2225 files changed, 211133 insertions, 72241 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..596615322f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+.gitattributes export-ignore
+.gitignore export-ignore
diff --git a/.gitignore b/.gitignore
index cba7caa074..0bd5e1ff2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,10 @@
 # Match at any level.
+
+# emacs
 *~
+# vim
+.*.sw[a-z]
+
 autom4te.cache
 *.beam
 *.asn1db
@@ -27,12 +32,72 @@ powerpc-unknown-linux-gnu
 # Mac OS X
 a.out.dSYM/
 
+# Windows
+*.pdb
+tcltk85_win32_bin.tar.gz
+erts/autoconf/win32.config.cache
+erts/emulator/obj/
+erts/emulator/pcre/obj/
+erts/emulator/pcre/win32/
+erts/emulator/win32/
+erts/emulator/zlib/obj/
+erts/emulator/zlib/win32/
+erts/epmd/src/win32/
+erts/etc/common/Install.ini
+erts/etc/common/win32/
+erts/etc/win32/cygwin_tools/vc/coffix.exe
+erts/include/internal/win32/
+erts/include/win32/
+erts/lib/internal/win32/
+erts/lib/win32/
+erts/lib_src/obj/
+erts/lib_src/win32/
+erts/obj/win32/
+erts/win32/
+erts/etc/win32/nsis/erlang.nsh
+lib/asn1/priv/lib/
+lib/asn1/priv/obj/
+lib/common_test/priv/win32/
+lib/crypto/c_src/win32/
+lib/crypto/priv/lib/
+lib/crypto/priv/obj/
+lib/erl_interface/obj.md/
+lib/erl_interface/obj.mdd/
+lib/erl_interface/src/win32/
+lib/gs/priv/tcl/
+lib/gs/tcl/binaries/
+lib/ic/c_src/win32/
+lib/ic/priv/lib/win32/
+lib/ic/priv/obj/win32/
+lib/megaco/src/flex/win32/
+lib/odbc/c_src/win32/
+lib/odbc/priv/bin/odbcserver.exe
+lib/odbc/priv/obj/win32/odbcserver.o
+lib/orber/c_src/win32/
+lib/os_mon/c_src/win32/
+lib/os_mon/priv/bin/win32/
+lib/os_mon/priv/obj/win32/
+lib/runtime_tools/c_src/win32/
+lib/runtime_tools/priv/lib/
+lib/runtime_tools/priv/obj/
+lib/ssl/c_src/win32/
+lib/ssl/priv/bin/win32/
+lib/ssl/priv/obj/win32/
+lib/tools/bin/win32/
+lib/tools/c_src/win32/
+lib/tools/obj/win32/
+lib/wx/c_src/win32/
+lib/wx/priv/win32/
+lib/wx/win32/
+make/win32/
+
 # Anchored from $ERL_TOP
 /bin
 /config.log
 /config.status
 
 /bootstrap/bin/*
+/bootstrap/target
 !/bootstrap/bin/*.script
 !/bootstrap/bin/*.boot
 
@@ -102,6 +167,7 @@ a.out.dSYM/
 /erts/emulator/test/*_SUITE_make.erl
 /erts/emulator/test/*_SUITE_data/Makefile
 /erts/test/install_SUITE_data/install_bin
+/erts/test/autoimport_SUITE_data/erlang.xml
 
 # asn1
 
@@ -142,6 +208,7 @@ a.out.dSYM/
 /erts/doc/pdf/*.fo
 /erts/doc/pdf/*.pdf
 /erts/doc/man[0-9]/*.[0-9]
+/erts/doc/CONF_INFO
 
 # et
 
@@ -182,11 +249,18 @@ a.out.dSYM/
 /lib/jinterface/priv/OtpErlang.jar
 /lib/jinterface/priv/com/
 /lib/jinterface/doc/html/java
+/lib/jinterface/pom.xml
+/lib/jinterface/target
 
 # kernel
 
 /lib/kernel/src/inet_dns_record_adts.hrl
 
+# kernel
+
+/lib/mnesia/test/Mnesia.*
+/lib/mnesia/test/test_log*
+
 # otp_mibs
 
 /lib/otp_mibs/include/[A-Z]*.hrl
@@ -217,9 +291,6 @@ a.out.dSYM/
 # ssl
 
 /lib/ssl/pkix/*.asn1db
-/lib/ssl/examples/certs/done
-/lib/ssl/examples/certs/ebin/make_certs.beam
-/lib/ssl/examples/certs/etc/
 /lib/ssl/include/OTP-PKIX.hrl
 /lib/ssl/pkix/OTP-PKIX.erl
 /lib/ssl/pkix/OTP-PKIX.hrl
@@ -232,6 +303,7 @@ a.out.dSYM/
 # snmp
 
 /lib/snmp/bin/snmp-v2tov1
+/lib/snmp/bin/snmpc
 /lib/snmp/examples/ex1/EX1-MIB.bin
 /lib/snmp/mibs/Makefile
 /lib/snmp/mibs/v1/OTP-SNMPEA-MIB.mib.v1
@@ -259,6 +331,8 @@ a.out.dSYM/
 /system/doc/tutorial/cnode.xml
 /system/doc/tutorial/erl_interface.xml
 /system/doc/tutorial/example.xml
+/system/doc/tutorial/nif.xml
+/system/doc/html/installation_guide
 /system/doc/installation_guide/INSTALL.xml
 /system/doc/installation_guide/INSTALL-CROSS.xml
 /system/doc/installation_guide/INSTALL-WIN32.xml
@@ -278,10 +352,12 @@ a.out.dSYM/
 /lib/wx/api_gen/wx_xml/*
 /lib/wx/api_gen/gl_xml/*
 /lib/wx/api_gen/??_doxygen
-/lib/wx/api_gen/??xml_generated
+/lib/wx/api_gen/*_generated
 /lib/wx/wx-*.ez
 /lib/wx/CONF_INFO
 /lib/wx/doc/src/wx*.xml
+/lib/wx/priv/wxe_driver.*
+/lib/wx/priv/erl_gl.*
 
 # xmerl
 
diff --git a/INSTALL-WIN32.md b/INSTALL-WIN32.md
index 643cd33c84..59b9086c39 100644
--- a/INSTALL-WIN32.md
+++ b/INSTALL-WIN32.md
@@ -92,7 +92,9 @@ Frequently Asked Questions
 
     A: The SMP version of Erlang needs features in the Visual Studio 2005.
     Can't live without them. Besides the new compiler gives the Erlang
-    emulator a ~40% performance boost(!)
+    emulator a ~40% performance boost(!). Alternatively you can build Erlang
+    successfully using the free (proprietary) Visual Studio 2008 Express
+    edition C++ compiler.
 
 *   Q: Can/will I build a Cygwin binary with the procedure you describe?
 
@@ -182,7 +184,7 @@ Frequently Asked Questions
     include workarounds for the bugs I've found in different Cygwin
     releases, please help me to add workarounds for new Cygwin-related
     bugs as soon as you encounter them. Also please do submit bug reports
-    to the appropriate Cygwin developers. The Cygwin GCC we used for R13B
+    to the appropriate Cygwin developers. The Cygwin GCC we used for %OTP-REL%
     was version 3.4.4. We used VC++ 8.0 (i.e. Visual studio 2005 SP1),
     Sun's JDK 1.5.0\_17, NSIS 2.37, and Win32 OpenSSL 0.9.8e. Please read
     the next section for details on what you need.
@@ -208,20 +210,15 @@ Frequently Asked Questions
 
     *   (Buy and) Install Microsoft Visual studio 2005 and SP1 (or higher)
 
-    *   Get and install Sun's JDK 1.4.2
+    *   Alternatively install the free MS Visual Studio 2008 Express [msvc++]
+    and the Windows SDK [32bit-SDK] or [64bit-SDK] depending on the Windows
+    platform you are running.
 
-    *   Get and install NSIS 2.01 or higher (up to 2.30 tried and working)
+    *   Get and install Sun's JDK 1.4.2
 
-    *   Get and install OpenSSL 0.9.7c or higher
+    *   Get and install NSIS 2.01 or higher (up to 2.46 tried and working)
 
-    *   Get and unpack wxWidgets-2.8.9 or higher to `/opt/local/pgm` inside
-        cygwin.
-        *   Open `/cygwin/opt/local/pgm/wxWidgets-2.8.9/build/msw/wx.dsw`
-        *   Enable `wxUSE_GLCANVAS`, `wxUSE_POSTSCRIPT` and
-            `wxUSE_GRAPHICS_CONTEXT` in `include/wx/msw/setup.h`
-        *   Build all unicode release (and unicode debug) packages
-        *   Open `/cygwin/opt/local/pgm/wxWidgets-2.8.9/contrib/build/stc/stc.dsw`
-        *   Build the unicode release (and unicode debug) packages
+    *   Get and install OpenSSL 0.9.7c or higher (up to 1.0.0a tried & working)
 
     *   Get the Erlang source distribution (from
         <http://www.erlang.org/download.html>) and unpack with Cygwin's `tar`.
@@ -363,6 +360,15 @@ Well' here's the list:
     your `PATH` to allow the environment to find mc.exe. The next Visual Studio
     (2010) is expected to include this tool.
 
+    Alternatively install the free MS Visual Studio 2008 Express [msvc++] and
+    the Windows SDK [32bit-SDK] or [64bit-SDK] depending on the Windows
+    platform you are running, which includes the missing mc.exe message
+    compiler.
+
+[msvc++]:	http://download.microsoft.com/download/E/8/E/E8EEB394-7F42-4963-A2D8-29559B738298/VS2008ExpressWithSP1ENUX1504728.iso
+[32bit-SDK]:	http://download.microsoft.com/download/2/E/9/2E911956-F90F-4BFB-8231-E292A7B6F287/GRMSDK_EN_DVD.iso
+[64bit-SDK]:	http://download.microsoft.com/download/2/E/9/2E911956-F90F-4BFB-8231-E292A7B6F287/GRMSDKX_EN_DVD.iso
+
 *   Sun's Java JDK 1.5.0 or higher. Our Java code (jinterface, ic) is
     written for JDK 1.5.0. Get it for Windows and install it, the JRE is
     not enough. If you don't care about Java, you can skip this step, the
@@ -401,9 +407,10 @@ Well' here's the list:
     on the `Related` link and then on the `Binaries` link (upper right
     corner of the page last time I looked), you can then reach the
     "Shining Lights Productions" Web site for Windows binaries
-    distributions. Get the latest or 0.9.7c if you get trouble with the
-    latest. It's a nifty installer. The rest should be handled by
-    `configure`, you needn't put anything in the path or anything.
+    distributions. Get the latest 32-bit installer, or use 0.9.7c if you get
+    trouble with the latest, and install to C:\OpenSSL which is where the
+    Makefiles are expecting to find it. It's a nifty installer. The rest should
+    be handled by `configure`, you needn't put anything in the path or anything.
 
     If you want to build openssl for windows yourself (which might be
     possible, as you wouldn't be reading this if you weren't a
@@ -422,18 +429,51 @@ Well' here's the list:
     release (2.9.\*  is a developer release which currently does not work
     with wxErlang).
 
-    Install or unpack it to `DRIVE:/PATH/cygwin/opt/local/pgm`
+    Install or unpack it to `DRIVE:/PATH/cygwin/opt/local/pgm`.
     Open from explorer (i.e. by double clicking the file)
-    `C:\cygwin\opt\local\pgm\wxMSW-2.8.10\build\msw\wx.dsw`
+    `C:\cygwin\opt\local\pgm\wxMSW-2.8.11\build\msw\wx.dsw`
     In Microsoft Visual Studio, click File/Open/File, locate and
-    open:  `C:\cygwin\opt\local\pgm\wxMSW-2.8.10\include\wx\msw\setup.h`
+    open:  `C:\cygwin\opt\local\pgm\wxMSW-2.8.11\include\wx\msw\setup.h`
     enable `wxUSE_GLCANVAS`, `wxUSE_POSTSCRIPT` and `wxUSE_GRAPHICS_CONTEXT`
     Build it by clicking Build/Batch Build and select all unicode release
     (and unicode debug) packages.
 
-    Open `C:\cygwin\opt\local\pgm\wxMSW-2.8.10\contrib/build/stc/stc.dsw`
+    Open `C:\cygwin\opt\local\pgm\wxMSW-2.8.11\contrib/build/stc/stc.dsw`
     and batch build all unicode packages.
 
+    If you are using Visual C++ 9.0 or higher (Visual Studio 2008 onwards) you
+    will also need to convert and re-create the project dependencies in the new
+    .sln "Solution" format.
+
+    * Open VSC++ & the project  `wxMSW-2.8.11\build\msw\wx.dsw`, accepting the
+    automatic conversion to the newer VC++ format and save as
+    `\wxMSW-2.8.11\build\msw\wx.sln`
+
+    * right-click on the project, and set up the project dependencies for
+    `wx.dsw` to achieve the below build order
+
+            jpeg, png, tiff, zlib, regex, expat, base, net, odbc, core,
+            gl, html, media, qa, adv, dbgrid, xrc, aui, richtext, xml
+
+    Build all unicode release (and unicode debug) packages either from the
+    GUI or alternatively launch a new prompt from somewhere like Start ->
+    Programs -> Microsoft Visual C++ -> Visual Studio Tools -> VS2008 Cmd Prompt
+    and cd to where you unpacked wxMSW
+
+            pushd c:\wxMSW*\build\msw
+            vcbuild /useenv /platform:Win32 /M4 wx.sln "Unicode Release|Win32"
+            vcbuild /useenv /platform:Win32 /M4 wx.sln "Unicode Debug|Win32"
+
+    Open VSC++ & convert `C:\wxMSW-2.8.11\contrib\build\stc\stc.dsw` to
+    `C:\wxMSW-2.8.11\contrib\build\stc\stc.sln`
+
+    * build the unicode release (and unicode debug) packages from the GUI or
+    alternatively open a VS2008 Cmd Prompt and cd to where you unpacked wxMSW
+
+            pushd c:\wxMSW*\contrib\build\stc
+            vcbuild /useenv /platform:Win32 /M4 stc.sln "Unicode Release|Win32"
+            vcbuild /useenv /platform:Win32 /M4 stc.sln "Unicode Debug|Win32"
+
 *   The Erlang source distribution (from <http://www.erlang.org/download.html>).
     The same as for Unix platforms. Preferably use tar from within Cygwin to
     unpack the source tar.gz (`tar zxf otp_src_%OTP-REL%.tar.gz`).
diff --git a/INSTALL.md b/INSTALL.md
index b26c0ce018..1061c5187a 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -273,6 +273,17 @@ Some of the available `configure` options are:
 *   `--with-ssl=PATH` - Specify location of OpenSSL include and lib
 *   `--{with,without}-ssl` - OpenSSL (without implies that the `crypto`,
     `ssh`, and `ssl` won't be built)
+*   `--enable-ethread-pre-pentium4-compatibility` - Enable compatibility with
+    x86 processors before pentium 4 (back to 486) in the ethread library. If
+    not passed the ethread library (part of the runtime system) will use
+    instructions that first appeared on the pentium 4 processor when building
+    for x86. This option will be automatically enabled if required on the
+    build machine.
+*   `--with-libatomic_ops=PATH` - Use the `libatomic_ops` library for atomic
+    memory accesses. If `configure` should inform you about no native atomic
+    implementation available, you typically want to try using the
+    `libatomic_ops` library. It can be downloaded from
+    <http://www.hpl.hp.com/research/linux/atomic_ops/>.
 
 If you or your system has special requirements please read the `Makefile` for
 additional configuration information.
diff --git a/Makefile.in b/Makefile.in
index ac2015f8e4..ca92bf604d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,7 +119,7 @@ BINDIR      = $(DESTDIR)$(EXTRA_PREFIX)$(bindir)
 #
 # Erlang base public files
 #
-ERL_BASE_PUB_FILES=erl erlc epmd run_erl to_erl dialyzer typer escript
+ERL_BASE_PUB_FILES=erl erlc epmd run_erl to_erl dialyzer typer escript run_test
 
 # ERLANG_INST_LIBDIR is the top directory where the Erlang installation
 # will be located when running.
@@ -393,7 +393,7 @@ endif
 # ---------------------------------------------------------------
 # Target only used when building commercial ERTS patches
 # ---------------------------------------------------------------
-release_docs docs:
+release_docs docs: mod2app
 ifeq ($(OTP_SMALL_BUILD),true)
 	cd $(ERL_TOP)/lib && \
 	  ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT=$(RELEASE_ROOT) $@
@@ -408,6 +408,9 @@ endif
 	cd $(ERL_TOP)/system/doc && \
 	  ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT=$(RELEASE_ROOT) $@
 
+mod2app:
+	$(ERL_TOP)/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml
+
 # ----------------------------------------------------------------------
 ERLANG_EARS=$(BOOTSTRAP_ROOT)/bootstrap/erts
 ELINK=$(BOOTSTRAP_ROOT)/bootstrap/erts/bin/elink
@@ -485,11 +488,13 @@ dep depend:
 # Creates "erl" and "erlc" in bootstrap/bin which uses the precompiled 
 # libraries in the bootstrap directory
 
+.PHONY: bootstrap_setup_target
+
 # ----------------------------------------------------------------------
 # Bootstraps... 
 # ----------------------------------------------------------------------
 ifeq ($(TARGET),win32)
-bootstrap_setup: check_recreate_primary_bootstrap
+bootstrap_setup: check_recreate_primary_bootstrap bootstrap_setup_target
 	@rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erl.exe \
 		$(BOOTSTRAP_ROOT)/bootstrap/bin/erlc.exe \
 		$(BOOTSTRAP_ROOT)/bootstrap/bin/erl.ini \
@@ -501,9 +506,9 @@ bootstrap_setup: check_recreate_primary_bootstrap
 	@cp $(ERL_TOP)/bin/$(TARGET)/erl.exe \
 		$(BOOTSTRAP_ROOT)/bootstrap/bin/erl.exe
 else
-bootstrap_setup: check_recreate_primary_bootstrap $(BOOTSTRAP_ROOT)/bootstrap/bin/erl $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
+bootstrap_setup: check_recreate_primary_bootstrap bootstrap_setup_target $(BOOTSTRAP_ROOT)/bootstrap/bin/erl $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
 
-$(BOOTSTRAP_ROOT)/bootstrap/bin/erl:  $(ERL_TOP)/erts/etc/unix/erl.src.src
+$(BOOTSTRAP_ROOT)/bootstrap/bin/erl: $(ERL_TOP)/erts/etc/unix/erl.src.src $(BOOTSTRAP_ROOT)/bootstrap/target
 	@rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erl 
 	@sed	-e "s;%FINAL_ROOTDIR%;$(BOOTSTRAP_ROOT)/bootstrap;"   \
 		-e "s;\$$ROOTDIR/erts-.*/bin;$(ERL_TOP)/bin/$(TARGET);"    \
@@ -512,12 +517,17 @@ $(BOOTSTRAP_ROOT)/bootstrap/bin/erl:  $(ERL_TOP)/erts/etc/unix/erl.src.src
 			$(BOOTSTRAP_ROOT)/bootstrap/bin/erl
 	@chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/erl
 
-$(BOOTSTRAP_ROOT)/bootstrap/bin/erlc:  $(ERL_TOP)/bin/$(TARGET)/erlc
+$(BOOTSTRAP_ROOT)/bootstrap/bin/erlc: $(ERL_TOP)/bin/$(TARGET)/erlc $(BOOTSTRAP_ROOT)/bootstrap/target
 	@rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
 	@cp $(ERL_TOP)/bin/$(TARGET)/erlc $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
 	@chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc
 endif
 
+bootstrap_setup_target:
+	@{ test -r $(BOOTSTRAP_ROOT)/bootstrap/target && \
+	   test $(TARGET) = `cat $(BOOTSTRAP_ROOT)/bootstrap/target`; } || \
+	 echo $(TARGET) > $(BOOTSTRAP_ROOT)/bootstrap/target
+
 secondary_bootstrap_build:
 	cd lib && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)$${PATH} \
@@ -743,14 +753,16 @@ recreate_primary_bootstrap:
 # of the emulator possible
 
 .PHONY: primary_bootstrap						\
-	primary_bootstrap_check_make					\
 	primary_bootstrap_build						\
 	primary_bootstrap_compiler					\
 	primary_bootstrap_mkdirs					\
 	primary_bootstrap_copy
 
-primary_bootstrap: primary_bootstrap_check_make
+primary_bootstrap:
 	@echo "=== Building a bootstrap compiler in $(BOOTSTRAP_ROOT)/bootstrap"
+	$(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) \
+		ERL_TOP=$(ERL_TOP) \
+		bootstrap_clean
 	cd $(ERL_TOP) && \
 		$(MAKE) TESTROOT=$(BOOTSTRAP_TOP) \
 		BOOTSTRAP_TOP=$(BOOTSTRAP_TOP) \
@@ -768,22 +780,6 @@ primary_bootstrap: primary_bootstrap_check_make
 			$(BOOTSTRAP_TOP) \
 			$(BOOTSTRAP_ROOT)
 
-#
-# Dependencies are not complete in all makefiles; therefore, remove bootstrap
-# build result and build from scratch if we are not using clearmake (which
-# tracks dependencies itself).
-#
-primary_bootstrap_check_make:
-	@ case "$(MAKE)" in						\
-	    *clearmake*)						\
-		;;							\
-	    *)								\
-		$(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT)		\
-		ERL_TOP=$(ERL_TOP)					\
-		bootstrap_clean						\
-		;;							\
-	esac
-
 primary_bootstrap_build: primary_bootstrap_mkdirs primary_bootstrap_compiler \
   primary_bootstrap_stdlib
 	cd lib && $(MAKE) ERLC_FLAGS='-pa $(BOOTSTRAP_COMPILER)/ebin' \
@@ -1023,6 +1019,7 @@ bootstrap_root_clean:
 # $(BOOTSTRAP_TOP) for some reason should be empty).
 bootstrap_clean:
 	rm -f $(ERL_TOP)/bootstrap/lib/*/ebin/*.beam
+	rm -f $(ERL_TOP)/bootstrap/lib/*/ebin/*.app
 	rm -f $(ERL_TOP)/bootstrap/lib/*/egen/*
 	rm -f $(ERL_TOP)/bootstrap/lib/*/include/*.hrl
 	rm -f $(ERL_TOP)/bootstrap/primary_compiler/ebin/*
diff --git a/README.bootstrap b/README.bootstrap
index b0c8a1cc20..f42bc7aa47 100644
--- a/README.bootstrap
+++ b/README.bootstrap
@@ -45,13 +45,11 @@ preloaded files are to be updated, the source code is built using a
 special Makefile in the $ERL_TOP/preloaded/src directory, which
 creates beam files in the same directory. When they seem to compile
 successfully, they can be used in an emulator build by being copied
-to the ebin directory (although, in Clearcase that requires checking
-out the files in the ebin directory first). For developers using the
-main Clearcase branch, otp_build {prepare,update,commit}_preloaded can
-be used to ease the process (there are also similar targets in the
+to the ebin directory. otp_build update_preloaded can be used to
+ease the process (there are also similar targets in the
 $ERL_TOP/preloaded/src/Makefile).
 
-In prebuilt open source distributions, these .beam files are also
+In prebuilt open source distributions, these beam files are also
 present, but to update them one might need to change permission on the
 $ERL_TOP/preloaded/ebin directory, then build and then manually copy
 the beam files from the source directory to ../ebin. If patches are
@@ -60,4 +58,4 @@ always note this specially as the preloaded/ebin directory needs
 updating, or provide the new derived files in the patch or as complete
 binaries.
 
-/Patrik, OTP
\ No newline at end of file
+/Patrik, OTP
diff --git a/bootstrap/bin/start.boot b/bootstrap/bin/start.boot
index 71d72c4b7d..c7f5785eee 100644
--- a/bootstrap/bin/start.boot
+++ b/bootstrap/bin/start.boot
diff --git a/bootstrap/bin/start.script b/bootstrap/bin/start.script
index 1b7e8ae4f7..c5106e3709 100644
--- a/bootstrap/bin/start.script
+++ b/bootstrap/bin/start.script
@@ -1,6 +1,6 @@
-%% script generated at {2010,6,2} {16,55,39}
+%% script generated at {2010,12,3} {17,41,47}
 {script,
-    {"OTP  APN 181 01","R14A"},
+    {"OTP  APN 181 01","R14B01"},
     [{preLoaded,
          [erl_prim_loader,erlang,init,otp_ring0,prim_file,prim_inet,prim_zip,
           zlib]},
@@ -43,7 +43,7 @@
          {application_controller,start,
              [{application,kernel,
                   [{description,"ERTS  CXC 138 10"},
-                   {vsn,"2.14"},
+                   {vsn,"2.14.2"},
                    {id,[]},
                    {modules,
                        [application,application_controller,application_master,
@@ -80,7 +80,7 @@
          {application,load,
              [{application,stdlib,
                   [{description,"ERTS  CXC 138 10"},
-                   {vsn,"1.17"},
+                   {vsn,"1.17.2"},
                    {id,[]},
                    {modules,
                        [array,base64,beam_lib,binary,c,calendar,dets,
diff --git a/bootstrap/bin/start_clean.boot b/bootstrap/bin/start_clean.boot
index 71d72c4b7d..c7f5785eee 100644
--- a/bootstrap/bin/start_clean.boot
+++ b/bootstrap/bin/start_clean.boot
diff --git a/bootstrap/bin/start_clean.script b/bootstrap/bin/start_clean.script
index 1b7e8ae4f7..c5106e3709 100644
--- a/bootstrap/bin/start_clean.script
+++ b/bootstrap/bin/start_clean.script
@@ -1,6 +1,6 @@
-%% script generated at {2010,6,2} {16,55,39}
+%% script generated at {2010,12,3} {17,41,47}
 {script,
-    {"OTP  APN 181 01","R14A"},
+    {"OTP  APN 181 01","R14B01"},
     [{preLoaded,
          [erl_prim_loader,erlang,init,otp_ring0,prim_file,prim_inet,prim_zip,
           zlib]},
@@ -43,7 +43,7 @@
          {application_controller,start,
              [{application,kernel,
                   [{description,"ERTS  CXC 138 10"},
-                   {vsn,"2.14"},
+                   {vsn,"2.14.2"},
                    {id,[]},
                    {modules,
                        [application,application_controller,application_master,
@@ -80,7 +80,7 @@
          {application,load,
              [{application,stdlib,
                   [{description,"ERTS  CXC 138 10"},
-                   {vsn,"1.17"},
+                   {vsn,"1.17.2"},
                    {id,[]},
                    {modules,
                        [array,base64,beam_lib,binary,c,calendar,dets,
diff --git a/bootstrap/lib/compiler/ebin/beam_asm.beam b/bootstrap/lib/compiler/ebin/beam_asm.beam
index 23046bac9f..7a40486b42 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 4d71b65e23..41be7667fc 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_dict.beam b/bootstrap/lib/compiler/ebin/beam_dict.beam
index e1b39a1799..6e3c32607e 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_utils.beam b/bootstrap/lib/compiler/ebin/beam_utils.beam
index 7b9c08439e..c335748e8a 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 6af598519f..32e75091f4 100644
--- a/bootstrap/lib/compiler/ebin/beam_validator.beam
+++ b/bootstrap/lib/compiler/ebin/beam_validator.beam
diff --git a/bootstrap/lib/compiler/ebin/cerl.beam b/bootstrap/lib/compiler/ebin/cerl.beam
index 9f45f9f441..197e726ba6 100644
--- a/bootstrap/lib/compiler/ebin/cerl.beam
+++ b/bootstrap/lib/compiler/ebin/cerl.beam
diff --git a/bootstrap/lib/compiler/ebin/compile.beam b/bootstrap/lib/compiler/ebin/compile.beam
index 3db3a08335..d9b955baff 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 ed0dd7c30e..3fd5add16b 100644
--- a/bootstrap/lib/compiler/ebin/compiler.app
+++ b/bootstrap/lib/compiler/ebin/compiler.app
@@ -1,7 +1,7 @@
 % This is an -*- erlang -*- file.
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -18,7 +18,7 @@
 
 {application, compiler,
  [{description, "ERTS  CXC 138 10"},
-  {vsn, "4.6.5"},
+  {vsn, "4.7.1"},
   {modules, [
 	     beam_asm,
 	     beam_block,
diff --git a/bootstrap/lib/compiler/ebin/compiler.appup b/bootstrap/lib/compiler/ebin/compiler.appup
index 99b234c847..10c9fd3dde 100644
--- a/bootstrap/lib/compiler/ebin/compiler.appup
+++ b/bootstrap/lib/compiler/ebin/compiler.appup
@@ -1 +1 @@
-{"4.6.5",[],[]}.
+{"4.7.1",[],[]}.
diff --git a/bootstrap/lib/compiler/ebin/core_lint.beam b/bootstrap/lib/compiler/ebin/core_lint.beam
index e7db1d3f72..813c444d9c 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 631c5d6aba..5e39a05dc5 100644
--- a/bootstrap/lib/compiler/ebin/core_parse.beam
+++ b/bootstrap/lib/compiler/ebin/core_parse.beam
diff --git a/bootstrap/lib/compiler/ebin/rec_env.beam b/bootstrap/lib/compiler/ebin/rec_env.beam
index 8a1de81396..7d53fa3353 100644
--- a/bootstrap/lib/compiler/ebin/rec_env.beam
+++ b/bootstrap/lib/compiler/ebin/rec_env.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_codegen.beam b/bootstrap/lib/compiler/ebin/v3_codegen.beam
index 5555d01b2a..7cdb5fe92a 100644
--- a/bootstrap/lib/compiler/ebin/v3_codegen.beam
+++ b/bootstrap/lib/compiler/ebin/v3_codegen.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_core.beam b/bootstrap/lib/compiler/ebin/v3_core.beam
index 5d889ea4f3..7a60d7b23d 100644
--- a/bootstrap/lib/compiler/ebin/v3_core.beam
+++ b/bootstrap/lib/compiler/ebin/v3_core.beam
diff --git a/bootstrap/lib/compiler/egen/core_parse.erl b/bootstrap/lib/compiler/egen/core_parse.erl
index 9740cb91bb..6e3fead4a3 100644
--- a/bootstrap/lib/compiler/egen/core_parse.erl
+++ b/bootstrap/lib/compiler/egen/core_parse.erl
@@ -13,11 +13,11 @@
 tok_val(T) -> element(3, T).
 tok_line(T) -> element(2, T).
 
--file("/usr/local/otp/releases/otp_beam_linux_sles10_x64_r13b02_patched/lib/parsetools-2.0/include/yeccpre.hrl", 0).
+-file("/usr/local/otp/releases/sles10_64_R14B_patched/lib/parsetools-2.0.4/include/yeccpre.hrl", 0).
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -36,33 +36,32 @@ tok_line(T) -> element(2, T).
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % The parser generator will insert appropriate declarations before this line.%
 
--type(yecc_ret() :: {'error', _} | {'ok', _}).
+-type yecc_ret() :: {'error', _} | {'ok', _}.
 
 -spec parse(Tokens :: list()) -> yecc_ret().
 parse(Tokens) ->
     yeccpars0(Tokens, {no_func, no_line}, 0, [], []).
 
--spec(parse_and_scan/1 ::
-      ({function() | {atom(), atom()}, [_]} | {atom(), atom(), [_]}) ->
-            yecc_ret()).
+-spec parse_and_scan({function() | {atom(), atom()}, [_]}
+                     | {atom(), atom(), [_]}) -> yecc_ret().
 parse_and_scan({F, A}) -> % Fun or {M, F}
     yeccpars0([], {{F, A}, no_line}, 0, [], []);
 parse_and_scan({M, F, A}) ->
     yeccpars0([], {{{M, F}, A}, no_line}, 0, [], []).
 
--spec(format_error/1 :: (any()) -> [char() | list()]).
+-spec format_error(any()) -> [char() | list()].
 format_error(Message) ->
     case io_lib:deep_char_list(Message) of
-	true ->
-	    Message;
-	_ ->
-	    io_lib:write(Message)
+        true ->
+            Message;
+        _ ->
+            io_lib:write(Message)
     end.
 
-% To be used in grammar files to throw an error message to the parser
-% toplevel. Doesn't have to be exported!
+%% To be used in grammar files to throw an error message to the parser
+%% toplevel. Doesn't have to be exported!
 -compile({nowarn_unused_function, return_error/2}).
--spec(return_error/2 :: (integer(), any()) -> no_return()).
+-spec return_error(integer(), any()) -> no_return().
 return_error(Line, Message) ->
     throw({error, {Line, ?MODULE, Message}}).
 
@@ -74,10 +73,7 @@ yeccpars0(Tokens, Tzr, State, States, Vstack) ->
         error: Error ->
             Stacktrace = erlang:get_stacktrace(),
             try yecc_error_type(Error, Stacktrace) of
-                {syntax_error, Token} ->
-                    yeccerror(Token);
-                {missing_in_goto_table=Tag, Symbol, State} ->
-                    Desc = {Symbol, State, Tag},
+                Desc ->
                     erlang:raise(error, {yecc_bug, ?CODE_VERSION, Desc},
                                  Stacktrace)
             catch _:_ -> erlang:raise(error, Error, Stacktrace)
@@ -87,13 +83,15 @@ yeccpars0(Tokens, Tzr, State, States, Vstack) ->
             Error
     end.
 
-yecc_error_type(function_clause, [{?MODULE,F,[State,_,_,_,Token,_,_]} | _]) ->
+yecc_error_type(function_clause, [{?MODULE,F,ArityOrArgs} | _]) ->
     case atom_to_list(F) of
-        "yeccpars2" ++ _ ->
-            {syntax_error, Token};
         "yeccgoto_" ++ SymbolL ->
             {ok,[{atom,_,Symbol}],_} = erl_scan:string(SymbolL),
-            {missing_in_goto_table, Symbol, State}
+            State = case ArityOrArgs of
+                        [S,_,_,_,_,_,_] -> S;
+                        _ -> state_is_unknown
+                    end,
+            {Symbol, State, missing_in_goto_table}
     end.
 
 yeccpars1([Token | Tokens], Tzr, State, States, Vstack) ->
@@ -101,7 +99,7 @@ yeccpars1([Token | Tokens], Tzr, State, States, Vstack) ->
 yeccpars1([], {{F, A},_Line}, State, States, Vstack) ->
     case apply(F, A) of
         {ok, Tokens, Endline} ->
-	    yeccpars1(Tokens, {{F, A}, Endline}, State, States, Vstack);
+            yeccpars1(Tokens, {{F, A}, Endline}, State, States, Vstack);
         {eof, Endline} ->
             yeccpars1([], {no_func, Endline}, State, States, Vstack);
         {error, Descriptor, _Endline} ->
@@ -134,7 +132,7 @@ yeccpars1(State1, State, States, Vstack, Token0, [], {no_func, Line}) ->
     yeccpars2(State, '$end', [State1 | States], [Token0 | Vstack],
               yecc_end(Line), [], {no_func, Line}).
 
-% For internal use only.
+%% For internal use only.
 yecc_end({Line,_Column}) ->
     {'$end', Line};
 yecc_end(Line) ->
@@ -158,11 +156,13 @@ yecctoken_end_location(Token) ->
         yecctoken_location(Token)
     end.
 
+-compile({nowarn_unused_function, yeccerror/1}).
 yeccerror(Token) ->
     Text = yecctoken_to_string(Token),
     Location = yecctoken_location(Token),
     {error, {Location, ?MODULE, ["syntax error before: ", Text]}}.
 
+-compile({nowarn_unused_function, yecctoken_to_string/1}).
 yecctoken_to_string(Token) ->
     case catch erl_scan:token_info(Token, text) of
         {text, Txt} -> Txt;
@@ -175,6 +175,7 @@ yecctoken_location(Token) ->
         _ -> element(2, Token)
     end.
 
+-compile({nowarn_unused_function, yecctoken2string/1}).
 yecctoken2string({atom, _, A}) -> io_lib:write(A);
 yecctoken2string({integer,_,N}) -> io_lib:write(N);
 yecctoken2string({float,_,F}) -> io_lib:write(F);
@@ -195,7 +196,7 @@ yecctoken2string(Other) ->
 
 
 
--file("/ldisk/pan/git/otp/bootstrap/lib/compiler/egen/core_parse.erl", 198).
+-file("/ldisk/pan/git/otp/bootstrap/lib/compiler/egen/core_parse.erl", 199).
 
 yeccpars2(0=S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_0(S, Cat, Ss, Stack, T, Ts, Tzr);
@@ -846,38 +847,54 @@ yeccpars2(321=S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2(323=S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_323(S, Cat, Ss, Stack, T, Ts, Tzr);
 yeccpars2(Other, _, _, _, _, _, _) ->
- erlang:error({yecc_bug,"1.3",{missing_state_in_action_table, Other}}).
+ erlang:error({yecc_bug,"1.4",{missing_state_in_action_table, Other}}).
 
 yeccpars2_0(S, '(', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 2, Ss, Stack, T, Ts, Tzr);
 yeccpars2_0(S, module, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 3, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 3, Ss, Stack, T, Ts, Tzr);
+yeccpars2_0(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
-yeccpars2_1(_S, '$end', _Ss, Stack,  _T, _Ts, _Tzr) ->
- {ok, hd(Stack)}.
+yeccpars2_1(_S, '$end', _Ss, Stack, _T, _Ts, _Tzr) ->
+ {ok, hd(Stack)};
+yeccpars2_1(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_2(S, module, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 315, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 315, Ss, Stack, T, Ts, Tzr);
+yeccpars2_2(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_3(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 4, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 4, Ss, Stack, T, Ts, Tzr);
+yeccpars2_3(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_4(S, '[', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 6, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 6, Ss, Stack, T, Ts, Tzr);
+yeccpars2_4(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_5(S, attributes, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 18, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 18, Ss, Stack, T, Ts, Tzr);
+yeccpars2_5(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_6(S, ']', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 10, Ss, Stack, T, Ts, Tzr);
 yeccpars2_6(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 11, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 11, Ss, Stack, T, Ts, Tzr);
+yeccpars2_6(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_7(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_exported_name(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_8(S, ']', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 16, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 16, Ss, Stack, T, Ts, Tzr);
+yeccpars2_8(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_9(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 14, Ss, Stack, T, Ts, Tzr);
@@ -891,10 +908,14 @@ yeccpars2_10(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_module_export(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_11(S, '/', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 12, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 12, Ss, Stack, T, Ts, Tzr);
+yeccpars2_11(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_12(S, integer, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 13, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 13, Ss, Stack, T, Ts, Tzr);
+yeccpars2_12(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_13(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -902,7 +923,9 @@ yeccpars2_13(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_function_name(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_14(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 11, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 11, Ss, Stack, T, Ts, Tzr);
+yeccpars2_14(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_15(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -923,15 +946,21 @@ yeccpars2_17(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_58(_S, Cat, [17 | Ss], NewStack, T, Ts, Tzr).
 
 yeccpars2_18(S, '[', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 19, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 19, Ss, Stack, T, Ts, Tzr);
+yeccpars2_18(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_19(S, ']', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 22, Ss, Stack, T, Ts, Tzr);
 yeccpars2_19(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 23, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 23, Ss, Stack, T, Ts, Tzr);
+yeccpars2_19(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_20(S, ']', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 55, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 55, Ss, Stack, T, Ts, Tzr);
+yeccpars2_20(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_21(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 53, Ss, Stack, T, Ts, Tzr);
@@ -945,7 +974,9 @@ yeccpars2_22(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_module_attribute(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_23(S, '=', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 24, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 24, Ss, Stack, T, Ts, Tzr);
+yeccpars2_23(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_24(S, '[', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 30, Ss, Stack, T, Ts, Tzr);
@@ -963,7 +994,9 @@ yeccpars2_cont_24(S, float, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_cont_24(S, integer, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 34, Ss, Stack, T, Ts, Tzr);
 yeccpars2_cont_24(S, string, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 35, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 35, Ss, Stack, T, Ts, Tzr);
+yeccpars2_cont_24(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_25(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_literal(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
@@ -1026,7 +1059,9 @@ yeccpars2_36(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_cont_24(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_37(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 42, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 42, Ss, Stack, T, Ts, Tzr);
+yeccpars2_37(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_38(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 40, Ss, Stack, T, Ts, Tzr);
@@ -1056,7 +1091,9 @@ yeccpars2_43(S, ',', Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_43(S, ']', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 47, Ss, Stack, T, Ts, Tzr);
 yeccpars2_43(S, '|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 48, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 48, Ss, Stack, T, Ts, Tzr);
+yeccpars2_43(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_44(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -1077,7 +1114,9 @@ yeccpars2_47(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_48: see yeccpars2_24
 
 yeccpars2_49(S, ']', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 50, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 50, Ss, Stack, T, Ts, Tzr);
+yeccpars2_49(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_50(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -1092,7 +1131,9 @@ yeccpars2_52(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_tail_literal(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_53(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 23, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 23, Ss, Stack, T, Ts, Tzr);
+yeccpars2_53(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_54(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -1105,7 +1146,9 @@ yeccpars2_55(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_module_attribute(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_56(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 314, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 314, Ss, Stack, T, Ts, Tzr);
+yeccpars2_56(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_57(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_anno_function_name(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
@@ -1122,18 +1165,26 @@ yeccpars2_59(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_313(_S, Cat, [59 | Ss], NewStack, T, Ts, Tzr).
 
 yeccpars2_60(S, '=', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 96, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 96, Ss, Stack, T, Ts, Tzr);
+yeccpars2_60(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_61: see yeccpars2_14
 
 yeccpars2_62(S, '-|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 63, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 63, Ss, Stack, T, Ts, Tzr);
+yeccpars2_62(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_63(S, '[', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 65, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 65, Ss, Stack, T, Ts, Tzr);
+yeccpars2_63(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_64(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 95, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 95, Ss, Stack, T, Ts, Tzr);
+yeccpars2_64(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_65(S, ']', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 73, Ss, Stack, T, Ts, Tzr);
@@ -1148,7 +1199,9 @@ yeccpars2_67(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_atomic_constant(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_68(S, ']', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 94, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 94, Ss, Stack, T, Ts, Tzr);
+yeccpars2_68(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_69(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 92, Ss, Stack, T, Ts, Tzr);
@@ -1198,7 +1251,9 @@ yeccpars2_79(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_85(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_80(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 82, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 82, Ss, Stack, T, Ts, Tzr);
+yeccpars2_80(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_81(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -1215,7 +1270,9 @@ yeccpars2_83(S, ',', Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_83(S, ']', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 86, Ss, Stack, T, Ts, Tzr);
 yeccpars2_83(S, '|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 87, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 87, Ss, Stack, T, Ts, Tzr);
+yeccpars2_83(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_84(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -1235,7 +1292,9 @@ yeccpars2_85(S, integer, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_85(S, string, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 78, Ss, Stack, T, Ts, Tzr);
 yeccpars2_85(S, '{', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 79, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 79, Ss, Stack, T, Ts, Tzr);
+yeccpars2_85(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_86(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  NewStack = yeccpars2_86_(Stack),
@@ -1244,7 +1303,9 @@ yeccpars2_86(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_87: see yeccpars2_85
 
 yeccpars2_88(S, ']', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 89, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 89, Ss, Stack, T, Ts, Tzr);
+yeccpars2_88(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_89(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -1278,7 +1339,9 @@ yeccpars2_95(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_96(S, '(', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 99, Ss, Stack, T, Ts, Tzr);
 yeccpars2_96(S, 'fun', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 100, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 100, Ss, Stack, T, Ts, Tzr);
+yeccpars2_96(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_97(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_anno_fun(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
@@ -1289,23 +1352,31 @@ yeccpars2_98(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_function_definition(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_99(S, 'fun', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 100, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 100, Ss, Stack, T, Ts, Tzr);
+yeccpars2_99(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_100(S, '(', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 101, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 101, Ss, Stack, T, Ts, Tzr);
+yeccpars2_100(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_101(S, '(', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 105, Ss, Stack, T, Ts, Tzr);
 yeccpars2_101(S, ')', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 106, Ss, Stack, T, Ts, Tzr);
 yeccpars2_101(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 107, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 107, Ss, Stack, T, Ts, Tzr);
+yeccpars2_101(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_102(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_anno_variable(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_103(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 306, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 306, Ss, Stack, T, Ts, Tzr);
+yeccpars2_103(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_104(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 304, Ss, Stack, T, Ts, Tzr);
@@ -1314,10 +1385,14 @@ yeccpars2_104(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_anno_variables(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_105(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 107, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 107, Ss, Stack, T, Ts, Tzr);
+yeccpars2_105(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_106(S, '->', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 108, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 108, Ss, Stack, T, Ts, Tzr);
+yeccpars2_106(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_107(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  NewStack = yeccpars2_107_(Stack),
@@ -1369,7 +1444,9 @@ yeccpars2_cont_108(S, 'receive', Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_cont_108(S, 'try', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 143, Ss, Stack, T, Ts, Tzr);
 yeccpars2_cont_108(S, '{', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 144, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 144, Ss, Stack, T, Ts, Tzr);
+yeccpars2_cont_108(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_109(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_single_expression(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
@@ -1434,7 +1511,9 @@ yeccpars2_128(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_fun_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_129(S, '{', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 287, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 287, Ss, Stack, T, Ts, Tzr);
+yeccpars2_129(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_130(S, char, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 32, Ss, Stack, T, Ts, Tzr);
@@ -1510,7 +1589,9 @@ yeccpars2_139(S, '(', Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_139(S, '<', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 155, Ss, Stack, T, Ts, Tzr);
 yeccpars2_139(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 107, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 107, Ss, Stack, T, Ts, Tzr);
+yeccpars2_139(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_140(S, '(', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 61, Ss, Stack, T, Ts, Tzr);
@@ -1563,7 +1644,9 @@ yeccpars2_144(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_cont_108(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_145(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 150, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 150, Ss, Stack, T, Ts, Tzr);
+yeccpars2_145(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_146(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 148, Ss, Stack, T, Ts, Tzr);
@@ -1589,12 +1672,16 @@ yeccpars2_150(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_tuple(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_151(S, 'of', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 152, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 152, Ss, Stack, T, Ts, Tzr);
+yeccpars2_151(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_152: see yeccpars2_139
 
 yeccpars2_153(S, '->', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 159, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 159, Ss, Stack, T, Ts, Tzr);
+yeccpars2_153(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_154(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  NewStack = yeccpars2_154_(Stack),
@@ -1605,10 +1692,14 @@ yeccpars2_155(S, '(', Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_155(S, '>', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 157, Ss, Stack, T, Ts, Tzr);
 yeccpars2_155(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 107, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 107, Ss, Stack, T, Ts, Tzr);
+yeccpars2_155(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_156(S, '>', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 158, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 158, Ss, Stack, T, Ts, Tzr);
+yeccpars2_156(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_157(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -1623,12 +1714,16 @@ yeccpars2_158(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_159: see yeccpars2_108
 
 yeccpars2_160(S, 'catch', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 161, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 161, Ss, Stack, T, Ts, Tzr);
+yeccpars2_160(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_161: see yeccpars2_139
 
 yeccpars2_162(S, '->', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 163, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 163, Ss, Stack, T, Ts, Tzr);
+yeccpars2_162(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_163: see yeccpars2_108
 
@@ -1652,7 +1747,9 @@ yeccpars2_168(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_other_pattern(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_169(S, 'when', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 240, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 240, Ss, Stack, T, Ts, Tzr);
+yeccpars2_169(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_170(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_anno_clause(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
@@ -1676,7 +1773,9 @@ yeccpars2_175(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_clause_pattern(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_176(S, 'after', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 182, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 182, Ss, Stack, T, Ts, Tzr);
+yeccpars2_176(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_177(S, '#', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 178, Ss, Stack, T, Ts, Tzr);
@@ -1705,7 +1804,9 @@ yeccpars2_177(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_anno_clauses(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_178(S, '{', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 222, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 222, Ss, Stack, T, Ts, Tzr);
+yeccpars2_178(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_179(S, '#', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 178, Ss, Stack, T, Ts, Tzr);
@@ -1778,7 +1879,9 @@ yeccpars2_183(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_cont_24(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_184(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 201, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 201, Ss, Stack, T, Ts, Tzr);
+yeccpars2_184(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_185(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 199, Ss, Stack, T, Ts, Tzr);
@@ -1812,10 +1915,14 @@ yeccpars2_188(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_anno_variable(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_189(S, '-|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 193, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 193, Ss, Stack, T, Ts, Tzr);
+yeccpars2_189(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_190(S, '=', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 191, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 191, Ss, Stack, T, Ts, Tzr);
+yeccpars2_190(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_191(S, '#', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 178, Ss, Stack, T, Ts, Tzr);
@@ -1840,7 +1947,9 @@ yeccpars2_192(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_193: see yeccpars2_63
 
 yeccpars2_194(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 195, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 195, Ss, Stack, T, Ts, Tzr);
+yeccpars2_194(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_195(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -1850,7 +1959,9 @@ yeccpars2_195(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_196: see yeccpars2_63
 
 yeccpars2_197(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 198, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 198, Ss, Stack, T, Ts, Tzr);
+yeccpars2_197(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_198(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -1870,7 +1981,9 @@ yeccpars2_201(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_tuple_pattern(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_202(S, '->', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 203, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 203, Ss, Stack, T, Ts, Tzr);
+yeccpars2_202(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_203: see yeccpars2_108
 
@@ -1884,7 +1997,9 @@ yeccpars2_205(S, ',', Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_205(S, ']', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 208, Ss, Stack, T, Ts, Tzr);
 yeccpars2_205(S, '|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 209, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 209, Ss, Stack, T, Ts, Tzr);
+yeccpars2_205(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_206(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -1900,7 +2015,9 @@ yeccpars2_208(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_209: see yeccpars2_191
 
 yeccpars2_210(S, ']', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 211, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 211, Ss, Stack, T, Ts, Tzr);
+yeccpars2_210(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_211(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -1915,7 +2032,9 @@ yeccpars2_213(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_tail_pattern(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_214(S, '>', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 216, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 216, Ss, Stack, T, Ts, Tzr);
+yeccpars2_214(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_215(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -1933,12 +2052,16 @@ yeccpars2_217(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_anno_pattern(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_218(S, '-|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 219, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 219, Ss, Stack, T, Ts, Tzr);
+yeccpars2_218(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_219: see yeccpars2_63
 
 yeccpars2_220(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 221, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 221, Ss, Stack, T, Ts, Tzr);
+yeccpars2_220(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_221(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -1948,10 +2071,14 @@ yeccpars2_221(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_222(S, '#', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 225, Ss, Stack, T, Ts, Tzr);
 yeccpars2_222(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 226, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 226, Ss, Stack, T, Ts, Tzr);
+yeccpars2_222(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_223(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 236, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 236, Ss, Stack, T, Ts, Tzr);
+yeccpars2_223(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_224(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 234, Ss, Stack, T, Ts, Tzr);
@@ -1960,10 +2087,14 @@ yeccpars2_224(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_segment_patterns(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_225(S, '<', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 228, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 228, Ss, Stack, T, Ts, Tzr);
+yeccpars2_225(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_226(S, '#', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 227, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 227, Ss, Stack, T, Ts, Tzr);
+yeccpars2_226(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_227(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_|Nss] = Ss,
@@ -1973,15 +2104,21 @@ yeccpars2_227(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_228: see yeccpars2_191
 
 yeccpars2_229(S, '>', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 230, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 230, Ss, Stack, T, Ts, Tzr);
+yeccpars2_229(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_230(S, '(', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 231, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 231, Ss, Stack, T, Ts, Tzr);
+yeccpars2_230(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_231: see yeccpars2_191
 
 yeccpars2_232(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 233, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 233, Ss, Stack, T, Ts, Tzr);
+yeccpars2_232(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_233(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_,_,_|Nss] = Ss,
@@ -1989,7 +2126,9 @@ yeccpars2_233(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_segment_pattern(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_234(S, '#', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 225, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 225, Ss, Stack, T, Ts, Tzr);
+yeccpars2_234(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_235(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -1997,7 +2136,9 @@ yeccpars2_235(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_segment_patterns(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_236(S, '#', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 237, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 237, Ss, Stack, T, Ts, Tzr);
+yeccpars2_236(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_237(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -2017,7 +2158,9 @@ yeccpars2_239(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_240: see yeccpars2_108
 
 yeccpars2_241(S, '->', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 242, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 242, Ss, Stack, T, Ts, Tzr);
+yeccpars2_241(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_242: see yeccpars2_108
 
@@ -2027,7 +2170,9 @@ yeccpars2_243(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_clause(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_244(S, '(', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 246, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 246, Ss, Stack, T, Ts, Tzr);
+yeccpars2_244(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_245(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2054,7 +2199,9 @@ yeccpars2_246(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_cont_108(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_247(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 249, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 249, Ss, Stack, T, Ts, Tzr);
+yeccpars2_247(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_248(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -2067,7 +2214,9 @@ yeccpars2_249(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_arg_list(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_250(S, in, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 251, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 251, Ss, Stack, T, Ts, Tzr);
+yeccpars2_250(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_251: see yeccpars2_108
 
@@ -2077,12 +2226,16 @@ yeccpars2_252(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_letrec_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_253(S, '=', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 254, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 254, Ss, Stack, T, Ts, Tzr);
+yeccpars2_253(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_254: see yeccpars2_108
 
 yeccpars2_255(S, in, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 256, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 256, Ss, Stack, T, Ts, Tzr);
+yeccpars2_255(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_256: see yeccpars2_108
 
@@ -2104,7 +2257,9 @@ yeccpars2_260(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_catch_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_261(S, 'of', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 262, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 262, Ss, Stack, T, Ts, Tzr);
+yeccpars2_261(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_262(S, '#', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 178, Ss, Stack, T, Ts, Tzr);
@@ -2124,7 +2279,9 @@ yeccpars2_262(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_cont_24(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_263(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 264, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 264, Ss, Stack, T, Ts, Tzr);
+yeccpars2_263(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_264(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -2132,7 +2289,9 @@ yeccpars2_264(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_case_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_265(S, ':', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 266, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 266, Ss, Stack, T, Ts, Tzr);
+yeccpars2_265(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_266: see yeccpars2_108
 
@@ -2155,7 +2314,9 @@ yeccpars2_271(S, ',', Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_271(S, ']', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 274, Ss, Stack, T, Ts, Tzr);
 yeccpars2_271(S, '|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 275, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 275, Ss, Stack, T, Ts, Tzr);
+yeccpars2_271(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_272(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2171,7 +2332,9 @@ yeccpars2_274(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_275: see yeccpars2_108
 
 yeccpars2_276(S, ']', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 277, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 277, Ss, Stack, T, Ts, Tzr);
+yeccpars2_276(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_277(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2186,7 +2349,9 @@ yeccpars2_279(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_tail(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_280(S, '>', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 282, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 282, Ss, Stack, T, Ts, Tzr);
+yeccpars2_280(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_281(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -2199,12 +2364,16 @@ yeccpars2_282(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_expression(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_283(S, '-|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 284, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 284, Ss, Stack, T, Ts, Tzr);
+yeccpars2_283(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_284: see yeccpars2_63
 
 yeccpars2_285(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 286, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 286, Ss, Stack, T, Ts, Tzr);
+yeccpars2_285(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_286(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -2214,10 +2383,14 @@ yeccpars2_286(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_287(S, '#', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 290, Ss, Stack, T, Ts, Tzr);
 yeccpars2_287(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 291, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 291, Ss, Stack, T, Ts, Tzr);
+yeccpars2_287(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_288(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 301, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 301, Ss, Stack, T, Ts, Tzr);
+yeccpars2_288(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_289(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 299, Ss, Stack, T, Ts, Tzr);
@@ -2226,10 +2399,14 @@ yeccpars2_289(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_segments(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_290(S, '<', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 293, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 293, Ss, Stack, T, Ts, Tzr);
+yeccpars2_290(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_291(S, '#', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 292, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 292, Ss, Stack, T, Ts, Tzr);
+yeccpars2_291(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_292(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_|Nss] = Ss,
@@ -2239,15 +2416,21 @@ yeccpars2_292(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_293: see yeccpars2_108
 
 yeccpars2_294(S, '>', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 295, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 295, Ss, Stack, T, Ts, Tzr);
+yeccpars2_294(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_295(S, '(', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 296, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 296, Ss, Stack, T, Ts, Tzr);
+yeccpars2_295(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_296: see yeccpars2_108
 
 yeccpars2_297(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 298, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 298, Ss, Stack, T, Ts, Tzr);
+yeccpars2_297(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_298(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_,_,_|Nss] = Ss,
@@ -2255,7 +2438,9 @@ yeccpars2_298(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_segment(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_299(S, '#', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 290, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 290, Ss, Stack, T, Ts, Tzr);
+yeccpars2_299(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_300(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2263,7 +2448,9 @@ yeccpars2_300(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_segments(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_301(S, '#', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 302, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 302, Ss, Stack, T, Ts, Tzr);
+yeccpars2_301(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_302(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -2271,12 +2458,16 @@ yeccpars2_302(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_binary(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_303(S, '-|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 196, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 196, Ss, Stack, T, Ts, Tzr);
+yeccpars2_303(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_304(S, '(', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 105, Ss, Stack, T, Ts, Tzr);
 yeccpars2_304(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 107, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 107, Ss, Stack, T, Ts, Tzr);
+yeccpars2_304(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_305(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2284,7 +2475,9 @@ yeccpars2_305(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_anno_variables(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_306(S, '->', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 307, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 307, Ss, Stack, T, Ts, Tzr);
+yeccpars2_306(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_307: see yeccpars2_108
 
@@ -2294,12 +2487,16 @@ yeccpars2_308(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_fun_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_309(S, '-|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 310, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 310, Ss, Stack, T, Ts, Tzr);
+yeccpars2_309(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_310: see yeccpars2_63
 
 yeccpars2_311(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 312, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 312, Ss, Stack, T, Ts, Tzr);
+yeccpars2_311(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_312(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -2317,7 +2514,9 @@ yeccpars2_314(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_module_definition(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_315(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 316, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 316, Ss, Stack, T, Ts, Tzr);
+yeccpars2_315(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_316: see yeccpars2_4
 
@@ -2332,15 +2531,21 @@ yeccpars2_318(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_58(_S, Cat, [318 | Ss], NewStack, T, Ts, Tzr).
 
 yeccpars2_319(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 320, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 320, Ss, Stack, T, Ts, Tzr);
+yeccpars2_319(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_320(S, '-|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 321, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 321, Ss, Stack, T, Ts, Tzr);
+yeccpars2_320(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_321: see yeccpars2_63
 
 yeccpars2_322(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 323, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 323, Ss, Stack, T, Ts, Tzr);
+yeccpars2_322(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_323(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_,_,_,_,_,_|Nss] = Ss,
diff --git a/bootstrap/lib/kernel/ebin/code.beam b/bootstrap/lib/kernel/ebin/code.beam
index bca88dfe7c..18947d98c3 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 8f95f91348..3d66c1c282 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 b432811d6e..f41ed33d9a 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 96f4e1953f..bbc42326cb 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/dist_ac.beam b/bootstrap/lib/kernel/ebin/dist_ac.beam
index 59c75602ec..29be008e0c 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 167a70e99d..93f0a3754a 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_epmd.beam b/bootstrap/lib/kernel/ebin/erl_epmd.beam
index 09746d0403..847ed69e23 100644
--- a/bootstrap/lib/kernel/ebin/erl_epmd.beam
+++ b/bootstrap/lib/kernel/ebin/erl_epmd.beam
diff --git a/bootstrap/lib/kernel/ebin/file.beam b/bootstrap/lib/kernel/ebin/file.beam
index 2504c16024..343cee3fe7 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 ce14722f4c..f7c170fd28 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/gen_sctp.beam b/bootstrap/lib/kernel/ebin/gen_sctp.beam
index a55e9090a5..1d51915a4f 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 fa87a6726b..f684fe1bf2 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 5af947d638..1591c85048 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 20053eb877..525d4ebdfa 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 00d03a24f5..42be2aad4c 100644
--- a/bootstrap/lib/kernel/ebin/global_group.beam
+++ b/bootstrap/lib/kernel/ebin/global_group.beam
diff --git a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
index d06aba7fe9..0c39512bb3 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 c712be3bdc..622110bcdb 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 0e71998ed9..d9917f0347 100644
--- a/bootstrap/lib/kernel/ebin/inet6_sctp.beam
+++ b/bootstrap/lib/kernel/ebin/inet6_sctp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_config.beam b/bootstrap/lib/kernel/ebin/inet_config.beam
index edc1e2f6fb..b3061fffa1 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 2bba1e88c9..095d624ea7 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_parse.beam b/bootstrap/lib/kernel/ebin/inet_parse.beam
index 914397158a..5afff695e5 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 0167a10b36..f1433006b7 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 a4d234911d..bfd6b4b252 100644
--- a/bootstrap/lib/kernel/ebin/inet_sctp.beam
+++ b/bootstrap/lib/kernel/ebin/inet_sctp.beam
diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app
index 93b0c3d78e..5ea0891375 100644
--- a/bootstrap/lib/kernel/ebin/kernel.app
+++ b/bootstrap/lib/kernel/ebin/kernel.app
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 1996-2009. 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%
 %%
 %% This is an -*- erlang -*- file.
@@ -21,7 +21,7 @@
 {application, kernel,
  [
   {description, "ERTS  CXC 138 10"},
-  {vsn, "2.14"},
+  {vsn, "2.14.2"},
   {modules, [application,
 	     application_controller,
 	     application_master,
diff --git a/bootstrap/lib/kernel/ebin/kernel.appup b/bootstrap/lib/kernel/ebin/kernel.appup
index 013c65b3e2..77f9f42fea 100644
--- a/bootstrap/lib/kernel/ebin/kernel.appup
+++ b/bootstrap/lib/kernel/ebin/kernel.appup
@@ -1 +1 @@
-{"2.14",[],[]}.
+{"2.14.2",[],[]}.
diff --git a/bootstrap/lib/kernel/ebin/kernel.beam b/bootstrap/lib/kernel/ebin/kernel.beam
index 471ab154e8..e1db5986dc 100644
--- a/bootstrap/lib/kernel/ebin/kernel.beam
+++ b/bootstrap/lib/kernel/ebin/kernel.beam
diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam
index 562ee24678..1245322a7d 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 4b3bcf80dd..e73189921f 100644
--- a/bootstrap/lib/kernel/ebin/os.beam
+++ b/bootstrap/lib/kernel/ebin/os.beam
diff --git a/bootstrap/lib/kernel/include/file.hrl b/bootstrap/lib/kernel/include/file.hrl
index b46400ca26..3889bce393 100644
--- a/bootstrap/lib/kernel/include/file.hrl
+++ b/bootstrap/lib/kernel/include/file.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
diff --git a/bootstrap/lib/kernel/include/inet.hrl b/bootstrap/lib/kernel/include/inet.hrl
index 94dd269f7e..929b2ee294 100644
--- a/bootstrap/lib/kernel/include/inet.hrl
+++ b/bootstrap/lib/kernel/include/inet.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 1997-2009. 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%
 %%
 %% This record is returned by inet:gethostbyaddr/2 and inet:gethostbyname/2.
diff --git a/bootstrap/lib/kernel/include/inet_sctp.hrl b/bootstrap/lib/kernel/include/inet_sctp.hrl
index 83f95e05af..169ba013aa 100644
--- a/bootstrap/lib/kernel/include/inet_sctp.hrl
+++ b/bootstrap/lib/kernel/include/inet_sctp.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 2007-2009. 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%
 %% 
 %% SCTP protocol contribution by Leonid Timochouk and Serge Aleynikov.
diff --git a/bootstrap/lib/orber/include/Makefile b/bootstrap/lib/orber/include/Makefile
index 08745e5727..219b7085e6 100644
--- a/bootstrap/lib/orber/include/Makefile
+++ b/bootstrap/lib/orber/include/Makefile
@@ -1,19 +1,19 @@
 #
 # %CopyrightBegin%
-#
-# Copyright Ericsson AB 2008-2010. All Rights Reserved.
-#
+# 
+# Copyright Ericsson AB 1998-2009. 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%
 #
 #
diff --git a/bootstrap/lib/orber/include/corba.hrl b/bootstrap/lib/orber/include/corba.hrl
index c5d2d50ea0..b9869855bf 100644
--- a/bootstrap/lib/orber/include/corba.hrl
+++ b/bootstrap/lib/orber/include/corba.hrl
@@ -1,20 +1,20 @@
 %%--------------------------------------------------------------------
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 1997-2009. 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%
 %%
 %%
diff --git a/bootstrap/lib/orber/include/ifr_types.hrl b/bootstrap/lib/orber/include/ifr_types.hrl
index 798f1c30a1..144ec7f8a1 100644
--- a/bootstrap/lib/orber/include/ifr_types.hrl
+++ b/bootstrap/lib/orber/include/ifr_types.hrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
diff --git a/bootstrap/lib/orber/include/orber_pi.hrl b/bootstrap/lib/orber/include/orber_pi.hrl
index 2b846bc814..84231758fe 100644
--- a/bootstrap/lib/orber/include/orber_pi.hrl
+++ b/bootstrap/lib/orber/include/orber_pi.hrl
@@ -1,20 +1,20 @@
 %%----------------------------------------------------------------------
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 2000-2009. 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%
 %%
 %%
diff --git a/bootstrap/lib/stdlib/ebin/beam_lib.beam b/bootstrap/lib/stdlib/ebin/beam_lib.beam
index e7ba44d542..04681ac12d 100644
--- a/bootstrap/lib/stdlib/ebin/beam_lib.beam
+++ b/bootstrap/lib/stdlib/ebin/beam_lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/c.beam b/bootstrap/lib/stdlib/ebin/c.beam
index 099bb5ad90..af54466541 100644
--- a/bootstrap/lib/stdlib/ebin/c.beam
+++ b/bootstrap/lib/stdlib/ebin/c.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets.beam b/bootstrap/lib/stdlib/ebin/dets.beam
index ccd277b7ad..4b6e3756e9 100644
--- a/bootstrap/lib/stdlib/ebin/dets.beam
+++ b/bootstrap/lib/stdlib/ebin/dets.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets_utils.beam b/bootstrap/lib/stdlib/ebin/dets_utils.beam
index b0c3e351d2..817ded2d62 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_v8.beam b/bootstrap/lib/stdlib/ebin/dets_v8.beam
index f48768ca53..968b9bcb28 100644
--- a/bootstrap/lib/stdlib/ebin/dets_v8.beam
+++ b/bootstrap/lib/stdlib/ebin/dets_v8.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets_v9.beam b/bootstrap/lib/stdlib/ebin/dets_v9.beam
index 0694437929..355c5819cf 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 ebf01cb9b5..ee24ed8f47 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 38195e8957..c68611ccdc 100644
--- a/bootstrap/lib/stdlib/ebin/digraph.beam
+++ b/bootstrap/lib/stdlib/ebin/digraph.beam
diff --git a/bootstrap/lib/stdlib/ebin/epp.beam b/bootstrap/lib/stdlib/ebin/epp.beam
index 8059231d6e..0483b561d4 100644
--- a/bootstrap/lib/stdlib/ebin/epp.beam
+++ b/bootstrap/lib/stdlib/ebin/epp.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_compile.beam b/bootstrap/lib/stdlib/ebin/erl_compile.beam
index 3f0cb585e8..c5d7557a15 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_expand_records.beam b/bootstrap/lib/stdlib/ebin/erl_expand_records.beam
index 983fe23879..81936036ae 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 588f761199..8d080bdacc 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 6862410a3a..9b54fff03b 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 426bd23e36..4d07a75daf 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_scan.beam b/bootstrap/lib/stdlib/ebin/erl_scan.beam
index cffdda03ae..1420d376f2 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 369e5a8c6d..7cf0571935 100644
--- a/bootstrap/lib/stdlib/ebin/erl_tar.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_tar.beam
diff --git a/bootstrap/lib/stdlib/ebin/escript.beam b/bootstrap/lib/stdlib/ebin/escript.beam
index 15f1cb8354..5c09e4aa54 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 bcb1b9684c..9ade9e2edd 100644
--- a/bootstrap/lib/stdlib/ebin/ets.beam
+++ b/bootstrap/lib/stdlib/ebin/ets.beam
diff --git a/bootstrap/lib/stdlib/ebin/file_sorter.beam b/bootstrap/lib/stdlib/ebin/file_sorter.beam
index c27d4e141f..29eb281856 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 8a59a62379..7c1ba41e59 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 4cdb6064d2..69af1ef3c2 100644
--- a/bootstrap/lib/stdlib/ebin/filename.beam
+++ b/bootstrap/lib/stdlib/ebin/filename.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_event.beam b/bootstrap/lib/stdlib/ebin/gen_event.beam
index 264071fe5f..79a037d8c8 100644
--- a/bootstrap/lib/stdlib/ebin/gen_event.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_event.beam
diff --git a/bootstrap/lib/stdlib/ebin/io.beam b/bootstrap/lib/stdlib/ebin/io.beam
index 36c276166c..fd788a8160 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 c0af612d77..23d5122581 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_fread.beam b/bootstrap/lib/stdlib/ebin/io_lib_fread.beam
index bebe0a6c75..a06b3d3c8a 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/ms_transform.beam b/bootstrap/lib/stdlib/ebin/ms_transform.beam
index 918c2537ea..42335a6a00 100644
--- a/bootstrap/lib/stdlib/ebin/ms_transform.beam
+++ b/bootstrap/lib/stdlib/ebin/ms_transform.beam
diff --git a/bootstrap/lib/stdlib/ebin/ordsets.beam b/bootstrap/lib/stdlib/ebin/ordsets.beam
index c3f2c3b7b1..48effb764e 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 cac4a97ae0..709d1379dd 100644
--- a/bootstrap/lib/stdlib/ebin/otp_internal.beam
+++ b/bootstrap/lib/stdlib/ebin/otp_internal.beam
diff --git a/bootstrap/lib/stdlib/ebin/proc_lib.beam b/bootstrap/lib/stdlib/ebin/proc_lib.beam
index f6c7a4f748..690b3efe07 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 bed96c6b1a..9b63909024 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 2e05a4c546..da0adc0c23 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 92b1bc8bee..141891308f 100644
--- a/bootstrap/lib/stdlib/ebin/qlc_pt.beam
+++ b/bootstrap/lib/stdlib/ebin/qlc_pt.beam
diff --git a/bootstrap/lib/stdlib/ebin/sets.beam b/bootstrap/lib/stdlib/ebin/sets.beam
index 9be4e8ab5b..e95a93e5cf 100644
--- a/bootstrap/lib/stdlib/ebin/sets.beam
+++ b/bootstrap/lib/stdlib/ebin/sets.beam
diff --git a/bootstrap/lib/stdlib/ebin/sofs.beam b/bootstrap/lib/stdlib/ebin/sofs.beam
index 51af30d7e8..aa12f15cdc 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 880e85627e..6aac1e2f19 100644
--- a/bootstrap/lib/stdlib/ebin/stdlib.app
+++ b/bootstrap/lib/stdlib/ebin/stdlib.app
@@ -2,7 +2,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -19,7 +19,7 @@
 %%
 {application, stdlib,
  [{description, "ERTS  CXC 138 10"},
-  {vsn, "1.17"},
+  {vsn, "1.17.2"},
   {modules, [array,
 	     base64,
 	     beam_lib,
diff --git a/bootstrap/lib/stdlib/ebin/stdlib.appup b/bootstrap/lib/stdlib/ebin/stdlib.appup
index 097f2b47ed..ca89dcf43a 100644
--- a/bootstrap/lib/stdlib/ebin/stdlib.appup
+++ b/bootstrap/lib/stdlib/ebin/stdlib.appup
@@ -1 +1 @@
-{"1.17",[],[]}.
+{"1.17.2",[],[]}.
diff --git a/bootstrap/lib/stdlib/ebin/string.beam b/bootstrap/lib/stdlib/ebin/string.beam
index 3c3eaf6ed2..0de0b44cb8 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 9cbf8912fe..13cb6032a9 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 3880293d47..686078826d 100644
--- a/bootstrap/lib/stdlib/ebin/supervisor_bridge.beam
+++ b/bootstrap/lib/stdlib/ebin/supervisor_bridge.beam
diff --git a/bootstrap/lib/stdlib/ebin/timer.beam b/bootstrap/lib/stdlib/ebin/timer.beam
index a20cc97935..1f84ff37ac 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 4ca769b9a2..cc3a3c1859 100644
--- a/bootstrap/lib/stdlib/ebin/unicode.beam
+++ b/bootstrap/lib/stdlib/ebin/unicode.beam
diff --git a/bootstrap/lib/stdlib/ebin/zip.beam b/bootstrap/lib/stdlib/ebin/zip.beam
index 6c5b31cd1f..6aa0cc32b2 100644
--- a/bootstrap/lib/stdlib/ebin/zip.beam
+++ b/bootstrap/lib/stdlib/ebin/zip.beam
diff --git a/bootstrap/lib/stdlib/egen/erl_parse.erl b/bootstrap/lib/stdlib/egen/erl_parse.erl
index 46456b51c5..f15deb37f1 100644
--- a/bootstrap/lib/stdlib/egen/erl_parse.erl
+++ b/bootstrap/lib/stdlib/egen/erl_parse.erl
@@ -556,11 +556,11 @@ get_attribute(L, Name) ->
 get_attributes(L) ->
     erl_scan:attributes_info(L).
 
--file("/usr/local/otp/releases/otp_beam_linux_sles10_x64_r13b02_patched/lib/parsetools-2.0/include/yeccpre.hrl", 0).
+-file("/usr/local/otp/releases/sles10_64_R14B_patched/lib/parsetools-2.0.4/include/yeccpre.hrl", 0).
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -579,33 +579,32 @@ get_attributes(L) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % The parser generator will insert appropriate declarations before this line.%
 
--type(yecc_ret() :: {'error', _} | {'ok', _}).
+-type yecc_ret() :: {'error', _} | {'ok', _}.
 
 -spec parse(Tokens :: list()) -> yecc_ret().
 parse(Tokens) ->
     yeccpars0(Tokens, {no_func, no_line}, 0, [], []).
 
--spec(parse_and_scan/1 ::
-      ({function() | {atom(), atom()}, [_]} | {atom(), atom(), [_]}) ->
-            yecc_ret()).
+-spec parse_and_scan({function() | {atom(), atom()}, [_]}
+                     | {atom(), atom(), [_]}) -> yecc_ret().
 parse_and_scan({F, A}) -> % Fun or {M, F}
     yeccpars0([], {{F, A}, no_line}, 0, [], []);
 parse_and_scan({M, F, A}) ->
     yeccpars0([], {{{M, F}, A}, no_line}, 0, [], []).
 
--spec(format_error/1 :: (any()) -> [char() | list()]).
+-spec format_error(any()) -> [char() | list()].
 format_error(Message) ->
     case io_lib:deep_char_list(Message) of
-	true ->
-	    Message;
-	_ ->
-	    io_lib:write(Message)
+        true ->
+            Message;
+        _ ->
+            io_lib:write(Message)
     end.
 
-% To be used in grammar files to throw an error message to the parser
-% toplevel. Doesn't have to be exported!
+%% To be used in grammar files to throw an error message to the parser
+%% toplevel. Doesn't have to be exported!
 -compile({nowarn_unused_function, return_error/2}).
--spec(return_error/2 :: (integer(), any()) -> no_return()).
+-spec return_error(integer(), any()) -> no_return().
 return_error(Line, Message) ->
     throw({error, {Line, ?MODULE, Message}}).
 
@@ -617,10 +616,7 @@ yeccpars0(Tokens, Tzr, State, States, Vstack) ->
         error: Error ->
             Stacktrace = erlang:get_stacktrace(),
             try yecc_error_type(Error, Stacktrace) of
-                {syntax_error, Token} ->
-                    yeccerror(Token);
-                {missing_in_goto_table=Tag, Symbol, State} ->
-                    Desc = {Symbol, State, Tag},
+                Desc ->
                     erlang:raise(error, {yecc_bug, ?CODE_VERSION, Desc},
                                  Stacktrace)
             catch _:_ -> erlang:raise(error, Error, Stacktrace)
@@ -630,13 +626,15 @@ yeccpars0(Tokens, Tzr, State, States, Vstack) ->
             Error
     end.
 
-yecc_error_type(function_clause, [{?MODULE,F,[State,_,_,_,Token,_,_]} | _]) ->
+yecc_error_type(function_clause, [{?MODULE,F,ArityOrArgs} | _]) ->
     case atom_to_list(F) of
-        "yeccpars2" ++ _ ->
-            {syntax_error, Token};
         "yeccgoto_" ++ SymbolL ->
             {ok,[{atom,_,Symbol}],_} = erl_scan:string(SymbolL),
-            {missing_in_goto_table, Symbol, State}
+            State = case ArityOrArgs of
+                        [S,_,_,_,_,_,_] -> S;
+                        _ -> state_is_unknown
+                    end,
+            {Symbol, State, missing_in_goto_table}
     end.
 
 yeccpars1([Token | Tokens], Tzr, State, States, Vstack) ->
@@ -644,7 +642,7 @@ yeccpars1([Token | Tokens], Tzr, State, States, Vstack) ->
 yeccpars1([], {{F, A},_Line}, State, States, Vstack) ->
     case apply(F, A) of
         {ok, Tokens, Endline} ->
-	    yeccpars1(Tokens, {{F, A}, Endline}, State, States, Vstack);
+            yeccpars1(Tokens, {{F, A}, Endline}, State, States, Vstack);
         {eof, Endline} ->
             yeccpars1([], {no_func, Endline}, State, States, Vstack);
         {error, Descriptor, _Endline} ->
@@ -677,7 +675,7 @@ yeccpars1(State1, State, States, Vstack, Token0, [], {no_func, Line}) ->
     yeccpars2(State, '$end', [State1 | States], [Token0 | Vstack],
               yecc_end(Line), [], {no_func, Line}).
 
-% For internal use only.
+%% For internal use only.
 yecc_end({Line,_Column}) ->
     {'$end', Line};
 yecc_end(Line) ->
@@ -701,11 +699,13 @@ yecctoken_end_location(Token) ->
         yecctoken_location(Token)
     end.
 
+-compile({nowarn_unused_function, yeccerror/1}).
 yeccerror(Token) ->
     Text = yecctoken_to_string(Token),
     Location = yecctoken_location(Token),
     {error, {Location, ?MODULE, ["syntax error before: ", Text]}}.
 
+-compile({nowarn_unused_function, yecctoken_to_string/1}).
 yecctoken_to_string(Token) ->
     case catch erl_scan:token_info(Token, text) of
         {text, Txt} -> Txt;
@@ -718,6 +718,7 @@ yecctoken_location(Token) ->
         _ -> element(2, Token)
     end.
 
+-compile({nowarn_unused_function, yecctoken2string/1}).
 yecctoken2string({atom, _, A}) -> io_lib:write(A);
 yecctoken2string({integer,_,N}) -> io_lib:write(N);
 yecctoken2string({float,_,F}) -> io_lib:write(F);
@@ -738,7 +739,7 @@ yecctoken2string(Other) ->
 
 
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 741).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 742).
 
 yeccpars2(0=S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_0(S, Cat, Ss, Stack, T, Ts, Tzr);
@@ -1671,12 +1672,14 @@ yeccpars2(462=S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2(464=S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %%  yeccpars2_464(S, Cat, Ss, Stack, T, Ts, Tzr);
 yeccpars2(Other, _, _, _, _, _, _) ->
- erlang:error({yecc_bug,"1.3",{missing_state_in_action_table, Other}}).
+ erlang:error({yecc_bug,"1.4",{missing_state_in_action_table, Other}}).
 
 yeccpars2_0(S, '-', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 9, Ss, Stack, T, Ts, Tzr);
 yeccpars2_0(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 10, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 10, Ss, Stack, T, Ts, Tzr);
+yeccpars2_0(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_1(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  NewStack = yeccpars2_1_(Stack),
@@ -1689,7 +1692,9 @@ yeccpars2_2(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_rule_clauses(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_3(S, dot, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 459, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 459, Ss, Stack, T, Ts, Tzr);
+yeccpars2_3(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_4(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  NewStack = yeccpars2_4_(Stack),
@@ -1702,21 +1707,31 @@ yeccpars2_5(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_function_clauses(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_6(S, dot, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 453, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 453, Ss, Stack, T, Ts, Tzr);
+yeccpars2_6(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
-yeccpars2_7(_S, '$end', _Ss, Stack,  _T, _Ts, _Tzr) ->
- {ok, hd(Stack)}.
+yeccpars2_7(_S, '$end', _Ss, Stack, _T, _Ts, _Tzr) ->
+ {ok, hd(Stack)};
+yeccpars2_7(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_8(S, dot, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 452, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 452, Ss, Stack, T, Ts, Tzr);
+yeccpars2_8(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_9(S, atom, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 292, Ss, Stack, T, Ts, Tzr);
 yeccpars2_9(S, spec, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 293, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 293, Ss, Stack, T, Ts, Tzr);
+yeccpars2_9(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_10(S, '(', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 13, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 13, Ss, Stack, T, Ts, Tzr);
+yeccpars2_10(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_11(S, 'when', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 84, Ss, Stack, T, Ts, Tzr);
@@ -1780,7 +1795,9 @@ yeccpars2_cont_13(S, 'receive', Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_cont_13(S, string, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 65, Ss, Stack, T, Ts, Tzr);
 yeccpars2_cont_13(S, 'try', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 66, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 66, Ss, Stack, T, Ts, Tzr);
+yeccpars2_cont_13(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_14(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_expr_max(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
@@ -1833,7 +1850,9 @@ yeccpars2_25(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_expr_max(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_26(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 280, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 280, Ss, Stack, T, Ts, Tzr);
+yeccpars2_26(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_27(S, '#', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 275, Ss, Stack, T, Ts, Tzr);
@@ -1954,7 +1973,9 @@ yeccpars2_43(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_expr_max(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_44(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 211, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 211, Ss, Stack, T, Ts, Tzr);
+yeccpars2_44(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_45(S, '#', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 44, Ss, Stack, T, Ts, Tzr);
@@ -1993,7 +2014,9 @@ yeccpars2_48(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_prefix_op(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_49(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 208, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 208, Ss, Stack, T, Ts, Tzr);
+yeccpars2_49(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_50(S, '(', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 45, Ss, Stack, T, Ts, Tzr);
@@ -2064,7 +2087,9 @@ yeccpars2_58(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_59(S, '(', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 13, Ss, Stack, T, Ts, Tzr);
 yeccpars2_59(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 152, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 152, Ss, Stack, T, Ts, Tzr);
+yeccpars2_59(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_60: see yeccpars2_45
 
@@ -2075,7 +2100,9 @@ yeccpars2_62(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_prefix_op(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_63(S, '[', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 127, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 127, Ss, Stack, T, Ts, Tzr);
+yeccpars2_63(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_64(S, '#', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 44, Ss, Stack, T, Ts, Tzr);
@@ -2142,7 +2169,9 @@ yeccpars2_68(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_cont_13(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_69(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 71, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 71, Ss, Stack, T, Ts, Tzr);
+yeccpars2_69(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_70(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -2202,7 +2231,9 @@ yeccpars2_77(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_78(S, 'after', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 74, Ss, Stack, T, Ts, Tzr);
 yeccpars2_78(S, 'catch', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 75, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 75, Ss, Stack, T, Ts, Tzr);
+yeccpars2_78(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_79(S, ';', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 80, Ss, Stack, T, Ts, Tzr);
@@ -2223,7 +2254,9 @@ yeccpars2_82(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_try_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_83(S, '->', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 90, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 90, Ss, Stack, T, Ts, Tzr);
+yeccpars2_83(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_84: see yeccpars2_45
 
@@ -2260,7 +2293,9 @@ yeccpars2_91(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_92(S, 'after', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 109, Ss, Stack, T, Ts, Tzr);
 yeccpars2_92(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 110, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 110, Ss, Stack, T, Ts, Tzr);
+yeccpars2_92(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_93(S, ';', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 107, Ss, Stack, T, Ts, Tzr);
@@ -2336,7 +2371,9 @@ yeccpars2_110(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_try_catch(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_111(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 112, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 112, Ss, Stack, T, Ts, Tzr);
+yeccpars2_111(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_112(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -2344,7 +2381,9 @@ yeccpars2_112(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_try_catch(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_113(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 114, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 114, Ss, Stack, T, Ts, Tzr);
+yeccpars2_113(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_114(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2359,14 +2398,18 @@ yeccpars2_115(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_116(S, 'after', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 121, Ss, Stack, T, Ts, Tzr);
 yeccpars2_116(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 122, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 122, Ss, Stack, T, Ts, Tzr);
+yeccpars2_116(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_117: see yeccpars2_45
 
 %% yeccpars2_118: see yeccpars2_83
 
 yeccpars2_119(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 120, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 120, Ss, Stack, T, Ts, Tzr);
+yeccpars2_119(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_120(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -2383,7 +2426,9 @@ yeccpars2_122(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_123: see yeccpars2_83
 
 yeccpars2_124(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 125, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 125, Ss, Stack, T, Ts, Tzr);
+yeccpars2_124(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_125(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_,_|Nss] = Ss,
@@ -2391,17 +2436,23 @@ yeccpars2_125(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_receive_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_126(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 141, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 141, Ss, Stack, T, Ts, Tzr);
+yeccpars2_126(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_127: see yeccpars2_45
 
 yeccpars2_128(S, '||', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 129, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 129, Ss, Stack, T, Ts, Tzr);
+yeccpars2_128(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_129: see yeccpars2_45
 
 yeccpars2_130(S, ']', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 140, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 140, Ss, Stack, T, Ts, Tzr);
+yeccpars2_130(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_131(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 138, Ss, Stack, T, Ts, Tzr);
@@ -2451,7 +2502,9 @@ yeccpars2_141(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_query_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_142(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 148, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 148, Ss, Stack, T, Ts, Tzr);
+yeccpars2_142(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_143(S, ';', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 146, Ss, Stack, T, Ts, Tzr);
@@ -2479,7 +2532,9 @@ yeccpars2_148(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_if_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_149(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 163, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 163, Ss, Stack, T, Ts, Tzr);
+yeccpars2_149(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_150(S, ';', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 161, Ss, Stack, T, Ts, Tzr);
@@ -2496,19 +2551,29 @@ yeccpars2_151(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_152(S, '/', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 153, Ss, Stack, T, Ts, Tzr);
 yeccpars2_152(S, ':', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 154, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 154, Ss, Stack, T, Ts, Tzr);
+yeccpars2_152(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_153(S, integer, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 158, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 158, Ss, Stack, T, Ts, Tzr);
+yeccpars2_153(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_154(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 155, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 155, Ss, Stack, T, Ts, Tzr);
+yeccpars2_154(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_155(S, '/', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 156, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 156, Ss, Stack, T, Ts, Tzr);
+yeccpars2_155(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_156(S, integer, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 157, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 157, Ss, Stack, T, Ts, Tzr);
+yeccpars2_156(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_157(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_,_|Nss] = Ss,
@@ -2545,12 +2610,16 @@ yeccpars2_164(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_165(S, 'of', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 166, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 166, Ss, Stack, T, Ts, Tzr);
+yeccpars2_165(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_166: see yeccpars2_45
 
 yeccpars2_167(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 168, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 168, Ss, Stack, T, Ts, Tzr);
+yeccpars2_167(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_168(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -2558,7 +2627,9 @@ yeccpars2_168(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_case_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_169(S, 'end', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 170, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 170, Ss, Stack, T, Ts, Tzr);
+yeccpars2_169(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_170(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2589,7 +2660,9 @@ yeccpars2_175(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_176: see yeccpars2_45
 
 yeccpars2_177(S, ']', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 178, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 178, Ss, Stack, T, Ts, Tzr);
+yeccpars2_177(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_178(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2601,7 +2674,9 @@ yeccpars2_179(S, ',', Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_179(S, ']', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 175, Ss, Stack, T, Ts, Tzr);
 yeccpars2_179(S, '|', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 176, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 176, Ss, Stack, T, Ts, Tzr);
+yeccpars2_179(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_180(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2634,7 +2709,9 @@ yeccpars2_184(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_expr_max(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_185(S, '>>', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 190, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 190, Ss, Stack, T, Ts, Tzr);
+yeccpars2_185(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_186(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 188, Ss, Stack, T, Ts, Tzr);
@@ -2679,7 +2756,9 @@ yeccpars2_190(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_191: see yeccpars2_45
 
 yeccpars2_192(S, '>>', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 193, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 193, Ss, Stack, T, Ts, Tzr);
+yeccpars2_192(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_193(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -2708,7 +2787,9 @@ yeccpars2_198(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_bin_element(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_199(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 202, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 202, Ss, Stack, T, Ts, Tzr);
+yeccpars2_199(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_200(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -2728,7 +2809,9 @@ yeccpars2_202(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_bit_type(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_203(S, integer, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 204, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 204, Ss, Stack, T, Ts, Tzr);
+yeccpars2_203(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_204(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2753,7 +2836,9 @@ yeccpars2_208(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_expr_900(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_209(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 210, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 210, Ss, Stack, T, Ts, Tzr);
+yeccpars2_209(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_210(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2763,7 +2848,9 @@ yeccpars2_210(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_211(S, '.', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 213, Ss, Stack, T, Ts, Tzr);
 yeccpars2_211(S, '{', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 214, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 214, Ss, Stack, T, Ts, Tzr);
+yeccpars2_211(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_212(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -2771,7 +2858,9 @@ yeccpars2_212(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_record_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_213(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 227, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 227, Ss, Stack, T, Ts, Tzr);
+yeccpars2_213(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_214(S, '}', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 219, Ss, Stack, T, Ts, Tzr);
@@ -2779,7 +2868,9 @@ yeccpars2_214(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_224(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_215(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 226, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 226, Ss, Stack, T, Ts, Tzr);
+yeccpars2_215(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_216(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 224, Ss, Stack, T, Ts, Tzr);
@@ -2788,10 +2879,14 @@ yeccpars2_216(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_record_fields(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_217(S, '=', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 222, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 222, Ss, Stack, T, Ts, Tzr);
+yeccpars2_217(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_218(S, '=', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 220, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 220, Ss, Stack, T, Ts, Tzr);
+yeccpars2_218(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_219(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -2815,7 +2910,9 @@ yeccpars2_223(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_224(S, atom, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 217, Ss, Stack, T, Ts, Tzr);
 yeccpars2_224(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 218, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 218, Ss, Stack, T, Ts, Tzr);
+yeccpars2_224(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_225(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -3006,7 +3103,9 @@ yeccpars2_270(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_function_call(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_271(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 274, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 274, Ss, Stack, T, Ts, Tzr);
+yeccpars2_271(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_272: see yeccpars2_181
 
@@ -3021,12 +3120,16 @@ yeccpars2_274(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_expr_900(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_275(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 276, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 276, Ss, Stack, T, Ts, Tzr);
+yeccpars2_275(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_276(S, '.', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 278, Ss, Stack, T, Ts, Tzr);
 yeccpars2_276(S, '{', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 214, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 214, Ss, Stack, T, Ts, Tzr);
+yeccpars2_276(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_277(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_|Nss] = Ss,
@@ -3034,7 +3137,9 @@ yeccpars2_277(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_record_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_278(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 279, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 279, Ss, Stack, T, Ts, Tzr);
+yeccpars2_278(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_279(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -3052,12 +3157,16 @@ yeccpars2_281(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_expr_600(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_282(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 283, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 283, Ss, Stack, T, Ts, Tzr);
+yeccpars2_282(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_283(S, '.', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 285, Ss, Stack, T, Ts, Tzr);
 yeccpars2_283(S, '{', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 214, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 214, Ss, Stack, T, Ts, Tzr);
+yeccpars2_283(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_284(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_|Nss] = Ss,
@@ -3065,7 +3174,9 @@ yeccpars2_284(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_record_expr(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_285(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 286, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 286, Ss, Stack, T, Ts, Tzr);
+yeccpars2_285(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_286(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -3075,7 +3186,9 @@ yeccpars2_286(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_287(S, '->', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 90, Ss, Stack, T, Ts, Tzr);
 yeccpars2_287(S, ':-', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 290, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 290, Ss, Stack, T, Ts, Tzr);
+yeccpars2_287(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_288(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_|Nss] = Ss,
@@ -3122,7 +3235,9 @@ yeccpars2_292(S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_293(S, '(', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 296, Ss, Stack, T, Ts, Tzr);
 yeccpars2_293(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 297, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 297, Ss, Stack, T, Ts, Tzr);
+yeccpars2_293(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_294(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -3130,10 +3245,14 @@ yeccpars2_294(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_attribute(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_295(S, '(', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 310, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 310, Ss, Stack, T, Ts, Tzr);
+yeccpars2_295(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_296(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 297, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 297, Ss, Stack, T, Ts, Tzr);
+yeccpars2_296(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_297(S, '/', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 298, Ss, Stack, T, Ts, Tzr);
@@ -3143,10 +3262,14 @@ yeccpars2_297(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_spec_fun(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_298(S, integer, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 304, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 304, Ss, Stack, T, Ts, Tzr);
+yeccpars2_298(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_299(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 300, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 300, Ss, Stack, T, Ts, Tzr);
+yeccpars2_299(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_300(S, '/', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 301, Ss, Stack, T, Ts, Tzr);
@@ -3156,10 +3279,14 @@ yeccpars2_300(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_spec_fun(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_301(S, integer, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 302, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 302, Ss, Stack, T, Ts, Tzr);
+yeccpars2_301(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_302(S, '::', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 303, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 303, Ss, Stack, T, Ts, Tzr);
+yeccpars2_302(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_303(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_,_|Nss] = Ss,
@@ -3167,7 +3294,9 @@ yeccpars2_303(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_spec_fun(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_304(S, '::', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 305, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 305, Ss, Stack, T, Ts, Tzr);
+yeccpars2_304(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_305(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_|Nss] = Ss,
@@ -3177,7 +3306,9 @@ yeccpars2_305(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_306: see yeccpars2_295
 
 yeccpars2_307(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 423, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 423, Ss, Stack, T, Ts, Tzr);
+yeccpars2_307(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_308(S, ';', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 421, Ss, Stack, T, Ts, Tzr);
@@ -3220,7 +3351,9 @@ yeccpars2_cont_310(S, 'fun', Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_cont_310(S, integer, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 328, Ss, Stack, T, Ts, Tzr);
 yeccpars2_cont_310(S, '{', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 330, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 330, Ss, Stack, T, Ts, Tzr);
+yeccpars2_cont_310(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_311(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type_400(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
@@ -3270,7 +3403,9 @@ yeccpars2_315(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type_500(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_316(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 398, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 398, Ss, Stack, T, Ts, Tzr);
+yeccpars2_316(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_317(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_top_type(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
@@ -3290,7 +3425,9 @@ yeccpars2_320(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_321(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 384, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 384, Ss, Stack, T, Ts, Tzr);
+yeccpars2_321(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_322(S, '+', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 47, Ss, Stack, T, Ts, Tzr);
@@ -3306,12 +3443,16 @@ yeccpars2_322(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_cont_310(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_323(S, '->', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 380, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 380, Ss, Stack, T, Ts, Tzr);
+yeccpars2_323(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_324(S, '>>', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 365, Ss, Stack, T, Ts, Tzr);
 yeccpars2_324(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 366, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 366, Ss, Stack, T, Ts, Tzr);
+yeccpars2_324(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_325(S, '+', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 47, Ss, Stack, T, Ts, Tzr);
@@ -3336,7 +3477,9 @@ yeccpars2_326(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_327(S, '(', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 337, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 337, Ss, Stack, T, Ts, Tzr);
+yeccpars2_327(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_328(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
@@ -3362,7 +3505,9 @@ yeccpars2_330(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_cont_310(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_331(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 333, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 333, Ss, Stack, T, Ts, Tzr);
+yeccpars2_331(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_332(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -3398,10 +3543,14 @@ yeccpars2_336(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_337(S, '(', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 340, Ss, Stack, T, Ts, Tzr);
 yeccpars2_337(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 341, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 341, Ss, Stack, T, Ts, Tzr);
+yeccpars2_337(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_338(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 346, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 346, Ss, Stack, T, Ts, Tzr);
+yeccpars2_338(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_339(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_fun_type_100(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
@@ -3429,10 +3578,14 @@ yeccpars2_341(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_342(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 343, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 343, Ss, Stack, T, Ts, Tzr);
+yeccpars2_342(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_343(S, '->', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 344, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 344, Ss, Stack, T, Ts, Tzr);
+yeccpars2_343(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_344: see yeccpars2_322
 
@@ -3462,10 +3615,14 @@ yeccpars2_347(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_cont_310(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_348(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 349, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 349, Ss, Stack, T, Ts, Tzr);
+yeccpars2_348(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_349(S, '(', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 350, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 350, Ss, Stack, T, Ts, Tzr);
+yeccpars2_349(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_350(S, ')', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 352, Ss, Stack, T, Ts, Tzr);
@@ -3483,7 +3640,9 @@ yeccpars2_350(S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_cont_310(S, Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_351(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 353, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 353, Ss, Stack, T, Ts, Tzr);
+yeccpars2_351(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_352(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -3496,7 +3655,9 @@ yeccpars2_353(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_354(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 356, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 356, Ss, Stack, T, Ts, Tzr);
+yeccpars2_354(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_355(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -3511,7 +3672,9 @@ yeccpars2_356(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_357(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 359, Ss, Stack, T, Ts, Tzr);
 yeccpars2_357(S, ']', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 360, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 360, Ss, Stack, T, Ts, Tzr);
+yeccpars2_357(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_358(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -3519,7 +3682,9 @@ yeccpars2_358(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_359(S, '...', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 361, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 361, Ss, Stack, T, Ts, Tzr);
+yeccpars2_359(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_360(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -3527,7 +3692,9 @@ yeccpars2_360(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_361(S, ']', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 362, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 362, Ss, Stack, T, Ts, Tzr);
+yeccpars2_361(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_362(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -3535,12 +3702,16 @@ yeccpars2_362(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_363(S, '>>', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 379, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 379, Ss, Stack, T, Ts, Tzr);
+yeccpars2_363(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_364(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 372, Ss, Stack, T, Ts, Tzr);
 yeccpars2_364(S, '>>', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 373, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 373, Ss, Stack, T, Ts, Tzr);
+yeccpars2_364(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_365(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -3548,7 +3719,9 @@ yeccpars2_365(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_binary_type(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_366(S, ':', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 367, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 367, Ss, Stack, T, Ts, Tzr);
+yeccpars2_366(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_367(S, var, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 369, Ss, Stack, T, Ts, Tzr);
@@ -3573,7 +3746,9 @@ yeccpars2_371(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_bin_unit_type(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_372(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 375, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 375, Ss, Stack, T, Ts, Tzr);
+yeccpars2_372(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_373(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -3581,16 +3756,24 @@ yeccpars2_373(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_binary_type(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_374(S, '>>', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 378, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 378, Ss, Stack, T, Ts, Tzr);
+yeccpars2_374(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_375(S, ':', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 376, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 376, Ss, Stack, T, Ts, Tzr);
+yeccpars2_375(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_376(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 377, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 377, Ss, Stack, T, Ts, Tzr);
+yeccpars2_376(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_377(S, '*', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 370, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 370, Ss, Stack, T, Ts, Tzr);
+yeccpars2_377(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_378(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_,_|Nss] = Ss,
@@ -3610,7 +3793,9 @@ yeccpars2_381(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_fun_type(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_382(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 383, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 383, Ss, Stack, T, Ts, Tzr);
+yeccpars2_382(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_383(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -3618,15 +3803,21 @@ yeccpars2_383(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_384(S, '{', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 385, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 385, Ss, Stack, T, Ts, Tzr);
+yeccpars2_384(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_385(S, atom, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 388, Ss, Stack, T, Ts, Tzr);
 yeccpars2_385(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 389, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 389, Ss, Stack, T, Ts, Tzr);
+yeccpars2_385(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_386(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 394, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 394, Ss, Stack, T, Ts, Tzr);
+yeccpars2_386(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_387(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 392, Ss, Stack, T, Ts, Tzr);
@@ -3635,7 +3826,9 @@ yeccpars2_387(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_field_types(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_388(S, '::', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 390, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 390, Ss, Stack, T, Ts, Tzr);
+yeccpars2_388(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_389(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_|Nss] = Ss,
@@ -3650,7 +3843,9 @@ yeccpars2_391(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_field_type(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_392(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 388, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 388, Ss, Stack, T, Ts, Tzr);
+yeccpars2_392(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_393(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -3675,7 +3870,9 @@ yeccpars2_397(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_top_types(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_398(S, '->', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 399, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 399, Ss, Stack, T, Ts, Tzr);
+yeccpars2_398(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_399: see yeccpars2_322
 
@@ -3743,7 +3940,9 @@ yeccpars2_408(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_409(S, atom, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 412, Ss, Stack, T, Ts, Tzr);
 yeccpars2_409(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 413, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 413, Ss, Stack, T, Ts, Tzr);
+yeccpars2_409(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_410(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -3757,10 +3956,14 @@ yeccpars2_411(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_type_guards(hd(Ss), Cat, Ss, NewStack, T, Ts, Tzr).
 
 yeccpars2_412(S, '(', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 416, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 416, Ss, Stack, T, Ts, Tzr);
+yeccpars2_412(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_413(S, '::', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 414, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 414, Ss, Stack, T, Ts, Tzr);
+yeccpars2_413(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_414: see yeccpars2_322
 
@@ -3772,7 +3975,9 @@ yeccpars2_415(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_416: see yeccpars2_322
 
 yeccpars2_417(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 418, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 418, Ss, Stack, T, Ts, Tzr);
+yeccpars2_417(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_418(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_,_|Nss] = Ss,
@@ -3824,14 +4029,18 @@ yeccpars2_427(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 %% yeccpars2_428: see yeccpars2_45
 
 yeccpars2_429(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 449, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 449, Ss, Stack, T, Ts, Tzr);
+yeccpars2_429(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_430(S, ')', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 210, Ss, Stack, T, Ts, Tzr);
 yeccpars2_430(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 431, Ss, Stack, T, Ts, Tzr);
 yeccpars2_430(S, '::', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 432, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 432, Ss, Stack, T, Ts, Tzr);
+yeccpars2_430(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_431(S, '#', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 44, Ss, Stack, T, Ts, Tzr);
@@ -3871,12 +4080,16 @@ yeccpars2_434(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_typed_attr_val(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_435(S, ')', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 448, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 448, Ss, Stack, T, Ts, Tzr);
+yeccpars2_435(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 %% yeccpars2_436: see yeccpars2_68
 
 yeccpars2_437(S, '}', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 447, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 447, Ss, Stack, T, Ts, Tzr);
+yeccpars2_437(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_438(S, ',', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 444, Ss, Stack, T, Ts, Tzr);
@@ -3951,7 +4164,9 @@ yeccpars2_453(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_form(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_454(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 456, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 456, Ss, Stack, T, Ts, Tzr);
+yeccpars2_454(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_455(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -3974,7 +4189,9 @@ yeccpars2_459(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_form(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_460(S, atom, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 462, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 462, Ss, Stack, T, Ts, Tzr);
+yeccpars2_460(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_461(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_,_|Nss] = Ss,
@@ -3990,7 +4207,9 @@ yeccpars2_463(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_464(464, Cat, [463 | Ss], NewStack, T, Ts, Tzr).
 
 yeccpars2_464(S, ':-', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 290, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 290, Ss, Stack, T, Ts, Tzr);
+yeccpars2_464(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccgoto_add_op(33, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_230(249, Cat, Ss, Stack, T, Ts, Tzr);
@@ -7976,7 +8195,7 @@ yeccpars2_39_(__Stack0) ->
    [ __1 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 7979).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8198).
 -compile({inline,yeccpars2_46_/1}).
 -file("erl_parse.yrl", 434).
 yeccpars2_46_(__Stack0) ->
@@ -7985,7 +8204,7 @@ yeccpars2_46_(__Stack0) ->
    { [ ] , ? line ( __1 ) }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 7988).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8207).
 -compile({inline,yeccpars2_70_/1}).
 -file("erl_parse.yrl", 325).
 yeccpars2_70_(__Stack0) ->
@@ -7994,7 +8213,7 @@ yeccpars2_70_(__Stack0) ->
    { tuple , ? line ( __1 ) , [ ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 7997).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8216).
 -compile({inline,yeccpars2_71_/1}).
 -file("erl_parse.yrl", 326).
 yeccpars2_71_(__Stack0) ->
@@ -8003,7 +8222,7 @@ yeccpars2_71_(__Stack0) ->
    { tuple , ? line ( __1 ) , __2 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8006).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8225).
 -compile({inline,yeccpars2_73_/1}).
 -file("erl_parse.yrl", 408).
 yeccpars2_73_(__Stack0) ->
@@ -8035,7 +8254,7 @@ yeccpars2_81_(__Stack0) ->
    [ __1 | __3 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8038).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8257).
 -compile({inline,yeccpars2_82_/1}).
 -file("erl_parse.yrl", 406).
 yeccpars2_82_(__Stack0) ->
@@ -8068,7 +8287,7 @@ yeccpars2_88_(__Stack0) ->
    [ __1 | __3 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8071).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8290).
 -compile({inline,yeccpars2_89_/1}).
 -file("erl_parse.yrl", 381).
 yeccpars2_89_(__Stack0) ->
@@ -8107,7 +8326,7 @@ yeccpars2_98_(__Stack0) ->
    [ ]
   end | __Stack0].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8110).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8329).
 -compile({inline,yeccpars2_100_/1}).
 -file("erl_parse.yrl", 427).
 yeccpars2_100_(__Stack0) ->
@@ -8124,7 +8343,7 @@ yeccpars2_102_(__Stack0) ->
    [ ]
   end | __Stack0].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8127).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8346).
 -compile({inline,yeccpars2_104_/1}).
 -file("erl_parse.yrl", 424).
 yeccpars2_104_(__Stack0) ->
@@ -8134,7 +8353,7 @@ yeccpars2_104_(__Stack0) ->
     { clause , L , [ { tuple , L , [ __1 , __3 , { var , L , '_' } ] } ] , __4 , __5 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8137).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8356).
 -compile({inline,yeccpars2_106_/1}).
 -file("erl_parse.yrl", 421).
 yeccpars2_106_(__Stack0) ->
@@ -8176,7 +8395,7 @@ yeccpars2_114_(__Stack0) ->
    { [ ] , __2 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8179).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8398).
 -compile({inline,yeccpars2_115_/1}).
 -file("erl_parse.yrl", 452).
 yeccpars2_115_(__Stack0) ->
@@ -8185,7 +8404,7 @@ yeccpars2_115_(__Stack0) ->
    { string , ? line ( __1 ) , element ( 3 , __1 ) ++ element ( 3 , __2 ) }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8188).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8407).
 -compile({inline,yeccpars2_120_/1}).
 -file("erl_parse.yrl", 386).
 yeccpars2_120_(__Stack0) ->
@@ -8194,7 +8413,7 @@ yeccpars2_120_(__Stack0) ->
    { 'receive' , ? line ( __1 ) , [ ] , __3 , __4 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8197).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8416).
 -compile({inline,yeccpars2_122_/1}).
 -file("erl_parse.yrl", 384).
 yeccpars2_122_(__Stack0) ->
@@ -8203,7 +8422,7 @@ yeccpars2_122_(__Stack0) ->
    { 'receive' , ? line ( __1 ) , __2 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8206).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8425).
 -compile({inline,yeccpars2_125_/1}).
 -file("erl_parse.yrl", 388).
 yeccpars2_125_(__Stack0) ->
@@ -8220,7 +8439,7 @@ yeccpars2_131_(__Stack0) ->
    [ __1 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8223).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8442).
 -compile({inline,yeccpars2_135_/1}).
 -file("erl_parse.yrl", 323).
 yeccpars2_135_(__Stack0) ->
@@ -8229,7 +8448,7 @@ yeccpars2_135_(__Stack0) ->
    { b_generate , ? line ( __2 ) , __1 , __3 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8232).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8451).
 -compile({inline,yeccpars2_137_/1}).
 -file("erl_parse.yrl", 322).
 yeccpars2_137_(__Stack0) ->
@@ -8246,7 +8465,7 @@ yeccpars2_139_(__Stack0) ->
    [ __1 | __3 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8249).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8468).
 -compile({inline,yeccpars2_140_/1}).
 -file("erl_parse.yrl", 315).
 yeccpars2_140_(__Stack0) ->
@@ -8255,7 +8474,7 @@ yeccpars2_140_(__Stack0) ->
    { lc , ? line ( __1 ) , __2 , __4 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8258).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8477).
 -compile({inline,yeccpars2_141_/1}).
 -file("erl_parse.yrl", 431).
 yeccpars2_141_(__Stack0) ->
@@ -8272,7 +8491,7 @@ yeccpars2_143_(__Stack0) ->
    [ __1 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8275).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8494).
 -compile({inline,yeccpars2_145_/1}).
 -file("erl_parse.yrl", 371).
 yeccpars2_145_(__Stack0) ->
@@ -8289,7 +8508,7 @@ yeccpars2_147_(__Stack0) ->
    [ __1 | __3 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8292).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8511).
 -compile({inline,yeccpars2_148_/1}).
 -file("erl_parse.yrl", 365).
 yeccpars2_148_(__Stack0) ->
@@ -8313,7 +8532,7 @@ yeccpars2_151_(__Stack0) ->
    [ ]
   end | __Stack0].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8316).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8535).
 -compile({inline,yeccpars2_157_/1}).
 -file("erl_parse.yrl", 394).
 yeccpars2_157_(__Stack0) ->
@@ -8322,7 +8541,7 @@ yeccpars2_157_(__Stack0) ->
    { 'fun' , ? line ( __1 ) , { function , element ( 3 , __2 ) , element ( 3 , __4 ) , element ( 3 , __6 ) } }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8325).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8544).
 -compile({inline,yeccpars2_158_/1}).
 -file("erl_parse.yrl", 392).
 yeccpars2_158_(__Stack0) ->
@@ -8348,7 +8567,7 @@ yeccpars2_162_(__Stack0) ->
    [ __1 | __3 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8351).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8570).
 -compile({inline,yeccpars2_163_/1}).
 -file("erl_parse.yrl", 396).
 yeccpars2_163_(__Stack0) ->
@@ -8357,7 +8576,7 @@ yeccpars2_163_(__Stack0) ->
    build_fun ( ? line ( __1 ) , __2 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8360).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8579).
 -compile({inline,yeccpars2_164_/1}).
 -file("erl_parse.yrl", 214).
 yeccpars2_164_(__Stack0) ->
@@ -8366,7 +8585,7 @@ yeccpars2_164_(__Stack0) ->
    { 'catch' , ? line ( __1 ) , __2 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8369).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8588).
 -compile({inline,yeccpars2_168_/1}).
 -file("erl_parse.yrl", 375).
 yeccpars2_168_(__Stack0) ->
@@ -8375,7 +8594,7 @@ yeccpars2_168_(__Stack0) ->
    { 'case' , ? line ( __1 ) , __2 , __4 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8378).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8597).
 -compile({inline,yeccpars2_170_/1}).
 -file("erl_parse.yrl", 270).
 yeccpars2_170_(__Stack0) ->
@@ -8384,7 +8603,7 @@ yeccpars2_170_(__Stack0) ->
    { block , ? line ( __1 ) , __2 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8387).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8606).
 -compile({inline,yeccpars2_172_/1}).
 -file("erl_parse.yrl", 279).
 yeccpars2_172_(__Stack0) ->
@@ -8393,7 +8612,7 @@ yeccpars2_172_(__Stack0) ->
    { nil , ? line ( __1 ) }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8396).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8615).
 -compile({inline,yeccpars2_173_/1}).
 -file("erl_parse.yrl", 280).
 yeccpars2_173_(__Stack0) ->
@@ -8402,7 +8621,7 @@ yeccpars2_173_(__Stack0) ->
    { cons , ? line ( __1 ) , __2 , __3 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8405).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8624).
 -compile({inline,yeccpars2_175_/1}).
 -file("erl_parse.yrl", 282).
 yeccpars2_175_(__Stack0) ->
@@ -8419,7 +8638,7 @@ yeccpars2_178_(__Stack0) ->
    __2
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8422).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8641).
 -compile({inline,yeccpars2_180_/1}).
 -file("erl_parse.yrl", 284).
 yeccpars2_180_(__Stack0) ->
@@ -8443,7 +8662,7 @@ yeccpars2_186_(__Stack0) ->
    [ __1 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8446).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8665).
 -compile({inline,yeccpars2_187_/1}).
 -file("erl_parse.yrl", 287).
 yeccpars2_187_(__Stack0) ->
@@ -8460,7 +8679,7 @@ yeccpars2_189_(__Stack0) ->
    [ __1 | __3 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8463).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8682).
 -compile({inline,yeccpars2_190_/1}).
 -file("erl_parse.yrl", 288).
 yeccpars2_190_(__Stack0) ->
@@ -8469,7 +8688,7 @@ yeccpars2_190_(__Stack0) ->
    { bin , ? line ( __1 ) , __2 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8472).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8691).
 -compile({inline,yeccpars2_193_/1}).
 -file("erl_parse.yrl", 317).
 yeccpars2_193_(__Stack0) ->
@@ -8493,7 +8712,7 @@ yeccpars2_197_(__Stack0) ->
    __2
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8496).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8715).
 -compile({inline,yeccpars2_198_/1}).
 -file("erl_parse.yrl", 294).
 yeccpars2_198_(__Stack0) ->
@@ -8542,7 +8761,7 @@ yeccpars2_206_(__Stack0) ->
    [ __1 | __3 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8545).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8764).
 -compile({inline,yeccpars2_207_/1}).
 -file("erl_parse.yrl", 296).
 yeccpars2_207_(__Stack0) ->
@@ -8551,7 +8770,7 @@ yeccpars2_207_(__Stack0) ->
    ? mkop1 ( __1 , __2 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8554).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8773).
 -compile({inline,yeccpars2_208_/1}).
 -file("erl_parse.yrl", 256).
 yeccpars2_208_(__Stack0) ->
@@ -8568,7 +8787,7 @@ yeccpars2_210_(__Stack0) ->
    __2
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8571).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8790).
 -compile({inline,yeccpars2_212_/1}).
 -file("erl_parse.yrl", 340).
 yeccpars2_212_(__Stack0) ->
@@ -8593,7 +8812,7 @@ yeccpars2_219_(__Stack0) ->
    [ ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8596).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8815).
 -compile({inline,yeccpars2_221_/1}).
 -file("erl_parse.yrl", 356).
 yeccpars2_221_(__Stack0) ->
@@ -8602,7 +8821,7 @@ yeccpars2_221_(__Stack0) ->
    { record_field , ? line ( __1 ) , __1 , __3 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8605).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8824).
 -compile({inline,yeccpars2_223_/1}).
 -file("erl_parse.yrl", 357).
 yeccpars2_223_(__Stack0) ->
@@ -8627,7 +8846,7 @@ yeccpars2_226_(__Stack0) ->
    __2
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8630).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8849).
 -compile({inline,yeccpars2_227_/1}).
 -file("erl_parse.yrl", 338).
 yeccpars2_227_(__Stack0) ->
@@ -8644,7 +8863,7 @@ yeccpars2_229_(__Stack0) ->
    [ __1 | __3 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8647).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8866).
 -compile({inline,yeccpars2_232_/1}).
 -file("erl_parse.yrl", 217).
 yeccpars2_232_(__Stack0) ->
@@ -8653,7 +8872,7 @@ yeccpars2_232_(__Stack0) ->
    { match , ? line ( __2 ) , __1 , __3 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8656).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8875).
 -compile({inline,yeccpars2_233_/1}).
 -file("erl_parse.yrl", 218).
 yeccpars2_233_(__Stack0) ->
@@ -8662,7 +8881,7 @@ yeccpars2_233_(__Stack0) ->
    ? mkop2 ( __1 , __2 , __3 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8665).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8884).
 -compile({inline,yeccpars2_235_/1}).
 -file("erl_parse.yrl", 221).
 yeccpars2_235_(__Stack0) ->
@@ -8671,7 +8890,7 @@ yeccpars2_235_(__Stack0) ->
    ? mkop2 ( __1 , __2 , __3 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8674).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8893).
 -compile({inline,yeccpars2_237_/1}).
 -file("erl_parse.yrl", 224).
 yeccpars2_237_(__Stack0) ->
@@ -8680,7 +8899,7 @@ yeccpars2_237_(__Stack0) ->
    ? mkop2 ( __1 , __2 , __3 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8683).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8902).
 -compile({inline,yeccpars2_247_/1}).
 -file("erl_parse.yrl", 228).
 yeccpars2_247_(__Stack0) ->
@@ -8689,7 +8908,7 @@ yeccpars2_247_(__Stack0) ->
    ? mkop2 ( __1 , __2 , __3 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8692).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8911).
 -compile({inline,yeccpars2_260_/1}).
 -file("erl_parse.yrl", 236).
 yeccpars2_260_(__Stack0) ->
@@ -8698,7 +8917,7 @@ yeccpars2_260_(__Stack0) ->
    ? mkop2 ( __1 , __2 , __3 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8701).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8920).
 -compile({inline,yeccpars2_268_/1}).
 -file("erl_parse.yrl", 240).
 yeccpars2_268_(__Stack0) ->
@@ -8707,7 +8926,7 @@ yeccpars2_268_(__Stack0) ->
    ? mkop2 ( __1 , __2 , __3 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8710).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8929).
 -compile({inline,yeccpars2_269_/1}).
 -file("erl_parse.yrl", 232).
 yeccpars2_269_(__Stack0) ->
@@ -8716,7 +8935,7 @@ yeccpars2_269_(__Stack0) ->
    ? mkop2 ( __1 , __2 , __3 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8719).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8938).
 -compile({inline,yeccpars2_270_/1}).
 -file("erl_parse.yrl", 362).
 yeccpars2_270_(__Stack0) ->
@@ -8725,7 +8944,7 @@ yeccpars2_270_(__Stack0) ->
    { call , ? line ( __1 ) , __1 , element ( 1 , __2 ) }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8728).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8947).
 -compile({inline,yeccpars2_273_/1}).
 -file("erl_parse.yrl", 252).
 yeccpars2_273_(__Stack0) ->
@@ -8734,7 +8953,7 @@ yeccpars2_273_(__Stack0) ->
    { remote , ? line ( __2 ) , __1 , __3 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8737).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8956).
 -compile({inline,yeccpars2_274_/1}).
 -file("erl_parse.yrl", 258).
 yeccpars2_274_(__Stack0) ->
@@ -8743,7 +8962,7 @@ yeccpars2_274_(__Stack0) ->
    { record_field , ? line ( __2 ) , __1 , __3 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8746).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8965).
 -compile({inline,yeccpars2_277_/1}).
 -file("erl_parse.yrl", 344).
 yeccpars2_277_(__Stack0) ->
@@ -8752,7 +8971,7 @@ yeccpars2_277_(__Stack0) ->
    { record , ? line ( __2 ) , __1 , element ( 3 , __3 ) , __4 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8755).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8974).
 -compile({inline,yeccpars2_279_/1}).
 -file("erl_parse.yrl", 342).
 yeccpars2_279_(__Stack0) ->
@@ -8761,7 +8980,7 @@ yeccpars2_279_(__Stack0) ->
    { record_field , ? line ( __2 ) , __1 , element ( 3 , __3 ) , __5 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8764).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8983).
 -compile({inline,yeccpars2_280_/1}).
 -file("erl_parse.yrl", 435).
 yeccpars2_280_(__Stack0) ->
@@ -8770,7 +8989,7 @@ yeccpars2_280_(__Stack0) ->
    { __2 , ? line ( __1 ) }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8773).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8992).
 -compile({inline,yeccpars2_281_/1}).
 -file("erl_parse.yrl", 244).
 yeccpars2_281_(__Stack0) ->
@@ -8779,7 +8998,7 @@ yeccpars2_281_(__Stack0) ->
    ? mkop1 ( __1 , __2 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8782).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9001).
 -compile({inline,yeccpars2_284_/1}).
 -file("erl_parse.yrl", 348).
 yeccpars2_284_(__Stack0) ->
@@ -8788,7 +9007,7 @@ yeccpars2_284_(__Stack0) ->
    { record , ? line ( __2 ) , __1 , element ( 3 , __3 ) , __4 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8791).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9010).
 -compile({inline,yeccpars2_286_/1}).
 -file("erl_parse.yrl", 346).
 yeccpars2_286_(__Stack0) ->
@@ -8797,7 +9016,7 @@ yeccpars2_286_(__Stack0) ->
    { record_field , ? line ( __2 ) , __1 , element ( 3 , __3 ) , __5 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8800).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9019).
 -compile({inline,yeccpars2_288_/1}).
 -file("erl_parse.yrl", 493).
 yeccpars2_288_(__Stack0) ->
@@ -8806,7 +9025,7 @@ yeccpars2_288_(__Stack0) ->
    { clause , ? line ( __1 ) , element ( 3 , __1 ) , __2 , __3 , __4 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8809).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9028).
 -compile({inline,yeccpars2_289_/1}).
 -file("erl_parse.yrl", 203).
 yeccpars2_289_(__Stack0) ->
@@ -8871,7 +9090,7 @@ yeccpars2_318_(__Stack0) ->
    [ __1 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8874).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9093).
 -compile({inline,yeccpars2_332_/1}).
 -file("erl_parse.yrl", 152).
 yeccpars2_332_(__Stack0) ->
@@ -8880,7 +9099,7 @@ yeccpars2_332_(__Stack0) ->
    { type , ? line ( __1 ) , tuple , [ ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8883).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9102).
 -compile({inline,yeccpars2_333_/1}).
 -file("erl_parse.yrl", 153).
 yeccpars2_333_(__Stack0) ->
@@ -8889,7 +9108,7 @@ yeccpars2_333_(__Stack0) ->
    { type , ? line ( __1 ) , tuple , __2 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8892).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9111).
 -compile({inline,yeccpars2_335_/1}).
 -file("erl_parse.yrl", 116).
 yeccpars2_335_(__Stack0) ->
@@ -8898,7 +9117,7 @@ yeccpars2_335_(__Stack0) ->
    { ann_type , ? line ( __1 ) , [ __1 , __3 ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8901).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9120).
 -compile({inline,yeccpars2_341_/1}).
 -file("erl_parse.yrl", 159).
 yeccpars2_341_(__Stack0) ->
@@ -8907,7 +9126,7 @@ yeccpars2_341_(__Stack0) ->
    { type , ? line ( __1 ) , 'fun' , [ ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8910).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9129).
 -compile({inline,yeccpars2_345_/1}).
 -file("erl_parse.yrl", 163).
 yeccpars2_345_(__Stack0) ->
@@ -8925,7 +9144,7 @@ yeccpars2_346_(__Stack0) ->
    __3
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8928).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9147).
 -compile({inline,yeccpars2_352_/1}).
 -file("erl_parse.yrl", 144).
 yeccpars2_352_(__Stack0) ->
@@ -8935,7 +9154,7 @@ yeccpars2_352_(__Stack0) ->
     [ __1 , __3 , [ ] ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8938).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9157).
 -compile({inline,yeccpars2_353_/1}).
 -file("erl_parse.yrl", 146).
 yeccpars2_353_(__Stack0) ->
@@ -8953,7 +9172,7 @@ yeccpars2_355_(__Stack0) ->
    build_gen_type ( __1 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8956).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9175).
 -compile({inline,yeccpars2_356_/1}).
 -file("erl_parse.yrl", 142).
 yeccpars2_356_(__Stack0) ->
@@ -8963,7 +9182,7 @@ yeccpars2_356_(__Stack0) ->
     normalise ( __1 ) , __3 }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8966).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9185).
 -compile({inline,yeccpars2_358_/1}).
 -file("erl_parse.yrl", 148).
 yeccpars2_358_(__Stack0) ->
@@ -8972,7 +9191,7 @@ yeccpars2_358_(__Stack0) ->
    { type , ? line ( __1 ) , nil , [ ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8975).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9194).
 -compile({inline,yeccpars2_360_/1}).
 -file("erl_parse.yrl", 149).
 yeccpars2_360_(__Stack0) ->
@@ -8981,7 +9200,7 @@ yeccpars2_360_(__Stack0) ->
    { type , ? line ( __1 ) , list , [ __2 ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8984).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9203).
 -compile({inline,yeccpars2_362_/1}).
 -file("erl_parse.yrl", 150).
 yeccpars2_362_(__Stack0) ->
@@ -8991,7 +9210,7 @@ yeccpars2_362_(__Stack0) ->
     nonempty_list , [ __2 ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 8994).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9213).
 -compile({inline,yeccpars2_365_/1}).
 -file("erl_parse.yrl", 179).
 yeccpars2_365_(__Stack0) ->
@@ -9018,7 +9237,7 @@ yeccpars2_371_(__Stack0) ->
    build_bin_type ( [ __1 , __3 ] , __5 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9021).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9240).
 -compile({inline,yeccpars2_373_/1}).
 -file("erl_parse.yrl", 182).
 yeccpars2_373_(__Stack0) ->
@@ -9028,7 +9247,7 @@ yeccpars2_373_(__Stack0) ->
     [ __2 , abstract ( 0 , ? line ( __1 ) ) ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9031).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9250).
 -compile({inline,yeccpars2_378_/1}).
 -file("erl_parse.yrl", 187).
 yeccpars2_378_(__Stack0) ->
@@ -9037,7 +9256,7 @@ yeccpars2_378_(__Stack0) ->
    { type , ? line ( __1 ) , binary , [ __2 , __4 ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9040).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9259).
 -compile({inline,yeccpars2_379_/1}).
 -file("erl_parse.yrl", 184).
 yeccpars2_379_(__Stack0) ->
@@ -9047,7 +9266,7 @@ yeccpars2_379_(__Stack0) ->
     [ abstract ( 0 , ? line ( __1 ) ) , __2 ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9050).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9269).
 -compile({inline,yeccpars2_381_/1}).
 -file("erl_parse.yrl", 167).
 yeccpars2_381_(__Stack0) ->
@@ -9057,7 +9276,7 @@ yeccpars2_381_(__Stack0) ->
     [ { type , ? line ( __1 ) , product , [ ] } , __4 ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9060).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9279).
 -compile({inline,yeccpars2_383_/1}).
 -file("erl_parse.yrl", 138).
 yeccpars2_383_(__Stack0) ->
@@ -9074,7 +9293,7 @@ yeccpars2_387_(__Stack0) ->
    [ __1 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9077).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9296).
 -compile({inline,yeccpars2_389_/1}).
 -file("erl_parse.yrl", 154).
 yeccpars2_389_(__Stack0) ->
@@ -9083,7 +9302,7 @@ yeccpars2_389_(__Stack0) ->
    { type , ? line ( __1 ) , record , [ __2 ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9086).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9305).
 -compile({inline,yeccpars2_391_/1}).
 -file("erl_parse.yrl", 176).
 yeccpars2_391_(__Stack0) ->
@@ -9101,7 +9320,7 @@ yeccpars2_393_(__Stack0) ->
    [ __1 | __3 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9104).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9323).
 -compile({inline,yeccpars2_394_/1}).
 -file("erl_parse.yrl", 155).
 yeccpars2_394_(__Stack0) ->
@@ -9111,7 +9330,7 @@ yeccpars2_394_(__Stack0) ->
     record , [ __2 | __4 ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9114).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9333).
 -compile({inline,yeccpars2_395_/1}).
 -file("erl_parse.yrl", 135).
 yeccpars2_395_(__Stack0) ->
@@ -9128,7 +9347,7 @@ yeccpars2_397_(__Stack0) ->
    [ __1 | __3 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9131).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9350).
 -compile({inline,yeccpars2_400_/1}).
 -file("erl_parse.yrl", 170).
 yeccpars2_400_(__Stack0) ->
@@ -9146,7 +9365,7 @@ yeccpars2_402_(__Stack0) ->
    lift_unions ( __1 , __3 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9149).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9368).
 -compile({inline,yeccpars2_405_/1}).
 -file("erl_parse.yrl", 122).
 yeccpars2_405_(__Stack0) ->
@@ -9157,7 +9376,7 @@ yeccpars2_405_(__Stack0) ->
     skip_paren ( __3 ) ] }
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9160).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9379).
 -compile({inline,yeccpars2_406_/1}).
 -file("erl_parse.yrl", 127).
 yeccpars2_406_(__Stack0) ->
@@ -9167,7 +9386,7 @@ yeccpars2_406_(__Stack0) ->
     __2 , skip_paren ( __3 ) )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9170).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9389).
 -compile({inline,yeccpars2_408_/1}).
 -file("erl_parse.yrl", 131).
 yeccpars2_408_(__Stack0) ->
@@ -9177,7 +9396,7 @@ yeccpars2_408_(__Stack0) ->
     __2 , skip_paren ( __3 ) )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9180).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9399).
 -compile({inline,yeccpars2_410_/1}).
 -file("erl_parse.yrl", 103).
 yeccpars2_410_(__Stack0) ->
@@ -9203,7 +9422,7 @@ yeccpars2_415_(__Stack0) ->
    build_def ( __1 , __3 )
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9206).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9425).
 -compile({inline,yeccpars2_418_/1}).
 -file("erl_parse.yrl", 109).
 yeccpars2_418_(__Stack0) ->
@@ -9333,7 +9552,7 @@ yeccpars2_446_(__Stack0) ->
    [ __1 | __3 ]
   end | __Stack].
 
--file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9336).
+-file("/ldisk/pan/git/otp/bootstrap/lib/stdlib/egen/erl_parse.erl", 9555).
 -compile({inline,yeccpars2_447_/1}).
 -file("erl_parse.yrl", 90).
 yeccpars2_447_(__Stack0) ->
diff --git a/bootstrap/lib/stdlib/include/erl_bits.hrl b/bootstrap/lib/stdlib/include/erl_bits.hrl
index 06bc1a75fc..54ebe58585 100644
--- a/bootstrap/lib/stdlib/include/erl_bits.hrl
+++ b/bootstrap/lib/stdlib/include/erl_bits.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 1999-2009. 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%
 %%
 %% This is an -*- erlang -*- file.
diff --git a/bootstrap/lib/stdlib/include/erl_compile.hrl b/bootstrap/lib/stdlib/include/erl_compile.hrl
index b49b0c3970..f779c4382c 100644
--- a/bootstrap/lib/stdlib/include/erl_compile.hrl
+++ b/bootstrap/lib/stdlib/include/erl_compile.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 1997-2009. 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%
 %%
 
diff --git a/bootstrap/lib/stdlib/include/ms_transform.hrl b/bootstrap/lib/stdlib/include/ms_transform.hrl
index 81a624b075..9937d48fef 100644
--- a/bootstrap/lib/stdlib/include/ms_transform.hrl
+++ b/bootstrap/lib/stdlib/include/ms_transform.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 2002-2009. 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%
 %%
 -compile({parse_transform,ms_transform}).
diff --git a/bootstrap/lib/stdlib/include/qlc.hrl b/bootstrap/lib/stdlib/include/qlc.hrl
index 54df6168e4..067fb83060 100644
--- a/bootstrap/lib/stdlib/include/qlc.hrl
+++ b/bootstrap/lib/stdlib/include/qlc.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 2004-2009. 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%
 %%
 -compile({parse_transform,qlc}).
diff --git a/bootstrap/lib/stdlib/include/zip.hrl b/bootstrap/lib/stdlib/include/zip.hrl
index 47b06a1cc3..2b5ddc1dfe 100644
--- a/bootstrap/lib/stdlib/include/zip.hrl
+++ b/bootstrap/lib/stdlib/include/zip.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 2006-2009. 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%
 %%
 
diff --git a/configure.in b/configure.in
index eb29b13bcc..36b33ec399 100644
--- a/configure.in
+++ b/configure.in
@@ -97,7 +97,7 @@ fi
 TARGET=$host
 AC_SUBST(TARGET)
 
-if test	X$cross_compiling = Xyes; then
+if test "$cross_compiling" = "yes"; then
     CROSS_COMPILING=yes
 else
     CROSS_COMPILING=no
@@ -106,7 +106,8 @@ AC_SUBST(CROSS_COMPILING)
 
 
 AC_ARG_ENABLE(bootstrap-only,
-[  --enable-bootstrap-only enable bootstrap only configuration],
+AS_HELP_STRING([--enable-bootstrap-only],
+               [enable bootstrap only configuration]),
 [ if test "X$enableval" = "Xyes"; then
      BOOTSTRAP_ONLY=yes
   else
@@ -192,53 +193,62 @@ AC_MSG_RESULT([$OTP_REL])
 AC_SUBST(OTP_REL)
 
 AC_ARG_ENABLE(threads,
-[  --enable-threads        enable async thread support
-  --disable-threads       disable async thread support])
+AS_HELP_STRING([--enable-threads], [enable async thread support])
+AS_HELP_STRING([--disable-threads], [disable async thread support]))
 
 AC_ARG_ENABLE(halfword-emulator,
-[  --enable-halfword-emulator        enable halfword emulator (only for 64bit builds)
-  --disable-halfword-emulator        disable halfword emulator (only for 64bit builds)])
+AS_HELP_STRING([--enable-halfword-emulator],
+               [enable halfword emulator (only for 64bit builds)]))
 
 AC_ARG_ENABLE(smp-support,
-[  --enable-smp-support    enable smp support
-  --disable-smp-support   disable smp support])
+AS_HELP_STRING([--enable-smp-support], [enable smp support])
+AS_HELP_STRING([--disable-smp-support], [disable smp support]))
 
 AC_ARG_WITH(termcap,
-[  --with-termcap          use termcap (default)
-  --without-termcap       do not use any termcap libraries (ncurses,curses,termcap,termlib)])
+AS_HELP_STRING([--with-termcap], [use termcap (default)])
+AS_HELP_STRING([--without-termcap],
+               [do not use any termcap libraries (ncurses,curses,termcap,termlib)]))
 
 AC_ARG_ENABLE(kernel-poll,
-[  --enable-kernel-poll    enable kernel poll support])
+AS_HELP_STRING([--enable-kernel-poll], [enable kernel poll support])
+AS_HELP_STRING([--disable-kernel-poll], [disable kernel poll support]))
+
+AC_ARG_ENABLE(sctp,
+AS_HELP_STRING([--enable-sctp], [enable sctp support])
+AS_HELP_STRING([--disable-sctp], [disable sctp support]))
 
 AC_ARG_ENABLE(hipe,
-[  --enable-hipe           enable hipe support
-  --disable-hipe          disable hipe support])
-			
+AS_HELP_STRING([--enable-hipe], [enable hipe support])
+AS_HELP_STRING([--disable-hipe], [disable hipe support]))
+
+AC_ARG_ENABLE(native-libs,
+AS_HELP_STRING([--enable-native-libs],
+               [compile Erlang libraries to native code]))
+
 AC_ARG_WITH(javac,
-[  --with-javac=JAVAC      specify Java compiler to use
-  --with-javac            use a Java compiler if found (default)
-  --without-javac         don't use any Java compiler])
+AS_HELP_STRING([--with-javac=JAVAC], [specify Java compiler to use])
+AS_HELP_STRING([--with-javac], [use a Java compiler if found (default)])
+AS_HELP_STRING([--without-javac], [don't use any Java compiler]))
 
 AC_ARG_ENABLE(megaco_flex_scanner_lineno,
-[  --enable-megaco-flex-scanner-lineno enable megaco flex scanner lineno
-  --disable-megaco-flex-scanner-lineno disable megaco flex scanner lineno])
+AS_HELP_STRING([--disable-megaco-flex-scanner-lineno],
+               [disable megaco flex scanner lineno]))
 
 AC_ARG_ENABLE(megaco_reentrant_flex_scanner,
-[  --enable-megaco-reentrant-flex-scanner enable reentrans megaco flex scanner
-  --disable-megaco-reentrant-flex-scanner disable reentrans megaco flex scanner])
+AS_HELP_STRING([--disable-megaco-reentrant-flex-scanner],
+               [disable reentrant megaco flex scanner]))
 
 AC_ARG_WITH(ssl,
-[  --with-ssl=PATH         specify location of OpenSSL include and lib
-  --with-ssl              use SSL (default)
-  --without-ssl           don't use 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_ENABLE(dynamic-ssl-lib,
-[  --enable-dynamic-ssl-lib        force using dynamic openssl libraries
-  --disable-dynamic-ssl-lib       disable using dynamic openssl libraries])
+AS_HELP_STRING([--disable-dynamic-ssl-lib],
+               [disable using dynamic openssl libraries]))
 
 AC_ARG_ENABLE(shared-zlib,
-[  --enable-shared-zlib        enable using shared zlib library
-  --disable-shared-zlib       disable shared zlib, compile own zlib source (default)])
+AS_HELP_STRING([--enable-shared-zlib], [enable using shared zlib library]))
 
 dnl This functionality has been lost along the way... :(
 dnl It could perhaps be nice to reintroduce some day; therefore,
@@ -256,7 +266,8 @@ dnl   esac ], erl_mandir='$(erlang_libdir)/man')
 dnl AC_SUBST(erl_mandir)
 
 AC_ARG_ENABLE(darwin-universal,
-[  --enable-darwin-universal    build universal binaries on darwin i386],
+AS_HELP_STRING([--enable-darwin-universal],
+               [build universal binaries on darwin i386]),
 [ case "$enableval" in
     no) enable_darwin_universal=no ;;
     *)  enable_darwin_univeral=yes ;;
@@ -265,7 +276,7 @@ AC_ARG_ENABLE(darwin-universal,
 
 
 AC_ARG_ENABLE(darwin-64bit,
-[  --enable-darwin-64bit    build 64bit binaries on darwin],
+AS_HELP_STRING([--enable-darwin-64bit], [build 64bit binaries on darwin]),
 [ case "$enableval" in
     no) enable_darwin_64bit=no ;;
     *)  enable_darwin_64bit=yes ;;
@@ -273,7 +284,8 @@ AC_ARG_ENABLE(darwin-64bit,
 ],enable_darwin_64bit=no)
 
 AC_ARG_ENABLE(m64-build,
-[  --enable-m64-build    build 64bit binaries using the -m64 flag to (g)cc],
+AS_HELP_STRING([--enable-m64-build],
+               [build 64bit binaries using the -m64 flag to (g)cc]),
 [ case "$enableval" in
     no) enable_m64_build=no ;;
     *)  enable_m64_build=yes ;;
@@ -281,7 +293,8 @@ AC_ARG_ENABLE(m64-build,
 ],enable_m64_build=no)
 
 AC_ARG_ENABLE(m32-build,
-[  --enable-m32-build    build 32bit binaries using the -m32 flag to (g)cc],
+AS_HELP_STRING([--enable-m32-build],
+               [build 32bit binaries using the -m32 flag to (g)cc]),
 [ case "$enableval" in
     no) enable_m32_build=no ;;
     *)
@@ -293,6 +306,14 @@ AC_ARG_ENABLE(m32-build,
   esac
 ],enable_m32_build=no)
 
+AC_ARG_ENABLE(ethread-pre-pentium4-compatibility,
+	      AS_HELP_STRING([--enable-ethread-pre-pentium4-compatibility],
+			     [enable compatibility with x86 processors before pentium 4 (back to 486) in the ethread library]))
+
+AC_ARG_WITH(libatomic_ops,
+	    AS_HELP_STRING([--with-libatomic_ops=PATH],
+			   [specify and prefer usage of libatomic_ops in the ethread library]))
+
 dnl OK, we might have darwin switches off different kinds, lets 
 dnl check it all before continuing.
 TMPSYS=`uname -s`-`uname -m`
@@ -368,11 +389,12 @@ if test "$files" != "$pattern"; then
 fi
 pattern="lib/*/CONF_INFO"
 files=`echo $pattern`
-if test "$files" != "$pattern"; then
+if test "$files" != "$pattern" || test -f erts/CONF_INFO; then
   echo '*********************************************************************'
   echo '**********************  APPLICATIONS INFORMATION  *******************'
   echo '*********************************************************************'
   echo
+  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
diff --git a/erts/Makefile.in b/erts/Makefile.in
index fabf86db7c..2e63fc469e 100644
--- a/erts/Makefile.in
+++ b/erts/Makefile.in
@@ -1,19 +1,19 @@
 # 
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2006-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2006-2010. 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%
 # 
 include $(ERL_TOP)/make/target.mk
@@ -87,15 +87,20 @@ endif
 # in the same directory...
 local_setup:
 	@cd start_scripts && $(MAKE)
+	@echo `ls $(ERL_TOP)/bin/`
 	@rm -f $(ERL_TOP)/bin/erl $(ERL_TOP)/bin/erlc $(ERL_TOP)/bin/cerl \
 		$(ERL_TOP)/bin/erl.exe $(ERL_TOP)/bin/erlc.exe \
 		$(ERL_TOP)/bin/escript $(ERL_TOP)/bin/escript.exe \
 		$(ERL_TOP)/bin/dialyzer $(ERL_TOP)/bin/dialyzer.exe \
 		$(ERL_TOP)/bin/typer $(ERL_TOP)/bin/typer.exe \
+		$(ERL_TOP)/bin/run_test $(ERL_TOP)/bin/run_test.exe \
+		$(ERL_TOP)/bin/ct_run $(ERL_TOP)/bin/ct_run.exe \
 		$(ERL_TOP)/bin/start*.boot $(ERL_TOP)/bin/start*.script
 	@if [ "X$(TARGET)" = "Xwin32" ]; then \
 		cp $(ERL_TOP)/bin/$(TARGET)/dialyzer.exe $(ERL_TOP)/bin/dialyzer.exe; \
 		cp $(ERL_TOP)/bin/$(TARGET)/typer.exe $(ERL_TOP)/bin/typer.exe; \
+		cp $(ERL_TOP)/bin/$(TARGET)/ct_run.exe $(ERL_TOP)/bin/ct_run.exe; \
+		cp $(ERL_TOP)/bin/$(TARGET)/ct_run.exe $(ERL_TOP)/bin/run_test.exe; \
 		cp $(ERL_TOP)/bin/$(TARGET)/erlc.exe $(ERL_TOP)/bin/erlc.exe; \
 		cp $(ERL_TOP)/bin/$(TARGET)/erl.exe $(ERL_TOP)/bin/erl.exe; \
 		cp $(ERL_TOP)/bin/$(TARGET)/werl.exe $(ERL_TOP)/bin/werl.exe; \
@@ -115,6 +120,8 @@ local_setup:
 	        $(ERL_TOP)/erts/etc/unix/cerl.src > $(ERL_TOP)/bin/cerl; \
 		cp $(ERL_TOP)/bin/$(TARGET)/dialyzer $(ERL_TOP)/bin/dialyzer; \
 		cp $(ERL_TOP)/bin/$(TARGET)/typer $(ERL_TOP)/bin/typer; \
+		cp $(ERL_TOP)/bin/$(TARGET)/ct_run $(ERL_TOP)/bin/ct_run; \
+		ln -s $(ERL_TOP)/bin/ct_run $(ERL_TOP)/bin/run_test; \
 		cp $(ERL_TOP)/bin/$(TARGET)/erlc $(ERL_TOP)/bin/erlc; \
 		cp $(ERL_TOP)/bin/$(TARGET)/escript $(ERL_TOP)/bin/escript; \
 	 	chmod 755 $(ERL_TOP)/bin/erl $(ERL_TOP)/bin/erlc \
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index 61244c7cd3..a1211bbf0c 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -386,14 +386,24 @@ AC_DEFUN(LM_SYS_IPV6,
 AC_CACHE_VAL(ac_cv_sys_ipv6_support,
 [ok_so_far=yes
  AC_TRY_COMPILE([#include <sys/types.h>
-#include <netinet/in.h>],
+#ifdef __WIN32__
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <netinet/in.h>
+#endif],
    [struct in6_addr a6; struct sockaddr_in6 s6;], ok_so_far=yes, ok_so_far=no)
 
 if test $ok_so_far = yes; then
   ac_cv_sys_ipv6_support=yes
 else
   AC_TRY_COMPILE([#include <sys/types.h>
-#include <netinet/in.h>],
+#ifdef __WIN32__
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <netinet/in.h>
+#endif],
     [struct in_addr6 a6; struct sockaddr_in6 s6;],
     ac_cv_sys_ipv6_support=in_addr6, ac_cv_sys_ipv6_support=no)
 fi
@@ -521,11 +531,13 @@ if test "X$host_os" = "Xwin32"; then
     THR_DEFS="-DWIN32_THREADS"
     THR_LIBS=
     THR_LIB_NAME=win32_threads
+    THR_LIB_TYPE=win32_threads
 else
     AC_MSG_RESULT(no)
     THR_DEFS=
     THR_LIBS=
     THR_LIB_NAME=
+    THR_LIB_TYPE=posix_unknown
 
 dnl Try to find POSIX threads
 
@@ -586,6 +598,7 @@ dnl On ofs1 the '-pthread' switch should be used
 		    AC_MSG_WARN([result yes guessed because of cross compilation])
 		fi
 		if test $nptl = yes; then
+		    THR_LIB_TYPE=posix_nptl
 		    need_nptl_incldir=no
 		    AC_CHECK_HEADER(nptl/pthread.h,
 				    [need_nptl_incldir=yes
@@ -653,6 +666,19 @@ fi
 
 ])
 
+AC_DEFUN(ERL_INTERNAL_LIBS,
+[
+
+ERTS_INTERNAL_X_LIBS=
+
+AC_CHECK_LIB(kstat, kstat_open,
+[AC_DEFINE(HAVE_KSTAT, 1, [Define if you have kstat])
+ERTS_INTERNAL_X_LIBS="$ERTS_INTERNAL_X_LIBS -lkstat"])
+
+AC_SUBST(ERTS_INTERNAL_X_LIBS)
+
+])
+
 dnl ----------------------------------------------------------------------
 dnl
 dnl ERL_FIND_ETHR_LIB
@@ -676,10 +702,14 @@ AC_DEFUN(ERL_FIND_ETHR_LIB,
 [
 
 LM_CHECK_THR_LIB
+ERL_INTERNAL_LIBS
 
+ethr_have_native_atomics=no
+ethr_have_native_spinlock=no
 ETHR_THR_LIB_BASE="$THR_LIB_NAME"
+ETHR_THR_LIB_BASE_TYPE="$THR_LIB_TYPE"
 ETHR_DEFS="$THR_DEFS"
-ETHR_X_LIBS="$THR_LIBS"
+ETHR_X_LIBS="$THR_LIBS $ERTS_INTERNAL_X_LIBS"
 ETHR_LIBS=
 ETHR_LIB_NAME=
 
@@ -691,6 +721,7 @@ ethr_lib_name=ethread
 case "$THR_LIB_NAME" in
 
     win32_threads)
+	ETHR_THR_LIB_BASE_DIR=win
 	# * _WIN32_WINNT >= 0x0400 is needed for
 	#   TryEnterCriticalSection
 	# * _WIN32_WINNT >= 0x0403 is needed for
@@ -716,10 +747,128 @@ case "$THR_LIB_NAME" in
         if test $found_win32_winnt = no; then
 	    AC_MSG_ERROR([-D_WIN32_WINNT missing in CPPFLAGS])
         fi
+
 	AC_DEFINE(ETHR_WIN32_THREADS, 1, [Define if you have win32 threads])
+
+	have_ilckd=no
+	AC_MSG_CHECKING([for _InterlockedCompareExchange64()])
+	AC_TRY_LINK([
+			#define WIN32_LEAN_AND_MEAN
+			#include <windows.h>
+		    ],
+		    [
+			volatile __int64 *var;
+			_InterlockedCompareExchange64(var, (__int64) 1, (__int64) 0);
+			return 0;
+		    ],
+		    have_ilckd=yes)
+	AC_MSG_RESULT([$have_ilckd])
+	test $have_ilckd = yes && AC_DEFINE(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64, 1, [Define if you have _InterlockedCompareExchange64()])
+
+	AC_CHECK_SIZEOF(void *)
+	case "$ac_cv_sizeof_void_p-$have_ilckd" in
+	    8-no)
+		ethr_have_native_atomics=no
+	  	ethr_have_native_spinlock=no;;
+	    *)
+		ethr_have_native_atomics=yes
+	  	ethr_have_native_spinlock=yes;;
+	esac
+
+	have_ilckd=no
+	AC_MSG_CHECKING([for _InterlockedDecrement64()])
+	AC_TRY_LINK([
+			#define WIN32_LEAN_AND_MEAN
+			#include <windows.h>
+		    ],
+		    [
+			volatile __int64 *var;
+			_InterlockedDecrement64(var);
+			return 0;
+		    ],
+		    have_ilckd=yes)
+	AC_MSG_RESULT([$have_ilckd])
+	test $have_ilckd = yes && AC_DEFINE(ETHR_HAVE__INTERLOCKEDDECREMENT64, 1, [Define if you have _InterlockedDecrement64()])
+
+	have_ilckd=no
+	AC_MSG_CHECKING([for _InterlockedIncrement64()])
+	AC_TRY_LINK([
+			#define WIN32_LEAN_AND_MEAN
+			#include <windows.h>
+		    ],
+		    [
+			volatile __int64 *var;
+			_InterlockedIncrement64(var);
+			return 0;
+		    ],
+		    have_ilckd=yes)
+	AC_MSG_RESULT([$have_ilckd])
+	test $have_ilckd = yes && AC_DEFINE(ETHR_HAVE__INTERLOCKEDINCREMENT64, 1, [Define if you have _InterlockedIncrement64()])
+
+	have_ilckd=no
+	AC_MSG_CHECKING([for _InterlockedExchangeAdd64()])
+	AC_TRY_LINK([
+			#define WIN32_LEAN_AND_MEAN
+			#include <windows.h>
+		    ],
+		    [
+			volatile __int64 *var;
+			_InterlockedExchangeAdd64(var, (__int64) 1);
+			return 0;
+		    ],
+		    have_ilckd=yes)
+	AC_MSG_RESULT([$have_ilckd])
+	test $have_ilckd = yes && AC_DEFINE(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64, 1, [Define if you have _InterlockedExchangeAdd64()])
+
+	have_ilckd=no
+	AC_MSG_CHECKING([for _InterlockedExchange64()])
+	AC_TRY_LINK([
+			#define WIN32_LEAN_AND_MEAN
+			#include <windows.h>
+		    ],
+		    [
+			volatile __int64 *var;
+			_InterlockedExchange64(var, (__int64) 1);
+			return 0;
+		    ],
+		    have_ilckd=yes)
+	AC_MSG_RESULT([$have_ilckd])
+	test $have_ilckd = yes && AC_DEFINE(ETHR_HAVE__INTERLOCKEDEXCHANGE64, 1, [Define if you have _InterlockedExchange64()])
+
+	have_ilckd=no
+	AC_MSG_CHECKING([for _InterlockedAnd64()])
+	AC_TRY_LINK([
+			#define WIN32_LEAN_AND_MEAN
+			#include <windows.h>
+		    ],
+		    [
+			volatile __int64 *var;
+			_InterlockedAnd64(var, (__int64) 1);
+			return 0;
+		    ],
+		    have_ilckd=yes)
+	AC_MSG_RESULT([$have_ilckd])
+	test $have_ilckd = yes && AC_DEFINE(ETHR_HAVE__INTERLOCKEDAND64, 1, [Define if you have _InterlockedAnd64()])
+
+	have_ilckd=no
+	AC_MSG_CHECKING([for _InterlockedOr64()])
+	AC_TRY_LINK([
+			#define WIN32_LEAN_AND_MEAN
+			#include <windows.h>
+		    ],
+		    [
+			volatile __int64 *var;
+			_InterlockedOr64(var, (__int64) 1);
+			return 0;
+		    ],
+		    have_ilckd=yes)
+	AC_MSG_RESULT([$have_ilckd])
+	test $have_ilckd = yes && AC_DEFINE(ETHR_HAVE__INTERLOCKEDOR64, 1, [Define if you have _InterlockedOr64()])
+
 	;;
 
     pthread)
+	ETHR_THR_LIB_BASE_DIR=pthread
     	AC_DEFINE(ETHR_PTHREADS, 1, [Define if you have pthreads])
 	case $host_os in
 	    openbsd*)
@@ -775,9 +924,7 @@ case "$THR_LIB_NAME" in
 		if test $usable_sigaltstack = no; then
 		    ETHR_DEFS="$ETHR_DEFS -DETHR_UNUSABLE_SIGALTSTACK"
 		fi
-
-		AC_DEFINE(ETHR_INIT_MUTEX_IN_CHILD_AT_FORK, 1, \
-[Define if mutexes should be reinitialized (instead of unlocked) in child at fork.]) ;;
+		;;
 	    *) ;;
 	esac
 
@@ -808,6 +955,10 @@ case "$THR_LIB_NAME" in
 [Define if you need the <nptl/pthread.h> header file.])
 	fi
 
+	AC_CHECK_HEADER(sched.h, \
+			AC_DEFINE(ETHR_HAVE_SCHED_H, 1, \
+[Define if you have the <sched.h> header file.]))
+
 	AC_CHECK_HEADER(sys/time.h, \
 			AC_DEFINE(ETHR_HAVE_SYS_TIME_H, 1, \
 [Define if you have the <sys/time.h> header file.]))
@@ -823,26 +974,63 @@ case "$THR_LIB_NAME" in
 	dnl Check for functions
 	dnl
 
-	AC_CHECK_FUNC(pthread_atfork, \
-			AC_DEFINE(ETHR_HAVE_PTHREAD_ATFORK, 1, \
-[Define if you have the pthread_atfork function.]))
-	AC_CHECK_FUNC(pthread_mutexattr_settype, \
-			AC_DEFINE(ETHR_HAVE_PTHREAD_MUTEXATTR_SETTYPE, 1, \
-[Define if you have the pthread_mutexattr_settype function.]))
-	AC_CHECK_FUNC(pthread_mutexattr_setkind_np, \
-			AC_DEFINE(ETHR_HAVE_PTHREAD_MUTEXATTR_SETKIND_NP, 1, \
-[Define if you have the pthread_mutexattr_setkind_np function.]))
 	AC_CHECK_FUNC(pthread_spin_lock, \
-			AC_DEFINE(ETHR_HAVE_PTHREAD_SPIN_LOCK, 1, \
-[Define if you have the pthread_spin_lock function.]))
+			[ethr_have_native_spinlock=yes \
+			 AC_DEFINE(ETHR_HAVE_PTHREAD_SPIN_LOCK, 1, \
+[Define if you have the pthread_spin_lock function.])])
+
+	have_sched_yield=no
+	have_librt_sched_yield=no
+	AC_CHECK_FUNC(sched_yield, [have_sched_yield=yes])
+	if test $have_sched_yield = no; then
+	    AC_CHECK_LIB(rt, sched_yield,
+			 [have_librt_sched_yield=yes
+			  ETHR_X_LIBS="$ETHR_X_LIBS -lrt"])
+	fi
+	if test $have_sched_yield = yes || test $have_librt_sched_yield = yes; then
+	    AC_DEFINE(ETHR_HAVE_SCHED_YIELD, 1, [Define if you have the sched_yield() function.])
+	    AC_MSG_CHECKING([whether sched_yield() returns an int])
+	    sched_yield_ret_int=no
+	    AC_TRY_COMPILE([
+				#ifdef ETHR_HAVE_SCHED_H
+				#include <sched.h>
+				#endif
+			   ],
+			   [int sched_yield();],
+			   [sched_yield_ret_int=yes])
+	    AC_MSG_RESULT([$sched_yield_ret_int])
+	    if test $sched_yield_ret_int = yes; then
+		AC_DEFINE(ETHR_SCHED_YIELD_RET_INT, 1, [Define if sched_yield() returns an int.])
+	    fi
+	fi
+
+	have_pthread_yield=no
+	AC_CHECK_FUNC(pthread_yield, [have_pthread_yield=yes])
+	if test $have_pthread_yield = yes; then
+	    AC_DEFINE(ETHR_HAVE_PTHREAD_YIELD, 1, [Define if you have the pthread_yield() function.])
+	    AC_MSG_CHECKING([whether pthread_yield() returns an int])
+	    pthread_yield_ret_int=no
+	    AC_TRY_COMPILE([
+				#if defined(ETHR_NEED_NPTL_PTHREAD_H)
+				#include <nptl/pthread.h>
+				#elif defined(ETHR_HAVE_MIT_PTHREAD_H)
+				#include <pthread/mit/pthread.h>
+				#elif defined(ETHR_HAVE_PTHREAD_H)
+				#include <pthread.h>
+				#endif
+			   ],
+			   [int pthread_yield();],
+			   [pthread_yield_ret_int=yes])
+	    AC_MSG_RESULT([$pthread_yield_ret_int])
+	    if test $pthread_yield_ret_int = yes; then
+		AC_DEFINE(ETHR_PTHREAD_YIELD_RET_INT, 1, [Define if pthread_yield() returns an int.])
+	    fi
+	fi
 
 	have_pthread_rwlock_init=no
 	AC_CHECK_FUNC(pthread_rwlock_init, [have_pthread_rwlock_init=yes])
 	if test $have_pthread_rwlock_init = yes; then
 
-	    AC_DEFINE(ETHR_HAVE_PTHREAD_RWLOCK_INIT, 1, \
-[Define if you have a pthread_rwlock implementation that can be used.])
-
 	    ethr_have_pthread_rwlockattr_setkind_np=no
 	    AC_CHECK_FUNC(pthread_rwlockattr_setkind_np,
 			  [ethr_have_pthread_rwlockattr_setkind_np=yes])
@@ -876,12 +1064,42 @@ case "$THR_LIB_NAME" in
 	    fi
 	fi
 
+	if test "$force_pthread_rwlocks" = "yes"; then
+
+	    AC_DEFINE(ETHR_FORCE_PTHREAD_RWLOCK, 1, \
+[Define if you want to force usage of pthread rwlocks])
 
+	    if test $have_pthread_rwlock_init = yes; then
+		AC_MSG_WARN([Forced usage of pthread rwlocks. Note that this implementation may suffer from starvation issues.])
+	    else
+		AC_MSG_ERROR([User forced usage of pthread rwlock, but no such implementation was found])
+	    fi
+	fi
 
 	AC_CHECK_FUNC(pthread_attr_setguardsize, \
 			AC_DEFINE(ETHR_HAVE_PTHREAD_ATTR_SETGUARDSIZE, 1, \
 [Define if you have the pthread_attr_setguardsize function.]))
 
+	linux_futex=no
+	AC_MSG_CHECKING([for Linux futexes])
+	AC_TRY_LINK([
+			#include <sys/syscall.h>
+			#include <unistd.h>
+			#include <linux/futex.h>
+			#include <sys/time.h>
+		    ],
+		    [
+			int i = 1;
+			syscall(__NR_futex, (void *) &i, FUTEX_WAKE, 1,
+				(void*)0,(void*)0, 0);
+			syscall(__NR_futex, (void *) &i, FUTEX_WAIT, 0,
+				(void*)0,(void*)0, 0);
+			return 0;
+		    ],
+		    linux_futex=yes)
+	AC_MSG_RESULT([$linux_futex])
+	test $linux_futex = yes && AC_DEFINE(ETHR_HAVE_LINUX_FUTEX, 1, [Define if you have a linux futex implementation.])
+
 	AC_MSG_CHECKING([for GCC atomic operations])
 	ethr_have_gcc_atomic_ops=no
 	AC_TRY_LINK([],
@@ -899,10 +1117,69 @@ case "$THR_LIB_NAME" in
 	AC_MSG_RESULT([$ethr_have_gcc_atomic_ops])
 	test $ethr_have_gcc_atomic_ops = yes && AC_DEFINE(ETHR_HAVE_GCC_ATOMIC_OPS, 1, [Define if you have gcc atomic operations])
 
+	case "$host_cpu" in
+	  sun4u | sparc64 | sun4v)
+		ethr_have_native_atomics=yes;; 
+	  i86pc | i*86 | x86_64 | amd64)
+		ethr_have_native_atomics=yes;;
+	  macppc | ppc | "Power Macintosh")
+		ethr_have_native_atomics=yes;;
+	  tile)
+		ethr_have_native_atomics=yes;;
+	  *)
+		;;
+	esac
+
+	AC_MSG_CHECKING([for a usable libatomic_ops implementation])
+	case "x$with_libatomic_ops" in
+	    xno | xyes | x)
+		libatomic_ops_include=
+		;;
+	    *)
+		if test -d "${with_libatomic_ops}/include"; then
+		    libatomic_ops_include="-I$with_libatomic_ops/include"
+		    CPPFLAGS="$CPPFLAGS $libatomic_ops_include"
+		else
+		    AC_MSG_ERROR([libatomic_ops include directory $with_libatomic_ops/include not found])
+		fi;;
+	esac
+	ethr_have_libatomic_ops=no
+	AC_TRY_LINK([#include "atomic_ops.h"],
+		    [
+			volatile AO_t x;
+			AO_t y;
+			int z;
+
+			AO_nop_full();
+			AO_store(&x, (AO_t) 0);
+			z = AO_load(&x);
+			z = AO_compare_and_swap(&x, (AO_t) 0, (AO_t) 1);
+		    ],
+		    [ethr_have_native_atomics=yes
+		     ethr_have_libatomic_ops=yes])
+	AC_MSG_RESULT([$ethr_have_libatomic_ops])
+	if test $ethr_have_libatomic_ops = yes; then
+	    AC_CHECK_SIZEOF(AO_t, ,
+			    [
+				#include <stdio.h>
+				#include "atomic_ops.h"
+			    ])
+	    AC_DEFINE_UNQUOTED(ETHR_SIZEOF_AO_T, $ac_cv_sizeof_AO_t, [Define to the size of AO_t if libatomic_ops is used])
+
+	    AC_DEFINE(ETHR_HAVE_LIBATOMIC_OPS, 1, [Define if you have libatomic_ops atomic operations])
+	    if test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
+		AC_DEFINE(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS, 1, [Define if you prefer libatomic_ops native ethread implementations])
+	    fi
+	    ETHR_DEFS="$ETHR_DEFS $libatomic_ops_include"
+	elif test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
+	    AC_MSG_ERROR([No usable libatomic_ops implementation found])
+	fi
+
 	dnl Restore LIBS
 	LIBS=$saved_libs
 	dnl restore CPPFLAGS
 	CPPFLAGS=$saved_cppflags
+
 	;;
     *)
 	;;
@@ -918,20 +1195,49 @@ fi
 
 if test "x$ETHR_THR_LIB_BASE" != "x"; then
 	ETHR_DEFS="-DUSE_THREADS $ETHR_DEFS"
-	ETHR_LIBS="-l$ethr_lib_name $ETHR_X_LIBS"
+	ETHR_LIBS="-l$ethr_lib_name -lerts_internal_r $ETHR_X_LIBS"
 	ETHR_LIB_NAME=$ethr_lib_name
 fi
 
 AC_CHECK_SIZEOF(void *)
 AC_DEFINE_UNQUOTED(ETHR_SIZEOF_PTR, $ac_cv_sizeof_void_p, [Define to the size of pointers])
 
-if test "X$disable_native_ethr_impls" = "Xyes"; then
-	AC_DEFINE(ETHR_DISABLE_NATIVE_IMPLS, 1, [Define if you want to disable native ethread implementations])
+AC_CHECK_SIZEOF(int)
+AC_DEFINE_UNQUOTED(ETHR_SIZEOF_INT, $ac_cv_sizeof_int, [Define to the size of int])
+AC_CHECK_SIZEOF(long)
+AC_DEFINE_UNQUOTED(ETHR_SIZEOF_LONG, $ac_cv_sizeof_long, [Define to the size of long])
+AC_CHECK_SIZEOF(long long)
+AC_DEFINE_UNQUOTED(ETHR_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long, [Define to the size of long long])
+AC_CHECK_SIZEOF(__int64)
+AC_DEFINE_UNQUOTED(ETHR_SIZEOF___INT64, $ac_cv_sizeof___int64, [Define to the size of __int64])
+
+
+case X$erl_xcomp_bigendian in
+    X) ;;
+    Xyes|Xno) ac_cv_c_bigendian=$erl_xcomp_bigendian;;
+    *) AC_MSG_ERROR([Bad erl_xcomp_bigendian value: $erl_xcomp_bigendian]);;
+esac
+
+AC_C_BIGENDIAN
+
+if test "$ac_cv_c_bigendian" = "yes"; then
+    AC_DEFINE(ETHR_BIGENDIAN, 1, [Define if bigendian])
 fi
 
+AC_ARG_ENABLE(native-ethr-impls,
+	      AS_HELP_STRING([--disable-native-ethr-impls],
+                             [disable native ethread implementations]),
+[ case "$enableval" in
+    no) disable_native_ethr_impls=yes ;;
+    *)  disable_native_ethr_impls=no ;;
+  esac ], disable_native_ethr_impls=no)
+
+test "X$disable_native_ethr_impls" = "Xyes" &&
+  AC_DEFINE(ETHR_DISABLE_NATIVE_IMPLS, 1, [Define if you want to disable native ethread implementations])
+
 AC_ARG_ENABLE(prefer-gcc-native-ethr-impls,
 	      AS_HELP_STRING([--enable-prefer-gcc-native-ethr-impls],
-			     [enable prefer gcc native ethread implementations]),
+			     [prefer gcc native ethread implementations]),
 [ case "$enableval" in
     yes) enable_prefer_gcc_native_ethr_impls=yes ;;
     *)  enable_prefer_gcc_native_ethr_impls=no ;;
@@ -940,6 +1246,60 @@ AC_ARG_ENABLE(prefer-gcc-native-ethr-impls,
 test $enable_prefer_gcc_native_ethr_impls = yes &&
   AC_DEFINE(ETHR_PREFER_GCC_NATIVE_IMPLS, 1, [Define if you prefer gcc native ethread implementations])
 
+AC_ARG_WITH(libatomic_ops,
+	    AS_HELP_STRING([--with-libatomic_ops=PATH],
+			   [specify and prefer usage of libatomic_ops in the ethread library]))
+
+AC_ARG_ENABLE(ethread-pre-pentium4-compatibility,
+	      AS_HELP_STRING([--enable-ethread-pre-pentium4-compatibility],
+			     [enable compatibility with x86 processors before pentium 4 (back to 486) in the ethread library]),
+[
+  case "$enable_ethread_pre_pentium4_compatibility" in
+    yes|no) ;;
+    *) enable_ethread_pre_pentium4_compatibility=check;;
+  esac
+],
+[enable_ethread_pre_pentium4_compatibility=check])
+
+test "$cross_compiling" != "yes" || enable_ethread_pre_pentium4_compatibility=no
+
+case "$enable_ethread_pre_pentium4_compatibility-$host_cpu" in
+  check-i86pc | check-i*86)
+    AC_MSG_CHECKING([whether pre pentium 4 compatibility should forced])
+    AC_RUN_IFELSE([
+#if defined(__GNUC__)
+#  if defined(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS)
+#    define CHECK_LIBATOMIC_OPS__
+#  else
+#    define CHECK_GCC_ASM__
+#  endif
+#elif defined(ETHR_HAVE_LIBATOMIC_OPS)
+#  define CHECK_LIBATOMIC_OPS__
+#endif
+#if defined(CHECK_LIBATOMIC_OPS__)
+#include "atomic_ops.h"
+#endif
+int main(void)
+{
+#if defined(CHECK_GCC_ASM__)
+    __asm__ __volatile__("mfence" : : : "memory");
+#elif defined(CHECK_LIBATOMIC_OPS__)
+    AO_nop_full();
+#endif
+    return 0;
+}
+	],
+	[enable_ethread_pre_pentium4_compatibility=no],
+	[enable_ethread_pre_pentium4_compatibility=yes],
+	[enable_ethread_pre_pentium4_compatibility=no])
+    AC_MSG_RESULT([$enable_ethread_pre_pentium4_compatibility]);;
+  *)
+    ;;
+esac
+
+test $enable_ethread_pre_pentium4_compatibility = yes &&
+  AC_DEFINE(ETHR_PRE_PENTIUM4_COMPAT, 1, [Define if you want compatibilty with x86 processors before pentium4.])
+
 AC_DEFINE(ETHR_HAVE_ETHREAD_DEFINES, 1, \
 [Define if you have all ethread defines])
 
@@ -948,6 +1308,7 @@ AC_SUBST(ETHR_LIBS)
 AC_SUBST(ETHR_LIB_NAME)
 AC_SUBST(ETHR_DEFS)
 AC_SUBST(ETHR_THR_LIB_BASE)
+AC_SUBST(ETHR_THR_LIB_BASE_DIR)
 
 ])
 
diff --git a/erts/autoconf/configure.vxworks b/erts/autoconf/configure.vxworks
index 70d7bdbaf2..14fbf766dc 100755
--- a/erts/autoconf/configure.vxworks
+++ b/erts/autoconf/configure.vxworks
@@ -101,7 +101,6 @@ epmd_dir=${ERL_TOP}/erts/epmd/src
 os_mon_dir=${ERL_TOP}/lib/os_mon/c_src
 orber_dir=${ERL_TOP}/lib/orber/c_src
 ic_dir=${ERL_TOP}/lib/ic/c_src
-asn1_dir=${ERL_TOP}/lib/asn1/c_src
 internal_tools_dir=${ERL_TOP}
 libdir=${ERL_TOP}/lib
 tsdir=$libdir/test_server/src
@@ -122,7 +121,6 @@ CONFIG_FILES="${ERL_TOP}/erts/emulator/$host/Makefile
 	    $os_mon_dir/$host/Makefile
 	    $zlibdir/$host/Makefile
 	    $ic_dir/$host/Makefile
-	    $asn1_dir/$host/Makefile
 	    $runtime_tools_dir/$host/Makefile
 	    $tools_dir/$host/Makefile
 	    $orber_dir/$host/Makefile"
diff --git a/erts/autoconf/vxworks/sed.general b/erts/autoconf/vxworks/sed.general
index f725a6f9ca..551458daf5 100644
--- a/erts/autoconf/vxworks/sed.general
+++ b/erts/autoconf/vxworks/sed.general
@@ -55,12 +55,16 @@ s|@ETHR_LIBS@||
 s|@ETHR_LIB_NAME@||
 s|@ETHR_DEFS@||
 s|@ETHR_THR_LIB_BASE@||
+s|@ETHR_THR_LIB_BASE_DIR@||
 s|@EMU_THR_DEFS@||
 s|@EMU_THR_LIBS@||
 s|@EMU_THR_LIB_NAME@|ethread|
 s|@ERTS_ENABLE_KERNEL_POLL@|no|
+s|@ERTS_INTERNAL_X_LIBS@||
 s|@cc_root@|/clearcase/otp/|
 # Define VxWorks even though cross-compiling. 
+s|@CROSS_COMPILING|yes|
+
 s|@HCFLAGS@|-DVXWORKS|
 s|@HCLIBS@||
 s|@ENABLE_ALLOC_TYPE_VARS@||
diff --git a/erts/autoconf/win32.config.cache b/erts/autoconf/win32.config.cache.static
index 31dfe510cd..d25b1df9d9 100755
--- a/erts/autoconf/win32.config.cache
+++ b/erts/autoconf/win32.config.cache.static
@@ -61,7 +61,6 @@ ac_cv_func_fork=${ac_cv_func_fork=no}
 ac_cv_func_fork_works=${ac_cv_func_fork_works=no}
 ac_cv_func_fpsetmask=${ac_cv_func_fpsetmask=no}
 ac_cv_func_fstat=${ac_cv_func_fstat=yes}
-ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=no}
 ac_cv_func_gethostbyaddr=${ac_cv_func_gethostbyaddr=no}
 ac_cv_func_gethostbyaddr_r=${ac_cv_func_gethostbyaddr_r=no}
 ac_cv_func_gethostbyname=${ac_cv_func_gethostbyname=no}
@@ -71,7 +70,6 @@ ac_cv_func_gethostname=${ac_cv_func_gethostname=no}
 ac_cv_func_gethrtime=${ac_cv_func_gethrtime=no}
 ac_cv_func_getipnodebyaddr=${ac_cv_func_getipnodebyaddr=no}
 ac_cv_func_getipnodebyname=${ac_cv_func_getipnodebyname=no}
-ac_cv_func_getnameinfo=${ac_cv_func_getnameinfo=no}
 ac_cv_func_getpagesize=${ac_cv_func_getpagesize=no}
 ac_cv_func_gettimeofday=${ac_cv_func_gettimeofday=no}
 ac_cv_func_gmtime_r=${ac_cv_func_gmtime_r=no}
@@ -212,7 +210,6 @@ ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4}
 ac_cv_struct_exception=${ac_cv_struct_exception=no}
 ac_cv_struct_sockaddr_sa_len=${ac_cv_struct_sockaddr_sa_len=no}
 ac_cv_struct_tm=${ac_cv_struct_tm=time.h}
-ac_cv_sys_ipv6_support=${ac_cv_sys_ipv6_support=no}
 ac_cv_sys_multicast_support=${ac_cv_sys_multicast_support=no}
 ac_cv_type_char=${ac_cv_type_char=yes}
 ac_cv_type_int=${ac_cv_type_int=yes}
diff --git a/erts/configure.in b/erts/configure.in
index 63bf548c89..627f734409 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -61,6 +61,9 @@ if test x"${ERL_TOP}/erts" != x"$srcdir"; then
 fi
 erl_top=${ERL_TOP}
 
+# Remove old configuration information
+/bin/rm -f "$ERL_TOP/erts/CONF_INFO"
+
 # echo XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 # echo X
 # echo "X srcdir  = $srcdir"
@@ -87,6 +90,13 @@ else
     host_os=$host
 fi
 
+if test "$cross_compiling" = "yes"; then
+    CROSS_COMPILING=yes
+else
+    CROSS_COMPILING=no
+fi
+AC_SUBST(CROSS_COMPILING)
+
 ERL_XCOMP_SYSROOT_INIT
 
 AC_ISC_POSIX
@@ -100,7 +110,8 @@ ENABLE_ALLOC_TYPE_VARS=
 AC_SUBST(ENABLE_ALLOC_TYPE_VARS)
 
 AC_ARG_ENABLE(bootstrap-only,
-[  --enable-bootstrap-only enable bootstrap only configuration],
+AS_HELP_STRING([--enable-bootstrap-only],
+               [enable bootstrap only configuration]),
 [ if test "X$enableval" = "Xyes"; then
 	# Disable stuff not necessary in a bootstrap only system in order
 	# to speed up things by reducing the amount of stuff needing to be
@@ -116,46 +127,46 @@ AC_ARG_ENABLE(bootstrap-only,
 ])
 
 AC_ARG_ENABLE(threads,
-[  --enable-threads        enable async thread support
-  --disable-threads       disable async thread support],
+AS_HELP_STRING([--enable-threads], [enable async thread support])
+AS_HELP_STRING([--disable-threads], [disable async thread support]),
 [ case "$enableval" in
     no) enable_threads=no ;;
     *)  enable_threads=yes ;;
   esac ], enable_threads=unknown)
 
 AC_ARG_ENABLE(halfword-emulator,
-[  --enable-halfword-emulator        enable halfword emulator (only for 64bit builds)
-  --disable-halfword-emulator        disable halfword emulator (only for 64bit builds)],
+AS_HELP_STRING([--enable-halfword-emulator],
+               [enable halfword emulator (only for 64bit builds)]),
 [ case "$enableval" in
     no) enable_halfword_emualtor=no ;;
     *)  enable_halfword_emulator=yes ;;
   esac ], enable_halfword_emulator=unknown)
 
 AC_ARG_ENABLE(smp-support,
-[  --enable-smp-support    enable smp support
-  --disable-smp-support   disable smp support],
+AS_HELP_STRING([--enable-smp-support], [enable smp support])
+AS_HELP_STRING([--disable-smp-support], [disable smp support]),
 [ case "$enableval" in
     no) enable_smp_support=no ;;
     *)  enable_smp_support=yes ;;
   esac ], enable_smp_support=unknown)
 
 AC_ARG_WITH(termcap,
-[  --with-termcap          use termcap (default)
-  --without-termcap       do not use any termcap libraries (ncurses,curses,termcap,termlib)],
+AS_HELP_STRING([--with-termcap], [use termcap (default)])
+AS_HELP_STRING([--without-termcap],
+               [do not use any termcap libraries (ncurses,curses,termcap,termlib)]),
 [],
 [with_termcap=yes])
 
 
 AC_ARG_ENABLE(hybrid-heap,
-[  --enable-hybrid-heap    enable hybrid heap
-  --disable-hybrid-heap   disable hybrid heap],
+AS_HELP_STRING([--enable-hybrid-heap], [enable hybrid heap]),
 [ case "$enableval" in
     no) enable_hybrid_heap=no ;;
     *)  enable_hybrid_heap=yes ;;
   esac ], enable_hybrid_heap=unknown)
 
 AC_ARG_ENABLE(lock-checking,
-[  --enable-lock-checking  enable lock checking],
+AS_HELP_STRING([--enable-lock-checking], [enable lock checking]),
 [ case "$enableval" in
     no) enable_lock_check=no ;;
     *)  enable_lock_check=yes ;;
@@ -164,16 +175,15 @@ AC_ARG_ENABLE(lock-checking,
   enable_lock_check=no)
 
 AC_ARG_ENABLE(lock-counter,
-[  --enable-lock-counter    enable lock counters
-  --disable-lock-counter   disable lock counters],
+AS_HELP_STRING([--enable-lock-counter], [enable lock counters]),
 [ case "$enableval" in
     no) enable_lock_count=no ;;
     *)  enable_lock_count=yes ;;
   esac ], enable_lock_count=no)
 
 AC_ARG_ENABLE(kernel-poll,
-[  --enable-kernel-poll    enable kernel poll support
-  --disable-kernel-poll   disable kernel poll support],
+AS_HELP_STRING([--enable-kernel-poll], [enable kernel poll support])
+AS_HELP_STRING([--disable-kernel-poll], [disable kernel poll support]),
 [ case "$enableval" in
     no) enable_kernel_poll=no ;;
     *)  enable_kernel_poll=yes ;;
@@ -181,28 +191,27 @@ AC_ARG_ENABLE(kernel-poll,
 
 
 AC_ARG_ENABLE(sctp,
-[  --enable-sctp           enable sctp support
-  --disable-sctp          disable sctp support],
+AS_HELP_STRING([--enable-sctp], [enable sctp support])
+AS_HELP_STRING([--disable-sctp], [disable sctp support]),
 [ case "$enableval" in
     no) enable_sctp=no ;;
     *)  enable_sctp=yes ;;
   esac ], enable_sctp=unknown)
 
 AC_ARG_ENABLE(hipe,
-[  --enable-hipe           enable hipe support
-  --disable-hipe          disable hipe support])
+AS_HELP_STRING([--enable-hipe], [enable hipe support])
+AS_HELP_STRING([--disable-hipe], [disable hipe support]))
 
 AC_ARG_ENABLE(native-libs,
-[  --enable-native-libs    compile Erlang libraries to native code])
+AS_HELP_STRING([--enable-native-libs],
+               [compile Erlang libraries to native code]))
 
 AC_ARG_ENABLE(tsp,
-[  --enable-tsp            compile tsp app])
-
-AC_ARG_ENABLE(elib-malloc,
-[  --enable-elib-malloc    use elib_malloc instead of normal malloc])
+AS_HELP_STRING([--enable-tsp], [compile tsp app]))
 
 AC_ARG_ENABLE(fp-exceptions,
-[  --enable-fp-exceptions    Use hardware floating point exceptions (default if hipe enabled)],
+AS_HELP_STRING([--enable-fp-exceptions],
+               [use hardware floating point exceptions (default if hipe enabled)]),
 [ case "$enableval" in
     no) enable_fp_exceptions=no ;;
     *)  enable_fp_exceptions=yes ;;
@@ -210,7 +219,8 @@ AC_ARG_ENABLE(fp-exceptions,
 ],enable_fp_exceptions=auto)
 
 AC_ARG_ENABLE(darwin-universal,
-[  --enable-darwin-universal    build universal binaries on darwin i386],
+AS_HELP_STRING([--enable-darwin-universal],
+               [build universal binaries on darwin i386]),
 [ case "$enableval" in
     no) enable_darwin_universal=no ;;
     *)  enable_darwin_univeral=yes ;;
@@ -219,7 +229,7 @@ AC_ARG_ENABLE(darwin-universal,
 
 
 AC_ARG_ENABLE(darwin-64bit,
-[  --enable-darwin-64bit    build 64bit binaries on darwin],
+AS_HELP_STRING([--enable-darwin-64bit], [build 64bit binaries on darwin]),
 [ case "$enableval" in
     no) enable_darwin_64bit=no ;;
     *)  enable_darwin_64bit=yes ;;
@@ -227,7 +237,8 @@ AC_ARG_ENABLE(darwin-64bit,
 ],enable_darwin_64bit=no)
 
 AC_ARG_ENABLE(m64-build,
-[  --enable-m64-build    build 64bit binaries using the -m64 flag to (g)cc],
+AS_HELP_STRING([--enable-m64-build],
+               [build 64bit binaries using the -m64 flag to (g)cc]),
 [ case "$enableval" in
     no) enable_m64_build=no ;;
     *)  enable_m64_build=yes ;;
@@ -235,7 +246,8 @@ AC_ARG_ENABLE(m64-build,
 ],enable_m64_build=no)
 
 AC_ARG_ENABLE(m32-build,
-[  --enable-m32-build    build 32bit binaries using the -m32 flag to (g)cc],
+AS_HELP_STRING([--enable-m32-build],
+               [build 32bit binaries using the -m32 flag to (g)cc]),
 [ case "$enableval" in
     no) enable_m32_build=no ;;
     *)
@@ -248,7 +260,7 @@ AC_ARG_ENABLE(m32-build,
 ],enable_m32_build=no)
 
 AC_ARG_ENABLE(fixalloc,
-[  --disable-fixalloc      disable the use of fix_alloc])
+AS_HELP_STRING([--disable-fixalloc], [disable the use of fix_alloc]))
 if test x${enable_fixalloc} = xno ; then
   AC_DEFINE(NO_FIX_ALLOC,[],
 	    [Define if you don't want the fix allocator in Erlang])
@@ -256,8 +268,9 @@ fi
 
 AC_SUBST(PERFCTR_PATH)
 AC_ARG_WITH(perfctr,
-[  --with-perfctr=PATH     specify location of perfctr include and lib
-  --without-perfctr       don't use perfctr (default)])
+AS_HELP_STRING([--with-perfctr=PATH],
+               [specify location of perfctr include and lib])
+AS_HELP_STRING([--without-perfctr], [don't use perfctr (default)]))
 
 if test "x$with_perfctr" = "xno" -o "x$with_perfctr" = "x" ; then
     PERFCTR_PATH=
@@ -271,26 +284,13 @@ else
 fi
 
 AC_ARG_ENABLE(clock-gettime,
-[  --enable-clock-gettime  Use clock-gettime for time correction],
+AS_HELP_STRING([--enable-clock-gettime],
+               [use clock-gettime for time correction]),
 [ case "$enableval" in
     no) clock_gettime_correction=no ;;
     *) clock_gettime_correction=yes ;;
   esac ], clock_gettime_correction=unknown)
 
-AC_ARG_ENABLE(native-ethr-impls,
-[  --enable-native-ethr-impls enable native ethread implementations
-  --disable-native-ethr-impls disable native ethread implementations],
-[ case "$enableval" in
-    no) disable_native_ethr_impls=yes ;;
-    *)  disable_native_ethr_impls=no ;;
-  esac ], disable_native_ethr_impls=no)
-
-dnl Defined in libraries/megaco/configure.in but we need it here
-dnl also in order to show it to the "top user"
-
-AC_ARG_ENABLE(megaco_flex_scanner_lineno,
-[  --disable-megaco-flex-scanner-lineno disable megaco flex scanner lineno])
-
 dnl Magic test for clearcase.
 OTP_RELEASE=
 if test "${ERLANG_COMMERCIAL_BUILD}" != ""; then
@@ -580,6 +580,11 @@ AC_SUBST(WFLAGS)
 AC_SUBST(CFLAG_RUNTIME_LIBRARY_PATH)
 
 AC_CHECK_SIZEOF(void *) # Needed for ARCH and smp checks below
+if test "x$ac_cv_sizeof_void_p" = x8; then
+  AC_SUBST(EXTERNAL_WORD_SIZE, 64)
+else
+  AC_SUBST(EXTERNAL_WORD_SIZE, 32)
+fi
 
 dnl
 dnl Figure out operating system and cpu architecture
@@ -1049,6 +1054,42 @@ if test $ERTS_BUILD_SMP_EMU = yes; then
 	fi
 
 	AC_DEFINE(ERTS_HAVE_SMP_EMU, 1, [Define if the smp emulator is built])
+
+	case "$ethr_have_native_atomics-$ethr_have_native_spinlock" in
+	  yes-*)
+		;;
+
+	  no-yes)
+
+		test -f "$ERL_TOP/erts/CONF_INFO" ||
+		    echo "" > "$ERL_TOP/erts/CONF_INFO"
+		cat >> $ERL_TOP/erts/CONF_INFO <<EOF
+
+                 No native atomic implementation available.
+                 Fallbacks implemented using spinlocks will be
+                 used. Note that the performance of the SMP
+                 runtime system will suffer due to this.
+
+EOF
+		;;
+
+	  no-no)
+
+		test -f "$ERL_TOP/erts/CONF_INFO" ||
+		    echo "" > "$ERL_TOP/erts/CONF_INFO"
+		cat >> "$ERL_TOP/erts/CONF_INFO" <<EOF
+
+                 No native atomic implementation, nor no native
+                 spinlock implementation available. Fallbacks
+                 implemented using mutexes will be used. Note
+                 that the performance of the SMP runtime system
+                 will suffer much due to this.
+
+EOF
+		;;
+
+	esac
+
 	enable_threads=force
 fi
 
@@ -1149,17 +1190,15 @@ else
 		enable_child_waiter_thread=yes
 		;;
 	    linux*)
-		AC_DEFINE(USE_RECURSIVE_MALLOC_MUTEX,[1],
-			[Define if malloc should use a recursive mutex])
 		AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
-		if test "x$ETHR_THR_LIB_BASE_NAME" != "xnptl"; then
+		if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
 		    AC_DEFINE(ERTS_NEED_DLOPEN_BEFORE_DLERROR,[1],
 			[Define if dlopen() needs to be called before first call to dlerror()])
 			AC_MSG_RESULT(yes)
 		else
 			AC_MSG_RESULT(no)
 		fi
-		if test "x$ETHR_THR_LIB_BASE_NAME" != "xnptl"; then
+		if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
 		    # Child waiter thread cannot be enabled
 		    disable_child_waiter_thread=yes
 		    enable_child_waiter_thread=no
@@ -1221,13 +1260,7 @@ fi
 
 AC_SUBST(EMU_LOCK_CHECKING)
 
-ERTS_INTERNAL_X_LIBS=
-
-AC_CHECK_LIB(kstat, kstat_open,
-[AC_DEFINE(HAVE_KSTAT, 1, [Define if you have kstat])
-ERTS_INTERNAL_X_LIBS="$ERTS_INTERNAL_X_LIBS -lkstat"])
-
-AC_SUBST(ERTS_INTERNAL_X_LIBS)
+ERL_INTERNAL_LIBS
 
 dnl THR_LIBS and THR_DEFS are only used by odbc
 THR_LIBS=$ETHR_X_LIBS
@@ -1272,8 +1305,7 @@ dnl zlib
 dnl -------------
 
 AC_ARG_ENABLE(shared-zlib,
-[  --enable-shared-zlib        enable using shared zlib library
-  --disable-shared-zlib       disable shared zlib, compile own zlib source (default)],
+AS_HELP_STRING([--enable-shared-zlib], [enable using shared zlib library]),
 [ case "$enableval" in
     no) enable_shared_zlib=no ;;
     *)  enable_shared_zlib=yes ;;
@@ -1452,7 +1484,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h unistd.h syslog.h dlfcn.h ieeefp.h \
                  sys/ioctl.h sys/time.h sys/uio.h \
                  sys/socket.h sys/sockio.h sys/socketio.h \
                  net/errno.h malloc.h mach-o/dyld.h arpa/nameser.h \
-		 pty.h util.h utmp.h langinfo.h poll.h)
+		 pty.h util.h utmp.h langinfo.h poll.h sdkddkver.h)
 
 AC_CHECK_HEADER(sys/resource.h,
 	[AC_DEFINE(HAVE_SYS_RESOURCE_H, 1,
@@ -1652,18 +1684,62 @@ LIBS="$LIBS $EMU_THR_X_LIBS"
 
 dnl Check if we have these, in which case we'll try to build
 dnl inet_gethost with ipv6 support.
-AC_CHECK_FUNC(getaddrinfo, have_getaddrinfo=yes, have_getaddrinfo=no)
+AC_CHECK_HEADERS(windows.h)
+AC_CHECK_HEADERS(winsock2.h)
+AC_CHECK_HEADERS(ws2tcpip.h,[],[],[
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+])
+dnl AC_CHECK_FUNC(getaddrinfo, have_getaddrinfo=yes, have_getaddrinfo=no)
+AC_MSG_CHECKING(for getaddrinfo)
+AC_TRY_LINK([
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#ifndef __WIN32__
+#include <sys/socket.h>
+#include <netdb.h>
+#endif
+], 
+[
+getaddrinfo("","",NULL,NULL);
+],have_getaddrinfo=yes, have_getaddrinfo=no)
 if test $have_getaddrinfo = yes; then
+        AC_MSG_RESULT([yes])
         AC_MSG_CHECKING([whether getaddrinfo accepts enough flags])
-        AC_TRY_RUN([
+        AC_TRY_COMPILE([
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#ifndef __WIN32__
 #include <sys/socket.h>
 #include <netdb.h>
-int main(int argc, char **argv) {
+#endif
+],
+[
     struct addrinfo hints, *ai;
     memset(&hints, 0, sizeof(hints));
-    hints.ai_flags = (AI_CANONNAME|AI_V4MAPPED|AI_ADDRCONFIG);
+    hints.ai_flags = AI_CANONNAME;
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_family = AF_INET6;
     if (getaddrinfo("::", NULL, &hints, &ai) == 0) {
@@ -1672,32 +1748,57 @@ int main(int argc, char **argv) {
     } else {
 	exit(1);
     }
-}
-	],, have_getaddrinfo=no,
-	[
-	case X$erl_xcomp_getaddrinfo in
-	    X) have_getaddrinfo=cross;;
-	    Xyes|Xno) have_getaddrinfo=$erl_xcomp_getaddrinfo;;
-	    *) AC_MSG_ERROR([Bad erl_xcomp_getaddrinfo value: $erl_xcomp_getaddrinfo]);;
-	esac
-	])
+],, have_getaddrinfo=no)
 	AC_MSG_RESULT($have_getaddrinfo)
 	case $have_getaddrinfo in
 	    yes)
 		AC_DEFINE(HAVE_GETADDRINFO, [1], 
 		          [Define to 1 if you have a good `getaddrinfo' function.]);;
-	    cross)
-		AC_MSG_WARN([result no guessed because of cross compilation]);;
 	    *) ;;
 	esac
+else
+    AC_MSG_RESULT([no])
+fi
+AC_MSG_CHECKING(for getnameinfo)
+AC_TRY_LINK([
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#ifndef __WIN32__
+#include <sys/socket.h>
+#include <netdb.h>
+#endif
+], 
+[
+getnameinfo(NULL,0,NULL,0,NULL,0,0);
+],have_getnameinfo=yes, have_getnameinfo=no)
+if test $have_getnameinfo = yes; then
+        AC_MSG_RESULT([yes])
+	AC_DEFINE(HAVE_GETNAMEINFO, [1], 
+		  [Define to 1 if you have a good `getnameinfo' function.])
+else
+	AC_MSG_RESULT([no])	  
 fi
-AC_CHECK_FUNCS([getnameinfo getipnodebyname getipnodebyaddr gethostbyname2])
+
+
+AC_CHECK_FUNCS([getipnodebyname getipnodebyaddr gethostbyname2])
 
 AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
 		pread pwrite writev memmove strerror strerror_r strncasecmp \
 		gethrtime localtime_r gmtime_r mmap mremap memcpy mallopt \
 		sbrk _sbrk __sbrk brk _brk __brk \
 		flockfile fstat strlcpy strlcat setsid posix2time setlocale nl_langinfo poll])
+
+AC_CHECK_DECLS([posix2time],,,[#include <time.h>])
+
 if test "X$host" = "Xwin32"; then
 	ac_cv_func_setvbuf_reversed=yes
 fi
@@ -1764,6 +1865,9 @@ AC_CHECK_FUNCS([fdatasync])
 dnl Find which C libraries are required to use fdatasync
 AC_SEARCH_LIBS(fdatasync, [rt])
 
+AC_CHECK_HEADERS(net/if_dl.h ifaddrs.h netpacket/packet.h)
+AC_CHECK_FUNCS([getifaddrs])
+
 dnl ----------------------------------------------------------------------
 dnl Checks for features/quirks in the system that affects Erlang.
 dnl ----------------------------------------------------------------------
@@ -1825,6 +1929,27 @@ if test $processor_bind_functionality = yes; then
 	AC_DEFINE(HAVE_PROCESSOR_BIND, 1, [Define if you have processor_bind functionality])
 fi
 
+AC_MSG_CHECKING([for cpuset_getaffinity/cpuset_setaffinity])
+AC_TRY_COMPILE([
+#include <sys/param.h>
+#include <sys/cpuset.h>
+],
+[
+	int res;
+	cpuset_t cpuset;
+	CPU_ZERO(&cpuset);
+	CPU_SET(1, &cpuset);
+	res = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cpuset_t), &cpuset);
+	res = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cpuset_t), &cpuset);
+	res = CPU_ISSET(1, &cpuset);
+	CPU_CLR(1, &cpuset);
+],
+		cpuset_xetaffinity=yes,
+		cpuset_xetaffinity=no)
+AC_MSG_RESULT([$cpuset_xetaffinity])
+if test $cpuset_xetaffinity = yes; then
+	AC_DEFINE(HAVE_CPUSET_xETAFFINITY, 1, [Define if you have cpuset_getaffinity/cpuset_setaffinity])
+fi
 
 AC_CACHE_CHECK([for 'end' symbol],
 		erts_cv_have_end_symbol,
@@ -2649,7 +2774,7 @@ static __inline__ int check_fpe(double f)
  * Implement SIGFPE handler based on CPU/OS combination
  */
 
-#if (defined(__linux__) && (defined(__i386__) || defined(__x86_64__) || defined(__sparc__) || defined(__powerpc__))) || (defined(__DARWIN__) && (defined(__i386__) || defined(__x86_64__) || defined(__ppc__))) || (defined(__FreeBSD__) && (defined(__i386__) || defined(__x86_64__))) || (defined(__OpenBSD__) && defined(__x86_64__)) || (defined(__sun__) && defined(__x86_64__))
+#if (defined(__linux__) && (defined(__i386__) || defined(__x86_64__) || defined(__sparc__) || defined(__powerpc__))) || (defined(__DARWIN__) && (defined(__i386__) || defined(__x86_64__) || defined(__ppc__))) || (defined(__FreeBSD__) && (defined(__i386__) || defined(__x86_64__))) || ((defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__)) || (defined(__sun__) && defined(__x86_64__))
 
 #if defined(__linux__) && defined(__i386__)
 #if !defined(X86_FXSR_MAGIC)
@@ -2763,6 +2888,11 @@ static void fpe_sig_action(int sig, siginfo_t *si, void *puc)
     struct fxsave64 *fxsave = uc->sc_fpstate;
     fxsave->fx_mxcsr = 0x1F80;
     fxsave->fx_fsw &= ~0xFF;
+#elif defined(__NetBSD__) && defined(__x86_64__)
+    mcontext_t *mc = &uc->uc_mcontext;
+    struct fxsave64 *fxsave = (struct fxsave64 *)&mc->__fpregs;
+    fxsave->fx_mxcsr = 0x1F80;
+    fxsave->fx_fsw &= ~0xFF;
 #elif defined(__sun__) && defined(__x86_64__)
     mcontext_t *mc = &uc->uc_mcontext;
     struct fpchip_state *fpstate = &mc->fpregs.fp_reg_set.fpchip_state;
@@ -2980,17 +3110,6 @@ if test "x$HIPE_ENABLED" = "xyes" ; then
 fi
 
 #
-# Check if we should use elib_malloc.
-#
-
-if test X${enable_elib_malloc} = Xyes; then
- AC_DEFINE(ENABLE_ELIB_MALLOC,[],[Define to enable use of elib_malloc (a malloc() replacement)])
- AC_DEFINE(ELIB_HEAP_SBRK,[],[Elib sbrk])
- AC_DEFINE(ELIB_ALLOC_IS_CLIB,[],[Use elib malloc as clib])
- AC_DEFINE(ELIB_SORTED_BLOCKS,[],[Define to enable the use of sorted blocks when using elib_malloc])
-fi
-
-#
 # Check for working poll().
 #
 AC_MSG_CHECKING([for working poll()])
@@ -3406,14 +3525,16 @@ AC_SUBST(SSL_LINK_WITH_KERBEROS)
 AC_SUBST(STATIC_KERBEROS_LIBS)
 AC_SUBST(SSL_LINK_WITH_ZLIB)
 AC_SUBST(STATIC_ZLIB_LIBS)
-AC_SUBST(OPENSSL_CMD)
 
 std_ssl_locations="/usr/local /usr/sfw /opt/local /usr /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl"
 
 AC_ARG_WITH(ssl-zlib,
-[  --with-ssl-zlib=PATH    specify location of ZLib to be used by OpenSSL
-  --with-ssl-zlib         link SSL with  Zlib (default if found)
-  --without-ssl-zlib      don't link SSL with 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
@@ -3482,13 +3603,13 @@ fi
 		
 			
 AC_ARG_WITH(ssl,
-[  --with-ssl=PATH         specify location of OpenSSL include and lib
-  --with-ssl              use SSL (default)
-  --without-ssl           don't use 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_ENABLE(dynamic-ssl-lib,
-[  --enable-dynamic-ssl-lib        enable using dynamic openssl libraries
-  --disable-dynamic-ssl-lib       disable using dynamic openssl libraries],
+AS_HELP_STRING([--disable-dynamic-ssl-lib],
+               [disable using dynamic openssl libraries]),
 [ case "$enableval" in
     no) enable_dynamic_ssl=no ;;
     *)  enable_dynamic_ssl=yes ;;
@@ -3598,21 +3719,6 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
 			SSL_DYNAMIC_ONLY=yes
 		fi
 		SSL_BINDIR="$rdir/bin"
-dnl 		Should one use EXEEXT or ac_exeext?
-		if test -f "$erl_xcomp_sysroot$SSL_BINDIR/openssl$EXEEXT"; then
-		    if test "$cross_compiling" = "yes"; then
-			dnl Cannot test it; hope it is working...
-			OPENSSL_CMD="$SSL_BINDIR/openssl"
-		    else
-			if "$SSL_BINDIR/openssl" version > /dev/null 2>&1; then
-				OPENSSL_CMD="$SSL_BINDIR/openssl"
-			else
-				is_real_ssl=no
-			fi
-		    fi
-		else
-			is_real_ssl=no
-		fi
 		if test "x$is_real_ssl" = "xyes" ; then
 			SSL_INCLUDE="-I$dir/include"
 			old_CPPFLAGS=$CPPFLAGS
@@ -3676,7 +3782,6 @@ dnl 		Should one use EXEEXT or ac_exeext?
 		  SSL_RUNTIME_LIB="/usr/lib"
 		  SSL_LIB="$erl_xcomp_sysroot/usr/lib"
 		  SSL_BINDIR="/usr/sbin"
-		  OPENSSL_CMD="$SSL_BINDIR/openssl"
 		  dnl OpenBSD requires us to link with -L and -l
 		  SSL_DYNAMIC_ONLY="yes" 
 		fi
@@ -3762,7 +3867,6 @@ dnl		so it is - be adoptable
 	SSL_DYNAMIC_ONLY=yes
     fi
     SSL_INCLUDE="-I$with_ssl/include"
-    OPENSSL_CMD="$with_ssl/bin/openssl"
     SSL_APP=ssl
     CRYPTO_APP=crypto
     SSH_APP=ssh
@@ -3968,9 +4072,9 @@ esac
 
 			
 AC_ARG_WITH(javac,
-[  --with-javac=JAVAC      specify Java compiler to use
-  --with-javac            use a Java compiler if found (default)
-  --without-javac         don't use any Java compiler])
+AS_HELP_STRING([--with-javac=JAVAC], [specify Java compiler to use])
+AS_HELP_STRING([--with-javac], [use a Java compiler if found (default)])
+AS_HELP_STRING([--without-javac], [don't use any Java compiler]))
 
 dnl
 dnl Then there are a number of apps which needs a java compiler...
@@ -4159,7 +4263,6 @@ dnl
   ../lib/ic/c_src/$host/Makefile:../lib/ic/c_src/Makefile.in
   ../lib/os_mon/c_src/$host/Makefile:../lib/os_mon/c_src/Makefile.in
   ../lib/ssl/c_src/$host/Makefile:../lib/ssl/c_src/Makefile.in
-  ../lib/ssl/examples/certs/$host/Makefile:../lib/ssl/examples/certs/Makefile.in
   ../lib/crypto/c_src/$host/Makefile:../lib/crypto/c_src/Makefile.in
   ../lib/orber/c_src/$host/Makefile:../lib/orber/c_src/Makefile.in
   ../lib/runtime_tools/c_src/$host/Makefile:../lib/runtime_tools/c_src/Makefile.in
diff --git a/erts/doc/src/driver.xml b/erts/doc/src/driver.xml
index 006a6160de..db455312ec 100644
--- a/erts/doc/src/driver.xml
+++ b/erts/doc/src/driver.xml
@@ -196,11 +196,14 @@ static ErlDrvData start(ErlDrvPort port, char *command)
     <p>We call disconnect to log out from the database.
       (This should have been done from Erlang, but just in case.)</p>
     <code type="none"><![CDATA[
- static int do_disconnect(our_data_t* data, ei_x_buff* x);
+static int do_disconnect(our_data_t* data, ei_x_buff* x);
 
 static void stop(ErlDrvData drv_data)
 {
-    do_disconnect((our_data_t*)drv_data, NULL);
+    our_data_t* data = (our_data_t*)drv_data;
+
+    do_disconnect(data, NULL);
+    driver_free(data);
 }
     ]]></code>
     <p>We use the binary format only to return data to the emulator;
diff --git a/erts/doc/src/driver_entry.xml b/erts/doc/src/driver_entry.xml
index e71b48bd92..dfddbb18ea 100644
--- a/erts/doc/src/driver_entry.xml
+++ b/erts/doc/src/driver_entry.xml
@@ -4,7 +4,7 @@
 <cref>
   <header>
     <copyright>
-      <year>2001</year><year>2010</year>
+      <year>2001</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -36,7 +36,7 @@
   <description>
     <p>As of erts version 5.5.3 the driver interface has been extended
       (see <seealso marker="driver_entry#extended_marker">extended marker</seealso>).
-      The extended interface introduce
+      The extended interface introduces
       <seealso marker="erl_driver#version_management">version management</seealso>,
       the possibility to pass capability flags
       (see <seealso marker="driver_entry#driver_flags">driver flags</seealso>)
@@ -45,21 +45,21 @@
     <note>
       <p>Old drivers (compiled with an <c>erl_driver.h</c> from an
         earlier erts version than 5.5.3) have to be recompiled
-        (but does not have to use the extended interface).</p>
+        (but do not have to use the extended interface).</p>
     </note>
     <p>The <c>driver_entry</c> structure is a C struct that all erlang
-      drivers defines. It contains entry points for the erlang driver
+      drivers define. It contains entry points for the erlang driver
       that are called by the erlang emulator when erlang code accesses
       the driver.</p>
     <p>      
       <marker id="emulator"></marker>
       The <seealso marker="driver_entry">erl_driver</seealso> driver
-      API functions needs a port handle
+      API functions need a port handle
       that identifies the driver instance (and the port in the
       emulator). This is only passed to the <c>start</c> function, but
       not to the other functions. The <c>start</c> function returns a
       driver-defined handle that is passed to the other functions. A
-      common practice is to have the <c>start</c> function allocating
+      common practice is to have the <c>start</c> function allocate
       some application-defined structure and stash the <c>port</c>
       handle in it, to use it later with the driver API functions.</p>
     <p>The driver call-back functions are called synchronously from the
@@ -172,7 +172,7 @@ typedef struct erl_drv_entry {
           added to the driver list.) The driver should return 0, or if
           the driver can't initialize, -1.</p>
       </item>
-      <tag><marker id="start"/>int (*start)(ErlDrvPort port, char* command)</tag>
+      <tag><marker id="start"/>ErlDrvData (*start)(ErlDrvPort port, char* command)</tag>
       <item>
         <p>This is called when the driver is instantiated, when
           <c>open_port/2</c> is called. The driver should return a
@@ -188,7 +188,9 @@ typedef struct erl_drv_entry {
         <p>This is called when the port is closed, with
           <c>port_close/1</c> or <c>Port ! {self(), close}</c>. Note
           that terminating the port owner process also closes the
-          port.</p>
+          port. If <c>drv_data</c> is a pointer to memory allocated in
+	  <c>start</c>, then <c>stop</c> is the place to deallocate that
+	  memory.</p>
       </item>
       <tag><marker id="output"/>void (*output)(ErlDrvData drv_data, char *buf, int len)</tag>
       <item>
@@ -217,6 +219,10 @@ typedef struct erl_drv_entry {
           completes, write to the pipe (use <c>SetEvent</c> on
           Windows), this will make the emulator call
           <c>ready_input</c> or <c>ready_output</c>.</p>
+          <p>Spurious events may happen. That is, calls to <c>ready_input</c>
+          or <c>ready_output</c> even though no real events are signaled. In
+          reality it should be rare (and OS dependant), but a robust driver
+          must nevertheless be able to handle such cases.</p>
       </item>
       <tag><marker id="driver_name"/>char *driver_name</tag>
       <item>
@@ -233,7 +239,7 @@ typedef struct erl_drv_entry {
       </item>
       <tag>void *handle</tag>
       <item>
-        <p>This field is reserved for the emulators internal use. The
+        <p>This field is reserved for the emulator's internal use. The
           emulator will modify this field; therefore, it is important
           that the <c>driver_entry</c> isn't declared <c>const</c>.</p> 
       </item>
@@ -397,7 +403,7 @@ typedef struct erl_drv_entry {
       <tag>void *handle2</tag>
       <item>
         <p>
-          This field is reserved for the emulators internal use. The
+          This field is reserved for the emulator's internal use. The
           emulator will modify this field; therefore, it is important
           that the <c>driver_entry</c> isn't declared <c>const</c>.
         </p>
diff --git a/erts/doc/src/epmd.xml b/erts/doc/src/epmd.xml
index 796ab3820b..474230cb38 100644
--- a/erts/doc/src/epmd.xml
+++ b/erts/doc/src/epmd.xml
@@ -4,7 +4,7 @@
 <comref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,9 +31,23 @@
     <rev>A</rev>
     <file>epmd.xml</file>
   </header>
+
   <com>epmd</com>
-  <comsummary>Erlang Port Mapper Daemon </comsummary>
+  <comsummary>
+  <p>Erlang Port Mapper Daemon</p>
+  <taglist>
+  <tag><c><![CDATA[epmd [-d|-debug] [DbgExtra...] [-port No] [-daemon] [-relaxed_command_check]]]></c></tag>
+  <item>
+  <p>Starts the port mapper daemon</p>
+  </item>
+  <tag><c><![CDATA[epmd [-d|-debug] [-port No] [-names|-kill|-stop Name]]]></c></tag>
+  <item>
+  <p>Communicates with a running port mapper daemon</p>
+  </item>
+  </taglist>
+  </comsummary>
   <description>
+
     <p>This daemon acts as a name server on all hosts  involved  in
       distributed  Erlang computations. When an Erlang node 
       starts, the node has a name and it obtains an address from the host 
@@ -46,48 +60,171 @@
       The job of the <c><![CDATA[epmd]]></c> daemon is to keep track of which
       node name listens on which address. Hence, <c><![CDATA[epmd]]></c> map
       symbolic node names to machine addresses.</p>
-    <p>The daemon is started automatically by the Erlang start-up script.</p>
-    <p>The program <c><![CDATA[epmd]]></c> can also be used for a variety of other 
-      purposes, for example checking the DNS (Domain Name System) 
-      configuration of a host.</p>
+
+      <p>The TCP/IP <c>epmd</c> daemon actually only keeps track of
+      the <c>Name</c> (first) part of an Erlang node name, the <c>Host</c>
+      part (whatever is after the <c><![CDATA[@]]></c> is implicit in the
+      node name where the <c>epmd</c> daemon was actually contacted,
+      as is the IP address where the Erlang node can be
+      reached. Consistent and correct TCP naming services are
+      therefore required for an Erlang network to function
+      correctly.</p>
+
+    <taglist>
+    <tag>Starting the port mapper daemon</tag>
+    <item>
+
+        <p>The daemon is started automatically by the <c>erl</c>
+        command if the node is to be distributed and there is no
+        running instance present. If automatically launched,
+        environment variables has to be used to alter the behavior of
+        the daemon. See the <seealso
+        marker="#environment_variables">Environment
+        variables</seealso> section below.</p>
+
+        <p>If the -daemon argument is not given, the
+        <c><![CDATA[epmd]]></c> runs as a normal program with the
+	controlling terminal of the shell in which it is
+	started. Normally, it should run as a daemon.</p>
+
+	<p>Regular start-up options are described in the
+	<seealso marker="#daemon_flags">Regular options</seealso>
+	section below.</p>
+
+	<p>The <c>DbgExtra</c> options are described in the
+	<seealso marker="#debug_flags">DbgExtra options</seealso>
+        section below.</p>
+
+     </item>
+     <tag>Communicating with a running port mapper daemon</tag>
+     <item>
+
+	<p>Communicating with the running epmd daemon by means of the
+	<c>epmd</c> program is done primarily for debugging
+	purposes.</p>
+
+	<p>The different queries are described in the <seealso
+        marker="#interactive_flags">Interactive options</seealso>
+        section below.</p>
+
+     </item>
+     </taglist>
   </description>
-  <funcs>
-    <func>
-      <name>epmd [-daemon] </name>
-      <fsummary>Start a name server as a daemon</fsummary>
-      <desc>
-        <p>Starts a name server as a daemon. If it has no argument, the
-          <c><![CDATA[epmd]]></c> runs as a normal program with the controlling terminal 
-          of the shell in which it is started. Normally, it should run as a 
-          daemon.</p>
-      </desc>
-    </func>
-    <func>
-      <name>epmd -names</name>
-      <fsummary>Request the names of the registered Erlang nodes on  this host</fsummary>
-      <desc>
-        <p>Requests the names of the local Erlang nodes <c><![CDATA[epmd]]></c> has 
-          registered.</p>
-      </desc>
-    </func>
-    <func>
-      <name>epmd -kill</name>
-      <fsummary>Kill the <c><![CDATA[epmd]]></c>process</fsummary>
-      <desc>
-        <p>Kills the <c><![CDATA[epmd]]></c> process.</p>
-      </desc>
-    </func>
-    <func>
-      <name>epmd -help</name>
-      <fsummary>List options</fsummary>
-      <desc>
-        <p>Write short info about the usage including some debugging
-          options not listed here.</p>
-      </desc>
-    </func>
-  </funcs>
+  <section>
+    <marker id="daemon_flags"></marker>
+    <title>Regular options</title>
+
+    <p>These options are available when starting the actual name server. The name server is normally started automatically by the <c>erl</c> command (if not already available), but it can also be started at i.e. system start-up.</p>
+    <taglist>
+    <tag><c><![CDATA[-port No]]></c></tag>
+    <item>
+      <p>Let this instance of epmd listen to another TCP port than
+      default 4369. This can also be set using the
+      <c><![CDATA[ERL_EPMD_PORT]]></c> environment variable, see the
+      section <seealso marker="#environment_variables">Environment
+      variables</seealso> below</p>
+    </item>
+    <tag><c><![CDATA[-d | -debug]]></c></tag>
+    <item>
+
+      <p>Enable debug output. The more <c>-d</c> flags given, the more
+      debug output you will get (to a certain limit). This option is
+      most useful when the epmd daemon is not started as a daemon.</p>
+    </item>
+    <tag><c><![CDATA[-daemon]]></c></tag>
+    <item>
+      <p>Start epmd detached from the controlling terminal. Logging will end up in syslog when available and correctly configured. If the epmd daemon is started at boot, this option should definitely be used. It is also used when the <c>erl</c> command automatically starts <c>epmd</c>.</p>
+    </item>
+    <tag><c><![CDATA[-relaxed_command_check]]></c></tag>
+    <item>
+      <p>Start the epmd program with relaxed command checking (mostly for backward compatibility). This affects the following:</p>
+      <list type="bulleted">
+          <item>
+            <p>With relaxed command checking, the <c>epmd</c> daemon can be killed from the localhost with i.e. <c>epmd -kill</c> even if there are active nodes registered. Normally only daemons with an empty node database can be killed with the <c>epmd -kill</c> command.</p>
+	  </item>
+	  <item>
+	    <p>The <c>epmd -stop</c> command (and the corresponding messages to epmd, as can be given using <c>erl_interface/ei</c>) is normally always ignored, as it opens up for strange situation when two nodes of the same name can be alive at the same time. A node unregisters itself by just closing the connection to epmd, why the <c>stop</c> command was only intended for use in debugging situations.</p>
+	    <p>With relaxed command checking enabled, you can forcibly unregister live nodes.</p>
+	  </item>
+        </list>
+	<p>Relaxed command checking can also be enabled by setting the environment variable <c>ERL_EPMD_RELAXED_COMMAND_CHECK</c> prior to starting <c>epmd</c>.</p>
+	<p>Only use relaxed command checking on systems with very limited interactive usage.</p>
+    </item>
+  </taglist>
+  </section>
 
   <section>
+    <marker id="debug_flags"></marker>
+    <title>DbgExtra options</title>
+    <p>These options are purely for debugging and testing epmd clients, they should not be used in normal operation.</p>
+
+    <taglist>
+    <tag><c><![CDATA[-packet_timeout Seconds]]></c></tag>
+    <item>
+    <p>Set the number of seconds a connection can be
+    inactive before epmd times out and closes the
+    connection (default 60).</p>
+    </item>
+    <tag><c><![CDATA[-delay_accept Seconds]]></c></tag>
+    <item>
+    <p>To simulate a busy server you can insert a delay between epmd
+    gets notified about that a new connection is requested and
+    when the connections gets accepted.</p>
+    </item>
+    <tag><c><![CDATA[-delay_write Seconds]]></c></tag>
+    <item>
+    <p>Also a simulation of a busy server. Inserts
+    a delay before a reply is sent.</p>
+    </item>
+    </taglist>
+  </section>
+  <section>
+    <marker id="interactive_flags"></marker>
+    <title>Interactive options</title>
+    <p>These options make <c>epmd</c> run as an interactive command displaying the results of sending queries ta an already running instance of <c>epmd</c>. The epmd contacted is always on the local node, but the <c>-port</c> option can be used to select between instances if several are running using different port on the host.</p>
+    <taglist>
+    <tag><c><![CDATA[-port No]]></c></tag>
+    <item>
+      <p>Contacts the <c>epmd</c> listening on the given TCP port number
+      (default 4369). This can also be set using the
+      <c><![CDATA[ERL_EPMD_PORT]]></c> environment variable, see the
+      section <seealso marker="#environment_variables">Environment
+      variables</seealso> below</p>
+    </item>
+    <tag><c><![CDATA[-names]]></c></tag>
+    <item>
+      <p>List names registered with the currently running epmd</p>
+    </item>
+    <tag><c><![CDATA[-kill]]></c></tag>
+    <item>
+      <p>Kill the currently running <c>epmd</c>.</p>
+
+      <p>Killing the running <c>epmd</c> is only allowed if <c>epmd
+        -names</c> show an empty database or
+        <c>-relaxed_command_check</c> was given when the running
+        instance of <c>epmd</c> was started. Note that
+        <c>-relaxed_command_check</c> is given when starting the
+        daemon that is to accept killing when it has live nodes
+        registered. When running epmd interactively,
+        <c>-relaxed_command_check</c> has no effect. A daemon that is
+        started without relaxed command checking has to be killed
+        using i.e. signals or some other OS specific method if it has
+        active clients registered.</p>
+    </item>
+    <tag><c><![CDATA[-stop Name]]></c></tag>
+    <item>
+       <p>Forcibly unregister a live node from <c>epmd</c>'s database</p>
+
+       <p>This command can only be used when contacting <c>epmd</c>
+       instances started with the <c>-relaxed_command_check</c>
+       flag. Note that relaxed command checking has to be enabled for
+       the <c>epmd</c> daemon contacted, When running epmd
+       interactively,
+        <c>-relaxed_command_check</c> has no effect.</p>
+    </item>
+  </taglist>
+  </section>
+  <section>
     <marker id="environment_variables"></marker>
     <title>Environment variables</title>
     <taglist>
@@ -99,6 +236,15 @@
           independent clusters of nodes, to co-exist on the same host.
           All nodes in a cluster must use the same epmd port number.</p>
       </item>
+      <tag><c><![CDATA[ERL_EPMD_RELAXED_COMMAND_CHECK]]></c></tag>
+      <item>
+        <p>If set prior to start, the <c>epmd</c> daemon will behave
+        as if the <c>-relaxed_command_check</c> option was given at
+        start-up. If consequently setting this option before starting
+        the Erlang virtual machine, the automatically started
+        <c>epmd</c> will accept the <c>-kill</c> and <c>-stop</c>
+        commands without restrictions.</p>
+      </item>
     </taglist>
   </section>
 
@@ -116,5 +262,29 @@
       silently be ignored.
       </p>
   </section>
+  <section>
+  <title>Access restrictions</title>
+  <p>The <c>epmd</c> daemon accepts messages from both localhost and
+  remote hosts. However, only the query commands are answered (and
+  acted upon) if the query comes from a remote host. It is always an
+  error to try to register a nodename if the client is not a process
+  located on the same host as the <c>epmd</c> instance is running on,
+  why such requests are considered hostile and the connection is
+  immediately closed.</p>
+
+  <p>The queries accepted from remote nodes are:</p>
+      <list type="bulleted">
+          <item>
+	  <p>Port queries - i.e. on which port does the node with a given
+	  name listen</p>
+	  </item>
+	  <item>
+	  <p>Name listing - i.e. give a list of all names registered on
+	  the host</p>
+	  </item>
+     </list>
+  <p>To restrict access further, firewall software has to be used.</p>
+  </section>
+
 </comref>
 
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index df80142ce1..1e6e290f6b 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -231,7 +231,8 @@
       <tag><c><![CDATA[-detached]]></c></tag>
       <item>
         <p>Starts the Erlang runtime system detached from the system
-          console. Useful for running daemons and backgrounds processes.</p>
+          console. Useful for running daemons and backgrounds processes. Implies
+          <c><![CDATA[-noinput]]></c>.</p>
       </item>
       <tag><c><![CDATA[-emu_args]]></c></tag>
       <item>
@@ -541,6 +542,28 @@
 	<p>Calling <c>erlang:halt/1</c> with a string argument will still
 	produce a crash dump.</p>
       </item>
+      <tag><c><![CDATA[+e Number]]></c></tag>
+      <item>
+        <p>Set max number of ETS tables.</p>
+      </item>
+      <tag><c><![CDATA[+ec]]></c></tag>
+      <item>
+        <p>Force the <c>compressed</c> option on all ETS tables.
+              Only intended for test and evaluation.</p>
+      </item>
+      <tag><c><![CDATA[+fnl]]></c></tag>
+      <item>
+        <p>The VM works with file names as if they are encoded using the ISO-latin-1 encoding, disallowing Unicode characters with codepoints beyond 255. This is default on operating systems that have transparent file naming, i.e. all Unixes except MacOSX.</p>
+      </item>
+      <tag><c><![CDATA[+fnu]]></c></tag>
+      <item>
+        <p>The VM works with file names as if they are encoded using UTF-8 (or some other system specific Unicode encoding). This is the default on operating systems that enforce Unicode encoding, i.e. Windows and MacOSX.</p>
+	<p>By enabling Unicode file name translation on systems where this is not default, you open up to the possibility that some file names can not be interpreted by the VM and therefore will be returned to the program as raw binaries. The option is therefore considered experimental.</p>
+      </item>
+      <tag><c><![CDATA[+fna]]></c></tag>
+      <item>
+        <p>Selection between <c>+fnl</c> and <c>+fnu</c> is done based on the current locale settings in the OS, meaning that if you have set your terminal for UTF-8 encoding, the filesystem is expected to use the same encoding for filenames (use with care).</p>
+      </item>
       <tag><c><![CDATA[+hms Size]]></c></tag>
       <item>
         <p>Sets the default heap size of processes to the size
@@ -603,6 +626,24 @@
       <item>
         <p>Force ets memory block to be moved on realloc.</p>
       </item>
+      <tag><marker id="+rg"><c><![CDATA[+rg ReaderGroupsLimit]]></c></marker></tag>
+      <item>
+        <p>Limits the amount of reader groups used by read/write locks
+	   optimized for read operations in the Erlang runtime system. By
+	   default the reader groups limit equals 8.</p>
+	<p>When the amount of schedulers is less than or equal to the reader
+	   groups limit, each scheduler has its own reader group. When the
+	   amount of schedulers is larger than the reader groups limit,
+	   schedulers share reader groups. Shared reader groups degrades
+	   read lock and read unlock performance while a large amount of
+	   reader groups degrades write lock performance, so the limit is a
+	   tradeoff between performance for read operations and performance
+	   for write operations. Each reader group currently consumes 64 byte
+	   in each read/write lock. Also note that a runtime system using
+	   shared reader groups benefits from <seealso marker="#+sbt">binding
+	   schedulers to logical processors</seealso>, since the reader groups
+	   are distributed better between schedulers.</p>
+      </item>
       <tag><marker id="+S"><c><![CDATA[+S Schedulers:SchedulerOnline]]></c></marker></tag>
       <item>
         <p>Sets the amount of scheduler threads to create and scheduler
@@ -667,8 +708,8 @@
 	      <seealso marker="erlang#system_flag_scheduler_bind_type">erlang:system_flag(scheduler_bind_type, default_bind)</seealso>.
 	      </p></item>
 	    </taglist>
-	    <p>Binding of schedulers are currently only supported on newer
-	       Linux and Solaris systems.</p>
+	    <p>Binding of schedulers is currently only supported on newer
+	       Linux, Solaris, FreeBSD, and Windows systems.</p>
 	    <p>If no CPU topology is available when the <c>+sbt</c> flag
 	       is processed and <c>BindType</c> is any other type than
 	       <c>u</c>, the runtime system will fail to start. CPU
@@ -813,14 +854,28 @@
 	    <p>For more information, see
 	    <seealso marker="erlang#system_flag_cpu_topology">erlang:system_flag(cpu_topology, CpuTopology)</seealso>.</p>
           </item>
+	  <tag><marker id="+swt"><c>+swt very_low|low|medium|high|very_high</c></marker></tag>
+	  <item>
+             <p>Set scheduler wakeup threshold. Default is <c>medium</c>.
+	        The threshold determines when to wake up sleeping schedulers
+		when more work than can be handled by currently awake schedulers
+		exist. A low threshold will cause earlier wakeups, and a high
+		threshold will cause later wakeups. Early wakeups will
+		distribute work over multiple schedulers faster, but work will
+		more easily bounce between schedulers.
+	     </p>
+             <p><em>NOTE:</em> This flag may be removed or changed at any time
+	        without prior notice.
+	     </p>
+	  </item>
+	  <tag><marker id="sched_thread_stack_size"><c><![CDATA[+sss size]]></c></marker></tag>
+	  <item>
+	    <p>Suggested stack size, in kilowords, for scheduler threads.
+            Valid range is 4-8192 kilowords. The default stack size
+            is OS dependent.</p>
+	  </item>
         </taglist>
       </item>
-      <tag><marker id="sched_thread_stack_size"><c><![CDATA[+sss size]]></c></marker></tag>
-      <item>
-        <p>Suggested stack size, in kilowords, for scheduler threads.
-          Valid range is 4-8192 kilowords. The default stack size
-          is OS dependent.</p>
-      </item>
       <tag><marker id="+t"><c><![CDATA[+t size]]></c></marker></tag>
       <item>
         <p>Set the maximum number of atoms the VM can handle. Default is 1048576.</p>
@@ -874,6 +929,25 @@
           <seealso marker="kernel:error_logger#warning_map/0">error_logger(3)</seealso>
           for further information.</p>
       </item>
+      <tag><c><![CDATA[+zFlag Value]]></c></tag>
+      <item>
+        <p>Miscellaneous flags.</p>
+        <taglist>
+          <tag><marker id="+zdbbl"><c>+zdbbl size</c></marker></tag>
+          <item>
+            <p>Set the distribution buffer busy limit
+	    (<seealso marker="erlang#system_info_dist_buf_busy_limit">dist_buf_busy_limit</seealso>)
+	    in kilobytes. Valid range is 1-2097151. Default is 1024.</p>
+            <p>A larger buffer limit will allow processes to buffer
+            more outgoing messages over the distribution. When the
+            buffer limit has been reached, sending processes will be
+            suspended until the buffer size has shrunk. The buffer
+            limit is per distribution channel. A higher limit will
+            give lower latency and higher throughput at the expense
+            of higher memory usage.</p>
+          </item>
+        </taglist>
+      </item>
     </taglist>
   </section>
 
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index f7b7b2f346..5987ddbd5e 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -4,7 +4,7 @@
 <cref>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,11 +34,10 @@
   <lib>erl_nif</lib>
   <libsummary>API functions for an Erlang NIF library</libsummary>
   <description>
-     <warning><p>The NIF concept was introduced in R13B03 as an
-	EXPERIMENTAL feature. The interfaces may be changed in any way
-	in coming releases. The plan is however to lift the experimental label and
-  maintain interface backward compatibility from R14B.</p>
-  <p>Incompatible changes in <em>R14A</em>:</p>
+     <note><p>The NIF concept is officially supported from R14B. NIF source code
+     written for earlier experimental versions might need adaption to run on R14B.</p>
+    <p>No incompatible changes between <em>R14B</em> and R14A.</p>
+    <p>Incompatible changes between <em>R14A</em> and R13B04:</p>
   <list>
     <item>Environment argument removed for <c>enif_alloc</c>,
     <c>enif_realloc</c>, <c>enif_free</c>, <c>enif_alloc_binary</c>,
@@ -50,14 +49,14 @@
     <item>Module argument added to <c>enif_open_resource_type</c>
       while changing name spaces of resource types from global to module local.</item>
   </list>
-  <p>Incompatible changes in <em>R13B04</em>:</p>
+  <p>Incompatible changes between <em>R13B04</em> and R13B03:</p>
   <list>
     <item>The function prototypes of the NIFs have  changed to expect <c>argc</c> and <c>argv</c>
 	  arguments. The arity of a NIF is by that no longer limited to 3.</item>
     <item><c>enif_get_data</c> renamed as <c>enif_priv_data</c>.</item>
     <item><c>enif_make_string</c> got a third argument for character encoding.</item>
   </list>
-  </warning>
+  </note>
 
     <p>A NIF library contains native implementation of some functions
     of an Erlang module. The native implemented functions (NIFs) are
@@ -456,12 +455,16 @@ typedef enum {
                 to return information about the runtime system. Contains currently
                 the exact same content as <seealso marker="erl_driver#ErlDrvSysInfo">ErlDrvSysInfo</seealso>.</p>
               </item>
+              <tag><marker id="ErlNifSInt64"/>ErlNifSInt64</tag>
+               <item><p>A native signed 64-bit integer type.</p></item>
+              <tag><marker id="ErlNifUInt64"/>ErlNifUInt64</tag>
+               <item><p>A native unsigned 64-bit integer type.</p></item>
 
     </taglist>
   </section>
 
   <funcs>
-    <func><name><ret>void*</ret><nametext>enif_alloc(ErlNifEnv* env, size_t size)</nametext></name>
+    <func><name><ret>void*</ret><nametext>enif_alloc(size_t size)</nametext></name>
       <fsummary>Allocate dynamic memory.</fsummary>
       <desc><p>Allocate memory of <c>size</c> bytes. Return NULL if allocation failed.</p></desc>
     </func>
@@ -536,7 +539,7 @@ typedef enum {
     <desc><p>Same as <seealso marker="erl_driver#erl_drv_equal_tids">erl_drv_equal_tids</seealso>.
           </p></desc>
     </func>
-    <func><name><ret>void</ret><nametext>enif_free(ErlNifEnv* env, void* ptr)</nametext></name>
+    <func><name><ret>void</ret><nametext>enif_free(void* ptr)</nametext></name>
       <fsummary>Free dynamic memory</fsummary>
       <desc><p>Free memory allocated by <c>enif_alloc</c>.</p></desc>
     </func>
@@ -571,7 +574,13 @@ typedef enum {
       <fsummary>Read an integer term</fsummary>
       <desc><p>Set <c>*ip</c> to the integer value of
       <c>term</c>. Return true on success or false if <c>term</c> is not an
-      integer or is outside the bounds of type <c>int</c></p></desc>
+      integer or is outside the bounds of type <c>int</c>.</p></desc>
+    </func>
+    <func><name><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><p>Set <c>*ip</c> to the integer value of
+      <c>term</c>. Return true on success or false if <c>term</c> is not an
+      integer or is outside the bounds of a signed 64-bit integer.</p></desc>
     </func>
     <func><name><ret>int</ret><nametext>enif_get_local_pid(ErlNifEnv* env, ERL_NIF_TERM term, ErlNifPid* pid)</nametext></name>
     <fsummary>Read an local pid term</fsummary>
@@ -633,7 +642,12 @@ typedef enum {
       return true, or return false if <c>term</c> is not an unsigned integer or
       is outside the bounds of type <c>unsigned int</c>.</p></desc>
     </func>
-
+    <func><name><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><p>Set <c>*ip</c> to the unsigned integer value of <c>term</c> and
+      return true, or return false if <c>term</c> is not an unsigned integer or
+      is outside the bounds of an unsigned 64-bit integer.</p></desc>
+    </func>
     <func><name><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><p>Set <c>*ip</c> to the unsigned long integer value of <c>term</c>
@@ -758,6 +772,10 @@ typedef enum {
       <fsummary>Create an integer term</fsummary>
       <desc><p>Create an integer term.</p></desc>
     </func>
+    <func><name><ret>ERL_NIF_TERM</ret><nametext>enif_make_int64(ErlNifEnv* env, ErlNifSInt64 i)</nametext></name>
+      <fsummary>Create an integer term</fsummary>
+      <desc><p>Create an integer term from a signed 64-bit integer.</p></desc>
+    </func>
     <func><name><ret>ERL_NIF_TERM</ret><nametext>enif_make_list(ErlNifEnv* env, unsigned cnt, ...)</nametext></name>
       <fsummary>Create a list term.</fsummary>
       <desc><p>Create an ordinary list term of length <c>cnt</c>. Expects
@@ -839,11 +857,6 @@ typedef enum {
       <seealso marker="#enif_release_resource">enif_release_resource</seealso>.</p>
       </desc>
     </func>
-    <func><name><ret>ErlNifPid*</ret><nametext>enif_self(ErlNifEnv* caller_env, ErlNifPid* pid)</nametext></name>
-      <fsummary>Get the pid of the calling process.</fsummary>
-      <desc><p>Initialize the pid variable <c>*pid</c> to represent the
-      calling process. Return <c>pid</c>.</p></desc>
-    </func>
     <func><name><ret>ERL_NIF_TERM</ret><nametext>enif_make_string(ErlNifEnv* env, const char* string, ErlNifCharEncoding encoding)</nametext></name>
       <fsummary>Create a string.</fsummary>
       <desc><p>Create a list containing the characters of the
@@ -894,6 +907,10 @@ typedef enum {
       <fsummary>Create an unsigned integer term</fsummary>
       <desc><p>Create an integer term from an <c>unsigned int</c>.</p></desc>
     </func>
+    <func><name><ret>ERL_NIF_TERM</ret><nametext>enif_make_uint64(ErlNifEnv* env, ErlNifUInt64 i)</nametext></name>
+      <fsummary>Create an unsigned integer term</fsummary>
+      <desc><p>Create an integer term from an unsigned 64-bit integer.</p></desc>
+    </func>
     <func><name><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>
       <desc><p>Create an integer term from an <c>unsigned long int</c>.</p></desc>
@@ -958,11 +975,12 @@ typedef enum {
       <c>reload</c> or <c>upgrade</c>.</p>
       <p>Was previously named <c>enif_get_data</c>.</p></desc>
     </func>
-    <func><name><ret>void</ret><nametext>enif_realloc_binary(ErlNifBinary* bin, size_t size)</nametext></name>
+    <func><name><ret>int</ret><nametext>enif_realloc_binary(ErlNifBinary* bin, size_t size)</nametext></name>
       <fsummary>Change the size of a binary.</fsummary>
       <desc><p>Change the size of a binary <c>bin</c>. The source binary
       may be read-only, in which case it will be left untouched and
-      a mutable copy is allocated and assigned to <c>*bin</c>.</p></desc>
+      a mutable copy is allocated and assigned to <c>*bin</c>. Return true on success,
+      false if memory allocation failed.</p></desc>
     </func>
     <func><name><ret>void</ret><nametext>enif_release_binary(ErlNifBinary* bin)</nametext></name>
       <fsummary>Release a binary.</fsummary>
@@ -1019,7 +1037,12 @@ typedef enum {
     <desc><p>Same as <seealso marker="erl_driver#erl_drv_rwlock_tryrwlock">erl_drv_rwlock_tryrwlock</seealso>.
           </p></desc>
     </func>
-    <func><name><ret>unsigned</ret><nametext>enif_send(ErlNifEnv* env, ErlNifPid* to_pid, ErlNifEnv* msg_env, ERL_NIF_TERM msg)</nametext></name>
+    <func><name><ret>ErlNifPid*</ret><nametext>enif_self(ErlNifEnv* caller_env, ErlNifPid* pid)</nametext></name>
+      <fsummary>Get the pid of the calling process.</fsummary>
+      <desc><p>Initialize the pid variable <c>*pid</c> to represent the
+      calling process. Return <c>pid</c>.</p></desc>
+    </func>
+    <func><name><ret>int</ret><nametext>enif_send(ErlNifEnv* env, ErlNifPid* to_pid, ErlNifEnv* msg_env, ERL_NIF_TERM msg)</nametext></name>
       <fsummary>Send a message to a process.</fsummary>
       <desc><p>Send a message to a process.</p>
       <taglist>
@@ -1108,7 +1131,7 @@ typedef enum {
   </funcs>
   <section>
     <title>SEE ALSO</title>
-    <p><seealso marker="erlang#load_nif-2">load_nif(3)</seealso></p>
+    <p><seealso marker="erlang#load_nif-2">erlang:load_nif/2</seealso></p>
   </section>
 </cref>
 
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 6f30c7fb21..c3f06982f5 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -80,7 +80,7 @@ iolist() = [char() | binary() | iolist()]
       </desc>
     </func>
     <func>
-      <name>adler32(Data) -> int()</name>
+      <name>erlang:adler32(Data) -> int()</name>
       <fsummary>Compute adler32 checksum</fsummary>
       <type>
         <v>Data = iodata()</v>
@@ -90,7 +90,7 @@ iolist() = [char() | binary() | iolist()]
       </desc>
     </func>
     <func>
-      <name>adler32(OldAdler, Data) -> int()</name>
+      <name>erlang:adler32(OldAdler, Data) -> int()</name>
       <fsummary>Compute adler32 checksum</fsummary>
       <type>
         <v>OldAdler = int()</v>
@@ -102,17 +102,17 @@ iolist() = [char() | binary() | iolist()]
 	<c>Data</c>.</p>
 	<p>The following code:</p>
 	<code>
-	X = adler32(Data1),
-	Y = adler32(X,Data2).
+	X = erlang:adler32(Data1),
+	Y = erlang:adler32(X,Data2).
 	</code>
 	<p>- would assign the same value to <c>Y</c> as this would:</p>
 	<code>
-	Y = adler32([Data1,Data2]).
+	Y = erlang:adler32([Data1,Data2]).
 	</code>
       </desc>
     </func>
     <func>
-      <name>adler32_combine(FirstAdler, SecondAdler, SecondSize) -> int()</name>
+      <name>erlang:adler32_combine(FirstAdler, SecondAdler, SecondSize) -> int()</name>
       <fsummary>Combine two adler32 checksums</fsummary>
       <type>
         <v>FirstAdler = SecondAdler = int()</v>
@@ -124,14 +124,14 @@ iolist() = [char() | binary() | iolist()]
 	the second checksum to be known.</p>
 	<p>The following code:</p>
 	<code>
-	Y = adler32(Data1),
-	Z = adler32(Y,Data2).
+	Y = erlang:adler32(Data1),
+	Z = erlang:adler32(Y,Data2).
 	</code>
 	<p>- would assign the same value to <c>Z</c> as this would:</p>
 	<code>
-	X = adler32(Data1),
-	Y = adler32(Data2),
-	Z = adler32_combine(X,Y,iolist_size(Data2)).
+	X = erlang:adler32(Data1),
+	Y = erlang:adler32(Data2),
+	Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).
 	</code>
       </desc>
     </func>
@@ -147,7 +147,7 @@ iolist() = [char() | binary() | iolist()]
           <c>Tuple1</c>, and contains the elements in <c>Tuple1</c>
           followed by <c>Term</c> as the last element. Semantically
           equivalent to
-          <c>list_to_tuple(tuple_to_list(Tuple ++ [Term])</c>, but much
+          <c>list_to_tuple(tuple_to_list(Tuple) ++ [Term])</c>, but much
           faster.</p>
         <pre>
 > <input>erlang:append_element({one, two}, three).</input>
@@ -499,7 +499,7 @@ iolist() = [char() | binary() | iolist()]
       <name>erlang:cancel_timer(TimerRef) -> Time | false</name>
       <fsummary>Cancel a timer</fsummary>
       <type>
-        <v>TimerRef = ref()</v>
+        <v>TimerRef = reference()</v>
         <v>Time = int()</v>
       </type>
       <desc>
@@ -553,7 +553,7 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>crc32(Data) -> int()</name>
+      <name>erlang:crc32(Data) -> int()</name>
       <fsummary>Compute crc32 (IEEE 802.3) checksum</fsummary>
       <type>
         <v>Data = iodata()</v>
@@ -563,7 +563,7 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>crc32(OldCrc, Data) -> int()</name>
+      <name>erlang:crc32(OldCrc, Data) -> int()</name>
       <fsummary>Compute crc32 (IEEE 802.3) checksum</fsummary>
       <type>
         <v>OldCrc = int()</v>
@@ -575,17 +575,17 @@ false</pre>
 	<c>Data</c>.</p>
 	<p>The following code:</p>
 	<code>
-	X = crc32(Data1),
-	Y = crc32(X,Data2).
+	X = erlang:crc32(Data1),
+	Y = erlang:crc32(X,Data2).
 	</code>
 	<p>- would assign the same value to <c>Y</c> as this would:</p>
 	<code>
-	Y = crc32([Data1,Data2]).
+	Y = erlang:crc32([Data1,Data2]).
 	</code>
       </desc>
     </func>
     <func>
-      <name>crc32_combine(FirstCrc, SecondCrc, SecondSize) -> int()</name>
+      <name>erlang:crc32_combine(FirstCrc, SecondCrc, SecondSize) -> int()</name>
       <fsummary>Combine two crc32 (IEEE 802.3) checksums</fsummary>
       <type>
         <v>FirstCrc = SecondCrc = int()</v>
@@ -597,14 +597,14 @@ false</pre>
 	the second checksum to be known.</p>
 	<p>The following code:</p>
 	<code>
-	Y = crc32(Data1),
-	Z = crc32(Y,Data2).
+	Y = erlang:crc32(Data1),
+	Z = erlang:crc32(Y,Data2).
 	</code>
 	<p>- would assign the same value to <c>Z</c> as this would:</p>
 	<code>
-	X = crc32(Data1),
-	Y = crc32(Data2),
-	Z = crc32_combine(X,Y,iolist_size(Data2)).
+	X = erlang:crc32(Data1),
+	Y = erlang:crc32(Data2),
+	Z = erlang:crc32_combine(X,Y,iolist_size(Data2)).
 	</code>
       </desc>
     </func>
@@ -624,7 +624,7 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>decode_packet(Type,Bin,Options) -> {ok,Packet,Rest} | {more,Length} | {error,Reason}</name>
+      <name>erlang:decode_packet(Type,Bin,Options) -> {ok,Packet,Rest} | {more,Length} | {error,Reason}</name>
       <fsummary>Extracts a protocol packet from a binary</fsummary>
       <type>
         <v>Bin = binary()</v>
@@ -760,18 +760,18 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:demonitor(MonitorRef) -> true</name>
+      <name>demonitor(MonitorRef) -> true</name>
       <fsummary>Stop monitoring</fsummary>
       <type>
-        <v>MonitorRef = ref()</v>
+        <v>MonitorRef = reference()</v>
       </type>
       <desc>
         <p>If <c>MonitorRef</c> is a reference which the calling process
           obtained by calling
-          <seealso marker="#monitor/2">erlang:monitor/2</seealso>,
+          <seealso marker="#monitor/2">monitor/2</seealso>,
           this monitoring is turned off. If the monitoring is already
           turned off, nothing happens.</p>
-        <p>Once <c>erlang:demonitor(MonitorRef)</c> has returned it is
+        <p>Once <c>demonitor(MonitorRef)</c> has returned it is
           guaranteed that no <c>{'DOWN', MonitorRef, _, _, _}</c> message
           due to the monitor will be placed in the callers message queue
           in the future. A <c>{'DOWN', MonitorRef, _, _, _}</c> message
@@ -779,10 +779,10 @@ false</pre>
           the call, though. Therefore, in most cases, it is advisable
           to remove such a <c>'DOWN'</c> message from the message queue
           after monitoring has been stopped. 
-          <seealso marker="#demonitor/2">erlang:demonitor(MonitorRef, [flush])</seealso> can be used instead of
-          <c>erlang:demonitor(MonitorRef)</c> if this cleanup is wanted.</p>
+          <seealso marker="#demonitor/2">demonitor(MonitorRef, [flush])</seealso> can be used instead of
+          <c>demonitor(MonitorRef)</c> if this cleanup is wanted.</p>
         <note>
-          <p>Prior to OTP release R11B (erts version 5.5) <c>erlang:demonitor/1</c>
+          <p>Prior to OTP release R11B (erts version 5.5) <c>demonitor/1</c>
             behaved completely asynchronous, i.e., the monitor was active
             until the "demonitor signal" reached the monitored entity. This
             had one undesirable effect, though. You could never know when
@@ -800,10 +800,10 @@ false</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:demonitor(MonitorRef, OptionList) -> true|false</name>
+      <name>demonitor(MonitorRef, OptionList) -> true|false</name>
       <fsummary>Stop monitoring</fsummary>
       <type>
-        <v>MonitorRef = ref()</v>
+        <v>MonitorRef = reference()</v>
         <v>OptionList = [Option]</v>
         <v>Option = flush</v>
         <v>Option = info</v>
@@ -812,8 +812,8 @@ false</pre>
         <p>The returned value is <c>true</c> unless <c>info</c> is part
 	   of <c>OptionList</c>.
 	</p>
-        <p><c>erlang:demonitor(MonitorRef, [])</c> is equivalent to
-          <seealso marker="#demonitor/1">erlang:demonitor(MonitorRef)</seealso>.</p>
+        <p><c>demonitor(MonitorRef, [])</c> is equivalent to
+          <seealso marker="#demonitor/1">demonitor(MonitorRef)</seealso>.</p>
         <p>Currently the following <c>Option</c>s are valid:</p>
         <taglist>
           <tag><c>flush</c></tag>
@@ -821,11 +821,11 @@ false</pre>
             <p>Remove (one) <c>{_, MonitorRef, _, _, _}</c> message,
               if there is one, from the callers message queue after
               monitoring has been stopped.</p>
-            <p>Calling <c>erlang:demonitor(MonitorRef, [flush])</c>
+            <p>Calling <c>demonitor(MonitorRef, [flush])</c>
               is equivalent to the following, but more efficient:</p>
             <code type="none">
 
-    erlang:demonitor(MonitorRef),
+    demonitor(MonitorRef),
     receive
         {_, MonitorRef, _, _, _} ->
             true
@@ -863,7 +863,7 @@ false</pre>
         </note>
         <p>Failure: <c>badarg</c> if <c>OptionList</c> is not a list, or
           if <c>Option</c> is not a valid option, or the same failure as for
-          <seealso marker="#demonitor/1">erlang:demonitor/1</seealso></p>
+          <seealso marker="#demonitor/1">demonitor/1</seealso></p>
       </desc>
     </func>
     <func>
@@ -944,7 +944,7 @@ b</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:error(Reason)</name>
+      <name>error(Reason)</name>
       <fsummary>Stop execution with a given reason</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -957,7 +957,7 @@ b</pre>
           function first). Since evaluating this function causes
           the process to terminate, it has no return value.</p>
         <pre>
-> <input>catch erlang:error(foobar).</input>
+> <input>catch error(foobar).</input>
 {'EXIT',{foobar,[{erl_eval,do_apply,5},
                  {erl_eval,expr,5},
                  {shell,exprs,6},
@@ -966,7 +966,7 @@ b</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:error(Reason, Args)</name>
+      <name>error(Reason, Args)</name>
       <fsummary>Stop execution with a given reason</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -1483,7 +1483,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:integer_to_list(Integer, Base) -> string()</name>
+      <name>integer_to_list(Integer, Base) -> string()</name>
       <fsummary>Text representation of an integer</fsummary>
       <type>
         <v>Integer = int()</v>
@@ -1493,7 +1493,7 @@ os_prompt%</pre>
         <p>Returns a string which corresponds to the text
           representation of <c>Integer</c> in base <c>Base</c>.</p>
         <pre>
-> <input>erlang:integer_to_list(1023, 16).</input>
+> <input>integer_to_list(1023, 16).</input>
 "3FF"</pre>
       </desc>
     </func>
@@ -1932,7 +1932,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:list_to_integer(String, Base) -> int()</name>
+      <name>list_to_integer(String, Base) -> int()</name>
       <fsummary>Convert from text representation to an integer</fsummary>
       <type>
         <v>String = string()</v>
@@ -1942,7 +1942,7 @@ os_prompt%</pre>
         <p>Returns an integer whose text representation in base
           <c>Base</c> is <c>String</c>.</p>
         <pre>
-> <input>erlang:list_to_integer("3FF", 16).</input>
+> <input>list_to_integer("3FF", 16).</input>
 1023</pre>
         <p>Failure: <c>badarg</c> if <c>String</c> contains a bad
           representation of an integer.</p>
@@ -2034,16 +2034,18 @@ os_prompt%</pre>
         <v>Text = string()</v>
       </type>
       <desc>
-        <warning>
-          <p>This BIF is still an experimental feature. The interface
-          may be changed in any way in future releases.</p><p>In
-          R13B03 the return value on failure was
+        <note>
+          <p>In releases older than OTP R14B, NIFs were an
+          experimental feature. Versions of OTP older than R14B might
+          have different and possibly incompatible NIF semantics and
+          interfaces. For example, in R13B03 the return value on
+          failure was
           <c>{error,Reason,Text}</c>.</p>
-        </warning>
+        </note>
         <p>Loads and links a dynamic library containing native
         implemented functions (NIFs) for a module. <c>Path</c> is a
         file path to the sharable object/dynamic library file minus
-        the OS-dependant file extension (.so for Unix and .ddl for
+        the OS-dependent file extension (.so for Unix and .dll for
         Windows). See <seealso marker="erl_nif">erl_nif</seealso>
         on how to implement a NIF library.</p> 
         <p><c>LoadInfo</c> can be any term. It will be passed on to
@@ -2160,7 +2162,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>make_ref() -> ref()</name>
+      <name>make_ref() -> reference()</name>
       <fsummary>Return an almost unique reference</fsummary>
       <desc>
         <p>Returns an almost unique reference.</p>
@@ -2209,7 +2211,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:max(Term1, Term2) -> Maximum</name>
+      <name>max(Term1, Term2) -> Maximum</name>
       <fsummary>Return the largest of two term</fsummary>
       <type>
         <v>Term1 = Term2 = Maximum = term()</v>
@@ -2458,7 +2460,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:min(Term1, Term2) -> Minimum</name>
+      <name>min(Term1, Term2) -> Minimum</name>
       <fsummary>Return the smallest of two term</fsummary>
       <type>
         <v>Term1 = Term2 = Minimum = term()</v>
@@ -2486,7 +2488,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:monitor(Type, Item) -> MonitorRef</name>
+      <name>monitor(Type, Item) -> MonitorRef</name>
       <fsummary>Start monitoring</fsummary>
       <type>
         <v>Type = process</v>
@@ -2522,7 +2524,7 @@ os_prompt%</pre>
         <note>
           <p>When a process is monitored by registered name, the process
             that has the registered name at the time when
-            <c>erlang:monitor/2</c> is called will be monitored.
+            <c>monitor/2</c> is called will be monitored.
             The monitor will not be effected, if the registered name is
             unregistered.</p>
         </note>
@@ -2556,20 +2558,20 @@ os_prompt%</pre>
           </item>
         </taglist>
         <note>
-          <p>If/when <c>erlang:monitor/2</c> is extended (e.g. to
+          <p>If/when <c>monitor/2</c> is extended (e.g. to
             handle other item types than <c>process</c>), other
             possible values for <c>Object</c>, and <c>Info</c> in the
             <c>'DOWN'</c> message will be introduced.</p>
         </note>
         <p>The monitoring is turned off either when the <c>'DOWN'</c>
           message is sent, or when
-          <seealso marker="#demonitor/1">erlang:demonitor/1</seealso>
+          <seealso marker="#demonitor/1">demonitor/1</seealso>
           is called.</p>
         <p>If an attempt is made to monitor a process on an older node
           (where remote process monitoring is not implemented or one
           where remote process monitoring by registered name is not
           implemented), the call fails with <c>badarg</c>.</p>
-        <p>Making several calls to <c>erlang:monitor/2</c> for the same
+        <p>Making several calls to <c>monitor/2</c> for the same
           <c>Item</c> is not an error; it results in as many, completely
           independent, monitorings.</p>
         <note>
@@ -2644,6 +2646,37 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
+      <name>erlang:nif_error(Reason)</name>
+      <fsummary>Stop execution with a given reason</fsummary>
+      <type>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Works exactly like
+	 <seealso marker="#error/1">erlang:error/1</seealso>,
+	 but Dialyzer thinks that this BIF will return an arbitrary term.
+	 When used in a stub function for a NIF to generate an
+	 exception when the NIF library is not loaded, Dialyzer
+	 will not generate false warnings.</p>
+      </desc>
+    </func>
+    <func>
+      <name>erlang:nif_error(Reason, Args)</name>
+      <fsummary>Stop execution with a given reason</fsummary>
+      <type>
+        <v>Reason = term()</v>
+        <v>Args = [term()]</v>
+      </type>
+      <desc>
+        <p>Works exactly like
+	 <seealso marker="#error/2">erlang:error/2</seealso>,
+	 but Dialyzer thinks that this BIF will return an arbitrary term.
+	 When used in a stub function for a NIF to generate an
+	 exception when the NIF library is not loaded, Dialyzer
+	 will not generate false warnings.</p>
+      </desc>
+    </func>
+    <func>
       <name>node() -> Node</name>
       <fsummary>Name of the local node</fsummary>
       <type>
@@ -2659,7 +2692,7 @@ os_prompt%</pre>
       <name>node(Arg) -> Node</name>
       <fsummary>At which node is a pid, port or reference located</fsummary>
       <type>
-        <v>Arg = pid() | port() | ref()</v>
+        <v>Arg = pid() | port() | reference()</v>
         <v>Node = node()</v>
       </type>
       <desc>
@@ -2736,8 +2769,10 @@ os_prompt%</pre>
           Otherwise, some other point in time is chosen. It is also
           guaranteed that subsequent calls to this BIF returns
           continuously increasing values. Hence, the return value from
-          <c>now()</c> can be used to generate unique time-stamps. It
-          can only be used to check the local time of day if
+          <c>now()</c> can be used to generate unique time-stamps,
+          and if it is called in a tight loop on a fast machine
+          the time of the node can become skewed.</p>
+        <p>It can only be used to check the local time of day if
           the time-zone info of the underlying operating system is
           properly configured.</p>
       </desc>
@@ -2746,14 +2781,17 @@ os_prompt%</pre>
       <name>open_port(PortName, PortSettings) -> port()</name>
       <fsummary>Open a port</fsummary>
       <type>
-        <v>PortName = {spawn, Command} | {spawn_driver, Command} | {spawn_executable, Command} | {fd, In, Out}</v>
+        <v>PortName = {spawn, Command} | {spawn_driver, Command} | {spawn_executable, FileName} | {fd, In, Out}</v>
         <v>&nbsp;Command = string()</v>
+	<v>&nbsp;FileName = [ FileNameChar ] | binary()</v>
+	<v>&nbsp;FileNameChar = int() (1..255 or any Unicode codepoint, see description)</v> 
         <v>&nbsp;In = Out = int()</v>
         <v>PortSettings = [Opt]</v>
-        <v>&nbsp;Opt = {packet, N} | stream | {line, L} | {cd, Dir} | {env, Env} | {args, [ string() ]} | {arg0, string()} | exit_status | use_stdio | nouse_stdio | stderr_to_stdout | in | out | binary | eof</v>
+        <v>&nbsp;Opt = {packet, N} | stream | {line, L} | {cd, Dir} | {env, Env} | {args, [ ArgString ]} | {arg0, ArgString} | exit_status | use_stdio | nouse_stdio | stderr_to_stdout | in | out | binary | eof</v>
         <v>&nbsp;&nbsp;N = 1 | 2 | 4</v>
         <v>&nbsp;&nbsp;L = int()</v>
         <v>&nbsp;&nbsp;Dir = string()</v>
+	<v>&nbsp;&nbsp;ArgString = [ FileNameChar ] | binary()</v>
         <v>&nbsp;&nbsp;Env = [{Name, Val}]</v>
         <v>&nbsp;&nbsp;&nbsp;Name = string()</v>
         <v>&nbsp;&nbsp;&nbsp;Val = string() | false</v>
@@ -2816,7 +2854,26 @@ os_prompt%</pre>
 	      executed, the appropriate command interpreter will
 	      implicitly be invoked, but there will still be no
 	      command argument expansion or implicit PATH search.</p>
-	      
+
+	      <p>The name of the executable as well as the arguments
+	      given in <c>args</c> and <c>arg0</c> is subject to
+	      Unicode file name translation if the system is running
+	      in Unicode file name mode. To avoid
+	      translation or force i.e. UTF-8, supply the executable
+	      and/or arguments as a binary in the correct
+	      encoding. See the <seealso
+	      marker="kernel:file">file</seealso> module, the
+	      <seealso marker="kernel:file#native_name_encoding/0">
+	      file:native_name_encoding/0</seealso> function and the 
+	      <seealso marker="stdlib:unicode_usage">stdlib users guide
+	      </seealso> for details.</p>
+
+	      <note>The characters in the name (if given as a list)
+	      can only be &gt; 255 if the Erlang VM is started in
+	      Unicode file name translation mode, otherwise the name
+	      of the executable is limited to the ISO-latin-1
+	      character set.</note>
+  
 	      <p>If the <c>Command</c> cannot be run, an error
 	      exception, with the posix error code as the reason, is
 	      raised. The error reason may differ between operating
@@ -2919,6 +2976,21 @@ os_prompt%</pre>
 	    should not be given in this list. The proper executable name will
 	    automatically be used as argv[0] where applicable.</p>
 
+	    <p>When the Erlang VM is running in Unicode file name
+	    mode, the arguments can contain any Unicode characters and
+	    will be translated into whatever is appropriate on the
+	    underlying OS, which means UTF-8 for all platforms except
+	    Windows, which has other (more transparent) ways of
+	    dealing with Unicode arguments to programs. To avoid
+	    Unicode translation of arguments, they can be supplied as
+	    binaries in whatever encoding is deemed appropriate.</p>
+
+	      <note>The characters in the arguments (if given as a
+	      list of characters) can only be &gt; 255 if the Erlang
+	      VM is started in Unicode file name mode,
+	      otherwise the arguments are limited to the
+	      ISO-latin-1 character set.</note>
+
 	    <p>If one, for any reason, wants to explicitly set the
 	    program name in the argument vector, the <c>arg0</c>
 	    option can be used.</p>
@@ -2934,6 +3006,9 @@ os_prompt%</pre>
 	    responds to this is highly system dependent and no specific 
 	    effect is guaranteed.</p>
 
+	    <p>The unicode file name translation rules of the
+	    <c>args</c> option apply to this option as well.</p>
+
 	  </item> 
 
           <tag><c>exit_status</c></tag>
@@ -3200,7 +3275,7 @@ os_prompt%</pre>
       </desc>
     </func>
     <func>
-      <name>erlang:port_command(Port, Data, OptionList) -> true|false</name>
+      <name>port_command(Port, Data, OptionList) -> true|false</name>
       <fsummary>Send data to a port</fsummary>
       <type>
         <v>Port = port() | atom()</v>
@@ -3236,10 +3311,6 @@ os_prompt%</pre>
         <note>
           <p>More options may be added in the future.</p>
         </note>
-        <note>
-          <p><c>erlang:port_command/3</c> is currently not auto imported, but
-	     it is planned to be auto imported in OTP R14.</p>
-        </note>
         <p>Failures:</p>
         <taglist>
           <tag><c>badarg</c></tag>
@@ -3868,11 +3939,11 @@ os_prompt%</pre>
           <tag><c>{monitored_by, Pids}</c></tag>
           <item>
             <p>A list of pids that are monitoring the process (with
-              <c>erlang:monitor/2</c>).</p>
+              <c>monitor/2</c>).</p>
           </item>
           <tag><c>{monitors, Monitors}</c></tag>
           <item>
-            <p>A list of monitors (started by <c>erlang:monitor/2</c>)
+            <p>A list of monitors (started by <c>monitor/2</c>)
               that are active for the process. For a local process
               monitor or a remote process monitor by pid, the list item
               is <c>{process, Pid}</c>, and for a remote process
@@ -3909,7 +3980,8 @@ os_prompt%</pre>
           <tag><c>{status, Status}</c></tag>
           <item>
             <p><c>Status</c> is the status of the process. <c>Status</c>
-              is <c>waiting</c> (waiting for a message), <c>running</c>,
+              is <c>exiting</c>, <c>garbage_collecting</c>,
+              <c>waiting</c> (for a message), <c>running</c>,
               <c>runnable</c> (ready to run, but another process is
               running), or <c>suspended</c> (suspended on a "busy" port
               or by the <c>erlang:suspend_process/[1,2]</c> BIF).</p>
@@ -4061,7 +4133,7 @@ os_prompt%</pre>
           terminate, it has no return value - unless the arguments are
           invalid, in which case the function <em>returns the error reason</em>, that is <c>badarg</c>. If you want to be
           really sure not to return you can call
-          <c>erlang:error(erlang:raise(Class, Reason, Stacktrace))</c>
+          <c>error(erlang:raise(Class, Reason, Stacktrace))</c>
           and hope to distinguish exceptions later.</p>
       </desc>
     </func>
@@ -4069,7 +4141,7 @@ os_prompt%</pre>
       <name>erlang:read_timer(TimerRef) -> int() | false</name>
       <fsummary>Number of milliseconds remaining for a timer</fsummary>
       <type>
-        <v>TimerRef = ref()</v>
+        <v>TimerRef = reference()</v>
       </type>
       <desc>
         <p><c>TimerRef</c> is a timer reference returned by
@@ -4092,7 +4164,7 @@ os_prompt%</pre>
       <name>erlang:ref_to_list(Ref) -> string()</name>
       <fsummary>Text representation of a reference</fsummary>
       <type>
-        <v>Ref = ref()</v>
+        <v>Ref = reference()</v>
       </type>
       <desc>
         <p>Returns a string which corresponds to the text
@@ -4271,7 +4343,7 @@ true</pre>
         <v>Dest = pid() | RegName </v>
         <v>&nbsp;LocalPid = pid() (of a process, alive or dead, on the local node)</v>
         <v>Msg = term()</v>
-        <v>TimerRef = ref()</v>
+        <v>TimerRef = reference()</v>
       </type>
       <desc>
         <p>Starts a timer which will send the message <c>Msg</c>
@@ -4484,7 +4556,7 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name>spawn(Node, Module, Function, ArgumentList) -> pid()</name>
+      <name>spawn(Node, Module, Function, Args) -> pid()</name>
       <fsummary>Create a new process with a function as entry point on a given node</fsummary>
       <type>
         <v>Node = node()</v>
@@ -4662,7 +4734,7 @@ true</pre>
           <tag><c>monitor</c></tag>
           <item>
             <p>Monitor the new process (just like
-              <seealso marker="#monitor/2">erlang:monitor/2</seealso> does).</p>
+              <seealso marker="#monitor/2">monitor/2</seealso> does).</p>
           </item>
           <tag><c>{priority, Level}</c></tag>
           <item>
@@ -4800,7 +4872,7 @@ true</pre>
         <v>&nbsp;LocalPid = pid() (of a process, alive or dead, on the local node)</v>
         <v>&nbsp;RegName = atom()</v>
         <v>Msg = term()</v>
-        <v>TimerRef = ref()</v>
+        <v>TimerRef = reference()</v>
       </type>
       <desc>
         <p>Starts a timer which will send the message
@@ -5146,9 +5218,9 @@ true</pre>
 	       schedulers actually have bound as requested, call
 	       <seealso marker="#system_info_scheduler_bindings">erlang:system_info(scheduler_bindings)</seealso>.
 	    </p>
-            <p>Schedulers can currently only be bound on newer Linux
-	       and Solaris systems, but more systems will be supported
-	       in the future.
+            <p>Schedulers can currently only be bound on newer Linux,
+	       Solaris, FreeBSD, and Windows systems, but more systems will be
+	       supported in the future.
 	    </p>
             <p>In order for the runtime system to be able to bind schedulers,
 	       the CPU topology needs to be known. If the runtime system fails
@@ -5335,7 +5407,7 @@ true</pre>
             <p>Returns <c>{Allocator, Version, Features, Settings}.</c></p>
             <p>Types:</p>
             <list type="bulleted">
-              <item><c>Allocator = undefined | elib_malloc | glibc</c></item>
+              <item><c>Allocator = undefined | glibc</c></item>
               <item><c>Version = [int()]</c></item>
               <item><c>Features = [atom()]</c></item>
               <item><c>Settings = [{Subsystem, [{Parameter, Value}]}]</c></item>
@@ -5350,7 +5422,7 @@ true</pre>
                   implementation used. If <c>Allocator</c> equals
                   <c>undefined</c>, the <c>malloc()</c> implementation
                   used could not be identified. Currently
-                  <c>elib_malloc</c> and <c>glibc</c> can be identified.</p>
+                  <c>glibc</c> can be identified.</p>
               </item>
               <item>
                 <p><c>Version</c> is a list of integers (but not a
@@ -5427,6 +5499,16 @@ true</pre>
 	    <seealso marker="#system_info_allocator_tuple">erlang:system_info({allocator, Alloc})</seealso>.
 	    </p>
           </item>
+          <tag><c>build_type</c></tag>
+          <item>
+            <p>Returns an atom describing the build type of the runtime
+	       system. This is normally the atom <c>opt</c> for optimized.
+               Other possible return values are <c>debug</c>, <c>purify</c>,
+	       <c>quantify</c>, <c>purecov</c>, <c>gcov</c>, <c>valgrind</c>,
+	       <c>gprof</c>, and <c>lcnt</c>. Possible return values
+	       may be added and/or removed at any time without prior notice.
+	     </p>
+          </item>
           <tag><c>c_compiler_used</c></tag>
           <item>
             <p>Returns a two-tuple describing the C compiler used when
@@ -5504,7 +5586,7 @@ true</pre>
 	       <c>CpuTopology</c> type to change.
 	    </p>
           </item>
-          <tag><c>{cpu_topology, defined}</c></tag>
+          <tag><marker id="system_info_cpu_topology_defined"><c>{cpu_topology, defined}</c></marker></tag>
           <item>
             <p>Returns the user defined <c>CpuTopology</c>. For more
 	       information see the documentation of
@@ -5514,12 +5596,14 @@ true</pre>
 	       argument.
 	    </p>
           </item>
-          <tag><c>{cpu_topology, detected}</c></tag>
+          <tag><marker id="system_info_cpu_topology_detected"><c>{cpu_topology, detected}</c></marker></tag>
           <item>
             <p>Returns the automatically detected <c>CpuTopology</c>. The
 	       emulator currently only detects the CPU topology on some newer
-	       linux and solaris systems. For more information see the 
-               documentation of the
+	       Linux, Solaris, FreeBSD, and Windows systems. On Windows system with
+	       more than 32 logical processors the CPU topology is not detected.
+	    </p>
+            <p>For more information see the documentation of the
 	       <seealso marker="#system_info_cpu_topology">cpu_topology</seealso>
 	       argument.
 	    </p>
@@ -5577,52 +5661,16 @@ true</pre>
           </item>
           <tag><c>elib_malloc</c></tag>
           <item>
-            <p>If the emulator uses the <c>elib_malloc</c> memory
-              allocator, a list of two-element tuples containing status
-              information is returned; otherwise, <c>false</c> is
-              returned. The list currently contains the following
-              two-element tuples (all sizes are presented in bytes):</p>
-            <taglist>
-              <tag><c>{heap_size, Size}</c></tag>
-              <item>
-                <p>Where <c>Size</c> is the current heap size.</p>
-              </item>
-              <tag><c>{max_alloced_size, Size}</c></tag>
-              <item>
-                <p>Where <c>Size</c> is the maximum amount of memory
-                  allocated on the heap since the emulator started.</p>
-              </item>
-              <tag><c>{alloced_size, Size}</c></tag>
-              <item>
-                <p>Where <c>Size</c> is the current amount of memory
-                  allocated on the heap.</p>
-              </item>
-              <tag><c>{free_size, Size}</c></tag>
-              <item>
-                <p>Where <c>Size</c> is the current amount of free
-                  memory on the heap.</p>
-              </item>
-              <tag><c>{no_alloced_blocks, No}</c></tag>
-              <item>
-                <p>Where <c>No</c> is the current number of allocated
-                  blocks on the heap.</p>
-              </item>
-              <tag><c>{no_free_blocks, No}</c></tag>
-              <item>
-                <p>Where <c>No</c> is the current number of free blocks
-                  on the heap.</p>
-              </item>
-              <tag><c>{smallest_alloced_block, Size}</c></tag>
-              <item>
-                <p>Where <c>Size</c> is the size of the smallest
-                  allocated block on the heap.</p>
-              </item>
-              <tag><c>{largest_free_block, Size}</c></tag>
-              <item>
-                <p>Where <c>Size</c> is the size of the largest free
-                  block on the heap.</p>
-              </item>
-            </taglist>
+            <p>This option will be removed in a future release.
+	      The return value will always be <c>false</c> since
+	      the elib_malloc allocator has been removed.</p>
+          </item>
+          <tag><marker id="system_info_dist_buf_busy_limit"><c>dist_buf_busy_limit</c></marker></tag>
+          <item>
+            <p>Returns the value of the distribution buffer busy limit
+	    in bytes. This limit can be set on startup by passing the
+	    <seealso marker="erl#+zdbbl">+zdbbl</seealso> command line
+	    flag to <c>erl</c>.</p>
           </item>
           <tag><c>fullsweep_after</c></tag>
           <item>
@@ -5698,11 +5746,34 @@ true</pre>
               information see the <seealso marker="erts:crash_dump">"How to interpret the Erlang crash dumps"</seealso> chapter
               in the ERTS User's Guide.</p>
           </item>
-	  <tag><c>logical_processors</c></tag>
+	  <tag><marker id="logical_processors"><c>logical_processors</c></marker></tag>
           <item>
-            <p>Returns the number of logical processors detected on the
-	       system as an integer or the atom <c>unknown</c> if the
-	       emulator wasn't able to detect any.
+            <p>Returns the detected number of logical processors configured
+	       on the system. The return value is either an integer, or
+	       the atom <c>unknown</c> if the emulator wasn't able to
+	       detect logical processors configured.
+	    </p>
+          </item>
+	  <tag><marker id="logical_processors_available"><c>logical_processors_available</c></marker></tag>
+          <item>
+            <p>Returns the detected number of logical processors available to
+	       the Erlang runtime system. The return value is either an
+	       integer, or the atom <c>unknown</c> if the emulator wasn't
+	       able to detect logical processors available. The number
+	       of logical processors available is less than or equal to
+	       the number of <seealso marker="#logical_processors_online">logical
+	       processors online</seealso>.
+	    </p>
+          </item>
+	  <tag><marker id="logical_processors_online"><c>logical_processors_online</c></marker></tag>
+          <item>
+            <p>Returns the detected number of logical processors online on
+	       the system. The return value is either an integer,
+	       or the atom <c>unknown</c> if the emulator wasn't able to
+	       detect logical processors online. The number of logical
+	       processors online is less than or equal to the number of
+	       <seealso marker="#logical_processors">logical processors
+	       configured</seealso>.
 	    </p>
           </item>
           <tag><c>machine</c></tag>
@@ -5907,6 +5978,26 @@ true</pre>
               <c>get_tcw</c> in "Match Specifications in Erlang",
               <seealso marker="erts:match_spec#get_tcw">ERTS User's Guide</seealso>.</p>
           </item>
+          <tag><marker id="update_cpu_info"><c>update_cpu_info</c></marker></tag>
+          <item>
+            <p>The runtime system rereads the CPU information available and
+	       updates its internally stored information about the
+	       <seealso marker="#system_info_cpu_topology_detected">detected CPU
+	       topology</seealso> and the amount of logical processors
+	       <seealso marker="#logical_processors">configured</seealso>,
+	       <seealso marker="#logical_processors_online">online</seealso>, and
+	       <seealso marker="#logical_processors_available">available</seealso>.
+	       If the CPU information has changed since the last time it was read,
+	       the atom <c>changed</c> is returned; otherwise, the atom
+	       <c>unchanged</c> is returned. If the CPU information has changed
+	       you probably want to
+	       <seealso marker="#system_flag_schedulers_online">adjust the amount
+	       of schedulers online</seealso>. You typically want to have as
+	       many schedulers online as
+	       <seealso marker="#logical_processors_available">logical processors
+	       available</seealso>.
+	    </p>
+          </item>
           <tag><marker id="system_info_version"><c>version</c></marker></tag>
           <item>
             <p>Returns a string containing the version number of the
diff --git a/erts/doc/src/erlc.xml b/erts/doc/src/erlc.xml
index 1e8960c22c..ebf76a2afe 100644
--- a/erts/doc/src/erlc.xml
+++ b/erts/doc/src/erlc.xml
@@ -4,7 +4,7 @@
 <comref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -141,6 +141,50 @@
           for compiling native code, which needs to be compiled with the same
           run-time system that it should be run on.</p>
       </item>
+      <tag>-M</tag>
+      <item>
+        <p>Produces a Makefile rule to track headers dependencies. The
+          rule is sent to stdout. No object file is produced.
+        </p>
+      </item>
+      <tag>-MF <em>Makefile</em></tag>
+      <item>
+        <p>Like the <c><![CDATA[-M]]></c> option above, except that the
+          Makefile is written to <em>Makefile</em>. No object
+          file is produced.
+        </p>
+      </item>
+      <tag>-MD</tag>
+      <item>
+        <p>Same as <c><![CDATA[-M -MF <File>.Pbeam]]></c>.
+        </p>
+      </item>
+      <tag>-MT <em>Target</em></tag>
+      <item>
+        <p>In conjunction with <c><![CDATA[-M]]></c> or
+          <c><![CDATA[-MF]]></c>, change the name of the rule emitted
+          to <em>Target</em>.
+        </p>
+      </item>
+      <tag>-MQ <em>Target</em></tag>
+      <item>
+        <p>Like the <c><![CDATA[-MT]]></c> option above, except that
+          characters special to make(1) are quoted.
+        </p>
+      </item>
+      <tag>-MP</tag>
+      <item>
+        <p>In conjunction with <c><![CDATA[-M]]></c> or
+          <c><![CDATA[-MF]]></c>, add a phony target for each dependency.
+        </p>
+      </item>
+      <tag>-MG</tag>
+      <item>
+        <p>In conjunction with <c><![CDATA[-M]]></c> or
+          <c><![CDATA[-MF]]></c>, consider missing headers as generated
+          files and add them to the dependencies.
+        </p>
+      </item>
       <tag>--</tag>
       <item>
         <p>Signals that no more options will follow.
diff --git a/erts/doc/src/escript.xml b/erts/doc/src/escript.xml
index 44c9a5ac68..588508aae6 100644
--- a/erts/doc/src/escript.xml
+++ b/erts/doc/src/escript.xml
@@ -153,7 +153,10 @@ halt(1).</pre>
         <p>Execution of interpreted code is slower than compiled code.
           If much of the execution takes place in interpreted code it
           may be worthwhile to compile it, even though the compilation
-          itself will take a little while.</p>
+          itself will take a little while. It is also possible to supply
+	  <c>native</c> instead of compile, this will compile the script 
+	  using the native flag, again depending on the characteristics 
+	  of the escript this could or could not be worth while.</p>
 
         <p>As mentioned earlier, it is possible to have a script which
           contains precompiled <c>beam</c> code. In a precompiled
@@ -397,6 +400,9 @@ ok
        Warnings and errors (if any) are written to the standard output, but
        the script will not be run. The exit status will be 0 if there were
        no errors, and 127 otherwise.</item>
+
+       <tag>-n</tag>
+      <item>Compile the escript using the +native flag.</item>
     </taglist>
   </section>
 </comref>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index a4867adf22..77181d3407 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,1320 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 5.8.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix format_man_pages so it handles all man sections
+	    and remove warnings/errors in various man pages. </p>
+          <p>
+	    Own Id: OTP-8600</p>
+        </item>
+        <item>
+          <p>
+	    The <c>configure</c> command line argument <seealso
+	    marker="doc/installation_guide:INSTALL#How-to-Build-and-Install-ErlangOTP_A-Closer-Look-at-the-individual-Steps_Configuring">--enable-ethread-pre-pentium4-compatibility</seealso>
+	    had no effect. This option is now also automatically
+	    enabled if required on the build machine.</p>
+          <p>
+	    Own Id: OTP-8847</p>
+        </item>
+        <item>
+          <p>
+	    Windows 2003 and Windows XP pre SP3 would sometimes not
+	    start the Erlang R14B VM at all due to a bug in the cpu
+	    topology detection. The bug affects Windows only, no
+	    other platform is even remotely affected. The bug is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-8876</p>
+        </item>
+        <item>
+          <p>
+	    The HiPE run-time in the 64-bit emulator could do a
+	    64-bit write to a 32-bit struct field. It happened to be
+	    harmless on Intel/AMD processors. Corrected. (Thanks to
+	    Mikael Pettersson.)</p>
+          <p>
+	    Own Id: OTP-8877</p>
+        </item>
+        <item>
+          <p>
+	    A bug in <seealso
+	    marker="erl_driver#erl_drv_tsd_get">erl_drv_tsd_get()</seealso>
+	    and <seealso
+	    marker="erl_nif#enif_tsd_get">enif_tsd_get()</seealso>
+	    could cause an emulator crash. These functions are
+	    currently not used in OTP. That is, the crash only occur
+	    on systems with user implemented NIF libraries, or
+	    drivers that use one of these functions.</p>
+          <p>
+	    Own Id: OTP-8889</p>
+        </item>
+        <item>
+          <p>
+	    Calling <c>erlang:system_info({cpu_topology,
+	    CpuTopologyType})</c> with another <c>CpuTopologyType</c>
+	    element than one of the documented atoms <c>defined</c>,
+	    <c>detected</c>, or <c>used</c> caused an emulator crash.
+	    (Thanks to Paul Guyot)</p>
+          <p>
+	    Own Id: OTP-8914</p>
+        </item>
+        <item>
+          <p>
+	    The ERTS internal rwlock implementation could get into an
+	    inconsistent state. This bug was very seldom triggered,
+	    but could be during heavy contention. The bug was
+	    introduced in R14B (erts-5.8.1).</p>
+          <p>
+	    The bug was most likely to be triggered when using the
+	    <c>read_concurrency</c> option on an ETS table that was
+	    frequently accessed from multiple processes doing lots of
+	    writes and reads. That is, in a situation where you
+	    typically don't want to use the <c>read_concurrency</c>
+	    option in the first place.</p>
+          <p>
+	    Own Id: OTP-8925 Aux Id: OTP-8544 </p>
+        </item>
+        <item>
+          <p>
+	    Tracing to port could cause an emulator crash when
+	    unloading the trace driver.</p>
+          <p>
+	    Own Id: OTP-8932</p>
+        </item>
+        <item>
+          <p>
+	    Removed use of CancelIoEx on Windows that had been shown
+	    to cause problems with some drivers.</p>
+          <p>
+	    Own Id: OTP-8937</p>
+        </item>
+        <item>
+          <p>
+	    The fallback implementation used when no native atomic
+	    implementation was found did not compile. (Thanks to
+	    Patrick Baggett, and Tuncer Ayaz)</p>
+          <p>
+	    Own Id: OTP-8944</p>
+        </item>
+        <item>
+          <p>
+	    Some integer values used during load balancing could
+	    under rare circumstances wrap causing a load unbalance
+	    between schedulers.</p>
+          <p>
+	    Own Id: OTP-8950</p>
+        </item>
+        <item>
+          <p>
+	    The windows VM now correctly handles appending to large
+	    files (> 4GB).</p>
+          <p>
+	    Own Id: OTP-8958</p>
+        </item>
+        <item>
+          <p>
+	    Name resolving of IPv6 addresses has been implemented for
+	    Windows versions that support it. The use of ancient
+	    resolver flags (AI_V4MAPPED | AI_ADDRCONFIG) to the
+	    getaddrinfo() function has been removed since e.g FreeBSD
+	    regard mapped IPv4 addresses to be a security problem and
+	    the semantics of the address configured flag is
+	    uncertain.</p>
+          <p>
+	    Own Id: OTP-8969</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The help texts produced by the <c>configure</c> scripts
+	    in the top directory and in the erts directory have been
+	    aligned and cleaned up.</p>
+          <p>
+	    Own Id: OTP-8859</p>
+        </item>
+        <item>
+          <p>
+	    When the runtime system had fewer schedulers than logical
+	    processors, the system could get an unnecessarily large
+	    amount reader groups.</p>
+          <p>
+	    Own Id: OTP-8861</p>
+        </item>
+        <item>
+          <p>
+	    <c>run_rel</c> has been updated to support Solaris's
+	    /dev/ptmx device and to load the necessary STREAMS
+	    modules so that <c>to_erl</c> can provide terminal echo
+	    of keyboard input. (Thanks to Ryan Tilder.)</p>
+          <p>
+	    Own Id: OTP-8878</p>
+        </item>
+        <item>
+          <p>
+	    The Erlang VM now supports Unicode filenames. The feature
+	    is turned on by default on systems where Unicode
+	    filenames are mandatory (Windows and MacOSX), but can be
+	    enabled on other systems with the '+fnu' emulator option.
+	    Enabling the Unicode filename feature on systems where it
+	    is not default is however considered experimental and not
+	    to be used for production. Together with the Unicode file
+	    name support, the concept of "raw filenames" is
+	    introduced, which means filenames provided without
+	    implicit unicode encoding translation. Raw filenames are
+	    provided as binaries, not lists. For further information,
+	    see stdlib users guide and the chapter about using
+	    Unicode in Erlang. Also see the file module manual page.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8887</p>
+        </item>
+        <item>
+	    <p>Buffer overflows have been prevented in <c>erlc</c>,
+	    <c>dialyzer</c>, <c>typer</c>, <c>run_test</c>,
+	    <c>heart</c>, <c>escript</c>, and <c>erlexec</c>.</p>
+	    (Thanks to Michael Santos.)
+          <p>
+	    Own Id: OTP-8892</p>
+        </item>
+        <item>
+          <p>
+	    The runtime system is now less eager to suspend processes
+	    sending messages over the distribution. The default value
+	    of the distribution buffer busy limit has also been
+	    increased from 128 KB to 1 MB. This in order to improve
+	    throughput.</p>
+          <p>
+	    Own Id: OTP-8901</p>
+        </item>
+        <item>
+          <p>
+	    The distribution buffer busy limit can now be configured
+	    at system startup. For more information see the
+	    documentation of the <c>erl</c> <seealso
+	    marker="erl#+zdbbl">+zdbbl</seealso> command line flag.
+	    (Thanks to Scott Lystig Fritchie)</p>
+          <p>
+	    Own Id: OTP-8912</p>
+        </item>
+        <item>
+          <p>
+	    The inet driver internal buffer stack implementation has
+	    been rewritten in order to reduce lock contention.</p>
+          <p>
+	    Own Id: OTP-8916</p>
+        </item>
+        <item>
+          <p>
+	    New ETS option <c>compressed</c>, to enable a more
+	    compact storage format at the expence of heavier table
+	    operations. For test and evaluation, <c>erl +ec</c> can
+	    be used to force compression on all ETS tables.</p>
+          <p>
+	    Own Id: OTP-8922 Aux Id: seq11658 </p>
+        </item>
+        <item>
+          <p>
+	    There is now a new function inet:getifaddrs/0 modeled
+	    after C library function getifaddrs() on BSD and LInux
+	    that reports existing interfaces and their addresses on
+	    the host. This replaces the undocumented and unsupported
+	    inet:getiflist/0 and inet:ifget/2.</p>
+          <p>
+	    Own Id: OTP-8926</p>
+        </item>
+        <item>
+          <p>
+	    Support for detection of CPU topology and binding of
+	    schedulers on FreeBSD 8 have been added. (Thanks to Paul
+	    Guyot)</p>
+          <p>
+	    Own Id: OTP-8939</p>
+        </item>
+        <item>
+          <p>
+	    Several bugs related to hibernate/3 and HiPE have been
+	    corrected. (Thanks to Paul Guyot.)</p>
+          <p>
+	    Own Id: OTP-8952</p>
+        </item>
+        <item>
+          <p>
+	    Support for soft and hard links on Windows versions and
+	    filesystems that support them is added.</p>
+          <p>
+	    Own Id: OTP-8955</p>
+        </item>
+        <item>
+          <p>
+	    The win32 virtual machine is now linked large address
+	    aware. his allows the Erlang VM to use up to 3 gigs of
+	    address space on Windows instead of the default of 2
+	    gigs.</p>
+          <p>
+	    Own Id: OTP-8956</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 5.8.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix that the documentation top index generator can
+	    handle an Ericsson internal application group. </p>
+          <p>
+	    Own Id: OTP-8875</p>
+        </item>
+        <item>
+	    <p>In embedded mode, on_load handlers that called
+	    <c>code:priv_dir/1</c> or other functions in <c>code</c>
+	    would hang the system. Since the <c>crypto</c>
+	    application now contains an on_loader handler that calls
+	    <c>code:priv_dir/1</c>, including the <c>crypto</c>
+	    application in the boot file would prevent the system
+	    from starting.</p>
+	    <p>Also extended the <c>-init_debug</c> option to print
+	    information about on_load handlers being run to
+	    facilitate debugging.</p>
+          <p>
+	    Own Id: OTP-8902 Aux Id: seq11703 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 5.8.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Windows 2003 and Windows XP pre SP3 would sometimes not
+	    start the Erlang R14B VM at all due to a bug in the cpu
+	    topology detection. The bug affects Windows only, no
+	    other platform is even remotely affected. The bug is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-8876</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 5.8.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Very small floating point numbers generated errors when
+	    converting from list to float in some versions of the VM,
+	    this is now corrected so that i.e.
+	    list_to_float("1.0e-324"). returns 0.0 in all versions of
+	    Erlang.</p>
+          <p>
+	    Own Id: OTP-7178</p>
+        </item>
+        <item>
+          <p>
+	    Windows Vista and Windows 7 file system virtualization,
+	    which makes "old style" windows programs execute in a
+	    file system sandbox, was previously unintentionally
+	    turned on for the Erlang VM. This is now corrected so
+	    that i.e. writes to C:\Program Files\. without
+	    administrator privileges will fail.</p>
+          <p>
+	    Own Id: OTP-7405</p>
+        </item>
+        <item>
+          <p>
+	    Fix faulty 64-bit integer term output from drivers. Large
+	    64-bits integers did not generate correct bignums and
+	    could even cause emulator crash. Only affects drivers
+	    using ERL_DRV_INT64 or ERL_DRV_UINT64, introduced in
+	    R13B03.</p>
+          <p>
+	    Own Id: OTP-8716</p>
+        </item>
+        <item>
+          <p>
+	    Fixed: inet:setopts(S, [{linger,{true,2}}]) returned
+	    {error,einval} for SCTP sockets. The inet_drv had a bug
+	    when checking the option size.</p>
+          <p>
+	    Own Id: OTP-8726 Aux Id: seq11617 </p>
+        </item>
+        <item>
+	    <p>Fix libm linking with --as-needed flag
+          <p>
+	    When building with "--as-needed" linker flags on Linux
+	    the build will fail. This has now been fixed.</p>
+          <p>
+	    (Thanks to Christian Faulhammer)</p></p>
+          <p>
+	    Own Id: OTP-8728</p>
+        </item>
+        <item>
+          <p>
+	    gen_udp:connect/3 was broken for SCTP enabled builds. It
+	    did not detect remote end errors as it should.</p>
+          <p>
+	    Own Id: OTP-8729</p>
+        </item>
+        <item>
+	    <p>Reduce the risk of integer wrapping in bin vheap size
+	    counting.</p> <p>The vheap size series will now use the
+	    golden ratio instead of doubling and fibonacci
+	    sequences.</p>
+          <p>
+	    Own Id: OTP-8730</p>
+        </item>
+        <item>
+          <p>
+	    ETS ordered_set containing <c>[]</c> as key could cause
+	    strange thing to happen, like an infinite hanging
+	    <c>ets:select</c>.</p>
+          <p>
+	    Own Id: OTP-8732</p>
+        </item>
+        <item>
+	    <p>reference() has been substituted for ref() in the
+	    documentation.</p>
+          <p>
+	    Own Id: OTP-8733</p>
+        </item>
+        <item>
+          <p>
+	    When a native compiled module called a not loaded
+	    non-native compiled module that had an on_load function,
+	    the export entries were trashed after code loading so on
+	    the next call from the native compiled module to the
+	    non-native compiled the emulator crashed. This bug has
+	    now been fixed.</p>
+          <p>
+	    Own Id: OTP-8736</p>
+        </item>
+        <item>
+          <p>
+	    HiPE-enabled Erlang VMs running on BSD systems sometimes
+	    generated messages like "Yikes! erts_alloc() returned
+	    misaligned address 0x8016a512c". Fixed. (Thanks to Mikael
+	    Pettersson.)</p>
+          <p>
+	    Own Id: OTP-8769</p>
+        </item>
+        <item>
+          <p>
+	    A race condition in <c>erts_poll()</c> could cause delay
+	    of poll for I/O.</p>
+          <p>
+	    Own Id: OTP-8773</p>
+        </item>
+        <item>
+          <p>
+	    Removed some potential vulnerabilities from the Erlang
+	    Port Mapper Daemon (epmd) and straightened up access
+	    control. Also removed hazardous interfaces allowing
+	    anyone on a machine to forcefully unregister other nodes.
+	    This means that the ei_unregister/erl_unregister
+	    interfaces in erl_interface is rendered not only error
+	    prone and mystifying as before, but totally ineffective.
+	    The old behaviour of unchecked node unregistering can be
+	    restored if needed, see epmd documentation for details.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8780</p>
+        </item>
+        <item>
+	    <p> Building in a source tree without prebuilt platform
+	    independent build results failed on the SSL examples
+	    when: </p> <list><item> cross building. This has been
+	    solved by not building the SSL examples during a cross
+	    build. </item><item> building on Windows. </item></list>
+          <p>
+	    Own Id: OTP-8791</p>
+        </item>
+        <item>
+          <p>
+	    inet:getsockopt for SCTP sctp_default_send_param had a
+	    bug to not initialize required feilds causing random
+	    answers. It is now corrected.</p>
+          <p>
+	    Own Id: OTP-8795 Aux Id: seq11655 </p>
+        </item>
+        <item>
+          <p>
+	    The hipe_bifs:get_hrvtime/0 BIF now always returns a real
+	    value even if the "perfctr" Linux kernel extension is not
+	    available. It used to return a dummy value. (Thanks to
+	    Mikael Pettersson.)</p>
+          <p>
+	    Own Id: OTP-8798</p>
+        </item>
+        <item>
+          <p>
+	    Calling a native-code compiled module with an
+	    <c>on_load</c> function could cause a crash. (Thanks to
+	    Mikael Pettersson.)</p>
+          <p>
+	    Own Id: OTP-8799</p>
+        </item>
+        <item>
+	    <p>The emulator could crash while writing a crash dump if
+	    native-compiled modules had been loaded. (Thanks to Paul
+	    Guyot.)</p>
+          <p>
+	    Own Id: OTP-8801</p>
+        </item>
+        <item>
+          <p>
+	    The garbage collector could crash if invoked from
+	    native-compiled code after a call to a BIF. (Thanks to
+	    Paul Guyot.)</p>
+          <p>
+	    Own Id: OTP-8821</p>
+        </item>
+        <item>
+          <p>
+	    A rare memory leak in binary:matches is removed</p>
+          <p>
+	    Own Id: OTP-8823</p>
+        </item>
+        <item>
+	    <p>For a socket in the HTTP packet mode, the return value
+	    from <c>gen_tcp:recv/2,3</c> if there is an error in the
+	    header will be <c>{ok,{http_error,String}}</c> instead of
+	    <c>{error,{http_error,String}}</c> to be consistent with
+	    <c>ssl:recv/2,3</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8831</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    ets:select_reverse/{1,2,3} are now documented.</p>
+          <p>
+	    Own Id: OTP-7863</p>
+        </item>
+        <item>
+          <p>
+	    External format of integers changed to make full use of
+	    all 32 bits of INTEGER_EXT. This is a compatible change
+	    as old code can read full 32-bit integers but only
+	    produce 28-bit integers as INTEGER_EXT.</p>
+          <p>
+	    Own Id: OTP-8540 Aux Id: seq11534 </p>
+        </item>
+        <item>
+          <p>
+	    Large parts of the <c>ethread</c> library have been
+	    rewritten. The <c>ethread</c> library is an Erlang
+	    runtime system internal, portable thread library used by
+	    the runtime system itself.</p>
+          <p>
+	    Most notable improvement is a reader optimized rwlock
+	    implementation which dramatically improve the performance
+	    of read-lock/read-unlock operations on multi processor
+	    systems by avoiding ping-ponging of the rwlock cache
+	    lines. The reader optimized rwlock implementation is used
+	    by miscellaneous rwlocks in the runtime system that are
+	    known to be read-locked frequently, and can be enabled on
+	    ETS tables by passing the <seealso
+	    marker="stdlib:ets#new_2_read_concurrency">{read_concurrency,
+	    true}</seealso> option upon table creation. See the
+	    documentation of <seealso
+	    marker="stdlib:ets#new/2">ets:new/2</seealso> for more
+	    information. The reader optimized rwlock implementation
+	    can be fine tuned when starting the runtime system. For
+	    more information, see the documentation of the <seealso
+	    marker="erts:erl#+rg">+rg</seealso> command line argument
+	    of <c>erl</c>.</p>
+          <p>
+	    There is also a new implementation of rwlocks that is not
+	    optimized for readers. Both implementations interleaves
+	    readers and writers during contention as opposed to,
+	    e.g., the NPTL (Linux) pthread rwlock implementation
+	    which use either a reader or writer preferred strategy.
+	    The reader/writer preferred strategy is problematic since
+	    it starves threads doing the non-preferred operation.</p>
+          <p>
+	    The new rwlock implementations in general performs better
+	    in ERTS than common pthread implementations. However, in
+	    some extremely heavily contended cases this is not the
+	    case. Such heavy contention can more or less only appear
+	    on ETS tables. This when multiple processes do very large
+	    amounts of write locked operations simultaneously on the
+	    same table. Such use of ETS is bad regardless of rwlock
+	    implementation, will never scale, and is something we
+	    strongly advise against.</p>
+          <p>
+	    The new rwlock implementations depend on atomic
+	    operations. If no native atomic implementation is found,
+	    a fallback solution will be used. Using the fallback
+	    implies a performance degradation. That is, it is more
+	    important now than before to build OTP with a native
+	    atomic implementation.</p>
+          <p>
+	    The <c>ethread</c> library contains native atomic
+	    implementations for, x86 (32 and 64 bit), powerpc (32
+	    bit), sparc V9 (32 and 64 bit), and tilera (32 bit). On
+	    other hardware gcc's builtin support for atomic memory
+	    access will be used if such exists. If no such support is
+	    found, <c>configure</c> will warn about no atomic
+	    implementation available.</p>
+          <p>
+	    The <c>ethread</c> library can now also use the
+	    <c>libatomic_ops</c> library for atomic memory accesses.
+	    This makes it possible for the Erlang runtime system to
+	    utilize optimized native atomic operations on more
+	    platforms than before. If <c>configure</c> warns about no
+	    atomic implementation available, try using the
+	    <c>libatomic_ops</c> library. Use the <seealso
+	    marker="doc/installation_guide:INSTALL#How-to-Build-and-Install-ErlangOTP_A-Closer-Look-at-the-individual-Steps_Configuring">--with-libatomic_ops=PATH</seealso>
+	    <c>configure</c> command line argument when specifying
+	    where the <c>libatomic_ops</c> installation is located.
+	    The <c>libatomic_ops</c> library can be downloaded from:
+	    <url
+	    href="http://www.hpl.hp.com/research/linux/atomic_ops/">http://www.hpl.hp.com/research/linux/atomic_ops/</url></p>
+          <p>
+	    The changed API of the <c>ethread</c> library has also
+	    caused modifications in the Erlang runtime system.
+	    Preparations for the to come "delayed deallocation"
+	    feature has also been done since it depends on the
+	    <c>ethread</c> library.</p>
+          <p>
+	    <em>Note</em>: When building for x86, the <c>ethread</c>
+	    library will now use instructions that first appeared on
+	    the pentium 4 processor. If you want the runtime system
+	    to be compatible with older processors (back to 486) you
+	    need to pass the <seealso
+	    marker="doc/installation_guide:INSTALL#How-to-Build-and-Install-ErlangOTP_A-Closer-Look-at-the-individual-Steps_Configuring">--enable-ethread-pre-pentium4-compatibility</seealso>
+	    <c>configure</c> command line argument when configuring
+	    the system.</p>
+          <p>
+	    Own Id: OTP-8544</p>
+        </item>
+        <item>
+          <p>
+	    erlang:localtime_to_universaltime({{2008, 8, 1}, {0, 0,
+	    0}},true) when TZ=UTC now behaves consistently on all
+	    Unix platforms.</p>
+          <p>
+	    The problem fixed was originally reported by Paul Guyot
+	    on erlang-bugs mailing list:</p>
+          <p>
+	    http://www.erlang.org/pipermail/erlang-bugs/2008-November/001077.html</p>
+          <p>
+	    Own Id: OTP-8580</p>
+        </item>
+        <item>
+          <p>
+	    Optimization reducing memory consumption by two words per
+	    ETS object.</p>
+          <p>
+	    Own Id: OTP-8737</p>
+        </item>
+        <item>
+          <p>
+	    Fixes for unsupported halfword-emulator</p>
+          <p>
+	    Own Id: OTP-8745</p>
+        </item>
+        <item>
+          <p>
+	    NIF 64-bit integer support; <c>enif_get_int64</c>,
+	    <c>enif_get_uint64</c>, <c>enif_make_int64</c>,
+	    <c>enif_make_uint64</c>.</p>
+          <p>
+	    Own Id: OTP-8746</p>
+        </item>
+        <item>
+          <p>
+	    Alignment of trailing data in messages has been adjusted.
+	    This in order to be able to pass data of any type as
+	    trailing data in the future.</p>
+          <p>
+	    Own Id: OTP-8754</p>
+        </item>
+        <item>
+          <p>
+	    The obsolete/driver.h header file has been removed. It
+	    has been obsolete and deprecated since R8B. Drivers that
+	    still include obsolete/driver.h must be updated to
+	    include erl_driver.h.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8758</p>
+        </item>
+        <item>
+          <p>
+	    Added erlang:system_info(build_type) which makes it
+	    easier to chose drivers, NIF libraries, etc based on
+	    build type of the runtime system.</p>
+          <p>
+	    The NIF library for crypto can now be built for valgrind
+	    and/or debug as separate NIF libraries that will be
+	    automatically loaded if the runtime system has been built
+	    with a matching build type.</p>
+          <p>
+	    Own Id: OTP-8760</p>
+        </item>
+        <item>
+          <p>
+	    Further lessened the memory requirements of ETS objects.</p>
+          <p>
+	    Own Id: OTP-8762</p>
+        </item>
+        <item>
+	    <p>The broken elib_malloc alternate memory allocator has
+	    been removed. <c>erlang:system_info(elib_malloc)</c> will
+	    always return <c>false</c>, and in R15,
+	    <c>erlang:system_info(elib_malloc)</c> will fail with a
+	    <c>badarg</c> exception.</p>
+          <p>
+	    Own Id: OTP-8764</p>
+        </item>
+        <item>
+          <p>
+	    Calling <c>erlang:system_info/1</c> with the new argument
+	    <c>update_cpu_info</c> will make the runtime system
+	    reread and update the internally stored CPU information.
+	    For more information see the documentation of <seealso
+	    marker="erlang#update_cpu_info">erlang:system_info(update_cpu_info)</seealso>.</p>
+          <p>
+	    The CPU topology is now automatically detected on Windows
+	    systems with less than 33 logical processors. The runtime
+	    system will now, also on Windows, by default bind
+	    schedulers to logical processors using the
+	    <c>default_bind</c> bind type if the amount of schedulers
+	    is at least equal to the amount of logical processors
+	    configured, binding of schedulers is supported, and a CPU
+	    topology is available at startup.</p>
+          <p>
+	    Own Id: OTP-8765</p>
+        </item>
+        <item>
+          <p>
+	    The SMP ERTS internal child waiter thread used on Linux
+	    system with NPTL was unintentionally disabled during
+	    cross compilation rewrites (OTP-8323 in R13B03). It has
+	    now been re-enabled. Enabling it again gives a slight
+	    performance improvement.</p>
+          <p>
+	    Own Id: OTP-8774</p>
+        </item>
+        <item>
+          <p>
+	    <c>epmd</c> used to generate a message to the syslog when
+	    it started up, which could be annoying. This has been
+	    changed to only generate the message if the debug swith
+	    is given. (Thanks to Michael Santos.)</p>
+          <p>
+	    Own Id: OTP-8775</p>
+        </item>
+        <item>
+          <p>
+	    The scheduler wakeup threshold is now possible to adjust
+	    at system boot. For more information see the <seealso
+	    marker="erl#+swt">+swt</seealso> command line argument of
+	    <c>erl</c>.</p>
+          <p>
+	    Own Id: OTP-8811</p>
+        </item>
+        <item>
+          <p>
+	    The undocumented function inet:ifget/2 has been improved
+	    to return interface hardware address (MAC) on platforms
+	    supporting getaddrinfo() (such as BSD unixes). Note it
+	    still does not work on all platforms for example not
+	    Windows nor Solaris, so the function is still
+	    undocumented.</p>
+          <p>
+	    Buffer overflow and field init bugs for inet:ifget/2 and
+	    inet:getservbyname/2 has also been fixed.</p>
+          <p>
+	    Thanks to Michael Santos.</p>
+          <p>
+	    Own Id: OTP-8816</p>
+        </item>
+        <item>
+          <p>
+	    Optimizations for MIPS when using gcc atomics. (Thanks to
+	    Steve Vinoski)</p>
+          <p>
+	    Own Id: OTP-8834</p>
+        </item>
+        <item>
+          <p>
+	    Lock optimization in timer functionality.</p>
+          <p>
+	    Own Id: OTP-8835</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+	    <p>Fix epmd and build environment to build on VxWorks</p>
+          <p>
+	    Own Id: OTP-8838</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 5.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Driver threads, such as async threads, using <seealso
+	    marker="erl_driver#ErlDrvPDL">port data locks</seealso>
+	    peeked at the port status field without proper locking
+	    when looking up the driver queue.</p>
+          <p>
+	    Own Id: OTP-8475</p>
+        </item>
+        <item>
+          <p>
+	    The use of <c>mmap()</c> was unnecessarily disabled when
+	    cross compiling.</p>
+          <p>
+	    The <c>configure</c> arguments <c>--with-ssl</c>, and
+	    <c>--with-odbc</c> refused to accept libraries outside of
+	    <c>$erl_xcomp_sysroot</c> when cross compiling for no
+	    good reason.</p>
+          <p>
+	    The <c>configure</c> argument <c>--with-odbc</c> didn't
+	    handle the value <c>yes</c> correct.</p>
+          <p>
+	    The <c>configure</c> arguments <c>--with-odbc</c>, and
+	    <c>--without-odbc</c> have also been added to the
+	    configure help.</p>
+          <p>
+	    (Thanks to Steve Vinoski for reporting these issues)</p>
+          <p>
+	    Own Id: OTP-8484</p>
+        </item>
+        <item>
+          <p>
+	    A call to the BIF <c>unregister(RegName)</c> when a port
+	    had the name <c>RegName</c> registered in the runtime
+	    system without SMP support caused a runtime system crash.
+	    (Thanks to Per Hedeland for the bugfix and test case.)</p>
+          <p>
+	    Own Id: OTP-8487</p>
+        </item>
+        <item>
+          <p>
+	    The runtime system crashed if fewer logical processors
+	    were found than reported by <c>sysconf(
+	    SC_NPROCESSORS_CONF)</c>.</p>
+          <p>
+	    Own Id: OTP-8549</p>
+        </item>
+        <item>
+          <p>
+	    Fix memory management bug causing crash of non-SMP
+	    emulator with async threads enabled. The bug did first
+	    appear in R13B03.</p>
+          <p>
+	    Own Id: OTP-8591 Aux Id: seq11554 </p>
+        </item>
+        <item>
+          <p>
+	    Port locks could be prematurely destroyed.</p>
+          <p>
+	    Own Id: OTP-8612</p>
+        </item>
+        <item>
+	    <p>The <c>empd</c> program could loop and consume 100%
+	    CPU time if an unexpected error ocurred in
+	    <c>listen()</c> or <c>accept()</c>. Now <c>epmd</c> will
+	    terminate if a non-recoverable error occurs. (Thanks to
+	    Michael Santos.)</p>
+          <p>
+	    Own Id: OTP-8618</p>
+        </item>
+        <item>
+          <p>
+	    When kernel poll has been enabled, a livelock could in
+	    rare circumstances occur. Problem reported by Chetan
+	    Ahuja, fix by Mikael Pettersson.</p>
+          <p>
+	    Own Id: OTP-8632</p>
+        </item>
+        <item>
+          <p>
+	    Windows: Closing port of program that stalled without
+	    reading all data could deadlock scheduler thread.</p>
+          <p>
+	    Own Id: OTP-8641</p>
+        </item>
+        <item>
+          <p>
+	    On some combination of Montavista Linux on Cavium Octeon
+	    processors, some socket-related system calls returned
+	    other numbers than -1 for errors. This caused a core dump
+	    in inet_drv.c. Now the code works around this problem.</p>
+          <p>
+	    Own Id: OTP-8654</p>
+        </item>
+        <item>
+          <p>
+	    Missing memory barriers in <c>erts_poll()</c> could cause
+	    the runtime system to hang indefinitely.</p>
+          <p>
+	    Own Id: OTP-8658</p>
+        </item>
+        <item>
+          <p>
+	    <c>ethr_rwmutex_tryrlock()</c> acquired and refused to
+	    acquire a lock with inverted logic. The lock was however
+	    never acquired in a thread unsafe manner. (Thanks to JR
+	    Zhang for noting this issue)</p>
+          <p>
+	    Own Id: OTP-8662</p>
+        </item>
+        <item>
+          <p>
+	    Extreme combinations of register/unregister in a highly
+	    parallell SMP application could crash the VM. The error
+	    is corrected.</p>
+          <p>
+	    Own Id: OTP-8663</p>
+        </item>
+        <item>
+          <p>
+	    On Windows, files are now opened with FILE_SHARE_DELETE
+	    to get closer to Unix semantics.</p>
+          <p>
+	    Own Id: OTP-8667</p>
+        </item>
+        <item>
+          <p>
+	    <c>erlang:system_info(multi_scheduling)</c> sometimes
+	    erroneously returned <c>enabled</c> when it should have
+	    returned <c>blocked</c>.</p>
+          <p>
+	    Own Id: OTP-8675</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug causing <c>erlang:decode_packet</c> and
+	    <c>enif_make_string</c> to generate faulty strings with
+	    negative character values for ascii values larger than
+	    127. (Thanks to Paul Guyot)</p>
+          <p>
+	    Own Id: OTP-8685</p>
+        </item>
+        <item>
+          <p>
+	    <c>open_port/2</c> with the <c>spawn</c> and
+	    <c>spawn_executable</c> options can include an
+	    <c>{env,Env}</c> option. In some cases unsetting
+	    variables would not work on Unix (typically if more
+	    variables were unset than were actually present in the
+	    environment).</p>
+          <p>
+	    Own Id: OTP-8701</p>
+        </item>
+        <item>
+          <p>
+	    A user defined CPU topology set via a call to <seealso
+	    marker="erlang#system_flag_cpu_topology">erlang:system_flag(cpu_topology,
+	    CPUTopology)</seealso> was not properly verified, and
+	    could in worst case cause an emulator crash. The emulator
+	    crash could only occur when a user defined CPU topology
+	    already existed and was redefined.</p>
+          <p>
+	    Own Id: OTP-8710</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The grammar for match specifications in ERTS users guide
+	    only described the tracing dialect of match
+	    specifications. An informal grammar for the ETS dialect
+	    is added.</p>
+          <p>
+	    Own Id: OTP-8086 Aux Id: seq11333 </p>
+        </item>
+        <item>
+          <p>
+	    The module binary from EEP31 (and EEP9) is implemented.</p>
+          <p>
+	    Own Id: OTP-8217</p>
+        </item>
+        <item>
+          <p>
+	    New NIF API function <c>enif_make_new_binary</c></p>
+          <p>
+	    Own Id: OTP-8474</p>
+        </item>
+        <item>
+          <p>
+	    The guard BIF <c>is_boolean/1</c> (introduced in R10B)
+	    has now been included in the lists of BIFs allowed in
+	    guards in the Reference Manual.</p>
+          <p>
+	    Own Id: OTP-8477</p>
+        </item>
+        <item>
+          <p>
+	    Added function <c>zip:foldl/3</c> to iterate over zip
+	    archives.</p>
+          <p>
+	    Added functions to create and extract escripts. See
+	    <c>escript:create/2</c> and <c>escript:extract/2</c>.</p>
+          <p>
+	    The undocumented function <c>escript:foldl/3</c> has been
+	    removed. The same functionality can be achieved with the
+	    more flexible functions <c>escript:extract/2</c> and
+	    <c>zip:foldl/3</c>.</p>
+          <p>
+	    Record fields has been annotated with type info. Source
+	    files as been adapted to fit within 80 chars and trailing
+	    whitespace has been removed.</p>
+          <p>
+	    Own Id: OTP-8521</p>
+        </item>
+        <item>
+	    <p>A regular expression with many levels of parenthesis
+	    could cause a buffer overflow. That has been corrected.
+	    (Thanks to Michael Santos.)</p>
+          <p>
+	    Own Id: OTP-8539</p>
+        </item>
+        <item>
+          <p>
+	    <c>erlang:decode_packet(httph_bin,..)</c> could return
+	    corrupt header strings or even crash the VM. This has
+	    been fixed. It only happened on 32-bit VM if the header
+	    name was unknown and between 16 and 20 characters long.
+	    Sockets with simular <c>packet</c> option did not suffer
+	    from this bug.</p>
+          <p>
+	    Own Id: OTP-8548</p>
+        </item>
+        <item>
+	    <p>New NIF features:</p> <list><item> Send messages from
+	    a NIF, or from thread created by NIF, to any local
+	    process (<c>enif_send</c>) </item><item> Store terms
+	    between NIF calls (<c>enif_alloc_env</c>,
+	    <c>enif_make_copy</c>) </item><item> Create binary terms
+	    with user defined memory management
+	    (<c>enif_make_resource_binary</c>) </item></list> <p>And
+	    some incompatible changes made to the API. For more
+	    information see the warning text in <seealso
+	    marker="erl_nif">erl_nif(3)</seealso>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8555</p>
+        </item>
+        <item>
+	    <p>If the '<c>fop</c>' program (needed for building PDF
+	    files) cannot not be found, it is now possible to build
+	    the HTML and man pages anyway (there will also be dummy
+	    PDF files with no real content created). (Thanks to
+	    Tuncer Ayaz.)</p>
+          <p>
+	    Own Id: OTP-8559</p>
+        </item>
+        <item>
+	    <p>When defining macros the closing right parenthesis
+	    before the dot is now mandatory.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8562</p>
+        </item>
+        <item>
+	    <p>Local and imported functions now override the
+	    auto-imported BIFs when the names clash. The pre R14
+	    behaviour was that auto-imported BIFs would override
+	    local functions. To avoid that old programs change
+	    behaviour, the following will generate an error:</p>
+	    <list><item><p>Doing a call without explicit module name
+	    to a local function having a name clashing with the name
+	    of an auto-imported BIF that was present (and
+	    auto-imported) before OTP R14A</p></item>
+	    <item><p>Explicitly importing a function having a name
+	    clashing with the name of an autoimported BIF that was
+	    present (and autoimported) before OTP R14A</p></item>
+	    <item><p>Using any form of the old compiler directive
+	    <c>nowarn_bif_clash</c></p></item> </list> <p>If the BIF
+	    was added or auto-imported in OTP R14A or later,
+	    overriding it with an import or a local function will
+	    only result in a warning,</p> <p>To resolve clashes, you
+	    can either use the explicit module name <c>erlang</c> to
+	    call the BIF, or you can remove the auto-import of that
+	    specific BIF by using the new compiler directive
+	    <c>-compile({no_auto_import,[F/A]}).</c>, which makes all
+	    calls to the local or imported function without explicit
+	    module name pass without warnings or errors.</p> <p>The
+	    change makes it possible to add auto-imported BIFs
+	    without breaking or silently changing old code in the
+	    future. However some current code ingeniously utilizing
+	    the old behaviour or the <c>nowarn_bif_clash</c> compiler
+	    directive, might need changing to be accepted by the
+	    compiler.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8579</p>
+        </item>
+        <item>
+          <p>
+	    A bug in re that could cause certain regular expression
+	    matches never to terminate is corrected. (Thanks to
+	    Michael Santos and Gordon Guthrie.)</p>
+          <p>
+	    Own Id: OTP-8589</p>
+        </item>
+        <item>
+	    <p>The erlang:open_port spawn and spawn_executable
+	    directives can include an <c>{env,Env}</c> directive to
+	    set up environment variables for the spawned process. A
+	    bug prevented applications from using <c>{env,Env}</c> to
+	    set an environment variable whose value ended with a
+	    '<c>=</c>' (equal sign) character; the trailing equal
+	    sign was mistaken as an indication that an environment
+	    variable was to be cleared from the environment of the
+	    spawned process. (Thanks to Steve Vinoski.)</p>
+          <p>
+	    Own Id: OTP-8614</p>
+        </item>
+        <item>
+	    <p><c>receive</c> statements that can only read out a
+	    newly created reference are now specially optimized so
+	    that it will execute in constant time regardless of the
+	    number of messages in the receive queue for the process.
+	    That optimization will benefit calls to
+	    <c>gen_server:call()</c>. (See <c>gen:do_call/4</c> for
+	    an example of a receive statement that will be
+	    optimized.)</p>
+          <p>
+	    Own Id: OTP-8623</p>
+        </item>
+        <item>
+          <p>
+	    The functions file:advise/4 and file:datasync/1 have been
+	    added. (Thanks to Filipe David Manana.)</p>
+          <p>
+	    Own Id: OTP-8637</p>
+        </item>
+        <item>
+          <p>
+	    New NIF API functions: <c>enif_make_atom_len</c>,
+	    <c>enif_make_existing_atom_len</c>,
+	    <c>enif_make_string_len</c>, <c>enif_get_atom_length</c>,
+	    <c>enif_get_list_length</c>, <c>enif_is_list</c>,
+	    <c>enif_is_tuple</c> (by Tuncer Ayaz)</p>
+          <p>
+	    Own Id: OTP-8640</p>
+        </item>
+        <item>
+          <p>
+	    Support for using gcc's built-in functions for atomic
+	    memory access has been added. This functionallity will be
+	    used if available and no other native atomic
+	    implementation in ERTS is available.</p>
+          <p>
+	    Own Id: OTP-8659</p>
+        </item>
+        <item>
+          <p>
+	    The number of spinlocks used when implementing atomic
+	    fall-backs when no native atomic implementation is
+	    available has been increased from 16 to 1024.</p>
+          <p>
+	    Own Id: OTP-8660</p>
+        </item>
+        <item>
+          <p>
+	    Writer preferred pthread read/write locks has been
+	    enabled on Linux.</p>
+          <p>
+	    Own Id: OTP-8661</p>
+        </item>
+        <item>
+          <p>
+	    The runtime system will by default bind schedulers to
+	    logical processors using the <c>default_bind</c> bind
+	    type if the amount of schedulers are at least equal to
+	    the amount of logical processors configured, binding of
+	    schedulers is supported, and a CPU topology is available
+	    at startup. </p>
+          <p>
+	    <em>NOTE:</em> If the Erlang runtime system is the only
+	    operating system process that binds threads to logical
+	    processors, this improves the performance of the runtime
+	    system. However, if other operating system processes (as
+	    for example another Erlang runtime system) also bind
+	    threads to logical processors, there might be a
+	    performance penalty instead. If this is the case you, are
+	    are advised to unbind the schedulers using the <seealso
+	    marker="erl#+sbt">+sbtu</seealso> command line argument,
+	    or by invoking <seealso
+	    marker="erlang#system_flag_scheduler_bind_type">erlang:system_flag(scheduler_bind_type,
+	    unbound)</seealso>.</p>
+          <p>
+	    Own Id: OTP-8666</p>
+        </item>
+        <item>
+          <p>
+	    The recently added BIFs erlang:min/2, erlang:max/2 and
+	    erlang:port_command/3 are now auto-imported (as they were
+	    originally intended to be). Due to the recent compiler
+	    change (OTP-8579), the only impact on old code defining
+	    it's own min/2, max/2 or port_command/3 functions will be
+	    a warning, the local functions will still be used. The
+	    warning can be removed by using
+	    -compile({no_auto_import,[min/2,max/2,port_command/3]}).
+	    in the source file.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8669 Aux Id: OTP-8579 </p>
+        </item>
+        <item>
+          <p>
+	    There is a new option 'exclusive' to file:open/2 that
+	    uses the OS O_EXCL flag where supported to open the file
+	    in exclusive mode.</p>
+          <p>
+	    Own Id: OTP-8670</p>
+        </item>
+        <item>
+          <p>
+	    Now, binary_to_term/2 is auto-imported. This will cause a
+	    compile warning if and only if a module has got a local
+	    function with that name.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8671</p>
+        </item>
+        <item>
+          <p>
+	    Alignment of scheduler data and run queues were adjusted.</p>
+          <p>
+	    Own Id: OTP-8673</p>
+        </item>
+        <item>
+	    <p>Call time breakpoint tracing</p> <list><item>Introduce
+	    a <c>call_time</c> option to
+	    <c>erlang:trace_pattern/3</c>.This option enables call
+	    time breakpoint tracing on code that is executed by
+	    processes with call tracing enabled. Call time tracing
+	    stores the number of calls and the time spent of each
+	    function with this trace pattern enabled. The information
+	    can be retrieved with <c>erlang:trace_info/2</c></item>
+	    <item>Add a scheduler array for BpData. To solve the
+	    issue of multiple schedulers constantly updating the head
+	    pointer to the bp data wheel, each scheduler now has its
+	    own entrypoint to the wheel. This head pointer can be
+	    updated without a locking being taken.</item></list>
+	    <p>Teach call count tracing to use atomics</p>
+	    <list><item>Call count previously used a global lock for
+	    accessing and writing its counter in the breakpoint. This
+	    is now changed to atomics instead.</item> <item>The
+	    change will let call count tracing and cprof to scale
+	    better when increasing the number of
+	    schedulers.</item></list>
+          <p>
+	    Own Id: OTP-8677</p>
+        </item>
+        <item>
+	    <p><c>eprof</c> has been reimplemented with support in
+	    the Erlang virtual machine and is now both faster (i.e.
+	    slows down the code being measured less) and scales much
+	    better. In measurements we saw speed-ups compared to the
+	    old eprof ranging from 6 times (for sequential code that
+	    only uses one scheduler/core) up to 84 times (for
+	    parallel code that uses 8 cores).</p>
+	    <p>Note: The API for the <c>eprof</c> has been cleaned up
+	    and extended. See the documentation.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8706</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 5.7.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            Driver threads, such as async threads, using <seealso
+            marker="erl_driver#ErlDrvPDL">port data locks</seealso>
+            peeked at the port status field without proper locking
+            when looking up the driver queue.</p>
+          <p>
+            Own Id: OTP-8475</p>
+        </item>
+        <item>
+          <p>
+            A call to the BIF <c>unregister(RegName)</c> when a port
+            had the name <c>RegName</c> registered in the runtime
+            system without SMP support caused a runtime system crash.
+            (Thanks to Per Hedeland for the bugfix and test case.)</p>
+          <p>
+            Own Id: OTP-8487</p>
+        </item>
+        <item>
+          <p>
+            Fix memory management bug causing crash of non-SMP
+            emulator with async threads enabled. The bug did first
+            appear in R13B03.</p>
+          <p>
+            Own Id: OTP-8591 Aux Id: seq11554 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 5.7.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index eca6121a1e..f04df354a8 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -74,7 +74,7 @@ else
 ifeq ($(TYPE),gcov)
 PURIFY = 
 TYPEMARKER = .gcov
-TYPE_FLAGS = @DEBUG_CFLAGS@ -DNO_JUMP_TABLE -fprofile-arcs -ftest-coverage -O0 -DERTS_CAN_INLINE=0 -DERTS_INLINE=
+TYPE_FLAGS = @DEBUG_CFLAGS@ -DERTS_GCOV -DNO_JUMP_TABLE -fprofile-arcs -ftest-coverage -O0 -DERTS_CAN_INLINE=0 -DERTS_INLINE=
 ifneq ($(findstring solaris,$(TARGET)),solaris)
 LIBS += -lgcov
 endif
@@ -199,6 +199,14 @@ MKDIR	= @MKDIR@
 
 USING_MINGW=@MIXED_CYGWIN_MINGW@
 
+ifeq ($(TARGET),win32)
+LIB_PREFIX=
+LIB_SUFFIX=.lib
+else
+LIB_PREFIX=lib
+LIB_SUFFIX=.a
+endif
+
 OMIT_OMIT_FP=no
 
 ifeq (@EMU_LOCK_CHECKING@,yes)
@@ -279,16 +287,11 @@ endif
 
 ifeq ($(TARGET),win32)
 LIBS    += -L$(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE) -lepcre
-DEPLIBS += $(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/epcre.lib
 else
-LIBS    += $(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/libepcre.a
-DEPLIBS += \
-	$(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/libepcre.a \
-	$(ERL_TOP)/erts/lib/internal/$(TARGET)/liberts_internal.a 
-# rem liberts_internal.a
+LIBS    += $(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/$(LIB_PREFIX)epcre$(LIB_SUFFIX)
 endif
 
-ELIB_FLAGS = -DENABLE_ELIB_MALLOC -DELIB_ALLOC_IS_CLIB -DELIB_HEAP_SBRK
+DEPLIBS += $(ERL_TOP)/erts/emulator/pcre/obj/$(TARGET)/$(TYPE)/$(LIB_PREFIX)epcre$(LIB_SUFFIX)
 
 PERFCTR_PATH=@PERFCTR_PATH@
 USE_PERFCTR=@USE_PERFCTR@
@@ -305,7 +308,19 @@ LIBSCTP = @LIBSCTP@
 ORG_THR_LIBS=@EMU_THR_LIBS@
 THR_LIB_NAME=@EMU_THR_LIB_NAME@
 
-THR_LIBS=$(subst -l$(THR_LIB_NAME),-l$(THR_LIB_NAME)$(TYPEMARKER),$(ORG_THR_LIBS))
+ifneq ($(strip $(THR_LIB_NAME)),)
+DEPLIBS +=	$(ERL_TOP)/erts/lib/internal/$(TARGET)/$(LIB_PREFIX)erts_internal_r$(TYPEMARKER)$(LIB_SUFFIX) \
+		$(ERL_TOP)/erts/lib/internal/$(TARGET)/$(LIB_PREFIX)ethread$(TYPEMARKER)$(LIB_SUFFIX)
+else
+DEPLIBS +=	$(ERL_TOP)/erts/lib/internal/$(TARGET)/$(LIB_PREFIX)erts_internal$(TYPEMARKER)$(LIB_SUFFIX)
+endif
+
+THR_LIBS=$(subst -l$(THR_LIB_NAME),-l$(THR_LIB_NAME)$(TYPEMARKER), \
+	   $(subst -lerts_internal_r,-lerts_internal_r$(TYPEMARKER),$(ORG_THR_LIBS)))
+
+LIBS += $(THR_LIBS)
+
+ifneq ($(findstring erts_internal_r, $(THR_LIBS)),erts_internal_r)
 
 ifeq ($(findstring vxworks,$(TARGET)),vxworks)
 ERTS_INTERNAL_LIB=erts_internal
@@ -317,7 +332,9 @@ ERTS_INTERNAL_LIB=erts_internal
 endif
 endif
 
-LIBS += $(THR_LIBS) -l$(ERTS_INTERNAL_LIB)$(TYPEMARKER)
+LIBS += -l$(ERTS_INTERNAL_LIB)$(TYPEMARKER)
+
+endif # erts_internal_r
 
 LIBS += @LIBRT@
 
@@ -441,8 +458,6 @@ release_spec: all
 ifeq ($(ERLANG_OSTYPE), unix)
 	$(INSTALL_PROGRAM) $(BINDIR)/$(CS_EXECUTABLE) $(RELSYSDIR)/bin
 endif
-	$(INSTALL_DIR) $(RELEASE_PATH)/usr/include/obsolete
-	$(INSTALL_DATA) obsolete/driver.h $(RELEASE_PATH)/usr/include/obsolete
 endif
 endif
 
@@ -490,8 +505,10 @@ ifdef HIPE_ENABLED
 OPCODE_TABLES += hipe/hipe_ops.tab
 endif
 
-$(TTF_DIR)/beam_opcodes.h $(TTF_DIR)/beam_opcodes.c: $(OPCODE_TABLES)
-	LANG=C $(PERL) utils/beam_makeops -outdir $(TTF_DIR) \
+$(TTF_DIR)/beam_opcodes.h $(TTF_DIR)/beam_opcodes.c: $(OPCODE_TABLES) utils/beam_makeops
+	LANG=C $(PERL) utils/beam_makeops \
+		-wordsize @EXTERNAL_WORD_SIZE@ \
+		-outdir $(TTF_DIR) \
 		-emulator $(OPCODE_TABLES)
 
 # bif and atom table
@@ -516,8 +533,9 @@ TABLES=	$(TARGET)/erl_bif_table.c $(TARGET)/erl_bif_table.h	\
 	$(TARGET)/erl_atom_table.c $(TARGET)/erl_atom_table.h   \
 	$(TARGET)/erl_pbifs.c
 
-$(TABLES):	$(ATOMS) $(BIFS)
-	LANG=C $(PERL) utils/make_tables -src $(TARGET) -include $(TARGET) $^
+$(TABLES): $(ATOMS) $(BIFS) utils/make_tables
+	LANG=C $(PERL) utils/make_tables -src $(TARGET) -include $(TARGET)\
+		$(ATOMS) $(BIFS)
 
 $(TTF_DIR)/erl_alloc_types.h: beam/erl_alloc.types utils/make_alloc_types
 	LANG=C $(PERL) utils/make_alloc_types -src $< -dst $@ $(ENABLE_ALLOC_TYPE_VARS)
@@ -636,9 +654,6 @@ $(BINDIR)/$(CS_EXECUTABLE): $(CS_SRC)
 	$(CS_PURIFY) $(CC) $(CS_LDFLAGS) -o $(BINDIR)/$(CS_EXECUTABLE) \
                $(CS_CFLAGS) $(COMMON_INCLUDES) $(CS_SRC) $(CS_LIBS)
 
-$(OBJDIR)/%.elib.o: beam/%.c
-	$(CC) $(ELIB_FLAGS) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
-
 $(OBJDIR)/%.kp.o: sys/common/%.c
 	$(CC) -DERTS_KERNEL_POLL_VERSION $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 
@@ -647,9 +662,6 @@ $(OBJDIR)/%.nkp.o: sys/common/%.c
 
 ifeq ($(GCC),yes)
 
-$(OBJDIR)/erl_obsolete.o: beam/erl_obsolete.c
-	$(CC) $(subst -Wstrict-prototypes, , $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS))) $(INCLUDES) -c $< -o $@
-
 $(OBJDIR)/erl_goodfit_alloc.o: beam/erl_goodfit_alloc.c
 	$(CC) $(subst -O2, $(GEN_OPT_FLGS) $(UNROLL_FLG), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 endif
@@ -724,7 +736,7 @@ RUN_OBJS = \
 	$(OBJDIR)/erl_fun.o             $(OBJDIR)/erl_bif_port.o \
 	$(OBJDIR)/erl_term.o 		$(OBJDIR)/erl_node_tables.o \
 	$(OBJDIR)/erl_monitors.o	$(OBJDIR)/erl_process_dump.o \
-	$(OBJDIR)/erl_obsolete.o	$(OBJDIR)/erl_bif_timer.o \
+	$(OBJDIR)/erl_bif_timer.o	$(OBJDIR)/erl_cpu_topology.o \
 	$(OBJDIR)/erl_drv_thread.o      $(OBJDIR)/erl_bif_chksum.o \
 	$(OBJDIR)/erl_bif_re.o		$(OBJDIR)/erl_unicode.o \
 	$(OBJDIR)/packet_parser.o	$(OBJDIR)/safe_hash.o \
@@ -748,15 +760,13 @@ OS_OBJS = \
 	$(OBJDIR)/sys_time.o \
 	$(OBJDIR)/sys_interrupt.o \
 	$(OBJDIR)/sys_env.o \
-	$(OBJDIR)/dosmap.o \
-	$(OBJDIR)/elib_malloc.o
+	$(OBJDIR)/dosmap.o
 else
 OS_OBJS = \
 	$(OBJDIR)/sys.o \
 	$(OBJDIR)/driver_tab.o \
 	$(OBJDIR)/unix_efile.o \
 	$(OBJDIR)/gzio.o \
-	$(OBJDIR)/elib_malloc.o \
 	$(OBJDIR)/elib_memmove.o
 
 ifeq ($(findstring vxworks,$(TARGET)),vxworks)
@@ -788,7 +798,8 @@ endif
 
 OS_OBJS +=	$(OBJDIR)/erl_mseg.o \
 		$(OBJDIR)/erl_$(ERLANG_OSTYPE)_sys_ddll.o \
-		$(OBJDIR)/erl_mtrace_sys_wrap.o
+		$(OBJDIR)/erl_mtrace_sys_wrap.o \
+		$(OBJDIR)/erl_sys_common_misc.o
 
 HIPE_x86_OS_OBJS=$(HIPE_x86_$(OPSYS)_OBJS)
 HIPE_x86_OBJS=$(OBJDIR)/hipe_x86.o $(OBJDIR)/hipe_x86_glue.o $(OBJDIR)/hipe_x86_bifs.o $(OBJDIR)/hipe_x86_signal.o $(OBJDIR)/hipe_x86_stack.o $(HIPE_x86_OS_OBJS)
@@ -820,16 +831,6 @@ BASE_OBJS = $(RUN_OBJS) $(EMU_OBJS) $(OS_OBJS) $(EXTRA_BASE_OBJS)
 
 OBJS =	$(BASE_OBJS) $(DRV_OBJS)
 
-ELIB_C_FILES =	beam/elib_malloc.c \
-		beam/elib_memmove.c \
-		beam/erl_bif_info.c \
-		beam/utils.c \
-		beam/erl_alloc.c
-
-MOD_OBJS_ELIB =	$(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(ELIB_C_FILES)))
-OBJS_ELIB = 	$(patsubst %.o,%.elib.o,$(MOD_OBJS_ELIB)) \
-		$(filter-out $(MOD_OBJS_ELIB),$(OBJS))
-
 ########################################
 # HiPE section
 
@@ -921,10 +922,6 @@ $(BINDIR)/$(EMULATOR_EXECUTABLE): $(INIT_OBJS) $(OBJS) $(DEPLIBS)
 	$(PURIFY) $(LD) -o $(BINDIR)/$(EMULATOR_EXECUTABLE) \
 	$(HIPEBEAMLDFLAGS) $(LDFLAGS) $(DEXPORT) $(INIT_OBJS) $(OBJS) $(LIBS)
 
-$(BINDIR)/$(EMULATOR_EXECUTABLE_ELIB): $(INIT_OBJS) $(OBJS_ELIB) $(DEPLIBS)
-	$(PURIFY) $(LD) -o $(BINDIR)/$(EMULATOR_EXECUTABLE_ELIB) \
-	$(LDFLAGS) $(DEXPORT) $(INIT_OBJS) $(OBJS_ELIB) $(LIBS)
-
 endif
 
 #
@@ -1019,7 +1016,7 @@ depend:
 	$(DEP_CC) $(DEP_FLAGS) $(TARGET_SRC) \
 		| $(SED_DEPEND) >> $(TARGET)/depend.mk
 ifneq ($(TARGET),win32)
-	$(DEP_CC) $(DEP_FLAGS) $(ELIB_FLAGS) $(ELIB_C_FILES) \
+	$(DEP_CC) $(DEP_FLAGS) $(ELIB_C_FILES) \
 		| $(SED_ELIB_DEPEND) >> $(TARGET)/depend.mk
 endif
 ifdef HIPE_ENABLED
diff --git a/erts/emulator/beam/atom.c b/erts/emulator/beam/atom.c
index e2a79d6e4f..b97705ed96 100644
--- a/erts/emulator/beam/atom.c
+++ b/erts/emulator/beam/atom.c
@@ -41,8 +41,7 @@ static erts_smp_rwmtx_t atom_table_lock;
 #define atom_read_unlock()	erts_smp_rwmtx_runlock(&atom_table_lock)
 #define atom_write_lock()	erts_smp_rwmtx_rwlock(&atom_table_lock)
 #define atom_write_unlock()	erts_smp_rwmtx_rwunlock(&atom_table_lock)
-#define atom_init_lock()	erts_smp_rwmtx_init(&atom_table_lock, \
-						    "atom_tab")
+
 #if 0
 #define ERTS_ATOM_PUT_OPS_STAT
 #endif
@@ -304,12 +303,17 @@ init_atom_table(void)
     HashFunctions f;
     int i;
     Atom a;
+    erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER;
+
+    rwmtx_opt.type = ERTS_SMP_RWMTX_TYPE_FREQUENT_READ;
+    rwmtx_opt.lived = ERTS_SMP_RWMTX_LONG_LIVED;
 
 #ifdef ERTS_ATOM_PUT_OPS_STAT
     erts_smp_atomic_init(&atom_put_ops, 0);
 #endif
 
-    atom_init_lock();
+    erts_smp_rwmtx_init_opt(&atom_table_lock, &rwmtx_opt, "atom_tab");
+
     f.hash = (H_FUN) atom_hash;
     f.cmp  = (HCMP_FUN) atom_cmp;
     f.alloc = (HALLOC_FUN) atom_alloc;
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index 28f69b9460..327620772f 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -119,6 +119,7 @@ atom bsl
 atom bsr
 atom bsr_anycrlf
 atom bsr_unicode
+atom build_type
 atom busy_dist_port
 atom busy_port
 atom call
@@ -378,6 +379,7 @@ atom old_heap_size
 atom on_load
 atom open
 atom open_error
+atom opt
 atom or
 atom ordered_set
 atom orelse
@@ -432,6 +434,7 @@ atom raw
 atom re
 atom re_pattern
 atom re_run_trap
+atom read_concurrency
 atom ready_input
 atom ready_output
 atom ready_async
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c
index 596ad9a010..6ae9736141 100644
--- a/erts/emulator/beam/beam_bif_load.c
+++ b/erts/emulator/beam/beam_bif_load.c
@@ -337,7 +337,6 @@ BIF_RETTYPE finish_after_on_load_2(BIF_ALIST_2)
 		ep->code[0] == BIF_ARG_1 &&
 		ep->code[4] != 0) {
 		ep->address = (void *) ep->code[4];
-		ep->code[3] = 0;
 		ep->code[4] = 0;
 	    }
 	}
@@ -402,7 +401,7 @@ check_process_code(Process* rp, Module* modp)
     BeamInstr* end;
     Eterm* sp;
 #ifndef HYBRID /* FIND ME! */
-    ErlFunThing* funp;
+    struct erl_off_heap_header* oh;
     int done_gc = 0;
 #endif
 
@@ -470,27 +469,30 @@ check_process_code(Process* rp, Module* modp)
 
 #ifndef HYBRID /* FIND ME! */
  rescan:
-    for (funp = MSO(rp).funs; funp; funp = funp->next) {
-	BeamInstr* fun_code;
-
-	fun_code = funp->fe->address;
-
-	if (INSIDE((BeamInstr *) funp->fe->address)) {
-	    if (done_gc) {
-		return am_true;
-	    } else {
-		/*
-		 * Try to get rid of this fun by garbage collecting.
-		 * Clear both fvalue and ftrace to make sure they
-		 * don't hold any funs.
-		 */
-		rp->freason = EXC_NULL;
-		rp->fvalue = NIL;
-		rp->ftrace = NIL;
-		done_gc = 1;
-                FLAGS(rp) |= F_NEED_FULLSWEEP;
-		(void) erts_garbage_collect(rp, 0, rp->arg_reg, rp->arity);
-		goto rescan;
+    for (oh = MSO(rp).first; oh; oh = oh->next) {
+	if (thing_subtag(oh->thing_word) == FUN_SUBTAG) {
+	    ErlFunThing* funp = (ErlFunThing*) oh;
+	    BeamInstr* fun_code;
+
+	    fun_code = funp->fe->address;
+
+	    if (INSIDE((BeamInstr *) funp->fe->address)) {
+		if (done_gc) {
+		    return am_true;
+		} else {
+		    /*
+		    * Try to get rid of this fun by garbage collecting.
+		    * Clear both fvalue and ftrace to make sure they
+		    * don't hold any funs.
+		    */
+		    rp->freason = EXC_NULL;
+		    rp->fvalue = NIL;
+		    rp->ftrace = NIL;
+		    done_gc = 1;
+		    FLAGS(rp) |= F_NEED_FULLSWEEP;
+		    (void) erts_garbage_collect(rp, 0, rp->arg_reg, rp->arity);
+		    goto rescan;
+		}
 	    }
 	}
     }
diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
index 682f31b83f..31910888d1 100644
--- a/erts/emulator/beam/beam_bp.c
+++ b/erts/emulator/beam/beam_bp.c
@@ -950,8 +950,8 @@ static int set_function_break(Module *modp, BeamInstr *pc, int bif,
 	    MatchSetUnref(old_match_spec);
 	} else {
 	    BpDataCount *bdc = (BpDataCount *) bd;
-	    long count = 0;
-	    long res   = 0;
+	    erts_aint_t count = 0;
+	    erts_aint_t res   = 0;
 
 	    ASSERT(! match_spec);
 	    ASSERT(is_nil(tracer_pid));
diff --git a/erts/emulator/beam/beam_bp.h b/erts/emulator/beam/beam_bp.h
index b5d5b3c203..bd8a7249a7 100644
--- a/erts/emulator/beam/beam_bp.h
+++ b/erts/emulator/beam/beam_bp.h
@@ -123,7 +123,7 @@ typedef struct {
     Uint ms;
     Uint s;
     Uint us;
-    Uint *pc;
+    BeamInstr *pc;
 } process_breakpoint_time_t; /* used within psd */
 
 extern erts_smp_spinlock_t erts_bp_lock;
@@ -157,7 +157,7 @@ do {                                                             \
     BpData **bds = (BpData **) (pc)[-4];                         \
     BpDataCount *bdc = NULL;                                     \
     Uint ix = bp_sched2ix_proc( (p) );                           \
-    long count = 0;                                              \
+    erts_aint_t count = 0;                                       \
                                                                  \
     ASSERT((pc)[-5] == (BeamInstr) BeamOp(op_i_func_info_IaaI)); \
     ASSERT(bds);                                                 \
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c
index 23b267d5cd..2855241b91 100644
--- a/erts/emulator/beam/beam_debug.c
+++ b/erts/emulator/beam/beam_debug.c
@@ -48,7 +48,6 @@
 void dbg_bt(Process* p, Eterm* sp);
 void dbg_where(BeamInstr* addr, Eterm x0, Eterm* reg);
 
-static void print_big(int to, void *to_arg, Eterm* addr);
 static int print_op(int to, void *to_arg, int op, int size, BeamInstr* addr);
 Eterm
 erts_debug_same_2(Process* p, Eterm term1, Eterm term2)
@@ -125,7 +124,7 @@ erts_debug_breakpoint_2(Process* p, Eterm MFA, Eterm bool)
     BIF_ERROR(p, BADARG);
 }
 
-#if 0 /* XXX:PaN - not used */
+#if 0 /* Kept for conveninence when hard debugging. */
 void debug_dump_code(BeamInstr *I, int num)
 {
     BeamInstr *code_ptr = I;
@@ -157,6 +156,25 @@ void debug_dump_code(BeamInstr *I, int num)
 }
 #endif
 
+BIF_RETTYPE
+erts_debug_instructions_0(BIF_ALIST_0)
+{
+    int i = 0;
+    Uint needed = num_instructions * 2;
+    Eterm* hp;
+    Eterm res = NIL;
+
+    for (i = 0; i < num_instructions; i++) {
+	needed += 2*strlen(opc[i].name);
+    }
+    hp = HAlloc(BIF_P, needed);
+    for (i = num_instructions-1; i >= 0; i--) {
+	Eterm s = erts_bld_string_n(&hp, 0, opc[i].name, strlen(opc[i].name));
+	res = erts_bld_cons(&hp, 0, s, res);
+    }
+    return res;
+}
+
 Eterm
 erts_debug_disassemble_1(Process* p, Eterm addr)
 {
@@ -312,6 +330,7 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
     BeamInstr packed = 0;		/* Accumulator for packed operations. */
     BeamInstr args[8];		/* Arguments for this instruction. */
     BeamInstr* ap;			/* Pointer to arguments. */
+    BeamInstr* unpacked;		/* Unpacked arguments */
 
     start_prog = opc[op].pack;
 
@@ -360,6 +379,12 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 		*ap++ = packed & BEAM_LOOSE_MASK;
 		packed >>= BEAM_LOOSE_SHIFT;
 		break;
+#ifdef ARCH_64
+	    case 'w':		/* Shift 32 steps */
+		*ap++ = packed & BEAM_WIDE_MASK;
+		packed >>= BEAM_WIDE_SHIFT;
+		break;
+#endif
 	    case 'p':
 		*sp++ = *--ap;
 		break;
@@ -386,7 +411,7 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    break;
 	case 'x':		/* x(N) */
 	    if (reg_index(ap[0]) == 0) {
-		erts_print(to, to_arg, "X[0]");
+		erts_print(to, to_arg, "x[0]");
 	    } else {
 		erts_print(to, to_arg, "x(%d)", reg_index(ap[0]));
 	    }
@@ -506,6 +531,7 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    ap++;
 	    break;
 	case 'P':	/* Byte offset into tuple (see beam_load.c) */
+	case 'Q':	/* Like 'P', but packable */
 	    erts_print(to, to_arg, "%d", (*ap / sizeof(Eterm)) - 1);
 	    ap++;
 	    break;
@@ -526,9 +552,12 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
      * Print more information about certain instructions.
      */
 
+    unpacked = ap;
     ap = addr + size;
     switch (op) {
-    case op_i_select_val_sfI:
+    case op_i_select_val_rfI:
+    case op_i_select_val_xfI:
+    case op_i_select_val_yfI:
 	{
 	    int n = ap[-1];
 
@@ -540,7 +569,24 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    }
 	}
 	break;
-    case op_i_jump_on_val_sfII:
+    case op_i_select_tuple_arity_rfI:
+    case op_i_select_tuple_arity_xfI:
+    case op_i_select_tuple_arity_yfI:
+	{
+	    int n = ap[-1];
+
+	    while (n > 0) {
+		Uint arity = arityval(ap[0]);
+		erts_print(to, to_arg, " {%d} f(" HEXF ")", arity, ap[1]);
+		ap += 2;
+		size += 2;
+		n--;
+	    }
+	}
+	break;
+    case op_i_jump_on_val_rfII:
+    case op_i_jump_on_val_xfII:
+    case op_i_jump_on_val_yfII:
 	{
 	    int n;
 	    for (n = ap[-2]; n > 0; n--) {
@@ -550,39 +596,46 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    }
 	}
 	break;
-    case op_i_select_big_sf:
-	while (ap[0]) {
-	    Eterm *bigp = (Eterm *) ap;
-	    int arity = thing_arityval(*bigp);
-	    print_big(to, to_arg, bigp);
-	    size += TermWords(arity+1);
-	    ap += TermWords(arity+1);
-	    erts_print(to, to_arg, " f(" HEXF ") ", ap[0]);
-	    ap++;
-	    size++;
+    case op_i_jump_on_val_zero_rfI:
+    case op_i_jump_on_val_zero_xfI:
+    case op_i_jump_on_val_zero_yfI:
+	{
+	    int n;
+	    for (n = ap[-1]; n > 0; n--) {
+		erts_print(to, to_arg, "f(" HEXF ") ", ap[0]);
+		ap++;
+		size++;
+	    }
+	}
+	break;
+    case op_i_put_tuple_rI:
+    case op_i_put_tuple_xI:
+    case op_i_put_tuple_yI:
+	{
+	    int n = unpacked[-1];
+
+	    while (n > 0) {
+		if (!is_header(ap[0])) {
+		    erts_print(to, to_arg, " %T", (Eterm) ap[0]);
+		} else {
+		    switch ((ap[0] >> 2) & 0x03) {
+		    case R_REG_DEF:
+			erts_print(to, to_arg, " x(0)");
+			break;
+		    case X_REG_DEF:
+			erts_print(to, to_arg, " x(%d)", ap[0] >> 4);
+			break;
+		    case Y_REG_DEF:
+			erts_print(to, to_arg, " y(%d)", ap[0] >> 4);
+			break;
+		    }
+		}
+		ap++, size++, n--;
+	    }
 	}
-	ap++;
-	size++;
 	break;
     }
     erts_print(to, to_arg, "\n");
 
     return size;
 }
-
-static void
-print_big(int to, void *to_arg, Eterm* addr)
-{
-    int i;
-    int k;
-
-    i = BIG_SIZE(addr);
-    if (BIG_SIGN(addr))
-	erts_print(to, to_arg, "-#integer(%d) = {", i);
-    else
-	erts_print(to, to_arg, "#integer(%d) = {", i);
-    erts_print(to, to_arg, "0x%x", BIG_DIGIT(addr, 0));
-    for (k = 1; k < i; k++)
-	erts_print(to, to_arg, ",0x%x", BIG_DIGIT(addr, k));
-    erts_print(to, to_arg, "}");
-}
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index c0680086aa..a4fb454481 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -321,6 +321,7 @@ extern int count_instructions;
 #  define POST_BIF_GC_SWAPIN_0(_p, _res)				\
      ERTS_SMP_REQ_PROC_MAIN_LOCK((_p));					\
      PROCESS_MAIN_CHK_LOCKS((_p));					\
+     ERTS_VERIFY_UNUSED_TEMP_ALLOC((_p));				\
      if (((_p)->mbuf) || (MSO(_p).overhead >= BIN_VHEAP_SZ(_p)) ) {	\
        _res = erts_gc_after_bif_call((_p), (_res), NULL, 0);		\
        E = (_p)->stop;							\
@@ -328,6 +329,7 @@ extern int count_instructions;
      HTOP = HEAP_TOP((_p))
 
 #  define POST_BIF_GC_SWAPIN(_p, _res, _regs, _arity)			\
+     ERTS_VERIFY_UNUSED_TEMP_ALLOC((_p));				\
      ERTS_SMP_REQ_PROC_MAIN_LOCK((_p));					\
      PROCESS_MAIN_CHK_LOCKS((_p));					\
      if (((_p)->mbuf) || (MSO(_p).overhead >= BIN_VHEAP_SZ(_p)) ) {	\
@@ -344,6 +346,8 @@ extern int count_instructions;
 #define xb(N) (*(Eterm *) (((unsigned char *)reg) + (N)))
 #define yb(N) (*(Eterm *) (((unsigned char *)E) + (N)))
 #define fb(N) (*(double *) (((unsigned char *)&(freg[0].fd)) + (N)))
+#define Qb(N) (N)
+#define Ib(N) (N)
 #define x(N) reg[N]
 #define y(N) E[N]
 #define r(N) x##N
@@ -365,6 +369,7 @@ extern int count_instructions;
            reg[0] = r(0); \
            PROCESS_MAIN_CHK_LOCKS(c_p); \
            FCALLS -= erts_garbage_collect(c_p, needed + (HeapNeed), reg, (M)); \
+           ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p); \
            PROCESS_MAIN_CHK_LOCKS(c_p); \
            r(0) = reg[0]; \
            SWAPIN; \
@@ -418,6 +423,7 @@ extern int count_instructions;
        reg[0] = r(0);                                           		\
        PROCESS_MAIN_CHK_LOCKS(c_p);                             		\
        FCALLS -= erts_garbage_collect(c_p, need, reg, (Live));  		\
+       ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);					\
        PROCESS_MAIN_CHK_LOCKS(c_p);                             		\
        r(0) = reg[0];                                           		\
        SWAPIN;                                                  		\
@@ -440,6 +446,7 @@ extern int count_instructions;
        reg[0] = r(0);                                           \
        PROCESS_MAIN_CHK_LOCKS(c_p);                             \
        FCALLS -= erts_garbage_collect(c_p, need, reg, (Live));  \
+       ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);			\
        PROCESS_MAIN_CHK_LOCKS(c_p);                             \
        r(0) = reg[0];                                           \
        SWAPIN;                                                  \
@@ -462,6 +469,7 @@ extern int count_instructions;
        reg[Live] = Extra;						\
        PROCESS_MAIN_CHK_LOCKS(c_p);					\
        FCALLS -= erts_garbage_collect(c_p, need, reg, (Live)+1);	\
+       ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);				\
        PROCESS_MAIN_CHK_LOCKS(c_p);					\
        if (Live > 0) {							\
 	   r(0) = reg[0];						\
@@ -472,6 +480,13 @@ extern int count_instructions;
     HEAP_SPACE_VERIFIED(need);                                      \
   } while (0)
 
+#define TestHeapPutList(Need, Reg)		\
+  do {						\
+     TestHeap((Need), 1);			\
+     PutList(Reg, r(0), r(0), StoreSimpleDest);	\
+     CHECK_TERM(r(0));				\
+  } while (0)
+
 #ifdef HYBRID
 #ifdef INCREMENTAL
 #define TestGlobalHeap(Nh, Live, hp)                                    \
@@ -516,6 +531,11 @@ extern int count_instructions;
      SWAPIN;							\
   } while (0)
 
+#define PutTuple(Dst, Arity)			\
+ do {						\
+   Dst = make_tuple(HTOP);			\
+   pt_arity = (Arity);				\
+ } while (0)
 
 /*
  * Check that we haven't used the reductions and jump to function pointed to by
@@ -674,6 +694,11 @@ extern int count_instructions;
     SET_I((BeamInstr *) CallDest);			\
     Dispatch();
 
+#define MoveJump(Src)				\
+     r(0) = (Src);				\
+     SET_I((BeamInstr *) Arg(0));		\
+     Goto(*I);
+
 #define GetList(Src, H, T) do {			\
    Eterm* tmp_ptr = list_val(Src);		\
    H = CAR(tmp_ptr);				\
@@ -723,16 +748,8 @@ extern int count_instructions;
      (Dest) = (* (Eterm *) EXPAND_POINTER(tmp_arg1));		\
   } while (0)
 
-#define PutTuple(Arity, Src, Dest)		\
-     ASSERT(is_arity_value(Arity));		\
-     Dest = make_tuple(HTOP);			\
-     HTOP[0] = (Arity);				\
-     HTOP[1] = (Src);				\
-     HTOP += 2
-
-#define Put(Word) *HTOP++ = (Word)
-
 #define EqualImmed(X, Y, Action) if (X != Y) { Action; }
+#define NotEqualImmed(X, Y, Action) if (X == Y) { Action; }
 
 #define IsFloat(Src, Fail) if (is_not_float(Src)) { Fail; }
 
@@ -984,8 +1001,41 @@ extern int count_instructions;
 #define IsPid(Src, Fail) if (is_not_pid(Src)) { Fail; }
 #define IsRef(Src, Fail) if (is_not_ref(Src)) { Fail; }
 
-static BifFunction translate_gc_bif(void* gcf);
-static BeamInstr* handle_error(Process* c_p, BeamInstr* pc, Eterm* reg, BifFunction bf);
+/*
+ * process_main() is already huge, so we want to avoid inlining
+ * into it. Especially functions that are seldom used.
+ */
+#ifdef __GNUC__
+#  define NOINLINE __attribute__((__noinline__))
+#else
+#  define NOINLINE
+#endif
+
+/*
+ * The following functions are called directly by process_main().
+ * Don't inline them.
+ */
+static BifFunction translate_gc_bif(void* gcf) NOINLINE;
+static BeamInstr* handle_error(Process* c_p, BeamInstr* pc,
+			       Eterm* reg, BifFunction bf) NOINLINE;
+static BeamInstr* call_error_handler(Process* p, BeamInstr* ip,
+				     Eterm* reg, Eterm func) NOINLINE;
+static BeamInstr* fixed_apply(Process* p, Eterm* reg, Uint arity) NOINLINE;
+static BeamInstr* apply(Process* p, Eterm module, Eterm function,
+			Eterm args, Eterm* reg) NOINLINE;
+static int hibernate(Process* c_p, Eterm module, Eterm function,
+		     Eterm args, Eterm* reg) NOINLINE;
+static BeamInstr* call_fun(Process* p, int arity,
+			   Eterm* reg, Eterm args) NOINLINE;
+static BeamInstr* apply_fun(Process* p, Eterm fun,
+			    Eterm args, Eterm* reg) NOINLINE;
+static Eterm new_fun(Process* p, Eterm* reg,
+		     ErlFunEntry* fe, int num_free) NOINLINE;
+
+
+/*
+ * Functions not directly called by process_main(). OK to inline.
+ */
 static BeamInstr* next_catch(Process* c_p, Eterm *reg);
 static void terminate_proc(Process* c_p, Eterm Value);
 static Eterm add_stacktrace(Process* c_p, Eterm Value, Eterm exc);
@@ -993,16 +1043,6 @@ static void save_stacktrace(Process* c_p, BeamInstr* pc, Eterm* reg,
 			     BifFunction bf, Eterm args);
 static struct StackTrace * get_trace_from_exc(Eterm exc);
 static Eterm make_arglist(Process* c_p, Eterm* reg, int a);
-static Eterm call_error_handler(Process* p, BeamInstr* ip, Eterm* reg);
-static Eterm call_breakpoint_handler(Process* p, BeamInstr* fi, Eterm* reg);
-static BeamInstr* fixed_apply(Process* p, Eterm* reg, Uint arity);
-static BeamInstr* apply(Process* p, Eterm module, Eterm function,
-		     Eterm args, Eterm* reg);
-static int hibernate(Process* c_p, Eterm module, Eterm function,
-		     Eterm args, Eterm* reg);
-static BeamInstr* call_fun(Process* p, int arity, Eterm* reg, Eterm args);
-static BeamInstr* apply_fun(Process* p, Eterm fun, Eterm args, Eterm* reg);
-static Eterm new_fun(Process* p, Eterm* reg, ErlFunEntry* fe, int num_free);
 
 #if defined(VXWORKS)
 static int init_done;
@@ -1146,6 +1186,8 @@ void process_main(void)
 
     Uint temp_bits; /* Temporary used by BsSkipBits2 & BsGetInteger2 */
 
+    Eterm pt_arity;		/* Used by do_put_tuple */
+
     ERL_BITS_DECLARE_STATEP; /* Has to be last declaration */
 
 
@@ -1178,7 +1220,12 @@ void process_main(void)
  do_schedule1:
     PROCESS_MAIN_CHK_LOCKS(c_p);
     ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
+#if HALFWORD_HEAP
+    ASSERT(erts_get_scheduler_data()->num_tmp_heap_used == 0);
+#endif
+    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
     c_p = schedule(c_p, reds_used);
+    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 #ifdef DEBUG
     pid = c_p->id;
 #endif
@@ -1246,6 +1293,52 @@ void process_main(void)
 #define STORE_ARITH_RESULT(res) StoreBifResult(2, (res));
 #define ARITH_FUNC(name) erts_gc_##name
 
+	{
+	    Eterm increment_reg_val;
+	    Eterm increment_val;
+	    Uint live;
+	    Eterm result;
+
+	OpCase(i_increment_yIId):
+	    increment_reg_val = yb(Arg(0));
+	    goto do_increment;
+
+	OpCase(i_increment_xIId):
+	    increment_reg_val = xb(Arg(0));
+	    goto do_increment;
+
+	OpCase(i_increment_rIId):
+	    increment_reg_val = r(0);
+	    I--;
+
+	do_increment:
+	    increment_val = Arg(1);
+	    if (is_small(increment_reg_val)) {
+		Sint i = signed_val(increment_reg_val) + increment_val;
+		ASSERT(MY_IS_SSMALL(i) == IS_SSMALL(i));
+		if (MY_IS_SSMALL(i)) {
+		    result = make_small(i);
+		store_result:
+		    StoreBifResult(3, result);
+		}
+	    }
+
+	    live = Arg(2);
+	    SWAPOUT;
+	    reg[0] = r(0);
+	    reg[live] = increment_reg_val;
+	    reg[live+1] = make_small(increment_val);
+	    result = erts_gc_mixed_plus(c_p, reg, live);
+	    r(0) = reg[0];
+	    SWAPIN;
+	    ERTS_HOLE_CHECK(c_p);
+	    if (is_value(result)) {
+		goto store_result;
+	    }
+	    ASSERT(c_p->freason != BADMATCH || is_value(c_p->fvalue));
+	    goto find_func_info;
+	}
+	    
  OpCase(i_plus_jId):
  {
      Eterm result;
@@ -1309,6 +1402,52 @@ void process_main(void)
     }
     Next(1);
 
+    {
+	Eterm is_eq_exact_lit_val;
+
+    OpCase(i_is_eq_exact_literal_xfc):
+	is_eq_exact_lit_val = xb(Arg(0));
+	I++;
+	goto do_is_eq_exact_literal;
+
+    OpCase(i_is_eq_exact_literal_yfc):
+	is_eq_exact_lit_val = yb(Arg(0));
+	I++;
+	goto do_is_eq_exact_literal;
+
+    OpCase(i_is_eq_exact_literal_rfc):
+	is_eq_exact_lit_val = r(0);
+
+    do_is_eq_exact_literal:
+	if (!eq(Arg(1), is_eq_exact_lit_val)) {
+	    ClauseFail();
+	}
+	Next(2);
+    }
+
+    {
+	Eterm is_ne_exact_lit_val;
+
+    OpCase(i_is_ne_exact_literal_xfc):
+	is_ne_exact_lit_val = xb(Arg(0));
+	I++;
+	goto do_is_ne_exact_literal;
+
+    OpCase(i_is_ne_exact_literal_yfc):
+	is_ne_exact_lit_val = yb(Arg(0));
+	I++;
+	goto do_is_ne_exact_literal;
+
+    OpCase(i_is_ne_exact_literal_rfc):
+	is_ne_exact_lit_val = r(0);
+
+    do_is_ne_exact_literal:
+	if (eq(Arg(1), is_ne_exact_lit_val)) {
+	    ClauseFail();
+	}
+	Next(2);
+    }
+
  OpCase(i_move_call_only_fcr): {
      r(0) = Arg(1);
  }
@@ -1392,6 +1531,17 @@ void process_main(void)
      NextPF(1, next);
  }
 
+ OpCase(move_x1_c): {
+	x(1) = Arg(0);
+	Next(1);
+    }
+
+ OpCase(move_x2_c): {
+	x(2) = Arg(0);
+	Next(1);
+    }
+
+
  OpCase(return): {
     SET_I(c_p->cp);
     /*
@@ -1405,16 +1555,6 @@ void process_main(void)
     Goto(*I);
  }
 
- OpCase(test_heap_1_put_list_Iy): {
-     BeamInstr *next;
-
-     PreFetch(2, next);
-     TestHeap(Arg(0), 1);
-     PutList(yb(Arg(1)), r(0), r(0), StoreSimpleDest);
-     CHECK_TERM(r(0));
-     NextPF(2, next);
- }
-
     /*
      * Send is almost a standard call-BIF with two arguments, except for:
      *    1) It cannot be traced.
@@ -1447,24 +1587,36 @@ void process_main(void)
      goto find_func_info;
  }
 
- OpCase(i_element_jssd): {
-     Eterm index;
-     Eterm tuple;
-
-     /*
-      * Inlined version of element/2 for speed.
-      */
-     GetArg2(1, index, tuple);
-     if (is_small(index) && is_tuple(tuple)) {
-	 Eterm* tp = tuple_val(tuple);
-
-	 if ((signed_val(index) >= 1) &&
-	     (signed_val(index) <= arityval(*tp))) {
-	     Eterm result = tp[signed_val(index)];
-	     StoreBifResult(3, result);
-	 }
-     }
- }
+    {
+	Eterm element_index;
+	Eterm element_tuple;
+
+    OpCase(i_element_xjsd):
+	element_tuple = xb(Arg(0));
+	I++;
+	goto do_element;
+
+    OpCase(i_element_yjsd):
+	element_tuple = yb(Arg(0));
+	I++;
+	goto do_element;
+
+    OpCase(i_element_rjsd):
+	element_tuple = r(0);
+	/* Fall through */
+
+    do_element:
+	GetArg1(1, element_index);
+	if (is_small(element_index) && is_tuple(element_tuple)) {
+	    Eterm* tp = tuple_val(element_tuple);
+
+	    if ((signed_val(element_index) >= 1) &&
+		(signed_val(element_index) <= arityval(*tp))) {
+		Eterm result = tp[signed_val(element_index)];
+		StoreBifResult(2, result);
+	    }
+	}
+    }
  /* Fall through */
 
  OpCase(badarg_j):
@@ -1472,24 +1624,32 @@ void process_main(void)
     c_p->freason = BADARG;
     goto lb_Cl_error;
 
- OpCase(i_fast_element_jIsd): {
-     Eterm tuple;
-
-     /*
-      * Inlined version of element/2 for even more speed.
-      * The first argument is an untagged integer >= 1.
-      * The second argument is guaranteed to be a register operand.
-      */
-     GetArg1(2, tuple);
-     if (is_tuple(tuple)) {
-	 Eterm* tp = tuple_val(tuple);
-	 tmp_arg2 = Arg(1);
-	 if (tmp_arg2 <= arityval(*tp)) {
-	     Eterm result = tp[tmp_arg2];
-	     StoreBifResult(3, result);
-	 }
-     }
+    {
+	Eterm fast_element_tuple;
+
+    OpCase(i_fast_element_rjId):
+	fast_element_tuple = r(0);
+
+    do_fast_element:
+	if (is_tuple(fast_element_tuple)) {
+	    Eterm* tp = tuple_val(fast_element_tuple);
+	    Eterm pos = Arg(1);	/* Untagged integer >= 1 */
+	    if (pos <= arityval(*tp)) {
+		Eterm result = tp[pos];
+		StoreBifResult(2, result);
+	    }
+	}
      goto badarg;
+
+    OpCase(i_fast_element_xjId):
+     fast_element_tuple = xb(Arg(0));
+     I++;
+     goto do_fast_element;
+
+    OpCase(i_fast_element_yjId):
+     fast_element_tuple = yb(Arg(0));
+     I++;
+     goto do_fast_element;
  }
 
  OpCase(catch_yf):
@@ -1515,6 +1675,7 @@ void process_main(void)
 		 SWAPOUT;
 		 PROCESS_MAIN_CHK_LOCKS(c_p);
 		 FCALLS -= erts_garbage_collect(c_p, 3, reg+2, 1);
+		 ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 		 PROCESS_MAIN_CHK_LOCKS(c_p);
 		 SWAPIN;
 	     }
@@ -1633,6 +1794,7 @@ void process_main(void)
 				       PROCESS_MAIN_CHK_LOCKS(c_p);
 				   },
 				   {
+				       ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 				       PROCESS_MAIN_CHK_LOCKS(c_p);
 				       r(0) = reg[0];
 				       SWAPIN;
@@ -1691,6 +1853,7 @@ void process_main(void)
      CANCEL_TIMER(c_p);
      free_message(msgp);
 
+     ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
      PROCESS_MAIN_CHK_LOCKS(c_p);
 
      NextPF(0, next);
@@ -1842,8 +2005,87 @@ void process_main(void)
      NextPF(0, next);
  }
 
- OpCase(i_select_val_sfI):
-     GetArg1(0, tmp_arg1);
+
+ {
+     Eterm select_val2;
+
+ OpCase(i_select_tuple_arity2_yfAfAf):
+     select_val2 = yb(Arg(0));
+     goto do_select_tuple_arity2;
+
+ OpCase(i_select_tuple_arity2_xfAfAf):
+     select_val2 = xb(Arg(0));
+     goto do_select_tuple_arity2;
+
+ OpCase(i_select_tuple_arity2_rfAfAf):
+     select_val2 = r(0);
+     I--;
+
+ do_select_tuple_arity2:
+     if (is_not_tuple(select_val2)) {
+	 goto select_val2_fail;
+     }
+     select_val2 = *tuple_val(select_val2);
+     goto do_select_val2;
+
+ OpCase(i_select_val2_yfcfcf):
+     select_val2 = yb(Arg(0));
+     goto do_select_val2;
+
+ OpCase(i_select_val2_xfcfcf):
+     select_val2 = xb(Arg(0));
+     goto do_select_val2;
+
+ OpCase(i_select_val2_rfcfcf):
+     select_val2 = r(0);
+     I--;
+
+ do_select_val2:
+     if (select_val2 == Arg(2)) {
+	 I += 2;
+     } else if (select_val2 == Arg(4)) {
+	 I += 4;
+     }
+
+ select_val2_fail:
+     SET_I((BeamInstr *) Arg(1));
+     Goto(*I);
+ }
+
+ {
+     Eterm select_val;
+
+ OpCase(i_select_tuple_arity_xfI):
+     select_val = xb(Arg(0));
+     goto do_select_tuple_arity;
+
+ OpCase(i_select_tuple_arity_yfI):
+     select_val = yb(Arg(0));
+     goto do_select_tuple_arity;
+
+ OpCase(i_select_tuple_arity_rfI):
+     select_val = r(0);
+     I--;
+
+ do_select_tuple_arity:
+     if (is_tuple(select_val)) {
+	 select_val = *tuple_val(select_val);
+	 goto do_binary_search;
+     }
+     SET_I((BeamInstr *) Arg(1));
+     Goto(*I);
+
+ OpCase(i_select_val_xfI):
+     select_val = xb(Arg(0));
+     goto do_binary_search;
+
+ OpCase(i_select_val_yfI):
+     select_val = yb(Arg(0));
+     goto do_binary_search;
+     
+ OpCase(i_select_val_rfI):
+     select_val = r(0);
+     I--;
 
  do_binary_search:
  {
@@ -1880,9 +2122,9 @@ void process_main(void)
 	 unsigned int boffset = ((unsigned int)bdiff >> 1) & ~(sizeof(struct Pairs)-1);
 
 	 mid = (struct Pairs*)((char*)low + boffset);
-	 if (tmp_arg1 < mid->val) {
+	 if (select_val < mid->val) {
 	     high = mid;
-	 } else if (tmp_arg1 > mid->val) {
+	 } else if (select_val > mid->val) {
 	     low = mid + 1;
 	 } else {
 	     SET_I(mid->addr);
@@ -1892,16 +2134,28 @@ void process_main(void)
      SET_I((BeamInstr *) Arg(1));
      Goto(*I);
  }
+ }
 
- OpCase(i_jump_on_val_zero_sfI):
  {
-     Eterm index;
-
-     GetArg1(0, index);
-     if (is_small(index)) {
-	 index = signed_val(index);
-	 if (index < Arg(2)) {
-	     SET_I((BeamInstr *) (&Arg(3))[index]);
+     Eterm jump_on_val_zero_index;
+     
+ OpCase(i_jump_on_val_zero_yfI):
+     jump_on_val_zero_index = yb(Arg(0));
+     goto do_jump_on_val_zero_index;
+
+ OpCase(i_jump_on_val_zero_xfI):
+     jump_on_val_zero_index = xb(Arg(0));
+     goto do_jump_on_val_zero_index;
+
+ OpCase(i_jump_on_val_zero_rfI):
+     jump_on_val_zero_index = r(0);
+     I--;
+
+ do_jump_on_val_zero_index:
+     if (is_small(jump_on_val_zero_index)) {
+	 jump_on_val_zero_index = signed_val(jump_on_val_zero_index);
+	 if (jump_on_val_zero_index < Arg(2)) {
+	     SET_I((BeamInstr *) (&Arg(3))[jump_on_val_zero_index]);
 	     Goto(*I);
 	 }
      }
@@ -1909,15 +2163,27 @@ void process_main(void)
      Goto(*I);
  }
 
- OpCase(i_jump_on_val_sfII):
  {
-     Eterm index;
+     Eterm jump_on_val_index;
 
-     GetArg1(0, index);
-     if (is_small(index)) {
-	 index = (Uint) (signed_val(index) - Arg(3));
-	 if (index < Arg(2)) {
-	     SET_I((BeamInstr *) (&Arg(4))[index]);
+ 
+ OpCase(i_jump_on_val_yfII):
+     jump_on_val_index = yb(Arg(0));
+     goto do_jump_on_val_index;
+
+ OpCase(i_jump_on_val_xfII):
+     jump_on_val_index = xb(Arg(0));
+     goto do_jump_on_val_index;
+
+ OpCase(i_jump_on_val_rfII):
+     jump_on_val_index = r(0);
+     I--;
+
+ do_jump_on_val_index:
+     if (is_small(jump_on_val_index)) {
+	 jump_on_val_index = (Uint) (signed_val(jump_on_val_index) - Arg(3));
+	 if (jump_on_val_index < Arg(2)) {
+	     SET_I((BeamInstr *) (&Arg(4))[jump_on_val_index]);
 	     Goto(*I);
 	 }
      }
@@ -1925,6 +2191,32 @@ void process_main(void)
      Goto(*I);
  }
 
+ do_put_tuple: {
+     Eterm* hp = HTOP;
+
+     *hp++ = make_arityval(pt_arity);
+
+     do {
+	 Eterm term = *I++;
+	 switch (term & _TAG_IMMED1_MASK) {
+	 case (R_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:
+	     *hp++ = r(0);
+	     break;
+	 case (X_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:
+	     *hp++ = x(term >> _TAG_IMMED1_SIZE);
+	     break;
+	 case (Y_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:
+	     *hp++ = y(term >> _TAG_IMMED1_SIZE);
+	     break;
+	 default:
+	     *hp++ = term;
+	     break;
+	 }
+     } while (--pt_arity != 0);
+     HTOP = hp;
+     Goto(*I);
+ }
+
     /*
      * All guards with zero arguments have special instructions:
      * 	self/0
@@ -1952,6 +2244,7 @@ void process_main(void)
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p));
 	result = (*bf)(c_p, arg);
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(result));
+	ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	ERTS_HOLE_CHECK(c_p);
 	FCALLS = c_p->fcalls;
@@ -1980,6 +2273,7 @@ void process_main(void)
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p));
 	result = (*bf)(c_p, arg);
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(result));
+	ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	ERTS_HOLE_CHECK(c_p);
 	FCALLS = c_p->fcalls;
@@ -2009,6 +2303,7 @@ void process_main(void)
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
 	result = (*bf)(c_p, reg, live);
+	ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	SWAPIN;
@@ -2044,6 +2339,7 @@ void process_main(void)
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
 	result = (*bf)(c_p, reg, live);
+	ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	SWAPIN;
@@ -2082,6 +2378,7 @@ void process_main(void)
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
 	result = (*bf)(c_p, reg, live);
+	ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	SWAPIN;
@@ -2116,6 +2413,7 @@ void process_main(void)
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p));
 	result = (*bf)(c_p, tmp_arg1, tmp_arg2);
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(result));
+	ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	ERTS_HOLE_CHECK(c_p);
 	FCALLS = c_p->fcalls;
@@ -2139,6 +2437,7 @@ void process_main(void)
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p));
 	result = (*bf)(c_p, tmp_arg1, tmp_arg2);
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(result));
+	ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	ERTS_HOLE_CHECK(c_p);
 	if (is_value(result)) {
@@ -2562,23 +2861,25 @@ void process_main(void)
 
  OpCase(i_int_bnot_jsId):
  {
-     GetArg1(1, tmp_arg1);
-     if (is_small(tmp_arg1)) {
-	 tmp_arg1 = make_small(~signed_val(tmp_arg1));
+     Eterm bnot_val;
+
+     GetArg1(1, bnot_val);
+     if (is_small(bnot_val)) {
+	 bnot_val = make_small(~signed_val(bnot_val));
      } else {
 	 Uint live = Arg(2);
 	 SWAPOUT;
 	 reg[0] = r(0);
-	 reg[live] = tmp_arg1;
-	 tmp_arg1 = erts_gc_bnot(c_p, reg, live);
+	 reg[live] = bnot_val;
+	 bnot_val = erts_gc_bnot(c_p, reg, live);
 	 r(0) = reg[0];
 	 SWAPIN;
 	 ERTS_HOLE_CHECK(c_p);
-	 if (is_nil(tmp_arg1)) {
+	 if (is_nil(bnot_val)) {
 	     goto lb_Cl_error;
 	 }
      }
-     StoreBifResult(3, tmp_arg1);
+     StoreBifResult(3, bnot_val);
  }
 
  badarith:
@@ -2833,121 +3134,6 @@ void process_main(void)
      goto do_schedule1;
  }
 
- OpCase(i_select_tuple_arity_sfI):
- {
-     GetArg1(0, tmp_arg1);
-
-     if (is_tuple(tmp_arg1)) {
-	 tmp_arg1 = *tuple_val(tmp_arg1);
-	 goto do_binary_search;
-     }
-     SET_I((BeamInstr *) Arg(1));
-     Goto(*I);
- }     
-
- OpCase(i_select_big_sf):
-    {
-	Eterm* bigp;
-	Uint arity;
-	Eterm* given;
-	Uint given_arity;
-	Uint given_size;
-
-	GetArg1(0, tmp_arg1);
-	if (is_big(tmp_arg1)) {
-
-	    /*
-	     * The loader has sorted the bignumbers in descending order
-	     * on the arity word.  Therefore, we know that the search
-	     * has failed as soon as we encounter an arity word less than
-	     * the arity word of the given number.  There is a zero word
-	     * (less than any valid arity word) stored after the last bignumber.
-	     */
-
- 	    given = big_val(tmp_arg1);
-	    given_arity = given[0];
-	    given_size = thing_arityval(given_arity);
-	    bigp = (Eterm *) &Arg(2);
-	    while ((arity = bigp[0]) > given_arity) {
-		bigp += (TermWords(thing_arityval(arity) + 1) + 1) * (sizeof(BeamInstr)/sizeof(Eterm));
-	    }
-	    while (bigp[0] == given_arity) {
-		if (memcmp(bigp+1, given+1, sizeof(Eterm)*given_size) == 0) {
-		    BeamInstr *tmp =
-			((BeamInstr *) (UWord) bigp) + TermWords(given_size + 1);
-		    SET_I((BeamInstr *) *tmp);
-		    Goto(*I);
-		}
-		bigp += (TermWords(thing_arityval(arity) + 1) + 1) * (sizeof(BeamInstr)/sizeof(Eterm));
-	    }
-	}
-
-	/*
-	 * Failed.
-	 */
-
-	SET_I((BeamInstr *) Arg(1));
-	Goto(*I);
-    }
-
-#if defined(ARCH_64) && !HALFWORD_HEAP
- OpCase(i_select_float_sfI):
- {
-     Uint f;
-     int n;
-     struct ValLabel {
-	 Uint f;
-	 BeamInstr* addr;
-     };
-     struct ValLabel* ptr;
-
-     GetArg1(0, tmp_arg1);
-     ASSERT(is_float(tmp_arg1));
-     f = float_val(tmp_arg1)[1];
-     n = Arg(2);
-     ptr = (struct ValLabel *) &Arg(3);
-     while (n-- > 0) {
-	 if (ptr->f == f) {
-	     SET_I(ptr->addr);
-	     Goto(*I);
-	 }
-	 ptr++;
-     }
-     SET_I((Eterm *) Arg(1));
-     Goto(*I);
- }
-#else
- OpCase(i_select_float_sfI):
- {
-     Uint fpart1;
-     Uint fpart2;
-     int n;
-     struct ValLabel {
-	 Uint fpart1;
-	 Uint fpart2;
-	 BeamInstr* addr;
-     };
-     struct ValLabel* ptr;
-
-     GetArg1(0, tmp_arg1);
-     ASSERT(is_float(tmp_arg1));
-     fpart1 = float_val(tmp_arg1)[1];
-     fpart2 = float_val(tmp_arg1)[2];
-
-     n = Arg(2);
-     ptr = (struct ValLabel *) &Arg(3);
-     while (n-- > 0) {
-	 if (ptr->fpart1 == fpart1 && ptr->fpart2 == fpart2) {
-	     SET_I(ptr->addr);
-	     Goto(*I);
-	 }
-	 ptr++;
-     }
-     SET_I((BeamInstr *) Arg(1));
-     Goto(*I);
- }
-#endif
-
  OpCase(set_tuple_element_sdP): {
      Eterm element;
      Eterm tuple;
@@ -2993,15 +3179,17 @@ void process_main(void)
 	the first argument. We also handle atom tags in the first
 	argument for backwards compatibility.
      */
-     GetArg2(0, tmp_arg1, tmp_arg2);
-     c_p->fvalue = tmp_arg2;
+     Eterm raise_val1;
+     Eterm raise_val2;
+     GetArg2(0, raise_val1, raise_val2);
+     c_p->fvalue = raise_val2;
      if (c_p->freason == EXC_NULL) {
        /* a safety check for the R10-0 case; should not happen */
        c_p->ftrace = NIL;
        c_p->freason = EXC_ERROR;
      }
      /* for R10-0 code, keep existing c_p->ftrace and hope it's correct */
-     switch (tmp_arg1) {
+     switch (raise_val1) {
      case am_throw:
        c_p->freason = EXC_THROWN & ~EXF_SAVETRACE;
        break;
@@ -3017,8 +3205,8 @@ void process_main(void)
 	   passed from a user! Currently only expecting generated calls.
 	*/
 	 struct StackTrace *s;
-	 c_p->ftrace = tmp_arg1;
-	 s = get_trace_from_exc(tmp_arg1);
+	 c_p->ftrace = raise_val1;
+	 s = get_trace_from_exc(raise_val1);
 	 if (s == NULL) {
 	   c_p->freason = EXC_ERROR;
 	 } else {
@@ -3029,11 +3217,24 @@ void process_main(void)
      goto find_func_info;
  }
 
- OpCase(badmatch_s): {
-     GetArg1(0, tmp_arg1);
-     c_p->fvalue = tmp_arg1;
-     c_p->freason = BADMATCH;
- }
+    {
+	Eterm badmatch_val;
+
+    OpCase(badmatch_y):
+	badmatch_val = yb(Arg(0));
+	goto do_badmatch;
+
+    OpCase(badmatch_x):
+	badmatch_val = xb(Arg(0));
+	goto do_badmatch;
+
+    OpCase(badmatch_r):
+	badmatch_val = r(0);
+
+    do_badmatch:
+	c_p->fvalue = badmatch_val;
+	c_p->freason = BADMATCH;
+    }
  /* Fall through here */
 
  find_func_info: {
@@ -3056,12 +3257,11 @@ void process_main(void)
      */
     SWAPOUT;
     reg[0] = r(0);
-    tmp_arg1 = call_error_handler(c_p, I-3, reg);
+    I = call_error_handler(c_p, I-3, reg, am_undefined_function);
     r(0) = reg[0];
     SWAPIN;
-    if (tmp_arg1) {
-	SET_I(c_p->i);
-	Dispatch();
+    if (I) {
+	Goto(*I);
     }
 
  /* Fall through */
@@ -3084,128 +3284,149 @@ void process_main(void)
      }
  }
 
- OpCase(call_nif):
-     {
-          /*
-	   * call_nif is always first instruction in function:
-	   *
-	   * I[-3]: Module
-	   * I[-2]: Function
-	   * I[-1]: Arity
-	   * I[0]: &&call_nif
-	   * I[1]: Function pointer to NIF function
-	   * I[2]: Pointer to erl_module_nif
-	   */
-     	 BifFunction vbf;
-
-	 c_p->current = I-3; /* current and vbf set to please handle_error */ 
-	 SWAPOUT;
-	 c_p->fcalls = FCALLS - 1;
-	 PROCESS_MAIN_CHK_LOCKS(c_p);
-	 tmp_arg2 = I[-1];
-	 ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
+    {
+	Eterm nif_bif_result;
+	Eterm bif_nif_arity;
 
-	 ASSERT(!ERTS_PROC_IS_EXITING(c_p));
-	 {
-	     typedef Eterm NifF(struct enif_environment_t*, int argc, Eterm argv[]);
-	     NifF* fp = vbf = (NifF*) I[1];
-	     struct enif_environment_t env;
-	     erts_pre_nif(&env, c_p, (struct erl_module_nif*)I[2]);
-	     reg[0] = r(0);
-	     tmp_arg1 = (*fp)(&env, tmp_arg2, reg);
-	     erts_post_nif(&env);
-	 }
-	 ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(tmp_arg1));
-	 PROCESS_MAIN_CHK_LOCKS(c_p);
-	 goto apply_bif_or_nif_epilogue;
-	 
- OpCase(apply_bif):
-	/*
-	 * At this point, I points to the code[3] in the export entry for
-	 * the BIF:
-	 *
-	 * code[0]: Module
-	 * code[1]: Function
-	 * code[2]: Arity
-	 * code[3]: &&apply_bif
-	 * code[4]: Function pointer to BIF function
-	 */
+    OpCase(call_nif):
+	{
+	    /*
+	     * call_nif is always first instruction in function:
+	     *
+	     * I[-3]: Module
+	     * I[-2]: Function
+	     * I[-1]: Arity
+	     * I[0]: &&call_nif
+	     * I[1]: Function pointer to NIF function
+	     * I[2]: Pointer to erl_module_nif
+	     */
+	    BifFunction vbf;
 
-	c_p->current = I-3;	/* In case we apply process_info/1,2 or load_nif/1 */
-	c_p->i = I;		/* In case we apply check_process_code/2. */
-	c_p->arity = 0;		/* To allow garbage collection on ourselves
-				 * (check_process_code/2).
-				 */
-	SWAPOUT;
-	c_p->fcalls = FCALLS - 1;
-	vbf = (BifFunction) Arg(0);
-	PROCESS_MAIN_CHK_LOCKS(c_p);
-	tmp_arg2 = I[-1];
-	ASSERT(tmp_arg2 <= 3);
-	ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
-	switch (tmp_arg2) {
-	case 3:
+	    c_p->current = I-3; /* current and vbf set to please handle_error */ 
+	    SWAPOUT;
+	    c_p->fcalls = FCALLS - 1;
+	    PROCESS_MAIN_CHK_LOCKS(c_p);
+	    bif_nif_arity = I[-1];
+	    ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
+	    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
+
+	    ASSERT(!ERTS_PROC_IS_EXITING(c_p));
 	    {
-		Eterm (*bf)(Process*, Eterm, Eterm, Eterm, BeamInstr*) = vbf;
-		ASSERT(!ERTS_PROC_IS_EXITING(c_p));
-		tmp_arg1 = (*bf)(c_p, r(0), x(1), x(2), I);
-		ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(tmp_arg1));
-		PROCESS_MAIN_CHK_LOCKS(c_p);
+		typedef Eterm NifF(struct enif_environment_t*, int argc, Eterm argv[]);
+		NifF* fp = vbf = (NifF*) I[1];
+		struct enif_environment_t env;
+		erts_pre_nif(&env, c_p, (struct erl_module_nif*)I[2]);
+		reg[0] = r(0);
+		nif_bif_result = (*fp)(&env, bif_nif_arity, reg);
+		erts_post_nif(&env);
 	    }
-	    break;
-	case 2:
-	    {
-		Eterm (*bf)(Process*, Eterm, Eterm, BeamInstr*) = vbf;
-		ASSERT(!ERTS_PROC_IS_EXITING(c_p));
-		tmp_arg1 = (*bf)(c_p, r(0), x(1), I);
-		ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(tmp_arg1));
-		PROCESS_MAIN_CHK_LOCKS(c_p);
+	    ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(nif_bif_result));
+	    PROCESS_MAIN_CHK_LOCKS(c_p);
+	    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
+	    goto apply_bif_or_nif_epilogue;
+	 
+	OpCase(apply_bif):
+	    /*
+	     * At this point, I points to the code[3] in the export entry for
+	     * the BIF:
+	     *
+	     * code[0]: Module
+	     * code[1]: Function
+	     * code[2]: Arity
+	     * code[3]: &&apply_bif
+	     * code[4]: Function pointer to BIF function
+	     */
+
+	    c_p->current = I-3;	/* In case we apply process_info/1,2 or load_nif/1 */
+	    c_p->i = I;		/* In case we apply check_process_code/2. */
+	    c_p->arity = 0;		/* To allow garbage collection on ourselves
+					 * (check_process_code/2).
+					 */
+	    SWAPOUT;
+	    c_p->fcalls = FCALLS - 1;
+	    vbf = (BifFunction) Arg(0);
+	    PROCESS_MAIN_CHK_LOCKS(c_p);
+	    bif_nif_arity = I[-1];
+	    ASSERT(bif_nif_arity <= 3);
+	    ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
+	    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
+	    switch (bif_nif_arity) {
+	    case 3:
+		{
+		    Eterm (*bf)(Process*, Eterm, Eterm, Eterm, BeamInstr*) = vbf;
+		    ASSERT(!ERTS_PROC_IS_EXITING(c_p));
+		    nif_bif_result = (*bf)(c_p, r(0), x(1), x(2), I);
+		    ASSERT(!ERTS_PROC_IS_EXITING(c_p) ||
+			   is_non_value(nif_bif_result));
+		    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
+		    PROCESS_MAIN_CHK_LOCKS(c_p);
+		}
+		break;
+	    case 2:
+		{
+		    Eterm (*bf)(Process*, Eterm, Eterm, BeamInstr*) = vbf;
+		    ASSERT(!ERTS_PROC_IS_EXITING(c_p));
+		    nif_bif_result = (*bf)(c_p, r(0), x(1), I);
+		    ASSERT(!ERTS_PROC_IS_EXITING(c_p) ||
+			   is_non_value(nif_bif_result));
+		    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
+		    PROCESS_MAIN_CHK_LOCKS(c_p);
+		}
+		break;
+	    case 1:
+		{
+		    Eterm (*bf)(Process*, Eterm, BeamInstr*) = vbf;
+		    ASSERT(!ERTS_PROC_IS_EXITING(c_p));
+		    nif_bif_result = (*bf)(c_p, r(0), I);
+		    ASSERT(!ERTS_PROC_IS_EXITING(c_p) ||
+			   is_non_value(nif_bif_result));
+		    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
+		    PROCESS_MAIN_CHK_LOCKS(c_p);
+		}
+		break;
+	    case 0:
+		{
+		    Eterm (*bf)(Process*, BeamInstr*) = vbf;
+		    ASSERT(!ERTS_PROC_IS_EXITING(c_p));
+		    nif_bif_result = (*bf)(c_p, I);
+		    ASSERT(!ERTS_PROC_IS_EXITING(c_p) ||
+			   is_non_value(nif_bif_result));
+		    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
+		    PROCESS_MAIN_CHK_LOCKS(c_p);
+		    break;
+		}
+	    default:
+		erl_exit(1, "apply_bif: invalid arity: %u\n",
+			 bif_nif_arity);
 	    }
-	    break;
-	case 1:
-	    {
-		Eterm (*bf)(Process*, Eterm, BeamInstr*) = vbf;
-		ASSERT(!ERTS_PROC_IS_EXITING(c_p));
-		tmp_arg1 = (*bf)(c_p, r(0), I);
-		ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(tmp_arg1));
-		PROCESS_MAIN_CHK_LOCKS(c_p);
+
+	apply_bif_or_nif_epilogue:
+	    ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
+	    ERTS_HOLE_CHECK(c_p);
+	    if (c_p->mbuf) {
+		reg[0] = r(0);
+		nif_bif_result = erts_gc_after_bif_call(c_p, nif_bif_result,
+						  reg, bif_nif_arity);
+		r(0) = reg[0];
 	    }
-	    break;
-	case 0:
-	    {
-		Eterm (*bf)(Process*, BeamInstr*) = vbf;
-		ASSERT(!ERTS_PROC_IS_EXITING(c_p));
-		tmp_arg1 = (*bf)(c_p, I);
-		ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(tmp_arg1));
-		PROCESS_MAIN_CHK_LOCKS(c_p);
-		break;
+	    SWAPIN;  /* There might have been a garbage collection. */
+	    FCALLS = c_p->fcalls;
+	    if (is_value(nif_bif_result)) {
+		r(0) = nif_bif_result;
+		CHECK_TERM(r(0));
+		SET_I(c_p->cp);
+		Goto(*I);
+	    } else if (c_p->freason == TRAP) {
+		SET_I(*((BeamInstr **) (UWord) ((c_p)->def_arg_reg + 3)));
+		r(0) = c_p->def_arg_reg[0];
+		x(1) = c_p->def_arg_reg[1];
+		x(2) = c_p->def_arg_reg[2];
+		Dispatch();
 	    }
-	}
-apply_bif_or_nif_epilogue:
-	ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
-	ERTS_HOLE_CHECK(c_p);
-	if (c_p->mbuf) {
 	    reg[0] = r(0);
-	    tmp_arg1 = erts_gc_after_bif_call(c_p, tmp_arg1, reg, tmp_arg2);
-	    r(0) = reg[0];
+	    I = handle_error(c_p, c_p->cp, reg, vbf);
+	    goto post_error_handling;
 	}
-	SWAPIN;			/* There might have been a garbage collection. */
-	FCALLS = c_p->fcalls;
-	if (is_value(tmp_arg1)) {
-	    r(0) = tmp_arg1;
-	    CHECK_TERM(r(0));
-	    SET_I(c_p->cp);
-	    Goto(*I);
-	} else if (c_p->freason == TRAP) {
-	    SET_I(*((BeamInstr **) (UWord) ((c_p)->def_arg_reg + 3)));
-	    r(0) = c_p->def_arg_reg[0];
-	    x(1) = c_p->def_arg_reg[1];
-	    x(2) = c_p->def_arg_reg[2];
-	    Dispatch();
-	}
-	reg[0] = r(0);
-	I = handle_error(c_p, c_p->cp, reg, vbf);
-	goto post_error_handling;
     }
 
  OpCase(i_get_sd):
@@ -3218,11 +3439,25 @@ apply_bif_or_nif_epilogue:
 	StoreBifResult(1, result);
     }
 
- OpCase(case_end_s):
-    GetArg1(0, tmp_arg1);
-    c_p->fvalue = tmp_arg1;
-    c_p->freason = EXC_CASE_CLAUSE;
-    goto find_func_info;
+    {
+	Eterm case_end_val;
+
+    OpCase(case_end_x):
+	case_end_val = xb(Arg(0));
+	goto do_case_end;
+
+    OpCase(case_end_y):
+	case_end_val = yb(Arg(0));
+	goto do_case_end;
+
+    OpCase(case_end_r):
+	case_end_val = r(0);
+
+    do_case_end:
+	c_p->fvalue = case_end_val;
+	c_p->freason = EXC_CASE_CLAUSE;
+	goto find_func_info;
+    }
 
  OpCase(if_end):
     c_p->freason = EXC_IF_CLAUSE;
@@ -3235,10 +3470,13 @@ apply_bif_or_nif_epilogue:
  }
 
  OpCase(try_case_end_s):
-    GetArg1(0, tmp_arg1);
-    c_p->fvalue = tmp_arg1;
-    c_p->freason = EXC_TRY_CLAUSE;
-    goto find_func_info;
+    {
+	Eterm try_case_end_val;
+	GetArg1(0, try_case_end_val);
+	c_p->fvalue = try_case_end_val;
+	c_p->freason = EXC_TRY_CLAUSE;
+	goto find_func_info;
+    }
 
  /*
   * Construction of binaries using new instructions.
@@ -3385,12 +3623,12 @@ apply_bif_or_nif_epilogue:
 	 HTOP += PROC_BIN_SIZE;
 	 pb->thing_word = HEADER_PROC_BIN;
 	 pb->size = num_bytes;
-	 pb->next = MSO(c_p).mso;
-	 MSO(c_p).mso = pb;
+	 pb->next = MSO(c_p).first;
+	 MSO(c_p).first = (struct erl_off_heap_header*) pb;
 	 pb->val = bptr;
 	 pb->bytes = (byte*) bptr->orig_bytes;
 	 pb->flags = 0;
-	 MSO(c_p).overhead += pb->size / sizeof(Eterm);
+	 OH_OVERHEAD(&(MSO(c_p)), pb->size / sizeof(Eterm));
 	 new_binary = make_binary(pb);
 	 goto do_bits_sub_bin;
      }
@@ -3486,13 +3724,13 @@ apply_bif_or_nif_epilogue:
 	 HTOP += PROC_BIN_SIZE;
 	 pb->thing_word = HEADER_PROC_BIN;
 	 pb->size = tmp_arg1;
-	 pb->next = MSO(c_p).mso;
-	 MSO(c_p).mso = pb;
+	 pb->next = MSO(c_p).first;
+	 MSO(c_p).first = (struct erl_off_heap_header*) pb;
 	 pb->val = bptr;
 	 pb->bytes = (byte*) bptr->orig_bytes;
 	 pb->flags = 0;
 	 
-	 MSO(c_p).overhead += tmp_arg1 / sizeof(Eterm);
+	 OH_OVERHEAD(&(MSO(c_p)), tmp_arg1 / sizeof(Eterm));
 
 	 StoreBifResult(2, make_binary(pb));
      }
@@ -3786,19 +4024,20 @@ apply_bif_or_nif_epilogue:
      Eterm header;
      BeamInstr *next;
      Uint slots;
+     Eterm context;
 
      OpCase(i_bs_start_match2_rfIId): {
-	 tmp_arg1 = r(0);
+	 context = r(0);
 
      do_start_match:
 	 slots = Arg(2);
-	 if (!is_boxed(tmp_arg1)) {
+	 if (!is_boxed(context)) {
 	     ClauseFail();
 	 }
 	 PreFetch(4, next);
-	 header = *boxed_val(tmp_arg1);
+	 header = *boxed_val(context);
 	 if (header_is_bin_matchstate(header)) {
-	     ErlBinMatchState* ms = (ErlBinMatchState *) boxed_val(tmp_arg1);
+	     ErlBinMatchState* ms = (ErlBinMatchState *) boxed_val(context);
 	     Uint actual_slots = HEADER_NUM_SLOTS(header);
 	     ms->save_offset[0] = ms->mb.offset;
 	     if (actual_slots < slots) {
@@ -3806,8 +4045,8 @@ apply_bif_or_nif_epilogue:
 		 Uint live = Arg(1);
 		 Uint wordsneeded = ERL_BIN_MATCHSTATE_SIZE(slots);
 
-		 TestHeapPreserve(wordsneeded, live, tmp_arg1);
-		 ms = (ErlBinMatchState *) boxed_val(tmp_arg1);
+		 TestHeapPreserve(wordsneeded, live, context);
+		 ms = (ErlBinMatchState *) boxed_val(context);
 		 dst = (ErlBinMatchState *) HTOP;
 		 *dst = *ms;
 		 *HTOP = HEADER_BIN_MATCHSTATE(slots);
@@ -3819,12 +4058,12 @@ apply_bif_or_nif_epilogue:
 	     Eterm result;
 	     Uint live = Arg(1);
 	     Uint wordsneeded = ERL_BIN_MATCHSTATE_SIZE(slots);
-	     TestHeapPreserve(wordsneeded, live, tmp_arg1);
+	     TestHeapPreserve(wordsneeded, live, context);
 	     HEAP_TOP(c_p) = HTOP;
 #ifdef DEBUG
 	     c_p->stop = E;	/* Needed for checking in HeapOnlyAlloc(). */
 #endif
-	     result = erts_bs_start_match_2(c_p, tmp_arg1, slots);
+	     result = erts_bs_start_match_2(c_p, context, slots);
 	     HTOP = HEAP_TOP(c_p);
 	     HEAP_SPACE_VERIFIED(0);
 	     if (is_non_value(result)) {
@@ -3838,12 +4077,12 @@ apply_bif_or_nif_epilogue:
 	 NextPF(4, next);
      }
      OpCase(i_bs_start_match2_xfIId): {
-	 tmp_arg1 = xb(Arg(0));
+	 context = xb(Arg(0));
 	 I++;
 	 goto do_start_match;
      }
      OpCase(i_bs_start_match2_yfIId): {
-	 tmp_arg1 = yb(Arg(0));
+	 context = yb(Arg(0));
 	 I++;
 	 goto do_start_match;
      }
@@ -3936,93 +4175,105 @@ apply_bif_or_nif_epilogue:
      NextPF(2, next);
  }
 
+ {
+     Eterm bs_get_integer8_context;
+
  OpCase(i_bs_get_integer_8_rfd): {
-     tmp_arg1 = r(0);
-     goto do_bs_get_integer_8;
- }
+	 bs_get_integer8_context = r(0);
+	 goto do_bs_get_integer_8;
+     }
 
  OpCase(i_bs_get_integer_8_xfd): {
-     tmp_arg1 = xb(Arg(0));
-     I++;
- }
+	 bs_get_integer8_context = xb(Arg(0));
+	 I++;
+     }
 
  do_bs_get_integer_8: {
-     ErlBinMatchBuffer *_mb;
-     Eterm _result;
-     _mb = ms_matchbuffer(tmp_arg1);
-     if (_mb->size - _mb->offset < 8) {
-	 ClauseFail();
-     }
-     if (BIT_OFFSET(_mb->offset) != 0) {
-	 _result = erts_bs_get_integer_2(c_p, 8, 0, _mb);
-     } else {
-	 _result = make_small(_mb->base[BYTE_OFFSET(_mb->offset)]);
-	 _mb->offset += 8;
+	 ErlBinMatchBuffer *_mb;
+	 Eterm _result;
+	 _mb = ms_matchbuffer(bs_get_integer8_context);
+	 if (_mb->size - _mb->offset < 8) {
+	     ClauseFail();
+	 }
+	 if (BIT_OFFSET(_mb->offset) != 0) {
+	     _result = erts_bs_get_integer_2(c_p, 8, 0, _mb);
+	 } else {
+	     _result = make_small(_mb->base[BYTE_OFFSET(_mb->offset)]);
+	     _mb->offset += 8;
+	 }
+	 StoreBifResult(1, _result);
      }
-     StoreBifResult(1, _result);
  }
 
- OpCase(i_bs_get_integer_16_rfd): {
-     tmp_arg1 = r(0);
+ {
+     Eterm bs_get_integer_16_context;
+
+ OpCase(i_bs_get_integer_16_rfd):
+     bs_get_integer_16_context = r(0);
      goto do_bs_get_integer_16;
- }
 
- OpCase(i_bs_get_integer_16_xfd): {
-     tmp_arg1 = xb(Arg(0));
+ OpCase(i_bs_get_integer_16_xfd):
+     bs_get_integer_16_context = xb(Arg(0));
      I++;
- }
 
- do_bs_get_integer_16: {
-     ErlBinMatchBuffer *_mb;
-     Eterm _result;
-     _mb = ms_matchbuffer(tmp_arg1);
-     if (_mb->size - _mb->offset < 16) {
-	 ClauseFail();
-     }
-     if (BIT_OFFSET(_mb->offset) != 0) {
-	 _result = erts_bs_get_integer_2(c_p, 16, 0, _mb);
-     } else {
-	 _result = make_small(get_int16(_mb->base+BYTE_OFFSET(_mb->offset)));
-	 _mb->offset += 16;
+ do_bs_get_integer_16:
+     {
+	 ErlBinMatchBuffer *_mb;
+	 Eterm _result;
+	 _mb = ms_matchbuffer(bs_get_integer_16_context);
+	 if (_mb->size - _mb->offset < 16) {
+	     ClauseFail(); 
+	 }
+	 if (BIT_OFFSET(_mb->offset) != 0) {
+	     _result = erts_bs_get_integer_2(c_p, 16, 0, _mb);
+	 } else {
+	     _result = make_small(get_int16(_mb->base+BYTE_OFFSET(_mb->offset)));
+	     _mb->offset += 16;
+	 }
+	 StoreBifResult(1, _result);
      }
-     StoreBifResult(1, _result);
  }
 
- OpCase(i_bs_get_integer_32_rfId): {
-     tmp_arg1 = r(0);
+ {
+     Eterm bs_get_integer_32_context;
+
+ OpCase(i_bs_get_integer_32_rfId):
+     bs_get_integer_32_context = r(0);
      goto do_bs_get_integer_32;
- }
+
      
- OpCase(i_bs_get_integer_32_xfId): {
-     tmp_arg1 = xb(Arg(0));
+ OpCase(i_bs_get_integer_32_xfId):
+     bs_get_integer_32_context = xb(Arg(0));
      I++;
- }
 
- do_bs_get_integer_32: {
-     ErlBinMatchBuffer *_mb;
-     Uint32 _integer;
-     Eterm _result;
-     _mb = ms_matchbuffer(tmp_arg1);
-     if (_mb->size - _mb->offset < 32) { ClauseFail(); }
-     if (BIT_OFFSET(_mb->offset) != 0) {
-	 _integer = erts_bs_get_unaligned_uint32(_mb);
-     } else {
-	 _integer = get_int32(_mb->base + _mb->offset/8);
-     }
-     _mb->offset += 32;
+
+ do_bs_get_integer_32:
+     {
+	 ErlBinMatchBuffer *_mb;
+	 Uint32 _integer;
+	 Eterm _result;
+	 _mb = ms_matchbuffer(bs_get_integer_32_context);
+	 if (_mb->size - _mb->offset < 32) { ClauseFail(); }
+	 if (BIT_OFFSET(_mb->offset) != 0) {
+	     _integer = erts_bs_get_unaligned_uint32(_mb);
+	 } else {
+	     _integer = get_int32(_mb->base + _mb->offset/8);
+	 }
+	 _mb->offset += 32;
 #if !defined(ARCH_64) || HALFWORD_HEAP
-     if (IS_USMALL(0, _integer)) {
+	 if (IS_USMALL(0, _integer)) {
 #endif
-	 _result = make_small(_integer);
+	     _result = make_small(_integer);
 #if !defined(ARCH_64) || HALFWORD_HEAP
-     } else {
-	 TestHeap(BIG_UINT_HEAP_SIZE, Arg(1));
-	 _result = uint_to_big((Uint) _integer, HTOP);
-	 HTOP += BIG_UINT_HEAP_SIZE;
-	 HEAP_SPACE_VERIFIED(0);
-     }
+	 } else {
+	     TestHeap(BIG_UINT_HEAP_SIZE, Arg(1));
+	     _result = uint_to_big((Uint) _integer, HTOP);
+	     HTOP += BIG_UINT_HEAP_SIZE;
+	     HEAP_SPACE_VERIFIED(0);
+	 }
 #endif
-     StoreBifResult(2, _result);
+	 StoreBifResult(2, _result);
+     }
  }
 
  /* Operands: Size Live Fail Flags Dst */
@@ -4120,54 +4371,64 @@ apply_bif_or_nif_epilogue:
      StoreBifResult(3, result);
  }
 
- /* Operands: MatchContext Fail Dst */
+ {
+     Eterm get_utf8_context;
+
+     /* Operands: MatchContext Fail Dst */
  OpCase(i_bs_get_utf8_rfd): {
-     tmp_arg1 = r(0);
-     goto do_bs_get_utf8;
- }
+	 get_utf8_context = r(0);
+	 goto do_bs_get_utf8;
+     }
 
  OpCase(i_bs_get_utf8_xfd): {
-     tmp_arg1 = xb(Arg(0));
-     I++;
- }
+	 get_utf8_context = xb(Arg(0));
+	 I++;
+     }
 
- /*
-  * tmp_arg1 = match_context
-  * Operands: Fail Dst
-  */
+     /*
+      * get_utf8_context = match_context
+      * Operands: Fail Dst
+      */
 
-    do_bs_get_utf8: {
-     Eterm result = erts_bs_get_utf8(ms_matchbuffer(tmp_arg1));
-     if (is_non_value(result)) {
-	 ClauseFail();
+ do_bs_get_utf8: {
+	 Eterm result = erts_bs_get_utf8(ms_matchbuffer(get_utf8_context));
+	 if (is_non_value(result)) {
+	     ClauseFail();
+	 }
+	 StoreBifResult(1, result);
      }
-     StoreBifResult(1, result);
  }
 
- /* Operands: MatchContext Fail Flags Dst */
+ {
+     Eterm get_utf16_context;
+
+     /* Operands: MatchContext Fail Flags Dst */
  OpCase(i_bs_get_utf16_rfId): {
-     tmp_arg1 = r(0);
-     goto do_bs_get_utf16;
- }
+	 get_utf16_context = r(0);
+	 goto do_bs_get_utf16;
+     }
 
  OpCase(i_bs_get_utf16_xfId): {
-     tmp_arg1 = xb(Arg(0));
-     I++;
- }
+	 get_utf16_context = xb(Arg(0));
+	 I++;
+     }
 
- /*
-  * tmp_arg1 = match_context
-  * Operands: Fail Flags Dst
-  */
-    do_bs_get_utf16: {
-     Eterm result = erts_bs_get_utf16(ms_matchbuffer(tmp_arg1), Arg(1));
-     if (is_non_value(result)) {
-	 ClauseFail();
+     /*
+      * get_utf16_context = match_context
+      * Operands: Fail Flags Dst
+      */
+ do_bs_get_utf16: {
+	 Eterm result = erts_bs_get_utf16(ms_matchbuffer(get_utf16_context),
+					  Arg(1));
+	 if (is_non_value(result)) {
+	     ClauseFail();
+	 }
+	 StoreBifResult(2, result);
      }
-     StoreBifResult(2, result);
  }
 
  {
+     Eterm context_to_binary_context;
      ErlBinMatchBuffer* mb;
      ErlSubBin* sb;
      Uint size;
@@ -4176,27 +4437,29 @@ apply_bif_or_nif_epilogue:
      Uint hole_size;
 
      OpCase(bs_context_to_binary_r): {
-	 tmp_arg1 = x0;
+	 context_to_binary_context = x0;
 	 I -= 2;
 	 goto do_context_to_binary;
      }
 
      /* Unfortunately, inlining can generate this instruction. */
      OpCase(bs_context_to_binary_y): {
-	 tmp_arg1 = yb(Arg(0));
+	 context_to_binary_context = yb(Arg(0));
 	 goto do_context_to_binary0;
      }
 
      OpCase(bs_context_to_binary_x): {
-	 tmp_arg1 = xb(Arg(0));
+	 context_to_binary_context = xb(Arg(0));
      
      do_context_to_binary0:
 	 I--;
      }
 
  do_context_to_binary:
-     if (is_boxed(tmp_arg1) && header_is_bin_matchstate(*boxed_val(tmp_arg1))) {
-	 ErlBinMatchState* ms = (ErlBinMatchState *) boxed_val(tmp_arg1);
+     if (is_boxed(context_to_binary_context) &&
+	 header_is_bin_matchstate(*boxed_val(context_to_binary_context))) {
+	 ErlBinMatchState* ms;
+	 ms = (ErlBinMatchState *) boxed_val(context_to_binary_context);
 	 mb = &ms->mb;
 	 offs = ms->save_offset[0];
 	 size = mb->size - offs;
@@ -4205,17 +4468,17 @@ apply_bif_or_nif_epilogue:
      Next(2);
 
      OpCase(i_bs_get_binary_all_reuse_rfI): {
-	 tmp_arg1 = x0;
+	 context_to_binary_context = x0;
 	 goto do_bs_get_binary_all_reuse;
      }
 
      OpCase(i_bs_get_binary_all_reuse_xfI): {
-	 tmp_arg1 = xb(Arg(0));
+	 context_to_binary_context = xb(Arg(0));
 	 I++;
      }
 
  do_bs_get_binary_all_reuse:
-     mb = ms_matchbuffer(tmp_arg1);
+     mb = ms_matchbuffer(context_to_binary_context);
      size = mb->size - mb->offset;
      if (size % Arg(1) != 0) {
 	 ClauseFail();
@@ -4224,7 +4487,7 @@ apply_bif_or_nif_epilogue:
 
  do_bs_get_binary_all_reuse_common:
      orig = mb->orig;
-     sb = (ErlSubBin *) boxed_val(tmp_arg1);
+     sb = (ErlSubBin *) boxed_val(context_to_binary_context);
      hole_size = 1 + header_arity(sb->thing_word) - ERL_SUB_BIN_SIZE;
      sb->thing_word = HEADER_SUB_BIN;
      sb->size = BYTE_OFFSET(size);
@@ -4240,12 +4503,14 @@ apply_bif_or_nif_epilogue:
  }
 
  {
+     Eterm match_string_context;
+
      OpCase(i_bs_match_string_rfII): {
-	 tmp_arg1 = r(0);
+	 match_string_context = r(0);
 	 goto do_bs_match_string;
      }
      OpCase(i_bs_match_string_xfII): {
-	 tmp_arg1 = xb(Arg(0));
+	 match_string_context = xb(Arg(0));
 	 I++;
      }
 
@@ -4260,7 +4525,7 @@ apply_bif_or_nif_epilogue:
 	 PreFetch(3, next);
 	 bits = Arg(1);
 	 bytes = (byte *) Arg(2);
-	 mb = ms_matchbuffer(tmp_arg1);
+	 mb = ms_matchbuffer(match_string_context);
 	 if (mb->size - mb->offset < bits) {
 	     ClauseFail();
 	 }
@@ -4353,6 +4618,7 @@ apply_bif_or_nif_epilogue:
 	 ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
 	 flags = erts_call_trace(c_p, ep->code, ep->match_prog_set, reg,
 				 0, &c_p->tracer_proc);
+	 ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	 ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
 	 PROCESS_MAIN_CHK_LOCKS(c_p);
 	 ASSERT(!ERTS_PROC_IS_EXITING(c_p));
@@ -4364,6 +4630,7 @@ apply_bif_or_nif_epilogue:
 		 /* SWAPOUT, SWAPIN was done and r(0) was saved above */
 		 PROCESS_MAIN_CHK_LOCKS(c_p);
 		 FCALLS -= erts_garbage_collect(c_p, 3, reg, ep->code[2]);
+		 ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 		 PROCESS_MAIN_CHK_LOCKS(c_p);
 		 r(0) = reg[0];
 		 SWAPIN;
@@ -4373,7 +4640,7 @@ apply_bif_or_nif_epilogue:
 	     ASSERT(is_CP((BeamInstr)(ep->code)));
 	     ASSERT(is_internal_pid(c_p->tracer_proc) || 
 		    is_internal_port(c_p->tracer_proc));
-	     E[2] = make_cp(c_p->cp); /* XXX:PaN - code in lower range on halfword */
+	     E[2] = make_cp(c_p->cp); /* Code in lower range on halfword */
 	     E[1] = am_true; /* Process tracer */
 	     E[0] = make_cp(ep->code);
 	     c_p->cp = (flags & MATCH_SET_EXCEPTION_TRACE)
@@ -4453,6 +4720,7 @@ apply_bif_or_nif_epilogue:
 		 reg[0] = r(0);
 		 PROCESS_MAIN_CHK_LOCKS(c_p);
 		 FCALLS -= erts_garbage_collect(c_p, 2, reg, I[-1]);
+		 ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 		 PROCESS_MAIN_CHK_LOCKS(c_p);
 		 r(0) = reg[0];
 	     }
@@ -4463,7 +4731,7 @@ apply_bif_or_nif_epilogue:
 	     E -= 2;
 	     E[0] = make_cp(I);
 	     E[1] = make_cp(c_p->cp);     /* original return address */
-	     c_p->cp = (BeamInstr *) make_cp(beam_return_time_trace);
+	     c_p->cp = beam_return_time_trace;
 	 }
      }
 
@@ -4493,20 +4761,20 @@ apply_bif_or_nif_epilogue:
      BeamInstr real_I;
      Uint32 flags;
      Eterm tracer_pid;
-     BeamInstr *cpp;
+     Uint* cpp;
      int return_to_trace = 0, need = 0;
      flags = 0;
      SWAPOUT;
      reg[0] = r(0);
 
      if (*(c_p->cp) == (BeamInstr) OpCode(return_trace)) {
-	 cpp = (BeamInstr*)&E[2];
+	 cpp = &E[2];
      } else if (*(c_p->cp) == (BeamInstr) OpCode(i_return_to_trace)) {
 	 return_to_trace = !0;
-	 cpp = (BeamInstr*)&E[0];
+	 cpp = &E[0];
      } else if (*(c_p->cp) == (BeamInstr) OpCode(i_return_time_trace)) {
 	 return_to_trace = !0;
-	 cpp = (BeamInstr*)&E[0];
+	 cpp = &E[0];
      } else {
 	 cpp = NULL;
      }
@@ -4556,6 +4824,7 @@ apply_bif_or_nif_epilogue:
 	     /* SWAPOUT was done and r(0) was saved above */
 	     PROCESS_MAIN_CHK_LOCKS(c_p);
 	     FCALLS -= erts_garbage_collect(c_p, need, reg, I[-1]);
+	     ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	     PROCESS_MAIN_CHK_LOCKS(c_p);
 	     r(0) = reg[0];
 	     SWAPIN;
@@ -4723,7 +4992,7 @@ apply_bif_or_nif_epilogue:
      NextPF(2, next);
  }
 
- OpCase(fmove_new_ld): {
+ OpCase(fmove_ld): {
      Eterm fr = Arg(0);
      Eterm dest = make_float(HTOP);
 
@@ -4753,11 +5022,6 @@ apply_bif_or_nif_epilogue:
      NextPF(2, next);
  }
 
- /*
-  * Old allocating fmove.
-  */
-
-
 #ifdef NO_FPE_SIGNALS
      OpCase(fclearerror):
      OpCase(i_fcheckerror):
@@ -4889,7 +5153,7 @@ apply_bif_or_nif_epilogue:
      neg_o_reds = -c_p->def_arg_reg[4];
      FCALLS = c_p->fcalls;
      SWAPIN;
-     switch( c_p->def_arg_reg[3] ) { /* XXX:PaN - Halfword wont work with hipe yet... */
+     switch( c_p->def_arg_reg[3] ) { /* Halfword wont work with hipe yet! */
        case HIPE_MODE_SWITCH_RES_RETURN:
 	 ASSERT(is_value(reg[0]));
 	 MoveReturn(reg[0], r(0));
@@ -4969,12 +5233,11 @@ apply_bif_or_nif_epilogue:
  OpCase(i_debug_breakpoint): {
      SWAPOUT;
      reg[0] = r(0);
-     tmp_arg1 = call_breakpoint_handler(c_p, I-3, reg);
+     I = call_error_handler(c_p, I-3, reg, am_breakpoint);
      r(0) = reg[0];
      SWAPIN;
-     if (tmp_arg1) {
-	 SET_I(c_p->i);
-	 Dispatch();
+     if (I) {
+	 Goto(*I);
      }
      goto no_error_handler;
  }
@@ -5633,9 +5896,6 @@ build_stacktrace(Process* c_p, Eterm exc) {
     Eterm  args;
     int    depth;
     BeamInstr* current;
-#if HALFWORD_HEAP
-    BeamInstr current_buff[3];
-#endif
     Eterm  Where = NIL;
     Eterm *next_p = &Where;
 
@@ -5665,14 +5925,7 @@ build_stacktrace(Process* c_p, Eterm exc) {
      * (e.g. spawn_link(erlang, abs, [1])).
      */
     if (current == NULL) {
-#if HALFWORD_HEAP
-	current = current_buff;
-	current[0] = (BeamInstr) c_p->initial[0];
-	current[1] = (BeamInstr) c_p->initial[1];
-	current[2] = (BeamInstr) c_p->initial[2];
-#else
 	current = c_p->initial;
-#endif
 	args = am_true; /* Just in case */
     } else {
 	args = get_args_from_exc(exc);
@@ -5724,8 +5977,8 @@ build_stacktrace(Process* c_p, Eterm exc) {
 }
 
 
-static Eterm
-call_error_handler(Process* p, BeamInstr* fi, Eterm* reg)
+static BeamInstr*
+call_error_handler(Process* p, BeamInstr* fi, Eterm* reg, Eterm func)
 {
     Eterm* hp;
     Export* ep;
@@ -5737,62 +5990,12 @@ call_error_handler(Process* p, BeamInstr* fi, Eterm* reg)
     /*
      * Search for the error_handler module.
      */
-    ep = erts_find_function(erts_proc_get_error_handler(p),
-			    am_undefined_function, 3);
-    if (ep == NULL) {		/* No error handler */
-	p->current = fi;
-	p->freason = EXC_UNDEF;
-	return 0;
-    }
-    p->i = ep->address;
-
-    /*
-     * Create a list with all arguments in the x registers.
-     */
-
-    arity = fi[2];
-    sz = 2 * arity;
-    if (HeapWordsLeft(p) < sz) {
-	erts_garbage_collect(p, sz, reg, arity);
-    }
-    hp = HEAP_TOP(p);
-    HEAP_TOP(p) += sz;
-    args = NIL;
-    for (i = arity-1; i >= 0; i--) {
-	args = CONS(hp, reg[i], args);
-	hp += 2;
-    }
-
-    /*
-     * Set up registers for call to error_handler:undefined_function/3.
-     */
-    reg[0] = fi[0];
-    reg[1] = fi[1];
-    reg[2] = args;
-    return 1;
-}
-
-static Eterm
-call_breakpoint_handler(Process* p, BeamInstr* fi, Eterm* reg)
-{
-    Eterm* hp;
-    Export* ep;
-    int arity;
-    Eterm args;
-    Uint sz;
-    int i;
-
-    /*
-     * Search for error handler module.
-     */
-    ep = erts_find_function(erts_proc_get_error_handler(p),
-			    am_breakpoint, 3);
+    ep = erts_find_function(erts_proc_get_error_handler(p), func, 3);
     if (ep == NULL) {		/* No error handler */
 	p->current = fi;
 	p->freason = EXC_UNDEF;
 	return 0;
     }
-    p->i = ep->address;
 
     /*
      * Create a list with all arguments in the x registers.
@@ -5812,15 +6015,14 @@ call_breakpoint_handler(Process* p, BeamInstr* fi, Eterm* reg)
     }
 
     /*
-     * Set up registers for call to error_handler:breakpoint/3.
+     * Set up registers for call to error_handler:<func>/3.
      */
     reg[0] = fi[0];
     reg[1] = fi[1];
     reg[2] = args;
-    return 1;
+    return ep->address;
 }
 
-
 
 static Export*
 apply_setup_error_handler(Process* p, Eterm module, Eterm function, Uint arity, Eterm* reg)
@@ -6069,6 +6271,7 @@ hibernate(Process* c_p, Eterm module, Eterm function, Eterm args, Eterm* reg)
 	c_p->fvalue = NIL;
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	erts_garbage_collect_hibernate(c_p);
+	ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	erts_smp_proc_lock(c_p, ERTS_PROC_LOCK_MSGQ|ERTS_PROC_LOCK_STATUS);
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p));
@@ -6314,6 +6517,7 @@ new_fun(Process* p, Eterm* reg, ErlFunEntry* fe, int num_free)
     if (HEAP_LIMIT(p) - HEAP_TOP(p) <= needed) {
 	PROCESS_MAIN_CHK_LOCKS(p);
 	erts_garbage_collect(p, needed, reg, num_free);
+	ERTS_VERIFY_UNUSED_TEMP_ALLOC(p);
 	PROCESS_MAIN_CHK_LOCKS(p);
     }
     hp = p->htop;
@@ -6323,8 +6527,8 @@ new_fun(Process* p, Eterm* reg, ErlFunEntry* fe, int num_free)
     erts_refc_inc(&fe->refc, 2);
     funp->thing_word = HEADER_FUN;
 #ifndef HYBRID /* FIND ME! */
-    funp->next = MSO(p).funs;
-    MSO(p).funs = funp;
+    funp->next = MSO(p).first;
+    MSO(p).first = (struct erl_off_heap_header*) funp;
 #endif
     funp->fe = fe;
     funp->num_free = num_free;
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index 30f276b95a..788cb4209c 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -89,13 +89,12 @@ typedef struct {
 } Label;
 
 /*
- * Type for a operand for a generic instruction.
+ * Type for an operand for a generic instruction.
  */
 
 typedef struct {
     unsigned type;		/* Type of operand. */
-    BeamInstr val;			/* Value of operand. */
-    Uint bigarity;		/* Arity for bignumbers (only). */
+    BeamInstr val;		/* Value of operand. */
 } GenOpArg;
 
 /*
@@ -326,11 +325,6 @@ typedef struct {
     Literal* literals;		/* Array of literals. */
     LiteralPatch* literal_patches; /* Operands that need to be patched. */
     Uint total_literal_size;	/* Total heap size for all literals. */
-
-    /*
-     * Floating point.
-     */
-    int new_float_instructions;	/* New allocation scheme for floating point. */
 } LoaderState;
 
 typedef struct {
@@ -476,12 +470,14 @@ static int read_code_header(LoaderState* stp);
 static int load_code(LoaderState* stp);
 static GenOp* gen_element(LoaderState* stp, GenOpArg Fail, GenOpArg Index,
 			  GenOpArg Tuple, GenOpArg Dst);
-static GenOp* gen_split_values(LoaderState* stp, GenOpArg S, GenOpArg Fail,
+static GenOp* gen_split_values(LoaderState* stp, GenOpArg S,
+			       GenOpArg TypeFail, GenOpArg Fail,
 			       GenOpArg Size, GenOpArg* Rest);
 static GenOp* gen_select_val(LoaderState* stp, GenOpArg S, GenOpArg Fail,
 			     GenOpArg Size, GenOpArg* Rest);
-static GenOp* gen_select_big(LoaderState* stp, GenOpArg S, GenOpArg Fail,
-			     GenOpArg Size, GenOpArg* Rest);
+static GenOp* gen_select_literals(LoaderState* stp, GenOpArg S,
+				  GenOpArg Fail, GenOpArg Size,
+				  GenOpArg* Rest);
 static GenOp* const_select_val(LoaderState* stp, GenOpArg S, GenOpArg Fail,
 			       GenOpArg Size, GenOpArg* Rest);
 static GenOp* gen_func_info(LoaderState* stp, GenOpArg mod, GenOpArg Func,
@@ -818,7 +814,6 @@ init_state(LoaderState* stp)
     stp->total_literal_size = 0;
     stp->literal_patches = 0;
     stp->string_patches = 0;
-    stp->new_float_instructions = 0;
     stp->may_load_nif = 0;
     stp->on_load = 0;
 }
@@ -1379,8 +1374,10 @@ read_code_header(LoaderState* stp)
     stp->ci = MI_FUNCTIONS + stp->num_functions + 1;
 
     stp->code[MI_ATTR_PTR] = 0;
+    stp->code[MI_ATTR_SIZE] = 0;
     stp->code[MI_ATTR_SIZE_ON_HEAP] = 0;
     stp->code[MI_COMPILE_PTR] = 0;
+    stp->code[MI_COMPILE_SIZE] = 0;
     stp->code[MI_COMPILE_SIZE_ON_HEAP] = 0;
     stp->code[MI_NUM_BREAKPOINTS] = 0;
 
@@ -1566,7 +1563,8 @@ load_code(LoaderState* stp)
 		    case 0:	/* Floating point number */
 			{
 			    Eterm* hp;
-#if !defined(ARCH_64) || HALFWORD_HEAP /* XXX:PaN - Should use ARCH_64 variant instead */
+/* XXX:PaN - Halfword should use ARCH_64 variant instead */
+#if !defined(ARCH_64) || HALFWORD_HEAP
 			    Uint high, low;
 # endif
 			    last_op->a[arg].val = new_literal(stp, &hp,
@@ -1615,7 +1613,6 @@ load_code(LoaderState* stp)
 			    BeamInstr val;
 			    BeamInstr words = 0;
 			    
-			    stp->new_float_instructions = 1;
 			    GetTagAndValue(stp, tag, n);
 			    VerifyTag(stp, tag, TAG_u);
 			    while (n-- > 0) {
@@ -1769,7 +1766,7 @@ load_code(LoaderState* stp)
 	    }
 
 	    stp->specific_op = specific;
-	    CodeNeed(opc[stp->specific_op].sz+2); /* Extra margin for packing */
+	    CodeNeed(opc[stp->specific_op].sz+16); /* Extra margin for packing */
 	    code[ci++] = BeamOpCode(stp->specific_op);
 	}
 	
@@ -1933,7 +1930,8 @@ load_code(LoaderState* stp)
 		}
 		code[ci++] = (BeamInstr) stp->import[i].bf;
 		break;
-	    case 'P':		/* Byte offset into tuple */ /* XXX:PaN - * sizeof(Eterm or Eterm *) ? */
+	    case 'P':		/* Byte offset into tuple or stack */
+	    case 'Q':		/* Like 'P', but packable */
 		VerifyTag(stp, tag, TAG_u);
 		tmp = tmp_op->a[arg].val;
 		code[ci++] = (BeamInstr) ((tmp_op->a[arg].val+1) * sizeof(Eterm));
@@ -1954,84 +1952,6 @@ load_code(LoaderState* stp)
 	}
 
 	/*
-	 * Load any list arguments using the primitive tags.
-	 */
-
-	for ( ; arg < tmp_op->arity; arg++) {
-	    switch (tmp_op->a[arg].type) {
-	    case TAG_i:
-		CodeNeed(1);
-		code[ci++] = make_small(tmp_op->a[arg].val);
-		break;
-	    case TAG_u:
-	    case TAG_a:
-	    case TAG_v:
-		CodeNeed(1);
-		code[ci++] = tmp_op->a[arg].val;
-		break;
-	    case TAG_f:
-		CodeNeed(1);
-		code[ci] = stp->labels[tmp_op->a[arg].val].patches;
-		stp->labels[tmp_op->a[arg].val].patches = ci;
-		ci++;
-		break;
-	    case TAG_q:
-		{
-		    Eterm lit;
-
-		    lit = stp->literals[tmp_op->a[arg].val].term;
-		    if (is_big(lit)) {
-			Eterm* bigp;
-			Eterm *tmp;
-			Uint size;
-			Uint term_size;
-
-			bigp = big_val(lit);
-			term_size = bignum_header_arity(*bigp);
-			size = TermWords(term_size + 1);
-			CodeNeed(size);
-			tmp = (Eterm *) (code + ci);
-			*tmp++ = *bigp++;
-			while (term_size-- > 0) {
-			    *tmp++ = *bigp++;
-			}
-			ci +=size;
-		    } else if (is_float(lit)) {
-#if defined(ARCH_64) && !HALFWORD_HEAP
-			CodeNeed(1);
-			code[ci++] = float_val(stp->literals[tmp_op->a[arg].val].term)[1];
-#elif HALFWORD_HEAP
-			Eterm* fptr;
-			Uint size;
-			Eterm *tmp;
-
-			fptr = float_val(stp->literals[tmp_op->a[arg].val].term)+1;
-			size = TermWords(2);
-			CodeNeed(size);
-			tmp = (Eterm *) (code + ci);
-			*tmp++ = *fptr++;
-			*tmp = *fptr;
-			ci += size;
-#else
-			Eterm* fptr;
-
-			fptr = float_val(stp->literals[tmp_op->a[arg].val].term)+1;
-			CodeNeed(2);
-			code[ci++] = *fptr++;
-			code[ci++] = *fptr;
-#endif
-		    } else {
-			LoadError0(stp, "literal is neither float nor big");
-		    }
-		}
-		break;
-	    default:
-		LoadError1(stp, "unsupported primitive type '%c'",
-			   tag_to_letter[tmp_op->a[arg].type]);
-	    }
-	}
-
-	/*
 	 * The packing engine.
 	 */
 	if (opc[stp->specific_op].pack[0]) {
@@ -2054,6 +1974,11 @@ load_code(LoaderState* stp)
 		case '6':	/* Shift 16 steps */
 		    packed = (packed << BEAM_LOOSE_SHIFT) | code[--ci];
 		    break;
+#ifdef ARCH_64
+		case 'w':	/* Shift 32 steps */
+		    packed = (packed << BEAM_WIDE_SHIFT) | code[--ci];
+		    break;
+#endif
 		case 'p':	/* Put instruction (from stack). */
 		    code[ci++] = *--sp;
 		    break;
@@ -2069,6 +1994,58 @@ load_code(LoaderState* stp)
 	}
 
 	/*
+	 * Load any list arguments using the primitive tags.
+	 */
+
+	for ( ; arg < tmp_op->arity; arg++) {
+	    switch (tmp_op->a[arg].type) {
+	    case TAG_i:
+		CodeNeed(1);
+		code[ci++] = make_small(tmp_op->a[arg].val);
+		break;
+	    case TAG_u:
+	    case TAG_a:
+	    case TAG_v:
+		CodeNeed(1);
+		code[ci++] = tmp_op->a[arg].val;
+		break;
+	    case TAG_f:
+		CodeNeed(1);
+		code[ci] = stp->labels[tmp_op->a[arg].val].patches;
+		stp->labels[tmp_op->a[arg].val].patches = ci;
+		ci++;
+		break;
+	    case TAG_r:
+		CodeNeed(1);
+		code[ci++] = (R_REG_DEF << _TAG_PRIMARY_SIZE) |
+		    TAG_PRIMARY_HEADER;
+		break;
+	    case TAG_x:
+		CodeNeed(1);
+		code[ci++] = (tmp_op->a[arg].val << _TAG_IMMED1_SIZE) |
+		    (X_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER;
+		break;
+	    case TAG_y:
+		CodeNeed(1);
+		code[ci++] = (tmp_op->a[arg].val << _TAG_IMMED1_SIZE) |
+		    (Y_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER;
+		break;
+	    case TAG_n:
+		CodeNeed(1);
+		code[ci++] = NIL;
+		break;
+	    case TAG_q:
+		CodeNeed(1);
+		new_literal_patch(stp, ci);
+		code[ci++] = tmp_op->a[arg].val;
+		break;
+	    default:
+		LoadError1(stp, "unsupported primitive type '%c'",
+			   tag_to_letter[tmp_op->a[arg].type]);
+	    }
+	}
+
+	/*
 	 * Handle a few special cases.
 	 */
 	switch (stp->specific_op) {
@@ -2236,11 +2213,12 @@ use_jump_tab(LoaderState* stp, GenOpArg Size, GenOpArg* Rest)
 }
 
 /*
- * Predicate to test whether all values in a table are big numbers.
+ * Predicate to test whether all values in a table are either
+ * floats or bignums.
  */
 
 static int
-all_values_are_big(LoaderState* stp, GenOpArg Size, GenOpArg* Rest)
+floats_or_bignums(LoaderState* stp, GenOpArg Size, GenOpArg* Rest)
 {
     int i;
 
@@ -2252,9 +2230,6 @@ all_values_are_big(LoaderState* stp, GenOpArg Size, GenOpArg* Rest)
 	if (Rest[i].type != TAG_q) {
 	    return 0;
 	}
-	if (is_not_big(stp->literals[Rest[i].val].term)) {
-	    return 0;
-	}
 	if (Rest[i+1].type != TAG_f) {
 	    return 0;
 	}
@@ -2314,6 +2289,14 @@ mixed_types(LoaderState* stp, GenOpArg Size, GenOpArg* Rest)
     return 0;
 }
 
+static int
+same_label(LoaderState* stp, GenOpArg Target, GenOpArg Label)
+{
+    return Target.type = TAG_f && Label.type == TAG_u &&
+	Target.val == Label.val;
+}
+
+
 /*
  * Generate an instruction for element/2.
  */
@@ -2325,23 +2308,23 @@ gen_element(LoaderState* stp, GenOpArg Fail, GenOpArg Index,
     GenOp* op;
 
     NEW_GENOP(stp, op);
-    op->op = genop_i_element_4;
     op->arity = 4;
-    op->a[0] = Fail;
-    op->a[1] = Index;
-    op->a[2] = Tuple;
-    op->a[3] = Dst;
     op->next = NULL;
 
-    /*
-     * If safe, generate a faster instruction.
-     */
-
     if (Index.type == TAG_i && Index.val > 0 &&
 	(Tuple.type == TAG_r || Tuple.type == TAG_x || Tuple.type == TAG_y)) {
 	op->op = genop_i_fast_element_4;
-	op->a[1].type = TAG_u;
-	op->a[1].val = Index.val;
+	op->a[0] = Tuple;
+	op->a[1] = Fail;
+	op->a[2].type = TAG_u;
+	op->a[2].val = Index.val;
+	op->a[3] = Dst;
+    } else {
+	op->op = genop_i_element_4;
+	op->a[0] = Tuple;
+	op->a[1] = Fail;
+	op->a[2] = Index;
+	op->a[3] = Dst;
     }
 
     return op;
@@ -2592,8 +2575,6 @@ binary_too_big_bits(LoaderState* stp, GenOpArg Size)
     return Size.type == TAG_u && (((Size.val+7)/8) >> (8*sizeof(Uint)-3) != 0);
 }
 
-#define new_float_allocation(Stp) ((Stp)->new_float_instructions)
-
 static GenOp*
 gen_put_binary(LoaderState* stp, GenOpArg Fail,GenOpArg Size,
 	       GenOpArg Unit, GenOpArg Flags, GenOpArg Src)
@@ -2806,6 +2787,52 @@ gen_skip_bits2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms,
     return op;
 }
 
+static GenOp*
+gen_increment(LoaderState* stp, GenOpArg Reg, GenOpArg Integer,
+	      GenOpArg Live, GenOpArg Dst)
+{
+    GenOp* op;
+
+    NEW_GENOP(stp, op);
+    op->op = genop_i_increment_4;
+    op->arity = 4;
+    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;
+    return op;
+}
+
+static GenOp*
+gen_increment_from_minus(LoaderState* stp, GenOpArg Reg, GenOpArg Integer,
+			 GenOpArg Live, GenOpArg Dst)
+{
+    GenOp* op;
+
+    NEW_GENOP(stp, op);
+    op->op = genop_i_increment_4;
+    op->arity = 4;
+    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;
+    return op;
+}
+
+/*
+ * Test whether the negation of the given number is small.
+ */
+static int
+negation_is_small(LoaderState* stp, GenOpArg Int)
+{
+    return Int.type == TAG_i && IS_SSMALL(-Int.val);
+}
+
+
 static int
 smp(LoaderState* stp)
 {
@@ -2997,6 +3024,21 @@ gen_select_tuple_arity(LoaderState* stp, GenOpArg S, GenOpArg Fail,
 	ASSERT(op->a[i].val < op->a[i+2].val);
     }
 #endif
+
+    /*
+     * Use a special-cased instruction if there are only two values.
+     */
+    if (size == 2) {
+	op->op = genop_i_select_tuple_arity2_6;
+	op->arity--;
+	op->a[2].type = TAG_u;
+	op->a[2].val = arityval(op->a[3].val);
+	op->a[3] = op->a[4];
+	op->a[4].type = TAG_u;
+	op->a[4].val = arityval(op->a[5].val);
+	op->a[5] = op->a[6];
+    }
+
     return op;
 }
 
@@ -3006,18 +3048,24 @@ gen_select_tuple_arity(LoaderState* stp, GenOpArg S, GenOpArg Fail,
  */
 
 static GenOp*
-gen_split_values(LoaderState* stp, GenOpArg S, GenOpArg Fail,
-		 GenOpArg Size, GenOpArg* Rest)
+gen_split_values(LoaderState* stp, GenOpArg S, GenOpArg TypeFail,
+		 GenOpArg Fail, GenOpArg Size, GenOpArg* Rest)
 
 {
     GenOp* op1;
     GenOp* op2;
     GenOp* label;
-    Uint type;
+    GenOp* is_integer;
     int i;
 
     ASSERT(Size.val >= 2 && Size.val % 2 == 0);
 
+    NEW_GENOP(stp, is_integer);
+    is_integer->op = genop_is_integer_2;
+    is_integer->arity = 2;
+    is_integer->a[0] = TypeFail;
+    is_integer->a[1] = S;
+
     NEW_GENOP(stp, label);
     label->op = genop_label_1;
     label->arity = 1;
@@ -3043,15 +3091,13 @@ gen_split_values(LoaderState* stp, GenOpArg S, GenOpArg Fail,
     op2->a[2].type = TAG_u;
     op2->a[2].val = 0;
 
-    op1->next = label;
-    label->next = op2;
-    op2->next = NULL;
-
-    type = Rest[0].type;
+    /*
+     * Split the list.
+     */
 
     ASSERT(Size.type == TAG_u);
     for (i = 0; i < Size.val; i += 2) {
-	GenOp* op = (Rest[i].type == type) ? op1 : op2;
+	GenOp* op = (Rest[i].type == TAG_q) ? op2 : op1;
 	int dst = 3 + op->a[2].val;
 
 	ASSERT(Rest[i+1].type == TAG_f);
@@ -3060,13 +3106,36 @@ gen_split_values(LoaderState* stp, GenOpArg S, GenOpArg Fail,
 	op->arity += 2;
 	op->a[2].val += 2;
     }
+    ASSERT(op1->a[2].val > 0);
+    ASSERT(op2->a[2].val > 0);
 
     /*
-     * None of the instructions should have zero elements in the list.
+     * Order the instruction sequence appropriately.
      */
 
-    ASSERT(op1->a[2].val > 0);
-    ASSERT(op2->a[2].val > 0);
+    if (TypeFail.val == Fail.val) {
+	/*
+	 * select_val L1 S ... (small numbers)
+	 * label L1
+	 * is_integer Fail S
+	 * select_val Fail S ... (bignums)
+	 */
+	op1->next = label;
+	label->next = is_integer;
+	is_integer->next = op2;
+    } else {
+	/*
+	 * is_integer TypeFail S
+	 * select_val L1 S ... (small numbers)
+	 * label L1
+	 * select_val Fail S ... (bignums)
+	 */
+	is_integer->next = op1;
+	op1->next = label;
+	label->next = op2;
+	op1 = is_integer;
+    }
+    op2->next = NULL;
 
     return op1;
 }
@@ -3088,6 +3157,29 @@ gen_jump_tab(LoaderState* stp, GenOpArg S, GenOpArg Fail, GenOpArg Size, GenOpAr
     ASSERT(Size.val >= 2 && Size.val % 2 == 0);
 
     /*
+     * If there is only one choice, don't generate a jump table.
+     */
+    if (Size.val == 2) {
+	GenOp* jump;
+
+	NEW_GENOP(stp, op);
+	op->arity = 3;
+	op->op = genop_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;
+	jump->a[0] = Fail;
+
+	op->next = jump;
+	return op;
+    }
+
+    /*
      * Calculate the minimum and maximum values and size of jump table.
      */
 
@@ -3159,8 +3251,9 @@ genopargcompare(GenOpArg* a, GenOpArg* b)
 }
 
 /*
- * Generate a select_val instruction.  We know that a jump table is not suitable,
- * and that all values are of the same type (integer, atoms, floats; never bignums).
+ * Generate a select_val instruction.  We know that a jump table
+ * is not suitable, and that all values are of the same type
+ * (integer or atoms).
  */
 
 static GenOp*
@@ -3174,12 +3267,7 @@ gen_select_val(LoaderState* stp, GenOpArg S, GenOpArg Fail,
 
     NEW_GENOP(stp, op);
     op->next = NULL;
-    if (Rest[0].type != TAG_q) {
-	op->op = genop_i_select_val_3;
-    } else {
-	ASSERT(is_float(stp->literals[Rest[0].val].term));
-	op->op = genop_i_select_float_3;
-    }
+    op->op = genop_i_select_val_3;
     GENOP_ARITY(op, arity);
     op->a[0] = S;
     op->a[1] = Fail;
@@ -3201,19 +3289,19 @@ gen_select_val(LoaderState* stp, GenOpArg S, GenOpArg Fail,
     }
 #endif
 
-    return op;
-}
-
-/* 
- *  Compare function for qsort().
- */
+    /*
+     * Use a special-cased instruction if there are only two values.
+     */
+    if (size == 2) {
+	op->op = genop_i_select_val2_6;
+	op->arity--;
+	op->a[2] = op->a[3];
+	op->a[3] = op->a[4];
+	op->a[4] = op->a[5];
+	op->a[5] = op->a[6];
+    }
 
-static int
-genbigcompare(GenOpArg* a, GenOpArg* b)
-{
-    int val = (int)(b->bigarity - a->bigarity);
-    
-    return val != 0 ? val : ((int) (a->val - b->val));
+    return op;
 }
 
 /*
@@ -3221,37 +3309,35 @@ genbigcompare(GenOpArg* a, GenOpArg* b)
  */
 
 static GenOp*
-gen_select_big(LoaderState* stp, GenOpArg S, GenOpArg Fail,
+gen_select_literals(LoaderState* stp, GenOpArg S, GenOpArg Fail,
 	       GenOpArg Size, GenOpArg* Rest)
 {
     GenOp* op;
-    int arity = Size.val + 2 + 1;
-    int size = Size.val / 2;
+    GenOp* jump;
+    GenOp** prev_next = &op;
+
     int i;
 
-    NEW_GENOP(stp, op);
-    op->next = NULL;
-    op->op = genop_i_select_big_2;
-    GENOP_ARITY(op, arity);
-    op->a[0] = S;
-    op->a[1] = Fail;
     for (i = 0; i < Size.val; i += 2) {
+	GenOp* op;
 	ASSERT(Rest[i].type == TAG_q);
-	op->a[i+2] = Rest[i];
-	op->a[i+2].bigarity = *big_val(stp->literals[op->a[i+2].val].term);
-	op->a[i+3] = Rest[i+1];
-    }
-    ASSERT(i+2 == arity-1);
-    op->a[arity-1].type = TAG_u;
-    op->a[arity-1].val = 0;
-
-    /*
-     * Sort the values in descending arity order.
-     */
-
-    qsort(op->a+2, size, 2*sizeof(GenOpArg), 
-	  (int (*)(const void *, const void *)) genbigcompare);
 
+	NEW_GENOP(stp, op);
+	op->op = genop_is_ne_exact_3;
+	op->arity = 3;
+	op->a[0] = Rest[i+1];
+	op->a[1] = S;
+	op->a[2] = Rest[i];
+	*prev_next = op;
+	prev_next = &op->next;
+    }
+
+    NEW_GENOP(stp, jump);
+    jump->next = NULL;
+    jump->op = genop_jump_1;
+    jump->arity = 1;
+    jump->a[0] = Fail;
+    *prev_next = jump;
     return op;
 }
 
@@ -3269,7 +3355,6 @@ const_select_val(LoaderState* stp, GenOpArg S, GenOpArg Fail,
     int i;
 
     ASSERT(Size.type == TAG_u);
-    ASSERT(S.type == TAG_q);
 
     NEW_GENOP(stp, op);
     op->next = NULL;
@@ -3280,18 +3365,32 @@ const_select_val(LoaderState* stp, GenOpArg S, GenOpArg Fail,
      * Search for a literal matching the controlling expression.
      */
 
-    if (S.type == TAG_q) {
-	Eterm expr = stp->literals[S.val].term;
-	for (i = 0; i < Size.val; i += 2) {
-	    if (Rest[i].type == TAG_q) {
-		Eterm term = stp->literals[Rest[i].val].term;
-		if (eq(term, expr)) {
-		    ASSERT(Rest[i+1].type == TAG_f);
-		    op->a[0] = Rest[i+1];
-		    return op;
+    switch (S.type) {
+    case TAG_q:
+	{
+	    Eterm expr = stp->literals[S.val].term;
+	    for (i = 0; i < Size.val; i += 2) {
+		if (Rest[i].type == TAG_q) {
+		    Eterm term = stp->literals[Rest[i].val].term;
+		    if (eq(term, expr)) {
+			ASSERT(Rest[i+1].type == TAG_f);
+			op->a[0] = Rest[i+1];
+			return op;
+		    }
 		}
 	    }
 	}
+	break;
+    case TAG_i:
+    case TAG_a:
+	for (i = 0; i < Size.val; i += 2) {
+	    if (Rest[i].val == S.val && Rest[i].type == S.type) {
+		ASSERT(Rest[i+1].type == TAG_f);
+		op->a[0] = Rest[i+1];
+		return op;
+	    }
+	}
+	break;
     }
 
     /*
@@ -3474,6 +3573,56 @@ gen_guard_bif3(LoaderState* stp, GenOpArg Fail, GenOpArg Live, GenOpArg Bif,
     return op;
 }
 
+static GenOp*
+tuple_append_put5(LoaderState* stp, GenOpArg Arity, GenOpArg Dst,
+		  GenOpArg* Puts, GenOpArg S1, GenOpArg S2, GenOpArg S3,
+		  GenOpArg S4, GenOpArg S5)
+{
+    GenOp* op;
+    int arity = Arity.val;	/* Arity of tuple, not the instruction */
+    int i;
+
+    NEW_GENOP(stp, op);
+    op->next = NULL;
+    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;
+    for (i = 0; i < arity; i++) {
+	op->a[i+2] = Puts[i];
+    }
+    op->a[arity+2] = S1;
+    op->a[arity+3] = S2;
+    op->a[arity+4] = S3;
+    op->a[arity+5] = S4;
+    op->a[arity+6] = S5;
+    return op;
+}
+
+static GenOp*
+tuple_append_put(LoaderState* stp, GenOpArg Arity, GenOpArg Dst,
+		 GenOpArg* Puts, GenOpArg S)
+{
+    GenOp* op;
+    int arity = Arity.val;	/* Arity of tuple, not the instruction */
+    int i;
+
+    NEW_GENOP(stp, op);
+    op->next = NULL;
+    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;
+    for (i = 0; i < arity; i++) {
+	op->a[i+2] = Puts[i];
+    }
+    op->a[arity+2] = S;
+    return op;
+}
+
+
 
 /*
  * Freeze the code in memory, move the string table into place,
@@ -3621,25 +3770,32 @@ freeze_code(LoaderState* stp)
     CHKBLK(ERTS_ALC_T_CODE,code);
     if (compile_size) {
 	byte* compile_info = str_table + strtab_size + attr_size;
-    CHKBLK(ERTS_ALC_T_CODE,code);
+	CHKBLK(ERTS_ALC_T_CODE,code);
 	sys_memcpy(compile_info, stp->chunks[COMPILE_CHUNK].start,
 	       stp->chunks[COMPILE_CHUNK].size);
-    CHKBLK(ERTS_ALC_T_CODE,code);
+
+	CHKBLK(ERTS_ALC_T_CODE,code);
 	code[MI_COMPILE_PTR] = (BeamInstr) compile_info;
-    CHKBLK(ERTS_ALC_T_CODE,code);
+	CHKBLK(ERTS_ALC_T_CODE,code);
 	code[MI_COMPILE_SIZE] = (BeamInstr) stp->chunks[COMPILE_CHUNK].size;
-    CHKBLK(ERTS_ALC_T_CODE,code);
+	CHKBLK(ERTS_ALC_T_CODE,code);
 	decoded_size = erts_decode_ext_size(compile_info, compile_size, 0);
-    CHKBLK(ERTS_ALC_T_CODE,code);
+	CHKBLK(ERTS_ALC_T_CODE,code);
 	if (decoded_size < 0) {
  	    LoadError0(stp, "bad external term representation of compilation information");
  	}
-    CHKBLK(ERTS_ALC_T_CODE,code);
+	CHKBLK(ERTS_ALC_T_CODE,code);
 	code[MI_COMPILE_SIZE_ON_HEAP] = decoded_size;
     }
     CHKBLK(ERTS_ALC_T_CODE,code);
 
     /*
+     * Make sure that we have not overflowed the allocated code space.
+     */
+    ASSERT(str_table + strtab_size + attr_size + compile_size ==
+	   ((byte *) code) + size);
+
+    /*
      * Go through all i_new_bs_put_strings instructions, restore the pointer to
      * the instruction and convert string offsets to pointers (to the
      * FIRST character).
@@ -3873,11 +4029,23 @@ transform_engine(LoaderState* st)
 	    if (i == 0)
 		goto restart;
 	    break;
+#if defined(TOP_is_eq)
 	case TOP_is_eq:
 	    ASSERT(ap < instr->arity);
 	    if (*pc++ != instr->a[ap].val)
 		goto restart;
 	    break;
+#endif
+	case TOP_is_type_eq:
+	    mask = *pc++;
+
+	    ASSERT(ap < instr->arity);
+	    ASSERT(instr->a[ap].type < BEAM_NUM_TAGS);
+	    if (((1 << instr->a[ap].type) & mask) == 0)
+		goto restart;
+	    if (*pc++ != instr->a[ap].val)
+		goto restart;
+	    break;
 	case TOP_is_same_var:
 	    ASSERT(ap < instr->arity);
 	    i = *pc++;
@@ -3998,14 +4166,17 @@ transform_engine(LoaderState* st)
 	case TOP_rest_args:
 	    {
 		int n = *pc++;
+		int formal_arity = gen_opc[instr->op].arity;
+		int num_vars = n + (instr->arity - formal_arity);
+		int j = formal_arity;
+
 		var = erts_alloc(ERTS_ALC_T_LOADER_TMP,
-				 instr->arity * sizeof(GenOpArg));
+				 num_vars * sizeof(GenOpArg));
 		for (i = 0; i < n; i++) {
 		    var[i] = def_vars[i];
 		}
-		while (i < instr->arity) {
-		    var[i] = instr->a[i];
-		    i++;
+		while (i < num_vars) {
+		    var[i++] = instr->a[j++];
 		}
 	    }
 	    break;
@@ -5198,8 +5369,10 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
 
     code[MI_NUM_FUNCTIONS] = n;
     code[MI_ATTR_PTR] = 0;
+    code[MI_ATTR_SIZE] = 0;
     code[MI_ATTR_SIZE_ON_HEAP] = 0;
     code[MI_COMPILE_PTR] = 0;
+    code[MI_COMPILE_SIZE] = 0;
     code[MI_COMPILE_SIZE_ON_HEAP] = 0;
     code[MI_NUM_BREAKPOINTS] = 0;
     code[MI_ON_LOAD_FUNCTION_PTR] = 0;
@@ -5310,6 +5483,9 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
 	if (state.lambdas != state.def_lambdas) {
 	    erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.lambdas);
 	}
+	erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.labels);
+	erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.atom);
+	erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.export);
 	if (bin != NULL) {
 	    driver_free_binary(bin);
 	}
@@ -5321,9 +5497,18 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
     if (code != NULL) {
 	erts_free(ERTS_ALC_T_CODE, code);
     }
+    if (state.labels != NULL) {
+	erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.labels);
+    }
     if (state.lambdas != state.def_lambdas) {
 	erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.lambdas);
     }
+    if (state.atom != NULL) {
+	erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.atom);
+    }
+    if (state.export != NULL) {
+	erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.export);
+    }
     if (bin != NULL) {
 	driver_free_binary(bin);
     }
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 10cc2e9003..bb237e378a 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -813,7 +813,7 @@ BIF_RETTYPE spawn_opt_1(BIF_ALIST_1)
     so.min_heap_size  = H_MIN_SIZE;
     so.min_vheap_size = BIN_VH_MIN_SIZE;
     so.priority       = PRIORITY_NORMAL;
-    so.max_gen_gcs    = (Uint16) erts_smp_atomic_read(&erts_max_gen_gcs);
+    so.max_gen_gcs    = (Uint16) erts_smp_atomic32_read(&erts_max_gen_gcs);
     so.scheduler      = 0;
 
     /*
@@ -1132,6 +1132,34 @@ BIF_RETTYPE error_2(Process* p, Eterm value, Eterm args)
 }
 
 /**********************************************************************/
+/*
+ * This is like exactly like error/1. The only difference is
+ * that Dialyzer thinks that it it will return an arbitrary term.
+ * It is useful in stub functions for NIFs.
+ */
+
+BIF_RETTYPE nif_error_1(Process* p, Eterm term)
+{
+    p->fvalue = term;
+    BIF_ERROR(p, EXC_ERROR);
+}
+
+/**********************************************************************/
+/*
+ * This is like exactly like error/2. The only difference is
+ * that Dialyzer thinks that it it will return an arbitrary term.
+ * It is useful in stub functions for NIFs.
+ */
+
+BIF_RETTYPE nif_error_2(Process* p, Eterm value, Eterm args)
+{
+    Eterm* hp = HAlloc(p, 3);
+
+    p->fvalue = TUPLE2(hp, value, args);
+    BIF_ERROR(p, EXC_ERROR_2);
+}
+
+/**********************************************************************/
 /* this is like throw/1 except that we set freason to EXC_EXIT */
 
 BIF_RETTYPE exit_1(BIF_ALIST_1)
@@ -1323,9 +1351,10 @@ BIF_RETTYPE exit_2(BIF_ALIST_2)
 #ifdef ERTS_SMP
 	 if (rp == BIF_P)
 	     rp_locks &= ~ERTS_PROC_LOCK_MAIN;
-	 else
+	 if (rp_locks)
+	     erts_smp_proc_unlock(rp, rp_locks);
+	 if (rp != BIF_P)
 	     erts_smp_proc_dec_refc(rp);
-	 erts_smp_proc_unlock(rp, rp_locks);
 #endif
 	 /*
 	  * We may have exited ourselves and may have to take action.
@@ -3241,12 +3270,13 @@ BIF_RETTYPE ports_0(BIF_ALIST_0)
 
     erts_smp_mtx_lock(&ports_snapshot_mtx); /* One snapshot at a time */
 
-    erts_smp_atomic_set(&erts_dead_ports_ptr, (long) (port_buf + erts_max_ports));
+    erts_smp_atomic_set(&erts_dead_ports_ptr,
+			(erts_aint_t) (port_buf + erts_max_ports));
 
     next_ss = erts_smp_atomic_inctest(&erts_ports_snapshot);
 
     if (erts_smp_atomic_read(&erts_ports_alive) > 0) {
-	long i;
+	erts_aint_t i;
 	for (i = erts_max_ports-1; i >= 0; i--) {
 	    Port* prt = &erts_port[i];
 	    erts_smp_port_state_lock(prt);
@@ -3261,7 +3291,7 @@ BIF_RETTYPE ports_0(BIF_ALIST_0)
     }
 
     dead_ports = (Eterm*)erts_smp_atomic_xchg(&erts_dead_ports_ptr,
-					      (long)NULL);
+					      (erts_aint_t) NULL);
     erts_smp_mtx_unlock(&ports_snapshot_mtx);
 
     ASSERT(pp <= dead_ports);
@@ -3272,7 +3302,7 @@ BIF_RETTYPE ports_0(BIF_ALIST_0)
     ASSERT((alive+dead) <= erts_max_ports);
 
     if (alive+dead > 0) {
-	long i;
+	erts_aint_t i;
 	Eterm *hp = HAlloc(BIF_P, (alive+dead)*2);
 
 	for (i = 0; i < alive; i++) {
@@ -3583,11 +3613,11 @@ BIF_RETTYPE list_to_pid_1(BIF_ALIST_1)
 
       etp = (ExternalThing *) HAlloc(BIF_P, EXTERNAL_THING_HEAD_SIZE + 1);
       etp->header = make_external_pid_header(1);
-      etp->next = MSO(BIF_P).externals;
+      etp->next = MSO(BIF_P).first;
       etp->node = enp;
       etp->data.ui[0] = make_pid_data(c, b);
 
-      MSO(BIF_P).externals = etp;
+      MSO(BIF_P).first = (struct erl_off_heap_header*) etp;
       erts_deref_dist_entry(dep);
       BIF_RET(make_external_pid(etp));
     }
@@ -3768,7 +3798,8 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 	    goto error;
 	}
 	nval = (n > (Sint) ((Uint16) -1)) ? ((Uint16) -1) : ((Uint16) n);
-	oval = (Uint) erts_smp_atomic_xchg(&erts_max_gen_gcs, (long) nval);
+	oval = (Uint) erts_smp_atomic32_xchg(&erts_max_gen_gcs,
+					     (erts_aint32_t) nval);
 	BIF_RET(make_small(oval));
     } else if (BIF_ARG_1 == am_min_heap_size) {
 	int oval = H_MIN_SIZE;
@@ -4111,7 +4142,7 @@ void erts_init_bif(void)
 
     erts_smp_spinlock_init(&make_ref_lock, "make_ref");
     erts_smp_mtx_init(&ports_snapshot_mtx, "ports_snapshot");
-    erts_smp_atomic_init(&erts_dead_ports_ptr, (long)NULL);
+    erts_smp_atomic_init(&erts_dead_ports_ptr, (erts_aint_t) NULL);
 
     /*
      * bif_return_trap/1 is a hidden BIF that bifs that need to
diff --git a/erts/emulator/beam/bif.h b/erts/emulator/beam/bif.h
index 50f5f4fbd6..a84ee7bb23 100644
--- a/erts/emulator/beam/bif.h
+++ b/erts/emulator/beam/bif.h
@@ -135,7 +135,6 @@ do {							\
     (Proc)->arity = 1;					\
     (Proc)->def_arg_reg[0] = (Eterm) (A0);		\
     *((UWord *) (UWord) ((Proc)->def_arg_reg + 3)) = (UWord) ((Trap)->address);	\
-    (Proc)->def_arg_reg[3] = (UWord) ((Trap)->address);	\
     (Proc)->freason = TRAP;				\
     (Ret) = THE_NON_VALUE;				\
 } while (0)
@@ -146,7 +145,6 @@ do {							\
     (Proc)->def_arg_reg[0] = (Eterm) (A0);		\
     (Proc)->def_arg_reg[1] = (Eterm) (A1);		\
     *((UWord *) (UWord) ((Proc)->def_arg_reg + 3)) = (UWord) ((Trap)->address);	\
-    (Proc)->def_arg_reg[3] = (UWord) ((Trap)->address);	\
     (Proc)->freason = TRAP;				\
     (Ret) = THE_NON_VALUE;				\
 } while (0)
@@ -158,7 +156,6 @@ do {							\
     (Proc)->def_arg_reg[1] = (Eterm) (A1);		\
     (Proc)->def_arg_reg[2] = (Eterm) (A2);		\
     *((UWord *) (UWord) ((Proc)->def_arg_reg + 3)) = (UWord) ((Trap)->address);	\
-    (Proc)->def_arg_reg[3] = (UWord) ((Trap)->address);	\
     (Proc)->freason = TRAP;				\
     (Ret) = THE_NON_VALUE;				\
 } while (0)
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 38e2dd77d3..d9dd80fa8b 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -660,6 +660,7 @@ bif erts_debug:display/1
 bif 'erl.system.debug':display/1 ebif_erts_debug_display_1
 bif erts_debug:dist_ext_to_term/2
 bif 'erl.system.debug':dist_ext_to_term/2 ebif_erts_debug_dist_ext_to_term_2
+bif erts_debug:instructions/0
 
 #
 # Monitor testing bif's...
@@ -791,6 +792,16 @@ bif binary:encode_unsigned/2
 bif binary:decode_unsigned/1
 bif binary:decode_unsigned/2
 
+bif erlang:nif_error/1
+bif erlang:nif_error/2
+
+#
+# Helpers for unicode filenames
+#
+bif prim_file:internal_name2native/1
+bif prim_file:internal_native2name/1
+bif prim_file:internal_normalize_utf8/1
+bif file:native_name_encoding/0
 #
 # Obsolete
 #
diff --git a/erts/emulator/beam/big.c b/erts/emulator/beam/big.c
index 90d3a0304a..f47f5a9c0c 100644
--- a/erts/emulator/beam/big.c
+++ b/erts/emulator/beam/big.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -1509,14 +1509,14 @@ Eterm erts_uint64_to_big(Uint64 x, Eterm **hpp)
 	*hp = make_pos_bignum_header(2);
 	BIG_DIGIT(hp, 0) = (Uint) (x & ((Uint) 0xffffffff));
 	BIG_DIGIT(hp, 1) = (Uint) ((x >> 32) & ((Uint) 0xffffffff));
-	*hpp += 2;
+	*hpp += 3;
     }
     else
 #endif
     {
 	*hp = make_pos_bignum_header(1);
 	BIG_DIGIT(hp, 0) = (Uint) x;
-	*hpp += 1;
+	*hpp += 2;
     }
     return make_big(hp);
 }
@@ -1539,7 +1539,7 @@ Eterm erts_sint64_to_big(Sint64 x, Eterm **hpp)
 	    *hp = make_pos_bignum_header(2);
 	BIG_DIGIT(hp, 0) = (Uint) (x & ((Uint) 0xffffffff));
 	BIG_DIGIT(hp, 1) = (Uint) ((x >> 32) & ((Uint) 0xffffffff));
-	*hpp += 2;
+	*hpp += 3;
     }
     else
 #endif
@@ -1549,7 +1549,7 @@ Eterm erts_sint64_to_big(Sint64 x, Eterm **hpp)
 	else
 	    *hp = make_pos_bignum_header(1);
 	BIG_DIGIT(hp, 0) = (Uint) x;
-	*hpp += 1;
+	*hpp += 2;
     }
     return make_big(hp);
 }
@@ -1558,7 +1558,7 @@ Eterm erts_sint64_to_big(Sint64 x, Eterm **hpp)
 ** Convert a bignum to a double float
 */
 int
-big_to_double(Eterm x, double* resp)
+big_to_double(Wterm x, double* resp)
 {
     double d = 0.0;
     Eterm* xp = big_val(x);
@@ -1725,7 +1725,7 @@ static Eterm big_norm(Eterm *x, dsize_t xl, short sign)
 /*
 ** Compare bignums
 */
-int big_comp(Eterm x, Eterm y)
+int big_comp(Wterm x, Wterm y)
 {
     Eterm* xp = big_val(x);
     Eterm* yp = big_val(y);
@@ -1881,6 +1881,9 @@ term_to_Uint(Eterm term, Uint *up)
 int
 term_to_UWord(Eterm term, UWord *up)
 {
+#if SIZEOF_VOID_P == ERTS_SIZEOF_ETERM
+    return term_to_Uint(term,up);
+#else
     if (is_small(term)) {
 	Sint i = signed_val(term);
 	if (i < 0) {
@@ -1903,7 +1906,47 @@ term_to_UWord(Eterm term, UWord *up)
 	    return 0;
 	}
 	while (xl-- > 0) {
-	    uval |= ((Uint)(*xr++)) << n;
+	    uval |= ((UWord)(*xr++)) << n;
+	    n += D_EXP;
+	}
+	*up = uval;
+	return 1;
+    } else {
+	*up = BADARG;
+	return 0;
+    }
+#endif
+}
+
+int
+term_to_Uint64(Eterm term, Uint64 *up)
+{
+#if SIZEOF_VOID_P == 8
+    return term_to_UWord(term,up);
+#else
+    if (is_small(term)) {
+	Sint i = signed_val(term);
+	if (i < 0) {
+	    *up = BADARG;
+	    return 0;
+	}
+	*up = (Uint64) i;
+	return 1;
+    } else if (is_big(term)) {
+	ErtsDigit* xr = big_v(term);
+	dsize_t  xl = big_size(term);
+	Uint64 uval = 0;
+	int n = 0;
+
+	if (big_sign(term)) {
+	    *up = BADARG;
+	    return 0;
+	} else if (xl*D_EXP > sizeof(Uint64)*8) {
+	    *up = SYSTEM_LIMIT;
+	    return 0;
+	}
+	while (xl-- > 0) {
+	    uval |= ((Uint64)(*xr++)) << n;
 	    n += D_EXP;
 	}
 	*up = uval;
@@ -1912,8 +1955,10 @@ term_to_UWord(Eterm term, UWord *up)
 	*up = BADARG;
 	return 0;
     }
+#endif
 }
 
+
 int term_to_Sint(Eterm term, Sint *sp)
 {
     if (is_small(term)) {
@@ -1948,6 +1993,47 @@ int term_to_Sint(Eterm term, Sint *sp)
     }
 }
 
+#if HAVE_INT64
+int term_to_Sint64(Eterm term, Sint64 *sp)
+{
+#if ERTS_SIZEOF_ETERM == 8
+    return term_to_Sint(term, sp);
+#else
+    if (is_small(term)) {
+	*sp = signed_val(term);
+	return 1;
+    } else if (is_big(term)) {
+	ErtsDigit* xr = big_v(term);
+	dsize_t xl = big_size(term);
+	int sign = big_sign(term);
+	Uint64 uval = 0;
+	int n = 0;
+
+	if (xl*D_EXP > sizeof(Uint64)*8) {
+	    return 0;
+	}
+	while (xl-- > 0) {
+	    uval |= ((Uint64)(*xr++)) << n;
+	    n += D_EXP;
+	}
+	if (sign) {
+	    uval = -uval;
+	    if ((Sint64)uval > 0)
+		return 0;
+	} else {
+	    if ((Sint64)uval < 0)
+		return 0;
+	}
+	*sp = uval;
+	return 1;
+    } else {
+	return 0;
+    }
+#endif
+}
+#endif /* HAVE_INT64 */
+
+
 /*
 ** Add and subtract
 */
@@ -1974,7 +2060,7 @@ static Eterm B_plus_minus(ErtsDigit *x, dsize_t xl, short xsgn,
 /*
 ** Add bignums
 */
-Eterm big_plus(Eterm x, Eterm y, Eterm *r)
+Eterm big_plus(Wterm x, Wterm y, Eterm *r)
 {
     Eterm* xp = big_val(x);
     Eterm* yp = big_val(y);
diff --git a/erts/emulator/beam/big.h b/erts/emulator/beam/big.h
index 56f3be372a..f28a390aea 100644
--- a/erts/emulator/beam/big.h
+++ b/erts/emulator/beam/big.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -120,7 +120,7 @@ char *erts_big_to_string(Eterm x, char *buf, Uint buf_sz);
 
 Eterm small_times(Sint, Sint, Eterm*);
 
-Eterm big_plus(Eterm, Eterm, Eterm*);
+Eterm big_plus(Wterm, Wterm, Eterm*);
 Eterm big_minus(Eterm, Eterm, Eterm*);
 Eterm big_times(Eterm, Eterm, Eterm*);
 Eterm big_div(Eterm, Eterm, Eterm*);
@@ -137,9 +137,9 @@ Eterm big_bxor(Eterm, Eterm, Eterm*);
 Eterm big_bnot(Eterm, Eterm*);
 
 Eterm big_lshift(Eterm, Sint, Eterm*);
-int big_comp (Eterm, Eterm);
+int big_comp (Wterm, Wterm);
 int big_ucomp (Eterm, Eterm);
-int big_to_double(Eterm x, double* resp);
+int big_to_double(Wterm x, double* resp);
 Eterm small_to_big(Sint, Eterm*);
 Eterm uint_to_big(Uint, Eterm*);
 Eterm uword_to_big(UWord, Eterm*);
@@ -152,6 +152,10 @@ byte* big_to_bytes(Eterm, byte*);
 int term_to_Uint(Eterm, Uint*);
 int term_to_UWord(Eterm, UWord*);
 int term_to_Sint(Eterm, Sint*);
+#if HAVE_INT64
+int term_to_Uint64(Eterm, Uint64*);
+int term_to_Sint64(Eterm, Sint64*);
+#endif
 
 Uint32 big_to_uint32(Eterm b);
 int term_equals_2pow32(Eterm);
diff --git a/erts/emulator/beam/binary.c b/erts/emulator/beam/binary.c
index c68392fad4..4be869f269 100644
--- a/erts/emulator/beam/binary.c
+++ b/erts/emulator/beam/binary.c
@@ -88,8 +88,8 @@ new_binary(Process *p, byte *buf, int len)
     pb = (ProcBin *) HAlloc(p, PROC_BIN_SIZE);
     pb->thing_word = HEADER_PROC_BIN;
     pb->size = len;
-    pb->next = MSO(p).mso;
-    MSO(p).mso = pb;
+    pb->next = MSO(p).first;
+    MSO(p).first = (struct erl_off_heap_header*)pb;
     pb->val = bptr;
     pb->bytes = (byte*) bptr->orig_bytes;
     pb->flags = 0;
@@ -97,7 +97,7 @@ new_binary(Process *p, byte *buf, int len)
     /*
      * Miscellanous updates. Return the tagged binary.
      */
-    MSO(p).overhead += pb->size / sizeof(Eterm);
+    OH_OVERHEAD(&(MSO(p)), pb->size / sizeof(Eterm));
     return make_binary(pb);
 }
 
@@ -127,8 +127,8 @@ Eterm erts_new_mso_binary(Process *p, byte *buf, int len)
     pb = (ProcBin *) HAlloc(p, PROC_BIN_SIZE);
     pb->thing_word = HEADER_PROC_BIN;
     pb->size = len;
-    pb->next = MSO(p).mso;
-    MSO(p).mso = pb;
+    pb->next = MSO(p).first;
+    MSO(p).first = (struct erl_off_heap_header*)pb;
     pb->val = bptr;
     pb->bytes = (byte*) bptr->orig_bytes;
     pb->flags = 0;
@@ -136,7 +136,7 @@ Eterm erts_new_mso_binary(Process *p, byte *buf, int len)
     /*
      * Miscellanous updates. Return the tagged binary.
      */
-    MSO(p).overhead += pb->size / sizeof(Eterm);
+    OH_OVERHEAD(&(MSO(p)), pb->size / sizeof(Eterm));
     return make_binary(pb);
 }
 
@@ -217,8 +217,8 @@ erts_get_aligned_binary_bytes_extra(Eterm bin, byte** base_ptr, ErtsAlcType_t al
     return bytes;
 }
 
-static Eterm
-bin_bytes_to_list(Eterm previous, Eterm* hp, byte* bytes, Uint size, Uint bitoffs)
+Eterm
+erts_bin_bytes_to_list(Eterm previous, Eterm* hp, byte* bytes, Uint size, Uint bitoffs)
 {
     if (bitoffs == 0) {
 	while (size) {
@@ -263,7 +263,7 @@ BIF_RETTYPE binary_to_list_1(BIF_ALIST_1)
 	Eterm* hp = HAlloc(BIF_P, 2 * size);
 	byte* bytes = binary_bytes(real_bin)+offset;
 
-	BIF_RET(bin_bytes_to_list(NIL, hp, bytes, size, bitoffs));
+	BIF_RET(erts_bin_bytes_to_list(NIL, hp, bytes, size, bitoffs));
     }
 
     error:
@@ -295,7 +295,7 @@ BIF_RETTYPE binary_to_list_3(BIF_ALIST_3)
     }
     i = stop-start+1;
     hp = HAlloc(BIF_P, 2*i);
-    BIF_RET(bin_bytes_to_list(NIL, hp, bytes+start-1, i, bitoffs));
+    BIF_RET(erts_bin_bytes_to_list(NIL, hp, bytes+start-1, i, bitoffs));
     
     error:
 	BIF_ERROR(BIF_P, BADARG);
@@ -339,7 +339,7 @@ BIF_RETTYPE bitstring_to_list_1(BIF_ALIST_1)
 	previous = CONS(hp, make_binary(last), previous);
 	hp += 2;
     }
-    BIF_RET(bin_bytes_to_list(previous, hp, bytes, size, bitoffs));
+    BIF_RET(erts_bin_bytes_to_list(previous, hp, bytes, size, bitoffs));
 }
 
 
@@ -487,16 +487,6 @@ BIF_RETTYPE split_binary_2(BIF_ALIST_2)
 	BIF_ERROR(BIF_P, BADARG);
 }
 
-void
-erts_cleanup_mso(ProcBin* pb)
-{
-    while (pb != NULL) {
-	ProcBin* next = pb->next;
-	if (erts_refc_dectest(&pb->val->refc, 0) == 0)
-	    erts_bin_free(pb->val);
-	pb = next;
-    }
-}
 
 /*
  * Local functions.
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 857cb177c8..d255cf3558 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -98,7 +98,7 @@ process_killer(void)
 		switch(j) {
 		case 'k':
 		    if (rp->status == P_WAITING) {
-			Uint32 rp_locks = ERTS_PROC_LOCKS_XSIG_SEND;
+			ErtsProcLocks rp_locks = ERTS_PROC_LOCKS_XSIG_SEND;
 			erts_smp_proc_inc_refc(rp);
 			erts_smp_proc_lock(rp, rp_locks);
 			(void) erts_send_exit_signal(NULL,
@@ -558,7 +558,7 @@ do_break(void)
 #endif
 #ifdef DEBUG
 	case 't':
-	    p_slpq();
+	    erts_p_slpq();
 	    return;
 	case 'b':
 	    bin_check();
@@ -611,29 +611,29 @@ static void
 bin_check(void)
 {
     Process  *rp;
-    ProcBin *bp;
-    int i, printed;
+    struct erl_off_heap_header* hdr;
+    int i, printed = 0;
 
     for (i=0; i < erts_max_processes; i++) {
 	if ((rp = process_tab[i]) == NULL)
 	    continue;
-	if (!(bp = rp->off_heap.mso))
-	    continue;
-	printed = 0;
-	while (bp) {
-	    if (printed == 0) {
-		erts_printf("Process %T holding binary data \n", rp->id);
-		printed = 1;
+	for (hdr = rp->off_heap.first; hdr; hdr = hdr->next) {
+	    if (hdr->thing_word == HEADER_PROC_BIN) {
+		ProcBin *bp = (ProcBin*) hdr;
+		if (!printed) {
+		    erts_printf("Process %T holding binary data \n", rp->id);
+		    printed = 1;
+		}
+		erts_printf("%p orig_size: %bpd, norefs = %bpd\n",
+			    bp->val, 
+			    bp->val->orig_size, 
+			    erts_smp_atomic_read(&bp->val->refc));
 	    }
-	    erts_printf("0x%08lx orig_size: %ld, norefs = %ld\n",
-		       (unsigned long)bp->val, 
-		       (long)bp->val->orig_size, 
-		       erts_smp_atomic_read(&bp->val->refc));
-
-	    bp = bp->next;
 	}
-	if (printed == 1)
+	if (printed) {
 	    erts_printf("--------------------------------------\n");
+	    printed = 0;
+	}
     }
     /* db_bin_check() has to be rewritten for the AVL trees... */
     /*db_bin_check();*/ 
diff --git a/erts/emulator/beam/copy.c b/erts/emulator/beam/copy.c
index 521a1b1788..243e8973cf 100644
--- a/erts/emulator/beam/copy.c
+++ b/erts/emulator/beam/copy.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -72,8 +72,11 @@ copy_object(Eterm obj, Process* to)
  * Return the "flat" size of the object.
  */
 
-Uint
-size_object(Eterm obj)
+#if HALFWORD_HEAP
+Uint size_object_rel(Eterm obj, Eterm* base)
+#else
+Uint size_object(Eterm obj)
+#endif
 {
     Uint sum = 0;
     Eterm* ptr;
@@ -84,7 +87,7 @@ size_object(Eterm obj)
 	switch (primary_tag(obj)) {
 	case TAG_PRIMARY_LIST:
 	    sum += 2;
-	    ptr = list_val(obj);
+	    ptr = list_val_rel(obj,base);
 	    obj = *ptr++;
 	    if (!IS_CONST(obj)) {
 		ESTACK_PUSH(s, obj);
@@ -93,11 +96,11 @@ size_object(Eterm obj)
 	    break;
 	case TAG_PRIMARY_BOXED:
 	    {
-		Eterm hdr = *boxed_val(obj);
+		Eterm hdr = *boxed_val_rel(obj,base);
 		ASSERT(is_header(hdr));
 		switch (hdr & _TAG_HEADER_MASK) {
 		case ARITYVAL_SUBTAG:
-		    ptr = tuple_val(obj);
+		    ptr = tuple_val_rel(obj,base);
 		    arity = header_arity(hdr);
 		    sum += arity + 1;
 		    if (arity == 0) { /* Empty tuple -- unusual. */
@@ -113,7 +116,7 @@ size_object(Eterm obj)
 		    break;
 		case FUN_SUBTAG:
 		    {
-			Eterm* bptr = fun_val(obj);
+			Eterm* bptr = fun_val_rel(obj,base);
 			ErlFunThing* funp = (ErlFunThing *) bptr;
 			unsigned eterms = 1 /* creator */ + funp->num_free;
 			unsigned sz = thing_arityval(hdr);
@@ -136,7 +139,7 @@ size_object(Eterm obj)
 			Uint bitoffs;
 			Uint extra_bytes;
 			Eterm hdr;
-			ERTS_GET_REAL_BIN(obj, real_bin, offset, bitoffs, bitsize);
+			ERTS_GET_REAL_BIN_REL(obj, real_bin, offset, bitoffs, bitsize, base);
 			if ((bitsize + bitoffs) > 8) {
 			    sum += ERL_SUB_BIN_SIZE;
 			    extra_bytes = 2;
@@ -146,11 +149,11 @@ size_object(Eterm obj)
 			} else {
 			    extra_bytes = 0;
 			}
-			hdr = *binary_val(real_bin);
+			hdr = *binary_val_rel(real_bin,base);
 			if (thing_subtag(hdr) == REFC_BINARY_SUBTAG) {
 			    sum += PROC_BIN_SIZE;
 			} else {
-			    sum += heap_bin_size(binary_size(obj)+extra_bytes);
+			    sum += heap_bin_size(binary_size_rel(obj,base)+extra_bytes);
 			}
 			goto pop_next;
 		    }
@@ -181,8 +184,12 @@ size_object(Eterm obj)
 /*
  *  Copy a structure to a heap.
  */
-Eterm
-copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
+#if HALFWORD_HEAP
+Eterm copy_struct_rel(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap,
+                      Eterm* src_base, Eterm* dst_base)
+#else
+Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
+#endif
 {
     char* hstart;
     Uint hsize;
@@ -214,7 +221,10 @@ copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 
     /* Copy the object onto the heap */
     switch (primary_tag(obj)) {
-    case TAG_PRIMARY_LIST: argp = &res; goto L_copy_list;
+    case TAG_PRIMARY_LIST:
+	argp = &res;
+	objp = list_val_rel(obj,src_base);
+	goto L_copy_list;
     case TAG_PRIMARY_BOXED: argp = &res; goto L_copy_boxed;
     default:
 	erl_exit(ERTS_ABORT_EXIT,
@@ -231,32 +241,46 @@ copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 	    hp++;
 	    break;
 	case TAG_PRIMARY_LIST:
-	    objp = list_val(obj);
+	    objp = list_val_rel(obj,src_base);
+	#if !HALFWORD_HEAP || defined(DEBUG)
 	    if (in_area(objp,hstart,hsize)) {
+		ASSERT(!HALFWORD_HEAP);
 		hp++;
 		break;
 	    }
+	#endif
 	    argp = hp++;
 	    /* Fall through */
 
 	L_copy_list:
 	    tailp = argp;
-	    while (is_list(obj)) {
-		objp = list_val(obj);
+	    for (;;) {
 		tp = tailp;
-		elem = *objp;
+		elem = CAR(objp);
 		if (IS_CONST(elem)) {
-		    *(hbot-2) = elem;
-		    tailp = hbot-1;
 		    hbot -= 2;
+		    CAR(hbot) = elem;
+		    tailp = &CDR(hbot);
 		}
 		else {
-		    *htop = elem;
-		    tailp = htop+1;
+		    CAR(htop) = elem;
+		#if HALFWORD_HEAP
+		    CDR(htop) = CDR(objp);
+		    *tailp = make_list_rel(htop,dst_base);
+		    htop += 2;
+		    goto L_copy;
+		#else
+		    tailp = &CDR(htop);
 		    htop += 2;
+		#endif
 		}
-		*tp = make_list(tailp - 1);
-		obj = *(objp+1);
+		ASSERT(!HALFWORD_HEAP || tp < hp || tp >= hbot);
+		*tp = make_list_rel(tailp - 1, dst_base);
+		obj = CDR(objp);
+		if (!is_list(obj)) {
+		    break;
+		}
+		objp = list_val_rel(obj,src_base);
 	    }
 	    switch (primary_tag(obj)) {
 	    case TAG_PRIMARY_IMMED1: *tailp = obj; goto L_copy;
@@ -268,21 +292,24 @@ copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 	    }
 	    
 	case TAG_PRIMARY_BOXED:
-	    if (in_area(boxed_val(obj),hstart,hsize)) {
+	#if !HALFWORD_HEAP || defined(DEBUG)
+	    if (in_area(boxed_val_rel(obj,src_base),hstart,hsize)) {
+		ASSERT(!HALFWORD_HEAP);
 		hp++;
 		break;
 	    }
+	#endif
 	    argp = hp++;
 
 	L_copy_boxed:
-	    objp = boxed_val(obj);
+	    objp = boxed_val_rel(obj, src_base);
 	    hdr = *objp;
 	    switch (hdr & _TAG_HEADER_MASK) {
 	    case ARITYVAL_SUBTAG:
 		{
 		    int const_flag = 1; /* assume constant tuple */
 		    i = arityval(hdr);
-		    *argp = make_tuple(htop);
+		    *argp = make_tuple_rel(htop, dst_base);
 		    tp = htop;	/* tp is pointer to new arity value */
 		    *htop++ = *objp++; /* copy arity value */
 		    while (i--) {
@@ -311,13 +338,13 @@ copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		    while (i--)  {
 			*tp++ = *objp++;
 		    }
-		    *argp = make_binary(hbot);
+		    *argp = make_binary_rel(hbot, dst_base);
 		    pb = (ProcBin*) hbot;
 		    erts_refc_inc(&pb->val->refc, 2);
-		    pb->next = off_heap->mso;
+		    pb->next = off_heap->first;
 		    pb->flags = 0;
-		    off_heap->mso = pb;
-		    off_heap->overhead += pb->size / sizeof(Eterm);
+		    off_heap->first = (struct erl_off_heap_header*) pb;
+		    OH_OVERHEAD(off_heap, pb->size / sizeof(Eterm));
 		}
 		break;
 	    case SUB_BINARY_SUBTAG:
@@ -338,7 +365,7 @@ copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 			extra_bytes = 0;
 		    } 
 		    real_size = size+extra_bytes;
-		    objp = binary_val(real_bin);
+		    objp = binary_val_rel(real_bin,src_base);
 		    if (thing_subtag(*objp) == HEAP_BINARY_SUBTAG) {
 			ErlHeapBin* from = (ErlHeapBin *) objp;
 			ErlHeapBin* to;
@@ -363,12 +390,12 @@ copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 			to->val = from->val;
 			erts_refc_inc(&to->val->refc, 2);
 			to->bytes = from->bytes + offset;
-			to->next = off_heap->mso;
+			to->next = off_heap->first;
 			to->flags = 0;
-			off_heap->mso = to;
-			off_heap->overhead += to->size / sizeof(Eterm);
+			off_heap->first = (struct erl_off_heap_header*) to;
+			OH_OVERHEAD(off_heap, to->size / sizeof(Eterm));
 		    }
-		    *argp = make_binary(hbot);
+		    *argp = make_binary_rel(hbot, dst_base);
 		    if (extra_bytes != 0) {
 			ErlSubBin* res;
 			hbot -= ERL_SUB_BIN_SIZE;
@@ -380,7 +407,7 @@ copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 			res->offs = 0;
 			res->is_writable = 0;
 			res->orig = *argp;
-			*argp = make_binary(hbot);
+			*argp = make_binary_rel(hbot, dst_base);
 		    }
 		    break;
 		}
@@ -396,11 +423,11 @@ copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		    }
 #ifndef HYBRID /* FIND ME! */
 		    funp = (ErlFunThing *) tp;
-		    funp->next = off_heap->funs;
-		    off_heap->funs = funp;
+		    funp->next = off_heap->first;
+		    off_heap->first = (struct erl_off_heap_header*) funp;
 		    erts_refc_inc(&funp->fe->refc, 2);
 #endif
-		    *argp = make_fun(tp);
+		    *argp = make_fun_rel(tp, dst_base);
 		}
 		break;
 	    case EXTERNAL_PID_SUBTAG:
@@ -416,11 +443,11 @@ copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		    *htop++ = *objp++;
 		  }
 
-		  etp->next = off_heap->externals;
-		  off_heap->externals = etp;
+		  etp->next = off_heap->first;
+		  off_heap->first = (struct erl_off_heap_header*)etp;
 		  erts_refc_inc(&etp->node->refc, 2);
 
-		  *argp = make_external(tp);
+		  *argp = make_external_rel(tp, dst_base);
 		}
 		break;
 	    case BIN_MATCHSTATE_SUBTAG:
@@ -430,7 +457,7 @@ copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		i = thing_arityval(hdr)+1;
 		hbot -= i;
 		tp = hbot;
-		*argp = make_boxed(hbot);
+		*argp = make_boxed_rel(hbot, dst_base);
 		while (i--) {
 		    *tp++ = *objp++;
 		}
@@ -650,9 +677,9 @@ Eterm copy_struct_lazy(Process *from, Eterm orig, Uint offs)
                     *hp++ = *objp++;
                 }
                 erts_refc_inc(&pb->val->refc, 2);
-                pb->next = erts_global_offheap.mso;
-                erts_global_offheap.mso = pb;
-                erts_global_offheap.overhead += pb->size / sizeof(Eterm);
+                pb->next = erts_global_offheap.first;
+                erts_global_offheap.first = pb;
+		OH_OVERHEAD(off_heap, pb->size / sizeof(Eterm));
                 continue;
             }
 
@@ -672,9 +699,9 @@ Eterm copy_struct_lazy(Process *from, Eterm orig, Uint offs)
                 while (i--) {
                     *hp++ = *objp++;
                 }
-#ifndef HYBRID // FIND ME!
-                funp->next = erts_global_offheap.funs;
-                erts_global_offheap.funs = funp;
+#ifndef HYBRID /* FIND ME! */
+                funp->next = erts_global_offheap.first;
+                erts_global_offheap.first = funp;
                 erts_refc_inc(&funp->fe->refc, 2);
 #endif
                 for (i = k; i < j; i++) {
@@ -718,8 +745,8 @@ Eterm copy_struct_lazy(Process *from, Eterm orig, Uint offs)
                     *hp++ = *objp++;
                 }
 
-                etp->next = erts_global_offheap.externals;
-                erts_global_offheap.externals = etp;
+                etp->next = erts_global_offheap.first;
+                erts_global_offheap.first = etp;
 		erts_refc_inc(&etp->node->refc, 2);
                 continue;
             }
@@ -775,9 +802,9 @@ Eterm copy_struct_lazy(Process *from, Eterm orig, Uint offs)
                     to_bin->size = real_size;
                     to_bin->val = from_bin->val;
                     to_bin->bytes = from_bin->bytes + sub_offset;
-                    to_bin->next = erts_global_offheap.mso;
-                    erts_global_offheap.mso = to_bin;
-                    erts_global_offheap.overhead += to_bin->size / sizeof(Eterm);
+                    to_bin->next = erts_global_offheap.first;
+                    erts_global_offheap.first = to_bin;
+		    OH_OVERHEAD(&erts_global_offheap, to_bin->size / sizeof(Eterm));
 		    res_binary=make_binary(to_bin);
 		    hp += PROC_BIN_SIZE;
                 }
@@ -885,12 +912,21 @@ Eterm copy_struct_lazy(Process *from, Eterm orig, Uint offs)
  *
  * NOTE: Assumes that term is a tuple (ptr is an untagged tuple ptr).
  */
-Eterm
-copy_shallow(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
+#if HALFWORD_HEAP
+Eterm copy_shallow_rel(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap,
+		       Eterm* src_base)
+#else
+Eterm copy_shallow(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
+#endif
 {
     Eterm* tp = ptr;
     Eterm* hp = *hpp;
-    Sint offs = hp - tp;
+    const Eterm res = make_tuple(hp);
+#if HALFWORD_HEAP
+    const Sint offs = COMPRESS_POINTER(hp - (tp - src_base));
+#else
+    const Sint offs = (hp - tp) * sizeof(Eterm);
+#endif
 
     while (sz--) {
 	Eterm val = *tp++;
@@ -901,7 +937,7 @@ copy_shallow(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 	    break;
 	case TAG_PRIMARY_LIST:
 	case TAG_PRIMARY_BOXED:
-	    *hp++ = offset_ptr(val, offs);
+	    *hp++ = byte_offset_ptr(val, offs);
 	    break;
 	case TAG_PRIMARY_HEADER:
 	    *hp++ = val;
@@ -910,57 +946,43 @@ copy_shallow(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		break;
 	    case REFC_BINARY_SUBTAG:
 		{
-		    ProcBin* pb = (ProcBin *) (hp-1);
-		    int tari = thing_arityval(val);
-
-		    sz -= tari;
-		    while (tari--) {
-			*hp++ = *tp++;
-		    }
+		    ProcBin* pb = (ProcBin *) (tp-1);
 		    erts_refc_inc(&pb->val->refc, 2);
-		    pb->next = off_heap->mso;
-		    off_heap->mso = pb;
-		    off_heap->overhead += pb->size / sizeof(Eterm);
+		    OH_OVERHEAD(off_heap, pb->size / sizeof(Eterm));
 		}
-		break;
+		goto off_heap_common;
+
 	    case FUN_SUBTAG:
 		{
-#ifndef HYBRID /* FIND ME! */
-		    ErlFunThing* funp = (ErlFunThing *) (hp-1);
-#endif
-		    int tari = thing_arityval(val);
-
-		    sz -= tari;
-		    while (tari--) {
-			*hp++ = *tp++;
-		    }
-#ifndef HYBRID /* FIND ME! */
-		    funp->next = off_heap->funs;
-		    off_heap->funs = funp;
+		    ErlFunThing* funp = (ErlFunThing *) (tp-1);
 		    erts_refc_inc(&funp->fe->refc, 2);
-#endif
 		}
-		break;
+		goto off_heap_common;
+
 	    case EXTERNAL_PID_SUBTAG:
 	    case EXTERNAL_PORT_SUBTAG:
 	    case EXTERNAL_REF_SUBTAG:
 		{
-		    ExternalThing* etp = (ExternalThing *) (hp-1);
+		    ExternalThing* etp = (ExternalThing *) (tp-1);
+		    erts_refc_inc(&etp->node->refc, 2);
+		}
+	    off_heap_common:
+		{
+		    struct erl_off_heap_header* ohh = (struct erl_off_heap_header*)(hp-1);
 		    int tari = thing_arityval(val);
-
+		    
 		    sz -= tari;
 		    while (tari--) {
 			*hp++ = *tp++;
 		    }
-		    etp->next = off_heap->externals;
-		    off_heap->externals = etp;
-		    erts_refc_inc(&etp->node->refc, 2);
+		    ohh->next = off_heap->first;
+		    off_heap->first = ohh;
 		}
 		break;
 	    default:
 		{
 		    int tari = header_arity(val);
-
+    
 		    sz -= tari;
 		    while (tari--) {
 			*hp++ = *tp++;
@@ -972,7 +994,8 @@ copy_shallow(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 	}
     }
     *hpp = hp;
-    return make_tuple(ptr + offs); 
+
+    return res;
 }
 
 /* Move all terms in heap fragments into heap. The terms must be guaranteed to 
@@ -991,7 +1014,7 @@ void move_multi_frags(Eterm** hpp, ErlOffHeap* off_heap, ErlHeapFragment* first,
 
     for (bp=first; bp!=NULL; bp=bp->next) {
 	move_one_frag(hpp, bp->mem, bp->used_size, off_heap);
-	off_heap->overhead += bp->off_heap.overhead;
+	OH_OVERHEAD(off_heap, bp->off_heap.overhead);
     }
     hp_end = *hpp;
     for (hp=hp_start; hp<hp_end; ++hp) {
@@ -1029,12 +1052,6 @@ void move_multi_frags(Eterm** hpp, ErlOffHeap* off_heap, ErlHeapFragment* first,
 static void
 move_one_frag(Eterm** hpp, Eterm* src, Uint src_sz, ErlOffHeap* off_heap)
 {
-    union {
-	Uint *up;
-	ProcBin *pbp;
-	ErlFunThing *efp;
-	ExternalThing *etp;
-    } ohe;
     Eterm* ptr = src;
     Eterm* end = ptr + src_sz;
     Eterm dummy_ref;
@@ -1046,23 +1063,17 @@ move_one_frag(Eterm** hpp, Eterm* src, Uint src_sz, ErlOffHeap* off_heap)
 	val = *ptr;
 	ASSERT(val != ERTS_HOLE_MARKER);
 	if (is_header(val)) {
+	    struct erl_off_heap_header* hdr = (struct erl_off_heap_header*)hp;
 	    ASSERT(ptr + header_arity(val) < end);
-	    ohe.up = hp;
 	    MOVE_BOXED(ptr, val, hp, &dummy_ref);	    
 	    switch (val & _HEADER_SUBTAG_MASK) {
 	    case REFC_BINARY_SUBTAG:
-		ohe.pbp->next = off_heap->mso;
-		off_heap->mso = ohe.pbp;
-		break;
 	    case FUN_SUBTAG:
-		ohe.efp->next = off_heap->funs;
-		off_heap->funs = ohe.efp;
-		break;
 	    case EXTERNAL_PID_SUBTAG:
 	    case EXTERNAL_PORT_SUBTAG:
 	    case EXTERNAL_REF_SUBTAG:
-		ohe.etp->next = off_heap->externals;
-		off_heap->externals = ohe.etp;
+		hdr->next = off_heap->first;
+		off_heap->first = hdr;
 		break;
 	    }
 	}
diff --git a/erts/emulator/beam/decl.h b/erts/emulator/beam/decl.h
deleted file mode 100644
index da1be29d53..0000000000
--- a/erts/emulator/beam/decl.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1996-2009. 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%
- */
-
-#ifndef __DECL_H__
-#define __DECL_H__
-
-#if defined(__STDC__) || defined(_MSC_VER)
-#define EXTERN_FUNCTION(t, f, x)  extern t f x
-#define FUNCTION(t, f, x) t f x
-#define _DOTS_ ...
-#define _VOID_      void
-#elif defined(__cplusplus)
-#define EXTERN_FUNCTION(f, x) extern "C" { f x }
-#define FUNCTION(t, f, x) t f x
-#define _DOTS_ ...
-#define _VOID_    void
-#else
-#define EXTERN_FUNCTION(t, f, x) extern t f (/*x*/)
-#define FUNCTION(t, f, x) t f (/*x*/)
-#define _DOTS_
-#define _VOID_
-#endif
-
-/*
-** Example of declarations
-**
-** EXTERN_FUNCTION(void, foo, (int, int, char));
-** FUNCTION(void, bar, (int, char));
-**
-** struct funcs {
-**    FUNCTION(int*, (*f1), (int, int));
-**    FUNCTION(void, (*f2), (int, char));
-**    FUNCTION(void, (*f3), (_VOID_));
-**    FUNCTION(int,  (*f4), (char*, _DOTS_));
-** };
-**
-*/
-
-#endif
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index d465017949..02910fad90 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -97,6 +97,8 @@ dist_msg_dbg(ErtsDistExternal *edep, char *what, byte *buf, int sz)
 #define PASS_THROUGH 'p'        /* This code should go */
 
 int erts_is_alive; /* System must be blocked on change */
+int erts_dist_buf_busy_limit;
+
 
 /* distribution trap functions */
 Export* dsend2_trap = NULL;
@@ -160,7 +162,7 @@ Uint erts_dist_cache_size(void)
 static ErtsProcList *
 get_suspended_on_de(DistEntry *dep, Uint32 unset_qflgs)
 {
-    ERTS_SMP_LC_ASSERT(erts_smp_lc_spinlock_is_locked(&dep->qlock));
+    ERTS_SMP_LC_ASSERT(erts_smp_lc_mtx_is_locked(&dep->qlock));
     dep->qflgs &= ~unset_qflgs;
     if (dep->qflgs & ERTS_DE_QFLG_EXIT) {
 	/* No resume when exit has been scheduled */
@@ -453,17 +455,17 @@ int erts_do_net_exits(DistEntry *dep, Eterm reason)
 
 	if (dep->status & ERTS_DE_SFLG_EXITING) {
 #ifdef DEBUG
-	    erts_smp_spin_lock(&dep->qlock);
+	    erts_smp_mtx_lock(&dep->qlock);
 	    ASSERT(dep->qflgs & ERTS_DE_QFLG_EXIT);
-	    erts_smp_spin_unlock(&dep->qlock);
+	    erts_smp_mtx_unlock(&dep->qlock);
 #endif
 	}
 	else {
 	    dep->status |= ERTS_DE_SFLG_EXITING;
-	    erts_smp_spin_lock(&dep->qlock);
+	    erts_smp_mtx_lock(&dep->qlock);
 	    ASSERT(!(dep->qflgs & ERTS_DE_QFLG_EXIT));
 	    dep->qflgs |= ERTS_DE_QFLG_EXIT;
-	    erts_smp_spin_unlock(&dep->qlock);
+	    erts_smp_mtx_unlock(&dep->qlock);
 	}
 
 	erts_smp_de_links_lock(dep);
@@ -577,7 +579,7 @@ static void clear_dist_entry(DistEntry *dep)
     erts_smp_de_links_unlock(dep);
 #endif
 
-    erts_smp_spin_lock(&dep->qlock);
+    erts_smp_mtx_lock(&dep->qlock);
 
     if (!dep->out_queue.last)
 	obuf = dep->finalized_out_queue.first;
@@ -593,7 +595,7 @@ static void clear_dist_entry(DistEntry *dep)
     dep->status = 0;
     suspendees = get_suspended_on_de(dep, ERTS_DE_QFLGS_ALL);
 
-    erts_smp_spin_unlock(&dep->qlock);
+    erts_smp_mtx_unlock(&dep->qlock);
     erts_smp_atomic_set(&dep->dist_cmd_scheduled, 0);
     dep->send = NULL;
     erts_smp_de_rwunlock(dep);
@@ -611,10 +613,10 @@ static void clear_dist_entry(DistEntry *dep)
     }
 
     if (obufsize) {
-	erts_smp_spin_lock(&dep->qlock);
+	erts_smp_mtx_lock(&dep->qlock);
 	ASSERT(dep->qsize >= obufsize);
 	dep->qsize -= obufsize;
-	erts_smp_spin_unlock(&dep->qlock);
+	erts_smp_mtx_unlock(&dep->qlock);
     }
 }
 
@@ -915,6 +917,7 @@ int erts_net_message(Port *prt,
     Eterm token_size;
     ErtsMonitor *mon;
     ErtsLink *lnk;
+    Uint tuple_arity;
     int res;
 #ifdef ERTS_DIST_MSG_DBG
     int orig_len = len;
@@ -922,12 +925,8 @@ int erts_net_message(Port *prt,
 
     UseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE);
     /* Thanks to Luke Gorrie */
-    off_heap.mso = NULL;
-#ifndef HYBRID /* FIND ME! */
-    off_heap.funs = NULL;
-#endif
+    off_heap.first = NULL;
     off_heap.overhead = 0;
-    off_heap.externals = NULL;
 
     ERTS_SMP_CHK_NO_PROC_LOCKS;
 
@@ -1005,29 +1004,23 @@ int erts_net_message(Port *prt,
 #endif
 
     if (is_not_tuple(arg) || 
-	(tuple = tuple_val(arg), arityval(*tuple) < 1) ||
+	(tuple = tuple_val(arg), (tuple_arity = arityval(*tuple)) < 1) ||
 	is_not_small(tuple[1])) {
-	erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	erts_dsprintf(dsbufp, "Invalid distribution message: %.200T", arg);
-	erts_send_error_to_logger_nogl(dsbufp);
-	goto data_error;
+ 	goto invalid_message;
     }
 
     token_size = 0;
 
     switch (type = unsigned_val(tuple[1])) {
     case DOP_LINK:
+	if (tuple_arity != 3) {
+	    goto invalid_message;
+	}
 	from = tuple[2];
 	to   = tuple[3];  /* local proc to link to */
 
 	if (is_not_pid(from) || is_not_pid(to)) {
-	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	    PURIFY_MSG("data error");
-	    erts_dsprintf(dsbufp,
-			  "Invalid DOP_LINK distribution message: %.200T",
-			  arg);
-	    erts_send_error_to_logger_nogl(dsbufp);
-	    goto data_error;
+	    goto invalid_message;
 	}
 
 	rp = erts_pid2proc_opt(NULL, 0,
@@ -1066,8 +1059,14 @@ int erts_net_message(Port *prt,
 
     case DOP_UNLINK: {
 	ErtsDistLinkData dld;
+	if (tuple_arity != 3) {
+	    goto invalid_message;
+	}
 	from = tuple[2];
 	to = tuple[3];
+	if (is_not_pid(from) || is_not_pid(to)) {
+	    goto invalid_message;
+	}
 	
 	rp = erts_pid2proc_opt(NULL, 0,
 			       to, ERTS_PROC_LOCK_LINK,
@@ -1094,11 +1093,19 @@ 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 name;
+	
+	if (tuple_arity != 4) {
+	    goto invalid_message;
+	}
 
 	watcher = tuple[2];
 	watched = tuple[3];  /* local proc to monitor */
 	ref     = tuple[4];
 
+	if (is_not_ref(ref)) {
+	    goto invalid_message;
+	}
+
 	if (is_atom(watched)) {
 	    name = watched;
 	    rp = erts_whereis_process(NULL, 0,
@@ -1140,10 +1147,17 @@ int erts_net_message(Port *prt,
 	   We get {DOP_DEMONITOR_P, Remote pid, Local pid or name, ref},
 	   We need only the ref of course */
 
+	if (tuple_arity != 4) {
+	    goto invalid_message;
+	}
 	/* watcher = tuple[2]; */
 	/* watched = tuple[3]; May be an atom in case of monitor name */
 	ref = tuple[4];
 
+	if(is_not_ref(ref)) {
+	    goto invalid_message;
+	}
+
 	erts_smp_de_links_lock(dep);
 	mon = erts_remove_monitor(&(dep->monitors),ref);
 	erts_smp_de_links_unlock(dep);
@@ -1168,10 +1182,11 @@ int erts_net_message(Port *prt,
 	erts_destroy_monitor(mon);
 	break;
 
-    case DOP_NODE_LINK: /* XXX never sent ?? */
-	break;
-
     case DOP_REG_SEND_TT:
+	if (tuple_arity != 5) {
+	    goto invalid_message;
+	}
+
 	token_size = size_object(tuple[5]);
 	/* Fall through ... */
     case DOP_REG_SEND:
@@ -1182,12 +1197,19 @@ int erts_net_message(Port *prt,
 	 * There is intentionally no testing of the cookie (it is always '')
 	 * from R9B and onwards.
 	 */
+	if (type != DOP_REG_SEND_TT && tuple_arity != 4) {
+	    goto invalid_message;
+	}
+
 #ifdef ERTS_DIST_MSG_DBG
 	dist_msg_dbg(&ede, "MSG", buf, orig_len);
 #endif
 
 	from = tuple[2];
 	to = tuple[4];
+	if (is_not_pid(from) || is_not_atom(to)){
+	    goto invalid_message;
+	}
 	rp = erts_whereis_process(NULL, 0, to, 0, ERTS_P2P_FLG_SMP_INC_REFC);
 	if (rp) {
 	    Uint xsize = (type == DOP_REG_SEND
@@ -1219,6 +1241,10 @@ int erts_net_message(Port *prt,
 	break;
 
     case DOP_SEND_TT:
+	if (tuple_arity != 4) {
+	    goto invalid_message;
+	}
+	
 	token_size = size_object(tuple[4]);
 	/* Fall through ... */
     case DOP_SEND:
@@ -1229,8 +1255,13 @@ int erts_net_message(Port *prt,
 #ifdef ERTS_DIST_MSG_DBG
 	dist_msg_dbg(&ede, "MSG", buf, orig_len);
 #endif
-
+	if (type != DOP_SEND_TT && tuple_arity != 3) {
+	    goto invalid_message;
+	}
 	to = tuple[3];
+	if (is_not_pid(to)) {
+	    goto invalid_message;
+	}
 	rp = erts_pid2proc_opt(NULL, 0, to, 0, ERTS_P2P_FLG_SMP_INC_REFC);
 	if (rp) {
 	    Uint xsize = type == DOP_SEND ? 0 : ERTS_HEAP_FRAG_SIZE(token_size);
@@ -1268,11 +1299,19 @@ int erts_net_message(Port *prt,
 	Eterm sysname;
 	ErtsProcLocks rp_locks = ERTS_PROC_LOCKS_MSG_SEND|ERTS_PROC_LOCK_LINK;
 
+	if (tuple_arity != 5) {
+	    goto invalid_message;
+	}
+
 	/* watched = tuple[2]; */  /* remote proc which died */
 	/* watcher = tuple[3]; */
 	ref     = tuple[4];
 	reason  = tuple[5];
 
+	if(is_not_ref(ref)) {
+	    goto invalid_message;
+	}
+
 	erts_smp_de_links_lock(dep);
 	sysname = dep->sysname;
 	mon = erts_remove_monitor(&(dep->monitors), ref);
@@ -1319,24 +1358,25 @@ int erts_net_message(Port *prt,
 	ErtsProcLocks rp_locks = ERTS_PROC_LOCK_LINK|ERTS_PROC_LOCKS_XSIG_SEND;
 	/* 'from', which 'to' is linked to, died */
 	if (type == DOP_EXIT) {
-	   from = tuple[2];
-	   to = tuple[3];
-	   reason = tuple[4];
-	   token = NIL;
+	    if (tuple_arity != 4) {
+		goto invalid_message;
+	    }
+	    
+	    from = tuple[2];
+	    to = tuple[3];
+	    reason = tuple[4];
+	    token = NIL;
 	} else {
-	   from = tuple[2];
-	   to = tuple[3];
-	   token = tuple[4];
-	   reason = tuple[5];
+	    if (tuple_arity != 5) {
+		goto invalid_message;
+	    }
+	    from = tuple[2];
+	    to = tuple[3];
+	    token = tuple[4];
+	    reason = tuple[5];
 	}
-	if (is_not_internal_pid(to)) {
-	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	    PURIFY_MSG("data error");
-	    erts_dsprintf(dsbufp,
-			  "Invalid DOP_EXIT distribution message: %.200T",
-			  arg);
-	    erts_send_error_to_logger_nogl(dsbufp);
-	    goto data_error;
+	if (is_not_pid(from) || is_not_internal_pid(to)) {
+	    goto invalid_message;
 	}
 
 	rp = erts_pid2proc(NULL, 0, to, rp_locks);
@@ -1383,15 +1423,24 @@ int erts_net_message(Port *prt,
 	ErtsProcLocks rp_locks = ERTS_PROC_LOCKS_XSIG_SEND;
 	/* 'from' is send an exit signal to 'to' */
 	if (type == DOP_EXIT2) {
-	   from = tuple[2];
-	   to = tuple[3];
-	   reason = tuple[4];
-	   token = NIL;
+	    if (tuple_arity != 4) {
+		goto invalid_message;
+	    }
+	    from = tuple[2];
+	    to = tuple[3];
+	    reason = tuple[4];
+	    token = NIL;
 	} else {
-	   from = tuple[2];
-	   to = tuple[3];
-	   token = tuple[4];
-	   reason = tuple[5];
+	    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)) {
+	    goto invalid_message;
 	}
 	rp = erts_pid2proc_opt(NULL, 0, to, rp_locks,
 			       ERTS_P2P_FLG_SMP_INC_REFC);
@@ -1410,10 +1459,14 @@ int erts_net_message(Port *prt,
 	break;
     }
     case DOP_GROUP_LEADER:
+	if (tuple_arity != 3) {
+	    goto invalid_message;
+	}
 	from = tuple[2];   /* Group leader  */
 	to = tuple[3];     /* new member */
-	if (is_not_pid(from))
-	    break;
+	if (is_not_pid(from) || is_not_pid(to)) {
+	    goto invalid_message;
+	}
 
 	rp = erts_pid2proc(NULL, 0, to, ERTS_PROC_LOCK_MAIN);
 	if (!rp)
@@ -1422,28 +1475,12 @@ int erts_net_message(Port *prt,
 	erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_MAIN);
 	break;
 
-    default: {
-	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	    erts_dsprintf(dsbufp,
-			  "Illegal value in distribution dispatch switch: "
-			  "%.200T",
-			  arg);
-	    erts_send_error_to_logger_nogl(dsbufp);
-	    PURIFY_MSG("data error");
-	    goto data_error;
-	}
+    default: 
+	goto invalid_message;
     }
 
-    if (off_heap.mso) {
-	erts_cleanup_mso(off_heap.mso);
-    }
-    if (off_heap.externals) {
-	erts_cleanup_externals(off_heap.externals);
-    }
+    erts_cleanup_offheap(&off_heap);
 #ifndef HYBRID /* FIND ME! */
-    if (off_heap.funs) {
-	erts_cleanup_funs(off_heap.funs);
-    }
     if (ctl != ctl_default) {
 	erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl);
     }
@@ -1451,18 +1488,16 @@ int erts_net_message(Port *prt,
     UnUseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE);
     ERTS_SMP_CHK_NO_PROC_LOCKS;
     return 0;
-
- data_error:
-    if (off_heap.mso) {
-	erts_cleanup_mso(off_heap.mso);
-    }
-    if (off_heap.externals) {
-	erts_cleanup_externals(off_heap.externals);
+ invalid_message:
+    {
+	erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
+	erts_dsprintf(dsbufp, "Invalid distribution message: %.200T", arg);
+	erts_send_error_to_logger_nogl(dsbufp);
     }
+ data_error:
+    PURIFY_MSG("data error");
+    erts_cleanup_offheap(&off_heap);
 #ifndef HYBRID /* FIND ME! */
-    if (off_heap.funs) {
-	erts_cleanup_funs(off_heap.funs);
-    }
     if (ctl != ctl_default) {
 	erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl);
     }
@@ -1473,8 +1508,6 @@ int erts_net_message(Port *prt,
     return -1;
 }
 
-#define ERTS_DE_BUSY_LIMIT (128*1024)
-
 static int
 dsig_send(ErtsDSigData *dsdp, Eterm ctl, Eterm msg, int force_busy)
 {
@@ -1558,18 +1591,18 @@ dsig_send(ErtsDSigData *dsdp, Eterm ctl, Eterm msg, int force_busy)
     }
     else {
 	ErtsProcList *plp = NULL;
-	erts_smp_spin_lock(&dep->qlock);
+	erts_smp_mtx_lock(&dep->qlock);
 	dep->qsize += size_obuf(obuf);
-	if (dep->qsize >= ERTS_DE_BUSY_LIMIT)
+	if (dep->qsize >= erts_dist_buf_busy_limit)
 	    dep->qflgs |= ERTS_DE_QFLG_BUSY;
 	if (!force_busy && (dep->qflgs & ERTS_DE_QFLG_BUSY)) {
-	    erts_smp_spin_unlock(&dep->qlock);
+	    erts_smp_mtx_unlock(&dep->qlock);
 
 	    plp = erts_proclist_create(c_p);
 	    plp->next = NULL;
 	    erts_suspend(c_p, ERTS_PROC_LOCK_MAIN, NULL);
 	    suspended = 1;
-	    erts_smp_spin_lock(&dep->qlock);
+	    erts_smp_mtx_lock(&dep->qlock);
 	}
 
 	/* Enqueue obuf on dist entry */
@@ -1595,7 +1628,7 @@ dsig_send(ErtsDSigData *dsdp, Eterm ctl, Eterm msg, int force_busy)
 	    }
 	}
 
-	erts_smp_spin_unlock(&dep->qlock);
+	erts_smp_mtx_unlock(&dep->qlock);
 	erts_schedule_dist_command(NULL, dep);
 	erts_smp_de_runlock(dep);
 	
@@ -1728,10 +1761,8 @@ erts_dist_command(Port *prt, int reds_limit)
 {
     Sint reds = ERTS_PORT_REDS_DIST_CMD_START;
     int prt_busy;
-    int de_busy;
     Uint32 status;
     Uint32 flags;
-    Uint32 qflgs;
     Sint obufsize = 0;
     ErtsDistOutputQueue oq, foq;
     DistEntry *dep = prt->dist_entry;
@@ -1766,13 +1797,12 @@ erts_dist_command(Port *prt, int reds_limit)
      * a mess.
      */
 
-    erts_smp_spin_lock(&dep->qlock);
+    erts_smp_mtx_lock(&dep->qlock);
     oq.first = dep->out_queue.first;
     oq.last = dep->out_queue.last;
     dep->out_queue.first = NULL;
     dep->out_queue.last = NULL;
-    qflgs = dep->qflgs;
-    erts_smp_spin_unlock(&dep->qlock);
+    erts_smp_mtx_unlock(&dep->qlock);
 
     foq.first = dep->finalized_out_queue.first;
     foq.last = dep->finalized_out_queue.last;
@@ -1783,17 +1813,8 @@ erts_dist_command(Port *prt, int reds_limit)
 	goto preempted;
 
     prt_busy = (int) (prt->status & ERTS_PORT_SFLG_PORT_BUSY);
-    de_busy = (int) (qflgs & ERTS_DE_QFLG_BUSY);
 
-    if (prt_busy) {
-	if (!de_busy) {
-	    erts_smp_spin_lock(&dep->qlock);
-	    dep->qflgs |= ERTS_DE_QFLG_BUSY;
-	    erts_smp_spin_unlock(&dep->qlock);
-	    de_busy = 1;
-	}
-    }
-    else if (foq.first) {
+    if (!prt_busy && foq.first) {
 	int preempt = 0;
 	do {
 	    Uint size;
@@ -1811,10 +1832,7 @@ erts_dist_command(Port *prt, int reds_limit)
 	    free_dist_obuf(fob);
 	    preempt = reds > reds_limit || (prt->status & ERTS_PORT_SFLGS_DEAD);
 	    if (prt->status & ERTS_PORT_SFLG_PORT_BUSY) {
-		erts_smp_spin_lock(&dep->qlock);
-		dep->qflgs |= ERTS_DE_QFLG_BUSY;
-		erts_smp_spin_unlock(&dep->qlock);
-		de_busy = prt_busy = 1;
+		prt_busy = 1;
 		break;
 	    }
 	} while (foq.first && !preempt);
@@ -1897,10 +1915,7 @@ erts_dist_command(Port *prt, int reds_limit)
 	    free_dist_obuf(fob);
 	    preempt = reds > reds_limit || (prt->status & ERTS_PORT_SFLGS_DEAD);
 	    if (prt->status & ERTS_PORT_SFLG_PORT_BUSY) {
-		erts_smp_spin_lock(&dep->qlock);
-		dep->qflgs |= ERTS_DE_QFLG_BUSY;
-		erts_smp_spin_unlock(&dep->qlock);
-		de_busy = prt_busy = 1;
+		prt_busy = 1;
 		if (oq.first && !preempt)
 		    goto finalize_only;
 	    }
@@ -1927,22 +1942,23 @@ erts_dist_command(Port *prt, int reds_limit)
 	 * dist entry in a non-busy state and resume suspended
 	 * processes.
 	 */
-	erts_smp_spin_lock(&dep->qlock);
+	erts_smp_mtx_lock(&dep->qlock);
 	ASSERT(dep->qsize >= obufsize);
 	dep->qsize -= obufsize;
 	obufsize = 0;
-	if (de_busy && !prt_busy && dep->qsize < ERTS_DE_BUSY_LIMIT) {
+	if (!prt_busy
+	    && (dep->qflgs & ERTS_DE_QFLG_BUSY)
+	    && dep->qsize < erts_dist_buf_busy_limit) {
 	    ErtsProcList *suspendees;
 	    int resumed;
 	    suspendees = get_suspended_on_de(dep, ERTS_DE_QFLG_BUSY);
-	    erts_smp_spin_unlock(&dep->qlock);
+	    erts_smp_mtx_unlock(&dep->qlock);
 
 	    resumed = erts_resume_processes(suspendees);
 	    reds += resumed*ERTS_PORT_REDS_DIST_CMD_RESUMED;
-	    de_busy = 0;
 	}
 	else
-	    erts_smp_spin_unlock(&dep->qlock);
+	    erts_smp_mtx_unlock(&dep->qlock);
     }
 
     ASSERT(!oq.first && !oq.last);
@@ -1951,10 +1967,10 @@ erts_dist_command(Port *prt, int reds_limit)
 
     if (obufsize != 0) {
 	ASSERT(obufsize > 0);
-	erts_smp_spin_lock(&dep->qlock);
+	erts_smp_mtx_lock(&dep->qlock);
 	ASSERT(dep->qsize >= obufsize);
 	dep->qsize -= obufsize;
-	erts_smp_spin_unlock(&dep->qlock);
+	erts_smp_mtx_unlock(&dep->qlock);
     }
 
     ASSERT(foq.first || !foq.last);
@@ -2004,9 +2020,9 @@ erts_dist_command(Port *prt, int reds_limit)
 	foq.last = NULL;
 
 #ifdef DEBUG
-	erts_smp_spin_lock(&dep->qlock);
+	erts_smp_mtx_lock(&dep->qlock);
 	ASSERT(dep->qsize == obufsize);
-	erts_smp_spin_unlock(&dep->qlock);
+	erts_smp_mtx_unlock(&dep->qlock);
 #endif
     }
     else {
@@ -2015,14 +2031,14 @@ erts_dist_command(Port *prt, int reds_limit)
 	     * Unhandle buffers need to be put back first
 	     * in out_queue.
 	     */
-	    erts_smp_spin_lock(&dep->qlock);
+	    erts_smp_mtx_lock(&dep->qlock);
 	    dep->qsize -= obufsize;
 	    obufsize = 0;
 	    oq.last->next = dep->out_queue.first;
 	    dep->out_queue.first = oq.first;
 	    if (!dep->out_queue.last)
 		dep->out_queue.last = oq.last;
-	    erts_smp_spin_unlock(&dep->qlock);
+	    erts_smp_mtx_unlock(&dep->qlock);
 	}
 
 	erts_schedule_dist_command(prt, NULL);
@@ -2046,10 +2062,10 @@ erts_kill_dist_connection(DistEntry *dep, Uint32 connection_id)
 
 	dep->status |= ERTS_DE_SFLG_EXITING;
 
-	erts_smp_spin_lock(&dep->qlock);
+	erts_smp_mtx_lock(&dep->qlock);
 	ASSERT(!(dep->qflgs & ERTS_DE_QFLG_EXIT));
 	dep->qflgs |= ERTS_DE_QFLG_EXIT;
-	erts_smp_spin_unlock(&dep->qlock);
+	erts_smp_mtx_unlock(&dep->qlock);
 
 	erts_schedule_dist_command(NULL, dep);
     }
@@ -2420,13 +2436,13 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
 	ErtsProcList *plp = erts_proclist_create(BIF_P);
 	plp->next = NULL;
 	erts_suspend(BIF_P, ERTS_PROC_LOCK_MAIN, NULL);
-	erts_smp_spin_lock(&dep->qlock);
+	erts_smp_mtx_lock(&dep->qlock);
 	if (dep->suspended.last)
 	    dep->suspended.last->next = plp;
 	else
 	    dep->suspended.first = plp;
 	dep->suspended.last = plp;
-	erts_smp_spin_unlock(&dep->qlock);
+	erts_smp_mtx_unlock(&dep->qlock);
 	goto yield;
     }
 
@@ -2454,9 +2470,9 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
     ASSERT(dep->send);
 
 #ifdef DEBUG
-    erts_smp_spin_lock(&dep->qlock);
+    erts_smp_mtx_lock(&dep->qlock);
     ASSERT(dep->qsize == 0);
-    erts_smp_spin_unlock(&dep->qlock);
+    erts_smp_mtx_unlock(&dep->qlock);
 #endif
 
     erts_set_dist_entry_connected(dep, BIF_ARG_2, flags);
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index fa19c7fb45..695a4fc3fe 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -38,6 +38,7 @@
 #define DFLAG_UNICODE_IO          0x1000
 #define DFLAG_DIST_HDR_ATOM_CACHE 0x2000
 #define DFLAG_SMALL_ATOM_TAGS     0x4000
+#define DFLAGS_INTERNAL_TAGS      0x8000
 
 /* All flags that should be enabled when term_to_binary/1 is used. */
 #define TERM_TO_BINARY_DFLAGS (DFLAG_EXTENDED_REFERENCES	\
@@ -51,7 +52,7 @@
 #define DOP_SEND		2
 #define DOP_EXIT		3
 #define DOP_UNLINK		4
-#define DOP_NODE_LINK		5
+/* Ancient DOP_NODE_LINK (5) was here, can be reused */
 #define DOP_REG_SEND		6
 #define DOP_GROUP_LEADER	7
 #define DOP_EXIT2		8
@@ -68,7 +69,6 @@
 /* distribution trap functions */
 extern Export* dsend2_trap;
 extern Export* dsend3_trap;
-/*extern Export* dsend_nosuspend_trap;*/
 extern Export* dlink_trap;
 extern Export* dunlink_trap;
 extern Export* dmonitor_node_trap;
@@ -99,7 +99,8 @@ typedef struct {
 #define ERTS_DE_IS_CONNECTED(DEP) \
   (!ERTS_DE_IS_NOT_CONNECTED((DEP)))
 
-
+#define ERTS_DE_BUSY_LIMIT (1024*1024)
+extern int erts_dist_buf_busy_limit;
 extern int erts_is_alive;
 
 /*
@@ -153,10 +154,10 @@ erts_dsig_prepare(ErtsDSigData *dsdp,
     }
     if (no_suspend) {
 	failure = ERTS_DSIG_PREP_CONNECTED;
-	erts_smp_spin_lock(&dep->qlock);
+	erts_smp_mtx_lock(&dep->qlock);
 	if (dep->qflgs & ERTS_DE_QFLG_BUSY)
 	    failure = ERTS_DSIG_PREP_WOULD_SUSPEND;
-	erts_smp_spin_unlock(&dep->qlock);
+	erts_smp_mtx_unlock(&dep->qlock);
 	if (failure == ERTS_DSIG_PREP_WOULD_SUSPEND)
 	    goto fail;
     }
diff --git a/erts/emulator/beam/elib_malloc.c b/erts/emulator/beam/elib_malloc.c
deleted file mode 100644
index b18c48d8d6..0000000000
--- a/erts/emulator/beam/elib_malloc.c
+++ /dev/null
@@ -1,2334 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2009. 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%
- */
-
-/*
-** Description: Faster malloc().
-*/
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "sys.h"
-
-#ifdef ENABLE_ELIB_MALLOC
-
-#undef THREAD_SAFE_ELIB_MALLOC
-#ifdef USE_THREADS
-#define THREAD_SAFE_ELIB_MALLOC 1
-#else
-#define THREAD_SAFE_ELIB_MALLOC 0
-#endif
-
-#include "erl_driver.h"
-#include "erl_threads.h"
-#include "elib_stat.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-/* To avoid clobbering of names becaure of reclaim on VxWorks,
-   we undefine all possible malloc, calloc etc. */
-#undef malloc
-#undef calloc
-#undef free
-#undef realloc
-
-#define ELIB_INLINE         /* inline all possible functions */
-
-#ifndef ELIB_ALIGN
-#define ELIB_ALIGN             sizeof(double)
-#endif
-
-#ifndef ELIB_HEAP_SIZE
-#define ELIB_HEAP_SIZE         (64*1024)  /* Default 64K */
-#endif
-
-#ifndef ELIB_HEAP_INCREAMENT
-#define ELIB_HEAP_INCREAMENT   (32*1024)  /* Default 32K */
-#endif
-
-#ifndef ELIB_FAILURE
-#define ELIB_FAILURE    abort()
-#endif
-
-#undef ASSERT
-#ifdef DEBUG
-#define ASSERT(B) \
- ((void) ((B) ? 1 : (fprintf(stderr, "%s:%d: Assertion failed: %s\n", \
-			     __FILE__, __LINE__, #B), abort(), 0)))
-#else
-#define ASSERT(B) ((void) 1)
-#endif
-
-#ifndef USE_RECURSIVE_MALLOC_MUTEX
-#define USE_RECURSIVE_MALLOC_MUTEX 0
-#endif
-
-#if USE_RECURSIVE_MALLOC_MUTEX
-static erts_mtx_t malloc_mutex = ERTS_REC_MTX_INITER;
-#else /* #if USE_RECURSIVE_MALLOC_MUTEX */
-static erts_mtx_t malloc_mutex = ERTS_MTX_INITER;
-#if THREAD_SAFE_ELIB_MALLOC
-static erts_cnd_t  malloc_cond  = ERTS_CND_INITER;
-#endif
-#endif  /* #if USE_RECURSIVE_MALLOC_MUTEX */
-
-typedef unsigned long EWord;       /* Assume 32-bit in this implementation */
-typedef unsigned short EHalfWord;  /* Assume 16-bit in this implementation */
-typedef unsigned char EByte;       /* Assume 8-bit byte */
-
-
-#define elib_printf fprintf
-#define elib_putc   fputc
-
-
-#if defined(__STDC__) || defined(__WIN32__)
-#define CONCAT(x,y) x##y
-#else
-#define CONCAT(x,y) x/**/y
-#endif
-
-
-#ifdef ELIB_DEBUG
-#define ELIB_PREFIX(fun, args) CONCAT(elib__,fun) args
-#else
-#define ELIB_PREFIX(fun, args) CONCAT(elib_,fun) args
-#endif
-
-#if defined(__STDC__)
-void *ELIB_PREFIX(malloc, (size_t));
-void *ELIB_PREFIX(calloc, (size_t, size_t));
-void ELIB_PREFIX(cfree, (EWord *));
-void ELIB_PREFIX(free, (EWord *));
-void *ELIB_PREFIX(realloc, (EWord *, size_t));
-void* ELIB_PREFIX(memresize, (EWord *, int));
-void* ELIB_PREFIX(memalign, (int, int));
-void* ELIB_PREFIX(valloc, (int));
-void* ELIB_PREFIX(pvalloc, (int));
-int ELIB_PREFIX(memsize, (EWord *));
-/* Extern interfaces used by VxWorks */
-size_t elib_sizeof(void *);
-void elib_init(EWord *, EWord);
-void elib_force_init(EWord *, EWord);
-#endif
-
-#if defined(__STDC__)
-/* define prototypes for missing */
-void* memalign(size_t a, size_t s);
-void* pvalloc(size_t nb);
-void* memresize(void *p, int nb);
-int memsize(void *p);
-#endif
-
-/* bytes to pages */
-#define PAGES(x)      (((x)+page_size-1) / page_size)
-#define PAGE_ALIGN(p) ((char*)((((EWord)(p))+page_size-1)&~(page_size-1)))
-
-/* bytes to words */
-#define WORDS(x)      (((x)+sizeof(EWord)-1) / sizeof(EWord))
-
-/* Align an address */
-#define ALIGN(p)     ((EWord*)((((EWord)(p)+ELIB_ALIGN-1)&~(ELIB_ALIGN-1))))
-
-/* Calculate the size needed to keep alignment */
-
-#define ALIGN_BSZ(nb)  ((nb+sizeof(EWord)+ELIB_ALIGN-1) & ~(ELIB_ALIGN-1))
-
-#define ALIGN_WSZ(nb)  WORDS(ALIGN_BSZ(nb))
-
-#define ALIGN_SIZE(nb) (ALIGN_WSZ(nb) - 1)
-
-
-/* PARAMETERS */
-
-#if defined(ELIB_HEAP_SBRK)
-
-#undef PAGE_SIZE
-
-/* Get the system page size (NEED MORE DEFINES HERE) */
-#ifdef _SC_PAGESIZE
-#define PAGE_SIZE   sysconf(_SC_PAGESIZE)
-#elif defined(_MSC_VER)
-#  ifdef _M_ALPHA
-#    define PAGE_SIZE      0x2000
-#  else
-#    define PAGE_SIZE      0x1000
-#  endif
-#else
-#define PAGE_SIZE   getpagesize()
-#endif
-
-#define ELIB_EXPAND(need)  expand_sbrk(need)
-static FUNCTION(int, expand_sbrk, (EWord));
-
-#elif defined(ELIB_HEAP_FIXED)
-
-#define PAGE_SIZE 1024
-#define ELIB_EXPAND(need) -1
-static EWord fix_heap[WORDS(ELIB_HEAP_SIZE)];
-
-#elif defined(ELIB_HEAP_USER)
-
-#define PAGE_SIZE 1024
-#define ELIB_EXPAND(need) -1
-
-#else
-
-#error "ELIB HEAP TYPE NOT SET"
-
-#endif
-
-
-#define STAT_ALLOCED_BLOCK(SZ)		\
-do {					\
-    tot_allocated += (SZ);		\
-    if (max_allocated < tot_allocated)	\
-	max_allocated = tot_allocated;	\
-} while (0)
-
-#define STAT_FREED_BLOCK(SZ)		\
-do {					\
-    tot_allocated -= (SZ);		\
-} while (0)
-
-static int max_allocated = 0;
-static int tot_allocated = 0;
-static EWord* eheap;        /* Align heap start */
-static EWord* eheap_top;    /* Point to end of heap */
-EWord page_size = 0;        /* Set by elib_init */
-
-#if defined(ELIB_DEBUG) || defined(DEBUG)
-#define ALIGN_CHECK(a, p)						\
- do {									\
-    if ((EWord)(p) & (a-1)) {						\
-	elib_printf(stderr,						\
-		    "RUNTIME ERROR: bad alignment (0x%lx:%d:%d)\n",	\
-		    (unsigned long) (p), (int) a, __LINE__);			\
-	ELIB_FAILURE;							\
-    }									\
-  } while(0)
-#define ELIB_ALIGN_CHECK(p) ALIGN_CHECK(ELIB_ALIGN, p)
-#else
-#define ALIGN_CHECK(a, p)
-#define ELIB_ALIGN_CHECK(p)
-#endif
-
-#define DYNAMIC 32
-
-/*
-** Free block layout
-**   1 1          30
-**  +--------------------------+
-**  |F|P|        Size          |
-**  +--------------------------+
-**
-** Where F is the free bit
-**       P is the free above bit
-**       Size is messured in words and does not include the hdr word
-**
-** If block is on the free list the size is also stored last in the block.
-** 
-*/
-typedef struct _free_block FreeBlock;
-struct _free_block {
-    EWord hdr;
-    Uint flags;
-    FreeBlock* parent;
-    FreeBlock* left;
-    FreeBlock* right;
-    EWord v[1];
-};
-
-typedef struct _allocated_block {
-    EWord hdr;
-    EWord v[5];
-} AllocatedBlock;
-
-
-/*
- * Interface to tree routines.
- */
-typedef Uint Block_t;
-
-static Block_t*	get_free_block(Uint);
-static void link_free_block(Block_t *);
-static void unlink_free_block(Block_t *del);
-
-#define FREE_BIT       0x80000000
-#define FREE_ABOVE_BIT 0x40000000
-#define SIZE_MASK      0x3fffffff     /* 2^30 words = 2^32 bytes */
-
-/* Work on both FreeBlock and AllocatedBlock */
-#define SIZEOF(p)         ((p)->hdr & SIZE_MASK)
-#define IS_FREE(p)        (((p)->hdr & FREE_BIT) != 0)
-#define IS_FREE_ABOVE(p)  (((p)->hdr & FREE_ABOVE_BIT) != 0)
-
-/* Given that we have a free block above find its size */
-#define SIZEOF_ABOVE(p)    *(((EWord*) (p)) - 1)
-
-#define MIN_BLOCK_SIZE      (sizeof(FreeBlock)/sizeof(EWord))
-#define MIN_WORD_SIZE       (MIN_BLOCK_SIZE-1)
-#define MIN_BYTE_SIZE       (sizeof(FreeBlock)-sizeof(EWord))
-
-#define MIN_ALIGN_SIZE      ALIGN_SIZE(MIN_BYTE_SIZE)
-
-
-static AllocatedBlock* heap_head = 0;
-static AllocatedBlock* heap_tail = 0;
-static EWord eheap_size = 0;
-
-static int heap_locked;
-
-static int elib_need_init = 1;
-#if THREAD_SAFE_ELIB_MALLOC
-static int elib_is_initing = 0;
-#endif
-
-typedef FreeBlock RBTree_t;
-
-static RBTree_t* root = NULL;
-
-
-static FUNCTION(void, deallocate, (AllocatedBlock*, int));
-
-/*
- * Unlink a free block
- */
-
-#define mark_allocated(p, szp) do { \
-      (p)->hdr = ((p)->hdr & FREE_ABOVE_BIT) | (szp); \
-      (p)->v[szp] &= ~FREE_ABOVE_BIT; \
-   } while(0)
-
-#define mark_free(p, szp) do { \
-      (p)->hdr = FREE_BIT | (szp); \
-      ((FreeBlock *)p)->v[szp-sizeof(FreeBlock)/sizeof(EWord)+1] = (szp); \
-   } while(0)
-
-#if 0
-/* Help macros to log2 */
-#define LOG_1(x)  (((x) > 1) ? 1 : 0)
-#define LOG_2(x)  (((x) > 3) ? 2+LOG_1((x) >> 2) : LOG_1(x))
-#define LOG_4(x)  (((x) > 15) ? 4+LOG_2((x) >> 4) : LOG_2(x))
-#define LOG_8(x)  (((x) > 255) ? 8+LOG_4((x)>>8) : LOG_4(x))
-#define LOG_16(x) (((x) > 65535) ? 16+LOG_8((x)>>16) : LOG_8(x))
-
-#define log2(x)   LOG_16(x)
-#endif
-
-/*
- * Split a block to be allocated.
- * Mark block as ALLOCATED and clear
- * FREE_ABOVE_BIT on next block
- *
- * nw is SIZE aligned and szp is SIZE aligned + 1
- */
-static void
-split_block(FreeBlock* p, EWord nw, EWord szp)
-{
-    EWord szq;
-    FreeBlock* q;
-
-    szq = szp - nw;
-    /* Preserve FREE_ABOVE bit in p->hdr !!! */
-
-    if (szq >= MIN_ALIGN_SIZE+1) {
-	szq--;
-	p->hdr = (p->hdr & FREE_ABOVE_BIT) | nw;
-
-	q = (FreeBlock*) (((EWord*) p) + nw + 1);
-	mark_free(q, szq);
-	link_free_block((Block_t *) q);
-
-	q = (FreeBlock*) (((EWord*) q) + szq + 1);
-	q->hdr |= FREE_ABOVE_BIT;
-    }
-    else {
-	mark_allocated((AllocatedBlock*)p, szp);
-    }
-}
-
-/*
- * Find a free block
- */
-static FreeBlock*
-alloc_block(EWord nw)
-{
-    for (;;) {
-	FreeBlock* p = (FreeBlock *) get_free_block(nw);
-
-	if (p != NULL) {
-	    return p;
-	} else if (ELIB_EXPAND(nw+MIN_WORD_SIZE)) {
-	    return 0;
-	}
-    }
-}
-
-
-size_t elib_sizeof(void *p)
-{
-    AllocatedBlock* pp;
-
-    if (p != 0) {
-	pp = (AllocatedBlock*) (((char *)p)-1);
-	return SIZEOF(pp);
-    }
-    return 0;
-}
-
-static void locked_elib_init(EWord*, EWord);
-static void init_elib_malloc(EWord*, EWord);
-
-/*
-** Initialize the elib
-** The addr and sz is only used when compiled with EXPAND_ADDR 
-*/
-/* Not static, this is used by VxWorks */
-void elib_init(EWord* addr, EWord sz)
-{
-    if (!elib_need_init)
-	return;
-    erts_mtx_lock(&malloc_mutex);
-    locked_elib_init(addr, sz);
-    erts_mtx_unlock(&malloc_mutex);
-}
-
-static void locked_elib_init(EWord* addr, EWord sz)
-{
-    if (!elib_need_init)
-	return;
-
-#if THREAD_SAFE_ELIB_MALLOC
-
-#if !USE_RECURSIVE_MALLOC_MUTEX
-    {
-	static erts_tid_t initer_tid;
-
-	if(elib_is_initing) {
-
-	    if(erts_equal_tids(initer_tid, erts_thr_self()))
-		return;
-
-	    /* Wait until initializing thread is done with initialization */
-
-	    while(elib_need_init)
-		erts_cnd_wait(&malloc_cond, &malloc_mutex);
-
-	    return;
-	}
-	else {
-	    initer_tid = erts_thr_self();
-	    elib_is_initing = 1;
-	}
-    }
-#else
-    if(elib_is_initing)
-	return;
-    elib_is_initing = 1;
-#endif
-
-#endif /* #if THREAD_SAFE_ELIB_MALLOC */
-
-    /* Do the actual initialization of the malloc implementation */
-    init_elib_malloc(addr, sz);
-
-#if THREAD_SAFE_ELIB_MALLOC
-
-#if !USE_RECURSIVE_MALLOC_MUTEX
-    erts_mtx_unlock(&malloc_mutex);
-#endif
-
-    /* Recursive calls to malloc are allowed here... */
-    erts_mtx_set_forksafe(&malloc_mutex);
-
-#if !USE_RECURSIVE_MALLOC_MUTEX
-    erts_mtx_lock(&malloc_mutex);
-    elib_is_initing = 0;
-#endif
-
-#endif /* #if THREAD_SAFE_ELIB_MALLOC */
-
-    elib_need_init = 0;
-
-#if THREAD_SAFE_ELIB_MALLOC && !USE_RECURSIVE_MALLOC_MUTEX
-    erts_cnd_broadcast(&malloc_cond);
-#endif
-
-}
-
-static void init_elib_malloc(EWord* addr, EWord sz)
-{
-    int i;
-    FreeBlock* freep;
-    EWord tmp_sz;
-#ifdef ELIB_HEAP_SBRK
-    char* top;
-    EWord n;
-#endif
-
-    max_allocated = 0;
-    tot_allocated = 0;
-    root = NULL;
-
-    /* Get the page size (may involve system call!!!) */
-    page_size = PAGE_SIZE;
-
-#if defined(ELIB_HEAP_SBRK)
-    sz = PAGES(ELIB_HEAP_SIZE)*page_size;
-
-    if ((top = (char*) sbrk(0)) == (char*)-1) {
-	elib_printf(stderr, "could not initialize elib, sbrk(0)");
-	ELIB_FAILURE;
-    }
-    n = PAGE_ALIGN(top) - top;
-    if ((top = (char*) sbrk(n)) == (char*)-1) {
-	elib_printf(stderr, "could not initialize elib, sbrk(n)");
-	ELIB_FAILURE;
-    }
-    if ((eheap = (EWord*) sbrk(sz)) == (EWord*)-1) {
-	elib_printf(stderr, "could not initialize elib, sbrk(SIZE)");
-	ELIB_FAILURE;
-    }
-    sz = WORDS(ELIB_HEAP_SIZE);
-#elif defined(ELIB_HEAP_FIXED)
-    eheap = fix_heap;
-    sz = WORDS(ELIB_HEAP_SIZE);
-#elif defined(ELIB_HEAP_USER)
-    eheap = addr;
-    sz = WORDS(sz);
-#else
-    return -1;
-#endif
-    eheap_size = 0;
-
-    /* Make sure that the first word of the heap_head is aligned */
-    addr = ALIGN(eheap+1);
-    sz -= ((addr - 1) - eheap);      /* Subtract unusable size */
-    eheap_top = eheap = addr - 1;    /* Set new aligned heap start */
-
-    eheap_top[sz-1] = 0;	     /* Heap stop mark */
-
-    addr = eheap;
-    heap_head = (AllocatedBlock*) addr;
-    heap_head->hdr = MIN_ALIGN_SIZE;
-    for (i = 0; i < MIN_ALIGN_SIZE; i++)
-	heap_head->v[i] = 0;
-
-    addr += (MIN_ALIGN_SIZE+1);
-    freep = (FreeBlock*) addr;
-    tmp_sz = sz - (((MIN_ALIGN_SIZE+1) + MIN_BLOCK_SIZE) + 1 + 1);
-    mark_free(freep, tmp_sz);
-    link_free_block((Block_t *) freep);
-
-    /* No need to align heap tail */
-    heap_tail = (AllocatedBlock*) &eheap_top[sz-MIN_BLOCK_SIZE-1];
-    heap_tail->hdr = FREE_ABOVE_BIT | MIN_WORD_SIZE;
-    heap_tail->v[0] = 0;
-    heap_tail->v[1] = 0;
-    heap_tail->v[2] = 0;
-
-    eheap_top += sz;
-    eheap_size += sz;
-
-    heap_locked = 0;
-}
-
-#ifdef ELIB_HEAP_USER
-void elib_force_init(EWord* addr, EWord sz)
-{
-    elib_need_init = 1;
-    elib_init(addr,sz);
-}
-#endif
-
-#ifdef ELIB_HEAP_SBRK
-
-/*
-** need in number of words (should include head and tail words)
-*/
-static int expand_sbrk(EWord sz)
-{
-    EWord* p;
-    EWord  bytes = sz * sizeof(EWord);
-    EWord  size;
-    AllocatedBlock* tail;
-
-    if (bytes < ELIB_HEAP_SIZE)
-	size = PAGES(ELIB_HEAP_INCREAMENT)*page_size;
-    else
-	size = PAGES(bytes)*page_size;
-
-    if ((p = (EWord*) sbrk(size)) == ((EWord*) -1))
-	return -1;
-
-    if (p != eheap_top) {
-	elib_printf(stderr, "panic: sbrk moved\n");
-	ELIB_FAILURE;
-    }
-
-    sz = WORDS(size);
-
-    /* Set new endof heap marker and a new heap tail */
-    eheap_top[sz-1] = 0;
-
-    tail = (AllocatedBlock*) &eheap_top[sz-MIN_BLOCK_SIZE-1];
-    tail->hdr = FREE_ABOVE_BIT | MIN_WORD_SIZE;
-    tail->v[0] = 0;
-    tail->v[1] = 0;
-    tail->v[2] = 0;
-
-    /* Patch old tail with new appended size */
-    heap_tail->hdr = (heap_tail->hdr & FREE_ABOVE_BIT) |
-	(MIN_WORD_SIZE+1+(sz-MIN_BLOCK_SIZE-1));
-    deallocate(heap_tail, 0);
-
-    heap_tail = tail;
-
-    eheap_size += sz;
-    eheap_top += sz;
-
-    return 0;
-}
-
-#endif /* ELIB_HEAP_SBRK */
-
-
-/*
-** Scan heap and check for corrupted heap
-*/
-int elib_check_heap(void)
-{
-    AllocatedBlock* p = heap_head;
-    EWord sz;
-
-    if (heap_locked) {
-	elib_printf(stderr, "heap is locked no info avaiable\n");
-	return 0;
-    }
-
-    while((sz = SIZEOF(p)) != 0) {
-	if (IS_FREE(p)) {
-	    if (p->v[sz-1] != sz) {
-		elib_printf(stderr, "panic: heap corrupted\r\n"); 
-		ELIB_FAILURE;	
-	    }
-	    p = (AllocatedBlock*) (p->v + sz);
-	    if (!IS_FREE_ABOVE(p)) {
-		elib_printf(stderr, "panic: heap corrupted\r\n"); 
-		ELIB_FAILURE;	
-	    }
-	}
-	else
-	    p = (AllocatedBlock*) (p->v + sz);
-    }
-    return 1;
-}
-
-/*
-** Load the byte vector pointed to by v of length vsz
-** with a heap image
-** The scale is defined by vsz and the current heap size
-** free = 0, full = 255
-** 
-** 
-*/
-int elib_heap_map(EByte* v, int vsz)
-{
-    AllocatedBlock* p = heap_head;
-    EWord sz;
-    int gsz = eheap_size / vsz;  /* The granuality used */
-    int fsz = 0;
-    int usz = 0;
-
-    if (gsz == 0)
-	return -1;  /* too good reolution */
-
-    while((sz = SIZEOF(p)) != 0) {
-	if (IS_FREE(p)) {
-	    fsz += sz;
-	    if ((fsz + usz) > gsz) {
-		*v++ = (255*usz)/gsz;
-		fsz -= (gsz - usz);
-		usz = 0;
-		while(fsz >= gsz) {
-		    *v++ = 0;
-		    fsz -= gsz;
-		}
-	    }
-	}
-	else {
-	    usz += sz;
-	    if ((fsz + usz) > gsz) {
-		*v++ = 255 - (255*fsz)/gsz;
-		usz -= (gsz - fsz);
-		fsz = 0;
-		while(usz >= gsz) {
-		    *v++ = 255;
-		    usz -= gsz;
-		}
-	    }
-	}
-	p = (AllocatedBlock*) (p->v + sz);
-    }
-    return 0;
-}
-
-/*
-** Generate a histogram of free/allocated blocks
-** Count granuality of 10 gives
-** (0-10],(10-100],(100-1000],(1000-10000] ...
-** (0-2], (2-4], (4-8], (8-16], ....
-*/
-static int i_logb(EWord size, int base)
-{
-    int lg = 0;
-    while(size >= base) {
-	size /= base;
-	lg++;
-    }
-    return lg;
-}
-
-int elib_histo(EWord* vf, EWord* va, int vsz, int base)
-{
-    AllocatedBlock* p = heap_head;
-    EWord sz;
-    int i;
-    int linear;
-
-    if ((vsz <= 1) || (vf == 0 && va == 0))
-	return -1;
-
-    if (base < 0) {
-	linear = 1;
-	base = -base;
-    }
-    else
-	linear = 0;
-
-    if (base <= 1)
-	return -1;
-
-    if (vf != 0) {
-	for (i = 0; i < vsz; i++)
-	    vf[i] = 0;
-    }
-    if (va != 0) {
-	for (i = 0; i < vsz; i++)
-	    va[i] = 0;
-    }
-
-    while((sz = SIZEOF(p)) != 0) {
-	if (IS_FREE(p)) {
-	    if (vf != 0) {
-		int val;
-		if (linear)
-		    val = sz / base;
-		else
-		    val = i_logb(sz, base);
-		if (val >= vsz)
-		    vf[vsz-1]++;
-		else
-		    vf[val]++;
-	    }
-	}
-	else {
-	    if (va != 0) {
-		int val;
-		if (linear)
-		    val = sz / base;
-		else
-		    val = i_logb(sz, base);
-		if (val >= vsz)
-		    va[vsz-1]++;
-		else
-		    va[val]++;
-	    }
-	}
-	p = (AllocatedBlock*) (p->v + sz);
-    }
-    return 0;
-}
-
-/*
-** Fill the info structure with actual values
-** Total
-** Allocated
-** Free
-** maxMaxFree     
-*/
-void elib_stat(struct elib_stat* info)
-{
-    EWord blks = 0;
-    EWord sz_free = 0;
-    EWord sz_alloc = 0;
-    EWord sz_max_free = 0;
-    EWord sz_min_used = 0x7fffffff;
-    EWord sz;
-    EWord num_free = 0;
-    AllocatedBlock* p = heap_head;
-
-    info->mem_total = eheap_size;
-
-    p = (AllocatedBlock*) (p->v + SIZEOF(p));
-
-    while((sz = SIZEOF(p)) != 0) {
-	blks++;
-	if (IS_FREE(p)) {
-	    if (sz > sz_max_free)
-		sz_max_free = sz;
-	    sz_free += sz;
-	    ++num_free;
-	}
-	else {
-	    if (sz < sz_min_used)
-		sz_min_used = sz;
-	    sz_alloc += sz;
-	}
-	p = (AllocatedBlock*) (p->v + sz);
-    }
-    info->mem_blocks = blks;
-    info->free_blocks = num_free;
-    info->mem_alloc = sz_alloc;
-    info->mem_free = sz_free;
-    info->min_used = sz_min_used;
-    info->max_free = sz_max_free;
-    info->mem_max_alloc = max_allocated;
-    ASSERT(sz_alloc == tot_allocated);
-}
-
-/*
-** Dump the heap
-*/
-void elib_heap_dump(char* label)
-{
-    AllocatedBlock* p = heap_head;
-    EWord sz;
-
-    elib_printf(stderr, "HEAP DUMP (%s)\n", label);
-    if (!elib_check_heap())
-	return;
-    
-    while((sz = SIZEOF(p)) != 0) {
-	if (IS_FREE(p)) {
-	    elib_printf(stderr, "%p: FREE, size = %d\n", p, (int) sz);
-	}
-	else {
-	    elib_printf(stderr, "%p: USED, size = %d %s\n", p, (int) sz,
-		       IS_FREE_ABOVE(p)?"(FREE ABOVE)":"");
-	}
-	p = (AllocatedBlock*) (p->v + sz);
-    }
-}
-
-/*
-**  Scan heaps and count:
-**  free_size, allocated_size, max_free_block
-*/
-void elib_statistics(void* to)
-{
-    struct elib_stat info;
-    EWord frag;
-
-    if (!elib_check_heap())
-	return;
-
-    elib_stat(&info);
-
-    frag = 1000 - ((1000 * info.max_free) / info.mem_free);
-
-    elib_printf(to, "Heap Statistics: total(%d), blocks(%d), frag(%d.%d%%)\n", 
-	       info.mem_total, info.mem_blocks,
-	       (int) frag/10, (int) frag % 10);
-
-    elib_printf(to, "                 allocated(%d), free(%d), "
-		"free_blocks(%d)\n",
-	       info.mem_alloc, info.mem_free,info.free_blocks);
-    elib_printf(to, "                 max_free(%d),  min_used(%d)\n",
-	       info.max_free, info.min_used);
-}
-
-/*
-** Allocate a least nb bytes with alignment a
-** Algorithm:
-**    1) Try locate a block which match exacly among the by direct index.
-**    2) Try using a fix block of greater size
-**    3) Try locate a block by searching in lists where block sizes
-**       X may vary between 2^i < X <= 2^(i+1)
-**
-** Reset memory to zero if clear is true
-*/
-static AllocatedBlock* allocate(EWord nb, EWord a, int clear)
-{
-    FreeBlock* p;
-    EWord nw;
-
-    if (a == ELIB_ALIGN) {
-	/*
-	 * Common case: Called by malloc(), realloc(), calloc().
-	 */
-	nw = nb < MIN_BYTE_SIZE ? MIN_ALIGN_SIZE : ALIGN_SIZE(nb);
-
-	if ((p = alloc_block(nw)) == 0)
-	    return NULL;
-    } else {
-	/*
-	 * Special case: Called by memalign().
-	 */
-	EWord asz, szp, szq, tmpsz;
-	FreeBlock *q;
-
-	if ((p = alloc_block((1+MIN_ALIGN_SIZE)*sizeof(EWord)+a-1+nb)) == 0)
-	    return NULL;
-
-	asz = a - ((EWord) ((AllocatedBlock *)p)->v) % a;
-
-	if (asz != a) {
-	    /* Enforce the alignment requirement by cutting of a free
-	       block at the beginning of the block. */
-
-	    if (asz < (1+MIN_ALIGN_SIZE)*sizeof(EWord) && !IS_FREE_ABOVE(p)) {
-		/* Not enough room to cut of a free block;
-		   increase align size */
-		asz += (((1+MIN_ALIGN_SIZE)*sizeof(EWord) + a - 1)/a)*a;
-	    }
-
-	    szq = ALIGN_SIZE(asz - sizeof(EWord));
-	    szp = SIZEOF(p) - szq - 1;
-
-	    q = p;
-	    p = (FreeBlock*) (((EWord*) q) + szq + 1);
-	    p->hdr = FREE_ABOVE_BIT | FREE_BIT | szp;
-
-	    if (IS_FREE_ABOVE(q)) { /* This should not be possible I think,
-				       but just in case... */
-		tmpsz = SIZEOF_ABOVE(q) + 1;
-		szq += tmpsz;
-		q = (FreeBlock*) (((EWord*) q) - tmpsz);
-		unlink_free_block((Block_t *) q);
-		q->hdr = (q->hdr & FREE_ABOVE_BIT) | FREE_BIT | szq;
-	    }
-	    mark_free(q, szq);
-	    link_free_block((Block_t *) q);
-
-	} /* else already had the correct alignment */
- 
-	nw = nb < MIN_BYTE_SIZE ? MIN_ALIGN_SIZE : ALIGN_SIZE(nb);
-    }
-
-    split_block(p, nw, SIZEOF(p));
-
-    STAT_ALLOCED_BLOCK(SIZEOF(p));
-
-    if (clear) {
-	EWord* pp = ((AllocatedBlock*)p)->v;
-
-	while(nw--)
-	    *pp++ = 0;
-    }
-
-    return (AllocatedBlock*) p;
-}
-
-
-/*
-** Deallocate memory pointed to by p
-** 1. Merge with block above if this block is free
-** 2. Merge with block below if this block is free
-** Link the block to the correct free list
-**
-** p points to the block header!
-**
-*/
-static void deallocate(AllocatedBlock* p, int stat_count)
-{
-    FreeBlock* q;
-    EWord szq;
-    EWord szp;
-
-    szp = SIZEOF(p);
-
-    if (stat_count)
-	STAT_FREED_BLOCK(SIZEOF(p));
-
-    if (IS_FREE_ABOVE(p)) {
-	szq = SIZEOF_ABOVE(p);
-	q = (FreeBlock*) ( ((EWord*) p) - szq - 1);
-	unlink_free_block((Block_t *) q);
-
-	p = (AllocatedBlock*) q;
-	szp += (szq + 1);
-    }
-    q = (FreeBlock*) (p->v + szp);
-    if (IS_FREE(q)) {
-	szq = SIZEOF(q);
-	unlink_free_block((Block_t *) q);
-	szp += (szq + 1);
-    }
-    else
-	q->hdr |= FREE_ABOVE_BIT;
-
-    /* The block above p can NEVER be free !!! */
-    p->hdr = FREE_BIT | szp;
-    p->v[szp-1] = szp;
-
-    link_free_block((Block_t *) p);
-}
-
-/*
-** Reallocate memory
-** If preserve is true then data is moved if neccesary
-*/
-static AllocatedBlock* reallocate(AllocatedBlock* p, EWord nb, int preserve)
-{
-    EWord szp;
-    EWord szq;
-    EWord sz;
-    EWord nw;
-    FreeBlock* q;
-
-    if (nb < MIN_BYTE_SIZE)
-	nw = MIN_ALIGN_SIZE;
-    else
-	nw = ALIGN_SIZE(nb);
-
-    sz = szp = SIZEOF(p);
-
-    STAT_FREED_BLOCK(szp);
-
-    /* Merge with block below */
-    q = (FreeBlock*) (p->v + szp);
-    if (IS_FREE(q)) {
-	szq = SIZEOF(q);
-	unlink_free_block((Block_t *) q);
-	szp += (szq + 1);
-    }
-
-    if (nw <= szp) {
-	split_block((FreeBlock *) p, nw, szp);
-	STAT_ALLOCED_BLOCK(SIZEOF(p));
-	return p;
-    }
-    else {
-	EWord* dp = p->v;
-	AllocatedBlock* npp;
-
-	if (IS_FREE_ABOVE(p)) {
-	    szq = SIZEOF_ABOVE(p);
-	    if (szq + szp + 1 >= nw) {
-		q = (FreeBlock*) (((EWord*) p) - szq - 1);
-		unlink_free_block((Block_t * )q);
-		szp += (szq + 1);
-		p = (AllocatedBlock*) q;
-
-		if (preserve) {
-		    EWord* pp = p->v;
-		    while(sz--)
-			*pp++ = *dp++;
-		}
-		split_block((FreeBlock *) p, nw, szp);
-		STAT_ALLOCED_BLOCK(SIZEOF(p));
-		return p;
-	    }
-	}
-
-	/*
-	 * Update p so that allocate() and deallocate() works.
-	 * (Note that allocate() may call expand_sbrk(), which in
-	 * in turn calls deallocate().)
-	 */
-
-	p->hdr = (p->hdr & FREE_ABOVE_BIT) | szp;
-	p->v[szp] &= ~FREE_ABOVE_BIT;
-
-	npp = allocate(nb, ELIB_ALIGN, 0);
-	if(npp == NULL)
-	    return NULL;
-	if (preserve) {
-	    EWord* pp = npp->v;
-	    while(sz--)
-		*pp++ = *dp++;
-	}
-	deallocate(p, 0);
-	return npp;
-    }
-}
-
-/*
-** What malloc() and friends should do (and return) when the heap is
-** exhausted.  [sverkerw]
-*/
-static void* heap_exhausted(void)
-{
-    /* Choose behaviour */
-#if 0
-    /* Crash-and-burn --- leave a usable corpse (hopefully) */
-    abort();
-#endif    
-    /* The usual ANSI-compliant behaviour */
-    return NULL;
-}
-
-/*
-** Allocate size bytes of memory
-*/
-void* ELIB_PREFIX(malloc, (size_t nb))
-{
-    void *res;
-    AllocatedBlock* p;
-
-    erts_mtx_lock(&malloc_mutex);
-    if (elib_need_init)
-	locked_elib_init(NULL,(EWord)0);
-
-    if (nb == 0)
-	res = NULL;
-    else if ((p = allocate(nb, ELIB_ALIGN, 0)) != 0) {
-	ELIB_ALIGN_CHECK(p->v);
-	res = p->v;
-    }
-    else
-	res = heap_exhausted();
-
-    erts_mtx_unlock(&malloc_mutex);
-
-    return res;
-}
-
-
-void* ELIB_PREFIX(calloc, (size_t nelem, size_t size))
-{
-    void *res;
-    int nb;
-    AllocatedBlock* p;
-    
-    erts_mtx_lock(&malloc_mutex);
-    if (elib_need_init)
-	locked_elib_init(NULL,(EWord)0);
-
-    if ((nb = nelem * size) == 0)
-	res = NULL;
-    else if ((p = allocate(nb, ELIB_ALIGN, 1)) != 0) {
-	ELIB_ALIGN_CHECK(p->v);
-	res = p->v;
-    }
-    else
-	res = heap_exhausted();
-
-    erts_mtx_unlock(&malloc_mutex);
-
-    return res;
-}
-
-/*
-** Free memory allocated by malloc
-*/
-
-void ELIB_PREFIX(free, (EWord* p))
-{
-    erts_mtx_lock(&malloc_mutex);
-    if (elib_need_init)
-	locked_elib_init(NULL,(EWord)0);
-
-    if (p != 0)
-	deallocate((AllocatedBlock*)(p-1), 1);
-
-    erts_mtx_unlock(&malloc_mutex);
-}
-
-void ELIB_PREFIX(cfree, (EWord* p))
-{
-    ELIB_PREFIX(free, (p));
-}
-
-
-/*
-** Realloc the memory allocated in p to nb number of bytes
-**
-*/
-
-void* ELIB_PREFIX(realloc, (EWord* p, size_t nb))
-{
-    void *res = NULL;
-    AllocatedBlock* pp;
-
-    erts_mtx_lock(&malloc_mutex);
-    if (elib_need_init)
-	locked_elib_init(NULL,(EWord)0);
-
-    if (p != 0) {
-	pp = (AllocatedBlock*) (p-1);
-	if (nb > 0) {
-	    if ((pp = reallocate(pp, nb, 1)) != 0) {
-		ELIB_ALIGN_CHECK(pp->v);
-		res = pp->v;
-	    }
-	}
-	else
-	    deallocate(pp, 1);
-    }
-    else if (nb > 0) {
-	if ((pp = allocate(nb, ELIB_ALIGN, 0)) != 0) {
-	    ELIB_ALIGN_CHECK(pp->v);
-	    res = pp->v;
-	}
-	else
-	    res = heap_exhausted();
-    }
-
-    erts_mtx_unlock(&malloc_mutex);
-
-    return res;
-}
-
-/*
-** Resize the memory area pointed to by p with nb number of bytes
-*/
-void* ELIB_PREFIX(memresize, (EWord* p, int nb))
-{
-    void *res = NULL;
-    AllocatedBlock* pp;
-
-    erts_mtx_lock(&malloc_mutex);
-    if (elib_need_init)
-	locked_elib_init(NULL,(EWord)0);
-
-    if (p != 0) {
-	pp = (AllocatedBlock*) (p-1);
-	if (nb > 0) {
-	    if ((pp = reallocate(pp, nb, 0)) != 0) {
-		ELIB_ALIGN_CHECK(pp->v);
-		res = pp->v;
-	    }
-	}
-	else
-	    deallocate(pp, 1);
-    }
-    else if (nb > 0) {
-	if ((pp = allocate(nb, ELIB_ALIGN, 0)) != 0) {
-	    ELIB_ALIGN_CHECK(pp->v);
-	    res = pp->v;
-	}
-	else
-	    res = heap_exhausted();
-    }
-
-    erts_mtx_unlock(&malloc_mutex);
-
-    return res;
-}
-
-
-/* Create aligned memory a must be a power of 2 !!! */
-
-void* ELIB_PREFIX(memalign, (int a, int nb))
-{
-    void *res;
-    AllocatedBlock* p;
-
-    erts_mtx_lock(&malloc_mutex);
-    if (elib_need_init)
-	locked_elib_init(NULL,(EWord)0);
-
-    if (nb == 0 || a <= 0)
-	res = NULL;
-    else if ((p = allocate(nb, a, 0)) != 0) {
-	ALIGN_CHECK(a, p->v);
-	res = p->v;
-    }
-    else
-	res = heap_exhausted();
-
-    erts_mtx_unlock(&malloc_mutex);
-
-    return res;
-}
-
-void* ELIB_PREFIX(valloc, (int nb))
-{
-    return ELIB_PREFIX(memalign, (page_size, nb));
-}
-
-
-void* ELIB_PREFIX(pvalloc, (int nb))
-{
-    return ELIB_PREFIX(memalign, (page_size, PAGES(nb)*page_size));
-}
-/* Return memory size for pointer p in bytes */
-
-int ELIB_PREFIX(memsize, (p))
-EWord* p;
-{
-    return SIZEOF((AllocatedBlock*)(p-1))*4;
-}
-
-
-/*
-** --------------------------------------------------------------------------
-**   DEBUG LIBRARY
-** --------------------------------------------------------------------------
-*/
-
-#ifdef ELIB_DEBUG
-
-#define IN_HEAP(p)  (((p) >= (char*) eheap) && (p) < (char*) eheap_top)
-/*
-** ptr_to_block: return the pointer to heap block pointed into by ptr
-** Returns 0 if not pointing into a block
-*/
-
-static EWord* ptr_to_block(char* ptr)
-{
-    AllocatedBlock* p = heap_head;
-    EWord sz;
-
-    while((sz = SIZEOF(p)) != 0) {
-	if ((ptr >= (char*) p->v) && (ptr < (char*)(p->v+sz)))
-	    return p->v;
-	p = (AllocatedBlock*) (p->v + sz);
-    }
-    return 0;
-}
-
-/*
-** Validate a pointer
-** returns:
-**      0  - if points to start of a block
-**      1  - if points outsize heap
-**     -1  - if points inside block
-**
-*/
-static int check_pointer(char* ptr)
-{
-    if (IN_HEAP(ptr)) {
-	if (ptr_to_block(ptr) == 0)
-	    return 1;
-	return 0;
-    }
-    return -1;
-}
-
-/*
-** Validate a memory area
-** returns:
-**      0 - if area is included in a block
-**     -1 - if area overlap a heap block
-**      1 - if area is outside heap
-*/
-static int check_area(char* ptr, int n)
-{
-    if (IN_HEAP(ptr)) {
-	if (IN_HEAP(ptr+n-1)) {
-	    EWord* p1 = ptr_to_block(ptr);
-	    EWord* p2 = ptr_to_block(ptr+n-1);
-
-	    if (p1 == p2)
-		return (p1 == 0) ? -1 : 0;
-	    return -1;
-	}
-    }
-    else if (IN_HEAP(ptr+n-1))
-	return -1;
-    return 1;
-}
-
-/*
-** Check if a block write will overwrite heap block
-*/
-static void check_write(char* ptr, int n, char* file, int line, char* fun)
-{
-    if (check_area(ptr, n) == -1) {
-	elib_printf(stderr, "RUNTIME ERROR: %s heap overwrite\n", fun);
-	elib_printf(stderr, "File: %s Line: %d\n", file, line);
-	ELIB_FAILURE;
-    }
-}
-
-/*
-** Check if a pointer is an allocated object
-*/
-static void check_allocated_block(char* ptr, char* file, int line, char* fun)
-{
-    EWord* q;
-
-    if (!IN_HEAP(ptr) || ((q=ptr_to_block(ptr)) == 0) || (ptr != (char*) q)) {
-	elib_printf(stderr, "RUNTIME ERROR: %s non heap pointer\n", fun);
-	elib_printf(stderr, "File: %s Line: %d\n", file, line);
-	ELIB_FAILURE;
-    }
-
-    if (IS_FREE((AllocatedBlock*)(q-1))) {
-	elib_printf(stderr, "RUNTIME ERROR: %s free pointer\n", fun);
-	elib_printf(stderr, "File: %s Line: %d\n", file, line);
-	ELIB_FAILURE;
-    }
-
-}
-
-/*
-** --------------------------------------------------------------------------
-**  DEBUG VERSIONS (COMPILED WITH THE ELIB.H)
-** --------------------------------------------------------------------------
-*/
-
-void* elib_dbg_malloc(int n, char* file, int line)
-{
-    return elib__malloc(n);
-}
-
-void* elib_dbg_calloc(int n, int s, char* file, int line)
-{
-    return elib__calloc(n, s);
-}
-
-void* elib_dbg_realloc(EWord* p, int n, char* file, int line)
-{
-    if (p == 0)
-	return elib__malloc(n);
-    check_allocated_block(p, file, line, "elib_realloc");
-    return elib__realloc(p, n);
-}
-
-void elib_dbg_free(EWord* p, char* file, int line)
-{
-    if (p == 0)
-	return;
-    check_allocated_block(p, file, line, "elib_free");
-    elib__free(p);
-}
-
-void elib_dbg_cfree(EWord* p, char* file, int line)
-{
-    if (p == 0)
-	return;
-    check_allocated_block(p, file, line, "elib_free");
-    elib__cfree(p);
-}
-
-void* elib_dbg_memalign(int a, int n, char* file, int line)
-{
-    return elib__memalign(a, n);
-}
-
-void* elib_dbg_valloc(int n, char* file, int line)
-{
-    return elib__valloc(n);
-}
-
-void* elib_dbg_pvalloc(int n, char* file, int line)
-{
-    return elib__pvalloc(n);
-}
-
-void* elib_dbg_memresize(EWord* p, int n, char* file, int line)
-{
-    if (p == 0)
-	return elib__malloc(n);
-    check_allocated_block(p, file, line, "elib_memresize");
-    return elib__memresize(p, n);
-}
-
-int elib_dbg_memsize(void* p, char* file, int line)
-{
-    check_allocated_block(p, file, line, "elib_memsize");
-    return elib__memsize(p);
-}
-
-/*
-** --------------------------------------------------------------------------
-**  LINK TIME FUNCTIONS (NOT COMPILED CALLS)
-** --------------------------------------------------------------------------
-*/
-
-void* elib_malloc(int n)
-{
-    return elib_dbg_malloc(n, "", -1);
-}
-
-void* elib_calloc(int n, int s)
-{
-    return elib_dbg_calloc(n, s, "", -1);
-}
-
-void* elib_realloc(EWord* p, int n)
-{
-    return elib_dbg_realloc(p, n, "", -1);
-}
-
-void elib_free(EWord* p)
-{
-    elib_dbg_free(p, "", -1);
-}
-
-void elib_cfree(EWord* p)
-{
-    elib_dbg_cfree(p, "", -1);
-}
-
-void* elib_memalign(int a, int n)
-{
-    return elib_dbg_memalign(a, n, "", -1);
-}
-
-void* elib_valloc(int n)
-{
-    return elib_dbg_valloc(n, "", -1);
-}
-
-void* elib_pvalloc(int n)
-{
-    return elib_dbg_pvalloc(n, "", -1);
-}
-
-void* elib_memresize(EWord* p, int n)
-{
-    return elib_dbg_memresize(p, n, "", -1);
-}
-
-
-int elib_memsize(EWord* p)
-{
-    return elib_dbg_memsize(p, "", -1);
-}
-
-#endif /* ELIB_DEBUG */
-
-/*
-** --------------------------------------------------------------------------
-** Map c library functions to elib
-** --------------------------------------------------------------------------
-*/
-
-#if defined(ELIB_ALLOC_IS_CLIB)
-void* malloc(size_t nb)
-{
-    return elib_malloc(nb);
-}
-
-void* calloc(size_t nelem, size_t size)
-{
-    return elib_calloc(nelem, size);
-}
-
-
-void free(void *p)
-{
-    elib_free(p);
-}
-
-void cfree(void *p)
-{
-    elib_cfree(p);
-}
-
-void* realloc(void* p, size_t nb)
-{
-    return elib_realloc(p, nb);
-}
-
-
-void* memalign(size_t a, size_t s)
-{
-    return elib_memalign(a, s);
-}
-
-void* valloc(size_t nb)
-{
-    return elib_valloc(nb);
-}
-
-void* pvalloc(size_t nb)
-{
-    return elib_pvalloc(nb);
-}
-
-#if 0
-void* memresize(void* p, int nb)
-{
-    return elib_memresize(p, nb);
-}
-
-int memsize(void* p)
-{
-    return elib_memsize(p);
-}
-#endif
-#endif /* ELIB_ALLOC_IS_CLIB */
-
-#endif /* ENABLE_ELIB_MALLOC */
-
-void elib_ensure_initialized(void)
-{
-#ifdef ENABLE_ELIB_MALLOC
-#ifndef ELIB_DONT_INITIALIZE
-    elib_init(NULL, 0);
-#endif
-#endif
-}
-
-#ifdef ENABLE_ELIB_MALLOC
-/**
- ** A Slightly modified version of the "address order best fit" algorithm
- ** used in erl_bestfit_alloc.c. Comments refer to that implementation.
- **/
-
-/*
- * Description:	A combined "address order best fit"/"best fit" allocator
- *              based on a Red-Black (binary search) Tree. The search,
- *              insert, and delete operations are all O(log n) operations
- *              on a Red-Black Tree. In the "address order best fit" case
- *              n equals number of free blocks, and in the "best fit" case
- *              n equals number of distinct sizes of free blocks. Red-Black
- *              Trees are described in "Introduction to Algorithms", by
- *              Thomas H. Cormen, Charles E. Leiserson, and
- *              Ronald L. Riverest.
- *
- *              This module is a callback-module for erl_alloc_util.c
- *
- * Author: 	Rickard Green
- */
-
-#ifdef DEBUG
-#if 0
-#define HARD_DEBUG
-#endif
-#else
-#undef HARD_DEBUG
-#endif
-
-#define SZ_MASK			SIZE_MASK
-#define FLG_MASK		(~(SZ_MASK))
-
-#define BLK_SZ(B)  (*((Block_t *) (B)) & SZ_MASK)
-
-#define TREE_NODE_FLG		(((Uint) 1) << 0)
-#define RED_FLG			(((Uint) 1) << 1)
-#ifdef HARD_DEBUG
-#  define LEFT_VISITED_FLG	(((Uint) 1) << 2)
-#  define RIGHT_VISITED_FLG	(((Uint) 1) << 3)
-#endif
-
-#define IS_TREE_NODE(N)		(((RBTree_t *) (N))->flags & TREE_NODE_FLG)
-#define IS_LIST_ELEM(N)		(!IS_TREE_NODE(((RBTree_t *) (N))))
-
-#define SET_TREE_NODE(N)	(((RBTree_t *) (N))->flags |= TREE_NODE_FLG)
-#define SET_LIST_ELEM(N)	(((RBTree_t *) (N))->flags &= ~TREE_NODE_FLG)
-
-#define IS_RED(N)		(((RBTree_t *) (N)) \
-				 && ((RBTree_t *) (N))->flags & RED_FLG)
-#define IS_BLACK(N)		(!IS_RED(((RBTree_t *) (N))))
-
-#define SET_RED(N)		(((RBTree_t *) (N))->flags |= RED_FLG)
-#define SET_BLACK(N)		(((RBTree_t *) (N))->flags &= ~RED_FLG)
-
-#undef ASSERT
-#define ASSERT ASSERT_EXPR
-
-#if 1
-#define RBT_ASSERT	ASSERT
-#else
-#define RBT_ASSERT(x)
-#endif
-
-
-#ifdef HARD_DEBUG
-static RBTree_t * check_tree(Uint);
-#endif
-
-#ifdef ERTS_INLINE
-#  ifndef ERTS_CAN_INLINE
-#    define ERTS_CAN_INLINE 1
-#  endif
-#else
-#  if defined(__GNUC__)
-#    define ERTS_CAN_INLINE 1
-#    define ERTS_INLINE __inline__
-#  elif defined(__WIN32__)
-#    define ERTS_CAN_INLINE 1
-#    define ERTS_INLINE __inline
-#  else
-#    define ERTS_CAN_INLINE 0
-#    define ERTS_INLINE
-#  endif
-#endif
-
-/* Types... */
-#if 0
-typedef struct RBTree_t_ RBTree_t;
-
-struct RBTree_t_ {
-    Block_t hdr;
-    Uint flags;
-    RBTree_t *parent;
-    RBTree_t *left;
-    RBTree_t *right;
-};
-#endif
-
-#if 0
-typedef struct {
-    RBTree_t t;
-    RBTree_t *next;
-} RBTreeList_t;
-
-#define LIST_NEXT(N) (((RBTreeList_t *) (N))->next)
-#define LIST_PREV(N) (((RBTreeList_t *) (N))->t.parent)
-#endif
-
-#ifdef DEBUG
-
-/* Destroy all tree fields */
-#define DESTROY_TREE_NODE(N)						\
-  sys_memset((void *) (((Block_t *) (N)) + 1),				\
-	     0xff,							\
-	     (sizeof(RBTree_t) - sizeof(Block_t)))
-
-/* Destroy all tree and list fields */
-#define DESTROY_LIST_ELEM(N)						\
-  sys_memset((void *) (((Block_t *) (N)) + 1),				\
-	     0xff,							\
-	     (sizeof(RBTreeList_t) - sizeof(Block_t)))
-
-#else
-
-#define DESTROY_TREE_NODE(N)
-#define DESTROY_LIST_ELEM(N)
-
-#endif
-
-
-/*
- * Red-Black Tree operations needed
- */
-
-static ERTS_INLINE void
-left_rotate(RBTree_t **root, RBTree_t *x)
-{
-    RBTree_t *y = x->right;
-    x->right = y->left;
-    if (y->left)
-	y->left->parent = x;
-    y->parent = x->parent;
-    if (!y->parent) {
-	RBT_ASSERT(*root == x);
-	*root = y;
-    }
-    else if (x == x->parent->left)
-	x->parent->left = y;
-    else {
-	RBT_ASSERT(x == x->parent->right);
-	x->parent->right = y;
-    }
-    y->left = x;
-    x->parent = y;
-}
-
-static ERTS_INLINE void
-right_rotate(RBTree_t **root, RBTree_t *x)
-{
-    RBTree_t *y = x->left;
-    x->left = y->right;
-    if (y->right)
-	y->right->parent = x;
-    y->parent = x->parent;
-    if (!y->parent) {
-	RBT_ASSERT(*root == x);
-	*root = y;
-    }
-    else if (x == x->parent->right)
-	x->parent->right = y;
-    else {
-	RBT_ASSERT(x == x->parent->left);
-	x->parent->left = y;
-    }
-    y->right = x;
-    x->parent = y;
-}
-
-
-/*
- * Replace node x with node y
- * NOTE: block header of y is not changed
- */
-static ERTS_INLINE void
-replace(RBTree_t **root, RBTree_t *x, RBTree_t *y)
-{
-
-    if (!x->parent) {
-	RBT_ASSERT(*root == x);
-	*root = y;
-    }
-    else if (x == x->parent->left)
-	x->parent->left = y;
-    else {
-	RBT_ASSERT(x == x->parent->right);
-	x->parent->right = y;
-    }
-    if (x->left) {
-	RBT_ASSERT(x->left->parent == x);
-	x->left->parent = y;
-    }
-    if (x->right) {
-	RBT_ASSERT(x->right->parent == x);
-	x->right->parent = y;
-    }
-
-    y->flags	= x->flags;
-    y->parent	= x->parent;
-    y->right	= x->right;
-    y->left	= x->left;
-
-    DESTROY_TREE_NODE(x);
-
-}
-
-static void
-tree_insert_fixup(RBTree_t *blk)
-{
-    RBTree_t *x = blk, *y;
-
-    /*
-     * Rearrange the tree so that it satisfies the Red-Black Tree properties
-     */
-
-    RBT_ASSERT(x != root && IS_RED(x->parent));
-    do {
-
-	/*
-	 * x and its parent are both red. Move the red pair up the tree
-	 * until we get to the root or until we can separate them.
-	 */
-
-	RBT_ASSERT(IS_RED(x));
-	RBT_ASSERT(IS_BLACK(x->parent->parent));
-	RBT_ASSERT(x->parent->parent);
-
-	if (x->parent == x->parent->parent->left) {
-	    y = x->parent->parent->right;
-	    if (IS_RED(y)) {
-		SET_BLACK(y);
-		x = x->parent;
-		SET_BLACK(x);
-		x = x->parent;
-		SET_RED(x);
-	    }
-	    else {
-
-		if (x == x->parent->right) {
-		    x = x->parent;
-		    left_rotate(&root, x);
-		}
-
-		RBT_ASSERT(x == x->parent->parent->left->left);
-		RBT_ASSERT(IS_RED(x));
-		RBT_ASSERT(IS_RED(x->parent));
-		RBT_ASSERT(IS_BLACK(x->parent->parent));
-		RBT_ASSERT(IS_BLACK(y));
-
-		SET_BLACK(x->parent);
-		SET_RED(x->parent->parent);
-		right_rotate(&root, x->parent->parent);
-
-		RBT_ASSERT(x == x->parent->left);
-		RBT_ASSERT(IS_RED(x));
-		RBT_ASSERT(IS_RED(x->parent->right));
-		RBT_ASSERT(IS_BLACK(x->parent));
-		break;
-	    }
-	}
-	else {
-	    RBT_ASSERT(x->parent == x->parent->parent->right);
-	    y = x->parent->parent->left;
-	    if (IS_RED(y)) {
-		SET_BLACK(y);
-		x = x->parent;
-		SET_BLACK(x);
-		x = x->parent;
-		SET_RED(x);
-	    }
-	    else {
-
-		if (x == x->parent->left) {
-		    x = x->parent;
-		    right_rotate(&root, x);
-		}
-
-		RBT_ASSERT(x == x->parent->parent->right->right);
-		RBT_ASSERT(IS_RED(x));
-		RBT_ASSERT(IS_RED(x->parent));
-		RBT_ASSERT(IS_BLACK(x->parent->parent));
-		RBT_ASSERT(IS_BLACK(y));
-
-		SET_BLACK(x->parent);
-		SET_RED(x->parent->parent);
-		left_rotate(&root, x->parent->parent);
-
-		RBT_ASSERT(x == x->parent->right);
-		RBT_ASSERT(IS_RED(x));
-		RBT_ASSERT(IS_RED(x->parent->left));
-		RBT_ASSERT(IS_BLACK(x->parent));
-		break;
-	    }
-	}
-    } while (x != root && IS_RED(x->parent));
-
-    SET_BLACK(root);
-}
-
-static void
-unlink_free_block(Block_t *del)
-{
-    Uint spliced_is_black;
-    RBTree_t *x, *y, *z = (RBTree_t *) del;
-    RBTree_t null_x; /* null_x is used to get the fixup started when we
-			splice out a node without children. */
-
-    null_x.parent = NULL;
-
-#ifdef HARD_DEBUG
-    check_tree(0);
-#endif
-
-    /* Remove node from tree... */
-
-    /* Find node to splice out */
-    if (!z->left || !z->right)
-	y = z;
-    else
-	/* Set y to z:s successor */
-	for(y = z->right; y->left; y = y->left);
-    /* splice out y */
-    x = y->left ? y->left : y->right;
-    spliced_is_black = IS_BLACK(y);
-    if (x) {
-	x->parent = y->parent;
-    }
-    else if (!x && spliced_is_black) {
-	x = &null_x;
-	x->flags = 0;
-	SET_BLACK(x);
-	x->right = x->left = NULL;
-	x->parent = y->parent;
-	y->left = x;
-    }
-
-    if (!y->parent) {
-	RBT_ASSERT(root == y);
-	root = x;
-    }
-    else if (y == y->parent->left)
-	y->parent->left = x;
-    else {
-	RBT_ASSERT(y == y->parent->right);
-	y->parent->right = x;
-    }
-    if (y != z) {
-	/* We spliced out the successor of z; replace z by the successor */
-	replace(&root, z, y);
-    }
-
-    if (spliced_is_black) {
-	/* We removed a black node which makes the resulting tree
-	   violate the Red-Black Tree properties. Fixup tree... */
-
-	while (IS_BLACK(x) && x->parent) {
-
-	    /*
-	     * x has an "extra black" which we move up the tree
-	     * until we reach the root or until we can get rid of it.
-	     *
-	     * y is the sibbling of x
-	     */
-
-	    if (x == x->parent->left) {
-		y = x->parent->right;
-		RBT_ASSERT(y);
-		if (IS_RED(y)) {
-		    RBT_ASSERT(y->right);
-		    RBT_ASSERT(y->left);
-		    SET_BLACK(y);
-		    RBT_ASSERT(IS_BLACK(x->parent));
-		    SET_RED(x->parent);
-		    left_rotate(&root, x->parent);
-		    y = x->parent->right;
-		}
-		RBT_ASSERT(y);
-		RBT_ASSERT(IS_BLACK(y));
-		if (IS_BLACK(y->left) && IS_BLACK(y->right)) {
-		    SET_RED(y);
-		    x = x->parent;
-		}
-		else {
-		    if (IS_BLACK(y->right)) {
-			SET_BLACK(y->left);
-			SET_RED(y);
-			right_rotate(&root, y);
-			y = x->parent->right;
-		    }
-		    RBT_ASSERT(y);
-		    if (IS_RED(x->parent)) {
-
-			SET_BLACK(x->parent);
-			SET_RED(y);
-		    }
-		    RBT_ASSERT(y->right);
-		    SET_BLACK(y->right);
-		    left_rotate(&root, x->parent);
-		    x = root;
-		    break;
-		}
-	    }
-	    else {
-		RBT_ASSERT(x == x->parent->right);
-		y = x->parent->left;
-		RBT_ASSERT(y);
-		if (IS_RED(y)) {
-		    RBT_ASSERT(y->right);
-		    RBT_ASSERT(y->left);
-		    SET_BLACK(y);
-		    RBT_ASSERT(IS_BLACK(x->parent));
-		    SET_RED(x->parent);
-		    right_rotate(&root, x->parent);
-		    y = x->parent->left;
-		}
-		RBT_ASSERT(y);
-		RBT_ASSERT(IS_BLACK(y));
-		if (IS_BLACK(y->right) && IS_BLACK(y->left)) {
-		    SET_RED(y);
-		    x = x->parent;
-		}
-		else {
-		    if (IS_BLACK(y->left)) {
-			SET_BLACK(y->right);
-			SET_RED(y);
-			left_rotate(&root, y);
-			y = x->parent->left;
-		    }
-		    RBT_ASSERT(y);
-		    if (IS_RED(x->parent)) {
-			SET_BLACK(x->parent);
-			SET_RED(y);
-		    }
-		    RBT_ASSERT(y->left);
-		    SET_BLACK(y->left);
-		    right_rotate(&root, x->parent);
-		    x = root;
-		    break;
-		}
-	    }
-	}
-	SET_BLACK(x);
-
-	if (null_x.parent) {
-	    if (null_x.parent->left == &null_x)
-		null_x.parent->left = NULL;
-	    else {
-		RBT_ASSERT(null_x.parent->right == &null_x);
-		null_x.parent->right = NULL;
-	    }
-	    RBT_ASSERT(!null_x.left);
-	    RBT_ASSERT(!null_x.right);
-	}
-	else if (root == &null_x) {
-	    root = NULL;
-	    RBT_ASSERT(!null_x.left);
-	    RBT_ASSERT(!null_x.right);
-	}
-    }
-
-
-    DESTROY_TREE_NODE(del);
-
-#ifdef HARD_DEBUG
-    check_tree(0);
-#endif
-
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
- * "Address order best fit" specific callbacks.                              *
-\*                                                                           */
-
-static void
-link_free_block(Block_t *block)
-{
-    RBTree_t *blk = (RBTree_t *) block;
-    Uint blk_sz = BLK_SZ(blk);
-
-    blk->flags	= 0;
-    blk->left	= NULL;
-    blk->right	= NULL;
-
-    if (!root) {
-	blk->parent = NULL;
-	SET_BLACK(blk);
-	root = blk;
-    } else {
-	RBTree_t *x = root;
-	while (1) {
-	    Uint size;
-
-	    size = BLK_SZ(x);
-
-	    if (blk_sz < size || (blk_sz == size && blk < x)) {
-		if (!x->left) {
-		    blk->parent = x;
-		    x->left = blk;
-		    break;
-		}
-		x = x->left;
-	    }
-	    else {
-		if (!x->right) {
-		    blk->parent = x;
-		    x->right = blk;
-		    break;
-		}
-		x = x->right;
-	    }
-
-	}
-
-	/* Insert block into size tree */
-	RBT_ASSERT(blk->parent);
-
-	SET_RED(blk);
-	if (IS_RED(blk->parent)) {
-	    tree_insert_fixup(blk);
-	}
-    }
-
-#ifdef HARD_DEBUG
-    check_tree(0);
-#endif
-}
-
-
-static Block_t *
-get_free_block(Uint size)
-{
-    RBTree_t *x = root;
-    RBTree_t *blk = NULL;
-    Uint blk_sz;
-
-    while (x) {
-	blk_sz = BLK_SZ(x);
-	if (blk_sz < size) {
-	    x = x->right;
-	}
-	else {
-	    blk = x;
-	    x = x->left;
-	}
-    }
-    
-    if (!blk)
-	return NULL;
-
-#ifdef HARD_DEBUG
-    ASSERT(blk == check_tree(size));
-#endif
-
-    unlink_free_block((Block_t *) blk);
-
-    return (Block_t *) blk;
-}
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
- * Debug functions                                                           *
-\*                                                                           */
-
-
-#ifdef HARD_DEBUG
-
-#define IS_LEFT_VISITED(FB)	((FB)->flags & LEFT_VISITED_FLG)
-#define IS_RIGHT_VISITED(FB)	((FB)->flags & RIGHT_VISITED_FLG)
-
-#define SET_LEFT_VISITED(FB)	((FB)->flags |= LEFT_VISITED_FLG)
-#define SET_RIGHT_VISITED(FB)	((FB)->flags |= RIGHT_VISITED_FLG)
-
-#define UNSET_LEFT_VISITED(FB)	((FB)->flags &= ~LEFT_VISITED_FLG)
-#define UNSET_RIGHT_VISITED(FB)	((FB)->flags &= ~RIGHT_VISITED_FLG)
-
-
-#if 0
-#  define PRINT_TREE
-#else
-#  undef PRINT_TREE
-#endif
-
-#ifdef PRINT_TREE
-static void print_tree(void);
-#endif
-
-/*
- * Checks that the order between parent and children are correct,
- * and that the Red-Black Tree properies are satisfied. if size > 0,
- * check_tree() returns a node that satisfies "best fit" resp.
- * "address order best fit".
- *
- * The Red-Black Tree properies are:
- *   1. Every node is either red or black.
- *   2. Every leaf (NIL) is black.
- *   3. If a node is red, then both its children are black.
- *   4. Every simple path from a node to a descendant leaf
- *      contains the same number of black nodes.
- */
-
-static RBTree_t *
-check_tree(Uint size)
-{
-    RBTree_t *res = NULL;
-    Sint blacks;
-    Sint curr_blacks;
-    RBTree_t *x;
-
-#ifdef PRINT_TREE
-    print_tree();
-#endif
-
-    if (!root)
-	return res;
-
-    x = root;
-    ASSERT(IS_BLACK(x));
-    ASSERT(!x->parent);
-    curr_blacks = 1;
-    blacks = -1;
-
-    while (x) {
-	if (!IS_LEFT_VISITED(x)) {
-	    SET_LEFT_VISITED(x);
-	    if (x->left) {
-		x = x->left;
-		if (IS_BLACK(x))
-		    curr_blacks++;
-		continue;
-	    }
-	    else {
-		if (blacks < 0)
-		    blacks = curr_blacks;
-		ASSERT(blacks == curr_blacks);
-	    }
-	}
-
-	if (!IS_RIGHT_VISITED(x)) {
-	    SET_RIGHT_VISITED(x);
-	    if (x->right) {
-		x = x->right;
-		if (IS_BLACK(x))
-		    curr_blacks++;
-		continue;
-	    }
-	    else {
-		if (blacks < 0)
-		    blacks = curr_blacks;
-		ASSERT(blacks == curr_blacks);
-	    }
-	}
-
-
-	if (IS_RED(x)) {
-	    ASSERT(IS_BLACK(x->right));
-	    ASSERT(IS_BLACK(x->left));
-	}
-
-	ASSERT(x->parent || x == root);
-
-	if (x->left) {
-	    ASSERT(x->left->parent == x);
-	    ASSERT(BLK_SZ(x->left) < BLK_SZ(x)
-		   || (BLK_SZ(x->left) == BLK_SZ(x) && x->left < x));
-	}
-
-	if (x->right) {
-	    ASSERT(x->right->parent == x);
-	    ASSERT(BLK_SZ(x->right) > BLK_SZ(x)
-		   || (BLK_SZ(x->right) == BLK_SZ(x) && x->right > x));
-	}
-
-	if (size && BLK_SZ(x) >= size) {
-	    if (!res
-		|| BLK_SZ(x) < BLK_SZ(res)
-		|| (BLK_SZ(x) == BLK_SZ(res) && x < res))
-		res = x;
-	}
-
-	UNSET_LEFT_VISITED(x);
-	UNSET_RIGHT_VISITED(x);
-	if (IS_BLACK(x))
-	    curr_blacks--;
-	x = x->parent;
-
-    }
-
-    ASSERT(curr_blacks == 0);
-
-    UNSET_LEFT_VISITED(root);
-    UNSET_RIGHT_VISITED(root);
-
-    return res;
-
-}
-
-
-#ifdef PRINT_TREE
-#define INDENT_STEP 2
-
-#include <stdio.h>
-
-static void
-print_tree_aux(RBTree_t *x, int indent)
-{
-    int i;
-
-    if (!x) {
-	for (i = 0; i < indent; i++) {
-	    putc(' ', stderr);
-	}
-	fprintf(stderr, "BLACK: nil\r\n");
-    }
-    else {
-	print_tree_aux(x->right, indent + INDENT_STEP);
-	for (i = 0; i < indent; i++) {
-	    putc(' ', stderr);
-	}
-	fprintf(stderr, "%s: sz=%lu addr=0x%lx\r\n",
-		IS_BLACK(x) ? "BLACK" : "RED",
-		BLK_SZ(x),
-		(Uint) x);
-	print_tree_aux(x->left,  indent + INDENT_STEP);
-    }
-}
-
-
-static void
-print_tree(void)
-{
-    fprintf(stderr, " --- Size-Adress tree begin ---\r\n");
-    print_tree_aux(root, 0);
-    fprintf(stderr, " --- Size-Adress tree end ---\r\n");
-}
-
-#endif
-
-#endif
-
-#endif /* ENABLE_ELIB_MALLOC */
diff --git a/erts/emulator/beam/elib_stat.h b/erts/emulator/beam/elib_stat.h
deleted file mode 100644
index d8c7f31737..0000000000
--- a/erts/emulator/beam/elib_stat.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1996-2009. 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%
- */
-
-/*
-** Interface to elib statistics
-**
-*/
-#ifndef __ELIB_STAT_H__
-#define __ELIB_STAT_H__
-
-struct elib_stat {
-    int mem_total;    /* Number of heap words  */
-    int mem_blocks;   /* Number of block */
-    int mem_alloc;    /* Number of words in use */
-    int mem_free;     /* Number of words free */
-    int min_used;     /* Size of the smallest block used */
-    int max_free;     /* Size of the largest free block */
-    int free_blocks;  /* Number of fragments in free list */
-    int mem_max_alloc;/* Max number of words in use */
-};
-
-EXTERN_FUNCTION(void, elib_statistics, (void*));
-EXTERN_FUNCTION(int,  elib_check_heap, (_VOID_));
-EXTERN_FUNCTION(void, elib_heap_dump, (char*));
-EXTERN_FUNCTION(void, elib_stat, (struct elib_stat*));
-EXTERN_FUNCTION(int,  elib_heap_map, (unsigned char*, int));
-EXTERN_FUNCTION(int,  elib_histo, (unsigned long*, unsigned long*, int, int));
-
-#endif
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index f8823b85fe..775f4435a9 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2002-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2011. 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
@@ -38,9 +38,6 @@
 #include "erl_bits.h"
 #include "erl_instrument.h"
 #include "erl_mseg.h"
-#ifdef ELIB_ALLOC_IS_CLIB
-#include "erl_version.h"
-#endif
 #include "erl_monitors.h"
 #include "erl_bif_timer.h"
 #if defined(ERTS_ALC_T_DRV_SEL_D_STATE) || defined(ERTS_ALC_T_DRV_EV_D_STATE)
@@ -64,8 +61,15 @@
 
 #ifdef DEBUG
 static Uint install_debug_functions(void);
+#if 0
+#define HARD_DEBUG
+#ifdef __GNUC__
+#warning "* * * * * * * * * * * * * *"
+#warning "* HARD DEBUG IS ENABLED!  *"
+#warning "* * * * * * * * * * * * * *"
+#endif
+#endif
 #endif
-extern void elib_ensure_initialized(void);
 
 ErtsAllocatorFunctions_t erts_allctrs[ERTS_ALC_A_MAX+1];
 ErtsAllocatorInfo_t erts_allctrs_info[ERTS_ALC_A_MAX+1];
@@ -391,6 +395,10 @@ refuse_af_strategy(struct au_init *init)
 
 static void init_thr_ix(int static_ixs);
 
+#ifdef HARD_DEBUG
+static void hdbg_init(void);
+#endif
+
 void
 erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
 {
@@ -406,6 +414,10 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
 	ERTS_DEFAULT_ALCU_INIT
     };
 
+#ifdef HARD_DEBUG
+    hdbg_init();
+#endif
+
     erts_sys_alloc_init();
     init_thr_ix(erts_no_schedulers);
     erts_init_utils_mem();
@@ -1336,6 +1348,13 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 	    argv[j++] = argv[i];
     }
     *argc = j;
+#if HALFWORD_HEAP
+    /* If halfword heap, silently ignore any disabling of internal 
+       allocators */
+    for (i = 0; i < aui_sz; ++i)
+	aui[i]->enable = 1;
+#endif
+
     
 }
 
@@ -1392,6 +1411,33 @@ void erts_alloc_reg_scheduler_id(Uint id)
     erts_tsd_set(thr_ix_key, (void *)(long) ix);
 }
 
+static void
+no_verify(Allctr_t *allctr)
+{
+
+}
+
+erts_alloc_verify_func_t
+erts_alloc_get_verify_unused_temp_alloc(Allctr_t **allctr)
+{
+    if (erts_allctrs_info[ERTS_ALC_A_TEMPORARY].alloc_util
+	&& erts_allctrs_info[ERTS_ALC_A_TEMPORARY].thr_spec) {
+	ErtsAllocatorThrSpec_t *tspec;
+	tspec = &erts_allctr_thr_spec[ERTS_ALC_A_TEMPORARY];
+	if (!tspec->all_thr_safe) {
+	    int ix = erts_alc_get_thr_ix();
+
+	    if (ix < tspec->size) {
+		*allctr = tspec->allctr[ix];
+		return erts_alcu_verify_unused;
+	    }
+	}
+    }
+
+    *allctr = NULL;
+    return no_verify;
+}
+
 __decl_noreturn void
 erts_alc_fatal_error(int error, int func, ErtsAlcType_t n, ...)
 {
@@ -1549,7 +1595,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
     Eterm atoms[sizeof(size)/sizeof(Uint)];
     Uint *uintps[sizeof(size)/sizeof(Uint)];
     Eterm euints[sizeof(size)/sizeof(Uint)];
-    int need_atom;
     int want_tot_or_sys;
     int length;
     Eterm res = THE_NON_VALUE;
@@ -1737,7 +1782,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
     /* Calculate values needed... */
 
     want_tot_or_sys = want.total || want.system;
-    need_atom = ERTS_MEM_NEED_ALL_ALCU || want.atom;
 
     if (ERTS_MEM_NEED_ALL_ALCU) {
 	size.total = 0;
@@ -2305,13 +2349,8 @@ erts_allocator_info_term(void *proc, Eterm which_alloc, int only_sz)
 			l = 0;
 			as[l] = am_atom_put("e", 1);
 			ts[l++] = am_true;
-#ifdef ELIB_ALLOC_IS_CLIB
-			as[l] = am_atom_put("m", 1);
-			ts[l++] = am_atom_put("elib", 4);
-#else
 			as[l] = am_atom_put("m", 1);
 			ts[l++] = am_atom_put("libc", 4);
-#endif
 			if(sas.trim_threshold >= 0) {
 			    as[l] = am_atom_put("tt", 2);
 			    ts[l++] = erts_bld_uint(hpp, szp,
@@ -2465,11 +2504,7 @@ erts_allocator_info(int to, void *arg)
 		    case ERTS_ALC_A_SYSTEM: {
 			SysAllocStat sas;
 			erts_print(to, arg, "option e: true\n");
-#ifdef ELIB_ALLOC_IS_CLIB
-			erts_print(to, arg, "option m: elib\n");
-#else
 			erts_print(to, arg, "option m: libc\n");
-#endif
 			sys_alloc_stat(&sas);
 			if(sas.trim_threshold >= 0)
 			    erts_print(to, arg, "option tt: %d\n", sas.trim_threshold);
@@ -2573,13 +2608,8 @@ erts_allocator_options(void *proc)
 
 		switch (a) {
 		case ERTS_ALC_A_SYSTEM:
-#ifdef ELIB_ALLOC_IS_CLIB
-		    as[l] = am_atom_put("m", 1);
-		    ts[l++] = am_atom_put("elib", 4);
-#else
 		    as[l] = am_atom_put("m", 1);
 		    ts[l++] = am_atom_put("libc", 4);
-#endif
 		    if(sas.trim_threshold >= 0) {
 			as[l] = am_atom_put("tt", 2);
 			ts[l++] = erts_bld_uint(hpp, szp,
@@ -2650,23 +2680,7 @@ erts_allocator_options(void *proc)
 
     features = length ? erts_bld_list(hpp, szp, length, terms) : NIL;
 
-#if defined(ELIB_ALLOC_IS_CLIB)
-    {
-	Eterm version;
-	int i;
-	int ver[5];
-	i = sscanf(ERLANG_VERSION,
-		   "%d.%d.%d.%d.%d",
-		   &ver[0], &ver[1], &ver[2], &ver[3], &ver[4]);
-
-	version = NIL;
-	for(i--; i >= 0; i--)
-	  version = erts_bld_cons(hpp, szp, make_small(ver[i]), version);
-
-	res = erts_bld_tuple(hpp, szp, 4,
-			     am_elib_malloc, version, features, settings);
-    }
-#elif defined(__GLIBC__)
+#if defined(__GLIBC__)
     {
 	Eterm AM_glibc = am_atom_put("glibc", 5);
 	Eterm version;
@@ -2862,12 +2876,10 @@ unsigned long erts_alc_test(unsigned long op,
 	    break;
 	}
 	case 0xf0a:
-	    if (ethr_mutex_lock((ethr_mutex *) a1) != 0)
-		ERTS_ALC_TEST_ABORT;
+	    ethr_mutex_lock((ethr_mutex *) a1);
 	    break;
 	case 0xf0b:
-	    if (ethr_mutex_unlock((ethr_mutex *) a1) != 0)
-		ERTS_ALC_TEST_ABORT;
+	    ethr_mutex_unlock((ethr_mutex *) a1);
 	    break;
 	case 0xf0c: {
 	    ethr_cond *cnd = erts_alloc(ERTS_ALC_T_UNDEF, sizeof(ethr_cond));
@@ -2883,31 +2895,21 @@ unsigned long erts_alc_test(unsigned long op,
 	    break;
 	}
 	case 0xf0e:
-	    if (ethr_cond_broadcast((ethr_cond *) a1) != 0)
-		ERTS_ALC_TEST_ABORT;
+	    ethr_cond_broadcast((ethr_cond *) a1);
 	    break;
 	case 0xf0f: {
 	    int res;
 	    do {
 		res = ethr_cond_wait((ethr_cond *) a1, (ethr_mutex *) a2);
 	    } while (res == EINTR);
-	    if (res != 0)
-		ERTS_ALC_TEST_ABORT;
 	    break;
 	}
 	case 0xf10: {
 	    ethr_tid *tid = erts_alloc(ERTS_ALC_T_UNDEF, sizeof(ethr_tid));
-#ifdef ERTS_ENABLE_LOCK_COUNT
-	    if (erts_lcnt_thr_create(tid,
-				(void * (*)(void *)) a1,
-				(void *) a2,
-				NULL) != 0)
-#else
 	    if (ethr_thr_create(tid,
 				(void * (*)(void *)) a1,
 				(void *) a2,
 				NULL) != 0)
-#endif
 		ERTS_ALC_TEST_ABORT;
 	    return (unsigned long) tid;
 	}
@@ -2946,8 +2948,11 @@ unsigned long erts_alc_test(unsigned long op,
 #undef PRINT_OPS
 #endif
 
-
+#ifdef HARD_DEBUG
+#define FENCE_SZ		(4*sizeof(UWord))
+#else
 #define FENCE_SZ		(3*sizeof(UWord))
+#endif
 
 #if defined(ARCH_64)
 #define FENCE_PATTERN 0xABCDEF97ABCDEF97
@@ -2969,6 +2974,104 @@ unsigned long erts_alc_test(unsigned long op,
 #define GET_TYPE_OF_PATTERN(P) \
   (((P) >> TYPE_PATTERN_SHIFT) & TYPE_PATTERN_MASK)
 
+#ifdef HARD_DEBUG
+
+#define ERL_ALC_HDBG_MAX_MBLK 100000
+#define ERTS_ALC_O_CHECK -1
+
+typedef struct hdbg_mblk_ hdbg_mblk;
+struct hdbg_mblk_ {
+    hdbg_mblk *next;
+    hdbg_mblk *prev;
+    void *p;
+    Uint s;
+    ErtsAlcType_t n;
+};
+
+static hdbg_mblk hdbg_mblks[ERL_ALC_HDBG_MAX_MBLK];
+
+static hdbg_mblk *free_hdbg_mblks;
+static hdbg_mblk *used_hdbg_mblks;
+static erts_mtx_t hdbg_mblk_mtx;
+
+static void
+hdbg_init(void)
+{
+    int i;
+    for (i = 0; i < ERL_ALC_HDBG_MAX_MBLK-1; i++)
+	hdbg_mblks[i].next = &hdbg_mblks[i+1];
+    hdbg_mblks[ERL_ALC_HDBG_MAX_MBLK-1].next = NULL;
+    free_hdbg_mblks = &hdbg_mblks[0];
+    used_hdbg_mblks = NULL;
+    erts_mtx_init(&hdbg_mblk_mtx, "erts_alloc_hard_debug");
+}
+
+static void *check_memory_fence(void *ptr,
+				Uint *size,
+				ErtsAlcType_t n,
+				int func);
+void erts_hdbg_chk_blks(void);
+
+void
+erts_hdbg_chk_blks(void)
+{
+    hdbg_mblk *mblk;
+
+    erts_mtx_lock(&hdbg_mblk_mtx);
+    for (mblk = used_hdbg_mblks; mblk; mblk = mblk->next) {
+	Uint sz;
+	check_memory_fence(mblk->p, &sz, mblk->n, ERTS_ALC_O_CHECK);
+	ASSERT(sz == mblk->s);
+    }
+    erts_mtx_unlock(&hdbg_mblk_mtx);
+}
+
+static hdbg_mblk *
+hdbg_alloc(void *p, Uint s, ErtsAlcType_t n)
+{
+    hdbg_mblk *mblk;
+
+    erts_mtx_lock(&hdbg_mblk_mtx);
+    mblk = free_hdbg_mblks;
+    if (!mblk) {
+	erts_fprintf(stderr,
+		     "Ran out of debug blocks; please increase "
+		     "ERL_ALC_HDBG_MAX_MBLK=%d and recompile!\n",
+		     ERL_ALC_HDBG_MAX_MBLK);
+	abort();
+    }
+    free_hdbg_mblks = mblk->next;
+
+    mblk->p = p;
+    mblk->s = s;
+    mblk->n = n;
+
+    mblk->next = used_hdbg_mblks;
+    mblk->prev = NULL;
+    if (used_hdbg_mblks)
+	used_hdbg_mblks->prev = mblk;
+    used_hdbg_mblks = mblk;
+    erts_mtx_unlock(&hdbg_mblk_mtx);
+    return (void *) mblk;
+}
+
+static void
+hdbg_free(hdbg_mblk *mblk)
+{
+    erts_mtx_lock(&hdbg_mblk_mtx);
+    if (mblk->next)
+	mblk->next->prev = mblk->prev;
+    if (mblk->prev)
+	mblk->prev->next = mblk->next;
+    else
+	used_hdbg_mblks = mblk->next;
+
+    mblk->next = free_hdbg_mblks;
+    free_hdbg_mblks = mblk;
+    erts_mtx_unlock(&hdbg_mblk_mtx);
+}
+
+#endif
 
 #ifdef  ERTS_ALLOC_UTIL_HARD_DEBUG
 static void *check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func);
@@ -3014,17 +3117,28 @@ set_memory_fence(void *ptr, Uint sz, ErtsAlcType_t n)
 {
     UWord *ui_ptr;
     UWord pattern;
+#ifdef HARD_DEBUG
+    hdbg_mblk **mblkpp;
+#endif
 
     if (!ptr)
 	return NULL;
 
     ui_ptr = (UWord *) ptr;
     pattern = MK_PATTERN(n);
-    
+
+#ifdef HARD_DEBUG
+    mblkpp = (hdbg_mblk **) ui_ptr++;
+#endif
+
     *(ui_ptr++) = sz;
     *(ui_ptr++) = pattern;
     memcpy((void *) (((char *) ui_ptr)+sz), (void *) &pattern, sizeof(UWord));
 
+#ifdef HARD_DEBUG
+    *mblkpp = hdbg_alloc((void *) ui_ptr, sz, n);
+#endif
+
     return (void *) ui_ptr;
 }
 
@@ -3036,6 +3150,9 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
     UWord pre_pattern;
     UWord post_pattern;
     UWord *ui_ptr;
+#ifdef HARD_DEBUG
+    hdbg_mblk *mblk;
+#endif
 
     if (!ptr)
 	return NULL;
@@ -3043,6 +3160,9 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
     ui_ptr = (UWord *) ptr;
     pre_pattern = *(--ui_ptr);
     *size = sz = *(--ui_ptr);
+#ifdef HARD_DEBUG
+    mblk = (hdbg_mblk *) *(--ui_ptr);
+#endif
 
     found_type = GET_TYPE_OF_PATTERN(pre_pattern);
     if (pre_pattern != MK_PATTERN(n)) {
@@ -3098,6 +3218,17 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
 		 (unsigned long) ptr, (unsigned long) sz, ftype, op_str, otype);
     }
 
+#ifdef HARD_DEBUG
+    switch (func) {
+    case ERTS_ALC_O_REALLOC:
+    case ERTS_ALC_O_FREE:
+	hdbg_free(mblk);
+	break;
+    default:
+	break;
+    }
+#endif
+
     return (void *) ui_ptr;
 }
 
@@ -3110,6 +3241,10 @@ debug_alloc(ErtsAlcType_t n, void *extra, Uint size)
     Uint dsize;
     void *res;
 
+#ifdef HARD_DEBUG
+    erts_hdbg_chk_blks();
+#endif
+
     ASSERT(ERTS_ALC_N_MIN <= n && n <= ERTS_ALC_N_MAX);
     dsize = size + FENCE_SZ;
     res = (*real_af->alloc)(n, real_af->extra, dsize);
@@ -3139,13 +3274,17 @@ debug_realloc(ErtsAlcType_t n, void *extra, void *ptr, Uint size)
     dsize = size + FENCE_SZ;
     dptr = check_memory_fence(ptr, &old_size, n, ERTS_ALC_O_REALLOC);
 
+#ifdef HARD_DEBUG
+    erts_hdbg_chk_blks();
+#endif
+
     if (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 = set_memory_fence(res, size, n);
 
 #ifdef PRINT_OPS
@@ -3175,6 +3314,10 @@ debug_free(ErtsAlcType_t n, void *extra, void *ptr)
     fprintf(stderr, "free(%s, 0x%lx)\r\n", ERTS_ALC_N2TD(n), (Uint) ptr);
 #endif
 
+#ifdef HARD_DEBUG
+    erts_hdbg_chk_blks();
+#endif
+
 }
 
 static Uint
diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h
index 3e96c76dbf..17ff9c3b03 100644
--- a/erts/emulator/beam/erl_alloc.h
+++ b/erts/emulator/beam/erl_alloc.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2002-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2011. 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
@@ -236,6 +236,11 @@ void *erts_realloc_fnf(ErtsAlcType_t type, void *ptr, Uint size)
 
 #endif /* #if ERTS_ALC_DO_INLINE || defined(ERTS_ALC_INTERNAL__) */
 
+typedef void (*erts_alloc_verify_func_t)(Allctr_t *);
+
+erts_alloc_verify_func_t
+erts_alloc_get_verify_unused_temp_alloc(Allctr_t **allctr);
+
 #ifndef ERTS_CACHE_LINE_SIZE
 /* Assume a cache line size of 64 bytes */
 #  define ERTS_CACHE_LINE_SIZE ((UWord) 64)
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index 6f88bbe5b8..ca71798917 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2003-2010. All Rights Reserved.
+# Copyright Ericsson AB 2003-2011. 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
@@ -193,6 +193,7 @@ type	DB_FIXATION	SHORT_LIVED	ETS		db_fixation
 type	DB_FIX_DEL	SHORT_LIVED	ETS		fixed_del
 type	DB_TABLES	LONG_LIVED	ETS		db_tabs
 type    DB_NTAB_ENT	STANDARD	ETS		db_named_table_entry
+type	DB_HEIR_DATA	STANDARD	ETS		db_heir_data
 type	DB_TMP		TEMPORARY	ETS		db_tmp
 type	DB_MC_STK	TEMPORARY	ETS		db_mc_stack
 type	DB_MS_PSDO_PROC	LONG_LIVED	ETS		db_match_pseudo_proc
@@ -212,7 +213,8 @@ type	LOGGER_DSBUF	TEMPORARY	SYSTEM		logger_dsbuf
 type	TMP_DSBUF	TEMPORARY	SYSTEM		tmp_dsbuf
 type	INFO_DSBUF	SYSTEM		SYSTEM		info_dsbuf
 # INFO_DSBUF have to use the SYSTEM allocator; otherwise, a deadlock might occur
-type	SCHDLR_DATA	LONG_LIVED	PROCESSES	scheduler_data
+type	SCHDLR_DATA	LONG_LIVED	SYSTEM		scheduler_data
+type	SCHDLR_SLP_INFO	LONG_LIVED	SYSTEM		scheduler_sleep_info
 type	RUNQS		LONG_LIVED	SYSTEM		run_queues
 type	DDLL_PROCESS	STANDARD	SYSTEM		ddll_processes
 type	DDLL_HANDLE	STANDARD	SYSTEM		ddll_handle
@@ -246,6 +248,7 @@ type	CPUDATA		LONG_LIVED	SYSTEM		cpu_data
 type	TMP_CPU_IDS	SHORT_LIVED	SYSTEM		tmp_cpu_ids
 type	EXT_TERM_DATA	SHORT_LIVED	PROCESSES	external_term_data
 type	ZLIB		STANDARD	SYSTEM		zlib
+type	CPU_GRPS_MAP	LONG_LIVED	SYSTEM		cpu_groups_map
 
 +if smp
 type	ASYNC		SHORT_LIVED	SYSTEM		async
@@ -261,6 +264,8 @@ type	XPORTS_LIST	SHORT_LIVED	SYSTEM		extra_port_list
 type	PROC_LCK_WTR	LONG_LIVED	SYSTEM		proc_lock_waiter
 type	PROC_LCK_QS	LONG_LIVED	SYSTEM		proc_lock_queues
 type	RUNQ_BLNS	LONG_LIVED	SYSTEM		run_queue_balancing
+type	MISC_AUX_WORK_Q	LONG_LIVED	SYSTEM		misc_aux_work_q
+type	MISC_AUX_WORK	SHORT_LIVED	SYSTEM		misc_aux_work
 +endif
 
 #
@@ -269,7 +274,9 @@ type	RUNQ_BLNS	LONG_LIVED	SYSTEM		run_queue_balancing
 
 +if threads
 
-type	ETHR_INTERNAL	SYSTEM		SYSTEM		ethread_internal
+type	ETHR_STD	STANDARD	SYSTEM		ethread_standard
+type	ETHR_SL		SHORT_LIVED	SYSTEM		ethread_short_lived
+type	ETHR_LL		LONG_LIVED	SYSTEM		ethread_long_lived
 
 +ifnot smp
 
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index 8b184899c9..1394b7e829 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2002-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2011. 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
@@ -3368,6 +3368,38 @@ erts_alcu_test(unsigned long op, unsigned long a1, unsigned long a2)
  * Debug functions                                                           *
 \*                                                                           */
 
+void
+erts_alcu_verify_unused(Allctr_t *allctr)
+{
+    UWord no;
+
+    no = allctr->sbcs.curr_mseg.no;
+    no += allctr->sbcs.curr_sys_alloc.no;
+    no += allctr->mbcs.blocks.curr.no;
+
+    if (no) {
+	UWord sz = allctr->sbcs.blocks.curr.size;
+	sz += allctr->mbcs.blocks.curr.size;
+	erl_exit(ERTS_ABORT_EXIT,
+		 "%salloc() used when expected to be unused!\n"
+		 "Total amount of blocks allocated: %bpu\n"
+		 "Total amount of bytes allocated: %bpu\n",
+		 allctr->name_prefix, no, sz);
+    }
+}
+
+void
+erts_alcu_verify_unused_ts(Allctr_t *allctr)
+{
+#ifdef USE_THREADS
+    erts_mtx_lock(&allctr->mutex);
+#endif
+    erts_alcu_verify_unused(allctr);
+#ifdef USE_THREADS
+    erts_mtx_unlock(&allctr->mutex);
+#endif
+}
+
 #ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
 
 static void
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index f2b951bca6..d296081714 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2002-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2011. 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
@@ -333,6 +333,9 @@ struct Allctr_t_ {
 int	erts_alcu_start(Allctr_t *, AllctrInit_t *);
 void	erts_alcu_stop(Allctr_t *);
 
+void	erts_alcu_verify_unused(Allctr_t *);
+void	erts_alcu_verify_unused_ts(Allctr_t *allctr);
+
 unsigned long	erts_alcu_test(unsigned long, unsigned long, unsigned long);
 
 
diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c
index be691317ee..12c7631448 100644
--- a/erts/emulator/beam/erl_async.c
+++ b/erts/emulator/beam/erl_async.c
@@ -70,7 +70,6 @@ static ErlAsync* async_ready_list = NULL;
 /* Detach from driver */
 static void async_detach(DE_Handle* dh)
 {
-    /* XXX:PaN what should happen here? we want to unload the driver or??? */
     return;
 }
 
@@ -176,7 +175,6 @@ int exit_async()
 
 static void async_add(ErlAsync* a, AsyncQueue* q)
 {
-    /* XXX:PaN Is this still necessary when ports lock drivers? */
     if (is_internal_port(a->port)) {
 	ERTS_LC_ASSERT(erts_drvportid2port(a->port));
 	/* make sure the driver will stay around */
diff --git a/erts/emulator/beam/erl_bif_binary.c b/erts/emulator/beam/erl_bif_binary.c
index 82f1e06e8e..684fa5d12f 100644
--- a/erts/emulator/beam/erl_bif_binary.c
+++ b/erts/emulator/beam/erl_bif_binary.c
@@ -555,8 +555,12 @@ static void ac_init_find_all(ACFindAllState *state, ACTrie *act, Sint startpos,
 static void ac_restore_find_all(ACFindAllState *state, char *buff)
 {
     memcpy(state,buff,sizeof(ACFindAllState));
-    state->out = erts_alloc(ERTS_ALC_T_TMP, sizeof(FindallData) * (state->allocated));
-    memcpy(state->out,buff+sizeof(ACFindAllState),sizeof(FindallData)*state->m);
+    if (state->allocated > 0) {
+	state->out = erts_alloc(ERTS_ALC_T_TMP, sizeof(FindallData) * (state->allocated));
+	memcpy(state->out,buff+sizeof(ACFindAllState),sizeof(FindallData)*state->m);
+    } else {
+	state->out = NULL;
+    }
 }
 
 static void ac_serialize_find_all(ACFindAllState *state, char *buff)
@@ -828,10 +832,14 @@ static void bm_init_find_all(BMFindAllState *state, Sint startpos, Uint len)
 static void bm_restore_find_all(BMFindAllState *state, char *buff)
 {
     memcpy(state,buff,sizeof(BMFindAllState));
-    state->out = erts_alloc(ERTS_ALC_T_TMP, sizeof(FindallData) *
-			    (state->allocated));
-    memcpy(state->out,buff+sizeof(BMFindAllState),
-	   sizeof(FindallData)*state->m);
+    if (state->allocated > 0) {
+	state->out = erts_alloc(ERTS_ALC_T_TMP, sizeof(FindallData) *
+				(state->allocated));
+	memcpy(state->out,buff+sizeof(BMFindAllState),
+	       sizeof(FindallData)*state->m);
+    } else {
+	state->out = NULL;
+    }
 }
 
 static void bm_serialize_find_all(BMFindAllState *state, char *buff)
@@ -1128,7 +1136,7 @@ static int do_binary_match(Process *p, Eterm subject, Uint hsstart, Uint hsend,
 	    ret = am_nomatch;
 	} else if (acr == AC_RESTART) {
 	    int x = (sizeof(state) / sizeof(Eterm)) +
-		!!(sizeof(BMFindFirstState) % sizeof(Eterm));
+		!!(sizeof(ACFindFirstState) % sizeof(Eterm));
 #ifdef HARDDEBUG
 	    erts_printf("Trap ac!\n");
 #endif
@@ -1469,7 +1477,7 @@ BIF_RETTYPE binary_matches_3(BIF_ALIST_3)
 	goto badarg;
     }
     if (hsend == 0) {
-	BIF_RET(am_nomatch);
+	BIF_RET(NIL);
     }
     if (is_tuple(BIF_ARG_2)) {
 	tp = tuple_val(BIF_ARG_2);
@@ -2511,13 +2519,13 @@ BIF_RETTYPE binary_copy_trap(BIF_ALIST_2)
 	pb = (ProcBin *) HAlloc(BIF_P, PROC_BIN_SIZE);
 	pb->thing_word = HEADER_PROC_BIN;
 	pb->size = target_size;
-	pb->next = MSO(BIF_P).mso;
-	MSO(BIF_P).mso = pb;
+	pb->next = MSO(BIF_P).first;
+	MSO(BIF_P).first = (struct erl_off_heap_header*) pb;
 	pb->val = save;
 	pb->bytes = t;
 	pb->flags = 0;
 
-	MSO(BIF_P).overhead += target_size / sizeof(Eterm);
+	OH_OVERHEAD(&(MSO(BIF_P)), target_size / sizeof(Eterm));
 	BUMP_REDS(BIF_P,(pos - opos) / BINARY_COPY_LOOP_FACTOR);
 
 	BIF_RET(make_binary(pb));
@@ -2551,7 +2559,8 @@ BIF_RETTYPE binary_referenced_byte_size_1(BIF_ALIST_1)
     }
     pb = (ProcBin *) binary_val(bin);
     if (pb->thing_word == HEADER_PROC_BIN) {
-	res = erts_make_integer((Uint) pb->val->orig_size, BIF_P); /* XXX:PaN Halfword? orig_size is a long */
+	/* XXX:PaN - Halfword - orig_size is a long, we should handle that */
+	res = erts_make_integer((Uint) pb->val->orig_size, BIF_P);
     } else { /* heap binary */
 	res = erts_make_integer((Uint) ((ErlHeapBin *) pb)->size, BIF_P);
     }
diff --git a/erts/emulator/beam/erl_bif_ddll.c b/erts/emulator/beam/erl_bif_ddll.c
index 9d5f0d9c02..c9cdcb87a6 100644
--- a/erts/emulator/beam/erl_bif_ddll.c
+++ b/erts/emulator/beam/erl_bif_ddll.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2006-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2006-2010. 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
@@ -1193,7 +1193,7 @@ int erts_ddll_driver_ok(DE_Handle *dh)
 static void ddll_no_more_references(void *vdh)
 {
     DE_Handle *dh = (DE_Handle *) vdh;
-    int x;
+    erts_aint_t x;
 
     lock_drv_list();
 
@@ -1604,7 +1604,7 @@ static int do_load_driver_entry(DE_Handle *dh, char *path, char *name)
 	erts_sys_ddll_close(dh->handle);
 	return ERL_DE_LOAD_ERROR_BAD_NAME;
     }
-    erts_smp_atomic_init(&(dh->refc), (long) 0);
+    erts_smp_atomic_init(&(dh->refc), (erts_aint_t) 0);
     dh->port_count = 0;
     dh->full_path = erts_alloc(ERTS_ALC_T_DDLL_HANDLE, sys_strlen(path) + 1);
     sys_strcpy(dh->full_path, path);
@@ -1646,7 +1646,8 @@ static int do_unload_driver_entry(DE_Handle *dh, Eterm *save_name)
 	    if (save_name != NULL) {
 		*save_name = mkatom(q->name);
 	    } 
-	    /* XXX:PaN Future locking problems? Don't dare to let go of the diver_list lock here!*/
+	    /* Future locking problems? Don't dare to let go of the
+	       diver_list lock here!*/
 	    if (q->finish) {
 		int fpe_was_unmasked = erts_block_fpe();
 		(*(q->finish))();
@@ -1671,7 +1672,7 @@ static int load_driver_entry(DE_Handle **dhp, char *path, char *name)
     dh->handle = NULL;
     dh->procs = NULL;
     dh->port_count = 0;
-    erts_refc_init(&(dh->refc), (long) 0);
+    erts_refc_init(&(dh->refc), (erts_aint_t) 0);
     dh->status = -1;
     dh->reload_full_path = NULL;
     dh->reload_driver_name = NULL;
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 48cda52612..4a717d7271 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -38,9 +38,7 @@
 #include "erl_instrument.h"
 #include "dist.h"
 #include "erl_gc.h"
-#ifdef ELIB_ALLOC_IS_CLIB
-#include "elib_stat.h"
-#endif
+#include "erl_cpu_topology.h"
 #ifdef HIPE
 #include "hipe_arch.h"
 #endif
@@ -122,22 +120,26 @@ static char erts_system_version[] = ("Erlang " ERLANG_OTP_RELEASE
 #endif
 
 static Eterm
-bld_bin_list(Uint **hpp, Uint *szp, ProcBin* pb)
+bld_bin_list(Uint **hpp, Uint *szp, ErlOffHeap* oh)
 {
+    struct erl_off_heap_header* ohh;
     Eterm res = NIL;
     Eterm tuple;
 
-    for (; pb; pb = pb->next) {
-	Eterm val = erts_bld_uword(hpp, szp, (UWord) pb->val);
-	Eterm orig_size = erts_bld_uint(hpp, szp, pb->val->orig_size);
-
-	if (szp)
-	    *szp += 4+2;
-	if (hpp) {
-	    Uint refc = (Uint) erts_smp_atomic_read(&pb->val->refc);
-	    tuple = TUPLE3(*hpp, val, orig_size, make_small(refc));
-	    res = CONS(*hpp + 4, tuple, res);
-	    *hpp += 4+2;
+    for (ohh = oh->first; ohh; ohh = ohh->next) {
+	if (ohh->thing_word == HEADER_PROC_BIN) {
+	    ProcBin* pb = (ProcBin*) ohh;
+	    Eterm val = erts_bld_uword(hpp, szp, (UWord) pb->val);
+	    Eterm orig_size = erts_bld_uint(hpp, szp, pb->val->orig_size);
+    
+	    if (szp)
+		*szp += 4+2;
+	    if (hpp) {
+		Uint refc = (Uint) erts_smp_atomic_read(&pb->val->refc);
+		tuple = TUPLE3(*hpp, val, orig_size, make_small(refc));
+		res = CONS(*hpp + 4, tuple, res);
+		*hpp += 4+2;
+	    }
 	}
     }
     return res;
@@ -176,10 +178,10 @@ static void do_make_one_mon_element(ErtsMonitor *mon, void * vpmlc)
     Eterm tup;
     Eterm r = (IS_CONST(mon->ref)
 	       ? mon->ref
-	       : STORE_NC(&(pmlc->hp), &MSO(pmlc->p).externals, mon->ref));
+	       : STORE_NC(&(pmlc->hp), &MSO(pmlc->p), mon->ref));
     Eterm p = (IS_CONST(mon->pid)
 	       ? mon->pid
-	       : STORE_NC(&(pmlc->hp), &MSO(pmlc->p).externals, mon->pid));
+	       : STORE_NC(&(pmlc->hp), &MSO(pmlc->p), mon->pid));
     tup = TUPLE5(pmlc->hp, pmlc->tag, make_small(mon->type), r, p, mon->name);
     pmlc->hp += 6;
     pmlc->res = CONS(pmlc->hp, tup, pmlc->res);
@@ -240,7 +242,7 @@ static void do_make_one_lnk_element(ErtsLink *lnk, void * vpllc)
     Eterm old_res, targets = NIL;
     Eterm p = (IS_CONST(lnk->pid)
 	       ? lnk->pid
-	       : STORE_NC(&(pllc->hp), &MSO(pllc->p).externals, lnk->pid));
+	       : STORE_NC(&(pllc->hp), &MSO(pllc->p), lnk->pid));
     if (lnk->type == LINK_NODE) {
 	targets = make_small(ERTS_LINK_REFC(lnk));
     } else if (ERTS_LINK_ROOT(lnk) != NULL) {
@@ -1225,7 +1227,7 @@ process_info_aux(Process *BIF_P,
 	hp = HAlloc(BIF_P, 3 + mic.sz);
 	res = NIL;
 	for (i = 0; i < mic.mi_i; i++) {
-	    item = STORE_NC(&hp, &MSO(BIF_P).externals, mic.mi[i].entity); 
+	    item = STORE_NC(&hp, &MSO(BIF_P), mic.mi[i].entity); 
 	    res = CONS(hp, item, res);
 	    hp += 2;
 	}
@@ -1258,9 +1260,7 @@ process_info_aux(Process *BIF_P,
 	    else {
 		/* Monitor by pid. Build {process, Pid} and cons it. */
 		Eterm t;
-		Eterm pid = STORE_NC(&hp,
-				     &MSO(BIF_P).externals,
-				     mic.mi[i].entity);
+		Eterm pid = STORE_NC(&hp, &MSO(BIF_P), mic.mi[i].entity);
 		t = TUPLE2(hp, am_process, pid);
 		hp += 3;
 		res = CONS(hp, t, res);
@@ -1282,7 +1282,7 @@ process_info_aux(Process *BIF_P,
 
 	res = NIL;
 	for (i = 0; i < mic.mi_i; ++i) {
-	    item = STORE_NC(&hp, &MSO(BIF_P).externals, mic.mi[i].entity); 
+	    item = STORE_NC(&hp, &MSO(BIF_P), mic.mi[i].entity); 
 	    res = CONS(hp, item, res);
 	    hp += 2;
 	}
@@ -1491,7 +1491,7 @@ process_info_aux(Process *BIF_P,
     case am_group_leader: {
 	int sz = NC_HEAP_SIZE(rp->group_leader);
 	hp = HAlloc(BIF_P, 3 + sz);
-	res = STORE_NC(&hp, &MSO(BIF_P).externals, rp->group_leader);
+	res = STORE_NC(&hp, &MSO(BIF_P), rp->group_leader);
 	break;
     }
 
@@ -1516,9 +1516,9 @@ process_info_aux(Process *BIF_P,
 
     case am_binary: {
 	Uint sz = 3;
-	(void) bld_bin_list(NULL, &sz, MSO(rp).mso);
+	(void) bld_bin_list(NULL, &sz, &MSO(rp));
 	hp = HAlloc(BIF_P, sz);
-	res = bld_bin_list(&hp, NULL, MSO(rp).mso);
+	res = bld_bin_list(&hp, NULL, &MSO(rp));
 	break;
     }
 
@@ -1688,6 +1688,8 @@ info_1_tuple(Process* BIF_P,	/* Pointer to current process. */
 	return erts_get_cpu_topology_term(BIF_P, *tp);
     } else if (ERTS_IS_ATOM_STR("cpu_topology", sel) && arity == 2) {
 	Eterm res = erts_get_cpu_topology_term(BIF_P, *tp);
+	if (res == THE_NON_VALUE)
+	    goto badarg;
 	ERTS_BIF_PREP_TRAP1(ret, erts_format_cpu_topology_trap, BIF_P, res);
 	return ret;
 #if defined(PURIFY) || defined(VALGRIND)
@@ -1956,6 +1958,35 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 		    : am_enabled);
 	}
 #endif
+    } else if (BIF_ARG_1 == am_build_type) {
+#if defined(DEBUG)
+	ERTS_DECL_AM(debug);
+	BIF_RET(AM_debug);
+#elif defined(PURIFY)
+	ERTS_DECL_AM(purify);
+	BIF_RET(AM_purify);
+#elif defined(QUANTIFY)
+	ERTS_DECL_AM(quantify);
+	BIF_RET(AM_quantify);
+#elif defined(PURECOV)
+	ERTS_DECL_AM(purecov);
+	BIF_RET(AM_purecov);
+#elif defined(ERTS_GCOV)
+	ERTS_DECL_AM(gcov);
+	BIF_RET(AM_gcov);
+#elif defined(VALGRIND)
+	ERTS_DECL_AM(valgrind);
+	BIF_RET(AM_valgrind);
+#elif defined(GPROF)
+	ERTS_DECL_AM(gprof);
+	BIF_RET(AM_gprof);
+#elif defined(ERTS_ENABLE_LOCK_COUNT)
+	ERTS_DECL_AM(lcnt);
+	BIF_RET(AM_lcnt);
+#else
+	BIF_RET(am_opt);
+#endif
+	BIF_RET(res);
     } else if (BIF_ARG_1 == am_allocated_areas) {
 	res = erts_allocated_areas(NULL, NULL, BIF_P);
 	BIF_RET(res);
@@ -1971,6 +2002,8 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	BIF_RET(db_get_trace_control_word_0(BIF_P));
     } else if (ERTS_IS_ATOM_STR("ets_realloc_moves", BIF_ARG_1)) {
  	BIF_RET((erts_ets_realloc_always_moves) ? am_true : am_false);
+    } else if (ERTS_IS_ATOM_STR("ets_always_compress", BIF_ARG_1)) {
+	BIF_RET((erts_ets_always_compress) ? am_true : am_false);
     } else if (ERTS_IS_ATOM_STR("snifs", BIF_ARG_1)) {
 	Uint size = 0;
 	Uint *szp;
@@ -1987,7 +2020,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	res = TUPLE2(hp, am_sequential_tracer, val);
 	BIF_RET(res);
     } else if (BIF_ARG_1 == am_garbage_collection){
-	Uint val = (Uint) erts_smp_atomic_read(&erts_max_gen_gcs);
+	Uint val = (Uint) erts_smp_atomic32_read(&erts_max_gen_gcs);
 	Eterm tup;
 	hp = HAlloc(BIF_P, 3+2 + 3+2 + 3+2);
 
@@ -2002,7 +2035,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 
 	BIF_RET(res);
     } else if (BIF_ARG_1 == am_fullsweep_after){
-	Uint val = (Uint) erts_smp_atomic_read(&erts_max_gen_gcs);
+	Uint val = (Uint) erts_smp_atomic32_read(&erts_max_gen_gcs);
 	hp = HAlloc(BIF_P, 3);
 	res = TUPLE2(hp, am_fullsweep_after, make_small(val));
 	BIF_RET(res);
@@ -2124,86 +2157,8 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	BIF_RET(erts_alloc_util_allocators((void *) BIF_P));
     }
     else if (BIF_ARG_1 == am_elib_malloc) {
-#ifdef ELIB_ALLOC_IS_CLIB
-	struct elib_stat stat;
-	DECL_AM(heap_size);
-	DECL_AM(max_alloced_size);
-	DECL_AM(alloced_size);
-	DECL_AM(free_size);
-	DECL_AM(no_alloced_blocks);
-	DECL_AM(no_free_blocks);
-	DECL_AM(smallest_alloced_block);
-	DECL_AM(largest_free_block);
-	Eterm atoms[8];
-	Eterm ints[8];
-	Uint **hpp;
-	Uint sz;
-	Uint *szp;
-	int length;
-#ifdef DEBUG
-	Uint *endp;
-#endif
-
-	elib_stat(&stat);
-
-	/* First find out the heap size needed ... */
-	hpp = NULL;
-	szp = &sz;
-	sz = 0;
-
-    build_elib_malloc_term:
-	length = 0;
-	atoms[length] = AM_heap_size;
-	ints[length++] = erts_bld_uint(hpp, szp,
-				       (Uint) stat.mem_total*sizeof(Uint));
-	atoms[length] = AM_max_alloced_size;
-	ints[length++] = erts_bld_uint(hpp, szp,
-				       (Uint) stat.mem_max_alloc*sizeof(Uint));
-	atoms[length] = AM_alloced_size;
-	ints[length++] = erts_bld_uint(hpp, szp,
-				       (Uint) stat.mem_alloc*sizeof(Uint));
-	atoms[length] = AM_free_size;
-	ints[length++] = erts_bld_uint(hpp, szp,
-				       (Uint) stat.mem_free*sizeof(Uint));
-	atoms[length] = AM_no_alloced_blocks;
-	ints[length++] = erts_bld_uint(hpp, szp, (Uint) stat.mem_blocks);
-	atoms[length] = AM_no_free_blocks;
-	ints[length++] = erts_bld_uint(hpp, szp, (Uint) stat.free_blocks);
-	atoms[length] = AM_smallest_alloced_block;
-	ints[length++] = erts_bld_uint(hpp, szp,
-				       (Uint) stat.min_used*sizeof(Uint));
-	atoms[length] = AM_largest_free_block;
-	ints[length++] = erts_bld_uint(hpp, szp,
-				       (Uint) stat.max_free*sizeof(Uint));
-
-
-
-	ASSERT(length <= sizeof(atoms)/sizeof(Eterm));
-	ASSERT(length <= sizeof(ints)/sizeof(Eterm));
-
-	res = erts_bld_2tup_list(hpp, szp, length, atoms, ints);
-
-	if (szp) {
-	    /* ... and then build the term */
-	    hp = HAlloc(BIF_P, sz);
-#ifdef DEBUG
-	    endp = hp + sz;
-#endif
-
-	    szp = NULL;
-	    hpp = &hp;
-	    goto build_elib_malloc_term;
-	}
-
-#ifdef DEBUG
-	ASSERT(endp == hp);
-#endif
-
-#else /* #ifdef ELIB_ALLOC_IS_CLIB */
-	res = am_false;
-#endif /* #ifdef ELIB_ALLOC_IS_CLIB */
-
-	BIF_RET(res);
+	/* To be removed in R15 */
+        BIF_RET(am_false);
     }
     else if (BIF_ARG_1 == am_os_version) {
        int major, minor, build;
@@ -2314,6 +2269,15 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
     } else if (ERTS_IS_ATOM_STR("cpu_topology", BIF_ARG_1)) {
 	res = erts_get_cpu_topology_term(BIF_P, am_used);
 	BIF_TRAP1(erts_format_cpu_topology_trap, BIF_P, res);
+    } else if (ERTS_IS_ATOM_STR("update_cpu_info", BIF_ARG_1)) {
+	if (erts_update_cpu_info()) {
+	    ERTS_DECL_AM(changed);
+	    BIF_RET(AM_changed);
+	}
+	else {
+	    ERTS_DECL_AM(unchanged);
+	    BIF_RET(AM_unchanged);
+	}
 #if defined(__GNUC__) && defined(HAVE_SOLARIS_SPARC_PERFMON)
     } else if (ERTS_IS_ATOM_STR("ultrasparc_read_tick1", BIF_ARG_1)) {
 	register unsigned high asm("%l0");
@@ -2385,7 +2349,8 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
     }
     /* Arguments that are unusual follow ... */
     else if (ERTS_IS_ATOM_STR("logical_processors", BIF_ARG_1)) {
-	int no = erts_get_cpu_configured(erts_cpuinfo);
+	int no;
+	erts_get_logical_processors(&no, NULL, NULL);
 	if (no > 0)
 	    BIF_RET(make_small((Uint) no));
 	else {
@@ -2394,7 +2359,8 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	}
     }
     else if (ERTS_IS_ATOM_STR("logical_processors_online", BIF_ARG_1)) {
-	int no = erts_get_cpu_online(erts_cpuinfo);
+	int no;
+	erts_get_logical_processors(NULL, &no, NULL);
 	if (no > 0)
 	    BIF_RET(make_small((Uint) no));
 	else {
@@ -2403,7 +2369,8 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	}
     }
     else if (ERTS_IS_ATOM_STR("logical_processors_available", BIF_ARG_1)) {
-	int no = erts_get_cpu_available(erts_cpuinfo);
+	int no;
+	erts_get_logical_processors(NULL, NULL, &no);
 	if (no > 0)
 	    BIF_RET(make_small((Uint) no));
 	else {
@@ -2563,6 +2530,15 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	BIF_RET(erts_sched_stat_term(BIF_P, 1));
     } else if (ERTS_IS_ATOM_STR("taints", BIF_ARG_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("dist_buf_busy_limit", BIF_ARG_1)) {
+	Uint hsz = 0;
+
+ 	(void) erts_bld_uint(NULL, &hsz, erts_dist_buf_busy_limit);
+	hp = hsz ? HAlloc(BIF_P, hsz) : NULL;
+	res = erts_bld_uint(&hp, NULL, erts_dist_buf_busy_limit);
+	BIF_RET(res);
     }
 
     BIF_ERROR(BIF_P, BADARG);
@@ -2678,7 +2654,7 @@ BIF_RETTYPE port_info_2(BIF_ALIST_2)
 	hp = HAlloc(BIF_P, 3 + mic.sz);
 	res = NIL;
 	for (i = 0; i < mic.mi_i; i++) {
-	    item = STORE_NC(&hp, &MSO(BIF_P).externals, mic.mi[i].entity); 
+	    item = STORE_NC(&hp, &MSO(BIF_P), mic.mi[i].entity); 
 	    res = CONS(hp, item, res);
 	    hp += 2;
 	}
@@ -2698,7 +2674,7 @@ BIF_RETTYPE port_info_2(BIF_ALIST_2)
 	res = NIL;
 	for (i = 0; i < mic.mi_i; i++) {
 	    Eterm t;
-	    item = STORE_NC(&hp, &MSO(BIF_P).externals, mic.mi[i].entity); 
+	    item = STORE_NC(&hp, &MSO(BIF_P), mic.mi[i].entity); 
 	    t = TUPLE2(hp, am_process, item);
 	    hp += 3;
 	    res = CONS(hp, t, res);
@@ -3426,6 +3402,16 @@ BIF_RETTYPE erts_debug_get_internal_state_1(BIF_ALIST_1)
 	    else if (ERTS_IS_ATOM_STR("fake_scheduler_bindings", tp[1])) {
 		return erts_fake_scheduler_bindings(BIF_P, tp[2]);
 	    }
+	    else if (ERTS_IS_ATOM_STR("reader_groups_map", tp[1])) {
+		Sint groups;
+		if (is_not_small(tp[2]))
+		    BIF_ERROR(BIF_P, BADARG);
+		groups = signed_val(tp[2]);
+		if (groups < (Sint) 1 || groups > (Sint) INT_MAX)
+		    BIF_ERROR(BIF_P, BADARG);
+
+		BIF_RET(erts_debug_reader_groups_map(BIF_P, (int) groups));
+	    }
 	    break;
 	}
 	default:
@@ -3444,8 +3430,8 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
      */
     if (ERTS_IS_ATOM_STR("available_internal_state", BIF_ARG_1)
 	&& (BIF_ARG_2 == am_true || BIF_ARG_2 == am_false)) {
-	long on = (long) (BIF_ARG_2 == am_true);
-	long prev_on = erts_smp_atomic_xchg(&available_internal_state, on);
+	erts_aint_t on = (erts_aint_t) (BIF_ARG_2 == am_true);
+	erts_aint_t prev_on = erts_smp_atomic_xchg(&available_internal_state, on);
 	if (on) {
 	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
 	    erts_dsprintf(dsbufp, "Process %T ", BIF_P->id);
@@ -3642,7 +3628,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
 	}
 	else if (ERTS_IS_ATOM_STR("hipe_test_reschedule_suspend", BIF_ARG_1)) {
 	    /* Used by hipe test suites */
-	    long flag = erts_smp_atomic_read(&hipe_test_reschedule_flag);
+	    erts_aint_t flag = erts_smp_atomic_read(&hipe_test_reschedule_flag);
 	    if (!flag && BIF_ARG_2 != am_false) {
 		erts_smp_atomic_set(&hipe_test_reschedule_flag, 1);
 		erts_suspend(BIF_P, ERTS_PROC_LOCK_MAIN, NULL);
@@ -3717,7 +3703,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
 
 #ifdef ERTS_ENABLE_LOCK_COUNT
 static Eterm lcnt_build_lock_stats_term(Eterm **hpp, Uint *szp, erts_lcnt_lock_stats_t *stats, Eterm res) {
-    unsigned long tries = 0, colls = 0;
+    Uint tries = 0, colls = 0;
     unsigned long timer_s = 0, timer_ns = 0, timer_n = 0;
     unsigned int  line = 0;
     
@@ -3730,8 +3716,8 @@ static Eterm lcnt_build_lock_stats_term(Eterm **hpp, Uint *szp, erts_lcnt_lock_s
      * [{{file, line}, {tries, colls, {seconds, nanoseconds, n_blocks}}}]
      */
     
-    ethr_atomic_read(&stats->tries, (long *)&tries);
-    ethr_atomic_read(&stats->colls, (long *)&colls);
+    tries = (Uint) ethr_atomic_read(&stats->tries);
+    colls = (Uint) ethr_atomic_read(&stats->colls);
    
     line     = stats->line; 
     timer_s  = stats->timer.s;
diff --git a/erts/emulator/beam/erl_bif_lists.c b/erts/emulator/beam/erl_bif_lists.c
index ce13469801..47c48e74d6 100644
--- a/erts/emulator/beam/erl_bif_lists.c
+++ b/erts/emulator/beam/erl_bif_lists.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1999-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1999-2011. 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
@@ -378,7 +378,7 @@ keyfind(int Bif, Process* p, Eterm Key, Eterm Pos, Eterm List)
 		Eterm *tuple_ptr = tuple_val(term);
 		if (pos <= arityval(*tuple_ptr)) {
 		    Eterm element = tuple_ptr[pos];
-		    if (cmp(Key, element) == 0) {
+		    if (CMP(Key, element) == 0) {
 			return term;
 		    }
 		}
diff --git a/erts/emulator/beam/erl_bif_port.c b/erts/emulator/beam/erl_bif_port.c
index 378c5e73fd..fbc92b9730 100644
--- a/erts/emulator/beam/erl_bif_port.c
+++ b/erts/emulator/beam/erl_bif_port.c
@@ -610,6 +610,7 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_nump)
     int binary_io;
     int soft_eof;
     Sint linebuf;
+    Eterm edir = NIL;
     byte dir[MAXPATHLEN];
 
     /* These are the defaults */
@@ -686,19 +687,10 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_nump)
 
 		} else if (option == am_arg0) {
 		    char *a0;
-		    int n;
-		    if (is_nil(*tp)) {
-			n = 0;
-		    } else if( (n = is_string(*tp)) == 0) {
+
+		    if ((a0 = erts_convert_filename_to_native(*tp, ERTS_ALC_T_TMP, 1)) == NULL) {
 			goto badarg;
 		    }
-		    a0 = (char *) erts_alloc(ERTS_ALC_T_TMP, 
-					    (n + 1) * sizeof(byte));
-		    if (intlist_to_buf(*tp, a0, n) != n) {
-			erl_exit(1, "%s:%d: Internal error\n",
-				 __FILE__, __LINE__);
-		    }
-		    a0[n] = '\0';		    
 		    if (opts.argv == NULL) {
 			opts.argv = erts_alloc(ERTS_ALC_T_TMP, 
 					       2 * sizeof(char **));
@@ -711,22 +703,7 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_nump)
 			opts.argv[0] = a0;
 		    }
 		} else if (option == am_cd) {
-		    Eterm iolist;
-		    DeclareTmpHeap(heap,4,p);
-		    int r;
-
-		    UseTmpHeap(4,p);
-		    heap[0] = *tp;
-		    heap[1] = make_list(heap+2);
-		    heap[2] = make_small(0);
-		    heap[3] = NIL;
-		    iolist = make_list(heap);
-		    r = io_list_to_buf(iolist, (char*) dir, MAXPATHLEN);
-		    UnUseTmpHeap(4,p);
-		    if (r < 0) {
-			goto badarg;
-		    }
-		    opts.wd = (char *) dir;
+		    edir = *tp;
 		} else {
 		    goto badarg;
 		}
@@ -838,19 +815,7 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_nump)
 		goto badarg;
 	    }
 	    name = tp[1];
-	    if (is_atom(name)) {
-		name_buf = (char *) erts_alloc(ERTS_ALC_T_TMP,
-					       atom_tab(atom_val(name))->len+1);
-		sys_memcpy((void *) name_buf,
-			   (void *) atom_tab(atom_val(name))->name, 
-			   atom_tab(atom_val(name))->len);
-		name_buf[atom_tab(atom_val(name))->len] = '\0';
-	    } else if ((i = is_string(name))) {
-		name_buf = (char *) erts_alloc(ERTS_ALC_T_TMP, i + 1);
-		if (intlist_to_buf(name, name_buf, i) != i)
-		    erl_exit(1, "%s:%d: Internal error\n", __FILE__, __LINE__);
-		name_buf[i] = '\0';
-	    } else {
+	    if ((name_buf = erts_convert_filename_to_native(name,ERTS_ALC_T_TMP,0)) == NULL) {
 		goto badarg;
 	    }
 	    opts.spawn_type = ERTS_SPAWN_EXECUTABLE;
@@ -892,7 +857,33 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_nump)
 	/* Argument vector only if explicit spawn_executable */
 	goto badarg;
     }
-	
+
+    if (edir != NIL) {
+	/* A working directory is expressed differently if spawn_executable, i.e. Unicode is handles 
+	   for spawn_executable... */
+	if (opts.spawn_type != ERTS_SPAWN_EXECUTABLE) {
+	    Eterm iolist;
+	    DeclareTmpHeap(heap,4,p);
+	    int r;
+	    
+	    UseTmpHeap(4,p);
+	    heap[0] = edir;
+	    heap[1] = make_list(heap+2);
+	    heap[2] = make_small(0);
+	    heap[3] = NIL;
+	    iolist = make_list(heap);
+	    r = io_list_to_buf(iolist, (char*) dir, MAXPATHLEN);
+	    UnUseTmpHeap(4,p);
+	    if (r < 0) {
+		goto badarg;
+	    }
+	    opts.wd = (char *) dir;
+	} else {
+	    if ((opts.wd = erts_convert_filename_to_native(edir,ERTS_ALC_T_TMP,0)) == NULL) {
+		goto badarg;
+	    }
+	}
+    }
 
     if (driver != &spawn_driver && opts.exit_status) {
 	goto badarg;
@@ -941,6 +932,9 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_nump)
     if (opts.argv) {
 	free_args(opts.argv);
     }
+    if (opts.wd && opts.wd != ((char *)dir)) {
+	erts_free(ERTS_ALC_T_TMP, (void *) opts.wd);
+    }
     return port_num;
     
  badarg:
@@ -950,6 +944,7 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_nump)
 #undef OPEN_PORT_ERROR
 }
 
+/* Arguments can be given i unicode and as raw binaries, convert filename is used to convert */
 static char **convert_args(Eterm l)
 {
     char **pp;
@@ -966,22 +961,14 @@ static char **convert_args(Eterm l)
     pp[i++] = erts_default_arg0;
     while (is_list(l)) {
 	str = CAR(list_val(l));
-
-	if (is_nil(str)) {
-	    n = 0;
-	} else if( (n = is_string(str)) == 0) {
-	    /* Not a string... */
+	if ((b = erts_convert_filename_to_native(str,ERTS_ALC_T_TMP,1)) == NULL) {
 	    int j;
 	    for (j = 1; j < i; ++j)
 		erts_free(ERTS_ALC_T_TMP, pp[j]);
 	    erts_free(ERTS_ALC_T_TMP, pp);
 	    return NULL;
-	}
-	b = (char *) erts_alloc(ERTS_ALC_T_TMP, (n + 1) * sizeof(byte));
-	pp[i++] = (char *) b;
-	if (intlist_to_buf(str, b, n) != n)
-	    erl_exit(1, "%s:%d: Internal error\n", __FILE__, __LINE__);
-	b[n] = '\0';
+	}	    
+	pp[i++] = b;
 	l = CDR(list_val(l));
     }
     pp[i] = NULL;
diff --git a/erts/emulator/beam/erl_bif_timer.c b/erts/emulator/beam/erl_bif_timer.c
index 4ae2f6ebf4..db771bd216 100644
--- a/erts/emulator/beam/erl_bif_timer.c
+++ b/erts/emulator/beam/erl_bif_timer.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2005-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2005-2011. 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
@@ -478,7 +478,7 @@ setup_bif_timer(Uint32 xflags,
     tab_insert(btm);
     ASSERT(btm == tab_find(ref));
     btm->tm.active = 0; /* MUST be initalized */
-    erl_set_timer(&btm->tm,
+    erts_set_timer(&btm->tm,
 		  (ErlTimeoutProc) bif_timer_timeout,
 		  (ErlCancelProc) bif_timer_cleanup,
 		  (void *) btm,
@@ -550,7 +550,7 @@ BIF_RETTYPE cancel_timer_1(BIF_ALIST_1)
 	res = am_false;
     }
     else {
-	Uint left = time_left(&btm->tm);
+	Uint left = erts_time_left(&btm->tm);
 	if (!(btm->flags & BTM_FLG_BYNAME)) {
 	    erts_smp_proc_lock(btm->receiver.proc.ess, ERTS_PROC_LOCK_MSGQ);
 	    unlink_proc(btm);
@@ -558,7 +558,7 @@ BIF_RETTYPE cancel_timer_1(BIF_ALIST_1)
 	}
 	tab_remove(btm);
 	ASSERT(!tab_find(BIF_ARG_1));
-	erl_cancel_timer(&btm->tm);
+	erts_cancel_timer(&btm->tm);
 	erts_smp_btm_rwunlock();
 	res = erts_make_integer(left, BIF_P);
     }
@@ -587,7 +587,7 @@ BIF_RETTYPE read_timer_1(BIF_ALIST_1)
 	res = am_false;
     }
     else {
-	Uint left = time_left(&btm->tm);
+	Uint left = erts_time_left(&btm->tm);
 	res = erts_make_integer(left, BIF_P);
     }
 
@@ -613,7 +613,8 @@ erts_print_bif_timer_info(int to, void *to_arg)
 			      : btm->receiver.proc.ess->id);
 	    erts_print(to, to_arg, "=timer:%T\n", receiver);
 	    erts_print(to, to_arg, "Message: %T\n", btm->message);
-	    erts_print(to, to_arg, "Time left: %d ms\n", time_left(&btm->tm));
+	    erts_print(to, to_arg, "Time left: %u ms\n",
+		       erts_time_left(&btm->tm));
 	}
     }
 
@@ -640,7 +641,7 @@ erts_cancel_bif_timers(Process *p, ErtsProcLocks plocks)
 	tab_remove(btm);
 	tmp_btm = btm;
 	btm = btm->receiver.proc.next;
-	erl_cancel_timer(&tmp_btm->tm);
+	erts_cancel_timer(&tmp_btm->tm);
     }
 
     p->bif_timers = NULL;
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c
index 443cac9033..0509e51a6f 100644
--- a/erts/emulator/beam/erl_bif_trace.c
+++ b/erts/emulator/beam/erl_bif_trace.c
@@ -2161,7 +2161,7 @@ trace_delivered_1(BIF_ALIST_1)
 #ifdef ERTS_SMP
     bp = new_message_buffer(REF_THING_SIZE + 4);
     hp = &bp->mem[0];
-    msg_ref = STORE_NC(&hp, &bp->off_heap.externals, ref);
+    msg_ref = STORE_NC(&hp, &bp->off_heap, ref);
 #else
     hp = HAlloc(BIF_P, 4);
     msg_ref = ref;
diff --git a/erts/emulator/beam/erl_binary.h b/erts/emulator/beam/erl_binary.h
index a569fe2e85..506c4813fa 100644
--- a/erts/emulator/beam/erl_binary.h
+++ b/erts/emulator/beam/erl_binary.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2000-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2000-2011. 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
@@ -71,6 +71,7 @@ typedef struct erl_heap_bin {
  */
 
 #define binary_size(Bin) (binary_val(Bin)[1])
+#define binary_size_rel(Bin,BasePtr) (binary_val_rel(Bin,BasePtr)[1])
 
 #define binary_bitsize(Bin)			\
   ((*binary_val(Bin) == HEADER_SUB_BIN) ?	\
@@ -93,9 +94,12 @@ typedef struct erl_heap_bin {
  * Bitsize: output variable (Uint)
  */
 
-#define ERTS_GET_BINARY_BYTES(Bin,Bytep,Bitoffs,Bitsize)		\
+#define ERTS_GET_BINARY_BYTES(Bin,Bytep,Bitoffs,Bitsize) \
+     ERTS_GET_BINARY_BYTES_REL(Bin,Bytep,Bitoffs,Bitsize,NULL)
+
+#define ERTS_GET_BINARY_BYTES_REL(Bin,Bytep,Bitoffs,Bitsize,BasePtr)    \
 do {									\
-    Eterm* _real_bin = binary_val(Bin);					\
+    Eterm* _real_bin = binary_val_rel(Bin,BasePtr);			\
     Uint _offs = 0;							\
     Bitoffs = Bitsize = 0;						\
     if (*_real_bin == HEADER_SUB_BIN) {					\
@@ -103,7 +107,7 @@ do {									\
 	_offs = _sb->offs;						\
         Bitoffs = _sb->bitoffs;						\
         Bitsize = _sb->bitsize;						\
-	_real_bin = binary_val(_sb->orig);				\
+	_real_bin = binary_val_rel(_sb->orig,BasePtr);			\
     }									\
     if (*_real_bin == HEADER_PROC_BIN) {				\
 	Bytep = ((ProcBin *) _real_bin)->bytes + _offs;			\
@@ -125,9 +129,12 @@ do {									\
  * BitSize: Extra bit size (Uint)
  */
 
-#define ERTS_GET_REAL_BIN(Bin, RealBin, ByteOffset, BitOffset, BitSize)	\
+#define ERTS_GET_REAL_BIN(Bin, RealBin, ByteOffset, BitOffset, BitSize) \
+     ERTS_GET_REAL_BIN_REL(Bin, RealBin, ByteOffset, BitOffset, BitSize, NULL)
+
+#define ERTS_GET_REAL_BIN_REL(Bin, RealBin, ByteOffset, BitOffset, BitSize, BasePtr) \
   do {									\
-    ErlSubBin* _sb = (ErlSubBin *) binary_val(Bin);			\
+    ErlSubBin* _sb = (ErlSubBin *) binary_val_rel(Bin,BasePtr);	        \
     if (_sb->thing_word == HEADER_SUB_BIN) {				\
       RealBin = _sb->orig;						\
       ByteOffset = _sb->offs;						\
@@ -152,6 +159,8 @@ do {									\
 void erts_init_binary(void);
 
 byte* erts_get_aligned_binary_bytes_extra(Eterm, byte**, ErtsAlcType_t, unsigned extra);
+/* Used by unicode module */
+Eterm erts_bin_bytes_to_list(Eterm previous, Eterm* hp, byte* bytes, Uint size, Uint bitoffs);
 
 /*
  * Common implementation for erlang:list_to_binary/1 and binary:list_to_bin/1
diff --git a/erts/emulator/beam/erl_bits.c b/erts/emulator/beam/erl_bits.c
index defe18c92b..6f8a7436d5 100644
--- a/erts/emulator/beam/erl_bits.c
+++ b/erts/emulator/beam/erl_bits.c
@@ -555,10 +555,11 @@ fmt_int(byte *buf, Uint sz, Eterm val, Uint size, Uint flags)
 {
     unsigned long offs;
 
-    ASSERT(size != 0);
     offs = BIT_OFFSET(size);
     if (is_small(val)) {
 	Sint v = signed_val(val);
+
+	ASSERT(size != 0);	  /* Tested by caller */
 	if (flags & BSF_LITTLE) { /* Little endian */
 	    sz--;
 	    COPY_VAL(buf,1,v,sz);
@@ -578,6 +579,9 @@ fmt_int(byte *buf, Uint sz, Eterm val, Uint size, Uint flags)
 	ErtsDigit* dp = big_v(val);
 	int n = MIN(sz,ds);
 
+	if (size == 0) {
+	    return 0;
+	}
 	if (flags & BSF_LITTLE) {
 	    sz -= n;                       /* pad with this amount */
 	    if (sign) {
@@ -729,15 +733,13 @@ erts_new_bs_put_integer(ERL_BITS_PROTO_3(Eterm arg, Uint num_bits, unsigned flag
     Uint b;
     byte *iptr;
 
-    if (num_bits == 0) {
-	return 1;
-    }
-
     bit_offset = BIT_OFFSET(bin_offset);
     if (is_small(arg)) {
 	Uint rbits = 8 - bit_offset;
 
-	if (bit_offset + num_bits <= 8) {
+	if (num_bits == 0) {
+	    return 1;
+	} else if (bit_offset + num_bits <= 8) {
 	    /*
 	     * All bits are in the same byte.
 	     */ 
@@ -1335,12 +1337,12 @@ erts_bs_append(Process* c_p, Eterm* reg, Uint live, Eterm build_size_term,
 	hp += PROC_BIN_SIZE;
 	pb->thing_word = HEADER_PROC_BIN;
 	pb->size = used_size_in_bytes;
-	pb->next = MSO(c_p).mso;
-	MSO(c_p).mso = pb;
+	pb->next = MSO(c_p).first;
+	MSO(c_p).first = (struct erl_off_heap_header*)pb;
 	pb->val = bptr;
 	pb->bytes = (byte*) bptr->orig_bytes;
 	pb->flags = PB_IS_WRITABLE | PB_ACTIVE_WRITER;
-	MSO(c_p).overhead += pb->size / sizeof(Eterm);
+	OH_OVERHEAD(&(MSO(c_p)), pb->size / sizeof(Eterm));
 
 	/*
 	 * Now allocate the sub binary and set its size to include the
@@ -1506,12 +1508,12 @@ erts_bs_init_writable(Process* p, Eterm sz)
     hp += PROC_BIN_SIZE;
     pb->thing_word = HEADER_PROC_BIN;
     pb->size = 0;
-    pb->next = MSO(p).mso;
-    MSO(p).mso = pb;
+    pb->next = MSO(p).first;
+    MSO(p).first = (struct erl_off_heap_header*) pb;
     pb->val = bptr;
     pb->bytes = (byte*) bptr->orig_bytes;
     pb->flags = PB_IS_WRITABLE | PB_ACTIVE_WRITER;
-    MSO(p).overhead += pb->size / sizeof(Eterm);
+    OH_OVERHEAD(&(MSO(p)), pb->size / sizeof(Eterm));
     
     /*
      * Now allocate the sub binary.
diff --git a/erts/emulator/beam/erl_cpu_topology.c b/erts/emulator/beam/erl_cpu_topology.c
new file mode 100644
index 0000000000..bcf8bcf270
--- /dev/null
+++ b/erts/emulator/beam/erl_cpu_topology.c
@@ -0,0 +1,2361 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010-2011. 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%
+ */
+
+/*
+ * Description:	CPU topology and related functionality
+ *
+ * Author: 	Rickard Green
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <ctype.h>
+
+#include "global.h"
+#include "error.h"
+#include "bif.h"
+#include "erl_cpu_topology.h"
+
+#define ERTS_MAX_READER_GROUPS 8
+
+/*
+ * Cpu topology hierarchy.
+ */
+#define ERTS_TOPOLOGY_NODE		0
+#define ERTS_TOPOLOGY_PROCESSOR		1
+#define ERTS_TOPOLOGY_PROCESSOR_NODE	2
+#define ERTS_TOPOLOGY_CORE		3
+#define ERTS_TOPOLOGY_THREAD		4
+#define ERTS_TOPOLOGY_LOGICAL		5
+
+#define ERTS_TOPOLOGY_MAX_DEPTH		6
+
+typedef struct {
+    int bind_id;
+    int bound_id;
+} ErtsCpuBindData;
+
+static erts_cpu_info_t *cpuinfo;
+
+static int max_main_threads;
+static int reader_groups;
+
+static ErtsCpuBindData *scheduler2cpu_map;
+static erts_smp_rwmtx_t cpuinfo_rwmtx;
+
+typedef enum {
+    ERTS_CPU_BIND_UNDEFINED,
+    ERTS_CPU_BIND_SPREAD,
+    ERTS_CPU_BIND_PROCESSOR_SPREAD,
+    ERTS_CPU_BIND_THREAD_SPREAD,
+    ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD,
+    ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD,
+    ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD,
+    ERTS_CPU_BIND_NO_SPREAD,
+    ERTS_CPU_BIND_NONE
+} ErtsCpuBindOrder;
+
+#define ERTS_CPU_BIND_DEFAULT_BIND \
+  ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD
+
+static int no_cpu_groups_callbacks;
+static ErtsCpuBindOrder cpu_bind_order;
+
+static erts_cpu_topology_t *user_cpudata;
+static int user_cpudata_size;
+static erts_cpu_topology_t *system_cpudata;
+static int system_cpudata_size;
+
+typedef struct {
+    int level[ERTS_TOPOLOGY_MAX_DEPTH+1];
+} erts_avail_cput;
+
+typedef struct {
+    int id;
+    int sub_levels;
+    int cpu_groups;
+} erts_cpu_groups_count_t;
+
+typedef struct {
+    int logical;
+    int cpu_group;
+} erts_cpu_groups_map_array_t;
+
+typedef struct erts_cpu_groups_callback_list_t_ erts_cpu_groups_callback_list_t;
+struct erts_cpu_groups_callback_list_t_ {
+    erts_cpu_groups_callback_list_t *next;
+    erts_cpu_groups_callback_t callback;
+    void *arg;
+};
+
+typedef struct erts_cpu_groups_map_t_ erts_cpu_groups_map_t;
+struct erts_cpu_groups_map_t_ {
+    erts_cpu_groups_map_t *next;
+    int groups;
+    erts_cpu_groups_map_array_t *array;
+    int size;
+    int logical_processors;
+    erts_cpu_groups_callback_list_t *callback_list;
+};
+
+typedef struct {
+    erts_cpu_groups_callback_t callback;
+    int ix;
+    void *arg;
+} erts_cpu_groups_callback_call_t;
+
+static erts_cpu_groups_map_t *cpu_groups_maps;
+
+static erts_cpu_groups_map_t *reader_groups_map;
+
+#define ERTS_TOPOLOGY_CG ERTS_TOPOLOGY_MAX_DEPTH
+
+#define ERTS_MAX_CPU_TOPOLOGY_ID ((int) 0xffff)
+
+#ifdef ERTS_SMP
+static void cpu_bind_order_sort(erts_cpu_topology_t *cpudata,
+				int size,
+				ErtsCpuBindOrder bind_order,
+				int mk_seq);
+static void write_schedulers_bind_change(erts_cpu_topology_t *cpudata, int size);
+#endif
+
+static void reader_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);
+static void update_cpu_groups_maps(void);
+static void make_cpu_groups_map(erts_cpu_groups_map_t *map, int test);
+static int cpu_groups_lookup(erts_cpu_groups_map_t *map,
+			     ErtsSchedulerData *esdp);
+
+static void create_tmp_cpu_topology_copy(erts_cpu_topology_t **cpudata,
+					 int *cpudata_size);
+static void destroy_tmp_cpu_topology_copy(erts_cpu_topology_t *cpudata);
+
+static int
+int_cmp(const void *vx, const void *vy)
+{
+    return *((int *) vx) - *((int *) vy);
+}
+
+static int
+cpu_spread_order_cmp(const void *vx, const void *vy)
+{
+    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
+    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
+
+    if (x->thread != y->thread)
+	return x->thread - y->thread;
+    if (x->core != y->core)
+	return x->core - y->core;
+    if (x->processor_node != y->processor_node)
+	return x->processor_node - y->processor_node;
+    if (x->processor != y->processor)
+	return x->processor - y->processor;
+    if (x->node != y->node)
+	return x->node - y->node;
+    return 0;
+}
+
+static int
+cpu_processor_spread_order_cmp(const void *vx, const void *vy)
+{
+    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
+    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
+
+    if (x->thread != y->thread)
+	return x->thread - y->thread;
+    if (x->processor_node != y->processor_node)
+	return x->processor_node - y->processor_node;
+    if (x->core != y->core)
+	return x->core - y->core;
+    if (x->node != y->node)
+	return x->node - y->node;
+    if (x->processor != y->processor)
+	return x->processor - y->processor;
+    return 0;
+}
+
+static int
+cpu_thread_spread_order_cmp(const void *vx, const void *vy)
+{
+    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
+    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
+
+    if (x->thread != y->thread)
+	return x->thread - y->thread;
+    if (x->node != y->node)
+	return x->node - y->node;
+    if (x->processor != y->processor)
+	return x->processor - y->processor;
+    if (x->processor_node != y->processor_node)
+	return x->processor_node - y->processor_node;
+    if (x->core != y->core)
+	return x->core - y->core;
+    return 0;
+}
+
+static int
+cpu_thread_no_node_processor_spread_order_cmp(const void *vx, const void *vy)
+{
+    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
+    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
+
+    if (x->thread != y->thread)
+	return x->thread - y->thread;
+    if (x->node != y->node)
+	return x->node - y->node;
+    if (x->core != y->core)
+	return x->core - y->core;
+    if (x->processor != y->processor)
+	return x->processor - y->processor;
+    return 0;
+}
+
+static int
+cpu_no_node_processor_spread_order_cmp(const void *vx, const void *vy)
+{
+    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
+    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
+
+    if (x->node != y->node)
+	return x->node - y->node;
+    if (x->thread != y->thread)
+	return x->thread - y->thread;
+    if (x->core != y->core)
+	return x->core - y->core;
+    if (x->processor != y->processor)
+	return x->processor - y->processor;
+    return 0;
+}
+
+static int
+cpu_no_node_thread_spread_order_cmp(const void *vx, const void *vy)
+{
+    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
+    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
+
+    if (x->node != y->node)
+	return x->node - y->node;
+    if (x->thread != y->thread)
+	return x->thread - y->thread;
+    if (x->processor != y->processor)
+	return x->processor - y->processor;
+    if (x->core != y->core)
+	return x->core - y->core;
+    return 0;
+}
+
+static int
+cpu_no_spread_order_cmp(const void *vx, const void *vy)
+{
+    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
+    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
+
+    if (x->node != y->node)
+	return x->node - y->node;
+    if (x->processor != y->processor)
+	return x->processor - y->processor;
+    if (x->processor_node != y->processor_node)
+	return x->processor_node - y->processor_node;
+    if (x->core != y->core)
+	return x->core - y->core;
+    if (x->thread != y->thread)
+	return x->thread - y->thread;
+    return 0;
+}
+
+static ERTS_INLINE void
+make_cpudata_id_seq(erts_cpu_topology_t *cpudata, int size, int no_node)
+{
+    int ix;
+    int node = -1;
+    int processor = -1;
+    int processor_node = -1;
+    int processor_node_node = -1;
+    int core = -1;
+    int thread = -1;
+    int old_node = -1;
+    int old_processor = -1;
+    int old_processor_node = -1;
+    int old_core = -1;
+    int old_thread = -1;
+
+    for (ix = 0; ix < size; ix++) {
+	if (!no_node || cpudata[ix].node >= 0) {
+	    if (old_node == cpudata[ix].node)
+		cpudata[ix].node = node;
+	    else {
+		old_node = cpudata[ix].node;
+		old_processor = processor = -1;
+		if (!no_node)
+		    old_processor_node = processor_node = -1;
+		old_core = core = -1;
+		old_thread = thread = -1;
+		if (no_node || cpudata[ix].node >= 0)
+		    cpudata[ix].node = ++node;
+	    }
+	}
+	if (old_processor == cpudata[ix].processor)
+	    cpudata[ix].processor = processor;
+	else {
+	    old_processor = cpudata[ix].processor;
+	    if (!no_node)
+		processor_node_node = old_processor_node = processor_node = -1;
+	    old_core = core = -1;
+	    old_thread = thread = -1;
+	    cpudata[ix].processor = ++processor;
+	}
+	if (no_node && cpudata[ix].processor_node < 0)
+	    old_processor_node = -1;
+	else {
+	    if (old_processor_node == cpudata[ix].processor_node) {
+		if (no_node)
+		    cpudata[ix].node = cpudata[ix].processor_node = node;
+		else {
+		    if (processor_node_node >= 0)
+			cpudata[ix].node = processor_node_node;
+		    cpudata[ix].processor_node = processor_node;
+		}
+	    }
+	    else {
+		old_processor_node = cpudata[ix].processor_node;
+		old_core = core = -1;
+		old_thread = thread = -1;
+		if (no_node)
+		    cpudata[ix].node = cpudata[ix].processor_node = ++node;
+		else {
+		    cpudata[ix].node = processor_node_node = ++node;
+		    cpudata[ix].processor_node = ++processor_node;
+		}
+	    }
+	}
+	if (!no_node && cpudata[ix].processor_node < 0)
+	    cpudata[ix].processor_node = 0;
+	if (old_core == cpudata[ix].core)
+	    cpudata[ix].core = core;
+	else {
+	    old_core = cpudata[ix].core;
+	    old_thread = thread = -1;
+	    cpudata[ix].core = ++core;
+	}
+	if (old_thread == cpudata[ix].thread)
+	    cpudata[ix].thread = thread;
+	else
+	    old_thread = cpudata[ix].thread = ++thread;
+    }
+}
+
+static void
+cpu_bind_order_sort(erts_cpu_topology_t *cpudata,
+		    int size,
+		    ErtsCpuBindOrder bind_order,
+		    int mk_seq)
+{
+    if (size > 1) {
+	int no_node = 0;
+	int (*cmp_func)(const void *, const void *);
+	switch (bind_order) {
+	case ERTS_CPU_BIND_SPREAD:
+	    cmp_func = cpu_spread_order_cmp;
+	    break;
+	case ERTS_CPU_BIND_PROCESSOR_SPREAD:
+	    cmp_func = cpu_processor_spread_order_cmp;
+	    break;
+	case ERTS_CPU_BIND_THREAD_SPREAD:
+	    cmp_func = cpu_thread_spread_order_cmp;
+	    break;
+	case ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD:
+	    no_node = 1;
+	    cmp_func = cpu_thread_no_node_processor_spread_order_cmp;
+	    break;
+	case ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD:
+	    no_node = 1;
+	    cmp_func = cpu_no_node_processor_spread_order_cmp;
+	    break;
+	case ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD:
+	    no_node = 1;
+	    cmp_func = cpu_no_node_thread_spread_order_cmp;
+	    break;
+	case ERTS_CPU_BIND_NO_SPREAD:
+	    cmp_func = cpu_no_spread_order_cmp;
+	    break;
+	default:
+	    cmp_func = NULL;
+	    erl_exit(ERTS_ABORT_EXIT,
+		     "Bad cpu bind type: %d\n",
+		     (int) cpu_bind_order);
+	    break;
+	}
+
+	if (mk_seq)
+	    make_cpudata_id_seq(cpudata, size, no_node);
+
+	qsort(cpudata, size, sizeof(erts_cpu_topology_t), cmp_func);
+    }
+}
+
+static int
+processor_order_cmp(const void *vx, const void *vy)
+{
+    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
+    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
+
+    if (x->processor != y->processor)
+	return x->processor - y->processor;
+    if (x->node != y->node)
+	return x->node - y->node;
+    if (x->processor_node != y->processor_node)
+	return x->processor_node - y->processor_node;
+    if (x->core != y->core)
+	return x->core - y->core;
+    if (x->thread != y->thread)
+	return x->thread - y->thread;
+    return 0;
+}
+
+#ifdef ERTS_SMP
+void
+erts_sched_check_cpu_bind_prep_suspend(ErtsSchedulerData *esdp)
+{
+    erts_cpu_groups_map_t *cgm;
+    erts_cpu_groups_callback_list_t *cgcl;
+    erts_cpu_groups_callback_call_t *cgcc;
+    int cgcc_ix;
+
+    /* Unbind from cpu */
+    erts_smp_rwmtx_rwlock(&cpuinfo_rwmtx);
+    if (scheduler2cpu_map[esdp->no].bound_id >= 0
+	&& erts_unbind_from_cpu(cpuinfo) == 0) {
+	esdp->cpu_id = scheduler2cpu_map[esdp->no].bound_id = -1;
+    }
+
+    cgcc = erts_alloc(ERTS_ALC_T_TMP,
+		      (no_cpu_groups_callbacks
+		       * sizeof(erts_cpu_groups_callback_call_t)));
+    cgcc_ix = 0;
+    for (cgm = cpu_groups_maps; cgm; cgm = cgm->next) {
+	for (cgcl = cgm->callback_list; cgcl; cgcl = cgcl->next) {
+	    cgcc[cgcc_ix].callback = cgcl->callback;
+	    cgcc[cgcc_ix].ix = cpu_groups_lookup(cgm, esdp);
+	    cgcc[cgcc_ix].arg = cgcl->arg;
+	    cgcc_ix++;
+	}
+    }
+    ASSERT(no_cpu_groups_callbacks == cgcc_ix);
+    erts_smp_rwmtx_rwunlock(&cpuinfo_rwmtx);
+
+    for (cgcc_ix = 0; cgcc_ix < no_cpu_groups_callbacks; cgcc_ix++)
+	cgcc[cgcc_ix].callback(1,
+			       esdp,
+			       cgcc[cgcc_ix].ix,
+			       cgcc[cgcc_ix].arg);
+
+    erts_free(ERTS_ALC_T_TMP, cgcc);
+
+    if (esdp->no <= max_main_threads)
+	erts_thr_set_main_status(0, 0);
+
+}
+
+void
+erts_sched_check_cpu_bind_post_suspend(ErtsSchedulerData *esdp)
+{
+    ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(esdp->run_queue));
+
+    if (esdp->no <= max_main_threads)
+	erts_thr_set_main_status(1, (int) esdp->no);
+
+    /* Make sure we check if we should bind to a cpu or not... */
+    if (esdp->run_queue->flags & ERTS_RUNQ_FLG_SHARED_RUNQ)
+	erts_smp_atomic32_set(&esdp->chk_cpu_bind, 1);
+    else
+	esdp->run_queue->flags |= ERTS_RUNQ_FLG_CHK_CPU_BIND;
+}
+
+#endif
+
+void
+erts_sched_check_cpu_bind(ErtsSchedulerData *esdp)
+{
+    int res, cpu_id, cgcc_ix;
+    erts_cpu_groups_map_t *cgm;
+    erts_cpu_groups_callback_list_t *cgcl;
+    erts_cpu_groups_callback_call_t *cgcc;
+#ifdef ERTS_SMP
+    if (erts_common_run_queue)
+	erts_smp_atomic32_set(&esdp->chk_cpu_bind, 0);
+    else {
+	esdp->run_queue->flags &= ~ERTS_RUNQ_FLG_CHK_CPU_BIND;
+    }
+#endif
+    erts_smp_runq_unlock(esdp->run_queue);
+    erts_smp_rwmtx_rwlock(&cpuinfo_rwmtx);
+    cpu_id = scheduler2cpu_map[esdp->no].bind_id;
+    if (cpu_id >= 0 && cpu_id != scheduler2cpu_map[esdp->no].bound_id) {
+	res = erts_bind_to_cpu(cpuinfo, cpu_id);
+	if (res == 0)
+	    esdp->cpu_id = scheduler2cpu_map[esdp->no].bound_id = cpu_id;
+	else {
+	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
+	    erts_dsprintf(dsbufp, "Scheduler %d failed to bind to cpu %d: %s\n",
+			  (int) esdp->no, cpu_id, erl_errno_id(-res));
+	    erts_send_error_to_logger_nogl(dsbufp);
+	    if (scheduler2cpu_map[esdp->no].bound_id >= 0)
+		goto unbind;
+	}
+    }
+    else if (cpu_id < 0) {
+    unbind:
+	/* Get rid of old binding */
+	res = erts_unbind_from_cpu(cpuinfo);
+	if (res == 0)
+	    esdp->cpu_id = scheduler2cpu_map[esdp->no].bound_id = -1;
+	else if (res != -ENOTSUP) {
+	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
+	    erts_dsprintf(dsbufp, "Scheduler %d failed to unbind from cpu %d: %s\n",
+			  (int) esdp->no, cpu_id, erl_errno_id(-res));
+	    erts_send_error_to_logger_nogl(dsbufp);
+	}
+    }
+
+    cgcc = erts_alloc(ERTS_ALC_T_TMP,
+		      (no_cpu_groups_callbacks
+		       * sizeof(erts_cpu_groups_callback_call_t)));
+    cgcc_ix = 0;
+    for (cgm = cpu_groups_maps; cgm; cgm = cgm->next) {
+	for (cgcl = cgm->callback_list; cgcl; cgcl = cgcl->next) {
+	    cgcc[cgcc_ix].callback = cgcl->callback;
+	    cgcc[cgcc_ix].ix = cpu_groups_lookup(cgm, esdp);
+	    cgcc[cgcc_ix].arg = cgcl->arg;
+	    cgcc_ix++;
+	}
+    }
+
+    ASSERT(no_cpu_groups_callbacks == cgcc_ix);
+    erts_smp_rwmtx_rwunlock(&cpuinfo_rwmtx);
+
+    for (cgcc_ix = 0; cgcc_ix < no_cpu_groups_callbacks; cgcc_ix++)
+	cgcc[cgcc_ix].callback(0,
+			       esdp,
+			       cgcc[cgcc_ix].ix,
+			       cgcc[cgcc_ix].arg);
+
+    erts_free(ERTS_ALC_T_TMP, cgcc);
+
+    erts_smp_runq_lock(esdp->run_queue);
+}
+
+#ifdef ERTS_SMP
+void
+erts_sched_init_check_cpu_bind(ErtsSchedulerData *esdp)
+{
+    int cgcc_ix;
+    erts_cpu_groups_map_t *cgm;
+    erts_cpu_groups_callback_list_t *cgcl;
+    erts_cpu_groups_callback_call_t *cgcc;
+
+    erts_smp_rwmtx_rlock(&cpuinfo_rwmtx);
+
+    cgcc = erts_alloc(ERTS_ALC_T_TMP,
+		      (no_cpu_groups_callbacks
+		       * sizeof(erts_cpu_groups_callback_call_t)));
+    cgcc_ix = 0;
+    for (cgm = cpu_groups_maps; cgm; cgm = cgm->next) {
+	for (cgcl = cgm->callback_list; cgcl; cgcl = cgcl->next) {
+	    cgcc[cgcc_ix].callback = cgcl->callback;
+	    cgcc[cgcc_ix].ix = cpu_groups_lookup(cgm, esdp);
+	    cgcc[cgcc_ix].arg = cgcl->arg;
+	    cgcc_ix++;
+	}
+    }
+
+    ASSERT(no_cpu_groups_callbacks == cgcc_ix);
+    erts_smp_rwmtx_runlock(&cpuinfo_rwmtx);
+
+    for (cgcc_ix = 0; cgcc_ix < no_cpu_groups_callbacks; cgcc_ix++)
+	cgcc[cgcc_ix].callback(0,
+			       esdp,
+			       cgcc[cgcc_ix].ix,
+			       cgcc[cgcc_ix].arg);
+
+    erts_free(ERTS_ALC_T_TMP, cgcc);
+
+    if (esdp->no <= max_main_threads)
+	erts_thr_set_main_status(1, (int) esdp->no);
+}
+#endif
+
+static void
+write_schedulers_bind_change(erts_cpu_topology_t *cpudata, int size)
+{
+    int s_ix = 1;
+    int cpu_ix;
+
+    ERTS_SMP_LC_ASSERT(erts_lc_rwmtx_is_rwlocked(&cpuinfo_rwmtx));
+
+    if (cpu_bind_order != ERTS_CPU_BIND_NONE && size) {
+
+	cpu_bind_order_sort(cpudata, size, cpu_bind_order, 1);
+
+	for (cpu_ix = 0; cpu_ix < size && cpu_ix < erts_no_schedulers; cpu_ix++)
+	    if (erts_is_cpu_available(cpuinfo, cpudata[cpu_ix].logical))
+		scheduler2cpu_map[s_ix++].bind_id = cpudata[cpu_ix].logical;
+    }
+
+    if (s_ix <= erts_no_schedulers)
+	for (; s_ix <= erts_no_schedulers; s_ix++)
+	    scheduler2cpu_map[s_ix].bind_id = -1;
+}
+
+int
+erts_init_scheduler_bind_type_string(char *how)
+{
+    if (sys_strcmp(how, "u") == 0)
+	cpu_bind_order = ERTS_CPU_BIND_NONE;
+    else if (erts_bind_to_cpu(cpuinfo, -1) == -ENOTSUP)
+	return ERTS_INIT_SCHED_BIND_TYPE_NOT_SUPPORTED;
+    else if (!system_cpudata && !user_cpudata)
+	return ERTS_INIT_SCHED_BIND_TYPE_ERROR_NO_CPU_TOPOLOGY;
+    else if (sys_strcmp(how, "db") == 0)
+	cpu_bind_order = ERTS_CPU_BIND_DEFAULT_BIND;
+    else if (sys_strcmp(how, "s") == 0)
+	cpu_bind_order = ERTS_CPU_BIND_SPREAD;
+    else if (sys_strcmp(how, "ps") == 0)
+	cpu_bind_order = ERTS_CPU_BIND_PROCESSOR_SPREAD;
+    else if (sys_strcmp(how, "ts") == 0)
+	cpu_bind_order = ERTS_CPU_BIND_THREAD_SPREAD;
+    else if (sys_strcmp(how, "tnnps") == 0)
+	cpu_bind_order = ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD;
+    else if (sys_strcmp(how, "nnps") == 0)
+	cpu_bind_order = ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD;
+    else if (sys_strcmp(how, "nnts") == 0)
+	cpu_bind_order = ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD;
+    else if (sys_strcmp(how, "ns") == 0)
+	cpu_bind_order = ERTS_CPU_BIND_NO_SPREAD;
+    else
+	return ERTS_INIT_SCHED_BIND_TYPE_ERROR_NO_BAD_TYPE;
+    return ERTS_INIT_SCHED_BIND_TYPE_SUCCESS;
+}
+
+static Eterm
+bound_schedulers_term(ErtsCpuBindOrder order)
+{
+    switch (order) {
+    case ERTS_CPU_BIND_SPREAD: {
+	ERTS_DECL_AM(spread);
+	return AM_spread;
+    }
+    case ERTS_CPU_BIND_PROCESSOR_SPREAD: {
+	ERTS_DECL_AM(processor_spread);
+	return AM_processor_spread;
+    }
+    case ERTS_CPU_BIND_THREAD_SPREAD: {
+	ERTS_DECL_AM(thread_spread);
+	return AM_thread_spread;
+    }
+    case ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD: {
+	ERTS_DECL_AM(thread_no_node_processor_spread);
+	return AM_thread_no_node_processor_spread;
+    }
+    case ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD: {
+	ERTS_DECL_AM(no_node_processor_spread);
+	return AM_no_node_processor_spread;
+    }
+    case ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD: {
+	ERTS_DECL_AM(no_node_thread_spread);
+	return AM_no_node_thread_spread;
+    }
+    case ERTS_CPU_BIND_NO_SPREAD: {
+	ERTS_DECL_AM(no_spread);
+	return AM_no_spread;
+    }
+    case ERTS_CPU_BIND_NONE: {
+	ERTS_DECL_AM(unbound);
+	return AM_unbound;
+    }
+    default:
+	ASSERT(0);
+	return THE_NON_VALUE;
+    }
+}
+
+Eterm
+erts_bound_schedulers_term(Process *c_p)
+{
+    ErtsCpuBindOrder order;
+    erts_smp_rwmtx_rlock(&cpuinfo_rwmtx);
+    order = cpu_bind_order;
+    erts_smp_rwmtx_runlock(&cpuinfo_rwmtx);
+    return bound_schedulers_term(order);
+}
+
+Eterm
+erts_bind_schedulers(Process *c_p, Eterm how)
+{
+    int notify = 0;
+    Eterm res;
+    erts_cpu_topology_t *cpudata;
+    int cpudata_size;
+    ErtsCpuBindOrder old_cpu_bind_order;
+
+    erts_smp_rwmtx_rwlock(&cpuinfo_rwmtx);
+
+    if (erts_bind_to_cpu(cpuinfo, -1) == -ENOTSUP) {
+	if (cpu_bind_order == ERTS_CPU_BIND_NONE
+	    && ERTS_IS_ATOM_STR("unbound", how)) {
+	    res = bound_schedulers_term(ERTS_CPU_BIND_NONE);
+	    goto done;
+	}
+	ERTS_BIF_PREP_ERROR(res, c_p, EXC_NOTSUP);
+    }
+    else {
+
+	old_cpu_bind_order = cpu_bind_order;
+
+	if (ERTS_IS_ATOM_STR("default_bind", how))
+	    cpu_bind_order = ERTS_CPU_BIND_DEFAULT_BIND;
+	else if (ERTS_IS_ATOM_STR("spread", how))
+	    cpu_bind_order = ERTS_CPU_BIND_SPREAD;
+	else if (ERTS_IS_ATOM_STR("processor_spread", how))
+	    cpu_bind_order = ERTS_CPU_BIND_PROCESSOR_SPREAD;
+	else if (ERTS_IS_ATOM_STR("thread_spread", how))
+	    cpu_bind_order = ERTS_CPU_BIND_THREAD_SPREAD;
+	else if (ERTS_IS_ATOM_STR("thread_no_node_processor_spread", how))
+	    cpu_bind_order = ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD;
+	else if (ERTS_IS_ATOM_STR("no_node_processor_spread", how))
+	    cpu_bind_order = ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD;
+	else if (ERTS_IS_ATOM_STR("no_node_thread_spread", how))
+	    cpu_bind_order = ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD;
+	else if (ERTS_IS_ATOM_STR("no_spread", how))
+	    cpu_bind_order = ERTS_CPU_BIND_NO_SPREAD;
+	else if (ERTS_IS_ATOM_STR("unbound", how))
+	    cpu_bind_order = ERTS_CPU_BIND_NONE;
+	else {
+	    cpu_bind_order = old_cpu_bind_order;
+	    ERTS_BIF_PREP_ERROR(res, c_p, BADARG);
+	    goto done;
+	}
+
+	create_tmp_cpu_topology_copy(&cpudata, &cpudata_size);
+
+	if (!cpudata) {
+	    cpu_bind_order = old_cpu_bind_order;
+	    ERTS_BIF_PREP_ERROR(res, c_p, BADARG);
+	    goto done;
+	}
+
+	write_schedulers_bind_change(cpudata, cpudata_size);
+	notify = 1;
+
+	destroy_tmp_cpu_topology_copy(cpudata);
+    
+	res = bound_schedulers_term(old_cpu_bind_order);
+    }
+
+ done:
+
+    erts_smp_rwmtx_rwunlock(&cpuinfo_rwmtx);
+
+    if (notify)
+	erts_sched_notify_check_cpu_bind();
+
+    return res;
+}
+
+int
+erts_sched_bind_atthrcreate_prepare(void)
+{
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
+    return esdp != NULL && erts_is_scheduler_bound(esdp);
+}
+
+int
+erts_sched_bind_atthrcreate_child(int unbind)
+{
+    int res = 0;
+    if (unbind) {
+	erts_smp_rwmtx_rlock(&cpuinfo_rwmtx);
+	res = erts_unbind_from_cpu(cpuinfo);
+	erts_smp_rwmtx_runlock(&cpuinfo_rwmtx);
+    }
+    return res;
+}
+
+void
+erts_sched_bind_atthrcreate_parent(int unbind)
+{
+
+}
+
+int
+erts_sched_bind_atfork_prepare(void)
+{
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
+    int unbind = esdp != NULL && erts_is_scheduler_bound(esdp);
+    if (unbind)
+	erts_smp_rwmtx_rlock(&cpuinfo_rwmtx);
+    return unbind;
+}
+
+int
+erts_sched_bind_atfork_child(int unbind)
+{
+    if (unbind) {
+	ERTS_SMP_LC_ASSERT(erts_lc_rwmtx_is_rlocked(&cpuinfo_rwmtx)
+			   || erts_lc_rwmtx_is_rwlocked(&cpuinfo_rwmtx));
+	return erts_unbind_from_cpu(cpuinfo);
+    }
+    return 0;
+}
+
+char *
+erts_sched_bind_atvfork_child(int unbind)
+{
+    if (unbind) {
+	ERTS_SMP_LC_ASSERT(erts_lc_rwmtx_is_rlocked(&cpuinfo_rwmtx)
+			   || erts_lc_rwmtx_is_rwlocked(&cpuinfo_rwmtx));
+	return erts_get_unbind_from_cpu_str(cpuinfo);
+    }
+    return "false";
+}
+
+void
+erts_sched_bind_atfork_parent(int unbind)
+{
+    if (unbind)
+	erts_smp_rwmtx_runlock(&cpuinfo_rwmtx);
+}
+
+Eterm
+erts_fake_scheduler_bindings(Process *p, Eterm how)
+{
+    ErtsCpuBindOrder fake_cpu_bind_order;
+    erts_cpu_topology_t *cpudata;
+    int cpudata_size;
+    Eterm res;
+
+    if (ERTS_IS_ATOM_STR("default_bind", how))
+	fake_cpu_bind_order = ERTS_CPU_BIND_DEFAULT_BIND;
+    else if (ERTS_IS_ATOM_STR("spread", how))
+	fake_cpu_bind_order = ERTS_CPU_BIND_SPREAD;
+    else if (ERTS_IS_ATOM_STR("processor_spread", how))
+	fake_cpu_bind_order = ERTS_CPU_BIND_PROCESSOR_SPREAD;
+    else if (ERTS_IS_ATOM_STR("thread_spread", how))
+	fake_cpu_bind_order = ERTS_CPU_BIND_THREAD_SPREAD;
+    else if (ERTS_IS_ATOM_STR("thread_no_node_processor_spread", how))
+	fake_cpu_bind_order = ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD;
+    else if (ERTS_IS_ATOM_STR("no_node_processor_spread", how))
+	fake_cpu_bind_order = ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD;
+    else if (ERTS_IS_ATOM_STR("no_node_thread_spread", how))
+	fake_cpu_bind_order = ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD;
+    else if (ERTS_IS_ATOM_STR("no_spread", how))
+	fake_cpu_bind_order = ERTS_CPU_BIND_NO_SPREAD;
+    else if (ERTS_IS_ATOM_STR("unbound", how))
+	fake_cpu_bind_order = ERTS_CPU_BIND_NONE;
+    else {
+	ERTS_BIF_PREP_ERROR(res, p, BADARG);
+	return res;
+    }
+
+    erts_smp_rwmtx_rlock(&cpuinfo_rwmtx);
+    create_tmp_cpu_topology_copy(&cpudata, &cpudata_size);
+    erts_smp_rwmtx_runlock(&cpuinfo_rwmtx);
+
+    if (!cpudata || fake_cpu_bind_order == ERTS_CPU_BIND_NONE)
+	ERTS_BIF_PREP_RET(res, am_false);
+    else {
+	int i;
+	Eterm *hp;
+	
+	cpu_bind_order_sort(cpudata, cpudata_size, fake_cpu_bind_order, 1);
+
+#ifdef ERTS_FAKE_SCHED_BIND_PRINT_SORTED_CPU_DATA
+
+	erts_fprintf(stderr, "node:          ");
+	for (i = 0; i < cpudata_size; i++)
+	    erts_fprintf(stderr, " %2d", cpudata[i].node);
+	erts_fprintf(stderr, "\n");
+	erts_fprintf(stderr, "processor:     ");
+	for (i = 0; i < cpudata_size; i++)
+	    erts_fprintf(stderr, " %2d", cpudata[i].processor);
+	erts_fprintf(stderr, "\n");
+	if (fake_cpu_bind_order != ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD
+	    && fake_cpu_bind_order != ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD
+	    && fake_cpu_bind_order != ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD) {
+	    erts_fprintf(stderr, "processor_node:");
+	    for (i = 0; i < cpudata_size; i++)
+		erts_fprintf(stderr, " %2d", cpudata[i].processor_node);
+	    erts_fprintf(stderr, "\n");
+	}
+	erts_fprintf(stderr, "core:          ");
+	for (i = 0; i < cpudata_size; i++)
+	    erts_fprintf(stderr, " %2d", cpudata[i].core);
+	erts_fprintf(stderr, "\n");
+	erts_fprintf(stderr, "thread:        ");
+	for (i = 0; i < cpudata_size; i++)
+	    erts_fprintf(stderr, " %2d", cpudata[i].thread);
+	erts_fprintf(stderr, "\n");
+	erts_fprintf(stderr, "logical:       ");
+	for (i = 0; i < cpudata_size; i++)
+	    erts_fprintf(stderr, " %2d", cpudata[i].logical);
+	erts_fprintf(stderr, "\n");
+#endif
+
+	hp = HAlloc(p, cpudata_size+1);
+	ERTS_BIF_PREP_RET(res, make_tuple(hp));
+	*hp++ = make_arityval((Uint) cpudata_size);
+	for (i = 0; i < cpudata_size; i++)
+	    *hp++ = make_small((Uint) cpudata[i].logical);
+    }
+
+    destroy_tmp_cpu_topology_copy(cpudata);
+
+    return res;
+}
+
+Eterm
+erts_get_schedulers_binds(Process *c_p)
+{
+    int ix;
+    ERTS_DECL_AM(unbound);
+    Eterm *hp = HAlloc(c_p, erts_no_schedulers+1);
+    Eterm res = make_tuple(hp);
+
+    *(hp++) = make_arityval(erts_no_schedulers);
+    erts_smp_rwmtx_rlock(&cpuinfo_rwmtx);
+    for (ix = 1; ix <= erts_no_schedulers; ix++)
+	*(hp++) = (scheduler2cpu_map[ix].bound_id >= 0
+		   ? make_small(scheduler2cpu_map[ix].bound_id)
+		   : AM_unbound);
+    erts_smp_rwmtx_runlock(&cpuinfo_rwmtx);
+    return res;
+}
+
+/*
+ * CPU topology
+ */
+
+typedef struct {
+    int *id;
+    int used;
+    int size;
+} ErtsCpuTopIdSeq;
+
+typedef struct {
+    ErtsCpuTopIdSeq logical;
+    ErtsCpuTopIdSeq thread;
+    ErtsCpuTopIdSeq core;
+    ErtsCpuTopIdSeq processor_node;
+    ErtsCpuTopIdSeq processor;
+    ErtsCpuTopIdSeq node;
+} ErtsCpuTopEntry;
+
+static void
+init_cpu_top_entry(ErtsCpuTopEntry *cte)
+{
+    int size = 10;
+    cte->logical.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
+				 sizeof(int)*size);
+    cte->logical.size = size;
+    cte->thread.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
+				sizeof(int)*size);
+    cte->thread.size = size;
+    cte->core.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
+			      sizeof(int)*size);
+    cte->core.size = size;
+    cte->processor_node.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
+					sizeof(int)*size);
+    cte->processor_node.size = size;
+    cte->processor.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
+				   sizeof(int)*size);
+    cte->processor.size = size;
+    cte->node.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
+			      sizeof(int)*size);
+    cte->node.size = size;
+}
+
+static void
+destroy_cpu_top_entry(ErtsCpuTopEntry *cte)
+{
+    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->logical.id);
+    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->thread.id);
+    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->core.id);
+    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->processor_node.id);
+    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->processor.id);
+    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->node.id);
+}
+
+static int
+get_cput_value_or_range(int *v, int *vr, char **str)
+{
+    long l;
+    char *c = *str;
+    errno = 0;
+    if (!isdigit((unsigned char)*c))
+	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID;
+    l = strtol(c, &c, 10);
+    if (errno != 0 || l < 0 || ERTS_MAX_CPU_TOPOLOGY_ID < l)
+	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID;
+    *v = (int) l;
+    if (*c == '-') {
+	c++;
+	if (!isdigit((unsigned char)*c))
+	    return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
+	l = strtol(c, &c, 10);
+	if (errno != 0 || l < 0 || ERTS_MAX_CPU_TOPOLOGY_ID < l)
+	    return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
+	*vr = (int) l;
+    }
+    *str = c;
+    return ERTS_INIT_CPU_TOPOLOGY_OK;
+}
+
+static int
+get_cput_id_seq(ErtsCpuTopIdSeq *idseq, char **str)
+{
+    int ix = 0;
+    int need_size = 0;
+    char *c = *str;
+
+    while (1) {
+	int res;
+	int val;
+	int nids;
+	int val_range = -1;
+	res = get_cput_value_or_range(&val, &val_range, &c);
+	if (res != ERTS_INIT_CPU_TOPOLOGY_OK)
+	    return res;
+	if (val_range < 0 || val_range == val)
+	    nids = 1;
+	else {
+	    if (val_range > val)
+		nids = val_range - val + 1;
+	    else
+		nids = val - val_range + 1;
+	}
+	need_size += nids;
+	if (need_size > idseq->size) {
+	    idseq->size = need_size + 10;
+	    idseq->id = erts_realloc(ERTS_ALC_T_TMP_CPU_IDS,
+				      idseq->id,
+				      sizeof(int)*idseq->size);
+	}
+	if (nids == 1)
+	    idseq->id[ix++] = val;
+	else if (val_range > val) {
+	    for (; val <= val_range; val++)
+		idseq->id[ix++] = val;
+	}
+	else {
+	    for (; val >= val_range; val--)
+		idseq->id[ix++] = val;
+	}
+	if (*c != ',')
+	    break;
+	c++;
+    }
+    *str = c;
+    idseq->used = ix;
+    return ERTS_INIT_CPU_TOPOLOGY_OK;
+}
+
+static int
+get_cput_entry(ErtsCpuTopEntry *cput, char **str)
+{
+    int h;
+    char *c = *str;
+
+    cput->logical.used = 0;
+    cput->thread.id[0] = 0;
+    cput->thread.used = 1;
+    cput->core.id[0] = 0;
+    cput->core.used = 1;
+    cput->processor_node.id[0] = -1;
+    cput->processor_node.used = 1;
+    cput->processor.id[0] = 0;
+    cput->processor.used = 1;
+    cput->node.id[0] = -1;
+    cput->node.used = 1;
+
+    h = ERTS_TOPOLOGY_MAX_DEPTH;
+    while (*c != ':' && *c != '\0') {
+	int res;
+	ErtsCpuTopIdSeq *idseqp;
+	switch (*c++) {
+	case 'L':
+	    if (h <= ERTS_TOPOLOGY_LOGICAL)
+		return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
+	    idseqp = &cput->logical;
+	    h = ERTS_TOPOLOGY_LOGICAL;
+	    break;
+	case 't':
+	case 'T':
+	    if (h <= ERTS_TOPOLOGY_THREAD)
+		return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
+	    idseqp = &cput->thread;
+	    h = ERTS_TOPOLOGY_THREAD;
+	    break;
+	case 'c':
+	case 'C':
+	    if (h <= ERTS_TOPOLOGY_CORE)
+		return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
+	    idseqp = &cput->core;
+	    h = ERTS_TOPOLOGY_CORE;
+	    break;
+	case 'p':
+	case 'P':
+	    if (h <= ERTS_TOPOLOGY_PROCESSOR)
+		return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
+	    idseqp = &cput->processor;
+	    h = ERTS_TOPOLOGY_PROCESSOR;
+	    break;
+	case 'n':
+	case 'N':
+	    if (h <= ERTS_TOPOLOGY_PROCESSOR) {
+	    do_node:
+		if (h <= ERTS_TOPOLOGY_NODE)
+		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
+		idseqp = &cput->node;
+		h = ERTS_TOPOLOGY_NODE;
+	    }
+	    else {
+		int p_node = 0;
+		char *p_chk = c;
+		while (*p_chk != '\0' && *p_chk != ':') {
+		    if (*p_chk == 'p' || *p_chk == 'P') {
+			p_node = 1;
+			break;
+		    }
+		    p_chk++;
+		}
+		if (!p_node)
+		    goto do_node;
+		if (h <= ERTS_TOPOLOGY_PROCESSOR_NODE)
+		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
+		idseqp = &cput->processor_node;
+		h = ERTS_TOPOLOGY_PROCESSOR_NODE;
+	    }
+	    break;
+	default:
+	    return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_TYPE;
+	}
+	res = get_cput_id_seq(idseqp, &c);
+	if (res != ERTS_INIT_CPU_TOPOLOGY_OK)
+		return res;
+    }
+
+    if (cput->logical.used < 1)
+	return ERTS_INIT_CPU_TOPOLOGY_MISSING_LID;
+
+    if (*c == ':') {
+	c++;
+    }
+
+    if (cput->thread.used != 1
+	&& cput->thread.used != cput->logical.used)
+	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
+    if (cput->core.used != 1
+	&& cput->core.used != cput->logical.used)
+	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
+    if (cput->processor_node.used != 1
+	&& cput->processor_node.used != cput->logical.used)
+	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
+    if (cput->processor.used != 1
+	&& cput->processor.used != cput->logical.used)
+	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
+    if (cput->node.used != 1
+	&& cput->node.used != cput->logical.used)
+	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
+
+    *str = c;
+    return ERTS_INIT_CPU_TOPOLOGY_OK;
+}
+
+static int
+verify_topology(erts_cpu_topology_t *cpudata, int size)
+{
+    if (size > 0) {
+	int *logical;
+	int node, processor, no_nodes, i;
+
+	/* Verify logical ids */
+	logical = erts_alloc(ERTS_ALC_T_TMP, sizeof(int)*size);
+
+	for (i = 0; i < size; i++)
+	    logical[i] = cpudata[i].logical;
+
+	qsort(logical, size, sizeof(int), int_cmp);
+	for (i = 0; i < size-1; i++) {
+	    if (logical[i] == logical[i+1]) {
+		erts_free(ERTS_ALC_T_TMP, logical);
+		return ERTS_INIT_CPU_TOPOLOGY_NOT_UNIQUE_LIDS;
+	    }
+	}
+
+	erts_free(ERTS_ALC_T_TMP, logical);
+
+	qsort(cpudata, size, sizeof(erts_cpu_topology_t), processor_order_cmp);
+
+	/* Verify unique entities */
+
+	for (i = 1; i < size; i++) {
+	    if (cpudata[i-1].processor == cpudata[i].processor
+		&& cpudata[i-1].node == cpudata[i].node
+		&& (cpudata[i-1].processor_node
+		    == cpudata[i].processor_node)
+		&& cpudata[i-1].core == cpudata[i].core
+		&& cpudata[i-1].thread == cpudata[i].thread) {
+		return ERTS_INIT_CPU_TOPOLOGY_NOT_UNIQUE_ENTITIES;
+	    }
+	}
+
+	/* Verify numa nodes */
+	node = cpudata[0].node;
+	processor = cpudata[0].processor;
+	no_nodes = cpudata[0].node < 0 && cpudata[0].processor_node < 0;
+	for (i = 1; i < size; i++) {
+	    if (no_nodes) {
+		if (cpudata[i].node >= 0 || cpudata[i].processor_node >= 0)
+		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_NODES;
+	    }
+	    else {
+		if (cpudata[i].processor == processor && cpudata[i].node != node)
+		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_NODES;
+		node = cpudata[i].node;
+		processor = cpudata[i].processor;
+		if (node >= 0 && cpudata[i].processor_node >= 0)
+		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_NODES;
+		if (node < 0 && cpudata[i].processor_node < 0)
+		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_NODES;
+	    }
+	}
+    }
+
+    return ERTS_INIT_CPU_TOPOLOGY_OK;
+}
+
+int
+erts_init_cpu_topology_string(char *topology_str)
+{
+    ErtsCpuTopEntry cput;
+    int need_size;
+    char *c;
+    int ix;
+    int error = ERTS_INIT_CPU_TOPOLOGY_OK;
+
+    if (user_cpudata)
+	erts_free(ERTS_ALC_T_CPUDATA, user_cpudata);
+    user_cpudata_size = 10;
+
+    user_cpudata = erts_alloc(ERTS_ALC_T_CPUDATA,
+			      (sizeof(erts_cpu_topology_t)
+			       * user_cpudata_size));
+
+    init_cpu_top_entry(&cput);
+
+    ix = 0;
+    need_size = 0;
+
+    c = topology_str;
+    if (*c == '\0') {
+	error = ERTS_INIT_CPU_TOPOLOGY_MISSING;
+	goto fail;
+    }
+    do {
+	int r;
+	error = get_cput_entry(&cput, &c);
+	if (error != ERTS_INIT_CPU_TOPOLOGY_OK)
+	    goto fail;
+	need_size += cput.logical.used;
+	if (user_cpudata_size < need_size) {
+	    user_cpudata_size = need_size + 10;
+	    user_cpudata = erts_realloc(ERTS_ALC_T_CPUDATA,
+					user_cpudata,
+					(sizeof(erts_cpu_topology_t)
+					 * user_cpudata_size));
+	}
+
+	ASSERT(cput.thread.used == 1
+	       || cput.thread.used == cput.logical.used);
+	ASSERT(cput.core.used == 1
+	       || cput.core.used == cput.logical.used);
+	ASSERT(cput.processor_node.used == 1
+	       || cput.processor_node.used == cput.logical.used);
+	ASSERT(cput.processor.used == 1
+	       || cput.processor.used == cput.logical.used);
+	ASSERT(cput.node.used == 1
+	       || cput.node.used == cput.logical.used);
+
+	for (r = 0; r < cput.logical.used; r++) {
+	    user_cpudata[ix].logical = cput.logical.id[r];
+	    user_cpudata[ix].thread =
+		cput.thread.id[cput.thread.used == 1 ? 0 : r];
+	    user_cpudata[ix].core =
+		cput.core.id[cput.core.used == 1 ? 0 : r];
+	    user_cpudata[ix].processor_node =
+		cput.processor_node.id[cput.processor_node.used == 1 ? 0 : r];
+	    user_cpudata[ix].processor =
+		cput.processor.id[cput.processor.used == 1 ? 0 : r];
+	    user_cpudata[ix].node =
+		cput.node.id[cput.node.used == 1 ? 0 : r];
+	    ix++;
+	}
+    } while (*c != '\0');
+
+    if (user_cpudata_size != ix) {
+	user_cpudata_size = ix;
+	user_cpudata = erts_realloc(ERTS_ALC_T_CPUDATA,
+				    user_cpudata,
+				    (sizeof(erts_cpu_topology_t)
+				     * user_cpudata_size));
+    }
+
+    error = verify_topology(user_cpudata, user_cpudata_size);
+    if (error == ERTS_INIT_CPU_TOPOLOGY_OK) {
+	destroy_cpu_top_entry(&cput);
+	return ERTS_INIT_CPU_TOPOLOGY_OK;
+    }
+
+ fail:
+    if (user_cpudata)
+	erts_free(ERTS_ALC_T_CPUDATA, user_cpudata);
+    user_cpudata_size = 0;
+    destroy_cpu_top_entry(&cput);
+    return error;
+}
+
+#define ERTS_GET_CPU_TOPOLOGY_ERROR		-1
+#define ERTS_GET_USED_CPU_TOPOLOGY		0
+#define ERTS_GET_DETECTED_CPU_TOPOLOGY		1
+#define ERTS_GET_DEFINED_CPU_TOPOLOGY		2
+
+static Eterm get_cpu_topology_term(Process *c_p, int type);
+
+Eterm
+erts_set_cpu_topology(Process *c_p, Eterm term)
+{
+    erts_cpu_topology_t *cpudata = NULL;
+    int cpudata_size = 0;
+    Eterm res;
+
+    erts_smp_rwmtx_rwlock(&cpuinfo_rwmtx);
+    res = get_cpu_topology_term(c_p, ERTS_GET_USED_CPU_TOPOLOGY);
+    if (term == am_undefined) {
+	if (user_cpudata)
+	    erts_free(ERTS_ALC_T_CPUDATA, user_cpudata);
+	user_cpudata = NULL;
+	user_cpudata_size = 0;
+
+	if (cpu_bind_order != ERTS_CPU_BIND_NONE && system_cpudata) {
+	    cpudata_size = system_cpudata_size;
+	    cpudata = erts_alloc(ERTS_ALC_T_TMP,
+				 (sizeof(erts_cpu_topology_t)
+				  * cpudata_size));
+
+	    sys_memcpy((void *) cpudata,
+		       (void *) system_cpudata,
+		       sizeof(erts_cpu_topology_t)*cpudata_size);
+	}
+    }
+    else if (is_not_list(term)) {
+    error:
+	erts_smp_rwmtx_rwunlock(&cpuinfo_rwmtx);
+	res = THE_NON_VALUE;
+	goto done;
+    }
+    else {
+	Eterm list = term;
+	int ix = 0;
+
+	cpudata_size = 100;
+	cpudata = erts_alloc(ERTS_ALC_T_TMP,
+			     (sizeof(erts_cpu_topology_t)
+			      * cpudata_size));
+
+	while (is_list(list)) {
+	    Eterm *lp = list_val(list);
+	    Eterm cpu = CAR(lp);
+	    Eterm* tp;
+	    Sint id;
+		
+	    if (is_not_tuple(cpu))
+		goto error;
+
+	    tp = tuple_val(cpu);
+
+	    if (arityval(tp[0]) != 7 || tp[1] != am_cpu)
+		goto error;
+
+	    if (ix >= cpudata_size) {
+		cpudata_size += 100;
+		cpudata = erts_realloc(ERTS_ALC_T_TMP,
+				       cpudata,
+				       (sizeof(erts_cpu_topology_t)
+					* cpudata_size));
+	    }
+
+	    id = signed_val(tp[2]);
+	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
+		goto error;
+	    cpudata[ix].node = (int) id;
+
+	    id = signed_val(tp[3]);
+	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
+		goto error;
+	    cpudata[ix].processor = (int) id;
+
+	    id = signed_val(tp[4]);
+	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
+		goto error;
+	    cpudata[ix].processor_node = (int) id;
+
+	    id = signed_val(tp[5]);
+	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
+		goto error;
+	    cpudata[ix].core = (int) id;
+
+	    id = signed_val(tp[6]);
+	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
+		goto error;
+	    cpudata[ix].thread = (int) id;
+
+	    id = signed_val(tp[7]);
+	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
+		goto error;
+	    cpudata[ix].logical = (int) id;
+
+	    list = CDR(lp);
+	    ix++;
+	}
+
+	if (is_not_nil(list))
+	    goto error;
+	
+	cpudata_size = ix;
+
+	if (ERTS_INIT_CPU_TOPOLOGY_OK != verify_topology(cpudata, cpudata_size))
+	    goto error;
+
+	if (user_cpudata_size != cpudata_size) {
+	    if (user_cpudata)
+		erts_free(ERTS_ALC_T_CPUDATA, user_cpudata);
+	    user_cpudata = erts_alloc(ERTS_ALC_T_CPUDATA,
+				      sizeof(erts_cpu_topology_t)*cpudata_size);
+	    user_cpudata_size = cpudata_size;
+	}
+
+	sys_memcpy((void *) user_cpudata,
+		   (void *) cpudata,
+		   sizeof(erts_cpu_topology_t)*cpudata_size);
+    }
+
+    update_cpu_groups_maps();
+
+    write_schedulers_bind_change(cpudata, cpudata_size);
+
+    erts_smp_rwmtx_rwunlock(&cpuinfo_rwmtx);
+    erts_sched_notify_check_cpu_bind();
+
+ done:
+
+    if (cpudata)
+	erts_free(ERTS_ALC_T_TMP, cpudata);
+
+    return res;
+}
+
+static void
+create_tmp_cpu_topology_copy(erts_cpu_topology_t **cpudata, int *cpudata_size)
+{
+    if (user_cpudata) {
+	*cpudata_size = user_cpudata_size;
+	*cpudata = erts_alloc(ERTS_ALC_T_TMP,
+			      (sizeof(erts_cpu_topology_t)
+			       * (*cpudata_size)));
+	sys_memcpy((void *) *cpudata,
+		   (void *) user_cpudata,
+		   sizeof(erts_cpu_topology_t)*(*cpudata_size));
+    }
+    else if (system_cpudata) {
+	*cpudata_size = system_cpudata_size;
+	*cpudata = erts_alloc(ERTS_ALC_T_TMP,
+			      (sizeof(erts_cpu_topology_t)
+			       * (*cpudata_size)));
+	sys_memcpy((void *) *cpudata,
+		   (void *) system_cpudata,
+		   sizeof(erts_cpu_topology_t)*(*cpudata_size));
+    }
+    else {
+	*cpudata = NULL;
+	*cpudata_size = 0;
+    }
+}
+
+static void
+destroy_tmp_cpu_topology_copy(erts_cpu_topology_t *cpudata)
+{
+    if (cpudata)
+	erts_free(ERTS_ALC_T_TMP, cpudata);
+}
+
+
+static Eterm
+bld_topology_term(Eterm **hpp,
+		  Uint *hszp,
+		  erts_cpu_topology_t *cpudata,
+		  int size)
+{
+    Eterm res = NIL;
+    int i;
+
+    if (size == 0)
+	return am_undefined;
+
+    for (i = size-1; i >= 0; i--) {
+	res = erts_bld_cons(hpp,
+			    hszp,
+			    erts_bld_tuple(hpp,
+					   hszp,
+					   7,
+					   am_cpu,
+					   make_small(cpudata[i].node),
+					   make_small(cpudata[i].processor),
+					   make_small(cpudata[i].processor_node),
+					   make_small(cpudata[i].core),
+					   make_small(cpudata[i].thread),
+					   make_small(cpudata[i].logical)),
+			    res);
+    }
+    return res;
+}
+
+static Eterm
+get_cpu_topology_term(Process *c_p, int type)
+{
+#ifdef DEBUG
+    Eterm *hp_end;
+#endif
+    Eterm *hp;
+    Uint hsz;
+    Eterm res = THE_NON_VALUE;
+    erts_cpu_topology_t *cpudata = NULL;
+    int size = 0;
+
+    switch (type) {
+    case ERTS_GET_USED_CPU_TOPOLOGY:
+	if (user_cpudata)
+	    goto defined;
+	else
+	    goto detected;
+    case ERTS_GET_DETECTED_CPU_TOPOLOGY:
+    detected:
+	if (!system_cpudata)
+	    res = am_undefined;
+	else {
+	    size = system_cpudata_size;
+	    cpudata = erts_alloc(ERTS_ALC_T_TMP,
+				 (sizeof(erts_cpu_topology_t)
+				  * size));
+	    sys_memcpy((void *) cpudata,
+		       (void *) system_cpudata,
+		       sizeof(erts_cpu_topology_t)*size);
+	}
+	break;
+    case ERTS_GET_DEFINED_CPU_TOPOLOGY:
+    defined:
+	if (!user_cpudata)
+	    res = am_undefined;
+	else {
+	    size = user_cpudata_size;
+	    cpudata = user_cpudata;
+	}
+	break;
+    default:
+	erl_exit(ERTS_ABORT_EXIT, "Bad cpu topology type: %d\n", type);
+	break;
+    }
+
+    if (res == am_undefined) {
+	ASSERT(!cpudata);
+	return res;
+    }
+
+    hsz = 0;
+
+    bld_topology_term(NULL, &hsz,
+		      cpudata, size);
+
+    hp = HAlloc(c_p, hsz);
+
+#ifdef DEBUG
+    hp_end = hp + hsz;
+#endif
+
+    res = bld_topology_term(&hp, NULL,
+			    cpudata, size);
+
+    ASSERT(hp_end == hp);
+
+    if (cpudata && cpudata != system_cpudata && cpudata != user_cpudata)
+	erts_free(ERTS_ALC_T_TMP, cpudata);
+
+    return res;
+}
+
+Eterm
+erts_get_cpu_topology_term(Process *c_p, Eterm which)
+{
+    Eterm res;
+    int type;
+    erts_smp_rwmtx_rlock(&cpuinfo_rwmtx);
+    if (ERTS_IS_ATOM_STR("used", which))
+	type = ERTS_GET_USED_CPU_TOPOLOGY;
+    else if (ERTS_IS_ATOM_STR("detected", which))
+	type = ERTS_GET_DETECTED_CPU_TOPOLOGY;
+    else if (ERTS_IS_ATOM_STR("defined", which))
+	type = ERTS_GET_DEFINED_CPU_TOPOLOGY;
+    else
+	type = ERTS_GET_CPU_TOPOLOGY_ERROR;
+    if (type == ERTS_GET_CPU_TOPOLOGY_ERROR)
+	res = THE_NON_VALUE;
+    else
+	res = get_cpu_topology_term(c_p, type);
+    erts_smp_rwmtx_runlock(&cpuinfo_rwmtx);
+    return res;
+}
+
+static void
+get_logical_processors(int *conf, int *onln, int *avail)
+{
+    if (conf)
+	*conf = erts_get_cpu_configured(cpuinfo);
+    if (onln)
+	*onln = erts_get_cpu_online(cpuinfo);
+    if (avail)
+	*avail = erts_get_cpu_available(cpuinfo);
+}
+
+void
+erts_get_logical_processors(int *conf, int *onln, int *avail)
+{
+    erts_smp_rwmtx_rlock(&cpuinfo_rwmtx);
+    get_logical_processors(conf, onln, avail);
+    erts_smp_rwmtx_runlock(&cpuinfo_rwmtx);
+}
+
+void
+erts_pre_early_init_cpu_topology(int *max_rg_p,
+				 int *conf_p,
+				 int *onln_p,
+				 int *avail_p)
+{
+    cpu_groups_maps = NULL;
+    no_cpu_groups_callbacks = 0;
+    *max_rg_p = ERTS_MAX_READER_GROUPS;
+    cpuinfo = erts_cpu_info_create();
+    get_logical_processors(conf_p, onln_p, avail_p);
+}
+
+void
+erts_early_init_cpu_topology(int no_schedulers,
+			     int *max_main_threads_p,
+			     int max_reader_groups,
+			     int *reader_groups_p)
+{
+    user_cpudata = NULL;
+    user_cpudata_size = 0;
+
+    system_cpudata_size = erts_get_cpu_topology_size(cpuinfo);
+    system_cpudata = erts_alloc(ERTS_ALC_T_CPUDATA,
+				(sizeof(erts_cpu_topology_t)
+				 * system_cpudata_size));
+
+    cpu_bind_order = ERTS_CPU_BIND_UNDEFINED;
+
+    if (!erts_get_cpu_topology(cpuinfo, system_cpudata)
+	|| ERTS_INIT_CPU_TOPOLOGY_OK != verify_topology(system_cpudata,
+							system_cpudata_size)) {
+	erts_free(ERTS_ALC_T_CPUDATA, system_cpudata);
+	system_cpudata = NULL;
+	system_cpudata_size = 0;
+    }
+
+    max_main_threads = erts_get_cpu_configured(cpuinfo);
+    if (max_main_threads > no_schedulers)
+	max_main_threads = no_schedulers;
+    *max_main_threads_p = max_main_threads;
+
+    reader_groups = max_main_threads;
+    if (reader_groups <= 1 || max_reader_groups <= 1)
+	reader_groups = 0;
+    if (reader_groups > max_reader_groups)
+	reader_groups = max_reader_groups;
+    *reader_groups_p = reader_groups;
+}
+
+void
+erts_init_cpu_topology(void)
+{
+    int ix;
+
+    erts_smp_rwmtx_init(&cpuinfo_rwmtx, "cpu_info");
+    erts_smp_rwmtx_rwlock(&cpuinfo_rwmtx);
+
+    scheduler2cpu_map = erts_alloc(ERTS_ALC_T_CPUDATA,
+				   (sizeof(ErtsCpuBindData)
+				    * (erts_no_schedulers+1)));
+    for (ix = 1; ix <= erts_no_schedulers; ix++) {
+	scheduler2cpu_map[ix].bind_id = -1;
+	scheduler2cpu_map[ix].bound_id = -1;
+    }
+
+    if (cpu_bind_order == ERTS_CPU_BIND_UNDEFINED) {
+	int ncpus = erts_get_cpu_configured(cpuinfo);
+	if (ncpus < 1 || erts_no_schedulers < ncpus)
+	    cpu_bind_order = ERTS_CPU_BIND_NONE;
+	else
+	    cpu_bind_order = ((system_cpudata || user_cpudata)
+			      && (erts_bind_to_cpu(cpuinfo, -1) != -ENOTSUP)
+			      ? ERTS_CPU_BIND_DEFAULT_BIND
+			      : ERTS_CPU_BIND_NONE);
+    }
+
+    reader_groups_map = add_cpu_groups(reader_groups,
+				       reader_groups_callback,
+				       NULL);
+
+    if (cpu_bind_order == ERTS_CPU_BIND_NONE)
+	erts_smp_rwmtx_rwunlock(&cpuinfo_rwmtx);
+    else {
+	erts_cpu_topology_t *cpudata;
+	int cpudata_size;
+	create_tmp_cpu_topology_copy(&cpudata, &cpudata_size);
+	write_schedulers_bind_change(cpudata, cpudata_size);
+	erts_smp_rwmtx_rwunlock(&cpuinfo_rwmtx);
+	erts_sched_notify_check_cpu_bind();
+	destroy_tmp_cpu_topology_copy(cpudata);
+    }
+}
+
+int
+erts_update_cpu_info(void)
+{
+    int changed;
+    erts_smp_rwmtx_rwlock(&cpuinfo_rwmtx);
+    changed = erts_cpu_info_update(cpuinfo);
+    if (changed) {
+	erts_cpu_topology_t *cpudata;
+	int cpudata_size;
+
+	if (system_cpudata)
+	    erts_free(ERTS_ALC_T_CPUDATA, system_cpudata);
+
+	system_cpudata_size = erts_get_cpu_topology_size(cpuinfo);
+	if (!system_cpudata_size)
+	    system_cpudata = NULL;
+	else {
+	    system_cpudata = erts_alloc(ERTS_ALC_T_CPUDATA,
+					(sizeof(erts_cpu_topology_t)
+					 * system_cpudata_size));
+
+	    if (!erts_get_cpu_topology(cpuinfo, system_cpudata)
+		|| (ERTS_INIT_CPU_TOPOLOGY_OK
+		    != verify_topology(system_cpudata,
+				       system_cpudata_size))) {
+		erts_free(ERTS_ALC_T_CPUDATA, system_cpudata);
+		system_cpudata = NULL;
+		system_cpudata_size = 0;
+	    }
+	}
+
+	update_cpu_groups_maps();
+
+	create_tmp_cpu_topology_copy(&cpudata, &cpudata_size);
+	write_schedulers_bind_change(cpudata, cpudata_size);
+	destroy_tmp_cpu_topology_copy(cpudata);
+    }
+    erts_smp_rwmtx_rwunlock(&cpuinfo_rwmtx);
+    if (changed)
+	erts_sched_notify_check_cpu_bind();
+    return changed;
+}
+
+/*
+ * reader groups map
+ */
+
+void
+reader_groups_callback(int suspending,
+		       ErtsSchedulerData *esdp,
+		       int group,
+		       void *unused)
+{
+    if (reader_groups && esdp->no <= max_main_threads)
+	erts_smp_rwmtx_set_reader_group(suspending ? 0 : group+1);
+}
+
+static Eterm get_cpu_groups_map(Process *c_p,
+				erts_cpu_groups_map_t *map,
+				int offset);
+Eterm
+erts_debug_reader_groups_map(Process *c_p, int groups)
+{
+    Eterm res;
+    erts_cpu_groups_map_t test;
+
+    test.array = NULL;
+    test.groups = groups;
+    make_cpu_groups_map(&test, 1);
+    if (!test.array)
+	res = NIL;
+    else {
+	res = get_cpu_groups_map(c_p, &test, 1);
+	erts_free(ERTS_ALC_T_TMP, test.array);
+    }
+    return res;
+}
+
+
+Eterm
+erts_get_reader_groups_map(Process *c_p)
+{
+    Eterm res;
+    erts_smp_rwmtx_rlock(&cpuinfo_rwmtx);
+    res = get_cpu_groups_map(c_p, reader_groups_map, 1);
+    erts_smp_rwmtx_runlock(&cpuinfo_rwmtx);
+    return res;
+}
+
+/*
+ * CPU groups
+ */
+
+static Eterm
+get_cpu_groups_map(Process *c_p,
+		   erts_cpu_groups_map_t *map,
+		   int offset)
+{
+#ifdef DEBUG
+    Eterm *endp;
+#endif
+    Eterm res = NIL, tuple;
+    Eterm *hp;
+    int i;
+
+    hp = HAlloc(c_p, map->logical_processors*(2+3));
+#ifdef DEBUG
+    endp = hp + map->logical_processors*(2+3);
+#endif
+    for (i = map->size - 1; i >= 0; i--) {
+	if (map->array[i].logical >= 0) {
+	    tuple = TUPLE2(hp,
+			   make_small(map->array[i].logical),
+			   make_small(map->array[i].cpu_group + offset));
+	    hp += 3;
+	    res = CONS(hp, tuple, res);
+	    hp += 2;
+	}
+    }
+    ASSERT(hp == endp);
+    return res;
+}
+
+static void
+make_available_cpu_topology(erts_avail_cput *no,
+			    erts_avail_cput *avail,
+			    erts_cpu_topology_t *cpudata,
+			    int *size,
+			    int test)
+{
+    int len = *size;
+    erts_cpu_topology_t last;
+    int a, i, j;
+
+    no->level[ERTS_TOPOLOGY_NODE] = -1;
+    no->level[ERTS_TOPOLOGY_PROCESSOR] = -1;
+    no->level[ERTS_TOPOLOGY_PROCESSOR_NODE] = -1;
+    no->level[ERTS_TOPOLOGY_CORE] = -1;
+    no->level[ERTS_TOPOLOGY_THREAD] = -1;
+    no->level[ERTS_TOPOLOGY_LOGICAL] = -1;
+
+    last.node = INT_MIN;
+    last.processor = INT_MIN;
+    last.processor_node = INT_MIN;
+    last.core = INT_MIN;
+    last.thread = INT_MIN;
+    last.logical = INT_MIN;
+
+    a = 0;
+
+    for (i = 0; i < len; i++) {
+
+	if (!test && !erts_is_cpu_available(cpuinfo, cpudata[i].logical))
+	    continue;
+
+	if (last.node != cpudata[i].node)
+	    goto node;
+	if (last.processor != cpudata[i].processor)
+	    goto processor;
+	if (last.processor_node != cpudata[i].processor_node)
+	    goto processor_node;
+	if (last.core != cpudata[i].core)
+	    goto core;
+	ASSERT(last.thread != cpudata[i].thread);
+	goto thread;
+
+    node:
+	no->level[ERTS_TOPOLOGY_NODE]++;
+    processor:
+	no->level[ERTS_TOPOLOGY_PROCESSOR]++;
+    processor_node:
+	no->level[ERTS_TOPOLOGY_PROCESSOR_NODE]++;
+    core:
+	no->level[ERTS_TOPOLOGY_CORE]++;
+    thread:
+	no->level[ERTS_TOPOLOGY_THREAD]++;
+
+	no->level[ERTS_TOPOLOGY_LOGICAL]++;
+
+	for (j = 0; j < ERTS_TOPOLOGY_LOGICAL; j++)
+	    avail[a].level[j] = no->level[j];
+
+	avail[a].level[ERTS_TOPOLOGY_LOGICAL] = cpudata[i].logical;
+	avail[a].level[ERTS_TOPOLOGY_CG] = 0;
+
+	ASSERT(last.logical != cpudata[i].logical);
+
+	last = cpudata[i];
+	a++;
+    }
+
+    no->level[ERTS_TOPOLOGY_NODE]++;
+    no->level[ERTS_TOPOLOGY_PROCESSOR]++;
+    no->level[ERTS_TOPOLOGY_PROCESSOR_NODE]++;
+    no->level[ERTS_TOPOLOGY_CORE]++;
+    no->level[ERTS_TOPOLOGY_THREAD]++;
+    no->level[ERTS_TOPOLOGY_LOGICAL]++;
+
+    *size = a;
+}
+
+static void
+cpu_group_insert(erts_cpu_groups_map_t *map,
+		 int logical, int cpu_group)
+{
+    int start = logical % map->size;
+    int ix = start;
+
+    do {
+	if (map->array[ix].logical < 0) {
+	    map->array[ix].logical = logical;
+	    map->array[ix].cpu_group = cpu_group;
+	    return;
+	}
+	ix++;
+	if (ix == map->size)
+	    ix = 0;
+    } while (ix != start);
+
+    erl_exit(ERTS_ABORT_EXIT, "Reader groups map full\n");
+}
+
+
+static int
+sub_levels(erts_cpu_groups_count_t *cgc, int level, int aix,
+	   int avail_sz, erts_avail_cput *avail)
+{
+    int sub_level = level+1;
+    int last = -1;
+    cgc->sub_levels = 0;
+
+    do {
+	if (last != avail[aix].level[sub_level]) {
+	    cgc->sub_levels++;
+	    last = avail[aix].level[sub_level];
+	}
+	aix++;
+    }
+    while (aix < avail_sz && cgc->id == avail[aix].level[level]);
+    cgc->cpu_groups = 0;
+    return aix;
+}
+
+static int
+write_cpu_groups(int *cgp, erts_cpu_groups_count_t *cgcp,
+		    int level, int a,
+		    int avail_sz, erts_avail_cput *avail)
+{
+    int cg = *cgp;
+    int sub_level = level+1;
+    int sl_per_gr = cgcp->sub_levels / cgcp->cpu_groups;
+    int xsl = cgcp->sub_levels % cgcp->cpu_groups;
+    int sls = 0;
+    int last = -1;
+    int xsl_cg_lim = (cgcp->cpu_groups - xsl) + cg + 1;
+
+    ASSERT(level < 0 || avail[a].level[level] == cgcp->id);
+
+    do {
+	if (last != avail[a].level[sub_level]) {
+	    if (!sls) {
+		sls = sl_per_gr;
+		cg++;
+		if (cg >= xsl_cg_lim)
+		    sls++;
+	    }
+	    last = avail[a].level[sub_level];
+	    sls--;
+	}
+	avail[a].level[ERTS_TOPOLOGY_CG] = cg;
+	a++;
+    } while (a < avail_sz && (level < 0
+			      || avail[a].level[level] == cgcp->id));
+
+    ASSERT(cgcp->cpu_groups == cg - *cgp);
+
+    *cgp = cg;
+
+    return a;
+}
+
+static int
+cg_count_sub_levels_compare(const void *vx, const void *vy)
+{
+    erts_cpu_groups_count_t *x = (erts_cpu_groups_count_t *) vx;
+    erts_cpu_groups_count_t *y = (erts_cpu_groups_count_t *) vy;
+    if (x->sub_levels != y->sub_levels)
+	return y->sub_levels - x->sub_levels;
+    return x->id - y->id;
+}
+
+static int
+cg_count_id_compare(const void *vx, const void *vy)
+{
+    erts_cpu_groups_count_t *x = (erts_cpu_groups_count_t *) vx;
+    erts_cpu_groups_count_t *y = (erts_cpu_groups_count_t *) vy;
+    return x->id - y->id;
+}
+
+static void
+make_cpu_groups_map(erts_cpu_groups_map_t *map, int test)
+{
+    int i, spread_level, avail_sz;
+    erts_avail_cput no, *avail;
+    erts_cpu_topology_t *cpudata;
+    ErtsAlcType_t alc_type = (test
+			      ? ERTS_ALC_T_TMP
+			      : ERTS_ALC_T_CPU_GRPS_MAP);
+
+    if (map->array)
+	erts_free(alc_type, map->array);
+
+    map->array = NULL;
+    map->logical_processors = 0;
+    map->size = 0;
+
+    if (!map->groups)
+	return;
+
+    create_tmp_cpu_topology_copy(&cpudata, &avail_sz);
+
+    if (!cpudata)
+	return;
+
+    cpu_bind_order_sort(cpudata,
+			avail_sz,
+			ERTS_CPU_BIND_NO_SPREAD,
+			1);
+
+    avail = erts_alloc(ERTS_ALC_T_TMP,
+		       sizeof(erts_avail_cput)*avail_sz);
+
+    make_available_cpu_topology(&no, avail, cpudata,
+				&avail_sz, test);
+
+    destroy_tmp_cpu_topology_copy(cpudata);
+
+    map->size = avail_sz*2+1;
+
+    map->array = erts_alloc(alc_type,
+			    (sizeof(erts_cpu_groups_map_array_t)
+			     * map->size));;
+    map->logical_processors = avail_sz;
+
+    for (i = 0; i < map->size; i++) {
+	map->array[i].logical = -1;
+	map->array[i].cpu_group = -1;
+    }
+
+    spread_level = ERTS_TOPOLOGY_CORE;
+    for (i = ERTS_TOPOLOGY_NODE; i < ERTS_TOPOLOGY_THREAD; i++) {
+	if (no.level[i] > map->groups) {
+	    spread_level = i;
+	    break;
+	}
+    }
+
+    if (no.level[spread_level] <= map->groups) {
+	int a, cg, last = -1;
+	cg = -1;
+	ASSERT(spread_level == ERTS_TOPOLOGY_CORE);
+	for (a = 0; a < avail_sz; a++) {
+	    if (last != avail[a].level[spread_level]) {
+		cg++;
+		last = avail[a].level[spread_level];
+	    }
+	    cpu_group_insert(map,
+			     avail[a].level[ERTS_TOPOLOGY_LOGICAL],
+			     cg);
+	}
+    }
+    else { /* map->groups < no.level[spread_level] */
+	erts_cpu_groups_count_t *cg_count;
+	int a, cg, tl, toplevels;
+
+	tl = spread_level-1;
+
+	if (spread_level == ERTS_TOPOLOGY_NODE)
+	    toplevels = 1;
+	else
+	    toplevels = no.level[tl];
+
+	cg_count = erts_alloc(ERTS_ALC_T_TMP,
+			      toplevels*sizeof(erts_cpu_groups_count_t));
+
+	if (toplevels == 1) {
+	    cg_count[0].id = 0;
+	    cg_count[0].sub_levels = no.level[spread_level];
+	    cg_count[0].cpu_groups = map->groups;
+	}
+	else {
+	    int cgs_per_tl, cgs;
+	    cgs = map->groups;
+	    cgs_per_tl = cgs / toplevels;
+
+	    a = 0;
+	    for (i = 0; i < toplevels; i++) {
+		cg_count[i].id = avail[a].level[tl];
+		a = sub_levels(&cg_count[i], tl, a, avail_sz, avail);
+	    }
+
+	    qsort(cg_count,
+		  toplevels,
+		  sizeof(erts_cpu_groups_count_t),
+		  cg_count_sub_levels_compare);
+
+	    for (i = 0; i < toplevels; i++) {
+		if (cg_count[i].sub_levels < cgs_per_tl) {
+		    cg_count[i].cpu_groups = cg_count[i].sub_levels;
+		    cgs -= cg_count[i].sub_levels;
+		}
+		else {
+		    cg_count[i].cpu_groups = cgs_per_tl;
+		    cgs -= cgs_per_tl;
+		}
+	    }
+
+	    while (cgs > 0) {
+		for (i = 0; i < toplevels; i++) {
+		    if (cg_count[i].sub_levels == cg_count[i].cpu_groups)
+			break;
+		    else {
+			cg_count[i].cpu_groups++;
+			if (--cgs == 0)
+			    break;
+		    }
+		}
+	    }
+
+	    qsort(cg_count,
+		  toplevels,
+		  sizeof(erts_cpu_groups_count_t),
+		  cg_count_id_compare);
+	}
+
+	a = i = 0;
+	cg = -1;
+	while (a < avail_sz) {
+	    a = write_cpu_groups(&cg, &cg_count[i], tl,
+				 a, avail_sz, avail);
+	    i++;
+	}
+
+	ASSERT(map->groups == cg + 1);
+
+	for (a = 0; a < avail_sz; a++)
+	    cpu_group_insert(map,
+			     avail[a].level[ERTS_TOPOLOGY_LOGICAL],
+			     avail[a].level[ERTS_TOPOLOGY_CG]);
+
+	erts_free(ERTS_ALC_T_TMP, cg_count);
+    }
+
+    erts_free(ERTS_ALC_T_TMP, avail);
+}
+
+static erts_cpu_groups_map_t *
+add_cpu_groups(int groups,
+	       erts_cpu_groups_callback_t callback,
+	       void *arg)
+{
+    int use_groups = groups;
+    erts_cpu_groups_callback_list_t *cgcl;
+    erts_cpu_groups_map_t *cgm;
+
+    ERTS_SMP_LC_ASSERT(erts_lc_rwmtx_is_rwlocked(&cpuinfo_rwmtx));
+
+    if (use_groups > max_main_threads)
+	use_groups = max_main_threads;
+
+    if (!use_groups)
+	return NULL;
+
+    no_cpu_groups_callbacks++;
+    cgcl = erts_alloc(ERTS_ALC_T_CPU_GRPS_MAP,
+		      sizeof(erts_cpu_groups_callback_list_t));
+    cgcl->callback = callback;
+    cgcl->arg = arg;
+
+    for (cgm = cpu_groups_maps; cgm; cgm = cgm->next) {
+	if (cgm->groups == use_groups) {
+	    cgcl->next = cgm->callback_list;
+	    cgm->callback_list = cgcl;
+	    return cgm;
+	}
+    }
+
+
+    cgm = erts_alloc(ERTS_ALC_T_CPU_GRPS_MAP,
+		     sizeof(erts_cpu_groups_map_t));
+    cgm->next = cpu_groups_maps;
+    cgm->groups = use_groups;
+    cgm->array = NULL;
+    cgm->size = 0;
+    cgm->logical_processors = 0;
+    cgm->callback_list = cgcl;
+
+    cgcl->next = NULL;
+
+    make_cpu_groups_map(cgm, 0);
+
+    cpu_groups_maps = cgm;
+
+    return cgm;
+}
+
+static void
+remove_cpu_groups(erts_cpu_groups_callback_t callback, void *arg)
+{
+    erts_cpu_groups_map_t *prev_cgm, *cgm;
+    erts_cpu_groups_callback_list_t *prev_cgcl, *cgcl;
+
+    ERTS_SMP_LC_ASSERT(erts_lc_rwmtx_is_rwlocked(&cpuinfo_rwmtx));
+
+    no_cpu_groups_callbacks--;
+
+    prev_cgm = NULL;
+    for (cgm = cpu_groups_maps; cgm; cgm = cgm->next) {
+	prev_cgcl = NULL;
+	for (cgcl = cgm->callback_list; cgcl; cgcl = cgcl->next) {
+	    if (cgcl->callback == callback && cgcl->arg == arg) {
+		if (prev_cgcl)
+		    prev_cgcl->next = cgcl->next;
+		else
+		    cgm->callback_list = cgcl->next;
+		erts_free(ERTS_ALC_T_CPU_GRPS_MAP, cgcl);
+		if (!cgm->callback_list) {
+		    if (prev_cgm)
+			prev_cgm->next = cgm->next;
+		    else
+			cpu_groups_maps = cgm->next;
+		    if (cgm->array)
+			erts_free(ERTS_ALC_T_CPU_GRPS_MAP, cgm->array);
+		    erts_free(ERTS_ALC_T_CPU_GRPS_MAP, cgm);
+		}
+		return;
+	    }
+	    prev_cgcl = cgcl;
+	}
+	prev_cgm = cgm;
+    }
+
+    erl_exit(ERTS_ABORT_EXIT, "Cpu groups not found\n");
+}
+
+static int
+cpu_groups_lookup(erts_cpu_groups_map_t *map,
+		  ErtsSchedulerData *esdp)
+{
+    int start, logical, ix;
+
+    ERTS_SMP_LC_ASSERT(erts_lc_rwmtx_is_rlocked(&cpuinfo_rwmtx)
+		       || erts_lc_rwmtx_is_rwlocked(&cpuinfo_rwmtx));
+
+    if (esdp->cpu_id < 0)
+	return (((int) esdp->no) - 1) % map->groups;
+
+    logical = esdp->cpu_id;
+    start = logical % map->size;
+    ix = start;
+
+    do {
+	if (map->array[ix].logical == logical) {
+	    int group = map->array[ix].cpu_group;
+	    ASSERT(0 <= group && group < map->groups);
+	    return group;
+	}
+	ix++;
+	if (ix == map->size)
+	    ix = 0;
+    } while (ix != start);
+
+    erl_exit(ERTS_ABORT_EXIT, "Logical cpu id %d not found\n", logical);
+}
+
+static void
+update_cpu_groups_maps(void)
+{
+    erts_cpu_groups_map_t *cgm;
+    ERTS_SMP_LC_ASSERT(erts_lc_rwmtx_is_rwlocked(&cpuinfo_rwmtx));
+
+    for (cgm = cpu_groups_maps; cgm; cgm = cgm->next)
+	make_cpu_groups_map(cgm, 0);
+}
+
+void
+erts_add_cpu_groups(int groups,
+		    erts_cpu_groups_callback_t callback,
+		    void *arg)
+{
+    erts_smp_rwmtx_rwlock(&cpuinfo_rwmtx);
+    add_cpu_groups(groups, callback, arg);
+    erts_smp_rwmtx_rwunlock(&cpuinfo_rwmtx);
+}
+
+void erts_remove_cpu_groups(erts_cpu_groups_callback_t callback,
+			    void *arg)
+{
+    erts_smp_rwmtx_rwlock(&cpuinfo_rwmtx);
+    remove_cpu_groups(callback, arg);
+    erts_smp_rwmtx_rwunlock(&cpuinfo_rwmtx);
+}
diff --git a/erts/emulator/beam/erl_cpu_topology.h b/erts/emulator/beam/erl_cpu_topology.h
new file mode 100644
index 0000000000..c5a9520b61
--- /dev/null
+++ b/erts/emulator/beam/erl_cpu_topology.h
@@ -0,0 +1,105 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description:	CPU topology and related functionality
+ *
+ * Author: 	Rickard Green
+ */
+
+#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_init_cpu_topology(void);
+
+
+#define ERTS_INIT_SCHED_BIND_TYPE_SUCCESS		0
+#define ERTS_INIT_SCHED_BIND_TYPE_NOT_SUPPORTED		1
+#define ERTS_INIT_SCHED_BIND_TYPE_ERROR_NO_CPU_TOPOLOGY	2
+#define ERTS_INIT_SCHED_BIND_TYPE_ERROR_NO_BAD_TYPE	3
+
+int erts_init_scheduler_bind_type_string(char *how);
+
+
+#define ERTS_INIT_CPU_TOPOLOGY_OK			0
+#define ERTS_INIT_CPU_TOPOLOGY_INVALID_ID		1
+#define ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE		2
+#define ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY	3
+#define ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_TYPE		4
+#define ERTS_INIT_CPU_TOPOLOGY_INVALID_NODES		5
+#define ERTS_INIT_CPU_TOPOLOGY_MISSING_LID		6
+#define ERTS_INIT_CPU_TOPOLOGY_NOT_UNIQUE_LIDS		7
+#define ERTS_INIT_CPU_TOPOLOGY_NOT_UNIQUE_ENTITIES	8
+#define ERTS_INIT_CPU_TOPOLOGY_MISSING			9
+
+int erts_init_cpu_topology_string(char *topology_str);
+
+void erts_sched_check_cpu_bind(ErtsSchedulerData *esdp);
+#ifdef ERTS_SMP
+void erts_sched_init_check_cpu_bind(ErtsSchedulerData *esdp);
+void erts_sched_check_cpu_bind_prep_suspend(ErtsSchedulerData *esdp);
+void erts_sched_check_cpu_bind_post_suspend(ErtsSchedulerData *esdp);
+#endif
+
+int erts_update_cpu_info(void);
+
+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_set_cpu_topology(Process *c_p, Eterm term);
+Eterm erts_get_cpu_topology_term(Process *c_p, Eterm which);
+
+int erts_update_cpu_info(void);
+void erts_get_logical_processors(int *conf, int *onln, int *avail);
+
+int erts_sched_bind_atthrcreate_prepare(void);
+int erts_sched_bind_atthrcreate_child(int unbind);
+void erts_sched_bind_atthrcreate_parent(int unbind);
+
+int erts_sched_bind_atfork_prepare(void);
+int erts_sched_bind_atfork_child(int unbind);
+char *erts_sched_bind_atvfork_child(int unbind);
+void erts_sched_bind_atfork_parent(int unbind);
+
+Eterm erts_fake_scheduler_bindings(Process *p, Eterm how);
+Eterm erts_debug_cpu_groups_map(Process *c_p, int groups);
+
+
+typedef void (*erts_cpu_groups_callback_t)(int,
+					   ErtsSchedulerData *,
+					   int,
+					   void *);
+
+void erts_add_cpu_groups(int groups,
+			 erts_cpu_groups_callback_t callback,
+			 void *arg);
+void erts_remove_cpu_groups(erts_cpu_groups_callback_t callback,
+			    void *arg);
+
+#endif
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index cbdaa459de..5b74240cc3 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -78,11 +78,19 @@ enum DbIterSafety {
 ** The main meta table, containing all ets tables.
 */
 #ifdef ERTS_SMP
-#  define META_MAIN_TAB_LOCK_CNT 16
-static union {
-    erts_smp_spinlock_t lck;
-    byte _cache_line_alignment[64];
-}meta_main_tab_locks[META_MAIN_TAB_LOCK_CNT];
+
+#define ERTS_META_MAIN_TAB_LOCK_TAB_BITS 8
+#define ERTS_META_MAIN_TAB_LOCK_TAB_SIZE (1 << ERTS_META_MAIN_TAB_LOCK_TAB_BITS)
+#define ERTS_META_MAIN_TAB_LOCK_TAB_MASK (ERTS_META_MAIN_TAB_LOCK_TAB_SIZE - 1)
+
+typedef union {
+    erts_smp_rwmtx_t rwmtx;
+    byte cache_line_align__[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(
+				sizeof(erts_smp_rwmtx_t))];
+} erts_meta_main_tab_lock_t;
+
+static erts_meta_main_tab_lock_t *meta_main_tab_locks;
+
 #endif
 static struct {
     union {
@@ -104,17 +112,13 @@ static struct {
 #define MARK_SLOT_DEAD(i) (meta_main_tab[(i)].u.next_free |= 2)
 #define GET_ANY_SLOT_TAB(i) ((DbTable*)(meta_main_tab[(i)].u.next_free & ~(1|2))) /* dead or alive */
 
-static ERTS_INLINE void meta_main_tab_lock(unsigned slot)
+static ERTS_INLINE erts_smp_rwmtx_t *
+get_meta_main_tab_lock(unsigned slot)
 {
 #ifdef ERTS_SMP
-    erts_smp_spin_lock(&meta_main_tab_locks[slot % META_MAIN_TAB_LOCK_CNT].lck);
-#endif
-}
-
-static ERTS_INLINE void meta_main_tab_unlock(unsigned slot)
-{
-#ifdef ERTS_SMP
-    erts_smp_spin_unlock(&meta_main_tab_locks[slot % META_MAIN_TAB_LOCK_CNT].lck);
+    return &meta_main_tab_locks[slot & ERTS_META_MAIN_TAB_LOCK_TAB_MASK].rwmtx;
+#else
+    return NULL;
 #endif
 }
 
@@ -166,7 +170,8 @@ struct meta_name_tab_entry* meta_name_tab_bucket(Eterm name,
 typedef enum {
     LCK_READ=1,     /* read only access */
     LCK_WRITE=2,    /* exclusive table write access */
-    LCK_WRITE_REC=3 /* record write access */
+    LCK_WRITE_REC=3, /* record write access */
+    LCK_NONE=4
 } db_lock_kind_t;
 
 extern DbTableMethod db_hash;
@@ -174,6 +179,7 @@ extern DbTableMethod db_tree;
 
 int user_requested_db_max_tabs;
 int erts_ets_realloc_always_moves;
+int erts_ets_always_compress;
 static int db_max_tabs;
 static DbTable *meta_pid_to_tab; /* Pid mapped to owned tables */
 static DbTable *meta_pid_to_fixed_tab; /* Pid mapped to fixed tables */
@@ -213,61 +219,87 @@ Export ets_select_continue_exp;
  * Static traps
  */
 static Export ets_delete_continue_exp;
-
-static ERTS_INLINE DbTable* db_ref(DbTable* tb)
-{
-    if (tb != NULL) {
-	erts_refc_inc(&tb->common.ref, 2);
-    }
-    return tb;
-}
-
-static ERTS_INLINE DbTable* db_unref(DbTable* tb)
+	
+static void
+free_dbtable(DbTable* tb)
 {
-    if (!erts_refc_dectest(&tb->common.ref, 0)) {
 #ifdef HARDDEBUG
 	if (erts_smp_atomic_read(&tb->common.memory_size) != sizeof(DbTable)) {
-	    erts_fprintf(stderr, "ets: db_unref memory remain=%ld fix=%x\n",
-			 erts_smp_atomic_read(&tb->common.memory_size)-sizeof(DbTable), 
+	    erts_fprintf(stderr, "ets: free_dbtable memory remain=%ld fix=%x\n",
+			 erts_smp_atomic_read(&tb->common.memory_size)-sizeof(DbTable),
 			 tb->common.fixations);
 	}
-	erts_fprintf(stderr, "ets: db_unref(%T) deleted!!!\r\n", 
+	erts_fprintf(stderr, "ets: free_dbtable(%T) deleted!!!\r\n",
 		     tb->common.id);
 
-	erts_fprintf(stderr, "ets: db_unref: meta_pid_to_tab common.memory_size = %ld\n",
+	erts_fprintf(stderr, "ets: free_dbtable: meta_pid_to_tab common.memory_size = %ld\n",
 		     erts_smp_atomic_read(&meta_pid_to_tab->common.memory_size));
 	print_table(ERTS_PRINT_STDOUT, NULL, 1, meta_pid_to_tab);
 
 
-	erts_fprintf(stderr, "ets: db_unref: meta_pid_to_fixed_tab common.memory_size = %ld\n",
+	erts_fprintf(stderr, "ets: free_dbtable: meta_pid_to_fixed_tab common.memory_size = %ld\n",
 		     erts_smp_atomic_read(&meta_pid_to_fixed_tab->common.memory_size));
 	print_table(ERTS_PRINT_STDOUT, NULL, 1, meta_pid_to_fixed_tab);
-	
 #endif
 #ifdef ERTS_SMP
 	erts_smp_rwmtx_destroy(&tb->common.rwlock);
 	erts_smp_mtx_destroy(&tb->common.fixlock);
 #endif
 	ASSERT(is_immed(tb->common.heir_data));
-	erts_db_free(ERTS_ALC_T_DB_TABLE, tb, (void *) tb, sizeof(DbTable));		     
+	erts_db_free(ERTS_ALC_T_DB_TABLE, tb, (void *) tb, sizeof(DbTable));
 	ERTS_ETS_MISC_MEM_ADD(-sizeof(DbTable));
-	return NULL;
-    }
-    return tb;
 }
 
-static ERTS_INLINE void db_init_lock(DbTable* tb, char *rwname, char* fixname)
+#ifdef ERTS_SMP
+static void
+chk_free_dbtable(void *vtb)
+{
+    DbTable * tb = (DbTable *) vtb;
+    ERTS_THR_MEMORY_BARRIER;
+    if (erts_refc_dectest(&tb->common.ref, 0) == 0)
+	free_dbtable(tb);
+}
+#endif
+
+static void schedule_free_dbtable(DbTable* tb)
 {
-    erts_refc_init(&tb->common.ref, 1);
-    erts_refc_init(&tb->common.fixref, 0);
+    /*
+     * NON-SMP case: Caller is *not* allowed to access the *tb
+     *               structure after this function has returned!          
+     * SMP case:     Caller is allowed to access the *tb structure
+     *               until the bif has returned (we typically
+     *               need to unlock the table lock after this
+     *               function has returned).
+     */
 #ifdef ERTS_SMP
-    erts_smp_rwmtx_init_x(&tb->common.rwlock, rwname, tb->common.the_name);
+    int scheds = erts_get_max_no_executing_schedulers();
+    ASSERT(scheds >= 1);
+    ASSERT(erts_refc_read(&tb->common.ref, 0) == 0);
+    erts_refc_init(&tb->common.ref, scheds);
+    ERTS_THR_MEMORY_BARRIER;
+    erts_smp_schedule_misc_aux_work(0, scheds, chk_free_dbtable, tb);
+#else
+    free_dbtable(tb);
+#endif
+}
+
+static ERTS_INLINE void db_init_lock(DbTable* tb, int use_frequent_read_lock,
+				     char *rwname, char* fixname)
+{
+#ifdef ERTS_SMP
+    erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER;
+    if (use_frequent_read_lock)
+	rwmtx_opt.type = ERTS_SMP_RWMTX_TYPE_FREQUENT_READ;
+#endif
+#ifdef ERTS_SMP
+    erts_smp_rwmtx_init_opt_x(&tb->common.rwlock, &rwmtx_opt,
+			      rwname, tb->common.the_name);
     erts_smp_mtx_init_x(&tb->common.fixlock, fixname, tb->common.the_name);
     tb->common.is_thread_safe = !(tb->common.status & DB_FINE_LOCKED);
 #endif
 }
 
-static ERTS_INLINE void db_lock_take_over_ref(DbTable* tb, db_lock_kind_t kind)
+static ERTS_INLINE void db_lock(DbTable* tb, db_lock_kind_t kind)
 {
 #ifdef ERTS_SMP
     ASSERT(tb != meta_pid_to_tab && tb != meta_pid_to_fixed_tab);
@@ -295,16 +327,13 @@ static ERTS_INLINE void db_lock_take_over_ref(DbTable* tb, db_lock_kind_t kind)
 #endif
 }
 
-static ERTS_INLINE void db_lock(DbTable* tb, db_lock_kind_t kind)
-{
-    (void) db_ref(tb);
-#ifdef ERTS_SMP
-    db_lock_take_over_ref(tb, kind);
-#endif
-}
-
 static ERTS_INLINE void db_unlock(DbTable* tb, db_lock_kind_t kind)
 {
+    /*
+     * In NON-SMP case tb may refer to an already deallocated
+     * DbTable structure. That is, ONLY the SMP case is allowed
+     * to follow the tb pointer!
+     */
 #ifdef ERTS_SMP
     ASSERT(tb != meta_pid_to_tab && tb != meta_pid_to_fixed_tab);
 
@@ -331,7 +360,6 @@ static ERTS_INLINE void db_unlock(DbTable* tb, db_lock_kind_t kind)
 	}
     }
 #endif
-    (void) db_unref(tb); /* May delete table... */
 }
 
 
@@ -349,56 +377,85 @@ static ERTS_INLINE void db_meta_unlock(DbTable* tb, db_lock_kind_t kind)
 }
 
 static ERTS_INLINE
-DbTable* db_get_table(Process *p,
-		      Eterm id,
-		      int what,
-		      db_lock_kind_t kind)
+DbTable* db_get_table_aux(Process *p,
+			  Eterm id,
+			  int what,
+			  db_lock_kind_t kind,
+			  int meta_already_locked)
 {
     DbTable *tb = NULL;
+    erts_smp_rwmtx_t *mtl = NULL;
+
+    /*
+     * IMPORTANT: Only scheduler threads are allowed
+     *            to access tables. Memory management
+     *            depend on it.
+     */
+    ASSERT(erts_get_scheduler_data());
 
     if (is_small(id)) {
 	Uint slot = unsigned_val(id) & meta_main_tab_slot_mask;
-	meta_main_tab_lock(slot);
-	if (slot < db_max_tabs && IS_SLOT_ALIVE(slot)) {
-	    /* SMP: inc to prevent race, between unlock of meta_main_tab_lock
-	     * and the table locking outside the meta_main_tab_lock
-	     */
-	    tb = db_ref(meta_main_tab[slot].u.tb);
+	if (!meta_already_locked) {
+	    mtl = get_meta_main_tab_lock(slot);
+	    erts_smp_rwmtx_rlock(mtl);
 	}
-	meta_main_tab_unlock(slot);
+#if defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK)
+	else {
+	    erts_smp_rwmtx_t *test_mtl = get_meta_main_tab_lock(slot);
+	    ERTS_SMP_LC_ASSERT(erts_lc_rwmtx_is_rlocked(test_mtl)
+			       || erts_lc_rwmtx_is_rwlocked(test_mtl));
+	}
+#endif
+	if (slot < db_max_tabs && IS_SLOT_ALIVE(slot))
+	    tb = meta_main_tab[slot].u.tb;
     }
     else if (is_atom(id)) {
-	erts_smp_rwmtx_t* rwlock;
-	struct meta_name_tab_entry* bucket = meta_name_tab_bucket(id,&rwlock);
-	erts_smp_rwmtx_rlock(rwlock);
+	struct meta_name_tab_entry* bucket = meta_name_tab_bucket(id,&mtl);
+	if (!meta_already_locked)
+	    erts_smp_rwmtx_rlock(mtl);
+	else{
+	    ERTS_SMP_LC_ASSERT(erts_lc_rwmtx_is_rlocked(mtl)
+			       || erts_lc_rwmtx_is_rwlocked(mtl));
+	    mtl = NULL;
+	}
+
 	if (bucket->pu.tb != NULL) {
 	    if (is_atom(bucket->u.name_atom)) { /* single */
-		if (bucket->u.name_atom == id) {
-		    tb = db_ref(bucket->pu.tb);
-		}
+		if (bucket->u.name_atom == id)
+		    tb = bucket->pu.tb;
 	    }
 	    else { /* multi */
 		Uint cnt = unsigned_val(bucket->u.mcnt);
 		Uint i;
 		for (i=0; i<cnt; i++) {
 		    if (bucket->pu.mvec[i].u.name_atom == id) {
-			tb = db_ref(bucket->pu.mvec[i].pu.tb);
+			tb = bucket->pu.mvec[i].pu.tb;
 			break;
 		    }
 		}
 	    }
 	}
-	erts_smp_rwmtx_runlock(rwlock);
     }
     if (tb) {
-	db_lock_take_over_ref(tb, kind);
-	if (tb->common.id == id && ((tb->common.status & what) != 0 || 
-				    p->id == tb->common.owner)) {
-	    return tb;
+	db_lock(tb, kind);
+	if (tb->common.id != id
+	    || ((tb->common.status & what) == 0 && p->id != tb->common.owner)) {
+	    db_unlock(tb, kind);
+	    tb = NULL;
 	}
-	db_unlock(tb, kind);
     }
-    return NULL;
+    if (mtl)
+	erts_smp_rwmtx_runlock(mtl);
+    return tb;
+}
+
+static ERTS_INLINE
+DbTable* db_get_table(Process *p,
+		      Eterm id,
+		      int what,
+		      db_lock_kind_t kind)
+{
+    return db_get_table_aux(p, id, what, kind, 0);
 }
 
 /* Requires meta_main_tab_locks[slot] locked.
@@ -413,15 +470,15 @@ static ERTS_INLINE void free_slot(int slot)
     erts_smp_spin_unlock(&meta_main_tab_main_lock);
 }
 
-static int insert_named_tab(Eterm name_atom, DbTable* tb)
+static int insert_named_tab(Eterm name_atom, DbTable* tb, int have_lock)
 {
     int ret = 0;
     erts_smp_rwmtx_t* rwlock;
     struct meta_name_tab_entry* new_entry;
     struct meta_name_tab_entry* bucket = meta_name_tab_bucket(name_atom,
 							      &rwlock);
-
-    erts_smp_rwmtx_rwlock(rwlock);
+    if (!have_lock)
+	erts_smp_rwmtx_rwlock(rwlock);
 
     if (bucket->pu.tb == NULL) { /* empty */
 	new_entry = bucket;
@@ -468,17 +525,32 @@ static int insert_named_tab(Eterm name_atom, DbTable* tb)
     ret = 1; /* Ok */
 
 done:
-    erts_smp_rwmtx_rwunlock(rwlock);
+    if (!have_lock)
+	erts_smp_rwmtx_rwunlock(rwlock);
     return ret;
 }
 
-static int remove_named_tab(Eterm name_atom)
+static int remove_named_tab(DbTable *tb, int have_lock)
 {
     int ret = 0;
     erts_smp_rwmtx_t* rwlock;
+    Eterm name_atom = tb->common.id;
     struct meta_name_tab_entry* bucket = meta_name_tab_bucket(name_atom,
 							      &rwlock);
-    erts_smp_rwmtx_rwlock(rwlock);
+#ifdef ERTS_SMP
+    if (!have_lock && erts_smp_rwmtx_tryrwlock(rwlock) == EBUSY) {
+	/*
+	 * We keep our increased refc over this op in order to
+	 * prevent the table from disapearing.
+	 */
+	erts_smp_rwmtx_rwunlock(&tb->common.rwlock);
+	erts_smp_rwmtx_rwlock(rwlock);
+	erts_smp_rwmtx_rwlock(&tb->common.rwlock);
+    }
+#endif
+
+    ERTS_SMP_LC_ASSERT(erts_lc_rwmtx_is_rwlocked(rwlock));
+
     if (bucket->pu.tb == NULL) {
 	goto done;
     }
@@ -529,7 +601,8 @@ static int remove_named_tab(Eterm name_atom)
     ret = 1; /* Ok */
 
 done:
-    erts_smp_rwmtx_rwunlock(rwlock);
+    if (!have_lock)
+	erts_smp_rwmtx_rwunlock(rwlock);
     return ret;
 }
 
@@ -538,11 +611,11 @@ done:
 */
 static ERTS_INLINE void local_fix_table(DbTable* tb)
 {
-    erts_refc_inc(&tb->common.fixref, 1);
+    erts_refc_inc(&tb->common.ref, 1);
 }	    
 static ERTS_INLINE void local_unfix_table(DbTable* tb)
 {	
-    if (erts_refc_dectest(&tb->common.fixref, 0) == 0) {
+    if (erts_refc_dectest(&tb->common.ref, 0) == 0) {
 	ASSERT(IS_HASH_TABLE(tb->common.status));
 	db_unfix_table_hash(&(tb->hash));
     }
@@ -837,7 +910,8 @@ BIF_RETTYPE ets_update_counter_3(BIF_ALIST_3)
 	Eterm upop;
 	Eterm* tpl;
 	Sint position;
-	Eterm incr, warp, oldcnt;
+	Eterm incr, warp;
+	Wterm oldcnt;
 
 	if (is_not_list(iter)) {
 	    goto finalize;
@@ -876,7 +950,7 @@ BIF_RETTYPE ets_update_counter_3(BIF_ALIST_3)
 		position > arityval(handle.dbterm->tpl[0])) {
 		goto finalize;
 	    }
-	    oldcnt = handle.dbterm->tpl[position];
+	    oldcnt = db_do_read_element(&handle, position);
 	    if (is_big(oldcnt)) {
 		halloc_size += BIG_NEED_SIZE(big_arity(oldcnt));
 	    }
@@ -912,7 +986,7 @@ BIF_RETTYPE ets_update_counter_3(BIF_ALIST_3)
 	Eterm* tpl = tuple_val(CAR(list_val(iter)));
 	Sint position = signed_val(tpl[1]);
 	Eterm incr = tpl[2];
-	Eterm oldcnt = handle.dbterm->tpl[position];
+	Wterm oldcnt = db_do_read_element(&handle,position);
 	Eterm newcnt = db_add_counter(&htop, oldcnt, incr);
 
 	if (newcnt == NIL) {
@@ -925,9 +999,9 @@ BIF_RETTYPE ets_update_counter_3(BIF_ALIST_3)
 
 	if (arityval(*tpl) == 4) { /* Maybe warp it */
 	    Eterm threshold = tpl[3];
-	    if ((cmp(incr,make_small(0)) < 0) ? /* negative increment? */
-		(cmp(newcnt,threshold) < 0) :  /* if negative, check if below */
-		(cmp(newcnt,threshold) > 0)) { /* else check if above threshold */
+	    if ((CMP(incr,make_small(0)) < 0) ? /* negative increment? */
+		(CMP(newcnt,threshold) < 0) :  /* if negative, check if below */
+		(CMP(newcnt,threshold) > 0)) { /* else check if above threshold */
 
 		newcnt = tpl[4];
 	    }
@@ -1133,6 +1207,7 @@ BIF_RETTYPE ets_rename_2(BIF_ALIST_2)
 {
     DbTable* tb;
     Eterm ret;
+    erts_smp_rwmtx_t *lck1, *lck2;
 
 #ifdef HARDDEBUG
     erts_fprintf(stderr,
@@ -1141,34 +1216,65 @@ BIF_RETTYPE ets_rename_2(BIF_ALIST_2)
 		BIF_P->initial[0], BIF_P->initial[1], BIF_P->initial[2]);
 #endif
 
-    if ((tb = db_get_table(BIF_P, BIF_ARG_1, DB_WRITE, LCK_WRITE)) == NULL) {
+
+    if (is_not_atom(BIF_ARG_2)) {
 	BIF_ERROR(BIF_P, BADARG);
     }
 
-    if (is_not_atom(BIF_ARG_2)) {
-	goto badarg;
+    (void) meta_name_tab_bucket(BIF_ARG_2, &lck1);
+
+    if (is_small(BIF_ARG_1)) {
+	Uint slot = unsigned_val(BIF_ARG_1) & meta_main_tab_slot_mask;
+	lck2 = get_meta_main_tab_lock(slot);
+    }
+    else if (is_atom(BIF_ARG_1)) {
+	(void) meta_name_tab_bucket(BIF_ARG_1, &lck2);
+	if (lck1 == lck2)
+	    lck2 = NULL;
+	else if (lck1 > lck2) {
+	    erts_smp_rwmtx_t *tmp = lck1;
+	    lck1 = lck2;
+	    lck2 = tmp;
+	}
+    }
+    else {
+	BIF_ERROR(BIF_P, BADARG);
     }
 
+    erts_smp_rwmtx_rwlock(lck1);
+    if (lck2)
+	erts_smp_rwmtx_rwlock(lck2);
+
+    tb = db_get_table_aux(BIF_P, BIF_ARG_1, DB_WRITE, LCK_WRITE, 1);
+    if (!tb)
+	goto badarg;
+
     if (is_not_atom(tb->common.id)) { /* Not a named table */
 	tb->common.the_name = BIF_ARG_2;
 	goto done;
     }
 
-    if (!insert_named_tab(BIF_ARG_2,tb)) {
+    if (!insert_named_tab(BIF_ARG_2, tb, 1))
 	goto badarg;
-    }
-    if (!remove_named_tab(tb->common.id)) {
+
+    if (!remove_named_tab(tb, 1))
 	erl_exit(1,"Could not find named tab %s", tb->common.id);
-    }
 
     tb->common.id = tb->common.the_name = BIF_ARG_2;
 
  done:
     ret = tb->common.id;
     db_unlock(tb, LCK_WRITE);
+    erts_smp_rwmtx_rwunlock(lck1);
+    if (lck2)
+	erts_smp_rwmtx_rwunlock(lck2);
     BIF_RET(ret);
  badarg:
-    db_unlock(tb, LCK_WRITE);
+    if (tb)
+	db_unlock(tb, LCK_WRITE);
+    erts_smp_rwmtx_rwunlock(lck1);
+    if (lck2)
+	erts_smp_rwmtx_rwunlock(lck2);
     BIF_ERROR(BIF_P, BADARG);    
 }
 
@@ -1189,10 +1295,11 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
     UWord heir_data;
     Uint32 status;
     Sint keypos;
-    int is_named, is_fine_locked;
+    int is_named, is_fine_locked, frequent_read, is_compressed;
     int cret;
     DeclareTmpHeap(meta_tuple,3,BIF_P);
     DbTableMethod* meth;
+    erts_smp_rwmtx_t *mmtl;
 
     if (is_not_atom(BIF_ARG_1)) {
 	BIF_ERROR(BIF_P, BADARG);
@@ -1205,8 +1312,10 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
     keypos = 1;
     is_named = 0;
     is_fine_locked = 0;
+    frequent_read = 0;
     heir = am_none;
     heir_data = (UWord) am_undefined;
+    is_compressed = erts_ets_always_compress;
 
     list = BIF_ARG_2;
     while(is_list(list)) {
@@ -1238,6 +1347,13 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
 			is_fine_locked = 0;
 		    } else break;
 		}
+		else if (tp[1] == am_read_concurrency) {
+		    if (tp[2] == am_true) {
+			frequent_read = 1;
+		    } else if (tp[2] == am_false) {
+			frequent_read = 0;
+		    } else break;
+		}
 		else if (tp[1] == am_heir && tp[2] == am_none) {
 		    heir = am_none;
 		    heir_data = am_undefined;
@@ -1262,6 +1378,9 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
 	else if (val == am_named_table) {
 	    is_named = 1;
 	}
+	else if (val == am_compressed) {
+	    is_compressed = 1;
+	}
 	else if (val == am_set || val == am_protected)
 	    ;
 	else break;
@@ -1286,6 +1405,11 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
 	BIF_ERROR(BIF_P, BADARG);
     }
 
+#ifdef ERTS_SMP
+    if (frequent_read && !(status & DB_PRIVATE))
+	status |= DB_FREQ_READ;
+#endif
+
     /* we create table outside any table lock
      * and take the unusal cost of destroy table if it
      * fails to find a slot 
@@ -1308,7 +1432,9 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
     tb->common.type = status & ERTS_ETS_TABLE_TYPES;
     /* Note, 'type' is *read only* from now on... */
 #endif
-    db_init_lock(tb, "db_tab", "db_tab_fix");
+    erts_refc_init(&tb->common.ref, 0);
+    db_init_lock(tb, status & (DB_FINE_LOCKED|DB_FREQ_READ),
+		 "db_tab", "db_tab_fix");
     tb->common.keypos = keypos;
     tb->common.owner = BIF_P->id;
     set_heir(BIF_P, tb, heir, heir_data);
@@ -1316,6 +1442,7 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
     erts_smp_atomic_init(&tb->common.nitems, 0);
 
     tb->common.fixations = NULL;
+    tb->common.compress = is_compressed;
 
     cret = meth->db_create(BIF_P, tb);
     ASSERT(cret == DB_ERROR_NONE);
@@ -1328,8 +1455,7 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
 				      "** Too many db tables **\n");
 	free_heir_data(tb);
 	tb->common.meth->db_free_table(tb);
-	erts_db_free(ERTS_ALC_T_DB_TABLE, tb, (void *) tb, sizeof(DbTable));
-	ERTS_ETS_MISC_MEM_ADD(-sizeof(DbTable));
+	free_dbtable(tb);
 	BIF_ERROR(BIF_P, SYSTEM_LIMIT);
     }
 
@@ -1351,19 +1477,22 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
     tb->common.id = ret;
     tb->common.slot = slot;           /* store slot for erase */
 
-    meta_main_tab_lock(slot);
+    mmtl = get_meta_main_tab_lock(slot);
+    erts_smp_rwmtx_rwlock(mmtl);
     meta_main_tab[slot].u.tb = tb;
     ASSERT(IS_SLOT_ALIVE(slot));
-    meta_main_tab_unlock(slot);
+    erts_smp_rwmtx_rwunlock(mmtl);
 
-    if (is_named && !insert_named_tab(BIF_ARG_1, tb)) {
-	meta_main_tab_lock(slot);
+    if (is_named && !insert_named_tab(BIF_ARG_1, tb, 0)) {
+	mmtl = get_meta_main_tab_lock(slot);
+	erts_smp_rwmtx_rwlock(mmtl);
 	free_slot(slot);
-	meta_main_tab_unlock(slot);
+	erts_smp_rwmtx_rwunlock(mmtl);
 
-	db_lock_take_over_ref(tb,LCK_WRITE);
+	db_lock(tb,LCK_WRITE);
 	free_heir_data(tb);
 	tb->common.meth->db_free_table(tb);
+	schedule_free_dbtable(tb);
 	db_unlock(tb,LCK_WRITE);
 	BIF_ERROR(BIF_P, BADARG);
     }
@@ -1499,6 +1628,7 @@ BIF_RETTYPE ets_delete_1(BIF_ALIST_1)
 {
     int trap;
     DbTable* tb;
+    erts_smp_rwmtx_t *mmtl;
 
 #ifdef HARDDEBUG
     erts_fprintf(stderr,
@@ -1520,13 +1650,23 @@ BIF_RETTYPE ets_delete_1(BIF_ALIST_1)
     tb->common.status &= ~(DB_PROTECTED|DB_PUBLIC|DB_PRIVATE);
     tb->common.status |= DB_DELETE;
 
-    meta_main_tab_lock(tb->common.slot);
+    mmtl = get_meta_main_tab_lock(tb->common.slot);
+#ifdef ERTS_SMP
+    if (erts_smp_rwmtx_tryrwlock(mmtl) == EBUSY) {
+	/*
+	 * We keep our increased refc over this op in order to
+	 * prevent the table from disapearing.
+	 */
+	erts_smp_rwmtx_rwunlock(&tb->common.rwlock);
+	erts_smp_rwmtx_rwlock(mmtl);
+	erts_smp_rwmtx_rwlock(&tb->common.rwlock);
+    }
+#endif
     /* We must keep the slot, to be found by db_proc_dead() if process dies */
     MARK_SLOT_DEAD(tb->common.slot);
-    meta_main_tab_unlock(tb->common.slot);
-    if (is_atom(tb->common.id)) {
-	remove_named_tab(tb->common.id);
-    }
+    erts_smp_rwmtx_rwunlock(mmtl);
+    if (is_atom(tb->common.id))
+	remove_named_tab(tb, 0);
     
     if (tb->common.owner != BIF_P->id) {
 	DeclareTmpHeap(meta_tuple,3,BIF_P);
@@ -1919,14 +2059,15 @@ BIF_RETTYPE ets_all_0(BIF_ALIST_0)
     previous = NIL;
     j = 0;
     for(i = 0; (i < t_max_tabs && j < t_tabs_cnt); i++) {
-	meta_main_tab_lock(i);
+	erts_smp_rwmtx_t *mmtl = get_meta_main_tab_lock(i);
+	erts_smp_rwmtx_rlock(mmtl);
 	if (IS_SLOT_ALIVE(i)) {
 	    j++;
 	    tb = meta_main_tab[i].u.tb;
 	    previous = CONS(hp, tb->common.id, previous);
 	    hp += 2;
 	}
-	meta_main_tab_unlock(i);
+	erts_smp_rwmtx_runlock(mmtl);
     }
     HRelease(BIF_P, hendp, hp);
     BIF_RET(previous);
@@ -2456,7 +2597,7 @@ BIF_RETTYPE ets_match_object_3(BIF_ALIST_3)
 BIF_RETTYPE ets_info_1(BIF_ALIST_1)
 {
     static Eterm fields[] = {am_protection, am_keypos, am_type, am_named_table,
-	am_node, am_size, am_name, am_heir, am_owner, am_memory};
+	am_node, am_size, am_name, am_heir, am_owner, am_memory, am_compressed};
     Eterm results[sizeof(fields)/sizeof(Eterm)];
     DbTable* tb;
     Eterm res;
@@ -2572,7 +2713,6 @@ BIF_RETTYPE ets_match_spec_run_r_3(BIF_ALIST_3)
     Binary *mp;
     Eterm res;
     Uint32 dummy;
-    Uint sz;
 
     if (!(is_list(BIF_ARG_1) || BIF_ARG_1 == NIL) || !is_binary(BIF_ARG_2)) {
     error:
@@ -2597,11 +2737,10 @@ BIF_RETTYPE ets_match_spec_run_r_3(BIF_ALIST_3)
 	    BIF_TRAP3(bif_export[BIF_ets_match_spec_run_r_3],
 		      BIF_P,lst,BIF_ARG_2,ret);
 	}
-	res = db_prog_match(BIF_P, mp, CAR(list_val(lst)), NULL, 0, &dummy);
+	res = db_prog_match(BIF_P, mp, CAR(list_val(lst)), NULL, NULL, 0,
+			    ERTS_PAM_COPY_RESULT, &dummy);
 	if (is_value(res)) {
-	    sz = size_object(res);
-	    hp = HAlloc(BIF_P, sz + 2);
-	    res = copy_struct(res, sz, &hp, &MSO(BIF_P));
+	    hp = HAlloc(BIF_P, 2);
 	    ret = CONS(hp,res,ret);
 	    /*hp += 2;*/
 	} 
@@ -2630,12 +2769,30 @@ void init_db(void)
     size_t size;
 
 #ifdef ERTS_SMP
-    for (i=0; i<META_MAIN_TAB_LOCK_CNT; i++) {
-	erts_smp_spinlock_init_x(&meta_main_tab_locks[i].lck, "meta_main_tab_slot", make_small(i));
+    erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER;
+    rwmtx_opt.type = ERTS_SMP_RWMTX_TYPE_FREQUENT_READ;
+    rwmtx_opt.lived = ERTS_SMP_RWMTX_LONG_LIVED;
+
+    meta_main_tab_locks = erts_alloc(ERTS_ALC_T_DB_TABLES,
+				     (sizeof(erts_meta_main_tab_lock_t)
+				      * (ERTS_META_MAIN_TAB_LOCK_TAB_SIZE+1)));
+
+    if ((((UWord) meta_main_tab_locks) & ERTS_CACHE_LINE_MASK) != 0)
+	meta_main_tab_locks = ((erts_meta_main_tab_lock_t *)
+			       ((((UWord) meta_main_tab_locks)
+				 & ~ERTS_CACHE_LINE_MASK)
+				+ ERTS_CACHE_LINE_SIZE));
+
+    ASSERT((((UWord) meta_main_tab_locks) & ERTS_CACHE_LINE_MASK) == 0);
+
+    for (i = 0; i < ERTS_META_MAIN_TAB_LOCK_TAB_SIZE; i++) {
+	erts_smp_rwmtx_init_opt_x(&meta_main_tab_locks[i].rwmtx, &rwmtx_opt,
+				  "meta_main_tab_slot", make_small(i));
     }
     erts_smp_spinlock_init(&meta_main_tab_main_lock, "meta_main_tab_main");
     for (i=0; i<META_NAME_TAB_LOCK_CNT; i++) {
-	erts_smp_rwmtx_init_x(&meta_name_tab_rwlocks[i].lck, "meta_name_tab", make_small(i));
+	erts_smp_rwmtx_init_opt_x(&meta_name_tab_rwlocks[i].lck, &rwmtx_opt,
+				  "meta_name_tab", make_small(i));
     }
 #endif
 
@@ -2703,9 +2860,9 @@ void init_db(void)
     erts_smp_atomic_init(&meta_pid_to_tab->common.nitems, 0);
     meta_pid_to_tab->common.slot   = -1;
     meta_pid_to_tab->common.meth   = &db_hash;
+    meta_pid_to_tab->common.compress = 0;
 
-    erts_refc_init(&meta_pid_to_tab->common.ref, 1);
-    erts_refc_init(&meta_pid_to_tab->common.fixref, 0);
+    erts_refc_init(&meta_pid_to_tab->common.ref, 0);
     /* Neither rwlock or fixlock used
     db_init_lock(meta_pid_to_tab, "meta_pid_to_tab", "meta_pid_to_tab_FIX");*/
 
@@ -2735,9 +2892,9 @@ void init_db(void)
     erts_smp_atomic_init(&meta_pid_to_fixed_tab->common.nitems, 0);
     meta_pid_to_fixed_tab->common.slot   = -1;
     meta_pid_to_fixed_tab->common.meth   = &db_hash;
+    meta_pid_to_fixed_tab->common.compress = 0;
 
-    erts_refc_init(&meta_pid_to_fixed_tab->common.ref, 1);
-    erts_refc_init(&meta_pid_to_fixed_tab->common.fixref, 0);
+    erts_refc_init(&meta_pid_to_fixed_tab->common.ref, 0);
     /* Neither rwlock or fixlock used
     db_init_lock(meta_pid_to_fixed_tab, "meta_pid_to_fixed_tab", "meta_pid_to_fixed_tab_FIX");*/
 
@@ -2895,12 +3052,10 @@ retry:
 				to_pid, to_locks,
 				ERTS_P2P_FLG_TRY_LOCK);
     if (to_proc == ERTS_PROC_LOCK_BUSY) {
-	db_ref(tb); /* while unlocked */
 	db_unlock(tb,LCK_WRITE);    
 	to_proc = erts_pid2proc(p, ERTS_PROC_LOCK_MAIN,
 				to_pid, to_locks);    
 	db_lock(tb,LCK_WRITE);
-	tb = db_unref(tb);
 	ASSERT(tb != NULL);
     
 	if (tb->common.owner != p->id) {
@@ -2943,7 +3098,7 @@ retry:
     db_unlock(tb,LCK_WRITE);
     heir_data = tb->common.heir_data;
     if (!is_immed(heir_data)) {
-	Eterm* tpv = DBTERM_BUF((DbTerm*)heir_data); /* tuple_val */
+	Eterm* tpv = ((DbTerm*)heir_data)->tpl; /* tuple_val */
 	ASSERT(arityval(*tpv) == 1);
 	heir_data = tpv[1];
     }
@@ -3008,15 +3163,16 @@ erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks)
 	    while (state->slots.ix < state->slots.size) {
 		DbTable *tb = NULL;
 		Sint ix = unsigned_val(state->slots.arr[state->slots.ix]);
-		meta_main_tab_lock(ix);
+		erts_smp_rwmtx_t *mmtl = get_meta_main_tab_lock(ix);
+		erts_smp_rwmtx_rlock(mmtl);
 		if (!IS_SLOT_FREE(ix)) {
-		    tb = db_ref(GET_ANY_SLOT_TAB(ix));
+		    tb = GET_ANY_SLOT_TAB(ix);
 		    ASSERT(tb);
 		}
-		meta_main_tab_unlock(ix);
+		erts_smp_rwmtx_runlock(mmtl);
 		if (tb) {
 		    int do_yield;
-		    db_lock_take_over_ref(tb, LCK_WRITE);
+		    db_lock(tb, LCK_WRITE);
 		    /* Ownership may have changed since
 		       we looked up the table. */
 		    if (tb->common.owner != pid) {
@@ -3045,7 +3201,7 @@ erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks)
 			    tb->common.status |= DB_DELETE;
 
 			    if (is_atom(tb->common.id))
-				remove_named_tab(tb->common.id);
+				remove_named_tab(tb, 0);
 
 			    free_heir_data(tb);
 			    free_fixations_locked(tb);
@@ -3095,17 +3251,18 @@ erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks)
 	    while (state->slots.ix < state->slots.size) {
 		DbTable *tb = NULL;
 		Sint ix = unsigned_val(state->slots.arr[state->slots.ix]);
-		meta_main_tab_lock(ix);
+		erts_smp_rwmtx_t *mmtl = get_meta_main_tab_lock(ix);
+		erts_smp_rwmtx_rlock(mmtl);
 		if (IS_SLOT_ALIVE(ix)) {
-		    tb = db_ref(meta_main_tab[ix].u.tb);
+		    tb = meta_main_tab[ix].u.tb;
 		    ASSERT(tb);
 		}
-		meta_main_tab_unlock(ix);
+		erts_smp_rwmtx_runlock(mmtl);
 		if (tb) {
 		    int reds;
 		    DbFixation** pp;
 
-		    db_lock_take_over_ref(tb, LCK_WRITE_REC);
+		    db_lock(tb, LCK_WRITE_REC);
 		    #ifdef ERTS_SMP
 		    erts_smp_mtx_lock(&tb->common.fixlock);
 		    #endif
@@ -3115,7 +3272,8 @@ erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks)
 			  pp = &(*pp)->next) {
 			if ((*pp)->pid == pid) {
 			    DbFixation* fix = *pp;
-			    erts_refc_add(&tb->common.fixref,-fix->counter,0);
+			    erts_aint_t diff = -((erts_aint_t) fix->counter);
+			    erts_refc_add(&tb->common.ref,diff,0);
 			    *pp = fix->next;
 			    erts_db_free(ERTS_ALC_T_DB_FIXATION,
 					 tb, fix, sizeof(DbFixation));
@@ -3190,7 +3348,7 @@ static void fix_table_locked(Process* p, DbTable* tb)
 #ifdef ERTS_SMP
     erts_smp_mtx_lock(&tb->common.fixlock);
 #endif
-    erts_refc_inc(&tb->common.fixref,1);
+    erts_refc_inc(&tb->common.ref,1);
     fix = tb->common.fixations;
     if (fix == NULL) { 
 	get_now(&(tb->common.megasec),
@@ -3244,7 +3402,7 @@ static void unfix_table_locked(Process* p,  DbTable* tb,
     for (pp = &tb->common.fixations; *pp != NULL; pp = &(*pp)->next) {
 	if ((*pp)->pid == p->id) {
 	    DbFixation* fix = *pp;
-	    erts_refc_dec(&tb->common.fixref,0);
+	    erts_refc_dec(&tb->common.ref,0);
 	    --(fix->counter);
 	    ASSERT(fix->counter >= 0);
 	    if (fix->counter > 0) {
@@ -3270,7 +3428,7 @@ static void unfix_table_locked(Process* p,  DbTable* tb,
 unlocked:
 
     if (!IS_FIXED(tb) && IS_HASH_TABLE(tb->common.status)
-	&& erts_smp_atomic_read(&tb->hash.fixdel) != (long)NULL) {
+	&& erts_smp_atomic_read(&tb->hash.fixdel) != (erts_aint_t)NULL) {
 #ifdef ERTS_SMP
 	if (*kind_p == LCK_READ && tb->common.is_thread_safe) {
 	    /* Must have write lock while purging pseudo-deleted (OTP-8166) */
@@ -3292,6 +3450,8 @@ static void free_fixations_locked(DbTable *tb)
 
     fix = tb->common.fixations;
     while (fix != NULL) {
+	erts_aint_t diff = -((erts_aint_t) fix->counter);
+	erts_refc_add(&tb->common.ref,diff,0);
 	next_fix = fix->next;
 	db_meta_lock(meta_pid_to_fixed_tab, LCK_WRITE_REC);
 	db_erase_bag_exact2(meta_pid_to_fixed_tab,
@@ -3329,11 +3489,24 @@ static void set_heir(Process* me, DbTable* tb, Eterm heir, UWord heir_data)
 
     if (!is_immed(heir_data)) {
 	DeclareTmpHeap(tmp,2,me);
+	Eterm wrap_tpl;
+	int size;
+	DbTerm* dbterm;
+	Eterm* top;
+	ErlOffHeap tmp_offheap;
 
 	UseTmpHeap(2,me);
-	/* Make a dummy 1-tuple around data to use db_get_term() */
-	heir_data = (UWord) db_get_term(&tb->common, NULL, 0,
-					TUPLE1(tmp,heir_data));
+	/* Make a dummy 1-tuple around data to use DbTerm */
+	wrap_tpl = TUPLE1(tmp,heir_data);
+	size = size_object(wrap_tpl);
+	dbterm = erts_db_alloc(ERTS_ALC_T_DB_HEIR_DATA, (DbTable *)tb,
+			       (sizeof(DbTerm) + sizeof(Eterm)*(size-1)));
+	dbterm->size = size;
+	top = dbterm->tpl;
+	tmp_offheap.first  = NULL;
+	copy_struct(wrap_tpl, size, &top, &tmp_offheap);
+	dbterm->first_oh = tmp_offheap.first;
+	heir_data = (UWord)dbterm;
 	UnUseTmpHeap(2,me);
 	ASSERT(!is_immed(heir_data));
     }
@@ -3344,8 +3517,8 @@ static void free_heir_data(DbTable* tb)
 {
     if (tb->common.heir != am_none && !is_immed(tb->common.heir_data)) {
 	DbTerm* p = (DbTerm*) tb->common.heir_data;
-	db_free_term_data(p);
-	erts_db_free(ERTS_ALC_T_DB_TERM, tb, (void *)p,
+	db_cleanup_offheap_comp(p);
+	erts_db_free(ERTS_ALC_T_DB_HEIR_DATA, tb, (void *)p,
 		     sizeof(DbTerm) + (p->size-1)*sizeof(Eterm));
     }
     #ifdef DEBUG
@@ -3386,6 +3559,7 @@ static int free_table_cont(Process *p,
 			   int clean_meta_tab)
 {
     Eterm result;
+    erts_smp_rwmtx_t *mmtl;
 
 #ifdef HARDDEBUG
     if (!first) {
@@ -3411,9 +3585,16 @@ static int free_table_cont(Process *p,
 		     tb->common.id);
 #endif
 	/* Completely done - we will not get called again. */
-	meta_main_tab_lock(tb->common.slot);
+	mmtl = get_meta_main_tab_lock(tb->common.slot);
+#ifdef ERTS_SMP
+	if (erts_smp_rwmtx_tryrwlock(mmtl) == EBUSY) {
+	    erts_smp_rwmtx_rwunlock(&tb->common.rwlock);
+	    erts_smp_rwmtx_rwlock(mmtl);
+	    erts_smp_rwmtx_rwlock(&tb->common.rwlock);
+	}
+#endif
 	free_slot(tb->common.slot);
-	meta_main_tab_unlock(tb->common.slot);
+	erts_smp_rwmtx_rwunlock(mmtl);
 
 	if (clean_meta_tab) {
 	    db_meta_lock(meta_pid_to_tab, LCK_WRITE_REC);
@@ -3421,7 +3602,7 @@ static int free_table_cont(Process *p,
 				make_small(tb->common.slot));
 	    db_meta_unlock(meta_pid_to_tab, LCK_WRITE_REC);
 	}
-	db_unref(tb);
+	schedule_free_dbtable(tb);
 	BUMP_REDS(p, 100);
 	return 0;
     }
@@ -3469,10 +3650,13 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 	ret = erts_this_dist_entry->sysname;
     } else if (What == am_named_table) {
 	ret = is_atom(tb->common.id) ? am_true : am_false;
+    } else if (What == am_compressed) {
+	ret = tb->common.compress ? am_true : am_false;
+    }
     /*
      * For debugging purposes
      */
-    } else if (What == am_data) { 
+    else if (What == am_data) {
 	print_table(ERTS_PRINT_STDOUT, NULL, 1, tb);
 	ret = am_true;
     } else if (What == am_atom_put("fixed",5)) { 
diff --git a/erts/emulator/beam/erl_db.h b/erts/emulator/beam/erl_db.h
index 7da28fad29..e0bdebcb01 100644
--- a/erts/emulator/beam/erl_db.h
+++ b/erts/emulator/beam/erl_db.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2010. 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
@@ -61,6 +61,7 @@ void erts_db_foreach_offheap(DbTable *,
 
 extern int user_requested_db_max_tabs; /* set in erl_init */
 extern int erts_ets_realloc_always_moves;  /* set in erl_init */
+extern int erts_ets_always_compress;  /* set in erl_init */
 extern Export ets_select_delete_continue_exp;
 extern Export ets_select_count_continue_exp;
 extern Export ets_select_continue_exp;
@@ -82,7 +83,8 @@ Eterm erts_ets_colliding_names(Process*, Eterm name, Uint cnt);
 
 #define ERTS_DB_ALC_MEM_UPDATE_(TAB, FREE_SZ, ALLOC_SZ)			\
 do {									\
-    long sz__ = ((long) (ALLOC_SZ)) - ((long) (FREE_SZ));		\
+    erts_aint_t sz__ = (((erts_aint_t) (ALLOC_SZ))			\
+			- ((erts_aint_t) (FREE_SZ)));			\
     ASSERT((TAB));							\
     erts_smp_atomic_add(&(TAB)->common.memory_size, sz__);		\
 } while (0)
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c
index 124129a371..9ef990cc4f 100644
--- a/erts/emulator/beam/erl_db_hash.c
+++ b/erts/emulator/beam/erl_db_hash.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2011. 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
@@ -135,8 +135,8 @@ static ERTS_INLINE Uint hash_to_ix(DbTableHash* tb, HashValue hval)
 */
 static ERTS_INLINE void add_fixed_deletion(DbTableHash* tb, int ix)
 {
-    long was_next;
-    long exp_next;
+    erts_aint_t was_next;
+    erts_aint_t exp_next;
     FixedDeletion* fixd = (FixedDeletion*) erts_db_alloc(ERTS_ALC_T_DB_FIX_DEL,
 							 (DbTable *) tb,
 							 sizeof(FixedDeletion));
@@ -146,7 +146,9 @@ static ERTS_INLINE void add_fixed_deletion(DbTableHash* tb, int ix)
     do { /* Lockless atomic insertion in linked list: */
 	exp_next = was_next;
 	fixd->next = (FixedDeletion*) exp_next;
-	was_next = erts_smp_atomic_cmpxchg(&tb->fixdel, (long)fixd, exp_next);
+	was_next = erts_smp_atomic_cmpxchg(&tb->fixdel,
+					   (erts_aint_t) fixd,
+					   exp_next);
     }while (was_next != exp_next);
 }
 
@@ -256,22 +258,16 @@ static ERTS_INLINE Sint next_slot_w(DbTableHash* tb, Uint ix,
 }
 
 
-/* 
- * tplp is an untagged pointer to a tuple we know is large enough 
- * and dth is a pointer to a DbTableHash.   
- */
-#define GETKEY(dth, tplp)   (*((tplp) +  (dth)->common.keypos))
-
 /*
  * Some special binary flags
  */
 #define BIN_FLAG_ALL_OBJECTS         BIN_FLAG_USR1
 
-/*
- * Size calculations
- */
-#define SIZ_OVERHEAD ((sizeof(HashDbTerm)/sizeof(Eterm)) - 1)
-#define SIZ_DBTERM(HDT) (SIZ_OVERHEAD + (HDT)->dbterm.size)
+
+static ERTS_INLINE void free_term(DbTableHash *tb, HashDbTerm* p)
+{
+    db_free_term((DbTable*)tb, p, offsetof(HashDbTerm, dbterm));
+}
 
 /*
  * Local types 
@@ -358,10 +354,8 @@ static HashDbTerm* search_list(DbTableHash* tb, Eterm key,
 			       HashValue hval, HashDbTerm *list);
 static void shrink(DbTableHash* tb, int nactive);
 static void grow(DbTableHash* tb, int nactive);
-static void free_term(DbTableHash *tb, HashDbTerm* p);
-static Eterm put_term_list(Process* p, HashDbTerm* ptr1, HashDbTerm* ptr2);
-static HashDbTerm* get_term(DbTableHash* tb, HashDbTerm* old, 
-			    Eterm obj, HashValue hval);
+static Eterm build_term_list(Process* p, HashDbTerm* ptr1, HashDbTerm* ptr2,
+			   DbTableHash*);
 static int analyze_pattern(DbTableHash *tb, Eterm pattern, 
 			   struct mp_info *mpi);
 
@@ -434,6 +428,9 @@ static ERTS_INLINE void try_shrink(DbTableHash* tb)
     }
 }	
 
+#define EQ_REL(x,y,y_base) \
+    (is_same(x,NULL,y,y_base) || (is_not_both_immed((x),(y)) && eq_rel((x),NULL,(y),y_base)))
+
 /* Is this a live object (not pseodo-deleted) with the specified key? 
 */
 static ERTS_INLINE int has_live_key(DbTableHash* tb, HashDbTerm* b,
@@ -442,7 +439,8 @@ static ERTS_INLINE int has_live_key(DbTableHash* tb, HashDbTerm* b,
     if (b->hvalue != hval) return 0;
     else {
 	Eterm itemKey = GETKEY(tb, b->dbterm.tpl);
-	return EQ(key,itemKey);
+	ASSERT(!is_header(itemKey));
+	return EQ_REL(key, itemKey, b->dbterm.tpl);
     }
 }
 
@@ -454,10 +452,38 @@ static ERTS_INLINE int has_key(DbTableHash* tb, HashDbTerm* b,
     if (b->hvalue != hval && b->hvalue != INVALID_HASH) return 0;
     else {
 	Eterm itemKey = GETKEY(tb, b->dbterm.tpl);
-	return EQ(key,itemKey);
+	ASSERT(!is_header(itemKey));
+	return EQ_REL(key, itemKey, b->dbterm.tpl);
     }
 }
 
+static ERTS_INLINE HashDbTerm* new_dbterm(DbTableHash* tb, Eterm obj)
+{
+    HashDbTerm* p;
+    if (tb->common.compress) {
+	p = db_store_term_comp(&tb->common, NULL, offsetof(HashDbTerm,dbterm), obj);
+    }
+    else {
+	p = db_store_term(&tb->common, NULL, offsetof(HashDbTerm,dbterm), obj);
+    }
+    return p;
+}
+
+static ERTS_INLINE HashDbTerm* replace_dbterm(DbTableHash* tb, HashDbTerm* old,
+					      Eterm obj)
+{
+    HashDbTerm* ret;
+    ASSERT(old != NULL);
+    if (tb->common.compress) {
+	ret = db_store_term_comp(&tb->common, &(old->dbterm), offsetof(HashDbTerm,dbterm), obj);
+    }
+    else {
+	ret = db_store_term(&tb->common, &(old->dbterm), offsetof(HashDbTerm,dbterm), obj);
+    }
+    return ret;
+}
+
+
 
 /*
 ** External interface 
@@ -514,12 +540,12 @@ static void restore_fixdel(DbTableHash* tb, FixedDeletion* fixdel)
 {
     /*int tries = 0;*/
     DEBUG_WAIT();
-    if (erts_smp_atomic_cmpxchg(&tb->fixdel, (long)fixdel,
-				(long)NULL) != (long)NULL) {
+    if (erts_smp_atomic_cmpxchg(&tb->fixdel, (erts_aint_t)fixdel,
+				(erts_aint_t)NULL) != (erts_aint_t)NULL) {
 	/* Oboy, must join lists */    
 	FixedDeletion* last = fixdel;
-	long was_tail;
-	long exp_tail;
+	erts_aint_t was_tail;
+	erts_aint_t exp_tail;
 
 	while (last->next != NULL) last = last->next;	
 	was_tail = erts_smp_atomic_read(&tb->fixdel);
@@ -528,7 +554,7 @@ static void restore_fixdel(DbTableHash* tb, FixedDeletion* fixdel)
 	    last->next = (FixedDeletion*) exp_tail;
 	    /*++tries;*/
 	    DEBUG_WAIT();
-	    was_tail = erts_smp_atomic_cmpxchg(&tb->fixdel, (long)fixdel,
+	    was_tail = erts_smp_atomic_cmpxchg(&tb->fixdel, (erts_aint_t)fixdel,
 					       exp_tail);
 	}while (was_tail != exp_tail);
     }
@@ -546,7 +572,7 @@ void db_unfix_table_hash(DbTableHash *tb)
 		       || (erts_smp_lc_rwmtx_is_rlocked(&tb->common.rwlock)
 			   && !tb->common.is_thread_safe));
 restart:
-    fixdel = (FixedDeletion*) erts_smp_atomic_xchg(&tb->fixdel, (long)NULL);
+    fixdel = (FixedDeletion*) erts_smp_atomic_xchg(&tb->fixdel, (erts_aint_t)NULL);
     while (fixdel != NULL) {
 	FixedDeletion *fx = fixdel;
 	int ix = fx->slot;
@@ -615,20 +641,24 @@ int db_create_hash(Process *p, DbTable *tbl)
 
     erts_smp_atomic_init(&tb->szm, SEGSZ_MASK);
     erts_smp_atomic_init(&tb->nactive, SEGSZ);
-    erts_smp_atomic_init(&tb->fixdel, (long)NULL);
-    erts_smp_atomic_init(&tb->segtab, (long) alloc_ext_seg(tb,0,NULL)->segtab);
+    erts_smp_atomic_init(&tb->fixdel, (erts_aint_t)NULL);
+    erts_smp_atomic_init(&tb->segtab, (erts_aint_t) alloc_ext_seg(tb,0,NULL)->segtab);
     tb->nsegs = NSEG_1;
     tb->nslots = SEGSZ;
 
     erts_smp_atomic_init(&tb->is_resizing, 0);
 #ifdef ERTS_SMP
     if (tb->common.type & DB_FINE_LOCKED) {
+	erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER;
 	int i;
+	if (tb->common.type & DB_FREQ_READ)
+	    rwmtx_opt.type = ERTS_SMP_RWMTX_TYPE_FREQUENT_READ;
 	tb->locks = (DbTableHashFineLocks*) erts_db_alloc_fnf(ERTS_ALC_T_DB_SEG, /* Other type maybe? */ 
 							      (DbTable *) tb,
 							      sizeof(DbTableHashFineLocks));	    	    
 	for (i=0; i<DB_HASH_LOCK_CNT; ++i) {
-	    erts_rwmtx_init_x(&tb->locks->lck_vec[i].lck, "db_hash_slot", make_small(i));
+	    erts_smp_rwmtx_init_opt_x(&tb->locks->lck_vec[i].lck, &rwmtx_opt,
+				      "db_hash_slot", make_small(i));
 	}
 	/* This important property is needed to guarantee that the buckets
     	 * involved in a grow/shrink operation it protected by the same lock:
@@ -663,9 +693,7 @@ static int db_first_hash(Process *p, DbTable *tbl, Eterm *ret)
 	}
     }
     if (list != NULL) {
-	Eterm key = GETKEY(tb, list->dbterm.tpl);
-	
-	COPY_OBJECT(key, p, ret);
+	*ret = db_copy_key(p, tbl, &list->dbterm);
 	RUNLOCK_HASH(lck);
     }
     else {
@@ -713,7 +741,7 @@ static int db_next_hash(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
 	*ret = am_EOT;
     }
     else {
-	COPY_OBJECT(GETKEY(tb, b->dbterm.tpl), p, ret);
+	*ret = db_copy_key(p, tbl, &b->dbterm);
 	RUNLOCK_HASH(lck);
     }    
     return DB_ERROR_NONE;
@@ -760,7 +788,7 @@ int db_put_hash(DbTable *tbl, Eterm obj, int key_clash_fail)
 	    ret = DB_ERROR_BADKEY;
 	    goto Ldone;
 	}
-	q = get_term(tb, b, obj, hval);
+	q = replace_dbterm(tb, b, obj);
 	q->next = bnext;
 	q->hvalue = hval; /* In case of INVALID_HASH */
 	*bp = q;
@@ -780,7 +808,7 @@ int db_put_hash(DbTable *tbl, Eterm obj, int key_clash_fail)
 	HashDbTerm** qp = bp;
 	q = b;
 	do {
-	    if (eq(make_tuple(q->dbterm.tpl), obj)) {
+	    if (db_eq(&tb->common,obj,&q->dbterm)) {
 		if (q->hvalue == INVALID_HASH) {
 		    erts_smp_atomic_inc(&tb->common.nitems);
 		    q->hvalue = hval;
@@ -799,7 +827,8 @@ int db_put_hash(DbTable *tbl, Eterm obj, int key_clash_fail)
     /*else DB_DUPLICATE_BAG */
 
 Lnew:
-    q = get_term(tb, NULL, obj, hval);
+    q = new_dbterm(tb, obj);
+    q->hvalue = hval;
     q->next = b;
     *bp = q;
     nitems = erts_smp_atomic_inctest(&tb->common.nitems);
@@ -840,7 +869,7 @@ int db_get_hash(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
 		while(b2 != NULL && has_key(tb,b2,key,hval))
 		    b2 = b2->next;
 	    }
-	    copy = put_term_list(p, b1, b2);
+	    copy = build_term_list(p, b1, b2, tb);
 	    CHECK_TABLES();
 	    *ret = copy;
 	    goto done;
@@ -963,13 +992,10 @@ static int db_get_element_hash(Process *p, DbTable *tbl,
 
     while(b1 != 0) {
 	if (has_live_key(tb,b1,key,hval)) {
-	    Eterm copy;
-
 	    if (ndex > arityval(b1->dbterm.tpl[0])) {
 		retval = DB_ERROR_BADITEM;
 		goto done;
 	    }
-
 	    if (tb->common.status & (DB_BAG | DB_DUPLICATE_BAG)) {
 		HashDbTerm* b;
 		HashDbTerm* b2 = b1->next;
@@ -983,15 +1009,12 @@ static int db_get_element_hash(Process *p, DbTable *tbl,
 		    }
 		    b2 = b2->next;
 		}
-
 		b = b1;
 		while(b != b2) {
 		    if (b->hvalue != INVALID_HASH) {
 			Eterm *hp;
-			Uint sz = size_object(b->dbterm.tpl[ndex])+2;
-			
-			hp = HAlloc(p, sz);
-			copy = copy_struct(b->dbterm.tpl[ndex], sz-2, &hp, &MSO(p));
+			Eterm copy = db_copy_element_from_ets(&tb->common, p,
+							      &b->dbterm, ndex, &hp, 2);
 			elem_list = CONS(hp, copy, elem_list);
 			hp += 2;
 		    }
@@ -1000,8 +1023,8 @@ static int db_get_element_hash(Process *p, DbTable *tbl,
 		*ret = elem_list;
 	    }
 	    else {
-		COPY_OBJECT(b1->dbterm.tpl[ndex], p, &copy);
-		*ret = copy;
+		Eterm* hp;
+		*ret = db_copy_element_from_ets(&tb->common, p, &b1->dbterm, ndex, &hp, 0);
 	    }
 	    retval = DB_ERROR_NONE;
 	    goto done;
@@ -1036,6 +1059,7 @@ int db_erase_bag_exact2(DbTable *tbl, Eterm key, Eterm value)
 
     ASSERT(!IS_FIXED(tb));
     ASSERT((tb->common.status & DB_BAG));
+    ASSERT(!tb->common.compress);
 
     while(b != 0) {
 	if (has_live_key(tb,b,key,hval)) {
@@ -1135,7 +1159,7 @@ static int db_erase_object_hash(DbTable *tbl, Eterm object, Eterm *ret)
     while(b != 0) {
 	if (has_live_key(tb,b,key,hval)) {
 	    ++nkeys;
-	    if (eq(object, make_tuple(b->dbterm.tpl))) {
+	    if (db_eq(&tb->common,object, &b->dbterm)) {
 		--nitems_diff;
 		if (nkeys==1 && IS_FIXED(tb)) { /* Pseudo remove */
 		    add_fixed_deletion(tb,ix);
@@ -1184,7 +1208,7 @@ static int db_slot_hash(Process *p, DbTable *tbl, Eterm slot_term, Eterm *ret)
     lck = RLOCK_HASH(tb, slot);
     nactive = NACTIVE(tb);
     if (slot < nactive) {
-	*ret = put_term_list(p, BUCKET(tb, slot), 0);
+	*ret = build_term_list(p, BUCKET(tb, slot), 0, tb);
 	retval = DB_ERROR_NONE;
     }
     else if (slot == nactive) {
@@ -1228,8 +1252,6 @@ static int db_select_continue_hash(Process *p,
     int num_left = 1000;
     HashDbTerm *current = 0;
     Eterm match_list;
-    Uint32 dummy;
-    unsigned sz;
     Eterm *hp;
     Eterm match_res;
     Sint got;
@@ -1281,26 +1303,14 @@ static int db_select_continue_hash(Process *p,
     }	  
     for(;;) {
 	if (current->hvalue != INVALID_HASH && 
-	    (match_res = 
-	     db_prog_match(p,mp,
-			   make_tuple(current->dbterm.tpl),
-			   NULL,0,&dummy),
+	    (match_res = db_match_dbterm(&tb->common, p, mp, all_objects,
+					 &current->dbterm, &hp, 2),
 	     is_value(match_res))) {
-	    if (all_objects) {
-		hp = HAlloc(p, current->dbterm.size + 2);
-		match_res = copy_shallow(DBTERM_BUF(&current->dbterm),
-					 current->dbterm.size,
-					 &hp,
-					 &MSO(p));
-	    } else {
-		sz = size_object(match_res);
-	    
-		hp = HAlloc(p, sz + 2);
-		match_res = copy_struct(match_res, sz, &hp, &MSO(p));
-	    }
-            match_list = CONS(hp, match_res, match_list);
+
+	    match_list = CONS(hp, match_res, match_list);
 	    ++got;
 	}
+
 	--num_left;
 	save_slot_ix = slot_ix;
 	if ((current = next(tb, (Uint*)&slot_ix, &lck, current)) == NULL) {
@@ -1391,9 +1401,7 @@ static int db_select_chunk_hash(Process *p, DbTable *tbl,
     HashDbTerm *current = 0;
     unsigned current_list_pos = 0;
     Eterm match_list;
-    Uint32 dummy;
     Eterm match_res;
-    unsigned sz;
     Eterm *hp;
     int num_left = 1000;
     Uint got = 0;
@@ -1460,22 +1468,9 @@ static int db_select_chunk_hash(Process *p, DbTable *tbl,
     for(;;) {
 	if (current != NULL) {
 	    if (current->hvalue != INVALID_HASH) {
-		match_res = db_prog_match(p,mpi.mp,
-					  make_tuple(current->dbterm.tpl),
-					  NULL,0,&dummy);
+		match_res = db_match_dbterm(&tb->common, p, mpi.mp, 0,
+					    &current->dbterm, &hp, 2);
 		if (is_value(match_res)) {
-		    if (mpi.all_objects) {
-			hp = HAlloc(p, current->dbterm.size + 2);
-			match_res = copy_shallow(DBTERM_BUF(&current->dbterm),
-						 current->dbterm.size,
-						 &hp,
-						 &MSO(p));
-		    } else {
-			sz = size_object(match_res);
-			
-			hp = HAlloc(p, sz + 2);
-			match_res = copy_struct(match_res, sz, &hp, &MSO(p));
-		    }
 		    match_list = CONS(hp, match_res, match_list);
 		    ++got;
 		}
@@ -1590,7 +1585,6 @@ static int db_select_count_hash(Process *p,
     Uint slot_ix = 0;
     HashDbTerm* current = NULL;
     unsigned current_list_pos = 0;
-    Uint32 dummy;
     Eterm *hp;
     int num_left = 1000;
     Uint got = 0;
@@ -1640,8 +1634,8 @@ static int db_select_count_hash(Process *p,
     for(;;) {
 	if (current != NULL) {
 	    if (current->hvalue != INVALID_HASH) {
-		if (db_prog_match(p, mpi.mp, make_tuple(current->dbterm.tpl),
-				  NULL,0, &dummy) == am_true) {
+		if (db_match_dbterm(&tb->common, p, mpi.mp, 0,
+				    &current->dbterm, NULL,0) == am_true) {
 		    ++got;
 		}
 		--num_left;
@@ -1709,7 +1703,6 @@ static int db_select_delete_hash(Process *p,
     Uint slot_ix = 0;
     HashDbTerm **current = NULL;
     unsigned current_list_pos = 0;
-    Uint32 dummy;
     Eterm *hp;
     int num_left = 1000;
     Uint got = 0;
@@ -1719,9 +1712,9 @@ static int db_select_delete_hash(Process *p,
     Eterm mpb;
     Eterm egot;
 #ifdef ERTS_SMP
-    int fixated_by_me = tb->common.is_thread_safe ? 0 : 1; /* ToDo: something nicer */
+    erts_aint_t fixated_by_me = tb->common.is_thread_safe ? 0 : 1; /* ToDo: something nicer */
 #else
-    int fixated_by_me = 0;
+    erts_aint_t fixated_by_me = 0;
 #endif
     erts_smp_rwmtx_t* lck;
 
@@ -1790,9 +1783,8 @@ static int db_select_delete_hash(Process *p,
 	} 
 	else {
 	    int did_erase = 0;
-	    if ((db_prog_match(p,mpi.mp,
-			       make_tuple((*current)->dbterm.tpl),
-			       NULL,0,&dummy)) == am_true) {
+	    if (db_match_dbterm(&tb->common, p, mpi.mp, 0,
+				&(*current)->dbterm, NULL, 0) == am_true) {
 		if (NFIXED(tb) > fixated_by_me) { /* fixated by others? */
 		    if (slot_ix != last_pseudo_delete) {
 			add_fixed_deletion(tb, slot_ix);
@@ -1855,7 +1847,6 @@ static int db_select_delete_continue_hash(Process *p,
     Uint slot_ix;
     Uint last_pseudo_delete = (Uint)-1;
     HashDbTerm **current = NULL;
-    Uint32 dummy;
     Eterm *hp;
     int num_left = 1000;
     Uint got;
@@ -1903,8 +1894,8 @@ static int db_select_delete_continue_hash(Process *p,
 	} 
 	else {
 	    int did_erase = 0;
-	    if ((db_prog_match(p,mp,make_tuple((*current)->dbterm.tpl),
-			       NULL,0,&dummy)) == am_true) {
+	    if (db_match_dbterm(&tb->common, p, mp, 0,
+				&(*current)->dbterm, NULL, 0) == am_true) {
 		if (NFIXED(tb) > fixated_by_me) { /* fixated by others? */
 		    if (slot_ix != last_pseudo_delete) {
 			add_fixed_deletion(tb, slot_ix);
@@ -1966,7 +1957,6 @@ static int db_select_count_continue_hash(Process *p,
     DbTableHash *tb = &tbl->hash;
     Uint slot_ix;
     HashDbTerm* current;
-    Uint32 dummy;
     Eterm *hp;
     int num_left = 1000;
     Uint got;
@@ -2004,8 +1994,8 @@ static int db_select_count_continue_hash(Process *p,
 		current = current->next;
 		continue;
 	    }
-	    if (db_prog_match(p, mp, make_tuple(current->dbterm.tpl),
-			      NULL,0,&dummy) == am_true) {
+	    if (db_match_dbterm(&tb->common, p, mp, 0, &current->dbterm,
+				NULL, 0) == am_true) {
 		++got;
 	    }
 	    --num_left;
@@ -2131,11 +2121,11 @@ static int db_free_table_continue_hash(DbTable *tbl)
 		     sizeof(FixedDeletion));
 	ERTS_ETS_MISC_MEM_ADD(-sizeof(FixedDeletion));
 	if (++done >= 2*DELETE_RECORD_LIMIT) {
-	    erts_smp_atomic_set(&tb->fixdel, (long)fixdel);
+	    erts_smp_atomic_set(&tb->fixdel, (erts_aint_t)fixdel);
 	    return 0;		/* Not done */
 	}
     }
-    erts_smp_atomic_set(&tb->fixdel, (long)NULL);
+    erts_smp_atomic_set(&tb->fixdel, (erts_aint_t)NULL);
 
     done /= 2;
     while(tb->nslots != 0) {
@@ -2184,7 +2174,7 @@ static int analyze_pattern(DbTableHash *tb, Eterm pattern,
     HashValue hval = NIL;      
     int num_heads = 0;
     int i;
-    
+
     mpi->lists = mpi->dlists;
     mpi->num_lists = 0;
     mpi->key_given = 1;
@@ -2352,7 +2342,7 @@ static int alloc_seg(DbTableHash *tb)
 	    struct ext_segment* eseg;
 	    eseg = (struct ext_segment*) SEGTAB(tb)[seg_ix-1];
 	    MY_ASSERT(eseg!=NULL && eseg->s.is_ext_segment);
-	    erts_smp_atomic_set(&tb->segtab, (long) eseg->segtab);
+	    erts_smp_atomic_set(&tb->segtab, (erts_aint_t) eseg->segtab);
 	    tb->nsegs = eseg->nsegs;
 	}
 	ASSERT(seg_ix < tb->nsegs);
@@ -2424,7 +2414,7 @@ static int free_seg(DbTableHash *tb, int free_records)
 	    MY_ASSERT(newtop->s.is_ext_segment);
 	    if (newtop->prev_segtab != NULL) {
 		/* Time to use a smaller segtab */
-		erts_smp_atomic_set(&tb->segtab, (long)newtop->prev_segtab);
+		erts_smp_atomic_set(&tb->segtab, (erts_aint_t)newtop->prev_segtab);
 		tb->nsegs = seg_ix;
 		ASSERT(tb->nsegs == EXTSEG(SEGTAB(tb))->nsegs);
 	    }
@@ -2441,7 +2431,7 @@ static int free_seg(DbTableHash *tb, int free_records)
     if (seg_ix > 0) {
 	if (seg_ix < tb->nsegs) SEGTAB(tb)[seg_ix] = NULL;
     } else {
-	erts_smp_atomic_set(&tb->segtab, (long)NULL);
+	erts_smp_atomic_set(&tb->segtab, (erts_aint_t)NULL);
     }
 #endif
     tb->nslots -= SEGSZ;
@@ -2450,31 +2440,19 @@ static int free_seg(DbTableHash *tb, int free_records)
 }
 
 
-static HashDbTerm* get_term(DbTableHash* tb, HashDbTerm* old, 
-			    Eterm obj, HashValue hval)
-{
-    HashDbTerm* p = db_get_term((DbTableCommon *) tb,
-				(old != NULL) ? &(old->dbterm) : NULL, 
-				((char *) &(old->dbterm)) - ((char *) old),
-				obj);
-    p->hvalue = hval;
-    /*p->next = NULL;*/ /*No Need */
-    return p;
-}
-
-
 /*
 ** Copy terms from ptr1 until ptr2
 ** works for ptr1 == ptr2 == 0  => []
 ** or ptr2 == 0
 */
-static Eterm put_term_list(Process* p, HashDbTerm* ptr1, HashDbTerm* ptr2)
+static Eterm build_term_list(Process* p, HashDbTerm* ptr1, HashDbTerm* ptr2,
+			   DbTableHash* tb)
 {
     int sz = 0;
     HashDbTerm* ptr;
     Eterm list = NIL;
     Eterm copy;
-    Eterm *hp;
+    Eterm *hp, *hend;
 
     ptr = ptr1;
     while(ptr != ptr2) {
@@ -2486,26 +2464,20 @@ static Eterm put_term_list(Process* p, HashDbTerm* ptr1, HashDbTerm* ptr2)
     }
 
     hp = HAlloc(p, sz);
+    hend = hp + sz;
 
     ptr = ptr1;
     while(ptr != ptr2) {
 	if (ptr->hvalue != INVALID_HASH) {
-	    copy = copy_shallow(DBTERM_BUF(&ptr->dbterm), ptr->dbterm.size, &hp, &MSO(p));
+	    copy = db_copy_object_from_ets(&tb->common, &ptr->dbterm, &hp, &MSO(p));
 	    list = CONS(hp, copy, list);
 	    hp  += 2;
 	}
 	ptr = ptr->next;
     }
-    return list;
-}
+    HRelease(p,hend,hp);
 
-static void free_term(DbTableHash *tb, HashDbTerm* p)
-{
-    db_free_term_data(&(p->dbterm));
-    erts_db_free(ERTS_ALC_T_DB_TERM,
-		 (DbTable *) tb,
-		 (void *) p,
-		 SIZ_DBTERM(p)*sizeof(Eterm));
+    return list;
 }
 
 /* Grow table with one new bucket.
@@ -2716,8 +2688,11 @@ static int db_lookup_dbterm_hash(DbTable *tbl, Eterm key, DbUpdateHandle* handle
 	    handle->tb = tbl;
 	    handle->bp = (void**) prevp;
 	    handle->dbterm = &b->dbterm;
-	    handle->new_size = b->dbterm.size;
 	    handle->mustResize = 0;
+	    handle->new_size = b->dbterm.size;
+	#if HALFWORD_HEAP
+	    handle->abs_vec = NULL;
+	#endif
 	    handle->lck = lck;
 	    /* KEEP hval WLOCKED, db_finalize_dbterm_hash will WUNLOCK */
 	    return 1;
@@ -2738,39 +2713,14 @@ static void db_finalize_dbterm_hash(DbUpdateHandle* handle)
     erts_smp_rwmtx_t* lck = (erts_smp_rwmtx_t*) handle->lck;
 
     ERTS_SMP_LC_ASSERT(IS_HASH_WLOCKED(&tbl->hash,lck));  /* locked by db_lookup_dbterm_hash */
-    ASSERT(&oldp->dbterm == handle->dbterm);
 
-    if (handle->mustResize) {
-	Eterm* top;
-	Eterm copy;
-	DbTerm* newDbTerm;
-	HashDbTerm* newp = erts_db_alloc(ERTS_ALC_T_DB_TERM, tbl,
-					 sizeof(HashDbTerm)+sizeof(Eterm)*(handle->new_size-1));    
-	sys_memcpy(newp, oldp, sizeof(HashDbTerm)-sizeof(DbTerm));  /* copy only hashtab header */
-	*(handle->bp) = newp;
-	newDbTerm = &newp->dbterm;
-    
-	newDbTerm->size = handle->new_size;
-	newDbTerm->off_heap.mso = NULL;
-	newDbTerm->off_heap.externals = NULL;
-    #ifndef HYBRID /* FIND ME! */
-	newDbTerm->off_heap.funs = NULL;
-    #endif
-	newDbTerm->off_heap.overhead = 0;
-	
-	/* make a flat copy */
-	top = DBTERM_BUF(newDbTerm);
-	copy = copy_struct(make_tuple(handle->dbterm->tpl),
-			   handle->new_size,
-			   &top, &newDbTerm->off_heap);
-	DBTERM_SET_TPL(newDbTerm,tuple_val(copy));
+    ASSERT((&oldp->dbterm == handle->dbterm) == !(tbl->common.compress && handle->mustResize));
 
+    if (handle->mustResize) {
+	db_finalize_resize(handle, offsetof(HashDbTerm,dbterm));
 	WUNLOCK_HASH(lck);
-		
-	db_free_term_data(handle->dbterm);
-	erts_db_free(ERTS_ALC_T_DB_TERM, tbl,
-		     (void *) (((char *) handle->dbterm) - (sizeof(HashDbTerm) - sizeof(DbTerm))),
-		     sizeof(HashDbTerm) + sizeof(Eterm)*(handle->dbterm->size-1));
+
+	free_term(&tbl->hash, oldp);
     }
     else {
 	WUNLOCK_HASH(lck);
@@ -2779,7 +2729,7 @@ static void db_finalize_dbterm_hash(DbUpdateHandle* handle)
     handle->dbterm = 0;
 #endif
     return;
-}   
+}
 
 static int db_delete_all_objects_hash(Process* p, DbTable* tbl)
 {
@@ -2805,7 +2755,11 @@ void db_foreach_offheap_hash(DbTable *tbl,
     for (i = 0; i < nactive; i++) {
 	list = BUCKET(tb,i);
 	while(list != 0) {
-	    (*func)(&(list->dbterm.off_heap), arg);
+	    ErlOffHeap tmp_offheap;
+	    tmp_offheap.first = list->dbterm.first_oh;
+	    tmp_offheap.overhead = 0;
+	    (*func)(&tmp_offheap, arg);
+	    list->dbterm.first_oh = tmp_offheap.first;
 	    list = list->next;
 	}
     }
diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c
index b6b3cabafe..6cdbec3213 100644
--- a/erts/emulator/beam/erl_db_tree.c
+++ b/erts/emulator/beam/erl_db_tree.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2011. 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
@@ -48,9 +48,6 @@
 
 #include "erl_db_tree.h"
 
-
-
-#define GETKEY(dtt, tplp)   (*((tplp) +  (dtt)->common.keypos))
 #define GETKEY_WITH_POS(Keypos, Tplp) (*((Tplp) + Keypos))
 #define NITEMS(tb) ((int)erts_smp_atomic_read(&(tb)->common.nitems))
 
@@ -122,12 +119,41 @@ static void release_stack(DbTableTree* tb, DbTreeStack* stack)
     }
 }
 
-static void reset_static_stack(DbTableTree* tb)
+static ERTS_INLINE void reset_static_stack(DbTableTree* tb)
 {
     tb->static_stack.pos = 0;
     tb->static_stack.slot = 0;
 }
 
+static ERTS_INLINE void free_term(DbTableTree *tb, TreeDbTerm* p)
+{
+    db_free_term((DbTable*)tb, p, offsetof(TreeDbTerm, dbterm));
+}
+
+static ERTS_INLINE TreeDbTerm* new_dbterm(DbTableTree *tb, Eterm obj)
+{
+    TreeDbTerm* p;
+    if (tb->common.compress) {
+	p = db_store_term_comp(&tb->common, NULL, offsetof(TreeDbTerm,dbterm), obj);
+    }
+    else {
+	p = db_store_term(&tb->common, NULL, offsetof(TreeDbTerm,dbterm), obj);
+    }
+    return p;
+}
+static ERTS_INLINE TreeDbTerm* replace_dbterm(DbTableTree *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);
+    }
+    else {
+	p = db_store_term(&tb->common, &(old->dbterm), offsetof(TreeDbTerm,dbterm), obj);
+    }
+    return p;
+}
 
 /*
 ** Some macros for "direction stacks"
@@ -178,12 +204,6 @@ static void do_dump_tree2(int to, void *to_arg, int show, TreeDbTerm *t,
 #endif
 
 /*
- * Size calculations
- */
-#define SIZ_OVERHEAD ((sizeof(TreeDbTerm)/sizeof(Eterm)) - 1)
-#define SIZ_DBTERM(TDT) (SIZ_OVERHEAD + (TDT)->dbterm.size)
-
-/*
 ** Datatypes
 */
 
@@ -259,13 +279,10 @@ struct select_delete_context {
 /*
 ** Forward declarations 
 */
-static TreeDbTerm *linkout_tree(DbTableTree *tb, Eterm key);
+static TreeDbTerm *linkout_tree(DbTableTree *tb, Eterm key, Eterm* key_base);
 static TreeDbTerm *linkout_object_tree(DbTableTree *tb, 
 				       Eterm object);
 static int do_free_tree_cont(DbTableTree *tb, int num_left);
-static TreeDbTerm* get_term(DbTableTree *tb,
-			    TreeDbTerm* old, 
-			    Eterm obj);
 static void free_term(DbTableTree *tb, TreeDbTerm* p);
 static int balance_left(TreeDbTerm **this); 
 static int balance_right(TreeDbTerm **this); 
@@ -273,15 +290,15 @@ 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_next(DbTableTree *tb, DbTreeStack*, Eterm key);
-static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack*, Eterm key);
+static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack*, Eterm key, Eterm* kbase);
+static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack*, Eterm key, Eterm* kbase);
 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,
 			       DbTreeStack*,
-			       Eterm lastkey,
+			       Eterm lastkey, Eterm* lk_base,
 			       int (*doit)(DbTableTree *tb,
 					   TreeDbTerm *,
 					   void *,
@@ -289,7 +306,7 @@ static void traverse_backwards(DbTableTree *tb,
 			       void *context); 
 static void traverse_forward(DbTableTree *tb,
 			     DbTreeStack*,
-			     Eterm lastkey,
+			     Eterm lastkey, Eterm* lk_base,
 			     int (*doit)(DbTableTree *tb,
 					 TreeDbTerm *,
 					 void *,
@@ -297,8 +314,8 @@ static void traverse_forward(DbTableTree *tb,
 			     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);
-static Sint do_cmp_partly_bound(Eterm a, Eterm b, int *done);
+static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key, Eterm* bk_base);
+static Sint do_cmp_partly_bound(Eterm a, Eterm b, Eterm* b_base, int *done);
 
 static int analyze_pattern(DbTableTree *tb, Eterm pattern, 
 			   struct mp_info *mpi);
@@ -318,7 +335,6 @@ static int doit_select_delete(DbTableTree *tb,
 			      TreeDbTerm *this,
 			      void *ptr,
 			      int forward);
-static void do_dump_tree(int to, void *to_arg, TreeDbTerm *t);
 
 static int partly_bound_can_match_lesser(Eterm partly_bound_1, 
 					 Eterm partly_bound_2);
@@ -472,9 +488,6 @@ static int db_first_tree(Process *p, DbTable *tbl, Eterm *ret)
     DbTableTree *tb = &tbl->tree;
     DbTreeStack* stack;
     TreeDbTerm *this;
-    Eterm e;
-    Eterm *hp;
-    Uint sz;
 
     if (( this = tb->root ) == NULL) {
 	*ret = am_EOT;
@@ -493,13 +506,7 @@ static int db_first_tree(Process *p, DbTable *tbl, Eterm *ret)
 	stack->slot = 1;
 	release_stack(tb,stack);
     }
-    e = GETKEY(tb, this->dbterm.tpl);
-    sz = size_object(e);
-
-    hp = HAlloc(p, sz);
-
-    *ret = copy_struct(e,sz,&hp,&MSO(p));
-    
+    *ret = db_copy_key(p, tbl, &this->dbterm);
     return DB_ERROR_NONE;
 }
 
@@ -508,26 +515,17 @@ static int db_next_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
     DbTableTree *tb = &tbl->tree;
     DbTreeStack* stack;
     TreeDbTerm *this;
-    Eterm e;
-    Eterm *hp;
-    Uint sz;
 
     if (is_atom(key) && key == am_EOT)
 	return DB_ERROR_BADKEY;
     stack = get_any_stack(tb);
-    this = find_next(tb, stack, key);
+    this = find_next(tb, stack, key, NULL);
     release_stack(tb,stack);
     if (this == NULL) {
 	*ret = am_EOT;
 	return DB_ERROR_NONE;
     }
-    e = GETKEY(tb, this->dbterm.tpl);
-    sz = size_object(e);
-
-    hp = HAlloc(p, sz);
-
-    *ret = copy_struct(e,sz,&hp,&MSO(p));
-    
+    *ret = db_copy_key(p, tbl, &this->dbterm);
     return DB_ERROR_NONE;
 }
 
@@ -536,9 +534,6 @@ static int db_last_tree(Process *p, DbTable *tbl, Eterm *ret)
     DbTableTree *tb = &tbl->tree;
     TreeDbTerm *this;
     DbTreeStack* stack;
-    Eterm e;
-    Eterm *hp;
-    Uint sz;
 
     if (( this = tb->root ) == NULL) {
 	*ret = am_EOT;
@@ -557,13 +552,7 @@ static int db_last_tree(Process *p, DbTable *tbl, Eterm *ret)
 	stack->slot = NITEMS(tb);
 	release_stack(tb,stack);
     }
-    e = GETKEY(tb, this->dbterm.tpl);
-    sz = size_object(e);
-
-    hp = HAlloc(p, sz);
-
-    *ret = copy_struct(e,sz,&hp,&MSO(p));
-    
+    *ret = db_copy_key(p, tbl, &this->dbterm);
     return DB_ERROR_NONE;
 }
 
@@ -572,27 +561,33 @@ static int db_prev_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
     DbTableTree *tb = &tbl->tree;
     TreeDbTerm *this;
     DbTreeStack* stack;
-    Eterm e;
-    Eterm *hp;
-    Uint sz;
 
     if (is_atom(key) && key == am_EOT)
 	return DB_ERROR_BADKEY;
     stack = get_any_stack(tb);
-    this = find_prev(tb, stack, key);
+    this = find_prev(tb, stack, key, NULL);
     release_stack(tb,stack);
     if (this == NULL) {
 	*ret = am_EOT;
 	return DB_ERROR_NONE;
     }
-    e = GETKEY(tb, this->dbterm.tpl);
-    sz = size_object(e);
+    *ret = db_copy_key(p, tbl, &this->dbterm);
+    return DB_ERROR_NONE;
+}
 
-    hp = HAlloc(p, sz);
+static ERTS_INLINE int cmp_key(DbTableTree* tb, Eterm key, Eterm* key_base,
+			       TreeDbTerm* obj)
+{
+    return cmp_rel(key, key_base,
+		   GETKEY(tb,obj->dbterm.tpl), obj->dbterm.tpl);
+}
 
-    *ret = copy_struct(e,sz,&hp,&MSO(p));
-    
-    return DB_ERROR_NONE;
+static ERTS_INLINE int cmp_key_eq(DbTableTree* tb, Eterm key, Eterm* key_base,
+				  TreeDbTerm* obj)
+{
+    Eterm obj_key = GETKEY(tb,obj->dbterm.tpl);
+    return is_same(key, key_base, obj_key, obj->dbterm.tpl)
+	|| cmp_rel(key, key_base, obj_key, obj->dbterm.tpl) == 0;
 }
 
 static int db_put_tree(DbTable *tbl, Eterm obj, int key_clash_fail)
@@ -622,12 +617,12 @@ static int db_put_tree(DbTable *tbl, Eterm obj, int key_clash_fail)
 		erts_smp_atomic_dec(&tb->common.nitems);
 		return DB_ERROR_SYSRES;
 	    }
-	    *this = get_term(tb, NULL, obj);
+	    *this = new_dbterm(tb, obj);
 	    (*this)->balance = 0;
 	    (*this)->left = (*this)->right = NULL;
 	    break;
-	} else if ((c = cmp(key,GETKEY(tb,(*this)->dbterm.tpl))) < 0) { 
-	    /* go left */
+	} else if ((c = cmp_key(tb, key, NULL, *this)) < 0) {
+	    /* go lefts */
 	    dstack[dpos++] = DIR_LEFT;
 	    tstack[tpos++] = this;
 	    this = &((*this)->left);
@@ -636,7 +631,7 @@ static int db_put_tree(DbTable *tbl, Eterm obj, int key_clash_fail)
 	    tstack[tpos++] = this;
 	    this = &((*this)->right);
 	} else if (!key_clash_fail) { /* Equal key and this is a set, replace. */
-	    *this = get_term(tb, *this, obj);
+	    *this = replace_dbterm(tb, *this, obj);
 	    break;
 	} else {
 	    return DB_ERROR_BADKEY; /* key already exists */
@@ -714,7 +709,7 @@ static int db_get_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
 {
     DbTableTree *tb = &tbl->tree;
     Eterm copy;
-    Eterm *hp;
+    Eterm *hp, *hend;
     TreeDbTerm *this;
 
     /*
@@ -728,11 +723,11 @@ static int db_get_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
 	*ret = NIL;
     } else {
 	hp = HAlloc(p, this->dbterm.size + 2);
-	copy = copy_shallow(DBTERM_BUF(&this->dbterm), 
-			    this->dbterm.size, 
-			    &hp, 
-			    &MSO(p));
+	hend = hp + this->dbterm.size + 2;
+	copy = db_copy_object_from_ets(&tb->common, &this->dbterm, &hp, &MSO(p));
 	*ret = CONS(hp, copy, NIL);
+	hp += 2;
+	HRelease(p,hend,hp);
     }
     return DB_ERROR_NONE;
 }
@@ -766,18 +761,10 @@ static int db_get_element_tree(Process *p, DbTable *tbl,
     if (this == NULL) {
 	return DB_ERROR_BADKEY;
     } else {
-	Eterm element;
-	Uint sz;
 	if (ndex > arityval(this->dbterm.tpl[0])) {
 	    return DB_ERROR_BADPARAM;
 	}
-	element = this->dbterm.tpl[ndex];
-	sz = size_object(element);
-	hp = HAlloc(p, sz);
-	*ret = copy_struct(element, 
-			   sz, 
-			   &hp, 
-			   &MSO(p));
+	*ret = db_copy_element_from_ets(&tb->common, p, &this->dbterm, ndex, &hp, 0);
     }
     return DB_ERROR_NONE;
 }
@@ -789,7 +776,7 @@ static int db_erase_tree(DbTable *tbl, Eterm key, Eterm *ret)
 
     *ret = am_true;
 
-    if ((res = linkout_tree(tb, key)) != NULL) {
+    if ((res = linkout_tree(tb, key, NULL)) != NULL) {
 	free_term(tb, res);
     }
     return DB_ERROR_NONE;
@@ -815,7 +802,7 @@ static int db_slot_tree(Process *p, DbTable *tbl,
     DbTableTree *tb = &tbl->tree;
     Sint slot;
     TreeDbTerm *st;
-    Eterm *hp;
+    Eterm *hp, *hend;
     Eterm copy;
 
     /*
@@ -847,11 +834,11 @@ static int db_slot_tree(Process *p, DbTable *tbl,
 	return DB_ERROR_UNSPEC;
     }
     hp = HAlloc(p, st->dbterm.size + 2);
-    copy = copy_shallow(DBTERM_BUF(&st->dbterm), 
-			st->dbterm.size, 
-			&hp, 
-			&MSO(p));
+    hend = hp + st->dbterm.size + 2;
+    copy = db_copy_object_from_ets(&tb->common, &st->dbterm, &hp, &MSO(p));
     *ret = CONS(hp, copy, NIL);
+    hp += 2;
+    HRelease(p,hend,hp);
     return DB_ERROR_NONE;
 }
 
@@ -981,15 +968,15 @@ static int db_select_continue_tree(Process *p,
     stack = get_any_stack(tb);
     if (chunk_size) {
 	if (reverse) {
-	    traverse_backwards(tb, stack, lastkey, &doit_select_chunk, &sc); 
+	    traverse_backwards(tb, stack, lastkey, NULL, &doit_select_chunk, &sc);
 	} else {
-	    traverse_forward(tb, stack, lastkey, &doit_select_chunk, &sc); 
+	    traverse_forward(tb, stack, lastkey, NULL, &doit_select_chunk, &sc);
 	}
     } else {
 	if (reverse) {
-	    traverse_forward(tb, stack, lastkey, &doit_select, &sc);
+	    traverse_forward(tb, stack, lastkey, NULL, &doit_select, &sc);
 	} else {
-	    traverse_backwards(tb, stack, lastkey, &doit_select, &sc);
+	    traverse_backwards(tb, stack, lastkey, NULL, &doit_select, &sc);
 	}
     }
     release_stack(tb,stack);
@@ -1014,10 +1001,9 @@ static int db_select_continue_tree(Process *p,
 	    }
 
 	    key = GETKEY(tb, sc.lastobj);
-
-	    sz = size_object(key);
+	    sz = size_object_rel(key,sc.lastobj);
 	    hp = HAlloc(p, 9 + sz);
-	    key = copy_struct(key, sz, &hp, &MSO(p));
+	    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
 	    continuation = TUPLE8
 		(hp,
 		 tptr[1],
@@ -1038,8 +1024,8 @@ static int db_select_continue_tree(Process *p,
     key = GETKEY(tb, sc.lastobj);
     if (chunk_size) {
 	if (end_condition != NIL && 
-	    ((!reverse && cmp_partly_bound(end_condition,key) < 0) ||
-	     (reverse && cmp_partly_bound(end_condition,key) > 0))) { 
+	    ((!reverse && cmp_partly_bound(end_condition,key,sc.lastobj) < 0) ||
+	     (reverse && cmp_partly_bound(end_condition,key,sc.lastobj) > 0))) {
 	    /* done anyway */
 	    if (!sc.got) {
 		RET_TO_BIF(am_EOT, DB_ERROR_NONE);
@@ -1051,16 +1037,16 @@ static int db_select_continue_tree(Process *p,
 	}
     } else {
 	if (end_condition != NIL && 
-	    ((!reverse && cmp_partly_bound(end_condition,key) > 0) ||
-	     (reverse && cmp_partly_bound(end_condition,key) < 0))) { 
+	    ((!reverse && cmp_partly_bound(end_condition,key,sc.lastobj) > 0) ||
+	     (reverse && cmp_partly_bound(end_condition,key,sc.lastobj) < 0))) {
 	    /* done anyway */
 	    RET_TO_BIF(sc.accum,DB_ERROR_NONE);
 	}
     }
     /* Not done yet, let's trap. */
-    sz = size_object(key);
+    sz = size_object_rel(key,sc.lastobj);
     hp = HAlloc(p, 9 + sz);
-    key = copy_struct(key, sz, &hp, &MSO(p));
+    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
     continuation = TUPLE8
 	(hp,
 	 tptr[1],
@@ -1081,11 +1067,13 @@ static int db_select_continue_tree(Process *p,
 static int db_select_tree(Process *p, DbTable *tbl, 
 			  Eterm pattern, int reverse, Eterm *ret)
 {
+    /* 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;
-    Eterm lastkey = NIL;
+    Eterm lastkey = THE_NON_VALUE;
+    Eterm* lk_base = NULL;
     Eterm key;
     Eterm continuation;
     unsigned sz;
@@ -1127,7 +1115,7 @@ static int db_select_tree(Process *p, DbTable *tbl,
     sc.all_objects = mpi.all_objects;
 
     if (!mpi.got_partial && mpi.some_limitation && 
-	cmp(mpi.least,mpi.most) == 0) {
+	CMP(mpi.least,mpi.most) == 0) {
 	doit_select(tb,mpi.save_term,&sc,0 /* direction doesn't matter */);
 	RET_TO_BIF(sc.accum,DB_ERROR_NONE);
     }
@@ -1137,20 +1125,20 @@ static int db_select_tree(Process *p, DbTable *tbl,
 	if (mpi.some_limitation) {
 	    if ((this = find_prev_from_pb_key(tb, stack, mpi.least)) != NULL) {
 		lastkey = GETKEY(tb, this->dbterm.tpl);
+		lk_base = this->dbterm.tpl;
 	    }
 	    sc.end_condition = mpi.most;
 	}
-	
-	traverse_forward(tb, stack, lastkey, &doit_select, &sc);
+	traverse_forward(tb, stack, lastkey, lk_base, &doit_select, &sc);
     } else {
 	if (mpi.some_limitation) {
 	    if ((this = find_next_from_pb_key(tb, stack, mpi.most)) != NULL) {
 		lastkey = GETKEY(tb, this->dbterm.tpl);
+		lk_base = this->dbterm.tpl;
 	    }
 	    sc.end_condition = mpi.least;
 	}
-	
-	traverse_backwards(tb, stack, lastkey, &doit_select, &sc);
+	traverse_backwards(tb, stack, lastkey, lk_base, &doit_select, &sc);
     }
     release_stack(tb,stack);
 #ifdef HARDDEBUG
@@ -1163,9 +1151,9 @@ static int db_select_tree(Process *p, DbTable *tbl,
     }
 
     key = GETKEY(tb, sc.lastobj);
-    sz = size_object(key);
+    sz = size_object_rel(key, sc.lastobj);
     hp = HAlloc(p, 9 + sz + PROC_BIN_SIZE);
-    key = copy_struct(key, sz, &hp, &MSO(p));
+    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
     if (mpi.all_objects)
 	(mpi.mp)->flags |= BIN_FLAG_ALL_OBJECTS;
     mpb=db_make_mp_binary(p,mpi.mp,&hp);
@@ -1246,7 +1234,7 @@ static int db_select_count_continue_tree(Process *p,
     }
 
     stack = get_any_stack(tb);
-    traverse_backwards(tb, stack, lastkey, &doit_select_count, &sc);
+    traverse_backwards(tb, stack, lastkey, NULL, &doit_select_count, &sc);
     release_stack(tb,stack);
 
     BUMP_REDS(p, 1000 - sc.max);
@@ -1256,12 +1244,12 @@ static int db_select_count_continue_tree(Process *p,
     }	
     key = GETKEY(tb, sc.lastobj);
     if (end_condition != NIL && 
-	(cmp_partly_bound(end_condition,key) > 0)) { 
+	(cmp_partly_bound(end_condition,key,sc.lastobj) > 0)) {
 	/* done anyway */
 	RET_TO_BIF(make_small(sc.got),DB_ERROR_NONE);
     }
     /* Not done yet, let's trap. */
-    sz = size_object(key);
+    sz = size_object_rel(key, sc.lastobj);
     if (IS_USMALL(0, sc.got)) {
 	hp = HAlloc(p, sz + 6);
 	egot = make_small(sc.got);
@@ -1271,7 +1259,7 @@ static int db_select_count_continue_tree(Process *p,
 	egot = uint_to_big(sc.got, hp);
 	hp += BIG_UINT_HEAP_SIZE;
     }
-    key = copy_struct(key, sz, &hp, &MSO(p));
+    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
     continuation = TUPLE5
 	(hp,
 	 tptr[1],
@@ -1293,7 +1281,8 @@ static int db_select_count_tree(Process *p, DbTable *tbl,
     DbTreeStack* stack;
     struct select_count_context sc;
     struct mp_info mpi;
-    Eterm lastkey = NIL;
+    Eterm lastkey = THE_NON_VALUE;
+    Eterm* lk_base = NULL;
     Eterm key;
     Eterm continuation;
     unsigned sz;
@@ -1334,7 +1323,7 @@ static int db_select_count_tree(Process *p, DbTable *tbl,
     sc.all_objects = mpi.all_objects;
 
     if (!mpi.got_partial && mpi.some_limitation && 
-	cmp(mpi.least,mpi.most) == 0) {
+	CMP(mpi.least,mpi.most) == 0) {
 	doit_select_count(tb,mpi.save_term,&sc,0 /* dummy */);
 	RET_TO_BIF(erts_make_integer(sc.got,p),DB_ERROR_NONE);
     }
@@ -1343,11 +1332,12 @@ static int db_select_count_tree(Process *p, DbTable *tbl,
     if (mpi.some_limitation) {
 	if ((this = find_next_from_pb_key(tb, stack, mpi.most)) != NULL) {
 	    lastkey = GETKEY(tb, this->dbterm.tpl);
+	    lk_base = this->dbterm.tpl;
 	}
 	sc.end_condition = mpi.least;
     }
     
-    traverse_backwards(tb, stack, lastkey, &doit_select_count, &sc);
+    traverse_backwards(tb, stack, lastkey, lk_base, &doit_select_count, &sc);
     release_stack(tb,stack);
     BUMP_REDS(p, 1000 - sc.max);
     if (sc.max > 0) {
@@ -1355,7 +1345,7 @@ static int db_select_count_tree(Process *p, DbTable *tbl,
     }
 
     key = GETKEY(tb, sc.lastobj);
-    sz = size_object(key);
+    sz = size_object_rel(key, sc.lastobj);
     if (IS_USMALL(0, sc.got)) {
 	hp = HAlloc(p, sz + PROC_BIN_SIZE + 6);
 	egot = make_small(sc.got);
@@ -1365,7 +1355,7 @@ static int db_select_count_tree(Process *p, DbTable *tbl,
 	egot = uint_to_big(sc.got, hp);
 	hp += BIG_UINT_HEAP_SIZE;
     }
-    key = copy_struct(key, sz, &hp, &MSO(p));
+    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
     if (mpi.all_objects)
 	(mpi.mp)->flags |= BIN_FLAG_ALL_OBJECTS;
     mpb = db_make_mp_binary(p,mpi.mp,&hp);
@@ -1395,7 +1385,8 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl,
     DbTreeStack* stack;
     struct select_context sc;
     struct mp_info mpi;
-    Eterm lastkey = NIL;
+    Eterm lastkey = THE_NON_VALUE;
+    Eterm* lk_base = NULL;
     Eterm key;
     Eterm continuation;
     unsigned sz;
@@ -1437,7 +1428,7 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl,
     sc.all_objects = mpi.all_objects;
 
     if (!mpi.got_partial && mpi.some_limitation && 
-	cmp(mpi.least,mpi.most) == 0) {
+	CMP(mpi.least,mpi.most) == 0) {
 	doit_select(tb,mpi.save_term,&sc, 0 /* direction doesn't matter */);
 	if (sc.accum != NIL) {
 	    hp=HAlloc(p, 3);
@@ -1452,20 +1443,20 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl,
 	if (mpi.some_limitation) {
 	    if ((this = find_next_from_pb_key(tb, stack, mpi.most)) != NULL) {
 		lastkey = GETKEY(tb, this->dbterm.tpl);
+		lk_base = this->dbterm.tpl;
 	    }
 	    sc.end_condition = mpi.least;
 	}
-
-	traverse_backwards(tb, stack, lastkey, &doit_select_chunk, &sc);
+	traverse_backwards(tb, stack, lastkey, lk_base, &doit_select_chunk, &sc);
     } else {
 	if (mpi.some_limitation) {
 	    if ((this = find_prev_from_pb_key(tb, stack, mpi.least)) != NULL) {
 		lastkey = GETKEY(tb, this->dbterm.tpl);
+		lk_base = this->dbterm.tpl;
 	    }
 	    sc.end_condition = mpi.most;
 	}
-
-	traverse_forward(tb, stack, lastkey, &doit_select_chunk, &sc);
+	traverse_forward(tb, stack, lastkey, lk_base, &doit_select_chunk, &sc);
     }
     release_stack(tb,stack);
 
@@ -1490,9 +1481,9 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl,
 	}
 
 	key = GETKEY(tb, sc.lastobj);
-	sz = size_object(key);
+	sz = size_object_rel(key, sc.lastobj);
 	hp = HAlloc(p, 9 + sz + PROC_BIN_SIZE);
-	key = copy_struct(key, sz, &hp, &MSO(p));
+	key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
 	if (mpi.all_objects)
 	    (mpi.mp)->flags |= BIN_FLAG_ALL_OBJECTS;
 	mpb = db_make_mp_binary(p,mpi.mp,&hp);
@@ -1515,9 +1506,9 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl,
     }
 
     key = GETKEY(tb, sc.lastobj);
-    sz = size_object(key);
+    sz = size_object_rel(key, sc.lastobj);
     hp = HAlloc(p, 9 + sz + PROC_BIN_SIZE);
-    key = copy_struct(key, sz, &hp, &MSO(p));
+    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
 
     if (mpi.all_objects)
 	(mpi.mp)->flags |= BIN_FLAG_ALL_OBJECTS;
@@ -1593,7 +1584,7 @@ static int db_select_delete_continue_tree(Process *p,
     sc.keypos = tb->common.keypos;
 
     ASSERT(!erts_smp_atomic_read(&tb->is_stack_busy));
-    traverse_backwards(tb, &tb->static_stack, lastkey, &doit_select_delete, &sc);
+    traverse_backwards(tb, &tb->static_stack, lastkey, NULL, &doit_select_delete, &sc);
 
     BUMP_REDS(p, 1000 - sc.max);
 
@@ -1602,11 +1593,11 @@ static int db_select_delete_continue_tree(Process *p,
     }	
     key = GETKEY(tb, (sc.lastterm)->dbterm.tpl);
     if (end_condition != NIL && 
-	cmp_partly_bound(end_condition,key) > 0) { /* done anyway */
+	cmp_partly_bound(end_condition,key,sc.lastterm->dbterm.tpl) > 0) { /* done anyway */
 	RET_TO_BIF(erts_make_integer(sc.accum,p),DB_ERROR_NONE);
     }
     /* Not done yet, let's trap. */
-    sz = size_object(key);
+    sz = size_object_rel(key, sc.lastterm->dbterm.tpl);
     if (IS_USMALL(0, sc.accum)) {
 	hp = HAlloc(p, sz + 6);
 	eaccsum = make_small(sc.accum);
@@ -1616,7 +1607,7 @@ static int db_select_delete_continue_tree(Process *p,
 	eaccsum = uint_to_big(sc.accum, hp);
 	hp += BIG_UINT_HEAP_SIZE;
     }
-    key = copy_struct(key, sz, &hp, &MSO(p));
+    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastterm->dbterm.tpl, NULL);
     continuation = TUPLE5
 	(hp,
 	 tptr[1],
@@ -1636,7 +1627,8 @@ static int db_select_delete_tree(Process *p, DbTable *tbl,
     DbTableTree *tb = &tbl->tree;
     struct select_delete_context sc;
     struct mp_info mpi;
-    Eterm lastkey = NIL;
+    Eterm lastkey = THE_NON_VALUE;
+    Eterm* lk_base = NULL;
     Eterm key;
     Eterm continuation;
     unsigned sz;
@@ -1680,7 +1672,7 @@ static int db_select_delete_tree(Process *p, DbTable *tbl,
     sc.mp = mpi.mp;
 
     if (!mpi.got_partial && mpi.some_limitation && 
-	cmp(mpi.least,mpi.most) == 0) {
+	CMP(mpi.least,mpi.most) == 0) {
 	doit_select_delete(tb,mpi.save_term,&sc, 0 /* direction doesn't 
 						      matter */);
 	RET_TO_BIF(erts_make_integer(sc.accum,p),DB_ERROR_NONE);
@@ -1689,11 +1681,12 @@ static int db_select_delete_tree(Process *p, DbTable *tbl,
     if (mpi.some_limitation) {
 	if ((this = find_next_from_pb_key(tb, &tb->static_stack, mpi.most)) != NULL) {
 	    lastkey = GETKEY(tb, this->dbterm.tpl);
+	    lk_base = this->dbterm.tpl;
 	}
 	sc.end_condition = mpi.least;
     }
 
-    traverse_backwards(tb, &tb->static_stack, lastkey, &doit_select_delete, &sc);
+    traverse_backwards(tb, &tb->static_stack, lastkey, lk_base, &doit_select_delete, &sc);
     BUMP_REDS(p, 1000 - sc.max);
 
     if (sc.max > 0) {
@@ -1701,7 +1694,7 @@ static int db_select_delete_tree(Process *p, DbTable *tbl,
     }
 
     key = GETKEY(tb, (sc.lastterm)->dbterm.tpl);
-    sz = size_object(key);
+    sz = size_object_rel(key, sc.lastterm->dbterm.tpl);
     if (IS_USMALL(0, sc.accum)) {
 	hp = HAlloc(p, sz + PROC_BIN_SIZE + 6);
 	eaccsum = make_small(sc.accum);
@@ -1711,7 +1704,7 @@ static int db_select_delete_tree(Process *p, DbTable *tbl,
 	eaccsum = uint_to_big(sc.accum, hp);
 	hp += BIG_UINT_HEAP_SIZE;
     }
-    key = copy_struct(key, sz, &hp, &MSO(p));
+    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastterm->dbterm.tpl, NULL);
     mpb = db_make_mp_binary(p,mpi.mp,&hp);
     
     continuation = TUPLE5
@@ -1737,7 +1730,7 @@ static int db_select_delete_tree(Process *p, DbTable *tbl,
 ** Other interface routines (not directly coupled to one bif)
 */
 
-/* Display hash table contents (for dump) */
+/* Display tree contents (for dump) */
 static void db_print_tree(int to, void *to_arg, 
 			  int show,
 			  DbTable *tbl)
@@ -1753,7 +1746,6 @@ static void db_print_tree(int to, void *to_arg,
 		   "------------------------------------------------\n");
 #else
     erts_print(to, to_arg, "Ordered set (AVL tree), Elements: %d\n", NITEMS(tb));
-    do_dump_tree(to, to_arg, tb->root);
 #endif
 }
 
@@ -1817,15 +1809,19 @@ do_db_tree_foreach_offheap(TreeDbTerm *tdbt,
 			   void (*func)(ErlOffHeap *, void *),
 			   void * arg)
 {
+    ErlOffHeap tmp_offheap;
     if(!tdbt)
 	return;
     do_db_tree_foreach_offheap(tdbt->left, func, arg);
-    (*func)(&(tdbt->dbterm.off_heap), arg);
+    tmp_offheap.first = tdbt->dbterm.first_oh;
+    tmp_offheap.overhead = 0;
+    (*func)(&tmp_offheap, arg);
+    tdbt->dbterm.first_oh = tmp_offheap.first;
     do_db_tree_foreach_offheap(tdbt->right, func, arg);
 }
 
 static TreeDbTerm *linkout_tree(DbTableTree *tb, 
-				Eterm key)
+				Eterm key, Eterm* key_base)
 {
     TreeDbTerm **tstack[STACK_NEED];
     int tpos = 0;
@@ -1848,7 +1844,7 @@ static TreeDbTerm *linkout_tree(DbTableTree *tb,
     for (;;) {
 	if (!*this) { /* Failure */
 	    return NULL;
-	} else if ((c = cmp(key,GETKEY(tb,(*this)->dbterm.tpl))) < 0) { 
+	} else if ((c = cmp_key(tb, key, key_base, *this)) < 0) {
 	    dstack[dpos++] = DIR_LEFT;
 	    tstack[tpos++] = this;
 	    this = &((*this)->left);
@@ -1912,7 +1908,7 @@ static TreeDbTerm *linkout_object_tree(DbTableTree *tb,
     for (;;) {
 	if (!*this) { /* Failure */
 	    return NULL;
-	} else if ((c = cmp(key,GETKEY(tb,(*this)->dbterm.tpl))) < 0) { 
+	} else if ((c = cmp_key(tb,key,NULL,*this)) < 0) {
 	    dstack[dpos++] = DIR_LEFT;
 	    tstack[tpos++] = this;
 	    this = &((*this)->left);
@@ -1921,7 +1917,7 @@ static TreeDbTerm *linkout_object_tree(DbTableTree *tb,
 	    tstack[tpos++] = this;
 	    this = &((*this)->right);
 	} else { /* Equal key, found the only possible matching object*/
-	    if (!eq(object,make_tuple((*this)->dbterm.tpl))) {
+	    if (!db_eq(&tb->common,object,&(*this)->dbterm)) {
 		return NULL;
 	    }
 	    q = (*this);
@@ -2065,24 +2061,6 @@ static int analyze_pattern(DbTableTree *tb, Eterm pattern,
     return DB_ERROR_NONE;
 }
 
-static void do_dump_tree(int to, void *to_arg, TreeDbTerm *t)
-{
-    if (t != NULL) {
-	do_dump_tree(to, to_arg, t->left);
-	erts_print(to, to_arg, "%T\n", make_tuple(t->dbterm.tpl));
-	do_dump_tree(to, to_arg, t->right); 
-    }
-}
-
-static void free_term(DbTableTree *tb, TreeDbTerm* p)
-{
-    db_free_term_data(&(p->dbterm));
-    erts_db_free(ERTS_ALC_T_DB_TERM,
-		 (DbTable *) tb,
-		 (void *) p,
-		 SIZ_DBTERM(p)*sizeof(Uint));
-}
-
 static int do_free_tree_cont(DbTableTree *tb, int num_left)
 {
     TreeDbTerm *root;
@@ -2113,17 +2091,6 @@ static int do_free_tree_cont(DbTableTree *tb, int num_left)
     return 1;
 }
 
-static TreeDbTerm* get_term(DbTableTree *tb,
-			    TreeDbTerm* old, 
-			    Eterm obj) 
-{
-    TreeDbTerm* p = db_get_term((DbTableCommon *) tb,
-				(old != NULL) ? &(old->dbterm) : NULL, 
-				((char *) &(old->dbterm)) - ((char *) old),
-				obj);
-    return p;
-}
-
 /*
  * Deletion helpers
  */
@@ -2327,14 +2294,15 @@ done:
  * Find next and previous in sort order
  */
 
-static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack, Eterm key)
+static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack,
+			     Eterm key, Eterm* key_base)
 {
     TreeDbTerm *this;
     TreeDbTerm *tmp;
     Sint c;
 
     if(( this = TOP_NODE(stack)) != NULL) {
-	if (!CMP_EQ(GETKEY(tb, this->dbterm.tpl),key)) {
+	if (!cmp_key_eq(tb,key,key_base,this)) {
 	    /* Start from the beginning */
 	    stack->pos = stack->slot = 0;
 	}
@@ -2344,14 +2312,14 @@ static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack, Eterm key)
 	    return NULL;
 	for (;;) {
 	    PUSH_NODE(stack, this);
-	    if (( c = cmp(GETKEY(tb, this->dbterm.tpl),key) ) < 0) {
+	    if (( c = cmp_key(tb,key,key_base,this) ) > 0) {
 		if (this->right == NULL) /* We are at the previos 
 					    and the element does
 					    not exist */
 		    break;
 		else
 		    this = this->right;
-	    } else if (c > 0) {
+	    } else if (c < 0) {
 		if (this->left == NULL) /* Done */
 		    return this;
 		else
@@ -2384,14 +2352,15 @@ static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack, Eterm key)
     return this;
 }
 
-static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack* stack, Eterm key)
+static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack* stack,
+			     Eterm key, Eterm* key_base)
 {
     TreeDbTerm *this;
     TreeDbTerm *tmp;
     Sint c;
 
     if(( this = TOP_NODE(stack)) != NULL) {
-	if (!CMP_EQ(GETKEY(tb, this->dbterm.tpl),key)) {
+	if (!cmp_key_eq(tb,key,key_base,this)) {
 	    /* Start from the beginning */
 	    stack->pos = stack->slot = 0;
 	}
@@ -2401,14 +2370,14 @@ static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack* stack, Eterm key)
 	    return NULL;
 	for (;;) {
 	    PUSH_NODE(stack, this);
-	    if (( c = cmp(GETKEY(tb, this->dbterm.tpl),key) ) > 0) {
+	    if (( c = cmp_key(tb,key,key_base,this) ) < 0) {
 		if (this->left == NULL) /* We are at the next 
 					   and the element does
 					   not exist */
 		    break;
 		else
 		    this = this->left;
-	    } else if (c < 0) {
+	    } else if (c > 0) {
 		if (this->right == NULL) /* Done */
 		    return this;
 		else
@@ -2454,7 +2423,8 @@ static TreeDbTerm *find_next_from_pb_key(DbTableTree *tb, DbTreeStack* stack,
 	return NULL;
     for (;;) {
 	PUSH_NODE(stack, this);
-	if (( c = cmp_partly_bound(key,GETKEY(tb, this->dbterm.tpl)) ) >= 0) {
+	if (( c = cmp_partly_bound(key,GETKEY(tb, this->dbterm.tpl),
+				   this->dbterm.tpl) ) >= 0) {
 	    if (this->right == NULL) {
 		do {
 		    tmp = POP_NODE(stack);
@@ -2487,7 +2457,8 @@ static TreeDbTerm *find_prev_from_pb_key(DbTableTree *tb, DbTreeStack* stack,
 	return NULL;
     for (;;) {
 	PUSH_NODE(stack, this);
-	if (( c = cmp_partly_bound(key,GETKEY(tb, this->dbterm.tpl)) ) <= 0) {
+	if (( c = cmp_partly_bound(key,GETKEY(tb, this->dbterm.tpl),
+				   this->dbterm.tpl) ) <= 0) {
 	    if (this->left == NULL) {
 		do {
 		    tmp = POP_NODE(stack);
@@ -2517,12 +2488,11 @@ static TreeDbTerm *find_node(DbTableTree *tb, Eterm key)
     Sint res;
     DbTreeStack* stack = get_static_stack(tb);
 
-    if(!stack || EMPTY_NODE(stack) 
-       || !CMP_EQ(GETKEY(tb, ( this = TOP_NODE(stack) )->dbterm.tpl), key)) {
+    if(!stack || EMPTY_NODE(stack)
+       || !cmp_key_eq(tb, key, NULL, (this=TOP_NODE(stack)))) {
 
 	this = tb->root;
-	while (this != NULL && 
-	       ( res = cmp(key, GETKEY(tb, this->dbterm.tpl)) ) != 0) {
+	while (this != NULL && (res = cmp_key(tb,key,NULL,this)) != 0) {
 	    if (res < 0)
 		this = this->left;
 	    else
@@ -2544,8 +2514,7 @@ static TreeDbTerm **find_node2(DbTableTree *tb, Eterm key)
     Sint res;
 
     this = &tb->root;
-    while ((*this) != NULL && 
-	   ( res = cmp(key, GETKEY(tb, (*this)->dbterm.tpl)) ) != 0) {
+    while ((*this) != NULL && (res = cmp_key(tb, key, NULL, *this)) != 0) {
 	if (res < 0)
 	    this = &((*this)->left);
 	else
@@ -2565,48 +2534,24 @@ static int db_lookup_dbterm_tree(DbTable *tbl, Eterm key, DbUpdateHandle* handle
 
     handle->tb = tbl;
     handle->dbterm = &(*pp)->dbterm;
+    handle->mustResize = 0;
     handle->bp = (void**) pp;
     handle->new_size = (*pp)->dbterm.size;
-    handle->mustResize = 0;
+#if HALFWORD_HEAP
+    handle->abs_vec = NULL;
+#endif
     return 1;
 }
 
 static void db_finalize_dbterm_tree(DbUpdateHandle* handle)
 {
     if (handle->mustResize) {
-	Eterm* top;
-	Eterm copy;
-	DbTerm* newDbTerm;
-	DbTableTree *tb = &handle->tb->tree;
 	TreeDbTerm* oldp = (TreeDbTerm*) *handle->bp;
-	TreeDbTerm* newp = erts_db_alloc(ERTS_ALC_T_DB_TERM,
-					 handle->tb,
-					 sizeof(TreeDbTerm)+sizeof(Eterm)*(handle->new_size-1));
-	memcpy(newp, oldp, sizeof(TreeDbTerm)-sizeof(DbTerm));  /* copy only tree header */
-	*(handle->bp) = newp;
-	reset_static_stack(tb);
-	newDbTerm = &newp->dbterm;
-    
-	newDbTerm->size = handle->new_size;
-	newDbTerm->off_heap.mso = NULL;
-	newDbTerm->off_heap.externals = NULL;
-    #ifndef HYBRID /* FIND ME! */
-	newDbTerm->off_heap.funs = NULL;
-    #endif
-	newDbTerm->off_heap.overhead = 0;
-	
-	/* make a flat copy */
-	top = DBTERM_BUF(newDbTerm);
-	copy = copy_struct(make_tuple(handle->dbterm->tpl),
-			   handle->new_size,
-			   &top, &newDbTerm->off_heap);
-	DBTERM_SET_TPL(newDbTerm,tuple_val(copy));
-    
-	db_free_term_data(handle->dbterm);
-	erts_db_free(ERTS_ALC_T_DB_TERM,
-		     handle->tb,
-		     (void *) (((char *) handle->dbterm) - (sizeof(TreeDbTerm) - sizeof(DbTerm))),
-		     sizeof(TreeDbTerm) + sizeof(Eterm)*(handle->dbterm->size-1));
+
+	db_finalize_resize(handle, offsetof(TreeDbTerm,dbterm));
+	reset_static_stack(&handle->tb->tree);
+
+	free_term(&handle->tb->tree, oldp);
     }
 #ifdef DEBUG
     handle->dbterm = 0;
@@ -2619,7 +2564,7 @@ static void db_finalize_dbterm_tree(DbUpdateHandle* handle)
  */
 static void traverse_backwards(DbTableTree *tb,
 			       DbTreeStack* stack,
-			       Eterm lastkey,
+			       Eterm lastkey, Eterm* lk_base,
 			       int (*doit)(DbTableTree *,
 					   TreeDbTerm *,
 					   void *,
@@ -2628,7 +2573,7 @@ static void traverse_backwards(DbTableTree *tb,
 {
     TreeDbTerm *this, *next;
 
-    if (lastkey == NIL) {
+    if (lastkey == THE_NON_VALUE) {
 	stack->pos = stack->slot = 0;
 	if (( this = tb->root ) == NULL) {
 	    return;
@@ -2638,15 +2583,16 @@ static void traverse_backwards(DbTableTree *tb,
 	    this = this->right;
 	}
 	this = TOP_NODE(stack);
-	next = find_prev(tb, stack, GETKEY(tb, this->dbterm.tpl));
+	next = find_prev(tb, stack, GETKEY(tb, this->dbterm.tpl),
+			 this->dbterm.tpl);
 	if (!((*doit)(tb, this, context, 0)))
 	    return;
     } else {
-	next = find_prev(tb, stack, lastkey);
+	next = find_prev(tb, stack, lastkey, lk_base);
     }
 
     while ((this = next) != NULL) {
-	next = find_prev(tb, stack, GETKEY(tb, this->dbterm.tpl));
+	next = find_prev(tb, stack, GETKEY(tb, this->dbterm.tpl), this->dbterm.tpl);
 	if (!((*doit)(tb, this, context, 0)))
 	    return;
     }
@@ -2657,7 +2603,7 @@ static void traverse_backwards(DbTableTree *tb,
  */
 static void traverse_forward(DbTableTree *tb,
 			     DbTreeStack* stack,
-			     Eterm lastkey,
+			     Eterm lastkey, Eterm* lk_base,
 			     int (*doit)(DbTableTree *,
 					 TreeDbTerm *,
 					 void *,
@@ -2666,7 +2612,7 @@ static void traverse_forward(DbTableTree *tb,
 {
     TreeDbTerm *this, *next;
 
-    if (lastkey == NIL) {
+    if (lastkey == THE_NON_VALUE) {
 	stack->pos = stack->slot = 0;
 	if (( this = tb->root ) == NULL) {
 	    return;
@@ -2676,15 +2622,15 @@ static void traverse_forward(DbTableTree *tb,
 	    this = this->left;
 	}
 	this = TOP_NODE(stack);
-	next = find_next(tb, stack, GETKEY(tb, this->dbterm.tpl));
+	next = find_next(tb, stack, GETKEY(tb, this->dbterm.tpl), this->dbterm.tpl);
 	if (!((*doit)(tb, this, context, 1)))
 	    return;
     } else {
-	next = find_next(tb, stack, lastkey);
+	next = find_next(tb, stack, lastkey, lk_base);
     }
 
     while ((this = next) != NULL) {
-	next = find_next(tb, stack, GETKEY(tb, this->dbterm.tpl));
+	next = find_next(tb, stack, GETKEY(tb, this->dbterm.tpl), this->dbterm.tpl);
 	if (!((*doit)(tb, this, context, 1)))
 	    return;
     }
@@ -2710,7 +2656,7 @@ static int key_given(DbTableTree *tb, Eterm pattern, TreeDbTerm **ret,
 	if (( this = find_node(tb, key) ) == NULL) {
 	    return -1;
 	}
-	*ret = this; 
+	*ret = this;
 	return 1;
     } else if (partly_bound != NULL && key != am_Underscore && 
 	       db_is_variable(key) < 0)
@@ -2721,7 +2667,7 @@ static int key_given(DbTableTree *tb, Eterm pattern, TreeDbTerm **ret,
 
 
 
-static Sint do_cmp_partly_bound(Eterm a, Eterm b, int *done)
+static Sint do_cmp_partly_bound(Eterm a, Eterm b, Eterm* b_base, int *done)
 {
     Eterm* aa;
     Eterm* bb;
@@ -2735,44 +2681,44 @@ static Sint do_cmp_partly_bound(Eterm a, Eterm b, int *done)
 	*done = 1;
 	return 0;
     }
-    if (a == b)
+    if (is_same(a,NULL,b,b_base))
 	return 0;
     
     switch (a & _TAG_PRIMARY_MASK) {
     case TAG_PRIMARY_LIST:
 	if (!is_list(b)) {
-	    return cmp(a,b);
+	    return cmp_rel(a,NULL,b,b_base);
 	}
 	aa = list_val(a);
-	bb = list_val(b);
+	bb = list_val_rel(b,b_base);
 	while (1) {
-	    if ((j = do_cmp_partly_bound(*aa++, *bb++, done)) != 0 || *done) 
+	    if ((j = do_cmp_partly_bound(*aa++, *bb++, b_base, done)) != 0 || *done)
 		return j;
 	    if (*aa==*bb)
 		return 0;
 	    if (is_not_list(*aa) || is_not_list(*bb))
-		return do_cmp_partly_bound(*aa, *bb, done);
+		return do_cmp_partly_bound(*aa, *bb, b_base, done);
 	    aa = list_val(*aa);
-	    bb = list_val(*bb);
+	    bb = list_val_rel(*bb,b_base);
 	}
     case TAG_PRIMARY_BOXED:
 	if ((b & _TAG_PRIMARY_MASK) != TAG_PRIMARY_BOXED) {
-	    return cmp(a,b);
+	    return cmp_rel(a,NULL,b,b_base);
 	}
 	a_hdr = ((*boxed_val(a)) & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE;
-	b_hdr = ((*boxed_val(b)) & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE;
+	b_hdr = ((*boxed_val_rel(b,b_base)) & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE;
 	if (a_hdr != b_hdr) {
-	    return cmp(a, b);
+	    return cmp_rel(a, NULL, b, b_base);
 	}
 	if (a_hdr == (_TAG_HEADER_ARITYVAL >> _TAG_PRIMARY_SIZE)) {
 	    aa = tuple_val(a);
-	    bb = tuple_val(b);
+	    bb = tuple_val_rel(b, b_base);
 	    /* compare the arities */
 	    i = arityval(*aa);	/* get the arity*/
 	    if (i < arityval(*bb)) return(-1);
 	    if (i > arityval(*bb)) return(1);
 	    while (i--) {
-		if ((j = do_cmp_partly_bound(*++aa, *++bb, done)) != 0 
+		if ((j = do_cmp_partly_bound(*++aa, *++bb, b_base, done)) != 0
 		    || *done) 
 		    return j;
 	    }
@@ -2780,14 +2726,14 @@ static Sint do_cmp_partly_bound(Eterm a, Eterm b, int *done)
 	}
 	/* Drop through */
       default:
-	  return cmp(a, b);
+	  return cmp_rel(a, NULL, b, b_base);
     }
 }
 
-static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key) 
+static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key, Eterm* bk_base)
 {
     int done = 0;
-    Sint ret = do_cmp_partly_bound(partly_bound_key, bound_key, &done);
+    Sint ret = do_cmp_partly_bound(partly_bound_key, bound_key, bk_base, &done);
 #ifdef HARDDEBUG
     erts_fprintf(stderr,"\ncmp_partly_bound: %T", partly_bound_key);
     if (ret < 0)
@@ -2796,7 +2742,7 @@ static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key)
 	erts_fprintf(stderr," > ");
     else
 	erts_fprintf(stderr," == ");
-    erts_fprintf(stderr,"%T\n",bound_key);
+    erts_fprintf(stderr,"%T\n",bound_key);  // HALFWORD BUG: printing rterm
 #endif
     return ret;
 }
@@ -2883,7 +2829,7 @@ static int do_partly_bound_can_match_lesser(Eterm a, Eterm b,
 
     if (not_eq_tags(a,b)) {
 	*done = 1;
-	return (cmp(a, b) < 0) ? 1 : 0;
+	return (CMP(a, b) < 0) ? 1 : 0;
     }
 
     /* we now know that tags are the same */
@@ -2919,7 +2865,7 @@ static int do_partly_bound_can_match_lesser(Eterm a, Eterm b,
 	    bb = list_val(*bb);
 	}
     default:
-	if((i = cmp(a, b)) != 0) {
+	if((i = CMP(a, b)) != 0) {
 	    *done = 1;
 	}
 	return (i < 0) ? 1 : 0;
@@ -2954,7 +2900,7 @@ static int do_partly_bound_can_match_greater(Eterm a, Eterm b,
 
     if (not_eq_tags(a,b)) {
 	*done = 1;
-	return (cmp(a, b) > 0) ? 1 : 0;
+	return (CMP(a, b) > 0) ? 1 : 0;
     }
 
     /* we now know that tags are the same */
@@ -2990,7 +2936,7 @@ static int do_partly_bound_can_match_greater(Eterm a, Eterm b,
 	    bb = list_val(*bb);
 	}
     default:
-	if((i = cmp(a, b)) != 0) {
+	if((i = CMP(a, b)) != 0) {
 	    *done = 1;
 	}
 	return (i > 0) ? 1 : 0;
@@ -3006,39 +2952,24 @@ static int doit_select(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 {
     struct select_context *sc = (struct select_context *) ptr;
     Eterm ret;
-    Uint32 dummy;
+    Eterm* hp;
 
     sc->lastobj = this->dbterm.tpl;
     
     if (sc->end_condition != NIL && 
 	((forward && 
 	  cmp_partly_bound(sc->end_condition, 
-			   GETKEY_WITH_POS(sc->keypos, 
-					   this->dbterm.tpl)) < 0) ||
+			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
+			   this->dbterm.tpl) < 0) ||
 	 (!forward && 
 	  cmp_partly_bound(sc->end_condition, 
-			   GETKEY_WITH_POS(sc->keypos, 
-					   this->dbterm.tpl)) > 0))) {
+			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
+			   this->dbterm.tpl) > 0))) {
 	return 0;
     }
-    ret = db_prog_match(sc->p, sc->mp,
-			make_tuple(this->dbterm.tpl), 
-			NULL,0, &dummy);
+    ret = db_match_dbterm(&tb->common,sc->p,sc->mp,sc->all_objects,
+			  &this->dbterm, &hp, 2);
     if (is_value(ret)) {
-	Uint sz;
-	Eterm *hp;
-	if (sc->all_objects) {
-	    hp = HAlloc(sc->p, this->dbterm.size + 2);
-	    ret = copy_shallow(DBTERM_BUF(&this->dbterm),
-				     this->dbterm.size,
-				     &hp,
-			             &MSO(sc->p));
-	} else {
-	    sz = size_object(ret);
-	    hp = HAlloc(sc->p, sz + 2);
-	    ret = copy_struct(ret, sz, 
-			      &hp, &MSO(sc->p));
-	}
 	sc->accum = CONS(hp, ret, sc->accum);
     }
     if (MBUF(sc->p)) {
@@ -3059,20 +2990,18 @@ static int doit_select_count(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 {
     struct select_count_context *sc = (struct select_count_context *) ptr;
     Eterm ret;
-    Uint32 dummy;
 
     sc->lastobj = this->dbterm.tpl;
     
     /* Always backwards traversing */
     if (sc->end_condition != NIL && 
 	(cmp_partly_bound(sc->end_condition, 
-			  GETKEY_WITH_POS(sc->keypos, 
-					  this->dbterm.tpl)) > 0)) {
+			  GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
+			  this->dbterm.tpl) > 0)) {
 	return 0;
     }
-    ret = db_prog_match(sc->p, sc->mp,
-			make_tuple(this->dbterm.tpl), 
-			NULL,0, &dummy);
+    ret = db_match_dbterm(&tb->common, sc->p, sc->mp, 0,
+			  &this->dbterm, NULL, 0);
     if (ret == am_true) {
 	++(sc->got);
     }
@@ -3087,41 +3016,26 @@ static int doit_select_chunk(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 {
     struct select_context *sc = (struct select_context *) ptr;
     Eterm ret;
-    Uint32 dummy;
+    Eterm* hp;
 
     sc->lastobj = this->dbterm.tpl;
     
     if (sc->end_condition != NIL && 
 	((forward && 
 	  cmp_partly_bound(sc->end_condition, 
-			   GETKEY_WITH_POS(sc->keypos, 
-					   this->dbterm.tpl)) < 0) ||
+			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
+			   this->dbterm.tpl) < 0) ||
 	 (!forward && 
 	  cmp_partly_bound(sc->end_condition, 
-			   GETKEY_WITH_POS(sc->keypos, 
-					   this->dbterm.tpl)) > 0))) {
+			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
+			   this->dbterm.tpl) > 0))) {
 	return 0;
     }
 
-    ret = db_prog_match(sc->p, sc->mp,
-			make_tuple(this->dbterm.tpl), 
-			NULL,0, &dummy);
+    ret = db_match_dbterm(&tb->common, sc->p, sc->mp, sc->all_objects,
+			  &this->dbterm, &hp, 2);
     if (is_value(ret)) {
-	Uint sz;
-	Eterm *hp;
-
 	++(sc->got);
-	if (sc->all_objects) {
-	    hp = HAlloc(sc->p, this->dbterm.size + 2);
-	    ret = copy_shallow(DBTERM_BUF(&this->dbterm),
-				     this->dbterm.size,
-				     &hp,
-			             &MSO(sc->p));
-	} else {
-	    sz = size_object(ret);
-	    hp = HAlloc(sc->p, sz + 2);
-	    ret = copy_struct(ret, sz, &hp, &MSO(sc->p));
-	}
 	sc->accum = CONS(hp, ret, sc->accum);
     }
     if (MBUF(sc->p)) {
@@ -3143,7 +3057,6 @@ static int doit_select_delete(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 {
     struct select_delete_context *sc = (struct select_delete_context *) ptr;
     Eterm ret;
-    Uint32 dummy;
     Eterm key;
 
     if (sc->erase_lastterm)
@@ -3153,15 +3066,14 @@ static int doit_select_delete(DbTableTree *tb, TreeDbTerm *this, void *ptr,
     
     if (sc->end_condition != NIL && 
 	cmp_partly_bound(sc->end_condition, 
-			 GETKEY_WITH_POS(sc->keypos, 
-					 this->dbterm.tpl)) > 0)
+			 GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
+			 this->dbterm.tpl) > 0)
 	return 0;
-    ret = db_prog_match(sc->p, sc->mp,
-			make_tuple(this->dbterm.tpl), 
-			NULL,0, &dummy);
+    ret = db_match_dbterm(&tb->common, sc->p, sc->mp, 0,
+			  &this->dbterm, NULL, 0);
     if (ret == am_true) {
 	key = GETKEY(sc->tb, this->dbterm.tpl);
-	linkout_tree(sc->tb, key);
+	linkout_tree(sc->tb, key, this->dbterm.tpl);
 	sc->erase_lastterm = 1;
 	++sc->accum;
     }
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index 93a47eb76f..d3e31da413 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2011. 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
@@ -25,7 +25,6 @@
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
-
 #include "sys.h"
 #include "erl_vm.h"
 #include "global.h"
@@ -58,6 +57,7 @@
 DBIF_TABLE_GUARD | DBIF_TABLE_BODY | DBIF_TRACE_GUARD | DBIF_TRACE_BODY
 
 
+#define HEAP_XTRA 100
 
 /*
 ** Some convenience macros for stacks (DMC == db_match_compile)
@@ -230,6 +230,11 @@ typedef enum {
     matchCall2,
     matchCall3,
     matchPushV,
+#if HALFWORD_HEAP
+    matchPushVGuard,    /* First guard-only variable reference */
+#endif
+    matchPushVResult, /* First variable reference in result, or (if HALFWORD)
+                         in guard if also referenced in result */
     matchPushExpr, /* Push the whole expression we're matching ('$_') */
     matchPushArrayAsList, /* Only when parameter is an Array and 
 			     not an erlang term  (DCOMP_TRACE) */
@@ -293,11 +298,19 @@ DMC_DECLARE_STACK_TYPE(unsigned);
 ** Data about the heap during compilation
 */
 
+typedef struct DMCVariable {
+    int is_bound;
+    int is_in_body;
+#if HALFWORD_HEAP
+    int first_guard_label;  /* to maybe change from PushVGuard to PushVResult */
+#endif
+} DMCVariable;
+
 typedef struct DMCHeap {
     int size;
-    unsigned def[DMC_DEFAULT_SIZE];
-    unsigned *data;
-    int used;
+    DMCVariable vars_def[DMC_DEFAULT_SIZE];
+    DMCVariable* vars;
+    int vars_used;
 } DMCHeap;
 
 /*
@@ -324,7 +337,6 @@ typedef struct dmc_context {
     Eterm *bodyexpr;
     int num_match;
     int current_match;
-    int eheap_need;
     Uint cflags;
     int is_guard; /* 1 if in guard, 0 if in body */
     int special; /* 1 if the head in the match was a single expression */ 
@@ -347,9 +359,22 @@ typedef struct dmc_context {
 
 #define ERTS_DEFAULT_MS_HEAP_SIZE 128
 
+/* Runtime info about a $-variable
+*/
+typedef struct MatchVariable {
+    Eterm term;
+#ifdef DEBUG
+    Process* proc;
+    Eterm* base;
+#endif
+} MatchVariable;
+
 typedef struct {
     Process process;
-    Eterm *heap;
+    union {
+	Eterm* heap;
+	MatchVariable* variables;   /* first on "heap" */
+    }u;
     Eterm default_heap[ERTS_DEFAULT_MS_HEAP_SIZE];
 } ErtsMatchPseudoProcess;
 
@@ -363,12 +388,7 @@ static ErtsMatchPseudoProcess *match_pseudo_process;
 static ERTS_INLINE void
 cleanup_match_pseudo_process(ErtsMatchPseudoProcess *mpsp, int keep_heap)
 {
-    if (mpsp->process.mbuf
-	|| mpsp->process.off_heap.mso
-#ifndef HYBRID /* FIND ME! */
-	|| mpsp->process.off_heap.funs
-#endif
-	|| mpsp->process.off_heap.externals) {
+    if (mpsp->process.mbuf || mpsp->process.off_heap.first) {
 	erts_cleanup_empty_process(&mpsp->process);
     }
 #ifdef DEBUG
@@ -377,10 +397,10 @@ cleanup_match_pseudo_process(ErtsMatchPseudoProcess *mpsp, int keep_heap)
     }
 #endif
     if (!keep_heap) {
-	if (mpsp->heap != &mpsp->default_heap[0]) {
+	if (mpsp->u.heap != mpsp->default_heap) {
 	    /* Have to be done *after* call to erts_cleanup_empty_process() */
-	    erts_free(ERTS_ALC_T_DB_MS_RUN_HEAP, (void *) mpsp->heap);
-	    mpsp->heap = &mpsp->default_heap[0];
+	    erts_free(ERTS_ALC_T_DB_MS_RUN_HEAP, (void *) mpsp->u.heap);
+	    mpsp->u.heap = mpsp->default_heap;
 	}
 #ifdef DEBUG
 	else {
@@ -404,7 +424,7 @@ create_match_pseudo_process(void)
     mpsp = (ErtsMatchPseudoProcess *)erts_alloc(ERTS_ALC_T_DB_MS_PSDO_PROC,
 						sizeof(ErtsMatchPseudoProcess));
     erts_init_empty_process(&mpsp->process);
-    mpsp->heap = &mpsp->default_heap[0];
+    mpsp->u.heap = mpsp->default_heap;
     return mpsp;
 }
 
@@ -428,11 +448,11 @@ get_match_pseudo_process(Process *c_p, Uint heap_size)
     mpsp = match_pseudo_process;
     cleanup_match_pseudo_process(mpsp, 0);
 #endif
-    if (heap_size > ERTS_DEFAULT_MS_HEAP_SIZE)
-	mpsp->heap = (Eterm *) erts_alloc(ERTS_ALC_T_DB_MS_RUN_HEAP,
-					  heap_size*sizeof(Uint));
+    if (heap_size > ERTS_DEFAULT_MS_HEAP_SIZE*sizeof(Eterm)) {
+	mpsp->u.heap = (Eterm*) erts_alloc(ERTS_ALC_T_DB_MS_RUN_HEAP, heap_size);
+    }
     else {
-	ASSERT(mpsp->heap == &mpsp->default_heap[0]);
+	ASSERT(mpsp->u.heap == mpsp->default_heap);
     }
     return mpsp;
 }
@@ -473,23 +493,6 @@ erts_match_set_release_result(Process* c_p)
 
 static erts_smp_atomic_t trace_control_word;
 
-
-Eterm
-erts_ets_copy_object(Eterm obj, Process* to)
-{
-    Uint size = size_object(obj);
-    Eterm* hp = HAlloc(to, size);
-    Eterm res;
-
-    res = copy_struct(obj, size, &hp, &MSO(to));
-#ifdef DEBUG
-    if (eq(obj, res) == 0) {
-	erl_exit(1, "copy not equal to source\n");
-    }
-#endif
-    return res;
-}
-
 /* This needs to be here, before the bif table... */
 
 static Eterm db_set_trace_control_word_fake_1(Process *p, Eterm val);
@@ -875,9 +878,9 @@ static DMCRet dmc_one_term(DMCContext *context,
 
 #ifdef DMC_DEBUG
 static int test_disassemble_next = 0;
-static void db_match_dis(Binary *prog);
+void db_match_dis(Binary *prog);
 #define TRACE erts_fprintf(stderr,"Trace: %s:%d\n",__FILE__,__LINE__)
-#define FENCE_PATTERN_SIZE 1
+#define FENCE_PATTERN_SIZE (1*sizeof(Uint))
 #define FENCE_PATTERN 0xDEADBEEFUL
 #else
 #define TRACE /* Nothing */
@@ -895,6 +898,8 @@ static Eterm match_spec_test(Process *p, Eterm against, Eterm spec, int trace);
 
 static Eterm seq_trace_fake(Process *p, Eterm arg1);
 
+static void db_free_tmp_uncompressed(DbTerm* obj);
+
 
 /*
 ** Interface routines.
@@ -919,7 +924,7 @@ BIF_RETTYPE db_set_trace_control_word_1(Process *p, Eterm new)
     if (val != ((Uint32)val))
 	BIF_ERROR(p, BADARG);
     
-    old_tcw = (Uint32) erts_smp_atomic_xchg(&trace_control_word, (long) val);
+    old_tcw = (Uint32) erts_smp_atomic_xchg(&trace_control_word, (erts_aint_t) val);
     BIF_RET(erts_make_integer((Uint) old_tcw, p));
 }
 
@@ -1183,14 +1188,14 @@ done:
 }
     
 Eterm erts_match_set_run(Process *p, Binary *mpsp, 
-			 Eterm *args, int num_args, 
+			 Eterm *args, int num_args,
+			 enum erts_pam_run_flags in_flags,
 			 Uint32 *return_flags) 
 {
     Eterm ret;
 
-    ret = db_prog_match(p, mpsp,
-			NIL, args,
-			num_args, return_flags);
+    ret = db_prog_match(p, mpsp, NIL, NULL, args, num_args,
+			in_flags, return_flags);
 #if defined(HARDDEBUG)
     if (is_non_value(ret)) {
 	erts_fprintf(stderr, "Failed\n");
@@ -1214,9 +1219,9 @@ static Eterm erts_match_set_run_ets(Process *p, Binary *mpsp,
 {
     Eterm ret;
 
-    ret = db_prog_match(p, mpsp,
-			args, NULL,
-			num_args, return_flags);
+    ret = db_prog_match(p, mpsp, args, NULL, NULL, num_args,
+			ERTS_PAM_CONTIGUOUS_TUPLE | ERTS_PAM_COPY_RESULT,
+			return_flags);
 #if defined(HARDDEBUG)
     if (is_non_value(ret)) {
 	erts_fprintf(stderr, "Failed\n");
@@ -1284,7 +1289,6 @@ Binary *db_match_compile(Eterm *matchexpr,
     int structure_checked;
     DMCRet res;
     int current_try_label;
-    Uint max_eheap_need;
     Binary *bp = NULL;
     unsigned clause_start;
 
@@ -1297,27 +1301,24 @@ Binary *db_match_compile(Eterm *matchexpr,
     context.matchexpr = matchexpr;
     context.guardexpr = guards;
     context.bodyexpr = body;
-    context.eheap_need = 0;
     context.err_info = err_info;
     context.cflags = flags;
 
     heap.size = DMC_DEFAULT_SIZE;
-    heap.data = heap.def;
+    heap.vars = heap.vars_def;
 
     /*
     ** Compile the match expression
     */
 restart:
-    heap.used = 0;
-    max_eheap_need = 0;
+    heap.vars_used = 0;
     for (context.current_match = 0; 
 	 context.current_match < num_progs; 
 	 ++context.current_match) { /* This loop is long, 
 				       too long */
-	memset(heap.data, 0, heap.size * sizeof(*heap.data));
+	memset(heap.vars, 0, heap.size * sizeof(*heap.vars));
 	t = context.matchexpr[context.current_match];
 	context.stack_used = 0;
-	context.eheap_need = 0;
 	structure_checked = 0;
 	if (context.current_match < num_progs - 1) {
 	    DMC_PUSH(text,matchTryMeElse);
@@ -1489,10 +1490,6 @@ restart:
 	if (current_try_label >= 0) {
 	    DMC_POKE(text, current_try_label, DMC_STACK_NUM(text));
 	}
-	/* So, how much eheap did this part of the match program need? */
-	if (context.eheap_need > max_eheap_need) {
-	    max_eheap_need = context.eheap_need;
-	}
     } /* for (context.current_match = 0 ...) */
 
 
@@ -1528,16 +1525,13 @@ restart:
     ret->saved_program_buf = NULL;
     ret->saved_program = NIL;
     ret->term_save = context.save;
-    ret->num_bindings = heap.used;
+    ret->num_bindings = heap.vars_used;
     ret->single_variable = context.special;
     sys_memcpy(ret->text, DMC_STACK_DATA(text), 
 	       DMC_STACK_NUM(text) * sizeof(UWord));
-    ret->heap_size = ((heap.used * sizeof(Eterm)) +
-		      (max_eheap_need * sizeof(Eterm)) +
-		      (context.stack_need * sizeof(Eterm *)) +
-		      (3 * (FENCE_PATTERN_SIZE * sizeof(Eterm *))));
-    ret->eheap_offset = heap.used + FENCE_PATTERN_SIZE;
-    ret->stack_offset = ret->eheap_offset + max_eheap_need + FENCE_PATTERN_SIZE;
+    ret->stack_offset = heap.vars_used*sizeof(MatchVariable) + FENCE_PATTERN_SIZE;
+    ret->heap_size = ret->stack_offset + context.stack_need * sizeof(Eterm*) + FENCE_PATTERN_SIZE;
+
 #ifdef DMC_DEBUG
     ret->prog_end = ret->text + DMC_STACK_NUM(text);
 #endif
@@ -1555,8 +1549,8 @@ error: /* Here is were we land when compilation failed. */
     DMC_FREE(text);
     if (context.copy != NULL) 
 	free_message_buffer(context.copy);
-    if (heap.data != heap.def)
-	erts_free(ERTS_ALC_T_DB_MS_CMPL_HEAP, (void *) heap.data);
+    if (heap.vars != heap.vars_def)
+	erts_free(ERTS_ALC_T_DB_MS_CMPL_HEAP, (void *) heap.vars);
     return bp;
 }
 
@@ -1601,7 +1595,7 @@ erts_match_prog_foreach_offheap(Binary *bprog,
 */
 static Eterm dpm_array_to_list(Process *psp, Eterm *arr, int arity)
 {
-    Eterm *hp = HAlloc(psp, arity * 2);
+    Eterm *hp = HAllocX(psp, arity * 2, HEAP_XTRA);
     Eterm ret = NIL;
     while (--arity >= 0) {
 	ret = CONS(hp, arr[arity], ret);
@@ -1609,15 +1603,83 @@ static Eterm dpm_array_to_list(Process *psp, Eterm *arr, int arity)
     }
     return ret;
 }
+
+
+#if HALFWORD_HEAP
+struct heap_checkpoint_t
+{
+    Process *p;
+    Eterm* htop;
+    ErlHeapFragment* mbuf;
+    unsigned used_size;
+    ErlOffHeap off_heap;
+};
+
+static void heap_checkpoint_init(Process* p, struct heap_checkpoint_t* hcp)
+{
+    hcp->p = p;
+    hcp->htop = HEAP_TOP(p);
+    hcp->mbuf = MBUF(p);
+    hcp->used_size = hcp->mbuf ? hcp->mbuf->used_size : 0;
+    hcp->off_heap = MSO(p);
+}
+
+static void heap_checkpoint_revert(struct heap_checkpoint_t* hcp)
+{
+    struct erl_off_heap_header* oh = MSO(hcp->p).first;
+
+    if (oh != hcp->off_heap.first) {
+	ASSERT(oh != NULL);
+	if (hcp->off_heap.first) {
+	    while (oh->next != hcp->off_heap.first) {
+		oh = oh->next;
+	    }
+	    oh->next = NULL;
+	}
+	erts_cleanup_offheap(&MSO(hcp->p));
+	MSO(hcp->p) = hcp->off_heap;
+    }
+    if (MBUF(hcp->p) != hcp->mbuf) {
+	ErlHeapFragment* hf = MBUF(hcp->p);
+	ASSERT(hf != NULL);
+	if (hcp->mbuf) {
+	    while (hf->next != hcp->mbuf) {
+		hf = hf->next;
+	    }
+	    hf->next = NULL;
+	}
+	free_message_buffer(MBUF(hcp->p));
+	MBUF(hcp->p) = hcp->mbuf;
+    }
+    if (hcp->mbuf != NULL && hcp->mbuf->used_size != hcp->used_size) {
+	hcp->mbuf->used_size = hcp->used_size;
+    }
+    HEAP_TOP(hcp->p) = hcp->htop;
+}
+#endif /* HALFWORD_HEAP */
+
+static ERTS_INLINE Eterm copy_object_rel(Process* p, Eterm term, Eterm* base)
+{
+    if (!is_immed(term)) {
+	Uint sz = size_object_rel(term, base);
+	Eterm* top = HAllocX(p, sz, HEAP_XTRA);
+	return copy_struct_rel(term, sz, &top, &MSO(p), base, NULL);
+    }
+    return term;
+}
+
+
 /*
 ** Execution of the match program, this is Pam.
 ** May return THE_NON_VALUE, which is a bailout.
-** the para meter 'arity' is only used if 'term' is actually an array,
+** the parameter 'arity' is only used if 'term' is actually an array,
 ** i.e. 'DCOMP_TRACE' was specified 
 */
-Eterm db_prog_match(Process *c_p, Binary *bprog, Eterm term, 
+Eterm db_prog_match(Process *c_p, Binary *bprog,
+		    Eterm term, Eterm* base,
 		    Eterm *termp,
 		    int arity,
+		    enum erts_pam_run_flags in_flags,
 		    Uint32 *return_flags)
 {
     MatchProg *prog = Binary2MatchProg(bprog);
@@ -1626,7 +1688,7 @@ Eterm db_prog_match(Process *c_p, Binary *bprog, Eterm term,
     Eterm t;
     Eterm **sp;
     Eterm *esp;
-    Eterm *hp;
+    MatchVariable* variables;
     BeamInstr *cp;
     UWord *pc = prog->text;
     Eterm *ehp;
@@ -1636,19 +1698,24 @@ Eterm db_prog_match(Process *c_p, Binary *bprog, Eterm term,
     unsigned do_catch;
     ErtsMatchPseudoProcess *mpsp;
     Process *psp;
+    Process* build_proc;
     Process *tmpp;
     Process *current_scheduled;
     ErtsSchedulerData *esdp;
     Eterm (*bif)(Process*, ...);
     int fail_label;
     int atomic_trace;
+#if HALFWORD_HEAP
+    struct heap_checkpoint_t c_p_checkpoint = {};
+#endif
 #ifdef DMC_DEBUG
     Uint *heap_fence;
-    Uint *eheap_fence;
     Uint *stack_fence;
     Uint save_op;
 #endif /* DMC_DEBUG */
 
+    ASSERT(base==NULL || HALFWORD_HEAP);
+
     mpsp = get_match_pseudo_process(c_p, prog->heap_size);
     psp = &mpsp->process;
 
@@ -1658,7 +1725,6 @@ Eterm db_prog_match(Process *c_p, Binary *bprog, Eterm term,
     esdp = ERTS_GET_SCHEDULER_DATA_FROM_PROC(c_p);
     ASSERT(esdp != NULL);
     current_scheduled = esdp->current_process;
-    esdp->current_process = psp;
     /* SMP: psp->scheduler_data is set by get_match_pseudo_process */
 
     atomic_trace = 0;
@@ -1681,11 +1747,9 @@ Eterm db_prog_match(Process *c_p, Binary *bprog, Eterm term,
 
 #ifdef DMC_DEBUG
     save_op = 0;
-    heap_fence =  (Uint *) mpsp->heap + prog->eheap_offset - 1;
-    eheap_fence = (Uint *) mpsp->heap + prog->stack_offset - 1;
-    stack_fence = (Uint *) mpsp->heap + prog->heap_size - 1;
+    heap_fence = (Eterm*)((char*) mpsp->u.heap + prog->stack_offset) - 1;
+    stack_fence = (Eterm*)((char*) mpsp->u.heap + prog->heap_size) - 1;
     *heap_fence = FENCE_PATTERN;
-    *eheap_fence = FENCE_PATTERN;
     *stack_fence = FENCE_PATTERN;
 #endif /* DMC_DEBUG */
 
@@ -1699,36 +1763,48 @@ Eterm db_prog_match(Process *c_p, Binary *bprog, Eterm term,
 
     *return_flags = 0U;
 
+    variables = mpsp->u.variables;
+#if HALFWORD_HEAP
+    c_p_checkpoint.p = NULL;
+#endif
+
 restart:
     ep = &term;
-    esp = mpsp->heap + prog->stack_offset;
+    esp = (Eterm*)((char*)mpsp->u.heap + prog->stack_offset);
     sp = (Eterm **) esp;
-    hp = mpsp->heap;
-    ehp = mpsp->heap + prog->eheap_offset;
     ret = am_true;
     do_catch = 0;
     fail_label = -1;
+    build_proc = psp;
+    esdp->current_process = psp;
+    ASSERT_HALFWORD(!c_p_checkpoint.p);
+
+#ifdef DEBUG
+    ASSERT(variables == mpsp->u.variables);
+    for (i=0; i<prog->num_bindings; i++) {
+	variables[i].term = THE_NON_VALUE;
+	variables[i].proc = NULL;
+	variables[i].base = base;
+    }
+#endif
 
     for (;;) {
-#ifdef DMC_DEBUG
+
+    #ifdef DMC_DEBUG
 	if (*heap_fence != FENCE_PATTERN) {
 	    erl_exit(1, "Heap fence overwritten in db_prog_match after op "
 		     "0x%08x, overwritten with 0x%08x.", save_op, *heap_fence);
 	}
-	if (*eheap_fence != FENCE_PATTERN) {
-	    erl_exit(1, "Eheap fence overwritten in db_prog_match after op "
-		     "0x%08x, overwritten with 0x%08x.", save_op, 
-		     *eheap_fence);
-	}
 	if (*stack_fence != FENCE_PATTERN) {
 	    erl_exit(1, "Stack fence overwritten in db_prog_match after op "
 		     "0x%08x, overwritten with 0x%08x.", save_op, 
 		     *stack_fence);
 	}
 	save_op = *pc;
-#endif
+    #endif
 	switch (*pc++) {
 	case matchTryMeElse:
+	    ASSERT(fail_label == -1);
 	    fail_label = *pc++;
 	    break;
 	case matchArray: /* only when DCOMP_TRACE, is always first
@@ -1738,15 +1814,15 @@ restart:
 		FAIL();
 	    ep = termp;
 	    break;
-	case matchArrayBind: /* When the array size is unknown. */ /* XXX:PaN - where does
-								      this array come from? */
+	case matchArrayBind: /* When the array size is unknown. */
+	    ASSERT(termp);
 	    n = *pc++;
-	    hp[n] = dpm_array_to_list(psp, termp, arity);
+	    variables[n].term = dpm_array_to_list(psp, termp, arity);
 	    break;
 	case matchTuple: /* *ep is a tuple of arity n */
-	    if (!is_tuple(*ep))
+	    if (!is_tuple_rel(*ep,base))
 		FAIL();
-	    ep = tuple_val(*ep);
+	    ep = tuple_val_rel(*ep,base);
 	    n = *pc++;
 	    if (arityval(*ep) != n)
 		FAIL();
@@ -1754,9 +1830,9 @@ restart:
 	    break;
 	case matchPushT: /* *ep is a tuple of arity n, 
 			    push ptr to first element */
-	    if (!is_tuple(*ep))
+	    if (!is_tuple_rel(*ep,base))
 		FAIL();
-	    tp = tuple_val(*ep);
+	    tp = tuple_val_rel(*ep,base);
 	    n = *pc++;
 	    if (arityval(*tp) != n)
 		FAIL();
@@ -1766,12 +1842,12 @@ restart:
 	case matchList:
 	    if (!is_list(*ep))
 		FAIL();
-	    ep = list_val(*ep);
+	    ep = list_val_rel(*ep,base);
 	    break;
 	case matchPushL:
 	    if (!is_list(*ep))
 		FAIL();
-	    *sp++ = list_val(*ep);
+	    *sp++ = list_val_rel(*ep,base);
 	    ++ep;
 	    break;
 	case matchPop:
@@ -1779,41 +1855,44 @@ restart:
 	    break;
 	case matchBind:
 	    n = *pc++;
-	    hp[n] = *ep++;
+	    variables[n].term = *ep++;
 	    break;
 	case matchCmp:
 	    n = *pc++;
-	    if (!eq(hp[n],*ep))
+	    if (!eq_rel(variables[n].term, base, *ep, base))
 		FAIL();
 	    ++ep;
 	    break;
 	case matchEqBin:
 	    t = (Eterm) *pc++;
-	    if (!eq(*ep,t))
+	    if (!eq_rel(t,NULL,*ep,base))
 		FAIL();
 	    ++ep;
 	    break;
 	case matchEqFloat:
-	    if (!is_float(*ep))
+	    if (!is_float_rel(*ep,base))
 		FAIL();
-	    if (memcmp(float_val(*ep) + 1, pc, sizeof(double)))
+	    if (memcmp(float_val_rel(*ep,base) + 1, pc, sizeof(double)))
 		FAIL();
 	    pc += TermWords(2);
 	    ++ep;
 	    break;
-	case matchEqRef:
-	    if (!is_ref(*ep))
+	case matchEqRef: {
+	    Eterm* epc = (Eterm*)pc;
+	    if (!is_ref_rel(*ep,base))
 		FAIL();
-	    if (!eq(*ep, make_internal_ref((Uint *) pc)))
+	    if (!eq_rel(make_internal_ref_rel(epc, epc), epc, *ep, base)) {
 		FAIL();
-	    i = thing_arityval(*((Uint *) pc));
+	    }
+	    i = thing_arityval(*epc);
 	    pc += TermWords(i+1);
 	    ++ep;
 	    break;
+	}
 	case matchEqBig:
-	    if (!is_big(*ep))
+	    if (!is_big_rel(*ep,base))
 		FAIL();
-	    tp = big_val(*ep);
+	    tp = big_val_rel(*ep,base);
 	    {
 		Eterm *epc = (Eterm *) pc;
 		if (*tp != *epc)
@@ -1829,7 +1908,8 @@ restart:
 	    ++ep;
 	    break;
 	case matchEq:
-	    t = (Eterm) *pc++; 
+	    t = (Eterm) *pc++;
+	    ASSERT(is_immed(t));
 	    if (t != *ep++)
 		FAIL();
 	    break;
@@ -1837,25 +1917,32 @@ restart:
 	    ++ep;
 	    break;
 	/* 
-	 * Here comes guard instructions 
+	 * Here comes guard & body instructions
 	 */
 	case matchPushC: /* Push constant */
-	    *esp++ = *pc++;
+	    if ((in_flags & ERTS_PAM_COPY_RESULT)
+		&& do_catch && !is_immed(*pc)) {
+		*esp++ = copy_object(*pc++, c_p);
+	    }
+	    else {
+		*esp++ = *pc++;
+	    }
 	    break;
 	case matchConsA:
-	    ehp[1] = *--esp;
-	    ehp[0] = esp[-1];
+	    ehp = HAllocX(build_proc, 2, HEAP_XTRA);
+	    CDR(ehp) = *--esp;
+	    CAR(ehp) = esp[-1];
 	    esp[-1] = make_list(ehp);
-	    ehp += 2;
 	    break;
 	case matchConsB:
-	    ehp[0] = *--esp;
-	    ehp[1] = esp[-1];
+	    ehp = HAllocX(build_proc, 2, HEAP_XTRA);
+	    CAR(ehp) = *--esp;
+	    CDR(ehp) = esp[-1];
 	    esp[-1] = make_list(ehp);
-	    ehp += 2;
 	    break;
 	case matchMkTuple:
 	    n = *pc++;
+	    ehp = HAllocX(build_proc, n+1, HEAP_XTRA);
 	    t = make_tuple(ehp);
 	    *ehp++ = make_arityval(n);
 	    while (n--) {
@@ -1865,7 +1952,7 @@ restart:
 	    break;
 	case matchCall0:
 	    bif = (Eterm (*)(Process*, ...)) *pc++;
-	    t = (*bif)(psp);
+	    t = (*bif)(build_proc);
 	    if (is_non_value(t)) {
 		if (do_catch)
 		    t = FAIL_TERM;
@@ -1876,7 +1963,7 @@ restart:
 	    break;
 	case matchCall1:
 	    bif = (Eterm (*)(Process*, ...)) *pc++;
-	    t = (*bif)(psp, esp[-1]);
+	    t = (*bif)(build_proc, esp[-1]);
 	    if (is_non_value(t)) {
 		if (do_catch)
 		    t = FAIL_TERM;
@@ -1887,7 +1974,7 @@ restart:
 	    break;
 	case matchCall2:
 	    bif = (Eterm (*)(Process*, ...)) *pc++;
-	    t = (*bif)(psp, esp[-1], esp[-2]);
+	    t = (*bif)(build_proc, esp[-1], esp[-2]);
 	    if (is_non_value(t)) {
 		if (do_catch)
 		    t = FAIL_TERM;
@@ -1899,7 +1986,7 @@ restart:
 	    break;
 	case matchCall3:
 	    bif = (Eterm (*)(Process*, ...)) *pc++;
-	    t = (*bif)(psp, esp[-1], esp[-2], esp[-3]);
+	    t = (*bif)(build_proc, esp[-1], esp[-2], esp[-3]);
 	    if (is_non_value(t)) {
 		if (do_catch)
 		    t = FAIL_TERM;
@@ -1909,15 +1996,73 @@ restart:
 	    esp -= 2;
 	    esp[-1] = t;
 	    break;
+
+	#if HALFWORD_HEAP
+	case matchPushVGuard:
+	    if (!base) goto case_matchPushV;
+	    /* Build NULL-based copy on pseudo heap for easy disposal */
+	    n = *pc++;
+	    ASSERT(is_value(variables[n].term));
+	    ASSERT(!variables[n].proc);
+	    variables[n].term = copy_object_rel(psp, variables[n].term, base);
+	    *esp++ = variables[n].term;
+	    #ifdef DEBUG
+	    variables[n].proc = psp;
+	    variables[n].base = NULL;
+	    #endif
+	    break;
+	#endif
+	case matchPushVResult:
+	    if (!(in_flags & ERTS_PAM_COPY_RESULT)) goto case_matchPushV;
+
+	    /* Build (NULL-based) copy on callers heap */
+	#if HALFWORD_HEAP
+	    if (!do_catch && !c_p_checkpoint.p) {
+		heap_checkpoint_init(c_p, &c_p_checkpoint);
+	    }
+        #endif
+	    n = *pc++;
+	    ASSERT(is_value(variables[n].term));
+	    ASSERT(!variables[n].proc);
+	    variables[n].term = copy_object_rel(c_p, variables[n].term, base);
+	    *esp++ = variables[n].term;
+	    #ifdef DEBUG
+	    variables[n].proc = c_p;
+	    variables[n].base = NULL;
+	    #endif
+	    break;
 	case matchPushV:
-	    *esp++ = hp[*pc++];
+	case_matchPushV:
+	    n = *pc++;
+	    ASSERT(is_value(variables[n].term));
+	    ASSERT(!variables[n].base);
+	    *esp++ = variables[n].term;
 	    break;
 	case matchPushExpr:
-	    *esp++ = term;
+	    if (in_flags & ERTS_PAM_COPY_RESULT) {
+		Uint sz;
+		Eterm* top;
+		sz = size_object_rel(term, base);
+		top = HAllocX(build_proc, sz, HEAP_XTRA);
+		if (in_flags & ERTS_PAM_CONTIGUOUS_TUPLE) {
+		    ASSERT(is_tuple_rel(term,base));
+		    *esp++ = copy_shallow_rel(tuple_val_rel(term,base), sz,
+					      &top, &MSO(build_proc), base);
+		}
+		else {
+		    *esp++ = copy_struct_rel(term, sz, &top, &MSO(build_proc),
+					     base, NULL);
+		}
+	    }
+	    else {
+		*esp = term;
+	    }
 	    break;
 	case matchPushArrayAsList:
+	    ASSERT_HALFWORD(base == NULL);
 	    n = arity; /* Only happens when 'term' is an array */
 	    tp = termp;
+	    ehp = HAllocX(build_proc, n*2, HEAP_XTRA);
 	    *esp++  = make_list(ehp);
 	    while (n--) {
 		*ehp++ = *tp++;
@@ -1930,7 +2075,8 @@ restart:
 	    break;
 	case matchPushArrayAsListU:
 	    /* This instruction is NOT efficient. */
-	    *esp++  = dpm_array_to_list(psp, termp, arity);
+	    ASSERT_HALFWORD(base == NULL);
+	    *esp++  = dpm_array_to_list(build_proc, termp, arity);
 	    break;
 	case matchTrue:
 	    if (*--esp != am_true)
@@ -2016,7 +2162,7 @@ restart:
 	case matchProcessDump: {
 	    erts_dsprintf_buf_t *dsbufp = erts_create_tmp_dsbuf(0);
 	    print_process_info(ERTS_PRINT_DSBUF, (void *) dsbufp, c_p);
-	    *esp++ = new_binary(psp, (byte *)dsbufp->str, (int)dsbufp->str_len);
+	    *esp++ = new_binary(build_proc, (byte *)dsbufp->str, (int)dsbufp->str_len);
 	    erts_destroy_tmp_dsbuf(dsbufp);
 	    break;
 	}
@@ -2060,29 +2206,24 @@ restart:
 	    if (SEQ_TRACE_TOKEN(c_p) == NIL) 
 		*esp++ = NIL;
 	    else {
+		Eterm sender = SEQ_TRACE_TOKEN_SENDER(c_p);
+		Uint sender_sz = is_immed(sender) ? 0 : size_object(sender);
+		ehp = HAllocX(build_proc, 6 + sender_sz, HEAP_XTRA);
+		if (sender_sz) {
+		    sender = copy_struct(sender, sender_sz, &ehp, &MSO(build_proc));
+		}
  		*esp++ = make_tuple(ehp);
  		ehp[0] = make_arityval(5);
  		ehp[1] = SEQ_TRACE_TOKEN_FLAGS(c_p);
  		ehp[2] = SEQ_TRACE_TOKEN_LABEL(c_p);
  		ehp[3] = SEQ_TRACE_TOKEN_SERIAL(c_p);
- 		ehp[4] = SEQ_TRACE_TOKEN_SENDER(c_p);
+		ehp[4] = sender;
  		ehp[5] = SEQ_TRACE_TOKEN_LASTCNT(c_p);
 		ASSERT(SEQ_TRACE_TOKEN_ARITY(c_p) == 5);
 		ASSERT(is_immed(ehp[1]));
 		ASSERT(is_immed(ehp[2]));
 		ASSERT(is_immed(ehp[3]));
 		ASSERT(is_immed(ehp[5]));
-		if(!is_immed(ehp[4])) {
-		    Eterm *sender = &ehp[4];
-		    ehp += 6;
-		    *sender = copy_struct(*sender,
-					  size_object(*sender),
-					  &ehp,
-					  &MSO(psp));
-		}
-		else
-		    ehp += 6;
-
 	    } 
 	    break;
 	case matchEnableTrace:
@@ -2131,12 +2272,12 @@ restart:
 	    if (!(c_p->cp) || !(cp = find_function_from_pc(c_p->cp))) {
  		*esp++ = am_undefined;
  	    } else {
+		ehp = HAllocX(build_proc, 4, HEAP_XTRA);
  		*esp++ = make_tuple(ehp);
 		ehp[0] = make_arityval(3);
 		ehp[1] = cp[0];
 		ehp[2] = cp[1];
 		ehp[3] = make_small((Uint) cp[2]);
-		ehp += 4;
 	    }
 	    break;
 	case matchSilent:
@@ -2213,8 +2354,12 @@ restart:
 		}
 	    }
 	    break;
-	case matchCatch:
+	case matchCatch:  /* Match success, now build result */
 	    do_catch = 1;
+	    if (in_flags & ERTS_PAM_COPY_RESULT) {
+		build_proc = c_p;
+		esdp->current_process = c_p;
+	    }
 	    break;
 	case matchHalt:
 	    goto success;
@@ -2223,9 +2368,16 @@ restart:
 	}
     }
 fail:
+#if HALFWORD_HEAP
+    if (c_p_checkpoint.p) {
+	/* Dispose garbage built by guards on caller heap */
+	heap_checkpoint_revert(&c_p_checkpoint);
+	c_p_checkpoint.p = NULL;
+    }
+#endif
     *return_flags = 0U;
-    if (fail_label >= 0) { /* We failed during a "TryMeElse", 
-			      lets restart, with the next match 
+    if (fail_label >= 0) { /* We failed during a "TryMeElse",
+			      lets restart, with the next match
 			      program */
 	pc = (prog->text) + fail_label;
 	cleanup_match_pseudo_process(mpsp, 1);
@@ -2239,11 +2391,6 @@ success:
 	erl_exit(1, "Heap fence overwritten in db_prog_match after op "
 		 "0x%08x, overwritten with 0x%08x.", save_op, *heap_fence);
     }
-    if (*eheap_fence != FENCE_PATTERN) {
-	erl_exit(1, "Eheap fence overwritten in db_prog_match after op "
-		 "0x%08x, overwritten with 0x%08x.", save_op, 
-		 *eheap_fence);
-    }
     if (*stack_fence != FENCE_PATTERN) {
 	erl_exit(1, "Stack fence overwritten in db_prog_match after op "
 		 "0x%08x, overwritten with 0x%08x.", save_op, 
@@ -2254,6 +2401,7 @@ success:
     esdp->current_process = current_scheduled;
 
     END_ATOMIC_TRACE(c_p);
+
     return ret;
 #undef FAIL
 #undef FAIL_TERM
@@ -2265,7 +2413,8 @@ success:
 /*
  * Convert a match program to a "magic" binary to return up to erlang
  */
-Eterm db_make_mp_binary(Process *p, Binary *mp, Eterm **hpp) {
+Eterm db_make_mp_binary(Process *p, Binary *mp, Eterm **hpp)
+{
     return erts_mk_magic_binary_term(hpp, &MSO(p), mp);
 }
 
@@ -2331,13 +2480,13 @@ void db_free_dmc_err_info(DMCErrInfo *ei){
 ** Store bignum in *hpp and increase *hpp accordingly.
 ** *hpp is assumed to be large enough to hold the result.
 */
-Eterm db_add_counter(Eterm** hpp, Eterm counter, Eterm incr)
+Eterm db_add_counter(Eterm** hpp, Wterm counter, Eterm incr)
 {
     DeclareTmpHeapNoproc(big_tmp,2);
     Eterm res;
     Sint ires;
-    Eterm arg1;
-    Eterm arg2;
+    Wterm arg1;
+    Wterm arg2;
 
     if (is_both_small(counter,incr)) {
 	ires = signed_val(counter) + signed_val(incr);
@@ -2378,6 +2527,34 @@ Eterm db_add_counter(Eterm** hpp, Eterm counter, Eterm incr)
     }
 }
 
+/* Must be called to read elements after db_lookup_dbterm.
+** Will decompress if needed.
+** HEALFWORD_HEAP:
+** 	Will convert from relative to Wterm format if needed.
+**      (but only on top level, tuples and lists will still contain rterms)
+*/
+Wterm db_do_read_element(DbUpdateHandle* handle, Sint position)
+{
+    Eterm elem = handle->dbterm->tpl[position];
+    if (!is_header(elem)) {
+#if HALFWORD_HEAP
+	if (!is_immed(elem)
+	    && !handle->tb->common.compress
+	    && !(handle->abs_vec && handle->abs_vec[position])) {
+	    return rterm2wterm(elem, handle->dbterm->tpl);
+	}
+#endif
+	return elem;
+    }
+
+    ASSERT(((DbTableCommon*)handle->tb)->compress);
+    ASSERT(!handle->mustResize);
+    handle->dbterm = db_alloc_tmp_uncompressed(&handle->tb->common,
+					       handle->dbterm);
+    handle->mustResize = 1;
+    return handle->dbterm->tpl[position];
+}
+
 /*
 ** Update one element:
 ** handle:   Initialized by db_lookup_dbterm()
@@ -2394,127 +2571,488 @@ void db_do_update_element(DbUpdateHandle* handle,
     Eterm* oldp;
     Uint newval_sz;
     Uint oldval_sz;
+#if HALFWORD_HEAP
+    Eterm* old_base;
+#endif
 
     if (is_both_immed(newval,oldval)) {
 	handle->dbterm->tpl[position] = newval;
+    #ifdef DEBUG_CLONE
+	if (handle->dbterm->debug_clone) {
+	    handle->dbterm->debug_clone[position] = newval;
+	}
+    #endif
 	return;
     }
-    else if (!handle->mustResize && is_boxed(newval)) {
-	newp = boxed_val(newval);
-	switch (*newp & _TAG_HEADER_MASK) {
-	case _TAG_HEADER_POS_BIG:
-	case _TAG_HEADER_NEG_BIG:
-	case _TAG_HEADER_FLOAT:
-	case _TAG_HEADER_HEAP_BIN:	    
-	    newval_sz = header_arity(*newp) + 1;	    
-	    if (is_boxed(oldval)) {
-		oldp = boxed_val(oldval);
-		switch (*oldp & _TAG_HEADER_MASK) {
+    if (!handle->mustResize) {
+	if (handle->tb->common.compress) {
+	    handle->dbterm = db_alloc_tmp_uncompressed(&handle->tb->common,
+						       handle->dbterm);
+	    handle->mustResize = 1;
+	    oldval = handle->dbterm->tpl[position];
+        #if HALFWORD_HEAP
+	    old_base = NULL;
+	#endif
+	}
+	else {
+	#if HALFWORD_HEAP
+	    ASSERT(!handle->abs_vec);
+	    old_base = handle->dbterm->tpl;
+	#endif
+	    if (is_boxed(newval)) {
+		newp = boxed_val(newval);
+		switch (*newp & _TAG_HEADER_MASK) {
 		case _TAG_HEADER_POS_BIG:
 		case _TAG_HEADER_NEG_BIG:
 		case _TAG_HEADER_FLOAT:
 		case _TAG_HEADER_HEAP_BIN:
-		    oldval_sz = header_arity(*oldp) + 1;
-		    if (oldval_sz == newval_sz) {
-			/* "self contained" terms of same size, do memcpy */
-			sys_memcpy(oldp, newp, newval_sz*sizeof(Eterm));			
-			return;
+		    newval_sz = header_arity(*newp) + 1;
+		    if (is_boxed(oldval)) {
+			oldp = boxed_val_rel(oldval,old_base);
+			switch (*oldp & _TAG_HEADER_MASK) {
+			case _TAG_HEADER_POS_BIG:
+			case _TAG_HEADER_NEG_BIG:
+			case _TAG_HEADER_FLOAT:
+			case _TAG_HEADER_HEAP_BIN:
+			    oldval_sz = header_arity(*oldp) + 1;
+			    if (oldval_sz == newval_sz) {
+				/* "self contained" terms of same size, do memcpy */
+				    sys_memcpy(oldp, newp, newval_sz*sizeof(Eterm));
+				return;
+			    }
+			    goto both_size_set;
+			}
 		    }
-		    goto both_size_set;
+		    goto new_size_set;
 		}
 	    }
-	    goto new_size_set;
 	}
     }
+#if HALFWORD_HEAP
+    else {
+	old_base = (handle->tb->common.compress
+		    || (handle->abs_vec && handle->abs_vec[position])) ?
+	    NULL : handle->dbterm->tpl;
+    }
+#endif
     /* Not possible for simple memcpy or dbterm is already non-contiguous, */
     /* need to realloc... */
 
     newval_sz = is_immed(newval) ? 0 : size_object(newval);
 new_size_set:
-	
-    oldval_sz = is_immed(oldval) ? 0 : size_object(oldval);
+
+    oldval_sz = is_immed(oldval) ? 0 : size_object_rel(oldval,old_base);
 both_size_set:
 
     handle->new_size = handle->new_size - oldval_sz + newval_sz;
 
-    /* write new value in old dbterm, finalize will make a flat copy */	
+    /* write new value in old dbterm, finalize will make a flat copy */
     handle->dbterm->tpl[position] = newval;
     handle->mustResize = 1;
+
+#if HALFWORD_HEAP
+    if (old_base && newval_sz > 0) {
+	ASSERT(!handle->tb->common.compress);
+	if (!handle->abs_vec) {
+	    int i = header_arity(handle->dbterm->tpl[0]);
+	    handle->abs_vec = erts_alloc(ERTS_ALC_T_TMP, (i+1)*sizeof(char));
+	    sys_memset(handle->abs_vec, 0, i+1);
+	    /* abs_vec[0] not used */
+	}
+	handle->abs_vec[position] = 1;
+    }
+#endif
+}
+
+static ERTS_INLINE byte* db_realloc_term(DbTableCommon* tb, void* old,
+					 Uint old_sz, Uint new_sz, Uint offset)
+{
+    byte* ret;
+    if (erts_ets_realloc_always_moves) {
+	ret = erts_db_alloc(ERTS_ALC_T_DB_TERM, (DbTable*)tb, new_sz);
+	sys_memcpy(ret, old, offset);
+	erts_db_free(ERTS_ALC_T_DB_TERM, (DbTable*)tb, old, old_sz);
+    } else {
+	ret = erts_db_realloc(ERTS_ALC_T_DB_TERM, (DbTable*)tb,
+			      old, old_sz, new_sz);
+    }
+    return ret;
+}
+
+/* Allocated size of a compressed dbterm
+*/
+static ERTS_INLINE Uint db_alloced_size_comp(DbTerm* obj)
+{
+    return obj->tpl[arityval(*obj->tpl) + 1];
+}
+
+void db_free_term(DbTable *tb, void* basep, Uint offset)
+{
+    DbTerm* db = (DbTerm*) ((byte*)basep + offset);
+    Uint size;
+    if (tb->common.compress) {
+	db_cleanup_offheap_comp(db);
+	size = db_alloced_size_comp(db);
+    }
+    else {
+	ErlOffHeap tmp_oh;
+	tmp_oh.first = db->first_oh;
+	erts_cleanup_offheap(&tmp_oh);
+	size = offset + offsetof(DbTerm,tpl) + db->size*sizeof(Eterm);
+    }
+    erts_db_free(ERTS_ALC_T_DB_TERM, tb, basep, size);
+}
+
+static ERTS_INLINE Uint align_up(Uint value, Uint pow2)
+{
+    ASSERT((pow2 & (pow2-1)) == 0);
+    return (value + (pow2-1)) & ~(pow2-1);
+}
+
+/* Compressed size of an uncompressed term
+*/
+static Uint db_size_dbterm_comp(DbTableCommon* tb, Eterm obj)
+{
+    Eterm* tpl = tuple_val(obj);
+    int i;
+    Uint size = sizeof(DbTerm)
+	+ arityval(*tpl) * sizeof(Eterm)
+        + sizeof(Uint); /* "alloc_size" */
+
+    for (i = arityval(*tpl); i>0; i--) {
+	if (i != tb->keypos && is_not_immed(tpl[i])) {
+	    size += erts_encode_ext_size_ets(tpl[i]);
+	}
+    }
+    size += size_object(tpl[tb->keypos]) * sizeof(Eterm);
+    return align_up(size, sizeof(Uint));
 }
 
+/* Conversion between top tuple element and pointer to compressed data
+*/
+static ERTS_INLINE Eterm ext2elem(Eterm* tpl, byte* ext)
+{
+    return (((Uint)(ext - (byte*)tpl)) << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER;
+}
+static ERTS_INLINE byte* elem2ext(Eterm* tpl, Uint ix)
+{
+    ASSERT(is_header(tpl[ix]));
+    return (byte*)tpl + (tpl[ix] >> _TAG_PRIMARY_SIZE);
+}
+
+static void* copy_to_comp(DbTableCommon* tb, Eterm obj, DbTerm* dest,
+			  Uint alloc_size)
+{
+    ErlOffHeap tmp_offheap;
+    Eterm* src = tuple_val(obj);
+    Eterm* tpl = dest->tpl;
+    Eterm key = src[tb->keypos];
+    int arity = arityval(src[0]);
+    union {
+	Eterm* ep;
+	byte* cp;
+	UWord ui;
+    }top;
+    int i;
+
+    top.ep = tpl+ 1 + arity + 1;
+    tpl[0] = src[0];
+    tpl[arity + 1] = alloc_size;
+
+    tmp_offheap.first = NULL;
+    tpl[tb->keypos] = copy_struct_rel(key, size_object(key), &top.ep, &tmp_offheap, NULL, tpl);
+    dest->first_oh = tmp_offheap.first;
+    for (i=1; i<=arity; i++) {
+	if (i != tb->keypos) {
+	    if (is_immed(src[i])) {
+		tpl[i] = src[i];
+	    }
+	    else {
+		tpl[i] = ext2elem(tpl, top.cp);
+		top.cp = erts_encode_ext_ets(src[i], top.cp, &dest->first_oh);
+	    }
+	}
+    }
+
+#ifdef DEBUG_CLONE
+    {
+	Eterm* dbg_top = erts_alloc(ERTS_ALC_T_DB_TERM, dest->size * sizeof(Eterm));
+	dest->debug_clone = dbg_top;
+	tmp_offheap.first = dest->first_oh;
+	copy_struct_rel(obj, dest->size, &dbg_top, &tmp_offheap, NULL, dbg_top);
+	dest->first_oh = tmp_offheap.first;
+	ASSERT(dbg_top == dest->debug_clone + dest->size);
+    }
+#endif
+    return top.cp;
+}
 
 /*
 ** Copy the object into a possibly new DbTerm, 
 ** offset is the offset of the DbTerm from the start
-** of the sysAllocaed structure, The possibly realloced and copied
+** of the allocated structure, The possibly realloced and copied
 ** structure is returned. Make sure (((char *) old) - offset) is a 
 ** pointer to a ERTS_ALC_T_DB_TERM allocated data area.
 */
-void* db_get_term(DbTableCommon *tb, DbTerm* old, Uint offset, Eterm obj)
+void* db_store_term(DbTableCommon *tb, DbTerm* old, Uint offset, Eterm obj)
 {
+    byte* basep;
+    DbTerm* newp;
+    Eterm* top;
     int size = size_object(obj);
-    void *structp = ((char*) old) - offset;
-    DbTerm* p;
-    Eterm copy;
-    Eterm *top;
+    ErlOffHeap tmp_offheap;
 
     if (old != 0) {
-	erts_cleanup_offheap(&old->off_heap);
+	basep = ((byte*) old) - offset;
+	tmp_offheap.first  = old->first_oh;
+	erts_cleanup_offheap(&tmp_offheap);
+	old->first_oh = tmp_offheap.first;
 	if (size == old->size) {
-	    p = old;
-	} else {
+	    newp = old;
+	}
+	else {
 	    Uint new_sz = offset + sizeof(DbTerm) + sizeof(Eterm)*(size-1);
 	    Uint old_sz = offset + sizeof(DbTerm) + sizeof(Eterm)*(old->size-1);
 
-	    if (erts_ets_realloc_always_moves) {
-		void *nstructp = erts_db_alloc(ERTS_ALC_T_DB_TERM,
-					       (DbTable *) tb,
-					       new_sz);
-		memcpy(nstructp,structp,offset);
-		erts_db_free(ERTS_ALC_T_DB_TERM,
-			     (DbTable *) tb,
-			     structp,
-			     old_sz);
-		structp = nstructp;
-	    } else {
-		structp = erts_db_realloc(ERTS_ALC_T_DB_TERM,
-					  (DbTable *) tb,
-					  structp,
-					  old_sz,
-					  new_sz);
-	    }
-	    p = (DbTerm*) ((void *)(((char *) structp) + offset));
+	    basep = db_realloc_term(tb, basep, old_sz, new_sz, offset);
+	    newp = (DbTerm*) (basep + offset);
 	}
     }
     else {
-	structp = erts_db_alloc(ERTS_ALC_T_DB_TERM,
-				(DbTable *) tb,
-				(offset
-				 + sizeof(DbTerm)
-				 + sizeof(Eterm)*(size-1)));
-	p = (DbTerm*) ((void *)(((char *) structp) + offset));
-    }
-    p->size = size;
-    p->off_heap.mso = NULL;
-    p->off_heap.externals = NULL;
-#ifndef HYBRID /* FIND ME! */
-    p->off_heap.funs = NULL;
+	basep = erts_db_alloc(ERTS_ALC_T_DB_TERM, (DbTable *)tb,
+			      (offset + sizeof(DbTerm) + sizeof(Eterm)*(size-1)));
+	newp = (DbTerm*) (basep + offset);
+    }
+    newp->size = size;
+    top = newp->tpl;
+    tmp_offheap.first  = NULL;
+    copy_struct_rel(obj, size, &top, &tmp_offheap, NULL, top);
+    newp->first_oh = tmp_offheap.first;
+#ifdef DEBUG_CLONE
+    newp->debug_clone = NULL;
 #endif
-    p->off_heap.overhead = 0;
+    return basep;
+}
+
+
+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;
+    byte* top;
+
+    ASSERT(tb->compress);
+    if (old != 0) {
+	Uint old_sz = db_alloced_size_comp(old);
+	db_cleanup_offheap_comp(old);
+
+	basep = ((byte*) old) - offset;
+	if (new_sz == old_sz) {
+	    newp = old;
+	}
+	else {
+	    basep = db_realloc_term(tb, basep, old_sz, new_sz, offset);
+	    newp = (DbTerm*) (basep + offset);
+	}
+    }
+    else {
+	basep = erts_db_alloc(ERTS_ALC_T_DB_TERM, (DbTable*)tb, new_sz);
+	newp = (DbTerm*) (basep + offset);
+    }
+
+    newp->size = size_object(obj);
+    top = copy_to_comp(tb, obj, newp, new_sz);
+    ASSERT(top <= basep + new_sz);
 
-    top = DBTERM_BUF(p);
-    copy = copy_struct(obj, size, &top, &p->off_heap);
-    DBTERM_SET_TPL(p,tuple_val(copy));
+    /* ToDo: Maybe realloc if ((basep+new_sz) - top) > WASTED_SPACE_LIMIT */
 
-    return structp;
+    return basep;
 }
 
 
-void db_free_term_data(DbTerm* p)
+void db_finalize_resize(DbUpdateHandle* handle, Uint offset)
 {
-    erts_cleanup_offheap(&p->off_heap);
+    DbTable* tbl = handle->tb;
+    DbTerm* newDbTerm;
+    Uint alloc_sz = offset +
+	(tbl->common.compress ?
+	 db_size_dbterm_comp(&tbl->common, make_tuple(handle->dbterm->tpl)) :
+	 sizeof(DbTerm)+sizeof(Eterm)*(handle->new_size-1));
+    byte* newp = erts_db_alloc(ERTS_ALC_T_DB_TERM, tbl, alloc_sz);
+    byte* oldp = *(handle->bp);
+
+    sys_memcpy(newp, oldp, offset);  /* copy only hash/tree header */
+    *(handle->bp) = newp;
+    newDbTerm = (DbTerm*) (newp + offset);
+    newDbTerm->size = handle->new_size;
+#ifdef DEBUG_CLONE
+    newDbTerm->debug_clone = NULL;
+#endif
+
+    /* make a flat copy */
+
+    if (tbl->common.compress) {
+	copy_to_comp(&tbl->common, make_tuple(handle->dbterm->tpl),
+		     newDbTerm, alloc_sz);
+	db_free_tmp_uncompressed(handle->dbterm);
+    }
+    else {
+	ErlOffHeap tmp_offheap;
+	Eterm* tpl = handle->dbterm->tpl;
+	Eterm* top = newDbTerm->tpl;
+
+	tmp_offheap.first = NULL;
+
+    #if HALFWORD_HEAP
+	if (handle->abs_vec) {
+	    int i, arity = header_arity(handle->dbterm->tpl[0]);
+
+	    top[0] = tpl[0];
+	    top += arity + 1;
+	    for (i=1; i<=arity; i++) {
+		Eterm* src_base = handle->abs_vec[i] ? NULL : tpl;
+
+		newDbTerm->tpl[i] = copy_struct_rel(tpl[i],
+						    size_object_rel(tpl[i],src_base),
+						    &top, &tmp_offheap, src_base,
+						    newDbTerm->tpl);
+	    }
+	    newDbTerm->first_oh = tmp_offheap.first;
+	    ASSERT((byte*)top <= (newp + alloc_sz));
+	    erts_free(ERTS_ALC_T_TMP, handle->abs_vec);
+	}
+	else
+    #endif /* HALFWORD_HEAP */
+	{
+	    copy_struct_rel(make_tuple_rel(tpl,tpl), handle->new_size, &top,
+			    &tmp_offheap, tpl, top);
+	    newDbTerm->first_oh = tmp_offheap.first;
+	    ASSERT((byte*)top == (newp + alloc_sz));
+	}
+    }
 }
 
+Eterm db_copy_from_comp(DbTableCommon* tb, DbTerm* bp, Eterm** hpp,
+			     ErlOffHeap* off_heap)
+{
+    Eterm* hp = *hpp;
+    int i, arity = arityval(bp->tpl[0]);
+
+    hp[0] = bp->tpl[0];
+    *hpp += arity + 1;
+
+    hp[tb->keypos] = copy_struct_rel(bp->tpl[tb->keypos],
+				     size_object_rel(bp->tpl[tb->keypos], bp->tpl),
+				     hpp, off_heap, bp->tpl, NULL);
+    for (i=arity; i>0; i--) {
+	if (i != tb->keypos) {
+	    if (is_immed(bp->tpl[i])) {
+		hp[i] = bp->tpl[i];
+	    }
+	    else {
+		hp[i] = erts_decode_ext_ets(hpp, off_heap,
+					    elem2ext(bp->tpl, i));
+	    }
+	}
+    }
+    ASSERT((*hpp - hp) <= bp->size);
+#ifdef DEBUG_CLONE
+    ASSERT(eq_rel(make_tuple(hp),make_tuple(bp->debug_clone),bp->debug_clone));
+#endif
+    return make_tuple(hp);
+}
+
+Eterm db_copy_element_from_ets(DbTableCommon* tb, Process* p,
+			       DbTerm* obj, Uint pos,
+			       Eterm** hpp, Uint extra)
+{
+    if (is_immed(obj->tpl[pos])) {
+	*hpp = HAlloc(p, extra);
+	return obj->tpl[pos];
+    }
+    if (tb->compress && pos != tb->keypos) {
+	byte* ext = elem2ext(obj->tpl, pos);
+	Sint sz = erts_decode_ext_size_ets(ext, db_alloced_size_comp(obj)) + extra;
+	Eterm* hp = HAlloc(p, sz);
+	Eterm* endp = hp + sz;
+	Eterm copy = erts_decode_ext_ets(&hp, &MSO(p), ext);
+	*hpp = hp;
+	hp += extra;
+	HRelease(p, endp, hp);
+#ifdef DEBUG_CLONE
+	ASSERT(eq_rel(copy, obj->debug_clone[pos], obj->debug_clone));
+#endif
+	return copy;
+    }
+    else {
+	Uint sz = size_object_rel(obj->tpl[pos], obj->tpl);
+	*hpp = HAlloc(p, sz + extra);
+	return copy_struct_rel(obj->tpl[pos], sz, hpp, &MSO(p), obj->tpl, NULL);
+    }
+}
+
+
+/* Our own "cleanup_offheap"
+ * as refc-binaries may be unaligned in compressed terms
+*/
+void db_cleanup_offheap_comp(DbTerm* obj)
+{
+    union erl_off_heap_ptr u;
+    ProcBin tmp;
+
+    for (u.hdr = obj->first_oh; u.hdr; u.hdr = u.hdr->next) {
+	if ((UWord)u.voidp % sizeof(Uint) != 0) { /* unaligned ptr */
+	    sys_memcpy(&tmp, u.voidp, sizeof(tmp));
+	    /* Warning, must pass (void*)-variable to memcpy. Otherwise it will
+	       cause Bus error on Sparc due to false compile time assumptions
+	       about word aligned memory (type cast is not enough) */
+	    u.pb = &tmp;
+	}
+	switch (thing_subtag(u.hdr->thing_word)) {
+	case REFC_BINARY_SUBTAG:
+	    if (erts_refc_dectest(&u.pb->val->refc, 0) == 0) {
+		erts_bin_free(u.pb->val);
+	    }
+	    break;
+	case FUN_SUBTAG:
+	    ASSERT(u.pb != &tmp);
+	    if (erts_refc_dectest(&u.fun->fe->refc, 0) == 0) {
+		erts_erase_fun_entry(u.fun->fe);
+	    }
+	    break;
+	default:
+	    ASSERT(is_external_header(u.hdr->thing_word));
+	    ASSERT(u.pb != &tmp);
+	    erts_deref_node_entry(u.ext->node);
+	    break;
+	}
+    }
+#ifdef DEBUG_CLONE
+    if (obj->debug_clone != NULL) {
+	erts_free(ERTS_ALC_T_DB_TERM, obj->debug_clone);
+	obj->debug_clone = NULL;
+    }
+#endif
+}
+
+int db_eq_comp(DbTableCommon* tb, Eterm a, DbTerm* b)
+{
+    ErlOffHeap tmp_offheap;
+    Eterm* allocp;
+    Eterm* hp;
+    Eterm tmp_b;
+    int is_eq;
+
+    ASSERT(tb->compress);
+    hp = allocp = erts_alloc(ERTS_ALC_T_TMP, b->size*sizeof(Eterm));
+    tmp_offheap.first = NULL;
+    tmp_b = db_copy_from_comp(tb, b, &hp, &tmp_offheap);
+    is_eq = eq(a,tmp_b);
+    erts_cleanup_offheap(&tmp_offheap);
+    erts_free(ERTS_ALC_T_TMP, allocp);
+    return is_eq;
+}
 
 /*
 ** Check if object represents a "match" variable 
@@ -2660,7 +3198,7 @@ static DMCRet dmc_one_term(DMCContext *context,
 		** Ouch, big integer in match variable.
 		*/
 		Eterm *save_hp;
-		ASSERT(heap->data == heap->def);
+		ASSERT(heap->vars == heap->vars_def);
 		sz = sz2 = sz3 = 0;
 		for (j = 0; j < context->num_match; ++j) {
 		    sz += size_object(context->matchexpr[j]);
@@ -2698,24 +3236,23 @@ static DMCRet dmc_one_term(DMCContext *context,
 		       may be atoms that changed */
 		    context->matchexpr[j] = context->copy->mem[j];
 		}
-		heap->data = erts_alloc(ERTS_ALC_T_DB_MS_CMPL_HEAP,
-					heap->size*sizeof(unsigned));
-		sys_memset(heap->data, 0, 
-			   heap->size * sizeof(unsigned));
+		heap->vars = erts_alloc(ERTS_ALC_T_DB_MS_CMPL_HEAP,
+					heap->size*sizeof(DMCVariable));
+		sys_memset(heap->vars, 0, heap->size * sizeof(DMCVariable));
 		DMC_CLEAR(*stack);
 		/*DMC_PUSH(*stack,NIL);*/
 		DMC_CLEAR(*text);
 		return retRestart;
 	    }
-	    if (heap->data[n]) { /* already bound ? */
+	    if (heap->vars[n].is_bound) {
 		DMC_PUSH(*text,matchCmp);
 		DMC_PUSH(*text,n);
 	    } else { /* Not bound, bind! */
-		if (n >= heap->used)
-		    heap->used = n + 1;
+		if (n >= heap->vars_used)
+		    heap->vars_used = n + 1;
 		DMC_PUSH(*text,matchBind);
 		DMC_PUSH(*text,n);
-		heap->data[n] = 1;
+		heap->vars[n].is_bound = 1;
 	    }
 	} else if (c == am_Underscore) {
 	    DMC_PUSH(*text, matchSkip);
@@ -2740,6 +3277,8 @@ static DMCRet dmc_one_term(DMCContext *context,
 	    DMC_PUSH(*stack, c);
 	    break;
 	case (_TAG_HEADER_REF >> _TAG_PRIMARY_SIZE):
+	{
+	    Eterm* ref_val = internal_ref_val(c);
 	    DMC_PUSH(*text, matchEqRef);
 #if HALFWORD_HEAP
 	    {
@@ -2747,25 +3286,27 @@ static DMCRet dmc_one_term(DMCContext *context,
 		    UWord u;
 		    Uint t[2];
 		} fiddle;
-		ASSERT(thing_arityval(*internal_ref_val(c)) == 3);
-		fiddle.t[0] = *internal_ref_val(c);
-		fiddle.t[1] = (Uint) internal_ref_val(c)[1];
+		ASSERT(thing_arityval(ref_val[0]) == 3);
+		fiddle.t[0] = ref_val[0];
+		fiddle.t[1] = ref_val[1];
 		DMC_PUSH(*text, fiddle.u);
-		fiddle.t[0] = (Uint) internal_ref_val(c)[2];
-		fiddle.t[1] = (Uint) internal_ref_val(c)[3];
+		fiddle.t[0] = ref_val[2];
+		fiddle.t[1] = ref_val[3];
 		DMC_PUSH(*text, fiddle.u);
 	    }
 #else
-	    n = thing_arityval(*internal_ref_val(c));
-	    DMC_PUSH(*text, *internal_ref_val(c));
-	    for (i = 1; i <= n; ++i) {
-		DMC_PUSH(*text, (Uint) internal_ref_val(c)[i]);
+	    n = thing_arityval(ref_val[0]);
+	    for (i = 0; i <= n; ++i) {
+		DMC_PUSH(*text, ref_val[i]);
 	    }
 #endif
 	    break;
+	}
 	case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
 	case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-	    n = thing_arityval(*big_val(c));
+	{
+	    Eterm* bval = big_val(c);
+	    n = thing_arityval(bval[0]);
 	    DMC_PUSH(*text, matchEqBig);
 #if HALFWORD_HEAP
 	    {
@@ -2774,13 +3315,13 @@ static DMCRet dmc_one_term(DMCContext *context,
 		    Uint t[2];
 		} fiddle;
 		ASSERT(n >= 1);
-		fiddle.t[0] = *big_val(c);
-		fiddle.t[1] = big_val(c)[1];
+		fiddle.t[0] = bval[0];
+		fiddle.t[1] = bval[1];
 		DMC_PUSH(*text, fiddle.u);
 		for (i = 2; i <= n; ++i) {
-		    fiddle.t[0] = big_val(c)[i];
+		    fiddle.t[0] = bval[i];
 		    if (++i <= n) {
-			fiddle.t[1] = big_val(c)[i];
+			fiddle.t[1] = bval[i];
 		    } else {
 			fiddle.t[1] = (Uint) 0;
 		    }
@@ -2788,12 +3329,12 @@ static DMCRet dmc_one_term(DMCContext *context,
 		}
 	    }
 #else
-	    DMC_PUSH(*text, *big_val(c));
-	    for (i = 1; i <= n; ++i) {
-		DMC_PUSH(*text, (Uint) big_val(c)[i]);
+	    for (i = 0; i <= n; ++i) {
+		DMC_PUSH(*text, (Uint) bval[i]);
 	    }
 #endif
 	    break;
+	}
 	case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
 	    DMC_PUSH(*text,matchEqFloat);
 #if HALFWORD_HEAP
@@ -2926,7 +3467,6 @@ static DMCRet dmc_list(DMCContext *context,
 	DMC_PUSH(*text, matchConsB);
     }
     --context->stack_used; /* Two objects on stack becomes one */
-    context->eheap_need += 2;
     return retOk;
 }
 
@@ -2985,7 +3525,6 @@ static DMCRet dmc_tuple(DMCContext *context,
     DMC_PUSH(*text, matchMkTuple);
     DMC_PUSH(*text, nelems);
     context->stack_used -= (nelems - 1);
-    context->eheap_need += (nelems + 1);
     *constant = 0;
     return retOk;
 }
@@ -3003,9 +3542,6 @@ static DMCRet dmc_whole_expression(DMCContext *context,
 	} else { 
 	    ASSERT(is_tuple(context->matchexpr
 			    [context->current_match]));
-	    context->eheap_need += 
-		arityval(*(tuple_val(context->matchexpr
-				     [context->current_match]))) * 2;
 	    DMC_PUSH(*text, matchPushArrayAsList);
 	}
     } else {
@@ -3018,6 +3554,41 @@ static DMCRet dmc_whole_expression(DMCContext *context,
     return retOk;
 }
 
+/* Figure out which PushV instruction to use.
+*/
+static void dmc_add_pushv_variant(DMCContext *context, DMCHeap *heap,
+				  DMC_STACK_TYPE(UWord) *text, Uint n)
+{
+    DMCVariable* v = &heap->vars[n];
+    MatchOps instr = matchPushV;
+
+    ASSERT(n < heap->vars_used && v->is_bound);
+    if (context->is_guard) {
+	#if HALFWORD_HEAP
+	if (!v->first_guard_label) {
+	    v->first_guard_label = DMC_STACK_NUM(*text);
+	    ASSERT(v->first_guard_label);
+	    instr = matchPushVGuard; /* may be changed to PushVResult below */
+	}
+	#endif
+    }
+    else { /* body */
+	#if HALFWORD_HEAP
+	if (v->first_guard_label) {
+	    /* Avoid double-copy, copy to result heap at first encounter in guard */
+	    DMC_POKE(*text, v->first_guard_label, matchPushVResult);
+	    v->is_in_body = 1;
+	}
+	#endif
+	if (!v->is_in_body) {
+	    instr = matchPushVResult;
+	    v->is_in_body = 1;
+	}
+    }
+    DMC_PUSH(*text, instr);
+    DMC_PUSH(*text, n);
+}
+
 static DMCRet dmc_variable(DMCContext *context,
 			   DMCHeap *heap,
 			   DMC_STACK_TYPE(UWord) *text,
@@ -3025,13 +3596,13 @@ static DMCRet dmc_variable(DMCContext *context,
 			   int *constant)
 {
     Uint n = db_is_variable(t);
-    ASSERT(n >= 0);
-    if (n >= heap->used) 
-	RETURN_VAR_ERROR("Variable $%d is unbound.", n, context, *constant);
-    if (heap->data[n] == 0U)
+
+    if (n >= heap->vars_used || !heap->vars[n].is_bound) {
 	RETURN_VAR_ERROR("Variable $%d is unbound.", n, context, *constant);
-    DMC_PUSH(*text, matchPushV);
-    DMC_PUSH(*text, n);
+    }
+
+    dmc_add_pushv_variant(context, heap, text, n);
+
     ++context->stack_used;
     if (context->stack_used > context->stack_need)
 	context->stack_need = context->stack_used;
@@ -3050,10 +3621,9 @@ static DMCRet dmc_all_bindings(DMCContext *context,
 
     DMC_PUSH(*text, matchPushC);
     DMC_PUSH(*text, NIL);
-    for (i = heap->used - 1; i >= 0; --i) { 
-	if (heap->data[i]) {
-	    DMC_PUSH(*text, matchPushV);
-	    DMC_PUSH(*text, i);
+    for (i = heap->vars_used - 1; i >= 0; --i) {
+	if (heap->vars[i].is_bound) {
+	    dmc_add_pushv_variant(context, heap, text, i);
 	    DMC_PUSH(*text, matchConsB);
 	    heap_used += 2;
 	}
@@ -3061,7 +3631,6 @@ static DMCRet dmc_all_bindings(DMCContext *context,
     ++context->stack_used;
     if ((context->stack_used + 1) > context->stack_need)
 	context->stack_need = (context->stack_used + 1);
-    context->eheap_need += heap_used;
     *constant = 0;
     return retOk;
 }
@@ -3464,10 +4033,6 @@ static DMCRet dmc_get_seq_token(DMCContext *context,
 
     *constant = 0;
     DMC_PUSH(*text, matchGetSeqToken);
-    context->eheap_need += (6 /* A 5-tuple is built */
-			    + EXTERNAL_THING_HEAD_SIZE + 2 /* Sender can
-							      be an external
-							      pid */);
     if (++context->stack_used > context->stack_need)
  	context->stack_need = context->stack_used;
     return retOk;
@@ -3764,7 +4329,6 @@ static DMCRet dmc_caller(DMCContext *context,
     }
     *constant = 0;
     DMC_PUSH(*text, matchCaller); /* Creates binary */
-    context->eheap_need += 4;     /* A 3-tuple is built */
     if (++context->stack_used > context->stack_need)
  	context->stack_need = context->stack_used;
     return retOk;
@@ -4362,7 +4926,8 @@ static Eterm match_spec_test(Process *p, Eterm against, Eterm spec, int trace)
 	    }
 	    save_cp = p->cp;
 	    p->cp = NULL;
-	    res = erts_match_set_run(p, mps, arr, n, &ret_flags);
+	    res = erts_match_set_run(p, mps, arr, n,
+				     ERTS_PAM_COPY_RESULT, &ret_flags);
 	    p->cp = save_cp;
 	} else {
 	    n = 0;
@@ -4375,11 +4940,10 @@ static Eterm match_spec_test(Process *p, Eterm against, Eterm spec, int trace)
 	if (is_non_value(res)) {
 	    res = am_false;
 	}
-	sz = size_object(res);
+	sz = 0;
 	if (ret_flags & MATCH_SET_EXCEPTION_TRACE) sz += 2;
 	if (ret_flags & MATCH_SET_RETURN_TRACE) sz += 2;
 	hp = HAlloc(p, 5 + sz);
-	res = copy_struct(res, sz, &hp, &MSO(p));
 	flg = NIL;
 	if (ret_flags & MATCH_SET_EXCEPTION_TRACE) {
 	    flg = CONS(hp, am_exception_trace, flg);
@@ -4406,12 +4970,67 @@ static Eterm seq_trace_fake(Process *p, Eterm arg1)
     }
     return result;
 }
-    
+
+DbTerm* db_alloc_tmp_uncompressed(DbTableCommon* tb, DbTerm* org)
+{
+    ErlOffHeap tmp_offheap;
+    DbTerm* res = erts_alloc(ERTS_ALC_T_TMP,
+			     sizeof(DbTerm) + org->size*sizeof(Eterm));
+    Eterm* hp = res->tpl;
+    tmp_offheap.first = NULL;
+    db_copy_from_comp(tb, org, &hp, &tmp_offheap);
+    res->first_oh = tmp_offheap.first;
+    res->size = org->size;
+#ifdef DEBUG_CLONE
+    res->debug_clone = NULL;
+#endif
+    return res;
+}
+
+void db_free_tmp_uncompressed(DbTerm* obj)
+{
+    ErlOffHeap off_heap;
+    off_heap.first = obj->first_oh;
+    erts_cleanup_offheap(&off_heap);
+#ifdef DEBUG_CLONE
+    ASSERT(obj->debug_clone == NULL);
+#endif
+    erts_free(ERTS_ALC_T_TMP, obj);
+}
+
+Eterm db_match_dbterm(DbTableCommon* tb, Process* c_p, Binary* bprog,
+			     int all, DbTerm* obj, Eterm** hpp, Uint extra)
+{
+    Uint32 dummy;
+    Eterm* base;
+    Eterm res;
+
+    if (tb->compress) {
+	obj = db_alloc_tmp_uncompressed(tb, obj);
+	base = NULL;
+    }
+    else base = HALFWORD_HEAP ? obj->tpl : NULL;
+
+    res = db_prog_match(c_p, bprog, make_tuple_rel(obj->tpl,base), base, NULL, 0,
+			ERTS_PAM_COPY_RESULT|ERTS_PAM_CONTIGUOUS_TUPLE, &dummy);
+
+    if (is_value(res) && hpp!=NULL) {
+	*hpp = HAlloc(c_p, extra);
+    }
+
+    if (tb->compress) {
+	db_free_tmp_uncompressed(obj);
+    }
+    return res;
+}
+
+
 #ifdef DMC_DEBUG
+
 /*
 ** Disassemble match program
 */
-static void db_match_dis(Binary *bp)
+void db_match_dis(Binary *bp)
 {
     MatchProg *prog = Binary2MatchProg(bp);
     UWord *t = prog->text;
@@ -4626,6 +5245,18 @@ static void db_match_dis(Binary *bp)
 	    ++t;
 	    erts_printf("PushV\t%bpu\n", n);
 	    break;
+    #if HALFWORD_HEAP
+	case matchPushVGuard:
+	    n = (Uint) *++t;
+	    ++t;
+	    erts_printf("PushVGuard\t%bpu\n", n);
+	    break;
+    #endif
+	case matchPushVResult:
+	    n = (Uint) *++t;
+	    ++t;
+	    erts_printf("PushVResult\t%bpu\n", n);
+	    break;
 	case matchTrue:
 	    ++t;
 	    erts_printf("True\n");
@@ -4736,7 +5367,6 @@ static void db_match_dis(Binary *bp)
     erts_printf("}\n");
     erts_printf("num_bindings: %d\n", prog->num_bindings);
     erts_printf("heap_size: %bpu\n", prog->heap_size);
-    erts_printf("eheap_offset: %bpu\n", prog->eheap_offset);
     erts_printf("stack_offset: %bpu\n", prog->stack_offset);
     erts_printf("text: 0x%08x\n", (unsigned long) prog->text);
     erts_printf("stack_size: %d (words)\n", prog->heap_size-prog->stack_offset);
diff --git a/erts/emulator/beam/erl_db_util.h b/erts/emulator/beam/erl_db_util.h
index 382e5dceb5..bb1751d309 100644
--- a/erts/emulator/beam/erl_db_util.h
+++ b/erts/emulator/beam/erl_db_util.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2011. 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
@@ -52,22 +52,27 @@
 				     is broken.*/
 #define DB_ERROR_UNSPEC   -10    /* Unspecified error */
 
+/*#define DEBUG_CLONE*/
 
 /*
  * A datatype for a database entry stored out of a process heap
  */
 typedef struct db_term {
-    ErlOffHeap off_heap;   /* Off heap data for term. */
-    Uint size;		   /* Size of term in "words" */
-    Eterm tpl[1];          /* Untagged "constant pointer" to top tuple */
-                           /* (assumed to be first in buffer) */
+    struct erl_off_heap_header* first_oh; /* Off heap data for term. */
+    Uint size;		   /* Heap size of term in "words" */
+#ifdef DEBUG_CLONE
+    Eterm* debug_clone;    /* An uncompressed copy */
+#endif
+    Eterm tpl[1];          /* Term data. Top tuple always first */
+
+    /* Compression: is_immed and key element are uncompressed.
+       Compressed elements are stored in external format after each other
+       last in dbterm. The top tuple elements contains byte offsets, to
+       the start of the data, tagged as headers.
+       The allocated size of the dbterm in bytes is stored at tpl[arity+1].
+     */
 } DbTerm;
 
-/* "Assign" a value to DbTerm.tpl */
-#define DBTERM_SET_TPL(dbtermPtr,tplPtr) ASSERT((tplPtr)==(dbtermPtr->tpl))
-/* Get start of term buffer */
-#define DBTERM_BUF(dbtermPtr) ((dbtermPtr)->tpl)
-
 union db_table;
 typedef union db_table DbTable;
 
@@ -81,6 +86,9 @@ typedef struct {
     Uint new_size;
     int mustResize;
     void* lck;
+#if HALFWORD_HEAP
+    unsigned char* abs_vec;  /* [i] true if dbterm->tpl[i] is absolute Eterm */
+#endif
 } DbUpdateHandle;
 
 
@@ -186,6 +194,12 @@ typedef struct db_table_method
 
 } DbTableMethod;
 
+typedef struct db_fixation {
+    Eterm pid;
+    Uint counter;
+    struct db_fixation *next;
+} DbFixation;
+
 /*
  * This structure contains data for all different types of database
  * tables. Note that these fields must match the same fields
@@ -194,16 +208,8 @@ typedef struct db_table_method
  * operations may be the same on different types of tables.
  */
 
-typedef struct db_fixation {
-    Eterm pid;
-    Uint counter;
-    struct db_fixation *next;
-} DbFixation;
-
-
 typedef struct db_table_common {
-    erts_refc_t ref;
-    erts_refc_t fixref;       /* fixation counter */
+    erts_refc_t ref;          /* fixation counter and delete counter */
 #ifdef ERTS_SMP
     erts_smp_rwmtx_t rwlock;  /* rw lock on table */
     erts_smp_mtx_t fixlock;   /* Protects fixations,megasec,sec,microsec */
@@ -226,6 +232,7 @@ typedef struct db_table_common {
     Uint32 status;            /* bit masks defined  below */
     int slot;                 /* slot index in meta_main_tab */
     int keypos;               /* defaults to 1 */
+    int compress;
 } DbTableCommon;
 
 /* These are status bit patterns */
@@ -240,30 +247,78 @@ typedef struct db_table_common {
 #define DB_DUPLICATE_BAG (1 << 8)
 #define DB_ORDERED_SET   (1 << 9)
 #define DB_DELETE        (1 << 10) /* table is being deleted */
+#define DB_FREQ_READ     (1 << 11)
 
-#define ERTS_ETS_TABLE_TYPES (DB_BAG|DB_SET|DB_DUPLICATE_BAG|DB_ORDERED_SET|DB_FINE_LOCKED)
+#define ERTS_ETS_TABLE_TYPES (DB_BAG|DB_SET|DB_DUPLICATE_BAG|DB_ORDERED_SET|DB_FINE_LOCKED|DB_FREQ_READ)
 
 #define IS_HASH_TABLE(Status) (!!((Status) & \
 				  (DB_BAG | DB_SET | DB_DUPLICATE_BAG)))
 #define IS_TREE_TABLE(Status) (!!((Status) & \
 				  DB_ORDERED_SET))
-#define NFIXED(T) (erts_refc_read(&(T)->common.fixref,0))
+#define NFIXED(T) (erts_refc_read(&(T)->common.ref,0))
 #define IS_FIXED(T) (NFIXED(T) != 0) 
 
-Eterm erts_ets_copy_object(Eterm, Process*);
+/*
+ * tplp is an untagged pointer to a tuple we know is large enough
+ * and dth is a pointer to a DbTableHash.
+ */
+#define GETKEY(dth, tplp)   (*((tplp) + ((DbTableCommon*)(dth))->keypos))
+
+
+ERTS_GLB_INLINE Eterm db_copy_key(Process* p, DbTable* tb, DbTerm* obj);
+Eterm db_copy_from_comp(DbTableCommon* tb, DbTerm* bp, Eterm** hpp,
+			ErlOffHeap* off_heap);
+int db_eq_comp(DbTableCommon* tb, Eterm a, DbTerm* b);
+DbTerm* db_alloc_tmp_uncompressed(DbTableCommon* tb, DbTerm* org);
+
+ERTS_GLB_INLINE Eterm db_copy_object_from_ets(DbTableCommon* tb, DbTerm* bp,
+					      Eterm** hpp, ErlOffHeap* off_heap);
+ERTS_GLB_INLINE int db_eq(DbTableCommon* tb, Eterm a, DbTerm* b);
+Wterm db_do_read_element(DbUpdateHandle* handle, Sint position);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_INLINE Eterm db_copy_key(Process* p, DbTable* tb, DbTerm* obj)
+{
+    Eterm key = GETKEY(tb, obj->tpl);
+    if IS_CONST(key) return key;
+    else {
+	Uint size = size_object_rel(key, obj->tpl);
+	Eterm* hp = HAlloc(p, size);
+	Eterm res = copy_struct_rel(key, size, &hp, &MSO(p), obj->tpl, NULL);
+	ASSERT(eq_rel(res,NULL,key,obj->tpl));
+	return res;
+    }
+}
+
+ERTS_GLB_INLINE Eterm db_copy_object_from_ets(DbTableCommon* tb, DbTerm* bp,
+					      Eterm** hpp, ErlOffHeap* off_heap)
+{
+    if (tb->compress) {
+	return db_copy_from_comp(tb, bp, hpp, off_heap);
+    }
+    else {
+	return copy_shallow_rel(bp->tpl, bp->size, hpp, off_heap, bp->tpl);
+    }
+}
+
+ERTS_GLB_INLINE int db_eq(DbTableCommon* tb, Eterm a, DbTerm* b)
+{
+    if (!tb->compress) {
+	return eq_rel(a, NULL, make_tuple_rel(b->tpl,b->tpl), b->tpl);
+    }
+    else {
+	return db_eq_comp(tb, a, b);
+    }
+}
+
+#endif /* ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
-/* optimised version of copy_object (normal case? atomic object) */
-#define COPY_OBJECT(obj, p, objp) \
-   if (IS_CONST(obj)) { *(objp) = (obj); } \
-   else { *objp = erts_ets_copy_object(obj, p); }
 
 #define DB_READ  (DB_PROTECTED|DB_PUBLIC)
 #define DB_WRITE DB_PUBLIC
 #define DB_INFO  (DB_PROTECTED|DB_PUBLIC|DB_PRIVATE)
 
-/* tb is an DbTableCommon and obj is an Eterm (tagged) */
-#define TERM_GETKEY(tb, obj) db_getkey((tb)->common.keypos, (obj)) 
-
 #define ONLY_WRITER(P,T) (((T)->common.status & (DB_PRIVATE|DB_PROTECTED)) \
 			  && (T)->common.owner == (P)->id)
 
@@ -276,15 +331,19 @@ Eterm db_set_trace_control_word_1(Process *p, Eterm val);
 
 void db_initialize_util(void);
 Eterm db_getkey(int keypos, Eterm obj);
-void db_free_term_data(DbTerm* p);
-void* db_get_term(DbTableCommon *tb, DbTerm* old, Uint offset, Eterm obj);
+void db_cleanup_offheap_comp(DbTerm* p);
+void db_free_term(DbTable *tb, void* basep, Uint offset);
+void* db_store_term(DbTableCommon *tb, DbTerm* old, Uint offset, Eterm obj);
+void* db_store_term_comp(DbTableCommon *tb, DbTerm* old, Uint offset, Eterm obj);
+Eterm db_copy_element_from_ets(DbTableCommon* tb, Process* p, DbTerm* obj,
+			       Uint pos, Eterm** hpp, Uint extra);
 int db_has_variable(Eterm obj);
 int db_is_variable(Eterm obj);
 void db_do_update_element(DbUpdateHandle* handle,
 			  Sint position,
 			  Eterm newval);
-void db_finalize_update_element(DbUpdateHandle* handle);
-Eterm db_add_counter(Eterm** hpp, Eterm counter, Eterm incr);
+void db_finalize_resize(DbUpdateHandle* handle, Uint offset);
+Eterm db_add_counter(Eterm** hpp, Wterm counter, Eterm incr);
 Eterm db_match_set_lint(Process *p, Eterm matchexpr, Uint flags);
 Binary *db_match_set_compile(Process *p, Eterm matchexpr, 
 			     Uint flags);
@@ -301,7 +360,6 @@ typedef struct match_prog {
     struct erl_heap_fragment *saved_program_buf;
     Eterm saved_program;
     Uint heap_size;          /* size of: heap + eheap + stack */
-    Uint eheap_offset;
     Uint stack_offset;
 #ifdef DMC_DEBUG
     UWord* prog_end;		/* End of program */
@@ -366,8 +424,15 @@ Binary *db_match_compile(Eterm *matchexpr, Eterm *guards,
 			 Uint flags, 
 			 DMCErrInfo *err_info);
 /* Returns newly allocated MatchProg binary with refc == 0*/
-Eterm db_prog_match(Process *p, Binary *prog, Eterm term, Eterm *termp, int arity,
+
+Eterm db_match_dbterm(DbTableCommon* tb, Process* c_p, Binary* bprog,
+		      int all, DbTerm* obj, Eterm** hpp, Uint extra);
+
+Eterm db_prog_match(Process *p, Binary *prog, Eterm term, Eterm* base,
+		    Eterm *termp, int arity,
+		    enum erts_pam_run_flags in_flags,
 		    Uint32 *return_flags /* Zeroed on enter */);
+
 /* returns DB_ERROR_NONE if matches, 1 if not matches and some db error on 
    error. */
 DMCErrInfo *db_new_dmc_err_info(void);
diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index 9733c0e5b5..13a73e01bb 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -150,6 +150,27 @@ typedef struct {
 #define ERL_DRV_FLAG_SOFT_BUSY		(1 << 1)
 
 /*
+ * Integer types
+ */
+
+typedef unsigned long ErlDrvTermData;
+typedef unsigned long ErlDrvUInt;
+typedef signed long ErlDrvSInt;
+
+#if defined(__WIN32__)
+typedef unsigned __int64 ErlDrvUInt64;
+typedef __int64 ErlDrvSInt64;
+#elif SIZEOF_LONG == 8
+typedef unsigned long ErlDrvUInt64;
+typedef long ErlDrvSInt64;
+#elif SIZEOF_LONG_LONG == 8
+typedef unsigned long long ErlDrvUInt64;
+typedef long long ErlDrvSInt64;
+#else
+#error No 64-bit integer type
+#endif
+
+/*
  * A binary as seen in a driver. Note that a binary should never be
  * altered by the driver when it has been sent to Erlang.
  */
@@ -179,26 +200,6 @@ struct erl_drv_event_data {
 #endif
 typedef struct erl_drv_event_data *ErlDrvEventData; /* Event data */
 
-/* 
- * Used in monitors...
- */
-typedef unsigned long ErlDrvTermData;
-typedef unsigned long ErlDrvUInt;
-typedef signed long ErlDrvSInt;
-
-#if defined(__WIN32__)
-typedef unsigned __int64 ErlDrvUInt64;
-typedef __int64 ErlDrvSInt64;
-#elif SIZEOF_LONG == 8
-typedef unsigned long ErlDrvUInt64;
-typedef long ErlDrvSInt64;
-#elif SIZEOF_LONG_LONG == 8
-typedef unsigned long long ErlDrvUInt64;
-typedef long long ErlDrvSInt64;
-#else
-#error No 64-bit integer type
-#endif
-
 /*
  * A driver monitor
  */
@@ -394,9 +395,9 @@ EXTERN int driver_exit (ErlDrvPort port, int err);
 EXTERN ErlDrvPDL driver_pdl_create(ErlDrvPort);
 EXTERN void driver_pdl_lock(ErlDrvPDL);
 EXTERN void driver_pdl_unlock(ErlDrvPDL);
-EXTERN long driver_pdl_get_refc(ErlDrvPDL);
-EXTERN long driver_pdl_inc_refc(ErlDrvPDL);
-EXTERN long driver_pdl_dec_refc(ErlDrvPDL);
+EXTERN ErlDrvSInt driver_pdl_get_refc(ErlDrvPDL);
+EXTERN ErlDrvSInt driver_pdl_inc_refc(ErlDrvPDL);
+EXTERN ErlDrvSInt driver_pdl_dec_refc(ErlDrvPDL);
 
 /*
  * Process monitors
@@ -432,9 +433,9 @@ EXTERN ErlDrvBinary* driver_realloc_binary(ErlDrvBinary *bin, int size);
 EXTERN void driver_free_binary(ErlDrvBinary *bin);
 
 /* Referenc count on driver binaries */
-EXTERN long driver_binary_get_refc(ErlDrvBinary *dbp);
-EXTERN long driver_binary_inc_refc(ErlDrvBinary *dbp);
-EXTERN long driver_binary_dec_refc(ErlDrvBinary *dbp);
+EXTERN ErlDrvSInt driver_binary_get_refc(ErlDrvBinary *dbp);
+EXTERN ErlDrvSInt driver_binary_inc_refc(ErlDrvBinary *dbp);
+EXTERN ErlDrvSInt driver_binary_dec_refc(ErlDrvBinary *dbp);
 
 /* Allocation interface */
 EXTERN void *driver_alloc(size_t size);
diff --git a/erts/emulator/beam/erl_drv_thread.c b/erts/emulator/beam/erl_drv_thread.c
index 50d8c25c46..39bbe9633b 100644
--- a/erts/emulator/beam/erl_drv_thread.c
+++ b/erts/emulator/beam/erl_drv_thread.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2007-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2007-2011. 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%
  */
 
@@ -24,6 +24,10 @@
 #include "global.h"
 #include <string.h>
 
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+#define __DARWIN__ 1
+#endif
+
 #define ERL_DRV_THR_OPTS_SIZE(LAST_FIELD) \
   (((size_t) &((ErlDrvThreadOpts *) 0)->LAST_FIELD) \
    + sizeof(((ErlDrvThreadOpts *) 0)->LAST_FIELD))
@@ -186,10 +190,9 @@ int
 erl_drv_mutex_trylock(ErlDrvMutex *dmtx)
 {
 #ifdef USE_THREADS
-    int res = dmtx ? ethr_mutex_trylock(&dmtx->mtx) : EINVAL;
-    if (res != 0 && res != EBUSY)
-	fatal_error(res, "erl_drv_mutex_trylock()");
-    return res;
+    if (!dmtx)
+	fatal_error(EINVAL, "erl_drv_mutex_trylock()");
+    return ethr_mutex_trylock(&dmtx->mtx);
 #else
     return 0;
 #endif
@@ -199,9 +202,9 @@ void
 erl_drv_mutex_lock(ErlDrvMutex *dmtx)
 {
 #ifdef USE_THREADS
-    int res = dmtx ? ethr_mutex_lock(&dmtx->mtx) : EINVAL;
-    if (res != 0)
-	fatal_error(res, "erl_drv_mutex_lock()");
+    if (!dmtx)
+	fatal_error(EINVAL, "erl_drv_mutex_lock()");
+    ethr_mutex_lock(&dmtx->mtx);
 #endif
 }
 
@@ -209,9 +212,9 @@ void
 erl_drv_mutex_unlock(ErlDrvMutex *dmtx)
 {
 #ifdef USE_THREADS
-    int res = dmtx ? ethr_mutex_unlock(&dmtx->mtx) : EINVAL;
-    if (res != 0)
-	fatal_error(res, "erl_drv_mutex_unlock()");
+    if (!dmtx)
+	fatal_error(EINVAL, "erl_drv_mutex_unlock()");
+    ethr_mutex_unlock(&dmtx->mtx);
 #endif
 }
 
@@ -256,9 +259,9 @@ void
 erl_drv_cond_signal(ErlDrvCond *dcnd)
 {
 #ifdef USE_THREADS
-    int res = dcnd ? ethr_cond_signal(&dcnd->cnd) : EINVAL;
-    if (res != 0)
-	fatal_error(res, "erl_drv_cond_signal()");
+    if (!dcnd)
+	fatal_error(EINVAL, "erl_drv_cond_signal()");
+    ethr_cond_signal(&dcnd->cnd);
 #endif
 }
 
@@ -266,9 +269,9 @@ void
 erl_drv_cond_broadcast(ErlDrvCond *dcnd)
 {
 #ifdef USE_THREADS
-    int res = dcnd ? ethr_cond_broadcast(&dcnd->cnd) : EINVAL;
-    if (res != 0)
-	fatal_error(res, "erl_drv_cond_broadcast()");
+    if (!dcnd)
+	fatal_error(EINVAL, "erl_drv_cond_broadcast()");
+    ethr_cond_broadcast(&dcnd->cnd);
 #endif
 }
 
@@ -277,18 +280,13 @@ void
 erl_drv_cond_wait(ErlDrvCond *dcnd, ErlDrvMutex *dmtx)
 {
 #ifdef USE_THREADS
-    int res;
     if (!dcnd || !dmtx) {
-	res = EINVAL;
-    error:
-	fatal_error(res, "erl_drv_cond_wait()");
+	fatal_error(EINVAL, "erl_drv_cond_wait()");
     }
     while (1) {
-	res = ethr_cond_wait(&dcnd->cnd, &dmtx->mtx);
+	int res = ethr_cond_wait(&dcnd->cnd, &dmtx->mtx);
 	if (res == 0)
 	    break;
-	if (res != EINTR)
-	    goto error;
     }
 #endif
 }
@@ -333,10 +331,9 @@ int
 erl_drv_rwlock_tryrlock(ErlDrvRWLock *drwlck)
 {
 #ifdef USE_THREADS
-    int res = drwlck ? ethr_rwmutex_tryrlock(&drwlck->rwmtx) : EINVAL;
-    if (res != 0 && res != EBUSY)
-	fatal_error(res, "erl_drv_rwlock_tryrlock()");
-    return res;
+    if (!drwlck)
+	fatal_error(EINVAL, "erl_drv_rwlock_tryrlock()");
+    return ethr_rwmutex_tryrlock(&drwlck->rwmtx);
 #else
     return 0;
 #endif
@@ -346,9 +343,9 @@ void
 erl_drv_rwlock_rlock(ErlDrvRWLock *drwlck)
 {
 #ifdef USE_THREADS
-    int res = drwlck ? ethr_rwmutex_rlock(&drwlck->rwmtx) : EINVAL;
-    if (res != 0)
-	fatal_error(res, "erl_drv_rwlock_rlock()");
+    if (!drwlck)
+	fatal_error(EINVAL, "erl_drv_rwlock_rlock()");
+    ethr_rwmutex_rlock(&drwlck->rwmtx);
 #endif
 }
 
@@ -356,9 +353,9 @@ void
 erl_drv_rwlock_runlock(ErlDrvRWLock *drwlck)
 {
 #ifdef USE_THREADS
-    int res = drwlck ? ethr_rwmutex_runlock(&drwlck->rwmtx) : EINVAL;
-    if (res != 0)
-	fatal_error(res, "erl_drv_rwlock_runlock()");
+    if (!drwlck)
+	fatal_error(EINVAL, "erl_drv_rwlock_runlock()");
+    ethr_rwmutex_runlock(&drwlck->rwmtx);
 #endif
 }
 
@@ -366,10 +363,9 @@ int
 erl_drv_rwlock_tryrwlock(ErlDrvRWLock *drwlck)
 {
 #ifdef USE_THREADS
-    int res = drwlck ? ethr_rwmutex_tryrwlock(&drwlck->rwmtx) : EINVAL;
-    if (res != 0 && res != EBUSY)
-	fatal_error(res, "erl_drv_rwlock_tryrwlock()");
-    return res;
+    if (!drwlck)
+	fatal_error(EINVAL, "erl_drv_rwlock_tryrwlock()");
+    return ethr_rwmutex_tryrwlock(&drwlck->rwmtx);
 #else
     return 0;
 #endif
@@ -379,9 +375,9 @@ void
 erl_drv_rwlock_rwlock(ErlDrvRWLock *drwlck)
 {
 #ifdef USE_THREADS
-    int res = drwlck ? ethr_rwmutex_rwlock(&drwlck->rwmtx) : EINVAL;
-    if (res != 0)
-	fatal_error(res, "erl_drv_rwlock_rwlock()");
+    if (!drwlck)
+	fatal_error(EINVAL, "erl_drv_rwlock_rwlock()");
+    ethr_rwmutex_rwlock(&drwlck->rwmtx);
 #endif
 }
 
@@ -389,9 +385,9 @@ void
 erl_drv_rwlock_rwunlock(ErlDrvRWLock *drwlck)
 {
 #ifdef USE_THREADS
-    int res = drwlck ? ethr_rwmutex_rwunlock(&drwlck->rwmtx) : EINVAL;
-    if (res != 0)
-	fatal_error(res, "erl_drv_rwlock_rwunlock()");
+    if (!drwlck)
+	fatal_error(EINVAL, "erl_drv_rwlock_rwunlock()");
+    ethr_rwmutex_rwunlock(&drwlck->rwmtx);
 #endif
 }
 
@@ -536,7 +532,7 @@ erl_drv_tsd_get(ErlDrvTSDKey key)
     if (!dtid)
 	return NULL;
 #endif
-    if (ERL_DRV_TSD_LEN__ < key)
+    if (ERL_DRV_TSD_LEN__ <= key)
 	return NULL;
     return ERL_DRV_TSD__[key];
 }
@@ -603,11 +599,7 @@ erl_drv_thread_create(char *name,
 	dtid->name = ((char *) dtid) + sizeof(struct ErlDrvTid_);
 	sys_strcpy(dtid->name, name);
     }
-#ifdef ERTS_ENABLE_LOCK_COUNT
-    res = erts_lcnt_thr_create(&dtid->tid, erl_drv_thread_wrapper, dtid, use_opts);
-#else
     res = ethr_thr_create(&dtid->tid, erl_drv_thread_wrapper, dtid, use_opts);
-#endif
 
     if (res != 0) {
 	erts_free(ERTS_ALC_T_DRV_TID, dtid);
@@ -704,3 +696,57 @@ erl_drv_thread_join(ErlDrvTid tid, void **respp)
 #endif
 }
 
+#if defined(__DARWIN__) && defined(USE_THREADS) && defined(ERTS_SMP)
+extern int erts_darwin_main_thread_pipe[2];
+extern int erts_darwin_main_thread_result_pipe[2];
+
+
+int
+erl_drv_stolen_main_thread_join(ErlDrvTid tid, void **respp)
+{
+    void *dummy;
+    void **x;
+    if (respp == NULL)
+	x = &dummy;
+    else
+	x = respp;
+    read(erts_darwin_main_thread_result_pipe[0],x,sizeof(void *));
+    return 0;
+}
+
+int
+erl_drv_steal_main_thread(char *name,
+			  ErlDrvTid *tid,
+			  void* (*func)(void*),
+			  void* arg,
+			  ErlDrvThreadOpts *opts)
+{
+    char buff[sizeof(void* (*)(void*)) + sizeof(void *)];
+    int buff_sz = sizeof(void* (*)(void*)) + sizeof(void *);
+    /*struct ErlDrvTid_ *dtid;
+
+    dtid = erts_alloc_fnf(ERTS_ALC_T_DRV_TID,
+			  (sizeof(struct ErlDrvTid_)
+			   + (name ? sys_strlen(name) + 1 : 0)));
+    if (!dtid)
+	return ENOMEM;
+    memset(dtid,0,sizeof(ErlDrvTid_));
+    dtid->tid = (void * ) -1;
+    dtid->drv_thr = 1;
+    dtid->func = func;
+    dtid->arg = arg;
+    dtid->tsd = NULL;
+    dtid->tsd_len = 0;
+    dtid->name = no_name;
+    *tid = (ErlDrvTid) dtid;
+    */
+    *tid = NULL;
+    /* Ignore options and name... */
+    
+    memcpy(buff,&func,sizeof(void* (*)(void*)));
+    memcpy(buff + sizeof(void* (*)(void*)),&arg,sizeof(void *));
+    write(erts_darwin_main_thread_pipe[1],buff,buff_sz);
+    return 0;
+}
+
+#endif
diff --git a/erts/emulator/beam/erl_fun.c b/erts/emulator/beam/erl_fun.c
index 15d9538301..88947b5536 100644
--- a/erts/emulator/beam/erl_fun.c
+++ b/erts/emulator/beam/erl_fun.c
@@ -37,8 +37,6 @@ static erts_smp_rwmtx_t erts_fun_table_lock;
 #define erts_fun_read_unlock()	erts_smp_rwmtx_runlock(&erts_fun_table_lock)
 #define erts_fun_write_lock()	erts_smp_rwmtx_rwlock(&erts_fun_table_lock)
 #define erts_fun_write_unlock()	erts_smp_rwmtx_rwunlock(&erts_fun_table_lock)
-#define erts_fun_init_lock()	erts_smp_rwmtx_init(&erts_fun_table_lock, \
-						    "fun_tab")
 
 static HashValue fun_hash(ErlFunEntry* obj);
 static int fun_cmp(ErlFunEntry* obj1, ErlFunEntry* obj2);
@@ -57,8 +55,12 @@ void
 erts_init_fun_table(void)
 {
     HashFunctions f;
+    erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER;
+    rwmtx_opt.type = ERTS_SMP_RWMTX_TYPE_FREQUENT_READ;
+    rwmtx_opt.lived = ERTS_SMP_RWMTX_LONG_LIVED;
+
+    erts_smp_rwmtx_init_opt(&erts_fun_table_lock, &rwmtx_opt, "fun_tab");
 
-    erts_fun_init_lock();
     f.hash = (H_FUN) fun_hash;
     f.cmp  = (HCMP_FUN) fun_cmp;
     f.alloc = (HALLOC_FUN) fun_alloc;
@@ -95,7 +97,7 @@ erts_put_fun_entry(Eterm mod, int uniq, int index)
 {
     ErlFunEntry template;
     ErlFunEntry* fe;
-    long refc;
+    erts_aint_t refc;
     ASSERT(is_atom(mod));
     template.old_uniq = uniq;
     template.old_index = index;
@@ -117,7 +119,7 @@ erts_put_fun_entry2(Eterm mod, int old_uniq, int old_index,
 {
     ErlFunEntry template;
     ErlFunEntry* fe;
-    long refc;
+    erts_aint_t refc;
 
     ASSERT(is_atom(mod));
     template.old_uniq = old_uniq;
@@ -155,7 +157,7 @@ erts_get_fun_entry(Eterm mod, int uniq, int index)
     erts_fun_read_lock();
     ret = (ErlFunEntry *) hash_get(&erts_fun_table, (void*) &template);
     if (ret) {
-	long refc = erts_refc_inctest(&ret->refc, 1);
+	erts_aint_t refc = erts_refc_inctest(&ret->refc, 1);
 	if (refc < 2) /* Pending delete */
 	    erts_refc_inc(&ret->refc, 1);
     }
@@ -192,20 +194,6 @@ erts_erase_fun_entry(ErlFunEntry* fe)
     erts_fun_write_unlock();
 }
 
-#ifndef HYBRID /* FIND ME! */
-void
-erts_cleanup_funs(ErlFunThing* funp)
-{
-    while (funp) {
-	ErlFunEntry* fe = funp->fe;
-	if (erts_refc_dectest(&fe->refc, 0) == 0) {
-	    erts_erase_fun_entry(fe);
-	}
-	funp = funp->next;
-    }
-}
-#endif
-
 void
 erts_cleanup_funs_on_purge(BeamInstr* start, BeamInstr* end)
 {
@@ -269,7 +257,7 @@ erts_dump_fun_entries(int to, void *to_arg)
 #ifdef HIPE
 	    erts_print(to, to_arg, "Native_address: %p\n", fe->native_address);
 #endif
-	    erts_print(to, to_arg, "Refc: %d\n", erts_refc_read(&fe->refc, 1));
+	    erts_print(to, to_arg, "Refc: %ld\n", erts_refc_read(&fe->refc, 1));
 	    b = b->next;
 	}
     }
diff --git a/erts/emulator/beam/erl_fun.h b/erts/emulator/beam/erl_fun.h
index 944d4b3df5..2f165afa06 100644
--- a/erts/emulator/beam/erl_fun.h
+++ b/erts/emulator/beam/erl_fun.h
@@ -53,10 +53,10 @@ typedef struct erl_fun_entry {
 
 typedef struct erl_fun_thing {
     Eterm thing_word;		/* Subtag FUN_SUBTAG. */
+    ErlFunEntry* fe;		/* Pointer to fun entry. */
 #ifndef HYBRID /* FIND ME! */
-    struct erl_fun_thing* next;	/* Next fun in mso list. */
+    struct erl_off_heap_header* next;
 #endif
-    ErlFunEntry* fe;		/* Pointer to fun entry. */
 #ifdef HIPE
     UWord* native_address;	/* Native code for the fun. */
 #endif
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index a19e090f1e..2aa932e7d1 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -110,9 +110,7 @@ static Uint adjust_after_fullsweep(Process *p, int size_before,
 				   int need, Eterm *objv, int nobj);
 static void shrink_new_heap(Process *p, Uint new_sz, Eterm *objv, int nobj);
 static void grow_new_heap(Process *p, Uint new_sz, Eterm* objv, int nobj);
-static void sweep_proc_bins(Process *p, int fullsweep);
-static void sweep_proc_funs(Process *p, int fullsweep);
-static void sweep_proc_externals(Process *p, int fullsweep);
+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_rootset(Process *p, Sint offs, char* area, Uint area_size,
@@ -145,6 +143,16 @@ erts_init_gc(void)
 {
     int i = 0;
 
+    ASSERT(offsetof(ProcBin,thing_word) == offsetof(struct erl_off_heap_header,thing_word));
+    ASSERT(offsetof(ProcBin,thing_word) == offsetof(ErlFunThing,thing_word));
+    ASSERT(offsetof(ProcBin,thing_word) == offsetof(ExternalThing,header));
+    ASSERT(offsetof(ProcBin,size) == offsetof(struct erl_off_heap_header,size));
+    ASSERT(offsetof(ProcBin,size) == offsetof(ErlSubBin,size));
+    ASSERT(offsetof(ProcBin,size) == offsetof(ErlHeapBin,size));
+    ASSERT(offsetof(ProcBin,next) == offsetof(struct erl_off_heap_header,next));
+    ASSERT(offsetof(ProcBin,next) == offsetof(ErlFunThing,next));
+    ASSERT(offsetof(ProcBin,next) == offsetof(ExternalThing,next));
+
     erts_smp_spinlock_init(&info_lck, "gc_info");
     garbage_cols = 0;
     reclaimed = 0;
@@ -286,25 +294,14 @@ erts_offset_heap_ptr(Eterm* hp, Uint sz, Sint offs,
     offset_heap_ptr(hp, sz, offs, (char *) low, ((char *)high)-((char *)low));
 }
 
+
 #define ptr_within(ptr, low, high) ((ptr) < (high) && (ptr) >= (low))
 
 void
 erts_offset_off_heap(ErlOffHeap *ohp, Sint offs, Eterm* low, Eterm* high)
 {
-    if (ohp->mso && ptr_within((Eterm *)ohp->mso, low, high)) {
-        Eterm** uptr = (Eterm**) (void *) &ohp->mso;
-        *uptr += offs;
-    }
-
-#ifndef HYBRID /* FIND ME! */
-    if (ohp->funs && ptr_within((Eterm *)ohp->funs, low, high)) {
-        Eterm** uptr = (Eterm**) (void *) &ohp->funs;
-        *uptr += offs;
-    }
-#endif
-
-    if (ohp->externals && ptr_within((Eterm *)ohp->externals, low, high)) {
-        Eterm** uptr = (Eterm**) (void *) &ohp->externals;
+    if (ohp->first && ptr_within((Eterm *)ohp->first, low, high)) {
+        Eterm** uptr = (Eterm**) (void *) &ohp->first;
         *uptr += offs;
     }
 }
@@ -504,14 +501,8 @@ erts_garbage_collect_hibernate(Process* p)
 
     cleanup_rootset(&rootset);
 
-    if (MSO(p).mso) {
-        sweep_proc_bins(p, 1);
-    }
-    if (MSO(p).funs) {
-        sweep_proc_funs(p, 1);
-    }
-    if (MSO(p).externals) {
-        sweep_proc_externals(p, 1);
+    if (MSO(p).first) {
+        sweep_off_heap(p, 1);
     }
 
     /*
@@ -752,7 +743,10 @@ minor_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
      * is large enough.
      */
 
-    if (OLD_HEAP(p) && mature <= OLD_HEND(p) - OLD_HTOP(p)) {
+    if (OLD_HEAP(p) &&
+	    ((mature <= OLD_HEND(p) - OLD_HTOP(p)) &&
+	    ((BIN_VHEAP_MATURE(p) < ( BIN_OLD_VHEAP_SZ(p) - BIN_OLD_VHEAP(p)))) &&
+	    ((BIN_OLD_VHEAP_SZ(p) > BIN_OLD_VHEAP(p))) ) ) {
 	ErlMessage *msgp;
 	Uint size_after;
 	Uint need_after;
@@ -1041,15 +1035,8 @@ do_minor(Process *p, int new_sz, Eterm* objv, int nobj)
     OLD_HTOP(p) = old_htop;
     HIGH_WATER(p) = (HEAP_START(p) != HIGH_WATER(p)) ? n_heap : n_htop;
 
-    if (MSO(p).mso) {
-        sweep_proc_bins(p, 0);
-    }
-
-    if (MSO(p).funs) {
-        sweep_proc_funs(p, 0);
-    }
-    if (MSO(p).externals) {
-        sweep_proc_externals(p, 0);
+    if (MSO(p).first) {
+	sweep_off_heap(p, 0);
     }
 
 #ifdef HARDDEBUG
@@ -1271,17 +1258,11 @@ major_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
 	}
     }
 
-    if (MSO(p).mso) {
-	sweep_proc_bins(p, 1);
-    }
-    if (MSO(p).funs) {
-	sweep_proc_funs(p, 1);
-    }
-    if (MSO(p).externals) {
-	sweep_proc_externals(p, 1);
+    if (MSO(p).first) {
+	sweep_off_heap(p, 1);
     }
 
-    if (OLD_HEAP(p) != NULL) {
+    if (OLD_HEAP(p) != NULL) {       
 	ERTS_HEAP_FREE(ERTS_ALC_T_OLD_HEAP,
 		       OLD_HEAP(p),
 		       (OLD_HEND(p) - OLD_HEAP(p)) * sizeof(Eterm));
@@ -1305,6 +1286,7 @@ major_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
     HIGH_WATER(p) = HEAP_TOP(p);
 
     ErtsGcQuickSanityCheck(p);
+
     /*
      * Copy newly received message onto the end of the new heap.
      */
@@ -2003,8 +1985,8 @@ shrink_new_heap(Process *p, Uint new_sz, Eterm *objv, int nobj)
     HEAP_SIZE(p) = new_sz;
 }
 
-static Uint
-do_next_vheap_size(Uint vheap, Uint vheap_sz) {
+static Uint64
+do_next_vheap_size(Uint64 vheap, Uint64 vheap_sz) {
 
     /*                grow
      *
@@ -2021,131 +2003,53 @@ do_next_vheap_size(Uint vheap, Uint vheap_sz) {
      *          ----------------------
      */
 
-    if (vheap > (Uint) (vheap_sz*3/4)) {
+    if ((Uint64) vheap/3 > (Uint64) (vheap_sz/4)) {
+	Uint64 new_vheap_sz = vheap_sz;
 
-	while(vheap > (Uint) (vheap_sz*3/4)) {
-	    vheap_sz = vheap_sz*2;
+	while((Uint64) vheap/3 > (Uint64) (vheap_sz/4)) {
+	    /* the golden ratio = 1.618 */
+	    new_vheap_sz = (Uint64) vheap_sz * 1.618;
+	    if (new_vheap_sz < vheap_sz ) {
+	        return vheap_sz;
+	    }
+	    vheap_sz = new_vheap_sz;
 	}
 
-	return erts_next_heap_size(vheap_sz, 0);
+	return vheap_sz;
     }
 
-    if (vheap < (Uint) (vheap_sz/4)) {
-	return erts_next_heap_size((Uint) (vheap_sz / 2), 0);
+    if (vheap < (Uint64) (vheap_sz/4)) {
+	return (vheap_sz >> 1);
     }
 
     return vheap_sz;
 
 }
 
-static Uint
-next_vheap_size(Process* p, Uint vheap, Uint vheap_sz) {
-    vheap_sz = do_next_vheap_size(vheap, vheap_sz);
-    return vheap_sz < p->min_vheap_size ? p->min_vheap_size : vheap_sz;
-}
-
-static void
-sweep_proc_externals(Process *p, int fullsweep)
-{
-    ExternalThing** prev;
-    ExternalThing* ptr;
-    char* oh = 0;
-    Uint oh_size = 0;
-
-    if (fullsweep == 0) {
-	oh = (char *) OLD_HEAP(p);
-	oh_size = (char *) OLD_HEND(p) - oh;
-    }
-
-    prev = &MSO(p).externals;
-    ptr = MSO(p).externals;
-
-    while (ptr) {
-        Eterm* ppt = (Eterm *) ptr;
-
-        if (IS_MOVED_BOXED(*ppt)) {        /* Object is alive */
-            ExternalThing* ro = external_thing_ptr(*ppt);
-
-            *prev = ro;         /* Patch to moved pos */
-            prev = &ro->next;
-            ptr = ro->next;
-        } else if (in_area(ppt, oh, oh_size)) {
-            /*
-             * Object resides on old heap, and we just did a
-             * generational collection - keep object in list.
-             */
-            prev = &ptr->next;
-            ptr = ptr->next;
-        } else {                /* Object has not been moved - deref it */
-	    erts_deref_node_entry(ptr->node);
-            *prev = ptr = ptr->next;
-        }
-    }
-    ASSERT(*prev == NULL);
-}
-
-static void
-sweep_proc_funs(Process *p, int fullsweep)
-{
-    ErlFunThing** prev;
-    ErlFunThing* ptr;
-    char* oh = 0;
-    Uint oh_size = 0;
-
-    if (fullsweep == 0) {
-	oh = (char *) OLD_HEAP(p);
-	oh_size = (char *) OLD_HEND(p) - oh;
-    }
-		      
-    prev = &MSO(p).funs;
-    ptr = MSO(p).funs;
-
-    while (ptr) {
-        Eterm* ppt = (Eterm *) ptr;
-
-        if (IS_MOVED_BOXED(*ppt)) {        /* Object is alive */
-            ErlFunThing* ro = (ErlFunThing *) fun_val(*ppt);
-
-            *prev = ro;         /* Patch to moved pos */
-            prev = &ro->next;
-            ptr = ro->next;
-        } else if (in_area(ppt, oh, oh_size)) {
-            /*
-             * Object resides on old heap, and we just did a
-             * generational collection - keep object in list.
-             */
-            prev = &ptr->next;
-            ptr = ptr->next;
-        } else {                /* Object has not been moved - deref it */
-            ErlFunEntry* fe = ptr->fe;
-
-            *prev = ptr = ptr->next;
-	    if (erts_refc_dectest(&fe->refc, 0) == 0) {
-                erts_erase_fun_entry(fe);
-            }
-        }
-    }
-    ASSERT(*prev == NULL);
+static Uint64
+next_vheap_size(Process* p, Uint64 vheap, Uint64 vheap_sz) {
+    Uint64 new_vheap_sz = do_next_vheap_size(vheap, vheap_sz);
+    return new_vheap_sz < p->min_vheap_size ? p->min_vheap_size : new_vheap_sz;
 }
 
 struct shrink_cand_data {
-    ProcBin* new_candidates;
-    ProcBin* new_candidates_end;
-    ProcBin* old_candidates;
+    struct erl_off_heap_header* new_candidates;
+    struct erl_off_heap_header* new_candidates_end;
+    struct erl_off_heap_header* old_candidates;
     Uint no_of_candidates;
     Uint no_of_active;
 };
 
 static ERTS_INLINE void
 link_live_proc_bin(struct shrink_cand_data *shrink,
-		   ProcBin ***prevppp,
-		   ProcBin **pbpp,
+		   struct erl_off_heap_header*** prevppp,
+		   struct erl_off_heap_header** currpp,
 		   int new_heap)
 {
-    ProcBin *pbp = *pbpp;
-
-    *pbpp = pbp->next;
+    ProcBin *pbp = (ProcBin*) *currpp;
+    ASSERT(**prevppp == *currpp);
 
+    *currpp = pbp->next;
     if (pbp->flags & (PB_ACTIVE_WRITER|PB_IS_WRITABLE)) {
 	ASSERT(((pbp->flags & (PB_ACTIVE_WRITER|PB_IS_WRITABLE))
 		== (PB_ACTIVE_WRITER|PB_IS_WRITABLE))
@@ -2162,15 +2066,16 @@ link_live_proc_bin(struct shrink_cand_data *shrink,
 	    /* Our allocators are 8 byte aligned, i.e., shrinking with
 	       less than 8 bytes will have no real effect */
 	    if (unused >= 8) { /* A shrink candidate; save in candidate list */
+		**prevppp = pbp->next;
 		if (new_heap) {
 		    if (!shrink->new_candidates)
-			shrink->new_candidates_end = pbp;
+			shrink->new_candidates_end = (struct erl_off_heap_header*)pbp;
 		    pbp->next = shrink->new_candidates;
-		    shrink->new_candidates = pbp;
+		    shrink->new_candidates = (struct erl_off_heap_header*)pbp;
 		}
 		else {
 		    pbp->next = shrink->old_candidates;
-		    shrink->old_candidates = pbp;
+		    shrink->old_candidates = (struct erl_off_heap_header*)pbp;
 		}
 		shrink->no_of_candidates++;
 		return;
@@ -2178,83 +2083,117 @@ link_live_proc_bin(struct shrink_cand_data *shrink,
 	}
     }
 
-    /* Not a shrink candidate; keep in original mso list */
-    **prevppp = pbp;
+    /* Not a shrink candidate; keep in original mso list */ 
     *prevppp = &pbp->next;
-
 }
 
 
-static void 
-sweep_proc_bins(Process *p, int fullsweep)
+static void
+sweep_off_heap(Process *p, int fullsweep)
 {
     struct shrink_cand_data shrink = {0};
-    ProcBin** prev;
-    ProcBin* ptr;
-    Binary* bptr;
-    char* oh = NULL;
-    Uint oh_size = 0;
-    Uint bin_vheap = 0;
+    struct erl_off_heap_header* ptr;
+    struct erl_off_heap_header** prev;
+    char* oheap = NULL;
+    Uint oheap_sz = 0;
+    Uint64 bin_vheap = 0;
+#ifdef DEBUG
+    int seen_mature = 0;
+#endif
 
     if (fullsweep == 0) {
-	oh = (char *) OLD_HEAP(p);
-	oh_size = (char *) OLD_HEND(p) - oh;
+	oheap = (char *) OLD_HEAP(p);
+	oheap_sz = (char *) OLD_HEND(p) - oheap;
     }
 
     BIN_OLD_VHEAP(p) = 0;
 
-    prev = &MSO(p).mso;
-    ptr = MSO(p).mso;
+    prev = &MSO(p).first;
+    ptr = MSO(p).first;
 
-    /*
-     * Note: In R7 we no longer force a fullsweep when we find binaries
-     * on the old heap. The reason is that with the introduction of the
-     * bit syntax we can expect binaries to be used a lot more. Note that
-     * in earlier releases a brand new binary (or any other term) could
-     * be put on the old heap during a gen-gc fullsweep, but this is
-     * no longer the case in R7.
+    /* Firts part of the list will reside on the (old) new-heap.
+     * Keep if moved, otherwise deref.
      */
     while (ptr) {
-        Eterm* ppt = (Eterm *) ptr;
-
-        if (IS_MOVED_BOXED(*ppt)) {        /* Object is alive */
-	    bin_vheap += ptr->size / sizeof(Eterm);
-            ptr = (ProcBin*) binary_val(*ppt);		   
-	    link_live_proc_bin(&shrink,
-			       &prev,
-			       &ptr,
-			       !in_area(ptr, oh, oh_size)); 
-        } else if (in_area(ppt, oh, oh_size)) {
-            /*
-             * Object resides on old heap, and we just did a
-             * generational collection - keep object in list.
-             */
-            BIN_OLD_VHEAP(p) += ptr->size / sizeof(Eterm); /* for binary gc (words)*/
-	    link_live_proc_bin(&shrink, &prev, &ptr, 0); 
-        } else {                /* Object has not been moved - deref it */
-
-            *prev = ptr->next;
-            bptr = ptr->val;
-            if (erts_refc_dectest(&bptr->refc, 0) == 0)
-		erts_bin_free(bptr);
-            ptr = *prev;
-        }
+	if (IS_MOVED_BOXED(ptr->thing_word)) {
+	    ASSERT(!in_area(ptr, oheap, oheap_sz));
+	    *prev = ptr = (struct erl_off_heap_header*) boxed_val(ptr->thing_word);
+	    ASSERT(!IS_MOVED_BOXED(ptr->thing_word));
+	    if (ptr->thing_word == HEADER_PROC_BIN) {
+		int to_new_heap = !in_area(ptr, oheap, oheap_sz);
+		ASSERT(to_new_heap == !seen_mature || (!to_new_heap && (seen_mature=1)));
+		if (to_new_heap) {
+		    bin_vheap += ptr->size / sizeof(Eterm);
+		} else {
+		    BIN_OLD_VHEAP(p) += ptr->size / sizeof(Eterm); /* for binary gc (words)*/
+		}		
+		link_live_proc_bin(&shrink, &prev, &ptr, to_new_heap);
+	    }
+	    else {
+		prev = &ptr->next;
+		ptr = ptr->next;
+	    }
+	}
+	else if (!in_area(ptr, oheap, oheap_sz)) {
+	    /* garbage */
+	    switch (thing_subtag(ptr->thing_word)) {
+	    case REFC_BINARY_SUBTAG:
+		{
+		    Binary* bptr = ((ProcBin*)ptr)->val;	
+		    if (erts_refc_dectest(&bptr->refc, 0) == 0) {
+			erts_bin_free(bptr);
+		    }
+		    break;
+		}
+	    case FUN_SUBTAG:
+		{
+		    ErlFunEntry* fe = ((ErlFunThing*)ptr)->fe;
+		    if (erts_refc_dectest(&fe->refc, 0) == 0) {
+			erts_erase_fun_entry(fe);
+		    }
+		    break;
+		}
+	    default:
+		ASSERT(is_external_header(ptr->thing_word));
+		erts_deref_node_entry(((ExternalThing*)ptr)->node);
+	    }
+	    *prev = ptr = ptr->next;
+	}
+	else break; /* and let old-heap loop continue */
     }
 
-    if (BIN_OLD_VHEAP(p) >= BIN_OLD_VHEAP_SZ(p)) {
-        FLAGS(p) |= F_NEED_FULLSWEEP;
+    /* The rest of the list resides on old-heap, and we just did a
+     * generational collection - keep objects in list.
+     */
+    while (ptr) {
+	ASSERT(in_area(ptr, oheap, oheap_sz));
+	ASSERT(!IS_MOVED_BOXED(ptr->thing_word));       
+	if (ptr->thing_word == HEADER_PROC_BIN) {
+	    BIN_OLD_VHEAP(p) += ptr->size / sizeof(Eterm); /* for binary gc (words)*/
+	    link_live_proc_bin(&shrink, &prev, &ptr, 0);
+	}
+	else {
+	    ASSERT(is_fun_header(ptr->thing_word) ||
+		   is_external_header(ptr->thing_word));
+	    prev = &ptr->next;
+	    ptr = ptr->next;
+	}
     }
 
-    BIN_VHEAP_SZ(p) = next_vheap_size(p, bin_vheap, BIN_VHEAP_SZ(p));
-    BIN_OLD_VHEAP_SZ(p) = next_vheap_size(p, BIN_OLD_VHEAP(p), BIN_OLD_VHEAP_SZ(p));
-    MSO(p).overhead = bin_vheap;
+    if (fullsweep) {
+	BIN_OLD_VHEAP_SZ(p) = next_vheap_size(p, BIN_OLD_VHEAP(p) + MSO(p).overhead, BIN_OLD_VHEAP_SZ(p));
+    }
+    BIN_VHEAP_SZ(p)     = next_vheap_size(p, bin_vheap, BIN_VHEAP_SZ(p));
+    MSO(p).overhead     = bin_vheap;
+    BIN_VHEAP_MATURE(p) = bin_vheap;
 
     /*
      * If we got any shrink candidates, check them out.
      */
 
     if (shrink.no_of_candidates) {
-	ProcBin *candlist[] = {shrink.new_candidates, shrink.old_candidates};
+	ProcBin *candlist[] = { (ProcBin*)shrink.new_candidates,
+	                        (ProcBin*)shrink.old_candidates };
 	Uint leave_unused = 0;
 	int i;
 
@@ -2266,21 +2205,21 @@ sweep_proc_bins(Process *p, int fullsweep)
 	}
 
 	for (i = 0; i < sizeof(candlist)/sizeof(candlist[0]); i++) {
-
-	    for (ptr = candlist[i]; ptr; ptr = ptr->next) {
-		Uint new_size = ptr->size;
+	    ProcBin* pb;
+	    for (pb = candlist[i]; pb; pb = (ProcBin*)pb->next) {
+		Uint new_size = pb->size;
 
 		if (leave_unused) {
 		    new_size += (new_size * 100) / leave_unused;
 		    /* Our allocators are 8 byte aligned, i.e., shrinking with
 		       less than 8 bytes will have no real effect */
-		    if (new_size + 8 >= ptr->val->orig_size)
+		    if (new_size + 8 >= pb->val->orig_size)
 			continue;
 		}
 
-		ptr->val = erts_bin_realloc(ptr->val, new_size);
-		ptr->val->orig_size = new_size;
-		ptr->bytes = (byte *) ptr->val->orig_bytes;
+		pb->val = erts_bin_realloc(pb->val, new_size);
+		pb->val->orig_size = new_size;
+		pb->bytes = (byte *) pb->val->orig_bytes;
 	    }
 	}
 
@@ -2289,21 +2228,20 @@ sweep_proc_bins(Process *p, int fullsweep)
 	 * We now potentially have the mso list divided into three lists:
 	 * - shrink candidates on new heap (inactive writable with unused data)
 	 * - shrink candidates on old heap (inactive writable with unused data)
-	 * - other binaries (read only + active writable ...)
+	 * - other binaries (read only + active writable ...) + funs and externals
 	 *
 	 * Put them back together: new candidates -> other -> old candidates
 	 * This order will ensure that the list only refers from new
 	 * generation to old and never from old to new *which is important*.
 	 */
 	if (shrink.new_candidates) {
-	    if (prev == &MSO(p).mso) /* empty other binaries list */
+	    if (prev == &MSO(p).first) /* empty other binaries list */
 		prev = &shrink.new_candidates_end->next;
 	    else
-		shrink.new_candidates_end->next = MSO(p).mso;
-	    MSO(p).mso = shrink.new_candidates;
+		shrink.new_candidates_end->next = MSO(p).first;
+	    MSO(p).first = shrink.new_candidates;
 	}
     }
-
     *prev = shrink.old_candidates;
 }
 
@@ -2334,15 +2272,17 @@ offset_heap(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size)
 	      tari = thing_arityval(val);
 	      switch (thing_subtag(val)) {
 	      case REFC_BINARY_SUBTAG:
+	      case FUN_SUBTAG:
+	      case EXTERNAL_PID_SUBTAG:
+	      case EXTERNAL_PORT_SUBTAG:
+	      case EXTERNAL_REF_SUBTAG:
 		  {
-		      ProcBin* pb = (ProcBin*) hp;
-		      Eterm** uptr = (Eterm **) (void *) &pb->next;
+		      struct erl_off_heap_header* oh = (struct erl_off_heap_header*) hp;
 
-		      if (*uptr && in_area((Eterm *)pb->next, area, area_size)) {
+		      if (in_area(oh->next, area, area_size)) {
+			  Eterm** uptr = (Eterm **) (void *) &oh->next;
 			  *uptr += offs; /* Patch the mso chain */
 		      }
-		      sz -= tari;
-		      hp += tari + 1;
 		  }
 		  break;
 	      case BIN_MATCHSTATE_SUBTAG:
@@ -2353,40 +2293,11 @@ offset_heap(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size)
 		      mb->orig = offset_ptr(mb->orig, offs);
 		      mb->base = binary_bytes(mb->orig);
 		  }
-		  sz -= tari;
-		  hp += tari + 1;
 		}
 		break;
-	      case FUN_SUBTAG:
-		  {
-		      ErlFunThing* funp = (ErlFunThing *) hp;
-		      Eterm** uptr = (Eterm **) (void *) &funp->next;
-
-		      if (*uptr && in_area((Eterm *)funp->next, area, area_size)) {
-			  *uptr += offs;
-		      }
-		      sz -= tari;
-		      hp += tari + 1;
-		  }
-		  break;
-	      case EXTERNAL_PID_SUBTAG:
-	      case EXTERNAL_PORT_SUBTAG:
-	      case EXTERNAL_REF_SUBTAG:
-		  {
-		      ExternalThing* etp = (ExternalThing *) hp;
-		      Eterm** uptr = (Eterm **) (void *) &etp->next;
-
-		      if (*uptr && in_area((Eterm *)etp->next, area, area_size)) {
-			  *uptr += offs;
-		      }
-		      sz -= tari;
-		      hp += tari + 1;
-		  }
-		  break;
-	      default:
-		  sz -= tari;
-		  hp += tari + 1;
 	      }
+	      sz -= tari;
+	      hp += tari + 1;
 	      break;
 	  }
 	  default:
@@ -2423,18 +2334,8 @@ offset_heap_ptr(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size)
 static void
 offset_off_heap(Process* p, Sint offs, char* area, Uint area_size)
 {
-    if (MSO(p).mso && in_area((Eterm *)MSO(p).mso, area, area_size)) {
-        Eterm** uptr = (Eterm**) (void *) &MSO(p).mso;
-        *uptr += offs;
-    }
-
-    if (MSO(p).funs && in_area((Eterm *)MSO(p).funs, area, area_size)) {
-        Eterm** uptr = (Eterm**) (void *) &MSO(p).funs;
-        *uptr += offs;
-    }
-
-    if (MSO(p).externals && in_area((Eterm *)MSO(p).externals, area, area_size)) {
-        Eterm** uptr = (Eterm**) (void *) &MSO(p).externals;
+    if (MSO(p).first && in_area((Eterm *)MSO(p).first, area, area_size)) {
+        Eterm** uptr = (Eterm**) (void *) &MSO(p).first;
         *uptr += offs;
     }
 }
@@ -2555,8 +2456,8 @@ do {							\
 		 __FILE__, __LINE__, #EXP);		\
 } while (0)
 
-#ifdef ERTS_OFFHEAP_DEBUG_CHK_CIRCULAR_EXTERNAL_LIST
-#  define ERTS_EXTERNAL_VISITED_BIT ((Eterm) 1 << 31)
+#ifdef ERTS_OFFHEAP_DEBUG_CHK_CIRCULAR_LIST
+#  define ERTS_OFFHEAP_VISITED_BIT ((Eterm) 1 << 31)
 #endif
 
 
@@ -2566,62 +2467,45 @@ erts_check_off_heap2(Process *p, Eterm *htop)
     Eterm *oheap = (Eterm *) OLD_HEAP(p);
     Eterm *ohtop = (Eterm *) OLD_HTOP(p);
     int old;
-    ProcBin *pb;
-    ErlFunThing *eft;
-    ExternalThing *et;
+    union erl_off_heap_ptr u;
 
     old = 0;
-    for (pb = MSO(p).mso; pb; pb = pb->next) {
-	Eterm *ptr = (Eterm *) pb;
-	long refc = erts_refc_read(&pb->val->refc, 1);
+    for (u.hdr = MSO(p).first; u.hdr; u.hdr = u.hdr->next) {
+	erts_aint_t refc;
+	switch (thing_subtag(u.hdr->thing_word)) {
+	case REFC_BINARY_SUBTAG:
+	    refc = erts_refc_read(&u.pb->val->refc, 1);		
+	    break;
+	case FUN_SUBTAG:
+	    refc = erts_refc_read(&u.fun->fe->refc, 1);
+	    break;
+	case EXTERNAL_PID_SUBTAG:
+	case EXTERNAL_PORT_SUBTAG:
+	case EXTERNAL_REF_SUBTAG:
+	    refc = erts_refc_read(&u.ext->node->refc, 1);
+	    break;
+	default:
+	    ASSERT(!!"erts_check_off_heap2: Invalid thing_word");
+	}
 	ERTS_CHK_OFFHEAP_ASSERT(refc >= 1);
+#ifdef ERTS_OFFHEAP_DEBUG_CHK_CIRCULAR_LIST
+	ERTS_CHK_OFFHEAP_ASSERT(!(u.hdr->thing_word & ERTS_EXTERNAL_VISITED_BIT));
+	u.hdr->thing_word |= ERTS_OFFHEAP_VISITED_BIT;
+#endif
 	if (old) {
-	    ERTS_CHK_OFFHEAP_ASSERT(oheap <= ptr && ptr < ohtop);
+	    ERTS_CHK_OFFHEAP_ASSERT(oheap <= u.ep && u.ep < ohtop);
 	}
-	else if (oheap <= ptr && ptr < ohtop)
+	else if (oheap <= u.ep && u.ep < ohtop)
 	    old = 1;
 	else {
-	    ERTS_CHK_OFFHEAP_ASSERT(within2(ptr, p, htop));
+	    ERTS_CHK_OFFHEAP_ASSERT(within2(u.ep, p, htop));
 	}
     }
 
-    old = 0;
-    for (eft = MSO(p).funs; eft; eft = eft->next) {
-	Eterm *ptr = (Eterm *) eft;
-	long refc = erts_refc_read(&eft->fe->refc, 1);
-	ERTS_CHK_OFFHEAP_ASSERT(refc >= 1);
-	if (old)
-	    ERTS_CHK_OFFHEAP_ASSERT(oheap <= ptr && ptr < ohtop);
-	else if (oheap <= ptr && ptr < ohtop)
-	    old = 1;
-	else
-	    ERTS_CHK_OFFHEAP_ASSERT(within2(ptr, p, htop));
-    }
-
-    old = 0;
-    for (et = MSO(p).externals; et; et = et->next) {
-	Eterm *ptr = (Eterm *) et;
-	long refc = erts_refc_read(&et->node->refc, 1);
-	ERTS_CHK_OFFHEAP_ASSERT(refc >= 1);
-#ifdef ERTS_OFFHEAP_DEBUG_CHK_CIRCULAR_EXTERNAL_LIST
-	ERTS_CHK_OFFHEAP_ASSERT(!(et->header & ERTS_EXTERNAL_VISITED_BIT));
-#endif
-	if (old)
-	    ERTS_CHK_OFFHEAP_ASSERT(oheap <= ptr && ptr < ohtop);
-	else if (oheap <= ptr && ptr < ohtop)
-	    old = 1;
-	else
-	    ERTS_CHK_OFFHEAP_ASSERT(within2(ptr, p, htop));
 #ifdef ERTS_OFFHEAP_DEBUG_CHK_CIRCULAR_EXTERNAL_LIST
-	et->header |= ERTS_EXTERNAL_VISITED_BIT;
+    for (u.hdr = MSO(p).first; u.hdr; u.hdr = u.hdr->next)
+	u.hdr->thing_word &= ~ERTS_OFFHEAP_VISITED_BIT;
 #endif
-    }
-
-#ifdef ERTS_OFFHEAP_DEBUG_CHK_CIRCULAR_EXTERNAL_LIST
-    for (et = MSO(p).externals; et; et = et->next)
-	et->header &= ~ERTS_EXTERNAL_VISITED_BIT;
-#endif
-	
 }
 
 void
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 2ee802cf3e..0a57eb6d88 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -41,6 +41,7 @@
 #include "erl_printf_term.h"
 #include "erl_misc_utils.h"
 #include "packet_parser.h"
+#include "erl_cpu_topology.h"
 
 #ifdef HIPE
 #include "hipe_mode_switch.h"	/* for hipe_mode_switch_init() */
@@ -63,6 +64,8 @@ extern void ConNormalExit(void);
 extern void ConWaitForExit(void);
 #endif
 
+static void erl_init(int ncpu);
+
 #define ERTS_MIN_COMPAT_REL 7
 
 #ifdef ERTS_SMP
@@ -76,8 +79,6 @@ int erts_initialized = 0;
 static erts_tid_t main_thread;
 #endif
 
-erts_cpu_info_t *erts_cpuinfo;
-
 int erts_use_sender_punish;
 
 /*
@@ -99,7 +100,7 @@ int erts_backtrace_depth;	/* How many functions to show in a backtrace
 
 int erts_async_max_threads;  /* number of threads for async support */
 int erts_async_thread_suggested_stack_size;
-erts_smp_atomic_t erts_max_gen_gcs;
+erts_smp_atomic32_t erts_max_gen_gcs;
 
 Eterm erts_error_logger_warnings; /* What to map warning logs to, am_error, 
 				     am_info or am_warning, am_error is 
@@ -228,18 +229,18 @@ void erl_error(char *fmt, va_list args)
     erts_vfprintf(stderr, fmt, args);
 }
 
-static void early_init(int *argc, char **argv);
+static int early_init(int *argc, char **argv);
 
 void
 erts_short_init(void)
 {
-    early_init(NULL, NULL);
-    erl_init();
+    int ncpu = early_init(NULL, NULL);
+    erl_init(ncpu);
     erts_initialized = 1;
 }
 
-void
-erl_init(void)
+static void
+erl_init(int ncpu)
 {
     init_benchmarking();
 
@@ -249,12 +250,13 @@ erl_init(void)
 
     erts_init_monitors();
     erts_init_gc();
-    init_time();
-    erts_init_process();
+    erts_init_time();
+    erts_init_sys_common_misc();
+    erts_init_process(ncpu);
     erts_init_scheduling(use_multi_run_queue,
 			 no_schedulers,
 			 no_schedulers_online);
-
+    erts_init_cpu_topology(); /* Must be after init_scheduling */
     H_MIN_SIZE      = erts_next_heap_size(H_MIN_SIZE, 0);
     BIN_VH_MIN_SIZE = erts_next_heap_size(BIN_VH_MIN_SIZE, 0);
 
@@ -287,7 +289,7 @@ erl_init(void)
     erts_delay_trap = erts_export_put(am_erlang, am_delay_trap, 2);
     erts_late_init_process();
 #if HAVE_ERTS_MSEG
-    erts_mseg_late_init(); /* Must be after timer (init_time()) and thread
+    erts_mseg_late_init(); /* Must be after timer (erts_init_time()) and thread
 			      initializations */
 #endif
 #ifdef HIPE
@@ -321,7 +323,7 @@ init_shared_memory(int argc, char **argv)
 #endif
 
     global_gen_gcs = 0;
-    global_max_gen_gcs = erts_smp_atomic_read(&erts_max_gen_gcs);
+    global_max_gen_gcs = (Uint16) erts_smp_atomic32_read(&erts_max_gen_gcs);
     global_gc_flags = erts_default_process_flags;
 
     erts_global_offheap.mso = NULL;
@@ -505,10 +507,13 @@ void erts_usage(void)
 	       ERTS_MIN_COMPAT_REL, this_rel_num());
 
     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");
     erts_fprintf(stderr, "            u|ns|ts|ps|s|nnts|nnps|tnnps|db\n");
     erts_fprintf(stderr, "-sct cput   set cpu topology,\n");
     erts_fprintf(stderr, "            see the erl(1) documentation for more info.\n");
+    erts_fprintf(stderr, "-swt val    set scheduler wakeup threshold, valid values are:\n");
+    erts_fprintf(stderr, "            very_low|low|medium|high|very_high.\n");
     erts_fprintf(stderr, "-sss size   suggested stack size in kilo words for scheduler threads,\n");
     erts_fprintf(stderr, "            valid range is [%d-%d]\n",
 		 ERTS_SCHED_THREAD_MIN_STACK_SIZE,
@@ -530,7 +535,8 @@ void erts_usage(void)
 
     erts_fprintf(stderr, "-W<i|w>     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");
+    erts_fprintf(stderr, "            valid range is [1-%d]\n", INT_MAX/1024);
     erts_fprintf(stderr, "\n");
     erts_fprintf(stderr, "Note that if the emulator is started with erlexec (typically\n");
     erts_fprintf(stderr, "from the erl script), these flags should be specified with +.\n");
@@ -538,7 +544,51 @@ void erts_usage(void)
     erl_exit(-1, "");
 }
 
-static void
+#ifdef USE_THREADS
+/*
+ * allocators for thread lib
+ */
+
+static void *ethr_std_alloc(size_t size)
+{
+    return erts_alloc_fnf(ERTS_ALC_T_ETHR_STD, (Uint) size);
+}
+static void *ethr_std_realloc(void *ptr, size_t size)
+{
+    return erts_realloc_fnf(ERTS_ALC_T_ETHR_STD, ptr, (Uint) size);
+}
+static void ethr_std_free(void *ptr)
+{
+    erts_free(ERTS_ALC_T_ETHR_STD, ptr);
+}
+static void *ethr_sl_alloc(size_t size)
+{
+    return erts_alloc_fnf(ERTS_ALC_T_ETHR_SL, (Uint) size);
+}
+static void *ethr_sl_realloc(void *ptr, size_t size)
+{
+    return erts_realloc_fnf(ERTS_ALC_T_ETHR_SL, ptr, (Uint) size);
+}
+static void ethr_sl_free(void *ptr)
+{
+    erts_free(ERTS_ALC_T_ETHR_SL, ptr);
+}
+static void *ethr_ll_alloc(size_t size)
+{
+    return erts_alloc_fnf(ERTS_ALC_T_ETHR_LL, (Uint) size);
+}
+static void *ethr_ll_realloc(void *ptr, size_t size)
+{
+    return erts_realloc_fnf(ERTS_ALC_T_ETHR_LL, ptr, (Uint) size);
+}
+static void ethr_ll_free(void *ptr)
+{
+    erts_free(ERTS_ALC_T_ETHR_LL, ptr);
+}
+
+#endif
+
+static int
 early_init(int *argc, char **argv) /*
 				   * Only put things here which are
 				   * really important initialize
@@ -551,6 +601,10 @@ early_init(int *argc, char **argv) /*
     int ncpuavail;
     int schdlrs;
     int schdlrs_onln;
+    int max_main_threads;
+    int max_reader_groups;
+    int reader_groups;
+
     use_multi_run_queue = 1;
     erts_printf_eterm_func = erts_printf_term;
     erts_disable_tolerant_timeofday = 0;
@@ -566,13 +620,11 @@ early_init(int *argc, char **argv) /*
 
     erts_use_sender_punish = 1;
 
-    erts_cpuinfo = erts_cpu_info_create();
-
-#ifdef ERTS_SMP
-    ncpu = erts_get_cpu_configured(erts_cpuinfo);
-    ncpuonln = erts_get_cpu_online(erts_cpuinfo);
-    ncpuavail = erts_get_cpu_available(erts_cpuinfo);
-#else
+    erts_pre_early_init_cpu_topology(&max_reader_groups,
+				     &ncpu,
+				     &ncpuonln,
+				     &ncpuavail);
+#ifndef ERTS_SMP
     ncpu = 1;
     ncpuonln = 1;
     ncpuavail = 1;
@@ -599,7 +651,7 @@ early_init(int *argc, char **argv) /*
     erts_writing_erl_crash_dump = 0;
 #endif
 
-    erts_smp_atomic_init(&erts_max_gen_gcs, (long)((Uint16) -1));
+    erts_smp_atomic32_init(&erts_max_gen_gcs, (erts_aint32_t) ((Uint16) -1));
 
     erts_pre_init_process();
 #if defined(USE_THREADS) && !defined(ERTS_SMP)
@@ -627,6 +679,24 @@ early_init(int *argc, char **argv) /*
 	    }
 	    if (argv[i][0] == '-') {
 		switch (argv[i][1]) {
+		case 'r': {
+		    char *sub_param = argv[i]+2;
+		    if (has_prefix("g", sub_param)) {
+			char *arg = get_arg(sub_param+1, argv[i+1], &i);
+			if (sscanf(arg, "%d", &max_reader_groups) != 1) {
+			    erts_fprintf(stderr,
+					 "bad reader groups limit: %s\n", arg);
+			    erts_usage();
+			}
+			if (max_reader_groups < 0) {
+			    erts_fprintf(stderr,
+					 "bad reader groups limit: %d\n",
+					 max_reader_groups);
+			    erts_usage();
+			}
+		    }
+		    break;
+		}
 		case 'S' : {
 		    int tot, onln;
 		    char *arg = get_arg(argv[i]+2, argv[i+1], &i);
@@ -695,13 +765,40 @@ early_init(int *argc, char **argv) /*
 
     erts_alloc_init(argc, argv, &alloc_opts); /* Handles (and removes)
 						 -M flags. */
+    /* Require allocators */
+    erts_early_init_scheduling();
+    erts_init_utils();
+    erts_early_init_cpu_topology(no_schedulers,
+				 &max_main_threads,
+				 max_reader_groups,
+				 &reader_groups);
 
-    erts_early_init_scheduling(); /* Require allocators */
-    erts_init_utils(); /* Require allocators */
+#ifdef USE_THREADS
+    {
+	erts_thr_late_init_data_t elid = ERTS_THR_LATE_INIT_DATA_DEF_INITER;
+	elid.mem.std.alloc = ethr_std_alloc;
+	elid.mem.std.realloc = ethr_std_realloc;
+	elid.mem.std.free = ethr_std_free;
+	elid.mem.sl.alloc = ethr_sl_alloc;
+	elid.mem.sl.realloc = ethr_sl_realloc;
+	elid.mem.sl.free = ethr_sl_free;
+	elid.mem.ll.alloc = ethr_ll_alloc;
+	elid.mem.ll.realloc = ethr_ll_realloc;
+	elid.mem.ll.free = ethr_ll_free;
+	elid.main_threads = max_main_threads;
+	elid.reader_groups = reader_groups;
+
+	erts_thr_late_init(&elid);
+    }
+#endif
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_late_init();
 #endif
+    
+#ifdef ERTS_ENABLE_LOCK_COUNT
+    erts_lcnt_late_init();
+#endif
 
 #if defined(HIPE)
     hipe_signal_init();	/* must be done very early */
@@ -711,7 +808,10 @@ early_init(int *argc, char **argv) /*
     erl_sys_args(argc, argv);
 
     erts_ets_realloc_always_moves = 0;
+    erts_ets_always_compress = 0;
+    erts_dist_buf_busy_limit = ERTS_DE_BUSY_LIMIT;
 
+    return ncpu;
 }
 
 #ifndef ERTS_SMP
@@ -745,8 +845,7 @@ erl_start(int argc, char **argv)
     char envbuf[21]; /* enough for any 64-bit integer */
     size_t envbufsz;
     int async_max_threads = erts_async_max_threads;
-
-    early_init(&argc, argv);
+    int ncpu = early_init(&argc, argv);
 
     envbufsz = sizeof(envbuf);
     if (erts_sys_getenv(ERL_MAX_ETS_TABLES_ENV, envbuf, &envbufsz) == 0)
@@ -757,7 +856,7 @@ erl_start(int argc, char **argv)
     envbufsz = sizeof(envbuf);
     if (erts_sys_getenv("ERL_FULLSWEEP_AFTER", envbuf, &envbufsz) == 0) {
 	Uint16 max_gen_gcs = atoi(envbuf);
-	erts_smp_atomic_set(&erts_max_gen_gcs, (long) max_gen_gcs);
+	erts_smp_atomic32_set(&erts_max_gen_gcs, (erts_aint32_t) max_gen_gcs);
     }
 
     envbufsz = sizeof(envbuf);
@@ -809,7 +908,27 @@ erl_start(int argc, char **argv)
 	    VERBOSE(DEBUG_SYSTEM,
                     ("using display items %d\n",display_items));
 	    break;
-
+	case 'f':
+	    if (!strncmp(argv[i],"-fn",3)) {
+		arg = get_arg(argv[i]+3, argv[i+1], &i);
+		switch (*arg) {
+		case 'u':
+		    erts_set_user_requested_filename_encoding(ERL_FILENAME_UTF8);
+		    break;
+		case 'l':
+		    erts_set_user_requested_filename_encoding(ERL_FILENAME_LATIN1);
+		    break;
+		case 'a':
+		    erts_set_user_requested_filename_encoding(ERL_FILENAME_UNKNOWN);
+		default:
+		    erts_fprintf(stderr, "bad filename encoding %s, can be (l,u or a)\n", arg);
+		    erts_usage();
+		}
+		break;
+	    } else {
+		erts_fprintf(stderr, "%s unknown flag %s\n", argv[0], argv[i]);
+		erts_usage();
+	    }
 	case 'l':
 	    display_loads++;
 	    break;
@@ -931,15 +1050,20 @@ erl_start(int argc, char **argv)
 	    break;
 
 	case 'e':
-	    /* set maximum number of ets tables */
-	    arg = get_arg(argv[i]+2, argv[i+1], &i);
-	    if (( user_requested_db_max_tabs = atoi(arg) ) < 0) {
-		erts_fprintf(stderr, "bad maximum number of ets tables %s\n", arg);
-		erts_usage();
+	    if (sys_strcmp("c", argv[i]+2) == 0) {
+		erts_ets_always_compress = 1;
+	    }
+	    else {
+		/* set maximum number of ets tables */
+		arg = get_arg(argv[i]+2, argv[i+1], &i);
+		if (( user_requested_db_max_tabs = atoi(arg) ) < 0) {
+		    erts_fprintf(stderr, "bad maximum number of ets tables %s\n", arg);
+		    erts_usage();
+		}
+		VERBOSE(DEBUG_SYSTEM,
+			("using maximum number of ets tables %d\n",
+			 user_requested_db_max_tabs));
 	    }
-	    VERBOSE(DEBUG_SYSTEM,
-                    ("using maximum number of ets tables %d\n",
-                     user_requested_db_max_tabs));
 	    break;
 
 	case 'i':
@@ -1003,7 +1127,7 @@ erl_start(int argc, char **argv)
 	    char *sub_param = argv[i]+2;
 	    if (has_prefix("bt", sub_param)) {
 		arg = get_arg(sub_param+2, argv[i+1], &i);
-		res = erts_init_scheduler_bind_type(arg);
+		res = erts_init_scheduler_bind_type_string(arg);
 		if (res != ERTS_INIT_SCHED_BIND_TYPE_SUCCESS) {
 		    switch (res) {
 		    case ERTS_INIT_SCHED_BIND_TYPE_NOT_SUPPORTED:
@@ -1028,7 +1152,7 @@ erl_start(int argc, char **argv)
 	    }
 	    else if (has_prefix("ct", sub_param)) {
 		arg = get_arg(sub_param+2, argv[i+1], &i);
-		res = erts_init_cpu_topology(arg);
+		res = erts_init_cpu_topology_string(arg);
 		if (res != ERTS_INIT_CPU_TOPOLOGY_OK) {
 		    switch (res) {
 		    case ERTS_INIT_CPU_TOPOLOGY_INVALID_ID:
@@ -1071,10 +1195,20 @@ erl_start(int argc, char **argv)
 	    }
 	    else if (sys_strcmp("mrq", sub_param) == 0)
 		use_multi_run_queue = 1;
-	    else if (sys_strcmp("srq", sub_param) == 0)
-		use_multi_run_queue = 0;
 	    else if (sys_strcmp("nsp", sub_param) == 0)
 		erts_use_sender_punish = 0;
+	    else if (sys_strcmp("srq", sub_param) == 0)
+		use_multi_run_queue = 0;
+	    else if (sys_strcmp("wt", sub_param) == 0) {
+		arg = get_arg(sub_param+2, argv[i+1], &i);
+		if (erts_sched_set_wakeup_limit(arg) != 0) {
+		    erts_fprintf(stderr, "scheduler wakeup threshold: %s\n",
+				 arg);
+		    erts_usage();
+		}
+		VERBOSE(DEBUG_SYSTEM,
+			("scheduler wakup threshold: %s\n", arg));
+	    }
 	    else if (has_prefix("ss", sub_param)) {
 		/* suggested stack size (Kilo Words) for scheduler threads */
 		arg = get_arg(sub_param+2, argv[i+1], &i);
@@ -1189,9 +1323,17 @@ erl_start(int argc, char **argv)
 		     erts_async_thread_suggested_stack_size));
 	    break;
 
- 	case 'r':
-	    erts_ets_realloc_always_moves = 1;
+	case 'r': {
+	    char *sub_param = argv[i]+2;
+	    if (has_prefix("g", sub_param)) {
+		get_arg(sub_param+1, argv[i+1], &i);
+		/* already handled */
+	    }
+	    else {
+		erts_ets_realloc_always_moves = 1;
+	    }
 	    break;
+	}
 	case 'n':   /* XXX obsolete */
 	    break;
 	case 'c':
@@ -1221,6 +1363,26 @@ erl_start(int argc, char **argv)
 	    }
 	    break;
 
+	case 'z': {
+	    char *sub_param = argv[i]+2;
+	    int new_limit;
+
+	    if (has_prefix("dbbl", sub_param)) {
+		arg = get_arg(sub_param+4, argv[i+1], &i);
+		new_limit = atoi(arg);
+		if (new_limit < 1 || INT_MAX/1024 < new_limit) {
+		    erts_fprintf(stderr, "Invalid dbbl limit: %d\n", new_limit);
+		    erts_usage();
+		} else {
+		    erts_dist_buf_busy_limit = new_limit*1024;
+		}
+	    } else {
+		erts_fprintf(stderr, "bad -z option %s\n", argv[i]);
+		erts_usage();
+	    }
+	    break;
+        }
+
 	default:
 	    erts_fprintf(stderr, "%s unknown flag %s\n", argv[0], argv[i]);
 	    erts_usage();
@@ -1261,7 +1423,7 @@ erl_start(int argc, char **argv)
     boot_argc = argc - i;  /* Number of arguments to init */
     boot_argv = &argv[i];
 
-    erl_init();
+    erl_init(ncpu);
 
     init_shared_memory(boot_argc, boot_argv);
     load_preloaded();
@@ -1276,6 +1438,7 @@ erl_start(int argc, char **argv)
 
     erts_sys_main_thread(); /* May or may not return! */
 #else
+    erts_thr_set_main_status(1, 1);
     set_main_stack_size();
     process_main();
 #endif
@@ -1349,7 +1512,7 @@ system_cleanup(int exit_code)
     erts_cleanup_incgc();
 #endif
 
-#if defined(USE_THREADS) && !defined(ERTS_SMP)
+#if defined(USE_THREADS)
     exit_async();
 #endif
 #if HAVE_ERTS_MSEG
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c
index cee470ae37..9e18997890 100644
--- a/erts/emulator/beam/erl_lock_check.c
+++ b/erts/emulator/beam/erl_lock_check.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2005-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2005-2011. 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
@@ -96,10 +96,10 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"proc_status",				"pid"			},
     {	"proc_tab",				NULL			},
     {   "ports_snapshot",                       NULL                    },
-    {	"db_tab",				"address"		},    
-    {	"db_tab_fix",				"address"		},
     {	"meta_name_tab",	         	"address"		},
     {	"meta_main_tab_slot",			"address"		},
+    {	"db_tab",				"address"		},
+    {	"db_tab_fix",				"address"		},
     {	"meta_main_tab_main",			NULL 			},
     {	"db_hash_slot",				"address"		},
     {	"node_table",				NULL			},
@@ -119,17 +119,17 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"child_status",				NULL			},
 #endif
 #ifdef __WIN32__
-    {	"sys_driver_data_lock",			NULL 			}, 
+    {	"sys_driver_data_lock",			NULL 			},
 #endif
-    {	"drv_ev_state_grow",			NULL,   		}, 
+    {	"drv_ev_state_grow",			NULL,   		},
     {	"drv_ev_state",				"address"		},
     {	"safe_hash",				"address"		},
     {   "pollset_rm_list",                      NULL                    },
     {   "removed_fd_pre_alloc_lock",            NULL                    },
     {   "state_prealloc",                       NULL                    },
     {	"schdlr_sspnd",				NULL			},
-    {	"cpu_bind",				NULL			},
     {	"run_queue",				"address"		},
+    {	"cpu_info",				NULL			},
     {	"pollset",				"address"		},
 #ifdef __WIN32__
     {	"pollwaiter",				"address"		},
@@ -153,8 +153,9 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"instr",				NULL			},
     {	"fix_alloc",				"index"			},
     {	"alcu_allocator",			"index"			},
+    {	"alcu_delayed_free",			"index"			},
     {	"mseg",					NULL			},
-#ifdef HALFWORD_HEAP
+#if HALFWORD_HEAP
     {	"pmmap",				NULL			},
 #endif
 #ifdef ERTS_SMP
@@ -176,18 +177,22 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"async_id",				NULL			},
     {	"pix_lock",				"address"		},
     {	"run_queues_lists",			NULL			},
+    {	"misc_aux_work_queue",			"index"			},
+    {	"misc_aux_work_pre_alloc_lock",		"address"		},
     {	"sched_stat",				NULL			},
+    {	"run_queue_sleep_list",			"address"		},
 #endif
     {	"alloc_thr_ix_lock",			NULL			},
 #ifdef ERTS_SMP
-    {	"proc_lck_wtr_alloc",			NULL 			},
+    {	"proc_lck_qs_alloc",			NULL 			},
 #endif
 #ifdef __WIN32__
 #ifdef DEBUG
     {   "save_ops_lock",                        NULL                    },
 #endif
 #endif
-    {	"mtrace_buf",				NULL			}
+    {	"mtrace_buf",				NULL			},
+    {	"erts_alloc_hard_debug",		NULL			}
 };
 
 #define ERTS_LOCK_ORDER_SIZE \
@@ -199,6 +204,8 @@ static erts_lc_lock_order_t erts_lock_order[] = {
        & ERTS_LC_FLG_LT_ALL						\
        & ~(ERTS_LC_FLG_LT_SPINLOCK|ERTS_LC_FLG_LT_RWSPINLOCK)))
 
+static __decl_noreturn void  __noreturn lc_abort(void);
+
 static char *
 lock_type(Uint16 flags)
 {
@@ -222,7 +229,7 @@ rw_op_str(Uint16 flags)
 	return " (r)";
     case ERTS_LC_FLG_LO_WRITE:
 	erts_fprintf(stderr, "\nInternal error\n");
-	abort();
+	lc_abort();
     default:
 	break;
     }
@@ -271,28 +278,18 @@ static erts_lc_free_block_t *free_blocks;
 #define ERTS_LC_FB_CHUNK_SIZE 10
 #endif
 
-#ifdef ETHR_HAVE_NATIVE_LOCKS
 static ethr_spinlock_t free_blocks_lock;
-#define ERTS_LC_LOCK	ethr_spin_lock
-#define ERTS_LC_UNLOCK	ethr_spin_unlock
-#else
-static ethr_mutex free_blocks_lock;
-#define ERTS_LC_LOCK	ethr_mutex_lock
-#define ERTS_LC_UNLOCK	ethr_mutex_unlock
-#endif
 
 static ERTS_INLINE void
 lc_lock(void)
 {
-    if (ERTS_LC_LOCK(&free_blocks_lock) != 0)
-	abort();
+    ethr_spin_lock(&free_blocks_lock);
 }
 
 static ERTS_INLINE void
 lc_unlock(void)
 {
-    if (ERTS_LC_UNLOCK(&free_blocks_lock) != 0)
-	abort();
+    ethr_spin_unlock(&free_blocks_lock);
 }
 
 static ERTS_INLINE void lc_free(void *p)
@@ -313,7 +310,7 @@ static void *lc_core_alloc(void)
 {
     lc_unlock();
     erts_fprintf(stderr, "Lock checker out of memory!\n");
-    abort();
+    lc_abort();
 }
 
 #else
@@ -327,7 +324,7 @@ static void *lc_core_alloc(void)
 					  * ERTS_LC_FB_CHUNK_SIZE);
     if (!fbs) {
 	erts_fprintf(stderr, "Lock checker failed to allocate memory!\n");
-	abort();
+	lc_abort();
     }
     for (i = 1; i < ERTS_LC_FB_CHUNK_SIZE - 1; i++) {
 #ifdef DEBUG
@@ -367,11 +364,11 @@ create_locked_locks(char *thread_name)
 {
     erts_lc_locked_locks_t *l_lcks = malloc(sizeof(erts_lc_locked_locks_t));
     if (!l_lcks)
-	abort();
+	lc_abort();
 
     l_lcks->thread_name = strdup(thread_name ? thread_name : "unknown");
     if (!l_lcks->thread_name)
-	abort();
+	lc_abort();
 
     l_lcks->tid = erts_thr_self();
     l_lcks->required.first = NULL;
@@ -513,7 +510,7 @@ uninitialized_lock(void)
 {
     erts_fprintf(stderr, "Performing operations on uninitialized lock!\n");
     print_curr_locks(get_my_locked_locks());
-    abort();
+    lc_abort();
 }
 
 static void
@@ -523,7 +520,7 @@ lock_twice(char *prefix, erts_lc_locked_locks_t *l_lcks, erts_lc_lock_t *lck,
     erts_fprintf(stderr, "%s%s", prefix, rw_op_str(op_flags));
     print_lock(" ", lck, " lock which is already locked by thread!\n");
     print_curr_locks(l_lcks);
-    abort();
+    lc_abort();
 }
 
 static void
@@ -533,7 +530,7 @@ unlock_op_mismatch(erts_lc_locked_locks_t *l_lcks, erts_lc_lock_t *lck,
     erts_fprintf(stderr, "Unlocking%s ", rw_op_str(op_flags));
     print_lock("", lck, " lock which mismatch previous lock operation!\n");
     print_curr_locks(l_lcks);
-    abort();
+    lc_abort();
 }
 
 static void
@@ -541,7 +538,7 @@ unlock_of_not_locked(erts_lc_locked_locks_t *l_lcks, erts_lc_lock_t *lck)
 {
     print_lock("Unlocking ", lck, " lock which is not locked by thread!\n");
     print_curr_locks(l_lcks);
-    abort();
+    lc_abort();
 }
 
 static void
@@ -550,7 +547,7 @@ lock_order_violation(erts_lc_locked_locks_t *l_lcks, erts_lc_lock_t *lck)
     print_lock("Lock order violation occured when locking ", lck, "!\n");
     print_curr_locks(l_lcks);
     print_lock_order();
-    abort();
+    lc_abort();
 }
 
 static void
@@ -561,7 +558,7 @@ type_order_violation(char *op, erts_lc_locked_locks_t *l_lcks,
     print_lock(op, lck, "!\n");
     ASSERT(l_lcks);
     print_curr_locks(l_lcks);
-    abort();
+    lc_abort();
 }
 
 static void
@@ -613,7 +610,7 @@ lock_mismatch(erts_lc_locked_locks_t *l_lcks, int exact,
 	}
     }
     print_curr_locks(l_lcks);
-    abort();
+    lc_abort();
 }
 
 static void
@@ -621,7 +618,7 @@ unlock_of_required_lock(erts_lc_locked_locks_t *l_lcks, erts_lc_lock_t *lck)
 {
     print_lock("Unlocking required ", lck, " lock!\n");
     print_curr_locks(l_lcks);
-    abort();
+    lc_abort();
 }
 
 static void
@@ -629,7 +626,7 @@ unrequire_of_not_required_lock(erts_lc_locked_locks_t *l_lcks, erts_lc_lock_t *l
 {
     print_lock("Unrequire on ", lck, " lock not required!\n");
     print_curr_locks(l_lcks);
-    abort();
+    lc_abort();
 }
 
 static void
@@ -637,7 +634,7 @@ require_twice(erts_lc_locked_locks_t *l_lcks, erts_lc_lock_t *lck)
 {
     print_lock("Require on ", lck, " lock already required!\n");
     print_curr_locks(l_lcks);
-    abort();
+    lc_abort();
 }
 
 static void
@@ -645,7 +642,7 @@ required_not_locked(erts_lc_locked_locks_t *l_lcks, erts_lc_lock_t *lck)
 {
     print_lock("Required ", lck, " lock not locked!\n");
     print_curr_locks(l_lcks);
-    abort();
+    lc_abort();
 }
 
 
@@ -658,13 +655,23 @@ thread_exit_handler(void)
 	    erts_fprintf(stderr,
 			 "Thread exiting while having locked locks!\n");
 	    print_curr_locks(l_lcks);
-	    abort();
+	    lc_abort();
 	}
 	destroy_locked_locks(l_lcks);
 	/* erts_tsd_set(locks_key, NULL); */
     }
 }
 
+static __decl_noreturn void
+lc_abort(void)
+{
+#ifdef __WIN32__
+    DebugBreak();
+#else
+    abort();
+#endif
+}
+
 void
 erts_lc_set_thread_name(char *thread_name)
 {
@@ -676,7 +683,7 @@ erts_lc_set_thread_name(char *thread_name)
 	free((void *) l_lcks->thread_name);
 	l_lcks->thread_name = strdup(thread_name ? thread_name : "unknown");
 	if (!l_lcks->thread_name)
-	    abort();
+	    lc_abort();
     }
 }
 
@@ -686,7 +693,7 @@ erts_lc_assert_failed(char *file, int line, char *assertion)
     erts_fprintf(stderr, "%s:%d: Lock check assertion \"%s\" failed!\n",
 		 file, line, assertion);
     print_curr_locks(get_my_locked_locks());
-    abort();
+    lc_abort();
     return 0;
 }
 
@@ -699,7 +706,7 @@ void erts_lc_fail(char *fmt, ...)
     va_end(args);
     erts_fprintf(stderr, "\n");
     print_curr_locks(get_my_locked_locks());
-    abort();
+    lc_abort();
 }
 
 
@@ -719,7 +726,7 @@ erts_lc_get_lock_order_id(char *name)
 		     "(update erl_lock_check.c)\n",
 		     name);
     }
-    abort();
+    lc_abort();
     return (Sint16) -1;
 }
 
@@ -895,6 +902,25 @@ erts_lc_check_exact(erts_lc_lock_t *have, int have_len)
     }
 }
 
+void
+erts_lc_check_no_locked_of_type(Uint16 flags)
+{
+    erts_lc_locked_locks_t *l_lcks = get_my_locked_locks();
+    if (l_lcks) {
+	erts_lc_locked_lock_t *l_lck = l_lcks->locked.first;
+	for (l_lck = l_lcks->locked.first; l_lck; l_lck = l_lck->next) {
+	    if (l_lck->flags & flags) {
+		erts_fprintf(stderr,
+			     "Locked lock of type %s found which isn't "
+			     "allowed here!\n",
+			     lock_type(l_lck->flags));
+		print_curr_locks(l_lcks);
+		lc_abort();
+	    }
+	}
+    }
+}
+
 int
 erts_lc_trylock_force_busy_flg(erts_lc_lock_t *lck, Uint16 op_flags)
 {
@@ -954,10 +980,10 @@ erts_lc_trylock_force_busy_flg(erts_lc_lock_t *lck, Uint16 op_flags)
 	/* We only force busy if a lock order violation would occur
 	   and when on an even millisecond. */
 	{
-	    erts_thr_timeval_t time;
-	    erts_thr_time_now(&time);
+	    SysTimeval tv;
+	    sys_gettimeofday(&tv);
 
-	    if ((time.tv_nsec / 1000000) & 1)
+	    if ((tv.tv_usec / 1000) & 1)
 		return 0;
 	}
 #endif
@@ -1234,7 +1260,6 @@ erts_lc_init_lock(erts_lc_lock_t *lck, char *name, Uint16 flags)
 {
     lck->id = erts_lc_get_lock_order_id(name);
 
-    /* XXX:PaN What to do with the extra information? */
     lck->extra = make_boxed(&lck->extra);
     lck->flags = flags;
     lck->inited = ERTS_LC_INITITALIZED;
@@ -1283,13 +1308,8 @@ erts_lc_init(void)
     free_blocks = NULL;
 #endif /* #ifdef ERTS_LC_STATIC_ALLOC */
 
-#ifdef ETHR_HAVE_NATIVE_LOCKS
     if (ethr_spinlock_init(&free_blocks_lock) != 0)
-	abort();
-#else
-    if (ethr_mutex_init(&free_blocks_lock) != 0)
-	abort();
-#endif
+	lc_abort();
 
     erts_tsd_key_create(&locks_key);
 }
diff --git a/erts/emulator/beam/erl_lock_check.h b/erts/emulator/beam/erl_lock_check.h
index d5e2ede9ac..0372e6850d 100644
--- a/erts/emulator/beam/erl_lock_check.h
+++ b/erts/emulator/beam/erl_lock_check.h
@@ -77,6 +77,7 @@ void erts_lc_check(erts_lc_lock_t *have, int have_len,
 void erts_lc_check_exact(erts_lc_lock_t *have, int have_len);
 void erts_lc_have_locks(int *resv, erts_lc_lock_t *lcks, int len);
 void erts_lc_have_lock_ids(int *resv, int *ids, int len);
+void erts_lc_check_no_locked_of_type(Uint16 flags);
 int erts_lc_trylock_force_busy_flg(erts_lc_lock_t *lck, Uint16 op_flags);
 void erts_lc_trylock_flg(int locked, erts_lc_lock_t *lck, Uint16 op_flags);
 void erts_lc_lock_flg(erts_lc_lock_t *lck, Uint16 op_flags);
diff --git a/erts/emulator/beam/erl_lock_count.c b/erts/emulator/beam/erl_lock_count.c
index 0d7e1335c1..a36c53560e 100644
--- a/erts/emulator/beam/erl_lock_count.c
+++ b/erts/emulator/beam/erl_lock_count.c
@@ -159,15 +159,15 @@ static char* lock_opt(Uint16 flag) {
 }
 
 static void print_lock_x(erts_lcnt_lock_t *lock, Uint16 flag, char *action, char *extra) {
-    long int colls, tries, w_state, r_state;
+    erts_aint_t colls, tries, w_state, r_state;
     erts_lcnt_lock_stats_t *stats = NULL;
     
     char *type;
     int i;
     
     type = lcnt_lock_type(lock->flag);
-    ethr_atomic_read(&lock->r_state, &r_state);
-    ethr_atomic_read(&lock->w_state, &w_state);
+    r_state = ethr_atomic_read(&lock->r_state);
+    w_state = ethr_atomic_read(&lock->w_state);
 
     
     if (lock->flag & flag) {
@@ -257,6 +257,10 @@ void erts_lcnt_init() {
     erts_lcnt_clear_counters();
 }
 
+void erts_lcnt_late_init() {
+    erts_thr_install_exit_handler(erts_lcnt_thread_exit_handler);
+}
+
 /* list operations */
 
 /* BEGIN ASSUMPTION: lcnt_data_lock taken */
@@ -381,7 +385,7 @@ void erts_lcnt_destroy_lock(erts_lcnt_lock_t *lock) {
 /* lock */
 
 void erts_lcnt_lock_opt(erts_lcnt_lock_t *lock, Uint16 option) {
-    long r_state = 0, w_state = 0;
+    erts_aint_t r_state = 0, w_state = 0;
     erts_lcnt_thread_data_t *eltd;
     
     if (erts_lcnt_rt_options & ERTS_LCNT_OPT_SUSPEND) return;
@@ -390,10 +394,10 @@ void erts_lcnt_lock_opt(erts_lcnt_lock_t *lock, Uint16 option) {
 
     ASSERT(eltd);
     
-    ethr_atomic_read(&lock->w_state, &w_state);
+    w_state = ethr_atomic_read(&lock->w_state);
     
     if (option & ERTS_LCNT_LO_WRITE) {
-        ethr_atomic_read(&lock->r_state, &r_state);
+        r_state = ethr_atomic_read(&lock->r_state);
         ethr_atomic_inc( &lock->w_state);
     }
     if (option & ERTS_LCNT_LO_READ) {
@@ -414,12 +418,12 @@ void erts_lcnt_lock_opt(erts_lcnt_lock_t *lock, Uint16 option) {
 }
 
 void erts_lcnt_lock(erts_lcnt_lock_t *lock) {
-    long w_state;
+    erts_aint_t w_state;
     erts_lcnt_thread_data_t *eltd;
     
     if (erts_lcnt_rt_options & ERTS_LCNT_OPT_SUSPEND) return;
 
-    ethr_atomic_read(&lock->w_state, &w_state);
+    w_state = ethr_atomic_read(&lock->w_state);
     ethr_atomic_inc( &lock->w_state);
 
     eltd = lcnt_get_thread_data();
@@ -467,14 +471,14 @@ void erts_lcnt_lock_post_x(erts_lcnt_lock_t *lock, char *file, unsigned int line
     erts_lcnt_time_t time_wait;
     erts_lcnt_lock_stats_t *stats;
 #ifdef DEBUG
-    long flowstate;
+    erts_aint_t flowstate;
 #endif
 
     if (erts_lcnt_rt_options & ERTS_LCNT_OPT_SUSPEND) return;
     
 #ifdef DEBUG
     if (!(lock->flag & (ERTS_LCNT_LT_RWMUTEX | ERTS_LCNT_LT_RWSPINLOCK))) {
-    	ethr_atomic_read(&lock->flowstate, &flowstate);
+	flowstate = ethr_atomic_read(&lock->flowstate);
 	ASSERT(flowstate == 0);
     	ethr_atomic_inc( &lock->flowstate);
     }
@@ -512,18 +516,18 @@ void erts_lcnt_unlock_opt(erts_lcnt_lock_t *lock, Uint16 option) {
 
 void erts_lcnt_unlock(erts_lcnt_lock_t *lock) {
 #ifdef DEBUG
-    long w_state;  
-    long flowstate;
+    erts_aint_t w_state;  
+    erts_aint_t flowstate;
 #endif
     if (erts_lcnt_rt_options & ERTS_LCNT_OPT_SUSPEND) return;
 #ifdef DEBUG
     /* flowstate */
-    ethr_atomic_read(&lock->flowstate, &flowstate);
+    flowstate = ethr_atomic_read(&lock->flowstate);
     ASSERT(flowstate == 1);
     ethr_atomic_dec( &lock->flowstate);
     
     /* write state */
-    ethr_atomic_read(&lock->w_state, &w_state);
+    w_state = ethr_atomic_read(&lock->w_state);
     ASSERT(w_state > 0)
 #endif
     ethr_atomic_dec(&lock->w_state);
@@ -548,13 +552,13 @@ void erts_lcnt_trylock_opt(erts_lcnt_lock_t *lock, int res, Uint16 option) {
 void erts_lcnt_trylock(erts_lcnt_lock_t *lock, int res) {
     /* Determine lock_state via res instead of state */
 #ifdef DEBUG
-    long flowstate;
+    erts_aint_t flowstate;
 #endif 
     if (erts_lcnt_rt_options & ERTS_LCNT_OPT_SUSPEND) return;
     if (res != EBUSY) {
 	
 #ifdef DEBUG
-    	ethr_atomic_read(&lock->flowstate, &flowstate);
+	flowstate = ethr_atomic_read(&lock->flowstate);
 	ASSERT(flowstate == 0);
     	ethr_atomic_inc( &lock->flowstate);
 #endif
@@ -570,36 +574,26 @@ void erts_lcnt_trylock(erts_lcnt_lock_t *lock, int res) {
 
 /* thread operations */
 
-static void *lcnt_thr_init(erts_lcnt_thread_data_t *eltd) {
-    void *(*function)(void *);
-    void *argument;
-    void *res;
-    function = eltd->function;
-    argument = eltd->argument;
-    
-    ethr_tsd_set(lcnt_thr_data_key, eltd);
-    
-    res = (void *)function(argument);
-    free(eltd);
-    return (void *)res;
-}
-
-    
-
-int erts_lcnt_thr_create(ethr_tid *tid, void * (*function)(void *), void *arg, ethr_thr_opts *opts) {
+void erts_lcnt_thread_setup(void) {
     erts_lcnt_thread_data_t *eltd;
-    
+
     lcnt_lock();
     /* lock for thread id global update */
     eltd = lcnt_thread_data_alloc();
     lcnt_unlock();
-    
-    eltd->function = function;
-    eltd->argument = arg;
-
-    return ethr_thr_create(tid, (void *)lcnt_thr_init, (void *)eltd, opts);
+    ASSERT(eltd);
+    ethr_tsd_set(lcnt_thr_data_key, eltd);
 }
 
+void erts_lcnt_thread_exit_handler() {
+    erts_lcnt_thread_data_t *eltd;
+
+    eltd = ethr_tsd_get(lcnt_thr_data_key);
+
+    if (eltd) {
+        free(eltd);
+    }
+}
 
 /* bindings for bifs */
 
diff --git a/erts/emulator/beam/erl_lock_count.h b/erts/emulator/beam/erl_lock_count.h
index e3044c371f..6306580ae4 100644
--- a/erts/emulator/beam/erl_lock_count.h
+++ b/erts/emulator/beam/erl_lock_count.h
@@ -155,11 +155,6 @@ typedef struct {
     erts_lcnt_time_t timer;	/* timer         */
     int timer_set;		/* bool          */
     int lock_in_conflict;       /* bool          */
-    
-    /* function pointer */
-    void *(*function)(void *);
-    void *argument;
-    
 } erts_lcnt_thread_data_t;
 
 /* globals */
@@ -169,6 +164,11 @@ extern Uint16 erts_lcnt_rt_options;
 /* function declerations */
 
 void erts_lcnt_init(void);
+void erts_lcnt_late_init(void);
+
+/* thread operations */
+void erts_lcnt_thread_setup(void);
+void erts_lcnt_thread_exit_handler(void);
 
 /* list operations (local)  */
 erts_lcnt_lock_list_t *erts_lcnt_list_init(void);
@@ -194,12 +194,7 @@ void erts_lcnt_unlock_opt(erts_lcnt_lock_t *lock, Uint16 option);
 void erts_lcnt_trylock_opt(erts_lcnt_lock_t *lock, int res, Uint16 option);
 void erts_lcnt_trylock(erts_lcnt_lock_t *lock, int res);
 
-/* thread operations */
-
-int erts_lcnt_thr_create(ethr_tid *tid, void * (*function)(void *), void *arg, ethr_thr_opts *opts);
-
 /* bif interface */
-
 Uint16 erts_lcnt_set_rt_opt(Uint16 opt);
 Uint16 erts_lcnt_clear_rt_opt(Uint16 opt);
 void   erts_lcnt_clear_counters(void);
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index b63f3df7df..82f272d28a 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -30,6 +30,7 @@
 #include "erl_message.h"
 #include "erl_process.h"
 #include "erl_nmgc.h"
+#include "erl_binary.h"
 
 ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(message,
 				 ErlMessage,
@@ -164,16 +165,25 @@ erts_resize_message_buffer(ErlHeapFragment *bp, Uint size,
 void
 erts_cleanup_offheap(ErlOffHeap *offheap)
 {
-    if (offheap->mso) {
-	erts_cleanup_mso(offheap->mso);
-    }
-#ifndef HYBRID /* FIND ME! */
-    if (offheap->funs) {
-	erts_cleanup_funs(offheap->funs);
-    }
-#endif
-    if (offheap->externals) {
-	erts_cleanup_externals(offheap->externals);
+    union erl_off_heap_ptr u;
+
+    for (u.hdr = offheap->first; u.hdr; u.hdr = u.hdr->next) {
+	switch (thing_subtag(u.hdr->thing_word)) {
+	case REFC_BINARY_SUBTAG:
+	    if (erts_refc_dectest(&u.pb->val->refc, 0) == 0) {
+		erts_bin_free(u.pb->val);
+	    }
+	    break;
+	case FUN_SUBTAG:
+	    if (erts_refc_dectest(&u.fun->fe->refc, 0) == 0) {
+		erts_erase_fun_entry(u.fun->fe);		    
+	    }
+	    break;
+	default:
+	    ASSERT(is_external_header(u.hdr->thing_word));
+	    erts_deref_node_entry(u.ext->node);
+	    break;
+	}
     }
 }
 
@@ -201,40 +211,16 @@ link_mbuf_to_proc(Process *proc, ErlHeapFragment *bp)
 	MBUF_SIZE(proc) += bp->used_size;
 	FLAGS(proc) |= F_FORCE_GC;
 
-	/* Move any binaries into the process */
-	if (bp->off_heap.mso != NULL) {
-	    ProcBin** next_p = &bp->off_heap.mso;
+	/* Move any off_heap's into the process */
+	if (bp->off_heap.first != NULL) {
+	    struct erl_off_heap_header** next_p = &bp->off_heap.first;
 	    while (*next_p != NULL) {
 		next_p = &((*next_p)->next);
 	    }
-	    *next_p = MSO(proc).mso;
-	    MSO(proc).mso = bp->off_heap.mso;
-	    bp->off_heap.mso = NULL;
-	    MSO(proc).overhead += bp->off_heap.overhead;
-	}
-
-	/* Move any funs into the process */
-#ifndef HYBRID
-	if (bp->off_heap.funs != NULL) {
-	    ErlFunThing** next_p = &bp->off_heap.funs;
-	    while (*next_p != NULL) {
-		next_p = &((*next_p)->next);
-	    }
-	    *next_p = MSO(proc).funs;
-	    MSO(proc).funs = bp->off_heap.funs;
-	    bp->off_heap.funs = NULL;
-	}
-#endif
-
-	/* Move any external things into the process */
-	if (bp->off_heap.externals != NULL) {
-	    ExternalThing** next_p = &bp->off_heap.externals;
-	    while (*next_p != NULL) {
-		next_p = &((*next_p)->next);
-	    }
-	    *next_p = MSO(proc).externals;
-	    MSO(proc).externals = bp->off_heap.externals;
-	    bp->off_heap.externals = NULL;
+	    *next_p = MSO(proc).first;
+	    MSO(proc).first = bp->off_heap.first;
+	    bp->off_heap.first = NULL;
+	    OH_OVERHEAD(&(MSO(proc)), bp->off_heap.overhead);
 	}
     }
 }
@@ -506,19 +492,7 @@ erts_link_mbuf_to_proc(struct process *proc, ErlHeapFragment *bp)
 void
 erts_move_msg_mbuf_to_heap(Eterm** hpp, ErlOffHeap* off_heap, ErlMessage *msg)
 {
-    /* Unions for typecasts avoids warnings about type-punned pointers and aliasing */
-    union {
-	Uint** upp;
-	ProcBin **pbpp;
-	ErlFunThing **efpp;
-	ExternalThing **etpp;
-    } oh_list_pp, oh_el_next_pp;
-    union {
-	Uint *up;
-	ProcBin *pbp;
-	ErlFunThing *efp;
-	ExternalThing *etp;
-    } oh_el_p;
+    struct erl_off_heap_header* oh;
     Eterm term, token, *fhp, *hp;
     Sint offs;
     Uint sz;
@@ -561,7 +535,7 @@ erts_move_msg_mbuf_to_heap(Eterm** hpp, ErlOffHeap* off_heap, ErlMessage *msg)
 	goto copy_done;
     }
 
-    off_heap->overhead += bp->off_heap.overhead;
+    OH_OVERHEAD(off_heap, bp->off_heap.overhead);
     sz = bp->used_size;
 
     ASSERT(is_immed(term) || in_heapfrag(ptr_val(term),bp));
@@ -571,9 +545,7 @@ erts_move_msg_mbuf_to_heap(Eterm** hpp, ErlOffHeap* off_heap, ErlMessage *msg)
     hp = *hpp;
     offs = hp - fhp;
 
-    oh_list_pp.upp = NULL;
-    oh_el_next_pp.upp = NULL; /* Shut up compiler warning */
-    oh_el_p.up = NULL; /* Shut up compiler warning */
+    oh = NULL;
     while (sz--) {
 	Uint cpy_sz;
 	Eterm val = *fhp++;
@@ -593,25 +565,11 @@ erts_move_msg_mbuf_to_heap(Eterm** hpp, ErlOffHeap* off_heap, ErlMessage *msg)
 	    case ARITYVAL_SUBTAG:
 		break;
 	    case REFC_BINARY_SUBTAG:
-		oh_list_pp.pbpp = &off_heap->mso;
-		oh_el_p.up = (hp-1);
-		oh_el_next_pp.pbpp = &(oh_el_p.pbp)->next;
-		cpy_sz = thing_arityval(val);
-		goto cpy_words;
 	    case FUN_SUBTAG:
-#ifndef HYBRID
-		oh_list_pp.efpp = &off_heap->funs;
-		oh_el_p.up = (hp-1);
-		oh_el_next_pp.efpp = &(oh_el_p.efp)->next;
-#endif
-		cpy_sz = thing_arityval(val);
-		goto cpy_words;
 	    case EXTERNAL_PID_SUBTAG:
 	    case EXTERNAL_PORT_SUBTAG:
 	    case EXTERNAL_REF_SUBTAG:
-		oh_list_pp.etpp = &off_heap->externals;
-		oh_el_p.up = (hp-1);
-		oh_el_next_pp.etpp =  &(oh_el_p.etp)->next;
+		oh = (struct erl_off_heap_header*) (hp-1);
 		cpy_sz = thing_arityval(val);
 		goto cpy_words;
 	    default:
@@ -641,44 +599,13 @@ erts_move_msg_mbuf_to_heap(Eterm** hpp, ErlOffHeap* off_heap, ErlMessage *msg)
 		case 1: *hp++ = *fhp++;
 		default: break;
 		}
-		if (oh_list_pp.upp) {
-#ifdef HARD_DEBUG
-		    Uint *dbg_old_oh_list_p = *oh_list_pp.upp;
-#endif
+		if (oh) {
 		    /* Add to offheap list */
-		    *oh_el_next_pp.upp = *oh_list_pp.upp;
-		    *oh_list_pp.upp = oh_el_p.up;
-		    ASSERT(*hpp <= oh_el_p.up);
-		    ASSERT(hp > oh_el_p.up);
-#ifdef HARD_DEBUG
-		    switch (val & _HEADER_SUBTAG_MASK) {
-		    case REFC_BINARY_SUBTAG:
-			ASSERT(off_heap->mso == *oh_list_pp.pbpp);
-			ASSERT(off_heap->mso->next
-			       == (ProcBin *) dbg_old_oh_list_p);
-			break;
-#ifndef HYBRID
-		    case FUN_SUBTAG:
-			ASSERT(off_heap->funs == *oh_list_pp.efpp);
-			ASSERT(off_heap->funs->next
-			       == (ErlFunThing *) dbg_old_oh_list_p);
-			break;
-#endif
-		    case EXTERNAL_PID_SUBTAG:
-		    case EXTERNAL_PORT_SUBTAG:
-		    case EXTERNAL_REF_SUBTAG:
-			ASSERT(off_heap->externals
-			       == *oh_list_pp.etpp);
-			ASSERT(off_heap->externals->next
-			       == (ExternalThing *) dbg_old_oh_list_p);
-			break;
-		    default:
-			ASSERT(0);
-		    }
-#endif
-		    oh_list_pp.upp = NULL;
-
-
+		    oh->next = off_heap->first;
+		    off_heap->first = oh;
+		    ASSERT(*hpp <= (Eterm*)oh);
+		    ASSERT(hp > (Eterm*)oh);
+		    oh = NULL;
 		}
 		break;
 	    }
@@ -765,11 +692,7 @@ copy_done:
 #endif
 	    
 
-    bp->off_heap.mso = NULL;
-#ifndef HYBRID
-    bp->off_heap.funs = NULL;
-#endif
-    bp->off_heap.externals = NULL;
+    bp->off_heap.first = NULL;
     free_message_buffer(bp);
     msg->data.heap_frag = NULL;
 
diff --git a/erts/emulator/beam/erl_message.h b/erts/emulator/beam/erl_message.h
index f478572ac2..5aca0db6fe 100644
--- a/erts/emulator/beam/erl_message.h
+++ b/erts/emulator/beam/erl_message.h
@@ -28,13 +28,22 @@ struct external_thing_;
  * but is stored outside of any heap.
  */
 
-typedef struct erl_off_heap {
-    struct proc_bin* mso;	/* List of associated binaries. */
-#ifndef HYBRID /* FIND ME! */
-    struct erl_fun_thing* funs;	/* List of funs. */
+struct erl_off_heap_header {
+    Eterm thing_word;
+    Uint size;
+#if HALFWORD_HEAP
+    void* dummy_ptr_padding__;
 #endif
-    struct external_thing_* externals; /* List of external things. */
-    int overhead;		/* Administrative overhead (used to force GC). */
+    struct erl_off_heap_header* next;
+};
+
+#define OH_OVERHEAD(oh, size) do { \
+    (oh)->overhead += size;        \
+} while(0)
+
+typedef struct erl_off_heap {
+    struct erl_off_heap_header* first;
+    Uint64 overhead;     /* Administrative overhead (used to force GC). */
 } ErlOffHeap;
 
 #include "external.h"
@@ -201,9 +210,7 @@ do {							\
     (HEAP_FRAG_P)->next = NULL;				\
     (HEAP_FRAG_P)->alloc_size = (DATA_WORDS);		\
     (HEAP_FRAG_P)->used_size = (DATA_WORDS);            \
-    (HEAP_FRAG_P)->off_heap.mso = NULL;			\
-    (HEAP_FRAG_P)->off_heap.funs = NULL;		\
-    (HEAP_FRAG_P)->off_heap.externals = NULL;		\
+    (HEAP_FRAG_P)->off_heap.first = NULL; 	        \
     (HEAP_FRAG_P)->off_heap.overhead = 0;		\
 } while (0)
 
diff --git a/erts/emulator/beam/erl_monitors.c b/erts/emulator/beam/erl_monitors.c
index d873c7a701..9751b5d77c 100644
--- a/erts/emulator/beam/erl_monitors.c
+++ b/erts/emulator/beam/erl_monitors.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2004-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2004-2011. 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
@@ -85,7 +85,7 @@ static ERTS_INLINE int cmp_mon_ref(Eterm ref1, Eterm ref2)
     if (is_ref_thing_header(*b2)) {
 	return 1;
     }
-    return cmp(ref1,ref2);
+    return CMP(ref1,ref2);
 }
 	    
 #define CP_LINK_VAL(To, Hp, From)				\
@@ -380,7 +380,7 @@ int erts_add_link(ErtsLink **root, Uint type, Eterm pid)
 	    state = 1;
 	    *this = create_link(type,pid);
 	    break;
-	} else if ((c = cmp(pid,(*this)->pid)) < 0) { 
+	} else if ((c = CMP(pid,(*this)->pid)) < 0) {
 	    /* go left */
 	    dstack[dpos++] = DIR_LEFT;
 	    tstack[tpos++] = this;
@@ -415,7 +415,7 @@ erts_add_or_lookup_suspend_monitor(ErtsSuspendMonitor **root, Eterm pid)
 	    state = 1;
 	    res = *this = create_suspend_monitor(pid);
 	    break;
-	} else if ((c = cmp(pid,(*this)->pid)) < 0) { 
+	} else if ((c = CMP(pid,(*this)->pid)) < 0) {
 	    /* go left */
 	    dstack[dpos++] = DIR_LEFT;
 	    tstack[tpos++] = this;
@@ -453,7 +453,7 @@ ErtsLink *erts_add_or_lookup_link(ErtsLink **root, Uint type, Eterm pid)
 	    *this = create_link(type,pid);
 	    ret = *this;
 	    break;
-	} else if ((c = cmp(pid,(*this)->pid)) < 0) { 
+	} else if ((c = CMP(pid,(*this)->pid)) < 0) {
 	    /* go left */
 	    dstack[dpos++] = DIR_LEFT;
 	    tstack[tpos++] = this;
@@ -663,7 +663,7 @@ ErtsLink *erts_remove_link(ErtsLink **root, Eterm pid)
     for (;;) {
 	if (!*this) { /* Failure */
 	    return NULL;
-	} else if ((c = cmp(pid,(*this)->pid)) < 0) { 
+	} else if ((c = CMP(pid,(*this)->pid)) < 0) {
 	    dstack[dpos++] = DIR_LEFT;
 	    tstack[tpos++] = this;
 	    this = &((*this)->left);
@@ -715,7 +715,7 @@ erts_delete_suspend_monitor(ErtsSuspendMonitor **root, Eterm pid)
     for (;;) {
 	if (!*this) { /* Nothing found */
 	    return;
-	} else if ((c = cmp(pid,(*this)->pid)) < 0) { 
+	} else if ((c = CMP(pid,(*this)->pid)) < 0) {
 	    dstack[dpos++] = DIR_LEFT;
 	    tstack[tpos++] = this;
 	    this = &((*this)->left);
@@ -771,7 +771,7 @@ ErtsLink *erts_lookup_link(ErtsLink *root, Eterm pid)
     Sint c;
 
     for (;;) {
-	if (root == NULL || (c = cmp(pid,root->pid)) == 0) {
+	if (root == NULL || (c = CMP(pid,root->pid)) == 0) {
 	    return root;
 	} else if (c < 0) { 
 	    root = root->left;
@@ -787,7 +787,7 @@ erts_lookup_suspend_monitor(ErtsSuspendMonitor *root, Eterm pid)
     Sint c;
 
     for (;;) {
-	if (root == NULL || (c = cmp(pid,root->pid)) == 0) {
+	if (root == NULL || (c = CMP(pid,root->pid)) == 0) {
 	    return root;
 	} else if (c < 0) { 
 	    root = root->left;
diff --git a/erts/emulator/beam/erl_mtrace.c b/erts/emulator/beam/erl_mtrace.c
index 9cf55ee319..b1478758a1 100644
--- a/erts/emulator/beam/erl_mtrace.c
+++ b/erts/emulator/beam/erl_mtrace.c
@@ -585,9 +585,7 @@ void erts_mtrace_init(char *receiver, char *nodename)
 	Uint16 port;
 
 	erts_mtx_init(&mtrace_buf_mutex, "mtrace_buf");
-	erts_mtx_set_forksafe(&mtrace_buf_mutex);
 	erts_mtx_init(&mtrace_op_mutex, "mtrace_op");
-	erts_mtx_set_forksafe(&mtrace_op_mutex);
 
 	socket_desc = erts_sock_open();
 	if (socket_desc == ERTS_SOCK_INVALID_SOCKET) {
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 3d63fa1caf..135c6b0ccc 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2009-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2009-2011. 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
@@ -81,7 +81,6 @@ static ERTS_INLINE Eterm* alloc_heap(ErlNifEnv* env, unsigned need)
 
 static Eterm* alloc_heap_heavy(ErlNifEnv* env, unsigned need, Eterm* hp)
 {    
-    unsigned frag_sz;
     env->hp = hp;
     if (env->heap_frag == NULL) {       
 	ASSERT(HEAP_LIMIT(env->proc) == env->hp_end);
@@ -91,14 +90,24 @@ static Eterm* alloc_heap_heavy(ErlNifEnv* env, unsigned need, Eterm* hp)
 	env->heap_frag->used_size = hp - env->heap_frag->mem;
 	ASSERT(env->heap_frag->used_size <= env->heap_frag->alloc_size);
     }
-    frag_sz = need + MIN_HEAP_FRAG_SZ;
-    hp = erts_heap_alloc(env->proc, frag_sz);
-    env->hp = hp + need;
-    env->hp_end = hp + frag_sz;
+    hp = erts_heap_alloc(env->proc, need, MIN_HEAP_FRAG_SZ);
     env->heap_frag = MBUF(env->proc);
+    env->hp = hp + need;
+    env->hp_end = env->heap_frag->mem + env->heap_frag->alloc_size;
+
     return hp;
 }
 
+#if SIZEOF_LONG != ERTS_SIZEOF_ETERM
+static ERTS_INLINE void ensure_heap(ErlNifEnv* env, unsigned may_need)
+{
+    if (env->hp + may_need > env->hp_end) {
+	alloc_heap_heavy(env, may_need, env->hp);
+	env->hp -= may_need;
+    }
+}
+#endif
+
 void erts_pre_nif(ErlNifEnv* env, Process* p, struct erl_module_nif* mod_nif)
 {
     env->mod_nif = mod_nif;
@@ -258,9 +267,7 @@ void enif_free_env(ErlNifEnv* env)
 
 static ERTS_INLINE void clear_offheap(ErlOffHeap* oh)
 {
-    oh->mso = NULL;
-    oh->externals = NULL;
-    oh->funs = NULL;
+    oh->first = NULL;
     oh->overhead = 0;
 }
 
@@ -364,7 +371,7 @@ ERL_NIF_TERM enif_make_copy(ErlNifEnv* dst_env, ERL_NIF_TERM src_term)
 #ifdef DEBUG
 static int is_offheap(const ErlOffHeap* oh)
 {
-    return oh->mso != NULL || oh->funs != NULL || oh->externals != NULL;
+    return oh->first != NULL;
 }
 #endif
 
@@ -566,7 +573,7 @@ int enif_is_identical(Eterm lhs, Eterm rhs)
 
 int enif_compare(Eterm lhs, Eterm rhs)
 {
-    return cmp(lhs,rhs);
+    return CMP(lhs,rhs);
 }
 
 int enif_get_tuple(ErlNifEnv* env, Eterm tpl, int* arity, const Eterm** array)
@@ -627,13 +634,13 @@ Eterm enif_make_binary(ErlNifEnv* env, ErlNifBinary* bin)
 	pb = (ProcBin *) alloc_heap(env, PROC_BIN_SIZE);
 	pb->thing_word = HEADER_PROC_BIN;
 	pb->size = bptr->orig_size;
-	pb->next = MSO(env->proc).mso;
-	MSO(env->proc).mso = pb;
+	pb->next = MSO(env->proc).first;
+	MSO(env->proc).first = (struct erl_off_heap_header*) pb;
 	pb->val = bptr;
 	pb->bytes = (byte*) bptr->orig_bytes;
 	pb->flags = 0;
 	
-	MSO(env->proc).overhead += pb->size / sizeof(Eterm);
+	OH_OVERHEAD(&(MSO(env->proc)), pb->size / sizeof(Eterm));
 	bin_term = make_binary(pb);	
 	if (erts_refc_read(&bptr->refc, 1) == 1) {
 	    /* Total ownership transfer */
@@ -732,9 +739,8 @@ int enif_get_long(ErlNifEnv* env, Eterm term, long* ip)
 {
 #if SIZEOF_LONG == ERTS_SIZEOF_ETERM
     return term_to_Sint(term, ip);
-#elif SIZEOF_INT == ERTS_SIZEOF_ETERM
-    Sint i;
-    return term_to_Sint(term, &i) ? (*ip = (long) i, 1) : 0;
+#elif SIZEOF_LONG == 8
+    return term_to_Sint64(term, ip);
 #else
 #  error Unknown long word size 
 #endif     
@@ -744,15 +750,26 @@ int enif_get_ulong(ErlNifEnv* env, Eterm term, unsigned long* ip)
 {
 #if SIZEOF_LONG == ERTS_SIZEOF_ETERM
     return term_to_Uint(term, ip);
-#elif SIZEOF_INT == ERTS_SIZEOF_ETERM
-    Uint u;
-    return term_to_Uint(term, &u) ? (*ip = (unsigned long) u, 1) : 0;
+#elif SIZEOF_LONG == 8
+    return term_to_Uint64(term, ip);
 #else
 #  error Unknown long word size 
 #endif     
 }
 
-int enif_get_double(ErlNifEnv* env, Eterm term, double* dp)
+#if HAVE_INT64 && SIZEOF_LONG != 8
+int enif_get_int64(ErlNifEnv* env, ERL_NIF_TERM term, ErlNifSInt64* ip)
+{
+    return term_to_Sint64(term, ip);
+}
+
+int enif_get_uint64(ErlNifEnv* env, ERL_NIF_TERM term, ErlNifUInt64* ip)
+{
+    return term_to_Uint64(term, ip);
+}
+#endif /* HAVE_INT64 && SIZEOF_LONG != 8 */
+
+int enif_get_double(ErlNifEnv* env, ERL_NIF_TERM term, double* dp)
 {
     FloatDef f;
     if (is_not_float(term)) {
@@ -811,14 +828,44 @@ ERL_NIF_TERM enif_make_uint(ErlNifEnv* env, unsigned i)
 
 ERL_NIF_TERM enif_make_long(ErlNifEnv* env, long i)
 {
+#if SIZEOF_LONG == ERTS_SIZEOF_ETERM
     return IS_SSMALL(i) ? make_small(i) : small_to_big(i, alloc_heap(env,2));
+#elif SIZEOF_LONG == 8
+    ensure_heap(env,3);
+    return erts_sint64_to_big(i, &env->hp);
+#endif
 }
 
 ERL_NIF_TERM enif_make_ulong(ErlNifEnv* env, unsigned long i)
 {
+#if SIZEOF_LONG == ERTS_SIZEOF_ETERM
     return IS_USMALL(0,i) ? make_small(i) : uint_to_big(i,alloc_heap(env,2));
+#elif SIZEOF_LONG == 8
+    ensure_heap(env,3);
+    return erts_uint64_to_big(i, &env->hp);    
+#endif
+}
+
+#if HAVE_INT64 && SIZEOF_LONG != 8
+ERL_NIF_TERM enif_make_int64(ErlNifEnv* env, ErlNifSInt64 i)
+{
+    Uint* hp;
+    Uint need = 0;
+    erts_bld_sint64(NULL, &need, i);
+    hp = alloc_heap(env, need);
+    return erts_bld_sint64(&hp, NULL, i);
 }
 
+ERL_NIF_TERM enif_make_uint64(ErlNifEnv* env, ErlNifUInt64 i)
+{
+    Uint* hp;
+    Uint need = 0;
+    erts_bld_uint64(NULL, &need, i);
+    hp = alloc_heap(env, need);
+    return erts_bld_uint64(&hp, NULL, i);
+}
+#endif /* HAVE_INT64 && SIZEOF_LONG != 8 */
+
 ERL_NIF_TERM enif_make_double(ErlNifEnv* env, double d)
 {
     Eterm* hp = alloc_heap(env,FLOAT_SIZE_OBJECT);
@@ -891,21 +938,26 @@ ERL_NIF_TERM enif_make_list_cell(ErlNifEnv* env, Eterm car, Eterm cdr)
 
 ERL_NIF_TERM enif_make_list(ErlNifEnv* env, unsigned cnt, ...)
 {
-    Eterm* hp = alloc_heap(env,cnt*2);
-    Eterm ret = make_list(hp);
-    Eterm* last = &ret;
-    va_list ap;
-
-    va_start(ap,cnt);
-    while (cnt--) {
-	*last = make_list(hp);
-	*hp = va_arg(ap,Eterm);
-	last = ++hp;
-	++hp;
+    if (cnt == 0) {
+	return NIL;
+    }
+    else {
+	Eterm* hp = alloc_heap(env,cnt*2);
+	Eterm ret = make_list(hp);
+	Eterm* last = &ret;
+	va_list ap;
+
+	va_start(ap,cnt);
+	while (cnt--) {
+	    *last = make_list(hp);
+	    *hp = va_arg(ap,Eterm);
+	    last = ++hp;
+	    ++hp;
+	}
+	va_end(ap);
+	*last = NIL;
+	return ret;
     }
-    va_end(ap);
-    *last = NIL;
-    return ret;
 }
 
 ERL_NIF_TERM enif_make_list_from_array(ErlNifEnv* env, const ERL_NIF_TERM arr[], unsigned cnt)
@@ -1426,7 +1478,13 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2)
 	
 	ret = load_nif_error(BIF_P, bad_lib, "Library version (%d.%d) not compatible (with %d.%d).",
 			     entry->major, entry->minor, ERL_NIF_MAJOR_VERSION, ERL_NIF_MINOR_VERSION);
-    }    
+    }   
+    else if (entry->minor >= 1
+	     && sys_strcmp(entry->vm_variant, ERL_NIF_VM_VARIANT) != 0) {
+	ret = load_nif_error(BIF_P, bad_lib, "Library (%s) not compiled for "
+			     "this vm variant (%s).",
+			     entry->vm_variant, ERL_NIF_VM_VARIANT);
+    }
     else if (!erts_is_atom_str((char*)entry->name, mod_atom)) {
 	ret = load_nif_error(BIF_P, bad_lib, "Library module name '%s' does not"
 			     " match calling module '%T'", entry->name, mod_atom);
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h
index 936f03bce1..8050b3640a 100644
--- a/erts/emulator/beam/erl_nif.h
+++ b/erts/emulator/beam/erl_nif.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2009-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2009-2011. 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
@@ -30,9 +30,10 @@
 ** 0.1: R13B03
 ** 1.0: R13B04
 ** 2.0: R14A
+** 2.1: R14B02 "vm_variant"
 */
 #define ERL_NIF_MAJOR_VERSION 2
-#define ERL_NIF_MINOR_VERSION 0
+#define ERL_NIF_MINOR_VERSION 1
 
 #include <stdlib.h>
 
@@ -66,9 +67,24 @@
 extern "C" {
 #endif
 
+#if (defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_))
+typedef unsigned __int64 ErlNifUInt64;
+typedef __int64 ErlNifSInt64;
+#elif SIZEOF_LONG == 8
+typedef unsigned long ErlNifUInt64;
+typedef long ErlNifSInt64;
+#elif SIZEOF_LONG_LONG == 8
+typedef unsigned long long ErlNifUInt64;
+typedef long long ErlNifSInt64;
+#else
+#error No 64-bit integer type
+#endif
+
 #ifdef HALFWORD_HEAP_EMULATOR
+#  define ERL_NIF_VM_VARIANT "beam.halfword" 
 typedef unsigned int ERL_NIF_TERM;
 #else
+#  define ERL_NIF_VM_VARIANT "beam.vanilla" 
 typedef unsigned long ERL_NIF_TERM;
 #endif
 
@@ -92,7 +108,8 @@ typedef struct enif_entry_t
     int  (*load)   (ErlNifEnv*, void** priv_data, ERL_NIF_TERM load_info);
     int  (*reload) (ErlNifEnv*, void** priv_data, ERL_NIF_TERM load_info);
     int  (*upgrade)(ErlNifEnv*, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info);
-    void (*unload) (ErlNifEnv*, void* priv_data);    
+    void (*unload) (ErlNifEnv*, void* priv_data);
+    const char* vm_variant;
 }ErlNifEntry;
 
 
@@ -185,6 +202,7 @@ extern TWinDynNifCallbacks WinDynNifCallbacks;
 #define ERL_NIF_INIT(NAME, FUNCS, LOAD, RELOAD, UPGRADE, UNLOAD) \
 ERL_NIF_INIT_PROLOGUE                   \
 ERL_NIF_INIT_GLOB                       \
+ERL_NIF_INIT_DECL(NAME);		\
 ERL_NIF_INIT_DECL(NAME)			\
 {					\
     static ErlNifEntry entry = 		\
@@ -194,7 +212,8 @@ ERL_NIF_INIT_DECL(NAME)			\
 	#NAME,				\
 	sizeof(FUNCS) / sizeof(*FUNCS),	\
 	FUNCS,				\
-	LOAD, RELOAD, UPGRADE, UNLOAD	\
+	LOAD, RELOAD, UPGRADE, UNLOAD,	\
+	ERL_NIF_VM_VARIANT		\
     };                                  \
     ERL_NIF_INIT_BODY;                  \
     return &entry;			\
diff --git a/erts/emulator/beam/erl_nif_api_funcs.h b/erts/emulator/beam/erl_nif_api_funcs.h
index ef4e9580b0..eca506593d 100644
--- a/erts/emulator/beam/erl_nif_api_funcs.h
+++ b/erts/emulator/beam/erl_nif_api_funcs.h
@@ -122,6 +122,12 @@ ERL_NIF_API_FUNC_DECL(ErlNifPid*,enif_self,(ErlNifEnv* caller_env, ErlNifPid* pi
 ERL_NIF_API_FUNC_DECL(int,enif_get_local_pid,(ErlNifEnv* env, ERL_NIF_TERM, ErlNifPid* pid));
 ERL_NIF_API_FUNC_DECL(void,enif_keep_resource,(void* obj));
 ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_resource_binary,(ErlNifEnv*,void* obj,const void* data, size_t size));
+#if SIZEOF_LONG != 8
+ERL_NIF_API_FUNC_DECL(int,enif_get_int64,(ErlNifEnv*, ERL_NIF_TERM term, ErlNifSInt64* ip));
+ERL_NIF_API_FUNC_DECL(int,enif_get_uint64,(ErlNifEnv*, ERL_NIF_TERM term, ErlNifUInt64* ip));
+ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_int64,(ErlNifEnv*, ErlNifSInt64));
+ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_uint64,(ErlNifEnv*, ErlNifUInt64));
+#endif
 
 /*
 ** Add last to keep compatibility on Windows!!!
@@ -230,6 +236,13 @@ ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_resource_binary,(ErlNifEnv*,void* o
 #  define enif_get_local_pid ERL_NIF_API_FUNC_MACRO(enif_get_local_pid)
 #  define enif_keep_resource ERL_NIF_API_FUNC_MACRO(enif_keep_resource)
 #  define enif_make_resource_binary ERL_NIF_API_FUNC_MACRO(enif_make_resource_binary)
+#if  SIZEOF_LONG != 8
+#  define enif_get_int64 ERL_NIF_API_FUNC_MACRO(enif_get_int64)
+#  define enif_get_uint64 ERL_NIF_API_FUNC_MACRO(enif_get_uint64)
+#  define enif_make_int64 ERL_NIF_API_FUNC_MACRO(enif_make_int64)
+#  define enif_make_uint64 ERL_NIF_API_FUNC_MACRO(enif_make_uint64)
+#endif
+
 #endif
 
 #ifndef enif_make_list1
@@ -253,5 +266,13 @@ ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_resource_binary,(ErlNifEnv*,void* o
 #  define enif_make_tuple9(ENV,E1,E2,E3,E4,E5,E6,E7,E8,E9) enif_make_tuple(ENV,9,E1,E2,E3,E4,E5,E6,E7,E8,E9)
 
 #  define enif_make_pid(ENV, PID) ((const ERL_NIF_TERM)((PID)->pid))
+
+#if SIZEOF_LONG == 8
+#  define enif_get_int64 enif_get_long
+#  define enif_get_uint64 enif_get_ulong
+#  define enif_make_int64 enif_make_long
+#  define enif_make_uint64 enif_make_ulong
+#endif
+
 #endif
 
diff --git a/erts/emulator/beam/erl_node_container_utils.h b/erts/emulator/beam/erl_node_container_utils.h
index ae1316eba2..2c67e781e0 100644
--- a/erts/emulator/beam/erl_node_container_utils.h
+++ b/erts/emulator/beam/erl_node_container_utils.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2001-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2011. 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
@@ -255,19 +255,32 @@ extern int erts_use_r9_pids_ports;
 
 #define internal_ref_no_of_numbers(x)					\
   (internal_ref_data((x))[0])
+#define internal_thing_ref_no_of_numbers(thing)			        \
+  (internal_thing_ref_data(thing)[0])
 #define internal_ref_numbers(x)						\
   (&internal_ref_data((x))[1])
+#define internal_thing_ref_numbers(thing)				\
+  (&internal_thing_ref_data(thing)[1])
 #define external_ref_no_of_numbers(x)					\
   (external_ref_data((x))[0])
+#define external_thing_ref_no_of_numbers(thing)			        \
+  (external_thing_ref_data(thing)[0])
 #define external_ref_numbers(x)						\
   (&external_ref_data((x))[1])
+#define external_thing_ref_numbers(thing)				\
+  (&external_thing_ref_data(thing)[1])
+
 
 #else
 
 #define internal_ref_no_of_numbers(x)	(internal_ref_data_words((x)))
+#define internal_thing_ref_no_of_numbers(t) (internal_thing_ref_data_words(t))
 #define internal_ref_numbers(x)		(internal_ref_data((x)))
+#define internal_thing_ref_numbers(t)   (internal_thing_ref_data(t))
 #define external_ref_no_of_numbers(x)	(external_ref_data_words((x)))
+#define external_thing_ref_no_of_numbers(t) (external_thing_ref_data_words((t)))
 #define external_ref_numbers(x)		(external_ref_data((x)))
+#define external_thing_ref_numbers(t)   (external_thing_ref_data((t)))
 
 #endif
 
@@ -311,6 +324,8 @@ extern int erts_use_r9_pids_ports;
 					 : external_ref_channel_no((x)))
 #define is_ref(x)			(is_internal_ref((x))		\
 					 || is_external_ref((x)))
+#define is_ref_rel(x,Base)		(is_internal_ref_rel((x),Base)	\
+					 || is_external_ref_rel((x),Base))
 #define is_not_ref(x)			(!is_ref(x))
 
 #endif
diff --git a/erts/emulator/beam/erl_node_tables.c b/erts/emulator/beam/erl_node_tables.c
index 5865d33138..6daa127d23 100644
--- a/erts/emulator/beam/erl_node_tables.c
+++ b/erts/emulator/beam/erl_node_tables.c
@@ -80,6 +80,8 @@ dist_table_alloc(void *dep_tmpl)
     Eterm chnl_nr;
     Eterm sysname;
     DistEntry *dep;
+    erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER;
+    rwmtx_opt.type = ERTS_SMP_RWMTX_TYPE_FREQUENT_READ;
 
     if(((DistEntry *) dep_tmpl) == erts_this_dist_entry)
 	return dep_tmpl;
@@ -92,7 +94,7 @@ dist_table_alloc(void *dep_tmpl)
 
     dep->prev				= NULL;
     erts_refc_init(&dep->refc, -1);
-    erts_smp_rwmtx_init_x(&dep->rwmtx, "dist_entry", chnl_nr);
+    erts_smp_rwmtx_init_opt_x(&dep->rwmtx, &rwmtx_opt, "dist_entry", chnl_nr);
     dep->sysname			= sysname;
     dep->cid				= NIL;
     dep->connection_id			= 0;
@@ -105,7 +107,7 @@ dist_table_alloc(void *dep_tmpl)
     dep->nlinks				= NULL;
     dep->monitors			= NULL;
 
-    erts_smp_spinlock_init_x(&dep->qlock, "dist_entry_out_queue", chnl_nr);
+    erts_smp_mtx_init_x(&dep->qlock, "dist_entry_out_queue", chnl_nr);
     dep->qflgs				= 0;
     dep->qsize				= 0;
     dep->out_queue.first		= NULL;
@@ -170,7 +172,7 @@ dist_table_free(void *vdep)
     ASSERT(!dep->cache);
     erts_smp_rwmtx_destroy(&dep->rwmtx);
     erts_smp_mtx_destroy(&dep->lnk_mtx);
-    erts_smp_spinlock_destroy(&dep->qlock);
+    erts_smp_mtx_destroy(&dep->qlock);
 
 #ifdef DEBUG
     sys_memset(vdep, 0x77, sizeof(DistEntry));
@@ -233,7 +235,7 @@ erts_sysname_to_connected_dist_entry(Eterm sysname)
     erts_smp_rwmtx_rlock(&erts_dist_table_rwmtx);
     res_dep = (DistEntry *) hash_get(&erts_dist_table, (void *) &de);
     if (res_dep) {
-	long refc = erts_refc_inctest(&res_dep->refc, 1);
+	erts_aint_t refc = erts_refc_inctest(&res_dep->refc, 1);
 	if (refc < 2) /* Pending delete */
 	    erts_refc_inc(&res_dep->refc, 1);
     }
@@ -255,7 +257,7 @@ DistEntry *erts_find_or_insert_dist_entry(Eterm sysname)
 {
     DistEntry *res;
     DistEntry de;
-    long refc;
+    erts_aint_t refc;
     res = erts_find_dist_entry(sysname);
     if (res)
 	return res;
@@ -277,7 +279,7 @@ DistEntry *erts_find_dist_entry(Eterm sysname)
     erts_smp_rwmtx_rlock(&erts_dist_table_rwmtx);
     res = hash_get(&erts_dist_table, (void *) &de);
     if (res) {
-	long refc = erts_refc_inctest(&res->refc, 1);
+	erts_aint_t refc = erts_refc_inctest(&res->refc, 1);
 	if (refc < 2) /* Pending delete */
 	    erts_refc_inc(&res->refc, 1);
     }
@@ -580,11 +582,23 @@ ErlNode *erts_find_or_insert_node(Eterm sysname, Uint creation)
     ErlNode ne;
     ne.sysname = sysname;
     ne.creation = creation;
+
+    erts_smp_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);
+	if (refc < 2) /* New or pending delete */
+	    erts_refc_inc(&res->refc, 1);
+    }
+    erts_smp_rwmtx_runlock(&erts_node_table_rwmtx);
+    if (res)
+	return res;
+
     erts_smp_rwmtx_rwlock(&erts_node_table_rwmtx);
     res = hash_put(&erts_node_table, (void *) &ne);
     ASSERT(res);
     if (res != erts_this_node) {
-	long refc = erts_refc_inctest(&res->refc, 0);
+	erts_aint_t refc = erts_refc_inctest(&res->refc, 0);
 	if (refc < 2) /* New or pending delete */
 	    erts_refc_inc(&res->refc, 1);
     }
@@ -696,8 +710,12 @@ erts_set_this_node(Eterm sysname, Uint creation)
 
 void erts_init_node_tables(void)
 {
+    erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER;
     HashFunctions f;
 
+    rwmtx_opt.type = ERTS_SMP_RWMTX_TYPE_FREQUENT_READ;
+    rwmtx_opt.lived = ERTS_SMP_RWMTX_LONG_LIVED;
+
     f.hash  = (H_FUN)			dist_table_hash;
     f.cmp   = (HCMP_FUN)		dist_table_cmp;
     f.alloc = (HALLOC_FUN)		dist_table_alloc;
@@ -719,9 +737,10 @@ void erts_init_node_tables(void)
     erts_this_dist_entry->prev				= NULL;
     erts_refc_init(&erts_this_dist_entry->refc, 1); /* erts_this_node */
 
-    erts_smp_rwmtx_init_x(&erts_this_dist_entry->rwmtx,
-			  "dist_entry",
-			  make_small(ERST_INTERNAL_CHANNEL_NO));
+    erts_smp_rwmtx_init_opt_x(&erts_this_dist_entry->rwmtx,
+			      &rwmtx_opt,
+			      "dist_entry",
+			      make_small(ERST_INTERNAL_CHANNEL_NO));
     erts_this_dist_entry->sysname			= am_Noname;
     erts_this_dist_entry->cid				= NIL;
     erts_this_dist_entry->connection_id			= 0;
@@ -736,9 +755,9 @@ void erts_init_node_tables(void)
     erts_this_dist_entry->nlinks			= NULL;
     erts_this_dist_entry->monitors			= NULL;
 
-    erts_smp_spinlock_init_x(&erts_this_dist_entry->qlock,
-			     "dist_entry_out_queue",
-			     make_small(ERST_INTERNAL_CHANNEL_NO));
+    erts_smp_mtx_init_x(&erts_this_dist_entry->qlock,
+			"dist_entry_out_queue",
+			make_small(ERST_INTERNAL_CHANNEL_NO));
     erts_this_dist_entry->qflgs				= 0;
     erts_this_dist_entry->qsize				= 0;
     erts_this_dist_entry->out_queue.first		= NULL;
@@ -772,8 +791,8 @@ void erts_init_node_tables(void)
 
     (void) hash_put(&erts_node_table, (void *) erts_this_node);
 
-    erts_smp_rwmtx_init(&erts_node_table_rwmtx, "node_table");
-    erts_smp_rwmtx_init(&erts_dist_table_rwmtx, "dist_table");
+    erts_smp_rwmtx_init_opt(&erts_node_table_rwmtx, &rwmtx_opt, "node_table");
+    erts_smp_rwmtx_init_opt(&erts_dist_table_rwmtx, &rwmtx_opt, "dist_table");
 
     references_atoms_need_init = 1;
 }
@@ -1087,30 +1106,24 @@ insert_offheap2(ErlOffHeap *oh, void *arg)
 static void
 insert_offheap(ErlOffHeap *oh, int type, Eterm id)
 {
-    if(oh->externals) {
-	ExternalThing *etp = oh->externals;
-	while (etp) {
-	    insert_node(etp->node, type, id);
-	    etp = etp->next;
-	}
-    }
+    union erl_off_heap_ptr u;
+    struct insert_offheap2_arg a;
+    a.type = BIN_REF;
 
-    if(oh->mso) {
-	ProcBin *pb;
-	struct insert_offheap2_arg a;
-	a.type = BIN_REF;
-	for(pb = oh->mso; pb; pb = pb->next) {
-	    if(IsMatchProgBinary(pb->val)) {
+    for (u.hdr = oh->first; u.hdr; u.hdr = u.hdr->next) {
+	switch (thing_subtag(u.hdr->thing_word)) {
+	case REFC_BINARY_SUBTAG:
+	    if(IsMatchProgBinary(u.pb->val)) {
 		InsertedBin *ib;
 		int insert_bin = 1;
 		for (ib = inserted_bins; ib; ib = ib->next)
-		    if(ib->bin_val == pb->val) {
+		    if(ib->bin_val == u.pb->val) {
 			insert_bin = 0;
 			break;
 		    }
 		if (insert_bin) {
 #if HALFWORD_HEAP
-		    UWord val = (UWord) pb->val;
+		    UWord val = (UWord) u.pb->val;
 		    DeclareTmpHeapNoproc(id_heap,BIG_UINT_HEAP_SIZE*2); /* extra place allocated */
 #else
 		    DeclareTmpHeapNoproc(id_heap,BIG_UINT_HEAP_SIZE);
@@ -1124,13 +1137,13 @@ insert_offheap(ErlOffHeap *oh, int type, Eterm id)
 		    a.id = erts_bld_uword(&hp, NULL, (UWord) val);
 #else
 		    UseTmpHeapNoproc(BIG_UINT_HEAP_SIZE);
-		    a.id = erts_bld_uint(&hp, NULL, (Uint) pb->val);
+		    a.id = erts_bld_uint(&hp, NULL, (Uint) u.pb->val);
 #endif
-		    erts_match_prog_foreach_offheap(pb->val,
+		    erts_match_prog_foreach_offheap(u.pb->val,
 						    insert_offheap2,
 						    (void *) &a);
 		    nib = erts_alloc(ERTS_ALC_T_NC_TMP, sizeof(InsertedBin));
-		    nib->bin_val = pb->val;
+		    nib->bin_val = u.pb->val;
 		    nib->next = inserted_bins;
 		    inserted_bins = nib;
 #if HALFWORD_HEAP
@@ -1139,15 +1152,16 @@ insert_offheap(ErlOffHeap *oh, int type, Eterm id)
 		    UnUseTmpHeapNoproc(BIG_UINT_HEAP_SIZE);
 #endif
 		}
-	    }
+	    }		
+	    break;
+	case FUN_SUBTAG:
+	    break; /* No need to */
+	default:
+	    ASSERT(is_external_header(u.hdr->thing_word));
+	    insert_node(u.ext->node, type, id);
+	    break;
 	}
     }
-
-#if 0
-    if(oh->funs) {
-	/* No need to */
-    }
-#endif
 }
 
 static void doit_insert_monitor(ErtsMonitor *monitor, void *p)
@@ -1289,6 +1303,7 @@ setup_reference_table(void)
     for (i = 0; i < erts_max_processes; i++)
 	if (process_tab[i]) {
 	    ErlMessage *msg;
+
 	    /* Insert Heap */
 	    insert_offheap(&(process_tab[i]->off_heap),
 			   HEAP_REF,
@@ -1375,21 +1390,22 @@ setup_reference_table(void)
 
     { /* Add binaries stored elsewhere ... */
 	ErlOffHeap oh;
-	ProcBin pb[2] = {{0},{0}};
-	ProcBin *mso = NULL;
+	ProcBin pb[2];
 	int i = 0;
 	Binary *default_match_spec;
 	Binary *default_meta_match_spec;
 
-	/* Only the ProcBin members val and next will be inspected
+	oh.first = NULL;
+	/* Only the ProcBin members thing_word, val and next will be inspected
 	   (by insert_offheap()) */
 #undef  ADD_BINARY
-#define ADD_BINARY(Bin)					\
-	if ((Bin)) {					\
-	    pb[i].val = (Bin);				\
-	    pb[i].next = mso;				\
-	    mso = &pb[i];				\
-	    i++;					\
+#define ADD_BINARY(Bin)				 	     \
+	if ((Bin)) {					     \
+	    pb[i].thing_word = REFC_BINARY_SUBTAG;           \
+	    pb[i].val = (Bin);				     \
+	    pb[i].next = oh.first;		             \
+	    oh.first = (struct erl_off_heap_header*) &pb[i]; \
+	    i++;				             \
 	}
 
 	erts_get_default_trace_pattern(NULL,
@@ -1401,11 +1417,6 @@ setup_reference_table(void)
 	ADD_BINARY(default_match_spec);
 	ADD_BINARY(default_meta_match_spec);
 
-	oh.mso = mso;
-	oh.externals = NULL;
-#ifndef HYBRID /* FIND ME! */
-	oh.funs = NULL;
-#endif
 	insert_offheap(&oh, BIN_REF, AM_match_spec);
 #undef  ADD_BINARY
     }
diff --git a/erts/emulator/beam/erl_node_tables.h b/erts/emulator/beam/erl_node_tables.h
index eb759b87e9..b0a63ae035 100644
--- a/erts/emulator/beam/erl_node_tables.h
+++ b/erts/emulator/beam/erl_node_tables.h
@@ -131,7 +131,7 @@ typedef struct dist_entry_ {
     ErtsLink *nlinks;           /* Link tree with subtrees */
     ErtsMonitor *monitors;      /* Monitor tree */
 
-    erts_smp_spinlock_t qlock;  /* Protects qflgs and out_queue */
+    erts_smp_mtx_t qlock;       /* Protects qflgs and out_queue */
     Uint32 qflgs;
     Sint qsize;
     ErtsDistOutputQueue out_queue;
diff --git a/erts/emulator/beam/erl_obsolete.c b/erts/emulator/beam/erl_obsolete.c
deleted file mode 100644
index 9c5a7c7ff9..0000000000
--- a/erts/emulator/beam/erl_obsolete.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2004-2009. 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%
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "sys.h"
-#include "erl_driver.h"
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
- *                                                                           *
- * ------------------------- OBSOLETE! DO NOT USE! ------------------------- *
- *                                                                           *
-\*                                                                           */
-
-/* cut from ../obsolete/driver.h (since it doesn't mix well with other
- * headers from the emulator).
- */
-#ifdef __WIN32__
-#ifdef CONST
-#  undef CONST
-#endif
-#endif
-
-#if ((defined(__STDC__) || defined(SABER)) && !defined(NO_PROTOTYPE)) || defined(__cplusplus) || defined(USE_PROTOTYPE)
-#   define _USING_PROTOTYPES_ 1
-#   define _ANSI_ARGS_(x)	x
-#   define CONST const
-#else
-#   define _ANSI_ARGS_(x)	()
-#   define CONST
-#endif
-
-typedef void* erl_mutex_t;
-typedef void* erl_cond_t;
-typedef void* erl_thread_t;
-
-EXTERN erl_mutex_t erts_mutex_create _ANSI_ARGS_((void));
-EXTERN int erts_mutex_destroy _ANSI_ARGS_((erl_mutex_t));
-EXTERN int erts_mutex_lock _ANSI_ARGS_((erl_mutex_t));
-EXTERN int erts_mutex_unlock _ANSI_ARGS_((erl_mutex_t));
-
-EXTERN erl_cond_t erts_cond_create _ANSI_ARGS_((void));
-EXTERN int erts_cond_destroy _ANSI_ARGS_((erl_cond_t));
-EXTERN int erts_cond_signal _ANSI_ARGS_((erl_cond_t));
-EXTERN int erts_cond_broadcast _ANSI_ARGS_((erl_cond_t));
-EXTERN int erts_cond_wait _ANSI_ARGS_((erl_cond_t, erl_mutex_t));
-EXTERN int erts_cond_timedwait _ANSI_ARGS_((erl_cond_t, erl_mutex_t, long));
-
-EXTERN int erts_thread_create _ANSI_ARGS_((erl_thread_t*,
-					 void* (*func)(void*),
-					 void* arg,
-					 int detached));
-EXTERN erl_thread_t erts_thread_self _ANSI_ARGS_((void));
-EXTERN void erts_thread_exit _ANSI_ARGS_((void*));
-EXTERN int  erts_thread_join _ANSI_ARGS_((erl_thread_t, void**));
-EXTERN int  erts_thread_kill _ANSI_ARGS_((erl_thread_t));
-
-/*
- * These functions implement the thread interface in ../obsolete/driver.h.
- * Do *not* use this interface! Within the emulator, use the erl_threads.h,
- * erl_smp.h, or ethread.h interface. From a driver use the thread interface
- * in erl_driver.h.
- */
-
-erl_mutex_t
-erts_mutex_create(void)
-{
-    return (erl_mutex_t) erl_drv_mutex_create(NULL);
-}
-
-int
-erts_mutex_destroy(erl_mutex_t mtx)
-{
-    erl_drv_mutex_destroy((ErlDrvMutex *) mtx);
-    return 0;
-}
-
-int
-erts_mutex_lock(erl_mutex_t mtx)
-{
-    erl_drv_mutex_lock((ErlDrvMutex *) mtx);
-    return 0;
-}
-
-int
-erts_mutex_unlock(erl_mutex_t mtx)
-{
-    erl_drv_mutex_unlock((ErlDrvMutex *) mtx);
-    return 0;
-}
-
-erl_cond_t
-erts_cond_create(void)
-{
-    return (erl_cond_t) erl_drv_cond_create(NULL);
-}
-
-int
-erts_cond_destroy(erl_cond_t cnd)
-{
-    erl_drv_cond_destroy((ErlDrvCond *) cnd);
-    return 0;
-}
-
-
-int
-erts_cond_signal(erl_cond_t cnd)
-{
-    erl_drv_cond_signal((ErlDrvCond *) cnd);
-    return 0;
-}
-
-int
-erts_cond_broadcast(erl_cond_t cnd)
-{
-    erl_drv_cond_broadcast((ErlDrvCond *) cnd);
-    return 0;
-}
-
-
-int
-erts_cond_wait(erl_cond_t cnd, erl_mutex_t mtx)
-{
-    erl_drv_cond_wait((ErlDrvCond *) cnd, (ErlDrvMutex *) mtx);
-    return 0;
-}
-
-int
-erts_cond_timedwait(erl_cond_t cnd, erl_mutex_t mtx, long ms)
-{
-    return ENOTSUP;
-}
-
-int
-erts_thread_create(erl_thread_t *tid,
-		   void* (*func)(void*),
-		   void* arg,
-		   int detached)
-{
-    if (detached)
-	return ENOTSUP;
-    return erl_drv_thread_create(NULL, (ErlDrvTid *) tid, func, arg, NULL);
-}
-
-erl_thread_t
-erts_thread_self(void)
-{
-    return (erl_thread_t) erl_drv_thread_self();
-}
-
-void
-erts_thread_exit(void *res)
-{
-    erl_drv_thread_exit(res);
-}
-
-int
-erts_thread_join(erl_thread_t tid, void **respp)
-{
-    return erl_drv_thread_join((ErlDrvTid) tid, respp);
-}
-
-int
-erts_thread_kill(erl_thread_t tid)
-{
-    return ENOTSUP;
-}
-
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 967a14f0d1..1b07024ca1 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -129,7 +129,7 @@ reset_handle(ErtsPortTask *ptp)
 {
     if (ptp->handle) {
 	ASSERT(ptp == handle2task(ptp->handle));
-	erts_smp_atomic_set(ptp->handle, (long) NULL);
+	erts_smp_atomic_set(ptp->handle, (erts_aint_t) NULL);
     }
 }
 
@@ -138,7 +138,7 @@ set_handle(ErtsPortTask *ptp, ErtsPortTaskHandle *pthp)
 {
     ptp->handle = pthp;
     if (pthp) {
-	erts_smp_atomic_set(pthp, (long) ptp);
+	erts_smp_atomic_set(pthp, (erts_aint_t) ptp);
 	ASSERT(ptp == handle2task(ptp->handle));
     }
 }
@@ -568,7 +568,7 @@ erts_port_task_schedule(Eterm id,
 	ErtsRunQueue *xrunq = erts_check_emigration_need(runq, ERTS_PORT_PRIO_LEVEL);
 	if (xrunq) {
 	    /* Port emigrated ... */
-	    erts_smp_atomic_set(&pp->run_queue, (long) xrunq);
+	    erts_smp_atomic_set(&pp->run_queue, (erts_aint_t) xrunq);
 	    erts_smp_runq_unlock(runq);
 	    runq = xrunq;
 	}
@@ -625,6 +625,7 @@ erts_port_task_schedule(Eterm id,
 
     if (!enq_port) {
 	ERTS_PT_CHK_PRES_PORTQ(runq, pp);
+	erts_smp_runq_unlock(runq);
     }
     else {
 	enqueue_port(runq, pp);
@@ -634,9 +635,10 @@ erts_port_task_schedule(Eterm id,
 	    profile_runnable_port(pp, am_active);
 	}
 
+	erts_smp_runq_unlock(runq);
+
 	erts_smp_notify_inc_runq(runq);
     }
-    erts_smp_runq_unlock(runq);
     return 0;
 }
 
@@ -725,7 +727,8 @@ resume_after_block(void *vd)
     ErtsPortTaskExeBlockData *d = (ErtsPortTaskExeBlockData *) vd;
     erts_smp_runq_lock(d->runq);
     if (d->resp)
-	*d->resp = erts_smp_atomic_read(&erts_port_task_outstanding_io_tasks) != (long) 0;
+	*d->resp = (erts_smp_atomic_read(&erts_port_task_outstanding_io_tasks)
+		    != (erts_aint_t) 0);
 }
 
 /*
@@ -746,7 +749,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
     ErtsPortTask *ptp;
     int res = 0;
     int reds = ERTS_PORT_REDS_EXECUTE;
-    long io_tasks_executed = 0;
+    erts_aint_t io_tasks_executed = 0;
     int fpe_was_unmasked;
     ErtsPortTaskExeBlockData blk_data = {runq, NULL};
 
@@ -940,18 +943,19 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 	}
 	else {
 	    /* Port emigrated ... */
-	    erts_smp_atomic_set(&pp->run_queue, (long) xrunq);
+	    erts_smp_atomic_set(&pp->run_queue, (erts_aint_t) xrunq);
 	    enqueue_port(xrunq, pp);
 	    ASSERT(pp->sched.exe_taskq);
 	    pp->sched.exe_taskq = NULL;
-	    erts_smp_notify_inc_runq(xrunq);
 	    erts_smp_runq_unlock(xrunq);
+	    erts_smp_notify_inc_runq(xrunq);
 	}
 #endif
 	port_was_enqueued = 1;
     }
 
-    res = erts_smp_atomic_read(&erts_port_task_outstanding_io_tasks) != (long) 0;
+    res = (erts_smp_atomic_read(&erts_port_task_outstanding_io_tasks)
+	   != (erts_aint_t) 0);
 
     ERTS_PT_CHK_PRES_PORTQ(runq, pp);
 
@@ -969,7 +973,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
     erts_port_release(pp);
 #else
     {
-	long refc;
+	erts_aint_t refc;
 	erts_smp_mtx_unlock(pp->lock);
 	refc = erts_smp_atomic_dectest(&pp->refc);
 	ASSERT(refc >= 0);
@@ -977,7 +981,8 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 	    erts_smp_runq_unlock(runq);
 	    erts_port_cleanup(pp); /* Might aquire runq lock */
 	    erts_smp_runq_lock(runq);
-	    res = erts_smp_atomic_read(&erts_port_task_outstanding_io_tasks) != (long) 0;
+	    res = (erts_smp_atomic_read(&erts_port_task_outstanding_io_tasks)
+		   != (erts_aint_t) 0);
 	}
     }
 #endif
@@ -1110,9 +1115,8 @@ erts_port_migrate(Port *prt, int *prt_locked,
     if (!ERTS_PORT_IS_IN_RUNQ(from_rq, prt))
 	return ERTS_MIGRATE_FAILED_NOT_IN_RUNQ;
     dequeue_port(from_rq, prt);
-    erts_smp_atomic_set(&prt->run_queue, (long) to_rq);
+    erts_smp_atomic_set(&prt->run_queue, (erts_aint_t) to_rq);
     enqueue_port(to_rq, prt);
-    erts_smp_notify_inc_runq(to_rq);
     return ERTS_MIGRATE_SUCCESS;
 }
 
@@ -1124,7 +1128,7 @@ erts_port_migrate(Port *prt, int *prt_locked,
 void
 erts_port_task_init(void)
 {
-    erts_smp_atomic_init(&erts_port_task_outstanding_io_tasks, (long) 0);
+    erts_smp_atomic_init(&erts_port_task_outstanding_io_tasks, (erts_aint_t) 0);
     init_port_task_alloc();
     init_port_taskq_alloc();
 }
diff --git a/erts/emulator/beam/erl_port_task.h b/erts/emulator/beam/erl_port_task.h
index f12d02da0c..714b4ea7dd 100644
--- a/erts/emulator/beam/erl_port_task.h
+++ b/erts/emulator/beam/erl_port_task.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2006-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2006-2010. 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
@@ -79,7 +79,7 @@ ERTS_GLB_INLINE int erts_port_task_have_outstanding_io_tasks(void);
 ERTS_GLB_INLINE void
 erts_port_task_handle_init(ErtsPortTaskHandle *pthp)
 {
-    erts_smp_atomic_init(pthp, (long) NULL);
+    erts_smp_atomic_init(pthp, (erts_aint_t) NULL);
 }
 
 ERTS_GLB_INLINE int
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index f4c889889d..4d6e982325 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -24,7 +24,6 @@
 #endif
 
 #include <stddef.h> /* offsetof() */
-#include <ctype.h>
 #include "sys.h"
 #include "erl_vm.h"
 #include "global.h"
@@ -39,6 +38,7 @@
 #include "erl_threads.h"
 #include "erl_binary.h"
 #include "beam_bp.h"
+#include "erl_cpu_topology.h"
 
 #define ERTS_RUNQ_CHECK_BALANCE_REDS_PER_SCHED (2000*CONTEXT_REDS)
 #define ERTS_RUNQ_CALL_CHECK_BALANCE_REDS \
@@ -46,14 +46,23 @@
 
 #define ERTS_PROC_MIN_CONTEXT_SWITCH_REDS_COST (CONTEXT_REDS/10)
 
-#define ERTS_SCHED_SLEEP_SPINCOUNT 10000
+#define ERTS_SCHED_SPIN_UNTIL_YIELD 100
+
+#define ERTS_SCHED_SYS_SLEEP_SPINCOUNT 10
+#define ERTS_SCHED_TSE_SLEEP_SPINCOUNT_FACT 1000
+#define ERTS_SCHED_TSE_SLEEP_SPINCOUNT \
+  (ERTS_SCHED_SYS_SLEEP_SPINCOUNT*ERTS_SCHED_TSE_SLEEP_SPINCOUNT_FACT)
+#define ERTS_SCHED_SUSPEND_SLEEP_SPINCOUNT 0
+
+#define ERTS_WAKEUP_OTHER_LIMIT_VERY_HIGH (200*CONTEXT_REDS)
+#define ERTS_WAKEUP_OTHER_LIMIT_HIGH (50*CONTEXT_REDS)
+#define ERTS_WAKEUP_OTHER_LIMIT_MEDIUM (10*CONTEXT_REDS)
+#define ERTS_WAKEUP_OTHER_LIMIT_LOW (CONTEXT_REDS)
+#define ERTS_WAKEUP_OTHER_LIMIT_VERY_LOW (CONTEXT_REDS/10)
 
-#define ERTS_WAKEUP_OTHER_LIMIT (100*CONTEXT_REDS/2)
 #define ERTS_WAKEUP_OTHER_DEC 10
 #define ERTS_WAKEUP_OTHER_FIXED_INC (CONTEXT_REDS/10)
 
-#define ERTS_MAX_CPU_TOPOLOGY_ID ((int) 0xffff)
-
 #if 0 || defined(DEBUG)
 #define ERTS_FAKE_SCHED_BIND_PRINT_SORTED_CPU_DATA
 #endif
@@ -106,6 +115,8 @@ Uint erts_no_schedulers;
 Uint erts_max_processes = ERTS_DEFAULT_MAX_PROCESSES;
 Uint erts_process_tab_index_mask;
 
+static int wakeup_other_limit;
+
 int erts_sched_thread_suggested_stack_size = -1;
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
@@ -116,19 +127,38 @@ ErtsLcPSDLocks erts_psd_required_locks[ERTS_PSD_SIZE];
 
 int erts_disable_proc_not_running_opt;
 
-#define ERTS_SCHED_CHANGING_ONLINE 1
-#define ERTS_SCHED_CHANGING_MULTI_SCHED 2
+#define ERTS_SCHDLR_SSPND_CHNG_WAITER		(((erts_aint32_t) 1) << 0)
+#define ERTS_SCHDLR_SSPND_CHNG_MSB		(((erts_aint32_t) 1) << 1)
+#define ERTS_SCHDLR_SSPND_CHNG_ONLN		(((erts_aint32_t) 1) << 2)
+
+#ifndef DEBUG
+
+#define ERTS_SCHDLR_SSPND_CHNG_SET(VAL, OLD_VAL) \
+  erts_smp_atomic32_set(&schdlr_sspnd.changing, (VAL))
+
+#else
+
+#define ERTS_SCHDLR_SSPND_CHNG_SET(VAL, OLD_VAL)			\
+do {									\
+    erts_aint32_t old_val__;						\
+    old_val__ = erts_smp_atomic32_xchg(&schdlr_sspnd.changing,		\
+				       (VAL));				\
+    ASSERT(old_val__ == (OLD_VAL));					\
+} while (0)
+
+#endif
+
 
 static struct {
     erts_smp_mtx_t mtx;
     erts_smp_cnd_t cnd;
-    int changing;
     int online;
     int curr_online;
     int wait_curr_online;
-    erts_smp_atomic_t active;
+    erts_smp_atomic32_t changing;
+    erts_smp_atomic32_t active;
     struct {
-	erts_smp_atomic_t ongoing;
+	erts_smp_atomic32_t ongoing;
 	long wait_active;
 	ErtsProcList *procs;
     } msb; /* Multi Scheduling Block */
@@ -136,11 +166,11 @@ static struct {
 
 static struct {
     erts_smp_mtx_t update_mtx;
-    erts_smp_atomic_t active_runqs;
+    erts_smp_atomic32_t active_runqs;
     int last_active_runqs;
-    erts_smp_atomic_t used_runqs;
+    erts_smp_atomic32_t used_runqs;
     int forced_check_balance;
-    erts_smp_atomic_t checking_balance;
+    erts_smp_atomic32_t checking_balance;
     int halftime;
     int full_reds_history_index;
     struct {
@@ -160,48 +190,6 @@ do {							\
 
 #endif
 
-/*
- * Cpu topology hierarchy.
- */
-#define ERTS_TOPOLOGY_NODE		0
-#define ERTS_TOPOLOGY_PROCESSOR		1
-#define ERTS_TOPOLOGY_PROCESSOR_NODE	2
-#define ERTS_TOPOLOGY_CORE		3
-#define ERTS_TOPOLOGY_THREAD		4
-#define ERTS_TOPOLOGY_LOGICAL		5
-
-#define ERTS_TOPOLOGY_MAX_DEPTH		6
-
-typedef struct {
-    int bind_id;
-    int bound_id;
-} ErtsCpuBindData;
-
-static ErtsCpuBindData *scheduler2cpu_map;
-erts_smp_rwmtx_t erts_cpu_bind_rwmtx;
-
-typedef enum {
-    ERTS_CPU_BIND_UNDEFINED,
-    ERTS_CPU_BIND_SPREAD,
-    ERTS_CPU_BIND_PROCESSOR_SPREAD,
-    ERTS_CPU_BIND_THREAD_SPREAD,
-    ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD,
-    ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD,
-    ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD,
-    ERTS_CPU_BIND_NO_SPREAD,
-    ERTS_CPU_BIND_NONE
-} ErtsCpuBindOrder;
-
-#define ERTS_CPU_BIND_DEFAULT_BIND \
-  ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD
-
-ErtsCpuBindOrder cpu_bind_order;
-
-static erts_cpu_topology_t *user_cpudata;
-static int user_cpudata_size;
-static erts_cpu_topology_t *system_cpudata;
-static int system_cpudata_size;
-
 erts_sched_stat_t erts_sched_stat;
 
 ErtsRunQueue *erts_common_run_queue;
@@ -212,11 +200,11 @@ static erts_tsd_key_t sched_data_key;
 
 static erts_smp_mtx_t proc_tab_mtx;
 
-static erts_smp_atomic_t function_calls;
+static erts_smp_atomic32_t function_calls;
 
 #ifdef ERTS_SMP
-static erts_smp_atomic_t doing_sys_schedule;
-static erts_smp_atomic_t no_empty_run_queues;
+static erts_smp_atomic32_t doing_sys_schedule;
+static erts_smp_atomic32_t no_empty_run_queues;
 #else /* !ERTS_SMP */
 ErtsSchedulerData *erts_scheduler_data;
 #endif
@@ -224,12 +212,18 @@ ErtsSchedulerData *erts_scheduler_data;
 ErtsAlignedRunQueue *erts_aligned_run_queues;
 Uint erts_no_run_queues;
 
+ErtsAlignedSchedulerData *erts_aligned_scheduler_data;
+
+#ifdef ERTS_SMP
+
 typedef union {
-    ErtsSchedulerData esd;
-    char align[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(ErtsSchedulerData))];
-} ErtsAlignedSchedulerData;
+    ErtsSchedulerSleepInfo ssi;
+    char align[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(ErtsSchedulerSleepInfo))];
+} ErtsAlignedSchedulerSleepInfo;
 
-ErtsAlignedSchedulerData *erts_aligned_scheduler_data;
+static ErtsAlignedSchedulerSleepInfo *aligned_sched_sleep_info;
+
+#endif
 
 #ifndef BM_COUNTERS
 static int processes_busy;
@@ -254,7 +248,10 @@ Uint erts_num_active_procs;
 Process** erts_active_procs;
 #endif
 
-static erts_smp_atomic_t process_count;
+#if ERTS_MAX_PROCESSES > 0x7fffffff
+#error "Need to store process_count in another type"
+#endif
+static erts_smp_atomic32_t process_count;
 
 typedef struct ErtsTermProcElement_ ErtsTermProcElement;
 struct ErtsTermProcElement_ {
@@ -288,8 +285,9 @@ ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(proclist,
 				 200,
 				 ERTS_ALC_T_PROC_LIST)
 
-#define ERTS_RUNQ_IX(IX)	(&erts_aligned_run_queues[(IX)].runq)
-#define ERTS_SCHEDULER_IX(IX)	(&erts_aligned_scheduler_data[(IX)].esd)
+#define ERTS_SCHED_SLEEP_INFO_IX(IX)					\
+  (ASSERT_EXPR(0 <= (IX) && (IX) < erts_no_schedulers),			\
+   &aligned_sched_sleep_info[(IX)].ssi)
 
 #define ERTS_FOREACH_RUNQ(RQVAR, DO)					\
 do {									\
@@ -345,17 +343,8 @@ static int stack_element_dump(int to, void *to_arg, Process* p, Eterm* sp,
 #ifdef ERTS_SMP
 static void handle_pending_exiters(ErtsProcList *);
 
-static void cpu_bind_order_sort(erts_cpu_topology_t *cpudata,
-				int size,
-				ErtsCpuBindOrder bind_order,
-				int mk_seq);
-static void signal_schedulers_bind_change(erts_cpu_topology_t *cpudata, int size);
-
 #endif
 
-static void early_cpu_bind_init(void);
-static void late_cpu_bind_init(void);
-
 #if defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK)
 int
 erts_smp_lc_runq_is_locked(ErtsRunQueue *runq)
@@ -411,18 +400,18 @@ erts_pre_init_process(void)
 
 /* initialize the scheduler */
 void
-erts_init_process(void)
+erts_init_process(int ncpu)
 {
     Uint proc_bits = ERTS_PROC_BITS;
 
 #ifdef ERTS_SMP
     erts_disable_proc_not_running_opt = 0;
-    erts_init_proc_lock();
+    erts_init_proc_lock(ncpu);
 #endif
 
     init_proclist_alloc();
 
-    erts_smp_atomic_init(&process_count, 0);
+    erts_smp_atomic32_init(&process_count, 0);
 
     if (erts_use_r9_pids_ports) {
 	proc_bits = ERTS_R9_PROC_BITS;
@@ -582,6 +571,198 @@ erts_psd_set_init(Process *p, ErtsProcLocks plocks, int ix, void *data)
 
 #ifdef ERTS_SMP
 
+void
+erts_sched_finish_poke(ErtsSchedulerSleepInfo *ssi, erts_aint32_t flags)
+{
+    switch (flags & ERTS_SSI_FLGS_SLEEP_TYPE) {
+    case ERTS_SSI_FLG_POLL_SLEEPING:
+	erts_sys_schedule_interrupt(1);
+	break;
+    case ERTS_SSI_FLG_TSE_SLEEPING:
+	erts_tse_set(ssi->event);
+	break;
+    case 0:
+	break;
+    default:
+	erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error\n",
+		 __FILE__, __LINE__);
+	break;
+    }
+}
+
+typedef struct erts_misc_aux_work_t_ erts_misc_aux_work_t;
+struct erts_misc_aux_work_t_ {
+    erts_misc_aux_work_t *next;
+    void (*func)(void *);
+    void *arg;
+};
+
+typedef struct {
+    erts_smp_mtx_t mtx;
+    erts_misc_aux_work_t *first;
+    erts_misc_aux_work_t *last;
+} erts_misc_aux_work_q_t;
+
+typedef union {
+    erts_misc_aux_work_q_t data;
+    char align[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(erts_misc_aux_work_q_t))];
+} erts_algnd_misc_aux_work_q_t;
+
+static erts_algnd_misc_aux_work_q_t *misc_aux_work_queues;
+
+ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(misc_aux_work,
+				 erts_misc_aux_work_t,
+				 200,
+				 ERTS_ALC_T_MISC_AUX_WORK)
+
+static void
+init_misc_aux_work(void)
+{
+    int ix;
+
+    init_misc_aux_work_alloc();
+
+    misc_aux_work_queues = erts_alloc(ERTS_ALC_T_MISC_AUX_WORK_Q,
+				      (sizeof(erts_algnd_misc_aux_work_q_t)
+				       *(erts_no_schedulers+1)));
+    if ((((UWord) misc_aux_work_queues) & ERTS_CACHE_LINE_MASK) != 0)
+	misc_aux_work_queues = ((erts_algnd_misc_aux_work_q_t *)
+				   ((((UWord) misc_aux_work_queues)
+				     & ~ERTS_CACHE_LINE_MASK)
+				    + ERTS_CACHE_LINE_SIZE));
+
+    for (ix = 0; ix < erts_no_schedulers; ix++) {
+	erts_smp_mtx_init_x(&misc_aux_work_queues[ix].data.mtx,
+			    "misc_aux_work_queue",
+			    make_small(ix + 1));
+	misc_aux_work_queues[ix].data.first = NULL;
+	misc_aux_work_queues[ix].data.last = NULL;
+    }
+}
+
+static void
+handle_misc_aux_work(ErtsSchedulerData *esdp)
+{
+    int ix = (int) esdp->no - 1;
+    erts_misc_aux_work_t *mawp;
+
+    erts_smp_mtx_lock(&misc_aux_work_queues[ix].data.mtx);
+    mawp = misc_aux_work_queues[ix].data.first;
+    misc_aux_work_queues[ix].data.first = NULL;
+    misc_aux_work_queues[ix].data.last = NULL;
+    erts_smp_mtx_unlock(&misc_aux_work_queues[ix].data.mtx);
+
+    while (mawp) {
+	erts_misc_aux_work_t *free_mawp;
+	mawp->func(mawp->arg);
+	free_mawp = mawp;
+	mawp = mawp->next;
+	misc_aux_work_free(free_mawp);
+    }
+}
+
+void
+erts_smp_schedule_misc_aux_work(int ignore_self,
+				int max_sched,
+				void (*func)(void *),
+				void *arg)
+{
+    int ix, ignore_ix = -1;
+
+    if (ignore_self) {
+	ErtsSchedulerData *esdp = erts_get_scheduler_data();
+	if (esdp)
+	    ignore_ix = (int) esdp->no - 1;
+    }
+
+    ASSERT(0 <= max_sched && max_sched <= erts_no_schedulers);
+
+    for (ix = 0; ix < max_sched; ix++) {
+	erts_aint32_t aux_work;
+	erts_misc_aux_work_t *mawp;
+	ErtsSchedulerSleepInfo *ssi;
+	if (ix == ignore_ix)
+	    continue;
+
+	mawp = misc_aux_work_alloc();
+
+	mawp->func = func;
+	mawp->arg = arg;
+	mawp->next = NULL;
+
+	erts_smp_mtx_lock(&misc_aux_work_queues[ix].data.mtx);
+	if (!misc_aux_work_queues[ix].data.last)
+	    misc_aux_work_queues[ix].data.first = mawp;
+	else
+	    misc_aux_work_queues[ix].data.last->next = mawp;
+	misc_aux_work_queues[ix].data.last = mawp;
+	erts_smp_mtx_unlock(&misc_aux_work_queues[ix].data.mtx);
+
+	ssi = ERTS_SCHED_SLEEP_INFO_IX(ix);
+	aux_work = erts_smp_atomic32_bor(&ssi->aux_work,
+					 ERTS_SSI_AUX_WORK_MISC);
+	if ((aux_work & ERTS_SSI_AUX_WORK_MISC) == 0)
+	    erts_sched_poke(ssi);
+   }
+}
+
+#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
+void
+erts_smp_notify_check_children_needed(void)
+{
+    int i;
+
+    for (i = 0; i < erts_no_schedulers; i++) {
+	erts_aint32_t aux_work;
+	ErtsSchedulerSleepInfo *ssi;
+	ssi = ERTS_SCHED_SLEEP_INFO_IX(i);
+	aux_work = erts_smp_atomic32_bor(&ssi->aux_work,
+					 ERTS_SSI_AUX_WORK_CHECK_CHILDREN);
+	if (!(aux_work & ERTS_SSI_AUX_WORK_CHECK_CHILDREN))
+	    erts_sched_poke(ssi);
+    }
+}
+#endif
+
+#ifdef ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK
+static ERTS_INLINE erts_aint32_t
+blockable_aux_work(ErtsSchedulerData *esdp,
+		   ErtsSchedulerSleepInfo *ssi,
+		   erts_aint32_t aux_work)
+{
+    if (aux_work & ERTS_SSI_BLOCKABLE_AUX_WORK_MASK) {
+	if (aux_work & ERTS_SSI_AUX_WORK_MISC) {
+	    aux_work = erts_smp_atomic32_band(&ssi->aux_work,
+					      ~ERTS_SSI_AUX_WORK_MISC);
+	    aux_work &= ~ERTS_SSI_AUX_WORK_MISC;
+	    handle_misc_aux_work(esdp);
+	}
+#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
+	if (aux_work & ERTS_SSI_AUX_WORK_CHECK_CHILDREN) {
+	    aux_work = erts_smp_atomic32_band(&ssi->aux_work,
+					      ~ERTS_SSI_AUX_WORK_CHECK_CHILDREN);
+	    aux_work &= ~ERTS_SSI_AUX_WORK_CHECK_CHILDREN;
+	    erts_check_children();
+	}
+#endif
+    }
+    return aux_work;
+}
+
+#endif
+
+#ifdef ERTS_SCHED_NEED_NONBLOCKABLE_AUX_WORK
+static ERTS_INLINE erts_aint32_t
+nonblockable_aux_work(ErtsSchedulerData *esdp,
+		      ErtsSchedulerSleepInfo *ssi,
+		      erts_aint32_t aux_work)
+{
+    if (aux_work & ERTS_SSI_NONBLOCKABLE_AUX_WORK_MASK) {
+
+    }
+}
+#endif
+
 static void
 prepare_for_block(void *vrq)
 {
@@ -634,9 +815,33 @@ erts_active_schedulers(void)
     return as;
 }
 
+static ERTS_INLINE int
+prepare_for_sys_schedule(void)
+{
+#ifdef ERTS_SMP
+    while (!erts_port_task_have_outstanding_io_tasks()
+	   && !erts_smp_atomic32_xchg(&doing_sys_schedule, 1)) {
+	if (!erts_port_task_have_outstanding_io_tasks())
+	    return 1;
+	erts_smp_atomic32_set(&doing_sys_schedule, 0);
+    }
+    return 0;
+#else
+    return !erts_port_task_have_outstanding_io_tasks();
+#endif
+}
+
 #ifdef ERTS_SMP
 
 static ERTS_INLINE void
+sched_change_waiting_sys_to_waiting(Uint no, ErtsRunQueue *rq)
+{
+    ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(rq));
+    ASSERT(rq->waiting < 0);
+    rq->waiting *= -1;
+}
+
+static ERTS_INLINE void
 sched_waiting(Uint no, ErtsRunQueue *rq)
 {
     ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(rq));
@@ -666,265 +871,451 @@ sched_active(Uint no, ErtsRunQueue *rq)
 static int ERTS_INLINE
 ongoing_multi_scheduling_block(void)
 {
-    return erts_smp_atomic_read(&schdlr_sspnd.msb.ongoing) != 0;
+    return erts_smp_atomic32_read(&schdlr_sspnd.msb.ongoing) != 0;
 }
 
 static ERTS_INLINE void
 empty_runq(ErtsRunQueue *rq)
 {
-    long oifls = erts_smp_atomic_band(&rq->info_flags, ~ERTS_RUNQ_IFLG_NONEMPTY);
+    erts_aint32_t oifls = erts_smp_atomic32_band(&rq->info_flags,
+						 ~ERTS_RUNQ_IFLG_NONEMPTY);
     if (oifls & ERTS_RUNQ_IFLG_NONEMPTY) {
 #ifdef DEBUG
-	long empty = erts_smp_atomic_read(&no_empty_run_queues);
-	ASSERT(0 <= empty && empty < erts_no_run_queues);
+	erts_aint32_t empty = erts_smp_atomic32_read(&no_empty_run_queues);
+	/*
+	 * For a short period of time no_empty_run_queues may have
+	 * been increased twice for a specific run queue.
+	 */
+	ASSERT(0 <= empty && empty < 2*erts_no_run_queues);
 #endif
-	erts_smp_atomic_inc(&no_empty_run_queues);
+	erts_smp_atomic32_inc(&no_empty_run_queues);
     }
 }
 
 static ERTS_INLINE void
 non_empty_runq(ErtsRunQueue *rq)
 {
-    long oifls = erts_smp_atomic_bor(&rq->info_flags, ERTS_RUNQ_IFLG_NONEMPTY);
+    erts_aint32_t oifls = erts_smp_atomic32_bor(&rq->info_flags,
+						ERTS_RUNQ_IFLG_NONEMPTY);
     if (!(oifls & ERTS_RUNQ_IFLG_NONEMPTY)) {
 #ifdef DEBUG
-	long empty = erts_smp_atomic_read(&no_empty_run_queues);
-	ASSERT(0 < empty && empty <= erts_no_run_queues);
+	erts_aint32_t empty = erts_smp_atomic32_read(&no_empty_run_queues);
+	/*
+	 * For a short period of time no_empty_run_queues may have
+	 * been increased twice for a specific run queue.
+	 */
+	ASSERT(0 < empty && empty <= 2*erts_no_run_queues);
 #endif
-	erts_smp_atomic_dec(&no_empty_run_queues);
+	erts_smp_atomic32_dec(&no_empty_run_queues);
     }
 }
 
-static ERTS_INLINE int
-sched_spin_wake(ErtsRunQueue *rq)
+static erts_aint32_t
+sched_prep_spin_wait(ErtsSchedulerSleepInfo *ssi)
 {
-#if ERTS_SCHED_SLEEP_SPINCOUNT == 0
-    return 0;
-#else
-    long val;
-    ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(rq));
+    erts_aint32_t oflgs;
+    erts_aint32_t nflgs = (ERTS_SSI_FLG_SLEEPING
+			   | ERTS_SSI_FLG_WAITING);
+    erts_aint32_t xflgs = 0;
 
-    val = erts_smp_atomic_read(&rq->spin_waiter);
-    ASSERT(val >= 0);
-    if (val != 0) {
-	erts_smp_atomic_inc(&rq->spin_wake);
-	return 1;
-    }
-    return 0;
-#endif
+    do {
+	oflgs = erts_smp_atomic32_cmpxchg(&ssi->flags, nflgs, xflgs);
+	if (oflgs == xflgs)
+	    return nflgs;
+	xflgs = oflgs;
+    } while (!(oflgs & ERTS_SSI_FLG_SUSPENDED));
+    return oflgs;
 }
 
-static ERTS_INLINE int
-sched_spin_wake_all(ErtsRunQueue *rq)
+static erts_aint32_t
+sched_prep_cont_spin_wait(ErtsSchedulerSleepInfo *ssi)
 {
-#if ERTS_SCHED_SLEEP_SPINCOUNT == 0
-    return 0;
-#else
-    long val;
-    ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(rq));
+    erts_aint32_t oflgs;
+    erts_aint32_t nflgs = (ERTS_SSI_FLG_SLEEPING
+			   | ERTS_SSI_FLG_WAITING);
+    erts_aint32_t xflgs = ERTS_SSI_FLG_WAITING;
 
-    val = erts_smp_atomic_read(&rq->spin_waiter);
-    ASSERT(val >= 0);
-    if (val != 0)
-	erts_smp_atomic_add(&rq->spin_wake, val);
-    return val;
-#endif
+    do {
+	oflgs = erts_smp_atomic32_cmpxchg(&ssi->flags, nflgs, xflgs);
+	if (oflgs == xflgs)
+	    return nflgs;
+	xflgs = oflgs;
+	nflgs |= oflgs & ERTS_SSI_FLG_SUSPENDED;
+    } while (oflgs & ERTS_SSI_FLG_WAITING);
+    return oflgs;
+}
+
+static erts_aint32_t
+sched_spin_wait(ErtsSchedulerSleepInfo *ssi, int spincount)
+{
+    int until_yield = ERTS_SCHED_SPIN_UNTIL_YIELD;
+    int sc = spincount;
+    erts_aint32_t flgs;
+
+    do {
+	flgs = erts_smp_atomic32_read(&ssi->flags);
+	if ((flgs & (ERTS_SSI_FLG_SLEEPING|ERTS_SSI_FLG_WAITING))
+	    != (ERTS_SSI_FLG_SLEEPING|ERTS_SSI_FLG_WAITING)) {
+	    break;
+	}
+	ERTS_SPIN_BODY;
+	if (--until_yield == 0) {
+	    until_yield = ERTS_SCHED_SPIN_UNTIL_YIELD;
+	    erts_thr_yield();
+	}
+    } while (--sc > 0);
+    return flgs;
 }
 
+static erts_aint32_t
+sched_set_sleeptype(ErtsSchedulerSleepInfo *ssi, erts_aint32_t sleep_type)
+{
+    erts_aint32_t oflgs;
+    erts_aint32_t nflgs = ERTS_SSI_FLG_SLEEPING|ERTS_SSI_FLG_WAITING|sleep_type;
+    erts_aint32_t xflgs = ERTS_SSI_FLG_SLEEPING|ERTS_SSI_FLG_WAITING;
+
+    if (sleep_type == ERTS_SSI_FLG_TSE_SLEEPING)
+	erts_tse_reset(ssi->event);
+
+    while (1) {
+	oflgs = erts_smp_atomic32_cmpxchg(&ssi->flags, nflgs, xflgs);
+	if (oflgs == xflgs)
+	    return nflgs;
+	if ((oflgs & (ERTS_SSI_FLG_SLEEPING|ERTS_SSI_FLG_WAITING))
+	    != (ERTS_SSI_FLG_SLEEPING|ERTS_SSI_FLG_WAITING)) {
+	    return oflgs;
+	}
+	xflgs = oflgs;
+	nflgs |= oflgs & ERTS_SSI_FLG_SUSPENDED;
+    }
+}
+
+#define ERTS_SCHED_WAIT_WOKEN(FLGS)				\
+  (((FLGS) & (ERTS_SSI_FLG_WAITING|ERTS_SSI_FLG_SUSPENDED))	\
+   != ERTS_SSI_FLG_WAITING)
+
 static void
-sched_sys_wait(Uint no, ErtsRunQueue *rq)
+scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 {
-    long dt;
-#if ERTS_SCHED_SLEEP_SPINCOUNT != 0
-    int val;
-    int spincount = ERTS_SCHED_SLEEP_SPINCOUNT;
+    ErtsSchedulerSleepInfo *ssi = esdp->ssi;
+    int spincount;
+    erts_aint32_t flgs;
+#if defined(ERTS_SCHED_NEED_NONBLOCKABLE_AUX_WORK) \
+    || defined(ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK)
+    erts_aint32_t aux_work;
+#endif
+
     ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(rq));
 
+    erts_smp_spin_lock(&rq->sleepers.lock);
+    flgs = sched_prep_spin_wait(ssi);
+    if (flgs & ERTS_SSI_FLG_SUSPENDED) {
+	/* Go suspend instead... */
+	erts_smp_spin_unlock(&rq->sleepers.lock);
+	return;
+    }
+
+    ssi->prev = NULL;
+    ssi->next = rq->sleepers.list;
+    if (rq->sleepers.list)
+	rq->sleepers.list->prev = ssi;
+    rq->sleepers.list = ssi;
+    erts_smp_spin_unlock(&rq->sleepers.lock);
+
+    /*
+     * If all schedulers are waiting, one of them *should*
+     * be waiting in erl_sys_schedule()
+     */
+
+    if (!prepare_for_sys_schedule()) {
+
+	sched_waiting(esdp->no, rq);
+
+	erts_smp_runq_unlock(rq);
+
+	spincount = ERTS_SCHED_TSE_SLEEP_SPINCOUNT;
+
+    tse_wait:
+
+#ifdef ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK
+	aux_work = erts_smp_atomic32_read(&ssi->aux_work);
+    tse_blockable_aux_work:
+	aux_work = blockable_aux_work(esdp, ssi, aux_work);
 #endif
+	erts_smp_activity_begin(ERTS_ACTIVITY_WAIT, NULL, NULL, NULL);
 
-    sched_waiting_sys(no, rq);
+	while (1) {
 
-#if ERTS_SCHED_SLEEP_SPINCOUNT != 0
-    erts_smp_atomic_inc(&rq->spin_waiter);
-    erts_smp_runq_unlock(rq);
+#ifdef ERTS_SCHED_NEED_NONBLOCKABLE_AUX_WORK
+#ifndef ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK
+	    aux_work = erts_smp_atomic32_read(&ssi->aux_work);
+#endif
+	    nonblockable_aux_work(esdp, ssi, aux_work);
+#endif
 
-    erl_sys_schedule(1); /* Might give us something to do */
+	    flgs = sched_spin_wait(ssi, spincount);
+	    if (flgs & ERTS_SSI_FLG_SLEEPING) {
+		ASSERT(flgs & ERTS_SSI_FLG_WAITING);
+		flgs = sched_set_sleeptype(ssi, ERTS_SSI_FLG_TSE_SLEEPING);
+		if (flgs & ERTS_SSI_FLG_SLEEPING) {
+		    int res;
+		    ASSERT(flgs & ERTS_SSI_FLG_TSE_SLEEPING);
+		    ASSERT(flgs & ERTS_SSI_FLG_WAITING);
+		    do {
+			res = erts_tse_wait(ssi->event);
+		    } while (res == EINTR);
+		}
+	    }
 
-    dt = do_time_read_and_reset();
-    if (dt) bump_timer(dt);
+	    if (!(flgs & ERTS_SSI_FLG_WAITING)) {
+		ASSERT(!(flgs & ERTS_SSI_FLG_SLEEPING));
+		break;
+	    }
+
+	    flgs = sched_prep_cont_spin_wait(ssi);
+	    spincount = ERTS_SCHED_TSE_SLEEP_SPINCOUNT;
+
+	    if (!(flgs & ERTS_SSI_FLG_WAITING)) {
+		ASSERT(!(flgs & ERTS_SSI_FLG_SLEEPING));
+		break;
+	    }
+
+#ifdef ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK
+	    aux_work = erts_smp_atomic32_read(&ssi->aux_work);
+	    if (aux_work & ERTS_SSI_BLOCKABLE_AUX_WORK_MASK) {
+		erts_smp_activity_end(ERTS_ACTIVITY_WAIT, NULL, NULL, NULL);
+		goto tse_blockable_aux_work;
+	    }
+#endif
 
-    while (spincount-- > 0) {
-	val = erts_smp_atomic_read(&rq->spin_wake);
-	ASSERT(val >= 0);
-	if (val != 0) {
-	    erts_smp_runq_lock(rq);
-	    val = erts_smp_atomic_read(&rq->spin_wake);
-	    ASSERT(val >= 0);
-	    if (val != 0)
-		goto woken;
-	    if (spincount == 0)
-		goto sleep;
-	    erts_smp_runq_unlock(rq);
 	}
-    }
 
-    erts_smp_runq_lock(rq);
-    val = erts_smp_atomic_read(&rq->spin_wake);
-    ASSERT(val >= 0);
-    if (val != 0) {
-    woken:
-	erts_smp_atomic_dec(&rq->spin_wake);
-	ASSERT(erts_smp_atomic_read(&rq->spin_wake) >= 0);
-	erts_smp_atomic_dec(&rq->spin_waiter);
-	ASSERT(erts_smp_atomic_read(&rq->spin_waiter) >= 0);
+	erts_smp_activity_end(ERTS_ACTIVITY_WAIT, NULL, NULL, NULL);
+
+	if (flgs & ~ERTS_SSI_FLG_SUSPENDED)
+	    erts_smp_atomic32_band(&ssi->flags, ERTS_SSI_FLG_SUSPENDED);
+
+	erts_smp_runq_lock(rq);
+	sched_active(esdp->no, rq);
+
     }
     else {
-    sleep:
-	erts_smp_atomic_dec(&rq->spin_waiter);
-	ASSERT(erts_smp_atomic_read(&rq->spin_waiter) >= 0);
+	erts_aint_t dt;
+
+	erts_smp_atomic32_set(&function_calls, 0);
+	*fcalls = 0;
+
+	sched_waiting_sys(esdp->no, rq);
+
+	erts_smp_runq_unlock(rq);
+
+	spincount = ERTS_SCHED_SYS_SLEEP_SPINCOUNT;
+
+	while (spincount-- > 0) {
+
+	sys_poll_aux_work:
+
+	    ASSERT(!erts_port_task_have_outstanding_io_tasks());
+
+	    erl_sys_schedule(1); /* Might give us something to do */
+
+	    dt = erts_do_time_read_and_reset();
+	    if (dt) erts_bump_timer(dt);
+
+	sys_aux_work:
+
+#ifdef ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK
+	    aux_work = erts_smp_atomic32_read(&ssi->aux_work);
+	    aux_work = blockable_aux_work(esdp, ssi, aux_work);
+#endif
+#ifdef ERTS_SCHED_NEED_NONBLOCKABLE_AUX_WORK
+#ifndef ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK
+	    aux_work = erts_smp_atomic32_read(&ssi->aux_work);
+#endif
+	    nonblockable_aux_work(esdp, ssi, aux_work);
+#endif
+
+	    flgs = erts_smp_atomic32_read(&ssi->flags);
+	    if (!(flgs & ERTS_SSI_FLG_WAITING)) {
+		ASSERT(!(flgs & ERTS_SSI_FLG_SLEEPING));
+		goto sys_woken;
+	    }
+	    if (!(flgs & ERTS_SSI_FLG_SLEEPING)) {
+		flgs = sched_prep_cont_spin_wait(ssi);
+		if (!(flgs & ERTS_SSI_FLG_WAITING)) {
+		    ASSERT(!(flgs & ERTS_SSI_FLG_SLEEPING));
+		    goto sys_woken;
+		}
+	    }
+
+	    /*
+	     * If we got new I/O tasks we aren't allowed to
+	     * call erl_sys_schedule() until it is handled.
+	     */
+	    if (erts_port_task_have_outstanding_io_tasks()) {
+		erts_smp_atomic32_set(&doing_sys_schedule, 0);
+		/*
+		 * Got to check that we still got I/O tasks; otherwise
+		 * we have to continue checking for I/O...
+		 */
+		if (!prepare_for_sys_schedule()) {
+		    spincount *= ERTS_SCHED_TSE_SLEEP_SPINCOUNT_FACT;
+		    goto tse_wait;
+		}
+	    }
+	}
+
+	erts_smp_runq_lock(rq);
+
 	/*
 	 * If we got new I/O tasks we aren't allowed to
 	 * sleep in erl_sys_schedule().
 	 */
-	if (!erts_port_task_have_outstanding_io_tasks()) {
-#endif
+	if (erts_port_task_have_outstanding_io_tasks()) {
+	    erts_smp_atomic32_set(&doing_sys_schedule, 0);
 
+	    /*
+	     * Got to check that we still got I/O tasks; otherwise
+	     * we have to wait in erl_sys_schedule() after all...
+	     */
+	    if (prepare_for_sys_schedule())
+		goto do_sys_schedule;
+
+	    /*
+	     * Not allowed to wait in erl_sys_schedule;
+	     * do tse wait instead...
+	     */
+	    sched_change_waiting_sys_to_waiting(esdp->no, rq);
+	    erts_smp_runq_unlock(rq);
+	    spincount = 0;
+	    goto tse_wait;
+	}
+	else {
+	do_sys_schedule:
 	    erts_sys_schedule_interrupt(0);
+	    flgs = sched_set_sleeptype(ssi, ERTS_SSI_FLG_POLL_SLEEPING);
+	    if (!(flgs & ERTS_SSI_FLG_SLEEPING)) {
+		if (!(flgs & ERTS_SSI_FLG_WAITING))
+		    goto sys_locked_woken;
+		erts_smp_runq_unlock(rq);
+		flgs = sched_prep_cont_spin_wait(ssi);
+		if (!(flgs & ERTS_SSI_FLG_WAITING)) {
+		    ASSERT(!(flgs & ERTS_SSI_FLG_SLEEPING));
+		    goto sys_woken;
+		}
+		ASSERT(!erts_port_task_have_outstanding_io_tasks());
+		goto sys_poll_aux_work;
+	    }
+
+	    ASSERT(flgs & ERTS_SSI_FLG_POLL_SLEEPING);
+	    ASSERT(flgs & ERTS_SSI_FLG_WAITING);
+
 	    erts_smp_runq_unlock(rq);
 
+	    ASSERT(!erts_port_task_have_outstanding_io_tasks());
+
 	    erl_sys_schedule(0);
 
-	    dt = do_time_read_and_reset();
-	    if (dt) bump_timer(dt);
+	    dt = erts_do_time_read_and_reset();
+	    if (dt) erts_bump_timer(dt);
 
-	    erts_smp_runq_lock(rq);
+	    flgs = sched_prep_cont_spin_wait(ssi);
+	    if (flgs & ERTS_SSI_FLG_WAITING)
+		goto sys_aux_work;
 
-#if ERTS_SCHED_SLEEP_SPINCOUNT != 0
+	sys_woken:
+	    erts_smp_runq_lock(rq);
+	sys_locked_woken:
+	    erts_smp_atomic32_set(&doing_sys_schedule, 0);
+	    if (flgs & ~ERTS_SSI_FLG_SUSPENDED)
+		erts_smp_atomic32_band(&ssi->flags, ERTS_SSI_FLG_SUSPENDED);
+	    sched_active_sys(esdp->no, rq);
 	}
     }
-#endif
 
-    sched_active_sys(no, rq);
-}
-
-static void
-sched_cnd_wait(Uint no, ErtsRunQueue *rq)
-{
-#if ERTS_SCHED_SLEEP_SPINCOUNT != 0
-    int val;
-    int spincount = ERTS_SCHED_SLEEP_SPINCOUNT;
     ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(rq));
-#endif
-
-    sched_waiting(no, rq);
-    erts_smp_activity_begin(ERTS_ACTIVITY_WAIT,
-			    prepare_for_block,
-			    resume_after_block,
-			    (void *) rq);
-
-#if ERTS_SCHED_SLEEP_SPINCOUNT == 0
-    erts_smp_cnd_wait(&rq->cnd, &rq->mtx);
-#else
-    erts_smp_atomic_inc(&rq->spin_waiter);
-    erts_smp_mtx_unlock(&rq->mtx);
-
-    while (spincount-- > 0) {
-	val = erts_smp_atomic_read(&rq->spin_wake);
-	ASSERT(val >= 0);
-	if (val != 0) {
-	    erts_smp_mtx_lock(&rq->mtx);
-	    val = erts_smp_atomic_read(&rq->spin_wake);
-	    ASSERT(val >= 0);
-	    if (val != 0)
-		goto woken;
-	    if (spincount == 0)
-		goto sleep;
-	    erts_smp_mtx_unlock(&rq->mtx);
-	}
-    }
-
-    erts_smp_mtx_lock(&rq->mtx);
-    val = erts_smp_atomic_read(&rq->spin_wake);
-    ASSERT(val >= 0);
-    if (val == 0) {
-    sleep:
-	erts_smp_atomic_dec(&rq->spin_waiter);
-	ASSERT(erts_smp_atomic_read(&rq->spin_waiter) >= 0);
-	erts_smp_cnd_wait(&rq->cnd, &rq->mtx);
-    }
-    else {
-    woken:
-	erts_smp_atomic_dec(&rq->spin_wake);
-	ASSERT(erts_smp_atomic_read(&rq->spin_wake) >= 0);
-	erts_smp_atomic_dec(&rq->spin_waiter);
-	ASSERT(erts_smp_atomic_read(&rq->spin_waiter) >= 0);
-    }
-#endif
-
-    erts_smp_activity_end(ERTS_ACTIVITY_WAIT,
-			  prepare_for_block,
-			  resume_after_block,
-			  (void *) rq);
-
-    sched_active(no, rq);
 }
 
-static void
-wake_one_scheduler(void)
-{
-    ASSERT(erts_common_run_queue);
-    ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(erts_common_run_queue));
-    if (erts_common_run_queue->waiting) {
-	if (!sched_spin_wake(erts_common_run_queue)) {
-	    if (erts_common_run_queue->waiting == -1) /* One scheduler waiting
-							 and doing so in
-							 sys_schedule */
-		erts_sys_schedule_interrupt(1);
-	    else
-		erts_smp_cnd_signal(&erts_common_run_queue->cnd);
-	}
+static ERTS_INLINE erts_aint32_t
+ssi_flags_set_wake(ErtsSchedulerSleepInfo *ssi)
+{
+    /* reset all flags but suspended */
+    erts_aint32_t oflgs;
+    erts_aint32_t nflgs = 0;
+    erts_aint32_t xflgs = ERTS_SSI_FLG_SLEEPING|ERTS_SSI_FLG_WAITING;
+    while (1) {
+	oflgs = erts_smp_atomic32_cmpxchg(&ssi->flags, nflgs, xflgs);
+	if (oflgs == xflgs)
+	    return oflgs;
+	nflgs = oflgs & ERTS_SSI_FLG_SUSPENDED;
+	xflgs = oflgs;
     }
 }
 
 static void
-wake_scheduler(ErtsRunQueue *rq, int incq)
+wake_scheduler(ErtsRunQueue *rq, int incq, int one)
 {
-    ASSERT(!erts_common_run_queue);
-    ASSERT(-1 <= rq->waiting && rq->waiting <= 1);
-    ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(rq));
-    if (rq->waiting && !rq->woken) {
-	if (!sched_spin_wake(rq)) {
-	    if (rq->waiting < 0)
-		erts_sys_schedule_interrupt(1);
-	    else
-		erts_smp_cnd_signal(&rq->cnd);
+    int res;
+    ErtsSchedulerSleepInfo *ssi;
+    ErtsSchedulerSleepList *sl;
+
+    /*
+     * The unlocked run queue is not strictly necessary
+     * from a thread safety or deadlock prevention
+     * perspective. It will, however, cost us performance
+     * if it is locked during wakup of another scheduler,
+     * so all code *should* handle this without having
+     * the lock on the run queue.
+     */
+    ERTS_SMP_LC_ASSERT(!erts_smp_lc_runq_is_locked(rq));
+
+    sl = &rq->sleepers;
+
+    erts_smp_spin_lock(&sl->lock);
+    ssi = sl->list;
+    if (!ssi)
+	erts_smp_spin_unlock(&sl->lock);
+    else if (one) {
+	erts_aint32_t flgs;
+	if (ssi->prev)
+	    ssi->prev->next = ssi->next;
+	else {
+	    ASSERT(sl->list == ssi);
+	    sl->list = ssi->next;
 	}
-	rq->woken = 1;
-	if (incq)
+	if (ssi->next)
+	    ssi->next->prev = ssi->prev;
+
+	res = sl->list != NULL;
+	erts_smp_spin_unlock(&sl->lock);
+
+	flgs = ssi_flags_set_wake(ssi);
+	erts_sched_finish_poke(ssi, flgs);
+
+	if (incq && !erts_common_run_queue && (flgs & ERTS_SSI_FLG_WAITING))
 	    non_empty_runq(rq);
     }
+    else {
+	sl->list = NULL;
+	erts_smp_spin_unlock(&sl->lock);
+	do {
+	    ErtsSchedulerSleepInfo *wake_ssi = ssi;
+	    ssi = ssi->next;
+	    erts_sched_finish_poke(wake_ssi, ssi_flags_set_wake(wake_ssi));
+	} while (ssi);
+    }
 }
 
 static void
 wake_all_schedulers(void)
 {
-    if (erts_common_run_queue) {
-	erts_smp_runq_lock(erts_common_run_queue);
-	if (erts_common_run_queue->waiting) {
-	    if (erts_common_run_queue->waiting < 0)
-		erts_sys_schedule_interrupt(1);
-	    sched_spin_wake_all(erts_common_run_queue);
-	    erts_smp_cnd_broadcast(&erts_common_run_queue->cnd);
-	}
-	erts_smp_runq_unlock(erts_common_run_queue);
-    }
+    if (erts_common_run_queue)
+	wake_scheduler(erts_common_run_queue, 0, 0);
     else {
 	int ix;
 	for (ix = 0; ix < erts_no_run_queues; ix++) {
 	    ErtsRunQueue *rq = ERTS_RUNQ_IX(ix);
-	    erts_smp_runq_lock(rq);
-	    wake_scheduler(rq, 0);
-	    erts_smp_runq_unlock(rq);
+	    wake_scheduler(rq, 0, 1);
 	}
     }
 }
@@ -932,21 +1323,23 @@ wake_all_schedulers(void)
 static ERTS_INLINE int
 chk_wake_sched(ErtsRunQueue *crq, int ix, int activate)
 {
-    long iflgs;
+    erts_aint32_t iflgs;
     ErtsRunQueue *wrq;
     if (crq->ix == ix)
 	return 0;
     wrq = ERTS_RUNQ_IX(ix);
-    iflgs = erts_smp_atomic_read(&wrq->info_flags);
+    iflgs = erts_smp_atomic32_read(&wrq->info_flags);
     if (!(iflgs & (ERTS_RUNQ_IFLG_SUSPENDED|ERTS_RUNQ_IFLG_NONEMPTY))) {
-	erts_smp_xrunq_lock(crq, wrq);
 	if (activate) {
-	    if (ix == erts_smp_atomic_cmpxchg(&balance_info.active_runqs, ix+1, ix)) {
+	    if (ix == erts_smp_atomic32_cmpxchg(&balance_info.active_runqs,
+						ix+1,
+						ix)) {
+		erts_smp_xrunq_lock(crq, wrq);
 		wrq->flags &= ~ERTS_RUNQ_FLG_INACTIVE;
+		erts_smp_xrunq_unlock(crq, wrq);
 	    }
 	}
-	wake_scheduler(wrq, 0);
-	erts_smp_xrunq_unlock(crq, wrq);
+	wake_scheduler(wrq, 0, 1);
 	return 1;
     }
     return 0;
@@ -957,8 +1350,8 @@ wake_scheduler_on_empty_runq(ErtsRunQueue *crq)
 {
     int ix = crq->ix;
     int stop_ix = ix;
-    int active_ix = erts_smp_atomic_read(&balance_info.active_runqs);
-    int balance_ix = erts_smp_atomic_read(&balance_info.used_runqs);
+    int active_ix = erts_smp_atomic32_read(&balance_info.active_runqs);
+    int balance_ix = erts_smp_atomic32_read(&balance_info.used_runqs);
 
     if (active_ix > balance_ix)
 	active_ix = balance_ix;
@@ -992,19 +1385,42 @@ static ERTS_INLINE void
 smp_notify_inc_runq(ErtsRunQueue *runq)
 {
 #ifdef ERTS_SMP
-    if (erts_common_run_queue)
-	wake_one_scheduler();
-    else
-	wake_scheduler(runq, 1);
+    if (runq)
+	wake_scheduler(runq, 1, 1);
 #endif
 }
 
 void
-erts_smp_notify_inc_runq__(ErtsRunQueue *runq)
+erts_smp_notify_inc_runq(ErtsRunQueue *runq)
 {
     smp_notify_inc_runq(runq);
 }
 
+void
+erts_sched_notify_check_cpu_bind(void)
+{
+#ifdef ERTS_SMP
+    int ix;
+    if (erts_common_run_queue) {
+	for (ix = 0; ix < erts_no_schedulers; ix++)
+	    erts_smp_atomic32_set(&ERTS_SCHEDULER_IX(ix)->chk_cpu_bind, 1);
+	wake_all_schedulers();
+    }
+    else {
+	for (ix = 0; ix < erts_no_run_queues; ix++) {
+	    ErtsRunQueue *rq = ERTS_RUNQ_IX(ix);
+	    erts_smp_runq_lock(rq);
+	    rq->flags |= ERTS_RUNQ_FLG_CHK_CPU_BIND;
+	    erts_smp_runq_unlock(rq);
+	    wake_scheduler(rq, 0, 1);
+	};
+    }
+#else
+    erts_sched_check_cpu_bind(erts_get_scheduler_data());
+#endif
+}
+
+
 #ifdef ERTS_SMP
 
 ErtsRunQueue *
@@ -1146,20 +1562,24 @@ static void
 evacuate_run_queue(ErtsRunQueue *evac_rq, ErtsRunQueue *rq)
 {
     Port *prt;
+    int notify_to_rq = 0;
     int prio;
     int prt_locked = 0;
     int rq_locked = 0;
     int evac_rq_locked = 1;
+    ErtsMigrateResult mres;
 
     erts_smp_runq_lock(evac_rq);
 
+    erts_smp_atomic32_bor(&evac_rq->scheduler->ssi->flags,
+			  ERTS_SSI_FLG_SUSPENDED);
+
     evac_rq->flags &= ~ERTS_RUNQ_FLGS_IMMIGRATE_QMASK;
     evac_rq->flags |= (ERTS_RUNQ_FLGS_EMIGRATE_QMASK
 		       | ERTS_RUNQ_FLGS_EVACUATE_QMASK
 		       | ERTS_RUNQ_FLG_SUSPENDED);
 
-    erts_smp_atomic_bor(&evac_rq->info_flags, ERTS_RUNQ_IFLG_SUSPENDED);
-
+    erts_smp_atomic32_bor(&evac_rq->info_flags, ERTS_RUNQ_IFLG_SUSPENDED);
     /*
      * Need to set up evacuation paths first since we
      * may release the run queue lock on evac_rq
@@ -1187,9 +1607,11 @@ evacuate_run_queue(ErtsRunQueue *evac_rq, ErtsRunQueue *rq)
     /* Evacuate scheduled ports */
     prt = evac_rq->ports.start;
     while (prt) {
-	(void) erts_port_migrate(prt, &prt_locked,
+	mres = erts_port_migrate(prt, &prt_locked,
 				 evac_rq, &evac_rq_locked,
 				 rq, &rq_locked);
+	if (mres == ERTS_MIGRATE_SUCCESS)
+	    notify_to_rq = 1;
 	if (prt_locked)
 	    erts_smp_port_unlock(prt);
 	if (!evac_rq_locked) {
@@ -1218,9 +1640,11 @@ evacuate_run_queue(ErtsRunQueue *evac_rq, ErtsRunQueue *rq)
 			goto end_of_proc;
 		}
 
-		(void) erts_proc_migrate(proc, &proc_locks,
+		mres = erts_proc_migrate(proc, &proc_locks,
 					 evac_rq, &evac_rq_locked,
 					 rq, &rq_locked);
+		if (mres == ERTS_MIGRATE_SUCCESS)
+		    notify_to_rq = 1;
 		if (proc_locks)
 		    erts_smp_proc_unlock(proc, proc_locks);
 		if (!evac_rq_locked) {
@@ -1252,10 +1676,13 @@ evacuate_run_queue(ErtsRunQueue *evac_rq, ErtsRunQueue *rq)
     if (rq_locked)
 	erts_smp_runq_unlock(rq);
 
-    if (!evac_rq_locked)
-	erts_smp_runq_lock(evac_rq);
-    wake_scheduler(evac_rq, 0);
-    erts_smp_runq_unlock(evac_rq);
+    if (evac_rq_locked)
+	erts_smp_runq_unlock(evac_rq);
+
+    if (notify_to_rq)
+	smp_notify_inc_runq(rq);
+
+    wake_scheduler(evac_rq, 0, 1);
 }
 
 static int
@@ -1401,7 +1828,7 @@ static ERTS_INLINE int
 check_possible_steal_victim(ErtsRunQueue *rq, int *rq_lockedp, int vix)
 {
     ErtsRunQueue *vrq = ERTS_RUNQ_IX(vix);
-    long iflgs = erts_smp_atomic_read(&vrq->info_flags);
+    erts_aint32_t iflgs = erts_smp_atomic32_read(&vrq->info_flags);
     if (iflgs & ERTS_RUNQ_IFLG_NONEMPTY)
 	return try_steal_task_from_victim(rq, rq_lockedp, vrq);
     else
@@ -1431,8 +1858,8 @@ try_steal_task(ErtsRunQueue *rq)
 
     ERTS_SMP_LC_CHK_RUNQ_LOCK(rq, rq_locked);
 
-    active_rqs = erts_smp_atomic_read(&balance_info.active_runqs);
-    blnc_rqs = erts_smp_atomic_read(&balance_info.used_runqs);
+    active_rqs = erts_smp_atomic32_read(&balance_info.active_runqs);
+    blnc_rqs = erts_smp_atomic32_read(&balance_info.used_runqs);
 
     if (active_rqs > blnc_rqs)
 	active_rqs = blnc_rqs;
@@ -1443,7 +1870,7 @@ try_steal_task(ErtsRunQueue *rq)
 	if (active_rqs < blnc_rqs) {
 	    int no = blnc_rqs - active_rqs;
 	    int stop_ix = vix = active_rqs + rq->ix % no;
-	    while (erts_smp_atomic_read(&no_empty_run_queues) < blnc_rqs) {
+	    while (erts_smp_atomic32_read(&no_empty_run_queues) < blnc_rqs) {
 		res = check_possible_steal_victim(rq, &rq_locked, vix);
 		if (res)
 		    goto done;
@@ -1458,7 +1885,7 @@ try_steal_task(ErtsRunQueue *rq)
 	vix = rq->ix;
 
 	/* ... then try to steal a job from another active queue... */
-	while (erts_smp_atomic_read(&no_empty_run_queues) < blnc_rqs) {
+	while (erts_smp_atomic32_read(&no_empty_run_queues) < blnc_rqs) {
 	    vix++;
 	    if (vix >= active_rqs)
 		vix = 0;
@@ -1483,31 +1910,6 @@ try_steal_task(ErtsRunQueue *rq)
     return res;
 }
 
-#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
-void
-erts_smp_notify_check_children_needed(void)
-{
-    int i;
-    for (i = 0; i < erts_no_schedulers; i++) {
-	erts_smp_runq_lock(ERTS_SCHEDULER_IX(i)->run_queue);
-	ERTS_SCHEDULER_IX(i)->check_children = 1;
-	if (!erts_common_run_queue)
-	    wake_scheduler(ERTS_SCHEDULER_IX(i)->run_queue, 0);
-	erts_smp_runq_unlock(ERTS_SCHEDULER_IX(i)->run_queue);
-    }
-    if (ongoing_multi_scheduling_block()) {
-	/* Also blocked schedulers need to check children */
-	erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-	for (i = 0; i < erts_no_schedulers; i++)
-	    ERTS_SCHEDULER_IX(i)->blocked_check_children = 1;
-	erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
-	erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-    }
-    if (erts_common_run_queue)
-	wake_all_schedulers();
-}
-#endif
-
 /* Run queue balancing */
 
 typedef struct {
@@ -1571,20 +1973,23 @@ do {									\
 static void
 check_balance(ErtsRunQueue *c_rq)
 {
+#if ERTS_MAX_PROCESSES >= (1 << 27)
+#  error check_balance() assumes ERTS_MAX_PROCESS < (1 << 27)
+#endif
     ErtsRunQueueBalance avg = {0};
     Sint64 scheds_reds, full_scheds_reds;
     int forced, active, current_active, oowc, half_full_scheds, full_scheds,
 	mmax_len, blnc_no_rqs, qix, pix, freds_hist_ix;
 
-    if (erts_smp_atomic_xchg(&balance_info.checking_balance, 1)) {
+    if (erts_smp_atomic32_xchg(&balance_info.checking_balance, 1)) {
 	c_rq->check_balance_reds = INT_MAX;
 	return;
     }
 
-    blnc_no_rqs = (int) erts_smp_atomic_read(&balance_info.used_runqs);
+    blnc_no_rqs = (int) erts_smp_atomic32_read(&balance_info.used_runqs);
     if (blnc_no_rqs == 1) {
 	c_rq->check_balance_reds = INT_MAX;
-	erts_smp_atomic_set(&balance_info.checking_balance, 0);
+	erts_smp_atomic32_set(&balance_info.checking_balance, 0);
 	return;
     }
 
@@ -1592,7 +1997,7 @@ check_balance(ErtsRunQueue *c_rq)
 
     if (balance_info.halftime) {	
 	balance_info.halftime = 0;
-	erts_smp_atomic_set(&balance_info.checking_balance, 0);
+	erts_smp_atomic32_set(&balance_info.checking_balance, 0);
 	ERTS_FOREACH_RUNQ(rq,
 	{
 	    if (rq->waiting)
@@ -1620,12 +2025,12 @@ check_balance(ErtsRunQueue *c_rq)
     forced = balance_info.forced_check_balance;
     balance_info.forced_check_balance = 0;
 
-    blnc_no_rqs = (int) erts_smp_atomic_read(&balance_info.used_runqs);
+    blnc_no_rqs = (int) erts_smp_atomic32_read(&balance_info.used_runqs);
     if (blnc_no_rqs == 1) {
 	erts_smp_mtx_unlock(&balance_info.update_mtx);
 	erts_smp_runq_lock(c_rq);
 	c_rq->check_balance_reds = INT_MAX;
-	erts_smp_atomic_set(&balance_info.checking_balance, 0);
+	erts_smp_atomic32_set(&balance_info.checking_balance, 0);
 	return;
     }
 
@@ -1634,7 +2039,7 @@ check_balance(ErtsRunQueue *c_rq)
     if (balance_info.full_reds_history_index >= ERTS_FULL_REDS_HISTORY_SIZE)
 	balance_info.full_reds_history_index = 0;
 
-    current_active = erts_smp_atomic_read(&balance_info.active_runqs);
+    current_active = erts_smp_atomic32_read(&balance_info.active_runqs);
 
     /* Read balance information for all run queues */
     for (qix = 0; qix < blnc_no_rqs; qix++) {
@@ -1694,12 +2099,14 @@ check_balance(ErtsRunQueue *c_rq)
 		    run_queue_info[qix].prio[pix].avail = 0;
 	    }
 	    else {
-		int xreds = 0;
-		int procreds = treds;
-		procreds -= run_queue_info[qix].prio[ERTS_PORT_PRIO_LEVEL].reds;
+		Sint64 xreds = 0;
+		Sint64 procreds = treds;
+		procreds -= 
+		    ((Sint64)
+		     run_queue_info[qix].prio[ERTS_PORT_PRIO_LEVEL].reds);
 
 		for (pix = 0; pix < ERTS_NO_PROC_PRIO_LEVELS; pix++) {
-		    int av;
+		    Sint64 av;
 
 		    if (xreds == 0)
 			av = 100;
@@ -1710,9 +2117,10 @@ check_balance(ErtsRunQueue *c_rq)
 			if (av == 0)
 			    av = 1;
 		    }
-		    run_queue_info[qix].prio[pix].avail = av;
+		    run_queue_info[qix].prio[pix].avail = (int) av;
+		    ASSERT(run_queue_info[qix].prio[pix].avail >= 0);
 		    if (pix < PRIORITY_NORMAL) /* ie., max or high */
-			xreds += run_queue_info[qix].prio[pix].reds;
+			xreds += (Sint64) run_queue_info[qix].prio[pix].reds;
 		}
 		run_queue_info[qix].prio[ERTS_PORT_PRIO_LEVEL].avail = 100;
 	    }
@@ -1817,7 +2225,8 @@ check_balance(ErtsRunQueue *c_rq)
 	    if (max_len != 0) {
 		int avail = avg.prio[pix].avail;
 		if (avail != 0) {
-		    max_len = ((100*max_len - 1) / avail) + 1;
+		    max_len = (int) ((100*((Sint64) max_len) - 1)
+				     / ((Sint64) avail)) + 1;
 		    avg.prio[pix].max_len = max_len;
 		    ASSERT(max_len >= 0);
 		}
@@ -1834,9 +2243,10 @@ check_balance(ErtsRunQueue *c_rq)
 		    || run_queue_info[qix].prio[pix].avail == 0)
 		    limit = 0;
 		else
-		    limit = (((avg.prio[pix].max_len
-			       * run_queue_info[qix].prio[pix].avail) - 1)
-			     / 100 + 1);
+		    limit = (int) (((((Sint64) avg.prio[pix].max_len)
+				     * ((Sint64) run_queue_info[qix].prio[pix].avail))
+				    - 1)
+				   / 100 + 1);
 		run_queue_info[qix].prio[pix].migration_limit = limit;
 	    }
 	}
@@ -1964,10 +2374,10 @@ erts_fprintf(stderr, "--------------------------------\n");
     }
 
     balance_info.last_active_runqs = active;
-    erts_smp_atomic_set(&balance_info.active_runqs, active);
+    erts_smp_atomic32_set(&balance_info.active_runqs, active);
 
     balance_info.halftime = 1;
-    erts_smp_atomic_set(&balance_info.checking_balance, 0);
+    erts_smp_atomic32_set(&balance_info.checking_balance, 0);
 
     /* Write migration paths and reset balance statistics in all queues */
     for (qix = 0; qix < blnc_no_rqs; qix++) {
@@ -2064,9 +2474,28 @@ erts_debug_nbalance(void)
 void
 erts_early_init_scheduling(void)
 {
-    early_cpu_bind_init();
+    wakeup_other_limit = ERTS_WAKEUP_OTHER_LIMIT_MEDIUM;
 }
 
+int
+erts_sched_set_wakeup_limit(char *str)
+{
+    if (sys_strcmp(str, "very_high") == 0)
+	wakeup_other_limit = ERTS_WAKEUP_OTHER_LIMIT_VERY_HIGH;
+    else if (sys_strcmp(str, "high") == 0)
+	wakeup_other_limit = ERTS_WAKEUP_OTHER_LIMIT_HIGH;
+    else if (sys_strcmp(str, "medium") == 0)
+	wakeup_other_limit = ERTS_WAKEUP_OTHER_LIMIT_MEDIUM;
+    else if (sys_strcmp(str, "low") == 0)
+	wakeup_other_limit = ERTS_WAKEUP_OTHER_LIMIT_LOW;
+    else if (sys_strcmp(str, "very_low") == 0)
+	wakeup_other_limit = ERTS_WAKEUP_OTHER_LIMIT_VERY_LOW;
+    else
+	return EINVAL;
+    return 0;
+}
+	
+
 void
 erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
 {
@@ -2097,15 +2526,17 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
     ASSERT((((UWord) erts_aligned_run_queues) & ERTS_CACHE_LINE_MASK) == 0);
 
 #ifdef ERTS_SMP
-    erts_smp_atomic_init(&no_empty_run_queues, 0);
+    erts_smp_atomic32_init(&no_empty_run_queues, 0);
 #endif
 
+    erts_no_run_queues = n;
+
     for (ix = 0; ix < n; ix++) {
 	int pix, rix;
 	ErtsRunQueue *rq = ERTS_RUNQ_IX(ix);
 
 	rq->ix = ix;
-	erts_smp_atomic_init(&rq->info_flags, ERTS_RUNQ_IFLG_NONEMPTY);
+	erts_smp_atomic32_init(&rq->info_flags, ERTS_RUNQ_IFLG_NONEMPTY);
 
 	/* make sure that the "extra" id correponds to the schedulers
 	 * id if the esdp->no <-> ix+1 mapping change.
@@ -2114,8 +2545,10 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
 	erts_smp_mtx_init_x(&rq->mtx, "run_queue", make_small(ix + 1));
 	erts_smp_cnd_init(&rq->cnd);
 
-	erts_smp_atomic_init(&rq->spin_waiter, 0);
-	erts_smp_atomic_init(&rq->spin_wake, 0);
+#ifdef ERTS_SMP
+	erts_smp_spinlock_init(&rq->sleepers.lock, "run_queue_sleep_list");
+	rq->sleepers.list = NULL;
+#endif
 
 	rq->waiting = 0;
 	rq->woken = 0;
@@ -2166,7 +2599,6 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
     }
 
     erts_common_run_queue = !mrq ? ERTS_RUNQ_IX(0) : NULL;
-    erts_no_run_queues = n;
 
 #ifdef ERTS_SMP
 
@@ -2181,9 +2613,34 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
 
 #endif
 
+    n = (int) no_schedulers;
+    erts_no_schedulers = n;
+
+#ifdef ERTS_SMP
+    /* Create and initialize scheduler sleep info */
+
+    aligned_sched_sleep_info = erts_alloc(ERTS_ALC_T_SCHDLR_SLP_INFO,
+					  (sizeof(ErtsAlignedSchedulerSleepInfo)
+					   *(n+1)));
+    if ((((UWord) aligned_sched_sleep_info) & ERTS_CACHE_LINE_MASK) == 0)
+	aligned_sched_sleep_info = ((ErtsAlignedSchedulerSleepInfo *)
+				    ((((UWord) aligned_sched_sleep_info)
+				      & ~ERTS_CACHE_LINE_MASK)
+				     + ERTS_CACHE_LINE_SIZE));
+    for (ix = 0; ix < n; ix++) {
+	ErtsSchedulerSleepInfo *ssi = ERTS_SCHED_SLEEP_INFO_IX(ix);
+#if 0 /* no need to initialize these... */
+	ssi->next = NULL;
+	ssi->prev = NULL;
+#endif
+	erts_smp_atomic32_init(&ssi->flags, 0);
+	ssi->event = NULL; /* initialized in sched_thread_func */
+	erts_smp_atomic32_init(&ssi->aux_work, 0);
+    }
+#endif
+
     /* Create and initialize scheduler specific data */
 
-    n = (int) no_schedulers;
     erts_aligned_scheduler_data = erts_alloc(ERTS_ALC_T_SCHDLR_DATA,
 					     (sizeof(ErtsAlignedSchedulerData)
 					      *(n+1)));
@@ -2200,6 +2657,7 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
 #ifdef ERTS_SMP
 	erts_bits_init_state(&esdp->erl_bits_state);
 	esdp->match_pseudo_process = NULL;
+	esdp->ssi = ERTS_SCHED_SLEEP_INFO_IX(ix);
 	esdp->free_process = NULL;
 #if HALFWORD_HEAP
 	/* Registers need to be heap allocated (correct memory range) for tracing to work */
@@ -2228,12 +2686,7 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
 	}
 
 #ifdef ERTS_SMP
-#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
-	esdp->check_children = 0;
-	esdp->blocked_check_children = 0;
-#endif
-	erts_smp_atomic_init(&esdp->suspended, 0);
-	erts_smp_atomic_init(&esdp->chk_cpu_bind, 0);
+	erts_smp_atomic32_init(&esdp->chk_cpu_bind, 0);
 #endif
     }
 
@@ -2241,21 +2694,21 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
     erts_smp_mtx_init(&schdlr_sspnd.mtx, "schdlr_sspnd");
     erts_smp_cnd_init(&schdlr_sspnd.cnd);
 
-    schdlr_sspnd.changing = 0;
+    erts_smp_atomic32_init(&schdlr_sspnd.changing, 0);
     schdlr_sspnd.online = no_schedulers_online;
     schdlr_sspnd.curr_online = no_schedulers;
-    erts_smp_atomic_init(&schdlr_sspnd.msb.ongoing, 0);
-    erts_smp_atomic_init(&schdlr_sspnd.active, no_schedulers);
+    erts_smp_atomic32_init(&schdlr_sspnd.msb.ongoing, 0);
+    erts_smp_atomic32_init(&schdlr_sspnd.active, no_schedulers);
     schdlr_sspnd.msb.procs = NULL;
-    erts_smp_atomic_set(&balance_info.used_runqs,
-			erts_common_run_queue ? 1 : no_schedulers_online);
-    erts_smp_atomic_init(&balance_info.active_runqs, no_schedulers);
+    erts_smp_atomic32_set(&balance_info.used_runqs,
+			  erts_common_run_queue ? 1 : no_schedulers_online);
+    erts_smp_atomic32_init(&balance_info.active_runqs, no_schedulers);
     balance_info.last_active_runqs = no_schedulers;
     erts_smp_mtx_init(&balance_info.update_mtx, "migration_info_update");
     balance_info.forced_check_balance = 0;
     balance_info.halftime = 1;
     balance_info.full_reds_history_index = 0;
-    erts_smp_atomic_init(&balance_info.checking_balance, 0);
+    erts_smp_atomic32_init(&balance_info.checking_balance, 0);
     balance_info.prev_rise.active_runqs = 0;
     balance_info.prev_rise.max_len = 0;
     balance_info.prev_rise.reds = 0;
@@ -2264,7 +2717,8 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
     if (no_schedulers_online < no_schedulers) {
 	if (erts_common_run_queue) {
 	    for (ix = no_schedulers_online; ix < no_schedulers; ix++)
-		erts_smp_atomic_set(&(ERTS_SCHEDULER_IX(ix)->suspended), 1);
+		erts_smp_atomic32_bor(&ERTS_SCHED_SLEEP_INFO_IX(ix)->flags,
+				      ERTS_SSI_FLG_SUSPENDED);
 	}
 	else {
 	    for (ix = no_schedulers_online; ix < erts_no_run_queues; ix++)
@@ -2275,9 +2729,12 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
 
     schdlr_sspnd.wait_curr_online = no_schedulers_online;
     schdlr_sspnd.curr_online *= 2; /* Boot strapping... */
-    schdlr_sspnd.changing = ERTS_SCHED_CHANGING_ONLINE;
+    ERTS_SCHDLR_SSPND_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_ONLN
+				| ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
+
+    erts_smp_atomic32_init(&doing_sys_schedule, 0);
 
-    erts_smp_atomic_init(&doing_sys_schedule, 0);
+    init_misc_aux_work();
 
 #else /* !ERTS_SMP */
     {
@@ -2291,12 +2748,19 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
     erts_no_schedulers = 1;
 #endif
 
-    erts_smp_atomic_init(&function_calls, 0);
+    erts_smp_atomic32_init(&function_calls, 0);
 
     /* init port tasks */
     erts_port_task_init();
 
-    late_cpu_bind_init();
+#ifndef ERTS_SMP
+#ifdef ERTS_DO_VERIFY_UNUSED_TEMP_ALLOC
+    erts_scheduler_data->verify_unused_temp_alloc
+	= erts_alloc_get_verify_unused_temp_alloc(
+	    &erts_scheduler_data->verify_unused_temp_alloc_data);
+    ERTS_VERIFY_UNUSED_TEMP_ALLOC(NULL);
+#endif
+#endif
 }
 
 ErtsRunQueue *
@@ -2408,6 +2872,19 @@ resume_process(Process *p)
     p->rstatus = P_FREE;    
 }
 
+int
+erts_get_max_no_executing_schedulers(void)
+{
+#ifdef ERTS_SMP
+    if (erts_smp_atomic32_read(&schdlr_sspnd.changing))
+	return (int) erts_no_schedulers;
+    ERTS_THR_MEMORY_BARRIER;
+    return (int) erts_smp_atomic32_read(&schdlr_sspnd.active);
+#else
+    return 1;
+#endif
+}
+
 #ifdef ERTS_SMP
 
 static void
@@ -2423,13 +2900,113 @@ susp_sched_resume_block(void *unused)
 }
 
 static void
+scheduler_ix_resume_wake(Uint ix)
+{
+    ErtsSchedulerSleepInfo *ssi = ERTS_SCHED_SLEEP_INFO_IX(ix);
+    erts_aint32_t xflgs = (ERTS_SSI_FLG_SLEEPING
+			   | ERTS_SSI_FLG_TSE_SLEEPING
+			   | ERTS_SSI_FLG_WAITING
+			   | ERTS_SSI_FLG_SUSPENDED);
+    erts_aint32_t oflgs;
+    do {
+	oflgs = erts_smp_atomic32_cmpxchg(&ssi->flags, 0, xflgs);
+	if (oflgs == xflgs) {
+	    erts_sched_finish_poke(ssi, oflgs);
+	    break;
+	}
+	xflgs = oflgs;
+    } while (oflgs & ERTS_SSI_FLG_SUSPENDED);
+}
+
+static erts_aint32_t
+sched_prep_spin_suspended(ErtsSchedulerSleepInfo *ssi, erts_aint32_t xpct)
+{
+    erts_aint32_t oflgs;
+    erts_aint32_t nflgs = (ERTS_SSI_FLG_SLEEPING
+			   | ERTS_SSI_FLG_WAITING
+			   | ERTS_SSI_FLG_SUSPENDED);
+    erts_aint32_t xflgs = xpct;
+
+    do {
+	oflgs = erts_smp_atomic32_cmpxchg(&ssi->flags, nflgs, xflgs);
+	if (oflgs == xflgs)
+	    return nflgs;
+	xflgs = oflgs;
+    } while (oflgs & ERTS_SSI_FLG_SUSPENDED);
+
+    return oflgs;
+}
+
+static erts_aint32_t
+sched_spin_suspended(ErtsSchedulerSleepInfo *ssi, int spincount)
+{
+    int until_yield = ERTS_SCHED_SPIN_UNTIL_YIELD;
+    int sc = spincount;
+    erts_aint32_t flgs;
+
+    do {
+	flgs = erts_smp_atomic32_read(&ssi->flags);
+	if ((flgs & (ERTS_SSI_FLG_SLEEPING
+		     | ERTS_SSI_FLG_WAITING
+		     | ERTS_SSI_FLG_SUSPENDED))
+	    != (ERTS_SSI_FLG_SLEEPING
+		| ERTS_SSI_FLG_WAITING
+		| ERTS_SSI_FLG_SUSPENDED)) {
+	    break;
+	}
+	ERTS_SPIN_BODY;
+	if (--until_yield == 0) {
+	    until_yield = ERTS_SCHED_SPIN_UNTIL_YIELD;
+	    erts_thr_yield();
+	}
+    } while (--sc > 0);
+    return flgs;
+}
+
+static erts_aint32_t
+sched_set_suspended_sleeptype(ErtsSchedulerSleepInfo *ssi)
+{
+    erts_aint32_t oflgs;
+    erts_aint32_t nflgs = (ERTS_SSI_FLG_SLEEPING
+			   | ERTS_SSI_FLG_TSE_SLEEPING
+			   | ERTS_SSI_FLG_WAITING
+			   | ERTS_SSI_FLG_SUSPENDED);
+    erts_aint32_t xflgs = (ERTS_SSI_FLG_SLEEPING
+			   | ERTS_SSI_FLG_WAITING
+			   | ERTS_SSI_FLG_SUSPENDED);
+
+    erts_tse_reset(ssi->event);
+
+    while (1) {
+	oflgs = erts_smp_atomic32_cmpxchg(&ssi->flags, nflgs, xflgs);
+	if (oflgs == xflgs)
+	    return nflgs;
+	if ((oflgs & (ERTS_SSI_FLG_SLEEPING
+		      | ERTS_SSI_FLG_WAITING
+		      | ERTS_SSI_FLG_SUSPENDED))
+	    != (ERTS_SSI_FLG_SLEEPING
+		| ERTS_SSI_FLG_WAITING
+		| ERTS_SSI_FLG_SUSPENDED)) {
+	    return oflgs;
+	}
+	xflgs = oflgs;
+    }
+}
+
+static void
 suspend_scheduler(ErtsSchedulerData *esdp)
 {
+    erts_aint32_t flgs;
+    erts_aint32_t changing;
     long no = (long) esdp->no;
-    ErtsRunQueue *rq = esdp->run_queue;
+    ErtsSchedulerSleepInfo *ssi = esdp->ssi;
     long active_schedulers;
     int curr_online = 1;
     int wake = 0;
+#if defined(ERTS_SCHED_NEED_NONBLOCKABLE_AUX_WORK) \
+    || defined(ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK)
+    erts_aint32_t aux_work;
+#endif
 
     /*
      * Schedulers may be suspended in two different ways:
@@ -2446,126 +3023,145 @@ suspend_scheduler(ErtsSchedulerData *esdp)
 
     erts_smp_runq_unlock(esdp->run_queue);
 
-    /* Unbind from cpu */
-    erts_smp_rwmtx_rwlock(&erts_cpu_bind_rwmtx);
-    if (scheduler2cpu_map[esdp->no].bound_id >= 0
-	&& erts_unbind_from_cpu(erts_cpuinfo) == 0) {
-	esdp->cpu_id = scheduler2cpu_map[esdp->no].bound_id = -1;
-    }
-    erts_smp_rwmtx_rwunlock(&erts_cpu_bind_rwmtx);
+    erts_sched_check_cpu_bind_prep_suspend(esdp);
 
     if (erts_system_profile_flags.scheduler)
     	profile_scheduler(make_small(esdp->no), am_inactive);
 
     erts_smp_mtx_lock(&schdlr_sspnd.mtx);
 
-    active_schedulers = erts_smp_atomic_dectest(&schdlr_sspnd.active);
-    ASSERT(active_schedulers >= 1);
-    if (schdlr_sspnd.changing == ERTS_SCHED_CHANGING_MULTI_SCHED) {
-	if (active_schedulers == schdlr_sspnd.msb.wait_active)
-	    wake = 1;
-	if (active_schedulers == 1)
-	    schdlr_sspnd.changing = 0;
-    }
-
-    while (1) {
+    flgs = sched_prep_spin_suspended(ssi, ERTS_SSI_FLG_SUSPENDED);
+    if (flgs & ERTS_SSI_FLG_SUSPENDED) {
 
-#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
-	int check_children;
-	erts_smp_runq_lock(esdp->run_queue);
-	check_children = esdp->check_children;
-	esdp->check_children = 0;
-	erts_smp_runq_unlock(esdp->run_queue);
-	if (check_children) {
-	    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-	    erts_check_children();
-	    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
+	active_schedulers = erts_smp_atomic32_dectest(&schdlr_sspnd.active);
+	ASSERT(active_schedulers >= 1);
+	changing = erts_smp_atomic32_read(&schdlr_sspnd.changing);
+	if (changing & ERTS_SCHDLR_SSPND_CHNG_MSB) {
+	    if (active_schedulers == schdlr_sspnd.msb.wait_active)
+		wake = 1;
+	    if (active_schedulers == 1) {
+		changing = erts_smp_atomic32_band(&schdlr_sspnd.changing,
+						  ~ERTS_SCHDLR_SSPND_CHNG_MSB);
+		changing &= ~ERTS_SCHDLR_SSPND_CHNG_MSB;
+	    }
 	}
-#endif
 
-	if (schdlr_sspnd.changing == ERTS_SCHED_CHANGING_ONLINE) {
-	    int changed = 0;
-	    if (no > schdlr_sspnd.online && curr_online) {
-		schdlr_sspnd.curr_online--;
-		curr_online = 0;
-		changed = 1;
+	while (1) {
+	    if (changing & ERTS_SCHDLR_SSPND_CHNG_ONLN) {
+		int changed = 0;
+		if (no > schdlr_sspnd.online && curr_online) {
+		    schdlr_sspnd.curr_online--;
+		    curr_online = 0;
+		    changed = 1;
+		}
+		else if (no <= schdlr_sspnd.online && !curr_online) {
+		    schdlr_sspnd.curr_online++;
+		    curr_online = 1;
+		    changed = 1;
+		}
+		if (changed
+		    && schdlr_sspnd.curr_online == schdlr_sspnd.wait_curr_online)
+		    wake = 1;
+		if (schdlr_sspnd.online == schdlr_sspnd.curr_online) {
+		    changing = erts_smp_atomic32_band(&schdlr_sspnd.changing,
+						      ~ERTS_SCHDLR_SSPND_CHNG_ONLN);
+		    changing &= ~ERTS_SCHDLR_SSPND_CHNG_ONLN;
+		}
 	    }
-	    else if (no <= schdlr_sspnd.online && !curr_online) {
-		schdlr_sspnd.curr_online++;
-		curr_online = 1;
-		changed = 1;
+
+	    if (wake) {
+		erts_smp_cnd_signal(&schdlr_sspnd.cnd);
+		wake = 0;
 	    }
-	    if (changed
-		&& schdlr_sspnd.curr_online == schdlr_sspnd.wait_curr_online)
-		wake = 1;
-	    if (schdlr_sspnd.online == schdlr_sspnd.curr_online)
-		schdlr_sspnd.changing = 0;
-	}
 
-	if (wake) {
-	    erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
-	    wake = 0;
-	}
+	    flgs = erts_smp_atomic32_read(&ssi->flags);
+	    if (!(flgs & ERTS_SSI_FLG_SUSPENDED))
+		break;
+	    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
 
 
-	if (!(rq->flags & (ERTS_RUNQ_FLG_SHARED_RUNQ|ERTS_RUNQ_FLG_SUSPENDED)))
-	    break;
-	if ((rq->flags & ERTS_RUNQ_FLG_SHARED_RUNQ)
-	    && !erts_smp_atomic_read(&esdp->suspended))
-	    break;
+#ifdef ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK
+	    aux_work = erts_smp_atomic32_read(&ssi->aux_work);
+	blockable_aux_work:
+	    blockable_aux_work(esdp, ssi, aux_work);
+#endif
+
+	    erts_smp_activity_begin(ERTS_ACTIVITY_WAIT, NULL, NULL, NULL);
+	    while (1) {
+		erts_aint32_t flgs;
+#ifdef ERTS_SCHED_NEED_NONBLOCKABLE_AUX_WORK
+#ifndef ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK
+		aux_work = erts_smp_atomic32_read(&ssi->aux_work);
+#endif
+		nonblockable_aux_work(esdp, ssi, aux_work);
+#endif
+
+		flgs = sched_spin_suspended(ssi,
+					    ERTS_SCHED_SUSPEND_SLEEP_SPINCOUNT);
+		if (flgs == (ERTS_SSI_FLG_SLEEPING
+			     | ERTS_SSI_FLG_WAITING
+			     | ERTS_SSI_FLG_SUSPENDED)) {
+		    flgs = sched_set_suspended_sleeptype(ssi);
+		    if (flgs == (ERTS_SSI_FLG_SLEEPING
+				 | ERTS_SSI_FLG_TSE_SLEEPING
+				 | ERTS_SSI_FLG_WAITING
+				 | ERTS_SSI_FLG_SUSPENDED)) {
+			int res;
+			do {
+			    res = erts_tse_wait(ssi->event);
+			} while (res == EINTR);
+		    }
+		}
 
-	erts_smp_activity_begin(ERTS_ACTIVITY_WAIT,
-				susp_sched_prep_block,
-				susp_sched_resume_block,
-				NULL);
-	while (1) {
+		flgs = sched_prep_spin_suspended(ssi, (ERTS_SSI_FLG_WAITING
+						       | ERTS_SSI_FLG_SUSPENDED));
+		if (!(flgs & ERTS_SSI_FLG_SUSPENDED))
+		    break;
+		changing = erts_smp_atomic32_read(&schdlr_sspnd.changing);
+		if (changing & ~ERTS_SCHDLR_SSPND_CHNG_WAITER)
+		    break;
 
-#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
-	    if (esdp->blocked_check_children)
-		break;
+
+#ifdef ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK
+		aux_work = erts_smp_atomic32_read(&ssi->aux_work);
+		if (aux_work & ERTS_SSI_BLOCKABLE_AUX_WORK_MASK) {
+		    erts_smp_activity_end(ERTS_ACTIVITY_WAIT, NULL, NULL, NULL);
+		    goto blockable_aux_work;
+		}
 #endif
 
-	    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
+	    }
 
-	    if (schdlr_sspnd.changing == ERTS_SCHED_CHANGING_ONLINE)
-		break;
+	    erts_smp_activity_end(ERTS_ACTIVITY_WAIT, NULL, NULL, NULL);
 
-	    if (!(rq->flags & (ERTS_RUNQ_FLG_SHARED_RUNQ
-			       | ERTS_RUNQ_FLG_SUSPENDED)))
-		break;
-	    if ((rq->flags & ERTS_RUNQ_FLG_SHARED_RUNQ)
-		&& !erts_smp_atomic_read(&esdp->suspended))
-		break;
+	    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
+	    changing = erts_smp_atomic32_read(&schdlr_sspnd.changing);
 	}
 
-#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
-	esdp->blocked_check_children = 0;
-#endif
+	active_schedulers = erts_smp_atomic32_inctest(&schdlr_sspnd.active);
+	changing = erts_smp_atomic32_read(&schdlr_sspnd.changing);
+	if ((changing & ERTS_SCHDLR_SSPND_CHNG_MSB)
+	    && schdlr_sspnd.online == active_schedulers) {
+	    erts_smp_atomic32_band(&schdlr_sspnd.changing,
+				   ~ERTS_SCHDLR_SSPND_CHNG_MSB);
+	}
 
-	erts_smp_activity_end(ERTS_ACTIVITY_WAIT,
-			      susp_sched_prep_block,
-			      susp_sched_resume_block,
-			      NULL);
-    }
+	ASSERT(no <= schdlr_sspnd.online);
+	ASSERT(!erts_smp_atomic32_read(&schdlr_sspnd.msb.ongoing));
 
-    active_schedulers = erts_smp_atomic_inctest(&schdlr_sspnd.active);
-    if (schdlr_sspnd.changing == ERTS_SCHED_CHANGING_MULTI_SCHED
-	&& schdlr_sspnd.online == active_schedulers) {
-	schdlr_sspnd.changing = 0;
     }
+
     erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
 
+    ASSERT(curr_online);
+
     if (erts_system_profile_flags.scheduler)
     	profile_scheduler(make_small(esdp->no), am_active);
 
     erts_smp_runq_lock(esdp->run_queue);
     non_empty_runq(esdp->run_queue);
 
-    /* Make sure we check if we should bind to a cpu or not... */
-    if (rq->flags & ERTS_RUNQ_FLG_SHARED_RUNQ)
-	erts_smp_atomic_set(&esdp->chk_cpu_bind, 1);
-    else
-	rq->flags |= ERTS_RUNQ_FLG_CHK_CPU_BIND;
+    erts_sched_check_cpu_bind_post_suspend(esdp);
 }
 
 #define ERTS_RUNQ_RESET_SUSPEND_INFO(RQ, DBG_ID)			\
@@ -2580,7 +3176,7 @@ do {									\
     (RQ)->flags |= (ERTS_RUNQ_FLG_OUT_OF_WORK				\
                     | ERTS_RUNQ_FLG_HALFTIME_OUT_OF_WORK);		\
     (RQ)->check_balance_reds = ERTS_RUNQ_CALL_CHECK_BALANCE_REDS;	\
-    erts_smp_atomic_band(&(RQ)->info_flags, ~ERTS_RUNQ_IFLG_SUSPENDED);	\
+    erts_smp_atomic32_band(&(RQ)->info_flags, ~ERTS_RUNQ_IFLG_SUSPENDED);\
     for (pix__ = 0; pix__ < ERTS_NO_PROC_PRIO_LEVELS; pix__++) {	\
 	(RQ)->procs.prio_info[pix__].max_len = 0;			\
 	(RQ)->procs.prio_info[pix__].reds = 0;				\
@@ -2622,8 +3218,10 @@ erts_schedulers_state(Uint *total,
 		      int yield_allowed)
 {
     int res;
+    erts_aint32_t changing;
     erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-    if (yield_allowed && schdlr_sspnd.changing)
+    changing = erts_smp_atomic32_read(&schdlr_sspnd.changing);
+    if (yield_allowed && (changing & ~ERTS_SCHDLR_SSPND_CHNG_WAITER))
 	res = ERTS_SCHDLR_SSPND_YIELD_RESTART;
     else {
 	*active = *online = schdlr_sspnd.online;
@@ -2643,6 +3241,7 @@ erts_set_schedulers_online(Process *p,
 			   Sint *old_no)
 {
     int ix, res, no, have_unlocked_plocks;
+    erts_aint32_t changing;
 
     if (new_no < 1 || erts_no_schedulers < new_no)
 	return ERTS_SCHDLR_SSPND_EINVAL;
@@ -2652,7 +3251,8 @@ erts_set_schedulers_online(Process *p,
     have_unlocked_plocks = 0;
     no = (int) new_no;
 
-    if (schdlr_sspnd.changing) {
+    changing = erts_smp_atomic32_read(&schdlr_sspnd.changing);
+    if (changing) {
 	res = ERTS_SCHDLR_SSPND_YIELD_RESTART;
     }
     else {
@@ -2661,17 +3261,19 @@ erts_set_schedulers_online(Process *p,
 	    res = ERTS_SCHDLR_SSPND_DONE;
 	}
 	else {
-	    schdlr_sspnd.changing = ERTS_SCHED_CHANGING_ONLINE;
+	    ERTS_SCHDLR_SSPND_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_ONLN
+					| ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
 	    schdlr_sspnd.online = no;
 	    if (no > online) {
 		int ix;
 		schdlr_sspnd.wait_curr_online = no;
-		if (ongoing_multi_scheduling_block())
-		    /* No schedulers to resume */;
+		if (ongoing_multi_scheduling_block()) {
+		    for (ix = online; ix < no; ix++)
+			erts_sched_poke(ERTS_SCHED_SLEEP_INFO_IX(ix));
+		}
 		else if (erts_common_run_queue) {
 		    for (ix = online; ix < no; ix++)
-			erts_smp_atomic_set(&ERTS_SCHEDULER_IX(ix)->suspended,
-					    0);
+			scheduler_ix_resume_wake(ix);
 		}
 		else {
 		    if (plocks) {
@@ -2685,6 +3287,7 @@ erts_set_schedulers_online(Process *p,
 			erts_smp_runq_lock(rq);
 			ERTS_RUNQ_RESET_SUSPEND_INFO(rq, 0x5);
 			erts_smp_runq_unlock(rq);
+			scheduler_ix_resume_wake(ix);
 		    }
 		    /*
 		     * Spread evacuation paths among all online
@@ -2695,11 +3298,10 @@ erts_set_schedulers_online(Process *p,
 			ErtsRunQueue *to_rq = ERTS_RUNQ_IX(ix % no);
 			evacuate_run_queue(from_rq, to_rq);
 		    }
-		    erts_smp_atomic_set(&balance_info.used_runqs, no);
+		    erts_smp_atomic32_set(&balance_info.used_runqs, no);
 		    erts_smp_mtx_unlock(&balance_info.update_mtx);
 		    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
 		}
-		erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
 		res = ERTS_SCHDLR_SSPND_DONE;
 	    }
 	    else /* if (no < online) */ {
@@ -2716,12 +3318,17 @@ erts_set_schedulers_online(Process *p,
 		    schdlr_sspnd.wait_curr_online = no+1;
 		}
 
-		if (ongoing_multi_scheduling_block())
-		    erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
-		else if (erts_common_run_queue) {
+		if (ongoing_multi_scheduling_block()) {
 		    for (ix = no; ix < online; ix++)
-			erts_smp_atomic_set(&ERTS_SCHEDULER_IX(ix)->suspended,
-					    1);
+			erts_sched_poke(ERTS_SCHED_SLEEP_INFO_IX(ix));
+		}
+		else if (erts_common_run_queue) {
+		    for (ix = no; ix < online; ix++) {
+			ErtsSchedulerSleepInfo *ssi;
+			ssi = ERTS_SCHED_SLEEP_INFO_IX(ix);
+			erts_smp_atomic32_bor(&ssi->flags,
+					      ERTS_SSI_FLG_SUSPENDED);
+		    }
 		    wake_all_schedulers();
 		}
 		else {
@@ -2745,10 +3352,13 @@ erts_set_schedulers_online(Process *p,
 		    for (ix = erts_no_run_queues-1; ix >= no; ix--)
 			evacuate_run_queue(ERTS_RUNQ_IX(ix),
 					   ERTS_RUNQ_IX(ix % no));
-		    erts_smp_atomic_set(&balance_info.used_runqs, no);
+		    erts_smp_atomic32_set(&balance_info.used_runqs, no);
 		    erts_smp_mtx_unlock(&balance_info.update_mtx);
 		    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-		    ERTS_FOREACH_OP_RUNQ(rq, wake_scheduler(rq, 0));
+		    for (ix = no; ix < online; ix++) {
+			ErtsRunQueue *rq = ERTS_RUNQ_IX(ix);
+			wake_scheduler(rq, 0, 1);
+		    }
 		}
 	    }
 
@@ -2762,6 +3372,13 @@ erts_set_schedulers_online(Process *p,
 				  susp_sched_prep_block,
 				  susp_sched_resume_block,
 				  NULL);
+	    ASSERT(res != ERTS_SCHDLR_SSPND_DONE
+		   ? (ERTS_SCHDLR_SSPND_CHNG_WAITER
+		      & erts_smp_atomic32_read(&schdlr_sspnd.changing))
+		   : (ERTS_SCHDLR_SSPND_CHNG_WAITER
+		      == erts_smp_atomic32_read(&schdlr_sspnd.changing)));
+	    erts_smp_atomic32_band(&schdlr_sspnd.changing,
+				   ~ERTS_SCHDLR_SSPND_CHNG_WAITER);
 	}
     }
 
@@ -2776,11 +3393,12 @@ ErtsSchedSuspendResult
 erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 {
     int ix, res, have_unlocked_plocks = 0;
+    erts_aint32_t changing;
     ErtsProcList *plp;
 
     erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-
-    if (schdlr_sspnd.changing) {
+    changing = erts_smp_atomic32_read(&schdlr_sspnd.changing);
+    if (changing) {
 	res = ERTS_SCHDLR_SSPND_YIELD_RESTART; /* Yield */
     }
     else if (on) { /* ------ BLOCK ------ */
@@ -2789,24 +3407,27 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 	    plp->next = schdlr_sspnd.msb.procs;
 	    schdlr_sspnd.msb.procs = plp;
 	    p->flags |= F_HAVE_BLCKD_MSCHED;
-	    ASSERT(erts_smp_atomic_read(&schdlr_sspnd.active) == 1);
+	    ASSERT(erts_smp_atomic32_read(&schdlr_sspnd.active) == 1);
 	    ASSERT(p->scheduler_data->no == 1);
 	    res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
 	}
 	else {
+	    int online = schdlr_sspnd.online;
 	    p->flags |= F_HAVE_BLCKD_MSCHED;
 	    if (plocks) {
 		have_unlocked_plocks = 1;
 		erts_smp_proc_unlock(p, plocks);
 	    }
-	    erts_smp_atomic_set(&schdlr_sspnd.msb.ongoing, 1);
-	    if (schdlr_sspnd.online == 1) {
+	    ASSERT(0 == erts_smp_atomic32_read(&schdlr_sspnd.msb.ongoing));
+	    erts_smp_atomic32_set(&schdlr_sspnd.msb.ongoing, 1);
+	    if (online == 1) {
 		res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
-		ASSERT(erts_smp_atomic_read(&schdlr_sspnd.active) == 1);
+		ASSERT(erts_smp_atomic32_read(&schdlr_sspnd.active) == 1);
 		ASSERT(p->scheduler_data->no == 1);
 	    }
 	    else {
-		schdlr_sspnd.changing = ERTS_SCHED_CHANGING_MULTI_SCHED;
+		ERTS_SCHDLR_SSPND_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_MSB
+					    | ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
 		if (p->scheduler_data->no == 1) {
 		    res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
 		    schdlr_sspnd.msb.wait_active = 1;
@@ -2820,17 +3441,19 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 		    schdlr_sspnd.msb.wait_active = 2;
 		}
 		if (erts_common_run_queue) {
-		    for (ix = 1; ix < schdlr_sspnd.online; ix++)
-			erts_smp_atomic_set(&ERTS_SCHEDULER_IX(ix)->suspended, 1);
+		    for (ix = 1; ix < online; ix++)
+			erts_smp_atomic32_bor(&ERTS_SCHED_SLEEP_INFO_IX(ix)->flags,
+					      ERTS_SSI_FLG_SUSPENDED);
 		    wake_all_schedulers();
 		}
 		else {
 		    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
 		    erts_smp_mtx_lock(&balance_info.update_mtx);
-		    erts_smp_atomic_set(&balance_info.used_runqs, 1);
-		    for (ix = 0; ix < schdlr_sspnd.online; ix++) {
+		    erts_smp_atomic32_set(&balance_info.used_runqs, 1);
+		    for (ix = 0; ix < online; ix++) {
 			ErtsRunQueue *rq = ERTS_RUNQ_IX(ix);
 			erts_smp_runq_lock(rq);
+			ASSERT(!(rq->flags & ERTS_RUNQ_FLG_SUSPENDED));
 			ERTS_RUNQ_RESET_MIGRATION_PATHS(rq, 0x7);
 			erts_smp_runq_unlock(rq);
 		    }
@@ -2848,13 +3471,20 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 					susp_sched_prep_block,
 					susp_sched_resume_block,
 					NULL);
-		while (erts_smp_atomic_read(&schdlr_sspnd.active)
+		while (erts_smp_atomic32_read(&schdlr_sspnd.active)
 		       != schdlr_sspnd.msb.wait_active)
 		    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
 		erts_smp_activity_end(ERTS_ACTIVITY_WAIT,
 				      susp_sched_prep_block,
 				      susp_sched_resume_block,
 				      NULL);
+		ASSERT(res != ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED
+		       ? (ERTS_SCHDLR_SSPND_CHNG_WAITER
+			  & erts_smp_atomic32_read(&schdlr_sspnd.changing))
+		       : (ERTS_SCHDLR_SSPND_CHNG_WAITER
+			  == erts_smp_atomic32_read(&schdlr_sspnd.changing)));
+		erts_smp_atomic32_band(&schdlr_sspnd.changing,
+				       ~ERTS_SCHDLR_SSPND_CHNG_WAITER);
 	    }
 	    plp = proclist_create(p);
 	    plp->next = schdlr_sspnd.msb.procs;
@@ -2898,7 +3528,7 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 	if (schdlr_sspnd.msb.procs)
 	    res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
 	else {
-	    schdlr_sspnd.changing = ERTS_SCHED_CHANGING_MULTI_SCHED;
+	    ERTS_SCHDLR_SSPND_CHNG_SET(ERTS_SCHDLR_SSPND_CHNG_MSB, 0);
 #ifdef DEBUG
 	    ERTS_FOREACH_RUNQ(rq,
 	    {
@@ -2921,17 +3551,17 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 	    });
 #endif
 	    p->flags &= ~F_HAVE_BLCKD_MSCHED;
-	    erts_smp_atomic_set(&schdlr_sspnd.msb.ongoing, 0);
+	    erts_smp_atomic32_set(&schdlr_sspnd.msb.ongoing, 0);
 	    if (schdlr_sspnd.online == 1) {
 		/* No schedulers to resume */
-		ASSERT(erts_smp_atomic_read(&schdlr_sspnd.active) == 1);
-		schdlr_sspnd.changing = 0;
+		ASSERT(erts_smp_atomic32_read(&schdlr_sspnd.active) == 1);
+		ERTS_SCHDLR_SSPND_CHNG_SET(0, ERTS_SCHDLR_SSPND_CHNG_MSB);
 	    }
 	    else if (erts_common_run_queue) {
 		for (ix = 1; ix < schdlr_sspnd.online; ix++)
-		    erts_smp_atomic_set(&ERTS_SCHEDULER_IX(ix)->suspended, 0);
+		    erts_smp_atomic32_band(&ERTS_SCHED_SLEEP_INFO_IX(ix)->flags,
+					   ~ERTS_SSI_FLG_SUSPENDED);
 		wake_all_schedulers();
-		erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
 	    }
 	    else {
 		int online = schdlr_sspnd.online;
@@ -2948,6 +3578,7 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 		    erts_smp_runq_lock(rq);
 		    ERTS_RUNQ_RESET_SUSPEND_INFO(rq, 0x4);
 		    erts_smp_runq_unlock(rq);
+		    scheduler_ix_resume_wake(ix);
 		}
 
 		/* Spread evacuation paths among all online run queues */
@@ -2955,7 +3586,7 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 		    evacuate_run_queue(ERTS_RUNQ_IX(ix),
 				       ERTS_RUNQ_IX(ix % online));
 
-		erts_smp_atomic_set(&balance_info.used_runqs, online);
+		erts_smp_atomic32_set(&balance_info.used_runqs, online);
 		/* Make sure that we balance soon... */
 		balance_info.forced_check_balance = 1;
 		erts_smp_runq_lock(ERTS_RUNQ_IX(0));
@@ -2963,7 +3594,6 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 		erts_smp_runq_unlock(ERTS_RUNQ_IX(0));
 		erts_smp_mtx_unlock(&balance_info.update_mtx);
 		erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-		erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
 	    }
 	    res = ERTS_SCHDLR_SSPND_DONE;
 	}
@@ -2980,7 +3610,7 @@ void
 erts_dbg_multi_scheduling_return_trap(Process *p, Eterm return_value)
 {
     if (return_value == am_blocked) {
-	long active = erts_smp_atomic_read(&schdlr_sspnd.active);
+	erts_aint32_t active = erts_smp_atomic32_read(&schdlr_sspnd.active);
 	ASSERT(1 <= active && active <= 2);
 	ASSERT(ERTS_PROC_GET_SCHDATA(p)->no == 1);
     }
@@ -3035,18 +3665,26 @@ erts_multi_scheduling_blockers(Process *p)
 static void *
 sched_thread_func(void *vesdp)
 {
+#ifdef ERTS_SMP
+    Uint no = ((ErtsSchedulerData *) vesdp)->no;
+#endif
 #ifdef ERTS_ENABLE_LOCK_CHECK
     {
 	char buf[31];
-	Uint no = ((ErtsSchedulerData *) vesdp)->no;
 	erts_snprintf(&buf[0], 31, "scheduler %bpu", no);
 	erts_lc_set_thread_name(&buf[0]);
     }
 #endif
-    erts_alloc_reg_scheduler_id(((ErtsSchedulerData *) vesdp)->no);
+    erts_alloc_reg_scheduler_id(no);
     erts_tsd_set(sched_data_key, vesdp);
 #ifdef ERTS_SMP
+
+    erts_sched_init_check_cpu_bind((ErtsSchedulerData *) vesdp);
+
     erts_proc_lock_prepare_proc_lock_waiter();
+    ERTS_SCHED_SLEEP_INFO_IX(no - 1)->event = erts_tse_fetch();
+
+
 #endif
     erts_register_blockable_thread();
 #ifdef HIPE
@@ -3055,33 +3693,40 @@ sched_thread_func(void *vesdp)
     erts_thread_init_float();
     erts_smp_mtx_lock(&schdlr_sspnd.mtx);
 
-    ASSERT(schdlr_sspnd.changing == ERTS_SCHED_CHANGING_ONLINE);
+    ASSERT(erts_smp_atomic32_read(&schdlr_sspnd.changing)
+	   & ERTS_SCHDLR_SSPND_CHNG_ONLN);
 
-    schdlr_sspnd.curr_online--;
+    if (--schdlr_sspnd.curr_online == schdlr_sspnd.wait_curr_online) {
+	erts_smp_atomic32_band(&schdlr_sspnd.changing,
+			       ~ERTS_SCHDLR_SSPND_CHNG_ONLN);
+	if (((ErtsSchedulerData *) vesdp)->no != 1)
+	    erts_smp_cnd_signal(&schdlr_sspnd.cnd);
+    }
 
-    if (((ErtsSchedulerData *) vesdp)->no != 1) {
-	if (schdlr_sspnd.online == schdlr_sspnd.curr_online) {
-	    schdlr_sspnd.changing = 0;
-	    erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
+    if (((ErtsSchedulerData *) vesdp)->no == 1) {
+	if (schdlr_sspnd.curr_online != schdlr_sspnd.wait_curr_online) {
+	    erts_smp_activity_begin(ERTS_ACTIVITY_WAIT,
+				    susp_sched_prep_block,
+				    susp_sched_resume_block,
+				    NULL);
+	    while (schdlr_sspnd.curr_online != schdlr_sspnd.wait_curr_online)
+		erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
+	    erts_smp_activity_end(ERTS_ACTIVITY_WAIT,
+				  susp_sched_prep_block,
+				  susp_sched_resume_block,
+				  NULL);
 	}
-    }
-    else if (schdlr_sspnd.curr_online == schdlr_sspnd.wait_curr_online)
-	schdlr_sspnd.changing = 0;
-    else {
-	erts_smp_activity_begin(ERTS_ACTIVITY_WAIT,
-				susp_sched_prep_block,
-				susp_sched_resume_block,
-				NULL);
-	while (schdlr_sspnd.curr_online != schdlr_sspnd.wait_curr_online)
-	    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
-	erts_smp_activity_end(ERTS_ACTIVITY_WAIT,
-			      susp_sched_prep_block,
-			      susp_sched_resume_block,
-			      NULL);
-	ASSERT(!schdlr_sspnd.changing);
+	ERTS_SCHDLR_SSPND_CHNG_SET(0, ERTS_SCHDLR_SSPND_CHNG_WAITER);
     }
     erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
 
+#ifdef ERTS_DO_VERIFY_UNUSED_TEMP_ALLOC
+    ((ErtsSchedulerData *) vesdp)->verify_unused_temp_alloc
+	= erts_alloc_get_verify_unused_temp_alloc(
+	    &((ErtsSchedulerData *) vesdp)->verify_unused_temp_alloc_data);
+    ERTS_VERIFY_UNUSED_TEMP_ALLOC(NULL);
+#endif
+
     process_main();
     /* No schedulers should *ever* terminate */
     erl_exit(ERTS_ABORT_EXIT, "Scheduler thread number %bpu terminated\n",
@@ -3114,11 +3759,7 @@ erts_start_schedulers(void)
 	ErtsSchedulerData *esdp = ERTS_SCHEDULER_IX(actual);
 	actual++;
 	ASSERT(actual == esdp->no);
-#ifdef ERTS_ENABLE_LOCK_COUNT
-	res = erts_lcnt_thr_create(&esdp->tid,sched_thread_func,(void*)esdp,&opts);
-#else
 	res = ethr_thr_create(&esdp->tid,sched_thread_func,(void*)esdp,&opts);
-#endif
 	if (res != 0) {
 	    actual--;
 	    break;
@@ -3147,1365 +3788,6 @@ erts_start_schedulers(void)
 
 #endif /* ERTS_SMP */
 
-static int
-int_cmp(const void *vx, const void *vy)
-{
-    return *((int *) vx) - *((int *) vy);
-}
-
-static int
-cpu_spread_order_cmp(const void *vx, const void *vy)
-{
-    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
-    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
-
-    if (x->thread != y->thread)
-	return x->thread - y->thread;
-    if (x->core != y->core)
-	return x->core - y->core;
-    if (x->processor_node != y->processor_node)
-	return x->processor_node - y->processor_node;
-    if (x->processor != y->processor)
-	return x->processor - y->processor;
-    if (x->node != y->node)
-	return x->node - y->node;
-    return 0;
-}
-
-static int
-cpu_processor_spread_order_cmp(const void *vx, const void *vy)
-{
-    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
-    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
-
-    if (x->thread != y->thread)
-	return x->thread - y->thread;
-    if (x->processor_node != y->processor_node)
-	return x->processor_node - y->processor_node;
-    if (x->core != y->core)
-	return x->core - y->core;
-    if (x->node != y->node)
-	return x->node - y->node;
-    if (x->processor != y->processor)
-	return x->processor - y->processor;
-    return 0;
-}
-
-static int
-cpu_thread_spread_order_cmp(const void *vx, const void *vy)
-{
-    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
-    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
-
-    if (x->thread != y->thread)
-	return x->thread - y->thread;
-    if (x->node != y->node)
-	return x->node - y->node;
-    if (x->processor != y->processor)
-	return x->processor - y->processor;
-    if (x->processor_node != y->processor_node)
-	return x->processor_node - y->processor_node;
-    if (x->core != y->core)
-	return x->core - y->core;
-    return 0;
-}
-
-static int
-cpu_thread_no_node_processor_spread_order_cmp(const void *vx, const void *vy)
-{
-    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
-    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
-
-    if (x->thread != y->thread)
-	return x->thread - y->thread;
-    if (x->node != y->node)
-	return x->node - y->node;
-    if (x->core != y->core)
-	return x->core - y->core;
-    if (x->processor != y->processor)
-	return x->processor - y->processor;
-    return 0;
-}
-
-static int
-cpu_no_node_processor_spread_order_cmp(const void *vx, const void *vy)
-{
-    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
-    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
-
-    if (x->node != y->node)
-	return x->node - y->node;
-    if (x->thread != y->thread)
-	return x->thread - y->thread;
-    if (x->core != y->core)
-	return x->core - y->core;
-    if (x->processor != y->processor)
-	return x->processor - y->processor;
-    return 0;
-}
-
-static int
-cpu_no_node_thread_spread_order_cmp(const void *vx, const void *vy)
-{
-    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
-    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
-
-    if (x->node != y->node)
-	return x->node - y->node;
-    if (x->thread != y->thread)
-	return x->thread - y->thread;
-    if (x->processor != y->processor)
-	return x->processor - y->processor;
-    if (x->core != y->core)
-	return x->core - y->core;
-    return 0;
-}
-
-static int
-cpu_no_spread_order_cmp(const void *vx, const void *vy)
-{
-    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
-    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
-
-    if (x->node != y->node)
-	return x->node - y->node;
-    if (x->processor != y->processor)
-	return x->processor - y->processor;
-    if (x->processor_node != y->processor_node)
-	return x->processor_node - y->processor_node;
-    if (x->core != y->core)
-	return x->core - y->core;
-    if (x->thread != y->thread)
-	return x->thread - y->thread;
-    return 0;
-}
-
-static ERTS_INLINE void
-make_cpudata_id_seq(erts_cpu_topology_t *cpudata, int size, int no_node)
-{
-    int ix;
-    int node = -1;
-    int processor = -1;
-    int processor_node = -1;
-    int processor_node_node = -1;
-    int core = -1;
-    int thread = -1;
-    int old_node = -1;
-    int old_processor = -1;
-    int old_processor_node = -1;
-    int old_core = -1;
-    int old_thread = -1;
-
-    for (ix = 0; ix < size; ix++) {
-	if (!no_node || cpudata[ix].node >= 0) {
-	    if (old_node == cpudata[ix].node)
-		cpudata[ix].node = node;
-	    else {
-		old_node = cpudata[ix].node;
-		old_processor = processor = -1;
-		if (!no_node)
-		    old_processor_node = processor_node = -1;
-		old_core = core = -1;
-		old_thread = thread = -1;
-		if (no_node || cpudata[ix].node >= 0)
-		    cpudata[ix].node = ++node;
-	    }
-	}
-	if (old_processor == cpudata[ix].processor)
-	    cpudata[ix].processor = processor;
-	else {
-	    old_processor = cpudata[ix].processor;
-	    if (!no_node)
-		processor_node_node = old_processor_node = processor_node = -1;
-	    old_core = core = -1;
-	    old_thread = thread = -1;
-	    cpudata[ix].processor = ++processor;
-	}
-	if (no_node && cpudata[ix].processor_node < 0)
-	    old_processor_node = -1;
-	else {
-	    if (old_processor_node == cpudata[ix].processor_node) {
-		if (no_node)
-		    cpudata[ix].node = cpudata[ix].processor_node = node;
-		else {
-		    if (processor_node_node >= 0)
-			cpudata[ix].node = processor_node_node;
-		    cpudata[ix].processor_node = processor_node;
-		}
-	    }
-	    else {
-		old_processor_node = cpudata[ix].processor_node;
-		old_core = core = -1;
-		old_thread = thread = -1;
-		if (no_node)
-		    cpudata[ix].node = cpudata[ix].processor_node = ++node;
-		else {
-		    cpudata[ix].node = processor_node_node = ++node;
-		    cpudata[ix].processor_node = ++processor_node;
-		}
-	    }
-	}
-	if (!no_node && cpudata[ix].processor_node < 0)
-	    cpudata[ix].processor_node = 0;
-	if (old_core == cpudata[ix].core)
-	    cpudata[ix].core = core;
-	else {
-	    old_core = cpudata[ix].core;
-	    old_thread = thread = -1;
-	    cpudata[ix].core = ++core;
-	}
-	if (old_thread == cpudata[ix].thread)
-	    cpudata[ix].thread = thread;
-	else
-	    old_thread = cpudata[ix].thread = ++thread;
-    }
-}
-
-static void
-cpu_bind_order_sort(erts_cpu_topology_t *cpudata,
-		    int size,
-		    ErtsCpuBindOrder bind_order,
-		    int mk_seq)
-{
-    if (size > 1) {
-	int no_node = 0;
-	int (*cmp_func)(const void *, const void *);
-	switch (bind_order) {
-	case ERTS_CPU_BIND_SPREAD:
-	    cmp_func = cpu_spread_order_cmp;
-	    break;
-	case ERTS_CPU_BIND_PROCESSOR_SPREAD:
-	    cmp_func = cpu_processor_spread_order_cmp;
-	    break;
-	case ERTS_CPU_BIND_THREAD_SPREAD:
-	    cmp_func = cpu_thread_spread_order_cmp;
-	    break;
-	case ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD:
-	    no_node = 1;
-	    cmp_func = cpu_thread_no_node_processor_spread_order_cmp;
-	    break;
-	case ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD:
-	    no_node = 1;
-	    cmp_func = cpu_no_node_processor_spread_order_cmp;
-	    break;
-	case ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD:
-	    no_node = 1;
-	    cmp_func = cpu_no_node_thread_spread_order_cmp;
-	    break;
-	case ERTS_CPU_BIND_NO_SPREAD:
-	    cmp_func = cpu_no_spread_order_cmp;
-	    break;
-	default:
-	    cmp_func = NULL;
-	    erl_exit(ERTS_ABORT_EXIT,
-		     "Bad cpu bind type: %d\n",
-		     (int) cpu_bind_order);
-	    break;
-	}
-
-	if (mk_seq)
-	    make_cpudata_id_seq(cpudata, size, no_node);
-
-	qsort(cpudata, size, sizeof(erts_cpu_topology_t), cmp_func);
-    }
-}
-
-static int
-processor_order_cmp(const void *vx, const void *vy)
-{
-    erts_cpu_topology_t *x = (erts_cpu_topology_t *) vx;
-    erts_cpu_topology_t *y = (erts_cpu_topology_t *) vy;
-
-    if (x->processor != y->processor)
-	return x->processor - y->processor;
-    if (x->node != y->node)
-	return x->node - y->node;
-    if (x->processor_node != y->processor_node)
-	return x->processor_node - y->processor_node;
-    if (x->core != y->core)
-	return x->core - y->core;
-    if (x->thread != y->thread)
-	return x->thread - y->thread;
-    return 0;
-}
-
-static void
-check_cpu_bind(ErtsSchedulerData *esdp)
-{
-    int res;
-    int cpu_id;
-    erts_smp_runq_unlock(esdp->run_queue);
-    erts_smp_rwmtx_rwlock(&erts_cpu_bind_rwmtx);
-    cpu_id = scheduler2cpu_map[esdp->no].bind_id;
-    if (cpu_id >= 0 && cpu_id != scheduler2cpu_map[esdp->no].bound_id) {
-	res = erts_bind_to_cpu(erts_cpuinfo, cpu_id);
-	if (res == 0)
-	    esdp->cpu_id = scheduler2cpu_map[esdp->no].bound_id = cpu_id;
-	else {
-	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	    erts_dsprintf(dsbufp, "Scheduler %d failed to bind to cpu %d: %s\n",
-			  (int) esdp->no, cpu_id, erl_errno_id(-res));
-	    erts_send_error_to_logger_nogl(dsbufp);
-	    if (scheduler2cpu_map[esdp->no].bound_id >= 0)
-		goto unbind;
-	}
-    }
-    else if (cpu_id < 0 && scheduler2cpu_map[esdp->no].bound_id >= 0) {
-    unbind:
-	/* Get rid of old binding */
-	res = erts_unbind_from_cpu(erts_cpuinfo);
-	if (res == 0)
-	    esdp->cpu_id = scheduler2cpu_map[esdp->no].bound_id = -1;
-	else {
-	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	    erts_dsprintf(dsbufp, "Scheduler %d failed to unbind from cpu %d: %s\n",
-			  (int) esdp->no, cpu_id, erl_errno_id(-res));
-	    erts_send_error_to_logger_nogl(dsbufp);
-	}
-    }
-    erts_smp_runq_lock(esdp->run_queue);
-#ifdef ERTS_SMP
-    if (erts_common_run_queue)
-	erts_smp_atomic_set(&esdp->chk_cpu_bind, 0);
-    else {
-	esdp->run_queue->flags &= ~ERTS_RUNQ_FLG_CHK_CPU_BIND;
-    }
-#endif
-    erts_smp_rwmtx_rwunlock(&erts_cpu_bind_rwmtx);
-
-}
-
-static void
-signal_schedulers_bind_change(erts_cpu_topology_t *cpudata, int size)
-{
-    int s_ix = 1;
-    int cpu_ix;
-
-    if (cpu_bind_order != ERTS_CPU_BIND_NONE) {
-
-	cpu_bind_order_sort(cpudata, size, cpu_bind_order, 1);
-
-	for (cpu_ix = 0; cpu_ix < size && cpu_ix < erts_no_schedulers; cpu_ix++)
-	    if (erts_is_cpu_available(erts_cpuinfo, cpudata[cpu_ix].logical))
-		scheduler2cpu_map[s_ix++].bind_id = cpudata[cpu_ix].logical;
-    }
-
-    if (s_ix <= erts_no_schedulers)
-	for (; s_ix <= erts_no_schedulers; s_ix++)
-	    scheduler2cpu_map[s_ix].bind_id = -1;
-
-#ifdef ERTS_SMP
-    if (erts_common_run_queue) {
-	for (s_ix = 0; s_ix < erts_no_schedulers; s_ix++)
-	    erts_smp_atomic_set(&ERTS_SCHEDULER_IX(s_ix)->chk_cpu_bind, 1);
-	wake_all_schedulers();
-    }
-    else {
-	ERTS_FOREACH_RUNQ(rq,
-	{
-	    rq->flags |= ERTS_RUNQ_FLG_CHK_CPU_BIND;
-	    wake_scheduler(rq, 0);
-	});
-    }
-#else
-    check_cpu_bind(erts_get_scheduler_data());
-#endif
-}
-
-int
-erts_init_scheduler_bind_type(char *how)
-{
-    if (erts_bind_to_cpu(erts_cpuinfo, -1) == -ENOTSUP)
-	return ERTS_INIT_SCHED_BIND_TYPE_NOT_SUPPORTED;
-
-    if (!system_cpudata && !user_cpudata)
-	return ERTS_INIT_SCHED_BIND_TYPE_ERROR_NO_CPU_TOPOLOGY;
-
-    if (sys_strcmp(how, "db") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_DEFAULT_BIND;
-    else if (sys_strcmp(how, "s") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_SPREAD;
-    else if (sys_strcmp(how, "ps") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_PROCESSOR_SPREAD;
-    else if (sys_strcmp(how, "ts") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_THREAD_SPREAD;
-    else if (sys_strcmp(how, "tnnps") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD;
-    else if (sys_strcmp(how, "nnps") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD;
-    else if (sys_strcmp(how, "nnts") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD;
-    else if (sys_strcmp(how, "ns") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_NO_SPREAD;
-    else if (sys_strcmp(how, "u") == 0)
-	cpu_bind_order = ERTS_CPU_BIND_NONE;
-    else
-	return ERTS_INIT_SCHED_BIND_TYPE_ERROR_NO_BAD_TYPE;
-
-    return ERTS_INIT_SCHED_BIND_TYPE_SUCCESS;
-}
-
-typedef struct {
-    int *id;
-    int used;
-    int size;
-} ErtsCpuTopIdSeq;
-
-typedef struct {
-    ErtsCpuTopIdSeq logical;
-    ErtsCpuTopIdSeq thread;
-    ErtsCpuTopIdSeq core;
-    ErtsCpuTopIdSeq processor_node;
-    ErtsCpuTopIdSeq processor;
-    ErtsCpuTopIdSeq node;
-} ErtsCpuTopEntry;
-
-static void
-init_cpu_top_entry(ErtsCpuTopEntry *cte)
-{
-    int size = 10;
-    cte->logical.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
-				 sizeof(int)*size);
-    cte->logical.size = size;
-    cte->thread.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
-				sizeof(int)*size);
-    cte->thread.size = size;
-    cte->core.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
-			      sizeof(int)*size);
-    cte->core.size = size;
-    cte->processor_node.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
-					sizeof(int)*size);
-    cte->processor_node.size = size;
-    cte->processor.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
-				   sizeof(int)*size);
-    cte->processor.size = size;
-    cte->node.id = erts_alloc(ERTS_ALC_T_TMP_CPU_IDS,
-			      sizeof(int)*size);
-    cte->node.size = size;
-}
-
-static void
-destroy_cpu_top_entry(ErtsCpuTopEntry *cte)
-{
-    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->logical.id);
-    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->thread.id);
-    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->core.id);
-    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->processor_node.id);
-    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->processor.id);
-    erts_free(ERTS_ALC_T_TMP_CPU_IDS, cte->node.id);
-}
-
-static int
-get_cput_value_or_range(int *v, int *vr, char **str)
-{
-    long l;
-    char *c = *str;
-    errno = 0;
-    if (!isdigit((unsigned char)*c))
-	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID;
-    l = strtol(c, &c, 10);
-    if (errno != 0 || l < 0 || ERTS_MAX_CPU_TOPOLOGY_ID < l)
-	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID;
-    *v = (int) l;
-    if (*c == '-') {
-	c++;
-	if (!isdigit((unsigned char)*c))
-	    return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
-	l = strtol(c, &c, 10);
-	if (errno != 0 || l < 0 || ERTS_MAX_CPU_TOPOLOGY_ID < l)
-	    return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
-	*vr = (int) l;
-    }
-    *str = c;
-    return ERTS_INIT_CPU_TOPOLOGY_OK;
-}
-
-static int
-get_cput_id_seq(ErtsCpuTopIdSeq *idseq, char **str)
-{
-    int ix = 0;
-    int need_size = 0;
-    char *c = *str;
-
-    while (1) {
-	int res;
-	int val;
-	int nids;
-	int val_range = -1;
-	res = get_cput_value_or_range(&val, &val_range, &c);
-	if (res != ERTS_INIT_CPU_TOPOLOGY_OK)
-	    return res;
-	if (val_range < 0 || val_range == val)
-	    nids = 1;
-	else {
-	    if (val_range > val)
-		nids = val_range - val + 1;
-	    else
-		nids = val - val_range + 1;
-	}
-	need_size += nids;
-	if (need_size > idseq->size) {
-	    idseq->size = need_size + 10;
-	    idseq->id = erts_realloc(ERTS_ALC_T_TMP_CPU_IDS,
-				      idseq->id,
-				      sizeof(int)*idseq->size);
-	}
-	if (nids == 1)
-	    idseq->id[ix++] = val;
-	else if (val_range > val) {
-	    for (; val <= val_range; val++)
-		idseq->id[ix++] = val;
-	}
-	else {
-	    for (; val >= val_range; val--)
-		idseq->id[ix++] = val;
-	}
-	if (*c != ',')
-	    break;
-	c++;
-    }
-    *str = c;
-    idseq->used = ix;
-    return ERTS_INIT_CPU_TOPOLOGY_OK;
-}
-
-static int
-get_cput_entry(ErtsCpuTopEntry *cput, char **str)
-{
-    int h;
-    char *c = *str;
-
-    cput->logical.used = 0;
-    cput->thread.id[0] = 0;
-    cput->thread.used = 1;
-    cput->core.id[0] = 0;
-    cput->core.used = 1;
-    cput->processor_node.id[0] = -1;
-    cput->processor_node.used = 1;
-    cput->processor.id[0] = 0;
-    cput->processor.used = 1;
-    cput->node.id[0] = -1;
-    cput->node.used = 1;
-
-    h = ERTS_TOPOLOGY_MAX_DEPTH;
-    while (*c != ':' && *c != '\0') {
-	int res;
-	ErtsCpuTopIdSeq *idseqp;
-	switch (*c++) {
-	case 'L':
-	    if (h <= ERTS_TOPOLOGY_LOGICAL)
-		return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
-	    idseqp = &cput->logical;
-	    h = ERTS_TOPOLOGY_LOGICAL;
-	    break;
-	case 't':
-	case 'T':
-	    if (h <= ERTS_TOPOLOGY_THREAD)
-		return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
-	    idseqp = &cput->thread;
-	    h = ERTS_TOPOLOGY_THREAD;
-	    break;
-	case 'c':
-	case 'C':
-	    if (h <= ERTS_TOPOLOGY_CORE)
-		return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
-	    idseqp = &cput->core;
-	    h = ERTS_TOPOLOGY_CORE;
-	    break;
-	case 'p':
-	case 'P':
-	    if (h <= ERTS_TOPOLOGY_PROCESSOR)
-		return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
-	    idseqp = &cput->processor;
-	    h = ERTS_TOPOLOGY_PROCESSOR;
-	    break;
-	case 'n':
-	case 'N':
-	    if (h <= ERTS_TOPOLOGY_PROCESSOR) {
-	    do_node:
-		if (h <= ERTS_TOPOLOGY_NODE)
-		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
-		idseqp = &cput->node;
-		h = ERTS_TOPOLOGY_NODE;
-	    }
-	    else {
-		int p_node = 0;
-		char *p_chk = c;
-		while (*p_chk != '\0' && *p_chk != ':') {
-		    if (*p_chk == 'p' || *p_chk == 'P') {
-			p_node = 1;
-			break;
-		    }
-		    p_chk++;
-		}
-		if (!p_node)
-		    goto do_node;
-		if (h <= ERTS_TOPOLOGY_PROCESSOR_NODE)
-		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY;
-		idseqp = &cput->processor_node;
-		h = ERTS_TOPOLOGY_PROCESSOR_NODE;
-	    }
-	    break;
-	default:
-	    return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_TYPE;
-	}
-	res = get_cput_id_seq(idseqp, &c);
-	if (res != ERTS_INIT_CPU_TOPOLOGY_OK)
-		return res;
-    }
-
-    if (cput->logical.used < 1)
-	return ERTS_INIT_CPU_TOPOLOGY_MISSING_LID;
-
-    if (*c == ':') {
-	c++;
-    }
-
-    if (cput->thread.used != 1
-	&& cput->thread.used != cput->logical.used)
-	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
-    if (cput->core.used != 1
-	&& cput->core.used != cput->logical.used)
-	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
-    if (cput->processor_node.used != 1
-	&& cput->processor_node.used != cput->logical.used)
-	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
-    if (cput->processor.used != 1
-	&& cput->processor.used != cput->logical.used)
-	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
-    if (cput->node.used != 1
-	&& cput->node.used != cput->logical.used)
-	return ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE;
-
-    *str = c;
-    return ERTS_INIT_CPU_TOPOLOGY_OK;
-}
-
-static int
-verify_topology(erts_cpu_topology_t *cpudata, int size)
-{
-    if (size > 0) {
-	int *logical;
-	int node, processor, no_nodes, i;
-
-	/* Verify logical ids */
-	logical = erts_alloc(ERTS_ALC_T_TMP, sizeof(int)*size);
-
-	for (i = 0; i < user_cpudata_size; i++)
-	    logical[i] = user_cpudata[i].logical;
-
-	qsort(logical, user_cpudata_size, sizeof(int), int_cmp);
-	for (i = 0; i < user_cpudata_size-1; i++) {
-	    if (logical[i] == logical[i+1]) {
-		erts_free(ERTS_ALC_T_TMP, logical);
-		return ERTS_INIT_CPU_TOPOLOGY_NOT_UNIQUE_LIDS;
-	    }
-	}
-
-	erts_free(ERTS_ALC_T_TMP, logical);
-
-	qsort(cpudata, size, sizeof(erts_cpu_topology_t), processor_order_cmp);
-
-	/* Verify unique entities */
-
-	for (i = 1; i < user_cpudata_size; i++) {
-	    if (user_cpudata[i-1].processor == user_cpudata[i].processor
-		&& user_cpudata[i-1].node == user_cpudata[i].node
-		&& (user_cpudata[i-1].processor_node
-		    == user_cpudata[i].processor_node)
-		&& user_cpudata[i-1].core == user_cpudata[i].core
-		&& user_cpudata[i-1].thread == user_cpudata[i].thread) {
-		return ERTS_INIT_CPU_TOPOLOGY_NOT_UNIQUE_ENTITIES;
-	    }
-	}
-
-	/* Verify numa nodes */
-	node = cpudata[0].node;
-	processor = cpudata[0].processor;
-	no_nodes = cpudata[0].node < 0 && cpudata[0].processor_node < 0;
-	for (i = 1; i < size; i++) {
-	    if (no_nodes) {
-		if (cpudata[i].node >= 0 || cpudata[i].processor_node >= 0)
-		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_NODES;
-	    }
-	    else {
-		if (cpudata[i].processor == processor && cpudata[i].node != node)
-		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_NODES;
-		node = cpudata[i].node;
-		processor = cpudata[i].processor;
-		if (node >= 0 && cpudata[i].processor_node >= 0)
-		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_NODES;
-		if (node < 0 && cpudata[i].processor_node < 0)
-		    return ERTS_INIT_CPU_TOPOLOGY_INVALID_NODES;
-	    }
-	}
-    }
-
-    return ERTS_INIT_CPU_TOPOLOGY_OK;
-}
-
-int
-erts_init_cpu_topology(char *topology_str)
-{
-    ErtsCpuTopEntry cput;
-    int need_size;
-    char *c;
-    int ix;
-    int error = ERTS_INIT_CPU_TOPOLOGY_OK;
-
-    if (user_cpudata)
-	erts_free(ERTS_ALC_T_CPUDATA, user_cpudata);
-    user_cpudata_size = 10;
-
-    user_cpudata = erts_alloc(ERTS_ALC_T_CPUDATA,
-			      (sizeof(erts_cpu_topology_t)
-			       * user_cpudata_size));
-
-    init_cpu_top_entry(&cput);
-
-    ix = 0;
-    need_size = 0;
-
-    c = topology_str;
-    if (*c == '\0') {
-	error = ERTS_INIT_CPU_TOPOLOGY_MISSING;
-	goto fail;
-    }
-    do {
-	int r;
-	error = get_cput_entry(&cput, &c);
-	if (error != ERTS_INIT_CPU_TOPOLOGY_OK)
-	    goto fail;
-	need_size += cput.logical.used;
-	if (user_cpudata_size < need_size) {
-	    user_cpudata_size = need_size + 10;
-	    user_cpudata = erts_realloc(ERTS_ALC_T_CPUDATA,
-					user_cpudata,
-					(sizeof(erts_cpu_topology_t)
-					 * user_cpudata_size));
-	}
-
-	ASSERT(cput.thread.used == 1
-	       || cput.thread.used == cput.logical.used);
-	ASSERT(cput.core.used == 1
-	       || cput.core.used == cput.logical.used);
-	ASSERT(cput.processor_node.used == 1
-	       || cput.processor_node.used == cput.logical.used);
-	ASSERT(cput.processor.used == 1
-	       || cput.processor.used == cput.logical.used);
-	ASSERT(cput.node.used == 1
-	       || cput.node.used == cput.logical.used);
-
-	for (r = 0; r < cput.logical.used; r++) {
-	    user_cpudata[ix].logical = cput.logical.id[r];
-	    user_cpudata[ix].thread =
-		cput.thread.id[cput.thread.used == 1 ? 0 : r];
-	    user_cpudata[ix].core =
-		cput.core.id[cput.core.used == 1 ? 0 : r];
-	    user_cpudata[ix].processor_node =
-		cput.processor_node.id[cput.processor_node.used == 1 ? 0 : r];
-	    user_cpudata[ix].processor =
-		cput.processor.id[cput.processor.used == 1 ? 0 : r];
-	    user_cpudata[ix].node =
-		cput.node.id[cput.node.used == 1 ? 0 : r];
-	    ix++;
-	}
-    } while (*c != '\0');
-
-    if (user_cpudata_size != ix) {
-	user_cpudata_size = ix;
-	user_cpudata = erts_realloc(ERTS_ALC_T_CPUDATA,
-				    user_cpudata,
-				    (sizeof(erts_cpu_topology_t)
-				     * user_cpudata_size));
-    }
-
-    error = verify_topology(user_cpudata, user_cpudata_size);
-    if (error == ERTS_INIT_CPU_TOPOLOGY_OK) {
-	destroy_cpu_top_entry(&cput);
-	return ERTS_INIT_CPU_TOPOLOGY_OK;
-    }
-
- fail:
-    if (user_cpudata)
-	erts_free(ERTS_ALC_T_CPUDATA, user_cpudata);
-    user_cpudata_size = 0;
-    destroy_cpu_top_entry(&cput);
-    return error;
-}
-
-#define ERTS_GET_CPU_TOPOLOGY_ERROR		-1
-#define ERTS_GET_USED_CPU_TOPOLOGY		0
-#define ERTS_GET_DETECTED_CPU_TOPOLOGY		1
-#define ERTS_GET_DEFINED_CPU_TOPOLOGY		2
-
-static Eterm get_cpu_topology_term(Process *c_p, int type);
-
-Eterm
-erts_set_cpu_topology(Process *c_p, Eterm term)
-{
-    erts_cpu_topology_t *cpudata = NULL;
-    int cpudata_size = 0;
-    Eterm res;
-
-    erts_smp_rwmtx_rwlock(&erts_cpu_bind_rwmtx);
-    res = get_cpu_topology_term(c_p, ERTS_GET_USED_CPU_TOPOLOGY);
-    if (term == am_undefined) {
-	if (user_cpudata)
-	    erts_free(ERTS_ALC_T_CPUDATA, user_cpudata);
-	user_cpudata = NULL;
-	user_cpudata_size = 0;
-
-	if (cpu_bind_order != ERTS_CPU_BIND_NONE && system_cpudata) {
-	    cpudata_size = system_cpudata_size;
-	    cpudata = erts_alloc(ERTS_ALC_T_TMP,
-				 (sizeof(erts_cpu_topology_t)
-				  * cpudata_size));
-
-	    sys_memcpy((void *) cpudata,
-		       (void *) system_cpudata,
-		       sizeof(erts_cpu_topology_t)*cpudata_size);
-	}
-    }
-    else if (is_not_list(term)) {
-    error:
-	res = THE_NON_VALUE;
-	goto done;
-    }
-    else {
-	Eterm list = term;
-	int ix = 0;
-
-	cpudata_size = 100;
-	cpudata = erts_alloc(ERTS_ALC_T_TMP,
-			     (sizeof(erts_cpu_topology_t)
-			      * cpudata_size));
-
-	while (is_list(list)) {
-	    Eterm *lp = list_val(list);
-	    Eterm cpu = CAR(lp);
-	    Eterm* tp;
-	    Sint id;
-		
-	    if (is_not_tuple(cpu))
-		goto error;
-
-	    tp = tuple_val(cpu);
-
-	    if (arityval(tp[0]) != 7 || tp[1] != am_cpu)
-		goto error;
-
-	    if (ix >= cpudata_size) {
-		cpudata_size += 100;
-		cpudata = erts_realloc(ERTS_ALC_T_TMP,
-				       cpudata,
-				       (sizeof(erts_cpu_topology_t)
-					* cpudata_size));
-	    }
-
-	    id = signed_val(tp[2]);
-	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
-		goto error;
-	    cpudata[ix].node = (int) id;
-
-	    id = signed_val(tp[3]);
-	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
-		goto error;
-	    cpudata[ix].processor = (int) id;
-
-	    id = signed_val(tp[4]);
-	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
-		goto error;
-	    cpudata[ix].processor_node = (int) id;
-
-	    id = signed_val(tp[5]);
-	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
-		goto error;
-	    cpudata[ix].core = (int) id;
-
-	    id = signed_val(tp[6]);
-	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
-		goto error;
-	    cpudata[ix].thread = (int) id;
-
-	    id = signed_val(tp[7]);
-	    if (id < -1 || ERTS_MAX_CPU_TOPOLOGY_ID < id)
-		goto error;
-	    cpudata[ix].logical = (int) id;
-
-	    list = CDR(lp);
-	    ix++;
-	}
-
-	if (is_not_nil(list))
-	    goto error;
-	
-	cpudata_size = ix;
-
-	if (ERTS_INIT_CPU_TOPOLOGY_OK != verify_topology(cpudata, cpudata_size))
-	    goto error;
-
-	if (user_cpudata_size != cpudata_size) {
-	    if (user_cpudata)
-		erts_free(ERTS_ALC_T_CPUDATA, user_cpudata);
-	    user_cpudata = erts_alloc(ERTS_ALC_T_CPUDATA,
-				      sizeof(erts_cpu_topology_t)*cpudata_size);
-	    user_cpudata_size = cpudata_size;
-	}
-
-	sys_memcpy((void *) user_cpudata,
-		   (void *) cpudata,
-		   sizeof(erts_cpu_topology_t)*cpudata_size);
-    }
-
-    signal_schedulers_bind_change(cpudata, cpudata_size);
-
- done:
-    erts_smp_rwmtx_rwunlock(&erts_cpu_bind_rwmtx);
-
-    if (cpudata)
-	erts_free(ERTS_ALC_T_TMP, cpudata);
-
-    return res;
-}
-
-static Eterm
-bound_schedulers_term(ErtsCpuBindOrder order)
-{
-    switch (order) {
-    case ERTS_CPU_BIND_SPREAD: {
-	ERTS_DECL_AM(spread);
-	return AM_spread;
-    }
-    case ERTS_CPU_BIND_PROCESSOR_SPREAD: {
-	ERTS_DECL_AM(processor_spread);
-	return AM_processor_spread;
-    }
-    case ERTS_CPU_BIND_THREAD_SPREAD: {
-	ERTS_DECL_AM(thread_spread);
-	return AM_thread_spread;
-    }
-    case ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD: {
-	ERTS_DECL_AM(thread_no_node_processor_spread);
-	return AM_thread_no_node_processor_spread;
-    }
-    case ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD: {
-	ERTS_DECL_AM(no_node_processor_spread);
-	return AM_no_node_processor_spread;
-    }
-    case ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD: {
-	ERTS_DECL_AM(no_node_thread_spread);
-	return AM_no_node_thread_spread;
-    }
-    case ERTS_CPU_BIND_NO_SPREAD: {
-	ERTS_DECL_AM(no_spread);
-	return AM_no_spread;
-    }
-    case ERTS_CPU_BIND_NONE: {
-	ERTS_DECL_AM(unbound);
-	return AM_unbound;
-    }
-    default:
-	ASSERT(0);
-	return THE_NON_VALUE;
-    }
-}
-
-Eterm
-erts_bound_schedulers_term(Process *c_p)
-{
-    ErtsCpuBindOrder order;
-    erts_smp_rwmtx_rlock(&erts_cpu_bind_rwmtx);
-    order = cpu_bind_order;
-    erts_smp_rwmtx_runlock(&erts_cpu_bind_rwmtx);
-    return bound_schedulers_term(order);
-}
-
-static void
-create_tmp_cpu_topology_copy(erts_cpu_topology_t **cpudata, int *cpudata_size)
-{
-    if (user_cpudata) {
-	*cpudata_size = user_cpudata_size;
-	*cpudata = erts_alloc(ERTS_ALC_T_TMP,
-			      (sizeof(erts_cpu_topology_t)
-			       * (*cpudata_size)));
-	sys_memcpy((void *) *cpudata,
-		   (void *) user_cpudata,
-		   sizeof(erts_cpu_topology_t)*(*cpudata_size));
-    }
-    else if (system_cpudata) {
-	*cpudata_size = system_cpudata_size;
-	*cpudata = erts_alloc(ERTS_ALC_T_TMP,
-			      (sizeof(erts_cpu_topology_t)
-			       * (*cpudata_size)));
-	sys_memcpy((void *) *cpudata,
-		   (void *) system_cpudata,
-		   sizeof(erts_cpu_topology_t)*(*cpudata_size));
-    }
-    else {
-	*cpudata = NULL;
-	*cpudata_size = 0;
-    }
-}
-
-static void
-destroy_tmp_cpu_topology_copy(erts_cpu_topology_t *cpudata)
-{
-    if (cpudata)
-	erts_free(ERTS_ALC_T_TMP, cpudata);
-}
-
-Eterm
-erts_bind_schedulers(Process *c_p, Eterm how)
-{
-    Eterm res;
-    erts_cpu_topology_t *cpudata;
-    int cpudata_size;
-    ErtsCpuBindOrder old_cpu_bind_order;
-
-    erts_smp_rwmtx_rwlock(&erts_cpu_bind_rwmtx);
-
-    if (erts_bind_to_cpu(erts_cpuinfo, -1) == -ENOTSUP) {
-	ERTS_BIF_PREP_ERROR(res, c_p, EXC_NOTSUP);
-    }
-    else {
-
-	old_cpu_bind_order = cpu_bind_order;
-
-	if (ERTS_IS_ATOM_STR("default_bind", how))
-	    cpu_bind_order = ERTS_CPU_BIND_DEFAULT_BIND;
-	else if (ERTS_IS_ATOM_STR("spread", how))
-	    cpu_bind_order = ERTS_CPU_BIND_SPREAD;
-	else if (ERTS_IS_ATOM_STR("processor_spread", how))
-	    cpu_bind_order = ERTS_CPU_BIND_PROCESSOR_SPREAD;
-	else if (ERTS_IS_ATOM_STR("thread_spread", how))
-	    cpu_bind_order = ERTS_CPU_BIND_THREAD_SPREAD;
-	else if (ERTS_IS_ATOM_STR("thread_no_node_processor_spread", how))
-	    cpu_bind_order = ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD;
-	else if (ERTS_IS_ATOM_STR("no_node_processor_spread", how))
-	    cpu_bind_order = ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD;
-	else if (ERTS_IS_ATOM_STR("no_node_thread_spread", how))
-	    cpu_bind_order = ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD;
-	else if (ERTS_IS_ATOM_STR("no_spread", how))
-	    cpu_bind_order = ERTS_CPU_BIND_NO_SPREAD;
-	else if (ERTS_IS_ATOM_STR("unbound", how))
-	    cpu_bind_order = ERTS_CPU_BIND_NONE;
-	else {
-	    cpu_bind_order = old_cpu_bind_order;
-	    ERTS_BIF_PREP_ERROR(res, c_p, BADARG);
-	    goto done;
-	}
-
-	create_tmp_cpu_topology_copy(&cpudata, &cpudata_size);
-
-	if (!cpudata) {
-	    cpu_bind_order = old_cpu_bind_order;
-	    ERTS_BIF_PREP_ERROR(res, c_p, BADARG);
-	    goto done;
-	}
-
-	signal_schedulers_bind_change(cpudata, cpudata_size);
-
-	destroy_tmp_cpu_topology_copy(cpudata);
-    
-	res = bound_schedulers_term(old_cpu_bind_order);
-    }
-
- done:
-
-    erts_smp_rwmtx_rwunlock(&erts_cpu_bind_rwmtx);
-
-    return res;
-}
-
-Eterm
-erts_fake_scheduler_bindings(Process *p, Eterm how)
-{
-    ErtsCpuBindOrder fake_cpu_bind_order;
-    erts_cpu_topology_t *cpudata;
-    int cpudata_size;
-    Eterm res;
-
-    if (ERTS_IS_ATOM_STR("default_bind", how))
-	fake_cpu_bind_order = ERTS_CPU_BIND_DEFAULT_BIND;
-    else if (ERTS_IS_ATOM_STR("spread", how))
-	fake_cpu_bind_order = ERTS_CPU_BIND_SPREAD;
-    else if (ERTS_IS_ATOM_STR("processor_spread", how))
-	fake_cpu_bind_order = ERTS_CPU_BIND_PROCESSOR_SPREAD;
-    else if (ERTS_IS_ATOM_STR("thread_spread", how))
-	fake_cpu_bind_order = ERTS_CPU_BIND_THREAD_SPREAD;
-    else if (ERTS_IS_ATOM_STR("thread_no_node_processor_spread", how))
-	fake_cpu_bind_order = ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD;
-    else if (ERTS_IS_ATOM_STR("no_node_processor_spread", how))
-	fake_cpu_bind_order = ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD;
-    else if (ERTS_IS_ATOM_STR("no_node_thread_spread", how))
-	fake_cpu_bind_order = ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD;
-    else if (ERTS_IS_ATOM_STR("no_spread", how))
-	fake_cpu_bind_order = ERTS_CPU_BIND_NO_SPREAD;
-    else if (ERTS_IS_ATOM_STR("unbound", how))
-	fake_cpu_bind_order = ERTS_CPU_BIND_NONE;
-    else {
-	ERTS_BIF_PREP_ERROR(res, p, BADARG);
-	return res;
-    }
-
-    erts_smp_rwmtx_rlock(&erts_cpu_bind_rwmtx);
-    create_tmp_cpu_topology_copy(&cpudata, &cpudata_size);
-    erts_smp_rwmtx_runlock(&erts_cpu_bind_rwmtx);
-
-    if (!cpudata || fake_cpu_bind_order == ERTS_CPU_BIND_NONE)
-	ERTS_BIF_PREP_RET(res, am_false);
-    else {
-	int i;
-	Eterm *hp;
-	
-	cpu_bind_order_sort(cpudata, cpudata_size, fake_cpu_bind_order, 1);
-
-#ifdef ERTS_FAKE_SCHED_BIND_PRINT_SORTED_CPU_DATA
-
-	erts_fprintf(stderr, "node:          ");
-	for (i = 0; i < cpudata_size; i++)
-	    erts_fprintf(stderr, " %2d", cpudata[i].node);
-	erts_fprintf(stderr, "\n");
-	erts_fprintf(stderr, "processor:     ");
-	for (i = 0; i < cpudata_size; i++)
-	    erts_fprintf(stderr, " %2d", cpudata[i].processor);
-	erts_fprintf(stderr, "\n");
-	if (fake_cpu_bind_order != ERTS_CPU_BIND_THREAD_NO_NODE_PROCESSOR_SPREAD
-	    && fake_cpu_bind_order != ERTS_CPU_BIND_NO_NODE_PROCESSOR_SPREAD
-	    && fake_cpu_bind_order != ERTS_CPU_BIND_NO_NODE_THREAD_SPREAD) {
-	    erts_fprintf(stderr, "processor_node:");
-	    for (i = 0; i < cpudata_size; i++)
-		erts_fprintf(stderr, " %2d", cpudata[i].processor_node);
-	    erts_fprintf(stderr, "\n");
-	}
-	erts_fprintf(stderr, "core:          ");
-	for (i = 0; i < cpudata_size; i++)
-	    erts_fprintf(stderr, " %2d", cpudata[i].core);
-	erts_fprintf(stderr, "\n");
-	erts_fprintf(stderr, "thread:        ");
-	for (i = 0; i < cpudata_size; i++)
-	    erts_fprintf(stderr, " %2d", cpudata[i].thread);
-	erts_fprintf(stderr, "\n");
-	erts_fprintf(stderr, "logical:       ");
-	for (i = 0; i < cpudata_size; i++)
-	    erts_fprintf(stderr, " %2d", cpudata[i].logical);
-	erts_fprintf(stderr, "\n");
-#endif
-
-	hp = HAlloc(p, cpudata_size+1);
-	ERTS_BIF_PREP_RET(res, make_tuple(hp));
-	*hp++ = make_arityval((Uint) cpudata_size);
-	for (i = 0; i < cpudata_size; i++)
-	    *hp++ = make_small((Uint) cpudata[i].logical);
-    }
-
-    destroy_tmp_cpu_topology_copy(cpudata);
-
-    return res;
-}
-
-Eterm
-erts_get_schedulers_binds(Process *c_p)
-{
-    int ix;
-    ERTS_DECL_AM(unbound);
-    Eterm *hp = HAlloc(c_p, erts_no_schedulers+1);
-    Eterm res = make_tuple(hp);
-
-    *(hp++) = make_arityval(erts_no_schedulers);
-    erts_smp_rwmtx_rlock(&erts_cpu_bind_rwmtx);
-    for (ix = 1; ix <= erts_no_schedulers; ix++)
-	*(hp++) = (scheduler2cpu_map[ix].bound_id >= 0
-		   ? make_small(scheduler2cpu_map[ix].bound_id)
-		   : AM_unbound);
-    erts_smp_rwmtx_runlock(&erts_cpu_bind_rwmtx);
-    return res;
-}
-
-static Eterm
-bld_topology_term(Eterm **hpp,
-		  Uint *hszp,
-		  erts_cpu_topology_t *cpudata,
-		  int size)
-{
-    Eterm res = NIL;
-    int i;
-
-    if (size == 0)
-	return am_undefined;
-
-    for (i = size-1; i >= 0; i--) {
-	res = erts_bld_cons(hpp,
-			    hszp,
-			    erts_bld_tuple(hpp,
-					   hszp,
-					   7,
-					   am_cpu,
-					   make_small(cpudata[i].node),
-					   make_small(cpudata[i].processor),
-					   make_small(cpudata[i].processor_node),
-					   make_small(cpudata[i].core),
-					   make_small(cpudata[i].thread),
-					   make_small(cpudata[i].logical)),
-			    res);
-    }
-    return res;
-}
-
-static Eterm
-get_cpu_topology_term(Process *c_p, int type)
-{
-#ifdef DEBUG
-    Eterm *hp_end;
-#endif
-    Eterm *hp;
-    Uint hsz;
-    Eterm res = THE_NON_VALUE;
-    erts_cpu_topology_t *cpudata = NULL;
-    int size = 0;
-
-    switch (type) {
-    case ERTS_GET_USED_CPU_TOPOLOGY:
-	if (user_cpudata)
-	    goto defined;
-	else
-	    goto detected;
-    case ERTS_GET_DETECTED_CPU_TOPOLOGY:
-    detected:
-	if (!system_cpudata)
-	    res = am_undefined;
-	else {
-	    size = system_cpudata_size;
-	    cpudata = erts_alloc(ERTS_ALC_T_TMP,
-				 (sizeof(erts_cpu_topology_t)
-				  * size));
-	    sys_memcpy((void *) cpudata,
-		       (void *) system_cpudata,
-		       sizeof(erts_cpu_topology_t)*size);
-	}
-	break;
-    case ERTS_GET_DEFINED_CPU_TOPOLOGY:
-    defined:
-	if (!user_cpudata)
-	    res = am_undefined;
-	else {
-	    size = user_cpudata_size;
-	    cpudata = user_cpudata;
-	}
-	break;
-    default:
-	erl_exit(ERTS_ABORT_EXIT, "Bad cpu topology type: %d\n", type);
-	break;
-    }
-
-    if (res == am_undefined) {
-	ASSERT(!cpudata);
-	return res;
-    }
-
-    hsz = 0;
-
-    bld_topology_term(NULL, &hsz,
-		      cpudata, size);
-
-    hp = HAlloc(c_p, hsz);
-
-#ifdef DEBUG
-    hp_end = hp + hsz;
-#endif
-
-    res = bld_topology_term(&hp, NULL,
-			    cpudata, size);
-
-    ASSERT(hp_end == hp);
-
-    if (cpudata && cpudata != system_cpudata && cpudata != user_cpudata)
-	erts_free(ERTS_ALC_T_TMP, cpudata);
-
-    return res;
-}
-
-Eterm
-erts_get_cpu_topology_term(Process *c_p, Eterm which)
-{
-    Eterm res;
-    int type;
-    erts_smp_rwmtx_rlock(&erts_cpu_bind_rwmtx);
-    if (ERTS_IS_ATOM_STR("used", which))
-	type = ERTS_GET_USED_CPU_TOPOLOGY;
-    else if (ERTS_IS_ATOM_STR("detected", which))
-	type = ERTS_GET_DETECTED_CPU_TOPOLOGY;
-    else if (ERTS_IS_ATOM_STR("defined", which))
-	type = ERTS_GET_DEFINED_CPU_TOPOLOGY;
-    else
-	type = ERTS_GET_CPU_TOPOLOGY_ERROR;
-    if (type == ERTS_GET_CPU_TOPOLOGY_ERROR)
-	res = THE_NON_VALUE;
-    else
-	res = get_cpu_topology_term(c_p, type);
-    erts_smp_rwmtx_runlock(&erts_cpu_bind_rwmtx);
-    return res;
-}
-
-static void
-early_cpu_bind_init(void)
-{
-    user_cpudata = NULL;
-    user_cpudata_size = 0;
-
-    system_cpudata_size = erts_get_cpu_topology_size(erts_cpuinfo);
-    system_cpudata = erts_alloc(ERTS_ALC_T_CPUDATA,
-				(sizeof(erts_cpu_topology_t)
-				 * system_cpudata_size));
-
-    cpu_bind_order = ERTS_CPU_BIND_UNDEFINED;
-
-    if (!erts_get_cpu_topology(erts_cpuinfo, system_cpudata)
-	|| ERTS_INIT_CPU_TOPOLOGY_OK != verify_topology(system_cpudata,
-							system_cpudata_size)) {
-	erts_free(ERTS_ALC_T_CPUDATA, system_cpudata);
-	system_cpudata = NULL;
-	system_cpudata_size = 0;
-    }
-}
-
-static void
-late_cpu_bind_init(void)
-{
-    int ix;
-
-    erts_smp_rwmtx_init(&erts_cpu_bind_rwmtx, "cpu_bind");
-
-    scheduler2cpu_map = erts_alloc(ERTS_ALC_T_CPUDATA,
-				   (sizeof(ErtsCpuBindData)
-				    * (erts_no_schedulers+1)));
-    for (ix = 1; ix <= erts_no_schedulers; ix++) {
-	scheduler2cpu_map[ix].bind_id = -1;
-	scheduler2cpu_map[ix].bound_id = -1;
-    }
-
-    if (cpu_bind_order == ERTS_CPU_BIND_UNDEFINED) {
-	int ncpus = erts_get_cpu_configured(erts_cpuinfo);
-	if (ncpus < 1 || erts_no_schedulers < ncpus)
-	    cpu_bind_order = ERTS_CPU_BIND_NONE;
-	else
-	    cpu_bind_order = ((system_cpudata || user_cpudata)
-			      && (erts_bind_to_cpu(erts_cpuinfo, -1) != -ENOTSUP)
-			      ? ERTS_CPU_BIND_DEFAULT_BIND
-			      : ERTS_CPU_BIND_NONE);
-    }
-
-    if (cpu_bind_order != ERTS_CPU_BIND_NONE) {
-	erts_cpu_topology_t *cpudata;
-	int cpudata_size;
-	create_tmp_cpu_topology_copy(&cpudata, &cpudata_size);
-	ASSERT(cpudata);
-	signal_schedulers_bind_change(cpudata, cpudata_size);
-	destroy_tmp_cpu_topology_copy(cpudata);
-    }
-}
-
 #ifdef ERTS_SMP
 
 static void
@@ -5361,7 +4643,7 @@ dequeue_process(ErtsRunQueue *runq, Process *p)
 }
 
 /* schedule a process */
-static ERTS_INLINE void
+static ERTS_INLINE ErtsRunQueue *
 internal_add_to_runq(ErtsRunQueue *runq, Process *p)
 {
     Uint32 prev_status = p->status;
@@ -5372,12 +4654,12 @@ internal_add_to_runq(ErtsRunQueue *runq, Process *p)
     ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(runq));
 
     if (p->status_flags & ERTS_PROC_SFLG_INRUNQ)
-	return;
+	return NULL;
     else if (p->runq_flags & ERTS_PROC_RUNQ_FLG_RUNNING) {
 	ASSERT(p->status != P_SUSPENDED);
 	ERTS_DBG_CHK_PROCS_RUNQ_NOPROC(runq, p);
 	p->status_flags |= ERTS_PROC_SFLG_PENDADD2SCHEDQ;
-	return;
+	return NULL;
     }
     ASSERT(!p->scheduler_data);
 #endif
@@ -5416,20 +4698,23 @@ internal_add_to_runq(ErtsRunQueue *runq, Process *p)
     	profile_runnable_proc(p, am_active);
     }
 
-    smp_notify_inc_runq(add_runq);
-
     if (add_runq != runq)
 	erts_smp_runq_unlock(add_runq);
+
+    return add_runq;
 }
 
 
 void
 erts_add_to_runq(Process *p)
 {
+    ErtsRunQueue *notify_runq;
     ErtsRunQueue *runq = erts_get_runq_proc(p);
     erts_smp_runq_lock(runq);
-    internal_add_to_runq(runq, p);
+    notify_runq = internal_add_to_runq(runq, p);
     erts_smp_runq_unlock(runq);
+    smp_notify_inc_runq(notify_runq);
+
 }
 
 /* Possibly remove a scheduled process we need to suspend */
@@ -5568,8 +4853,6 @@ erts_proc_migrate(Process *p, ErtsProcLocks *plcks,
     p->run_queue = to_rq;
     enqueue_process(to_rq, p);
 
-    smp_notify_inc_runq(to_rq);
-
     return ERTS_MIGRATE_SUCCESS;
 }
 #endif /* ERTS_SMP */
@@ -5766,30 +5049,6 @@ erts_set_process_priority(Process *p, Eterm new_value)
     return old_value;
 }
 
-#ifdef ERTS_SMP
-
-static ERTS_INLINE int
-prepare_for_sys_schedule(void)
-{
-    while (!erts_port_task_have_outstanding_io_tasks()
-	   && !erts_smp_atomic_xchg(&doing_sys_schedule, 1)) {
-	if (!erts_port_task_have_outstanding_io_tasks())
-	    return 1;
-	erts_smp_atomic_set(&doing_sys_schedule, 0);
-    }
-    return 0;
-}
-
-#else
-
-static ERTS_INLINE int
-prepare_for_sys_schedule(void)
-{
-    return !erts_port_task_have_outstanding_io_tasks();
-}
-
-#endif
-
 /* note that P_RUNNING is only set so that we don't try to remove
 ** running processes from the schedule queue if they exit - a running
 ** process not being in the schedule queue!! 
@@ -5819,10 +5078,10 @@ Process *schedule(Process *p, int calls)
 {
     ErtsRunQueue *rq;
     ErtsRunPrioQueue *rpq;
-    long dt;
+    erts_aint_t dt;
     ErtsSchedulerData *esdp;
     int context_reds;
-    long fcalls;
+    int fcalls;
     int input_reductions;
     int actual_reds;
     int reds;
@@ -5845,7 +5104,7 @@ Process *schedule(Process *p, int calls)
 	esdp = erts_get_scheduler_data();
 	rq = erts_get_runq_current(esdp);
 	ASSERT(esdp);
-	fcalls = erts_smp_atomic_read(&function_calls);
+	fcalls = (int) erts_smp_atomic32_read(&function_calls);
 	actual_reds = reds = 0;
 	erts_smp_runq_lock(rq);
     } else {
@@ -5863,7 +5122,7 @@ Process *schedule(Process *p, int calls)
 	    reds = ERTS_PROC_MIN_CONTEXT_SWITCH_REDS_COST;
 	esdp->virtual_reds = 0;
 
-	fcalls = erts_smp_atomic_addtest(&function_calls, reds);
+	fcalls = (int) erts_smp_atomic32_addtest(&function_calls, reds);
 	ASSERT(esdp && esdp == erts_get_scheduler_data());
 
 	rq = erts_get_runq_current(esdp);
@@ -5924,8 +5183,11 @@ Process *schedule(Process *p, int calls)
 	p->status_flags &= ~ERTS_PROC_SFLG_RUNNING;
 
 	if (p->status_flags & ERTS_PROC_SFLG_PENDADD2SCHEDQ) {
+	    ErtsRunQueue *notify_runq;
 	    p->status_flags &= ~ERTS_PROC_SFLG_PENDADD2SCHEDQ;
-	    internal_add_to_runq(rq, p);
+	    notify_runq = internal_add_to_runq(rq, p);
+	    if (notify_runq != rq)
+		smp_notify_inc_runq(notify_runq);
 	}
 #endif
 
@@ -5961,10 +5223,10 @@ Process *schedule(Process *p, int calls)
 
 	ERTS_SMP_CHK_NO_PROC_LOCKS;
 
-	dt = do_time_read_and_reset();
+	dt = erts_do_time_read_and_reset();
 	if (dt) {
 	    erts_smp_runq_unlock(rq);
-	    bump_timer(dt);
+	    erts_bump_timer(dt);
 	    erts_smp_runq_lock(rq);
 	}
 	BM_STOP_TIMER(system);
@@ -5993,21 +5255,33 @@ Process *schedule(Process *p, int calls)
 			 | ERTS_RUNQ_FLG_CHK_CPU_BIND
 			 | ERTS_RUNQ_FLG_SUSPENDED)) {
 	    if ((rq->flags & ERTS_RUNQ_FLG_SUSPENDED)
-		|| erts_smp_atomic_read(&esdp->suspended)) {
+		|| (erts_smp_atomic32_read(&esdp->ssi->flags)
+		    & ERTS_SSI_FLG_SUSPENDED)) {
+		ASSERT(erts_smp_atomic32_read(&esdp->ssi->flags)
+		       & ERTS_SSI_FLG_SUSPENDED);
 		suspend_scheduler(esdp);
 	    }
 	    if ((rq->flags & ERTS_RUNQ_FLG_CHK_CPU_BIND)
-		|| erts_smp_atomic_read(&esdp->chk_cpu_bind)) {
-		check_cpu_bind(esdp);
+		|| erts_smp_atomic32_read(&esdp->chk_cpu_bind)) {
+		erts_sched_check_cpu_bind(esdp);
 	    }
 	}
 
-#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
-	if (esdp->check_children) {
-	    esdp->check_children = 0;
-	    erts_smp_runq_unlock(rq);
-	    erts_check_children();
-	    erts_smp_runq_lock(rq);
+#if defined(ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK) \
+	|| defined(ERTS_SCHED_NEED_NONBLOCKABLE_AUX_WORK)
+	{
+	    ErtsSchedulerSleepInfo *ssi = esdp->ssi;
+	    erts_aint32_t aux_work = erts_smp_atomic32_read(&ssi->aux_work);
+	    if (aux_work) {
+		erts_smp_runq_unlock(rq);
+#ifdef ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK
+		aux_work = blockable_aux_work(esdp, ssi, aux_work);
+#endif
+#ifdef ERTS_SCHED_NEED_NONBLOCKABLE_AUX_WORK
+		nonblockable_aux_work(esdp, ssi, aux_work);
+#endif
+		erts_smp_runq_lock(rq);
+	    }
 	}
 #endif
 
@@ -6039,7 +5313,10 @@ Process *schedule(Process *p, int calls)
 	    if (rq->flags & (ERTS_RUNQ_FLG_SHARED_RUNQ
 			     | ERTS_RUNQ_FLG_SUSPENDED)) {
 		if ((rq->flags & ERTS_RUNQ_FLG_SUSPENDED)
-		    || erts_smp_atomic_read(&esdp->suspended)) {
+		    || (erts_smp_atomic32_read(&esdp->ssi->flags)
+			& ERTS_SSI_FLG_SUSPENDED)) {
+		    ASSERT(erts_smp_atomic32_read(&esdp->ssi->flags)
+			   & ERTS_SSI_FLG_SUSPENDED);
 		    non_empty_runq(rq);
 		    goto continue_check_activities_to_run;
 		}
@@ -6056,17 +5333,7 @@ Process *schedule(Process *p, int calls)
 		}
 	    }
 
-	    if (prepare_for_sys_schedule()) {
-		erts_smp_atomic_set(&function_calls, 0);
-		fcalls = 0;
-		sched_sys_wait(esdp->no, rq);
-		erts_smp_atomic_set(&doing_sys_schedule, 0);
-	    }
-	    else {
-		/* If all schedulers are waiting, one of them *should*
-		   be waiting in erl_sys_schedule() */
-		sched_cnd_wait(esdp->no, rq);
-	    }
+	    scheduler_wait(&fcalls, esdp, rq);
 
 	    non_empty_runq(rq);
 
@@ -6090,19 +5357,21 @@ Process *schedule(Process *p, int calls)
 	     * Schedule system-level activities.
 	     */
 
-	    erts_smp_atomic_set(&function_calls, 0);
+	    erts_smp_atomic32_set(&function_calls, 0);
 	    fcalls = 0;
+
 	    ASSERT(!erts_port_task_have_outstanding_io_tasks());
+
 #ifdef ERTS_SMP
 	    /* erts_sys_schedule_interrupt(0); */
 #endif
 	    erts_smp_runq_unlock(rq);
 	    erl_sys_schedule(runnable);
-	    dt = do_time_read_and_reset();
-	    if (dt) bump_timer(dt);
+	    dt = erts_do_time_read_and_reset();
+	    if (dt) erts_bump_timer(dt);
 #ifdef ERTS_SMP
 	    erts_smp_runq_lock(rq);
-	    erts_smp_atomic_set(&doing_sys_schedule, 0);
+	    erts_smp_atomic32_set(&doing_sys_schedule, 0);
 	    goto continue_check_activities_to_run;
 #else
 	    if (!runnable)
@@ -6123,14 +5392,14 @@ Process *schedule(Process *p, int calls)
 		    if (rq->wakeup_other < 0)
 			rq->wakeup_other = 0;
 		}
-		else if (rq->wakeup_other < ERTS_WAKEUP_OTHER_LIMIT)
+		else if (rq->wakeup_other < wakeup_other_limit)
 		    rq->wakeup_other += rq->len*wo_reds + ERTS_WAKEUP_OTHER_FIXED_INC;
 		else {
 		    if (erts_common_run_queue) {
 			if (erts_common_run_queue->waiting)
-			    wake_one_scheduler();
+			    wake_scheduler(erts_common_run_queue, 0, 1);
 		    }
-		    else if (erts_smp_atomic_read(&no_empty_run_queues) != 0) {
+		    else if (erts_smp_atomic32_read(&no_empty_run_queues) != 0) {
 			wake_scheduler_on_empty_runq(rq);
 			rq->wakeup_other = 0;
 		    }
@@ -6424,6 +5693,15 @@ erts_schedule_misc_op(void (*func)(void *), void *arg)
     ErtsRunQueue *rq = erts_get_runq_current(NULL);
     ErtsMiscOpList *molp = misc_op_list_alloc();
 
+    if (!rq) {
+	/*
+	 * This can only happen when the sys msg dispatcher
+	 * thread schedules misc ops (this happens *very*
+	 * seldom; only when trace drivers are unloaded).
+	 */
+	rq =  ERTS_RUNQ_IX(0);
+    }
+
     erts_smp_runq_lock(rq);
 
     while (rq->misc.evac_runq) {
@@ -6443,8 +5721,8 @@ erts_schedule_misc_op(void (*func)(void *), void *arg)
     else
 	rq->misc.start = molp;
     rq->misc.end = molp;
-    smp_notify_inc_runq(rq);
     erts_smp_runq_unlock(rq);
+    smp_notify_inc_runq(rq);
 }
 
 static void
@@ -6578,7 +5856,7 @@ erts_test_next_pid(int set, Uint next)
 
 Uint erts_process_count(void)
 {
-    long res = erts_smp_atomic_read(&process_count);
+    erts_aint32_t res = erts_smp_atomic32_read(&process_count);
     ASSERT(res >= 0);
     return (Uint) res;
 }
@@ -6627,7 +5905,7 @@ alloc_process(void)
     ASSERT(!process_tab[p_next]);
 
     process_tab[p_next] = p;
-    erts_smp_atomic_inc(&process_count);
+    erts_smp_atomic32_inc(&process_count);
     p->id = make_internal_pid(p_serial << p_serial_shift | p_next);
     if (p->id == ERTS_INVALID_PID) {
 	/* Do not use the invalid pid; change serial */
@@ -6686,7 +5964,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 		   Eterm args,	/* Arguments for function (must be well-formed list). */
 		   ErlSpawnOpts* so) /* Options for spawn. */
 {
-    ErtsRunQueue *rq;
+    ErtsRunQueue *rq, *notify_runq;
     Process *p;
     Sint arity;			/* Number of arguments. */
 #ifndef HYBRID
@@ -6753,7 +6031,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 	p->min_heap_size  = H_MIN_SIZE;
 	p->min_vheap_size = BIN_VH_MIN_SIZE;
 	p->prio           = PRIORITY_NORMAL;
-	p->max_gen_gcs    = (Uint16) erts_smp_atomic_read(&erts_max_gen_gcs);
+	p->max_gen_gcs    = (Uint16) erts_smp_atomic32_read(&erts_max_gen_gcs);
     }
     p->skipped = 0;
     ASSERT(p->min_heap_size == erts_next_heap_size(p->min_heap_size, 0));
@@ -6765,11 +6043,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     /*
      * Must initialize binary lists here before copying binaries to process.
      */
-    p->off_heap.mso = NULL;
-#ifndef HYBRID /* FIND ME! */
-    p->off_heap.funs = NULL;
-#endif
-    p->off_heap.externals = NULL;
+    p->off_heap.first = NULL;
     p->off_heap.overhead = 0;
 
     heap_need +=
@@ -6803,6 +6077,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     p->bin_vheap_sz     = p->min_vheap_size;
     p->bin_old_vheap_sz = p->min_vheap_size;
     p->bin_old_vheap    = 0;
+    p->bin_vheap_mature = 0;
 
     /* No need to initialize p->fcalls. */
 
@@ -6859,7 +6134,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 	p->group_leader =
 	    IS_CONST(parent->group_leader)
 	    ? parent->group_leader
-	    : STORE_NC(&p->htop, &p->off_heap.externals, parent->group_leader);
+	    : STORE_NC(&p->htop, &p->off_heap, parent->group_leader);
     }
 
     erts_get_default_tracing(&p->trace_flags, &p->tracer_proc);
@@ -7003,10 +6278,12 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 #endif
 
     p->status = P_WAITING;
-    internal_add_to_runq(rq, p);
+    notify_runq = internal_add_to_runq(rq, p);
 
     erts_smp_runq_unlock(rq);
 
+    smp_notify_inc_runq(notify_runq);
+
     res = p->id;
     erts_smp_proc_unlock(p, ERTS_PROC_LOCKS_ALL);
 
@@ -7053,6 +6330,7 @@ void erts_init_empty_process(Process *p)
     p->bin_vheap_sz = BIN_VH_MIN_SIZE;
     p->bin_old_vheap_sz = BIN_VH_MIN_SIZE;
     p->bin_old_vheap = 0;
+    p->bin_vheap_mature = 0;
 #ifdef ERTS_SMP
     p->u.ptimer = NULL;
     p->bound_runq = NULL;
@@ -7060,11 +6338,7 @@ void erts_init_empty_process(Process *p)
     memset(&(p->u.tm), 0, sizeof(ErlTimer));
 #endif
     p->next = NULL;
-    p->off_heap.mso = NULL;
-#ifndef HYBRID /* FIND ME! */
-    p->off_heap.funs = NULL;
-#endif
-    p->off_heap.externals = NULL;
+    p->off_heap.first = NULL;
     p->off_heap.overhead = 0;
     p->reg = NULL;
     p->heap_sz = 0;
@@ -7211,11 +6485,7 @@ erts_debug_verify_clean_empty_process(Process* p)
 
     /* Thing that erts_cleanup_empty_process() cleans up */
 
-    ASSERT(p->off_heap.mso == NULL);
-#ifndef HYBRID /* FIND ME! */
-    ASSERT(p->off_heap.funs == NULL);
-#endif
-    ASSERT(p->off_heap.externals == NULL);
+    ASSERT(p->off_heap.first == NULL);
     ASSERT(p->off_heap.overhead == 0);
 
     ASSERT(p->mbuf == NULL);
@@ -7229,11 +6499,7 @@ erts_cleanup_empty_process(Process* p)
     /* We only check fields that are known to be used... */
 
     erts_cleanup_offheap(&p->off_heap);
-    p->off_heap.mso = NULL;
-#ifndef HYBRID /* FIND ME! */
-    p->off_heap.funs = NULL;
-#endif
-    p->off_heap.externals = NULL;
+    p->off_heap.first = NULL;
     p->off_heap.overhead = 0;
 
     if (p->mbuf != NULL) {
@@ -7270,7 +6536,7 @@ delete_process(Process* p)
      * The mso list should not be used anymore, but if it is, make sure that
      * we'll notice.
      */
-    p->off_heap.mso = (void *) 0x8DEFFACD;
+    p->off_heap.first = (void *) 0x8DEFFACD;
 
     if (p->arg_reg != p->def_arg_reg) {
 	erts_free(ERTS_ALC_T_ARG_REG, p->arg_reg);
@@ -7818,11 +7084,11 @@ static void doit_exit_monitor(ErtsMonitor *mon, void *vpcontext)
 	    DeclareTmpHeapNoproc(lhp,3);
 	    ErtsProcLocks rp_locks = (ERTS_PROC_LOCK_LINK
 				      | ERTS_PROC_LOCKS_MSG_SEND);
-	    UseTmpHeapNoproc(3);
 	    rp = erts_pid2proc(NULL, 0, mon->pid, rp_locks);
 	    if (rp == NULL) {
 		goto done;
 	    }
+	    UseTmpHeapNoproc(3);
 	    rmon = erts_remove_monitor(&(rp->monitors),mon->ref);
 	    if (rmon) {
 		erts_destroy_monitor(rmon);
@@ -8222,8 +7488,8 @@ continue_exit_process(Process *p
 	p->status_flags = 0;
 #endif
 	process_tab[pix] = NULL; /* Time of death! */
-	ASSERT(erts_smp_atomic_read(&process_count) > 0);
-	erts_smp_atomic_dec(&process_count);
+	ASSERT(erts_smp_atomic32_read(&process_count) > 0);
+	erts_smp_atomic32_dec(&process_count);
 
 #ifdef ERTS_SMP
 	erts_pix_unlock(pix_lock);
@@ -8363,7 +7629,7 @@ cancel_timer(Process* p)
 #ifdef ERTS_SMP
     erts_cancel_smp_ptimer(p->u.ptimer);
 #else
-    erl_cancel_timer(&p->u.tm);
+    erts_cancel_timer(&p->u.tm);
 #endif
 }
 
@@ -8389,7 +7655,7 @@ set_timer(Process* p, Uint timeout)
 			   (ErlTimeoutProc) timeout_proc,
 			   timeout);
 #else
-    erl_set_timer(&p->u.tm,
+    erts_set_timer(&p->u.tm,
 		  (ErlTimeoutProc) timeout_proc,
 		  NULL,
 		  (void*) p,
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index 8f9f7f004e..e871a9834a 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -28,6 +28,12 @@
 #define ERTS_INCLUDE_SCHEDULER_INTERNALS
 #endif
 
+/* #define ERTS_DO_VERIFY_UNUSED_TEMP_ALLOC */
+
+#if !defined(ERTS_DO_VERIFY_UNUSED_TEMP_ALLOC) && defined(DEBUG)
+#  define ERTS_DO_VERIFY_UNUSED_TEMP_ALLOC
+#endif
+
 typedef struct process Process;
 
 #include "sys.h"
@@ -174,8 +180,8 @@ extern int erts_sched_thread_suggested_stack_size;
 #define ERTS_UNSET_RUNQ_FLG_EVACUATE(FLGS, PRIO) \
   ((FLGS) &= ~ERTS_RUNQ_FLG_EVACUATE((PRIO)))
 
-#define ERTS_RUNQ_IFLG_SUSPENDED		(((long) 1) << 0)
-#define ERTS_RUNQ_IFLG_NONEMPTY			(((long) 1) << 1)
+#define ERTS_RUNQ_IFLG_SUSPENDED		(((erts_aint32_t) 1) << 0)
+#define ERTS_RUNQ_IFLG_NONEMPTY			(((erts_aint32_t) 1) << 1)
 
 
 #ifdef DEBUG
@@ -219,6 +225,49 @@ typedef enum {
     ERTS_MIGRATE_FAILED_RUNQ_SUSPENDED
 } ErtsMigrateResult;
 
+#define ERTS_SSI_FLG_SLEEPING		(((erts_aint32_t) 1) << 0)
+#define ERTS_SSI_FLG_POLL_SLEEPING 	(((erts_aint32_t) 1) << 1)
+#define ERTS_SSI_FLG_TSE_SLEEPING 	(((erts_aint32_t) 1) << 2)
+#define ERTS_SSI_FLG_WAITING		(((erts_aint32_t) 1) << 3)
+#define ERTS_SSI_FLG_SUSPENDED	 	(((erts_aint32_t) 1) << 4)
+
+#define ERTS_SSI_FLGS_SLEEP_TYPE			\
+ (ERTS_SSI_FLG_TSE_SLEEPING|ERTS_SSI_FLG_POLL_SLEEPING)
+
+#define ERTS_SSI_FLGS_SLEEP				\
+ (ERTS_SSI_FLG_SLEEPING|ERTS_SSI_FLGS_SLEEP_TYPE)
+
+#define ERTS_SSI_FLGS_ALL				\
+ (ERTS_SSI_FLGS_SLEEP					\
+  | ERTS_SSI_FLG_WAITING				\
+  | ERTS_SSI_FLG_SUSPENDED)
+
+#define ERTS_SCHED_NEED_BLOCKABLE_AUX_WORK
+
+#define ERTS_SSI_AUX_WORK_CHECK_CHILDREN	(((erts_aint32_t) 1) << 0)
+#define ERTS_SSI_AUX_WORK_MISC			(((erts_aint32_t) 1) << 1)
+
+#define ERTS_SSI_BLOCKABLE_AUX_WORK_MASK \
+  (ERTS_SSI_AUX_WORK_CHECK_CHILDREN \
+   | ERTS_SSI_AUX_WORK_MISC)
+#define ERTS_SSI_NONBLOCKABLE_AUX_WORK_MASK \
+  (0)
+
+typedef struct ErtsSchedulerSleepInfo_ ErtsSchedulerSleepInfo;
+
+typedef struct {
+    erts_smp_spinlock_t lock;
+    ErtsSchedulerSleepInfo *list;
+} ErtsSchedulerSleepList;
+
+struct ErtsSchedulerSleepInfo_ {
+    ErtsSchedulerSleepInfo *next;
+    ErtsSchedulerSleepInfo *prev;
+    erts_smp_atomic32_t flags;
+    erts_tse_t *event;
+    erts_smp_atomic32_t aux_work;
+};
+
 /* times to reschedule low prio process before running */
 #define RESCHEDULE_LOW        8
 
@@ -266,13 +315,14 @@ typedef struct {
 
 struct ErtsRunQueue_ {
     int ix;
-    erts_smp_atomic_t info_flags;
+    erts_smp_atomic32_t info_flags;
 
     erts_smp_mtx_t mtx;
     erts_smp_cnd_t cnd;
 
-    erts_smp_atomic_t spin_waiter;
-    erts_smp_atomic_t spin_wake;
+#ifdef ERTS_SMP
+    ErtsSchedulerSleepList sleepers;
+#endif
 
     ErtsSchedulerData *scheduler;
     int waiting; /* < 0 in sys schedule; > 0 on cnd variable */
@@ -353,6 +403,7 @@ struct ErtsSchedulerData_ {
     ethr_tid tid;		/* Thread id */
     struct erl_bits_state erl_bits_state; /* erl_bits.c state */
     void *match_pseudo_process; /* erl_db_util.c:db_prog_match() */
+    ErtsSchedulerSleepInfo *ssi;
     Process *free_process;
 #endif
 #if !HEAP_ON_C_STACK
@@ -374,15 +425,22 @@ struct ErtsSchedulerData_ {
 
 #ifdef ERTS_SMP
     /* NOTE: These fields are modified under held mutexes by other threads */
-#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
-    int check_children; /* run queue mutex */
-    int blocked_check_children; /* schdlr_sspnd mutex */
+    erts_smp_atomic32_t chk_cpu_bind; /* Only used when common run queue */
 #endif
-    erts_smp_atomic_t suspended; /* Only used when common run queue */
-    erts_smp_atomic_t chk_cpu_bind; /* Only used when common run queue */
+
+#ifdef ERTS_DO_VERIFY_UNUSED_TEMP_ALLOC
+    erts_alloc_verify_func_t verify_unused_temp_alloc;
+    Allctr_t *verify_unused_temp_alloc_data;
 #endif
 };
 
+typedef union {
+    ErtsSchedulerData esd;
+    char align[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(ErtsSchedulerData))];
+} ErtsAlignedSchedulerData;
+
+extern ErtsAlignedSchedulerData *erts_aligned_scheduler_data;
+
 #ifndef ERTS_SMP
 extern ErtsSchedulerData *erts_scheduler_data;
 #endif
@@ -494,6 +552,7 @@ struct ErtsPendingSuspend_ {
 
 #  define MIN_VHEAP_SIZE(p)   (p)->min_vheap_size
 #  define BIN_VHEAP_SZ(p)     (p)->bin_vheap_sz
+#  define BIN_VHEAP_MATURE(p) (p)->bin_vheap_mature
 #  define BIN_OLD_VHEAP_SZ(p) (p)->bin_old_vheap_sz
 #  define BIN_OLD_VHEAP(p)    (p)->bin_old_vheap
 
@@ -611,9 +670,10 @@ struct process {
     Uint mbuf_sz;		/* Size of all message buffers */
     ErtsPSD *psd;		/* Rarely used process specific data */
 
-    Uint bin_vheap_sz;		/* Virtual heap block size for binaries */
-    Uint bin_old_vheap_sz;	/* Virtual old heap block size for binaries */
-    Uint bin_old_vheap;		/* Virtual old heap size for binaries */
+    Uint64 bin_vheap_sz;	/* Virtual heap block size for binaries */
+    Uint64 bin_vheap_mature;	/* Virtual heap block size for binaries */
+    Uint64 bin_old_vheap_sz;	/* Virtual old heap block size for binaries */
+    Uint64 bin_old_vheap;	/* Virtual old heap size for binaries */
 
     union {
 #ifdef ERTS_SMP
@@ -775,7 +835,7 @@ ERTS_GLB_INLINE void erts_heap_frag_shrink(Process* p, Eterm* hp)
 }	
 #endif /* inline */
 
-Eterm* erts_heap_alloc(Process* p, Uint need);
+Eterm* erts_heap_alloc(Process* p, Uint need, Uint xtra);
 #ifdef CHECK_FOR_HOLES
 Eterm* erts_set_hole_marker(Eterm* ptr, Uint sz);
 #endif
@@ -828,7 +888,7 @@ extern struct erts_system_profile_flags_t erts_system_profile_flags;
 #define F_INSLPQUEUE         (1 <<  1) /* Set if in timer queue */
 #define F_TIMO               (1 <<  2) /* Set if timeout */
 #define F_HEAP_GROW          (1 <<  3)
-#define F_NEED_FULLSWEEP     (1 <<  4) /* If process has old binaries & funs. */
+#define F_NEED_FULLSWEEP     (1 <<  4)
 #define F_USING_DB           (1 <<  5) /* If have created tables */
 #define F_DISTRIBUTION       (1 <<  6) /* Process used in distribution */
 #define F_USING_DDLL         (1 <<  7) /* Process has used the DDLL interface */
@@ -962,26 +1022,12 @@ extern struct erts_system_profile_flags_t erts_system_profile_flags;
 	    (p)->flags &= ~F_TIMO; \
     } while (0)
 
-
-#define ERTS_INIT_SCHED_BIND_TYPE_SUCCESS		0
-#define ERTS_INIT_SCHED_BIND_TYPE_NOT_SUPPORTED		1
-#define ERTS_INIT_SCHED_BIND_TYPE_ERROR_NO_CPU_TOPOLOGY	2
-#define ERTS_INIT_SCHED_BIND_TYPE_ERROR_NO_BAD_TYPE	3
-
-int erts_init_scheduler_bind_type(char *how);
-
-#define ERTS_INIT_CPU_TOPOLOGY_OK			0
-#define ERTS_INIT_CPU_TOPOLOGY_INVALID_ID		1
-#define ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_RANGE		2
-#define ERTS_INIT_CPU_TOPOLOGY_INVALID_HIERARCHY	3
-#define ERTS_INIT_CPU_TOPOLOGY_INVALID_ID_TYPE		4
-#define ERTS_INIT_CPU_TOPOLOGY_INVALID_NODES		5
-#define ERTS_INIT_CPU_TOPOLOGY_MISSING_LID		6
-#define ERTS_INIT_CPU_TOPOLOGY_NOT_UNIQUE_LIDS		7
-#define ERTS_INIT_CPU_TOPOLOGY_NOT_UNIQUE_ENTITIES	8
-#define ERTS_INIT_CPU_TOPOLOGY_MISSING			9
-
-int erts_init_cpu_topology(char *topology_str);
+#define ERTS_RUNQ_IX(IX)						\
+  (ASSERT_EXPR(0 <= (IX) && (IX) < erts_no_run_queues),			\
+   &erts_aligned_run_queues[(IX)].runq)
+#define ERTS_SCHEDULER_IX(IX)						\
+  (ASSERT_EXPR(0 <= (IX) && (IX) < erts_no_schedulers),			\
+   &erts_aligned_scheduler_data[(IX)].esd)
 
 void erts_pre_init_process(void);
 void erts_late_init_process(void);
@@ -992,9 +1038,12 @@ ErtsProcList *erts_proclist_create(Process *);
 void erts_proclist_destroy(ErtsProcList *);
 int erts_proclist_same(ErtsProcList *, Process *);
 
+int erts_sched_set_wakeup_limit(char *str);
+
 #ifdef DEBUG
 void erts_dbg_multi_scheduling_return_trap(Process *, Eterm);
 #endif
+int erts_get_max_no_executing_schedulers(void);
 #ifdef ERTS_SMP
 ErtsSchedSuspendResult
 erts_schedulers_state(Uint *, Uint *, Uint *, int);
@@ -1009,9 +1058,15 @@ int erts_is_multi_scheduling_blocked(void);
 Eterm erts_multi_scheduling_blockers(Process *);
 void erts_start_schedulers(void);
 void erts_smp_notify_check_children_needed(void);
+void
+erts_smp_schedule_misc_aux_work(int ignore_self,
+				int max_sched,
+				void (*func)(void *),
+				void *arg);
 #endif
+void erts_sched_notify_check_cpu_bind(void);
 Uint erts_active_schedulers(void);
-void erts_init_process(void);
+void erts_init_process(int);
 Eterm erts_process_status(Process *, ErtsProcLocks, Process *, Eterm);
 Uint erts_run_queues_len(Uint *);
 void erts_add_to_runq(Process *);
@@ -1085,6 +1140,9 @@ void erts_handle_pending_exit(Process *, ErtsProcLocks);
 
 void erts_deep_process_dump(int, void *);
 
+Eterm erts_get_reader_groups_map(Process *c_p);
+Eterm erts_debug_reader_groups_map(Process *c_p, int groups);
+
 Sint erts_test_next_pid(int, Uint);
 Eterm erts_debug_processes(Process *c_p);
 Eterm erts_debug_processes_bif_info(Process *c_p);
@@ -1098,6 +1156,20 @@ Uint erts_debug_nbalance(void);
 #  define ERTS_PROC_GET_SCHDATA(PROC) (erts_scheduler_data)
 #endif
 
+#ifdef ERTS_DO_VERIFY_UNUSED_TEMP_ALLOC
+#  define ERTS_VERIFY_UNUSED_TEMP_ALLOC(P)					\
+do {										\
+    ErtsSchedulerData *esdp__ = ((P)						\
+				 ? ERTS_PROC_GET_SCHDATA((Process *) (P))	\
+				 : erts_get_scheduler_data());			\
+    if (esdp__)									\
+	esdp__->verify_unused_temp_alloc(					\
+	    esdp__->verify_unused_temp_alloc_data);				\
+} while (0)
+#else
+#  define ERTS_VERIFY_UNUSED_TEMP_ALLOC(ESDP)
+#endif
+
 #if defined(ERTS_SMP) || defined(USE_THREADS)
 ErtsSchedulerData *erts_get_scheduler_data(void);
 #else
@@ -1509,29 +1581,30 @@ extern int erts_disable_proc_not_running_opt;
 #define ERTS_MIN_PROCESSES		16
 #endif
 
-#ifdef ERTS_INCLUDE_SCHEDULER_INTERNALS
-ERTS_GLB_INLINE void erts_smp_notify_inc_runq(ErtsRunQueue *runq);
-void erts_smp_notify_inc_runq__(ErtsRunQueue *runq);
-#endif /* ERTS_INCLUDE_SCHEDULER_INTERNALS */
+void erts_smp_notify_inc_runq(ErtsRunQueue *runq);
 
-#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+#ifdef ERTS_SMP
+void erts_sched_finish_poke(ErtsSchedulerSleepInfo *, erts_aint32_t);
+ERTS_GLB_INLINE void erts_sched_poke(ErtsSchedulerSleepInfo *ssi);
 
-#ifdef ERTS_INCLUDE_SCHEDULER_INTERNALS
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
 ERTS_GLB_INLINE void
-erts_smp_notify_inc_runq(ErtsRunQueue *runq)
+erts_sched_poke(ErtsSchedulerSleepInfo *ssi)
 {
-#ifdef ERTS_SMP
-    ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(runq));
-    if (runq->waiting)
-	erts_smp_notify_inc_runq__(runq);
-#endif
+    erts_aint32_t flags = erts_smp_atomic32_read(&ssi->flags);
+    ASSERT(!(flags & ERTS_SSI_FLG_SLEEPING)
+	   || (flags & ERTS_SSI_FLG_WAITING));
+    if (flags & ERTS_SSI_FLG_SLEEPING) {
+	flags = erts_smp_atomic32_band(&ssi->flags, ~ERTS_SSI_FLGS_SLEEP);
+	erts_sched_finish_poke(ssi, flags);
+    }
 }
 
-#endif /* ERTS_INCLUDE_SCHEDULER_INTERNALS */
-
 #endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
+#endif /* #ifdef ERTS_SMP */
+
 #include "erl_process_lock.h"
 
 #undef ERTS_INCLUDE_SCHEDULER_INTERNALS
diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c
index 7a7042abe4..68fda01597 100644
--- a/erts/emulator/beam/erl_process_dump.c
+++ b/erts/emulator/beam/erl_process_dump.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2003-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2003-2011. 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
@@ -261,139 +261,139 @@ print_function_from_pc(int to, void *to_arg, BeamInstr* x)
 static void
 heap_dump(int to, void *to_arg, Eterm x)
 {
+    DeclareTmpHeapNoproc(last,1);
+    Eterm* next = last;
     Eterm* ptr;
-    Eterm last = OUR_NIL;
-    Eterm* next = &last;
 
     if (is_immed(x) || is_CP(x)) {
 	return;
     }
-
- again:
-    if (x == OUR_NIL) {	/* We are done. */
-	return;
-    } if (is_CP(x)) {
-	next = (Eterm *) EXPAND_POINTER(x);
-    } else if (is_list(x)) {
-	ptr = list_val(x);
-	if (ptr[0] != OUR_NIL) {
-	    erts_print(to, to_arg, ADDR_FMT ":l", ptr);
-	    dump_element(to, to_arg, ptr[0]);
-	    erts_putc(to, to_arg, '|');
-	    dump_element(to, to_arg, ptr[1]);
-	    erts_putc(to, to_arg, '\n');
-	    if (is_immed(ptr[1])) {
-		ptr[1] = make_small(0);
-	    }
-	    x = ptr[0];
-	    ptr[0] = (Eterm) COMPRESS_POINTER(next);
-	    next = ptr + 1;
-	    goto again;
-	}
-    } else if (is_boxed(x)) {
-	Eterm hdr;
-	
-	ptr = boxed_val(x);
-	hdr = *ptr;
-	if (hdr != OUR_NIL) {	/* If not visited */
-	    erts_print(to, to_arg, ADDR_FMT ":", ptr);
-	    if (is_arity_value(hdr)) {
-		Uint i;
-		Uint arity = arityval(hdr);
-
-		erts_print(to, to_arg, "t" WORD_FMT ":", arity);
-		for (i = 1; i <= arity; i++) {
-		    dump_element(to, to_arg, ptr[i]);
-		    if (is_immed(ptr[i])) {
-			ptr[i] = make_small(0);
-		    }
-		    if (i < arity) {
-			erts_putc(to, to_arg, ',');
-		    }
-		}
+    UseTmpHeapNoproc(1);
+    *last = OUR_NIL;
+
+    while (x != OUR_NIL) {
+	if (is_CP(x)) {
+	    next = (Eterm *) EXPAND_POINTER(x);
+	} else if (is_list(x)) {
+	    ptr = list_val(x);
+	    if (ptr[0] != OUR_NIL) {
+		erts_print(to, to_arg, ADDR_FMT ":l", ptr);
+		dump_element(to, to_arg, ptr[0]);
+		erts_putc(to, to_arg, '|');
+		dump_element(to, to_arg, ptr[1]);
 		erts_putc(to, to_arg, '\n');
-		if (arity == 0) {
-		    ptr[0] = OUR_NIL;
-		} else {
-		    x = ptr[arity];
-		    ptr[0] = (Eterm) COMPRESS_POINTER(next);
-		    next = ptr + arity - 1;
-		    goto again;
+		if (is_immed(ptr[1])) {
+		    ptr[1] = make_small(0);
 		}
-	    } else if (hdr == HEADER_FLONUM) {
-		FloatDef f;
-		char sbuf[31];
-		int i;
-
-		GET_DOUBLE_DATA((ptr+1), f);
-		i = sys_double_to_chars(f.fd, (char*) sbuf);
-		sys_memset(sbuf+i, 0, 31-i);
-		erts_print(to, to_arg, "F%X:%s\n", i, sbuf);
-		*ptr = OUR_NIL;
-	    } else if (_is_bignum_header(hdr)) {
-		erts_print(to, to_arg, "B%T\n", x);
-		*ptr = OUR_NIL;
-	    } else if (is_binary_header(hdr)) {
-		Uint tag = thing_subtag(hdr);
-		Uint size = binary_size(x);
-		Uint i;
-
-		if (tag == HEAP_BINARY_SUBTAG) {
-		    byte* p;
-
-		    erts_print(to, to_arg, "Yh%X:", size);
-		    p = binary_bytes(x);
-		    for (i = 0; i < size; i++) {
-			erts_print(to, to_arg, "%02X", p[i]);
+		x = ptr[0];
+		ptr[0] = (Eterm) COMPRESS_POINTER(next);
+		next = ptr + 1;
+		continue;
+	    }
+	} else if (is_boxed(x)) {
+	    Eterm hdr;
+
+	    ptr = boxed_val(x);
+	    hdr = *ptr;
+	    if (hdr != OUR_NIL) {	/* If not visited */
+		erts_print(to, to_arg, ADDR_FMT ":", ptr);
+	        if (is_arity_value(hdr)) {
+		    Uint i;
+		    Uint arity = arityval(hdr);
+
+		    erts_print(to, to_arg, "t" WORD_FMT ":", arity);
+		    for (i = 1; i <= arity; i++) {
+			dump_element(to, to_arg, ptr[i]);
+			if (is_immed(ptr[i])) {
+			    ptr[i] = make_small(0);
+			}
+			if (i < arity) {
+			    erts_putc(to, to_arg, ',');
+			}
 		    }
-		} else if (tag == REFC_BINARY_SUBTAG) {
-		    ProcBin* pb = (ProcBin *) binary_val(x);
-		    Binary* val = pb->val;
-
-		    if (erts_smp_atomic_xchg(&val->refc, 0) != 0) {
-			val->flags = (UWord) all_binaries;
-			all_binaries = val;
+		    erts_putc(to, to_arg, '\n');
+		    if (arity == 0) {
+			ptr[0] = OUR_NIL;
+		    } else {
+			x = ptr[arity];
+			ptr[0] = (Eterm) COMPRESS_POINTER(next);
+			next = ptr + arity - 1;
+			continue;
 		    }
-		    erts_print(to, to_arg, "Yc%X:%X:%X", val,
-			       pb->bytes - (byte *)val->orig_bytes,
-			       size);
-		} else if (tag == SUB_BINARY_SUBTAG) {
-		    ErlSubBin* Sb = (ErlSubBin *) binary_val(x);
-		    Eterm* real_bin = binary_val(Sb->orig);
-		    void* val;
-
-		    if (thing_subtag(*real_bin) == REFC_BINARY_SUBTAG) {
-			ProcBin* pb = (ProcBin *) real_bin;
-			val = pb->val;
-		    } else {	/* Heap binary */
-			val = real_bin;
+		} else if (hdr == HEADER_FLONUM) {
+		    FloatDef f;
+		    char sbuf[31];
+		    int i;
+
+		    GET_DOUBLE_DATA((ptr+1), f);
+		    i = sys_double_to_chars(f.fd, (char*) sbuf);
+		    sys_memset(sbuf+i, 0, 31-i);
+		    erts_print(to, to_arg, "F%X:%s\n", i, sbuf);
+		    *ptr = OUR_NIL;
+		} else if (_is_bignum_header(hdr)) {
+		    erts_print(to, to_arg, "B%T\n", x);
+		    *ptr = OUR_NIL;
+		} else if (is_binary_header(hdr)) {
+		    Uint tag = thing_subtag(hdr);
+		    Uint size = binary_size(x);
+		    Uint i;
+
+		    if (tag == HEAP_BINARY_SUBTAG) {
+			byte* p;
+
+			erts_print(to, to_arg, "Yh%X:", size);
+			p = binary_bytes(x);
+			for (i = 0; i < size; i++) {
+			    erts_print(to, to_arg, "%02X", p[i]);
+			}
+		    } else if (tag == REFC_BINARY_SUBTAG) {
+			ProcBin* pb = (ProcBin *) binary_val(x);
+			Binary* val = pb->val;
+
+			if (erts_smp_atomic_xchg(&val->refc, 0) != 0) {
+			    val->flags = (UWord) all_binaries;
+			    all_binaries = val;
+			}
+			erts_print(to, to_arg, "Yc%X:%X:%X", val,
+				   pb->bytes - (byte *)val->orig_bytes,
+				   size);
+		    } else if (tag == SUB_BINARY_SUBTAG) {
+			ErlSubBin* Sb = (ErlSubBin *) binary_val(x);
+			Eterm* real_bin = binary_val(Sb->orig);
+			void* val;
+
+			if (thing_subtag(*real_bin) == REFC_BINARY_SUBTAG) {
+			    ProcBin* pb = (ProcBin *) real_bin;
+			    val = pb->val;
+			} else {	/* Heap binary */
+			    val = real_bin;
+			}
+			erts_print(to, to_arg, "Ys%X:%X:%X", val, Sb->offs, size);
 		    }
-		    erts_print(to, to_arg, "Ys%X:%X:%X", val, Sb->offs, size);
+		    erts_putc(to, to_arg, '\n');
+		    *ptr = OUR_NIL;
+		} else if (is_external_pid_header(hdr)) {
+		    erts_print(to, to_arg, "P%T\n", x);
+		    *ptr = OUR_NIL;
+		} else if (is_external_port_header(hdr)) {
+		    erts_print(to, to_arg, "p<%bpu.%bpu>\n",
+			       port_channel_no(x), port_number(x));
+		    *ptr = OUR_NIL;
+		} else {
+		    /*
+		     * All other we dump in the external term format.
+		     */
+			dump_externally(to, to_arg, x);
+		    erts_putc(to, to_arg, '\n');
+		    *ptr = OUR_NIL;
 		}
-		erts_putc(to, to_arg, '\n');
-		*ptr = OUR_NIL;
-	    } else if (is_external_pid_header(hdr)) {
-		erts_print(to, to_arg, "P%T\n", x);
-		*ptr = OUR_NIL;
-	    } else if (is_external_port_header(hdr)) {
-		erts_print(to, to_arg, "p<%bpu.%bpu>\n",
-			   port_channel_no(x), port_number(x));
-		*ptr = OUR_NIL;
-	    } else {
-		/*
-		 * All other we dump in the external term format.
-		 */
-		dump_externally(to, to_arg, x);
-		erts_putc(to, to_arg, '\n');
-		*ptr = OUR_NIL;
 	    }
 	}
+	x = *next;
+	*next = OUR_NIL;
+	next--;
     }
-
-    x = *next;
-    *next = OUR_NIL;
-    next--;
-    goto again;
+    UnUseTmpHeapNoproc(1);
 }
 
 static void
diff --git a/erts/emulator/beam/erl_process_lock.c b/erts/emulator/beam/erl_process_lock.c
index 52440fb635..72560aa124 100644
--- a/erts/emulator/beam/erl_process_lock.c
+++ b/erts/emulator/beam/erl_process_lock.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2007-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2007-2010. 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%
  */
 
@@ -71,9 +71,12 @@ const Process erts_proc_lock_busy;
 
 #ifdef ERTS_SMP
 
-/*#define ERTS_PROC_LOCK_SPIN_ON_GATE*/
-#define ERTS_PROC_LOCK_SPIN_COUNT_MAX  16000
+#define ERTS_PROC_LOCK_SPIN_COUNT_MAX  2000
+#define ERTS_PROC_LOCK_SPIN_COUNT_SCHED_INC 32
 #define ERTS_PROC_LOCK_SPIN_COUNT_BASE 1000
+#define ERTS_PROC_LOCK_AUX_SPIN_COUNT 50
+
+#define ERTS_PROC_LOCK_SPIN_UNTIL_YIELD 25
 
 #ifdef ERTS_PROC_LOCK_DEBUG
 #define ERTS_PROC_LOCK_HARD_DEBUG
@@ -83,32 +86,19 @@ const Process erts_proc_lock_busy;
 static void check_queue(erts_proc_lock_t *lck);
 #endif
 
-
-typedef struct erts_proc_lock_waiter_t_ erts_proc_lock_waiter_t;
-struct erts_proc_lock_waiter_t_ {
-    erts_proc_lock_waiter_t *next;
-    erts_proc_lock_waiter_t *prev;
-    ErtsProcLocks wait_locks;
-    erts_smp_gate_t gate;
-    erts_proc_lock_queues_t *queues;
-};
+#if SIZEOF_INT < 4
+#error "The size of the 'uflgs' field of the erts_tse_t type is too small"
+#endif
 
 struct erts_proc_lock_queues_t_ {
     erts_proc_lock_queues_t *next;
-    erts_proc_lock_waiter_t *queue[ERTS_PROC_LOCK_MAX_BIT+1];
-};
-
-struct erts_proc_lock_thr_spec_data_t_ {
-    erts_proc_lock_queues_t *qs;
-    erts_proc_lock_waiter_t *wtr;
+    erts_tse_t *queue[ERTS_PROC_LOCK_MAX_BIT+1];
 };
 
 static erts_proc_lock_queues_t zeroqs = {0};
 
-static erts_smp_spinlock_t wtr_lock;
-static erts_proc_lock_waiter_t *waiter_free_list;
+static erts_smp_spinlock_t qs_lock;
 static erts_proc_lock_queues_t *queue_free_list;
-static erts_tsd_key_t waiter_key;
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
 static struct {
@@ -122,122 +112,131 @@ static struct {
 erts_pix_lock_t erts_pix_locks[ERTS_NO_OF_PIX_LOCKS];
 
 static int proc_lock_spin_count;
-static int proc_lock_trans_spin_cost;
+static int aux_thr_proc_lock_spin_count;
 
-static void cleanup_waiter(void);
+static void cleanup_tse(void);
 
 void
-erts_init_proc_lock(void)
+erts_init_proc_lock(int cpus)
 {
     int i;
-    int cpus;
-    erts_smp_spinlock_init(&wtr_lock, "proc_lck_wtr_alloc");
+    erts_smp_spinlock_init(&qs_lock, "proc_lck_qs_alloc");
     for (i = 0; i < ERTS_NO_OF_PIX_LOCKS; i++) {
-#if ERTS_PROC_LOCK_MUTEX_IMPL
-#ifdef ERTS_ENABLE_LOCK_COUNT
-	erts_smp_mtx_init_x(&erts_pix_locks[i].u.mtx, "pix_lock", make_small(i));
-#else
-	erts_smp_mtx_init(&erts_pix_locks[i].u.mtx, "pix_lock");
-#endif
-#else
 #ifdef ERTS_ENABLE_LOCK_COUNT
-	erts_smp_spinlock_init_x(&erts_pix_locks[i].u.spnlck, "pix_lock", make_small(i));
+	erts_smp_spinlock_init_x(&erts_pix_locks[i].u.spnlck,
+				 "pix_lock", make_small(i));
 #else
 	erts_smp_spinlock_init(&erts_pix_locks[i].u.spnlck, "pix_lock");
 #endif
-#endif
     }
-    waiter_free_list = NULL;
     queue_free_list = NULL;
-    erts_tsd_key_create(&waiter_key);
-    erts_thr_install_exit_handler(cleanup_waiter);
+    erts_thr_install_exit_handler(cleanup_tse);
 #ifdef ERTS_ENABLE_LOCK_CHECK
     lc_id.proc_lock_main	= erts_lc_get_lock_order_id("proc_main");
     lc_id.proc_lock_link	= erts_lc_get_lock_order_id("proc_link");
     lc_id.proc_lock_msgq	= erts_lc_get_lock_order_id("proc_msgq");
     lc_id.proc_lock_status	= erts_lc_get_lock_order_id("proc_status");
 #endif
-    cpus = erts_get_cpu_configured(erts_cpuinfo);
-    if (cpus > 1)
-	proc_lock_spin_count = (ERTS_PROC_LOCK_SPIN_COUNT_BASE
-				* ((int) erts_no_schedulers));
-    else if (cpus == 1)
-	proc_lock_spin_count = 0;
-    else /* No of cpus unknown. Assume multi proc, but be conservative. */
+    if (cpus > 1) {
 	proc_lock_spin_count = ERTS_PROC_LOCK_SPIN_COUNT_BASE;
-    if (proc_lock_spin_count > ERTS_PROC_LOCK_SPIN_COUNT_MAX)
-	proc_lock_spin_count = ERTS_PROC_LOCK_SPIN_COUNT_MAX;
-    proc_lock_trans_spin_cost = proc_lock_spin_count/20;
-}
-
-static ERTS_INLINE erts_proc_lock_waiter_t *
-alloc_wtr(void)
-{
-    erts_proc_lock_waiter_t *wtr;
-    erts_smp_spin_lock(&wtr_lock);
-    wtr = waiter_free_list;
-    if (wtr) {
-	waiter_free_list = wtr->next;
-	ERTS_LC_ASSERT(queue_free_list);
-	wtr->queues = queue_free_list;
-	queue_free_list = wtr->queues->next;
-	erts_smp_spin_unlock(&wtr_lock);
+	proc_lock_spin_count += (ERTS_PROC_LOCK_SPIN_COUNT_SCHED_INC
+				 * ((int) erts_no_schedulers));
+	aux_thr_proc_lock_spin_count = ERTS_PROC_LOCK_AUX_SPIN_COUNT;
     }
-    else {
-	erts_smp_spin_unlock(&wtr_lock);
-	wtr = erts_alloc(ERTS_ALC_T_PROC_LCK_WTR,
-			 sizeof(erts_proc_lock_waiter_t));
-	erts_smp_gate_init(&wtr->gate);
-	wtr->wait_locks = (ErtsProcLocks) 0;
-	wtr->queues = erts_alloc(ERTS_ALC_T_PROC_LCK_QS,
-				 sizeof(erts_proc_lock_queues_t));
-	sys_memcpy((void *) wtr->queues,
-		   (void *) &zeroqs,
-		   sizeof(erts_proc_lock_queues_t));
+    else if (cpus == 1) {
+	proc_lock_spin_count = 0;
+	aux_thr_proc_lock_spin_count = 0;
     }
-    return wtr;
+    else { /* No of cpus unknown. Assume multi proc, but be conservative. */
+	proc_lock_spin_count = ERTS_PROC_LOCK_SPIN_COUNT_BASE/2;
+	aux_thr_proc_lock_spin_count = ERTS_PROC_LOCK_AUX_SPIN_COUNT/2;
+    }
+    if (proc_lock_spin_count > ERTS_PROC_LOCK_SPIN_COUNT_MAX)
+	proc_lock_spin_count = ERTS_PROC_LOCK_SPIN_COUNT_MAX;
 }
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
 static void
-check_unused_waiter(erts_proc_lock_waiter_t *wtr)
+check_unused_tse(erts_tse_t *wtr)
 {
     int i;
-    ERTS_LC_ASSERT(wtr->wait_locks == 0);
+    erts_proc_lock_queues_t *queues = wtr->udata;
+    ERTS_LC_ASSERT(wtr->uflgs == 0);
     for (i = 0; i <= ERTS_PROC_LOCK_MAX_BIT; i++)
-	ERTS_LC_ASSERT(!wtr->queues->queue[i]);
+	ERTS_LC_ASSERT(!queues->queue[i]);
 }
-#define CHECK_UNUSED_WAITER(W) check_unused_waiter((W))
+#define CHECK_UNUSED_TSE(W) check_unused_tse((W))
 #else
-#define CHECK_UNUSED_WAITER(W)
+#define CHECK_UNUSED_TSE(W)
 #endif
 
+static ERTS_INLINE erts_tse_t *
+tse_fetch(erts_pix_lock_t *pix_lock)
+{
+    erts_tse_t *tse = erts_tse_fetch();
+    if (!tse->udata) {
+	erts_proc_lock_queues_t *qs;
+#if ERTS_PROC_LOCK_SPINLOCK_IMPL && !ERTS_PROC_LOCK_ATOMIC_IMPL
+	if (pix_lock)
+	    erts_pix_unlock(pix_lock);
+#endif
+	erts_smp_spin_lock(&qs_lock);
+	qs = queue_free_list;
+	if (qs) {
+	    queue_free_list = queue_free_list->next;
+	    erts_smp_spin_unlock(&qs_lock);
+	}
+	else {
+	    erts_smp_spin_unlock(&qs_lock);
+	    qs = erts_alloc(ERTS_ALC_T_PROC_LCK_QS,
+			    sizeof(erts_proc_lock_queues_t));
+	    sys_memcpy((void *) qs,
+		       (void *) &zeroqs,
+		       sizeof(erts_proc_lock_queues_t));
+	}
+	tse->udata = qs;
+#if ERTS_PROC_LOCK_SPINLOCK_IMPL && !ERTS_PROC_LOCK_ATOMIC_IMPL
+	if (pix_lock)
+	    erts_pix_lock(pix_lock);
+#endif
+    }
+    tse->uflgs = 0;
+    return tse;
+}
 
 static ERTS_INLINE void
-free_wtr(erts_proc_lock_waiter_t *wtr)
+tse_return(erts_tse_t *tse, int force_free_q)
 {
-    CHECK_UNUSED_WAITER(wtr);
-    erts_smp_spin_lock(&wtr_lock);
-    wtr->next = waiter_free_list;
-    waiter_free_list = wtr;
-    wtr->queues->next = queue_free_list;
-    queue_free_list = wtr->queues;
-    erts_smp_spin_unlock(&wtr_lock);
+    CHECK_UNUSED_TSE(tse);
+    if (force_free_q || erts_tse_is_tmp(tse)) {
+	erts_proc_lock_queues_t *qs = tse->udata;
+	ASSERT(qs);
+	erts_smp_spin_lock(&qs_lock);
+	qs->next = queue_free_list;
+	queue_free_list = qs;
+	erts_smp_spin_unlock(&qs_lock);
+	tse->udata = NULL;
+    }
+    erts_tse_return(tse);
 }
 
 void
 erts_proc_lock_prepare_proc_lock_waiter(void)
 {
-    erts_tsd_set(waiter_key, (void *) alloc_wtr());
+    tse_return(tse_fetch(NULL), 0);
 }
 
 
 static void
-cleanup_waiter(void)
+cleanup_tse(void)
 {
-    erts_proc_lock_waiter_t *wtr = erts_tsd_get(waiter_key);
-    if (wtr)
-	free_wtr(wtr);
+    erts_tse_t *tse = erts_tse_fetch();
+    if (tse) {
+	if (tse->udata)
+	    tse_return(tse, 1);
+	else
+	    erts_tse_return(tse);
+    }
 }
 
 
@@ -250,7 +249,7 @@ cleanup_waiter(void)
 static ERTS_INLINE void
 enqueue_waiter(erts_proc_lock_queues_t *qs,
 	       int ix,
-	       erts_proc_lock_waiter_t *wtr)
+	       erts_tse_t *wtr)
 {
     if (!qs->queue[ix]) {
 	qs->queue[ix] = wtr;
@@ -266,10 +265,10 @@ enqueue_waiter(erts_proc_lock_queues_t *qs,
     }
 }
 
-static erts_proc_lock_waiter_t *
+static erts_tse_t *
 dequeue_waiter(erts_proc_lock_queues_t *qs, int ix)
 {
-    erts_proc_lock_waiter_t *wtr = qs->queue[ix];
+    erts_tse_t *wtr = qs->queue[ix];
     ERTS_LC_ASSERT(qs->queue[ix]);
     if (wtr->next == wtr) {
 	ERTS_LC_ASSERT(qs->queue[ix]->prev == wtr);
@@ -295,10 +294,10 @@ dequeue_waiter(erts_proc_lock_queues_t *qs, int ix)
  *       lock.
  */
 static ERTS_INLINE void
-try_aquire(erts_proc_lock_t *lck, erts_proc_lock_waiter_t *wtr)
+try_aquire(erts_proc_lock_t *lck, erts_tse_t *wtr)
 {
     ErtsProcLocks got_locks = (ErtsProcLocks) 0;
-    ErtsProcLocks locks = wtr->wait_locks;
+    ErtsProcLocks locks = wtr->uflgs;
     int lock_no;
 
     ERTS_LC_ASSERT(lck->queues);
@@ -334,7 +333,7 @@ try_aquire(erts_proc_lock_t *lck, erts_proc_lock_waiter_t *wtr)
 	}
     }
 
-    wtr->wait_locks &= ~got_locks;
+    wtr->uflgs &= ~got_locks;
 }
 
 /*
@@ -350,8 +349,8 @@ transfer_locks(Process *p,
 	       int unlock)
 {
     int transferred = 0;
-    erts_proc_lock_waiter_t *wake = NULL;
-    erts_proc_lock_waiter_t *wtr;
+    erts_tse_t *wake = NULL;
+    erts_tse_t *wtr;
     ErtsProcLocks unset_waiter = 0;
     ErtsProcLocks tlocks = trnsfr_lcks;
     int lock_no;
@@ -377,11 +376,11 @@ transfer_locks(Process *p,
 	    ERTS_LC_ASSERT(wtr);
 	    if (!qs->queue[lock_no])
 		unset_waiter |= lock;
-	    ERTS_LC_ASSERT(wtr->wait_locks & lock);
-	    wtr->wait_locks &= ~lock;
-	    if (wtr->wait_locks)
+	    ERTS_LC_ASSERT(wtr->uflgs & lock);
+	    wtr->uflgs &= ~lock;
+	    if (wtr->uflgs)
 		try_aquire(&p->lock, wtr);
-	    if (!wtr->wait_locks) {
+	    if (!wtr->uflgs) {
 		/*
 		 * The other thread got all locks it needs;
 		 * need to wake it up.
@@ -412,9 +411,10 @@ transfer_locks(Process *p,
 	erts_pix_unlock(pix_lock);
     
 	do {
-	    erts_proc_lock_waiter_t *tmp = wake;
+	    erts_tse_t *tmp = wake;
 	    wake = wake->next;
-	    erts_smp_gate_let_through(&tmp->gate, 1);
+	    erts_atomic32_set(&tmp->uaflgs, 0);
+	    erts_tse_set(tmp);
 	} while (wake);
 
 	if (!unlock)
@@ -462,26 +462,16 @@ wait_for_locks(Process *p,
                ErtsProcLocks olflgs)
 {
     erts_pix_lock_t *pix_lock = pixlck ? pixlck : ERTS_PID2PIXLOCK(p->id);
-    int tsd;
-    erts_proc_lock_waiter_t *wtr;
+    erts_tse_t *wtr;
+    erts_proc_lock_queues_t *qs;
 
     /* Acquire a waiter object on which this thread can wait. */
-    wtr = erts_tsd_get(waiter_key);
-    if (wtr)
-	tsd = 1;
-    else {
-#if ERTS_PROC_LOCK_SPINLOCK_IMPL && !ERTS_PROC_LOCK_ATOMIC_IMPL
-	erts_pix_unlock(pix_lock);
-#endif
-	wtr = alloc_wtr();
-	tsd = 0;
-#if ERTS_PROC_LOCK_SPINLOCK_IMPL && !ERTS_PROC_LOCK_ATOMIC_IMPL
-	erts_pix_lock(pix_lock);
-#endif
-    }
+    wtr = tse_fetch(pix_lock);
     
     /* Record which locks this waiter needs. */
-    wtr->wait_locks = need_locks;
+    wtr->uflgs = need_locks;
+
+    ASSERT((wtr->uflgs & ~ERTS_PROC_LOCKS_ALL) == 0);
 
 #if ERTS_PROC_LOCK_ATOMIC_IMPL
     erts_pix_lock(pix_lock);
@@ -489,14 +479,16 @@ wait_for_locks(Process *p,
 
     ERTS_LC_ASSERT(erts_lc_pix_lock_is_locked(pix_lock));
 
+    qs = wtr->udata;
+    ASSERT(qs);
     /* Provide the process with waiter queues, if it doesn't have one. */
     if (!p->lock.queues) {
-	wtr->queues->next = NULL;
-	p->lock.queues = wtr->queues;
+	qs->next = NULL;
+	p->lock.queues = qs;
     }
     else {
-	wtr->queues->next = p->lock.queues->next;
-	p->lock.queues->next = wtr->queues;
+	qs->next = p->lock.queues->next;
+	p->lock.queues->next = qs;
     }
 
 #ifdef ERTS_PROC_LOCK_HARD_DEBUG
@@ -506,46 +498,59 @@ wait_for_locks(Process *p,
     /* Try to aquire locks one at a time in lock order and set wait flag */
     try_aquire(&p->lock, wtr);
 
+    ASSERT((wtr->uflgs & ~ERTS_PROC_LOCKS_ALL) == 0);
+
 #ifdef ERTS_PROC_LOCK_HARD_DEBUG
     check_queue(&p->lock);
 #endif
 
-    if (wtr->wait_locks) { /* We didn't get them all; need to wait... */
-	/* Got to wait for locks... */
+    if (wtr->uflgs) {
+	/* We didn't get them all; need to wait... */
+
+	ASSERT((wtr->uflgs & ~ERTS_PROC_LOCKS_ALL) == 0);
+
+	erts_atomic32_set(&wtr->uaflgs, 1);
 	erts_pix_unlock(pix_lock);
 
-	/*
-	 * Wait for needed locks. When we return all needed locks have
-	 * have been acquired by other threads and transfered to us.
-	 */
-#ifdef ERTS_PROC_LOCK_SPIN_ON_GATE
-	erts_smp_gate_swait(&wtr->gate, proc_lock_spin_count);
-#else
-	erts_smp_gate_wait(&wtr->gate);
-#endif
+	while (1) {
+	    int res;
+	    erts_tse_reset(wtr);
+
+	    if (erts_atomic32_read(&wtr->uaflgs) == 0)
+		break;
+
+	    /*
+	     * Wait for needed locks. When we are woken all needed locks have
+	     * have been acquired by other threads and transfered to us.
+	     * However, we need to be prepared for spurious wakeups.
+	     */
+	    do {
+		res = erts_tse_wait(wtr); /* might return EINTR */
+	    } while (res != 0);
+	}
 
 	erts_pix_lock(pix_lock);
+
+	ASSERT(wtr->uflgs == 0);
     }
 
     /* Recover some queues to store in the waiter. */
     ERTS_LC_ASSERT(p->lock.queues);
     if (p->lock.queues->next) {
-	wtr->queues = p->lock.queues->next;
-	p->lock.queues->next = wtr->queues->next;
+	qs = p->lock.queues->next;
+	p->lock.queues->next = qs->next;
     }
     else {
-	wtr->queues = p->lock.queues;
+	qs = p->lock.queues;
 	p->lock.queues = NULL;
     }
+    wtr->udata = qs;
 
     erts_pix_unlock(pix_lock);
 
     ERTS_LC_ASSERT(locks == (ERTS_PROC_LOCK_FLGS_READ_(&p->lock) & locks));
 
-    if (tsd)
-	CHECK_UNUSED_WAITER(wtr);
-    else
-	free_wtr(wtr);
+    tse_return(wtr, 0);
 }
 
 /*
@@ -563,52 +568,57 @@ erts_proc_lock_failed(Process *p,
 		      ErtsProcLocks locks,
 		      ErtsProcLocks old_lflgs)
 {
-#ifdef ERTS_PROC_LOCK_SPIN_ON_GATE
-    int spin_count = 0;
-#else
-    int spin_count = proc_lock_spin_count;
-#endif
-
+    int until_yield = ERTS_PROC_LOCK_SPIN_UNTIL_YIELD;
+    int thr_spin_count;
+    int spin_count;
     ErtsProcLocks need_locks = locks;
     ErtsProcLocks olflgs = old_lflgs;
 
-    while (need_locks != 0)
-    {
-        ErtsProcLocks can_grab = in_order_locks(olflgs, need_locks);
+    if (erts_thr_get_main_status())
+	thr_spin_count = proc_lock_spin_count;
+    else
+	thr_spin_count = aux_thr_proc_lock_spin_count;
+
+    spin_count = thr_spin_count;
+
+    while (need_locks != 0) {
+        ErtsProcLocks can_grab;
+
+	can_grab = in_order_locks(olflgs, need_locks);
 
-        if (can_grab == 0)
-        {
+        if (can_grab == 0) {
             /* Someone already has the lowest-numbered lock we want. */
 
-            if (spin_count-- <= 0)
-            {
+            if (spin_count-- <= 0) {
                 /* Too many retries, give up and sleep for the lock. */
                 wait_for_locks(p, pixlck, locks, need_locks, olflgs);
                 return;
             }
 
+	    ERTS_SPIN_BODY;
+
+	    if (--until_yield == 0) {
+		until_yield = ERTS_PROC_LOCK_SPIN_UNTIL_YIELD;
+		erts_thr_yield();
+	    }
+
             olflgs = ERTS_PROC_LOCK_FLGS_READ_(&p->lock);
         }
-        else
-        {
+        else {
             /* Try to grab all of the grabbable locks at once with cmpxchg. */
             ErtsProcLocks grabbed = olflgs | can_grab;
             ErtsProcLocks nflgs =
-                ERTS_PROC_LOCK_FLGS_CMPXCHG_(&p->lock, grabbed, olflgs);
+                ERTS_PROC_LOCK_FLGS_CMPXCHG_ACQB_(&p->lock, grabbed, olflgs);
 
-            if (nflgs == olflgs)
-            {
+            if (nflgs == olflgs) {
                 /* Success! We grabbed the 'can_grab' locks. */
                 olflgs = grabbed;
                 need_locks &= ~can_grab;
 
-#ifndef ERTS_PROC_LOCK_SPIN_ON_GATE
                 /* Since we made progress, reset the spin count. */
-                spin_count = proc_lock_spin_count;
-#endif
+                spin_count = thr_spin_count;
             }
-            else
-            {
+            else {
                 /* Compare-and-exchange failed, try again. */
                 olflgs = nflgs;
             }
@@ -945,7 +955,7 @@ erts_proc_lock_init(Process *p)
 {
     /* We always start with all locks locked */
 #if ERTS_PROC_LOCK_ATOMIC_IMPL
-    erts_smp_atomic_init(&p->lock.flags, (long) ERTS_PROC_LOCKS_ALL);
+    erts_smp_atomic32_init(&p->lock.flags, (erts_aint32_t) ERTS_PROC_LOCKS_ALL);
 #else
     p->lock.flags = ERTS_PROC_LOCKS_ALL;
 #endif
@@ -964,7 +974,7 @@ erts_proc_lock_init(Process *p)
     {
 	int i;
 	for (i = 0; i <= ERTS_PROC_LOCK_MAX_BIT; i++)
-	    erts_smp_atomic_init(&p->lock.locked[i], (long) 1);
+	    erts_smp_atomic32_init(&p->lock.locked[i], (erts_aint32_t) 1);
     }
 #endif
 }
@@ -1407,7 +1417,7 @@ check_queue(erts_proc_lock_t *lck)
 	wtr = (((ErtsProcLocks) 1) << lock_no) << ERTS_PROC_LOCK_WAITER_SHIFT;
 	if (lflgs & wtr) {
 	    int n;
-	    erts_proc_lock_waiter_t *wtr;
+	    erts_tse_t *wtr;
 	    ERTS_LC_ASSERT(lck->queues && lck->queues->queue[lock_no]);
 	    wtr = lck->queues->queue[lock_no];
 	    n = 0;
diff --git a/erts/emulator/beam/erl_process_lock.h b/erts/emulator/beam/erl_process_lock.h
index d71e5a0a6e..355179f084 100644
--- a/erts/emulator/beam/erl_process_lock.h
+++ b/erts/emulator/beam/erl_process_lock.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2007-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2007-2010. 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
@@ -54,20 +54,20 @@
 
 #define ERTS_PROC_LOCK_MAX_BIT 3
 
-typedef Uint32 ErtsProcLocks;
+typedef erts_aint32_t ErtsProcLocks;
 
 typedef struct erts_proc_lock_queues_t_ erts_proc_lock_queues_t;
 
 typedef struct erts_proc_lock_t_ {
 #if ERTS_PROC_LOCK_ATOMIC_IMPL
-    erts_smp_atomic_t flags;
+    erts_smp_atomic32_t flags;
 #else
     ErtsProcLocks flags;
 #endif
     erts_proc_lock_queues_t *queues;
-    long refc;
+    Sint32 refc;
 #ifdef ERTS_PROC_LOCK_DEBUG
-    erts_smp_atomic_t locked[ERTS_PROC_LOCK_MAX_BIT+1];
+    erts_smp_atomic32_t locked[ERTS_PROC_LOCK_MAX_BIT+1];
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_t lcnt_main;
@@ -255,11 +255,7 @@ void erts_proc_lc_unrequire_lock(Process *p, ErtsProcLocks locks);
 
 typedef struct {
     union {
-#if ERTS_PROC_LOCK_MUTEX_IMPL
-	erts_smp_mtx_t mtx;
-#else
 	erts_smp_spinlock_t spnlck;
-#endif
 	char buf[64]; /* Try to get locks in different cache lines */
     } u;
 } erts_pix_lock_t;
@@ -274,14 +270,19 @@ typedef struct {
 #if ERTS_PROC_LOCK_ATOMIC_IMPL
 
 #define ERTS_PROC_LOCK_FLGS_BAND_(L, MSK) \
-  ((ErtsProcLocks) erts_smp_atomic_band(&(L)->flags, (long) (MSK)))
+  ((ErtsProcLocks) erts_smp_atomic32_band(&(L)->flags, (erts_aint32_t) (MSK)))
 #define ERTS_PROC_LOCK_FLGS_BOR_(L, MSK) \
-  ((ErtsProcLocks) erts_smp_atomic_bor(&(L)->flags, (long) (MSK)))
-#define ERTS_PROC_LOCK_FLGS_CMPXCHG_(L, NEW, EXPECTED) \
-  ((ErtsProcLocks) erts_smp_atomic_cmpxchg(&(L)->flags, \
-                                           (long) (NEW), (long) (EXPECTED)))
+  ((ErtsProcLocks) erts_smp_atomic32_bor(&(L)->flags, (erts_aint32_t) (MSK)))
+#define ERTS_PROC_LOCK_FLGS_CMPXCHG_ACQB_(L, NEW, EXPECTED) \
+  ((ErtsProcLocks) erts_smp_atomic32_cmpxchg_acqb(&(L)->flags, \
+						  (erts_aint32_t) (NEW), \
+						  (erts_aint32_t) (EXPECTED)))
+#define ERTS_PROC_LOCK_FLGS_CMPXCHG_RELB_(L, NEW, EXPECTED) \
+  ((ErtsProcLocks) erts_smp_atomic32_cmpxchg_relb(&(L)->flags, \
+						  (erts_aint32_t) (NEW), \
+						  (erts_aint32_t) (EXPECTED)))
 #define ERTS_PROC_LOCK_FLGS_READ_(L) \
-  ((ErtsProcLocks) erts_smp_atomic_read(&(L)->flags))
+  ((ErtsProcLocks) erts_smp_atomic32_read(&(L)->flags))
 
 #else /* no opt atomic ops */
 
@@ -289,6 +290,9 @@ ERTS_GLB_INLINE ErtsProcLocks erts_proc_lock_flags_band(erts_proc_lock_t *,
 							ErtsProcLocks);
 ERTS_GLB_INLINE ErtsProcLocks erts_proc_lock_flags_bor(erts_proc_lock_t *,
 						       ErtsProcLocks);
+ERTS_GLB_INLINE ErtsProcLocks erts_proc_lock_flags_cmpxchg(erts_proc_lock_t *,
+							   ErtsProcLocks,
+							   ErtsProcLocks);
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
@@ -322,7 +326,9 @@ erts_proc_lock_flags_cmpxchg(erts_proc_lock_t *lck, ErtsProcLocks new,
 
 #define ERTS_PROC_LOCK_FLGS_BAND_(L, MSK) erts_proc_lock_flags_band((L), (MSK))
 #define ERTS_PROC_LOCK_FLGS_BOR_(L, MSK) erts_proc_lock_flags_bor((L), (MSK))
-#define ERTS_PROC_LOCK_FLGS_CMPXCHG_(L, NEW, EXPECTED) \
+#define ERTS_PROC_LOCK_FLGS_CMPXCHG_ACQB_(L, NEW, EXPECTED) \
+  erts_proc_lock_flags_cmpxchg((L), (NEW), (EXPECTED))
+#define ERTS_PROC_LOCK_FLGS_CMPXCHG_RELB_(L, NEW, EXPECTED) \
   erts_proc_lock_flags_cmpxchg((L), (NEW), (EXPECTED))
 #define ERTS_PROC_LOCK_FLGS_READ_(L) ((L)->flags)
 
@@ -330,7 +336,7 @@ erts_proc_lock_flags_cmpxchg(erts_proc_lock_t *lck, ErtsProcLocks new,
 
 extern erts_pix_lock_t erts_pix_locks[ERTS_NO_OF_PIX_LOCKS];
 
-void erts_init_proc_lock(void);
+void erts_init_proc_lock(int cpus);
 void erts_proc_lock_prepare_proc_lock_waiter(void);
 void erts_proc_lock_failed(Process *,
 			   erts_pix_lock_t *,
@@ -348,9 +354,9 @@ ERTS_GLB_INLINE ErtsProcLocks erts_smp_proc_raw_trylock__(Process *p,
 							  ErtsProcLocks locks);
 #ifdef ERTS_ENABLE_LOCK_COUNT
 ERTS_GLB_INLINE void erts_smp_proc_lock_x__(Process *,
-					  erts_pix_lock_t *,
-					  ErtsProcLocks,
-					  char *file, unsigned int line);
+					    erts_pix_lock_t *,
+					    ErtsProcLocks,
+					    char *file, unsigned int line);
 #else
 ERTS_GLB_INLINE void erts_smp_proc_lock__(Process *,
 					  erts_pix_lock_t *,
@@ -372,30 +378,18 @@ ERTS_GLB_INLINE void erts_proc_lock_op_debug(Process *, ErtsProcLocks, int);
 ERTS_GLB_INLINE void erts_pix_lock(erts_pix_lock_t *pixlck)
 {
     ERTS_LC_ASSERT(pixlck);
-#if ERTS_PROC_LOCK_MUTEX_IMPL
-    erts_smp_mtx_lock(&pixlck->u.mtx);
-#else
     erts_smp_spin_lock(&pixlck->u.spnlck);
-#endif
 }
 
 ERTS_GLB_INLINE void erts_pix_unlock(erts_pix_lock_t *pixlck)
 {
     ERTS_LC_ASSERT(pixlck);
-#if ERTS_PROC_LOCK_MUTEX_IMPL
-    erts_smp_mtx_unlock(&pixlck->u.mtx);
-#else
     erts_smp_spin_unlock(&pixlck->u.spnlck);
-#endif
 }
 
 ERTS_GLB_INLINE int erts_lc_pix_lock_is_locked(erts_pix_lock_t *pixlck)
 {
-#if ERTS_PROC_LOCK_MUTEX_IMPL
-    return erts_smp_lc_mtx_is_locked(&pixlck->u.mtx);
-#else
     return erts_smp_lc_spinlock_is_locked(&pixlck->u.spnlck);
-#endif
 }
 
 /*
@@ -417,9 +411,9 @@ erts_smp_proc_raw_trylock__(Process *p, ErtsProcLocks locks)
     ErtsProcLocks expct_lflgs = 0;
 
     while (1) {
-        ErtsProcLocks lflgs = ERTS_PROC_LOCK_FLGS_CMPXCHG_(&p->lock,
-							   expct_lflgs | locks,
-							   expct_lflgs);
+        ErtsProcLocks lflgs = ERTS_PROC_LOCK_FLGS_CMPXCHG_ACQB_(&p->lock,
+								expct_lflgs | locks,
+								expct_lflgs);
         if (ERTS_LIKELY(lflgs == expct_lflgs)) {
             /* We successfully grabbed all locks. */
             return 0;
@@ -535,7 +529,7 @@ erts_smp_proc_unlock__(Process *p,
 
         if (want_lflgs != old_lflgs) {
             ErtsProcLocks new_lflgs =
-                ERTS_PROC_LOCK_FLGS_CMPXCHG_(&p->lock, want_lflgs, old_lflgs);
+                ERTS_PROC_LOCK_FLGS_CMPXCHG_RELB_(&p->lock, want_lflgs, old_lflgs);
 
             if (new_lflgs != old_lflgs) {
                 /* cmpxchg failed, try again. */
@@ -627,13 +621,13 @@ erts_proc_lock_op_debug(Process *p, ErtsProcLocks locks, int locked)
     for (i = 0; i <= ERTS_PROC_LOCK_MAX_BIT; i++) {
 	ErtsProcLocks lock = ((ErtsProcLocks) 1) << i;
 	if (locks & lock) {
-	    long lock_count;
+	    erts_aint32_t lock_count;
 	    if (locked) {
-		lock_count = erts_smp_atomic_inctest(&p->lock.locked[i]);
+		lock_count = erts_smp_atomic32_inctest(&p->lock.locked[i]);
 		ERTS_LC_ASSERT(lock_count == 1);
 	    }
 	    else {
-		lock_count = erts_smp_atomic_dectest(&p->lock.locked[i]);
+		lock_count = erts_smp_atomic32_dectest(&p->lock.locked[i]);
 		ERTS_LC_ASSERT(lock_count == 0);
 	    }
 	}
diff --git a/erts/emulator/beam/erl_smp.h b/erts/emulator/beam/erl_smp.h
index 03d2a586e3..287327bfe1 100644
--- a/erts/emulator/beam/erl_smp.h
+++ b/erts/emulator/beam/erl_smp.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2005-2010. 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%
  */
 /*
@@ -43,27 +43,48 @@ typedef erts_thr_init_data_t erts_smp_thr_init_data_t;
 typedef erts_tid_t erts_smp_tid_t;
 typedef erts_mtx_t erts_smp_mtx_t;
 typedef erts_cnd_t erts_smp_cnd_t;
+#define ERTS_SMP_RWMTX_OPT_DEFAULT_INITER ERTS_RWMTX_OPT_DEFAULT_INITER
+#define ERTS_SMP_RWMTX_TYPE_NORMAL ERTS_RWMTX_TYPE_NORMAL
+#define ERTS_SMP_RWMTX_TYPE_FREQUENT_READ ERTS_RWMTX_TYPE_FREQUENT_READ
+#define ERTS_SMP_RWMTX_TYPE_EXTREMELY_FREQUENT_READ \
+  ERTS_RWMTX_TYPE_EXTREMELY_FREQUENT_READ
+#define ERTS_SMP_RWMTX_LONG_LIVED ERTS_RWMTX_LONG_LIVED
+#define ERTS_SMP_RWMTX_SHORT_LIVED ERTS_RWMTX_SHORT_LIVED
+#define ERTS_SMP_RWMTX_UNKNOWN_LIVED ERTS_RWMTX_UNKNOWN_LIVED
+typedef erts_rwmtx_opt_t erts_smp_rwmtx_opt_t;
 typedef erts_rwmtx_t erts_smp_rwmtx_t;
 typedef erts_tsd_key_t erts_smp_tsd_key_t;
-typedef erts_gate_t erts_smp_gate_t;
-typedef ethr_atomic_t erts_smp_atomic_t;
+typedef erts_atomic_t erts_smp_atomic_t;
+typedef erts_atomic32_t erts_smp_atomic32_t;
 typedef erts_spinlock_t erts_smp_spinlock_t;
 typedef erts_rwlock_t erts_smp_rwlock_t;
-typedef erts_thr_timeval_t erts_smp_thr_timeval_t;
 void erts_thr_fatal_error(int, char *); /* implemented in erl_init.c */
 
 #else /* #ifdef ERTS_SMP */
 
-#define ERTS_SMP_THR_OPTS_DEFAULT_INITER 0
+#define ERTS_SMP_THR_OPTS_DEFAULT_INITER {0}
 typedef int erts_smp_thr_opts_t;
 typedef int erts_smp_thr_init_data_t;
 typedef int erts_smp_tid_t;
 typedef int erts_smp_mtx_t;
 typedef int erts_smp_cnd_t;
+#define ERTS_SMP_RWMTX_OPT_DEFAULT_INITER {0}
+#define ERTS_SMP_RWMTX_TYPE_NORMAL 0
+#define ERTS_SMP_RWMTX_TYPE_FREQUENT_READ 0
+#define ERTS_SMP_RWMTX_TYPE_EXTREMELY_FREQUENT_READ 0
+#define ERTS_SMP_RWMTX_LONG_LIVED 0
+#define ERTS_SMP_RWMTX_SHORT_LIVED 0
+#define ERTS_SMP_RWMTX_UNKNOWN_LIVED 0
+typedef struct {
+    char type;
+    char lived;
+    int main_spincount;
+    int aux_spincount;
+} erts_smp_rwmtx_opt_t;
 typedef int erts_smp_rwmtx_t;
 typedef int erts_smp_tsd_key_t;
-typedef int erts_smp_gate_t;
-typedef long erts_smp_atomic_t;
+typedef SWord erts_smp_atomic_t;
+typedef Uint32 erts_smp_atomic32_t;
 #if __GNUC__ > 2
 typedef struct { } erts_smp_spinlock_t;
 typedef struct { } erts_smp_rwlock_t;
@@ -72,11 +93,6 @@ typedef struct { int gcc_is_buggy; } erts_smp_spinlock_t;
 typedef struct { int gcc_is_buggy; } erts_smp_rwlock_t;
 #endif
 
-typedef struct {
-    long tv_sec;
-    long tv_nsec;
-} erts_smp_thr_timeval_t;
-
 #endif /* #ifdef ERTS_SMP */
 
 ERTS_GLB_INLINE void erts_smp_thr_init(erts_smp_thr_init_data_t *id);
@@ -103,8 +119,6 @@ ERTS_GLB_INLINE void erts_smp_mtx_init_locked_x(erts_smp_mtx_t *mtx,
 ERTS_GLB_INLINE void erts_smp_mtx_init(erts_smp_mtx_t *mtx, char *name);
 ERTS_GLB_INLINE void erts_smp_mtx_init_locked(erts_smp_mtx_t *mtx, char *name);
 ERTS_GLB_INLINE void erts_smp_mtx_destroy(erts_smp_mtx_t *mtx);
-ERTS_GLB_INLINE void erts_smp_mtx_set_forksafe(erts_smp_mtx_t *mtx);
-ERTS_GLB_INLINE void erts_smp_mtx_unset_forksafe(erts_smp_mtx_t *mtx);
 ERTS_GLB_INLINE int erts_smp_mtx_trylock(erts_smp_mtx_t *mtx);
 #ifdef ERTS_ENABLE_LOCK_COUNT
 ERTS_GLB_INLINE void erts_smp_mtx_lock_x(erts_smp_mtx_t *mtx, char *file, int line);
@@ -119,9 +133,17 @@ ERTS_GLB_INLINE void erts_smp_cnd_wait(erts_smp_cnd_t *cnd,
 					   erts_smp_mtx_t *mtx);
 ERTS_GLB_INLINE void erts_smp_cnd_signal(erts_smp_cnd_t *cnd);
 ERTS_GLB_INLINE void erts_smp_cnd_broadcast(erts_smp_cnd_t *cnd);
+ERTS_GLB_INLINE void erts_smp_rwmtx_set_reader_group(int no);
+ERTS_GLB_INLINE void erts_smp_rwmtx_init_opt_x(erts_smp_rwmtx_t *rwmtx,
+					       erts_smp_rwmtx_opt_t *opt,
+					       char *name,
+					       Eterm extra);
 ERTS_GLB_INLINE void erts_smp_rwmtx_init_x(erts_smp_rwmtx_t *rwmtx,
 					   char *name,
 					   Eterm extra);
+ERTS_GLB_INLINE void erts_smp_rwmtx_init_opt(erts_smp_rwmtx_t *rwmtx,
+					     erts_smp_rwmtx_opt_t *opt,
+					     char *name);
 ERTS_GLB_INLINE void erts_smp_rwmtx_init(erts_smp_rwmtx_t *rwmtx,
 					 char *name);
 ERTS_GLB_INLINE void erts_smp_rwmtx_destroy(erts_smp_rwmtx_t *rwmtx);
@@ -138,23 +160,82 @@ ERTS_GLB_INLINE int erts_smp_rwmtx_tryrwlock(erts_smp_rwmtx_t *rwmtx);
 ERTS_GLB_INLINE void erts_smp_rwmtx_rwunlock(erts_smp_rwmtx_t *rwmtx);
 ERTS_GLB_INLINE int erts_smp_lc_rwmtx_is_rlocked(erts_smp_rwmtx_t *mtx);
 ERTS_GLB_INLINE int erts_smp_lc_rwmtx_is_rwlocked(erts_smp_rwmtx_t *mtx);
-ERTS_GLB_INLINE void erts_smp_atomic_init(erts_smp_atomic_t *var, long i);
-ERTS_GLB_INLINE void erts_smp_atomic_set(erts_smp_atomic_t *var, long i);
-ERTS_GLB_INLINE long erts_smp_atomic_read(erts_smp_atomic_t *var);
-ERTS_GLB_INLINE long erts_smp_atomic_inctest(erts_smp_atomic_t *incp);
-ERTS_GLB_INLINE long erts_smp_atomic_dectest(erts_smp_atomic_t *decp);
+ERTS_GLB_INLINE void erts_smp_atomic_init(erts_smp_atomic_t *var,
+					  erts_aint_t i);
+ERTS_GLB_INLINE void erts_smp_atomic_set(erts_smp_atomic_t *var, erts_aint_t i);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_read(erts_smp_atomic_t *var);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_inctest(erts_smp_atomic_t *incp);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_dectest(erts_smp_atomic_t *decp);
 ERTS_GLB_INLINE void erts_smp_atomic_inc(erts_smp_atomic_t *incp);
 ERTS_GLB_INLINE void erts_smp_atomic_dec(erts_smp_atomic_t *decp);
-ERTS_GLB_INLINE long erts_smp_atomic_addtest(erts_smp_atomic_t *addp,
-					     long i);
-ERTS_GLB_INLINE void erts_smp_atomic_add(erts_smp_atomic_t *addp, long i);
-ERTS_GLB_INLINE long erts_smp_atomic_xchg(erts_smp_atomic_t *xchgp,
-					  long new);
-ERTS_GLB_INLINE long erts_smp_atomic_cmpxchg(erts_smp_atomic_t *xchgp,
-					     long new,
-					     long expected);
-ERTS_GLB_INLINE long erts_smp_atomic_bor(erts_smp_atomic_t *var, long mask);
-ERTS_GLB_INLINE long erts_smp_atomic_band(erts_smp_atomic_t *var, long mask);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_addtest(erts_smp_atomic_t *addp,
+						    erts_aint_t i);
+ERTS_GLB_INLINE void erts_smp_atomic_add(erts_smp_atomic_t *addp,
+					 erts_aint_t i);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_xchg(erts_smp_atomic_t *xchgp,
+						 erts_aint_t new);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_cmpxchg(erts_smp_atomic_t *xchgp,
+						    erts_aint_t new,
+						    erts_aint_t expected);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_bor(erts_smp_atomic_t *var,
+						erts_aint_t mask);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_band(erts_smp_atomic_t *var,
+						 erts_aint_t mask);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_read_acqb(erts_smp_atomic_t *var);
+ERTS_GLB_INLINE void erts_smp_atomic_set_relb(erts_smp_atomic_t *var,
+					      erts_aint_t i);
+ERTS_GLB_INLINE void erts_smp_atomic_dec_relb(erts_smp_atomic_t *decp);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_dectest_relb(erts_smp_atomic_t *decp);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_cmpxchg_acqb(erts_smp_atomic_t *xchgp,
+							 erts_aint_t new,
+							 erts_aint_t exp);
+ERTS_GLB_INLINE erts_aint_t erts_smp_atomic_cmpxchg_relb(erts_smp_atomic_t *xchgp,
+							 erts_aint_t new,
+							 erts_aint_t exp);
+ERTS_GLB_INLINE void
+erts_smp_atomic32_init(erts_smp_atomic32_t *var, erts_aint32_t i);
+ERTS_GLB_INLINE void
+erts_smp_atomic32_set(erts_smp_atomic32_t *var, erts_aint32_t i);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_read(erts_smp_atomic32_t *var);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_inctest(erts_smp_atomic32_t *incp);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_dectest(erts_smp_atomic32_t *decp);
+ERTS_GLB_INLINE void
+erts_smp_atomic32_inc(erts_smp_atomic32_t *incp);
+ERTS_GLB_INLINE void
+erts_smp_atomic32_dec(erts_smp_atomic32_t *decp);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_addtest(erts_smp_atomic32_t *addp, erts_aint32_t i);
+ERTS_GLB_INLINE void
+erts_smp_atomic32_add(erts_smp_atomic32_t *addp, erts_aint32_t i);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_xchg(erts_smp_atomic32_t *xchgp, erts_aint32_t new);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_cmpxchg(erts_smp_atomic32_t *xchgp,
+			  erts_aint32_t new,
+			  erts_aint32_t expected);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_bor(erts_smp_atomic32_t *var, erts_aint32_t mask);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_band(erts_smp_atomic32_t *var, erts_aint32_t mask);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_read_acqb(erts_smp_atomic32_t *var);
+ERTS_GLB_INLINE void
+erts_smp_atomic32_set_relb(erts_smp_atomic32_t *var, erts_aint32_t i);
+ERTS_GLB_INLINE void
+erts_smp_atomic32_dec_relb(erts_smp_atomic32_t *decp);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_dectest_relb(erts_smp_atomic32_t *decp);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_cmpxchg_acqb(erts_smp_atomic32_t *xchgp,
+			       erts_aint32_t new,
+			       erts_aint32_t exp);
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_cmpxchg_relb(erts_smp_atomic32_t *xchgp,
+			       erts_aint32_t new,
+			       erts_aint32_t exp);
 ERTS_GLB_INLINE void erts_smp_spinlock_init_x(erts_smp_spinlock_t *lock,
 					      char *name,
 					      Eterm extra);
@@ -185,17 +266,10 @@ ERTS_GLB_INLINE void erts_smp_write_lock(erts_smp_rwlock_t *lock);
 ERTS_GLB_INLINE void erts_smp_write_unlock(erts_smp_rwlock_t *lock);
 ERTS_GLB_INLINE int erts_smp_lc_rwlock_is_rlocked(erts_smp_rwlock_t *lock);
 ERTS_GLB_INLINE int erts_smp_lc_rwlock_is_rwlocked(erts_smp_rwlock_t *lock);
-ERTS_GLB_INLINE void erts_smp_thr_time_now(erts_smp_thr_timeval_t *time);
 ERTS_GLB_INLINE void erts_smp_tsd_key_create(erts_smp_tsd_key_t *keyp);
 ERTS_GLB_INLINE void erts_smp_tsd_key_delete(erts_smp_tsd_key_t key);
 ERTS_GLB_INLINE void erts_smp_tsd_set(erts_smp_tsd_key_t key, void *value);
 ERTS_GLB_INLINE void * erts_smp_tsd_get(erts_smp_tsd_key_t key);
-ERTS_GLB_INLINE void erts_smp_gate_init(erts_smp_gate_t *gp);
-ERTS_GLB_INLINE void erts_smp_gate_destroy(erts_smp_gate_t *gp);
-ERTS_GLB_INLINE void erts_smp_gate_close(erts_smp_gate_t *gp);
-ERTS_GLB_INLINE void erts_smp_gate_let_through(erts_smp_gate_t *gp, unsigned no);
-ERTS_GLB_INLINE void erts_smp_gate_wait(erts_smp_gate_t *gp);
-ERTS_GLB_INLINE void erts_smp_gate_swait(erts_smp_gate_t *gp, int spincount);
 
 #ifdef ERTS_THR_HAVE_SIG_FUNCS
 #define ERTS_SMP_THR_HAVE_SIG_FUNCS 1
@@ -331,22 +405,6 @@ erts_smp_mtx_destroy(erts_smp_mtx_t *mtx)
 #endif
 }
 
-ERTS_GLB_INLINE void
-erts_smp_mtx_set_forksafe(erts_smp_mtx_t *mtx)
-{
-#ifdef ERTS_SMP
-    erts_mtx_set_forksafe(mtx);
-#endif
-}
-
-ERTS_GLB_INLINE void
-erts_smp_mtx_unset_forksafe(erts_smp_mtx_t *mtx)
-{
-#ifdef ERTS_SMP
-    erts_mtx_unset_forksafe(mtx);
-#endif
-}
-
 ERTS_GLB_INLINE int
 erts_smp_mtx_trylock(erts_smp_mtx_t *mtx)
 {
@@ -433,6 +491,25 @@ erts_smp_cnd_broadcast(erts_smp_cnd_t *cnd)
 }
 
 ERTS_GLB_INLINE void
+erts_smp_rwmtx_set_reader_group(int no)
+{
+#ifdef ERTS_SMP
+    erts_rwmtx_set_reader_group(no);
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_rwmtx_init_opt_x(erts_smp_rwmtx_t *rwmtx,
+			  erts_smp_rwmtx_opt_t *opt,
+			  char *name,
+			  Eterm extra)
+{
+#ifdef ERTS_SMP
+    erts_rwmtx_init_opt_x(rwmtx, opt, name, extra);
+#endif
+}
+
+ERTS_GLB_INLINE void
 erts_smp_rwmtx_init_x(erts_smp_rwmtx_t *rwmtx, char *name, Eterm extra)
 {
 #ifdef ERTS_SMP
@@ -441,6 +518,16 @@ erts_smp_rwmtx_init_x(erts_smp_rwmtx_t *rwmtx, char *name, Eterm extra)
 }
 
 ERTS_GLB_INLINE void
+erts_smp_rwmtx_init_opt(erts_smp_rwmtx_t *rwmtx,
+			erts_smp_rwmtx_opt_t *opt,
+			char *name)
+{
+#ifdef ERTS_SMP
+    erts_rwmtx_init_opt(rwmtx, opt, name);
+#endif
+}
+
+ERTS_GLB_INLINE void
 erts_smp_rwmtx_init(erts_smp_rwmtx_t *rwmtx, char *name)
 {
 #ifdef ERTS_SMP
@@ -568,7 +655,7 @@ erts_smp_lc_rwmtx_is_rwlocked(erts_smp_rwmtx_t *mtx)
 }
 
 ERTS_GLB_INLINE void
-erts_smp_atomic_init(erts_smp_atomic_t *var, long i)
+erts_smp_atomic_init(erts_smp_atomic_t *var, erts_aint_t i)
 {
 #ifdef ERTS_SMP
     erts_atomic_init(var, i);
@@ -578,7 +665,7 @@ erts_smp_atomic_init(erts_smp_atomic_t *var, long i)
 }
 
 ERTS_GLB_INLINE void
-erts_smp_atomic_set(erts_smp_atomic_t *var, long i)
+erts_smp_atomic_set(erts_smp_atomic_t *var, erts_aint_t i)
 {
 #ifdef ERTS_SMP
     erts_atomic_set(var, i);
@@ -587,7 +674,7 @@ erts_smp_atomic_set(erts_smp_atomic_t *var, long i)
 #endif
 }
 
-ERTS_GLB_INLINE long
+ERTS_GLB_INLINE erts_aint_t
 erts_smp_atomic_read(erts_smp_atomic_t *var)
 {
 #ifdef ERTS_SMP
@@ -597,7 +684,7 @@ erts_smp_atomic_read(erts_smp_atomic_t *var)
 #endif
 }
 
-ERTS_GLB_INLINE long
+ERTS_GLB_INLINE erts_aint_t
 erts_smp_atomic_inctest(erts_smp_atomic_t *incp)
 {
 #ifdef ERTS_SMP
@@ -607,7 +694,7 @@ erts_smp_atomic_inctest(erts_smp_atomic_t *incp)
 #endif
 }
 
-ERTS_GLB_INLINE long
+ERTS_GLB_INLINE erts_aint_t
 erts_smp_atomic_dectest(erts_smp_atomic_t *decp)
 {
 #ifdef ERTS_SMP
@@ -637,8 +724,8 @@ erts_smp_atomic_dec(erts_smp_atomic_t *decp)
 #endif
 }
 
-ERTS_GLB_INLINE long
-erts_smp_atomic_addtest(erts_smp_atomic_t *addp, long i)
+ERTS_GLB_INLINE erts_aint_t
+erts_smp_atomic_addtest(erts_smp_atomic_t *addp, erts_aint_t i)
 {
 #ifdef ERTS_SMP
     return erts_atomic_addtest(addp, i);
@@ -648,7 +735,7 @@ erts_smp_atomic_addtest(erts_smp_atomic_t *addp, long i)
 }
 
 ERTS_GLB_INLINE void
-erts_smp_atomic_add(erts_smp_atomic_t *addp, long i)
+erts_smp_atomic_add(erts_smp_atomic_t *addp, erts_aint_t i)
 {
 #ifdef ERTS_SMP
     erts_atomic_add(addp, i);
@@ -657,58 +744,344 @@ erts_smp_atomic_add(erts_smp_atomic_t *addp, long i)
 #endif
 }
 
-ERTS_GLB_INLINE long
-erts_smp_atomic_xchg(erts_smp_atomic_t *xchgp, long new)
+ERTS_GLB_INLINE erts_aint_t
+erts_smp_atomic_xchg(erts_smp_atomic_t *xchgp, erts_aint_t new)
 {
 #ifdef ERTS_SMP
     return erts_atomic_xchg(xchgp, new);
 #else
-    long old;
+    erts_aint_t old;
     old = *xchgp;
     *xchgp = new;
     return old;
 #endif
 }
 
-ERTS_GLB_INLINE long
-erts_smp_atomic_cmpxchg(erts_smp_atomic_t *xchgp, long new, long expected)
+ERTS_GLB_INLINE erts_aint_t
+erts_smp_atomic_cmpxchg(erts_smp_atomic_t *xchgp,
+			erts_aint_t new,
+			erts_aint_t expected)
 {
 #ifdef ERTS_SMP
     return erts_atomic_cmpxchg(xchgp, new, expected);
 #else
-    long old = *xchgp;
+    erts_aint_t old = *xchgp;
     if (old == expected)
         *xchgp = new;
     return old;
 #endif
 }
 
-ERTS_GLB_INLINE long
-erts_smp_atomic_bor(erts_smp_atomic_t *var, long mask)
+ERTS_GLB_INLINE erts_aint_t
+erts_smp_atomic_bor(erts_smp_atomic_t *var, erts_aint_t mask)
 {
 #ifdef ERTS_SMP
     return erts_atomic_bor(var, mask);
 #else
-    long old;
+    erts_aint_t old;
     old = *var;
     *var |= mask;
     return old;
 #endif
 }
 
-ERTS_GLB_INLINE long
-erts_smp_atomic_band(erts_smp_atomic_t *var, long mask)
+ERTS_GLB_INLINE erts_aint_t
+erts_smp_atomic_band(erts_smp_atomic_t *var, erts_aint_t mask)
 {
 #ifdef ERTS_SMP
     return erts_atomic_band(var, mask);
 #else
-    long old;
+    erts_aint_t old;
+    old = *var;
+    *var &= mask;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint_t
+erts_smp_atomic_read_acqb(erts_smp_atomic_t *var)
+{
+#ifdef ERTS_SMP
+    return erts_atomic_read_acqb(var);
+#else
+    return *var;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_atomic_set_relb(erts_smp_atomic_t *var, erts_aint_t i)
+{
+#ifdef ERTS_SMP
+    erts_atomic_set_relb(var, i);
+#else
+    *var = i;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_atomic_dec_relb(erts_smp_atomic_t *decp)
+{
+#ifdef ERTS_SMP
+    erts_atomic_dec_relb(decp);
+#else
+    --(*decp);
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint_t
+erts_smp_atomic_dectest_relb(erts_smp_atomic_t *decp)
+{
+#ifdef ERTS_SMP
+    return erts_atomic_dectest_relb(decp);
+#else
+    return --(*decp);
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint_t
+erts_smp_atomic_cmpxchg_acqb(erts_smp_atomic_t *xchgp,
+			     erts_aint_t new,
+			     erts_aint_t exp)
+{
+#ifdef ERTS_SMP
+    return erts_atomic_cmpxchg_acqb(xchgp, new, exp);
+#else
+    erts_aint_t old = *xchgp;
+    if (old == exp)
+        *xchgp = new;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint_t
+erts_smp_atomic_cmpxchg_relb(erts_smp_atomic_t *xchgp,
+			     erts_aint_t new,
+			     erts_aint_t exp)
+{
+#ifdef ERTS_SMP
+    return erts_atomic_cmpxchg_relb(xchgp, new, exp);
+#else
+    erts_aint_t old = *xchgp;
+    if (old == exp)
+        *xchgp = new;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_atomic32_init(erts_smp_atomic32_t *var, erts_aint32_t i)
+{
+#ifdef ERTS_SMP
+    erts_atomic32_init(var, i);
+#else
+    *var = i;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_atomic32_set(erts_smp_atomic32_t *var, erts_aint32_t i)
+{
+#ifdef ERTS_SMP
+    erts_atomic32_set(var, i);
+#else
+    *var = i;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_read(erts_smp_atomic32_t *var)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_read(var);
+#else
+    return *var;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_inctest(erts_smp_atomic32_t *incp)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_inctest(incp);
+#else
+    return ++(*incp);
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_dectest(erts_smp_atomic32_t *decp)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_dectest(decp);
+#else
+    return --(*decp);
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_atomic32_inc(erts_smp_atomic32_t *incp)
+{
+#ifdef ERTS_SMP
+    erts_atomic32_inc(incp);
+#else
+    ++(*incp);
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_atomic32_dec(erts_smp_atomic32_t *decp)
+{
+#ifdef ERTS_SMP
+    erts_atomic32_dec(decp);
+#else
+    --(*decp);
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_addtest(erts_smp_atomic32_t *addp, erts_aint32_t i)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_addtest(addp, i);
+#else
+    return *addp += i;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_atomic32_add(erts_smp_atomic32_t *addp, erts_aint32_t i)
+{
+#ifdef ERTS_SMP
+    erts_atomic32_add(addp, i);
+#else
+    *addp += i;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_xchg(erts_smp_atomic32_t *xchgp, erts_aint32_t new)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_xchg(xchgp, new);
+#else
+    erts_aint32_t old;
+    old = *xchgp;
+    *xchgp = new;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_cmpxchg(erts_smp_atomic32_t *xchgp,
+			  erts_aint32_t new,
+			  erts_aint32_t expected)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_cmpxchg(xchgp, new, expected);
+#else
+    erts_aint32_t old = *xchgp;
+    if (old == expected)
+        *xchgp = new;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_bor(erts_smp_atomic32_t *var, erts_aint32_t mask)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_bor(var, mask);
+#else
+    erts_aint32_t old;
+    old = *var;
+    *var |= mask;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_band(erts_smp_atomic32_t *var, erts_aint32_t mask)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_band(var, mask);
+#else
+    erts_aint32_t old;
     old = *var;
     *var &= mask;
     return old;
 #endif
 }
 
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_read_acqb(erts_smp_atomic32_t *var)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_read_acqb(var);
+#else
+    return *var;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_atomic32_set_relb(erts_smp_atomic32_t *var, erts_aint32_t i)
+{
+#ifdef ERTS_SMP
+    erts_atomic32_set_relb(var, i);
+#else
+    *var = i;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_atomic32_dec_relb(erts_smp_atomic32_t *decp)
+{
+#ifdef ERTS_SMP
+    erts_atomic32_dec_relb(decp);
+#else
+    --(*decp);
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_dectest_relb(erts_smp_atomic32_t *decp)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_dectest_relb(decp);
+#else
+    return --(*decp);
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_cmpxchg_acqb(erts_smp_atomic32_t *xchgp,
+			       erts_aint32_t new,
+			       erts_aint32_t exp)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_cmpxchg_acqb(xchgp, new, exp);
+#else
+    erts_aint32_t old = *xchgp;
+    if (old == exp)
+        *xchgp = new;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_smp_atomic32_cmpxchg_relb(erts_smp_atomic32_t *xchgp,
+			       erts_aint32_t new,
+			       erts_aint32_t exp)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_cmpxchg_relb(xchgp, new, exp);
+#else
+    erts_aint32_t old = *xchgp;
+    if (old == exp)
+        *xchgp = new;
+    return old;
+#endif
+}
+
 ERTS_GLB_INLINE void
 erts_smp_spinlock_init_x(erts_smp_spinlock_t *lock, char *name, Eterm extra)
 {
@@ -878,14 +1251,6 @@ erts_smp_lc_rwlock_is_rwlocked(erts_smp_rwlock_t *lock)
 }
 
 ERTS_GLB_INLINE void
-erts_smp_thr_time_now(erts_smp_thr_timeval_t *time)
-{
-#ifdef ERTS_SMP
-    erts_thr_time_now(time);
-#endif
-}
-
-ERTS_GLB_INLINE void
 erts_smp_tsd_key_create(erts_smp_tsd_key_t *keyp)
 {
 #ifdef ERTS_SMP
@@ -919,54 +1284,6 @@ erts_smp_tsd_get(erts_smp_tsd_key_t key)
 #endif
 }
 
-ERTS_GLB_INLINE void
-erts_smp_gate_init(erts_smp_gate_t *gp)
-{
-#ifdef ERTS_SMP
-    erts_gate_init((erts_gate_t *) gp);
-#endif
-}
-
-ERTS_GLB_INLINE void
-erts_smp_gate_destroy(erts_smp_gate_t *gp)
-{
-#ifdef ERTS_SMP
-    erts_gate_destroy((erts_gate_t *) gp);
-#endif
-}
-
-ERTS_GLB_INLINE void
-erts_smp_gate_close(erts_smp_gate_t *gp)
-{
-#ifdef ERTS_SMP
-    erts_gate_close((erts_gate_t *) gp);
-#endif
-}
-
-ERTS_GLB_INLINE void
-erts_smp_gate_let_through(erts_smp_gate_t *gp, unsigned no)
-{
-#ifdef ERTS_SMP
-    erts_gate_let_through((erts_gate_t *) gp, no);
-#endif
-}
-
-ERTS_GLB_INLINE void
-erts_smp_gate_wait(erts_smp_gate_t *gp)
-{
-#ifdef ERTS_SMP
-    erts_gate_wait((erts_gate_t *) gp);
-#endif
-}
-
-ERTS_GLB_INLINE void
-erts_smp_gate_swait(erts_smp_gate_t *gp, int spincount)
-{
-#ifdef ERTS_SMP
-    erts_gate_swait((erts_gate_t *) gp, spincount);
-#endif
-}
-
 #ifdef ERTS_THR_HAVE_SIG_FUNCS
 #define ERTS_SMP_THR_HAVE_SIG_FUNCS 1
 
diff --git a/erts/emulator/beam/erl_term.c b/erts/emulator/beam/erl_term.c
index c6458a0e45..f77e8b798f 100644
--- a/erts/emulator/beam/erl_term.c
+++ b/erts/emulator/beam/erl_term.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2000-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2000-2011. 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
@@ -58,9 +58,9 @@ do { \
 #endif
 
 #if ET_DEBUG
-unsigned tag_val_def_debug(Eterm x, const char *file, unsigned line)
+unsigned tag_val_def_debug(Wterm x, const char *file, unsigned line)
 #else
-unsigned tag_val_def(Eterm x)
+unsigned tag_val_def(Wterm x)
 #define file __FILE__
 #define line __LINE__
 #endif
@@ -125,10 +125,10 @@ FUNTY checked_##FUN(ARGTY x, const char *file, unsigned line) \
 
 ET_DEFINE_CHECKED(Eterm,make_boxed,Eterm*,_is_taggable_pointer);
 ET_DEFINE_CHECKED(int,is_boxed,Eterm,!is_header);
-ET_DEFINE_CHECKED(Eterm*,boxed_val,Eterm,_boxed_precond);
+ET_DEFINE_CHECKED(Eterm*,boxed_val,Wterm,_boxed_precond);
 ET_DEFINE_CHECKED(Eterm,make_list,Eterm*,_is_taggable_pointer);
 ET_DEFINE_CHECKED(int,is_not_list,Eterm,!is_header);
-ET_DEFINE_CHECKED(Eterm*,list_val,Eterm,_list_precond);
+ET_DEFINE_CHECKED(Eterm*,list_val,Wterm,_list_precond);
 ET_DEFINE_CHECKED(Uint,unsigned_val,Eterm,is_small);
 ET_DEFINE_CHECKED(Sint,signed_val,Eterm,is_small);
 ET_DEFINE_CHECKED(Uint,atom_val,Eterm,is_atom);
@@ -136,34 +136,35 @@ ET_DEFINE_CHECKED(Uint,header_arity,Eterm,is_header);
 ET_DEFINE_CHECKED(Uint,arityval,Eterm,is_arity_value);
 ET_DEFINE_CHECKED(Uint,thing_arityval,Eterm,is_thing);
 ET_DEFINE_CHECKED(Uint,thing_subtag,Eterm,is_thing);
-ET_DEFINE_CHECKED(Eterm*,binary_val,Eterm,is_binary);
-ET_DEFINE_CHECKED(Eterm*,fun_val,Eterm,is_fun);
+ET_DEFINE_CHECKED(Eterm*,binary_val,Wterm,is_binary);
+ET_DEFINE_CHECKED(Eterm*,fun_val,Wterm,is_fun);
 ET_DEFINE_CHECKED(int,bignum_header_is_neg,Eterm,_is_bignum_header);
 ET_DEFINE_CHECKED(Eterm,bignum_header_neg,Eterm,_is_bignum_header);
 ET_DEFINE_CHECKED(Uint,bignum_header_arity,Eterm,_is_bignum_header);
-ET_DEFINE_CHECKED(Eterm*,big_val,Eterm,is_big);
-ET_DEFINE_CHECKED(Eterm*,float_val,Eterm,is_float);
-ET_DEFINE_CHECKED(Eterm*,tuple_val,Eterm,is_tuple);
+ET_DEFINE_CHECKED(Eterm*,big_val,Wterm,is_big);
+ET_DEFINE_CHECKED(Eterm*,float_val,Wterm,is_float);
+ET_DEFINE_CHECKED(Eterm*,tuple_val,Wterm,is_tuple);
 ET_DEFINE_CHECKED(Uint,internal_pid_data,Eterm,is_internal_pid);
 ET_DEFINE_CHECKED(struct erl_node_*,internal_pid_node,Eterm,is_internal_pid);
 ET_DEFINE_CHECKED(Uint,internal_port_data,Eterm,is_internal_port);
 ET_DEFINE_CHECKED(struct erl_node_*,internal_port_node,Eterm,is_internal_port);
-ET_DEFINE_CHECKED(Eterm*,internal_ref_val,Eterm,is_internal_ref);
-ET_DEFINE_CHECKED(Uint,internal_ref_data_words,Eterm,is_internal_ref);
-ET_DEFINE_CHECKED(Uint32*,internal_ref_data,Eterm,is_internal_ref);
+ET_DEFINE_CHECKED(Eterm*,internal_ref_val,Wterm,is_internal_ref);
+ET_DEFINE_CHECKED(Uint,internal_ref_data_words,Wterm,is_internal_ref);
+ET_DEFINE_CHECKED(Uint32*,internal_ref_data,Wterm,is_internal_ref);
 ET_DEFINE_CHECKED(struct erl_node_*,internal_ref_node,Eterm,is_internal_ref);
-ET_DEFINE_CHECKED(Eterm*,external_val,Eterm,is_external);
-ET_DEFINE_CHECKED(Uint,external_data_words,Eterm,is_external);
-ET_DEFINE_CHECKED(Uint,external_pid_data_words,Eterm,is_external_pid);
-ET_DEFINE_CHECKED(Uint,external_pid_data,Eterm,is_external_pid);
-ET_DEFINE_CHECKED(struct erl_node_*,external_pid_node,Eterm,is_external_pid);
-ET_DEFINE_CHECKED(Uint,external_port_data_words,Eterm,is_external_port);
-ET_DEFINE_CHECKED(Uint,external_port_data,Eterm,is_external_port);
-ET_DEFINE_CHECKED(struct erl_node_*,external_port_node,Eterm,is_external_port);
-ET_DEFINE_CHECKED(Uint,external_ref_data_words,Eterm,is_external_ref);
-ET_DEFINE_CHECKED(Uint32*,external_ref_data,Eterm,is_external_ref);
+ET_DEFINE_CHECKED(Eterm*,external_val,Wterm,is_external);
+ET_DEFINE_CHECKED(Uint,external_data_words,Wterm,is_external);
+ET_DEFINE_CHECKED(Uint,external_pid_data_words,Wterm,is_external_pid);
+ET_DEFINE_CHECKED(Uint,external_pid_data,Wterm,is_external_pid);
+ET_DEFINE_CHECKED(struct erl_node_*,external_pid_node,Wterm,is_external_pid);
+ET_DEFINE_CHECKED(Uint,external_port_data_words,Wterm,is_external_port);
+ET_DEFINE_CHECKED(Uint,external_port_data,Wterm,is_external_port);
+ET_DEFINE_CHECKED(struct erl_node_*,external_port_node,Wterm,is_external_port);
+ET_DEFINE_CHECKED(Uint,external_ref_data_words,Wterm,is_external_ref);
+ET_DEFINE_CHECKED(Uint32*,external_ref_data,Wterm,is_external_ref);
 ET_DEFINE_CHECKED(struct erl_node_*,external_ref_node,Eterm,is_external_ref);
-ET_DEFINE_CHECKED(Eterm*,export_val,Eterm,is_export);
+ET_DEFINE_CHECKED(Eterm*,export_val,Wterm,is_export);
+ET_DEFINE_CHECKED(Uint,external_thing_data_words,ExternalThing*,is_thing_ptr);
 
 ET_DEFINE_CHECKED(Eterm,make_cp,UWord *,_is_taggable_pointer);
 ET_DEFINE_CHECKED(UWord *,cp_val,Eterm,is_CP);
diff --git a/erts/emulator/beam/erl_term.h b/erts/emulator/beam/erl_term.h
index 3a8c30fe6a..1d75fa313c 100644
--- a/erts/emulator/beam/erl_term.h
+++ b/erts/emulator/beam/erl_term.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2000-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2000-2011. 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
@@ -22,6 +22,8 @@
 
 #include "sys.h" /* defines HALFWORD_HEAP */
 
+typedef UWord Wterm;  /* Full word terms */
+
 #if HALFWORD_HEAP
 #  define HEAP_ON_C_STACK 0
 #  if HALFWORD_ASSERT
@@ -193,7 +195,7 @@ struct erl_node_; /* Declared in erl_node_tables.h */
 #endif
 #define _is_aligned(x)		(((Uint)(x) & 0x3) == 0)
 #define _unchecked_make_boxed(x) ((Uint) COMPRESS_POINTER(x) + TAG_PRIMARY_BOXED)
-_ET_DECLARE_CHECKED(Eterm,make_boxed,Eterm*);
+_ET_DECLARE_CHECKED(Eterm,make_boxed,Eterm*)
 #define make_boxed(x)		_ET_APPLY(make_boxed,(x))
 #if 1
 #define _is_not_boxed(x)	((x) & (_TAG_PRIMARY_MASK-TAG_PRIMARY_BOXED))
@@ -204,12 +206,12 @@ _ET_DECLARE_CHECKED(int,is_boxed,Eterm)
 #define is_boxed(x)		(((x) & _TAG_PRIMARY_MASK) == TAG_PRIMARY_BOXED)
 #endif
 #define _unchecked_boxed_val(x) ((Eterm*) EXPAND_POINTER(((x) - TAG_PRIMARY_BOXED)))
-_ET_DECLARE_CHECKED(Eterm*,boxed_val,Eterm);
+_ET_DECLARE_CHECKED(Eterm*,boxed_val,Wterm)
 #define boxed_val(x)		_ET_APPLY(boxed_val,(x))
 
 /* cons cell ("list") access methods */
 #define _unchecked_make_list(x)	((Uint) COMPRESS_POINTER(x) + TAG_PRIMARY_LIST)
-_ET_DECLARE_CHECKED(Eterm,make_list,Eterm*);
+_ET_DECLARE_CHECKED(Eterm,make_list,Eterm*)
 #define make_list(x)		_ET_APPLY(make_list,(x))
 #if 1
 #define _unchecked_is_not_list(x) ((x) & (_TAG_PRIMARY_MASK-TAG_PRIMARY_LIST))
@@ -226,7 +228,7 @@ _ET_DECLARE_CHECKED(int,is_not_list,Eterm)
 #define _list_precond(x)       (is_list(x))
 #endif
 #define _unchecked_list_val(x) ((Eterm*) EXPAND_POINTER((x) - TAG_PRIMARY_LIST))
-_ET_DECLARE_CHECKED(Eterm*,list_val,Eterm);
+_ET_DECLARE_CHECKED(Eterm*,list_val,Wterm)
 #define list_val(x)		_ET_APPLY(list_val,(x))
 
 #define CONS(hp, car, cdr) \
@@ -240,6 +242,8 @@ _ET_DECLARE_CHECKED(Eterm*,list_val,Eterm);
 #define ptr_val(x)		_unchecked_ptr_val((x))	/*XXX*/
 #define _unchecked_offset_ptr(x,offs)	((x)+((offs)*sizeof(Eterm)))
 #define offset_ptr(x,offs)	_unchecked_offset_ptr(x,offs)	/*XXX*/
+#define _unchecked_byte_offset_ptr(x,byte_offs)	((x)+(offs))
+#define byte_offset_ptr(x,offs) _unchecked_byte_offset_ptr(x,offs)  /*XXX*/
 
 /* fixnum ("small") access methods */
 #if defined(ARCH_64) && !HALFWORD_HEAP
@@ -305,6 +309,7 @@ _ET_DECLARE_CHECKED(Uint,arityval,Eterm)
 
 /* thing access methods */
 #define is_thing(x)	(is_header((x)) && header_is_thing((x)))
+#define is_thing_ptr(t) (is_thing((t)->header))
 #define _unchecked_thing_arityval(x)	_unchecked_header_arity((x))
 _ET_DECLARE_CHECKED(Uint,thing_arityval,Eterm)
 #define thing_arityval(x)	_ET_APPLY(thing_arityval,(x))
@@ -339,7 +344,7 @@ _ET_DECLARE_CHECKED(Uint,thing_subtag,Eterm)
 #define is_binary(x)	(is_boxed((x)) && is_binary_header(*boxed_val((x))))
 #define is_not_binary(x) (!is_binary((x)))
 #define _unchecked_binary_val(x) _unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,binary_val,Eterm)
+_ET_DECLARE_CHECKED(Eterm*,binary_val,Wterm)
 #define binary_val(x)	_ET_APPLY(binary_val,(x))
 
 /* process binaries stuff (special case of binaries) */
@@ -356,7 +361,7 @@ _ET_DECLARE_CHECKED(Eterm*,binary_val,Eterm)
 #define is_fun(x)		(is_boxed((x)) && is_fun_header(*boxed_val((x))))
 #define is_not_fun(x)		(!is_fun((x)))
 #define _unchecked_fun_val(x)   _unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,fun_val,Eterm)
+_ET_DECLARE_CHECKED(Eterm*,fun_val,Wterm)
 #define fun_val(x)		_ET_APPLY(fun_val,(x))
 
 /* export access methods */
@@ -364,7 +369,7 @@ _ET_DECLARE_CHECKED(Eterm*,fun_val,Eterm)
 #define is_export(x)     (is_boxed((x)) && is_export_header(*boxed_val((x))))
 #define is_not_export(x) (!is_export((x)))
 #define _unchecked_export_val(x)   _unchecked_boxed_val(x)
-_ET_DECLARE_CHECKED(Eterm*,export_val,Eterm)
+_ET_DECLARE_CHECKED(Eterm*,export_val,Wterm)
 #define export_val(x)	_ET_APPLY(export_val,(x))
 #define is_export_header(x)	((x) == HEADER_EXPORT)
 #if HALFWORD_HEAP
@@ -391,7 +396,7 @@ _ET_DECLARE_CHECKED(Uint,bignum_header_arity,Eterm)
 #define is_big(x)	(is_boxed((x)) && _is_bignum_header(*boxed_val((x))))
 #define is_not_big(x)	(!is_big((x)))
 #define _unchecked_big_val(x)	_unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,big_val,Eterm)
+_ET_DECLARE_CHECKED(Eterm*,big_val,Wterm)
 #define big_val(x)		_ET_APPLY(big_val,(x))
 
 /* flonum ("float") access methods */
@@ -404,7 +409,7 @@ _ET_DECLARE_CHECKED(Eterm*,big_val,Eterm)
 #define is_float(x)	(is_boxed((x)) && *boxed_val((x)) == HEADER_FLONUM)
 #define is_not_float(x)	(!is_float(x))
 #define _unchecked_float_val(x)	_unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,float_val,Eterm)
+_ET_DECLARE_CHECKED(Eterm*,float_val,Wterm)
 #define float_val(x)	_ET_APPLY(float_val,(x))
 
 /* Float definition for byte and word access */
@@ -422,15 +427,16 @@ typedef union float_def
 } FloatDef;
 
 #if defined(ARCH_64) && !HALFWORD_HEAP
-#define GET_DOUBLE(x, f) (f).fdw = *(float_val(x)+1)
+
+#define FLOAT_VAL_GET_DOUBLE(fval, f) (f).fdw = *((fval)+1)
 
 #define PUT_DOUBLE(f, x)  *(x) = HEADER_FLONUM, \
                           *((x)+1) = (f).fdw
 #define GET_DOUBLE_DATA(p, f) (f).fdw = *((Uint *) (p))
 #define PUT_DOUBLE_DATA(f,p) *((Uint *) (p)) = (f).fdw
 #else
-#define GET_DOUBLE(x, f) (f).fw[0] = *(float_val(x)+1), \
-                         (f).fw[1] = *(float_val(x)+2)
+#define FLOAT_VAL_GET_DOUBLE(fval, f) (f).fw[0] = *((fval)+1), \
+				      (f).fw[1] = *((fval)+2)
 
 #define PUT_DOUBLE(f, x)  *(x) = HEADER_FLONUM, \
                           *((x)+1) = (f).fw[0], \
@@ -440,6 +446,9 @@ typedef union float_def
 #define PUT_DOUBLE_DATA(f,p) *((Uint *) (p)) = (f).fw[0],\
                              *(((Uint *) (p))+1) = (f).fw[1]
 #endif
+
+#define GET_DOUBLE(x, f) FLOAT_VAL_GET_DOUBLE(float_val(x), f)
+
 #define DOUBLE_DATA_WORDS (sizeof(ieee754_8)/sizeof(Eterm))
 #define FLOAT_SIZE_OBJECT (DOUBLE_DATA_WORDS+1)
 
@@ -451,7 +460,7 @@ typedef union float_def
    (is_boxed((x)) && *boxed_val((x)) == make_arityval((a)))
 #define is_not_tuple_arity(x, a) (!is_tuple_arity((x),(a)))
 #define _unchecked_tuple_val(x)	_unchecked_boxed_val(x)
-_ET_DECLARE_CHECKED(Eterm*,tuple_val,Eterm)
+_ET_DECLARE_CHECKED(Eterm*,tuple_val,Wterm)
 #define tuple_val(x)	_ET_APPLY(tuple_val,(x))
 
 #define TUPLE0(t) \
@@ -790,21 +799,24 @@ do {									\
   ((RefThing*) internal_ref_val(x))
 
 #define is_internal_ref(x) \
-  (_unchecked_is_boxed((x)) && is_ref_thing_header(*boxed_val((x))))
+    (_unchecked_is_boxed((x)) && is_ref_thing_header(*boxed_val((x))))
+
 #define is_not_internal_ref(x) \
   (!is_internal_ref((x)))
 
 #define _unchecked_internal_ref_val(x) _unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,internal_ref_val,Eterm)
+_ET_DECLARE_CHECKED(Eterm*,internal_ref_val,Wterm)
 #define internal_ref_val(x) _ET_APPLY(internal_ref_val,(x))
 
+#define internal_thing_ref_data_words(t) (thing_arityval(*(Eterm*)(t)))
 #define _unchecked_internal_ref_data_words(x) \
  (_unchecked_thing_arityval(*_unchecked_internal_ref_val(x)))
-_ET_DECLARE_CHECKED(Uint,internal_ref_data_words,Eterm)
+_ET_DECLARE_CHECKED(Uint,internal_ref_data_words,Wterm)
 #define internal_ref_data_words(x) _ET_APPLY(internal_ref_data_words,(x))
 
-#define _unchecked_internal_ref_data(x) (_unchecked_ref_thing_ptr(x)->data.ui32)
-_ET_DECLARE_CHECKED(Uint32*,internal_ref_data,Eterm)
+#define internal_thing_ref_data(thing) ((thing)->data.ui32)
+#define _unchecked_internal_ref_data(x) (internal_thing_ref_data(_unchecked_ref_thing_ptr(x)))
+_ET_DECLARE_CHECKED(Uint32*,internal_ref_data,Wterm)
 #define internal_ref_data(x) _ET_APPLY(internal_ref_data,(x))
 
 #define _unchecked_internal_ref_node(x) erts_this_node
@@ -821,10 +833,10 @@ _ET_DECLARE_CHECKED(struct erl_node_*,internal_ref_node,Eterm)
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |A A A A A A A A A A A A A A A A A A A A A A A A A A|t t t t|0 0| Thing
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N| Next
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |E E E E E E E E E E E E E E E E E E E E E E E E E E E E E E E E| ErlNode
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N| Next
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X| Data 0
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  .                                                               .   .
@@ -835,7 +847,7 @@ _ET_DECLARE_CHECKED(struct erl_node_*,internal_ref_node,Eterm)
  *  t : External pid thing tag  (1100)
  *  t : External port thing tag (1101)
  *  t : External ref thing tag  (1110)
- *  N : Next (external thing) pointer
+ *  N : Next (off_heap) pointer
  *  E : ErlNode pointer
  *  X : Type specific data
  *
@@ -852,13 +864,16 @@ _ET_DECLARE_CHECKED(struct erl_node_*,internal_ref_node,Eterm)
 /* XXX:PaN - this structure is not perfect for halfword heap, it takes
    a lot of memory due to padding, and the array will not begin at the end of the
    structure, as otherwise expected. Be sure to access data.ui32 array and not try
-   to do pointer manipulation on an Eterm * to reach the actual data... */
+   to do pointer manipulation on an Eterm * to reach the actual data...
 
+   XXX:Sverk - Problem made worse by "one off-heap list" when 'next' pointer
+     must align with 'next' in ProcBin, erl_fun_thing and erl_off_heap_header.
+*/
 typedef struct external_thing_ {
     /*                                 ----+                        */
     Eterm                   header;     /* |                        */
-    struct external_thing_ *next;       /*  > External thing head   */
-    struct erl_node_       *node;       /* |                        */
+    struct erl_node_*       node;       /*  > External thing head   */
+    struct erl_off_heap_header* next;   /* |                        */
     /*                                 ----+                        */
     union {
 	Uint32              ui32[1];
@@ -886,14 +901,14 @@ typedef struct external_thing_ {
 #define is_external_header(x) \
   (((x) & (_TAG_HEADER_MASK-_BINARY_XXX_MASK)) == _TAG_HEADER_EXTERNAL_PID)
 
-#define is_external(x) \
-  (is_boxed((x)) && is_external_header(*boxed_val((x))))
+#define is_external(x) (is_boxed((x)) && is_external_header(*boxed_val((x))))
+
 #define is_external_pid(x) \
   (is_boxed((x)) && is_external_pid_header(*boxed_val((x))))
 #define is_external_port(x) \
-  (is_boxed((x)) && is_external_port_header(*boxed_val((x))))
-#define is_external_ref(x) \
-  (_unchecked_is_boxed((x)) && is_external_ref_header(*boxed_val((x))))
+    (is_boxed((x)) && is_external_port_header(*boxed_val((x))))
+
+#define is_external_ref(x) (_unchecked_is_boxed((x)) && is_external_ref_header(*boxed_val((x))))
 
 #define _unchecked_is_external(x) \
   (_unchecked_is_boxed((x)) && is_external_header(*_unchecked_boxed_val((x))))
@@ -911,17 +926,21 @@ typedef struct external_thing_ {
 #define make_external_ref		make_external
 
 #define _unchecked_external_val(x) _unchecked_boxed_val((x))
-_ET_DECLARE_CHECKED(Eterm*,external_val,Eterm)
+_ET_DECLARE_CHECKED(Eterm*,external_val,Wterm)
 #define external_val(x) _ET_APPLY(external_val,(x))
 
 #define external_thing_ptr(x) ((ExternalThing *) external_val((x)))
 #define _unchecked_external_thing_ptr(x) \
   ((ExternalThing *) _unchecked_external_val((x)))
 
+#define _unchecked_external_thing_data_words(thing) \
+    (_unchecked_thing_arityval((thing)->header) + (1 - EXTERNAL_THING_HEAD_SIZE))
+_ET_DECLARE_CHECKED(Uint,external_thing_data_words,ExternalThing*)
+#define external_thing_data_words(thing) _ET_APPLY(external_thing_data_words,(thing))
+
 #define _unchecked_external_data_words(x) \
-  (_unchecked_thing_arityval(_unchecked_external_thing_ptr((x))->header) \
-   + (1 - EXTERNAL_THING_HEAD_SIZE))
-_ET_DECLARE_CHECKED(Uint,external_data_words,Eterm)
+    _unchecked_external_thing_data_words(_unchecked_external_thing_ptr((x)))
+_ET_DECLARE_CHECKED(Uint,external_data_words,Wterm)
 #define external_data_words(x) _ET_APPLY(external_data_words,(x))
 
 #define _unchecked_external_data(x) (_unchecked_external_thing_ptr((x))->data.ui)
@@ -932,15 +951,15 @@ _ET_DECLARE_CHECKED(Uint,external_data_words,Eterm)
 
 #define _unchecked_external_pid_data_words(x) \
   _unchecked_external_data_words((x))
-_ET_DECLARE_CHECKED(Uint,external_pid_data_words,Eterm)
+_ET_DECLARE_CHECKED(Uint,external_pid_data_words,Wterm)
 #define external_pid_data_words(x) _ET_APPLY(external_pid_data_words,(x))
 
 #define _unchecked_external_pid_data(x) _unchecked_external_data((x))[0]
-_ET_DECLARE_CHECKED(Uint,external_pid_data,Eterm)
+_ET_DECLARE_CHECKED(Uint,external_pid_data,Wterm)
 #define external_pid_data(x) _ET_APPLY(external_pid_data,(x))
 
 #define _unchecked_external_pid_node(x) _unchecked_external_node((x))
-_ET_DECLARE_CHECKED(struct erl_node_*,external_pid_node,Eterm)
+_ET_DECLARE_CHECKED(struct erl_node_*,external_pid_node,Wterm)
 #define external_pid_node(x) _ET_APPLY(external_pid_node,(x))
 
 #define external_pid_number(x) _GET_PID_NUM(external_pid_data((x)))
@@ -948,27 +967,29 @@ _ET_DECLARE_CHECKED(struct erl_node_*,external_pid_node,Eterm)
 
 #define _unchecked_external_port_data_words(x) \
   _unchecked_external_data_words((x))
-_ET_DECLARE_CHECKED(Uint,external_port_data_words,Eterm)
+_ET_DECLARE_CHECKED(Uint,external_port_data_words,Wterm)
 #define external_port_data_words(x) _ET_APPLY(external_port_data_words,(x))
 
 #define _unchecked_external_port_data(x) _unchecked_external_data((x))[0]
-_ET_DECLARE_CHECKED(Uint,external_port_data,Eterm)
+_ET_DECLARE_CHECKED(Uint,external_port_data,Wterm)
 #define external_port_data(x) _ET_APPLY(external_port_data,(x))
 
 #define _unchecked_external_port_node(x) _unchecked_external_node((x))
-_ET_DECLARE_CHECKED(struct erl_node_*,external_port_node,Eterm)
+_ET_DECLARE_CHECKED(struct erl_node_*,external_port_node,Wterm)
 #define external_port_node(x) _ET_APPLY(external_port_node,(x))
 
 #define external_port_number(x) _GET_PORT_NUM(external_port_data((x)))
 
 #define _unchecked_external_ref_data_words(x) \
   _unchecked_external_data_words((x))
-_ET_DECLARE_CHECKED(Uint,external_ref_data_words,Eterm)
+_ET_DECLARE_CHECKED(Uint,external_ref_data_words,Wterm)
 #define external_ref_data_words(x) _ET_APPLY(external_ref_data_words,(x))
+#define external_thing_ref_data_words(thing) external_thing_data_words(thing)
 
 #define _unchecked_external_ref_data(x) (_unchecked_external_thing_ptr((x))->data.ui32)
-_ET_DECLARE_CHECKED(Uint32*,external_ref_data,Eterm)
+_ET_DECLARE_CHECKED(Uint32*,external_ref_data,Wterm)
 #define external_ref_data(x) _ET_APPLY(external_ref_data,(x))
+#define external_thing_ref_data(thing) ((thing)->data.ui32)
 
 #define _unchecked_external_ref_node(x) _unchecked_external_node((x))
 _ET_DECLARE_CHECKED(struct erl_node_*,external_ref_node,Eterm)
@@ -992,14 +1013,14 @@ _ET_DECLARE_CHECKED(struct erl_node_*,external_ref_node,Eterm)
 #endif
 
 #define _unchecked_make_cp(x)	((Eterm) COMPRESS_POINTER(x))
-_ET_DECLARE_CHECKED(Eterm,make_cp,BeamInstr*);
+_ET_DECLARE_CHECKED(Eterm,make_cp,BeamInstr*)
 #define make_cp(x)	_ET_APPLY(make_cp,(x))
 
 #define is_not_CP(x)	((x) & _CPMASK)
 #define is_CP(x)	(!is_not_CP(x))
 
 #define _unchecked_cp_val(x)	((BeamInstr*) EXPAND_POINTER(x))
-_ET_DECLARE_CHECKED(BeamInstr*,cp_val,Eterm);
+_ET_DECLARE_CHECKED(BeamInstr*,cp_val,Eterm)
 #define cp_val(x)	_ET_APPLY(cp_val,(x))
 
 #define make_catch(x)	(((x) << _TAG_IMMED2_SIZE) | _TAG_IMMED2_CATCH)
@@ -1080,10 +1101,10 @@ _ET_DECLARE_CHECKED(Uint,y_reg_index,Uint)
 #define SMALL_DEF		0xf
 
 #if ET_DEBUG
-extern unsigned tag_val_def_debug(Eterm, const char*, unsigned);
+extern unsigned tag_val_def_debug(Wterm, const char*, unsigned);
 #define tag_val_def(x)	tag_val_def_debug((x),__FILE__,__LINE__)
 #else
-extern unsigned tag_val_def(Eterm);
+extern unsigned tag_val_def(Wterm);
 #endif
 #define not_eq_tags(X,Y)	(tag_val_def((X)) ^ tag_val_def((Y)))
 
@@ -1099,5 +1120,81 @@ extern unsigned tag_val_def(Eterm);
 #define FLOAT_BIG 	_NUMBER_CODE(FLOAT_DEF,BIG_DEF)
 #define FLOAT_FLOAT	_NUMBER_CODE(FLOAT_DEF,FLOAT_DEF)
 
+#if HALFWORD_HEAP
+#define ptr2rel(PTR,BASE) ((Eterm*)((char*)(PTR) - (char*)(BASE)))
+#define rterm2wterm(REL,BASE) ((Wterm)(REL) + (Wterm)(BASE))
+
+#else /* HALFWORD_HEAP */
+
+#define ptr2rel(PTR,BASE) (PTR)
+#define rterm2wterm(REL,BASE) (REL)
+
+#endif /* !HALFWORD_HEAP */
+
+#define make_list_rel(PTR, BASE) make_list(ptr2rel(PTR,BASE))
+#define make_boxed_rel(PTR, BASE) make_boxed(ptr2rel(PTR,BASE))
+#define make_fun_rel make_boxed_rel
+#define make_binary_rel make_boxed_rel
+#define make_tuple_rel make_boxed_rel
+#define make_external_rel make_boxed_rel
+#define make_internal_ref_rel make_boxed_rel
+
+#define binary_val_rel(RTERM, BASE) binary_val(rterm2wterm(RTERM, BASE))
+#define list_val_rel(RTERM, BASE) list_val(rterm2wterm(RTERM, BASE))
+#define boxed_val_rel(RTERM, BASE) boxed_val(rterm2wterm(RTERM, BASE))
+#define tuple_val_rel(RTERM, BASE) tuple_val(rterm2wterm(RTERM, BASE))
+#define export_val_rel(RTERM, BASE) export_val(rterm2wterm(RTERM, BASE))
+#define fun_val_rel(RTERM, BASE) fun_val(rterm2wterm(RTERM, BASE))
+#define big_val_rel(RTERM,BASE)	big_val(rterm2wterm(RTERM,BASE))
+#define float_val_rel(RTERM,BASE) float_val(rterm2wterm(RTERM,BASE))
+#define internal_ref_val_rel(RTERM,BASE) internal_ref_val(rterm2wterm(RTERM,BASE))
+
+#define external_thing_ptr_rel(RTERM, BASE) external_thing_ptr(rterm2wterm(RTERM, BASE))
+#define external_data_words_rel(RTERM,BASE) external_data_words(rterm2wterm(RTERM,BASE))
+
+#define external_port_node_rel(RTERM,BASE) external_port_node(rterm2wterm(RTERM,BASE))
+#define external_port_data_rel(RTERM,BASE) external_port_data(rterm2wterm(RTERM,BASE))
+
+#define is_external_pid_rel(RTERM,BASE) is_external_pid(rterm2wterm(RTERM,BASE))
+#define external_pid_node_rel(RTERM,BASE) external_pid_node(rterm2wterm(RTERM,BASE))
+#define external_pid_data_rel(RTERM,BASE) external_pid_data(rterm2wterm(RTERM,BASE))
+
+#define is_binary_rel(RTERM,BASE) is_binary(rterm2wterm(RTERM,BASE))
+#define is_float_rel(RTERM,BASE) is_float(rterm2wterm(RTERM,BASE))
+#define is_fun_rel(RTERM,BASE) is_fun(rterm2wterm(RTERM,BASE))
+#define is_big_rel(RTERM,BASE) is_big(rterm2wterm(RTERM,BASE))
+#define is_export_rel(RTERM,BASE) is_export(rterm2wterm(RTERM,BASE))
+#define is_tuple_rel(RTERM,BASE) is_tuple(rterm2wterm(RTERM,BASE))
+
+#define GET_DOUBLE_REL(RTERM, f, BASE) GET_DOUBLE(rterm2wterm(RTERM,BASE), f)
+
+#define ref_thing_ptr_rel(RTERM,BASE) ref_thing_ptr(rterm2wterm(RTERM,BASE))
+#define is_internal_ref_rel(RTERM,BASE) is_internal_ref(rterm2wterm(RTERM,BASE))
+#define is_external_rel(RTERM,BASE) is_external(rterm2wterm(RTERM,BASE))
+#define is_external_port_rel(RTERM,BASE) is_external_port(rterm2wterm(RTERM,BASE))
+#define is_external_ref_rel(RTERM,BASE) is_external_ref(rterm2wterm(RTERM,BASE))
+
+#define external_node_rel(RTERM,BASE) external_node(rterm2wterm(RTERM,BASE))
+
+
+#if HALFWORD_HEAP
+ERTS_GLB_INLINE int is_same(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+ERTS_GLB_INLINE int is_same(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base)
+{
+    /* If bases differ, assume a and b are on different "heaps",
+       ie can only be same if immed */
+    ASSERT(a_base == b_base || is_immed(a) || is_immed(b)
+	   || rterm2wterm(a,a_base) != rterm2wterm(b,b_base));
+
+    return a == b && (a_base == b_base || is_immed(a));
+}
+#endif
+
+#else /* !HALFWORD_HEAP */
+#define is_same(A,A_BASE,B,B_BASE) ((A)==(B))
+#endif
+
 #endif	/* __ERL_TERM_H */
 
diff --git a/erts/emulator/beam/erl_threads.h b/erts/emulator/beam/erl_threads.h
index 21f85bd045..8c9cace0c5 100644
--- a/erts/emulator/beam/erl_threads.h
+++ b/erts/emulator/beam/erl_threads.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2001-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2011. 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
@@ -25,6 +25,8 @@
 #ifndef ERL_THREAD_H__
 #define ERL_THREAD_H__
 
+#define ERTS_SPIN_BODY ETHR_SPIN_BODY
+
 #include "sys.h"
 #ifdef USE_THREADS
 
@@ -34,6 +36,16 @@
 #include "erl_lock_count.h"
 #include "erl_term.h"
 
+#if defined(__GLIBC__) && (__GLIBC__ << 16) + __GLIBC_MINOR__ < (2 << 16) + 4
+/*
+ * pthread_mutex_destroy() may return EBUSY when it shouldn't :( We have
+ * only seen this bug in glibc versions before 2.4. Note that condition
+ * variables, rwmutexes, spinlocks, and rwspinlocks also may be effected by
+ * this bug since these implementations may use mutexes internally.
+ */
+#  define ERTS_THR_HAVE_BUSY_DESTROY_BUG
+#endif
+
 #define ERTS_THR_MEMORY_BARRIER ETHR_MEMORY_BARRIER
 
 #ifdef ERTS_ENABLE_LOCK_COUNT
@@ -48,6 +60,7 @@
 #define ERTS_THR_OPTS_DEFAULT_INITER ETHR_THR_OPTS_DEFAULT_INITER
 typedef ethr_thr_opts erts_thr_opts_t;
 typedef ethr_init_data erts_thr_init_data_t;
+typedef ethr_late_init_data erts_thr_late_init_data_t;
 typedef ethr_tid erts_tid_t;
 
 /* mutex */
@@ -73,9 +86,23 @@ typedef struct {
     erts_lcnt_lock_t lcnt;
 #endif
 } erts_rwmtx_t;
+
+#define ERTS_RWMTX_OPT_DEFAULT_INITER ETHR_RWMUTEX_OPT_DEFAULT_INITER
+#define ERTS_RWMTX_TYPE_NORMAL ETHR_RWMUTEX_TYPE_NORMAL
+#define ERTS_RWMTX_TYPE_FREQUENT_READ ETHR_RWMUTEX_TYPE_FREQUENT_READ
+#define ERTS_RWMTX_TYPE_EXTREMELY_FREQUENT_READ \
+  ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ
+#define ERTS_RWMTX_LONG_LIVED ETHR_RWMUTEX_LONG_LIVED
+#define ERTS_RWMTX_SHORT_LIVED ETHR_RWMUTEX_SHORT_LIVED
+#define ERTS_RWMTX_UNKNOWN_LIVED ETHR_RWMUTEX_UNKNOWN_LIVED
+typedef ethr_rwmutex_opt erts_rwmtx_opt_t;
+
 typedef ethr_tsd_key erts_tsd_key_t;
-typedef ethr_gate erts_gate_t;
+typedef ethr_ts_event erts_tse_t;
+typedef ethr_sint_t erts_aint_t;
 typedef ethr_atomic_t erts_atomic_t;
+typedef ethr_sint32_t erts_aint32_t;
+typedef ethr_atomic32_t erts_atomic32_t;
 
 /* spinlock */
 typedef struct {
@@ -99,29 +126,17 @@ typedef struct {
 #endif
 } erts_rwlock_t;
 
-typedef ethr_timeval erts_thr_timeval_t;
 __decl_noreturn void  __noreturn erts_thr_fatal_error(int, char *); 
                                  /* implemented in erl_init.c */
 
-#ifdef ERTS_ENABLE_LOCK_CHECK
-#define ERTS_REC_MTX_INITER \
-  {ETHR_REC_MUTEX_INITER, \
-   ERTS_LC_LOCK_INIT(-1,THE_NON_VALUE,ERTS_LC_FLG_LT_MUTEX)}
-#define ERTS_MTX_INITER \
-  {ETHR_MUTEX_INITER, \
-   ERTS_LC_LOCK_INIT(-1, THE_NON_VALUE, ERTS_LC_FLG_LT_MUTEX)}
-#else
-#define ERTS_REC_MTX_INITER		{ETHR_REC_MUTEX_INITER}
-#define ERTS_MTX_INITER			{ETHR_MUTEX_INITER}
-#endif
-#define ERTS_CND_INITER			ETHR_COND_INITER
 #define ERTS_THR_INIT_DATA_DEF_INITER	ETHR_INIT_DATA_DEFAULT_INITER
+#define ERTS_THR_LATE_INIT_DATA_DEF_INITER \
+                                        ETHR_LATE_INIT_DATA_DEFAULT_INITER
 
 #ifdef ETHR_HAVE_ETHR_REC_MUTEX_INIT
 #  define ERTS_HAVE_REC_MTX_INIT	ETHR_HAVE_ETHR_REC_MUTEX_INIT
 #endif
 
-
 #else /* #ifdef USE_THREADS */
 
 #define ERTS_THR_MEMORY_BARRIER
@@ -129,13 +144,30 @@ __decl_noreturn void  __noreturn erts_thr_fatal_error(int, char *);
 #define ERTS_THR_OPTS_DEFAULT_INITER 0
 typedef int erts_thr_opts_t;
 typedef int erts_thr_init_data_t;
+typedef int erts_thr_late_init_data_t;
 typedef int erts_tid_t;
 typedef int erts_mtx_t;
 typedef int erts_cnd_t;
+#define ERTS_RWMTX_OPT_DEFAULT_INITER {0}
+#define ERTS_RWMTX_TYPE_NORMAL 0
+#define ERTS_RWMTX_TYPE_FREQUENT_READ 0
+#define ERTS_RWMTX_TYPE_EXTREMELY_FREQUENT_READ 0
+#define ERTS_RWMTX_LONG_LIVED 0
+#define ERTS_RWMTX_SHORT_LIVED 0
+#define ERTS_RWMTX_UNKNOWN_LIVED 0
+typedef struct {
+    char type;
+    char lived;
+    int main_spincount;
+    int aux_spincount;
+} erts_rwmtx_opt_t;
 typedef int erts_rwmtx_t;
 typedef int erts_tsd_key_t;
-typedef int erts_gate_t;
-typedef long erts_atomic_t;
+typedef int erts_tse_t;
+typedef SWord erts_aint_t;
+typedef SWord erts_atomic_t;
+typedef SWord erts_aint32_t;
+typedef SWord erts_atomic32_t;
 #if __GNUC__ > 2
 typedef struct { } erts_spinlock_t;
 typedef struct { } erts_rwlock_t;
@@ -143,12 +175,7 @@ typedef struct { } erts_rwlock_t;
 typedef struct { int gcc_is_buggy; } erts_spinlock_t;
 typedef struct { int gcc_is_buggy; } erts_rwlock_t;
 #endif
-typedef struct {
-    long tv_sec;
-    long tv_nsec;
-} erts_thr_timeval_t;
 
-#define ERTS_REC_MTX_INITER		0
 #define ERTS_MTX_INITER			0
 #define ERTS_CND_INITER			0
 #define ERTS_THR_INIT_DATA_DEF_INITER	0
@@ -157,7 +184,13 @@ typedef struct {
 
 #endif /* #ifdef USE_THREADS */
 
+#define ERTS_AINT_T_MAX (~(((erts_aint_t) 1) << (sizeof(erts_aint_t)*8-1)))
+#define ERTS_AINT_T_MIN ((((erts_aint_t) 1) << (sizeof(erts_aint_t)*8-1)))
+#define ERTS_AINT32_T_MAX (~(((erts_aint32_t) 1) << (sizeof(erts_aint32_t)*8-1)))
+#define ERTS_AINT32_T_MIN ((((erts_aint32_t) 1) << (sizeof(erts_aint32_t)*8-1)))
+
 ERTS_GLB_INLINE void erts_thr_init(erts_thr_init_data_t *id);
+ERTS_GLB_INLINE void erts_thr_late_init(erts_thr_late_init_data_t *id);
 ERTS_GLB_INLINE void erts_thr_create(erts_tid_t *tid, void * (*func)(void *),
 				     void *arg, erts_thr_opts_t *opts);
 ERTS_GLB_INLINE void erts_thr_join(erts_tid_t tid, void **thr_res);
@@ -166,9 +199,6 @@ ERTS_GLB_INLINE void erts_thr_exit(void *res);
 ERTS_GLB_INLINE void erts_thr_install_exit_handler(void (*exit_handler)(void));
 ERTS_GLB_INLINE erts_tid_t erts_thr_self(void);
 ERTS_GLB_INLINE int erts_equal_tids(erts_tid_t x, erts_tid_t y);
-#ifdef ERTS_HAVE_REC_MTX_INIT
-ERTS_GLB_INLINE void erts_rec_mtx_init(erts_mtx_t *mtx);
-#endif
 ERTS_GLB_INLINE void erts_mtx_init_x(erts_mtx_t *mtx, char *name, Eterm extra);
 ERTS_GLB_INLINE void erts_mtx_init_x_opt(erts_mtx_t *mtx, char *name, Eterm extra, Uint16 opt);
 ERTS_GLB_INLINE void erts_mtx_init_locked_x(erts_mtx_t *mtx,
@@ -177,8 +207,6 @@ ERTS_GLB_INLINE void erts_mtx_init_locked_x(erts_mtx_t *mtx,
 ERTS_GLB_INLINE void erts_mtx_init(erts_mtx_t *mtx, char *name);
 ERTS_GLB_INLINE void erts_mtx_init_locked(erts_mtx_t *mtx, char *name);
 ERTS_GLB_INLINE void erts_mtx_destroy(erts_mtx_t *mtx);
-ERTS_GLB_INLINE void erts_mtx_set_forksafe(erts_mtx_t *mtx);
-ERTS_GLB_INLINE void erts_mtx_unset_forksafe(erts_mtx_t *mtx);
 ERTS_GLB_INLINE int erts_mtx_trylock(erts_mtx_t *mtx);
 #ifdef ERTS_ENABLE_LOCK_COUNT
 ERTS_GLB_INLINE void erts_mtx_lock_x(erts_mtx_t *mtx, char *file, unsigned int line);
@@ -192,9 +220,17 @@ ERTS_GLB_INLINE void erts_cnd_destroy(erts_cnd_t *cnd);
 ERTS_GLB_INLINE void erts_cnd_wait(erts_cnd_t *cnd, erts_mtx_t *mtx);
 ERTS_GLB_INLINE void erts_cnd_signal(erts_cnd_t *cnd);
 ERTS_GLB_INLINE void erts_cnd_broadcast(erts_cnd_t *cnd);
+ERTS_GLB_INLINE void erts_rwmtx_set_reader_group(int no);
+ERTS_GLB_INLINE void erts_rwmtx_init_opt_x(erts_rwmtx_t *rwmtx,
+					   erts_rwmtx_opt_t *opt,
+					   char *name,
+					   Eterm extra);
 ERTS_GLB_INLINE void erts_rwmtx_init_x(erts_rwmtx_t *rwmtx,
 				       char *name,
 				       Eterm extra);
+ERTS_GLB_INLINE void erts_rwmtx_init_opt(erts_rwmtx_t *rwmtx,
+					 erts_rwmtx_opt_t *opt,
+					 char *name);
 ERTS_GLB_INLINE void erts_rwmtx_init(erts_rwmtx_t *rwmtx,
 					 char *name);
 ERTS_GLB_INLINE void erts_rwmtx_destroy(erts_rwmtx_t *rwmtx);
@@ -211,23 +247,69 @@ ERTS_GLB_INLINE int erts_rwmtx_tryrwlock(erts_rwmtx_t *rwmtx);
 ERTS_GLB_INLINE void erts_rwmtx_rwunlock(erts_rwmtx_t *rwmtx);
 ERTS_GLB_INLINE int erts_lc_rwmtx_is_rlocked(erts_rwmtx_t *mtx);
 ERTS_GLB_INLINE int erts_lc_rwmtx_is_rwlocked(erts_rwmtx_t *mtx);
-ERTS_GLB_INLINE void erts_atomic_init(erts_atomic_t *var, long i);
-ERTS_GLB_INLINE void erts_atomic_set(erts_atomic_t *var, long i);
-ERTS_GLB_INLINE long erts_atomic_read(erts_atomic_t *var);
-ERTS_GLB_INLINE long erts_atomic_inctest(erts_atomic_t *incp);
-ERTS_GLB_INLINE long erts_atomic_dectest(erts_atomic_t *decp);
+ERTS_GLB_INLINE void erts_atomic_init(erts_atomic_t *var, erts_aint_t i);
+ERTS_GLB_INLINE void erts_atomic_set(erts_atomic_t *var, erts_aint_t i);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_read(erts_atomic_t *var);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_inctest(erts_atomic_t *incp);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_dectest(erts_atomic_t *decp);
 ERTS_GLB_INLINE void erts_atomic_inc(erts_atomic_t *incp);
 ERTS_GLB_INLINE void erts_atomic_dec(erts_atomic_t *decp);
-ERTS_GLB_INLINE long erts_atomic_addtest(erts_atomic_t *addp,
-					 long i);
-ERTS_GLB_INLINE void erts_atomic_add(erts_atomic_t *addp, long i);
-ERTS_GLB_INLINE long erts_atomic_xchg(erts_atomic_t *xchgp,
-				      long new);
-ERTS_GLB_INLINE long erts_atomic_cmpxchg(erts_atomic_t *xchgp,
-					 long new,
-					 long expected);
-ERTS_GLB_INLINE long erts_atomic_bor(erts_atomic_t *var, long mask);
-ERTS_GLB_INLINE long erts_atomic_band(erts_atomic_t *var, long mask);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_addtest(erts_atomic_t *addp,
+						erts_aint_t i);
+ERTS_GLB_INLINE void erts_atomic_add(erts_atomic_t *addp, erts_aint_t i);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_xchg(erts_atomic_t *xchgp,
+					     erts_aint_t new);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_cmpxchg(erts_atomic_t *xchgp,
+						erts_aint_t new,
+						erts_aint_t expected);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_bor(erts_atomic_t *var,
+					    erts_aint_t mask);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_band(erts_atomic_t *var,
+					     erts_aint_t mask);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_read_acqb(erts_atomic_t *var);
+ERTS_GLB_INLINE void erts_atomic_set_relb(erts_atomic_t *var, erts_aint_t i);
+ERTS_GLB_INLINE void erts_atomic_dec_relb(erts_atomic_t *decp);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_dectest_relb(erts_atomic_t *decp);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_cmpxchg_acqb(erts_atomic_t *xchgp,
+						     erts_aint_t new,
+						     erts_aint_t exp);
+ERTS_GLB_INLINE erts_aint_t erts_atomic_cmpxchg_relb(erts_atomic_t *xchgp,
+						     erts_aint_t new,
+						     erts_aint_t exp);
+ERTS_GLB_INLINE void erts_atomic32_init(erts_atomic32_t *var, erts_aint32_t i);
+ERTS_GLB_INLINE void erts_atomic32_set(erts_atomic32_t *var, erts_aint32_t i);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_read(erts_atomic32_t *var);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_inctest(erts_atomic32_t *incp);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_dectest(erts_atomic32_t *decp);
+ERTS_GLB_INLINE void erts_atomic32_inc(erts_atomic32_t *incp);
+ERTS_GLB_INLINE void erts_atomic32_dec(erts_atomic32_t *decp);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_addtest(erts_atomic32_t *addp,
+						    erts_aint32_t i);
+ERTS_GLB_INLINE void erts_atomic32_add(erts_atomic32_t *addp, erts_aint32_t i);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_xchg(erts_atomic32_t *xchgp,
+						 erts_aint32_t new);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_cmpxchg(erts_atomic32_t *xchgp,
+						    erts_aint32_t new,
+						    erts_aint32_t expected);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_bor(erts_atomic32_t *var,
+						erts_aint32_t mask);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_band(erts_atomic32_t *var,
+						 erts_aint32_t mask);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_read_acqb(erts_atomic32_t *var);
+ERTS_GLB_INLINE void erts_atomic32_set_relb(erts_atomic32_t *var,
+					    erts_aint32_t i);
+ERTS_GLB_INLINE void erts_atomic32_dec_relb(erts_atomic32_t *decp);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_dectest_relb(erts_atomic32_t *decp);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_cmpxchg_acqb(erts_atomic32_t *xchgp,
+							 erts_aint32_t new,
+							 erts_aint32_t exp);
+ERTS_GLB_INLINE erts_aint32_t erts_atomic32_cmpxchg_relb(erts_atomic32_t *xchgp,
+							 erts_aint32_t new,
+							 erts_aint32_t exp);
+ERTS_GLB_INLINE void erts_spinlock_init_x_opt(erts_spinlock_t *lock,
+					      char *name,
+					      Eterm extra,
+					      Uint16 opt);
 ERTS_GLB_INLINE void erts_spinlock_init_x(erts_spinlock_t *lock,
 					  char *name,
 					  Eterm extra);
@@ -258,17 +340,20 @@ ERTS_GLB_INLINE void erts_write_lock(erts_rwlock_t *lock);
 ERTS_GLB_INLINE void erts_write_unlock(erts_rwlock_t *lock);
 ERTS_GLB_INLINE int erts_lc_rwlock_is_rlocked(erts_rwlock_t *lock);
 ERTS_GLB_INLINE int erts_lc_rwlock_is_rwlocked(erts_rwlock_t *lock);
-ERTS_GLB_INLINE void erts_thr_time_now(erts_thr_timeval_t *time);
 ERTS_GLB_INLINE void erts_tsd_key_create(erts_tsd_key_t *keyp);
 ERTS_GLB_INLINE void erts_tsd_key_delete(erts_tsd_key_t key);
 ERTS_GLB_INLINE void erts_tsd_set(erts_tsd_key_t key, void *value);
 ERTS_GLB_INLINE void * erts_tsd_get(erts_tsd_key_t key);
-ERTS_GLB_INLINE void erts_gate_init(erts_gate_t *gp);
-ERTS_GLB_INLINE void erts_gate_destroy(erts_gate_t *gp);
-ERTS_GLB_INLINE void erts_gate_close(erts_gate_t *gp);
-ERTS_GLB_INLINE void erts_gate_let_through(erts_gate_t *gp, unsigned no);
-ERTS_GLB_INLINE void erts_gate_wait(erts_gate_t *gp);
-ERTS_GLB_INLINE void erts_gate_swait(erts_gate_t *gp, int spincount);
+ERTS_GLB_INLINE erts_tse_t *erts_tse_fetch(void);
+ERTS_GLB_INLINE void erts_tse_return(erts_tse_t *ep);
+ERTS_GLB_INLINE void erts_tse_set(erts_tse_t *ep);
+ERTS_GLB_INLINE void erts_tse_reset(erts_tse_t *ep);
+ERTS_GLB_INLINE int erts_tse_wait(erts_tse_t *ep);
+ERTS_GLB_INLINE int erts_tse_swait(erts_tse_t *ep, int spincount);
+ERTS_GLB_INLINE int erts_tse_is_tmp(erts_tse_t *ep);
+ERTS_GLB_INLINE void erts_thr_set_main_status(int, int);
+ERTS_GLB_INLINE int erts_thr_get_main_status(void);
+ERTS_GLB_INLINE void erts_thr_yield(void);
 
 #ifdef ETHR_HAVE_ETHR_SIG_FUNCS
 #define ERTS_THR_HAVE_SIG_FUNCS 1
@@ -290,15 +375,21 @@ erts_thr_init(erts_thr_init_data_t *id)
 }
 
 ERTS_GLB_INLINE void
+erts_thr_late_init(erts_thr_late_init_data_t *id)
+{
+#ifdef USE_THREADS
+    int res = ethr_late_init(id);
+    if (res)
+	erts_thr_fatal_error(res, "complete initialization of thread library");
+#endif
+}
+
+ERTS_GLB_INLINE void
 erts_thr_create(erts_tid_t *tid, void * (*func)(void *), void *arg,
 		erts_thr_opts_t *opts)
 {
 #ifdef USE_THREADS
-#ifdef ERTS_ENABLE_LOCK_COUNT
-    int res = erts_lcnt_thr_create(tid, func, arg, opts);
-#else
     int res = ethr_thr_create(tid, func, arg, opts);
-#endif
     if (res)
 	erts_thr_fatal_error(res, "create thread");
 #endif
@@ -366,20 +457,6 @@ erts_equal_tids(erts_tid_t x, erts_tid_t y)
 #endif
 }
 
-
-#ifdef ERTS_HAVE_REC_MTX_INIT
-ERTS_GLB_INLINE void
-erts_rec_mtx_init(erts_mtx_t *mtx)
-{
-#ifdef USE_THREADS
-    int res = ethr_rec_mutex_init(&mtx->mtx);
-    if (res)
-	erts_thr_fatal_error(res, "initialize recursive mutex");
-#endif
-}
-#endif
-
-
 ERTS_GLB_INLINE void
 erts_mtx_init_x(erts_mtx_t *mtx, char *name, Eterm extra)
 {
@@ -426,9 +503,7 @@ erts_mtx_init_locked_x(erts_mtx_t *mtx, char *name, Eterm extra)
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_init_lock_x(&mtx->lcnt, name, ERTS_LCNT_LT_MUTEX, extra);
 #endif
-    res = ethr_mutex_lock(&mtx->mtx);
-    if (res)
-	erts_thr_fatal_error(res, "lock mutex");
+    ethr_mutex_lock(&mtx->mtx);
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_trylock(1, &mtx->lc);
 #endif
@@ -467,9 +542,7 @@ erts_mtx_init_locked(erts_mtx_t *mtx, char *name)
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_init_lock(&mtx->lcnt, name, ERTS_LCNT_LT_MUTEX);
 #endif
-    res = ethr_mutex_lock(&mtx->mtx);
-    if (res)
-	erts_thr_fatal_error(res, "lock mutex");
+    ethr_mutex_lock(&mtx->mtx);
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_trylock(1, &mtx->lc);
 #endif
@@ -491,28 +564,16 @@ erts_mtx_destroy(erts_mtx_t *mtx)
     erts_lcnt_destroy_lock(&mtx->lcnt);
 #endif
     res = ethr_mutex_destroy(&mtx->mtx);
-    if (res)
-	erts_thr_fatal_error(res, "destroy mutex");
-#endif
-}
-
-ERTS_GLB_INLINE void
-erts_mtx_set_forksafe(erts_mtx_t *mtx)
-{
-#ifdef USE_THREADS
-    int res = ethr_mutex_set_forksafe(&mtx->mtx);
-    if (res != 0 && res != ENOTSUP)
-	erts_thr_fatal_error(res, "set mutex forksafe");
+    if (res != 0) {
+#ifdef ERTS_THR_HAVE_BUSY_DESTROY_BUG
+	if (res == EBUSY) {
+	    char *warn = "Ignoring busy mutex destroy. "
+		"Most likely a bug in pthread implementation.";
+	    erts_send_warning_to_logger_str_nogl(warn);
+	}
 #endif
-}
-
-ERTS_GLB_INLINE void
-erts_mtx_unset_forksafe(erts_mtx_t *mtx)
-{
-#ifdef USE_THREADS
-    int res = ethr_mutex_unset_forksafe(&mtx->mtx);
-    if (res != 0 && res != ENOTSUP)
-	erts_thr_fatal_error(res, "unset mutex forksafe");
+	erts_thr_fatal_error(res, "destroy mutex");
+    }
 #endif
 }
 
@@ -535,11 +596,7 @@ erts_mtx_trylock(erts_mtx_t *mtx)
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_trylock(&mtx->lcnt, res);
-#endif
-
-    if (res != 0 && res != EBUSY)
-	erts_thr_fatal_error(res, "try lock mutex");
-    
+#endif    
     return res;
 #else
     return 0;
@@ -555,19 +612,16 @@ erts_mtx_lock(erts_mtx_t *mtx)
 #endif
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_lock(&mtx->lc);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock(&mtx->lcnt);
 #endif
-    res = ethr_mutex_lock(&mtx->mtx);
+    ethr_mutex_lock(&mtx->mtx);
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&mtx->lcnt, file, line);
 #endif
-    if (res)
-	erts_thr_fatal_error(res, "lock mutex");
 #endif
 }
 
@@ -575,16 +629,13 @@ ERTS_GLB_INLINE void
 erts_mtx_unlock(erts_mtx_t *mtx)
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock(&mtx->lc);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_unlock(&mtx->lcnt);
 #endif
-    res = ethr_mutex_unlock(&mtx->mtx);
-    if (res)
-	erts_thr_fatal_error(res, "unlock mutex");
+    ethr_mutex_unlock(&mtx->mtx);
 #endif
 }
 
@@ -617,8 +668,16 @@ erts_cnd_destroy(erts_cnd_t *cnd)
 {
 #ifdef USE_THREADS
     int res = ethr_cond_destroy(cnd);
-    if (res)
+    if (res != 0) {
+#ifdef ERTS_THR_HAVE_BUSY_DESTROY_BUG
+	if (res == EBUSY) {
+	    char *warn = "Ignoring busy cond destroy. "
+		"Most likely a bug in pthread implementation.";
+	    erts_send_warning_to_logger_str_nogl(warn);
+	}
+#endif
 	erts_thr_fatal_error(res, "destroy condition variable");
+    }
 #endif
 }
 
@@ -652,9 +711,7 @@ ERTS_GLB_INLINE void
 erts_cnd_signal(erts_cnd_t *cnd)
 {
 #ifdef USE_THREADS
-    int res = ethr_cond_signal(cnd);
-    if (res)
-	erts_thr_fatal_error(res, "signal on condition variable");
+    ethr_cond_signal(cnd);
 #endif
 }
 
@@ -663,19 +720,34 @@ ERTS_GLB_INLINE void
 erts_cnd_broadcast(erts_cnd_t *cnd)
 {
 #ifdef USE_THREADS
-    int res = ethr_cond_broadcast(cnd);
-    if (res)
-	erts_thr_fatal_error(res, "broadcast on condition variable");
+    ethr_cond_broadcast(cnd);
 #endif
 }
 
 /* rwmutex */
 
 ERTS_GLB_INLINE void
-erts_rwmtx_init_x(erts_rwmtx_t *rwmtx, char *name, Eterm extra)
+erts_rwmtx_set_reader_group(int no)
+{
+#ifdef USE_THREADS
+    int res;
+#ifdef ERTS_ENABLE_LOCK_CHECK
+    erts_lc_check_no_locked_of_type(ERTS_LC_FLG_LT_RWMUTEX);
+#endif
+    res = ethr_rwmutex_set_reader_group(no);
+    if (res != 0)
+	erts_thr_fatal_error(res, "set reader group");
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_rwmtx_init_opt_x(erts_rwmtx_t *rwmtx,
+		      erts_rwmtx_opt_t *opt,
+		      char *name,
+		      Eterm extra)
 {
 #ifdef USE_THREADS
-    int res = ethr_rwmutex_init(&rwmtx->rwmtx);
+    int res = ethr_rwmutex_init_opt(&rwmtx->rwmtx, opt);
     if (res != 0)
 	erts_thr_fatal_error(res, "initialize rwmutex");
 #ifdef ERTS_ENABLE_LOCK_CHECK
@@ -688,10 +760,20 @@ erts_rwmtx_init_x(erts_rwmtx_t *rwmtx, char *name, Eterm extra)
 }
 
 ERTS_GLB_INLINE void
-erts_rwmtx_init(erts_rwmtx_t *rwmtx, char *name)
+erts_rwmtx_init_x(erts_rwmtx_t *rwmtx,
+		  char *name,
+		  Eterm extra)
+{
+    erts_rwmtx_init_opt_x(rwmtx, NULL, name, extra);
+}
+
+ERTS_GLB_INLINE void
+erts_rwmtx_init_opt(erts_rwmtx_t *rwmtx,
+		    erts_rwmtx_opt_t *opt,
+		    char *name)
 {
 #ifdef USE_THREADS
-    int res = ethr_rwmutex_init(&rwmtx->rwmtx);
+    int res = ethr_rwmutex_init_opt(&rwmtx->rwmtx, opt);
     if (res != 0)
 	erts_thr_fatal_error(res, "initialize rwmutex");
 #ifdef ERTS_ENABLE_LOCK_CHECK
@@ -704,6 +786,12 @@ erts_rwmtx_init(erts_rwmtx_t *rwmtx, char *name)
 }
 
 ERTS_GLB_INLINE void
+erts_rwmtx_init(erts_rwmtx_t *rwmtx, char *name)
+{
+    erts_rwmtx_init_opt(rwmtx, NULL, name);
+}
+
+ERTS_GLB_INLINE void
 erts_rwmtx_destroy(erts_rwmtx_t *rwmtx)
 {
 #ifdef USE_THREADS
@@ -715,8 +803,16 @@ erts_rwmtx_destroy(erts_rwmtx_t *rwmtx)
     erts_lcnt_destroy_lock(&rwmtx->lcnt);
 #endif
     res = ethr_rwmutex_destroy(&rwmtx->rwmtx);
-    if (res != 0)
+    if (res != 0) {
+#ifdef ERTS_THR_HAVE_BUSY_DESTROY_BUG
+	if (res == EBUSY) {
+	    char *warn = "Ignoring busy rwmutex destroy. "
+		"Most likely a bug in pthread implementation.";
+	    erts_send_warning_to_logger_str_nogl(warn);
+	}
+#endif
 	erts_thr_fatal_error(res, "destroy rwmutex");
+    }
 #endif
 }
 
@@ -740,9 +836,6 @@ erts_rwmtx_tryrlock(erts_rwmtx_t *rwmtx)
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_trylock_opt(&rwmtx->lcnt, res, ERTS_LCNT_LO_READ);
 #endif
-
-    if (res != 0 && res != EBUSY)
-	erts_thr_fatal_error(res, "try read lock rwmutex");
     
     return res;
 #else
@@ -758,19 +851,16 @@ erts_rwmtx_rlock(erts_rwmtx_t *rwmtx)
 #endif
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_lock_flg(&rwmtx->lc, ERTS_LC_FLG_LO_READ);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_opt(&rwmtx->lcnt, ERTS_LCNT_LO_READ);
 #endif
-    res = ethr_rwmutex_rlock(&rwmtx->rwmtx);
+    ethr_rwmutex_rlock(&rwmtx->rwmtx);
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&rwmtx->lcnt, file, line);
 #endif
-    if (res != 0)
-	erts_thr_fatal_error(res, "read lock rwmutex");
 #endif
 }
 
@@ -778,16 +868,13 @@ ERTS_GLB_INLINE void
 erts_rwmtx_runlock(erts_rwmtx_t *rwmtx)
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock_flg(&rwmtx->lc, ERTS_LC_FLG_LO_READ);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_unlock_opt(&rwmtx->lcnt, ERTS_LCNT_LO_READ);
 #endif
-    res = ethr_rwmutex_runlock(&rwmtx->rwmtx);
-    if (res != 0)
-	erts_thr_fatal_error(res, "read unlock rwmutex");
+    ethr_rwmutex_runlock(&rwmtx->rwmtx);
 #endif
 }
 
@@ -812,9 +899,6 @@ erts_rwmtx_tryrwlock(erts_rwmtx_t *rwmtx)
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_trylock_opt(&rwmtx->lcnt, res, ERTS_LCNT_LO_READ_WRITE);
 #endif
-
-    if (res != 0 && res != EBUSY)
-	erts_thr_fatal_error(res, "try write lock rwmutex");
     
     return res;
 #else
@@ -830,19 +914,16 @@ erts_rwmtx_rwlock(erts_rwmtx_t *rwmtx)
 #endif
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_lock_flg(&rwmtx->lc, ERTS_LC_FLG_LO_READ_WRITE);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_opt(&rwmtx->lcnt, ERTS_LCNT_LO_READ_WRITE);
 #endif
-    res = ethr_rwmutex_rwlock(&rwmtx->rwmtx);
+    ethr_rwmutex_rwlock(&rwmtx->rwmtx);
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&rwmtx->lcnt, file, line);
 #endif
-    if (res != 0)
-	erts_thr_fatal_error(res, "write lock rwmutex");
 #endif
 }
 
@@ -850,16 +931,13 @@ ERTS_GLB_INLINE void
 erts_rwmtx_rwunlock(erts_rwmtx_t *rwmtx)
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock_flg(&rwmtx->lc, ERTS_LC_FLG_LO_READ_WRITE);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_unlock_opt(&rwmtx->lcnt, ERTS_LCNT_LO_READ_WRITE);
 #endif
-    res = ethr_rwmutex_rwunlock(&rwmtx->rwmtx);
-    if (res != 0)
-	erts_thr_fatal_error(res, "write unlock rwmutex");
+    ethr_rwmutex_rwunlock(&rwmtx->rwmtx);
 #endif
 }
 
@@ -918,66 +996,50 @@ erts_lc_rwmtx_is_rwlocked(erts_rwmtx_t *mtx)
 }
 
 ERTS_GLB_INLINE void
-erts_atomic_init(erts_atomic_t *var, long i)
+erts_atomic_init(erts_atomic_t *var, erts_aint_t i)
 {
 #ifdef USE_THREADS
-    int res = ethr_atomic_init(var, i);
-    if (res)
-	erts_thr_fatal_error(res, "perform atomic init");
+    ethr_atomic_init(var, i);
 #else
     *var = i;
 #endif
 }
 
 ERTS_GLB_INLINE void
-erts_atomic_set(erts_atomic_t *var, long i)
+erts_atomic_set(erts_atomic_t *var, erts_aint_t i)
 {
 #ifdef USE_THREADS
-    int res = ethr_atomic_set(var, i);
-    if (res)
-	erts_thr_fatal_error(res, "perform atomic set");
+    ethr_atomic_set(var, i);
 #else
     *var = i;
 #endif
 }
 
-ERTS_GLB_INLINE long
+ERTS_GLB_INLINE erts_aint_t
 erts_atomic_read(erts_atomic_t *var)
 {
 #ifdef USE_THREADS
-    long i;
-    int res = ethr_atomic_read(var, &i);
-    if (res)
-	erts_thr_fatal_error(res, "perform atomic read");
-    return i;
+    return ethr_atomic_read(var);
 #else
     return *var;
 #endif
 }
 
-ERTS_GLB_INLINE long
+ERTS_GLB_INLINE erts_aint_t
 erts_atomic_inctest(erts_atomic_t *incp)
 {
 #ifdef USE_THREADS
-    long test;
-    int res = ethr_atomic_inctest(incp, &test);
-    if (res)
-	erts_thr_fatal_error(res, "perform atomic increment and test");
-    return test;
+    return ethr_atomic_inc_read(incp);
 #else
     return ++(*incp);
 #endif
 }
 
-ERTS_GLB_INLINE long
+ERTS_GLB_INLINE erts_aint_t
 erts_atomic_dectest(erts_atomic_t *decp)
 {
 #ifdef USE_THREADS
-    long test;
-    int res = ethr_atomic_dectest(decp, &test);
-    if (res)
-	erts_thr_fatal_error(res, "perform atomic decrement and test");
-    return test;
+    return ethr_atomic_dec_read(decp);
 #else
     return --(*decp);
 #endif
@@ -987,9 +1049,7 @@ ERTS_GLB_INLINE void
 erts_atomic_inc(erts_atomic_t *incp)
 {
 #ifdef USE_THREADS
-    int res = ethr_atomic_inc(incp);
-    if (res)
-	erts_thr_fatal_error(res, "perform atomic increment");
+    ethr_atomic_inc(incp);
 #else
     ++(*incp);
 #endif
@@ -999,100 +1059,364 @@ ERTS_GLB_INLINE void
 erts_atomic_dec(erts_atomic_t *decp)
 {
 #ifdef USE_THREADS
-    int res = ethr_atomic_dec(decp);
-    if (res)
-	erts_thr_fatal_error(res, "perform atomic decrement");
+    ethr_atomic_dec(decp);
 #else
     --(*decp);
 #endif
 }
 
-ERTS_GLB_INLINE long
-erts_atomic_addtest(erts_atomic_t *addp, long i)
+ERTS_GLB_INLINE erts_aint_t
+erts_atomic_addtest(erts_atomic_t *addp, erts_aint_t i)
 {
 #ifdef USE_THREADS
-    long test;
-    int res = ethr_atomic_addtest(addp, i, &test);
-    if (res)
-	erts_thr_fatal_error(res, "perform atomic addition and test");
-    return test;
+    return ethr_atomic_add_read(addp, i);
 #else
     return *addp += i;
 #endif
 }
 
 ERTS_GLB_INLINE void
-erts_atomic_add(erts_atomic_t *addp, long i)
+erts_atomic_add(erts_atomic_t *addp, erts_aint_t i)
 {
 #ifdef USE_THREADS
-    int res = ethr_atomic_add(addp, i);
-    if (res)
-	erts_thr_fatal_error(res, "perform atomic addition");
+    ethr_atomic_add(addp, i);
 #else
     *addp += i;
 #endif
 }
 
-ERTS_GLB_INLINE long
-erts_atomic_xchg(erts_atomic_t *xchgp, long new)
+ERTS_GLB_INLINE erts_aint_t
+erts_atomic_xchg(erts_atomic_t *xchgp, erts_aint_t new)
 {
-    long old;
 #ifdef USE_THREADS
-    int res = ethr_atomic_xchg(xchgp, new, &old);
-    if (res)
-	erts_thr_fatal_error(res, "perform atomic exchange");
+    return ethr_atomic_xchg(xchgp, new);
 #else
-    old = *xchgp;
+    erts_aint_t old = *xchgp;
     *xchgp = new;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint_t
+erts_atomic_cmpxchg(erts_atomic_t *xchgp, erts_aint_t new, erts_aint_t expected)
+{
+#ifdef USE_THREADS
+    return ethr_atomic_cmpxchg(xchgp, new, expected);
+#else
+    erts_aint_t old = *xchgp;
+    if (old == expected)
+        *xchgp = new;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint_t
+erts_atomic_bor(erts_atomic_t *var, erts_aint_t mask)
+{
+#ifdef USE_THREADS
+    return ethr_atomic_read_bor(var, mask);
+#else
+    erts_aint_t old;
+    old = *var;
+    *var |= mask;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint_t
+erts_atomic_band(erts_atomic_t *var, erts_aint_t mask)
+{
+#ifdef USE_THREADS
+    return ethr_atomic_read_band(var, mask);
+#else
+    erts_aint_t old;
+    old = *var;
+    *var &= mask;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint_t
+erts_atomic_read_acqb(erts_atomic_t *var)
+{
+#ifdef USE_THREADS
+    return ethr_atomic_read_acqb(var);
+#else
+    return *var;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_atomic_set_relb(erts_atomic_t *var, erts_aint_t i)
+{
+#ifdef USE_THREADS
+    ethr_atomic_set_relb(var, i);
+#else
+    *var = i;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_atomic_dec_relb(erts_atomic_t *decp)
+{
+#ifdef USE_THREADS
+    ethr_atomic_dec_relb(decp);
+#else
+    --(*decp);
 #endif
+}
+
+ERTS_GLB_INLINE erts_aint_t
+erts_atomic_dectest_relb(erts_atomic_t *decp)
+{
+#ifdef USE_THREADS
+    return ethr_atomic_dec_read_relb(decp);
+#else
+    return --(*decp);
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint_t erts_atomic_cmpxchg_acqb(erts_atomic_t *xchgp,
+						     erts_aint_t new,
+						     erts_aint_t exp)
+{
+#ifdef USE_THREADS
+    return ethr_atomic_cmpxchg_acqb(xchgp, new, exp);
+#else
+    erts_aint_t old = *xchgp;
+    if (old == exp)
+        *xchgp = new;
     return old;
+#endif
 }
 
-ERTS_GLB_INLINE long
-erts_atomic_cmpxchg(erts_atomic_t *xchgp, long new, long expected)
+ERTS_GLB_INLINE erts_aint_t erts_atomic_cmpxchg_relb(erts_atomic_t *xchgp,
+						     erts_aint_t new,
+						     erts_aint_t exp)
 {
 #ifdef USE_THREADS
-    long old;
-    int res = ethr_atomic_cmpxchg(xchgp, new, expected, &old);
-    if (ERTS_UNLIKELY(res != 0))
-	erts_thr_fatal_error(res, "perform atomic exchange");
+    return ethr_atomic_cmpxchg_relb(xchgp, new, exp);
+#else
+    erts_aint_t old = *xchgp;
+    if (old == exp)
+        *xchgp = new;
     return old;
+#endif
+}
+
+/* atomic32 */
+
+ERTS_GLB_INLINE void
+erts_atomic32_init(erts_atomic32_t *var, erts_aint32_t i)
+{
+#ifdef USE_THREADS
+    ethr_atomic32_init(var, i);
+#else
+    *var = i;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_atomic32_set(erts_atomic32_t *var, erts_aint32_t i)
+{
+#ifdef USE_THREADS
+    ethr_atomic32_set(var, i);
 #else
-    long old = *xchgp;
+    *var = i;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_read(erts_atomic32_t *var)
+{
+#ifdef USE_THREADS
+    return ethr_atomic32_read(var);
+#else
+    return *var;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_inctest(erts_atomic32_t *incp)
+{
+#ifdef USE_THREADS
+    return ethr_atomic32_inc_read(incp);
+#else
+    return ++(*incp);
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_dectest(erts_atomic32_t *decp)
+{
+#ifdef USE_THREADS
+    return ethr_atomic32_dec_read(decp);
+#else
+    return --(*decp);
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_atomic32_inc(erts_atomic32_t *incp)
+{
+#ifdef USE_THREADS
+    ethr_atomic32_inc(incp);
+#else
+    ++(*incp);
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_atomic32_dec(erts_atomic32_t *decp)
+{
+#ifdef USE_THREADS
+    ethr_atomic32_dec(decp);
+#else
+    --(*decp);
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_addtest(erts_atomic32_t *addp, erts_aint32_t i)
+{
+#ifdef USE_THREADS
+    return ethr_atomic32_add_read(addp, i);
+#else
+    return *addp += i;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_atomic32_add(erts_atomic32_t *addp, erts_aint32_t i)
+{
+#ifdef USE_THREADS
+    ethr_atomic32_add(addp, i);
+#else
+    *addp += i;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_xchg(erts_atomic32_t *xchgp, erts_aint32_t new)
+{
+#ifdef USE_THREADS
+    return ethr_atomic32_xchg(xchgp, new);
+#else
+    erts_aint32_t old = *xchgp;
+    *xchgp = new;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_cmpxchg(erts_atomic32_t *xchgp,
+		      erts_aint32_t new,
+		      erts_aint32_t expected)
+{
+#ifdef USE_THREADS
+    return ethr_atomic32_cmpxchg(xchgp, new, expected);
+#else
+    erts_aint32_t old = *xchgp;
     if (old == expected)
         *xchgp = new;
     return old;
 #endif
 }
 
-ERTS_GLB_INLINE long
-erts_atomic_bor(erts_atomic_t *var, long mask)
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_bor(erts_atomic32_t *var, erts_aint32_t mask)
 {
-    long old;
 #ifdef USE_THREADS
-    int res = ethr_atomic_or_old(var, mask, &old);
-    if (res != 0)
-	erts_thr_fatal_error(res, "perform atomic bitwise or");
+    return ethr_atomic32_read_bor(var, mask);
 #else
+    erts_aint32_t old;
     old = *var;
     *var |= mask;
-#endif
     return old;
+#endif
 }
 
-ERTS_GLB_INLINE long
-erts_atomic_band(erts_atomic_t *var, long mask)
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_band(erts_atomic32_t *var, erts_aint32_t mask)
 {
-    long old;
 #ifdef USE_THREADS
-    int res = ethr_atomic_and_old(var, mask, &old);
-    if (res != 0)
-	erts_thr_fatal_error(res, "perform atomic bitwise and");
+    return ethr_atomic32_read_band(var, mask);
 #else
+    erts_aint32_t old;
     old = *var;
     *var &= mask;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_read_acqb(erts_atomic32_t *var)
+{
+#ifdef USE_THREADS
+    return ethr_atomic32_read_acqb(var);
+#else
+    return *var;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_atomic32_set_relb(erts_atomic32_t *var, erts_aint32_t i)
+{
+#ifdef USE_THREADS
+    ethr_atomic32_set_relb(var, i);
+#else
+    *var = i;
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_atomic32_dec_relb(erts_atomic32_t *decp)
+{
+#ifdef USE_THREADS
+    ethr_atomic32_dec_relb(decp);
+#else
+    --(*decp);
 #endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_dectest_relb(erts_atomic32_t *decp)
+{
+#ifdef USE_THREADS
+    return ethr_atomic32_dec_read_relb(decp);
+#else
+    return --(*decp);
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_cmpxchg_acqb(erts_atomic32_t *xchgp,
+			   erts_aint32_t new,
+			   erts_aint32_t exp)
+{
+#ifdef USE_THREADS
+    return ethr_atomic32_cmpxchg_acqb(xchgp, new, exp);
+#else
+    erts_aint32_t old = *xchgp;
+    if (old == exp)
+        *xchgp = new;
+    return old;
+#endif
+}
+
+ERTS_GLB_INLINE erts_aint32_t
+erts_atomic32_cmpxchg_relb(erts_atomic32_t *xchgp,
+			   erts_aint32_t new,
+			   erts_aint32_t exp)
+{
+#ifdef USE_THREADS
+    return ethr_atomic32_cmpxchg_relb(xchgp, new, exp);
+#else
+    erts_aint32_t old = *xchgp;
+    if (old == exp)
+        *xchgp = new;
     return old;
+#endif
 }
 
 /* spinlock */
@@ -1116,6 +1440,26 @@ erts_spinlock_init_x(erts_spinlock_t *lock, char *name, Eterm extra)
 }
 
 ERTS_GLB_INLINE void
+erts_spinlock_init_x_opt(erts_spinlock_t *lock, char *name, Eterm extra,
+			 Uint16 opt)
+{
+#ifdef USE_THREADS
+    int res = ethr_spinlock_init(&lock->slck);
+    if (res)
+	erts_thr_fatal_error(res, "init spinlock");
+#ifdef ERTS_ENABLE_LOCK_CHECK
+    erts_lc_init_lock_x(&lock->lc, name, ERTS_LC_FLG_LT_SPINLOCK, extra);
+#endif
+#ifdef ERTS_ENABLE_LOCK_COUNT
+    erts_lcnt_init_lock_x(&lock->lcnt, name, ERTS_LCNT_LT_SPINLOCK|opt, extra);
+#endif
+#else
+    (void)lock;
+#endif
+}
+
+
+ERTS_GLB_INLINE void
 erts_spinlock_init(erts_spinlock_t *lock, char *name)
 {
 #ifdef USE_THREADS
@@ -1145,8 +1489,16 @@ erts_spinlock_destroy(erts_spinlock_t *lock)
     erts_lcnt_destroy_lock(&lock->lcnt);
 #endif
     res = ethr_spinlock_destroy(&lock->slck);
-    if (res)
-	erts_thr_fatal_error(res, "destroy spinlock");
+    if (res != 0) {
+#ifdef ERTS_THR_HAVE_BUSY_DESTROY_BUG
+	if (res == EBUSY) {
+	    char *warn = "Ignoring busy spinlock destroy. "
+		"Most likely a bug in pthread implementation.";
+	    erts_send_warning_to_logger_str_nogl(warn);
+	}
+#endif
+	erts_thr_fatal_error(res, "destroy rwlock");
+    }
 #else
     (void)lock;
 #endif
@@ -1156,16 +1508,13 @@ ERTS_GLB_INLINE void
 erts_spin_unlock(erts_spinlock_t *lock)
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock(&lock->lc);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_unlock(&lock->lcnt);
 #endif
-    res = ethr_spin_unlock(&lock->slck);
-    if (res)
-	erts_thr_fatal_error(res, "release spin lock");
+    ethr_spin_unlock(&lock->slck);
 #else
     (void)lock;
 #endif
@@ -1179,19 +1528,16 @@ erts_spin_lock(erts_spinlock_t *lock)
 #endif
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_lock(&lock->lc);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock(&lock->lcnt);
 #endif
-    res = ethr_spin_lock(&lock->slck);
+    ethr_spin_lock(&lock->slck);
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&lock->lcnt, file, line);
 #endif
-    if (res)
-	erts_thr_fatal_error(res, "take spin lock");
 #else
     (void)lock;
 #endif
@@ -1261,8 +1607,16 @@ erts_rwlock_destroy(erts_rwlock_t *lock)
     erts_lcnt_destroy_lock(&lock->lcnt);
 #endif
     res = ethr_rwlock_destroy(&lock->rwlck);
-    if (res)
+    if (res != 0) {
+#ifdef ERTS_THR_HAVE_BUSY_DESTROY_BUG
+	if (res == EBUSY) {
+	    char *warn = "Ignoring busy rwlock destroy. "
+		"Most likely a bug in pthread implementation.";
+	    erts_send_warning_to_logger_str_nogl(warn);
+	}
+#endif
 	erts_thr_fatal_error(res, "destroy rwlock");
+    }
 #else
     (void)lock;
 #endif
@@ -1272,16 +1626,13 @@ ERTS_GLB_INLINE void
 erts_read_unlock(erts_rwlock_t *lock)
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock_flg(&lock->lc, ERTS_LC_FLG_LO_READ);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_unlock_opt(&lock->lcnt, ERTS_LCNT_LO_READ);
 #endif
-    res = ethr_read_unlock(&lock->rwlck);
-    if (res)
-	erts_thr_fatal_error(res, "release read lock");
+    ethr_read_unlock(&lock->rwlck);
 #else
     (void)lock;
 #endif
@@ -1295,19 +1646,16 @@ erts_read_lock(erts_rwlock_t *lock)
 #endif
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_lock_flg(&lock->lc, ERTS_LC_FLG_LO_READ);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_opt(&lock->lcnt, ERTS_LCNT_LO_READ);
 #endif
-    res = ethr_read_lock(&lock->rwlck);
+    ethr_read_lock(&lock->rwlck);
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&lock->lcnt, file, line);
 #endif
-    if (res)
-	erts_thr_fatal_error(res, "take read lock");
 #else
     (void)lock;
 #endif
@@ -1317,16 +1665,13 @@ ERTS_GLB_INLINE void
 erts_write_unlock(erts_rwlock_t *lock)
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock_flg(&lock->lc, ERTS_LC_FLG_LO_READ_WRITE);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_unlock_opt(&lock->lcnt, ERTS_LCNT_LO_READ_WRITE);
 #endif
-    res = ethr_write_unlock(&lock->rwlck);
-    if (res)
-	erts_thr_fatal_error(res, "release write lock");
+    ethr_write_unlock(&lock->rwlck);
 #else
     (void)lock;
 #endif
@@ -1340,19 +1685,16 @@ erts_write_lock(erts_rwlock_t *lock)
 #endif
 {
 #ifdef USE_THREADS
-    int res;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_lock_flg(&lock->lc, ERTS_LC_FLG_LO_READ_WRITE);
 #endif
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_opt(&lock->lcnt, ERTS_LCNT_LO_READ_WRITE);
 #endif
-    res = ethr_write_lock(&lock->rwlck);
+    ethr_write_lock(&lock->rwlck);
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_lock_post_x(&lock->lcnt, file, line);
 #endif
-    if (res)
-	erts_thr_fatal_error(res, "take write lock");
 #else
     (void)lock;
 #endif
@@ -1387,16 +1729,6 @@ erts_lc_rwlock_is_rwlocked(erts_rwlock_t *lock)
 }
 
 ERTS_GLB_INLINE void
-erts_thr_time_now(erts_thr_timeval_t *time)
-{
-#ifdef USE_THREADS
-    int res = ethr_time_now(time);
-    if (res)
-	erts_thr_fatal_error(res, "get current time");
-#endif
-}
-
-ERTS_GLB_INLINE void
 erts_tsd_key_create(erts_tsd_key_t *keyp)
 {
 #ifdef USE_THREADS
@@ -1436,66 +1768,95 @@ erts_tsd_get(erts_tsd_key_t key)
 #endif
 }
 
-ERTS_GLB_INLINE void
-erts_gate_init(erts_gate_t *gp)
+ERTS_GLB_INLINE erts_tse_t *erts_tse_fetch(void)
 {
 #ifdef USE_THREADS
-    int res = ethr_gate_init((ethr_gate *) gp);
-    if (res != 0)
-	erts_thr_fatal_error(res, "initialize gate");
+    return (erts_tse_t *) ethr_get_ts_event();
+#else
+    return (erts_tse_t *) NULL;
 #endif
 }
 
-ERTS_GLB_INLINE void
-erts_gate_destroy(erts_gate_t *gp)
+ERTS_GLB_INLINE void erts_tse_return(erts_tse_t *ep)
 {
 #ifdef USE_THREADS
-    int res = ethr_gate_destroy((ethr_gate *) gp);
-    if (res != 0)
-	erts_thr_fatal_error(res, "destroy gate");
+    ethr_leave_ts_event(ep);
 #endif
 }
 
-ERTS_GLB_INLINE void
-erts_gate_close(erts_gate_t *gp)
+ERTS_GLB_INLINE void erts_tse_set(erts_tse_t *ep)
 {
 #ifdef USE_THREADS
-    int res = ethr_gate_close((ethr_gate *) gp);
-    if (res != 0)
-	erts_thr_fatal_error(res, "close gate");
+    ethr_event_set(&((ethr_ts_event *) ep)->event);
 #endif
 }
 
-ERTS_GLB_INLINE void
-erts_gate_let_through(erts_gate_t *gp, unsigned no)
+ERTS_GLB_INLINE void erts_tse_reset(erts_tse_t *ep)
 {
 #ifdef USE_THREADS
-    int res = ethr_gate_let_through((ethr_gate *) gp, no);
-    if (res != 0)
-	erts_thr_fatal_error(res, "let through gate");
+    ethr_event_reset(&((ethr_ts_event *) ep)->event);
 #endif
 }
 
-ERTS_GLB_INLINE void
-erts_gate_wait(erts_gate_t *gp)
+ERTS_GLB_INLINE int erts_tse_wait(erts_tse_t *ep)
 {
 #ifdef USE_THREADS
-    int res = ethr_gate_wait((ethr_gate *) gp);
+    return ethr_event_wait(&((ethr_ts_event *) ep)->event);
+#else
+    return ENOTSUP;
+#endif
+}
+
+ERTS_GLB_INLINE int erts_tse_swait(erts_tse_t *ep, int spincount)
+{
+#ifdef USE_THREADS
+    return ethr_event_swait(&((ethr_ts_event *) ep)->event, spincount);
+#else
+    return ENOTSUP;
+#endif
+}
+
+ERTS_GLB_INLINE int erts_tse_is_tmp(erts_tse_t *ep)
+{
+#ifdef USE_THREADS
+    return (ep->iflgs & ETHR_TS_EV_TMP) == ETHR_TS_EV_TMP;
+#else
+    return 0;
+#endif
+}
+
+ERTS_GLB_INLINE void erts_thr_set_main_status(int on, int no)
+{
+#ifdef USE_THREADS
+    int res = ethr_set_main_thr_status(on, no);
     if (res != 0)
-	erts_thr_fatal_error(res, "wait on gate");
+	erts_thr_fatal_error(res, "set thread main status");
 #endif
 }
 
-ERTS_GLB_INLINE void
-erts_gate_swait(erts_gate_t *gp, int spincount)
+ERTS_GLB_INLINE int erts_thr_get_main_status(void)
 {
 #ifdef USE_THREADS
-    int res = ethr_gate_swait((ethr_gate *) gp, spincount);
+    int main_status;
+    int res = ethr_get_main_thr_status(&main_status);
     if (res != 0)
-	erts_thr_fatal_error(res, "swait on gate");
+	erts_thr_fatal_error(res, "get thread main status");
+    return main_status;
+#else
+    return 1;
 #endif
 }
 
+ERTS_GLB_INLINE void erts_thr_yield(void)
+{
+#ifdef USE_THREADS
+    int res = ETHR_YIELD();
+    if (res != 0)
+	erts_thr_fatal_error(res, "yield");
+#endif    
+}
+
+
 #ifdef ETHR_HAVE_ETHR_SIG_FUNCS
 
 ERTS_GLB_INLINE void
diff --git a/erts/emulator/beam/erl_time.h b/erts/emulator/beam/erl_time.h
index 6f6b971d34..93d8ea4cb4 100644
--- a/erts/emulator/beam/erl_time.h
+++ b/erts/emulator/beam/erl_time.h
@@ -20,11 +20,15 @@
 #ifndef ERL_TIME_H__
 #define ERL_TIME_H__
 
+extern erts_smp_atomic_t do_time;	/* set at clock interrupt */
+extern SysTimeval erts_first_emu_time;
+
 /*
 ** Timer entry:
 */
 typedef struct erl_timer {
     struct erl_timer* next;	/* next entry tiw slot or chain */
+    struct erl_timer* prev;	/* prev entry tiw slot or chain */
     Uint slot;			/* slot in timer wheel */
     Uint count;			/* number of loops remaining */
     int    active;		/* 1=activated, 0=deactivated */
@@ -39,7 +43,6 @@ typedef void (*ErlTimeoutProc)(void*);
 typedef void (*ErlCancelProc)(void*);
 
 #ifdef ERTS_SMP
-
 /*
  * Process and port timer
  */
@@ -61,7 +64,66 @@ void erts_create_smp_ptimer(ErtsSmpPTimer **timer_ref,
 			    ErlTimeoutProc timeout_func,
 			    Uint timeout);
 void erts_cancel_smp_ptimer(ErtsSmpPTimer *ptimer);
+#endif
+
+/* timer-wheel api */
 
+void erts_init_time(void);
+void erts_set_timer(ErlTimer*, ErlTimeoutProc, ErlCancelProc, void*, Uint);
+void erts_cancel_timer(ErlTimer*);
+void erts_bump_timer(erts_aint_t);
+Uint erts_timer_wheel_memory_size(void);
+Uint erts_time_left(ErlTimer *);
+erts_aint_t erts_next_time(void);
+
+#ifdef DEBUG
+void erts_p_slpq(void);
 #endif
 
+ERTS_GLB_INLINE erts_aint_t erts_do_time_read_and_reset(void);
+ERTS_GLB_INLINE void erts_do_time_add(long);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_INLINE erts_aint_t erts_do_time_read_and_reset(void) { return erts_smp_atomic_xchg(&do_time, 0L); }
+ERTS_GLB_INLINE void erts_do_time_add(long elapsed) { erts_smp_atomic_add(&do_time, elapsed); }
+
+#endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
+
+
+/* time_sup */
+
+#if (defined(HAVE_GETHRVTIME) || defined(HAVE_CLOCK_GETTIME))
+#  ifndef HAVE_ERTS_NOW_CPU
+#    define HAVE_ERTS_NOW_CPU
+#    ifdef HAVE_GETHRVTIME
+#      define erts_start_now_cpu() sys_start_hrvtime()
+#      define erts_stop_now_cpu()  sys_stop_hrvtime()
+#    endif
+#  endif
+void erts_get_now_cpu(Uint* megasec, Uint* sec, Uint* microsec);
 #endif
+
+void erts_get_timeval(SysTimeval *tv);
+long erts_get_time(void);
+void erts_get_emu_time(SysTimeval *);
+
+ERTS_GLB_INLINE int erts_cmp_timeval(SysTimeval *t1p, SysTimeval *t2p);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_INLINE int
+erts_cmp_timeval(SysTimeval *t1p, SysTimeval *t2p)
+{
+    if (t1p->tv_sec == t2p->tv_sec) {
+	if (t1p->tv_usec < t2p->tv_usec)
+	    return -1;
+	else if (t1p->tv_usec > t2p->tv_usec)
+	    return 1;
+	return 0;
+    }
+    return t1p->tv_sec < t2p->tv_sec ? -1 : 1;
+}
+
+#endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
+#endif /* ERL_TIME_H__ */
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
index c15f85f8f1..ca4b54188e 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -358,10 +358,6 @@ static int clock_resolution;
 ** instead of something like select.
 */
 
-#if defined(ERTS_TIMER_THREAD)
-static ERTS_INLINE void init_erts_deliver_time(const SysTimeval *inittv) { }
-static ERTS_INLINE void do_erts_deliver_time(const SysTimeval *current) { }
-#else
 static SysTimeval last_delivered; 
 
 static void init_erts_deliver_time(const SysTimeval *inittv)
@@ -389,11 +385,10 @@ static void do_erts_deliver_time(const SysTimeval *current)
        this by simply pretend as if the time stood still. :) */
 
     if (elapsed > 0) {
-	do_time_add(elapsed);
+	erts_do_time_add(elapsed);
 	last_delivered = cur_time;
     }
 }
-#endif
 
 int 
 erts_init_time_sup(void)
@@ -650,6 +645,22 @@ local_to_univ(Sint *year, Sint *month, Sint *day,
     t.tm_sec = *second;
     t.tm_isdst = isdst;
     the_clock = mktime(&t);
+    if (the_clock == -1) {
+	if (isdst) {
+	    /* If this is a timezone without DST and the OS (correctly)
+	       refuses to give us a DST time, we simulate the Linux/Solaris
+	       behaviour of giving the same data as if is_dst was not set. */
+	    t.tm_isdst = 0;
+	    the_clock = mktime(&t);
+	    if (the_clock == -1) {
+		/* Failed anyway, something else is bad - will be a badarg */
+		return 0;
+	    }
+	} else {
+	    /* Something else is the matter, badarg. */
+	    return 0;
+	}
+    }
 #ifdef HAVE_GMTIME_R
     gmtime_r(&the_clock, (tm = &tmbuf));
 #else
@@ -663,6 +674,10 @@ local_to_univ(Sint *year, Sint *month, Sint *day,
     *second = tm->tm_sec;
     return 1;
 }
+#if defined(HAVE_POSIX2TIME) && defined(HAVE_DECL_POSIX2TIME) && \
+    !HAVE_DECL_POSIX2TIME
+extern time_t posix2time(time_t);
+#endif
 
 int 
 univ_to_local(Sint *year, Sint *month, Sint *day, 
@@ -766,7 +781,6 @@ get_sys_now(Uint* megasec, Uint* sec, Uint* microsec)
    to a struct timeval representing current time (to save
    a gettimeofday() where possible) or NULL */
 
-#if !defined(ERTS_TIMER_THREAD)
 void erts_deliver_time(void) {
     SysTimeval now;
     
@@ -777,7 +791,6 @@ void erts_deliver_time(void) {
     
     erts_smp_mtx_unlock(&erts_timeofday_mtx);
 }
-#endif
 
 /* get *real* time (not ticks) remaining until next timeout - if there
    isn't one, give a "long" time, that is guaranteed
@@ -786,14 +799,12 @@ void erts_deliver_time(void) {
 void erts_time_remaining(SysTimeval *rem_time)
 {
     int ticks;
-#if !defined(ERTS_TIMER_THREAD)
     SysTimeval cur_time;
-#endif
     long elapsed;
 
-    /* next_time() returns no of ticks to next timeout or -1 if none */
+    /* erts_next_time() returns no of ticks to next timeout or -1 if none */
 
-    if ((ticks = next_time()) == -1) {
+    if ((ticks = erts_next_time()) == -1) {
 	/* timer queue empty */
 	/* this will cause at most 100000000 ticks */
 	rem_time->tv_sec = 100000;
@@ -802,9 +813,6 @@ void erts_time_remaining(SysTimeval *rem_time)
 	/* next timeout after ticks ticks */
 	ticks *= CLOCK_RESOLUTION;
 	
-#if defined(ERTS_TIMER_THREAD)
-	elapsed = 0;
-#else
 	erts_smp_mtx_lock(&erts_timeofday_mtx);
 	
 	get_tolerant_timeofday(&cur_time);
@@ -819,7 +827,6 @@ void erts_time_remaining(SysTimeval *rem_time)
 	    rem_time->tv_sec = rem_time->tv_usec = 0;
 	    return;
 	}
-#endif
 	rem_time->tv_sec = (ticks - elapsed) / 1000;
 	rem_time->tv_usec = 1000 * ((ticks - elapsed) % 1000);
     }
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index 3043bb1e8c..c0397ca6c3 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1999-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1999-2011. 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
@@ -1668,7 +1668,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	return_flags = 0;
 	if (match_spec) {
 	    pam_result = erts_match_set_run(p, match_spec, args, arity,
-					    &return_flags);
+					    ERTS_PAM_TMP_RESULT, &return_flags);
 	    if (is_non_value(pam_result)) {
 		erts_match_set_release_result(p);
 #if !HEAP_ON_C_STACK
@@ -1815,7 +1815,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	return_flags = 0;
 	if (match_spec) {
 	    pam_result = erts_match_set_run(p, match_spec, args, arity,
-					    &return_flags);
+					    ERTS_PAM_TMP_RESULT, &return_flags);
 	    if (is_non_value(pam_result)) {
 		erts_match_set_release_result(p);
 		UnUseTmpHeap(ERL_SUB_BIN_SIZE,p);
diff --git a/erts/emulator/beam/erl_unicode.c b/erts/emulator/beam/erl_unicode.c
index d01a3661f9..545b345a71 100644
--- a/erts/emulator/beam/erl_unicode.c
+++ b/erts/emulator/beam/erl_unicode.c
@@ -30,6 +30,8 @@
 #include "big.h"
 
 #include "erl_unicode.h"
+#include "erl_unicode_normalize.h"
+
 
 typedef struct _restart_context {
     byte *bytes;
@@ -54,13 +56,6 @@ static BIF_RETTYPE finalize_list_to_list(Process *p,
 					 Uint num_resulting_chars, 
 					 int state, int left,
 					 Eterm tail);
-static int analyze_utf8(byte *source, Uint size, 
-			byte **err_pos, Uint *num_chars, int *left);
-#define UTF8_OK 0
-#define UTF8_INCOMPLETE 1
-#define UTF8_ERROR 2
-#define UTF8_ANALYZE_MORE 3
-
 static BIF_RETTYPE characters_to_utf8_trap(BIF_ALIST_3);
 static BIF_RETTYPE characters_to_list_trap_1(BIF_ALIST_3);
 static BIF_RETTYPE characters_to_list_trap_2(BIF_ALIST_3);
@@ -463,7 +458,7 @@ L_Again:   /* Restart with sublist, old listend was pushed on stack */
 			}
 			objp = list_val(ioterm);
 			obj = CAR(objp);
-			if (!is_byte(obj))
+			if (!is_small(obj))
 			    break;
 		    }
 		} else if (is_nil(obj)) {
@@ -970,11 +965,11 @@ static int is_valid_utf8(Eterm orig_bin)
 	bytes = erts_get_aligned_binary_bytes(orig_bin, &temp_alloc);
     }
     size = binary_size(orig_bin);
-    ret = analyze_utf8(bytes,
+    ret = erts_analyze_utf8(bytes,
 		       size,
 		       &endpos,&numchar,NULL);
     erts_free_aligned_binary_bytes(temp_alloc);
-    return (ret == UTF8_OK);
+    return (ret == ERTS_UTF8_OK);
 }
 
 BIF_RETTYPE unicode_characters_to_binary_2(BIF_ALIST_2)
@@ -1084,14 +1079,14 @@ static BIF_RETTYPE build_list_return(Process *p, byte *bytes, int pos, Uint char
 	    hp += 2;
 	    rest_term = CONS(hp,leftover_bin,rest_term);
 	}
-	BIF_RET(finalize_list_to_list(p, bytes, rest_term, 0U, pos, characters, UTF8_ERROR, left, NIL));
+	BIF_RET(finalize_list_to_list(p, bytes, rest_term, 0U, pos, characters, ERTS_UTF8_ERROR, left, NIL));
     } else if (rest_term == NIL && num_leftovers != 0) {
 	Eterm leftover_bin = new_binary(p, leftover, num_leftovers);
 	if (check_leftovers(leftover,num_leftovers) != 0) {
-	    BIF_RET(finalize_list_to_list(p, bytes, leftover_bin, 0U, pos, characters, UTF8_ERROR, 
+	    BIF_RET(finalize_list_to_list(p, bytes, leftover_bin, 0U, pos, characters, ERTS_UTF8_ERROR, 
 					  left, NIL));
 	} else {
-	    BIF_RET(finalize_list_to_list(p, bytes, leftover_bin, 0U, pos, characters, UTF8_INCOMPLETE, 
+	    BIF_RET(finalize_list_to_list(p, bytes, leftover_bin, 0U, pos, characters, ERTS_UTF8_INCOMPLETE, 
 					  left, NIL));
 	}
     } else { /* All OK */	    
@@ -1107,11 +1102,11 @@ static BIF_RETTYPE build_list_return(Process *p, byte *bytes, int pos, Uint char
 	    rc.num_processed_bytes = 0; /* not used */
 	    rc.num_bytes_to_process = pos;
 	    rc.num_resulting_chars = characters;
-	    rc.state = UTF8_OK; /* not used */
+	    rc.state = ERTS_UTF8_OK; /* not used */
 	    BIF_TRAP3(&characters_to_list_trap_1_exp, p, make_magic_bin_for_restart(p,&rc), 
 		      rest_term, latin1);
 	} else { /* Success */
-	    BIF_RET(finalize_list_to_list(p, bytes, NIL, 0U, pos, characters, UTF8_OK, left, NIL));
+	    BIF_RET(finalize_list_to_list(p, bytes, NIL, 0U, pos, characters, ERTS_UTF8_OK, left, NIL));
 	}
     }
 }
@@ -1205,7 +1200,7 @@ BIF_RETTYPE unicode_characters_to_list_2(BIF_ALIST_2)
  * When input to characters_to_list is a plain binary and the format is 'unicode', we do
  * a faster analyze and size count with this function.
  */
-static int analyze_utf8(byte *source, Uint size, 
+int erts_analyze_utf8(byte *source, Uint size, 
 			byte **err_pos, Uint *num_chars, int *left)
 {
     *err_pos = source;
@@ -1216,60 +1211,60 @@ static int analyze_utf8(byte *source, Uint size,
 	    --size; 
 	} else if (((*source) & ((byte) 0xE0)) == 0xC0) {
 	    if (size < 2) {
-		return UTF8_INCOMPLETE;
+		return ERTS_UTF8_INCOMPLETE;
 	    }
 	    if (((source[1] & ((byte) 0xC0)) != 0x80) ||
 		((*source) < 0xC2) /* overlong */) {
-		return UTF8_ERROR;
+		return ERTS_UTF8_ERROR;
 	    }
 	    source += 2;
 	    size -= 2;
 	} else if (((*source) & ((byte) 0xF0)) == 0xE0) {
 	    if (size < 3) {
-		return UTF8_INCOMPLETE;
+		return ERTS_UTF8_INCOMPLETE;
 	    }
 	    if (((source[1] & ((byte) 0xC0)) != 0x80) ||
 		((source[2] & ((byte) 0xC0)) != 0x80) ||
 		(((*source) == 0xE0) && (source[1] < 0xA0)) /* overlong */ ) {
-		return UTF8_ERROR;
+		return ERTS_UTF8_ERROR;
 	    }
 	    if ((((*source) & ((byte) 0xF)) == 0xD) && 
 		((source[1] & 0x20) != 0)) {
-		return UTF8_ERROR;
+		return ERTS_UTF8_ERROR;
 	    }
 	    if (((*source) == 0xEF) && (source[1] == 0xBF) &&
 		((source[2] == 0xBE) || (source[2] == 0xBF))) {
-		return UTF8_ERROR;
+		return ERTS_UTF8_ERROR;
 	    }
 	    source += 3;
 	    size -= 3;
 	} else if (((*source) & ((byte) 0xF8)) == 0xF0) {
 	    if (size < 4) {
-		return UTF8_INCOMPLETE;
+		return ERTS_UTF8_INCOMPLETE;
 	    }
 	    if (((source[1] & ((byte) 0xC0)) != 0x80) ||
 		((source[2] & ((byte) 0xC0)) != 0x80) ||
 		((source[3] & ((byte) 0xC0)) != 0x80) ||
 		(((*source) == 0xF0) && (source[1] < 0x90)) /* overlong */) {
-		return UTF8_ERROR;
+		return ERTS_UTF8_ERROR;
 	    }
 	    if ((((*source) & ((byte)0x7)) > 0x4U) ||
 		((((*source) & ((byte)0x7)) == 0x4U) && 
 		 ((source[1] & ((byte)0x3F)) > 0xFU))) {
-		return UTF8_ERROR;
+		return ERTS_UTF8_ERROR;
 	    }
 	    source += 4;
 	    size -= 4; 
 	} else {
-	    return UTF8_ERROR;
+	    return ERTS_UTF8_ERROR;
 	}
 	++(*num_chars);
 	*err_pos = source;
 	if (left && --(*left) <= 0) {
-	    return UTF8_ANALYZE_MORE;
+	    return ERTS_UTF8_ANALYZE_MORE;
 	}
     }
-    return UTF8_OK;
+    return ERTS_UTF8_OK;
 }
 
 /*
@@ -1304,7 +1299,7 @@ static Eterm do_utf8_to_list(Process *p, Uint num, byte *bytes, Uint sz,
 	} else if (((*source) & ((byte) 0xE0)) == 0xC0) {
 	    unipoint = 
 		(((Uint) ((*source) & ((byte) 0x1F))) << 6) |
-		((Uint) (source[1] & ((byte) 0x3F))); 	
+		((Uint) (source[1] & ((byte) 0x3F)));
 	} else if (((*source) & ((byte) 0xF0)) == 0xE0) {
 	    unipoint = 
 		(((Uint) ((*source) & ((byte) 0xF))) << 12) |
@@ -1330,6 +1325,216 @@ static Eterm do_utf8_to_list(Process *p, Uint num, byte *bytes, Uint sz,
     return ret;
 }
 
+static int is_candidate(Uint cp)
+{
+    int index,pos;
+    if (cp < 768) return 0;
+    if (cp > 4023) {
+	if (cp == 12441 || cp == 12442) return 1;
+	return 0;
+    }
+    index = cp / 32 - COMP_CANDIDATE_MAP_OFFSET;
+    pos = cp % 32;
+    return !!(comp_candidate_map[index] & (1UL << pos));
+}
+
+static int hashsearch(int *htab, int htab_size, CompEntry *cv, Uint16 c)
+{
+	int bucket = c % htab_size;
+	while (htab[bucket] != -1 && cv[htab[bucket]].c != c)
+	    bucket = (bucket + 1) % htab_size;
+	return htab[bucket];
+}
+
+#define TRANSLATE_NO 0
+#define TRANSLATE_MAYBE -1
+
+/* The s array is reversed */
+static int translate(Uint16 *s, int slen, Uint16 *res)
+{
+    /* Go backwards through buffer and match against tree */
+    int pos = 0;
+    CompEntry *cv = compose_tab;
+    int *hc = hash_compose_tab;
+    int cvs = compose_tab_size;
+    int x;
+    while (pos < slen) {
+	x = hashsearch(hc,cvs*HASH_SIZE_FACTOR,cv,s[pos]);
+	if (x < 0) {
+	    return TRANSLATE_NO;
+	} 
+	if (cv[x].res) {
+	    *res = cv[x].res;
+	    return pos;
+	}
+	cvs = cv[x].num_subs;
+	hc = cv[x].hash;
+	cv = cv[x].subs;
+	++pos;
+    }
+    return TRANSLATE_MAYBE;
+}
+
+static void handle_first_norm(Uint16 *savepoints, int *numpointsp, Uint unipoint)
+{
+    /*erts_fprintf(stderr,"CP = %d, numpoints = %d\n",(int) unipoint,(int) *numpointsp);*/
+    *numpointsp = 1;
+    savepoints[0] = (Uint16) unipoint;
+}
+
+static void cleanup_norm(Eterm **hpp, Uint16 *savepoints, int numpoints, Eterm *retp)
+{
+    Eterm *hp = *hpp;
+    int res,i;
+    Uint16 newpoint;
+    Eterm ret = *retp;
+    
+    ret = CONS(hp,make_small((Uint) savepoints[0]),ret);
+    hp += 2;
+    
+    for (i = 1;i < numpoints;) {
+	if(!is_candidate(savepoints[i]) || 
+	   ((res = translate(savepoints+i,numpoints - i, &newpoint)) <= 0)) {
+	    ret = CONS(hp,make_small((Uint) savepoints[i]),ret);
+	    hp += 2;
+	    ++i;
+	} else {
+	    ret = CONS(hp,make_small((Uint) newpoint),ret);
+	    hp += 2;
+	    i += res;
+	}
+    }
+    *retp = ret;
+}
+    
+static void handle_potential_norm(Eterm **hpp, Uint16 *savepoints, int *numpointsp, Uint unipoint, Eterm *retp)
+{
+    Eterm *hp = *hpp;
+    int numpoints = *numpointsp;
+    int res,i;
+    Uint16 newpoint;
+    Eterm ret = *retp;
+
+    /* erts_fprintf(stderr,"CP = %d, numpoints = %d\n",(int) unipoint,(int) numpoints);*/
+    if ((unipoint >> 16) == 0) { /* otherwise we're done here */ 
+	savepoints[numpoints++] = (Uint16) unipoint;
+	res = translate(savepoints,numpoints,&newpoint);
+	if (res == TRANSLATE_NO) {
+	    ret = CONS(hp,make_small((Uint) savepoints[0]),ret);
+	    hp += 2;
+	    for (i = 1;i < numpoints;) {
+		if(!is_candidate(savepoints[i]) ||
+		   ((res = translate(savepoints+i,numpoints - i, &newpoint)) == 0)) {
+		    ret = CONS(hp,make_small((Uint) savepoints[i]),ret);
+		    hp += 2;
+		    ++i;
+		} else if (res > 0) {
+		    ret = CONS(hp,make_small((Uint) newpoint),ret);
+		    hp += 2;
+		    i += res;
+		} else { /* res < 0 */
+		    /* A "maybe", means we are not done yet */
+		    int j = 0;
+		    while (i < numpoints) {
+			savepoints[j++] = savepoints[i++];
+		    }
+		    numpoints = j;
+		    goto breakaway;
+		}
+	    }
+	    numpoints = 0;
+	breakaway:
+	    ;
+	} else if (res > 0) {
+	    numpoints = 0;
+	    ret = CONS(hp,make_small((Uint) newpoint),ret);
+	    hp += 2;
+	} /* < 0 means go on */
+    } else {
+	/* Unconditional rollup, this character is larger than 16 bit */
+	ret = CONS(hp,make_small((Uint) savepoints[0]),ret);
+	hp += 2;
+	
+	for (i = 1;i < numpoints;) {
+	    if(!is_candidate(savepoints[i]) || 
+	       ((res = translate(savepoints+i,numpoints - i, &newpoint)) <= 0)) {
+		ret = CONS(hp,make_small((Uint) savepoints[i]),ret);
+		hp += 2;
+		++i;
+	    } else {
+		ret = CONS(hp,make_small((Uint) newpoint),ret);
+		hp += 2;
+		i += res;
+	    }
+	}
+	ret = CONS(hp,make_small(unipoint),ret);
+	hp += 2;
+	numpoints = 0;
+    }	
+    *hpp = hp;
+    *numpointsp = numpoints;
+    *retp = ret;
+} 
+
+static Eterm do_utf8_to_list_normalize(Process *p, Uint num, byte *bytes, Uint sz)
+{
+    Eterm *hp,*hp_end;
+    Eterm ret;
+    byte *source;
+    Uint unipoint;
+    Uint16 savepoints[4];
+    int numpoints = 0;
+
+    ASSERT(num > 0);
+
+    hp = HAlloc(p,num * 2); /* May be to much */
+    hp_end = hp + num * 2;
+    ret = NIL;
+    source = bytes + sz;
+    while(--source >= bytes) {
+	if (((*source) & ((byte) 0x80)) == 0) {
+	    unipoint = (Uint) *source;
+	} else if (((*source) & ((byte) 0xE0)) == 0xC0) {
+	    unipoint = 
+		(((Uint) ((*source) & ((byte) 0x1F))) << 6) |
+		((Uint) (source[1] & ((byte) 0x3F))); 	
+	} else if (((*source) & ((byte) 0xF0)) == 0xE0) {
+	    unipoint = 
+		(((Uint) ((*source) & ((byte) 0xF))) << 12) |
+		(((Uint) (source[1] & ((byte) 0x3F))) << 6) |
+		((Uint) (source[2] & ((byte) 0x3F))); 	 	
+	} else if (((*source) & ((byte) 0xF8)) == 0xF0) {
+	    unipoint = 
+		(((Uint) ((*source) & ((byte) 0x7))) << 18) |
+		(((Uint) (source[1] & ((byte) 0x3F))) << 12) |
+		(((Uint) (source[2] & ((byte) 0x3F))) << 6) |
+		((Uint) (source[3] & ((byte) 0x3F))); 	 	
+	} else {
+	    /* ignore 2#10XXXXXX */
+	    continue;
+	}
+	if (numpoints) {
+	    handle_potential_norm(&hp,savepoints,&numpoints,unipoint,&ret);
+	    continue;
+	}
+	/* We are not building up any normalizations yet, look that we shouldn't start... */
+	if (is_candidate(unipoint)) {
+	    handle_first_norm(savepoints,&numpoints,unipoint);
+	    continue;
+	} 
+	ret = CONS(hp,make_small(unipoint),ret);
+	hp += 2;
+    }
+    /* so, we'we looped to the beginning, do we have anything saved? */
+    if (numpoints) {
+	cleanup_norm(&hp,savepoints,numpoints,&ret);
+    }
+    if (hp_end != hp) {
+	HRelease(p,hp_end,hp);
+    }
+    return ret;
+}
+
 /*
  * The last step of characters_to_list, build a list from the buffer 'bytes' (created in the same way
  * as for characters_to_utf8). All sizes are known in advance and most data will be held in a 
@@ -1378,10 +1583,10 @@ static BIF_RETTYPE finalize_list_to_list(Process *p,
      */
 
     free_restart(bytes);
-    if (state == UTF8_INCOMPLETE) {
+    if (state == ERTS_UTF8_INCOMPLETE) {
 	hp = HAlloc(p,4);
 	ret = TUPLE3(hp,am_incomplete,converted,rest);
-    } else if (state == UTF8_ERROR) {
+    } else if (state == ERTS_UTF8_ERROR) {
 	hp = HAlloc(p,4);
 	ret = TUPLE3(hp,am_error,converted,rest);
     } else {
@@ -1408,7 +1613,7 @@ static BIF_RETTYPE characters_to_list_trap_2(BIF_ALIST_3)
 
 /*
  * Hooks into the process of decoding a binary depending on state.
- * If last_state is UTF8_ANALYZE_MORE, num_bytes_to_process 
+ * If last_state is ERTS_UTF8_ANALYZE_MORE, num_bytes_to_process 
  * and num_resulting_chars will grow
  * until we're done analyzing the binary. Then we'll eat 
  * the bytes to process, lowering num_bytes_to_process and num_resulting_chars,
@@ -1465,14 +1670,14 @@ static BIF_RETTYPE do_bif_utf8_to_list(Process *p,
 
     left = allowed_iterations(p);
     
-    if (state == UTF8_ANALYZE_MORE) {
-	state = analyze_utf8(bytes + num_bytes_to_process,
+    if (state == ERTS_UTF8_ANALYZE_MORE) {
+	state = erts_analyze_utf8(bytes + num_bytes_to_process,
 			     size - num_bytes_to_process,
 			     &endpos,&numchar,&left);
 	cost_to_proc(p,numchar);
 	num_resulting_chars += numchar;
 	num_bytes_to_process = endpos - bytes;
-	if (state == UTF8_ANALYZE_MORE) {
+	if (state == ERTS_UTF8_ANALYZE_MORE) {
 	    Eterm epos = erts_make_integer(num_bytes_to_process,p);
 	    Eterm enumchar = erts_make_integer(num_resulting_chars,p);
 	    erts_free_aligned_binary_bytes(temp_alloc);
@@ -1528,7 +1733,7 @@ static BIF_RETTYPE do_bif_utf8_to_list(Process *p,
 	ErlSubBin *sb;
 	Eterm orig;
 	Uint offset;
-	ASSERT(state != UTF8_OK);
+	ASSERT(state != ERTS_UTF8_OK);
 	hp = HAlloc(p, ERL_SUB_BIN_SIZE);
 	sb = (ErlSubBin *) hp;
 	ERTS_GET_REAL_BIN(orig_bin, orig, offset, bitoffs, bitsize);
@@ -1544,14 +1749,14 @@ static BIF_RETTYPE do_bif_utf8_to_list(Process *p,
 
     /* Done */
 
-    if (state == UTF8_INCOMPLETE) {
+    if (state == ERTS_UTF8_INCOMPLETE) {
 	if (check_leftovers(bytes + num_bytes_to_process + num_processed_bytes,
 			    b_sz) != 0) {
 	    goto error_return;
 	}
 	hp = HAlloc(p,4);
 	ret = TUPLE3(hp,am_incomplete,converted,rest);
-    } else if (state == UTF8_ERROR) {
+    } else if (state == ERTS_UTF8_ERROR) {
  error_return:
 	hp = HAlloc(p,4);
 	ret = TUPLE3(hp,am_error,converted,rest);
@@ -1589,7 +1794,7 @@ static BIF_RETTYPE characters_to_list_trap_3(BIF_ALIST_3)
 			       0U, /* nothing processed yet */
 			       num_bytes_to_process, 
 			       num_resulting_chars,
-			       UTF8_ANALYZE_MORE, /* always this state here */
+			       ERTS_UTF8_ANALYZE_MORE, /* always this state here */
 			       NIL); /* Nothing built -> no tail yet */
 	
 }
@@ -1642,7 +1847,7 @@ static BIF_RETTYPE utf8_to_list(BIF_ALIST_1)
 	BIF_ERROR(BIF_P,BADARG);
     }
     return do_bif_utf8_to_list(BIF_P, BIF_ARG_1, 0U, 0U, 0U, 
-			       UTF8_ANALYZE_MORE,NIL);
+			       ERTS_UTF8_ANALYZE_MORE,NIL);
 }
 
 
@@ -1728,8 +1933,8 @@ binary_to_atom(Process* p, Eterm bin, Eterm enc, int must_exist)
 	    Uint n;
 	    int reds_left = bin_size+1; /* Number of reductions left. */
 
-	    if (analyze_utf8(bytes, bin_size, &err_pos,
-			     &n, &reds_left) == UTF8_OK) {
+	    if (erts_analyze_utf8(bytes, bin_size, &err_pos,
+			     &n, &reds_left) == ERTS_UTF8_OK) {
 		/* 
 		 * Correct UTF-8 encoding, but too many characters to
 		 * fit in an atom.
@@ -1813,3 +2018,616 @@ BIF_RETTYPE binary_to_existing_atom_2(BIF_ALIST_2)
 {
     return binary_to_atom(BIF_P, BIF_ARG_1, BIF_ARG_2, 1);
 }
+
+/**********************************************************
+ * Simpler non-interruptable routines for UTF-8 and 
+ * Windowish UTF-16 (restricted)
+ **********************************************************/
+/*
+ * This function is the heart of the Unicode support for 
+ * open_port - spawn_executable. It converts both the name
+ * of the executable and the arguments according to the same rules
+ * as for filename conversion. That means as if your arguments are
+ * to be raw, you supply binaries, else unicode characters are allowed up to
+ * the encoding maximum (256 of the unicode max).
+ * Depending on the filename encoding standard, the vector is then
+ * converted to whatever is used, which might mean win_utf16 if on windows.
+ * Do not peek into the argument vector or filenam with ordinary
+ * string routines, that will certainly fail on some OS.
+ */
+
+char *erts_convert_filename_to_native(Eterm name, ErtsAlcType_t alloc_type, int allow_empty)
+{
+    int encoding = erts_get_native_filename_encoding();
+    char* name_buf = NULL;
+
+    if (is_atom(name) || is_list(name) || (allow_empty && is_nil(name))) {
+	Sint need;
+	if ((need = erts_native_filename_need(name,encoding)) < 0) {
+	    return NULL;
+	}
+	if (encoding == ERL_FILENAME_WIN_WCHAR) {
+	    need += 2;
+	} else {
+	    ++need;
+	}
+	name_buf = (char *) erts_alloc(alloc_type, need);
+	erts_native_filename_put(name,encoding,(byte *)name_buf); 
+	name_buf[need-1] = 0;
+	if (encoding == ERL_FILENAME_WIN_WCHAR) {
+	    name_buf[need-2] = 0;
+	}
+    } else if (is_binary(name)) {
+	byte *temp_alloc = NULL;
+	byte *bytes;
+	byte *err_pos;
+	Uint size,num_chars;
+	
+	size = binary_size(name);
+	bytes = erts_get_aligned_binary_bytes(name, &temp_alloc);
+	if (encoding != ERL_FILENAME_WIN_WCHAR) {
+	    /*Add 0 termination only*/
+	    name_buf = (char *) erts_alloc(alloc_type, size+1);
+	    memcpy(name_buf,bytes,size);
+	    name_buf[size]=0;
+	} else if (erts_analyze_utf8(bytes,size,&err_pos,&num_chars,NULL) != ERTS_UTF8_OK || 
+		   erts_get_user_requested_filename_encoding() ==  ERL_FILENAME_LATIN1) {
+	    byte *p;
+	    /* What to do now? Maybe latin1, so just take byte for byte instead */
+	    name_buf = (char *) erts_alloc(alloc_type, (size+1)*2);
+	    p = (byte *) name_buf;
+	    while (size--) {
+		*p++ = *bytes++;
+		*p++ = 0;
+	    }
+	    *p++ = 0;
+	    *p++ = 0;
+	} else { /* WIN_WCHAR and valid UTF8 */
+	    name_buf = (char *) erts_alloc(alloc_type, (num_chars+1)*2);
+	    erts_copy_utf8_to_utf16_little((byte *) name_buf, bytes, num_chars);
+	    name_buf[num_chars*2] = 0;
+	    name_buf[num_chars*2+1] = 0;
+	}
+	erts_free_aligned_binary_bytes(temp_alloc);
+    } else {
+	return NULL;
+    }
+    return name_buf;
+}
+
+
+Sint erts_native_filename_need(Eterm ioterm, int encoding) 
+{
+    Eterm *objp;
+    Eterm obj;
+    DECLARE_ESTACK(stack);
+    Sint need = 0;
+
+    if (is_atom(ioterm)) {
+	Atom* ap;
+	int i;
+	ap = atom_tab(atom_val(ioterm));
+	switch (encoding) {
+	case ERL_FILENAME_LATIN1:
+	    need = ap->len;
+	    break;
+	case ERL_FILENAME_UTF8_MAC:
+	case ERL_FILENAME_UTF8:
+	    for (i = 0; i < ap->len; i++) {
+		need += (ap->name[i] >= 0x80) ? 2 : 1;
+	    }
+	    break;
+	case ERL_FILENAME_WIN_WCHAR:
+	    need = 2*(ap->len);
+	    break;
+	default:
+	    need = -1;
+	}
+	DESTROY_ESTACK(stack);
+	return need;
+    }
+
+    if (is_nil(ioterm)) {
+	DESTROY_ESTACK(stack);
+	return need;
+    }
+    if (!is_list(ioterm)) {
+	DESTROY_ESTACK(stack);
+	return (Sint) -1;
+    }
+    /* OK a list, needs to be processed in order, handling each flat list-level
+       as they occur, just like io_list_to_binary would */
+    ESTACK_PUSH(stack,ioterm);
+    while (!ESTACK_ISEMPTY(stack)) {
+	ioterm = ESTACK_POP(stack);	
+	if (is_nil(ioterm)) {
+	    /* ignore empty lists */
+	    continue;
+	}
+	if(is_list(ioterm)) {
+L_Again:   /* Restart with sublist, old listend was pushed on stack */
+	    objp = list_val(ioterm);
+	    obj = CAR(objp);
+	    for(;;) { /* loop over one flat list of bytes and binaries
+		         until sublist or list end is encountered */
+		if (is_small(obj)) { /* Always small */
+		    for(;;) {
+			Uint x = unsigned_val(obj);
+			switch (encoding) {
+			case ERL_FILENAME_LATIN1:
+			    if (x > 255) {
+				DESTROY_ESTACK(stack);
+				return ((Sint) -1);
+			    }
+			    need += 1;
+			    break;
+			case ERL_FILENAME_UTF8_MAC:
+			case ERL_FILENAME_UTF8:
+			    if (x < 0x80) {
+				need +=1;
+			    } else if (x < 0x800) {
+				need += 2;
+			    } else if (x < 0x10000) {
+				if ((x >= 0xD800 && x <= 0xDFFF) ||
+				    (x == 0xFFFE) ||
+				    (x == 0xFFFF)) { /* Invalid unicode range */
+				    DESTROY_ESTACK(stack);
+				    return ((Sint) -1);
+				}
+				need += 3;
+			    } else  if (x < 0x110000) {
+				need += 4; 
+			    } else {
+				DESTROY_ESTACK(stack);
+				return ((Sint) -1);
+			    }
+			    break;
+			case ERL_FILENAME_WIN_WCHAR:
+			    if (x <= 0xffff) { 
+				need += 2;
+				break;
+			    } /* else fall throug to error */
+			default:
+			    DESTROY_ESTACK(stack);
+			    return ((Sint) -1);
+			}
+			    
+			/* everything else will give badarg later 
+			   in the process, so we dont check */
+			ioterm = CDR(objp);
+			if (!is_list(ioterm)) {
+			    break;
+			}
+			objp = list_val(ioterm);
+			obj = CAR(objp);
+			if (!is_small(obj))
+			    break;
+		    }
+		} else if (is_nil(obj)) {
+		    ioterm = CDR(objp);
+		    if (!is_list(ioterm)) {
+			break;
+		    }
+		    objp = list_val(ioterm);
+		    obj = CAR(objp);
+		} else if (is_list(obj)) {
+		    /* push rest of list for later processing, start 
+		       again with sublist */
+		    ESTACK_PUSH(stack,CDR(objp));
+		    ioterm = obj;
+		    goto L_Again;
+		} else {
+		    DESTROY_ESTACK(stack);
+		    return ((Sint) -1);
+		} 
+		if (is_nil(ioterm) || !is_list(ioterm)) {
+		    break;
+		}
+	    } /* for(;;) */
+	} /* is_list(ioterm) */
+	
+	if (!is_list(ioterm) && !is_nil(ioterm)) {
+	    /* inproper list end */
+	    DESTROY_ESTACK(stack);
+	    return ((Sint) -1);
+	}
+    } /* while  not estack empty */
+    DESTROY_ESTACK(stack);
+    return need;
+}
+
+void erts_native_filename_put(Eterm ioterm, int encoding, byte *p) 
+{
+    Eterm *objp;
+    Eterm obj;
+    DECLARE_ESTACK(stack);
+
+    if (is_atom(ioterm)) {
+	Atom* ap;
+	int i;
+	ap = atom_tab(atom_val(ioterm));
+	switch (encoding) {
+	case ERL_FILENAME_LATIN1:
+	    for (i = 0; i < ap->len; i++) {
+		*p++ = ap->name[i];
+	    }
+	    break;
+	case ERL_FILENAME_UTF8_MAC:
+	case ERL_FILENAME_UTF8:
+	    for (i = 0; i < ap->len; i++) {
+		if(ap->name[i] < 0x80) {
+		    *p++ = ap->name[i];
+		} else {
+		    *p++ = (((ap->name[i]) >> 6) | ((byte) 0xC0));
+		    *p++ = (((ap->name[i]) & 0x3F) | ((byte) 0x80));
+		}
+	    }
+	    break;
+	case ERL_FILENAME_WIN_WCHAR:
+	    for (i = 0; i < ap->len; i++) {
+		/* Little endian */
+		*p++ = ap->name[i];
+		*p++ = 0;
+	    }
+	    break;
+	default:
+	    ASSERT(0);
+	}
+	DESTROY_ESTACK(stack);
+	return;
+    }
+
+    if (is_nil(ioterm)) {
+	DESTROY_ESTACK(stack);
+	return;
+    }
+    ASSERT(is_list(ioterm));
+    /* OK a list, needs to be processed in order, handling each flat list-level
+       as they occur, just like io_list_to_binary would */
+    ESTACK_PUSH(stack,ioterm);
+    while (!ESTACK_ISEMPTY(stack)) {
+	ioterm = ESTACK_POP(stack);	
+	if (is_nil(ioterm)) {
+	    /* ignore empty lists */
+	    continue;
+	}
+	if(is_list(ioterm)) {
+L_Again:   /* Restart with sublist, old listend was pushed on stack */
+	    objp = list_val(ioterm);
+	    obj = CAR(objp);
+	    for(;;) { /* loop over one flat list of bytes and binaries
+		         until sublist or list end is encountered */
+		if (is_small(obj)) { /* Always small */
+		    for(;;) {
+			Uint x = unsigned_val(obj);
+			switch (encoding) {
+			case ERL_FILENAME_LATIN1:
+			    ASSERT( x < 256);
+			    *p++ = (byte) x;
+			    break;
+			case ERL_FILENAME_UTF8_MAC:
+			case ERL_FILENAME_UTF8:
+			    if (x < 0x80) {
+				*p++ = (byte) x;
+			    }
+			    else if (x < 0x800) {
+				*p++ = (((byte) (x >> 6)) | 
+					((byte) 0xC0));
+				*p++ = (((byte) (x & 0x3F)) | 
+					((byte) 0x80));
+			    } else if (x < 0x10000) {
+				ASSERT(!((x >= 0xD800 && x <= 0xDFFF) ||
+					 (x == 0xFFFE) ||
+					 (x == 0xFFFF)));
+				*p++ = (((byte) (x >> 12)) | 
+					((byte) 0xE0));
+				*p++ = ((((byte) (x >> 6)) & 0x3F)  | 
+					((byte) 0x80));
+				*p++ = (((byte) (x & 0x3F)) | 
+					((byte) 0x80));
+			    } else {
+				ASSERT(x < 0x110000);
+				*p++ = (((byte) (x >> 18)) | 
+					((byte) 0xF0));
+				*p++ = ((((byte) (x >> 12)) & 0x3F)  | 
+					((byte) 0x80));
+				*p++ = ((((byte) (x >> 6)) & 0x3F)  | 
+					((byte) 0x80));
+				*p++ = (((byte) (x & 0x3F)) | 
+					((byte) 0x80));
+			    }
+			    break;
+			case ERL_FILENAME_WIN_WCHAR:
+			    ASSERT(x <= 0xFFFF); 
+			    *p++ = (byte) (x & 0xFFU);
+			    *p++ = (byte) ((x >> 8) & 0xFFU);
+			    break;
+			default:
+			    ASSERT(0);
+			}
+			    
+			/* everything else will give badarg later 
+			   in the process, so we dont check */
+			ioterm = CDR(objp);
+			if (!is_list(ioterm)) {
+			    break;
+			}
+			objp = list_val(ioterm);
+			obj = CAR(objp);
+			if (!is_small(obj))
+			    break;
+		    }
+		} else if (is_nil(obj)) {
+		    ioterm = CDR(objp);
+		    if (!is_list(ioterm)) {
+			break;
+		    }
+		    objp = list_val(ioterm);
+		    obj = CAR(objp);
+		} else if (is_list(obj)) {
+		    /* push rest of list for later processing, start 
+		       again with sublist */
+		    ESTACK_PUSH(stack,CDR(objp));
+		    ioterm = obj;
+		    goto L_Again;
+		} else {
+		    ASSERT(0);
+		} 
+		if (is_nil(ioterm) || !is_list(ioterm)) {
+		    break;
+		}
+	    } /* for(;;) */
+	} /* is_list(ioterm) */
+	
+	ASSERT(is_list(ioterm) || is_nil(ioterm));
+    } /* while  not estack empty */
+    DESTROY_ESTACK(stack);
+    return;
+}
+void erts_copy_utf8_to_utf16_little(byte *target, byte *bytes, int num_chars)
+{
+    Uint unipoint;
+    
+    while (num_chars--) {
+	if (((*bytes) & ((byte) 0x80)) == 0) {
+	    unipoint = (Uint) *bytes;
+	    ++bytes;
+	} else if (((*bytes) & ((byte) 0xE0)) == 0xC0) {
+	    unipoint = 
+		(((Uint) ((*bytes) & ((byte) 0x1F))) << 6) |
+		((Uint) (bytes[1] & ((byte) 0x3F))); 	
+	    bytes += 2;
+	} else if (((*bytes) & ((byte) 0xF0)) == 0xE0) {
+	    unipoint = 
+		(((Uint) ((*bytes) & ((byte) 0xF))) << 12) |
+		(((Uint) (bytes[1] & ((byte) 0x3F))) << 6) |
+		((Uint) (bytes[2] & ((byte) 0x3F)));
+	    bytes +=3;
+	} else if (((*bytes) & ((byte) 0xF8)) == 0xF0) {
+	    unipoint = 
+		(((Uint) ((*bytes) & ((byte) 0x7))) << 18) |
+		(((Uint) (bytes[1] & ((byte) 0x3F))) << 12) |
+		(((Uint) (bytes[2] & ((byte) 0x3F))) << 6) |
+		((Uint) (bytes[3] & ((byte) 0x3F)));
+	    bytes += 4;
+	} else {
+	    erl_exit(1,"Internal unicode error in prim_file:internal_name2native/1");
+	}
+	*target++ = (byte) (unipoint & 0xFF);
+	*target++ = (byte) ((unipoint >> 8) & 0xFF);
+    }
+}
+
+/*
+ * This internal bif converts a filename to whatever format is suitable for the file driver
+ * It also adds zero termination so that prim_file needn't bother with the character encoding
+ * of the file driver 
+ */
+BIF_RETTYPE prim_file_internal_name2native_1(BIF_ALIST_1)
+{
+    int encoding = erts_get_native_filename_encoding();
+    Sint need;
+    Eterm bin_term;
+    byte* bin_p;
+    /* Prim file explicitly does not allow atoms, although we could 
+       very well cope with it. Instead of letting 'file' handle them,
+       it would probably be more efficient to handle them here. Subject to 
+       change in R15. */ 
+    if (is_atom(BIF_ARG_1)) {
+	BIF_ERROR(BIF_P,BADARG);
+    }
+    if (is_binary(BIF_ARG_1)) {
+	byte *temp_alloc = NULL;
+	byte *bytes;
+	byte *err_pos;
+	Uint size,num_chars;
+	/* Uninterpreted encoding except if windows widechar, in case we convert from 
+	   utf8 to win_wchar */
+	size = binary_size(BIF_ARG_1);
+	bytes = erts_get_aligned_binary_bytes(BIF_ARG_1, &temp_alloc);
+	if (encoding != ERL_FILENAME_WIN_WCHAR) {
+	    /*Add 0 termination only*/
+	    bin_term = new_binary(BIF_P, NULL, size+1);
+	    bin_p = binary_bytes(bin_term);
+	    memcpy(bin_p,bytes,size);
+	    bin_p[size]=0;
+	    erts_free_aligned_binary_bytes(temp_alloc);
+	    BIF_RET(bin_term);
+	} 
+	/* In a wchar world, the emulator flags only affect how
+	   binaries are interpreted when sent from the user. */
+	/* Determine real length and create a new binary */
+	if (erts_analyze_utf8(bytes,size,&err_pos,&num_chars,NULL) != ERTS_UTF8_OK || 
+	    erts_get_user_requested_filename_encoding() ==  ERL_FILENAME_LATIN1) {
+	    /* What to do now? Maybe latin1, so just take byte for byte instead */
+	    bin_term = new_binary(BIF_P, 0, (size+1)*2);
+	    bin_p = binary_bytes(bin_term);
+	    while (size--) {
+		*bin_p++ = *bytes++;
+		*bin_p++ = 0;
+	    }
+	    *bin_p++ = 0;
+	    *bin_p++ = 0;
+	    erts_free_aligned_binary_bytes(temp_alloc);
+	    BIF_RET(bin_term);
+	}
+	/* OK, UTF8 ok, number of characters is in num_chars */
+	bin_term = new_binary(BIF_P, 0, (num_chars+1)*2);
+	bin_p = binary_bytes(bin_term);
+	erts_copy_utf8_to_utf16_little(bin_p, bytes, num_chars);
+	/* zero termination */
+	bin_p[num_chars*2] = 0;
+	bin_p[num_chars*2+1] = 0;
+	erts_free_aligned_binary_bytes(temp_alloc);
+	BIF_RET(bin_term);
+    } /* binary */   
+	    
+
+    if ((need = erts_native_filename_need(BIF_ARG_1,encoding)) < 0) {
+	BIF_ERROR(BIF_P,BADARG);
+    }
+    if (encoding == ERL_FILENAME_WIN_WCHAR) {
+	need += 2;
+    } else {
+	++need;
+    }
+    
+    bin_term = new_binary(BIF_P, 0, need);
+    bin_p = binary_bytes(bin_term);
+    erts_native_filename_put(BIF_ARG_1,encoding,bin_p); 
+    bin_p[need-1] = 0;
+    if (encoding == ERL_FILENAME_WIN_WCHAR) {
+	bin_p[need-2] = 0;
+    }
+    BIF_RET(bin_term);
+}
+
+BIF_RETTYPE prim_file_internal_native2name_1(BIF_ALIST_1)
+{
+    Eterm real_bin;
+    Uint offset;
+    Uint size,num_chars;
+    Uint bitsize;
+    Uint bitoffs;
+    Eterm *hp;
+    byte *temp_alloc = NULL;
+    byte *bytes;
+    byte *err_pos;
+    Uint num_built; /* characters */
+    Uint num_eaten; /* bytes */
+    Eterm ret;
+    int mac = 0;
+
+    if (is_not_binary(BIF_ARG_1)) {
+	BIF_ERROR(BIF_P,BADARG);
+    }
+    size = binary_size(BIF_ARG_1);
+    ERTS_GET_REAL_BIN(BIF_ARG_1, real_bin, offset, bitoffs, bitsize);
+    if (bitsize != 0) {
+	BIF_ERROR(BIF_P,BADARG);
+    }
+    if (size == 0) {
+	BIF_RET(NIL);
+    }
+    switch (erts_get_native_filename_encoding()) {
+    case ERL_FILENAME_LATIN1:
+	hp = HAlloc(BIF_P, 2 * size);
+	bytes = binary_bytes(real_bin)+offset;
+    
+	BIF_RET(erts_bin_bytes_to_list(NIL, hp, bytes, size, bitoffs));
+    case ERL_FILENAME_UTF8_MAC:
+	mac = 1;
+    case ERL_FILENAME_UTF8:
+	bytes = erts_get_aligned_binary_bytes(BIF_ARG_1, &temp_alloc);
+	if (erts_analyze_utf8(bytes,size,&err_pos,&num_chars,NULL) != ERTS_UTF8_OK) {
+	    erts_free_aligned_binary_bytes(temp_alloc);
+	    goto noconvert;
+	}
+	num_built = 0;
+	num_eaten = 0;
+	if (mac) {
+	    ret = do_utf8_to_list_normalize(BIF_P, num_chars, bytes, size);
+	} else {
+	    ret = do_utf8_to_list(BIF_P, num_chars, bytes, size, num_chars, &num_built, &num_eaten, NIL);
+	} 
+	erts_free_aligned_binary_bytes(temp_alloc);
+	BIF_RET(ret);
+    case ERL_FILENAME_WIN_WCHAR:
+	bytes = erts_get_aligned_binary_bytes(BIF_ARG_1, &temp_alloc);
+	if ((size % 2) != 0) { /* Panic fixup to avoid crashing the emulator */
+	    size--;
+	    hp = HAlloc(BIF_P, size+2);
+	    ret = CONS(hp,make_small((Uint) bytes[size]),NIL);
+	    hp += 2;
+	} else {
+	    hp = HAlloc(BIF_P, size);
+	    ret = NIL;
+	}
+	bytes += size-1;
+	while (size > 0) {
+	    Uint x = ((Uint) *bytes--) << 8;
+	    x |= ((Uint) *bytes--);
+	    size -= 2;
+	    ret = CONS(hp,make_small(x),ret);
+	    hp += 2;
+	}	    
+	erts_free_aligned_binary_bytes(temp_alloc);
+	BIF_RET(ret);
+    default:
+	goto noconvert;
+    }
+ noconvert:
+    BIF_RET(BIF_ARG_1);
+}
+
+BIF_RETTYPE prim_file_internal_normalize_utf8_1(BIF_ALIST_1)
+{
+    Eterm real_bin;
+    Uint offset;
+    Uint size,num_chars;
+    Uint bitsize;
+    Uint bitoffs;
+    Eterm ret;
+    byte *temp_alloc = NULL;
+    byte *bytes;
+    byte *err_pos;
+
+    if (is_not_binary(BIF_ARG_1)) {
+	BIF_ERROR(BIF_P,BADARG);
+    }
+    size = binary_size(BIF_ARG_1);
+    ERTS_GET_REAL_BIN(BIF_ARG_1, real_bin, offset, bitoffs, bitsize);
+    if (bitsize != 0) {
+	BIF_ERROR(BIF_P,BADARG);
+    }
+    if (size == 0) {
+	BIF_RET(NIL);
+    }
+    bytes = erts_get_aligned_binary_bytes(BIF_ARG_1, &temp_alloc);
+    if (erts_analyze_utf8(bytes,size,&err_pos,&num_chars,NULL) != ERTS_UTF8_OK) {
+	erts_free_aligned_binary_bytes(temp_alloc);
+	BIF_ERROR(BIF_P,BADARG);
+    }
+    ret = do_utf8_to_list_normalize(BIF_P, num_chars, bytes, size);
+    erts_free_aligned_binary_bytes(temp_alloc);
+    BIF_RET(ret);
+}  
+
+BIF_RETTYPE file_native_name_encoding_0(BIF_ALIST_0)
+{
+    switch (erts_get_native_filename_encoding()) {
+    case ERL_FILENAME_LATIN1:
+	BIF_RET(am_latin1);
+    case ERL_FILENAME_UTF8_MAC:
+    case ERL_FILENAME_UTF8:
+	BIF_RET(am_utf8);
+    case ERL_FILENAME_WIN_WCHAR:
+	if (erts_get_user_requested_filename_encoding() ==  ERL_FILENAME_LATIN1) {
+	    BIF_RET(am_latin1);
+	} else {
+	    BIF_RET(am_utf8);
+	}
+    default:
+	BIF_RET(am_undefined);
+    }
+}
diff --git a/erts/emulator/beam/erl_unicode_normalize.h b/erts/emulator/beam/erl_unicode_normalize.h
new file mode 100644
index 0000000000..fb0a111ca2
--- /dev/null
+++ b/erts/emulator/beam/erl_unicode_normalize.h
@@ -0,0 +1,1687 @@
+/*
+* %CopyrightBegin%
+*
+* Copyright Ericsson AB 1999-2010. 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%
+*/
+/*
+* This file is automatically generated by dec.erl, do not edit manually
+*/
+#define HASH_SIZE_FACTOR 2
+typedef struct _compose_entry {
+    Uint16 c;
+    Uint16 res;
+    Uint16 num_subs;
+    struct _compose_entry *subs;
+    int *hash;
+} CompEntry;
+
+static int compose_tab_size = 61;
+static int hash_compose_tab_0_15[12] = 
+{-1,3,-1,5,-1,0,4,2,-1,1,-1,-1}; /* hash_compose_tab_0_15 */ 
+static CompEntry compose_tab_0_15[] = {
+{65, 7846, 0, NULL, NULL},
+{69, 7872, 0, NULL, NULL},
+{79, 7890, 0, NULL, NULL},
+{97, 7847, 0, NULL, NULL},
+{101, 7873, 0, NULL, NULL},
+{111, 7891, 0, NULL, NULL}
+}; /* compose_tab_0_15 */ 
+static int hash_compose_tab_0_16[8] = 
+{3,-1,-1,-1,-1,0,2,1}; /* hash_compose_tab_0_16 */ 
+static CompEntry compose_tab_0_16[] = {
+{69, 7700, 0, NULL, NULL},
+{79, 7760, 0, NULL, NULL},
+{101, 7701, 0, NULL, NULL},
+{111, 7761, 0, NULL, NULL}
+}; /* compose_tab_0_16 */ 
+static int hash_compose_tab_0_17[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_0_17 */ 
+static CompEntry compose_tab_0_17[] = {
+{65, 7856, 0, NULL, NULL},
+{97, 7857, 0, NULL, NULL}
+}; /* compose_tab_0_17 */ 
+static int hash_compose_tab_0_18[8] = 
+{-1,2,-1,-1,-1,0,1,3}; /* hash_compose_tab_0_18 */ 
+static CompEntry compose_tab_0_18[] = {
+{85, 475, 0, NULL, NULL},
+{117, 476, 0, NULL, NULL},
+{953, 8146, 0, NULL, NULL},
+{965, 8162, 0, NULL, NULL}
+}; /* compose_tab_0_18 */ 
+static int hash_compose_tab_0_19_0[12] = 
+{-1,0,2,4,-1,-1,-1,1,-1,3,5,-1}; /* hash_compose_tab_0_19_0 */ 
+static CompEntry compose_tab_0_19_0[] = {
+{913, 8074, 0, NULL, NULL},
+{919, 8090, 0, NULL, NULL},
+{937, 8106, 0, NULL, NULL},
+{945, 8066, 0, NULL, NULL},
+{951, 8082, 0, NULL, NULL},
+{969, 8098, 0, NULL, NULL}
+}; /* compose_tab_0_19_0 */ 
+static int hash_compose_tab_0_19[28] = 
+{9,10,-1,5,-1,-1,-1,11,-1,-1,-1,-1,-1,6,12,-1,-1,1,13,-1,-1,2,7,3,-1,0,4,8}; /* hash_compose_tab_0_19 */ 
+static CompEntry compose_tab_0_19[] = {
+{837, 0, 6, compose_tab_0_19_0, hash_compose_tab_0_19_0},
+{913, 7946, 0, NULL, NULL},
+{917, 7962, 0, NULL, NULL},
+{919, 7978, 0, NULL, NULL},
+{921, 7994, 0, NULL, NULL},
+{927, 8010, 0, NULL, NULL},
+{937, 8042, 0, NULL, NULL},
+{945, 7938, 0, NULL, NULL},
+{949, 7954, 0, NULL, NULL},
+{951, 7970, 0, NULL, NULL},
+{953, 7986, 0, NULL, NULL},
+{959, 8002, 0, NULL, NULL},
+{965, 8018, 0, NULL, NULL},
+{969, 8034, 0, NULL, NULL}
+}; /* compose_tab_0_19 */ 
+static int hash_compose_tab_0_20_0[12] = 
+{-1,0,2,4,-1,-1,-1,1,-1,3,5,-1}; /* hash_compose_tab_0_20_0 */ 
+static CompEntry compose_tab_0_20_0[] = {
+{913, 8075, 0, NULL, NULL},
+{919, 8091, 0, NULL, NULL},
+{937, 8107, 0, NULL, NULL},
+{945, 8067, 0, NULL, NULL},
+{951, 8083, 0, NULL, NULL},
+{969, 8099, 0, NULL, NULL}
+}; /* compose_tab_0_20_0 */ 
+static int hash_compose_tab_0_20[30] = 
+{-1,-1,-1,6,-1,13,-1,7,-1,14,-1,-1,-1,1,-1,8,-1,2,-1,3,9,4,10,11,-1,-1,-1,0,5,
+ 12}; /* hash_compose_tab_0_20 */ 
+static CompEntry compose_tab_0_20[] = {
+{837, 0, 6, compose_tab_0_20_0, hash_compose_tab_0_20_0},
+{913, 7947, 0, NULL, NULL},
+{917, 7963, 0, NULL, NULL},
+{919, 7979, 0, NULL, NULL},
+{921, 7995, 0, NULL, NULL},
+{927, 8011, 0, NULL, NULL},
+{933, 8027, 0, NULL, NULL},
+{937, 8043, 0, NULL, NULL},
+{945, 7939, 0, NULL, NULL},
+{949, 7955, 0, NULL, NULL},
+{951, 7971, 0, NULL, NULL},
+{953, 7987, 0, NULL, NULL},
+{959, 8003, 0, NULL, NULL},
+{965, 8019, 0, NULL, NULL},
+{969, 8035, 0, NULL, NULL}
+}; /* compose_tab_0_20 */ 
+static int hash_compose_tab_0_21[8] = 
+{2,-1,-1,-1,-1,1,3,0}; /* hash_compose_tab_0_21 */ 
+static CompEntry compose_tab_0_21[] = {
+{79, 7900, 0, NULL, NULL},
+{85, 7914, 0, NULL, NULL},
+{111, 7901, 0, NULL, NULL},
+{117, 7915, 0, NULL, NULL}
+}; /* compose_tab_0_21 */ 
+static int hash_compose_tab_0_22[6] = 
+{-1,-1,-1,0,1,2}; /* hash_compose_tab_0_22 */ 
+static CompEntry compose_tab_0_22[] = {
+{945, 8114, 0, NULL, NULL},
+{951, 8130, 0, NULL, NULL},
+{969, 8178, 0, NULL, NULL}
+}; /* compose_tab_0_22 */ 
+static int hash_compose_tab_0[78] = 
+{38,3,29,-1,-1,-1,-1,4,19,5,20,6,14,30,31,21,32,33,37,7,-1,-1,-1,8,34,-1,-1,9,
+ -1,35,-1,-1,-1,10,36,-1,-1,-1,-1,11,-1,12,-1,13,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ -1,-1,23,-1,22,-1,24,-1,25,-1,26,-1,0,-1,-1,15,1,16,27,17,2,18,28,-1,-1}; /* hash_compose_tab_0 */ 
+static CompEntry compose_tab_0[] = {
+{65, 192, 0, NULL, NULL},
+{69, 200, 0, NULL, NULL},
+{73, 204, 0, NULL, NULL},
+{79, 210, 0, NULL, NULL},
+{85, 217, 0, NULL, NULL},
+{87, 7808, 0, NULL, NULL},
+{89, 7922, 0, NULL, NULL},
+{97, 224, 0, NULL, NULL},
+{101, 232, 0, NULL, NULL},
+{105, 236, 0, NULL, NULL},
+{111, 242, 0, NULL, NULL},
+{117, 249, 0, NULL, NULL},
+{119, 7809, 0, NULL, NULL},
+{121, 7923, 0, NULL, NULL},
+{168, 8173, 0, NULL, NULL},
+{770, 0, 6, compose_tab_0_15, hash_compose_tab_0_15},
+{772, 0, 4, compose_tab_0_16, hash_compose_tab_0_16},
+{774, 0, 2, compose_tab_0_17, hash_compose_tab_0_17},
+{776, 0, 4, compose_tab_0_18, hash_compose_tab_0_18},
+{787, 0, 14, compose_tab_0_19, hash_compose_tab_0_19},
+{788, 0, 15, compose_tab_0_20, hash_compose_tab_0_20},
+{795, 0, 4, compose_tab_0_21, hash_compose_tab_0_21},
+{837, 0, 3, compose_tab_0_22, hash_compose_tab_0_22},
+{913, 8122, 0, NULL, NULL},
+{917, 8136, 0, NULL, NULL},
+{919, 8138, 0, NULL, NULL},
+{921, 8154, 0, NULL, NULL},
+{927, 8184, 0, NULL, NULL},
+{933, 8170, 0, NULL, NULL},
+{937, 8186, 0, NULL, NULL},
+{945, 8048, 0, NULL, NULL},
+{949, 8050, 0, NULL, NULL},
+{951, 8052, 0, NULL, NULL},
+{953, 8054, 0, NULL, NULL},
+{959, 8056, 0, NULL, NULL},
+{965, 8058, 0, NULL, NULL},
+{969, 8060, 0, NULL, NULL},
+{8127, 8141, 0, NULL, NULL},
+{8190, 8157, 0, NULL, NULL}
+}; /* compose_tab_0 */ 
+static int hash_compose_tab_1_39[12] = 
+{-1,3,-1,5,-1,0,4,2,-1,1,-1,-1}; /* hash_compose_tab_1_39 */ 
+static CompEntry compose_tab_1_39[] = {
+{65, 7844, 0, NULL, NULL},
+{69, 7870, 0, NULL, NULL},
+{79, 7888, 0, NULL, NULL},
+{97, 7845, 0, NULL, NULL},
+{101, 7871, 0, NULL, NULL},
+{111, 7889, 0, NULL, NULL}
+}; /* compose_tab_1_39 */ 
+static int hash_compose_tab_1_40[8] = 
+{2,-1,-1,-1,-1,1,3,0}; /* hash_compose_tab_1_40 */ 
+static CompEntry compose_tab_1_40[] = {
+{79, 7756, 0, NULL, NULL},
+{85, 7800, 0, NULL, NULL},
+{111, 7757, 0, NULL, NULL},
+{117, 7801, 0, NULL, NULL}
+}; /* compose_tab_1_40 */ 
+static int hash_compose_tab_1_41[8] = 
+{3,-1,-1,-1,-1,0,2,1}; /* hash_compose_tab_1_41 */ 
+static CompEntry compose_tab_1_41[] = {
+{69, 7702, 0, NULL, NULL},
+{79, 7762, 0, NULL, NULL},
+{101, 7703, 0, NULL, NULL},
+{111, 7763, 0, NULL, NULL}
+}; /* compose_tab_1_41 */ 
+static int hash_compose_tab_1_42[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_1_42 */ 
+static CompEntry compose_tab_1_42[] = {
+{65, 7854, 0, NULL, NULL},
+{97, 7855, 0, NULL, NULL}
+}; /* compose_tab_1_42 */ 
+static int hash_compose_tab_1_43[12] = 
+{-1,0,1,-1,-1,4,5,-1,-1,2,3,-1}; /* hash_compose_tab_1_43 */ 
+static CompEntry compose_tab_1_43[] = {
+{73, 7726, 0, NULL, NULL},
+{85, 471, 0, NULL, NULL},
+{105, 7727, 0, NULL, NULL},
+{117, 472, 0, NULL, NULL},
+{953, 8147, 0, NULL, NULL},
+{965, 8163, 0, NULL, NULL}
+}; /* compose_tab_1_43 */ 
+static int hash_compose_tab_1_44[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_1_44 */ 
+static CompEntry compose_tab_1_44[] = {
+{65, 506, 0, NULL, NULL},
+{97, 507, 0, NULL, NULL}
+}; /* compose_tab_1_44 */ 
+static int hash_compose_tab_1_45_0[12] = 
+{-1,0,2,4,-1,-1,-1,1,-1,3,5,-1}; /* hash_compose_tab_1_45_0 */ 
+static CompEntry compose_tab_1_45_0[] = {
+{913, 8076, 0, NULL, NULL},
+{919, 8092, 0, NULL, NULL},
+{937, 8108, 0, NULL, NULL},
+{945, 8068, 0, NULL, NULL},
+{951, 8084, 0, NULL, NULL},
+{969, 8100, 0, NULL, NULL}
+}; /* compose_tab_1_45_0 */ 
+static int hash_compose_tab_1_45[28] = 
+{9,10,-1,5,-1,-1,-1,11,-1,-1,-1,-1,-1,6,12,-1,-1,1,13,-1,-1,2,7,3,-1,0,4,8}; /* hash_compose_tab_1_45 */ 
+static CompEntry compose_tab_1_45[] = {
+{837, 0, 6, compose_tab_1_45_0, hash_compose_tab_1_45_0},
+{913, 7948, 0, NULL, NULL},
+{917, 7964, 0, NULL, NULL},
+{919, 7980, 0, NULL, NULL},
+{921, 7996, 0, NULL, NULL},
+{927, 8012, 0, NULL, NULL},
+{937, 8044, 0, NULL, NULL},
+{945, 7940, 0, NULL, NULL},
+{949, 7956, 0, NULL, NULL},
+{951, 7972, 0, NULL, NULL},
+{953, 7988, 0, NULL, NULL},
+{959, 8004, 0, NULL, NULL},
+{965, 8020, 0, NULL, NULL},
+{969, 8036, 0, NULL, NULL}
+}; /* compose_tab_1_45 */ 
+static int hash_compose_tab_1_46_0[12] = 
+{-1,0,2,4,-1,-1,-1,1,-1,3,5,-1}; /* hash_compose_tab_1_46_0 */ 
+static CompEntry compose_tab_1_46_0[] = {
+{913, 8077, 0, NULL, NULL},
+{919, 8093, 0, NULL, NULL},
+{937, 8109, 0, NULL, NULL},
+{945, 8069, 0, NULL, NULL},
+{951, 8085, 0, NULL, NULL},
+{969, 8101, 0, NULL, NULL}
+}; /* compose_tab_1_46_0 */ 
+static int hash_compose_tab_1_46[30] = 
+{-1,-1,-1,6,-1,13,-1,7,-1,14,-1,-1,-1,1,-1,8,-1,2,-1,3,9,4,10,11,-1,-1,-1,0,5,
+ 12}; /* hash_compose_tab_1_46 */ 
+static CompEntry compose_tab_1_46[] = {
+{837, 0, 6, compose_tab_1_46_0, hash_compose_tab_1_46_0},
+{913, 7949, 0, NULL, NULL},
+{917, 7965, 0, NULL, NULL},
+{919, 7981, 0, NULL, NULL},
+{921, 7997, 0, NULL, NULL},
+{927, 8013, 0, NULL, NULL},
+{933, 8029, 0, NULL, NULL},
+{937, 8045, 0, NULL, NULL},
+{945, 7941, 0, NULL, NULL},
+{949, 7957, 0, NULL, NULL},
+{951, 7973, 0, NULL, NULL},
+{953, 7989, 0, NULL, NULL},
+{959, 8005, 0, NULL, NULL},
+{965, 8021, 0, NULL, NULL},
+{969, 8037, 0, NULL, NULL}
+}; /* compose_tab_1_46 */ 
+static int hash_compose_tab_1_47[8] = 
+{2,-1,-1,-1,-1,1,3,0}; /* hash_compose_tab_1_47 */ 
+static CompEntry compose_tab_1_47[] = {
+{79, 7898, 0, NULL, NULL},
+{85, 7912, 0, NULL, NULL},
+{111, 7899, 0, NULL, NULL},
+{117, 7913, 0, NULL, NULL}
+}; /* compose_tab_1_47 */ 
+static int hash_compose_tab_1_48[4] = 
+{1,-1,-1,0}; /* hash_compose_tab_1_48 */ 
+static CompEntry compose_tab_1_48[] = {
+{67, 7688, 0, NULL, NULL},
+{99, 7689, 0, NULL, NULL}
+}; /* compose_tab_1_48 */ 
+static int hash_compose_tab_1_49[6] = 
+{-1,-1,-1,0,1,2}; /* hash_compose_tab_1_49 */ 
+static CompEntry compose_tab_1_49[] = {
+{945, 8116, 0, NULL, NULL},
+{951, 8132, 0, NULL, NULL},
+{959, 8180, 0, NULL, NULL}
+}; /* compose_tab_1_49 */ 
+static int hash_compose_tab_1[140] = 
+{-1,-1,-1,-1,-1,-1,-1,68,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ -1,-1,-1,34,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ -1,-1,-1,-1,-1,-1,-1,-1,35,-1,-1,-1,-1,64,-1,0,-1,1,-1,2,39,3,40,4,41,5,6,7,
+ 8,9,10,36,11,12,42,13,43,14,44,15,16,37,45,46,50,47,51,17,52,18,53,19,54,20,
+ 55,21,56,22,23,24,25,26,27,38,28,29,48,30,57,31,58,32,33,59,60,61,62,65,66,
+ 63,67,69,-1,-1,-1,-1,-1,49,-1,-1}; /* hash_compose_tab_1 */ 
+static CompEntry compose_tab_1[] = {
+{65, 193, 0, NULL, NULL},
+{67, 262, 0, NULL, NULL},
+{69, 201, 0, NULL, NULL},
+{71, 500, 0, NULL, NULL},
+{73, 205, 0, NULL, NULL},
+{75, 7728, 0, NULL, NULL},
+{76, 313, 0, NULL, NULL},
+{77, 7742, 0, NULL, NULL},
+{78, 323, 0, NULL, NULL},
+{79, 211, 0, NULL, NULL},
+{80, 7764, 0, NULL, NULL},
+{82, 340, 0, NULL, NULL},
+{83, 346, 0, NULL, NULL},
+{85, 218, 0, NULL, NULL},
+{87, 7810, 0, NULL, NULL},
+{89, 221, 0, NULL, NULL},
+{90, 377, 0, NULL, NULL},
+{97, 225, 0, NULL, NULL},
+{99, 263, 0, NULL, NULL},
+{101, 233, 0, NULL, NULL},
+{103, 501, 0, NULL, NULL},
+{105, 237, 0, NULL, NULL},
+{107, 7729, 0, NULL, NULL},
+{108, 314, 0, NULL, NULL},
+{109, 7743, 0, NULL, NULL},
+{110, 324, 0, NULL, NULL},
+{111, 243, 0, NULL, NULL},
+{112, 7765, 0, NULL, NULL},
+{114, 341, 0, NULL, NULL},
+{115, 347, 0, NULL, NULL},
+{117, 250, 0, NULL, NULL},
+{119, 7811, 0, NULL, NULL},
+{121, 253, 0, NULL, NULL},
+{122, 378, 0, NULL, NULL},
+{168, 8174, 0, NULL, NULL},
+{198, 508, 0, NULL, NULL},
+{216, 510, 0, NULL, NULL},
+{230, 509, 0, NULL, NULL},
+{248, 511, 0, NULL, NULL},
+{770, 0, 6, compose_tab_1_39, hash_compose_tab_1_39},
+{771, 0, 4, compose_tab_1_40, hash_compose_tab_1_40},
+{772, 0, 4, compose_tab_1_41, hash_compose_tab_1_41},
+{774, 0, 2, compose_tab_1_42, hash_compose_tab_1_42},
+{776, 0, 6, compose_tab_1_43, hash_compose_tab_1_43},
+{778, 0, 2, compose_tab_1_44, hash_compose_tab_1_44},
+{787, 0, 14, compose_tab_1_45, hash_compose_tab_1_45},
+{788, 0, 15, compose_tab_1_46, hash_compose_tab_1_46},
+{795, 0, 4, compose_tab_1_47, hash_compose_tab_1_47},
+{807, 0, 2, compose_tab_1_48, hash_compose_tab_1_48},
+{837, 0, 3, compose_tab_1_49, hash_compose_tab_1_49},
+{913, 8123, 0, NULL, NULL},
+{917, 8137, 0, NULL, NULL},
+{919, 8139, 0, NULL, NULL},
+{921, 8155, 0, NULL, NULL},
+{927, 8185, 0, NULL, NULL},
+{933, 8171, 0, NULL, NULL},
+{937, 8187, 0, NULL, NULL},
+{945, 8049, 0, NULL, NULL},
+{949, 8051, 0, NULL, NULL},
+{951, 8053, 0, NULL, NULL},
+{953, 8055, 0, NULL, NULL},
+{959, 8057, 0, NULL, NULL},
+{965, 8059, 0, NULL, NULL},
+{969, 8061, 0, NULL, NULL},
+{1043, 1027, 0, NULL, NULL},
+{1050, 1036, 0, NULL, NULL},
+{1075, 1107, 0, NULL, NULL},
+{1082, 1116, 0, NULL, NULL},
+{8127, 8142, 0, NULL, NULL},
+{8190, 8158, 0, NULL, NULL}
+}; /* compose_tab_1 */ 
+static int hash_compose_tab_2_26[12] = 
+{-1,3,-1,5,-1,0,4,2,-1,1,-1,-1}; /* hash_compose_tab_2_26 */ 
+static CompEntry compose_tab_2_26[] = {
+{65, 7852, 0, NULL, NULL},
+{69, 7878, 0, NULL, NULL},
+{79, 7896, 0, NULL, NULL},
+{97, 7853, 0, NULL, NULL},
+{101, 7879, 0, NULL, NULL},
+{111, 7897, 0, NULL, NULL}
+}; /* compose_tab_2_26 */ 
+static int hash_compose_tab_2[54] = 
+{-1,-1,-1,20,-1,-1,-1,21,-1,22,-1,0,23,1,24,2,25,3,4,5,6,-1,-1,-1,-1,7,-1,-1,
+ -1,8,-1,9,-1,10,-1,11,12,-1,-1,-1,-1,-1,-1,13,-1,14,-1,15,26,16,17,18,19,-1}; /* hash_compose_tab_2 */ 
+static CompEntry compose_tab_2[] = {
+{65, 194, 0, NULL, NULL},
+{67, 264, 0, NULL, NULL},
+{69, 202, 0, NULL, NULL},
+{71, 284, 0, NULL, NULL},
+{72, 292, 0, NULL, NULL},
+{73, 206, 0, NULL, NULL},
+{74, 308, 0, NULL, NULL},
+{79, 212, 0, NULL, NULL},
+{83, 348, 0, NULL, NULL},
+{85, 219, 0, NULL, NULL},
+{87, 372, 0, NULL, NULL},
+{89, 374, 0, NULL, NULL},
+{90, 7824, 0, NULL, NULL},
+{97, 226, 0, NULL, NULL},
+{99, 265, 0, NULL, NULL},
+{101, 234, 0, NULL, NULL},
+{103, 285, 0, NULL, NULL},
+{104, 293, 0, NULL, NULL},
+{105, 238, 0, NULL, NULL},
+{106, 309, 0, NULL, NULL},
+{111, 244, 0, NULL, NULL},
+{115, 349, 0, NULL, NULL},
+{117, 251, 0, NULL, NULL},
+{119, 373, 0, NULL, NULL},
+{121, 375, 0, NULL, NULL},
+{122, 7825, 0, NULL, NULL},
+{803, 0, 6, compose_tab_2_26, hash_compose_tab_2_26}
+}; /* compose_tab_2 */ 
+static int hash_compose_tab_3_16[12] = 
+{-1,3,-1,5,-1,0,4,2,-1,1,-1,-1}; /* hash_compose_tab_3_16 */ 
+static CompEntry compose_tab_3_16[] = {
+{65, 7850, 0, NULL, NULL},
+{69, 7876, 0, NULL, NULL},
+{79, 7894, 0, NULL, NULL},
+{97, 7851, 0, NULL, NULL},
+{101, 7877, 0, NULL, NULL},
+{111, 7895, 0, NULL, NULL}
+}; /* compose_tab_3_16 */ 
+static int hash_compose_tab_3_17[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_3_17 */ 
+static CompEntry compose_tab_3_17[] = {
+{65, 7860, 0, NULL, NULL},
+{97, 7861, 0, NULL, NULL}
+}; /* compose_tab_3_17 */ 
+static int hash_compose_tab_3_18[8] = 
+{2,-1,-1,-1,-1,1,3,0}; /* hash_compose_tab_3_18 */ 
+static CompEntry compose_tab_3_18[] = {
+{79, 7904, 0, NULL, NULL},
+{85, 7918, 0, NULL, NULL},
+{111, 7905, 0, NULL, NULL},
+{117, 7919, 0, NULL, NULL}
+}; /* compose_tab_3_18 */ 
+static int hash_compose_tab_3[38] = 
+{-1,-1,3,4,13,14,-1,15,-1,5,6,16,-1,7,17,-1,-1,-1,-1,-1,-1,8,-1,-1,-1,9,-1,0,
+ -1,10,-1,1,-1,-1,11,2,12,18}; /* hash_compose_tab_3 */ 
+static CompEntry compose_tab_3[] = {
+{65, 195, 0, NULL, NULL},
+{69, 7868, 0, NULL, NULL},
+{73, 296, 0, NULL, NULL},
+{78, 209, 0, NULL, NULL},
+{79, 213, 0, NULL, NULL},
+{85, 360, 0, NULL, NULL},
+{86, 7804, 0, NULL, NULL},
+{89, 7928, 0, NULL, NULL},
+{97, 227, 0, NULL, NULL},
+{101, 7869, 0, NULL, NULL},
+{105, 297, 0, NULL, NULL},
+{110, 241, 0, NULL, NULL},
+{111, 245, 0, NULL, NULL},
+{117, 361, 0, NULL, NULL},
+{118, 7805, 0, NULL, NULL},
+{121, 7929, 0, NULL, NULL},
+{770, 0, 6, compose_tab_3_16, hash_compose_tab_3_16},
+{774, 0, 2, compose_tab_3_17, hash_compose_tab_3_17},
+{795, 0, 4, compose_tab_3_18, hash_compose_tab_3_18}
+}; /* compose_tab_3 */ 
+static int hash_compose_tab_4_14[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_4_14 */ 
+static CompEntry compose_tab_4_14[] = {
+{65, 480, 0, NULL, NULL},
+{97, 481, 0, NULL, NULL}
+}; /* compose_tab_4_14 */ 
+static int hash_compose_tab_4_15[8] = 
+{-1,0,2,-1,-1,1,3,-1}; /* hash_compose_tab_4_15 */ 
+static CompEntry compose_tab_4_15[] = {
+{65, 478, 0, NULL, NULL},
+{85, 469, 0, NULL, NULL},
+{97, 479, 0, NULL, NULL},
+{117, 470, 0, NULL, NULL}
+}; /* compose_tab_4_15 */ 
+static int hash_compose_tab_4_16[8] = 
+{-1,-1,1,3,0,2,-1,-1}; /* hash_compose_tab_4_16 */ 
+static CompEntry compose_tab_4_16[] = {
+{76, 7736, 0, NULL, NULL},
+{82, 7772, 0, NULL, NULL},
+{108, 7737, 0, NULL, NULL},
+{114, 7773, 0, NULL, NULL}
+}; /* compose_tab_4_16 */ 
+static int hash_compose_tab_4_17[4] = 
+{1,-1,-1,0}; /* hash_compose_tab_4_17 */ 
+static CompEntry compose_tab_4_17[] = {
+{79, 492, 0, NULL, NULL},
+{111, 493, 0, NULL, NULL}
+}; /* compose_tab_4_17 */ 
+static int hash_compose_tab_4[56] = 
+{-1,22,-1,-1,-1,11,13,-1,-1,0,-1,-1,-1,1,23,2,26,3,18,16,-1,-1,-1,4,17,19,-1,
+ 27,-1,5,12,-1,-1,-1,-1,-1,-1,20,-1,-1,24,6,-1,-1,-1,7,-1,8,14,9,15,21,25,-1,
+ -1,10}; /* hash_compose_tab_4 */ 
+static CompEntry compose_tab_4[] = {
+{65, 256, 0, NULL, NULL},
+{69, 274, 0, NULL, NULL},
+{71, 7712, 0, NULL, NULL},
+{73, 298, 0, NULL, NULL},
+{79, 332, 0, NULL, NULL},
+{85, 362, 0, NULL, NULL},
+{97, 257, 0, NULL, NULL},
+{101, 275, 0, NULL, NULL},
+{103, 7713, 0, NULL, NULL},
+{105, 299, 0, NULL, NULL},
+{111, 333, 0, NULL, NULL},
+{117, 363, 0, NULL, NULL},
+{198, 482, 0, NULL, NULL},
+{230, 483, 0, NULL, NULL},
+{775, 0, 2, compose_tab_4_14, hash_compose_tab_4_14},
+{776, 0, 4, compose_tab_4_15, hash_compose_tab_4_15},
+{803, 0, 4, compose_tab_4_16, hash_compose_tab_4_16},
+{808, 0, 2, compose_tab_4_17, hash_compose_tab_4_17},
+{913, 8121, 0, NULL, NULL},
+{921, 8153, 0, NULL, NULL},
+{933, 8169, 0, NULL, NULL},
+{945, 8113, 0, NULL, NULL},
+{953, 8145, 0, NULL, NULL},
+{965, 8161, 0, NULL, NULL},
+{1048, 1250, 0, NULL, NULL},
+{1059, 1262, 0, NULL, NULL},
+{1080, 1251, 0, NULL, NULL},
+{1091, 1263, 0, NULL, NULL}
+}; /* compose_tab_4 */ 
+static int hash_compose_tab_5_12[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_5_12 */ 
+static CompEntry compose_tab_5_12[] = {
+{65, 7862, 0, NULL, NULL},
+{97, 7863, 0, NULL, NULL}
+}; /* compose_tab_5_12 */ 
+static int hash_compose_tab_5_13[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_5_13 */ 
+static CompEntry compose_tab_5_13[] = {
+{69, 7708, 0, NULL, NULL},
+{101, 7709, 0, NULL, NULL}
+}; /* compose_tab_5_13 */ 
+static int hash_compose_tab_5[60] = 
+{28,-1,-1,-1,-1,0,19,-1,-1,1,-1,2,29,3,14,-1,-1,-1,-1,4,20,15,-1,12,-1,5,21,
+ 13,22,23,-1,-1,-1,16,-1,-1,-1,6,-1,24,-1,7,-1,8,-1,9,17,-1,-1,-1,-1,10,25,18,
+ -1,-1,-1,11,26,27}; /* hash_compose_tab_5 */ 
+static CompEntry compose_tab_5[] = {
+{65, 258, 0, NULL, NULL},
+{69, 276, 0, NULL, NULL},
+{71, 286, 0, NULL, NULL},
+{73, 300, 0, NULL, NULL},
+{79, 334, 0, NULL, NULL},
+{85, 364, 0, NULL, NULL},
+{97, 259, 0, NULL, NULL},
+{101, 277, 0, NULL, NULL},
+{103, 287, 0, NULL, NULL},
+{105, 301, 0, NULL, NULL},
+{111, 335, 0, NULL, NULL},
+{117, 365, 0, NULL, NULL},
+{803, 0, 2, compose_tab_5_12, hash_compose_tab_5_12},
+{807, 0, 2, compose_tab_5_13, hash_compose_tab_5_13},
+{913, 8120, 0, NULL, NULL},
+{921, 8152, 0, NULL, NULL},
+{933, 8168, 0, NULL, NULL},
+{945, 8112, 0, NULL, NULL},
+{953, 8144, 0, NULL, NULL},
+{965, 8160, 0, NULL, NULL},
+{1040, 1232, 0, NULL, NULL},
+{1045, 1238, 0, NULL, NULL},
+{1046, 1217, 0, NULL, NULL},
+{1048, 1049, 0, NULL, NULL},
+{1059, 1038, 0, NULL, NULL},
+{1072, 1233, 0, NULL, NULL},
+{1077, 1239, 0, NULL, NULL},
+{1078, 1218, 0, NULL, NULL},
+{1080, 1081, 0, NULL, NULL},
+{1091, 1118, 0, NULL, NULL}
+}; /* compose_tab_5 */ 
+static int hash_compose_tab_6_36[4] = 
+{1,-1,-1,0}; /* hash_compose_tab_6_36 */ 
+static CompEntry compose_tab_6_36[] = {
+{83, 7780, 0, NULL, NULL},
+{115, 7781, 0, NULL, NULL}
+}; /* compose_tab_6_36 */ 
+static int hash_compose_tab_6_38[4] = 
+{1,-1,-1,0}; /* hash_compose_tab_6_38 */ 
+static CompEntry compose_tab_6_38[] = {
+{83, 7782, 0, NULL, NULL},
+{115, 7783, 0, NULL, NULL}
+}; /* compose_tab_6_38 */ 
+static int hash_compose_tab_6_39[4] = 
+{1,-1,-1,0}; /* hash_compose_tab_6_39 */ 
+static CompEntry compose_tab_6_39[] = {
+{83, 7784, 0, NULL, NULL},
+{115, 7785, 0, NULL, NULL}
+}; /* compose_tab_6_39 */ 
+static int hash_compose_tab_6[80] = 
+{10,-1,11,12,13,39,-1,14,15,16,17,-1,-1,-1,-1,-1,-1,-1,18,19,20,21,22,23,24,
+ -1,-1,-1,-1,25,26,-1,27,-1,28,29,30,-1,-1,31,32,33,34,-1,-1,-1,-1,-1,-1,36,
+ -1,-1,-1,-1,37,-1,-1,-1,-1,-1,38,-1,-1,35,-1,-1,0,1,2,3,4,5,6,7,-1,-1,-1,8,9,
+ -1}; /* hash_compose_tab_6 */ 
+static CompEntry compose_tab_6[] = {
+{66, 7682, 0, NULL, NULL},
+{67, 266, 0, NULL, NULL},
+{68, 7690, 0, NULL, NULL},
+{69, 278, 0, NULL, NULL},
+{70, 7710, 0, NULL, NULL},
+{71, 288, 0, NULL, NULL},
+{72, 7714, 0, NULL, NULL},
+{73, 304, 0, NULL, NULL},
+{77, 7744, 0, NULL, NULL},
+{78, 7748, 0, NULL, NULL},
+{80, 7766, 0, NULL, NULL},
+{82, 7768, 0, NULL, NULL},
+{83, 7776, 0, NULL, NULL},
+{84, 7786, 0, NULL, NULL},
+{87, 7814, 0, NULL, NULL},
+{88, 7818, 0, NULL, NULL},
+{89, 7822, 0, NULL, NULL},
+{90, 379, 0, NULL, NULL},
+{98, 7683, 0, NULL, NULL},
+{99, 267, 0, NULL, NULL},
+{100, 7691, 0, NULL, NULL},
+{101, 279, 0, NULL, NULL},
+{102, 7711, 0, NULL, NULL},
+{103, 289, 0, NULL, NULL},
+{104, 7715, 0, NULL, NULL},
+{109, 7745, 0, NULL, NULL},
+{110, 7749, 0, NULL, NULL},
+{112, 7767, 0, NULL, NULL},
+{114, 7769, 0, NULL, NULL},
+{115, 7777, 0, NULL, NULL},
+{116, 7787, 0, NULL, NULL},
+{119, 7815, 0, NULL, NULL},
+{120, 7819, 0, NULL, NULL},
+{121, 7823, 0, NULL, NULL},
+{122, 380, 0, NULL, NULL},
+{383, 7835, 0, NULL, NULL},
+{769, 0, 2, compose_tab_6_36, hash_compose_tab_6_36},
+{774, 784, 0, NULL, NULL},
+{780, 0, 2, compose_tab_6_38, hash_compose_tab_6_38},
+{803, 0, 2, compose_tab_6_39, hash_compose_tab_6_39}
+}; /* compose_tab_6 */ 
+static int hash_compose_tab_7_23[4] = 
+{1,-1,-1,0}; /* hash_compose_tab_7_23 */ 
+static CompEntry compose_tab_7_23[] = {
+{79, 7758, 0, NULL, NULL},
+{111, 7759, 0, NULL, NULL}
+}; /* compose_tab_7_23 */ 
+static int hash_compose_tab_7_24[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_7_24 */ 
+static CompEntry compose_tab_7_24[] = {
+{85, 7802, 0, NULL, NULL},
+{117, 7803, 0, NULL, NULL}
+}; /* compose_tab_7_24 */ 
+static int hash_compose_tab_7[100] = 
+{48,10,21,-1,11,12,-1,-1,-1,-1,49,13,-1,-1,-1,20,14,15,-1,16,17,18,25,-1,-1,
+ -1,-1,-1,-1,22,30,-1,-1,26,-1,-1,-1,-1,-1,-1,31,-1,-1,-1,-1,32,33,34,35,-1,
+ -1,-1,-1,27,36,-1,-1,-1,-1,37,-1,-1,-1,38,-1,0,28,39,-1,1,-1,23,2,3,24,40,-1,
+ 41,29,4,42,43,44,-1,-1,5,45,6,7,8,-1,46,-1,-1,-1,47,-1,9,-1,19}; /* hash_compose_tab_7 */ 
+static CompEntry compose_tab_7[] = {
+{65, 196, 0, NULL, NULL},
+{69, 203, 0, NULL, NULL},
+{72, 7718, 0, NULL, NULL},
+{73, 207, 0, NULL, NULL},
+{79, 214, 0, NULL, NULL},
+{85, 220, 0, NULL, NULL},
+{87, 7812, 0, NULL, NULL},
+{88, 7820, 0, NULL, NULL},
+{89, 376, 0, NULL, NULL},
+{97, 228, 0, NULL, NULL},
+{101, 235, 0, NULL, NULL},
+{104, 7719, 0, NULL, NULL},
+{105, 239, 0, NULL, NULL},
+{111, 246, 0, NULL, NULL},
+{116, 7831, 0, NULL, NULL},
+{117, 252, 0, NULL, NULL},
+{119, 7813, 0, NULL, NULL},
+{120, 7821, 0, NULL, NULL},
+{121, 255, 0, NULL, NULL},
+{399, 1242, 0, NULL, NULL},
+{415, 1258, 0, NULL, NULL},
+{601, 1243, 0, NULL, NULL},
+{629, 1259, 0, NULL, NULL},
+{771, 0, 2, compose_tab_7_23, hash_compose_tab_7_23},
+{772, 0, 2, compose_tab_7_24, hash_compose_tab_7_24},
+{921, 938, 0, NULL, NULL},
+{933, 939, 0, NULL, NULL},
+{953, 970, 0, NULL, NULL},
+{965, 971, 0, NULL, NULL},
+{978, 980, 0, NULL, NULL},
+{1030, 1031, 0, NULL, NULL},
+{1040, 1234, 0, NULL, NULL},
+{1045, 1025, 0, NULL, NULL},
+{1046, 1244, 0, NULL, NULL},
+{1047, 1246, 0, NULL, NULL},
+{1048, 1252, 0, NULL, NULL},
+{1054, 1254, 0, NULL, NULL},
+{1059, 1264, 0, NULL, NULL},
+{1063, 1268, 0, NULL, NULL},
+{1067, 1272, 0, NULL, NULL},
+{1072, 1235, 0, NULL, NULL},
+{1077, 1105, 0, NULL, NULL},
+{1078, 1245, 0, NULL, NULL},
+{1079, 1247, 0, NULL, NULL},
+{1080, 1253, 0, NULL, NULL},
+{1086, 1255, 0, NULL, NULL},
+{1091, 1265, 0, NULL, NULL},
+{1095, 1269, 0, NULL, NULL},
+{1099, 1273, 0, NULL, NULL},
+{1110, 1111, 0, NULL, NULL}
+}; /* compose_tab_7 */ 
+static int hash_compose_tab_8_12[12] = 
+{-1,3,-1,5,-1,0,4,2,-1,1,-1,-1}; /* hash_compose_tab_8_12 */ 
+static CompEntry compose_tab_8_12[] = {
+{65, 7848, 0, NULL, NULL},
+{69, 7874, 0, NULL, NULL},
+{79, 7892, 0, NULL, NULL},
+{97, 7849, 0, NULL, NULL},
+{101, 7875, 0, NULL, NULL},
+{111, 7893, 0, NULL, NULL}
+}; /* compose_tab_8_12 */ 
+static int hash_compose_tab_8_13[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_8_13 */ 
+static CompEntry compose_tab_8_13[] = {
+{65, 7858, 0, NULL, NULL},
+{97, 7859, 0, NULL, NULL}
+}; /* compose_tab_8_13 */ 
+static int hash_compose_tab_8_14[8] = 
+{2,-1,-1,-1,-1,1,3,0}; /* hash_compose_tab_8_14 */ 
+static CompEntry compose_tab_8_14[] = {
+{79, 7902, 0, NULL, NULL},
+{85, 7916, 0, NULL, NULL},
+{111, 7903, 0, NULL, NULL},
+{117, 7917, 0, NULL, NULL}
+}; /* compose_tab_8_14 */ 
+static int hash_compose_tab_8[30] = 
+{-1,11,-1,-1,-1,0,-1,6,-1,1,-1,7,-1,2,-1,8,14,-1,-1,3,12,9,-1,-1,13,4,-1,10,
+ -1,5}; /* hash_compose_tab_8 */ 
+static CompEntry compose_tab_8[] = {
+{65, 7842, 0, NULL, NULL},
+{69, 7866, 0, NULL, NULL},
+{73, 7880, 0, NULL, NULL},
+{79, 7886, 0, NULL, NULL},
+{85, 7910, 0, NULL, NULL},
+{89, 7926, 0, NULL, NULL},
+{97, 7843, 0, NULL, NULL},
+{101, 7867, 0, NULL, NULL},
+{105, 7881, 0, NULL, NULL},
+{111, 7887, 0, NULL, NULL},
+{117, 7911, 0, NULL, NULL},
+{121, 7927, 0, NULL, NULL},
+{770, 0, 6, compose_tab_8_12, hash_compose_tab_8_12},
+{774, 0, 2, compose_tab_8_13, hash_compose_tab_8_13},
+{795, 0, 4, compose_tab_8_14, hash_compose_tab_8_14}
+}; /* compose_tab_8 */ 
+static int hash_compose_tab_9[12] = 
+{-1,1,2,5,-1,0,-1,-1,-1,3,-1,4}; /* hash_compose_tab_9 */ 
+static CompEntry compose_tab_9[] = {
+{65, 197, 0, NULL, NULL},
+{85, 366, 0, NULL, NULL},
+{97, 229, 0, NULL, NULL},
+{117, 367, 0, NULL, NULL},
+{119, 7832, 0, NULL, NULL},
+{121, 7833, 0, NULL, NULL}
+}; /* compose_tab_9 */ 
+static int hash_compose_tab_10[12] = 
+{-1,1,-1,2,4,-1,-1,0,-1,3,-1,5}; /* hash_compose_tab_10 */ 
+static CompEntry compose_tab_10[] = {
+{79, 336, 0, NULL, NULL},
+{85, 368, 0, NULL, NULL},
+{111, 337, 0, NULL, NULL},
+{117, 369, 0, NULL, NULL},
+{1059, 1266, 0, NULL, NULL},
+{1091, 1267, 0, NULL, NULL}
+}; /* compose_tab_10 */ 
+static int hash_compose_tab_11_33[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_11_33 */ 
+static CompEntry compose_tab_11_33[] = {
+{85, 473, 0, NULL, NULL},
+{117, 474, 0, NULL, NULL}
+}; /* compose_tab_11_33 */ 
+static int hash_compose_tab_11[68] = 
+{2,3,-1,4,-1,5,-1,6,7,-1,8,9,-1,-1,10,11,12,13,-1,-1,-1,-1,14,-1,-1,-1,-1,-1,
+ 33,15,-1,16,17,18,31,19,-1,20,21,22,23,-1,24,25,-1,-1,26,27,28,29,32,-1,-1,
+ -1,30,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,-1,1}; /* hash_compose_tab_11 */ 
+static CompEntry compose_tab_11[] = {
+{65, 461, 0, NULL, NULL},
+{67, 268, 0, NULL, NULL},
+{68, 270, 0, NULL, NULL},
+{69, 282, 0, NULL, NULL},
+{71, 486, 0, NULL, NULL},
+{73, 463, 0, NULL, NULL},
+{75, 488, 0, NULL, NULL},
+{76, 317, 0, NULL, NULL},
+{78, 327, 0, NULL, NULL},
+{79, 465, 0, NULL, NULL},
+{82, 344, 0, NULL, NULL},
+{83, 352, 0, NULL, NULL},
+{84, 356, 0, NULL, NULL},
+{85, 467, 0, NULL, NULL},
+{90, 381, 0, NULL, NULL},
+{97, 462, 0, NULL, NULL},
+{99, 269, 0, NULL, NULL},
+{100, 271, 0, NULL, NULL},
+{101, 283, 0, NULL, NULL},
+{103, 487, 0, NULL, NULL},
+{105, 464, 0, NULL, NULL},
+{106, 496, 0, NULL, NULL},
+{107, 489, 0, NULL, NULL},
+{108, 318, 0, NULL, NULL},
+{110, 328, 0, NULL, NULL},
+{111, 466, 0, NULL, NULL},
+{114, 345, 0, NULL, NULL},
+{115, 353, 0, NULL, NULL},
+{116, 357, 0, NULL, NULL},
+{117, 468, 0, NULL, NULL},
+{122, 382, 0, NULL, NULL},
+{439, 494, 0, NULL, NULL},
+{658, 495, 0, NULL, NULL},
+{776, 0, 2, compose_tab_11_33, hash_compose_tab_11_33}
+}; /* compose_tab_11 */ 
+static int hash_compose_tab_12_1[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_12_1 */ 
+static CompEntry compose_tab_12_1[] = {
+{953, 912, 0, NULL, NULL},
+{965, 944, 0, NULL, NULL}
+}; /* compose_tab_12_1 */ 
+static int hash_compose_tab_12[34] = 
+{11,4,12,5,-1,-1,-1,13,-1,6,-1,-1,-1,14,-1,7,-1,15,-1,8,-1,-1,-1,-1,-1,-1,16,
+ 9,1,2,-1,10,0,3}; /* hash_compose_tab_12 */ 
+static CompEntry compose_tab_12[] = {
+{168, 901, 0, NULL, NULL},
+{776, 0, 2, compose_tab_12_1, hash_compose_tab_12_1},
+{913, 902, 0, NULL, NULL},
+{917, 904, 0, NULL, NULL},
+{919, 905, 0, NULL, NULL},
+{921, 906, 0, NULL, NULL},
+{927, 908, 0, NULL, NULL},
+{933, 910, 0, NULL, NULL},
+{937, 911, 0, NULL, NULL},
+{945, 940, 0, NULL, NULL},
+{949, 941, 0, NULL, NULL},
+{951, 942, 0, NULL, NULL},
+{953, 943, 0, NULL, NULL},
+{959, 972, 0, NULL, NULL},
+{965, 973, 0, NULL, NULL},
+{969, 974, 0, NULL, NULL},
+{978, 979, 0, NULL, NULL}
+}; /* compose_tab_12 */ 
+static int hash_compose_tab_13[28] = 
+{-1,5,10,-1,-1,11,-1,-1,-1,0,-1,-1,-1,1,6,-1,-1,2,7,-1,12,8,13,3,-1,-1,4,9}; /* hash_compose_tab_13 */ 
+static CompEntry compose_tab_13[] = {
+{65, 512, 0, NULL, NULL},
+{69, 516, 0, NULL, NULL},
+{73, 520, 0, NULL, NULL},
+{79, 524, 0, NULL, NULL},
+{82, 528, 0, NULL, NULL},
+{85, 532, 0, NULL, NULL},
+{97, 513, 0, NULL, NULL},
+{101, 517, 0, NULL, NULL},
+{105, 521, 0, NULL, NULL},
+{111, 525, 0, NULL, NULL},
+{114, 529, 0, NULL, NULL},
+{117, 533, 0, NULL, NULL},
+{1140, 1142, 0, NULL, NULL},
+{1141, 1143, 0, NULL, NULL}
+}; /* compose_tab_13 */ 
+static int hash_compose_tab_14[24] = 
+{-1,2,6,-1,-1,7,-1,3,-1,8,4,-1,-1,5,-1,9,-1,0,10,-1,-1,1,11,-1}; /* hash_compose_tab_14 */ 
+static CompEntry compose_tab_14[] = {
+{65, 514, 0, NULL, NULL},
+{69, 518, 0, NULL, NULL},
+{73, 522, 0, NULL, NULL},
+{79, 526, 0, NULL, NULL},
+{82, 530, 0, NULL, NULL},
+{85, 534, 0, NULL, NULL},
+{97, 515, 0, NULL, NULL},
+{101, 519, 0, NULL, NULL},
+{105, 523, 0, NULL, NULL},
+{111, 527, 0, NULL, NULL},
+{114, 531, 0, NULL, NULL},
+{117, 535, 0, NULL, NULL}
+}; /* compose_tab_14 */ 
+static int hash_compose_tab_15_0[12] = 
+{-1,0,2,4,-1,-1,-1,1,-1,3,5,-1}; /* hash_compose_tab_15_0 */ 
+static CompEntry compose_tab_15_0[] = {
+{913, 8072, 0, NULL, NULL},
+{919, 8088, 0, NULL, NULL},
+{937, 8104, 0, NULL, NULL},
+{945, 8064, 0, NULL, NULL},
+{951, 8080, 0, NULL, NULL},
+{969, 8096, 0, NULL, NULL}
+}; /* compose_tab_15_0 */ 
+static int hash_compose_tab_15[30] = 
+{-1,12,-1,-1,-1,13,-1,6,-1,14,-1,-1,-1,1,-1,7,-1,2,-1,3,8,4,9,10,-1,-1,-1,0,5,
+ 11}; /* hash_compose_tab_15 */ 
+static CompEntry compose_tab_15[] = {
+{837, 0, 6, compose_tab_15_0, hash_compose_tab_15_0},
+{913, 7944, 0, NULL, NULL},
+{917, 7960, 0, NULL, NULL},
+{919, 7976, 0, NULL, NULL},
+{921, 7992, 0, NULL, NULL},
+{927, 8008, 0, NULL, NULL},
+{937, 8040, 0, NULL, NULL},
+{945, 7936, 0, NULL, NULL},
+{949, 7952, 0, NULL, NULL},
+{951, 7968, 0, NULL, NULL},
+{953, 7984, 0, NULL, NULL},
+{959, 8000, 0, NULL, NULL},
+{961, 8164, 0, NULL, NULL},
+{965, 8016, 0, NULL, NULL},
+{969, 8032, 0, NULL, NULL}
+}; /* compose_tab_15 */ 
+static int hash_compose_tab_16_0[12] = 
+{-1,0,2,4,-1,-1,-1,1,-1,3,5,-1}; /* hash_compose_tab_16_0 */ 
+static CompEntry compose_tab_16_0[] = {
+{913, 8073, 0, NULL, NULL},
+{919, 8089, 0, NULL, NULL},
+{937, 8105, 0, NULL, NULL},
+{945, 8065, 0, NULL, NULL},
+{951, 8081, 0, NULL, NULL},
+{969, 8097, 0, NULL, NULL}
+}; /* compose_tab_16_0 */ 
+static int hash_compose_tab_16[34] = 
+{11,3,12,4,-1,-1,-1,13,-1,5,14,6,-1,15,-1,7,-1,16,-1,8,-1,0,-1,-1,-1,-1,-1,9,
+ -1,1,-1,10,-1,2}; /* hash_compose_tab_16 */ 
+static CompEntry compose_tab_16[] = {
+{837, 0, 6, compose_tab_16_0, hash_compose_tab_16_0},
+{913, 7945, 0, NULL, NULL},
+{917, 7961, 0, NULL, NULL},
+{919, 7977, 0, NULL, NULL},
+{921, 7993, 0, NULL, NULL},
+{927, 8009, 0, NULL, NULL},
+{929, 8172, 0, NULL, NULL},
+{933, 8025, 0, NULL, NULL},
+{937, 8041, 0, NULL, NULL},
+{945, 7937, 0, NULL, NULL},
+{949, 7953, 0, NULL, NULL},
+{951, 7969, 0, NULL, NULL},
+{953, 7985, 0, NULL, NULL},
+{959, 8001, 0, NULL, NULL},
+{961, 8165, 0, NULL, NULL},
+{965, 8017, 0, NULL, NULL},
+{969, 8033, 0, NULL, NULL}
+}; /* compose_tab_16 */ 
+static int hash_compose_tab_17[8] = 
+{2,-1,-1,-1,-1,1,3,0}; /* hash_compose_tab_17 */ 
+static CompEntry compose_tab_17[] = {
+{79, 416, 0, NULL, NULL},
+{85, 431, 0, NULL, NULL},
+{111, 417, 0, NULL, NULL},
+{117, 432, 0, NULL, NULL}
+}; /* compose_tab_17 */ 
+static int hash_compose_tab_18_38[8] = 
+{2,-1,-1,-1,-1,1,3,0}; /* hash_compose_tab_18_38 */ 
+static CompEntry compose_tab_18_38[] = {
+{79, 7906, 0, NULL, NULL},
+{85, 7920, 0, NULL, NULL},
+{111, 7907, 0, NULL, NULL},
+{117, 7921, 0, NULL, NULL}
+}; /* compose_tab_18_38 */ 
+static int hash_compose_tab_18[78] = 
+{9,10,-1,-1,11,12,13,14,15,16,-1,17,18,-1,-1,38,-1,-1,-1,19,20,-1,21,22,-1,-1,
+ 23,24,-1,25,26,27,28,29,-1,-1,30,31,32,33,34,35,-1,36,37,-1,-1,-1,-1,-1,-1,
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,-1,2,3,-1,-1,4,5,-1,6,7,8}; /* hash_compose_tab_18 */ 
+static CompEntry compose_tab_18[] = {
+{65, 7840, 0, NULL, NULL},
+{66, 7684, 0, NULL, NULL},
+{68, 7692, 0, NULL, NULL},
+{69, 7864, 0, NULL, NULL},
+{72, 7716, 0, NULL, NULL},
+{73, 7882, 0, NULL, NULL},
+{75, 7730, 0, NULL, NULL},
+{76, 7734, 0, NULL, NULL},
+{77, 7746, 0, NULL, NULL},
+{78, 7750, 0, NULL, NULL},
+{79, 7884, 0, NULL, NULL},
+{82, 7770, 0, NULL, NULL},
+{83, 7778, 0, NULL, NULL},
+{84, 7788, 0, NULL, NULL},
+{85, 7908, 0, NULL, NULL},
+{86, 7806, 0, NULL, NULL},
+{87, 7816, 0, NULL, NULL},
+{89, 7924, 0, NULL, NULL},
+{90, 7826, 0, NULL, NULL},
+{97, 7841, 0, NULL, NULL},
+{98, 7685, 0, NULL, NULL},
+{100, 7693, 0, NULL, NULL},
+{101, 7865, 0, NULL, NULL},
+{104, 7717, 0, NULL, NULL},
+{105, 7883, 0, NULL, NULL},
+{107, 7731, 0, NULL, NULL},
+{108, 7735, 0, NULL, NULL},
+{109, 7747, 0, NULL, NULL},
+{110, 7751, 0, NULL, NULL},
+{111, 7885, 0, NULL, NULL},
+{114, 7771, 0, NULL, NULL},
+{115, 7779, 0, NULL, NULL},
+{116, 7789, 0, NULL, NULL},
+{117, 7909, 0, NULL, NULL},
+{118, 7807, 0, NULL, NULL},
+{119, 7817, 0, NULL, NULL},
+{121, 7925, 0, NULL, NULL},
+{122, 7827, 0, NULL, NULL},
+{795, 0, 4, compose_tab_18_38, hash_compose_tab_18_38}
+}; /* compose_tab_18 */ 
+static int hash_compose_tab_19[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_19 */ 
+static CompEntry compose_tab_19[] = {
+{85, 7794, 0, NULL, NULL},
+{117, 7795, 0, NULL, NULL}
+}; /* compose_tab_19 */ 
+static int hash_compose_tab_20[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_20 */ 
+static CompEntry compose_tab_20[] = {
+{65, 7680, 0, NULL, NULL},
+{97, 7681, 0, NULL, NULL}
+}; /* compose_tab_20 */ 
+static int hash_compose_tab_21[40] = 
+{-1,-1,7,8,9,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,10,11,-1,-1,12,13,-1,
+ -1,0,1,14,15,2,3,16,17,4,5,18,6,19}; /* hash_compose_tab_21 */ 
+static CompEntry compose_tab_21[] = {
+{67, 199, 0, NULL, NULL},
+{68, 7696, 0, NULL, NULL},
+{71, 290, 0, NULL, NULL},
+{72, 7720, 0, NULL, NULL},
+{75, 310, 0, NULL, NULL},
+{76, 315, 0, NULL, NULL},
+{78, 325, 0, NULL, NULL},
+{82, 342, 0, NULL, NULL},
+{83, 350, 0, NULL, NULL},
+{84, 354, 0, NULL, NULL},
+{99, 231, 0, NULL, NULL},
+{100, 7697, 0, NULL, NULL},
+{103, 291, 0, NULL, NULL},
+{104, 7721, 0, NULL, NULL},
+{107, 311, 0, NULL, NULL},
+{108, 316, 0, NULL, NULL},
+{110, 326, 0, NULL, NULL},
+{114, 343, 0, NULL, NULL},
+{115, 351, 0, NULL, NULL},
+{116, 355, 0, NULL, NULL}
+}; /* compose_tab_21 */ 
+static int hash_compose_tab_22[20] = 
+{-1,6,-1,-1,-1,0,4,7,-1,1,-1,8,-1,2,-1,-1,-1,5,9,3}; /* hash_compose_tab_22 */ 
+static CompEntry compose_tab_22[] = {
+{65, 260, 0, NULL, NULL},
+{69, 280, 0, NULL, NULL},
+{73, 302, 0, NULL, NULL},
+{79, 490, 0, NULL, NULL},
+{85, 370, 0, NULL, NULL},
+{97, 261, 0, NULL, NULL},
+{101, 281, 0, NULL, NULL},
+{105, 303, 0, NULL, NULL},
+{111, 491, 0, NULL, NULL},
+{117, 371, 0, NULL, NULL}
+}; /* compose_tab_22 */ 
+static int hash_compose_tab_23[24] = 
+{-1,-1,-1,-1,2,6,3,7,-1,-1,-1,-1,4,5,8,9,-1,-1,-1,-1,0,1,10,11}; /* hash_compose_tab_23 */ 
+static CompEntry compose_tab_23[] = {
+{68, 7698, 0, NULL, NULL},
+{69, 7704, 0, NULL, NULL},
+{76, 7740, 0, NULL, NULL},
+{78, 7754, 0, NULL, NULL},
+{84, 7792, 0, NULL, NULL},
+{85, 7798, 0, NULL, NULL},
+{100, 7699, 0, NULL, NULL},
+{101, 7705, 0, NULL, NULL},
+{108, 7741, 0, NULL, NULL},
+{110, 7755, 0, NULL, NULL},
+{116, 7793, 0, NULL, NULL},
+{117, 7799, 0, NULL, NULL}
+}; /* compose_tab_23 */ 
+static int hash_compose_tab_24[4] = 
+{0,1,-1,-1}; /* hash_compose_tab_24 */ 
+static CompEntry compose_tab_24[] = {
+{72, 7722, 0, NULL, NULL},
+{104, 7723, 0, NULL, NULL}
+}; /* compose_tab_24 */ 
+static int hash_compose_tab_25[12] = 
+{-1,1,2,-1,-1,3,-1,-1,-1,0,4,5}; /* hash_compose_tab_25 */ 
+static CompEntry compose_tab_25[] = {
+{69, 7706, 0, NULL, NULL},
+{73, 7724, 0, NULL, NULL},
+{85, 7796, 0, NULL, NULL},
+{101, 7707, 0, NULL, NULL},
+{105, 7725, 0, NULL, NULL},
+{117, 7797, 0, NULL, NULL}
+}; /* compose_tab_25 */ 
+static int hash_compose_tab_26[34] = 
+{1,-1,10,-1,-1,11,12,2,3,13,4,-1,14,-1,5,15,6,-1,-1,-1,16,-1,7,-1,-1,-1,-1,-1,
+ -1,-1,8,-1,0,9}; /* hash_compose_tab_26 */ 
+static CompEntry compose_tab_26[] = {
+{66, 7686, 0, NULL, NULL},
+{68, 7694, 0, NULL, NULL},
+{75, 7732, 0, NULL, NULL},
+{76, 7738, 0, NULL, NULL},
+{78, 7752, 0, NULL, NULL},
+{82, 7774, 0, NULL, NULL},
+{84, 7790, 0, NULL, NULL},
+{90, 7828, 0, NULL, NULL},
+{98, 7687, 0, NULL, NULL},
+{100, 7695, 0, NULL, NULL},
+{104, 7830, 0, NULL, NULL},
+{107, 7733, 0, NULL, NULL},
+{108, 7739, 0, NULL, NULL},
+{110, 7753, 0, NULL, NULL},
+{114, 7775, 0, NULL, NULL},
+{116, 7791, 0, NULL, NULL},
+{122, 7829, 0, NULL, NULL}
+}; /* compose_tab_26 */ 
+static int hash_compose_tab_27_1[4] = 
+{-1,0,1,-1}; /* hash_compose_tab_27_1 */ 
+static CompEntry compose_tab_27_1[] = {
+{953, 8151, 0, NULL, NULL},
+{965, 8167, 0, NULL, NULL}
+}; /* compose_tab_27_1 */ 
+static int hash_compose_tab_27_2_0[12] = 
+{-1,0,2,4,-1,-1,-1,1,-1,3,5,-1}; /* hash_compose_tab_27_2_0 */ 
+static CompEntry compose_tab_27_2_0[] = {
+{913, 8078, 0, NULL, NULL},
+{919, 8094, 0, NULL, NULL},
+{937, 8110, 0, NULL, NULL},
+{945, 8070, 0, NULL, NULL},
+{951, 8086, 0, NULL, NULL},
+{969, 8102, 0, NULL, NULL}
+}; /* compose_tab_27_2_0 */ 
+static int hash_compose_tab_27_2[20] = 
+{-1,3,-1,-1,-1,5,8,-1,-1,9,-1,6,-1,1,7,-1,-1,0,4,2}; /* hash_compose_tab_27_2 */ 
+static CompEntry compose_tab_27_2[] = {
+{837, 0, 6, compose_tab_27_2_0, hash_compose_tab_27_2_0},
+{913, 7950, 0, NULL, NULL},
+{919, 7982, 0, NULL, NULL},
+{921, 7998, 0, NULL, NULL},
+{937, 8046, 0, NULL, NULL},
+{945, 7942, 0, NULL, NULL},
+{951, 7974, 0, NULL, NULL},
+{953, 7990, 0, NULL, NULL},
+{965, 8022, 0, NULL, NULL},
+{969, 8038, 0, NULL, NULL}
+}; /* compose_tab_27_2 */ 
+static int hash_compose_tab_27_3_0[12] = 
+{-1,0,2,4,-1,-1,-1,1,-1,3,5,-1}; /* hash_compose_tab_27_3_0 */ 
+static CompEntry compose_tab_27_3_0[] = {
+{913, 8079, 0, NULL, NULL},
+{919, 8095, 0, NULL, NULL},
+{937, 8111, 0, NULL, NULL},
+{945, 8071, 0, NULL, NULL},
+{951, 8087, 0, NULL, NULL},
+{969, 8103, 0, NULL, NULL}
+}; /* compose_tab_27_3_0 */ 
+static int hash_compose_tab_27_3[22] = 
+{-1,0,10,-1,-1,7,-1,8,-1,4,-1,1,-1,5,-1,-1,-1,2,-1,3,9,6}; /* hash_compose_tab_27_3 */ 
+static CompEntry compose_tab_27_3[] = {
+{837, 0, 6, compose_tab_27_3_0, hash_compose_tab_27_3_0},
+{913, 7951, 0, NULL, NULL},
+{919, 7983, 0, NULL, NULL},
+{921, 7999, 0, NULL, NULL},
+{933, 8031, 0, NULL, NULL},
+{937, 8047, 0, NULL, NULL},
+{945, 7943, 0, NULL, NULL},
+{951, 7975, 0, NULL, NULL},
+{953, 7991, 0, NULL, NULL},
+{965, 8023, 0, NULL, NULL},
+{969, 8039, 0, NULL, NULL}
+}; /* compose_tab_27_3 */ 
+static int hash_compose_tab_27_4[6] = 
+{-1,-1,-1,0,1,2}; /* hash_compose_tab_27_4 */ 
+static CompEntry compose_tab_27_4[] = {
+{945, 8119, 0, NULL, NULL},
+{951, 8135, 0, NULL, NULL},
+{969, 8183, 0, NULL, NULL}
+}; /* compose_tab_27_4 */ 
+static int hash_compose_tab_27[24] = 
+{0,-1,-1,-1,-1,8,11,-1,1,5,9,-1,-1,-1,-1,6,10,7,-1,2,3,4,-1,-1}; /* hash_compose_tab_27 */ 
+static CompEntry compose_tab_27[] = {
+{168, 8129, 0, NULL, NULL},
+{776, 0, 2, compose_tab_27_1, hash_compose_tab_27_1},
+{787, 0, 10, compose_tab_27_2, hash_compose_tab_27_2},
+{788, 0, 11, compose_tab_27_3, hash_compose_tab_27_3},
+{837, 0, 3, compose_tab_27_4, hash_compose_tab_27_4},
+{945, 8118, 0, NULL, NULL},
+{951, 8134, 0, NULL, NULL},
+{953, 8150, 0, NULL, NULL},
+{965, 8166, 0, NULL, NULL},
+{969, 8182, 0, NULL, NULL},
+{8127, 8143, 0, NULL, NULL},
+{8190, 8159, 0, NULL, NULL}
+}; /* compose_tab_27 */ 
+static int hash_compose_tab_28[12] = 
+{-1,0,2,4,-1,-1,-1,1,-1,3,5,-1}; /* hash_compose_tab_28 */ 
+static CompEntry compose_tab_28[] = {
+{913, 8124, 0, NULL, NULL},
+{919, 8140, 0, NULL, NULL},
+{937, 8188, 0, NULL, NULL},
+{945, 8115, 0, NULL, NULL},
+{951, 8131, 0, NULL, NULL},
+{969, 8179, 0, NULL, NULL}
+}; /* compose_tab_28 */ 
+static int hash_compose_tab_29[4] = 
+{0,-1,1,-1}; /* hash_compose_tab_29 */ 
+static CompEntry compose_tab_29[] = {
+{1488, 64302, 0, NULL, NULL},
+{1522, 64287, 0, NULL, NULL}
+}; /* compose_tab_29 */ 
+static int hash_compose_tab_30[2] = 
+{0,-1}; /* hash_compose_tab_30 */ 
+static CompEntry compose_tab_30[] = {
+{1488, 64303, 0, NULL, NULL}
+}; /* compose_tab_30 */ 
+static int hash_compose_tab_31[2] = 
+{-1,0}; /* hash_compose_tab_31 */ 
+static CompEntry compose_tab_31[] = {
+{1493, 64331, 0, NULL, NULL}
+}; /* compose_tab_31 */ 
+static int hash_compose_tab_32[44] = 
+{7,8,9,10,11,-1,12,-1,13,14,-1,15,16,-1,17,18,19,20,21,-1,-1,-1,-1,-1,-1,-1,
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,-1}; /* hash_compose_tab_32 */ 
+static CompEntry compose_tab_32[] = {
+{1488, 64304, 0, NULL, NULL},
+{1489, 64305, 0, NULL, NULL},
+{1490, 64306, 0, NULL, NULL},
+{1491, 64307, 0, NULL, NULL},
+{1492, 64308, 0, NULL, NULL},
+{1493, 64309, 0, NULL, NULL},
+{1494, 64310, 0, NULL, NULL},
+{1496, 64312, 0, NULL, NULL},
+{1497, 64313, 0, NULL, NULL},
+{1498, 64314, 0, NULL, NULL},
+{1499, 64315, 0, NULL, NULL},
+{1500, 64316, 0, NULL, NULL},
+{1502, 64318, 0, NULL, NULL},
+{1504, 64320, 0, NULL, NULL},
+{1505, 64321, 0, NULL, NULL},
+{1507, 64323, 0, NULL, NULL},
+{1508, 64324, 0, NULL, NULL},
+{1510, 64326, 0, NULL, NULL},
+{1511, 64327, 0, NULL, NULL},
+{1512, 64328, 0, NULL, NULL},
+{1513, 64329, 0, NULL, NULL},
+{1514, 64330, 0, NULL, NULL}
+}; /* compose_tab_32 */ 
+static int hash_compose_tab_33[6] = 
+{-1,0,2,-1,-1,1}; /* hash_compose_tab_33 */ 
+static CompEntry compose_tab_33[] = {
+{1489, 64332, 0, NULL, NULL},
+{1499, 64333, 0, NULL, NULL},
+{1508, 64334, 0, NULL, NULL}
+}; /* compose_tab_33 */ 
+static int hash_compose_tab_34_0[2] = 
+{-1,0}; /* hash_compose_tab_34_0 */ 
+static CompEntry compose_tab_34_0[] = {
+{1513, 64300, 0, NULL, NULL}
+}; /* compose_tab_34_0 */ 
+static int hash_compose_tab_34[4] = 
+{0,1,-1,-1}; /* hash_compose_tab_34 */ 
+static CompEntry compose_tab_34[] = {
+{1468, 0, 1, compose_tab_34_0, hash_compose_tab_34_0},
+{1513, 64298, 0, NULL, NULL}
+}; /* compose_tab_34 */ 
+static int hash_compose_tab_35_0[2] = 
+{-1,0}; /* hash_compose_tab_35_0 */ 
+static CompEntry compose_tab_35_0[] = {
+{1513, 64301, 0, NULL, NULL}
+}; /* compose_tab_35_0 */ 
+static int hash_compose_tab_35[4] = 
+{0,1,-1,-1}; /* hash_compose_tab_35 */ 
+static CompEntry compose_tab_35[] = {
+{1468, 0, 1, compose_tab_35_0, hash_compose_tab_35_0},
+{1513, 64299, 0, NULL, NULL}
+}; /* compose_tab_35 */ 
+static int hash_compose_tab_36[22] = 
+{3,10,-1,-1,-1,4,5,-1,-1,-1,-1,-1,6,-1,-1,0,1,2,7,8,9,-1}; /* hash_compose_tab_36 */ 
+static CompEntry compose_tab_36[] = {
+{2325, 2392, 0, NULL, NULL},
+{2326, 2393, 0, NULL, NULL},
+{2327, 2394, 0, NULL, NULL},
+{2332, 2395, 0, NULL, NULL},
+{2337, 2396, 0, NULL, NULL},
+{2338, 2397, 0, NULL, NULL},
+{2344, 2345, 0, NULL, NULL},
+{2347, 2398, 0, NULL, NULL},
+{2351, 2399, 0, NULL, NULL},
+{2352, 2353, 0, NULL, NULL},
+{2355, 2356, 0, NULL, NULL}
+}; /* compose_tab_36 */ 
+static int hash_compose_tab_37[8] = 
+{-1,0,1,-1,2,-1,-1,3}; /* hash_compose_tab_37 */ 
+static CompEntry compose_tab_37[] = {
+{2465, 2524, 0, NULL, NULL},
+{2466, 2525, 0, NULL, NULL},
+{2476, 2480, 0, NULL, NULL},
+{2479, 2527, 0, NULL, NULL}
+}; /* compose_tab_37 */ 
+static int hash_compose_tab_38[2] = 
+{-1,0}; /* hash_compose_tab_38 */ 
+static CompEntry compose_tab_38[] = {
+{2503, 2507, 0, NULL, NULL}
+}; /* compose_tab_38 */ 
+static int hash_compose_tab_39[2] = 
+{-1,0}; /* hash_compose_tab_39 */ 
+static CompEntry compose_tab_39[] = {
+{2503, 2508, 0, NULL, NULL}
+}; /* compose_tab_39 */ 
+static int hash_compose_tab_40[10] = 
+{-1,-1,0,1,3,4,-1,-1,2,-1}; /* hash_compose_tab_40 */ 
+static CompEntry compose_tab_40[] = {
+{2582, 2649, 0, NULL, NULL},
+{2583, 2650, 0, NULL, NULL},
+{2588, 2651, 0, NULL, NULL},
+{2593, 2652, 0, NULL, NULL},
+{2603, 2654, 0, NULL, NULL}
+}; /* compose_tab_40 */ 
+static int hash_compose_tab_41[6] = 
+{1,2,-1,-1,-1,0}; /* hash_compose_tab_41 */ 
+static CompEntry compose_tab_41[] = {
+{2849, 2908, 0, NULL, NULL},
+{2850, 2909, 0, NULL, NULL},
+{2863, 2911, 0, NULL, NULL}
+}; /* compose_tab_41 */ 
+static int hash_compose_tab_42[2] = 
+{-1,0}; /* hash_compose_tab_42 */ 
+static CompEntry compose_tab_42[] = {
+{2887, 2891, 0, NULL, NULL}
+}; /* compose_tab_42 */ 
+static int hash_compose_tab_43[2] = 
+{-1,0}; /* hash_compose_tab_43 */ 
+static CompEntry compose_tab_43[] = {
+{2887, 2888, 0, NULL, NULL}
+}; /* compose_tab_43 */ 
+static int hash_compose_tab_44[2] = 
+{-1,0}; /* hash_compose_tab_44 */ 
+static CompEntry compose_tab_44[] = {
+{2887, 2892, 0, NULL, NULL}
+}; /* compose_tab_44 */ 
+static int hash_compose_tab_45[4] = 
+{-1,-1,0,1}; /* hash_compose_tab_45 */ 
+static CompEntry compose_tab_45[] = {
+{3014, 3018, 0, NULL, NULL},
+{3015, 3019, 0, NULL, NULL}
+}; /* compose_tab_45 */ 
+static int hash_compose_tab_46[4] = 
+{-1,-1,0,1}; /* hash_compose_tab_46 */ 
+static CompEntry compose_tab_46[] = {
+{2962, 2964, 0, NULL, NULL},
+{3014, 3020, 0, NULL, NULL}
+}; /* compose_tab_46 */ 
+static int hash_compose_tab_47[2] = 
+{0,-1}; /* hash_compose_tab_47 */ 
+static CompEntry compose_tab_47[] = {
+{3142, 3144, 0, NULL, NULL}
+}; /* compose_tab_47 */ 
+static int hash_compose_tab_48[2] = 
+{0,-1}; /* hash_compose_tab_48 */ 
+static CompEntry compose_tab_48[] = {
+{3270, 3274, 0, NULL, NULL}
+}; /* compose_tab_48 */ 
+static int hash_compose_tab_49_1[2] = 
+{0,-1}; /* hash_compose_tab_49_1 */ 
+static CompEntry compose_tab_49_1[] = {
+{3270, 3275, 0, NULL, NULL}
+}; /* compose_tab_49_1 */ 
+static int hash_compose_tab_49[6] = 
+{2,-1,1,-1,-1,0}; /* hash_compose_tab_49 */ 
+static CompEntry compose_tab_49[] = {
+{3263, 3264, 0, NULL, NULL},
+{3266, 0, 1, compose_tab_49_1, hash_compose_tab_49_1},
+{3270, 3271, 0, NULL, NULL}
+}; /* compose_tab_49 */ 
+static int hash_compose_tab_50[2] = 
+{0,-1}; /* hash_compose_tab_50 */ 
+static CompEntry compose_tab_50[] = {
+{3270, 3272, 0, NULL, NULL}
+}; /* compose_tab_50 */ 
+static int hash_compose_tab_51[4] = 
+{-1,-1,0,1}; /* hash_compose_tab_51 */ 
+static CompEntry compose_tab_51[] = {
+{3398, 3402, 0, NULL, NULL},
+{3399, 3403, 0, NULL, NULL}
+}; /* compose_tab_51 */ 
+static int hash_compose_tab_52[2] = 
+{0,-1}; /* hash_compose_tab_52 */ 
+static CompEntry compose_tab_52[] = {
+{3398, 3404, 0, NULL, NULL}
+}; /* compose_tab_52 */ 
+static int hash_compose_tab_53[2] = 
+{-1,0}; /* hash_compose_tab_53 */ 
+static CompEntry compose_tab_53[] = {
+{3661, 3635, 0, NULL, NULL}
+}; /* compose_tab_53 */ 
+static int hash_compose_tab_54[2] = 
+{-1,0}; /* hash_compose_tab_54 */ 
+static CompEntry compose_tab_54[] = {
+{3789, 3763, 0, NULL, NULL}
+}; /* compose_tab_54 */ 
+static int hash_compose_tab_55_2[4] = 
+{-1,-1,0,1}; /* hash_compose_tab_55_2 */ 
+static CompEntry compose_tab_55_2[] = {
+{4018, 3959, 0, NULL, NULL},
+{4019, 3961, 0, NULL, NULL}
+}; /* compose_tab_55_2 */ 
+static int hash_compose_tab_55[6] = 
+{0,-1,1,2,-1,-1}; /* hash_compose_tab_55 */ 
+static CompEntry compose_tab_55[] = {
+{3954, 3955, 0, NULL, NULL},
+{3956, 3957, 0, NULL, NULL},
+{3968, 0, 2, compose_tab_55_2, hash_compose_tab_55_2}
+}; /* compose_tab_55 */ 
+static int hash_compose_tab_56[4] = 
+{-1,-1,0,1}; /* hash_compose_tab_56 */ 
+static CompEntry compose_tab_56[] = {
+{4018, 3958, 0, NULL, NULL},
+{4019, 3960, 0, NULL, NULL}
+}; /* compose_tab_56 */ 
+static int hash_compose_tab_57[4] = 
+{0,1,-1,-1}; /* hash_compose_tab_57 */ 
+static CompEntry compose_tab_57[] = {
+{3904, 3945, 0, NULL, NULL},
+{3984, 4025, 0, NULL, NULL}
+}; /* compose_tab_57 */ 
+static int hash_compose_tab_58[20] = 
+{-1,2,7,-1,-1,-1,0,3,5,8,-1,4,9,-1,-1,-1,1,6,-1,-1}; /* hash_compose_tab_58 */ 
+static CompEntry compose_tab_58[] = {
+{3906, 3907, 0, NULL, NULL},
+{3916, 3917, 0, NULL, NULL},
+{3921, 3922, 0, NULL, NULL},
+{3926, 3927, 0, NULL, NULL},
+{3931, 3932, 0, NULL, NULL},
+{3986, 3987, 0, NULL, NULL},
+{3996, 3997, 0, NULL, NULL},
+{4001, 4002, 0, NULL, NULL},
+{4006, 4007, 0, NULL, NULL},
+{4011, 4012, 0, NULL, NULL}
+}; /* compose_tab_58 */ 
+static int hash_compose_tab_59[96] = 
+{33,12,34,-1,13,35,14,36,15,37,-1,-1,-1,-1,-1,16,38,-1,17,39,-1,18,40,-1,19,
+ 41,-1,20,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,43,44,45,
+ 46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,21,47,-1,-1,-1,-1,-1,-1,-1,0,22,-1,-1,-1,1,
+ 23,2,24,3,25,4,26,5,27,6,28,7,29,8,30,9,31,10,32,11}; /* hash_compose_tab_59 */ 
+static CompEntry compose_tab_59[] = {
+{12358, 12436, 0, NULL, NULL},
+{12363, 12364, 0, NULL, NULL},
+{12365, 12366, 0, NULL, NULL},
+{12367, 12368, 0, NULL, NULL},
+{12369, 12370, 0, NULL, NULL},
+{12371, 12372, 0, NULL, NULL},
+{12373, 12374, 0, NULL, NULL},
+{12375, 12376, 0, NULL, NULL},
+{12377, 12378, 0, NULL, NULL},
+{12379, 12380, 0, NULL, NULL},
+{12381, 12382, 0, NULL, NULL},
+{12383, 12384, 0, NULL, NULL},
+{12385, 12386, 0, NULL, NULL},
+{12388, 12389, 0, NULL, NULL},
+{12390, 12391, 0, NULL, NULL},
+{12392, 12393, 0, NULL, NULL},
+{12399, 12400, 0, NULL, NULL},
+{12402, 12403, 0, NULL, NULL},
+{12405, 12406, 0, NULL, NULL},
+{12408, 12409, 0, NULL, NULL},
+{12411, 12412, 0, NULL, NULL},
+{12445, 12446, 0, NULL, NULL},
+{12454, 12532, 0, NULL, NULL},
+{12459, 12460, 0, NULL, NULL},
+{12461, 12462, 0, NULL, NULL},
+{12463, 12464, 0, NULL, NULL},
+{12465, 12466, 0, NULL, NULL},
+{12467, 12468, 0, NULL, NULL},
+{12469, 12470, 0, NULL, NULL},
+{12471, 12472, 0, NULL, NULL},
+{12473, 12474, 0, NULL, NULL},
+{12475, 12476, 0, NULL, NULL},
+{12477, 12478, 0, NULL, NULL},
+{12479, 12480, 0, NULL, NULL},
+{12481, 12482, 0, NULL, NULL},
+{12484, 12485, 0, NULL, NULL},
+{12486, 12487, 0, NULL, NULL},
+{12488, 12489, 0, NULL, NULL},
+{12495, 12496, 0, NULL, NULL},
+{12498, 12499, 0, NULL, NULL},
+{12501, 12502, 0, NULL, NULL},
+{12504, 12505, 0, NULL, NULL},
+{12507, 12508, 0, NULL, NULL},
+{12527, 12535, 0, NULL, NULL},
+{12528, 12536, 0, NULL, NULL},
+{12529, 12537, 0, NULL, NULL},
+{12530, 12538, 0, NULL, NULL},
+{12541, 12542, 0, NULL, NULL}
+}; /* compose_tab_59 */ 
+static int hash_compose_tab_60[20] = 
+{-1,7,1,-1,8,2,-1,9,3,-1,-1,4,-1,-1,-1,5,-1,-1,6,0}; /* hash_compose_tab_60 */ 
+static CompEntry compose_tab_60[] = {
+{12399, 12401, 0, NULL, NULL},
+{12402, 12404, 0, NULL, NULL},
+{12405, 12407, 0, NULL, NULL},
+{12408, 12410, 0, NULL, NULL},
+{12411, 12413, 0, NULL, NULL},
+{12495, 12497, 0, NULL, NULL},
+{12498, 12500, 0, NULL, NULL},
+{12501, 12503, 0, NULL, NULL},
+{12504, 12506, 0, NULL, NULL},
+{12507, 12509, 0, NULL, NULL}
+}; /* compose_tab_60 */ 
+static int hash_compose_tab[122] = 
+{30,31,52,60,32,-1,-1,33,-1,34,35,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,-1,5,6,7,8,9,10,11,12,36,13,37,14,
+ 38,15,16,55,40,-1,-1,-1,-1,17,56,-1,-1,-1,-1,-1,41,18,19,20,42,21,22,-1,45,
+ 39,-1,23,24,-1,25,26,-1,-1,-1,-1,-1,-1,-1,-1,48,-1,43,44,51,53,-1,-1,27,46,
+ 54,28,-1,-1,47,-1,-1,-1,-1,49,50,-1,-1,57,-1,58,59,29}; /* hash_compose_tab */ 
+static CompEntry compose_tab[] = {
+{768, 0, 39, compose_tab_0, hash_compose_tab_0},
+{769, 0, 70, compose_tab_1, hash_compose_tab_1},
+{770, 0, 27, compose_tab_2, hash_compose_tab_2},
+{771, 0, 19, compose_tab_3, hash_compose_tab_3},
+{772, 0, 28, compose_tab_4, hash_compose_tab_4},
+{774, 0, 30, compose_tab_5, hash_compose_tab_5},
+{775, 0, 40, compose_tab_6, hash_compose_tab_6},
+{776, 0, 50, compose_tab_7, hash_compose_tab_7},
+{777, 0, 15, compose_tab_8, hash_compose_tab_8},
+{778, 0, 6, compose_tab_9, hash_compose_tab_9},
+{779, 0, 6, compose_tab_10, hash_compose_tab_10},
+{780, 0, 34, compose_tab_11, hash_compose_tab_11},
+{781, 0, 17, compose_tab_12, hash_compose_tab_12},
+{783, 0, 14, compose_tab_13, hash_compose_tab_13},
+{785, 0, 12, compose_tab_14, hash_compose_tab_14},
+{787, 0, 15, compose_tab_15, hash_compose_tab_15},
+{788, 0, 17, compose_tab_16, hash_compose_tab_16},
+{795, 0, 4, compose_tab_17, hash_compose_tab_17},
+{803, 0, 39, compose_tab_18, hash_compose_tab_18},
+{804, 0, 2, compose_tab_19, hash_compose_tab_19},
+{805, 0, 2, compose_tab_20, hash_compose_tab_20},
+{807, 0, 20, compose_tab_21, hash_compose_tab_21},
+{808, 0, 10, compose_tab_22, hash_compose_tab_22},
+{813, 0, 12, compose_tab_23, hash_compose_tab_23},
+{814, 0, 2, compose_tab_24, hash_compose_tab_24},
+{816, 0, 6, compose_tab_25, hash_compose_tab_25},
+{817, 0, 17, compose_tab_26, hash_compose_tab_26},
+{834, 0, 12, compose_tab_27, hash_compose_tab_27},
+{837, 0, 6, compose_tab_28, hash_compose_tab_28},
+{1463, 0, 2, compose_tab_29, hash_compose_tab_29},
+{1464, 0, 1, compose_tab_30, hash_compose_tab_30},
+{1465, 0, 1, compose_tab_31, hash_compose_tab_31},
+{1468, 0, 22, compose_tab_32, hash_compose_tab_32},
+{1471, 0, 3, compose_tab_33, hash_compose_tab_33},
+{1473, 0, 2, compose_tab_34, hash_compose_tab_34},
+{1474, 0, 2, compose_tab_35, hash_compose_tab_35},
+{2364, 0, 11, compose_tab_36, hash_compose_tab_36},
+{2492, 0, 4, compose_tab_37, hash_compose_tab_37},
+{2494, 0, 1, compose_tab_38, hash_compose_tab_38},
+{2519, 0, 1, compose_tab_39, hash_compose_tab_39},
+{2620, 0, 5, compose_tab_40, hash_compose_tab_40},
+{2876, 0, 3, compose_tab_41, hash_compose_tab_41},
+{2878, 0, 1, compose_tab_42, hash_compose_tab_42},
+{2902, 0, 1, compose_tab_43, hash_compose_tab_43},
+{2903, 0, 1, compose_tab_44, hash_compose_tab_44},
+{3006, 0, 2, compose_tab_45, hash_compose_tab_45},
+{3031, 0, 2, compose_tab_46, hash_compose_tab_46},
+{3158, 0, 1, compose_tab_47, hash_compose_tab_47},
+{3266, 0, 1, compose_tab_48, hash_compose_tab_48},
+{3285, 0, 3, compose_tab_49, hash_compose_tab_49},
+{3286, 0, 1, compose_tab_50, hash_compose_tab_50},
+{3390, 0, 2, compose_tab_51, hash_compose_tab_51},
+{3415, 0, 1, compose_tab_52, hash_compose_tab_52},
+{3634, 0, 1, compose_tab_53, hash_compose_tab_53},
+{3762, 0, 1, compose_tab_54, hash_compose_tab_54},
+{3953, 0, 3, compose_tab_55, hash_compose_tab_55},
+{3968, 0, 2, compose_tab_56, hash_compose_tab_56},
+{4021, 0, 2, compose_tab_57, hash_compose_tab_57},
+{4023, 0, 10, compose_tab_58, hash_compose_tab_58},
+{12441, 0, 48, compose_tab_59, hash_compose_tab_59},
+{12442, 0, 10, compose_tab_60, hash_compose_tab_60}
+}; /* compose_tab */ 
+#define COMP_CANDIDATE_MAP_OFFSET 24
+static Uint32 comp_candidate_map[] = {
+    0x081ABFDFU,
+    0x000361B8U,
+    0x00000024U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x93800000U,
+    0x00000006U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x10000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x50000000U,
+    0x00800000U,
+    0x00000000U,
+    0x00000000U,
+    0x10000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x50000000U,
+    0x00C00000U,
+    0x00000000U,
+    0x00000000U,
+    0x40000000U,
+    0x00800000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00400000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00600004U,
+    0x00000000U,
+    0x00000000U,
+    0x40000000U,
+    0x00800000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00040000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00040000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00000000U,
+    0x00020000U,
+    0x00000001U,
+    0x00A00000U
+};
diff --git a/erts/emulator/beam/erl_vm.h b/erts/emulator/beam/erl_vm.h
index cd63401581..e7fd144ec3 100644
--- a/erts/emulator/beam/erl_vm.h
+++ b/erts/emulator/beam/erl_vm.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -47,7 +47,7 @@
 #define SEQ_TRACE 1
 
 #define CONTEXT_REDS 2000	/* Swap process out after this number */
-#define MAX_ARG 256	        /* Max number of arguments allowed */
+#define MAX_ARG 255	        /* Max number of arguments allowed */
 #define MAX_REG 1024            /* Max number of x(N) registers used */
 
 /* Scheduler stores data for temporary heaps if
@@ -120,14 +120,15 @@
  * Allocate heap memory, first on the ordinary heap;
  * failing that, in a heap fragment.
  */
-#define HAlloc(p, sz)			                              \
+#define HAllocX(p, sz, xtra)		                              \
     (ASSERT_EXPR((sz) >= 0),					      \
      ErtsHAllocLockCheck(p),					      \
      (IS_FORCE_HEAP_FRAGS || (((HEAP_LIMIT(p) - HEAP_TOP(p)) < (sz))) \
-      ? erts_heap_alloc((p),(sz))                                     \
+      ? erts_heap_alloc((p),(sz),(xtra))                              \
       : (INIT_HEAP_MEM(p,sz),		                              \
          HEAP_TOP(p) = HEAP_TOP(p) + (sz), HEAP_TOP(p) - (sz))))
 
+#define HAlloc(P, SZ) HAllocX(P,SZ,0)
 
 #define HRelease(p, endp, ptr)					\
   if ((ptr) == (endp)) {					\
@@ -199,6 +200,7 @@ extern int BIN_VH_MIN_SIZE;	/* minimum virtual (bin) heap */
 extern int erts_atom_table_size;/* Atom table size */
 
 #define ORIG_CREATION 0
+#define INTERNAL_CREATION 255
 
 /* macros for extracting bytes from uint16's */
 
diff --git a/erts/emulator/beam/export.c b/erts/emulator/beam/export.c
index 66b05c0e9d..5bc402fe22 100644
--- a/erts/emulator/beam/export.c
+++ b/erts/emulator/beam/export.c
@@ -43,8 +43,6 @@ static erts_smp_rwmtx_t export_table_lock; /* Locks the secondary export table.
 #define export_read_unlock()	erts_smp_rwmtx_runlock(&export_table_lock)
 #define export_write_lock()	erts_smp_rwmtx_rwlock(&export_table_lock)
 #define export_write_unlock()	erts_smp_rwmtx_rwunlock(&export_table_lock)
-#define export_init_lock()	erts_smp_rwmtx_init(&export_table_lock, \
-						    "export_tab")
 
 extern BeamInstr* em_call_error_handler;
 extern BeamInstr* em_call_traced_function;
@@ -111,8 +109,12 @@ void
 init_export_table(void)
 {
     HashFunctions f;
+    erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER;
+    rwmtx_opt.type = ERTS_SMP_RWMTX_TYPE_FREQUENT_READ;
+    rwmtx_opt.lived = ERTS_SMP_RWMTX_LONG_LIVED;
+
+    erts_smp_rwmtx_init_opt(&export_table_lock, &rwmtx_opt, "export_tab");
 
-    export_init_lock();
     f.hash = (H_FUN) export_hash;
     f.cmp  = (HCMP_FUN) export_cmp;
     f.alloc = (HALLOC_FUN) export_alloc;
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index f41b61d73d..328aa2be6a 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -49,10 +49,8 @@
 #define in_area(ptr,start,nbytes) ((Uint)((char*)(ptr) - (char*)(start)) < (nbytes))
 
 #define MAX_STRING_LEN 0xffff
-#define dec_set_creation(nodename,creat)				\
-  (((nodename) == erts_this_node->sysname && (creat) == ORIG_CREATION)	\
-   ? erts_this_node->creation						\
-   : (creat))
+
+#define is_valid_creation(Cre) ((unsigned)(Cre) < MAX_CREATION || (Cre) == INTERNAL_CREATION)
 
 #undef ERTS_DEBUG_USE_DIST_SEP
 #ifdef DEBUG
@@ -65,11 +63,9 @@
 #  endif
 #endif
 
-/*
- * For backward compatibility reasons, only encode integers that
- * fit in 28 bits (signed) using INTEGER_EXT.
+/* Does Sint fit in Sint32?
  */
-#define IS_SSMALL28(x) (((Uint) (((x) >> (28-1)) + 1)) < 2)
+#define IS_SSMALL32(x) (((Uint) (((x) >> (32-1)) + 1)) < 2)
 
 /*
  *   Valid creations for nodes are 1, 2, or 3. 0 can also be sent
@@ -85,14 +81,14 @@
  *
  */
 
-static byte* enc_term(ErtsAtomCacheMap *, Eterm, byte*, Uint32);
+static byte* enc_term(ErtsAtomCacheMap *, Eterm, byte*, Uint32, struct erl_off_heap_header** off_heap);
 static Uint is_external_string(Eterm obj, int* p_is_string);
 static byte* enc_atom(ErtsAtomCacheMap *, Eterm, byte*, Uint32);
 static byte* enc_pid(ErtsAtomCacheMap *, Eterm, byte*, Uint32);
 static byte* dec_term(ErtsDistExternal *, Eterm**, byte*, ErlOffHeap*, Eterm*);
 static byte* dec_atom(ErtsDistExternal *, byte*, Eterm*);
 static byte* dec_pid(ErtsDistExternal *, Eterm**, byte*, ErlOffHeap*, Eterm*);
-static Sint decoded_size(byte *ep, byte* endp, int only_heap_bins);
+static Sint decoded_size(byte *ep, byte* endp, int only_heap_bins, int internal_tags);
 
 
 static Uint encode_size_struct2(ErtsAtomCacheMap *, Eterm, unsigned);
@@ -463,6 +459,12 @@ Uint erts_encode_ext_size(Eterm term)
 	+ 1 /* VERSION_MAGIC */;
 }
 
+Uint erts_encode_ext_size_ets(Eterm term)
+{
+    return encode_size_struct2(NULL, term, TERM_TO_BINARY_DFLAGS|DFLAGS_INTERNAL_TAGS);
+}
+
+
 void erts_encode_dist_ext(Eterm term, byte **ext, Uint32 flags, ErtsAtomCacheMap *acmp)
 {
     byte *ep = *ext;
@@ -470,7 +472,7 @@ void erts_encode_dist_ext(Eterm term, byte **ext, Uint32 flags, ErtsAtomCacheMap
     if (!(flags & DFLAG_DIST_HDR_ATOM_CACHE))
 #endif
 	*ep++ = VERSION_MAGIC;
-    ep = enc_term(acmp, term, ep, flags);
+    ep = enc_term(acmp, term, ep, flags, NULL);
     if (!ep)
 	erl_exit(ERTS_ABORT_EXIT,
 		 "%s:%d:erts_encode_dist_ext(): Internal data structure error\n",
@@ -482,7 +484,7 @@ void erts_encode_ext(Eterm term, byte **ext)
 {
     byte *ep = *ext;
     *ep++ = VERSION_MAGIC;
-    ep = enc_term(NULL, term, ep, TERM_TO_BINARY_DFLAGS);
+    ep = enc_term(NULL, term, ep, TERM_TO_BINARY_DFLAGS, NULL);
     if (!ep)
 	erl_exit(ERTS_ABORT_EXIT,
 		 "%s:%d:erts_encode_ext(): Internal data structure error\n",
@@ -490,6 +492,12 @@ void erts_encode_ext(Eterm term, byte **ext)
     *ext = ep;
 }
 
+byte* erts_encode_ext_ets(Eterm term, byte *ep, struct erl_off_heap_header** off_heap)
+{
+    return enc_term(NULL, term, ep, TERM_TO_BINARY_DFLAGS|DFLAGS_INTERNAL_TAGS,
+		    off_heap);
+}
+
 ErtsDistExternal *
 erts_make_dist_ext_copy(ErtsDistExternal *edep, Uint xsize)
 {
@@ -504,7 +512,7 @@ erts_make_dist_ext_copy(ErtsDistExternal *edep, Uint xsize)
     ASSERT(edep->ext_endp >= edep->extp);
     ext_sz = edep->ext_endp - edep->extp;
 
-    align_sz = ERTS_WORD_ALIGN_PAD_SZ(dist_ext_sz + ext_sz);
+    align_sz = ERTS_EXTRA_DATA_ALIGN_SZ(dist_ext_sz + ext_sz);
 
     new_edep = erts_alloc(ERTS_ALC_T_EXT_TERM_DATA,
 			  dist_ext_sz + ext_sz + align_sz + xsize);
@@ -815,7 +823,7 @@ erts_decode_dist_ext_size(ErtsDistExternal *edep, int no_refc_bins)
 	    goto fail;
 	ep = edep->extp+1;
     }
-    res = decoded_size(ep, edep->ext_endp, no_refc_bins);
+    res = decoded_size(ep, edep->ext_endp, no_refc_bins, 0);
     if (res >= 0)
 	return res;
  fail:
@@ -827,9 +835,17 @@ Sint erts_decode_ext_size(byte *ext, Uint size, int no_refc_bins)
 {
     if (size == 0 || *ext != VERSION_MAGIC)
 	return -1;
-    return decoded_size(ext+1, ext+size, no_refc_bins);
+    return decoded_size(ext+1, ext+size, no_refc_bins, 0);
 }
 
+Sint erts_decode_ext_size_ets(byte *ext, Uint size)
+{
+    Sint sz = decoded_size(ext, ext+size, 0, 1);
+    ASSERT(sz >= 0);
+    return sz;
+}
+
+
 /*
 ** hpp is set to either a &p->htop or
 ** a pointer to a memory pointer (form message buffers)
@@ -889,7 +905,13 @@ Eterm erts_decode_ext(Eterm **hpp, ErlOffHeap *off_heap, byte **ext)
     return obj;
 }
 
-
+Eterm erts_decode_ext_ets(Eterm **hpp, ErlOffHeap *off_heap, byte *ext)
+{
+    Eterm obj;
+    ext = dec_term(NULL, hpp, ext, off_heap, &obj);
+    ASSERT(ext);
+    return obj;
+}
 
 /**********************************************************************/
 
@@ -966,6 +988,7 @@ term_to_binary_1(Process* p, Eterm Term)
     return erts_term_to_binary(p, Term, 0, TERM_TO_BINARY_DFLAGS);
 }
 
+
 Eterm
 term_to_binary_2(Process* p, Eterm Term, Eterm Flags)
 {
@@ -1077,7 +1100,7 @@ binary2term_prepare(ErtsBinary2TermState *state, byte *data, Sint data_size)
 	    goto error;
 	size = (Sint) dest_len;
     }
-    res = decoded_size(state->extp, state->extp + size, 0);
+    res = decoded_size(state->extp, state->extp + size, 0, 0);
     if (res < 0)
 	goto error;
     return res;
@@ -1185,7 +1208,8 @@ BIF_RETTYPE binary_to_term_2(BIF_ALIST_2)
         opt = CAR(list_val(opts));
         if (opt == am_safe) {
 	    fakedep.flags |= ERTS_DIST_EXT_BTT_SAFE;
-        } else {
+        }
+	else {
             goto error;
         }
         opts = CDR(list_val(opts));
@@ -1257,7 +1281,7 @@ erts_term_to_binary(Process* p, Eterm Term, int level, Uint flags)
 	    bytes = erts_alloc(ERTS_ALC_T_TMP, size);
 	}
 
-	if ((endp = enc_term(NULL, Term, bytes, flags))
+	if ((endp = enc_term(NULL, Term, bytes, flags, NULL))
 	    == NULL) {
 	    erl_exit(1, "%s, line %d: bad term: %x\n",
 		     __FILE__, __LINE__, Term);
@@ -1302,7 +1326,7 @@ erts_term_to_binary(Process* p, Eterm Term, int level, Uint flags)
 	bin = new_binary(p, (byte *)NULL, size);
 	bytes = binary_bytes(bin);
 	bytes[0] = VERSION_MAGIC;
-	if ((endp = enc_term(NULL, Term, bytes+1, flags))	
+	if ((endp = enc_term(NULL, Term, bytes+1, flags, NULL))
 	    == NULL) {
 	    erl_exit(1, "%s, line %d: bad term: %x\n",
 		     __FILE__, __LINE__, Term);
@@ -1332,6 +1356,21 @@ enc_atom(ErtsAtomCacheMap *acmp, Eterm atom, byte *ep, Uint32 dflags)
 
     ASSERT(is_atom(atom));
 
+    if (dflags & DFLAGS_INTERNAL_TAGS) {
+	Uint aval = atom_val(atom);
+	ASSERT(aval < (1<<24));
+	if (aval >= (1 << 16)) {
+	    *ep++ = ATOM_INTERNAL_REF3;
+	    put_int24(aval, ep);
+	    ep += 3;
+	}
+	else {
+	    *ep++ = ATOM_INTERNAL_REF2;
+	    put_int16(aval, ep);
+	    ep += 2;
+	}
+	return ep;
+    }
     /*
      * term_to_binary/1,2 and the initial distribution message
      * don't use the cache.
@@ -1381,7 +1420,8 @@ enc_pid(ErtsAtomCacheMap *acmp, Eterm pid, byte* ep, Uint32 dflags)
     ep += 4;
     put_int32(os, ep);
     ep += 4;
-    *ep++ = pid_creation(pid);
+    *ep++ = (is_internal_pid(pid) && (dflags & DFLAGS_INTERNAL_TAGS)) ?
+	INTERNAL_CREATION : pid_creation(pid);
     return ep;
 }
 
@@ -1420,6 +1460,23 @@ dec_atom(ErtsDistExternal *edep, byte* ep, Eterm* objp)
         }
 	ep += len;
 	break;
+    case ATOM_INTERNAL_REF2:
+	n = get_int16(ep);
+	ep += 2;
+	if (n >= atom_table_size()) {
+	    goto error;
+	}
+	*objp = make_atom(n);
+	break;
+    case ATOM_INTERNAL_REF3:
+	n = get_int24(ep);
+	ep += 3;
+	if (n >= atom_table_size()) {
+	    goto error;
+	}
+	*objp = make_atom(n);
+	break;
+
     default:
     error:
 	*objp = NIL;	/* Don't leave a hole in the heap */
@@ -1428,6 +1485,19 @@ dec_atom(ErtsDistExternal *edep, byte* ep, Eterm* objp)
     return ep;
 }
 
+static ERTS_INLINE ErlNode* dec_get_node(Eterm sysname, Uint creation)
+{
+    switch (creation) {
+    case INTERNAL_CREATION:
+	return erts_this_node;
+    case ORIG_CREATION:
+	if (sysname == erts_this_node->sysname) {
+	    creation = erts_this_node->creation;
+	}
+    }
+    return erts_find_or_insert_node(sysname,creation);
+}
+
 static byte*
 dec_pid(ErtsDistExternal *edep, Eterm** hpp, byte* ep, ErlOffHeap* off_heap, Eterm* objp)
 {
@@ -1451,18 +1521,20 @@ dec_pid(ErtsDistExternal *edep, Eterm** hpp, byte* ep, ErlOffHeap* off_heap, Ete
     ep += 4;
     if (ser > ERTS_MAX_PID_SERIAL)
 	return NULL;
-    if ((cre = get_int8(ep)) >= MAX_CREATION)
-	return NULL;
+    cre = get_int8(ep);
     ep += 1;
 
+    if (!is_valid_creation(cre)) {
+	return NULL;
+    }
+    data = make_pid_data(ser, num);
+
     /*
      * We are careful to create the node entry only after all
      * validity tests are done.
      */
-    cre = dec_set_creation(sysname,cre);
-    node = erts_find_or_insert_node(sysname,cre);
+    node = dec_get_node(sysname, cre);
 
-    data = make_pid_data(ser, num);
     if(node == erts_this_node) {
 	*objp = make_internal_pid(data);
     } else {
@@ -1470,11 +1542,11 @@ dec_pid(ErtsDistExternal *edep, Eterm** hpp, byte* ep, ErlOffHeap* off_heap, Ete
 	*hpp += EXTERNAL_THING_HEAD_SIZE + 1;
 
 	etp->header = make_external_pid_header(1);
-	etp->next = off_heap->externals;
+	etp->next = off_heap->first;
 	etp->node = node;
 	etp->data.ui[0] = data;
 
-	off_heap->externals = etp;
+	off_heap->first = (struct erl_off_heap_header*) etp;
 	*objp = make_external_pid(etp);
     }
     return ep;
@@ -1487,7 +1559,8 @@ dec_pid(ErtsDistExternal *edep, Eterm** hpp, byte* ep, ErlOffHeap* off_heap, Ete
 #define ENC_LAST_ARRAY_ELEMENT ((Eterm) 3)
 
 static byte*
-enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags)
+enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags,
+	 struct erl_off_heap_header** off_heap)
 {
     DECLARE_WSTACK(s);
     Uint n;
@@ -1571,13 +1644,15 @@ enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags)
 
 	case SMALL_DEF:
 	    {
+		/* From R14B we no longer restrict INTEGER_EXT to 28 bits,
+		 * as done earlier for backward compatibility reasons. */
 		Sint val = signed_val(obj);
 
 		if ((Uint)val < 256) {
 		    *ep++ = SMALL_INTEGER_EXT;
 		    put_int8(val, ep);
 		    ep++;
-		} else if (sizeof(Sint) == 4 || IS_SSMALL28(val)) {
+		} else if (sizeof(Sint) == 4 || IS_SSMALL32(val)) {
 		    *ep++ = INTEGER_EXT;
 		    put_int32(val, ep);
 		    ep += 4;
@@ -1599,18 +1674,32 @@ enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags)
 	    break;
 
 	case BIG_DEF:
-	    if ((n = big_bytes(obj)) < 256) {
-		*ep++ = SMALL_BIG_EXT;
-		put_int8(n, ep);
-		ep += 1;
-	    }
-	    else {
-		*ep++ = LARGE_BIG_EXT;
-		put_int32(n, ep);
-		ep += 4;
+	    {
+		int sign = big_sign(obj);
+		n = big_bytes(obj);
+		if (sizeof(Sint)==4 && n<=4) {
+		    Uint dig = big_digit(obj,0);		   
+		    Sint val = sign ? -dig : dig;
+		    if ((val<0) == sign) {
+			*ep++ = INTEGER_EXT;
+			put_int32(val, ep);
+			ep += 4;
+			break;
+		    }
+		}
+		if (n < 256) {
+		    *ep++ = SMALL_BIG_EXT;
+		    put_int8(n, ep);
+		    ep += 1;
+		}
+		else {
+		    *ep++ = LARGE_BIG_EXT;
+		    put_int32(n, ep);
+		    ep += 4;
+		}
+		*ep++ = sign;
+		ep = big_to_bytes(obj, ep);
 	    }
-	    *ep++ = big_sign(obj);
-	    ep = big_to_bytes(obj, ep);
 	    break;
 
 	case PID_DEF:
@@ -1623,12 +1712,14 @@ enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags)
 	    Uint32 *ref_num;
 
 	    ASSERT(dflags & DFLAG_EXTENDED_REFERENCES);
+
 	    *ep++ = NEW_REFERENCE_EXT;
 	    i = ref_no_of_numbers(obj);
 	    put_int16(i, ep);
 	    ep += 2;
 	    ep = enc_atom(acmp,ref_node_name(obj),ep,dflags);
-	    *ep++ = ref_creation(obj);
+	    *ep++ = ((dflags & DFLAGS_INTERNAL_TAGS) && is_internal_ref(obj)) ?
+		INTERNAL_CREATION : ref_creation(obj);
 	    ref_num = ref_numbers(obj);
 	    for (j = 0; j < i; j++) {
 		put_int32(ref_num[j], ep);
@@ -1644,7 +1735,8 @@ enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags)
 	    j = port_number(obj);
 	    put_int32(j, ep);
 	    ep += 4;
-	    *ep++ = port_creation(obj);
+	    *ep++ = ((dflags & DFLAGS_INTERNAL_TAGS) && is_internal_port(obj)) ?
+		INTERNAL_CREATION : port_creation(obj);
 	    break;
 
 	case LIST_DEF:
@@ -1724,6 +1816,41 @@ enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags)
 		byte* bytes;
 
 		ERTS_GET_BINARY_BYTES(obj, bytes, bitoffs, bitsize);
+		if (dflags & DFLAGS_INTERNAL_TAGS) {
+		    ProcBin* pb = (ProcBin*) binary_val(obj);
+		    Uint bytesize = pb->size;
+		    if (pb->thing_word == HEADER_SUB_BIN) {
+			ErlSubBin* sub = (ErlSubBin*)pb;
+			pb = (ProcBin*) binary_val(sub->orig);
+			ASSERT(bytesize == sub->size);
+			bytesize += (bitoffs + bitsize + 7) / 8;
+		    }
+		    if (pb->thing_word == HEADER_PROC_BIN
+			&& heap_bin_size(bytesize) > PROC_BIN_SIZE) {
+			ProcBin tmp;
+			if (bitoffs || bitsize) {
+			    *ep++ = BIT_BINARY_INTERNAL_REF;
+			    *ep++ = bitoffs;
+			    *ep++ = bitsize;
+			}
+			else {
+			    *ep++ = BINARY_INTERNAL_REF;
+			}
+			if (pb->flags) {
+			    erts_emasculate_writable_binary(pb);
+			}
+			erts_refc_inc(&pb->val->refc, 2);
+
+			sys_memcpy(&tmp, pb, sizeof(ProcBin));
+			tmp.next = *off_heap;
+			tmp.bytes = bytes;
+			tmp.size = bytesize;
+			sys_memcpy(ep, &tmp, sizeof(ProcBin));
+			*off_heap = (struct erl_off_heap_header*) ep;
+			ep += sizeof(ProcBin);
+			break;
+		    }
+		}
 		if (bitsize == 0) {
 		    /* Plain old byte-sized binary. */
 		    *ep++ = BINARY_EXT;
@@ -1759,8 +1886,8 @@ enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags)
 		    *ep++ = SMALL_INTEGER_EXT;
 		    *ep++ = bitsize;
 		}
-		break;
 	    }
+	    break;
 	case EXPORT_DEF:
 	    {
 		Export* exp = *((Export **) (export_val(obj) + 1));
@@ -1768,7 +1895,7 @@ enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags)
 		    *ep++ = EXPORT_EXT;
 		    ep = enc_atom(acmp, exp->code[0], ep, dflags);
 		    ep = enc_atom(acmp, exp->code[1], ep, dflags);
-		    ep = enc_term(acmp, make_small(exp->code[2]), ep, dflags);
+		    ep = enc_term(acmp, make_small(exp->code[2]), ep, dflags, off_heap);
 		} else {
 		    /* Tag, arity */
 		    *ep++ = SMALL_TUPLE_EXT;
@@ -1804,8 +1931,8 @@ enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags)
 		    put_int32(funp->num_free, ep);
 		    ep += 4;
 		    ep = enc_atom(acmp, funp->fe->module, ep, dflags);
-		    ep = enc_term(acmp, make_small(funp->fe->old_index), ep, dflags);
-		    ep = enc_term(acmp, make_small(funp->fe->old_uniq), ep, dflags);
+		    ep = enc_term(acmp, make_small(funp->fe->old_index), ep, dflags, off_heap);
+		    ep = enc_term(acmp, make_small(funp->fe->old_uniq), ep, dflags, off_heap);
 		    ep = enc_pid(acmp, funp->creator, ep, dflags);
 
 		fun_env:
@@ -1858,7 +1985,8 @@ enc_term(ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags)
     return ep;
 }
 
-static Uint
+static
+Uint
 is_external_string(Eterm list, int* p_is_string)
 {
     Uint len = 0;
@@ -1896,69 +2024,30 @@ is_external_string(Eterm list, int* p_is_string)
     return len;
 }
 
-/* Assumes that the ones to undo are preluding the lists. */ 
+/* Assumes that the ones to undo are preluding the list. */ 
 static void
 undo_offheap_in_area(ErlOffHeap* off_heap, Eterm* start, Eterm* end)
 {
     const Uint area_sz = (end - start) * sizeof(Eterm);
-    struct proc_bin* mso;
-    struct proc_bin** mso_nextp = NULL;
-#ifndef HYBRID /* FIND ME! */
-    struct erl_fun_thing* funs;
-    struct erl_fun_thing** funs_nextp = NULL;
-#endif
-    struct external_thing_* ext;
-    struct external_thing_** ext_nextp = NULL;
-
-    for (mso = off_heap->mso; ; mso=mso->next) {
-	if (!in_area(mso, start, area_sz)) {
-	    if (mso_nextp != NULL) {
-		*mso_nextp = NULL;
-		erts_cleanup_mso(off_heap->mso);
-		off_heap->mso = mso;
-	    }
-	    break;
-	}
-	mso_nextp = &mso->next;
-    }    
-
-#ifndef HYBRID /* FIND ME! */
-    for (funs = off_heap->funs; ; funs=funs->next) {
-	if (!in_area(funs, start, area_sz)) {
-	    if (funs_nextp != NULL) {
-		*funs_nextp = NULL;
-		erts_cleanup_funs(off_heap->funs);
-		off_heap->funs = funs;
+    struct erl_off_heap_header* hdr;
+    struct erl_off_heap_header** hdr_nextp = NULL;
+
+    for (hdr = off_heap->first; ; hdr=hdr->next) {
+	if (!in_area(hdr, start, area_sz)) {
+	    if (hdr_nextp != NULL) {
+		*hdr_nextp = NULL;
+		erts_cleanup_offheap(off_heap);
+		off_heap->first = hdr;
 	    }
 	    break;
 	}
-	funs_nextp = &funs->next;
+	hdr_nextp = &hdr->next;
     }    
-#endif
-    for (ext = off_heap->externals; ; ext=ext->next) {
-	if (!in_area(ext, start, area_sz)) {
-	    if (ext_nextp != NULL) {
-		*ext_nextp = NULL;
-		erts_cleanup_externals(off_heap->externals);
-		off_heap->externals = ext;
-	    }
-	    break;
-	}
-	ext_nextp = &ext->next;
-    }
 
-    /* Assert that the ones to undo were indeed preluding the lists. */ 
+    /* Assert that the ones to undo were indeed preluding the list. */ 
 #ifdef DEBUG
-    for (mso = off_heap->mso; mso != NULL; mso=mso->next) {
-	ASSERT(!in_area(mso, start, area_sz));
-    }    
-# ifndef HYBRID /* FIND ME! */
-    for (funs = off_heap->funs; funs != NULL; funs=funs->next) {
-	ASSERT(!in_area(funs, start, area_sz));
-    }    
-# endif
-    for (ext = off_heap->externals; ext != NULL; ext=ext->next) {
-	ASSERT(!in_area(ext, start, area_sz));
+    for (hdr = off_heap->first; hdr != NULL; hdr = hdr->next) {
+	ASSERT(!in_area(hdr, start, area_sz));
     }    
 #endif /* DEBUG */
 }
@@ -2187,13 +2276,13 @@ dec_term_atom_common:
 		    goto error;
 		}
 		ep += 4;
-		if ((cre = get_int8(ep)) >= MAX_CREATION) {
+		cre = get_int8(ep);
+		ep++;
+		if (!is_valid_creation(cre)) {
 		    goto error;
 		}
-		ep++;
-		cre = dec_set_creation(sysname,cre);
-		node = erts_find_or_insert_node(sysname, cre);
 
+		node = dec_get_node(sysname, cre);
 		if(node == erts_this_node) {
 		    *objp = make_internal_port(num);
 		}
@@ -2202,11 +2291,11 @@ dec_term_atom_common:
 		    hp += EXTERNAL_THING_HEAD_SIZE + 1;
 		    
 		    etp->header = make_external_port_header(1);
-		    etp->next = off_heap->externals;
+		    etp->next = off_heap->first;
 		    etp->node = node;
 		    etp->data.ui[0] = num;
 
-		    off_heap->externals = etp;
+		    off_heap->first = (struct erl_off_heap_header*)etp;
 		    *objp = make_external_port(etp);
 		}
 
@@ -2230,9 +2319,11 @@ dec_term_atom_common:
 		    goto error;
 		ep += 4;
 
-		if ((cre = get_int8(ep)) >= MAX_CREATION)
-		    goto error;
+		cre = get_int8(ep);
 		ep += 1;
+		if (!is_valid_creation(cre)) {
+		    goto error;
+		}
 		goto ref_ext_common;
 
 	    case NEW_REFERENCE_EXT:
@@ -2245,10 +2336,11 @@ dec_term_atom_common:
 		if ((ep = dec_atom(edep, ep, &sysname)) == NULL)
 		    goto error;
 
-		if ((cre = get_int8(ep)) >= MAX_CREATION)
-		    goto error;
+		cre = get_int8(ep);
 		ep += 1;
-
+		if (!is_valid_creation(cre)) {
+		    goto error;
+		}
 		r0 = get_int32(ep);
 		ep += 4;
 		if (r0 >= MAX_REFERENCE)
@@ -2256,8 +2348,7 @@ dec_term_atom_common:
 
 	    ref_ext_common:
 
-		cre = dec_set_creation(sysname, cre);
-		node = erts_find_or_insert_node(sysname, cre);
+		node = dec_get_node(sysname, cre);
 		if(node == erts_this_node) {
 		    RefThing *rtp = (RefThing *) hp;
 		    ref_num = (Uint32 *) (hp + REF_THING_HEAD_SIZE);
@@ -2284,10 +2375,10 @@ dec_term_atom_common:
 #else
 		    etp->header = make_external_ref_header(ref_words);
 #endif
-		    etp->next = off_heap->externals;
+		    etp->next = off_heap->first;
 		    etp->node = node;
 
-		    off_heap->externals = etp;
+		    off_heap->first = (struct erl_off_heap_header*)etp;
 		    *objp = make_external_ref(etp);
 		    ref_num = &(etp->data.ui32[0]);
 		}
@@ -2330,8 +2421,8 @@ dec_term_atom_common:
 		    hp += PROC_BIN_SIZE;
 		    pb->thing_word = HEADER_PROC_BIN;
 		    pb->size = n;
-		    pb->next = off_heap->mso;
-		    off_heap->mso = pb;
+		    pb->next = off_heap->first;
+		    off_heap->first = (struct erl_off_heap_header*)pb;
 		    pb->val = dbin;
 		    pb->bytes = (byte*) dbin->orig_bytes;
 		    pb->flags = 0;
@@ -2367,8 +2458,8 @@ dec_term_atom_common:
 		    pb = (ProcBin *) hp;
 		    pb->thing_word = HEADER_PROC_BIN;
 		    pb->size = n;
-		    pb->next = off_heap->mso;
-		    off_heap->mso = pb;
+		    pb->next = off_heap->first;
+		    off_heap->first = (struct erl_off_heap_header*)pb;
 		    pb->val = dbin;
 		    pb->bytes = (byte*) dbin->orig_bytes;
 		    pb->flags = 0;
@@ -2488,8 +2579,8 @@ dec_term_atom_common:
 		 * It is safe to link the fun into the fun list only when
 		 * no more validity tests can fail.
 		 */
-		funp->next = off_heap->funs;
-		off_heap->funs = funp;
+		funp->next = off_heap->first;
+		off_heap->first = (struct erl_off_heap_header*)funp;
 #endif
 
 		funp->fe = erts_put_fun_entry2(module, old_uniq, old_index,
@@ -2566,8 +2657,8 @@ dec_term_atom_common:
 		 * It is safe to link the fun into the fun list only when
 		 * no more validity tests can fail.
 		 */
-		funp->next = off_heap->funs;
-		off_heap->funs = funp;
+		funp->next = off_heap->first;
+		off_heap->first = (struct erl_off_heap_header*)funp;
 #endif
 		old_uniq = unsigned_val(temp);
 
@@ -2585,6 +2676,66 @@ dec_term_atom_common:
 		}
 		break;
 	    }
+	case ATOM_INTERNAL_REF2:
+	    n = get_int16(ep);
+	    ep += 2;
+	    if (n >= atom_table_size()) {
+		goto error;
+	    }
+	    *objp = make_atom(n);
+	    break;
+	case ATOM_INTERNAL_REF3:
+	    n = get_int24(ep);
+	    ep += 3;
+	    if (n >= atom_table_size()) {
+		goto error;
+	    }
+	    *objp = make_atom(n);
+	    break;
+
+	case BINARY_INTERNAL_REF:
+	    {
+		ProcBin* pb = (ProcBin*) hp;
+		sys_memcpy(pb, ep, sizeof(ProcBin));
+		ep += sizeof(ProcBin);
+
+		erts_refc_inc(&pb->val->refc, 1);
+		hp += PROC_BIN_SIZE;
+		pb->next = off_heap->first;
+		off_heap->first = (struct erl_off_heap_header*)pb;
+		pb->flags = 0;
+		*objp = make_binary(pb);
+		break;
+	    }
+	case BIT_BINARY_INTERNAL_REF:
+	    {
+		Sint bitoffs = *ep++;
+		Sint bitsize = *ep++;
+		ProcBin* pb = (ProcBin*) hp;
+		ErlSubBin* sub;
+		sys_memcpy(pb, ep, sizeof(ProcBin));
+		ep += sizeof(ProcBin);
+
+		erts_refc_inc(&pb->val->refc, 1);
+		hp += PROC_BIN_SIZE;
+		pb->next = off_heap->first;
+		off_heap->first = (struct erl_off_heap_header*)pb;
+		pb->flags = 0;
+
+		sub = (ErlSubBin*)hp;
+		sub->thing_word = HEADER_SUB_BIN;
+		sub->size = pb->size - (bitoffs + bitsize + 7)/8;
+		sub->offs = 0;
+		sub->bitoffs = bitoffs;
+		sub->bitsize = bitsize;
+		sub->is_writable = 0;
+		sub->orig = make_binary(pb);
+
+		hp += ERL_SUB_BIN_SIZE;
+		*objp = make_binary(sub);
+		break;
+	    }
+
 	default:
 	error:
 	    /* UNDO:
@@ -2667,27 +2818,36 @@ encode_size_struct2(ErtsAtomCacheMap *acmp, Eterm obj, unsigned dflags)
 	case NIL_DEF:
 	    result++;
 	    break;
-	case ATOM_DEF: {
-	    int alen = atom_tab(atom_val(obj))->len;
-	    if ((MAX_ATOM_LENGTH <= 255 || alen <= 255)
-		&& (dflags & DFLAG_SMALL_ATOM_TAGS)) {
-		/* Make sure a SMALL_ATOM_EXT fits: SMALL_ATOM_EXT l t1 t2... */
-		result += 1 + 1 + alen;
+	case ATOM_DEF:
+	    if (dflags & DFLAGS_INTERNAL_TAGS) {
+		if (atom_val(obj) >= (1<<16)) {
+		    result += 1 + 3;
+		}
+		else {
+		    result += 1 + 2;
+		}
 	    }
 	    else {
-		/* Make sure an ATOM_EXT fits: ATOM_EXT l1 l0 t1 t2... */
-		result += 1 + 2 + alen;
+		int alen = atom_tab(atom_val(obj))->len;
+		if ((MAX_ATOM_LENGTH <= 255 || alen <= 255)
+		    && (dflags & DFLAG_SMALL_ATOM_TAGS)) {
+		    /* Make sure a SMALL_ATOM_EXT fits: SMALL_ATOM_EXT l t1 t2... */
+			result += 1 + 1 + alen;
+		}
+		else {
+		    /* Make sure an ATOM_EXT fits: ATOM_EXT l1 l0 t1 t2... */
+			result += 1 + 2 + alen;
+		}
+		insert_acache_map(acmp, obj);
 	    }
-	    insert_acache_map(acmp, obj);
 	    break;
-	}
 	case SMALL_DEF:
 	    {
 		Sint val = signed_val(obj);
 
 		if ((Uint)val < 256)
 		    result += 1 + 1;		/* SMALL_INTEGER_EXT */
-		else if (sizeof(Sint) == 4 || IS_SSMALL28(val))
+		else if (sizeof(Sint) == 4 || IS_SSMALL32(val))
 		    result += 1 + 4;		/* INTEGER_EXT */
 		else {
 		    DeclareTmpHeapNoproc(tmp_big,2);
@@ -2699,7 +2859,10 @@ encode_size_struct2(ErtsAtomCacheMap *acmp, Eterm obj, unsigned dflags)
 	    }
 	    break;
 	case BIG_DEF:
-	    if ((i = big_bytes(obj)) < 256)
+	    i = big_bytes(obj);
+	    if (sizeof(Sint)==4 && i <= 4 && (big_digit(obj,0)-big_sign(obj)) < (1<<31))
+		result += 1 + 4;          /* INTEGER_EXT */
+	    else if (i < 256)
 		result += 1 + 1 + 1 + i;  /* tag,size,sign,digits */
 	    else
 		result += 1 + 4 + 1 + i;  /* tag,size,sign,digits */
@@ -2756,8 +2919,25 @@ encode_size_struct2(ErtsAtomCacheMap *acmp, Eterm obj, unsigned dflags)
 	    }
 	    break;
 	case BINARY_DEF:
+	    if (dflags & DFLAGS_INTERNAL_TAGS) {
+		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);
+		    sub_extra = 2;  /* bitoffs and bitsize */
+		    tot_bytes += (sub->bitoffs + sub->bitsize+ 7) / 8;
+		}
+		if (pb->thing_word == HEADER_PROC_BIN
+		    && heap_bin_size(tot_bytes) > PROC_BIN_SIZE) {
+
+		    result += 1 + sub_extra + sizeof(ProcBin);
+		    break;
+		}
+	    }
 	    result += 1 + 4 + binary_size(obj) +
-		5;			/* For unaligned binary */
+		    5;			/* For unaligned binary */
 	    break;
 	case FUN_DEF:
 	    {
@@ -2829,7 +3009,7 @@ encode_size_struct2(ErtsAtomCacheMap *acmp, Eterm obj, unsigned dflags)
 }
 
 static Sint
-decoded_size(byte *ep, byte* endp, int no_refc_bins)
+decoded_size(byte *ep, byte* endp, int no_refc_bins, int internal_tags)
 {
     int heap_size = 0;
     int terms;
@@ -3039,6 +3219,29 @@ decoded_size(byte *ep, byte* endp, int no_refc_bins)
 		heap_size += ERL_FUN_SIZE + num_free;
 		break;
 	    }
+	case ATOM_INTERNAL_REF2:
+	    SKIP(2+atom_extra_skip);
+	    atom_extra_skip = 0;
+	    break;
+	case ATOM_INTERNAL_REF3:
+	    SKIP(3+atom_extra_skip);
+	    atom_extra_skip = 0;
+	    break;
+
+	case BINARY_INTERNAL_REF:
+	    if (!internal_tags) {
+		return -1;
+	    }
+	    SKIP(sizeof(ProcBin));
+	    heap_size += PROC_BIN_SIZE;
+	    break;
+	case BIT_BINARY_INTERNAL_REF:
+	    if (!internal_tags) {
+		return -1;
+	    }
+	    SKIP(2+sizeof(ProcBin));
+	    heap_size += PROC_BIN_SIZE + ERL_SUB_BIN_SIZE;
+	    break;
 	default:
 	    return -1;
 	}
diff --git a/erts/emulator/beam/external.h b/erts/emulator/beam/external.h
index db86b4d796..d8287b96a4 100644
--- a/erts/emulator/beam/external.h
+++ b/erts/emulator/beam/external.h
@@ -54,6 +54,10 @@
 
 #define DIST_HEADER       'D'
 #define ATOM_CACHE_REF    'R'
+#define ATOM_INTERNAL_REF2 'I'
+#define ATOM_INTERNAL_REF3 'K'
+#define BINARY_INTERNAL_REF 'J'
+#define BIT_BINARY_INTERNAL_REF 'L'
 #define COMPRESSED        'P'
 
 #if 0
@@ -156,7 +160,9 @@ Uint erts_encode_dist_ext_size(Eterm, Uint32, ErtsAtomCacheMap *);
 void erts_encode_dist_ext(Eterm, byte **, Uint32, ErtsAtomCacheMap *);
 
 Uint erts_encode_ext_size(Eterm);
+Uint erts_encode_ext_size_ets(Eterm);
 void erts_encode_ext(Eterm, byte **);
+byte* erts_encode_ext_ets(Eterm, byte *, struct erl_off_heap_header** ext_off_heap);
 
 #ifdef ERTS_WANT_EXTERNAL_TAGS
 ERTS_GLB_INLINE void erts_peek_dist_header(ErtsDistHeaderPeek *, byte *, Uint);
@@ -172,7 +178,9 @@ Sint erts_decode_dist_ext_size(ErtsDistExternal *, int);
 Eterm erts_decode_dist_ext(Eterm **, ErlOffHeap *, ErtsDistExternal *);
 
 Sint erts_decode_ext_size(byte*, Uint, int);
+Sint erts_decode_ext_size_ets(byte*, Uint);
 Eterm erts_decode_ext(Eterm **, ErlOffHeap *, byte**);
+Eterm erts_decode_ext_ets(Eterm **, ErlOffHeap *, byte*);
 
 Eterm erts_term_to_binary(Process* p, Eterm Term, int level, Uint flags);
 
@@ -211,7 +219,7 @@ ERTS_GLB_INLINE void *
 erts_dist_ext_trailer(ErtsDistExternal *edep)
 {
     void *res = (void *) (edep->ext_endp
-			  + ERTS_WORD_ALIGN_PAD_SZ(edep->ext_endp));
+			  + ERTS_EXTRA_DATA_ALIGN_SZ(edep->ext_endp));
     ASSERT((((UWord) res) % sizeof(Uint)) == 0);
     return res;
 }
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index b4a7a22082..bd540eaaa6 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -464,7 +464,10 @@ typedef union {
 typedef struct proc_bin {
     Eterm thing_word;		/* Subtag REFC_BINARY_SUBTAG. */
     Uint size;			/* Binary size in bytes. */
-    struct proc_bin *next;	/* Pointer to next ProcBin. */
+#if HALFWORD_HEAP
+    void* dummy_ptr_padding__;
+#endif
+    struct erl_off_heap_header *next;
     Binary *val;		/* Pointer to Binary structure. */
     byte *bytes;		/* Pointer to the actual data bytes. */
     Uint flags;			/* Flag word. */
@@ -494,8 +497,8 @@ erts_mk_magic_binary_term(Eterm **hpp, ErlOffHeap *ohp, Binary *mbp)
 
     pb->thing_word = HEADER_PROC_BIN;
     pb->size = 0;
-    pb->next = ohp->mso;
-    ohp->mso = pb;
+    pb->next = ohp->first;
+    ohp->first = (struct erl_off_heap_header*) pb;
     pb->val = mbp;
     pb->bytes = (byte *) mbp->orig_bytes;
     pb->flags = 0;
@@ -512,6 +515,16 @@ erts_mk_magic_binary_term(Eterm **hpp, ErlOffHeap *ohp, Binary *mbp)
    && (thing_subtag(*binary_val((T))) == REFC_BINARY_SUBTAG) \
    && (((ProcBin *) binary_val((T)))->val->flags & BIN_FLAG_MAGIC))
 
+
+union erl_off_heap_ptr {
+    struct erl_off_heap_header* hdr;
+    ProcBin *pb;
+    struct erl_fun_thing* fun;
+    struct external_thing_* ext;
+    Eterm* ep;
+    void* voidp;
+};
+
 /* arrays that get malloced at startup */
 extern Port* erts_port;
 extern erts_smp_atomic_t erts_ports_alive;
@@ -531,7 +544,7 @@ ERTS_GLB_INLINE void erts_may_save_closed_port(Port *prt)
     if (prt->snapshot != erts_smp_atomic_read(&erts_ports_snapshot)) {
 	/* Dead ports are added from the end of the snapshot buffer */
 	Eterm* tombstone = (Eterm*) erts_smp_atomic_addtest(&erts_dead_ports_ptr,
-							    -(long)sizeof(Eterm));
+							    -(erts_aint_t)sizeof(Eterm));
 	ASSERT(tombstone+1 != NULL);
 	ASSERT(prt->snapshot == (Uint32) erts_smp_atomic_read(&erts_ports_snapshot) - 1);
 	*tombstone = prt->id;
@@ -550,7 +563,7 @@ extern Uint display_items;	/* no of items to display in traces etc */
 extern Uint display_loads;	/* print info about loaded modules */
 
 extern int erts_backtrace_depth;
-extern erts_smp_atomic_t erts_max_gen_gcs;
+extern erts_smp_atomic32_t erts_max_gen_gcs;
 
 extern int erts_disable_tolerant_timeofday;
 
@@ -823,7 +836,6 @@ Eterm erts_new_heap_binary(Process *p, byte *buf, int len, byte** datap);
 Eterm erts_new_mso_binary(Process*, byte*, int);
 Eterm new_binary(Process*, byte*, int);
 Eterm erts_realloc_binary(Eterm bin, size_t size);
-void erts_cleanup_mso(ProcBin* pb);
 
 /* erl_bif_info.c */
 
@@ -878,9 +890,31 @@ void erl_error(char*, va_list);
 /* copy.c */
 void init_copy(void);
 Eterm copy_object(Eterm, Process*);
+
+#if HALFWORD_HEAP
+Uint size_object_rel(Eterm, Eterm*);
+#  define size_object(A) size_object_rel(A,NULL)
+
+Eterm copy_struct_rel(Eterm, Uint, Eterm**, ErlOffHeap*, Eterm* src_base, Eterm* dst_base);
+#  define copy_struct(OBJ,SZ,HPP,OH) copy_struct_rel(OBJ,SZ,HPP,OH, NULL,NULL)
+
+Eterm copy_shallow_rel(Eterm*, Uint, Eterm**, ErlOffHeap*, Eterm* src_base);
+#  define copy_shallow(A,B,C,D) copy_shallow_rel(A,B,C,D,NULL)
+
+#else /* !HALFWORD_HEAP */
+
 Uint size_object(Eterm);
+#  define size_object_rel(A,B) size_object(A)
+
 Eterm copy_struct(Eterm, Uint, Eterm**, ErlOffHeap*);
+#  define copy_struct_rel(OBJ,SZ,HPP,OH, SB,DB) copy_struct(OBJ,SZ,HPP,OH)
+
 Eterm copy_shallow(Eterm*, Uint, Eterm**, ErlOffHeap*);
+#  define copy_shallow_rel(A,B,C,D, BASE) copy_shallow(A,B,C,D)
+
+#endif
+
+
 void move_multi_frags(Eterm** hpp, ErlOffHeap*, ErlHeapFragment* first,
 		      Eterm* refs, unsigned nrefs);
 
@@ -1015,7 +1049,7 @@ void print_pass_through(int, byte*, int);
 
 /* beam_emu.c */
 int catchlevel(Process*);
-void init_emulator(_VOID_);
+void init_emulator(void);
 void process_main(void);
 Eterm build_stacktrace(Process* c_p, Eterm exc);
 Eterm expand_error_value(Process* c_p, Uint freason, Eterm Value);
@@ -1194,7 +1228,7 @@ ERTS_GLB_INLINE void
 erts_smp_port_unlock(Port *prt)
 {
 #ifdef ERTS_SMP
-    long refc;
+    erts_aint_t refc;
     erts_smp_mtx_unlock(prt->lock);
     refc = erts_smp_atomic_dectest(&prt->refc);
     ASSERT(refc >= 0);
@@ -1413,84 +1447,6 @@ void erl_drv_thr_init(void);
 
 /* time.c */
 
-ERTS_GLB_INLINE long do_time_read_and_reset(void);
-#ifdef ERTS_TIMER_THREAD
-ERTS_GLB_INLINE int next_time(void);
-ERTS_GLB_INLINE void bump_timer(long);
-#else
-int next_time(void);
-void bump_timer(long);
-extern erts_smp_atomic_t do_time;	/* set at clock interrupt */
-ERTS_GLB_INLINE void do_time_add(long);
-#endif
-
-#if ERTS_GLB_INLINE_INCL_FUNC_DEF
-
-#ifdef ERTS_TIMER_THREAD
-ERTS_GLB_INLINE long do_time_read_and_reset(void) { return 0; }
-ERTS_GLB_INLINE int next_time(void) { return -1; }
-ERTS_GLB_INLINE void bump_timer(long ignore) { }
-#else
-ERTS_GLB_INLINE long do_time_read_and_reset(void)
-{
-    return erts_smp_atomic_xchg(&do_time, 0L);
-}
-ERTS_GLB_INLINE void do_time_add(long elapsed)
-{
-    erts_smp_atomic_add(&do_time, elapsed);
-}
-#endif
-
-#endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
-
-void init_time(void);
-void erl_set_timer(ErlTimer*, ErlTimeoutProc, ErlCancelProc, void*, Uint);
-void erl_cancel_timer(ErlTimer*);
-Uint time_left(ErlTimer *);
-
-Uint erts_timer_wheel_memory_size(void);
-
-#if (defined(HAVE_GETHRVTIME) || defined(HAVE_CLOCK_GETTIME))
-#  ifndef HAVE_ERTS_NOW_CPU
-#    define HAVE_ERTS_NOW_CPU
-#    ifdef HAVE_GETHRVTIME
-#      define erts_start_now_cpu() sys_start_hrvtime()
-#      define erts_stop_now_cpu()  sys_stop_hrvtime()
-#    endif
-#  endif
-void erts_get_now_cpu(Uint* megasec, Uint* sec, Uint* microsec);
-#endif
-
-void erts_get_timeval(SysTimeval *tv);
-long erts_get_time(void);
-
-extern SysTimeval erts_first_emu_time;
-
-void erts_get_emu_time(SysTimeval *);
-
-ERTS_GLB_INLINE int erts_cmp_timeval(SysTimeval *t1p, SysTimeval *t2p);
-
-#if ERTS_GLB_INLINE_INCL_FUNC_DEF
-
-ERTS_GLB_INLINE int
-erts_cmp_timeval(SysTimeval *t1p, SysTimeval *t2p)
-{
-    if (t1p->tv_sec == t2p->tv_sec) {
-	if (t1p->tv_usec < t2p->tv_usec)
-	    return -1;
-	else if (t1p->tv_usec > t2p->tv_usec)
-	    return 1;
-	return 0;
-    }
-    return t1p->tv_sec < t2p->tv_sec ? -1 : 1;
-}
-
-#endif
-
-#ifdef DEBUG
-void p_slpq(_VOID_);
-#endif
-
 /* utils.c */
 
 /*
@@ -1499,7 +1455,6 @@ void p_slpq(_VOID_);
 void erts_silence_warn_unused_result(long unused);
 
 void erts_cleanup_offheap(ErlOffHeap *offheap);
-void erts_cleanup_externals(ExternalThing *);
 
 Uint erts_fit_in_bits(Uint);
 int list_length(Eterm);
@@ -1532,7 +1487,7 @@ erts_bld_atom_2uint_3tup_list(Uint **hpp, Uint *szp, Sint length,
 			      Eterm atoms[], Uint uints1[], Uint uints2[]);
 
 Eterm store_external_or_ref_in_proc_(Process *, Eterm);
-Eterm store_external_or_ref_(Uint **, ExternalThing **, Eterm);
+Eterm store_external_or_ref_(Uint **, ErlOffHeap*, Eterm);
 
 #define NC_HEAP_SIZE(NC) \
  (ASSERT_EXPR(is_node_container((NC))), \
@@ -1550,16 +1505,30 @@ void erts_init_utils_mem(void);
 erts_dsprintf_buf_t *erts_create_tmp_dsbuf(Uint);
 void erts_destroy_tmp_dsbuf(erts_dsprintf_buf_t *);
 
+#if HALFWORD_HEAP
+int eq_rel(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base);
+#  define eq(A,B) eq_rel(A,NULL,B,NULL)
+#else
 int eq(Eterm, Eterm);
+#  define eq_rel(A,A_BASE,B,B_BASE) eq(A,B)
+#endif
+
 #define EQ(x,y) (((x) == (y)) || (is_not_both_immed((x),(y)) && eq((x),(y))))
 
+#if HALFWORD_HEAP
+Sint cmp_rel(Eterm, Eterm*, Eterm, Eterm*);
+#define CMP(A,B) cmp_rel(A,NULL,B,NULL)
+#else
 Sint cmp(Eterm, Eterm);
-#define cmp_lt(a,b)	(cmp((a),(b)) < 0)
-#define cmp_le(a,b)	(cmp((a),(b)) <= 0)
-#define cmp_eq(a,b)	(cmp((a),(b)) == 0)
-#define cmp_ne(a,b)	(cmp((a),(b)) != 0)
-#define cmp_ge(a,b)	(cmp((a),(b)) >= 0)
-#define cmp_gt(a,b)	(cmp((a),(b)) > 0)
+#define cmp_rel(A,A_BASE,B,B_BASE) cmp(A,B)
+#define CMP(A,B) cmp(A,B)
+#endif
+#define cmp_lt(a,b)	(CMP((a),(b)) < 0)
+#define cmp_le(a,b)	(CMP((a),(b)) <= 0)
+#define cmp_eq(a,b)	(CMP((a),(b)) == 0)
+#define cmp_ne(a,b)	(CMP((a),(b)) != 0)
+#define cmp_ge(a,b)	(CMP((a),(b)) >= 0)
+#define cmp_gt(a,b)	(CMP((a),(b)) > 0)
 
 #define CMP_LT(a,b)	((a) != (b) && cmp_lt((a),(b)))
 #define CMP_GE(a,b)	((a) == (b) || cmp_ge((a),(b)))
@@ -1585,6 +1554,19 @@ Sint erts_binary_set_loop_limit(Sint limit);
 /* erl_unicode.c */
 void erts_init_unicode(void);
 Sint erts_unicode_set_loop_limit(Sint limit);
+
+void erts_native_filename_put(Eterm ioterm, int encoding, byte *p) ;
+Sint erts_native_filename_need(Eterm ioterm, int encoding);
+void erts_copy_utf8_to_utf16_little(byte *target, byte *bytes, int num_chars);
+int erts_analyze_utf8(byte *source, Uint size, 
+			byte **err_pos, Uint *num_chars, int *left);
+char *erts_convert_filename_to_native(Eterm name, ErtsAlcType_t alloc_type, int allow_empty);
+
+#define ERTS_UTF8_OK 0
+#define ERTS_UTF8_INCOMPLETE 1
+#define ERTS_UTF8_ERROR 2
+#define ERTS_UTF8_ANALYZE_MORE 3
+
 /* erl_trace.c */
 void erts_init_trace(void);
 void erts_trace_check_exiting(Eterm exiting);
@@ -1676,7 +1658,7 @@ int io_list_to_buf(Eterm, char*, int);
 int io_list_to_buf2(Eterm, char*, int);
 int io_list_len(Eterm);
 int is_string(Eterm);
-void erl_at_exit(FUNCTION(void,(*),(void*)), void*);
+void erl_at_exit(void (*) (void*), void*);
 Eterm collect_memory(Process *);
 void dump_memory_to_fd(int);
 int dump_memory_data(const char *);
@@ -1718,11 +1700,6 @@ Uint erts_current_reductions(Process* current, Process *p);
 
 int erts_print_system_version(int to, void *arg, Process *c_p);
 
-/*
- * Interface to erl_init
- */
-void erl_init(void);
-
 #define seq_trace_output(token, msg, type, receiver, process) \
 seq_trace_output_generic((token), (msg), (type), (receiver), (process), NIL)
 #define seq_trace_output_exit(token, msg, type, receiver, exitfrom) \
@@ -1780,8 +1757,15 @@ do {								\
 extern Binary *erts_match_set_compile(Process *p, Eterm matchexpr);
 Eterm erts_match_set_lint(Process *p, Eterm matchexpr); 
 extern void erts_match_set_release_result(Process* p);
+
+enum erts_pam_run_flags {
+    ERTS_PAM_TMP_RESULT=0,
+    ERTS_PAM_COPY_RESULT=1,
+    ERTS_PAM_CONTIGUOUS_TUPLE=2
+};
 extern Eterm erts_match_set_run(Process *p, Binary *mpsp, 
 				Eterm *args, int num_args,
+				enum erts_pam_run_flags in_flags,
 				Uint32 *return_flags);
 extern Eterm erts_match_set_get_source(Binary *mpsp);
 extern void erts_match_prog_foreach_offheap(Binary *b,
@@ -1957,5 +1941,5 @@ erts_alloc_message_heap(Uint size,
 #  define UnUseTmpHeap(Size,Proc) /* Nothing */
 #  define UseTmpHeapNoproc(Size) /* Nothing */
 #  define UnUseTmpHeapNoproc(Size) /* Nothing */
-#endif
-#endif
+#endif /* HEAP_ON_C_STACK */
+#endif /* !__GLOBAL_H__ */
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 68625801cf..f21a96c754 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -428,7 +428,7 @@ setup_port(Port* prt, Eterm pid, erts_driver_t *driver,
     old_name = prt->name;
     prt->name = new_name;
 #ifdef ERTS_SMP
-    erts_smp_atomic_set(&prt->run_queue, (long) runq);
+    erts_smp_atomic_set(&prt->run_queue, (erts_aint_t) runq);
 #endif
     ASSERT(!prt->drv_ptr);
     prt->drv_ptr = driver;
@@ -670,7 +670,7 @@ erts_open_driver(erts_driver_t* driver,	/* Pointer to driver. */
 #ifdef ERTS_SMP
 	erts_cancel_smp_ptimer(port->ptimer);
 #else
-	erl_cancel_timer(&(port->tm));
+	erts_cancel_timer(&(port->tm));
 #endif
 	stopq(port);
 	kill_port(port);
@@ -1297,7 +1297,7 @@ void init_io(void)
 	erts_port[i].port_data_lock = NULL;
     }
 
-    erts_smp_atomic_init(&erts_ports_snapshot, (long) 0);
+    erts_smp_atomic_init(&erts_ports_snapshot, (erts_aint_t) 0);
     last_port_num = 0;
     erts_smp_spinlock_init(&get_free_port_lck, "get_free_port");
 
@@ -1575,14 +1575,14 @@ static void deliver_read_message(Port* prt, Eterm to,
 	pb = (ProcBin *) hp;
 	pb->thing_word = HEADER_PROC_BIN;
 	pb->size = len;
-	pb->next = ohp->mso;
-	ohp->mso = pb;
+	pb->next = ohp->first;
+	ohp->first = (struct erl_off_heap_header*)pb;
 	pb->val = bptr;
 	pb->bytes = (byte*) bptr->orig_bytes;
 	pb->flags = 0;
 	hp += PROC_BIN_SIZE;
 
-	ohp->overhead += pb->size / sizeof(Eterm);
+	OH_OVERHEAD(ohp, pb->size / sizeof(Eterm));
 	listp = make_binary(pb);
     }
 
@@ -1725,14 +1725,14 @@ deliver_vec_message(Port* prt,			/* Port */
 	    }
 	    pb->thing_word = HEADER_PROC_BIN;
 	    pb->size = iov->iov_len;
-	    pb->next = ohp->mso;
-	    ohp->mso = pb;
+	    pb->next = ohp->first;
+	    ohp->first = (struct erl_off_heap_header*)pb;
 	    pb->val = ErlDrvBinary2Binary(b);
 	    pb->bytes = base;
 	    pb->flags = 0;
 	    hp += PROC_BIN_SIZE;
 	    
-	    ohp->overhead += iov->iov_len / sizeof(Eterm);
+	    OH_OVERHEAD(ohp, iov->iov_len / sizeof(Eterm));
 
 	    if (listp == NIL) {  /* compatible with deliver_bin_message */
 		listp = make_binary(pb);
@@ -1839,7 +1839,7 @@ terminate_port(Port *prt)
 #ifdef ERTS_SMP
     erts_cancel_smp_ptimer(prt->ptimer);
 #else
-    erl_cancel_timer(&prt->tm);
+    erts_cancel_timer(&prt->tm);
 #endif
 
     drv = prt->drv_ptr;
@@ -2259,12 +2259,12 @@ erts_port_control(Process* p, Port* prt, Uint command, Eterm iolist)
 		ProcBin* pb = (ProcBin *) HAlloc(p, PROC_BIN_SIZE);
 		pb->thing_word = HEADER_PROC_BIN;
 		pb->size = dbin->orig_size;
-		pb->next = MSO(p).mso;
-		MSO(p).mso = pb;
+		pb->next = MSO(p).first;
+		MSO(p).first = (struct erl_off_heap_header*)pb;
 		pb->val = ErlDrvBinary2Binary(dbin);
 		pb->bytes = (byte*) dbin->orig_bytes;
 		pb->flags = 0;
-		MSO(p).overhead += dbin->orig_size / sizeof(Eterm);
+		OH_OVERHEAD(&(MSO(p)), dbin->orig_size / sizeof(Eterm));
 		return make_binary(pb);
 	    }
 	    port_resp = dbin->orig_bytes;
@@ -2802,17 +2802,25 @@ driver_deliver_term(ErlDrvPort port,
 	    break;
 	case ERL_DRV_INT:  /* signed int argument */
 	    ERTS_DDT_CHK_ENOUGH_ARGS(1);
+#if HALFWORD_HEAP
+	    erts_bld_sint64(NULL, &need, (Sint64)ptr[0]);
+#else
 	    /* check for bignum */
 	    if (!IS_SSMALL((Sint)ptr[0]))
 		need += BIG_UINT_HEAP_SIZE;  /* use small_to_big */
+#endif
 	    ptr++;
 	    depth++;
 	    break;
 	case ERL_DRV_UINT:  /* unsigned int argument */
 	    ERTS_DDT_CHK_ENOUGH_ARGS(1);
+#if HALFWORD_HEAP
+	    erts_bld_uint64(NULL, &need, (Uint64)ptr[0]);
+#else
 	    /* check for bignum */
 	    if (!IS_USMALL(0, (Uint)ptr[0]))
 		need += BIG_UINT_HEAP_SIZE;  /* use small_to_big */
+#endif
 	    ptr++;
 	    depth++;
 	    break;
@@ -2979,22 +2987,30 @@ driver_deliver_term(ErlDrvPort port,
 	    break;
 
 	case ERL_DRV_INT:  /* signed int argument */
+#if HALFWORD_HEAP
+	    mess = erts_bld_sint64(&hp, NULL, (Sint64)ptr[0]);
+#else
 	    if (IS_SSMALL((Sint)ptr[0]))
 		mess = make_small((Sint)ptr[0]);
 	    else {
 		mess = small_to_big((Sint)ptr[0], hp);
 		hp += BIG_UINT_HEAP_SIZE;
 	    }
+#endif
 	    ptr++;
 	    break;
 
 	case ERL_DRV_UINT:  /* unsigned int argument */
+#if HALFWORD_HEAP
+	    mess = erts_bld_uint64(&hp, NULL, (Uint64)ptr[0]);
+#else
 	    if (IS_USMALL(0, (Uint)ptr[0]))
 		mess = make_small((Uint)ptr[0]);
 	    else {
 		mess = uint_to_big((Uint)ptr[0], hp);
 		hp += BIG_UINT_HEAP_SIZE;
 	    }
+#endif
 	    ptr++;
 	    break;
 
@@ -3033,14 +3049,14 @@ driver_deliver_term(ErlDrvPort port,
 		driver_binary_inc_refc(b);  /* caller will free binary */
 		pb->thing_word = HEADER_PROC_BIN;
 		pb->size = size;
-		pb->next = ohp->mso;
-		ohp->mso = pb;
+		pb->next = ohp->first;
+		ohp->first = (struct erl_off_heap_header*)pb;
 		pb->val = ErlDrvBinary2Binary(b);
 		pb->bytes = ((byte*) b->orig_bytes) + offset;
 		pb->flags = 0;
 		mess =  make_binary(pb);
 		hp += PROC_BIN_SIZE;
-		ohp->overhead += pb->size / sizeof(Eterm);
+		OH_OVERHEAD(ohp, pb->size / sizeof(Eterm));
 	    }
 	    ptr += 3;
 	    break;
@@ -3072,12 +3088,12 @@ driver_deliver_term(ErlDrvPort port,
 		hp += PROC_BIN_SIZE;
 		pbp->thing_word = HEADER_PROC_BIN;
 		pbp->size = size;
-		pbp->next = ohp->mso;
-		ohp->mso = pbp;
+		pbp->next = ohp->first;
+		ohp->first = (struct erl_off_heap_header*)pbp;
 		pbp->val = bp;
 		pbp->bytes = (byte*) bp->orig_bytes;
 		pbp->flags = 0;
-		ohp->overhead += (pbp->size / sizeof(Eterm));
+		OH_OVERHEAD(ohp, pbp->size / sizeof(Eterm));
 		mess = make_binary(pbp);
 	    }
 	    ptr += 2;
@@ -3236,7 +3252,7 @@ int driver_output_binary(ErlDrvPort ix, char* hbuf, int hlen,
 	return 0;
 
     prt->bytes_in += (hlen + len);
-    erts_smp_atomic_add(&erts_bytes_in, (long) (hlen + len));
+    erts_smp_atomic_add(&erts_bytes_in, (erts_aint_t) (hlen + len));
     if (prt->status & ERTS_PORT_SFLG_DISTRIBUTION) {
 	return erts_net_message(prt,
 				prt->dist_entry,
@@ -3271,7 +3287,7 @@ int driver_output2(ErlDrvPort ix, char* hbuf, int hlen, char* buf, int len)
 	return 0;
     
     prt->bytes_in += (hlen + len);
-    erts_smp_atomic_add(&erts_bytes_in, (long) (hlen + len));
+    erts_smp_atomic_add(&erts_bytes_in, (erts_aint_t) (hlen + len));
     if (prt->status & ERTS_PORT_SFLG_DISTRIBUTION) {
 	if (len == 0)
 	    return erts_net_message(prt,
@@ -3348,7 +3364,7 @@ int driver_outputv(ErlDrvPort ix, char* hbuf, int hlen, ErlIOVec* vec, int skip)
 
     /* XXX handle distribution !!! */
     prt->bytes_in += (hlen + size);
-    erts_smp_atomic_add(&erts_bytes_in, (long) (hlen + size));
+    erts_smp_atomic_add(&erts_bytes_in, (erts_aint_t) (hlen + size));
     deliver_vec_message(prt, prt->connected, hbuf, hlen, binv, iov, n, size);
     return 0;
 }
@@ -3392,25 +3408,25 @@ int len;
  * reference count on driver binaries...
  */
 
-long
+ErlDrvSInt
 driver_binary_get_refc(ErlDrvBinary *dbp)
 {
     Binary* bp = ErlDrvBinary2Binary(dbp);
-    return erts_refc_read(&bp->refc, 1);
+    return (ErlDrvSInt) erts_refc_read(&bp->refc, 1);
 }
 
-long
+ErlDrvSInt
 driver_binary_inc_refc(ErlDrvBinary *dbp)
 {
     Binary* bp = ErlDrvBinary2Binary(dbp);
-    return erts_refc_inctest(&bp->refc, 2);
+    return (ErlDrvSInt) erts_refc_inctest(&bp->refc, 2);
 }
 
-long
+ErlDrvSInt
 driver_binary_dec_refc(ErlDrvBinary *dbp)
 {
     Binary* bp = ErlDrvBinary2Binary(dbp);
-    return erts_refc_dectest(&bp->refc, 1);
+    return (ErlDrvSInt) erts_refc_dectest(&bp->refc, 1);
 }
 
 
@@ -3525,12 +3541,12 @@ pdl_init_refc(ErlDrvPDL pdl)
     erts_atomic_init(&pdl->refc, 1);
 }
 
-static ERTS_INLINE long
+static ERTS_INLINE ErlDrvSInt
 pdl_read_refc(ErlDrvPDL pdl)
 {
-    long refc = erts_atomic_read(&pdl->refc);
+    erts_aint_t refc = erts_atomic_read(&pdl->refc);
     ERTS_LC_ASSERT(refc >= 0);
-    return refc;
+    return (ErlDrvSInt) refc;
 }
 
 static ERTS_INLINE void
@@ -3540,12 +3556,12 @@ pdl_inc_refc(ErlDrvPDL pdl)
     ERTS_LC_ASSERT(driver_pdl_get_refc(pdl) > 1);
 }
 
-static ERTS_INLINE long
+static ERTS_INLINE ErlDrvSInt
 pdl_inctest_refc(ErlDrvPDL pdl)
 {
-    long refc = erts_atomic_inctest(&pdl->refc);
+    erts_aint_t refc = erts_atomic_inctest(&pdl->refc);
     ERTS_LC_ASSERT(refc > 1);
-    return refc;
+    return (ErlDrvSInt) refc;
 }
 
 #if 0 /* unused */
@@ -3557,12 +3573,12 @@ pdl_dec_refc(ErlDrvPDL pdl)
 }
 #endif
 
-static ERTS_INLINE long
+static ERTS_INLINE ErlDrvSInt
 pdl_dectest_refc(ErlDrvPDL pdl)
 {
-    long refc = erts_atomic_dectest(&pdl->refc);
+    erts_aint_t refc = erts_atomic_dectest(&pdl->refc);
     ERTS_LC_ASSERT(refc >= 0);
-    return refc;
+    return (ErlDrvSInt) refc;
 }
 
 static ERTS_INLINE void pdl_destroy(ErlDrvPDL pdl)
@@ -3633,7 +3649,7 @@ driver_pdl_lock(ErlDrvPDL pdl)
 void
 driver_pdl_unlock(ErlDrvPDL pdl)
 {
-    long refc;
+    ErlDrvSInt refc;
 #ifdef HARDDEBUG
     erts_fprintf(stderr, "driver_pdl_unlock(0x%08X)\r\n",(unsigned) pdl);
 #endif
@@ -3643,28 +3659,30 @@ driver_pdl_unlock(ErlDrvPDL pdl)
 	pdl_destroy(pdl);
 }
 
-long
+ErlDrvSInt
 driver_pdl_get_refc(ErlDrvPDL pdl)
 {
     return pdl_read_refc(pdl);
 }
 
-long
+ErlDrvSInt
 driver_pdl_inc_refc(ErlDrvPDL pdl)
 {
-    long refc = pdl_inctest_refc(pdl);
+    ErlDrvSInt refc = pdl_inctest_refc(pdl);
 #ifdef HARDDEBUG
-    erts_fprintf(stderr, "driver_pdl_inc_refc(0x%08X) -> %ld\r\n",(unsigned) pdl, refc);
+    erts_fprintf(stderr, "driver_pdl_inc_refc(%p) -> %bpd\r\n",
+		 pdl, refc);
 #endif
     return refc;
 }
 
-long
+ErlDrvSInt
 driver_pdl_dec_refc(ErlDrvPDL pdl)
 {
-    long refc = pdl_dectest_refc(pdl);
+    ErlDrvSInt refc = pdl_dectest_refc(pdl);
 #ifdef HARDDEBUG
-    erts_fprintf(stderr, "driver_pdl_dec_refc(0x%08X) -> %ld\r\n",(unsigned) pdl, refc);
+    erts_fprintf(stderr, "driver_pdl_dec_refc(%p) -> %bpd\r\n",
+		 pdl, refc);
 #endif
     if (!refc)
 	pdl_destroy(pdl);
@@ -4050,7 +4068,7 @@ drv_cancel_timer(Port *prt)
 #ifdef ERTS_SMP
     erts_cancel_smp_ptimer(prt->ptimer);
 #else
-    erl_cancel_timer(&prt->tm);
+    erts_cancel_timer(&prt->tm);
 #endif
     if (erts_port_task_is_scheduled(&prt->timeout_task))
 	erts_port_task_abort(prt->id, &prt->timeout_task);
@@ -4074,7 +4092,7 @@ int driver_set_timer(ErlDrvPort ix, UWord t)
 			   (ErlTimeoutProc) schedule_port_timeout,
 			   t);
 #else
-    erl_set_timer(&prt->tm,
+    erts_set_timer(&prt->tm,
 		  (ErlTimeoutProc) schedule_port_timeout,
 		  NULL,
 		  prt,
@@ -4105,9 +4123,9 @@ driver_read_timer(ErlDrvPort ix, unsigned long* t)
 	return -1;
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
 #ifdef ERTS_SMP
-    *t = prt->ptimer ? time_left(&prt->ptimer->timer.tm) : 0;
+    *t = prt->ptimer ? erts_time_left(&prt->ptimer->timer.tm) : 0;
 #else
-    *t = time_left(&prt->tm);
+    *t = erts_time_left(&prt->tm);
 #endif
     return 0;
 }
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index a2439d5582..e861f97e7a 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -101,16 +101,16 @@ return
 %macro: test_heap TestHeap -pack
 
 allocate t t
-allocate_heap I I I
+allocate_heap t I t
 deallocate I
 init y
 allocate_zero t t
-allocate_heap_zero I I I
+allocate_heap_zero t I t
 
 trim N Remaining => i_trim N
 i_trim I
 
-test_heap I I
+test_heap I t
 
 allocate_heap S u==0 R => allocate S R
 allocate_heap_zero S u==0 R => allocate_zero S R
@@ -124,7 +124,7 @@ init Y1 | init Y2 => init2 Y1 Y2
 
 # Selecting values
 
-select_val S=q Fail=f Size=u Rest=* => const_select_val(S, Fail, Size, Rest)
+select_val S=aiq Fail=f Size=u Rest=* => const_select_val(S, Fail, Size, Rest)
 
 select_val S=s Fail=f Size=u Rest=* | use_jump_tab(Size, Rest) => \
   gen_jump_tab(S, Fail, Size, Rest)
@@ -132,34 +132,59 @@ select_val S=s Fail=f Size=u Rest=* | use_jump_tab(Size, Rest) => \
 is_integer Fail=f S | select_val S=s Fail=f Size=u Rest=* | use_jump_tab(Size, Rest) => \
   gen_jump_tab(S, Fail, Size, Rest)
 
+is_integer TypeFail=f S | select_val S=s Fail=f Size=u Rest=* | \
+	   mixed_types(Size, Rest) => \
+  gen_split_values(S, TypeFail, Fail, Size, Rest)
+
 select_val S=s Fail=f Size=u Rest=* | mixed_types(Size, Rest) => \
-  gen_split_values(S, Fail, Size, Rest)
+  gen_split_values(S, Fail, Fail, Size, Rest)
 
-is_integer Fail=f S | select_val S=s Fail=f Size=u Rest=* | \
+is_integer Fail=f S | select_val S=d Fail=f Size=u Rest=* | \
   fixed_size_values(Size, Rest) => gen_select_val(S, Fail, Size, Rest)
 
-is_atom Fail=f S | select_val S=s Fail=f Size=u Rest=* | \
+is_atom Fail=f S | select_val S=d Fail=f Size=u Rest=* | \
   fixed_size_values(Size, Rest) => gen_select_val(S, Fail, Size, Rest)
 
-select_val S=s Fail=f Size=u Rest=* | fixed_size_values(Size, Rest) => \
-  gen_select_val(S, Fail, Size, Rest)
+select_val S=s Fail=f Size=u Rest=* | floats_or_bignums(Size, Rest) => \
+  gen_select_literals(S, Fail, Size, Rest)
 
-select_val S=s Fail=f Size=u Rest=* | all_values_are_big(Size, Rest) => \
-  gen_select_big(S, Fail, Size, Rest)
+select_val S=d Fail=f Size=u Rest=* | fixed_size_values(Size, Rest) => \
+  gen_select_val(S, Fail, Size, Rest)
 
-is_tuple Fail=f S | select_tuple_arity S=s Fail=f Size=u Rest=* => \
+is_tuple Fail=f S | select_tuple_arity S=d Fail=f Size=u Rest=* => \
   gen_select_tuple_arity(S, Fail, Size, Rest)
 
-select_tuple_arity S=s Fail=f Size=u Rest=* => \
+select_tuple_arity S=d Fail=f Size=u Rest=* => \
   gen_select_tuple_arity(S, Fail, Size, Rest)
 
-i_select_val s f I
-i_select_tuple_arity s f I
-i_select_big s f
-i_select_float s f I
+i_select_val r f I
+i_select_val x f I
+i_select_val y f I
+
+i_select_val2 r f c f c f
+i_select_val2 x f c f c f
+i_select_val2 y f c f c f
+
+i_select_tuple_arity2 r f A f A f
+i_select_tuple_arity2 x f A f A f
+i_select_tuple_arity2 y f A f A f
+
+i_select_tuple_arity r f I
+i_select_tuple_arity x f I
+i_select_tuple_arity y f I
+
+i_jump_on_val_zero r f I
+i_jump_on_val_zero x f I
+i_jump_on_val_zero y f I
+
+i_jump_on_val r f I I
+i_jump_on_val x f I I
+i_jump_on_val y f I I
 
-i_jump_on_val_zero s f I
-i_jump_on_val s f I I
+jump Target | label Lbl | same_label(Target, Lbl) => label Lbl
+
+is_ne_exact L1 S1 S2 | jump Fail | label L2 | same_label(L1, L2) => \
+  is_eq_exact Fail S1 S2 | label L2
 
 %macro: get_list GetList -pack
 get_list x x x
@@ -234,11 +259,17 @@ is_number Fail Literal=q => move Literal x | is_number Fail x
 
 jump f
 
-case_end Literal=q => move Literal x | case_end x
-badmatch Literal=q => move Literal x | badmatch x
+case_end Literal=cq => move Literal x | case_end x
+badmatch Literal=cq => move Literal x | badmatch x
+
+case_end r
+case_end x
+case_end y
+
+badmatch r
+badmatch x
+badmatch y
 
-case_end s
-badmatch s
 if_end
 raise s s
 
@@ -248,12 +279,33 @@ system_limit j
 
 move R R =>
 
+move C=cxy r | jump Lbl => move_jump Lbl C
+
+%macro: move_jump MoveJump -nonext
+move_jump f n
+move_jump f c
+move_jump f x
+move_jump f y
+
 move X1=x Y1=y | move X2=x Y2=y => move2 X1 Y1 X2 Y2
 move Y1=y X1=x | move Y2=y X2=x => move2 Y1 X1 Y2 X2
+move X1=x X2=x | move X3=x X4=x => move2 X1 X2 X3 X4
+
+move C=aiq X=x==1 => move_x1 C
+move C=aiq X=x==2 => move_x2 C
+
+move_x1 c
+move_x2 c
 
 %macro: move2 Move2 -pack
 move2 x y x y
 move2 y x y x
+move2 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
 
 %macro:move Move -pack -gen_dest
 move x x
@@ -265,15 +317,10 @@ move r x
 move r y
 move c r
 move c x
-move c y
 move n x
 move n r
 move y y
 
-%cold
-move s d
-%hot
-
 # Receive operations.
 
 loop_rec Fail Src | smp_mark_target_label(Fail) => i_loop_rec Fail Src
@@ -306,55 +353,78 @@ i_wait_error_locked
 send
 
 #
-# Comparisions.
+# Optimized comparisons with one immediate/literal operand.
+#
+
+is_eq_exact Lbl R=rxy C=ian => i_is_eq_exact_immed Lbl R C
+is_eq_exact Lbl R=rxy C=q => i_is_eq_exact_literal R Lbl C
+
+is_ne_exact Lbl R=rxy C=ian => i_is_ne_exact_immed Lbl R C
+is_ne_exact Lbl R=rxy C=q => i_is_ne_exact_literal R Lbl C
+
+%macro: i_is_eq_exact_immed EqualImmed -fail_action
+i_is_eq_exact_immed f r c
+i_is_eq_exact_immed f x c
+i_is_eq_exact_immed f y c
+
+i_is_eq_exact_literal r f c
+i_is_eq_exact_literal x f c
+i_is_eq_exact_literal y f c
+
+%macro: i_is_ne_exact_immed NotEqualImmed -fail_action
+i_is_ne_exact_immed f r c
+i_is_ne_exact_immed f x c
+i_is_ne_exact_immed f y c
+
+i_is_ne_exact_literal r f c
+i_is_ne_exact_literal x f c
+i_is_ne_exact_literal y f c
+
+#
+# All other comparisons.
 #
 
-is_eq_exact Lbl=f R=rxy C=ian => i_is_eq_immed Lbl R C
-is_eq Lbl=f R=rxy C=an => i_is_eq_immed Lbl R C
+is_eq_exact Lbl S1 S2 => i_fetch S1 S2 | i_is_eq_exact Lbl
+is_ne_exact Lbl S1 S2 => i_fetch S1 S2 | i_is_ne_exact Lbl
 
 is_ge Lbl S1 S2 => i_fetch S1 S2 | i_is_ge Lbl
 is_lt Lbl S1 S2 => i_fetch S1 S2 | i_is_lt Lbl
 is_eq Lbl S1 S2 => i_fetch S1 S2 | i_is_eq Lbl
 is_ne Lbl S1 S2 => i_fetch S1 S2 | i_is_ne Lbl
 
-is_eq_exact Lbl=f S1 S2 => i_fetch S1 S2 | i_is_eq_exact Lbl
-is_ne_exact Lbl S1 S2 => i_fetch S1 S2 | i_is_ne_exact Lbl
-
+i_is_eq_exact f
+i_is_ne_exact f
 i_is_lt f
 i_is_ge f
 i_is_eq f
 i_is_ne f
-i_is_eq_exact f
-i_is_ne_exact f
-
-%macro: i_is_eq_immed EqualImmed -fail_action
-i_is_eq_immed f r c
-i_is_eq_immed f x c
-i_is_eq_immed f y c
 
 #
 # Putting things.
 #
 
-put_tuple Arity Dst | put V => i_put_tuple Arity V Dst
+put_tuple Arity Dst => i_put_tuple Dst u
 
-%macro: i_put_tuple PutTuple -pack
-i_put_tuple A x x
-i_put_tuple A y x
-i_put_tuple A r x
-i_put_tuple A n x
-i_put_tuple A c x
-i_put_tuple A x y
-i_put_tuple A x r
-i_put_tuple A y r
-i_put_tuple A n r
-i_put_tuple A c r
+i_put_tuple Dst Arity Puts=* | put S1 | put S2 | \
+  put S3 | put S4 | put S5 => \
+	    tuple_append_put5(Arity, Dst, Puts, S1, S2, S3, S4, S5)
 
-%cold
-i_put_tuple A r y
-i_put_tuple A y y
-i_put_tuple A c y
-%hot
+i_put_tuple Dst Arity Puts=* | put S => \
+	    tuple_append_put(Arity, Dst, Puts, S)
+
+i_put_tuple/2
+
+%macro:i_put_tuple PutTuple -pack -goto:do_put_tuple
+i_put_tuple r I
+i_put_tuple x I
+i_put_tuple y I
+
+#
+# The instruction "put_list Const [] Dst" will not be generated by
+# the current BEAM compiler. But until R15A, play it safe by handling
+# that instruction with the following transformation.
+#
+put_list Const=c n Dst => move Const x | put_list x n Dst
 
 %macro:put_list PutList -pack -gen_dest
 
@@ -362,10 +432,8 @@ put_list x n x
 put_list y n x
 put_list x x x
 put_list y x x
-put_list c n x
 put_list x x r
 put_list y r r
-put_list c n r
 
 put_list y y x
 put_list x y x
@@ -376,6 +444,13 @@ put_list y y r
 put_list y r x
 put_list r n x
 
+put_list x r x
+put_list x y r
+put_list y x r
+put_list y x x
+
+put_list x r r
+
 # put_list SrcReg Constant Dst
 put_list r c r
 put_list r c x
@@ -403,17 +478,9 @@ put_list c y x
 put_list c y y
 
 %cold
-put_list x r r
 put_list s s d
 %hot
 
-%macro: put Put
-put x
-put r
-put y
-put c
-put n
-
 %macro: i_fetch FetchArgs -pack
 i_fetch c c
 i_fetch c r
@@ -464,19 +531,20 @@ move_return n r
 
 move S r | deallocate D | return => move_deallocate_return S r D
 
-%macro: move_deallocate_return MoveDeallocateReturn -nonext
-move_deallocate_return x r P
-move_deallocate_return y r P
-move_deallocate_return c r P
-move_deallocate_return n r P
+%macro: move_deallocate_return MoveDeallocateReturn -pack -nonext
+move_deallocate_return x r Q
+move_deallocate_return y r Q
+move_deallocate_return c r Q
+move_deallocate_return n r Q
 
 deallocate D | return => deallocate_return D
 
 %macro: deallocate_return DeallocateReturn -nonext
-deallocate_return P
+deallocate_return Q
 
 test_heap Need u==1 | put_list Y=y r r => test_heap_1_put_list Need Y
 
+%macro: test_heap_1_put_list TestHeapPutList -pack
 test_heap_1_put_list I y
 
 # Test tuple & arity (head)
@@ -576,14 +644,14 @@ is_list f y
 
 is_nonempty_list Fail=f S=rx | allocate Need Rs => is_nonempty_list_allocate Fail S Need Rs
 
-%macro:is_nonempty_list_allocate IsNonemptyListAllocate -fail_action
-is_nonempty_list_allocate f x I I
-is_nonempty_list_allocate f r I I
+%macro:is_nonempty_list_allocate IsNonemptyListAllocate -fail_action -pack
+is_nonempty_list_allocate f x I t
+is_nonempty_list_allocate f r I t
 
 is_nonempty_list F=f r | test_heap I1 I2 => is_non_empty_list_test_heap F r I1 I2
 
-%macro: is_non_empty_list_test_heap IsNonemptyListTestHeap -fail_action
-is_non_empty_list_test_heap f r I I
+%macro: is_non_empty_list_test_heap IsNonemptyListTestHeap -fail_action -pack
+is_non_empty_list_test_heap f r I t
 
 %macro: is_nonempty_list IsNonemptyList -fail_action
 is_nonempty_list f x
@@ -912,8 +980,13 @@ node x
 node y
 %hot
 
-i_fast_element j I s d
-i_element j s s d
+i_fast_element r j I d
+i_fast_element x j I d
+i_fast_element y j I d
+
+i_element r j s d
+i_element x j s d
+i_element y j s d
 
 bif1 f b s d
 bif1_body b s d
@@ -940,11 +1013,11 @@ move S r | call_last Ar P=f D => move_call_last S r P D
 
 i_move_call_last f P c r
 
-%macro:move_call_last MoveCallLast -arg_f -nonext
+%macro:move_call_last MoveCallLast -arg_f -nonext -pack
 
 move_call_last/4
-move_call_last x r f P
-move_call_last y r f P
+move_call_last x r f Q
+move_call_last y r f Q
 
 move S=c r | call_only Ar P=f => i_move_call_only P S r
 move S=x r | call_only Ar P=f => move_call_only S r P
@@ -1307,6 +1380,8 @@ fconv Arg=iqan Dst=l => move Arg x | fconv x Dst
 
 fmove q l
 fmove d l
+fmove l d
+
 fconv d l
 
 i_fadd l l l
@@ -1322,12 +1397,6 @@ fcheckerror p => i_fcheckerror
 i_fcheckerror
 fclearerror
 
-fmove FR=l Dst=d | new_float_allocation() => fmove_new FR Dst
- 
-# The new instruction for moving a float out of a floating point register.
-# (No allocation.)
-fmove_new l d
-
 #
 # New apply instructions in R10B.
 #
@@ -1336,7 +1405,21 @@ apply I
 apply_last I P
 
 #
-# New GCing arithmetic instructions.
+# Optimize addition and subtraction of small literals using
+# the i_increment/4 instruction (in bodies, not in guards).
+#
+
+gc_bif2 p Live u$bif:erlang:splus/2 Int=i Reg=d Dst => \
+	gen_increment(Reg, Int, Live, Dst)
+gc_bif2 p Live u$bif:erlang:splus/2 Reg=d Int=i Dst => \
+	gen_increment(Reg, Int, Live, Dst)
+
+gc_bif2 p Live u$bif:erlang:sminus/2 Reg=d Int=i Dst | \
+	negation_is_small(Int) => \
+	gen_increment_from_minus(Reg, Int, Live, Dst)
+
+#
+# GCing arithmetic instructions.
 #
 
 gc_bif2 Fail I u$bif:erlang:splus/2 S1 S2 Dst=d => i_fetch S1 S2 | i_plus Fail I Dst
@@ -1359,6 +1442,10 @@ gc_bif1 Fail I u$bif:erlang:bnot/1 Src Dst=d => i_int_bnot Fail Src I Dst
 gc_bif1 Fail I u$bif:erlang:sminus/1 Src Dst=d => i_fetch i Src | i_minus Fail I Dst
 gc_bif1 Fail I u$bif:erlang:splus/1 Src Dst=d => i_fetch i Src | i_plus Fail I Dst
 
+i_increment r I I d
+i_increment x I I d
+i_increment y I I d
+
 i_plus j I d
 i_minus j I d
 i_times j I d
diff --git a/erts/emulator/beam/packet_parser.c b/erts/emulator/beam/packet_parser.c
index 8c8029d450..a66d60aa22 100644
--- a/erts/emulator/beam/packet_parser.c
+++ b/erts/emulator/beam/packet_parser.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2008-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2010. 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
@@ -47,11 +47,6 @@
                              (((unsigned char*) (s))[1] << 8) | \
                              (((unsigned char*) (s))[0]))
 
-#define put_int24(s, x) ((((unsigned char*)(s))[0] = ((x) >> 16) & 0xff), \
-                         (((unsigned char*)(s))[1] = ((x) >> 8) & 0xff), \
-                         (((unsigned char*)(s))[2] = (x) & 0xff))
-
-
 #if !defined(__WIN32__) && !defined(HAVE_STRNCASECMP)
 #define STRNCASECMP my_strncasecmp
 
@@ -679,7 +674,7 @@ int packet_parse_http(const char* buf, int len, int* statep,
             while (n && SP(ptr)) {
                 ptr++; n--;
             }
-            if (ptr==p0) return -1;
+            if (ptr==p0 && n>0) return -1;
             
             /* NOTE: the syntax allows empty reason phrases */
             (*statep) = !0;
@@ -833,7 +828,7 @@ int packet_parse_ssl(const char* buf, int len,
         char prefix[4];
         /* <<1:8,Length:24,Data/binary>> */
         prefix[0] = 1;
-        put_int24(&prefix[1],len-3);
+        put_int24(len-3,&prefix[1]);
         return pcb->ssl_tls(arg, 22, major, minor, buf+3, len-3, prefix, sizeof(prefix));
     } 
     else {
diff --git a/erts/emulator/beam/register.c b/erts/emulator/beam/register.c
index 900ebcbbf7..26d64887d0 100644
--- a/erts/emulator/beam/register.c
+++ b/erts/emulator/beam/register.c
@@ -39,8 +39,6 @@ static Hash process_reg;
 
 static erts_smp_rwmtx_t regtab_rwmtx;
 
-#define reg_lock_init()			erts_smp_rwmtx_init(&regtab_rwmtx, \
-							    "reg_tab")
 #define reg_try_read_lock()		erts_smp_rwmtx_tryrlock(&regtab_rwmtx)
 #define reg_try_write_lock()		erts_smp_rwmtx_tryrwlock(&regtab_rwmtx)
 #define reg_read_lock()			erts_smp_rwmtx_rlock(&regtab_rwmtx)
@@ -147,8 +145,11 @@ static void reg_free(RegProc *obj)
 void init_register_table(void)
 {
     HashFunctions f;
+    erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER;
+    rwmtx_opt.type = ERTS_SMP_RWMTX_TYPE_FREQUENT_READ;
+    rwmtx_opt.lived = ERTS_SMP_RWMTX_LONG_LIVED;
 
-    reg_lock_init();
+    erts_smp_rwmtx_init_opt(&regtab_rwmtx, &rwmtx_opt, "reg_tab");
 
     f.hash = (H_FUN) reg_hash;
     f.cmp  = (HCMP_FUN) reg_cmp;
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index ca87d3d70f..ff828ae889 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -25,14 +25,6 @@
 #  define NO_FPE_SIGNALS
 #endif
 
-/* Never use elib-malloc when purify-memory-tracing */
-#if defined(PURIFY)
-#undef ENABLE_ELIB_MALLOC
-#undef ELIB_HEAP_SBRK
-#undef ELIB_ALLOC_IS_CLIB
-#endif
-
-
 /* xxxP __VXWORKS__ */
 #ifdef VXWORKS
 #include <vxWorks.h>
@@ -47,13 +39,6 @@
 #define ENABLE_CHILD_WAITER_THREAD 1
 #endif
 
-/* The ERTS_TIMER_TREAD #define must be visible to the
-   erl_${OS}_sys.h #include files: it controls whether
-   certain optional facilities should be defined or not. */
-#if defined(ERTS_SMP) && 0
-#define ERTS_TIMER_THREAD
-#endif
-
 #if defined (__WIN32__)
 #  include "erl_win_sys.h"
 #elif defined (VXWORKS) 
@@ -171,23 +156,6 @@ void erl_assert_error(char* expr, char* file, int line);
 
 #include <stdarg.h>
 
-#if defined(__STDC__) || defined(_MSC_VER)
-#  define EXTERN_FUNCTION(t, f, x)  extern t f x
-#  define FUNCTION(t, f, x) t f x
-#  define _DOTS_ ...
-#  define _VOID_      void
-#elif defined(__cplusplus)
-#  define EXTERN_FUNCTION(f, x) extern "C" { f x }
-#  define FUNCTION(t, f, x) t f x
-#  define _DOTS_ ...
-#  define _VOID_    void
-#else
-#  define EXTERN_FUNCTION(t, f, x) extern t f (/*x*/)
-#  define FUNCTION(t, f, x) t f (/*x*/)
-#  define _DOTS_
-#  define _VOID_
-#endif
-
 /* This isn't sys-dependent, but putting it here benefits sys.c and drivers
    - allow use of 'const' regardless of compiler */
 
@@ -197,7 +165,7 @@ void erl_assert_error(char* expr, char* file, int line);
 
 #ifdef VXWORKS
 /* Replace VxWorks' printf with a real one that does fprintf(stdout, ...) */
-EXTERN_FUNCTION(int, real_printf, (const char *fmt, ...));
+int real_printf(const char *fmt, ...);
 #  define printf real_printf
 #endif
 
@@ -257,14 +225,14 @@ EXTERN_FUNCTION(int, real_printf, (const char *fmt, ...));
 #else
 #error Neither 32 nor 64 bit architecture
 #endif
-#ifdef ARCH_64
-#  ifdef HALFWORD_HEAP_EMULATOR
+#if defined(ARCH_64) && defined(HALFWORD_HEAP_EMULATOR)
 #    define HALFWORD_HEAP 1
 #    define HALFWORD_ASSERT 0
-#  else
+#    define ASSERT_HALFWORD(COND) ASSERT(COND)
+#else
 #    define HALFWORD_HEAP 0
 #    define HALFWORD_ASSERT 0
-#  endif
+#    define ASSERT_HALFWORD(COND)
 #endif
 
 #if SIZEOF_VOID_P != SIZEOF_SIZE_T
@@ -359,23 +327,20 @@ typedef unsigned char byte;
 #error 64-bit architecture, but no appropriate type to use for Uint64 and Sint64 found 
 #endif
 
-#if defined(ARCH_64)
-#  define ERTS_WORD_ALIGN_PAD_SZ(X) \
+#  define ERTS_EXTRA_DATA_ALIGN_SZ(X) \
     (((size_t) 8) - (((size_t) (X)) & ((size_t) 7)))
-#elif defined(ARCH_32)
-#  define ERTS_WORD_ALIGN_PAD_SZ(X) \
-    (((size_t) 4) - (((size_t) (X)) & ((size_t) 3)))
-#else
-#error "Not supported..."
-#endif
 
 #include "erl_lock_check.h"
+
+/* needed by erl_smp.h */
+int erts_send_warning_to_logger_str_nogl(char *);
+
 #include "erl_smp.h"
 
 #ifdef ERTS_WANT_BREAK_HANDLING
 #  ifdef ERTS_SMP
-extern erts_smp_atomic_t erts_break_requested;
-#    define ERTS_BREAK_REQUESTED ((int) erts_smp_atomic_read(&erts_break_requested))
+extern erts_smp_atomic32_t erts_break_requested;
+#    define ERTS_BREAK_REQUESTED ((int) erts_smp_atomic32_read(&erts_break_requested))
 #  else
 extern volatile int erts_break_requested;
 #    define ERTS_BREAK_REQUESTED erts_break_requested
@@ -388,8 +353,8 @@ void erts_do_break_handling(void);
 #    define ERTS_GOT_SIGUSR1 0
 #  else
 #    ifdef ERTS_SMP
-extern erts_smp_atomic_t erts_got_sigusr1;
-#      define ERTS_GOT_SIGUSR1 ((int) erts_smp_atomic_read(&erts_got_sigusr1))
+extern erts_smp_atomic32_t erts_got_sigusr1;
+#      define ERTS_GOT_SIGUSR1 ((int) erts_smp_atomic32_read(&erts_got_sigusr1))
 #    else
 extern volatile int erts_got_sigusr1;
 #      define ERTS_GOT_SIGUSR1 erts_got_sigusr1
@@ -498,8 +463,6 @@ static const int zero_value = 0, one_value = 1;
 #  endif /* !__WIN32__ */
 #endif /* WANT_NONBLOCKING */
 
-extern erts_cpu_info_t *erts_cpuinfo; /* erl_init.c */
-
 __decl_noreturn void __noreturn erl_exit(int n, char*, ...);
 
 /* Some special erl_exit() codes: */
@@ -558,7 +521,8 @@ int erts_send_info_to_logger_nogl(erts_dsprintf_buf_t *);
 int erts_send_warning_to_logger_nogl(erts_dsprintf_buf_t *);
 int erts_send_error_to_logger_nogl(erts_dsprintf_buf_t *);
 int erts_send_info_to_logger_str_nogl(char *);
-int erts_send_warning_to_logger_str_nogl(char *);
+/* needed by erl_smp.h (declared above)
+   int erts_send_warning_to_logger_str_nogl(char *); */
 int erts_send_error_to_logger_str_nogl(char *);
 
 typedef struct preload {
@@ -596,11 +560,7 @@ extern char *erts_default_arg0;
 extern char os_type[];
 
 extern int sys_init_time(void);
-#if defined(ERTS_TIMER_THREAD)
-#define erts_deliver_time()
-#else
 extern void erts_deliver_time(void);
-#endif
 extern void erts_time_remaining(SysTimeval *);
 extern int erts_init_time_sup(void);
 extern void erts_sys_init_float(void);
@@ -667,12 +627,12 @@ extern void erl_sys_args(int *argc, char **argv);
 extern void erl_sys_schedule(int);
 void sys_tty_reset(int);
 
-EXTERN_FUNCTION(int, sys_max_files, (_VOID_));
+int sys_max_files(void);
 void sys_init_io(void);
 Preload* sys_preloaded(void);
-EXTERN_FUNCTION(unsigned char*, sys_preload_begin, (Preload*));
-EXTERN_FUNCTION(void, sys_preload_end, (Preload*));
-EXTERN_FUNCTION(int, sys_get_key, (int));
+unsigned char* sys_preload_begin(Preload*);
+void sys_preload_end(Preload*);
+int sys_get_key(int);
 void elapsed_time_both(unsigned long *ms_user, unsigned long *ms_sys, 
 		       unsigned long *ms_user_diff, unsigned long *ms_sys_diff);
 void wall_clock_elapsed_time_both(unsigned long *ms_total, 
@@ -689,7 +649,7 @@ int local_to_univ(Sint *year, Sint *month, Sint *day,
 		  Sint *hour, Sint *minute, Sint *second, int isdst);
 void get_now(Uint*, Uint*, Uint*);
 void get_sys_now(Uint*, Uint*, Uint*);
-EXTERN_FUNCTION(void, set_break_quit, (void (*)(void), void (*)(void)));
+void set_break_quit(void (*)(void), void (*)(void));
 
 void os_flavor(char*, unsigned);
 void os_version(int*, int*, int*);
@@ -729,7 +689,7 @@ int erts_write_env(char *key, char *value);
 #define ERTS_DEFAULT_MMAP_THRESHOLD  (128 * 1024)
 #define ERTS_DEFAULT_MMAP_MAX        64
 
-EXTERN_FUNCTION(int, sys_alloc_opt, (int, int));
+int sys_alloc_opt(int, int);
 
 typedef struct {
   Sint trim_threshold;
@@ -738,7 +698,7 @@ typedef struct {
   Sint mmap_max;
 } SysAllocStat;
 
-EXTERN_FUNCTION(void, sys_alloc_stat, (SysAllocStat *));
+void sys_alloc_stat(SysAllocStat *);
 
 /* Block the whole system... */
 
@@ -762,11 +722,11 @@ typedef enum {
 } erts_activity_error_t;
 
 typedef struct {
-    erts_smp_atomic_t do_block;
+    erts_smp_atomic32_t do_block;
     struct {
-	erts_smp_atomic_t wait;
-	erts_smp_atomic_t gc;
-	erts_smp_atomic_t io;
+	erts_smp_atomic32_t wait;
+	erts_smp_atomic32_t gc;
+	erts_smp_atomic32_t io;
     } in_activity;
 } erts_system_block_state_t;
 
@@ -917,7 +877,7 @@ ERTS_GLB_INLINE int
 erts_smp_pending_system_block(void)
 {
 #ifdef ERTS_SMP
-    return erts_smp_atomic_read(&erts_system_block_state.do_block);
+    return (int) erts_smp_atomic32_read(&erts_system_block_state.do_block);
 #else
     return 0;
 #endif
@@ -953,7 +913,7 @@ erts_smp_set_activity(erts_activity_t old_activity,
     case ERTS_ACTIVITY_UNDEFINED:
 	break;
     case ERTS_ACTIVITY_WAIT:
-	erts_smp_atomic_dec(&erts_system_block_state.in_activity.wait);
+	erts_smp_atomic32_dec(&erts_system_block_state.in_activity.wait);
 	if (locked) {
 	    /* You are not allowed to leave activity waiting
 	     * without supplying the possibility to block
@@ -964,10 +924,10 @@ erts_smp_set_activity(erts_activity_t old_activity,
 	}
 	break;
     case ERTS_ACTIVITY_GC:
-	erts_smp_atomic_dec(&erts_system_block_state.in_activity.gc);
+	erts_smp_atomic32_dec(&erts_system_block_state.in_activity.gc);
 	break;
     case ERTS_ACTIVITY_IO:
-	erts_smp_atomic_dec(&erts_system_block_state.in_activity.io);
+	erts_smp_atomic32_dec(&erts_system_block_state.in_activity.io);
 	break;
     default:
 	erts_set_activity_error(ERTS_ACT_ERR_LEAVE_UNKNOWN_ACTIVITY,
@@ -983,13 +943,13 @@ erts_smp_set_activity(erts_activity_t old_activity,
     case ERTS_ACTIVITY_UNDEFINED:
 	break;
     case ERTS_ACTIVITY_WAIT:
-	erts_smp_atomic_inc(&erts_system_block_state.in_activity.wait);
+	erts_smp_atomic32_inc(&erts_system_block_state.in_activity.wait);
 	break;
     case ERTS_ACTIVITY_GC:
-	erts_smp_atomic_inc(&erts_system_block_state.in_activity.gc);
+	erts_smp_atomic32_inc(&erts_system_block_state.in_activity.gc);
 	break;
     case ERTS_ACTIVITY_IO:
-	erts_smp_atomic_inc(&erts_system_block_state.in_activity.io);
+	erts_smp_atomic32_inc(&erts_system_block_state.in_activity.io);
 	break;
     default:
 	erts_set_activity_error(ERTS_ACT_ERR_ENTER_UNKNOWN_ACTIVITY,
@@ -1024,27 +984,31 @@ erts_smp_set_activity(erts_activity_t old_activity,
 
 typedef erts_smp_atomic_t erts_refc_t;
 
-ERTS_GLB_INLINE void erts_refc_init(erts_refc_t *refcp, long val);
-ERTS_GLB_INLINE void erts_refc_inc(erts_refc_t *refcp, long min_val);
-ERTS_GLB_INLINE long erts_refc_inctest(erts_refc_t *refcp, long min_val);
-ERTS_GLB_INLINE void erts_refc_dec(erts_refc_t *refcp, long min_val);
-ERTS_GLB_INLINE long erts_refc_dectest(erts_refc_t *refcp, long min_val);
-ERTS_GLB_INLINE void erts_refc_add(erts_refc_t *refcp, long diff, long min_val);
-ERTS_GLB_INLINE long erts_refc_read(erts_refc_t *refcp, long min_val);
+ERTS_GLB_INLINE void erts_refc_init(erts_refc_t *refcp, erts_aint_t val);
+ERTS_GLB_INLINE void erts_refc_inc(erts_refc_t *refcp, erts_aint_t min_val);
+ERTS_GLB_INLINE erts_aint_t erts_refc_inctest(erts_refc_t *refcp,
+					      erts_aint_t min_val);
+ERTS_GLB_INLINE void erts_refc_dec(erts_refc_t *refcp, erts_aint_t min_val);
+ERTS_GLB_INLINE erts_aint_t erts_refc_dectest(erts_refc_t *refcp,
+					      erts_aint_t min_val);
+ERTS_GLB_INLINE void erts_refc_add(erts_refc_t *refcp, erts_aint_t diff,
+				   erts_aint_t min_val);
+ERTS_GLB_INLINE erts_aint_t erts_refc_read(erts_refc_t *refcp,
+					   erts_aint_t min_val);
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
 ERTS_GLB_INLINE void
-erts_refc_init(erts_refc_t *refcp, long val)
+erts_refc_init(erts_refc_t *refcp, erts_aint_t val)
 {
     erts_smp_atomic_init((erts_smp_atomic_t *) refcp, val);
 }
 
 ERTS_GLB_INLINE void
-erts_refc_inc(erts_refc_t *refcp, long min_val)
+erts_refc_inc(erts_refc_t *refcp, erts_aint_t min_val)
 {
 #ifdef ERTS_REFC_DEBUG
-    long val = erts_smp_atomic_inctest((erts_smp_atomic_t *) refcp);
+    erts_aint_t val = erts_smp_atomic_inctest((erts_smp_atomic_t *) refcp);
     if (val < min_val)
 	erl_exit(ERTS_ABORT_EXIT,
 		 "erts_refc_inc(): Bad refc found (refc=%ld < %ld)!\n",
@@ -1054,10 +1018,10 @@ erts_refc_inc(erts_refc_t *refcp, long min_val)
 #endif
 }
 
-ERTS_GLB_INLINE long
-erts_refc_inctest(erts_refc_t *refcp, long min_val)
+ERTS_GLB_INLINE erts_aint_t
+erts_refc_inctest(erts_refc_t *refcp, erts_aint_t min_val)
 {
-    long val = erts_smp_atomic_inctest((erts_smp_atomic_t *) refcp);
+    erts_aint_t val = erts_smp_atomic_inctest((erts_smp_atomic_t *) refcp);
 #ifdef ERTS_REFC_DEBUG
     if (val < min_val)
 	erl_exit(ERTS_ABORT_EXIT,
@@ -1068,10 +1032,10 @@ erts_refc_inctest(erts_refc_t *refcp, long min_val)
 }
 
 ERTS_GLB_INLINE void
-erts_refc_dec(erts_refc_t *refcp, long min_val)
+erts_refc_dec(erts_refc_t *refcp, erts_aint_t min_val)
 {
 #ifdef ERTS_REFC_DEBUG
-    long val = erts_smp_atomic_dectest((erts_smp_atomic_t *) refcp);
+    erts_aint_t val = erts_smp_atomic_dectest((erts_smp_atomic_t *) refcp);
     if (val < min_val)
 	erl_exit(ERTS_ABORT_EXIT,
 		 "erts_refc_dec(): Bad refc found (refc=%ld < %ld)!\n",
@@ -1081,10 +1045,10 @@ erts_refc_dec(erts_refc_t *refcp, long min_val)
 #endif
 }
 
-ERTS_GLB_INLINE long
-erts_refc_dectest(erts_refc_t *refcp, long min_val)
+ERTS_GLB_INLINE erts_aint_t
+erts_refc_dectest(erts_refc_t *refcp, erts_aint_t min_val)
 {
-    long val = erts_smp_atomic_dectest((erts_smp_atomic_t *) refcp);
+    erts_aint_t val = erts_smp_atomic_dectest((erts_smp_atomic_t *) refcp);
 #ifdef ERTS_REFC_DEBUG
     if (val < min_val)
 	erl_exit(ERTS_ABORT_EXIT,
@@ -1095,10 +1059,10 @@ erts_refc_dectest(erts_refc_t *refcp, long min_val)
 }
 
 ERTS_GLB_INLINE void
-erts_refc_add(erts_refc_t *refcp, long diff, long min_val)
+erts_refc_add(erts_refc_t *refcp, erts_aint_t diff, erts_aint_t min_val)
 {
 #ifdef ERTS_REFC_DEBUG
-    long val = erts_smp_atomic_addtest((erts_smp_atomic_t *) refcp, diff);
+    erts_aint_t val = erts_smp_atomic_addtest((erts_smp_atomic_t *) refcp, diff);
     if (val < min_val)
 	erl_exit(ERTS_ABORT_EXIT,
 		 "erts_refc_add(%ld): Bad refc found (refc=%ld < %ld)!\n",
@@ -1108,10 +1072,10 @@ erts_refc_add(erts_refc_t *refcp, long diff, long min_val)
 #endif
 }
 
-ERTS_GLB_INLINE long
-erts_refc_read(erts_refc_t *refcp, long min_val)
+ERTS_GLB_INLINE erts_aint_t
+erts_refc_read(erts_refc_t *refcp, erts_aint_t min_val)
 {
-    long val = erts_smp_atomic_read((erts_smp_atomic_t *) refcp);
+    erts_aint_t val = erts_smp_atomic_read((erts_smp_atomic_t *) refcp);
 #ifdef ERTS_REFC_DEBUG
     if (val < min_val)
 	erl_exit(ERTS_ABORT_EXIT,
@@ -1127,13 +1091,10 @@ erts_refc_read(erts_refc_t *refcp, long min_val)
 extern int erts_use_kernel_poll;
 #endif
 
-void elib_ensure_initialized(void);
-
-
 #if defined(VXWORKS)
 /* NOTE! sys_calloc2 does not exist on other 
    platforms than VxWorks and OSE */
-EXTERN_FUNCTION(void*, sys_calloc2, (Uint, Uint));
+void* sys_calloc2(Uint, Uint);
 #endif /* VXWORKS || OSE */
 
 
@@ -1203,6 +1164,15 @@ EXTERN_FUNCTION(void*, sys_calloc2, (Uint, Uint));
                             ((char*)(s))[3] = (char)(i)         & 0xff;} \
                         while (0)
 
+#define get_int24(s) ((((unsigned char*) (s))[0] << 16) | \
+                      (((unsigned char*) (s))[1] << 8)  | \
+                      (((unsigned char*) (s))[2]))
+
+#define put_int24(i, s) do {((char*)(s))[0] = (char)((i) >> 16) & 0xff;  \
+                            ((char*)(s))[1] = (char)((i) >> 8)  & 0xff;  \
+                            ((char*)(s))[2] = (char)(i)         & 0xff;} \
+                        while (0)
+
 #define get_int16(s) ((((unsigned char*)  (s))[0] << 8) | \
                       (((unsigned char*)  (s))[1]))
 
@@ -1216,6 +1186,7 @@ EXTERN_FUNCTION(void*, sys_calloc2, (Uint, Uint));
 
 #define put_int8(i, s) do {((unsigned char*)(s))[0] = (i) & 0xff;} while (0)
 
+
 /*
  * Use DEBUGF as you would use printf, but use double parentheses:
  *
@@ -1225,8 +1196,8 @@ EXTERN_FUNCTION(void*, sys_calloc2, (Uint, Uint));
  */
 
 #ifdef DEBUG
-EXTERN_FUNCTION(void, erl_debug, (char* format, ...));
-EXTERN_FUNCTION(void, erl_bin_write, (unsigned char *, int, int));
+void erl_debug(char* format, ...);
+void erl_bin_write(unsigned char *, int, int);
 
 #  define DEBUGF(x) erl_debug x
 #else
@@ -1280,6 +1251,22 @@ char* win32_errorstr(int);
 
 #endif
 
+/************************************************************************
+ * Find out the native filename encoding of the process (look at locale of 
+ * Unix processes and just do UTF16 on windows 
+ ************************************************************************/
+#define ERL_FILENAME_UNKNOWN 0
+#define ERL_FILENAME_LATIN1 1
+#define ERL_FILENAME_UTF8 2
+#define ERL_FILENAME_UTF8_MAC 3
+#define ERL_FILENAME_WIN_WCHAR 4
+
+int erts_get_native_filename_encoding(void);
+/* The set function is only to be used by erl_init! */
+void erts_set_user_requested_filename_encoding(int encoding); 
+int erts_get_user_requested_filename_encoding(void);
+
+void erts_init_sys_common_misc(void);
 
 #endif
 
diff --git a/erts/emulator/beam/time.c b/erts/emulator/beam/time.c
index a07d6a5327..c65cc37fc6 100644
--- a/erts/emulator/beam/time.c
+++ b/erts/emulator/beam/time.c
@@ -83,24 +83,8 @@
 #define ASSERT_NO_LOCKED_LOCKS
 #endif
 
+static erts_smp_mtx_t tiw_lock;
 
-#if defined(ERTS_TIMER_THREAD) || 1
-/* I don't yet know why, but using a mutex instead of a spinlock
-   or spin-based rwlock avoids excessive delays at startup. */
-static erts_smp_rwmtx_t tiw_lock;
-#define tiw_read_lock()		erts_smp_rwmtx_rlock(&tiw_lock)
-#define tiw_read_unlock()	erts_smp_rwmtx_runlock(&tiw_lock)
-#define tiw_write_lock()	erts_smp_rwmtx_rwlock(&tiw_lock)
-#define tiw_write_unlock()	erts_smp_rwmtx_rwunlock(&tiw_lock)
-#define tiw_init_lock()		erts_smp_rwmtx_init(&tiw_lock, "timer_wheel")
-#else
-static erts_smp_rwlock_t tiw_lock;
-#define tiw_read_lock()		erts_smp_read_lock(&tiw_lock)
-#define tiw_read_unlock()	erts_smp_read_unlock(&tiw_lock)
-#define tiw_write_lock()	erts_smp_write_lock(&tiw_lock)
-#define tiw_write_unlock()	erts_smp_write_unlock(&tiw_lock)
-#define tiw_init_lock()		erts_smp_rwlock_init(&tiw_lock, "timer_wheel")
-#endif
 
 /* BEGIN tiw_lock protected variables 
 **
@@ -115,80 +99,37 @@ static erts_smp_rwlock_t tiw_lock;
 static ErlTimer** tiw;		/* the timing wheel, allocated in init_time() */
 static Uint tiw_pos;		/* current position in wheel */
 static Uint tiw_nto;		/* number of timeouts in wheel */
+static Uint tiw_min;
+static ErlTimer *tiw_min_ptr;
 
 /* END tiw_lock protected variables */
 
 /* Actual interval time chosen by sys_init_time() */
 static int itime; /* Constant after init */
 
-#if defined(ERTS_TIMER_THREAD)
-static SysTimeval time_start;	/* start of current time interval */
-static long ticks_end;		/* time_start+ticks_end == time_wakeup */
-static long ticks_latest;	/* delta from time_start at latest time update*/
-
-static ERTS_INLINE long time_gettimeofday(SysTimeval *now)
-{
-    long elapsed;
-
-    erts_get_timeval(now);
-    now->tv_usec = 1000 * (now->tv_usec / 1000); /* ms resolution */
-    elapsed = (1000 * (now->tv_sec - time_start.tv_sec) +
-	       (now->tv_usec - time_start.tv_usec) / 1000);
-    // elapsed /= CLOCK_RESOLUTION;
-    return elapsed;
-}
-
-static long do_time_update(void)
-{
-    SysTimeval now;
-    long elapsed;
-
-    elapsed = time_gettimeofday(&now);
-    ticks_latest = elapsed;
-    return elapsed;
-}
-
-static ERTS_INLINE long do_time_read(void)
-{
-    return ticks_latest;
-}
-
-static long do_time_reset(void)
-{
-    SysTimeval now;
-    long elapsed;
-
-    elapsed = time_gettimeofday(&now);
-    time_start = now;
-    ticks_end = LONG_MAX;
-    ticks_latest = 0;
-    return elapsed;
-}
-
-static ERTS_INLINE void do_time_init(void)
-{
-    (void)do_time_reset();
-}
-
-#else
 erts_smp_atomic_t do_time;	/* set at clock interrupt */
-static ERTS_INLINE long do_time_read(void) { return erts_smp_atomic_read(&do_time); }
-static ERTS_INLINE long do_time_update(void) { return do_time_read(); }
+static ERTS_INLINE erts_aint_t do_time_read(void) { return erts_smp_atomic_read(&do_time); }
+static ERTS_INLINE erts_aint_t do_time_update(void) { return do_time_read(); }
 static ERTS_INLINE void do_time_init(void) { erts_smp_atomic_init(&do_time, 0L); }
-#endif
 
 /* get the time (in units of itime) to the next timeout,
    or -1 if there are no timeouts                     */
 
-static int next_time_internal(void) /* PRE: tiw_lock taken by caller */
+static erts_aint_t next_time_internal(void) /* PRE: tiw_lock taken by caller */
 {
     int i, tm, nto;
     unsigned int min;
     ErlTimer* p;
-    long dt;
+    erts_aint_t dt;
   
     if (tiw_nto == 0)
 	return -1;	/* no timeouts in wheel */
+
+    if (tiw_min_ptr) {
+	min = tiw_min;
+	dt  = do_time_read();
+	return ((min >= dt) ? (min - dt) : 0);
+    }
   
     /* start going through wheel to find next timeout */
     tm = nto = 0;
@@ -201,11 +142,17 @@ static int next_time_internal(void) /* PRE: tiw_lock taken by caller */
 	    if (p->count == 0) {
 		/* found next timeout */
 		dt = do_time_read();
+		/* p->count is zero */
+		tiw_min_ptr = p;
+		tiw_min     = tm;
 		return ((tm >= dt) ? (tm - dt) : 0);
 	    } else {
 		/* keep shortest time in 'min' */
-		if (tm + p->count*TIW_SIZE < min)
+		if (tm + p->count*TIW_SIZE < min) {
 		    min = tm + p->count*TIW_SIZE;
+		    tiw_min_ptr = p;
+		    tiw_min     = min;
+		}
 	    }
 	    p = p->next;
 	}
@@ -218,30 +165,53 @@ static int next_time_internal(void) /* PRE: tiw_lock taken by caller */
     return ((min >= dt) ? (min - dt) : 0);
 }
 
-#if !defined(ERTS_TIMER_THREAD)
+static void remove_timer(ErlTimer *p) {
+    /* first */
+    if (!p->prev) {
+	tiw[p->slot] = p->next;
+	if(p->next)
+	    p->next->prev = NULL;
+    } else {
+	p->prev->next = p->next;
+    }
+
+    /* last */
+    if (!p->next) {
+	if (p->prev)
+	    p->prev->next = NULL;
+    } else {
+	p->next->prev = p->prev;
+    }
+
+    p->next = NULL;
+    p->prev = NULL;
+    /* Make sure cancel callback isn't called */
+    p->active = 0;
+    tiw_nto--;
+}
+
 /* Private export to erl_time_sup.c */
-int next_time(void)
+erts_aint_t erts_next_time(void)
 {
-    int ret;
+    erts_aint_t ret;
 
-    tiw_write_lock();
+    erts_smp_mtx_lock(&tiw_lock);
     (void)do_time_update();
     ret = next_time_internal();
-    tiw_write_unlock();
+    erts_smp_mtx_unlock(&tiw_lock);
     return ret;
 }
-#endif
 
-static ERTS_INLINE void bump_timer_internal(long dt) /* PRE: tiw_lock is write-locked */
+static ERTS_INLINE void bump_timer_internal(erts_aint_t dt) /* PRE: tiw_lock is write-locked */
 {
     Uint keep_pos;
     Uint count;
     ErlTimer *p, **prev, *timeout_head, **timeout_tail;
-    Uint dtime = (unsigned long)dt;  
+    Uint dtime = (Uint) dt;  
 
     /* no need to bump the position if there aren't any timeouts */
     if (tiw_nto == 0) {
-	tiw_write_unlock();
+	erts_smp_mtx_unlock(&tiw_lock);
 	return;
     }
 
@@ -258,12 +228,16 @@ static ERTS_INLINE void bump_timer_internal(long dt) /* PRE: tiw_lock is write-l
 	if (tiw_pos == keep_pos) count--;
 	prev = &tiw[tiw_pos];
 	while ((p = *prev) != NULL) {
+	    ASSERT( p != p->next);
 	    if (p->count < count) {     /* we have a timeout */
-		*prev = p->next;	/* Remove from list */
-		tiw_nto--;
-		p->next = NULL;
-		p->active = 0;		/* Make sure cancel callback
-					   isn't called */
+		/* remove min time */
+		if (tiw_min_ptr == p) {
+		    tiw_min_ptr = NULL;
+		    tiw_min = 0;
+		}
+
+		/* Remove from list */
+		remove_timer(p);
 		*timeout_tail = p;	/* Insert in timeout queue */
 		timeout_tail = &p->next;
 	    }
@@ -277,8 +251,10 @@ static ERTS_INLINE void bump_timer_internal(long dt) /* PRE: tiw_lock is write-l
 	dtime--;
     }
     tiw_pos = keep_pos;
+    if (tiw_min_ptr)
+	tiw_min -= dt;
     
-    tiw_write_unlock();
+    erts_smp_mtx_unlock(&tiw_lock);
     
     /* Call timedout timers callbacks */
     while (timeout_head) {
@@ -291,24 +267,17 @@ static ERTS_INLINE void bump_timer_internal(long dt) /* PRE: tiw_lock is write-l
 	 * callback is called.
 	 */
 	p->next = NULL;
+	p->prev = NULL;
 	p->slot = 0;
 	(*p->timeout)(p->arg);
     }
 }
 
-#if defined(ERTS_TIMER_THREAD)
-static void timer_thread_bump_timer(void)
+void erts_bump_timer(erts_aint_t dt) /* dt is value from do_time */
 {
-    tiw_write_lock();
-    bump_timer_internal(do_time_reset());
-}
-#else
-void bump_timer(long dt) /* dt is value from do_time */
-{
-    tiw_write_lock();
+    erts_smp_mtx_lock(&tiw_lock);
     bump_timer_internal(dt);
 }
-#endif
 
 Uint
 erts_timer_wheel_memory_size(void)
@@ -316,82 +285,10 @@ erts_timer_wheel_memory_size(void)
     return (Uint) TIW_SIZE * sizeof(ErlTimer*);
 }
 
-#if defined(ERTS_TIMER_THREAD)
-static struct erts_iwait *timer_thread_iwait;
-
-static int timer_thread_setup_delay(SysTimeval *rem_time)
-{
-    long elapsed;
-    int ticks;
-
-    tiw_write_lock();
-    elapsed = do_time_update();
-    ticks = next_time_internal();
-    if (ticks == -1)	/* timer queue empty */
-	ticks = 100*1000*1000;
-    if (elapsed > ticks)
-	elapsed = ticks;
-    ticks -= elapsed;
-    //ticks *= CLOCK_RESOLUTION;
-    rem_time->tv_sec = ticks / 1000;
-    rem_time->tv_usec = 1000 * (ticks % 1000);
-    ticks_end = ticks;
-    tiw_write_unlock();
-    return ticks;
-}
-
-static void *timer_thread_start(void *ignore)
-{
-    SysTimeval delay;
-
-#ifdef ERTS_ENABLE_LOCK_CHECK
-    erts_lc_set_thread_name("timer");
-#endif
-    erts_register_blockable_thread();
-
-    for(;;) {
-	if (timer_thread_setup_delay(&delay)) {
-	    erts_smp_activity_begin(ERTS_ACTIVITY_WAIT, NULL, NULL, NULL);
-	    ASSERT_NO_LOCKED_LOCKS;
-	    erts_iwait_wait(timer_thread_iwait, &delay);
-	    ASSERT_NO_LOCKED_LOCKS;
-	    erts_smp_activity_end(ERTS_ACTIVITY_WAIT, NULL, NULL, NULL);
-	}
-	else
-	    erts_smp_chk_system_block(NULL, NULL, NULL);
-	timer_thread_bump_timer();
-	ASSERT_NO_LOCKED_LOCKS;
-    }
-    /*NOTREACHED*/
-    return NULL;
-}
-
-static ERTS_INLINE void timer_thread_post_insert(Uint ticks)
-{
-    if ((Sint)ticks < ticks_end)
-	erts_iwait_interrupt(timer_thread_iwait);
-}
-
-static void timer_thread_init(void)
-{
-    erts_thr_opts_t opts = ERTS_THR_OPTS_DEFAULT_INITER;
-    erts_tid_t tid;
-
-    opts->detached = 1;
-
-    timer_thread_iwait = erts_iwait_init();
-    erts_thr_create(&tid, timer_thread_start, NULL, &opts);
-}
-
-#else
-static ERTS_INLINE void timer_thread_post_insert(Uint ticks) { }
-static ERTS_INLINE void timer_thread_init(void) { }
-#endif
-
 /* this routine links the time cells into a free list at the start
    and sets the time queue as empty */
 void
-init_time(void)
+erts_init_time(void)
 {
     int i;
 
@@ -399,7 +296,7 @@ init_time(void)
        if timer thread is enabled */
     itime = erts_init_time_sup();
 
-    tiw_init_lock();
+    erts_smp_mtx_init(&tiw_lock, "timer_wheel");
 
     tiw = (ErlTimer**) erts_alloc(ERTS_ALC_T_TIMER_WHEEL,
 				  TIW_SIZE * sizeof(ErlTimer*));
@@ -407,10 +304,13 @@ init_time(void)
 	tiw[i] = NULL;
     do_time_init();
     tiw_pos = tiw_nto = 0;
-
-    timer_thread_init();
+    tiw_min_ptr = NULL;
+    tiw_min = 0;
 }
 
+
+
+
 /*
 ** Insert a process into the time queue, with a timeout 't'
 */
@@ -440,20 +340,35 @@ insert_timer(ErlTimer* p, Uint t)
   
     /* insert at head of list at slot */
     p->next = tiw[tm];
+    p->prev = NULL;
+    if (p->next != NULL)
+	p->next->prev = p;
     tiw[tm] = p;
-    tiw_nto++;
 
-    timer_thread_post_insert(ticks);
+
+    /* insert min time */
+    if ((tiw_nto == 0) || ((tiw_min_ptr != NULL) && (ticks < tiw_min))) {
+	tiw_min = ticks;
+	tiw_min_ptr = p;
+    }
+    if ((tiw_min_ptr == p) && (ticks > tiw_min)) {
+	/* some other timer might be 'min' now */
+	tiw_min = 0;
+	tiw_min_ptr = NULL;
+    }
+
+    tiw_nto++;
 }
 
 void
-erl_set_timer(ErlTimer* p, ErlTimeoutProc timeout, ErlCancelProc cancel,
+erts_set_timer(ErlTimer* p, ErlTimeoutProc timeout, ErlCancelProc cancel,
 	      void* arg, Uint t)
 {
+
     erts_deliver_time();
-    tiw_write_lock();
+    erts_smp_mtx_lock(&tiw_lock);
     if (p->active) { /* XXX assert ? */
-	tiw_write_unlock();
+	erts_smp_mtx_unlock(&tiw_lock);
 	return;
     }
     p->timeout = timeout;
@@ -461,45 +376,37 @@ erl_set_timer(ErlTimer* p, ErlTimeoutProc timeout, ErlCancelProc cancel,
     p->arg = arg;
     p->active = 1;
     insert_timer(p, t);
-    tiw_write_unlock();
-#if defined(ERTS_SMP) && !defined(ERTS_TIMER_THREAD)
+    erts_smp_mtx_unlock(&tiw_lock);
+#if defined(ERTS_SMP)
     if (t <= (Uint) LONG_MAX)
 	erts_sys_schedule_interrupt_timed(1, (long) t);
 #endif
 }
 
 void
-erl_cancel_timer(ErlTimer* p)
+erts_cancel_timer(ErlTimer* p)
 {
-    ErlTimer *tp;
-    ErlTimer **prev;
-
-    tiw_write_lock();
+    erts_smp_mtx_lock(&tiw_lock);
     if (!p->active) { /* allow repeated cancel (drivers) */
-	tiw_write_unlock();
+	erts_smp_mtx_unlock(&tiw_lock);
 	return;
     }
-    /* find p in linked list at slot p->slot and remove it */
-    prev = &tiw[p->slot];
-    while ((tp = *prev) != NULL) {
-	if (tp == p) {
-	    *prev = p->next;	/* Remove from list */
-	    tiw_nto--;
-	    p->next = NULL;
-	    p->slot = p->count = 0;
-	    p->active = 0;
-	    if (p->cancel != NULL) {
-		tiw_write_unlock();
-		(*p->cancel)(p->arg);
-	    } else {
-		tiw_write_unlock();
-	    }
-	    return;
-	} else {
-	    prev = &tp->next;
-	}
+
+    /* is it the 'min' timer, remove min */
+    if (p == tiw_min_ptr) {
+	tiw_min_ptr = NULL;
+	tiw_min     = 0;
     }
-    tiw_write_unlock();
+
+    remove_timer(p);
+    p->slot = p->count = 0;
+
+    if (p->cancel != NULL) {
+	erts_smp_mtx_unlock(&tiw_lock);
+	(*p->cancel)(p->arg);
+	return;
+    }
+    erts_smp_mtx_unlock(&tiw_lock);
 }
 
 /*
@@ -509,15 +416,15 @@ erl_cancel_timer(ErlTimer* p)
   immediately if it hadn't been cancelled).
 */
 Uint
-time_left(ErlTimer *p)
+erts_time_left(ErlTimer *p)
 {
     Uint left;
-    long dt;
+    erts_aint_t dt;
 
-    tiw_read_lock();
+    erts_smp_mtx_lock(&tiw_lock);
 
     if (!p->active) {
-	tiw_read_unlock();
+	erts_smp_mtx_unlock(&tiw_lock);
 	return 0;
     }
 
@@ -531,19 +438,18 @@ time_left(ErlTimer *p)
     else
 	left -= dt;
 
-    tiw_read_unlock();
+    erts_smp_mtx_unlock(&tiw_lock);
 
-    return left * itime;
+    return (Uint) left * itime;
 }
 
 #ifdef DEBUG
-
-void p_slpq()
+void erts_p_slpq()
 {
     int i;
     ErlTimer* p;
   
-    tiw_read_lock();
+    erts_smp_mtx_lock(&tiw_lock);
 
     /* print the whole wheel, starting at the current position */
     erts_printf("\ntiw_pos = %d tiw_nto %d\n", tiw_pos, tiw_nto);
@@ -565,7 +471,6 @@ void p_slpq()
 	}
     }
 
-    tiw_read_unlock();
+    erts_smp_mtx_unlock(&tiw_lock);
 }
-
 #endif /* DEBUG */
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index 445a8eebd9..f531d1430b 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -48,24 +48,17 @@
 #undef M_MMAP_THRESHOLD
 #undef M_MMAP_MAX
 
-#if !defined(ELIB_ALLOC_IS_CLIB) && defined(__GLIBC__) && defined(HAVE_MALLOC_H)
+#if defined(__GLIBC__) && defined(HAVE_MALLOC_H)
 #include <malloc.h>
 #endif
 
-#if defined(ELIB_ALLOC_IS_CLIB) || !defined(HAVE_MALLOPT)
+#if !defined(HAVE_MALLOPT)
 #undef  HAVE_MALLOPT
 #define HAVE_MALLOPT 0
 #endif
 
 /* profile_scheduler mini message queue */
 
-#ifdef ERTS_TIMER_THREAD
-/* A timer thread is not welcomed with this lock violation work around.
- * - Bj�rn-Egil
- */
-#error Timer thread may not be enabled due to lock violation.
-#endif
-
 typedef struct {
     Uint scheduler_id;
     Uint no_schedulers;
@@ -98,7 +91,7 @@ dispatch_profile_msg_q(profile_sched_msg_q *psmq)
 
 
 Eterm*
-erts_heap_alloc(Process* p, Uint need)
+erts_heap_alloc(Process* p, Uint need, Uint xtra)
 {
     ErlHeapFragment* bp;
     Eterm* htop;
@@ -124,7 +117,7 @@ erts_heap_alloc(Process* p, Uint need)
     p->space_verified_from = NULL;
 #endif /* FORCE_HEAP_FRAGS */
 
-    n = need;
+    n = need + xtra;
     bp = MBUF(p);
     if (bp != NULL && need <= (bp->alloc_size - bp->used_size)) {
 	Eterm* ret = bp->mem + bp->used_size;
@@ -160,15 +153,10 @@ erts_heap_alloc(Process* p, Uint need)
     bp->next = MBUF(p);
     MBUF(p) = bp;
     bp->alloc_size = n;
-    bp->used_size = n;
+    bp->used_size = need;
     MBUF_SIZE(p) += n;
-    bp->off_heap.mso = NULL;
-#ifndef HYBRID /* FIND ME! */
-    bp->off_heap.funs = NULL;
-#endif
-    bp->off_heap.externals = NULL;
+    bp->off_heap.first = NULL;
     bp->off_heap.overhead = 0;
-
     return bp->mem;
 }
 
@@ -409,7 +397,7 @@ erts_bld_uint64(Uint **hpp, Uint *szp, Uint64 ui64)
     }
     else {
 	if (szp)
-	    *szp = ERTS_UINT64_HEAP_SIZE(ui64);
+	    *szp += ERTS_UINT64_HEAP_SIZE(ui64);
 	if (hpp)
 	    res = erts_uint64_to_big(ui64, hpp);
     }
@@ -426,7 +414,7 @@ erts_bld_sint64(Uint **hpp, Uint *szp, Sint64 si64)
     }
     else {
 	if (szp)
-	    *szp = ERTS_SINT64_HEAP_SIZE(si64);
+	    *szp += ERTS_SINT64_HEAP_SIZE(si64);
 	if (hpp)
 	    res = erts_sint64_to_big(si64, hpp);
     }
@@ -510,7 +498,7 @@ erts_bld_string_n(Uint **hpp, Uint *szp, const char *str, Sint len)
     if (hpp) {
 	res = NIL;
 	while (--i >= 0) {
-	    res = CONS(*hpp, make_small(str[i]), res);
+	    res = CONS(*hpp, make_small((byte) str[i]), res);
 	    *hpp += 2;
 	}
     }
@@ -1906,34 +1894,36 @@ erts_destroy_tmp_dsbuf(erts_dsprintf_buf_t *dsbufp)
     erts_free(ERTS_ALC_T_TMP_DSBUF, (void *) dsbufp);
 }
 
-
 /* eq and cmp are written as separate functions a eq is a little faster */
 
 /*
  * Test for equality of two terms.
  * Returns 0 if not equal, or a non-zero value otherwise.
  */
-
+#if HALFWORD_HEAP
+int eq_rel(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base)
+#else
 int eq(Eterm a, Eterm b)
+#endif
 {
     DECLARE_WSTACK(stack);
     Sint sz;
     Eterm* aa;
-    Eterm* bb;	
+    Eterm* bb;
 
 tailrecur:
-    if (a == b) goto pop_next; 
+    if (is_same(a, a_base, b, b_base)) goto pop_next;
 tailrecur_ne:
 
     switch (primary_tag(a)) {
     case TAG_PRIMARY_LIST:
 	if (is_list(b)) {
-	    Eterm* aval = list_val(a);
-	    Eterm* bval = list_val(b);
+	    Eterm* aval = list_val_rel(a, a_base);
+	    Eterm* bval = list_val_rel(b, b_base);
 	    while (1) {
 		Eterm atmp = CAR(aval);
 		Eterm btmp = CAR(bval);
-		if (atmp != btmp) {
+		if (!is_same(atmp,a_base,btmp,b_base)) {
 		    WSTACK_PUSH2(stack,(UWord) CDR(bval),(UWord) CDR(aval));
 		    a = atmp;
 		    b = btmp;
@@ -1941,7 +1931,7 @@ tailrecur_ne:
 		}
 		atmp = CDR(aval);
 		btmp = CDR(bval);
-		if (atmp == btmp) {
+		if (is_same(atmp,a_base,btmp,b_base)) {
 		    goto pop_next;
 		}
 		if (is_not_list(atmp) || is_not_list(btmp)) {
@@ -1949,22 +1939,22 @@ tailrecur_ne:
 		    b = btmp;
 		    goto tailrecur_ne;
 		}
-		aval = list_val(atmp);
-		bval = list_val(btmp);
+		aval = list_val_rel(atmp, a_base);
+		bval = list_val_rel(btmp, b_base);
 	    }
 	}
 	break; /* not equal */
 
     case TAG_PRIMARY_BOXED:
 	{	
-	    Eterm hdr = *boxed_val(a);
+	    Eterm hdr = *boxed_val_rel(a,a_base);
 	    switch (hdr & _TAG_HEADER_MASK) {
 	    case ARITYVAL_SUBTAG:
 		{
-		    aa = tuple_val(a);
-		    if (!is_boxed(b) || *boxed_val(b) != *aa)
+		    aa = tuple_val_rel(a, a_base);
+		    if (!is_boxed(b) || *boxed_val_rel(b,b_base) != *aa)
 			goto not_equal;
-		    bb = tuple_val(b);
+		    bb = tuple_val_rel(b,b_base);
 		    if ((sz = arityval(*aa)) == 0) goto pop_next;
 		    ++aa;
 		    ++bb;
@@ -1983,16 +1973,16 @@ tailrecur_ne:
 		    Uint a_bitoffs;
 		    Uint b_bitoffs;
 		    
-		    if (is_not_binary(b)) {
+		    if (!is_binary_rel(b,b_base)) {
 			goto not_equal;
 		    }
-		    a_size = binary_size(a);
-		    b_size = binary_size(b); 
+		    a_size = binary_size_rel(a,a_base);
+		    b_size = binary_size_rel(b,b_base);
 		    if (a_size != b_size) {
 			goto not_equal;
 		    }
-		    ERTS_GET_BINARY_BYTES(a, a_ptr, a_bitoffs, a_bitsize);
-		    ERTS_GET_BINARY_BYTES(b, b_ptr, b_bitoffs, b_bitsize);
+		    ERTS_GET_BINARY_BYTES_REL(a, a_ptr, a_bitoffs, a_bitsize, a_base);
+		    ERTS_GET_BINARY_BYTES_REL(b, b_ptr, b_bitoffs, b_bitsize, b_base);
 		    if ((a_bitsize | b_bitsize | a_bitoffs | b_bitoffs) == 0) {
 			if (sys_memcmp(a_ptr, b_ptr, a_size) == 0) goto pop_next;
 		    } else if (a_bitsize == b_bitsize) {
@@ -2003,9 +1993,9 @@ tailrecur_ne:
 		}
 	    case EXPORT_SUBTAG:
 		{
-		    if (is_export(b)) {
-			Export* a_exp = *((Export **) (export_val(a) + 1));
-			Export* b_exp = *((Export **) (export_val(b) + 1));
+		    if (is_export_rel(b,b_base)) {
+			Export* a_exp = *((Export **) (export_val_rel(a,a_base) + 1));
+			Export* b_exp = *((Export **) (export_val_rel(b,b_base) + 1));
 			if (a_exp == b_exp) goto pop_next;
 		    }
 		    break; /* not equal */
@@ -2015,10 +2005,10 @@ tailrecur_ne:
 		    ErlFunThing* f1;
 		    ErlFunThing* f2;
   
-		    if (is_not_fun(b))
+		    if (!is_fun_rel(b,b_base))
 			goto not_equal;
-		    f1 = (ErlFunThing *) fun_val(a);
-		    f2 = (ErlFunThing *) fun_val(b);
+		    f1 = (ErlFunThing *) fun_val_rel(a,a_base);
+		    f2 = (ErlFunThing *) fun_val_rel(b,b_base);
 		    if (f1->fe->module != f2->fe->module ||
 			f1->fe->old_index != f2->fe->old_index ||
 			f1->fe->old_uniq != f2->fe->old_uniq ||
@@ -2036,15 +2026,15 @@ tailrecur_ne:
 		ExternalThing *ap;
 		ExternalThing *bp;
 
-		if(is_not_external(b))
+		if(!is_external_rel(b,b_base))
 		    goto not_equal;
 
-		ap = external_thing_ptr(a);
-		bp = external_thing_ptr(b);
+		ap = external_thing_ptr_rel(a,a_base);
+		bp = external_thing_ptr_rel(b,b_base);
 
 		if(ap->header == bp->header && ap->node == bp->node) {
-		    ASSERT(1 == external_data_words(a));
-		    ASSERT(1 == external_data_words(b));
+		    ASSERT(1 == external_data_words_rel(a,a_base));
+		    ASSERT(1 == external_data_words_rel(b,b_base));
 		    
 		    if (ap->data.ui[0] == bp->data.ui[0]) goto pop_next;
 		}
@@ -2062,27 +2052,36 @@ tailrecur_ne:
 		Uint alen;
 		Uint blen;
 		Uint i;
+		ExternalThing* athing;
+		ExternalThing* bthing;
 
-		if(is_not_external_ref(b))
+		if(!is_external_ref_rel(b,b_base))
 		    goto not_equal;
 
-		if(external_node(a) != external_node(b))
+		athing = external_thing_ptr_rel(a,a_base);
+		bthing = external_thing_ptr_rel(b,b_base);
+
+		if(athing->node != bthing->node)
 		    goto not_equal;
 
-		anum = external_ref_numbers(a);
-		bnum = external_ref_numbers(b);
-		alen = external_ref_no_of_numbers(a);
-		blen = external_ref_no_of_numbers(b);
+		anum = external_thing_ref_numbers(athing);
+		bnum = external_thing_ref_numbers(bthing);
+		alen = external_thing_ref_no_of_numbers(athing);
+		blen = external_thing_ref_no_of_numbers(bthing);
 
 		goto ref_common;
 	    case REF_SUBTAG:
-  
-		    if (is_not_internal_ref(b))
+		    if (!is_internal_ref_rel(b,b_base))
 			goto not_equal;
-		    alen = internal_ref_no_of_numbers(a);
-		    blen = internal_ref_no_of_numbers(b);
-		    anum = internal_ref_numbers(a);
-		    bnum = internal_ref_numbers(b);
+
+		    {
+			RefThing* athing = ref_thing_ptr_rel(a,a_base);
+			RefThing* bthing = ref_thing_ptr_rel(b,b_base);
+			alen = internal_thing_ref_no_of_numbers(athing);
+			blen = internal_thing_ref_no_of_numbers(bthing);
+			anum = internal_thing_ref_numbers(athing);
+			bnum = internal_thing_ref_numbers(bthing);
+		    }
 
 	    ref_common:
 		    ASSERT(alen > 0 && blen > 0);
@@ -2127,10 +2126,10 @@ tailrecur_ne:
 		{
 		    int i;
   
-		    if (is_not_big(b))
+		    if (!is_big_rel(b,b_base))
 			goto not_equal;
-		    aa = big_val(a); /* get pointer to thing */
-		    bb = big_val(b);
+		    aa = big_val_rel(a,a_base);
+		    bb = big_val_rel(b,b_base);
 		    if (*aa != *bb)
 			goto not_equal;
 		    i = BIG_ARITY(aa);
@@ -2145,9 +2144,9 @@ tailrecur_ne:
 		    FloatDef af;
 		    FloatDef bf;
   
-		    if (is_float(b)) {
-			GET_DOUBLE(a, af);
-			GET_DOUBLE(b, bf);
+		    if (is_float_rel(b,b_base)) {
+			GET_DOUBLE_REL(a, af, a_base);
+			GET_DOUBLE_REL(b, bf, b_base);
 			if (af.fd == bf.fd) goto pop_next;
 		    }
 		    break; /* not equal */
@@ -2166,7 +2165,7 @@ term_array: /* arrays in 'aa' and 'bb', length in 'sz' */
 	Eterm* bp = bb;
 	Sint i = sz;
 	for (;;) {
-	    if (*ap != *bp) break;
+	    if (!is_same(*ap,a_base,*bp,b_base)) break;
 	    if (--i == 0) goto pop_next;
 	    ++ap;
 	    ++bp;
@@ -2255,7 +2254,11 @@ static int cmp_atoms(Eterm a, Eterm b)
 		    bb->name+3, bb->len-3);
 }
 
+#if HALFWORD_HEAP
+Sint cmp_rel(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base)
+#else
 Sint cmp(Eterm a, Eterm b)
+#endif
 {
     DECLARE_WSTACK(stack);
     Eterm* aa;
@@ -2289,7 +2292,7 @@ Sint cmp(Eterm a, Eterm b)
 
 
 tailrecur:
-    if (a == b) {		/* Equal values or pointers. */
+    if (is_same(a,a_base,b,b_base)) {	/* Equal values or pointers. */
 	goto pop_next;
     }
 tailrecur_ne:
@@ -2315,9 +2318,9 @@ tailrecur_ne:
 	    if (is_internal_port(b)) {
 		bnode = erts_this_node;
 		bdata = internal_port_data(b);
-	    } else if (is_external_port(b)) {
-		bnode = external_port_node(b);
-		bdata = external_port_data(b);
+	    } else if (is_external_port_rel(b,b_base)) {
+		bnode = external_port_node_rel(b,b_base);
+		bdata = external_port_data_rel(b,b_base);
 	    } else {
 		a_tag = PORT_DEF;
 		goto mixed_types;
@@ -2333,9 +2336,9 @@ tailrecur_ne:
 	    if (is_internal_pid(b)) {
 		bnode = erts_this_node;
 		bdata = internal_pid_data(b);
-	    } else if (is_external_pid(b)) {
-		bnode = external_pid_node(b);
-		bdata = external_pid_data(b);
+	    } else if (is_external_pid_rel(b,b_base)) {
+		bnode = external_pid_node_rel(b,b_base);
+		bdata = external_pid_data_rel(b,b_base);
 	    } else {
 		a_tag = PID_DEF;
 		goto mixed_types;
@@ -2368,12 +2371,12 @@ tailrecur_ne:
 	    a_tag = LIST_DEF;
 	    goto mixed_types;
 	}
-	aa = list_val(a);
-	bb = list_val(b);
+	aa = list_val_rel(a,a_base);
+	bb = list_val_rel(b,b_base);
 	while (1) {
 	    Eterm atmp = CAR(aa);
 	    Eterm btmp = CAR(bb);
-	    if (atmp != btmp) {
+	    if (!is_same(atmp,a_base,btmp,b_base)) {
 		WSTACK_PUSH2(stack,(UWord) CDR(bb),(UWord) CDR(aa));
 		a = atmp;
 		b = btmp;
@@ -2381,7 +2384,7 @@ tailrecur_ne:
 	    }
 	    atmp = CDR(aa);
 	    btmp = CDR(bb);
-	    if (atmp == btmp) {
+	    if (is_same(atmp,a_base,btmp,b_base)) {
 		goto pop_next;
 	    }
 	    if (is_not_list(atmp) || is_not_list(btmp)) {
@@ -2389,20 +2392,20 @@ tailrecur_ne:
 		b = btmp;
 		goto tailrecur_ne;
 	    }
-	    aa = list_val(atmp);
-	    bb = list_val(btmp);
+	    aa = list_val_rel(atmp,a_base);
+	    bb = list_val_rel(btmp,b_base);
 	}
     case TAG_PRIMARY_BOXED:
 	{
-	    Eterm ahdr = *boxed_val(a);
+	    Eterm ahdr = *boxed_val_rel(a,a_base);
 	    switch ((ahdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
 	    case (_TAG_HEADER_ARITYVAL >> _TAG_PRIMARY_SIZE):
-		if (is_not_tuple(b)) {
+		if (!is_tuple_rel(b,b_base)) {
 		    a_tag = TUPLE_DEF;
 		    goto mixed_types;
 		}
-		aa = tuple_val(a);
-		bb = tuple_val(b);
+		aa = tuple_val_rel(a,a_base);
+		bb = tuple_val_rel(b,b_base);
 		/* compare the arities */
 		i = arityval(ahdr);	/* get the arity*/
 		if (i != arityval(*bb)) {
@@ -2416,31 +2419,31 @@ tailrecur_ne:
 		goto term_array;
 
 	    case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		if (is_not_float(b)) {
+		if (!is_float_rel(b,b_base)) {
 		    a_tag = FLOAT_DEF;
 		    goto mixed_types;
 		} else {
 		    FloatDef af;
 		    FloatDef bf; 
 
-		    GET_DOUBLE(a, af);
-		    GET_DOUBLE(b, bf);
+		    GET_DOUBLE_REL(a, af, a_base);
+		    GET_DOUBLE_REL(b, bf, b_base);
 		    ON_CMP_GOTO(float_comp(af.fd, bf.fd));
 		}
 	    case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
 	    case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		if (is_not_big(b)) {
+		if (!is_big_rel(b,b_base)) {
 		    a_tag = BIG_DEF;
 		    goto mixed_types;
 		}
-		ON_CMP_GOTO(big_comp(a, b));
+		ON_CMP_GOTO(big_comp(rterm2wterm(a,a_base), rterm2wterm(b,b_base)));
 	    case (_TAG_HEADER_EXPORT >> _TAG_PRIMARY_SIZE):
-		if (is_not_export(b)) {
+		if (!is_export_rel(b,b_base)) {
 		    a_tag = EXPORT_DEF;
 		    goto mixed_types;
 		} else {
-		    Export* a_exp = *((Export **) (export_val(a) + 1));
-		    Export* b_exp = *((Export **) (export_val(b) + 1));
+		    Export* a_exp = *((Export **) (export_val_rel(a,a_base) + 1));
+		    Export* b_exp = *((Export **) (export_val_rel(b,b_base) + 1));
 
 		    if ((j = cmp_atoms(a_exp->code[0], b_exp->code[0])) != 0) {
 			RETURN_NEQ(j);
@@ -2452,12 +2455,12 @@ tailrecur_ne:
 		}
 		break;
 	    case (_TAG_HEADER_FUN >> _TAG_PRIMARY_SIZE):
-		if (is_not_fun(b)) {
+		if (!is_fun_rel(b,b_base)) {
 		    a_tag = FUN_DEF;
 		    goto mixed_types;
 		} else {
-		    ErlFunThing* f1 = (ErlFunThing *) fun_val(a);
-		    ErlFunThing* f2 = (ErlFunThing *) fun_val(b);
+		    ErlFunThing* f1 = (ErlFunThing *) fun_val_rel(a,a_base);
+		    ErlFunThing* f2 = (ErlFunThing *) fun_val_rel(b,b_base);
 		    Sint diff;
 
 		    diff = cmpbytes(atom_tab(atom_val(f1->fe->module))->name,
@@ -2489,51 +2492,57 @@ tailrecur_ne:
 		if (is_internal_pid(b)) {
 		    bnode = erts_this_node;
 		    bdata = internal_pid_data(b);
-		} else if (is_external_pid(b)) {
-		    bnode = external_pid_node(b);
-		    bdata = external_pid_data(b);
+		} else if (is_external_pid_rel(b,b_base)) {
+		    bnode = external_pid_node_rel(b,b_base);
+		    bdata = external_pid_data_rel(b,b_base);
 		} else {
 		    a_tag = EXTERNAL_PID_DEF;
 		    goto mixed_types;
 		}
-		anode = external_pid_node(a);
-		adata = external_pid_data(a);
+		anode = external_pid_node_rel(a,a_base);
+		adata = external_pid_data_rel(a,a_base);
 		goto pid_common;
 	    case (_TAG_HEADER_EXTERNAL_PORT >> _TAG_PRIMARY_SIZE):
 		if (is_internal_port(b)) {
 		    bnode = erts_this_node;
 		    bdata = internal_port_data(b);
-		} else if (is_external_port(b)) {
-		    bnode = external_port_node(b);
-		    bdata = external_port_data(b);
+		} else if (is_external_port_rel(b,b_base)) {
+		    bnode = external_port_node_rel(b,b_base);
+		    bdata = external_port_data_rel(b,b_base);
 		} else {
 		    a_tag = EXTERNAL_PORT_DEF;
 		    goto mixed_types;
 		}
-		anode = external_port_node(a);
-		adata = external_port_data(a);
+		anode = external_port_node_rel(a,a_base);
+		adata = external_port_data_rel(a,a_base);
 		goto port_common;
 	    case (_TAG_HEADER_REF >> _TAG_PRIMARY_SIZE):
 		/*
 		 * Note! When comparing refs we need to compare ref numbers
 		 * (32-bit words), *not* ref data words.
 		 */
+
 		
-		if (is_internal_ref(b)) {
+		if (is_internal_ref_rel(b,b_base)) {
+		    RefThing* bthing = ref_thing_ptr_rel(b,b_base);
 		    bnode = erts_this_node;
-		    bnum = internal_ref_numbers(b);
-		    blen = internal_ref_no_of_numbers(b);
-		} else if(is_external_ref(b)) {
-		    bnode = external_ref_node(b);
-		    bnum = external_ref_numbers(b);
-		    blen = external_ref_no_of_numbers(b);
+		    bnum = internal_thing_ref_numbers(bthing);
+		    blen = internal_thing_ref_no_of_numbers(bthing);
+		} else if(is_external_ref_rel(b,b_base)) {
+		    ExternalThing* bthing = external_thing_ptr_rel(b,b_base);
+		    bnode = bthing->node;
+		    bnum = external_thing_ref_numbers(bthing);
+		    blen = external_thing_ref_no_of_numbers(bthing);
 		} else {
 		    a_tag = REF_DEF;
 		    goto mixed_types;
 		}
-		anode = erts_this_node;
-		anum = internal_ref_numbers(a);
-		alen = internal_ref_no_of_numbers(a);
+		{
+		    RefThing* athing = ref_thing_ptr_rel(a,a_base);
+		    anode = erts_this_node;
+		    anum = internal_thing_ref_numbers(athing);
+		    alen = internal_thing_ref_no_of_numbers(athing);
+		}
 		
 	    ref_common:
 		CMP_NODES(anode, bnode);
@@ -2562,31 +2571,36 @@ tailrecur_ne:
 			RETURN_NEQ((Sint32) (anum[i] - bnum[i]));
 		goto pop_next;
 	    case (_TAG_HEADER_EXTERNAL_REF >> _TAG_PRIMARY_SIZE):
-		if (is_internal_ref(b)) {
+		if (is_internal_ref_rel(b,b_base)) {
+		    RefThing* bthing = ref_thing_ptr_rel(b,b_base);
 		    bnode = erts_this_node;
-		    bnum = internal_ref_numbers(b);
-		    blen = internal_ref_no_of_numbers(b);
-		} else if (is_external_ref(b)) {
-		    bnode = external_ref_node(b);
-		    bnum = external_ref_numbers(b);
-		    blen = external_ref_no_of_numbers(b);
+		    bnum = internal_thing_ref_numbers(bthing);
+		    blen = internal_thing_ref_no_of_numbers(bthing);
+		} else if (is_external_ref_rel(b,b_base)) {
+		    ExternalThing* bthing = external_thing_ptr_rel(b,b_base);
+		    bnode = bthing->node;
+		    bnum = external_thing_ref_numbers(bthing);
+		    blen = external_thing_ref_no_of_numbers(bthing);
 		} else {
 		    a_tag = EXTERNAL_REF_DEF;
 		    goto mixed_types;
 		}
-		anode = external_ref_node(a);
-		anum = external_ref_numbers(a);
-		alen = external_ref_no_of_numbers(a);
+		{
+		    ExternalThing* athing = external_thing_ptr_rel(a,a_base);
+		    anode = athing->node;
+		    anum = external_thing_ref_numbers(athing);
+		    alen = external_thing_ref_no_of_numbers(athing);
+		}
 		goto ref_common;
 	    default:
 		/* Must be a binary */
-		ASSERT(is_binary(a));
-		if (is_not_binary(b)) {
+		ASSERT(is_binary_rel(a,a_base));
+		if (!is_binary_rel(b,b_base)) {
 		    a_tag = BINARY_DEF;
 		    goto mixed_types;
 		} else {
-		    Uint a_size = binary_size(a);
-		    Uint b_size = binary_size(b);
+		    Uint a_size = binary_size_rel(a,a_base);
+		    Uint b_size = binary_size_rel(b,b_base);
 		    Uint a_bitsize;
 		    Uint b_bitsize;
 		    Uint a_bitoffs;
@@ -2595,8 +2609,8 @@ tailrecur_ne:
 		    int cmp;
 		    byte* a_ptr;
 		    byte* b_ptr;
-		    ERTS_GET_BINARY_BYTES(a, a_ptr, a_bitoffs, a_bitsize);
-		    ERTS_GET_BINARY_BYTES(b, b_ptr, b_bitoffs, b_bitsize);
+		    ERTS_GET_BINARY_BYTES_REL(a, a_ptr, a_bitoffs, a_bitsize, a_base);
+		    ERTS_GET_BINARY_BYTES_REL(b, b_ptr, b_bitoffs, b_bitsize, b_base);
 		    if ((a_bitsize | b_bitsize | a_bitoffs | b_bitoffs) == 0) {
 			min_size = (a_size < b_size) ? a_size : b_size;
 			if ((cmp = sys_memcmp(a_ptr, b_ptr, min_size)) != 0) {
@@ -2623,7 +2637,6 @@ tailrecur_ne:
      */
 
  mixed_types:
-    b_tag = tag_val_def(b);
 
     {
 	FloatDef f1, f2;
@@ -2633,39 +2646,47 @@ tailrecur_ne:
 #else
 	Eterm *big_buf = erts_get_scheduler_data()->cmp_tmp_heap;
 #endif
+#if HALFWORD_HEAP
+	Wterm aw = is_immed(a) ? a : rterm2wterm(a,a_base);
+	Wterm bw = is_immed(b) ? b : rterm2wterm(b,b_base);
+#else
+	Eterm aw = a;
+	Eterm bw = b;
+#endif
+	b_tag = tag_val_def(bw);
 
 	switch(_NUMBER_CODE(a_tag, b_tag)) {
 	case SMALL_BIG:
 	    big = small_to_big(signed_val(a), big_buf);
-	    j = big_comp(big, b);
+	    j = big_comp(big, bw);
 	    break;
 	case SMALL_FLOAT:
 	    f1.fd = signed_val(a);
-	    GET_DOUBLE(b, f2);
+	    GET_DOUBLE(bw, f2);
 	    j = float_comp(f1.fd, f2.fd);
 	    break;
 	case BIG_SMALL:
 	    big = small_to_big(signed_val(b), big_buf);
-	    j = big_comp(a, big);
+	    j = big_comp(aw, big);
 	    break;
 	case BIG_FLOAT:
-	    if (big_to_double(a, &f1.fd) < 0) {
+	    if (big_to_double(aw, &f1.fd) < 0) {
 		j = big_sign(a) ? -1 : 1;
 	    } else {
-		GET_DOUBLE(b, f2);
+		GET_DOUBLE(bw, f2);
 		j = float_comp(f1.fd, f2.fd);
 	    }
 	    break;
 	case FLOAT_SMALL:
-	    GET_DOUBLE(a, f1);
+	    GET_DOUBLE(aw, f1);
 	    f2.fd = signed_val(b);
 	    j = float_comp(f1.fd, f2.fd);
 	    break;
 	case FLOAT_BIG:
-	    if (big_to_double(b, &f2.fd) < 0) {
+	    if (big_to_double(bw, &f2.fd) < 0) {
 		j = big_sign(b) ? 1 : -1;
 	    } else {
-		GET_DOUBLE(a, f1);
+		GET_DOUBLE(aw, f1);
 		j = float_comp(f1.fd, f2.fd);
 	    }
 	    break;
@@ -2729,21 +2750,8 @@ not_equal:
 }
 
 
-void
-erts_cleanup_externals(ExternalThing *etp)
-{
-    ExternalThing *tetp;
-
-    tetp = etp;
-
-    while(tetp) {
-	erts_deref_node_entry(tetp->node);
-	tetp = tetp->next;
-    }
-}
-
 Eterm
-store_external_or_ref_(Uint **hpp, ExternalThing **etpp, Eterm ns)
+store_external_or_ref_(Uint **hpp, ErlOffHeap* oh, Eterm ns)
 {
     Uint i;
     Uint size;
@@ -2762,8 +2770,8 @@ store_external_or_ref_(Uint **hpp, ExternalThing **etpp, Eterm ns)
 
 	erts_refc_inc(&((ExternalThing *) to_hp)->node->refc, 2);
 
-	((ExternalThing *) to_hp)->next = *etpp;
-	*etpp = (ExternalThing *) to_hp;
+	((struct erl_off_heap_header*) to_hp)->next = oh->first;
+	oh->first = (struct erl_off_heap_header*) to_hp;
 
 	return make_external(to_hp);
     }
@@ -2792,7 +2800,7 @@ store_external_or_ref_in_proc_(Process *proc, Eterm ns)
     sz = NC_HEAP_SIZE(ns);
     ASSERT(sz > 0);
     hp = HAlloc(proc, sz);
-    return store_external_or_ref_(&hp, &MSO(proc).externals, ns);
+    return store_external_or_ref_(&hp, &MSO(proc), ns);
 }
 
 void bin_write(int to, void *to_arg, byte* buf, int sz)
@@ -3201,7 +3209,7 @@ erts_create_smp_ptimer(ErtsSmpPTimer **timer_ref,
 
     *timer_ref = res;
 
-    erl_set_timer(&res->timer.tm,
+    erts_set_timer(&res->timer.tm,
 		  (ErlTimeoutProc) ptimer_timeout,
 		  (ErlCancelProc) ptimer_cancelled,
 		  (void*) res,
@@ -3215,7 +3223,7 @@ erts_cancel_smp_ptimer(ErtsSmpPTimer *ptimer)
 	ASSERT(*ptimer->timer.timer_ref == ptimer);
 	*ptimer->timer.timer_ref = NULL;
 	ptimer->timer.flags |= ERTS_PTMR_FLG_CANCELLED;
-	erl_cancel_timer(&ptimer->timer.tm);
+	erts_cancel_timer(&ptimer->timer.tm);
     }
 }
 
@@ -3655,19 +3663,19 @@ erts_set_activity_error(erts_activity_error_t error, char *file, int line)
 }
 
 
-static ERTS_INLINE int
+static ERTS_INLINE erts_aint32_t
 threads_not_under_control(void)
 {
-    int res = system_block_state.threads_to_block;
+    erts_aint32_t res = system_block_state.threads_to_block;
 
     /* Waiting is always an allowed activity... */
-    res -= erts_smp_atomic_read(&erts_system_block_state.in_activity.wait);
+    res -= erts_smp_atomic32_read(&erts_system_block_state.in_activity.wait);
 
     if (system_block_state.allowed_activities & ERTS_BS_FLG_ALLOW_GC)
-	res -= erts_smp_atomic_read(&erts_system_block_state.in_activity.gc);
+	res -= erts_smp_atomic32_read(&erts_system_block_state.in_activity.gc);
 
     if (system_block_state.allowed_activities & ERTS_BS_FLG_ALLOW_IO)
-	res -= erts_smp_atomic_read(&erts_system_block_state.in_activity.io);
+	res -= erts_smp_atomic32_read(&erts_system_block_state.in_activity.io);
 
     if (res < 0) {
 	ASSERT(0);
@@ -3727,7 +3735,7 @@ erts_block_system(Uint32 allowed_activities)
     }
     else {
 
-	erts_smp_atomic_inc(&erts_system_block_state.do_block);
+	erts_smp_atomic32_inc(&erts_system_block_state.do_block);
 
 	/* Someone else might be waiting for us to block... */
 	if (do_block) {
@@ -3779,11 +3787,11 @@ erts_emergency_block_system(long timeout, Uint32 allowed_activities)
 
     another_blocker = erts_smp_pending_system_block();
     system_block_state.emergency = 1;
-    erts_smp_atomic_inc(&erts_system_block_state.do_block);
+    erts_smp_atomic32_inc(&erts_system_block_state.do_block);
 
     if (another_blocker) {
 	if (is_blocker()) {
-	    erts_smp_atomic_dec(&erts_system_block_state.do_block);
+	    erts_smp_atomic32_dec(&erts_system_block_state.do_block);
 	    res = 0;
 	    goto done;
 	}
@@ -3840,7 +3848,7 @@ erts_release_system(void)
     if (system_block_state.recursive_block)
 	system_block_state.recursive_block--;
     else {
-	do_block = erts_smp_atomic_dectest(&erts_system_block_state.do_block);
+	do_block = erts_smp_atomic32_dectest(&erts_system_block_state.do_block);
 	system_block_state.have_blocker = 0;
 	if (is_blockable_thread())
 	    system_block_state.threads_to_block++;
@@ -3975,10 +3983,10 @@ erts_system_block_init(void)
 
     /* Global state... */
 
-    erts_smp_atomic_init(&erts_system_block_state.do_block, 0L);
-    erts_smp_atomic_init(&erts_system_block_state.in_activity.wait, 0L);
-    erts_smp_atomic_init(&erts_system_block_state.in_activity.gc, 0L);
-    erts_smp_atomic_init(&erts_system_block_state.in_activity.io, 0L);
+    erts_smp_atomic32_init(&erts_system_block_state.do_block, 0);
+    erts_smp_atomic32_init(&erts_system_block_state.in_activity.wait, 0);
+    erts_smp_atomic32_init(&erts_system_block_state.in_activity.gc, 0);
+    erts_smp_atomic32_init(&erts_system_block_state.in_activity.io, 0);
 
     /* Make sure blockable threads unregister when exiting... */
     erts_smp_install_exit_handler(erts_unregister_blockable_thread);
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
index 60ae4cb108..6449c6f506 100644
--- a/erts/emulator/drivers/common/efile_drv.c
+++ b/erts/emulator/drivers/common/efile_drv.c
@@ -67,6 +67,8 @@
 #define FILE_RESP_LDATA      6
 #define FILE_RESP_N2DATA     7
 #define FILE_RESP_EOF        8
+#define FILE_RESP_FNAME      9
+#define FILE_RESP_ALL_DATA  10
 
 /* Options */
 
@@ -104,16 +106,16 @@
 #include <ctype.h>
 #include <sys/types.h>
 
-extern void erl_exit(int n, char *fmt, _DOTS_);
+void erl_exit(int n, char *fmt, ...);
 
 static ErlDrvSysInfo sys_info;
 
 
-/*#define TRACE 1*/
+/* #define TRACE 1 */
 #ifdef TRACE
-#    define TRACE_C(c) (putchar(c))
-#    define TRACE_S(s) (fputs((s), stdout))
-#    define TRACE_F(args) (printf args)
+#    define TRACE_C(c) do { putchar(c); fflush(stdout); } while (0)
+#    define TRACE_S(s) do { fputs((s), stdout); fflush(stdout); } while (0)
+#    define TRACE_F(args) do { printf args ;fflush(stdout); } while (0)
 #else
 #    define TRACE_C(c) ((void)(0))
 #    define TRACE_S(s) ((void)(0))
@@ -137,24 +139,54 @@ static ErlDrvSysInfo sys_info;
 #define MUTEX_UNLOCK(m)
 #endif
 
-
-
 #if 0
 /* Experimental, for forcing all file operations to use the same thread. */
-static unsigned file_fixed_key = 1;
-#define KEY(desc) (&file_fixed_key)
+   static unsigned file_fixed_key = 1;
+#  define KEY(desc) (&file_fixed_key)
 #else
-#define KEY(desc) (&(desc)->key)
+#  define KEY(desc) (&(desc)->key)
 #endif
 
 
+#ifdef FILENAMES_16BIT
+#  define FILENAME_BYTELEN(Str) filename_len_16bit(Str)
+#  define FILENAME_COPY(To,From) filename_cpy_16bit((To),(From)) 
+#  define FILENAME_CHARSIZE 2
+
+   static int filename_len_16bit(char *str) 
+   {
+       char *p = str;
+       while(*p != '\0' || p[1] != '\0') {
+	   p += 2;
+       }
+       return (p - str);
+   }
+
+   static void filename_cpy_16bit(char *to, char *from) 
+   {
+       while(*from != '\0' || from[1] != '\0') {
+	   *to++ = *from++;
+	   *to++ = *from++;
+       }
+       *to++ = *from++;
+       *to++ = *from++;
+   }
+
+#else
+#  define FILENAME_BYTELEN(Str) strlen(Str)
+#  define FILENAME_COPY(To,From) strcpy(To,From) 
+#  define FILENAME_CHARSIZE 1
+#endif
 
-#if     MAXPATHLEN >= BUFSIZ
-#define    RESBUFSIZE  MAXPATHLEN+1
+#if     (MAXPATHLEN+1)*FILENAME_CHARSIZE+1 > BUFSIZ
+#  define    RESBUFSIZE  ((MAXPATHLEN+1)*FILENAME_CHARSIZE+1)
 #else
-#define    RESBUFSIZE  BUFSIZ
+#  define    RESBUFSIZE  BUFSIZ
 #endif
 
+
+
+
 #define GET_TIME(i, b) \
     (i).year  = get_int32((b) + 0 * 4); \
     (i).month = get_int32((b) + 1 * 4); \
@@ -286,9 +318,9 @@ struct t_preadv {
 };
 
 #define READDIR_BUFSIZE (8*1024)
-#if READDIR_BUFSIZE < (2*MAXPATHLEN)
-#undef READDIR_BUFSIZE
-#define READDIR_BUFSIZE (2*MAXPATHLEN)
+#if READDIR_BUFSIZE < (FILENAME_CHARSIZE*2*(MAXPATHLEN+1))
+#  undef READDIR_BUFSIZE
+#  define READDIR_BUFSIZE (FILENAME_CHARSIZE*2*(MAXPATHLEN+1))
 #endif
 
 struct t_readdir_buf {
@@ -353,7 +385,6 @@ struct t_data
 	    ErlDrvBinary *binp;
 	    int           size;
 	    int           offset;
-	    char          name[1];
 	} read_file;
 	struct {
 	    struct t_readdir_buf *first_buf;
@@ -369,6 +400,7 @@ struct t_data
 };
 
 
+
 #define EF_ALLOC(S)		driver_alloc((S))
 #define EF_REALLOC(P, S)	driver_realloc((P), (S))
 #define EF_SAFE_ALLOC(S)	ef_safe_alloc((S))
@@ -1084,7 +1116,7 @@ static void invoke_read_file(void *data)
 	Sint64 size;
 	
 	if (! (d->result_ok = 
-	       efile_openfile(&d->errInfo, d->c.read_file.name, 
+	       efile_openfile(&d->errInfo, d->b, 
 			      EFILE_MODE_READ, &fd, &size))) {
 	    goto done;
 	}
@@ -1288,7 +1320,7 @@ static void invoke_writev(void *data) {
 	 p < size && iovcnt < iovlen;
 	 p += iov0[iovcnt++].iov_len)
 	;
-    iov = EF_ALLOC(sizeof(SysIOVec)*iovcnt);
+    iov = EF_SAFE_ALLOC(sizeof(SysIOVec)*iovcnt);
     memcpy(iov,iov0,iovcnt*sizeof(SysIOVec));
     MUTEX_UNLOCK(d->c.writev.q_mtx);
     /* Let go of lock until we deque from original vector */
@@ -1368,7 +1400,7 @@ static void invoke_readlink(void *data)
     d->result_ok = efile_readlink(&d->errInfo, d->b, resbuf+1,
 				  RESBUFSIZE-1);
     if (d->result_ok != 0)
-	strcpy((char *) d->b + 1, resbuf+1);
+	FILENAME_COPY((char *) d->b + 1, resbuf+1);
 }
 
 static void invoke_altname(void *data)
@@ -1380,7 +1412,7 @@ static void invoke_altname(void *data)
     d->result_ok = efile_altname(&d->errInfo, d->b, resbuf+1,
 				  RESBUFSIZE-1);
     if (d->result_ok != 0)
-	strcpy((char *) d->b + 1, resbuf+1);
+	FILENAME_COPY((char *) d->b + 1, resbuf+1);
 }
 
 static void invoke_pwritev(void *data) {
@@ -1405,7 +1437,7 @@ static void invoke_pwritev(void *data) {
     /* Lock the queue just for a while, we don't want it locked during write */
     MUTEX_LOCK(c->q_mtx);
     iov0 = driver_peekq(c->port, &iovlen);
-    iov = EF_ALLOC(sizeof(SysIOVec)*iovlen);
+    iov = EF_SAFE_ALLOC(sizeof(SysIOVec)*iovlen);
     memcpy(iov,iov0,sizeof(SysIOVec)*iovlen);
     MUTEX_UNLOCK(c->q_mtx);
 
@@ -1499,7 +1531,7 @@ static void invoke_link(void *data)
     char *new_name;
 
     d->again = 0;
-    new_name = name+strlen(name)+1;
+    new_name = name+FILENAME_BYTELEN(name)+FILENAME_CHARSIZE;
     d->result_ok = efile_link(&d->errInfo, name, new_name);
 }
 
@@ -1510,7 +1542,7 @@ static void invoke_symlink(void *data)
     char *new_name;
 
     d->again = 0;
-    new_name = name+strlen(name)+1;
+    new_name = name+FILENAME_BYTELEN(name)+FILENAME_CHARSIZE;
     d->result_ok = efile_symlink(&d->errInfo, name, new_name);
 }
 
@@ -1521,7 +1553,7 @@ static void invoke_rename(void *data)
     char *new_name;
 
     d->again = 0;
-    new_name = name+strlen(name)+1;
+    new_name = name+FILENAME_BYTELEN(name)+FILENAME_CHARSIZE;
     d->result_ok = efile_rename(&d->errInfo, name, new_name);
 }
 
@@ -1569,13 +1601,15 @@ static void invoke_readdir(void *data)
     int s;
     char *p = NULL;
     int buf_sz = 0;
+    size_t tmp_bs;
 
     d->again = 0;
     d->errInfo.posix_errno = 0;
 
     while (1) {
 	char *str;
-	if (buf_sz < (4 /* sz */ + 1 /* cmd */ + MAXPATHLEN + 1 /* '\0' */)) {
+	if (buf_sz < (4 /* sz */ + 1 /* cmd */ + 
+		      FILENAME_CHARSIZE*(MAXPATHLEN + 1))) {
 	    struct t_readdir_buf *b;
 	    if (p) {
 		put_int32(0, p); /* EOB */
@@ -1591,18 +1625,18 @@ static void invoke_readdir(void *data)
 	    buf_sz = READDIR_BUFSIZE - 4/* EOB */;
 	}
 
-	p[4] = FILE_RESP_OK;
+	p[4] = FILE_RESP_FNAME;
 	buf_sz -= 4 + 1;
 	str = p + 4 + 1;
 	ASSERT(buf_sz >= MAXPATHLEN + 1);
-	s = efile_readdir(&d->errInfo, d->b, &d->dir_handle, str, buf_sz);
+	tmp_bs = buf_sz;
+	s = efile_readdir(&d->errInfo, d->b, &d->dir_handle, str, &tmp_bs);
 
 	if (s) {
-	    int str_sz = strlen(str);
-	    int sz = str_sz + 1;
-	    put_int32(sz, p);
-	    p += 4 + sz;
-	    buf_sz -= str_sz;
+	    put_int32(tmp_bs + 1 /* 1 byte for opcode */, p);
+	    p += 4 + tmp_bs + 1;
+	    ASSERT(p == (str + tmp_bs));
+	    buf_sz -= tmp_bs;
 	}
 	else {
 	    put_int32(1, p);
@@ -1911,7 +1945,7 @@ file_async_ready(ErlDrvData e, ErlDrvThreadData data)
 	if (!d->result_ok)
 	    reply_error(desc, &d->errInfo);
 	else {
-	    header[0] = FILE_RESP_OK;
+	    header[0] = FILE_RESP_ALL_DATA;
 	    TRACE_C('R');
 	    driver_output_binary(desc->port, header, 1,
 				 d->c.read_file.binp,
@@ -1968,10 +2002,10 @@ file_async_ready(ErlDrvData e, ErlDrvThreadData data)
 	    if (!d->result_ok)
 		reply_error(desc, &d->errInfo);
 	    else {
-		resbuf[0] = FILE_RESP_OK;
-		length = 1+strlen((char*) resbuf+1);
+		resbuf[0] = FILE_RESP_FNAME;
+		length = 1+FILENAME_BYTELEN((char*) resbuf+1);
 		TRACE_C('R');
-		driver_output2(desc->port, resbuf, length, NULL, 0);
+		driver_output2(desc->port, resbuf, 1, resbuf+1, length-1);
 	    }
 	    free_data(data);
 	    break;
@@ -2031,13 +2065,18 @@ file_async_ready(ErlDrvData e, ErlDrvThreadData data)
 		int sz = get_int32(p);
 		while (sz) { /* 0 == EOB */
 		    p += 4;
-		    driver_output2(desc->port, p, sz, NULL, 0);
+		    if (sz - 1 > 0) {
+			driver_output2(desc->port, p, 1, p+1, sz-1);
+		    } else {
+			driver_output2(desc->port, p, 1, NULL, 0);
+		    }
 		    p += sz;
 		    sz = get_int32(p);
 		}
 		b1 = b1->next;
 		EF_FREE(b2);
 	    }
+	    
 	    d->c.read_dir.first_buf = NULL;
 	    d->c.read_dir.last_buf = NULL;
 	}
@@ -2113,9 +2152,9 @@ file_output(ErlDrvData e, char* buf, int count)
 
     case FILE_MKDIR:
     {
-	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + strlen(name) + 1);
+	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE);
 	
-	strcpy(d->b, name);
+	FILENAME_COPY(d->b, name);
 	d->command = command;
 	d->invoke = invoke_mkdir;
 	d->free = free_data;
@@ -2124,9 +2163,9 @@ file_output(ErlDrvData e, char* buf, int count)
     }
     case FILE_RMDIR:
     {
-	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + strlen(name) + 1);
+	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE);
 	
-	strcpy(d->b, name);
+	FILENAME_COPY(d->b, name);
 	d->command = command;
 	d->invoke = invoke_rmdir;
 	d->free = free_data;
@@ -2135,9 +2174,9 @@ file_output(ErlDrvData e, char* buf, int count)
     }
     case FILE_DELETE:
     {
-	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + strlen(name) + 1);
+	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE);
 	
-	strcpy(d->b, name);
+	FILENAME_COPY(d->b, name);
 	d->command = command;
 	d->invoke = invoke_delete_file;
 	d->free = free_data;
@@ -2147,14 +2186,14 @@ file_output(ErlDrvData e, char* buf, int count)
     case FILE_RENAME:
 	{
 	    char* new_name;
-
-	    new_name = name+strlen(name)+1;
+	    int namelen = FILENAME_BYTELEN(name)+FILENAME_CHARSIZE;
+	    new_name = name+namelen;
 	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1
-			      + strlen(name) + 1
-			      + strlen(new_name) + 1);
+			      + namelen
+			      + FILENAME_BYTELEN(new_name) + FILENAME_CHARSIZE);
 	
-	    strcpy(d->b, name);
-	    strcpy(d->b + strlen(name) + 1, new_name);
+	    FILENAME_COPY(d->b, name);
+	    FILENAME_COPY(d->b + namelen, new_name);
 	    d->flags = desc->flags;
 	    d->fd = fd;
 	    d->command = command;
@@ -2165,9 +2204,9 @@ file_output(ErlDrvData e, char* buf, int count)
 	}
     case FILE_CHDIR:
     {
-	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + strlen(name) + 1);
+	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + FILENAME_CHARSIZE);
 	
-	strcpy(d->b, name);
+	FILENAME_COPY(d->b, name);
 	d->command = command;
 	d->invoke = invoke_chdir;
 	d->free = free_data;
@@ -2190,9 +2229,10 @@ file_output(ErlDrvData e, char* buf, int count)
 #ifdef USE_THREADS
 	if (sys_info.async_threads > 0)
 	{
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + strlen(name) + 1);
+	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + 
+			      FILENAME_CHARSIZE);
 	
-	    strcpy(d->b, name);
+	    FILENAME_COPY(d->b, name);
 	    d->dir_handle = NULL;
 	    d->command = command;
 	    d->invoke = invoke_readdir;
@@ -2205,17 +2245,19 @@ file_output(ErlDrvData e, char* buf, int count)
 	else   
 #endif
 	{
+	    size_t resbufsize;
 	    char resbuf[RESBUFSIZE+1];
 	    EFILE_DIR_HANDLE dir_handle; /* Handle to open directory. */
 
 	    errInfo.posix_errno = 0;
 	    dir_handle = NULL;
-	    resbuf[0] = FILE_RESP_OK;
+	    resbuf[0] = FILE_RESP_FNAME;
+	    resbufsize = RESBUFSIZE;
 
 	    while (efile_readdir(&errInfo, name, &dir_handle,
-				 resbuf+1, RESBUFSIZE)) {
-		int length = 1 + strlen(resbuf+1);
-		driver_output2(desc->port, resbuf, length, NULL, 0);
+				 resbuf+1, &resbufsize)) {
+		driver_output2(desc->port, resbuf, 1, resbuf+1, resbufsize);
+		resbufsize = RESBUFSIZE;
 	    }
 	    if (errInfo.posix_errno != 0) {
 		reply_error(desc, &errInfo);
@@ -2227,11 +2269,12 @@ file_output(ErlDrvData e, char* buf, int count)
 	}
     case FILE_OPEN:
 	{
-	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + strlen(buf+4) + 1);
+	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(buf+4) + 
+			      FILENAME_CHARSIZE);
 	
 	    d->flags = get_int32((uchar*)buf);
 	    name = buf+4;
-	    strcpy(d->b, name);
+	    FILENAME_COPY(d->b, name);
 	    d->command = command;
 	    d->invoke = invoke_open;
 	    d->free = free_data;
@@ -2240,44 +2283,45 @@ file_output(ErlDrvData e, char* buf, int count)
 	}
 
     case FILE_FDATASYNC:
-    {
+	{
 	    d = EF_SAFE_ALLOC(sizeof(struct t_data));
-
+	    
 	    d->fd = fd;
 	    d->command = command;
 	    d->invoke = invoke_fdatasync;
 	    d->free = free_data;
 	    d->level = 2;
 	    goto done;
-    }
+	}
 
     case FILE_FSYNC:
-    {
-	d = EF_SAFE_ALLOC(sizeof(struct t_data));
-	
-	d->fd = fd;
-	d->command = command;
-	d->invoke = invoke_fsync;
-	d->free = free_data;
-	d->level = 2;
-	goto done;
-    }
+	{
+	    d = EF_SAFE_ALLOC(sizeof(struct t_data));
+	    
+	    d->fd = fd;
+	    d->command = command;
+	    d->invoke = invoke_fsync;
+	    d->free = free_data;
+	    d->level = 2;
+	    goto done;
+	}
 
 
     case FILE_FSTAT: 
     case FILE_LSTAT:
-    {
-	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + strlen(name) + 1);
+	{
+	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + FILENAME_BYTELEN(name) + 
+			      FILENAME_CHARSIZE);
+	    
+	    FILENAME_COPY(d->b, name);
+	    d->fd = fd;
+	    d->command = command;
+	    d->invoke = invoke_flstat;
+	    d->free = free_data;
+	    d->level = 2;
+	    goto done;
+	}
 	
-	strcpy(d->b, name);
-	d->fd = fd;
-	d->command = command;
-	d->invoke = invoke_flstat;
-	d->free = free_data;
-	d->level = 2;
-	goto done;
-    }
-
     case FILE_TRUNCATE:
         {
 	    d = EF_SAFE_ALLOC(sizeof(struct t_data));
@@ -2294,7 +2338,7 @@ file_output(ErlDrvData e, char* buf, int count)
     case FILE_WRITE_INFO:
 	{
 	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1
-			      + strlen(buf+21*4) + 1);
+			      + FILENAME_BYTELEN(buf+21*4) + FILENAME_CHARSIZE);
 	    
 	    d->info.mode = get_int32(buf + 0 * 4);
 	    d->info.uid = get_int32(buf + 1 * 4);
@@ -2302,7 +2346,7 @@ file_output(ErlDrvData e, char* buf, int count)
 	    GET_TIME(d->info.accessTime, buf + 3 * 4);
 	    GET_TIME(d->info.modifyTime, buf + 9 * 4);
 	    GET_TIME(d->info.cTime, buf + 15 * 4);
-	    strcpy(d->b, buf+21*4);
+	    FILENAME_COPY(d->b, buf+21*4);
 	    d->command = command;
 	    d->invoke = invoke_write_info;
 	    d->free = free_data;
@@ -2314,7 +2358,7 @@ file_output(ErlDrvData e, char* buf, int count)
 	{
 	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + RESBUFSIZE + 1);
 	
-	    strcpy(d->b, name);
+	    FILENAME_COPY(d->b, name);
 	    d->command = command;
 	    d->invoke = invoke_readlink;
 	    d->free = free_data;
@@ -2323,28 +2367,29 @@ file_output(ErlDrvData e, char* buf, int count)
 	}
 
     case FILE_ALTNAME:
-    {
-	d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + RESBUFSIZE + 1);
-	strcpy(d->b, name);
-	d->command = command;
-	d->invoke = invoke_altname;
-	d->free = free_data;
-	d->level = 2;
-	goto done;
-    }
+	{
+	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + RESBUFSIZE + 1);
+	    FILENAME_COPY(d->b, name);
+	    d->command = command;
+	    d->invoke = invoke_altname;
+	    d->free = free_data;
+	    d->level = 2;
+	    goto done;
+	}
 
 
     case FILE_LINK:
 	{
 	    char* new_name;
+	    int namelen = FILENAME_BYTELEN(name) + FILENAME_CHARSIZE;
 
-	    new_name = name+strlen(name)+1;
+	    new_name = name+namelen;
 	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1
-			      + strlen(name) + 1
-			      + strlen(new_name) + 1);
+			      + namelen
+			      + FILENAME_BYTELEN(new_name) + FILENAME_CHARSIZE);
 	
-	    strcpy(d->b, name);
-	    strcpy(d->b + strlen(name) + 1, new_name);
+	    FILENAME_COPY(d->b, name);
+	    FILENAME_COPY(d->b + namelen, new_name);
 	    d->flags = desc->flags;
 	    d->fd = fd;
 	    d->command = command;
@@ -2357,14 +2402,15 @@ file_output(ErlDrvData e, char* buf, int count)
     case FILE_SYMLINK:
 	{
 	    char* new_name;
+	    int namelen = FILENAME_BYTELEN(name) + FILENAME_CHARSIZE;
 
-	    new_name = name+strlen(name)+1;
+	    new_name = name+namelen;
 	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1
-			      + strlen(name) + 1
-			      + strlen(new_name) + 1);
+			      + namelen
+			      + FILENAME_BYTELEN(new_name) + FILENAME_CHARSIZE);
 	
-	    strcpy(d->b, name);
-	    strcpy(d->b + strlen(name) + 1, new_name);
+	    FILENAME_COPY(d->b, name);
+	    FILENAME_COPY(d->b + namelen, new_name);
 	    d->flags = desc->flags;
 	    d->fd = fd;
 	    d->command = command;
@@ -3004,6 +3050,7 @@ file_outputv(ErlDrvData e, ErlIOVec *ev) {
 
     case FILE_READ_FILE: {
 	struct t_data *d;
+	char *filename;
 	if (ev->size < 1+1) {
 	    /* Buffer contains empty name */
 	    reply_posix_error(desc, ENOENT);
@@ -3014,7 +3061,8 @@ file_outputv(ErlDrvData e, ErlIOVec *ev) {
 	    reply_posix_error(desc, EINVAL);
 	    goto done;
 	}
-	d = EF_ALLOC(sizeof(struct t_data) + ev->size);
+	filename = EV_CHAR_P(ev, p, q);
+	d = EF_ALLOC(sizeof(struct t_data) -1 + FILENAME_BYTELEN(filename) + FILENAME_CHARSIZE);
 	if (! d) {
 	    reply_posix_error(desc, ENOMEM);
 	    goto done;
@@ -3022,8 +3070,7 @@ file_outputv(ErlDrvData e, ErlIOVec *ev) {
 	d->command = command;
 	d->reply = !0;
 	/* Copy name */
-	memcpy(d->c.read_file.name, EV_CHAR_P(ev, p, q), ev->size-1);
-	d->c.read_file.name[ev->size-1] = '\0';
+	FILENAME_COPY(d->b, filename);
 	d->c.read_file.binp = NULL;
 	d->invoke = invoke_read_file;
 	d->free = free_read_file;
diff --git a/erts/emulator/drivers/common/erl_efile.h b/erts/emulator/drivers/common/erl_efile.h
index bbc973d58b..3097ded3f1 100644
--- a/erts/emulator/drivers/common/erl_efile.h
+++ b/erts/emulator/drivers/common/erl_efile.h
@@ -32,7 +32,8 @@
 #define EFILE_MODE_READ_WRITE 	3
 #define EFILE_MODE_APPEND	4
 #define EFILE_COMPRESSED 	8
-#define EFILE_NO_TRUNCATE      16 /* Special for reopening on VxWorks */
+#define EFILE_MODE_EXCL        16
+#define EFILE_NO_TRUNCATE      32 /* Special for reopening on VxWorks */
 
 /*
  * Seek modes for efile_seek().
@@ -58,6 +59,14 @@
 #define FA_WRITE 	1
 #define FA_READ		2
 
+/* Some OS'es (i.e. Windows) has filenames in wide charaqcters. That requires special handling */
+/* Note that we do *not* honor alignment in the communication to the OS specific driver, */
+/* which is not a problem on x86, but might be on other platforms. The OS specific efile */
+/* implementation is expected to align if needed */
+#ifdef __WIN32__
+#define FILENAMES_16BIT 1
+#endif
+
 /*
  * An handle to an open directory.  To be cast to the correct type
  * in the system-dependent directory functions.
@@ -122,7 +131,7 @@ int efile_getdcwd(Efile_error* errInfo, int drive,
 		  char* buffer, size_t size);
 int efile_readdir(Efile_error* errInfo, char* name, 
 		  EFILE_DIR_HANDLE* dir_handle,
-		  char* buffer, size_t size);
+		  char* buffer, size_t *size);
 int efile_openfile(Efile_error* errInfo, char* name, int flags,
 		   int* pfd, Sint64* pSize);
 void efile_closefile(int fd);
diff --git a/erts/emulator/drivers/common/gzio.c b/erts/emulator/drivers/common/gzio.c
index 801bc61d4d..5531a275ea 100644
--- a/erts/emulator/drivers/common/gzio.c
+++ b/erts/emulator/drivers/common/gzio.c
@@ -28,6 +28,7 @@
 
 #ifdef __WIN32__
 #define HAVE_CONFLICTING_FREAD_DECLARATION
+#define FILENAMES_16BIT 1
 #endif
 
 #ifdef STDC
@@ -102,6 +103,40 @@ local uLong  getLong      OF((gz_stream *s));
 # define ERTS_GZREAD(File, Buf, Count) fread((Buf), 1, (Count), (File))
 #endif
 
+/*
+ * Ripped from efile_drv.c
+ */
+
+#ifdef FILENAMES_16BIT
+#  define FILENAME_BYTELEN(Str) filename_len_16bit(Str)
+#  define FILENAME_COPY(To,From) filename_cpy_16bit((To),(From)) 
+#  define FILENAME_CHARSIZE 2
+
+   static int filename_len_16bit(const char *str) 
+   {
+       const char *p = str;
+       while(*p != '\0' || p[1] != '\0') {
+	   p += 2;
+       }
+       return (p - str);
+   }
+
+   static void filename_cpy_16bit(char *to, const char *from) 
+   {
+       while(*from != '\0' || from[1] != '\0') {
+	   *to++ = *from++;
+	   *to++ = *from++;
+       }
+       *to++ = *from++;
+       *to++ = *from++;
+   }
+
+#else
+#  define FILENAME_BYTELEN(Str) strlen(Str)
+#  define FILENAME_COPY(To,From) strcpy(To,From) 
+#  define FILENAME_CHARSIZE 1
+#endif
+
 /* ===========================================================================
      Opens a gzip (.gz) file for reading or writing. The mode parameter
    is as in fopen ("rb" or "wb"). The file is given either by file descriptor
@@ -144,11 +179,11 @@ local gzFile gz_open (path, mode)
     s->position = 0;
     s->destroy = destroy;
 
-    s->path = (char*)ALLOC(strlen(path)+1);
+    s->path = (char*)ALLOC(FILENAME_BYTELEN(path)+FILENAME_CHARSIZE);
     if (s->path == NULL) {
         return s->destroy(s), (gzFile)Z_NULL;
     }
-    strcpy(s->path, path); /* do this early for debugging */
+    FILENAME_COPY(s->path, path); /* do this early for debugging */
 
     s->mode = '\0';
     do {
@@ -194,7 +229,22 @@ local gzFile gz_open (path, mode)
     s->stream.avail_out = Z_BUFSIZE;
 
     errno = 0;
-#ifdef UNIX
+#if defined(FILENAMES_16BIT)
+    {
+	char wfmode[160];
+	int i=0,j;
+	for(j=0;fmode[j] != '\0';++j) {
+	    wfmode[i++]=fmode[j];
+	    wfmode[i++]='\0';
+	}
+	wfmode[i++] = '\0';
+	wfmode[i++] = '\0';
+	s->file = F_OPEN(path, wfmode);
+	if (s->file == NULL) {
+	    return s->destroy(s), (gzFile)Z_NULL;
+	}
+    }
+#elif defined(UNIX)
     if (s->mode == 'r') {
 	s->file = open(path, O_RDONLY);
     } else {
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 87691fc1bc..b491242aea 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-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2011. 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
@@ -48,6 +48,15 @@
 #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
 
 /* All platforms fail on malloc errors. */
 #define FATAL_MALLOC
@@ -79,8 +88,21 @@
 #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>
 
-#include <Ws2tcpip.h>   /* NEED VC 6.0 !!! */
 
 #undef WANT_NONBLOCKING
 #include "sys.h"
@@ -461,6 +483,7 @@ static int my_strncasecmp(const char *s1, const char *s2, size_t n)
 #define INET_REQ_IFGET         22
 #define INET_REQ_IFSET         23
 #define INET_REQ_SUBSCRIBE     24
+#define INET_REQ_GETIFADDRS    25
 /* TCP requests */
 #define TCP_REQ_ACCEPT         40
 #define TCP_REQ_LISTEN         41
@@ -626,15 +649,12 @@ static int my_strncasecmp(const char *s1, const char *s2, size_t n)
 #define IS_BUSY(d) \
   (((d)->state & INET_F_BUSY) == INET_F_BUSY)
 
+#define INET_MAX_OPT_BUFFER (64*1024)
+
 #define INET_DEF_BUFFER     1460        /* default buffer size */
 #define INET_MIN_BUFFER     1           /* internal min buffer */
-#define INET_MAX_BUFFER     (1024*64)   /* internal max buffer */
 
-/* Note: INET_HIGH_WATERMARK MUST be less than 2*INET_MAX_BUFFER */
 #define INET_HIGH_WATERMARK (1024*8) /* 8k pending high => busy  */
-/* Note: INET_LOW_WATERMARK MUST be less than INET_MAX_BUFFER and
-** less than INET_HIGH_WATERMARK
-*/
 #define INET_LOW_WATERMARK  (1024*4) /* 4k pending => allow more */
 
 #define INET_INFINITY  0xffffffff  /* infinity value */
@@ -1045,7 +1065,7 @@ struct erl_drv_entry inet_driver_entry =
 };
 
 /* XXX: is this a driver interface function ??? */
-extern void erl_exit(int n, char*, _DOTS_);
+void erl_exit(int n, char*, ...);
 
 /*
  * Malloc wrapper,
@@ -1245,139 +1265,136 @@ static int load_ip_and_port
 	LOAD_ATOM((spec), (i), (flag) ? am_true : am_false);
 #endif /* HAVE_SCTP */
 
+/* Assume a cache line size of 64 bytes */
+#define INET_DRV_CACHE_LINE_SIZE ((ErlDrvUInt) 64)
+#define INET_DRV_CACHE_LINE_MASK (INET_DRV_CACHE_LINE_SIZE - 1)
+
 /*
 ** Binary Buffer Managment
 ** We keep a stack of usable buffers 
 */
-#define BUFFER_STACK_SIZE 16
+#define BUFFER_STACK_SIZE 14
+#define BUFFER_STACK_MAX_MEM_SIZE (1024*1024)
 
-static erts_smp_spinlock_t inet_buffer_stack_lock;
-static ErlDrvBinary* buffer_stack[BUFFER_STACK_SIZE];
-static int buffer_stack_pos = 0;
+ErlDrvTSDKey buffer_stack_key;
 
+typedef struct {
+    int mem_size;
+    int pos;
+    ErlDrvBinary* stk[BUFFER_STACK_SIZE];
+} InetDrvBufStkBase;
 
-/*
- * XXX
- * The erts_smp_spin_* functions should not be used by drivers (but this
- * driver is special). Replace when driver locking api has been implemented.
- * /rickard
- */
-#define BUFSTK_LOCK	erts_smp_spin_lock(&inet_buffer_stack_lock);
-#define BUFSTK_UNLOCK	erts_smp_spin_unlock(&inet_buffer_stack_lock);
-
-#ifdef DEBUG
-static int tot_buf_allocated = 0;  /* memory in use for i_buf */
-static int tot_buf_stacked = 0;   /* memory on stack */
-static int max_buf_allocated = 0; /* max allocated */
-
-#define COUNT_BUF_ALLOC(sz) do { \
-  BUFSTK_LOCK; \
-  tot_buf_allocated += (sz); \
-  if (tot_buf_allocated > max_buf_allocated) \
-    max_buf_allocated = tot_buf_allocated; \
-  BUFSTK_UNLOCK; \
-} while(0)
-
-#define COUNT_BUF_FREE(sz) do { \
- BUFSTK_LOCK; \
- tot_buf_allocated -= (sz); \
- BUFSTK_UNLOCK; \
- } while(0)
-
-#define COUNT_BUF_STACK(sz) do { \
- BUFSTK_LOCK; \
- tot_buf_stacked += (sz); \
- BUFSTK_UNLOCK; \
- } while(0)
-
-#else
+typedef struct {
+    InetDrvBufStkBase buf;
+    char align[(((sizeof(InetDrvBufStkBase) - 1) / INET_DRV_CACHE_LINE_SIZE) + 1)
+	       * INET_DRV_CACHE_LINE_SIZE];
+} InetDrvBufStk;
+
+static InetDrvBufStk *get_bufstk(void)
+{
+    InetDrvBufStk *bs = erl_drv_tsd_get(buffer_stack_key);
+    if (bs)
+	return bs;
+    bs = driver_alloc(sizeof(InetDrvBufStk)
+		      + INET_DRV_CACHE_LINE_SIZE - 1);
+    if (!bs)
+	return NULL;
+    if ((((ErlDrvUInt) bs) & INET_DRV_CACHE_LINE_MASK) != 0)
+	bs = ((InetDrvBufStk *)
+	      ((((ErlDrvUInt) bs) & ~INET_DRV_CACHE_LINE_MASK)
+	       + INET_DRV_CACHE_LINE_SIZE));
+    erl_drv_tsd_set(buffer_stack_key, bs);
+    bs->buf.pos = 0;
+    bs->buf.mem_size = 0;
 
-#define COUNT_BUF_ALLOC(sz)
-#define COUNT_BUF_FREE(sz)
-#define COUNT_BUF_STACK(sz)
+    ASSERT(bs == erl_drv_tsd_get(buffer_stack_key));
 
-#endif
+    return bs;
+}
 
 static ErlDrvBinary* alloc_buffer(long minsz)
 {
-    ErlDrvBinary* buf = NULL;
+    InetDrvBufStk *bs = get_bufstk();
 
-    BUFSTK_LOCK;
+    DEBUGF(("alloc_buffer: %ld\r\n", minsz));
 
-    DEBUGF(("alloc_buffer: sz = %ld, tot = %d, max = %d\r\n", 
-	    minsz, tot_buf_allocated, max_buf_allocated));
+    if (bs && bs->buf.pos > 0) {
+	long size;
+	ErlDrvBinary* buf = bs->buf.stk[--bs->buf.pos];
+	size = buf->orig_size;
+	bs->buf.mem_size -= size;
+	ASSERT(0 <= bs->buf.mem_size
+	       && bs->buf.mem_size <= BUFFER_STACK_MAX_MEM_SIZE);
+	if (size >= minsz)
+	    return buf;
 
-    if (buffer_stack_pos > 0) {
-	int origsz;
+	driver_free_binary(buf);
+    }
 
-	buf = buffer_stack[--buffer_stack_pos];
-	origsz = buf->orig_size;
-	BUFSTK_UNLOCK;
-	COUNT_BUF_STACK(-origsz);
-	if (origsz < minsz) {
-	    if ((buf = driver_realloc_binary(buf, minsz)) == NULL)
-		return NULL;
-	    COUNT_BUF_ALLOC(buf->orig_size - origsz);
+    ASSERT(!bs || bs->buf.pos != 0 || bs->buf.mem_size == 0);
+
+    return driver_alloc_binary(minsz);
+}
+
+/*#define CHECK_DOUBLE_RELEASE 1*/
+#ifdef CHECK_DOUBLE_RELEASE
+static void
+check_double_release(InetDrvBufStk *bs, ErlDrvBinary* buf)
+{
+#ifdef __GNUC__
+#warning CHECK_DOUBLE_RELEASE is enabled, this is a custom build emulator
+#endif
+    int i;
+    for (i = 0; i < bs->buf.pos; ++i) {
+	if (bs->buf.stk[i] == buf) {
+	    erl_exit(ERTS_ABORT_EXIT,
+		     "Multiple buffer release in inet_drv, this "
+		     "is a bug, save the core and send it to "
+		     "[email protected]!");
 	}
     }
-    else {
-	BUFSTK_UNLOCK;
-	if ((buf = driver_alloc_binary(minsz)) == NULL)
-	    return NULL;
-	COUNT_BUF_ALLOC(buf->orig_size);
-    }
-    return buf;
 }
+#endif
 
-/*
-** Max buffer memory "cached" BUFFER_STACK_SIZE * INET_MAX_BUFFER
-** (16 * 64k ~ 1M)
-*/
-/*#define CHECK_DOUBLE_RELEASE 1*/
 static void release_buffer(ErlDrvBinary* buf)
 {
+    InetDrvBufStk *bs;
+    long size;
+
     DEBUGF(("release_buffer: %ld\r\n", (buf==NULL) ? 0 : buf->orig_size));
-    if (buf == NULL)
+
+    if (!buf)
 	return;
-    BUFSTK_LOCK;
-    if ((buf->orig_size > INET_MAX_BUFFER) || 
-	(buffer_stack_pos >= BUFFER_STACK_SIZE)) {
-	BUFSTK_UNLOCK;
-	COUNT_BUF_FREE(buf->orig_size);
+
+    size = buf->orig_size;
+
+    if (size > BUFFER_STACK_MAX_MEM_SIZE)
+	goto free_binary;
+
+    bs = get_bufstk();
+    if (!bs
+	|| (bs->buf.mem_size + size > BUFFER_STACK_MAX_MEM_SIZE)
+	|| (bs->buf.pos >= BUFFER_STACK_SIZE)) {
+    free_binary:
 	driver_free_binary(buf);
     }
     else {
 #ifdef CHECK_DOUBLE_RELEASE
-#ifdef __GNUC__
-#warning CHECK_DOUBLE_RELEASE is enabled, this is a custom build emulator
-#endif
-	int i;
-	for (i = 0; i < buffer_stack_pos; ++i) {
-	    if (buffer_stack[i] == buf) {
-		erl_exit(1,"Multiple buffer release in inet_drv, this is a "
-			 "bug, save the core and send it to "
-			 "[email protected]!");
-	    }
-	}
+	check_double_release(bs, buf);
 #endif
-	buffer_stack[buffer_stack_pos++] = buf;
-	BUFSTK_UNLOCK;
-	COUNT_BUF_STACK(buf->orig_size);
+	ASSERT(bs->buf.pos != 0 || bs->buf.mem_size == 0);
+
+	bs->buf.mem_size += size;
+	bs->buf.stk[bs->buf.pos++] = buf;
+
+	ASSERT(0 <= bs->buf.mem_size
+	       && bs->buf.mem_size <= BUFFER_STACK_MAX_MEM_SIZE);
     }
 }
 
 static ErlDrvBinary* realloc_buffer(ErlDrvBinary* buf, long newsz)
 {
-    ErlDrvBinary* bin;
-#ifdef DEBUG
-    long orig_size =  buf->orig_size;
-#endif
-
-    if ((bin = driver_realloc_binary(buf,newsz)) != NULL) {
-	COUNT_BUF_ALLOC(newsz - orig_size);
-	;
-    }
-    return bin;
+    return driver_realloc_binary(buf, newsz);
 }
 
 /* use a TRICK, access the refc field to see if any one else has
@@ -1391,10 +1408,8 @@ static void free_buffer(ErlDrvBinary* buf)
     if (buf != NULL) {
 	if (driver_binary_get_refc(buf) == 1)
 	    release_buffer(buf);
-	else {
-	    COUNT_BUF_FREE(buf->orig_size);
+	else
 	    driver_free_binary(buf);
-	}
     }
 }
 
@@ -2168,7 +2183,7 @@ static int http_error_inetdrv(void* arg, const char* buf, int len)
   ErlDrvTermData spec[19];
 
   if (desc->inet.active == INET_PASSIVE) {
-    /* {inet_async,S,Ref,{error,{http_error,Line}}} */
+    /* {inet_async,S,Ref,{ok,{http_error,Line}}} */
     int req;
     int aid;
     ErlDrvTermData caller;
@@ -2178,7 +2193,7 @@ static int http_error_inetdrv(void* arg, const char* buf, int len)
     i = LOAD_ATOM(spec, i,  am_inet_async);
     i = LOAD_PORT(spec, i,  desc->inet.dport);
     i = LOAD_INT(spec, i,   aid);
-    i = LOAD_ATOM(spec, i,  am_error);
+    i = LOAD_ATOM(spec, i,  am_ok);
     i = LOAD_ATOM(spec, i,  am_http_error);
     i = http_load_string(desc, spec, i, buf, len);
     i = LOAD_TUPLE(spec, i, 2);
@@ -3398,20 +3413,14 @@ static int inet_init()
     if (!sock_init())
 	goto error;
 
-    buffer_stack_pos = 0;
-
-    erts_smp_spinlock_init(&inet_buffer_stack_lock, "inet_buffer_stack_lock");
+    if (0 != erl_drv_tsd_key_create("inet_buffer_stack_key", &buffer_stack_key))
+	goto error;
 
     ASSERT(sizeof(struct in_addr) == 4);
 #   if defined(HAVE_IN6) && defined(AF_INET6)
     ASSERT(sizeof(struct in6_addr) == 16);
 #   endif
 
-#ifdef DEBUG
-    tot_buf_allocated = 0;
-    max_buf_allocated = 0;
-    tot_buf_stacked = 0;
-#endif
     INIT_ATOM(ok);
     INIT_ATOM(tcp);
     INIT_ATOM(udp);
@@ -3818,39 +3827,81 @@ do { if ((end)-(ptr) < (n)) goto error; } while(0)
 static char* sockaddr_to_buf(struct sockaddr* addr, char* ptr, char* end)
 {
     if (addr->sa_family == AF_INET || addr->sa_family == 0) {
-	struct in_addr a;
-	buf_check(ptr,end,sizeof(struct in_addr));
-	a = ((struct sockaddr_in*) addr)->sin_addr;
-	sys_memcpy(ptr, (char*)&a, sizeof(struct in_addr));
-	return ptr + sizeof(struct in_addr);
+	struct in_addr *p = &(((struct sockaddr_in*) addr)->sin_addr);
+	buf_check(ptr, end, 1 + sizeof(struct in_addr));
+	*ptr = INET_AF_INET;
+	sys_memcpy(ptr+1, (char*)p, sizeof(struct in_addr));
+	return ptr + 1 + sizeof(struct in_addr);
     }
 #if defined(HAVE_IN6) && defined(AF_INET6)
     else if (addr->sa_family == AF_INET6) {
-	struct in6_addr a;
-	buf_check(ptr,end,sizeof(struct in6_addr));
-	a = ((struct sockaddr_in6*) addr)->sin6_addr;
-	sys_memcpy(ptr, (char*)&a, sizeof(struct in6_addr));
-	return ptr + sizeof(struct in6_addr);
+	struct in6_addr *p = &(((struct sockaddr_in6*) addr)->sin6_addr);
+	buf_check(ptr, end, 1 + sizeof(struct in6_addr));
+	*ptr = INET_AF_INET6;
+	sys_memcpy(ptr+1, (char*)p, sizeof(struct in6_addr));
+	return ptr + 1 + sizeof(struct in6_addr);
     }
 #endif
+#if defined(AF_LINK)
+    else if (addr->sa_family == AF_LINK) {
+	struct sockaddr_dl *sdl_p = (struct sockaddr_dl*) addr;
+	buf_check(ptr, end, 2 + sdl_p->sdl_alen);
+	put_int16(sdl_p->sdl_alen, ptr); ptr += 2;
+	sys_memcpy(ptr, sdl_p->sdl_data + sdl_p->sdl_nlen, sdl_p->sdl_alen);
+	return ptr + sdl_p->sdl_alen;
+    }
+#endif
+#if defined(AF_PACKET) && defined(HAVE_NETPACKET_PACKET_H)
+    else if(addr->sa_family == AF_PACKET) {
+	struct sockaddr_ll *sll_p = (struct sockaddr_ll*) addr;
+	buf_check(ptr, end, 2 + sll_p->sll_halen);
+	put_int16(sll_p->sll_halen, ptr); ptr += 2;
+	sys_memcpy(ptr, sll_p->sll_addr, sll_p->sll_halen);
+	return ptr + sll_p->sll_halen;
+    }
+#endif
+    return ptr;
  error:
     return NULL;
-
 }
 
 static char* buf_to_sockaddr(char* ptr, char* end, struct sockaddr* addr)
 {
-    buf_check(ptr,end,sizeof(struct in_addr));
-    sys_memcpy((char*) &((struct sockaddr_in*)addr)->sin_addr, ptr,
-	       sizeof(struct in_addr));
-    addr->sa_family = AF_INET;
-    return ptr +  sizeof(struct in_addr);
-
+    buf_check(ptr,end,1);
+    switch (*ptr++) {
+    case INET_AF_INET: {
+	struct in_addr *p = &((struct sockaddr_in*)addr)->sin_addr;
+	buf_check(ptr,end,sizeof(struct in_addr));
+	sys_memcpy((char*) p, ptr, sizeof(struct in_addr));
+	addr->sa_family = AF_INET;
+	return ptr + sizeof(struct in_addr);
+    }
+    case INET_AF_INET6: {
+	struct in6_addr *p = &((struct sockaddr_in6*)addr)->sin6_addr;
+	buf_check(ptr,end,sizeof(struct in6_addr));
+	sys_memcpy((char*) p, ptr, sizeof(struct in6_addr));
+	addr->sa_family = AF_INET6;
+	return ptr + sizeof(struct in6_addr);
+    }
+    }
  error:
     return NULL;
 }
 
 
+#if defined (IFF_POINTOPOINT)
+#define IFGET_FLAGS(cflags) IFGET_FLAGS_P2P(cflags, IFF_POINTOPOINT)
+#elif defined IFF_POINTTOPOINT
+#define IFGET_FLAGS(cflags) IFGET_FLAGS_P2P(cflags, IFF_POINTTOPOINT)
+#endif
+
+#define IFGET_FLAGS_P2P(cflags, iff_ptp)				\
+    ((((cflags) & IFF_UP) ? INET_IFF_UP : 0) |				\
+     (((cflags) & IFF_BROADCAST) ? INET_IFF_BROADCAST : 0) |		\
+     (((cflags) & IFF_LOOPBACK) ? INET_IFF_LOOPBACK : 0) |		\
+     (((cflags) & iff_ptp) ? INET_IFF_POINTTOPOINT : 0) |		\
+     (((cflags) & IFF_UP) ? INET_IFF_RUNNING : 0) |  /* emulate running ? */ \
+     (((cflags) & IFF_MULTICAST) ? INET_IFF_MULTICAST : 0))
 
 #if defined(__WIN32__) && defined(SIO_GET_INTERFACE_LIST)
 
@@ -3888,7 +3939,6 @@ static int inet_ctl_getiflist(inet_descriptor* desc, char** rbuf, int rsize)
     return ctl_reply(INET_REP_OK, sbuf, sptr - sbuf, rbuf, rsize);
 }
 
-
 /* input is an ip-address in string format i.e A.B.C.D 
 ** scan the INTERFACE_LIST to get the options 
 */
@@ -3905,7 +3955,7 @@ static int inet_ctl_ifget(inet_descriptor* desc, char* buf, int len,
     INTERFACE_INFO* ifp;
     long namaddr;
 
-    if ((len == 0) || ((namlen = buf[0]) > len))
+    if ((len == 0) || ((namlen = get_int8(buf)) > len))
 	goto error;
     if (parse_addr(buf+1, namlen, &namaddr) < 0)
 	goto error;
@@ -3974,27 +4024,12 @@ static int inet_ctl_ifget(inet_descriptor* desc, char* buf, int len,
 	    break;
 
 	case INET_IFOPT_FLAGS: {
-	    long eflags = 0;
 	    int flags = ifp->iiFlags;
 	    /* just enumerate the interfaces (no names) */
 
-	    /* translate flags */
-	    if (flags & IFF_UP)
-		eflags |= INET_IFF_UP;
-	    if (flags & IFF_BROADCAST)
-		eflags |= INET_IFF_BROADCAST;
-	    if (flags & IFF_LOOPBACK)
-		eflags |= INET_IFF_LOOPBACK;
-	    if (flags & IFF_POINTTOPOINT)
-		eflags |= INET_IFF_POINTTOPOINT;
-	    if (flags & IFF_UP) /* emulate runnign ? */
-		eflags |= INET_IFF_RUNNING;
-	    if (flags & IFF_MULTICAST)
-		eflags |= INET_IFF_MULTICAST;
-
 	    buf_check(sptr, s_end, 5);
 	    *sptr++ = INET_IFOPT_FLAGS;
-	    put_int32(eflags, sptr);
+	    put_int32(IFGET_FLAGS(flags), sptr);
 	    sptr += 4;
 	    break;
 	}
@@ -4015,7 +4050,6 @@ static int inet_ctl_ifset(inet_descriptor* desc, char* buf, int len,
     return ctl_reply(INET_REP_OK, NULL, 0, rbuf, rsize);
 }
 
-
 #elif defined(SIOCGIFCONF) && defined(SIOCSIFFLAGS)
 /* cygwin has SIOCGIFCONF but not SIOCSIFFLAGS (Nov 2002) */
 
@@ -4026,69 +4060,81 @@ static int inet_ctl_ifset(inet_descriptor* desc, char* buf, int len,
 #define SIZEA(p) (sizeof (p))
 #endif
 
-
-static int inet_ctl_getiflist(inet_descriptor* desc, char** rbuf, int rsize)
-{
-    struct ifconf ifc;
-    struct ifreq *ifr;
-    char *buf;
-    int buflen, ifc_len, i;
-    char *sbuf, *sp;
-    
-    /* Courtesy of Per Bergqvist and W. Richard Stevens */
-    
-    ifc_len = 0;
-    buflen = 100 * sizeof(struct ifreq);
-    buf = ALLOC(buflen);
+static int get_ifconf(SOCKET s, struct ifconf *ifcp) {
+    int ifc_len = 0;
+    int buflen = 100 * sizeof(struct ifreq);
+    char *buf = ALLOC(buflen);
 
     for (;;) {
-	ifc.ifc_len = buflen;
-	ifc.ifc_buf = buf;
-	if (ioctl(desc->s, SIOCGIFCONF, (char *)&ifc) < 0) {
+	ifcp->ifc_len = buflen;
+	ifcp->ifc_buf = buf;
+	if (ioctl(s, SIOCGIFCONF, (char *)ifcp) < 0) {
 	    int res = sock_errno();
 	    if (res != EINVAL || ifc_len) {
 		FREE(buf);
-		return ctl_error(res, rbuf, rsize);
+		return -1;
 	    }
 	} else {
-	    if (ifc.ifc_len == ifc_len) break; /* buf large enough */
-	    ifc_len = ifc.ifc_len;
+	    if (ifcp->ifc_len == ifc_len) break; /* buf large enough */
+	    ifc_len = ifcp->ifc_len;
 	}
 	buflen += 10 * sizeof(struct ifreq);
 	buf = (char *)REALLOC(buf, buflen);
     }
-    
-    sp = sbuf = ALLOC(ifc_len+1);
+    return 0;
+}
+
+static void free_ifconf(struct ifconf *ifcp) {
+    FREE(ifcp->ifc_buf);
+}
+
+static int inet_ctl_getiflist(inet_descriptor* desc, char** rbuf, int rsize)
+{
+    struct ifconf ifc;
+    struct ifreq *ifrp;
+    char *sbuf, *sp;
+    int i;
+
+    /* Courtesy of Per Bergqvist and W. Richard Stevens */
+
+    if (get_ifconf(desc->s, &ifc) < 0) {
+	return ctl_error(sock_errno(), rbuf, rsize);
+    }
+
+    sp = sbuf = ALLOC(ifc.ifc_len+1);
     *sp++ = INET_REP_OK;
     i = 0;
     for (;;) {
 	int n;
-	
-	ifr = (struct ifreq *) VOIDP(buf + i);
-	n = sizeof(ifr->ifr_name) + SIZEA(ifr->ifr_addr);
-	if (n < sizeof(*ifr)) n = sizeof(*ifr);
-	if (i+n > ifc_len) break;
+
+	ifrp = (struct ifreq *) VOIDP(ifc.ifc_buf + i);
+	n = sizeof(ifrp->ifr_name) + SIZEA(ifrp->ifr_addr);
+	if (n < sizeof(*ifrp)) n = sizeof(*ifrp);
+	if (i+n > ifc.ifc_len) break;
 	i += n;
-	
-	switch (ifr->ifr_addr.sa_family) {
+
+	switch (ifrp->ifr_addr.sa_family) {
 #if defined(HAVE_IN6) && defined(AF_INET6)
 	case AF_INET6:
 #endif
 	case AF_INET:
-	    ASSERT(sp+IFNAMSIZ+1 < sbuf+buflen+1)
-	    strncpy(sp, ifr->ifr_name, IFNAMSIZ);
+	    ASSERT(sp+IFNAMSIZ+1 < sbuf+ifc.ifc_len+1)
+	    strncpy(sp, ifrp->ifr_name, IFNAMSIZ);
 	    sp[IFNAMSIZ] = '\0';
 	    sp += strlen(sp), ++sp;
 	}
-	
-	if (i >= ifc_len) break;
+
+	if (i >= ifc.ifc_len) break;
     }
-    FREE(buf);
+    free_ifconf(&ifc);
     *rbuf = sbuf;
     return sp - sbuf;
 }
 
-
+/* FIXME: temporary hack */
+#ifndef IFHWADDRLEN
+#define IFHWADDRLEN 6
+#endif
 
 static int inet_ctl_ifget(inet_descriptor* desc, char* buf, int len,
 			  char** rbuf, int rsize)
@@ -4099,11 +4145,11 @@ static int inet_ctl_ifget(inet_descriptor* desc, char* buf, int len,
     struct ifreq ifreq;
     int namlen;
 
-    if ((len == 0) || ((namlen = buf[0]) > len))
+    if ((len == 0) || ((namlen = get_int8(buf)) > len))
 	goto error;
     sys_memset(ifreq.ifr_name, '\0', IFNAMSIZ);
     sys_memcpy(ifreq.ifr_name, buf+1, 
-	       (namlen > IFNAMSIZ) ? IFNAMSIZ : namlen);
+	       (namlen >= IFNAMSIZ) ? IFNAMSIZ-1 : namlen);
     buf += (namlen+1);
     len -= (namlen+1);
     sptr = sbuf;
@@ -4123,11 +4169,52 @@ static int inet_ctl_ifget(inet_descriptor* desc, char* buf, int len,
 #ifdef SIOCGIFHWADDR
 	    if (ioctl(desc->s, SIOCGIFHWADDR, (char *)&ifreq) < 0)
 		break;
-	    buf_check(sptr, s_end, 1+IFHWADDRLEN);
+	    buf_check(sptr, s_end, 1+2+IFHWADDRLEN);
 	    *sptr++ = INET_IFOPT_HWADDR;
+	    put_int16(IFHWADDRLEN, sptr); sptr += 2;
 	    /* raw memcpy (fix include autoconf later) */
 	    sys_memcpy(sptr, (char*)(&ifreq.ifr_hwaddr.sa_data), IFHWADDRLEN);
 	    sptr += IFHWADDRLEN;
+#elif defined(SIOCGENADDR)
+	    if (ioctl(desc->s, SIOCGENADDR, (char *)&ifreq) < 0)
+		break;
+	    buf_check(sptr, s_end, 1+2+sizeof(ifreq.ifr_enaddr));
+	    *sptr++ = INET_IFOPT_HWADDR;
+	    put_int16(sizeof(ifreq.ifr_enaddr), sptr); sptr += 2;
+	    /* raw memcpy (fix include autoconf later) */
+	    sys_memcpy(sptr, (char*)(&ifreq.ifr_enaddr),
+		       sizeof(ifreq.ifr_enaddr));
+	    sptr += sizeof(ifreq.ifr_enaddr);
+#elif defined(HAVE_GETIFADDRS) && defined(AF_LINK)
+	    struct ifaddrs *ifa, *ifp;
+	    struct sockaddr_dl *sdlp;
+	    int found = 0;
+
+	    if (getifaddrs(&ifa) == -1)
+		goto error;
+
+	    for (ifp = ifa; ifp; ifp = ifp->ifa_next) {
+		if ((ifp->ifa_addr->sa_family == AF_LINK) &&
+		    (sys_strcmp(ifp->ifa_name, ifreq.ifr_name) == 0)) {
+		    found = 1;
+		    break;
+		}
+	    }
+
+	    if (found == 0) {
+		freeifaddrs(ifa);
+		break;
+	    }
+	    sdlp = (struct sockaddr_dl *)ifp->ifa_addr;
+
+	    buf_check(sptr, s_end, 1+2+sdlp->sdl_alen);
+	    *sptr++ = INET_IFOPT_HWADDR;
+	    put_int16(sdlp->sdl_alen, sptr); sptr += 2;
+	    sys_memcpy(sptr,
+		       sdlp->sdl_data + sdlp->sdl_nlen,
+		       sdlp->sdl_alen);
+	    freeifaddrs(ifa);
+	    sptr += sdlp->sdl_alen;
 #endif
 	    break;
 	}
@@ -4204,29 +4291,15 @@ static int inet_ctl_ifget(inet_descriptor* desc, char* buf, int len,
 
 	case INET_IFOPT_FLAGS: {
 	    int flags;
-	    int eflags = 0;
 
 	    if (ioctl(desc->s, SIOCGIFFLAGS, (char*)&ifreq) < 0)
 		flags = 0;
 	    else
 		flags = ifreq.ifr_flags;
-	    /* translate flags */
-	    if (flags & IFF_UP)
-		eflags |= INET_IFF_UP;
-	    if (flags & IFF_BROADCAST)
-		eflags |= INET_IFF_BROADCAST;
-	    if (flags & IFF_LOOPBACK)
-		eflags |= INET_IFF_LOOPBACK;	
-	    if (flags & IFF_POINTOPOINT)
-		eflags |= INET_IFF_POINTTOPOINT;
-	    if (flags & IFF_RUNNING)
-		eflags |= INET_IFF_RUNNING;
-	    if (flags & IFF_MULTICAST)
-		eflags |= INET_IFF_MULTICAST;
 
 	    buf_check(sptr, s_end, 5);
 	    *sptr++ = INET_IFOPT_FLAGS;
-	    put_int32(eflags, sptr);
+	    put_int32(IFGET_FLAGS(flags), sptr);
 	    sptr += 4;
 	    break;
 	}
@@ -4240,10 +4313,6 @@ static int inet_ctl_ifget(inet_descriptor* desc, char* buf, int len,
     return ctl_error(EINVAL, rbuf, rsize);
 }
 
-/* FIXME: temporary hack */
-#ifndef IFHWADDRLEN
-#define IFHWADDRLEN 6
-#endif
 
 static int inet_ctl_ifset(inet_descriptor* desc, char* buf, int len,
 			  char** rbuf, int rsize)
@@ -4252,11 +4321,11 @@ static int inet_ctl_ifset(inet_descriptor* desc, char* buf, int len,
     int namlen;
     char* b_end = buf + len;
 
-    if ((len == 0) || ((namlen = buf[0]) > len))
+    if ((len == 0) || ((namlen = get_int8(buf)) > len))
 	goto error;
     sys_memset(ifreq.ifr_name, '\0', IFNAMSIZ);
     sys_memcpy(ifreq.ifr_name, buf+1, 
-	       (namlen > IFNAMSIZ) ? IFNAMSIZ : namlen);
+	       (namlen >= IFNAMSIZ) ? IFNAMSIZ-1 : namlen);
     buf += (namlen+1);
     len -= (namlen+1);
 
@@ -4268,17 +4337,22 @@ static int inet_ctl_ifset(inet_descriptor* desc, char* buf, int len,
 	    (void) ioctl(desc->s, SIOCSIFADDR, (char*)&ifreq);
 	    break;
 
-	case INET_IFOPT_HWADDR: 
-	    buf_check(buf, b_end, IFHWADDRLEN);
+	case INET_IFOPT_HWADDR: {
+	    unsigned int len;
+	    buf_check(buf, b_end, 2);
+	    len = get_int16(buf); buf += 2;
+	    buf_check(buf, b_end, len);
 #ifdef SIOCSIFHWADDR
 	    /* raw memcpy (fix include autoconf later) */
-	    sys_memcpy((char*)(&ifreq.ifr_hwaddr.sa_data), buf, IFHWADDRLEN);
+	    sys_memset((char*)(&ifreq.ifr_hwaddr.sa_data),
+		       '\0', sizeof(ifreq.ifr_hwaddr.sa_data));
+	    sys_memcpy((char*)(&ifreq.ifr_hwaddr.sa_data), buf, len);
 
 	    (void) ioctl(desc->s, SIOCSIFHWADDR, (char *)&ifreq);
 #endif
-	    buf += IFHWADDRLEN;
+	    buf += len;
 	    break;
-
+	}
 
 	case INET_IFOPT_BROADADDR:
 #ifdef SIOCSIFBRDADDR
@@ -4383,6 +4457,557 @@ static int inet_ctl_ifset(inet_descriptor* desc, char* buf, int len,
 
 #endif
 
+
+
+/* Latin-1 to utf8 */
+
+static int utf8_len(const char *c, int m) {
+    int l;
+    for (l = 0;  m;  c++, l++, m--) {
+	if (*c == '\0') break;
+	if ((*c & 0x7f) != *c) l++;
+    }
+    return l;
+}
+
+static void utf8_encode(const char *c, int m, char *p) {
+    for (;  m;  c++, m--) {
+	if (*c == '\0') break;
+	if ((*c & 0x7f) != *c) {
+	    *p++ = (char) (0xC0 | (0x03 & (*c >> 6)));
+	    *p++ = (char) (0x80 | (0x3F & *c));
+	} else {
+	    *p++ = (char) *c;
+	}
+    }
+}
+
+#if defined(__WIN32__)
+
+static void set_netmask_bytes(char *c, int len, int pref_len) {
+    int i, m;
+    for (i = 0, m = pref_len >> 3;  i < m && i < len;  i++) c[i] = '\xFF';
+    if (i < len) c[i++] = 0xFF << (8 - (pref_len & 7));
+    for (;  i < len;  i++) c[i] = '\0';
+}
+
+
+int eq_masked_bytes(char *a, char *b, int pref_len) {
+    int i, m;
+    for (i = 0, m = pref_len >> 3;  i < m;  i++) {
+	if (a[i] != b[i]) return 0;
+    }
+    m = pref_len & 7;
+    if (m) {
+	m = 0xFF & (0xFF << (8 - m));
+	if ((a[i] & m) != (b[i] & m)) return 0;
+    }
+    return !0;
+}
+
+static int inet_ctl_getifaddrs(inet_descriptor* desc_p,
+			       char **rbuf_pp, int rsize)
+{
+    int i;
+    DWORD ret, n;
+    IP_INTERFACE_INFO *info_p;
+    MIB_IPADDRTABLE *ip_addrs_p;
+    IP_ADAPTER_ADDRESSES *ip_adaddrs_p, *ia_p;
+
+    char *buf_p;
+    char *buf_alloc_p;
+    int buf_size =512;
+#   define BUF_ENSURE(Size)						\
+    do {								\
+	int NEED_, GOT_ = buf_p - buf_alloc_p;				\
+	NEED_ = GOT_ + (Size);						\
+	if (NEED_ > buf_size) {						\
+	    buf_size = NEED_ + 512;					\
+	    buf_alloc_p = REALLOC(buf_alloc_p, buf_size);		\
+	    buf_p = buf_alloc_p + GOT_;					\
+	}								\
+    } while(0)
+#   define SOCKADDR_TO_BUF(opt, sa)					\
+    do {								\
+	if (sa) {							\
+	    char *P_;							\
+	    *buf_p++ = (opt);						\
+	    while (! (P_ = sockaddr_to_buf((sa), buf_p,			\
+					   buf_alloc_p+buf_size))) {    \
+		int GOT_ = buf_p - buf_alloc_p;				\
+		buf_size += 512;					\
+		buf_alloc_p = REALLOC(buf_alloc_p, buf_size);		\
+		buf_p = buf_alloc_p + GOT_;				\
+	    }								\
+	    if (P_ == buf_p) {						\
+		buf_p--;						\
+	    } else {							\
+		buf_p = P_;						\
+	    }								\
+	}								\
+    } while (0)
+
+    {
+	/* Try GetAdaptersAddresses, if it is available */
+	unsigned long ip_adaddrs_size = 16 * 1024;
+	ULONG family = AF_UNSPEC;
+	ULONG flags =
+	    GAA_FLAG_INCLUDE_PREFIX | GAA_FLAG_SKIP_ANYCAST |
+	    GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME |
+	    GAA_FLAG_SKIP_MULTICAST;
+	ULONG (WINAPI *fpGetAdaptersAddresses)
+	    (ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG);
+	HMODULE iphlpapi = GetModuleHandle("iphlpapi");
+	fpGetAdaptersAddresses = (void *)
+	    (iphlpapi ?
+		GetProcAddress(iphlpapi, "GetAdaptersAddresses") :
+		NULL);
+	if (fpGetAdaptersAddresses) {
+	    ip_adaddrs_p = ALLOC(ip_adaddrs_size);
+	    for (i = 17;  i;  i--) {
+		ret = fpGetAdaptersAddresses(
+		    family, flags, NULL, ip_adaddrs_p, &ip_adaddrs_size);
+		ip_adaddrs_p = REALLOC(ip_adaddrs_p, ip_adaddrs_size);
+		if (ret == NO_ERROR) break;
+		if (ret == ERROR_BUFFER_OVERFLOW) continue;
+		i = 0;
+	    }
+	    if (! i) {
+		FREE(ip_adaddrs_p);
+		ip_adaddrs_p = NULL;
+	    }
+	} else ip_adaddrs_p = NULL;
+    }
+
+    {
+	/* Load the IP_INTERFACE_INFO table (only IPv4 interfaces),
+	 * reliable source of interface names on XP
+	 */
+	unsigned long info_size = 4 * 1024;
+	info_p = ALLOC(info_size);
+	for (i = 17;  i;  i--) {
+	    ret = GetInterfaceInfo(info_p, &info_size);
+	    info_p = REALLOC(info_p, info_size);
+	    if (ret == NO_ERROR) break;
+	    if (ret == ERROR_INSUFFICIENT_BUFFER) continue;
+	    i = 0;
+	}
+	if (! i) {
+	    FREE(info_p);
+	    info_p = NULL;
+	}
+    }
+
+    if (! ip_adaddrs_p) {
+	/* If GetAdaptersAddresses gave nothing we fall back to
+	 * MIB_IPADDRTABLE (only IPv4 interfaces)
+	 */
+	unsigned long ip_addrs_size = 16 * sizeof(*ip_addrs_p);
+	ip_addrs_p = ALLOC(ip_addrs_size);
+	for (i = 17;  i;  i--) {
+	    ret = GetIpAddrTable(ip_addrs_p, &ip_addrs_size, FALSE);
+	    ip_addrs_p = REALLOC(ip_addrs_p, ip_addrs_size);
+	    if (ret == NO_ERROR) break;
+	    if (ret == ERROR_INSUFFICIENT_BUFFER) continue;
+	    i = 0;
+	}
+	if (! i) {
+	    if (info_p) FREE(info_p);
+	    FREE(ip_addrs_p);
+	    return ctl_reply(INET_REP_OK, NULL, 0, rbuf_pp, rsize);
+	}
+    } else ip_addrs_p = NULL;
+
+    buf_p = buf_alloc_p = ALLOC(buf_size);
+    *buf_p++ = INET_REP_OK;
+
+    /* Iterate over MIB_IPADDRTABLE or IP_ADAPTER_ADDRESSES */
+    for (ia_p = NULL, ip_addrs_p ? ((void *)(i = 0)) : (ia_p = ip_adaddrs_p);
+	 ip_addrs_p ? (i < ip_addrs_p->dwNumEntries) : (ia_p != NULL);
+	 ip_addrs_p ? ((void *)(i++)) : (ia_p = ia_p->Next)) {
+	MIB_IPADDRROW *ipaddrrow_p = NULL;
+	DWORD flags = INET_IFF_MULTICAST;
+	DWORD index = 0;
+	WCHAR *wname_p = NULL;
+	MIB_IFROW ifrow;
+
+	if (ip_addrs_p) {
+	    ipaddrrow_p = ip_addrs_p->table + i;
+	    index = ipaddrrow_p->dwIndex;
+	} else {
+	    index = ia_p->IfIndex;
+	    if (ia_p->Flags & IP_ADAPTER_NO_MULTICAST) {
+		flags &= ~INET_IFF_MULTICAST;
+	    }
+	}
+index:
+	if (! index) goto done;
+	sys_memzero(&ifrow, sizeof(ifrow));
+	ifrow.dwIndex = index;
+	if (GetIfEntry(&ifrow) != NO_ERROR) break;
+	/* Find the interface name - first try MIB_IFROW.wzname */
+	if (ifrow.wszName[0] != 0) {
+	    wname_p = ifrow.wszName;
+	} else {
+	    /* Then try IP_ADAPTER_INDEX_MAP.Name (only IPv4 adapters) */
+	    int j;
+	    for (j = 0;  j < info_p->NumAdapters;  j++) {
+		if (info_p->Adapter[j].Index == (ULONG) ifrow.dwIndex) {
+		    if (info_p->Adapter[j].Name[0] != 0) {
+			wname_p = info_p->Adapter[j].Name;
+		    }
+		    break;
+		}
+	    }
+	}
+	if (wname_p) {
+	    int len;
+	    /* Convert interface name to UTF-8 */
+	    len =
+		WideCharToMultiByte(
+		    CP_UTF8, 0, wname_p, -1, NULL, 0, NULL, NULL);
+	    if (! len) break;
+	    BUF_ENSURE(len);
+	    WideCharToMultiByte(
+		CP_UTF8, 0, wname_p, -1, buf_p, len, NULL, NULL);
+	    buf_p += len;
+	} else {
+	    /* Found no name -
+	    * use "MIB_IFROW.dwIndex: MIB_IFROW.bDescr" as name instead */
+	    int l;
+	    l = utf8_len(ifrow.bDescr, ifrow.dwDescrLen);
+	    BUF_ENSURE(9 + l+1);
+	    buf_p +=
+		erts_sprintf(
+		    buf_p, "%lu: ", (unsigned long) ifrow.dwIndex);
+	    utf8_encode(ifrow.bDescr, ifrow.dwDescrLen, buf_p);
+	    buf_p += l;
+	    *buf_p++ = '\0';
+	}
+	/* Interface flags, often make up broadcast and multicast flags */
+	switch (ifrow.dwType) {
+	case IF_TYPE_ETHERNET_CSMACD:
+	    flags |= INET_IFF_BROADCAST;
+	    break;
+	case IF_TYPE_SOFTWARE_LOOPBACK:
+	    flags |= INET_IFF_LOOPBACK;
+	    flags &= ~INET_IFF_MULTICAST;
+	    break;
+	default:
+	    flags &= ~INET_IFF_MULTICAST;
+	    break;
+	}
+	if (ifrow.dwAdminStatus) {
+	    flags |= INET_IFF_UP;
+	    switch (ifrow.dwOperStatus) {
+	    case IF_OPER_STATUS_CONNECTING:
+		flags |= INET_IFF_POINTTOPOINT;
+		break;
+	    case IF_OPER_STATUS_CONNECTED:
+		flags |= INET_IFF_RUNNING | INET_IFF_POINTTOPOINT;
+		break;
+	    case IF_OPER_STATUS_OPERATIONAL:
+		flags |= INET_IFF_RUNNING;
+		break;
+	    }
+	}
+	BUF_ENSURE(1 + 4);
+	*buf_p++ = INET_IFOPT_FLAGS;
+	put_int32(flags, buf_p); buf_p += 4;
+	if (ipaddrrow_p) {
+	    /* Legacy implementation through GetIpAddrTable */
+	    struct sockaddr_in sin;
+	    /* IP Address */
+	    sys_memzero(&sin, sizeof(sin));
+	    sin.sin_family = AF_INET;
+	    sin.sin_addr.s_addr = ipaddrrow_p->dwAddr;
+	    BUF_ENSURE(1);
+	    /* Netmask */
+	    SOCKADDR_TO_BUF(INET_IFOPT_ADDR, (struct sockaddr *) &sin);
+	    sin.sin_addr.s_addr = ipaddrrow_p->dwMask;
+	    BUF_ENSURE(1);
+	    SOCKADDR_TO_BUF(INET_IFOPT_NETMASK, (struct sockaddr *) &sin);
+	    if (flags & INET_IFF_BROADCAST) {
+		/* Broadcast address - fake it*/
+		sin.sin_addr.s_addr = ipaddrrow_p->dwAddr;
+		sin.sin_addr.s_addr |= ~ipaddrrow_p->dwMask;
+		BUF_ENSURE(1);
+		SOCKADDR_TO_BUF(
+		    INET_IFOPT_BROADADDR, (struct sockaddr *) &sin);
+	    }
+	} else {
+	    IP_ADAPTER_UNICAST_ADDRESS *p;
+	    /* IP Address(es) */
+	    for (p = ia_p->FirstUnicastAddress;
+		p;
+		p = p->Next)
+	    {
+		IP_ADAPTER_PREFIX *q;
+		ULONG shortest_length;
+		struct sockaddr *shortest_p, *sa_p = p->Address.lpSockaddr;
+		BUF_ENSURE(1);
+		SOCKADDR_TO_BUF(INET_IFOPT_ADDR, sa_p);
+		shortest_p = NULL;
+		shortest_length = 0;
+		for (q = ia_p->FirstPrefix;
+		     q;
+		     q = q->Next) {
+		    struct sockaddr *sp_p = q->Address.lpSockaddr;
+		    if (sa_p->sa_family != sp_p->sa_family) continue;
+		    switch (sa_p->sa_family) {
+		    case AF_INET: {
+			struct sockaddr_in sin;
+			DWORD sa, sp, mask;
+			sa = ntohl((DWORD)
+				   ((struct sockaddr_in *)
+				    sa_p)->sin_addr.s_addr);
+			sp = ntohl((DWORD)
+				   ((struct sockaddr_in *)
+				    sp_p)->sin_addr.s_addr);
+			mask = 0xFFFFFFFF << (32 - q->PrefixLength);
+			if ((sa & mask) != (sp & mask)) continue;
+			if ((! shortest_p)
+			    || q->PrefixLength < shortest_length) {
+			    shortest_p = sp_p;
+			    shortest_length = q->PrefixLength;
+			}
+		    }   break;
+		    case AF_INET6: {
+			struct sockaddr_in6 sin6;
+			if (!eq_masked_bytes((char *)
+					     &((struct sockaddr_in6 *)
+					       sa_p)->sin6_addr,
+					     (char *)
+					     &((struct sockaddr_in6 *)
+					       sp_p)->sin6_addr,
+					     q->PrefixLength)) {
+			    continue;
+			}
+			if ((! shortest_p)
+			    || q->PrefixLength < shortest_length) {
+			    shortest_p = sp_p;
+			    shortest_length = q->PrefixLength;
+			}
+		    }   break;
+		    }
+		}
+		if (! shortest_p) {
+		    /* Found no shortest prefix */
+		    shortest_p = sa_p;
+		    switch (shortest_p->sa_family) {
+		    case AF_INET: {
+			/* Fall back to old classfull network addresses */
+			DWORD addr = ntohl(((struct sockaddr_in *)shortest_p)
+					   ->sin_addr.s_addr);
+			if (! (addr & 0x800000)) {
+			    /* Class A */
+			    shortest_length = 8;
+			} else if (! (addr & 0x400000)) {
+			    /* Class B */
+			    shortest_length = 16;
+			} else if (! (addr & 0x200000)) {
+			    /* Class C */
+			    shortest_length = 24;
+			} else {
+			    shortest_length = 32;
+			}
+		    }   break;
+		    case AF_INET6: {
+			/* Just play it safe */
+			shortest_length = 128;
+		    }   break;
+		    }
+		}
+		switch (shortest_p->sa_family) {
+		case AF_INET: {
+		    struct sockaddr_in sin;
+		    DWORD mask = 0xFFFFFFFF << (32 - shortest_length);
+		    sys_memzero(&sin, sizeof(sin));
+		    sin.sin_family = shortest_p->sa_family;
+		    sin.sin_addr.s_addr = htonl(mask);
+		    BUF_ENSURE(1);
+		    SOCKADDR_TO_BUF(INET_IFOPT_NETMASK,
+				    (struct sockaddr *) &sin);
+		    if (flags & INET_IFF_BROADCAST) {
+			DWORD sp =
+			    ntohl((DWORD)
+				  ((struct sockaddr_in *)shortest_p)
+				  -> sin_addr.s_addr);
+			sin.sin_addr.s_addr = htonl(sp | ~mask);
+			BUF_ENSURE(1);
+			SOCKADDR_TO_BUF(INET_IFOPT_BROADADDR,
+					(struct sockaddr *) &sin);
+		    }
+		}   break;
+		case AF_INET6: {
+		    struct sockaddr_in6 sin6;
+		    sys_memzero(&sin6, sizeof(sin6));
+		    sin6.sin6_family = shortest_p->sa_family;
+		    set_netmask_bytes((char *) &sin6.sin6_addr,
+				      16,
+				      shortest_length);
+		    BUF_ENSURE(1);
+		    SOCKADDR_TO_BUF(INET_IFOPT_NETMASK,
+				    (struct sockaddr *) &sin6);
+		}   break;
+		}
+	    }
+	}
+	if (ifrow.dwPhysAddrLen) {
+	    /* Hardware Address */
+	    BUF_ENSURE(1 + 2 + ifrow.dwPhysAddrLen);
+	    *buf_p++ = INET_IFOPT_HWADDR;
+	    put_int16(ifrow.dwPhysAddrLen, buf_p); buf_p += 2;
+	    sys_memcpy(buf_p, ifrow.bPhysAddr, ifrow.dwPhysAddrLen);
+	    buf_p += ifrow.dwPhysAddrLen;
+	}
+
+done:
+	/* That is all for this interface */
+	BUF_ENSURE(1);
+	*buf_p++ = '\0';
+	if (ia_p &&
+	    ia_p->Ipv6IfIndex &&
+	    ia_p->Ipv6IfIndex != index)
+	{
+	    /* Oops, there was an other interface for IPv6. Possible? XXX */
+	    index = ia_p->Ipv6IfIndex;
+	    goto index;
+	}
+    }
+
+    if (ip_adaddrs_p) FREE(ip_adaddrs_p);
+    if (info_p) FREE(info_p);
+    if (ip_addrs_p) FREE(ip_addrs_p);
+
+    buf_size = buf_p - buf_alloc_p;
+    buf_alloc_p = REALLOC(buf_alloc_p, buf_size);
+    /* buf_p is now unreliable */
+    *rbuf_pp = buf_alloc_p;
+    return buf_size;
+#   undef BUF_ENSURE
+}
+
+#elif defined(HAVE_GETIFADDRS)
+
+static int inet_ctl_getifaddrs(inet_descriptor* desc_p,
+			       char **rbuf_pp, int rsize)
+{
+    struct ifaddrs *ifa_p, *ifa_free_p;
+
+    int buf_size;
+    char *buf_p;
+    char *buf_alloc_p;
+
+    buf_size = 512;
+    buf_alloc_p = ALLOC(buf_size);
+    buf_p = buf_alloc_p;
+#   define BUF_ENSURE(Size)						\
+    do {								\
+	int NEED_, GOT_ = buf_p - buf_alloc_p;				\
+	NEED_ = GOT_ + (Size);						\
+	if (NEED_ > buf_size) {						\
+	    buf_size = NEED_ + 512;					\
+	    buf_alloc_p = REALLOC(buf_alloc_p, buf_size);		\
+	    buf_p = buf_alloc_p + GOT_;					\
+	}								\
+    } while (0)
+#   define SOCKADDR_TO_BUF(opt, sa)				        \
+    do {    						                \
+	if (sa) {                                                       \
+	    char *P_;							\
+	    *buf_p++ = (opt);						\
+	    while (! (P_ = sockaddr_to_buf((sa), buf_p,			\
+					   buf_alloc_p+buf_size))) {	\
+		int GOT_ = buf_p - buf_alloc_p;				\
+		buf_size += 512;					\
+		buf_alloc_p = REALLOC(buf_alloc_p, buf_size);		\
+		buf_p = buf_alloc_p + GOT_;				\
+	    }								\
+	    if (P_ == buf_p) {						\
+		buf_p--;						\
+	    } else {							\
+		buf_p = P_;						\
+	    }								\
+	}                                                               \
+    } while (0)
+
+    if (getifaddrs(&ifa_p) < 0) {
+	return ctl_error(sock_errno(), rbuf_pp, rsize);
+    }
+    ifa_free_p = ifa_p;
+    *buf_p++ = INET_REP_OK;
+    for (;  ifa_p;  ifa_p = ifa_p->ifa_next) {
+	int len = utf8_len(ifa_p->ifa_name, -1);
+	BUF_ENSURE(len+1 + 1+4 + 1);
+	utf8_encode(ifa_p->ifa_name, -1, buf_p);
+	buf_p += len;
+	*buf_p++ = '\0';
+	*buf_p++ = INET_IFOPT_FLAGS;
+	put_int32(IFGET_FLAGS(ifa_p->ifa_flags), buf_p); buf_p += 4;
+	if (ifa_p->ifa_addr) {
+	    if (ifa_p->ifa_addr->sa_family == AF_INET
+#if defined(AF_INET6)
+		|| ifa_p->ifa_addr->sa_family == AF_INET6
+#endif
+		) {
+		SOCKADDR_TO_BUF(INET_IFOPT_ADDR, ifa_p->ifa_addr);
+		if (ifa_p->ifa_netmask) {
+		    BUF_ENSURE(1);
+		    SOCKADDR_TO_BUF(INET_IFOPT_NETMASK, ifa_p->ifa_netmask);
+		}
+		if (ifa_p->ifa_dstaddr &&
+		    (ifa_p->ifa_flags & IFF_POINTOPOINT)) {
+		    BUF_ENSURE(1);
+		    SOCKADDR_TO_BUF(INET_IFOPT_DSTADDR, ifa_p->ifa_dstaddr);
+		} else if (ifa_p->ifa_broadaddr &&
+			   (ifa_p->ifa_flags & IFF_BROADCAST)) {
+		    BUF_ENSURE(1);
+		    SOCKADDR_TO_BUF(INET_IFOPT_BROADADDR, ifa_p->ifa_broadaddr);
+		}
+	    }
+#if defined(AF_LINK) || defined(AF_PACKET)
+	    else if (
+#if defined(AF_LINK)
+		     ifa_p->ifa_addr->sa_family == AF_LINK
+#else
+		     0
+#endif
+#if defined(AF_PACKET)
+		     || ifa_p->ifa_addr->sa_family == AF_PACKET
+#endif
+		     ) {
+		char *bp = buf_p;
+		BUF_ENSURE(1);
+		SOCKADDR_TO_BUF(INET_IFOPT_HWADDR, ifa_p->ifa_addr);
+		if (buf_p - bp < 4) buf_p = bp; /* Empty hwaddr */
+	    }
+#endif
+	}
+	BUF_ENSURE(1);
+	*buf_p++ = '\0';
+    }
+    buf_size = buf_p - buf_alloc_p;
+    buf_alloc_p = REALLOC(buf_alloc_p, buf_size);
+    /* buf_p is now unreliable */
+    freeifaddrs(ifa_free_p);
+    *rbuf_pp = buf_alloc_p;
+    return buf_size;
+#   undef BUF_ENSURE
+}
+
+#else
+
+static int inet_ctl_getifaddrs(inet_descriptor* desc_p,
+			       char **rbuf_pp, int rsize)
+{
+    return ctl_error(ENOTSUP, rbuf_pp, rsize);
+}
+
+#endif
+
+
+
 #ifdef VXWORKS
 /*
 ** THIS is a terrible creature, a bug in the TCP part
@@ -4425,9 +5050,17 @@ static STATUS wrap_sockopt(STATUS (*function)() /* Yep, no parameter
 }
 #endif
 
+/* 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.                  */
+
 #if  defined(IP_TOS) && defined(SOL_IP) && defined(SO_PRIORITY)
 static int setopt_prio_tos_trick
-	   (int fd, int proto, int type, char* arg_ptr, int arg_sz)
+	(int fd, int proto, int type, char* arg_ptr, int arg_sz, int propagate)
 {
     /* The relations between SO_PRIORITY, TOS and other options
        is not what you (or at least I) would expect...:
@@ -4440,6 +5073,8 @@ static int setopt_prio_tos_trick
     int          tmp_ival_prio;
     int          tmp_ival_tos;
     int          res;
+    int          res_prio;
+    int          res_tos;
 #ifdef HAVE_SOCKLEN_T
 	    socklen_t
 #else
@@ -4448,28 +5083,35 @@ static int setopt_prio_tos_trick
 		tmp_arg_sz_prio = sizeof(tmp_ival_prio),
 		tmp_arg_sz_tos  = sizeof(tmp_ival_tos);
 
-    res = sock_getopt(fd, SOL_SOCKET, SO_PRIORITY,
+    res_prio = sock_getopt(fd, SOL_SOCKET, SO_PRIORITY,
 		      (char *) &tmp_ival_prio, &tmp_arg_sz_prio);
-    if (res == 0) {
-	res = sock_getopt(fd, SOL_IP, IP_TOS, 
+    res_tos = sock_getopt(fd, SOL_IP, IP_TOS, 
 		      (char *) &tmp_ival_tos, &tmp_arg_sz_tos);
-	if (res == 0) {
 	    res = sock_setopt(fd, proto, type, arg_ptr, arg_sz);
 	    if (res == 0) {
 		if (type != SO_PRIORITY) {
-		    if (type != IP_TOS) {
-			res = sock_setopt(fd, 
+	    if (type != IP_TOS && res_tos == 0) {
+		res_tos = sock_setopt(fd, 
 					  SOL_IP, 
 					  IP_TOS,
 					  (char *) &tmp_ival_tos, 
 					  tmp_arg_sz_tos);
+		if (propagate)
+		    res = res_tos;
 		    }
-		    if (res == 0) {
-			res =  sock_setopt(fd, 
+	    if (res == 0 && res_prio == 0) {
+		res_prio = sock_setopt(fd, 
 					   SOL_SOCKET, 
 					   SO_PRIORITY,
 					   (char *) &tmp_ival_prio, 
 					   tmp_arg_sz_prio);
+		if (propagate) {		
+		    /* Some kernels set a SO_PRIORITY by default that you are not permitted to reset,
+		       silently ignore this error condition */
+		    if (res_prio != 0 && sock_errno() == EPERM) {
+			res = 0;
+		    } else {
+			res = res_prio;
 		    }
 		}
 	    }
@@ -4544,8 +5186,7 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
 	case INET_LOPT_BUFFER:
 	    DEBUGF(("inet_set_opts(%ld): s=%d, BUFFER=%d\r\n",
 		    (long)desc->port, desc->s, ival));
-	    if (ival > INET_MAX_BUFFER)  ival = INET_MAX_BUFFER;
-	    else if (ival < INET_MIN_BUFFER) ival = INET_MIN_BUFFER;
+	    if (ival < INET_MIN_BUFFER) ival = INET_MIN_BUFFER;
 	    desc->bufsz = ival;
 	    continue;
 
@@ -4610,7 +5251,6 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
 	    if (desc->stype == SOCK_STREAM) {
 		tcp_descriptor* tdesc = (tcp_descriptor*) desc;
 		if (ival < 0) ival = 0;
-		else if (ival > INET_MAX_BUFFER*2) ival = INET_MAX_BUFFER*2;
 		if (tdesc->low > ival)
 		    tdesc->low = ival;
 		tdesc->high = ival;
@@ -4621,7 +5261,6 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
 	    if (desc->stype == SOCK_STREAM) {
 		tcp_descriptor* tdesc = (tcp_descriptor*) desc;
 		if (ival < 0) ival = 0;
-		else if (ival > INET_MAX_BUFFER) ival = INET_MAX_BUFFER;
 		if (tdesc->high < ival)
 		    tdesc->high = ival;
 		tdesc->low = ival;
@@ -4818,7 +5457,7 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
 	    return -1;
 	}
 #if  defined(IP_TOS) && defined(SOL_IP) && defined(SO_PRIORITY)
-	res = setopt_prio_tos_trick (desc->s, proto, type, arg_ptr, arg_sz);
+	res = setopt_prio_tos_trick (desc->s, proto, type, arg_ptr, arg_sz, propagate);
 #else
 	res = sock_setopt	    (desc->s, proto, type, arg_ptr, arg_sz);
 #endif
@@ -4967,9 +5606,6 @@ static int sctp_set_opts(inet_descriptor* desc, char* ptr, int len)
 	case INET_LOPT_BUFFER:
 	    desc->bufsz  = get_int32(curr);		curr += 4;
 
-            if (desc->bufsz > INET_MAX_BUFFER)
-		desc->bufsz = INET_MAX_BUFFER;
-            else
 	    if (desc->bufsz < INET_MIN_BUFFER)
 		desc->bufsz = INET_MIN_BUFFER;
 	    res = 0;	  /* This does not affect the kernel buffer size */
@@ -5032,8 +5668,8 @@ static int sctp_set_opts(inet_descriptor* desc, char* ptr, int len)
 	}
 	case INET_OPT_LINGER:
 	{
-	    CHKLEN(curr, ASSOC_ID_LEN + 2 + 4);
-	    arg.lin.l_onoff  = get_int16 (curr);  curr += 2;
+	    CHKLEN(curr, 2*4);
+	    arg.lin.l_onoff  = get_int32 (curr);  curr += 4;
 	    arg.lin.l_linger = get_int32 (curr);  curr += 4;
 
 	    proto   = SOL_SOCKET;
@@ -5210,9 +5846,12 @@ static int sctp_set_opts(inet_descriptor* desc, char* ptr, int len)
 	    char *after;
 #	    ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_FLAGS
 	    int eflags, cflags, hb_enable, hb_disable,
-		pmtud_enable, pmtud_disable,
+		pmtud_enable, pmtud_disable;
+#	    ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
+	    int
 		sackdelay_enable, sackdelay_disable;
 #           endif
+#           endif
 	    
 	    CHKLEN(curr, ASSOC_ID_LEN);
 	    arg.pap.spp_assoc_id = GET_ASSOC_ID(curr);	curr += ASSOC_ID_LEN;
@@ -5261,12 +5900,15 @@ static int sctp_set_opts(inet_descriptor* desc, char* ptr, int len)
 	    if (pmtud_enable)			cflags |= SPP_PMTUD_ENABLE;
 	    if (pmtud_disable)			cflags |= SPP_PMTUD_DISABLE;
 
+#	    ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
+	    /* The followings are missing in FreeBSD 7.1 */
 	    sackdelay_enable =eflags& SCTP_FLAG_SACDELAY_ENABLE;
 	    sackdelay_disable=eflags& SCTP_FLAG_SACDELAY_DISABLE;
 	    if (sackdelay_enable && sackdelay_disable)
 		return -1;
 	    if (sackdelay_enable)		cflags |= SPP_SACKDELAY_ENABLE;
 	    if (sackdelay_disable)		cflags |= SPP_SACKDELAY_DISABLE;
+#           endif
 
 	    arg.pap.spp_flags  = cflags;
 #	    endif
@@ -5345,7 +5987,7 @@ static int sctp_set_opts(inet_descriptor* desc, char* ptr, int len)
 	    return -1;
 	}
 #if  defined(IP_TOS) && defined(SOL_IP) && defined(SO_PRIORITY)
-	res = setopt_prio_tos_trick (desc->s, proto, type, arg_ptr, arg_sz);
+	res = setopt_prio_tos_trick (desc->s, proto, type, arg_ptr, arg_sz, 1);
 #else
 	res = sock_setopt	    (desc->s, proto, type, arg_ptr, arg_sz);
 #endif
@@ -5404,7 +6046,7 @@ static int inet_fill_opts(inet_descriptor* desc,
 #define PLACE_FOR(Size,Ptr)						   \
     do {								   \
 	int need = dest_used + (Size);					   \
-	if (need > INET_MAX_BUFFER) {					   \
+	if (need > INET_MAX_OPT_BUFFER) {				   \
 	    RETURN_ERROR();						   \
 	}								   \
 	if (need > dest_allocated) {					   \
@@ -5628,7 +6270,7 @@ static int inet_fill_opts(inet_descriptor* desc,
 		buf += 4;
 		data_provided = (int) *buf++;
 		arg_sz = get_int32(buf);
-		if (arg_sz > INET_MAX_BUFFER) {	
+		if (arg_sz > INET_MAX_OPT_BUFFER) {
 		    RETURN_ERROR();
 		}
 		buf += 4;
@@ -5742,7 +6384,7 @@ static int sctp_fill_opts(inet_descriptor* desc, char* buf, int buflen,
 		     "miscalculated buffer size");              \
 	}                                                       \
 	need = (Index) + (N);                                   \
-	if (need > INET_MAX_BUFFER/sizeof(ErlDrvTermData)) {    \
+	if (need > INET_MAX_OPT_BUFFER/sizeof(ErlDrvTermData)) {\
 	    RETURN_ERROR((Spec), -ENOMEM);                      \
 	}                                                       \
 	if (need > spec_allocated) {                            \
@@ -6167,13 +6809,15 @@ static int sctp_fill_opts(inet_descriptor* desc, char* buf, int buflen,
 	    
 	    if (ap.spp_flags & SPP_PMTUD_DISABLE)
 		{ i = LOAD_ATOM (spec, i, am_pmtud_disable);         n++; }
-	    
+#	    ifdef HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY
+	    /* SPP_SACKDELAY_* not in FreeBSD 7.1 */
 	    if (ap.spp_flags & SPP_SACKDELAY_ENABLE)
 		{ i = LOAD_ATOM (spec, i, am_sackdelay_enable);      n++; }
 	    
 	    if (ap.spp_flags & SPP_SACKDELAY_DISABLE)
 		{ i = LOAD_ATOM (spec, i, am_sackdelay_disable);     n++; }
 #	    endif
+#	    endif
 	    
 	    PLACE_FOR(spec, i,
 		      LOAD_NIL_CNT + LOAD_LIST_CNT + 2*LOAD_TUPLE_CNT);
@@ -6193,6 +6837,10 @@ static int sctp_fill_opts(inet_descriptor* desc, char* buf, int buflen,
 	    struct       sctp_sndrcvinfo sri;
 	    unsigned int sz  = sizeof(sri);
 	    
+	    if (buflen < ASSOC_ID_LEN) RETURN_ERROR(spec, -EINVAL);
+	    sri.sinfo_assoc_id = GET_ASSOC_ID(buf);
+	    buf += ASSOC_ID_LEN;
+	    buflen -= ASSOC_ID_LEN;
 	    if (sock_getopt(desc->s, IPPROTO_SCTP, SCTP_DEFAULT_SEND_PARAM,
 			    &sri, &sz) < 0) continue;
 	    /* Fill in the response: */
@@ -6589,7 +7237,7 @@ static int inet_ctl(inet_descriptor* desc, int cmd, char* buf, int len,
 	      }
 	  }
 	  DEBUGF(("inet_ctl(%ld): GETSTAT\r\n", (long) desc->port)); 
-	  if (dstlen > INET_MAX_BUFFER) /* sanity check */
+	  if (dstlen > INET_MAX_OPT_BUFFER) /* sanity check */
 	      return 0;
 	  if (dstlen > rsize) {
 	      if ((dst = (char*) ALLOC(dstlen)) == NULL)
@@ -6605,7 +7253,7 @@ static int inet_ctl(inet_descriptor* desc, int cmd, char* buf, int len,
 	  char* dst;
 	  int dstlen = 1 /* Reply code */ + len*5;
 	  DEBUGF(("inet_ctl(%ld): INET_REQ_SUBSCRIBE\r\n", (long) desc->port)); 
-	  if (dstlen > INET_MAX_BUFFER) /* sanity check */
+	  if (dstlen > INET_MAX_OPT_BUFFER) /* sanity check */
 	      return 0;
 	  if (dstlen > rsize) {
 	      if ((dst = (char*) ALLOC(dstlen)) == NULL)
@@ -6640,6 +7288,13 @@ static int inet_ctl(inet_descriptor* desc, int cmd, char* buf, int len,
 	return inet_ctl_getiflist(desc, rbuf, rsize);
     }
 
+    case INET_REQ_GETIFADDRS: {
+	DEBUGF(("inet_ctl(%ld): GETIFADDRS\r\n", (long)desc->port));
+	if (!IS_OPEN(desc))
+	    return ctl_xerror(EXBADPORT, rbuf, rsize);
+	return inet_ctl_getifaddrs(desc, rbuf, rsize);
+    }
+
     case INET_REQ_IFGET: {
 	DEBUGF(("inet_ctl(%ld): IFGET\r\n", (long)desc->port)); 	
 	if (!IS_OPEN(desc))
@@ -6847,13 +7502,13 @@ static int inet_ctl(inet_descriptor* desc, int cmd, char* buf, int len,
 
 	if (len < 2)
 	    return ctl_error(EINVAL, rbuf, rsize);
-	n = buf[0]; buf++; len--;
+	n = get_int8(buf); buf++; len--;
 	if (n >= len) /* the = sign makes the test inklude next length byte */
 	    return ctl_error(EINVAL, rbuf, rsize);
 	memcpy(namebuf, buf, n);
 	namebuf[n] = '\0';
 	len -= n; buf += n;
-	n = buf[0]; buf++; len--;
+	n = get_int8(buf); buf++; len--;
 	if (n > len)
 	    return ctl_error(EINVAL, rbuf, rsize);
 	memcpy(protobuf, buf, n);
@@ -6876,7 +7531,7 @@ static int inet_ctl(inet_descriptor* desc, int cmd, char* buf, int len,
 	port = get_int16(buf);
 	port = sock_htons(port);
 	buf += 2;
-	n = buf[0]; buf++; len -= 3;
+	n = get_int8(buf); buf++; len -= 3;
 	if (n > len)
 	    return ctl_error(EINVAL, rbuf, rsize);
 	memcpy(protobuf, buf, n);
@@ -9333,11 +9988,13 @@ static int packet_inet_input(udp_descriptor* udesc, HANDLE event)
 	    if (err != ERRNO_BLOCK) {
 		if (!desc->active) {
 #ifdef HAVE_SCTP
-		    if (short_recv)
+		    if (short_recv) {
 			async_error_am(desc, am_short_recv);
-		    else
-#else
+		    } else {
 			async_error(desc, err);
+		    }
+#else
+		    async_error(desc, err);
 #endif
 		    driver_cancel_timer(desc->port);
 		    sock_select(desc,FD_READ,0);
diff --git a/erts/emulator/drivers/unix/mem_drv.c b/erts/emulator/drivers/unix/mem_drv.c
deleted file mode 100644
index 1417ca1121..0000000000
--- a/erts/emulator/drivers/unix/mem_drv.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1996-2009. 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%
- */
-
-/* Purpose: Access to elib memory statistics */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "sys.h"
-#include "erl_driver.h"
-#include "elib_stat.h"
-
-#define MAP_BUF_SIZE    1000   /* Max map size */
-#define HISTO_BUF_SIZE  100    /* Max histogram buckets */
-
-static ErlDrvData mem_start(ErlDrvPort);
-static int mem_init(void); 
-static void mem_stop(ErlDrvData);
-static void mem_command(ErlDrvData, char*, int);
-
-const struct driver_entry mem_driver_entry = {
-    mem_init,
-    mem_start,
-    mem_stop,
-    mem_command,
-    NULL,
-    NULL,
-    "mem_drv"
-};
-
-static int mem_init(void)
-{
-    return 0;
-}
-
-static ErlDrvData mem_start(ErlDrvPort port, char* buf)
-{
-    return (ErlDrvData)port;
-}
-
-static void mem_stop(ErlDrvData port)
-{
-}
-
-void putint32(p, v)
-byte* p; int v;
-{
-    p[0] = (v >> 24) & 0xff;
-    p[1] = (v >> 16) & 0xff;
-    p[2] = (v >> 8) & 0xff;
-    p[3] = (v) & 0xff;
-}
-
-int getint16(p)
-byte* p;
-{
-    return (p[0] << 8) | p[1];
-}
-
-/*
-** Command:
-**   m L1 L0  -> a heap map of length L1*256 + L0 is returned
-**   s        -> X3 X2 X1 X0 Y3 Y2 Y1 Y0 Z3 Z2 Z1 Z0
-**               X == Total heap size bytes
-**               Y == Total free bytes
-**               Z == Size of largest free block in bytes
-**
-**   h L1 L0 B0 -> Generate a logarithm historgram base B with L buckets
-**   l L1 L0 S0 -> Generate a linear histogram with step S with L buckets
-*/
-unsigned char outbuf[HISTO_BUF_SIZE*2*4];
-
-static void mem_command(ErlDrvData port, char* buf, int count)
-{
-    if ((count == 1) && buf[0] == 's') {
-	struct elib_stat info;
-	char v[3*4];
-
-	elib_stat(&info);
-
-	putint32(v, info.mem_total*4);
-	putint32(v+4, info.mem_free*4);
-	putint32(v+8, info.max_free*4);
-	driver_output((ErlDrvPort)port, v, 12);
-	return;
-    }
-    else if ((count == 3) && buf[0] == 'm') {
-	char w[MAP_BUF_SIZE];
-	int n = getint16(buf+1);
-
-	if (n > MAP_BUF_SIZE)
-	    n = MAP_BUF_SIZE;
-	elib_heap_map(w, n);
-	driver_output((ErlDrvPort)port, w, n);
-	return;
-    }
-    else if ((count == 4) && (buf[0] == 'h' || buf[0] == 'l')) {
-	unsigned long vf[HISTO_BUF_SIZE];
-	unsigned long va[HISTO_BUF_SIZE];
-	int n = getint16(buf+1);
-	int base = (unsigned char) buf[3];
-
-	if (n >= HISTO_BUF_SIZE)
-	    n = HISTO_BUF_SIZE;
-	if (buf[0] == 'l')
-	    base = -base;
-	if (elib_histo(vf, va, n, base) < 0) {
-	    driver_failure((ErlDrvPort)port, -1);
-	    return;
-	}
-	else {
-	    char* p = outbuf;
-	    int i;
-
-	    for (i = 0; i < n; i++) {
-		putint32(p, vf[i]);
-		p += 4;
-	    }
-	    for (i = 0; i < n; i++) {
-		putint32(p, va[i]);
-		p += 4;
-	    }
-	    driver_output((ErlDrvPort)port, outbuf, n*8);
-	}
-	return;
-    }
-    driver_failure((ErlDrvPort)port, -1);
-}
diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c
index ea016526ef..4b3934657c 100644
--- a/erts/emulator/drivers/unix/unix_efile.c
+++ b/erts/emulator/drivers/unix/unix_efile.c
@@ -98,7 +98,7 @@ extern STATUS copy(char *, char *);
 #define EF_SAFE_REALLOC(P, S)	ef_safe_realloc((P), (S))
 #define EF_FREE(P)		do { if((P)) driver_free((P)); } while(0)
 
-extern void erl_exit(int n, char *fmt, _DOTS_);
+void erl_exit(int n, char *fmt, ...);
 
 static void *ef_safe_alloc(Uint s)
 {
@@ -127,7 +127,7 @@ static void *ef_safe_realloc(void *op, Uint s)
     (s[0] == '.' && (s[1] == '\0' || (s[1] == '.' && s[2] == '\0')))
 
 #ifdef VXWORKS
-static FUNCTION(int, vxworks_to_posix, (int vx_errno));
+static int vxworks_to_posix(int vx_errno);
 #endif
 
 /*
@@ -146,7 +146,7 @@ static FUNCTION(int, vxworks_to_posix, (int vx_errno));
 #define CHECK_PATHLEN(X,Y) /* Nothing */
 #endif
 
-static FUNCTION(int, check_error, (int result, Efile_error* errInfo));
+static int check_error(int result, Efile_error* errInfo);
 
 static int
 check_error(int result, Efile_error *errInfo)
@@ -587,7 +587,8 @@ efile_readdir(Efile_error* errInfo,	/* Where to return error codes. */
 						   open directory.*/
 	      char* buffer,		/* Pointer to buffer for 
 					   one filename. */
-	      size_t size)		/* Size of buffer. */
+	      size_t *size)		/* in-out Size of buffer, length
+					   of name. */
 {
     DIR *dp;			/* Pointer to directory structure. */
     struct dirent* dirp;	/* Pointer to directory entry. */
@@ -619,7 +620,8 @@ efile_readdir(Efile_error* errInfo,	/* Where to return error codes. */
 	if (IS_DOT_OR_DOTDOT(dirp->d_name))
 	    continue;
 	buffer[0] = '\0';
-	strncat(buffer, dirp->d_name, size-1);
+	strncat(buffer, dirp->d_name, (*size)-1);
+	*size = strlen(dirp->d_name);
 	return 1;
     }
 }
@@ -706,6 +708,9 @@ efile_openfile(Efile_error* errInfo,	/* Where to return error codes. */
 #endif
     }
 
+    if (flags & EFILE_MODE_EXCL) {
+	mode |= O_EXCL;
+    }
 
 #ifdef VXWORKS
     if (*name != '/') {
diff --git a/erts/emulator/drivers/win32/mem_drv.c b/erts/emulator/drivers/win32/mem_drv.c
deleted file mode 100644
index fa7c46eca8..0000000000
--- a/erts/emulator/drivers/win32/mem_drv.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2009. 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%
- */
-/* Purpose: Access to elib memory statistics */
-
-#include "sys.h"
-#include "erl_driver.h"
-#include "elib_stat.h"
-
-#define MAP_BUF_SIZE    1000   /* Max map size */
-#define HISTO_BUF_SIZE  100    /* Max histogram buckets */
-
-static ErlDrvData mem_start(ErlDrvPort, char*);
-static int mem_init(void); 
-static void mem_stop(ErlDrvData);
-static void mem_command(ErlDrvData);
-
-ErlDrvEntry mem_driver_entry = {
-    mem_init,
-    mem_start,
-    mem_stop,
-    mem_command,
-    NULL,
-    NULL,
-    "mem_drv"
-};
-
-static int mem_init(void)
-{
-    return 0;
-}
-
-static ErlDrvData mem_start(ErlDrvPort port, char* buf)
-{
-    return (ErlDrvData)port;
-}
-
-static void mem_stop(ErlDrvData port)
-{
-}
-
-void putint32(p, v)
-byte* p; int v;
-{
-    p[0] = (v >> 24) & 0xff;
-    p[1] = (v >> 16) & 0xff;
-    p[2] = (v >> 8) & 0xff;
-    p[3] = (v) & 0xff;
-}
-
-int getint16(p)
-byte* p;
-{
-    return (p[0] << 8) | p[1];
-}
-
-/*
-** Command:
-**   m L1 L0  -> a heap map of length L1*256 + L0 is returned
-**   s        -> X3 X2 X1 X0 Y3 Y2 Y1 Y0 Z3 Z2 Z1 Z0
-**               X == Total heap size bytes
-**               Y == Total free bytes
-**               Z == Size of largest free block in bytes
-**
-**   h L1 L0 B0 -> Generate a logarithm histogram base B with L buckets
-**   l L1 L0 S0 -> Generate a linear histogram with step S with L buckets
-*/
-unsigned char outbuf[HISTO_BUF_SIZE*2*4];
-
-static void mem_command(ErlDrvData port, char* buf, int count)
-{
-    if ((count == 1) && buf[0] == 's') {
-	struct elib_stat info;
-	char v[3*4];
-
-	elib_stat(&info);
-
-	putint32(v, info.mem_total*4);
-	putint32(v+4, info.mem_free*4);
-	putint32(v+8, info.max_free*4);
-	driver_output((ErlDrvPort)port, v, 12);
-	return;
-    }
-    else if ((count == 3) && buf[0] == 'm') {
-	char w[MAP_BUF_SIZE];
-	int n = getint16(buf+1);
-
-	if (n > MAP_BUF_SIZE)
-	    n = MAP_BUF_SIZE;
-	elib_heap_map(w, n);
-	driver_output((ErlDrvPort)port, w, n);
-	return;
-    }
-    else if ((count == 4) && (buf[0] == 'h' || buf[0] == 'l')) {
-	unsigned long vf[HISTO_BUF_SIZE];
-	unsigned long va[HISTO_BUF_SIZE];
-	int n = getint16(buf+1);
-	int base = (unsigned char) buf[3];
-
-	if (n >= HISTO_BUF_SIZE)
-	    n = HISTO_BUF_SIZE;
-	if (buf[0] == 'l')
-	    base = -base;
-	if (elib_histo(vf, va, n, base) < 0) {
-	    driver_failure((ErlDrvPort)port, -1);
-	    return;
-	}
-	else {
-	    char* p = outbuf;
-	    int i;
-
-	    for (i = 0; i < n; i++) {
-		putint32(p, vf[i]);
-		p += 4;
-	    }
-	    for (i = 0; i < n; i++) {
-		putint32(p, va[i]);
-		p += 4;
-	    }
-	    driver_output((ErlDrvPort)port, outbuf, n*8);
-	}
-	return;
-    }
-    driver_failure((ErlDrvPort)port, -1);
-}
-
diff --git a/erts/emulator/drivers/win32/win_con.c b/erts/emulator/drivers/win32/win_con.c
index 2202ca655f..14f7941643 100644
--- a/erts/emulator/drivers/win32/win_con.c
+++ b/erts/emulator/drivers/win32/win_con.c
@@ -704,6 +704,18 @@ FrameWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 	}
         write_inbuf(&c, 1);
 	return 0;
+    case WM_MOUSEWHEEL:
+      {
+	int delta = GET_WHEEL_DELTA_WPARAM(wParam);
+	if (delta < 0) {
+	  PostMessage(hClientWnd, WM_VSCROLL, MAKELONG(SB_THUMBTRACK,
+						       (iVscrollPos + 5)),0);
+	} else {
+	  WORD pos = ((iVscrollPos - 5) < 0) ? 0 : (iVscrollPos - 5);
+	  PostMessage(hClientWnd, WM_VSCROLL, MAKELONG(SB_THUMBTRACK,pos),0);
+	}
+      return 0;
+      }
     case WM_CHAR:
 	c = (TCHAR)wParam;
         write_inbuf(&c,1);
diff --git a/erts/emulator/drivers/win32/win_efile.c b/erts/emulator/drivers/win32/win_efile.c
index 24b6fb30dc..101853736a 100644..100755
--- a/erts/emulator/drivers/win32/win_efile.c
+++ b/erts/emulator/drivers/win32/win_efile.c
@@ -23,20 +23,20 @@
 #include <windows.h>
 #include "sys.h"
 #include <ctype.h>
-
+#include <wchar.h>
 #include "erl_efile.h"
 
 /*
  * Microsoft-specific function to map a WIN32 error code to a Posix errno.
  */
 
-#define ISSLASH(a)  ((a) == '\\' || (a) == '/')
+#define ISSLASH(a)  ((a) == L'\\' || (a) == L'/')
 
 #define ISDIR(st) (((st).st_mode&S_IFMT) == S_IFDIR)
 #define ISREG(st) (((st).st_mode&S_IFMT) == S_IFREG)
 
 #define IS_DOT_OR_DOTDOT(s) \
-    (s[0] == '.' && (s[1] == '\0' || (s[1] == '.' && s[2] == '\0')))
+    ((s)[0] == L'.' && ((s)[1] == L'\0' || ((s)[1] == L'.' && (s)[2] == L'\0')))
 
 #ifndef INVALID_FILE_ATTRIBUTES
 #define INVALID_FILE_ATTRIBUTES ((DWORD) 0xFFFFFFFF)
@@ -44,9 +44,9 @@
 
 static int check_error(int result, Efile_error* errInfo);
 static int set_error(Efile_error* errInfo);
-static int IsRootUNCName(const char* path);
-static int extract_root(char* name);
-static unsigned short dos_to_posix_mode(int attr, const char *name);
+static int is_root_unc_name(const WCHAR *path);
+static int extract_root(WCHAR *name);
+static unsigned short dos_to_posix_mode(int attr, const WCHAR *name);
 
 static int errno_map(DWORD last_error) {
 
@@ -196,27 +196,26 @@ win_writev(Efile_error* errInfo,
 
 
 int
-efile_mkdir(errInfo, name)
-Efile_error* errInfo;		/* Where to return error codes. */
-char* name;			/* Name of directory to create. */
+efile_mkdir(Efile_error* errInfo,	/* Where to return error codes. */
+	    char* name)			/* Name of directory to create. */
 {
-    return check_error(mkdir(name), errInfo);
+    return check_error(_wmkdir((WCHAR *) name), errInfo);
 }
 
 int
-efile_rmdir(errInfo, name)
-Efile_error* errInfo;		/* Where to return error codes. */
-char* name;			/* Name of directory to delete. */
+efile_rmdir(Efile_error* errInfo,	/* Where to return error codes. */
+	    char* name)			/* Name of directory to delete. */
 {
     OSVERSIONINFO os;
     DWORD attr;
+    WCHAR *wname = (WCHAR *) name;
 
-    if (RemoveDirectory(name) != FALSE) {
+    if (RemoveDirectoryW(wname) != FALSE) {
 	return 1;
     }
     errno = errno_map(GetLastError());
     if (errno == EACCES) {
-	attr = GetFileAttributes(name);
+	attr = GetFileAttributesW(wname);
 	if (attr != (DWORD) -1) {
 	    if ((attr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
 		/* 
@@ -238,21 +237,21 @@ char* name;			/* Name of directory to delete. */
 	    GetVersionEx(&os);
 	    if (os.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
 		HANDLE handle;
-		WIN32_FIND_DATA data;
-		char buffer[2*MAX_PATH];
+		WIN32_FIND_DATAW data;
+		WCHAR buffer[2*MAX_PATH];
 		int len;
 
-		len = strlen(name);
-		strcpy(buffer, name);
-		if (buffer[0] && buffer[len-1] != '\\' && buffer[len-1] != '/') {
-		    strcat(buffer, "\\");
+		len = wcslen(wname);
+		wcscpy(buffer, wname);
+		if (buffer[0] && buffer[len-1] != L'\\' && buffer[len-1] != L'/') {
+		    wcscat(buffer, L"\\");
 		}
-		strcat(buffer, "*.*");
-		handle = FindFirstFile(buffer, &data);
+		wcscat(buffer, L"*.*");
+		handle = FindFirstFileW(buffer, &data);
 		if (handle != INVALID_HANDLE_VALUE) {
 		    while (1) {
-			if ((strcmp(data.cFileName, ".") != 0)
-				&& (strcmp(data.cFileName, "..") != 0)) {
+			if ((wcscmp(data.cFileName, L".") != 0)
+				&& (wcscmp(data.cFileName, L"..") != 0)) {
 			    /*
 			     * Found something in this directory.
 			     */
@@ -260,7 +259,7 @@ char* name;			/* Name of directory to delete. */
 			    errno = EEXIST;
 			    break;
 			}
-			if (FindNextFile(handle, &data) == FALSE) {
+			if (FindNextFileW(handle, &data) == FALSE) {
 			    break;
 			}
 		    }
@@ -284,19 +283,19 @@ char* name;			/* Name of directory to delete. */
 }
 
 int
-efile_delete_file(errInfo, name)
-Efile_error* errInfo;		/* Where to return error codes. */
-char* name;			/* Name of file to delete. */
+efile_delete_file(Efile_error* errInfo,		/* Where to return error codes. */
+		  char* name)			/* Name of file to delete. */
 {
     DWORD attr;
+    WCHAR *wname = (WCHAR *) name;
 
-    if (DeleteFile(name) != FALSE) {
+    if (DeleteFileW(wname) != FALSE) {
 	return 1;
     }
 
     errno = errno_map(GetLastError());
     if (errno == EACCES) {
-        attr = GetFileAttributes(name);
+        attr = GetFileAttributesW(wname);
 	if (attr != (DWORD) -1) {
 	    if (attr & FILE_ATTRIBUTE_DIRECTORY) {
 		/*
@@ -308,7 +307,7 @@ char* name;			/* Name of file to delete. */
 	    }
 	}
     } else if (errno == ENOENT) {
-        attr = GetFileAttributes(name);
+        attr = GetFileAttributesW(wname);
 	if (attr != (DWORD) -1) {
 	    if (attr & FILE_ATTRIBUTE_DIRECTORY) {
 	    	/*
@@ -362,20 +361,21 @@ char* name;			/* Name of file to delete. */
  */
 
 int
-efile_rename(errInfo, src, dst)
-Efile_error* errInfo;		/* Where to return error codes. */
-char* src;			/* Original name. */
-char* dst;			/* New name. */
+efile_rename(Efile_error* errInfo,	/* Where to return error codes. */
+	     char* src,			/* Original name. */
+	     char* dst)			/* New name. */
 {
     DWORD srcAttr, dstAttr;
+    WCHAR *wsrc = (WCHAR *) src;
+    WCHAR *wdst = (WCHAR *) dst;
     
-    if (MoveFile(src, dst) != FALSE) {
+    if (MoveFileW(wsrc, wdst) != FALSE) {
 	return 1;
     }
 
     errno = errno_map(GetLastError());
-    srcAttr = GetFileAttributes(src);
-    dstAttr = GetFileAttributes(dst);
+    srcAttr = GetFileAttributesW(wsrc);
+    dstAttr = GetFileAttributesW(wdst);
     if (srcAttr == (DWORD) -1) {
 	srcAttr = 0;
     }
@@ -390,22 +390,22 @@ char* dst;			/* New name. */
     if (errno == EACCES) {
 	decode:
 	if (srcAttr & FILE_ATTRIBUTE_DIRECTORY) {
-	    char srcPath[MAX_PATH], dstPath[MAX_PATH];
-	    char *srcRest, *dstRest;
+	    WCHAR srcPath[MAX_PATH], dstPath[MAX_PATH];
+	    WCHAR *srcRest, *dstRest;
 	    int size;
 
-	    size = GetFullPathName(src, sizeof(srcPath), srcPath, &srcRest);
-	    if ((size == 0) || (size > sizeof(srcPath))) {
+	    size = GetFullPathNameW(wsrc, MAX_PATH, srcPath, &srcRest);
+	    if ((size == 0) || (size > MAX_PATH)) {
 		return check_error(-1, errInfo);
 	    }
-	    size = GetFullPathName(dst, sizeof(dstPath), dstPath, &dstRest);
-	    if ((size == 0) || (size > sizeof(dstPath))) {
+	    size = GetFullPathNameW(wdst, MAX_PATH, dstPath, &dstRest);
+	    if ((size == 0) || (size > MAX_PATH)) {
 		return check_error(-1, errInfo);
 	    }
 	    if (srcRest == NULL) {
-		srcRest = srcPath + strlen(srcPath);
+		srcRest = srcPath + wcslen(srcPath);
 	    }
-	    if (strnicmp(srcPath, dstPath, srcRest - srcPath) == 0) {
+	    if (_wcsnicmp(srcPath, dstPath, srcRest - srcPath) == 0) {
 		/*
 		 * Trying to move a directory into itself.
 		 */
@@ -420,14 +420,14 @@ char* dst;			/* New name. */
 	    }
 
 	    (void) extract_root(dstPath);
-	    if (dstPath[0] == '\0') {
+	    if (dstPath[0] == L'\0') {
 		/*
 		 * The filename was invalid.  (Don't know why,
 		 * but play it safe.)
 		 */
 		errno = EINVAL;
 	    }
-	    if (stricmp(srcPath, dstPath) != 0) {
+	    if (_wcsicmp(srcPath, dstPath) != 0) {
 		/*
 		 * If src is a directory and dst filesystem != src
 		 * filesystem, errno should be EXDEV.  It is very
@@ -463,14 +463,14 @@ char* dst;			/* New name. */
 		 * fails, it's because it wasn't empty.
 		 */
 
-		if (RemoveDirectory(dst)) {
+		if (RemoveDirectoryW(wdst)) {
 		    /*
 		     * Now that that empty directory is gone, we can try
 		     * renaming again.  If that fails, we'll put this empty
 		     * directory back, for completeness.
 		     */
 
-		    if (MoveFile(src, dst) != FALSE) {
+		    if (MoveFileW(wsrc, wdst) != FALSE) {
 			return 1;
 		    }
 
@@ -480,8 +480,8 @@ char* dst;			/* New name. */
 		     */
 
 		    errno = errno_map(GetLastError());
-		    CreateDirectory(dst, NULL);
-		    SetFileAttributes(dst, dstAttr);
+		    CreateDirectoryW(wdst, NULL);
+		    SetFileAttributesW(wdst, dstAttr);
 		    if (errno == EACCES) {
 			/*
 			 * Decode the EACCES to a more meaningful error.
@@ -506,17 +506,17 @@ char* dst;			/* New name. */
 		 *    put temp file back to old name.
 		 */
 
-		char tempName[MAX_PATH];
+		WCHAR tempName[MAX_PATH];
 		int result, size;
-		char *rest;
+		WCHAR *rest;
 		
-		size = GetFullPathName(dst, sizeof(tempName), tempName, &rest);
-		if ((size == 0) || (size > sizeof(tempName)) || (rest == NULL)) {
+		size = GetFullPathNameW(wdst, MAX_PATH, tempName, &rest);
+		if ((size == 0) || (size > MAX_PATH) || (rest == NULL)) {
 		    return check_error(-1, errInfo);
 		}
-		*rest = '\0';
+		*rest = L'\0';
 		result = -1;
-		if (GetTempFileName(tempName, "erlr", 0, tempName) != 0) {
+		if (GetTempFileNameW(tempName, L"erlr", 0, tempName) != 0) {
 		    /*
 		     * Strictly speaking, need the following DeleteFile and
 		     * MoveFile to be joined as an atomic operation so no
@@ -524,15 +524,15 @@ char* dst;			/* New name. */
 		     * same temp file.
 		     */
 		     
-		    DeleteFile(tempName);
-		    if (MoveFile(dst, tempName) != FALSE) {
-			if (MoveFile(src, dst) != FALSE) {
-			    SetFileAttributes(tempName, FILE_ATTRIBUTE_NORMAL);
-			    DeleteFile(tempName);
+		    DeleteFileW(tempName);
+		    if (MoveFileW(wdst, tempName) != FALSE) {
+			if (MoveFileW(wsrc, wdst) != FALSE) {
+			    SetFileAttributesW(tempName, FILE_ATTRIBUTE_NORMAL);
+			    DeleteFileW(tempName);
 			    return 1;
 			} else {
-			    DeleteFile(dst);
-			    MoveFile(tempName, dst);
+			    DeleteFileW(wdst);
+			    MoveFileW(tempName, wdst);
 			}
 		    } 
 
@@ -558,11 +558,10 @@ char* dst;			/* New name. */
 }
 
 int
-efile_chdir(errInfo, name)
-Efile_error* errInfo;		/* Where to return error codes. */
-char* name;			/* Name of directory to make current. */
+efile_chdir(Efile_error* errInfo,	/* Where to return error codes. */
+	    char* name)			/* Name of directory to make current. */
 {
-    int success = check_error(chdir(name), errInfo);
+    int success = check_error(_wchdir((WCHAR *) name), errInfo);
     if (!success && errInfo->posix_errno == EINVAL)
 	/* POSIXification of errno */
 	errInfo->posix_errno = ENOENT;
@@ -570,59 +569,65 @@ char* name;			/* Name of directory to make current. */
 }
 
 int
-efile_getdcwd(errInfo, drive, buffer, size)
-Efile_error* errInfo;		/* Where to return error codes. */
-int drive;			/* 0 - current, 1 - A, 2 - B etc. */
-char* buffer;			/* Where to return the current directory. */
-size_t size;			/* Size of buffer. */
+efile_getdcwd(Efile_error* errInfo,		/* Where to return error codes. */
+	      int drive,			/* 0 - current, 1 - A, 2 - B etc. */
+	      char* buffer,			/* Where to return the current directory. */
+	      size_t size)			/* Size of buffer. */
 {
-    if (_getdcwd(drive, buffer, size) == NULL)
+    WCHAR *wbuffer = (WCHAR *) buffer;
+    size_t wbuffer_size = size / 2; 
+    if (_wgetdcwd(drive, wbuffer, wbuffer_size) == NULL)
 	return check_error(-1, errInfo);
-    for ( ; *buffer; buffer++) 
-	if (*buffer == '\\')
-	    *buffer = '/';
+    for ( ; *wbuffer; wbuffer++) 
+	if (*wbuffer == L'\\')
+	    *wbuffer = L'/';
     return 1;
 }
 
 int
-efile_readdir(errInfo, name, dir_handle, buffer, size)
-Efile_error* errInfo;		/* Where to return error codes. */
-char* name;			/* Name of directory to open. */
-EFILE_DIR_HANDLE* dir_handle;	/* Directory handle of open directory. */
-char* buffer;			/* Pointer to buffer for one filename. */
-size_t size;			/* Size of buffer. */
+efile_readdir(Efile_error* errInfo, /* Where to return error codes. */
+	      char* name,           /* Name of directory to list */
+	      EFILE_DIR_HANDLE* dir_handle, /* Handle of opened directory or NULL */
+	      char* buffer,                 /* Buffer to put one filename in */ 
+	      size_t *size)                 /* in-out size of buffer/size of filename excluding zero
+					       termination in bytes*/
 {
     HANDLE dir;			/* Handle to directory. */
-    char wildcard[MAX_PATH];	/* Wildcard to search for. */
-    WIN32_FIND_DATA findData;	/* Data found by FindFirstFile() or FindNext(). */
+    WCHAR wildcard[MAX_PATH];	/* Wildcard to search for. */
+    WIN32_FIND_DATAW findData;	/* Data found by FindFirstFile() or FindNext(). */
+    /* Alignment is not honored, this works on x86 because of alignment fixup by processor.
+       Not perfect, but faster than alinging by hand (really) */
+    WCHAR *wname = (WCHAR *) name;
+    WCHAR *wbuffer = (WCHAR *) buffer;
 
     /*
      * First time we must setup everything.
      */
 
     if (*dir_handle == NULL) {
-	int length = strlen(name);
-	char* s;
+	int length = wcslen(wname);
+	WCHAR* s;
 
 	if (length+3 >= MAX_PATH) {
 	    errno = ENAMETOOLONG;
 	    return check_error(-1, errInfo);
 	}
 
-	strcpy(wildcard, name);
+	wcscpy(wildcard, wname);
 	s = wildcard+length-1;
-	if (*s != '/' && *s != '\\')
-	    *++s = '\\';
-	*++s = '*';
-	*++s = '\0';
-	DEBUGF(("Reading %s\n", wildcard));
-	dir = FindFirstFile(wildcard, &findData);
+	if (*s != L'/' && *s != L'\\')
+	    *++s = L'\\';
+	*++s = L'*';
+	*++s = L'\0';
+	DEBUGF(("Reading %ws\n", wildcard));
+	dir = FindFirstFileW(wildcard, &findData);
 	if (dir == INVALID_HANDLE_VALUE)
 	    return set_error(errInfo);
 	*dir_handle = (EFILE_DIR_HANDLE) dir;
 
 	if (!IS_DOT_OR_DOTDOT(findData.cFileName)) {
-	    strcpy(buffer, findData.cFileName);
+	    wcscpy(wbuffer, findData.cFileName);
+	    *size = wcslen(wbuffer)*2;
 	    return 1;
 	}
     }
@@ -635,10 +640,11 @@ size_t size;			/* Size of buffer. */
     dir = (HANDLE) *dir_handle;
 
     for (;;) {
-	if (FindNextFile(dir, &findData)) {
+	if (FindNextFileW(dir, &findData)) {
 	    if (IS_DOT_OR_DOTDOT(findData.cFileName))
 		continue;
-	    strcpy(buffer, findData.cFileName);
+	    wcscpy(wbuffer, findData.cFileName);
+	    *size = wcslen(wbuffer)*2;
 	    return 1;
 	}
 
@@ -655,17 +661,17 @@ size_t size;			/* Size of buffer. */
 }
 
 int
-efile_openfile(errInfo, name, flags, pfd, pSize)
-Efile_error* errInfo;		/* Where to return error codes. */
-char* name;			/* Name of directory to open. */
-int flags;			/* Flags to use for opening. */
-int* pfd;			/* Where to store the file descriptor. */
-Sint64* pSize;			/* Where to store the size of the file. */
+efile_openfile(Efile_error* errInfo,		/* Where to return error codes. */
+	       char* name,			/* Name of directory to open. */
+	       int flags,			/* Flags to use for opening. */
+	       int* pfd,			/* Where to store the file descriptor. */
+	       Sint64* pSize)			/* Where to store the size of the file. */
 {
     BY_HANDLE_FILE_INFORMATION fileInfo; /* File information from a handle. */
     HANDLE fd;			/* Handle to open file. */
     DWORD access;		/* Access mode: GENERIC_READ, GENERIC_WRITE. */
     DWORD crFlags;
+    WCHAR *wname = (WCHAR *) name;
 
     switch (flags & (EFILE_MODE_READ|EFILE_MODE_WRITE)) {
     case EFILE_MODE_READ:
@@ -689,7 +695,10 @@ Sint64* pSize;			/* Where to store the size of the file. */
     if (flags & EFILE_MODE_APPEND) {
 	crFlags = OPEN_ALWAYS;
     }
-    fd = CreateFile(name, access,
+    if (flags & EFILE_MODE_EXCL) {
+	crFlags = CREATE_NEW;
+    }
+    fd = CreateFileW(wname, access,
 		    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
 		    NULL, crFlags, FILE_ATTRIBUTE_NORMAL, NULL);
 
@@ -708,7 +717,7 @@ Sint64* pSize;			/* Where to store the size of the file. */
 	 * to EISDIR.
 	 */
 	if (errInfo->posix_errno && 
-	    (attr = GetFileAttributes(name)) != INVALID_FILE_ATTRIBUTES && 
+	    (attr = GetFileAttributesW(wname)) != INVALID_FILE_ATTRIBUTES && 
 	    (attr & FILE_ATTRIBUTE_DIRECTORY)) {
 	    errInfo->posix_errno = EISDIR;
 	}
@@ -732,9 +741,10 @@ Sint64* pSize;			/* Where to store the size of the file. */
 
 int 
 efile_may_openfile(Efile_error* errInfo, char *name) {
+    WCHAR *wname = (WCHAR *) name;
     DWORD attr;
 
-    if ((attr = GetFileAttributes(name)) == INVALID_FILE_ATTRIBUTES) {
+    if ((attr = GetFileAttributesW(wname)) == INVALID_FILE_ATTRIBUTES) {
 	return check_error(-1, errInfo);
     }
 
@@ -743,18 +753,6 @@ efile_may_openfile(Efile_error* errInfo, char *name) {
 	return check_error(-1, errInfo);
     }
     return 1;
-#if 0
-    struct stat statbuf;
-    
-    if (stat(name, &statbuf)) {
-	return check_error(-1, errInfo);
-    }
-    if (ISDIR(statbuf)) {
-	errno = EISDIR;
-	return check_error(-1, errInfo);
-    }
-    return 1;
-#endif
 }
 
 void
@@ -789,16 +787,17 @@ efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
 	       char* orig_name, int info_for_link)
 {
     HANDLE findhandle;		/* Handle returned by FindFirstFile(). */
-    WIN32_FIND_DATA findbuf;	/* Data return by FindFirstFile(). */
-    char name[_MAX_PATH];
+    WIN32_FIND_DATAW findbuf;	/* Data return by FindFirstFile(). */
+    WCHAR name[_MAX_PATH];
     int name_len;
-    char* path;
-    char pathbuf[_MAX_PATH];
+    WCHAR *path;
+    WCHAR pathbuf[_MAX_PATH];
     int drive;			/* Drive for filename (1 = A:, 2 = B: etc). */
+    WCHAR *worig_name = (WCHAR *) orig_name; 
 
     /* Don't allow wildcards to be interpreted by system */
 
-    if (strpbrk(orig_name, "?*")) {
+    if (wcspbrk(worig_name, L"?*")) {
     enoent:
 	errInfo->posix_errno = ENOENT;
 	errInfo->os_errno = ERROR_FILE_NOT_FOUND;
@@ -810,25 +809,25 @@ efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
      * slash, because it causes FindFirstFile() to fail on Win95.
      */
 
-    if ((name_len = strlen(orig_name)) >= _MAX_PATH) {
+    if ((name_len = wcslen(worig_name)) >= _MAX_PATH) {
 	goto enoent;
     } else {
-	strcpy(name, orig_name);
+	wcscpy(name, worig_name);
 	if (name_len > 2 && ISSLASH(name[name_len-1]) &&
-	    name[name_len-2] != ':') {
-	    name[name_len-1] = '\0';
+	    name[name_len-2] != L':') {
+	    name[name_len-1] = L'\0';
 	}
     }
     
     /* Try to get disk from name.  If none, get current disk.  */
 
-    if (name[1] != ':') {
+    if (name[1] != L':') {
         drive = 0;
-        if (GetCurrentDirectory(sizeof(pathbuf), pathbuf) &&
-	    pathbuf[1] == ':') {
-	    drive = tolower(pathbuf[0]) - 'a' + 1;
+        if (GetCurrentDirectoryW(_MAX_PATH, pathbuf) &&
+	    pathbuf[1] == L':') {
+	    drive = towlower(pathbuf[0]) - L'a' + 1;
 	}
-    } else if (*name && name[2] == '\0') {
+    } else if (*name && name[2] == L'\0') {
 	/*
 	 * X: and nothing more is an error.
 	 */
@@ -836,15 +835,15 @@ efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
 	errInfo->os_errno = ERROR_FILE_NOT_FOUND;
 	return 0;
     } else
-        drive = tolower(*name) - 'a' + 1;
+        drive = towlower(*name) - L'a' + 1;
 
-    findhandle = FindFirstFile(name, &findbuf);
+    findhandle = FindFirstFileW(name, &findbuf);
     if (findhandle == INVALID_HANDLE_VALUE) {
-        if (!(strpbrk(name, "./\\") &&
-	      (path = _fullpath(pathbuf, name, _MAX_PATH)) &&
+        if (!(wcspbrk(name, L"./\\") &&
+	      (path = _wfullpath(pathbuf, name, _MAX_PATH)) &&
 	      /* root dir. ('C:\') or UNC root dir. ('\\server\share\') */
-	      ((strlen(path) == 3) || IsRootUNCName(path)) &&
-	      (GetDriveType(path) > 1)   ) ) {
+	      ((wcslen(path) == 3) || is_root_unc_name(path)) &&
+	      (GetDriveTypeW(path) > 1)   ) ) {
 	    errInfo->posix_errno = ENOENT;
 	    errInfo->os_errno = ERROR_FILE_NOT_FOUND;
 	    return 0;
@@ -857,8 +856,9 @@ efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
         findbuf.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY;
         findbuf.nFileSizeHigh = 0;
         findbuf.nFileSizeLow = 0;
-        findbuf.cFileName[0] = '\0';
+        findbuf.cFileName[0] = L'\0';
 
+	pInfo->links = 1;
 	pInfo->modifyTime.year = 1980;
 	pInfo->modifyTime.month = 1;
 	pInfo->modifyTime.day = 1;
@@ -871,6 +871,35 @@ efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
 	SYSTEMTIME SystemTime;
         FILETIME LocalFTime;
 
+	/*first check if we are a symlink */
+	if (!info_for_link && (findbuf.dwFileAttributes &
+			       FILE_ATTRIBUTE_REPARSE_POINT)){
+	    /*
+	     * given that we know this is a symlink,
+	     we should be able to find its target */
+	    WCHAR target_name[_MAX_PATH];
+	    if (efile_readlink(errInfo, (char *) name, 
+			       (char *) target_name,256) == 1) {
+		FindClose(findhandle);
+		return efile_fileinfo(errInfo, pInfo,
+				      (char *) target_name, info_for_link);
+	    }
+	}
+
+	/* number of links: */
+	{
+	    HANDLE handle;	/* Handle returned by CreateFile() */
+	    BY_HANDLE_FILE_INFORMATION fileInfo; /* from  CreateFile() */
+	    if (handle = CreateFileW(name, GENERIC_READ, 0,NULL,
+				    OPEN_EXISTING, 0, NULL)) {
+		GetFileInformationByHandle(handle, &fileInfo);
+		pInfo->links = fileInfo.nNumberOfLinks;
+		CloseHandle(handle);
+	    } else {
+		pInfo->links = 1;
+	    }	
+	}
+
 #define GET_TIME(dst, src) \
 if (!FileTimeToLocalFileTime(&findbuf.src, &LocalFTime) || \
     !FileTimeToSystemTime(&LocalFTime, &SystemTime)) { \
@@ -905,7 +934,10 @@ if (!FileTimeToLocalFileTime(&findbuf.src, &LocalFTime) || \
     pInfo->size_low = findbuf.nFileSizeLow;
     pInfo->size_high = findbuf.nFileSizeHigh;
 	
-    if (findbuf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+    if (info_for_link && (findbuf.dwFileAttributes &
+			  FILE_ATTRIBUTE_REPARSE_POINT))
+	pInfo->type = FT_SYMLINK;
+    else if (findbuf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
 	pInfo->type = FT_DIRECTORY;
     else
 	pInfo->type = FT_REGULAR;
@@ -916,7 +948,6 @@ if (!FileTimeToLocalFileTime(&findbuf.src, &LocalFTime) || \
 	pInfo->access = FA_READ|FA_WRITE;
 
     pInfo->mode = dos_to_posix_mode(findbuf.dwFileAttributes, name);
-    pInfo->links = 1;
     pInfo->major_device = drive;
     pInfo->minor_device = 0;
     pInfo->inode = 0;
@@ -927,10 +958,9 @@ if (!FileTimeToLocalFileTime(&findbuf.src, &LocalFTime) || \
 }
 
 int
-efile_write_info(errInfo, pInfo, name)
-Efile_error* errInfo;
-Efile_info* pInfo;
-char* name;
+efile_write_info(Efile_error* errInfo,
+		 Efile_info* pInfo,
+		 char* name)
 {
     SYSTEMTIME timebuf;
     FILETIME LocalFileTime;
@@ -944,12 +974,13 @@ char* name;
     DWORD attr;
     DWORD tempAttr;
     BOOL modifyTime = FALSE;
+    WCHAR *wname = (WCHAR *) name;
 
     /*
      * Get the attributes for the file.
      */
 
-    tempAttr = attr = GetFileAttributes((LPTSTR)name);
+    tempAttr = attr = GetFileAttributesW(wname);
     if (attr == 0xffffffff) {
 	return set_error(errInfo);
     }
@@ -985,8 +1016,8 @@ char* name;
      } \
     }
 
-    MKTIME(ModifyFileTime, pInfo->accessTime, mtime);
-    MKTIME(AccessFileTime, pInfo->modifyTime, atime);
+    MKTIME(ModifyFileTime, pInfo->modifyTime, mtime);
+    MKTIME(AccessFileTime, pInfo->accessTime, atime);
     MKTIME(CreationFileTime, pInfo->cTime, ctime);
 #undef MKTIME
 
@@ -1003,12 +1034,12 @@ char* name;
 
 	if (tempAttr & FILE_ATTRIBUTE_READONLY) {
 	    tempAttr &= ~FILE_ATTRIBUTE_READONLY;
-	    if (!SetFileAttributes((LPTSTR) name, tempAttr)) {
+	    if (!SetFileAttributesW(wname, tempAttr)) {
 		return set_error(errInfo);
 	    }
 	}
 
-	fd = CreateFile(name, GENERIC_READ|GENERIC_WRITE,
+	fd = CreateFileW(wname, GENERIC_READ|GENERIC_WRITE,
 			FILE_SHARE_READ | FILE_SHARE_WRITE,
 			NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 	if (fd != INVALID_HANDLE_VALUE) {
@@ -1026,7 +1057,7 @@ char* name;
      */
 
     if (tempAttr != attr) {
-	if (!SetFileAttributes((LPTSTR) name, attr)) {
+	if (!SetFileAttributesW(wname, attr)) {
 	    return set_error(errInfo);
 	}
     }
@@ -1079,12 +1110,17 @@ char* buf;			/* Buffer to write. */
 size_t count;			/* Number of bytes to write. */
 {
     DWORD written;		/* Bytes written in last operation. */
+    OVERLAPPED overlapped;
+    OVERLAPPED* pOverlapped = NULL;
 
     if (flags & EFILE_MODE_APPEND) {
-	(void) SetFilePointer((HANDLE) fd, 0, NULL, FILE_END);
+	memset(&overlapped, 0, sizeof(overlapped));
+	overlapped.Offset = 0xffffffff;
+	overlapped.OffsetHigh = 0xffffffff;
+	pOverlapped = &overlapped;
     }
     while (count > 0) {
-	if (!WriteFile((HANDLE) fd, buf, count, &written, NULL))
+	if (!WriteFile((HANDLE) fd, buf, count, &written, pOverlapped))
 	    return set_error(errInfo);
 	buf += written;
 	count -= written;
@@ -1104,11 +1140,16 @@ efile_writev(Efile_error* errInfo,   /* Where to return error codes */
 	     size_t size)            /* Number of bytes to write */
 {
     int cnt;                         /* Buffers so far written */
+    OVERLAPPED overlapped;
+    OVERLAPPED* pOverlapped = NULL;
 
     ASSERT(iovcnt >= 0);
     
     if (flags & EFILE_MODE_APPEND) {
-	(void) SetFilePointer((HANDLE) fd, 0, NULL, FILE_END);
+	memset(&overlapped, 0, sizeof(overlapped));
+	overlapped.Offset = 0xffffffff;
+	overlapped.OffsetHigh = 0xffffffff;
+	pOverlapped = &overlapped;
     }
     for (cnt = 0; cnt < iovcnt; cnt++) {
 	if (iov[cnt].iov_base && iov[cnt].iov_len > 0) {
@@ -1120,7 +1161,7 @@ efile_writev(Efile_error* errInfo,   /* Where to return error codes */
 			       iov[cnt].iov_base + p, 
 			       iov[cnt].iov_len - p, 
 			       &w, 
-			       NULL))
+			       pOverlapped))
 		    return set_error(errInfo);
 	    }
 	}
@@ -1192,7 +1233,7 @@ int flags;
 
 
 /*
- * IsRootUNCName - returns TRUE if the argument is a UNC name specifying
+ * is_root_unc_name - returns TRUE if the argument is a UNC name specifying
  *      a root share.  That is, if it is of the form \\server\share\.
  *      This routine will also return true if the argument is of the
  *      form \\server\share (no trailing slash) but Win32 currently
@@ -1202,16 +1243,16 @@ int flags;
  */
 
 static int
-IsRootUNCName(const char* path)
+is_root_unc_name(const WCHAR *path)
 {
     /*
      * If a root UNC name, path will start with 2 (but not 3) slashes
      */
 
-    if ((strlen(path) >= 5) /* minimum string is "//x/y" */
+    if ((wcslen(path) >= 5) /* minimum string is "//x/y" */
 	&& ISSLASH(path[0]) && ISSLASH(path[1]))
     {
-        const char * p = path + 2 ;
+        const WCHAR *p = path + 2;
 
         /*
          * find the slash between the server name and share name
@@ -1254,19 +1295,19 @@ IsRootUNCName(const char* path)
  */
 
 static int
-extract_root(char* name)
+extract_root(WCHAR* name)
 {
-    int len = strlen(name);
+    int len = wcslen(name);
 
-    if (isalpha(name[0]) && name[1] == ':' && ISSLASH(name[2])) {
-	int c = name[3];
-	name[3] = '\0';
-	return c == '\0';
+    if (iswalpha(name[0]) && name[1] == L':' && ISSLASH(name[2])) {
+	WCHAR c = name[3];
+	name[3] = L'\0';
+	return c == L'\0';
     } else if (len < 5 || !ISSLASH(name[0]) || !ISSLASH(name[1])) {
 	goto error;
     } else {			/* Try to find the end of the UNC name. */
-	char* p;
-	int c;
+	WCHAR* p;
+	WCHAR c;
 
         /*
          * Find the slash between the server name and share name.
@@ -1275,7 +1316,7 @@ extract_root(char* name)
 	for (p = name + 2; *p; p++)
             if (ISSLASH(*p))
                 break;
-	if (*p == '\0')
+	if (*p == L'\0')
 	    goto error;
 
 	/*
@@ -1286,24 +1327,24 @@ extract_root(char* name)
             if (ISSLASH(*p))
                 break;
 	c = *p;
-	*p = '\0';
-	return c == '\0' || p[1] == '\0';
+	*p = L'\0';
+	return c == L'\0' || p[1] == L'\0';
     }
 
  error:
-    *name = '\0';
+    *name = L'\0';
     return 1;
 }
 
 static unsigned short
-dos_to_posix_mode(int attr, const char *name)
+dos_to_posix_mode(int attr, const WCHAR *name)
 {
     register unsigned short uxmode;
     unsigned dosmode;
-    register const char *p;
+    register const WCHAR *p;
 
     dosmode = attr & 0xff;
-    if ((p = name)[1] == ':')
+    if ((p = name)[1] == L':')
 	p += 2;
 
     /* check to see if this is a directory - note we must make a special
@@ -1312,7 +1353,7 @@ dos_to_posix_mode(int attr, const char *name)
 
     uxmode = (unsigned short)
 	(((ISSLASH(*p) && !p[1]) || (dosmode & FILE_ATTRIBUTE_DIRECTORY) ||
-	       *p == '\0') ? _S_IFDIR|_S_IEXEC : _S_IFREG);
+	       *p == L'\0') ? _S_IFDIR|_S_IEXEC : _S_IFREG);
 
     /* If attribute byte does not have read-only bit, it is read-write */
 
@@ -1321,11 +1362,11 @@ dos_to_posix_mode(int attr, const char *name)
 
     /* see if file appears to be executable - check extension of name */
 
-    if (p = strrchr(name, '.')) {
-        if (!stricmp(p, ".exe") ||
-	    !stricmp(p, ".cmd") ||
-	    !stricmp(p, ".bat") ||
-	    !stricmp(p, ".com"))
+    if (p = wcsrchr(name, L'.')) {
+        if (!_wcsicmp(p, L".exe") ||
+	    !_wcsicmp(p, L".cmd") ||
+	    !_wcsicmp(p, L".bat") ||
+	    !_wcsicmp(p, L".com"))
             uxmode |= _S_IEXEC;
     }
 
@@ -1340,6 +1381,60 @@ dos_to_posix_mode(int attr, const char *name)
 int
 efile_readlink(Efile_error* errInfo, char* name, char* buffer, size_t size)
 {
+    /*
+     * load dll and see if we have CreateSymbolicLink at runtime:
+     * (Vista only)
+     */
+    HINSTANCE hModule = NULL;
+    WCHAR *wname = (WCHAR *) name;
+    WCHAR *wbuffer = (WCHAR *) buffer;
+    if ((hModule = LoadLibrary("kernel32.dll")) != NULL) {
+	typedef DWORD (WINAPI * GETFINALPATHNAMEBYHANDLEPTR)(
+							     HANDLE hFile,
+							     LPCWSTR lpFilePath,
+							     DWORD cchFilePath,
+							     DWORD dwFlags);
+
+	GETFINALPATHNAMEBYHANDLEPTR pGetFinalPathNameByHandle =
+	    (GETFINALPATHNAMEBYHANDLEPTR)GetProcAddress(hModule, "GetFinalPathNameByHandleW");
+
+	if (pGetFinalPathNameByHandle == NULL) {
+	    FreeLibrary(hModule);
+	} else {
+	    /* first check if file is a symlink; {error, einval} otherwise */
+	    DWORD fileAttributes =  GetFileAttributesW(wname);
+	    if ((fileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
+		BOOLEAN success = 0;
+		HANDLE h = CreateFileW(wname, GENERIC_READ, 0,NULL, OPEN_EXISTING, 0, NULL);
+		int len;
+		if(h != INVALID_HANDLE_VALUE) {
+		    success = pGetFinalPathNameByHandle(h, wbuffer, size,0);
+		    /* GetFinalPathNameByHandle prepends path with "\\?\": */
+		    len = wcslen(wbuffer);
+		    wmemmove(wbuffer,wbuffer+4,len-3);
+		    if (len - 4 >= 2 && wbuffer[1] == L':' && wbuffer[0] >= L'A' &&
+			wbuffer[0] <= L'Z') {
+			wbuffer[0] = wbuffer[0] + L'a' - L'A';
+		    }
+			
+		    for ( ; *wbuffer; wbuffer++) 
+			if (*wbuffer == L'\\')
+			    *wbuffer = L'/';
+		    CloseHandle(h);
+		}
+		FreeLibrary(hModule);
+		if (success) {
+		    return 1;
+		} else {
+		    return set_error(errInfo);
+		}
+	    } else {
+		FreeLibrary(hModule);
+		errno = EINVAL;
+		return check_error(-1, errInfo);
+	    }
+	}
+    }
     errno = ENOTSUP;
     return check_error(-1, errInfo);
 }
@@ -1348,17 +1443,20 @@ efile_readlink(Efile_error* errInfo, char* name, char* buffer, size_t size)
 int
 efile_altname(Efile_error* errInfo, char* orig_name, char* buffer, size_t size)
 {
-    WIN32_FIND_DATA wfd;
+    WIN32_FIND_DATAW wfd;
     HANDLE fh;
-    char name[_MAX_PATH];
+    WCHAR name[_MAX_PATH+1];
     int name_len;
-    char* path;
-    char pathbuf[_MAX_PATH];
+    WCHAR* path;
+    WCHAR pathbuf[_MAX_PATH+1]; /* Unclear weather GetCurrentDirectory will access one char after
+				   _MAX_PATH */
+    WCHAR *worig_name = (WCHAR *) orig_name;
+    WCHAR *wbuffer = (WCHAR *) buffer;
     int drive;			/* Drive for filename (1 = A:, 2 = B: etc). */
 
     /* Don't allow wildcards to be interpreted by system */
 
-    if (strpbrk(orig_name, "?*")) {
+    if (wcspbrk(worig_name, L"?*")) {
     enoent:
 	errInfo->posix_errno = ENOENT;
 	errInfo->os_errno = ERROR_FILE_NOT_FOUND;
@@ -1370,67 +1468,105 @@ efile_altname(Efile_error* errInfo, char* orig_name, char* buffer, size_t size)
      * slash, because it causes FindFirstFile() to fail on Win95.
      */
 
-    if ((name_len = strlen(orig_name)) >= _MAX_PATH) {
+    if ((name_len = wcslen(worig_name)) >= _MAX_PATH) {
 	goto enoent;
     } else {
-	strcpy(name, orig_name);
+	wcscpy(name, worig_name);
 	if (name_len > 2 && ISSLASH(name[name_len-1]) &&
-	    name[name_len-2] != ':') {
-	    name[name_len-1] = '\0';
+	    name[name_len-2] != L':') {
+	    name[name_len-1] = L'\0';
 	}
     }
     
     /* Try to get disk from name.  If none, get current disk.  */
 
-    if (name[1] != ':') {
+    if (name[1] != L':') {
         drive = 0;
-        if (GetCurrentDirectory(sizeof(pathbuf), pathbuf) &&
-	    pathbuf[1] == ':') {
-	    drive = tolower(pathbuf[0]) - 'a' + 1;
+        if (GetCurrentDirectoryW(_MAX_PATH, pathbuf) &&
+	    pathbuf[1] == L':') {
+	    drive = towlower(pathbuf[0]) - L'a' + 1;
 	}
-    } else if (*name && name[2] == '\0') {
+    } else if (*name && name[2] == L'\0') {
 	/*
 	 * X: and nothing more is an error.
 	 */
 	goto enoent;
     } else {
-        drive = tolower(*name) - 'a' + 1;
+        drive = towlower(*name) - L'a' + 1;
     }
-    fh = FindFirstFile(name,&wfd);
+    fh = FindFirstFileW(name,&wfd);
     if (fh == INVALID_HANDLE_VALUE) {
-        if (!(strpbrk(name, "./\\") &&
-	      (path = _fullpath(pathbuf, name, _MAX_PATH)) &&
+        if (!(wcspbrk(name, L"./\\") &&
+	      (path = _wfullpath(pathbuf, name, _MAX_PATH)) &&
 	      /* root dir. ('C:\') or UNC root dir. ('\\server\share\') */
-	      ((strlen(path) == 3) || IsRootUNCName(path)) &&
-	      (GetDriveType(path) > 1)   ) ) {
+	      ((wcslen(path) == 3) || is_root_unc_name(path)) &&
+	      (GetDriveTypeW(path) > 1)   ) ) {
 	    errno = errno_map(GetLastError());
 	    return check_error(-1, errInfo);
 	}
         /*
          * Root directories (such as C:\ or \\server\share\ are fabricated.
          */
-	strcpy(buffer,name);
+	wcscpy(wbuffer,name);
 	return 1;
     }
 	
-    strcpy(buffer,wfd.cAlternateFileName);
-    if (!*buffer) {
-	strcpy(buffer,wfd.cFileName);
+    wcscpy(wbuffer,wfd.cAlternateFileName);
+    if (!*wbuffer) {
+	wcscpy(wbuffer,wfd.cFileName);
     }
-
+    FindClose(fh);
     return 1;
 }
 
+
 int
 efile_link(Efile_error* errInfo, char* old, char* new)
 {
-    errno = ENOTSUP;
-    return check_error(-1, errInfo);
+    WCHAR *wold = (WCHAR *) old;
+    WCHAR *wnew = (WCHAR *) new;
+    if(!CreateHardLinkW(wnew, wold, NULL)) {
+	return set_error(errInfo);
+    }
+    return 1;
 }
 
 int
 efile_symlink(Efile_error* errInfo, char* old, char* new)
 {
+    /*
+     * Load dll and see if we have CreateSymbolicLink at runtime:
+     * (Vista only)
+     */
+    HINSTANCE hModule = NULL;
+    WCHAR *wold = (WCHAR *) old;
+    WCHAR *wnew = (WCHAR *) new;
+    if ((hModule = LoadLibrary("kernel32.dll")) != NULL) {
+	typedef BOOLEAN (WINAPI  * CREATESYMBOLICLINKFUNCPTR) (
+	     LPCWSTR lpSymlinkFileName,
+	     LPCWSTR lpTargetFileName,
+	     DWORD dwFlags);
+
+	CREATESYMBOLICLINKFUNCPTR pCreateSymbolicLink =
+	    (CREATESYMBOLICLINKFUNCPTR) GetProcAddress(hModule,
+						       "CreateSymbolicLinkW");
+	/* A for MBCS, W for UNICODE... char* above implies 'W'! */
+	if (pCreateSymbolicLink != NULL) {
+	    DWORD attr = GetFileAttributesW(wold);
+	    int flag = (attr != INVALID_FILE_ATTRIBUTES &&
+			attr & FILE_ATTRIBUTE_DIRECTORY) ? 1 : 0;
+	    /*  SYMBOLIC_LINK_FLAG_DIRECTORY = 1 */
+	    BOOLEAN success = pCreateSymbolicLink(wnew, wold, flag);
+	    FreeLibrary(hModule);
+
+	    if (success) {
+		return 1;
+	    } else {
+		return set_error(errInfo);
+	    }
+	} else
+	    FreeLibrary(hModule);
+    }
     errno = ENOTSUP;
     return check_error(-1, errInfo);
 }
diff --git a/erts/emulator/hipe/hipe_amd64_glue.S b/erts/emulator/hipe/hipe_amd64_glue.S
index 83b7b0397b..3376487292 100644
--- a/erts/emulator/hipe/hipe_amd64_glue.S
+++ b/erts/emulator/hipe/hipe_amd64_glue.S
@@ -346,6 +346,8 @@ nbif_3_gc_after_bif:
 	subq	$(16-8), %rsp
 	movq	P, %rdi
 	movq	%rax, %rsi
+	xorl	%edx, %edx		# Pass NULL in regs
+	xorl	%ecx, %ecx		# Pass 0 in arity
 	call	CSYM(erts_gc_after_bif_call)
 	addq	$(16-8), %rsp
 	movl	$0, P_NARITY(P)		# Note: narity is a 32-bit field
@@ -400,7 +402,7 @@ nbif_3_simple_exception:
 	 * - the native heap/stack/reds registers are saved in P
 	 */
 .handle_trap:
-	movq	%rax, P_NARITY(P)
+	movl	%eax, P_NARITY(P)	# Note: narity is a 32-bit field
 	movl	$HIPE_MODE_SWITCH_RES_TRAP, %eax
 	jmp	.nosave_exit
 
diff --git a/erts/emulator/hipe/hipe_arm_glue.S b/erts/emulator/hipe/hipe_arm_glue.S
index 5d626a5f69..2bce01954e 100644
--- a/erts/emulator/hipe/hipe_arm_glue.S
+++ b/erts/emulator/hipe/hipe_arm_glue.S
@@ -311,6 +311,8 @@ nbif_3_gc_after_bif:
 	str	TEMP_LR, [P, #P_NRA]
 	str	NSP, [P, #P_NSP]
 	mov	TEMP_LR, lr
+	mov	r3, #0			/* Pass 0 in arity */
+	mov	r2, #0			/* Pass NULL in regs */
 	mov	r1, r0
 	mov	r0, P
 	bl	erts_gc_after_bif_call
diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c
index b0abfd2310..2a877d8ace 100644
--- a/erts/emulator/hipe/hipe_bif0.c
+++ b/erts/emulator/hipe/hipe_bif0.c
@@ -440,9 +440,12 @@ BIF_RETTYPE hipe_bifs_alloc_data_2(BIF_ALIST_2)
 	 align != sizeof(long) && align != sizeof(double)))
 	BIF_ERROR(BIF_P, BADARG);
     nrbytes = unsigned_val(BIF_ARG_2);
+    if (nrbytes == 0)
+	BIF_RET(make_small(0));
     block = erts_alloc(ERTS_ALC_T_HIPE, nrbytes);
     if ((unsigned long)block & (align-1))
-	fprintf(stderr, "Yikes! erts_alloc() returned misaligned address %p\r\n", block);
+	fprintf(stderr, "%s: erts_alloc(%lu) returned %p which is not %lu-byte aligned\r\n",
+		__FUNCTION__, (unsigned long)nrbytes, block, (unsigned long)align);
     BIF_RET(address_to_term(block, BIF_P));
 }
 
diff --git a/erts/emulator/hipe/hipe_bif1.c b/erts/emulator/hipe/hipe_bif1.c
index 5188950e17..8f43811537 100644
--- a/erts/emulator/hipe/hipe_bif1.c
+++ b/erts/emulator/hipe/hipe_bif1.c
@@ -876,22 +876,44 @@ BIF_RETTYPE hipe_bifs_misc_timer_clear_0(BIF_ALIST_0)
  * + The fallback, which is the same as {X,_} = runtime(statistics).
  */
 
+static double fallback_get_hrvtime(void)
+{
+    unsigned long ms_user;
+
+    elapsed_time_both(&ms_user, NULL, NULL, NULL);
+    return (double)ms_user;
+}
+
 #if USE_PERFCTR
 
 #include "hipe_perfctr.h"
-static int hrvtime_is_open;
-#define hrvtime_is_started()	hrvtime_is_open
+static int hrvtime_started;	/* 0: closed, +1: perfctr, -1: fallback */
+#define hrvtime_is_started()	(hrvtime_started != 0)
 
 static void start_hrvtime(void)
 {
     if (hipe_perfctr_hrvtime_open() >= 0)
-	hrvtime_is_open = 1;
+	hrvtime_started = 1;
+    else
+	hrvtime_started = -1;
 }
 
-#define get_hrvtime()		hipe_perfctr_hrvtime_get()
-#define stop_hrvtime()		hipe_perfctr_hrvtime_close()
+static void stop_hrvtime(void)
+{
+    if (hrvtime_started > 0)
+	hipe_perfctr_hrvtime_close();
+    hrvtime_started = 0;
+}
 
-#else
+static double get_hrvtime(void)
+{
+    if (hrvtime_started > 0)
+	return hipe_perfctr_hrvtime_get();
+    else
+	return fallback_get_hrvtime();
+}
+
+#else	/* !USE_PERFCTR */
 
 /*
  * Fallback, if nothing better exists.
@@ -902,15 +924,9 @@ static void start_hrvtime(void)
 #define hrvtime_is_started()	1
 #define start_hrvtime()		do{}while(0)
 #define stop_hrvtime()		do{}while(0)
+#define get_hrvtime()		fallback_get_hrvtime()
 
-static double get_hrvtime(void)
-{
-    unsigned long ms_user;
-    elapsed_time_both(&ms_user, NULL, NULL, NULL);
-    return (double)ms_user;
-}
-
-#endif	/* hrvtime support */
+#endif	/* !USE_PERFCTR */
 
 BIF_RETTYPE hipe_bifs_get_hrvtime_0(BIF_ALIST_0)
 {
@@ -918,11 +934,8 @@ BIF_RETTYPE hipe_bifs_get_hrvtime_0(BIF_ALIST_0)
     Eterm res;
     FloatDef f;
 
-    if (!hrvtime_is_started()) {
+    if (!hrvtime_is_started())
 	start_hrvtime();
-	if (!hrvtime_is_started())
-	    BIF_RET(NIL); /* arity 0 BIFs may not fail */
-    }
     f.fd = get_hrvtime();
     hp = HAlloc(BIF_P, FLOAT_SIZE_OBJECT);
     res = make_float(hp);
diff --git a/erts/emulator/hipe/hipe_mkliterals.c b/erts/emulator/hipe/hipe_mkliterals.c
index a77aec7919..900dfc5a8a 100644
--- a/erts/emulator/hipe/hipe_mkliterals.c
+++ b/erts/emulator/hipe/hipe_mkliterals.c
@@ -261,7 +261,7 @@ static const struct literal {
     /* Field offsets in a process struct */
     { "P_HP", offsetof(struct process, htop) },
     { "P_HP_LIMIT", offsetof(struct process, stop) },
-    { "P_OFF_HEAP_MSO", offsetof(struct process, off_heap.mso) },
+    { "P_OFF_HEAP_FIRST", offsetof(struct process, off_heap.first) },
     { "P_MBUF", offsetof(struct process, mbuf) },
     { "P_ID", offsetof(struct process, id) },
     { "P_FLAGS", offsetof(struct process, flags) },
@@ -456,7 +456,7 @@ static const struct rts_param {
 } rts_params[] = {
     { 1, "P_OFF_HEAP_FUNS",
 #if !defined(HYBRID)
-      1, offsetof(struct process, off_heap.funs)
+      1, offsetof(struct process, off_heap.first)
 #endif
     },
 
diff --git a/erts/emulator/hipe/hipe_ppc_glue.S b/erts/emulator/hipe/hipe_ppc_glue.S
index 97b07353f9..c010f4f047 100644
--- a/erts/emulator/hipe/hipe_ppc_glue.S
+++ b/erts/emulator/hipe/hipe_ppc_glue.S
@@ -476,6 +476,8 @@ CSYM(nbif_3_gc_after_bif):
 	STORE	TEMP_LR, P_NRA(P)
 	STORE	NSP, P_NSP(P)
 	mflr	TEMP_LR
+	li	r6, 0			/* Pass 0 in arity */
+	li	r5, 0			/* Pass NULL in regs */
 	mr	r4, r3
 	mr	r3, P
 	bl	CSYM(erts_gc_after_bif_call)
@@ -539,7 +541,7 @@ CSYM(nbif_3_simple_exception):
 .handle_trap:
 	li	r3, HIPE_MODE_SWITCH_RES_TRAP
 	STORE	NSP, P_NSP(P)
-	STORE	r4, P_NARITY(P)
+	stw	r4, P_NARITY(P)	/* Note: narity is a 32-bit field */
 	STORE	TEMP_LR, P_NRA(P)
 	b	.nosave_exit
 
diff --git a/erts/emulator/hipe/hipe_sparc_glue.S b/erts/emulator/hipe/hipe_sparc_glue.S
index d1af5c43f5..73cefd4896 100644
--- a/erts/emulator/hipe/hipe_sparc_glue.S
+++ b/erts/emulator/hipe/hipe_sparc_glue.S
@@ -333,6 +333,8 @@ nbif_3_gc_after_bif:
 	st	TEMP_RA, [P+P_NRA]
 	st	NSP, [P+P_NSP]
 	mov	RA, TEMP_RA
+	mov	0, %o3			/* Pass 0 in arity */
+	mov	0, %o2			/* Pass NULL in regs */
 	mov	%o0, %o1
 	call	erts_gc_after_bif_call
 	mov	P, %o0			/* delay slot */
diff --git a/erts/emulator/hipe/hipe_x86_glue.S b/erts/emulator/hipe/hipe_x86_glue.S
index 2f7dff39f5..43392111fe 100644
--- a/erts/emulator/hipe/hipe_x86_glue.S
+++ b/erts/emulator/hipe/hipe_x86_glue.S
@@ -320,11 +320,13 @@ nbif_3_gc_after_bif:
 	.align	4
 .gc_after_bif:
 	movl	%edx, P_NARITY(P)
-	subl	$(16-4), %esp
+	subl	$(32-4), %esp
 	movl	P, (%esp)
 	movl	%eax, 4(%esp)
+	movl	$0, 8(%esp)		# Pass NULL in regs
+	movl	$0, 12(%esp)		# Pass 0 in arity
 	call	CSYM(erts_gc_after_bif_call)
-	addl	$(16-4), %esp
+	addl	$(32-4), %esp
 	movl	$0, P_NARITY(P)
 	ret
 
diff --git a/erts/emulator/hipe/hipe_x86_signal.c b/erts/emulator/hipe/hipe_x86_signal.c
index a4fff4ce31..0c61e7bf96 100644
--- a/erts/emulator/hipe/hipe_x86_signal.c
+++ b/erts/emulator/hipe/hipe_x86_signal.c
@@ -195,7 +195,7 @@ static void do_init(void)
 #define INIT()	do { if (!init_done()) do_init(); } while (0)
 #endif /* __DARWIN__ */
 
-#if !defined(__GLIBC__) && !defined(__DARWIN__)
+#if !defined(__GLIBC__) && !defined(__DARWIN__) && !defined(__NetBSD__)
 /*
  * Assume Solaris/x86 2.8.
  * There is a number of sigaction() procedures in libc:
@@ -231,6 +231,7 @@ static void do_init(void)
 #define INIT()	do { if (!init_done()) do_init(); } while (0)
 #endif	/* not glibc or darwin */
 
+#if !defined(__NetBSD__)
 /*
  * This is our wrapper for sigaction(). sigaction() can be called before
  * hipe_signal_init() has been executed, especially when threads support
@@ -253,7 +254,7 @@ static int my_sigaction(int signum, const struct sigaction *act, struct sigactio
     }
     return __next_sigaction(signum, act, oldact);
 }
-
+#endif
 /*
  * This overrides the C library's core sigaction() procedure, catching
  * all its internal calls.
@@ -268,7 +269,7 @@ int __SIGACTION(int signum, const struct sigaction *act, struct sigaction *oldac
 /*
  * This catches the application's own sigaction() calls.
  */
-#if !defined(__DARWIN__)
+#if !defined(__DARWIN__) && !defined(__NetBSD__)
 int sigaction(int signum, const struct sigaction *act, struct sigaction *oldact)
 {
     return my_sigaction(signum, act, oldact);
@@ -326,7 +327,9 @@ void hipe_signal_init(void)
     struct sigaction sa;
     int i;
 
+#ifndef __NetBSD__
     INIT();
+#endif
 
     hipe_sigaltstack_init();
 
diff --git a/erts/emulator/internal_doc/dec.dat b/erts/emulator/internal_doc/dec.dat
new file mode 100644
index 0000000000..771ef51baa
--- /dev/null
+++ b/erts/emulator/internal_doc/dec.dat
@@ -0,0 +1,942 @@
+{[59],894}.
+{[96],8175}.
+{[180],8189}.
+{[183],903}.
+{[198],1236}.
+{[230],1237}.
+{[399],1240}.
+{[415],1256}.
+{[439],1248}.
+{[601],1241}.
+{[629],1257}.
+{[658],1249}.
+{[697],884}.
+{[768],832}.
+{[768,65],192}.
+{[768,69],200}.
+{[768,73],204}.
+{[768,79],210}.
+{[768,85],217}.
+{[768,87],7808}.
+{[768,89],7922}.
+{[768,97],224}.
+{[768,101],232}.
+{[768,105],236}.
+{[768,111],242}.
+{[768,117],249}.
+{[768,119],7809}.
+{[768,121],7923}.
+{[768,168],8173}.
+{[768,770,65],7846}.
+{[768,770,69],7872}.
+{[768,770,79],7890}.
+{[768,770,97],7847}.
+{[768,770,101],7873}.
+{[768,770,111],7891}.
+{[768,772,69],7700}.
+{[768,772,79],7760}.
+{[768,772,101],7701}.
+{[768,772,111],7761}.
+{[768,774,65],7856}.
+{[768,774,97],7857}.
+{[768,776,85],475}.
+{[768,776,117],476}.
+{[768,776,953],8146}.
+{[768,776,965],8162}.
+{[768,787,837,913],8074}.
+{[768,787,837,919],8090}.
+{[768,787,837,937],8106}.
+{[768,787,837,945],8066}.
+{[768,787,837,951],8082}.
+{[768,787,837,969],8098}.
+{[768,787,913],7946}.
+{[768,787,917],7962}.
+{[768,787,919],7978}.
+{[768,787,921],7994}.
+{[768,787,927],8010}.
+{[768,787,937],8042}.
+{[768,787,945],7938}.
+{[768,787,949],7954}.
+{[768,787,951],7970}.
+{[768,787,953],7986}.
+{[768,787,959],8002}.
+{[768,787,965],8018}.
+{[768,787,969],8034}.
+{[768,788,837,913],8075}.
+{[768,788,837,919],8091}.
+{[768,788,837,937],8107}.
+{[768,788,837,945],8067}.
+{[768,788,837,951],8083}.
+{[768,788,837,969],8099}.
+{[768,788,913],7947}.
+{[768,788,917],7963}.
+{[768,788,919],7979}.
+{[768,788,921],7995}.
+{[768,788,927],8011}.
+{[768,788,933],8027}.
+{[768,788,937],8043}.
+{[768,788,945],7939}.
+{[768,788,949],7955}.
+{[768,788,951],7971}.
+{[768,788,953],7987}.
+{[768,788,959],8003}.
+{[768,788,965],8019}.
+{[768,788,969],8035}.
+{[768,795,79],7900}.
+{[768,795,85],7914}.
+{[768,795,111],7901}.
+{[768,795,117],7915}.
+{[768,837,945],8114}.
+{[768,837,951],8130}.
+{[768,837,969],8178}.
+{[768,913],8122}.
+{[768,917],8136}.
+{[768,919],8138}.
+{[768,921],8154}.
+{[768,927],8184}.
+{[768,933],8170}.
+{[768,937],8186}.
+{[768,945],8048}.
+{[768,949],8050}.
+{[768,951],8052}.
+{[768,953],8054}.
+{[768,959],8056}.
+{[768,965],8058}.
+{[768,969],8060}.
+{[768,8127],8141}.
+{[768,8190],8157}.
+{[769],833}.
+{[769,65],193}.
+{[769,67],262}.
+{[769,69],201}.
+{[769,71],500}.
+{[769,73],205}.
+{[769,75],7728}.
+{[769,76],313}.
+{[769,77],7742}.
+{[769,78],323}.
+{[769,79],211}.
+{[769,80],7764}.
+{[769,82],340}.
+{[769,83],346}.
+{[769,85],218}.
+{[769,87],7810}.
+{[769,89],221}.
+{[769,90],377}.
+{[769,97],225}.
+{[769,99],263}.
+{[769,101],233}.
+{[769,103],501}.
+{[769,105],237}.
+{[769,107],7729}.
+{[769,108],314}.
+{[769,109],7743}.
+{[769,110],324}.
+{[769,111],243}.
+{[769,112],7765}.
+{[769,114],341}.
+{[769,115],347}.
+{[769,117],250}.
+{[769,119],7811}.
+{[769,121],253}.
+{[769,122],378}.
+{[769,168],8174}.
+{[769,198],508}.
+{[769,216],510}.
+{[769,230],509}.
+{[769,248],511}.
+{[769,770,65],7844}.
+{[769,770,69],7870}.
+{[769,770,79],7888}.
+{[769,770,97],7845}.
+{[769,770,101],7871}.
+{[769,770,111],7889}.
+{[769,771,79],7756}.
+{[769,771,85],7800}.
+{[769,771,111],7757}.
+{[769,771,117],7801}.
+{[769,772,69],7702}.
+{[769,772,79],7762}.
+{[769,772,101],7703}.
+{[769,772,111],7763}.
+{[769,774,65],7854}.
+{[769,774,97],7855}.
+{[769,776,73],7726}.
+{[769,776,85],471}.
+{[769,776,105],7727}.
+{[769,776,117],472}.
+{[769,776,953],8147}.
+{[769,776,965],8163}.
+{[769,778,65],506}.
+{[769,778,97],507}.
+{[769,787,837,913],8076}.
+{[769,787,837,919],8092}.
+{[769,787,837,937],8108}.
+{[769,787,837,945],8068}.
+{[769,787,837,951],8084}.
+{[769,787,837,969],8100}.
+{[769,787,913],7948}.
+{[769,787,917],7964}.
+{[769,787,919],7980}.
+{[769,787,921],7996}.
+{[769,787,927],8012}.
+{[769,787,937],8044}.
+{[769,787,945],7940}.
+{[769,787,949],7956}.
+{[769,787,951],7972}.
+{[769,787,953],7988}.
+{[769,787,959],8004}.
+{[769,787,965],8020}.
+{[769,787,969],8036}.
+{[769,788,837,913],8077}.
+{[769,788,837,919],8093}.
+{[769,788,837,937],8109}.
+{[769,788,837,945],8069}.
+{[769,788,837,951],8085}.
+{[769,788,837,969],8101}.
+{[769,788,913],7949}.
+{[769,788,917],7965}.
+{[769,788,919],7981}.
+{[769,788,921],7997}.
+{[769,788,927],8013}.
+{[769,788,933],8029}.
+{[769,788,937],8045}.
+{[769,788,945],7941}.
+{[769,788,949],7957}.
+{[769,788,951],7973}.
+{[769,788,953],7989}.
+{[769,788,959],8005}.
+{[769,788,965],8021}.
+{[769,788,969],8037}.
+{[769,795,79],7898}.
+{[769,795,85],7912}.
+{[769,795,111],7899}.
+{[769,795,117],7913}.
+{[769,807,67],7688}.
+{[769,807,99],7689}.
+{[769,837,945],8116}.
+{[769,837,951],8132}.
+{[769,837,959],8180}.
+{[769,913],8123}.
+{[769,917],8137}.
+{[769,919],8139}.
+{[769,921],8155}.
+{[769,927],8185}.
+{[769,933],8171}.
+{[769,937],8187}.
+{[769,945],8049}.
+{[769,949],8051}.
+{[769,951],8053}.
+{[769,953],8055}.
+{[769,959],8057}.
+{[769,965],8059}.
+{[769,969],8061}.
+{[769,1043],1027}.
+{[769,1050],1036}.
+{[769,1075],1107}.
+{[769,1082],1116}.
+{[769,8127],8142}.
+{[769,8190],8158}.
+{[770,65],194}.
+{[770,67],264}.
+{[770,69],202}.
+{[770,71],284}.
+{[770,72],292}.
+{[770,73],206}.
+{[770,74],308}.
+{[770,79],212}.
+{[770,83],348}.
+{[770,85],219}.
+{[770,87],372}.
+{[770,89],374}.
+{[770,90],7824}.
+{[770,97],226}.
+{[770,99],265}.
+{[770,101],234}.
+{[770,103],285}.
+{[770,104],293}.
+{[770,105],238}.
+{[770,106],309}.
+{[770,111],244}.
+{[770,115],349}.
+{[770,117],251}.
+{[770,119],373}.
+{[770,121],375}.
+{[770,122],7825}.
+{[770,803,65],7852}.
+{[770,803,69],7878}.
+{[770,803,79],7896}.
+{[770,803,97],7853}.
+{[770,803,101],7879}.
+{[770,803,111],7897}.
+{[771,65],195}.
+{[771,69],7868}.
+{[771,73],296}.
+{[771,78],209}.
+{[771,79],213}.
+{[771,85],360}.
+{[771,86],7804}.
+{[771,89],7928}.
+{[771,97],227}.
+{[771,101],7869}.
+{[771,105],297}.
+{[771,110],241}.
+{[771,111],245}.
+{[771,117],361}.
+{[771,118],7805}.
+{[771,121],7929}.
+{[771,770,65],7850}.
+{[771,770,69],7876}.
+{[771,770,79],7894}.
+{[771,770,97],7851}.
+{[771,770,101],7877}.
+{[771,770,111],7895}.
+{[771,774,65],7860}.
+{[771,774,97],7861}.
+{[771,795,79],7904}.
+{[771,795,85],7918}.
+{[771,795,111],7905}.
+{[771,795,117],7919}.
+{[772,65],256}.
+{[772,69],274}.
+{[772,71],7712}.
+{[772,73],298}.
+{[772,79],332}.
+{[772,85],362}.
+{[772,97],257}.
+{[772,101],275}.
+{[772,103],7713}.
+{[772,105],299}.
+{[772,111],333}.
+{[772,117],363}.
+{[772,198],482}.
+{[772,230],483}.
+{[772,775,65],480}.
+{[772,775,97],481}.
+{[772,776,65],478}.
+{[772,776,85],469}.
+{[772,776,97],479}.
+{[772,776,117],470}.
+{[772,803,76],7736}.
+{[772,803,82],7772}.
+{[772,803,108],7737}.
+{[772,803,114],7773}.
+{[772,808,79],492}.
+{[772,808,111],493}.
+{[772,913],8121}.
+{[772,921],8153}.
+{[772,933],8169}.
+{[772,945],8113}.
+{[772,953],8145}.
+{[772,965],8161}.
+{[772,1048],1250}.
+{[772,1059],1262}.
+{[772,1080],1251}.
+{[772,1091],1263}.
+{[774,65],258}.
+{[774,69],276}.
+{[774,71],286}.
+{[774,73],300}.
+{[774,79],334}.
+{[774,85],364}.
+{[774,97],259}.
+{[774,101],277}.
+{[774,103],287}.
+{[774,105],301}.
+{[774,111],335}.
+{[774,117],365}.
+{[774,803,65],7862}.
+{[774,803,97],7863}.
+{[774,807,69],7708}.
+{[774,807,101],7709}.
+{[774,913],8120}.
+{[774,921],8152}.
+{[774,933],8168}.
+{[774,945],8112}.
+{[774,953],8144}.
+{[774,965],8160}.
+{[774,1040],1232}.
+{[774,1045],1238}.
+{[774,1046],1217}.
+{[774,1048],1049}.
+{[774,1059],1038}.
+{[774,1072],1233}.
+{[774,1077],1239}.
+{[774,1078],1218}.
+{[774,1080],1081}.
+{[774,1091],1118}.
+{[775,66],7682}.
+{[775,67],266}.
+{[775,68],7690}.
+{[775,69],278}.
+{[775,70],7710}.
+{[775,71],288}.
+{[775,72],7714}.
+{[775,73],304}.
+{[775,77],7744}.
+{[775,78],7748}.
+{[775,80],7766}.
+{[775,82],7768}.
+{[775,83],7776}.
+{[775,84],7786}.
+{[775,87],7814}.
+{[775,88],7818}.
+{[775,89],7822}.
+{[775,90],379}.
+{[775,98],7683}.
+{[775,99],267}.
+{[775,100],7691}.
+{[775,101],279}.
+{[775,102],7711}.
+{[775,103],289}.
+{[775,104],7715}.
+{[775,109],7745}.
+{[775,110],7749}.
+{[775,112],7767}.
+{[775,114],7769}.
+{[775,115],7777}.
+{[775,116],7787}.
+{[775,119],7815}.
+{[775,120],7819}.
+{[775,121],7823}.
+{[775,122],380}.
+{[775,383],7835}.
+{[775,769,83],7780}.
+{[775,769,115],7781}.
+{[775,774],784}.
+{[775,780,83],7782}.
+{[775,780,115],7783}.
+{[775,803,83],7784}.
+{[775,803,115],7785}.
+{[776,65],196}.
+{[776,69],203}.
+{[776,72],7718}.
+{[776,73],207}.
+{[776,79],214}.
+{[776,85],220}.
+{[776,87],7812}.
+{[776,88],7820}.
+{[776,89],376}.
+{[776,97],228}.
+{[776,101],235}.
+{[776,104],7719}.
+{[776,105],239}.
+{[776,111],246}.
+{[776,116],7831}.
+{[776,117],252}.
+{[776,119],7813}.
+{[776,120],7821}.
+{[776,121],255}.
+{[776,399],1242}.
+{[776,415],1258}.
+{[776,601],1243}.
+{[776,629],1259}.
+{[776,771,79],7758}.
+{[776,771,111],7759}.
+{[776,772,85],7802}.
+{[776,772,117],7803}.
+{[776,921],938}.
+{[776,933],939}.
+{[776,953],970}.
+{[776,965],971}.
+{[776,978],980}.
+{[776,1030],1031}.
+{[776,1040],1234}.
+{[776,1045],1025}.
+{[776,1046],1244}.
+{[776,1047],1246}.
+{[776,1048],1252}.
+{[776,1054],1254}.
+{[776,1059],1264}.
+{[776,1063],1268}.
+{[776,1067],1272}.
+{[776,1072],1235}.
+{[776,1077],1105}.
+{[776,1078],1245}.
+{[776,1079],1247}.
+{[776,1080],1253}.
+{[776,1086],1255}.
+{[776,1091],1265}.
+{[776,1095],1269}.
+{[776,1099],1273}.
+{[776,1110],1111}.
+{[777,65],7842}.
+{[777,69],7866}.
+{[777,73],7880}.
+{[777,79],7886}.
+{[777,85],7910}.
+{[777,89],7926}.
+{[777,97],7843}.
+{[777,101],7867}.
+{[777,105],7881}.
+{[777,111],7887}.
+{[777,117],7911}.
+{[777,121],7927}.
+{[777,770,65],7848}.
+{[777,770,69],7874}.
+{[777,770,79],7892}.
+{[777,770,97],7849}.
+{[777,770,101],7875}.
+{[777,770,111],7893}.
+{[777,774,65],7858}.
+{[777,774,97],7859}.
+{[777,795,79],7902}.
+{[777,795,85],7916}.
+{[777,795,111],7903}.
+{[777,795,117],7917}.
+{[778,65],197}.
+{[778,85],366}.
+{[778,97],229}.
+{[778,117],367}.
+{[778,119],7832}.
+{[778,121],7833}.
+{[779,79],336}.
+{[779,85],368}.
+{[779,111],337}.
+{[779,117],369}.
+{[779,1059],1266}.
+{[779,1091],1267}.
+{[780,65],461}.
+{[780,67],268}.
+{[780,68],270}.
+{[780,69],282}.
+{[780,71],486}.
+{[780,73],463}.
+{[780,75],488}.
+{[780,76],317}.
+{[780,78],327}.
+{[780,79],465}.
+{[780,82],344}.
+{[780,83],352}.
+{[780,84],356}.
+{[780,85],467}.
+{[780,90],381}.
+{[780,97],462}.
+{[780,99],269}.
+{[780,100],271}.
+{[780,101],283}.
+{[780,103],487}.
+{[780,105],464}.
+{[780,106],496}.
+{[780,107],489}.
+{[780,108],318}.
+{[780,110],328}.
+{[780,111],466}.
+{[780,114],345}.
+{[780,115],353}.
+{[780,116],357}.
+{[780,117],468}.
+{[780,122],382}.
+{[780,439],494}.
+{[780,658],495}.
+{[780,776,85],473}.
+{[780,776,117],474}.
+{[781,168],901}.
+{[781,776],836}.
+{[781,776,953],912}.
+{[781,776,965],944}.
+{[781,913],902}.
+{[781,917],904}.
+{[781,919],905}.
+{[781,921],906}.
+{[781,927],908}.
+{[781,933],910}.
+{[781,937],911}.
+{[781,945],940}.
+{[781,949],941}.
+{[781,951],942}.
+{[781,953],943}.
+{[781,959],972}.
+{[781,965],973}.
+{[781,969],974}.
+{[781,978],979}.
+{[783,65],512}.
+{[783,69],516}.
+{[783,73],520}.
+{[783,79],524}.
+{[783,82],528}.
+{[783,85],532}.
+{[783,97],513}.
+{[783,101],517}.
+{[783,105],521}.
+{[783,111],525}.
+{[783,114],529}.
+{[783,117],533}.
+{[783,1140],1142}.
+{[783,1141],1143}.
+{[785,65],514}.
+{[785,69],518}.
+{[785,73],522}.
+{[785,79],526}.
+{[785,82],530}.
+{[785,85],534}.
+{[785,97],515}.
+{[785,101],519}.
+{[785,105],523}.
+{[785,111],527}.
+{[785,114],531}.
+{[785,117],535}.
+{[787],835}.
+{[787,837,913],8072}.
+{[787,837,919],8088}.
+{[787,837,937],8104}.
+{[787,837,945],8064}.
+{[787,837,951],8080}.
+{[787,837,969],8096}.
+{[787,913],7944}.
+{[787,917],7960}.
+{[787,919],7976}.
+{[787,921],7992}.
+{[787,927],8008}.
+{[787,937],8040}.
+{[787,945],7936}.
+{[787,949],7952}.
+{[787,951],7968}.
+{[787,953],7984}.
+{[787,959],8000}.
+{[787,961],8164}.
+{[787,965],8016}.
+{[787,969],8032}.
+{[788,837,913],8073}.
+{[788,837,919],8089}.
+{[788,837,937],8105}.
+{[788,837,945],8065}.
+{[788,837,951],8081}.
+{[788,837,969],8097}.
+{[788,913],7945}.
+{[788,917],7961}.
+{[788,919],7977}.
+{[788,921],7993}.
+{[788,927],8009}.
+{[788,929],8172}.
+{[788,933],8025}.
+{[788,937],8041}.
+{[788,945],7937}.
+{[788,949],7953}.
+{[788,951],7969}.
+{[788,953],7985}.
+{[788,959],8001}.
+{[788,961],8165}.
+{[788,965],8017}.
+{[788,969],8033}.
+{[795,79],416}.
+{[795,85],431}.
+{[795,111],417}.
+{[795,117],432}.
+{[803,65],7840}.
+{[803,66],7684}.
+{[803,68],7692}.
+{[803,69],7864}.
+{[803,72],7716}.
+{[803,73],7882}.
+{[803,75],7730}.
+{[803,76],7734}.
+{[803,77],7746}.
+{[803,78],7750}.
+{[803,79],7884}.
+{[803,82],7770}.
+{[803,83],7778}.
+{[803,84],7788}.
+{[803,85],7908}.
+{[803,86],7806}.
+{[803,87],7816}.
+{[803,89],7924}.
+{[803,90],7826}.
+{[803,97],7841}.
+{[803,98],7685}.
+{[803,100],7693}.
+{[803,101],7865}.
+{[803,104],7717}.
+{[803,105],7883}.
+{[803,107],7731}.
+{[803,108],7735}.
+{[803,109],7747}.
+{[803,110],7751}.
+{[803,111],7885}.
+{[803,114],7771}.
+{[803,115],7779}.
+{[803,116],7789}.
+{[803,117],7909}.
+{[803,118],7807}.
+{[803,119],7817}.
+{[803,121],7925}.
+{[803,122],7827}.
+{[803,795,79],7906}.
+{[803,795,85],7920}.
+{[803,795,111],7907}.
+{[803,795,117],7921}.
+{[804,85],7794}.
+{[804,117],7795}.
+{[805,65],7680}.
+{[805,97],7681}.
+{[807,67],199}.
+{[807,68],7696}.
+{[807,71],290}.
+{[807,72],7720}.
+{[807,75],310}.
+{[807,76],315}.
+{[807,78],325}.
+{[807,82],342}.
+{[807,83],350}.
+{[807,84],354}.
+{[807,99],231}.
+{[807,100],7697}.
+{[807,103],291}.
+{[807,104],7721}.
+{[807,107],311}.
+{[807,108],316}.
+{[807,110],326}.
+{[807,114],343}.
+{[807,115],351}.
+{[807,116],355}.
+{[808,65],260}.
+{[808,69],280}.
+{[808,73],302}.
+{[808,79],490}.
+{[808,85],370}.
+{[808,97],261}.
+{[808,101],281}.
+{[808,105],303}.
+{[808,111],491}.
+{[808,117],371}.
+{[813,68],7698}.
+{[813,69],7704}.
+{[813,76],7740}.
+{[813,78],7754}.
+{[813,84],7792}.
+{[813,85],7798}.
+{[813,100],7699}.
+{[813,101],7705}.
+{[813,108],7741}.
+{[813,110],7755}.
+{[813,116],7793}.
+{[813,117],7799}.
+{[814,72],7722}.
+{[814,104],7723}.
+{[816,69],7706}.
+{[816,73],7724}.
+{[816,85],7796}.
+{[816,101],7707}.
+{[816,105],7725}.
+{[816,117],7797}.
+{[817,66],7686}.
+{[817,68],7694}.
+{[817,75],7732}.
+{[817,76],7738}.
+{[817,78],7752}.
+{[817,82],7774}.
+{[817,84],7790}.
+{[817,90],7828}.
+{[817,98],7687}.
+{[817,100],7695}.
+{[817,104],7830}.
+{[817,107],7733}.
+{[817,108],7739}.
+{[817,110],7753}.
+{[817,114],7775}.
+{[817,116],7791}.
+{[817,122],7829}.
+{[834,168],8129}.
+{[834,776,953],8151}.
+{[834,776,965],8167}.
+{[834,787,837,913],8078}.
+{[834,787,837,919],8094}.
+{[834,787,837,937],8110}.
+{[834,787,837,945],8070}.
+{[834,787,837,951],8086}.
+{[834,787,837,969],8102}.
+{[834,787,913],7950}.
+{[834,787,919],7982}.
+{[834,787,921],7998}.
+{[834,787,937],8046}.
+{[834,787,945],7942}.
+{[834,787,951],7974}.
+{[834,787,953],7990}.
+{[834,787,965],8022}.
+{[834,787,969],8038}.
+{[834,788,837,913],8079}.
+{[834,788,837,919],8095}.
+{[834,788,837,937],8111}.
+{[834,788,837,945],8071}.
+{[834,788,837,951],8087}.
+{[834,788,837,969],8103}.
+{[834,788,913],7951}.
+{[834,788,919],7983}.
+{[834,788,921],7999}.
+{[834,788,933],8031}.
+{[834,788,937],8047}.
+{[834,788,945],7943}.
+{[834,788,951],7975}.
+{[834,788,953],7991}.
+{[834,788,965],8023}.
+{[834,788,969],8039}.
+{[834,837,945],8119}.
+{[834,837,951],8135}.
+{[834,837,969],8183}.
+{[834,945],8118}.
+{[834,951],8134}.
+{[834,953],8150}.
+{[834,965],8166}.
+{[834,969],8182}.
+{[834,8127],8143}.
+{[834,8190],8159}.
+{[837,913],8124}.
+{[837,919],8140}.
+{[837,937],8188}.
+{[837,945],8115}.
+{[837,951],8131}.
+{[837,969],8179}.
+{[953],8126}.
+{[1463,1488],64302}.
+{[1463,1522],64287}.
+{[1464,1488],64303}.
+{[1465,1493],64331}.
+{[1468,1488],64304}.
+{[1468,1489],64305}.
+{[1468,1490],64306}.
+{[1468,1491],64307}.
+{[1468,1492],64308}.
+{[1468,1493],64309}.
+{[1468,1494],64310}.
+{[1468,1496],64312}.
+{[1468,1497],64313}.
+{[1468,1498],64314}.
+{[1468,1499],64315}.
+{[1468,1500],64316}.
+{[1468,1502],64318}.
+{[1468,1504],64320}.
+{[1468,1505],64321}.
+{[1468,1507],64323}.
+{[1468,1508],64324}.
+{[1468,1510],64326}.
+{[1468,1511],64327}.
+{[1468,1512],64328}.
+{[1468,1513],64329}.
+{[1468,1514],64330}.
+{[1471,1489],64332}.
+{[1471,1499],64333}.
+{[1471,1508],64334}.
+{[1473,1468,1513],64300}.
+{[1473,1513],64298}.
+{[1474,1468,1513],64301}.
+{[1474,1513],64299}.
+{[2364,2325],2392}.
+{[2364,2326],2393}.
+{[2364,2327],2394}.
+{[2364,2332],2395}.
+{[2364,2337],2396}.
+{[2364,2338],2397}.
+{[2364,2344],2345}.
+{[2364,2347],2398}.
+{[2364,2351],2399}.
+{[2364,2352],2353}.
+{[2364,2355],2356}.
+{[2492,2465],2524}.
+{[2492,2466],2525}.
+{[2492,2476],2480}.
+{[2492,2479],2527}.
+{[2494,2503],2507}.
+{[2519,2503],2508}.
+{[2620,2582],2649}.
+{[2620,2583],2650}.
+{[2620,2588],2651}.
+{[2620,2593],2652}.
+{[2620,2603],2654}.
+{[2876,2849],2908}.
+{[2876,2850],2909}.
+{[2876,2863],2911}.
+{[2878,2887],2891}.
+{[2902,2887],2888}.
+{[2903,2887],2892}.
+{[3006,3014],3018}.
+{[3006,3015],3019}.
+{[3031,2962],2964}.
+{[3031,3014],3020}.
+{[3158,3142],3144}.
+{[3266,3270],3274}.
+{[3285,3263],3264}.
+{[3285,3266,3270],3275}.
+{[3285,3270],3271}.
+{[3286,3270],3272}.
+{[3390,3398],3402}.
+{[3390,3399],3403}.
+{[3415,3398],3404}.
+{[3634,3661],3635}.
+{[3762,3789],3763}.
+{[3953,3954],3955}.
+{[3953,3956],3957}.
+{[3953,3968],3969}.
+{[3953,3968,4018],3959}.
+{[3953,3968,4019],3961}.
+{[3968,4018],3958}.
+{[3968,4019],3960}.
+{[4021,3904],3945}.
+{[4021,3984],4025}.
+{[4023,3906],3907}.
+{[4023,3916],3917}.
+{[4023,3921],3922}.
+{[4023,3926],3927}.
+{[4023,3931],3932}.
+{[4023,3986],3987}.
+{[4023,3996],3997}.
+{[4023,4001],4002}.
+{[4023,4006],4007}.
+{[4023,4011],4012}.
+{[12441,12358],12436}.
+{[12441,12363],12364}.
+{[12441,12365],12366}.
+{[12441,12367],12368}.
+{[12441,12369],12370}.
+{[12441,12371],12372}.
+{[12441,12373],12374}.
+{[12441,12375],12376}.
+{[12441,12377],12378}.
+{[12441,12379],12380}.
+{[12441,12381],12382}.
+{[12441,12383],12384}.
+{[12441,12385],12386}.
+{[12441,12388],12389}.
+{[12441,12390],12391}.
+{[12441,12392],12393}.
+{[12441,12399],12400}.
+{[12441,12402],12403}.
+{[12441,12405],12406}.
+{[12441,12408],12409}.
+{[12441,12411],12412}.
+{[12441,12445],12446}.
+{[12441,12454],12532}.
+{[12441,12459],12460}.
+{[12441,12461],12462}.
+{[12441,12463],12464}.
+{[12441,12465],12466}.
+{[12441,12467],12468}.
+{[12441,12469],12470}.
+{[12441,12471],12472}.
+{[12441,12473],12474}.
+{[12441,12475],12476}.
+{[12441,12477],12478}.
+{[12441,12479],12480}.
+{[12441,12481],12482}.
+{[12441,12484],12485}.
+{[12441,12486],12487}.
+{[12441,12488],12489}.
+{[12441,12495],12496}.
+{[12441,12498],12499}.
+{[12441,12501],12502}.
+{[12441,12504],12505}.
+{[12441,12507],12508}.
+{[12441,12527],12535}.
+{[12441,12528],12536}.
+{[12441,12529],12537}.
+{[12441,12530],12538}.
+{[12441,12541],12542}.
+{[12442,12399],12401}.
+{[12442,12402],12404}.
+{[12442,12405],12407}.
+{[12442,12408],12410}.
+{[12442,12411],12413}.
+{[12442,12495],12497}.
+{[12442,12498],12500}.
+{[12442,12501],12503}.
+{[12442,12504],12506}.
+{[12442,12507],12509}.
diff --git a/erts/emulator/internal_doc/dec.erl b/erts/emulator/internal_doc/dec.erl
new file mode 100644
index 0000000000..0315f2a52d
--- /dev/null
+++ b/erts/emulator/internal_doc/dec.erl
@@ -0,0 +1,237 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2000-2010. 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%
+%%
+
+%% This program is used to generate a header file with data for
+%% normalizing denormalized unicode.
+
+%% The C header is generated from a text file containing tuples in the 
+%% following format:
+%% {RevList,Translation}
+%% Where 'RevList' is a reversed list of the denormalized repressentation of
+%% the character 'Translation'. An example would be the swedish character 
+%% '�', which would be represented in the file as:
+%% {[776,111],246}, as the denormalized representation of codepoint 246
+%% is [111,776] (i.e an 'o' followed by the "double dot accent character 776),
+%% while '�' instead is represented as {[776,97],228}, as the denormalized 
+%% form would be [97,776] (same accent but an 'a' instead).
+%% The datafile is generated from the table on Apple's developer connection
+%% http://developer.apple.com/library/mac/#technotes/tn/tn1150table.html
+%% The generating is done whenever new data is present (i.e. dec.dat has 
+%% to be changed) and not for every build. The product (the C header) is copied
+%% to $ERL_TOP/erts/beam after generation and checked in.
+%% The program and the data file is included for reference.
+
+-module(dec).
+
+-compile(export_all).
+
+-define(HASH_SIZE_FACTOR,2).
+-define(BIG_PREFIX_SIZE,392).
+
+-define(INPUT_FILE_NAME,"dec.dat").
+-define(OUTPUT_FILE_NAME,"erl_unicode_normalize.h").
+
+read(FName) ->
+    {ok,L} = file:consult(FName),
+    [{A,B} || {A,B} <- L,
+	      length(A) > 1% , hd(A) < 769
+		 ].
+
+dec() ->
+    L = read(?INPUT_FILE_NAME),
+    G = group(L),
+    {ok,Out} = file:open(?OUTPUT_FILE_NAME,[write]),
+    io:format
+      (Out,
+       "/*~n"
+       "* %CopyrightBegin%~n"
+       "*~n"
+       "* Copyright Ericsson AB 1999-2010. All Rights Reserved.~n"
+       "*~n"
+       "* The contents of this file are subject to the Erlang Public License,~n"
+       "* Version 1.1, (the \"License\"); you may not use this file except in~n"
+       "* compliance with the License. You should have received a copy of the~n"
+       "* Erlang Public License along with this software. If not, it can be~n"
+       "* retrieved online at http://www.erlang.org/.~n"
+       "*~n"
+       "* Software distributed under the License is distributed on an "
+       "\"AS IS\"~n"
+       "* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See~n"
+       "* the License for the specific language governing rights and "
+       "limitations~n"
+       "* under the License.~n"
+       "*~n"
+       "* %CopyrightEnd%~n"
+       "*/~n"
+       "/*~n"
+       "* This file is automatically generated by ~p.erl, "
+       "do not edit manually~n"
+       "*/~n",
+       [?MODULE]),
+
+    io:format(Out,
+	      "#define HASH_SIZE_FACTOR ~w~n"
+	      "typedef struct _compose_entry {~n"
+	      "    Uint16 c;~n"
+	      "    Uint16 res;~n"
+	      "    Uint16 num_subs;~n"
+	      "    struct _compose_entry *subs;~n"
+	      "    int *hash;~n"
+	      "} CompEntry;~n~n"
+	      "static int compose_tab_size = ~p;~n", 
+	      [?HASH_SIZE_FACTOR,length(G)]),
+    d(Out,G,[],0),
+    PreTab = tuple_to_list(make_prefix_table(G,erlang:make_tuple(102,0))),
+    dump_prefixes(Out,PreTab),
+%% Using this cuts down on the searching in the
+%% actual implementation, but wastes memory with little real gain..
+%%    LL = lists:flatten([PartList || {PartList,_} <- L]),
+%%    BigPreTab = tuple_to_list(
+%%		  make_big_prefixes(LL,
+%%				    erlang:make_tuple(?BIG_PREFIX_SIZE,0))),
+%%    dump_big_prefixes(Out,BigPreTab),
+    file:close(Out),
+    ok.
+    
+   
+
+d(Out,List,D,C) ->
+    d_sub(Out,List,D,C),
+    d_top_hash(Out,List,D,C),
+    d_top(Out,List,D,C).
+d_sub(_Out,[],_D,_C) ->
+    ok;
+d_sub(Out,[{_CP,[],_Res}|T],D,C) ->
+    d_sub(Out,T,D,C+1);
+d_sub(Out,[{_CP,Subs,_Res0}|T],D,C) ->
+    d(Out,Subs,[C|D],0),
+    d_sub(Out,T,D,C+1).
+d_top(Out,L,D,C) ->
+    io:format(Out,"static CompEntry ~s[] = {~n",[format_depth(D)]),
+    d_top_1(Out,L,D,C),
+    io:format(Out,"}; /* ~s */ ~n",[format_depth(D)]).
+    
+d_top_1(_Out,[],_D,_C) ->
+    ok;
+d_top_1(Out,[{CP,[],Res}|T],D,C) ->
+    io:format(Out,
+	          "{~w, ~w, 0, NULL, NULL}",[CP,Res]),
+    if 
+	T =:= [] ->
+	    io:format(Out,"~n",[]);
+	true ->
+	    io:format(Out,",~n",[])
+    end,
+    d_top_1(Out,T,D,C+1);
+d_top_1(Out,[{CP,Subs,_Res}|T],D,C) ->
+    io:format(Out,
+	          "{~w, 0, ~w, ~s, ~s}",[CP,length(Subs),
+					  format_depth([C|D]),
+					 "hash_"++format_depth([C|D])]),
+    if 
+	T =:= [] ->
+	    io:format(Out,"~n",[]);
+	true ->
+	    io:format(Out,",~n",[])
+    end,
+    d_top_1(Out,T,D,C+1).
+
+
+d_top_hash(Out,List,D,_C) ->
+     HSize = length(List)*?HASH_SIZE_FACTOR,
+     io:format(Out,"static int ~s[~p] = ~n",["hash_"++format_depth(D),HSize]),
+     Tup = d_top_hash_1(List,0,erlang:make_tuple(HSize,-1),HSize),
+     io:format(Out,"~p; /* ~s */ ~n",[Tup,"hash_"++format_depth(D)]).
+
+d_top_hash_1([],_,Hash,_HSize) -> 
+    Hash;
+d_top_hash_1([{CP,_,_}|T],Index,Hash,HSize) ->
+    Bucket = hash_search(Hash,HSize,CP rem HSize),
+    d_top_hash_1(T,Index+1,erlang:setelement(Bucket+1,Hash,Index),HSize).
+
+hash_search(Hash,_HSize,Bucket) when element(Bucket+1,Hash) =:= -1 ->
+    Bucket;
+hash_search(Hash,HSize,Bucket) ->
+    hash_search(Hash,HSize,(Bucket + 1) rem HSize). 
+
+format_depth(D) ->
+    lists:reverse(tl(lists:reverse(lists:flatten(["compose_tab_",[ integer_to_list(X) ++ "_" || X <- lists:reverse(D) ]])))).
+
+
+
+
+make_prefix_table([],Table) ->
+    Table;
+make_prefix_table([{C,_,_}|T],Table) when C =< 4023 ->
+    Index = (C div 32) + 1 - 24,
+    Pos = C rem 32,
+    X = element(Index,Table),
+    Y = X bor (1 bsl Pos),
+    NewTab = setelement(Index,Table,Y),
+    make_prefix_table(T,NewTab);
+make_prefix_table([_|T],Tab) ->
+    make_prefix_table(T,Tab).
+
+dump_prefixes(Out,L) ->
+    io:format(Out,"#define COMP_CANDIDATE_MAP_OFFSET 24~n",[]),
+    io:format(Out,"static Uint32 comp_candidate_map[] = {~n",[]),
+    dump_prefixes_1(Out,L).
+dump_prefixes_1(Out,[H]) ->
+    io:format(Out,"    0x~8.16.0BU~n",[H]),
+    io:format(Out,"};~n",[]);
+dump_prefixes_1(Out,[H|T]) ->
+    io:format(Out,"    0x~8.16.0BU,~n",[H]),
+    dump_prefixes_1(Out,T).
+
+%% make_big_prefixes([],Table) ->
+%%     Table;
+%% make_big_prefixes([C|T],Table) ->
+%%     Index = (C div 32) + 1,
+%%     Pos = C rem 32,
+%%     X = element(Index,Table),
+%%     Y = X bor (1 bsl Pos),
+%%     NewTab = setelement(Index,Table,Y),
+%%     make_big_prefixes(T,NewTab).
+
+%% dump_big_prefixes(Out,L) ->
+%%     io:format(Out,"#define BIG_COMP_CANDIDATE_SIZE ~w~n", [?BIG_PREFIX_SIZE]),
+%%     io:format(Out,"static Uint32 big_comp_candidate_map[] = {~n",[]),
+%%     dump_prefixes_1(Out,L).
+   
+pick([],_,Acc) ->
+    {lists:reverse(Acc),[]};
+pick([{[H|TT],N}|T],H,Acc) ->
+    pick(T,H,[{TT,N}|Acc]);
+pick([{[H|_],_}|_]=L,M,Acc) when H =/= M ->
+    {lists:reverse(Acc),L}.
+    
+
+group([]) ->
+    [];
+group([{[H],N}|T]) ->
+    {Part,Rest} = pick(T,H,[]),
+    [{H,group(Part),N}| group(Rest)];
+group([{[H|_],_}|_]=L) ->
+    {Part,Rest} = pick(L,H,[]),
+    [{H,group(Part),0}| group(Rest)].
+    
+    
+
+
+    
diff --git a/erts/emulator/obsolete/driver.h b/erts/emulator/obsolete/driver.h
deleted file mode 100644
index 708fe68e1a..0000000000
--- a/erts/emulator/obsolete/driver.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1996-2009. 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%
- */
-/*
- * OLD, OBSOLETE include file for erlang driver writers.
- * New drivers should use erl_driver.h instead.
- */
-
-#ifndef __DRIVER_H__
-#define __DRIVER_H__
-
-#include <stdlib.h>
-#include "driver_int.h"
-
-#undef _ANSI_ARGS_
-#undef CONST
-
-#if ((defined(__STDC__) || defined(SABER)) && !defined(NO_PROTOTYPE)) || defined(__cplusplus) || defined(USE_PROTOTYPE)
-#   define _USING_PROTOTYPES_ 1
-#   define _ANSI_ARGS_(x)	x
-#   define CONST const
-#else
-#   define _ANSI_ARGS_(x)	()
-#   define CONST
-#endif
-
-#ifdef __cplusplus
-#   define EXTERN extern "C"
-#else
-#   define EXTERN extern
-#endif
-
-/* Values for mode arg to driver_select() */
-
-#define DO_READ	 (1 << 0)
-#define DO_WRITE (1 << 1)
-
-/* Flags for set_port_control_flags() */
-#define PORT_CONTROL_FLAG_BINARY	1
-#define PORT_CONTROL_FLAG_HEAVY		2
-
-/* This macro is used to name a dynamic driver's init function in */
-/* a way that doesn't lead to conflicts. This is crucial when using */
-/* operating systems that has one namespace for all symbols */
-/* (e.g. VxWorks). Example: if you have an dynamic driver C source */
-/* file named echo_drv.c, you use the macro like this: */
-/* int DRIVER_INIT(echo_drv)(void *handle) */
-#if defined(VXWORKS)
-#  define DRIVER_INIT(DRIVER_NAME) DRIVER_NAME  ## _init
-#elif defined(__WIN32__)
-#  define DRIVER_INIT(DRIVER_NAME) __declspec(dllexport) driver_init
-#else 
-#  define DRIVER_INIT(DRIVER_NAME)  driver_init
-#endif
-
-typedef int (*F_PTR)();    /* a function pointer */
-typedef long (*L_PTR)();   /* pointer to a function returning long */
-
-extern int null_func();
-
-/* This structure MUST match Binary in global.h exactly!!! */
-typedef struct driver_binary {
-    int orig_size;        /* total length of binary */
-    char orig_bytes[1];   /* the data (char instead of byte!) */
-} DriverBinary;
-
-typedef struct {
-    int vsize;     /* length of vectors */
-    int size;      /* total size in bytes */
-    SysIOVec* iov;
-    DriverBinary**  binv;
-} ErlIOVec;
-
-/*
- * OLD, OBSOLETE driver entry structure.
- */
-
-typedef struct driver_entry {
-    F_PTR init;          /* called at system start up (no args) */
-    L_PTR start;         /* called when some one does an open_port
-			 args: port, command (nul-terminated),
-			 additional/alternate args for fd/vanilla/spawn driver.
-			 return value -1 means failure, other
-			 is saved and passed to the other funcs */
-    F_PTR stop;          /* called when port is closed, and when the
-			    emulator is halted - arg: start_return */
-    F_PTR output;	 /* called when we have output from erlang to the port
-		         args: start_return, buf, buflen */
-    F_PTR ready_input;   /* called when we have input from one of the driver's
-			 file descriptors - args: start_return, fd */
-    F_PTR ready_output;  /* called when output is possible to one of the driver's
-			 file descriptors - args: start_return, fd */
-    char *driver_name;   /* name supplied as {driver,Name,Args} to open_port */
-
-    F_PTR finish;        /* called before unloading (DYNAMIC DRIVERS ONLY) */
-    void *handle;        /* file handle             (DYNAMIC DRIVERS ONLY) */
-    F_PTR control;	 /* "ioctl" for drivers (invoked by port_command/3) */
-    F_PTR timeout;       /* Reserved */
-    F_PTR outputv;       /* Reserved */
-    F_PTR ready_async;   /* Completion routine for driver_async */
-    F_PTR padding1[3];   /* pad to match size of modern driver struct */
-    int padding2[4];     /* more pad */
-    F_PTR padding3[3];   /* even more padding */
-} DriverEntry;
-
-
-/* These are the kernel functions available for driver writers */
-
-EXTERN int driver_select _ANSI_ARGS_((int,int,int,int));
-
-EXTERN int driver_output _ANSI_ARGS_((int, char*, int));
-EXTERN int driver_output2 _ANSI_ARGS_((int, char*, int, char*, int));
-EXTERN int driver_output_binary _ANSI_ARGS_((int, char*, int,
-					     DriverBinary*, int, int));
-EXTERN int driver_outputv _ANSI_ARGS_((int, char*,int,ErlIOVec*,int));
-
-EXTERN int driver_vec_to_buf _ANSI_ARGS_((ErlIOVec*, char*, int));
-
-EXTERN int driver_set_timer _ANSI_ARGS_((int, unsigned long));
-EXTERN int driver_cancel_timer _ANSI_ARGS_((int));
-
-/*
- * The following functions are used to initiate a close of a port
- * from a driver.
- */
-EXTERN int driver_failure_eof _ANSI_ARGS_((int));
-EXTERN int driver_failure_atom _ANSI_ARGS_((int, char *));
-EXTERN int driver_failure_posix _ANSI_ARGS_((int, int));
-EXTERN int driver_failure _ANSI_ARGS_((int, int));
-EXTERN int driver_exit _ANSI_ARGS_ ((int, int));
-
-EXTERN char* erl_errno_id _ANSI_ARGS_((int error));
-EXTERN void set_busy_port _ANSI_ARGS_((int, int));
-EXTERN void add_driver_entry _ANSI_ARGS_((DriverEntry *));
-EXTERN int remove_driver_entry _ANSI_ARGS_((DriverEntry *));
-EXTERN void set_port_control_flags _ANSI_ARGS_((int, int));
-
-/* Binary interface */
-/* NOTE: DO NOT overwrite a binary with new data (if the data is delivered);
-** since the binary is a shared object it MUST be written once.
-*/
-
-EXTERN DriverBinary* driver_alloc_binary _ANSI_ARGS_((int));
-EXTERN DriverBinary* driver_realloc_binary _ANSI_ARGS_((DriverBinary*, int));
-EXTERN void driver_free_binary _ANSI_ARGS_((DriverBinary*));
-
-
-/* Queue interface */
-EXTERN int driver_enqv _ANSI_ARGS_((int, ErlIOVec*, int));
-EXTERN int driver_pushqv _ANSI_ARGS_((int, ErlIOVec*, int));
-EXTERN int driver_deq _ANSI_ARGS_((int, int));
-EXTERN SysIOVec* driver_peekq _ANSI_ARGS_((int, int*));
-EXTERN int driver_sizeq _ANSI_ARGS_((int));
-EXTERN int driver_enq_bin _ANSI_ARGS_((int, DriverBinary*, int, int));
-EXTERN int driver_enq _ANSI_ARGS_((int, char*, int));
-EXTERN int driver_pushq_bin _ANSI_ARGS_((int, DriverBinary*, int, int));
-EXTERN int driver_pushq _ANSI_ARGS_((int, char*, int));
-
-/* Memory management */
-EXTERN void *driver_alloc _ANSI_ARGS_((size_t));
-EXTERN void *driver_realloc _ANSI_ARGS_((void*, size_t));
-EXTERN void driver_free _ANSI_ARGS_((void*));
-
-/* Shared / dynamic link libraries */
-EXTERN void *driver_dl_open _ANSI_ARGS_((char *));
-EXTERN void *driver_dl_sym _ANSI_ARGS_((void *, char *));
-EXTERN int driver_dl_close _ANSI_ARGS_((void *));
-EXTERN char *driver_dl_error _ANSI_ARGS_((void));
-
-/* Async IO functions */
-EXTERN long driver_async _ANSI_ARGS_((int,
-				      unsigned int*,
-				      void (*)(void*), 
-				      void *,
-				      void (*)(void*)));
-EXTERN int driver_async_cancel _ANSI_ARGS_((long));
-
-EXTERN int driver_lock_driver _ANSI_ARGS_((int));
-
-/* Threads */
-typedef void* erl_mutex_t;
-typedef void* erl_cond_t;
-typedef void* erl_thread_t;
-
-EXTERN erl_mutex_t erts_mutex_create _ANSI_ARGS_((void));
-EXTERN int erts_mutex_destroy _ANSI_ARGS_((erl_mutex_t));
-EXTERN int erts_mutex_lock _ANSI_ARGS_((erl_mutex_t));
-EXTERN int erts_mutex_unlock _ANSI_ARGS_((erl_mutex_t));
-
-EXTERN erl_cond_t erts_cond_create _ANSI_ARGS_((void));
-EXTERN int erts_cond_destroy _ANSI_ARGS_((erl_cond_t));
-EXTERN int erts_cond_signal _ANSI_ARGS_((erl_cond_t));
-EXTERN int erts_cond_broadcast _ANSI_ARGS_((erl_cond_t));
-EXTERN int erts_cond_wait _ANSI_ARGS_((erl_cond_t, erl_mutex_t));
-EXTERN int erts_cond_timedwait _ANSI_ARGS_((erl_cond_t, erl_mutex_t, long));
-
-EXTERN int erts_thread_create _ANSI_ARGS_((erl_thread_t*,
-					 void* (*func)(void*),
-					 void* arg,
-					 int detached));
-EXTERN erl_thread_t erts_thread_self _ANSI_ARGS_((void));
-EXTERN void erts_thread_exit _ANSI_ARGS_((void*));
-EXTERN int  erts_thread_join _ANSI_ARGS_((erl_thread_t, void**));
-EXTERN int  erts_thread_kill _ANSI_ARGS_((erl_thread_t));
-
-
-typedef unsigned long DriverTermData;
-
-#define TERM_DATA(x) ((DriverTermData) (x))
-
-/* Possible types to send from driver          Argument type */
-#define ERL_DRV_NIL         ((DriverTermData) 1)  /* None */
-#define ERL_DRV_ATOM        ((DriverTermData) 2)  /* driver_mk_atom(string) */
-#define ERL_DRV_INT         ((DriverTermData) 3)  /* int */
-#define ERL_DRV_PORT        ((DriverTermData) 4)  /* driver_mk_port(ix) */
-#define ERL_DRV_BINARY      ((DriverTermData) 5)  /* ErlDriverBinary*, int */
-#define ERL_DRV_STRING      ((DriverTermData) 6)  /* char*, int */
-#define ERL_DRV_TUPLE       ((DriverTermData) 7)  /* int */
-#define ERL_DRV_LIST        ((DriverTermData) 8)  /* int */
-#define ERL_DRV_STRING_CONS ((DriverTermData) 9)  /* char*, int */
-#define ERL_DRV_PID         ((DriverTermData) 10) /* driver_connected,... */
-
-/* DriverTermData is the type to use for casts when building 
- * terms that should be sent to connected process,
- * for instance a tuple on the form {tcp, Port, [Tag|Binary]}
- *
- * DriverTermData spec[] = {
- *    ERL_DRV_ATOM, driver_mk_atom("tcp"),
- *    ERL_DRV_PORT, driver_mk_port(drv->ix),
- *             ERL_DRV_INT, REPLY_TAG,
- *             ERL_DRV_BIN, 50, TERM_DATA(buffer),
- *             ERL_DRV_LIST, 2,
- *    ERL_DRV_TUPLE, 3,
- *  }       
- *             
- */
-
-EXTERN DriverTermData driver_mk_atom _ANSI_ARGS_ ((char*));
-EXTERN DriverTermData driver_mk_port _ANSI_ARGS_ ((int));
-EXTERN DriverTermData driver_connected _ANSI_ARGS_((int));
-EXTERN DriverTermData driver_caller _ANSI_ARGS_((int));
-
-EXTERN int driver_output_term _ANSI_ARGS_((int, DriverTermData *, int));
-EXTERN int driver_send_term _ANSI_ARGS_((int, DriverTermData, DriverTermData *, int));
-
-#endif
-
-
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c
index 1c4c37b01a..8421eb415c 100644
--- a/erts/emulator/sys/common/erl_mseg.c
+++ b/erts/emulator/sys/common/erl_mseg.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2002-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2011. 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
@@ -35,6 +35,7 @@
 #include "global.h"
 #include "erl_threads.h"
 #include "erl_mtrace.h"
+#include "erl_time.h"
 #include "big.h"
 
 #if HAVE_ERTS_MSEG
@@ -76,8 +77,10 @@ static int atoms_initialized;
 
 static Uint cache_check_interval;
 
+typedef struct mem_kind_t MemKind;
+
 static void check_cache(void *unused);
-static void mseg_clear_cache(void);
+static void mseg_clear_cache(MemKind*);
 static int is_cache_check_scheduled;
 #ifdef ERTS_THREADS_NO_SMP
 static int is_cache_check_requested;
@@ -159,14 +162,43 @@ static struct {
     CallCounter check_cache;
 } calls;
 
-static cache_desc_t cache_descs[MAX_CACHE_SIZE];
-static cache_desc_t *free_cache_descs;
-static cache_desc_t *cache;
-static cache_desc_t *cache_end;
-static Uint cache_hits;
-static Uint cache_size;
-static Uint min_cached_seg_size;
-static Uint max_cached_seg_size;
+struct mem_kind_t {
+    cache_desc_t cache_descs[MAX_CACHE_SIZE];
+    cache_desc_t *free_cache_descs;
+    cache_desc_t *cache;
+    cache_desc_t *cache_end;
+
+    Uint cache_size;
+    Uint min_cached_seg_size;
+    Uint max_cached_seg_size;
+    Uint cache_hits;
+
+    struct {
+	struct {
+	    Uint watermark;
+	    Uint no;
+	    Uint sz;
+	} current;
+	struct {
+	    Uint no;
+	    Uint sz;
+	} max;
+	struct {
+	    Uint no;
+	    Uint sz;
+	} max_ever;
+    } segments;
+
+    const char* name;
+    MemKind* next;
+};/*MemKind*/
+
+#if HALFWORD_HEAP
+static MemKind low_mem, hi_mem;
+#else
+static MemKind the_mem;
+#endif
+static MemKind* mk_list = NULL;
 
 static Uint max_cache_size;
 static Uint abs_max_cache_bad_fit;
@@ -176,47 +208,32 @@ static Uint rel_max_cache_bad_fit;
 static Uint min_seg_size;
 #endif
 
-struct {
-    struct {
-	Uint watermark;
-	Uint no;
-	Uint sz;
-    } current;
-    struct {
-	Uint no;
-	Uint sz;
-    } max;
-    struct {
-	Uint no;
-	Uint sz;
-    } max_ever;
-} segments;
 
-#define ERTS_MSEG_ALLOC_STAT(SZ)					\
+#define ERTS_MSEG_ALLOC_STAT(C,SZ)					\
 do {									\
-    segments.current.no++;						\
-    if (segments.max.no < segments.current.no)				\
-	segments.max.no = segments.current.no;				\
-    if (segments.current.watermark < segments.current.no)		\
-	segments.current.watermark = segments.current.no;		\
-    segments.current.sz += (SZ);					\
-    if (segments.max.sz < segments.current.sz)				\
-	segments.max.sz = segments.current.sz;				\
+    C->segments.current.no++;						\
+    if (C->segments.max.no < C->segments.current.no)			\
+	C->segments.max.no = C->segments.current.no;			\
+    if (C->segments.current.watermark < C->segments.current.no)		\
+	C->segments.current.watermark = C->segments.current.no;		\
+    C->segments.current.sz += (SZ);					\
+    if (C->segments.max.sz < C->segments.current.sz)			\
+	C->segments.max.sz = C->segments.current.sz;			\
 } while (0)
 
-#define ERTS_MSEG_DEALLOC_STAT(SZ)					\
+#define ERTS_MSEG_DEALLOC_STAT(C,SZ)					\
 do {									\
-    ASSERT(segments.current.no > 0);					\
-    segments.current.no--;						\
-    ASSERT(segments.current.sz >= (SZ));				\
-    segments.current.sz -= (SZ);					\
+    ASSERT(C->segments.current.no > 0);					\
+    C->segments.current.no--;						\
+    ASSERT(C->segments.current.sz >= (SZ));				\
+    C->segments.current.sz -= (SZ);					\
 } while (0) 
 
-#define ERTS_MSEG_REALLOC_STAT(OSZ, NSZ)				\
+#define ERTS_MSEG_REALLOC_STAT(C,OSZ, NSZ)				\
 do {									\
-    ASSERT(segments.current.sz >= (OSZ));				\
-    segments.current.sz -= (OSZ);					\
-    segments.current.sz += (NSZ);					\
+    ASSERT(C->segments.current.sz >= (OSZ));				\
+    C->segments.current.sz -= (OSZ);					\
+    C->segments.current.sz += (NSZ);					\
 } while (0)
 
 #define ONE_GIGA (1000000000)
@@ -271,7 +288,7 @@ schedule_cache_check(void)
 #endif
 	{
 	    cache_check_timer.active = 0;
-	    erl_set_timer(&cache_check_timer,
+	    erts_set_timer(&cache_check_timer,
 			  check_cache,
 			  NULL,
 			  NULL,
@@ -302,13 +319,16 @@ check_schedule_cache_check(void)
 static void
 mseg_shutdown(void)
 {
+    MemKind* mk;
     erts_mtx_lock(&mseg_mutex);
-    mseg_clear_cache();
+    for (mk=mk_list; mk; mk=mk->next) {
+	mseg_clear_cache(mk);
+    }
     erts_mtx_unlock(&mseg_mutex);
 }
 
 static ERTS_INLINE void *
-mseg_create(Uint size)
+mseg_create(MemKind* mk, Uint size)
 {
     void *seg;
 
@@ -318,19 +338,21 @@ mseg_create(Uint size)
     seg = erts_sys_alloc(ERTS_ALC_N_INVALID, NULL, size);
 #elif HAVE_MMAP
 #if HALFWORD_HEAP
-    seg = pmmap(size);
-#else
-    seg = (void *) mmap((void *) 0, (size_t) size,
-			MMAP_PROT, MMAP_FLAGS, MMAP_FD, 0);
-    if (seg == (void *) MAP_FAILED)
-	seg = NULL;
-#endif
-#if HALFWORD_HEAP
-    if ((unsigned long) seg & CHECK_POINTER_MASK) {
-	erts_fprintf(stderr,"Pointer mask failure (0x%08lx)\n",(unsigned long) seg);
-	return NULL;
+    if (mk == &low_mem) {
+	seg = pmmap(size);
+	if ((unsigned long) seg & CHECK_POINTER_MASK) {
+	    erts_fprintf(stderr,"Pointer mask failure (0x%08lx)\n",(unsigned long) seg);
+	    return NULL;
+	}
     }
+    else
 #endif
+    {
+	seg = (void *) mmap((void *) 0, (size_t) size,
+			    MMAP_PROT, MMAP_FLAGS, MMAP_FD, 0);
+	if (seg == (void *) MAP_FAILED)
+	    seg = NULL;
+    }
 #else
 #error "Missing mseg_create() implementation"
 #endif
@@ -341,20 +363,23 @@ mseg_create(Uint size)
 }
 
 static ERTS_INLINE void
-mseg_destroy(void *seg, Uint size)
+mseg_destroy(MemKind* mk, void *seg, Uint size)
 {
 #if defined(ERTS_MSEG_FAKE_SEGMENTS)
     erts_sys_free(ERTS_ALC_N_INVALID, NULL, seg);
 #elif HAVE_MMAP
+    int res;
 
-#ifdef DEBUG
-    int res =
-#endif
 #if HALFWORD_HEAP
-	pmunmap((void *) seg, size);
-#else
-	munmap((void *) seg, size);
+    if (mk == &low_mem) {
+	res = pmunmap((void *) seg, size);
+    }
+    else
 #endif
+    {
+	res = munmap((void *) seg, size);
+    }
+
     ASSERT(size % page_size == 0);
     ASSERT(res == 0);
 #else
@@ -368,7 +393,7 @@ mseg_destroy(void *seg, Uint size)
 #if HAVE_MSEG_RECREATE
 
 static ERTS_INLINE void *
-mseg_recreate(void *old_seg, Uint old_size, Uint new_size)
+mseg_recreate(MemKind* mk, void *old_seg, Uint old_size, Uint new_size)
 {
     void *new_seg;
 
@@ -379,17 +404,29 @@ mseg_recreate(void *old_seg, Uint old_size, Uint new_size)
     new_seg = erts_sys_realloc(ERTS_ALC_N_INVALID, NULL, old_seg, new_size);
 #elif HAVE_MREMAP
 #if HALFWORD_HEAP
-     new_seg = (void *) pmremap((void *) old_seg,
-				(size_t) old_size,
-				(size_t) new_size);
-#else
-    new_seg = (void *) mremap((void *) old_seg,
-			      (size_t) old_size,
-			      (size_t) new_size,
-			      MREMAP_MAYMOVE);
-    if (new_seg == (void *) MAP_FAILED)
-	new_seg = NULL;
+    if (mk == &low_mem) {
+	new_seg = (void *) pmremap((void *) old_seg,
+				   (size_t) old_size,
+				   (size_t) new_size);
+    }
+    else
 #endif
+    {
+    #if defined(__NetBSD__)
+	new_seg = (void *) mremap((void *) old_seg,
+				  (size_t) old_size,
+				  NULL,
+				  (size_t) new_size,
+				  0);
+    #else
+	new_seg = (void *) mremap((void *) old_seg,
+				  (size_t) old_size,
+				  (size_t) new_size,
+				  MREMAP_MAYMOVE);
+    #endif
+	if (new_seg == (void *) MAP_FAILED)
+	    new_seg = NULL;
+    }
 #else
 #error "Missing mseg_recreate() implementation"
 #endif
@@ -403,134 +440,142 @@ mseg_recreate(void *old_seg, Uint old_size, Uint new_size)
 
 
 static ERTS_INLINE cache_desc_t * 
-alloc_cd(void)
+alloc_cd(MemKind* mk)
 {    
-    cache_desc_t *cd = free_cache_descs;
+    cache_desc_t *cd = mk->free_cache_descs;
     ERTS_LC_ASSERT(erts_lc_mtx_is_locked(&mseg_mutex));
     if (cd)
-	free_cache_descs = cd->next;
+	mk->free_cache_descs = cd->next;
     return cd;
 }
 
 static ERTS_INLINE void
-free_cd(cache_desc_t *cd)
+free_cd(MemKind* mk, cache_desc_t *cd)
 {
     ERTS_LC_ASSERT(erts_lc_mtx_is_locked(&mseg_mutex));
-    cd->next = free_cache_descs;
-    free_cache_descs = cd;
+    cd->next = mk->free_cache_descs;
+    mk->free_cache_descs = cd;
 }
 
 
 static ERTS_INLINE void
-link_cd(cache_desc_t *cd)
+link_cd(MemKind* mk, cache_desc_t *cd)
 {
     ERTS_LC_ASSERT(erts_lc_mtx_is_locked(&mseg_mutex));
-    if (cache)
-	cache->prev = cd;
-    cd->next = cache;
+    if (mk->cache)
+	mk->cache->prev = cd;
+    cd->next = mk->cache;
     cd->prev = NULL;
-    cache = cd;
+    mk->cache = cd;
 
-    if (!cache_end) {
+    if (!mk->cache_end) {
 	ASSERT(!cd->next);
-	cache_end = cd;
+	mk->cache_end = cd;
     }
 
-    cache_size++;
+    mk->cache_size++;
 }
 
+#if CAN_PARTLY_DESTROY
 static ERTS_INLINE void
-end_link_cd(cache_desc_t *cd)
+end_link_cd(MemKind* mk, cache_desc_t *cd)
 {
     ERTS_LC_ASSERT(erts_lc_mtx_is_locked(&mseg_mutex));
-    if (cache_end)
-	cache_end->next = cd;
+    if (mk->cache_end)
+	mk->cache_end->next = cd;
     cd->next = NULL;
-    cd->prev = cache_end;
-    cache_end = cd;
+    cd->prev = mk->cache_end;
+    mk->cache_end = cd;
 
-    if (!cache) {
+    if (!mk->cache) {
 	ASSERT(!cd->prev);
-	cache = cd;
+	mk->cache = cd;
     }
 
-    cache_size++;
+    mk->cache_size++;
 }
+#endif
 
 static ERTS_INLINE void
-unlink_cd(cache_desc_t *cd)
+unlink_cd(MemKind* mk, cache_desc_t *cd)
 {
     ERTS_LC_ASSERT(erts_lc_mtx_is_locked(&mseg_mutex));
     if (cd->next)
 	cd->next->prev = cd->prev;
     else
-	cache_end = cd->prev;
+	mk->cache_end = cd->prev;
     
     if (cd->prev)
 	cd->prev->next = cd->next;
     else
-	cache = cd->next;
-    ASSERT(cache_size > 0);
-    cache_size--;
+	mk->cache = cd->next;
+    ASSERT(mk->cache_size > 0);
+    mk->cache_size--;
 }
 
 static ERTS_INLINE void
-check_cache_limits(void)
+check_cache_limits(MemKind* mk)
 {
     cache_desc_t *cd;
     ERTS_LC_ASSERT(erts_lc_mtx_is_locked(&mseg_mutex));
-    max_cached_seg_size = 0;
-    min_cached_seg_size = ~((Uint) 0);
-    for (cd = cache; cd; cd = cd->next) {
-	if (cd->size < min_cached_seg_size)
-	    min_cached_seg_size = cd->size;
-	if (cd->size > max_cached_seg_size)
-	    max_cached_seg_size = cd->size;
+    mk->max_cached_seg_size = 0;
+    mk->min_cached_seg_size = ~((Uint) 0);
+    for (cd = mk->cache; cd; cd = cd->next) {
+	if (cd->size < mk->min_cached_seg_size)
+	    mk->min_cached_seg_size = cd->size;
+	if (cd->size > mk->max_cached_seg_size)
+	    mk->max_cached_seg_size = cd->size;
     }
-
 }
 
 static ERTS_INLINE void
-adjust_cache_size(int force_check_limits)
+adjust_cache_size(MemKind* mk, int force_check_limits)
 {
     cache_desc_t *cd;
     int check_limits = force_check_limits;
-    Sint max_cached = ((Sint) segments.current.watermark
-		       - (Sint) segments.current.no);
+    Sint max_cached = ((Sint) mk->segments.current.watermark
+		       - (Sint) mk->segments.current.no);
     ERTS_LC_ASSERT(erts_lc_mtx_is_locked(&mseg_mutex));
-    while (((Sint) cache_size) > max_cached && ((Sint) cache_size) > 0) {
-	ASSERT(cache_end);
-	cd = cache_end;
+    while (((Sint) mk->cache_size) > max_cached && ((Sint) mk->cache_size) > 0) {
+	ASSERT(mk->cache_end);
+	cd = mk->cache_end;
 	if (!check_limits &&
-	    !(min_cached_seg_size < cd->size
-	      && cd->size < max_cached_seg_size)) {
+	    !(mk->min_cached_seg_size < cd->size
+	      && cd->size < mk->max_cached_seg_size)) {
 	    check_limits = 1;
 	}
 	if (erts_mtrace_enabled)
 	    erts_mtrace_crr_free(SEGTYPE, SEGTYPE, cd->seg);
-	mseg_destroy(cd->seg, cd->size);
-	unlink_cd(cd);
-	free_cd(cd);
+	mseg_destroy(mk, cd->seg, cd->size);
+	unlink_cd(mk,cd);
+	free_cd(mk,cd);
     }
 
     if (check_limits)
-	check_cache_limits();
-
+	check_cache_limits(mk);
 }
 
 static void
-check_cache(void *unused)
+check_one_cache(MemKind* mk)
 {
+    if (mk->segments.current.watermark > mk->segments.current.no)
+	mk->segments.current.watermark--;
+    adjust_cache_size(mk, 0);
+
+    if (mk->cache_size)
+	schedule_cache_check();
+}
+
+static void check_cache(void* unused)
+{
+    MemKind* mk;
     erts_mtx_lock(&mseg_mutex);
 
     is_cache_check_scheduled = 0;
 
-    if (segments.current.watermark > segments.current.no)
-	segments.current.watermark--;
-    adjust_cache_size(0);
-
-    if (cache_size)
-	schedule_cache_check();
+    for (mk=mk_list; mk; mk=mk->next) {
+	check_one_cache(mk);
+    }
 
     INC_CC(check_cache);
 
@@ -538,28 +583,45 @@ check_cache(void *unused)
 }
 
 static void
-mseg_clear_cache(void)
+mseg_clear_cache(MemKind* mk)
 {
-    segments.current.watermark = 0;
+    mk->segments.current.watermark = 0;
 
-    adjust_cache_size(1);
+    adjust_cache_size(mk, 1);
 
-    ASSERT(!cache);
-    ASSERT(!cache_end);
-    ASSERT(!cache_size);
+    ASSERT(!mk->cache);
+    ASSERT(!mk->cache_end);
+    ASSERT(!mk->cache_size);
 
-    segments.current.watermark = segments.current.no;
+    mk->segments.current.watermark = mk->segments.current.no;
 
     INC_CC(clear_cache);
 }
 
+static ERTS_INLINE MemKind* type2mk(ErtsAlcType_t atype)
+{
+#if HALFWORD_HEAP
+    switch (atype) {
+    case ERTS_ALC_A_ETS:
+    case ERTS_ALC_A_BINARY:
+    case ERTS_ALC_A_FIXED_SIZE:
+    case ERTS_ALC_A_DRIVER:
+	return &hi_mem;
+    default:
+	return &low_mem;
+    }
+#else
+    return &the_mem;
+#endif
+}
+
 static void *
 mseg_alloc(ErtsAlcType_t atype, Uint *size_p, const ErtsMsegOpt_t *opt)
 {
-
     Uint max, min, diff_size, size;
     cache_desc_t *cd, *cand_cd;
     void *seg;
+    MemKind* mk = type2mk(atype);
 
     INC_CC(alloc);
 
@@ -572,11 +634,11 @@ mseg_alloc(ErtsAlcType_t atype, Uint *size_p, const ErtsMsegOpt_t *opt)
 
     if (!opt->cache) {
     create_seg:
-	adjust_cache_size(0);
-	seg = mseg_create(size);
+	adjust_cache_size(mk,0);
+	seg = mseg_create(mk, size);
 	if (!seg) {
-	    mseg_clear_cache();
-	    seg = mseg_create(size);
+	    mseg_clear_cache(mk);
+	    seg = mseg_create(mk, size);
 	    if (!seg)
 		size = 0;
 	}
@@ -585,17 +647,17 @@ mseg_alloc(ErtsAlcType_t atype, Uint *size_p, const ErtsMsegOpt_t *opt)
 	if (seg) {
 	    if (erts_mtrace_enabled)
 		erts_mtrace_crr_alloc(seg, atype, ERTS_MTRACE_SEGMENT_ID, size);
-	    ERTS_MSEG_ALLOC_STAT(size);
+	    ERTS_MSEG_ALLOC_STAT(mk,size);
 	}
 	return seg;
     }
 
-    if (size > max_cached_seg_size)
+    if (size > mk->max_cached_seg_size)
 	goto create_seg;
 
-    if (size < min_cached_seg_size) {
+    if (size < mk->min_cached_seg_size) {
 
-	diff_size = min_cached_seg_size - size;
+	diff_size = mk->min_cached_seg_size - size;
 
 	if (diff_size > abs_max_cache_bad_fit)
 	    goto create_seg;
@@ -609,7 +671,7 @@ mseg_alloc(ErtsAlcType_t atype, Uint *size_p, const ErtsMsegOpt_t *opt)
     min = ~((Uint) 0);
     cand_cd = NULL;
 
-    for (cd = cache; cd; cd = cd->next) {
+    for (cd = mk->cache; cd; cd = cd->next) {
 	if (cd->size >= size) {
 	    if (!cand_cd) {
 		cand_cd = cd;
@@ -630,8 +692,8 @@ mseg_alloc(ErtsAlcType_t atype, Uint *size_p, const ErtsMsegOpt_t *opt)
 	    min = cd->size;
     }
 
-    min_cached_seg_size = min;
-    max_cached_seg_size = max;
+    mk->min_cached_seg_size = min;
+    mk->max_cached_seg_size = max;
 
     if (!cand_cd)
 	goto create_seg;
@@ -640,20 +702,20 @@ mseg_alloc(ErtsAlcType_t atype, Uint *size_p, const ErtsMsegOpt_t *opt)
 
     if (diff_size > abs_max_cache_bad_fit
 	|| 100*PAGES(diff_size) > rel_max_cache_bad_fit*PAGES(size)) {
-	if (max_cached_seg_size < cand_cd->size)	
-	    max_cached_seg_size = cand_cd->size;
-	if (min_cached_seg_size > cand_cd->size)
-	    min_cached_seg_size = cand_cd->size;
+	if (mk->max_cached_seg_size < cand_cd->size)
+	    mk->max_cached_seg_size = cand_cd->size;
+	if (mk->min_cached_seg_size > cand_cd->size)
+	    mk->min_cached_seg_size = cand_cd->size;
 	goto create_seg;
     }
 
-    cache_hits++;
+    mk->cache_hits++;
 
     size = cand_cd->size;
     seg = cand_cd->seg;
 
-    unlink_cd(cand_cd);
-    free_cd(cand_cd);
+    unlink_cd(mk,cand_cd);
+    free_cd(mk,cand_cd);
 
     *size_p = size;
 
@@ -663,7 +725,7 @@ mseg_alloc(ErtsAlcType_t atype, Uint *size_p, const ErtsMsegOpt_t *opt)
     }
 
     if (seg)
-	ERTS_MSEG_ALLOC_STAT(size);
+	ERTS_MSEG_ALLOC_STAT(mk,size);
     return seg;
 }
 
@@ -672,41 +734,42 @@ static void
 mseg_dealloc(ErtsAlcType_t atype, void *seg, Uint size,
 	     const ErtsMsegOpt_t *opt)
 {
+    MemKind* mk = type2mk(atype);
     cache_desc_t *cd;
 
-    ERTS_MSEG_DEALLOC_STAT(size);
+    ERTS_MSEG_DEALLOC_STAT(mk,size);
 
     if (!opt->cache || max_cache_size == 0) {
 	if (erts_mtrace_enabled)
 	    erts_mtrace_crr_free(atype, SEGTYPE, seg);
-	mseg_destroy(seg, size);
+	mseg_destroy(mk, seg, size);
     }
     else {
 	int check_limits = 0;
 	
-	if (size < min_cached_seg_size)
-	    min_cached_seg_size = size;
-	if (size > max_cached_seg_size)
-	    max_cached_seg_size = size;
-
-	if (!free_cache_descs) {
-	    cd = cache_end;
-	    if (!(min_cached_seg_size < cd->size
-		  && cd->size < max_cached_seg_size)) {
+	if (size < mk->min_cached_seg_size)
+	    mk->min_cached_seg_size = size;
+	if (size > mk->max_cached_seg_size)
+	    mk->max_cached_seg_size = size;
+
+	if (!mk->free_cache_descs) {
+	    cd = mk->cache_end;
+	    if (!(mk->min_cached_seg_size < cd->size
+		  && cd->size < mk->max_cached_seg_size)) {
 		check_limits = 1;
 	    }
 	    if (erts_mtrace_enabled)
 		erts_mtrace_crr_free(SEGTYPE, SEGTYPE, cd->seg);
-	    mseg_destroy(cd->seg, cd->size);
-	    unlink_cd(cd);
-	    free_cd(cd);
+	    mseg_destroy(mk, cd->seg, cd->size);
+	    unlink_cd(mk,cd);
+	    free_cd(mk,cd);
 	}
 
-	cd = alloc_cd();
+	cd = alloc_cd(mk);
 	ASSERT(cd);
 	cd->seg = seg;
 	cd->size = size;
-	link_cd(cd);
+	link_cd(mk,cd);
 
 	if (erts_mtrace_enabled) {
 	    erts_mtrace_crr_free(atype, SEGTYPE, seg);
@@ -716,7 +779,7 @@ mseg_dealloc(ErtsAlcType_t atype, void *seg, Uint size,
 	/* ASSERT(segments.current.watermark >= segments.current.no + cache_size); */
 
 	if (check_limits)
-	    check_cache_limits();
+	    check_cache_limits(mk);
 
 	schedule_cache_check();
 
@@ -729,6 +792,7 @@ static void *
 mseg_realloc(ErtsAlcType_t atype, void *seg, Uint old_size, Uint *new_size_p,
 	     const ErtsMsegOpt_t *opt)
 {
+    MemKind* mk = type2mk(atype);
     void *new_seg;
     Uint new_size;
 
@@ -766,15 +830,15 @@ mseg_realloc(ErtsAlcType_t atype, void *seg, Uint old_size, Uint *new_size_p,
 #if CAN_PARTLY_DESTROY
 
 	    if (shrink_sz > min_seg_size
-		&& free_cache_descs
+		&& mk->free_cache_descs
 		&& opt->cache) {
 		cache_desc_t *cd;
 
-		cd = alloc_cd();
+		cd = alloc_cd(mk);
 		ASSERT(cd);
 		cd->seg = ((char *) seg) + new_size;
 		cd->size = shrink_sz;
-		end_link_cd(cd);
+		end_link_cd(mk,cd);
 
 		if (erts_mtrace_enabled) {
 		    erts_mtrace_crr_realloc(new_seg,
@@ -793,7 +857,7 @@ mseg_realloc(ErtsAlcType_t atype, void *seg, Uint old_size, Uint *new_size_p,
 					    SEGTYPE,
 					    seg,
 					    new_size);
-		mseg_destroy(((char *) seg) + new_size, shrink_sz);
+		mseg_destroy(mk, ((char *) seg) + new_size, shrink_sz);
 	    }
 
 #elif HAVE_MSEG_RECREATE
@@ -827,7 +891,7 @@ mseg_realloc(ErtsAlcType_t atype, void *seg, Uint old_size, Uint *new_size_p,
 #if !CAN_PARTLY_DESTROY
 	do_recreate:
 #endif
-	    new_seg = mseg_recreate((void *) seg, old_size, new_size);
+	    new_seg = mseg_recreate(mk, (void *) seg, old_size, new_size);
 	    if (erts_mtrace_enabled)
 		erts_mtrace_crr_realloc(new_seg, atype, SEGTYPE, seg, new_size);
 	    if (!new_seg)
@@ -850,7 +914,7 @@ mseg_realloc(ErtsAlcType_t atype, void *seg, Uint old_size, Uint *new_size_p,
 
     *new_size_p = new_size;
 
-    ERTS_MSEG_REALLOC_STAT(old_size, new_size);
+    ERTS_MSEG_REALLOC_STAT(mk, old_size, new_size);
 
     return new_seg;
 }
@@ -866,6 +930,8 @@ static struct {
     Eterm mcs;
     Eterm cci;
 
+    Eterm memkind;
+    Eterm name;
     Eterm status;
     Eterm cached_segments;
     Eterm cache_hits;
@@ -915,6 +981,8 @@ init_atoms(void)
 #endif
 
 	AM_INIT(version);
+	AM_INIT(memkind);
+	AM_INIT(name);
 
 	AM_INIT(options);
 	AM_INIT(amcbf);
@@ -1125,65 +1193,88 @@ info_calls(int *print_to_p, void *print_to_arg, Uint **hpp, Uint *szp)
 }
 
 static Eterm
-info_status(int *print_to_p,
-	    void *print_to_arg,
-	    int begin_new_max_period,
-	    Uint **hpp,
-	    Uint *szp)
+info_status(MemKind* mk, int *print_to_p, void *print_to_arg,
+	    int begin_new_max_period, Uint **hpp, Uint *szp)
 {
     Eterm res = THE_NON_VALUE;
     
-    if (segments.max_ever.no < segments.max.no)
-	segments.max_ever.no = segments.max.no;
-    if (segments.max_ever.sz < segments.max.sz)
-	segments.max_ever.sz = segments.max.sz;
+    if (mk->segments.max_ever.no < mk->segments.max.no)
+	mk->segments.max_ever.no = mk->segments.max.no;
+    if (mk->segments.max_ever.sz < mk->segments.max.sz)
+	mk->segments.max_ever.sz = mk->segments.max.sz;
 
     if (print_to_p) {
 	int to = *print_to_p;
 	void *arg = print_to_arg;
 
-	erts_print(to, arg, "cached_segments: %bpu\n", cache_size);
-	erts_print(to, arg, "cache_hits: %bpu\n", cache_hits);
+	erts_print(to, arg, "cached_segments: %bpu\n", mk->cache_size);
+	erts_print(to, arg, "cache_hits: %bpu\n", mk->cache_hits);
 	erts_print(to, arg, "segments: %bpu %bpu %bpu\n",
-		   segments.current.no, segments.max.no, segments.max_ever.no);
+		   mk->segments.current.no, mk->segments.max.no, mk->segments.max_ever.no);
 	erts_print(to, arg, "segments_size: %bpu %bpu %bpu\n",
-		   segments.current.sz, segments.max.sz, segments.max_ever.sz);
+		   mk->segments.current.sz, mk->segments.max.sz, mk->segments.max_ever.sz);
 	erts_print(to, arg, "segments_watermark: %bpu\n",
-		   segments.current.watermark);
+		   mk->segments.current.watermark);
     }
 
     if (hpp || szp) {
 	res = NIL;
 	add_2tup(hpp, szp, &res,
 		 am.segments_watermark,
-		 bld_unstable_uint(hpp, szp, segments.current.watermark));
+		 bld_unstable_uint(hpp, szp, mk->segments.current.watermark));
 	add_4tup(hpp, szp, &res,
 		 am.segments_size,
-		 bld_unstable_uint(hpp, szp, segments.current.sz),
-		 bld_unstable_uint(hpp, szp, segments.max.sz),
-		 bld_unstable_uint(hpp, szp, segments.max_ever.sz));
+		 bld_unstable_uint(hpp, szp, mk->segments.current.sz),
+		 bld_unstable_uint(hpp, szp, mk->segments.max.sz),
+		 bld_unstable_uint(hpp, szp, mk->segments.max_ever.sz));
 	add_4tup(hpp, szp, &res,
 		 am.segments,
-		 bld_unstable_uint(hpp, szp, segments.current.no),
-		 bld_unstable_uint(hpp, szp, segments.max.no),
-		 bld_unstable_uint(hpp, szp, segments.max_ever.no));
+		 bld_unstable_uint(hpp, szp, mk->segments.current.no),
+		 bld_unstable_uint(hpp, szp, mk->segments.max.no),
+		 bld_unstable_uint(hpp, szp, mk->segments.max_ever.no));
 	add_2tup(hpp, szp, &res,
 		 am.cache_hits,
-		 bld_unstable_uint(hpp, szp, cache_hits));
+		 bld_unstable_uint(hpp, szp, mk->cache_hits));
 	add_2tup(hpp, szp, &res,
 		 am.cached_segments,
-		 bld_unstable_uint(hpp, szp, cache_size));
+		 bld_unstable_uint(hpp, szp, mk->cache_size));
 
     }
 
     if (begin_new_max_period) {
-	segments.max.no = segments.current.no;
-	segments.max.sz = segments.current.sz;
+	mk->segments.max.no = mk->segments.current.no;
+	mk->segments.max.sz = mk->segments.current.sz;
     }
 
     return res;
 }
 
+static Eterm info_memkind(MemKind* mk, int *print_to_p, void *print_to_arg,
+			  int begin_max_per, Uint **hpp, Uint *szp)
+{
+    Eterm res = THE_NON_VALUE;
+    Eterm atoms[3];
+    Eterm values[3];
+
+    if (print_to_p) {
+	erts_print(*print_to_p, print_to_arg, "memory kind: %s\n", mk->name);
+    }
+    if (hpp || szp) {
+	atoms[0] = am.name;
+	atoms[1] = am.status;
+	atoms[2] = am.calls;
+	values[0] = erts_bld_string(hpp, szp, mk->name);
+    }
+    values[1] = info_status(mk, print_to_p, print_to_arg, begin_max_per, hpp, szp);
+    values[2] = info_calls(print_to_p, print_to_arg, hpp, szp);
+
+    if (hpp || szp)
+	res = bld_2tup_list(hpp, szp, 3, atoms, values);
+
+    return res;
+}
+
+
 static Eterm
 info_version(int *print_to_p, void *print_to_arg, Uint **hpp, Uint *szp)
 {
@@ -1230,6 +1321,7 @@ erts_mseg_info(int *print_to_p,
     Eterm res = THE_NON_VALUE;
     Eterm atoms[4];
     Eterm values[4];
+    Uint n = 0;
 
     erts_mtx_lock(&mseg_mutex);
 
@@ -1240,17 +1332,19 @@ erts_mseg_info(int *print_to_p,
 
 	atoms[0] = am.version;
 	atoms[1] = am.options;
-	atoms[2] = am.status;
-	atoms[3] = am.calls;
+	atoms[2] = am.memkind;
+	atoms[3] = am.memkind;
     }
-
-    values[0] = info_version(print_to_p, print_to_arg, hpp, szp);
-    values[1] = info_options("option ", print_to_p, print_to_arg, hpp, szp);
-    values[2] = info_status(print_to_p, print_to_arg, begin_max_per, hpp, szp);
-    values[3] = info_calls(print_to_p, print_to_arg, hpp, szp);
-
+    values[n++] = info_version(print_to_p, print_to_arg, hpp, szp);
+    values[n++] = info_options("option ", print_to_p, print_to_arg, hpp, szp);
+#if HALFWORD_HEAP
+    values[n++] = info_memkind(&low_mem, print_to_p, print_to_arg, begin_max_per, hpp, szp);
+    values[n++] = info_memkind(&hi_mem, print_to_p, print_to_arg, begin_max_per, hpp, szp);
+#else
+    values[n++] = info_memkind(&the_mem, print_to_p, print_to_arg, begin_max_per, hpp, szp);
+#endif
     if (hpp || szp)
-	res = bld_2tup_list(hpp, szp, 4, atoms, values);
+	res = bld_2tup_list(hpp, szp, n, atoms, values);
 
     erts_mtx_unlock(&mseg_mutex);
 
@@ -1309,17 +1403,23 @@ erts_mseg_realloc(ErtsAlcType_t atype, void *seg, Uint old_size,
 void
 erts_mseg_clear_cache(void)
 {
+    MemKind* mk;
     erts_mtx_lock(&mseg_mutex);
-    mseg_clear_cache();
+    for (mk=mk_list; mk; mk=mk->next) {
+	mseg_clear_cache(mk);
+    }
     erts_mtx_unlock(&mseg_mutex);
 }
 
 Uint
 erts_mseg_no(void)
 {
-    Uint n;
+    MemKind* mk;
+    Uint n = 0;
     erts_mtx_lock(&mseg_mutex);
-    n = segments.current.no;
+    for (mk=mk_list; mk; mk=mk->next) {
+	n += mk->segments.current.no;
+    }
     erts_mtx_unlock(&mseg_mutex);
     return n;
 }
@@ -1330,11 +1430,43 @@ erts_mseg_unit_size(void)
     return page_size;
 }
 
-void
-erts_mseg_init(ErtsMsegInit_t *init)
+static void mem_kind_init(MemKind* mk, const char* name)
 {
     unsigned i;
 
+    mk->cache = NULL;
+    mk->cache_end = NULL;
+    mk->max_cached_seg_size = 0;
+    mk->min_cached_seg_size = ~((Uint) 0);
+    mk->cache_size = 0;
+    mk->cache_hits = 0;
+
+    if (max_cache_size > 0) {
+	for (i = 0; i < max_cache_size - 1; i++)
+	    mk->cache_descs[i].next = &mk->cache_descs[i + 1];
+	mk->cache_descs[max_cache_size - 1].next = NULL;
+	mk->free_cache_descs = &mk->cache_descs[0];
+    }
+    else
+	mk->free_cache_descs = NULL;
+
+    mk->segments.current.watermark = 0;
+    mk->segments.current.no = 0;
+    mk->segments.current.sz = 0;
+    mk->segments.max.no = 0;
+    mk->segments.max.sz = 0;
+    mk->segments.max_ever.no = 0;
+    mk->segments.max_ever.sz = 0;
+
+    mk->name = name;
+    mk->next = mk_list;
+    mk_list = mk;
+}
+
+
+void
+erts_mseg_init(ErtsMsegInit_t *init)
+{
     atoms_initialized = 0;
     is_init_done = 0;
 
@@ -1377,40 +1509,33 @@ erts_mseg_init(ErtsMsegInit_t *init)
     min_seg_size = ~((Uint) 0);
 #endif
 
-    cache = NULL;
-    cache_end = NULL;
-    cache_hits = 0;
-    max_cached_seg_size = 0;
-    min_cached_seg_size = ~((Uint) 0);
-    cache_size = 0;
+    if (max_cache_size > MAX_CACHE_SIZE)
+	max_cache_size = MAX_CACHE_SIZE;
+
+#if HALFWORD_HEAP
+    mem_kind_init(&low_mem, "low memory");
+    mem_kind_init(&hi_mem, "high memory");
+#else
+    mem_kind_init(&the_mem, "all memory");
+#endif
 
     is_cache_check_scheduled = 0;
 #ifdef ERTS_THREADS_NO_SMP
     is_cache_check_requested = 0;
 #endif
+}
 
-    if (max_cache_size > MAX_CACHE_SIZE)
-	max_cache_size = MAX_CACHE_SIZE;
 
-    if (max_cache_size > 0) {
-	for (i = 0; i < max_cache_size - 1; i++)
-	    cache_descs[i].next = &cache_descs[i + 1];
-	cache_descs[max_cache_size - 1].next = NULL;
-	free_cache_descs = &cache_descs[0];
+static ERTS_INLINE Uint tot_cache_size(void)
+{
+    MemKind* mk;
+    Uint sz = 0;
+    for (mk=mk_list; mk; mk=mk->next) {
+	sz += mk->cache_size;
     }
-    else
-	free_cache_descs = NULL;
-
-    segments.current.watermark = 0;
-    segments.current.no = 0;
-    segments.current.sz = 0;
-    segments.max.no = 0;
-    segments.max.sz = 0;
-    segments.max_ever.no = 0;
-    segments.max_ever.sz = 0;
+    return sz;
 }
 
-
 /*
  * erts_mseg_late_init() have to be called after all allocators,
  * threads and timers have been initialized.
@@ -1428,7 +1553,7 @@ erts_mseg_late_init(void)
 #ifdef ERTS_THREADS_NO_SMP
     async_handle = handle;
 #endif
-    if (cache_size)
+    if (tot_cache_size())
 	schedule_cache_check();
     erts_mtx_unlock(&mseg_mutex);
 }
@@ -1469,7 +1594,7 @@ erts_mseg_test(unsigned long op,
     case 0x406: {
 	unsigned long res;
 	erts_mtx_lock(&mseg_mutex);
-	res = (unsigned long) cache_size;
+	res = (unsigned long) tot_cache_size();
 	erts_mtx_unlock(&mseg_mutex);
 	return res;
     }
@@ -1748,6 +1873,7 @@ static int pmunmap(void *p, size_t size)
     FreeBlock *last;
     FreeBlock *nb = (FreeBlock *) p;
 
+    ASSERT(((unsigned long)p & CHECK_POINTER_MASK)==0);
     if (real_size > pagsz) {
 	if (do_unmap(((char *) p) + pagsz,real_size - pagsz)) {
 	    return 1;
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 09fb6337f7..77ac2de5f6 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2006-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2006-2011. 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
@@ -124,25 +124,11 @@
   erts_smp_mtx_unlock(&(PS)->mtx)
 
 #define ERTS_POLLSET_SET_POLLED_CHK(PS) \
-  ((int) erts_smp_atomic_xchg(&(PS)->polled, (long) 1))
+  ((int) erts_atomic32_xchg(&(PS)->polled, (erts_aint32_t) 1))
 #define ERTS_POLLSET_UNSET_POLLED(PS) \
-  erts_smp_atomic_set(&(PS)->polled, (long) 0)
+  erts_atomic32_set(&(PS)->polled, (erts_aint32_t) 0)
 #define ERTS_POLLSET_IS_POLLED(PS) \
-  ((int) erts_smp_atomic_read(&(PS)->polled))
-
-#define ERTS_POLLSET_SET_POLLER_WOKEN_CHK(PS) set_poller_woken_chk((PS))
-#define ERTS_POLLSET_SET_POLLER_WOKEN(PS) 				\
-do {									\
-      ERTS_THR_MEMORY_BARRIER;						\
-      erts_smp_atomic_set(&(PS)->woken, (long) 1);			\
-} while (0)
-#define ERTS_POLLSET_UNSET_POLLER_WOKEN(PS)				\
-do {									\
-    erts_smp_atomic_set(&(PS)->woken, (long) 0);			\
-    ERTS_THR_MEMORY_BARRIER;						\
-} while (0)
-#define ERTS_POLLSET_IS_POLLER_WOKEN(PS)				\
-  ((int) erts_smp_atomic_read(&(PS)->woken))
+  ((int) erts_atomic32_read(&(PS)->polled))
 
 #else
 
@@ -152,69 +138,21 @@ do {									\
 #define ERTS_POLLSET_UNSET_POLLED(PS)
 #define ERTS_POLLSET_IS_POLLED(PS) 0
 
-#if ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
-
-/*
- * Ideally, the ERTS_POLLSET_SET_POLLER_WOKEN_CHK(PS) operation would
- * be atomic. This operation isn't, but we will do okay anyway. The
- * "woken check" is only an optimization. The only requirement we have:
- * If (PS)->woken is set to a value != 0 when interrupting, we have to
- * write on the the wakeup pipe at least once. Multiple writes are okay.
- */
-#define ERTS_POLLSET_SET_POLLER_WOKEN_CHK(PS) ((PS)->woken++)
-#define ERTS_POLLSET_SET_POLLER_WOKEN(PS) ((PS)->woken = 1, (void) 0)
-#define ERTS_POLLSET_UNSET_POLLER_WOKEN(PS) ((PS)->woken = 0, (void) 0)
-#define ERTS_POLLSET_IS_POLLER_WOKEN(PS) ((PS)->woken)
-
-#else
-
-#define ERTS_POLLSET_SET_POLLER_WOKEN_CHK(PS) 1
-#define ERTS_POLLSET_SET_POLLER_WOKEN(PS)
-#define ERTS_POLLSET_UNSET_POLLER_WOKEN(PS)
-#define ERTS_POLLSET_IS_POLLER_WOKEN(PS) 1
-
-#endif
-
 #endif
 
 #if ERTS_POLL_USE_UPDATE_REQUESTS_QUEUE
 #define ERTS_POLLSET_SET_HAVE_UPDATE_REQUESTS(PS) \
-  erts_smp_atomic_set(&(PS)->have_update_requests, (long) 1)
+  erts_smp_atomic32_set(&(PS)->have_update_requests, (erts_aint32_t) 1)
 #define ERTS_POLLSET_UNSET_HAVE_UPDATE_REQUESTS(PS) \
-  erts_smp_atomic_set(&(PS)->have_update_requests, (long) 0)
+  erts_smp_atomic32_set(&(PS)->have_update_requests, (erts_aint32_t) 0)
 #define ERTS_POLLSET_HAVE_UPDATE_REQUESTS(PS) \
-  ((int) erts_smp_atomic_read(&(PS)->have_update_requests))
+  ((int) erts_smp_atomic32_read(&(PS)->have_update_requests))
 #else
 #define ERTS_POLLSET_SET_HAVE_UPDATE_REQUESTS(PS)
 #define ERTS_POLLSET_UNSET_HAVE_UPDATE_REQUESTS(PS)
 #define ERTS_POLLSET_HAVE_UPDATE_REQUESTS(PS) 0
 #endif
 
-#if ERTS_POLL_ASYNC_INTERRUPT_SUPPORT && !defined(ERTS_SMP)
-
-#define ERTS_POLLSET_UNSET_INTERRUPTED_CHK(PS) unset_interrupted_chk((PS))
-#define ERTS_POLLSET_UNSET_INTERRUPTED(PS) ((PS)->interrupt = 0, (void) 0)
-#define ERTS_POLLSET_SET_INTERRUPTED(PS) ((PS)->interrupt = 1, (void) 0)
-#define ERTS_POLLSET_IS_INTERRUPTED(PS) ((PS)->interrupt)
-
-#else
-
-#define ERTS_POLLSET_UNSET_INTERRUPTED_CHK(PS) unset_interrupted_chk((PS))
-#define ERTS_POLLSET_UNSET_INTERRUPTED(PS)				\
-do {									\
-    erts_smp_atomic_set(&(PS)->interrupt, (long) 0);			\
-    ERTS_THR_MEMORY_BARRIER;						\
-} while (0)
-#define ERTS_POLLSET_SET_INTERRUPTED(PS) 				\
-do {									\
-      ERTS_THR_MEMORY_BARRIER;						\
-      erts_smp_atomic_set(&(PS)->interrupt, (long) 1);			\
-} while (0)
-#define ERTS_POLLSET_IS_INTERRUPTED(PS)					\
-  ((int) erts_smp_atomic_read(&(PS)->interrupt))
-
-#endif
-
 #if ERTS_POLL_USE_FALLBACK
 #  if ERTS_POLL_USE_POLL
 #    define ERTS_POLL_NEED_FALLBACK(PS) ((PS)->no_poll_fds > 1)
@@ -286,7 +224,7 @@ struct ErtsPollSet_ {
     ErtsPollSet next;
     int internal_fd_limit;
     ErtsFdStatus *fds_status;
-    int no_of_user_fds;
+    erts_smp_atomic_t no_of_user_fds;
     int fds_status_len;
 #if ERTS_POLL_USE_KERNEL_POLL
     int kp_fd;
@@ -318,14 +256,12 @@ struct ErtsPollSet_ {
 #if ERTS_POLL_USE_UPDATE_REQUESTS_QUEUE
     ErtsPollSetUpdateRequestsBlock update_requests;
     ErtsPollSetUpdateRequestsBlock *curr_upd_req_block;
-    erts_smp_atomic_t have_update_requests;
+    erts_smp_atomic32_t have_update_requests;
 #endif
 #ifdef ERTS_SMP
-    erts_smp_atomic_t polled;
-    erts_smp_atomic_t woken;
+    erts_atomic32_t polled;
     erts_smp_mtx_t mtx;
 #elif ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
-    volatile int woken;
 #endif
 #if ERTS_POLL_USE_WAKEUP_PIPE
     int wake_fds[2];
@@ -333,12 +269,12 @@ struct ErtsPollSet_ {
 #if ERTS_POLL_USE_FALLBACK
     int fallback_used;
 #endif
-#if ERTS_POLL_ASYNC_INTERRUPT_SUPPORT && !defined(ERTS_SMP)
-    volatile int interrupt;
-#else
-    erts_smp_atomic_t interrupt;
+#ifdef ERTS_SMP
+    erts_atomic32_t wakeup_state;
+#elif ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
+    volatile int wakeup_state;
 #endif
-    erts_smp_atomic_t timeout;
+    erts_smp_atomic32_t timeout;
 #ifdef ERTS_POLL_COUNT_AVOIDED_WAKEUPS
     erts_smp_atomic_t no_avoided_wakeups;
     erts_smp_atomic_t no_avoided_interrupts;
@@ -346,34 +282,6 @@ struct ErtsPollSet_ {
 #endif
 };
 
-static ERTS_INLINE int
-unset_interrupted_chk(ErtsPollSet ps)
-{
-    int res;
-#if ERTS_POLL_ASYNC_INTERRUPT_SUPPORT && !defined(ERTS_SMP)
-    /* This operation isn't atomic, but we have no need at all for an
-       atomic operation here... */
-    res = ps->interrupt;
-    ps->interrupt = 0;
-#else
-    res = (int) erts_smp_atomic_xchg(&ps->interrupt, (long) 0);
-    ERTS_THR_MEMORY_BARRIER;
-#endif
-    return res;
-
-}
-
-#ifdef ERTS_SMP
-
-static ERTS_INLINE int
-set_poller_woken_chk(ErtsPollSet ps)
-{
-    ERTS_THR_MEMORY_BARRIER;
-    return (int) erts_smp_atomic_xchg(&ps->woken, (long) 1);
-}
-
-#endif
-
 void erts_silence_warn_unused_result(long unused);
 static void fatal_error(char *format, ...);
 static void fatal_error_async_signal_safe(char *error_str);
@@ -430,6 +338,63 @@ static void check_poll_status(ErtsPollSet ps);
 static void print_misc_debug_info(void);
 #endif
 
+#define ERTS_POLL_NOT_WOKEN	0
+#define ERTS_POLL_WOKEN		-1
+#define ERTS_POLL_WOKEN_INTR	1
+
+static ERTS_INLINE void
+reset_wakeup_state(ErtsPollSet ps)
+{
+#ifdef ERTS_SMP
+    erts_atomic32_set(&ps->wakeup_state, ERTS_POLL_NOT_WOKEN);
+#elif ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
+    ps->wakeup_state = 0;
+#endif
+}
+
+static ERTS_INLINE int
+is_woken(ErtsPollSet ps)
+{
+#ifdef ERTS_SMP
+    return erts_atomic32_read_acqb(&ps->wakeup_state) != ERTS_POLL_NOT_WOKEN;
+#elif ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
+    return ps->wakeup_state != ERTS_POLL_NOT_WOKEN;
+#else
+    return 0;
+#endif
+}
+
+static ERTS_INLINE int
+is_interrupted_reset(ErtsPollSet ps)
+{
+#ifdef ERTS_SMP
+    return (erts_atomic32_xchg(&ps->wakeup_state, ERTS_POLL_NOT_WOKEN)
+	    == ERTS_POLL_WOKEN_INTR);
+#elif ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
+    int res = ps->wakeup_state == ERTS_POLL_WOKEN_INTR;
+    ps->wakeup_state = ERTS_POLL_NOT_WOKEN;
+    return res;
+#else
+    return 0;
+#endif
+}
+
+static ERTS_INLINE void
+woke_up(ErtsPollSet ps)
+{
+#ifdef ERTS_SMP
+    erts_aint32_t wakeup_state = erts_atomic32_read(&ps->wakeup_state);
+    if (wakeup_state == ERTS_POLL_NOT_WOKEN)
+	(void) erts_atomic32_cmpxchg(&ps->wakeup_state,
+				     ERTS_POLL_WOKEN,
+				     ERTS_POLL_NOT_WOKEN);
+    ASSERT(erts_atomic32_read(&ps->wakeup_state) != ERTS_POLL_NOT_WOKEN);
+#elif ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
+    if (ps->wakeup_state == ERTS_POLL_NOT_WOKEN)
+	ps->wakeup_state = ERTS_POLL_WOKEN;
+#endif
+}
+
 /*
  * --- Wakeup pipe -----------------------------------------------------------
  */
@@ -437,14 +402,34 @@ static void print_misc_debug_info(void);
 #if ERTS_POLL_USE_WAKEUP_PIPE
 
 static ERTS_INLINE void
-wake_poller(ErtsPollSet ps)
+wake_poller(ErtsPollSet ps, int interrupted)
 {
+    int wake;
+#ifdef ERTS_SMP
+    erts_aint32_t wakeup_state;
+    if (!interrupted)
+	wakeup_state = erts_atomic32_cmpxchg_relb(&ps->wakeup_state,
+						  ERTS_POLL_WOKEN,
+						  ERTS_POLL_NOT_WOKEN);
+    else {
+	/*
+	 * We might unnecessarily write to the pipe, however,
+	 * that isn't problematic.
+	 */
+	wakeup_state = erts_atomic32_read(&ps->wakeup_state);
+	erts_atomic32_set_relb(&ps->wakeup_state, ERTS_POLL_WOKEN_INTR);
+    }
+    wake = wakeup_state == ERTS_POLL_NOT_WOKEN;
+#elif ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
+    wake = ps->wakeup_state == ERTS_POLL_NOT_WOKEN;
+    ps->wakeup_state = interrupted ? ERTS_POLL_WOKEN_INTR : ERTS_POLL_NOT_WOKEN;
+#endif
     /*
      * NOTE: This function might be called from signal handlers in the
      *       non-smp case; therefore, it has to be async-signal safe in
      *       the non-smp case.
      */
-    if (!ERTS_POLLSET_SET_POLLER_WOKEN_CHK(ps)) {
+    if (wake) {
 	ssize_t res;
 	if (ps->wake_fds[1] < 0)
 	    return; /* Not initialized yet */
@@ -852,7 +837,7 @@ write_batch_buf(ErtsPollSet ps, ErtsPollBatchBuf *bbp)
 		    ps->fds_status[fd].flags |= ERTS_POLL_FD_FLG_USEFLBCK;
 		    ASSERT(ps->fds_status[fd].used_events);
 		    ps->fds_status[fd].used_events = 0;
-		    ps->no_of_user_fds--;
+		    erts_smp_atomic_dec(&ps->no_of_user_fds);
 		    update_fallback_pollset(ps, fd);
 		    ASSERT(ps->fds_status[fd].flags & ERTS_POLL_FD_FLG_INFLBCK);
 		    break;
@@ -902,11 +887,11 @@ batch_update_pollset(ErtsPollSet ps, int fd, ErtsPollBatchBuf *bbp)
     events = ERTS_POLL_EV_E2N(ps->fds_status[fd].events);
     if (!events) {
 	buf[buf_len].events = POLLREMOVE;
-	ps->no_of_user_fds--;
+	erts_smp_atomic_dec(&ps->no_of_user_fds);
     }
     else if (!ps->fds_status[fd].used_events) {
 	buf[buf_len].events = events;
-	ps->no_of_user_fds++;
+	erts_smp_atomic_inc(&ps->no_of_user_fds);
     }
     else {
 	if ((ps->fds_status[fd].flags & ERTS_POLL_FD_FLG_RST)
@@ -996,12 +981,12 @@ batch_update_pollset(ErtsPollSet ps, int fd, ErtsPollBatchBuf *bbp)
 	}
 	if (used_events) {
 	    if (!events) {
-		ps->no_of_user_fds--;
+		erts_smp_atomic_dec(&ps->no_of_user_fds);
 	    }
 	}
 	else {
 	    if (events)
-		ps->no_of_user_fds++;
+		erts_smp_atomic_inc(&ps->no_of_user_fds);
 	}
 	ASSERT((events & ~(ERTS_POLL_EV_IN|ERTS_POLL_EV_OUT)) == 0);
 	ASSERT((used_events & ~(ERTS_POLL_EV_IN|ERTS_POLL_EV_OUT)) == 0);
@@ -1075,7 +1060,7 @@ update_pollset(ErtsPollSet ps, int fd)
 	    epe.data.fd = epe_templ.data.fd;
 	    res = epoll_ctl(ps->kp_fd, EPOLL_CTL_DEL, fd, &epe);
 	} while (res != 0 && errno == EINTR);
-	ps->no_of_user_fds--;
+	erts_smp_atomic_dec(&ps->no_of_user_fds);
 	ps->fds_status[fd].used_events = 0;
     }
 
@@ -1083,11 +1068,11 @@ update_pollset(ErtsPollSet ps, int fd)
 	/* A note on EPOLL_CTL_DEL: linux kernel versions before 2.6.9
 	   need a non-NULL event pointer even though it is ignored... */
 	op = EPOLL_CTL_DEL;
-	ps->no_of_user_fds--;
+	erts_smp_atomic_dec(&ps->no_of_user_fds);
     }
     else if (!ps->fds_status[fd].used_events) {
 	op = EPOLL_CTL_ADD;
-	ps->no_of_user_fds++;
+	erts_smp_atomic_inc(&ps->no_of_user_fds);
     }
     else {
 	op = EPOLL_CTL_MOD;
@@ -1137,7 +1122,7 @@ update_pollset(ErtsPollSet ps, int fd)
 	/* Fall through ... */
 	case EPOLL_CTL_ADD: {
 	    ps->fds_status[fd].flags |= ERTS_POLL_FD_FLG_USEFLBCK;
-	    ps->no_of_user_fds--;
+	    erts_smp_atomic_dec(&ps->no_of_user_fds);
 #if ERTS_POLL_USE_CONCURRENT_UPDATE
 	    if (!*update_fallback) {
 		*update_fallback = 1;
@@ -1225,7 +1210,7 @@ static int update_pollset(ErtsPollSet ps, int fd)
 #if ERTS_POLL_USE_FALLBACK
 	ASSERT(ps->fds_status[fd].flags & ERTS_POLL_FD_FLG_INFLBCK);
 #endif
-	ps->no_of_user_fds--;
+	erts_smp_atomic_dec(&ps->no_of_user_fds);
 	last_pix = --ps->no_poll_fds;
 	if (pix != last_pix) {
 	/* Move last pix to this pix */
@@ -1252,7 +1237,7 @@ static int update_pollset(ErtsPollSet ps, int fd)
 	    ASSERT(!(ps->fds_status[fd].flags & ERTS_POLL_FD_FLG_INFLBCK)
 		    || fd == ps->kp_fd);
 #endif
-	    ps->no_of_user_fds++;
+	    erts_smp_atomic_inc(&ps->no_of_user_fds);
 	    ps->fds_status[fd].pix = pix = ps->no_poll_fds++;
 	    if (pix >= ps->poll_fds_len)
 		grow_poll_fds(ps, pix);
@@ -1303,7 +1288,7 @@ static int update_pollset(ErtsPollSet ps, int fd)
 
 	if (!ps->fds_status[fd].used_events) {
 	    ASSERT(events);
-	    ps->no_of_user_fds++;
+	    erts_smp_atomic_inc(&ps->no_of_user_fds);
 #if ERTS_POLL_USE_FALLBACK
 	    ps->no_select_fds++;
 	    ps->fds_status[fd].flags |= ERTS_POLL_FD_FLG_INFLBCK;
@@ -1311,7 +1296,7 @@ static int update_pollset(ErtsPollSet ps, int fd)
 	}
 	else if (!events) {
 	    ASSERT(ps->fds_status[fd].used_events);
-	    ps->no_of_user_fds--;
+	    erts_smp_atomic_dec(&ps->no_of_user_fds);
 	    ps->fds_status[fd].events = events;
 #if ERTS_POLL_USE_FALLBACK
 	    ps->no_select_fds--;
@@ -1387,9 +1372,7 @@ handle_update_requests(ErtsPollSet ps)
 #endif /* ERTS_POLL_USE_UPDATE_REQUESTS_QUEUE */
 
 static ERTS_INLINE ErtsPollEvents
-poll_control(ErtsPollSet ps, int fd, ErtsPollEvents events, int on,
-	     int *have_set_have_update_requests,
-	     int *do_wake)
+poll_control(ErtsPollSet ps, int fd, ErtsPollEvents events, int on, int *do_wake)
 {
     ErtsPollEvents new_events;
 
@@ -1493,7 +1476,6 @@ ERTS_POLL_EXPORT(erts_poll_controlv)(ErtsPollSet ps,
 				     int len)
 {
     int i;
-    int hshur = 0;
     int do_wake;
     int final_do_wake = 0;
 
@@ -1505,17 +1487,17 @@ ERTS_POLL_EXPORT(erts_poll_controlv)(ErtsPollSet ps,
 				      pcev[i].fd,
 				      pcev[i].events,
 				      pcev[i].on,
-				      &hshur,
 				      &do_wake);
 	final_do_wake |= do_wake;
     }
 
+    ERTS_POLLSET_UNLOCK(ps);
+
 #ifdef ERTS_SMP
     if (final_do_wake)
-	wake_poller(ps);
+	wake_poller(ps, 0);
 #endif /* ERTS_SMP */
 
-    ERTS_POLLSET_UNLOCK(ps);
 }
 
 ErtsPollEvents
@@ -1526,20 +1508,20 @@ ERTS_POLL_EXPORT(erts_poll_control)(ErtsPollSet ps,
 				    int* do_wake) /* In: Wake up polling thread */
 				                  /* Out: Poller is woken */
 {
-    int hshur = 0;
     ErtsPollEvents res;
 
     ERTS_POLLSET_LOCK(ps);
 
-    res = poll_control(ps, fd, events, on, &hshur, do_wake);
+    res = poll_control(ps, fd, events, on, do_wake);
+
+    ERTS_POLLSET_UNLOCK(ps);
 
 #ifdef ERTS_SMP
     if (*do_wake) {
-	wake_poller(ps);
+	wake_poller(ps, 0);
     }
 #endif /* ERTS_SMP */
 
-    ERTS_POLLSET_UNLOCK(ps);
     return res;
 }
 
@@ -1912,14 +1894,17 @@ static ERTS_INLINE int
 check_fd_events(ErtsPollSet ps, SysTimeval *tv, int max_res, int *ps_locked)
 {
     ASSERT(!*ps_locked);
-    if (ps->no_of_user_fds == 0 && tv->tv_usec == 0 && tv->tv_sec == 0) {
+    if (erts_smp_atomic_read(&ps->no_of_user_fds) == 0
+	&& tv->tv_usec == 0 && tv->tv_sec == 0) {
 	/* Nothing to poll and zero timeout; done... */
 	return 0;
     }
     else {
 	long timeout = tv->tv_sec*1000 + tv->tv_usec/1000;
+	if (timeout > ERTS_AINT32_T_MAX)
+	    timeout = ERTS_AINT32_T_MAX;
 	ASSERT(timeout >= 0);
-	erts_smp_atomic_set(&ps->timeout, timeout);
+	erts_smp_atomic32_set_relb(&ps->timeout, (erts_aint32_t) timeout);
 #if ERTS_POLL_USE_FALLBACK
 	if (!(ps->fallback_used = ERTS_POLL_NEED_FALLBACK(ps))) {
 
@@ -1950,7 +1935,7 @@ check_fd_events(ErtsPollSet ps, SysTimeval *tv, int max_res, int *ps_locked)
 	     * the maximum number of file descriptors in the poll set.
 	     */
 	    struct dvpoll poll_res;
-	    int nfds = ps->no_of_user_fds;
+	    int nfds = (int) erts_smp_atomic_read(&ps->no_of_user_fds);
 #ifdef ERTS_SMP
 	    nfds++; /* Wakeup pipe */
 #endif
@@ -2041,15 +2026,14 @@ ERTS_POLL_EXPORT(erts_poll_wait)(ErtsPollSet ps,
 		 (int) tv->tv_sec*1000 + tv->tv_usec/1000);
 #endif
 
-    ERTS_POLLSET_UNSET_POLLER_WOKEN(ps);
     if (ERTS_POLLSET_SET_POLLED_CHK(ps)) {
 	res = EINVAL; /* Another thread is in erts_poll_wait()
 			 on this pollset... */
 	goto done;
     }
 
-    if (ERTS_POLLSET_IS_INTERRUPTED(ps)) {
-	/* Interrupt use zero timeout */
+    if (is_woken(ps)) {
+	/* Use zero timeout */
 	itv.tv_sec = 0;
 	itv.tv_usec = 0;
 	tvp = &itv;
@@ -2066,7 +2050,7 @@ ERTS_POLL_EXPORT(erts_poll_wait)(ErtsPollSet ps,
     ps_locked = 0;
     res = check_fd_events(ps, tvp, no_fds, &ps_locked);
 
-    ERTS_POLLSET_SET_POLLER_WOKEN(ps);
+    woke_up(ps);
 
     if (res == 0) {
 	res = ETIMEDOUT;
@@ -2098,9 +2082,7 @@ ERTS_POLL_EXPORT(erts_poll_wait)(ErtsPollSet ps,
 	check_poll_result(pr, no_fds);
 #endif
 
-	res = (no_fds == 0
-	       ? (ERTS_POLLSET_UNSET_INTERRUPTED_CHK(ps) ? EINTR : EAGAIN)
-	       : 0);
+	res = (no_fds == 0 ? (is_interrupted_reset(ps) ? EINTR : EAGAIN) : 0);
 	*len = no_fds;
     }
 
@@ -2111,7 +2093,7 @@ ERTS_POLL_EXPORT(erts_poll_wait)(ErtsPollSet ps,
 #endif
 
  done:
-    erts_smp_atomic_set(&ps->timeout, LONG_MAX);
+    erts_smp_atomic32_set_relb(&ps->timeout, ERTS_AINT32_T_MAX);
 #ifdef ERTS_POLL_DEBUG_PRINT
     erts_printf("Leaving %s = erts_poll_wait()\n",
 		 res == 0 ? "0" : erl_errno_id(res));
@@ -2127,20 +2109,17 @@ ERTS_POLL_EXPORT(erts_poll_wait)(ErtsPollSet ps,
 void
 ERTS_POLL_EXPORT(erts_poll_interrupt)(ErtsPollSet ps, int set)
 {
+#if ERTS_POLL_ASYNC_INTERRUPT_SUPPORT || defined(ERTS_SMP)
     /*
      * NOTE: This function might be called from signal handlers in the
      *       non-smp case; therefore, it has to be async-signal safe in
      *       the non-smp case.
      */
-    if (set) {
-	ERTS_POLLSET_SET_INTERRUPTED(ps);
-#if ERTS_POLL_ASYNC_INTERRUPT_SUPPORT || defined(ERTS_SMP)
-	wake_poller(ps);
+    if (!set)
+	reset_wakeup_state(ps);
+    else
+	wake_poller(ps, 1);
 #endif
-    }
-    else {
-	ERTS_POLLSET_UNSET_INTERRUPTED(ps);
-    }
 }
 
 /*
@@ -2149,15 +2128,16 @@ ERTS_POLL_EXPORT(erts_poll_interrupt)(ErtsPollSet ps, int set)
  * is not guaranteed that it will timeout before 'msec' milli seconds.
  */
 void
-ERTS_POLL_EXPORT(erts_poll_interrupt_timed)(ErtsPollSet ps, int set, long msec)
+ERTS_POLL_EXPORT(erts_poll_interrupt_timed)(ErtsPollSet ps,
+					    int set,
+					    long msec)
 {
-    if (set) {
-	if (erts_smp_atomic_read(&ps->timeout) > msec) {
-	    ERTS_POLLSET_SET_INTERRUPTED(ps);
 #if ERTS_POLL_ASYNC_INTERRUPT_SUPPORT || defined(ERTS_SMP)
-	    wake_poller(ps);
-#endif
-	}
+    if (!set)
+	reset_wakeup_state(ps);
+    else {
+	if (erts_smp_atomic32_read_acqb(&ps->timeout) > (erts_aint32_t) msec)
+	    wake_poller(ps, 1);
 #ifdef ERTS_POLL_COUNT_AVOIDED_WAKEUPS
 	else {
 	    if (ERTS_POLLSET_IS_POLLED(ps))
@@ -2167,9 +2147,7 @@ ERTS_POLL_EXPORT(erts_poll_interrupt_timed)(ErtsPollSet ps, int set, long msec)
 	erts_smp_atomic_inc(&ps->no_interrupt_timed);
 #endif
     }
-    else {
-	ERTS_POLLSET_UNSET_INTERRUPTED(ps);
-    }
+#endif
 }
 
 int
@@ -2228,7 +2206,7 @@ ERTS_POLL_EXPORT(erts_poll_create_pollset)(void)
     ps->internal_fd_limit = 0;
     ps->fds_status = NULL;
     ps->fds_status_len = 0;
-    ps->no_of_user_fds = 0;
+    erts_smp_atomic_init(&ps->no_of_user_fds, 0);
 #if ERTS_POLL_USE_KERNEL_POLL
     ps->kp_fd = -1;
 #if ERTS_POLL_USE_EPOLL
@@ -2280,14 +2258,16 @@ ERTS_POLL_EXPORT(erts_poll_create_pollset)(void)
     ps->update_requests.next = NULL;
     ps->update_requests.len = 0;
     ps->curr_upd_req_block = &ps->update_requests;
-    erts_smp_atomic_init(&ps->have_update_requests, 0);
+    erts_smp_atomic32_init(&ps->have_update_requests, 0);
 #endif
 #ifdef ERTS_SMP
-    erts_smp_atomic_init(&ps->polled, 0);
-    erts_smp_atomic_init(&ps->woken, 0);
+    erts_atomic32_init(&ps->polled, 0);
     erts_smp_mtx_init(&ps->mtx, "pollset");
+#endif
+#ifdef ERTS_SMP
+    erts_atomic32_init(&ps->wakeup_state, (erts_aint32_t) 0);
 #elif ERTS_POLL_ASYNC_INTERRUPT_SUPPORT
-    ps->woken = 0;
+    ps->wakeup_state = 0;
 #endif
 #if ERTS_POLL_USE_WAKEUP_PIPE
     create_wakeup_pipe(ps);
@@ -2309,12 +2289,7 @@ ERTS_POLL_EXPORT(erts_poll_create_pollset)(void)
 	ps->internal_fd_limit = kp_fd + 1;
     ps->kp_fd = kp_fd;
 #endif
-#if ERTS_POLL_ASYNC_INTERRUPT_SUPPORT && !defined(ERTS_SMP)
-    ps->interrupt = 0;
-#else
-    erts_smp_atomic_init(&ps->interrupt, 0);
-#endif
-    erts_smp_atomic_init(&ps->timeout, LONG_MAX);
+    erts_smp_atomic32_init(&ps->timeout, ERTS_AINT32_T_MAX);
 #ifdef ERTS_POLL_COUNT_AVOIDED_WAKEUPS
     erts_smp_atomic_init(&ps->no_avoided_wakeups, 0);
     erts_smp_atomic_init(&ps->no_avoided_interrupts, 0);
@@ -2326,7 +2301,7 @@ ERTS_POLL_EXPORT(erts_poll_create_pollset)(void)
 #if ERTS_POLL_USE_FALLBACK
     ps->fallback_used = 0;
 #endif
-    ps->no_of_user_fds = 0; /* Don't count wakeup pipe and fallback fd */
+    erts_smp_atomic_set(&ps->no_of_user_fds, 0); /* Don't count wakeup pipe and fallback fd */
 
     erts_smp_spin_lock(&pollsets_lock);
     ps->next = pollsets;
@@ -2472,7 +2447,7 @@ ERTS_POLL_EXPORT(erts_poll_info)(ErtsPollSet ps, ErtsPollInfo *pip)
 
     pip->memory_size = size;
 
-    pip->poll_set_size = ps->no_of_user_fds;
+    pip->poll_set_size = (int) erts_smp_atomic_read(&ps->no_of_user_fds);
 #ifdef ERTS_SMP
     pip->poll_set_size++; /* Wakeup pipe */
 #endif
diff --git a/erts/emulator/sys/common/erl_sys_common_misc.c b/erts/emulator/sys/common/erl_sys_common_misc.c
new file mode 100644
index 0000000000..461e763f03
--- /dev/null
+++ b/erts/emulator/sys/common/erl_sys_common_misc.c
@@ -0,0 +1,107 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2006-2010. 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%
+ */
+
+
+
+/*
+ * Darwin needs conversion!
+ * http://developer.apple.com/library/mac/#qa/qa2001/qa1235.html
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "sys.h"
+#include "global.h"
+
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+#define __DARWIN__ 1
+#endif
+
+#if !defined(__WIN32__)
+#include <locale.h>
+#if !defined(HAVE_SETLOCALE) || !defined(HAVE_NL_LANGINFO) || !defined(HAVE_LANGINFO_H)
+#define PRIMITIVE_UTF8_CHECK 1
+#else
+#include <langinfo.h>
+#endif
+#endif
+
+/* Written once and only once */
+
+static int filename_encoding = ERL_FILENAME_UNKNOWN;
+#if defined(__WIN32__) || defined(__DARWIN__)
+static int user_filename_encoding = ERL_FILENAME_UTF8; /* Default unicode on windows */
+#else
+static int user_filename_encoding = ERL_FILENAME_LATIN1;
+#endif
+void erts_set_user_requested_filename_encoding(int encoding)
+{
+    user_filename_encoding = encoding;
+}
+
+int erts_get_user_requested_filename_encoding(void)
+{
+    return user_filename_encoding;
+}
+
+void erts_init_sys_common_misc(void)
+{
+#if defined(__WIN32__)
+    /* win_efile will totally fail if this is not set. */
+    filename_encoding = ERL_FILENAME_WIN_WCHAR;
+#else
+    if (user_filename_encoding != ERL_FILENAME_UNKNOWN) {
+	filename_encoding = user_filename_encoding;
+    } else {
+	char *l;
+	filename_encoding = ERL_FILENAME_LATIN1;
+#  ifdef PRIMITIVE_UTF8_CHECK
+	setlocale(LC_CTYPE, "");  /* Set international environment, 
+				     ignore result */
+	if (((l = getenv("LC_ALL"))   && *l) ||
+	    ((l = getenv("LC_CTYPE")) && *l) ||
+	    ((l = getenv("LANG"))     && *l)) {
+	    if (strstr(l, "UTF-8")) {
+		filename_encoding = ERL_FILENAME_UTF8;
+	    } 
+	}
+	
+#  else
+	l = setlocale(LC_CTYPE, "");  /* Set international environment */
+	if (l != NULL) {
+	    if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) {
+		filename_encoding = ERL_FILENAME_UTF8;
+	    }
+	}
+#  endif
+    }
+#  if defined(__DARWIN__)
+    if (filename_encoding == ERL_FILENAME_UTF8) {
+	filename_encoding = ERL_FILENAME_UTF8_MAC;
+    }
+#  endif
+#endif
+}
+
+int erts_get_native_filename_encoding(void)
+{
+    return filename_encoding;
+}
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h
index 2d5ef882f6..824678a0bb 100644
--- a/erts/emulator/sys/unix/erl_unix_sys.h
+++ b/erts/emulator/sys/unix/erl_unix_sys.h
@@ -329,11 +329,4 @@ extern int exit_async(void);
 
 #define ERTS_EXIT_AFTER_DUMP _exit
 
-#ifdef ERTS_TIMER_THREAD
-struct erts_iwait; /* opaque for clients */
-extern struct erts_iwait *erts_iwait_init(void);
-extern void erts_iwait_wait(struct erts_iwait *iwait, struct timeval *delay);
-extern void erts_iwait_interrupt(struct erts_iwait *iwait);
-#endif /* ERTS_TIMER_THREAD */
-
 #endif /* #ifndef _ERL_UNIX_SYS_H */
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index 50b208848f..bafbbb0f6c 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2011. 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
@@ -53,6 +53,11 @@
 #define WANT_NONBLOCKING    /* must define this to pull in defs from sys.h */
 #include "sys.h"
 
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+#define __DARWIN__ 1
+#endif
+
+
 #ifdef USE_THREADS
 #include "erl_threads.h"
 #endif
@@ -75,6 +80,7 @@ static erts_smp_rwmtx_t environ_rwmtx;
 
 #include "erl_sys_driver.h"
 #include "erl_check_io.h"
+#include "erl_cpu_topology.h"
 
 #ifndef DISABLE_VFORK
 #define DISABLE_VFORK 0
@@ -123,8 +129,6 @@ static ErtsSysReportExit *report_exit_transit_list;
 
 extern int  check_async_ready(void);
 extern int  driver_interrupt(int, int);
-/*EXTERN_FUNCTION(void, increment_time, (int));*/
-/*EXTERN_FUNCTION(int, next_time, (_VOID_));*/
 extern void do_break(void);
 
 extern void erl_sys_args(int*, char**);
@@ -161,14 +165,14 @@ static int debug_log = 0;
 #endif
 
 #ifdef ERTS_SMP
-erts_smp_atomic_t erts_got_sigusr1;
+erts_smp_atomic32_t erts_got_sigusr1;
 #define ERTS_SET_GOT_SIGUSR1 \
-  erts_smp_atomic_set(&erts_got_sigusr1, 1)
+  erts_smp_atomic32_set(&erts_got_sigusr1, 1)
 #define ERTS_UNSET_GOT_SIGUSR1 \
-  erts_smp_atomic_set(&erts_got_sigusr1, 0)
-static erts_smp_atomic_t have_prepared_crash_dump;
+  erts_smp_atomic32_set(&erts_got_sigusr1, 0)
+static erts_smp_atomic32_t have_prepared_crash_dump;
 #define ERTS_PREPARED_CRASH_DUMP \
-  ((int) erts_smp_atomic_xchg(&have_prepared_crash_dump, 1))
+  ((int) erts_smp_atomic32_xchg(&have_prepared_crash_dump, 1))
 #else
 volatile int erts_got_sigusr1;
 #define ERTS_SET_GOT_SIGUSR1 (erts_got_sigusr1 = 1)
@@ -221,10 +225,10 @@ static struct fd_data {
 } *fd_data;			/* indexed by fd */
 
 /* static FUNCTION(int, write_fill, (int, char*, int)); unused? */
-static FUNCTION(void, note_child_death, (int, int));
+static void note_child_death(int, int);
 
 #if CHLDWTHR
-static FUNCTION(void *, child_waiter, (void *));
+static void* child_waiter(void *);
 #endif
 
 /********************* General functions ****************************/
@@ -236,11 +240,11 @@ static int max_files = -1;
  * a few variables used by the break handler 
  */
 #ifdef ERTS_SMP
-erts_smp_atomic_t erts_break_requested;
+erts_smp_atomic32_t erts_break_requested;
 #define ERTS_SET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 1)
+  erts_smp_atomic32_set(&erts_break_requested, (erts_aint32_t) 1)
 #define ERTS_UNSET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 0)
+  erts_smp_atomic32_set(&erts_break_requested, (erts_aint32_t) 0)
 #else
 volatile int erts_break_requested = 0;
 #define ERTS_SET_BREAK_REQUESTED (erts_break_requested = 1)
@@ -384,18 +388,6 @@ MALLOC_USE_HASH(1);
 #endif
 
 #ifdef USE_THREADS
-static void *ethr_internal_alloc(size_t size)
-{
-    return erts_alloc_fnf(ERTS_ALC_T_ETHR_INTERNAL, (Uint) size);
-}
-static void *ethr_internal_realloc(void *ptr, size_t size)
-{
-    return erts_realloc_fnf(ERTS_ALC_T_ETHR_INTERNAL, ptr, (Uint) size);
-}
-static void ethr_internal_free(void *ptr)
-{
-    erts_free(ERTS_ALC_T_ETHR_INTERNAL, ptr);
-}
 
 #ifdef ERTS_THR_HAVE_SIG_FUNCS
 /*
@@ -413,7 +405,7 @@ typedef struct {
 #ifdef ERTS_THR_HAVE_SIG_FUNCS
     sigset_t saved_sigmask;
 #endif
-    int unbind_child;
+    int sched_bind_data;
 } erts_thr_create_data_t;
 
 /*
@@ -424,15 +416,13 @@ static void *
 thr_create_prepare(void)
 {
     erts_thr_create_data_t *tcdp;
-    ErtsSchedulerData *esdp;
 
     tcdp = erts_alloc(ERTS_ALC_T_TMP, sizeof(erts_thr_create_data_t));
 
 #ifdef ERTS_THR_HAVE_SIG_FUNCS
     erts_thr_sigmask(SIG_BLOCK, &thr_create_sigmask, &tcdp->saved_sigmask);
 #endif
-    esdp = erts_get_scheduler_data();
-    tcdp->unbind_child = esdp && erts_is_scheduler_bound(esdp);
+    tcdp->sched_bind_data = erts_sched_bind_atthrcreate_prepare();
 
     return (void *) tcdp;
 }
@@ -444,6 +434,8 @@ thr_create_cleanup(void *vtcdp)
 {
     erts_thr_create_data_t *tcdp = (erts_thr_create_data_t *) vtcdp;
 
+    erts_sched_bind_atthrcreate_parent(tcdp->sched_bind_data);
+
 #ifdef ERTS_THR_HAVE_SIG_FUNCS
     /* Restore signalmask... */
     erts_thr_sigmask(SIG_SETMASK, &tcdp->saved_sigmask, NULL);
@@ -457,6 +449,10 @@ thr_create_prepare_child(void *vtcdp)
 {
     erts_thr_create_data_t *tcdp = (erts_thr_create_data_t *) vtcdp;
 
+#ifdef ERTS_ENABLE_LOCK_COUNT
+    erts_lcnt_thread_setup();
+#endif
+
 #ifndef NO_FPE_SIGNALS
     /*
      * We do not want fp exeptions in other threads than the
@@ -466,12 +462,7 @@ thr_create_prepare_child(void *vtcdp)
     erts_thread_disable_fpe();
 #endif
 
-    if (tcdp->unbind_child) {
-	erts_smp_rwmtx_rlock(&erts_cpu_bind_rwmtx);
-	erts_unbind_from_cpu(erts_cpuinfo);
-	erts_smp_rwmtx_runlock(&erts_cpu_bind_rwmtx);
-    }
-    
+    erts_sched_bind_atthrcreate_child(tcdp->sched_bind_data);
 }
 
 #endif /* #ifdef USE_THREADS */
@@ -484,9 +475,6 @@ erts_sys_pre_init(void)
 #ifdef USE_THREADS
     {
     erts_thr_init_data_t eid = ERTS_THR_INIT_DATA_DEF_INITER;
-    eid.alloc = ethr_internal_alloc;
-    eid.realloc = ethr_internal_realloc;
-    eid.free = ethr_internal_free;
 
     eid.thread_create_child_func = thr_create_prepare_child;
     /* Before creation in parent */
@@ -521,9 +509,9 @@ erts_sys_pre_init(void)
 #endif
     }
 #ifdef ERTS_SMP
-    erts_smp_atomic_init(&erts_break_requested, 0);
-    erts_smp_atomic_init(&erts_got_sigusr1, 0);
-    erts_smp_atomic_init(&have_prepared_crash_dump, 0);
+    erts_smp_atomic32_init(&erts_break_requested, 0);
+    erts_smp_atomic32_init(&erts_got_sigusr1, 0);
+    erts_smp_atomic32_init(&have_prepared_crash_dump, 0);
 #else
     erts_break_requested = 0;
     erts_got_sigusr1 = 0;
@@ -534,13 +522,14 @@ erts_sys_pre_init(void)
 #endif
 #endif /* USE_THREADS */
     erts_smp_atomic_init(&sys_misc_mem_sz, 0);
-    erts_smp_rwmtx_init(&environ_rwmtx, "environ");
 }
 
 void
 erl_sys_init(void)
 {
+    erts_smp_rwmtx_init(&environ_rwmtx, "environ");
 #if !DISABLE_VFORK
+ {
     int res;
     char bindir[MAXPATHLEN];
     size_t bindirsz = sizeof(bindir);
@@ -570,6 +559,7 @@ erl_sys_init(void)
             bindir,
             DIR_SEPARATOR_CHAR,
             CHILD_SETUP_PROG_NAME);
+ }
 #endif
 
 #ifdef USE_SETLINEBUF
@@ -1324,10 +1314,18 @@ static char **build_unix_environment(char *block)
 	}
     }
 
-    for (j = 0; j < i; j++) {
+    for (j = 0; j < i; ) {
         size_t last = strlen(cpp[j])-1;
 	if (cpp[j][last] == '=' && strchr(cpp[j], '=') == cpp[j]+last) {
 	    cpp[j] = cpp[--len];
+	    if (len < i) {
+		i--;
+	    } else {
+		j++;
+	    }
+	}
+	else {
+	    j++;
 	}
     }
 
@@ -1464,9 +1462,7 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* op
 
     CHLD_STAT_LOCK;
 
-    unbind = erts_is_scheduler_bound(NULL);
-    if (unbind)
-	erts_smp_rwmtx_rlock(&erts_cpu_bind_rwmtx);
+    unbind = erts_sched_bind_atfork_prepare();
 
 #if !DISABLE_VFORK
     /* See fork/vfork discussion before this function. */
@@ -1479,7 +1475,7 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* op
 	if (pid == 0) {
 	    /* The child! Setup child... */
 
-	    if (unbind && erts_unbind_from_cpu(erts_cpuinfo) != 0)
+	    if (erts_sched_bind_atfork_child(unbind) != 0)
 		goto child_error;
 
 	    /* OBSERVE!
@@ -1580,8 +1576,7 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* op
 
 	cs_argv[CS_ARGV_PROGNAME_IX] = child_setup_prog;
 	cs_argv[CS_ARGV_WD_IX] = opts->wd ? opts->wd : ".";
-	cs_argv[CS_ARGV_UNBIND_IX]
-	    = (unbind ? erts_get_unbind_from_cpu_str(erts_cpuinfo) : "false");
+	cs_argv[CS_ARGV_UNBIND_IX] = erts_sched_bind_atvfork_child(unbind);
 	cs_argv[CS_ARGV_FD_CR_IX] = fd_close_range;
 	for (i = 0; i < CS_ARGV_NO_OF_DUP2_OPS; i++)
 	    cs_argv[CS_ARGV_DUP2_OP_IX(i)] = &dup2_op[i][0];
@@ -1630,8 +1625,7 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* op
     }
 #endif
 
-    if (unbind)
-	erts_smp_rwmtx_runlock(&erts_cpu_bind_rwmtx);
+    erts_sched_bind_atfork_parent(unbind);
 
     if (pid == -1) {
         saved_errno = errno;
@@ -2563,7 +2557,6 @@ extern Preload pre_loaded[];
 
 void erts_sys_alloc_init(void)
 {
-    elib_ensure_initialized();
 }
 
 void *erts_sys_alloc(ErtsAlcType_t t, void *x, Uint sz)
@@ -3001,11 +2994,27 @@ init_smp_sig_notify(void)
 			NULL,
 			&thr_opts);
 }
+#ifdef __DARWIN__
 
+int erts_darwin_main_thread_pipe[2];
+int erts_darwin_main_thread_result_pipe[2];
+
+static void initialize_darwin_main_thread_pipes(void) 
+{
+    if (pipe(erts_darwin_main_thread_pipe) < 0 || 
+	pipe(erts_darwin_main_thread_result_pipe) < 0) {
+	erl_exit(1,"Fatal error initializing Darwin main thread stealing");
+    }
+}
+
+#endif
 void
 erts_sys_main_thread(void)
 {
     erts_thread_disable_fpe();
+#ifdef __DARWIN__
+    initialize_darwin_main_thread_pipes();
+#endif
     /* Become signal receiver thread... */
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_set_thread_name("signal_receiver");
@@ -3014,6 +3023,27 @@ erts_sys_main_thread(void)
     smp_sig_notify(0); /* Notify initialized */
     while (1) {
 	/* Wait for a signal to arrive... */
+#ifdef __DARWIN__
+	/*
+	 * The wx driver needs to be able to steal the main thread for Cocoa to
+	 * work properly.
+	 */
+	fd_set readfds;
+	int res;
+
+	FD_ZERO(&readfds);
+	FD_SET(erts_darwin_main_thread_pipe[0], &readfds);
+	res = select(erts_darwin_main_thread_pipe[0] + 1, &readfds, NULL, NULL, NULL);
+	if (res > 0 && FD_ISSET(erts_darwin_main_thread_pipe[0],&readfds)) {
+	    void* (*func)(void*);
+	    void* arg;
+	    void *resp;
+	    read(erts_darwin_main_thread_pipe[0],&func,sizeof(void* (*)(void*)));
+	    read(erts_darwin_main_thread_pipe[0],&arg, sizeof(void*));
+	    resp = (*func)(arg);
+	    write(erts_darwin_main_thread_result_pipe[1],&resp,sizeof(void *));
+	}
+#else
 #ifdef DEBUG
 	int res =
 #else
@@ -3022,6 +3052,7 @@ erts_sys_main_thread(void)
 	    select(0, NULL, NULL, NULL, NULL);
 	ASSERT(res < 0);
 	ASSERT(errno == EINTR);
+#endif
     }
 }
 
@@ -3121,226 +3152,3 @@ erl_sys_args(int* argc, char** argv)
     }
     *argc = j;
 }
-
-#ifdef ERTS_TIMER_THREAD
-
-/*
- * Interruptible-wait facility: low-level synchronisation state
- * and methods that are implementation dependent.
- *
- * Constraint: Every implementation must define 'struct erts_iwait'
- * with a field 'erts_smp_atomic_t state;'.
- */
-
-/* values for struct erts_iwait's state field */
-#define IWAIT_WAITING	0
-#define IWAIT_AWAKE	1
-#define IWAIT_INTERRUPT	2
-
-#if 0	/* XXX: needs feature test in erts/configure.in */
-
-/*
- * This is an implementation of the interruptible wait facility on
- * top of Linux-specific futexes.
- */
-#include <asm/unistd.h>
-#define FUTEX_WAIT		0
-#define FUTEX_WAKE		1
-static int sys_futex(void *futex, int op, int val, const struct timespec *timeout)
-{
-    return syscall(__NR_futex, futex, op, val, timeout);
-}
-
-struct erts_iwait {
-    erts_smp_atomic_t state; /* &state.counter is our futex */
-};
-
-static void iwait_lowlevel_init(struct erts_iwait *iwait) { /* empty */ }
-
-static void iwait_lowlevel_wait(struct erts_iwait *iwait, struct timeval *delay)
-{
-    struct timespec timeout;
-    int res;
-
-    timeout.tv_sec = delay->tv_sec;
-    timeout.tv_nsec = delay->tv_usec * 1000;
-    res = sys_futex((void*)&iwait->state.counter, FUTEX_WAIT, IWAIT_WAITING, &timeout);
-    if (res < 0 && errno != ETIMEDOUT && errno != EWOULDBLOCK && errno != EINTR)
-	perror("FUTEX_WAIT");
-}
-
-static void iwait_lowlevel_interrupt(struct erts_iwait *iwait)
-{
-    int res = sys_futex((void*)&iwait->state.counter, FUTEX_WAKE, 1, NULL);
-    if (res < 0)
-	perror("FUTEX_WAKE");
-}
-
-#else	/* using poll() or select() */
-
-/*
- * This is an implementation of the interruptible wait facility on
- * top of pipe(), poll() or select(), read(), and write().
- */
-struct erts_iwait {
-    erts_smp_atomic_t state;
-    int read_fd;	/* wait polls and reads this fd */
-    int write_fd;	/* interrupt writes this fd */
-};
-
-static void iwait_lowlevel_init(struct erts_iwait *iwait)
-{
-    int fds[2];
-
-    if (pipe(fds) < 0) {
-	perror("pipe()");
-	exit(1);
-    }
-    iwait->read_fd = fds[0];
-    iwait->write_fd = fds[1];
-}
-
-#if defined(ERTS_USE_POLL)
-
-#include <sys/poll.h>
-#define PERROR_POLL "poll()"
-
-static int iwait_lowlevel_poll(int read_fd, struct timeval *delay)
-{
-    struct pollfd pollfd;
-    int timeout;
-
-    pollfd.fd = read_fd;
-    pollfd.events = POLLIN;
-    pollfd.revents = 0;
-    timeout = delay->tv_sec * 1000 + delay->tv_usec / 1000;
-    return poll(&pollfd, 1, timeout);
-}
-
-#else	/* !ERTS_USE_POLL */
-
-#include <sys/select.h>
-#define PERROR_POLL "select()"
-
-static int iwait_lowlevel_poll(int read_fd, struct timeval *delay)
-{
-    fd_set readfds;
-
-    FD_ZERO(&readfds);
-    FD_SET(read_fd, &readfds);
-    return select(read_fd + 1, &readfds, NULL, NULL, delay);
-}
-
-#endif	/* !ERTS_USE_POLL */
-
-static void iwait_lowlevel_wait(struct erts_iwait *iwait, struct timeval *delay)
-{
-    int res;
-    char buf[64];
-
-    res = iwait_lowlevel_poll(iwait->read_fd, delay);
-    if (res > 0)
-	(void)read(iwait->read_fd, buf, sizeof buf);
-    else if (res < 0 && errno != EINTR)
-	perror(PERROR_POLL);
-}
-
-static void iwait_lowlevel_interrupt(struct erts_iwait *iwait)
-{
-    int res = write(iwait->write_fd, "!", 1);
-    if (res < 0)
-	perror("write()");
-}
-
-#endif	/* using poll() or select() */
-
-#if 0	/* not using poll() or select() */
-/*
- * This is an implementation of the interruptible wait facility on
- * top of pthread_cond_timedwait(). This has two problems:
- * 1. pthread_cond_timedwait() requires an absolute time point,
- *    so the relative delay must be converted to absolute time.
- *    Worse, this breaks if the machine's time is adjusted while
- *    we're preparing to wait.
- * 2. Each cond operation requires additional mutex lock/unlock operations.
- *
- * Problem 2 is probably not too bad on Linux (they'll just become
- * relatively cheap futex operations), but problem 1 is the real killer.
- * Only use this implementation if no better alternatives are available!
- */
-struct erts_iwait {
-    erts_smp_atomic_t state;
-    pthread_cond_t cond;
-    pthread_mutex_t mutex;
-};
-
-static void iwait_lowlevel_init(struct erts_iwait *iwait)
-{
-    iwait->cond = (pthread_cond_t) PTHREAD_COND_INITIALIZER;
-    iwait->mutex = (pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER;
-}
-
-static void iwait_lowlevel_wait(struct erts_iwait *iwait, struct timeval *delay)
-{
-    struct timeval tmp;
-    struct timespec timeout;
-
-    /* Due to pthread_cond_timedwait()'s use of absolute
-       time, this must be the real gettimeofday(), _not_
-       the "smoothed" one beam/erl_time_sup.c implements. */
-    gettimeofday(&tmp, NULL);
-
-    tmp.tv_sec += delay->tv_sec;
-    tmp.tv_usec += delay->tv_usec;
-    if (tmp.tv_usec >= 1000*1000) {
-	tmp.tv_usec -= 1000*1000;
-	tmp.tv_sec += 1;
-    }
-    timeout.tv_sec = tmp.tv_sec;
-    timeout.tv_nsec = tmp.tv_usec * 1000;
-    pthread_mutex_lock(&iwait->mutex);
-    pthread_cond_timedwait(&iwait->cond, &iwait->mutex, &timeout);
-    pthread_mutex_unlock(&iwait->mutex);
-}
-
-static void iwait_lowlevel_interrupt(struct erts_iwait *iwait)
-{
-    pthread_mutex_lock(&iwait->mutex);
-    pthread_cond_signal(&iwait->cond);
-    pthread_mutex_unlock(&iwait->mutex);
-}
-
-#endif /* not using POLL */
-
-/*
- * Interruptible-wait facility. This is just a wrapper around the
- * low-level synchronisation code, where we maintain our logical
- * state in order to suppress some state transitions.
- */
-
-struct erts_iwait *erts_iwait_init(void)
-{
-    struct erts_iwait *iwait = malloc(sizeof *iwait);
-    if (!iwait) {
-	perror("malloc");
-	exit(1);
-    }
-    iwait_lowlevel_init(iwait);
-    erts_smp_atomic_init(&iwait->state, IWAIT_AWAKE);
-    return iwait;
-}
-
-void erts_iwait_wait(struct erts_iwait *iwait, struct timeval *delay)
-{
-    if (erts_smp_atomic_xchg(&iwait->state, IWAIT_WAITING) != IWAIT_INTERRUPT)
-	iwait_lowlevel_wait(iwait, delay);
-    erts_smp_atomic_set(&iwait->state, IWAIT_AWAKE);
-}
-
-void erts_iwait_interrupt(struct erts_iwait *iwait)
-{
-    if (erts_smp_atomic_xchg(&iwait->state, IWAIT_INTERRUPT) == IWAIT_WAITING)
-	iwait_lowlevel_interrupt(iwait);
-}
-
-#endif /* ERTS_TIMER_THREAD */
diff --git a/erts/emulator/sys/unix/sys_float.c b/erts/emulator/sys/unix/sys_float.c
index c59c99f65e..8ec7b31ce0 100644
--- a/erts/emulator/sys/unix/sys_float.c
+++ b/erts/emulator/sys/unix/sys_float.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2001-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2011. 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
@@ -36,11 +36,6 @@ erts_sys_init_float(void)
 # endif
 }
 
-static ERTS_INLINE void set_current_fp_exception(unsigned long pc)
-{
-    /* nothing to do */
-}
-
 #else  /* !NO_FPE_SIGNALS */
 
 #ifdef ERTS_SMP
@@ -476,7 +471,7 @@ static int mask_fpe(void)
 
 #endif
 
-#if (defined(__linux__) && (defined(__i386__) || defined(__x86_64__) || defined(__sparc__) || defined(__powerpc__))) || (defined(__DARWIN__) && (defined(__i386__) || defined(__x86_64__) || defined(__ppc__))) || (defined(__FreeBSD__) && (defined(__x86_64__) || defined(__i386__))) || (defined(__OpenBSD__) && defined(__x86_64__)) || (defined(__sun__) && defined(__x86_64__))
+#if (defined(__linux__) && (defined(__i386__) || defined(__x86_64__) || defined(__sparc__) || defined(__powerpc__))) || (defined(__DARWIN__) && (defined(__i386__) || defined(__x86_64__) || defined(__ppc__))) || (defined(__FreeBSD__) && (defined(__x86_64__) || defined(__i386__))) || ((defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)) || (defined(__sun__) && defined(__x86_64__))
 
 #if defined(__linux__) && defined(__i386__)
 #if !defined(X86_FXSR_MAGIC)
@@ -519,6 +514,10 @@ static int mask_fpe(void)
 #define mc_pc(mc)	((mc)->mc_rip)
 #elif defined(__FreeBSD__) && defined(__i386__)
 #define mc_pc(mc)	((mc)->mc_eip)
+#elif defined(__NetBSD__) && defined(__x86_64__)
+#define mc_pc(mc)	((mc)->__gregs[_REG_RIP])
+#elif defined(__NetBSD__) && defined(__i386__)
+#define mc_pc(mc)	((mc)->__gregs[_REG_EIP])
 #elif defined(__OpenBSD__) && defined(__x86_64__)
 #define mc_pc(mc)	((mc)->sc_rip)
 #elif defined(__sun__) && defined(__x86_64__)
@@ -610,6 +609,23 @@ static void fpe_sig_action(int sig, siginfo_t *si, void *puc)
 	struct env87 *env87 = &savefpu->sv_87.sv_env;
 	env87->en_sw &= ~0xFF;
     }
+#elif defined(__NetBSD__) && defined(__x86_64__)
+    mcontext_t *mc = &uc->uc_mcontext;
+    struct fxsave64 *fxsave = (struct fxsave64 *)&mc->__fpregs;
+    pc = mc_pc(mc);
+    fxsave->fx_mxcsr = 0x1F80;
+    fxsave->fx_fsw &= ~0xFF;
+#elif defined(__NetBSD__) && defined(__i386__)
+    mcontext_t *mc = &uc->uc_mcontext;
+    pc = mc_pc(mc);
+    if (uc->uc_flags & _UC_FXSAVE) {
+	struct envxmm *envxmm = (struct envxmm *)&mc->__fpregs;
+	envxmm->en_mxcsr = 0x1F80;
+	envxmm->en_sw &= ~0xFF;
+    } else {
+	struct env87 *env87 = (struct env87 *)&mc->__fpregs;
+	env87->en_sw &= ~0xFF;
+    }
 #elif defined(__OpenBSD__) && defined(__x86_64__)
     struct fxsave64 *fxsave = uc->sc_fpstate;
     pc = mc_pc(uc);
@@ -799,8 +815,17 @@ sys_chars_to_double(char* buf, double* fp)
     }
 
 #ifdef NO_FPE_SIGNALS
-    if (errno == ERANGE && (*fp == 0.0 || *fp == HUGE_VAL || *fp == -HUGE_VAL)) {
-	return -1;
+    if (errno == ERANGE) {
+	if (*fp == HUGE_VAL || *fp == -HUGE_VAL) {
+	    /* overflow, should give error */
+	    return -1;
+	} else if (t == s && *fp == 0.0) {
+	    /* This should give 0.0 - OTP-7178 */
+	    errno = 0;
+
+	} else if (*fp == 0.0) {
+	    return -1;
+	}
     }
 #endif
     return 0;
@@ -810,7 +835,9 @@ int
 matherr(struct exception *exc)
 {
 #if !defined(NO_FPE_SIGNALS)
-    set_current_fp_exception((unsigned long)__builtin_return_address(0));
+    volatile unsigned long *fpexnp = erts_get_current_fp_exception();
+    if (fpexnp != NULL)
+	*fpexnp = (unsigned long)__builtin_return_address(0);
 #endif
     return 1;
 }
diff --git a/erts/emulator/sys/vxworks/sys.c b/erts/emulator/sys/vxworks/sys.c
index 411b4b37cf..c6e7b65f32 100644
--- a/erts/emulator/sys/vxworks/sys.c
+++ b/erts/emulator/sys/vxworks/sys.c
@@ -85,7 +85,7 @@ EXTERN_FUNCTION(void, erl_exit, (int n, char*, _DOTS_));
 EXTERN_FUNCTION(void, erl_error, (char*, va_list));
 EXTERN_FUNCTION(int, driver_interrupt, (int, int));
 EXTERN_FUNCTION(void, increment_time, (int));
-EXTERN_FUNCTION(int, next_time, (_VOID_));
+EXTERN_FUNCTION(int, erts_next_time, (_VOID_));
 EXTERN_FUNCTION(void, set_reclaim_free_function, (FreeFunction));
 EXTERN_FUNCTION(int, erl_mem_info_get, (MEM_PART_STATS *));
 EXTERN_FUNCTION(void, erl_crash_dump, (char* file, int line, char* fmt, ...));
diff --git a/erts/emulator/sys/win32/erl_poll.c b/erts/emulator/sys/win32/erl_poll.c
index a766fe9575..1f2877b682 100644
--- a/erts/emulator/sys/win32/erl_poll.c
+++ b/erts/emulator/sys/win32/erl_poll.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2007-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2007-2011. 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
@@ -274,7 +274,6 @@ struct ErtsPollSet_ {
     Waiter** waiter;
     int allocated_waiters;  /* Size ow waiter array */ 
     int num_waiters;	    /* Number of waiter threads. */
-    erts_atomic_t sys_io_ready; /* Tells us there is I/O ready (already). */
     int restore_events;        /* Tells us to restore waiters events 
 				  next time around */
     HANDLE event_io_ready;     /* To be used when waiting for io */
@@ -282,12 +281,11 @@ struct ErtsPollSet_ {
     volatile int standby_wait_counter; /* Number of threads to wait for */
     CRITICAL_SECTION standby_crit;     /* CS to guard the counter */
     HANDLE standby_wait_event;         /* Event signalled when counte == 0 */
+    erts_atomic32_t wakeup_state;
 #ifdef ERTS_SMP
-    erts_smp_atomic_t woken;
     erts_smp_mtx_t mtx;
-    erts_smp_atomic_t interrupt;
 #endif
-    erts_smp_atomic_t timeout;
+    erts_smp_atomic32_t timeout;
 };
 
 #ifdef ERTS_SMP
@@ -296,126 +294,24 @@ struct ErtsPollSet_ {
   erts_smp_mtx_lock(&(PS)->mtx)
 #define ERTS_POLLSET_UNLOCK(PS) \
   erts_smp_mtx_unlock(&(PS)->mtx)
-#define ERTS_POLLSET_SET_POLLED_CHK(PS) \
-  ((int) erts_smp_atomic_xchg(&(PS)->polled, (long) 1))
-#define ERTS_POLLSET_SET_POLLED(PS) \
-  erts_smp_atomic_set(&(PS)->polled, (long) 1)
-#define ERTS_POLLSET_UNSET_POLLED(PS) \
-  erts_smp_atomic_set(&(PS)->polled, (long) 0)
-#define ERTS_POLLSET_IS_POLLED(PS) \
-  ((int) erts_smp_atomic_read(&(PS)->polled))
-
-#define ERTS_POLLSET_SET_POLLER_WOKEN_CHK(PS) set_poller_woken_chk((PS))
-#define ERTS_POLLSET_SET_POLLER_WOKEN(PS) 				\
-do {									\
-      ERTS_THR_MEMORY_BARRIER;						\
-      erts_smp_atomic_set(&(PS)->woken, (long) 1);			\
-} while (0)
-#define ERTS_POLLSET_UNSET_POLLER_WOKEN(PS)				\
-do {									\
-    erts_smp_atomic_set(&(PS)->woken, (long) 0);			\
-    ERTS_THR_MEMORY_BARRIER;						\
-} while (0)
-#define ERTS_POLLSET_IS_POLLER_WOKEN(PS)				\
-  ((int) erts_smp_atomic_read(&(PS)->woken))
-
-#define ERTS_POLLSET_UNSET_INTERRUPTED_CHK(PS) unset_interrupted_chk((PS))
-#define ERTS_POLLSET_UNSET_INTERRUPTED(PS)				\
-do {									\
-    erts_smp_atomic_set(&(PS)->interrupt, (long) 0);			\
-    ERTS_THR_MEMORY_BARRIER;						\
-} while (0)
-#define ERTS_POLLSET_SET_INTERRUPTED(PS) 				\
-do {									\
-      ERTS_THR_MEMORY_BARRIER;						\
-      erts_smp_atomic_set(&(PS)->interrupt, (long) 1);			\
-} while (0)
-#define ERTS_POLLSET_IS_INTERRUPTED(PS)					\
-  ((int) erts_smp_atomic_read(&(PS)->interrupt))
-
-static ERTS_INLINE int
-unset_interrupted_chk(ErtsPollSet ps)
-{
-    int res = (int) erts_smp_atomic_xchg(&ps->interrupt, (long) 0);
-    ERTS_THR_MEMORY_BARRIER;
-    return res;
-
-}
-
-static ERTS_INLINE int
-set_poller_woken_chk(ErtsPollSet ps)
-{
-    ERTS_THR_MEMORY_BARRIER;
-    return (int) erts_smp_atomic_xchg(&ps->woken, (long) 1);
-}
 
 #else
 
 #define ERTS_POLLSET_LOCK(PS)
 #define ERTS_POLLSET_UNLOCK(PS)
-#define ERTS_POLLSET_SET_POLLED_CHK(PS) 0
-#define ERTS_POLLSET_UNSET_POLLED(PS)
-#define ERTS_POLLSET_IS_POLLED(PS) 0
-#define ERTS_POLLSET_SET_POLLER_WOKEN_CHK(PS) 1
-#define ERTS_POLLSET_SET_POLLER_WOKEN(PS)
-#define ERTS_POLLSET_UNSET_POLLER_WOKEN(PS)
-#define ERTS_POLLSET_IS_POLLER_WOKEN(PS) 1
-
 
 #endif
 
 /*
- * While atomics are not yet implemented for windows in the common library...
- *
- * MSDN doc states that SMP machines and old compilers require
- * InterLockedExchange to properly read and write interlocked
- * variables, otherwise the processors might reschedule
- * the access and order of atomics access is destroyed... 
- * While they only mention it in white-papers, the problem
- * in VS2003 is due to the IA64 arch, so we can still count
- * on the CPU not rescheduling the access to volatile in X86 arch using 
- * even the slightly older compiler...
- *
- * So here's (hopefully) a subset of the generally working atomic 
- * variable access...
- */
-
-#if defined(__GNUC__)
-#  if defined(__i386__) || defined(__x86_64__)
-#    define VOLATILE_IN_SEQUENCE 1
-#  else
-#    define VOLATILE_IN_SEQUENCE 0
-#  endif 
-#elif defined(_MSC_VER)
-#  if _MSC_VER < 1300
-#    define VOLATILE_IN_SEQUENCE 0 /* Dont trust really old compilers */
-#  else
-#    if defined(_M_IX86)
-#      define VOLATILE_IN_SEQUENCE 1
-#    else /* I.e. IA64 */
-#      if _MSC_VER >= 1400 
-#        define VOLATILE_IN_SEQUENCE 1
-#      else
-#        define VOLATILE_IN_SEQUENCE 0
-#      endif
-#    endif
-#  endif
-#else
-# define VOLATILE_IN_SEQUENCE 0
-#endif
- 
-
-
-/*
  * Communication with sys_interrupt
  */
 
 #ifdef ERTS_SMP
-extern erts_smp_atomic_t erts_break_requested;
+extern erts_smp_atomic32_t erts_break_requested;
 #define ERTS_SET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 1)
+  erts_smp_atomic32_set(&erts_break_requested, (erts_aint32_t) 1)
 #define ERTS_UNSET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 0)
+  erts_smp_atomic32_set(&erts_break_requested, (erts_aint32_t) 0)
 #else
 extern volatile int erts_break_requested;
 #define ERTS_SET_BREAK_REQUESTED (erts_break_requested = 1)
@@ -424,7 +320,7 @@ extern volatile int erts_break_requested;
 
 static erts_mtx_t break_waiter_lock;
 static HANDLE break_happened_event;
-static erts_atomic_t break_waiter_state;
+static erts_atomic32_t break_waiter_state;
 #define BREAK_WAITER_GOT_BREAK 1
 #define BREAK_WAITER_GOT_HALT 2
 
@@ -467,29 +363,168 @@ do { \
     wait_standby(PS); \
  } while(0)
 
-#if ERTS_POLL_ASYNC_INTERRUPT_SUPPORT && !defined(ERTS_SMP)
+#define ERTS_POLL_NOT_WOKEN		((erts_aint32_t) 0)
+#define ERTS_POLL_WOKEN_IO_READY	((erts_aint32_t) 1)
+#define ERTS_POLL_WOKEN_INTR		((erts_aint32_t) 2)
+#define ERTS_POLL_WOKEN_TIMEDOUT	((erts_aint32_t) 3)
 
 static ERTS_INLINE int
-unset_interrupted_chk(ErtsPollSet ps)
+is_io_ready(ErtsPollSet ps)
 {
-    /* This operation isn't atomic, but we have no need at all for an
-       atomic operation here... */
-    int res = ps->interrupt;
-    ps->interrupt = 0;
-    return res;
+    return erts_atomic32_read(&ps->wakeup_state) == ERTS_POLL_WOKEN_IO_READY;
 }
 
+static ERTS_INLINE void
+woke_up(ErtsPollSet ps)
+{
+    if (erts_atomic32_read(&ps->wakeup_state) == ERTS_POLL_NOT_WOKEN)
+	erts_atomic32_cmpxchg(&ps->wakeup_state,
+			      ERTS_POLL_WOKEN_TIMEDOUT,
+			      ERTS_POLL_NOT_WOKEN);
+#ifdef DEBUG
+    {
+	erts_aint32_t wakeup_state = erts_atomic32_read(&ps->wakeup_state);
+	switch (wakeup_state) {
+	case ERTS_POLL_WOKEN_IO_READY:
+	case ERTS_POLL_WOKEN_INTR:
+	case ERTS_POLL_WOKEN_TIMEDOUT:
+	    break;
+	default:
+	    ASSERT(0);
+	    break;
+	}
+    }
 #endif
+}
+
+static ERTS_INLINE int
+wakeup_cause(ErtsPollSet ps)
+{
+    int res;
+    erts_aint32_t wakeup_state = erts_atomic32_read(&ps->wakeup_state);
+    switch (wakeup_state) {
+    case ERTS_POLL_WOKEN_IO_READY:
+	res = 0;
+	break;
+    case ERTS_POLL_WOKEN_INTR:
+	res = EINTR;
+	break;
+    case ERTS_POLL_WOKEN_TIMEDOUT:
+	res = ETIMEDOUT;
+	break;
+    default:
+	res = 0;
+	erl_exit(ERTS_ABORT_EXIT,
+		 "%s:%d: Internal error: Invalid wakeup_state=%d\n",
+		 __FILE__, __LINE__, (int) wakeup_state);
+    }
+    return res;
+}
+
+static ERTS_INLINE DWORD
+poll_wait_timeout(ErtsPollSet ps, SysTimeval *tvp)
+{
+    time_t timeout = tvp->tv_sec * 1000 + tvp->tv_usec / 1000;
+
+    if (timeout <= 0) {
+	woke_up(ps);
+	return (DWORD) 0;
+    }
+
+    ResetEvent(ps->event_io_ready);
+    /*
+     * Since we don't know the internals of ResetEvent() we issue
+     * a memory barrier as a safety precaution ensuring that
+     * the load of wakeup_state wont be reordered with stores made
+     * by ResetEvent().
+     */
+    ERTS_THR_MEMORY_BARRIER;
+    if (erts_atomic32_read(&ps->wakeup_state) != ERTS_POLL_NOT_WOKEN)
+	return (DWORD) 0;
+
+    if (timeout > ERTS_AINT32_T_MAX) /* Also prevents DWORD overflow */
+	timeout = ERTS_AINT32_T_MAX;
+
+    erts_smp_atomic32_set_relb(&ps->timeout, (erts_aint32_t) timeout);
+    return (DWORD) timeout;
+}
 
-#ifdef ERTS_SMP
 static ERTS_INLINE void
-wake_poller(ErtsPollSet ps)
+wake_poller(ErtsPollSet ps, int io_ready)
 {
-    if (!ERTS_POLLSET_SET_POLLER_WOKEN_CHK(ps)) {
+    erts_aint32_t wakeup_state = erts_atomic32_read(&ps->wakeup_state);
+    if (io_ready) {
+	/* We may set the event multiple times. This is, however, harmless. */
+	erts_atomic32_set(&ps->wakeup_state, ERTS_POLL_WOKEN_IO_READY);
+    }
+    else {
+	while (wakeup_state != ERTS_POLL_WOKEN_IO_READY
+	       && wakeup_state != ERTS_POLL_WOKEN_INTR) {
+	    erts_aint32_t act = erts_atomic32_cmpxchg(&ps->wakeup_state,
+						      ERTS_POLL_WOKEN_INTR,
+						      wakeup_state);
+	    if (act == wakeup_state) {
+		wakeup_state = act;
+		break;
+	    }
+	    wakeup_state = act;
+	}
+    }
+    if (wakeup_state == ERTS_POLL_NOT_WOKEN) {
+	/*
+	 * Since we don't know the internals of SetEvent() we issue
+	 * a memory barrier as a safety precaution ensuring that
+	 * the store we just made to wakeup_state wont be reordered
+	 * with loads in SetEvent().
+	 */
+	ERTS_THR_MEMORY_BARRIER;
 	SetEvent(ps->event_io_ready);
     }
 }
-#endif
+
+static ERTS_INLINE void
+reset_io_ready(ErtsPollSet ps)
+{
+    erts_atomic32_set(&ps->wakeup_state, ERTS_POLL_NOT_WOKEN);
+}
+
+static ERTS_INLINE void
+restore_io_ready(ErtsPollSet ps)
+{
+    erts_atomic32_set(&ps->wakeup_state, ERTS_POLL_WOKEN_IO_READY);
+}
+
+/*
+ * notify_io_ready() is used by threads waiting for events, when
+ * notifying a poller thread about I/O ready.
+ */
+static ERTS_INLINE void
+notify_io_ready(ErtsPollSet ps)
+{
+    wake_poller(ps, 1);
+}
+
+static ERTS_INLINE void
+reset_interrupt(ErtsPollSet ps)
+{
+    /* We need to keep io-ready if set */
+    erts_aint32_t wakeup_state = erts_atomic32_read(&ps->wakeup_state);
+    while (wakeup_state != ERTS_POLL_WOKEN_IO_READY
+	   && wakeup_state != ERTS_POLL_NOT_WOKEN) {
+	erts_aint32_t act = erts_atomic32_cmpxchg(&ps->wakeup_state,
+						  ERTS_POLL_NOT_WOKEN,
+						  wakeup_state);
+	if (wakeup_state == act)
+	    break;
+	wakeup_state = act;
+    }
+}
+
+static ERTS_INLINE void
+set_interrupt(ErtsPollSet ps)
+{
+    wake_poller(ps, 0);
+}
 
 static void setup_standby_wait(ErtsPollSet ps, int num_threads)
 {
@@ -653,14 +688,14 @@ static void *break_waiter(void *param)
 	case WAIT_OBJECT_0:
 	    ResetEvent(harr[0]);
 	    erts_mtx_lock(&break_waiter_lock);
-	    erts_atomic_set(&break_waiter_state,BREAK_WAITER_GOT_BREAK);
+	    erts_atomic32_set(&break_waiter_state,BREAK_WAITER_GOT_BREAK);
 	    SetEvent(break_happened_event);
 	    erts_mtx_unlock(&break_waiter_lock);
 	    break;
 	case (WAIT_OBJECT_0+1):
 	    ResetEvent(harr[1]);
 	    erts_mtx_lock(&break_waiter_lock);
-	    erts_atomic_set(&break_waiter_state,BREAK_WAITER_GOT_HALT);
+	    erts_atomic32_set(&break_waiter_state,BREAK_WAITER_GOT_HALT);
 	    SetEvent(break_happened_event);
 	    erts_mtx_unlock(&break_waiter_lock);
 	    break;
@@ -767,12 +802,7 @@ event_happened:
 	    consistency_check(w);
 #endif
 	    ASSERT(WAIT_OBJECT_0 < i && i < WAIT_OBJECT_0+w->active_events);
-	    if (!erts_atomic_xchg(&ps->sys_io_ready,1)) { 
-		HARDDEBUGF(("SET EventIoReady (%d)",erts_atomic_read(&ps->sys_io_ready)));
-		SetEvent(ps->event_io_ready);
-	    } else {
-		HARDDEBUGF(("DONT SET EventIoReady"));
-	    }
+	    notify_io_ready(ps);
 
 	    /* 
 	     * The main thread wont start working on our arrays untill we're
@@ -967,15 +997,10 @@ static int cancel_driver_select(ErtsPollSet ps, HANDLE event)
 void  erts_poll_interrupt(ErtsPollSet ps, int set /* bool */)
 {
     HARDTRACEF(("In erts_poll_interrupt(%d)",set));
-#ifdef ERTS_SMP
-    if (set) {
-	ERTS_POLLSET_SET_INTERRUPTED(ps);
-	wake_poller(ps);
-    }
-    else {
-	ERTS_POLLSET_UNSET_INTERRUPTED(ps);
-    }
-#endif
+    if (!set)
+	reset_interrupt(ps);
+    else
+	set_interrupt(ps);
     HARDTRACEF(("Out erts_poll_interrupt(%d)",set));
 }
 
@@ -984,17 +1009,10 @@ void erts_poll_interrupt_timed(ErtsPollSet ps,
 			       long msec)
 {
     HARDTRACEF(("In erts_poll_interrupt_timed(%d,%ld)",set,msec));
-#ifdef ERTS_SMP
-    if (set) {
-	if (erts_smp_atomic_read(&ps->timeout) > msec) {
-	    ERTS_POLLSET_SET_INTERRUPTED(ps);
-	    wake_poller(ps);
-	}
-    }
-    else {
-	ERTS_POLLSET_UNSET_INTERRUPTED(ps);
-    }
-#endif
+    if (!set)
+	reset_interrupt(ps);
+    else if (erts_smp_atomic32_read_acqb(&ps->timeout) > (erts_aint32_t) msec)
+	set_interrupt(ps);
     HARDTRACEF(("Out erts_poll_interrupt_timed"));
 }
 
@@ -1068,10 +1086,8 @@ void erts_poll_controlv(ErtsPollSet ps,
 int erts_poll_wait(ErtsPollSet ps,
 		   ErtsPollResFd pr[],
 		   int *len,
-		   SysTimeval *utvp)
+		   SysTimeval *tvp)
 {
-    SysTimeval *tvp = utvp;
-    SysTimeval itv;
     int no_fds;
     DWORD timeout;
     EventData* ev;
@@ -1084,7 +1100,7 @@ int erts_poll_wait(ErtsPollSet ps,
     HARDTRACEF(("In erts_poll_wait"));
     ERTS_POLLSET_LOCK(ps);
 
-    if (!erts_atomic_read(&ps->sys_io_ready) && ps->restore_events) {
+    if (!is_io_ready(ps) && ps->restore_events) {
 	HARDDEBUGF(("Restore events: %d",ps->num_waiters));
 	ps->restore_events = 0;
 	for (i = 0; i < ps->num_waiters; ++i) {
@@ -1102,7 +1118,7 @@ int erts_poll_wait(ErtsPollSet ps,
 	       if (w->highwater != w->active_events) {
 		   HARDDEBUGF(("Oups!"));
 		   /* Oups, got signalled before we took the lock, can't reset */
-		   if(erts_atomic_read(&ps->sys_io_ready) == 0) {
+		   if(!is_io_ready(ps)) {
 		       erl_exit(1,"Internal error: "
 				"Inconsistent io structures in erl_poll.\n");
 		   }
@@ -1127,39 +1143,27 @@ int erts_poll_wait(ErtsPollSet ps,
 	no_fds = ERTS_POLL_MAX_RES;
 #endif
 
+    timeout = poll_wait_timeout(ps, tvp);
 
-    ResetEvent(ps->event_io_ready);
-    ERTS_POLLSET_UNSET_POLLER_WOKEN(ps);
-
-#ifdef ERTS_SMP
-    if (ERTS_POLLSET_IS_INTERRUPTED(ps)) {
-	/* Interrupt use zero timeout */
-	itv.tv_sec = 0;
-	itv.tv_usec = 0;
-	tvp = &itv;
-    }
-#endif
-
-    timeout = tvp->tv_sec * 1000 + tvp->tv_usec / 1000;
     /*HARDDEBUGF(("timeout = %ld",(long) timeout));*/
-    erts_smp_atomic_set(&ps->timeout, timeout);
 
-    if (timeout > 0 && ! erts_atomic_read(&ps->sys_io_ready) && ! erts_atomic_read(&break_waiter_state)) {
+    if (timeout > 0 && !erts_atomic32_read(&break_waiter_state)) {
 	HANDLE harr[2] = {ps->event_io_ready, break_happened_event};
 	int num_h = 2;
 
-	HARDDEBUGF(("Start waiting %d [%d]",num_h, (long) timeout));
+	HARDDEBUGF(("Start waiting %d [%d]",num_h, (int) timeout));
 	ERTS_POLLSET_UNLOCK(ps);
 	WaitForMultipleObjects(num_h, harr, FALSE, timeout);
 	ERTS_POLLSET_LOCK(ps);
-	HARDDEBUGF(("Stop waiting %d [%d]",num_h, (long) timeout));
+	HARDDEBUGF(("Stop waiting %d [%d]",num_h, (int) timeout));
+	woke_up(ps);
     }
 
     ERTS_UNSET_BREAK_REQUESTED;
-    if(erts_atomic_read(&break_waiter_state)) {
+    if(erts_atomic32_read(&break_waiter_state)) {
 	erts_mtx_lock(&break_waiter_lock);
-	break_state = erts_atomic_read(&break_waiter_state);
-	erts_atomic_set(&break_waiter_state,0);
+	break_state = erts_atomic32_read(&break_waiter_state);
+	erts_atomic32_set(&break_waiter_state,0);
 	ResetEvent(break_happened_event);
 	erts_mtx_unlock(&break_waiter_lock);
 	switch (break_state) {
@@ -1174,15 +1178,13 @@ int erts_poll_wait(ErtsPollSet ps,
 	}
     }
 
-    ERTS_POLLSET_SET_POLLER_WOKEN(ps);
-
-    if (!erts_atomic_read(&ps->sys_io_ready)) {
-	res = EINTR;
-	HARDDEBUGF(("EINTR!"));
-	goto done; 
+    res = wakeup_cause(ps);
+    if (res != 0) {
+	HARDDEBUGF(("%s!", res == EINTR ? "EINTR" : "ETIMEDOUT"));
+	goto done;
     }
 
-    erts_atomic_set(&ps->sys_io_ready,0);
+    reset_io_ready(ps);
 
     n = ps->num_waiters;	
 
@@ -1204,9 +1206,9 @@ int erts_poll_wait(ErtsPollSet ps,
 	    if (num >= no_fds) {
 		w->highwater=j+1;
 		erts_mtx_unlock(&w->mtx);
-		/* This might mean we still have data to report, set
-		   back the global flag! */
-		erts_atomic_set(&ps->sys_io_ready,1);
+		/* This might mean we still have data to report,
+		   restore flag indicating I/O ready! */
+		restore_io_ready(ps);
 		HARDDEBUGF(("To many FD's to report!"));
 		goto done;
 	    }
@@ -1228,7 +1230,7 @@ int erts_poll_wait(ErtsPollSet ps,
 	erts_mtx_unlock(&w->mtx);
     }
  done:
-    erts_smp_atomic_set(&ps->timeout, LONG_MAX);
+    erts_smp_atomic32_set(&ps->timeout, ERTS_AINT32_T_MAX);
     *len = num;
     ERTS_POLLSET_UNLOCK(ps);
     HARDTRACEF(("Out erts_poll_wait"));
@@ -1306,15 +1308,13 @@ ErtsPollSet erts_poll_create_pollset(void)
     ps->standby_wait_counter = 0;
     ps->event_io_ready = CreateManualEvent(FALSE);
     ps->standby_wait_event = CreateManualEvent(FALSE); 
-    erts_atomic_init(&ps->sys_io_ready,0);
     ps->restore_events = 0;
 
+    erts_atomic32_init(&ps->wakeup_state, ERTS_POLL_NOT_WOKEN);
 #ifdef ERTS_SMP
-    erts_smp_atomic_init(&ps->woken, 0);
     erts_smp_mtx_init(&ps->mtx, "pollset");
-    erts_smp_atomic_init(&ps->interrupt, 0);
 #endif
-    erts_smp_atomic_init(&ps->timeout, LONG_MAX);
+    erts_smp_atomic32_init(&ps->timeout, ERTS_AINT32_T_MAX);
 
     HARDTRACEF(("Out erts_poll_create_pollset"));
     return ps;
@@ -1366,7 +1366,7 @@ void  erts_poll_init(void)
 
     erts_mtx_init(&break_waiter_lock,"break_waiter_lock");
     break_happened_event = CreateManualEvent(FALSE);
-    erts_atomic_init(&break_waiter_state, 0); 
+    erts_atomic32_init(&break_waiter_state, 0); 
 
     erts_thr_create(&thread, &break_waiter, NULL, NULL);
     ERTS_UNSET_BREAK_REQUESTED;
diff --git a/erts/emulator/sys/win32/erl_win_dyn_driver.h b/erts/emulator/sys/win32/erl_win_dyn_driver.h
index 4949998abc..1347eead91 100644
--- a/erts/emulator/sys/win32/erl_win_dyn_driver.h
+++ b/erts/emulator/sys/win32/erl_win_dyn_driver.h
@@ -87,15 +87,15 @@ WDD_TYPEDEF(unsigned long, erts_alc_test, (unsigned long,
 					   unsigned long,
 					   unsigned long,
 					   unsigned long));
-WDD_TYPEDEF(long, driver_binary_get_refc, (ErlDrvBinary *dbp));
-WDD_TYPEDEF(long, driver_binary_inc_refc, (ErlDrvBinary *dbp));
-WDD_TYPEDEF(long, driver_binary_dec_refc, (ErlDrvBinary *dbp));
+WDD_TYPEDEF(ErlDrvSInt, driver_binary_get_refc, (ErlDrvBinary *dbp));
+WDD_TYPEDEF(ErlDrvSInt, driver_binary_inc_refc, (ErlDrvBinary *dbp));
+WDD_TYPEDEF(ErlDrvSInt, driver_binary_dec_refc, (ErlDrvBinary *dbp));
 WDD_TYPEDEF(ErlDrvPDL, driver_pdl_create, (ErlDrvPort));
 WDD_TYPEDEF(void, driver_pdl_lock, (ErlDrvPDL));
 WDD_TYPEDEF(void, driver_pdl_unlock, (ErlDrvPDL));
-WDD_TYPEDEF(long, driver_pdl_get_refc, (ErlDrvPDL));
-WDD_TYPEDEF(long, driver_pdl_inc_refc, (ErlDrvPDL));
-WDD_TYPEDEF(long, driver_pdl_dec_refc, (ErlDrvPDL));
+WDD_TYPEDEF(ErlDrvSInt, driver_pdl_get_refc, (ErlDrvPDL));
+WDD_TYPEDEF(ErlDrvSInt, driver_pdl_inc_refc, (ErlDrvPDL));
+WDD_TYPEDEF(ErlDrvSInt, driver_pdl_dec_refc, (ErlDrvPDL));
 WDD_TYPEDEF(void, driver_system_info, (ErlDrvSysInfo *, size_t));
 WDD_TYPEDEF(int, driver_get_now, (ErlDrvNowData *));
 WDD_TYPEDEF(int, driver_monitor_process, (ErlDrvPort port, 
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index d3921a14f8..37041ed987 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -31,13 +31,13 @@
 #include "global.h"
 #include "erl_threads.h"
 #include "../../drivers/win32/win_con.h"
-
+#include "erl_cpu_topology.h"
 
 
 void erts_sys_init_float(void);
 
 void erl_start(int, char**);
-void erl_exit(int n, char*, _DOTS_);
+void erl_exit(int n, char*, ...);
 void erl_error(char*, va_list);
 void erl_crash_dump(char*, int, char*, ...);
 
@@ -67,14 +67,17 @@ static void async_read_file(struct async_io* aio, LPVOID buf, DWORD numToRead);
 static int async_write_file(struct async_io* aio, LPVOID buf, DWORD numToWrite);
 static int get_overlapped_result(struct async_io* aio,
 				 LPDWORD pBytesRead, BOOL wait);
-static FUNCTION(BOOL, CreateChildProcess, (char *, HANDLE, HANDLE,
-					   HANDLE, LPHANDLE, BOOL,
-					   LPVOID, LPTSTR, unsigned, 
-					   char **, int *));
+static BOOL create_child_process(char *, HANDLE, HANDLE,
+			       HANDLE, LPHANDLE, BOOL,
+			       LPVOID, LPTSTR, unsigned,
+			       char **, int *);
 static int create_pipe(LPHANDLE, LPHANDLE, BOOL, BOOL);
-static int ApplicationType(const char* originalName, char fullPath[MAX_PATH],
+static int application_type(const char* originalName, char fullPath[MAX_PATH],
 			   BOOL search_in_path, BOOL handle_quotes,
 			   int *error_return);
+static int application_type_w(const char* originalName, WCHAR fullPath[MAX_PATH],
+			      BOOL search_in_path, BOOL handle_quotes,
+			      int *error_return);
 
 HANDLE erts_service_event;
 
@@ -87,17 +90,17 @@ static erts_smp_atomic_t pipe_creation_counter;
 static erts_smp_mtx_t sys_driver_data_lock;
 
 
-/* Results from ApplicationType is one of */
+/* Results from application_type(_w) is one of */
 #define APPL_NONE 0
 #define APPL_DOS  1
 #define APPL_WIN3X 2
 #define APPL_WIN32 3
 
-static FUNCTION(int, driver_write, (long, HANDLE, byte*, int));
+static int driver_write(long, HANDLE, byte*, int);
 static void common_stop(int);
 static int create_file_thread(struct async_io* aio, int mode);
 #ifdef ERTS_SMP
-static void close_active_handles(ErlDrvPort, const HANDLE* handles, int cnt);
+static void close_active_handle(ErlDrvPort, HANDLE handle);
 static DWORD WINAPI threaded_handle_closer(LPVOID param);
 #endif
 static DWORD WINAPI threaded_reader(LPVOID param);
@@ -137,7 +140,11 @@ static BOOL win_console = FALSE;
 
 static OSVERSIONINFO int_os_version;	/* Version information for Win32. */
 
-#ifdef ERTS_SMP
+/*#define USE_CANCELIOEX
+    Disabled the use of CancelIoEx as its been seen to cause problem with some
+    drivers. Not sure what to blame; faulty drivers or some form of invalid use.
+*/
+#if defined(ERTS_SMP) && defined(USE_CANCELIOEX)
 static BOOL (WINAPI *fpCancelIoEx)(HANDLE,LPOVERLAPPED);
 #endif
 
@@ -684,6 +691,7 @@ release_driver_data(DriverData* dp)
     erts_smp_mtx_lock(&sys_driver_data_lock);
 
 #ifdef ERTS_SMP
+#ifdef USE_CANCELIOEX
     if (fpCancelIoEx != NULL) {
 	if (dp->in.thread == (HANDLE) -1 && dp->in.fd != INVALID_HANDLE_VALUE) {
 	    (*fpCancelIoEx)(dp->in.fd, NULL);
@@ -692,10 +700,12 @@ release_driver_data(DriverData* dp)
 	    (*fpCancelIoEx)(dp->out.fd, NULL);
 	}
     }
-    else {
+    else
+#endif
+    {
 	/* This is a workaround for the fact that CancelIo cant cancel
 	   requests issued by another thread and that we cant use
-	   CancelIoEx as that's only availabele in Vista etc.
+	   CancelIoEx as that's only available in Vista etc.
 	   R14: Avoid scheduler deadlock by only wait for 10ms, and then spawn
 	    a thread that will keep waiting in in order to close handles. */
 	HANDLE handles[2];
@@ -706,7 +716,7 @@ release_driver_data(DriverData* dp)
 	    dp->in.fd = INVALID_HANDLE_VALUE;
 	    DEBUGF(("Waiting for the in event thingie"));
 	    if (WaitForSingleObject(dp->in.ov.hEvent,timeout) == WAIT_TIMEOUT) {
-		handles[i++] = dp->in.ov.hEvent;
+		close_active_handle(dp->port_num, dp->in.ov.hEvent);
 		dp->in.ov.hEvent = NULL;
 		timeout = 0;
 	    }
@@ -717,14 +727,11 @@ release_driver_data(DriverData* dp)
 	    dp->out.fd = INVALID_HANDLE_VALUE;
 	    DEBUGF(("Waiting for the out event thingie"));
 	    if (WaitForSingleObject(dp->out.ov.hEvent,timeout) == WAIT_TIMEOUT) {
-		handles[i++] = dp->out.ov.hEvent;
+		close_active_handle(dp->port_num, dp->out.ov.hEvent);
 		dp->out.ov.hEvent = NULL;
 	    }
 	    DEBUGF(("...done\n"));
 	}
-	if (i > 0) {
-	    close_active_handles(dp->port_num, handles, i);
-	}
     }
 #else
 	if (dp->in.thread == (HANDLE) -1 && dp->in.fd != INVALID_HANDLE_VALUE) {
@@ -772,42 +779,82 @@ release_driver_data(DriverData* dp)
 
 #ifdef ERTS_SMP
 
-struct handles_to_be_closed
-{
-    int cnt;
-    HANDLE handles[2];
+struct handles_to_be_closed {
+    HANDLE handles[MAXIMUM_WAIT_OBJECTS];
+    unsigned cnt;
 };
+static struct handles_to_be_closed* htbc_curr = NULL;
+CRITICAL_SECTION htbc_lock;
 
-static void close_active_handles(ErlDrvPort port_num, const HANDLE* handles, int cnt)
+static void close_active_handle(ErlDrvPort port_num, HANDLE handle)
 {
-    DWORD tid;
-    HANDLE thread;
+    struct handles_to_be_closed* htbc;
     int i;
-    struct handles_to_be_closed* htbc = erts_alloc(ERTS_ALC_T_DRV_TAB,
-						   sizeof(struct handles_to_be_closed));
-    htbc->cnt = cnt;
-    for (i=0; i < cnt; ++i) {
-	htbc->handles[i] = handles[i];
-	(void) driver_select(port_num, (ErlDrvEvent)handles[i],
-			     ERL_DRV_USE_NO_CALLBACK, 0);
+    EnterCriticalSection(&htbc_lock);
+    htbc = htbc_curr;
+    if (htbc == NULL || htbc->cnt >= MAXIMUM_WAIT_OBJECTS) {
+	DWORD tid;
+	HANDLE thread;
+
+	htbc = (struct handles_to_be_closed*) erts_alloc(ERTS_ALC_T_DRV_TAB,
+							 sizeof(*htbc));
+	htbc->handles[0] = CreateAutoEvent(FALSE);
+	htbc->cnt = 1;
+	thread = (HANDLE *) _beginthreadex(NULL, 0, threaded_handle_closer, htbc, 0, &tid);
+	CloseHandle(thread);
     }
-    thread = (HANDLE *) _beginthreadex(NULL, 0, threaded_handle_closer, htbc, 0, &tid);
-    CloseHandle(thread);
+    htbc->handles[htbc->cnt++] = handle;
+    driver_select(port_num, (ErlDrvEvent)handle, ERL_DRV_USE_NO_CALLBACK, 0);
+    SetEvent(htbc->handles[0]);
+    htbc_curr = htbc;
+    LeaveCriticalSection(&htbc_lock);
 }
 
-
 static DWORD WINAPI
 threaded_handle_closer(LPVOID param)
 {
     struct handles_to_be_closed* htbc = (struct handles_to_be_closed*) param;
-    int i;
-    DEBUGF(("threaded_handle_closer waiting for %d handles\r\n",htbc->cnt));
-    WaitForMultipleObjects(htbc->cnt, htbc->handles, TRUE, INFINITE);
-    for (i=0; i < htbc->cnt; ++i) {
-	CloseHandle(htbc->handles[i]);
+    unsigned ix;
+    DWORD res;
+    DEBUGF(("threaded_handle_closer %p started\r\n", htbc));
+    EnterCriticalSection(&htbc_lock);
+    for (;;) {
+	{
+	    HANDLE* handles = htbc->handles;
+	    unsigned cnt = htbc->cnt;
+	    DWORD timeout = (htbc == htbc_curr) ? INFINITE : 10*1000;
+
+	    LeaveCriticalSection(&htbc_lock);
+	    DEBUGF(("threaded_handle_closer %p waiting for %d handles\r\n", htbc, cnt));
+	    res = WaitForMultipleObjects(cnt, handles, FALSE, timeout);
+	}
+	EnterCriticalSection(&htbc_lock);
+	switch (res) {
+	case WAIT_OBJECT_0:
+	case WAIT_TIMEOUT:
+	    break; /* got some more handles to wait for maybe */
+	default:
+	    ix = res - WAIT_OBJECT_0;
+	    if (ix > 0 && ix < htbc->cnt) {
+		CloseHandle(htbc->handles[ix]);
+		htbc->handles[ix] = htbc->handles[--htbc->cnt];
+	    }
+	}
+	if (htbc != htbc_curr) {
+	    if (htbc->cnt == 1) { /* no real handles left */
+		break;
+	    }
+	    /* The thread with most free slots will be "current" */
+	    if (htbc->cnt < htbc_curr->cnt) {
+		htbc_curr = htbc;
+		DEBUGF(("threaded_handle_closer %p made current\r\n", htbc));
+	    }
+	}
     }
+    LeaveCriticalSection(&htbc_lock);
+    CloseHandle(htbc->handles[0]);
     erts_free(ERTS_ALC_T_DRV_TAB, htbc);
-    DEBUGF(("threaded_handle_closer terminating\r\n"));
+    DEBUGF(("threaded_handle_closer %p terminating\r\n", htbc));
     return 0;
 }
 #endif /* ERTS_SMP */
@@ -1101,11 +1148,10 @@ static int
 spawn_init()
 {
     int i;
-#ifdef ERTS_SMP
+#if defined(ERTS_SMP) && defined(USE_CANCELIOEX)
     HMODULE module = GetModuleHandle("kernel32");
-    fpCancelIoEx = (module != NULL) ?
-	(BOOL (WINAPI *)(HANDLE,LPOVERLAPPED))
-      GetProcAddress(module,"CancelIoEx") : NULL;
+    fpCancelIoEx = (BOOL (WINAPI *)(HANDLE,LPOVERLAPPED))
+	((module != NULL) ? GetProcAddress(module,"CancelIoEx") : NULL);
     DEBUGF(("fpCancelIoEx = %p\r\n", fpCancelIoEx));
 #endif
     driver_data = (struct driver_data *)
@@ -1192,8 +1238,10 @@ spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* opts)
      */
 
     DEBUGF(("Spawning \"%s\"\n", name));
-    envir = win_build_environment(envir);
-    ok = CreateChildProcess(name, 
+    envir = win_build_environment(envir); /* Still an ansi environment, could be
+					     converted to unicode for spawn_executable, but
+					     that is not done (yet) */ 
+    ok = create_child_process(name, 
 			    hChildStdin, 
 			    hChildStdout,
 			    hChildStderr,
@@ -1272,7 +1320,7 @@ create_file_thread(AsyncIo* aio, int mode)
 }
 
 /* 
- *  A helper function used by CreateChildProcess().
+ *  A helper function used by create_child_process().
  *  Parses a command line with arguments and returns the length of the
  *  first part containing the program name.
  *  Example: input = "\"Program Files\"\\erl arg1 arg2"
@@ -1313,24 +1361,25 @@ int parse_command(char* cmd){
     return i;
 }
 
-BOOL need_quotes(char *str)
+static BOOL need_quotes(WCHAR *str) 
 {
     int in_quote = 0;
     int backslashed = 0;
     int naked_space = 0;
-    while (*str != '\0') {
+
+    while (*str != L'\0') {
 	switch (*str) {
-	case '\\' :
+	case L'\\' :
 	    backslashed = !backslashed;
 	    break;
-	case '"':
+	case L'"':
 	    if (backslashed) {
 		backslashed=0;
 	    } else {
 		in_quote = !in_quote;
 	    }
 	    break;
-	case ' ':
+	case L' ':
 	    backslashed = 0;
 	    if (!(backslashed || in_quote)) {
 		naked_space++;
@@ -1349,7 +1398,7 @@ BOOL need_quotes(char *str)
 /*
  *----------------------------------------------------------------------
  *
- * CreateChildProcess --
+ * create_child_process --
  *
  *	Create a child process that has pipes as its 
  *	standard input, output, and error.  The child process runs
@@ -1374,7 +1423,7 @@ BOOL need_quotes(char *str)
  */
 
 static BOOL
-CreateChildProcess
+create_child_process
 (
  char *origcmd,  /* Command line for child process (including
 		  * name of executable). Or whole executable if st is
@@ -1393,14 +1442,12 @@ CreateChildProcess
  )
 { 
     PROCESS_INFORMATION piProcInfo = {0};
-    STARTUPINFO siStartInfo = {0};
     BOOL ok = FALSE;
     int applType;
     /* Not to be changed for different types of executables */
     int staticCreateFlags = GetPriorityClass(GetCurrentProcess()); 
     int createFlags = DETACHED_PROCESS;
     char *newcmdline = NULL;
-    char execPath[MAX_PATH];
     int cmdlength;
     char* thecommand;
     LPTSTR appname = NULL;
@@ -1408,14 +1455,17 @@ CreateChildProcess
     
     *errno_return = -1;
 
-    siStartInfo.cb = sizeof(STARTUPINFO); 
-    siStartInfo.dwFlags = STARTF_USESTDHANDLES;
-    siStartInfo.hStdInput = hStdin;
-    siStartInfo.hStdOutput = hStdout;
-    siStartInfo.hStdError = hStderr;
-
 
     if (st != ERTS_SPAWN_EXECUTABLE) {
+	STARTUPINFO siStartInfo = {0};
+	char execPath[MAX_PATH];
+
+	siStartInfo.cb = sizeof(STARTUPINFO); 
+	siStartInfo.dwFlags = STARTF_USESTDHANDLES;
+	siStartInfo.hStdInput = hStdin;
+	siStartInfo.hStdOutput = hStdout;
+	siStartInfo.hStdError = hStderr;
+
 	/*
 	 * Parse out the program name from the command line (it can be quoted and
 	 * contain spaces).
@@ -1427,9 +1477,9 @@ CreateChildProcess
 	thecommand[cmdlength] = '\0';
 	DEBUGF(("spawn command: %s\n", thecommand));
     
-	applType = ApplicationType(thecommand, execPath, TRUE, 
+	applType = application_type(thecommand, execPath, TRUE, 
 				   TRUE, errno_return);
-	DEBUGF(("ApplicationType returned for (%s) is %d\n", thecommand, applType));
+	DEBUGF(("application_type returned for (%s) is %d\n", thecommand, applType));
 	erts_free(ERTS_ALC_T_TMP, (void *) thecommand);
 	if (applType == APPL_NONE) {
 	    erts_free(ERTS_ALC_T_TMP,newcmdline);
@@ -1458,126 +1508,147 @@ CreateChildProcess
 
 	strcat(newcmdline, execPath);
 	strcat(newcmdline, origcmd+cmdlength);
-    } else { /* ERTS_SPAWN_EXECUTABLE */
+	DEBUGF(("Creating child process: %s, createFlags = %d\n", newcmdline, createFlags));
+	ok = CreateProcessA(appname, 
+			    newcmdline, 
+			    NULL, 
+			    NULL, 
+			    TRUE, 
+			    createFlags | staticCreateFlags, 
+			    env, 
+			    wd, 
+			    &siStartInfo, 
+			    &piProcInfo);
+
+    } else { /* ERTS_SPAWN_EXECUTABLE, filename and args are in unicode ({utf16,little}) */
 	int run_cmd = 0;
-	applType = ApplicationType(origcmd, execPath, FALSE, FALSE, 
-				   errno_return);
+	STARTUPINFOW siStartInfo = {0};
+	WCHAR execPath[MAX_PATH];
+
+
+	siStartInfo.cb = sizeof(STARTUPINFOW); 
+	siStartInfo.dwFlags = STARTF_USESTDHANDLES;
+	siStartInfo.hStdInput = hStdin;
+	siStartInfo.hStdOutput = hStdout;
+	siStartInfo.hStdError = hStderr;
+
+	applType = application_type_w(origcmd, (char *) execPath, FALSE, FALSE, 
+				      errno_return);
 	if (applType == APPL_NONE) {
 	    return FALSE;
 	} 
 	if (applType == APPL_DOS) {
-		/*
-		 * See comment above
-		 */
+	    /*
+	     * See comment above
+	     */
 		
-		siStartInfo.wShowWindow = SW_HIDE;
-		siStartInfo.dwFlags |= STARTF_USESHOWWINDOW;
-		createFlags = CREATE_NEW_CONSOLE;
-		run_cmd = 1;
+	    siStartInfo.wShowWindow = SW_HIDE;
+	    siStartInfo.dwFlags |= STARTF_USESHOWWINDOW;
+	    createFlags = CREATE_NEW_CONSOLE;
+	    run_cmd = 1;
 	} else if (hide) {
-		DEBUGF(("hiding window\n"));
-		siStartInfo.wShowWindow = SW_HIDE;
-		siStartInfo.dwFlags |= STARTF_USESHOWWINDOW;
-		createFlags = 0;
+	    DEBUGF(("hiding window\n"));
+	    siStartInfo.wShowWindow = SW_HIDE;
+	    siStartInfo.dwFlags |= STARTF_USESHOWWINDOW;
+	    createFlags = 0;
 	}
 	if (run_cmd) {
-	    char cmdPath[MAX_PATH];
+	    WCHAR cmdPath[MAX_PATH];
 	    int cmdType;
-	    cmdType = ApplicationType("cmd.exe", cmdPath, TRUE, FALSE, errno_return);
+	    cmdType = application_type_w((char *) L"cmd.exe", (char *) cmdPath, TRUE, FALSE, errno_return);
 	    if (cmdType == APPL_NONE || cmdType == APPL_DOS) {
 		return FALSE;
 	    }
-	    appname = (char *) erts_alloc(ERTS_ALC_T_TMP, strlen(cmdPath)+1);
-	    strcpy(appname,cmdPath);
+	    appname = (char *) erts_alloc(ERTS_ALC_T_TMP, (wcslen(cmdPath)+1)*sizeof(WCHAR));
+	    wcscpy((WCHAR *) appname,cmdPath);
 	} else {
-	    appname = (char *) erts_alloc(ERTS_ALC_T_TMP, strlen(execPath)+1);
-	    strcpy(appname,execPath);
+	    appname = (char *) erts_alloc(ERTS_ALC_T_TMP, (wcslen(execPath)+1)*sizeof(WCHAR));
+	    wcscpy((WCHAR *) appname, execPath);
 	}
-	if (argv == NULL) {
+	if (argv == NULL) { 
 	    BOOL orig_need_q = need_quotes(execPath);
-	    char *ptr;
-	    int ocl = strlen(execPath);
+	    WCHAR *ptr;
+	    int ocl = wcslen(execPath);
 	    if (run_cmd) {
 		newcmdline = (char *) erts_alloc(ERTS_ALC_T_TMP, 
-						 ocl + ((orig_need_q) ? 3 : 1)
-						 + 11);
-		memcpy(newcmdline,"cmd.exe /c ",11);
-		ptr = newcmdline + 11;
+						 (ocl + ((orig_need_q) ? 3 : 1)
+						  + 11)*sizeof(WCHAR));
+		memcpy(newcmdline,L"cmd.exe /c ",11*sizeof(WCHAR));
+		ptr = (WCHAR *) (newcmdline + (11*sizeof(WCHAR)));
 	    } else {
 		newcmdline = (char *) erts_alloc(ERTS_ALC_T_TMP, 
-						 ocl + ((orig_need_q) ? 3 : 1));
-		ptr = newcmdline;
+						 (ocl + ((orig_need_q) ? 3 : 1))*sizeof(WCHAR));
+		ptr = (WCHAR *) newcmdline;
 	    }
 	    if (orig_need_q) {
-		*ptr++ = '"';
+		*ptr++ = L'"';
 	    }
-	    memcpy(ptr,execPath,ocl);
+	    memcpy(ptr,execPath,ocl*sizeof(WCHAR));
 	    ptr += ocl;
 	    if (orig_need_q) {
-		*ptr++ = '"';
+		*ptr++ = L'"';
 	    }
-	    *ptr = '\0';
+	    *ptr = L'\0';
 	} else {
 	    int sum = 1; /* '\0' */
-	    char **ar = argv;
-	    char *n;
+	    WCHAR **ar = (WCHAR **) argv;
+	    WCHAR *n;
 	    char *save_arg0 = NULL;
 	    if (argv[0] == erts_default_arg0 || run_cmd) {
 		save_arg0 = argv[0];
-		argv[0] = execPath;
+		argv[0] = (char *) execPath;
 	    }
 	    if (run_cmd) {
 		sum += 11; /* cmd.exe /c */
 	    }
 	    while (*ar != NULL) {
-		sum += strlen(*ar);
+		sum += wcslen(*ar);
 		if (need_quotes(*ar)) {
 		    sum += 2; /* quotes */
 		}
 		sum++; /* space */
 		++ar;
 	    }
-	    ar = argv;
-	    newcmdline = erts_alloc(ERTS_ALC_T_TMP, sum);
-	    n = newcmdline;
+	    ar = (WCHAR **) argv;
+	    newcmdline = erts_alloc(ERTS_ALC_T_TMP, sum*sizeof(WCHAR));
+	    n = (WCHAR *) newcmdline;
 	    if (run_cmd) {
-		memcpy(n,"cmd.exe /c ",11);
+		memcpy(n,L"cmd.exe /c ",11*sizeof(WCHAR));
 		n += 11;
 	    }
 	    while (*ar != NULL) {
 		int q = need_quotes(*ar);
-		sum = strlen(*ar);
+		sum = wcslen(*ar);
 		if (q) {
-		    *n++ = '"';
+		    *n++ = L'"';
 		}
-		memcpy(n,*ar,sum);
+		memcpy(n,*ar,sum*sizeof(WCHAR));
 		n += sum;
 		if (q) {
-		    *n++ = '"';
+		    *n++ = L'"';
 		}
-		*n++ = ' ';
+		*n++ = L' ';
 		++ar;
 	    }
-	    ASSERT(n > newcmdline);
-	    *(n-1) = '\0';
+	    *(n-1) = L'\0';
 	    if (save_arg0 != NULL) {
 		argv[0] = save_arg0;
 	    }
 	}	    
 	    
-    }
-    DEBUGF(("Creating child process: %s, createFlags = %d\n", newcmdline, createFlags));
-    ok = CreateProcess(appname, 
-		       newcmdline, 
-		       NULL, 
-		       NULL, 
-		       TRUE, 
-		       createFlags | staticCreateFlags, 
-		       env, 
-		       wd, 
-		       &siStartInfo, 
-		       &piProcInfo);
-
+	DEBUGF(("Creating child process: %s, createFlags = %d\n", newcmdline, createFlags));
+	ok = CreateProcessW((WCHAR *) appname, 
+			    (WCHAR *) newcmdline, 
+			    NULL, 
+			    NULL, 
+			    TRUE, 
+			    createFlags | staticCreateFlags, 
+			    env, 
+			    (WCHAR *) wd, 
+			    &siStartInfo, 
+			    &piProcInfo);
+
+    } /* end SPAWN_EXECUTABLE */
     if (newcmdline != NULL) {
 	    erts_free(ERTS_ALC_T_TMP,newcmdline);
     }	
@@ -1696,7 +1767,7 @@ static int create_pipe(HANDLE *phRead, HANDLE *phWrite, BOOL inheritRead, BOOL o
 
 
 
-static int ApplicationType
+static int application_type
 (
  const char *originalName, /* Name of the application to find. */ 
  char fullPath[MAX_PATH],  /* Filled with complete path to 
@@ -1850,6 +1921,146 @@ static int ApplicationType
     return applType;
 }
 
+static int application_type_w (const char *originalName, /* Name of the application to find. */ 
+			       WCHAR wfullpath[MAX_PATH],/* Filled with complete path to 
+							  * application. */
+			       BOOL search_in_path,      /* If we should search the system wide path */
+			       BOOL handle_quotes,       /* If we should handle quotes around executable */
+			       int *error_return)         /* A place to put an error code */
+{
+    int applType, i;
+    HANDLE hFile;
+    WCHAR *ext, *rest;
+    char buf[2];
+    DWORD read;
+    IMAGE_DOS_HEADER header;
+    static WCHAR extensions[][5] = {L"", L".com", L".exe", L".bat"};
+    int is_quoted;
+    int len;
+    WCHAR *wname = (WCHAR *) originalName;
+    WCHAR xfullpath[MAX_PATH];
+
+    len = wcslen(wname);
+    is_quoted = handle_quotes && len > 0 && wname[0] == L'"' && 
+	wname[len-1] == L'"';
+
+    applType = APPL_NONE;
+    *error_return = ENOENT;
+    for (i = 0; i < (int) (sizeof(extensions) / sizeof(extensions[0])); i++) {
+	if(is_quoted) {
+	   lstrcpynW(xfullpath, wname+1, MAX_PATH - 7); /* Cannot start using StringCchCopy yet, we support
+							   older platforms */
+	   len = wcslen(xfullpath);
+	   if(len > 0) {
+	       xfullpath[len-1] = L'\0';
+	   }
+	} else {
+	    lstrcpynW(xfullpath, wname, MAX_PATH - 5);
+	}
+	wcscat(xfullpath, extensions[i]);
+	/* It seems that the Unicode version does not allow in and out parameter to overlap. */
+	SearchPathW((search_in_path) ? NULL : L".", xfullpath, NULL, MAX_PATH, wfullpath, &rest);
+
+	/*
+	 * Ignore matches on directories or data files, return if identified
+	 * a known type.
+	 */
+
+	if (GetFileAttributesW(wfullpath) & FILE_ATTRIBUTE_DIRECTORY) {
+	    continue;
+	}
+
+	ext = wcsrchr(wfullpath, L'.');
+	if ((ext != NULL) && (_wcsicmp(ext, L".bat") == 0)) {
+	    *error_return = EACCES;
+	    applType = APPL_DOS;
+	    break;
+	}
+
+	hFile = CreateFileW(wfullpath, GENERIC_READ, FILE_SHARE_READ, NULL, 
+		OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (hFile == INVALID_HANDLE_VALUE) {
+	    continue;
+	}
+
+	*error_return = EACCES; /* If considered an error, 
+				    it's an access error */
+	header.e_magic = 0;
+	ReadFile(hFile, (void *) &header, sizeof(header), &read, NULL);
+	if (header.e_magic != IMAGE_DOS_SIGNATURE) {
+	    /* 
+	     * Doesn't have the magic number for relocatable executables.  If 
+	     * filename ends with .com, assume it's a DOS application anyhow.
+	     * Note that we didn't make this assumption at first, because some
+	     * supposed .com files are really 32-bit executables with all the
+	     * magic numbers and everything.  
+	     */
+
+	    CloseHandle(hFile);
+	    if ((ext != NULL) && (_wcsicmp(ext, L".com") == 0)) {
+		applType = APPL_DOS;
+		break;
+	    }
+	    continue;
+	}
+	if (header.e_lfarlc != sizeof(header)) {
+	    /* 
+	     * All Windows 3.X and Win32 and some DOS programs have this value
+	     * set here.  If it doesn't, assume that since it already had the 
+	     * other magic number it was a DOS application.
+	     */
+
+	    CloseHandle(hFile);
+	    applType = APPL_DOS;
+	    break;
+	}
+
+	/* 
+	 * The DWORD at header.e_lfanew points to yet another magic number.
+	 */
+
+	buf[0] = '\0';
+	SetFilePointer(hFile, header.e_lfanew, NULL, FILE_BEGIN);
+	ReadFile(hFile, (void *) buf, 2, &read, NULL);
+	CloseHandle(hFile);
+
+	if ((buf[0] == 'L') && (buf[1] == 'E')) {
+	    applType = APPL_DOS;
+	} else if ((buf[0] == 'N') && (buf[1] == 'E')) {
+	    applType = APPL_WIN3X;
+	} else if ((buf[0] == 'P') && (buf[1] == 'E')) {
+	    applType = APPL_WIN32;
+	} else {
+	    continue;
+	}
+	break;
+    }
+
+    if (applType == APPL_NONE) {
+	return APPL_NONE;
+    }
+
+    if ((applType == APPL_DOS) || (applType == APPL_WIN3X)) {
+	/* 
+	 * Replace long path name of executable with short path name for 
+	 * 16-bit applications.  Otherwise the application may not be able
+	 * to correctly parse its own command line to separate off the 
+	 * application name from the arguments.
+	 */
+
+	GetShortPathNameW(wfullpath, wfullpath, MAX_PATH);
+    }
+    if (is_quoted) {
+	/* restore quotes on quoted program name */
+	len = wcslen(wfullpath);
+	memmove(wfullpath+1,wfullpath,len*sizeof(WCHAR));
+	wfullpath[0]=L'"';
+	wfullpath[len+1]=L'"';
+	wfullpath[len+2]=L'\0';
+    }
+    return applType;
+}
+
 /*
  * Thread function used to emulate overlapped reading.
  */
@@ -2627,7 +2838,6 @@ erts_sys_main_thread(void)
 
 void erts_sys_alloc_init(void)
 {
-    elib_ensure_initialized();
 }
 
 void *erts_sys_alloc(ErtsAlcType_t t, void *x, Uint sz)
@@ -2974,19 +3184,51 @@ check_supported_os_version(void)
 }
 
 #ifdef USE_THREADS
-static void *ethr_internal_alloc(size_t size)
+
+typedef struct {
+    int sched_bind_data;
+} erts_thr_create_data_t;
+
+/*
+ * thr_create_prepare() is called in parent thread before thread creation.
+ * Returned value is passed as argument to thr_create_cleanup().
+ */
+static void *
+thr_create_prepare(void)
 {
-    return erts_alloc_fnf(ERTS_ALC_T_ETHR_INTERNAL, (Uint) size);
+    erts_thr_create_data_t *tcdp;
+
+    tcdp = erts_alloc(ERTS_ALC_T_TMP, sizeof(erts_thr_create_data_t));
+    tcdp->sched_bind_data = erts_sched_bind_atthrcreate_prepare();
+
+    return (void *) tcdp;
 }
-static void *ethr_internal_realloc(void *ptr, size_t size)
+
+
+/* thr_create_cleanup() is called in parent thread after thread creation. */
+static void
+thr_create_cleanup(void *vtcdp)
 {
-    return erts_realloc_fnf(ERTS_ALC_T_ETHR_INTERNAL, ptr, (Uint) size);
+    erts_thr_create_data_t *tcdp = (erts_thr_create_data_t *) vtcdp;
+
+    erts_sched_bind_atthrcreate_parent(tcdp->sched_bind_data);
+
+    erts_free(ERTS_ALC_T_TMP, tcdp);
 }
-static void ethr_internal_free(void *ptr)
+
+static void
+thr_create_prepare_child(void *vtcdp)
 {
-    erts_free(ERTS_ALC_T_ETHR_INTERNAL, ptr);
+    erts_thr_create_data_t *tcdp = (erts_thr_create_data_t *) vtcdp;
+
+#ifdef ERTS_ENABLE_LOCK_COUNT
+    erts_lcnt_thread_setup();
+#endif /* ERTS_ENABLE_LOCK_COUNT */
+
+    erts_sched_bind_atthrcreate_child(tcdp->sched_bind_data);
 }
-#endif
+
+#endif /* USE_THREADS */
 
 void
 erts_sys_pre_init(void)
@@ -2997,9 +3239,13 @@ erts_sys_pre_init(void)
 #ifdef USE_THREADS
     {
 	erts_thr_init_data_t eid = ERTS_THR_INIT_DATA_DEF_INITER;
-	eid.alloc = ethr_internal_alloc;
-	eid.realloc = ethr_internal_realloc;
-	eid.free = ethr_internal_free;
+
+	eid.thread_create_child_func = thr_create_prepare_child;
+	/* Before creation in parent */
+	eid.thread_create_prepare_func = thr_create_prepare;
+	/* After creation in parent */
+	eid.thread_create_parent_func = thr_create_cleanup,
+
 	erts_thr_init(&eid);
 #ifdef ERTS_ENABLE_LOCK_COUNT
 	erts_lcnt_init();
@@ -3007,7 +3253,6 @@ erts_sys_pre_init(void)
     }
 #endif
     erts_smp_atomic_init(&sys_misc_mem_sz, 0);
-    erts_sys_env_init();
 }
 
 void noinherit_std_handle(DWORD type)
@@ -3023,6 +3268,8 @@ void erl_sys_init(void)
 {
     HANDLE handle;
 
+    erts_sys_env_init();
+
     noinherit_std_handle(STD_OUTPUT_HANDLE);
     noinherit_std_handle(STD_INPUT_HANDLE);
     noinherit_std_handle(STD_ERROR_HANDLE);
@@ -3032,6 +3279,7 @@ void erl_sys_init(void)
 
 #ifdef ERTS_SMP
     erts_smp_tsd_key_create(&win32_errstr_key);
+    InitializeCriticalSection(&htbc_lock);
 #endif
     erts_smp_atomic_init(&pipe_creation_counter,0);
     /*
diff --git a/erts/emulator/sys/win32/sys_env.c b/erts/emulator/sys/win32/sys_env.c
index ac4be3f316..02c8433a10 100644
--- a/erts/emulator/sys/win32/sys_env.c
+++ b/erts/emulator/sys/win32/sys_env.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2002-2010. 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%
  */
 
@@ -145,15 +145,17 @@ merge_environment(char *old, char *add)
     for(j = 0; a_arg[j] != NULL; ++j){
 	char **tmp;
 	char *current = a_arg[j];
+	char *eq_p = strchr(current,'=');
+	int unset = (eq_p!=NULL && eq_p[1]=='\0');
 
 	if ((tmp = find_arg(c_arg, current)) != NULL) {
-	    if (current[strlen(current)-1] != '=') {
+	    if (!unset) {
 		*tmp = current;
 	    } else {
 		*tmp = c_arg[--i];
 		c_arg[i] = NULL;
 	    }
-	} else if (current[strlen(current)-1] != '=') {
+	} else if (!unset) {
 	    c_arg[i++] = current;
 	    c_arg[i] = NULL;
 	}
diff --git a/erts/emulator/sys/win32/sys_interrupt.c b/erts/emulator/sys/win32/sys_interrupt.c
index d2449a1bdb..943c338794 100644
--- a/erts/emulator/sys/win32/sys_interrupt.c
+++ b/erts/emulator/sys/win32/sys_interrupt.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2011. 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
@@ -31,11 +31,11 @@
 #endif
 
 #ifdef ERTS_SMP
-erts_smp_atomic_t erts_break_requested;
+erts_smp_atomic32_t erts_break_requested;
 #define ERTS_SET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 1)
+  erts_smp_atomic32_set(&erts_break_requested, (erts_aint32_t) 1)
 #define ERTS_UNSET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 0)
+  erts_smp_atomic32_set(&erts_break_requested, (erts_aint32_t) 0)
 #else
 volatile int erts_break_requested = 0;
 #define ERTS_SET_BREAK_REQUESTED (erts_break_requested = 1)
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile
index 5ec17a5e2a..7259e1b84d 100644
--- a/erts/emulator/test/Makefile
+++ b/erts/emulator/test/Makefile
@@ -75,7 +75,6 @@ MODULES= \
 	node_container_SUITE \
 	nofrag_SUITE \
 	num_bif_SUITE \
-	obsolete_SUITE \
 	op_SUITE \
 	port_SUITE \
 	port_bif_SUITE \
@@ -84,6 +83,7 @@ MODULES= \
 	receive_SUITE \
 	ref_SUITE \
 	register_SUITE \
+	mtx_SUITE \
 	save_calls_SUITE \
 	send_term_SUITE \
 	sensitive_SUITE \
diff --git a/erts/emulator/test/a_SUITE.erl b/erts/emulator/test/a_SUITE.erl
index e9d653a7c4..784869251a 100644
--- a/erts/emulator/test/a_SUITE.erl
+++ b/erts/emulator/test/a_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -26,15 +26,32 @@
 %%%-------------------------------------------------------------------
 -module(a_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, long_timers/1, pollset_size/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, long_timers/1, pollset_size/1]).
 
-all(doc) ->
-    [];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [long_timers, pollset_size].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 long_timers(doc) ->
     [];
 long_timers(suite) ->
diff --git a/erts/emulator/test/after_SUITE.erl b/erts/emulator/test/after_SUITE.erl
index 3e1a871408..78ac099792 100644
--- a/erts/emulator/test/after_SUITE.erl
+++ b/erts/emulator/test/after_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -21,27 +21,48 @@
 
 %% Tests receive after.
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, t_after/1, receive_after/1, receive_after_big/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 t_after/1, receive_after/1, receive_after_big/1,
 	 receive_after_errors/1, receive_var_zero/1, receive_zero/1,
 	 multi_timeout/1, receive_after_32bit/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Internal exports.
 
 -export([timeout_g/0]).
 
-all(suite) ->
-    [t_after, receive_after, receive_after_big, receive_after_errors,
-     receive_var_zero, receive_zero, multi_timeout, receive_after_32bit].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [t_after, receive_after, receive_after_big,
+     receive_after_errors, receive_var_zero, receive_zero,
+     multi_timeout, receive_after_32bit].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(3)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index 94766dc6e9..687a4f0d5a 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -18,7 +18,8 @@
 
 -module(alloc_SUITE).
 -author('[email protected]').
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([basic/1,
 	 coalesce/1,
@@ -29,28 +30,40 @@
 	 rbtree/1,
 	 mseg_clear_cache/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(DEFAULT_TIMETRAP_SECS, 240).
 
-all(doc) -> [];
-all(suite) -> [basic,
-	       coalesce,
-	       threads,
-	       realloc_copy,
-	       bucket_index,
-	       bucket_mask,
-	       rbtree,
-	       mseg_clear_cache].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic, coalesce, threads, realloc_copy, bucket_index,
+     bucket_mask, rbtree, mseg_clear_cache].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 init_per_testcase(Case, Config) when is_list(Config) ->
     Dog = ?t:timetrap(?t:seconds(?DEFAULT_TIMETRAP_SECS)),
     [{watchdog, Dog},{testcase, Case}|Config].
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
diff --git a/erts/emulator/test/beam_SUITE.erl b/erts/emulator/test/beam_SUITE.erl
index 228ff15341..3643750883 100644
--- a/erts/emulator/test/beam_SUITE.erl
+++ b/erts/emulator/test/beam_SUITE.erl
@@ -19,16 +19,37 @@
 
 -module(beam_SUITE).
 
--export([all/1, packed_registers/1, apply_last/1, apply_last_bif/1,
-	 buildo_mucho/1, heap_sizes/1, big_lists/1, fconv/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 packed_registers/1, apply_last/1, apply_last_bif/1,
+	 buildo_mucho/1, heap_sizes/1, big_lists/1, fconv/1,
+	 select_val/1]).
 
 -export([applied/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [packed_registers, apply_last, apply_last_bif,
+     buildo_mucho, heap_sizes, big_lists, select_val].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [packed_registers, apply_last, apply_last_bif, buildo_mucho,
-     heap_sizes, big_lists].
 
 
 %% Verify that apply(M, F, A) is really tail recursive.
@@ -302,3 +323,19 @@ do_fconv(nil, Float) when is_float(Float) ->
     Float + [];
 do_fconv(tuple_literal, Float) when is_float(Float) ->
     Float + {a,b}.
+
+select_val(Config) when is_list(Config) ->
+    ?line zero = do_select_val(0),
+    ?line big = do_select_val(1 bsl 64),
+    ?line integer = do_select_val(42),
+    ok.
+
+do_select_val(X) ->
+    case X of
+	0 ->
+	    zero;
+	1 bsl 64 ->
+	    big;
+	Int when is_integer(Int) ->
+	    integer
+    end.
diff --git a/erts/emulator/test/beam_literals_SUITE.erl b/erts/emulator/test/beam_literals_SUITE.erl
index 75841adbfc..3ab7fc615b 100644
--- a/erts/emulator/test/beam_literals_SUITE.erl
+++ b/erts/emulator/test/beam_literals_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -18,21 +18,41 @@
 %%
 
 -module(beam_literals_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([putting/1, matching_smalls/1, matching_smalls_jt/1,
 	 matching_bigs/1, matching_more_bigs/1,
 	 matching_bigs_and_smalls/1, badmatch/1, case_clause/1,
 	 receiving/1, literal_type_tests/1,
-	 put_list/1, fconv/1, literal_case_expression/1]).
+	 put_list/1, fconv/1, literal_case_expression/1,
+	 increment/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [putting, matching_smalls, matching_smalls_jt,
      matching_bigs, matching_more_bigs,
      matching_bigs_and_smalls, badmatch, case_clause,
-     receiving, literal_type_tests,
-     put_list, fconv, literal_case_expression].
+     receiving, literal_type_tests, put_list, fconv,
+     literal_case_expression, increment].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 putting(doc) -> "Test creating lists and tuples containing big number literals.";
 putting(Config) when is_list(Config) ->
@@ -48,6 +68,7 @@ matching_bigs(doc) -> "Test matching of a few big number literals (in Beam,"
 matching_bigs(Config) when is_list(Config) ->
     a = matching1(3972907842873739),
     b = matching1(-389789298378939783333333333333333333784),
+    other = matching1(3141699999999999999999999999999999999),
     other = matching1(42).
 
 matching_smalls(doc) -> "Test matching small numbers (both positive and negative).";
@@ -236,14 +257,14 @@ make_test([{T,L}|Ts]) ->
 make_test([]) -> [].
 
 test(T, L) ->
-    S = lists:flatten(io_lib:format("begin io:format(\"~~p~~n\", [{~p,~p}]), if ~w(~w) -> true; true -> false end end. ", [T, L, T, L])),
+    S = lists:flatten(io_lib:format("begin io:format(\"~~p~n\", [{~p,~p}]), if ~w(~w) -> true; true -> false end end. ", [T, L, T, L])),
     {ok,Toks,_Line} = erl_scan:string(S),
     {ok,E} = erl_parse:parse_exprs(Toks),
     {value,Val,_Bs} = erl_eval:exprs(E, []),
     {match,0,{atom,0,Val},hd(E)}.
 
 test(T, A, L) ->
-    S = lists:flatten(io_lib:format("begin io:format(\"~~p~~n\", [{~p,~p,~p}]), if ~w(~w, ~w) -> true; true -> false end end. ",
+    S = lists:flatten(io_lib:format("begin io:format(\"~~p~n\", [{~p,~p,~p}]), if ~w(~w, ~w) -> true; true -> false end end. ",
 				    [T,L,A,T,L,A])),
     {ok,Toks,_Line} = erl_scan:string(S),
     {ok,E} = erl_parse:parse_exprs(Toks),
@@ -405,14 +426,51 @@ fconv_2(F) when is_float(F) ->
 literal_case_expression(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
     ?line Src = filename:join(DataDir, "literal_case_expression"),
-    ?line {ok,literal_case_expression=Mod,Code} = compile:file(Src, [from_asm,binary]),
+    ?line {ok,literal_case_expression=Mod,Code} =
+	compile:file(Src, [from_asm,binary]),
     ?line {module,Mod} = code:load_binary(Mod, Src, Code),
     ?line ok = Mod:x(),
     ?line ok = Mod:y(),
+    ?line ok = Mod:zi1(),
+    ?line ok = Mod:zi2(),
+    ?line ok = Mod:za1(),
+    ?line ok = Mod:za2(),
     ?line true = code:delete(Mod),
     ?line code:purge(Mod),
     ok.
 
+%% Test the i_increment instruction.
+increment(Config) when is_list(Config) ->
+    %% In the 32-bit emulator, Neg32 can be represented as a small,
+    %% but -Neg32 cannot. Therefore the i_increment instruction must
+    %% not be used in the subtraction that follows (since i_increment
+    %% cannot handle a bignum literal).
+    Neg32 = -(1 bsl 27),
+    Big32 = id(1 bsl 32),
+    Result32 = (1 bsl 32) + (1 bsl 27),
+    ?line Result32 = Big32 + (1 bsl 27),
+    ?line Result32 = Big32 - Neg32,
+
+    %% Same thing, but for the 64-bit emulator.
+    Neg64 = -(1 bsl 59),
+    Big64 = id(1 bsl 64),
+    Result64 = (1 bsl 64) + (1 bsl 59),
+    ?line Result64 = Big64 + (1 bsl 59),
+    ?line Result64 = Big64 - Neg64,
+
+    %% Test error handling for the i_increment instruction.
+    Bad = id(bad),
+    ?line {'EXIT',{badarith,_}} = (catch Bad + 42),
+
+    %% Small operands, but a big result.
+    Res32 = 1 bsl 27,
+    Small32 = id(Res32-1),
+    ?line Res32 = Small32 + 1,
+    Res64 = 1 bsl 59,
+    Small64 = id(Res64-1),
+    ?line Res64 = Small64 + 1,
+    ok.
+
 %% Help functions.
 
 chksum(Term) ->
diff --git a/erts/emulator/test/beam_literals_SUITE_data/literal_case_expression.S b/erts/emulator/test/beam_literals_SUITE_data/literal_case_expression.S
index c0ffe9ab53..bfdfc079dc 100644
--- a/erts/emulator/test/beam_literals_SUITE_data/literal_case_expression.S
+++ b/erts/emulator/test/beam_literals_SUITE_data/literal_case_expression.S
@@ -1,10 +1,11 @@
 {module, literal_case_expression}.  %% version = 0
 
-{exports, [{module_info,0},{module_info,1},{x,0},{y,0}]}.
+{exports, [{module_info,0},{module_info,1},{x,0},{y,0},
+	   {zi1,0},{zi2,0},{za1,0},{za2,0}]}.
 
 {attributes, []}.
 
-{labels, 15}.
+{labels, 32}.
 
 
 {function, x, 0, 2}.
@@ -52,6 +53,81 @@
   {label,10}.
     {case_end,{float,34.0000}}.
 
+{function, zi1, 0, 16}.
+  {label,15}.
+    {func_info,{atom,literal_case_expression},{atom,zi1},0}.
+  {label,16}.
+    {test,is_integer,{f,19},[{integer,42}]}.
+    {select_val,{integer,42},
+                {f,18},
+                {list,[{integer,42},
+                       {f,17},
+                       {integer,1000},
+                       {f,18}]}}.
+  {label,17}.
+    {move,{atom,ok},{x,0}}.
+    return.
+  {label,18}.
+    {move,{atom,error},{x,0}}.
+    return.
+  {label,19}.
+    {case_end,{integer,42}}.
+
+{function, zi2, 0, 16}.
+  {label,20}.
+    {func_info,{atom,literal_case_expression},{atom,zi2},0}.
+  {label,21}.
+    {test,is_integer,{f,23},[{integer,42}]}.
+    {select_val,{integer,42},
+                {f,23},
+                {list,[{integer,42},
+                       {f,22},
+                       {integer,1000},
+                       {f,23}]}}.
+  {label,22}.
+    {move,{atom,ok},{x,0}}.
+    return.
+  {label,23}.
+    {move,{atom,error},{x,0}}.
+    return.
+
+{function, za1, 0, 25}.
+  {label,24}.
+    {func_info,{atom,literal_case_expression},{atom,za1},0}.
+  {label,25}.
+    {test,is_atom,{f,28},[{atom,x}]}.
+    {select_val,{atom,x},
+                {f,27},
+                {list,[{atom,a},
+                       {f,27},
+                       {atom,x},
+                       {f,26}]}}.
+  {label,26}.
+    {move,{atom,ok},{x,0}}.
+    return.
+  {label,27}.
+    {move,{atom,error},{x,0}}.
+    return.
+  {label,28}.
+    {case_end,{atom,x}}.
+
+{function, za2, 0, 30}.
+  {label,29}.
+    {func_info,{atom,literal_case_expression},{atom,za2},0}.
+  {label,30}.
+    {test,is_atom,{f,32},[{atom,x}]}.
+    {select_val,{atom,x},
+                {f,32},
+                {list,[{atom,a},
+                       {f,32},
+                       {atom,x},
+                       {f,31}]}}.
+  {label,31}.
+    {move,{atom,ok},{x,0}}.
+    return.
+  {label,32}.
+    {move,{atom,error},{x,0}}.
+    return.
 
 {function, module_info, 0, 12}.
   {label,11}.
diff --git a/erts/emulator/test/bif_SUITE.erl b/erts/emulator/test/bif_SUITE.erl
index 15c09d9158..016befdced 100644
--- a/erts/emulator/test/bif_SUITE.erl
+++ b/erts/emulator/test/bif_SUITE.erl
@@ -19,26 +19,114 @@
 
 -module(bif_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
+	 types/1,
 	 t_list_to_existing_atom/1,os_env/1,otp_7526/1,
 	 binary_to_atom/1,binary_to_existing_atom/1,
 	 atom_to_binary/1,min_max/1]).
 
-all(suite) ->
-    [t_list_to_existing_atom,os_env,otp_7526,
-     atom_to_binary,binary_to_atom,binary_to_existing_atom,
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [types, t_list_to_existing_atom, os_env, otp_7526,
+     atom_to_binary, binary_to_atom, binary_to_existing_atom,
      min_max].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(1)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
+types(Config) when is_list(Config) ->
+    c:l(erl_bif_types),
+    case erlang:function_exported(erl_bif_types, module_info, 0) of
+	false ->
+	    %% Fail cleanly.
+	    ?line ?t:fail("erl_bif_types not compiled");
+	true ->
+	    types_1()
+    end.
+
+types_1() ->
+    ?line List0 = erlang:system_info(snifs),
+
+    %% Ignore missing type information for hipe BIFs.
+    ?line List = [MFA || {M,_,_}=MFA <- List0, M =/= hipe_bifs],
+
+    case [MFA || MFA <- List, not known_types(MFA)] of
+	[] ->
+	    types_2(List);
+	BadTypes ->
+	    io:put_chars("No type information:\n"),
+	    io:format("~p\n", [lists:sort(BadTypes)]),
+	    ?line ?t:fail({length(BadTypes),bifs_without_types})
+    end.
+
+types_2(List) ->
+    BadArity = [MFA || {M,F,A}=MFA <- List,
+		       begin
+			   Types = erl_bif_types:arg_types(M, F, A),
+			   length(Types) =/= A
+		       end],
+    case BadArity of
+	[] ->
+	    types_3(List);
+	[_|_] ->
+	    io:put_chars("Bifs with bad arity\n"),
+	    io:format("~p\n", [BadArity]),
+	    ?line ?t:fail({length(BadArity),bad_arity})
+    end.
+
+types_3(List) ->
+    BadSmokeTest = [MFA || {M,F,A}=MFA <- List,
+			   begin
+			       try erl_bif_types:type(M, F, A) of
+				   Type ->
+				       %% Test that type is returned.
+				       not erl_types:is_erl_type(Type)
+			       catch
+				   Class:Error ->
+				       io:format("~p: ~p ~p\n",
+						 [MFA,Class,Error]),
+				       true
+			       end
+			   end],
+    case BadSmokeTest of
+	[] ->
+	    ok;
+	[_|_] ->
+	    io:put_chars("Bifs with failing calls to erlang_bif_types:type/3 "
+			 "(or with bogus return values):\n"),
+	    io:format("~p\n", [BadSmokeTest]),
+	    ?line ?t:fail({length(BadSmokeTest),bad_smoke_test})
+    end.
+
+known_types({M,F,A}) ->
+    erl_bif_types:is_known(M, F, A).
+
 t_list_to_existing_atom(Config) when is_list(Config) ->
     ?line all = list_to_existing_atom("all"),
     ?line ?MODULE = list_to_existing_atom(?MODULE_STRING),
diff --git a/erts/emulator/test/big_SUITE.erl b/erts/emulator/test/big_SUITE.erl
index 6cedd39009..60b19af68e 100644
--- a/erts/emulator/test/big_SUITE.erl
+++ b/erts/emulator/test/big_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -19,9 +19,10 @@
 -module(big_SUITE).
 
 
--export([all/1]).
+-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_div/1, eq_28/1, eq_32/1, eq_big/1, eq_math/1, big_literals/1,
-	 borders/1, negative/1, big_float/1, big_float_1/1, big_float_2/1,
+	 borders/1, negative/1, big_float_1/1, big_float_2/1,
 	 shift_limit_1/1, powmod/1, system_limit/1, otp_6692/1]).
 
 %% Internal exports.
@@ -30,19 +31,38 @@
 
 -export([fac/1, fib/1, pow/2, gcd/2, lcm/2]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [t_div, eq_28, eq_32, eq_big, eq_math, big_literals,
+     borders, negative, {group, big_float}, shift_limit_1,
+     powmod, system_limit, otp_6692].
+
+groups() -> 
+    [{big_float, [], [big_float_1, big_float_2]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [t_div, eq_28, eq_32, eq_big, eq_math, big_literals, borders,
-     negative, big_float, shift_limit_1, powmod, system_limit, otp_6692].
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(3)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
@@ -260,10 +280,6 @@ big_literals(Config) when is_list(Config) ->
     ?line ok = Mod:t(),
     ok.
 
-big_float(doc) ->
-    ["Test cases for mixing bignums and floats"];
-big_float(suite) ->
-    [big_float_1, big_float_2].
 
 big_float_1(doc) ->
     ["OTP-2436, part 1"];
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 77d2579848..7e409f053e 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -40,9 +40,11 @@
 %%      phash2(Binary, N)
 %%
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2,
+-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,
 	 copy_terms/1, conversions/1, deep_lists/1, deep_bitstr_lists/1,
 	 bad_list_to_binary/1, bad_binary_to_list/1,
 	 t_split_binary/1, bad_split/1, t_concat_binary/1,
@@ -61,24 +63,42 @@
 %% Internal exports.
 -export([sleeper/0]).
 
-all(suite) ->
-    [copy_terms,conversions,deep_lists,deep_bitstr_lists,
+suite() -> [{ct_hooks,[ts_install_cth]},
+	    {timetrap,{minutes,2}}].
+
+all() -> 
+    [copy_terms, conversions, deep_lists, deep_bitstr_lists,
      t_split_binary, bad_split, t_concat_binary,
-     bad_list_to_binary, bad_binary_to_list, terms, terms_float,
-     external_size, t_iolist_size,
-     bad_binary_to_term_2,safe_binary_to_term2,
-     bad_binary_to_term, bad_terms, t_hash, bad_size, bad_term_to_binary,
-     more_bad_terms, otp_5484, otp_5933, ordering, unaligned_order,
-     gc_test, bit_sized_binary_sizes, otp_6817, otp_8117,
-     deep,obsolete_funs,robustness,otp_8180].
+     bad_list_to_binary, bad_binary_to_list, terms,
+     terms_float, external_size, t_iolist_size,
+     bad_binary_to_term_2, safe_binary_to_term2,
+     bad_binary_to_term, bad_terms, t_hash, bad_size,
+     bad_term_to_binary, more_bad_terms, otp_5484, otp_5933,
+     ordering, unaligned_order, gc_test,
+     bit_sized_binary_sizes, otp_6817, otp_8117, deep,
+     obsolete_funs, robustness, otp_8180].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(2)),
-    [{watchdog, Dog}|Config].
+    Config.
 
-fin_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+end_per_testcase(_Func, _Config) ->
+    ok.
 
 -define(heap_binary_size, 64).
 
@@ -1041,7 +1061,7 @@ test_terms(Test_Func) ->
     ?line Test_Func(F = fun(A) -> 42*A end),
     ?line Test_Func(lists:duplicate(32, F)),
 
-    ?line Test_Func(FF = fun binary_SUITE:all/1),
+    ?line Test_Func(FF = fun binary_SUITE:all/0),
     ?line Test_Func(lists:duplicate(32, FF)),
 
     ok.
@@ -1301,11 +1321,4 @@ unaligned_sub_bin(Bin0, Offs) ->
     <<_:Offs,Bin:Sz/binary,_:Roffs>> = id(Bin1),
     Bin.
 
-hostname() ->
-    from($@, atom_to_list(node())).
-
-from(H, [H | T]) -> T;
-from(H, [_ | T]) -> from(H, T);
-from(_, []) -> [].
-
 id(I) -> I.
diff --git a/erts/emulator/test/bs_bincomp_SUITE.erl b/erts/emulator/test/bs_bincomp_SUITE.erl
index 4e83d97689..c0d64c263e 100644
--- a/erts/emulator/test/bs_bincomp_SUITE.erl
+++ b/erts/emulator/test/bs_bincomp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -22,15 +22,34 @@
 
 -module(bs_bincomp_SUITE).
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 byte_aligned/1,bit_aligned/1,extended_byte_aligned/1,
 	 extended_bit_aligned/1,mixed/1,tracing/1]).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [byte_aligned, bit_aligned, extended_byte_aligned,
+     extended_bit_aligned, mixed, tracing].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [byte_aligned,bit_aligned,extended_byte_aligned,
-     extended_bit_aligned,mixed,tracing].
 
 
 byte_aligned(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/bs_bit_binaries_SUITE.erl b/erts/emulator/test/bs_bit_binaries_SUITE.erl
index 52bb925385..76d2661592 100644
--- a/erts/emulator/test/bs_bit_binaries_SUITE.erl
+++ b/erts/emulator/test/bs_bit_binaries_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -22,18 +22,38 @@
 
 -module(bs_bit_binaries_SUITE).
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 misc/1,horrid_match/1,test_bitstr/1,test_bit_size/1,asymmetric_tests/1,
 	 big_asymmetric_tests/1,binary_to_and_from_list/1,
 	 big_binary_to_and_from_list/1,send_and_receive/1,
 	 send_and_receive_alot/1,append/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [misc, horrid_match, test_bitstr, test_bit_size,
+     asymmetric_tests, big_asymmetric_tests,
+     binary_to_and_from_list, big_binary_to_and_from_list,
+     send_and_receive, send_and_receive_alot, append].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [misc,horrid_match,test_bitstr,test_bit_size,asymmetric_tests,
-     big_asymmetric_tests,binary_to_and_from_list,big_binary_to_and_from_list,
-     send_and_receive,send_and_receive_alot,append].
 
 misc(Config) when is_list(Config) ->
     ?line <<1:100>> = id(<<1:100>>),
diff --git a/erts/emulator/test/bs_construct_SUITE.erl b/erts/emulator/test/bs_construct_SUITE.erl
index 3d9b51d278..dd77278307 100644
--- a/erts/emulator/test/bs_construct_SUITE.erl
+++ b/erts/emulator/test/bs_construct_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -21,22 +21,39 @@
 
 -module(bs_construct_SUITE).
 
--export([all/1,
+-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, 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,
 	 copy_writable_binary/1, kostis/1, dynamic/1, bs_add/1,
-	 otp_7422/1]).
+	 otp_7422/1, zero_width/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
-all(suite) ->
-    [test1, test2, test3, test4, test5, testf,
-     not_used, in_guard, mem_leak, coerce_to_float, bjorn,
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+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,
-     copy_writable_binary, kostis, dynamic, bs_add,
-     otp_7422].
+     copy_writable_binary, kostis, dynamic, bs_add, otp_7422, zero_width].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 big(1) ->
     57285702734876389752897683.
@@ -786,5 +803,20 @@ otp_7422_bin(N) when N < 512 ->
 	       end),
     otp_7422_bin(N+1);
 otp_7422_bin(_) -> ok.
+
+zero_width(Config) when is_list(Config) ->
+    ?line Z = id(0),
+    Small = id(42),
+    Big = id(1 bsl 128),
+    ?line <<>> = <<Small:Z>>,
+    ?line <<>> = <<Small:0>>,
+    ?line <<>> = <<Big:Z>>,
+    ?line <<>> = <<Big:0>>,
+    
+    ?line {'EXIT',{badarg,_}} = (catch <<not_a_number:0>>),
+    ?line {'EXIT',{badarg,_}} = (catch <<(id(not_a_number)):Z>>),
+    ?line {'EXIT',{badarg,_}} = (catch <<(id(not_a_number)):0>>),
+
+    ok.
     
 id(I) -> I.
diff --git a/erts/emulator/test/bs_match_bin_SUITE.erl b/erts/emulator/test/bs_match_bin_SUITE.erl
index 3d054a279f..5a028835e6 100644
--- a/erts/emulator/test/bs_match_bin_SUITE.erl
+++ b/erts/emulator/test/bs_match_bin_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -19,12 +19,32 @@
 
 -module(bs_match_bin_SUITE).
 
--export([all/1,byte_split_binary/1,bit_split_binary/1,match_huge_bin/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 byte_split_binary/1,bit_split_binary/1,match_huge_bin/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [byte_split_binary, bit_split_binary, match_huge_bin].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [byte_split_binary,bit_split_binary,match_huge_bin].
 
 byte_split_binary(doc) -> "Tries to split a binary at all byte-aligned positions.";
 byte_split_binary(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/bs_match_int_SUITE.erl b/erts/emulator/test/bs_match_int_SUITE.erl
index 99dee7c7bc..093ef906c8 100644
--- a/erts/emulator/test/bs_match_int_SUITE.erl
+++ b/erts/emulator/test/bs_match_int_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -18,16 +18,36 @@
 
 -module(bs_match_int_SUITE).
 
--export([all/1,integer/1,signed_integer/1,dynamic/1,more_dynamic/1,mml/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 integer/1,signed_integer/1,dynamic/1,more_dynamic/1,mml/1,
 	 match_huge_int/1,bignum/1,unaligned_32_bit/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -import(lists, [seq/2]).
 
-all(suite) ->
-    [integer,signed_integer,dynamic,more_dynamic,mml,match_huge_int,bignum,
-     unaligned_32_bit].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [integer, signed_integer, dynamic, more_dynamic, mml,
+     match_huge_int, bignum, unaligned_32_bit].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 integer(Config) when is_list(Config) ->
     ?line 0 = get_int(mkbin([])),
diff --git a/erts/emulator/test/bs_match_misc_SUITE.erl b/erts/emulator/test/bs_match_misc_SUITE.erl
index 6de2ef67e5..ad21e01f7e 100644
--- a/erts/emulator/test/bs_match_misc_SUITE.erl
+++ b/erts/emulator/test/bs_match_misc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -18,18 +18,38 @@
 %%
 -module(bs_match_misc_SUITE).
 
--export([all/1,bound_var/1,bound_tail/1,t_float/1,little_float/1,sean/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 bound_var/1,bound_tail/1,t_float/1,little_float/1,sean/1,
 	 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]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+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].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [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].
 
 bound_var(doc) -> "Test matching of bound variables.";
 bound_var(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/bs_match_tail_SUITE.erl b/erts/emulator/test/bs_match_tail_SUITE.erl
index b0b0779b65..b8f7789f60 100644
--- a/erts/emulator/test/bs_match_tail_SUITE.erl
+++ b/erts/emulator/test/bs_match_tail_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -20,11 +20,31 @@
 -module(bs_match_tail_SUITE).
 
 -author('[email protected]').
--export([all/1,aligned/1,unaligned/1,zero_tail/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,aligned/1,unaligned/1,zero_tail/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [aligned, unaligned, zero_tail].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> [aligned,unaligned,zero_tail].
 
 aligned(doc) -> "Test aligned tails.";
 aligned(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/bs_utf_SUITE.erl b/erts/emulator/test/bs_utf_SUITE.erl
index 87adc5197b..626a8b4cb6 100644
--- a/erts/emulator/test/bs_utf_SUITE.erl
+++ b/erts/emulator/test/bs_utf_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -19,13 +19,15 @@
 
 -module(bs_utf_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 utf8_roundtrip/1,utf16_roundtrip/1,utf32_roundtrip/1,
 	 utf8_illegal_sequences/1,utf16_illegal_sequences/1,
 	 utf32_illegal_sequences/1,
 	 bad_construction/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(FAIL(Expr), ?line fail_check(catch Expr, ??Expr, [])).
 
@@ -33,14 +35,32 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog = ?t:timetrap(?t:minutes(6)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
-all(suite) ->
-    [utf8_roundtrip,utf16_roundtrip,utf32_roundtrip,
-     utf8_illegal_sequences,utf16_illegal_sequences,
-     utf32_illegal_sequences,bad_construction].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [utf8_roundtrip, utf16_roundtrip, utf32_roundtrip,
+     utf8_illegal_sequences, utf16_illegal_sequences,
+     utf32_illegal_sequences, bad_construction].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 utf8_roundtrip(Config) when is_list(Config) ->
     ?line utf8_roundtrip(0, 16#D7FF),
diff --git a/erts/emulator/test/busy_port_SUITE.erl b/erts/emulator/test/busy_port_SUITE.erl
index 7350aef4ec..e754d161a3 100644
--- a/erts/emulator/test/busy_port_SUITE.erl
+++ b/erts/emulator/test/busy_port_SUITE.erl
@@ -19,21 +19,40 @@
 
 -module(busy_port_SUITE).
 
--export([all/1, io_to_busy/1, message_order/1, send_3/1, 
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 io_to_busy/1, message_order/1, send_3/1, 
 	 system_monitor/1, no_trap_exit/1,
 	 no_trap_exit_unlinked/1, trap_exit/1, multiple_writers/1,
 	 hard_busy_driver/1, soft_busy_driver/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Internal exports.
 -export([init/2]).
 
-all(suite) -> {req, [dynamic_loading],
-	       [io_to_busy, message_order, send_3, 
-		system_monitor, no_trap_exit,
-		no_trap_exit_unlinked, trap_exit, multiple_writers,
-		hard_busy_driver, soft_busy_driver]}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [io_to_busy, message_order, send_3, system_monitor,
+     no_trap_exit, no_trap_exit_unlinked, trap_exit,
+     multiple_writers, hard_busy_driver, soft_busy_driver].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% Tests I/O operations to a busy port, to make sure a suspended send
 %% operation is correctly restarted.  This used to crash Beam.
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl
index e0528955b0..11e8085cff 100644
--- a/erts/emulator/test/call_trace_SUITE.erl
+++ b/erts/emulator/test/call_trace_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -20,7 +20,9 @@
 
 -module(call_trace_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 hipe/1,process_specs/1,basic/1,flags/1,errors/1,pam/1,change_pam/1,
 	 return_trace/1,exception_trace/1,on_load/1,deep_exception/1,
 	 exception_nocatch/1,bit_syntax/1]).
@@ -35,25 +37,44 @@
 -export([abbr/1,abbr/2]).
 
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(P, 20).
 
-all(suite) ->
-    Common = [errors,on_load],
-    NotHipe = [process_specs,basic,flags,pam,change_pam,return_trace,
-	       exception_trace,deep_exception,exception_nocatch,bit_syntax],
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    Common = [errors, on_load],
+    NotHipe = [process_specs, basic, flags, pam, change_pam,
+	       return_trace, exception_trace, deep_exception,
+	       exception_nocatch, bit_syntax],
     Hipe = [hipe],
-    case test_server:is_native(?MODULE) of
+    case test_server:is_native(call_trace_SUITE) of
 	true -> Hipe ++ Common;
 	false -> NotHipe ++ Common
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog = ?t:timetrap(?t:seconds(30)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
diff --git a/erts/emulator/test/code_SUITE.erl b/erts/emulator/test/code_SUITE.erl
index 33351a3cc9..703a00a598 100644
--- a/erts/emulator/test/code_SUITE.erl
+++ b/erts/emulator/test/code_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -18,18 +18,38 @@
 %%
 
 -module(code_SUITE).
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 new_binary_types/1,t_check_process_code/1,t_check_process_code_ets/1,
 	 external_fun/1,get_chunk/1,module_md5/1,make_stub/1,
 	 make_stub_many_funs/1,constant_pools/1,
 	 false_dependency/1,coverage/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [new_binary_types, t_check_process_code,
+     t_check_process_code_ets, external_fun, get_chunk,
+     module_md5, make_stub, make_stub_many_funs,
+     constant_pools, false_dependency, coverage].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [new_binary_types,t_check_process_code,t_check_process_code_ets,
-     external_fun,get_chunk,module_md5,make_stub,make_stub_many_funs,
-     constant_pools,false_dependency,coverage].
 
 new_binary_types(Config) when is_list(Config) ->
     ?line Data = ?config(data_dir, Config),
@@ -320,6 +340,9 @@ make_stub(Config) when is_list(Config) ->
 	(catch code:make_stub_module(my_code_test,
 				     bit_sized_binary(Code),
 				     {[],[]})),
+    ?line {'EXIT',{badarg,_}} =
+	(catch code:make_stub_module(my_code_test_with_wrong_name,
+				     Code, {[],[]})),
     ok.
 
 make_stub_many_funs(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/crypto_SUITE.erl b/erts/emulator/test/crypto_SUITE.erl
index e3d34b923d..a8cc175303 100644
--- a/erts/emulator/test/crypto_SUITE.erl
+++ b/erts/emulator/test/crypto_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -19,14 +19,34 @@
 
 -module(crypto_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 t_md5/1,t_md5_update/1,error/1,unaligned_context/1,random_lists/1,
 	 misc_errors/1]).
 
-all(suite) ->
-    [t_md5,t_md5_update,error,unaligned_context,random_lists,misc_errors].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [t_md5, t_md5_update, error, unaligned_context,
+     random_lists, misc_errors].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 misc_errors(doc) ->
diff --git a/erts/emulator/test/crypto_reference.erl b/erts/emulator/test/crypto_reference.erl
index 99107e3b57..b91535a50e 100644
--- a/erts/emulator/test/crypto_reference.erl
+++ b/erts/emulator/test/crypto_reference.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
diff --git a/erts/emulator/test/ddll_SUITE.erl b/erts/emulator/test/ddll_SUITE.erl
index 79047d7de5..ef607bf407 100644
--- a/erts/emulator/test/ddll_SUITE.erl
+++ b/erts/emulator/test/ddll_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -30,7 +30,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
--export([all/1, ddll_test/1, errors/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, ddll_test/1, errors/1,
 	 reference_count/1,
 	 kill_port/1, dont_kill_port/1]).
 -export([unload_on_process_exit/1, delayed_unload_with_ports/1, 
@@ -50,35 +51,39 @@
 
 -import(ordsets, [subtract/2]).
 
--include("test_server.hrl").
-
-all(suite) ->
-    [ddll_test, errors,
-     reference_count,
-     kill_port,
-     dont_kill_port,
-     properties,
-     load_and_unload,
-     unload_on_process_exit, 
-     delayed_unload_with_ports, 
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [ddll_test, errors, reference_count, kill_port,
+     dont_kill_port, properties, load_and_unload,
+     unload_on_process_exit, delayed_unload_with_ports,
      unload_due_to_process_exit,
-     no_unload_due_to_process_exit, 
-     no_unload_due_to_process_exit_2,
-     unload_reload_thingie, 
-     unload_reload_thingie_2,
-     unload_reload_thingie_3,
-     reload_pending,
-     load_fail_init,
-     reload_pending_fail_init,
-     reload_pending_kill,
-     more_error_codes, 
-     forced_port_killing, 
-     no_trap_exit_and_kill_ports,
-     monitor_demonitor, 
-     monitor_demonitor_load,
-     new_interface,
-     lock_driver
-    ].
+     no_unload_due_to_process_exit,
+     no_unload_due_to_process_exit_2, unload_reload_thingie,
+     unload_reload_thingie_2, unload_reload_thingie_3,
+     reload_pending, load_fail_init,
+     reload_pending_fail_init, reload_pending_kill,
+     more_error_codes, forced_port_killing,
+     no_trap_exit_and_kill_ports, monitor_demonitor,
+     monitor_demonitor_load, new_interface, lock_driver].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 unload_on_process_exit(suite) ->
     [];
diff --git a/erts/emulator/test/decode_packet_SUITE.erl b/erts/emulator/test/decode_packet_SUITE.erl
index 6cde286871..97ab470a3e 100644
--- a/erts/emulator/test/decode_packet_SUITE.erl
+++ b/erts/emulator/test/decode_packet_SUITE.erl
@@ -21,14 +21,34 @@
 
 -module(decode_packet_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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, packet_size/1, neg/1, http/1, line/1, ssl/1, otp_8536/1]).
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [basic, packet_size, neg, http, line, ssl, otp_8536].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Seed = {S1,S2,S3} = now(),
     random:seed(S1,S2,S3),
@@ -36,7 +56,7 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(1)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
@@ -304,6 +324,10 @@ http(Config) when is_list(Config) ->
 		   {ok, {http_request, 'GET', ResB, {1,1}}, Rest} = decode_pkt(http_bin,Bin) 
 	   end,
     lists:foreach(UriF, http_uri_variants()),
+
+    %% Response with empty phrase
+    ?line {ok,{http_response,{1,1},200,[]},<<>>} = decode_pkt(http, <<"HTTP/1.1 200\r\n">>, []),
+    ?line {ok,{http_response,{1,1},200,<<>>},<<>>} = decode_pkt(http_bin, <<"HTTP/1.1 200\r\n">>, []),
     ok.
 	     
 http_with_bin(http) ->
diff --git a/erts/emulator/test/dgawd_handler.erl b/erts/emulator/test/dgawd_handler.erl
index 881354b9da..27085b7b7e 100644
--- a/erts/emulator/test/dgawd_handler.erl
+++ b/erts/emulator/test/dgawd_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 7c19274696..d62eb00919 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -22,45 +22,71 @@
 
 %% Tests distribution and the tcp driver.
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,
-	 ping/1, bulk_send/1, bulk_send_small/1,
-	 bulk_send_big/1,
-	 local_send/1, local_send_small/1, local_send_big/1,
+-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,
+	 bulk_send_big/1, bulk_send_bigbig/1,
+	 local_send_small/1, local_send_big/1,
 	 local_send_legal/1, link_to_busy/1, exit_to_busy/1,
 	 lost_exit/1, link_to_dead/1, link_to_dead_new_node/1,
 	 applied_monitor_node/1, ref_port_roundtrip/1, nil_roundtrip/1,
-	 trap_bif/1, trap_bif_1/1, trap_bif_2/1, trap_bif_3/1,
-	 stop_dist/1, dist_auto_connect/1, 
+	 trap_bif_1/1, trap_bif_2/1, trap_bif_3/1,
+	 stop_dist/1, 
 	 dist_auto_connect_never/1, dist_auto_connect_once/1,
 	 dist_parallel_send/1,
 	 atom_roundtrip/1,
 	 atom_roundtrip_r12b/1,
 	 contended_atom_cache_entry/1,
-	 bad_dist_ext/1,
+	 bad_dist_structure/1,
 	 bad_dist_ext_receive/1,
 	 bad_dist_ext_process_info/1,
 	 bad_dist_ext_control/1,
 	 bad_dist_ext_connection_id/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Internal exports.
 -export([sender/3, receiver2/2, dummy_waiter/0, dead_process/0,
 	 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]).
-
-all(suite) -> [
-	       ping, bulk_send, local_send, link_to_busy, exit_to_busy,
-	       lost_exit, link_to_dead, link_to_dead_new_node,
-	       applied_monitor_node, ref_port_roundtrip, nil_roundtrip,
-	       stop_dist, trap_bif, dist_auto_connect, dist_parallel_send,
-	       atom_roundtrip, atom_roundtrip_r12b,
-	       contended_atom_cache_entry,
-	       bad_dist_ext
-	      ].
+	 dist_evil_parallel_receiver/0,
+         sendersender/4, sendersender2/4]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [ping, {group, bulk_send}, {group, local_send},
+     link_to_busy, exit_to_busy, lost_exit, link_to_dead,
+     link_to_dead_new_node, applied_monitor_node,
+     ref_port_roundtrip, nil_roundtrip, stop_dist,
+     {group, trap_bif}, {group, dist_auto_connect},
+     dist_parallel_send, atom_roundtrip, atom_roundtrip_r12b,
+     contended_atom_cache_entry, bad_dist_structure, {group, bad_dist_ext}].
+
+groups() -> 
+    [{bulk_send, [], [bulk_send_small, bulk_send_big, bulk_send_bigbig]},
+     {local_send, [],
+      [local_send_small, local_send_big, local_send_legal]},
+     {trap_bif, [], [trap_bif_1, trap_bif_2, trap_bif_3]},
+     {dist_auto_connect, [],
+      [dist_auto_connect_never, dist_auto_connect_once]},
+     {bad_dist_ext, [],
+      [bad_dist_ext_receive, bad_dist_ext_process_info,
+       bad_dist_ext_control, bad_dist_ext_connection_id]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 -define(DEFAULT_TIMETRAP, 4*60*1000).
 
@@ -68,7 +94,7 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?DEFAULT_TIMETRAP),
     [{watchdog, Dog},{testcase, Func}|Config].
 
-fin_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
+end_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
@@ -116,19 +142,15 @@ ping(Config) when is_list(Config) ->
 
     ok.
 
-bulk_send(doc) ->
- ["Tests sending large amount of data to another node and measure",
-  "the time. This tests that a process that is suspended on a ",
-  "busy port will eventually be resumed."];
-bulk_send(suite) ->
-    [bulk_send_small, bulk_send_big].
-
 bulk_send_small(Config) when is_list(Config) ->
     ?line bulk_send(64, 32).
 
 bulk_send_big(Config) when is_list(Config) ->
     ?line bulk_send(32, 64).
 
+bulk_send_bigbig(Config) when is_list(Config) ->
+    ?line bulk_sendsend(32*5, 4).
+
 bulk_send(Terms, BinSize) ->
     ?line Dog = test_server:timetrap(test_server:seconds(30)),
 
@@ -145,6 +167,53 @@ bulk_send(Terms, BinSize) ->
     ?line test_server:timetrap_cancel(Dog),
     {comment, integer_to_list(trunc(Size/1024/Elapsed+0.5)) ++ " K/s"}.
 
+bulk_sendsend(Terms, BinSize) ->
+    {Rate1, MonitorCount1} = bulk_sendsend2(Terms, BinSize,   5),
+    {Rate2, MonitorCount2} = bulk_sendsend2(Terms, BinSize, 995),
+    Ratio = if MonitorCount2 == 0 -> MonitorCount1 / 1.0;
+               true               -> MonitorCount1 / MonitorCount2
+            end,
+    %% A somewhat arbitrary ratio, but hopefully one that will accomodate
+    %% a wide range of CPU speeds.
+    true = (Ratio > 8.0),
+    {comment,
+     integer_to_list(Rate1) ++ " K/s, " ++
+     integer_to_list(Rate2) ++ " K/s, " ++
+     integer_to_list(MonitorCount1) ++ " monitor msgs, " ++
+     integer_to_list(MonitorCount2) ++ " monitor msgs, " ++
+     float_to_list(Ratio) ++ " monitor ratio"}.    
+
+bulk_sendsend2(Terms, BinSize, BusyBufSize) ->
+    ?line Dog = test_server:timetrap(test_server:seconds(30)),
+
+    ?line io:format("Sending ~w binaries, each of size ~w K",
+		    [Terms, BinSize]),
+    ?line {ok, NodeRecv} = start_node(bulk_receiver),
+    ?line Recv = spawn(NodeRecv, erlang, apply, [fun receiver/2, [0, 0]]),
+    ?line Bin = list_to_binary(lists:duplicate(BinSize*1024, 253)),
+    %%?line Size = Terms*size(Bin),
+
+    %% SLF LEFT OFF HERE.
+    %% When the caller uses small hunks, like 4k via
+    %% bulk_sendsend(32*5, 4), then (on my laptop at least), we get
+    %% zero monitor messages.  But if we use "+zdbbl 5", then we
+    %% get a lot of monitor messages.  So, if we can count up the
+    %% total number of monitor messages that we get when running both
+    %% default busy size and "+zdbbl 5", and if the 5 case gets
+    %% "many many more" monitor messages, then we know we're working.
+
+    ?line {ok, NodeSend} = start_node(bulk_sender, "+zdbbl " ++ integer_to_list(BusyBufSize)),
+    ?line _Send = spawn(NodeSend, erlang, apply, [fun sendersender/4, [self(), Recv, Bin, Terms]]),
+    ?line {Elapsed, {_TermsN, SizeN}, MonitorCount} =
+        receive {sendersender, BigRes} ->
+                BigRes
+        end,
+    ?line stop_node(NodeRecv),
+    ?line stop_node(NodeSend),
+
+    ?line test_server:timetrap_cancel(Dog),
+    {trunc(SizeN/1024/Elapsed+0.5), MonitorCount}.
+
 sender(To, _Bin, 0) ->
     To ! {done, self()},
     receive
@@ -155,6 +224,43 @@ sender(To, Bin, Left) ->
     To ! {term, Bin},
     sender(To, Bin, Left-1).
 
+%% Sender process to be run on a slave node
+
+sendersender(Parent, To, Bin, Left) ->
+    erlang:system_monitor(self(), [busy_dist_port]),
+    [spawn(fun() -> sendersender2(To, Bin, Left, false) end) ||
+        _ <- lists:seq(1,1)],
+    {USec, {Res, MonitorCount}} =
+        timer:tc(?MODULE, sendersender2, [To, Bin, Left, true]),
+    Parent ! {sendersender, {USec/1000000, Res, MonitorCount}}.
+
+sendersender2(To, Bin, Left, SendDone) ->
+    sendersender3(To, Bin, Left, SendDone, 0).
+
+sendersender3(To, _Bin, 0, SendDone, MonitorCount) ->
+    if SendDone ->
+            To ! {done, self()};
+       true ->
+            ok
+    end,
+    receive
+        {monitor, _Pid, _Type, _Info} ->
+            sendersender3(To, _Bin, 0, SendDone, MonitorCount + 1)
+    after 0 ->
+            if SendDone ->
+                    receive
+                        Any when is_tuple(Any), size(Any) == 2 ->
+                            {Any, MonitorCount}
+                    end;
+               true ->
+                    exit(normal)
+            end
+    end;
+sendersender3(To, Bin, Left, SendDone, MonitorCount) ->
+    To ! {term, Bin},
+    %%timer:sleep(50),
+    sendersender3(To, Bin, Left-1, SendDone, MonitorCount).
+
 %% Receiver process to be run on a slave node.
 
 receiver(Terms, Size) ->
@@ -166,17 +272,14 @@ receiver(Terms, Size) ->
     end.
 
 
-local_send(suite) ->
-    [local_send_small, local_send_big, local_send_legal];
-local_send(doc) ->
-    ["Tests sending small and big messages to a non-existing ",
-     "local registered process."].
 
 local_send_big(doc) ->
     ["Sends several big message to an non-registered process on ",
      "the local node."];
 local_send_big(Config) when is_list(Config) ->
-    Data0=local_send_big(doc)++local_send(doc),
+    Data0=local_send_big(doc)++
+	["Tests sending small and big messages to a non-existing ",
+        "local registered process."],
     Data1=[Data0,[Data0, Data0, [Data0], Data0],Data0],
     Data2=Data0++lists:flatten(Data1)++
 	list_to_binary(lists:flatten(Data1)),
@@ -433,7 +536,7 @@ sink1() ->
 
 lost_exit(doc) ->
     "Test that EXIT and DOWN messages send to another node are not lost if "
-	"if the distribution port is busy.";
+	"the distribution port is busy.";
 lost_exit(Config) when is_list(Config) ->
     ?line {ok, Node} = start_node(lost_exit),
 
@@ -662,9 +765,6 @@ stop_dist(Config) when is_list(Config) ->
 
     ok.
 
-trap_bif(doc) ->
-    ["Verifies that BIFs which are traps to Erlang work (OTP-2680)."];
-trap_bif(suite) -> [trap_bif_1, trap_bif_2, trap_bif_3].
 
 trap_bif_1(doc) ->
     [""];
@@ -701,10 +801,6 @@ tr3() ->
 
 
 
-dist_auto_connect(doc) ->
-    ["Tests the kernel parameter 'dist_auto_connect'."];
-dist_auto_connect(suite) ->
-    [dist_auto_connect_never, dist_auto_connect_once].
 
 % This has to be done by nodes with differrent cookies, otherwise global
 % will connect nodes, which is correct, but makes it hard to test.
@@ -1054,8 +1150,7 @@ contended_atom_cache_entry(Config) when is_list(Config) ->
     ?line {ok, SNode} = start_node(Config),
     ?line {ok, RNode} = start_node(Config),
     ?line Success = make_ref(),
-    ?line Mstr
-	= spawn_link(
+    ?line spawn_link(
 	    SNode,
 	    fun () ->
 		    erts_debug:set_internal_state(available_internal_state,
@@ -1112,13 +1207,13 @@ contended_atom_cache_entry(Config) when is_list(Config) ->
     ?line stop_node(RNode),
     ?line ok.
 
-send_ref_atom(To, Ref, Atom, 0) ->
+send_ref_atom(_To, _Ref, _Atom, 0) ->
     ok;
 send_ref_atom(To, Ref, Atom, N) ->
     To ! {Ref, Atom},
     send_ref_atom(To, Ref, Atom, N-1).
 
-receive_ref_atom(Ref, Atom, 0) ->
+receive_ref_atom(_Ref, _Atom, 0) ->
     ok;
 receive_ref_atom(Ref, Atom, N) ->
     receive
@@ -1153,7 +1248,7 @@ unwanted_cixs() ->
 	      nodes()).
     
     
-get_conflicting_atoms(CIX, 0) ->
+get_conflicting_atoms(_CIX, 0) ->
     [];
 get_conflicting_atoms(CIX, N) ->
     {A, B, C} = now(),
@@ -1167,13 +1262,187 @@ get_conflicting_atoms(CIX, N) ->
 	    get_conflicting_atoms(CIX, N)
     end.
 
+-define(COOKIE, '').
+-define(DOP_LINK,		1).
+-define(DOP_SEND,		2).
+-define(DOP_EXIT,		3).
+-define(DOP_UNLINK,		4).
+-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).
+
+start_monitor(Offender,P) ->
+    ?line Parent = self(),
+    ?line Q = spawn(Offender,
+		    fun () -> 
+			    Ref = erlang:monitor(process,P),
+			    Parent ! {self(),ref,Ref},
+			    receive
+				just_stay_alive -> ok
+			    end
+		    end),
+    ?line Ref = receive
+		    {Q,ref,R} ->
+			R
+		after  5000 ->
+			error
+		end,
+    io:format("Ref is ~p~n",[Ref]),
+    ok.
+start_link(Offender,P) ->
+    ?line Parent = self(),
+    ?line Q = spawn(Offender,
+		    fun () ->
+			    process_flag(trap_exit,true),
+			    link(P),
+			    Parent ! {self(),ref,P},
+			    receive
+				just_stay_alive -> ok
+			    end
+		    end),
+    ?line Ref = receive
+		    {Q,ref,R} ->
+			R
+		after  5000 ->
+			error
+		end,
+    io:format("Ref is ~p~n",[Ref]),
+    ok.
+
+bad_dist_structure(suite) ->
+    [];
+bad_dist_structure(doc) ->
+    ["Test dist messages with valid structure (binary to term ok) but malformed"
+     "control content"];
+bad_dist_structure(Config) when is_list(Config) ->
+    %process_flag(trap_exit,true),
+    ODog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(ODog),
+    Dog = ?t:timetrap(?t:seconds(15)),
+
+    ?line {ok, Offender} = start_node(bad_dist_structure_offender),
+    ?line {ok, Victim} = start_node(bad_dist_structure_victim),
+    ?line start_node_monitors([Offender,Victim]),
+    ?line Parent = self(),
+    ?line 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),
+    ?line receive {P, started} -> ok end,
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line verify_up(Offender, Victim),
+    ?line true = lists:member(Offender, rpc:call(Victim, erlang, nodes, [])),
+    ?line start_monitor(Offender,P),
+    ?line P ! one,
+    ?line send_bad_structure(Offender, P,{?DOP_MONITOR_P_EXIT,'replace',P,normal},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line start_monitor(Offender,P),
+    ?line send_bad_structure(Offender, P,{?DOP_MONITOR_P_EXIT,'replace',P,normal,normal},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line start_link(Offender,P),
+    ?line send_bad_structure(Offender, P,{?DOP_LINK},0),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line start_link(Offender,P),
+    ?line send_bad_structure(Offender, P,{?DOP_UNLINK,'replace'},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line start_link(Offender,P),
+    ?line send_bad_structure(Offender, P,{?DOP_UNLINK,'replace',make_ref()},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line start_link(Offender,P),
+    ?line send_bad_structure(Offender, P,{?DOP_UNLINK,make_ref(),P},0),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line start_link(Offender,P),
+    ?line send_bad_structure(Offender, P,{?DOP_UNLINK,normal,normal},0),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line start_monitor(Offender,P),
+    ?line send_bad_structure(Offender, P,{?DOP_MONITOR_P,'replace',P},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line start_monitor(Offender,P),
+    ?line send_bad_structure(Offender, P,{?DOP_MONITOR_P,'replace',P,normal},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line start_monitor(Offender,P),
+    ?line send_bad_structure(Offender, P,{?DOP_DEMONITOR_P,'replace',P},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line start_monitor(Offender,P),
+    ?line send_bad_structure(Offender, P,{?DOP_DEMONITOR_P,'replace',P,normal},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_EXIT,'replace',P},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_EXIT,make_ref(),normal,normal},0),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_EXIT_TT,'replace',token,P},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_EXIT_TT,make_ref(),token,normal,normal},0),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_EXIT2,'replace',P},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_EXIT2,make_ref(),normal,normal},0),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_EXIT2_TT,'replace',token,P},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_EXIT2_TT,make_ref(),token,normal,normal},0),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace'},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace','atomic'},2),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace',P},0),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND_TT,'replace','',name},2,{message}),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND_TT,'replace','',name,token},0,{message}),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace',''},2,{message}),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',P},0,{message}),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',name},0,{message}),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',name,{token}},2,{message}),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_SEND_TT,'',P},0,{message}),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_SEND_TT,'',name,token},0,{message}),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_SEND,''},0,{message}),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_SEND,'',name},0,{message}),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line send_bad_structure(Offender, P,{?DOP_SEND,'',P,{token}},0,{message}),
+    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    ?line P ! two,
+    ?line P ! check_msgs,
+    ?line receive 
+	      {P, messages_checked} -> ok 
+	  after 5000 ->
+		  exit(victim_is_dead)
+	  end,
+
+    ?line {message_queue_len, 0}
+	= rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
+    
+    ?line unlink(P),
+    ?line P ! done,
+    ?line stop_node(Offender),
+    ?line stop_node(Victim),
+    ?t:timetrap_cancel(Dog),
+    ok.
 
-bad_dist_ext(doc) -> [];
-bad_dist_ext(suite) ->
-    [bad_dist_ext_receive,
-     bad_dist_ext_process_info,
-     bad_dist_ext_control,
-     bad_dist_ext_connection_id].
 
 
 bad_dist_ext_receive(Config) when is_list(Config) ->
@@ -1394,6 +1663,22 @@ bad_dist_ext_connection_id(Config) when is_list(Config) ->
     ?line stop_node(Victim).
 
 
+bad_dist_struct_check_msgs([]) ->
+    receive
+	Msg ->
+	    exit({unexpected_message, Msg})
+    after 0 ->
+	    ok
+    end;
+bad_dist_struct_check_msgs([M|Ms]) ->
+    receive
+	{'EXIT',_,_} = EM ->
+	    io:format("Ignoring exit message: ~p~n",[EM]),
+	    bad_dist_struct_check_msgs([M|Ms]);
+	Msg ->
+	    M = Msg,
+	    bad_dist_struct_check_msgs(Ms)
+    end.
 bad_dist_ext_check_msgs([]) ->
     receive
 	Msg ->
@@ -1408,24 +1693,6 @@ bad_dist_ext_check_msgs([M|Ms]) ->
 	    bad_dist_ext_check_msgs(Ms)
     end.
     
--define(COOKIE, '').
--define(DOP_LINK,		1).
--define(DOP_SEND,		2).
--define(DOP_EXIT,		3).
--define(DOP_UNLINK,		4).
--define(DOP_NODE_LINK,		5).
--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).
 
 dport_reg_send(Node, Name, Msg) ->
     DPrt = case dport(Node) of
@@ -1457,6 +1724,39 @@ dport_send(To, Msg) ->
 				  ?COOKIE,
 				  To}),
 			dmsg_ext(Msg)]).
+send_bad_structure(Offender,Victim,Bad,WhereToPutSelf) ->
+    send_bad_structure(Offender,Victim,Bad,WhereToPutSelf,[]).
+send_bad_structure(Offender,Victim,Bad,WhereToPutSelf,PayLoad) ->
+    Parent = self(),
+    Done = make_ref(),
+    spawn(Offender,
+	  fun () ->
+		  Node = node(Victim),
+		  pong = net_adm:ping(Node),
+		  DPrt = dport(Node),
+		  Bad1 = case WhereToPutSelf of
+			     0 -> 
+				 Bad;
+			     N when N > 0 ->
+				 setelement(N,Bad,self())
+			 end,
+		  DData = [dmsg_hdr(),
+			   dmsg_ext(Bad1)] ++
+		      case PayLoad of
+			  [] -> [];
+			  _Other -> [dmsg_ext(PayLoad)]
+		      end,
+		  port_command(DPrt, DData),
+		  Parent ! {DData,Done}
+	  end),
+    receive 
+	{WhatSent,Done} -> 
+	    io:format("Offender sent ~p~n",[WhatSent]),
+	    ok
+    after 5000 ->
+	    exit(unable_to_send)
+    end.
+   
 
 %% send_bad_msgs():
 %% Send a valid distribution header and control message
@@ -1540,10 +1840,10 @@ dmsg_bad_hdr() ->
      255].  % 255 atom references
     
 
-dmsg_fake_hdr1() ->
-    A = <<"fake header atom 1">>,
-    [131, % Version Magic
-     $D, 1, 16#8, 0, size(A), A]. % Fake header
+%% dmsg_fake_hdr1() ->
+%%     A = <<"fake header atom 1">>,
+%%     [131, % Version Magic
+%%      $D, 1, 16#8, 0, size(A), A]. % Fake header
 
 dmsg_fake_hdr2() ->
     A1 = <<"fake header atom 1">>,
@@ -1728,7 +2028,7 @@ flush_node_changes() ->
 
 node_monitor_loop(Master) ->
     receive
-	{nodeup, Node, InfoList} = Msg ->
+	{nodeup, Node, _InfoList} = Msg ->
 	    Master ! {nodeup, node(), Node},
 	    ?t:format("~p ~p: ~p~n", [node(), erlang:now(), Msg]),
 	    node_monitor_loop(Master);
@@ -1765,9 +2065,9 @@ verify_no_down(A, B) ->
 	    ok
     end.
 
-verify_down(A, B) ->
-    receive {nodedown, A, B, _} -> ok end,
-    receive {nodedown, B, A, _} -> ok end.
+%% verify_down(A, B) ->
+%%     receive {nodedown, A, B, _} -> ok end,
+%%     receive {nodedown, B, A, _} -> ok end.
 
 verify_down(A, ReasonA, B, ReasonB) ->
     receive
@@ -1787,11 +2087,11 @@ from(H, [H | T]) -> T;
 from(H, [_ | T]) -> from(H, T);
 from(_, []) -> [].
 
-fun_spawn(Fun) ->
-    fun_spawn(Fun, []).
+%% fun_spawn(Fun) ->
+%%     fun_spawn(Fun, []).
 
-fun_spawn(Fun, Args) ->
-    spawn_link(erlang, apply, [Fun, Args]).
+%% fun_spawn(Fun, Args) ->
+%%     spawn_link(erlang, apply, [Fun, Args]).
 
 
 long_or_short() -> 
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 39b2ed395f..7600a44988 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -27,12 +27,12 @@
 %%% - queueing
 
 -module(driver_SUITE).
--export([all/1,
+-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,
-	 fin_per_testcase/2,
-	 end_per_suite/1,
+	 end_per_testcase/2,
 	 outputv_echo/1,
-	 timer/1,
+	
 	 timer_measure/1,
 	 timer_cancel/1,
 	 timer_change/1,
@@ -51,7 +51,7 @@
 	 'driver_system_info_ver1.1'/1,
 	 driver_system_info_current_ver/1,
 	 driver_monitor/1,
-	 ioq_exit/1,
+	
 	 ioq_exit_ready_input/1,
 	 ioq_exit_ready_output/1,
 	 ioq_exit_timeout/1,
@@ -78,7 +78,7 @@
 
 -export([bin_prefix/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 
 % First byte in communication with the timer driver
@@ -120,49 +120,51 @@ init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     ?line 0 = erts_debug:get_internal_state(check_io_debug),
     [{watchdog, Dog},{testcase, Case}|Config].
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     Dog = ?config(watchdog, Config),
-    erlang:display({fin_per_testcase, Case}),
+    erlang:display({end_per_testcase, Case}),
     ?line 0 = erts_debug:get_internal_state(check_io_debug),
     ?t:timetrap_cancel(Dog).
 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [fun_to_port, outputv_echo, queue_echo, {group, timer},
+     driver_unloaded, io_ready_exit, use_fallback_pollset,
+     bad_fd_in_pollset, driver_event, fd_change,
+     steal_control, otp_6602, 'driver_system_info_ver1.0',
+     'driver_system_info_ver1.1',
+     driver_system_info_current_ver, driver_monitor,
+     {group, ioq_exit}, zero_extended_marker_garb_drv,
+     invalid_extended_marker_drv, larger_major_vsn_drv,
+     larger_minor_vsn_drv, smaller_major_vsn_drv,
+     smaller_minor_vsn_drv, peek_non_existing_queue,
+     otp_6879, caller, many_events, missing_callbacks,
+     smp_select, driver_select_use,
+     thread_mseg_alloc_cache_clean].
+
+groups() -> 
+    [{timer, [],
+      [timer_measure, timer_cancel, timer_delay,
+       timer_change]},
+     {ioq_exit, [],
+      [ioq_exit_ready_input, ioq_exit_ready_output,
+       ioq_exit_timeout, ioq_exit_ready_async, ioq_exit_event,
+       ioq_exit_ready_input_async, ioq_exit_ready_output_async,
+       ioq_exit_timeout_async, ioq_exit_event_async]}].
+
+init_per_suite(Config) ->
+    Config.
+
 end_per_suite(_Config) ->
     catch erts_debug:set_internal_state(available_internal_state, false).
 
-all(suite) ->
-    [
-     fun_to_port,
-     outputv_echo,
-     queue_echo,
-     timer,
-     driver_unloaded,
-     io_ready_exit,
-     use_fallback_pollset,
-     bad_fd_in_pollset,
-     driver_event,
-     fd_change,
-     steal_control,
-     otp_6602,
-     'driver_system_info_ver1.0',
-     'driver_system_info_ver1.1',
-     driver_system_info_current_ver,
-     driver_monitor,
-     ioq_exit,
-     zero_extended_marker_garb_drv,
-     invalid_extended_marker_drv,
-     larger_major_vsn_drv,
-     larger_minor_vsn_drv,
-     smaller_major_vsn_drv,
-     smaller_minor_vsn_drv,
-     peek_non_existing_queue,
-     otp_6879,
-     caller,
-     many_events,
-     missing_callbacks,
-     smp_select,
-     driver_select_use,
-     thread_mseg_alloc_cache_clean
-    ].
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 fun_to_port(doc) -> "Test sending a fun to port with an outputv-capable driver.";
 fun_to_port(Config) when is_list(Config) ->
@@ -308,7 +310,6 @@ compare(Got, Expected) ->
 %% 		Driver timer test suites
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-timer(suite) -> [timer_measure,timer_cancel,timer_delay,timer_change].
 
 timer_measure(doc) -> ["Check that timers time out in good time."];
 timer_measure(Config) when is_list(Config) ->
@@ -1299,17 +1300,6 @@ driver_monitor(Config) when is_list(Config) ->
     ?line stop_driver(Port, Name),
     ?line ok.
 
-ioq_exit(doc) -> [];
-ioq_exit(suite) ->
-    [ioq_exit_ready_input,
-     ioq_exit_ready_output,
-     ioq_exit_timeout,
-     ioq_exit_ready_async,
-     ioq_exit_event,
-     ioq_exit_ready_input_async,
-     ioq_exit_ready_output_async,
-     ioq_exit_timeout_async,
-     ioq_exit_event_async].
 
 -define(IOQ_EXIT_READY_INPUT, 1).
 -define(IOQ_EXIT_READY_OUTPUT, 2).
@@ -1682,7 +1672,7 @@ smp_select0(Config) ->
     ProcFun = fun()-> io:format("Worker ~p starting\n",[self()]),	
 		      ?line Port = open_port({spawn, DrvName}, []),
 		      smp_select_loop(Port, 100000),
-		      sleep(500), % wait for driver to handle pending events
+		      sleep(1000), % wait for driver to handle pending events
 		      ?line true = erlang:port_close(Port),
 		      Master ! {ok,self()},
 		      io:format("Worker ~p finished\n",[self()])
@@ -1790,8 +1780,8 @@ mseg_alloc_ccc() ->
     mseg_alloc_ccc(erlang:system_info({allocator,mseg_alloc})).
 
 mseg_alloc_ccc(MsegAllocInfo) ->
-    ?line {value,{calls, CL}}
-	= lists:keysearch(calls, 1, MsegAllocInfo),
+    ?line {value,{memkind, MKL}} = lists:keysearch(memkind,1,MsegAllocInfo),
+    ?line {value,{calls, CL}} = lists:keysearch(calls, 1, MKL),
     ?line {value,{mseg_check_cache, GigaCCC, CCC}}
 	= lists:keysearch(mseg_check_cache, 1, CL),
     ?line GigaCCC*1000000000 + CCC.
@@ -1800,12 +1790,28 @@ mseg_alloc_cached_segments() ->
     mseg_alloc_cached_segments(erlang:system_info({allocator,mseg_alloc})).
 
 mseg_alloc_cached_segments(MsegAllocInfo) ->
+    MemName = case is_halfword_vm() of
+	true -> "high memory";
+	false -> "all memory"
+    end,
+    ?line [{memkind,DrvMem}]
+	= lists:filter(fun(E) -> case E of
+				    {memkind, [{name, MemName} | _]} -> true;
+				    _ -> false
+		       end end, MsegAllocInfo),
     ?line {value,{status, SL}}
-	= lists:keysearch(status, 1, MsegAllocInfo),
+	= lists:keysearch(status, 1, DrvMem),
     ?line {value,{cached_segments, CS}}
 	= lists:keysearch(cached_segments, 1, SL),
     ?line CS.
 
+is_halfword_vm() ->
+    case {erlang:system_info({wordsize, internal}),
+	  erlang:system_info({wordsize, external})} of
+	{4, 8} -> true;
+	{WS, WS} -> false
+    end.
+
 driver_alloc_sbct() ->
     {_, _, _, As} = erlang:system_info(allocator),
     case lists:keysearch(driver_alloc, 1, As) of
diff --git a/erts/emulator/test/driver_SUITE_data/chkio_drv.c b/erts/emulator/test/driver_SUITE_data/chkio_drv.c
index b571cb30e6..bbdb09cfcb 100644
--- a/erts/emulator/test/driver_SUITE_data/chkio_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/chkio_drv.c
@@ -102,6 +102,7 @@ typedef struct chkio_smp_select {
     int write_fd;
     int next_read;
     int next_write;
+    int first_write;
     enum {Closed, Opened, Selected, Waiting} state;
     int wasSelected;
     unsigned rand_state;
@@ -577,9 +578,16 @@ chkio_drv_ready_input(ErlDrvData drv_data, ErlDrvEvent event)
 	inPipe = (pip->next_write - pip->next_read);
 	if (inPipe == 0) {
 	    bytes = read(pip->read_fd, &word, sizeof(word));
-	    printf("Unexpected empty pipe, expected %u -> %u, bytes=%d, word=%d\n",
-		   pip->next_read, pip->next_write-1, bytes, word);
-	    abort();
+	    printf("Unexpected empty pipe, expected %u -> %u, bytes=%d, word=%d, written=%d\n",
+		   pip->next_read, pip->next_write-1, bytes, word,
+		   (pip->next_write - pip->first_write));
+	    /*abort();
+    	      Allow unexpected events as it's been seen to be triggered by epoll
+	      on Linux. Most of the time the unwanted events are filtered by
+	      the erl_check_io layer. But when fd's are reused the events may
+	      slip up to the driver.
+	    */
+	    break; 
 	}
 
 	n = rand_r(&pip->rand_state) % (inPipe*4);
@@ -1252,6 +1260,7 @@ chkio_drv_control(ErlDrvData drv_data,
 		pip->state = Opened;
 		pip->wasSelected = 0;
 		pip->next_write = pip->next_read = rand_r(&pip->rand_state) % 1024;
+		pip->first_write = pip->next_write;
 		if (op & 1) break;
 		op >>= 1;
 	    }/*fall through*/
diff --git a/erts/emulator/test/efile_SUITE.erl b/erts/emulator/test/efile_SUITE.erl
index 1d66b6ef70..0cac0636e0 100644
--- a/erts/emulator/test/efile_SUITE.erl
+++ b/erts/emulator/test/efile_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -17,12 +17,32 @@
 %% %CopyrightEnd%
 
 -module(efile_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([iter_max_files/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [iter_max_files].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> [iter_max_files].
 
 %%
 %% Open as many files as possible. Do this several times and check 
diff --git a/erts/emulator/test/emulator.spec b/erts/emulator/test/emulator.spec
index ed5bd48e84..1ea751cc3b 100644
--- a/erts/emulator/test/emulator.spec
+++ b/erts/emulator/test/emulator.spec
@@ -1 +1 @@
-{topcase, {dir, "../emulator_test"}}.
+{suites,"../emulator_test",all}.
diff --git a/erts/emulator/test/erl_drv_thread_SUITE.erl b/erts/emulator/test/erl_drv_thread_SUITE.erl
index ea618e9feb..bc9e610af3 100644
--- a/erts/emulator/test/erl_drv_thread_SUITE.erl
+++ b/erts/emulator/test/erl_drv_thread_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -19,18 +19,36 @@
 
 -module(erl_drv_thread_SUITE).
 -author('[email protected]').
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([basic/1, rwlock/1, tsd/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(DEFAULT_TIMETRAP_SECS, 240).
 
-all(doc) -> [];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [basic, rwlock, tsd].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%                                                                        %%
 %% Testcases                                                              %%
diff --git a/erts/emulator/test/erl_link_SUITE.erl b/erts/emulator/test/erl_link_SUITE.erl
index 542c8dffbe..84d17c9596 100644
--- a/erts/emulator/test/erl_link_SUITE.erl
+++ b/erts/emulator/test/erl_link_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -28,9 +28,10 @@
 -author('[email protected]').
 
 %-define(line_trace, 1).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 % Test cases
 -export([links/1,
@@ -46,7 +47,7 @@
 	 otp_5772_dist_monitor/1,
 	 otp_7946/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 % Internal exports
 -export([test_proc/0]).
@@ -77,11 +78,29 @@
 
 
 
-all(suite) -> [links, dist_links, monitor_nodes, process_monitors,
-	       dist_process_monitors, busy_dist_port_monitor,
-	       busy_dist_port_link, otp_5772_link, otp_5772_dist_link,
-	       otp_5772_monitor, otp_5772_dist_monitor,
-	       otp_7946].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [links, dist_links, monitor_nodes, process_monitors,
+     dist_process_monitors, busy_dist_port_monitor,
+     busy_dist_port_link, otp_5772_link, otp_5772_dist_link,
+     otp_5772_monitor, otp_5772_dist_monitor, otp_7946].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    catch erts_debug:set_internal_state(available_internal_state, false).
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 links(doc) -> ["Tests node local links"];
 links(suite) -> [];
@@ -678,13 +697,10 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     end,
     ?line [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     ?line Dog = ?config(watchdog, Config),
     ?line ?t:timetrap_cancel(Dog).
 
-end_per_suite(_Config) ->
-    catch erts_debug:set_internal_state(available_internal_state, false).
-
 tp_call(Tp, Fun) ->
     ?line R = make_ref(),
     ?line Tp ! {call, self(), R, Fun},
@@ -1050,7 +1066,6 @@ stop_node(Node) ->
 -define(DOP_SEND,		2).
 -define(DOP_EXIT,		3).
 -define(DOP_UNLINK,		4).
--define(DOP_NODE_LINK,		5).
 -define(DOP_REG_SEND,		6).
 -define(DOP_GROUP_LEADER,	7).
 -define(DOP_EXIT2,		8).
diff --git a/erts/emulator/test/erts_debug_SUITE.erl b/erts/emulator/test/erts_debug_SUITE.erl
index e60a999df1..9a6a6f4c05 100644
--- a/erts/emulator/test/erts_debug_SUITE.erl
+++ b/erts/emulator/test/erts_debug_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -18,19 +18,40 @@
 %%
 
 -module(erts_debug_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
-	 flat_size/1,flat_size_big/1,df/1]).
+-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,
+	 flat_size/1,flat_size_big/1,df/1,
+	 instructions/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [flat_size, flat_size_big, df, instructions].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [flat_size,flat_size_big,df].
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(2)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
@@ -70,3 +91,8 @@ df(Config) when is_list(Config) ->
 
 pps() ->
     {erlang:ports()}.
+
+instructions(Config) when is_list(Config) ->
+    ?line Is = erts_debug:instructions(),
+    ?line _ = [list_to_atom(I) || I <- Is],
+    ok.
diff --git a/erts/emulator/test/estone_SUITE.erl b/erts/emulator/test/estone_SUITE.erl
index 7fb92faf0d..a4cb76dde1 100644
--- a/erts/emulator/test/estone_SUITE.erl
+++ b/erts/emulator/test/estone_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
@@ -18,8 +18,9 @@
 
 -module(estone_SUITE).
 %% Test functions
--export([all/1,estone/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,estone/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Internal exports for EStone tests
 -export([lists/1,
@@ -44,7 +45,7 @@
 	 run_micro/3,p1/1,ppp/3,macro/2,micros/0]).
 
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test suite defines
 -define(default_timeout, ?t:minutes(10)).
@@ -68,12 +69,31 @@
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> [estone].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [estone].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 estone(suite) ->
     [];
diff --git a/erts/emulator/test/evil_SUITE.erl b/erts/emulator/test/evil_SUITE.erl
index a8288584f4..5c59184fe2 100644
--- a/erts/emulator/test/evil_SUITE.erl
+++ b/erts/emulator/test/evil_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
@@ -18,7 +18,9 @@
 
 -module(evil_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 heap_frag/1,
 	 encode_decode_ext/1,
 	 decode_integer_ext/1,
@@ -30,26 +32,37 @@
 	 decode_pos_neg_zero/1
 	]).
 
--include("test_server.hrl").
-
-all(suite) ->
-    [
-     heap_frag,
-     encode_decode_ext,
-     decode_integer_ext,
-     decode_small_big_ext,
-     decode_large_big_ext,
-     decode_small_big_ext_neg,
-     decode_large_big_ext_neg,
-     decode_too_small,
-     decode_pos_neg_zero
-    ].
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [heap_frag, encode_decode_ext, decode_integer_ext,
+     decode_small_big_ext, decode_large_big_ext,
+     decode_small_big_ext_neg, decode_large_big_ext_neg,
+     decode_too_small, decode_pos_neg_zero].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog = test_server:timetrap(?t:minutes(0.5)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/erts/emulator/test/exception_SUITE.erl b/erts/emulator/test/exception_SUITE.erl
index f1e6e004ad..7041ad32de 100644
--- a/erts/emulator/test/exception_SUITE.erl
+++ b/erts/emulator/test/exception_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -19,20 +19,40 @@
 
 -module(exception_SUITE).
 
--export([all/1, badmatch/1, pending_errors/1, nil_arith/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 badmatch/1, pending_errors/1, nil_arith/1,
          stacktrace/1, nested_stacktrace/1, raise/1, gunilla/1, per/1,
 	 exception_with_heap_frag/1]).
 
 -export([bad_guy/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -import(lists, [foreach/2]).
 
-all(suite) ->
-    [badmatch, pending_errors, nil_arith, 
-     stacktrace, nested_stacktrace, raise, gunilla, per,
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [badmatch, pending_errors, nil_arith, stacktrace,
+     nested_stacktrace, raise, gunilla, per,
      exception_with_heap_frag].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 -define(try_match(E),
 	catch ?MODULE:bar(),
 	{'EXIT', {{badmatch, nomatch}, _}} = (catch E = id(nomatch))).
diff --git a/erts/emulator/test/float_SUITE.erl b/erts/emulator/test/float_SUITE.erl
index 102e472ea6..c79a1d9900 100644
--- a/erts/emulator/test/float_SUITE.erl
+++ b/erts/emulator/test/float_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -19,21 +19,61 @@
 
 -module(float_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.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,
+	 fpe/1,fp_drv/1,fp_drv_thread/1,denormalized/1,match/1,
+	 bad_float_unpack/1]).
+-export([otp_7178/1]).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
-	 fpe/1,fp_drv/1,fp_drv_thread/1,denormalized/1,match/1,bad_float_unpack/1]).
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog = ?t:timetrap(?t:minutes(3)),
     [{watchdog, Dog},{testcase,Func}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
-all(suite) ->
-    [fpe,fp_drv,fp_drv_thread,denormalized,match,bad_float_unpack].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [fpe, fp_drv, fp_drv_thread, otp_7178, denormalized,
+     match, bad_float_unpack].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%
+%% OTP-7178, list_to_float on very small numbers should give 0.0
+%% instead of exception, i.e. ignore underflow.
+%%
+otp_7178(suite) ->
+    [];
+otp_7178(doc) ->
+    ["test that list_to_float on very small numbers give 0.0"];
+otp_7178(Config) when is_list(Config) ->
+    ?line X = list_to_float("1.0e-325"),
+    ?line true = (X < 0.00000001) and (X > -0.00000001),
+    ?line Y = list_to_float("1.0e-325325325"),
+    ?line true = (Y < 0.00000001) and (Y > -0.00000001),
+    ?line {'EXIT', {badarg,_}} = (catch list_to_float("1.0e83291083210")),
+    ok.
 
 %% Forces floating point exceptions and tests that subsequent, legal,
 %% operations are calculated correctly.  Original version by Sebastian
diff --git a/erts/emulator/test/fun_SUITE.erl b/erts/emulator/test/fun_SUITE.erl
index a7889dfe90..4b59bfd6a5 100644
--- a/erts/emulator/test/fun_SUITE.erl
+++ b/erts/emulator/test/fun_SUITE.erl
@@ -22,7 +22,9 @@
 
 -define(default_timeout, ?t:minutes(1)).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 bad_apply/1,bad_fun_call/1,badarity/1,ext_badarity/1,
 	 equality/1,ordering/1,
 	 fun_to_port/1,t_hash/1,t_phash/1,t_phash2/1,md5/1,
@@ -32,19 +34,37 @@
 
 -export([nothing/0]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [bad_apply, bad_fun_call, badarity, ext_badarity,
+     equality, ordering, fun_to_port, t_hash, t_phash,
+     t_phash2, md5, refc, refc_ets, refc_dist,
+     const_propagation, t_arity, t_is_function2, t_fun_info].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [bad_apply,bad_fun_call,badarity,ext_badarity,equality,ordering,
-     fun_to_port,t_hash,t_phash,t_phash2,md5,
-     refc,refc_ets,refc_dist,const_propagation,
-     t_arity,t_is_function2,t_fun_info].
 
 init_per_testcase(_Case, Config) ->
     ?line Dog = test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/erts/emulator/test/fun_r12_SUITE.erl b/erts/emulator/test/fun_r12_SUITE.erl
index 9262731dcb..9421b60f49 100644
--- a/erts/emulator/test/fun_r12_SUITE.erl
+++ b/erts/emulator/test/fun_r12_SUITE.erl
@@ -20,18 +20,39 @@
 -module(fun_r12_SUITE).
 -compile(r12).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,dist_old_release/1]).
+-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,dist_old_release/1]).
 
 -define(default_timeout, ?t:minutes(1)).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [dist_old_release].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> [dist_old_release].
 
 init_per_testcase(_Case, Config) ->
     ?line Dog = test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/erts/emulator/test/gc_SUITE.erl b/erts/emulator/test/gc_SUITE.erl
index 066aa215b2..9ce8d18346 100644
--- a/erts/emulator/test/gc_SUITE.erl
+++ b/erts/emulator/test/gc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -21,15 +21,34 @@
 
 -module(gc_SUITE).
 
--include("test_server.hrl").
--export([all/1]).
+-include_lib("test_server/include/test_server.hrl").
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -define(default_timeout, ?t:minutes(10)).
 
 -export([grow_heap/1, grow_stack/1, grow_stack_heap/1]).
 
-all(suite) ->
-    [grow_heap,grow_stack, grow_stack_heap].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [grow_heap, grow_stack, grow_stack_heap].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 grow_heap(doc) -> ["Produce a growing list of elements, ",
 		   "for X calls, then drop one item per call",
diff --git a/erts/emulator/test/guard_SUITE.erl b/erts/emulator/test/guard_SUITE.erl
index 8fef36dfaf..a3be387a5b 100644
--- a/erts/emulator/test/guard_SUITE.erl
+++ b/erts/emulator/test/guard_SUITE.erl
@@ -19,16 +19,37 @@
 
 -module(guard_SUITE).
 
--export([all/1, bad_arith/1, bad_tuple/1, test_heap_guards/1, guard_bifs/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, bad_arith/1, bad_tuple/1, 
+	 test_heap_guards/1, guard_bifs/1,
 	 type_tests/1,guard_bif_binary_part/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -export([init/3]).
 -import(lists, [member/2]).
 
-all(suite) -> [bad_arith, bad_tuple, test_heap_guards, guard_bifs,
-	       type_tests, guard_bif_binary_part].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [bad_arith, bad_tuple, test_heap_guards, guard_bifs,
+     type_tests, guard_bif_binary_part].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 bad_arith(doc) -> "Test that a bad arithmetic operation in a guard works correctly.";
 bad_arith(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/hash_SUITE.erl b/erts/emulator/test/hash_SUITE.erl
index 85bdb8bff8..257bee0b78 100644
--- a/erts/emulator/test/hash_SUITE.erl
+++ b/erts/emulator/test/hash_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -49,7 +49,7 @@
 -define(config(A,B),config(A,B)).
 -export([config/2]).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -endif.
 
 -ifdef(debug).
@@ -69,22 +69,40 @@ config(priv_dir,_) ->
     ".".
 -else.
 %% When run in test server.
--export([all/1,test_basic/1,test_cmp/1,test_range/1,test_spread/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 test_basic/1,test_cmp/1,test_range/1,test_spread/1,
 	 test_phash2/1,otp_5292/1,bit_level_binaries/1,otp_7127/1,
-	 fin_per_testcase/2,init_per_testcase/2]).
+	 end_per_testcase/2,init_per_testcase/2]).
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(test_server:minutes(10)),
     [{watchdog, Dog}|Config].
  
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
-all(doc) ->
-    ["Test erlang:phash"];
-all(suite) ->
-    [test_basic, test_cmp, test_range, test_spread, test_phash2, otp_5292,
-     bit_level_binaries, otp_7127].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [test_basic, test_cmp, test_range, test_spread,
+     test_phash2, otp_5292, bit_level_binaries, otp_7127].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 test_basic(suite) ->
     [];
@@ -480,14 +498,14 @@ otp_5292_test() ->
     S2 = md5([md5(hash_int(S, E, PH)) || {Start, N, Sz} <- d(), 
                                          {S, E} <- int(Start, N, Sz)]),
     ?line Comment = case S1 of 
-                        <<43,186,76,102,87,4,110,245,203,177,206,6,130,69,43,99>> ->
+			<<4,248,208,156,200,131,7,1,173,13,239,173,112,81,16,174>> ->
 			    ?line big = erlang:system_info(endian),
                             "Big endian machine";
-                        <<21,206,139,15,149,28,167,81,98,225,132,254,49,125,174,195>> ->
+                        <<180,28,33,231,239,184,71,125,76,47,227,241,78,184,176,233>> ->
 			    ?line little = erlang:system_info(endian),
                             "Little endian machine"
                     end,
-    ?line <<140,37,79,80,26,242,130,22,20,229,123,240,223,244,43,99>> = S2,
+    ?line <<124,81,198,121,174,233,19,137,10,83,33,80,226,111,238,99>> = S2,
     ?line 2 = erlang:hash(1, (1 bsl 27) -1),
     ?line {'EXIT', _} = (catch erlang:hash(1, (1 bsl 27))),
     {comment, Comment}.
@@ -507,7 +525,7 @@ hash_int(Start, End, F) ->
     {Start, End, md5(HL)}.
 
 md5(T) ->
-    erlang:md5(term_to_binary(T)).
+    erlang:md5(term_to_binary(T)).   
 
 bit_level_binaries() ->
     ?line [3511317,7022633,14044578,28087749,56173436,112344123,90467083|_] =
diff --git a/erts/emulator/test/hibernate_SUITE.erl b/erts/emulator/test/hibernate_SUITE.erl
index 4d36076d12..b8dc87db7f 100644
--- a/erts/emulator/test/hibernate_SUITE.erl
+++ b/erts/emulator/test/hibernate_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -19,23 +19,44 @@
 
 -module(hibernate_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,min_heap_size/1,bad_args/1,
 	 messages_in_queue/1,undefined_mfa/1, no_heap/1]).
 
 %% Used by test cases.
 -export([basic_hibernator/1,messages_in_queue_restart/2, no_heap_loop/0]).
 
-all(suite) ->
-    [basic,min_heap_size,bad_args,messages_in_queue,undefined_mfa,no_heap].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic, min_heap_size, bad_args, messages_in_queue,
+     undefined_mfa, no_heap].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog = ?t:timetrap(?t:minutes(3)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
diff --git a/erts/emulator/test/ignore_cores.erl b/erts/emulator/test/ignore_cores.erl
index 1d738cbafd..8b1ac0fe6c 120000..100644
--- a/erts/emulator/test/ignore_cores.erl
+++ b/erts/emulator/test/ignore_cores.erl
@@ -1 +1,158 @@
-../../test/ignore_cores.erl
\ No newline at end of file
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File    : ignore_cores.erl
+%%% Author  : Rickard Green <[email protected]>
+%%% Description : 
+%%%
+%%% Created : 11 Feb 2008 by Rickard Green <[email protected]>
+%%%-------------------------------------------------------------------
+
+-module(ignore_cores).
+
+-include_lib("test_server/include/test_server.hrl").
+
+-export([init/1, fini/1, setup/3, setup/4, restore/1, dir/1]).
+
+-record(ignore_cores, {org_cwd,
+		       org_path,
+		       org_pwd_env,
+		       ign_dir = false,
+		       cores_dir = false}).
+
+%%
+%% Takes a testcase config
+%%
+
+init(Config) ->
+    {ok, OrgCWD} = file:get_cwd(),
+    [{ignore_cores,
+      #ignore_cores{org_cwd = OrgCWD,
+		    org_path = code:get_path(),
+		    org_pwd_env = os:getenv("PWD")}}
+     | lists:keydelete(ignore_cores, 1, Config)].
+    
+fini(Config) ->
+    #ignore_cores{org_cwd = OrgCWD,
+		  org_path = OrgPath,
+		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+    ok = file:set_cwd(OrgCWD),
+    true = code:set_path(OrgPath),
+    case OrgPWD of
+	false -> ok;
+	_ -> true = os:putenv("PWD", OrgPWD)
+    end,
+    lists:keydelete(ignore_cores, 1, Config).
+
+setup(Suite, Testcase, Config) ->
+    setup(Suite, Testcase, Config, false).
+
+setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite), 
+                                            is_atom(Testcase),
+                                            is_list(Config) ->
+    #ignore_cores{org_cwd = OrgCWD,
+		  org_path = OrgPath,
+		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+    Path = lists:map(fun (".") -> OrgCWD; (Dir) -> Dir end, OrgPath),
+    true = code:set_path(Path),
+    PrivDir = ?config(priv_dir, Config),
+    IgnDir = filename:join([PrivDir,
+			 atom_to_list(Suite)
+			 ++ "_"
+			 ++ atom_to_list(Testcase)
+			 ++ "_wd"]),
+    ok = file:make_dir(IgnDir),
+    case SetCwd of
+	false ->
+	    ok;
+	_ ->
+	    ok = file:set_cwd(IgnDir),
+	    OrgPWD = case os:getenv("PWD") of
+			 false -> false;
+			 PWD ->
+			     os:putenv("PWD", IgnDir),
+			     PWD
+		     end
+    end,
+    ok = file:write_file(filename:join([IgnDir, "ignore_core_files"]), <<>>),
+    %% cores are dumped in /cores on MacOS X
+    CoresDir = case {?t:os_type(), filelib:is_dir("/cores")} of
+		   {{unix,darwin}, true} ->
+		       filelib:fold_files("/cores",
+					  "^core.*$",
+					  false,
+					  fun (C,Cs) -> [C|Cs] end,
+					  []);
+		   _ ->
+		       false
+	       end,
+    lists:keyreplace(ignore_cores,
+		     1,
+		     Config,
+		     {ignore_cores,
+		      #ignore_cores{org_cwd = OrgCWD,
+				    org_path = OrgPath,
+				    org_pwd_env = OrgPWD,
+				    ign_dir = IgnDir,
+				    cores_dir = CoresDir}}).
+
+restore(Config) ->
+    #ignore_cores{org_cwd = OrgCWD,
+		  org_path = OrgPath,
+		  org_pwd_env = OrgPWD,
+		  ign_dir = IgnDir,
+		  cores_dir = CoresDir} = ?config(ignore_cores, Config),
+    try
+	case CoresDir of
+	    false ->
+		ok;
+	    _ ->
+		%% Move cores dumped by these testcases in /cores
+		%% to cwd.
+		lists:foreach(fun (C) ->
+				      case lists:member(C, CoresDir) of
+					  true -> ok;
+					  _ ->
+					      Dst = filename:join(
+						      [IgnDir,
+						       filename:basename(C)]),
+					      {ok, _} = file:copy(C, Dst),
+					      file:delete(C)
+				      end
+			      end,
+			      filelib:fold_files("/cores",
+						 "^core.*$",
+						 false,
+						 fun (C,Cs) -> [C|Cs] end,
+						 []))
+	end
+    after
+	catch file:set_cwd(OrgCWD),
+	catch code:set_path(OrgPath),
+	case OrgPWD of
+	    false -> ok;
+	    _ -> catch os:putenv("PWD", OrgPWD)
+	end
+    end.
+
+
+dir(Config) ->
+    #ignore_cores{ign_dir = Dir} = ?config(ignore_cores, Config),
+    Dir.
diff --git a/erts/emulator/test/list_bif_SUITE.erl b/erts/emulator/test/list_bif_SUITE.erl
index 65ea88eb2f..ef0929e769 100644
--- a/erts/emulator/test/list_bif_SUITE.erl
+++ b/erts/emulator/test/list_bif_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -18,21 +18,42 @@
 %%
 
 -module(list_bif_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2]).
+-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([hd_test/1,tl_test/1,t_length/1,t_list_to_pid/1,
 	 t_list_to_float/1,t_list_to_integer/1]).
 
 
-all(suite) ->
-    [hd_test,tl_test,t_length,t_list_to_pid,t_list_to_float,t_list_to_integer].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [hd_test, tl_test, t_length, t_list_to_pid,
+     t_list_to_float, t_list_to_integer].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog = test_server:timetrap(test_server:seconds(60)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/erts/emulator/test/long_timers_test.erl b/erts/emulator/test/long_timers_test.erl
index 28626d26fb..28a4fba9f6 100644
--- a/erts/emulator/test/long_timers_test.erl
+++ b/erts/emulator/test/long_timers_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl
index 69c89f5d2d..2b21fa58f4 100644
--- a/erts/emulator/test/match_spec_SUITE.erl
+++ b/erts/emulator/test/match_spec_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -19,7 +19,8 @@
 
 -module(match_spec_SUITE).
 
--export([all/1, not_run/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, not_run/1]).
 -export([test_1/1, test_2/1, test_3/1, bad_match_spec_bin/1,
 	 trace_control_word/1, silent/1, silent_no_ms/1, 
 	 ms_trace2/1, ms_trace3/1, boxed_and_small/1,
@@ -34,29 +35,48 @@
 % This test suite assumes that tracing in general works. What we test is
 % the match spec functionality.
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:seconds(10)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
 
-all(suite) ->
-    case test_server:is_native(?MODULE) of
-	false -> [test_1, test_2, test_3, bad_match_spec_bin,
-		  trace_control_word, silent, silent_no_ms, 
-		  ms_trace2, ms_trace3, boxed_and_small,
-		  destructive_in_test_bif, guard_exceptions,
-		  unary_plus, unary_minus, fpe, moving_labels];
-	true  -> [not_run]
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    case test_server:is_native(match_spec_SUITE) of
+	false ->
+	    [test_1, test_2, test_3, bad_match_spec_bin,
+	     trace_control_word, silent, silent_no_ms, ms_trace2,
+	     ms_trace3, boxed_and_small, destructive_in_test_bif,
+	     guard_exceptions, unary_plus, unary_minus, fpe,
+	     moving_labels];
+	true -> [not_run]
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
 not_run(Config) when is_list(Config) ->
     {skipped, "Native Code"}.
 
@@ -345,15 +365,15 @@ silent_no_ms(Config) when is_list(Config) ->
 	    fun () -> 
 		    ?MODULE:f1(a),
 		    ?MODULE:f2(b, c),
-		    erlang:integer_to_list(id(1)),
+		    _ = erlang:integer_to_list(id(1)),
 		    ?MODULE:f3(d, e),
 		    ?MODULE:f1(start),
 		    ?MODULE:f2(f, g),
-		    erlang:integer_to_list(id(2)),
+		    _ = erlang:integer_to_list(id(2)),
 		    ?MODULE:f3(h, i),
 		    ?MODULE:f1(stop),
 		    ?MODULE:f2(j, k),
-		    erlang:integer_to_list(id(3)),
+		    _ = erlang:integer_to_list(id(3)),
 		    ?MODULE:f3(l, m)
 	    end,
 	    fun (Tracee) ->
@@ -393,15 +413,15 @@ silent_no_ms(Config) when is_list(Config) ->
 	    fun () -> 
 		    ?MODULE:f1(a),
 		    ?MODULE:f2(b, c),
-		    erlang:integer_to_list(id(1)),
+		    _ = erlang:integer_to_list(id(1)),
 		    ?MODULE:f3(d, e),
 		    ?MODULE:f1(start),
 		    ?MODULE:f2(f, g),
-		    erlang:integer_to_list(id(2)),
+		    _ = erlang:integer_to_list(id(2)),
 		    ?MODULE:f3(h, i),
 		    ?MODULE:f1(stop),
 		    ?MODULE:f2(j, k),
-		    erlang:integer_to_list(id(3)),
+		    _ = erlang:integer_to_list(id(3)),
 		    ?MODULE:f3(l, m)
 	    end,
 	    fun (Tracee) ->
@@ -455,18 +475,18 @@ ms_trace2(Config) when is_list(Config) ->
 	    fun () -> 
 		    ?MODULE:f1(a),
 		    ?MODULE:f2(b, c),
-		    erlang:integer_to_list(id(1)),
+		    _ = erlang:integer_to_list(id(1)),
 		    ?MODULE:f3(d, e),
 		    fn([all], [call,return_to,{tracer,Tracer}]),
 		    ?MODULE:f1(f),
 		    f2(g, h),
 		    f1(i),
-		    erlang:integer_to_list(id(2)),
+		    _ = erlang:integer_to_list(id(2)),
 		    ?MODULE:f3(j, k),
 		    fn([call,return_to], []),
 		    ?MODULE:f1(l),
 		    ?MODULE:f2(m, n),
-		    erlang:integer_to_list(id(3)),
+		    _ = erlang:integer_to_list(id(3)),
 		    ?MODULE:f3(o, p)
 	    end,
 	    fun (Tracee) ->
@@ -551,26 +571,26 @@ ms_trace3(Config) when is_list(Config) ->
 		    register(TraceeName, self()),
 		    ?MODULE:f1(a),
 		    ?MODULE:f2(b, c),
-		    erlang:integer_to_list(id(1)),
+		    _ = erlang:integer_to_list(id(1)),
 		    ?MODULE:f3(d, e),
 		    Controller ! {self(),Tag,start},
 		    receive {Controller,Tag,started} -> ok end,
 		    ?MODULE:f1(f),
 		    f2(g, h),
 		    f1(i),
-		    erlang:integer_to_list(id(2)),
+		    _ = erlang:integer_to_list(id(2)),
 		    ?MODULE:f3(j, k),
 		    Controller ! {self(),Tag,stop_1},
 		    receive {Controller,Tag,stopped_1} -> ok end,
 		    ?MODULE:f1(l),
 		    ?MODULE:f2(m, n),
-		    erlang:integer_to_list(id(3)),
+		    _ = erlang:integer_to_list(id(3)),
 		    ?MODULE:f3(o, p),
 		    Controller ! {self(),Tag,stop_2},
 		    receive {Controller,Tag,stopped_2} -> ok end,
 		    ?MODULE:f1(q),
 		    ?MODULE:f2(r, s),
-		    erlang:integer_to_list(id(4)),
+		    _ = erlang:integer_to_list(id(4)),
 		    ?MODULE:f3(t, u)
 	    end,
 	    
diff --git a/erts/emulator/test/module_info_SUITE.erl b/erts/emulator/test/module_info_SUITE.erl
index f34a2b496c..a2a052671f 100644
--- a/erts/emulator/test/module_info_SUITE.erl
+++ b/erts/emulator/test/module_info_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -19,9 +19,11 @@
 
 -module(module_info_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,init_per_testcase/2,end_per_testcase/2,
+-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,
 	 exports/1,functions/1,native/1]).
 
 %%-compile(native).
@@ -29,8 +31,29 @@
 %% Helper.
 -export([native_proj/1,native_filter/1]).
 
-all(suite) ->
-    [exports,functions,native].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    modules().
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+modules() -> 
+    [exports, functions, native].
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog = ?t:timetrap(?t:minutes(3)),
@@ -42,14 +65,18 @@ end_per_testcase(_Func, Config) ->
 
 %% Should return all functions exported from this module. (local)
 all_exported() ->
-    All = add_arity(all(suite)),
-    lists:sort([{all,1},{init_per_testcase,2},{end_per_testcase,2},
+    All = add_arity(modules()),
+    lists:sort([{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},
 		{module_info,0},{module_info,1},{native_proj,1},
 		{native_filter,1}|All]).
 
 %% Should return all functions in this module. (local)
 all_functions() ->
-    Locals = [{add_arity,1},{add_arity,2},{all_exported,0},{all_functions,0}],
+    Locals = [{add_arity,1},{add_arity,2},{all_exported,0},{all_functions,0},
+	      {modules,0}],
     lists:sort(Locals++all_exported()).
 
 %% Test that the list of exported functions from this module is correct.
diff --git a/erts/emulator/test/monitor_SUITE.erl b/erts/emulator/test/monitor_SUITE.erl
index 68e378dfec..9cf4ed702a 100644
--- a/erts/emulator/test/monitor_SUITE.erl
+++ b/erts/emulator/test/monitor_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -19,29 +19,49 @@
 
 -module(monitor_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 case_1/1, case_1a/1, case_2/1, case_2a/1, mon_e_1/1, demon_e_1/1, demon_1/1,
-	 demon_2/1, demon_3/1, demonitor_flush/1, remove_monitor/1,
+	 demon_2/1, demon_3/1, demonitor_flush/1,
 	 local_remove_monitor/1, remote_remove_monitor/1, mon_1/1, mon_2/1,
 	 large_exit/1, list_cleanup/1, mixer/1, named_down/1, otp_5827/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([y2/1, g/1, g0/0, g1/0, large_exit_sub/1]).
 
-all(suite) ->
-    [case_1, case_1a, case_2, case_2a, mon_e_1, demon_e_1, demon_1, mon_1,
-     mon_2, demon_2, demon_3, demonitor_flush, remove_monitor,
-     large_exit, list_cleanup, mixer, named_down,
-     otp_5827].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [case_1, case_1a, case_2, case_2a, mon_e_1, demon_e_1,
+     demon_1, mon_1, mon_2, demon_2, demon_3,
+     demonitor_flush, {group, remove_monitor}, large_exit,
+     list_cleanup, mixer, named_down, otp_5827].
+
+groups() -> 
+    [{remove_monitor, [],
+      [local_remove_monitor, remote_remove_monitor]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(15)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
@@ -315,8 +335,6 @@ demonitor_flush_test(Node) ->
 -define(RM_MON_GROUPS, 100).
 -define(RM_MON_GPROCS, 100).
 
-remove_monitor(suite) ->
-    [local_remove_monitor, remote_remove_monitor].
 
 local_remove_monitor(Config) when is_list(Config) ->
     Gs = generate(fun () -> start_remove_monitor_group(node()) end,
diff --git a/erts/emulator/test/mtx_SUITE.erl b/erts/emulator/test/mtx_SUITE.erl
new file mode 100644
index 0000000000..d379b8a7fa
--- /dev/null
+++ b/erts/emulator/test/mtx_SUITE.erl
@@ -0,0 +1,479 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+
+%%
+%% Stress tests of rwmutex implementation.
+%%
+%% Author: Rickard Green
+%%
+-module(mtx_SUITE).
+
+%%-define(line_trace,true).
+
+-include_lib("common_test/include/ct.hrl").
+
+-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]).
+
+-export([long_rwlock/1,
+	 hammer_ets_rwlock/1,
+	 hammer_rwlock/1,
+	 hammer_rwlock_check/1,
+	 hammer_tryrwlock/1,
+	 hammer_tryrwlock_check/1,
+	 hammer_sched_long_rwlock/1,
+	 hammer_sched_long_rwlock_check/1,
+	 hammer_sched_long_freqread_rwlock/1,
+	 hammer_sched_long_freqread_rwlock_check/1,
+	 hammer_sched_long_tryrwlock/1,
+	 hammer_sched_long_tryrwlock_check/1,
+	 hammer_sched_long_freqread_tryrwlock/1,
+	 hammer_sched_long_freqread_tryrwlock_check/1,
+	 hammer_sched_rwlock/1,
+	 hammer_sched_rwlock_check/1,
+	 hammer_sched_freqread_rwlock/1,
+	 hammer_sched_freqread_rwlock_check/1,
+	 hammer_sched_tryrwlock/1,
+	 hammer_sched_tryrwlock_check/1,
+	 hammer_sched_freqread_tryrwlock/1,
+	 hammer_sched_freqread_tryrwlock_check/1]).
+
+init_per_suite(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Lib = filename:join([DataDir, atom_to_list(?MODULE)]),
+    ok = erlang:load_nif(Lib, none),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    Config.
+
+init_per_testcase(_Case, Config) ->
+    Dog = ?t:timetrap(?t:minutes(15)),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Func, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [long_rwlock, hammer_rwlock_check, hammer_rwlock,
+     hammer_tryrwlock_check, hammer_tryrwlock,
+     hammer_ets_rwlock, hammer_sched_long_rwlock_check,
+     hammer_sched_long_rwlock,
+     hammer_sched_long_freqread_rwlock_check,
+     hammer_sched_long_freqread_rwlock,
+     hammer_sched_long_tryrwlock_check,
+     hammer_sched_long_tryrwlock,
+     hammer_sched_long_freqread_tryrwlock_check,
+     hammer_sched_long_freqread_tryrwlock,
+     hammer_sched_rwlock_check, hammer_sched_rwlock,
+     hammer_sched_freqread_rwlock_check,
+     hammer_sched_freqread_rwlock,
+     hammer_sched_tryrwlock_check, hammer_sched_tryrwlock,
+     hammer_sched_freqread_tryrwlock_check,
+     hammer_sched_freqread_tryrwlock].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+long_rwlock(Config) when is_list(Config) ->
+    statistics(runtime),
+    LLRes = long_rw_test(),
+    {_, RunTime} = statistics(runtime),
+    %% A very short run time is expected, since
+    %% threads in the test mostly wait
+    ?t:format("RunTime=~p~n", [RunTime]),
+    ?line true = RunTime < 100,
+    ?line RunTimeStr = "Run-time during test was "++integer_to_list(RunTime)++" ms.",
+    case LLRes of
+	ok ->
+	    {comment, RunTimeStr};
+	{comment, Comment} ->
+	    {comment, Comment ++ " " ++ RunTimeStr}
+    end.
+
+hammer_rwlock(Config) when is_list(Config) ->
+    hammer_rw_test(false).
+
+hammer_rwlock_check(Config) when is_list(Config) ->
+    hammer_rw_test(true).
+
+hammer_tryrwlock(Config) when is_list(Config) ->
+    hammer_tryrw_test(false).
+
+hammer_tryrwlock_check(Config) when is_list(Config) ->
+    hammer_tryrw_test(true).
+
+hammer_sched_rwlock(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(false, false, true, 0, 0).
+
+hammer_sched_rwlock_check(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(false, true, true, 0, 0).
+
+hammer_sched_freqread_rwlock(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(true, false, true, 0, 0).
+
+hammer_sched_freqread_rwlock_check(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(true, true, true, 0, 0).
+
+hammer_sched_tryrwlock(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(false, false, false, 0, 100).
+
+hammer_sched_tryrwlock_check(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(false, true, false, 0, 100).
+
+hammer_sched_freqread_tryrwlock(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(true, false, false, 0, 100).
+
+hammer_sched_freqread_tryrwlock_check(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(true, true, false, 0, 100).
+
+hammer_sched_long_rwlock(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(false, false, true, 100, 0).
+
+hammer_sched_long_rwlock_check(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(false, true, true, 100, 0).
+
+hammer_sched_long_freqread_rwlock(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(true, false, true, 100, 0).
+
+hammer_sched_long_freqread_rwlock_check(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(true, true, true, 100, 0).
+
+hammer_sched_long_tryrwlock(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(false, false, false, 100, 100).
+
+hammer_sched_long_tryrwlock_check(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(false, true, false, 100, 100).
+
+hammer_sched_long_freqread_tryrwlock(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(true, false, false, 100, 100).
+
+hammer_sched_long_freqread_tryrwlock_check(Config) when is_list(Config) ->
+    hammer_sched_rwlock_test(true, true, false, 100, 100).
+
+hammer_sched_rwlock_test(FreqRead, LockCheck, Blocking, WaitLocked, WaitUnlocked) ->
+    case create_rwlock(FreqRead, LockCheck) of
+	enotsup ->
+	    {skipped, "Not supported."};
+	RWLock ->
+	    Onln = erlang:system_info(schedulers_online),
+	    NWPs = case Onln div 3 of
+		       1 -> case Onln < 4 of
+				true -> 1;
+				false -> 2
+			    end;
+		       X -> X
+		   end,
+	    NRPs = Onln - NWPs,
+	    NoLockOps = ((((50000000 div Onln)
+			       div case {Blocking, WaitLocked} of
+				       {false, 0} -> 1;
+				       _ -> 10
+				   end)
+			      div (case WaitLocked == 0 of
+				       true -> 1;
+				       false -> WaitLocked*250
+				   end))
+			     div handicap()),
+	    ?t:format("NoLockOps=~p~n", [NoLockOps]),
+	    Sleep = case Blocking of
+			true -> NoLockOps;
+			false -> NoLockOps div 10
+		    end,
+	    WPs = lists:map(
+		    fun (Sched) ->
+			    spawn_opt(
+			      fun () ->
+				      io:format("Writer on scheduler ~p.~n",
+						[Sched]),
+				      Sched = erlang:system_info(scheduler_id),
+				      receive go -> gone end,
+				      hammer_sched_rwlock_proc(RWLock,
+							       Blocking,
+							       true,
+							       WaitLocked,
+							       WaitUnlocked,
+							       NoLockOps,
+							       Sleep),
+				      Sched = erlang:system_info(scheduler_id)
+			      end,
+			      [link, {scheduler, Sched}])
+		    end,
+		    lists:seq(1, NWPs)),
+	    RPs = lists:map(
+		    fun (Sched) ->
+			    spawn_opt(
+			      fun () ->
+				      io:format("Reader on scheduler ~p.~n",
+						[Sched]),
+				      Sched = erlang:system_info(scheduler_id),
+				      receive go -> gone end,
+				      hammer_sched_rwlock_proc(RWLock,
+							       Blocking,
+							       false,
+							       WaitLocked,
+							       WaitUnlocked,
+							       NoLockOps,
+							       Sleep),
+				      Sched = erlang:system_info(scheduler_id)
+			      end,
+			      [link, {scheduler, Sched}])
+		    end,
+		    lists:seq(NWPs + 1, NWPs + NRPs)),
+	    Procs = WPs ++ RPs,
+	    case {Blocking, WaitLocked} of
+		{_, 0} -> ok;
+		{false, _} -> ok;
+		_ -> statistics(runtime)
+	    end,
+	    lists:foreach(fun (P) -> P ! go end, Procs),
+	    lists:foreach(fun (P) ->
+				  M = erlang:monitor(process, P),
+				  receive
+				      {'DOWN', M, process, P, _} ->
+					  ok
+				  end
+			  end,
+			  Procs),
+	    case {Blocking, WaitLocked} of
+		{_, 0} -> ok;
+		{false, _} -> ok;
+		_ ->
+		    {_, RunTime} = statistics(runtime),
+		    ?t:format("RunTime=~p~n", [RunTime]),
+		    ?line true = RunTime < 500,
+		    {comment,
+		     "Run-time during test was "
+		     ++ integer_to_list(RunTime)
+		     ++ " ms."}
+	    end
+    end.
+
+hammer_sched_rwlock_proc(_RWLock,
+			 _Blocking,
+			 _WriteOp,
+			 _WaitLocked,
+			 _WaitUnlocked,
+			 0,
+			 _Sleep) ->
+    ok;
+hammer_sched_rwlock_proc(RWLock,
+			 Blocking,
+			 WriteOp,
+			 WaitLocked,
+			 WaitUnlocked,
+			 Times,
+			 Sleep) when Times rem Sleep == 0 ->
+    rwlock_op(RWLock, Blocking, WriteOp, WaitLocked, WaitUnlocked),
+    hammer_sched_rwlock_proc(RWLock,
+			     Blocking,
+			     WriteOp,
+			     WaitLocked,
+			     WaitUnlocked,
+			     Times - 1,
+			     Sleep);
+hammer_sched_rwlock_proc(RWLock,
+			 Blocking,
+			 WriteOp,
+			 WaitLocked,
+			 WaitUnlocked,
+			 Times,
+			 Sleep) ->
+    rwlock_op(RWLock, Blocking, WriteOp, WaitLocked, 0),
+    hammer_sched_rwlock_proc(RWLock,
+			     Blocking,
+			     WriteOp,
+			     WaitLocked,
+			     WaitUnlocked,
+			     Times - 1,
+			     Sleep).
+
+-define(HAMMER_ETS_RWLOCK_REPEAT_TIMES, 1).
+-define(HAMMER_ETS_RWLOCK_TSIZE, 500).
+
+hammer_ets_rwlock(Config) when is_list(Config) ->
+    {Ops, Procs} = case handicap() of
+		       1 -> {20000, 500};
+		       2 -> {20000, 50};
+		       3 -> {2000, 50};
+		       _ -> {200, 50}
+		   end,
+    ?t:format("Procs=~p~nOps=~p~n", [Procs, Ops]),
+    lists:foreach(fun (XOpts) ->
+			  ?t:format("Running with extra opts: ~p", [XOpts]),
+			  hammer_ets_rwlock_test(XOpts, true, 2, Ops,
+						 Procs, false)
+		  end,
+		  [[],
+		   [{read_concurrency, true}],
+		   [{write_concurrency, true}],
+		   [{read_concurrency, true},{write_concurrency, true}]]),
+    ok.
+
+%% Aux funcs
+
+long_rw_test() ->
+    exit(no_nif_implementation).
+
+hammer_rw_test(_Arg) ->
+    exit(no_nif_implementation).
+
+hammer_tryrw_test(_Arg) ->
+    exit(no_nif_implementation).
+
+create_rwlock(_FreqRead, _LockCheck) ->
+    exit(no_nif_implementation).
+
+rwlock_op(_RWLock, _Blocking, _WriteOp, _WaitLocked, _WaitUnlocked) ->
+    exit(no_nif_implementation).
+
+hammer_ets_rwlock_put_data() ->
+    put(?MODULE, {"here are some", data, "to store", make_ref()}).
+
+hammer_ets_rwlock_get_data() ->
+    get(?MODULE).
+
+hammer_ets_rwlock_ops(_T, _UW, _N, _C, _SC, 0) ->
+    ok;
+hammer_ets_rwlock_ops(T, UW, N, C, SC, Tot) when N >= ?HAMMER_ETS_RWLOCK_TSIZE ->
+    hammer_ets_rwlock_ops(T, UW, 0, C, SC, Tot);
+hammer_ets_rwlock_ops(T, UW, N, 0, SC, Tot) ->
+    case UW of
+	true ->
+	    true = ets:insert(T, {N, Tot, hammer_ets_rwlock_get_data()});
+	false ->
+	    [{N, _, _}] = ets:lookup(T, N)
+    end,
+    hammer_ets_rwlock_ops(T, UW, N+1, SC, SC, Tot-1);
+hammer_ets_rwlock_ops(T, UW, N, C, SC, Tot) ->
+    case UW of
+	false ->
+	    true = ets:insert(T, {N, Tot, hammer_ets_rwlock_get_data()});
+	true ->
+	    [{N, _, _}] = ets:lookup(T, N)
+    end,
+    hammer_ets_rwlock_ops(T, UW, N+1, C-1, SC, Tot-1).
+
+hammer_ets_rwlock_init(T, N) when N < ?HAMMER_ETS_RWLOCK_TSIZE ->
+    ets:insert(T, {N, N, N}),
+    hammer_ets_rwlock_init(T, N+1);
+hammer_ets_rwlock_init(_T, _N) ->
+    ok.
+
+hammer_ets_rwlock_test(XOpts, UW, C, N, NP, SC) ->
+    receive after 100 -> ok end,
+    {TP, TM} = spawn_monitor(
+		 fun () ->
+			 _L = repeat_list(
+				fun () ->
+					Caller = self(),
+					T = fun () ->
+						    Parent = self(),
+						    hammer_ets_rwlock_put_data(),
+						    T=ets:new(x, [public | XOpts]),
+						    hammer_ets_rwlock_init(T, 0),
+						    Ps0 = repeat_list(
+							    fun () ->
+								    spawn_link(
+								      fun () ->
+									      hammer_ets_rwlock_put_data(),
+									      receive go -> ok end,
+									      hammer_ets_rwlock_ops(T, UW, N, C, C, N),
+									      Parent ! {done, self()},
+									      receive after infinity -> ok end
+								      end)
+							    end,
+							    NP - case SC of
+								     false -> 0;
+								     _ -> 1
+								 end),
+						    Ps = case SC of
+							     false -> Ps0;
+							     _ -> [spawn_link(fun () ->
+										      hammer_ets_rwlock_put_data(),
+										      receive go -> ok end,
+										      hammer_ets_rwlock_ops(T, UW, N, SC, SC, N),
+										      Parent ! {done, self()},
+										      receive after infinity -> ok end
+									      end) | Ps0]
+							 end,
+						    Start = now(),
+						    lists:foreach(fun (P) -> P ! go end, Ps),
+						    lists:foreach(fun (P) -> receive {done, P} -> ok end end, Ps),
+						    Stop = now(),
+						    lists:foreach(fun (P) ->
+									  unlink(P),
+									  exit(P, bang),
+									  M = erlang:monitor(process, P),
+									  receive
+									      {'DOWN', M, process, P, _} -> ok
+									  end
+								  end, Ps),
+						    Res = timer:now_diff(Stop, Start)/1000000,
+						    Caller ! {?MODULE, self(), Res}
+					    end,
+					TP = spawn_link(T),
+					receive
+					    {?MODULE, TP, Res} ->
+						Res
+					end
+				end,
+				?HAMMER_ETS_RWLOCK_REPEAT_TIMES)
+		 end),
+    receive
+	{'DOWN', TM, process, TP, _} -> ok
+    end.
+
+repeat_list(Fun, N) ->
+    repeat_list(Fun, N, []).
+
+repeat_list(_Fun, 0, Acc) ->
+    Acc;
+repeat_list(Fun, N, Acc) ->
+    repeat_list(Fun, N-1, [Fun()|Acc]).
+
+
+handicap() ->
+    X0 = case catch (erlang:system_info(logical_processors_available) >=
+			 erlang:system_info(schedulers_online)) of
+	     true -> 1;
+	     _ -> 2
+	 end,
+    case erlang:system_info(build_type) of
+	opt ->
+	    X0;
+	ReallySlow when ReallySlow == debug;
+			ReallySlow == valgrind;
+			ReallySlow == purify ->
+	    X0*3;
+	_Slow ->
+	    X0*2
+    end.
+		
diff --git a/erts/emulator/test/mtx_SUITE_data/Makefile.src b/erts/emulator/test/mtx_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..b6c843269c
--- /dev/null
+++ b/erts/emulator/test/mtx_SUITE_data/Makefile.src
@@ -0,0 +1,30 @@
+# 
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2010. 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%
+# 
+
+include @erts_lib_include_internal_generated@@[email protected]
+include @erts_lib_include_internal_generated@@DS@erts_internal.mk
+
+NIF_LIBS = mtx_SUITE@dll@
+
+SHLIB_EXTRA_CFLAGS =  $(ETHR_DEFS) -I@erts_lib_include_internal@ -I@erts_lib_include_internal_generated@
+LIBS = @ERTS_LIBS@
+
+all: $(NIF_LIBS)
+
+@SHLIB_RULES@
diff --git a/erts/emulator/test/mtx_SUITE_data/mtx_SUITE.c b/erts/emulator/test/mtx_SUITE_data/mtx_SUITE.c
new file mode 100644
index 0000000000..818023211c
--- /dev/null
+++ b/erts/emulator/test/mtx_SUITE_data/mtx_SUITE.c
@@ -0,0 +1,692 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Stress tests of rwmutex implementation.
+ *
+ * Author: Rickard Green
+ */
+
+#include "erl_nif.h"
+
+#ifdef __WIN32__
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <windows.h>
+#else
+#  include "ethread.h"
+#  include "erl_misc_utils.h"
+#  include <unistd.h>
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+
+static int
+fail(const char *file, int line, const char *function, const char *assertion);
+
+#undef ASSERT
+#define ASSERT(X) ((void) ((X) ? 1 : fail(__FILE__, __LINE__, __func__, #X)))
+
+#ifdef __WIN32__
+/*
+ * We cannot access the ethread symbols directly; test
+ * what we got in the nif api instead...
+ */
+#define HAVE_FREQREAD_SUPPORT 0
+#define RWMUTEX_T ErlNifRWLock
+#define RWMUTEX_CREATE(FR) enif_rwlock_create("dummy")
+#define RWMUTEX_DESTROY enif_rwlock_destroy
+#define RWMUTEX_WLOCK enif_rwlock_rwlock
+#define RWMUTEX_TRYWLOCK enif_rwlock_tryrwlock
+#define RWMUTEX_WUNLOCK enif_rwlock_rwunlock
+#define RWMUTEX_TRYRLOCK enif_rwlock_tryrlock
+#define RWMUTEX_RLOCK enif_rwlock_rlock
+#define RWMUTEX_RUNLOCK enif_rwlock_runlock
+#define THR_ID ErlNifTid
+#define THR_CREATE(A, B, C, D) enif_thread_create("dummy", (A), (B), (C), (D))
+#define THR_JOIN enif_thread_join
+#define ATOMIC_T volatile LONG
+#define ATOMIC_INIT(VarP, Val) (*(VarP) = (Val))
+#define ATOMIC_SET(VarP, Val) (*(VarP) = (Val))
+#define ATOMIC_READ(VarP) (*(VarP))
+#define ATOMIC_INC InterlockedIncrement
+#define ATOMIC_DEC InterlockedDecrement
+
+#else
+
+#ifdef ETHR_USE_OWN_RWMTX_IMPL__
+#  define HAVE_FREQREAD_SUPPORT 1
+#else
+#  define HAVE_FREQREAD_SUPPORT 0
+#endif
+
+#define RWMUTEX_T ethr_rwmutex
+static ethr_rwmutex *
+RWMUTEX_CREATE(int freqread)
+{
+    ethr_rwmutex *rwmtx = enif_alloc(sizeof(ethr_rwmutex));
+    ethr_rwmutex_opt rwmtx_opt = ETHR_RWMUTEX_OPT_DEFAULT_INITER;
+    if (freqread)
+	rwmtx_opt.type = ETHR_RWMUTEX_TYPE_FREQUENT_READ;
+    ASSERT(rwmtx);
+    ASSERT(ethr_rwmutex_init_opt(rwmtx, &rwmtx_opt) == 0);
+    return rwmtx;
+}
+static void
+RWMUTEX_DESTROY(ethr_rwmutex *rwmtx)
+{
+    ASSERT(ethr_rwmutex_destroy(rwmtx) == 0);
+    enif_free(rwmtx);
+}
+#define RWMUTEX_TRYWLOCK ethr_rwmutex_tryrwlock
+#define RWMUTEX_WLOCK ethr_rwmutex_rwlock
+#define RWMUTEX_WUNLOCK ethr_rwmutex_rwunlock
+#define RWMUTEX_TRYRLOCK ethr_rwmutex_tryrlock
+#define RWMUTEX_RLOCK ethr_rwmutex_rlock
+#define RWMUTEX_RUNLOCK ethr_rwmutex_runlock
+#define THR_ID ethr_tid
+#define THR_CREATE ethr_thr_create
+#define THR_JOIN ethr_thr_join
+#define ATOMIC_T ethr_atomic_t
+#define ATOMIC_INIT ethr_atomic_init
+#define ATOMIC_SET ethr_atomic_set
+#define ATOMIC_READ ethr_atomic_read
+#define ATOMIC_INC ethr_atomic_inc
+#define ATOMIC_DEC ethr_atomic_dec
+
+#endif
+
+
+#if !defined(__func__)
+#  if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
+#    if !defined(__GNUC__) ||  __GNUC__ < 2
+#      define __func__ "[unknown_function]"
+#    else
+#      define __func__ __FUNCTION__
+#    endif
+#  endif
+#endif
+
+static void milli_sleep(int ms);
+static int get_bool(ErlNifEnv* env, ERL_NIF_TERM term);
+
+/*
+ * Long rwlock testcase
+ */
+
+#define LONG_RW_NO_W_THREADS 6
+#define LONG_RW_NO_THREADS 20
+#define LONG_RW_NO_WLOCK_COUNT 100
+
+typedef struct {
+    RWMUTEX_T *rwlock;
+    ATOMIC_T *is_wlocked;
+    ATOMIC_T *is_rlocked;
+    int *stop;
+    int *count;
+    int sleep;
+} long_rw_t;
+
+static void *
+long_rw_w(void *varg)
+{
+    long_rw_t *arg = varg;
+    int stop = 0;
+    do {
+	RWMUTEX_WLOCK(arg->rwlock);
+	ASSERT(!ATOMIC_READ(arg->is_wlocked));
+	ATOMIC_SET(arg->is_wlocked, 1);
+	ASSERT(!ATOMIC_READ(arg->is_rlocked));
+	milli_sleep(arg->sleep);
+	if (++(*arg->count) > LONG_RW_NO_WLOCK_COUNT)
+	    stop = *arg->stop = 1;
+	ATOMIC_SET(arg->is_wlocked, 0);
+	ASSERT(!ATOMIC_READ(arg->is_rlocked));
+	RWMUTEX_WUNLOCK(arg->rwlock);
+    } while (!stop);
+    return NULL;
+}
+
+static void *
+long_rw_r(void *varg)
+{
+    long_rw_t *arg = varg;
+    int stop;
+    do {
+	RWMUTEX_RLOCK(arg->rwlock);
+	ASSERT(!ATOMIC_READ(arg->is_wlocked));
+	ATOMIC_INC(arg->is_rlocked);
+	milli_sleep(arg->sleep);
+	stop = *arg->stop;
+	ATOMIC_DEC(arg->is_rlocked);
+	ASSERT(!ATOMIC_READ(arg->is_wlocked));
+	RWMUTEX_RUNLOCK(arg->rwlock);
+    } while (!stop);
+    return NULL;
+}
+
+
+static ERL_NIF_TERM long_rw_test(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{
+    int res, freqread, i, count, stop;
+    ATOMIC_T is_wlocked, is_rlocked;
+    THR_ID tid[LONG_RW_NO_THREADS];
+    long_rw_t arg;
+    long_rw_t targ[LONG_RW_NO_THREADS];
+
+    ATOMIC_INIT(&is_wlocked, 0);
+    ATOMIC_INIT(&is_rlocked, 0);
+
+    freqread = 0;
+
+    arg.is_wlocked = &is_wlocked;
+    arg.is_rlocked = &is_rlocked;
+    arg.count = &count;
+    arg.stop = &stop;
+
+ restart:
+
+    stop = 0;
+    count = 0;
+
+    arg.rwlock = RWMUTEX_CREATE(freqread);
+
+    ASSERT(arg.rwlock);
+
+    for (i = 0; i < LONG_RW_NO_W_THREADS; i++) {
+	targ[i] = arg;
+	targ[i].sleep = 100 + i*10;
+	ASSERT(THR_CREATE(&tid[i], long_rw_w, &targ[i], NULL) == 0);
+    }
+    for (; i < LONG_RW_NO_THREADS; i++) {
+	targ[i] = arg;
+	targ[i].sleep = 100;
+	ASSERT(THR_CREATE(&tid[i], long_rw_r, &targ[i], NULL) == 0);
+    }
+    for (i = 0; i < LONG_RW_NO_THREADS; i++)
+	ASSERT(THR_JOIN(tid[i], NULL) == 0);
+
+    ASSERT(!ATOMIC_READ(arg.is_wlocked));
+    ASSERT(!ATOMIC_READ(arg.is_rlocked));
+
+    RWMUTEX_DESTROY(arg.rwlock);
+
+    if (HAVE_FREQREAD_SUPPORT && !freqread) {
+	freqread = 1;
+	goto restart;
+    }
+
+    if (freqread)
+	return enif_make_atom(env, "ok");
+    else
+	return enif_make_tuple2(env,
+				enif_make_atom(env,
+					       "comment"),
+				enif_make_string(env,
+						 "No frequent read test made.",
+						 ERL_NIF_LATIN1));
+}
+
+/*
+ * Hammer rwlock testcase
+ */
+
+#define HAMMER_RW_NO_W_THREADS 6
+#define HAMMER_RW_NO_THREADS 20
+#define HAMMER_RW_NO_WLOCK_COUNT 1000000
+
+typedef struct {
+    RWMUTEX_T *rwlock;
+    ATOMIC_T is_locked;
+    int lock_check;
+    int stop;
+    int count;
+} hammer_rw_t;
+
+static void *
+hammer_rw_w(void *varg)
+{
+    hammer_rw_t *arg = varg;
+    int stop = 0;
+    do {
+	RWMUTEX_WLOCK(arg->rwlock);
+	if (arg->lock_check) {
+	    ASSERT(!ATOMIC_READ(&arg->is_locked));
+	    ATOMIC_SET(&arg->is_locked, -1);
+	}
+	if (++arg->count > HAMMER_RW_NO_WLOCK_COUNT)
+	    stop = arg->stop = 1;
+	if (arg->lock_check) {
+	    ASSERT(ATOMIC_READ(&arg->is_locked) == -1);
+	    ATOMIC_SET(&arg->is_locked, 0);
+	}
+	RWMUTEX_WUNLOCK(arg->rwlock);
+    } while (!stop);
+    return NULL;
+}
+
+static void *
+hammer_rw_r(void *varg)
+{
+    hammer_rw_t *arg = varg;
+    int stop;
+    do {
+	RWMUTEX_RLOCK(arg->rwlock);
+	if (arg->lock_check) {
+	    ASSERT(ATOMIC_READ(&arg->is_locked) >= 0);
+	    ATOMIC_INC(&arg->is_locked);
+	}
+	stop = arg->stop;
+	if (arg->lock_check) {
+	    ASSERT(ATOMIC_READ(&arg->is_locked) > 0);
+	    ATOMIC_DEC(&arg->is_locked);
+	}
+	RWMUTEX_RUNLOCK(arg->rwlock);
+    } while (!stop); 
+    return NULL;
+}
+
+
+static ERL_NIF_TERM hammer_rw_test(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{
+    hammer_rw_t arg;
+    char buf[10];
+    int res, freqread, i;
+    THR_ID tid[HAMMER_RW_NO_THREADS];
+
+    if (argc != 1)
+	goto badarg;
+
+    arg.lock_check = get_bool(env, argv[0]);
+    if (arg.lock_check < 0)
+	goto badarg;
+
+    ATOMIC_INIT(&arg.is_locked, 0);
+
+    freqread = 0;
+
+ restart:
+    arg.stop = 0;
+    arg.count = 0;
+
+    arg.rwlock = RWMUTEX_CREATE(freqread);
+
+    ASSERT(arg.rwlock);
+
+    for (i = 0; i < HAMMER_RW_NO_W_THREADS; i++)
+	ASSERT(THR_CREATE(&tid[i], hammer_rw_w, &arg, NULL) == 0);
+    for (; i < HAMMER_RW_NO_THREADS; i++)
+	ASSERT(THR_CREATE(&tid[i], hammer_rw_r, &arg, NULL) == 0);
+    for (i = 0; i < HAMMER_RW_NO_THREADS; i++)
+	ASSERT(THR_JOIN(tid[i], NULL) == 0);
+
+    ASSERT(!ATOMIC_READ(&arg.is_locked));
+
+    RWMUTEX_DESTROY(arg.rwlock);
+
+    if (HAVE_FREQREAD_SUPPORT && !freqread) {
+	freqread = 1;
+	goto restart;
+    }
+
+    if (freqread)
+	return enif_make_atom(env, "ok");
+    else
+	return enif_make_tuple2(env,
+				enif_make_atom(env,
+					       "comment"),
+				enif_make_string(env,
+						 "No frequent read test made.",
+						 ERL_NIF_LATIN1));
+ badarg:
+    return enif_make_badarg(env);
+}
+
+/*
+ * Hammer try rwlock testcase
+ */
+
+#define HAMMER_TRYRW_NO_W_THREADS 10
+#define HAMMER_TRYRW_NO_THREADS 20
+#define HAMMER_TRYRW_NO_WLOCK_COUNT 10000000
+#define HAMMER_TRYRW_NO_RLOCK_COUNT 10000000
+#define HAMMER_TRYRW_NO_WLOCK_WAIT_COUNT ((10*HAMMER_TRYRW_NO_WLOCK_COUNT)/8)
+#define HAMMER_TRYRW_NO_RLOCK_WAIT_COUNT ((10*HAMMER_TRYRW_NO_RLOCK_COUNT)/8)
+
+typedef struct {
+    RWMUTEX_T *rwlock;
+    ATOMIC_T is_locked;
+    int lock_check;
+    int w_count;
+    ATOMIC_T r_count;
+} hammer_tryrw_t;
+
+static void *
+hammer_tryrw_w(void *varg)
+{
+    hammer_tryrw_t *arg = varg;
+    int stop = 0;
+    int wait = 0;
+    do {
+	while (EBUSY == RWMUTEX_TRYWLOCK(arg->rwlock));
+	if (arg->lock_check) {
+	    ASSERT(!ATOMIC_READ(&arg->is_locked));
+	    ATOMIC_SET(&arg->is_locked, -1);
+	}
+	if (++arg->w_count > HAMMER_TRYRW_NO_WLOCK_COUNT)
+	    stop = 1;
+	else if (arg->w_count > HAMMER_TRYRW_NO_RLOCK_WAIT_COUNT)
+	    wait = 1;
+	if (arg->lock_check) {
+	    ASSERT(ATOMIC_READ(&arg->is_locked) == -1);
+	    ATOMIC_SET(&arg->is_locked, 0);
+	}
+	RWMUTEX_WUNLOCK(arg->rwlock);
+	if (wait)
+	    milli_sleep(1);
+    } while (!stop);
+    return NULL;
+}
+
+static void *
+hammer_tryrw_r(void *varg)
+{
+    hammer_tryrw_t *arg = varg;
+    long r_count;
+    int stop = 0;
+    int wait = 0;
+    do {
+	while (EBUSY == RWMUTEX_TRYRLOCK(arg->rwlock));
+	if (arg->lock_check) {
+	    ASSERT(ATOMIC_READ(&arg->is_locked) >= 0);
+	    ATOMIC_INC(&arg->is_locked);
+	}
+	ATOMIC_INC(&arg->r_count);
+	r_count = ATOMIC_READ(&arg->r_count);
+	if (r_count > HAMMER_TRYRW_NO_RLOCK_COUNT)
+	    stop = 1;
+	else if (r_count > HAMMER_TRYRW_NO_RLOCK_WAIT_COUNT)
+	    wait = 1;
+	if (arg->lock_check) {
+	    ASSERT(ATOMIC_READ(&arg->is_locked) > 0);
+	    ATOMIC_DEC(&arg->is_locked);
+	}
+	RWMUTEX_RUNLOCK(arg->rwlock);
+	if (wait)
+	    milli_sleep(1);
+    } while (!stop);
+    return NULL;
+}
+
+
+static ERL_NIF_TERM hammer_tryrw_test(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{
+    hammer_tryrw_t arg;
+    char buf[10];
+    int res, freqread, i;
+    THR_ID tid[HAMMER_TRYRW_NO_THREADS];
+
+    if (argc != 1)
+	goto badarg;
+
+    arg.lock_check = get_bool(env, argv[0]);
+    if (arg.lock_check < 0)
+	goto badarg;
+
+    ATOMIC_INIT(&arg.is_locked, 0);
+    freqread = 0;
+
+ restart:
+
+    arg.w_count = 0;
+    ATOMIC_INIT(&arg.r_count, 0);
+
+    arg.rwlock = RWMUTEX_CREATE(freqread);
+
+    ASSERT(arg.rwlock);
+
+    for (i = 0; i < HAMMER_TRYRW_NO_W_THREADS; i++)
+	ASSERT(THR_CREATE(&tid[i], hammer_tryrw_w, &arg, NULL) == 0);
+    for (; i < HAMMER_TRYRW_NO_THREADS; i++)
+	ASSERT(THR_CREATE(&tid[i], hammer_tryrw_r, &arg, NULL) == 0);
+    for (i = 0; i < HAMMER_TRYRW_NO_THREADS; i++)
+	ASSERT(THR_JOIN(tid[i], NULL) == 0);
+
+    ASSERT(!ATOMIC_READ(&arg.is_locked));
+
+    RWMUTEX_DESTROY(arg.rwlock);
+
+    if (HAVE_FREQREAD_SUPPORT && !freqread) {
+	freqread = 1;
+	goto restart;
+    }
+
+    if (freqread)
+	return enif_make_atom(env, "ok");
+    else
+	return enif_make_tuple2(env,
+				enif_make_atom(env,
+					       "comment"),
+				enif_make_string(env,
+						 "No frequent read test made.",
+						 ERL_NIF_LATIN1));
+ badarg:
+    return enif_make_badarg(env);
+}
+
+typedef struct {
+    int lock_check;
+    ATOMIC_T is_locked;
+    RWMUTEX_T *rwlock;
+} rwlock_resource_t;
+
+static void
+rwlock_destructor(ErlNifEnv* env, void* obj)
+{
+    rwlock_resource_t *rwlr = obj;
+    if (rwlr->lock_check)
+	ASSERT(!ATOMIC_READ(&rwlr->is_locked));
+    RWMUTEX_DESTROY(rwlr->rwlock);
+}
+
+/*
+ * create_rwlock(FreqRead, LockCheck)
+ */
+
+static ERL_NIF_TERM
+create_rwlock(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{
+    int lock_check, freqread;
+    ERL_NIF_TERM rwlock_term;
+    rwlock_resource_t *rwlr;
+    char buf[100];
+
+    if (argc != 2)
+	goto badarg;
+
+    freqread = get_bool(env, argv[0]);
+    if (freqread < 0)
+	goto badarg;
+
+    if (!HAVE_FREQREAD_SUPPORT && freqread)
+	return enif_make_atom(env, "enotsup");
+
+    lock_check = get_bool(env, argv[1]);
+    if (lock_check < 0)
+	goto badarg;
+
+    rwlr = enif_alloc_resource(enif_priv_data(env), sizeof(rwlock_resource_t));
+    rwlr->lock_check = lock_check;
+    ATOMIC_INIT(&rwlr->is_locked, 0);
+    rwlr->rwlock = RWMUTEX_CREATE(freqread);
+    rwlock_term = enif_make_resource(env, rwlr);
+    enif_release_resource(rwlr);
+    return rwlock_term;
+
+ badarg:
+    return enif_make_badarg(env);
+}
+
+/*
+ * rwlock_op(RWLock, Blocking, WriteOp, WaitTime) 
+ */
+
+static ERL_NIF_TERM
+rwlock_op(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{
+    rwlock_resource_t *rwlr;
+    int blocking, write, wait_locked, wait_unlocked;
+
+    if (argc != 5)
+	goto badarg;
+
+    if (!enif_get_resource(env, argv[0], enif_priv_data(env), (void **) &rwlr))
+	goto badarg;
+
+    blocking = get_bool(env, argv[1]);
+    if (blocking < 0)
+	goto badarg;
+
+    write = get_bool(env, argv[2]);
+    if (write < 0)
+	goto badarg;
+
+    if (!enif_get_int(env, argv[3], &wait_locked))
+	goto badarg;
+    if (wait_locked < 0)
+	goto badarg;
+
+    if (!enif_get_int(env, argv[4], &wait_unlocked))
+	goto badarg;
+    if (wait_unlocked < 0)
+	goto badarg;
+
+    if (write) {
+	if (blocking)
+	    RWMUTEX_WLOCK(rwlr->rwlock);
+	else
+	    while (EBUSY == RWMUTEX_TRYWLOCK(rwlr->rwlock));
+	if (rwlr->lock_check) {
+	    ASSERT(!ATOMIC_READ(&rwlr->is_locked));
+	    ATOMIC_SET(&rwlr->is_locked, -1);
+	}
+    }
+    else {
+	if (blocking)
+	    RWMUTEX_RLOCK(rwlr->rwlock);
+	else
+	    while (EBUSY == RWMUTEX_TRYRLOCK(rwlr->rwlock));
+	if (rwlr->lock_check) {
+	    ASSERT(ATOMIC_READ(&rwlr->is_locked) >= 0);
+	    ATOMIC_INC(&rwlr->is_locked);
+	}
+    }
+
+    if (wait_locked)
+	milli_sleep(wait_locked);
+
+    if (write) {
+	if (rwlr->lock_check) {
+	    ASSERT(ATOMIC_READ(&rwlr->is_locked) == -1);
+	    ATOMIC_SET(&rwlr->is_locked, 0);
+	}
+	RWMUTEX_WUNLOCK(rwlr->rwlock);
+    }
+    else {
+	if (rwlr->lock_check) {
+	    ASSERT(ATOMIC_READ(&rwlr->is_locked) > 0);
+	    ATOMIC_DEC(&rwlr->is_locked);
+	}
+	RWMUTEX_RUNLOCK(rwlr->rwlock);
+    }
+
+    if (wait_unlocked)
+	milli_sleep(wait_unlocked);
+
+    return enif_make_atom(env, "ok");
+ badarg:
+    return enif_make_badarg(env);
+}
+
+static int load_nif_lib(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
+{
+    *priv_data = enif_open_resource_type(env,
+					 NULL,
+					 "rwlock_resource",
+					 rwlock_destructor,
+					 ERL_NIF_RT_CREATE,
+					 NULL);
+    if (*priv_data)
+	return 0;
+    else
+	return -1;
+}
+
+/*
+ * 0 -> false
+ * >0 -> true
+ * <0 -> error
+ */
+
+static int
+get_bool(ErlNifEnv* env, ERL_NIF_TERM term)
+{
+    int res;
+    char buf[10];
+
+    res = enif_get_atom(env, term, buf, sizeof(buf), ERL_NIF_LATIN1);
+    if (res == 0)
+	return -1;
+    if (strcmp("false", buf) == 0)
+	return 0;
+    else if (strcmp("true", buf) == 0)
+	return 1;
+    else
+	return -1;
+}
+
+static int
+fail(const char *file, int line, const char *function, const char *assertion)
+{
+    fprintf(stderr, "%s:%d: Assertion failed in %s(): %s\n",
+	    file, line, function, assertion);
+    abort();
+}
+
+static void
+milli_sleep(int ms)
+{
+#ifdef __WIN32__
+    Sleep(ms);
+#else
+    while (erts_milli_sleep(ms) != 0);
+#endif
+}
+
+static ErlNifFunc nif_funcs[] = {
+    {"long_rw_test", 0, long_rw_test},
+    {"hammer_rw_test", 1, hammer_rw_test},
+    {"hammer_tryrw_test", 1, hammer_tryrw_test},
+    {"create_rwlock", 2, create_rwlock},
+    {"rwlock_op", 5, rwlock_op}
+};
+
+ERL_NIF_INIT(mtx_SUITE, nif_funcs, load_nif_lib, NULL, NULL, NULL)
diff --git a/erts/emulator/test/nested_SUITE.erl b/erts/emulator/test/nested_SUITE.erl
index 310892424e..f889712f46 100644
--- a/erts/emulator/test/nested_SUITE.erl
+++ b/erts/emulator/test/nested_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -19,11 +19,33 @@
 
 -module(nested_SUITE).
 
--export([all/1, case_in_case/1, case_in_after/1, catch_in_catch/1, bif_in_bif/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 case_in_case/1, case_in_after/1, catch_in_catch/1, bif_in_bif/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [case_in_case, case_in_after, catch_in_catch,
+     bif_in_bif].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> [case_in_case, case_in_after, catch_in_catch, bif_in_bif].
 
 case_in_case(suite) -> [];
 case_in_case(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index a1f61dad67..54cbf6b974 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2010. 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
@@ -23,14 +23,18 @@
 -define(CHECK(Exp,Got), check(Exp,Got,?LINE)).
 %%-define(CHECK(Exp,Got), ?line Exp = Got).
 
--include("test_server.hrl").
-
--export([all/1, 
-	 %%init_per_testcase/2, 
-	 fin_per_testcase/2, basic/1, reload/1, upgrade/1, heap_frag/1,
-	 types/1, many_args/1, binaries/1, get_string/1, get_atom/1, api_macros/1,
-	 from_array/1, iolist_as_binary/1, resource/1, resource_binary/1, resource_takeover/1,
-	 threading/1, send/1, send2/1, send_threaded/1, neg/1, is_checks/1,
+-include_lib("test_server/include/test_server.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/1, upgrade/1, heap_frag/1,
+	 types/1, many_args/1, binaries/1, get_string/1, get_atom/1, 
+	 api_macros/1,
+	 from_array/1, iolist_as_binary/1, resource/1, resource_binary/1, 
+	 resource_takeover/1,
+	 threading/1, send/1, send2/1, send3/1, send_threaded/1, neg/1, 
+	 is_checks/1,
 	 get_length/1, make_atom/1, make_string/1]).
 
 -export([many_args_100/100]).
@@ -40,7 +44,7 @@
 %% 	 list_seq/1,type_test/0,tuple_2_list/1,is_identical/2,compare/2,
 %% 	 clone_bin/1,make_sub_bin/3,string_to_bin/2,atom_to_bin/2,macros/1,
 %% 	 tuple_2_list_and_tuple/1,iolist_2_bin/1,get_resource_type/1,alloc_resource/2,
-%% 	 make_resource/1,get_resource/2,release_resource/1,last_resource_dtor_call/0,
+%% 	 make_resource/1,get_resource/2,release_resource/1,last_resource_dtor_call/0, suite/0,
 %% 	 make_new_resource/2,make_new_resource_binary/1,send_list_seq/2,send_new_blob/2,
 %% 	 alloc_msgenv/0,clear_msgenv/1,grow_blob/2,send_blob/2,send_blob_thread/3,
 %% 	 join_send_thread/1]).
@@ -48,17 +52,37 @@
 
 -define(nif_stub,nif_stub_error(?LINE)).
 
-all(suite) ->
-    [basic, reload, upgrade, heap_frag, types, many_args, binaries, get_string,
-     get_atom, api_macros, from_array, iolist_as_binary, resource, resource_binary,
-     resource_takeover, threading, send, send2, send_threaded, neg, is_checks,
-     get_length, make_atom, make_string].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic, reload, upgrade, heap_frag, types, many_args,
+     binaries, get_string, get_atom, api_macros, from_array,
+     iolist_as_binary, resource, resource_binary,
+     resource_takeover, threading, send, send2, send3,
+     send_threaded, neg, is_checks, get_length, make_atom,
+     make_string].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
 
-%%init_per_testcase(_Case, Config) ->
-%%    ?line Dog = ?t:timetrap(?t:seconds(60*60*24)),
-%%    [{watchdog, Dog}|Config].
+init_per_group(_GroupName, Config) ->
+    Config.
 
-fin_per_testcase(_Func, _Config) ->
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(_Case, Config) ->
+%    ?line Dog = ?t:timetrap(?t:seconds(60*60*24)),
+    Config.
+
+end_per_testcase(_Func, _Config) ->
     %%Dog = ?config(watchdog, Config),
     %%?t:timetrap_cancel(Dog),
     P1 = code:purge(nif_mod),
@@ -73,7 +97,7 @@ basic(Config) when is_list(Config) ->
     ?line true = (lib_version() =/= undefined),
     ?line [{load,1,1,101},{lib_version,1,2,102}] = call_history(),
     ?line [] = call_history(),
-    ?line [?MODULE] = erlang:system_info(taints),
+    ?line true = lists:member(?MODULE, erlang:system_info(taints)),
     ok.
 
 reload(doc) -> ["Test reload callback in nif lib"];
@@ -107,7 +131,8 @@ reload(Config) when is_list(Config) ->
     ?line true = erlang:purge_module(nif_mod),
     ?line [{unload,1,3,103}] = nif_mod_call_history(),    
 
-    ?line [?MODULE, nif_mod] = erlang:system_info(taints),
+    ?line true = lists:member(?MODULE, erlang:system_info(taints)),
+    ?line true = lists:member(nif_mod, erlang:system_info(taints)),
     ?line verify_tmpmem(TmpMem),
     ok.
 
@@ -197,7 +222,8 @@ upgrade(Config) when is_list(Config) ->
     ?line true = erlang:purge_module(nif_mod),
     ?line [{unload,2,4,204}] = nif_mod_call_history(),    
 
-    ?line [?MODULE, nif_mod] = erlang:system_info(taints),    
+    ?line true = lists:member(?MODULE, erlang:system_info(taints)),
+    ?line true = lists:member(nif_mod, erlang:system_info(taints)),
     ?line verify_tmpmem(TmpMem),
     ok.
 
@@ -727,7 +753,8 @@ resource_takeover(Config) when is_list(Config) ->
     ?line ok = forget_resource(AN4),
     ?line [] = nif_mod_call_history(),
 
-    ?line [?MODULE, nif_mod] = erlang:system_info(taints),
+    ?line true = lists:member(?MODULE, erlang:system_info(taints)),
+    ?line true = lists:member(nif_mod, erlang:system_info(taints)),
     ?line verify_tmpmem(TmpMem),    
     ok.
 
@@ -916,7 +943,164 @@ forwarder(To, N) ->
 
 other_term() ->
     {fun(X,Y) -> X*Y end, make_ref()}.
-    
+
+send3(doc) -> ["Message sending stress test"];
+send3(Config) when is_list(Config) ->
+    %% Let a number of processes send random message blobs between each other
+    %% using enif_send. Kill and spawn new ones randomly to keep a ~constant
+    %% number of workers running.
+    Seed = now(),
+    io:format("seed: ~p\n",[Seed]), 
+    random:seed(Seed),    
+    ets:new(nif_SUITE,[named_table,public]),
+    ?line true = ets:insert(nif_SUITE,{send3,0,0,0,0}),
+    timer:send_after(10000, timeout), % Run for 10 seconds
+    SpawnCnt = send3_controller(0, [], [], 20),
+    ?line [{_,Rcv,SndOk,SndFail,Balance}] = ets:lookup(nif_SUITE,send3),
+    io:format("spawns=~p received=~p, sent=~p send-failure=~p balance=~p\n",
+              [SpawnCnt,Rcv,SndOk,SndFail,Balance]),
+    ets:delete(nif_SUITE).
+
+send3_controller(SpawnCnt, [], _, infinity) ->
+    SpawnCnt;
+send3_controller(SpawnCnt0, Mons0, Pids0, Tick) ->
+    receive 
+        timeout ->
+            io:format("Timeout. Sending 'halt' to ~p\n",[Pids0]),            
+            lists:foreach(fun(P) -> P ! {halt,self()} end, Pids0),
+            lists:foreach(fun(P) -> receive {halted,P} -> ok end end, Pids0),
+            QTot = lists:foldl(fun(P,QSum) ->
+                                 {message_queue_len,QLen} = 
+                                    erlang:process_info(P,message_queue_len),
+                                 QSum + QLen
+                               end, 0, Pids0),
+            io:format("Total queue length ~p\n",[QTot]),            
+            lists:foreach(fun(P) -> P ! die end, Pids0),
+            send3_controller(SpawnCnt0, Mons0, [], infinity);
+        {'DOWN', MonRef, process, _Pid, _} ->
+            Mons1 = lists:delete(MonRef, Mons0),
+            %%io:format("Got DOWN from ~p. Monitors left: ~p\n",[Pid,Mons1]),            
+            send3_controller(SpawnCnt0, Mons1, Pids0, Tick)
+    after Tick -> 
+        Max = 20,
+        N = length(Pids0),
+        PidN = random:uniform(Max),
+        %%io:format("N=~p PidN=~p Pids0=~p\n", [N,PidN,Pids0]), 
+        case PidN > N of
+            true ->
+                {NewPid,Mon} = spawn_opt(fun send3_proc/0, [link,monitor]),                
+                lists:foreach(fun(P) -> P ! {is_born,NewPid} end, Pids0),
+                ?line Balance = ets:lookup_element(nif_SUITE,send3,5),
+                Inject = (Balance =< 0),
+                case Inject of
+                    true ->  ok;
+                    false -> ets:update_element(nif_SUITE,send3,{5,-1})
+                end,
+                NewPid ! {pids,Pids0,Inject},
+                send3_controller(SpawnCnt0+1, [Mon|Mons0], [NewPid|Pids0], Tick);
+            false ->
+                KillPid = lists:nth(PidN,Pids0),
+                KillPid ! die,
+                Pids1 = lists:delete(KillPid, Pids0),
+                lists:foreach(fun(P) -> P ! {is_dead,KillPid} end, Pids1),
+                send3_controller(SpawnCnt0, Mons0, Pids1, Tick)
+        end        
+   end.
+
+send3_proc() ->
+    %%io:format("Process ~p spawned\n",[self()]),
+    send3_proc([self()], {0,0,0}, {1,2,3,4,5}).
+send3_proc(Pids0, Counters={Rcv,SndOk,SndFail}, State0) ->
+    %%io:format("~p: Pids0=~p", [self(), Pids0]),
+    %%timer:sleep(10),
+    receive 
+        {pids, Pids1, Inject} ->
+            %%io:format("~p: got ~p Inject=~p\n", [self(), Pids1, Inject]), 
+            ?line Pids0 = [self()],
+            Pids2 = [self() | Pids1],
+            case Inject of
+                true -> send3_proc_send(Pids2, Counters, State0);
+                false -> send3_proc(Pids2, Counters, State0)
+            end;
+        {is_born, Pid} ->
+            %%io:format("~p: is_born ~p, got ~p\n", [self(), Pid, Pids0]), 
+            send3_proc([Pid | Pids0], Counters, State0);
+        {is_dead, Pid} ->            
+            Pids1 = lists:delete(Pid,Pids0),
+            %%io:format("~p: is_dead ~p, got ~p\n", [self(), Pid, Pids1]),
+            send3_proc(Pids1, Counters, State0);
+        {blob, Blob0} ->
+            %%io:format("~p: blob ~p\n", [self(), Blob0]),
+            State1 = send3_new_state(State0, Blob0),
+            send3_proc_send(Pids0, {Rcv+1,SndOk,SndFail}, State1);
+        die ->
+            %%io:format("Process ~p terminating, stats = ~p\n",[self(),Counters]),
+            {message_queue_len,Dropped} = erlang:process_info(self(),message_queue_len),
+            _R = ets:update_counter(nif_SUITE,send3,
+                               [{2,Rcv},{3,SndOk},{4,SndFail},{5,1-Dropped}]),
+            %%io:format("~p: dies R=~p\n", [self(), R]),
+            ok;
+        {halt,Papa} ->
+            Papa ! {halted,self()},
+            io:format("~p halted\n",[self()]),
+            receive die -> ok end,
+            io:format("~p dying\n",[self()])
+    end.
+
+send3_proc_send(Pids, {Rcv,SndOk,SndFail}, State0) ->
+    To = lists:nth(random:uniform(length(Pids)),Pids),
+    Blob = send3_make_blob(),
+    State1 = send3_new_state(State0,Blob), 
+    case send3_send(To, Blob) of
+        true ->
+            send3_proc(Pids, {Rcv,SndOk+1,SndFail}, State1);
+        false ->
+            send3_proc(Pids, {Rcv,SndOk,SndFail+1}, State1)
+    end.
+
+
+send3_make_blob() ->    
+    case random:uniform(20)-1 of
+        0 -> {term,[]};
+        N ->
+            MsgEnv = alloc_msgenv(), 
+            repeat(N bsr 1,
+                   fun(_) -> grow_blob(MsgEnv,other_term(),random:uniform(1 bsl 20))
+                   end, void),
+            case (N band 1) of
+                0 -> {term,copy_blob(MsgEnv)};
+                1 -> {msgenv,MsgEnv}
+            end
+    end.
+
+send3_send(Pid, Msg) ->
+    %% 90% enif_send and 10% normal bang
+    case random:uniform(10) of
+        1 -> send3_send_bang(Pid,Msg);
+        _ -> send3_send_nif(Pid,Msg)
+    end.
+send3_send_nif(Pid, {term,Blob}) ->
+    %%io:format("~p send term nif\n",[self()]),
+    send_term(Pid, {blob, Blob}) =:= 1;
+send3_send_nif(Pid, {msgenv,MsgEnv}) ->
+    %%io:format("~p send blob nif\n",[self()]),   
+    send3_blob(MsgEnv, Pid, blob) =:= 1.
+
+send3_send_bang(Pid, {term,Blob}) ->
+    %%io:format("~p send term bang\n",[self()]),   
+    Pid ! {blob, Blob},
+    true;
+send3_send_bang(Pid, {msgenv,MsgEnv}) ->
+    %%io:format("~p send blob bang\n",[self()]),   
+    Pid ! {blob, copy_blob(MsgEnv)},
+    true.
+
+send3_new_state(State, Blob) ->
+    case random:uniform(5+2) of
+        N when N =< 5-> setelement(N, State, Blob);
+        _ -> State  % Don't store blob
+    end.
+
 neg(doc) -> ["Negative testing of load_nif"];
 neg(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
@@ -967,10 +1151,11 @@ make_atom(Config) when is_list(Config) ->
 make_string(Config) when is_list(Config) ->
     ?line ensure_lib_loaded(Config, 1),
     ?line Strings = make_strings(),
-    ?line 4 = size(Strings),
+    ?line 5 = size(Strings),
     A0String = "a0string",
     A0String0 = [$a,0,$s,$t,$r,$i,$n,$g,0],
-    ?line Strings = {A0String,A0String,A0String,A0String0}.
+    AStringWithAccents = [$E,$r,$l,$a,$n,$g,$ ,16#e4,$r,$ ,$e,$t,$t,$ ,$g,$e,$n,$e,$r,$e,$l,$l,$t,$ ,$p,$r,$o,$g,$r,$a,$m,$s,$p,$r,16#e5,$k],
+    ?line Strings = {A0String,A0String,A0String,A0String0, AStringWithAccents}.
 
 tmpmem() ->
     case erlang:system_info({allocator,temp_alloc}) of
@@ -1069,10 +1254,13 @@ send_new_blob(_,_) -> ?nif_stub.
 alloc_msgenv() -> ?nif_stub.
 clear_msgenv(_) -> ?nif_stub.
 grow_blob(_,_) -> ?nif_stub.
+grow_blob(_,_,_) -> ?nif_stub.
 send_blob(_,_) -> ?nif_stub.
+send3_blob(_,_,_) -> ?nif_stub.
 send_blob_thread(_,_,_) -> ?nif_stub.
 join_send_thread(_) -> ?nif_stub.
-
+copy_blob(_) -> ?nif_stub.
+send_term(_,_) -> ?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 bacf7845e2..8489124966 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -296,6 +296,30 @@ static int test_ulong(ErlNifEnv* env, unsigned long i1)
     return 1;
 }
 
+static int test_int64(ErlNifEnv* env, ErlNifSInt64 i1)
+{
+    ErlNifSInt64 i2 = 0;
+    ERL_NIF_TERM int_term = enif_make_int64(env, i1);
+    if (!enif_get_int64(env,int_term, &i2) || i1 != i2) {
+	fprintf(stderr, "test_int64(%ld) ...FAILED i2=%ld\r\n",
+		(long)i1, (long)i2);
+	return 0;
+    }
+    return 1;
+}
+
+static int test_uint64(ErlNifEnv* env, ErlNifUInt64 i1)
+{
+    ErlNifUInt64 i2 = 0;
+    ERL_NIF_TERM int_term = enif_make_uint64(env, i1);
+    if (!enif_get_uint64(env,int_term, &i2) || i1 != i2) {
+	fprintf(stderr, "test_ulong(%lu) ...FAILED i2=%lu\r\n",
+		(unsigned long)i1, (unsigned long)i2);
+	return 0;
+    }
+    return 1;
+}
+
 static int test_double(ErlNifEnv* env, double d1)
 {
     double d2 = 0;
@@ -319,6 +343,8 @@ static ERL_NIF_TERM type_test(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
     unsigned uint;
     long slong;
     unsigned long ulong;
+    ErlNifSInt64 sint64;
+    ErlNifUInt64 uint64;
     double d;
     ERL_NIF_TERM atom, ref1, ref2;
 
@@ -352,11 +378,25 @@ static ERL_NIF_TERM type_test(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
 	slong -= slong / 3 + 1;
     } while (slong >= 0);
 
+    sint64 = ((ErlNifSInt64)1 << 63); /* INT64_MIN */
+    do {
+	if (!test_int64(env,sint64)) {
+	    goto error;
+	}
+	sint64 += ~sint64 / 3 + 1;
+    } while (sint64 < 0);
+    sint64 = ((ErlNifUInt64)1 << 63) - 1; /* INT64_MAX */
+    do {
+	if (!test_int64(env,sint64)) {
+	    goto error;
+	}
+	sint64 -= sint64 / 3 + 1;
+    } while (sint64 >= 0);
 
     uint = UINT_MAX;
     for (;;) {
 	if (!test_uint(env,uint)) {
-	    
+	    goto error;
 	}
 	if (uint == 0) break;
 	uint -= uint / 3 + 1;
@@ -364,11 +404,19 @@ static ERL_NIF_TERM type_test(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
     ulong = ULONG_MAX;
     for (;;) {
 	if (!test_ulong(env,ulong)) {
-	    
+	    goto error;
 	}
 	if (ulong == 0) break;
 	ulong -= ulong / 3 + 1;
     }    
+    uint64 = (ErlNifUInt64)-1; /* UINT64_MAX */
+    for (;;) {
+	if (!test_uint64(env,uint64)) {
+	    goto error;
+	}
+	if (uint64 == 0) break;
+	uint64 -= uint64 / 3 + 1;
+    }    
 
     if (MAX_SMALL < INT_MAX) { /* 32-bit */
 	for (i=-10 ; i <= 10; i++) {
@@ -391,11 +439,18 @@ static ERL_NIF_TERM type_test(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
 
     for (i=-10 ; i < 10; i++) {
 	if (!test_long(env,MAX_SMALL+i) || !test_ulong(env,MAX_SMALL+i) ||
-	    !test_long(env,MIN_SMALL+i)) {
+	    !test_long(env,MIN_SMALL+i) ||
+	    !test_int64(env,MAX_SMALL+i) || !test_uint64(env,MAX_SMALL+i) ||
+	    !test_int64(env,MIN_SMALL+i)) {
 	    goto error;
 	}
+	if (MAX_SMALL < INT_MAX) {
+	    if (!test_int(env,MAX_SMALL+i) || !test_uint(env,MAX_SMALL+i) ||
+		!test_int(env,MIN_SMALL+i)) {
+		goto error;
+	    }
+	}
     }
-
     for (d=3.141592e-100 ; d < 1e100 ; d *= 9.97) {
 	if (!test_double(env,d) || !test_double(env,-d)) {
 	    goto error;
@@ -808,12 +863,14 @@ static ERL_NIF_TERM make_strings(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 {
     const char a0string[8] = {'a','0','s','t','r','i','n','g'};
     const char a0string0[9] = {'a','\0','s','t','r','i','n','g',0};
+    const char astringwith8bits[37] = {'E','r','l','a','n','g',' ',0xE4 /* 'ä' */,'r',' ','e','t','t',' ','g','e','n','e','r','e','l','l','t',' ','p','r','o','g','r','a','m','s','p','r', 0xE5 /* 'å' */,'k',0};
 
-    return enif_make_tuple4(env,
+    return enif_make_tuple5(env,
 			    enif_make_string(env, "a0string", ERL_NIF_LATIN1),
 			    enif_make_string_len(env, "a0string", 8, ERL_NIF_LATIN1),
 			    enif_make_string_len(env, a0string, 8, ERL_NIF_LATIN1),
-			    enif_make_string_len(env, a0string0, 9, ERL_NIF_LATIN1));
+			    enif_make_string_len(env, a0string0, 9, ERL_NIF_LATIN1),
+			    enif_make_string(env, astringwith8bits, ERL_NIF_LATIN1));
 }
 static ERL_NIF_TERM send_list_seq(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
@@ -972,8 +1029,11 @@ static ERL_NIF_TERM make_term_list0(struct make_term_info* mti, int n)
 static ERL_NIF_TERM make_term_resource(struct make_term_info* mti, int n)
 {
     void* resource = enif_alloc_resource(mti->resource_type, 10);
+    ERL_NIF_TERM term;
     fill(resource, 10, n); 
-    return enif_make_resource(mti->dst_env, resource);
+    term = enif_make_resource(mti->dst_env, resource);
+    enif_release_resource(resource);
+    return term;
 }
 static ERL_NIF_TERM make_term_new_binary(struct make_term_info* mti, int n)
 {
@@ -1036,36 +1096,41 @@ static ERL_NIF_TERM make_term_copy(struct make_term_info* mti, int n)
 {
     return enif_make_copy(mti->dst_env, mti->other_term);
 }
+
+typedef ERL_NIF_TERM Make_term_Func(struct make_term_info*, int);
+static Make_term_Func* make_funcs[] = {
+    make_term_binary,
+    make_term_int,
+    make_term_ulong,
+    make_term_double,
+    make_term_atom,
+    make_term_existing_atom,
+    make_term_string,
+    //make_term_ref,
+    make_term_sub_binary,
+    make_term_uint,
+    make_term_long,
+    make_term_tuple0,
+    make_term_list0,
+    make_term_resource,
+    make_term_new_binary,
+    make_term_caller_pid,
+    make_term_tuple,
+    make_term_list,
+    make_term_list_cell,
+    make_term_tuple_from_array,
+    make_term_list_from_array,
+    make_term_garbage,
+    make_term_copy
+};
+static unsigned num_of_make_funcs()
+{
+    return sizeof(make_funcs)/sizeof(*make_funcs);
+}
 static int make_term_n(struct make_term_info* mti, int n, ERL_NIF_TERM* res)
 {
-    typedef ERL_NIF_TERM Make_term_Func(struct make_term_info*, int);
-    static Make_term_Func* funcs[] = {
-	make_term_binary,
-	make_term_int,
-	make_term_ulong,
-	make_term_double,
-	make_term_atom,
-	make_term_existing_atom,
-	make_term_string,
-	//make_term_ref,
-	make_term_sub_binary,
-	make_term_uint,
-	make_term_long,
-	make_term_tuple0,
-	make_term_list0,
-	make_term_resource,
-	make_term_new_binary,
-	make_term_caller_pid,
-	make_term_tuple,
-	make_term_list,
-	make_term_list_cell,
-	make_term_tuple_from_array,
-	make_term_list_from_array,
-	make_term_garbage,
-	make_term_copy
-    };
-    if (n < sizeof(funcs)/sizeof(*funcs)) {
-	*res = funcs[n](mti, n);
+    if (n < num_of_make_funcs()) {
+	*res = make_funcs[n](mti, n);
 	push_term(mti, *res);
 	return 1;
     }
@@ -1165,14 +1230,14 @@ static ERL_NIF_TERM grow_blob(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
 {
     union { void* vp; struct make_term_info* p; }mti;
     ERL_NIF_TERM term;
-    if (!enif_get_resource(env, argv[0], msgenv_resource_type, &mti.vp)) {
+    if (!enif_get_resource(env, argv[0], msgenv_resource_type, &mti.vp)
+	|| (argc>2 && !enif_get_uint(env,argv[2], &mti.p->n))) {
 	return enif_make_badarg(env);
     }
     mti.p->caller_env = env;
     mti.p->other_term = argv[1];
-    while (!make_term_n(mti.p, mti.p->n++, &term)) {
-	mti.p->n = 0;
-    }
+    mti.p->n %= num_of_make_funcs();
+    make_term_n(mti.p, mti.p->n++, &term);
     mti.p->blob = enif_make_list_cell(mti.p->dst_env, term, mti.p->blob);
     return atom_ok;
 }
@@ -1192,6 +1257,23 @@ static ERL_NIF_TERM send_blob(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
     return enif_make_tuple3(env, atom_ok, enif_make_int(env,res), copy);
 }
 
+static ERL_NIF_TERM send3_blob(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    union { void* vp; struct make_term_info* p; }mti;
+    ErlNifPid to;
+    ERL_NIF_TERM copy;
+    int res;
+    if (!enif_get_resource(env, argv[0], msgenv_resource_type, &mti.vp)
+	|| !enif_get_local_pid(env, argv[1], &to)) {
+	return enif_make_badarg(env);
+    }
+    mti.p->blob = enif_make_tuple2(mti.p->dst_env, 
+				   enif_make_copy(mti.p->dst_env, argv[2]),
+				   mti.p->blob);
+    res = enif_send(env, &to, mti.p->dst_env, mti.p->blob);
+    return enif_make_int(env,res);
+}
+
 void* threaded_sender(void *arg)
 {
 
@@ -1251,6 +1333,28 @@ static ERL_NIF_TERM join_send_thread(ErlNifEnv* env, int argc, const ERL_NIF_TER
     return enif_make_tuple2(env, atom_ok, enif_make_int(env, mti.p->send_res));    
 }
 
+static ERL_NIF_TERM copy_blob(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    union { void* vp; struct make_term_info* p; }mti;
+    if (!enif_get_resource(env, argv[0], msgenv_resource_type, &mti.vp)) {
+	return enif_make_badarg(env);
+    }
+    return enif_make_copy(env, mti.p->blob);
+}
+
+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)) {
+	return enif_make_badarg(env);
+    }
+    menv = enif_alloc_env();
+    ret = enif_send(env, &pid, menv, enif_make_copy(menv, argv[1]));
+    enif_free_env(menv);
+    return enif_make_int(env, ret);
+}
 
 static ErlNifFunc nif_funcs[] =
 {
@@ -1289,9 +1393,13 @@ static ErlNifFunc nif_funcs[] =
     {"alloc_msgenv", 0, alloc_msgenv},
     {"clear_msgenv", 1, clear_msgenv},
     {"grow_blob", 2, grow_blob},
+    {"grow_blob", 3, grow_blob},
     {"send_blob", 2, send_blob},
+    {"send3_blob", 3, send3_blob},
     {"send_blob_thread", 3, send_blob_thread},
-    {"join_send_thread", 1, join_send_thread}
+    {"join_send_thread", 1, join_send_thread},
+    {"copy_blob", 1, copy_blob},
+    {"send_term", 2, send_term}
 };
 
 ERL_NIF_INIT(nif_SUITE,nif_funcs,load,reload,upgrade,unload)
diff --git a/erts/emulator/test/nif_SUITE_data/nif_mod.erl b/erts/emulator/test/nif_SUITE_data/nif_mod.erl
index 7888a589e7..b99a2c90ee 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_mod.erl
+++ b/erts/emulator/test/nif_SUITE_data/nif_mod.erl
@@ -19,7 +19,7 @@
 
 -module(nif_mod).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -export([load_nif_lib/2, load_nif_lib/3, start/0, lib_version/0, call_history/0,
 	 get_priv_data_ptr/0, make_new_resource/2, get_resource/2]).
diff --git a/erts/emulator/test/nif_SUITE_data/tester.erl b/erts/emulator/test/nif_SUITE_data/tester.erl
index 9df2158200..b393e29b82 100644
--- a/erts/emulator/test/nif_SUITE_data/tester.erl
+++ b/erts/emulator/test/nif_SUITE_data/tester.erl
@@ -1,6 +1,6 @@
 -module(tester).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -export([load_nif_lib/2, run/0]).
 
diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl
index f3d9eb783b..416fdad941 100644
--- a/erts/emulator/test/node_container_SUITE.erl
+++ b/erts/emulator/test/node_container_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
@@ -29,10 +29,12 @@
 
 %-define(line_trace, 1).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %-compile(export_all).
--export([all/1, init_per_testcase/2, fin_per_testcase/2, end_per_suite/1,
+-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,
 	 node_container_refc_check/1]).
 
 -export([term_to_binary_to_term_eq/1,
@@ -55,25 +57,30 @@
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(10)).
 
-all(doc) -> [];
-all(suite) ->
-    [term_to_binary_to_term_eq,
-     round_trip_eq,
-     cmp,
-     ref_eq,
-     node_table_gc,
-     dist_link_refc,
-     dist_monitor_refc,
-     node_controller_refc,
-     ets_refc,
-     match_spec_refc,
-     timer_refc,
-     otp_4715,
-     pid_wrap,
-     port_wrap,
-     bad_nc,
-     unique_pid,
-     iter_max_procs].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [term_to_binary_to_term_eq, round_trip_eq, cmp, ref_eq,
+     node_table_gc, dist_link_refc, dist_monitor_refc,
+     node_controller_refc, ets_refc, match_spec_refc,
+     timer_refc, otp_4715, pid_wrap, port_wrap, bad_nc,
+     unique_pid, iter_max_procs].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    available_internal_state(false).
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 available_internal_state(Bool) when Bool == true; Bool == false ->
     case {Bool,
@@ -95,14 +102,11 @@ init_per_testcase(_Case, Config) when is_list(Config) ->
     available_internal_state(true),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
 
-end_per_suite(_Config) ->
-    available_internal_state(false).
-
 %%%
 %%% The test cases -------------------------------------------------------------
 %%%
diff --git a/erts/emulator/test/nofrag_SUITE.erl b/erts/emulator/test/nofrag_SUITE.erl
index ece55f433c..9287158981 100644
--- a/erts/emulator/test/nofrag_SUITE.erl
+++ b/erts/emulator/test/nofrag_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -19,9 +19,11 @@
 
 -module(nofrag_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,init_per_testcase/2,end_per_testcase/2,
+-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,
 	 error_handler/1,error_handler_apply/1,
 	 error_handler_fixed_apply/1,error_handler_fun/1,
 	 error_handler_tuple_fun/1,
@@ -30,9 +32,28 @@
 %% Exported functions for an error_handler module.
 -export([undefined_function/3,undefined_lambda/3,breakpoint/3]).
 
-all(suite) ->
-    [error_handler,error_handler_apply,error_handler_fixed_apply,
-     error_handler_fun,error_handler_tuple_fun,debug_breakpoint].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [error_handler, error_handler_apply,
+     error_handler_fixed_apply, error_handler_fun,
+     error_handler_tuple_fun, debug_breakpoint].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog = ?t:timetrap(?t:minutes(3)),
diff --git a/erts/emulator/test/num_bif_SUITE.erl b/erts/emulator/test/num_bif_SUITE.erl
index d009994e2d..bf101b038d 100644
--- a/erts/emulator/test/num_bif_SUITE.erl
+++ b/erts/emulator/test/num_bif_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -19,7 +19,7 @@
 
 -module(num_bif_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Tests the BIFs:
 %% 	abs/1
@@ -31,15 +31,36 @@
 %%	round/1
 %%	trunc/1
 
--export([all/1, t_abs/1, t_float/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, t_abs/1, t_float/1,
 	 t_float_to_list/1, t_integer_to_list/1,
 	 t_list_to_integer/1,
-	 t_list_to_float/1, t_list_to_float_safe/1, t_list_to_float_risky/1,
+	 t_list_to_float_safe/1, t_list_to_float_risky/1,
 	 t_round/1, t_trunc/1]).
 
-all(suite) -> [t_abs, t_float, t_float_to_list, t_integer_to_list,
-	       t_list_to_float, t_list_to_integer,
-	       t_round, t_trunc].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [t_abs, t_float, t_float_to_list, t_integer_to_list,
+     {group, t_list_to_float}, t_list_to_integer, t_round,
+     t_trunc].
+
+groups() -> 
+    [{t_list_to_float, [],
+      [t_list_to_float_safe, t_list_to_float_risky]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 t_abs(Config) when is_list(Config) ->
     %% Floats.
@@ -140,7 +161,6 @@ t_integer_to_list(Config) when is_list(Config) ->
 
 %% Tests list_to_float/1.
 
-t_list_to_float(suite) -> [t_list_to_float_safe, t_list_to_float_risky].
 
 t_list_to_float_safe(Config) when is_list(Config) ->
     ?line 0.0 = list_to_float(id("0.0")),
diff --git a/erts/emulator/test/obsolete_SUITE.erl b/erts/emulator/test/obsolete_SUITE.erl
deleted file mode 100644
index b191f84ee0..0000000000
--- a/erts/emulator/test/obsolete_SUITE.erl
+++ /dev/null
@@ -1,123 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-2010. 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(obsolete_SUITE).
--author('[email protected]').
--compile(nowarn_obsolete_guard).
-
--export([all/1]).
-
--export([erl_threads/1]).
-
--include("test_server.hrl").
-
--define(DEFAULT_TIMETRAP_SECS, 240).
-
-all(doc) -> [];
-all(suite) ->
-    case catch erlang:system_info({wordsize,external}) of
-	4 -> [erl_threads];
-	_ -> {skip, "Only expected to work on true 32-bit architectures"}
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                        %%
-%% Testcases                                                              %%
-%%                                                                        %%
-
-erl_threads(suite) -> [];
-erl_threads(doc) ->   [];
-erl_threads(Cfg) ->
-    ?line case erlang:system_info(threads) of
-	      true ->
-		  ?line drv_case(Cfg, erl_threads);
-	      false ->
-		  ?line {skip, "Emulator not compiled with threads support"}
-	  end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                        %%
-%% Internal functions                                                     %%
-%%                                                                        %%
-
-drv_case(Config, CaseName) ->
-    drv_case(Config, CaseName, "").
-
-drv_case(Config, CaseName, TimeTrap) when integer(TimeTrap) ->
-    drv_case(Config, CaseName, "", TimeTrap);
-drv_case(Config, CaseName, Command) when list(Command) ->
-    drv_case(Config, CaseName, Command, ?DEFAULT_TIMETRAP_SECS).
-
-drv_case(Config, CaseName, TimeTrap, Command) when list(Command),
-						   integer(TimeTrap) ->
-    drv_case(Config, CaseName, Command, TimeTrap);
-drv_case(Config, CaseName, Command, TimeTrap) when list(Config),
-						   atom(CaseName),
-						   list(Command),
-						   integer(TimeTrap) ->
-    case ?t:os_type() of
-	{Family, _} when Family == unix; Family == win32 ->
-	    ?line run_drv_case(Config, CaseName, Command, TimeTrap);
-	SkipOs ->
-	    ?line {skipped,
-		   lists:flatten(["Not run on "
-				  | io_lib:format("~p",[SkipOs])])}
-    end.
-
-run_drv_case(Config, CaseName, Command, TimeTrap) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(TimeTrap)),
-    ?line DataDir = ?config(data_dir,Config),
-    case erl_ddll:load_driver(DataDir, CaseName) of
-	ok -> ok;
-	{error, Error} ->
-	    io:format("~s\n", [erl_ddll:format_error(Error)]),
-	    ?line ?t:fail()
-    end,
-    ?line Port = open_port({spawn, atom_to_list(CaseName)}, []),
-    ?line true = is_port(Port),
-    ?line Port ! {self(), {command, Command}},
-    ?line Result = receive_drv_result(Port, CaseName),
-    ?line Port ! {self(), close},
-    ?line receive 
-	      {Port, closed} ->
-		  ok
-	  end,
-    ?line ok = erl_ddll:unload_driver(CaseName),
-    ?line test_server:timetrap_cancel(Dog),
-    ?line Result.
-
-receive_drv_result(Port, CaseName) ->
-    ?line receive
-	      {print, Port, CaseName, Str} ->
-		  ?line ?t:format("~s", [Str]),
-		  ?line receive_drv_result(Port, CaseName);
-	      {'EXIT', Port, Error} ->
-		  ?line ?t:fail(Error);
-	      {'EXIT', error, Error} ->
-		  ?line ?t:fail(Error);
-	      {failed, Port, CaseName, Comment} ->
-		  ?line ?t:fail(Comment);
-	      {skipped, Port, CaseName, Comment} ->
-		  ?line {skipped, Comment};
-	      {succeeded, Port, CaseName, ""} ->
-		  ?line succeeded;
-	      {succeeded, Port, CaseName, Comment} ->
-		  ?line {comment, Comment}
-	  end.
diff --git a/erts/emulator/test/obsolete_SUITE_data/Makefile.src b/erts/emulator/test/obsolete_SUITE_data/Makefile.src
deleted file mode 100644
index d8e2b861c0..0000000000
--- a/erts/emulator/test/obsolete_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,33 +0,0 @@
-# ``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 via the world wide web 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.
-# 
-# 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$
-#
-
-TEST_DRVS = erl_threads@dll@
-CC = @CC@
-LD = @LD@
-CFLAGS = @SHLIB_CFLAGS@ -I@erl_include@ @DEFS@
-SHLIB_EXTRA_LDLIBS = testcase_driver@obj@
-
-all: $(TEST_DRVS)
-
-@SHLIB_RULES@
-
-testcase_driver@obj@: testcase_driver.c testcase_driver.h
-$(TEST_DRVS): testcase_driver@obj@
-
-
-
diff --git a/erts/emulator/test/obsolete_SUITE_data/erl_threads.c b/erts/emulator/test/obsolete_SUITE_data/erl_threads.c
deleted file mode 100644
index 27a5163121..0000000000
--- a/erts/emulator/test/obsolete_SUITE_data/erl_threads.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/* ``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 via the world wide web 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.
- * 
- * The Initial Developer of the Original Code is Ericsson Utvecklings AB.
- * Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
- * AB. All Rights Reserved.''
- * 
- *     $Id$
- */
-
-#include "testcase_driver.h"
-
-#ifndef __WIN32__
-
-#define NO_OF_THREADS 2
-
-#include <unistd.h>
-#include <errno.h>
-
-static int die;
-static int cw_passed;
-static int res_tf0;
-static int res_tf1;
-static erl_mutex_t mtx;
-static erl_cond_t cnd;
-static erl_thread_t tid[NO_OF_THREADS];
-static int need_join[NO_OF_THREADS];
-
-typedef struct {
-    int n;
-} thr_arg_t;
-
-
-static void *tf0(void *vta)
-{
-    int r;
-
-    if (((thr_arg_t *) vta)->n != 0)
-	goto fail;
-
-    r = erts_mutex_lock(mtx);
-    if (r != 0) {
-	erts_mutex_unlock(mtx);
-	goto fail;
-    }
-
-    r = erts_cond_wait(cnd, mtx);
-    if (r != 0 || die) {
-	erts_mutex_unlock(mtx);
-	goto fail;
-    }
-
-    cw_passed++;
-
-    r = erts_cond_wait(cnd, mtx);
-    if (r != 0 || die) {
-	erts_mutex_unlock(mtx);
-	goto fail;
-    }
-
-    cw_passed++;
-
-    r = erts_mutex_unlock(mtx);
-    if (r != 0)
-	goto fail;
-
-    res_tf0 = 0;
-
-    return (void *) &res_tf0;
-
- fail:
-    return NULL;
-}
-
-
-static void *tf1(void *vta)
-{
-    int r;
-
-    if (((thr_arg_t *) vta)->n != 1)
-	goto fail;
-
-    r = erts_mutex_lock(mtx);
-    if (r != 0) {
-	erts_mutex_unlock(mtx);
-	goto fail;
-    }
-
-    r = erts_cond_wait(cnd, mtx);
-    if (r != 0 || die) {
-	erts_mutex_unlock(mtx);
-	goto fail;
-    }
-
-    cw_passed++;
-
-    r = erts_cond_wait(cnd, mtx);
-    if (r != 0 || die) {
-	erts_mutex_unlock(mtx);
-	goto fail;
-    }
-
-    cw_passed++;
-
-    r = erts_mutex_unlock(mtx);
-    if (r != 0)
-	goto fail;
-
-    res_tf1 = 1;
-
-    erts_thread_exit((void *) &res_tf1);
-
-    res_tf1 = 4711;
-
- fail:
-    return NULL;
-}
-
-#endif /* #ifndef __WIN32__ */
-
-void
-testcase_run(TestCaseState_t *tcs)
-{
-#ifdef __WIN32__
-    testcase_skipped(tcs, "Nothing to test; not supported on windows.");
-#else
-    int i, r;
-    void *tres[NO_OF_THREADS];
-    thr_arg_t ta[NO_OF_THREADS];
-    erl_thread_t t1;
-
-    die = 0;
-    cw_passed = 0;
-
-    for (i = 0; i < NO_OF_THREADS; i++)
-	need_join[i] = 0;
-
-    res_tf0 = 17;
-    res_tf1 = 17;
-
-    cnd = mtx = NULL;
-
-    /* Create mutex and cond */
-    mtx = erts_mutex_create();
-    ASSERT(tcs, mtx);
-    cnd = erts_cond_create();
-    ASSERT(tcs, cnd);
-
-    /* Create the threads */
-    ta[0].n = 0;
-    r = erts_thread_create(&tid[0], tf0, (void *) &ta[0], 0);
-    ASSERT(tcs, r == 0);
-    need_join[0] = 1;
-
-    ta[1].n = 1;
-    r = erts_thread_create(&tid[1], tf1, (void *) &ta[1], 0);
-    ASSERT(tcs, r == 0);
-    need_join[1] = 1;
-
-    /* Make sure the threads waits on cond wait */
-    sleep(1);
-
-    r = erts_mutex_lock(mtx);
-    ASSERT_CLNUP(tcs, r == 0, (void) erts_mutex_unlock(mtx));
-
-    ASSERT_CLNUP(tcs, cw_passed == 0, (void) erts_mutex_unlock(mtx));
-
-
-    /* Let one thread pass one cond wait */
-    r = erts_cond_signal(cnd);
-    ASSERT_CLNUP(tcs, r == 0, (void) erts_mutex_unlock(mtx));
-
-    r = erts_mutex_unlock(mtx);
-    ASSERT(tcs, r == 0);
-
-    sleep(1);
-
-    r = erts_mutex_lock(mtx);
-    ASSERT_CLNUP(tcs, r == 0, (void) erts_mutex_unlock(mtx));
-
-    ASSERT_CLNUP(tcs, cw_passed == 1, (void) erts_mutex_unlock(mtx));
-
-
-    /* Let both threads pass one cond wait */
-    r = erts_cond_broadcast(cnd);
-    ASSERT_CLNUP(tcs, r == 0, (void) erts_mutex_unlock(mtx));
-
-    r = erts_mutex_unlock(mtx);
-    ASSERT(tcs, r == 0);
-
-    sleep(1);
-
-    r = erts_mutex_lock(mtx);
-    ASSERT_CLNUP(tcs, r == 0, (void) erts_mutex_unlock(mtx));
-
-    ASSERT_CLNUP(tcs, cw_passed == 3, (void) erts_mutex_unlock(mtx));
-
-
-    /* Let the thread that only have passed one cond wait pass the other one */
-    r = erts_cond_signal(cnd);
-    ASSERT_CLNUP(tcs, r == 0, (void) erts_mutex_unlock(mtx));
-
-    r = erts_mutex_unlock(mtx);
-    ASSERT(tcs, r == 0);
-
-    sleep(1);
-
-    r = erts_mutex_lock(mtx);
-    ASSERT_CLNUP(tcs, r == 0, (void) erts_mutex_unlock(mtx));
-
-    ASSERT_CLNUP(tcs, cw_passed == 4, (void) erts_mutex_unlock(mtx));
-
-    /* Both threads should have passed both cond waits and exited;
-       join them and check returned values */
-
-    r = erts_thread_join(tid[0], &tres[0]);
-    ASSERT_CLNUP(tcs, r == 0, (void) erts_mutex_unlock(mtx));
-    need_join[0] = 0;
-
-    ASSERT_CLNUP(tcs, tres[0] == &res_tf0, (void) erts_mutex_unlock(mtx));
-    ASSERT_CLNUP(tcs, res_tf0 == 0, (void) erts_mutex_unlock(mtx));
-
-    r = erts_thread_join(tid[1], &tres[1]);
-    ASSERT_CLNUP(tcs, r == 0, (void) erts_mutex_unlock(mtx));
-    need_join[1] = 0;
-
-    ASSERT_CLNUP(tcs, tres[1] == &res_tf1, (void) erts_mutex_unlock(mtx));
-    ASSERT_CLNUP(tcs, res_tf1 == 1, (void) erts_mutex_unlock(mtx));
-
-    /* Test signaling when noone waits */
-
-    r = erts_cond_signal(cnd);
-    ASSERT_CLNUP(tcs, r == 0, (void) erts_mutex_unlock(mtx));
-
-    /* Test broadcasting when noone waits */
-
-    r = erts_cond_broadcast(cnd);
-    ASSERT_CLNUP(tcs, r == 0, (void) erts_mutex_unlock(mtx));
-
-    /* erts_cond_timedwait() not supported anymore */
-    r = erts_cond_timedwait(cnd, mtx, 1000);
-    ASSERT_CLNUP(tcs, r != 0, (void) erts_mutex_unlock(mtx));
-    ASSERT_CLNUP(tcs,
-		 strcmp(erl_errno_id(r), "enotsup") == 0,
-		 (void) erts_mutex_unlock(mtx));
-
-    r = erts_mutex_unlock(mtx);
-    ASSERT(tcs, r == 0);
-
-    r = erts_mutex_destroy(mtx);
-    ASSERT(tcs, r == 0);
-    mtx = NULL;
-
-    r = erts_cond_destroy(cnd);
-    ASSERT(tcs, r == 0);
-    cnd = NULL;
-
-    /* ... */
-    t1 = erts_thread_self();
-
-    if (cw_passed == 4711) {
-	/* We don't want to execute this just check that the
-	   symbol/symbols is/are defined */
-	erts_thread_kill(t1);
-    }
-
-#endif /* #ifndef __WIN32__ */
-}
-
-char *
-testcase_name(void)
-{
-    return "erl_threads";
-}
-
-void
-testcase_cleanup(TestCaseState_t *tcs)
-{
-    int i;
-    for (i = 0; i < NO_OF_THREADS; i++) {
-	if (need_join[i]) {
-	    erts_mutex_lock(mtx);
-	    die = 1;
-	    erts_cond_broadcast(cnd);
-	    erts_mutex_unlock(mtx);
-	    erts_thread_join(tid[1], NULL);
-	}
-    }
-    if (mtx)
-	erts_mutex_destroy(mtx);
-    if (cnd)
-	erts_cond_destroy(cnd);
-}
-
diff --git a/erts/emulator/test/obsolete_SUITE_data/testcase_driver.c b/erts/emulator/test/obsolete_SUITE_data/testcase_driver.c
deleted file mode 100644
index 99d5adb041..0000000000
--- a/erts/emulator/test/obsolete_SUITE_data/testcase_driver.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/* ``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 via the world wide web 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.
- * 
- * The Initial Developer of the Original Code is Ericsson Utvecklings AB.
- * Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
- * AB. All Rights Reserved.''
- * 
- *     $Id$
- */
-
-#include "testcase_driver.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <setjmp.h>
-#include <string.h>
-
-#ifdef __WIN32__
-#undef HAVE_VSNPRINTF
-#define HAVE_VSNPRINTF 1
-#define vsnprintf _vsnprintf
-#endif
-
-#ifndef HAVE_VSNPRINTF
-#define HAVE_VSNPRINTF 0
-#endif
-
-#define COMMENT_BUF_SZ 4096
-
-#define TESTCASE_FAILED		0
-#define TESTCASE_SKIPPED	1
-#define TESTCASE_SUCCEEDED	2
-
-typedef struct {
-    TestCaseState_t visible;
-    int port;
-    int result;
-    jmp_buf done_jmp_buf;
-    char *comment;
-    char comment_buf[COMMENT_BUF_SZ];
-} InternalTestCaseState_t;
-
-long testcase_drv_start(int port, char *command);
-int testcase_drv_stop(long drv_data);
-int testcase_drv_run(long drv_data, char *buf, int len);
-
-static DriverEntry testcase_drv_entry = { 
-    NULL,
-    testcase_drv_start,
-    testcase_drv_stop,
-    testcase_drv_run
-};
-
-
-int DRIVER_INIT(testcase_drv)(void *arg)
-{
-    testcase_drv_entry.driver_name = testcase_name();
-    return (int) &testcase_drv_entry;
-}
-
-long
-testcase_drv_start(int port, char *command)
-{
-    InternalTestCaseState_t *itcs = (InternalTestCaseState_t *)
-	driver_alloc(sizeof(InternalTestCaseState_t));
-    if (!itcs) {
-	return -1;
-    }
-
-    itcs->visible.testcase_name = testcase_name();
-    itcs->visible.extra = NULL;
-    itcs->port = port;
-    itcs->result = TESTCASE_FAILED;
-    itcs->comment = "";
-
-    return (long) itcs;
-}
-
-int
-testcase_drv_stop(long drv_data)
-{
-    testcase_cleanup((TestCaseState_t *) drv_data);
-    driver_free((void *) drv_data);
-    return 0;
-}
-
-int
-testcase_drv_run(long drv_data, char *buf, int len)
-{
-    InternalTestCaseState_t *itcs = (InternalTestCaseState_t *) drv_data;
-    DriverTermData result_atom;
-    DriverTermData msg[12];
-
-    itcs->visible.command = buf;
-    itcs->visible.command_len = len;
-
-    if (setjmp(itcs->done_jmp_buf) == 0) {
-	testcase_run((TestCaseState_t *) itcs);
-	itcs->result = TESTCASE_SUCCEEDED;
-    }
-
-    switch (itcs->result) {
-    case TESTCASE_SUCCEEDED:
-	result_atom = driver_mk_atom("succeeded");
-	break;
-    case TESTCASE_SKIPPED:
-	result_atom = driver_mk_atom("skipped");
-	break;
-    case TESTCASE_FAILED:
-    default:
-	result_atom = driver_mk_atom("failed");
-	break;
-    }
-
-    msg[0] = ERL_DRV_ATOM;
-    msg[1] = (DriverTermData) result_atom;
-
-    msg[2] = ERL_DRV_PORT;
-    msg[3] = driver_mk_port(itcs->port);
-
-    msg[4] = ERL_DRV_ATOM;
-    msg[5] = driver_mk_atom(itcs->visible.testcase_name);
- 
-    msg[6] = ERL_DRV_STRING;
-    msg[7] = (DriverTermData) itcs->comment;
-    msg[8] = (DriverTermData) strlen(itcs->comment);
-
-    msg[9] = ERL_DRV_TUPLE;
-    msg[10] = (DriverTermData) 4;
-
-    driver_output_term(itcs->port, msg, 11);
-    return 0;
-}
-
-int
-testcase_assertion_failed(TestCaseState_t *tcs,
-			  char *file, int line, char *assertion)
-{
-    testcase_failed(tcs, "%s:%d: Assertion failed: \"%s\"",
-		    file, line, assertion);
-    return 0;
-}
-
-void
-testcase_printf(TestCaseState_t *tcs, char *frmt, ...)
-{
-    InternalTestCaseState_t *itcs = (InternalTestCaseState_t *) tcs;
-    DriverTermData msg[12];
-    va_list va;
-    va_start(va, frmt);
-#if HAVE_VSNPRINTF
-    vsnprintf(itcs->comment_buf, COMMENT_BUF_SZ, frmt, va);
-#else
-    vsprintf(itcs->comment_buf, frmt, va);
-#endif
-    va_end(va);
-
-    msg[0] = ERL_DRV_ATOM;
-    msg[1] = (DriverTermData) driver_mk_atom("print");
-
-    msg[2] = ERL_DRV_PORT;
-    msg[3] = driver_mk_port(itcs->port);
-
-    msg[4] = ERL_DRV_ATOM;
-    msg[5] = driver_mk_atom(itcs->visible.testcase_name);
-
-    msg[6] = ERL_DRV_STRING;
-    msg[7] = (DriverTermData) itcs->comment_buf;
-    msg[8] = (DriverTermData) strlen(itcs->comment_buf);
-
-    msg[9] = ERL_DRV_TUPLE;
-    msg[10] = (DriverTermData) 4;
-
-    driver_output_term(itcs->port, msg, 11);
-}
-
-
-void testcase_succeeded(TestCaseState_t *tcs, char *frmt, ...)
-{
-    InternalTestCaseState_t *itcs = (InternalTestCaseState_t *) tcs;
-    va_list va;
-    va_start(va, frmt);
-#if HAVE_VSNPRINTF
-    vsnprintf(itcs->comment_buf, COMMENT_BUF_SZ, frmt, va);
-#else
-    vsprintf(itcs->comment_buf, frmt, va);
-#endif
-    va_end(va);
-
-    itcs->result = TESTCASE_SUCCEEDED;
-    itcs->comment = itcs->comment_buf;
-
-    longjmp(itcs->done_jmp_buf, 1);
-}
-
-void testcase_skipped(TestCaseState_t *tcs, char *frmt, ...)
-{
-    InternalTestCaseState_t *itcs = (InternalTestCaseState_t *) tcs;
-    va_list va;
-    va_start(va, frmt);
-#if HAVE_VSNPRINTF
-    vsnprintf(itcs->comment_buf, COMMENT_BUF_SZ, frmt, va);
-#else
-    vsprintf(itcs->comment_buf, frmt, va);
-#endif
-    va_end(va);
-
-    itcs->result = TESTCASE_SKIPPED;
-    itcs->comment = itcs->comment_buf;
-
-    longjmp(itcs->done_jmp_buf, 1);
-}
-
-void testcase_failed(TestCaseState_t *tcs, char *frmt, ...)
-{
-    InternalTestCaseState_t *itcs = (InternalTestCaseState_t *) tcs;
-    char buf[10];
-    size_t bufsz = sizeof(buf);
-    va_list va;
-    va_start(va, frmt);
-#if HAVE_VSNPRINTF
-    vsnprintf(itcs->comment_buf, COMMENT_BUF_SZ, frmt, va);
-#else
-    vsprintf(itcs->comment_buf, frmt, va);
-#endif
-    va_end(va);
-
-    itcs->result = TESTCASE_FAILED;
-    itcs->comment = itcs->comment_buf;
-
-    if (erl_drv_getenv("ERL_ABORT_ON_FAILURE", buf, &bufsz) == 0
-	&& strcmp("true", buf) == 0) {
-	fprintf(stderr, "Testcase \"%s\" failed: %s\n",
-		itcs->visible.testcase_name, itcs->comment);
-	abort();
-    }
-
-    longjmp(itcs->done_jmp_buf, 1);
-}
-
-void *testcase_alloc(size_t size)
-{
-    return driver_alloc(size);
-}
-
-void *testcase_realloc(void *ptr, size_t size)
-{
-    return driver_realloc(ptr, size);
-}
-
-void testcase_free(void *ptr)
-{
-    driver_free(ptr);
-}
diff --git a/erts/emulator/test/obsolete_SUITE_data/testcase_driver.h b/erts/emulator/test/obsolete_SUITE_data/testcase_driver.h
deleted file mode 100644
index 3d85ca6df0..0000000000
--- a/erts/emulator/test/obsolete_SUITE_data/testcase_driver.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ``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 via the world wide web 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.
- * 
- * 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 TESTCASE_DRIVER_H__
-#define TESTCASE_DRIVER_H__
-
-#include "obsolete/driver.h"
-#include <stdlib.h>
-
-typedef struct {
-    char *testcase_name;
-    char *command;
-    int command_len;
-    void *extra;
-} TestCaseState_t;
-
-#define ASSERT_CLNUP(TCS, B, CLN)					\
-do {									\
-    if (!(B)) {								\
-	CLN;								\
-	testcase_assertion_failed((TCS), __FILE__, __LINE__, #B);	\
-    }									\
-} while (0)
-
-#define ASSERT(TCS, B) ASSERT_CLNUP(TCS, B, (void) 0)
-
-void testcase_printf(TestCaseState_t *tcs, char *frmt, ...);
-void testcase_succeeded(TestCaseState_t *tcs, char *frmt, ...);
-void testcase_skipped(TestCaseState_t *tcs, char *frmt, ...);
-void testcase_failed(TestCaseState_t *tcs, char *frmt, ...);
-int testcase_assertion_failed(TestCaseState_t *tcs, char *file, int line,
-			      char *assertion);
-void *testcase_alloc(size_t size);
-void *testcase_realloc(void *ptr, size_t size);
-void testcase_free(void *ptr);
-
-
-char *testcase_name(void);
-void testcase_run(TestCaseState_t *tcs);
-void testcase_cleanup(TestCaseState_t *tcs);
-
-#endif
diff --git a/erts/emulator/test/old_mod.erl b/erts/emulator/test/old_mod.erl
index 6c47ba6f8f..124842390a 100644
--- a/erts/emulator/test/old_mod.erl
+++ b/erts/emulator/test/old_mod.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
diff --git a/erts/emulator/test/old_scheduler_SUITE.erl b/erts/emulator/test/old_scheduler_SUITE.erl
index 70348f64db..6f9c0a9dab 100644
--- a/erts/emulator/test/old_scheduler_SUITE.erl
+++ b/erts/emulator/test/old_scheduler_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -19,24 +19,44 @@
 
 -module(old_scheduler_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([equal/1, many_low/1, few_low/1, max/1, high/1]).
 
 -define(default_timeout, ?t:minutes(11)).
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     case catch erlang:system_info(modified_timing_level) of
 	Level when is_integer(Level) ->
 	    {skipped,
-	     "Modified timing (level " ++ integer_to_list(Level)
-	     ++ ") is enabled. Testcases gets messed up by modfied "
-	     "timing."};
-	_ ->
-	    [equal, many_low, few_low, max, high]
+	     "Modified timing (level " ++
+		 integer_to_list(Level) ++
+		 ") is enabled. Testcases gets messed "
+	     "up by modfied timing."};
+	_ -> [equal, many_low, few_low, max, high]
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------------------------
 %% TEST SUITE DESCRIPTION
 %%
@@ -63,7 +83,7 @@ init_per_testcase(_Case, Config) ->
     ?line MS = erlang:system_flag(multi_scheduling, block),
     [{prio,Prio},{watchdog,Dog},{multi_scheduling, MS}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     erlang:system_flag(multi_scheduling, unblock),
     Dog=?config(watchdog, Config),
     Prio=?config(prio, Config),
diff --git a/erts/emulator/test/op_SUITE.erl b/erts/emulator/test/op_SUITE.erl
index 55d8d9ab0f..7bea35e980 100644
--- a/erts/emulator/test/op_SUITE.erl
+++ b/erts/emulator/test/op_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -19,22 +19,43 @@
 
 -module(op_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 bsl_bsr/1,logical/1,t_not/1,relop_simple/1,relop/1,complex_relop/1]).
 
 -export([]).
 -import(lists, [foldl/3,flatmap/2]).
 
-all(suite) ->
-    [bsl_bsr,logical,t_not,relop_simple,relop,complex_relop].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [bsl_bsr, logical, t_not, relop_simple, relop,
+     complex_relop].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(3)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index 66aff307a3..6da9a7e0ad 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -73,18 +73,19 @@
 %%
 
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_testcase/2, end_per_testcase/2,
 	 init_per_suite/1, end_per_suite/1,
-	 stream/1, stream_small/1, stream_big/1,
+	 stream_small/1, stream_big/1,
 	 basic_ping/1, slow_writes/1, bad_packet/1, bad_port_messages/1,
-	 multiple_packets/1, mul_basic/1, mul_slow_writes/1,
+	 mul_basic/1, mul_slow_writes/1,
 	 dying_port/1, port_program_with_path/1,
 	 open_input_file_port/1, open_output_file_port/1,
 	 iter_max_ports/1, eof/1, input_only/1, output_only/1,
 	 name1/1,
-	 t_binary/1, options/1, parallell/1, t_exit/1,
+	 t_binary/1, parallell/1, t_exit/1,
 	 env/1, bad_env/1, cd/1, exit_status/1,
-	 tps/1, tps_16_bytes/1, tps_1K/1, line/1, stderr_to_stdout/1,
+	 tps_16_bytes/1, tps_1K/1, line/1, stderr_to_stdout/1,
 	 otp_3906/1, otp_4389/1, win_massive/1, win_massive_client/1,
 	 mix_up_ports/1, otp_5112/1, otp_5119/1, otp_6224/1,
 	 exit_status_multi_scheduling_block/1, ports/1,
@@ -98,31 +99,42 @@
 -export([otp_3906_forker/5, otp_3906_start_forker_starter/4]).
 -export([env_slave_main/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
-all(suite) ->
-    [
-     otp_6224, stream, basic_ping, slow_writes, bad_packet,
-     bad_port_messages, options, multiple_packets, parallell,
-     dying_port, port_program_with_path,
-     open_input_file_port, open_output_file_port,
-     name1,
-     env, bad_env, cd, exit_status,
-     iter_max_ports, t_exit, tps, line, stderr_to_stdout,
-     otp_3906, otp_4389, win_massive, mix_up_ports,
-     otp_5112, otp_5119,
-     exit_status_multi_scheduling_block,
-     ports, spawn_driver, spawn_executable, close_deaf_port,
-     unregister_name
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [otp_6224, {group, stream}, basic_ping, slow_writes,
+     bad_packet, bad_port_messages, {group, options},
+     {group, multiple_packets}, parallell, dying_port,
+     port_program_with_path, open_input_file_port,
+     open_output_file_port, name1, env, bad_env, cd,
+     exit_status, iter_max_ports, t_exit, {group, tps}, line,
+     stderr_to_stdout, otp_3906, otp_4389, win_massive,
+     mix_up_ports, otp_5112, otp_5119,
+     exit_status_multi_scheduling_block, ports, spawn_driver,
+     spawn_executable, close_deaf_port, unregister_name].
+
+groups() -> 
+    [{stream, [], [stream_small, stream_big]},
+     {options, [], [t_binary, eof, input_only, output_only]},
+     {multiple_packets, [], [mul_basic, mul_slow_writes]},
+     {tps, [], [tps_16_bytes, tps_1K]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(5)).
 
 init_per_testcase(Case, Config) ->
     [{testcase, Case} |Config].
 
-fin_per_testcase(_Case, _Config) ->
+end_per_testcase(_Case, _Config) ->
     ok.
 
 init_per_suite(Config) when is_list(Config) ->
@@ -191,7 +203,6 @@ win_massive_loop(P,N) ->
     
 
 
-stream(suite) -> [stream_small, stream_big].
 
 %% Test that we can send a stream of bytes and get it back.
 %% We will send only a small amount of data, to avoid deadlock.
@@ -304,7 +315,6 @@ bad_message(PortTest, Message) ->
 %% Tests various options (stream and {packet, Number} are implicitly
 %% tested in other test cases).
 
-options(suite) -> [t_binary, eof, input_only, output_only].
 
 %% Tests the 'binary' option for a port.
 
@@ -416,7 +426,6 @@ output_and_verify(Config, Filename, Options, Data) ->
 %% Test that receiving several packages written in the same
 %% write operation works.
 
-multiple_packets(suite) -> [mul_basic, mul_slow_writes].
 
 %% Basic test of receiving multiple packages, written in
 %% one operation by the other end.
@@ -740,7 +749,6 @@ suicide_port(Config) when is_list(Config) ->
     ?line exit(Port, die),
     ?line receive after infinity -> ok end.
 
-tps(suite) -> [tps_16_bytes, tps_1K].
 
 tps_16_bytes(doc) -> "";
 tps_16_bytes(suite) -> [];
@@ -878,13 +886,20 @@ env2(Config) ->
 			    "nisse" = os:getenv(Long)
 		    end),
 
-
+    
     ?line env_slave(Temp, [{"must_define_something","some_value"},
-			   {"certainly_not_existing",false},
+			    {"certainly_not_existing",false},
                            {"ends_with_equal", "value="},
 			   {Long,false},
 			   {"glurf","a glorfy string"}]),
 
+    %% A lot of non existing variables (mingled with existing)
+    NotExistingList = [{lists:flatten(io_lib:format("V~p_not_existing",[X])),false} 
+                        ||  X <- lists:seq(1,150)],
+    ExistingList = [{lists:flatten(io_lib:format("V~p_existing",[X])),"a_value"} 
+                        ||  X <- lists:seq(1,150)],
+    ?line env_slave(Temp, lists:sort(ExistingList ++ NotExistingList)),
+
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
@@ -1042,8 +1057,10 @@ otp_3906(Config)  when is_list(Config) ->
 -define(OTP_3906_MAX_CONC_OSP, 50).
 
 otp_3906(Config, OSName) ->
-    ?line TSDir = filename:dirname(code:which(test_server)),
-    ?line {ok, Variables} = file:consult(filename:join(TSDir, "variables")),
+    ?line DataDir = filename:dirname(proplists:get_value(data_dir,Config)),
+    ?line {ok, Variables} = file:consult(
+			      filename:join([DataDir,"..","..",
+					     "test_server","variables"])),
     case lists:keysearch('CC', 1, Variables) of
 	{value,{'CC', CC}} ->
 	    SuiteDir = filename:dirname(code:which(?MODULE)),
@@ -2295,10 +2312,35 @@ load_driver(Dir, Driver) ->
     end.
 
 
-close_deaf_port(doc) -> ["Send data to port program that does not read it, then close port."];
+close_deaf_port(doc) -> ["Send data to port program that does not read it, then close port."
+			 "Primary targeting Windows to test threaded_handle_closer in sys.c"];
 close_deaf_port(suite) -> [];
 close_deaf_port(Config) when is_list(Config) ->
-    Port = open_port({spawn,"sleep 999999"},[]),
-    erlang:port_command(Port,"Hello, can you hear me!?!?"),
-    port_close(Port),
-    ok.
+    ?line Dog = test_server:timetrap(test_server:seconds(100)),
+    ?line DataDir = ?config(data_dir, Config),
+    ?line DeadPort = os:find_executable("dead_port", DataDir),
+    ?line Port = open_port({spawn,DeadPort++" 60"},[]),
+    ?line erlang:port_command(Port,"Hello, can you hear me!?!?"),
+    ?line port_close(Port),
+
+    Res = close_deaf_port_1(0, DeadPort),
+    io:format("Waiting for OS procs to terminate...\n"),
+    receive after 5*1000 -> ok end,
+    ?line test_server:timetrap_cancel(Dog),
+    Res.
+
+close_deaf_port_1(1000, _) ->
+    ok;
+close_deaf_port_1(N, Cmd) ->
+    Timeout = integer_to_list(random:uniform(5*1000)),
+    ?line try open_port({spawn_executable,Cmd},[{args,[Timeout]}]) of
+    	Port ->
+	    ?line erlang:port_command(Port,"Hello, can you hear me!?!?"),
+	    ?line port_close(Port),
+	    close_deaf_port_1(N+1, Cmd)
+    catch
+    	_:eagain ->
+	    {comment, "Could not spawn more than " ++ integer_to_list(N) ++ " OS processes."}
+    end.
+    
+
diff --git a/erts/emulator/test/port_SUITE_data/Makefile.src b/erts/emulator/test/port_SUITE_data/Makefile.src
index d97b37c9ae..ff822ae720 100644
--- a/erts/emulator/test/port_SUITE_data/Makefile.src
+++ b/erts/emulator/test/port_SUITE_data/Makefile.src
@@ -3,7 +3,7 @@ LD = @LD@
 CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@
 CROSSLDFLAGS = @CROSSLDFLAGS@
 
-PROGS = port_test@exe@ echo_args@exe@
+PROGS = port_test@exe@ echo_args@exe@ dead_port@exe@
 DRIVERS = echo_drv@dll@ exit_drv@dll@ failure_drv@dll@
 
 all: $(PROGS) $(DRIVERS) port_test.@EMULATOR@
diff --git a/erts/emulator/test/port_SUITE_data/dead_port.c b/erts/emulator/test/port_SUITE_data/dead_port.c
new file mode 100644
index 0000000000..68e96fbf14
--- /dev/null
+++ b/erts/emulator/test/port_SUITE_data/dead_port.c
@@ -0,0 +1,102 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2001-2010. 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%
+ */
+
+#ifdef VXWORKS
+#include <vxWorks.h>
+#include <taskVarLib.h>
+#include <taskLib.h>
+#include <sysLib.h>
+#include <string.h>
+#include <ioLib.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#ifndef __WIN32__
+#include <unistd.h>
+
+#ifdef VXWORKS
+#include "reclaim.h"
+#include <sys/times.h>
+#else
+#include <sys/time.h>
+#endif
+
+#define O_BINARY 0
+#define _setmode(fd, mode)
+#endif
+
+#ifdef __WIN32__
+#include "windows.h"
+#include "winbase.h"
+#endif
+
+
+#ifdef VXWORKS
+#define MAIN(argc, argv) port_test(argc, argv)
+#else
+#define MAIN(argc, argv) main(argc, argv)
+#endif
+
+
+extern int errno;
+
+static void delay(unsigned ms);
+
+
+MAIN(argc, argv)
+int argc;
+char *argv[];
+{
+    int x;
+    if (argc < 2) {
+	fprintf(stderr,"Usage %s <milliseconds>\n",argv[0]);
+	return 1;
+    }
+    if ((x = atoi(argv[1])) <= 0) {
+	fprintf(stderr,"Usage %s <milliseconds>\n",argv[0]);
+	return 1;
+    }
+    delay(x);
+    return 0;
+}
+
+static void
+delay(unsigned ms)
+{
+#ifdef VXWORKS
+  taskDelay((sysClkRateGet() * ms) / 1000);
+#else
+#ifdef __WIN32__
+  Sleep(ms);
+#else
+  struct timeval t;
+  t.tv_sec = ms/1000;
+  t.tv_usec = (ms % 1000) * 1000;
+
+  select(0, NULL, NULL, NULL, &t);
+#endif
+#endif
+}
diff --git a/erts/emulator/test/port_bif_SUITE.erl b/erts/emulator/test/port_bif_SUITE.erl
index f4e0bb9fa8..946978c580 100644
--- a/erts/emulator/test/port_bif_SUITE.erl
+++ b/erts/emulator/test/port_bif_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -20,25 +20,47 @@
 -module(port_bif_SUITE).
 
 
--export([all/1, command/1, command_e/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, command/1,
 	 command_e_1/1, command_e_2/1, command_e_3/1, command_e_4/1,
-	 port_info/1, port_info1/1, port_info2/1,
+	 port_info1/1, port_info2/1,
 	 connect/1, control/1, echo_to_busy/1]).
 
 -export([do_command_e_1/1, do_command_e_2/1, do_command_e_4/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [command, {group, port_info}, connect, control,
+     echo_to_busy].
+
+groups() -> 
+    [{command_e, [],
+      [command_e_1, command_e_2, command_e_3, command_e_4]},
+     {port_info, [], [port_info1, port_info2]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [command, port_info, connect, control, echo_to_busy].
 
 
 init_per_testcase(_Func, Config) when is_list(Config) ->
     Dog=test_server:timetrap(test_server:minutes(10)),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Func, Config) when is_list(Config) ->
+end_per_testcase(_Func, Config) when is_list(Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
@@ -69,11 +91,6 @@ do_command(P, Data) ->
     end.
 
 
-command_e(suite) -> [command_e_1,
-		     command_e_2,
-		     command_e_3,
-		     command_e_4];
-command_e(doc) -> "Tests port_command/2 with errors".
 
 %% port_command/2: badarg 1st arg
 command_e_1(Config) when is_list(Config) ->
@@ -161,7 +178,6 @@ do_command_e_4(Program) ->
     ?line erlang:port_command(P, Data),
     exit(survived).
 
-port_info(suite) -> [port_info1, port_info2].
 
 %% Tests the port_info/1 BIF
 port_info1(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index 77f850d0fb..f7553e5815 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -25,12 +25,13 @@
 %%	process_info/1,2
 %%	register/2 (partially)
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(heap_binary_size, 64).
 
--export([all/1, spawn_with_binaries/1,
-	 t_exit_1/1, t_exit_2/1, t_exit_2_other/1, t_exit_2_other_normal/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, spawn_with_binaries/1,
+	 t_exit_1/1, t_exit_2_other/1, t_exit_2_other_normal/1,
 	 self_exit/1, normal_suicide_exit/1, abnormal_suicide_exit/1,
 	 t_exit_2_catch/1, trap_exit_badarg/1, trap_exit_badarg_in_bif/1,
 	 exit_and_timeout/1, exit_twice/1,
@@ -46,39 +47,67 @@
 	 processes_large_tab/1, processes_default_tab/1, processes_small_tab/1,
 	 processes_this_tab/1, processes_apply_trap/1,
 	 processes_last_call_trap/1, processes_gc_trap/1,
-	 processes_term_proc_list/1, processes_bif/1,
-	 otp_7738/1, otp_7738_waiting/1, otp_7738_suspended/1,
+	 processes_term_proc_list/1,
+	 otp_7738_waiting/1, otp_7738_suspended/1,
 	 otp_7738_resume/1]).
 -export([prio_server/2, prio_client/2]).
 
--export([init_per_testcase/2, fin_per_testcase/2, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([hangaround/2, processes_bif_test/0, do_processes/1,
 	 processes_term_proc_list_test/1]).
 
-all(suite) ->
-    [spawn_with_binaries, t_exit_1, t_exit_2,
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [spawn_with_binaries, t_exit_1, {group, t_exit_2},
      trap_exit_badarg, trap_exit_badarg_in_bif,
-     t_process_info, process_info_other_msg, process_info_other_dist_msg,
-     process_info_2_list,
-     process_info_lock_reschedule, process_info_lock_reschedule2,
-     process_status_exiting,
-     bump_reductions, low_prio, yield, yield2, otp_4725, bad_register,
-     garbage_collect, process_info_messages, process_flag_badarg, process_flag_heap_size,
-     spawn_opt_heap_size, otp_6237, processes_bif, otp_7738].
+     t_process_info, process_info_other_msg,
+     process_info_other_dist_msg, process_info_2_list,
+     process_info_lock_reschedule,
+     process_info_lock_reschedule2, process_status_exiting,
+     bump_reductions, low_prio, yield, yield2, otp_4725,
+     bad_register, garbage_collect, process_info_messages,
+     process_flag_badarg, process_flag_heap_size,
+     spawn_opt_heap_size, otp_6237, {group, processes_bif},
+     {group, otp_7738}].
+
+groups() -> 
+    [{t_exit_2, [],
+      [t_exit_2_other, t_exit_2_other_normal, self_exit,
+       normal_suicide_exit, abnormal_suicide_exit,
+       t_exit_2_catch, exit_and_timeout, exit_twice]},
+     {processes_bif, [],
+      [processes_large_tab, processes_default_tab,
+       processes_small_tab, processes_this_tab,
+       processes_last_call_trap, processes_apply_trap,
+       processes_gc_trap, processes_term_proc_list]},
+     {otp_7738, [],
+      [otp_7738_waiting, otp_7738_suspended,
+       otp_7738_resume]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    catch erts_debug:set_internal_state(available_internal_state, false),
+    Config.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(10)),
     [{watchdog, Dog},{testcase, Func}|Config].
 
-fin_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
+end_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
-end_per_suite(Config) ->
-    catch erts_debug:set_internal_state(available_internal_state, false),
-    Config.
-
 fun_spawn(Fun) ->
     spawn_link(erlang, apply, [Fun, []]).
 
@@ -117,10 +146,6 @@ t_exit_1() ->
 	      {'EXIT', Pid, Garbage} -> ok
 	  end.
 
-t_exit_2(suite) -> [t_exit_2_other, t_exit_2_other_normal, 
-		    self_exit, normal_suicide_exit,
-		    abnormal_suicide_exit, t_exit_2_catch,
-		    exit_and_timeout, exit_twice].
 
 %% Tests exit/2 with a lot of data in the exit message.
 t_exit_2_other(Config) when is_list(Config) ->
@@ -1227,17 +1252,6 @@ otp_6237_select_loop() ->
     otp_6237_select_loop().
 
 
-processes_bif(doc) ->
-    [];
-processes_bif(suite) ->
-    [processes_large_tab,
-     processes_default_tab,
-     processes_small_tab,
-     processes_this_tab,
-     processes_last_call_trap,
-     processes_apply_trap,
-     processes_gc_trap,
-     processes_term_proc_list].
 
 -define(NoTestProcs, 10000).
 -record(processes_bif_info, {min_start_reds,
@@ -1965,10 +1979,6 @@ processes_term_proc_list_test(MustChk) ->
     ?line erlang:system_flag(multi_scheduling, unblock),
     ?line as_expected.
 
-otp_7738(doc) ->
-    [];
-otp_7738(suite) ->
-    [otp_7738_waiting, otp_7738_suspended, otp_7738_resume].
 
 otp_7738_waiting(doc) ->
     [];
diff --git a/erts/emulator/test/pseudoknot_SUITE.erl b/erts/emulator/test/pseudoknot_SUITE.erl
index 907204cf93..5a7cdcecd5 100644
--- a/erts/emulator/test/pseudoknot_SUITE.erl
+++ b/erts/emulator/test/pseudoknot_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -19,9 +19,29 @@
 
 -module(pseudoknot_SUITE).
 
--export([all/1,test/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,test/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [test].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> [test].
     
 test(Config) when is_list(Config) ->
     statistics(runtime),
@@ -3274,13 +3294,13 @@ most_distant_atom(Sols) ->
     maximum(map(sol_most_distant_atom, Sols)).
 
 maximum([H|T]) ->
-    max(T,H).
+    max1(T,H).
 
-max([H|T],M) when is_float(H), is_float(M), H > M ->
-    max(T,H);
-max([_|T],M) ->
-    max(T,M);
-max([],M) -> M.
+max1([H|T],M) when is_float(H), is_float(M), H > M ->
+    max1(T,H);
+max1([_|T],M) ->
+    max1(T,M);
+max1([],M) -> M.
 
 map(_Func,[]) -> [];
 map(Func,[H|T]) -> 
diff --git a/erts/emulator/test/random_iolist.erl b/erts/emulator/test/random_iolist.erl
index 4bce347d9a..8f21b5a3b3 100644
--- a/erts/emulator/test/random_iolist.erl
+++ b/erts/emulator/test/random_iolist.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
diff --git a/erts/emulator/test/receive_SUITE.erl b/erts/emulator/test/receive_SUITE.erl
index 40ebf2bd21..2ac696b4c7 100644
--- a/erts/emulator/test/receive_SUITE.erl
+++ b/erts/emulator/test/receive_SUITE.erl
@@ -21,21 +21,40 @@
 
 %% Tests receive after.
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 call_with_huge_message_queue/1,receive_in_between/1]).
 
--export([init_per_testcase/2,fin_per_testcase/2]).
+-export([init_per_testcase/2,end_per_testcase/2]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [call_with_huge_message_queue, receive_in_between].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [call_with_huge_message_queue,receive_in_between].
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(3)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
diff --git a/erts/emulator/test/ref_SUITE.erl b/erts/emulator/test/ref_SUITE.erl
index fa77095efd..327d55fead 100644
--- a/erts/emulator/test/ref_SUITE.erl
+++ b/erts/emulator/test/ref_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -19,23 +19,44 @@
 
 -module(ref_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2]).
+-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([wrap_1/1]).
 
 -export([loop_ref/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 init_per_testcase(_, Config) ->
     ?line Dog=test_server:timetrap(test_server:minutes(2)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_, Config) ->
+end_per_testcase(_, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> [wrap_1].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [wrap_1].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 wrap_1(doc) -> "Check that refs don't wrap around easily.";
 wrap_1(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/register_SUITE.erl b/erts/emulator/test/register_SUITE.erl
index c03ee23b2e..d88df8d59d 100644
--- a/erts/emulator/test/register_SUITE.erl
+++ b/erts/emulator/test/register_SUITE.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2010. 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
@@ -22,24 +22,43 @@
 
 %-define(line_trace, 1).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %-compile(export_all).
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([otp_8099/1]).
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(2)).
 
-all(doc) -> [];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [otp_8099].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 init_per_testcase(Case, Config) when is_list(Config) ->
     Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
     [{watchdog, Dog}, {testcase, Case} | Config].
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
diff --git a/erts/emulator/test/save_calls_SUITE.erl b/erts/emulator/test/save_calls_SUITE.erl
index b56c4ad0b0..4929031794 100644
--- a/erts/emulator/test/save_calls_SUITE.erl
+++ b/erts/emulator/test/save_calls_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -19,17 +19,36 @@
 
 -module(save_calls_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([save_calls_1/1,dont_break_reductions/1]).
 
 -export([do_bopp/1, do_bipp/0, do_bepp/0]).
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [save_calls_1, dont_break_reductions].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 dont_break_reductions(suite) ->
     [];
 dont_break_reductions(doc) ->
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index ab727b7cb1..f16d0ea429 100644
--- a/erts/emulator/test/scheduler_SUITE.erl
+++ b/erts/emulator/test/scheduler_SUITE.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -30,10 +30,12 @@
 
 %-define(line_trace, 1).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %-compile(export_all).
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 init_per_testcase/2, end_per_testcase/2, end_per_suite/1]).
 
 -export([equal/1,
 	 few_low/1,
@@ -44,30 +46,47 @@
 	 equal_with_high/1,
 	 equal_with_high_max/1,
 	 bound_process/1,
-	 scheduler_bind/1,
+	
 	 scheduler_bind_types/1,
 	 cpu_topology/1,
+	 update_cpu_info/1,
 	 sct_cmd/1,
 	 sbt_cmd/1,
-	 scheduler_suspend/1]).
+	 scheduler_suspend/1,
+	 reader_groups/1]).
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(10)).
 
 -define(MIN_SCHEDULER_TEST_TIMEOUT, ?t:minutes(1)).
 
-all(doc) -> [];
-all(suite) ->
-    [equal,
-     few_low,
-     many_low,
-     equal_with_part_time_high,
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [equal, few_low, many_low, equal_with_part_time_high,
      equal_with_part_time_max,
-     equal_and_high_with_part_time_max,
-     equal_with_high,
-     equal_with_high_max,
-     bound_process,
-     scheduler_bind,
-     scheduler_suspend].
+     equal_and_high_with_part_time_max, equal_with_high,
+     equal_with_high_max, bound_process,
+     {group, scheduler_bind}, scheduler_suspend,
+     reader_groups].
+
+groups() -> 
+    [{scheduler_bind, [],
+      [scheduler_bind_types, cpu_topology, update_cpu_info,
+       sct_cmd, sbt_cmd]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    catch erts_debug:set_internal_state(available_internal_state, false),
+    Config.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Case, Config) when is_list(Config) ->
     Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
@@ -76,7 +95,7 @@ init_per_testcase(Case, Config) when is_list(Config) ->
     OkRes = ok,
     [{watchdog, Dog}, {testcase, Case}, {ok_res, OkRes} |Config].
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
@@ -240,11 +259,6 @@ bound_loop(NS, N, M, Sched) ->
     Sched = erlang:system_info(scheduler_id),
     bound_loop(NS, N-1, M, Sched).
 
-scheduler_bind(suite) ->
-    [scheduler_bind_types,
-     cpu_topology,
-     sct_cmd,
-     sbt_cmd].
 
 -define(TOPOLOGY_A_CMD,
 	"+sct"
@@ -766,6 +780,137 @@ cpu_topology_cmdline_test(Config, Topology, Cmd) ->
     ?line stop_node(Node),
     ?line ok.
 
+update_cpu_info(Config) when is_list(Config) ->
+    ?line OldOnline = erlang:system_info(schedulers_online),
+    ?line OldAff = get_affinity_mask(),
+    ?line ?t:format("START - Affinity mask: ~p - Schedulers online: ~p - Scheduler bindings: ~p~n",
+		    [OldAff, OldOnline, erlang:system_info(scheduler_bindings)]),
+    ?line case {erlang:system_info(logical_processors_available), OldAff} of
+	      {Avail, _} when Avail == unknown; OldAff == unknown ->
+		  %% Nothing much to test; just a smoke test
+		  case erlang:system_info(update_cpu_info) of
+		      unchanged -> ?line ok;
+		      changed -> ?line ok
+		  end;
+	      _ ->
+		  try
+		      ?line adjust_schedulers_online(),
+		      case erlang:system_info(schedulers_online) of
+			  1 ->
+			      %% Nothing much to test; just a smoke test
+			      ?line ok;
+			  Onln0 ->
+			      %% unset least significant bit
+			      ?line Aff = (OldAff band (OldAff - 1)),
+			      ?line set_affinity_mask(Aff),
+			      ?line Onln1 = Onln0 - 1,
+			      ?line case adjust_schedulers_online() of
+					{Onln0, Onln1} ->
+					    ?line Onln1 = erlang:system_info(schedulers_online),
+					    ?line receive after 500 -> ok end,
+					    ?line ?t:format("TEST - Affinity mask: ~p - Schedulers online: ~p - Scheduler bindings: ~p~n",
+							    [Aff, Onln1, erlang:system_info(scheduler_bindings)]),
+					    ?line unchanged = adjust_schedulers_online(),
+					    ?line ok;
+					Fail ->
+					    ?line ?t:fail(Fail)
+				    end
+		      end
+		  after
+		      set_affinity_mask(OldAff),
+		      adjust_schedulers_online(),
+		      erlang:system_flag(schedulers_online, OldOnline),
+		      receive after 500 -> ok end,
+		      ?t:format("END - Affinity mask: ~p - Schedulers online: ~p - Scheduler bindings: ~p~n",
+				[get_affinity_mask(),
+				 erlang:system_info(schedulers_online),
+				 erlang:system_info(scheduler_bindings)])
+		  end
+	  end.
+
+adjust_schedulers_online() ->
+    case erlang:system_info(update_cpu_info) of
+	unchanged ->
+	    unchanged;
+	changed ->
+	    Avail = erlang:system_info(logical_processors_available),
+	    {erlang:system_flag(schedulers_online, Avail), Avail}
+    end.
+
+read_affinity(Data) ->
+    Exp = "pid " ++ os:getpid() ++ "'s current affinity mask",
+    case string:tokens(Data, ":") of
+	[Exp, DirtyAffinityStr] ->
+	    AffinityStr = string:strip(string:strip(DirtyAffinityStr,
+						    both, $ ),
+				       both, $\n),
+	    case catch erlang:list_to_integer(AffinityStr, 16) of
+		Affinity when is_integer(Affinity) ->
+		    Affinity;
+		_ ->
+		    bad
+	    end;
+	_ ->
+	    bad
+    end.
+
+get_affinity_mask(Port, Status, Affinity) when Status == unknown;
+					       Affinity == unknown ->
+    receive
+	{Port,{data, Data}} ->
+	    get_affinity_mask(Port, Status, read_affinity(Data));
+	{Port,{exit_status,S}} ->
+	    get_affinity_mask(Port, S, Affinity)
+    end;
+get_affinity_mask(_Port, _Status, bad) ->
+    unknown;
+get_affinity_mask(_Port, _Status, Affinity) ->
+    Affinity.
+
+get_affinity_mask() ->
+    case ?t:os_type() of
+	{unix, linux} ->
+	    case catch open_port({spawn, "taskset -p " ++ os:getpid()},
+				 [exit_status]) of
+		Port when is_port(Port) ->
+		    get_affinity_mask(Port, unknown, unknown);
+		_ ->
+		    unknown
+	    end;
+	_ ->
+	    unknown
+    end.
+
+set_affinity_mask(Port, unknown) ->
+    receive
+	{Port,{data, _}} ->
+	    set_affinity_mask(Port, unknown);
+	{Port,{exit_status,Status}} ->
+	    set_affinity_mask(Port, Status)
+    end;
+set_affinity_mask(Port, Status) ->
+    receive
+	{Port,{data, _}} ->
+	    set_affinity_mask(Port, unknown)
+    after 0 ->
+	    Status
+    end.
+
+set_affinity_mask(Mask) ->
+    Cmd = lists:flatten(["taskset -p ",
+			 io_lib:format("~.16b", [Mask]),
+			 " ",
+			 os:getpid()]),
+    case catch open_port({spawn, Cmd}, [exit_status]) of
+	Port when is_port(Port) ->
+	    case set_affinity_mask(Port, unknown) of
+		0 -> ok;
+		_ -> exit(failed_to_set_affinity)
+	    end;
+	_ ->
+	    exit(failed_to_set_affinity)
+    end.
+
 sct_cmd(Config) when is_list(Config) ->
     ?line Topology = ?TOPOLOGY_A_TERM,
     ?line OldRelFlags = clear_erl_rel_flags(),
@@ -965,12 +1110,300 @@ sst3_loop(S, N) ->
     erlang:system_flag(schedulers_online, 1),
     erlang:system_flag(schedulers_online, S),
     sst3_loop(S, N-1).
+
+reader_groups(Config) when is_list(Config) ->
+    %% White box testing. These results are correct, but other results
+    %% could be too...
+
+    %% The actual tilepro64 topology
+    CPUT0 = [{processor,[{node,[{core,{logical,0}},
+				{core,{logical,1}},
+				{core,{logical,2}},
+				{core,{logical,8}},
+				{core,{logical,9}},
+				{core,{logical,10}},
+				{core,{logical,11}},
+				{core,{logical,16}},
+				{core,{logical,17}},
+				{core,{logical,18}},
+				{core,{logical,19}},
+				{core,{logical,24}},
+				{core,{logical,25}},
+				{core,{logical,27}},
+				{core,{logical,29}}]},
+			 {node,[{core,{logical,3}},
+				{core,{logical,4}},
+				{core,{logical,5}},
+				{core,{logical,6}},
+				{core,{logical,7}},
+				{core,{logical,12}},
+				{core,{logical,13}},
+				{core,{logical,14}},
+				{core,{logical,15}},
+				{core,{logical,20}},
+				{core,{logical,21}},
+				{core,{logical,22}},
+				{core,{logical,23}},
+				{core,{logical,28}},
+				{core,{logical,30}}]},
+			 {node,[{core,{logical,31}},
+				{core,{logical,36}},
+				{core,{logical,37}},
+				{core,{logical,38}},
+				{core,{logical,44}},
+				{core,{logical,45}},
+				{core,{logical,46}},
+				{core,{logical,47}},
+				{core,{logical,51}},
+				{core,{logical,52}},
+				{core,{logical,53}},
+				{core,{logical,54}},
+				{core,{logical,55}},
+				{core,{logical,60}},
+				{core,{logical,61}}]},
+			 {node,[{core,{logical,26}},
+				{core,{logical,32}},
+				{core,{logical,33}},
+				{core,{logical,34}},
+				{core,{logical,35}},
+				{core,{logical,39}},
+				{core,{logical,40}},
+				{core,{logical,41}},
+				{core,{logical,42}},
+				{core,{logical,43}},
+				{core,{logical,48}},
+				{core,{logical,49}},
+				{core,{logical,50}},
+				{core,{logical,58}}]}]}],
+
+    ?line [{0,1},{1,1},{2,1},{3,3},{4,3},{5,3},{6,3},{7,3},{8,1},{9,1},{10,1},
+	   {11,1},{12,3},{13,3},{14,4},{15,4},{16,2},{17,2},{18,2},{19,2},
+	   {20,4},{21,4},{22,4},{23,4},{24,2},{25,2},{26,7},{27,2},{28,4},
+	   {29,2},{30,4},{31,5},{32,7},{33,7},{34,7},{35,7},{36,5},{37,5},
+	   {38,5},{39,7},{40,7},{41,8},{42,8},{43,8},{44,5},{45,5},{46,5},
+	   {47,6},{48,8},{49,8},{50,8},{51,6},{52,6},{53,6},{54,6},{55,6},
+	   {58,8},{60,6},{61,6}]
+	= reader_groups_map(CPUT0, 8),
+
+    CPUT1 = [n([p([c([t(l(0)),t(l(1)),t(l(2)),t(l(3))]),
+		   c([t(l(4)),t(l(5)),t(l(6)),t(l(7))]),
+		   c([t(l(8)),t(l(9)),t(l(10)),t(l(11))]),
+		   c([t(l(12)),t(l(13)),t(l(14)),t(l(15))])]),
+		p([c([t(l(16)),t(l(17)),t(l(18)),t(l(19))]),
+		   c([t(l(20)),t(l(21)),t(l(22)),t(l(23))]),
+		   c([t(l(24)),t(l(25)),t(l(26)),t(l(27))]),
+		   c([t(l(28)),t(l(29)),t(l(30)),t(l(31))])])]),
+	     n([p([c([t(l(32)),t(l(33)),t(l(34)),t(l(35))]),
+		   c([t(l(36)),t(l(37)),t(l(38)),t(l(39))]),
+		   c([t(l(40)),t(l(41)),t(l(42)),t(l(43))]),
+		   c([t(l(44)),t(l(45)),t(l(46)),t(l(47))])]),
+		p([c([t(l(48)),t(l(49)),t(l(50)),t(l(51))]),
+		   c([t(l(52)),t(l(53)),t(l(54)),t(l(55))]),
+		   c([t(l(56)),t(l(57)),t(l(58)),t(l(59))]),
+		   c([t(l(60)),t(l(61)),t(l(62)),t(l(63))])])]),
+	     n([p([c([t(l(64)),t(l(65)),t(l(66)),t(l(67))]),
+		   c([t(l(68)),t(l(69)),t(l(70)),t(l(71))]),
+		   c([t(l(72)),t(l(73)),t(l(74)),t(l(75))]),
+		   c([t(l(76)),t(l(77)),t(l(78)),t(l(79))])]),
+		p([c([t(l(80)),t(l(81)),t(l(82)),t(l(83))]),
+		   c([t(l(84)),t(l(85)),t(l(86)),t(l(87))]),
+		   c([t(l(88)),t(l(89)),t(l(90)),t(l(91))]),
+		   c([t(l(92)),t(l(93)),t(l(94)),t(l(95))])])]),
+	     n([p([c([t(l(96)),t(l(97)),t(l(98)),t(l(99))]),
+		   c([t(l(100)),t(l(101)),t(l(102)),t(l(103))]),
+		   c([t(l(104)),t(l(105)),t(l(106)),t(l(107))]),
+		   c([t(l(108)),t(l(109)),t(l(110)),t(l(111))])]),
+		p([c([t(l(112)),t(l(113)),t(l(114)),t(l(115))]),
+		   c([t(l(116)),t(l(117)),t(l(118)),t(l(119))]),
+		   c([t(l(120)),t(l(121)),t(l(122)),t(l(123))]),
+		   c([t(l(124)),t(l(125)),t(l(126)),t(l(127))])])])],
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,2},{5,2},{6,2},{7,2},{8,3},{9,3},
+	   {10,3},{11,3},{12,4},{13,4},{14,4},{15,4},{16,5},{17,5},{18,5},
+	   {19,5},{20,6},{21,6},{22,6},{23,6},{24,7},{25,7},{26,7},{27,7},
+	   {28,8},{29,8},{30,8},{31,8},{32,9},{33,9},{34,9},{35,9},{36,10},
+	   {37,10},{38,10},{39,10},{40,11},{41,11},{42,11},{43,11},{44,12},
+	   {45,12},{46,12},{47,12},{48,13},{49,13},{50,13},{51,13},{52,14},
+	   {53,14},{54,14},{55,14},{56,15},{57,15},{58,15},{59,15},{60,16},
+	   {61,16},{62,16},{63,16},{64,17},{65,17},{66,17},{67,17},{68,18},
+	   {69,18},{70,18},{71,18},{72,19},{73,19},{74,19},{75,19},{76,20},
+	   {77,20},{78,20},{79,20},{80,21},{81,21},{82,21},{83,21},{84,22},
+	   {85,22},{86,22},{87,22},{88,23},{89,23},{90,23},{91,23},{92,24},
+	   {93,24},{94,24},{95,24},{96,25},{97,25},{98,25},{99,25},{100,26},
+	   {101,26},{102,26},{103,26},{104,27},{105,27},{106,27},{107,27},
+	   {108,28},{109,28},{110,28},{111,28},{112,29},{113,29},{114,29},
+	   {115,29},{116,30},{117,30},{118,30},{119,30},{120,31},{121,31},
+	   {122,31},{123,31},{124,32},{125,32},{126,32},{127,32}]
+	= reader_groups_map(CPUT1, 128),
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{9,1},{10,1},
+	   {11,1},{12,1},{13,1},{14,1},{15,1},{16,1},{17,1},{18,1},{19,1},
+	   {20,1},{21,1},{22,1},{23,1},{24,1},{25,1},{26,1},{27,1},{28,1},
+	   {29,1},{30,1},{31,1},{32,1},{33,1},{34,1},{35,1},{36,1},{37,1},
+	   {38,1},{39,1},{40,1},{41,1},{42,1},{43,1},{44,1},{45,1},{46,1},
+	   {47,1},{48,1},{49,1},{50,1},{51,1},{52,1},{53,1},{54,1},{55,1},
+	   {56,1},{57,1},{58,1},{59,1},{60,1},{61,1},{62,1},{63,1},{64,2},
+	   {65,2},{66,2},{67,2},{68,2},{69,2},{70,2},{71,2},{72,2},{73,2},
+	   {74,2},{75,2},{76,2},{77,2},{78,2},{79,2},{80,2},{81,2},{82,2},
+	   {83,2},{84,2},{85,2},{86,2},{87,2},{88,2},{89,2},{90,2},{91,2},
+	   {92,2},{93,2},{94,2},{95,2},{96,2},{97,2},{98,2},{99,2},{100,2},
+	   {101,2},{102,2},{103,2},{104,2},{105,2},{106,2},{107,2},{108,2},
+	   {109,2},{110,2},{111,2},{112,2},{113,2},{114,2},{115,2},{116,2},
+	   {117,2},{118,2},{119,2},{120,2},{121,2},{122,2},{123,2},{124,2},
+	   {125,2},{126,2},{127,2}]
+	= reader_groups_map(CPUT1, 2),
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,2},{5,2},{6,2},{7,2},{8,3},{9,3},{10,3},
+	   {11,3},{12,3},{13,3},{14,3},{15,3},{16,4},{17,4},{18,4},{19,4},
+	   {20,4},{21,4},{22,4},{23,4},{24,5},{25,5},{26,5},{27,5},{28,5},
+	   {29,5},{30,5},{31,5},{32,6},{33,6},{34,6},{35,6},{36,6},{37,6},
+	   {38,6},{39,6},{40,7},{41,7},{42,7},{43,7},{44,7},{45,7},{46,7},
+	   {47,7},{48,8},{49,8},{50,8},{51,8},{52,8},{53,8},{54,8},{55,8},
+	   {56,9},{57,9},{58,9},{59,9},{60,9},{61,9},{62,9},{63,9},{64,10},
+	   {65,10},{66,10},{67,10},{68,10},{69,10},{70,10},{71,10},{72,11},
+	   {73,11},{74,11},{75,11},{76,11},{77,11},{78,11},{79,11},{80,12},
+	   {81,12},{82,12},{83,12},{84,12},{85,12},{86,12},{87,12},{88,13},
+	   {89,13},{90,13},{91,13},{92,13},{93,13},{94,13},{95,13},{96,14},
+	   {97,14},{98,14},{99,14},{100,14},{101,14},{102,14},{103,14},
+	   {104,15},{105,15},{106,15},{107,15},{108,15},{109,15},{110,15},
+	   {111,15},{112,16},{113,16},{114,16},{115,16},{116,16},{117,16},
+	   {118,16},{119,16},{120,17},{121,17},{122,17},{123,17},{124,17},
+	   {125,17},{126,17},{127,17}]
+	= reader_groups_map(CPUT1, 17),
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{9,1},{10,1},
+	   {11,1},{12,1},{13,1},{14,1},{15,1},{16,2},{17,2},{18,2},{19,2},
+	   {20,2},{21,2},{22,2},{23,2},{24,2},{25,2},{26,2},{27,2},{28,2},
+	   {29,2},{30,2},{31,2},{32,3},{33,3},{34,3},{35,3},{36,3},{37,3},
+	   {38,3},{39,3},{40,3},{41,3},{42,3},{43,3},{44,3},{45,3},{46,3},
+	   {47,3},{48,4},{49,4},{50,4},{51,4},{52,4},{53,4},{54,4},{55,4},
+	   {56,4},{57,4},{58,4},{59,4},{60,4},{61,4},{62,4},{63,4},{64,5},
+	   {65,5},{66,5},{67,5},{68,5},{69,5},{70,5},{71,5},{72,5},{73,5},
+	   {74,5},{75,5},{76,5},{77,5},{78,5},{79,5},{80,6},{81,6},{82,6},
+	   {83,6},{84,6},{85,6},{86,6},{87,6},{88,6},{89,6},{90,6},{91,6},
+	   {92,6},{93,6},{94,6},{95,6},{96,7},{97,7},{98,7},{99,7},{100,7},
+	   {101,7},{102,7},{103,7},{104,7},{105,7},{106,7},{107,7},{108,7},
+	   {109,7},{110,7},{111,7},{112,7},{113,7},{114,7},{115,7},{116,7},
+	   {117,7},{118,7},{119,7},{120,7},{121,7},{122,7},{123,7},{124,7},
+	   {125,7},{126,7},{127,7}]
+	= reader_groups_map(CPUT1, 7),
+
+    ?line CPUT2 = [p([c(l(0)),c(l(1)),c(l(2)),c(l(3)),c(l(4))]),
+		   p([t(l(5)),t(l(6)),t(l(7)),t(l(8)),t(l(9))]),
+		   p([t(l(10))]),
+		   p([c(l(11)),c(l(12)),c(l(13))]),
+		   p([c(l(14)),c(l(15))])],
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},
+	   {5,2},{6,2},{7,2},{8,2},{9,2},
+	   {10,3},
+	   {11,4},{12,4},{13,4},
+	   {14,5},{15,5}] = reader_groups_map(CPUT2, 5),
+
+
+    ?line [{0,1},{1,1},{2,2},{3,2},{4,2},
+	   {5,3},{6,3},{7,3},{8,3},{9,3},
+	   {10,4},
+	   {11,5},{12,5},{13,5},
+	   {14,6},{15,6}] = reader_groups_map(CPUT2, 6),
+
+    ?line [{0,1},{1,1},{2,2},{3,2},{4,2},
+	   {5,3},{6,3},{7,3},{8,3},{9,3},
+	   {10,4},
+	   {11,5},{12,6},{13,6},
+	   {14,7},{15,7}] = reader_groups_map(CPUT2, 7),
+
+    ?line [{0,1},{1,1},{2,2},{3,2},{4,2},
+	   {5,3},{6,3},{7,3},{8,3},{9,3},
+	   {10,4},
+	   {11,5},{12,6},{13,6},
+	   {14,7},{15,8}] = reader_groups_map(CPUT2, 8),
+
+    ?line [{0,1},{1,2},{2,2},{3,3},{4,3},
+	   {5,4},{6,4},{7,4},{8,4},{9,4},
+	   {10,5},
+	   {11,6},{12,7},{13,7},
+	   {14,8},{15,9}] = reader_groups_map(CPUT2, 9),
+
+    ?line [{0,1},{1,2},{2,2},{3,3},{4,3},
+	   {5,4},{6,4},{7,4},{8,4},{9,4},
+	   {10,5},
+	   {11,6},{12,7},{13,8},
+	   {14,9},{15,10}] = reader_groups_map(CPUT2, 10),
+
+    ?line [{0,1},{1,2},{2,3},{3,4},{4,4},
+	   {5,5},{6,5},{7,5},{8,5},{9,5},
+	   {10,6},
+	   {11,7},{12,8},{13,9},
+	   {14,10},{15,11}] = reader_groups_map(CPUT2, 11),
+
+    ?line [{0,1},{1,2},{2,3},{3,4},{4,5},
+	   {5,6},{6,6},{7,6},{8,6},{9,6},
+	   {10,7},
+	   {11,8},{12,9},{13,10},
+	   {14,11},{15,12}] = reader_groups_map(CPUT2, 100),
+
+    CPUT3 = [p([t(l(5)),t(l(6)),t(l(7)),t(l(8)),t(l(9))]),
+	     p([t(l(10))]),
+	     p([c(l(11)),c(l(12)),c(l(13))]),
+	     p([c(l(14)),c(l(15))]),
+	     p([c(l(0)),c(l(1)),c(l(2)),c(l(3)),c(l(4))])],
+
+    ?line [{0,5},{1,5},{2,6},{3,6},{4,6},
+	   {5,1},{6,1},{7,1},{8,1},{9,1},
+	   {10,2},{11,3},{12,3},{13,3},
+	   {14,4},{15,4}] = reader_groups_map(CPUT3, 6),
+
+    CPUT4 = [p([t(l(0)),t(l(1)),t(l(2)),t(l(3)),t(l(4))]),
+	     p([t(l(5))]),
+	     p([c(l(6)),c(l(7)),c(l(8))]),
+	     p([c(l(9)),c(l(10))]),
+	     p([c(l(11)),c(l(12)),c(l(13)),c(l(14)),c(l(15))])],
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},
+	   {5,2},
+	   {6,3},{7,3},{8,3},
+	   {9,4},{10,4},
+	   {11,5},{12,5},{13,6},{14,6},{15,6}] = reader_groups_map(CPUT4, 6),
+
+    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},
+	   {5,2},
+	   {6,3},{7,4},{8,4},
+	   {9,5},{10,5},
+	   {11,6},{12,6},{13,7},{14,7},{15,7}] = reader_groups_map(CPUT4, 7),
+
+    ?line [{0,1},{65535,2}] = reader_groups_map([c(l(0)),c(l(65535))], 10),
+
+    ?line ok.
     
 
+reader_groups_map(CPUT, Groups) ->
+    Old = erlang:system_info({cpu_topology, defined}),
+    erlang:system_flag(cpu_topology, CPUT),
+    enable_internal_state(),
+    Res = erts_debug:get_internal_state({reader_groups_map, Groups}),
+    erlang:system_flag(cpu_topology, Old),
+    lists:sort(Res).
+
 %%
 %% Utils
 %%
 
+l(Id) ->
+    {logical, Id}.
+
+t(X) ->
+    {thread, X}.
+
+c(X) ->
+    {core, X}.
+
+p(X) ->
+    {processor, X}.
+
+n(X) ->
+    {node, X}.
+
 mcall(Node, Funs) ->
     Parent = self(),
     Refs = lists:map(fun (Fun) ->
diff --git a/erts/emulator/test/send_term_SUITE.erl b/erts/emulator/test/send_term_SUITE.erl
index 489adbd660..84352f78ad 100644
--- a/erts/emulator/test/send_term_SUITE.erl
+++ b/erts/emulator/test/send_term_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -19,24 +19,43 @@
 
 -module(send_term_SUITE).
 
--export([all/1,basic/1]).
--export([init_per_testcase/2,fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,basic/1]).
+-export([init_per_testcase/2,end_per_testcase/2]).
 
 -export([generate_external_terms_files/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(3)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [basic].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 basic(Config) when is_list(Config) ->
     Drv = "send_term_drv",
     ?line P = start_driver(Config, Drv),
@@ -61,7 +80,7 @@ basic(Config) when is_list(Config) ->
     ?line ExpectExt2Term = term(P, 5),
 
     %% ERL_DRV_INT, ERL_DRV_UINT
-    ?line case erlang:system_info(wordsize) of
+    ?line case erlang:system_info({wordsize, external}) of
 	      4 ->
 		  ?line {-1, 4294967295} = term(P, 6);
 	      8 ->
@@ -76,40 +95,43 @@ basic(Config) when is_list(Config) ->
     ?line ExpectedBinTup = term(P, 7),
 
     %% single terms
-    ?line [] = term(P, 8), % ERL_DRV_NIL
-    ?line '' = term(P, 9), % ERL_DRV_ATOM
-    ?line an_atom = term(P, 10), % ERL_DRV_ATOM
-    ?line -4711 = term(P, 11), % ERL_DRV_INT
-    ?line 4711 = term(P, 12), % ERL_DRV_UINT
-    ?line P = term(P, 13), % ERL_DRV_PORT
-    ?line <<>> = term(P, 14), % ERL_DRV_BINARY
-    ?line <<"hejsan">> = term(P, 15), % ERL_DRV_BINARY
-    ?line <<>> = term(P, 16), % ERL_DRV_BUF2BINARY
-    ?line <<>> = term(P, 17), % ERL_DRV_BUF2BINARY
-    ?line <<"hoppsan">> = term(P, 18), % ERL_DRV_BUF2BINARY
-    ?line "" = term(P, 19), % ERL_DRV_STRING
-    ?line "" = term(P, 20), % ERL_DRV_STRING
-    ?line "hippsan" = term(P, 21), % ERL_DRV_STRING
-    ?line {} = term(P, 22), % ERL_DRV_TUPLE
-    ?line [] = term(P, 23), % ERL_DRV_LIST
-    ?line Self = term(P, 24), % ERL_DRV_PID
-    ?line [] = term(P, 25), % ERL_DRV_STRING_CONS
-    ?line AFloat = term(P, 26), % ERL_DRV_FLOAT
+    Singles = [{[], 8}, % ERL_DRV_NIL
+               {'', 9}, % ERL_DRV_ATOM
+               {an_atom, 10}, % ERL_DRV_ATOM
+               {-4711, 11}, % ERL_DRV_INT
+               {4711, 12}, % ERL_DRV_UINT
+               {P, 13}, % ERL_DRV_PORT
+               {<<>>, 14}, % ERL_DRV_BINARY
+               {<<"hejsan">>, 15}, % ERL_DRV_BINARY
+               {<<>>, 16}, % ERL_DRV_BUF2BINARY
+               {<<>>, 17}, % ERL_DRV_BUF2BINARY
+               {<<"hoppsan">>, 18}, % ERL_DRV_BUF2BINARY
+               {"", 19}, % ERL_DRV_STRING
+               {"", 20}, % ERL_DRV_STRING
+               {"hippsan", 21}, % ERL_DRV_STRING
+               {{}, 22}, % ERL_DRV_TUPLE
+               {[], 23}, % ERL_DRV_LIST
+               {Self, 24}, % ERL_DRV_PID
+               {[], 25}, % ERL_DRV_STRING_CONS
+               {[], 27}, % ERL_DRV_EXT2TERM
+               {18446744073709551615, 28}, % ERL_DRV_UINT64
+               {20233590931456, 29}, % ERL_DRV_UINT64
+               {4711, 30}, % ERL_DRV_UINT64
+               {0, 31}, % ERL_DRV_UINT64
+               {9223372036854775807, 32}, % ERL_DRV_INT64
+               {20233590931456, 33}, % ERL_DRV_INT64
+               {4711, 34}, % ERL_DRV_INT64
+               {0, 35}, % ERL_DRV_INT64
+               {-1, 36}, % ERL_DRV_INT64
+               {-4711, 37}, % ERL_DRV_INT64
+               {-20233590931456, 38}, % ERL_DRV_INT64
+               {-9223372036854775808, 39}], % ERL_DRV_INT64
+    ?line {Terms, Ops} = lists:unzip(Singles),
+    ?line Terms = term(P,Ops),
+
+    AFloat = term(P, 26), % ERL_DRV_FLOAT
     ?line true = AFloat < 0.001,
     ?line true = AFloat > -0.001,
-    ?line [] = term(P, 27), % ERL_DRV_EXT2TERM
-    ?line 18446744073709551615 = term(P, 28), % ERL_DRV_UINT64
-    ?line 20233590931456 = term(P, 29), % ERL_DRV_UINT64
-    ?line 4711 = term(P, 30), % ERL_DRV_UINT64
-    ?line 0 = term(P, 31), % ERL_DRV_UINT64
-    ?line 9223372036854775807 = term(P, 32), % ERL_DRV_INT64
-    ?line 20233590931456 = term(P, 33), % ERL_DRV_INT64
-    ?line 4711 = term(P, 34), % ERL_DRV_INT64
-    ?line 0 = term(P, 35), % ERL_DRV_INT64
-    ?line -1 = term(P, 36), % ERL_DRV_INT64
-    ?line -4711 = term(P, 37), % ERL_DRV_INT64
-    ?line -20233590931456 = term(P, 38), % ERL_DRV_INT64
-    ?line -9223372036854775808 = term(P, 39), % ERL_DRV_INT64
 
     %% Failure cases.
     ?line [] = term(P, 127),
diff --git a/erts/emulator/test/send_term_SUITE_data/send_term_drv.c b/erts/emulator/test/send_term_SUITE_data/send_term_drv.c
index 6638de0560..165cce2e9d 100644
--- a/erts/emulator/test/send_term_SUITE_data/send_term_drv.c
+++ b/erts/emulator/test/send_term_SUITE_data/send_term_drv.c
@@ -17,6 +17,7 @@
  */
 
 #include "erl_driver.h"
+#include <stdio.h>
 #include <errno.h>
 #include <string.h>
 
@@ -65,12 +66,21 @@ static void fail_term(ErlDrvTermData* msg, int len, int line);
 
 static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 {
-    ErlDrvTermData msg[1024];
-
-    switch (*buf) {
+    char buf7[1024];
+    ErlDrvTermData spec[1024];
+    ErlDrvTermData* msg = spec;
+    ErlDrvBinary* bins[15];
+    int bin_ix = 0;
+    ErlDrvSInt64 s64[15];
+    int s64_ix = 0;
+    ErlDrvUInt64 u64[15];
+    int u64_ix = 0;
+    int i = 0;
+
+    for (i=0; i<count; i++) switch (buf[i]) {
     case 0:
 	msg[0] = ERL_DRV_NIL;
-	output_term(msg, 1);
+	msg += 1;
 	break;
 
     case 1: 			/* Most term types inside a tuple. */
@@ -102,7 +112,7 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	    msg[22] = driver_connected(erlang_port);
 	    msg[23] = ERL_DRV_TUPLE;
 	    msg[24] = (ErlDrvTermData) 7;
-	    output_term(msg, 25);
+	    msg += 25;
 	}
 	break;
 
@@ -117,7 +127,7 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	    msg[i] = ERL_DRV_NIL;
 	    msg[i+1] = ERL_DRV_LIST;
 	    msg[i+2] = (ErlDrvTermData) 201;
-	    output_term(msg, i+3);
+	    msg += i+3;
 	}
 	break;
 
@@ -126,7 +136,7 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	    ErlDrvBinary* bin;
 	    int i;
 
-	    bin = driver_alloc_binary(256);
+	    bin = bins[bin_ix++] = driver_alloc_binary(256);
 	    for (i = 0; i < 256; i++) {
 		bin->orig_bytes[i] = i;
 	    }
@@ -140,8 +150,7 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	    msg[7] = (ErlDrvTermData) 23;
 	    msg[8] = ERL_DRV_TUPLE;
 	    msg[9] = (ErlDrvTermData) 2;
-	    output_term(msg, 10);
-	    driver_free_binary(bin);
+	    msg += 10;
 	}
 	break;
 
@@ -152,11 +161,11 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	msg[3] = driver_caller(erlang_port);
 	msg[4] = ERL_DRV_TUPLE;
 	msg[5] = (ErlDrvTermData) 2;
-	output_term(msg, 6);
+	msg += 6;
 	break;
 
     case 5:
-	output_term(msg, make_ext_term_list(msg, 0));
+	msg += make_ext_term_list(msg, 0);
 	break;
 
     case 6:
@@ -166,94 +175,91 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	msg[3] = ~((ErlDrvTermData) 0);
 	msg[4] = ERL_DRV_TUPLE;
 	msg[5] = (ErlDrvTermData) 2;
-	output_term(msg, 6);
+	msg += 6;
 	break;
 
     case 7: {
 	int len = 0;
-	char buf[1024];
-	memset(buf, 17, sizeof(buf));
+	memset(buf7, 17, sizeof(buf7));
 	/* empty heap binary */
 	msg[len++] = ERL_DRV_BUF2BINARY;
 	msg[len++] = (ErlDrvTermData) NULL; /* NULL is ok if size == 0 */
 	msg[len++] = (ErlDrvTermData) 0;
 	/* empty heap binary again */
 	msg[len++] = ERL_DRV_BUF2BINARY;
-	msg[len++] = (ErlDrvTermData) &buf[0]; /* ptr is ok if size == 0 */
+	msg[len++] = (ErlDrvTermData) buf7; /* ptr is ok if size == 0 */
 	msg[len++] = (ErlDrvTermData) 0;
 	/* heap binary */
 	msg[len++] = ERL_DRV_BUF2BINARY;
-	msg[len++] = (ErlDrvTermData) &buf[0];
+	msg[len++] = (ErlDrvTermData) buf7;
 	msg[len++] = (ErlDrvTermData) 17;
 	/* off heap binary */
 	msg[len++] = ERL_DRV_BUF2BINARY;
-	msg[len++] = (ErlDrvTermData) &buf[0];
-	msg[len++] = (ErlDrvTermData) sizeof(buf);
+	msg[len++] = (ErlDrvTermData) buf7;
+	msg[len++] = (ErlDrvTermData) sizeof(buf7);
 
 	msg[len++] = ERL_DRV_TUPLE;
 	msg[len++] = (ErlDrvTermData) 4;
 
-	output_term(msg, len);
+	msg += len;
 	break;
     }
 
     case 8:
 	msg[0] = ERL_DRV_NIL;
-	output_term(msg, 1);
+	msg += 1;
 	break;
 
     case 9:
 	msg[0] = ERL_DRV_ATOM;
 	msg[1] = (ErlDrvTermData) driver_mk_atom("");
-	output_term(msg, 2);
+	msg += 2;
 	break;
 
     case 10:
 	msg[0] = ERL_DRV_ATOM;
 	msg[1] = (ErlDrvTermData) driver_mk_atom("an_atom");
-	output_term(msg, 2);
+	msg += 2;
 	break;
 
     case 11:
 	msg[0] = ERL_DRV_INT;
 	msg[1] = (ErlDrvTermData) -4711;
-	output_term(msg, 2);
+	msg += 2;
 	break;
 	  
     case 12:  
 	msg[0] = ERL_DRV_UINT;
 	msg[1] = (ErlDrvTermData) 4711;
-	output_term(msg, 2);
+	msg += 2;
 	  
 	break;
     case 13:  
 	msg[0] = ERL_DRV_PORT;
 	msg[1] = driver_mk_port(erlang_port);
-	output_term(msg, 2);
+	msg += 2;
 	break;
 
     case 14: {
-	ErlDrvBinary *dbin = driver_alloc_binary(0);
+	ErlDrvBinary *dbin = bins[bin_ix++] = driver_alloc_binary(0);
 	msg[0] = ERL_DRV_BINARY;
 	msg[1] = (ErlDrvTermData) dbin;
 	msg[2] = (ErlDrvTermData) 0;
 	msg[3] = (ErlDrvTermData) 0;
-	output_term(msg, 4);
-	driver_free_binary(dbin);
+	msg += 4;
 	break;
 	}
 
     case 15: {
-	char buf[] = "hejsan";
-	ErlDrvBinary *dbin = driver_alloc_binary(sizeof(buf)-1);
+	static const char buf[] = "hejsan";
+	ErlDrvBinary *dbin = bins[bin_ix++] = driver_alloc_binary(sizeof(buf)-1);
 	if (dbin)
 	    memcpy((void *) dbin->orig_bytes, (void *) buf, sizeof(buf)-1);
 	msg[0] = ERL_DRV_BINARY;
 	msg[1] = (ErlDrvTermData) dbin;
 	msg[2] = (ErlDrvTermData) (dbin ? sizeof(buf)-1 : 0);
 	msg[3] = (ErlDrvTermData) 0;
-	output_term(msg, 4);
-	driver_free_binary(dbin);
+	msg += 4;
 	break;
 	}
 
@@ -261,24 +267,24 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	msg[0] = ERL_DRV_BUF2BINARY;
 	msg[1] = (ErlDrvTermData) NULL;
 	msg[2] = (ErlDrvTermData) 0;
-	output_term(msg, 3);
+	msg += 3;
 	break;
 	
     case 17: {
-	char buf[] = "";
+	static const char buf[] = "";
 	msg[0] = ERL_DRV_BUF2BINARY;
 	msg[1] = (ErlDrvTermData) buf;
 	msg[2] = (ErlDrvTermData) sizeof(buf)-1;
-	output_term(msg, 3);
+	msg += 3;
 	break;
 	}
 
     case 18: {
-	char buf[] = "hoppsan";
+	static const char buf[] = "hoppsan";
 	msg[0] = ERL_DRV_BUF2BINARY;
 	msg[1] = (ErlDrvTermData) buf;
 	msg[2] = (ErlDrvTermData) sizeof(buf)-1;
-	output_term(msg, 3);
+	msg += 3;
 	break;
     }
 
@@ -286,44 +292,44 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	msg[0] = ERL_DRV_STRING;
 	msg[1] = (ErlDrvTermData) buf;
 	msg[2] = (ErlDrvTermData) 0;
-	output_term(msg, 3);
+	msg += 3;
 	break;
 
     case 20: {
-	char buf[] = "";
+	static const char buf[] = "";
 	msg[0] = ERL_DRV_STRING;
 	msg[1] = (ErlDrvTermData) buf;
 	msg[2] = (ErlDrvTermData) sizeof(buf)-1;
-	output_term(msg, 3);
+	msg += 3;
 	break;
     }
 	
     case 21: {
-	char buf[] = "hippsan";
+	static const char buf[] = "hippsan";
 	msg[0] = ERL_DRV_STRING;
 	msg[1] = (ErlDrvTermData) buf;
 	msg[2] = (ErlDrvTermData) sizeof(buf)-1;
-	output_term(msg, 3);
+	msg += 3;
 	break;
 	}
 
     case 22:
 	msg[0] = ERL_DRV_TUPLE;
 	msg[1] = (ErlDrvTermData) 0;
-	output_term(msg, 2);
+	msg += 2;
 	break;
 
     case 23:
 	msg[0] = ERL_DRV_NIL;
 	msg[1] = ERL_DRV_LIST;
 	msg[2] = (ErlDrvTermData) 1;
-	output_term(msg, 3);
+	msg += 3;
 	break;
 	
     case 24:
 	msg[0] = ERL_DRV_PID;
 	msg[1] = driver_connected(erlang_port);
-	output_term(msg, 2);
+	msg += 2;
 	break;
 	
     case 25:
@@ -331,132 +337,131 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	msg[1] = ERL_DRV_STRING_CONS;
 	msg[2] = (ErlDrvTermData) "";
 	msg[3] = (ErlDrvTermData) 0;
-	output_term(msg, 4);
+	msg += 4;
 	break;
 
     case 26: {
-	double my_float = 0.0;
+	static double my_float = 0.0;
 	msg[0] = ERL_DRV_FLOAT;
 	msg[1] = (ErlDrvTermData) &my_float; 
-	output_term(msg, 2);
+	msg += 2;
 	break;
     }
 
     case 27: {
-	char buf[] = {131, 106}; /* [] */
+	static char buf[] = {131, 106}; /* [] */
 	msg[0] = ERL_DRV_EXT2TERM;
 	msg[1] = (ErlDrvTermData) buf;
 	msg[2] = (ErlDrvTermData) sizeof(buf);
-	output_term(msg, 3);
+	msg += 3;
 	break;
     }
 
     case 28: {
-	ErlDrvUInt64 x = ~((ErlDrvUInt64) 0);
+	ErlDrvUInt64* x = &u64[u64_ix++];
+	*x = ~((ErlDrvUInt64) 0);
 	msg[0] = ERL_DRV_UINT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
     case 29: {
-	ErlDrvUInt64 x = ((ErlDrvUInt64) 4711) << 32;
+	ErlDrvUInt64* x = &u64[u64_ix++];
+	*x = ((ErlDrvUInt64) 4711) << 32;
 	msg[0] = ERL_DRV_UINT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
     case 30: {
-	ErlDrvUInt64 x = 4711;
+	ErlDrvUInt64* x = &u64[u64_ix++];
+	*x = 4711;
 	msg[0] = ERL_DRV_UINT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
     case 31: {
-	ErlDrvUInt64 x = 0;
+	ErlDrvUInt64* x = &u64[u64_ix++];
+	*x = 0;
 	msg[0] = ERL_DRV_UINT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
     case 32: {
-	ErlDrvSInt64 x = ((((ErlDrvUInt64) 0x7fffffff) << 32)
-			  | ((ErlDrvUInt64) 0xffffffff));
+	ErlDrvSInt64* x = &s64[s64_ix++];
+	*x = ((((ErlDrvUInt64) 0x7fffffff) << 32) | ((ErlDrvUInt64) 0xffffffff));
 	msg[0] = ERL_DRV_INT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
     case 33: {
-	ErlDrvSInt64 x = (ErlDrvSInt64) (((ErlDrvUInt64) 4711) << 32);
+	ErlDrvSInt64* x = &s64[s64_ix++];
+	*x = (ErlDrvSInt64) (((ErlDrvUInt64) 4711) << 32);
 	msg[0] = ERL_DRV_INT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
     case 34: {
-	ErlDrvSInt64 x = 4711;
+	ErlDrvSInt64* x = &s64[s64_ix++];
+	*x = 4711;
 	msg[0] = ERL_DRV_INT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
     case 35: {
-	ErlDrvSInt64 x = 0;
+	ErlDrvSInt64* x = &s64[s64_ix++];
+	*x = 0;
 	msg[0] = ERL_DRV_INT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
     case 36: {
-	ErlDrvSInt64 x = -1;
+	ErlDrvSInt64* x = &s64[s64_ix++];
+	*x = -1;
 	msg[0] = ERL_DRV_INT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
     case 37: {
-	ErlDrvSInt64 x = -4711;
+	ErlDrvSInt64* x = &s64[s64_ix++];
+	*x = -4711;
 	msg[0] = ERL_DRV_INT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
     case 38: {
-	ErlDrvSInt64 x = ((ErlDrvSInt64) ((ErlDrvUInt64) 4711) << 32)*-1;
+	ErlDrvSInt64* x = &s64[s64_ix++];
+	*x = ((ErlDrvSInt64) ((ErlDrvUInt64) 4711) << 32)*-1;
 	msg[0] = ERL_DRV_INT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
     case 39: {
-	ErlDrvSInt64 x = ((ErlDrvSInt64) 1) << 63;
+	ErlDrvSInt64* x = &s64[s64_ix++];
+	*x = ((ErlDrvSInt64) 1) << 63;
 	msg[0] = ERL_DRV_INT64;
-	msg[1] = (ErlDrvTermData) &x;
-	output_term(msg, 2);
-
+	msg[1] = (ErlDrvTermData) x;
+	msg += 2;
 	break;
     }
 
@@ -464,7 +469,7 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
     case 127:			/* Error cases */
 	{
 	    long refc;
-	    ErlDrvBinary* bin = driver_alloc_binary(256);
+	    ErlDrvBinary* bin = bins[bin_ix++] = driver_alloc_binary(256);
 
 	    FAIL_TERM(msg, 0);
 
@@ -537,7 +542,7 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	    refc = driver_binary_get_refc(bin);
 	    if (refc > 3) {
 		char sbuf[128];
-		sprintf(sbuf, "bad_refc:%d", refc);
+		sprintf(sbuf, "bad_refc:%ld", refc);
 		driver_failure_atom(erlang_port, sbuf);
 	    }
 	    driver_free_binary(bin);
@@ -644,6 +649,7 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	    /* Signal end of test case */
 	    msg[0] = ERL_DRV_NIL;
 	    driver_output_term(erlang_port, msg, 1);
+	    return;
 	}
 	break;
 
@@ -651,6 +657,16 @@ static void send_term_drv_run(ErlDrvData port, char *buf, int count)
 	driver_failure_atom(erlang_port, "bad_request");
 	break;
     }
+    if (count > 1) {
+	*msg++ = ERL_DRV_NIL;
+	*msg++ = ERL_DRV_LIST;
+	*msg++ = count + 1;
+    }
+    output_term(spec, msg-spec);
+    if ((bin_ix|s64_ix|u64_ix) > 15) abort();
+    while (bin_ix) {
+	driver_free_binary(bins[--bin_ix]);
+    }
 }
 
 static void output_term(ErlDrvTermData* msg, int len)
diff --git a/erts/emulator/test/sensitive_SUITE.erl b/erts/emulator/test/sensitive_SUITE.erl
index 458275af81..57bc6ce08e 100644
--- a/erts/emulator/test/sensitive_SUITE.erl
+++ b/erts/emulator/test/sensitive_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -19,9 +19,11 @@
 
 -module(sensitive_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 stickiness/1,send_trace/1,recv_trace/1,proc_trace/1,call_trace/1,
 	 meta_trace/1,running_trace/1,gc_trace/1,seq_trace/1,
 	 t_process_info/1,t_process_display/1,save_calls/1]).
@@ -34,14 +36,33 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog = ?t:timetrap(?t:minutes(5)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
+end_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
-all(suite) ->
-    [stickiness,send_trace,recv_trace,proc_trace,call_trace,
-     meta_trace,running_trace,gc_trace,seq_trace,
-     t_process_info,t_process_display,save_calls].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [stickiness, send_trace, recv_trace, proc_trace,
+     call_trace, meta_trace, running_trace, gc_trace,
+     seq_trace, t_process_info, t_process_display,
+     save_calls].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
     
 stickiness(Config) when is_list(Config) ->
     ?line {Tracer,Mref} = spawn_monitor(fun() ->
diff --git a/erts/emulator/test/signal_SUITE.erl b/erts/emulator/test/signal_SUITE.erl
index e9103ca3c1..682a9d03fc 100644
--- a/erts/emulator/test/signal_SUITE.erl
+++ b/erts/emulator/test/signal_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -30,8 +30,9 @@
 -define(DEFAULT_TIMEOUT_SECONDS, 120).
 
 %-define(line_trace, 1).
--include("test_server.hrl").
--export([all/1]).
+-include_lib("test_server/include/test_server.hrl").
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 % Test cases
 -export([xm_sig_order/1,
@@ -49,38 +50,48 @@
 	 pending_exit_group_leader/1,
 	 exit_before_pending_exit/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     ?line Dog = ?t:timetrap(?t:seconds(?DEFAULT_TIMEOUT_SECONDS)),
     available_internal_state(true),
     ?line [{testcase, Func},{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     ?line Dog = ?config(watchdog, Config),
     ?line ?t:timetrap_cancel(Dog).
 
+init_per_suite(Config) ->
+    Config.
+
 end_per_suite(_Config) ->
     available_internal_state(true),
-    erts_debug:set_internal_state(not_running_optimization, true),
+    catch erts_debug:set_internal_state(not_running_optimization, true),
     available_internal_state(false).
 
-all(suite) ->
-    [xm_sig_order,
-     pending_exit_unlink_process,
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [xm_sig_order, pending_exit_unlink_process,
      pending_exit_unlink_dist_process,
-     pending_exit_unlink_port,
-     pending_exit_trap_exit,
-     pending_exit_receive,
-     pending_exit_trap_exit,
-     pending_exit_gc,
-     pending_exit_is_process_alive,
+     pending_exit_unlink_port, pending_exit_trap_exit,
+     pending_exit_receive, pending_exit_trap_exit,
+     pending_exit_gc, pending_exit_is_process_alive,
      pending_exit_process_display,
      pending_exit_process_info_1,
-     pending_exit_process_info_2,
-     pending_exit_group_leader,
+     pending_exit_process_info_2, pending_exit_group_leader,
      exit_before_pending_exit].
 
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 xm_sig_order(doc) -> ["Test that exit signals and messages are received "
 		      "in correct order"];
 xm_sig_order(suite) -> [];
diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl
index 898908c40f..b543491471 100644
--- a/erts/emulator/test/statistics_SUITE.erl
+++ b/erts/emulator/test/statistics_SUITE.erl
@@ -21,13 +21,14 @@
 
 %% Tests the statistics/1 bif.
 
--export([all/1,
+-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,
-	 fin_per_testcase/2,
-	 wall_clock/1, wall_clock_zero_diff/1, wall_clock_update/1,
-	 runtime/1, runtime_zero_diff/1,
+	 end_per_testcase/2,
+	 wall_clock_zero_diff/1, wall_clock_update/1,
+	 runtime_zero_diff/1,
 	 runtime_update/1, runtime_diff/1,
-	 run_queue/1, run_queue_one/1,
+	 run_queue_one/1,
 	 reductions/1, reductions_big/1, garbage_collection/1, io/1,
 	 badarg/1]).
 
@@ -35,24 +36,47 @@
 
 -export([hog/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 init_per_testcase(_, Config) ->
     ?line Dog = test_server:timetrap(test_server:seconds(300)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_, Config) ->
+end_per_testcase(_, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> [wall_clock, runtime, reductions, reductions_big, run_queue,
-	       garbage_collection, io, badarg].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, wall_clock}, {group, runtime}, reductions,
+     reductions_big, {group, run_queue}, garbage_collection,
+     io, badarg].
+
+groups() -> 
+    [{wall_clock, [],
+      [wall_clock_zero_diff, wall_clock_update]},
+     {runtime, [],
+      [runtime_zero_diff, runtime_update, runtime_diff]},
+     {run_queue, [], [run_queue_one]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 %%% Testing statistics(wall_clock).
 
-wall_clock(suite) -> [wall_clock_zero_diff, wall_clock_update].
 
 
 wall_clock_zero_diff(doc) ->
@@ -99,7 +123,6 @@ wall_clock_update1(0) ->
 
 %%% Test statistics(runtime).
 
-runtime(suite) -> [runtime_zero_diff, runtime_update, runtime_diff].
 
 runtime_zero_diff(doc) ->
     "Tests that the difference between the times returned from two consectuitive "
@@ -225,7 +248,6 @@ reductions_big_loop() ->
 
 %%% Tests of statistics(run_queue).
 
-run_queue(suite) -> [run_queue_one].
 
 run_queue_one(doc) ->
     "Tests that statistics(run_queue) returns 1 if we start a "
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl
index ba433d4e11..0293341eac 100644
--- a/erts/emulator/test/system_info_SUITE.erl
+++ b/erts/emulator/test/system_info_SUITE.erl
@@ -30,23 +30,44 @@
 
 %-define(line_trace, 1).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %-compile(export_all).
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([process_count/1, system_version/1, misc_smoke_tests/1, heap_size/1, wordsize/1]).
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(2)).
 
-all(doc) -> [];
-all(suite) -> [process_count, system_version, misc_smoke_tests, heap_size, wordsize].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [process_count, system_version, misc_smoke_tests,
+     heap_size, wordsize].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
@@ -132,6 +153,7 @@ misc_smoke_tests(Config) when is_list(Config) ->
     ?line true = is_binary(erlang:system_info(procs)),
     ?line true = is_binary(erlang:system_info(loaded)),
     ?line true = is_binary(erlang:system_info(dist)),
+    ?line ok = try erlang:system_info({cpu_topology,erts_get_cpu_topology_error_case}), fail catch error:badarg -> ok end,
     ?line ok.
     
 
diff --git a/erts/emulator/test/system_profile_SUITE.erl b/erts/emulator/test/system_profile_SUITE.erl
index 7b0d6d19fe..e4cfa56d88 100644
--- a/erts/emulator/test/system_profile_SUITE.erl
+++ b/erts/emulator/test/system_profile_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -22,35 +22,52 @@
 
 -module(system_profile_SUITE).
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	system_profile_on_and_off/1,
 	runnable_procs/1,
 	runnable_ports/1,
 	scheduler/1
         ]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--export([profiler_process/1, ring_loop/1, port_echo_start/0, list_load/0, run_load/2]).
+-export([profiler_process/1, ring_loop/1, port_echo_start/0, 
+	 list_load/0, run_load/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(default_timeout, ?t:minutes(1)).
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=?t:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> 
-    %% Test specification on test suite level
-    [system_profile_on_and_off,
-    runnable_procs,
-    runnable_ports,
-    scheduler].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [system_profile_on_and_off, runnable_procs,
+     runnable_ports, scheduler].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% No specification clause needed for an init function in a conf case!!!
 
diff --git a/erts/emulator/test/time_SUITE.erl b/erts/emulator/test/time_SUITE.erl
index 2ad1f0d201..43dccc6ecb 100644
--- a/erts/emulator/test/time_SUITE.erl
+++ b/erts/emulator/test/time_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -29,12 +29,15 @@
 %%	now/0
 %%
 
--export([all/1, univ_to_local/1, local_to_univ/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, univ_to_local/1, local_to_univ/1,
 	 bad_univ_to_local/1, bad_local_to_univ/1,
 	 consistency/1,
-	 now/1, now_unique/1, now_update/1, timestamp/1]).
+	 now_unique/1, now_update/1, timestamp/1]).
 
--include("test_server.hrl").
+-export([local_to_univ_utc/1]).
+
+-include_lib("test_server/include/test_server.hrl").
 
 -export([linear_time/1]).
 
@@ -52,8 +55,59 @@
 
 -define(dst_timezone, 2).
 
-all(suite) -> [univ_to_local, local_to_univ,
-	       bad_univ_to_local, bad_local_to_univ, consistency, now, timestamp].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [univ_to_local, local_to_univ, local_to_univ_utc,
+     bad_univ_to_local, bad_local_to_univ, consistency,
+     {group, now}, timestamp].
+
+groups() -> 
+    [{now, [], [now_unique, now_update]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+local_to_univ_utc(suite) ->
+    [];
+local_to_univ_utc(doc) ->
+    ["Test that DST = true on timezones without DST is ignored"];
+local_to_univ_utc(Config) when is_list(Config) ->
+    case os:type() of
+	{unix,_} ->
+	    %% TZ variable has a meaning
+	    ?line {ok, Node} =
+		test_server:start_node(local_univ_utc,peer,
+				       [{args, "-env TZ UTC"}]),
+	    ?line {{2008,8,1},{0,0,0}} =
+		rpc:call(Node,
+			 erlang,localtime_to_universaltime,
+			 [{{2008, 8, 1}, {0, 0, 0}},
+			  false]),
+	    ?line {{2008,8,1},{0,0,0}} =
+		rpc:call(Node,
+			 erlang,localtime_to_universaltime,
+			 [{{2008, 8, 1}, {0, 0, 0}},
+			  true]),
+	    ?line [{{2008,8,1},{0,0,0}}] =
+		rpc:call(Node,
+			 calendar,local_time_to_universal_time_dst,
+			 [{{2008, 8, 1}, {0, 0, 0}}]),
+	    ?line test_server:stop_node(Node),
+	    ok;
+	_ ->
+	    {skip,"Only valid on Unix"}
+    end.
 
 
 %% Tests conversion from univeral to local time.
@@ -248,7 +302,6 @@ repeating_timestamp_check(N) ->
 
 %% Test now/0.
 
-now(suite) -> [now_unique, now_update].
 
 %% Tests that successive calls to now/0 returns different values.
 %% Also returns a comment string with the median difference between
diff --git a/erts/emulator/test/timer_bif_SUITE.erl b/erts/emulator/test/timer_bif_SUITE.erl
index 9ac5afcc45..6c421253af 100644
--- a/erts/emulator/test/timer_bif_SUITE.erl
+++ b/erts/emulator/test/timer_bif_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -19,7 +19,9 @@
 
 -module(timer_bif_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,end_per_suite/1]).
+-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([start_timer_1/1, send_after_1/1, send_after_2/1, send_after_3/1,
 	 cancel_timer_1/1,
 	 start_timer_big/1, send_after_big/1,
@@ -27,7 +29,7 @@
 	 read_timer_trivial/1, read_timer/1,
 	 cleanup/1, evil_timers/1, registered_process/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(test_server:seconds(30)),
@@ -37,19 +39,35 @@ init_per_testcase(_Case, Config) ->
     end,
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
+init_per_suite(Config) ->
+    Config.
+
 end_per_suite(_Config) ->
     catch erts_debug:set_internal_state(available_internal_state, false).
 
-all(suite) ->
-    [start_timer_1, send_after_1, send_after_2, cancel_timer_1,
-     start_timer_e, send_after_e, cancel_timer_e,
-     start_timer_big, send_after_big, read_timer_trivial, read_timer,
-     cleanup, evil_timers, registered_process].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [start_timer_1, send_after_1, send_after_2,
+     cancel_timer_1, start_timer_e, send_after_e,
+     cancel_timer_e, start_timer_big, send_after_big,
+     read_timer_trivial, read_timer, cleanup, evil_timers,
+     registered_process].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 start_timer_1(doc) -> ["Basic start_timer/3 functionality"];
 start_timer_1(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl
index e9713fcf0f..d200fdaf4c 100644
--- a/erts/emulator/test/trace_SUITE.erl
+++ b/erts/emulator/test/trace_SUITE.erl
@@ -23,7 +23,8 @@
 %%% Tests the trace BIF.
 %%%
 
--export([all/1, receive_trace/1, self_send/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, receive_trace/1, self_send/1,
 	 timeout_trace/1, send_trace/1,
 	 procs_trace/1, dist_procs_trace/1,
 	 suspend/1, mutual_suspend/1, suspend_exit/1, suspender_exit/1,
@@ -35,22 +36,39 @@
 	 system_monitor_large_heap_1/1, system_monitor_large_heap_2/1,
 	 bad_flag/1, trace_delivered/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %%% Internal exports
 -export([process/1]).
 
-all(suite) ->
-    [cpu_timestamp, receive_trace, self_send, timeout_trace, send_trace,
-     procs_trace, dist_procs_trace,
-     suspend, mutual_suspend, suspend_exit, suspender_exit,
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [cpu_timestamp, receive_trace, self_send, timeout_trace,
+     send_trace, procs_trace, dist_procs_trace, suspend,
+     mutual_suspend, suspend_exit, suspender_exit,
      suspend_system_limit, suspend_opts, suspend_waiting,
-     new_clear, existing_clear,
-     set_on_spawn, set_on_first_spawn,
-     system_monitor_args, more_system_monitor_args,
-     system_monitor_long_gc_1, system_monitor_long_gc_2, 
-     system_monitor_large_heap_1, system_monitor_large_heap_2,
-     bad_flag, trace_delivered].
+     new_clear, existing_clear, set_on_spawn,
+     set_on_first_spawn, system_monitor_args,
+     more_system_monitor_args, system_monitor_long_gc_1,
+     system_monitor_long_gc_2, system_monitor_large_heap_1,
+     system_monitor_large_heap_2, bad_flag, trace_delivered].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 %% No longer testing anything, just reporting whether cpu_timestamp
diff --git a/erts/emulator/test/trace_bif_SUITE.erl b/erts/emulator/test/trace_bif_SUITE.erl
index 3f91f8dc08..263db065b3 100644
--- a/erts/emulator/test/trace_bif_SUITE.erl
+++ b/erts/emulator/test/trace_bif_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -19,24 +19,44 @@
 
 -module(trace_bif_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
--export([trace_bif/1, trace_bif_timestamp/1, trace_on_and_off/1, trace_bif_local/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([trace_bif/1, trace_bif_timestamp/1, trace_on_and_off/1, 
+	 trace_bif_local/1,
 	 trace_bif_timestamp_local/1, trace_bif_return/1, not_run/1,
 	 trace_info_old_code/1]).
 
 -export([bif_process/0]).
 
-all(suite) ->
-    case test_server:is_native(?MODULE) of
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    case test_server:is_native(trace_bif_SUITE) of
 	true -> [not_run];
 	false ->
 	    [trace_bif, trace_bif_timestamp, trace_on_and_off,
-	     trace_bif_local, trace_bif_timestamp_local, 
+	     trace_bif_local, trace_bif_timestamp_local,
 	     trace_bif_return, trace_info_old_code]
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
diff --git a/erts/emulator/test/trace_call_count_SUITE.erl b/erts/emulator/test/trace_call_count_SUITE.erl
index 07aa7c8d8d..55d9b2b288 100644
--- a/erts/emulator/test/trace_call_count_SUITE.erl
+++ b/erts/emulator/test/trace_call_count_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
@@ -42,7 +42,7 @@
 -define(config(A,B),config(A,B)).
 -export([config/2]).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -endif.
  
 -ifdef(debug).
@@ -62,7 +62,9 @@ config(priv_dir,_) ->
     ".".
 -else.
 %% When run in test server.
--export([all/1, init_per_testcase/2, fin_per_testcase/2, not_run/1]).
+-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, not_run/1]).
 -export([basic/1, on_and_off/1, info/1, 
 	 pause_and_restart/1, combo/1]).
 	 
@@ -70,7 +72,7 @@ init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(test_server:seconds(30)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     erlang:trace_pattern({'_','_','_'}, false, [local,meta,call_count]),
     erlang:trace_pattern(on_load, false, [local,meta,call_count]),
     erlang:trace(all, false, [all]),
@@ -78,15 +80,31 @@ fin_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(doc) ->
-    ["Test call count tracing of local function calls."];
-all(suite) ->
-    case test_server:is_native(?MODULE) of
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    case test_server:is_native(trace_call_count_SUITE) of
 	true -> [not_run];
-	false -> [basic, on_and_off, info, 
-		  pause_and_restart, combo]
+	false ->
+	    [basic, on_and_off, info, pause_and_restart, combo]
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
diff --git a/erts/emulator/test/trace_call_time_SUITE.erl b/erts/emulator/test/trace_call_time_SUITE.erl
index 7bc91addde..5dfa87bbee 100644
--- a/erts/emulator/test/trace_call_time_SUITE.erl
+++ b/erts/emulator/test/trace_call_time_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010. All Rights Reserved.
+%% Copyright Ericsson AB 2011. 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
@@ -57,12 +57,15 @@
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% When run in test server.
--export([all/1, init_per_testcase/2, fin_per_testcase/2, not_run/1]).
+-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, not_run/1]).
 -export([basic/1, on_and_off/1, info/1,
-	 pause_and_restart/1, scheduling/1, called_function/1, combo/1, bif/1, nif/1]).
+	 pause_and_restart/1, scheduling/1, called_function/1, combo/1, 
+	 bif/1, nif/1]).
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(test_server:seconds(400)),
@@ -71,7 +74,7 @@ init_per_testcase(_Case, Config) ->
     timer:now_diff(now(),now()),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     erlang:trace_pattern({'_','_','_'}, false, [local,meta,call_time,call_count]),
     erlang:trace_pattern(on_load, false, [local,meta,call_time,call_count]),
     erlang:trace(all, false, [all]),
@@ -79,15 +82,32 @@ fin_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(doc) ->
-    ["Test call count tracing of local function calls."];
-all(suite) ->
-    case test_server:is_native(?MODULE) of
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    case test_server:is_native(trace_call_time_SUITE) of
 	true -> [not_run];
-	false -> [basic, on_and_off, info,
-		  pause_and_restart, scheduling, combo, bif, nif, called_function]
+	false ->
+	    [basic, on_and_off, info, pause_and_restart, scheduling,
+	     combo, bif, nif, called_function]
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 not_run(Config) when is_list(Config) ->
     {skipped,"Native code"}.
 
@@ -407,7 +427,7 @@ nif(Config) when is_list(Config) ->
     ?line 1 = erlang:trace_pattern({?MODULE, nif_dec,  '_'}, true, [call_time]),
     ?line 1 = erlang:trace_pattern({?MODULE, with_nif, '_'}, true, [call_time]),
     ?line Pid = setup(),
-    ?line {L, T1} = execute(Pid, fun() -> with_nif(M) end),
+    ?line {_, T1} = execute(Pid, fun() -> with_nif(M) end),
 
     % the nif is called M - 1 times, the last time the function with 'with_nif'
     % returns ok and does not call the nif.
@@ -486,7 +506,7 @@ with_nif(N) ->
     with_nif(?MODULE:nif_dec(N)).
 
 
-nif_dec(N) -> 0.
+nif_dec(_) -> 0.
 
 dec(N) ->
     loaded(10000),
diff --git a/erts/emulator/test/trace_local_SUITE.erl b/erts/emulator/test/trace_local_SUITE.erl
index 24005774ba..091e960610 100644
--- a/erts/emulator/test/trace_local_SUITE.erl
+++ b/erts/emulator/test/trace_local_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -45,7 +45,7 @@
 -export([config/2]).
 -define(DEFAULT_RECEIVE_TIMEOUT, 1000).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(DEFAULT_RECEIVE_TIMEOUT, infinity).
 -endif.
  
@@ -68,7 +68,8 @@ config(priv_dir,_) ->
 
 %%% When run in test server %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--export([all/1, basic/1, bit_syntax/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, basic/1, bit_syntax/1,
 	 return/1, on_and_off/1, stack_grow/1,info/1, delete/1,
 	 exception/1, exception_apply/1,
 	 exception_function/1, exception_apply_function/1,
@@ -79,34 +80,51 @@ config(priv_dir,_) ->
 	 exception_meta_nocatch/1, exception_meta_nocatch_apply/1,
 	 exception_meta_nocatch_function/1,
 	 exception_meta_nocatch_apply_function/1,
-	 init_per_testcase/2, fin_per_testcase/2]).
+	 init_per_testcase/2, end_per_testcase/2]).
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(test_server:minutes(2)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     shutdown(),
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
-all(doc) ->
-    ["Test tracing of local function calls and return traces."];
-all(suite) ->
-    case test_server:is_native(?MODULE) of
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    case test_server:is_native(trace_local_SUITE) of
 	true -> [not_run];
-	false -> [basic, bit_syntax, return, on_and_off, stack_grow, info, delete,
-		  exception, exception_apply,
-		  exception_function, exception_apply_function,
-		  exception_nocatch, exception_nocatch_apply,
-		  exception_nocatch_function, 
-		  exception_nocatch_apply_function,
-		  exception_meta, exception_meta_apply,
-		  exception_meta_function, exception_meta_apply_function,
-		  exception_meta_nocatch, exception_meta_nocatch_apply,
-		  exception_meta_nocatch_function,
-		  exception_meta_nocatch_apply_function]
+	false ->
+	    [basic, bit_syntax, return, on_and_off, stack_grow,
+	     info, delete, exception, exception_apply,
+	     exception_function, exception_apply_function,
+	     exception_nocatch, exception_nocatch_apply,
+	     exception_nocatch_function,
+	     exception_nocatch_apply_function, exception_meta,
+	     exception_meta_apply, exception_meta_function,
+	     exception_meta_apply_function, exception_meta_nocatch,
+	     exception_meta_nocatch_apply,
+	     exception_meta_nocatch_function,
+	     exception_meta_nocatch_apply_function]
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
@@ -796,9 +814,6 @@ loop(D1,D2,D3,0) ->
 loop(D1,D2,D3,N) ->
     max(N,loop(D1,D2,D3,N-1)).
 
-max(A, B) when A > B -> A;
-max(_, B) -> B.
-
 exported_wrap(Val) ->
     exported(Val).
 
diff --git a/erts/emulator/test/trace_meta_SUITE.erl b/erts/emulator/test/trace_meta_SUITE.erl
index d84cb3cdf2..45987cc319 100644
--- a/erts/emulator/test/trace_meta_SUITE.erl
+++ b/erts/emulator/test/trace_meta_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. 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
@@ -45,7 +45,7 @@
 -define(config(A,B),config(A,B)).
 -export([config/2]).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -endif.
  
 -ifdef(debug).
@@ -65,7 +65,9 @@ config(priv_dir,_) ->
     ".".
 -else.
 %% When run in test server.
--export([all/1, init_per_testcase/2, fin_per_testcase/2, not_run/1]).
+-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, not_run/1]).
 -export([basic/1, return/1, on_and_off/1, stack_grow/1, 
 	 info/1, tracer/1, combo/1, nosilent/1]).
 	 
@@ -73,19 +75,36 @@ init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(test_server:minutes(5)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     shutdown(),
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
-all(doc) ->
-    ["Test meta tracing of local function calls and return trace."];
-all(suite) ->
-    case test_server:is_native(?MODULE) of
-	true -> [not_run];
-	false -> [basic, return, on_and_off, stack_grow, 
-		  info, tracer, combo, nosilent]
-    end.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+case test_server:is_native(trace_meta_SUITE) of
+  true -> [not_run];
+  false ->
+      [basic, return, on_and_off, stack_grow, info, tracer,
+       combo, nosilent]
+end.
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
@@ -594,11 +613,6 @@ loop(D1,D2,D3,0) ->
 loop(D1,D2,D3,N) ->
     max(N,loop(D1,D2,D3,N-1)).
 
-max(A,B) when A > B ->
-    A;
-max(_A,B) ->
-    B.
-
 id(X) ->
     X.
 
diff --git a/erts/emulator/test/trace_nif_SUITE.erl b/erts/emulator/test/trace_nif_SUITE.erl
index 587cc08979..a52ee15e0e 100644
--- a/erts/emulator/test/trace_nif_SUITE.erl
+++ b/erts/emulator/test/trace_nif_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2010. 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
@@ -19,9 +19,10 @@
 
 -module(trace_nif_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([trace_nif/1,
 	 trace_nif_timestamp/1,
 	 trace_nif_local/1,
@@ -32,19 +33,33 @@
 
 -export([nif_process/0, nif/0, nif/1]).
 
-all(suite) ->
-    case test_server:is_native(?MODULE) of
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    case test_server:is_native(trace_nif_SUITE) of
 	true -> [not_run];
 	false ->
-	    [trace_nif,
- 	     trace_nif_timestamp,
-	     trace_nif_local,
-	     trace_nif_meta,
-	     trace_nif_timestamp_local,
- 	     trace_nif_return
-	    ]
+	    [trace_nif, trace_nif_timestamp, trace_nif_local,
+	     trace_nif_meta, trace_nif_timestamp_local,
+	     trace_nif_return]
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
diff --git a/erts/emulator/test/trace_port_SUITE.erl b/erts/emulator/test/trace_port_SUITE.erl
index 5febe177f9..d94fc0aa20 100644
--- a/erts/emulator/test/trace_port_SUITE.erl
+++ b/erts/emulator/test/trace_port_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -20,7 +20,9 @@
 
 -module(trace_port_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 call_trace/1,
 	 return_trace/1,
 	 send/1,
@@ -34,29 +36,42 @@
 	 gc/1,
 	 default_tracer/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
-test_cases() ->
-    [call_trace,
-     return_trace,
-     send,
-     receive_trace,
-     process_events,
-     schedule,
-     fake_schedule,
+test_cases() -> 
+    [call_trace, return_trace, send, receive_trace,
+     process_events, schedule, fake_schedule,
      fake_schedule_after_register,
      fake_schedule_after_getting_linked,
-     fake_schedule_after_getting_unlinked,
-     gc,
+     fake_schedule_after_getting_unlinked, gc,
      default_tracer].
 
-all(suite) -> test_cases().
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_cases().
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog = ?t:timetrap(?t:seconds(30)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
diff --git a/erts/emulator/test/tuple_SUITE.erl b/erts/emulator/test/tuple_SUITE.erl
index c4edb16d68..bfc3910742 100644
--- a/erts/emulator/test/tuple_SUITE.erl
+++ b/erts/emulator/test/tuple_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -17,11 +17,13 @@
 %% %CopyrightEnd%
 %%
 -module(tuple_SUITE).
--export([all/1, t_size/1, t_tuple_size/1, t_element/1, t_setelement/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 t_size/1, t_tuple_size/1, t_element/1, t_setelement/1,
 	 t_list_to_tuple/1, t_tuple_to_list/1,
 	 t_make_tuple_2/1, t_make_tuple_3/1, t_append_element/1,
 	 build_and_match/1, tuple_with_case/1, tuple_in_guard/1]).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Tests tuples and the BIFs:
 %%
@@ -33,13 +35,30 @@
 %% make_tuple/2
 %%
 
-all(suite) ->
-    [build_and_match, t_size, t_tuple_size,
-     t_list_to_tuple, t_tuple_to_list,
-     t_element, t_setelement, t_make_tuple_2,
-     t_make_tuple_3, t_append_element,
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [build_and_match, t_size, t_tuple_size, t_list_to_tuple,
+     t_tuple_to_list, t_element, t_setelement,
+     t_make_tuple_2, t_make_tuple_3, t_append_element,
      tuple_with_case, tuple_in_guard].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 build_and_match(Config) when is_list(Config) ->
     ?line {} = id({}),
     ?line {1} = id({1}),
@@ -80,7 +99,7 @@ t_tuple_size(Config) when is_list(Config) ->
 
 ludicrous_tuple_size(T)
   when tuple_size(T) =:= 16#7777777777777777777777777777777777 -> ok;
-ludicrous_tuple_size(T) -> error.
+ludicrous_tuple_size(_) -> error.
 
 %% Tests element/2.
 
diff --git a/erts/emulator/test/z_SUITE.erl b/erts/emulator/test/z_SUITE.erl
index 67d2b288a2..9637ecd87e 100644
--- a/erts/emulator/test/z_SUITE.erl
+++ b/erts/emulator/test/z_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -29,10 +29,12 @@
 
 %-define(line_trace, 1).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %-compile(export_all).
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([schedulers_alive/1, node_container_refc_check/1,
 	 long_timers/1, pollset_size/1,
@@ -40,19 +42,33 @@
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(5)).
 
-all(doc) -> [];
-all(suite) ->
-    [schedulers_alive,
-     node_container_refc_check,
-     long_timers,
-     pollset_size,
-     check_io_debug].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [schedulers_alive, node_container_refc_check,
+     long_timers, pollset_size, check_io_debug].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
diff --git a/erts/emulator/utils/beam_makeops b/erts/emulator/utils/beam_makeops
index de19a2e35b..e7c57142c0 100755
--- a/erts/emulator/utils/beam_makeops
+++ b/erts/emulator/utils/beam_makeops
@@ -27,6 +27,7 @@ my $outdir = ".";		# Directory for output files.
 my $verbose = 0;
 my $hot = 1;
 my $num_file_opcodes = 0;
+my $wordsize = 32;
 
 # This is shift counts and mask for the packer.
 my $WHOLE_WORD = '';
@@ -36,12 +37,20 @@ my @pack_mask;
 
 $pack_instr[2] = ['6', 'i'];
 $pack_instr[3] = ['0', '0', 'i'];
+$pack_instr[4] = ['6', '6', '6', 'i']; # Only for 64 bit wordsize
 
 $pack_shift[2] = ['0', 'BEAM_LOOSE_SHIFT'];
 $pack_shift[3] = ['0', 'BEAM_TIGHT_SHIFT', '(2*BEAM_TIGHT_SHIFT)'];
+$pack_shift[4] = ['0', 'BEAM_LOOSE_SHIFT', # Only for 64 bit wordsize
+		  '(2*BEAM_LOOSE_SHIFT)',
+		  '(3*BEAM_LOOSE_SHIFT)'];
 
 $pack_mask[2]  = ['BEAM_LOOSE_MASK', $WHOLE_WORD];
 $pack_mask[3]  = ['BEAM_TIGHT_MASK', 'BEAM_TIGHT_MASK', 'BEAM_TIGHT_MASK'];
+$pack_mask[4]  = ['BEAM_LOOSE_MASK', # Only for 64 bit wordsize
+		  'BEAM_LOOSE_MASK',
+		  'BEAM_LOOSE_MASK',
+		  $WHOLE_WORD];
 
 # There are two types of instructions: generic and specific.
 # The generic instructions are those generated by the Beam compiler.
@@ -80,6 +89,8 @@ my %cold_code;
 my @unnumbered_generic;
 my %unnumbered;
 
+my %is_transformed;
+
 #
 # Code transformations.
 #
@@ -118,7 +129,8 @@ my %arg_size = ('r' => 0,	# x(0) - x register zero
 		't' => 1,	# untagged integer -- can be packed
 		'b' => 1,	# pointer to bif
 		'A' => 1,	# arity value
-		'P' => 1,	# byte offset into tuple
+		'P' => 1,	# byte offset into tuple or stack
+		'Q' => 1,	# like 'P', but packable
 		'h' => 1,	# character
 		'l' => 1,	# float reg
 		'q' => 1,	# literal term
@@ -157,6 +169,7 @@ my @tag_type;
     $type_bit{'U'} = $type_bit{'u'};
     $type_bit{'e'} = $type_bit{'u'};
     $type_bit{'P'} = $type_bit{'u'};
+    $type_bit{'Q'} = $type_bit{'u'};
 }
 
 #
@@ -169,6 +182,7 @@ while (@ARGV && $ARGV[0] =~ /^-(.*)/) {
     ($target = \&emulator_output), next if /^emulator/;
     ($target = \&compiler_output), next if /^compiler/;
     ($outdir = shift), next if /^outdir/;
+    ($wordsize = shift), next if /^wordsize/;
     ($verbose = 1), next if /^v/;
     die "$0: Bad option: -$_\n";
 }
@@ -474,8 +488,9 @@ sub emulator_output {
 		$gen_transform_offset{$key} : -1;
 	    my($spec_op) = $gen_to_spec{$key};
 	    my($num_specific) = $num_specific{$key};
-	    defined $spec_op or $tr != -1 or
+	    defined $spec_op or
 		$obsolete[$gen_opnum{$name,$arity}] or
+		$is_transformed{$name,$arity} or
 		error("instruction $key has no specific instruction");
 	    $spec_op = -1 unless defined $spec_op;
 	    &init_item($name, $arity, $spec_op, $num_specific, $tr, $min_window{$key});
@@ -498,12 +513,14 @@ sub emulator_output {
     print "#define NUM_SPECIFIC_OPS ", scalar(@op_to_name), "\n";
     print "\n";
     print "#ifdef ARCH_64\n";
+    print "#  define BEAM_WIDE_MASK 0xFFFFUL\n";
     print "#  define BEAM_LOOSE_MASK 0x1FFFUL\n";
     print "#if HALFWORD_HEAP\n";
     print "#  define BEAM_TIGHT_MASK 0x1FFCUL\n";
     print "#else\n";
     print "#  define BEAM_TIGHT_MASK 0x1FF8UL\n";
     print "#endif\n";
+    print "#  define BEAM_WIDE_SHIFT 32\n";
     print "#  define BEAM_LOOSE_SHIFT 16\n";
     print "#  define BEAM_TIGHT_SHIFT 16\n";
     print "#else\n";
@@ -796,6 +813,7 @@ sub basic_generator {
 		     'I' => 1,
 		     't' => 1,
 		     'P' => 1,
+		     'Q' => 1,
 		     );
 
     # Pick up the macro to use and its flags (if any).
@@ -916,7 +934,18 @@ sub basic_generator {
 	$var_decls .= "BeamInstr tmp_packed2;"
 	    if $macro_code =~ /tmp_packed2/;
 	if ($flags =~ /-nonext/) {
-	    $code = "$macro_code\n";
+	    $code = join("\n",
+			 "{ $var_decls",
+			 $macro_code,
+			 "}");
+	} elsif ($flags =~ /-goto:(\S*)/) {
+	    my $goto = $1;
+	    $code = join("\n",
+			 "{ $var_decls",
+			 $macro_code,
+			 "I += $size + 1;",
+			 "goto $goto;",
+			 "}");
 	} else {
 	    $code = join("\n",
 			 "{ $var_decls",
@@ -935,18 +964,31 @@ sub basic_generator {
 
 sub do_pack {
     my(@args) = @_;
-    my($i);
     my($packable_args) = 0;
+    my @is_packable;		# Packability (boolean) for each argument.
+    my $wide_packing = 0;
 
     #
     # Count the number of packable arguments.  If we encounter any 's' or 'd'
     # arguments, packing is not possible.
     #
-    for ($i = 0; $i < @args; $i++) {
-	if ($args[$i] =~ /[xyt]/) {
+    my $packable_types = "xytQ";
+    foreach my $arg (@args) {
+	if ($arg =~ /^[$packable_types]/) {
 	    $packable_args++;
-	} elsif ($args[$i] =~ /[sd]/) {
+	    push @is_packable, 1;
+	} elsif ($arg =~ /^I/ and $wordsize == 64 and $packable_args < 2) {
+	    $wide_packing = 1;
+	    push @is_packable, 1;
+	    if (++$packable_args == 2) {
+		# We can only pack two arguments. Turn off packing
+		# for the rest of the arguments.
+		$packable_types = "\xFF";
+	    }
+	} elsif ($arg =~ /^[sd]/) {
 	    return ('', '', @args);
+	} else {
+	    push @is_packable, 0;
 	}
     }
 
@@ -962,10 +1004,27 @@ sub do_pack {
 				# beginning).
     my($up) = '';		# Pack commands (storing back while
 				# moving forward).
-    my($args_per_word) = $packable_args < 4 ? $packable_args : 2;
-    my(@shift) = @{$pack_shift[$args_per_word]};
-    my(@mask) = @{$pack_mask[$args_per_word]};
-    my(@pack_instr) = @{$pack_instr[$args_per_word]};
+    my $args_per_word;
+    if ($packable_args < 4 or $wordsize == 64) {
+	$args_per_word = $packable_args;
+    } else {
+	# 4 packable argument, 32 bit wordsize. Need 2 words.
+	$args_per_word = 2;
+    }
+
+    my @shift;
+    my @mask;
+    my @instr;
+
+    if ($wide_packing) {
+	@shift = ('0', 'BEAM_WIDE_SHIFT');
+	@mask = ('BEAM_WIDE_MASK', $WHOLE_WORD);
+	@instr = ('w', 'i');
+    } else {
+	@shift = @{$pack_shift[$args_per_word]};
+	@mask = @{$pack_mask[$args_per_word]};
+	@instr = @{$pack_instr[$args_per_word]};
+    }
 
     #
     # Now generate the packing instructions.  One complication is that
@@ -979,10 +1038,10 @@ sub do_pack {
     my($ap) = 0;		# Argument number within word.
     my($tmpnum) = 1;		# Number of temporary variable.
     my($expr) = '';
-    for ($i = 0; $i < @args; $i++) {
+    for (my $i = 0; $i < @args; $i++) {
 	my($reg) = $args[$i];
 	my($this_size) = $arg_size{$reg};
-	if ($reg =~ /[xyt]/) {
+	if ($is_packable[$i]) {
 	    $this_size = 0;
 	    $did_some_packing = 1;
 
@@ -993,7 +1052,7 @@ sub do_pack {
 		$this_size = 1;
 	    }
 
-	    $down = "$pack_instr[$ap]$down";
+	    $down = "$instr[$ap]$down";
 	    my($unpack) = &make_unpack($tmpnum, $shift[$ap], $mask[$ap]);
 	    $args[$i] = "pack:$this_size:$reg" . "b($unpack)";
 
@@ -1103,6 +1162,10 @@ sub compile_transform {
     if ($obsolete[$gen_opnum{$name,$arity}]) {
 	error("obsolete function must not be used in transformations");
     }
+
+    if ($src) {
+	$is_transformed{$name,$arity} = 1;
+    }
     
     [$name,$arity,@ops];
 }
@@ -1291,13 +1354,28 @@ sub tr_gen_from {
 	    my($var, $type, $type_val, $cond, $val) = @$op;
 
 	    if ($type ne '' && $type ne '*') {
-		my($types) = '';
-		my($type_mask) = 0;
-		foreach (split('', $type)) {
-		    $types .= "$_ ";
-		    $type_mask |= $type_bit{$_};
+		#
+		# The is_bif, is_not_bif, and is_func instructions have
+		# their own built-in type test and don't need to
+		# be guarded with a type test instruction.
+		#
+		unless ($cond eq 'is_bif' or
+			$cond eq 'is_not_bif' or
+			$cond eq 'is_func') {
+		    my($types) = '';
+		    my($type_mask) = 0;
+		    foreach (split('', $type)) {
+			$types .= "$_ ";
+			$type_mask |= $type_bit{$_};
+		    }
+		    if ($cond ne 'is_eq') {
+			push(@code, &make_op($types, 'is_type', $type_mask));
+		    } else {
+			$cond = '';
+			push(@code, &make_op($types, 'is_type_eq',
+					     $type_mask, $val));
+		    }
 		}
-		push(@code, &make_op($types, 'is_type', $type_mask));
 	    }
 
 	    if ($cond eq 'is_func') {
diff --git a/erts/emulator/utils/count b/erts/emulator/utils/count
new file mode 100755
index 0000000000..617f5c25e8
--- /dev/null
+++ b/erts/emulator/utils/count
@@ -0,0 +1,127 @@
+%% -*- erlang -*-
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+
+-mode(compile).
+
+main(_) ->
+    DisDir = "./dis",
+    ok = filelib:ensure_dir(filename:join(DisDir, "dummy")),
+    io:format("Dissambling to ~s\n", [DisDir]),
+    ok = file:set_cwd(DisDir),
+    Path = code:get_path() -- ["."],
+    Beams0 = [filelib:wildcard(filename:join(Dir, "*.beam")) ||
+		 Dir <- Path],
+    Beams = lists:append(Beams0),
+    Mods0 = [list_to_atom(filename:rootname(filename:basename(F))) ||
+	       F <- Beams],
+    Mods = lists:usort(Mods0),
+    start_sem(),
+    Ps = [begin
+	      {_,Ref} = spawn_monitor(fun() -> count(M) end),
+	      Ref
+	  end || M <- Mods],
+    [put(list_to_atom(I), 0) || I <- erts_debug:instructions()],
+    Res = wait_for_all(Ps, 1),
+    OutFile = "count",
+    {ok,Out} = file:open(OutFile, [write]),
+    [io:format(Out, "~s ~p\n", [I,C]) || {I,C} <- Res],
+    ok = file:close(Out),
+    io:format("\nResult written to ~s\n",
+	      [filename:join(DisDir, OutFile)]),
+    ok.
+
+wait_for_all([], _) ->
+    lists:reverse(lists:keysort(2, get()));
+wait_for_all([_|_]=Ps, I) ->
+    receive
+	{'DOWN',Ref,process,_,Result} ->
+	    io:format("\r~p", [I]),
+	    [increment(Key, Count) || {Key,Count} <- Result],
+	    wait_for_all(Ps -- [Ref], I+1)
+    end.
+
+count(M) ->
+    down(),
+    erts_debug:df(M),
+    {ok,Fd} = file:open(atom_to_list(M) ++ ".dis", [read,raw]),
+    count_is(Fd),
+    ok = file:close(Fd),
+    exit(get()).
+
+count_is(Fd) ->
+    case file:read_line(Fd) of
+	{ok,Line} ->
+	    count_instr(Line),
+	    count_is(Fd);
+	eof ->
+	    ok
+    end.
+
+count_instr([$\s|T]) ->
+    count_instr_1(T, []);
+count_instr([_|T]) ->
+    count_instr(T);
+count_instr([]) ->
+    %% Empty line.
+    ok.
+
+count_instr_1([$\s|_], Acc) ->
+    Instr = list_to_atom(lists:reverse(Acc)),
+    increment(Instr, 1);
+count_instr_1([H|T], Acc) ->
+    count_instr_1(T, [H|Acc]).
+
+increment(Key, Inc) -> 
+    case get(Key) of
+	undefined ->
+	    put(Key, Inc);
+	Count ->
+	    put(Key, Count+Inc)
+    end.
+
+%%%
+%%% Counting sempahore to limit the number of processes that
+%%% can run concurrently.
+%%%
+
+down() ->
+    sem ! {down,self()},
+    receive
+	sem_taken -> ok
+    end.
+
+start_sem() ->	    
+    spawn(fun() ->
+		  register(sem, self()),
+		  process_flag(trap_exit, true),
+		  do_sem(erlang:system_info(schedulers)+1) end).
+
+do_sem(0) ->
+    receive
+	{'EXIT',_,_} ->
+	    do_sem(1)
+    end;
+do_sem(C) ->
+    receive
+	{down,Pid} ->
+	    link(Pid),
+	    Pid ! sem_taken,
+	    do_sem(C-1)
+    end.
diff --git a/erts/emulator/utils/loaded b/erts/emulator/utils/loaded
new file mode 100644
index 0000000000..d124a64a78
--- /dev/null
+++ b/erts/emulator/utils/loaded
@@ -0,0 +1,44 @@
+%% -*- erlang -*-
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2011. 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%
+%%
+
+%% Run like:
+%%   $ERL_TOP/bin/escript erts/emulator/utils/loaded
+
+-mode(compile).
+
+main(_) ->
+    LibDir = code:lib_dir(),
+    io:format("Library root is ~s\n", [LibDir]),
+    Wc = filename:join(LibDir, "*/ebin/*.beam"),
+    Beams = filelib:wildcard(Wc),
+    BeamFileSize = lists:sum([filelib:file_size(Beam) || Beam <- Beams]),
+    io:format("~w BEAM files containing ~w bytes\n",
+	      [length(Beams),BeamFileSize]),
+    Ms = [list_to_atom(filename:rootname(filename:basename(Beam))) ||
+	     Beam <- Beams],
+    [{module,_} = code:ensure_loaded(M) || M <- Ms],
+    <<"Current code: ",T/binary>> = erlang:system_info(loaded),
+    Digits = grab_digits(T),
+    io:format("~w modules comprising ~s words when loaded\n",
+	      [length(Ms),Digits]).
+
+grab_digits(<<H,T/binary>>) when $0 =< H, H =< $9 ->
+    [H|grab_digits(T)];
+grab_digits(<<$\n,_/binary>>) -> [].
diff --git a/erts/emulator/zlib/zutil.h b/erts/emulator/zlib/zutil.h
index d560382691..a8872e1c88 100644
--- a/erts/emulator/zlib/zutil.h
+++ b/erts/emulator/zlib/zutil.h
@@ -142,6 +142,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #ifdef WIN32
 #  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
 #    define OS_CODE  0x0b
+#    define F_OPEN(name, mode) _wfopen((WCHAR *)(name), (WCHAR *)(mode)) /* Unicode */
 #  endif
 #endif
 
diff --git a/erts/epmd/src/Makefile.in b/erts/epmd/src/Makefile.in
index 498756b468..2f5296a5e8 100644
--- a/erts/epmd/src/Makefile.in
+++ b/erts/epmd/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1998-2009. All Rights Reserved.
+# Copyright Ericsson AB 1998-2010. 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
@@ -49,15 +49,31 @@ include ../epmd.mk
 
 BINDIR  = $(ERL_TOP)/bin/$(TARGET)
 OBJDIR  = $(ERL_TOP)/erts/obj$(TYPEMARKER)/$(TARGET)
+ERTS_INCL = -I$(ERL_TOP)/erts/include \
+            -I$(ERL_TOP)/erts/include/$(TARGET) \
+            -I$(ERL_TOP)/erts/include/internal \
+            -I$(ERL_TOP)/erts/include/internal/$(TARGET)
+
+# On windows we always need reentrant libraries.
+ifeq ($(TARGET),win32)
+ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal_r$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
+else
+ifeq ($(findstring vxworks,$(TARGET)),vxworks)
+ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
+else
+ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ -lm
+endif
+endif
 
 CC      = @CC@
 WFLAGS  = @WFLAGS@
-CFLAGS  = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) $(WFLAGS)
+CFLAGS  = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) $(WFLAGS) $(ERTS_INCL)
 LD      = @LD@
-LIBS    = @LIBS@
+LIBS    = @LIBS@ $(ERTS_INTERNAL_LIBS)
 LDFLAGS = @LDFLAGS@
 
 
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -90,7 +106,7 @@ EPMD_OBJS = $(OBJDIR)/epmd.o       \
 #---------------------------------
 
 
-all: $(BINDIR)/$(EPMD)
+all: erts_lib $(BINDIR)/$(EPMD)
 
 docs:
 
@@ -109,9 +125,12 @@ clean:
 $(BINDIR)/$(EPMD): $(EPMD_OBJS)
 	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(EPMD_OBJS) $(LIBS)
 
-$(OBJDIR)/%.o: %.c
+$(OBJDIR)/%.o: %.c epmd.h epmd_int.h
 	$(CC) $(CFLAGS) $(EPMD_FLAGS) -o $@ -c $<
 
+erts_lib:
+	cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)
+
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: all
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index c509c49b39..65ff0cd6b2 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -23,6 +23,7 @@
 #endif
 #include "epmd.h"     /* Renamed from 'epmd_r4.h' */
 #include "epmd_int.h"
+#include "erl_printf.h"
 
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
@@ -33,6 +34,7 @@
 static void usage(EpmdVars *);
 static void run_daemon(EpmdVars*);
 static int get_port_no(void);
+static int check_relaxed(void);
 #ifdef __WIN32__
 static int has_console(void);
 #endif
@@ -161,6 +163,7 @@ int main(int argc, char** argv)
 
     g->silent         = 0; 
     g->is_daemon      = 0;
+    g->brutal_kill    = check_relaxed();
     g->packet_timeout = CLOSE_TIMEOUT; /* Default timeout */
     g->delay_accept   = 0;
     g->delay_write    = 0;
@@ -196,6 +199,9 @@ int main(int argc, char** argv)
 	} else if (strcmp(argv[0], "-daemon") == 0) {
 	    g->is_daemon = 1;
 	    argv++; argc--;
+	} else if (strcmp(argv[0], "-relaxed_command_check") == 0) {
+	    g->brutal_kill = 1;
+	    argv++; argc--;
 	} else if (strcmp(argv[0], "-kill") == 0) {
 	    if (argc == 1)
 		kill_epmd(g);
@@ -226,11 +232,17 @@ int main(int argc, char** argv)
 	    else
 		usage(g);
 	    epmd_cleanup_exit(g,0);
+	} else if (strcmp(argv[0], "-stop") == 0) {
+	    if (argc == 2)
+		stop_cli(g, argv[1]);
+	    else
+		usage(g);
+	    epmd_cleanup_exit(g,0);
 	}
 	else
 	    usage(g);
     }
-    dbg_printf(g,0,"epmd running - daemon = %d",g->is_daemon);
+    dbg_printf(g,1,"epmd running - daemon = %d",g->is_daemon);
 
 #ifndef NO_SYSCONF
     if ((g->max_conn = sysconf(_SC_OPEN_MAX)) <= 0)
@@ -382,9 +394,10 @@ static void run_daemon(EpmdVars *g)
 static void usage(EpmdVars *g)
 {
     fprintf(stderr, "usage: epmd [-d|-debug] [DbgExtra...] [-port No] [-daemon]\n");
-    fprintf(stderr, "            [-d|-debug] [-port No] [-names|-kill]\n\n");
-    fprintf(stderr, "See the Erlang epmd manual page for info about the usage.\n");
-    fprintf(stderr, "The -port and DbgExtra options are\n\n");
+    fprintf(stderr, "            [-relaxed_command_check]\n");
+    fprintf(stderr, "       epmd [-d|-debug] [-port No] [-names|-kill|-stop name]\n\n");
+    fprintf(stderr, "See the Erlang epmd manual page for info about the usage.\n\n");
+    fprintf(stderr, "Regular options\n");
     fprintf(stderr, "    -port No\n");
     fprintf(stderr, "        Let epmd listen to another port than default %d\n",
 	    EPMD_PORT_NO);
@@ -394,8 +407,16 @@ static void usage(EpmdVars *g)
     fprintf(stderr, "        the standard error stream. It will shorten\n");
     fprintf(stderr, "        the number of saved used node names to 5.\n\n");
     fprintf(stderr, "        If you give more than one debug flag you may\n");
-    fprintf(stderr, "        get more debugging information.\n\n");
-    fprintf(stderr, "    -packet_timout Seconds\n");
+    fprintf(stderr, "        get more debugging information.\n");
+    fprintf(stderr, "    -daemon\n");
+    fprintf(stderr, "        Start epmd detached (as a daemon)\n");
+    fprintf(stderr, "    -relaxed_command_check\n");
+    fprintf(stderr, "        Allow this instance of epmd to be killed with\n");
+    fprintf(stderr, "        epmd -kill even if there "
+	    "are registered nodes.\n");
+    fprintf(stderr, "        Also allows forced unregister (epmd -stop).\n");
+    fprintf(stderr, "\nDbgExtra options\n");
+    fprintf(stderr, "    -packet_timeout Seconds\n");
     fprintf(stderr, "        Set the number of seconds a connection can be\n");
     fprintf(stderr, "        inactive before epmd times out and closes the\n");
     fprintf(stderr, "        connection (default 60).\n\n");
@@ -407,6 +428,18 @@ static void usage(EpmdVars *g)
     fprintf(stderr, "    -delay_write Seconds\n");
     fprintf(stderr, "        Also a simulation of a busy server. Inserts\n");
     fprintf(stderr, "        a delay before a reply is sent.\n");
+    fprintf(stderr, "\nInteractive options\n");
+    fprintf(stderr, "    -names\n");
+    fprintf(stderr, "        List names registered with the currently "
+	    "running epmd\n");
+    fprintf(stderr, "    -kill\n");
+    fprintf(stderr, "        Kill the currently runniing epmd\n");
+    fprintf(stderr, "        (only allowed if -names show empty database or\n");
+    fprintf(stderr, "        -relaxed_command_check was given when epmd was started).\n");
+    fprintf(stderr, "    -stop Name\n");
+    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");
     epmd_cleanup_exit(g,1);
 }
 
@@ -426,20 +459,20 @@ static void usage(EpmdVars *g)
  *      args...      Arguments to print out according to the format
  *      
  */
-
+#define DEBUG_BUFFER_SIZE 2048
 static void dbg_gen_printf(int onsyslog,int perr,int from_level,
 			   EpmdVars *g,const char *format, va_list args)
 {
   time_t now;
   char *timestr;
-  char buf[2048];
+  char buf[DEBUG_BUFFER_SIZE];
 
   if (g->is_daemon)
     {
 #ifndef NO_SYSLOG
       if (onsyslog)
 	{
-	  vsprintf(buf, format, args);
+	  erts_vsnprintf(buf, DEBUG_BUFFER_SIZE, format, args);
 	  syslog(LOG_ERR,"epmd: %s",buf);
 	}
 #endif
@@ -450,9 +483,10 @@ static void dbg_gen_printf(int onsyslog,int perr,int from_level,
 
       time(&now);
       timestr = (char *)ctime(&now);
-      sprintf(buf, "epmd: %.*s: ", (int) strlen(timestr)-1, timestr);
+      erts_snprintf(buf, DEBUG_BUFFER_SIZE, "epmd: %.*s: ",
+		    (int) strlen(timestr)-1, timestr);
       len = strlen(buf);
-      vsprintf(buf + len, format, args);
+      erts_vsnprintf(buf + len, DEBUG_BUFFER_SIZE - len, format, args);
       if (perr == 1)
 	perror(buf);
       else
@@ -539,4 +573,9 @@ static int get_port_no(void)
     char* port_str = getenv("ERL_EPMD_PORT");
     return (port_str != NULL) ? atoi(port_str) : EPMD_PORT_NO;
 }
+static int check_relaxed(void)
+{
+    char* port_str = getenv("ERL_EPMD_RELAXED_COMMAND_CHECK");
+    return (port_str != NULL) ? 1 : 0;
+}
 
diff --git a/erts/epmd/src/epmd.h b/erts/epmd/src/epmd.h
index 9e939ee38e..5d6e9ac165 100644
--- a/erts/epmd/src/epmd.h
+++ b/erts/epmd/src/epmd.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2010. 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
@@ -17,21 +17,18 @@
  * %CopyrightEnd%
  */
 
-/* The port number is now defined in a makefile */
+/* The port number is defined in a makefile */
 
 /* Definitions of message codes */
 
-#define EPMD_ALIVE_REQ 'a'
-#define EPMD_ALIVE_OK_RESP 'Y'
-#define EPMD_PORT_REQ 'p'
+/* Registration and queries */
+#define EPMD_ALIVE2_REQ 'x'
+#define EPMD_PORT2_REQ 'z'
+#define EPMD_ALIVE2_RESP 'y'
+#define EPMD_PORT2_RESP 'w'
 #define EPMD_NAMES_REQ 'n'
+
+/* Interactive client command codes */
 #define EPMD_DUMP_REQ 'd'
 #define EPMD_KILL_REQ 'k'
 #define EPMD_STOP_REQ 's'
-
-/* New epmd messages */
-
-#define EPMD_ALIVE2_REQ 'x' /* 120 */
-#define EPMD_PORT2_REQ 'z' /* 122 */
-#define EPMD_ALIVE2_RESP 'y' /* 121 */
-#define EPMD_PORT2_RESP 'w' /* 119 */
diff --git a/erts/epmd/src/epmd_cli.c b/erts/epmd/src/epmd_cli.c
index c12f711bc5..7c60ba0420 100644
--- a/erts/epmd/src/epmd_cli.c
+++ b/erts/epmd/src/epmd_cli.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2010. 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
@@ -42,7 +42,47 @@ void kill_epmd(EpmdVars *g)
 	epmd_cleanup_exit(g,1);
     }
     if ((rval = read_fill(fd,buf,2)) == 2) {
-	printf("Killed\n");
+	if (buf[0] == 'O' && buf[1] == 'K') {
+	    printf("Killed\n");
+	} else {
+	    printf("Killing not allowed - living nodes in database.\n");
+	}
+	epmd_cleanup_exit(g,0);
+    } else if (rval < 0) {
+	printf("epmd: failed to read answer from local epmd\n");
+	epmd_cleanup_exit(g,1);
+    } else { 			/* rval is now 0 or 1 */
+	buf[rval] = '\0';
+	printf("epmd: local epmd responded with <%s>\n", buf);
+	epmd_cleanup_exit(g,1);
+    }
+}
+
+void stop_cli(EpmdVars *g, char *name)
+{
+    char buf[1024];
+    int fd, rval, bsize;
+
+    bsize = strlen(name);
+    if (bsize > 1000) {
+	printf("epmd: Name too long!");
+	epmd_cleanup_exit(g, 1);
+    }
+
+    fd = conn_to_epmd(g);
+    bsize++;
+    put_int16(bsize, buf);
+    buf[2] = EPMD_STOP_REQ;
+    bsize += 2;
+    strcpy(buf+3, name);
+
+    if (write(fd, buf, bsize) != bsize) {
+	printf("epmd: Can't write to epmd\n");
+	epmd_cleanup_exit(g,1);
+    }
+    if ((rval = read_fill(fd,buf,7)) == 7) {
+	buf[7] = '\000';
+	printf("%s\n", buf);
 	epmd_cleanup_exit(g,0);
     } else if (rval < 0) {
 	printf("epmd: failed to read answer from local epmd\n");
diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h
index 5ead553f36..c2558d52a1 100644
--- a/erts/epmd/src/epmd_int.h
+++ b/erts/epmd/src/epmd_int.h
@@ -1,3 +1,4 @@
+/* -*- c-indent-level: 2; c-continued-statement-offset: 2 -*- */
 /*
  * %CopyrightBegin%
  *
@@ -245,8 +246,10 @@
 
 typedef struct {
   int fd;			/* File descriptor */
-  unsigned open:1;		/* TRUE if open */
-  unsigned keep:1;		/* Don't close when sent reply */
+  unsigned char open;		/* TRUE if open */
+  unsigned char keep;		/* Don't close when sent reply */
+  unsigned char local_peer;     /* The peer of this connection is via
+                                   loopback interface */
   unsigned got;			/* # of bytes we have got */
   unsigned want;		/* Number of bytes we want */
   char *buf;			/* The remaining buffer */
@@ -286,6 +289,7 @@ typedef struct {
   int debug;
   int silent; 
   int is_daemon;
+  int brutal_kill;
   unsigned packet_timeout;
   unsigned delay_accept;
   unsigned delay_write;
@@ -307,6 +311,7 @@ void epmd_call(EpmdVars*,int);
 void run(EpmdVars*);
 void epmd_cleanup_exit(EpmdVars*, int);
 int epmd_conn_close(EpmdVars*,Connection*);
+void stop_cli(EpmdVars *g, char *name);
 
 #ifdef DONT_USE_MAIN
 int  start_epmd(char *,char *,char *,char *,char *,char *,char *,char *,char *,char *);
diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 34f657fb16..3499ab2934 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -2,7 +2,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2011. 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
@@ -39,46 +39,16 @@
  *  server keeps the socket open where the request for registration was
  *  made.
  *
- *  The protocol is briefly documented in "erl_ext_dist.txt". All requests
- *  to this server are done with a packet
+ *  The protocol is briefly documented in the ERTS User's Guide, see
+ *  http://www.erlang.org/doc/apps/erts/erl_dist_protocol.html
+ *
+ *  All requests to this server are done with a packet
  *
  *      2        n
  *  +--------+---------+
  *  | Length | Request |
  *  +--------+---------+
  *
- *  In all but one case there is only one request for each connection made
- *  to this server so we can safely close the socket after sending the
- *  reply.  The exception is ALIVE_REQ where we keep the connection
- *  open without sending any data. When we receive a "close" this is
- *  an indication that the Erlang node was terminated. The termination
- *  may have been "normal" or caused by a crash. The operating system
- *  ensure that the connection is closed either way.
- *  
- *  Reading is done non-blocking, i.e. we call a "read" only if we are
- *  told by the "select" function that there are data to read.
- *  
- *  Two databases are used: One node database where the registered names
- *  of the nodes are stored, and one connection database where the state
- *  of sockets and the data buffers is stored.
- *  
- *  Incomplete packets are thrown away after a timout. The Erlang node
- *  doing the request is responsible for completing in it in a reasonable time.
- *
- *  Note that if the server gets busy it may not have time to
- *  process all requests for connection. The "accept()" function
- *  will on most operating systems silently refuse to accept more
- *  than 5 outstanding requests. It is the client's responsibility
- *  to retry the request a number of times with random time interval.
- *  The "-debug" flag will insert a delay so you can test this 
- *  behaviour.
- *
- *  FIXME: In this code we assume that the packets we send on each
- *  socket is so small that a "write()" never block
- *
- *  FIXME: We never restarts a read or write that was terminated
- *  by an interrupt. Do we need to?
- *
  */
 
 /* We use separate data structures for node names and connections
@@ -98,7 +68,6 @@ static int conn_open(EpmdVars*,int);
 static int conn_close_fd(EpmdVars*,int);
 
 static void node_init(EpmdVars*);
-static Node *node_reg(EpmdVars*,char*,int,int);
 static Node *node_reg2(EpmdVars*,char*, int, int, unsigned char, unsigned char, int, int, int, char*);
 static int node_unreg(EpmdVars*,char*);
 static int node_unreg_sock(EpmdVars*,int);
@@ -188,8 +157,10 @@ void run(EpmdVars *g)
 
   dbg_printf(g,2,"starting");
 
-  listen(listensock, SOMAXCONN);
-
+  if(listen(listensock, SOMAXCONN) < 0) {
+      dbg_perror(g,"failed to listen on socket");
+      epmd_cleanup_exit(g,1);
+  }
 
   FD_ZERO(&g->orig_read_mask);
   FD_SET(listensock,&g->orig_read_mask);
@@ -303,11 +274,9 @@ static void do_read(EpmdVars *g,Connection *s)
 		 s->fd,val);
 	  dbg_print_buf(g,s->buf,val);
 
-	  /* FIXME: Shouldn't be needed to close down.... */
 	  node_unreg_sock(g,s->fd);
 	  epmd_conn_close(g,s);
 	}
-      /* FIXME: We always close, probably the right thing to do */
       return;
     }
 
@@ -405,6 +374,8 @@ static int do_accept(EpmdVars *g,int listensock)
     return conn_open(g,msgsock);
 }
 
+/* buf is actually one byte larger than bsize,
+   giving place for null termination */
 static void do_request(g, fd, s, buf, bsize)
      EpmdVars *g;
      int fd;
@@ -415,117 +386,23 @@ static void do_request(g, fd, s, buf, bsize)
   char wbuf[OUTBUF_SIZE];	/* Buffer for writing */
   int i;
 
-  /*
-   * Terminate packet as a C string.  Needed for requests received from Erlang
-   * nodes with lower version than R3A.
-   */
-
-  buf[bsize] = '\0';
+  buf[bsize] = '\0'; /* Needed for strcmp in PORT2 and STOP requests
+			buf is always large enough */
 
   switch (*buf)
     {
-    case EPMD_ALIVE_REQ:
-      dbg_printf(g,1,"** got ALIVE_REQ");
-
-      /* The packet has the format "axxyyyyyy" where xx is port, given
-	 in network byte order, and yyyyyy is symname, possibly null
-	 terminated. */
-
-      if (buf[bsize - 1] == '\000') /* Skip null termination */
-	bsize--;
-	
-      if (bsize <= 3)
-	{
-	  dbg_printf(g,0,"packet to small for request ALIVE_REQ (%d)", bsize);
-	  return;
-	}
-
-      for (i = 3; i < bsize; i++)
-	if (buf[i] == '\000')
-	  {
-	    dbg_printf(g,0,"node name contains ascii 0 in ALIVE_REQ");
-	    return;
-	  }
-
-      {
-	Node *node;
-	int eport;
-	char *name  = &buf[3];	/* points to node name */
-
-	eport = get_int16(&buf[1]);
-
-	if ((node = node_reg(g, name, fd, eport)) == NULL)
-	  return;
-
-	wbuf[0] = EPMD_ALIVE_OK_RESP;
-	put_int16(node->creation, wbuf+1);
-  
-	if (g->delay_write)		/* Test of busy server */
-	  sleep(g->delay_write);
-
-	if (reply(g, fd, wbuf, 3) != 3)
-	  {
-	    dbg_tty_printf(g,1,"failed to send ALIVE_OK_RESP for \"%s\"",name);
-	    return;
-	  }
-
-	dbg_tty_printf(g,1,"** sent ALIVE_OK_RESP for \"%s\"",name);
-	s->keep = EPMD_TRUE;		/* Don't close on inactivity */
-      }
-      break;
-
-    case EPMD_PORT_REQ:
-      dbg_printf(g,1,"** got PORT_REQ");
-
-      if (buf[bsize - 1] == '\000') /* Skip null termination */
-	bsize--;
-	
-      if (bsize <= 1)
-	{
-	  dbg_printf(g,0,"packet to small for request PORT_REQ (%d)", bsize);
-	  return;
-	}
-
-      for (i = 1; i < bsize; i++)
-	if (buf[i] == '\000')
-	  {
-	    dbg_printf(g,0,"node name contains ascii 0 in PORT_REQ");
-	    return;
-	  }
-
-      {
-	char *name = &buf[1]; /* Points to node name */
-	Node *node;
-
-	for (node = g->nodes.reg; node; node = node->next)
-	  {
-	    if (strcmp(node->symname, name) == 0)
-	      {
-		put_int16(node->port,wbuf);
-		if (reply(g, fd, wbuf, 2) != 2)
-		  {
-		    dbg_tty_printf(g,1,"failed to send PORT_RESP for %s: %d",
-				   name,node->port);
-		    return;
-		  }
-		dbg_tty_printf(g,1,"** sent PORT_RESP for %s: %d",
-			       name,node->port);
-		return;
-	      }
-	  }
-	dbg_tty_printf(g,1,"Closed on PORT_REQ for %s",name);
-      }
-      /* FIXME: How about an answer if no port? Is a close enough? */
-      break;
-
     case EPMD_ALIVE2_REQ:
       dbg_printf(g,1,"** got ALIVE2_REQ");
+      if (!s->local_peer) {
+	   dbg_printf(g,0,"ALIVE2_REQ from non local address");
+	   return;
+      }
 
       /* The packet has the format "axxyyyyyy" where xx is port, given
 	 in network byte order, and yyyyyy is symname, possibly null
 	 terminated. */
 
-      if (bsize <= 13)
+      if (bsize <= 13) /* at least one character for the node name */
 	{
 	  dbg_printf(g,0,"packet to small for request ALIVE2_REQ (%d)",bsize);
 	  return;
@@ -548,7 +425,17 @@ static void do_request(g, fd, s, buf, bsize)
 	highvsn = get_int16(&buf[5]);
 	lowvsn = get_int16(&buf[7]);
 	namelen = get_int16(&buf[9]);
+	if (namelen + 13 > bsize) {
+	    dbg_printf(g,0,"Node name size error in ALIVE2_REQ");
+	    return;
+	}
 	extralen = get_int16(&buf[11+namelen]);
+
+	if (extralen + namelen + 13 > bsize) {
+	    dbg_printf(g,0,"Extra info size error in ALIVE2_REQ");
+	    return;
+	}
+
 	for (i = 11 ; i < 11 + namelen; i ++)
 	    if (buf[i] == '\000')  {
 		dbg_printf(g,0,"node name contains ascii 0 in ALIVE2_REQ");
@@ -591,7 +478,7 @@ static void do_request(g, fd, s, buf, bsize)
 	
       if (bsize <= 1)
 	{
-	  dbg_printf(g,0,"packet to small for request PORT2_REQ (%d)", bsize);
+	  dbg_printf(g,0,"packet too small for request PORT2_REQ (%d)", bsize);
 	  return;
 	}
 
@@ -679,6 +566,10 @@ static void do_request(g, fd, s, buf, bsize)
 
     case EPMD_DUMP_REQ:
       dbg_printf(g,1,"** got DUMP_REQ");
+      if (!s->local_peer) {
+	   dbg_printf(g,0,"DUMP_REQ from non local address");
+	   return;
+      }
       {
 	Node *node;
 
@@ -728,7 +619,19 @@ static void do_request(g, fd, s, buf, bsize)
       break;
 
     case EPMD_KILL_REQ:
+      if (!s->local_peer) {
+	   dbg_printf(g,0,"KILL_REQ from non local address");
+	   return;
+      }
       dbg_printf(g,1,"** got KILL_REQ");
+
+      if (!g->brutal_kill && (g->nodes.reg != NULL)) {
+	  dbg_printf(g,0,"Disallowed KILL_REQ, live nodes");
+	  if (reply(g, fd,"NO",2) != 2)
+	      dbg_printf(g,0,"failed to send reply to KILL_REQ");
+	  return;
+      }
+
       if (reply(g, fd,"OK",2) != 2)
 	dbg_printf(g,0,"failed to send reply to KILL_REQ");
       dbg_tty_printf(g,1,"epmd killed");
@@ -738,9 +641,18 @@ static void do_request(g, fd, s, buf, bsize)
 
     case EPMD_STOP_REQ:
       dbg_printf(g,1,"** got STOP_REQ");
+      if (!s->local_peer) {
+	   dbg_printf(g,0,"STOP_REQ from non local address");
+	   return;
+      }
+      if (!g->brutal_kill) {
+	  dbg_printf(g,0,"Disallowed STOP_REQ, no relaxed_command_check");
+	  return;
+      }
+
       if (bsize <= 1 )
 	{
-	  dbg_printf(g,0,"packet to small for request STOP_REQ (%d)",bsize);
+	  dbg_printf(g,0,"packet too small for request STOP_REQ (%d)",bsize);
 	  return;
 	}
 
@@ -825,6 +737,14 @@ static int conn_open(EpmdVars *g,int fd)
 
   for (i = 0; i < g->max_conn; i++) {
     if (g->conn[i].open == EPMD_FALSE) {
+      struct sockaddr_in si;
+#ifdef HAVE_SOCKLEN_T
+      socklen_t st;
+#else
+      int st;
+#endif
+      st = sizeof(si);
+
       g->active_conn++;
       s = &g->conn[i];
      
@@ -834,6 +754,20 @@ static int conn_open(EpmdVars *g,int fd)
       s->fd   = fd;
       s->open = EPMD_TRUE;
       s->keep = EPMD_FALSE;
+
+      /* Determine if connection is from localhost */
+      if (getpeername(s->fd,(struct sockaddr*) &si,&st) ||
+	  st < sizeof(si)) {
+	  /* Failure to get peername is regarder as non local host */
+	  s->local_peer = EPMD_FALSE;
+      } else {
+	  s->local_peer =
+	      ((((unsigned) ntohl(si.sin_addr.s_addr)) & 0xFF000000U) ==
+	       0x7F000000U); /* Only 127.x.x.x allowed, no false positives */
+      }
+      dbg_tty_printf(g,2,(s->local_peer) ? "Local peer connected" :
+		     "Non-local peer connected");
+
       s->want = 0;		/* Currently unknown */
       s->got  = 0;
       s->mod_time = current_time(g); /* Note activity */
@@ -902,7 +836,7 @@ static void node_init(EpmdVars *g)
 
 
 /* We have got a close on a connection and it may be a
-   EPMD_ALIVE_CLOSE_REQ. Note that this call shouild be called
+   EPMD_ALIVE_CLOSE_REQ. Note that this call should be called
    *before* calling conn_close() */
 
 static int node_unreg(EpmdVars *g,char *name)
@@ -990,11 +924,6 @@ static int node_unreg_sock(EpmdVars *g,int fd)
  *     Perhaps use the oldest or something.
  */
 
-static Node *node_reg(EpmdVars *g,char *name,int fd, int port)
-{
-    return node_reg2(g, name, fd, port, 0, 0, 0, 0, 0, NULL);
-}
-
 static Node *node_reg2(EpmdVars *g,
 		       char* name,
 		       int fd,
@@ -1020,6 +949,11 @@ static Node *node_reg2(EpmdVars *g,
       dbg_printf(g,0,"node name is too long (%d) %s", strlen(name), name);
       return NULL;
     }
+  if (extralen > MAXSYMLEN)
+    {
+      dbg_printf(g,0,"extra data is too long (%d) %s", strlen(name), name);
+      return NULL;
+    }
 
   /* Fail if it is already registered */
 
diff --git a/erts/epmd/test/epmd.spec b/erts/epmd/test/epmd.spec
index 0e2496bc72..e72272cf94 100644
--- a/erts/epmd/test/epmd.spec
+++ b/erts/epmd/test/epmd.spec
@@ -1 +1 @@
-{topcase, {dir, "../epmd_test"}}.
+{suites,"../epmd_test",all}.
diff --git a/erts/epmd/test/epmd_SUITE.erl b/erts/epmd/test/epmd_SUITE.erl
index 91e09faf75..ec566f817b 100644
--- a/erts/epmd/test/epmd_SUITE.erl
+++ b/erts/epmd/test/epmd_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(epmd_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
 
@@ -35,7 +35,9 @@
 -record(node_info, {port, node_type, prot, lvsn, hvsn, node_name, extra}).
 
 % Test server specific exports
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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(
    [
@@ -63,7 +65,13 @@
     alive_req_too_large/1,
 
     returns_valid_empty_extra/1,
-    returns_valid_populated_extra_with_nulls/1
+    returns_valid_populated_extra_with_nulls/1,
+
+    buffer_overrun_1/1,
+    buffer_overrun_2/1,
+    no_nonlocal_register/1,
+    no_nonlocal_kill/1,
+    no_live_killing/1
    ]).
 
 
@@ -82,11 +90,8 @@
 -define(REG_REPEAT_LIM,1000).
 
 % Message codes in epmd protocol
--define(EPMD_ALIVE_REQ,		$a).
 -define(EPMD_ALIVE2_REQ,	$x).
--define(EPMD_ALIVE_OK_RESP,	$Y).
 -define(EPMD_ALIVE2_RESP,	$y).
--define(EPMD_PORT_REQ,		$p).
 -define(EPMD_PORT_PLEASE2_REQ,	$z).
 -define(EPMD_PORT2_RESP,	$w).
 -define(EPMD_NAMES_REQ,	$n).
@@ -98,45 +103,48 @@
 %% all/1
 %%
 
-all(suite) ->
-    [
-     register_name,
-     register_names_1,
-     register_names_2,
-     register_duplicate_name,
-     get_port_nr,
-     slow_get_port_nr,
-     unregister_others_name_1,
-     unregister_others_name_2,
-     register_overflow,
-     name_with_null_inside,
-     name_null_terminated,
-     stupid_names_req,
-
-     no_data,
-     one_byte,
-     two_bytes,
-     partial_packet,
-     zero_length,
-     too_large,
-     alive_req_too_small_1,
-     alive_req_too_small_2,
-     alive_req_too_large,
-
-     returns_valid_empty_extra,
-     returns_valid_populated_extra_with_nulls
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [register_name, register_names_1, register_names_2,
+     register_duplicate_name, get_port_nr, slow_get_port_nr,
+     unregister_others_name_1, unregister_others_name_2,
+     register_overflow, name_with_null_inside,
+     name_null_terminated, stupid_names_req, no_data,
+     one_byte, two_bytes, partial_packet, zero_length,
+     too_large, alive_req_too_small_1, alive_req_too_small_2,
+     alive_req_too_large, returns_valid_empty_extra,
+     returns_valid_populated_extra_with_nulls,
+     {group, buffer_overrun}, no_nonlocal_register,
+     no_nonlocal_kill, no_live_killing].
+
+groups() -> 
+    [{buffer_overrun, [],
+      [buffer_overrun_1, buffer_overrun_2]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%
 %% Run before and after each test case
 %%
 
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(?SHORT_TEST_TIMEOUT),
+    Dog = test_server:timetrap(?MEDIUM_TEST_TIMEOUT),
     cleanup(),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     cleanup(),
     Dog = ?config(watchdog, Config),
     catch test_server:timetrap_cancel(Dog),	% We may have canceled already
@@ -148,7 +156,7 @@ register_name(doc) ->
     ["Register a name"];
 register_name(suite) ->
     [];
-register_name(Config) when list(Config) ->
+register_name(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = register_node("foobar"),
     ?line ok = close(Sock),			% Unregister
@@ -158,7 +166,7 @@ register_names_1(doc) ->
     ["Register and unregister two nodes"];
 register_names_1(suite) ->
     [];
-register_names_1(Config) when list(Config) ->
+register_names_1(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock1} = register_node("foobar"),
     ?line {ok,Sock2} = register_node("foozap"),
@@ -170,7 +178,7 @@ register_names_2(doc) ->
     ["Register and unregister two nodes"];
 register_names_2(suite) ->
     [];
-register_names_2(Config) when list(Config) ->
+register_names_2(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock1} = register_node("foobar"),
     ?line {ok,Sock2} = register_node("foozap"),
@@ -182,7 +190,7 @@ register_duplicate_name(doc) ->
     ["Two nodes with the same name"];
 register_duplicate_name(suite) ->
     [];
-register_duplicate_name(Config) when list(Config) ->
+register_duplicate_name(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = register_node("foobar"),
     ?line error = register_node("foobar"),
@@ -192,22 +200,9 @@ register_duplicate_name(Config) when list(Config) ->
 % Internal function to register a node name, no close, i.e. unregister
 
 register_node(Name) ->
-    register_node(Name,?DUMMY_PORT).
-
-register_node(Name, Port) ->
-    case send_req([?EPMD_ALIVE_REQ, put16(Port), Name]) of
-	{ok,Sock} ->
-	    case recv(Sock,3) of
-		{ok, [?EPMD_ALIVE_OK_RESP,_D1,_D0]} ->
-		    {ok,Sock};
-		Other ->
-		    test_server:format("recv on sock ~w: ~p~n",
-				       [Sock,Other]),
-		    error
-	    end;
-	error ->
-	    error
-    end.
+    register_node_v2(?DUMMY_PORT,$M,0,5,5,Name,"").
+register_node(Name,Port) ->
+    register_node_v2(Port,$M,0,5,5,Name,"").
 
 register_node_v2(Port, NodeType, Prot, HVsn, LVsn, Name, Extra) ->
     Req = [?EPMD_ALIVE2_REQ, put16(Port), NodeType, Prot,
@@ -254,7 +249,7 @@ parse_port2_resp(Resp) ->
 			    hvsn=HVsn,lvsn=LVsn,
 			    node_name=binary_to_list(NodeName),
 			    extra=binary_to_list(Extra)}};
-	Other ->
+	_Other ->
 	    test_server:format("invalid port2 resp: ~p~n",
 			       [Resp]),
 	    error
@@ -266,7 +261,7 @@ name_with_null_inside(doc) ->
     ["Register a name with a null char in it"];
 name_with_null_inside(suite) ->
     [];
-name_with_null_inside(Config) when list(Config) ->
+name_with_null_inside(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line error = register_node("foo\000bar"),
     ok.
@@ -277,11 +272,9 @@ name_null_terminated(doc) ->
     ["Register a name with terminating null byte"];
 name_null_terminated(suite) ->
     [];
-name_null_terminated(Config) when list(Config) ->
+name_null_terminated(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
-    ?line {ok,Sock} = register_node("foobar\000"),
-    ?line error = register_node("foobar"),
-    ?line ok = close(Sock),			% Unregister
+    ?line error = register_node("foobar\000"),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -290,7 +283,7 @@ stupid_names_req(doc) ->
     ["Read names from epmd in a stupid way"];
 stupid_names_req(suite) ->
     [];
-stupid_names_req(Config) when list(Config) ->
+stupid_names_req(Config) when is_list(Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     LongDog = test_server:timetrap(?MEDIUM_TEST_TIMEOUT),
@@ -394,15 +387,15 @@ get_port_nr(doc) ->
     ["Register a name on a port and ask about port nr"];
 get_port_nr(suite) ->
     [];
-get_port_nr(Config) when list(Config) ->
-    port_request([?EPMD_PORT_REQ,"foo"]).
+get_port_nr(Config) when is_list(Config) ->
+    port_request([?EPMD_PORT_PLEASE2_REQ,"foo"]).
 
 slow_get_port_nr(doc) ->
     ["Register with slow write and ask about port nr"];
 slow_get_port_nr(suite) ->
     [];
-slow_get_port_nr(Config) when list(Config) ->
-    port_request([?EPMD_PORT_REQ,d,$f,d,$o,d,$o]).
+slow_get_port_nr(Config) when is_list(Config) ->
+    port_request([?EPMD_PORT_PLEASE2_REQ,d,$f,d,$o,d,$o]).
 
 
 % Internal function used above
@@ -413,9 +406,18 @@ port_request(M) ->
     ?line {ok,RSock} = register_node("foo", Port),
     ?line {ok,Sock} = connect(),
     ?line ok = send(Sock,[size16(M),M]),
-    R = put16(Port),
-    ?line {ok,R} = recv(Sock, length(R)),
-    ?line ok = close(RSock),
+    ?line case recv_until_sock_closes(Sock) of
+	      {ok, Resp} ->
+		  ?line close(RSock),
+		  ?line {ok,Rec} = parse_port2_resp(Resp),
+		  ?line Port = Rec#node_info.port,
+		  ok;
+	      Other ->
+		  ?line close(RSock),
+		  ?line test_server:format("recv on sock ~w: ~p~n",
+					   [Sock,Other]),
+		  ?line throw({error,Other})
+	  end,
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -424,8 +426,8 @@ unregister_others_name_1(doc) ->
     ["Unregister name of other node"];
 unregister_others_name_1(suite) ->
     [];
-unregister_others_name_1(Config) when list(Config) ->
-    ?line ok = epmdrun(),
+unregister_others_name_1(Config) when is_list(Config) ->
+    ?line ok = epmdrun("-relaxed_command_check"),
     ?line {ok,RSock} = register_node("foo"),
     ?line {ok,Sock} = connect(),
     M = [?EPMD_STOP_REQ,"foo"],
@@ -441,8 +443,8 @@ unregister_others_name_2(doc) ->
     ["Unregister name of other node"];
 unregister_others_name_2(suite) ->
     [];
-unregister_others_name_2(Config) when list(Config) ->
-    ?line ok = epmdrun(),
+unregister_others_name_2(Config) when is_list(Config) ->
+    ?line ok = epmdrun("-relaxed_command_check"),
     ?line {ok,Sock} = connect(),
     M = [?EPMD_STOP_REQ,"xxx42"],
     ?line ok = send(Sock,[size16(M),M]),
@@ -456,7 +458,7 @@ register_overflow(doc) ->
     ["Register too many, clean and redo 10 times"];
 register_overflow(suite) ->
     [];
-register_overflow(Config) when list(Config) ->
+register_overflow(Config) when is_list(Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     LongDog = test_server:timetrap(?LONG_TEST_TIMEOUT),
@@ -546,7 +548,7 @@ no_data(doc) ->
     ["Open but send no data"];
 no_data(suite) ->
     [];
-no_data(Config) when list(Config) ->
+no_data(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = connect(),
     sleep(?LONG_PAUSE),
@@ -559,7 +561,7 @@ one_byte(doc) ->
     ["Send one byte only"];
 one_byte(suite) ->
     [];
-one_byte(Config) when list(Config) ->
+one_byte(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = connect(),
     ?line ok = send(Sock,[0]),
@@ -573,7 +575,7 @@ two_bytes(doc) ->
     ["Send packet size only"];
 two_bytes(suite) ->
     [];
-two_bytes(Config) when list(Config) ->
+two_bytes(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = connect(),
     ?line ok = send(Sock,[put16(3)]),
@@ -587,7 +589,7 @@ partial_packet(doc) ->
     ["Got only part of a packet"];
 partial_packet(suite) ->
     [];
-partial_packet(Config) when list(Config) ->
+partial_packet(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = connect(),
     ?line ok = send(Sock,[put16(100),"only a few bytes"]),
@@ -601,7 +603,7 @@ zero_length(doc) ->
     ["Invalid zero packet size"];
 zero_length(suite) ->
     [];
-zero_length(Config) when list(Config) ->
+zero_length(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = connect(),
     ?line ok = send(Sock,[0,0,0,0,0,0,0,0,0,0]),
@@ -615,15 +617,20 @@ too_large(doc) ->
     ["Invalid large packet"];
 too_large(suite) ->
     [];
-too_large(Config) when list(Config) ->
+too_large(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = connect(),
     Size = 63000,
     M = lists:duplicate(Size, $z),
     ?line ok = send(Sock,[put16(Size),M]),
     sleep(?MEDIUM_PAUSE),
-    ?line closed = recv(Sock,1),
-    ok.
+    % With such a large packet, even the writes can fail as the
+    % daemon closes before everything is delivered -> econnaborted
+    case recv(Sock,1) of
+	closed -> ok;
+	{error,econnaborted} -> ok;
+	Other -> exit({unexpected,Other})
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -631,10 +638,11 @@ alive_req_too_small_1(doc) ->
     ["Try to register but not enough data"];
 alive_req_too_small_1(suite) ->
     [];
-alive_req_too_small_1(Config) when list(Config) ->
+alive_req_too_small_1(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = connect(),
-    M = [?EPMD_ALIVE_REQ, 42],
+    M = [?EPMD_ALIVE2_REQ, put16(?DUMMY_PORT),$M,0, put16(5),
+	 put16(5),put16(0)],
     ?line ok = send(Sock, [size16(M), M]),
     sleep(?MEDIUM_PAUSE),
     ?line closed = recv(Sock,1),
@@ -646,10 +654,11 @@ alive_req_too_small_2(doc) ->
     ["Try to register but not enough data"];
 alive_req_too_small_2(suite) ->
     [];
-alive_req_too_small_2(Config) when list(Config) ->
+alive_req_too_small_2(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = connect(),
-    M = [?EPMD_ALIVE_REQ, put16(?DUMMY_PORT)],
+    M =  [?EPMD_ALIVE2_REQ, put16(?DUMMY_PORT),$M,0, put16(5),
+	  put16(5)],
     ?line ok = send(Sock, [size16(M), M]),
     sleep(?MEDIUM_PAUSE),
     ?line closed = recv(Sock,1),
@@ -661,7 +670,7 @@ alive_req_too_large(doc) ->
     ["Try to register but node name too large"];
 alive_req_too_large(suite) ->
     [];
-alive_req_too_large(Config) when list(Config) ->
+alive_req_too_large(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = connect(),
     L = [
@@ -678,10 +687,12 @@ alive_req_too_large(Config) when list(Config) ->
 	 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
 	 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 	 ],
-    M = [?EPMD_ALIVE_REQ, put16(?DUMMY_PORT), L],
+    S = length(lists:flatten(L)),
+    M = [?EPMD_ALIVE2_REQ, put16(?DUMMY_PORT),$M,0, put16(5),
+	 put16(5), put16(S),L,put16(0)],
     ?line ok = send(Sock, [size16(M), M]),
     sleep(?MEDIUM_PAUSE),
-    ?line closed = recv(Sock,1),
+    ?line {ok,[?EPMD_ALIVE2_RESP,1]} = recv(Sock,2),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -690,7 +701,7 @@ returns_valid_empty_extra(doc) ->
     ["Check that an empty extra is prefixed by a two byte length"];
 returns_valid_empty_extra(suite) ->
     [];
-returns_valid_empty_extra(Config) when list(Config) ->
+returns_valid_empty_extra(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = register_node_v2(4711, 72, 0, 5, 5, "foo", []),
     ?line {ok,#node_info{extra=[]}} = port_please_v2("foo"),
@@ -703,7 +714,7 @@ returns_valid_populated_extra_with_nulls(doc) ->
     ["Check a populated extra with embedded null characters"];
 returns_valid_populated_extra_with_nulls(suite) ->
     [];
-returns_valid_populated_extra_with_nulls(Config) when list(Config) ->
+returns_valid_populated_extra_with_nulls(Config) when is_list(Config) ->
     ?line ok = epmdrun(),
     ?line {ok,Sock} = register_node_v2(4711, 72, 0, 5, 5, "foo", "ABC\000\000"),
     ?line {ok,#node_info{extra="ABC\000\000"}} = port_please_v2("foo"),
@@ -711,6 +722,165 @@ returns_valid_populated_extra_with_nulls(Config) when list(Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+buffer_overrun_1(suite) ->
+    [];
+buffer_overrun_1(doc) ->
+    ["Test security vulnerability in fake extra lengths in alive2_req"];
+buffer_overrun_1(Config) when is_list(Config) ->
+    ?line ok = epmdrun(),
+    ?line true = alltrue([hostile(N) || N <- lists:seq(1,10000)]),
+    ok.
+buffer_overrun_2(suite) ->
+    [];
+buffer_overrun_2(doc) ->
+    ["Test security vulnerability in fake extra lengths in alive2_req"];
+buffer_overrun_2(Config) when is_list(Config) ->
+    ?line ok = epmdrun(),
+    ?line [false | Rest] = [hostile2(N) || N <- lists:seq(255,10000)],
+    ?line true = alltrue(Rest),
+    ok.
+hostile(N) ->
+    try
+	Bin= <<$x:8,4747:16,$M:8,0:8,5:16,5:16,5:16,"gurka",N:16>>,
+	S = size(Bin),
+	{ok,E}=connect_sturdy(),
+	gen_tcp:send(E,[<<S:16>>,Bin]),
+	closed = recv(E,1),
+	gen_tcp:close(E),
+	true
+    catch
+	_:_ ->
+	    false
+    end.
+hostile2(N) ->
+    try
+	B2 = list_to_binary(lists:duplicate(N,255)),
+	Bin= <<$x:8,4747:16,$M:8,0:8,5:16,5:16,5:16,"gurka",N:16,B2/binary>>,
+	S = size(Bin),
+	{ok,E}=connect_sturdy(),
+	gen_tcp:send(E,[<<S:16>>,Bin]),
+	Z = recv(E,2),
+	gen_tcp:close(E),
+	(Z =:= closed) or (Z =:= {ok, [$y,1]})
+    catch
+	_A:_B ->
+	    false
+    end.
+
+alltrue([]) ->
+    true;
+alltrue([true|T]) ->
+    alltrue(T);
+alltrue([_|_]) ->
+    false.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+no_nonlocal_register(suite) ->
+    [];
+no_nonlocal_register(doc) ->
+    ["Ensure that we cannot register throug a nonlocal connection"];
+no_nonlocal_register(Config) when is_list(Config) ->
+    ?line ok = epmdrun(),
+    ?line {ok,Ifs} = inet:getiflist(),
+    ?line Addr0 = [ inet:ifget(I, [addr]) || I <- Ifs ],
+    ?line Addr1 = [ A || {ok,[{addr,A}]} <- Addr0],
+    ?line Addr = lists:filter(fun({127,_,_,_}) ->
+				      false;
+				 (_)  ->
+				      true
+			      end,Addr1),
+    %% Now we should have all non loopback interface addresses,
+    %% none should accept a alive2 registration.
+    ?line Res = lists:map(fun(Ad={A1,A2,A3,A4}) ->
+				  try
+				      Name = "gurka_"++
+				             integer_to_list(A1)++"_"++
+				             integer_to_list(A2)++"_"++
+				             integer_to_list(A3)++"_"++
+				             integer_to_list(A4),
+				      Bname = list_to_binary(Name),
+				      NameS = byte_size(Bname),
+				      ?line Bin= <<$x:8,4747:16,$M:8,0:8,5:16,
+						  5:16,NameS:16,Bname/binary,
+						  0:16>>,
+				      ?line S = size(Bin),
+				      {ok, E} = connect(Ad),
+				      gen_tcp:send(E,[<<S:16>>,Bin]),
+				      closed = recv(E,1),
+				      gen_tcp:close(E),
+				      true
+				  catch
+				      _:_ ->
+					  false
+				  end
+		    end, Addr),
+    erlang:display(Res),
+    ?line true = alltrue(Res),
+    ok.
+
+no_nonlocal_kill(suite) ->
+    [];
+no_nonlocal_kill(doc) ->
+    ["Ensure that we cannot kill through nonlocal connection"];
+no_nonlocal_kill(Config) when is_list(Config) ->
+    ?line ok = epmdrun(),
+    ?line {ok,Ifs} = inet:getiflist(),
+    ?line Addr0 = [ inet:ifget(I, [addr]) || I <- Ifs ],
+    ?line Addr1 = [ A || {ok,[{addr,A}]} <- Addr0],
+    ?line Addr = lists:filter(fun({127,_,_,_}) ->
+				      false;
+				 (_)  ->
+				      true
+			      end,Addr1),
+    %% Now we should have all non loopback interface addresses,
+    %% none should accept a alive2 registration.
+    ?line Res = lists:map(fun(Ad) ->
+				  try
+				      {ok, E} = connect(Ad),
+				      M = [?EPMD_KILL_REQ],
+				      send(E, [size16(M), M]),
+				      closed = recv(E,2),
+				      gen_tcp:close(E),
+				      sleep(?MEDIUM_PAUSE),
+				      {ok, E2} = connect(Ad),
+				      gen_tcp:close(E2),
+				      true
+				  catch
+				      _:_ ->
+					  false
+				  end
+		    end, Addr),
+    erlang:display(Res),
+    ?line true = alltrue(Res),
+    ok.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+no_live_killing(doc) ->
+    ["Dont allow killing with live nodes or any unregistering w/o -relaxed_command_check"];
+no_live_killing(suite) ->
+    [];
+no_live_killing(Config) when is_list(Config) ->
+    ?line ok = epmdrun(),
+    ?line {ok,RSock} = register_node("foo"),
+    ?line {ok,Sock} = connect(),
+    ?line M = [?EPMD_KILL_REQ],
+    ?line ok = send(Sock,[size16(M),M]),
+    ?line {ok,"NO"} = recv(Sock,2),
+    ?line close(Sock),
+    ?line {ok,Sock2} = connect(),
+    ?line M2 = [?EPMD_STOP_REQ,"foo"],
+    ?line ok = send(Sock2,[size16(M2),M2]),
+    ?line closed = recv(Sock2,1),
+    ?line close(Sock2),
+    ?line close(RSock),
+    ?line sleep(?MEDIUM_PAUSE),
+    ?line {ok,Sock3} = connect(),
+    ?line M3 = [?EPMD_KILL_REQ],
+    ?line ok = send(Sock3,[size16(M3),M3]),
+    ?line {ok,"OK"} = recv(Sock3,2),
+    ?line close(Sock3),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Terminate all tests with killing epmd.
 
 cleanup() ->
@@ -731,16 +901,24 @@ cleanup() ->
 % Normal debug start of epmd
 
 epmdrun() ->
+    epmdrun([]).
+epmdrun(Args) ->
     case os:find_executable(epmd) of
 	false ->
 	    {error, {could_not_find_epmd_in_path}};
 	Path ->
-	    epmdrun(Path)
+	    epmdrun(Path,Args)
     end.
 
-epmdrun(Epmd) ->
+epmdrun(Epmd,Args0) ->
   %% test_server:format("epmdrun() => Epmd = ~p",[Epmd]),
-  osrun(Epmd ++ " " ?EPMDARGS " -port " ++ integer_to_list(?PORT)).
+    Args = case Args0 of
+	       [] ->
+		   [];
+	       O ->
+		   " "++O
+	   end,
+  osrun(Epmd ++ Args ++ " " ?EPMDARGS " -port " ++ integer_to_list(?PORT)).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -753,20 +931,27 @@ osrun(Cmd) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Wrappers of TCP functions
 
-% These two functions is the interface for connect.
+% These functions is the interface for connect.
 % Passive mode is the default
 
 connect() ->
-    connect(?PORT, passive).
+    connect("localhost",?PORT, passive).
+
+connect(Addr) ->
+    connect(Addr,?PORT, passive).
 
 connect_active() ->
-    connect(?PORT, active).
+    connect("localhost",?PORT, active).
 
+%% Retry after 15 seconds, to avoid TIME_WAIT socket exhaust.
+connect_sturdy() ->
+    connect("localhost",?PORT, passive, 15000, 3).
 
 % Try a few times before giving up
-
-connect(Port, Mode) ->
-    case connect_repeat(?CONN_RETRY, Port, Mode) of
+connect(Addr, Port, Mode) ->
+    connect(Addr, Port, Mode, ?CONN_SLEEP, ?CONN_RETRY).
+connect(Addr, Port, Mode, Sleep, Retry) ->
+    case connect_repeat(Addr, Retry, Port, Mode, Sleep) of
 	{ok,Sock} ->
 	    {ok,Sock};
 	{error,timeout} ->
@@ -783,25 +968,25 @@ connect(Port, Mode) ->
 % Try a few times before giving up. Pause a small time between
 % each try.
 
-connect_repeat(1, Port, Mode) ->
-    connect_mode(Port, Mode);
-connect_repeat(Retry, Port, Mode) ->
-    case connect_mode(Port, Mode) of
+connect_repeat(Addr, 1, Port, Mode, _Sleep) ->
+    connect_mode(Addr,Port, Mode);
+connect_repeat(Addr,Retry, Port, Mode, Sleep) ->
+    case connect_mode(Addr,Port, Mode) of
 	{ok,Sock} ->
 	    {ok,Sock};
 	{error,Reason} ->
 	    test_server:format("connect: error: ~w~n",[Reason]),
-	    timer:sleep(?CONN_SLEEP),
-	    connect_repeat(Retry - 1, Port, Mode);
+	    timer:sleep(Sleep),
+	    connect_repeat(Addr, Retry - 1, Port, Mode, Sleep);
 	Any ->
 	    test_server:format("connect: unknown message: ~w~n",[Any]),
 	    exit(1)
     end.
 
-connect_mode(Port, active) ->
-    gen_tcp:connect("localhost", Port, [{packet, 0}], ?CONN_TIMEOUT);
-connect_mode(Port, passive) ->
-    gen_tcp:connect("localhost", Port, [{packet, 0}, {active, false}],
+connect_mode(Addr,Port, active) ->
+    gen_tcp:connect(Addr, Port, [{packet, 0}], ?CONN_TIMEOUT);
+connect_mode(Addr, Port, passive) ->
+    gen_tcp:connect(Addr, Port, [{packet, 0}, {active, false}],
 		    ?CONN_TIMEOUT).
 
 
@@ -858,9 +1043,9 @@ send(Sock, SendSpec) ->
 
 send([], RevBytes, _Sock) ->
     {ok,RevBytes};
-send([Byte | Spec], RevBytes, Sock) when integer(Byte) ->
+send([Byte | Spec], RevBytes, Sock) when is_integer(Byte) ->
     send(Spec, [Byte | RevBytes], Sock);
-send([List | Spec], RevBytes, Sock) when list(List) ->
+send([List | Spec], RevBytes, Sock) when is_list(List) ->
     case send(List, RevBytes, Sock) of
 	{ok,Left} ->
 	    send(Spec, Left, Sock);
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index d2a5080c68..4754328c0b 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -98,7 +98,7 @@ endif
 ifeq ($(TARGET),win32)
 ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal_r$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
 else
-ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
+ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ -lm
 endif
 
 # ----------------------------------------------------
@@ -178,7 +178,7 @@ MC_OUTPUTS= \
 	MT_FLAG="-MD"
 endif
 INET_GETHOST = $(BINDIR)/inet_gethost.exe
-INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer.exe $(BINDIR)/dialyzer.exe $(BINDIR)/erlc.exe $(BINDIR)/start_erl.exe $(BINDIR)/escript.exe
+INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer.exe $(BINDIR)/dialyzer.exe $(BINDIR)/erlc.exe $(BINDIR)/start_erl.exe $(BINDIR)/escript.exe $(BINDIR)/ct_run.exe
 INSTALL_SRC = $(WINETC)/start_erl.c $(WINETC)/Nmakefile.start_erl
 ERLEXECDIR=.
 INSTALL_LIBS =
@@ -211,7 +211,7 @@ ERLSRV_OBJECTS=
 MC_OUTPUTS=
 INET_GETHOST = $(BINDIR)/inet_gethost@EXEEXT@
 INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer@EXEEXT@ $(BINDIR)/dialyzer@EXEEXT@ \
- $(BINDIR)/erlc@EXEEXT@ $(BINDIR)/escript@EXEEXT@ \
+ $(BINDIR)/erlc@EXEEXT@ $(BINDIR)/escript@EXEEXT@ $(BINDIR)/ct_run@EXEEXT@ \
  $(BINDIR)/run_erl $(BINDIR)/to_erl $(BINDIR)/dyn_erl
 INSTALL_EMBEDDED_DATA = ../unix/start.src ../unix/start_erl.src
 INSTALL_TOP = Install
@@ -274,6 +274,7 @@ endif
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/dyn_erl.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/safe_string.o	
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/typer.o
+	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/ct_run.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/vxcall.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/erl.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/werl.o
@@ -326,29 +327,36 @@ $(OBJDIR)/$(ERLEXEC).o: $(ERLEXECDIR)/$(ERLEXEC).c
 	$(CC) -I$(EMUDIR) $(CFLAGS) -o $@ -c $(ERLEXECDIR)/$(ERLEXEC).c
 endif
 $(BINDIR)/erlc@EXEEXT@: $(OBJDIR)/erlc.o
-	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/erlc.o -L$(OBJDIR) $(LIBS)
+	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/erlc.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
 $(OBJDIR)/erlc.o: erlc.c
 	$(CC) $(CFLAGS) -o $@ -c erlc.c
 
 $(BINDIR)/dialyzer@EXEEXT@: $(OBJDIR)/dialyzer.o
-	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/dialyzer.o -L$(OBJDIR) $(LIBS)
+	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/dialyzer.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
 $(OBJDIR)/dialyzer.o: dialyzer.c
 	$(CC) $(CFLAGS) -o $@ -c dialyzer.c
 
 $(BINDIR)/typer@EXEEXT@: $(OBJDIR)/typer.o
-	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/typer.o -L$(OBJDIR) $(LIBS)
+	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/typer.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
 $(OBJDIR)/typer.o: typer.c
 	$(CC) $(CFLAGS) -o $@ -c typer.c
 
 $(BINDIR)/escript@EXEEXT@: $(OBJDIR)/escript.o
-	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/escript.o -L$(OBJDIR) $(LIBS)
+	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/escript.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
 $(OBJDIR)/escript.o: escript.c
 	$(CC) $(CFLAGS) -o $@ -c escript.c
 
+$(BINDIR)/ct_run@EXEEXT@: $(OBJDIR)/ct_run.o
+	$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/ct_run.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
+
+$(OBJDIR)/ct_run.o: ct_run.c
+	$(CC) $(CFLAGS) -o $@ -c ct_run.c
+
+
 #------------------------------------------------------------------------
 # Windows specific targets
 # The windows platform is quite different from the others. erl/werl are small C programs
diff --git a/erts/etc/common/ct_run.c b/erts/etc/common/ct_run.c
new file mode 100644
index 0000000000..7aaab716f7
--- /dev/null
+++ b/erts/etc/common/ct_run.c
@@ -0,0 +1,545 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+/*
+ * Purpose: Common Test front-end.
+ */
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "sys.h"
+#ifdef __WIN32__
+#include <winbase.h>
+#endif
+
+#include <ctype.h>
+
+#define NO 0
+#define YES 1
+
+#define ASIZE(a) (sizeof(a)/sizeof(a[0]))
+
+static int debug = 0;		/* Bit flags for debug printouts. */
+
+static char** eargv_base;	/* Base of vector. */
+static char** eargv;		/* First argument for erl. */
+
+static int eargc;		/* Number of arguments in eargv. */
+
+#ifdef __WIN32__
+#  define QUOTE(s) possibly_quote(s)
+#  define IS_DIRSEP(c) ((c) == '/' || (c) == '\\')
+#  define ERL_NAME "erl.exe"
+#else
+#  define QUOTE(s) s
+#  define IS_DIRSEP(c) ((c) == '/')
+#  define ERL_NAME "erl"
+#endif
+
+#define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s)
+#define PUSH(s) eargv[eargc++] = QUOTE(s)
+#define PUSH2(s, t) PUSH(s); PUSH(t)
+#define PUSH3(s, t, u) PUSH2(s, t); PUSH(u)
+#define PUSH4(s, t, u, v) PUSH2(s, t); PUSH2(u, v)
+
+/*
+ * The possible modes to start Common Test
+ */
+
+#define NORMAL_MODE 0
+#define VTS_MODE 1
+#define CT_SHELL_MODE 2
+#define MASTER_MODE 3
+#define ERL_SHELL_MODE 4
+
+/*
+ * Distribution
+ */
+
+#define SHORT_NAME 0
+#define FULL_NAME 1
+
+/*
+ * Local functions.
+ */
+
+static void error(char* format, ...);
+static char* emalloc(size_t size);
+static char* strsave(char* string);
+static void push_words(char* src);
+static int run_erlang(char* name, char** argv);
+static char* get_default_emulator(char* progname);
+static void print_deprecation_warning(char *progname); 
+#ifdef __WIN32__
+static char* possibly_quote(char* arg);
+#endif
+
+/*
+ * Supply a strerror() function if libc doesn't.
+ */
+#ifndef HAVE_STRERROR
+
+extern int sys_nerr;
+
+#ifndef SYS_ERRLIST_DECLARED
+extern const char * const sys_errlist[];
+#endif /* !SYS_ERRLIST_DECLARED */
+
+char *strerror(int errnum)
+{
+  static char *emsg[1024];
+
+  if (errnum != 0) {
+    if (errnum > 0 && errnum < sys_nerr)
+      sprintf((char *) &emsg[0], "(%s)", sys_errlist[errnum]);
+    else
+      sprintf((char *) &emsg[0], "errnum = %d ", errnum);
+  }
+  else {
+    emsg[0] = '\0';
+  }
+  return (char *) &emsg[0];
+}
+#endif /* !HAVE_STRERROR */
+
+int
+main(int argc, char** argv)
+{
+    int eargv_size;
+    int eargc_base;		/* How many arguments in the base of eargv. */
+    char* emulator;
+    char nodename[100];
+    char browser[100];
+    int ct_mode;
+    int dist_mode;
+    int cnt;
+    int erl_args;
+    char** argv0 = argv;
+
+    print_deprecation_warning(argv[0]);
+
+    emulator = get_default_emulator(argv[0]);
+
+    /*
+     * Allocate the argv vector to be used for arguments to Erlang.
+     * Arrange for starting to pushing information in the middle of
+     * the array, to allow easy addition of commands in the beginning.
+     */
+
+    eargv_size = argc*4+100;
+    eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
+    eargv = eargv_base;
+    eargc = 0;
+    push_words(emulator);
+    eargc_base = eargc;
+    eargv = eargv + eargv_size/2;
+    eargc = 0;
+
+    strcpy(nodename, "ct");
+    dist_mode = SHORT_NAME;
+    browser[0] = '\0';
+    ct_mode = NORMAL_MODE;
+    erl_args = argc;
+    cnt = 1;
+
+    /*
+     * Check various flags before building command line
+     */
+
+    while (cnt < argc) {
+	if (strcmp(argv[1], "-erl_args") == 0) {
+	    erl_args = cnt;
+	}
+	else if (strcmp(argv[1], "-sname") == 0) {
+	    strncpy(nodename, argv[2], sizeof(nodename));
+	    nodename[sizeof(nodename)-1] = '\0';
+	    cnt++, argv++;
+	}
+	else if (strcmp(argv[1], "-name") == 0) {
+	    strncpy(nodename, argv[2], sizeof(nodename));
+	    nodename[sizeof(nodename)-1] = '\0';
+	    dist_mode = FULL_NAME;
+	    cnt++, argv++;
+	}
+	else {
+	    if (cnt < erl_args) {
+		if (strcmp(argv[1], "-vts") == 0) {
+		    ct_mode = VTS_MODE;
+		}
+		else if (strcmp(argv[1], "-browser") == 0) {
+		    strncpy(browser, argv[2], sizeof(browser));
+		    browser[sizeof(browser)-1] = '\0';
+		    cnt++, argv++;
+		}
+		else if (strcmp(argv[1], "-shell") == 0) {
+		    ct_mode = CT_SHELL_MODE;
+		}
+		else if (strcmp(argv[1], "-ctmaster") == 0) {
+		    strcpy(nodename, "ct_master");
+		    ct_mode = MASTER_MODE;
+		}
+		else if (strcmp(argv[1], "-ctname") == 0) {
+		    strncpy(nodename, argv[2], sizeof(nodename));
+		    nodename[sizeof(nodename)-1] = '\0';
+		    ct_mode = ERL_SHELL_MODE;
+		    cnt++, argv++;
+		}
+	    }
+	}
+	cnt++, argv++;
+    }
+
+    argv = argv0;
+
+    /*
+     * Push initial arguments.
+     */
+
+    if (dist_mode == FULL_NAME) {
+	PUSH2("-name", nodename);
+    }
+    else {
+	PUSH2("-sname", nodename);
+    }
+
+    /*
+     * Push everything else
+     */
+
+    if (ct_mode == VTS_MODE) {
+	PUSH4("-s", "webtool", "script_start", "vts");
+	if (browser[0] != '\0') PUSH(browser);
+	PUSH3("-s", "ct_run", "script_start");
+    }
+    else if (ct_mode == CT_SHELL_MODE) {
+	PUSH3("-s", "ct_run", "script_start");
+    }
+    else if (ct_mode == NORMAL_MODE) {
+	PUSH3("-s", "ct_run", "script_start");
+	PUSH3("-s", "erlang", "halt");
+    }
+
+    cnt = 1;
+    while (cnt < argc) {
+	if (strcmp(argv[1], "-erl_args") == 0) {
+	    PUSH("-ct_erl_args");
+	}
+	else if ((strcmp(argv[1], "-sname") == 0) || (strcmp(argv[1], "-name") == 0)) {
+	    cnt++, argv++;
+	}
+	else if (cnt < erl_args) {
+	    if (strcmp(argv[1], "-config") == 0)
+		PUSH("-ct_config");
+	    else if (strcmp(argv[1], "-decrypt_key") == 0)
+		PUSH("-ct_decrypt_key");
+	    else if (strcmp(argv[1], "-decrypt_file") == 0)
+		PUSH("-ct_decrypt_file");
+	    else
+		PUSH(argv[1]);
+	}
+	else {
+	    PUSH(argv[1]);
+	}
+	cnt++, argv++;
+    }
+
+    /*
+     * Move up the commands for invoking the emulator and adjust eargv
+     * accordingly.
+     */
+
+    while (--eargc_base >= 0) {
+	UNSHIFT(eargv_base[eargc_base]);
+    }
+
+    /*
+     * Invoke Erlang with the collected options.
+     */
+
+    PUSH(NULL);
+
+    return run_erlang(eargv[0], eargv);
+}
+
+static void
+push_words(char* src)
+{
+    char sbuf[MAXPATHLEN];
+    char* dst;
+
+    dst = sbuf;
+    while ((*dst++ = *src++) != '\0') {
+	if (isspace((int)*src)) {
+	    *dst = '\0';
+	    PUSH(strsave(sbuf));
+	    dst = sbuf;
+	    do {
+		src++;
+	    } while (isspace((int)*src));
+	}
+    }
+    if (sbuf[0])
+	PUSH(strsave(sbuf));
+}
+#ifdef __WIN32__
+char *make_commandline(char **argv)
+{
+    static char *buff = NULL;
+    static int siz = 0;
+    int num = 0;
+    char **arg, *p;
+
+    if (*argv == NULL) {
+	return "";
+    }
+    for (arg = argv; *arg != NULL; ++arg) {
+	num += strlen(*arg)+1;
+    }
+    if (!siz) {
+	siz = num;
+	buff = malloc(siz*sizeof(char));
+    } else if (siz < num) {
+	siz = num;
+	buff = realloc(buff,siz*sizeof(char));
+    }
+    p = buff;
+    for (arg = argv; *arg != NULL; ++arg) {
+	strcpy(p,*arg);
+	p+=strlen(*arg);
+	*p++=' ';
+    }
+    *(--p) = '\0';
+
+    if (debug) {
+	printf("Processed commandline:%s\n",buff);
+    }
+    return buff;
+}
+
+int my_spawnvp(char **argv)
+{
+    STARTUPINFO siStartInfo;
+    PROCESS_INFORMATION piProcInfo;
+    DWORD ec;
+
+    memset(&siStartInfo,0,sizeof(STARTUPINFO));
+    siStartInfo.cb = sizeof(STARTUPINFO);
+    siStartInfo.dwFlags = STARTF_USESTDHANDLES;
+    siStartInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
+    siStartInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+    siStartInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
+    siStartInfo.wShowWindow = SW_HIDE;
+    siStartInfo.dwFlags |= STARTF_USESHOWWINDOW;
+
+
+    if (!CreateProcess(NULL,
+		       make_commandline(argv),
+		       NULL,
+		       NULL,
+		       TRUE,
+		       0,
+		       NULL,
+		       NULL,
+		       &siStartInfo,
+		       &piProcInfo)) {
+	return -1;
+    }
+    CloseHandle(piProcInfo.hThread);
+
+    WaitForSingleObject(piProcInfo.hProcess,INFINITE);
+    if (!GetExitCodeProcess(piProcInfo.hProcess,&ec)) {
+	return 0;
+    }
+    return (int) ec;
+}
+#endif /* __WIN32__ */
+
+
+static int
+run_erlang(char* progname, char** argv)
+{
+#ifdef __WIN32__
+    int status;
+#endif
+
+    if (debug) {
+	int i = 0;
+	while (argv[i] != NULL)
+	    printf(" %s", argv[i++]);
+	printf("\n");
+    }
+
+#ifdef __WIN32__
+    /*
+     * Alas, we must wait here for the program to finish.
+     * Otherwise, the shell from which we were executed will think
+     * we are finished and print a prompt and read keyboard input.
+     */
+
+    status = my_spawnvp(argv)/*_spawnvp(_P_WAIT,progname,argv)*/;
+    if (status == -1) {
+	fprintf(stderr, "ct_run: Error executing '%s': %d", progname,
+		GetLastError());
+    }
+    return status;
+#else
+    execvp(progname, argv);
+    error("Error %d executing \'%s\'.", errno, progname);
+    return 2;
+#endif
+}
+
+static void
+error(char* format, ...)
+{
+    char sbuf[1024];
+    va_list ap;
+
+    va_start(ap, format);
+    erts_vsnprintf(sbuf, sizeof(sbuf), format, ap);
+    va_end(ap);
+    fprintf(stderr, "ct_run: %s\n", sbuf);
+    exit(1);
+}
+
+static char*
+emalloc(size_t size)
+{
+  char *p = malloc(size);
+  if (p == NULL)
+    error("Insufficient memory");
+  return p;
+}
+
+static char*
+strsave(char* string)
+{
+    char* p = emalloc(strlen(string)+1);
+    strcpy(p, string);
+    return p;
+}
+
+/* Instead of making sure basename exists, we do our own */
+static char *simple_basename(char *path)
+{
+    char *ptr;
+    for (ptr = path; *ptr != '\0'; ++ptr) {
+	if (*ptr == '/' || *ptr == '\\') {
+	    path = ptr + 1;
+	}
+    }
+    return path;
+}
+
+static void print_deprecation_warning(char* progpath)
+{
+  char *basename = simple_basename(progpath);
+  if(strcmp(basename,"run_test") == 0 ||
+       strcmp(basename, "run_test.exe") == 0) {
+    printf("---***---\nDeprecated: run_test is deprecated and will be removed in R16B,\n            please use ct_run instead\n---***---\n");
+  }
+}
+
+static char*
+get_default_emulator(char* progname)
+{
+    char sbuf[MAXPATHLEN];
+    char* s;
+
+    if (strlen(progname) >= sizeof(sbuf))
+        return ERL_NAME;
+
+    strcpy(sbuf, progname);
+    for (s = sbuf+strlen(sbuf); s >= sbuf; s--) {
+	if (IS_DIRSEP(*s)) {
+	    strcpy(s+1, ERL_NAME);
+#ifdef __WIN32__
+	    if (_access(sbuf, 0) != -1) {
+		return strsave(sbuf);
+	    }
+#else
+	    if (access(sbuf, 1) != -1) {
+		return strsave(sbuf);
+	    }
+#endif
+	    break;
+	}
+    }
+    return ERL_NAME;
+}
+
+#ifdef __WIN32__
+static char*
+possibly_quote(char* arg)
+{
+    int mustQuote = NO;
+    int n = 0;
+    char* s;
+    char* narg;
+
+    if (arg == NULL) {
+	return arg;
+    }
+
+    /*
+     * Scan the string to find out if it needs quoting and return
+     * the original argument if not.
+     */
+
+    for (s = arg; *s; s++, n++) {
+	switch(*s) {
+	case ' ':
+	    mustQuote = YES;
+	    continue;
+	case '"':
+	    mustQuote = YES;
+	    n++;
+	    continue;
+	case '\\':
+	    if(s[1] == '"')
+		n++;
+	    continue;
+	default:
+	    continue;
+	}
+    }
+    if (!mustQuote) {
+	return arg;
+    }
+
+    /*
+     * Insert the quotes and put a backslash in front of every quote
+     * inside the string.
+     */
+
+    s = narg = emalloc(n+2+1);
+    for (*s++ = '"'; *arg; arg++, s++) {
+	if (*arg == '"' || (*arg == '\\' && arg[1] == '"')) {
+	    *s++ = '\\';
+	}
+	*s = *arg;
+    }
+    if (s[-1] == '\\') {
+	*s++ ='\\';
+    }
+    *s++ = '"';
+    *s = '\0';
+    return narg;
+}
+#endif /* __WIN32__ */
diff --git a/erts/etc/common/dialyzer.c b/erts/etc/common/dialyzer.c
index 4b4c1124f1..4453e63f1c 100644
--- a/erts/etc/common/dialyzer.c
+++ b/erts/etc/common/dialyzer.c
@@ -147,6 +147,9 @@ main(int argc, char** argv)
     env = get_env("DIALYZER_EMULATOR");
     emulator = env ? env : get_default_emulator(argv[0]);
 
+    if (strlen(emulator) >= MAXPATHLEN)
+        error("Value of environment variable DIALYZER_EMULATOR is too large");
+
     /*
      * Allocate the argv vector to be used for arguments to Erlang.
      * Arrange for starting to pushing information in the middle of
@@ -228,7 +231,7 @@ main(int argc, char** argv)
 static void
 push_words(char* src)
 {
-    char sbuf[1024];
+    char sbuf[MAXPATHLEN];
     char* dst;
 
     dst = sbuf;
@@ -360,7 +363,7 @@ error(char* format, ...)
     va_list ap;
     
     va_start(ap, format);
-    vsprintf(sbuf, format, ap);
+    erts_vsnprintf(sbuf, sizeof(sbuf), format, ap);
     va_end(ap);
     fprintf(stderr, "dialyzer: %s\n", sbuf);
     exit(1);
@@ -389,6 +392,9 @@ get_default_emulator(char* progname)
     char sbuf[MAXPATHLEN];
     char* s;
 
+    if (strlen(progname) >= sizeof(sbuf))
+        return ERL_NAME;
+
     strcpy(sbuf, progname);
     for (s = sbuf+strlen(sbuf); s >= sbuf; s--) {
 	if (IS_DIRSEP(*s)) {
diff --git a/erts/etc/common/erlc.c b/erts/etc/common/erlc.c
index 09aca19e6c..35c360a99d 100644
--- a/erts/etc/common/erlc.c
+++ b/erts/etc/common/erlc.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1997-2010. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2011. 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
@@ -28,6 +28,7 @@
 #include <winbase.h>
 /* FIXE ME config_win32.h? */
 #define HAVE_STRERROR 1
+#define snprintf _snprintf
 #endif
 
 #include <ctype.h>
@@ -148,10 +149,6 @@ int
 main(int argc, char** argv)
 {
     char cwd[MAXPATHLEN];	/* Current working directory. */
-    char** rpc_eargv;		/* Pointer to the beginning of arguments
-				 * if calling a running Erlang system
-				 * via erl_rpc().
-				 */
     int eargv_size;
     int eargc_base;		/* How many arguments in the base of eargv. */
     char* emulator;
@@ -160,6 +157,9 @@ main(int argc, char** argv)
     env = get_env("ERLC_EMULATOR");
     emulator = env ? env : get_default_emulator(argv[0]);
 
+    if (strlen(emulator) >= MAXPATHLEN)
+        error("Value of environment variable ERLC_EMULATOR is too large");
+
     /*
      * Allocate the argv vector to be used for arguments to Erlang.
      * Arrange for starting to pushing information in the middle of
@@ -170,7 +170,7 @@ main(int argc, char** argv)
      * base of the eargv vector, and move it up later.
      */
 
-    eargv_size = argc*4+100;
+    eargv_size = argc*6+100;
     eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
     eargv = eargv_base;
     eargc = 0;
@@ -189,7 +189,6 @@ main(int argc, char** argv)
     PUSH2("-mode", "minimal");
     PUSH2("-boot", "start_clean");
     PUSH3("-s", "erl_compile", "compile_cmdline");
-    rpc_eargv = eargv+eargc;
 
     /*
      * Push standard arguments to Erlang.
@@ -262,6 +261,95 @@ main(int argc, char** argv)
 	    case 'I':
 		PUSH2("@i", process_opt(&argc, &argv, 0));
 		break;
+	    case 'M':
+		{
+		    char *buf, *key, *val;
+		    size_t buf_len;
+
+		    if (argv[1][2] == '\0') { /* -M */
+			/* Push the following options:
+			 *   o  'makedep'
+			 *   o  {makedep_output, standard_io}
+			 */
+			buf = strsave("makedep");
+			PUSH2("@option", buf);
+
+			key = "makedep_output";
+			val = "standard_io";
+			buf_len = 1 + strlen(key) + 1 + strlen(val) + 1 + 1;
+			buf = emalloc(buf_len);
+			snprintf(buf, buf_len, "{%s,%s}", key, val);
+			PUSH2("@option", buf);
+		    } else if (argv[1][3] == '\0') {
+			switch(argv[1][2]) {
+			case 'D': /* -MD */
+			    /* Push the following options:
+			     *   o  'makedep'
+			     */
+			    buf = strsave("makedep");
+			    PUSH2("@option", buf);
+			    break;
+			case 'F': /* -MF <file> */
+			    /* Push the following options:
+			     *   o  'makedep'
+			     *   o  {makedep_output, <file>}
+			     */
+			    buf = strsave("makedep");
+			    PUSH2("@option", buf);
+
+			    key = "makedep_output";
+			    val = process_opt(&argc, &argv, 1);
+			    buf_len = 1 + strlen(key) + 2 + strlen(val) + 2 + 1;
+			    buf = emalloc(buf_len);
+			    snprintf(buf, buf_len, "{%s,\"%s\"}", key, val);
+			    PUSH2("@option", buf);
+			    break;
+			case 'T': /* -MT <target> */
+			    /* Push the following options:
+			     *   o  {makedep_target, <target>}
+			     */
+			    key = "makedep_target";
+			    val = process_opt(&argc, &argv, 1);
+			    buf_len = 1 + strlen(key) + 2 + strlen(val) + 2 + 1;
+			    buf = emalloc(buf_len);
+			    snprintf(buf, buf_len, "{%s,\"%s\"}", key, val);
+			    PUSH2("@option", buf);
+			    break;
+			case 'Q': /* -MQ <target> */
+			    /* Push the following options:
+			     *   o  {makedep_target, <target>}
+			     *   o  makedep_quote_target
+			     */
+			    key = "makedep_target";
+			    val = process_opt(&argc, &argv, 1);
+			    buf_len = 1 + strlen(key) + 2 + strlen(val) + 2 + 1;
+			    buf = emalloc(buf_len);
+			    snprintf(buf, buf_len, "{%s,\"%s\"}", key, val);
+			    PUSH2("@option", buf);
+
+			    buf = strsave("makedep_quote_target");
+			    PUSH2("@option", buf);
+			    break;
+			case 'G': /* -MG */
+			    /* Push the following options:
+			     *   o  makedep_add_missing
+			     */
+			    buf = strsave("makedep_add_missing");
+			    PUSH2("@option", buf);
+			    break;
+			case 'P': /* -MP */
+			    /* Push the following options:
+			     *   o  makedep_phony
+			     */
+			    buf = strsave("makedep_add_missing");
+			    PUSH2("@option", buf);
+			    break;
+			default:
+			    goto error;
+			}
+		    }
+		}
+		break;
 	    case 'o':
 		PUSH2("@outdir", process_opt(&argc, &argv, 0));
 		break;
@@ -419,7 +507,7 @@ process_opt(int* pArgc, char*** pArgv, int offset)
 static void
 push_words(char* src)
 {
-    char sbuf[1024];
+    char sbuf[MAXPATHLEN];
     char* dst;
 
     dst = sbuf;
@@ -563,6 +651,15 @@ usage(void)
 	{"-hybrid", "compile using hybrid-heap emulator"},
 	{"-help", "shows this help text"},
 	{"-I path", "where to search for include files"},
+	{"-M", "generate a rule for make(1) describing the dependencies"},
+	{"-MF file", "write the dependencies to 'file'"},
+	{"-MT target", "change the target of the rule emitted by dependency "
+		"generation"},
+	{"-MQ target", "same as -MT but quote characters special to make(1)"},
+	{"-MG", "consider missing headers as generated files and add them to "
+		"the dependencies"},
+	{"-MP", "add a phony target for each dependency"},
+	{"-MD", "same as -M -MT file (with default 'file')"},
 	{"-o name", "name output directory or file"},
 	{"-pa path", "add path to the front of Erlang's code path"},
 	{"-pz path", "add path to the end of Erlang's code path"},
@@ -595,7 +692,7 @@ error(char* format, ...)
     va_list ap;
     
     va_start(ap, format);
-    vsprintf(sbuf, format, ap);
+    erts_vsnprintf(sbuf, sizeof(sbuf), format, ap);
     va_end(ap);
     fprintf(stderr, "erlc: %s\n", sbuf);
     exit(1);
@@ -624,6 +721,9 @@ get_default_emulator(char* progname)
     char sbuf[MAXPATHLEN];
     char* s;
 
+    if (strlen(progname) >= sizeof(sbuf))
+        return ERL_NAME;
+
     strcpy(sbuf, progname);
     for (s = sbuf+strlen(sbuf); s >= sbuf; s--) {
 	if (IS_DIRSEP(*s)) {
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index f79f5cc978..60b3af7db7 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -120,6 +120,7 @@ static char *plusM_other_switches[] = {
 static char *pluss_val_switches[] = {
     "bt",
     "ct",
+    "wt",
     "ss",
     NULL
 };
@@ -131,6 +132,18 @@ static char *plush_val_switches[] = {
     NULL
 };
 
+/* +r arguments with values */
+static char *plusr_val_switches[] = {
+    "g",
+    NULL
+};
+
+/* +z arguments with values */
+static char *plusz_val_switches[] = {
+    "dbbl",
+    NULL
+};
+
 
 /*
  * Define sleep(seconds) in terms of Sleep() on Windows.
@@ -302,7 +315,7 @@ free_env_val(char *value)
 }
 
 /*
- * Add the arcitecture suffix to the program name if needed,
+ * Add the architecture suffix to the program name if needed,
  * except on Windows, where we insert it just before ".DLL".
  */
 static char*
@@ -553,7 +566,7 @@ int main(int argc, char **argv)
 	    usage("+MYm");
     }
     emu = add_extra_suffixes(emu, emu_type);
-    sprintf(tmpStr, "%s" DIRSEP "%s" BINARY_EXT, bindir, emu);
+    erts_snprintf(tmpStr, sizeof(tmpStr), "%s" DIRSEP "%s" BINARY_EXT, bindir, emu);
     emu = strsave(tmpStr);
 
     add_Eargs(emu);		/* Will be argv[0] -- necessary! */
@@ -564,12 +577,12 @@ int main(int argc, char **argv)
 
     s = get_env("PATH");
     if (!s) {
-	sprintf(tmpStr, "%s" PATHSEP "%s" DIRSEP "bin", bindir, rootdir);
+	erts_snprintf(tmpStr, sizeof(tmpStr), "%s" PATHSEP "%s" DIRSEP "bin", bindir, rootdir);
     } else if (strstr(s, bindir) == NULL) {
-	sprintf(tmpStr, "%s" PATHSEP "%s" DIRSEP "bin" PATHSEP "%s", bindir, 
+	erts_snprintf(tmpStr, sizeof(tmpStr), "%s" PATHSEP "%s" DIRSEP "bin" PATHSEP "%s", bindir,
 		rootdir, s);
     } else {
-	sprintf(tmpStr, "%s", s);
+	erts_snprintf(tmpStr, sizeof(tmpStr), "%s", s);
     }
     free_env_val(s);
     set_env("PATH", tmpStr);
@@ -707,7 +720,7 @@ int main(int argc, char **argv)
 			error("-man not supported on Windows");
 #else
 			argv[i] = "man";
-			sprintf(tmpStr, "%s/man", rootdir);
+			erts_snprintf(tmpStr, sizeof(tmpStr), "%s/man", rootdir);
 			set_env("MANPATH", tmpStr);
 			execvp("man", argv+i);
 			error("Could not execute the 'man' command.");
@@ -872,6 +885,21 @@ int main(int argc, char **argv)
 			  i++;
 		      }
 		      break;
+		  case 'r':
+		      if (!is_one_of_strings(&argv[i][2],
+					     plusr_val_switches))
+			  goto the_default;
+		      else {
+			  if (i+1 >= argc
+			      || argv[i+1][0] == '-'
+			      || argv[i+1][0] == '+')
+			      usage(argv[i]);
+			  argv[i][0] = '-';
+			  add_Eargs(argv[i]);
+			  add_Eargs(argv[i+1]);
+			  i++;
+		      }
+		      break;
 		  case 's':
 		      if (!is_one_of_strings(&argv[i][2],
 					     pluss_val_switches))
@@ -887,6 +915,20 @@ int main(int argc, char **argv)
 			  i++;
 		      }
 		      break;
+		  case 'z':
+		      if (!is_one_of_strings(&argv[i][2], plusz_val_switches)) {
+			  goto the_default;
+		      } else {
+			  if (i+1 >= argc
+			      || argv[i+1][0] == '-'
+			      || argv[i+1][0] == '+')
+			      usage(argv[i]);
+			  argv[i][0] = '-';
+			  add_Eargs(argv[i]);
+			  add_Eargs(argv[i+1]);
+			  i++;
+		      }
+		      break;
 		  default:
 		  the_default:
 		    argv[i][0] = '-'; /* Change +option to -option. */
@@ -1069,11 +1111,12 @@ usage_aux(void)
 	  "[-hybrid] "
 #endif
 	  "[-make] [-man [manopts] MANPAGE] [-x] [-emu_args] "
-	  "[-args_file FILENAME] "
-	  "[+A THREADS] [+a SIZE] [+B[c|d|i]] [+c] [+h HEAP_SIZE_OPTION] [+K BOOLEAN] "
+	  "[-args_file FILENAME] [+A THREADS] [+a SIZE] [+B[c|d|i]] [+c] "
+	  "[+h HEAP_SIZE_OPTION] [+K BOOLEAN] "
 	  "[+l] [+M<SUBSWITCH> <ARGUMENT>] [+P MAX_PROCS] [+R COMPAT_REL] "
-	  "[+r] [+s SCHEDULER_OPTION] [+S NO_SCHEDULERS:NO_SCHEDULERS_ONLINE] [+T LEVEL] [+V] [+v] [+W<i|w>] "
-	  "[args ...]\n");
+	  "[+r] [+rg READER_GROUPS_LIMIT] [+s SCHEDULER_OPTION] "
+	  "[+S NO_SCHEDULERS:NO_SCHEDULERS_ONLINE] [+T LEVEL] [+V] [+v] "
+	  "[+W<i|w>] [+z MISC_OPTION] [args ...]\n");
   exit(1);
 }
 
@@ -1122,10 +1165,10 @@ start_epmd(char *epmd)
     if (!epmd) {
 	epmd = epmd_cmd;
 #ifdef __WIN32__
-	sprintf(epmd_cmd, "%s" DIRSEP "epmd", bindir);
+	erts_snprintf(epmd_cmd, sizeof(epmd_cmd), "%s" DIRSEP "epmd", bindir);
 	arg1 = "-daemon";
 #else
-	sprintf(epmd_cmd, "%s" DIRSEP "epmd -daemon", bindir);
+	erts_snprintf(epmd_cmd, sizeof(epmd_cmd), "%s" DIRSEP "epmd -daemon", bindir);
 #endif
     } 
 #ifdef __WIN32__
@@ -1201,7 +1244,7 @@ void error(char* format, ...)
     va_list ap;
 
     va_start(ap, format);
-    vsprintf(sbuf, format, ap);
+    erts_vsnprintf(sbuf, sizeof(sbuf), format, ap);
     va_end(ap);
     fprintf(stderr, "erlexec: %s\n", sbuf);
     exit(1);
@@ -1281,14 +1324,14 @@ static void get_start_erl_data(char *file)
     if (env)
 	reldir = strsave(env);
     else {
-	sprintf(tmpbuffer, "%s/releases", rootdir);
+	erts_snprintf(tmpbuffer, sizeof(tmpbuffer), "%s/releases", rootdir);
 	reldir = strsave(tmpbuffer);
     }
     free_env_val(env);
     if (file == NULL)
-       sprintf(start_erl_data, "%s/start_erl.data", reldir);
+       erts_snprintf(start_erl_data, sizeof(start_erl_data), "%s/start_erl.data", reldir);
     else
-       sprintf(start_erl_data, "%s", file);
+       erts_snprintf(start_erl_data, sizeof(start_erl_data), "%s", file);
     fp = _open(start_erl_data, _O_RDONLY );
     if( fp == -1 )
 	error( "open failed on %s",start_erl_data );
@@ -1318,16 +1361,16 @@ static void get_start_erl_data(char *file)
     }
 	
     bindir = emalloc(512);
-    sprintf(bindir,"%s/erts-%s/bin",rootdir,tmpbuffer);
+    erts_snprintf(bindir,512,"%s/erts-%s/bin",rootdir,tmpbuffer);
     /* BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin */
     tprogname = progname;
     progname = emalloc(strlen(tprogname) + 20);
-    sprintf(progname,"%s -start_erl",tprogname);
+    erts_snprintf(progname,strlen(tprogname) + 20,"%s -start_erl",tprogname);
 
     boot_script = emalloc(512);
     config_script = emalloc(512);
-    sprintf(boot_script, "%s/%s/start", reldir, otpstring);
-    sprintf(config_script, "%s/%s/sys", reldir, otpstring);
+    erts_snprintf(boot_script, 512, "%s/%s/start", reldir, otpstring);
+    erts_snprintf(config_script, 512, "%s/%s/sys", reldir, otpstring);
        
 }
 
@@ -1335,7 +1378,7 @@ static void get_start_erl_data(char *file)
 static char *replace_filename(char *path, char *new_base) 
 {
     int plen = strlen(path);
-    char *res = malloc((plen+strlen(new_base)+1)*sizeof(char));
+    char *res = emalloc((plen+strlen(new_base)+1)*sizeof(char));
     char *p;
 
     strcpy(res,path);
@@ -1350,7 +1393,7 @@ static char *path_massage(char *long_path)
 {
      char *p;
 
-     p = malloc(MAX_PATH+1);
+     p = emalloc(MAX_PATH+1);
      strcpy(p, long_path);
      GetShortPathName(p, p, MAX_PATH);
      return p;
@@ -1486,7 +1529,8 @@ get_parameters(int argc, char** argv)
 	/* Determine bindir from absolute path to executable */
 	char *p;
 	char buffer[PATH_MAX];
-	strcpy(buffer, argv[0]);
+	strncpy(buffer, argv[0], sizeof(buffer));
+	buffer[sizeof(buffer)-1] = '\0';
 	
 	for (p = buffer+strlen(buffer)-1 ; p >= buffer && *p != '/'; --p)
 	    ;
@@ -1499,7 +1543,8 @@ get_parameters(int argc, char** argv)
 	/* Determine rootdir from absolute path to bindir */
 	char *p;
 	char buffer[PATH_MAX];
-	strcpy(buffer, bindir);
+	strncpy(buffer, bindir, sizeof(buffer));
+	buffer[sizeof(buffer)-1] = '\0';
 	
 	for (p = buffer+strlen(buffer)-1; p >= buffer && *p != '/'; --p)
 	    ;
diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index 1bc5eb7651..6ed79c91e3 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -151,6 +151,9 @@ find_prog(char *origpath)
     char relpath[PMAX];
     char abspath[PMAX];
 
+    if (strlen(origpath) >= sizeof(relpath))
+        error("Path too long");
+
     strcpy(relpath, origpath);
 
     if (strstr(relpath, DIRSEPSTR) == NULL) {
@@ -180,19 +183,21 @@ find_prog(char *origpath)
                 end = strstr(beg, PATHSEPSTR);
                 if (end != NULL) {
                     sz = end - beg;
-                    strncpy(dir, beg, sz);
-                    dir[sz] = '\0';
                 } else {
                     sz = strlen(beg);
-                    strcpy(dir, beg);
                     look_for_sep = FALSE;
                 }
+                if (sz >= sizeof(dir)) {
+                    beg = end + 1;
+                    continue;
+                }
+                strncpy(dir, beg, sz);
+                dir[sz] = '\0';
                 beg = end + 1;
 
 #ifdef __WIN32__
-		strcpy(wildcard, dir);
-		strcat(wildcard, DIRSEPSTR);
-		strcat(wildcard, relpath); /* basename */
+		erts_snprintf(wildcard, sizeof(wildcard), "%s" DIRSEPSTR "%s",
+            dir, relpath /* basename */);
 		dir_handle = FindFirstFile(wildcard, &find_data);
 		if (dir_handle == INVALID_HANDLE_VALUE) {
 		    /* Try next directory in path */
@@ -217,9 +222,8 @@ find_prog(char *origpath)
 
                         if (strcmp(origpath, dirp->d_name) == 0) {
                             /* Wow we found the executable. */
-                            strcpy(relpath, dir);
-                            strcat(relpath, DIRSEPSTR);
-                            strcat(relpath, dirp->d_name);
+                            erts_snprintf(relpath, sizeof(relpath), "%s" DIRSEPSTR "%s",
+                                dir, dirp->d_name);
                             closedir(dp);
 			    look_for_sep = FALSE;
                             break;
@@ -291,7 +295,7 @@ append_shebang_args(char* scriptname)
 		    
 		    /* Find end of arg */
 		    end = beg;
-		    while (end && end[0] != ' ') {
+		    while (end && end < (linebuf+LINEBUFSZ-1) && end[0] != ' ') {
 			if (end[0] == '\n') {
 			    newline = TRUE;
 			    end[0]= '\0';
@@ -335,13 +339,16 @@ main(int argc, char** argv)
 	emulator = get_default_emulator(argv[0]);
     }
 
+    if (strlen(emulator) >= PMAX)
+        error("Value of environment variable ESCRIPT_EMULATOR is too large");
+
     /*
      * Allocate the argv vector to be used for arguments to Erlang.
      * Arrange for starting to pushing information in the middle of
      * the array, to allow easy addition of commands in the beginning.
      */
 
-    eargv_size = argc*4+1000;
+    eargv_size = argc*4+1000+LINEBUFSZ/2;
     eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
     eargv = eargv_base;
     eargc = 0;
@@ -387,7 +394,8 @@ main(int argc, char** argv)
 	if (argc <= 1) {
 	    error("Missing filename\n");
 	}
-	strcpy(scriptname, argv[1]);
+	strncpy(scriptname, argv[1], sizeof(scriptname));
+	scriptname[sizeof(scriptname)-1] = '\0';
 	argc--;
 	argv++;
     } else {
@@ -395,16 +403,17 @@ main(int argc, char** argv)
 	int len;
 #endif
 	absname = find_prog(argv[0]);
-	strcpy(scriptname, absname);
-	efree(absname);
 #ifdef __WIN32__
-	len = strlen(scriptname);
-	if (len >= 4 && _stricmp(scriptname+len-4, ".exe") == 0) {
-	    scriptname[len-4] = '\0';
+	len = strlen(absname);
+	if (len >= 4 && _stricmp(absname+len-4, ".exe") == 0) {
+	    absname[len-4] = '\0';
 	}
 #endif
 
-	strcat(scriptname, ".escript");
+	erts_snprintf(scriptname, sizeof(scriptname), "%s.escript",
+        absname);
+	efree(absname);
+
     }
 
     /*
@@ -455,7 +464,7 @@ main(int argc, char** argv)
 static void
 push_words(char* src)
 {
-    char sbuf[1024];
+    char sbuf[PMAX];
     char* dst;
 
     dst = sbuf;
@@ -584,7 +593,7 @@ error(char* format, ...)
     va_list ap;
     
     va_start(ap, format);
-    vsprintf(sbuf, format, ap);
+    erts_vsnprintf(sbuf, sizeof(sbuf), format, ap);
     va_end(ap);
     fprintf(stderr, "escript: %s\n", sbuf);
     exit(1);
@@ -619,6 +628,9 @@ get_default_emulator(char* progname)
     char sbuf[MAXPATHLEN];
     char* s;
 
+    if (strlen(progname) >= sizeof(sbuf))
+        return ERL_NAME;
+
     strcpy(sbuf, progname);
     for (s = sbuf+strlen(sbuf); s >= sbuf; s--) {
 	if (IS_DIRSEP(*s)) {
diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c
index 4f738947b7..3e19e5f386 100644
--- a/erts/etc/common/heart.c
+++ b/erts/etc/common/heart.c
@@ -375,7 +375,8 @@ main(int argc, char **argv)
     _setmode(erlin_fd,_O_BINARY);
     _setmode(erlout_fd,_O_BINARY);
 #endif
-    strcpy(program_name, argv[0]);
+    strncpy(program_name, argv[0], sizeof(program_name));
+    program_name[sizeof(program_name)-1] = '\0';
     notify_ack(erlout_fd);
     cmd[0] = '\0';
     do_terminate(message_loop(erlin_fd,erlout_fd));
@@ -728,7 +729,11 @@ heart_cmd_reply(int fd, char *s)
   struct msg m;
   int len = strlen(s) + 1;	/* Include \0 */
 
-  /* FIXME if s >= MSG_BODY_SIZE error */
+  /* if s >= MSG_BODY_SIZE, return a write
+   * failure immediately.
+   */
+  if (len > sizeof(m.fill))
+      return -1;
 
   m.op = HEART_CMD;
   m.len = htons(len + 2);	/* Include Op */
diff --git a/erts/etc/common/inet_gethost.c b/erts/etc/common/inet_gethost.c
index d3ff4874ac..8bd9368aa1 100644
--- a/erts/etc/common/inet_gethost.c
+++ b/erts/etc/common/inet_gethost.c
@@ -59,15 +59,14 @@
 #define WIN32_LEAN_AND_MEAN
 #include <winsock2.h>
 #include <windows.h>
+#include <ws2tcpip.h>
 #include <process.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 /* These are not used even if they would exist which they should not */
-#undef HAVE_GETADDRINFO
 #undef HAVE_GETIPNODEBYNAME
 #undef HAVE_GETHOSTBYNAME2
-#undef HAVE_GETNAMEINFO
 #undef HAVE_GETIPNODEBYADDR
 
 #else /* Unix */
@@ -1761,7 +1760,7 @@ static int worker_loop(void)
 		struct addrinfo hints;
 		
 		memset(&hints, 0, sizeof(hints));
-		hints.ai_flags = (AI_CANONNAME|AI_V4MAPPED|AI_ADDRCONFIG);
+		hints.ai_flags = AI_CANONNAME;
 		hints.ai_socktype = SOCK_STREAM;
 		hints.ai_family = AF_INET6;
 		DEBUGF(5, ("Starting getaddrinfo(%s, ...)", data));
diff --git a/erts/etc/common/typer.c b/erts/etc/common/typer.c
index c2567cb8b4..de48daf002 100644
--- a/erts/etc/common/typer.c
+++ b/erts/etc/common/typer.c
@@ -175,7 +175,7 @@ main(int argc, char** argv)
 static void
 push_words(char* src)
 {
-    char sbuf[1024];
+    char sbuf[MAXPATHLEN];
     char* dst;
 
     dst = sbuf;
@@ -307,7 +307,7 @@ error(char* format, ...)
     va_list ap;
     
     va_start(ap, format);
-    vsprintf(sbuf, format, ap);
+    erts_vsnprintf(sbuf, sizeof(sbuf), format, ap);
     va_end(ap);
     fprintf(stderr, "typer: %s\n", sbuf);
     exit(1);
@@ -336,6 +336,9 @@ get_default_emulator(char* progname)
     char sbuf[MAXPATHLEN];
     char* s;
 
+    if (strlen(progname) >= sizeof(sbuf))
+        return ERL_NAME;
+
     strcpy(sbuf, progname);
     for (s = sbuf+strlen(sbuf); s >= sbuf; s--) {
 	if (IS_DIRSEP(*s)) {
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
index 83f9690782..8f40c43874 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -89,8 +89,12 @@ cp -p $ERL_ROOT/erts-%I_VSN%/bin/erl .
 cp -p $ERL_ROOT/erts-%I_VSN%/bin/erlc .
 cp -p $ERL_ROOT/erts-%I_VSN%/bin/dialyzer .
 cp -p $ERL_ROOT/erts-%I_VSN%/bin/typer .
+cp -p $ERL_ROOT/erts-%I_VSN%/bin/ct_run .
 cp -p $ERL_ROOT/erts-%I_VSN%/bin/escript .
 
+# Remove in R16B
+ln -s ct_run run_test
+
 #
 # Set a soft link to epmd
 # This should not be done for an embedded system!
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src
index 9dab9fcfcc..69840daf69 100644
--- a/erts/etc/unix/cerl.src
+++ b/erts/etc/unix/cerl.src
@@ -66,6 +66,7 @@ core=
 
 GDB=
 GDBBP=
+GDBARGS=
 TYPE=
 EMU_TYPE=
 debug=
@@ -227,17 +228,30 @@ if [ $run_valgrind != yes ]; then
 fi
 if [ "x$GDB" = "x" ]; then
     if [ $run_valgrind = yes ]; then
+	valversion=`valgrind --version`
+	valmajor=`echo $valversion | sed 's,[a-z]*\-\([0-9]*\).*,\1,'`
+        valminor=`echo $valversion | sed 's,[a-z]*\-[0-9]*.\([0-9]*\).*,\1,'`
 	emu_xargs=`echo $xargs | sed "s|+|-|g"`
-	if [ "x$VALGRIND_LOG_DIR" = "x" ]; then
-	    valgrind_log=
-	else
-	    valgrind_log="--log-file=$VALGRIND_LOG_DIR/$VALGRIND_LOGFILE_PREFIX$VALGRIND_LOGFILE_INFIX$EMU.log"
-	fi
 	if [ "x$VALGRIND_LOG_XML" = "x" ]; then
 	    valgrind_xml=
+	    log_file_prefix="--log-file="
 	else
 	    export VALGRIND_LOG_XML
 	    valgrind_xml="--xml=yes"
+	    if [ $valmajor -gt 2 -a $valminor -gt 4 ]; then
+		log_file_prefix="--xml-file="
+	    else
+		log_file_prefix="--log-file="
+	    fi
+	fi
+	if [ "x$VALGRIND_LOG_DIR" = "x" ]; then
+	    valgrind_log=
+	else
+	    if [ $valmajor -gt 2 -a $valminor -gt 4 ]; then
+		valgrind_log="$log_file_prefix$VALGRIND_LOG_DIR/$VALGRIND_LOGFILE_PREFIX$VALGRIND_LOGFILE_INFIX$EMU.log.$$"
+	    else
+		valgrind_log="$log_file_prefix$VALGRIND_LOG_DIR/$VALGRIND_LOGFILE_PREFIX$VALGRIND_LOGFILE_INFIX$EMU.log"
+	    fi
 	fi
 	if [ "x$VALGRIND_MISC_FLAGS" = "x" ]; then
 	    valgrind_misc_flags=
@@ -280,16 +294,11 @@ else
     # Set annotation level for gdb in emacs 22 and higher.
     emacs_major=`$EMACS --version | head -1 | sed 's,^[^0-9]*\([0-9]*\).*,\1,g'`
     if [ '!' -z "$emacs_major" -a $emacs_major -gt 21 ]; then
-	# Hack - wait for etp-commands to be loaded and then set
-	# annotation level, could be done more beautifully than with sit-for...
-	gdbcmd="$gdbcmd \
-                (sit-for 1) \
-                (insert-string \"set annotate 3\") \
-                (comint-send-input)"
+	GDBARGS="--annotate=3 "
     fi
     gdbcmd="$gdbcmd $GDBBP \
             (insert-string \"source $ROOTDIR/erts/etc/unix/etp-commands\") \
             (comint-send-input)"
     # Fire up gdb in emacs...
-    exec $EMACS --eval "(progn (gdb \"gdb $EMU\") $gdbcmd)"
+    exec $EMACS --eval "(progn (gdb \"gdb $GDBARGS$EMU\") $gdbcmd)"
 fi
diff --git a/erts/etc/unix/format_man_pages b/erts/etc/unix/format_man_pages
index 2c4f6eee4f..93dcdcd8fa 100644
--- a/erts/etc/unix/format_man_pages
+++ b/erts/etc/unix/format_man_pages
@@ -3,7 +3,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2010. 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
@@ -59,34 +59,21 @@ esac
 # Create the 'cat' directories (probably not needed)
 #
 
-cd $ERL_ROOT
+cd $ERL_ROOT/man
 
-if [ ! -d man/cat1 ]
-then
-    mkdir man/cat1
-fi
+for d in 0 1 2 3 4 5 6 7 8 9
+do
+  if [ ! -d cat$d ]
+      then
+      mkdir cat$d
+  fi
 
-if [ ! -d man/cat3 ]
-then
-    mkdir man/cat3
-fi
-
-if [ ! -d man/cat4 ]
-then
-    mkdir man/cat4
-fi
-
-if [ ! -d man/cat6 ]
-then
-    mkdir man/cat6
-fi
+done
 
 #
 # Cleanup old formatting
 #
 
-cd $ERL_ROOT/man
-
 rm -f whatis windex
 
 # Remove old cat files
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index 4bb148df98..cadff12c6f 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2010. 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
@@ -75,6 +75,9 @@
 #ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 #endif
+#if defined(__sun) && defined(__SVR4)
+#  include <stropts.h>
+#endif
 
 #include "run_erl.h"
 #include "safe_string.h"    /* sn_printf, strn_cpy, strn_cat, etc */
@@ -864,8 +867,12 @@ static int open_pty_master(char **ptyslave)
 
 /* Use the posix_openpt if working, as this guarantees creation of the 
    slave device properly. */
-#ifdef HAVE_WORKING_POSIX_OPENPT
+#if defined(HAVE_WORKING_POSIX_OPENPT) || (defined(__sun) && defined(__SVR4))
+#  ifdef HAVE_WORKING_POSIX_OPENPT
   if ((mfd = posix_openpt(O_RDWR)) >= 0) {
+#  elif defined(__sun) && defined(__SVR4)
+  if ((mfd = open("/dev/ptmx", O_RDWR)) >= 0) {
+#  endif
       if ((*ptyslave = ptsname(mfd)) != NULL &&
 	  grantpt(mfd) == 0 && 
 	  unlockpt(mfd) == 0) {
@@ -981,8 +988,28 @@ static int open_pty_slave(char *name)
     return -1;
   }
 
+#if defined(__sun) && defined(__SVR4)
+  /* Load the necessary STREAMS modules for Solaris */
+  if ((ioctl(sfd, I_FIND, "ldterm")) < 0) {
+    ERROR0(LOG_ERR, "Failed to find ldterm STREAMS module");
+    return -1;
+  }
+  if (ioctl(sfd, I_PUSH, "ptem") < 0) {
+    ERROR0(LOG_ERR, "Failed to push ptem STREAMS module");
+    return -1;
+  }
+  if (ioctl(sfd, I_PUSH, "ldterm") < 0) {
+    ERROR0(LOG_ERR, "Failed to push ldterm STREAMS module");
+    return -1;
+  }
+  if (ioctl(sfd, I_PUSH, "ttcompat") < 0) {
+    ERROR0(LOG_ERR, "Failed to push ttcompat STREAMS module");
+    return -1;
+  }
+#endif
+
 #ifdef DEBUG
-  if (tcgetattr(sfd, &tty_rmode) , 0) {
+  if (tcgetattr(sfd, &tty_rmode) < 0) {
     fprintf(stderr, "Cannot get terminals current mode\n");
     exit(-1);
   }
diff --git a/erts/etc/win32/Install.c b/erts/etc/win32/Install.c
index 4a559cd8a2..6e60512f6d 100644
--- a/erts/etc/win32/Install.c
+++ b/erts/etc/win32/Install.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2003-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2003-2010. 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%
  */
 /*
@@ -45,8 +45,8 @@ int main(int argc, char **argv)
     InitSection *ini_section;
     HANDLE module = GetModuleHandle(NULL);
     char *binaries[] = { "erl.exe", "werl.exe", "erlc.exe",
-			     "dialyzer.exe", "typer.exe",
-			     "escript.exe", NULL };
+			 "dialyzer.exe", "typer.exe",
+			 "escript.exe", "ct_run.exe", NULL };
     char *scripts[] = { "start_clean.boot", "start_sasl.boot", NULL };
     char fromname[MAX_PATH];
     char toname[MAX_PATH];
@@ -172,6 +172,20 @@ int main(int argc, char **argv)
 	}
     }
 
+    // Remove in R16B
+    sprintf(fromname,"%s\\%s",bin_dir,"ct_run.exe");
+    sprintf(toname,"%s\\%s",bin_dir,"run_test.exe");
+    if (GetFileAttributes(fromname) == 0xFFFFFFFF) {
+      fprintf(stderr,"Could not find file %s\n",
+	      fromname);
+      exit(1);
+    }
+    if (!CopyFile(fromname,toname,FALSE)) {
+      fprintf(stderr,"Could not copy file %s to %s\n",
+	      fromname,toname);
+      fprintf(stderr,"Continuing installation anyway...\n");
+    }
+    
     for (i = 0; scripts[i] != NULL; ++i) {
 	sprintf(fromname,"%s\\%s",release_dir,scripts[i]);
 	sprintf(toname,"%s\\%s",bin_dir,scripts[i]);
diff --git a/erts/etc/win32/cygwin_tools/vc/ld.sh b/erts/etc/win32/cygwin_tools/vc/ld.sh
index ac39bf871c..406c63ffee 100755
--- a/erts/etc/win32/cygwin_tools/vc/ld.sh
+++ b/erts/etc/win32/cygwin_tools/vc/ld.sh
@@ -3,7 +3,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2009. All Rights Reserved.
+# Copyright Ericsson AB 2002-2010. 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
@@ -53,7 +53,7 @@ while test -n "$1" ; do
 	    STDLIB_FORCED=true;
 	    STDLIB=LIBCMTD.LIB;; 
 	-lsocket)
-	    DEFAULT_LIBRARIES="$DEFAULT_LIBRARIES WS2_32.LIB";;
+	    DEFAULT_LIBRARIES="$DEFAULT_LIBRARIES WS2_32.LIB IPHLPAPI.LIB";;
 	-l*)
 	    y=`echo $x | sed 's,^-l\(.*\),\1,g'`;
 	    MPATH=`cygpath -m $y`;
@@ -158,7 +158,7 @@ else
 fi    
 	    
 p=$$
-CMD="$linktype -nologo -incremental:no $CMD $STDLIB $DEFAULT_LIBRARIES"
+CMD="$linktype -nologo -incremental:no -largeaddressaware $CMD $STDLIB $DEFAULT_LIBRARIES"
 if [ "X$LD_SH_DEBUG_LOG" != "X" ]; then
     echo ld.sh "$SAVE" >>$LD_SH_DEBUG_LOG
     echo link.exe $CMD >>$LD_SH_DEBUG_LOG
@@ -167,6 +167,10 @@ eval link.exe "$CMD"  >/tmp/link.exe.${p}.1 2>/tmp/link.exe.${p}.2
 RES=$?
 CMANIFEST=`cygpath $MANIFEST`
 if [ "$RES" = "0" -a -f "$CMANIFEST" ]; then
+    # Add stuff to manifest to turn off "virtualization"
+    sed -n -i '1h;1!H;${;g;s,<trustInfo.*</trustInfo>.,,g;p;}' $CMANIFEST
+    sed -i "s/<\/assembly>/ <ms_asmv2:trustInfo xmlns:ms_asmv2=\"urn:schemas-microsoft-com:asm.v2\">\n  <ms_asmv2:security>\n   <ms_asmv2:requestedPrivileges>\n    <ms_asmv2:requestedExecutionLevel level=\"AsInvoker\" uiAccess=\"false\"\/>\n   <\/ms_asmv2:requestedPrivileges>\n  <\/ms_asmv2:security>\n <\/ms_asmv2:trustInfo>\n<\/assembly>/" $CMANIFEST
+
     eval mt.exe -nologo -manifest "$MANIFEST" -outputresource:"$OUTPUTRES" >>/tmp/link.exe.${p}.1 2>>/tmp/link.exe.${p}.2
     RES=$?
     if [ "$RES" != "0" ]; then
diff --git a/erts/etc/win32/cygwin_tools/vc/rc.sh b/erts/etc/win32/cygwin_tools/vc/rc.sh
index 6a6921c49e..054c672e64 100755
--- a/erts/etc/win32/cygwin_tools/vc/rc.sh
+++ b/erts/etc/win32/cygwin_tools/vc/rc.sh
@@ -2,20 +2,20 @@
 # set -x
 # 
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2002-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2002-2010. 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%
 # 
 # Save the command line for debug outputs
@@ -80,7 +80,7 @@ if [ "X$RC_SH_DEBUG_LOG" != "X" ]; then
 fi
 eval $RCC "$CMD"  >/tmp/rc.exe.${p}.1 2>/tmp/rc.exe.${p}.2
 RES=$?
-tail +2 /tmp/rc.exe.${p}.2 >&2
+tail -n +2 /tmp/rc.exe.${p}.2 >&2
 cat /tmp/rc.exe.${p}.1
 rm -f /tmp/rc.exe.${p}.2 /tmp/rc.exe.${p}.1
 exit $RES
diff --git a/erts/etc/win32/nsis/Makefile b/erts/etc/win32/nsis/Makefile
index ebb3ad9a96..981a232c69 100644
--- a/erts/etc/win32/nsis/Makefile
+++ b/erts/etc/win32/nsis/Makefile
@@ -45,6 +45,7 @@ WTARGET_DIR=$(shell (cygpath -d $(TARGET_DIR) 2>/dev/null || cygpath -d $(TARGET
 
 REDIST_FILE=$(shell (sh ./find_redist.sh || echo ""))
 REDIST_DLL_VERSION=$(shell (sh ./dll_version_helper.sh || echo ""))
+REDIST_DLL_NAME=$(shell (sh ./dll_version_helper.sh -n || echo ""))
 
 release_spec:
 	@NSIS_VER=`makensis /hdrinfo | head -1 | awk '{print $$2}'`; \
@@ -73,6 +74,7 @@ release_spec:
 		cp $(REDIST_FILE) $(RELEASE_PATH)/vcredist_x86.exe;\
 		echo '!define HAVE_REDIST_FILE 1'  >> $(VERSION_HEADER); \
 		echo '!define REDIST_DLL_VERSION "$(REDIST_DLL_VERSION)"' >> $(VERSION_HEADER);\
+		echo '!define REDIST_DLL_NAME "$(REDIST_DLL_NAME)"' >> $(VERSION_HEADER);\
 	  fi;\
 	  if [ -f $(RELEASE_PATH)/docs/doc/index.html ];\
 	  then \
diff --git a/erts/etc/win32/nsis/dll_version_helper.sh b/erts/etc/win32/nsis/dll_version_helper.sh
index e0047dea8b..571ee3e39e 100755
--- a/erts/etc/win32/nsis/dll_version_helper.sh
+++ b/erts/etc/win32/nsis/dll_version_helper.sh
@@ -2,7 +2,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2007-2009. All Rights Reserved.
+# Copyright Ericsson AB 2007-2010. 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
@@ -41,9 +41,15 @@ if [ '!' -f hello.exe.manifest ]; then
     exit 0
 fi
 VERSION=`grep '<assemblyIdentity' hello.exe.manifest | sed 's,.*version=.\([0-9\.]*\).*,\1,g' | grep -v '<'`
+NAME=`grep '<assemblyIdentity' hello.exe.manifest | sed 's,.*name=.[A-Za-z\.]*\([0-9]*\).*,msvcr\1.dll,g' | grep -v '<'`
 rm -f hello.c hello.obj hello.exe hello.exe.manifest
-if [ -z "$VERSION" ]; then
+if [ "$1" = "-n" ]; then
+    ASKEDFOR=$NAME
+else
+    ASKEDFOR=$VERSION
+fi
+if [ -z "$ASKEDFOR" ]; then
     exit 1
 fi
-echo $VERSION
+echo $ASKEDFOR
 exit 0
diff --git a/erts/etc/win32/nsis/erlang20.nsi b/erts/etc/win32/nsis/erlang20.nsi
index 43e5d91604..941e8e6f5d 100644
--- a/erts/etc/win32/nsis/erlang20.nsi
+++ b/erts/etc/win32/nsis/erlang20.nsi
@@ -311,23 +311,23 @@ FunctionEnd
 

 Function .onInit

    SectionGetFlags 0 $MYTEMP 

-;   MessageBox MB_YESNO "Found $SYSDIR\msvcr80.dll" IDYES FoundLbl

-   IfFileExists $SYSDIR\msvcr80.dll MaybeFoundInSystemLbl

+   ;MessageBox MB_YESNO "Found $SYSDIR\${REDIST_DLL_NAME}" IDYES FoundLbl

+   IfFileExists $SYSDIR\${REDIST_DLL_NAME} MaybeFoundInSystemLbl

    SearchSxsLbl:	

         FindFirst $0 $1 $WINDIR\WinSxS\x86*

         LoopLbl:

 	    StrCmp $1 "" NotFoundLbl

-	    IfFileExists $WINDIR\WinSxS\$1\msvcr80.dll MaybeFoundInSxsLbl

+	    IfFileExists $WINDIR\WinSxS\$1\${REDIST_DLL_NAME} MaybeFoundInSxsLbl

 	    FindNext $0 $1

 	    Goto LoopLbl

         MaybeFoundInSxsLbl:

-	    GetDllVersion $WINDIR\WinSxS\$1\msvcr80.dll $R0 $R1

+	    GetDllVersion $WINDIR\WinSxS\$1\${REDIST_DLL_NAME} $R0 $R1

 	    Call DllVersionGoodEnough

 	    FindNext $0 $1

 	    IntCmp 2 $R0 LoopLbl

 	    Goto FoundLbl  

    MaybeFoundInSystemLbl:

-	GetDllVersion $SYSDIR\msvcr80.dll $R0 $R1

+	GetDllVersion $SYSDIR\${REDIST_DLL_NAME} $R0 $R1

 	Call DllVersionGoodEnough

 	IntCmp 2 $R0 SearchSxSLbl  

    FoundLbl:

diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh
index c5572839c5..153977ded5 100755
--- a/erts/etc/win32/nsis/find_redist.sh
+++ b/erts/etc/win32/nsis/find_redist.sh
@@ -2,7 +2,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2007-2009. All Rights Reserved.
+# Copyright Ericsson AB 2007-2010. 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
@@ -107,16 +107,56 @@ for x in cl bin vc; do
     fi
     BPATH="$NBPATH"
 done
+BPATH_LIST=$BPATH
+
+# rc.exe is in the Microsoft SDK directory of VS2008
+RCPATH=`lookup_prog_in_path rc`
+fail=false
+if [ '!' -z "$RCPATH" ]; then 
+    BPATH=$RCPATH
+    for x in rc bin v6.0A ; do 
+	NBPATH=`remove_path_element $x "$BPATH"`
+	if [ "$NBPATH" = "$BPATH" ]; then
+	    fail=true
+	    break;
+	fi
+	BPATH="$NBPATH"
+    done
+    if [ $fail = false ]; then
+	BPATH_LIST="$BPATH_LIST $BPATH"
+    fi
+fi
+
+# Frantic search through two roots with different 
+# version directories. We want to be very specific about the
+# directory structures as we woildnt want to find the wrong 
+# redistributables...
+
 #echo $BPATH
-for x in sdk v2.0 bootstrapper packages vcredist_x86 vcredist_x86.exe; do
-    #echo "x=$x"
-    #echo "BPATH=$BPATH"
-    NBPATH=`add_path_element $x "$BPATH"`
-    if [ "$NBPATH" = "$BPATH" ]; then
-	echo "Failed to locate vcredist_x86.exe because directory structure was unexpected" >&2
-	exit 3
+for BP in $BPATH_LIST; do
+    for verdir in "sdk v2.0" "sdk v3.5" "v6.0A"; do
+	BPATH=$BP
+	fail=false
+	for x in $verdir bootstrapper packages vcredist_x86 vcredist_x86.exe; do
+	    #echo "x=$x"
+	    #echo "BPATH=$BPATH"
+	    NBPATH=`add_path_element $x "$BPATH"`
+	    if [ "$NBPATH" = "$BPATH" ]; then
+		fail=true
+		break;
+	    fi
+	    BPATH="$NBPATH"
+	done
+	if [ $fail = false ]; then
+	    break;
+	fi
+    done
+    if [ $fail = false ]; then
+	echo $BPATH
+	exit 0
     fi
-    BPATH="$NBPATH"
 done
-echo $BPATH
-exit 0
\ No newline at end of file
+
+echo "Failed to locate vcredist_x86.exe because directory structure was unexpected" >&2
+exit 3
+
diff --git a/erts/include/internal/erl_misc_utils.h b/erts/include/internal/erl_misc_utils.h
index 82e9ba3798..507e1726f4 100644
--- a/erts/include/internal/erl_misc_utils.h
+++ b/erts/include/internal/erl_misc_utils.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2006-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2006-2010. 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
@@ -34,7 +34,7 @@ typedef struct {
 
 erts_cpu_info_t *erts_cpu_info_create(void);
 void erts_cpu_info_destroy(erts_cpu_info_t *cpuinfo);
-void erts_cpu_info_update(erts_cpu_info_t *cpuinfo);
+int erts_cpu_info_update(erts_cpu_info_t *cpuinfo);
 int erts_get_cpu_configured(erts_cpu_info_t *cpuinfo);
 int erts_get_cpu_online(erts_cpu_info_t *cpuinfo);
 int erts_get_cpu_available(erts_cpu_info_t *cpuinfo);
@@ -50,4 +50,9 @@ int erts_unbind_from_cpu_str(char *str);
 
 int erts_milli_sleep(long);
 
+#ifdef __WIN32__
+int erts_map_win_error_to_errno(DWORD win_error);
+int erts_get_last_win_errno(void);
+#endif
+
 #endif /* #ifndef ERL_MISC_UTILS_H_ */
diff --git a/erts/include/internal/ethr_atomics.h b/erts/include/internal/ethr_atomics.h
new file mode 100644
index 0000000000..1caf4d0567
--- /dev/null
+++ b/erts/include/internal/ethr_atomics.h
@@ -0,0 +1,726 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: The ethread atomic API
+ * Author: Rickard Green
+ */
+
+#ifndef ETHR_ATOMIC_H__
+#define ETHR_ATOMIC_H__
+
+#if !defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_ATOMIC_IMPL__)
+#  define ETHR_NEED_ATOMIC_PROTOTYPES__
+#endif
+
+#ifndef ETHR_HAVE_NATIVE_ATOMICS
+/*
+ * No native atomic implementation available. :(
+ * Use fallback...
+ */
+typedef ethr_sint32_t ethr_atomic32_t;
+typedef ethr_sint_t ethr_atomic_t;
+#else
+/*
+ * Map ethread native atomics to ethread API atomics.
+ *
+ * We do at least have a native atomic implementation that
+ * can handle integers of a size larger than or equal to
+ * the size of pointers.
+ */
+
+/* -- Pointer size atomics -- */
+
+#undef ETHR_NAINT_T__
+#undef ETHR_NATMC_FUNC__
+#undef ETHR_NATMC_ADDR_FUNC__
+#if ETHR_SIZEOF_PTR == 8
+#  if defined(ETHR_HAVE_NATIVE_ATOMIC64)
+#    define ETHR_NATMC_ADDR_FUNC__ ethr_native_atomic64_addr
+typedef ethr_native_atomic64_t ethr_atomic_t;
+#    define ETHR_NAINT_T__ ethr_sint64_t
+#    define ETHR_NATMC_FUNC__(X) ethr_native_atomic64_ ## X
+#  else
+#    error "Missing native atomic implementation"
+#  endif
+#elif ETHR_SIZEOF_PTR == 4
+#  define ETHR_NATMC_ADDR_FUNC__ ethr_native_atomic32_addr
+#  ifdef ETHR_HAVE_NATIVE_ATOMIC32
+typedef ethr_native_atomic32_t ethr_atomic_t;
+#    define ETHR_NAINT_T__ ethr_sint32_t
+#    define ETHR_NATMC_FUNC__(X) ethr_native_atomic32_ ## X
+#  elif defined(ETHR_HAVE_NATIVE_ATOMIC64)
+typedef ethr_native_atomic64_t ethr_atomic_t;
+#    define ETHR_NATMC_T__ ethr_native_atomic64_t
+#    define ETHR_NAINT_T__ ethr_sint64_t
+#    define ETHR_NATMC_FUNC__(X) ethr_native_atomic64_ ## X
+#  else
+#    error "Missing native atomic implementation"
+#  endif
+#endif
+
+/* -- 32-bit atomics -- */
+
+#undef ETHR_NAINT32_T__
+#undef ETHR_NATMC32_FUNC__
+#if defined(ETHR_HAVE_NATIVE_ATOMIC32)
+typedef ethr_native_atomic32_t ethr_atomic32_t;
+#  define ETHR_NAINT32_T__ ethr_sint32_t
+#  define ETHR_NATMC32_FUNC__(X) ethr_native_atomic32_ ## X
+#elif defined(ETHR_HAVE_NATIVE_ATOMIC64)
+typedef ethr_native_atomic64_t ethr_atomic32_t;
+#  define ETHR_NAINT32_T__ ethr_sint64_t
+#  define ETHR_NATMC32_FUNC__(X) ethr_native_atomic64_ ## X
+#else
+#  error "Missing native atomic implementation"
+#endif
+
+#endif
+
+#ifdef ETHR_NEED_ATOMIC_PROTOTYPES__
+ethr_sint_t *ethr_atomic_addr(ethr_atomic_t *);
+void ethr_atomic_init(ethr_atomic_t *, ethr_sint_t);
+void ethr_atomic_set(ethr_atomic_t *, ethr_sint_t);
+ethr_sint_t ethr_atomic_read(ethr_atomic_t *);
+ethr_sint_t ethr_atomic_inc_read(ethr_atomic_t *);
+ethr_sint_t ethr_atomic_dec_read(ethr_atomic_t *);
+void ethr_atomic_inc(ethr_atomic_t *);
+void ethr_atomic_dec(ethr_atomic_t *);
+ethr_sint_t ethr_atomic_add_read(ethr_atomic_t *, ethr_sint_t);
+void ethr_atomic_add(ethr_atomic_t *, ethr_sint_t);
+ethr_sint_t ethr_atomic_read_band(ethr_atomic_t *, ethr_sint_t);
+ethr_sint_t ethr_atomic_read_bor(ethr_atomic_t *, ethr_sint_t);
+ethr_sint_t ethr_atomic_xchg(ethr_atomic_t *, ethr_sint_t);
+ethr_sint_t ethr_atomic_cmpxchg(ethr_atomic_t *, ethr_sint_t, ethr_sint_t);
+ethr_sint_t ethr_atomic_read_acqb(ethr_atomic_t *);
+ethr_sint_t ethr_atomic_inc_read_acqb(ethr_atomic_t *);
+void ethr_atomic_set_relb(ethr_atomic_t *, ethr_sint_t);
+void ethr_atomic_dec_relb(ethr_atomic_t *);
+ethr_sint_t ethr_atomic_dec_read_relb(ethr_atomic_t *);
+ethr_sint_t ethr_atomic_cmpxchg_acqb(ethr_atomic_t *, ethr_sint_t, ethr_sint_t);
+ethr_sint_t ethr_atomic_cmpxchg_relb(ethr_atomic_t *, ethr_sint_t, ethr_sint_t);
+
+ethr_sint32_t *ethr_atomic32_addr(ethr_atomic32_t *);
+void ethr_atomic32_init(ethr_atomic32_t *, ethr_sint32_t);
+void ethr_atomic32_set(ethr_atomic32_t *, ethr_sint32_t);
+ethr_sint32_t ethr_atomic32_read(ethr_atomic32_t *);
+ethr_sint32_t ethr_atomic32_inc_read(ethr_atomic32_t *);
+ethr_sint32_t ethr_atomic32_dec_read(ethr_atomic32_t *);
+void ethr_atomic32_inc(ethr_atomic32_t *);
+void ethr_atomic32_dec(ethr_atomic32_t *);
+ethr_sint32_t ethr_atomic32_add_read(ethr_atomic32_t *, ethr_sint32_t);
+void ethr_atomic32_add(ethr_atomic32_t *, ethr_sint32_t);
+ethr_sint32_t ethr_atomic32_read_band(ethr_atomic32_t *, ethr_sint32_t);
+ethr_sint32_t ethr_atomic32_read_bor(ethr_atomic32_t *, ethr_sint32_t);
+ethr_sint32_t ethr_atomic32_xchg(ethr_atomic32_t *, ethr_sint32_t);
+ethr_sint32_t ethr_atomic32_cmpxchg(ethr_atomic32_t *,
+				    ethr_sint32_t,
+				    ethr_sint32_t);
+ethr_sint32_t ethr_atomic32_read_acqb(ethr_atomic32_t *);
+ethr_sint32_t ethr_atomic32_inc_read_acqb(ethr_atomic32_t *);
+void ethr_atomic32_set_relb(ethr_atomic32_t *, ethr_sint32_t);
+void ethr_atomic32_dec_relb(ethr_atomic32_t *);
+ethr_sint32_t ethr_atomic32_dec_read_relb(ethr_atomic32_t *);
+ethr_sint32_t ethr_atomic32_cmpxchg_acqb(ethr_atomic32_t *,
+					 ethr_sint32_t,
+					 ethr_sint32_t);
+ethr_sint32_t ethr_atomic32_cmpxchg_relb(ethr_atomic32_t *,
+					 ethr_sint32_t,
+					 ethr_sint32_t);
+#endif
+
+int ethr_init_atomics(void);
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_ATOMIC_IMPL__)
+
+#ifndef ETHR_HAVE_NATIVE_ATOMICS
+/*
+ * Fallbacks for atomics used in absence of a native implementation.
+ */
+
+#define ETHR_ATOMIC_ADDR_BITS 10
+#define ETHR_ATOMIC_ADDR_SHIFT 6
+
+typedef struct {
+    union {
+	ethr_spinlock_t lck;
+	char buf[ETHR_CACHE_LINE_SIZE];
+    } u;
+} ethr_atomic_protection_t;
+
+extern ethr_atomic_protection_t ethr_atomic_protection__[1 << ETHR_ATOMIC_ADDR_BITS];
+
+#define ETHR_ATOMIC_PTR2LCK__(PTR) \
+(&ethr_atomic_protection__[((((ethr_uint_t) (PTR)) >> ETHR_ATOMIC_ADDR_SHIFT) \
+			& ((1 << ETHR_ATOMIC_ADDR_BITS) - 1))].u.lck)
+
+
+#define ETHR_ATOMIC_OP_FALLBACK_IMPL__(AP, EXPS)			\
+do {									\
+    ethr_spinlock_t *slp__ = ETHR_ATOMIC_PTR2LCK__((AP));		\
+    ethr_spin_lock(slp__);						\
+    { EXPS; }								\
+    ethr_spin_unlock(slp__);						\
+} while (0)
+
+#endif
+
+/*
+ * --- Pointer size atomics ---------------------------------------------------
+ */
+
+static ETHR_INLINE ethr_sint_t *
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_addr)(ethr_atomic_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t *) ETHR_NATMC_ADDR_FUNC__(var);
+#else
+    return (ethr_sint_t *) var;
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_init)(ethr_atomic_t *var, ethr_sint_t i)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC_FUNC__(init)(var, (ETHR_NAINT_T__) i);
+#else
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *var = i);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_set)(ethr_atomic_t *var, ethr_sint_t i)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC_FUNC__(set)(var, (ETHR_NAINT_T__) i);
+#else
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *var = i);
+#endif
+}
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_read)(ethr_atomic_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(read)(var);
+#else
+    ethr_sint_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = *var);
+    return res;
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_add)(ethr_atomic_t *var, ethr_sint_t incr)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC_FUNC__(add)(var, (ETHR_NAINT_T__) incr);
+#else
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *var += incr);
+#endif
+}   
+    
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_add_read)(ethr_atomic_t *var, ethr_sint_t i)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(add_return)(var, (ETHR_NAINT_T__) i);
+#else
+    ethr_sint_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *var += i; res = *var);
+    return res;
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_inc)(ethr_atomic_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC_FUNC__(inc)(var);
+#else
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, ++(*var));
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_dec)(ethr_atomic_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC_FUNC__(dec)(var);
+#else
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, --(*var));
+#endif
+}
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_inc_read)(ethr_atomic_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(inc_return)(var);
+#else
+    ethr_sint_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = ++(*var));
+    return res;
+#endif
+}
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_dec_read)(ethr_atomic_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(dec_return)(var);
+#else
+    ethr_sint_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = --(*var));
+    return res;
+#endif
+}
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_read_band)(ethr_atomic_t *var,
+					      ethr_sint_t mask)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(and_retold)(var,
+						       (ETHR_NAINT_T__) mask);
+#else
+    ethr_sint_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = *var; *var &= mask);
+    return res;
+#endif
+}
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_read_bor)(ethr_atomic_t *var,
+					     ethr_sint_t mask)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(or_retold)(var,
+						      (ETHR_NAINT_T__) mask);
+#else
+    ethr_sint_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = *var; *var |= mask);
+    return res;
+#endif
+}
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_xchg)(ethr_atomic_t *var, ethr_sint_t new)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(xchg)(var,
+						 (ETHR_NAINT_T__) new);
+#else
+    ethr_sint_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = *var; *var = new);
+    return res;
+#endif
+}
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_cmpxchg)(ethr_atomic_t *var,
+					    ethr_sint_t new,
+                                            ethr_sint_t exp)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(cmpxchg)(var,
+						    (ETHR_NAINT_T__) new,
+						    (ETHR_NAINT_T__) exp);
+#else
+    ethr_sint_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var,
+    {
+	res = *var;
+	if (__builtin_expect(res == exp, 1))
+	    *var = new;
+    });
+    return res;
+#endif
+}
+
+/*
+ * Important memory barrier requirements.
+ *
+ * The following atomic operations *must* supply a memory barrier of
+ * at least the type specified by its suffix:
+ *    _acqb = acquire barrier
+ *    _relb = release barrier
+ */
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_read_acqb)(ethr_atomic_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(read_acqb)(var);
+#else
+    return ETHR_INLINE_FUNC_NAME_(ethr_atomic_read)(var);
+#endif
+}
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_inc_read_acqb)(ethr_atomic_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(inc_return_acqb)(var);
+#else
+    return ETHR_INLINE_FUNC_NAME_(ethr_atomic_inc_read)(var);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_set_relb)(ethr_atomic_t *var,
+					     ethr_sint_t val)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC_FUNC__(set_relb)(var, (ETHR_NAINT_T__) val);
+#else
+    ETHR_INLINE_FUNC_NAME_(ethr_atomic_set)(var, val);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_dec_relb)(ethr_atomic_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC_FUNC__(dec_relb)(var);
+#else
+    ETHR_INLINE_FUNC_NAME_(ethr_atomic_dec)(var);
+#endif
+}
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_dec_read_relb)(ethr_atomic_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(dec_return_relb)(var);
+#else
+    return ETHR_INLINE_FUNC_NAME_(ethr_atomic_dec_read)(var);
+#endif
+}
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_cmpxchg_acqb)(ethr_atomic_t *var,
+						 ethr_sint_t new,
+						 ethr_sint_t exp)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(cmpxchg_acqb)(var,
+							 (ETHR_NAINT_T__) new,
+							 (ETHR_NAINT_T__) exp);
+#else
+    return ETHR_INLINE_FUNC_NAME_(ethr_atomic_cmpxchg)(var, new, exp);
+#endif
+}
+
+static ETHR_INLINE ethr_sint_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic_cmpxchg_relb)(ethr_atomic_t *var,
+						 ethr_sint_t new,
+						 ethr_sint_t exp)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint_t) ETHR_NATMC_FUNC__(cmpxchg_relb)(var,
+							 (ETHR_NAINT_T__) new,
+							 (ETHR_NAINT_T__) exp);
+#else
+    return ETHR_INLINE_FUNC_NAME_(ethr_atomic_cmpxchg)(var, new, exp);
+#endif
+}
+
+/*
+ * --- 32-bit atomics ---------------------------------------------------------
+ */
+
+static ETHR_INLINE ethr_sint32_t *
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_addr)(ethr_atomic32_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return ethr_native_atomic32_addr(var);
+#else
+    return (ethr_sint32_t *) var;
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_init)(ethr_atomic32_t *var,
+					   ethr_sint32_t i)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC32_FUNC__(init)(var, (ETHR_NAINT32_T__) i);
+#else
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *var = i);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_set)(ethr_atomic32_t *var, ethr_sint32_t i)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC32_FUNC__(set)(var, (ETHR_NAINT32_T__) i);
+#else
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *var = i);
+#endif
+}
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_read)(ethr_atomic32_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t) ETHR_NATMC32_FUNC__(read)(var);
+#else
+    ethr_sint32_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = *var);
+    return res;
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_add)(ethr_atomic32_t *var,
+					  ethr_sint32_t incr)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC32_FUNC__(add)(var, (ETHR_NAINT32_T__) incr);
+#else
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *var += incr);
+#endif
+}   
+    
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_add_read)(ethr_atomic32_t *var,
+					       ethr_sint32_t i)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t)
+	ETHR_NATMC32_FUNC__(add_return)(var, (ETHR_NAINT32_T__) i);
+#else
+    ethr_sint32_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *var += i; res = *var);
+    return res;
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_inc)(ethr_atomic32_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC32_FUNC__(inc)(var);
+#else
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, ++(*var));
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_dec)(ethr_atomic32_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC32_FUNC__(dec)(var);
+#else
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, --(*var));
+#endif
+}
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_inc_read)(ethr_atomic32_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t) ETHR_NATMC32_FUNC__(inc_return)(var);
+#else
+    ethr_sint32_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = ++(*var));
+    return res;
+#endif
+}
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_dec_read)(ethr_atomic32_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t) ETHR_NATMC32_FUNC__(dec_return)(var);
+#else
+    ethr_sint32_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = --(*var));
+    return res;
+#endif
+}
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_read_band)(ethr_atomic32_t *var,
+						ethr_sint32_t mask)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t)
+	ETHR_NATMC32_FUNC__(and_retold)(var, (ETHR_NAINT32_T__) mask);
+#else
+    ethr_sint32_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = *var; *var &= mask);
+    return res;
+#endif
+}
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_read_bor)(ethr_atomic32_t *var,
+					       ethr_sint32_t mask)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return
+	(ethr_sint32_t) ETHR_NATMC32_FUNC__(or_retold)(var,
+						       (ETHR_NAINT32_T__) mask);
+#else
+    ethr_sint32_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = *var; *var |= mask);
+    return res;
+#endif
+}
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_xchg)(ethr_atomic32_t *var,
+					   ethr_sint32_t new)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t) ETHR_NATMC32_FUNC__(xchg)(var,
+						     (ETHR_NAINT32_T__) new);
+#else
+    ethr_sint32_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, res = *var; *var = new);
+    return res;
+#endif
+}
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_cmpxchg)(ethr_atomic32_t *var,
+					    ethr_sint32_t new,
+                                            ethr_sint32_t exp)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t) ETHR_NATMC32_FUNC__(cmpxchg)(var,
+							(ETHR_NAINT32_T__) new,
+							(ETHR_NAINT32_T__) exp);
+#else
+    ethr_sint32_t res;
+    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var,
+    {
+	res = *var;
+	if (__builtin_expect(res == exp, 1))
+	    *var = new;
+    });
+    return res;
+#endif
+}
+
+/*
+ * Important memory barrier requirements.
+ *
+ * The following atomic operations *must* supply a memory barrier of
+ * at least the type specified by its suffix:
+ *    _acqb = acquire barrier
+ *    _relb = release barrier
+ */
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_read_acqb)(ethr_atomic32_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t) ETHR_NATMC32_FUNC__(read_acqb)(var);
+#else
+    return ETHR_INLINE_FUNC_NAME_(ethr_atomic32_read)(var);
+#endif
+}
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_inc_read_acqb)(ethr_atomic32_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t) ETHR_NATMC32_FUNC__(inc_return_acqb)(var);
+#else
+    return ETHR_INLINE_FUNC_NAME_(ethr_atomic32_inc_read)(var);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_set_relb)(ethr_atomic32_t *var,
+					       ethr_sint32_t val)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC32_FUNC__(set_relb)(var, (ETHR_NAINT32_T__) val);
+#else
+    ETHR_INLINE_FUNC_NAME_(ethr_atomic32_set)(var, val);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_dec_relb)(ethr_atomic32_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    ETHR_NATMC32_FUNC__(dec_relb)(var);
+#else
+    ETHR_INLINE_FUNC_NAME_(ethr_atomic32_dec)(var);
+#endif
+}
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_dec_read_relb)(ethr_atomic32_t *var)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t) ETHR_NATMC32_FUNC__(dec_return_relb)(var);
+#else
+    return ETHR_INLINE_FUNC_NAME_(ethr_atomic32_dec_read)(var);
+#endif
+}
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_cmpxchg_acqb)(ethr_atomic32_t *var,
+						   ethr_sint32_t new,
+						   ethr_sint32_t exp)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t)
+	ETHR_NATMC32_FUNC__(cmpxchg_acqb)(var,
+					  (ETHR_NAINT32_T__) new,
+					  (ETHR_NAINT32_T__) exp);
+#else
+    return ETHR_INLINE_FUNC_NAME_(ethr_atomic32_cmpxchg)(var, new, exp);
+#endif
+}
+
+static ETHR_INLINE ethr_sint32_t
+ETHR_INLINE_FUNC_NAME_(ethr_atomic32_cmpxchg_relb)(ethr_atomic32_t *var,
+						   ethr_sint32_t new,
+						   ethr_sint32_t exp)
+{
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+    return (ethr_sint32_t)
+	ETHR_NATMC32_FUNC__(cmpxchg_relb)(var,
+					  (ETHR_NAINT32_T__) new,
+					  (ETHR_NAINT32_T__) exp);
+#else
+    return ETHR_INLINE_FUNC_NAME_(ethr_atomic32_cmpxchg)(var, new, exp);
+#endif
+}
+
+
+#endif /* ETHR_TRY_INLINE_FUNCS */
+
+#undef ETHR_NAINT_T__
+#undef ETHR_NATMC_FUNC__
+#undef ETHR_NATMC_ADDR_FUNC__
+
+#undef ETHR_NAINT32_T__
+#undef ETHR_NATMC32_FUNC__
+
+#endif
diff --git a/erts/include/internal/ethr_internal.h b/erts/include/internal/ethr_internal.h
new file mode 100644
index 0000000000..e9c3daf783
--- /dev/null
+++ b/erts/include/internal/ethr_internal.h
@@ -0,0 +1,67 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: Internal ethread exports
+ * Author: Rickard Green
+ */
+
+#ifndef ETHR_INTERNAL_H__
+#define ETHR_INTERNAL_H__
+
+#include "erl_misc_utils.h"
+
+extern ethr_memory_allocators ethr_mem__;
+extern erts_cpu_info_t *ethr_cpu_info__;
+extern size_t ethr_pagesize__;
+extern size_t ethr_min_stack_size__; /* kilo words */
+extern size_t ethr_max_stack_size__; /* kilo words */
+extern int ethr_not_completely_inited__;
+extern int ethr_not_inited__;
+
+extern void *(*ethr_thr_prepare_func__)(void);
+extern void (*ethr_thr_parent_func__)(void *);
+extern void (*ethr_thr_child_func__)(void *);
+
+#define ETHR_PAGE_ALIGN(SZ) \
+  (((((size_t) (SZ)) - 1)/ethr_pagesize__ + 1)*ethr_pagesize__)
+#define ETHR_B2KW(B) ((((size_t) (B)) - 1)/(sizeof(void *)*1024) + 1)
+#define ETHR_KW2B(KW) (((size_t) (KW))*sizeof(void *)*1024)
+
+#undef ETHR_STACK_GUARD_SIZE 
+#ifdef ETHR_HAVE_PTHREAD_ATTR_SETGUARDSIZE
+#  define ETHR_STACK_GUARD_SIZE (ethr_pagesize__)
+#endif
+
+/* implemented in lib_src/<thr-lib>/ethread.c */
+int ethr_set_tse__(ethr_ts_event *tsep);
+ethr_ts_event *ethr_get_tse__(void);
+ETHR_PROTO_NORETURN__ ethr_abort__(void);
+#ifdef ETHR_WIN32_THREADS
+int ethr_win_get_errno__(void);
+#endif
+
+/* implemented in lib_src/common/ethread_aux.c */
+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);
+
+
+#endif
diff --git a/erts/include/internal/ethr_mutex.h b/erts/include/internal/ethr_mutex.h
new file mode 100644
index 0000000000..fadaf1e2a4
--- /dev/null
+++ b/erts/include/internal/ethr_mutex.h
@@ -0,0 +1,674 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: Mutex, rwmutex and condition variable implementation
+ * Author: Rickard Green
+ */
+
+#ifndef ETHR_MUTEX_H__
+#define ETHR_MUTEX_H__
+
+#define ETHR_RWMUTEX_INITIALIZED 	0x99999999
+#define ETHR_MUTEX_INITIALIZED		0x77777777
+#define ETHR_COND_INITIALIZED		0x55555555
+
+#if 0
+#  define ETHR_MTX_HARD_DEBUG
+#endif
+
+#if 0
+#  define ETHR_MTX_CHK_EXCL
+#if 1
+#    define ETHR_MTX_CHK_NON_EXCL
+#endif
+#endif
+
+#ifdef ETHR_MTX_HARD_DEBUG
+#  ifdef __GNUC__
+#    warning ETHR_MTX_HARD_DEBUG
+#  endif
+/*#  define ETHR_MTX_HARD_DEBUG_LFS*/
+/*#  define ETHR_MTX_HARD_DEBUG_FENCE*/
+/*#  define ETHR_MTX_HARD_DEBUG_Q*/
+#  define ETHR_MTX_HARD_DEBUG_WSQ
+
+#  if !defined(ETHR_MTX_HARD_DEBUG_WSQ) && defined(ETHR_MTX_HARD_DEBUG_Q)
+#    define ETHR_MTX_HARD_DEBUG_WSQ
+#  endif
+#endif
+
+#if defined(ETHR_USE_OWN_RWMTX_IMPL__) || defined(ETHR_USE_OWN_MTX_IMPL__)
+
+#ifdef ETHR_DEBUG
+#  ifndef ETHR_MTX_CHK_EXCL
+#    define ETHR_MTX_CHK_EXCL
+#  endif
+#  ifndef ETHR_MTX_CHK_NON_EXCL
+#    define ETHR_MTX_CHK_NON_EXCL
+#  endif
+#endif
+
+#if 0
+#  define ETHR_MTX_Q_LOCK_SPINLOCK__
+#  define ETHR_MTX_QLOCK_TYPE__ ethr_spinlock_t
+#elif defined(ETHR_PTHREADS)
+#  define ETHR_MTX_Q_LOCK_PTHREAD_MUTEX__
+#  define ETHR_MTX_QLOCK_TYPE__ pthread_mutex_t
+#elif defined(ETHR_WIN32_THREADS)
+#  define ETHR_MTX_Q_LOCK_CRITICAL_SECTION__
+#  define ETHR_MTX_QLOCK_TYPE__ CRITICAL_SECTION
+#else
+#  error Need a qlock implementation
+#endif
+
+#define ETHR_RWMTX_W_FLG__		(((ethr_sint32_t) 1) << 31)
+#define ETHR_RWMTX_W_WAIT_FLG__		(((ethr_sint32_t) 1) << 30)
+#define ETHR_RWMTX_R_WAIT_FLG__		(((ethr_sint32_t) 1) << 29)
+
+/* frequent read kind */
+#define ETHR_RWMTX_R_FLG__		(((ethr_sint32_t) 1) << 28)
+#define ETHR_RWMTX_R_ABRT_UNLCK_FLG__	(((ethr_sint32_t) 1) << 27)
+#define ETHR_RWMTX_R_PEND_UNLCK_MASK__	(ETHR_RWMTX_R_ABRT_UNLCK_FLG__ - 1)
+
+/* normal kind */
+#define ETHR_RWMTX_RS_MASK__		(ETHR_RWMTX_R_WAIT_FLG__ - 1)
+
+#define ETHR_RWMTX_WAIT_FLGS__ \
+  (ETHR_RWMTX_W_WAIT_FLG__|ETHR_RWMTX_R_WAIT_FLG__)
+
+#define ETHR_CND_WAIT_FLG__		ETHR_RWMTX_R_WAIT_FLG__
+
+#ifdef ETHR_DEBUG
+#define ETHR_DBG_CHK_UNUSED_FLG_BITS(V)			\
+  ETHR_ASSERT(!((V) & ~(ETHR_RWMTX_W_FLG__		\
+			| ETHR_RWMTX_W_WAIT_FLG__	\
+			| ETHR_RWMTX_R_WAIT_FLG__	\
+			| ETHR_RWMTX_RS_MASK__)))
+#else
+#define ETHR_DBG_CHK_UNUSED_FLG_BITS(V)
+#endif
+
+#define ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(MTX)		\
+  ETHR_DBG_CHK_UNUSED_FLG_BITS(ethr_atomic32_read(&(MTX)->mtxb.flgs))
+
+struct ethr_mutex_base_ {
+#ifdef ETHR_MTX_HARD_DEBUG_FENCE
+    long pre_fence;
+#endif
+    ethr_atomic32_t flgs;
+    short aux_scnt;
+    short main_scnt;
+    ETHR_MTX_QLOCK_TYPE__ qlck;
+    ethr_ts_event *q;
+#ifdef ETHR_MTX_HARD_DEBUG_WSQ
+    int ws;
+#endif
+#ifdef ETHR_MTX_CHK_EXCL
+    ethr_atomic32_t exclusive;
+#endif
+#ifdef ETHR_MTX_CHK_NON_EXCL
+    ethr_atomic32_t non_exclusive;
+#endif
+#ifdef ETHR_MTX_HARD_DEBUG_LFS
+    ethr_atomic32_t hdbg_lfs;
+#endif
+};
+
+#endif
+
+typedef struct {
+    int main_spincount;
+    int aux_spincount;
+} ethr_mutex_opt;
+
+typedef struct {
+    int main_spincount;
+    int aux_spincount;
+} ethr_cond_opt;
+
+#ifdef ETHR_USE_OWN_MTX_IMPL__
+
+typedef struct ethr_mutex_ ethr_mutex;
+struct ethr_mutex_ {
+    struct ethr_mutex_base_ mtxb;
+#ifdef ETHR_MTX_HARD_DEBUG_FENCE
+    long post_fence;
+#endif
+#if ETHR_XCHK
+    int initialized;
+#endif
+};
+
+typedef struct ethr_cond_ ethr_cond;
+struct ethr_cond_ {
+#ifdef ETHR_MTX_HARD_DEBUG_FENCE
+    struct {
+	long pre_fence;
+    } mtxb; /* mtxb allows us to use same macro as for mutex and rwmutex... */
+#endif
+    ETHR_MTX_QLOCK_TYPE__ qlck;
+    ethr_ts_event *q;
+    short aux_scnt;
+    short main_scnt;
+#ifdef ETHR_MTX_HARD_DEBUG_FENCE
+    long post_fence;
+#endif
+#if ETHR_XCHK
+    int initialized;
+#endif
+};
+
+#else /* pthread */
+
+typedef struct ethr_mutex_ ethr_mutex;
+struct ethr_mutex_ {
+    pthread_mutex_t pt_mtx;
+#if ETHR_XCHK
+    int initialized;
+#endif
+};
+
+typedef struct ethr_cond_ ethr_cond;
+struct ethr_cond_ {
+    pthread_cond_t pt_cnd;
+#if ETHR_XCHK
+    int initialized;
+#endif
+};
+
+#endif /* pthread */
+
+int ethr_mutex_init_opt(ethr_mutex *, ethr_mutex_opt *);
+int ethr_mutex_init(ethr_mutex *);
+int ethr_mutex_destroy(ethr_mutex *);
+#if !defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_MUTEX_IMPL__)
+int ethr_mutex_trylock(ethr_mutex *);
+void ethr_mutex_lock(ethr_mutex *);
+void ethr_mutex_unlock(ethr_mutex *);
+#endif
+int ethr_cond_init_opt(ethr_cond *, ethr_cond_opt *);
+int ethr_cond_init(ethr_cond *);
+int ethr_cond_destroy(ethr_cond *);
+void ethr_cond_signal(ethr_cond *);
+void ethr_cond_broadcast(ethr_cond *);
+int ethr_cond_wait(ethr_cond *, ethr_mutex *);
+
+typedef enum {
+    ETHR_RWMUTEX_TYPE_NORMAL,
+    ETHR_RWMUTEX_TYPE_FREQUENT_READ,
+    ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ
+} ethr_rwmutex_type;
+
+typedef enum {
+    ETHR_RWMUTEX_LONG_LIVED,
+    ETHR_RWMUTEX_SHORT_LIVED,
+    ETHR_RWMUTEX_UNKNOWN_LIVED
+} ethr_rwmutex_lived;
+
+typedef struct {
+    ethr_rwmutex_type type;
+    ethr_rwmutex_lived lived;
+    int main_spincount;
+    int aux_spincount;
+} ethr_rwmutex_opt;
+
+#define ETHR_RWMUTEX_OPT_DEFAULT_INITER \
+  {ETHR_RWMUTEX_TYPE_NORMAL, ETHR_RWMUTEX_UNKNOWN_LIVED, -1, -1}
+
+#ifdef ETHR_USE_OWN_RWMTX_IMPL__
+
+typedef union {
+    struct {
+	ethr_atomic32_t readers;
+	int waiting_readers;
+	int byte_offset;
+	ethr_rwmutex_lived lived;
+    } data;
+    char align__[ETHR_CACHE_LINE_SIZE];
+} ethr_rwmtx_readers_array__;
+
+typedef struct ethr_rwmutex_ ethr_rwmutex;
+struct ethr_rwmutex_ {
+    struct ethr_mutex_base_ mtxb;
+    ethr_rwmutex_type type;
+    ethr_ts_event *rq_end;
+    union {
+	ethr_rwmtx_readers_array__ *ra;
+	int rs;
+    } tdata;
+#ifdef ETHR_MTX_HARD_DEBUG_FENCE
+    long post_fence;
+#endif
+#if ETHR_XCHK
+    int initialized;
+#endif
+};
+
+#else /* pthread_rwlock */
+
+typedef struct ethr_rwmutex_ ethr_rwmutex;
+struct ethr_rwmutex_ {
+    pthread_rwlock_t pt_rwlock;
+#if ETHR_XCHK
+    int initialized;
+#endif
+};
+
+#endif /* pthread_rwlock */
+
+int ethr_rwmutex_set_reader_group(int);
+int ethr_rwmutex_init_opt(ethr_rwmutex *, ethr_rwmutex_opt *);
+int ethr_rwmutex_init(ethr_rwmutex *);
+int ethr_rwmutex_destroy(ethr_rwmutex *);
+#if defined(ETHR_USE_OWN_RWMTX_IMPL__) \
+    || !defined(ETHR_TRY_INLINE_FUNCS) \
+    || defined(ETHR_MUTEX_IMPL__)
+int ethr_rwmutex_tryrlock(ethr_rwmutex *);
+void ethr_rwmutex_rlock(ethr_rwmutex *);
+void ethr_rwmutex_runlock(ethr_rwmutex *);
+int ethr_rwmutex_tryrwlock(ethr_rwmutex *);
+void ethr_rwmutex_rwlock(ethr_rwmutex *);
+void ethr_rwmutex_rwunlock(ethr_rwmutex *);
+#endif
+
+#ifdef ETHR_MTX_HARD_DEBUG
+#define ETHR_MTX_HARD_ASSERT(A) \
+  ((void) ((A) ? 1 : ethr_assert_failed(__FILE__, __LINE__, #A)))
+#else
+#define ETHR_MTX_HARD_ASSERT(A) ((void) 1)
+#endif
+
+#ifdef ETHR_MTX_HARD_DEBUG_LFS
+#  define ETHR_MTX_HARD_DEBUG_LFS_INIT(MTXB)				\
+do {									\
+    ethr_atomic32_init(&(MTXB)->hdbg_lfs, 0);				\
+} while (0)
+#  define ETHR_MTX_HARD_DEBUG_LFS_RLOCK(MTXB)				\
+do {									\
+    ethr_sint32_t val__;						\
+    ETHR_COMPILER_BARRIER;						\
+    val__ = ethr_atomic32_inc_read(&(MTXB)->hdbg_lfs);			\
+    ETHR_MTX_HARD_ASSERT(val__ > 0);					\
+} while (0)
+#  define ETHR_MTX_HARD_DEBUG_LFS_TRYRLOCK(MTXB, RES)			\
+do {									\
+    ETHR_COMPILER_BARRIER;						\
+    if ((RES) == 0)							\
+	ETHR_MTX_HARD_DEBUG_LFS_RLOCK((MTXB));				\
+    else								\
+	ETHR_MTX_HARD_ASSERT((RES) == EBUSY);				\
+} while (0)
+#  define ETHR_MTX_HARD_DEBUG_LFS_RUNLOCK(MTXB)				\
+do {									\
+    ethr_sint32_t val__ = ethr_atomic32_dec_read(&(MTXB)->hdbg_lfs);	\
+    ETHR_MTX_HARD_ASSERT(val__ >= 0);					\
+    ETHR_COMPILER_BARRIER;						\
+} while (0)
+#  define ETHR_MTX_HARD_DEBUG_LFS_RWLOCK(MTXB)				\
+do {									\
+    ethr_sint32_t val__;						\
+    ETHR_COMPILER_BARRIER;						\
+    val__ = ethr_atomic32_dec_read(&(MTXB)->hdbg_lfs);			\
+    ETHR_MTX_HARD_ASSERT(val__ == -1);					\
+} while (0)
+#  define ETHR_MTX_HARD_DEBUG_LFS_TRYRWLOCK(MTXB, RES)			\
+do {									\
+    ETHR_COMPILER_BARRIER;						\
+    if ((RES) == 0)							\
+	ETHR_MTX_HARD_DEBUG_LFS_RWLOCK((MTXB));				\
+    else								\
+	ETHR_MTX_HARD_ASSERT((RES) == EBUSY);				\
+} while (0)
+#  define ETHR_MTX_HARD_DEBUG_LFS_RWUNLOCK(MTXB)			\
+do {									\
+    ethr_sint32_t val__ = ethr_atomic32_inctest(&(MTXB)->hdbg_lfs);	\
+    ETHR_MTX_HARD_ASSERT(val__ == 0);					\
+    ETHR_COMPILER_BARRIER;						\
+} while (0)
+#else
+#  define ETHR_MTX_HARD_DEBUG_LFS_INIT(MTXB)
+#  define ETHR_MTX_HARD_DEBUG_LFS_RLOCK(MTXB)
+#  define ETHR_MTX_HARD_DEBUG_LFS_TRYRLOCK(MTXB, RES)
+#  define ETHR_MTX_HARD_DEBUG_LFS_RUNLOCK(MTXB)
+#  define ETHR_MTX_HARD_DEBUG_LFS_RWLOCK(MTXB)
+#  define ETHR_MTX_HARD_DEBUG_LFS_TRYRWLOCK(MTXB, RES)
+#  define ETHR_MTX_HARD_DEBUG_LFS_RWUNLOCK(MTXB)
+#endif
+
+#ifdef ETHR_MTX_HARD_DEBUG_FENCE
+
+#if ETHR_SIZEOF_PTR == 8
+#  define ETHR_MTX_HARD_DEBUG_PRE_FENCE		0xdeadbeefdeadbeefL
+#  define ETHR_MTX_HARD_DEBUG_POST_FENCE	0xdeaddeaddeaddeadL
+#else
+#  define ETHR_MTX_HARD_DEBUG_PRE_FENCE		0xdeaddeadL
+#  define ETHR_MTX_HARD_DEBUG_POST_FENCE	0xdeaddeadL
+#endif
+
+#define ETHR_MTX_HARD_DEBUG_FENCE_CHK(X) \
+do { \
+    ETHR_COMPILER_BARRIER; \
+    ETHR_MTX_HARD_ASSERT((X)->mtxb.pre_fence == ETHR_MTX_HARD_DEBUG_PRE_FENCE);\
+    ETHR_MTX_HARD_ASSERT((X)->post_fence == ETHR_MTX_HARD_DEBUG_POST_FENCE); \
+    ETHR_COMPILER_BARRIER; \
+} while (0)
+#define ETHR_MTX_HARD_DEBUG_FENCE_INIT(X) \
+do { \
+    (X)->mtxb.pre_fence = ETHR_MTX_HARD_DEBUG_PRE_FENCE; \
+    (X)->post_fence = ETHR_MTX_HARD_DEBUG_POST_FENCE; \
+} while (0)
+#else
+#define ETHR_MTX_HARD_DEBUG_FENCE_CHK(X)
+#define ETHR_MTX_HARD_DEBUG_FENCE_INIT(X)
+#endif
+
+#ifdef ETHR_MTX_CHK_EXCL
+
+#if !defined(ETHR_DEBUG) && defined(__GNUC__)
+#warning "check exclusive is enabled"
+#endif
+
+#  define ETHR_MTX_CHK_EXCL_INIT__(MTXB)		\
+    ethr_atomic32_init(&(MTXB)->exclusive, 0)
+
+#  define ETHR_MTX_CHK_EXCL_IS_EXCL(MTXB)		\
+do {							\
+    ETHR_COMPILER_BARRIER;				\
+    if (!ethr_atomic32_read(&(MTXB)->exclusive))	\
+	ethr_assert_failed(__FILE__, __LINE__, __func__,\
+			   "is exclusive");		\
+    ETHR_COMPILER_BARRIER;				\
+} while (0)
+#  define ETHR_MTX_CHK_EXCL_IS_NOT_EXCL(MTXB)		\
+do {							\
+    ETHR_COMPILER_BARRIER;				\
+    if (ethr_atomic32_read(&(MTXB)->exclusive))		\
+	ethr_assert_failed(__FILE__, __LINE__, __func__,\
+			   "is not exclusive");		\
+    ETHR_COMPILER_BARRIER;				\
+} while (0)
+#  define ETHR_MTX_CHK_EXCL_SET_EXCL(MTXB)		\
+do {							\
+    ETHR_MTX_CHK_EXCL_IS_NOT_EXCL((MTXB));		\
+    ethr_atomic32_set(&(MTXB)->exclusive, 1);		\
+    ETHR_COMPILER_BARRIER;				\
+} while (0)
+#  define ETHR_MTX_CHK_EXCL_UNSET_EXCL(MTXB)		\
+do {							\
+    ETHR_MTX_CHK_EXCL_IS_EXCL((MTXB));			\
+    ethr_atomic32_set(&(MTXB)->exclusive, 0);		\
+    ETHR_COMPILER_BARRIER;				\
+} while (0)
+
+#ifdef ETHR_MTX_CHK_NON_EXCL
+
+#if !defined(ETHR_DEBUG) && defined(__GNUC__)
+#warning "check non-exclusive is enabled"
+#endif
+
+#    define ETHR_MTX_CHK_NON_EXCL_INIT__(MTXB)		\
+    ethr_atomic32_init(&(MTXB)->non_exclusive, 0)
+#    define ETHR_MTX_CHK_EXCL_IS_NON_EXCL(MTXB)		\
+do {							\
+    ETHR_COMPILER_BARRIER;				\
+    if (!ethr_atomic32_read(&(MTXB)->non_exclusive))	\
+	ethr_assert_failed(__FILE__, __LINE__, __func__,\
+			   "is non-exclusive");		\
+    ETHR_COMPILER_BARRIER;				\
+} while (0)
+#    define ETHR_MTX_CHK_EXCL_IS_NOT_NON_EXCL(MTXB)	\
+do {							\
+    ETHR_COMPILER_BARRIER;				\
+    if (ethr_atomic32_read(&(MTXB)->non_exclusive))	\
+	ethr_assert_failed(__FILE__, __LINE__, __func__,\
+			   "is not non-exclusive");	\
+    ETHR_COMPILER_BARRIER;				\
+} while (0)
+#    define ETHR_MTX_CHK_EXCL_SET_NON_EXCL(MTXB)	\
+do {							\
+    ETHR_COMPILER_BARRIER;				\
+    ethr_atomic32_inc(&(MTXB)->non_exclusive);		\
+    ETHR_COMPILER_BARRIER;				\
+} while (0)
+#    define ETHR_MTX_CHK_EXCL_SET_NON_EXCL_NO(MTXB, NO)	\
+do {							\
+    ETHR_COMPILER_BARRIER;				\
+    ethr_atomic32_add(&(MTXB)->non_exclusive, (NO));	\
+    ETHR_COMPILER_BARRIER;				\
+} while (0)
+#    define ETHR_MTX_CHK_EXCL_UNSET_NON_EXCL(MTXB)	\
+do {							\
+    ETHR_COMPILER_BARRIER;				\
+    ethr_atomic32_dec(&(MTXB)->non_exclusive);		\
+    ETHR_COMPILER_BARRIER;				\
+} while (0)
+#else
+#    define ETHR_MTX_CHK_NON_EXCL_INIT__(MTXB)
+#    define ETHR_MTX_CHK_EXCL_IS_NON_EXCL(MTXB)
+#    define ETHR_MTX_CHK_EXCL_IS_NOT_NON_EXCL(MTXB)
+#    define ETHR_MTX_CHK_EXCL_SET_NON_EXCL_NO(MTXB, NO)
+#    define ETHR_MTX_CHK_EXCL_SET_NON_EXCL(MTXB)
+#    define ETHR_MTX_CHK_EXCL_UNSET_NON_EXCL(MTXB)
+#endif
+
+#else
+#  define ETHR_MTX_CHK_EXCL_INIT__(MTXB)
+#  define ETHR_MTX_CHK_EXCL_IS_EXCL(MTXB)
+#  define ETHR_MTX_CHK_EXCL_IS_NOT_EXCL(MTXB)
+#  define ETHR_MTX_CHK_EXCL_SET_EXCL(MTXB)
+#  define ETHR_MTX_CHK_EXCL_UNSET_EXCL(MTXB)
+#  define ETHR_MTX_CHK_NON_EXCL_INIT__(MTXB)
+#  define ETHR_MTX_CHK_EXCL_IS_NON_EXCL(MTXB)
+#  define ETHR_MTX_CHK_EXCL_IS_NOT_NON_EXCL(MTXB)
+#  define ETHR_MTX_CHK_EXCL_SET_NON_EXCL_NO(MTXB, NO)
+#  define ETHR_MTX_CHK_EXCL_SET_NON_EXCL(MTXB)
+#  define ETHR_MTX_CHK_EXCL_UNSET_NON_EXCL(MTXB)
+#endif
+
+#  define ETHR_MTX_CHK_EXCL_INIT(MTXB)			\
+do {							\
+    ETHR_MTX_CHK_EXCL_INIT__((MTXB));			\
+    ETHR_MTX_CHK_NON_EXCL_INIT__((MTXB));		\
+} while (0)
+
+
+#ifdef ETHR_USE_OWN_MTX_IMPL__
+
+#define ETHR_MTX_DEFAULT_MAIN_SPINCOUNT_MAX 2000
+#define ETHR_MTX_DEFAULT_MAIN_SPINCOUNT_BASE 800
+#define ETHR_MTX_DEFAULT_MAIN_SPINCOUNT_INC 50
+#define ETHR_MTX_DEFAULT_AUX_SPINCOUNT 50
+
+#define ETHR_CND_DEFAULT_MAIN_SPINCOUNT 0
+#define ETHR_CND_DEFAULT_AUX_SPINCOUNT 0
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_MUTEX_IMPL__)
+
+void ethr_mutex_lock_wait__(ethr_mutex *, ethr_sint32_t);
+void ethr_mutex_unlock_wake__(ethr_mutex *, ethr_sint32_t);
+
+static ETHR_INLINE int
+ETHR_INLINE_FUNC_NAME_(ethr_mutex_trylock)(ethr_mutex *mtx)
+{
+    ethr_sint32_t act;
+    int res;
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
+
+    act = ethr_atomic32_cmpxchg_acqb(&mtx->mtxb.flgs, ETHR_RWMTX_W_FLG__, 0);
+    res = (act == 0) ? 0 : EBUSY;
+
+#ifdef ETHR_MTX_CHK_EXCL
+    if (res == 0)
+	ETHR_MTX_CHK_EXCL_SET_EXCL(&mtx->mtxb);
+#endif
+
+    ETHR_MTX_HARD_DEBUG_LFS_TRYRWLOCK(&mtx->mtxb, res);
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
+
+    ETHR_COMPILER_BARRIER;
+    return res;
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_mutex_lock)(ethr_mutex *mtx)
+{
+    ethr_sint32_t act;
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
+
+    act = ethr_atomic32_cmpxchg_acqb(&mtx->mtxb.flgs, ETHR_RWMTX_W_FLG__, 0);
+    if (act != 0)
+	ethr_mutex_lock_wait__(mtx, act);
+
+    ETHR_MTX_CHK_EXCL_SET_EXCL(&mtx->mtxb);
+
+    ETHR_MTX_HARD_DEBUG_LFS_RWLOCK(&mtx->mtxb);
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
+
+    ETHR_COMPILER_BARRIER;
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_mutex_unlock)(ethr_mutex *mtx)
+{
+    ethr_sint32_t act;
+    ETHR_COMPILER_BARRIER;
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_HARD_DEBUG_LFS_RWUNLOCK(&mtx->mtxb);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
+
+    ETHR_MTX_CHK_EXCL_UNSET_EXCL(&mtx->mtxb);
+
+    act = ethr_atomic32_cmpxchg_relb(&mtx->mtxb.flgs, 0, ETHR_RWMTX_W_FLG__);
+    if (act != ETHR_RWMTX_W_FLG__)
+	ethr_mutex_unlock_wake__(mtx, act);
+
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
+}
+
+#endif /* ETHR_TRY_INLINE_FUNCS */
+
+#else /* pthread_mutex */
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_MUTEX_IMPL__)
+
+static ETHR_INLINE int
+ETHR_INLINE_FUNC_NAME_(ethr_mutex_trylock)(ethr_mutex *mtx)
+{
+    int res;
+    res = pthread_mutex_trylock(&mtx->pt_mtx);
+    if (res != 0 && res != EBUSY)
+	ETHR_FATAL_ERROR__(res);
+    return res;
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_mutex_lock)(ethr_mutex *mtx)
+{
+    int res = pthread_mutex_lock(&mtx->pt_mtx);
+    if (res != 0)
+	ETHR_FATAL_ERROR__(res);
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_mutex_unlock)(ethr_mutex *mtx)
+{
+    int res = pthread_mutex_unlock(&mtx->pt_mtx);
+    if (res != 0)
+	ETHR_FATAL_ERROR__(res);
+}
+
+#endif /* ETHR_TRY_INLINE_FUNCS */
+
+#endif /* pthread_mutex */
+
+#ifdef ETHR_USE_OWN_RWMTX_IMPL__
+
+#define ETHR_RWMTX_DEFAULT_MAIN_SPINCOUNT_MAX 2000
+#define ETHR_RWMTX_DEFAULT_MAIN_SPINCOUNT_BASE 800
+#define ETHR_RWMTX_DEFAULT_MAIN_SPINCOUNT_INC 50
+#define ETHR_RWMTX_DEFAULT_AUX_SPINCOUNT 50
+
+#else /* pthread_rwlock */
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_MUTEX_IMPL__)
+
+static ETHR_INLINE int
+ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_tryrlock)(ethr_rwmutex *rwmtx)
+{
+    int res = pthread_rwlock_tryrdlock(&rwmtx->pt_rwlock);
+    if (res != 0 && res != EBUSY)
+	ETHR_FATAL_ERROR__(res);
+    return res;
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_rlock)(ethr_rwmutex *rwmtx)
+{
+    int res = pthread_rwlock_rdlock(&rwmtx->pt_rwlock);
+    if (res != 0)
+	ETHR_FATAL_ERROR__(res);
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_runlock)(ethr_rwmutex *rwmtx)
+{
+    int res = pthread_rwlock_unlock(&rwmtx->pt_rwlock);
+    if (res != 0)
+	ETHR_FATAL_ERROR__(res);
+}
+
+static ETHR_INLINE int
+ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_tryrwlock)(ethr_rwmutex *rwmtx)
+{
+    int res = pthread_rwlock_trywrlock(&rwmtx->pt_rwlock);
+    if (res != 0 && res != EBUSY)
+	ETHR_FATAL_ERROR__(res);
+    return res;
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_rwlock)(ethr_rwmutex *rwmtx)
+{
+    int res = pthread_rwlock_wrlock(&rwmtx->pt_rwlock);
+    if (res != 0)
+	ETHR_FATAL_ERROR__(res);
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_rwunlock)(ethr_rwmutex *rwmtx)
+{
+    int res = pthread_rwlock_unlock(&rwmtx->pt_rwlock);
+    if (res != 0)
+	ETHR_FATAL_ERROR__(res);
+}
+
+#endif /* ETHR_TRY_INLINE_FUNCS */
+
+#endif /* pthread_rwlock */
+
+int ethr_mutex_lib_init(int);
+int ethr_mutex_lib_late_init(int, int);
+
+#endif /* #ifndef ETHR_MUTEX_H__ */
diff --git a/erts/include/internal/ethr_optimized_fallbacks.h b/erts/include/internal/ethr_optimized_fallbacks.h
new file mode 100644
index 0000000000..8e04692856
--- /dev/null
+++ b/erts/include/internal/ethr_optimized_fallbacks.h
@@ -0,0 +1,209 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: "Optimized" fallbacks used when native ops are missing
+ * Author: Rickard Green
+ */
+
+#ifndef ETHR_OPTIMIZED_FALLBACKS_H__
+#define ETHR_OPTIMIZED_FALLBACKS_H__
+
+#ifdef ETHR_HAVE_NATIVE_ATOMICS
+#define ETHR_HAVE_OPTIMIZED_ATOMIC_OPS 1
+#endif
+
+#ifdef ETHR_HAVE_NATIVE_SPINLOCKS
+#define ETHR_HAVE_OPTIMIZED_SPINLOCKS 1
+#elif defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
+/* --- Optimized spinlocks using pthread spinlocks -------------------------- */
+#define ETHR_HAVE_OPTIMIZED_SPINLOCKS 1
+
+typedef pthread_spinlock_t ethr_opt_spinlock_t;
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
+
+static ETHR_INLINE int
+ethr_opt_spinlock_init(ethr_opt_spinlock_t *lock)
+{
+    return pthread_spin_init((pthread_spinlock_t *) lock, 0);
+}
+
+static ETHR_INLINE int
+ethr_opt_spinlock_destroy(ethr_opt_spinlock_t *lock)
+{
+    return pthread_spin_destroy((pthread_spinlock_t *) lock);
+}
+
+
+static ETHR_INLINE int
+ethr_opt_spin_unlock(ethr_opt_spinlock_t *lock)
+{
+    return pthread_spin_unlock((pthread_spinlock_t *) lock);
+}
+
+static ETHR_INLINE int
+ethr_opt_spin_lock(ethr_opt_spinlock_t *lock)
+{
+    return pthread_spin_lock((pthread_spinlock_t *) lock);
+}
+
+#endif
+
+#elif defined(ETHR_HAVE_NATIVE_ATOMICS)
+/* --- Native spinlocks using native atomics -------------------------------- */
+#define ETHR_HAVE_NATIVE_SPINLOCKS 1
+#define ETHR_HAVE_OPTIMIZED_SPINLOCKS 1
+
+#if defined(ETHR_HAVE_NATIVE_ATOMIC32)
+typedef ethr_native_atomic32_t ethr_native_spinlock_t;
+#  define ETHR_NATMC_FUNC__(X) ethr_native_atomic32_ ## X
+#elif defined(ETHR_HAVE_NATIVE_ATOMIC64)
+typedef ethr_native_atomic64_t ethr_native_spinlock_t;
+#  define ETHR_NATMC_FUNC__(X) ethr_native_atomic64_ ## X
+#else
+#  error "Missing native atomic implementation"
+#endif
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
+
+static ETHR_INLINE void
+ethr_native_spinlock_init(ethr_native_spinlock_t *lock)
+{
+    ETHR_NATMC_FUNC__(init)(lock, 0);
+}
+
+static ETHR_INLINE void
+ethr_native_spin_unlock(ethr_native_spinlock_t *lock)
+{
+    ETHR_COMPILER_BARRIER;
+    ETHR_ASSERT(ETHR_NATMC_FUNC__(read)(lock) == 1);
+    ETHR_NATMC_FUNC__(set_relb)(lock, 0);
+}
+
+static ETHR_INLINE void
+ethr_native_spin_lock(ethr_native_spinlock_t *lock)
+{
+    while (ETHR_NATMC_FUNC__(cmpxchg_acqb)(lock, 1, 0) != 0) {
+	while (ETHR_NATMC_FUNC__(read)(lock) != 0)
+	    ETHR_SPIN_BODY;
+    }
+    ETHR_COMPILER_BARRIER;
+}
+
+#endif
+
+#undef ETHR_NATMC_FUNC__
+
+#endif
+
+
+#ifdef ETHR_HAVE_NATIVE_RWSPINLOCKS
+#define ETHR_HAVE_OPTIMIZED_RWSPINLOCKS 1
+#elif defined(ETHR_HAVE_NATIVE_ATOMICS)
+/* --- Native rwspinlocks using native atomics ------------------------------ */
+#define ETHR_HAVE_NATIVE_RWSPINLOCKS 1
+#define ETHR_HAVE_OPTIMIZED_RWSPINLOCKS 1
+
+#if defined(ETHR_HAVE_NATIVE_ATOMIC32)
+typedef ethr_native_atomic32_t ethr_native_rwlock_t;
+#  define ETHR_NAINT_T__ ethr_sint32_t
+#  define ETHR_WLOCK_FLAG__ (((ethr_sint32_t) 1) << 30)
+#  define ETHR_NATMC_FUNC__(X) ethr_native_atomic32_ ## X
+#elif defined(ETHR_HAVE_NATIVE_ATOMIC64)
+typedef ethr_native_atomic64_t ethr_native_rwlock_t;
+#  define ETHR_NAINT_T__ ethr_sint64_t
+#  define ETHR_WLOCK_FLAG__ (((ethr_sint64_t) 1) << 62)
+#  define ETHR_NATMC_FUNC__(X) ethr_native_atomic64_ ## X
+#else
+#  error "Missing native atomic implementation"
+#endif
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
+
+static ETHR_INLINE void
+ethr_native_rwlock_init(ethr_native_rwlock_t *lock)
+{
+    ETHR_NATMC_FUNC__(init)(lock, 0);
+}
+
+static ETHR_INLINE void
+ethr_native_read_unlock(ethr_native_rwlock_t *lock)
+{
+    ETHR_COMPILER_BARRIER;
+#ifdef DEBUG
+    ETHR_ASSERT(ETHR_NATMC_FUNC__(read)(lock) >= 0);
+#endif
+    ETHR_NATMC_FUNC__(dec_relb)(lock);
+}
+
+static ETHR_INLINE void
+ethr_native_read_lock(ethr_native_rwlock_t *lock)
+{
+    ETHR_NAINT_T__ act, exp = 0;
+    while (1) {
+	act = ETHR_NATMC_FUNC__(cmpxchg_acqb)(lock, exp+1, exp);
+	if (act == exp)
+	    break;
+	while (act & ETHR_WLOCK_FLAG__) {
+	    ETHR_SPIN_BODY;
+	    act = ETHR_NATMC_FUNC__(read)(lock);
+	}
+	exp = act;
+    }
+    ETHR_COMPILER_BARRIER;
+}
+
+static ETHR_INLINE void
+ethr_native_write_unlock(ethr_native_rwlock_t *lock)
+{
+    ETHR_COMPILER_BARRIER;
+    ETHR_ASSERT(ETHR_NATMC_FUNC__(read)(lock) == ETHR_WLOCK_FLAG__);
+    ETHR_NATMC_FUNC__(set_relb)(lock, 0);
+}
+
+static ETHR_INLINE void
+ethr_native_write_lock(ethr_native_rwlock_t *lock)
+{
+    ETHR_NAINT_T__ act, exp = 0;
+    while (1) {
+	act = ETHR_NATMC_FUNC__(cmpxchg_acqb)(lock, exp|ETHR_WLOCK_FLAG__, exp);
+	if (act == exp)
+	    break;
+	ETHR_SPIN_BODY;
+	exp = act & ~ETHR_WLOCK_FLAG__;
+    }
+    act |= ETHR_WLOCK_FLAG__;
+    /* Wait for readers to leave */
+    while (act != ETHR_WLOCK_FLAG__) {
+	ETHR_SPIN_BODY;
+	act = ETHR_NATMC_FUNC__(read_acqb)(lock);
+    }
+    ETHR_COMPILER_BARRIER;
+}
+
+#endif
+
+#undef ETHR_NAINT_T__
+#undef ETHR_NATMC_FUNC__
+#undef ETHR_WLOCK_FLAG__
+
+#endif
+
+#endif
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h
index 4e7a38cd5c..4cd95faf6a 100644
--- a/erts/include/internal/ethread.h
+++ b/erts/include/internal/ethread.h
@@ -33,27 +33,15 @@
 #include <stdlib.h>
 #include "erl_errno.h"
 
-/*
- * Extra memory barrier requirements:
- * - ethr_atomic_or_old() needs to enforce a memory barrier sufficient
- *   for a lock operation.
- * - ethr_atomic_and_old() needs to enforce a memory barrier sufficient
- *   for an unlock operation.
- * - ethr_atomic_cmpxchg() needs to enforce a memory barrier sufficient
- *   for a lock and unlock operation.
- */
-
-
-#undef ETHR_USE_RWMTX_FALLBACK
 #undef ETHR_HAVE_OPTIMIZED_ATOMIC_OPS
-#undef ETHR_HAVE_OPTIMIZED_LOCKS
-
-typedef struct {
-    long tv_sec;
-    long tv_nsec;
-} ethr_timeval;
+#undef ETHR_HAVE_OPTIMIZED_SPINLOCK
+#undef ETHR_HAVE_OPTIMIZED_RWSPINLOCK
 
 #if defined(DEBUG)
+#  define ETHR_DEBUG
+#endif
+
+#if defined(ETHR_DEBUG)
 #  undef ETHR_XCHK
 #  define  ETHR_XCHK 1
 #else
@@ -68,47 +56,57 @@ typedef struct {
 #elif defined(__WIN32__)
 #  define ETHR_INLINE __forceinline
 #endif
-#if defined(DEBUG) || !defined(ETHR_INLINE) || ETHR_XCHK \
+#if defined(ETHR_DEBUG) || !defined(ETHR_INLINE) || ETHR_XCHK \
     || (defined(__GNUC__) && defined(ERTS_MIXED_CYGWIN_VC))
 #  undef ETHR_INLINE
 #  define ETHR_INLINE 
 #  undef ETHR_TRY_INLINE_FUNCS
 #endif
-#ifdef ETHR_FORCE_INLINE_FUNCS
-#  define ETHR_TRY_INLINE_FUNCS
-#endif
 
-#if !defined(ETHR_DISABLE_NATIVE_IMPLS) \
-    && (defined(PURIFY) || defined(VALGRIND) || defined(ERTS_MIXED_CYGWIN_VC))
+#if !defined(ETHR_DISABLE_NATIVE_IMPLS) && (defined(PURIFY)||defined(VALGRIND))
 #  define ETHR_DISABLE_NATIVE_IMPLS
 #endif
 
-#define ETHR_RWMUTEX_INITIALIZED 	0x99999999
-#define ETHR_MUTEX_INITIALIZED		0x77777777
-#define ETHR_COND_INITIALIZED		0x55555555
+/* Assume 64-byte cache line size */
+#define ETHR_CACHE_LINE_SIZE ((ethr_uint_t) 64)
+#define ETHR_CACHE_LINE_MASK (ETHR_CACHE_LINE_SIZE - 1)
 
-#define ETHR_CACHE_LINE_SIZE 64
+#define ETHR_CACHE_LINE_ALIGN_SIZE(SZ) \
+  (((((SZ) - 1) / ETHR_CACHE_LINE_SIZE) + 1) * ETHR_CACHE_LINE_SIZE)
 
-#ifdef ETHR_INLINE_FUNC_NAME_
-#  define ETHR_CUSTOM_INLINE_FUNC_NAME_
-#else
+#ifndef ETHR_INLINE_FUNC_NAME_
 #  define ETHR_INLINE_FUNC_NAME_(X) X
 #endif
 
-#define ETHR_COMPILER_BARRIER ethr_compiler_barrier()
-#ifdef __GNUC__
-#  undef ETHR_COMPILER_BARRIER
-#  define ETHR_COMPILER_BARRIER __asm__ __volatile__("":::"memory")
+#if !defined(__func__)
+#  if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
+#    if !defined(__GNUC__) ||  __GNUC__ < 2
+#      define __func__ "[unknown_function]"
+#    else
+#      define __func__ __FUNCTION__
+#    endif
+#  endif
 #endif
 
-#ifdef DEBUG
+int ethr_assert_failed(const char *file, int line, const char *func, char *a);
+#ifdef ETHR_DEBUG
 #define ETHR_ASSERT(A) \
-  ((void) ((A) ? 1 : ethr_assert_failed(__FILE__, __LINE__, #A)))
-int ethr_assert_failed(char *f, int l, char *a);
+  ((void) ((A) ? 1 : ethr_assert_failed(__FILE__, __LINE__, __func__, #A)))
 #else
 #define ETHR_ASSERT(A) ((void) 1)
 #endif
 
+#if defined(__GNUC__)
+#  define ETHR_PROTO_NORETURN__ void __attribute__((noreturn))
+#  define ETHR_IMPL_NORETURN__ void
+#elif defined(__WIN32__) && defined(_MSC_VER)
+#  define ETHR_PROTO_NORETURN__ __declspec(noreturn) void
+#  define ETHR_IMPL_NORETURN__ __declspec(noreturn) void
+#else
+#  define ETHR_PROTO_NORETURN__ void
+#  define ETHR_IMPL_NORETURN__ void
+#endif
+
 #if defined(ETHR_PTHREADS)
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
  * The pthread implementation                                                *
@@ -118,7 +116,9 @@ int ethr_assert_failed(char *f, int l, char *a);
 #error "_GNU_SOURCE not defined. Please, compile all files with -D_GNU_SOURCE."
 #endif
 
-#if defined(ETHR_HAVE_MIT_PTHREAD_H)
+#if defined(ETHR_NEED_NPTL_PTHREAD_H)
+#include <nptl/pthread.h>
+#elif defined(ETHR_HAVE_MIT_PTHREAD_H)
 #include <pthread/mit/pthread.h>
 #elif defined(ETHR_HAVE_PTHREAD_H)
 #include <pthread.h>
@@ -128,130 +128,23 @@ int ethr_assert_failed(char *f, int l, char *a);
 
 typedef pthread_t ethr_tid;
 
-typedef struct ethr_mutex_ ethr_mutex;
-struct ethr_mutex_ {
-    pthread_mutex_t pt_mtx;
-    int is_rec_mtx;
-    ethr_mutex *prev;
-    ethr_mutex *next;
-#if ETHR_XCHK
-    int initialized;
-#endif
-};
-
-typedef struct ethr_cond_ ethr_cond;
-struct ethr_cond_ {
-    pthread_cond_t pt_cnd;
-#if ETHR_XCHK
-    int initialized;
-#endif
-};
+typedef pthread_key_t ethr_tsd_key;
 
-#ifndef ETHR_HAVE_PTHREAD_RWLOCK_INIT
-#define ETHR_USE_RWMTX_FALLBACK
-#else
-typedef struct ethr_rwmutex_ ethr_rwmutex;
-struct ethr_rwmutex_ {
-    pthread_rwlock_t pt_rwlock;
-#if ETHR_XCHK
-    int initialized;
-#endif
-};
-#endif
+#define ETHR_HAVE_ETHR_SIG_FUNCS 1
 
-/* Static initializers */
-#if ETHR_XCHK
-#define ETHR_MUTEX_XCHK_INITER	, ETHR_MUTEX_INITIALIZED
-#define ETHR_COND_XCHK_INITER	, ETHR_COND_INITIALIZED
-#else
-#define ETHR_MUTEX_XCHK_INITER
-#define ETHR_COND_XCHK_INITER
+#if defined(PURIFY) || defined(VALGRIND)
+#  define ETHR_FORCE_PTHREAD_RWLOCK
+#  define ETHR_FORCE_PTHREAD_MUTEX
 #endif
 
-#define ETHR_MUTEX_INITER {PTHREAD_MUTEX_INITIALIZER, 0, NULL, NULL ETHR_MUTEX_XCHK_INITER}
-#define ETHR_COND_INITER {PTHREAD_COND_INITIALIZER ETHR_COND_XCHK_INITER}
-
-#if defined(ETHR_HAVE_PTHREAD_MUTEXATTR_SETTYPE) \
-    || defined(ETHR_HAVE_PTHREAD_MUTEXATTR_SETKIND_NP)
-#  define ETHR_HAVE_ETHR_REC_MUTEX_INIT 1
-#  ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#    define ETHR_REC_MUTEX_INITER \
-            {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, 1, NULL, NULL ETHR_MUTEX_XCHK_INITER}
-#  endif
-#else
-#  undef ETHR_HAVE_ETHR_REC_MUTEX_INIT
+#if !defined(ETHR_FORCE_PTHREAD_RWLOCK)
+#  define ETHR_USE_OWN_RWMTX_IMPL__
 #endif
 
-#ifndef ETHR_HAVE_PTHREAD_ATFORK
-#  define ETHR_NO_FORKSAFETY 1
+#if !defined(ETHR_FORCE_PTHREAD_MUTEX) && 0
+#  define ETHR_USE_OWN_MTX_IMPL__
 #endif
 
-typedef pthread_key_t ethr_tsd_key;
-
-#define ETHR_HAVE_ETHR_SIG_FUNCS 1
-
-#ifdef ETHR_TRY_INLINE_FUNCS
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_mutex_trylock)(ethr_mutex *mtx)
-{
-    return pthread_mutex_trylock(&mtx->pt_mtx);
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_mutex_lock)(ethr_mutex *mtx)
-{
-    return pthread_mutex_lock(&mtx->pt_mtx);
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_mutex_unlock)(ethr_mutex *mtx)
-{
-    return pthread_mutex_unlock(&mtx->pt_mtx);
-}
-
-#ifdef ETHR_HAVE_PTHREAD_RWLOCK_INIT
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_tryrlock)(ethr_rwmutex *rwmtx)
-{
-    return pthread_rwlock_tryrdlock(&rwmtx->pt_rwlock);
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_rlock)(ethr_rwmutex *rwmtx)
-{
-    return pthread_rwlock_rdlock(&rwmtx->pt_rwlock);
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_runlock)(ethr_rwmutex *rwmtx)
-{
-    return pthread_rwlock_unlock(&rwmtx->pt_rwlock);
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_tryrwlock)(ethr_rwmutex *rwmtx)
-{
-    return pthread_rwlock_trywrlock(&rwmtx->pt_rwlock);
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_rwlock)(ethr_rwmutex *rwmtx)
-{
-    return pthread_rwlock_wrlock(&rwmtx->pt_rwlock);
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_rwunlock)(ethr_rwmutex *rwmtx)
-{
-    return pthread_rwlock_unlock(&rwmtx->pt_rwlock);
-}
-
-#endif /* ETHR_HAVE_PTHREAD_RWLOCK_INIT */
-
-#endif /* ETHR_TRY_INLINE_FUNCS */
-
 #elif defined(ETHR_WIN32_THREADS)
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
  * The native win32 threads implementation                                   *
@@ -273,418 +166,89 @@ ETHR_INLINE_FUNC_NAME_(ethr_rwmutex_rwunlock)(ethr_rwmutex *rwmtx)
 #  undef WIN32_LEAN_AND_MEAN
 #endif
 
-/* Types */
-typedef long ethr_tid; /* thread id type */
-typedef struct {
-    volatile int initialized;
-    CRITICAL_SECTION cs;
-#if ETHR_XCHK
-    int is_rec_mtx;
-#endif
-} ethr_mutex;
-
-typedef struct cnd_wait_event__ cnd_wait_event_;
-
-typedef struct {
-    volatile int initialized;
-    CRITICAL_SECTION cs;
-    cnd_wait_event_ *queue;
-    cnd_wait_event_ *queue_end;
-} ethr_cond;
-
-#define ETHR_USE_RWMTX_FALLBACK
-
-/* Static initializers */
-
-#define ETHR_MUTEX_INITER {0}
-#define ETHR_COND_INITER {0}
-
-#define ETHR_REC_MUTEX_INITER ETHR_MUTEX_INITER
-
-#define ETHR_HAVE_ETHR_REC_MUTEX_INIT 1
-
-typedef DWORD ethr_tsd_key;
-
-#undef ETHR_HAVE_ETHR_SIG_FUNCS
-
-#ifdef ETHR_TRY_INLINE_FUNCS
-int ethr_fake_static_mutex_init(ethr_mutex *mtx);
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_mutex_trylock)(ethr_mutex *mtx)
-{
-    if (!mtx->initialized) {
-	int res = ethr_fake_static_mutex_init(mtx);
-	if (res != 0)
-	    return res;
-    }
-    return TryEnterCriticalSection(&mtx->cs) ? 0 : EBUSY;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_mutex_lock)(ethr_mutex *mtx)
-{
-    if (!mtx->initialized) {
-	int res = ethr_fake_static_mutex_init(mtx);
-	if (res != 0)
-	    return res;
-    }
-    EnterCriticalSection(&mtx->cs);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_mutex_unlock)(ethr_mutex *mtx)
-{
-    LeaveCriticalSection(&mtx->cs);
-    return 0;
-}
-
-#endif /* #ifdef ETHR_TRY_INLINE_FUNCS */
+#if defined(_MSC_VER)
 
-#ifdef ERTS_MIXED_CYGWIN_VC
-
-/* atomics */
-
-#ifdef _MSC_VER
-#  if _MSC_VER < 1300
-#    define ETHR_IMMED_ATOMIC_SET_GET_SAFE__ 0 /* Dont trust really old compilers */
-#  else
-#    if defined(_M_IX86)
-#      define ETHR_IMMED_ATOMIC_SET_GET_SAFE__ 1
-#    else /* I.e. IA64 */
-#      if _MSC_VER >= 1400 
-#        define ETHR_IMMED_ATOMIC_SET_GET_SAFE__ 1
-#      else
-#        define ETHR_IMMED_ATOMIC_SET_GET_SAFE__ 0
-#      endif
-#    endif
-#  endif
-#  if _MSC_VER >= 1400
-#    include <intrin.h>
-#    undef ETHR_COMPILER_BARRIER
-#    define ETHR_COMPILER_BARRIER _ReadWriteBarrier()
-#  endif
-#pragma intrinsic(_ReadWriteBarrier)
-#pragma intrinsic(_InterlockedAnd)
-#pragma intrinsic(_InterlockedOr)
-#else
-#    define ETHR_IMMED_ATOMIC_SET_GET_SAFE__ 0 
+#if ETHR_SIZEOF_LONG == 4
+#define ETHR_HAVE_INT32_T 1
+typedef long ethr_sint32_t;
+typedef unsigned long ethr_uint32_t;
 #endif
 
-#define ETHR_HAVE_OPTIMIZED_ATOMIC_OPS 1
-#define ETHR_HAVE_OPTIMIZED_LOCKS 1
-
-#define ETHR_MEMORY_BARRIER \
-do { \
-    volatile LONG x___ = 0; \
-    (void) _InterlockedCompareExchange(&x___, (LONG) 1, (LONG) 0); \
-} while (0)
-
-typedef struct {
-    volatile LONG value;
-} ethr_atomic_t;
-
-typedef struct {
-    volatile LONG locked;
-} ethr_spinlock_t;
-
-typedef struct {
-    volatile LONG counter;
-} ethr_rwlock_t;
-#define ETHR_WLOCK_FLAG__ (((LONG) 1) << 30)
-
-#ifdef ETHR_TRY_INLINE_FUNCS
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_init)(ethr_atomic_t *var, long i)
-{
-#if ETHR_IMMED_ATOMIC_SET_GET_SAFE__
-    var->value = (LONG) i;
-#else
-    (void) InterlockedExchange(&var->value, (LONG) i);
+#if ETHR_SIZEOF___INT64 == 8
+#define ETHR_HAVE_INT64_T 1
+typedef __int64 ethr_sint64_t;
+typedef unsigned __int64 ethr_uint64_t;
 #endif
-    return 0;
-}
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_set)(ethr_atomic_t *var, long i)
-{
-#if ETHR_IMMED_ATOMIC_SET_GET_SAFE__
-    var->value = (LONG) i;
-#else
-    (void) InterlockedExchange(&var->value, (LONG) i);
 #endif
-    return 0;
-}
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_read)(ethr_atomic_t *var, long *i)
-{
-#if ETHR_IMMED_ATOMIC_SET_GET_SAFE__
-    *i = var->value;
-#else
-    *i = InterlockedExchangeAdd(&var->value, (LONG) 0);
-#endif
-    return 0;
-}
+struct ethr_join_data_;
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_add)(ethr_atomic_t *var, long incr)
-{
-    (void) InterlockedExchangeAdd(&var->value, (LONG) incr);
-    return 0;
-}   
-    
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_addtest)(ethr_atomic_t *var,
-					    long i,
-					    long *testp)
-{
-    *testp = InterlockedExchangeAdd(&var->value, (LONG) i);
-    *testp += i;
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_inc)(ethr_atomic_t *var)
-{
-    (void) InterlockedIncrement(&var->value);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_dec)(ethr_atomic_t *var)
-{
-    (void) InterlockedDecrement(&var->value);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_inctest)(ethr_atomic_t *var, long *testp)
-{
-    *testp = (long) InterlockedIncrement(&var->value);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_dectest)(ethr_atomic_t *var, long *testp)
-{
-    *testp = (long) InterlockedDecrement(&var->value);
-    return 0;
-}
+/* Types */
+typedef struct {
+    long id;
+    struct ethr_join_data_ *jdata;
+} ethr_tid; /* thread id type */
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_and_old)(ethr_atomic_t *var,
-					    long mask,
-					    long *old)
-{
-    /*
-     * See "Extra memory barrier requirements" note at the top
-     * of the file.
-     *
-     * According to msdn _InterlockedAnd() provides a full
-     * memory barrier.
-     */
-    *old = (long) _InterlockedAnd(&var->value, mask);
-    return 0;
-}
+typedef DWORD ethr_tsd_key;
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_or_old)(ethr_atomic_t *var,
-					   long mask,
-					   long *old)
-{
-    /*
-     * See "Extra memory barrier requirements" note at the top
-     * of the file.
-     *
-     * According to msdn _InterlockedOr() provides a full
-     * memory barrier.
-     */
-    *old = (long) _InterlockedOr(&var->value, mask);
-    return 0;
-}
+#undef ETHR_HAVE_ETHR_SIG_FUNCS
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_cmpxchg)(ethr_atomic_t *var,
-					    long new,
-                                            long expected,
-					    long *old)
-{
-    /*
-     * See "Extra memory barrier requirements" note at the top
-     * of the file.
-     *
-     * According to msdn _InterlockedCompareExchange() provides a full
-     * memory barrier.
-     */
-    *old = _InterlockedCompareExchange(&var->value, (LONG) new, (LONG) expected);
-    return 0;
-}
+#define ETHR_USE_OWN_RWMTX_IMPL__
+#define ETHR_USE_OWN_MTX_IMPL__
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_xchg)(ethr_atomic_t *var,
-					 long new,
-					 long *old)
-{
-    *old = (long) InterlockedExchange(&var->value, (LONG) new);
-    return 0;
-}
+#define ETHR_YIELD() (Sleep(0), 0)
 
-/*
- * According to msdn InterlockedExchange() provides a full
- * memory barrier. 
- */
+#else /* No supported thread lib found */
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_spinlock_init)(ethr_spinlock_t *lock)
-{
-#if ETHR_IMMED_ATOMIC_SET_GET_SAFE__
-    lock->locked = (LONG) 0;
+#ifdef ETHR_NO_SUPP_THR_LIB_NOT_FATAL
+#define ETHR_NO_THREAD_LIB
 #else
-    (void) InterlockedExchange(&lock->locked, (LONG) 0);
+#error "No supported thread lib found"
 #endif
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_spinlock_destroy)(ethr_spinlock_t *lock)
-{
-    return 0;
-}
-
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_spin_unlock)(ethr_spinlock_t *lock)
-{
-    ETHR_COMPILER_BARRIER;
-    {
-#ifdef DEBUG
-	LONG old =
 #endif
-	    InterlockedExchange(&lock->locked, (LONG) 0);
-#ifdef DEBUG
-	ETHR_ASSERT(old == 1);
-#endif
-    }
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_spin_lock)(ethr_spinlock_t *lock)
-{
-    LONG old;
-    do {
-	old = InterlockedExchange(&lock->locked, (LONG) 1);
-    } while (old != (LONG) 0);
-    ETHR_COMPILER_BARRIER;
-    return 0;
-}
 
-/*
- * According to msdn InterlockedIncrement, InterlockedDecrement,
- * and InterlockedExchangeAdd(), _InterlockedAnd, and _InterlockedOr
- * provides full memory barriers.
- */
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_rwlock_init)(ethr_rwlock_t *lock)
-{
-#if ETHR_IMMED_ATOMIC_SET_GET_SAFE__
-    lock->counter = (LONG) 0;
-#else
-    (void) InterlockedExchange(&lock->counter, (LONG) 0);
+#ifndef ETHR_HAVE_INT32_T
+#if ETHR_SIZEOF_INT == 4
+#define ETHR_HAVE_INT32_T 1
+typedef int ethr_sint32_t;
+typedef unsigned int ethr_uint32_t;
+#elif ETHR_SIZEOF_LONG == 4
+#define ETHR_HAVE_INT32_T 1
+typedef long ethr_sint32_t;
+typedef unsigned long ethr_uint32_t;
 #endif
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_rwlock_destroy)(ethr_rwlock_t *lock)
-{
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_read_unlock)(ethr_rwlock_t *lock)
-{
-    ETHR_COMPILER_BARRIER;
-    {
-#ifdef DEBUG
-	LONG old =
 #endif
-	    InterlockedDecrement(&lock->counter);
-	ETHR_ASSERT(old != 0);
-    }
-    return 0;
-}
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_read_lock)(ethr_rwlock_t *lock)
-{
-    while (1) {
-	LONG old = InterlockedIncrement(&lock->counter);
-	if ((old & ETHR_WLOCK_FLAG__) == 0)
-	    break; /* Got read lock */
-	/* Restore and wait for writers to unlock */
-	old = InterlockedDecrement(&lock->counter);
-	while (old & ETHR_WLOCK_FLAG__) {
-#if ETHR_IMMED_ATOMIC_SET_GET_SAFE__
-	    old = lock->counter;
-#else
-	    old = InterlockedExchangeAdd(&lock->counter, (LONG) 0);
+#ifndef ETHR_HAVE_INT64_T
+#if ETHR_SIZEOF_INT == 8
+#define ETHR_HAVE_INT64_T 1
+typedef int ethr_sint64_t;
+typedef unsigned int ethr_uint64_t;
+#elif ETHR_SIZEOF_LONG == 8
+#define ETHR_HAVE_INT64_T 1
+typedef long ethr_sint64_t;
+typedef unsigned long ethr_uint64_t;
+#elif ETHR_SIZEOF_LONG_LONG == 8
+#define ETHR_HAVE_INT64_T 1
+typedef long long ethr_sint64_t;
+typedef unsigned long long ethr_uint64_t;
 #endif
-	}
-    }
-    ETHR_COMPILER_BARRIER;
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_write_unlock)(ethr_rwlock_t *lock)
-{
-    ETHR_COMPILER_BARRIER;
-    {
-#ifdef DEBUG
-	LONG old =
 #endif
-	    _InterlockedAnd(&lock->counter, ~ETHR_WLOCK_FLAG__);
-	ETHR_ASSERT(old & ETHR_WLOCK_FLAG__);
-    }
-    return 0;
-}
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_write_lock)(ethr_rwlock_t *lock)
-{
-    LONG old;
-    do {
-	old = _InterlockedOr(&lock->counter, ETHR_WLOCK_FLAG__);
-    } while (old & ETHR_WLOCK_FLAG__);
-    /* We got the write part of the lock; wait for readers to unlock */
-    while ((old & ~ETHR_WLOCK_FLAG__) != 0) {
-#if ETHR_IMMED_ATOMIC_SET_GET_SAFE__
-	old = lock->counter;
-#else
-	old = InterlockedExchangeAdd(&lock->counter, (LONG) 0);
+#if ETHR_SIZEOF_PTR == 4
+#ifndef ETHR_HAVE_INT32_T
+#error "No 32-bit integer type found"
 #endif
-	ETHR_ASSERT(old & ETHR_WLOCK_FLAG__);
-    }
-    ETHR_COMPILER_BARRIER;
-    return 0;
-}
-
-#endif /* #ifdef ETHR_TRY_INLINE_FUNCS */
-
-#endif /* #ifdef ERTS_MIXED_CYGWIN_VC */
-
-#else /* No supported thread lib found */
-
-#ifdef ETHR_NO_SUPP_THR_LIB_NOT_FATAL
-#define ETHR_NO_THREAD_LIB
-#else
-#error "No supported thread lib found"
+typedef ethr_sint32_t ethr_sint_t;
+typedef ethr_uint32_t ethr_uint_t;
+#elif ETHR_SIZEOF_PTR == 8
+#ifndef ETHR_HAVE_INT64_T
+#error "No 64-bit integer type found"
 #endif
-
+typedef ethr_sint64_t ethr_sint_t;
+typedef ethr_uint64_t ethr_uint_t;
 #endif
 
 /* __builtin_expect() is needed by both native atomics code 
@@ -698,6 +262,8 @@ ETHR_INLINE_FUNC_NAME_(ethr_write_lock)(ethr_rwlock_t *lock)
 #  if defined(__GNUC__)
 #    if defined(ETHR_PREFER_GCC_NATIVE_IMPLS)
 #      include "gcc/ethread.h"
+#    elif defined(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS)
+#      include "libatomic_ops/ethread.h"
 #    endif
 #    ifndef ETHR_HAVE_NATIVE_ATOMICS
 #      if ETHR_SIZEOF_PTR == 4
@@ -718,115 +284,143 @@ ETHR_INLINE_FUNC_NAME_(ethr_write_lock)(ethr_rwlock_t *lock)
 #        endif
 #      endif
 #      include "gcc/ethread.h"
+#      include "libatomic_ops/ethread.h"
 #    endif
+#  elif defined(ETHR_HAVE_LIBATOMIC_OPS)
+#    include "libatomic_ops/ethread.h"
+#  elif defined(ETHR_WIN32_THREADS)
+#    include "win/ethread.h"
 #  endif
-#endif /* !defined(ETHR_DISABLE_NATIVE_IMPLS) */
+#endif /* !ETHR_DISABLE_NATIVE_IMPLS */
 
-#ifdef ETHR_HAVE_OPTIMIZED_ATOMIC_OPS
-#  undef ETHR_HAVE_NATIVE_ATOMICS
-#endif
-#ifdef ETHR_HAVE_OPTIMIZED_LOCKS
-#  undef ETHR_HAVE_NATIVE_LOCKS
-#endif
-
-#ifdef ETHR_HAVE_NATIVE_ATOMICS
-#define ETHR_HAVE_OPTIMIZED_ATOMIC_OPS 1
-#endif
-#ifdef ETHR_HAVE_NATIVE_LOCKS
-#define ETHR_HAVE_OPTIMIZED_LOCKS 1
+#if defined(__GNUC__)
+#  ifndef ETHR_COMPILER_BARRIER
+#    define ETHR_COMPILER_BARRIER __asm__ __volatile__("" : : : "memory")
+#  endif
+#  ifndef ETHR_SPIN_BODY
+#    if defined(__i386__) || defined(__x86_64__)
+#      define ETHR_SPIN_BODY __asm__ __volatile__("rep;nop" : : : "memory")
+#    elif defined(__ia64__)
+#      define ETHR_SPIN_BODY __asm__ __volatile__("hint @pause" : : : "memory")
+#    elif defined(__sparc__)
+#      define ETHR_SPIN_BODY __asm__ __volatile__("membar #LoadLoad")
+#    else
+#      define ETHR_SPIN_BODY ETHR_COMPILER_BARRIER
+#    endif
+#  endif
+#elif defined(ETHR_WIN32_THREADS)
+#  ifndef ETHR_COMPILER_BARRIER
+#    include <intrin.h>
+#    pragma intrinsic(_ReadWriteBarrier)
+#    define ETHR_COMPILER_BARRIER _ReadWriteBarrier()
+#  endif
+#  ifndef ETHR_SPIN_BODY
+#    define ETHR_SPIN_BODY do {YieldProcessor();ETHR_COMPILER_BARRIER;} while(0)
+#  endif
 #endif
 
-typedef struct {
-    unsigned open;
-    ethr_mutex mtx;
-    ethr_cond cnd;
-} ethr_gate;
+#define ETHR_YIELD_AFTER_BUSY_LOOPS 50
 
-#ifdef ETHR_HAVE_NATIVE_ATOMICS
+#ifndef ETHR_HAVE_NATIVE_ATOMICS
 /*
- * Map ethread native atomics to ethread API atomics.
+ * ETHR_*MEMORY_BARRIER orders between locked and atomic accesses only,
+ * i.e. when our lock based atomic fallback is used, a noop is sufficient.
  */
-typedef ethr_native_atomic_t ethr_atomic_t;
+#define ETHR_MEMORY_BARRIER do { } while (0)
+#define ETHR_WRITE_MEMORY_BARRIER do { } while (0)
+#define ETHR_READ_MEMORY_BARRIER do { } while (0)
+#define ETHR_READ_DEPEND_MEMORY_BARRIER do { } while (0)
 #endif
 
-#ifdef ETHR_HAVE_NATIVE_LOCKS
-/*
- * Map ethread native spinlocks to ethread API spinlocks.
- */
-typedef ethr_native_spinlock_t ethr_spinlock_t;
-/*
- * Map ethread native rwlocks to ethread API rwlocks.
- */
-typedef ethr_native_rwlock_t ethr_rwlock_t;
+#ifndef ETHR_WRITE_MEMORY_BARRIER
+#  define ETHR_WRITE_MEMORY_BARRIER ETHR_MEMORY_BARRIER
+#  define ETHR_WRITE_MEMORY_BARRIER_IS_FULL
 #endif
-
-#ifdef ETHR_USE_RWMTX_FALLBACK
-typedef struct {
-    ethr_mutex mtx;
-    ethr_cond rcnd;
-    ethr_cond wcnd;
-    unsigned readers;
-    unsigned waiting_readers;
-    unsigned waiting_writers;
-#if ETHR_XCHK
-    int initialized;
+#ifndef ETHR_READ_MEMORY_BARRIER
+#  define ETHR_READ_MEMORY_BARRIER ETHR_MEMORY_BARRIER
+#  define ETHR_READ_MEMORY_BARRIER_IS_FULL
 #endif
-} ethr_rwmutex;
+#ifndef ETHR_READ_DEPEND_MEMORY_BARRIER
+#  define ETHR_READ_DEPEND_MEMORY_BARRIER ETHR_COMPILER_BARRIER
+#  define ETHR_READ_DEPEND_MEMORY_BARRIER_IS_COMPILER_BARRIER
 #endif
 
-#ifndef ETHR_HAVE_OPTIMIZED_ATOMIC_OPS
-typedef long ethr_atomic_t;
-#endif
+#define ETHR_FATAL_ERROR__(ERR) \
+  ethr_fatal_error__(__FILE__, __LINE__, __func__, (ERR))
 
-#ifndef ETHR_HAVE_OPTIMIZED_LOCKS
+ETHR_PROTO_NORETURN__ ethr_fatal_error__(const char *file,
+					 int line,
+					 const char *func,
+					 int err);
 
-#if defined(ETHR_WIN32_THREADS)
-typedef struct {
-    CRITICAL_SECTION cs;
-} ethr_spinlock_t;
-typedef struct {
-    CRITICAL_SECTION cs;
-    unsigned counter;
-} ethr_rwlock_t;
+void ethr_compiler_barrier_fallback(void);
+#ifndef ETHR_COMPILER_BARRIER
+#  define ETHR_COMPILER_BARRIER ethr_compiler_barrier_fallback()
+#endif
 
-int ethr_do_spinlock_init(ethr_spinlock_t *lock);
-int ethr_do_rwlock_init(ethr_rwlock_t *lock);
+#ifndef ETHR_SPIN_BODY
+#  define ETHR_SPIN_BODY ETHR_COMPILER_BARRIER
+#endif
 
-#define ETHR_RWLOCK_WRITERS (((unsigned) 1) << 31)
+#ifndef ETHR_YIELD
+#  if defined(ETHR_HAVE_SCHED_YIELD)
+#    ifdef ETHR_HAVE_SCHED_H
+#      include <sched.h>
+#    endif
+#    include <errno.h>
+#    if defined(ETHR_SCHED_YIELD_RET_INT)
+#      define ETHR_YIELD() (sched_yield() < 0 ? errno : 0)
+#    else
+#      define ETHR_YIELD() (sched_yield(), 0)
+#    endif
+#  elif defined(ETHR_HAVE_PTHREAD_YIELD)
+#    if defined(ETHR_PTHREAD_YIELD_RET_INT)
+#      define ETHR_YIELD() pthread_yield()
+#    else
+#      define ETHR_YIELD() (pthread_yield(), 0)
+#    endif
+#  else
+#    define ETHR_YIELD() (ethr_compiler_barrier(), 0)
+#  endif
+#endif
+
+#include "ethr_optimized_fallbacks.h"
 
-#elif defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-typedef struct {
-    pthread_spinlock_t spnlck;
-} ethr_spinlock_t;
 typedef struct {
-    pthread_spinlock_t spnlck;
-    unsigned counter;
-} ethr_rwlock_t;
-#define ETHR_RWLOCK_WRITERS (((unsigned) 1) << 31)
+    void *(*thread_create_prepare_func)(void);
+    void (*thread_create_parent_func)(void *);
+    void (*thread_create_child_func)(void *);
+} ethr_init_data;
 
-#else /* ethr mutex/rwmutex */
+#define ETHR_INIT_DATA_DEFAULT_INITER {NULL, NULL, NULL}
 
 typedef struct {
-    ethr_mutex mtx;
-} ethr_spinlock_t;
+    void *(*alloc)(size_t);
+    void *(*realloc)(void *, size_t);
+    void (*free)(void *);
+} ethr_memory_allocator;
+
+#define ETHR_MEM_ALLOC_DEF_INITER__ {NULL, NULL, NULL}
 
 typedef struct {
-    ethr_rwmutex rwmtx;
-} ethr_rwlock_t;
+    ethr_memory_allocator std;
+    ethr_memory_allocator sl;
+    ethr_memory_allocator ll;
+} ethr_memory_allocators;
 
-#endif /* end mutex/rwmutex */
-#endif /* ETHR_HAVE_OPTIMIZED_LOCKS */
+#define ETHR_MEM_ALLOCS_DEF_INITER__					\
+  {ETHR_MEM_ALLOC_DEF_INITER__,						\
+   ETHR_MEM_ALLOC_DEF_INITER__,						\
+   ETHR_MEM_ALLOC_DEF_INITER__}
 
 typedef struct {
-    void *(*alloc)(size_t);
-    void *(*realloc)(void *, size_t);
-    void (*free)(void *);
-    void *(*thread_create_prepare_func)(void);
-    void (*thread_create_parent_func)(void *);
-    void (*thread_create_child_func)(void *);
-} ethr_init_data;
+    ethr_memory_allocators mem;
+    int reader_groups;
+    int main_threads;
+} ethr_late_init_data;
 
-#define ETHR_INIT_DATA_DEFAULT_INITER {malloc, realloc, free, NULL, NULL, NULL}
+#define ETHR_LATE_INIT_DATA_DEFAULT_INITER				\
+  {ETHR_MEM_ALLOCS_DEF_INITER__, 0, 0}
 
 typedef struct {
     int detached;			/* boolean (default false) */
@@ -835,18 +429,14 @@ typedef struct {
 
 #define ETHR_THR_OPTS_DEFAULT_INITER {0, -1}
 
-#if defined(ETHR_CUSTOM_INLINE_FUNC_NAME_) || !defined(ETHR_TRY_INLINE_FUNCS)
-#  define ETHR_NEED_MTX_PROTOTYPES__
-#  define ETHR_NEED_RWMTX_PROTOTYPES__
-#  define ETHR_NEED_SPINLOCK_PROTOTYPES__
-#  define ETHR_NEED_ATOMIC_PROTOTYPES__
-#endif
 
-#if !defined(ETHR_NEED_RWMTX_PROTOTYPES__) && defined(ETHR_USE_RWMTX_FALLBACK)
-#  define ETHR_NEED_RWMTX_PROTOTYPES__
+#if !defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
+#  define ETHR_NEED_SPINLOCK_PROTOTYPES__
+#  define ETHR_NEED_RWSPINLOCK_PROTOTYPES__
 #endif
 
 int ethr_init(ethr_init_data *);
+int ethr_late_init(ethr_late_init_data *);
 int ethr_install_exit_handler(void (*funcp)(void));
 int ethr_thr_create(ethr_tid *, void * (*)(void *), void *, ethr_thr_opts *);
 int ethr_thr_join(ethr_tid, void **);
@@ -854,79 +444,12 @@ int ethr_thr_detach(ethr_tid);
 void ethr_thr_exit(void *);
 ethr_tid ethr_self(void);
 int ethr_equal_tids(ethr_tid, ethr_tid);
-int ethr_mutex_init(ethr_mutex *);
-#ifdef ETHR_HAVE_ETHR_REC_MUTEX_INIT
-int ethr_rec_mutex_init(ethr_mutex *);
-#endif
-int ethr_mutex_destroy(ethr_mutex *);
-int ethr_mutex_set_forksafe(ethr_mutex *);
-int ethr_mutex_unset_forksafe(ethr_mutex *);
-#ifdef ETHR_NEED_MTX_PROTOTYPES__
-int ethr_mutex_trylock(ethr_mutex *);
-int ethr_mutex_lock(ethr_mutex *);
-int ethr_mutex_unlock(ethr_mutex *);
-#endif
-int ethr_cond_init(ethr_cond *);
-int ethr_cond_destroy(ethr_cond *);
-int ethr_cond_signal(ethr_cond *);
-int ethr_cond_broadcast(ethr_cond *);
-int ethr_cond_wait(ethr_cond *, ethr_mutex *);
-int ethr_cond_timedwait(ethr_cond *, ethr_mutex *, ethr_timeval *);
-
-int ethr_rwmutex_init(ethr_rwmutex *);
-int ethr_rwmutex_destroy(ethr_rwmutex *);
-#ifdef ETHR_NEED_RWMTX_PROTOTYPES__
-int ethr_rwmutex_tryrlock(ethr_rwmutex *);
-int ethr_rwmutex_rlock(ethr_rwmutex *);
-int ethr_rwmutex_runlock(ethr_rwmutex *);
-int ethr_rwmutex_tryrwlock(ethr_rwmutex *);
-int ethr_rwmutex_rwlock(ethr_rwmutex *);
-int ethr_rwmutex_rwunlock(ethr_rwmutex *);
-#endif
-
-#ifdef ETHR_NEED_ATOMIC_PROTOTYPES__
-int ethr_atomic_init(ethr_atomic_t *, long);
-int ethr_atomic_set(ethr_atomic_t *, long);
-int ethr_atomic_read(ethr_atomic_t *, long *);
-int ethr_atomic_inctest(ethr_atomic_t *, long *);
-int ethr_atomic_dectest(ethr_atomic_t *, long *);
-int ethr_atomic_inc(ethr_atomic_t *);
-int ethr_atomic_dec(ethr_atomic_t *);
-int ethr_atomic_addtest(ethr_atomic_t *, long, long *);
-int ethr_atomic_add(ethr_atomic_t *, long);
-int ethr_atomic_and_old(ethr_atomic_t *, long, long *);
-int ethr_atomic_or_old(ethr_atomic_t *, long, long *);
-int ethr_atomic_xchg(ethr_atomic_t *, long, long *);
-int ethr_atomic_cmpxchg(ethr_atomic_t *, long, long, long *);
-#endif
 
-#ifdef ETHR_NEED_SPINLOCK_PROTOTYPES__
-int ethr_spinlock_init(ethr_spinlock_t *);
-int ethr_spinlock_destroy(ethr_spinlock_t *);
-int ethr_spin_unlock(ethr_spinlock_t *);
-int ethr_spin_lock(ethr_spinlock_t *);
-
-int ethr_rwlock_init(ethr_rwlock_t *);
-int ethr_rwlock_destroy(ethr_rwlock_t *);
-int ethr_read_unlock(ethr_rwlock_t *);
-int ethr_read_lock(ethr_rwlock_t *);
-int ethr_write_unlock(ethr_rwlock_t *);
-int ethr_write_lock(ethr_rwlock_t *);
-#endif
-
-int ethr_time_now(ethr_timeval *);
 int ethr_tsd_key_create(ethr_tsd_key *);
 int ethr_tsd_key_delete(ethr_tsd_key);
 int ethr_tsd_set(ethr_tsd_key, void *);
 void *ethr_tsd_get(ethr_tsd_key);
 
-int ethr_gate_init(ethr_gate *);
-int ethr_gate_destroy(ethr_gate *);
-int ethr_gate_close(ethr_gate *);
-int ethr_gate_let_through(ethr_gate *, unsigned);
-int ethr_gate_wait(ethr_gate *);
-int ethr_gate_swait(ethr_gate *, int);
-
 #ifdef ETHR_HAVE_ETHR_SIG_FUNCS
 #include <signal.h>
 int ethr_sigmask(int how, const sigset_t *set, sigset_t *oset);
@@ -935,534 +458,274 @@ int ethr_sigwait(const sigset_t *set, int *sig);
 
 void ethr_compiler_barrier(void);
 
-#ifdef ETHR_TRY_INLINE_FUNCS
-
-#ifdef ETHR_HAVE_NATIVE_ATOMICS
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_init)(ethr_atomic_t *var, long i)
-{
-    ethr_native_atomic_init(var, i);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_set)(ethr_atomic_t *var, long i)
-{
-    ethr_native_atomic_set(var, i);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_read)(ethr_atomic_t *var, long *i)
-{
-    *i = ethr_native_atomic_read(var);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_add)(ethr_atomic_t *var, long incr)
-{
-    ethr_native_atomic_add(var, incr);
-    return 0;
-}   
-    
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_addtest)(ethr_atomic_t *var,
-					    long i,
-					    long *testp)
-{
-    *testp = ethr_native_atomic_add_return(var, i);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_inc)(ethr_atomic_t *var)
-{
-    ethr_native_atomic_inc(var);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_dec)(ethr_atomic_t *var)
-{
-    ethr_native_atomic_dec(var);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_inctest)(ethr_atomic_t *var, long *testp)
-{
-    *testp = ethr_native_atomic_inc_return(var);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_dectest)(ethr_atomic_t *var, long *testp)
-{
-    *testp = ethr_native_atomic_dec_return(var);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_and_old)(ethr_atomic_t *var,
-					    long mask,
-					    long *old)
-{
-    /*
-     * See "Extra memory barrier requirements" note at the top
-     * of the file.
-     */
-    *old = ethr_native_atomic_and_retold(var, mask);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_or_old)(ethr_atomic_t *var,
-					   long mask,
-					   long *old)
-{
-    /*
-     * See "Extra memory barrier requirements" note at the top
-     * of the file.
-     */
-    *old = ethr_native_atomic_or_retold(var, mask);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_xchg)(ethr_atomic_t *var,
-					 long new,
-					 long *old)
-{
-    *old = ethr_native_atomic_xchg(var, new);
-    return 0;
-}   
-
-/*
- * If *var == *old, replace *old with new, else do nothing.
- * In any case return the original value of *var in *old.
- */
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_cmpxchg)(ethr_atomic_t *var,
-					    long new,
-                                            long expected,
-					    long *old)
-{
-    /*
-     * See "Extra memory barrier requirements" note at the top
-     * of the file.
-     */
-    *old = ethr_native_atomic_cmpxchg(var, new, expected);
-    return 0;
-}
+#if defined(ETHR_HAVE_NATIVE_SPINLOCKS)
+typedef ethr_native_spinlock_t ethr_spinlock_t;
+#elif defined(ETHR_HAVE_OPTIMIZED_SPINLOCKS)
+typedef ethr_opt_spinlock_t ethr_spinlock_t;
+#elif defined(__WIN32__)
+typedef CRITICAL_SECTION ethr_spinlock_t;
+#else
+typedef pthread_mutex_t ethr_spinlock_t;
+#endif
 
-#endif /* ETHR_HAVE_NATIVE_ATOMICS */
+#ifdef ETHR_NEED_SPINLOCK_PROTOTYPES__
+int ethr_spinlock_init(ethr_spinlock_t *);
+int ethr_spinlock_destroy(ethr_spinlock_t *);
+void ethr_spin_unlock(ethr_spinlock_t *);
+void ethr_spin_lock(ethr_spinlock_t *);
+#endif
 
-#ifdef ETHR_HAVE_NATIVE_LOCKS
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
 
 static ETHR_INLINE int
 ETHR_INLINE_FUNC_NAME_(ethr_spinlock_init)(ethr_spinlock_t *lock)
 {
+#ifdef ETHR_HAVE_NATIVE_SPINLOCKS
     ethr_native_spinlock_init(lock);
     return 0;
+#elif defined(ETHR_HAVE_OPTIMIZED_SPINLOCKS)
+    return ethr_opt_spinlock_init((ethr_opt_spinlock_t *) lock);
+#elif defined(__WIN32__)
+    if (!InitializeCriticalSectionAndSpinCount((CRITICAL_SECTION *) lock, INT_MAX))
+	return ethr_win_get_errno__();
+    return 0;
+#else
+    return pthread_mutex_init((pthread_mutex_t *) lock, NULL);
+#endif
 }
 
 static ETHR_INLINE int
 ETHR_INLINE_FUNC_NAME_(ethr_spinlock_destroy)(ethr_spinlock_t *lock)
 {
+#ifdef ETHR_HAVE_NATIVE_SPINLOCKS
+    return 0;
+#elif defined(ETHR_HAVE_OPTIMIZED_SPINLOCKS)
+    return ethr_opt_spinlock_destroy((ethr_opt_spinlock_t *) lock);
+#elif defined(__WIN32__)
+    DeleteCriticalSection((CRITICAL_SECTION *) lock);
     return 0;
+#else
+    return pthread_mutex_destroy((pthread_mutex_t *) lock);
+#endif
 }
 
-static ETHR_INLINE int
+static ETHR_INLINE void
 ETHR_INLINE_FUNC_NAME_(ethr_spin_unlock)(ethr_spinlock_t *lock)
 {
+#ifdef ETHR_HAVE_NATIVE_SPINLOCKS
     ethr_native_spin_unlock(lock);
-    return 0;
+#elif defined(ETHR_HAVE_OPTIMIZED_SPINLOCKS)
+    int err = ethr_opt_spin_unlock((ethr_opt_spinlock_t *) lock);
+    if (err)
+	ETHR_FATAL_ERROR__(err);
+#elif defined(__WIN32__)
+    LeaveCriticalSection((CRITICAL_SECTION *) lock);
+#else
+    int err = pthread_mutex_unlock((pthread_mutex_t *) lock);
+    if (err)
+	ETHR_FATAL_ERROR__(err);
+#endif
 }
 
-static ETHR_INLINE int
+static ETHR_INLINE void
 ETHR_INLINE_FUNC_NAME_(ethr_spin_lock)(ethr_spinlock_t *lock)
 {
+#ifdef ETHR_HAVE_NATIVE_SPINLOCKS
     ethr_native_spin_lock(lock);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_rwlock_init)(ethr_rwlock_t *lock)
-{
-    ethr_native_rwlock_init(lock);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_rwlock_destroy)(ethr_rwlock_t *lock)
-{
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_read_unlock)(ethr_rwlock_t *lock)
-{
-    ethr_native_read_unlock(lock);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_read_lock)(ethr_rwlock_t *lock)
-{
-    ethr_native_read_lock(lock);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_write_unlock)(ethr_rwlock_t *lock)
-{
-    ethr_native_write_unlock(lock);
-    return 0;
-}
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_write_lock)(ethr_rwlock_t *lock)
-{
-    ethr_native_write_lock(lock);
-    return 0;
+#elif defined(ETHR_HAVE_OPTIMIZED_SPINLOCKS)
+    int err = ethr_opt_spin_lock((ethr_opt_spinlock_t *) lock);
+    if (err)
+	ETHR_FATAL_ERROR__(err);
+#elif defined(__WIN32__)
+    EnterCriticalSection((CRITICAL_SECTION *) lock);
+#else
+    int err = pthread_mutex_lock((pthread_mutex_t *) lock);
+    if (err)
+	ETHR_FATAL_ERROR__(err);
+#endif
 }
 
-#endif /* ETHR_HAVE_NATIVE_LOCKS */
-
 #endif /* ETHR_TRY_INLINE_FUNCS */
 
-/*
- * Fallbacks for atomics used in absence of optimized implementation.
- */
-#ifndef ETHR_HAVE_OPTIMIZED_ATOMIC_OPS
-
-/*
- * ETHR_MEMORY_BARRIER orders between locked and atomic accesses only,
- * i.e. when this atomic fallback is used a noop is sufficient.
- */
-#define ETHR_MEMORY_BARRIER
+#include "ethr_atomics.h"
 
-#define ETHR_ATOMIC_ADDR_BITS 10
-#define ETHR_ATOMIC_ADDR_SHIFT 6
+typedef struct ethr_ts_event_ ethr_ts_event; /* Needed by ethr_mutex.h */
 
-typedef struct {
-    union {
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-	pthread_spinlock_t spnlck;
+#if defined(ETHR_WIN32_THREADS)
+#  include "win/ethr_event.h"
 #else
-	ethr_mutex mtx;
-#endif
-	char buf[ETHR_CACHE_LINE_SIZE];
-    } u;
-} ethr_atomic_protection_t;
-
-extern ethr_atomic_protection_t ethr_atomic_protection__[1 << ETHR_ATOMIC_ADDR_BITS];
-
-
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-
-#define ETHR_ATOMIC_PTR2LCK__(PTR) \
-(&ethr_atomic_protection__[((((unsigned long) (PTR)) >> ETHR_ATOMIC_ADDR_SHIFT) \
-			& ((1 << ETHR_ATOMIC_ADDR_BITS) - 1))].u.spnlck)
-
-
-#define ETHR_ATOMIC_OP_FALLBACK_IMPL__(AP, EXPS)			\
-do {									\
-    pthread_spinlock_t *slp__ = ETHR_ATOMIC_PTR2LCK__((AP));		\
-    int res__ = pthread_spin_lock(slp__);				\
-    if (res__ != 0)							\
-	return res__;							\
-    { EXPS; }								\
-    return pthread_spin_unlock(slp__);					\
-} while (0)
-
-#else /* ethread mutex */
+#  include "pthread/ethr_event.h"
+#endif
+
+int ethr_set_main_thr_status(int, int);
+int ethr_get_main_thr_status(int *);
+
+struct ethr_ts_event_ {
+    ethr_ts_event *next;
+    ethr_ts_event *prev;
+    ethr_event event;
+    void *udata;
+    ethr_atomic32_t uaflgs;
+    unsigned uflgs;
+    unsigned iflgs;		/* for ethr lib only */
+    short rgix;			/* for ethr lib only */
+    short mtix;			/* for ethr lib only */
+};
 
-#define ETHR_ATOMIC_PTR2LCK__(PTR) \
-(&ethr_atomic_protection__[((((unsigned long) (PTR)) >> ETHR_ATOMIC_ADDR_SHIFT) \
-		     & ((1 << ETHR_ATOMIC_ADDR_BITS) - 1))].u.mtx)
+#define ETHR_TS_EV_ETHREAD	(((unsigned) 1) << 0)
+#define ETHR_TS_EV_INITED	(((unsigned) 1) << 1)
+#define ETHR_TS_EV_TMP		(((unsigned) 1) << 2)
+#define ETHR_TS_EV_MAIN_THR	(((unsigned) 1) << 3)
 
-#define ETHR_ATOMIC_OP_FALLBACK_IMPL__(AP, EXPS)			\
-do {									\
-    ethr_mutex *mtxp__ = ETHR_ATOMIC_PTR2LCK__((AP));			\
-    int res__ = ETHR_INLINE_FUNC_NAME_(ethr_mutex_lock)(mtxp__);	\
-    if (res__ != 0)							\
-	return res__;							\
-    { EXPS; }								\
-    return ETHR_INLINE_FUNC_NAME_(ethr_mutex_unlock)(mtxp__);		\
-} while (0)
+int ethr_get_tmp_ts_event__(ethr_ts_event **tsepp);
+int ethr_free_ts_event__(ethr_ts_event *tsep);
+int ethr_make_ts_event__(ethr_ts_event **tsepp);
 
-#endif /* end ethread mutex */
+#if !defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHREAD_IMPL__)
+ethr_ts_event *ethr_get_ts_event(void);
+void ethr_leave_ts_event(ethr_ts_event *);
+#endif
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#if defined(ETHR_PTHREADS)
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_init)(ethr_atomic_t *var, long i)
-{
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *var = (ethr_atomic_t) i);
-}
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHREAD_IMPL__)
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_set)(ethr_atomic_t *var, long i)
-{
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *var = (ethr_atomic_t) i);
-}
+extern pthread_key_t ethr_ts_event_key__;
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_read)(ethr_atomic_t *var, long *i)
+static ETHR_INLINE ethr_ts_event *
+ETHR_INLINE_FUNC_NAME_(ethr_get_ts_event)(void)
 {
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *i = (long) *var);
+    ethr_ts_event *tsep = pthread_getspecific(ethr_ts_event_key__);
+    if (!tsep) {
+	int res = ethr_make_ts_event__(&tsep);
+	if (res != 0)
+	    ETHR_FATAL_ERROR__(res);
+	ETHR_ASSERT(tsep);
+    }
+    return tsep;
 }
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_inctest)(ethr_atomic_t *incp, long *testp)
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_leave_ts_event)(ethr_ts_event *tsep)
 {
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(incp, *testp = (long) ++(*incp));
-}
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_dectest)(ethr_atomic_t *decp, long *testp)
-{
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(decp, *testp = (long) --(*decp));
 }
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_add)(ethr_atomic_t *var, long incr)
-{
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *var += incr);
-}   
-    
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_addtest)(ethr_atomic_t *incp,
-					    long i,
-					    long *testp)
-{
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(incp, *incp += i; *testp = *incp);
-}
+#endif
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_inc)(ethr_atomic_t *incp)
-{
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(incp, ++(*incp));
-}
+#elif defined(ETHR_WIN32_THREADS)
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_dec)(ethr_atomic_t *decp)
-{
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(decp, --(*decp));
-}
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHREAD_IMPL__)
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_and_old)(ethr_atomic_t *var,
-					    long mask,
-					    long *old)
-{
-    /*
-     * See "Extra memory barrier requirements" note at the top
-     * of the file.
-     */
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *old = *var; *var &= mask);
-}
+extern DWORD ethr_ts_event_key__;
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_or_old)(ethr_atomic_t *var,
-					   long mask,
-					   long *old)
+static ETHR_INLINE ethr_ts_event *
+ETHR_INLINE_FUNC_NAME_(ethr_get_ts_event)(void)
 {
-    /*
-     * See "Extra memory barrier requirements" note at the top
-     * of the file.
-     */
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *old = *var; *var |= mask);
+    ethr_ts_event *tsep = TlsGetValue(ethr_ts_event_key__);
+    if (!tsep) {
+	int res = ethr_get_tmp_ts_event__(&tsep);
+	if (res != 0)
+	    ETHR_FATAL_ERROR__(res);
+	ETHR_ASSERT(tsep);
+    }
+    return tsep;
 }
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_xchg)(ethr_atomic_t *var,
-					 long new,
-					 long *old)
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_leave_ts_event)(ethr_ts_event *tsep)
 {
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(var, *old = *var; *var = new);
-}   
-
-/*
- * If *var == *old, replace *old with new, else do nothing.
- * In any case return the original value of *var in *old.
- */
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_atomic_cmpxchg)(ethr_atomic_t *var,
-					    long new,
-                                            long expected,
-					    long *old)
-{
-    /*
-     * See "Extra memory barrier requirements" note at the top
-     * of the file.
-     */
-    ETHR_ATOMIC_OP_FALLBACK_IMPL__(
-      var,
-      long old_val = *var;
-      *old = old_val;
-      if (__builtin_expect(old_val == expected, 1))
-          *var = new;
-      );
-    return 0;
+    if (tsep->iflgs & ETHR_TS_EV_TMP) {
+	int res = ethr_free_ts_event__(tsep);
+	if (res != 0)
+	    ETHR_FATAL_ERROR__(res);
+    }
 }
 
-#endif /* #ifdef ETHR_TRY_INLINE_FUNCS */
-#endif /* #ifndef ETHR_HAVE_OPTIMIZED_ATOMIC_OPS */
-
-/*
- * Fallbacks for spin locks, and rw spin locks used in absence of
- * optimized implementation.
- */
-#ifndef ETHR_HAVE_OPTIMIZED_LOCKS
-
-#ifdef ETHR_TRY_INLINE_FUNCS
-
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_spinlock_init)(ethr_spinlock_t *lock)
-{
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-    return pthread_spin_init(&lock->spnlck, 0);
-#else
-    return ethr_mutex_init(&lock->mtx);
 #endif
-}
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_spinlock_destroy)(ethr_spinlock_t *lock)
-{
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-    return pthread_spin_destroy(&lock->spnlck);
-#else
-    return ethr_mutex_destroy(&lock->mtx);
 #endif
-}
 
+#include "ethr_mutex.h" /* Need atomic declarations and tse */
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_spin_unlock)(ethr_spinlock_t *lock)
-{
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-    return pthread_spin_unlock(&lock->spnlck);
+#ifdef ETHR_HAVE_NATIVE_RWSPINLOCKS
+typedef ethr_native_rwlock_t ethr_rwlock_t;
 #else
-    return ETHR_INLINE_FUNC_NAME_(ethr_mutex_unlock)(&lock->mtx);
+typedef ethr_rwmutex ethr_rwlock_t;
 #endif
-}
 
-static ETHR_INLINE int
-ETHR_INLINE_FUNC_NAME_(ethr_spin_lock)(ethr_spinlock_t *lock)
-{
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-    return pthread_spin_lock(&lock->spnlck);
-#else
-    return ETHR_INLINE_FUNC_NAME_(ethr_mutex_lock)(&lock->mtx);
+#ifdef ETHR_NEED_RWSPINLOCK_PROTOTYPES__
+int ethr_rwlock_init(ethr_rwlock_t *);
+int ethr_rwlock_destroy(ethr_rwlock_t *);
+void ethr_read_unlock(ethr_rwlock_t *);
+void ethr_read_lock(ethr_rwlock_t *);
+void ethr_write_unlock(ethr_rwlock_t *);
+void ethr_write_lock(ethr_rwlock_t *);
 #endif
-}
 
-#ifdef ETHR_USE_RWMTX_FALLBACK
-#define ETHR_RWLOCK_RWMTX_FALLBACK_NAME_(X) X
-#else
-#define ETHR_RWLOCK_RWMTX_FALLBACK_NAME_(X) ETHR_INLINE_FUNC_NAME_(X)
-#endif
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
 
 static ETHR_INLINE int
 ETHR_INLINE_FUNC_NAME_(ethr_rwlock_init)(ethr_rwlock_t *lock)
 {
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-    lock->counter = 0;
-    return pthread_spin_init(&lock->spnlck, 0);
+#ifdef ETHR_HAVE_NATIVE_RWSPINLOCKS
+    ethr_native_rwlock_init(lock);
+    return 0;
 #else
-    return ethr_rwmutex_init(&lock->rwmtx);
+    return ethr_rwmutex_init_opt((ethr_rwmutex *) lock, NULL);
 #endif
 }
 
 static ETHR_INLINE int
 ETHR_INLINE_FUNC_NAME_(ethr_rwlock_destroy)(ethr_rwlock_t *lock)
 {
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-    return pthread_spin_destroy(&lock->spnlck);
+#ifdef ETHR_HAVE_NATIVE_RWSPINLOCKS
+    return 0;
 #else
-    return ethr_rwmutex_destroy(&lock->rwmtx);
+    return ethr_rwmutex_destroy((ethr_rwmutex *) lock);
 #endif
 }
 
-static ETHR_INLINE int
+static ETHR_INLINE void
 ETHR_INLINE_FUNC_NAME_(ethr_read_unlock)(ethr_rwlock_t *lock)
 {
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-    int res = pthread_spin_lock(&lock->spnlck);
-    if (res != 0)
-	return res;
-    lock->counter--;
-    return pthread_spin_unlock(&lock->spnlck);
+#ifdef ETHR_HAVE_NATIVE_RWSPINLOCKS
+    ethr_native_read_unlock(lock);
 #else
-    return ETHR_RWLOCK_RWMTX_FALLBACK_NAME_(ethr_rwmutex_runlock)(&lock->rwmtx);
+    ethr_rwmutex_runlock((ethr_rwmutex *) lock);
 #endif
 }
 
-static ETHR_INLINE int
+static ETHR_INLINE void
 ETHR_INLINE_FUNC_NAME_(ethr_read_lock)(ethr_rwlock_t *lock)
 {
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-    int locked = 0;
-    do {
-	int res = pthread_spin_lock(&lock->spnlck);
-	if (res != 0)
-	    return res;
-	if ((lock->counter & ETHR_RWLOCK_WRITERS) == 0) {
-	    lock->counter++;
-	    locked = 1;
-	}
-	res = pthread_spin_unlock(&lock->spnlck);
-	if (res != 0)
-	    return res;
-    } while (!locked);
-    return 0;
+#ifdef ETHR_HAVE_NATIVE_RWSPINLOCKS
+    ethr_native_read_lock(lock);
 #else
-    return ETHR_RWLOCK_RWMTX_FALLBACK_NAME_(ethr_rwmutex_rlock)(&lock->rwmtx);
+    ethr_rwmutex_rlock((ethr_rwmutex *) lock);
 #endif
 }
 
-static ETHR_INLINE int
+static ETHR_INLINE void
 ETHR_INLINE_FUNC_NAME_(ethr_write_unlock)(ethr_rwlock_t *lock)
 {
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-    lock->counter = 0;
-    return pthread_spin_unlock(&lock->spnlck);
+#ifdef ETHR_HAVE_NATIVE_RWSPINLOCKS
+    ethr_native_write_unlock(lock);
 #else
-    return ETHR_RWLOCK_RWMTX_FALLBACK_NAME_(ethr_rwmutex_rwunlock)(&lock->rwmtx);
+    ethr_rwmutex_rwunlock((ethr_rwmutex *) lock);
 #endif
 }
 
-static ETHR_INLINE int
+static ETHR_INLINE void
 ETHR_INLINE_FUNC_NAME_(ethr_write_lock)(ethr_rwlock_t *lock)
 {
-#if defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-    while (1) {
-	int res = pthread_spin_lock(&lock->spnlck);
-	if (res != 0)
-	    return res;
-	lock->counter |= ETHR_RWLOCK_WRITERS;
-	if (lock->counter == ETHR_RWLOCK_WRITERS)
-	    return 0;
-	res = pthread_spin_unlock(&lock->spnlck);
-	if (res != 0)
-	    return res;
-    }
+#ifdef ETHR_HAVE_NATIVE_RWSPINLOCKS
+    ethr_native_write_lock(lock);
 #else
-    return ETHR_RWLOCK_RWMTX_FALLBACK_NAME_(ethr_rwmutex_rwlock)(&lock->rwmtx);
+    ethr_rwmutex_rwlock((ethr_rwmutex *) lock);
 #endif
 }
 
-#endif /* #ifdef ETHR_TRY_INLINE_FUNCS */
-
-#endif /* ETHR_HAVE_OPTIMIZED_LOCKS */
-
-#if defined(ETHR_HAVE_OPTIMIZED_LOCKS) || defined(ETHR_HAVE_PTHREAD_SPIN_LOCK)
-# define ETHR_HAVE_OPTIMIZED_SPINLOCK
-#endif
+#endif /* ETHR_TRY_INLINE_FUNCS */
 
 #endif /* #ifndef ETHREAD_H__ */
diff --git a/erts/include/internal/ethread_header_config.h.in b/erts/include/internal/ethread_header_config.h.in
index c9fd87c2f6..f394d790d2 100644
--- a/erts/include/internal/ethread_header_config.h.in
+++ b/erts/include/internal/ethread_header_config.h.in
@@ -20,6 +20,21 @@
 /* Define to the size of pointers */
 #undef ETHR_SIZEOF_PTR
 
+/* Define to the size of int */
+#undef ETHR_SIZEOF_INT
+
+/* Define to the size of long */
+#undef ETHR_SIZEOF_LONG
+
+/* Define to the size of long long */
+#undef ETHR_SIZEOF_LONG_LONG
+
+/* Define to the size of __int64 */
+#undef ETHR_SIZEOF___INT64
+
+/* Define if bigendian */
+#undef ETHR_BIGENDIAN
+
 /* Define if you want to disable native ethread implementations */
 #undef ETHR_DISABLE_NATIVE_IMPLS
 
@@ -29,26 +44,54 @@
 /* Define if you have pthreads */
 #undef ETHR_PTHREADS
 
+/* Define if you need the <nptl/pthread.h> header file. */
+#undef ETHR_NEED_NPTL_PTHREAD_H
+
 /* Define if you have the <pthread.h> header file. */
 #undef ETHR_HAVE_PTHREAD_H
 
 /* Define if the pthread.h header file is in pthread/mit directory. */
 #undef ETHR_HAVE_MIT_PTHREAD_H
 
-/* Define if you have the pthread_mutexattr_settype function. */
-#undef ETHR_HAVE_PTHREAD_MUTEXATTR_SETTYPE
+/* Define if you have the pthread_spin_lock function. */
+#undef ETHR_HAVE_PTHREAD_SPIN_LOCK
 
-/* Define if you have the pthread_mutexattr_setkind_np function. */
-#undef ETHR_HAVE_PTHREAD_MUTEXATTR_SETKIND_NP
+/* Define if you want to force usage of pthread rwlocks */
+#undef ETHR_FORCE_PTHREAD_RWLOCK
 
-/* Define if you have the pthread_atfork function. */
-#undef ETHR_HAVE_PTHREAD_ATFORK
+/* Define if you have the pthread_rwlockattr_setkind_np() function. */
+#undef ETHR_HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP
 
-/* Define if you have the pthread_spin_lock function. */
-#undef ETHR_HAVE_PTHREAD_SPIN_LOCK
+/* Define if you have the PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP rwlock
+   attribute. */
+#undef ETHR_HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
 
-/* Define if you have a pthread_rwlock implementation that can be used */
-#undef ETHR_HAVE_PTHREAD_RWLOCK_INIT
+/* Define if you have a linux futex implementation. */
+#undef ETHR_HAVE_LINUX_FUTEX
+
+/* Define if you have gcc atomic operations */
+#undef ETHR_HAVE_GCC_ATOMIC_OPS
+
+/* Define if you prefer gcc native ethread implementations */
+#undef ETHR_PREFER_GCC_NATIVE_IMPLS
+
+/* Define if you have the <sched.h> header file. */
+#undef ETHR_HAVE_SCHED_H
+
+/* Define if you have the sched_yield() function. */
+#undef ETHR_HAVE_SCHED_YIELD
+
+/* Define if you have the pthread_yield() function. */
+#undef ETHR_HAVE_PTHREAD_YIELD
+
+/* Define if pthread_yield() returns an int. */
+#undef ETHR_PTHREAD_YIELD_RET_INT
+
+/* Define if sched_yield() returns an int. */
+#undef ETHR_SCHED_YIELD_RET_INT
+
+/* Define if you want compatibilty with x86 processors before pentium4. */
+#undef ETHR_PRE_PENTIUM4_COMPAT
 
 /* Define if you have the pthread_rwlockattr_setkind_np() function. */
 #undef ETHR_HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP
@@ -63,6 +106,36 @@
 /* Define if you prefer gcc native ethread implementations */
 #undef ETHR_PREFER_GCC_NATIVE_IMPLS
 
+/* Define if you have libatomic_ops atomic operations */
+#undef ETHR_HAVE_LIBATOMIC_OPS
+
+/* Define if you prefer libatomic_ops native ethread implementations */
+#undef ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS
+
+/* Define to the size of AO_t if libatomic_ops is used */
+#undef ETHR_SIZEOF_AO_T
+
+/* Define if you have _InterlockedCompareExchange64() */
+#undef ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64
+
+/* Define if you have _InterlockedDecrement64() */
+#undef ETHR_HAVE__INTERLOCKEDDECREMENT64
+
+/* Define if you have _InterlockedIncrement64() */
+#undef ETHR_HAVE__INTERLOCKEDINCREMENT64
+
+/* Define if you have _InterlockedExchangeAdd64() */
+#undef ETHR_HAVE__INTERLOCKEDEXCHANGEADD64
+
+/* Define if you have _InterlockedExchange64() */
+#undef ETHR_HAVE__INTERLOCKEDEXCHANGE64
+
+/* Define if you have _InterlockedAnd64() */
+#undef ETHR_HAVE__INTERLOCKEDAND64
+
+/* Define if you have _InterlockedOr64() */
+#undef ETHR_HAVE__INTERLOCKEDOR64
+
 /* Define if you want to turn on extra sanity checking in the ethread library */
 #undef ETHR_XCHK
 
diff --git a/erts/include/internal/gcc/ethr_atomic.h b/erts/include/internal/gcc/ethr_atomic.h
index 775030c8d5..16935084b1 100644
--- a/erts/include/internal/gcc/ethr_atomic.h
+++ b/erts/include/internal/gcc/ethr_atomic.h
@@ -22,24 +22,35 @@
  * Author: Rickard Green
  */
 
-#ifndef ETHR_GCC_ATOMIC_H__
-#define ETHR_GCC_ATOMIC_H__
+#undef ETHR_INCLUDE_ATOMIC_IMPL__
+#if !defined(ETHR_GCC_ATOMIC32_H__) && defined(ETHR_ATOMIC_WANT_32BIT_IMPL__)
+#define ETHR_GCC_ATOMIC32_H__
+#define ETHR_INCLUDE_ATOMIC_IMPL__ 4
+#undef ETHR_ATOMIC_WANT_32BIT_IMPL__
+#elif !defined(ETHR_GCC_ATOMIC64_H__) && defined(ETHR_ATOMIC_WANT_64BIT_IMPL__)
+#define ETHR_GCC_ATOMIC64_H__
+#define ETHR_INCLUDE_ATOMIC_IMPL__ 8
+#undef ETHR_ATOMIC_WANT_64BIT_IMPL__
+#endif
+
+#ifdef ETHR_INCLUDE_ATOMIC_IMPL__
 
-#if !defined(ETHR_HAVE_NATIVE_ATOMICS) && defined(ETHR_HAVE_GCC_ATOMIC_OPS)
-#define ETHR_HAVE_NATIVE_ATOMICS 1
+#ifndef ETHR_GCC_ATOMIC_COMMON__
+#define ETHR_GCC_ATOMIC_COMMON__
 
-#define ETHR_IMMED_ATOMIC_SET_GET_SAFE__ 0
-/* Enable immediate read/write on platforms where we know it is safe */
+#define ETHR_READ_AND_SET_WITHOUT_SYNC_OP__ 0
 #if defined(__i386__) || defined(__x86_64__) || defined(__sparc__) \
-    || defined(__powerpc__) || defined(__ppc__)
-#  undef ETHR_IMMED_ATOMIC_SET_GET_SAFE__
-#  define ETHR_IMMED_ATOMIC_SET_GET_SAFE__ 1
+    || defined(__powerpc__) || defined(__ppc__) || defined(__mips__)
+#  undef ETHR_READ_AND_SET_WITHOUT_SYNC_OP__
+#  define ETHR_READ_AND_SET_WITHOUT_SYNC_OP__ 1
 #endif
 
-typedef struct {
-    volatile long counter;
-} ethr_native_atomic_t;
-
+#if defined(__x86_64__) || (defined(__i386__) \
+			    && !defined(ETHR_PRE_PENTIUM4_COMPAT))
+#  define ETHR_READ_ACQB_AND_SET_RELB_COMPILER_BARRIER_ONLY__ 1
+#else
+#  define ETHR_READ_ACQB_AND_SET_RELB_COMPILER_BARRIER_ONLY__ 0
+#endif
 
 /*
  * According to the documentation this is what we want:
@@ -47,28 +58,73 @@ typedef struct {
  * However, __sync_synchronize() is known to erroneously be
  * a noop on at least some platforms with some gcc versions.
  * This has suposedly been fixed in some gcc version, but we
- * don't know from which version. Therefore, we use the
- * workaround implemented below on all gcc versions.
+ * don't know from which version. Therefore, we only use
+ * it when it has been verified to work. Otherwise
+ * we use a workaround.
  */
+#if defined(__mips__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
+/* __sync_synchronize() has been verified to work here */
+#define ETHR_MEMORY_BARRIER __sync_synchronize()
+#define ETHR_READ_DEPEND_MEMORY_BARRIER __sync_synchronize()
+#elif defined(__x86_64__) || (defined(__i386__) \
+			      && !defined(ETHR_PRE_PENTIUM4_COMPAT))
+/* Use fence instructions directly instead of workaround */
+#define ETHR_MEMORY_BARRIER __asm__ __volatile__("mfence" : : : "memory")
+#define ETHR_WRITE_MEMORY_BARRIER __asm__ __volatile__("sfence" : : : "memory")
+#define ETHR_READ_MEMORY_BARRIER __asm__ __volatile__("lfence" : : : "memory")
+#define ETHR_READ_DEPEND_MEMORY_BARRIER __asm__ __volatile__("" : : : "memory")
+#else
+/* Workaround */
 #define ETHR_MEMORY_BARRIER \
 do { \
-    volatile long x___ = 0; \
-    (void) __sync_val_compare_and_swap(&x___, (long) 0, (long) 1); \
+    volatile ethr_sint32_t x___ = 0; \
+    (void) __sync_val_compare_and_swap(&x___, (ethr_sint32_t) 0, (ethr_sint32_t) 1); \
 } while (0)
+#define ETHR_READ_DEPEND_MEMORY_BARRIER ETHR_MEMORY_BARRIER
+#endif
+
+#define ETHR_COMPILER_BARRIER __asm__ __volatile__("" : : : "memory")
+
+#endif /* ETHR_GCC_ATOMIC_COMMON__ */
+
+#if ETHR_INCLUDE_ATOMIC_IMPL__ == 4
+#define ETHR_HAVE_NATIVE_ATOMIC32 1
+#define ETHR_NATMC_FUNC__(X) ethr_native_atomic32_ ## X
+#define ETHR_ATMC_T__ ethr_native_atomic32_t
+#define ETHR_AINT_T__ ethr_sint32_t
+#elif ETHR_INCLUDE_ATOMIC_IMPL__ == 8
+#define ETHR_HAVE_NATIVE_ATOMIC64 1
+#define ETHR_NATMC_FUNC__(X) ethr_native_atomic64_ ## X
+#define ETHR_ATMC_T__ ethr_native_atomic64_t
+#define ETHR_AINT_T__ ethr_sint64_t
+#else
+#error "Unsupported integer size"
+#endif
+
+typedef struct {
+    volatile ETHR_AINT_T__ counter;
+} ETHR_ATMC_T__;
 
-#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_ATOMIC_IMPL__)
+
+static ETHR_INLINE ETHR_AINT_T__ *
+ETHR_NATMC_FUNC__(addr)(ETHR_ATMC_T__ *var)
+{
+    return (ETHR_AINT_T__ *) &var->counter;
+}
 
 static ETHR_INLINE void
-ethr_native_atomic_set(ethr_native_atomic_t *var, long value)
+ETHR_NATMC_FUNC__(set)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ value)
 {
-#if ETHR_IMMED_ATOMIC_SET_GET_SAFE__
+#if ETHR_READ_AND_SET_WITHOUT_SYNC_OP__
     var->counter = value;
 #else
     /*
      * Unfortunately no __sync_store() or similar exist in the gcc atomic
      * op interface. We therefore have to simulate it this way...
      */
-    long act = 0, exp;
+    ETHR_AINT_T__ act = 0, exp;
     do {
 	exp = act;
 	act = __sync_val_compare_and_swap(&var->counter, exp, value);
@@ -76,80 +132,86 @@ ethr_native_atomic_set(ethr_native_atomic_t *var, long value)
 #endif
 }
 
-#define ethr_native_atomic_init ethr_native_atomic_set
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(init)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ value)
+{
+    ETHR_NATMC_FUNC__(set)(var, value);
+}
 
-static ETHR_INLINE long
-ethr_native_atomic_read(ethr_native_atomic_t *var)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(read)(ETHR_ATMC_T__ *var)
 {
-#if ETHR_IMMED_ATOMIC_SET_GET_SAFE__
+#if ETHR_READ_AND_SET_WITHOUT_SYNC_OP__
     return var->counter;
 #else
     /*
      * Unfortunately no __sync_fetch() or similar exist in the gcc atomic
      * op interface. We therefore have to simulate it this way...
      */
-    return __sync_add_and_fetch(&var->counter, (long) 0);
+    return __sync_add_and_fetch(&var->counter, (ETHR_AINT_T__) 0);
 #endif
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_add(ethr_native_atomic_t *var, long incr)
+ETHR_NATMC_FUNC__(add)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
 {
     (void) __sync_add_and_fetch(&var->counter, incr);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_add_return(ethr_native_atomic_t *var, long incr)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(add_return)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
 {
     return __sync_add_and_fetch(&var->counter, incr);
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_inc(ethr_native_atomic_t *var)
+ETHR_NATMC_FUNC__(inc)(ETHR_ATMC_T__ *var)
 {
-    (void) __sync_add_and_fetch(&var->counter, (long) 1);
+    (void) __sync_add_and_fetch(&var->counter, (ETHR_AINT_T__) 1);
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_dec(ethr_native_atomic_t *var)
+ETHR_NATMC_FUNC__(dec)(ETHR_ATMC_T__ *var)
 {
-    (void) __sync_sub_and_fetch(&var->counter, (long) 1);
+    (void) __sync_sub_and_fetch(&var->counter, (ETHR_AINT_T__) 1);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_inc_return(ethr_native_atomic_t *var)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(inc_return)(ETHR_ATMC_T__ *var)
 {
-    return __sync_add_and_fetch(&var->counter, (long) 1);
+    return __sync_add_and_fetch(&var->counter, (ETHR_AINT_T__) 1);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_dec_return(ethr_native_atomic_t *var)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(dec_return)(ETHR_ATMC_T__ *var)
 {
-    return __sync_sub_and_fetch(&var->counter, (long) 1);
+    return __sync_sub_and_fetch(&var->counter, (ETHR_AINT_T__) 1);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_and_retold(ethr_native_atomic_t *var, long mask)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(and_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
 {
     return __sync_fetch_and_and(&var->counter, mask);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_or_retold(ethr_native_atomic_t *var, long mask)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(or_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
 {
-    return (long) __sync_fetch_and_or(&var->counter, mask);
+    return (ETHR_AINT_T__) __sync_fetch_and_or(&var->counter, mask);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_cmpxchg(ethr_native_atomic_t *var, long new, long old)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg)(ETHR_ATMC_T__ *var,
+			   ETHR_AINT_T__ new,
+			   ETHR_AINT_T__ old)
 {
     return __sync_val_compare_and_swap(&var->counter, old, new);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_xchg(ethr_native_atomic_t *var, long new)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(xchg)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ new)
 {
-    long exp, act = 0;
+    ETHR_AINT_T__ exp, act = 0;
     do {
 	exp = act;
 	act = __sync_val_compare_and_swap(&var->counter, exp, new);
@@ -157,8 +219,72 @@ ethr_native_atomic_xchg(ethr_native_atomic_t *var, long new)
     return act;
 }
 
+/*
+ * Atomic ops with at least specified barriers.
+ */
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(read_acqb)(ETHR_ATMC_T__ *var)
+{
+#if ETHR_READ_ACQB_AND_SET_RELB_COMPILER_BARRIER_ONLY__
+    ETHR_AINT_T__ val = var->counter;
+    ETHR_COMPILER_BARRIER;
+    return val;
+#else
+    return __sync_add_and_fetch(&var->counter, (ETHR_AINT_T__) 0);
 #endif
+}
 
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(set_relb)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ i)
+{
+#if ETHR_READ_ACQB_AND_SET_RELB_COMPILER_BARRIER_ONLY__
+    ETHR_COMPILER_BARRIER;
+    var->counter = i;
+#else
+    (void) ETHR_NATMC_FUNC__(xchg)(var, i);
 #endif
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(inc_return_acqb)(ETHR_ATMC_T__ *var)
+{
+    return ETHR_NATMC_FUNC__(inc_return)(var);
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(dec_relb)(ETHR_ATMC_T__ *var)
+{
+    ETHR_NATMC_FUNC__(dec)(var);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(dec_return_relb)(ETHR_ATMC_T__ *var)
+{
+    return ETHR_NATMC_FUNC__(dec_return)(var);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg_acqb)(ETHR_ATMC_T__ *var,
+				ETHR_AINT_T__ new,
+				ETHR_AINT_T__ old)
+{
+    return ETHR_NATMC_FUNC__(cmpxchg)(var, new, old);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg_relb)(ETHR_ATMC_T__ *var,
+				ETHR_AINT_T__ new,
+				ETHR_AINT_T__ old)
+{
+    return ETHR_NATMC_FUNC__(cmpxchg)(var, new, old);
+}
+
+#endif
+
+#undef ETHR_NATMC_FUNC__
+#undef ETHR_ATMC_T__
+#undef ETHR_AINT_T__
+#undef ETHR_AINT_SUFFIX__
 
 #endif
diff --git a/erts/include/internal/gcc/ethread.h b/erts/include/internal/gcc/ethread.h
index bb378e31e0..392a1aa2b2 100644
--- a/erts/include/internal/gcc/ethread.h
+++ b/erts/include/internal/gcc/ethread.h
@@ -25,6 +25,16 @@
 #ifndef ETHREAD_GCC_H__
 #define ETHREAD_GCC_H__
 
+#if !defined(ETHR_HAVE_NATIVE_ATOMICS) && defined(ETHR_HAVE_GCC_ATOMIC_OPS)
+#define ETHR_HAVE_NATIVE_ATOMICS 1
+
+#define ETHR_ATOMIC_WANT_32BIT_IMPL__
 #include "ethr_atomic.h"
+#if ETHR_SIZEOF_PTR == 8
+#  define ETHR_ATOMIC_WANT_64BIT_IMPL__
+#  include "ethr_atomic.h"
+#endif
+
+#endif
 
 #endif
diff --git a/erts/include/internal/i386/atomic.h b/erts/include/internal/i386/atomic.h
index 90b4c5f773..4e402f261a 100644
--- a/erts/include/internal/i386/atomic.h
+++ b/erts/include/internal/i386/atomic.h
@@ -23,143 +23,265 @@
  *
  * This code requires a 486 or newer processor.
  */
-#ifndef ETHREAD_I386_ATOMIC_H
-#define ETHREAD_I386_ATOMIC_H
 
-/* An atomic is an aligned long accessed via locked operations.
- */
-typedef struct {
-    volatile long counter;
-} ethr_native_atomic_t;
+#undef ETHR_INCLUDE_ATOMIC_IMPL__
+#if !defined(ETHR_X86_ATOMIC32_H__) && defined(ETHR_ATOMIC_WANT_32BIT_IMPL__)
+#define ETHR_X86_ATOMIC32_H__
+#define ETHR_INCLUDE_ATOMIC_IMPL__ 4
+#undef ETHR_ATOMIC_WANT_32BIT_IMPL__
+#elif !defined(ETHR_X86_ATOMIC64_H__) && defined(ETHR_ATOMIC_WANT_64BIT_IMPL__)
+#define ETHR_X86_ATOMIC64_H__
+#define ETHR_INCLUDE_ATOMIC_IMPL__ 8
+#undef ETHR_ATOMIC_WANT_64BIT_IMPL__
+#endif
+
+#ifdef ETHR_INCLUDE_ATOMIC_IMPL__
 
-#ifdef __x86_64__
+#ifndef ETHR_X86_ATOMIC_COMMON__
+#define ETHR_X86_ATOMIC_COMMON__
+
+#define ETHR_ATOMIC_HAVE_INC_DEC_INSTRUCTIONS 1
+
+#if defined(__x86_64__) || !defined(ETHR_PRE_PENTIUM4_COMPAT)
 #define ETHR_MEMORY_BARRIER __asm__ __volatile__("mfence" : : : "memory")
+#define ETHR_WRITE_MEMORY_BARRIER __asm__ __volatile__("sfence" : : : "memory")
+#define ETHR_READ_MEMORY_BARRIER __asm__ __volatile__("lfence" : : : "memory")
+#define ETHR_READ_DEPEND_MEMORY_BARRIER __asm__ __volatile__("" : : : "memory")
 #else
 #define ETHR_MEMORY_BARRIER \
 do { \
-    volatile long x___ = 0; \
+    volatile ethr_sint32_t x___ = 0; \
     __asm__ __volatile__("lock; incl %0" : "=m"(x___) : "m"(x___) : "memory"); \
 } while (0)
 #endif
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#endif /* ETHR_X86_ATOMIC_COMMON__ */
 
-#ifdef __x86_64__
-#define LONG_SUFFIX "q"
+#if ETHR_INCLUDE_ATOMIC_IMPL__ == 4
+#define ETHR_HAVE_NATIVE_ATOMIC32 1
+#define ETHR_NATMC_FUNC__(X) ethr_native_atomic32_ ## X
+#define ETHR_ATMC_T__ ethr_native_atomic32_t
+#define ETHR_AINT_T__ ethr_sint32_t
+#define ETHR_AINT_SUFFIX__ "l"
+#elif ETHR_INCLUDE_ATOMIC_IMPL__ == 8
+#define ETHR_HAVE_NATIVE_ATOMIC64 1
+#define ETHR_NATMC_FUNC__(X) ethr_native_atomic64_ ## X
+#define ETHR_ATMC_T__ ethr_native_atomic64_t
+#define ETHR_AINT_T__ ethr_sint64_t
+#define ETHR_AINT_SUFFIX__ "q"
 #else
-#define LONG_SUFFIX "l"
+#error "Unsupported integer size"
 #endif
 
+/* An atomic is an aligned ETHR_AINT_T__ accessed via locked operations.
+ */
+typedef struct {
+    volatile ETHR_AINT_T__ counter;
+} ETHR_ATMC_T__;
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_ATOMIC_IMPL__)
+
+static ETHR_INLINE ETHR_AINT_T__ *
+ETHR_NATMC_FUNC__(addr)(ETHR_ATMC_T__ *var)
+{
+    return (ETHR_AINT_T__ *) &var->counter;
+}
+
 static ETHR_INLINE void
-ethr_native_atomic_init(ethr_native_atomic_t *var, long i)
+ETHR_NATMC_FUNC__(init)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ i)
 {
     var->counter = i;
 }
-#define ethr_native_atomic_set(v, i)	ethr_native_atomic_init((v), (i))
 
-static ETHR_INLINE long
-ethr_native_atomic_read(ethr_native_atomic_t *var)
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(set)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ i)
+{
+    var->counter = i;
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(read)(ETHR_ATMC_T__ *var)
 {
     return var->counter;
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_add(ethr_native_atomic_t *var, long incr)
+ETHR_NATMC_FUNC__(add)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
 {
     __asm__ __volatile__(
-       "lock; add" LONG_SUFFIX " %1, %0"
+       "lock; add" ETHR_AINT_SUFFIX__ " %1, %0"
        : "=m"(var->counter)
        : "ir"(incr), "m"(var->counter));
 }      
        
 static ETHR_INLINE void
-ethr_native_atomic_inc(ethr_native_atomic_t *var)
+ETHR_NATMC_FUNC__(inc)(ETHR_ATMC_T__ *var)
 {
     __asm__ __volatile__(
-	"lock; inc" LONG_SUFFIX " %0"
+	"lock; inc" ETHR_AINT_SUFFIX__ " %0"
 	: "=m"(var->counter)
 	: "m"(var->counter));
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_dec(ethr_native_atomic_t *var)
+ETHR_NATMC_FUNC__(dec)(ETHR_ATMC_T__ *var)
 {
     __asm__ __volatile__(
-	"lock; dec" LONG_SUFFIX " %0"
+	"lock; dec" ETHR_AINT_SUFFIX__ " %0"
 	: "=m"(var->counter)
 	: "m"(var->counter));
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_add_return(ethr_native_atomic_t *var, long incr)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(add_return)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
 {
-    long tmp;
+    ETHR_AINT_T__ tmp;
 
     tmp = incr;
     __asm__ __volatile__(
-	"lock; xadd" LONG_SUFFIX " %0, %1" /* xadd didn't exist prior to the 486 */
+	"lock; xadd" ETHR_AINT_SUFFIX__ " %0, %1" /* xadd didn't exist prior to the 486 */
 	: "=r"(tmp)
 	: "m"(var->counter), "0"(tmp));
     /* now tmp is the atomic's previous value */
     return tmp + incr;
 }
 
-#define ethr_native_atomic_inc_return(var) ethr_native_atomic_add_return((var), 1)
-#define ethr_native_atomic_dec_return(var) ethr_native_atomic_add_return((var), -1)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(inc_return)(ETHR_ATMC_T__ *var)
+{
+    return ETHR_NATMC_FUNC__(add_return)(var, (ETHR_AINT_T__) 1);
+}
 
-static ETHR_INLINE long
-ethr_native_atomic_cmpxchg(ethr_native_atomic_t *var, long new, long old)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(dec_return)(ETHR_ATMC_T__ *var)
+{
+    return ETHR_NATMC_FUNC__(add_return)(var, (ETHR_AINT_T__) -1);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg)(ETHR_ATMC_T__ *var,
+			   ETHR_AINT_T__ new,
+			   ETHR_AINT_T__ old)
 {
     __asm__ __volatile__(
-      "lock; cmpxchg" LONG_SUFFIX " %2, %3"
+      "lock; cmpxchg" ETHR_AINT_SUFFIX__ " %2, %3"
       : "=a"(old), "=m"(var->counter)
       : "r"(new), "m"(var->counter), "0"(old)
       : "cc", "memory"); /* full memory clobber to make this a compiler barrier */
     return old;
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_and_retold(ethr_native_atomic_t *var, long mask)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(and_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
 {
-    long tmp, old;
+    ETHR_AINT_T__ tmp, old;
 
     tmp = var->counter;
     do {
 	old = tmp;
-        tmp = ethr_native_atomic_cmpxchg(var, tmp & mask, tmp);
+        tmp = ETHR_NATMC_FUNC__(cmpxchg)(var, tmp & mask, tmp);
     } while (__builtin_expect(tmp != old, 0));
     /* now tmp is the atomic's previous value */
     return tmp;
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_or_retold(ethr_native_atomic_t *var, long mask)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(or_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
 {
-    long tmp, old;
+    ETHR_AINT_T__ tmp, old;
 
     tmp = var->counter;
     do {
 	old = tmp;
-        tmp = ethr_native_atomic_cmpxchg(var, tmp | mask, tmp);
+        tmp = ETHR_NATMC_FUNC__(cmpxchg)(var, tmp | mask, tmp);
     } while (__builtin_expect(tmp != old, 0));
     /* now tmp is the atomic's previous value */
     return tmp;
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_xchg(ethr_native_atomic_t *var, long val)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(xchg)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ val)
 {   
-    long tmp = val;
+    ETHR_AINT_T__ tmp = val;
     __asm__ __volatile__(
-	"xchg" LONG_SUFFIX " %0, %1"
+	"xchg" ETHR_AINT_SUFFIX__ " %0, %1"
 	: "=r"(tmp)
 	: "m"(var->counter), "0"(tmp));
     /* now tmp is the atomic's previous value */ 
     return tmp;
 } 
 
-#undef LONG_SUFFIX
+/*
+ * Atomic ops with at least specified barriers.
+ */
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(read_acqb)(ETHR_ATMC_T__ *var)
+{
+    ETHR_AINT_T__ val;
+#if defined(__x86_64__) || !defined(ETHR_PRE_PENTIUM4_COMPAT)
+    val = var->counter;
+#else
+    val = ETHR_NATMC_FUNC__(add_return)(var, 0);
+#endif
+    __asm__ __volatile__("" : : : "memory");
+    return val;
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(set_relb)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ i)
+{
+    __asm__ __volatile__("" : : : "memory");
+#if defined(__x86_64__) || !defined(ETHR_PRE_PENTIUM4_COMPAT)
+    var->counter = i;
+#else
+    (void) ETHR_NATMC_FUNC__(xchg)(var, i);
+#endif
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(inc_return_acqb)(ETHR_ATMC_T__ *var)
+{
+    ETHR_AINT_T__ res = ETHR_NATMC_FUNC__(inc_return)(var);
+    __asm__ __volatile__("" : : : "memory");
+    return res;
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(dec_relb)(ETHR_ATMC_T__ *var)
+{
+    __asm__ __volatile__("" : : : "memory");
+    ETHR_NATMC_FUNC__(dec)(var);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(dec_return_relb)(ETHR_ATMC_T__ *var)
+{
+    __asm__ __volatile__("" : : : "memory");
+    return ETHR_NATMC_FUNC__(dec_return)(var);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg_acqb)(ETHR_ATMC_T__ *var,
+				ETHR_AINT_T__ new,
+				ETHR_AINT_T__ old)
+{
+    return ETHR_NATMC_FUNC__(cmpxchg)(var, new, old);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg_relb)(ETHR_ATMC_T__ *var,
+				ETHR_AINT_T__ new,
+				ETHR_AINT_T__ old)
+{
+    return ETHR_NATMC_FUNC__(cmpxchg)(var, new, old);
+}
 
 #endif /* ETHR_TRY_INLINE_FUNCS */
 
-#endif /* ETHREAD_I386_ATOMIC_H */
+#undef ETHR_NATMC_FUNC__
+#undef ETHR_ATMC_T__
+#undef ETHR_AINT_T__
+#undef ETHR_AINT_SUFFIX__
+
+#endif /* ETHR_INCLUDE_ATOMIC_IMPL__ */
diff --git a/erts/include/internal/i386/ethread.h b/erts/include/internal/i386/ethread.h
index fad8b108fa..b5a17caefb 100644
--- a/erts/include/internal/i386/ethread.h
+++ b/erts/include/internal/i386/ethread.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2005-2010. 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
@@ -24,11 +24,17 @@
 #ifndef ETHREAD_I386_ETHREAD_H
 #define ETHREAD_I386_ETHREAD_H
 
+#define ETHR_ATOMIC_WANT_32BIT_IMPL__
 #include "atomic.h"
+#if ETHR_SIZEOF_PTR == 8
+#  define ETHR_ATOMIC_WANT_64BIT_IMPL__
+#  include "atomic.h"
+#endif
 #include "spinlock.h"
 #include "rwlock.h"
 
 #define ETHR_HAVE_NATIVE_ATOMICS 1
-#define ETHR_HAVE_NATIVE_LOCKS 1
+#define ETHR_HAVE_NATIVE_SPINLOCKS 1
+#define ETHR_HAVE_NATIVE_RWSPINLOCKS 1
 
 #endif /* ETHREAD_I386_ETHREAD_H */
diff --git a/erts/include/internal/i386/rwlock.h b/erts/include/internal/i386/rwlock.h
index c009be8ef1..be47f459ce 100644
--- a/erts/include/internal/i386/rwlock.h
+++ b/erts/include/internal/i386/rwlock.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2005-2010. 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%
  */
 
@@ -31,7 +31,7 @@ typedef struct {
     volatile int lock;
 } ethr_native_rwlock_t;
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
 
 #define ETHR_RWLOCK_OFFSET	(1<<24)
 
diff --git a/erts/include/internal/i386/spinlock.h b/erts/include/internal/i386/spinlock.h
index 2b4832e26a..0325324895 100644
--- a/erts/include/internal/i386/spinlock.h
+++ b/erts/include/internal/i386/spinlock.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2005-2010. 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%
  */
 
@@ -31,7 +31,7 @@ typedef struct {
     volatile unsigned int lock;
 } ethr_native_spinlock_t;
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
 
 static ETHR_INLINE void
 ethr_native_spinlock_init(ethr_native_spinlock_t *lock)
@@ -46,7 +46,7 @@ ethr_native_spin_unlock(ethr_native_spinlock_t *lock)
      * On i386 this needs to be a locked operation
      * to avoid Pentium Pro errata 66 and 92.
      */
-#if defined(__x86_64__)
+#if defined(__x86_64__) || !defined(ETHR_PRE_PENTIUM4_COMPAT)
     __asm__ __volatile__("" : : : "memory");
     *(unsigned char*)&lock->lock = 0;
 #else
diff --git a/erts/include/internal/libatomic_ops/ethr_atomic.h b/erts/include/internal/libatomic_ops/ethr_atomic.h
new file mode 100644
index 0000000000..d56693dbf8
--- /dev/null
+++ b/erts/include/internal/libatomic_ops/ethr_atomic.h
@@ -0,0 +1,350 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: Native atomics ethread support using libatomic_ops
+ * Author: Rickard Green
+ */
+
+#ifndef ETHR_LIBATOMIC_OPS_ATOMIC_H__
+#define ETHR_LIBATOMIC_OPS_ATOMIC_H__
+
+#if !defined(ETHR_HAVE_NATIVE_ATOMICS) && defined(ETHR_HAVE_LIBATOMIC_OPS)
+#define ETHR_HAVE_NATIVE_ATOMICS 1
+
+#if (defined(__i386__) && !defined(ETHR_PRE_PENTIUM4_COMPAT)) \
+    || defined(__x86_64__)
+#define AO_USE_PENTIUM4_INSTRS
+#endif
+
+#include "atomic_ops.h"
+
+/*
+ * libatomic_ops can be downloaded from:
+ *   http://www.hpl.hp.com/research/linux/atomic_ops/
+ *
+ * These operations need to be defined by libatomic_ops;
+ * otherwise, we won't compile:
+ * - AO_nop_full()
+ * - AO_load()
+ * - AO_store()
+ * - AO_compare_and_swap()
+ *
+ * The `AO_t' type also have to be at least as large as the `void *' type.
+ */
+
+#if ETHR_SIZEOF_AO_T < ETHR_SIZEOF_PTR
+#error The AO_t type is too small
+#endif
+
+#if ETHR_SIZEOF_AO_T == 4
+#define ETHR_HAVE_NATIVE_ATOMIC32 1
+#define ETHR_NATMC_FUNC__(X) ethr_native_atomic32_ ## X
+#define ETHR_ATMC_T__ ethr_native_atomic32_t
+#define ETHR_AINT_T__ ethr_sint32_t
+#define ETHR_AINT_SUFFIX__ "l"
+#elif ETHR_SIZEOF_AO_T == 8
+#define ETHR_HAVE_NATIVE_ATOMIC64 1
+#define ETHR_NATMC_FUNC__(X) ethr_native_atomic64_ ## X
+#define ETHR_ATMC_T__ ethr_native_atomic64_t
+#define ETHR_AINT_T__ ethr_sint64_t
+#define ETHR_AINT_SUFFIX__ "q"
+#else
+#error "Unsupported integer size"
+#endif
+
+#if ETHR_SIZEOF_AO_T == 8
+typedef union {
+    volatile AO_t counter;
+    ethr_sint32_t sint32[2];
+} ETHR_ATMC_T__;
+#else
+typedef struct {
+    volatile AO_t counter;
+} ETHR_ATMC_T__;
+#endif
+
+#define ETHR_MEMORY_BARRIER AO_nop_full()
+#ifdef AO_HAVE_nop_write
+# define ETHR_WRITE_MEMORY_BARRIER AO_nop_write()
+#else
+# define ETHR_WRITE_MEMORY_BARRIER ETHR_MEMORY_BARRIER
+#endif
+#ifdef AO_HAVE_nop_read
+#  define ETHR_READ_MEMORY_BARRIER AO_nop_read()
+#else
+#  define ETHR_READ_MEMORY_BARRIER ETHR_MEMORY_BARRIER
+#endif
+#ifdef AO_NO_DD_ORDERING
+#  define ETHR_READ_DEPEND_MEMORY_BARRIER ETHR_READ_MEMORY_BARRIER
+#else
+#  define ETHR_READ_DEPEND_MEMORY_BARRIER AO_compiler_barrier()
+#endif
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_ATOMIC_IMPL__)
+
+static ETHR_INLINE ETHR_AINT_T__ *
+ETHR_NATMC_FUNC__(addr)(ETHR_ATMC_T__ *var)
+{
+    return (ETHR_AINT_T__ *) &var->counter;
+}
+
+#if ETHR_SIZEOF_AO_T == 8
+/*
+ * We also need to provide an ethr_native_atomic32_addr(), since
+ * this 64-bit implementation will be used implementing 32-bit
+ * native atomics.
+ */
+
+static ETHR_INLINE ethr_sint32_t *
+ethr_native_atomic32_addr(ETHR_ATMC_T__ *var)
+{
+    ETHR_ASSERT(((void *) &var->sint32[0]) == ((void *) &var->counter));
+#ifdef ETHR_BIGENDIAN
+    return &var->sint32[1];
+#else
+    return &var->sint32[0];
+#endif
+}
+
+#endif /* ETHR_SIZEOF_AO_T == 8 */
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(set)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ value)
+{
+    AO_store(&var->counter, (AO_t) value);
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(init)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ value)
+{
+    ETHR_NATMC_FUNC__(set)(var, value);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(read)(ETHR_ATMC_T__ *var)
+{
+    return (ETHR_AINT_T__) AO_load(&var->counter);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(add_return)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
+{
+#ifdef AO_HAVE_fetch_and_add
+    return ((ETHR_AINT_T__) AO_fetch_and_add(&var->counter, (AO_t) incr)) + incr;
+#else
+    while (1) {
+	AO_t exp = AO_load(&var->counter);
+	AO_t new = exp + (AO_t) incr;
+	if (AO_compare_and_swap(&var->counter, exp, new))
+	    return (ETHR_AINT_T__) new;
+    }
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(add)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
+{
+    (void) ETHR_NATMC_FUNC__(add_return)(var, incr);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(inc_return)(ETHR_ATMC_T__ *var)
+{
+#ifdef AO_HAVE_fetch_and_add1
+    return ((ETHR_AINT_T__) AO_fetch_and_add1(&var->counter)) + 1;
+#else
+    return ETHR_NATMC_FUNC__(add_return)(var, 1);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(inc)(ETHR_ATMC_T__ *var)
+{
+    (void) ETHR_NATMC_FUNC__(inc_return)(var);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(dec_return)(ETHR_ATMC_T__ *var)
+{
+#ifdef AO_HAVE_fetch_and_sub1
+    return ((ETHR_AINT_T__) AO_fetch_and_sub1(&var->counter)) - 1;
+#else
+    return ETHR_NATMC_FUNC__(add_return)(var, -1);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(dec)(ETHR_ATMC_T__ *var)
+{
+    (void) ETHR_NATMC_FUNC__(dec_return)(var);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(and_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
+{
+    while (1) {
+	AO_t exp = AO_load(&var->counter);
+	AO_t new = exp & ((AO_t) mask);
+	if (AO_compare_and_swap(&var->counter, exp, new))
+	    return (ETHR_AINT_T__) exp;
+    }
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(or_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
+{
+    while (1) {
+	AO_t exp = AO_load(&var->counter);
+	AO_t new = exp | ((AO_t) mask);
+	if (AO_compare_and_swap(&var->counter, exp, new))
+	    return (ETHR_AINT_T__) exp;
+    }
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg)(ETHR_ATMC_T__ *var,
+			   ETHR_AINT_T__ new,
+			   ETHR_AINT_T__ exp)
+{
+    ETHR_AINT_T__ act;
+    do {
+	if (AO_compare_and_swap(&var->counter, (AO_t) exp, (AO_t) new))
+	    return exp;
+	act = (ETHR_AINT_T__) AO_load(&var->counter);
+    } while (act == exp);
+    return act;
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(xchg)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ new)
+{
+    while (1) {
+	AO_t exp = AO_load(&var->counter);
+	if (AO_compare_and_swap(&var->counter, exp, (AO_t) new))
+	    return (ETHR_AINT_T__) exp;
+    }
+}
+
+/*
+ * Atomic ops with at least specified barriers.
+ */
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(read_acqb)(ETHR_ATMC_T__ *var)
+{
+#ifdef AO_HAVE_load_acquire
+    return (ETHR_AINT_T__) AO_load_acquire(&var->counter);
+#else
+    ETHR_AINT_T__ res = ETHR_NATMC_FUNC__(read)(var);
+    ETHR_MEMORY_BARRIER;
+    return res;
+#endif
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(inc_return_acqb)(ETHR_ATMC_T__ *var)
+{
+#ifdef AO_HAVE_fetch_and_add1_acquire
+    return ((ETHR_AINT_T__) AO_fetch_and_add1_acquire(&var->counter)) + 1;
+#else
+    ETHR_AINT_T__ res = ETHR_NATMC_FUNC__(add_return)(var, 1);
+    ETHR_MEMORY_BARRIER;
+    return res;
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(set_relb)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ value)
+{
+#ifdef AO_HAVE_store_release
+    AO_store_release(&var->counter, (AO_t) value);
+#else
+    ETHR_MEMORY_BARRIER;
+    ETHR_NATMC_FUNC__(set)(var, value);
+#endif
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(dec_return_relb)(ETHR_ATMC_T__ *var)
+{
+#ifdef AO_HAVE_fetch_and_sub1_release
+    return ((ETHR_AINT_T__) AO_fetch_and_sub1_release(&var->counter)) - 1;
+#else
+    ETHR_MEMORY_BARRIER;
+    return ETHR_NATMC_FUNC__(dec_return)(var);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(dec_relb)(ETHR_ATMC_T__ *var)
+{
+    (void) ETHR_NATMC_FUNC__(dec_return_relb)(var);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg_acqb)(ETHR_ATMC_T__ *var,
+				ETHR_AINT_T__ new,
+				ETHR_AINT_T__ exp)
+{
+#ifdef AO_HAVE_compare_and_swap_acquire
+    ETHR_AINT_T__ act;
+    do {
+	if (AO_compare_and_swap_acquire(&var->counter, (AO_t) exp, (AO_t) new))
+	    return exp;
+	act = (ETHR_AINT_T__) AO_load(&var->counter);
+    } while (act == exp);
+    AO_nop_full();
+    return act;
+#else
+    ETHR_AINT_T__ act = ETHR_NATMC_FUNC__(cmpxchg)(var, new, exp);
+    ETHR_MEMORY_BARRIER;
+    return act;
+#endif
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg_relb)(ETHR_ATMC_T__ *var,
+				ETHR_AINT_T__ new,
+				ETHR_AINT_T__ exp)
+{
+#ifdef AO_HAVE_compare_and_swap_release
+    ETHR_AINT_T__ act;
+    do {
+	if (AO_compare_and_swap_release(&var->counter, (AO_t) exp, (AO_t) new))
+	    return exp;
+	act = (ETHR_AINT_T__) AO_load(&var->counter);
+    } while (act == exp);
+    return act;
+#else
+    ETHR_MEMORY_BARRIER;
+    return ETHR_NATMC_FUNC__(cmpxchg)(var, new, exp);
+#endif
+}
+
+
+#endif /* ETHR_TRY_INLINE_FUNCS */
+
+#undef ETHR_NATMC_FUNC__
+#undef ETHR_ATMC_T__
+#undef ETHR_AINT_T__
+
+#endif /* !defined(ETHR_HAVE_NATIVE_ATOMICS) && defined(ETHR_HAVE_LIBATOMIC_OPS) */
+
+#endif /* ETHR_LIBATOMIC_OPS_ATOMIC_H__ */
diff --git a/erts/include/internal/libatomic_ops/ethread.h b/erts/include/internal/libatomic_ops/ethread.h
new file mode 100644
index 0000000000..ee73ba73bc
--- /dev/null
+++ b/erts/include/internal/libatomic_ops/ethread.h
@@ -0,0 +1,30 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: Native atomics ethread support using libatomic_ops
+ * Author: Rickard Green
+ */
+
+#ifndef ETHREAD_LIBATOMIC_OPS_H__
+#define ETHREAD_LIBATOMIC_OPS_H__
+
+#include "ethr_atomic.h"
+
+#endif
diff --git a/erts/include/internal/ppc32/atomic.h b/erts/include/internal/ppc32/atomic.h
index 105d874995..522f433649 100644
--- a/erts/include/internal/ppc32/atomic.h
+++ b/erts/include/internal/ppc32/atomic.h
@@ -28,31 +28,39 @@
 #ifndef ETHREAD_PPC_ATOMIC_H
 #define ETHREAD_PPC_ATOMIC_H
 
+#define ETHR_HAVE_NATIVE_ATOMIC32 1
+
 typedef struct {
-    volatile int counter;
-} ethr_native_atomic_t;
+    volatile ethr_sint32_t counter;
+} ethr_native_atomic32_t;
 
 #define ETHR_MEMORY_BARRIER __asm__ __volatile__("sync" : : : "memory")
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_ATOMIC_IMPL__)
+
+static ETHR_INLINE ethr_sint32_t *
+ethr_native_atomic32_addr(ethr_native_atomic32_t *var)
+{
+    return (ethr_sint32_t *) &var->counter;
+}
 
 static ETHR_INLINE void
-ethr_native_atomic_init(ethr_native_atomic_t *var, int i)
+ethr_native_atomic32_init(ethr_native_atomic32_t *var, ethr_sint32_t i)
 {
     var->counter = i;
 }
-#define ethr_native_atomic_set(v, i)	ethr_native_atomic_init((v), (i))
+#define ethr_native_atomic32_set(v, i)	ethr_native_atomic32_init((v), (i))
 
-static ETHR_INLINE int
-ethr_native_atomic_read(ethr_native_atomic_t *var)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_read(ethr_native_atomic32_t *var)
 {
     return var->counter;
 }
 
-static ETHR_INLINE int
-ethr_native_atomic_add_return(ethr_native_atomic_t *var, int incr)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_add_return(ethr_native_atomic32_t *var, ethr_sint32_t incr)
 {
-    int tmp;
+    ethr_sint32_t tmp;
 
     __asm__ __volatile__(
 	"eieio\n\t"
@@ -69,16 +77,16 @@ ethr_native_atomic_add_return(ethr_native_atomic_t *var, int incr)
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_add(ethr_native_atomic_t *var, int incr)
+ethr_native_atomic32_add(ethr_native_atomic32_t *var, ethr_sint32_t incr)
 {
     /* XXX: could use weaker version here w/o eieio+isync */
-    (void)ethr_native_atomic_add_return(var, incr);
+    (void)ethr_native_atomic32_add_return(var, incr);
 }
 
-static ETHR_INLINE int
-ethr_native_atomic_inc_return(ethr_native_atomic_t *var)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_inc_return(ethr_native_atomic32_t *var)
 {
-    int tmp;
+    ethr_sint32_t tmp;
 
     __asm__ __volatile__(
 	"eieio\n\t"
@@ -95,16 +103,16 @@ ethr_native_atomic_inc_return(ethr_native_atomic_t *var)
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_inc(ethr_native_atomic_t *var)
+ethr_native_atomic32_inc(ethr_native_atomic32_t *var)
 {
     /* XXX: could use weaker version here w/o eieio+isync */
-    (void)ethr_native_atomic_inc_return(var);
+    (void)ethr_native_atomic32_inc_return(var);
 }
 
-static ETHR_INLINE int
-ethr_native_atomic_dec_return(ethr_native_atomic_t *var)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_dec_return(ethr_native_atomic32_t *var)
 {
-    int tmp;
+    ethr_sint32_t tmp;
 
     __asm__ __volatile__(
 	"eieio\n\t"
@@ -121,16 +129,16 @@ ethr_native_atomic_dec_return(ethr_native_atomic_t *var)
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_dec(ethr_native_atomic_t *var)
+ethr_native_atomic32_dec(ethr_native_atomic32_t *var)
 {
     /* XXX: could use weaker version here w/o eieio+isync */
-    (void)ethr_native_atomic_dec_return(var);
+    (void)ethr_native_atomic32_dec_return(var);
 }
 
-static ETHR_INLINE int
-ethr_native_atomic_and_retold(ethr_native_atomic_t *var, int mask)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_and_retold(ethr_native_atomic32_t *var, ethr_sint32_t mask)
 {
-    int old, new;
+    ethr_sint32_t old, new;
 
     __asm__ __volatile__(
 	"eieio\n\t"
@@ -146,10 +154,10 @@ ethr_native_atomic_and_retold(ethr_native_atomic_t *var, int mask)
     return old;
 }
 
-static ETHR_INLINE int
-ethr_native_atomic_or_retold(ethr_native_atomic_t *var, int mask)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_or_retold(ethr_native_atomic32_t *var, ethr_sint32_t mask)
 {
-    int old, new;
+    ethr_sint32_t old, new;
 
     __asm__ __volatile__(
 	"eieio\n\t"
@@ -165,10 +173,10 @@ ethr_native_atomic_or_retold(ethr_native_atomic_t *var, int mask)
     return old;
 }
 
-static ETHR_INLINE int
-ethr_native_atomic_xchg(ethr_native_atomic_t *var, int val)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_xchg(ethr_native_atomic32_t *var, ethr_sint32_t val)
 {
-    int tmp;
+    ethr_sint32_t tmp;
 
     __asm__ __volatile__(
 	"eieio\n\t"
@@ -183,10 +191,12 @@ ethr_native_atomic_xchg(ethr_native_atomic_t *var, int val)
     return tmp;
 }
 
-static ETHR_INLINE int
-ethr_native_atomic_cmpxchg(ethr_native_atomic_t *var, int new, int expected)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_cmpxchg(ethr_native_atomic32_t *var,
+			     ethr_sint32_t new,
+			     ethr_sint32_t expected)
 {
-  int old;
+  ethr_sint32_t old;
 
   __asm__ __volatile__(
     "eieio\n\t"
@@ -205,6 +215,26 @@ ethr_native_atomic_cmpxchg(ethr_native_atomic_t *var, int new, int expected)
     return old;
 }
 
+/*
+ * Atomic ops with at least specified barriers.
+ */
+
+static ETHR_INLINE long
+ethr_native_atomic32_read_acqb(ethr_native_atomic32_t *var)
+{
+    long res = ethr_native_atomic32_read(var);
+    ETHR_MEMORY_BARRIER;
+    return res;
+}
+
+#define ethr_native_atomic32_set_relb ethr_native_atomic32_xchg
+#define ethr_native_atomic32_inc_return_acqb ethr_native_atomic32_inc_return
+#define ethr_native_atomic32_dec_relb ethr_native_atomic32_dec_return
+#define ethr_native_atomic32_dec_return_relb ethr_native_atomic32_dec_return
+
+#define ethr_native_atomic32_cmpxchg_acqb ethr_native_atomic32_cmpxchg
+#define ethr_native_atomic32_cmpxchg_relb ethr_native_atomic32_cmpxchg
+
 #endif /* ETHR_TRY_INLINE_FUNCS */
 
 #endif /* ETHREAD_PPC_ATOMIC_H */
diff --git a/erts/include/internal/ppc32/ethread.h b/erts/include/internal/ppc32/ethread.h
index d2a72c3dc1..12efc1b653 100644
--- a/erts/include/internal/ppc32/ethread.h
+++ b/erts/include/internal/ppc32/ethread.h
@@ -29,6 +29,7 @@
 #include "rwlock.h"
 
 #define ETHR_HAVE_NATIVE_ATOMICS 1
-#define ETHR_HAVE_NATIVE_LOCKS 1
+#define ETHR_HAVE_NATIVE_SPINLOCKS 1
+#define ETHR_HAVE_NATIVE_RWSPINLOCKS 1
 
 #endif /* ETHREAD_PPC32_ETHREAD_H */
diff --git a/erts/include/internal/ppc32/rwlock.h b/erts/include/internal/ppc32/rwlock.h
index 9bdab12826..19ec26ab68 100644
--- a/erts/include/internal/ppc32/rwlock.h
+++ b/erts/include/internal/ppc32/rwlock.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2005-2010. 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%
  */
 
@@ -34,7 +34,7 @@ typedef struct {
     volatile int lock;
 } ethr_native_rwlock_t;
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
 
 static ETHR_INLINE void
 ethr_native_rwlock_init(ethr_native_rwlock_t *lock)
diff --git a/erts/include/internal/ppc32/spinlock.h b/erts/include/internal/ppc32/spinlock.h
index 034c20c143..c8460a3e8a 100644
--- a/erts/include/internal/ppc32/spinlock.h
+++ b/erts/include/internal/ppc32/spinlock.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2005-2010. 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%
  */
 
@@ -34,7 +34,7 @@ typedef struct {
     volatile unsigned int lock;
 } ethr_native_spinlock_t;
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
 
 static ETHR_INLINE void
 ethr_native_spinlock_init(ethr_native_spinlock_t *lock)
diff --git a/erts/include/internal/pthread/ethr_event.h b/erts/include/internal/pthread/ethr_event.h
new file mode 100644
index 0000000000..93da8a0429
--- /dev/null
+++ b/erts/include/internal/pthread/ethr_event.h
@@ -0,0 +1,135 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2009-2010. 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%
+ */
+
+/*
+ * Author: Rickard Green
+ */
+
+#if defined(ETHR_HAVE_LINUX_FUTEX) && defined(ETHR_HAVE_NATIVE_ATOMICS)
+/* --- Linux futex implementation of ethread events ------------------------- */
+#define ETHR_LINUX_FUTEX_IMPL__
+
+#include <sys/syscall.h>
+#include <unistd.h>
+#include <linux/futex.h>
+#include <sys/time.h>
+
+#define ETHR_EVENT_OFF_WAITER__		((ethr_sint32_t) -1)
+#define ETHR_EVENT_OFF__		((ethr_sint32_t) 1)
+#define ETHR_EVENT_ON__ 		((ethr_sint32_t) 0)
+
+#if defined(FUTEX_WAIT_PRIVATE) && defined(FUTEX_WAKE_PRIVATE)
+#  define ETHR_FUTEX_WAIT__ FUTEX_WAIT_PRIVATE
+#  define ETHR_FUTEX_WAKE__ FUTEX_WAKE_PRIVATE
+#else
+#  define ETHR_FUTEX_WAIT__ FUTEX_WAIT
+#  define ETHR_FUTEX_WAKE__ FUTEX_WAKE
+#endif
+
+typedef struct {
+    ethr_atomic32_t futex;
+} ethr_event;
+
+#define ETHR_FUTEX__(FTX, OP, VAL)			\
+  (-1 == syscall(__NR_futex,				\
+		 (void *) ethr_atomic32_addr((FTX)),	\
+		 (OP),					\
+		 (int) (VAL),				\
+		 NULL,					\
+		 NULL,					\
+		 0)					\
+   ? errno : 0)
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_EVENT_IMPL__)
+
+static void ETHR_INLINE
+ETHR_INLINE_FUNC_NAME_(ethr_event_set)(ethr_event *e)
+{
+    ethr_sint32_t val;
+    ETHR_WRITE_MEMORY_BARRIER;
+    val = ethr_atomic32_xchg(&e->futex, ETHR_EVENT_ON__);
+    if (val == ETHR_EVENT_OFF_WAITER__) {
+	int res = ETHR_FUTEX__(&e->futex, ETHR_FUTEX_WAKE__, 1);
+	if (res != 0)
+	    ETHR_FATAL_ERROR__(res);
+    }
+}
+
+static void ETHR_INLINE
+ETHR_INLINE_FUNC_NAME_(ethr_event_reset)(ethr_event *e)
+{
+    ethr_atomic32_set(&e->futex, ETHR_EVENT_OFF__);
+    ETHR_MEMORY_BARRIER;
+}
+
+#endif
+
+#elif defined(ETHR_PTHREADS)
+/* --- Posix mutex/cond implementation of events ---------------------------- */
+
+typedef struct {
+    ethr_atomic32_t state;
+    pthread_mutex_t mtx;
+    pthread_cond_t cnd;
+} ethr_event;
+
+#define ETHR_EVENT_OFF_WAITER__		-1L
+#define ETHR_EVENT_OFF__		1L
+#define ETHR_EVENT_ON__ 		0L
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_EVENT_IMPL__)
+
+static void ETHR_INLINE
+ETHR_INLINE_FUNC_NAME_(ethr_event_set)(ethr_event *e)
+{
+    ethr_sint32_t val;
+    ETHR_WRITE_MEMORY_BARRIER;
+    val = ethr_atomic32_xchg(&e->state, ETHR_EVENT_ON__);
+    if (val == ETHR_EVENT_OFF_WAITER__) {
+	int res = pthread_mutex_lock(&e->mtx);
+	if (res != 0)
+	    ETHR_FATAL_ERROR__(res);
+	res = pthread_cond_signal(&e->cnd);
+	if (res != 0)
+	    ETHR_FATAL_ERROR__(res);
+	res = pthread_mutex_unlock(&e->mtx);
+	if (res != 0)
+	    ETHR_FATAL_ERROR__(res);
+    }
+}
+
+static void ETHR_INLINE
+ETHR_INLINE_FUNC_NAME_(ethr_event_reset)(ethr_event *e)
+{
+    ethr_atomic32_set(&e->state, ETHR_EVENT_OFF__);
+    ETHR_MEMORY_BARRIER;
+}
+
+#endif
+
+#endif
+
+int ethr_event_init(ethr_event *e);
+int ethr_event_destroy(ethr_event *e);
+int ethr_event_wait(ethr_event *e);
+int ethr_event_swait(ethr_event *e, int spincount);
+#if !defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_EVENT_IMPL__)
+void ethr_event_set(ethr_event *e);
+void ethr_event_reset(ethr_event *e);
+#endif
diff --git a/erts/include/internal/sparc32/atomic.h b/erts/include/internal/sparc32/atomic.h
index 8fde449a52..00380dbf07 100644
--- a/erts/include/internal/sparc32/atomic.h
+++ b/erts/include/internal/sparc32/atomic.h
@@ -21,49 +21,86 @@
  * Native ethread atomics on SPARC V9.
  * Author: Mikael Pettersson.
  */
-#ifndef ETHR_SPARC32_ATOMIC_H
-#define ETHR_SPARC32_ATOMIC_H
 
-typedef struct {
-    volatile long counter;
-} ethr_native_atomic_t;
+#undef ETHR_INCLUDE_ATOMIC_IMPL__
+#if !defined(ETHR_SPARC_V9_ATOMIC32_H__) && defined(ETHR_ATOMIC_WANT_32BIT_IMPL__)
+#define ETHR_SPARC_V9_ATOMIC32_H__
+#define ETHR_INCLUDE_ATOMIC_IMPL__ 4
+#undef ETHR_ATOMIC_WANT_32BIT_IMPL__
+#elif !defined(ETHR_SPARC_V9_ATOMIC64_H__) && defined(ETHR_ATOMIC_WANT_64BIT_IMPL__)
+#define ETHR_SPARC_V9_ATOMIC64_H__
+#define ETHR_INCLUDE_ATOMIC_IMPL__ 8
+#undef ETHR_ATOMIC_WANT_64BIT_IMPL__
+#endif
+
+#ifdef ETHR_INCLUDE_ATOMIC_IMPL__
+
+#ifndef ETHR_SPARC_V9_ATOMIC_COMMON__
+#define ETHR_SPARC_V9_ATOMIC_COMMON__
 
 #define ETHR_MEMORY_BARRIER \
   __asm__ __volatile__("membar #LoadLoad|#LoadStore|#StoreLoad|#StoreStore\n" \
                        : : : "memory")
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#endif /* ETHR_SPARC_V9_ATOMIC_COMMON__ */
 
-#if defined(__arch64__)
-#define CASX "casx"
+#if ETHR_INCLUDE_ATOMIC_IMPL__ == 4
+#define ETHR_HAVE_NATIVE_ATOMIC32 1
+#define ETHR_NATMC_FUNC__(X) ethr_native_atomic32_ ## X
+#define ETHR_ATMC_T__ ethr_native_atomic32_t
+#define ETHR_AINT_T__ ethr_sint32_t
+#define ETHR_CAS__ "cas"
+#elif ETHR_INCLUDE_ATOMIC_IMPL__ == 8
+#define ETHR_HAVE_NATIVE_ATOMIC64 1
+#define ETHR_NATMC_FUNC__(X) ethr_native_atomic64_ ## X
+#define ETHR_ATMC_T__ ethr_native_atomic64_t
+#define ETHR_AINT_T__ ethr_sint64_t
+#define ETHR_CAS__ "casx"
 #else
-#define CASX "cas"
+#error "Unsupported integer size"
 #endif
 
+typedef struct {
+    volatile ETHR_AINT_T__ counter;
+} ETHR_ATMC_T__;
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_ATOMIC_IMPL__)
+
+static ETHR_INLINE ETHR_AINT_T__ *
+ETHR_NATMC_FUNC__(addr)(ETHR_ATMC_T__ *var)
+{
+    return (ETHR_AINT_T__ *) &var->counter;
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(init)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ i)
+{
+    var->counter = i;
+}
+
 static ETHR_INLINE void
-ethr_native_atomic_init(ethr_native_atomic_t *var, long i)
+ETHR_NATMC_FUNC__(set)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ i)
 {
     var->counter = i;
 }
-#define ethr_native_atomic_set(v, i)	ethr_native_atomic_init((v), (i))
 
-static ETHR_INLINE long
-ethr_native_atomic_read(ethr_native_atomic_t *var)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(read)(ETHR_ATMC_T__ *var)
 {
     return var->counter;
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_add_return(ethr_native_atomic_t *var, long incr)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(add_return)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
 {
-    long old, tmp;
+    ETHR_AINT_T__ old, tmp;
 
     __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n");
     do {
 	old = var->counter;
 	tmp = old+incr;
 	__asm__ __volatile__(
-	    CASX " [%2], %1, %0"
+	    ETHR_CAS__ " [%2], %1, %0"
 	    : "=&r"(tmp)
 	    : "r"(old), "r"(&var->counter), "0"(tmp)
 	    : "memory");
@@ -73,46 +110,46 @@ ethr_native_atomic_add_return(ethr_native_atomic_t *var, long incr)
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_add(ethr_native_atomic_t *var, long incr)
+ETHR_NATMC_FUNC__(add)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
 {
-    (void)ethr_native_atomic_add_return(var, incr);
+    (void)ETHR_NATMC_FUNC__(add_return)(var, incr);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_inc_return(ethr_native_atomic_t *var)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(inc_return)(ETHR_ATMC_T__ *var)
 {
-    return ethr_native_atomic_add_return(var, 1);
+    return ETHR_NATMC_FUNC__(add_return)(var, 1);
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_inc(ethr_native_atomic_t *var)
+ETHR_NATMC_FUNC__(inc)(ETHR_ATMC_T__ *var)
 {
-    (void)ethr_native_atomic_add_return(var, 1);
+    (void)ETHR_NATMC_FUNC__(add_return)(var, 1);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_dec_return(ethr_native_atomic_t *var)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(dec_return)(ETHR_ATMC_T__ *var)
 {
-    return ethr_native_atomic_add_return(var, -1);
+    return ETHR_NATMC_FUNC__(add_return)(var, -1);
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_dec(ethr_native_atomic_t *var)
+ETHR_NATMC_FUNC__(dec)(ETHR_ATMC_T__ *var)
 {
-    (void)ethr_native_atomic_add_return(var, -1);
+    (void)ETHR_NATMC_FUNC__(add_return)(var, -1);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_and_retold(ethr_native_atomic_t *var, long mask)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(and_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
 {
-    long old, tmp;
+    ETHR_AINT_T__ old, tmp;
 
     __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n");
     do {
 	old = var->counter;
 	tmp = old & mask;
 	__asm__ __volatile__(
-	    CASX " [%2], %1, %0"
+	    ETHR_CAS__ " [%2], %1, %0"
 	    : "=&r"(tmp)
 	    : "r"(old), "r"(&var->counter), "0"(tmp)
 	    : "memory");
@@ -121,17 +158,17 @@ ethr_native_atomic_and_retold(ethr_native_atomic_t *var, long mask)
     return old;
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_or_retold(ethr_native_atomic_t *var, long mask)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(or_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
 {
-    long old, tmp;
+    ETHR_AINT_T__ old, tmp;
 
     __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n");
     do {
 	old = var->counter;
 	tmp = old | mask;
 	__asm__ __volatile__(
-	    CASX " [%2], %1, %0"
+	    ETHR_CAS__ " [%2], %1, %0"
 	    : "=&r"(tmp)
 	    : "r"(old), "r"(&var->counter), "0"(tmp)
 	    : "memory");
@@ -140,17 +177,17 @@ ethr_native_atomic_or_retold(ethr_native_atomic_t *var, long mask)
     return old;
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_xchg(ethr_native_atomic_t *var, long val)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(xchg)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ val)
 {
-    long old, new;
+    ETHR_AINT_T__ old, new;
 
     __asm__ __volatile__("membar #LoadLoad|#StoreLoad");
     do {
 	old = var->counter;
 	new = val;
 	__asm__ __volatile__(
-	    CASX " [%2], %1, %0"
+	    ETHR_CAS__ " [%2], %1, %0"
 	    : "=&r"(new)
 	    : "r"(old), "r"(&var->counter), "0"(new)
 	    : "memory");
@@ -159,12 +196,12 @@ ethr_native_atomic_xchg(ethr_native_atomic_t *var, long val)
     return old;
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_cmpxchg(ethr_native_atomic_t *var, long new, long old)
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ new, ETHR_AINT_T__ old)
 {
     __asm__ __volatile__("membar #LoadLoad|#StoreLoad\n");
     __asm__ __volatile__(
-      CASX " [%2], %1, %0"
+      ETHR_CAS__ " [%2], %1, %0"
       : "=&r"(new)
       : "r"(old), "r"(&var->counter), "0"(new)
       : "memory");
@@ -172,6 +209,69 @@ ethr_native_atomic_cmpxchg(ethr_native_atomic_t *var, long new, long old)
     return new;
 }
 
+/*
+ * Atomic ops with at least specified barriers.
+ */
+
+/* TODO: relax acquire barriers */
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(read_acqb)(ETHR_ATMC_T__ *var)
+{
+    ETHR_AINT_T__ res = ETHR_NATMC_FUNC__(read)(var);
+    __asm__ __volatile__("membar #LoadLoad|#LoadStore|#StoreLoad|#StoreStore" : : : "memory");
+    return res;
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(set_relb)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ i)
+{
+    __asm__ __volatile__("membar #LoadStore|#StoreStore" : : : "memory");
+    ETHR_NATMC_FUNC__(set)(var, i);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(inc_return_acqb)(ETHR_ATMC_T__ *var)
+{
+    ETHR_AINT_T__ res = ETHR_NATMC_FUNC__(inc_return)(var);
+    __asm__ __volatile__("membar #LoadLoad|#LoadStore" : : : "memory");
+    return res;
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(dec_relb)(ETHR_ATMC_T__ *var)
+{
+    __asm__ __volatile__("membar #LoadStore|#StoreStore" : : : "memory");
+    ETHR_NATMC_FUNC__(dec)(var);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(dec_return_relb)(ETHR_ATMC_T__ *var)
+{
+    __asm__ __volatile__("membar #LoadStore|#StoreStore" : : : "memory");
+    return ETHR_NATMC_FUNC__(dec_return)(var);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg_acqb)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ new, ETHR_AINT_T__ old)
+{
+    ETHR_AINT_T__ res = ETHR_NATMC_FUNC__(cmpxchg)(var, new, old);
+    __asm__ __volatile__("membar #LoadLoad|#LoadStore" : : : "memory");
+    return res;
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg_relb)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ new, ETHR_AINT_T__ old)
+{
+    __asm__ __volatile__("membar #LoadStore|#StoreStore" : : : "memory");
+    return ETHR_NATMC_FUNC__(cmpxchg)(var, new, old);
+}
+
 #endif /* ETHR_TRY_INLINE_FUNCS */
 
-#endif /* ETHR_SPARC32_ATOMIC_H */
+#undef ETHR_NATMC_FUNC__
+#undef ETHR_ATMC_T__
+#undef ETHR_AINT_T__
+#undef ETHR_CAS__
+
+#endif /* ETHR_INCLUDE_ATOMIC_IMPL__ */
diff --git a/erts/include/internal/sparc32/ethread.h b/erts/include/internal/sparc32/ethread.h
index 1d55399640..aea9794390 100644
--- a/erts/include/internal/sparc32/ethread.h
+++ b/erts/include/internal/sparc32/ethread.h
@@ -1,7 +1,7 @@
 /* 
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2005-2010. 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
@@ -24,11 +24,17 @@
 #ifndef ETHREAD_SPARC32_ETHREAD_H
 #define ETHREAD_SPARC32_ETHREAD_H
 
+#define ETHR_ATOMIC_WANT_32BIT_IMPL__
 #include "atomic.h"
+#if ETHR_SIZEOF_PTR == 8
+#  define ETHR_ATOMIC_WANT_64BIT_IMPL__
+#  include "atomic.h"
+#endif
 #include "spinlock.h"
 #include "rwlock.h"
 
 #define ETHR_HAVE_NATIVE_ATOMICS 1
-#define ETHR_HAVE_NATIVE_LOCKS 1
+#define ETHR_HAVE_NATIVE_SPINLOCKS 1
+#define ETHR_HAVE_NATIVE_RWSPINLOCKS 1
 
 #endif /* ETHREAD_SPARC32_ETHREAD_H */
diff --git a/erts/include/internal/sparc32/rwlock.h b/erts/include/internal/sparc32/rwlock.h
index 12448e0b06..465ec96866 100644
--- a/erts/include/internal/sparc32/rwlock.h
+++ b/erts/include/internal/sparc32/rwlock.h
@@ -1,19 +1,19 @@
 /* 
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2005-2010. 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%
  */
 
@@ -29,7 +29,7 @@ typedef struct {
     volatile int lock;
 } ethr_native_rwlock_t;
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
 
 static ETHR_INLINE void
 ethr_native_rwlock_init(ethr_native_rwlock_t *lock)
diff --git a/erts/include/internal/sparc32/spinlock.h b/erts/include/internal/sparc32/spinlock.h
index b4fe48b714..493d514210 100644
--- a/erts/include/internal/sparc32/spinlock.h
+++ b/erts/include/internal/sparc32/spinlock.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2005-2010. 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%
  */
 
@@ -29,7 +29,7 @@ typedef struct {
     volatile unsigned char lock;
 } ethr_native_spinlock_t;
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
 
 static ETHR_INLINE void
 ethr_native_spinlock_init(ethr_native_spinlock_t *lock)
diff --git a/erts/include/internal/tile/atomic.h b/erts/include/internal/tile/atomic.h
index 5e4c7ac9fe..48e4c0c6c8 100644
--- a/erts/include/internal/tile/atomic.h
+++ b/erts/include/internal/tile/atomic.h
@@ -24,107 +24,164 @@
 #ifndef ETHREAD_TILE_ATOMIC_H
 #define ETHREAD_TILE_ATOMIC_H
 
+#define ETHR_HAVE_NATIVE_ATOMIC32 1
+
 #include <atomic.h>
 
 /* An atomic is an aligned int accessed via locked operations.
  */
 typedef struct {
-    volatile long counter;
-} ethr_native_atomic_t;
+    volatile ethr_sint32_t counter;
+} ethr_native_atomic32_t;
 
 #define ETHR_MEMORY_BARRIER __insn_mf()
 
-#ifdef ETHR_TRY_INLINE_FUNCS
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_ATOMIC_IMPL__)
+
+static ETHR_INLINE ethr_sint32_t *
+ethr_native_atomic32_addr(ethr_native_atomic32_t *var)
+{
+    return (ethr_sint32_t *) &var->counter;
+}
 
 static ETHR_INLINE void
-ethr_native_atomic_init(ethr_native_atomic_t *var, long i)
+ethr_native_atomic32_init(ethr_native_atomic32_t *var, ethr_sint32_t i)
 {
     var->counter = i;
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_set(ethr_native_atomic_t *var, long i)
+ethr_native_atomic32_set(ethr_native_atomic32_t *var, ethr_sint32_t i)
 {
-    __insn_mf();
     atomic_exchange_acq(&var->counter, i);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_read(ethr_native_atomic_t *var)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_read(ethr_native_atomic32_t *var)
 {
     return var->counter;
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_add(ethr_native_atomic_t *var, long incr)
+ethr_native_atomic32_add(ethr_native_atomic32_t *var, ethr_sint32_t incr)
 {
-    __insn_mf();
     atomic_add(&var->counter, incr);
 }      
        
 static ETHR_INLINE void
-ethr_native_atomic_inc(ethr_native_atomic_t *var)
+ethr_native_atomic32_inc(ethr_native_atomic32_t *var)
 {
-    __insn_mf();
     atomic_increment(&var->counter);
 }
 
 static ETHR_INLINE void
-ethr_native_atomic_dec(ethr_native_atomic_t *var)
+ethr_native_atomic32_dec(ethr_native_atomic32_t *var)
 {
-    __insn_mf();
     atomic_decrement(&var->counter);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_add_return(ethr_native_atomic_t *var, long incr)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_add_return(ethr_native_atomic32_t *var, ethr_sint32_t incr)
 {
-    __insn_mf();
     return atomic_exchange_and_add(&var->counter, incr) + incr;
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_inc_return(ethr_native_atomic_t *var)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_inc_return(ethr_native_atomic32_t *var)
 {
-    return ethr_native_atomic_add_return(var, 1);
+    return ethr_native_atomic32_add_return(var, 1);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_dec_return(ethr_native_atomic_t *var)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_dec_return(ethr_native_atomic32_t *var)
 {
-    return ethr_native_atomic_add_return(var, -1);
+    return ethr_native_atomic32_add_return(var, -1);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_and_retold(ethr_native_atomic_t *var, long mask)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_and_retold(ethr_native_atomic32_t *var, ethr_sint32_t mask)
 {
-    /* Implement a barrier suitable for a mutex unlock. */
-    __insn_mf();
     return atomic_and_val(&var->counter, mask);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_or_retold(ethr_native_atomic_t *var, long mask)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_or_retold(ethr_native_atomic32_t *var, ethr_sint32_t mask)
 {
-    __insn_mf();
     return atomic_or_val(&var->counter, mask);
 }
 
-static ETHR_INLINE long
-ethr_native_atomic_xchg(ethr_native_atomic_t *var, long val)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_xchg(ethr_native_atomic32_t *var, ethr_sint32_t val)
 {   
-    __insn_mf();
     return atomic_exchange_acq(&var->counter, val);
 } 
 
-static ETHR_INLINE long
-ethr_native_atomic_cmpxchg(ethr_native_atomic_t *var, long new, long expected)
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_cmpxchg(ethr_native_atomic32_t *var,
+			     ethr_sint32_t new,
+			     ethr_sint32_t expected)
 {
-    /* Implement a barrier suitable for a mutex unlock. */
-    __insn_mf();
     return atomic_compare_and_exchange_val_acq(&var->counter, new, expected);
 }
 
+/*
+ * Atomic ops with at least specified barriers.
+ */
+
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_read_acqb(ethr_native_atomic32_t *var)
+{
+    ethr_sint32_t res = ethr_native_atomic32_read(var);
+    ETHR_MEMORY_BARRIER;
+    return res;
+}
+
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_inc_return_acqb(ethr_native_atomic32_t *var)
+{
+    ethr_sint32_t res = ethr_native_atomic32_inc_return(var);
+    ETHR_MEMORY_BARRIER;
+    return res;
+}
+
+static ETHR_INLINE void
+ethr_native_atomic32_set_relb(ethr_native_atomic32_t *var, ethr_sint32_t val)
+{
+    ETHR_MEMORY_BARRIER;
+    ethr_native_atomic32_set(var, val);
+}
+
+static ETHR_INLINE void
+ethr_native_atomic32_dec_relb(ethr_native_atomic32_t *var)
+{
+    ETHR_MEMORY_BARRIER;
+    ethr_native_atomic32_dec(var);
+}
+
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_dec_return_relb(ethr_native_atomic32_t *var)
+{
+    ETHR_MEMORY_BARRIER;
+    return ethr_native_atomic32_dec_return(var);
+}
+
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_cmpxchg_acqb(ethr_native_atomic32_t *var,
+				  ethr_sint32_t new,
+				  ethr_sint32_t exp)
+{
+    return ethr_native_atomic32_cmpxchg(var, new, exp);
+}
+
+static ETHR_INLINE ethr_sint32_t
+ethr_native_atomic32_cmpxchg_relb(ethr_native_atomic32_t *var,
+				  ethr_sint32_t new,
+				  ethr_sint32_t exp)
+{
+    ETHR_MEMORY_BARRIER;
+    return ethr_native_atomic32_cmpxchg(var, new, exp);
+}
+
 #endif /* ETHR_TRY_INLINE_FUNCS */
 
 #endif /* ETHREAD_TILE_ATOMIC_H */
diff --git a/erts/include/internal/win/ethr_atomic.h b/erts/include/internal/win/ethr_atomic.h
new file mode 100644
index 0000000000..60def01a7e
--- /dev/null
+++ b/erts/include/internal/win/ethr_atomic.h
@@ -0,0 +1,415 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: Native atomics ethread support when using VC++
+ * Author: Rickard Green
+ */
+
+#undef ETHR_INCLUDE_ATOMIC_IMPL__
+#if !defined(ETHR_WIN_ATOMIC32_H__) && defined(ETHR_ATOMIC_WANT_32BIT_IMPL__)
+#define ETHR_WIN_ATOMIC32_H__
+#define ETHR_INCLUDE_ATOMIC_IMPL__ 4
+#undef ETHR_ATOMIC_WANT_32BIT_IMPL__
+#elif !defined(ETHR_WIN_ATOMIC64_H__) && defined(ETHR_ATOMIC_WANT_64BIT_IMPL__)
+#define ETHR_WIN_ATOMIC64_H__
+#ifdef ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64
+/* _InterlockedCompareExchange64() required... */
+#define ETHR_INCLUDE_ATOMIC_IMPL__ 8
+#endif
+#undef ETHR_ATOMIC_WANT_64BIT_IMPL__
+#endif
+
+#ifdef ETHR_INCLUDE_ATOMIC_IMPL__
+
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+
+#ifndef ETHR_WIN_ATOMIC_COMMON__
+#define ETHR_WIN_ATOMIC_COMMON__
+
+#define ETHR_HAVE_NATIVE_ATOMICS 1
+
+#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)
+#  define ETHR_READ_AND_SET_WITHOUT_INTERLOCKED_OP__ 1
+#else
+#  define ETHR_READ_AND_SET_WITHOUT_INTERLOCKED_OP__ 0
+#endif
+
+#if defined(_M_AMD64) || (defined(_M_IX86) \
+			  && !defined(ETHR_PRE_PENTIUM4_COMPAT))
+#  define ETHR_READ_ACQB_AND_SET_RELB_COMPILER_BARRIER_ONLY__ 1
+#else
+#  define ETHR_READ_ACQB_AND_SET_RELB_COMPILER_BARRIER_ONLY__ 0
+#endif
+/*
+ * No configure test checking for interlocked acquire/release
+ * versions have been written, yet. It should define
+ * ETHR_HAVE_INTERLOCKED_ACQUIRE_RELEASE_BARRIERS if, and
+ * only if, all used interlocked operations with barriers
+ * exists.
+ *
+ * Note, that these are pure optimizations for the itanium
+ * processor.
+ */
+
+#include <intrin.h>
+#undef ETHR_COMPILER_BARRIER
+#define ETHR_COMPILER_BARRIER _ReadWriteBarrier()
+#pragma intrinsic(_ReadWriteBarrier)
+#pragma intrinsic(_InterlockedCompareExchange)
+
+#if defined(_M_AMD64) || (defined(_M_IX86) \
+			  && !defined(ETHR_PRE_PENTIUM4_COMPAT))
+#include <emmintrin.h>
+#include <mmintrin.h>
+#pragma intrinsic(_mm_mfence)
+#define ETHR_MEMORY_BARRIER _mm_mfence()
+#pragma intrinsic(_mm_sfence)
+#define ETHR_WRITE_MEMORY_BARRIER _mm_sfence()
+#pragma intrinsic(_mm_lfence)
+#define ETHR_READ_MEMORY_BARRIER _mm_lfence()
+#define ETHR_READ_DEPEND_MEMORY_BARRIER ETHR_COMPILER_BARRIER
+
+#else
+
+#define ETHR_MEMORY_BARRIER					\
+do {								\
+    volatile long x___ = 0;					\
+    _InterlockedCompareExchange(&x___, (long) 1, (long) 0);	\
+} while (0)
+
+#endif
+
+#endif /* ETHR_WIN_ATOMIC_COMMON__ */
+
+#if ETHR_INCLUDE_ATOMIC_IMPL__ == 4
+
+#define ETHR_HAVE_NATIVE_ATOMIC32 1
+
+/*
+ * All used operations available as 32-bit intrinsics
+ */
+
+#pragma intrinsic(_InterlockedDecrement)
+#pragma intrinsic(_InterlockedIncrement)
+#pragma intrinsic(_InterlockedExchangeAdd)
+#pragma intrinsic(_InterlockedExchange)
+#pragma intrinsic(_InterlockedAnd)
+#pragma intrinsic(_InterlockedOr)
+#ifdef ETHR_HAVE_INTERLOCKED_ACQUIRE_RELEASE_BARRIERS
+#pragma intrinsic(_InterlockedExchangeAdd_acq)
+#pragma intrinsic(_InterlockedIncrement_acq)
+#pragma intrinsic(_InterlockedDecrement_rel)
+#pragma intrinsic(_InterlockedCompareExchange_acq)
+#pragma intrinsic(_InterlockedCompareExchange_rel)
+#endif
+
+#define ETHR_ILCKD__(X) _Interlocked ## X
+#ifdef ETHR_HAVE_INTERLOCKED_ACQUIRE_RELEASE_BARRIERS
+#define ETHR_ILCKD_ACQ__(X) _Interlocked ## X ## _acq
+#define ETHR_ILCKD_REL__(X) _Interlocked ## X ## _rel
+#else
+#define ETHR_ILCKD_ACQ__(X) _Interlocked ## X
+#define ETHR_ILCKD_REL__(X) _Interlocked ## X
+#endif
+
+#define ETHR_NATMC_FUNC__(X) ethr_native_atomic32_ ## X
+#define ETHR_ATMC_T__ ethr_native_atomic32_t
+#define ETHR_AINT_T__ ethr_sint32_t
+
+#elif ETHR_INCLUDE_ATOMIC_IMPL__ == 8
+
+#define ETHR_HAVE_NATIVE_ATOMIC64 1
+
+/*
+ * _InterlockedCompareExchange64() is required. The other may not
+ * be available, but if so, we can generate them.
+ */
+#pragma intrinsic(_InterlockedCompareExchange64)
+
+#if ETHR_READ_AND_SET_WITHOUT_INTERLOCKED_OP__		
+#define ETHR_OWN_ILCKD_INIT_VAL__(PTR) *(PTR)
+#else
+#define ETHR_OWN_ILCKD_INIT_VAL__(PTR) (__int64) 0
+#endif
+
+#define ETHR_OWN_ILCKD_BODY_IMPL__(FUNC, PTR, NEW, ACT, EXP, OPS, RET)	\
+{									\
+    __int64 NEW, ACT, EXP;						\
+    ACT = ETHR_OWN_ILCKD_INIT_VAL__(PTR);				\
+    do {								\
+	EXP = ACT;							\
+	{ OPS; }							\
+	ACT = _InterlockedCompareExchange64(PTR, NEW, EXP);		\
+    } while (ACT != EXP);						\
+    return RET;								\
+}
+
+#define ETHR_OWN_ILCKD_1_IMPL__(FUNC, NEW, ACT, EXP, OPS, RET)		\
+static __forceinline __int64						\
+FUNC(__int64 volatile *ptr)						\
+ETHR_OWN_ILCKD_BODY_IMPL__(FUNC, ptr, NEW, ACT, EXP, OPS, RET)
+
+#define ETHR_OWN_ILCKD_2_IMPL__(FUNC, NEW, ACT, EXP, OPS, ARG, RET)	\
+static __forceinline __int64						\
+FUNC(__int64 volatile *ptr, __int64 ARG)				\
+ETHR_OWN_ILCKD_BODY_IMPL__(FUNC, ptr, NEW, ACT, EXP, OPS, RET)
+
+
+#ifdef ETHR_HAVE__INTERLOCKEDDECREMENT64
+#pragma intrinsic(_InterlockedDecrement64)
+#else
+ETHR_OWN_ILCKD_1_IMPL__(_InterlockedDecrement64, new, act, exp,
+			new = act - 1, new)
+#endif
+#ifdef ETHR_HAVE__INTERLOCKEDINCREMENT64
+#pragma intrinsic(_InterlockedIncrement64)
+#else
+ETHR_OWN_ILCKD_1_IMPL__(_InterlockedIncrement64, new, act, exp,
+			new = act + 1, new)
+#endif
+#ifdef ETHR_HAVE__INTERLOCKEDEXCHANGEADD64
+#pragma intrinsic(_InterlockedExchangeAdd64)
+#else
+ETHR_OWN_ILCKD_2_IMPL__(_InterlockedExchangeAdd64, new, act, exp,
+			new = act + arg, arg, act)
+#endif
+#ifdef ETHR_HAVE__INTERLOCKEDEXCHANGE64
+#pragma intrinsic(_InterlockedExchange64)
+#else
+ETHR_OWN_ILCKD_2_IMPL__(_InterlockedExchange64, new, act, exp,
+			new = arg, arg, act)
+#endif
+#ifdef ETHR_HAVE__INTERLOCKEDAND64
+#pragma intrinsic(_InterlockedAnd64)
+#else
+ETHR_OWN_ILCKD_2_IMPL__(_InterlockedAnd64, new, act, exp,
+			new = act & arg, arg, act)
+#endif
+#ifdef ETHR_HAVE__INTERLOCKEDOR64
+#pragma intrinsic(_InterlockedOr64)
+#else
+ETHR_OWN_ILCKD_2_IMPL__(_InterlockedOr64, new, act, exp,
+			new = act | arg, arg, act)
+#endif
+#ifdef ETHR_HAVE_INTERLOCKED_ACQUIRE_RELEASE_BARRIERS
+#pragma intrinsic(_InterlockedExchangeAdd64_acq)
+#pragma intrinsic(_InterlockedIncrement64_acq)
+#pragma intrinsic(_InterlockedDecrement64_rel)
+#pragma intrinsic(_InterlockedCompareExchange64_acq)
+#pragma intrinsic(_InterlockedCompareExchange64_rel)
+#endif
+
+#define ETHR_ILCKD__(X) _Interlocked ## X ## 64
+#ifdef ETHR_HAVE_INTERLOCKED_ACQUIRE_RELEASE_BARRIERS
+#define ETHR_ILCKD_ACQ__(X) _Interlocked ## X ## 64_acq
+#define ETHR_ILCKD_REL__(X) _Interlocked ## X ## 64_rel
+#else
+#define ETHR_ILCKD_ACQ__(X) _Interlocked ## X ## 64
+#define ETHR_ILCKD_REL__(X) _Interlocked ## X ## 64
+#endif
+
+#define ETHR_NATMC_FUNC__(X) ethr_native_atomic64_ ## X
+#define ETHR_ATMC_T__ ethr_native_atomic64_t
+#define ETHR_AINT_T__ ethr_sint64_t
+
+#else
+#error "Unsupported integer size"
+#endif
+
+typedef struct {
+    volatile ETHR_AINT_T__ value;
+} ETHR_ATMC_T__;
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_ATOMIC_IMPL__)
+
+static ETHR_INLINE ETHR_AINT_T__ *
+ETHR_NATMC_FUNC__(addr)(ETHR_ATMC_T__ *var)
+{
+    return (ETHR_AINT_T__ *) &var->value;
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(init)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ i)
+{
+#if ETHR_READ_AND_SET_WITHOUT_INTERLOCKED_OP__
+    var->value = i;
+#else
+    (void) ETHR_ILCKD__(Exchange)(&var->value, i);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(set)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ i)
+{
+#if ETHR_READ_AND_SET_WITHOUT_INTERLOCKED_OP__
+    var->value = i;
+#else
+    (void) ETHR_ILCKD__(Exchange)(&var->value, i);
+#endif
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(read)(ETHR_ATMC_T__ *var)
+{
+#if ETHR_READ_AND_SET_WITHOUT_INTERLOCKED_OP__
+    return var->value;
+#else
+    return ETHR_ILCKD__(ExchangeAdd)(&var->value, (ETHR_AINT_T__) 0);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(add)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ incr)
+{
+    (void) ETHR_ILCKD__(ExchangeAdd)(&var->value, incr);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(add_return)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ i)
+{
+    return ETHR_ILCKD__(ExchangeAdd)(&var->value, i) + i;
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(inc)(ETHR_ATMC_T__ *var)
+{
+    (void) ETHR_ILCKD__(Increment)(&var->value);
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(dec)(ETHR_ATMC_T__ *var)
+{
+    (void) ETHR_ILCKD__(Decrement)(&var->value);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(inc_return)(ETHR_ATMC_T__ *var)
+{
+    return ETHR_ILCKD__(Increment)(&var->value);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(dec_return)(ETHR_ATMC_T__ *var)
+{
+    return ETHR_ILCKD__(Decrement)(&var->value);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(and_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
+{
+    return ETHR_ILCKD__(And)(&var->value, mask);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(or_retold)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
+{
+    return ETHR_ILCKD__(Or)(&var->value, mask);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg)(ETHR_ATMC_T__ *var,
+			   ETHR_AINT_T__ new,
+			   ETHR_AINT_T__ old)
+{
+    return ETHR_ILCKD__(CompareExchange)(&var->value, new, old);
+}
+
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(xchg)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ new)
+{
+    return ETHR_ILCKD__(Exchange)(&var->value, new);
+}
+
+/*
+ * Atomic ops with at least specified barriers.
+ */
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(read_acqb)(ETHR_ATMC_T__ *var)
+{
+#if ETHR_READ_ACQB_AND_SET_RELB_COMPILER_BARRIER_ONLY__
+    ETHR_AINT_T__ val = var->value;
+    ETHR_COMPILER_BARRIER;
+    return val;
+#else
+    return ETHR_ILCKD_ACQ__(ExchangeAdd)(&var->value, (ETHR_AINT_T__) 0);
+#endif
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(inc_return_acqb)(ETHR_ATMC_T__ *var)
+{
+    return ETHR_ILCKD_ACQ__(Increment)(&var->value);
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(set_relb)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ i)
+{
+#if ETHR_READ_ACQB_AND_SET_RELB_COMPILER_BARRIER_ONLY__
+    ETHR_COMPILER_BARRIER;
+    var->value = i;
+#else
+    (void) ETHR_ILCKD_REL__(Exchange)(&var->value, i);
+#endif
+}
+
+static ETHR_INLINE void
+ETHR_NATMC_FUNC__(dec_relb)(ETHR_ATMC_T__ *var)
+{
+    (void) ETHR_ILCKD_REL__(Decrement)(&var->value);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(dec_return_relb)(ETHR_ATMC_T__ *var)
+{
+    return ETHR_ILCKD_REL__(Decrement)(&var->value);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg_acqb)(ETHR_ATMC_T__ *var,
+				ETHR_AINT_T__ new,
+				ETHR_AINT_T__ old)
+{
+    return ETHR_ILCKD_ACQ__(CompareExchange)(&var->value, new, old);
+}
+
+static ETHR_INLINE ETHR_AINT_T__
+ETHR_NATMC_FUNC__(cmpxchg_relb)(ETHR_ATMC_T__ *var,
+				ETHR_AINT_T__ new,
+				ETHR_AINT_T__ old)
+{
+    return ETHR_ILCKD_REL__(CompareExchange)(&var->value, new, old);
+}
+
+#endif /* ETHR_TRY_INLINE_FUNCS */
+
+#undef ETHR_ILCKD__
+#undef ETHR_ILCKD_ACQ__
+#undef ETHR_ILCKD_REL__
+#undef ETHR_NATMC_FUNC__
+#undef ETHR_ATMC_T__
+#undef ETHR_AINT_T__
+#undef ETHR_READ_AND_SET_WITHOUT_INTERLOCKED_OP__
+#undef ETHR_READ_ACQB_AND_SET_RELB_COMPILER_BARRIER_ONLY__
+
+#endif /* _MSC_VER */
+
+#endif /* ETHR_INCLUDE_ATOMIC_IMPL__ */
diff --git a/erts/include/internal/win/ethr_event.h b/erts/include/internal/win/ethr_event.h
new file mode 100644
index 0000000000..598816b2c6
--- /dev/null
+++ b/erts/include/internal/win/ethr_event.h
@@ -0,0 +1,64 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2009-2010. 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%
+ */
+
+/*
+ * Author: Rickard Green
+ */
+
+#define ETHR_EVENT_OFF_WAITER__		((long) -1)
+#define ETHR_EVENT_OFF__		((long) 1)
+#define ETHR_EVENT_ON__ 		((long) 0)
+
+typedef struct {
+    volatile long state;
+    HANDLE handle;
+} ethr_event;
+
+#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_EVENT_IMPL__)
+
+#pragma intrinsic(_InterlockedExchange)
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_event_set)(ethr_event *e)
+{
+    /* _InterlockedExchange() imply a full memory barrier which is important */
+    long state = _InterlockedExchange(&e->state, ETHR_EVENT_ON__);
+    if (state == ETHR_EVENT_OFF_WAITER__) {
+	if (!SetEvent(e->handle))
+	    ETHR_FATAL_ERROR__(ethr_win_get_errno__());
+    }
+}
+
+static ETHR_INLINE void
+ETHR_INLINE_FUNC_NAME_(ethr_event_reset)(ethr_event *e)
+{
+    /* _InterlockedExchange() imply a full memory barrier which is important */
+    InterlockedExchange(&e->state, ETHR_EVENT_OFF__);
+}
+
+#endif
+
+int ethr_event_init(ethr_event *e);
+int ethr_event_destroy(ethr_event *e);
+int ethr_event_wait(ethr_event *e);
+int ethr_event_swait(ethr_event *e, int spincount);
+#if !defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_EVENT_IMPL__)
+void ethr_event_set(ethr_event *e);
+void ethr_event_reset(ethr_event *e);
+#endif
diff --git a/erts/include/internal/win/ethread.h b/erts/include/internal/win/ethread.h
new file mode 100644
index 0000000000..c01b17cf14
--- /dev/null
+++ b/erts/include/internal/win/ethread.h
@@ -0,0 +1,35 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: Native atomic and spinlock ethread support when using VC++
+ * Author: Rickard Green
+ */
+
+#ifndef ETHREAD_WIN_H__
+#define ETHREAD_WIN_H__
+
+#define ETHR_ATOMIC_WANT_32BIT_IMPL__
+#include "ethr_atomic.h"
+#if ETHR_SIZEOF_PTR == 8
+#  define ETHR_ATOMIC_WANT_64BIT_IMPL__
+#  include "ethr_atomic.h"
+#endif
+
+#endif
diff --git a/erts/lib_src/Makefile.in b/erts/lib_src/Makefile.in
index e7caac8072..757b3b24e2 100644
--- a/erts/lib_src/Makefile.in
+++ b/erts/lib_src/Makefile.in
@@ -280,8 +280,14 @@ endif
 #
 # ethread library
 #
+ETHR_THR_LIB_BASE_DIR=@ETHR_THR_LIB_BASE_DIR@
 ifneq ($(strip $(ETHR_LIB_NAME)),)
-ETHREAD_LIB_SRC=common/ethread.c
+ETHREAD_LIB_SRC=common/ethr_aux.c \
+		common/ethr_atomics.c \
+		common/ethr_mutex.c \
+		common/ethr_cbf.c \
+		$(ETHR_THR_LIB_BASE_DIR)/ethread.c \
+		$(ETHR_THR_LIB_BASE_DIR)/ethr_event.c
 ETHREAD_LIB_NAME=ethread$(TYPE_SUFFIX)
 
 ifeq ($(USING_VC),yes)
@@ -376,16 +382,21 @@ $(ERTS_LIB): $(ERTS_LIB_OBJS)
 # Object files
 #
 
+ifeq ($(TYPE)-@GCC@,debug-yes)
+$(r_OBJ_DIR)/ethr_aux.o: common/ethr_aux.c
+	$(CC) $(THR_DEFS) $(CFLAGS) -Wno-unused-function $(INCLUDES) -c $< -o $@
+endif
+
 $(r_OBJ_DIR)/%.o: common/%.c
 	$(CC) $(THR_DEFS) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-$(r_OBJ_DIR)/%.o: $(ERLANG_OSTYPE)/%.c
+$(r_OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
 	$(CC) $(THR_DEFS) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 $(OBJ_DIR)/%.o: common/%.c
 	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/%.o: $(ERLANG_OSTYPE)/%.c
+$(OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
 	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 # Win32 specific
@@ -393,25 +404,25 @@ $(OBJ_DIR)/%.o: $(ERLANG_OSTYPE)/%.c
 $(MD_OBJ_DIR)/%.o: common/%.c
 	$(CC) $(THR_DEFS) $(CFLAGS) -MD $(INCLUDES) -c $< -o $@
 
-$(MD_OBJ_DIR)/%.o: $(ERLANG_OSTYPE)/%.c
+$(MD_OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
 	$(CC) $(THR_DEFS) $(CFLAGS) -MD $(INCLUDES) -c $< -o $@
 
 $(MDd_OBJ_DIR)/%.o: common/%.c
 	$(CC) $(THR_DEFS) $(CFLAGS) -MDd $(INCLUDES) -c $< -o $@
 
-$(MDd_OBJ_DIR)/%.o: $(ERLANG_OSTYPE)/%.c
+$(MDd_OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
 	$(CC) $(THR_DEFS) $(CFLAGS) -MDd $(INCLUDES) -c $< -o $@
 
 $(MT_OBJ_DIR)/%.o: common/%.c
 	$(CC) $(THR_DEFS) $(CFLAGS) -MT $(INCLUDES) -c $< -o $@
 
-$(MT_OBJ_DIR)/%.o: $(ERLANG_OSTYPE)/%.c
+$(MT_OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
 	$(CC) $(THR_DEFS) $(CFLAGS) -MT $(INCLUDES) -c $< -o $@
 
 $(MTd_OBJ_DIR)/%.o: common/%.c
 	$(CC) $(THR_DEFS) $(CFLAGS) -MTd $(INCLUDES) -c $< -o $@
 
-$(MTd_OBJ_DIR)/%.o: $(ERLANG_OSTYPE)/%.c
+$(MTd_OBJ_DIR)/%.o: $(ETHR_THR_LIB_BASE_DIR)/%.c
 	$(CC) $(THR_DEFS) $(CFLAGS) -MTd $(INCLUDES) -c $< -o $@
 
 #
@@ -438,6 +449,9 @@ RELEASE_LIBS=$(ERTS_LIBS)
 INTERNAL_RELEASE_INCLUDES= \
 	$(ERTS_INCL_INT)/README \
 	$(ERTS_INCL_INT)/ethread.h \
+	$(ERTS_INCL_INT)/ethr_mutex.h \
+	$(ERTS_INCL_INT)/ethr_optimized_fallbacks.h \
+	$(ERTS_INCL_INT)/ethr_atomics.h \
 	$(ERTS_INCL_INT)/$(TARGET)/ethread.mk \
 	$(ERTS_INCL_INT)/$(TARGET)/erts_internal.mk \
 	$(ERTS_INCL_INT)/$(TARGET)/ethread_header_config.h \
@@ -447,7 +461,8 @@ INTERNAL_RELEASE_INCLUDES= \
 	$(ERTS_INCL_INT)/erl_misc_utils.h \
 	$(ERTS_INCL_INT)/erl_errno.h
 
-INTERNAL_X_RELEASE_INCLUDE_DIRS= i386 x86_64 ppc32 sparc32 sparc64 tile gcc
+INTERNAL_X_RELEASE_INCLUDE_DIRS= \
+        i386 x86_64 ppc32 sparc32 sparc64 tile gcc pthread win libatomic_ops
 
 INTERNAL_RELEASE_LIBS= \
 	../lib/internal/README \
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c
index f70db86960..4c881993a5 100644
--- a/erts/lib_src/common/erl_misc_utils.c
+++ b/erts/lib_src/common/erl_misc_utils.c
@@ -21,10 +21,13 @@
 #include "config.h"
 #endif
 
+#if defined(__WIN32__)
+#  include <windows.h>
+#endif
+
 #include "erl_misc_utils.h"
 
 #if defined(__WIN32__)
-#  include <windows.h>
 #elif defined(VXWORKS)
 #  include <selectLib.h>
 #else /* UNIX */
@@ -59,8 +62,38 @@
 #  endif
 #endif
 
-#ifdef HAVE_SCHED_xETAFFINITY
+#if defined(HAVE_SCHED_xETAFFINITY)
 #  include <sched.h>
+#  define ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__
+#define ERTS_MU_GET_PROC_AFFINITY__(CPUINFOP, CPUSET)			\
+     (sched_getaffinity((CPUINFOP)->pid,				\
+			sizeof(cpu_set_t),				\
+			(CPUSET)) != 0 ? -errno : 0)
+#define ERTS_MU_SET_THR_AFFINITY__(SETP)				\
+     (sched_setaffinity(0, sizeof(cpu_set_t), (SETP)) != 0 ? -errno : 0)
+#elif defined(HAVE_CPUSET_xETAFFINITY)
+#  include <sys/param.h>
+#  include <sys/cpuset.h>
+#  define ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__
+#define ERTS_MU_GET_PROC_AFFINITY__(CPUINFOP, CPUSET)			\
+     (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, 	    \
+			sizeof(cpuset_t),				\
+			(CPUSET)) != 0 ? -errno : 0)
+#define ERTS_MU_SET_THR_AFFINITY__(CPUSETP)				\
+     (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1,    \
+            sizeof(cpuset_t),               \
+            (CPUSETP)) != 0 ? -errno : 0)
+#  define cpu_set_t cpuset_t
+#elif defined(__WIN32__)
+#  define ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__
+#  define cpu_set_t DWORD
+#  define CPU_SETSIZE (sizeof(DWORD)*8)
+#  define CPU_ZERO(SETP) (*(SETP) = (DWORD) 0)
+#  define CPU_SET(CPU, SETP) (*(SETP) |= (((DWORD) 1) << (CPU)))
+#  define CPU_CLR(CPU, SETP) (*(SETP) &= ~(((DWORD) 1) << (CPU)))
+#  define CPU_ISSET(CPU, SETP) ((*(SETP) & (((DWORD) 1) << (CPU))) != (DWORD) 0)
+#define ERTS_MU_GET_PROC_AFFINITY__ get_proc_affinity
+#define ERTS_MU_SET_THR_AFFINITY__ set_thr_affinity
 #endif
 #ifdef HAVE_PSET_INFO
 #  include <sys/pset.h>
@@ -80,8 +113,33 @@
 #  define ERTS_SYS_CPU_PATH	"/sys/devices/system/cpu"
 #endif
 
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
+
 static int read_topology(erts_cpu_info_t *cpuinfo);
 
+#if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
+static int
+cpu_sets_are_eq(cpu_set_t *x, cpu_set_t *y)
+{
+    int i;
+    for (i = 0; i < CPU_SETSIZE; i++) {
+	if (CPU_ISSET(i, x)) {
+	    if (!CPU_ISSET(i, y))
+		return 0;
+	}
+	else {
+	    if (CPU_ISSET(i, y))
+		return 0;
+	}
+    }
+    return 1;
+}
+
+#endif
+
 int
 erts_milli_sleep(long ms)
 {
@@ -105,30 +163,66 @@ struct erts_cpu_info_t_ {
     int available;
     int topology_size;
     erts_cpu_topology_t *topology;
-#if defined(HAVE_SCHED_xETAFFINITY)
+#if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
     char *affinity_str;
     char affinity_str_buf[CPU_SETSIZE/4+2];
     cpu_set_t cpuset;
+#if defined(HAVE_SCHED_xETAFFINITY)
     pid_t pid;
+#endif
 #elif defined(HAVE_PSET_INFO)
     processorid_t *cpuids;
 #endif
 };
 
+#if defined(__WIN32__)
+
+static __forceinline int
+get_proc_affinity(erts_cpu_info_t *cpuinfo, cpu_set_t *cpuset)
+{
+    DWORD pamask, samask;
+    if (GetProcessAffinityMask(GetCurrentProcess(), &pamask, &samask)) {
+	*cpuset = (cpu_set_t) pamask;
+	return 0;
+    }
+    else {
+	*cpuset = (cpu_set_t) 0;
+	return -erts_get_last_win_errno();
+    }
+}
+
+static __forceinline int
+set_thr_affinity(cpu_set_t *set)
+{
+    if (*set == (cpu_set_t) 0)
+	return -ENOTSUP;
+    if (SetThreadAffinityMask(GetCurrentThread(), *set) == 0)
+	return -erts_get_last_win_errno();
+    else
+	return 0;
+}
+
+#endif
+
 erts_cpu_info_t *
 erts_cpu_info_create(void)
 {
     erts_cpu_info_t *cpuinfo = malloc(sizeof(erts_cpu_info_t));
     if (!cpuinfo)
 	return NULL;
-#if defined(HAVE_SCHED_xETAFFINITY)
+#if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
     cpuinfo->affinity_str = NULL;
+#if defined(HAVE_SCHED_xETAFFINITY)
     cpuinfo->pid = getpid();
+#endif
 #elif defined(HAVE_PSET_INFO)
     cpuinfo->cpuids = NULL;
 #endif
     cpuinfo->topology_size = 0;
     cpuinfo->topology = NULL;
+    cpuinfo->configured = -1;
+    cpuinfo->online = -1;
+    cpuinfo->available = -1;
     erts_cpu_info_update(cpuinfo);
     return cpuinfo;
 }
@@ -153,31 +247,40 @@ erts_cpu_info_destroy(erts_cpu_info_t *cpuinfo)
     }
 }
 
-void
+int
 erts_cpu_info_update(erts_cpu_info_t *cpuinfo)
 {
-    cpuinfo->configured = 0;
-    cpuinfo->online = 0;
-    cpuinfo->available = 0;
+    int changed = 0;
+    int configured = 0;
+    int online = 0;
+    int available = 0;
+    erts_cpu_topology_t *old_topology;
+    int old_topology_size;
+#if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
+    cpu_set_t cpuset;
+#endif
 
 #ifdef __WIN32__
     {
+	int i;
 	SYSTEM_INFO sys_info;
 	GetSystemInfo(&sys_info);
-	cpuinfo->configured = (int) sys_info.dwNumberOfProcessors;
-	
+	configured = (int) sys_info.dwNumberOfProcessors;
+	for (i = 0; i < sizeof(DWORD)*8; i++)
+	    if (sys_info.dwActiveProcessorMask & (((DWORD) 1) << i))
+		online++;
     }
 #elif !defined(NO_SYSCONF) && (defined(_SC_NPROCESSORS_CONF) \
 			       || defined(_SC_NPROCESSORS_ONLN))
 #ifdef _SC_NPROCESSORS_CONF
-    cpuinfo->configured = (int) sysconf(_SC_NPROCESSORS_CONF);
-    if (cpuinfo->configured < 0)
-	cpuinfo->configured = 0;
+    configured = (int) sysconf(_SC_NPROCESSORS_CONF);
+    if (configured < 0)
+	configured = 0;
 #endif
 #ifdef _SC_NPROCESSORS_ONLN
-    cpuinfo->online = (int) sysconf(_SC_NPROCESSORS_ONLN);
-    if (cpuinfo->online < 0)
-	cpuinfo->online = 0;
+    online = (int) sysconf(_SC_NPROCESSORS_ONLN);
+    if (online < 0)
+	online = 0;
 #endif
 #elif defined(HAVE_SYS_SYSCTL_H) && defined(CTL_HW) && (defined(HW_NCPU) \
 							|| defined(HW_AVAILCPU))
@@ -189,71 +292,138 @@ erts_cpu_info_update(erts_cpu_info_t *cpuinfo)
 	len = sizeof(int);
 	mib[0] = CTL_HW;
 	mib[1] = HW_NCPU;
-	if (sysctl(&mib[0], 2, &cpuinfo->configured, &len, NULL, 0) < 0)
-	    cpuinfo->configured = 0;
+	if (sysctl(&mib[0], 2, &configured, &len, NULL, 0) < 0)
+	    configured = 0;
 #endif
 #ifdef HW_AVAILCPU
 	len = sizeof(int);
 	mib[0] = CTL_HW;
 	mib[1] = HW_AVAILCPU;
-	if (sysctl(&mib[0], 2, &cpuinfo->online, &len, NULL, 0) < 0)
-	    cpuinfo->online = 0;
+	if (sysctl(&mib[0], 2, &online, &len, NULL, 0) < 0)
+	    online = 0;
 #endif
     }
 #endif
 
-    if (cpuinfo->online > cpuinfo->configured)
-	cpuinfo->online = cpuinfo->configured;
+    if (online > configured)
+	online = configured;
 
-#ifdef HAVE_SCHED_xETAFFINITY
-    if (sched_getaffinity(cpuinfo->pid, sizeof(cpu_set_t), &cpuinfo->cpuset) == 0) {
-	int i, c, cn, si;
-	c = cn = 0;
-	si = sizeof(cpuinfo->affinity_str_buf) - 1;
-	cpuinfo->affinity_str_buf[si] = '\0';
-	for (i = 0; i < CPU_SETSIZE; i++) {
-	    if (CPU_ISSET(i, &cpuinfo->cpuset)) {
-		c |= 1 << cn;
-		cpuinfo->available++;
+    if (cpuinfo->configured != configured)
+	changed = 1;
+    if (cpuinfo->online != online)
+	changed = 1;
+
+#if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
+    if (ERTS_MU_GET_PROC_AFFINITY__(cpuinfo, &cpuset) == 0) {
+	if (!changed && !cpu_sets_are_eq(&cpuset, &cpuinfo->cpuset))
+	    changed = 1;
+
+	if (!changed)
+	    available = cpuinfo->available;
+	else {
+	    int i, c, cn, si;
+
+	    memcpy((void *) &cpuinfo->cpuset,
+		   (void *) &cpuset,
+		   sizeof(cpu_set_t));
+
+	    c = cn = 0;
+	    si = sizeof(cpuinfo->affinity_str_buf) - 1;
+	    cpuinfo->affinity_str_buf[si] = '\0';
+	    for (i = 0; i < CPU_SETSIZE; i++) {
+		if (CPU_ISSET(i, &cpuinfo->cpuset)) {
+		    c |= 1 << cn;
+		    available++;
+		}
+		cn++;
+		if (cn == 4) {
+		    cpuinfo->affinity_str_buf[--si] = (c < 10
+						       ? '0' + c
+						       : 'A' + c - 10);
+		    c = cn = 0;
+		}
 	    }
-	    cn++;
-	    if (cn == 4) {
+	    if (c)
 		cpuinfo->affinity_str_buf[--si] = (c < 10
 						   ? '0' + c
 						   : 'A' + c - 10);
-		c = cn = 0;
-	    }
+	    while (cpuinfo->affinity_str_buf[si] == '0')
+		si++;
+	    cpuinfo->affinity_str = &cpuinfo->affinity_str_buf[si];
 	}
-	if (c)
-	    cpuinfo->affinity_str_buf[--si] = (c < 10
-					       ? '0' + c
-					       : 'A' + c - 10);
-	while (cpuinfo->affinity_str_buf[si] == '0')
-	    si++;
-	cpuinfo->affinity_str = &cpuinfo->affinity_str_buf[si];
     }
 #elif defined(HAVE_PSET_INFO)
     {
-	uint_t numcpus = cpuinfo->configured;
-	if (cpuinfo->cpuids)
-	    free(cpuinfo->cpuids);
-	cpuinfo->cpuids = malloc(sizeof(processorid_t)*numcpus);
-	if (cpuinfo->cpuids) {
-	    if (pset_info(PS_MYID, NULL, &numcpus, &cpuinfo->cpuids) == 0)
-		cpuinfo->available = (int) numcpus;
-	    if (cpuinfo->available < 0) {
-		free(cpuinfo->cpuid);
-		cpuinfo->available = 0;
+	processorid_t *cpuids;
+	uint_t numcpus = configured;
+	cpuids = malloc(sizeof(processorid_t)*numcpus);
+	if (cpuids) {
+	    if (pset_info(PS_MYID, NULL, &numcpus, &cpuids) == 0)
+		available = (int) numcpus;
+	    if (available < 0) {
+		free(cpuids);
+		cpuids = NULL;
+		available = 0;
 	    }
 	}
+	if (!cpuids) {
+	    if (cpuinfo->cpuids)
+		changed = 1;
+	}
+	else {
+	    if (cpuinfo->cpuids)
+		changed = 1;
+	    if (memcmp((void *) cpuinfo->cpuids,
+		       (void *) cpuids,
+		       sizeof(processorid_t)*numcpus) != 0)
+		changed = 1;
+
+	}
+	if (!changed) {
+	    if (cpuids)
+		free(cpuids);
+	}
+	else {
+	    if (cpuinfo->cpuids)
+		free(cpuinfo->cpuids);
+	    cpuinfo->cpuids = cpuids;
+	}
     }
 #endif
 
-    if (cpuinfo->available > cpuinfo->online)
-	cpuinfo->available = cpuinfo->online;
+    if (available > online)
+	available = online;
+
+    if (cpuinfo->available != available)
+	changed = 1;
+
+    cpuinfo->configured = configured;
+    cpuinfo->online = online;
+    cpuinfo->available = available;
+
+    old_topology = cpuinfo->topology;
+    old_topology_size = cpuinfo->topology_size;
+    cpuinfo->topology = NULL;
 
     read_topology(cpuinfo);
 
+    if (cpuinfo->topology_size != old_topology_size
+	|| (old_topology_size != 0
+	    && memcmp((void *) cpuinfo->topology,
+		      (void *) old_topology,
+		      (sizeof(erts_cpu_topology_t)
+		       * old_topology_size)) != 0)) {
+	changed = 1;
+	if (old_topology)
+	    free(old_topology);
+    }
+    else {
+	if (cpuinfo->topology)
+	    free(cpuinfo->topology);
+	cpuinfo->topology = old_topology;
+    }
+
+    return changed;
 }
 
 int
@@ -289,7 +459,7 @@ erts_get_cpu_available(erts_cpu_info_t *cpuinfo)
 char *
 erts_get_unbind_from_cpu_str(erts_cpu_info_t *cpuinfo)
 {
-#if defined(HAVE_SCHED_xETAFFINITY)
+#if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
     if (!cpuinfo)
 	return "false";
     return cpuinfo->affinity_str;
@@ -303,7 +473,7 @@ erts_get_available_cpu(erts_cpu_info_t *cpuinfo, int no)
 {
     if (!cpuinfo || no < 1 || cpuinfo->available < no)
 	return -EINVAL;
-#ifdef HAVE_SCHED_xETAFFINITY
+#if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
     {
 	cpu_set_t *allowed = &cpuinfo->cpuset;
 	int ix, n;
@@ -335,8 +505,8 @@ int
 erts_is_cpu_available(erts_cpu_info_t *cpuinfo, int id)
 {
     if (cpuinfo && 0 <= id) {
-#ifdef HAVE_SCHED_xETAFFINITY
-	if (id <= CPU_SETSIZE)
+#if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
+	if (id < CPU_SETSIZE)
 	    return CPU_ISSET(id, &cpuinfo->cpuset);
 #elif defined(HAVE_PROCESSOR_BIND)
 	int no;
@@ -388,7 +558,7 @@ erts_bind_to_cpu(erts_cpu_info_t *cpuinfo, int cpu)
      */
     if (!cpuinfo)
 	return -EINVAL;
-#ifdef HAVE_SCHED_xETAFFINITY
+#if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
     {
 	cpu_set_t bind_set;
 	if (cpu < 0)
@@ -398,9 +568,7 @@ erts_bind_to_cpu(erts_cpu_info_t *cpuinfo, int cpu)
 
 	CPU_ZERO(&bind_set);
 	CPU_SET(cpu, &bind_set);
-	if (sched_setaffinity(0, sizeof(cpu_set_t), &bind_set) != 0)
-	    return -errno;
-	return 0;
+	return ERTS_MU_SET_THR_AFFINITY__(&bind_set);
     }
 #elif defined(HAVE_PROCESSOR_BIND)
     if (cpu < 0)
@@ -418,10 +586,8 @@ erts_unbind_from_cpu(erts_cpu_info_t *cpuinfo)
 {
     if (!cpuinfo)
 	return -EINVAL;
-#if defined(HAVE_SCHED_xETAFFINITY)
-    if (sched_setaffinity(0, sizeof(cpu_set_t), &cpuinfo->cpuset) != 0)
-	return -errno;
-    return 0;
+#if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
+    return ERTS_MU_SET_THR_AFFINITY__(&cpuinfo->cpuset);
 #elif defined(HAVE_PROCESSOR_BIND)
     if (processor_bind(P_LWPID, P_MYID, PBIND_NONE, NULL) != 0)
 	return -errno;
@@ -434,7 +600,7 @@ erts_unbind_from_cpu(erts_cpu_info_t *cpuinfo)
 int
 erts_unbind_from_cpu_str(char *str)
 {
-#if defined(HAVE_SCHED_xETAFFINITY)
+#if defined(ERTS_HAVE_MISC_UTIL_AFFINITY_MASK__)
     char *c = str;
     int cpus = 0;
     int shft = 0;
@@ -486,9 +652,7 @@ erts_unbind_from_cpu_str(char *str)
     if (!cpus)
 	return -EINVAL;
 
-    if (sched_setaffinity(0, sizeof(cpu_set_t), &cpuset) != 0)
-	return -errno;
-    return 0;
+    return ERTS_MU_SET_THR_AFFINITY__(&cpuset);
 #elif defined(HAVE_PROCESSOR_BIND)
     if (processor_bind(P_LWPID, P_MYID, PBIND_NONE, NULL) != 0)
 	return -errno;
@@ -541,6 +705,56 @@ cpu_cmp(const void *vx, const void *vy)
     return 0;
 }
 
+static void
+adjust_processor_nodes(erts_cpu_info_t *cpuinfo, int no_nodes)
+{
+    erts_cpu_topology_t *prev, *this, *last;
+    if (no_nodes > 1) {
+	int processor = -1;
+	int processor_node = 0;
+	int node = -1;
+
+	qsort(cpuinfo->topology,
+	      cpuinfo->topology_size,
+	      sizeof(erts_cpu_topology_t),
+	      pn_cmp);
+
+	prev = NULL;
+	this = &cpuinfo->topology[0];
+	last = &cpuinfo->topology[cpuinfo->configured-1];
+	while (1) {
+	    if (processor == this->processor) {
+		if (node != this->node)
+		    processor_node = 1;
+	    }
+	    else {
+		if (processor_node) {
+		make_processor_node:
+		    while (prev->processor == processor) {
+			prev->processor_node = prev->node;
+			prev->node = -1;
+			if (prev == &cpuinfo->topology[0])
+			    break;
+			prev--;
+		    }
+		    processor_node = 0;
+		}
+		processor = this->processor;
+		node = this->node;
+	    }
+	    if (this == last) {
+		if (processor_node) {
+		    prev = this;
+		    goto make_processor_node;
+		}
+		break;
+	    }
+	    prev = this++;
+	}
+    }
+}
+
+
 #ifdef __linux__
 
 static int
@@ -594,9 +808,6 @@ read_topology(erts_cpu_info_t *cpuinfo)
 
     errno = 0;
 
-    if (cpuinfo->topology)
-	free(cpuinfo->topology);
-
     if (cpuinfo->configured < 1)
 	goto error;
 
@@ -710,49 +921,7 @@ read_topology(erts_cpu_info_t *cpuinfo)
 		cpuinfo->topology = t;
 	}
 
-	if (no_nodes > 1) {
-	    int processor = -1;
-	    int processor_node = 0;
-	    int node = -1;
-
-	    qsort(cpuinfo->topology,
-		  cpuinfo->topology_size,
-		  sizeof(erts_cpu_topology_t),
-		  pn_cmp);
-
-	    prev = NULL;
-	    this = &cpuinfo->topology[0];
-	    last = &cpuinfo->topology[cpuinfo->configured-1];
-	    while (1) {
-		if (processor == this->processor) {
-		    if (node != this->node)
-			processor_node = 1;
-		}
-		else {
-		    if (processor_node) {
-		    make_processor_node:
-			while (prev->processor == processor) {
-			    prev->processor_node = prev->node;
-			    prev->node = -1;
-			    if (prev == &cpuinfo->topology[0])
-				break;
-			    prev--;
-			}
-			processor_node = 0;
-		    }
-		    processor = this->processor;
-		    node = this->node;
-		}
-		if (this == last) {
-		    if (processor_node) {
-			prev = this;
-			goto make_processor_node;
-		    }
-		    break;
-		}
-		prev = this++;
-	    }
-	}
+	adjust_processor_nodes(cpuinfo, no_nodes);
 
 	qsort(cpuinfo->topology,
 	      cpuinfo->topology_size,
@@ -849,9 +1018,6 @@ read_topology(erts_cpu_info_t *cpuinfo)
 
     errno = 0;
 
-    if (cpuinfo->topology)
-	free(cpuinfo->topology);
-
     if (cpuinfo->configured < 1)
 	goto error;
 
@@ -938,6 +1104,8 @@ read_topology(erts_cpu_info_t *cpuinfo)
 	}
     }
 
+    adjust_processor_nodes(cpuinfo, 1);
+
  error:
 
     if (res == 0) {
@@ -956,6 +1124,519 @@ read_topology(erts_cpu_info_t *cpuinfo)
 
 }
 
+#elif defined(__WIN32__)
+
+/*
+ * We cannot use Relation* out of the box since all of them are not
+ * always part of the LOGICAL_PROCESSOR_RELATIONSHIP enum. They are
+ * however documented as follows...
+ */
+#define ERTS_MU_RELATION_PROCESSOR_CORE       0 /* RelationProcessorCore */
+#define ERTS_MU_RELATION_NUMA_NODE            1 /* RelationNumaNode */
+#define ERTS_MU_RELATION_CACHE                2 /* RelationCache */
+#define ERTS_MU_RELATION_PROCESSOR_PACKAGE    3 /* RelationProcessorPackage */
+
+static __forceinline int
+rel_cmp_val(int r)
+{
+    switch (r) {
+    case ERTS_MU_RELATION_NUMA_NODE:         return 0;
+    case ERTS_MU_RELATION_PROCESSOR_PACKAGE: return 1;
+    case ERTS_MU_RELATION_PROCESSOR_CORE:    return 2;
+    default: /* currently not used */        return 3;
+    }
+}
+
+static int
+slpi_cmp(const void *vx, const void *vy)
+{
+    PSYSTEM_LOGICAL_PROCESSOR_INFORMATION x, y;
+    x = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION) vx;
+    y = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION) vy;
+
+    if ((int) x->Relationship != (int) y->Relationship)
+	return (rel_cmp_val((int) x->Relationship)
+		- rel_cmp_val((int) y->Relationship));
+
+    switch ((int) x->Relationship) {
+    case ERTS_MU_RELATION_NUMA_NODE:
+	if (x->NumaNode.NodeNumber == y->NumaNode.NodeNumber)
+	    break;
+	return ((int) x->NumaNode.NodeNumber) - ((int) y->NumaNode.NodeNumber);
+    case ERTS_MU_RELATION_PROCESSOR_CORE:
+    case ERTS_MU_RELATION_PROCESSOR_PACKAGE:
+    default:
+	break;
+    }
+
+    if (x->ProcessorMask == y->ProcessorMask)
+	return 0;
+    return x->ProcessorMask < y->ProcessorMask ? -1 : 1;
+}
+
+typedef BOOL (WINAPI *glpi_t)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, PDWORD);
+
+static int
+read_topology(erts_cpu_info_t *cpuinfo)
+{
+    int res = 0;
+    glpi_t glpi;
+    int *core_id = NULL;
+    PSYSTEM_LOGICAL_PROCESSOR_INFORMATION slpip = NULL;
+    int wix, rix, max_l, l, packages, nodes, no_slpi;
+    DWORD slpi_size = 0;
+
+
+    glpi = (glpi_t) GetProcAddress(GetModuleHandle("kernel32"),
+				   "GetLogicalProcessorInformation");
+    if (!glpi)
+	return -ENOTSUP;
+
+    cpuinfo->topology = NULL;
+
+    if (cpuinfo->configured < 1 || sizeof(ULONG_PTR)*8 < cpuinfo->configured)
+	goto error;
+
+    while (1) {
+	DWORD werr;
+	if (TRUE == glpi(slpip, &slpi_size))
+	    break;
+	werr = GetLastError();
+	if (werr != ERROR_INSUFFICIENT_BUFFER) {
+	    res = -erts_map_win_error_to_errno(werr);
+	    goto error;
+	}
+	if (slpip)
+	    free(slpip);
+	slpip = malloc(slpi_size);
+	if (!slpip) {
+	    res = -ENOMEM;
+	    goto error;
+	}
+    }
+
+    no_slpi = (int) slpi_size/sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION);
+
+    qsort(slpip,
+	  no_slpi,
+	  sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION),
+	  slpi_cmp);
+
+    /*
+     * Now numa node relations appear before package relations which
+     * appear before core relations which appear before relations
+     * we aren't interested in...
+     */
+
+    max_l = 0;
+    packages = 0;
+    nodes = 0;
+    for (rix = 0; rix < no_slpi; rix++) {
+	PSYSTEM_LOGICAL_PROCESSOR_INFORMATION this = &slpip[rix];
+	for (l = sizeof(ULONG_PTR)*8 - 1; l > 0; l--) {
+	    if (slpip[rix].ProcessorMask & (((ULONG_PTR) 1) << l)) {
+		if (max_l < l)
+		    max_l = l;
+		break;
+	    }
+	}
+	if ((int) slpip[rix].Relationship == ERTS_MU_RELATION_PROCESSOR_PACKAGE)
+	    packages++;
+	if ((int) slpip[rix].Relationship == ERTS_MU_RELATION_NUMA_NODE)
+	    nodes++;
+    }
+
+    if (!packages) {
+      packages = 1;
+    }
+    core_id = malloc(sizeof(int)*packages);
+    if (!core_id) {
+	res = -ENOMEM;
+	goto error;
+    }
+
+    for (rix = 0; rix < packages; rix++)
+	core_id[rix] = 0;
+
+    cpuinfo->topology_size = max_l + 1;
+    cpuinfo->topology = malloc(sizeof(erts_cpu_topology_t)
+			       * cpuinfo->topology_size);
+    if (!cpuinfo->topology) {
+	res = -ENOMEM;
+	goto error;
+    }
+
+    for (wix = 0; wix < cpuinfo->topology_size; wix++) {
+	cpuinfo->topology[wix].node = -1;
+	cpuinfo->topology[wix].processor = -1;
+	cpuinfo->topology[wix].processor_node = -1;
+	cpuinfo->topology[wix].core = -1;
+	cpuinfo->topology[wix].thread = -1;
+	cpuinfo->topology[wix].logical = -1;
+    }
+
+    nodes = 0;
+    packages = 0;
+
+    for (rix = 0; rix < no_slpi; rix++) {
+
+        switch ((int) slpip[rix].Relationship) {
+        case ERTS_MU_RELATION_NUMA_NODE:
+	    for (l = 0; l < sizeof(ULONG_PTR)*8; l++) {
+		if (slpip[rix].ProcessorMask & (((ULONG_PTR) 1) << l)) {
+		    cpuinfo->topology[l].logical = l;
+		    cpuinfo->topology[l].node = slpip[rix].NumaNode.NodeNumber;
+		}
+	    }
+	    nodes++;
+            break;
+        case ERTS_MU_RELATION_PROCESSOR_PACKAGE:
+	    for (l = 0; l < sizeof(ULONG_PTR)*8; l++) {
+		if (slpip[rix].ProcessorMask & (((ULONG_PTR) 1) << l)) {
+		    cpuinfo->topology[l].logical = l;
+		    cpuinfo->topology[l].processor = packages;
+		}
+	    }
+	    packages++;
+            break;
+        case ERTS_MU_RELATION_PROCESSOR_CORE: {
+	    int thread = 0;
+	    int processor = -1;
+	    for (l = 0; l < sizeof(ULONG_PTR)*8; l++) {
+		/*
+		 * Nodes and packages may not be supported; pretend
+		 * that there are one if this is the case...
+		 */
+		if (slpip[rix].ProcessorMask & (((ULONG_PTR) 1) << l)) {
+		    if (!nodes) {
+		      cpuinfo->topology[l].node = 0;
+		    }
+		    if (!packages) {
+		      cpuinfo->topology[l].processor = 0;
+		    }
+		    if (processor < 0) {
+			processor = cpuinfo->topology[l].processor;
+			if (processor < 0) {
+			    res = -EINVAL;
+			    goto error;
+			}
+		    }
+		    else if (processor != cpuinfo->topology[l].processor) {
+			res = -EINVAL;
+			goto error;
+		    }
+		    cpuinfo->topology[l].logical = l;
+		    cpuinfo->topology[l].thread = thread;
+		    cpuinfo->topology[l].core = core_id[processor];
+		    thread++;
+		}
+	    }
+	    core_id[processor]++;
+            break;
+	}
+        default:
+	    /*
+	     * We have reached the end of the relationships
+	     * that we (currently) are interested in...
+	     */
+	    goto relationships_done;
+        }
+    }
+
+ relationships_done:
+
+    /*
+     * There may be unused entries; remove them...
+     */
+    for (rix = wix = 0; rix < cpuinfo->topology_size; rix++) {
+	if (cpuinfo->topology[rix].logical >= 0) {
+	    if (wix != rix)
+		cpuinfo->topology[wix] = cpuinfo->topology[rix];
+	    wix++;
+	}
+    }
+
+    if (cpuinfo->topology_size != wix) {
+	erts_cpu_topology_t *new = cpuinfo->topology;
+	new = realloc(cpuinfo->topology,
+		      sizeof(erts_cpu_topology_t)*wix);
+	if (!new) {
+	    res = -ENOMEM;
+	    goto error;
+	}
+	cpuinfo->topology = new;
+	cpuinfo->topology_size = wix;
+    }
+
+    res = wix;
+
+    adjust_processor_nodes(cpuinfo, nodes);
+
+    qsort(cpuinfo->topology,
+	  cpuinfo->topology_size,
+	  sizeof(erts_cpu_topology_t),
+	  cpu_cmp);
+
+    if (res < cpuinfo->online)
+	res = -EINVAL;
+
+ error:
+
+    if (res <= 0) {
+	cpuinfo->topology_size = 0;
+	if (cpuinfo->topology) {
+	    free(cpuinfo->topology);
+	    cpuinfo->topology = NULL;
+	}
+    }
+
+    if (slpip)
+	free(slpip);
+    if (core_id)
+	free(core_id);
+
+    return res;
+}
+
+#elif defined(__FreeBSD__)
+
+/**
+ * FreeBSD topology detection is based on kern.sched.topology_spec XML as
+ * exposed by the ULE scheduler and described in SMP(4). It is available in
+ * 8.0 and higher.
+ *
+ * Threads are identified in this XML chunk with a THREAD flag. The function
+ * (simplistically) distinguishes cores and processors by the amount of cache
+ * they share (0 => processor, otherwise => core). Nodes are not identified
+ * (ULE doesn't handle NUMA yet, I believe).
+ */
+
+/**
+ * Recursively parse a topology_spec <group> tag.
+ */
+static
+const char* parse_topology_spec_group(erts_cpu_info_t *cpuinfo, const char* xml, int parentCacheLevel, int* processor_p, int* core_p, int* index_procs_p) {
+    int error = 0;
+    int cacheLevel = parentCacheLevel;
+    const char* next_group_start = strstr(xml + 1, "<group");
+    int is_thread_group = 0;
+    const char* next_cache_level;
+    const char* next_thread_flag;
+    const char* next_group_end;
+    const char* next_children;
+    const char* next_children_end;
+
+    /* parse the cache level */
+    next_cache_level = strstr(xml, "cache-level=\"");
+    if (next_cache_level && (next_group_start == NULL || next_cache_level < next_group_start)) {
+	sscanf(next_cache_level, "cache-level=\"%i\"", &cacheLevel);
+    }
+
+    /* parse the threads flag */
+    next_thread_flag = strstr(xml, "THREAD");
+    if (next_thread_flag && (next_group_start == NULL || next_thread_flag < next_group_start))
+	is_thread_group = 1;
+
+    /* Determine if it's a leaf with the position of the next children tag */
+    next_group_end = strstr(xml, "</group>");
+    next_children = strstr(xml, "<children>");
+    next_children_end = strstr(xml, "</children>");
+    if (next_children == NULL || next_group_end < next_children) {
+	do {
+	    const char* next_cpu_start;
+	    const char* next_cpu_cdata;
+	    const char* next_cpu_end;
+	    int cpu_str_size;
+	    char* cpu_str;
+	    char* cpu_crsr;
+	    char* brkb;
+	    int thread = 0;
+	    int index_procs = *index_procs_p;
+
+	    next_cpu_start = strstr(xml, "<cpu");
+	    if (!next_cpu_start) {
+		error = 1;
+		break;
+	    }
+	    next_cpu_cdata = strstr(next_cpu_start, ">") + 1;
+	    if (!next_cpu_cdata) {
+		error = 1;
+		break;
+	    }
+	    next_cpu_end = strstr(next_cpu_cdata, "</cpu>");
+	    if (!next_cpu_end) {
+		error = 1;
+		break;
+	    }
+	    cpu_str_size = next_cpu_end - next_cpu_cdata;
+	    cpu_str = (char*) malloc(cpu_str_size + 1);
+	    memcpy(cpu_str, (const char*) next_cpu_cdata, cpu_str_size);
+	    cpu_str[cpu_str_size] = 0;
+	    for (cpu_crsr = strtok_r(cpu_str, " \t,", &brkb); cpu_crsr; cpu_crsr = strtok_r(NULL, " \t,", &brkb)) {
+		int cpu_id;
+		if (index_procs >= cpuinfo->configured) {
+		    void* t = realloc(cpuinfo->topology, (sizeof(erts_cpu_topology_t) * (index_procs + 1)));
+		    if (t) {
+			cpuinfo->topology = t;
+		    } else {
+			error = 1;
+			break;
+		    }
+		}
+		cpu_id = atoi(cpu_crsr);
+		cpuinfo->topology[index_procs].node = -1;
+		cpuinfo->topology[index_procs].processor = *processor_p;
+		cpuinfo->topology[index_procs].processor_node = -1;
+		cpuinfo->topology[index_procs].core = *core_p;
+		cpuinfo->topology[index_procs].thread = thread;
+		cpuinfo->topology[index_procs].logical = cpu_id;
+		if (is_thread_group) {
+		    thread++;
+		} else {
+		    *core_p = (*core_p)++;
+		}
+		index_procs++;
+	    }
+	    *index_procs_p = index_procs;
+	    free(cpu_str);
+	} while (0);
+	xml = next_group_end;
+    } else {
+	while (next_group_start != NULL && next_group_start < next_children_end) {
+	    xml = parse_topology_spec_group(cpuinfo, next_group_start, cacheLevel, processor_p, core_p, index_procs_p);
+	    if (!xml)
+		break;
+	    next_group_start = strstr(xml, "<group");
+	    next_children_end = strstr(xml, "</children>");
+	}
+    }
+
+    if (cacheLevel == 0) {
+	*core_p = 0;
+	*processor_p = (*processor_p)++;
+    } else {
+	*core_p = (*core_p)++;
+    }
+
+    if (error)
+	xml = NULL;
+
+    return xml;
+}
+
+/**
+ * Parse the topology_spec. Return the number of CPUs or 0 if parsing failed.
+ */
+static
+int parse_topology_spec(erts_cpu_info_t *cpuinfo, const char* xml) {
+    int res = 1;
+    int index_procs = 0;
+    int core = 0;
+    int processor = 0;
+    xml = strstr(xml, "<groups");
+    if (!xml)
+	return -1;
+
+    xml += 7;
+    xml = strstr(xml, "<group");
+    while (xml) {
+	xml = parse_topology_spec_group(cpuinfo, xml, 0, &processor, &core, &index_procs);
+	if (!xml) {
+	    res = 0;
+	    break;
+	}
+	xml = strstr(xml, "<group");
+    }
+
+    if (res)
+	res = index_procs;
+
+    return res;
+}
+
+static int
+read_topology(erts_cpu_info_t *cpuinfo)
+{
+    int ix;
+    int res = 0;
+    size_t topology_spec_size = 0;
+    void* topology_spec = NULL;
+
+    errno = 0;
+
+    if (cpuinfo->configured < 1)
+	goto error;
+
+    cpuinfo->topology_size = cpuinfo->configured;
+    cpuinfo->topology = malloc(sizeof(erts_cpu_topology_t)
+			       * cpuinfo->configured);
+    if (!cpuinfo->topology) {
+	res = -ENOMEM;
+	goto error;
+    }
+
+    for (ix = 0; ix < cpuinfo->configured; ix++) {
+	cpuinfo->topology[ix].node = -1;
+	cpuinfo->topology[ix].processor = -1;
+	cpuinfo->topology[ix].processor_node = -1;
+	cpuinfo->topology[ix].core = -1;
+	cpuinfo->topology[ix].thread = -1;
+	cpuinfo->topology[ix].logical = -1;
+    }
+
+    if (!sysctlbyname("kern.sched.topology_spec", NULL, &topology_spec_size, NULL, 0)) {
+	topology_spec = malloc(topology_spec_size);
+	if (!topology_spec) {
+	    res = -ENOMEM;
+	    goto error;
+	}
+
+	if (sysctlbyname("kern.sched.topology_spec", topology_spec, &topology_spec_size, NULL, 0)) {
+	    goto error;
+	}
+
+	res = parse_topology_spec(cpuinfo, topology_spec);
+	if (!res || res < cpuinfo->online)
+	    res = 0;
+	else {
+	    cpuinfo->topology_size = res;
+
+	    if (cpuinfo->topology_size != cpuinfo->configured) {
+		void *t = realloc(cpuinfo->topology, (sizeof(erts_cpu_topology_t)
+						  * cpuinfo->topology_size));
+		if (t)
+		    cpuinfo->topology = t;
+	    }
+
+	    adjust_processor_nodes(cpuinfo, 1);
+
+	    qsort(cpuinfo->topology,
+	        cpuinfo->topology_size,
+	        sizeof(erts_cpu_topology_t),
+	        cpu_cmp);
+	}
+    }
+
+error:
+
+    if (res == 0) {
+	cpuinfo->topology_size = 0;
+	if (cpuinfo->topology) {
+	    free(cpuinfo->topology);
+	    cpuinfo->topology = NULL;
+	}
+	if (errno)
+	    res = -errno;
+	else
+	    res = -EINVAL;
+    }
+
+    if (topology_spec)
+	free(topology_spec);
+
+    return res;
+}
+
 #else
 
 static int
@@ -965,3 +1646,98 @@ read_topology(erts_cpu_info_t *cpuinfo)
 }
 
 #endif
+
+#if defined(__WIN32__)
+
+int
+erts_map_win_error_to_errno(DWORD win_error)
+{
+    switch (win_error) {
+    case ERROR_INVALID_FUNCTION:		return EINVAL;	/* 1	*/
+    case ERROR_FILE_NOT_FOUND:			return ENOENT;	/* 2	*/
+    case ERROR_PATH_NOT_FOUND:			return ENOENT;	/* 3	*/
+    case ERROR_TOO_MANY_OPEN_FILES:		return EMFILE;	/* 4	*/
+    case ERROR_ACCESS_DENIED:			return EACCES;	/* 5	*/
+    case ERROR_INVALID_HANDLE:			return EBADF;	/* 6	*/
+    case ERROR_ARENA_TRASHED:			return ENOMEM;	/* 7	*/
+    case ERROR_NOT_ENOUGH_MEMORY:		return ENOMEM;	/* 8	*/
+    case ERROR_INVALID_BLOCK:			return ENOMEM;	/* 9	*/
+    case ERROR_BAD_ENVIRONMENT:			return E2BIG;	/* 10	*/
+    case ERROR_BAD_FORMAT:			return ENOEXEC;	/* 11	*/
+    case ERROR_INVALID_ACCESS:			return EINVAL;	/* 12	*/
+    case ERROR_INVALID_DATA:			return EINVAL;	/* 13	*/
+    case ERROR_OUTOFMEMORY:			return ENOMEM;	/* 14	*/
+    case ERROR_INVALID_DRIVE:			return ENOENT;	/* 15	*/
+    case ERROR_CURRENT_DIRECTORY:		return EACCES;	/* 16	*/
+    case ERROR_NOT_SAME_DEVICE:			return EXDEV;	/* 17	*/
+    case ERROR_NO_MORE_FILES:			return ENOENT;	/* 18	*/
+    case ERROR_WRITE_PROTECT:			return EACCES;	/* 19	*/
+    case ERROR_BAD_UNIT:			return EACCES;	/* 20	*/
+    case ERROR_NOT_READY:			return EACCES;	/* 21	*/
+    case ERROR_BAD_COMMAND:			return EACCES;	/* 22	*/
+    case ERROR_CRC:				return EACCES;	/* 23	*/
+    case ERROR_BAD_LENGTH:			return EACCES;	/* 24	*/
+    case ERROR_SEEK:				return EACCES;	/* 25	*/
+    case ERROR_NOT_DOS_DISK:			return EACCES;	/* 26	*/
+    case ERROR_SECTOR_NOT_FOUND:		return EACCES;	/* 27	*/
+    case ERROR_OUT_OF_PAPER:			return EACCES;	/* 28	*/
+    case ERROR_WRITE_FAULT:			return EACCES;	/* 29	*/
+    case ERROR_READ_FAULT:			return EACCES;	/* 30	*/
+    case ERROR_GEN_FAILURE:			return EACCES;	/* 31	*/
+    case ERROR_SHARING_VIOLATION:		return EACCES;	/* 32	*/
+    case ERROR_LOCK_VIOLATION:			return EACCES;	/* 33	*/
+    case ERROR_WRONG_DISK:			return EACCES;	/* 34	*/
+    case ERROR_SHARING_BUFFER_EXCEEDED:		return EACCES;	/* 36	*/
+    case ERROR_BAD_NETPATH:			return ENOENT;	/* 53	*/
+    case ERROR_NETWORK_ACCESS_DENIED:		return EACCES;	/* 65	*/
+    case ERROR_BAD_NET_NAME:			return ENOENT;	/* 67	*/
+    case ERROR_FILE_EXISTS:			return EEXIST;	/* 80	*/
+    case ERROR_CANNOT_MAKE:			return EACCES;	/* 82	*/
+    case ERROR_FAIL_I24:			return EACCES;	/* 83	*/
+    case ERROR_INVALID_PARAMETER:		return EINVAL;	/* 87	*/
+    case ERROR_NO_PROC_SLOTS:			return EAGAIN;	/* 89	*/
+    case ERROR_DRIVE_LOCKED:			return EACCES;	/* 108	*/
+    case ERROR_BROKEN_PIPE:			return EPIPE;	/* 109	*/
+    case ERROR_DISK_FULL:			return ENOSPC;	/* 112	*/
+    case ERROR_INVALID_TARGET_HANDLE:		return EBADF;	/* 114	*/
+    case ERROR_WAIT_NO_CHILDREN:		return ECHILD;	/* 128	*/
+    case ERROR_CHILD_NOT_COMPLETE:		return ECHILD;	/* 129	*/
+    case ERROR_DIRECT_ACCESS_HANDLE:		return EBADF;	/* 130	*/
+    case ERROR_NEGATIVE_SEEK:			return EINVAL;	/* 131	*/
+    case ERROR_SEEK_ON_DEVICE:			return EACCES;	/* 132	*/
+    case ERROR_DIR_NOT_EMPTY:			return ENOTEMPTY;/* 145	*/
+    case ERROR_NOT_LOCKED:			return EACCES;	/* 158	*/
+    case ERROR_BAD_PATHNAME:			return ENOENT;	/* 161	*/
+    case ERROR_MAX_THRDS_REACHED:		return EAGAIN;	/* 164	*/
+    case ERROR_LOCK_FAILED:			return EACCES;	/* 167	*/
+    case ERROR_ALREADY_EXISTS:			return EEXIST;	/* 183	*/
+    case ERROR_INVALID_STARTING_CODESEG:	return ENOEXEC;	/* 188	*/
+    case ERROR_INVALID_STACKSEG:		return ENOEXEC;	/* 189	*/
+    case ERROR_INVALID_MODULETYPE:		return ENOEXEC;	/* 190	*/
+    case ERROR_INVALID_EXE_SIGNATURE:		return ENOEXEC;	/* 191	*/
+    case ERROR_EXE_MARKED_INVALID:		return ENOEXEC;	/* 192	*/
+    case ERROR_BAD_EXE_FORMAT:			return ENOEXEC;	/* 193	*/
+    case ERROR_ITERATED_DATA_EXCEEDS_64k:	return ENOEXEC;	/* 194	*/
+    case ERROR_INVALID_MINALLOCSIZE:		return ENOEXEC;	/* 195	*/
+    case ERROR_DYNLINK_FROM_INVALID_RING:	return ENOEXEC;	/* 196	*/
+    case ERROR_IOPL_NOT_ENABLED:		return ENOEXEC;	/* 197	*/
+    case ERROR_INVALID_SEGDPL:			return ENOEXEC;	/* 198	*/
+    case ERROR_AUTODATASEG_EXCEEDS_64k:		return ENOEXEC;	/* 199	*/
+    case ERROR_RING2SEG_MUST_BE_MOVABLE:	return ENOEXEC;	/* 200	*/
+    case ERROR_RELOC_CHAIN_XEEDS_SEGLIM:	return ENOEXEC;	/* 201	*/
+    case ERROR_INFLOOP_IN_RELOC_CHAIN:		return ENOEXEC;	/* 202	*/
+    case ERROR_FILENAME_EXCED_RANGE:		return ENOENT;	/* 206	*/
+    case ERROR_NESTING_NOT_ALLOWED:		return EAGAIN;	/* 215	*/
+    case ERROR_NOT_ENOUGH_QUOTA:		return ENOMEM;	/* 1816	*/
+    default:					return EINVAL;
+    }
+}
+
+int
+erts_get_last_win_errno(void)
+{
+    return erts_map_win_error_to_errno(GetLastError());
+}
+
+
+#endif
diff --git a/erts/lib_src/common/ethr_atomics.c b/erts/lib_src/common/ethr_atomics.c
new file mode 100644
index 0000000000..94557d904a
--- /dev/null
+++ b/erts/lib_src/common/ethr_atomics.c
@@ -0,0 +1,402 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: The ethread atomic API
+ * Author: Rickard Green
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define ETHR_INLINE_FUNC_NAME_(X) X ## __
+#define ETHR_ATOMIC_IMPL__
+
+#include "ethread.h"
+#include "ethr_internal.h"
+
+#ifndef ETHR_HAVE_NATIVE_ATOMICS
+ethr_atomic_protection_t ethr_atomic_protection__[1 << ETHR_ATOMIC_ADDR_BITS];
+#endif
+
+int
+ethr_init_atomics(void)
+{
+#ifndef ETHR_HAVE_NATIVE_ATOMICS
+    {
+	int i;
+	for (i = 0; i < (1 << ETHR_ATOMIC_ADDR_BITS); i++) {
+	    int res = ethr_spinlock_init(&ethr_atomic_protection__[i].u.lck);
+	    if (res != 0)
+		return res;
+	}
+    }
+#endif
+    return 0;
+}
+
+/*
+ * --- Pointer size atomics ---------------------------------------------------
+ */
+
+ethr_sint_t *
+ethr_atomic_addr(ethr_atomic_t *var)
+{
+    ETHR_ASSERT(var);
+    return ethr_atomic_addr__(var);
+}
+
+void
+ethr_atomic_init(ethr_atomic_t *var, ethr_sint_t i)
+{
+    ETHR_ASSERT(var);
+    ethr_atomic_init__(var, i);
+}
+
+void
+ethr_atomic_set(ethr_atomic_t *var, ethr_sint_t i)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic_set__(var, i);
+}
+
+ethr_sint_t
+ethr_atomic_read(ethr_atomic_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_read__(var);
+}
+
+ethr_sint_t
+ethr_atomic_add_read(ethr_atomic_t *var, ethr_sint_t incr)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_add_read__(var, incr);
+}   
+
+ethr_sint_t
+ethr_atomic_inc_read(ethr_atomic_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_inc_read__(var);
+}
+
+ethr_sint_t
+ethr_atomic_dec_read(ethr_atomic_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_dec_read__(var);
+}
+
+void
+ethr_atomic_add(ethr_atomic_t *var, ethr_sint_t incr)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic_add__(var, incr);
+}   
+    
+void
+ethr_atomic_inc(ethr_atomic_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic_inc__(var);
+}
+
+void
+ethr_atomic_dec(ethr_atomic_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic_dec__(var);
+}
+
+ethr_sint_t
+ethr_atomic_read_band(ethr_atomic_t *var, ethr_sint_t mask)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_read_band__(var, mask);
+}
+
+ethr_sint_t
+ethr_atomic_read_bor(ethr_atomic_t *var, ethr_sint_t mask)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_read_bor__(var, mask);
+}
+
+ethr_sint_t
+ethr_atomic_xchg(ethr_atomic_t *var, ethr_sint_t new)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_xchg__(var, new);
+}   
+
+ethr_sint_t
+ethr_atomic_cmpxchg(ethr_atomic_t *var, ethr_sint_t new, ethr_sint_t expected)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_cmpxchg__(var, new, expected);
+}
+
+ethr_sint_t
+ethr_atomic_read_acqb(ethr_atomic_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_read_acqb__(var);
+}
+
+ethr_sint_t
+ethr_atomic_inc_read_acqb(ethr_atomic_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_inc_read_acqb__(var);
+}
+
+void
+ethr_atomic_set_relb(ethr_atomic_t *var, ethr_sint_t i)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic_set_relb__(var, i);
+}
+
+void
+ethr_atomic_dec_relb(ethr_atomic_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic_dec_relb__(var);
+}
+
+ethr_sint_t
+ethr_atomic_dec_read_relb(ethr_atomic_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_dec_read_relb__(var);
+}
+
+ethr_sint_t
+ethr_atomic_cmpxchg_acqb(ethr_atomic_t *var, ethr_sint_t new, ethr_sint_t exp)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_cmpxchg_acqb__(var, new, exp);
+}
+
+ethr_sint_t
+ethr_atomic_cmpxchg_relb(ethr_atomic_t *var, ethr_sint_t new, ethr_sint_t exp)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic_cmpxchg_relb__(var, new, exp);
+}
+
+
+/*
+ * --- 32-bit atomics ---------------------------------------------------------
+ */
+
+ethr_sint32_t *
+ethr_atomic32_addr(ethr_atomic32_t *var)
+{
+    ETHR_ASSERT(var);
+    return ethr_atomic32_addr__(var);
+}
+
+void
+ethr_atomic32_init(ethr_atomic32_t *var, ethr_sint32_t i)
+{
+    ETHR_ASSERT(var);
+    ethr_atomic32_init__(var, i);
+}
+
+void
+ethr_atomic32_set(ethr_atomic32_t *var, ethr_sint32_t i)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic32_set__(var, i);
+}
+
+ethr_sint32_t
+ethr_atomic32_read(ethr_atomic32_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_read__(var);
+}
+
+
+ethr_sint32_t
+ethr_atomic32_add_read(ethr_atomic32_t *var, ethr_sint32_t incr)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_add_read__(var, incr);
+}   
+
+ethr_sint32_t
+ethr_atomic32_inc_read(ethr_atomic32_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_inc_read__(var);
+}
+
+ethr_sint32_t
+ethr_atomic32_dec_read(ethr_atomic32_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_dec_read__(var);
+}
+
+void
+ethr_atomic32_add(ethr_atomic32_t *var, ethr_sint32_t incr)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic32_add__(var, incr);
+}   
+    
+void
+ethr_atomic32_inc(ethr_atomic32_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic32_inc__(var);
+}
+
+void
+ethr_atomic32_dec(ethr_atomic32_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic32_dec__(var);
+}
+
+ethr_sint32_t
+ethr_atomic32_read_band(ethr_atomic32_t *var, ethr_sint32_t mask)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_read_band__(var, mask);
+}
+
+ethr_sint32_t
+ethr_atomic32_read_bor(ethr_atomic32_t *var, ethr_sint32_t mask)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_read_bor__(var, mask);
+}
+
+ethr_sint32_t
+ethr_atomic32_xchg(ethr_atomic32_t *var, ethr_sint32_t new)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_xchg__(var, new);
+}   
+
+ethr_sint32_t
+ethr_atomic32_cmpxchg(ethr_atomic32_t *var,
+		      ethr_sint32_t new,
+		      ethr_sint32_t expected)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_cmpxchg__(var, new, expected);
+}
+
+ethr_sint32_t
+ethr_atomic32_read_acqb(ethr_atomic32_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_read_acqb__(var);
+}
+
+ethr_sint32_t
+ethr_atomic32_inc_read_acqb(ethr_atomic32_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_inc_read_acqb__(var);
+}
+
+void
+ethr_atomic32_set_relb(ethr_atomic32_t *var, ethr_sint32_t i)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic32_set_relb__(var, i);
+}
+
+void
+ethr_atomic32_dec_relb(ethr_atomic32_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    ethr_atomic32_dec_relb__(var);
+}
+
+ethr_sint32_t
+ethr_atomic32_dec_read_relb(ethr_atomic32_t *var)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_dec_read_relb__(var);
+}
+
+ethr_sint32_t
+ethr_atomic32_cmpxchg_acqb(ethr_atomic32_t *var,
+			   ethr_sint32_t new,
+			   ethr_sint32_t exp)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_cmpxchg_acqb__(var, new, exp);
+}
+
+ethr_sint32_t
+ethr_atomic32_cmpxchg_relb(ethr_atomic32_t *var,
+			   ethr_sint32_t new,
+			   ethr_sint32_t exp)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(var);
+    return ethr_atomic32_cmpxchg_relb__(var, new, exp);
+}
+
diff --git a/erts/lib_src/common/ethr_aux.c b/erts/lib_src/common/ethr_aux.c
new file mode 100644
index 0000000000..2c3e25a805
--- /dev/null
+++ b/erts/lib_src/common/ethr_aux.c
@@ -0,0 +1,582 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: A Thread library for use in the ERTS and other OTP
+ *              applications.
+ * Author: Rickard Green
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+
+#define ETHR_INLINE_FUNC_NAME_(X) X ## __
+#define ETHR_AUX_IMPL__
+#define ETHR_ATOMIC_IMPL__ /* Needed in order to pull in
+			      native atomic implementations
+			      for optimized fallbacks of
+			      spinlocks and rwspinlocks */
+#include "ethread.h"
+#include "ethr_internal.h"
+#include <string.h>
+#include <limits.h>
+
+#ifndef __WIN32__
+#include <unistd.h>
+#endif
+
+#define ERTS_TS_EV_ALLOC_DEFAULT_POOL_SIZE 100
+#define ERTS_TS_EV_ALLOC_POOL_SIZE 25
+
+erts_cpu_info_t *ethr_cpu_info__;
+
+int ethr_not_completely_inited__ = 1;
+int ethr_not_inited__ = 1;
+
+ethr_memory_allocators ethr_mem__ = ETHR_MEM_ALLOCS_DEF_INITER__;
+
+void *(*ethr_thr_prepare_func__)(void) = NULL;
+void (*ethr_thr_parent_func__)(void *) = NULL;
+void (*ethr_thr_child_func__)(void *) = NULL;
+
+typedef struct ethr_xhndl_list_ ethr_xhndl_list;
+struct ethr_xhndl_list_ {
+    ethr_xhndl_list *next;
+    void (*funcp)(void);
+};
+
+size_t ethr_pagesize__;
+size_t ethr_min_stack_size__; /* kilo words */
+size_t ethr_max_stack_size__; /* kilo words */
+
+ethr_rwmutex xhndl_rwmtx;
+ethr_xhndl_list *xhndl_list;
+
+static int main_threads;
+
+static int init_ts_event_alloc(void);
+
+int
+ethr_init_common__(ethr_init_data *id)
+{
+    int res;
+    if (id) {
+	ethr_thr_prepare_func__	= id->thread_create_prepare_func;
+	ethr_thr_parent_func__	= id->thread_create_parent_func;
+	ethr_thr_child_func__	= id->thread_create_child_func;
+    }
+
+    ethr_cpu_info__ = erts_cpu_info_create();
+    if (!ethr_cpu_info__)
+	return ENOMEM;
+
+#ifdef _SC_PAGESIZE
+    ethr_pagesize__ = (size_t) sysconf(_SC_PAGESIZE);
+#elif defined(HAVE_GETPAGESIZE)
+    ethr_pagesize__ = (size_t) getpagesize();
+#else
+    ethr_pagesize__ = (size_t) 4*1024; /* Guess 4 KB */
+#endif
+
+    /* User needs at least 4 KB */
+    ethr_min_stack_size__ = 4*1024;
+#if SIZEOF_VOID_P == 8
+    /* Double that on 64-bit archs */
+    ethr_min_stack_size__ *= 2;
+#endif
+    /* On some systems as much as about 4 KB is used by the system */
+    ethr_min_stack_size__ += 4*1024;
+    /* There should be room for signal handlers */
+#ifdef SIGSTKSZ
+    ethr_min_stack_size__ += SIGSTKSZ;
+#else
+    ethr_min_stack_size__ += ethr_pagesize__;
+#endif
+    /* The system may think that we need more stack */
+#if defined(PTHREAD_STACK_MIN)
+    if (ethr_min_stack_size__ < PTHREAD_STACK_MIN)
+	ethr_min_stack_size__ = PTHREAD_STACK_MIN;
+#elif defined(_SC_THREAD_STACK_MIN)
+    {
+	size_t thr_min_stk_sz = (size_t) sysconf(_SC_THREAD_STACK_MIN);
+	if (ethr_min_stack_size__ < thr_min_stk_sz)
+	    ethr_min_stack_size__ = thr_min_stk_sz;
+    }
+#endif
+    /* The guard is at least on some platforms included in the stack size
+       passed when creating threads */
+#ifdef ETHR_STACK_GUARD_SIZE
+    ethr_min_stack_size__ += ETHR_STACK_GUARD_SIZE;
+#endif
+    ethr_min_stack_size__ = ETHR_PAGE_ALIGN(ethr_min_stack_size__);
+
+    ethr_min_stack_size__ = ETHR_B2KW(ethr_min_stack_size__);
+
+    ethr_max_stack_size__ = 32*1024*1024;
+#if SIZEOF_VOID_P == 8
+    ethr_max_stack_size__ *= 2;
+#endif
+    ethr_max_stack_size__ = ETHR_B2KW(ethr_max_stack_size__);
+
+    res = ethr_init_atomics();
+    if (res != 0)
+	return res;
+
+    res = ethr_mutex_lib_init(erts_get_cpu_configured(ethr_cpu_info__));
+    if (res != 0)
+	return res;
+
+    xhndl_list = NULL;
+
+    return 0;
+}
+
+int
+ethr_late_init_common__(ethr_late_init_data *lid)
+{
+    ethr_ts_event *tsep = NULL;
+    int reader_groups;
+    int res;
+    int i;
+    ethr_memory_allocator *m[] = {&ethr_mem__.std,
+				  &ethr_mem__.sl,
+				  &ethr_mem__.ll};
+    if (lid)
+	ethr_mem__ = lid->mem;
+    if (!ethr_mem__.std.alloc
+	|| !ethr_mem__.std.realloc
+	|| !ethr_mem__.std.free) {
+	ethr_mem__.std.alloc = malloc;
+	ethr_mem__.std.realloc = realloc;
+	ethr_mem__.std.free = free;
+    }
+    for (i = 0; i < sizeof(m)/sizeof(m[0]); i++) {
+	if (!m[i]->alloc || !m[i]->realloc || !m[i]->free) {
+	    m[i]->alloc = ethr_mem__.std.alloc;
+	    m[i]->realloc = ethr_mem__.std.realloc;
+	    m[i]->free = ethr_mem__.std.free;
+	}
+
+    }
+    res = init_ts_event_alloc();
+    if (res != 0)
+	return res;
+    res = ethr_make_ts_event__(&tsep);
+    if (res == 0)
+	tsep->iflgs |= ETHR_TS_EV_ETHREAD;
+    if (!lid) {
+	main_threads = 0;
+	reader_groups = 0;
+    }
+    else {
+	if (lid->main_threads < 0 || USHRT_MAX < lid->main_threads)
+	    return res;
+	main_threads = lid->main_threads;
+	reader_groups = lid->reader_groups;
+    }
+    res = ethr_mutex_lib_late_init(reader_groups, main_threads);
+    if (res != 0)
+	return res;
+    ethr_not_completely_inited__ = 0; /* Need it for
+					 rwmutex_init */
+    res = ethr_rwmutex_init(&xhndl_rwmtx);
+    ethr_not_completely_inited__ = 1;
+    if (res != 0)
+	return res;
+    return 0;
+}
+
+int
+ethr_install_exit_handler(void (*funcp)(void))
+{
+    ethr_xhndl_list *xhp;
+
+#if ETHR_XCHK
+    if (ethr_not_completely_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+#endif
+
+    if (!funcp)
+	return EINVAL;
+
+    xhp = (ethr_xhndl_list *) ethr_mem__.std.alloc(sizeof(ethr_xhndl_list));
+    if (!xhp)
+	return ENOMEM;
+
+    ethr_rwmutex_rwlock(&xhndl_rwmtx);
+
+    xhp->funcp = funcp;
+    xhp->next = xhndl_list;
+    xhndl_list = xhp;
+
+    ethr_rwmutex_rwunlock(&xhndl_rwmtx);
+
+    return 0;
+}
+
+void
+ethr_run_exit_handlers__(void)
+{
+    ethr_xhndl_list *xhp;
+
+    ethr_rwmutex_rlock(&xhndl_rwmtx);
+
+    xhp = xhndl_list;
+
+    ethr_rwmutex_runlock(&xhndl_rwmtx);
+
+    for (; xhp; xhp = xhp->next)
+	(*xhp->funcp)();
+}
+
+/*
+ * Thread specific event alloc, etc.
+ *
+ * Note that we don't know when it is safe to destroy an event, but
+ * we know when it is safe to reuse it. ts_event_free() therefore
+ * never destroys an event (but makes freed events available for
+ * reuse).
+ *
+ * We could easily keep track of the usage of events, and by this
+ * make it possible to destroy events. We would however suffer a
+ * performance penalty for this and save very little memory.
+ */
+
+typedef union {
+    ethr_ts_event ts_ev;
+    char align[ETHR_CACHE_LINE_ALIGN_SIZE(sizeof(ethr_ts_event))];
+} ethr_aligned_ts_event;
+
+static ethr_spinlock_t ts_ev_alloc_lock;
+static ethr_ts_event *free_ts_ev;
+
+static ethr_ts_event *ts_event_pool(int size, ethr_ts_event **endpp)
+{
+    int i;
+    ethr_aligned_ts_event *atsev;
+    atsev = ethr_mem__.std.alloc(sizeof(ethr_aligned_ts_event) * size
+				 + ETHR_CACHE_LINE_SIZE);
+    if (!atsev)
+	return NULL;
+    if ((((ethr_uint_t) atsev) & ETHR_CACHE_LINE_MASK) == 0)
+	atsev = ((ethr_aligned_ts_event *)
+		 ((((ethr_uint_t) atsev) & ~ETHR_CACHE_LINE_MASK)
+		  + ETHR_CACHE_LINE_SIZE));
+    for (i = 1; i < size; i++) {
+	atsev[i-1].ts_ev.next = &atsev[i].ts_ev;
+	ethr_atomic32_init(&atsev[i-1].ts_ev.uaflgs, 0);
+	atsev[i-1].ts_ev.iflgs = 0;
+    }
+    ethr_atomic32_init(&atsev[size-1].ts_ev.uaflgs, 0);
+    atsev[size-1].ts_ev.iflgs = 0;
+    atsev[size-1].ts_ev.next = NULL;
+    if (endpp)
+	*endpp = &atsev[size-1].ts_ev;
+    return &atsev[0].ts_ev;
+}
+
+static int init_ts_event_alloc(void)
+{
+    free_ts_ev = ts_event_pool(ERTS_TS_EV_ALLOC_DEFAULT_POOL_SIZE,
+			       NULL);
+    if (!free_ts_ev)
+	return ENOMEM;
+    return ethr_spinlock_init(&ts_ev_alloc_lock);
+}
+
+static ethr_ts_event *ts_event_alloc(void)
+{
+    ethr_ts_event *ts_ev;
+    ethr_spin_lock(&ts_ev_alloc_lock);
+    if (free_ts_ev) {
+	ts_ev = free_ts_ev;
+	free_ts_ev = ts_ev->next;
+	ethr_spin_unlock(&ts_ev_alloc_lock);
+    }
+    else {
+	ethr_ts_event *ts_ev_pool_end;
+	ethr_spin_unlock(&ts_ev_alloc_lock);
+
+	ts_ev = ts_event_pool(ERTS_TS_EV_ALLOC_POOL_SIZE, &ts_ev_pool_end);
+	if (!ts_ev)
+	    return NULL;
+
+	ethr_spin_lock(&ts_ev_alloc_lock);
+	ts_ev_pool_end->next = free_ts_ev;
+	free_ts_ev = ts_ev->next;
+	ethr_spin_unlock(&ts_ev_alloc_lock);
+    }
+    return ts_ev;
+}
+
+static void ts_event_free(ethr_ts_event *ts_ev)
+{
+    ETHR_ASSERT(!ts_ev->udata);
+    ethr_spin_lock(&ts_ev_alloc_lock);
+    ts_ev->next = free_ts_ev;
+    free_ts_ev = ts_ev;
+    ethr_spin_unlock(&ts_ev_alloc_lock);
+}
+
+int ethr_make_ts_event__(ethr_ts_event **tsepp)
+{
+    int res;
+    ethr_ts_event *tsep = *tsepp;
+
+    if (!tsep) {
+	tsep = ts_event_alloc();
+	if (!tsep)
+	    return ENOMEM;
+    }
+
+    if ((tsep->iflgs & ETHR_TS_EV_INITED) == 0) {
+	res = ethr_event_init(&tsep->event);
+	if (res != 0) {
+	    ts_event_free(tsep);
+	    return res;
+	}
+    }
+
+    tsep->iflgs = ETHR_TS_EV_INITED;
+    tsep->udata = NULL;
+    tsep->rgix = 0;
+    tsep->mtix = 0;
+
+    res = ethr_set_tse__(tsep);
+    if (res != 0 && tsepp && *tsepp) {
+	ts_event_free(tsep);
+	return res;
+    }
+
+    if (tsepp)
+	*tsepp = tsep;
+
+    return 0;
+}
+
+int ethr_get_tmp_ts_event__(ethr_ts_event **tsepp)
+{
+    int res;
+    ethr_ts_event *tsep = *tsepp;
+
+    if (!tsep) {
+	tsep = ts_event_alloc();
+	if (!tsep)
+	    return ENOMEM;
+    }
+
+    if ((tsep->iflgs & ETHR_TS_EV_INITED) == 0) {
+	res = ethr_event_init(&tsep->event);
+	if (res != 0) {
+	    ts_event_free(tsep);
+	    return res;
+	}
+    }
+
+    tsep->iflgs = ETHR_TS_EV_INITED|ETHR_TS_EV_TMP;
+    tsep->udata = NULL;
+
+    if (tsepp)
+	*tsepp = tsep;
+
+    return 0;
+}
+
+int ethr_free_ts_event__(ethr_ts_event *tsep)
+{
+    ts_event_free(tsep);
+    return 0;
+}
+
+void ethr_ts_event_destructor__(void *vtsep)
+{
+    if (vtsep) {
+	ethr_ts_event *tsep = (ethr_ts_event *) vtsep;
+	ts_event_free(tsep);
+	ethr_set_tse__(NULL);
+    }
+}
+
+int ethr_set_main_thr_status(int on, int no)
+{
+    ethr_ts_event *tsep = ethr_get_tse__();
+    if (!tsep)
+	return EINVAL;
+    if (on) {
+	if (no < 1 || main_threads < no)
+	    return EINVAL;
+	tsep->mtix = (unsigned short) no;
+	tsep->iflgs |= ETHR_TS_EV_MAIN_THR;
+    }
+    else {
+	tsep->iflgs &= ~ETHR_TS_EV_MAIN_THR;
+	tsep->mtix = (unsigned short) 0;
+    }
+    return 0;
+}
+
+int ethr_get_main_thr_status(int *on)
+{
+    ethr_ts_event *tsep = ethr_get_tse__();
+    if (!tsep)
+	*on = 0;
+    else {
+	if (tsep->iflgs & ETHR_TS_EV_MAIN_THR)
+	    *on = 1;
+	else
+	    *on = 0;
+    }
+    return 0;
+}
+
+/* Spinlocks and rwspinlocks */
+
+int
+ethr_spinlock_init(ethr_spinlock_t *lock)
+{
+#if ETHR_XCHK 
+    if (!lock) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+    return ethr_spinlock_init__(lock);
+}
+
+int
+ethr_spinlock_destroy(ethr_spinlock_t *lock)
+{
+#if ETHR_XCHK 
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!lock) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+    return ethr_spinlock_destroy__(lock);
+}
+
+void
+ethr_spin_unlock(ethr_spinlock_t *lock)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(lock);
+    ethr_spin_unlock__(lock);
+}
+
+void
+ethr_spin_lock(ethr_spinlock_t *lock)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(lock);
+    ethr_spin_lock__(lock);
+}
+
+int
+ethr_rwlock_init(ethr_rwlock_t *lock)
+{
+#if ETHR_XCHK 
+    if (!lock) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+    return ethr_rwlock_init__(lock);
+}
+
+int
+ethr_rwlock_destroy(ethr_rwlock_t *lock)
+{
+#if ETHR_XCHK 
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!lock) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+    return ethr_rwlock_destroy__(lock);
+}
+
+void
+ethr_read_unlock(ethr_rwlock_t *lock)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(lock);
+    ethr_read_unlock__(lock);
+}
+
+void
+ethr_read_lock(ethr_rwlock_t *lock)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(lock);
+    ethr_read_lock__(lock);
+}
+
+void
+ethr_write_unlock(ethr_rwlock_t *lock)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(lock);
+    ethr_write_unlock__(lock);
+}
+
+void
+ethr_write_lock(ethr_rwlock_t *lock)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(lock);
+    ethr_write_lock__(lock);
+}
+
+ETHR_IMPL_NORETURN__ ethr_fatal_error__(const char *file,
+					int line,
+					const char *func,
+					int err)
+{
+    char *errstr;
+    if (err == ENOTSUP)
+	errstr = "Operation not supported";
+    else {
+	errstr = strerror(err);
+	if (!errstr)
+	    errstr = "Unknown error";
+    }
+    fprintf(stderr, "%s:%d: Fatal error in %s(): %s (%d)\n",
+	    file, line, func, errstr, err);
+    ethr_abort__();
+}
+
+int ethr_assert_failed(const char *file, int line, const char *func, char *a)
+{
+    fprintf(stderr, "%s:%d: %s(): Assertion failed: %s\n", file, line, func, a);
+    ethr_abort__();
+    return 0;
+}
diff --git a/erts/lib_src/common/ethr_cbf.c b/erts/lib_src/common/ethr_cbf.c
new file mode 100644
index 0000000000..04feceec89
--- /dev/null
+++ b/erts/lib_src/common/ethr_cbf.c
@@ -0,0 +1,36 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+
+/*
+ * We keep this function alone in a separate file so the
+ * compiler wont optimize it away.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ethread.h"
+
+void
+ethr_compiler_barrier_fallback(void)
+{
+
+}
diff --git a/erts/lib_src/common/ethr_mutex.c b/erts/lib_src/common/ethr_mutex.c
new file mode 100644
index 0000000000..2ddef32dfc
--- /dev/null
+++ b/erts/lib_src/common/ethr_mutex.c
@@ -0,0 +1,2912 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: Mutex, rwmutex and condition variable implementation
+ * Author: Rickard Green
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define ETHR_INLINE_FUNC_NAME_(X) X ## __
+#define ETHR_MUTEX_IMPL__
+
+#include <limits.h>
+#include "ethread.h"
+#include "ethr_internal.h"
+
+#define ETHR_SPIN_WITH_WAITERS 1
+
+#define ETHR_MTX_MAX_FLGS_SPIN 10
+
+#ifdef ETHR_USE_OWN_RWMTX_IMPL__
+static int default_rwmtx_main_spincount;
+static int default_rwmtx_aux_spincount;
+#endif
+#ifdef ETHR_USE_OWN_MTX_IMPL__
+static int default_mtx_main_spincount;
+static int default_mtx_aux_spincount;
+static int default_cnd_main_spincount;
+static int default_cnd_aux_spincount;
+#endif
+
+static int no_spin;
+
+#ifndef ETHR_USE_OWN_RWMTX_IMPL__
+static pthread_rwlockattr_t write_pref_attr_data;
+static pthread_rwlockattr_t *write_pref_attr;
+#endif
+
+#if defined(ETHR_MTX_Q_LOCK_SPINLOCK__)
+#  define ETHR_MTX_QLOCK_INIT ethr_spinlock_init
+#  define ETHR_MTX_QLOCK_DESTROY ethr_spinlock_destroy
+#  define ETHR_MTX_Q_LOCK ethr_spin_lock
+#  define ETHR_MTX_Q_UNLOCK ethr_spin_unlock
+#elif defined(ETHR_MTX_Q_LOCK_PTHREAD_MUTEX__)
+#  define ETHR_MTX_QLOCK_INIT(QL) pthread_mutex_init((QL), NULL)
+#  define ETHR_MTX_QLOCK_DESTROY pthread_mutex_destroy
+#  define ETHR_MTX_Q_LOCK(L)					\
+do {								\
+    int res__ = pthread_mutex_lock(L);				\
+    if (res__ != 0)						\
+	ETHR_FATAL_ERROR__(res__);				\
+} while (0)
+#  define ETHR_MTX_Q_UNLOCK(L)					\
+do {								\
+    int res__ = pthread_mutex_unlock(L);			\
+    if (res__ != 0)						\
+	ETHR_FATAL_ERROR__(res__);				\
+} while (0)
+#elif defined(ETHR_MTX_Q_LOCK_CRITICAL_SECTION__)
+#  define ETHR_MTX_QLOCK_INIT(QL) (InitializeCriticalSection((QL)), 0)
+#  define ETHR_MTX_QLOCK_DESTROY(QL) (DeleteCriticalSection((QL)), 0)
+#  define ETHR_MTX_Q_LOCK(QL) EnterCriticalSection((QL))
+#  define ETHR_MTX_Q_UNLOCK(QL) LeaveCriticalSection((QL))
+#endif
+
+int
+ethr_mutex_lib_init(int cpu_conf)
+{
+    int res = 0;
+
+    no_spin = cpu_conf == 1;
+
+#ifdef ETHR_USE_OWN_MTX_IMPL__
+    default_mtx_main_spincount = ETHR_MTX_DEFAULT_MAIN_SPINCOUNT_BASE;
+    default_mtx_aux_spincount = ETHR_MTX_DEFAULT_AUX_SPINCOUNT;
+    default_cnd_main_spincount = ETHR_CND_DEFAULT_MAIN_SPINCOUNT;
+    default_cnd_aux_spincount = ETHR_CND_DEFAULT_AUX_SPINCOUNT;
+#endif
+
+#ifdef ETHR_USE_OWN_RWMTX_IMPL__
+
+    default_rwmtx_main_spincount = ETHR_RWMTX_DEFAULT_MAIN_SPINCOUNT_BASE;
+    default_rwmtx_aux_spincount = ETHR_RWMTX_DEFAULT_AUX_SPINCOUNT;
+
+#else
+
+#if defined(ETHR_HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP) \
+    && defined(ETHR_HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP)
+    res = pthread_rwlockattr_init(&write_pref_attr_data);
+    if (res != 0)
+	return res;
+    res = pthread_rwlockattr_setkind_np(
+	&write_pref_attr_data,
+	PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+    write_pref_attr = &write_pref_attr_data;
+#else
+    write_pref_attr = NULL;
+#endif
+
+#endif
+
+    return res;
+}
+
+#ifdef ETHR_USE_OWN_RWMTX_IMPL__
+
+#ifdef ETHR_ATOMIC_HAVE_INC_DEC_INSTRUCTIONS
+#if 0 /*
+       * When inc and dec are real atomic instructions as on x86, the
+       * ETHR_RLOCK_WITH_INC_DEC implementations performs better with
+       * lots of read locks compared to the cmpxchg based implementation.
+       * It, however, performs worse with lots of mixed reads and writes.
+       * It could be used for rwlocks that are known to be read locked
+       * much, but the readers array based implementation outperforms it
+       * by far. Therefore, it has been disabled, and will probably be
+       * removed some time in the future.
+       */
+#  define ETHR_RLOCK_WITH_INC_DEC
+#endif
+#endif
+
+static int reader_groups_array_size = 0;
+static int main_threads_array_size = 0;
+
+#endif
+
+int
+ethr_mutex_lib_late_init(int no_reader_groups, int no_main_threads)
+{
+
+#ifdef ETHR_USE_OWN_MTX_IMPL__
+    default_mtx_main_spincount += (no_main_threads
+				   * ETHR_MTX_DEFAULT_MAIN_SPINCOUNT_INC);
+    if (default_mtx_main_spincount > ETHR_MTX_DEFAULT_MAIN_SPINCOUNT_MAX)
+	default_mtx_main_spincount = ETHR_MTX_DEFAULT_MAIN_SPINCOUNT_MAX;
+#endif
+
+#ifdef ETHR_USE_OWN_RWMTX_IMPL__
+
+    default_rwmtx_main_spincount += (no_main_threads
+				     * ETHR_RWMTX_DEFAULT_MAIN_SPINCOUNT_INC);
+    if (default_rwmtx_main_spincount > ETHR_RWMTX_DEFAULT_MAIN_SPINCOUNT_MAX)
+	default_rwmtx_main_spincount = ETHR_RWMTX_DEFAULT_MAIN_SPINCOUNT_MAX;
+
+    reader_groups_array_size = (no_reader_groups <= 1
+				? 1
+				: no_reader_groups + 1);
+    main_threads_array_size = (no_main_threads <= 1
+			       ? 1
+			       : no_main_threads + 1);
+#endif
+    return 0;
+}
+
+int
+ethr_rwmutex_set_reader_group(int ix)
+{
+#ifdef ETHR_USE_OWN_RWMTX_IMPL__
+    ethr_ts_event *tse;
+
+    if (ix < 0 || reader_groups_array_size <= ix)
+	return EINVAL;
+
+    tse = ethr_get_ts_event();
+
+    if ((tse->iflgs & ETHR_TS_EV_ETHREAD) == 0) {
+	ethr_leave_ts_event(tse);
+	return EINVAL;
+    }
+
+    tse->rgix = ix;
+    
+    ethr_leave_ts_event(tse);
+#endif
+    return 0;
+}
+
+#if defined(ETHR_MTX_HARD_DEBUG_Q) || defined(ETHR_MTX_HARD_DEBUG_WSQ)
+static void hard_debug_chk_q__(struct ethr_mutex_base_ *, int);
+#define ETHR_RWMTX_HARD_DEBUG_CHK_Q(RWMTX) hard_debug_chk_q__(&(RWMTX)->mtxb,1)
+#define ETHR_MTX_HARD_DEBUG_CHK_Q(MTX) hard_debug_chk_q__(&(MTX)->mtxb, 0)
+#else
+#define ETHR_RWMTX_HARD_DEBUG_CHK_Q(RWMTX)
+#define ETHR_MTX_HARD_DEBUG_CHK_Q(MTX)
+#endif
+
+#ifdef ETHR_USE_OWN_RWMTX_IMPL__
+static void
+rwmutex_transfer_read_lock(ethr_rwmutex *rwmtx,
+			   ethr_sint32_t initial,
+			   int q_locked);
+static void
+rwmutex_unlock_wake(ethr_rwmutex *rwmtx,
+		    int have_w,
+		    ethr_sint32_t initial,
+		    int transfer_read_lock);
+static int
+rwmutex_try_complete_runlock(ethr_rwmutex *rwmtx,
+			     ethr_sint32_t initial,
+			     ethr_ts_event *tse,
+			     int start_next_ix,
+			     int check_before_try,
+			     int try_write_lock);
+#endif
+
+#if defined(ETHR_USE_OWN_RWMTX_IMPL__) || defined(ETHR_USE_OWN_MTX_IMPL__)
+
+/* -- Utilities operating both on ordinary mutexes and read write mutexes -- */
+
+static ETHR_INLINE void
+rwmutex_freqread_wtng_rdrs_inc(ethr_rwmutex *rwmtx, ethr_ts_event *tse)
+{
+    int ix = (rwmtx->type == ETHR_RWMUTEX_TYPE_FREQUENT_READ
+	      ? tse->rgix
+	      : tse->mtix);
+    rwmtx->tdata.ra[ix].data.waiting_readers++;
+}
+
+static ETHR_INLINE void
+rwmutex_freqread_rdrs_add(ethr_rwmutex *rwmtx,
+			  ethr_rwmutex_type type,
+			  int ix,
+			  int inc)
+{
+    if (type == ETHR_RWMUTEX_TYPE_FREQUENT_READ || ix == 0)
+	ethr_atomic32_add(&rwmtx->tdata.ra[ix].data.readers, inc);
+    else {
+	ETHR_ASSERT(type == ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ);
+	ETHR_ASSERT(ethr_atomic32_read(&rwmtx->tdata.ra[ix].data.readers) == 0);
+	ETHR_ASSERT(inc == 1);
+	ethr_atomic32_set(&rwmtx->tdata.ra[ix].data.readers, (ethr_sint32_t) 1);
+    }
+}
+
+static ETHR_INLINE void
+rwmutex_freqread_rdrs_inc(ethr_rwmutex *rwmtx, ethr_ts_event *tse)
+{
+    int ix;
+    if (rwmtx->type == ETHR_RWMUTEX_TYPE_FREQUENT_READ) {
+	ix = tse->rgix;
+    atomic_inc:
+	ethr_atomic32_inc(&rwmtx->tdata.ra[ix].data.readers);
+    }
+    else {
+	ix = tse->mtix;
+	if (ix == 0)
+	    goto atomic_inc;
+	ETHR_ASSERT(rwmtx->type == ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ);
+	ETHR_ASSERT(ethr_atomic32_read(&rwmtx->tdata.ra[ix].data.readers) == 0);
+	ethr_atomic32_set(&rwmtx->tdata.ra[ix].data.readers, (ethr_sint32_t) 1);
+    }
+}
+
+#if 0 /* Not used */
+
+static ETHR_INLINE void
+rwmutex_freqread_rdrs_dec(ethr_rwmutex *rwmtx, ethr_ts_event *tse)
+{
+    int ix;
+    if (rwmtx->type == ETHR_RWMUTEX_TYPE_FREQUENT_READ) {
+	ix = tse->rgix;
+    atomic_dec:
+	ethr_atomic32_dec(&rwmtx->tdata.ra[ix].data.readers);
+    }
+    else {
+	ix = tse->mtix;
+	if (ix == 0)
+	    goto atomic_dec;
+	ETHR_ASSERT(rwmtx->type == ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ);
+	ETHR_ASSERT(ethr_atomic32_read(&rwmtx->tdata.ra[ix].data.readers) == 1);
+	ethr_atomic32_set(&rwmtx->tdata.ra[ix].data.readers, (ethr_sint32_t) 0);
+    }
+}
+
+#endif
+
+static ETHR_INLINE ethr_sint32_t
+rwmutex_freqread_rdrs_dec_read(ethr_rwmutex *rwmtx, ethr_ts_event *tse)
+{
+    int ix;
+    if (rwmtx->type == ETHR_RWMUTEX_TYPE_FREQUENT_READ) {
+	ix = tse->rgix;
+    atomic_dec_read:
+	return ethr_atomic32_dec_read(&rwmtx->tdata.ra[ix].data.readers);
+    }
+    else {
+	ix = tse->mtix;
+	if (ix == 0)
+	    goto atomic_dec_read;
+	ETHR_ASSERT(rwmtx->type == ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ);
+	ETHR_ASSERT(ethr_atomic32_read(&rwmtx->tdata.ra[ix].data.readers) == 1);
+	ethr_atomic32_set(&rwmtx->tdata.ra[ix].data.readers, (ethr_sint32_t) 0);
+	return (ethr_sint32_t) 0;
+    }
+}
+
+static ETHR_INLINE ethr_sint32_t
+rwmutex_freqread_rdrs_dec_read_relb(ethr_rwmutex *rwmtx, ethr_ts_event *tse)
+{
+    int ix;
+    if (rwmtx->type == ETHR_RWMUTEX_TYPE_FREQUENT_READ) {
+	ix = tse->rgix;
+    atomic_dec_read:
+	return ethr_atomic32_dec_read_relb(&rwmtx->tdata.ra[ix].data.readers);
+    }
+    else {
+	ix = tse->mtix;
+	if (ix == 0)
+	    goto atomic_dec_read;
+	ETHR_ASSERT(rwmtx->type == ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ);
+	ETHR_ASSERT(ethr_atomic32_read(&rwmtx->tdata.ra[ix].data.readers) == 1);
+	ethr_atomic32_set_relb(&rwmtx->tdata.ra[ix].data.readers,
+			     (ethr_sint32_t) 0);
+	return (ethr_sint32_t) 0;
+    }
+}
+
+static ETHR_INLINE ethr_sint32_t
+rwmutex_freqread_rdrs_read(ethr_rwmutex *rwmtx, int ix)
+{
+    ethr_sint32_t res = ethr_atomic32_read(&rwmtx->tdata.ra[ix].data.readers);
+#ifdef ETHR_DEBUG
+    switch (rwmtx->type) {
+    case ETHR_RWMUTEX_TYPE_FREQUENT_READ:
+	ETHR_ASSERT(res >= 0);
+	break;
+    case ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ:
+	ETHR_ASSERT(ix == 0 ? res >= 0 : (res == 0 || res == 1));
+	break;
+    default:
+	ETHR_ASSERT(0);
+	break;
+    }
+#endif
+    return res;
+}
+
+
+static ETHR_INLINE void
+enqueue(ethr_ts_event **queue,
+	ethr_ts_event *tse_start,
+	ethr_ts_event *tse_end)
+{
+    if (!*queue) {
+	*queue = tse_start;
+	tse_start->prev = tse_end;
+	tse_end->next = tse_start;
+    }
+    else {
+	tse_end->next = *queue;
+	tse_start->prev = (*queue)->prev;
+	(*queue)->prev->next = tse_start;
+	(*queue)->prev = tse_end;
+    }
+}
+
+static ETHR_INLINE void
+insert(ethr_ts_event *tse_pred, ethr_ts_event *tse)
+{
+    tse->next = tse_pred->next;
+    tse->prev = tse_pred;
+    tse_pred->next->prev = tse;
+    tse_pred->next = tse;
+}
+
+static ETHR_INLINE void
+dequeue(ethr_ts_event **queue,
+	ethr_ts_event *tse_start,
+	ethr_ts_event *tse_end)
+{
+    if (tse_start->prev == tse_end) {
+	ETHR_ASSERT(*queue == tse_start && tse_end->next == tse_start);
+	*queue = NULL;
+    }
+    else {
+	if (*queue == tse_start)
+	    *queue = tse_end->next;
+	tse_end->next->prev = tse_start->prev;
+	tse_start->prev->next = tse_end->next;
+    }
+}
+
+static void
+event_wait(struct ethr_mutex_base_ *mtxb,
+	   ethr_ts_event *tse,
+	   int spincount,
+	   ethr_sint32_t type,
+	   int is_rwmtx,
+	   int is_freq_read)
+{
+    int locked = 0;
+    ethr_sint32_t act;
+    int need_try_complete_runlock = 0;
+    int transfer_read_lock = 0;
+
+    /* Need to enqueue and wait... */
+
+    tse->uflgs = type;
+    ethr_atomic32_set(&tse->uaflgs, type);
+
+    ETHR_MTX_Q_LOCK(&mtxb->qlck);
+    locked = 1;
+
+#ifdef ETHR_MTX_HARD_DEBUG_Q
+    hard_debug_chk_q__(mtxb, is_rwmtx);
+#endif
+
+    act = ethr_atomic32_read(&mtxb->flgs);
+
+    if (act & type) {
+
+	/* Wait bit already there; enqueue... */
+
+	ETHR_ASSERT(mtxb->q);
+	if (type == ETHR_RWMTX_W_WAIT_FLG__) {
+	    enqueue(&mtxb->q, tse, tse);
+#ifdef ETHR_MTX_HARD_DEBUG_WSQ
+	    mtxb->ws++;
+#endif
+	}
+	else {
+	    ethr_rwmutex *rwmtx = (ethr_rwmutex *) mtxb;
+	    ETHR_ASSERT(is_rwmtx);
+	    ETHR_ASSERT(rwmtx->rq_end);
+	    insert(rwmtx->rq_end, tse);
+	    rwmtx->rq_end = tse;
+	    if (is_freq_read)
+		rwmutex_freqread_wtng_rdrs_inc(rwmtx, tse);
+	    else
+		rwmtx->tdata.rs++;
+	}
+    }
+    else {
+
+	/* Set wait bit */
+
+	while (1) {
+	    ethr_sint32_t new, exp = act;
+	    need_try_complete_runlock = 0;
+	    transfer_read_lock = 0;
+
+	    if (type == ETHR_RWMTX_W_WAIT_FLG__) {
+		if (is_freq_read && act == ETHR_RWMTX_R_FLG__)
+		    need_try_complete_runlock = 1;
+		if (act != 0)
+		    new = act | ETHR_RWMTX_W_WAIT_FLG__;
+		else
+		    new = ETHR_RWMTX_W_FLG__; /* Try to get it */
+	    }
+	    else {
+		ETHR_ASSERT(is_rwmtx);
+
+		if (!is_freq_read) {
+		    if (act & (ETHR_RWMTX_W_FLG__| ETHR_RWMTX_W_WAIT_FLG__))
+			new = act | ETHR_RWMTX_R_WAIT_FLG__;
+		    else
+			new = act + 1; /* Try to get it */
+		}
+		else {
+		    new = act | ETHR_RWMTX_R_WAIT_FLG__;
+		    if ((act & (ETHR_RWMTX_W_FLG__
+				| ETHR_RWMTX_W_WAIT_FLG__)) == 0) {
+			/* Transfer read lock to this thread. */
+			transfer_read_lock = 1;
+		    }
+		}
+	    }
+
+	    act = ethr_atomic32_cmpxchg_acqb(&mtxb->flgs, new, exp);
+	    if (exp == act) {
+		if (new & type) {
+		    act = new;
+		    break;
+		}
+		else {
+		    /* Got it */
+		    goto done;
+		}
+	    }
+	}
+
+	/* Enqueue */
+
+	if (type == ETHR_RWMTX_R_WAIT_FLG__) {
+	    ethr_rwmutex *rwmtx = (ethr_rwmutex *) mtxb;
+	    ETHR_ASSERT(is_rwmtx);
+	    ETHR_ASSERT(!rwmtx->rq_end);
+	    rwmtx->rq_end =  tse;
+	    if (is_freq_read)
+		rwmutex_freqread_wtng_rdrs_inc(rwmtx, tse);
+	    else
+		rwmtx->tdata.rs++;
+	}
+#ifdef ETHR_MTX_HARD_DEBUG_WSQ
+	else {
+	    mtxb->ws++;
+	}
+#endif
+
+	enqueue(&mtxb->q, tse, tse);
+    }
+
+#ifdef ETHR_MTX_HARD_DEBUG_Q
+    hard_debug_chk_q__(mtxb, is_rwmtx);
+#endif
+
+    /* Wait */
+    locked = 0;
+
+    ETHR_ASSERT(!(transfer_read_lock && need_try_complete_runlock));
+
+    if (transfer_read_lock) {
+	ETHR_ASSERT(((ethr_rwmutex *) mtxb)->type
+		    != ETHR_RWMUTEX_TYPE_NORMAL);
+	/*
+	 * We are the only one in the queue and we are not write
+	 * locked; rwmutex_transfer_read_lock() will:
+	 * - transfer a read lock to us (since we're first in q)
+	 * - unlock the Q-lock
+	 */
+	rwmutex_transfer_read_lock(((ethr_rwmutex *) mtxb), act, 1);
+    }
+    else {
+	ETHR_MTX_Q_UNLOCK(&mtxb->qlck);
+
+	if (need_try_complete_runlock) {
+	    ETHR_ASSERT(((ethr_rwmutex *) mtxb)->type
+			!= ETHR_RWMUTEX_TYPE_NORMAL);
+	    /*
+	     * We were the only one in queue when we enqueued, and it
+	     * was seemingly read locked. We need to try to complete a
+	     * runlock otherwise we might be hanging forever. If the
+	     * runlock could be completed we will be dequeued and
+	     * woken by ourselves.
+	     */
+	    rwmutex_try_complete_runlock((ethr_rwmutex *) mtxb,
+					 act, tse, 0, 1, 0);
+	}
+    }
+
+    while (1) {
+	ethr_event_reset(&tse->event);
+
+	act = ethr_atomic32_read_acqb(&tse->uaflgs);
+	if (!act)
+	    goto done; /* Got it */
+
+	ETHR_ASSERT(act == type);
+	ethr_event_swait(&tse->event, spincount);
+	/* swait result: 0 || EINTR */
+
+	act = ethr_atomic32_read_acqb(&tse->uaflgs);
+	if (!act)
+	    goto done; /* Got it */
+    }
+
+ done:
+    if (locked)
+	ETHR_MTX_Q_UNLOCK(&mtxb->qlck);
+}
+
+static void
+wake_writer(struct ethr_mutex_base_ *mtxb, int is_rwmtx)
+{
+    ethr_ts_event *tse;
+
+    tse = mtxb->q;
+    ETHR_ASSERT(tse);
+    dequeue(&mtxb->q, tse, tse);
+
+    ETHR_ASSERT(tse->uflgs == ETHR_RWMTX_W_WAIT_FLG__);
+    ETHR_ASSERT(ethr_atomic32_read(&tse->uaflgs) == ETHR_RWMTX_W_WAIT_FLG__);
+#ifdef ETHR_MTX_HARD_DEBUG_WSQ
+    mtxb->ws--;
+#endif
+#if defined(ETHR_MTX_HARD_DEBUG_Q) || defined(ETHR_MTX_HARD_DEBUG_WSQ)
+    hard_debug_chk_q__(mtxb, is_rwmtx);
+#endif
+
+    ETHR_MTX_Q_UNLOCK(&mtxb->qlck);
+
+    ethr_atomic32_set(&tse->uaflgs, 0);
+    ethr_event_set(&tse->event);
+}
+
+static ETHR_INLINE int
+initial_spincount(struct ethr_mutex_base_ *mtxb)
+{
+    return (mtxb->aux_scnt < ETHR_MTX_MAX_FLGS_SPIN
+	    ? mtxb->aux_scnt
+	    : ETHR_MTX_MAX_FLGS_SPIN);
+}
+
+static ETHR_INLINE int
+update_spincount(struct ethr_mutex_base_ *mtxb,
+		 ethr_ts_event *tse,
+		 int *scnt_state,
+		 int *scnt)
+{
+    int state = *scnt_state;
+    if (state <= 0) {
+	/* Here state is max spincount to do on event negated */
+	*scnt = -state;
+    }
+    else {
+	/* Here state is initial spincount made on flags */
+	*scnt = ((tse->iflgs & ETHR_TS_EV_MAIN_THR)
+		 ? mtxb->main_scnt
+		 : mtxb->aux_scnt);
+	if (*scnt <= state)
+	    *scnt = 0;
+	else {
+	    if (*scnt <= ETHR_MTX_MAX_FLGS_SPIN)
+		*scnt_state = 0; /* No spin on event */
+	    else {
+		 /* Spin on event after... */
+		*scnt_state = -1*(*scnt - ETHR_MTX_MAX_FLGS_SPIN);
+		/* ... we have spun on flags */
+		*scnt = ETHR_MTX_MAX_FLGS_SPIN;
+	    }
+	    *scnt -= state;
+	    return 0;
+	}
+    }
+    return 1;
+}
+
+int check_readers_array(ethr_rwmutex *rwmtx,
+			int start_rix,
+			int length);
+
+static ETHR_INLINE void
+write_lock_wait(struct ethr_mutex_base_ *mtxb,
+		ethr_sint32_t initial,
+		int is_rwmtx,
+		int is_freq_read)
+{
+    ethr_sint32_t act = initial;
+    int scnt, start_scnt;
+    ethr_ts_event *tse = NULL;
+    int until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+    int res;
+
+    ETHR_ASSERT(!is_freq_read || is_rwmtx);
+
+    start_scnt = scnt = initial_spincount(mtxb);
+
+    /*
+     * Spin trying to write lock for a while. If unsuccessful,
+     * wait on event.
+     */
+
+    while (1) {
+	while (act != 0) {
+
+	    if (is_freq_read && act == ETHR_RWMTX_R_FLG__) {
+		ethr_rwmutex *rwmtx = (ethr_rwmutex *) mtxb;
+		scnt--;
+		if (!tse)
+		    tse = ethr_get_ts_event();
+		res = rwmutex_try_complete_runlock(rwmtx, act,
+						   tse, 0, 0,
+						   1);
+		if (res != EBUSY)
+		    goto done; /* Got it */
+		if (scnt <= 0)
+		    goto chk_spin;
+		if (--until_yield == 0) {
+		    until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+		    ETHR_YIELD();
+		}
+	    }
+
+	    if (scnt <= 0) {
+	    chk_spin:
+		scnt = 0;
+
+		if (!tse)
+		    tse = ethr_get_ts_event();
+		if (update_spincount(mtxb, tse, &start_scnt, &scnt)) {
+		    event_wait(mtxb, tse, scnt, ETHR_RWMTX_W_WAIT_FLG__,
+			       is_rwmtx, is_freq_read);
+		    goto done;
+		}
+	    }
+	    ETHR_SPIN_BODY;
+	    if (--until_yield == 0) {
+		until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+		ETHR_YIELD();
+	    }
+	    act = ethr_atomic32_read(&mtxb->flgs);
+	    scnt--;
+	}
+
+	act = ethr_atomic32_cmpxchg_acqb(&mtxb->flgs,
+					 ETHR_RWMTX_W_FLG__,
+					 0);
+	if (act == 0)
+	    goto done; /* Got it */
+    }
+
+ done:
+    if (tse)
+	ethr_leave_ts_event(tse);
+}
+
+static int
+mtxb_init(struct ethr_mutex_base_ *mtxb,
+	  int def_main_scnt,
+	  int main_scnt,
+	  int def_aux_scnt,
+	  int aux_scnt)
+{
+    ETHR_MTX_HARD_DEBUG_LFS_INIT(mtxb);
+#ifdef ETHR_MTX_HARD_DEBUG_WSQ
+    mtxb->ws = 0;
+#endif
+    ETHR_MTX_CHK_EXCL_INIT(mtxb);
+    if (no_spin) {
+	mtxb->main_scnt = 0;
+	mtxb->aux_scnt = 0;
+    }
+    else {
+	if (main_scnt > SHRT_MAX)
+	    mtxb->main_scnt = SHRT_MAX;
+	else if (main_scnt < 0)
+	    mtxb->main_scnt = def_main_scnt;
+	else
+	    mtxb->main_scnt = (short) main_scnt;
+	if (aux_scnt > SHRT_MAX)
+	    mtxb->aux_scnt = SHRT_MAX;
+	else if (aux_scnt < 0)
+	    mtxb->aux_scnt = def_aux_scnt;
+	else
+	    mtxb->aux_scnt = (short) aux_scnt;
+	if (mtxb->main_scnt < mtxb->aux_scnt)
+	    mtxb->main_scnt = mtxb->aux_scnt;
+
+    }
+    mtxb->q = NULL;
+    ethr_atomic32_init(&mtxb->flgs, 0);
+    return ETHR_MTX_QLOCK_INIT(&mtxb->qlck);
+}
+
+static int
+mtxb_destroy(struct ethr_mutex_base_ *mtxb)
+{
+    ethr_sint32_t act;
+    ETHR_MTX_Q_LOCK(&mtxb->qlck);
+    act = ethr_atomic32_read(&mtxb->flgs);
+    ETHR_MTX_Q_UNLOCK(&mtxb->qlck);
+    if (act != 0)
+	return EINVAL;
+    return ETHR_MTX_QLOCK_DESTROY(&mtxb->qlck);
+}
+
+
+#endif /* ETHR_USE_OWN_RWMTX_IMPL__ || ETHR_USE_OWN_MTX_IMPL__ */
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
+ * Mutex and condition variable implementation                               *
+\*                                                                           */
+
+#ifdef ETHR_USE_OWN_MTX_IMPL__
+
+/* -- Mutex ---------------------------------------------------------------- */
+
+int
+ethr_mutex_init_opt(ethr_mutex *mtx, ethr_mutex_opt *opt)
+{
+    int res;
+#if ETHR_XCHK
+    if (!mtx) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+    mtx->initialized = ETHR_MUTEX_INITIALIZED;
+#endif
+    ETHR_MTX_HARD_DEBUG_FENCE_INIT(mtx);
+    res = mtxb_init(&mtx->mtxb,
+		    default_mtx_main_spincount,
+		    opt ? opt->main_spincount : -1,
+		    default_mtx_aux_spincount,
+		    opt ? opt->aux_spincount : -1);
+#if ETHR_XCHK
+    if (res != 0)
+	mtx->initialized = 0;
+#endif
+    return res;
+}
+
+int
+ethr_mutex_init(ethr_mutex *mtx)
+{
+    return ethr_mutex_init_opt(mtx, NULL);
+}
+
+int
+ethr_mutex_destroy(ethr_mutex *mtx)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!mtx) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+    mtx->initialized = 0;
+#endif
+    return mtxb_destroy(&mtx->mtxb);
+}
+
+void
+ethr_mutex_lock_wait__(ethr_mutex *mtx, ethr_sint32_t initial)
+{
+    write_lock_wait(&mtx->mtxb, initial, 0, 0);
+}
+
+void
+ethr_mutex_unlock_wake__(ethr_mutex *mtx, ethr_sint32_t initial)
+{
+    ethr_ts_event *tse;
+
+    ETHR_MTX_Q_LOCK(&mtx->mtxb.qlck);
+    tse = mtx->mtxb.q;
+
+    ETHR_ASSERT(tse);
+    ETHR_ASSERT(ethr_atomic32_read(&mtx->mtxb.flgs)
+		== (ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__));
+    ETHR_ASSERT(initial & ETHR_RWMTX_W_WAIT_FLG__);
+    ETHR_MTX_HARD_DEBUG_CHK_Q(mtx);
+
+    /*
+     * If we have multiple waiters, there is no need to modify
+     * mtxb->flgs; otherwise, we need to clear the write wait bit...
+     */
+    if (tse->next == mtx->mtxb.q)
+	ethr_atomic32_set(&mtx->mtxb.flgs, ETHR_RWMTX_W_FLG__);
+
+    wake_writer(&mtx->mtxb, 0);
+}
+
+/* -- Condition variables -------------------------------------------------- */
+
+static void
+enqueue_mtx(ethr_mutex *mtx, ethr_ts_event *tse_start, ethr_ts_event *tse_end)
+{
+    ethr_sint32_t act;
+
+    /*
+     * `ethr_cond_signal()' and `ethr_cond_broadcast()' end up here. If `mtx'
+     * is not currently locked by current thread, we almost certainly have a
+     * hard to debug race condition. There might however be some (strange)
+     * use for it. POSIX also allow a call to `pthread_cond_signal' or
+     * `pthread_cond_broadcast' even though the the associated mutex isn't
+     * locked by the caller. Therefore, we also allow this kind of strange
+     * usage, but optimize for the case where the mutex is locked by the
+     * calling thread.
+     */
+
+    ETHR_MTX_Q_LOCK(&mtx->mtxb.qlck);
+
+    ETHR_MTX_HARD_DEBUG_CHK_Q(mtx);
+
+#ifdef ETHR_MTX_HARD_DEBUG_WSQ
+    {
+	int dbg_nws__ = 0;
+	ethr_ts_event *dbg_tse__;
+	for (dbg_tse__ = tse_start;
+	     dbg_tse__ != tse_end;
+	     dbg_tse__ = dbg_tse__->next)
+	    dbg_nws__++;
+	mtx->mtxb.ws += dbg_nws__ + 1;
+    }
+#endif
+
+    act = ethr_atomic32_read(&mtx->mtxb.flgs);
+    ETHR_ASSERT(act == 0
+		|| act == ETHR_RWMTX_W_FLG__
+		|| act == (ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__));
+    if (act & ETHR_RWMTX_W_FLG__) {
+	/* The normal sane case */
+	if (!(act & ETHR_RWMTX_W_WAIT_FLG__)) {
+	    ETHR_ASSERT(!mtx->mtxb.q);
+	    act = ethr_atomic32_cmpxchg(&mtx->mtxb.flgs,
+					(ETHR_RWMTX_W_FLG__
+					 | ETHR_RWMTX_W_WAIT_FLG__),
+					ETHR_RWMTX_W_FLG__);
+	    if (act != ETHR_RWMTX_W_FLG__) {
+		/*
+		 * Sigh... this wasn't so sane after all since, the mutex was
+		 * obviously not locked by the current thread....
+		 */
+		ETHR_ASSERT(act == 0);
+		goto mtx_unlocked;
+	    }
+	}
+
+#ifdef ETHR_DEBUG
+	if (act & ETHR_RWMTX_W_WAIT_FLG__)
+	    ETHR_ASSERT(mtx->mtxb.q);
+	else
+	    ETHR_ASSERT(!mtx->mtxb.q);
+#endif
+
+	enqueue(&mtx->mtxb.q, tse_start, tse_end);
+
+	ETHR_MTX_HARD_DEBUG_CHK_Q(mtx);
+	ETHR_MTX_Q_UNLOCK(&mtx->mtxb.qlck);
+
+    }
+    else {
+	int multi;
+    mtx_unlocked:
+	/* Sigh... mutex isn't locked... */
+
+	multi = tse_start != tse_end;
+
+	while (1) {
+	    ethr_sint32_t new, exp = act;
+
+	    if (multi || (act & ETHR_RWMTX_W_FLG__))
+		new = ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__;
+	    else
+		new = ETHR_RWMTX_W_FLG__;
+
+	    act = ethr_atomic32_cmpxchg(&mtx->mtxb.flgs, new, exp);
+	    if (exp == act) {
+		ETHR_ASSERT(!mtx->mtxb.q);
+		if (act & ETHR_RWMTX_W_FLG__) {
+		    enqueue(&mtx->mtxb.q, tse_start, tse_end);
+
+		    ETHR_MTX_HARD_DEBUG_CHK_Q(mtx);
+		    ETHR_MTX_Q_UNLOCK(&mtx->mtxb.qlck);
+
+		}
+		else {
+		    ETHR_ASSERT(!mtx->mtxb.q);
+		    /*
+		     * Acquired the mutex on behalf of the
+		     * first thread in the queue; wake
+		     * it and enqueue the rest...
+		     */
+#ifdef ETHR_MTX_HARD_DEBUG_WSQ
+		    mtx->mtxb.ws--;
+#endif
+		    if (multi) {
+			enqueue(&mtx->mtxb.q, tse_start->next, tse_end);
+			ETHR_ASSERT(mtx->mtxb.q);
+		    }
+
+		    ETHR_MTX_HARD_DEBUG_CHK_Q(mtx);
+		    ETHR_MTX_Q_UNLOCK(&mtx->mtxb.qlck);
+
+		    ethr_atomic32_set(&tse_start->uaflgs, 0);
+		    ethr_event_set(&tse_start->event);
+		}
+		break;
+	    }
+	}
+    }
+}
+
+int
+ethr_cond_init_opt(ethr_cond *cnd, ethr_cond_opt *opt)
+{
+#if ETHR_XCHK
+    if (!cnd) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+    cnd->initialized = ETHR_COND_INITIALIZED;
+#endif
+    ETHR_MTX_HARD_DEBUG_FENCE_INIT(cnd);
+    cnd->q = NULL;
+    if (no_spin) {
+	cnd->main_scnt = 0;
+	cnd->aux_scnt = 0;
+    }
+    else {
+	if (!opt || opt->main_spincount < 0)
+	    cnd->main_scnt = default_cnd_main_spincount;
+	else if (opt->main_spincount > SHRT_MAX)
+	    cnd->main_scnt = SHRT_MAX;
+	else
+	    cnd->main_scnt = (short) opt->main_spincount;
+	if (!opt || opt->aux_spincount < 0)
+	    cnd->aux_scnt = default_cnd_aux_spincount;
+	else if (opt->aux_spincount > SHRT_MAX)
+	    cnd->aux_scnt = SHRT_MAX;
+	else
+	    cnd->aux_scnt = (short) opt->aux_spincount;
+	if (cnd->main_scnt < cnd->aux_scnt)
+	    cnd->main_scnt = cnd->aux_scnt;
+    }
+    ETHR_MTX_QLOCK_INIT(&cnd->qlck);
+    return 0;
+}
+
+int
+ethr_cond_init(ethr_cond *cnd)
+{
+    return ethr_cond_init_opt(cnd, NULL);
+}
+
+int
+ethr_cond_destroy(ethr_cond *cnd)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!cnd || cnd->initialized != ETHR_COND_INITIALIZED) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+    cnd->initialized = 0;
+#endif
+    return ETHR_MTX_QLOCK_DESTROY(&cnd->qlck);
+}
+
+void
+ethr_cond_signal(ethr_cond *cnd)
+{
+    ethr_ts_event *tse;
+
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(cnd);
+    ETHR_ASSERT(cnd->initialized == ETHR_COND_INITIALIZED);
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd);
+
+    ETHR_MTX_Q_LOCK(&cnd->qlck);
+
+    tse = cnd->q;
+
+    if (!tse) {
+	ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd);
+	ETHR_MTX_Q_UNLOCK(&cnd->qlck);
+    }
+    else {
+	ethr_mutex *mtx = (ethr_mutex *) tse->udata;
+
+	ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+	ETHR_ASSERT(tse->uflgs == ETHR_RWMTX_W_WAIT_FLG__);
+	ETHR_ASSERT(ethr_atomic32_read(&tse->uaflgs) == ETHR_CND_WAIT_FLG__);
+
+	ethr_atomic32_set(&tse->uaflgs, ETHR_RWMTX_W_WAIT_FLG__);
+
+	dequeue(&cnd->q, tse, tse);
+
+	ETHR_MTX_Q_UNLOCK(&cnd->qlck);
+
+	tse->next = tse->prev = NULL;
+
+	enqueue_mtx(mtx, tse, tse);
+
+	ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd);
+	ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    }
+}
+
+void
+ethr_cond_broadcast(ethr_cond *cnd)
+{
+    int got_all;
+    ethr_ts_event *tse;
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(cnd);
+    ETHR_ASSERT(cnd->initialized == ETHR_COND_INITIALIZED);
+
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd);
+    do {
+	got_all = 1;
+
+	ETHR_MTX_Q_LOCK(&cnd->qlck);
+
+	tse = cnd->q;
+
+	if (!tse) {
+	    ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd);
+	    ETHR_MTX_Q_UNLOCK(&cnd->qlck);
+	}
+	else {
+	    ethr_mutex *mtx = (ethr_mutex *) tse->udata;
+	    ethr_ts_event *tse_tmp, *tse_end;
+
+	    ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+	    tse_end = cnd->q->prev;
+
+	    tse_tmp = tse;
+
+	    do {
+
+		if (mtx == (ethr_mutex *) tse_tmp->udata) {
+		    /* The normal case */
+
+		    ETHR_ASSERT(tse_tmp->uflgs == ETHR_RWMTX_W_WAIT_FLG__);
+		    ETHR_ASSERT(ethr_atomic32_read(&tse_tmp->uaflgs)
+				== ETHR_CND_WAIT_FLG__);
+
+		    ethr_atomic32_set(&tse_tmp->uaflgs,
+				      ETHR_RWMTX_W_WAIT_FLG__);
+		}
+		else {
+		    /* Should be very unusual */
+		    ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+		    tse_end = tse_tmp->prev;
+		    got_all = 0;
+		    break;
+		}
+
+		tse_tmp = tse_tmp->next;
+
+	    } while (tse_tmp != cnd->q);
+
+	    dequeue(&cnd->q, tse, tse_end);
+
+	    ETHR_MTX_Q_UNLOCK(&cnd->qlck);
+
+	    enqueue_mtx(mtx, tse, tse_end);
+	}
+
+    } while (!got_all);
+
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd);
+}
+
+int
+ethr_cond_wait(ethr_cond *cnd, ethr_mutex *mtx)
+{
+    int woken;
+    int scnt;
+    void *udata = NULL;
+    ethr_ts_event *tse;
+
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(cnd);
+    ETHR_ASSERT(cnd->initialized == ETHR_COND_INITIALIZED);
+    ETHR_ASSERT(mtx);
+    ETHR_ASSERT(mtx->initialized == ETHR_MUTEX_INITIALIZED);
+
+    tse = ethr_get_ts_event();
+
+    scnt = ((tse->iflgs & ETHR_TS_EV_MAIN_THR)
+	    ? cnd->main_scnt
+	    : cnd->aux_scnt);
+
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd);
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+
+    udata = tse->udata; /* Got to restore udata before returning */
+    tse->udata = (void *) mtx;
+
+    tse->uflgs = ETHR_RWMTX_W_WAIT_FLG__; /* Prep for mutex lock op */
+    ethr_atomic32_set(&tse->uaflgs, ETHR_CND_WAIT_FLG__);
+
+    ETHR_MTX_Q_LOCK(&cnd->qlck);
+
+    enqueue(&cnd->q, tse, tse);
+
+    ETHR_MTX_Q_UNLOCK(&cnd->qlck);
+
+    ethr_mutex_unlock(mtx);
+
+    /* Wait */
+    woken = 0;
+    while (1) {
+	ethr_sint32_t act;
+
+	ethr_event_reset(&tse->event);
+
+	act = ethr_atomic32_read_acqb(&tse->uaflgs);
+	if (!act)
+	    break; /* Mtx locked */
+
+	/* First time, got EINTR, or spurious wakeup... */
+
+	ETHR_ASSERT(act == ETHR_CND_WAIT_FLG__
+		    || act == ETHR_RWMTX_W_WAIT_FLG__);
+
+	if (woken) {
+	    /*
+	     * If act == ETHR_RWMTX_W_WAIT_FLG__, we have already been enqueued
+	     * on the mutex; continue wait until locked...
+	     */
+	    if (act == ETHR_CND_WAIT_FLG__) {
+		ETHR_MTX_Q_LOCK(&cnd->qlck);
+		act = ethr_atomic32_read(&tse->uaflgs);
+		ETHR_ASSERT(act == ETHR_CND_WAIT_FLG__
+			    || act == ETHR_RWMTX_W_WAIT_FLG__);
+		/*
+		 * If act == ETHR_RWMTX_W_WAIT_FLG__, we have already
+		 * enqueued on the mutex; continue wait until locked...
+		 */
+		if (act == ETHR_CND_WAIT_FLG__)
+		    dequeue(&cnd->q, tse, tse);
+
+		ETHR_MTX_Q_UNLOCK(&cnd->qlck);
+
+		if (act == ETHR_CND_WAIT_FLG__) {
+		    tse->udata = udata;
+		    ethr_leave_ts_event(tse);
+		    ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd);
+		    ethr_mutex_lock(mtx);
+		    return EINTR;
+		}
+	    }
+	    ETHR_ASSERT(act == ETHR_RWMTX_W_WAIT_FLG__);
+	}
+	ethr_event_swait(&tse->event, scnt);
+	/* swait result: 0 || EINTR */
+	woken = 1;
+    }
+
+    ETHR_MTX_HARD_DEBUG_LFS_RWLOCK(&mtx->mtxb);
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd);
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_CHK_EXCL_SET_EXCL(&mtx->mtxb);
+    tse->udata = udata;
+    ethr_leave_ts_event(tse);
+    return 0;
+}
+
+#else
+/* -- pthread mutex and condition variables -------------------------------- */
+
+int
+ethr_mutex_init(ethr_mutex *mtx)
+{
+#if ETHR_XCHK
+    if (!mtx) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+    mtx->initialized = ETHR_MUTEX_INITIALIZED;
+#endif
+    return pthread_mutex_init(&mtx->pt_mtx, NULL);
+}
+
+int
+ethr_mutex_destroy(ethr_mutex *mtx)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!mtx || mtx->initialized != ETHR_MUTEX_INITIALIZED) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+#if ETHR_XCHK
+    mtx->initialized = 0;
+#endif
+    return pthread_mutex_destroy(&mtx->pt_mtx);
+}
+
+int
+ethr_cond_init(ethr_cond *cnd)
+{
+#if ETHR_XCHK
+    if (!cnd) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+    cnd->initialized = ETHR_COND_INITIALIZED;
+#endif
+    return pthread_cond_init(&cnd->pt_cnd, NULL);
+}
+
+int
+ethr_cond_destroy(ethr_cond *cnd)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!cnd || cnd->initialized != ETHR_COND_INITIALIZED) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+    cnd->initialized = 0;
+#endif
+    return pthread_cond_destroy(&cnd->pt_cnd);
+}
+
+void
+ethr_cond_signal(ethr_cond *cnd)
+{
+    int res;
+
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(cnd);
+    ETHR_ASSERT(cnd->initialized == ETHR_COND_INITIALIZED);
+
+    res = pthread_cond_signal(&cnd->pt_cnd);
+    if (res != 0)
+	ETHR_FATAL_ERROR__(res);
+}
+
+void
+ethr_cond_broadcast(ethr_cond *cnd)
+{
+    int res;
+
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(cnd);
+    ETHR_ASSERT(cnd->initialized == ETHR_COND_INITIALIZED);
+
+    res = pthread_cond_broadcast(&cnd->pt_cnd);
+    if (res != 0)
+	ETHR_FATAL_ERROR__(res);
+}
+
+int
+ethr_cond_wait(ethr_cond *cnd, ethr_mutex *mtx)
+{
+    int res;
+
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(cnd);
+    ETHR_ASSERT(cnd->initialized == ETHR_COND_INITIALIZED);
+    ETHR_ASSERT(mtx);
+    ETHR_ASSERT(mtx->initialized == ETHR_MUTEX_INITIALIZED);
+
+    res = pthread_cond_wait(&cnd->pt_cnd, &mtx->pt_mtx);
+    if (res != 0 && res != EINTR)
+	ETHR_FATAL_ERROR__(res);
+    return res;
+}
+
+#endif /* pthread_mutex */
+
+/* -- Exported symbols of inline functions --------------------------------- */
+
+int
+ethr_mutex_trylock(ethr_mutex *mtx)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(mtx);
+    ETHR_ASSERT(mtx->initialized == ETHR_MUTEX_INITIALIZED);
+
+    return ethr_mutex_trylock__(mtx);
+}
+
+void
+ethr_mutex_lock(ethr_mutex *mtx)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(mtx);
+    ETHR_ASSERT(mtx->initialized == ETHR_MUTEX_INITIALIZED);
+
+    ethr_mutex_lock__(mtx);
+}
+
+void
+ethr_mutex_unlock(ethr_mutex *mtx)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(mtx);
+    ETHR_ASSERT(mtx->initialized == ETHR_MUTEX_INITIALIZED);
+
+    ethr_mutex_unlock__(mtx);
+}
+
+
+#ifdef ETHR_USE_OWN_RWMTX_IMPL__
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
+ * Read/Write Mutex                                                          *
+\*                                                                           */
+
+static void
+wake_readers(ethr_rwmutex *rwmtx, int rs)
+{
+    ethr_ts_event *tse;
+#ifdef ETHR_DEBUG
+    int drs = 0;
+#endif
+
+    tse = rwmtx->mtxb.q;
+    ETHR_ASSERT(tse);
+    ETHR_ASSERT(rwmtx->rq_end);
+    dequeue(&rwmtx->mtxb.q, tse, rwmtx->rq_end);
+    rwmtx->rq_end->next = NULL;
+    rwmtx->rq_end = NULL;
+
+    ETHR_ASSERT(!rwmtx->mtxb.q
+		|| (ethr_atomic32_read(&rwmtx->mtxb.q->uaflgs)
+		    == ETHR_RWMTX_W_WAIT_FLG__));
+
+    ETHR_RWMTX_HARD_DEBUG_CHK_Q(rwmtx);
+    ETHR_MTX_Q_UNLOCK(&rwmtx->mtxb.qlck);
+
+    while (tse) {
+	ethr_ts_event *tse_next;
+
+#ifdef ETHR_DEBUG
+	ETHR_ASSERT(tse->uflgs == ETHR_RWMTX_R_WAIT_FLG__);
+	ETHR_ASSERT(ethr_atomic32_read(&tse->uaflgs)
+		    == ETHR_RWMTX_R_WAIT_FLG__);
+	drs++;
+#endif
+
+	tse_next = tse->next; /* we aren't allowed to read tse->next
+				 after we have reset uaflgs */
+
+	ethr_atomic32_set(&tse->uaflgs, 0);
+	ethr_event_set(&tse->event);
+	tse = tse_next;
+    }
+
+    ETHR_ASSERT(rs == drs);
+}
+
+static ETHR_INLINE int
+is_w_waiter(ethr_ts_event *tse)
+{
+    ETHR_ASSERT(tse->uflgs == ETHR_RWMTX_W_WAIT_FLG__
+		|| tse->uflgs == ETHR_RWMTX_R_WAIT_FLG__);
+    return tse->uflgs == ETHR_RWMTX_W_WAIT_FLG__;
+}
+
+static ETHR_INLINE int
+multiple_w_waiters(ethr_rwmutex *rwmtx)
+{
+    ETHR_ASSERT(rwmtx->mtxb.q);
+    ETHR_ASSERT(rwmtx->mtxb.q->uflgs == ETHR_RWMTX_W_WAIT_FLG__);
+
+    if (!rwmtx->rq_end)
+	return rwmtx->mtxb.q->next != rwmtx->mtxb.q;
+    else {
+	ETHR_ASSERT(rwmtx->mtxb.q->next != rwmtx->mtxb.q);
+	if (rwmtx->mtxb.q->next->uflgs == ETHR_RWMTX_W_WAIT_FLG__)
+	    return 1;
+	ETHR_ASSERT(rwmtx->rq_end->next == rwmtx->mtxb.q
+		    || rwmtx->rq_end->next->uflgs == ETHR_RWMTX_W_WAIT_FLG__);
+	return rwmtx->rq_end->next != rwmtx->mtxb.q;
+    }
+}
+
+int check_readers_array(ethr_rwmutex *rwmtx,
+			int start_rix,
+			int length)
+{
+    int ix = start_rix;
+
+    ETHR_MEMORY_BARRIER;
+
+    do {
+	ethr_sint32_t act = rwmutex_freqread_rdrs_read(rwmtx, ix);
+	if (act != 0)
+	    return EBUSY;
+	ix++;
+	if (ix == length)
+	    ix = 0;
+    } while (ix != start_rix);
+
+    return 0;
+}
+
+static void
+rwmutex_freqread_rdrs_dec_chk_wakeup(ethr_rwmutex *rwmtx,
+				     ethr_ts_event *tse,
+				     ethr_sint32_t initial)
+{
+    ethr_sint32_t act = initial;
+
+    if ((act & (ETHR_RWMTX_W_FLG__|
+		ETHR_RWMTX_R_ABRT_UNLCK_FLG__)) == 0) {
+	if ((act & ETHR_RWMTX_WAIT_FLGS__) == 0) {
+	    if (act & ETHR_RWMTX_R_PEND_UNLCK_MASK__) {
+		/*
+		 * We *need* to try to complete the runlock.
+		 * A writer that just enqueued (not seen by us
+		 * in flag field) may depend on someone else
+		 * completing the runlock. We just took over
+		 * that responsibilty since we modified reader
+		 * groups.
+		 */
+		rwmutex_try_complete_runlock(rwmtx, act, tse, 1, 0, 0);
+	    }
+	}
+	else if ((act & ETHR_RWMTX_WAIT_FLGS__) == ETHR_RWMTX_R_WAIT_FLG__)
+	    rwmutex_transfer_read_lock(rwmtx, act, 0);
+	else if ((act & ETHR_RWMTX_WAIT_FLGS__) == ETHR_RWMTX_W_WAIT_FLG__)
+	    rwmutex_try_complete_runlock(rwmtx, act, tse, 1, 0, 0);
+	else {
+	    /*
+	     * Don't know if we got readers or writers
+	     * first in queue; need to peek
+	     */
+	    ETHR_MTX_Q_LOCK(&rwmtx->mtxb.qlck);
+	    if (!rwmtx->mtxb.q)
+		ETHR_MTX_Q_UNLOCK(&rwmtx->mtxb.qlck);
+	    else if (is_w_waiter(rwmtx->mtxb.q)) {
+		act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+		ETHR_MTX_Q_UNLOCK(&rwmtx->mtxb.qlck);
+		if ((act & ETHR_RWMTX_W_FLG__) == 0)
+		    rwmutex_try_complete_runlock(rwmtx, act, tse, 1, 0, 0);
+	    }
+	    else {
+		/*
+		 * rwmutex_transfer_read_lock() will
+		 * unlock Q lock.
+		 */
+		act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+		if (act & ETHR_RWMTX_W_FLG__)
+		    ETHR_MTX_Q_UNLOCK(&rwmtx->mtxb.qlck);
+		else
+		    rwmutex_transfer_read_lock(rwmtx, act, 1);
+	    }
+	}
+    }
+}
+
+static void
+rwmutex_freqread_restore_failed_tryrlock(ethr_rwmutex *rwmtx,
+					 ethr_ts_event *tse)
+{
+    ethr_sint32_t act;
+    /*
+     * Restore failed increment
+     */
+    act = rwmutex_freqread_rdrs_dec_read(rwmtx, tse);
+
+    ETHR_MEMORY_BARRIER;
+
+    if (act == 0) {
+	act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+	rwmutex_freqread_rdrs_dec_chk_wakeup(rwmtx, tse, act);
+    }
+}
+
+static int
+rwmutex_try_complete_runlock(ethr_rwmutex *rwmtx,
+			     ethr_sint32_t initial,
+			     ethr_ts_event *tse,
+			     int start_next_ix,
+			     int check_before_try,
+			     int try_write_lock)
+{
+    ethr_ts_event *tse_tmp;
+    ethr_sint32_t act = initial;
+    int six, res, length;
+
+    ETHR_ASSERT((act & ETHR_RWMTX_W_FLG__) == 0);
+
+    if (act & ETHR_RWMTX_R_ABRT_UNLCK_FLG__)
+	return try_write_lock ? EBUSY : 0;
+
+    tse_tmp = tse;
+    if (!tse_tmp)
+	tse_tmp = ethr_get_ts_event();
+
+    if ((act & ETHR_RWMTX_WAIT_FLGS__) && (act & ~ETHR_RWMTX_WAIT_FLGS__) == 0)
+	goto check_waiters;
+
+    if (rwmtx->type == ETHR_RWMUTEX_TYPE_FREQUENT_READ) {
+	length = reader_groups_array_size;
+	six = tse_tmp->rgix;
+    }
+    else {
+	length = main_threads_array_size;
+	six = tse_tmp->mtix;
+    }
+    if (start_next_ix) {
+	six++;
+	if (six >= length)
+	    six = 0;
+    }
+
+    if (!tse)
+	ethr_leave_ts_event(tse_tmp);
+
+    if (check_before_try) {
+	res = check_readers_array(rwmtx, six, length);
+
+	ETHR_MEMORY_BARRIER;
+
+	if (res == EBUSY)
+	    return try_write_lock ? EBUSY : 0;
+    }
+
+ restart:
+
+    while (1) {
+	ethr_sint32_t exp = act;
+	ethr_sint32_t new = act+1;
+
+	ETHR_ASSERT((act & ETHR_RWMTX_R_ABRT_UNLCK_FLG__) == 0);
+
+	ETHR_ASSERT((act & ETHR_RWMTX_R_PEND_UNLCK_MASK__)
+		    < ETHR_RWMTX_R_PEND_UNLCK_MASK__);
+
+	act = ethr_atomic32_cmpxchg(&rwmtx->mtxb.flgs, new, exp);
+	if (exp == act) {
+	    act = new;
+	    break;
+	}
+
+	if (!try_write_lock) {
+	    if (act == 0 || (act & (ETHR_RWMTX_W_FLG__
+				    | ETHR_RWMTX_R_ABRT_UNLCK_FLG__)))
+		return 0;
+	    if ((act & ETHR_RWMTX_WAIT_FLGS__) == 0) {
+		if ((act & ETHR_RWMTX_R_FLG__) == 0)
+		    return 0;
+	    }
+	    else if ((act & ETHR_RWMTX_R_FLG__) == 0) {
+		if (act & ETHR_RWMTX_R_PEND_UNLCK_MASK__)
+		    return 0;
+		goto check_waiters;
+	    }
+	}
+	else {
+	    if (act == 0)
+		goto tryrwlock;
+	    if (act & (ETHR_RWMTX_W_FLG__
+		       | ETHR_RWMTX_R_ABRT_UNLCK_FLG__))
+		return EBUSY;
+	}
+    }
+
+    res = check_readers_array(rwmtx, six, length);
+
+    ETHR_MEMORY_BARRIER;
+
+    ETHR_ASSERT((act & ETHR_RWMTX_W_FLG__) == 0);
+
+    while (1) {
+	int finished_abort = 0;
+	ethr_sint32_t exp = act;
+	ethr_sint32_t new = act;
+
+	new--;
+	if (act & ETHR_RWMTX_R_ABRT_UNLCK_FLG__) {
+	    if ((new & ETHR_RWMTX_R_PEND_UNLCK_MASK__) == 0) {
+		new &= ~ETHR_RWMTX_R_ABRT_UNLCK_FLG__;
+		finished_abort = 1;
+	    }
+	    ETHR_ASSERT(act & ETHR_RWMTX_R_FLG__);
+	}
+	else if ((act & ETHR_RWMTX_R_FLG__) && res != EBUSY) {
+	    new &= ~ETHR_RWMTX_R_FLG__;
+	}
+
+	ETHR_ASSERT(act & ETHR_RWMTX_R_PEND_UNLCK_MASK__);
+
+	act = ethr_atomic32_cmpxchg(&rwmtx->mtxb.flgs, new, exp);
+	if (exp == act) {
+	    act = new;
+	    if (act & ETHR_RWMTX_W_FLG__)
+		return try_write_lock ? EBUSY : 0;
+	    if (finished_abort && (act & ETHR_RWMTX_WAIT_FLGS__))
+		goto restart;
+	    if (act & (ETHR_RWMTX_R_FLG__
+		       | ETHR_RWMTX_R_ABRT_UNLCK_FLG__
+		       | ETHR_RWMTX_R_PEND_UNLCK_MASK__))
+		return try_write_lock ? EBUSY : 0;
+	    /* Read unlock completed */
+	    break;
+	}
+    }
+
+    /*
+     * Read unlock completed, but we have to check if
+     * threads have to be woken (or if we should try
+     * to write lock it).
+     */
+
+    if (act & ETHR_RWMTX_WAIT_FLGS__) {
+    check_waiters:
+	rwmutex_unlock_wake(rwmtx, 0, act, 0);
+	return try_write_lock ? EBUSY : 0;
+    }
+
+    if (!try_write_lock)
+	return 0;
+
+ tryrwlock:
+    /* Try to write lock it */
+
+    act = ethr_atomic32_cmpxchg_acqb(&rwmtx->mtxb.flgs,
+				     ETHR_RWMTX_W_FLG__,
+				     0);
+    return act == 0 ? 0 : EBUSY;
+}
+
+#ifdef ETHR_RLOCK_WITH_INC_DEC
+
+static ETHR_INLINE void
+rwmutex_incdec_restore_failed_tryrlock(ethr_rwmutex *rwmtx)
+{
+    ethr_sint32_t act;
+    /*
+     * Restore failed increment
+     */
+    act = ethr_atomic32_dec_read(&rwmtx->mtxb.flgs);
+    if ((act & ETHR_RWMTX_WAIT_FLGS__)
+	&& (act & ~ETHR_RWMTX_WAIT_FLGS__) == 0) {
+	rwmutex_unlock_wake(rwmtx, 0, act, 0);
+    }
+}
+
+#endif
+
+static void
+rwmutex_normal_rlock_wait(ethr_rwmutex *rwmtx, ethr_sint32_t initial)
+{
+    ethr_sint32_t act = initial, exp;
+    int scnt, start_scnt;
+    ethr_ts_event *tse = NULL;
+    int until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+
+    start_scnt = scnt = initial_spincount(&rwmtx->mtxb);
+
+    /*
+     * Spin trying to read lock for a while. If unsuccessful,
+     * wait on event.
+     */
+
+    while (1) {
+
+#ifdef ETHR_RLOCK_WITH_INC_DEC
+	rwmutex_incdec_restore_failed_tryrlock(rwmtx);
+	act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+#endif
+
+	while (act & (ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__)) {
+	    if (scnt <= 0) {
+		tse = ethr_get_ts_event();
+		if (update_spincount(&rwmtx->mtxb, tse, &start_scnt, &scnt)) {
+		    event_wait(&rwmtx->mtxb, tse, scnt,
+			       ETHR_RWMTX_R_WAIT_FLG__, 1, 0);
+		    goto done;
+		}
+	    }
+	    ETHR_SPIN_BODY;
+	    if (--until_yield == 0) {
+		until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+		ETHR_YIELD();
+	    }
+	    act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+	    scnt--;
+	}
+	exp = act;
+
+#ifdef ETHR_RLOCK_WITH_INC_DEC
+	act = ethr_atomic32_inc_read(&rwmtx->mtxb.flgs);
+	if ((act & (ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__)) == 0)
+	    goto done; /* Got it */
+#else
+	act = ethr_atomic32_cmpxchg_acqb(&rwmtx->mtxb.flgs, exp+1, exp);
+	if (act == exp)
+	    goto done; /* Got it */
+#endif
+    }
+
+ done:
+    if (tse)
+	ethr_leave_ts_event(tse);
+}
+
+static void
+rwmutex_freqread_rlock_wait(ethr_rwmutex *rwmtx,
+			    ethr_ts_event *tse);
+
+static int
+rwmutex_freqread_rlock(ethr_rwmutex *rwmtx, ethr_ts_event *tse, int trylock)
+{
+    int res = 0;
+    ethr_sint32_t act;
+
+    rwmutex_freqread_rdrs_inc(rwmtx, tse);
+
+    ETHR_MEMORY_BARRIER;
+
+    act = ethr_atomic32_read_acqb(&rwmtx->mtxb.flgs);
+
+    if (act != ETHR_RWMTX_R_FLG__) {
+	int wake_other_readers;
+
+	while (1) {
+	    ethr_sint32_t exp, new;
+
+	    wake_other_readers = 0;
+
+	    if (act == 0)
+		new = act | ETHR_RWMTX_R_FLG__;
+	    else if (act == ETHR_RWMTX_R_FLG__)
+		break; /* Got it */
+	    else if (act & (ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__)) {
+		rwmutex_freqread_restore_failed_tryrlock(rwmtx, tse);
+		if (trylock)
+		    res = EBUSY;
+		else
+		    rwmutex_freqread_rlock_wait(rwmtx, tse);
+		break;
+	    }
+	    else if (act & ETHR_RWMTX_R_ABRT_UNLCK_FLG__) {
+		if ((act & ETHR_RWMTX_R_FLG__) == 0)
+		    ETHR_FATAL_ERROR__(EFAULT);
+		/*
+		 * An aborted runlock, not write locked, and no write
+		 * waiters, i.e., we got it...
+		 */
+		if (act & ETHR_RWMTX_R_WAIT_FLG__)
+		    wake_other_readers = 1;
+		break;
+	    }
+	    else {
+		new = act | ETHR_RWMTX_R_FLG__;
+		if (act & ETHR_RWMTX_R_PEND_UNLCK_MASK__) {
+		    /*
+		     * Someone is doing tryrwlock (no writer and no
+		     * write waiters); we will try to abort that...
+		     */
+		    new |= ETHR_RWMTX_R_ABRT_UNLCK_FLG__;
+		}
+
+		if (act & ETHR_RWMTX_R_WAIT_FLG__)
+		    wake_other_readers = 1;
+	    }
+
+	    exp = act;
+	    act = ethr_atomic32_cmpxchg_acqb(&rwmtx->mtxb.flgs, new, exp);
+	    if (act == exp)
+		break;
+	}
+
+	if (wake_other_readers)
+	    rwmutex_transfer_read_lock(rwmtx, act, 0);
+    }
+
+    return res;
+}
+
+static void
+rwmutex_freqread_rlock_wait(ethr_rwmutex *rwmtx,
+			    ethr_ts_event *tse)
+{
+    ethr_sint32_t act;
+    int scnt, start_scnt;
+    int until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+
+    start_scnt = scnt = initial_spincount(&rwmtx->mtxb);
+
+    /*
+     * Spin trying to read lock for a while. If unsuccessful,
+     * wait on event.
+     */
+
+    while (1) {
+
+	act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+
+	while (act & (ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__)) {
+	    if (scnt <= 0) {
+		if (update_spincount(&rwmtx->mtxb, tse, &start_scnt, &scnt)) {
+		    event_wait(&rwmtx->mtxb, tse, scnt,
+			       ETHR_RWMTX_R_WAIT_FLG__, 1, 1);
+		    return; /* Got it */
+		}
+	    }
+	    ETHR_SPIN_BODY;
+	    if (--until_yield == 0) {
+		until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+		ETHR_YIELD();
+	    }
+	    act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+	    scnt--;
+	}
+
+	if (rwmutex_freqread_rlock(rwmtx, tse, 1) != EBUSY)
+	    break; /* Got it */
+    }
+}
+
+static void
+rwmutex_normal_rwlock_wait(ethr_rwmutex *rwmtx, ethr_sint32_t initial)
+{
+    write_lock_wait(&rwmtx->mtxb, initial, 1, 0);
+}
+
+static void
+rwmutex_freqread_rwlock_wait(ethr_rwmutex *rwmtx, ethr_sint32_t initial)
+{
+    write_lock_wait(&rwmtx->mtxb, initial, 1, 1);
+}
+
+static ETHR_INLINE void
+rwlock_wake_set_flags(ethr_rwmutex *rwmtx,
+		      ethr_sint32_t new_initial,
+		      ethr_sint32_t act_initial)
+{
+    ethr_sint32_t act, act_mask;
+    int chk_abrt_flg;
+
+    ETHR_MEMORY_BARRIER;
+
+    if (rwmtx->type != ETHR_RWMUTEX_TYPE_NORMAL) {
+	/* r pend unlock mask may vary and must be retained */
+	act_mask = ETHR_RWMTX_R_PEND_UNLCK_MASK__;
+	if (new_initial & ETHR_RWMTX_R_FLG__)
+	    chk_abrt_flg = 1;
+	else
+	    chk_abrt_flg = 0;
+    }
+    else {
+#ifdef ETHR_RLOCK_WITH_INC_DEC
+	/* rs mask may vary and must be retained */
+	act_mask = ETHR_RWMTX_RS_MASK__;
+	chk_abrt_flg = 0;
+#else
+	/* rs mask always zero */
+	ETHR_ASSERT((act_initial & ETHR_RWMTX_RS_MASK__) == 0);
+	ethr_atomic32_set(&rwmtx->mtxb.flgs, new_initial);
+	return;
+#endif
+    }
+
+    act = act_initial;
+    while (1) {
+	ethr_sint32_t exp = act;
+	ethr_sint32_t new = new_initial + (act & act_mask);
+	if (chk_abrt_flg && (act & act_mask))
+	    new |= ETHR_RWMTX_R_ABRT_UNLCK_FLG__;
+	act = ethr_atomic32_cmpxchg(&rwmtx->mtxb.flgs, new, exp);
+	if (act == exp)
+	    break;
+	exp = act;
+    }
+}
+
+#ifdef ETHR_DEBUG
+
+static void
+dbg_unlock_wake(ethr_rwmutex *rwmtx,
+		int have_w,
+		ethr_ts_event *tse)
+{
+    ethr_sint32_t exp, act, imask;
+
+    exp = have_w ? ETHR_RWMTX_W_FLG__ : 0;
+
+    if (rwmtx->type != ETHR_RWMUTEX_TYPE_NORMAL)
+	imask = ETHR_RWMTX_R_PEND_UNLCK_MASK__;
+    else {
+#ifdef ETHR_RLOCK_WITH_INC_DEC
+	imask = ETHR_RWMTX_RS_MASK__;
+#else
+	imask = 0;
+#endif
+    }
+
+    ETHR_ASSERT(tse);
+
+    if (is_w_waiter(tse)) {
+
+	exp |= ETHR_RWMTX_W_WAIT_FLG__;
+	if (rwmtx->rq_end) {
+	    exp |= ETHR_RWMTX_R_WAIT_FLG__;
+	}
+	act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+	ETHR_ASSERT((exp & ~imask) == (act & ~imask));
+
+	ETHR_RWMTX_HARD_DEBUG_CHK_Q(rwmtx);
+
+    }
+    else {
+
+	exp |= ETHR_RWMTX_R_WAIT_FLG__;
+	if (rwmtx->rq_end->next != rwmtx->mtxb.q)
+	    exp |= ETHR_RWMTX_W_WAIT_FLG__;
+	else if (exp == ETHR_RWMTX_R_WAIT_FLG__) {
+	    if (!have_w) {
+		if (rwmtx->type != ETHR_RWMUTEX_TYPE_NORMAL)
+		    imask |= ETHR_RWMTX_R_FLG__;
+		else
+		    imask |= ETHR_RWMTX_RS_MASK__;
+	    }
+	}
+	act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+	ETHR_ASSERT((exp & ~imask) == (act & ~imask));
+
+	ETHR_RWMTX_HARD_DEBUG_CHK_Q(rwmtx);
+
+    }
+}
+
+#endif
+
+static void
+rwmutex_transfer_read_lock(ethr_rwmutex *rwmtx,
+			   ethr_sint32_t initial,
+			   int q_locked)
+{
+    ethr_sint32_t act = initial;
+
+    if (!q_locked) {
+	ethr_ts_event *tse;
+	ETHR_ASSERT(initial & ETHR_RWMTX_R_WAIT_FLG__);
+	ETHR_ASSERT((initial & ETHR_RWMTX_W_FLG__) == 0);
+	ETHR_MTX_Q_LOCK(&rwmtx->mtxb.qlck);
+
+	act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+	tse = rwmtx->mtxb.q;
+	if ((act & ETHR_RWMTX_W_FLG__) || !tse || is_w_waiter(tse)) {
+	    /* Someone else woke the readers up... */
+	    ETHR_MTX_Q_UNLOCK(&rwmtx->mtxb.qlck);
+	    return;
+	}
+    }
+
+    rwmutex_unlock_wake(rwmtx, 0, initial, 1);
+}
+
+static void
+rwmutex_unlock_wake(ethr_rwmutex *rwmtx, int have_w, ethr_sint32_t initial,
+		    int transfer_read_lock)
+{
+    ethr_sint32_t new, act = initial;
+    ethr_ts_event *tse;
+
+    if (transfer_read_lock) {
+	/*
+	 * - Q already locked
+	 * - Got R waiters first in Q
+	 * - Not W locked
+	 */
+	tse = rwmtx->mtxb.q;
+
+	ETHR_ASSERT(act & ETHR_RWMTX_R_WAIT_FLG__);
+	ETHR_ASSERT((act & (ETHR_RWMTX_W_FLG__)) == 0);
+	ETHR_ASSERT(tse && !is_w_waiter(tse));
+    }
+    else {
+
+	if ((act & ETHR_RWMTX_WAIT_FLGS__) == 0) {
+	    if (!have_w)
+		return;
+	    else {
+		while ((act & ETHR_RWMTX_WAIT_FLGS__) == 0) {
+		    ethr_sint32_t exp = act;
+		    new = exp & ~ETHR_RWMTX_W_FLG__;
+		    act = ethr_atomic32_cmpxchg(&rwmtx->mtxb.flgs, new, exp);
+		    if (act == exp)
+			return;
+		}
+	    }
+	}
+
+	ETHR_MTX_Q_LOCK(&rwmtx->mtxb.qlck);
+	tse = rwmtx->mtxb.q;
+
+	if (!have_w) {
+	    if (!tse) {
+#ifdef ETHR_DEBUG
+		act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+		ETHR_ASSERT((act & ETHR_RWMTX_WAIT_FLGS__) == 0);
+#endif
+		goto already_served;
+	    }
+	    act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+	    if (act == (ETHR_RWMTX_R_WAIT_FLG__|ETHR_RWMTX_R_FLG__)) {
+		ETHR_ASSERT(tse && !is_w_waiter(tse));
+	    }
+	    else if (act & ~ETHR_RWMTX_WAIT_FLGS__) {
+	    already_served:
+		ETHR_MTX_Q_UNLOCK(&rwmtx->mtxb.qlck);
+		return;
+	    }
+	}
+    }
+
+#ifdef ETHR_DEBUG
+    dbg_unlock_wake(rwmtx, have_w, tse);
+#endif
+
+    if (is_w_waiter(tse)) {
+
+	if (!have_w) {
+	    act = ethr_atomic32_read_bor(&rwmtx->mtxb.flgs,
+				       ETHR_RWMTX_W_FLG__);
+	    ETHR_ASSERT((act & ~(ETHR_RWMTX_WAIT_FLGS__
+				 | (rwmtx->type == ETHR_RWMUTEX_TYPE_NORMAL
+				    ? 0
+				    : ETHR_RWMTX_R_PEND_UNLCK_MASK__))) == 0);
+	    ETHR_ASSERT(act & ETHR_RWMTX_W_WAIT_FLG__);
+	    act |= ETHR_RWMTX_W_FLG__;
+	}
+
+	/*
+	 * If we have multiple write waiters, there
+	 * is no need to modify mtxb->flgs; otherwise,
+	 * we need to clear the write wait bit...
+	 */
+	if (!multiple_w_waiters(rwmtx)) {
+	    new = ETHR_RWMTX_W_FLG__;
+	    if (tse->next != rwmtx->mtxb.q) {
+		ETHR_ASSERT(tse->next->uflgs == ETHR_RWMTX_R_WAIT_FLG__);
+		new |= ETHR_RWMTX_R_WAIT_FLG__;
+	    }
+
+	    rwlock_wake_set_flags(rwmtx, new, act);
+	}
+
+	wake_writer(&rwmtx->mtxb, 1);
+    }
+    else {
+	int rs;
+
+	if (rwmtx->type == ETHR_RWMUTEX_TYPE_NORMAL) {
+	    rs = rwmtx->tdata.rs;
+	    new = (ethr_sint32_t) rs;
+	    rwmtx->tdata.rs = 0;
+	}
+	else {
+	    ethr_rwmutex_type type = rwmtx->type;
+	    int length = (type == ETHR_RWMUTEX_TYPE_FREQUENT_READ
+			  ? reader_groups_array_size
+			  : main_threads_array_size);
+	    int ix;
+
+	    rs = 0;
+	    for (ix = 0; ix < length; ix++) {
+		int wrs = rwmtx->tdata.ra[ix].data.waiting_readers;
+		rwmtx->tdata.ra[ix].data.waiting_readers = 0;
+		ETHR_ASSERT(wrs >= 0);
+		if (wrs) {
+		    rs += wrs;
+		    rwmutex_freqread_rdrs_add(rwmtx, type, ix, wrs);
+		}
+	    }
+
+	    new = ETHR_RWMTX_R_FLG__;
+	}
+
+	if (rwmtx->rq_end->next != rwmtx->mtxb.q)
+	    new |= ETHR_RWMTX_W_WAIT_FLG__;
+
+	rwlock_wake_set_flags(rwmtx, new, act);
+
+	wake_readers(rwmtx, rs);
+    }
+}
+
+static ethr_rwmtx_readers_array__ *
+alloc_readers_array(int length, ethr_rwmutex_lived lived)
+{
+    ethr_rwmtx_readers_array__ *ra;
+    size_t sz;
+    void *mem;
+
+    sz = sizeof(ethr_rwmtx_readers_array__) * (length + 1);
+
+    switch (lived) {
+    case ETHR_RWMUTEX_LONG_LIVED:
+	mem = ethr_mem__.ll.alloc(sz);
+	break;
+    case ETHR_RWMUTEX_SHORT_LIVED:
+	mem = ethr_mem__.sl.alloc(sz);
+	break;
+    default:
+	mem = ethr_mem__.std.alloc(sz);
+	break;
+    }
+    if (!mem)
+	return NULL;
+
+    if ((((ethr_uint_t) mem) & ETHR_CACHE_LINE_MASK) == 0) {
+	ra = (ethr_rwmtx_readers_array__ *) mem;
+	ra->data.byte_offset = 0;
+    }
+    else {
+	ra = ((ethr_rwmtx_readers_array__ *)
+	      ((((ethr_uint_t) mem) & ~ETHR_CACHE_LINE_MASK)
+	       + ETHR_CACHE_LINE_SIZE));
+	ra->data.byte_offset = (int) ((ethr_uint_t) ra
+				      - (ethr_uint_t) mem);
+    }
+    ra->data.lived = lived;
+    return ra;
+}
+
+static void
+free_readers_array(ethr_rwmtx_readers_array__ *ra)
+{
+    void *ptr = (void *) (((char *) ra) - ra->data.byte_offset);
+    switch (ra->data.lived) {
+    case ETHR_RWMUTEX_LONG_LIVED:
+	ethr_mem__.ll.free(ptr);
+	break;
+    case ETHR_RWMUTEX_SHORT_LIVED:
+	ethr_mem__.sl.free(ptr);
+	break;
+    default:
+	ethr_mem__.std.free(ptr);
+	break;
+    }
+}
+
+int
+ethr_rwmutex_init_opt(ethr_rwmutex *rwmtx, ethr_rwmutex_opt *opt)
+{
+    int res;
+    ethr_rwmtx_readers_array__ *ra = NULL;
+#if ETHR_XCHK
+    if (ethr_not_completely_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!rwmtx) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+    rwmtx->initialized = ETHR_RWMUTEX_INITIALIZED;
+#endif
+    ETHR_MTX_HARD_DEBUG_FENCE_INIT(rwmtx);
+    rwmtx->rq_end = NULL;
+    rwmtx->type = opt ? opt->type : ETHR_RWMUTEX_TYPE_NORMAL;
+    switch (rwmtx->type) {
+    case ETHR_RWMUTEX_TYPE_FREQUENT_READ:
+	if (main_threads_array_size <= reader_groups_array_size) {
+	    /* No point using reader groups... */
+	    rwmtx->type = ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ;
+	}
+	/* Fall through */
+    case ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ: {
+	int length;
+
+	length = (rwmtx->type == ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ
+		  ? main_threads_array_size
+		  : reader_groups_array_size);
+
+	if (length == 1) {
+	    /* No point using a frequent reader type... */
+	    rwmtx->type = ETHR_RWMUTEX_TYPE_NORMAL;
+	}
+	else {
+	    int ix;
+	    ra = alloc_readers_array(length,
+				     (opt
+				      ? opt->lived
+				      : ETHR_RWMUTEX_UNKNOWN_LIVED));
+	    if (!ra) {
+		res = ENOMEM;
+		goto error;
+	    }
+
+	    rwmtx->tdata.ra = ra;
+
+	    for (ix = 0; ix < length; ix++) {
+		ethr_atomic32_init(&rwmtx->tdata.ra[ix].data.readers, 0);
+		rwmtx->tdata.ra[ix].data.waiting_readers = 0;
+	    }
+	    break;
+	}
+    }
+    case ETHR_RWMUTEX_TYPE_NORMAL:
+	rwmtx->tdata.rs = 0;
+	break;
+    default:
+	res = EINVAL;
+	goto error;
+    }
+    res = mtxb_init(&rwmtx->mtxb,
+		    default_rwmtx_main_spincount,
+		    opt ? opt->main_spincount : -1,
+		    default_rwmtx_aux_spincount,
+		    opt ? opt->aux_spincount : -1);
+    if (res == 0)
+	return 0;
+
+ error:
+
+    if (ra)
+	free_readers_array(ra);
+
+#if ETHR_XCHK
+    rwmtx->initialized = 0;
+#endif
+    return res;
+}
+
+int
+ethr_rwmutex_init(ethr_rwmutex *rwmtx)
+{
+    return ethr_rwmutex_init_opt(rwmtx, NULL);
+}
+
+int
+ethr_rwmutex_destroy(ethr_rwmutex *rwmtx)
+{
+    int res;
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+    if (rwmtx->type != ETHR_RWMUTEX_TYPE_NORMAL) {
+	ethr_sint32_t act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+	if (act == ETHR_RWMTX_R_FLG__)
+	    rwmutex_try_complete_runlock(rwmtx, act, NULL, 0, 0, 0);
+    }
+    res = mtxb_destroy(&rwmtx->mtxb);
+    if (res != 0)
+	return res;
+    if (rwmtx->type != ETHR_RWMUTEX_TYPE_NORMAL)
+	free_readers_array(rwmtx->tdata.ra);
+#if ETHR_XCHK
+    rwmtx->initialized = 0;
+#endif
+    return 0;
+}
+
+#define ETHR_MAX_TRYRLOCK_TRIES 5
+
+int
+ethr_rwmutex_tryrlock(ethr_rwmutex *rwmtx)
+{
+    int res = 0;
+    ethr_sint32_t act;
+
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
+    switch (rwmtx->type) {
+    case ETHR_RWMUTEX_TYPE_NORMAL: {
+#ifdef ETHR_RLOCK_WITH_INC_DEC
+	act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+	if (act & (ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__))
+	    res = EBUSY;
+	else {
+	    act = ethr_atomic32_inc_read_acqb(&rwmtx->mtxb.flgs);
+	    if (act & (ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__)) {
+		rwmutex_incdec_restore_failed_tryrlock(rwmtx);
+		res = EBUSY;
+	    }
+	}
+#else
+	ethr_sint32_t exp = 0;
+	int tries = 0;
+
+	while (1) {
+	    act = ethr_atomic32_cmpxchg_acqb(&rwmtx->mtxb.flgs, exp+1, exp);
+	    if (act == exp) {
+		res = 0;
+		break;
+	    }
+	    if (tries > ETHR_MAX_TRYRLOCK_TRIES
+		|| (act & (ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__))) {
+		res = EBUSY;
+		break;
+	    }
+	    tries++;
+	    exp = act;
+	}
+#endif
+	break;
+    }
+
+    case ETHR_RWMUTEX_TYPE_FREQUENT_READ:
+    case ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ: {
+	ethr_ts_event *tse = ethr_get_ts_event();
+	res = rwmutex_freqread_rlock(rwmtx, tse, 1);
+	ethr_leave_ts_event(tse);
+	break;
+    }
+    }
+
+#ifdef ETHR_MTX_CHK_EXCL
+    if (res == 0) {
+	ETHR_MTX_CHK_EXCL_SET_NON_EXCL(&rwmtx->mtxb);
+	ETHR_MTX_CHK_EXCL_IS_NOT_EXCL(&rwmtx->mtxb);
+    }
+#endif
+
+    ETHR_MTX_HARD_DEBUG_LFS_TRYRLOCK(&rwmtx->mtxb, res);
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+    return res;
+}
+
+void
+ethr_rwmutex_rlock(ethr_rwmutex *rwmtx)
+{
+    ethr_sint32_t act;
+
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
+    switch (rwmtx->type) {
+    case ETHR_RWMUTEX_TYPE_NORMAL: {
+#ifdef ETHR_RLOCK_WITH_INC_DEC
+	act = ethr_atomic32_inc_read_acqb(&rwmtx->mtxb.flgs);
+	if (act & (ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__))
+	    rwmutex_normal_rlock_wait(rwmtx, act);
+#else
+	ethr_sint32_t exp = 0;
+
+	while (1) {
+	    act = ethr_atomic32_cmpxchg_acqb(&rwmtx->mtxb.flgs, exp+1, exp);
+	    if (act == exp)
+		break;
+
+	    if (act & (ETHR_RWMTX_W_FLG__|ETHR_RWMTX_W_WAIT_FLG__)) {
+		rwmutex_normal_rlock_wait(rwmtx, act);
+		break;
+	    }
+	    exp = act;
+	}
+#endif
+	break;
+    }
+
+    case ETHR_RWMUTEX_TYPE_FREQUENT_READ:
+    case ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ: {
+	ethr_ts_event *tse = ethr_get_ts_event();
+	rwmutex_freqread_rlock(rwmtx, tse, 0);
+	ethr_leave_ts_event(tse);
+	break;
+    }
+    }
+
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+    ETHR_MTX_CHK_EXCL_SET_NON_EXCL(&rwmtx->mtxb);
+    ETHR_MTX_CHK_EXCL_IS_NOT_EXCL(&rwmtx->mtxb);
+    ETHR_MTX_HARD_DEBUG_LFS_RLOCK(&rwmtx->mtxb);
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+}
+
+void
+ethr_rwmutex_runlock(ethr_rwmutex *rwmtx)
+{
+    ethr_sint32_t act;
+
+    ETHR_MTX_CHK_EXCL_IS_NOT_EXCL(&rwmtx->mtxb);
+    ETHR_MTX_CHK_EXCL_UNSET_NON_EXCL(&rwmtx->mtxb);
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+    ETHR_MTX_HARD_DEBUG_LFS_RUNLOCK(&rwmtx->mtxb);
+
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
+    switch (rwmtx->type) {
+    case ETHR_RWMUTEX_TYPE_NORMAL:
+	act = ethr_atomic32_dec_read_relb(&rwmtx->mtxb.flgs);
+	if ((act & ETHR_RWMTX_WAIT_FLGS__)
+	    && (act & ~ETHR_RWMTX_WAIT_FLGS__) == 0) {
+	    ETHR_ASSERT((act & ETHR_RWMTX_W_FLG__) == 0);
+	    rwmutex_unlock_wake(rwmtx, 0, act, 0);
+	}
+	break;
+
+    case ETHR_RWMUTEX_TYPE_FREQUENT_READ:
+    case ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ: {
+	ethr_ts_event *tse = ethr_get_ts_event();
+
+	act = rwmutex_freqread_rdrs_dec_read_relb(rwmtx, tse);
+
+	ETHR_ASSERT(act >= 0);
+
+	ETHR_MEMORY_BARRIER;
+
+	if (act == 0) {
+	    act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+	    if (act != ETHR_RWMTX_R_FLG__)
+		rwmutex_freqread_rdrs_dec_chk_wakeup(rwmtx, tse, act);
+	}
+
+	ethr_leave_ts_event(tse);
+	break;
+    }
+    }
+
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+}
+
+int
+ethr_rwmutex_tryrwlock(ethr_rwmutex *rwmtx)
+{
+    int res = 0;
+    ethr_sint32_t act;
+
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
+    switch (rwmtx->type) {
+    case ETHR_RWMUTEX_TYPE_NORMAL:
+	act = ethr_atomic32_cmpxchg_acqb(&rwmtx->mtxb.flgs,
+					 ETHR_RWMTX_W_FLG__, 0);
+	if (act != 0)
+	    res = EBUSY;
+	break;
+
+    case ETHR_RWMUTEX_TYPE_FREQUENT_READ:
+    case ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ:
+
+	res = 0;
+	act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+
+	do {
+
+	    if (act == 0)
+		act = ethr_atomic32_cmpxchg_acqb(&rwmtx->mtxb.flgs,
+						 ETHR_RWMTX_W_FLG__, 0);
+	    else if (act == ETHR_RWMTX_R_FLG__) {
+		res = rwmutex_try_complete_runlock(rwmtx, act, NULL,
+						   0, 1, 1);
+		break;
+	    }
+	    else {
+		res = EBUSY;
+		break;
+	    }
+
+	} while (act != 0);
+
+	break;
+    }
+
+#ifdef ETHR_MTX_CHK_EXCL
+    if (res == 0) {
+	ETHR_MTX_CHK_EXCL_SET_EXCL(&rwmtx->mtxb);
+	ETHR_MTX_CHK_EXCL_IS_NOT_NON_EXCL(&rwmtx->mtxb);
+    }
+#endif
+
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+    ETHR_MTX_HARD_DEBUG_LFS_TRYRWLOCK(&rwmtx->mtxb, res);
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+
+    return res;
+}
+
+void
+ethr_rwmutex_rwlock(ethr_rwmutex *rwmtx)
+{
+    ethr_sint32_t act;
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
+    switch (rwmtx->type) {
+    case ETHR_RWMUTEX_TYPE_NORMAL:
+	act = ethr_atomic32_cmpxchg_acqb(&rwmtx->mtxb.flgs,
+					 ETHR_RWMTX_W_FLG__, 0);
+	if (act != 0)
+	    rwmutex_normal_rwlock_wait(rwmtx, act);
+	break;
+
+    case ETHR_RWMUTEX_TYPE_FREQUENT_READ:
+    case ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ:
+
+	act = ethr_atomic32_read(&rwmtx->mtxb.flgs);
+
+	do {
+
+	    if (act != 0) {
+		rwmutex_freqread_rwlock_wait(rwmtx, act);
+		break;
+	    }
+
+	    act = ethr_atomic32_cmpxchg_acqb(&rwmtx->mtxb.flgs,
+					     ETHR_RWMTX_W_FLG__, 0);
+
+	} while (act != 0);
+
+	break;
+    }
+
+    ETHR_MTX_CHK_EXCL_SET_EXCL(&rwmtx->mtxb);
+    ETHR_MTX_CHK_EXCL_IS_NOT_NON_EXCL(&rwmtx->mtxb);
+    ETHR_MTX_HARD_DEBUG_LFS_RWLOCK(&rwmtx->mtxb);
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
+}
+
+void
+ethr_rwmutex_rwunlock(ethr_rwmutex *rwmtx)
+{
+    ethr_sint32_t act;
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+    ETHR_MTX_HARD_DEBUG_LFS_RWUNLOCK(&rwmtx->mtxb);
+
+    ETHR_MTX_CHK_EXCL_IS_NOT_NON_EXCL(&rwmtx->mtxb);
+    ETHR_MTX_CHK_EXCL_UNSET_EXCL(&rwmtx->mtxb);
+
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
+    switch (rwmtx->type) {
+    case ETHR_RWMUTEX_TYPE_NORMAL:
+	act = ethr_atomic32_cmpxchg_relb(&rwmtx->mtxb.flgs,
+					 0, ETHR_RWMTX_W_FLG__);
+	if (act != ETHR_RWMTX_W_FLG__)
+	    rwmutex_unlock_wake(rwmtx, 1, act, 0);
+	break;
+
+    case ETHR_RWMUTEX_TYPE_FREQUENT_READ:
+    case ETHR_RWMUTEX_TYPE_EXTREMELY_FREQUENT_READ:
+	act = ethr_atomic32_cmpxchg_relb(&rwmtx->mtxb.flgs, 0,
+					 ETHR_RWMTX_W_FLG__);
+	if (act != ETHR_RWMTX_W_FLG__)
+	    rwmutex_unlock_wake(rwmtx, 1, act, 0);
+	break;
+    }
+
+    ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+}
+
+#else
+/* -- pthread read/write mutex --------------------------------------------- */
+
+int
+ethr_rwmutex_init(ethr_rwmutex *rwmtx)
+{
+#if ETHR_XCHK
+    if (!rwmtx) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+    rwmtx->initialized = ETHR_RWMUTEX_INITIALIZED;
+#endif
+    return pthread_rwlock_init(&rwmtx->pt_rwlock, write_pref_attr);
+}
+
+int
+ethr_rwmutex_init_opt(ethr_rwmutex *rwmtx, ethr_rwmutex_opt *opt)
+{
+    return ethr_rwmutex_init(rwmtx);
+}
+
+int
+ethr_rwmutex_destroy(ethr_rwmutex *rwmtx)
+{
+    int res;
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+    res = pthread_rwlock_destroy(&rwmtx->pt_rwlock);
+#if ETHR_XCHK
+    rwmtx->initialized = 0;
+#endif
+    return res;
+}
+
+/* -- Exported symbols of inline functions --------------------------------- */
+
+int
+ethr_rwmutex_tryrlock(ethr_rwmutex *rwmtx)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    return ethr_rwmutex_tryrlock__(rwmtx);
+}
+
+void
+ethr_rwmutex_rlock(ethr_rwmutex *rwmtx)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    ethr_rwmutex_rlock__(rwmtx);
+}
+
+void
+ethr_rwmutex_runlock(ethr_rwmutex *rwmtx)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    ethr_rwmutex_runlock__(rwmtx);
+}
+
+int
+ethr_rwmutex_tryrwlock(ethr_rwmutex *rwmtx)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    return ethr_rwmutex_tryrwlock__(rwmtx);
+}
+
+void
+ethr_rwmutex_rwlock(ethr_rwmutex *rwmtx)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    return ethr_rwmutex_rwlock__(rwmtx);
+}
+
+void
+ethr_rwmutex_rwunlock(ethr_rwmutex *rwmtx)
+{
+    ETHR_ASSERT(!ethr_not_inited__);
+    ETHR_ASSERT(rwmtx);
+    ETHR_ASSERT(rwmtx->initialized == ETHR_RWMUTEX_INITIALIZED);
+
+    ethr_rwmutex_rwunlock__(rwmtx);
+}
+
+#endif /* pthread */
+
+
+#if defined(ETHR_USE_OWN_RWMTX_IMPL__) || defined(ETHR_USE_OWN_MTX_IMPL__)
+
+#ifdef ETHR_MTX_HARD_DEBUG_Q
+static void
+hard_debug_chk_q__(struct ethr_mutex_base_ *mtxb, int is_rwmtx)
+{
+    int res;
+    ethr_sint32_t flgs = ethr_atomic32_read(&mtxb->flgs);
+
+    ETHR_MTX_HARD_ASSERT(res == 0);
+
+    ETHR_MTX_HARD_ASSERT(!(flgs & ETHR_RWMTX_R_WAIT_FLG__) || is_rwmtx);
+
+    if (!(flgs & ETHR_RWMTX_WAIT_FLGS__)) {
+	ETHR_MTX_HARD_ASSERT(!mtxb->q);
+	if (is_rwmtx) {
+	    ethr_rwmutex *rwmtx = (ethr_rwmutex *) mtxb;
+	    ETHR_MTX_HARD_ASSERT(!rwmtx->rq_end);
+	    ETHR_MTX_HARD_ASSERT(!rwmtx->rs);
+	}
+    }
+    else {
+	ethr_ts_event *tse;
+	int ws = 0, rs = 0, rsf = 0, ref = 0;
+
+	ETHR_MTX_HARD_ASSERT(mtxb->q);
+
+	tse = mtxb->q;
+
+	do {
+	    ethr_sint32_t type;
+
+	    ETHR_MTX_HARD_ASSERT(tse->next->prev == tse);
+	    ETHR_MTX_HARD_ASSERT(tse->prev->next == tse);
+
+	    type = ethr_atomic32_read(&tse->uaflgs);
+	    ETHR_MTX_HARD_ASSERT(type == tse->uflgs);
+	    switch (type) {
+	    case ETHR_RWMTX_W_WAIT_FLG__:
+		ws++;
+		break;
+	    case ETHR_RWMTX_R_WAIT_FLG__: {
+		ethr_rwmutex *rwmtx = (ethr_rwmutex *) mtxb;
+		ETHR_MTX_HARD_ASSERT(is_rwmtx);
+		if (!rsf)
+		    rsf = 1;
+		ETHR_MTX_HARD_ASSERT(!ref);
+		if (rwmtx->rq_end == tse) {
+		    ETHR_MTX_HARD_ASSERT(
+			tse->next == rwmtx->mtxb.q
+			|| tse->next->uflgs == ETHR_RWMTX_W_WAIT_FLG__);
+		    ref = 1;
+		}
+		rs++;
+		break;
+	    }
+	    default:
+		ETHR_MTX_HARD_ASSERT(! "invalid wait type found");
+	    }
+
+	    tse = tse->next;
+	} while (tse != mtxb->q);
+
+	if (is_rwmtx) {
+	    ethr_rwmutex *rwmtx = (ethr_rwmutex *) mtxb;
+	    ETHR_MTX_HARD_ASSERT(rs == rwmtx->rs);
+	}
+
+#ifdef ETHR_MTX_HARD_DEBUG_WSQ
+	ETHR_MTX_HARD_ASSERT(ws == mtxb->ws);
+#endif
+
+	if (flgs & ETHR_RWMTX_W_WAIT_FLG__)
+	    ETHR_MTX_HARD_ASSERT(ws);
+	else
+	    ETHR_MTX_HARD_ASSERT(!ws);
+
+	if (flgs & ETHR_RWMTX_R_WAIT_FLG__) {
+	    ethr_rwmutex *rwmtx = (ethr_rwmutex *) mtxb;
+	    ETHR_MTX_HARD_ASSERT(is_rwmtx);
+	    ETHR_MTX_HARD_ASSERT(rwmtx->rq_end);
+	    ETHR_MTX_HARD_ASSERT(rsf);
+	    ETHR_MTX_HARD_ASSERT(ref);
+	    ETHR_MTX_HARD_ASSERT(rs);
+	}
+	else {
+	    if (is_rwmtx) {
+		ethr_rwmutex *rwmtx = (ethr_rwmutex *) mtxb;
+		ETHR_MTX_HARD_ASSERT(!rwmtx->rq_end);
+	    }
+	    ETHR_MTX_HARD_ASSERT(!rsf);
+	    ETHR_MTX_HARD_ASSERT(!ref);
+	    ETHR_MTX_HARD_ASSERT(!rs);
+	}
+    }
+}
+
+#elif defined(ETHR_MTX_HARD_DEBUG_WSQ)
+
+static void
+hard_debug_chk_q__(struct ethr_mutex_base_ *mtxb, int is_rwmtx)
+{
+    int ws = 0;
+    int rs = 0;
+
+    if (mtxb->q) {
+	ethr_ts_event *tse = mtxb->q;
+	do {
+	    switch (tse->uflgs) {
+	    case ETHR_RWMTX_W_WAIT_FLG__:
+		ws++;
+		break;
+	    case ETHR_RWMTX_R_WAIT_FLG__:
+		rs++;
+		break;
+	    default:
+		ETHR_MTX_HARD_ASSERT(0);
+		break;
+	    }
+	    tse = tse->next;
+	} while (tse != mtxb->q);
+    }
+
+    ETHR_MTX_HARD_ASSERT(mtxb->ws == ws);
+    if (is_rwmtx) {
+	ethr_rwmutex *rwmtx = (ethr_rwmutex *) mtxb;
+	ETHR_MTX_HARD_ASSERT(rwmtx->rs == rs);
+    }
+}
+
+#endif
+
+#endif
diff --git a/erts/lib_src/common/ethread.c b/erts/lib_src/common/ethread.c
deleted file mode 100644
index 9c88233934..0000000000
--- a/erts/lib_src/common/ethread.c
+++ /dev/null
@@ -1,3369 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2004-2010. 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%
- */
-
-/*
- * Description: A Thread library for use in the ERTS and other OTP
- *              applications.
- * Author: Rickard Green
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#undef ETHR_STACK_GUARD_SIZE 
-
-#if defined(ETHR_PTHREADS)
-
-#ifdef ETHR_TIME_WITH_SYS_TIME
-#  include <time.h>
-#  include <sys/time.h>
-#else
-#  ifdef ETHR_HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#  else
-#    include <time.h>
-#  endif
-#endif
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-
-#ifdef ETHR_HAVE_PTHREAD_ATTR_SETGUARDSIZE
-#  define ETHR_STACK_GUARD_SIZE (pagesize)
-#endif
-
-#elif defined(ETHR_WIN32_THREADS)
-
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <process.h>
-#include <winerror.h>
-
-#else
-#error "Missing thread implementation"
-#endif
-
-#include <limits.h>
-
-#define ETHR_FORCE_INLINE_FUNCS
-#define ETHR_INLINE_FUNC_NAME_(X) X ## __
-#include "ethread.h"
-
-#ifndef ETHR_HAVE_ETHREAD_DEFINES
-#error Missing configure defines
-#endif
-
-/*
- * ----------------------------------------------------------------------------
- * Common stuff
- * ----------------------------------------------------------------------------
- */
-
-#define ETHR_MAX_THREADS 2048 /* Has to be an even power of 2 */
-
-static int ethr_not_inited = 1;
-
-#define ASSERT(A) ETHR_ASSERT((A))
-
-static void *(*allocp)(size_t) = malloc;
-static void *(*reallocp)(void *, size_t) = realloc;
-static void (*freep)(void *) = free;
-
-#ifndef ETHR_HAVE_OPTIMIZED_ATOMIC_OPS
-ethr_atomic_protection_t ethr_atomic_protection__[1 << ETHR_ATOMIC_ADDR_BITS];
-#endif
-
-void *(*thread_create_prepare_func)(void) = NULL;
-void (*thread_create_parent_func)(void *) = NULL;
-void (*thread_create_child_func)(void *) = NULL;
-
-typedef struct ethr_xhndl_list_ ethr_xhndl_list;
-struct ethr_xhndl_list_ {
-    ethr_xhndl_list *next;
-    void (*funcp)(void);
-};
-
-static size_t pagesize;
-#define ETHR_PAGE_ALIGN(SZ) (((((size_t) (SZ)) - 1)/pagesize + 1)*pagesize)
-static size_t min_stack_size; /* kilo words */
-static size_t max_stack_size; /* kilo words */
-#define ETHR_B2KW(B) ((((size_t) (B)) - 1)/(sizeof(void *)*1024) + 1)
-#define ETHR_KW2B(KW) (((size_t) (KW))*sizeof(void *)*1024)
-
-ethr_mutex xhndl_mtx;
-ethr_xhndl_list *xhndl_list;
-
-static int
-init_common(ethr_init_data *id)
-{
-    int res;
-    if (id) {
-	allocp				= id->alloc;
-	reallocp			= id->realloc;
-	freep				= id->free;
-	thread_create_prepare_func	= id->thread_create_prepare_func;
-	thread_create_parent_func	= id->thread_create_parent_func;
-	thread_create_child_func	= id->thread_create_child_func;
-    }
-    if (!allocp || !reallocp || !freep)
-	return EINVAL;
-
-#ifdef _SC_PAGESIZE
-    pagesize = (size_t) sysconf(_SC_PAGESIZE);
-#elif defined(HAVE_GETPAGESIZE)
-    pagesize = (size_t) getpagesize();
-#else
-    pagesize = (size_t) 4*1024; /* Guess 4 KB */
-#endif
-
-    /* User needs at least 4 KB */
-    min_stack_size = 4*1024;
-#if SIZEOF_VOID_P == 8
-    /* Double that on 64-bit archs */
-    min_stack_size *= 2;
-#endif
-    /* On some systems as much as about 4 KB is used by the system */
-    min_stack_size += 4*1024;
-    /* There should be room for signal handlers */
-#ifdef SIGSTKSZ
-    min_stack_size += SIGSTKSZ;
-#else
-    min_stack_size += pagesize;
-#endif
-    /* The system may think that we need more stack */
-#if defined(PTHREAD_STACK_MIN)
-    if (min_stack_size < PTHREAD_STACK_MIN)
-	min_stack_size = PTHREAD_STACK_MIN;
-#elif defined(_SC_THREAD_STACK_MIN)
-    {
-	size_t thr_min_stk_sz = (size_t) sysconf(_SC_THREAD_STACK_MIN);
-	if (min_stack_size < thr_min_stk_sz)
-	    min_stack_size = thr_min_stk_sz;
-    }
-#endif
-    /* The guard is at least on some platforms included in the stack size
-       passed when creating threads */
-#ifdef ETHR_STACK_GUARD_SIZE
-    min_stack_size += ETHR_STACK_GUARD_SIZE;
-#endif
-    min_stack_size = ETHR_PAGE_ALIGN(min_stack_size);
-
-    min_stack_size = ETHR_B2KW(min_stack_size);
-
-    max_stack_size = 32*1024*1024;
-#if SIZEOF_VOID_P == 8
-    max_stack_size *= 2;
-#endif
-    max_stack_size = ETHR_B2KW(max_stack_size);
-
-    xhndl_list = NULL;
-
-    res = ethr_mutex_init(&xhndl_mtx);
-    if (res != 0)
-	return res;
-
-    res = ethr_mutex_set_forksafe(&xhndl_mtx);
-    if (res != 0 && res != ENOTSUP)
-	return res;
-
-    return 0;
-}
-
-int
-ethr_install_exit_handler(void (*funcp)(void))
-{
-    ethr_xhndl_list *xhp;
-    int res;
-
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-#endif
-
-    if (!funcp)
-	return EINVAL;
-
-    xhp = (ethr_xhndl_list *) (*allocp)(sizeof(ethr_xhndl_list));
-    if (!xhp)
-	return ENOMEM;
-
-    res = ethr_mutex_lock__(&xhndl_mtx);
-    if (res != 0) {
-	(*freep)((void *) xhp);
-	return res;
-    }
-
-    xhp->funcp = funcp;
-    xhp->next = xhndl_list;
-    xhndl_list = xhp;
-
-    res = ethr_mutex_unlock__(&xhndl_mtx);
-    if (res != 0)
-	abort();
-
-    return res;
-}
-
-static void
-run_exit_handlers(void)
-{
-    int res;
-    ethr_xhndl_list *xhp;
-
-    res = ethr_mutex_lock__(&xhndl_mtx);
-    if (res != 0)
-	abort();
-
-    xhp = xhndl_list;
-
-    res = ethr_mutex_unlock__(&xhndl_mtx);
-    if (res != 0)
-	abort();
-
-    for (; xhp; xhp = xhp->next)
-	(*xhp->funcp)();
-}
-
-#if defined(ETHR_PTHREADS)
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
- * pthread implementation                                                    *
-\*                                                                           */
-
-typedef struct {
-    pthread_mutex_t mtx;
-    pthread_cond_t cnd;
-    int initialized;
-    void *(*thr_func)(void *);
-    void *arg;
-    void *prep_func_res;
-} thr_wrap_data_;
-
-static int no_ethreads;
-static ethr_mutex no_ethrs_mtx;
-
-#ifndef ETHR_HAVE_PTHREAD_ATFORK
-#define ETHR_HAVE_PTHREAD_ATFORK 0
-#endif
-
-#if !ETHR_HAVE_PTHREAD_ATFORK
-#warning "Cannot enforce fork-safety"
-#endif
-
-#ifdef ETHR_HAVE_PTHREAD_RWLOCK_INIT
-static pthread_rwlockattr_t write_pref_attr_data;
-static pthread_rwlockattr_t *write_pref_attr;
-#endif
-
-/*
- * ----------------------------------------------------------------------------
- * Static functions
- * ----------------------------------------------------------------------------
- */
-
-/*
- * Functions with safe_ prefix aborts on failure. To be used when
- * we cannot recover after failure.
- */
-
-static ETHR_INLINE void
-safe_mutex_lock(pthread_mutex_t *mtxp)
-{
-    int res = pthread_mutex_lock(mtxp);
-    if (res != 0)
-	abort();
-}
-
-static ETHR_INLINE void
-safe_mutex_unlock(pthread_mutex_t *mtxp)
-{
-    int res = pthread_mutex_unlock(mtxp);
-    if (res != 0)
-	abort();
-}
-
-static ETHR_INLINE void
-safe_cond_signal(pthread_cond_t *cndp)
-{
-    int res = pthread_cond_signal(cndp);
-    if (res != 0)
-	abort();
-}
-
-#ifdef ETHR_HAVE_ETHR_REC_MUTEX_INIT
-
-static volatile int rec_mtx_attr_need_init = 1;
-static pthread_mutexattr_t rec_mtx_attr;
-
-static int init_rec_mtx_attr(void);
-
-#endif
-
-#if ETHR_HAVE_PTHREAD_ATFORK
-
-static ethr_mutex forksafe_mtx = ETHR_MUTEX_INITER;
-
-static void lock_mutexes(void)
-{
-    ethr_mutex *m = &forksafe_mtx;
-    do {
-
-	safe_mutex_lock(&m->pt_mtx);
-
-	m = m->next;
-
-    } while (m != &forksafe_mtx);
-}
-
-static void unlock_mutexes(void)
-{
-    ethr_mutex *m = forksafe_mtx.prev;
-    do {
-
-	safe_mutex_unlock(&m->pt_mtx);
-
-	m = m->prev;
-
-    } while (m->next != &forksafe_mtx);
-}
-
-#if ETHR_INIT_MUTEX_IN_CHILD_AT_FORK
-
-static void reinit_mutexes(void)
-{
-    ethr_mutex *m = forksafe_mtx.prev;
-    do {
-	pthread_mutexattr_t *attrp = NULL;
-
-#ifdef ETHR_HAVE_ETHR_REC_MUTEX_INIT
-	if (m->is_rec_mtx) {
-	    if (rec_mtx_attr_need_init) {
-		int res = init_rec_mtx_attr();
-		if (res != 0)
-		    abort();
-	    }
-	    attrp = &rec_mtx_attr;
-	}
-#endif
-	if (pthread_mutex_init(&m->pt_mtx, attrp) != 0)
-	    abort();
-
-	m = m->prev;
-
-    } while (m->next != &forksafe_mtx);
-}
-
-#endif
-
-static int
-init_forksafe(void)
-{
-    static int init_done = 0;
-    int res = 0;
-
-    if (init_done)
-	return res;
-
-    forksafe_mtx.prev = &forksafe_mtx;
-    forksafe_mtx.next = &forksafe_mtx;
-
-    res = pthread_atfork(lock_mutexes,
-			 unlock_mutexes,
-#if ETHR_INIT_MUTEX_IN_CHILD_AT_FORK
-			 reinit_mutexes
-#else
-			 unlock_mutexes
-#endif
-	);
-
-    init_done = 1;
-    return res;
-}
-
-#endif
-
-
-#ifdef ETHR_HAVE_ETHR_REC_MUTEX_INIT
-
-#if defined(ETHR_HAVE_PTHREAD_MUTEXATTR_SETTYPE)
-
-#define SET_REC_MUTEX_ATTR(AP) \
-  pthread_mutexattr_settype((AP), PTHREAD_MUTEX_RECURSIVE);
-
-#elif defined(ETHR_HAVE_PTHREAD_MUTEXATTR_SETKIND_NP)
-
-#define SET_REC_MUTEX_ATTR(AP) \
-  pthread_mutexattr_setkind_np((AP), PTHREAD_MUTEX_RECURSIVE_NP);
-
-#else
-
-#error "Don't know how to set recursive mutex attributes"
-
-#endif
-
-static int
-init_rec_mtx_attr(void)
-{
-    int res, mres;
-    static pthread_mutex_t attrinit_mtx = PTHREAD_MUTEX_INITIALIZER;
-
-    mres = pthread_mutex_lock(&attrinit_mtx);
-    if (mres != 0)
-	return mres;
-    /* Got here under race conditions; check again ... */
-    if (!rec_mtx_attr_need_init)
-	res = 0;
-    else {
-	res = pthread_mutexattr_init(&rec_mtx_attr);
-	if (res == 0) {
-	    res = SET_REC_MUTEX_ATTR(&rec_mtx_attr);
-	    if (res == 0)
-		rec_mtx_attr_need_init = 0;
-	    else
-		(void) pthread_mutexattr_destroy(&rec_mtx_attr);
-	}
-    }
-
-    mres = pthread_mutex_unlock(&attrinit_mtx);
-    if (mres != 0)
-	return mres;
-    return res;
-}
-
-#endif /* #if ETHR_HAVE_ETHR_REC_MUTEX_INIT */
-
-static ETHR_INLINE void thr_exit_cleanup(void)
-{
-    run_exit_handlers();
-    safe_mutex_lock(&no_ethrs_mtx.pt_mtx);
-    ASSERT(no_ethreads > 0);
-    no_ethreads--;
-    safe_mutex_unlock(&no_ethrs_mtx.pt_mtx);
-}
-
-static void *thr_wrapper(void *vtwd)
-{
-    void *res;
-    thr_wrap_data_ *twd = (thr_wrap_data_ *) vtwd;
-    void *(*thr_func)(void *) = twd->thr_func;
-    void *arg = twd->arg;
-
-    safe_mutex_lock(&twd->mtx);
-
-    if (thread_create_child_func)
-	(*thread_create_child_func)(twd->prep_func_res);
-
-    twd->initialized = 1;
-
-    safe_cond_signal(&twd->cnd);
-    safe_mutex_unlock(&twd->mtx);
-
-    res = (*thr_func)(arg);
-    thr_exit_cleanup();
-    return res;
-}
-
-
-/*
- * ----------------------------------------------------------------------------
- * Exported functions
- * ----------------------------------------------------------------------------
- */
-
-int
-ethr_init(ethr_init_data *id)
-{
-    int res;
-
-    if (!ethr_not_inited)
-	return EINVAL;
-
-    ethr_not_inited = 0;
-
-    res = init_common(id);
-    if (res != 0)
-	goto error;
-
-#if ETHR_HAVE_PTHREAD_ATFORK
-    init_forksafe();
-#endif
-
-    no_ethreads = 1;
-    res = ethr_mutex_init(&no_ethrs_mtx);
-    if (res != 0)
-	goto error;
-    res = ethr_mutex_set_forksafe(&no_ethrs_mtx);
-    if (res != 0 && res != ENOTSUP)
-	goto error;
-
-#ifndef ETHR_HAVE_OPTIMIZED_ATOMIC_OPS
-    {
-	int i;
-	for (i = 0; i < (1 << ETHR_ATOMIC_ADDR_BITS); i++) {
-#ifdef ETHR_HAVE_PTHREAD_SPIN_LOCK
-	    res = pthread_spin_init(&ethr_atomic_protection__[i].u.spnlck, 0);
-#else
-	    res = ethr_mutex_init(&ethr_atomic_protection__[i].u.mtx);
-#endif
-	    if (res != 0)
-		goto error;
-	}
-    }
-#endif
-
-#ifdef ETHR_HAVE_PTHREAD_RWLOCK_INIT
-#if defined(ETHR_HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP) \
-    && defined(ETHR_HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP)
-    res = pthread_rwlockattr_init(&write_pref_attr_data);
-    if (res != 0)
-	goto error;
-    res = pthread_rwlockattr_setkind_np(
-	&write_pref_attr_data,
-	PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
-    if (res != 0)
-	goto error;
-    write_pref_attr = &write_pref_attr_data;
-#else
-    write_pref_attr = NULL;
-#endif
-#endif
-
-
-    return 0;
-
- error:
-    ethr_not_inited = 1;
-    return res;
-
-}
-
-int
-ethr_thr_create(ethr_tid *tid, void * (*func)(void *), void *arg,
-		ethr_thr_opts *opts)
-{
-    thr_wrap_data_ twd;
-    pthread_attr_t attr;
-    int res, dres;
-    int use_stack_size = (opts && opts->suggested_stack_size >= 0
-			  ? opts->suggested_stack_size
-			  : -1 /* Use system default */);
-
-#ifdef ETHR_MODIFIED_DEFAULT_STACK_SIZE
-    if (use_stack_size < 0)
-	use_stack_size = ETHR_MODIFIED_DEFAULT_STACK_SIZE;
-#endif
-
-    twd.initialized = 0;
-    twd.thr_func = func;
-    twd.arg = arg;
-
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!tid || !func) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-
-    /* Call prepare func if it exist */
-    if (thread_create_prepare_func)
-	twd.prep_func_res = (*thread_create_prepare_func)();
-    else
-	twd.prep_func_res = NULL;
-
-    /* Set som thread attributes */
-    res = pthread_attr_init(&attr);
-    if (res != 0)
-	goto cleanup_parent_func;
-    res = pthread_mutex_init(&twd.mtx, NULL);
-    if (res != 0)
-	goto cleanup_attr_destroy;
-    res = pthread_cond_init(&twd.cnd, NULL);
-    if (res != 0)
-	goto cleanup_mutex_destroy;
-
-    /* Schedule child thread in system scope (if possible) ... */
-    res = pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
-    if (res != 0 && res != ENOTSUP)
-	goto cleanup_cond_destroy;
-
-    if (use_stack_size >= 0) {
-	size_t suggested_stack_size = (size_t) use_stack_size;
-	size_t stack_size;
-#ifdef DEBUG
-	suggested_stack_size /= 2; /* Make sure we got margin */
-#endif
-#ifdef ETHR_STACK_GUARD_SIZE
-	/* The guard is at least on some platforms included in the stack size
-	   passed when creating threads */
-	suggested_stack_size += ETHR_B2KW(ETHR_STACK_GUARD_SIZE);
-#endif
-	if (suggested_stack_size < min_stack_size)
-	    stack_size = ETHR_KW2B(min_stack_size);
-	else if (suggested_stack_size > max_stack_size)
-	    stack_size = ETHR_KW2B(max_stack_size);
-	else
-	    stack_size = ETHR_PAGE_ALIGN(ETHR_KW2B(suggested_stack_size));
-	(void) pthread_attr_setstacksize(&attr, stack_size);
-    }
-
-#ifdef ETHR_STACK_GUARD_SIZE
-    (void) pthread_attr_setguardsize(&attr, ETHR_STACK_GUARD_SIZE);
-#endif
-
-    /* Detached or joinable... */
-    res = pthread_attr_setdetachstate(&attr,
-				      (opts && opts->detached
-				       ? PTHREAD_CREATE_DETACHED
-				       : PTHREAD_CREATE_JOINABLE));
-    if (res != 0)
-	goto cleanup_cond_destroy;
-    
-    res = pthread_mutex_lock(&twd.mtx);
-
-    if (res != 0)
-	goto cleanup_cond_destroy;
-
-    safe_mutex_lock(&no_ethrs_mtx.pt_mtx);
-    if (no_ethreads < ETHR_MAX_THREADS) {
-	no_ethreads++;
-	safe_mutex_unlock(&no_ethrs_mtx.pt_mtx);
-    }
-    else {
-	res = EAGAIN;
-	safe_mutex_unlock(&no_ethrs_mtx.pt_mtx);
-	goto cleanup_mutex_unlock;
-    }
-
-    res = pthread_create((pthread_t *) tid, &attr, thr_wrapper, (void *) &twd);
-
-    if (res != 0) {
-	safe_mutex_lock(&no_ethrs_mtx.pt_mtx);
-	ASSERT(no_ethreads > 0);
-	no_ethreads--;
-	safe_mutex_unlock(&no_ethrs_mtx.pt_mtx);
-    }
-    else {
-
-	/* Wait for child to initialize... */
-	while (!twd.initialized) {
-	    res = pthread_cond_wait(&twd.cnd, &twd.mtx);
-	    if (res != 0 && res != EINTR)
-		break;
-	}
-
-    }
-
-    /* Cleanup... */
- cleanup_mutex_unlock:
-    dres = pthread_mutex_unlock(&twd.mtx);
-    if (res == 0)
-	res = dres;
- cleanup_cond_destroy:
-    dres = pthread_cond_destroy(&twd.cnd);
-    if (res == 0)
-	res = dres;
- cleanup_mutex_destroy:
-    dres = pthread_mutex_destroy(&twd.mtx);
-    if (res == 0)
-	res = dres;
- cleanup_attr_destroy:
-    dres = pthread_attr_destroy(&attr);
-    if (res == 0)
-	res = dres;
- cleanup_parent_func:
-    if (thread_create_parent_func)
-	(*thread_create_parent_func)(twd.prep_func_res);
-
-    return res;
-}
-
-int
-ethr_thr_join(ethr_tid tid, void **res)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-#endif
-    return pthread_join((pthread_t) tid, res);
-}
-
-int
-ethr_thr_detach(ethr_tid tid)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-#endif
-    return pthread_detach((pthread_t) tid);
-}
-
-void
-ethr_thr_exit(void *res)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return;
-    }
-#endif
-    thr_exit_cleanup();
-    pthread_exit(res);
-}
-
-ethr_tid
-ethr_self(void)
-{
-    return (ethr_tid) pthread_self();
-}
-
-int
-ethr_equal_tids(ethr_tid tid1, ethr_tid tid2)
-{
-    return pthread_equal((pthread_t) tid1, (pthread_t) tid2);
-}
-
-
-/*
- * Mutex functions
- */
-
-
-int
-ethr_mutex_init(ethr_mutex *mtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx) {
-	ASSERT(0);
-	return EINVAL;
-    }
-    mtx->initialized = ETHR_MUTEX_INITIALIZED;
-#endif
-    mtx->prev = NULL;
-    mtx->next = NULL;
-    mtx->is_rec_mtx = 0;
-    return pthread_mutex_init(&mtx->pt_mtx, NULL);
-}
-
-#ifdef ETHR_HAVE_ETHR_REC_MUTEX_INIT
-
-int
-ethr_rec_mutex_init(ethr_mutex *mtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx) {
-	ASSERT(0);
-	return EINVAL;
-    }
-    mtx->initialized = ETHR_MUTEX_INITIALIZED;
-#endif
-    if (rec_mtx_attr_need_init)
-	init_rec_mtx_attr();
-
-    mtx->prev = NULL;
-    mtx->next = NULL;
-    mtx->is_rec_mtx = 1;
-    return pthread_mutex_init(&mtx->pt_mtx, &rec_mtx_attr);
-}
-
-#endif /* #if ETHR_HAVE_ETHR_REC_MUTEX_INIT */
-
-int
-ethr_mutex_destroy(ethr_mutex *mtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx || mtx->initialized != ETHR_MUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    if (mtx->next) {
-	ASSERT(mtx->prev);
-	ethr_mutex_unset_forksafe(mtx);
-    }
-#if ETHR_XCHK
-    mtx->initialized = 0;
-#endif
-    return pthread_mutex_destroy(&mtx->pt_mtx);
-}
-
-int ethr_mutex_set_forksafe(ethr_mutex *mtx)
-{
-    int res;
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx || mtx->initialized != ETHR_MUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-#if ETHR_HAVE_PTHREAD_ATFORK
-    res = pthread_mutex_lock(&forksafe_mtx.pt_mtx);
-    if (res != 0)
-	return res;
-    if (!forksafe_mtx.next) {
-	ASSERT(!forksafe_mtx.prev);
-	init_forksafe();
-    }
-    if (mtx->next) {
-	/* forksafe already set for this mutex */ 
-	ASSERT(mtx->prev);
-    }
-    else {
-	mtx->next = forksafe_mtx.next;
-	mtx->prev = &forksafe_mtx;
-	forksafe_mtx.next->prev = mtx;
-	forksafe_mtx.next = mtx;
-    }
-
-    res = pthread_mutex_unlock(&forksafe_mtx.pt_mtx);
-
-#else /* #if ETHR_HAVE_PTHREAD_ATFORK */
-    res = ENOTSUP;
-#endif /* #if ETHR_HAVE_PTHREAD_ATFORK */
-    return res;
-}
-
-int ethr_mutex_unset_forksafe(ethr_mutex *mtx)
-{
-    int res;
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx || mtx->initialized != ETHR_MUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-#if ETHR_HAVE_PTHREAD_ATFORK
-    res = pthread_mutex_lock(&forksafe_mtx.pt_mtx);
-    if (res != 0)
-	return res;
-    if (!forksafe_mtx.next) {
-	ASSERT(!forksafe_mtx.prev);
-	init_forksafe();
-    }
-    if (!mtx->next) {
-	/* forksafe already unset for this mutex */ 
-	ASSERT(!mtx->prev);
-    }
-    else {
-	mtx->prev->next = mtx->next;
-	mtx->next->prev = mtx->prev;
-	mtx->next = NULL;
-	mtx->prev = NULL;
-    }
-    res = pthread_mutex_unlock(&forksafe_mtx.pt_mtx);
-
-#else /* #if ETHR_HAVE_PTHREAD_ATFORK */
-    res = ENOTSUP;
-#endif /* #if ETHR_HAVE_PTHREAD_ATFORK */
-    return res;
-}
-
-int
-ethr_mutex_trylock(ethr_mutex *mtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx || mtx->initialized != ETHR_MUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_mutex_trylock__(mtx);
-}
-
-int
-ethr_mutex_lock(ethr_mutex *mtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx || mtx->initialized != ETHR_MUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_mutex_lock__(mtx);
-}
-
-int
-ethr_mutex_unlock(ethr_mutex *mtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx || mtx->initialized != ETHR_MUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_mutex_unlock__(mtx);
-}
-
-/*
- * Condition variable functions
- */
-
-int
-ethr_cond_init(ethr_cond *cnd)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!cnd) {
-	ASSERT(0);
-	return EINVAL;
-    }
-    cnd->initialized = ETHR_COND_INITIALIZED;
-#endif
-    return pthread_cond_init(&cnd->pt_cnd, NULL);
-}
-
-int
-ethr_cond_destroy(ethr_cond *cnd)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!cnd || cnd->initialized != ETHR_COND_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-    cnd->initialized = 0;
-#endif
-    return pthread_cond_destroy(&cnd->pt_cnd);
-}
-
-int
-ethr_cond_signal(ethr_cond *cnd)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!cnd || cnd->initialized != ETHR_COND_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return pthread_cond_signal(&cnd->pt_cnd);
-}
-
-int
-ethr_cond_broadcast(ethr_cond *cnd)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!cnd || cnd->initialized != ETHR_COND_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return pthread_cond_broadcast(&cnd->pt_cnd);
-}
-
-int
-ethr_cond_wait(ethr_cond *cnd, ethr_mutex *mtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!cnd
-	|| cnd->initialized != ETHR_COND_INITIALIZED
-	|| !mtx
-	|| mtx->initialized != ETHR_MUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return pthread_cond_wait(&cnd->pt_cnd, &mtx->pt_mtx);
-}
-
-int
-ethr_cond_timedwait(ethr_cond *cnd, ethr_mutex *mtx, ethr_timeval *timeout)
-{
-    struct timespec to;
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!cnd
-	|| cnd->initialized != ETHR_COND_INITIALIZED
-	|| !mtx
-	|| mtx->initialized != ETHR_MUTEX_INITIALIZED
-	|| !timeout) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-
-    to.tv_sec = timeout->tv_sec;
-    to.tv_nsec = timeout->tv_nsec;
-
-    return pthread_cond_timedwait(&cnd->pt_cnd, &mtx->pt_mtx, &to);
-}
-
-
-#ifdef ETHR_HAVE_PTHREAD_RWLOCK_INIT
-
-int
-ethr_rwmutex_init(ethr_rwmutex *rwmtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!rwmtx) {
-	ASSERT(0);
-	return EINVAL;
-    }
-    rwmtx->initialized = ETHR_RWMUTEX_INITIALIZED;
-#endif
-    return pthread_rwlock_init(&rwmtx->pt_rwlock, write_pref_attr);
-}
-
-int
-ethr_rwmutex_destroy(ethr_rwmutex *rwmtx)
-{
-    int res;
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = pthread_rwlock_destroy(&rwmtx->pt_rwlock);
-#if ETHR_XCHK
-    rwmtx->initialized = 0;
-#endif
-    return res;
-}
-
-int
-ethr_rwmutex_tryrlock(ethr_rwmutex *rwmtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_rwmutex_tryrlock__(rwmtx);
-}
-
-int
-ethr_rwmutex_rlock(ethr_rwmutex *rwmtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_rwmutex_rlock__(rwmtx);
-}
-
-int
-ethr_rwmutex_runlock(ethr_rwmutex *rwmtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_rwmutex_runlock__(rwmtx);
-}
-
-int
-ethr_rwmutex_tryrwlock(ethr_rwmutex *rwmtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_rwmutex_tryrwlock__(rwmtx);
-}
-
-int
-ethr_rwmutex_rwlock(ethr_rwmutex *rwmtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_rwmutex_rwlock__(rwmtx);
-}
-
-int
-ethr_rwmutex_rwunlock(ethr_rwmutex *rwmtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_rwmutex_rwunlock__(rwmtx);
-}
-
-#endif /* #ifdef ETHR_HAVE_PTHREAD_RWLOCK_INIT */
-
-/*
- * Current time
- */
-
-int
-ethr_time_now(ethr_timeval *time)
-{
-    int res;
-    struct timeval tv;
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!time) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-
-    res = gettimeofday(&tv, NULL);
-    time->tv_sec = (long) tv.tv_sec;
-    time->tv_nsec = ((long) tv.tv_usec)*1000;
-    return res;
-}
-
-/*
- * Thread specific data
- */
-
-int
-ethr_tsd_key_create(ethr_tsd_key *keyp)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!keyp) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return pthread_key_create((pthread_key_t *) keyp, NULL);
-}
-
-int
-ethr_tsd_key_delete(ethr_tsd_key key)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-#endif
-    return pthread_key_delete((pthread_key_t) key);
-}
-
-int
-ethr_tsd_set(ethr_tsd_key key, void *value)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-#endif
-    return pthread_setspecific((pthread_key_t) key, value);
-}
-
-void *
-ethr_tsd_get(ethr_tsd_key key)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return NULL;
-    }
-#endif
-    return pthread_getspecific((pthread_key_t) key);
-}
-
-/*
- * Signal functions
- */
-
-#if ETHR_HAVE_ETHR_SIG_FUNCS
-
-int ethr_sigmask(int how, const sigset_t *set, sigset_t *oset)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!set && !oset) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-  return pthread_sigmask(how, set, oset);
-}
-
-int ethr_sigwait(const sigset_t *set, int *sig)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!set || !sig) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    if (sigwait(set, sig) < 0)
-	return errno;
-    return 0;
-}
-
-#endif /* #if ETHR_HAVE_ETHR_SIG_FUNCS */
-
-#elif defined(ETHR_WIN32_THREADS)
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
- * Native win32 threads implementation                                       *
-\*                                                                           */
-
-#define INVALID_TID -1
-
-/* The spin count values are more or less taken out of the blue */
-#define ETHR_MUTEX_SPIN_COUNT	5000
-#define ETHR_COND_SPIN_COUNT	1000
-
-ethr_tid serial_shift; /* Bits to shift serial when constructing a tid */
-ethr_tid last_serial; /* Last thread table serial used */
-ethr_tid last_ix; /* Last thread table index used */
-ethr_tid thr_ix_mask; /* Mask used to mask out thread table index from a tid */
-
-/* Event used for conditional variables. On per thread. */
-/*typedef struct cnd_wait_event__ cnd_wait_event_;*/
-struct cnd_wait_event__ {
-    HANDLE handle;
-    cnd_wait_event_ *prev;
-    cnd_wait_event_ *next;
-    int in_queue;
-};
-
-/* Thread specific data. Stored in the thread table */
-typedef struct {
-    ethr_tid thr_id;
-    HANDLE thr_handle;
-    ethr_tid joiner;
-    void *result;
-    cnd_wait_event_ wait_event;
-} thr_data_;
-
-/* Argument passed to thr_wrapper() */
-typedef struct {
-    void * (*func)(void *);
-    void * arg;
-    thr_data_ *ptd;
-    thr_data_ *td;
-    int res;
-    void *prep_func_res;
-} thr_wrap_data_;
-
-
-static CRITICAL_SECTION thr_table_cs; /* Critical section used to protect
-					 the thread table from concurrent
-					 accesses. */
-static CRITICAL_SECTION fake_static_init_cs; /* Critical section used to protect
-					initialazition of 'statically
-					initialized' mutexes */
-static thr_data_ * thr_table[ETHR_MAX_THREADS]; /* The thread table */
-
-static DWORD tls_own_thr_data;
-
-static thr_data_ main_thr_data;
-
-#define THR_IX(TID)	((TID) & thr_ix_mask)
-#define OWN_THR_DATA	((thr_data_ *) TlsGetValue(tls_own_thr_data))
-
-/*
- * ----------------------------------------------------------------------------
- * Static functions
- * ----------------------------------------------------------------------------
- */
-
-static int
-get_errno(void)
-{
-    switch (GetLastError()) {
-    case ERROR_INVALID_FUNCTION:		return EINVAL;	/* 1	*/
-    case ERROR_FILE_NOT_FOUND:			return ENOENT;	/* 2	*/
-    case ERROR_PATH_NOT_FOUND:			return ENOENT;	/* 3	*/
-    case ERROR_TOO_MANY_OPEN_FILES:		return EMFILE;	/* 4	*/
-    case ERROR_ACCESS_DENIED:			return EACCES;	/* 5	*/
-    case ERROR_INVALID_HANDLE:			return EBADF;	/* 6	*/
-    case ERROR_ARENA_TRASHED:			return ENOMEM;	/* 7	*/
-    case ERROR_NOT_ENOUGH_MEMORY:		return ENOMEM;	/* 8	*/
-    case ERROR_INVALID_BLOCK:			return ENOMEM;	/* 9	*/
-    case ERROR_BAD_ENVIRONMENT:			return E2BIG;	/* 10	*/
-    case ERROR_BAD_FORMAT:			return ENOEXEC;	/* 11	*/
-    case ERROR_INVALID_ACCESS:			return EINVAL;	/* 12	*/
-    case ERROR_INVALID_DATA:			return EINVAL;	/* 13	*/
-    case ERROR_OUTOFMEMORY:			return ENOMEM;	/* 14	*/
-    case ERROR_INVALID_DRIVE:			return ENOENT;	/* 15	*/
-    case ERROR_CURRENT_DIRECTORY:		return EACCES;	/* 16	*/
-    case ERROR_NOT_SAME_DEVICE:			return EXDEV;	/* 17	*/
-    case ERROR_NO_MORE_FILES:			return ENOENT;	/* 18	*/
-    case ERROR_WRITE_PROTECT:			return EACCES;	/* 19	*/
-    case ERROR_BAD_UNIT:			return EACCES;	/* 20	*/
-    case ERROR_NOT_READY:			return EACCES;	/* 21	*/
-    case ERROR_BAD_COMMAND:			return EACCES;	/* 22	*/
-    case ERROR_CRC:				return EACCES;	/* 23	*/
-    case ERROR_BAD_LENGTH:			return EACCES;	/* 24	*/
-    case ERROR_SEEK:				return EACCES;	/* 25	*/
-    case ERROR_NOT_DOS_DISK:			return EACCES;	/* 26	*/
-    case ERROR_SECTOR_NOT_FOUND:		return EACCES;	/* 27	*/
-    case ERROR_OUT_OF_PAPER:			return EACCES;	/* 28	*/
-    case ERROR_WRITE_FAULT:			return EACCES;	/* 29	*/
-    case ERROR_READ_FAULT:			return EACCES;	/* 30	*/
-    case ERROR_GEN_FAILURE:			return EACCES;	/* 31	*/
-    case ERROR_SHARING_VIOLATION:		return EACCES;	/* 32	*/
-    case ERROR_LOCK_VIOLATION:			return EACCES;	/* 33	*/
-    case ERROR_WRONG_DISK:			return EACCES;	/* 34	*/
-    case ERROR_SHARING_BUFFER_EXCEEDED:		return EACCES;	/* 36	*/
-    case ERROR_BAD_NETPATH:			return ENOENT;	/* 53	*/
-    case ERROR_NETWORK_ACCESS_DENIED:		return EACCES;	/* 65	*/
-    case ERROR_BAD_NET_NAME:			return ENOENT;	/* 67	*/
-    case ERROR_FILE_EXISTS:			return EEXIST;	/* 80	*/
-    case ERROR_CANNOT_MAKE:			return EACCES;	/* 82	*/
-    case ERROR_FAIL_I24:			return EACCES;	/* 83	*/
-    case ERROR_INVALID_PARAMETER:		return EINVAL;	/* 87	*/
-    case ERROR_NO_PROC_SLOTS:			return EAGAIN;	/* 89	*/
-    case ERROR_DRIVE_LOCKED:			return EACCES;	/* 108	*/
-    case ERROR_BROKEN_PIPE:			return EPIPE;	/* 109	*/
-    case ERROR_DISK_FULL:			return ENOSPC;	/* 112	*/
-    case ERROR_INVALID_TARGET_HANDLE:		return EBADF;	/* 114	*/
-    case ERROR_WAIT_NO_CHILDREN:		return ECHILD;	/* 128	*/
-    case ERROR_CHILD_NOT_COMPLETE:		return ECHILD;	/* 129	*/
-    case ERROR_DIRECT_ACCESS_HANDLE:		return EBADF;	/* 130	*/
-    case ERROR_NEGATIVE_SEEK:			return EINVAL;	/* 131	*/
-    case ERROR_SEEK_ON_DEVICE:			return EACCES;	/* 132	*/
-    case ERROR_DIR_NOT_EMPTY:			return ENOTEMPTY;/* 145	*/
-    case ERROR_NOT_LOCKED:			return EACCES;	/* 158	*/
-    case ERROR_BAD_PATHNAME:			return ENOENT;	/* 161	*/
-    case ERROR_MAX_THRDS_REACHED:		return EAGAIN;	/* 164	*/
-    case ERROR_LOCK_FAILED:			return EACCES;	/* 167	*/
-    case ERROR_ALREADY_EXISTS:			return EEXIST;	/* 183	*/
-    case ERROR_INVALID_STARTING_CODESEG:	return ENOEXEC;	/* 188	*/
-    case ERROR_INVALID_STACKSEG:		return ENOEXEC;	/* 189	*/
-    case ERROR_INVALID_MODULETYPE:		return ENOEXEC;	/* 190	*/
-    case ERROR_INVALID_EXE_SIGNATURE:		return ENOEXEC;	/* 191	*/
-    case ERROR_EXE_MARKED_INVALID:		return ENOEXEC;	/* 192	*/
-    case ERROR_BAD_EXE_FORMAT:			return ENOEXEC;	/* 193	*/
-    case ERROR_ITERATED_DATA_EXCEEDS_64k:	return ENOEXEC;	/* 194	*/
-    case ERROR_INVALID_MINALLOCSIZE:		return ENOEXEC;	/* 195	*/
-    case ERROR_DYNLINK_FROM_INVALID_RING:	return ENOEXEC;	/* 196	*/
-    case ERROR_IOPL_NOT_ENABLED:		return ENOEXEC;	/* 197	*/
-    case ERROR_INVALID_SEGDPL:			return ENOEXEC;	/* 198	*/
-    case ERROR_AUTODATASEG_EXCEEDS_64k:		return ENOEXEC;	/* 199	*/
-    case ERROR_RING2SEG_MUST_BE_MOVABLE:	return ENOEXEC;	/* 200	*/
-    case ERROR_RELOC_CHAIN_XEEDS_SEGLIM:	return ENOEXEC;	/* 201	*/
-    case ERROR_INFLOOP_IN_RELOC_CHAIN:		return ENOEXEC;	/* 202	*/
-    case ERROR_FILENAME_EXCED_RANGE:		return ENOENT;	/* 206	*/
-    case ERROR_NESTING_NOT_ALLOWED:		return EAGAIN;	/* 215	*/
-    case ERROR_NOT_ENOUGH_QUOTA:		return ENOMEM;	/* 1816	*/
-    default:					return EINVAL;
-    }
-}
-
-static ETHR_INLINE thr_data_ *
-tid2thr(ethr_tid tid)
-{
-    ethr_tid ix;
-    thr_data_ *td;
-    
-    if (tid < 0)
-	return NULL;
-    ix = THR_IX(tid);
-    if (ix >= ETHR_MAX_THREADS)
-	return NULL;
-    td = thr_table[ix];
-    if (!td)
-	return NULL;
-    if (td->thr_id != tid)
-	return NULL;
-    return td;
-}
-
-static ETHR_INLINE void
-new_tid(ethr_tid *new_tid, ethr_tid *new_serial, ethr_tid *new_ix)
-{
-    ethr_tid tmp_serial = last_serial;
-    ethr_tid tmp_ix = last_ix + 1;
-    ethr_tid start_ix = tmp_ix;
-
-
-    do {
-	if (tmp_ix >= ETHR_MAX_THREADS) {
-	    tmp_serial++;
-	    if ((tmp_serial << serial_shift) < 0)
-		tmp_serial = 0;
-	    tmp_ix = 0;
-	}
-	if (!thr_table[tmp_ix]) {
-	    *new_tid	= (tmp_serial << serial_shift) | tmp_ix;
-	    *new_serial	= tmp_serial;
-	    *new_ix	= tmp_ix;
-	    return;
-	}
-	tmp_ix++;
-    } while (tmp_ix != start_ix);
-
-    *new_tid	= INVALID_TID;
-    *new_serial	= INVALID_TID;
-    *new_ix	= INVALID_TID;
-
-}
-
-
-static void thr_exit_cleanup(thr_data_ *td, void *res)
-{
-
-    ASSERT(td == OWN_THR_DATA);
-
-    run_exit_handlers();
-
-    EnterCriticalSection(&thr_table_cs);
-    CloseHandle(td->wait_event.handle);
-    if (td->thr_handle == INVALID_HANDLE_VALUE) {
-	/* We are detached; cleanup thread table */
-	ASSERT(td->joiner == INVALID_TID);
-	ASSERT(td == thr_table[THR_IX(td->thr_id)]);
-	thr_table[THR_IX(td->thr_id)] = NULL;
-	if (td != &main_thr_data)
-	    (*freep)((void *) td);
-    }
-    else {
-	/* Save result and let joining thread cleanup */
-	td->result = res;
-    }
-    LeaveCriticalSection(&thr_table_cs);
-}
-
-static unsigned __stdcall thr_wrapper(LPVOID args)
-{
-    void *(*func)(void*) = ((thr_wrap_data_ *) args)->func;
-    void *arg = ((thr_wrap_data_ *) args)->arg;
-    thr_data_ *td = ((thr_wrap_data_ *) args)->td;
-
-    td->wait_event.handle = CreateEvent(NULL, FALSE, FALSE, NULL);
-    if (td->wait_event.handle == INVALID_HANDLE_VALUE
-	|| !TlsSetValue(tls_own_thr_data, (LPVOID) td)) {
-	((thr_wrap_data_ *) args)->res = get_errno();
-	if (td->wait_event.handle != INVALID_HANDLE_VALUE)
-	    CloseHandle(td->wait_event.handle);
-	SetEvent(((thr_wrap_data_ *) args)->ptd->wait_event.handle);
-	_endthreadex((unsigned) 0);
-	ASSERT(0);
-    }
-
-    td->wait_event.prev = NULL;
-    td->wait_event.next = NULL;
-    td->wait_event.in_queue = 0;
-
-    if (thread_create_child_func)
-	(*thread_create_child_func)(((thr_wrap_data_ *) args)->prep_func_res);
-
-    ASSERT(td == OWN_THR_DATA);
-
-    ((thr_wrap_data_ *) args)->res = 0;
-    SetEvent(((thr_wrap_data_ *) args)->ptd->wait_event.handle);
-
-    thr_exit_cleanup(td, (*func)(arg));
-    return 0;
-}
-
-int
-ethr_fake_static_mutex_init(ethr_mutex *mtx)
-{
-    EnterCriticalSection((CRITICAL_SECTION *) &fake_static_init_cs);
-    /* Got here under race conditions; check again... */
-    if (!mtx->initialized) {
-	if (!InitializeCriticalSectionAndSpinCount(&mtx->cs,
-						   ETHR_MUTEX_SPIN_COUNT))
-	    return get_errno();
-	mtx->initialized = ETHR_MUTEX_INITIALIZED;
-    }
-    LeaveCriticalSection((CRITICAL_SECTION *) &fake_static_init_cs);
-    return 0;
-}
-
-static int
-fake_static_cond_init(ethr_cond *cnd)
-{
-    EnterCriticalSection((CRITICAL_SECTION *) &fake_static_init_cs);
-    /* Got here under race conditions; check again... */
-    if (!cnd->initialized) {
-	if (!InitializeCriticalSectionAndSpinCount(&cnd->cs,
-						   ETHR_COND_SPIN_COUNT))
-	    return get_errno();
-	cnd->queue = NULL;
-	cnd->queue_end = NULL;
-	cnd->initialized = ETHR_COND_INITIALIZED;
-    }
-    LeaveCriticalSection((CRITICAL_SECTION *) &fake_static_init_cs);
-    return 0;
-}
-
-#ifdef __GNUC__
-#define LL_LITERAL(X) X##LL
-#else
-#define LL_LITERAL(X) X##i64
-#endif
-
-#define EPOCH_JULIAN_DIFF LL_LITERAL(11644473600)
-
-static ETHR_INLINE void
-get_curr_time(long *sec, long *nsec)
-{
-    SYSTEMTIME t;
-    FILETIME ft;
-    LONGLONG lft;
-
-    GetSystemTime(&t);
-    SystemTimeToFileTime(&t, &ft);
-    memcpy(&lft, &ft, sizeof(lft));
-    *nsec = ((long) (lft % LL_LITERAL(10000000)))*100;
-    *sec = (long) ((lft / LL_LITERAL(10000000)) - EPOCH_JULIAN_DIFF);
-}
-
-static cnd_wait_event_ *cwe_freelist;
-static CRITICAL_SECTION cwe_cs;
-
-static int
-alloc_cwe(cnd_wait_event_ **cwe_res)
-{
-    cnd_wait_event_ *cwe;
-    EnterCriticalSection(&cwe_cs);
-    cwe = cwe_freelist;
-    if (cwe) {
-	cwe_freelist = cwe->next;
-	LeaveCriticalSection(&cwe_cs);
-    }
-    else {
-	LeaveCriticalSection(&cwe_cs);
-	cwe = (*allocp)(sizeof(cnd_wait_event_));
-	if (!cwe)
-	    return ENOMEM;
-	cwe->handle = CreateEvent(NULL, FALSE, FALSE, NULL);
-	if (cwe->handle == INVALID_HANDLE_VALUE) {
-	    int res = get_errno();
-	    (*freep)(cwe);
-	    return res;
-	}
-    }
-    *cwe_res = cwe;
-    return 0;
-}
-
-static
-free_cwe(cnd_wait_event_ *cwe)
-{
-    EnterCriticalSection(&cwe_cs);
-    cwe->next = cwe_freelist;
-    cwe_freelist = cwe;
-    LeaveCriticalSection(&cwe_cs);
-}
-
-static ETHR_INLINE int
-condwait(ethr_cond *cnd,
-	 ethr_mutex *mtx,
-	 int with_timeout,
-	 ethr_timeval *timeout)
-{
-    int res;
-    thr_data_ *td;
-    cnd_wait_event_ *cwe;
-    DWORD code;
-    long time; /* time until timeout in milli seconds */
-
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-
-    if (!mtx
-	|| mtx->initialized != ETHR_MUTEX_INITIALIZED
-	|| !cnd
-	|| (cnd->initialized && cnd->initialized != ETHR_COND_INITIALIZED)
-	|| (with_timeout && !timeout)) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-
-    td = OWN_THR_DATA;
-    if (td)
-	cwe = &td->wait_event;
-    else { /* A non-ethread thread */
-	res = alloc_cwe(&cwe);
-	if (res != 0)
-	    return res;
-    }
-
-    if (!cnd->initialized)
-	fake_static_cond_init(cnd);
-    EnterCriticalSection(&cnd->cs);
-
-    ASSERT(!cwe->in_queue);
-    if (cnd->queue_end) {
-	ASSERT(cnd->queue);
-	cwe->prev = cnd->queue_end;
-	cwe->next = NULL;
-	cnd->queue_end->next = cwe;
-	cnd->queue_end = cwe;
-    }
-    else {
-	ASSERT(!cnd->queue);
-	cwe->prev = NULL;
-	cwe->next = NULL;
-	cnd->queue = cwe;
-	cnd->queue_end = cwe;
-    }
-    cwe->in_queue = 1;
-
-    LeaveCriticalSection(&cnd->cs);
- 
-    LeaveCriticalSection(&mtx->cs);
-
-    if (!with_timeout)
-	time = INFINITE;
-    else {
-	long sec, nsec;
-	ASSERT(timeout);
-	get_curr_time(&sec, &nsec);
-	time = (timeout->tv_sec - sec)*1000;
-	time += (timeout->tv_nsec - nsec + 500)/1000000;
-	if (time < 0)
-	    time = 0;
-    }
-
-    /* wait for event to signal */
-    code = WaitForSingleObject(cwe->handle, time);
-
-    EnterCriticalSection(&mtx->cs);
-
-    if (code == WAIT_OBJECT_0) {
-	/* We were woken by a signal or a broadcast ... */
-	res = 0;
-
-	/* ... no need to remove event from wait queue since this was
-	   taken care of by the signal or broadcast */
-#ifdef DEBUG
-	EnterCriticalSection(&cnd->cs);
-	ASSERT(!cwe->in_queue);
-	LeaveCriticalSection(&cnd->cs);
-#endif
-
-    }
-    else {
-	/* We timed out... */
-	res = ETIMEDOUT;
-
-	/* ... probably have to remove event from wait queue ... */
-	EnterCriticalSection(&cnd->cs);
-
-	if (cwe->in_queue) { /* ... but we must check that we are in queue
-				since a signal or broadcast after timeout
-				may have removed us from the queue */
-	    if (cwe->prev) {
-		cwe->prev->next = cwe->next;
-	    }
-	    else {
-		ASSERT(cnd->queue == cwe);
-		cnd->queue = cwe->next;
-	    }
-
-	    if (cwe->next) {
-		cwe->next->prev = cwe->prev;
-	    }
-	    else {
-		ASSERT(cnd->queue_end == cwe);
-		cnd->queue_end = cwe->prev;
-	    }
-	    cwe->in_queue = 0;
-	}
-
-	LeaveCriticalSection(&cnd->cs);
-
-    }
-
-    if (!td)
-	free_cwe(cwe);
-
-    return res;
-
-}
-
-
-/*
- * ----------------------------------------------------------------------------
- * Exported functions
- * ----------------------------------------------------------------------------
- */
-
-int
-ethr_init(ethr_init_data *id)
-{
-#ifdef _WIN32_WINNT
-    DWORD major = (_WIN32_WINNT >> 8) & 0xff;
-    DWORD minor = _WIN32_WINNT & 0xff;
-    OSVERSIONINFO os_version;
-#endif
-    int err = 0;
-    thr_data_ *td = &main_thr_data;
-    unsigned long i;
-
-    if (!ethr_not_inited)
-	return EINVAL;
-
-#ifdef _WIN32_WINNT
-    os_version.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    GetVersionEx(&os_version);
-    if (os_version.dwPlatformId != VER_PLATFORM_WIN32_NT
-	|| os_version.dwMajorVersion < major
-	|| (os_version.dwMajorVersion == major
-	    && os_version.dwMinorVersion < minor))
-	return ENOTSUP;
-#endif
-
-    ASSERT(ETHR_MAX_THREADS > 0);
-    for (i = ETHR_MAX_THREADS - 1, serial_shift = 0;
-	 i;
-	 serial_shift++, i >>= 1);
-    thr_ix_mask = ~(~((ethr_tid) 0) << serial_shift);
-
-    tls_own_thr_data = TlsAlloc();
-    if (tls_own_thr_data == TLS_OUT_OF_INDEXES)
-	goto error;
-
-    last_serial = 0;
-    last_ix = 0;
-
-    td->thr_id = 0;
-    td->thr_handle = GetCurrentThread();
-    td->joiner = INVALID_TID;
-    td->result = NULL;
-    td->wait_event.handle = CreateEvent(NULL, FALSE, FALSE, NULL);
-    if (td->wait_event.handle == INVALID_HANDLE_VALUE)
-	goto error;
-    td->wait_event.prev = NULL;
-    td->wait_event.next = NULL;
-    td->wait_event.in_queue = 0;
-    thr_table[0] = td;
-
-    if (!TlsSetValue(tls_own_thr_data, (LPVOID) td))
-	goto error;
-
-    ASSERT(td == OWN_THR_DATA);
-
-
-    cwe_freelist = NULL;
-    if (!InitializeCriticalSectionAndSpinCount(&cwe_cs,
-					       ETHR_MUTEX_SPIN_COUNT))
-	goto error;
-
-    for (i = 1; i < ETHR_MAX_THREADS; i++)
-	thr_table[i] = NULL;
-
-    if (!InitializeCriticalSectionAndSpinCount(&thr_table_cs,
-					       ETHR_MUTEX_SPIN_COUNT))
-	goto error;
-    if (!InitializeCriticalSectionAndSpinCount(&fake_static_init_cs,
-					       ETHR_MUTEX_SPIN_COUNT))
-	goto error;
-    ethr_not_inited = 0;
-
-    err = init_common(id);
-    if (err)
-	goto error;
-
-    return 0;
-
- error:
-    ethr_not_inited = 1;
-    if (err == 0)
-	err = get_errno();
-    ASSERT(err != 0);
-    if (td->thr_handle != INVALID_HANDLE_VALUE)
-	CloseHandle(td->thr_handle);
-    if (td->wait_event.handle != INVALID_HANDLE_VALUE)
-	CloseHandle(td->wait_event.handle);
-    return err;
-}
-
-/*
- * Thread functions.
- */
-
-int
-ethr_thr_create(ethr_tid *tid, void * (*func)(void *), void *arg,
-		ethr_thr_opts *opts)
-{
-    int err = 0;
-    thr_wrap_data_ twd;
-    thr_data_ *my_td, *child_td = NULL;
-    ethr_tid child_tid, child_serial, child_ix;
-    DWORD code;
-    unsigned ID;
-    unsigned stack_size = 0; /* 0 = system default */
-    int use_stack_size = (opts && opts->suggested_stack_size >= 0
-			  ? opts->suggested_stack_size
-			  : -1 /* Use system default */);
-
-#ifdef ETHR_MODIFIED_DEFAULT_STACK_SIZE
-    if (use_stack_size < 0)
-	use_stack_size = ETHR_MODIFIED_DEFAULT_STACK_SIZE;
-#endif
-
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!tid || !func) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-
-    my_td = OWN_THR_DATA;
-    if (!my_td) {
-	/* Only ethreads are allowed to call this function */
-	ASSERT(0);
-	return EACCES;
-    }
-
-    if (use_stack_size >= 0) {
-	size_t suggested_stack_size = (size_t) use_stack_size;
-#ifdef DEBUG
-	suggested_stack_size /= 2; /* Make sure we got margin */
-#endif
-	if (suggested_stack_size < min_stack_size)
-	    stack_size = (unsigned) ETHR_KW2B(min_stack_size);
-	else if (suggested_stack_size > max_stack_size)
-	    stack_size = (unsigned) ETHR_KW2B(max_stack_size);
-	else
-	    stack_size =
-		(unsigned) ETHR_PAGE_ALIGN(ETHR_KW2B(suggested_stack_size));
-    }
-
-    EnterCriticalSection(&thr_table_cs);
-
-    /* Call prepare func if it exist */
-    if (thread_create_prepare_func)
-	twd.prep_func_res = (*thread_create_prepare_func)();
-    else
-	twd.prep_func_res = NULL;
-
-    /* Find a new thread id to use */
-    new_tid(&child_tid, &child_serial, &child_ix);
-    if (child_tid == INVALID_TID) {
-	err = EAGAIN;
-	goto error;
-    }
-
-    ASSERT(child_ix == THR_IX(child_tid));
-
-    *tid = child_tid;
-
-    ASSERT(!thr_table[child_ix]);
-
-    /* Alloc thread data */
-    thr_table[child_ix] = child_td = (thr_data_ *) (*allocp)(sizeof(thr_data_));
-    if (!child_td) {
-	err = ENOMEM;
-	goto error;
-    }
-
-    /* Init thread data */
-
-    child_td->thr_id		= child_tid;
-    child_td->thr_handle	= INVALID_HANDLE_VALUE;
-    child_td->joiner		= INVALID_TID;
-    child_td->result		= NULL;
-    /* 'child_td->wait_event' is initialized by child thread */
-
-
-    /* Init thread wrapper data */
-
-    twd.func			= func;
-    twd.arg			= arg;
-    twd.ptd			= my_td;
-    twd.td			= child_td;
-    twd.res			= 0;
-
-    ASSERT(!my_td->wait_event.in_queue);
-
-    /* spawn the thr_wrapper function */
-    child_td->thr_handle = (HANDLE) _beginthreadex(NULL,
-						   stack_size,
-						   thr_wrapper,
-						   (LPVOID) &twd,
-						   0,
-						   &ID);
-    if (child_td->thr_handle == (HANDLE) 0) {
-	child_td->thr_handle = INVALID_HANDLE_VALUE;
-	goto error;
-    }
-
-    ASSERT(child_td->thr_handle != INVALID_HANDLE_VALUE);
-
-    /* Wait for child to finish initialization */
-    code = WaitForSingleObject(my_td->wait_event.handle, INFINITE);
-    if (twd.res || code != WAIT_OBJECT_0) {
-	err = twd.res;
-	goto error;
-    }
-
-    if (opts && opts->detached) {
-	CloseHandle(child_td->thr_handle);
-	child_td->thr_handle = INVALID_HANDLE_VALUE;
-    }
-
-    last_serial	= child_serial;
-    last_ix	= child_ix;
-
-    ASSERT(thr_table[child_ix] == child_td);
-
-    if (thread_create_parent_func)
-	(*thread_create_parent_func)(twd.prep_func_res);
-
-    LeaveCriticalSection(&thr_table_cs);
-
-    return 0;
-
- error:
-
-    if (err == 0)
-	err = get_errno();
-    ASSERT(err != 0);
-
-    if (thread_create_parent_func)
-	(*thread_create_parent_func)(twd.prep_func_res);
-
-    if (child_ix != INVALID_TID) {
-
-	if (child_td) {
-	    ASSERT(thr_table[child_ix] == child_td);
-
-	    if (child_td->thr_handle != INVALID_HANDLE_VALUE) {
-		WaitForSingleObject(child_td->thr_handle, INFINITE);
-		CloseHandle(child_td->thr_handle);
-	    }
-
-	    (*freep)((void *) child_td);
-	    thr_table[child_ix] = NULL;
-	}
-    }
-
-    *tid = INVALID_TID;
-
-    LeaveCriticalSection(&thr_table_cs);
-    return err;
-}
-
-int ethr_thr_join(ethr_tid tid, void **res)
-{
-    int err = 0;
-    DWORD code;
-    thr_data_ *td;
-    thr_data_ *my_td;
-
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-#endif
-
-    my_td = OWN_THR_DATA;
-
-    if (!my_td) {
-	/* Only ethreads are allowed to call this function */
-	ASSERT(0);
-	return EACCES;
-    }
-
-    EnterCriticalSection(&thr_table_cs);
-
-    td = tid2thr(tid);
-    if (!td)
-	err = ESRCH;
-    else if (td->thr_handle == INVALID_HANDLE_VALUE /* i.e. detached */
-	     || td->joiner != INVALID_TID) /* i.e. someone else is joining */
-	err = EINVAL;
-    else if (my_td == td)
-	err = EDEADLK;
-    else
-	td->joiner = my_td->thr_id;
-
-    LeaveCriticalSection(&thr_table_cs);
-
-    if (err)
-	goto error;
-
-    /* Wait for thread to terminate */
-    code = WaitForSingleObject(td->thr_handle, INFINITE);
-    if (code != WAIT_OBJECT_0)
-	goto error;
-
-    EnterCriticalSection(&thr_table_cs);
-
-    ASSERT(td == tid2thr(tid));
-    ASSERT(td->thr_handle != INVALID_HANDLE_VALUE);
-    ASSERT(td->joiner == my_td->thr_id);
-
-    if (res)
-	*res = td->result;
-
-    CloseHandle(td->thr_handle);
-    ASSERT(td == thr_table[THR_IX(td->thr_id)]);
-    thr_table[THR_IX(td->thr_id)] = NULL;
-    if (td != &main_thr_data)
-	(*freep)((void *) td);
-
-    LeaveCriticalSection(&thr_table_cs);
-
-    return 0;
-
- error:
-    if (err == 0)
-	err = get_errno();
-    ASSERT(err != 0);
-    return err;
-}
-
-
-int
-ethr_thr_detach(ethr_tid tid)
-{
-    int res;
-    DWORD code;
-    thr_data_ *td;
-
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-#endif
-
-    if (!OWN_THR_DATA) {
-	/* Only ethreads are allowed to call this function */
-	ASSERT(0);
-	return EACCES;
-    }
-
-    EnterCriticalSection(&thr_table_cs);
-
-    td = tid2thr(tid);
-    if (!td)
-	res = ESRCH;
-    if (td->thr_handle == INVALID_HANDLE_VALUE /* i.e. detached */
-	|| td->joiner != INVALID_TID) /* i.e. someone is joining */
-	res = EINVAL;
-    else {
-	res = 0;
-	CloseHandle(td->thr_handle);
-	td->thr_handle = INVALID_HANDLE_VALUE;
-    }
-
-    LeaveCriticalSection(&thr_table_cs);
-
-    return res;
-}
-
-
-void
-ethr_thr_exit(void *res)
-{
-    thr_data_ *td;
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return;
-    }
-#endif
-    td = OWN_THR_DATA;
-    if (!td) {
-	/* Only ethreads are allowed to call this function */
-	ASSERT(0);
-	return;
-    }
-    thr_exit_cleanup(td, res);
-    _endthreadex((unsigned) 0);
-}
-
-ethr_tid
-ethr_self(void)
-{
-    thr_data_ *td;
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return INVALID_TID;
-    }
-#endif
-    /* It is okay for non-ethreads (i.e. native win32 threads) to call
-       ethr_self(). They will however be returned the INVALID_TID. */
-    td = OWN_THR_DATA;
-    if (!td)
-	return INVALID_TID;
-    return td->thr_id;
-}
-
-int
-ethr_equal_tids(ethr_tid tid1, ethr_tid tid2)
-{
-    /* INVALID_TID does not equal any tid, not even the INVALID_TID */
-    return tid1 == tid2 && tid1 != INVALID_TID;
-}
-
-/*
- * Mutex functions.
- */
-
-int
-ethr_mutex_init(ethr_mutex *mtx)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    if (!InitializeCriticalSectionAndSpinCount(&mtx->cs, ETHR_MUTEX_SPIN_COUNT))
-	return get_errno();
-    mtx->initialized = ETHR_MUTEX_INITIALIZED;
-#if ETHR_XCHK
-    mtx->is_rec_mtx = 0;
-#endif
-    return 0;
-}
-
-int
-ethr_rec_mutex_init(ethr_mutex *mtx)
-{
-    int res;
-    res = ethr_mutex_init(mtx);
-#if ETHR_XCHK
-    mtx->is_rec_mtx = 1;
-#endif
-    return res;
-}
-
-int
-ethr_mutex_destroy(ethr_mutex *mtx)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx || mtx->initialized != ETHR_MUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    DeleteCriticalSection(&mtx->cs);
-    mtx->initialized = 0;
-    return 0;
-}
-
-int ethr_mutex_set_forksafe(ethr_mutex *mtx)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-#endif
-    return 0; /* No fork() */
-}
-
-int ethr_mutex_unset_forksafe(ethr_mutex *mtx)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-#endif
-    return 0; /* No fork() */
-}
-
-int
-ethr_mutex_trylock(ethr_mutex *mtx)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx
-	|| (mtx->initialized && mtx->initialized != ETHR_MUTEX_INITIALIZED)) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    if (!mtx->initialized) {
-	int res = ethr_fake_static_mutex_init(mtx);
-	if (res != 0)
-	    return res;
-    }
-    return ethr_mutex_trylock__(mtx);
-}
-
-int
-ethr_mutex_lock(ethr_mutex *mtx)
-{
-    int res;
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx
-	|| (mtx->initialized && mtx->initialized != ETHR_MUTEX_INITIALIZED)) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_mutex_lock__(mtx);
-}
-
-int
-ethr_mutex_unlock(ethr_mutex *mtx)
-{
-#if ETHR_XCHK
-    int res;
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!mtx || mtx->initialized != ETHR_MUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_mutex_unlock__(mtx);
-}
-
-/*
- * Condition variable functions.
- */
-
-int
-ethr_cond_init(ethr_cond *cnd)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!cnd) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    if (!InitializeCriticalSectionAndSpinCount(&cnd->cs, ETHR_COND_SPIN_COUNT))
-	return get_errno();
-    cnd->queue = NULL;
-    cnd->queue_end = NULL;
-    cnd->initialized = ETHR_COND_INITIALIZED;
-    return 0;
-}
-
-int
-ethr_cond_destroy(ethr_cond *cnd)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!cnd
-	|| (cnd->initialized && cnd->initialized != ETHR_COND_INITIALIZED)
-	|| cnd->queue) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    DeleteCriticalSection(&cnd->cs);
-    cnd->initialized = 0;
-    return 0;
-}
-
-int
-ethr_cond_signal(ethr_cond *cnd)
-{
-    cnd_wait_event_ *cwe;
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!cnd
-	|| (cnd->initialized && cnd->initialized != ETHR_COND_INITIALIZED)) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    if (!cnd->initialized) {
-	int res = fake_static_cond_init(cnd);
-	if (res != 0)
-	    return res;
-    }
-    EnterCriticalSection(&cnd->cs);
-    cwe = cnd->queue;
-    if (cwe) {
-	ASSERT(cwe->in_queue);
-	SetEvent(cnd->queue->handle);
-	if (cwe->next)
-	    cwe->next->prev = NULL;
-	else {
-	    ASSERT(cnd->queue_end == cnd->queue);
-	    cnd->queue_end = NULL;
-	}
-	cnd->queue = cwe->next;
-	cwe->in_queue = 0;
-    }
-    LeaveCriticalSection(&cnd->cs);
-    return 0;
-}
-
-int
-ethr_cond_broadcast(ethr_cond *cnd)
-{
-    cnd_wait_event_ *cwe;
-
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!cnd
-	|| (cnd->initialized && cnd->initialized != ETHR_COND_INITIALIZED)) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    if (!cnd->initialized) {
-	int res = fake_static_cond_init(cnd);
-	if (res != 0)
-	    return res;
-    }
-    EnterCriticalSection(&cnd->cs);
-    for (cwe = cnd->queue; cwe; cwe = cwe->next) {
-	ASSERT(cwe->in_queue);
-	SetEvent(cwe->handle);
-	cwe->in_queue = 0;
-    }
-    cnd->queue = NULL;
-    cnd->queue_end = NULL;
-    LeaveCriticalSection(&cnd->cs);
-    return 0;
-
-}
-
-int
-ethr_cond_wait(ethr_cond *cnd, ethr_mutex *mtx)
-{
-    return condwait(cnd, mtx, 0, NULL);
-}
-
-int
-ethr_cond_timedwait(ethr_cond *cnd, ethr_mutex *mtx, ethr_timeval *timeout)
-{
-    return condwait(cnd, mtx, 1, timeout);
-}
-
-int
-ethr_time_now(ethr_timeval *time)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!time) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    get_curr_time(&time->tv_sec, &time->tv_nsec);
-    return 0;
-}
-
-/*
- * Thread specific data
- */
-
-int
-ethr_tsd_key_create(ethr_tsd_key *keyp)
-{
-    DWORD key;
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!keyp) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    key = TlsAlloc();
-    if (key == TLS_OUT_OF_INDEXES)
-	return get_errno();
-    *keyp = (ethr_tsd_key) key;
-    return 0;
-}
-
-int
-ethr_tsd_key_delete(ethr_tsd_key key)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-#endif
-    if (!TlsFree((DWORD) key))
-	return get_errno();
-    return 0;
-}
-
-int
-ethr_tsd_set(ethr_tsd_key key, void *value)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-#endif
-    if (!TlsSetValue((DWORD) key, (LPVOID) value))
-	return get_errno();
-    return 0;
-}
-
-void *
-ethr_tsd_get(ethr_tsd_key key)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return NULL;
-    }
-#endif
-    return (void *) TlsGetValue((DWORD) key);
-}
-
-/* Misc */
-
-#ifndef ETHR_HAVE_OPTIMIZED_LOCKS
-
-int
-ethr_do_spinlock_init(ethr_spinlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    if (InitializeCriticalSectionAndSpinCount(&lock->cs, INT_MAX))
-	return 0;
-    else
-	return get_errno();
-}
-
-int
-ethr_do_rwlock_init(ethr_rwlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    lock->counter = 0;
-    if (InitializeCriticalSectionAndSpinCount(&lock->cs, INT_MAX))
-	return 0;
-    else
-	return get_errno();    
-}
-
-#endif /* #ifndef ETHR_HAVE_OPTIMIZED_ATOMIC_OPS */
-
-#else
-#error "Missing thread implementation"
-#endif
-
-/* Atomics */
-
-int
-ethr_atomic_init(ethr_atomic_t *var, long i)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-       ASSERT(0);
-       return EACCES;
-    }  
-    if (!var) {
-       ASSERT(0);
-       return EINVAL;
-    }  
-#endif
-    return ethr_atomic_init__(var, i);
-}
-
-int
-ethr_atomic_set(ethr_atomic_t *var, long i)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-       ASSERT(0);
-       return EACCES;
-    }  
-    if (!var) {
-       ASSERT(0);
-       return EINVAL;
-    }  
-#endif
-    return ethr_atomic_set__(var, i);
-}
-
-int
-ethr_atomic_read(ethr_atomic_t *var, long *i)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-       ASSERT(0);
-       return EACCES;
-    }  
-    if (!var || !i) {
-       ASSERT(0);
-       return EINVAL;
-    }  
-#endif
-    return ethr_atomic_read__(var, i);
-}
-
-
-int
-ethr_atomic_addtest(ethr_atomic_t *var, long incr, long *testp)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-       ASSERT(0);
-       return EACCES;
-    }  
-    if (!var || !testp) {
-       ASSERT(0);
-       return EINVAL;
-    }  
-#endif
-    return ethr_atomic_addtest__(var, incr, testp);
-}   
-    
-int
-ethr_atomic_inctest(ethr_atomic_t *incp, long *testp)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!incp || !testp) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_atomic_inctest__(incp, testp);
-}
-
-int
-ethr_atomic_dectest(ethr_atomic_t *decp, long *testp)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!decp || !testp) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_atomic_dectest__(decp, testp);
-}
-
-int
-ethr_atomic_add(ethr_atomic_t *var, long incr)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-       ASSERT(0);
-       return EACCES;
-    }  
-    if (!var) {
-       ASSERT(0);
-       return EINVAL;
-    }  
-#endif
-    return ethr_atomic_add__(var, incr);
-}   
-    
-int 
-ethr_atomic_inc(ethr_atomic_t *incp)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!incp) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_atomic_inc__(incp);
-}
-
-int
-ethr_atomic_dec(ethr_atomic_t *decp)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!decp) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_atomic_dec__(decp);
-}
-
-int
-ethr_atomic_and_old(ethr_atomic_t *var, long mask, long *old)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!var || !old) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_atomic_and_old__(var, mask, old);
-}
-
-int
-ethr_atomic_or_old(ethr_atomic_t *var, long mask, long *old)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!var || !old) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_atomic_or_old__(var, mask, old);
-}
-
-int
-ethr_atomic_xchg(ethr_atomic_t *var, long new, long *old)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }  
-    if (!var || !old) {
-	ASSERT(0);
-	return EINVAL;
-    }  
-#endif
-    return ethr_atomic_xchg__(var, new, old);
-}   
-
-int
-ethr_atomic_cmpxchg(ethr_atomic_t *var, long new, long expected, long *old)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }  
-    if (!var || !old) {
-	ASSERT(0);
-	return EINVAL;
-    }  
-#endif
-    return ethr_atomic_cmpxchg__(var, new, expected, old);
-}
-
-/* Spinlocks and rwspinlocks */
-
-int
-ethr_spinlock_init(ethr_spinlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_spinlock_init__(lock);
-}
-
-int
-ethr_spinlock_destroy(ethr_spinlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_spinlock_destroy__(lock);
-}
-
-
-int
-ethr_spin_unlock(ethr_spinlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_spin_unlock__(lock);
-}
-
-int
-ethr_spin_lock(ethr_spinlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_spin_lock__(lock);
-}
-
-int
-ethr_rwlock_init(ethr_rwlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_rwlock_init__(lock);
-}
-
-int
-ethr_rwlock_destroy(ethr_rwlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_rwlock_destroy__(lock);
-}
-
-int
-ethr_read_unlock(ethr_rwlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_read_unlock__(lock);
-}
-
-int
-ethr_read_lock(ethr_rwlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_read_lock__(lock);
-}
-
-int
-ethr_write_unlock(ethr_rwlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_write_unlock__(lock);
-}
-
-int
-ethr_write_lock(ethr_rwlock_t *lock)
-{
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!lock) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    return ethr_write_lock__(lock);
-}
-
-
-int
-ethr_gate_init(ethr_gate *gp)
-{
-    int res;
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!gp) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = ethr_mutex_init(&gp->mtx);
-    if (res != 0)
-	return res;
-    res = ethr_cond_init(&gp->cnd);
-    if (res != 0) {
-	ethr_mutex_destroy(&gp->mtx);
-	return res;
-    }
-    gp->open = 0;
-    return 0;
-}
-
-int
-ethr_gate_destroy(ethr_gate *gp)
-{
-    int res, dres;
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!gp) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = ethr_mutex_destroy(&gp->mtx);
-    dres = ethr_cond_destroy(&gp->cnd);
-    if (res == 0)
-	res = dres;
-    gp->open = 0;
-    return res;
-}
-
-int
-ethr_gate_close(ethr_gate *gp)
-{
-    int res;
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!gp) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = ethr_mutex_lock__(&gp->mtx);
-    if (res != 0)
-	return res;
-    gp->open = 0;
-    res = ethr_mutex_unlock__(&gp->mtx);
-    return res;
-}
-
-int
-ethr_gate_let_through(ethr_gate *gp, unsigned no)
-{
-    int res, ures;
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!gp) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = ethr_mutex_lock__(&gp->mtx);
-    if (res != 0)
-	return res;
-    gp->open += no;
-    res = (gp->open == 1
-	   ? ethr_cond_signal(&gp->cnd)
-	   : ethr_cond_broadcast(&gp->cnd));
-    ures = ethr_mutex_unlock__(&gp->mtx);
-    if (res != 0)
-	res = ures;
-    return res;
-}
-
-int
-ethr_gate_swait(ethr_gate *gp, int spincount)
-{
-    int res, ures, n;
-#if ETHR_XCHK 
-    if (ethr_not_inited) {
-	ASSERT(0);
-	return EACCES;
-    }
-    if (!gp) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    n = spincount;
-    res = ethr_mutex_lock__(&gp->mtx);
-    if (res != 0)
-	return res;
-    while (n >= 0 && !gp->open) {
-	res = ethr_mutex_unlock__(&gp->mtx);
-	if (res != 0)
-	    return res;
-	res = ethr_mutex_lock__(&gp->mtx);
-	if (res != 0)
-	    return res;
-	n--;
-    }
-    while (!gp->open) {
-	res = ethr_cond_wait(&gp->cnd, &gp->mtx);
-	if (res != 0 && res != EINTR)
-	    goto done;
-    }
-    gp->open--;
- done:
-    ures = ethr_mutex_unlock__(&gp->mtx);
-    if (res == 0)
-	res = ures;
-    return res;
-}
-
-
-int
-ethr_gate_wait(ethr_gate *gp)
-{
-    return ethr_gate_swait(gp, 0);
-}
-
-
-/* rwmutex fallback */
-#ifdef ETHR_USE_RWMTX_FALLBACK
-
-int
-ethr_rwmutex_init(ethr_rwmutex *rwmtx)
-{
-    int res;
-#if ETHR_XCHK
-    if (!rwmtx) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = ethr_mutex_init(&rwmtx->mtx);
-    if (res != 0)
-	return res;
-    ethr_cond_init(&rwmtx->rcnd);
-    if (res != 0)
-	goto error_cleanup1;
-    res = ethr_cond_init(&rwmtx->wcnd);
-    if (res != 0)
-	goto error_cleanup2;
-    rwmtx->readers = 0;
-    rwmtx->waiting_readers = 0;
-    rwmtx->waiting_writers = 0;
-#if ETHR_XCHK
-    rwmtx->initialized = ETHR_RWMUTEX_INITIALIZED;
-#endif
-    return 0;
- error_cleanup2:
-    ethr_cond_destroy(&rwmtx->rcnd);
- error_cleanup1:
-    ethr_mutex_destroy(&rwmtx->mtx);
-    return res;
-}
-
-int
-ethr_rwmutex_destroy(ethr_rwmutex *rwmtx)
-{
-    int res, pres;
-#if ETHR_XCHK
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-    rwmtx->initialized = 0;
-#endif
-    res = ethr_mutex_destroy(&rwmtx->mtx);
-    pres = ethr_cond_destroy(&rwmtx->rcnd);
-    if (res == 0)
-	res = pres;
-    pres = ethr_cond_destroy(&rwmtx->wcnd);
-    if (res == 0)
-	res = pres;
-    return res;
-}
-
-int
-ethr_rwmutex_tryrlock(ethr_rwmutex *rwmtx)
-{
-    int res;
-#if ETHR_XCHK
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = ethr_mutex_trylock__(&rwmtx->mtx);
-    if (res != 0)
-	return res;
-    if (rwmtx->waiting_writers) {
-	res = ethr_mutex_unlock__(&rwmtx->mtx);
-	if (res == 0)
-	    return EBUSY;
-	return res;
-    }
-    rwmtx->readers++;
-    return ethr_mutex_unlock__(&rwmtx->mtx);
-}
-
-int
-ethr_rwmutex_rlock(ethr_rwmutex *rwmtx)
-{
-    int res;
-#if ETHR_XCHK
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = ethr_mutex_lock__(&rwmtx->mtx);
-    if (res != 0)
-	return res;
-    while (rwmtx->waiting_writers) {
-	rwmtx->waiting_readers++;
-	res = ethr_cond_wait(&rwmtx->rcnd, &rwmtx->mtx);
-	rwmtx->waiting_readers--;
-	if (res != 0 && res != EINTR) {
-	    (void) ethr_mutex_unlock__(&rwmtx->mtx);
-	    return res;
-	}
-    }
-    rwmtx->readers++;
-    return ethr_mutex_unlock__(&rwmtx->mtx);
-}
-
-int
-ethr_rwmutex_runlock(ethr_rwmutex *rwmtx)
-{
-    int res, ures;
-#if ETHR_XCHK
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = ethr_mutex_lock__(&rwmtx->mtx);
-    if (res != 0)
-	return res;
-    rwmtx->readers--;
-    if (!rwmtx->readers && rwmtx->waiting_writers)
-	res = ethr_cond_signal(&rwmtx->wcnd);
-    ures = ethr_mutex_unlock__(&rwmtx->mtx);
-    if (res == 0)
-	res = ures;
-    return res;
-}
-
-int
-ethr_rwmutex_tryrwlock(ethr_rwmutex *rwmtx)
-{
-    int res;
-#if ETHR_XCHK
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = ethr_mutex_trylock__(&rwmtx->mtx);
-    if (res != 0)
-	return res;
-    if (!rwmtx->readers && !rwmtx->waiting_writers)
-	return 0;
-    else {
-	res = ethr_mutex_unlock__(&rwmtx->mtx);
-	if (res == 0)
-	    return EBUSY;
-	return res;
-    }
-}
-
-int
-ethr_rwmutex_rwlock(ethr_rwmutex *rwmtx)
-{
-    int res;
-#if ETHR_XCHK
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = ethr_mutex_lock__(&rwmtx->mtx);
-    if (res != 0)
-	return res;
-    if (!rwmtx->readers && !rwmtx->waiting_writers) 
-	return 0;
-    
-    while (rwmtx->readers) {
-	rwmtx->waiting_writers++;
-	res = ethr_cond_wait(&rwmtx->wcnd, &rwmtx->mtx);
-	rwmtx->waiting_writers--;
-	if (res != 0 && res != EINTR) {
-	    (void) ethr_rwmutex_rwunlock(rwmtx);
-	    return res;
-	}
-    }
-    return 0;
-}
-
-int
-ethr_rwmutex_rwunlock(ethr_rwmutex *rwmtx)
-{
-    int res, ures;
-#if ETHR_XCHK
-    if (!rwmtx || rwmtx->initialized != ETHR_RWMUTEX_INITIALIZED) {
-	ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    res = 0;
-    if (rwmtx->waiting_writers)
-	res = ethr_cond_signal(&rwmtx->wcnd);
-    else if (rwmtx->waiting_readers)
-	res = ethr_cond_broadcast(&rwmtx->rcnd);
-    ures = ethr_mutex_unlock__(&rwmtx->mtx);
-    if (res == 0)
-	res = ures;
-    return res;
-}
-
-#endif /* #ifdef ETHR_USE_RWMTX_FALLBACK */
-
-void
-ethr_compiler_barrier(void)
-{
-
-}
-
-#ifdef DEBUG
-
-#include <stdio.h>
-int ethr_assert_failed(char *f, int l, char *a)
-{
-    fprintf(stderr, "%s:%d: Assertion failed: %s\n", f, l, a);
-    abort();
-    return 0;
-}
-
-#endif
-
-
diff --git a/erts/lib_src/pthread/ethr_event.c b/erts/lib_src/pthread/ethr_event.c
new file mode 100644
index 0000000000..9434d60d0a
--- /dev/null
+++ b/erts/lib_src/pthread/ethr_event.c
@@ -0,0 +1,225 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2009-2010. 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%
+ */
+
+/*
+ * Author: Rickard Green
+ */
+
+#define ETHR_INLINE_FUNC_NAME_(X) X ## __
+#define ETHR_EVENT_IMPL__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ethread.h"
+
+#if defined(ETHR_LINUX_FUTEX_IMPL__)
+/* --- Linux futex implementation of ethread events ------------------------- */
+
+#include <sched.h>
+#include <errno.h>
+
+#define ETHR_YIELD_AFTER_BUSY_LOOPS 50
+
+int
+ethr_event_init(ethr_event *e)
+{
+    ethr_atomic32_init(&e->futex, ETHR_EVENT_OFF__);
+    return 0;
+}
+
+int
+ethr_event_destroy(ethr_event *e)
+{
+    return 0;
+}
+
+static ETHR_INLINE int
+wait__(ethr_event *e, int spincount)
+{
+    unsigned sc = spincount;
+    int res;
+    ethr_sint32_t val;
+    int until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+
+    if (spincount < 0)
+	ETHR_FATAL_ERROR__(EINVAL);
+
+    while (1) {
+	while (1) {
+	    val = ethr_atomic32_read(&e->futex);
+	    if (val == ETHR_EVENT_ON__)
+		return 0;
+	    if (sc == 0)
+		break;
+	    sc--;
+	    ETHR_SPIN_BODY;
+	    if (--until_yield == 0) {
+		until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+		res = ETHR_YIELD();
+		if (res != 0)
+		    ETHR_FATAL_ERROR__(res);
+	    }
+	}
+
+	if (val != ETHR_EVENT_OFF_WAITER__) {
+	    val = ethr_atomic32_cmpxchg(&e->futex,
+					ETHR_EVENT_OFF_WAITER__,
+					ETHR_EVENT_OFF__);
+
+	    if (val == ETHR_EVENT_ON__)
+		return 0;
+	    ETHR_ASSERT(val == ETHR_EVENT_OFF__);
+	}
+
+	res = ETHR_FUTEX__(&e->futex,
+			   ETHR_FUTEX_WAIT__,
+			   ETHR_EVENT_OFF_WAITER__);
+	if (res == EINTR)
+	    break;
+	if (res != 0 && res != EWOULDBLOCK)
+	    ETHR_FATAL_ERROR__(res);
+    }
+
+    return res;
+}
+
+#elif defined(ETHR_PTHREADS)
+/* --- Posix mutex/cond implementation of events ---------------------------- */
+
+int
+ethr_event_init(ethr_event *e)
+{
+    int res;
+    ethr_atomic32_init(&e->state, ETHR_EVENT_OFF__);
+    res = pthread_mutex_init(&e->mtx, NULL);
+    if (res != 0)
+	return res;
+    res = pthread_cond_init(&e->cnd, NULL);
+    if (res != 0) {
+	pthread_mutex_destroy(&e->mtx);
+	return res;
+    }
+    return 0;
+}
+
+int
+ethr_event_destroy(ethr_event *e)
+{
+    int res;
+    res = pthread_mutex_destroy(&e->mtx);
+    if (res != 0)
+	return res;
+    res = pthread_cond_destroy(&e->cnd);
+    if (res != 0)
+	return res;
+    return 0;
+}
+
+static ETHR_INLINE int
+wait__(ethr_event *e, int spincount)
+{
+    int sc = spincount;
+    ethr_sint32_t val;
+    int res, ulres;
+    int until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+
+    if (spincount < 0)
+	ETHR_FATAL_ERROR__(EINVAL);
+
+    while (1) {
+	val = ethr_atomic32_read(&e->state);
+	if (val == ETHR_EVENT_ON__)
+	    return 0;
+	if (sc == 0)
+	    break;
+	sc--;
+	ETHR_SPIN_BODY;
+	if (--until_yield == 0) {
+	    until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+	    res = ETHR_YIELD();
+	    if (res != 0)
+		ETHR_FATAL_ERROR__(res);
+	}
+    }
+
+    if (val != ETHR_EVENT_OFF_WAITER__) {
+	val = ethr_atomic32_cmpxchg(&e->state,
+				    ETHR_EVENT_OFF_WAITER__,
+				    ETHR_EVENT_OFF__);
+	if (val == ETHR_EVENT_ON__)
+	    return 0;
+	ETHR_ASSERT(val == ETHR_EVENT_OFF__);
+    }
+
+    ETHR_ASSERT(val == ETHR_EVENT_OFF_WAITER__
+		|| val == ETHR_EVENT_OFF__);
+
+    res = pthread_mutex_lock(&e->mtx);
+    if (res != 0)
+	ETHR_FATAL_ERROR__(res);
+
+    while (1) {
+
+	val = ethr_atomic32_read(&e->state);
+	if (val == ETHR_EVENT_ON__)
+	    break;
+
+	res = pthread_cond_wait(&e->cnd, &e->mtx);
+	if (res == EINTR)
+	    break;
+	if (res != 0)
+	    ETHR_FATAL_ERROR__(res);
+    }
+
+    ulres = pthread_mutex_unlock(&e->mtx);
+    if (ulres != 0)
+	ETHR_FATAL_ERROR__(ulres);
+
+    return res; /* 0 || EINTR */
+}
+
+#else
+#error No ethread event implementation
+#endif
+
+void
+ethr_event_reset(ethr_event *e)
+{
+    ethr_event_reset__(e);
+}
+
+void
+ethr_event_set(ethr_event *e)
+{
+    ethr_event_set__(e);
+}
+
+int
+ethr_event_wait(ethr_event *e)
+{
+    return wait__(e, 0);
+}
+
+int
+ethr_event_swait(ethr_event *e, int spincount)
+{
+    return wait__(e, spincount);
+}
diff --git a/erts/lib_src/pthread/ethread.c b/erts/lib_src/pthread/ethread.c
new file mode 100644
index 0000000000..f047104103
--- /dev/null
+++ b/erts/lib_src/pthread/ethread.c
@@ -0,0 +1,451 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: Pthread implementation of the ethread library
+ * Author: Rickard Green
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define ETHR_CHILD_WAIT_SPIN_COUNT 4000
+
+#include <stdio.h>
+#ifdef ETHR_TIME_WITH_SYS_TIME
+#  include <time.h>
+#  include <sys/time.h>
+#else
+#  ifdef ETHR_HAVE_SYS_TIME_H
+#    include <sys/time.h>
+#  else
+#    include <time.h>
+#  endif
+#endif
+#include <sys/types.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <limits.h>
+
+#define ETHR_INLINE_FUNC_NAME_(X) X ## __
+#define ETHREAD_IMPL__
+
+#include "ethread.h"
+#include "ethr_internal.h"
+
+#ifndef ETHR_HAVE_ETHREAD_DEFINES
+#error Missing configure defines
+#endif
+
+pthread_key_t ethr_ts_event_key__;
+static int child_wait_spin_count;
+
+/*
+ * --------------------------------------------------------------------------
+ * Static functions
+ * --------------------------------------------------------------------------
+ */
+
+static void thr_exit_cleanup(void)
+{
+    ethr_run_exit_handlers__();
+}
+
+
+/* Argument passed to thr_wrapper() */
+typedef struct {
+    ethr_atomic32_t result;
+    ethr_ts_event *tse;
+    void *(*thr_func)(void *);
+    void *arg;
+    void *prep_func_res;
+} ethr_thr_wrap_data__;
+
+static void *thr_wrapper(void *vtwd)
+{
+    ethr_sint32_t result;
+    void *res;
+    ethr_thr_wrap_data__ *twd = (ethr_thr_wrap_data__ *) vtwd;
+    void *(*thr_func)(void *) = twd->thr_func;
+    void *arg = twd->arg;
+    ethr_ts_event *tsep = NULL;
+
+    result = (ethr_sint32_t) ethr_make_ts_event__(&tsep);
+
+    if (result == 0) {
+	tsep->iflgs |= ETHR_TS_EV_ETHREAD;
+	if (ethr_thr_child_func__)
+	    ethr_thr_child_func__(twd->prep_func_res);
+    }
+
+    tsep = twd->tse; /* We aren't allowed to follow twd after
+			result has been set! */
+
+    ethr_atomic32_set(&twd->result, result);
+
+    ethr_event_set(&tsep->event);
+
+    res = result == 0 ? (*thr_func)(arg) : NULL;
+
+    thr_exit_cleanup();
+    return res;
+}
+
+/* internal exports */
+
+int ethr_set_tse__(ethr_ts_event *tsep)
+{
+    return pthread_setspecific(ethr_ts_event_key__, (void *) tsep);
+}
+
+ethr_ts_event *ethr_get_tse__(void)
+{
+    return pthread_getspecific(ethr_ts_event_key__);
+}
+
+/*
+ * --------------------------------------------------------------------------
+ * Exported functions
+ * --------------------------------------------------------------------------
+ */
+
+int
+ethr_init(ethr_init_data *id)
+{
+    int res;
+
+    if (!ethr_not_inited__)
+	return EINVAL;
+
+    ethr_not_inited__ = 0;
+
+    res = ethr_init_common__(id);
+    if (res != 0)
+	goto error;
+
+    child_wait_spin_count = ETHR_CHILD_WAIT_SPIN_COUNT;
+    if (erts_get_cpu_configured(ethr_cpu_info__) == 1)
+	child_wait_spin_count = 0;
+
+    res = pthread_key_create(&ethr_ts_event_key__, ethr_ts_event_destructor__);
+
+    return 0;
+ error:
+    ethr_not_inited__ = 1;
+    return res;
+
+}
+
+int
+ethr_late_init(ethr_late_init_data *id)
+{
+    int res = ethr_late_init_common__(id);
+    if (res != 0)
+	return res;
+    ethr_not_completely_inited__ = 0;
+    return res;
+}
+
+int
+ethr_thr_create(ethr_tid *tid, void * (*func)(void *), void *arg,
+		ethr_thr_opts *opts)
+{
+    ethr_thr_wrap_data__ twd;
+    pthread_attr_t attr;
+    int res, dres;
+    int use_stack_size = (opts && opts->suggested_stack_size >= 0
+			  ? opts->suggested_stack_size
+			  : -1 /* Use system default */);
+
+#ifdef ETHR_MODIFIED_DEFAULT_STACK_SIZE
+    if (use_stack_size < 0)
+	use_stack_size = ETHR_MODIFIED_DEFAULT_STACK_SIZE;
+#endif
+
+#if ETHR_XCHK
+    if (ethr_not_completely_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!tid || !func) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+
+    ethr_atomic32_init(&twd.result, (ethr_sint32_t) -1);
+    twd.tse = ethr_get_ts_event();
+    twd.thr_func = func;
+    twd.arg = arg;
+
+    res = pthread_attr_init(&attr);
+    if (res != 0)
+	return res;
+
+    /* Error cleanup needed after this point */
+
+    /* Schedule child thread in system scope (if possible) ... */
+    res = pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
+    if (res != 0 && res != ENOTSUP)
+	goto error;
+
+    if (use_stack_size >= 0) {
+	size_t suggested_stack_size = (size_t) use_stack_size;
+	size_t stack_size;
+#ifdef ETHR_DEBUG
+	suggested_stack_size /= 2; /* Make sure we got margin */
+#endif
+#ifdef ETHR_STACK_GUARD_SIZE
+	/* The guard is at least on some platforms included in the stack size
+	   passed when creating threads */
+	suggested_stack_size += ETHR_B2KW(ETHR_STACK_GUARD_SIZE);
+#endif
+	if (suggested_stack_size < ethr_min_stack_size__)
+	    stack_size = ETHR_KW2B(ethr_min_stack_size__);
+	else if (suggested_stack_size > ethr_max_stack_size__)
+	    stack_size = ETHR_KW2B(ethr_max_stack_size__);
+	else
+	    stack_size = ETHR_PAGE_ALIGN(ETHR_KW2B(suggested_stack_size));
+	(void) pthread_attr_setstacksize(&attr, stack_size);
+    }
+
+#ifdef ETHR_STACK_GUARD_SIZE
+    (void) pthread_attr_setguardsize(&attr, ETHR_STACK_GUARD_SIZE);
+#endif
+
+    /* Detached or joinable... */
+    res = pthread_attr_setdetachstate(&attr,
+				      (opts && opts->detached
+				       ? PTHREAD_CREATE_DETACHED
+				       : PTHREAD_CREATE_JOINABLE));
+    if (res != 0)
+	goto error;
+
+    /* Call prepare func if it exist */
+    if (ethr_thr_prepare_func__)
+	twd.prep_func_res = ethr_thr_prepare_func__();
+    else
+	twd.prep_func_res = NULL;
+
+    res = pthread_create((pthread_t *) tid, &attr, thr_wrapper, (void*) &twd);
+
+    if (res == 0) {
+	int spin_count = child_wait_spin_count;
+
+	/* Wait for child to initialize... */
+	while (1) {
+	    ethr_sint32_t result;
+	    ethr_event_reset(&twd.tse->event);
+
+	    result = ethr_atomic32_read(&twd.result);
+	    if (result == 0)
+		break;
+
+	    if (result > 0) {
+		res = (int) result;
+		goto error;
+	    }
+
+	    res = ethr_event_swait(&twd.tse->event, spin_count);
+	    if (res != 0 && res != EINTR)
+		goto error;
+	    spin_count = 0;
+	}
+    }
+
+    /* Cleanup... */
+
+ error:
+    dres = pthread_attr_destroy(&attr);
+    if (res == 0)
+	res = dres;
+    if (ethr_thr_parent_func__)
+	ethr_thr_parent_func__(twd.prep_func_res);
+    return res;
+}
+
+int
+ethr_thr_join(ethr_tid tid, void **res)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+#endif
+    return pthread_join((pthread_t) tid, res);
+}
+
+int
+ethr_thr_detach(ethr_tid tid)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+#endif
+    return pthread_detach((pthread_t) tid);
+}
+
+void
+ethr_thr_exit(void *res)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return;
+    }
+#endif
+    thr_exit_cleanup();
+    pthread_exit(res);
+}
+
+ethr_tid
+ethr_self(void)
+{
+    return (ethr_tid) pthread_self();
+}
+
+int
+ethr_equal_tids(ethr_tid tid1, ethr_tid tid2)
+{
+    return pthread_equal((pthread_t) tid1, (pthread_t) tid2);
+}
+
+
+/*
+ * Thread specific events
+ */
+
+ethr_ts_event *
+ethr_get_ts_event(void)
+{
+    return ethr_get_ts_event__();
+}
+
+void
+ethr_leave_ts_event(ethr_ts_event *tsep)
+{
+    ethr_leave_ts_event__(tsep);
+}
+
+/*
+ * Thread specific data
+ */
+
+int
+ethr_tsd_key_create(ethr_tsd_key *keyp)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!keyp) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+    return pthread_key_create((pthread_key_t *) keyp, NULL);
+}
+
+int
+ethr_tsd_key_delete(ethr_tsd_key key)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+#endif
+    return pthread_key_delete((pthread_key_t) key);
+}
+
+int
+ethr_tsd_set(ethr_tsd_key key, void *value)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+#endif
+    return pthread_setspecific((pthread_key_t) key, value);
+}
+
+void *
+ethr_tsd_get(ethr_tsd_key key)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return NULL;
+    }
+#endif
+    return pthread_getspecific((pthread_key_t) key);
+}
+
+/*
+ * Signal functions
+ */
+
+#if ETHR_HAVE_ETHR_SIG_FUNCS
+
+int ethr_sigmask(int how, const sigset_t *set, sigset_t *oset)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!set && !oset) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+  return pthread_sigmask(how, set, oset);
+}
+
+int ethr_sigwait(const sigset_t *set, int *sig)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!set || !sig) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+    if (sigwait(set, sig) < 0)
+	return errno;
+    return 0;
+}
+
+#endif /* #if ETHR_HAVE_ETHR_SIG_FUNCS */
+
+ETHR_IMPL_NORETURN__
+ethr_abort__(void)
+{
+    abort();
+}
diff --git a/erts/lib_src/win/ethr_event.c b/erts/lib_src/win/ethr_event.c
new file mode 100644
index 0000000000..68f093f49c
--- /dev/null
+++ b/erts/lib_src/win/ethr_event.c
@@ -0,0 +1,123 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2009-2010. 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%
+ */
+
+/*
+ * Author: Rickard Green
+ */
+
+#define ETHR_INLINE_FUNC_NAME_(X) X ## __
+#define ETHR_EVENT_IMPL__
+
+#include "ethread.h"
+
+/* --- Windows implementation of thread events ------------------------------ */
+
+#pragma intrinsic(_InterlockedExchangeAdd)
+#pragma intrinsic(_InterlockedCompareExchange)
+
+int
+ethr_event_init(ethr_event *e)
+{
+    e->state = ETHR_EVENT_OFF__;
+    e->handle = CreateEvent(NULL, FALSE, FALSE, NULL);
+    if (e->handle == INVALID_HANDLE_VALUE)
+	return ethr_win_get_errno__();
+    return 0;
+}
+
+int
+ethr_event_destroy(ethr_event *e)
+{
+    BOOL res = CloseHandle(e->handle);
+    return res == 0 ? ethr_win_get_errno__() : 0;
+}
+
+void
+ethr_event_set(ethr_event *e)
+{
+    ethr_event_set__(e);
+}
+
+void
+ethr_event_reset(ethr_event *e)
+{
+    ethr_event_reset__(e);
+}
+
+static ETHR_INLINE int
+wait(ethr_event *e, int spincount)
+{
+    LONG state;
+    DWORD code;
+    int sc, res, until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+
+    if (spincount < 0)
+	ETHR_FATAL_ERROR__(EINVAL);
+
+    sc = spincount;
+
+    while (1) {
+	long on;
+	while (1) {
+#if ETHR_READ_AND_SET_WITHOUT_INTERLOCKED_OP__
+	    state = e->state;
+#else
+	    state = _InterlockedExchangeAdd(&e->state, (LONG) 0);
+#endif
+	    if (state == ETHR_EVENT_ON__)
+		return 0;
+	    if (sc == 0)
+		break;
+	    sc--;
+	    ETHR_SPIN_BODY;
+	    if (--until_yield == 0) {
+		until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
+		res = ETHR_YIELD();
+		if (res != 0)
+		    ETHR_FATAL_ERROR__(res);
+	    }
+	}
+
+	if (state != ETHR_EVENT_OFF_WAITER__) {
+	    state = _InterlockedCompareExchange(&e->state,
+						ETHR_EVENT_OFF_WAITER__,
+						ETHR_EVENT_OFF__);
+	    if (state == ETHR_EVENT_ON__)
+		return 0;
+	    ETHR_ASSERT(state == ETHR_EVENT_OFF__);
+	}
+
+	code = WaitForSingleObject(e->handle, INFINITE);
+	if (code != WAIT_OBJECT_0)
+	    ETHR_FATAL_ERROR__(ethr_win_get_errno__());
+    }
+
+}
+
+int
+ethr_event_wait(ethr_event *e)
+{
+    return wait(e, 0);
+}
+
+int
+ethr_event_swait(ethr_event *e, int spincount)
+{
+    return wait(e, spincount);
+}
diff --git a/erts/lib_src/win/ethread.c b/erts/lib_src/win/ethread.c
new file mode 100644
index 0000000000..789a360b11
--- /dev/null
+++ b/erts/lib_src/win/ethread.c
@@ -0,0 +1,586 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010. 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%
+ */
+
+/*
+ * Description: Windows native threads implementation of the ethread library
+ * Author: Rickard Green
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define ETHR_CHILD_WAIT_SPIN_COUNT 4000
+
+#undef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <process.h>
+#include <winerror.h>
+#include <stdio.h>
+#include <limits.h>
+
+#define ETHR_INLINE_FUNC_NAME_(X) X ## __
+#define ETHREAD_IMPL__
+
+#include "ethread.h"
+#include "ethr_internal.h"
+
+#ifndef ETHR_HAVE_ETHREAD_DEFINES
+#error Missing configure defines
+#endif
+
+/* Argument passed to thr_wrapper() */
+typedef struct {
+    ethr_tid *tid;
+    ethr_atomic32_t result;
+    ethr_ts_event *tse;
+    void *(*thr_func)(void *);
+    void *arg;
+    void *prep_func_res;
+} ethr_thr_wrap_data__;
+
+#define ETHR_INVALID_TID_ID -1
+
+struct ethr_join_data_ {
+    HANDLE handle;
+    void *res;
+};
+
+static ethr_atomic_t thread_id_counter;
+static DWORD own_tid_key;
+static ethr_tid main_thr_tid;
+static int child_wait_spin_count;
+
+DWORD ethr_ts_event_key__;
+
+#define ETHR_GET_OWN_TID__	((ethr_tid *) TlsGetValue(own_tid_key))
+
+/*
+ * --------------------------------------------------------------------------
+ * Static functions
+ * --------------------------------------------------------------------------
+ */
+
+static void thr_exit_cleanup(ethr_tid *tid, void *res)
+{
+
+    ETHR_ASSERT(tid == ETHR_GET_OWN_TID__);
+
+    if (tid->jdata)
+	tid->jdata->res = res;
+
+    ethr_run_exit_handlers__();
+    ethr_ts_event_destructor__((void *) ethr_get_tse__());
+}
+
+static unsigned __stdcall thr_wrapper(LPVOID vtwd)
+{
+    ethr_tid my_tid;
+    ethr_sint32_t result;
+    void *res;
+    ethr_thr_wrap_data__ *twd = (ethr_thr_wrap_data__ *) vtwd;
+    void *(*thr_func)(void *) = twd->thr_func;
+    void *arg = twd->arg;
+    ethr_ts_event *tsep = NULL;
+
+    result = (ethr_sint32_t) ethr_make_ts_event__(&tsep);
+
+    if (result == 0) {
+	tsep->iflgs |= ETHR_TS_EV_ETHREAD;
+	my_tid = *twd->tid;
+	if (!TlsSetValue(own_tid_key, (LPVOID) &my_tid)) {
+	    result = (ethr_sint32_t) ethr_win_get_errno__();
+	    ethr_free_ts_event__(tsep);
+	}
+	else {
+	    if (ethr_thr_child_func__)
+		ethr_thr_child_func__(twd->prep_func_res);
+	}
+    }
+
+    tsep = twd->tse; /* We aren't allowed to follow twd after
+			result has been set! */
+
+    ethr_atomic32_set(&twd->result, result);
+
+    ethr_event_set(&tsep->event);
+
+    res = result == 0 ? (*thr_func)(arg) : NULL;
+
+    thr_exit_cleanup(&my_tid, res);
+    return 0;
+}
+
+/* internal exports */
+
+int
+ethr_win_get_errno__(void)
+{
+    return erts_get_last_win_errno();
+}
+
+int ethr_set_tse__(ethr_ts_event *tsep)
+{
+    return (TlsSetValue(ethr_ts_event_key__, (LPVOID) tsep)
+	    ? 0
+	    : ethr_win_get_errno__());
+}
+
+ethr_ts_event *ethr_get_tse__(void)
+{
+    return (ethr_ts_event *) TlsGetValue(ethr_ts_event_key__);
+}
+
+ETHR_IMPL_NORETURN__
+ethr_abort__(void)
+{
+#if 1
+    DebugBreak();
+#else
+    abort();
+#endif
+}
+
+/*
+ * ----------------------------------------------------------------------------
+ * Exported functions
+ * ----------------------------------------------------------------------------
+ */
+
+int
+ethr_init(ethr_init_data *id)
+{
+#ifdef _WIN32_WINNT
+    DWORD major = (_WIN32_WINNT >> 8) & 0xff;
+    DWORD minor = _WIN32_WINNT & 0xff;
+    OSVERSIONINFO os_version;
+#endif
+    int err = 0;
+    unsigned long i;
+
+    if (!ethr_not_inited__)
+	return EINVAL;
+
+#ifdef _WIN32_WINNT
+    os_version.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    GetVersionEx(&os_version);
+    if (os_version.dwPlatformId != VER_PLATFORM_WIN32_NT
+	|| os_version.dwMajorVersion < major
+	|| (os_version.dwMajorVersion == major
+	    && os_version.dwMinorVersion < minor))
+	return ENOTSUP;
+#endif
+    err = ethr_init_common__(id);
+    if (err)
+	goto error;
+
+    own_tid_key = TlsAlloc();
+    if (own_tid_key == TLS_OUT_OF_INDEXES)
+	goto error;
+
+    ethr_atomic_init(&thread_id_counter, 0);
+
+    main_thr_tid.id = 0;
+    main_thr_tid.jdata = NULL;
+
+    if (!TlsSetValue(own_tid_key, (LPVOID) &main_thr_tid))
+	goto error;
+
+    ETHR_ASSERT(&main_thr_tid == ETHR_GET_OWN_TID__);
+
+    ethr_ts_event_key__ = TlsAlloc();
+    if (ethr_ts_event_key__ == TLS_OUT_OF_INDEXES)
+	goto error;
+
+    child_wait_spin_count = ETHR_CHILD_WAIT_SPIN_COUNT;
+    if (erts_get_cpu_configured(ethr_cpu_info__) == 1)
+	child_wait_spin_count = 0;
+
+    ethr_not_inited__ = 0;
+
+    return 0;
+
+ error:
+    ethr_not_inited__ = 1;
+    if (err == 0)
+	err = ethr_win_get_errno__();
+    ETHR_ASSERT(err != 0);
+    return err;
+}
+
+int
+ethr_late_init(ethr_late_init_data *id)
+{
+    int res = ethr_late_init_common__(id);
+    if (res != 0)
+	return res;
+    ethr_not_completely_inited__ = 0;
+    return res;
+}
+
+
+/*
+ * Thread functions.
+ */
+
+int
+ethr_thr_create(ethr_tid *tid, void * (*func)(void *), void *arg,
+		ethr_thr_opts *opts)
+{
+    HANDLE handle = INVALID_HANDLE_VALUE;
+    int err = 0;
+    ethr_thr_wrap_data__ twd;
+    DWORD code;
+    unsigned ID;
+    unsigned stack_size = 0; /* 0 = system default */
+    int use_stack_size = (opts && opts->suggested_stack_size >= 0
+			  ? opts->suggested_stack_size
+			  : -1 /* Use system default */);
+
+#ifdef ETHR_MODIFIED_DEFAULT_STACK_SIZE
+    if (use_stack_size < 0)
+	use_stack_size = ETHR_MODIFIED_DEFAULT_STACK_SIZE;
+#endif
+
+#if ETHR_XCHK
+    if (ethr_not_completely_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!tid || !func) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+
+    do {
+	tid->id = ethr_atomic_inc_read(&thread_id_counter);
+    } while (tid->id == ETHR_INVALID_TID_ID);
+
+    if (opts && opts->detached)
+	tid->jdata = NULL;
+    else {
+	tid->jdata = ethr_mem__.std.alloc(sizeof(struct ethr_join_data_));
+	if (!tid->jdata)
+	    return ENOMEM;
+	tid->jdata->handle = INVALID_HANDLE_VALUE;
+	tid->jdata->res = NULL;
+    }
+
+    if (use_stack_size >= 0) {
+	size_t suggested_stack_size = (size_t) use_stack_size;
+#ifdef ETHR_DEBUG
+	suggested_stack_size /= 2; /* Make sure we got margin */
+#endif
+	if (suggested_stack_size < ethr_min_stack_size__)
+	    stack_size = (unsigned) ETHR_KW2B(ethr_min_stack_size__);
+	else if (suggested_stack_size > ethr_max_stack_size__)
+	    stack_size = (unsigned) ETHR_KW2B(ethr_max_stack_size__);
+	else
+	    stack_size = (unsigned)
+	      ETHR_PAGE_ALIGN(ETHR_KW2B(suggested_stack_size));
+    }
+
+    ethr_atomic32_init(&twd.result, -1);
+
+    twd.tid = tid;
+    twd.thr_func = func;
+    twd.arg = arg;
+    twd.tse = ethr_get_ts_event();
+
+    /* Call prepare func if it exist */
+    if (ethr_thr_prepare_func__)
+	twd.prep_func_res = ethr_thr_prepare_func__();
+    else
+	twd.prep_func_res = NULL;
+
+    /* spawn the thr_wrapper function */
+    handle = (HANDLE) _beginthreadex(NULL, stack_size, thr_wrapper,
+				     (LPVOID) &twd, 0, &ID);
+    if (handle == (HANDLE) 0) {
+	handle = INVALID_HANDLE_VALUE;
+	goto error;
+    }
+    else {
+	int spin_count = child_wait_spin_count;
+
+	ETHR_ASSERT(handle != INVALID_HANDLE_VALUE);
+
+	if (!tid->jdata)
+	    CloseHandle(handle);
+	else
+	    tid->jdata->handle = handle;
+
+	/* Wait for child to initialize... */
+	while (1) {
+	    ethr_sint32_t result;
+	    int err;
+	    ethr_event_reset(&twd.tse->event);
+
+	    result = ethr_atomic32_read(&twd.result);
+	    if (result == 0)
+		break;
+
+	    if (result > 0) {
+		err = (int) result;
+		goto error;
+	    }
+
+	    err = ethr_event_swait(&twd.tse->event, spin_count);
+	    if (err && err != EINTR)
+		goto error;
+	    spin_count = 0;
+	}
+    }
+
+    if (ethr_thr_parent_func__)
+	ethr_thr_parent_func__(twd.prep_func_res);
+
+    if (twd.tse)
+	ethr_leave_ts_event(twd.tse);
+
+    return 0;
+
+ error:
+
+    if (err == 0)
+	err = ethr_win_get_errno__();
+    ETHR_ASSERT(err != 0);
+
+    if (ethr_thr_parent_func__)
+	ethr_thr_parent_func__(twd.prep_func_res);
+
+    if (handle != INVALID_HANDLE_VALUE) {
+	WaitForSingleObject(handle, INFINITE);
+	CloseHandle(handle);
+    }
+
+    if (tid->jdata) {
+	ethr_mem__.std.free(tid->jdata);
+	tid->jdata = NULL;
+    }
+
+    tid->id = ETHR_INVALID_TID_ID;
+
+    if (twd.tse)
+	ethr_leave_ts_event(twd.tse);
+
+    return err;
+}
+
+int ethr_thr_join(ethr_tid tid, void **res)
+{
+    DWORD code;
+
+#if ETHR_XCHK 
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+#endif
+
+    if (tid.id == ETHR_INVALID_TID_ID || !tid.jdata)
+	return EINVAL;
+
+    /* Wait for thread to terminate */
+    code = WaitForSingleObject(tid.jdata->handle, INFINITE);
+    if (code != WAIT_OBJECT_0)
+	return ethr_win_get_errno__();
+
+    CloseHandle(tid.jdata->handle);
+    tid.jdata->handle = INVALID_HANDLE_VALUE;
+
+    if (res)
+	*res = tid.jdata->res;
+
+    /*
+     * User better not try to join or detach again; or
+     * bad things will happen... (users responsibility)
+     */
+
+    ethr_mem__.std.free(tid.jdata);
+
+    return 0;
+}
+
+
+int
+ethr_thr_detach(ethr_tid tid)
+{
+#if ETHR_XCHK 
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+#endif
+
+    if (tid.id == ETHR_INVALID_TID_ID || !tid.jdata)
+	return EINVAL;
+
+    CloseHandle(tid.jdata->handle);
+    tid.jdata->handle = INVALID_HANDLE_VALUE;
+
+    /*
+     * User better not try to join or detach again; or
+     * bad things will happen... (users responsibility)
+     */
+
+    ethr_mem__.std.free(tid.jdata);
+
+    return 0;
+}
+
+
+void
+ethr_thr_exit(void *res)
+{
+    ethr_tid *tid;
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return;
+    }
+#endif
+    tid = ETHR_GET_OWN_TID__;
+    if (!tid) {
+	ETHR_ASSERT(0);
+	_endthreadex((unsigned) 0);
+    }
+    thr_exit_cleanup(tid, res);
+    _endthreadex((unsigned) 0);
+}
+
+ethr_tid
+ethr_self(void)
+{
+    ethr_tid *tid;
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ethr_tid dummy_tid = {ETHR_INVALID_TID_ID, NULL};
+	ETHR_ASSERT(0);
+	return dummy_tid;
+    }
+#endif
+    /* It is okay for non-ethreads (i.e. native win32 threads) to call
+       ethr_self(). They will however be returned an invalid tid. */
+    tid = ETHR_GET_OWN_TID__;
+    if (!tid) {
+	ethr_tid dummy_tid = {ETHR_INVALID_TID_ID, NULL};
+	return dummy_tid;
+    }
+    return *tid;
+}
+
+int
+ethr_equal_tids(ethr_tid tid1, ethr_tid tid2)
+{
+    /* An invalid tid does not equal any tid, not even an invalid tid */
+    return tid1.id == tid2.id && tid1.id != ETHR_INVALID_TID_ID;
+}
+
+/*
+ * Thread specific data
+ */
+
+int
+ethr_tsd_key_create(ethr_tsd_key *keyp)
+{
+    DWORD key;
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+    if (!keyp) {
+	ETHR_ASSERT(0);
+	return EINVAL;
+    }
+#endif
+    key = TlsAlloc();
+    if (key == TLS_OUT_OF_INDEXES)
+	return ethr_win_get_errno__();
+    *keyp = (ethr_tsd_key) key;
+    return 0;
+}
+
+int
+ethr_tsd_key_delete(ethr_tsd_key key)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+#endif
+    if (!TlsFree((DWORD) key))
+	return ethr_win_get_errno__();
+    return 0;
+}
+
+int
+ethr_tsd_set(ethr_tsd_key key, void *value)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return EACCES;
+    }
+#endif
+    if (!TlsSetValue((DWORD) key, (LPVOID) value))
+	return ethr_win_get_errno__();
+    return 0;
+}
+
+void *
+ethr_tsd_get(ethr_tsd_key key)
+{
+#if ETHR_XCHK
+    if (ethr_not_inited__) {
+	ETHR_ASSERT(0);
+	return NULL;
+    }
+#endif
+    return (void *) TlsGetValue((DWORD) key);
+}
+
+
+/*
+ * Thread specific events
+ */
+
+ethr_ts_event *
+ethr_get_ts_event(void)
+{
+    return ethr_get_ts_event__();
+}
+
+void
+ethr_leave_ts_event(ethr_ts_event *tsep)
+{
+    ethr_leave_ts_event__(tsep);
+}
+
+ethr_ts_event *
+ethr_create_ts_event__(void)
+{
+    ethr_ts_event *tsep;
+    ethr_make_ts_event__(&tsep);
+    return tsep;
+}
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index 0d2be9e1ea..bff3f7f9de 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index a33a570891..5d2f187435 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index 2cb7d3bd25..7e492057da 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 4c1e8aa63f..c443866671 100644
--- a/erts/preloaded/ebin/otp_ring0.beam
+++ b/erts/preloaded/ebin/otp_ring0.beam
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index d39d2d1135..4a75e43e73 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 52d1d9215f..30bbfb0943 100644
--- a/erts/preloaded/ebin/prim_inet.beam
+++ b/erts/preloaded/ebin/prim_inet.beam
diff --git a/erts/preloaded/ebin/prim_zip.beam b/erts/preloaded/ebin/prim_zip.beam
index d31de6cfd3..6681466767 100644
--- a/erts/preloaded/ebin/prim_zip.beam
+++ b/erts/preloaded/ebin/prim_zip.beam
diff --git a/erts/preloaded/ebin/zlib.beam b/erts/preloaded/ebin/zlib.beam
index ac4537662b..593bb8dbed 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 785ad531f3..145638802f 100644
--- a/erts/preloaded/src/Makefile
+++ b/erts/preloaded/src/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2008-2009. All Rights Reserved.
+# Copyright Ericsson AB 2008-2010. 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
@@ -20,8 +20,7 @@
 # be used when the preloaded modules actually are to be updated (i.e. the 
 # beam files are to be recompiled, which is normally not done). 
 # The beam files are placed in the current directory and should be copied 
-# to the ../ebin directory by using the commit target (only works in 
-# clearcase). 
+# to the ../ebin directory by using the copy target.
 
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
@@ -62,26 +61,9 @@ debug opt: $(TARGET_FILES)
 clean:
 	rm -f $(TARGET_FILES)
 
-prepare:
-	cleartool co -nc $(STATIC_EBIN)/*
-	cleartool co -nc $(STATIC_EBIN)
-
 copy:
-	for x in *.beam; do\
-	  if test '!' -f $(STATIC_EBIN)/$$x; then\
-	    cleartool mkelem -nc $$x;\
-	  fi;\
-	done
 	cp *.beam $(STATIC_EBIN)
 
-commit:
-	cleartool ci -ident -nc $(STATIC_EBIN)/*.beam
-	cleartool ci -ident -nc $(STATIC_EBIN)
-
-cancel:
-	-cleartool unco -rm $(STATIC_EBIN)
-	-cleartool unco -rm $(STATIC_EBIN)/*.beam
-
 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 935c2de253..d6dc070436 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -427,17 +427,11 @@ delay_trap(Result, Timeout) -> receive after Timeout -> Result end.
 %% have to reflect that, which we cannot forsee.
 %%
 set_cookie(Node, C) when Node =/= nonode@nohost, is_atom(Node) ->
-    Res = case C of
-	      _ when is_atom(C) ->
-		  auth:set_cookie(Node, C);
-	      {CI,CO} when is_atom(CI), is_atom(CO) ->
-		  auth:set_cookie(Node, {CI, CO});
-	      _ ->
-		  error
-	  end,
-    case Res of
-	error -> exit(badarg);
-	Other -> Other
+    case is_atom(C) of
+	true ->
+	    auth:set_cookie(Node, C);
+	false ->
+	    error(badarg)
     end.
 
 -spec get_cookie() -> atom().
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index 3b98b9cddc..24430a3d40 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -51,6 +51,9 @@
 	 get_status/0,boot/1,get_arguments/0,get_plain_arguments/0,
 	 get_argument/1,script_id/0]).
 
+%% for the on_load functionality; not for general use
+-export([run_on_load_handlers/0]).
+
 %% internal exports
 -export([fetch_loaded/0,ensure_loaded/1,make_permanent/2,
 	 notify_when_started/1,wait_until_started/0, 
@@ -69,6 +72,7 @@
 		script_id = [],
 		loaded = [],
 		subscribed = []}).
+-type state() :: #state{}.
 
 -define(ON_LOAD_HANDLER, init__boot__on_load_handler).
 
@@ -143,10 +147,10 @@ restart() -> init ! {stop,restart}, ok.
 -spec reboot() -> 'ok'.
 reboot() -> init ! {stop,reboot}, ok.
 
--spec stop() -> no_return().
+-spec stop() -> 'ok'.
 stop() -> init ! {stop,stop}, ok.
 
--spec stop(non_neg_integer() | string()) -> no_return().
+-spec stop(non_neg_integer() | string()) -> 'ok'.
 stop(Status) -> init ! {stop,{stop,Status}}, ok.
 
 -spec boot([binary()]) -> no_return().
@@ -275,7 +279,7 @@ crash(String, List) ->
     halt(halt_string(String, List)).
 
 %% Status is {InternalStatus,ProvidedStatus}
--spec boot_loop(pid(), #state{}) -> no_return().
+-spec boot_loop(pid(), state()) -> no_return().
 boot_loop(BootPid, State) ->
     receive
 	{BootPid,loaded,ModLoaded} ->
@@ -308,24 +312,6 @@ boot_loop(BootPid, State) ->
 	{stop,Reason} ->
 	    stop(Reason,State);
 	{From,fetch_loaded} ->   %% Fetch and reset initially loaded modules.
-	    case whereis(?ON_LOAD_HANDLER) of
-		undefined ->
-		    %% There is no on_load handler process,
-		    %% probably because init:restart/0 has been
-		    %% called and it is not the first time we
-		    %% pass through here.
-		    ok;
-		Pid when is_pid(Pid) ->
-		    Pid ! run_on_load,
-		    receive
-			{'EXIT',Pid,on_load_done} ->
-			    ok;
-			{'EXIT',Pid,Res} ->
-			    %% Failure to run an on_load handler.
-			    %% This is fatal during start-up.
-			    exit(Res)
-		    end
-	    end,
 	    From ! {init,State#state.loaded},
 	    garb_boot_loop(BootPid,State#state{loaded = []});
 	{From,{ensure_loaded,Module}} ->
@@ -736,6 +722,7 @@ do_boot(Init,Flags,Start) ->
     BootList = get_boot(BootFile,Root),
     LoadMode = b2a(get_flag('-mode',Flags,false)),
     Deb = b2a(get_flag('-init_debug',Flags,false)),
+    catch ?ON_LOAD_HANDLER ! {init_debug_flag,Deb},
     BootVars = get_flag_args('-boot_var',Flags),
     ParallelLoad = 
 	(Pgm =:= "efile") and (erlang:system_info(thread_pool_size) > 0),
@@ -1335,23 +1322,44 @@ archive_extension() ->
 %%% Support for handling of on_load functions.
 %%%
 
+run_on_load_handlers() ->
+    Ref = monitor(process, ?ON_LOAD_HANDLER),
+    catch ?ON_LOAD_HANDLER ! run_on_load,
+    receive
+	{'DOWN',Ref,process,_,noproc} ->
+	    %% There is no on_load handler process,
+	    %% probably because init:restart/0 has been
+	    %% called and it is not the first time we
+	    %% pass through here.
+	    ok;
+	{'DOWN',Ref,process,_,on_load_done} ->
+	    ok;
+	{'DOWN',Ref,process,_,Res} ->
+	    %% Failure to run an on_load handler.
+	    %% This is fatal during start-up.
+	    exit(Res)
+    end.
+
 start_on_load_handler_process() ->
     register(?ON_LOAD_HANDLER,
-	     spawn_link(fun on_load_handler_init/0)).
+	     spawn(fun on_load_handler_init/0)).
 
 on_load_handler_init() ->
-    on_load_loop([]).
+    on_load_loop([], false).
 
-on_load_loop(Mods) ->
+on_load_loop(Mods, Debug0) ->
     receive
+	{init_debug_flag,Debug} ->
+	    on_load_loop(Mods, Debug);
 	{loaded,Mod} ->
-	    on_load_loop([Mod|Mods]);
+	    on_load_loop([Mod|Mods], Debug0);
 	run_on_load ->
-	    run_on_load_handlers(Mods),
+	    run_on_load_handlers(Mods, Debug0),
 	    exit(on_load_done)
     end.
 
-run_on_load_handlers([M|Ms]) ->
+run_on_load_handlers([M|Ms], Debug) ->
+    debug(Debug, {running_on_load_handler,M}),
     Fun = fun() ->
 		  Res = erlang:call_on_load_function(M),
 		  exit(Res)
@@ -1363,9 +1371,12 @@ run_on_load_handlers([M|Ms]) ->
 	    erlang:finish_after_on_load(M, Keep),
 	    case Keep of
 		false ->
-		    exit({on_load_function_failed,M});
+		    Error = {on_load_function_failed,M},
+		    debug(Debug, Error),
+		    exit(Error);
 		true ->
-		    run_on_load_handlers(Ms)
+		    debug(Debug, {on_load_handler_returned_ok,M}),
+		    run_on_load_handlers(Ms, Debug)
 	    end
     end;
-run_on_load_handlers([]) -> ok.
+run_on_load_handlers([], _) -> ok.
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 2d177bf80e..10be852e92 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -109,6 +109,8 @@
 -define(FILE_RESP_LDATA,       6).
 -define(FILE_RESP_N2DATA,      7).
 -define(FILE_RESP_EOF,         8).
+-define(FILE_RESP_FNAME,       9).
+-define(FILE_RESP_ALL_DATA,   10).
 
 %% Open modes for the driver's open function.
 -define(EFILE_MODE_READ,       1).
@@ -116,9 +118,10 @@
 -define(EFILE_MODE_READ_WRITE, 3).  
 -define(EFILE_MODE_APPEND,     4).
 -define(EFILE_COMPRESSED,      8).
+-define(EFILE_MODE_EXCL,       16).
 
 %% Use this mask to get just the mode bits to be passed to the driver.
--define(EFILE_MODE_MASK, 15).
+-define(EFILE_MODE_MASK, 31).
 
 %% Seek modes for the driver's seek function.
 -define(EFILE_SEEK_SET, 0).
@@ -152,7 +155,7 @@
 %% Opens a file using the driver port Port. Returns {error, Reason}
 %% | {ok, FileDescriptor}
 open(Port, File, ModeList) when is_port(Port), 
-                                is_list(File), 
+                                (is_list(File) orelse is_binary(File)), 
                                 is_list(ModeList) ->
     case open_mode(ModeList) of
 	{Mode, _Portopts, _Setopts} ->
@@ -164,10 +167,11 @@ open(_,_,_) ->
     {error, badarg}.
 
 %% Opens a file. Returns {error, Reason} | {ok, FileDescriptor}.
-open(File, ModeList) when is_list(File), is_list(ModeList) ->
+open(File, ModeList) when (is_list(File) orelse is_binary(File)), 
+			  is_list(ModeList) ->
     case open_mode(ModeList) of
 	{Mode, Portopts, Setopts} ->
-	    open_int({?FD_DRV, Portopts}, File, Mode, Setopts);
+	    open_int({?FD_DRV, Portopts},File, Mode, Setopts);
 	Reason ->
 	    {error, Reason}
     end;
@@ -195,7 +199,7 @@ open_int({Driver, Portopts}, File, Mode, Setopts) ->
     end;
 open_int(Port, File, Mode, Setopts) ->
     M = Mode band ?EFILE_MODE_MASK,
-    case drv_command(Port, [<<?FILE_OPEN, M:32>>, File, 0]) of
+    case drv_command(Port, [<<?FILE_OPEN, M:32>>, pathname(File)]) of
 	{ok, Number} ->
 	    open_int_setopts(Port, Number, Setopts);
 	Error ->
@@ -488,7 +492,7 @@ ipread_s32bu_p32bu(#file_descriptor{module = ?MODULE, data = {_, _}},
 
 
 %% Returns {ok, Contents} | {error, Reason}
-read_file(File) ->
+read_file(File) when (is_list(File) orelse is_binary(File)) ->
     case drv_open(?FD_DRV, [binary]) of
 	{ok, Port} ->
 	    Result = read_file(Port, File),
@@ -496,11 +500,14 @@ read_file(File) ->
 	    Result;
 	{error, _} = Error ->
 	    Error
-    end.
+    end;
+read_file(_) ->
+    {error, badarg}.
 
 %% Takes a Port opened with open/1.
-read_file(Port, File) when is_port(Port) ->
-    Cmd = [?FILE_READ_FILE | File],
+read_file(Port, File) when is_port(Port),
+			   (is_list(File) orelse is_binary(File))->
+    Cmd = [?FILE_READ_FILE | pathname(File)],
     case drv_command(Port, Cmd) of
 	{error, enomem} ->
 	    %% It could possibly help to do a 
@@ -511,12 +518,14 @@ read_file(Port, File) when is_port(Port) ->
 	    drv_command(Port, Cmd);
 	Result ->
 	    Result
-    end.
+    end;
+read_file(_,_) ->
+    {error, badarg}.
 
     
 
 %% Returns {error, Reason} | ok.
-write_file(File, Bin) ->
+write_file(File, Bin) when (is_list(File) orelse is_binary(File)) ->
     case open(File, [binary, write]) of
 	{ok, Handle} ->
 	    Result = write(Handle, Bin),
@@ -524,8 +533,10 @@ write_file(File, Bin) ->
 	    Result;
 	Error ->
 	    Error
-    end.
-
+    end;
+write_file(_, _) -> 
+    {error, badarg}.
+    
 
 
 %%%-----------------------------------------------------------------
@@ -538,7 +549,7 @@ write_file(File, Bin) ->
 %% Returns {ok, Port}, the Port should be used as first argument in all
 %% the following functions. Returns {error, Reason} upon failure.
 start() ->
-    try erlang:open_port({spawn, atom_to_list(?DRV)}, []) of
+    try erlang:open_port({spawn, atom_to_list(?DRV)}, [binary]) of
 	Port ->
 	    {ok, Port}
     catch
@@ -595,7 +606,7 @@ get_cwd(_, _) ->
     {error, badarg}.
 
 get_cwd_int(Drive) ->
-    get_cwd_int({?DRV, []}, Drive).
+    get_cwd_int({?DRV, [binary]}, Drive).
 
 get_cwd_int(Port, Drive) ->
     drv_command(Port, <<?FILE_PWD, Drive>>).
@@ -605,7 +616,7 @@ get_cwd_int(Port, Drive) ->
 %% set_cwd/{1,2}
 
 set_cwd(Dir) ->
-    set_cwd_int({?DRV, []}, Dir).
+    set_cwd_int({?DRV, [binary]}, Dir).
 
 set_cwd(Port, Dir) when is_port(Port) ->
     set_cwd_int(Port, Dir).
@@ -631,89 +642,88 @@ set_cwd_int(Port, Dir0) ->
 	 end),
     %% Dir is now either a string or an EXIT tuple.
     %% An EXIT tuple will fail in the following catch.
-    drv_command(Port, [?FILE_CHDIR, Dir, 0]).
+    drv_command(Port, [?FILE_CHDIR, pathname(Dir)]).
 
 
 
 %% delete/{1,2}
 
 delete(File) ->
-    delete_int({?DRV, []}, File).
+    delete_int({?DRV, [binary]}, File).
 
 delete(Port, File) when is_port(Port) ->
     delete_int(Port, File).
 
 delete_int(Port, File) ->
-    drv_command(Port, [?FILE_DELETE, File, 0]).
+    drv_command(Port, [?FILE_DELETE, pathname(File)]).
 
 
 
 %% rename/{2,3}
 
 rename(From, To) ->
-    rename_int({?DRV, []}, From, To).
+    rename_int({?DRV, [binary]}, From, To).
 
 rename(Port, From, To) when is_port(Port) ->
     rename_int(Port, From, To).
 
 rename_int(Port, From, To) ->
-    drv_command(Port, [?FILE_RENAME, From, 0, To, 0]).
+    drv_command(Port, [?FILE_RENAME, pathname(From), pathname(To)]).
 
 
 
 %% make_dir/{1,2}
 
 make_dir(Dir) ->
-    make_dir_int({?DRV, []}, Dir).
+    make_dir_int({?DRV, [binary]}, Dir).
 
 make_dir(Port, Dir) when is_port(Port) ->
     make_dir_int(Port, Dir).
 
 make_dir_int(Port, Dir) ->
-    drv_command(Port, [?FILE_MKDIR, Dir, 0]).
+    drv_command(Port, [?FILE_MKDIR, pathname(Dir)]).
 
 
 
 %% del_dir/{1,2}
 
 del_dir(Dir) ->
-    del_dir_int({?DRV, []}, Dir).
+    del_dir_int({?DRV, [binary]}, Dir).
 
 del_dir(Port, Dir) when is_port(Port) ->
     del_dir_int(Port, Dir).
 
 del_dir_int(Port, Dir) ->
-    drv_command(Port, [?FILE_RMDIR, Dir, 0]).
+    drv_command(Port, [?FILE_RMDIR, pathname(Dir)]).
 
 
 
 %% read_file_info/{1,2}
 
 read_file_info(File) ->
-    read_file_info_int({?DRV, []}, File).
+    read_file_info_int({?DRV, [binary]}, File).
 
 read_file_info(Port, File) when is_port(Port) ->
     read_file_info_int(Port, File).
 
 read_file_info_int(Port, File) ->
-    drv_command(Port, [?FILE_FSTAT, File, 0]).
+    drv_command(Port, [?FILE_FSTAT, pathname(File)]).
 
 %% altname/{1,2}
 
 altname(File) ->
-    altname_int({?DRV, []}, File).
+    altname_int({?DRV, [binary]}, File).
 
 altname(Port, File) when is_port(Port) ->
     altname_int(Port, File).
 
 altname_int(Port, File) ->
-    drv_command(Port, [?FILE_ALTNAME, File, 0]).
-
+    drv_command(Port, [?FILE_ALTNAME, pathname(File)]).
 
 %% write_file_info/{2,3}
 
 write_file_info(File, Info) ->
-    write_file_info_int({?DRV, []}, File, Info).
+    write_file_info_int({?DRV, [binary]}, File, Info).
 
 write_file_info(Port, File, Info) when is_port(Port) ->
     write_file_info_int(Port, File, Info).
@@ -739,72 +749,72 @@ write_file_info_int(Port,
 			date_to_bytes(Atime), 
 			date_to_bytes(Mtime), 
 			date_to_bytes(Ctime),
-			File, 0]).
+			pathname(File)]).
 
 
 
 %% make_link/{2,3}
 
 make_link(Old, New) ->
-    make_link_int({?DRV, []}, Old, New).
+    make_link_int({?DRV, [binary]}, Old, New).
 
 make_link(Port, Old, New) when is_port(Port) ->
     make_link_int(Port, Old, New).
 
 make_link_int(Port, Old, New) ->
-    drv_command(Port, [?FILE_LINK, Old, 0, New, 0]).
+    drv_command(Port, [?FILE_LINK, pathname(Old), pathname(New)]).
 
 
 
 %% make_symlink/{2,3}
 
 make_symlink(Old, New) ->
-    make_symlink_int({?DRV, []}, Old, New).
+    make_symlink_int({?DRV, [binary]}, Old, New).
 
 make_symlink(Port, Old, New) when is_port(Port) ->
     make_symlink_int(Port, Old, New).
 
 make_symlink_int(Port, Old, New) ->
-    drv_command(Port, [?FILE_SYMLINK, Old, 0, New, 0]).
+    drv_command(Port, [?FILE_SYMLINK, pathname(Old), pathname(New)]).
 
 
 
 %% read_link/{2,3}
 
 read_link(Link) ->
-    read_link_int({?DRV, []}, Link).
+    read_link_int({?DRV, [binary]}, Link).
 
 read_link(Port, Link) when is_port(Port) ->
     read_link_int(Port, Link).
 
 read_link_int(Port, Link) ->
-    drv_command(Port, [?FILE_READLINK, Link, 0]).
+    drv_command(Port, [?FILE_READLINK, pathname(Link)]).
 
 
 
 %% read_link_info/{2,3}
 
 read_link_info(Link) ->
-    read_link_info_int({?DRV, []}, Link).
+    read_link_info_int({?DRV, [binary]}, Link).
 
 read_link_info(Port, Link) when is_port(Port) ->
     read_link_info_int(Port, Link).
 
 read_link_info_int(Port, Link) ->
-    drv_command(Port, [?FILE_LSTAT, Link, 0]).
+    drv_command(Port, [?FILE_LSTAT, pathname(Link)]).
 
 
 
 %% list_dir/{1,2}
 
 list_dir(Dir) ->
-    list_dir_int({?DRV, []}, Dir).
+    list_dir_int({?DRV, [binary]}, Dir).
 
 list_dir(Port, Dir) when is_port(Port) ->
     list_dir_int(Port, Dir).
 
 list_dir_int(Port, Dir) ->
-    drv_command(Port, [?FILE_READDIR, Dir, 0], []).
+    drv_command(Port, [?FILE_READDIR, pathname(Dir)], []).
 
 
 
@@ -958,6 +968,8 @@ open_mode([compressed|Rest], Mode, Portopts, Setopts) ->
 open_mode([append|Rest], Mode, Portopts, Setopts) ->
     open_mode(Rest, Mode bor ?EFILE_MODE_APPEND bor ?EFILE_MODE_WRITE, 
 	      Portopts, Setopts);
+open_mode([exclusive|Rest], Mode, Portopts, Setopts) ->
+    open_mode(Rest, Mode bor ?EFILE_MODE_EXCL, Portopts, Setopts);
 open_mode([delayed_write|Rest], Mode, Portopts, Setopts) ->
     open_mode([{delayed_write, 64*1024, 2000}|Rest], Mode,
 	      Portopts, Setopts);
@@ -1023,8 +1035,6 @@ lseek_position(_) ->
 
 translate_response(?FILE_RESP_OK, []) ->
     ok;
-translate_response(?FILE_RESP_OK, Data) ->
-    {ok, Data};
 translate_response(?FILE_RESP_ERROR, List) when is_list(List) ->
     {error, list_to_atom(List)};
 translate_response(?FILE_RESP_NUMBER, List) ->
@@ -1071,6 +1081,16 @@ translate_response(?FILE_RESP_N2DATA = X, L0) when is_list(L0) ->
     end;
 translate_response(?FILE_RESP_EOF, []) ->
     eof;
+translate_response(?FILE_RESP_FNAME, []) ->
+    ok;
+translate_response(?FILE_RESP_FNAME, Data) when is_binary(Data) ->
+    {ok, prim_file:internal_native2name(Data)};
+translate_response(?FILE_RESP_FNAME, Data) ->
+    {ok, Data};
+
+translate_response(?FILE_RESP_ALL_DATA, Data) ->
+    {ok, Data};
+
 translate_response(X, Data) ->
     {error, {bad_response_from_port, [X | Data]}}.
 
@@ -1206,3 +1226,9 @@ lists_split([Hd | Tl], N, Rev) ->
 
 reverse(X) -> lists:reverse(X, []).
 reverse(L, T) -> lists:reverse(L, T).
+
+% Will add zero termination too
+% The 'EXIT' tuple from a bad argument will eventually generate an error
+% in list_to_binary, which is caught and generates the {error,badarg} return
+pathname(File) ->
+    (catch prim_file:internal_name2native(File)).
diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl
index 0feb591efb..2e4a2866e6 100644
--- a/erts/preloaded/src/prim_inet.erl
+++ b/erts/preloaded/src/prim_inet.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -37,7 +37,7 @@
 -export([setopt/3, setopts/2, getopt/2, getopts/2, is_sockopt_val/2]).
 -export([chgopt/3, chgopts/2]).
 -export([getstat/2, getfd/1, getindex/1, getstatus/1, gettype/1, 
-	 getiflist/1, ifget/3, ifset/3,
+	 getifaddrs/1, getiflist/1, ifget/3, ifset/3,
 	 gethostname/1]).
 -export([getservbyname/3, getservbyport/3]).
 -export([peername/1, setpeername/2]).
@@ -216,9 +216,10 @@ bindx(S, AddFlag, Addrs) ->
 	sctp ->
 	    %% Really multi-homed "bindx". Stringified args:
 	    %% [AddFlag, (Port, IP)+]:
-	    Args = ?int8(AddFlag) ++
-		lists:concat([?int16(Port)++ip_to_bytes(IP) ||
-				 {IP, Port} <- Addrs]),
+	    Args =
+		[?int8(AddFlag)|
+		 [[?int16(Port)|ip_to_bytes(IP)] ||
+		     {IP, Port} <- Addrs]],
 	    case ctl_cmd(S, ?SCTP_REQ_BINDX, Args) of
 		{ok,_} -> {ok, S};
 		Error  -> Error
@@ -623,7 +624,7 @@ chgopt(S, Opt, Value) when is_port(S) ->
     chgopts(S, [{Opt,Value}]).
 
 chgopts(S, Opts) when is_port(S), is_list(Opts) ->
-    case inet:getopts(S, need_template(Opts)) of
+    case getopts(S, need_template(Opts)) of
 	{ok,Templates} ->
 	    try merge_options(Opts, Templates) of
 		NewOpts ->
@@ -636,7 +637,94 @@ chgopts(S, Opts) when is_port(S), is_list(Opts) ->
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
-%% IFLIST(insock()) -> {ok,IfNameList} | {error, Reason}
+%% getifaddrs(insock()) -> {ok,IfAddrsList} | {error, Reason}
+%%
+%%   IfAddrsList = [{Name,[Opts]}]
+%%   Name = string()
+%%   Opts = {flags,[Flag]} | {addr,Addr} | {netmask,Addr} | {broadaddr,Addr}
+%%        | {dstaddr,Addr} | {hwaddr,HwAddr} | {mtu,integer()}
+%%   Flag = up | broadcast | loopback | running | multicast
+%%   Addr = ipv4addr() | ipv6addr()
+%%   HwAddr = ethernet_addr()
+%%
+%% get interface name and addresses list
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+getifaddrs(S) when is_port(S) ->
+    case ctl_cmd(S, ?INET_REQ_GETIFADDRS, []) of
+	{ok, Data} ->
+	    {ok, comp_ifaddrs(build_ifaddrs(Data), ktree_empty())};
+	{error,enotsup} ->
+	    case getiflist(S) of
+		{ok, IFs} ->
+		    {ok, getifaddrs_ifget(S, IFs)};
+		Err1 -> Err1
+	    end;
+	Err2 -> Err2
+    end.
+
+%% Restructure interface properties per interface and remove duplicates
+
+comp_ifaddrs([{If,Opts}|IfOpts], T) ->
+    case ktree_is_defined(If, T) of
+	true ->
+	    OptSet = comp_ifaddrs_add(ktree_get(If, T), Opts),
+	    comp_ifaddrs(IfOpts, ktree_update(If, OptSet, T));
+	false ->
+	    OptSet = comp_ifaddrs_add(ktree_empty(), Opts),
+	    comp_ifaddrs(IfOpts, ktree_insert(If, OptSet, T))
+     end;
+comp_ifaddrs([], T) ->
+    [{If,ktree_keys(ktree_get(If, T))} || If <- ktree_keys(T)].
+
+comp_ifaddrs_add(OptSet, [Opt|Opts]) ->
+    case ktree_is_defined(Opt, OptSet) of
+	true
+	  when element(1, Opt) =:= flags;
+	       element(1, Opt) =:= hwaddr ->
+	    comp_ifaddrs_add(OptSet, Opts);
+	_ ->
+	    comp_ifaddrs_add(ktree_insert(Opt, undefined, OptSet), Opts)
+    end;
+comp_ifaddrs_add(OptSet, []) -> OptSet.
+
+%% Legacy emulation of getifaddrs
+
+getifaddrs_ifget(_, []) -> [];
+getifaddrs_ifget(S, [IF|IFs]) ->
+    case ifget(S, IF, [flags]) of
+	{ok,[{flags,Flags}]=FlagsVals} ->
+	    BroadOpts =
+		case member(broadcast, Flags) of
+		    true ->
+			[broadaddr,hwaddr];
+		    false ->
+			[hwaddr]
+		end,
+	    P2POpts =
+		case member(pointtopoint, Flags) of
+		    true ->
+			[dstaddr|BroadOpts];
+		    false ->
+			BroadOpts
+		end,
+	    getifaddrs_ifget(S, IFs, IF, FlagsVals, [addr,netmask|P2POpts]);
+	_ ->
+	    getifaddrs_ifget(S, IFs, IF, [], [addr,netmask,hwaddr])
+    end.
+
+getifaddrs_ifget(S, IFs, IF, FlagsVals, Opts) ->
+    OptVals =
+	case ifget(S, IF, Opts) of
+	    {ok,OVs} -> OVs;
+	    _ -> []
+	end,
+    [{IF,FlagsVals++OptVals}|getifaddrs_ifget(S, IFs)].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% getiflist(insock()) -> {ok,IfNameList} | {error, Reason}
 %%
 %% get interface name list
 %%
@@ -1206,7 +1294,7 @@ type_opt_1(sctp_default_send_param) ->
 	timetolive        = [uint32,0],
 	tsn               = [],
 	cumtsn            = [],
-	assoc_id          = [sctp_assoc_id,0]}}];
+	assoc_id          = [[sctp_assoc_id,0]]}}];
 %% for SCTP_OPT_EVENTS
 type_opt_1(sctp_events) ->
     [{record,#sctp_event_subscribe{
@@ -1325,6 +1413,19 @@ type_value_2({enum,List}, Enum) ->
 	{value,_} 				    -> true;
 	false                                       -> false
     end;
+type_value_2(sockaddr, Addr) ->
+    case Addr of
+	any                                         -> true;
+	loopback                                    -> true;
+	{A,B,C,D} when ?ip(A,B,C,D)                 -> true;
+	{A,B,C,D,E,F,G,H} when ?ip6(A,B,C,D,E,F,G,H) -> true;
+	_                                           -> false
+    end;
+type_value_2(linkaddr, Addr) when is_list(Addr) ->
+    case len(Addr, 32768) of
+	undefined                                   -> false;
+	_                                           -> true
+    end;
 type_value_2({bitenumlist,List}, EnumList) -> 
     case enum_vals(EnumList, List) of
 	Ls when is_list(Ls)                         -> true;
@@ -1413,14 +1514,21 @@ enc_value_2(addr, {any,Port}) ->
     [?INET_AF_ANY|?int16(Port)];
 enc_value_2(addr, {loopback,Port}) ->
     [?INET_AF_LOOPBACK|?int16(Port)];
-enc_value_2(addr, {IP,Port}) ->
-    case tuple_size(IP) of
-	4 ->
-	    [?INET_AF_INET,?int16(Port)|ip4_to_bytes(IP)];
-	8 ->
-	    [?INET_AF_INET6,?int16(Port)|ip6_to_bytes(IP)]
-    end;
-enc_value_2(ether, [X1,X2,X3,X4,X5,X6]) -> [X1,X2,X3,X4,X5,X6];
+enc_value_2(addr, {IP,Port}) when tuple_size(IP) =:= 4 ->
+    [?INET_AF_INET,?int16(Port)|ip4_to_bytes(IP)];
+enc_value_2(addr, {IP,Port}) when tuple_size(IP) =:= 8 ->
+    [?INET_AF_INET6,?int16(Port)|ip6_to_bytes(IP)];
+enc_value_2(ether, [_,_,_,_,_,_]=Xs) -> Xs;
+enc_value_2(sockaddr, any) ->
+    [?INET_AF_ANY];
+enc_value_2(sockaddr, loopback) ->
+    [?INET_AF_LOOPBACK];
+enc_value_2(sockaddr, IP) when tuple_size(IP) =:= 4 ->
+    [?INET_AF_INET|ip4_to_bytes(IP)];
+enc_value_2(sockaddr, IP) when tuple_size(IP) =:= 8 ->
+    [?INET_AF_INET6|ip6_to_bytes(IP)];
+enc_value_2(linkaddr, Linkaddr) ->
+    [?int16(length(Linkaddr)),Linkaddr];
 enc_value_2(sctp_assoc_id, Val) -> ?int32(Val);
 %% enc_value_2(sctp_assoc_id, Bin) -> [byte_size(Bin),Bin];
 enc_value_2({enum,List}, Enum) ->
@@ -1464,7 +1572,11 @@ dec_value(time, [X3,X2,X1,X0|T]) ->
 	Val -> {Val, T}
     end;
 dec_value(ip, [A,B,C,D|T])             -> {{A,B,C,D}, T};
-dec_value(ether,[X1,X2,X3,X4,X5,X6|T]) -> {[X1,X2,X3,X4,X5,X6],T};
+%% dec_value(ether, [X1,X2,X3,X4,X5,X6|T]) -> {[X1,X2,X3,X4,X5,X6],T};
+dec_value(sockaddr, [X|T]) ->
+    get_ip(X, T);
+dec_value(linkaddr, [X1,X0|T]) ->
+    split(?i16(X1,X0), T);
 dec_value({enum,List}, [X3,X2,X1,X0|T]) ->
     Val = ?i32(X3,X2,X1,X0),
     case enum_name(Val, List) of
@@ -1480,7 +1592,7 @@ dec_value({bitenumlist,List}, [X3,X2,X1,X0|T]) ->
 %%     {enum_names(Val, List), T};
 dec_value(binary,[L0,L1,L2,L3|List]) ->
     Len = ?i32(L0,L1,L2,L3),
-    {X,T}=lists:split(Len,List),
+    {X,T}=split(Len,List),
     {list_to_binary(X),T};
 dec_value(Types, List) when is_tuple(Types) ->
     {L,T} = dec_value_tuple(Types, List, 1, []),
@@ -1495,7 +1607,7 @@ dec_value_tuple(Types, List, N, Acc)
     {Term,Tail} = dec_value(element(N, Types), List),
     dec_value_tuple(Types, Tail, N+1, [Term|Acc]);
 dec_value_tuple(_, List, _, Acc) ->
-    {lists:reverse(Acc),List}.
+    {rev(Acc),List}.
 
 borlist([V|Vs], Value) ->
     borlist(Vs, V bor Value);
@@ -1702,11 +1814,11 @@ merge_fields(_, _, _) -> [].
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-type_ifopt(addr)      -> ip;
-type_ifopt(broadaddr) -> ip;
-type_ifopt(dstaddr)   -> ip;
+type_ifopt(addr)      -> sockaddr;
+type_ifopt(broadaddr) -> sockaddr;
+type_ifopt(dstaddr)   -> sockaddr;
 type_ifopt(mtu)       -> int;
-type_ifopt(netmask)   -> ip;
+type_ifopt(netmask)   -> sockaddr;
 type_ifopt(flags)     ->
     {bitenumlist,
      [{up, ?INET_IFF_UP},
@@ -1718,7 +1830,7 @@ type_ifopt(flags)     ->
       {no_pointtopoint, ?INET_IFF_NPOINTTOPOINT},
       {running, ?INET_IFF_RUNNING},
       {multicast, ?INET_IFF_MULTICAST}]};
-type_ifopt(hwaddr)    -> ether;
+type_ifopt(hwaddr)    -> linkaddr;
 type_ifopt(Opt) when is_atom(Opt) -> undefined.
 
 enc_ifopt(addr)      -> ?INET_IFOPT_ADDR;
@@ -1903,6 +2015,30 @@ encode_ifname(Name) ->
     if N > 255 -> {error, einval};
        true -> {ok,[N | Name]}
     end.
+
+build_ifaddrs(Cs) ->
+    build_ifaddrs(Cs, []).
+%%
+build_ifaddrs([], []) ->
+    [];
+build_ifaddrs([0|Cs], Acc) ->
+    Name = utf8_to_characters(rev(Acc)),
+    {Opts,Rest} = build_ifaddrs_opts(Cs, []),
+    [{Name,Opts}|build_ifaddrs(Rest)];
+build_ifaddrs([C|Cs], Acc) ->
+    build_ifaddrs(Cs, [C|Acc]).
+
+build_ifaddrs_opts([0|Cs], Acc) ->
+    {rev(Acc),Cs};
+build_ifaddrs_opts([C|Cs]=CCs, Acc) ->
+    case dec_ifopt(C) of
+	undefined ->
+	    erlang:error(badarg, [CCs,Acc]);
+	Opt ->
+	    Type = type_ifopt(Opt),
+	    {Val,Rest} = dec_value(Type, Cs),
+	    build_ifaddrs_opts(Rest, [{Opt,Val}|Acc])
+    end.
     
 build_iflist(Cs) ->
     build_iflist(Cs, [], []).
@@ -1927,6 +2063,80 @@ rev(L) -> rev(L,[]).
 rev([C|L],Acc) -> rev(L,[C|Acc]);
 rev([],Acc) -> Acc.
 
+split(N, L) -> split(N, L, []).
+split(0, L, R) when is_list(L) -> {rev(R),L};
+split(N, [H|T], R) when is_integer(N), N > 0 -> split(N-1, T, [H|R]).
+
+len(L, N) -> len(L, N, 0).
+len([], N, C) when is_integer(N), N >= 0 -> C;
+len(L, 0, _) when is_list(L) -> undefined;
+len([_|L], N, C) when is_integer(N), N >= 0 -> len(L, N-1, C+1).
+
+member(X, [X|_]) -> true;
+member(X, [_|Xs]) -> member(X, Xs);
+member(_, []) -> false.
+
+
+
+%% Lookup tree that keeps key insert order
+
+ktree_empty() -> {[],tree()}.
+ktree_is_defined(Key, {_,T}) -> tree(T, Key, is_defined).
+ktree_get(Key, {_,T}) -> tree(T, Key, get).
+ktree_insert(Key, V, {Keys,T}) -> {[Key|Keys],tree(T, Key, {insert,V})}.
+ktree_update(Key, V, {Keys,T}) -> {Keys,tree(T, Key, {update,V})}.
+ktree_keys({Keys,_}) -> rev(Keys).
+
+%% Simple lookup tree. Hash the key to get statistical balance.
+%% Key is matched equal, not compared equal.
+
+tree() -> nil.
+tree(T, Key, Op) -> tree(T, Key, Op, erlang:phash2(Key)).
+
+tree(nil, _, is_defined, _) -> false;
+tree(nil, K, {insert,V}, _) -> {K,V,nil,nil};
+tree({K,_,_,_}, K, is_defined, _) -> true;
+tree({K,V,_,_}, K, get, _) -> V;
+tree({K,_,L,R}, K, {update,V}, _) -> {K,V,L,R};
+tree({K0,V0,L,R}, K, Op, H) ->
+    H0 = erlang:phash2(K0),
+    if  H0 < H;  H0 =:= H, K0 < K ->
+	    if  is_tuple(Op) ->
+		    {K0,V0,tree(L, K, Op, H),R};
+		true ->
+		    tree(L, K, Op, H)
+	    end;
+	true ->
+	    if  is_tuple(Op) ->
+		    {K0,V0,L,tree(R, K, Op, H)};
+		true ->
+		    tree(R, K, Op, H)
+	    end
+    end.
+
+
+
+utf8_to_characters([]) -> [];
+utf8_to_characters([B|Bs]=Arg) when (B band 16#FF) =:= B ->
+    if  16#F8 =< B ->
+	    erlang:error(badarg, [Arg]);
+	16#F0 =< B ->
+	    utf8_to_characters(Bs, B band 16#07, 3);
+	16#E0 =< B ->
+	    utf8_to_characters(Bs, B band 16#0F, 2);
+	16#C0 =< B ->
+	    utf8_to_characters(Bs, B band 16#1F, 1);
+	16#80 =< B ->
+	    erlang:error(badarg, [Arg]);
+	true ->
+	    [B|utf8_to_characters(Bs)]
+    end.
+%%
+utf8_to_characters(Bs, U, 0) ->
+    [U|utf8_to_characters(Bs)];
+utf8_to_characters([B|Bs], U, N) when ((B band 16#3F) bor 16#80) =:= B ->
+    utf8_to_characters(Bs, (U bsl 6) bor (B band 16#3F), N-1).
+
 ip_to_bytes(IP) when tuple_size(IP) =:= 4 -> ip4_to_bytes(IP);
 ip_to_bytes(IP) when tuple_size(IP) =:= 8 -> ip6_to_bytes(IP).
 
diff --git a/erts/test/Makefile b/erts/test/Makefile
index 796403e182..94458da019 100644
--- a/erts/test/Makefile
+++ b/erts/test/Makefile
@@ -28,6 +28,7 @@ EBIN = .
 # ----------------------------------------------------
 
 MODULES= \
+	autoimport_SUITE \
 	erlc_SUITE \
 	install_SUITE \
 	nt_SUITE \
@@ -38,12 +39,14 @@ MODULES= \
 	erlexec_SUITE \
 	z_SUITE
 
+ERL_XML = $(ERL_TOP)/erts/doc/src/erlang.xml
+ERL_XML_TARGET = autoimport_SUITE_data/erlang.xml
 
 ERL_FILES= $(MODULES:%=%.erl)
 
 TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
-EXTRA_FILES = install_SUITE_data/install_bin
+EXTRA_FILES = install_SUITE_data/install_bin $(ERL_XML_TARGET)
 
 # ----------------------------------------------------
 # Release directory specification
@@ -65,6 +68,10 @@ install_SUITE_data/install_bin: ../../make/install_bin
 	rm -f $@
 	cp -p $< $@
 
+$(ERL_XML_TARGET): $(ERL_XML)
+	rm -f $@
+	cp -p $< $@
+
 clean:
 	rm -f $(TARGET_FILES) $(EXTRA_FILES)
 	rm -f core *~
diff --git a/erts/test/autoimport_SUITE.erl b/erts/test/autoimport_SUITE.erl
new file mode 100644
index 0000000000..9724ea3ad5
--- /dev/null
+++ b/erts/test/autoimport_SUITE.erl
@@ -0,0 +1,185 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+%%% Purpose: Test erlang.xml re autoimports
+-module(autoimport_SUITE).
+
+-include_lib("test_server/include/test_server.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,
+	 autoimports/1]).
+-define(TEST_TIMEOUT, ?t:seconds(180)).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [autoimports].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(_Func, Config) ->
+    Dog = test_server:timetrap(?TEST_TIMEOUT),
+    [{watchdog, Dog} | Config].
+
+end_per_testcase(_Func, Config) ->
+    Dog = ?config(watchdog, Config),
+    catch test_server:timetrap_cancel(Dog),
+    ok.
+
+
+autoimports(suite) ->
+    [];
+autoimports(doc) ->
+    ["Check that erlang.xml documents autoimports correctly"];
+autoimports(Config) when is_list(Config) ->
+    ?line XML = filename:join([?config(data_dir,Config),"erlang.xml"]),
+    ?line case xml(XML) of
+	      [] ->
+		  ok;
+	      List ->
+		  lists:foreach(fun({[],F,A}) ->
+					io:format("erlang:~s/~p is wrongly "
+						  "documented as ~s/~p~n",
+						  [F,A,F,A]);
+				   ({"erlang",F,A}) ->
+					io:format("~s/~p is wrongly "
+						  "documented as "
+						  "erlang:~s/~p~n",
+						  [F,A,F,A])
+				end,List),
+		  ?t:fail({wrong_autoimports,List})
+	  end.
+
+%%
+%% Ugly chunk of code to heuristically analyze the erlang.xml
+%% documentation file. Don't view this as an example...
+%%
+
+xml(XMLFile) ->
+    {ok,File} = file:open(XMLFile,[read]),
+    DocData = xloop(file:read_line(File),File),
+    file:close(File),
+    analyze(DocData).
+
+xloop({ok,Line},File) ->
+    case re:run(Line,"\\<name\\>",[{capture,none}]) of
+	nomatch ->
+	    xloop(file:read_line(File),File);
+	match ->
+	    X = re:replace(Line,"\\).*",")",[{return,list}]),
+	    Y = re:replace(X,".*\\>","",[{return,list}]),
+	    Mod = get_module(Y),
+	    Rest1 = fstrip(Mod++":",Y),
+	    Func = get_function(Rest1),
+	    Rest2 = fstrip(Func++"(", Rest1),
+	    Argc = count_args(Rest2,1,0,false),
+	    [{Mod,Func,Argc} |
+	     xloop(file:read_line(File),File)]
+    end;
+xloop(_,_) ->
+    [].
+
+analyze([{[],Func,Arity}|T]) ->
+    case erl_internal:bif(list_to_atom(Func),Arity) of
+	true ->
+	    analyze(T);
+	false ->
+	    [{[],Func,Arity} |
+	     analyze(T)]
+    end;
+analyze([{"erlang",Func,Arity}|T]) ->
+    case erl_internal:bif(list_to_atom(Func),Arity) of
+	true ->
+	    [{"erlang",Func,Arity}|analyze(T)];
+	false ->
+	    analyze(T)
+    end;
+analyze([_|T]) ->
+   analyze(T);
+analyze([]) ->
+   [].
+
+
+count_args([],_,N,false) ->
+    N;
+count_args([],_,N,true) ->
+    N+1;
+count_args(_,0,N,true) ->
+    N+1;
+count_args(_,0,N,false) ->
+    N;
+count_args([Par|T],Level,N,Got) when (Par =:= 40) or
+				 (Par =:= 123) or (Par =:= 91) ->
+    count_args(T,Level+1,N,(Level =:= 1) or Got);
+count_args([41|T],1,N,true) ->
+    count_args(T,0,N+1,false);
+count_args([Par|T],Level,N, Got) when (Par =:= 41) or
+				 (Par =:= 125) or (Par =:= 93) ->
+    count_args(T,Level-1,N,Got);
+count_args([$,|T],1,N,true) ->
+    count_args(T,1,N+1,false);
+count_args([$ |T],A,B,C) ->
+    count_args(T,A,B,C);
+count_args([_|T],1,N,_) ->
+    count_args(T,1,N,true);
+count_args([_|T],A,B,C) ->
+    count_args(T,A,B,C).
+
+fstrip([],X) ->
+    X;
+fstrip(_,[]) ->
+    [];
+fstrip([H|T1],[H|T2]) ->
+    fstrip(T1,T2);
+fstrip(_,L) ->
+    L.
+
+get_module(X) ->
+    get_module(X,[]).
+get_module([],_) ->
+    [];
+get_module([$:|_],Acc) ->
+    lists:reverse(Acc);
+get_module([40|_],_) -> %(
+    [];
+get_module([H|T],Acc) ->
+    get_module(T,[H|Acc]).
+
+get_function(X) ->
+    get_function(X,[]).
+get_function([],_) ->
+    [];
+get_function([40|_],Acc) -> %(
+    lists:reverse(Acc);
+get_function([H|T],Acc) ->
+    get_function(T,[H|Acc]).
diff --git a/erts/test/autoimport_SUITE_data/dummy.txt b/erts/test/autoimport_SUITE_data/dummy.txt
new file mode 100644
index 0000000000..972643e527
--- /dev/null
+++ b/erts/test/autoimport_SUITE_data/dummy.txt
@@ -0,0 +1,19 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+%% Purpouse: Dummy
diff --git a/erts/test/erl_print_SUITE.erl b/erts/test/erl_print_SUITE.erl
index 3bb7d4d016..fe9e811d4d 100644
--- a/erts/test/erl_print_SUITE.erl
+++ b/erts/test/erl_print_SUITE.erl
@@ -32,14 +32,35 @@
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(10)).
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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, fin_per_testcase/2]).
 
--export([erlang_display/1, integer/1, float/1, string/1, character/1, snprintf/1, quote/1]).
+-export([erlang_display/1, integer/1, float/1, 
+	 string/1, character/1, snprintf/1, quote/1]).
 
 -include_lib("test_server/include/test_server.hrl").
-    
-all(doc) -> [];
-all(suite) -> test_cases().
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_cases().
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%
 %%
@@ -47,14 +68,9 @@ all(suite) -> test_cases().
 %%
 %%
 
-test_cases() ->
-    [erlang_display,
-     integer,
-     float,
-     string,
-     character,
-     snprintf,
-     quote].
+test_cases() -> 
+    [erlang_display, integer, float, string, character,
+     snprintf, quote].
 
 erlang_display(doc) -> [];
 erlang_display(suite) -> [];
diff --git a/erts/test/erlc_SUITE.erl b/erts/test/erlc_SUITE.erl
index 437f020f99..a3a33b568c 100644
--- a/erts/test/erlc_SUITE.erl
+++ b/erts/test/erlc_SUITE.erl
@@ -20,14 +20,33 @@
 
 %% Tests the erlc command by compiling various types of files.
 
--export([all/1, compile_erl/1, compile_yecc/1, compile_script/1,
-	 compile_mib/1, good_citizen/1, deep_cwd/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, compile_erl/1,
+	 compile_yecc/1, compile_script/1,
+	 compile_mib/1, good_citizen/1, deep_cwd/1, arg_overflow/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [compile_erl, compile_yecc, compile_script, compile_mib,
-     good_citizen, deep_cwd].
+     good_citizen, deep_cwd, arg_overflow].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 %% Copy from erlc_SUITE_data/include/erl_test.hrl.
 
@@ -189,6 +208,18 @@ deep_cwd_1(PrivDir) ->
     ?line true = filelib:is_file("test.beam"),
     ok.
 
+%% Test that a large number of command line switches does not
+%% overflow the argument buffer
+arg_overflow(Config) when is_list(Config) ->
+    ?line {SrcDir, _OutDir, Cmd} = get_cmd(Config),
+    ?line FileName = filename:join(SrcDir, "erl_test_ok.erl"),
+    ?line Args = lists:flatten([ ["-D", integer_to_list(N), "=1 "] ||
+            N <- lists:seq(1,10000) ]),
+    ?line run(Config, Cmd, FileName, Args,
+	      ["Warning: function foo/0 is unused\$",
+	       "_OK_"]),
+    ok.
+
 erlc() ->
     case os:find_executable("erlc") of
 	false ->
diff --git a/erts/test/erlexec_SUITE.erl b/erts/test/erlexec_SUITE.erl
index 164ce9faaf..e932e5a211 100644
--- a/erts/test/erlexec_SUITE.erl
+++ b/erts/test/erlexec_SUITE.erl
@@ -31,9 +31,11 @@
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(1)).
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([args_file/1, evil_args_file/1, env/1, args_file_env/1, otp_7461/1, otp_7461_remote/1, otp_8209/1]).
+-export([args_file/1, evil_args_file/1, env/1, args_file_env/1, otp_7461/1, otp_7461_remote/1, otp_8209/1, zdbbl_dist_buf_busy_limit/1]).
 
 -include_lib("test_server/include/test_server.hrl").
     
@@ -43,7 +45,7 @@ init_per_testcase(Case, Config) ->
     SavedEnv = save_env(),
     [{testcase, Case}, {watchdog, Dog}, {erl_flags_env, SavedEnv} |Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     SavedEnv = ?config(erl_flags_env, Config),
     restore_env(SavedEnv),
@@ -51,10 +53,26 @@ fin_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(doc) -> [];
-all(suite) ->
-    [args_file, evil_args_file, env, args_file_env, otp_7461, otp_8209].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
+all() -> 
+    [args_file, evil_args_file, env, args_file_env,
+     otp_7461, otp_8209, zdbbl_dist_buf_busy_limit].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 otp_8209(doc) ->
     ["Test that plain first argument does not "
@@ -330,6 +348,25 @@ otp_7461_remote([halt, Pid]) ->
     io:format("halt order from ~p to node ~p\n",[Pid,node()]),
     halt().
 
+zdbbl_dist_buf_busy_limit(doc) ->    
+    ["Check +zdbbl flag"];
+zdbbl_dist_buf_busy_limit(suite) ->
+    [];
+zdbbl_dist_buf_busy_limit(Config) when is_list(Config) ->
+    LimKB = 1122233,
+    LimB = LimKB*1024,
+    ?line {ok,[[PName]]} = init:get_argument(progname),
+    ?line SNameS = "erlexec_test_02",
+    ?line SName = list_to_atom(SNameS++"@"++
+                         hd(tl(string:tokens(atom_to_list(node()),"@")))),
+    ?line Cmd = PName ++ " -sname "++SNameS++" -setcookie "++
+        atom_to_list(erlang:get_cookie()) ++
+	" +zdbbl " ++ integer_to_list(LimKB),
+    ?line open_port({spawn,Cmd},[]),
+    ?line pong = loop_ping(SName,40),
+    ?line LimB = rpc:call(SName,erlang,system_info,[dist_buf_busy_limit]),
+    ?line ok = cleanup_node(SNameS, 10),
+    ok.
     
 
 %%
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl
index bbc79e9381..9bc3eebb74 100644
--- a/erts/test/ethread_SUITE.erl
+++ b/erts/test/ethread_SUITE.erl
@@ -31,54 +31,50 @@
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(10)).
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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, fin_per_testcase/2]).
 
 -export([create_join_thread/1,
 	 equal_tids/1,
 	 mutex/1,
 	 try_lock_mutex/1,
-	 recursive_mutex/1,
-	 time_now/1,
 	 cond_wait/1,
-	 cond_timedwait/1,
 	 broadcast/1,
 	 detached_thread/1,
 	 max_threads/1,
-	 forksafety/1,
-	 vfork/1,
 	 tsd/1,
 	 spinlock/1,
 	 rwspinlock/1,
 	 rwmutex/1,
-	 atomic/1,
-	 gate/1]).
+	 atomic/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
-tests() ->
-    [create_join_thread,
-     equal_tids,
-     mutex,
-     try_lock_mutex,
-     recursive_mutex,
-     time_now,
-     cond_wait,
-     cond_timedwait,
-     broadcast,
-     detached_thread,
-     max_threads,
-     forksafety,
-     vfork,
-     tsd,
-     spinlock,
-     rwspinlock,
-     rwmutex,
-     atomic,
-     gate].
-
-all(doc) -> [];
-all(suite) -> tests().
+tests() -> 
+    [create_join_thread, equal_tids, mutex, try_lock_mutex,
+     cond_wait, broadcast, detached_thread,
+     max_threads, tsd, spinlock, rwspinlock, rwmutex, atomic].
 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    tests().
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 %%
 %%
@@ -114,24 +110,6 @@ try_lock_mutex(suite) ->
 try_lock_mutex(Config) ->
     run_case(Config, "try_lock_mutex", "").
 
-recursive_mutex(doc) ->
-    ["Tests recursive mutexes."];
-recursive_mutex(suite) ->
-    [];
-recursive_mutex(Config) ->
-    run_case(Config, "recursive_mutex", "").
-
-time_now(doc) ->
-    ["Tests ethr_time_now by comparing time values with Erlang."];
-time_now(suite) ->
-    [];
-time_now(Config) ->
-    run_case(Config, "time_now", "", fun (P) ->
-					     spawn_link(fun () ->
-								watchdog(P)
-							end)
-				     end).
-
 wd_dispatch(P) ->
     receive
 	bye ->
@@ -169,13 +147,6 @@ cond_wait(suite) ->
 cond_wait(Config) ->
     run_case(Config, "cond_wait", "").
 
-cond_timedwait(doc) ->
-    ["Tests ethr_cond_timedwait with ethr_cond_signal and ethr_cond_broadcast."];
-cond_timedwait(suite) ->
-    [];
-cond_timedwait(Config) ->
-    run_case(Config, "cond_timedwait", "").
-
 broadcast(doc) ->
     ["Tests that a ethr_cond_broadcast really wakes up all waiting threads"];
 broadcast(suite) ->
@@ -195,26 +166,15 @@ max_threads(doc) ->
 max_threads(suite) ->
     [];
 max_threads(Config) ->
-    run_case(Config, "max_threads", "").
-
-forksafety(doc) ->
-    ["Tests forksafety."];
-forksafety(suite) ->
-    [];
-forksafety(Config) ->
-    run_case(Config, "forksafety", "").
-
-vfork(doc) ->
-    ["Tests vfork with threads."];
-vfork(suite) ->
-    case ?t:os_type() of
-	{unix, osf1} ->
-	    {skip, "vfork() known to hang multi-threaded applications on osf1"};
+    case {os:type(), os:version()} of
+	{{unix,darwin}, {9, _, _}} ->
+	    %% For some reason pthread_create() crashes when more
+	    %% threads cannot be created, instead of returning an
+	    %% error code on our MacOS X Leopard machine...
+	    {skipped, "MacOS X Leopard cannot cope with this test..."};
 	_ ->
-	    []
-    end;
-vfork(Config) ->
-    run_case(Config, "vfork", "").
+	    run_case(Config, "max_threads", "")
+    end.
 
 tsd(doc) ->
     ["Tests thread specific data."];
@@ -251,13 +211,6 @@ atomic(suite) ->
 atomic(Config) ->
     run_case(Config, "atomic", "").
 
-gate(doc) ->
-    ["Tests gates."];
-gate(suite) ->
-    [];
-gate(Config) ->
-    run_case(Config, "gate", "").
-
 %%
 %%
 %% Auxiliary functions
diff --git a/erts/test/ethread_SUITE_data/ethread_tests.c b/erts/test/ethread_SUITE_data/ethread_tests.c
index f779f13c51..0b59ff5aa6 100644
--- a/erts/test/ethread_SUITE_data/ethread_tests.c
+++ b/erts/test/ethread_SUITE_data/ethread_tests.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2004-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
  */
 
@@ -90,10 +90,12 @@ static void print_line(char *frmt,...)
     print_eol();
 }
 
+#if 0 /* Currently not used; silence annoying warning... */
 static void print(char *frmt,...)
 {
     PRINT_VA_LIST(frmt);
 }
+#endif
 
 static void fail(char *frmt,...)
 {
@@ -197,8 +199,8 @@ create_join_thread_test(void)
     }
 
     for (i = 1; i <= CJTT_NO_THREADS; i++) {
-	int *tres;
-	res = ethr_thr_join(cjtt_tids[i], (void **) &tres);
+	void *tres;
+	res = ethr_thr_join(cjtt_tids[i], &tres);
 	ASSERT(res == 0);
 	ASSERT(tres == &cjtt_res[i]);
 	ASSERT(cjtt_res[i] == i);
@@ -216,8 +218,8 @@ create_join_thread_test(void)
 #define ETT_THREADS 100000
 
 static ethr_tid ett_tids[3];
-static ethr_mutex ett_mutex = ETHR_MUTEX_INITER;
-static ethr_cond ett_cond = ETHR_COND_INITER;
+static ethr_mutex ett_mutex;
+static ethr_cond ett_cond;
 static int ett_terminate;
 
 static void *
@@ -234,14 +236,12 @@ static void *
 ett_thread2(void *unused)
 {
     int res;
-    res = ethr_mutex_lock(&ett_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&ett_mutex);
     while (!ett_terminate) {
 	res = ethr_cond_wait(&ett_cond, &ett_mutex);
 	ASSERT(res == 0);
     }
-    res = ethr_mutex_unlock(&ett_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&ett_mutex);
     return NULL;
 }
 
@@ -250,6 +250,10 @@ equal_tids_test(void)
 {
     int res, i;
 
+    res = ethr_mutex_init(&ett_mutex);
+    ASSERT(res == 0);
+    res = ethr_cond_init(&ett_cond);
+    ASSERT(res == 0);
     ett_tids[0] = ethr_self();
     
     res = ethr_thr_create(&ett_tids[1], ett_thread, (void *) &ett_tids[1], NULL);
@@ -298,13 +302,10 @@ equal_tids_test(void)
 	ASSERT(res == 0);
     }
 
-    res = ethr_mutex_lock(&ett_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&ett_mutex);
     ett_terminate = 1;
-    res = ethr_cond_signal(&ett_cond);
-    ASSERT(res == 0);
-    res = ethr_mutex_unlock(&ett_mutex);
-    ASSERT(res == 0);
+    ethr_cond_signal(&ett_cond);
+    ethr_mutex_unlock(&ett_mutex);
     res = ethr_thr_join(ett_tids[1], NULL);
     ASSERT(res == 0);
 
@@ -321,17 +322,14 @@ equal_tids_test(void)
  * Tests mutexes.
  */
 
-static ethr_mutex mt_mutex = ETHR_MUTEX_INITER;
+static ethr_mutex mt_mutex;
 static int mt_data;
 
 void *
 mt_thread(void *unused)
 {
-    int res;
-
     print_line("Aux thread tries to lock mutex");
-    res = ethr_mutex_lock(&mt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&mt_mutex);
     print_line("Aux thread locked mutex");
 
     ASSERT(mt_data == 0);
@@ -345,8 +343,7 @@ mt_thread(void *unused)
 
     ASSERT(mt_data == 1);
 
-    res = ethr_mutex_unlock(&mt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&mt_mutex);
     print_line("Aux thread unlocked mutex");
 
     return NULL;
@@ -356,18 +353,18 @@ mt_thread(void *unused)
 static void
 mutex_test(void)
 {
-    int do_restart = 1;
     int res;
     ethr_tid tid;
 
-    print_line("Running test with statically initialized mutex");
+    print_line("Trying to initialize mutex");
+    res = ethr_mutex_init(&mt_mutex);
+    ASSERT(res == 0);
+    print_line("Initialized mutex");
 
- restart:
     mt_data = 0;
 
     print_line("Main thread tries to lock mutex");
-    res = ethr_mutex_lock(&mt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&mt_mutex);
     print_line("Main thread locked mutex");
 
     ASSERT(mt_data == 0);
@@ -383,8 +380,7 @@ mutex_test(void)
 
     ASSERT(mt_data == 0);
 
-    res = ethr_mutex_unlock(&mt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&mt_mutex);
     print_line("Main thread unlocked mutex");
 
     print_line("Main thread goes to sleep for 1 second");
@@ -392,8 +388,7 @@ mutex_test(void)
     print_line("Main thread woke up");
 
     print_line("Main thread tries to lock mutex");
-    res = ethr_mutex_lock(&mt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&mt_mutex);
     print_line("Main thread locked mutex");
 
     ASSERT(mt_data == 1);
@@ -404,8 +399,7 @@ mutex_test(void)
 
     ASSERT(mt_data == 1);
 
-    res = ethr_mutex_unlock(&mt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&mt_mutex);
     print_line("Main thread unlocked mutex");
 
     res = ethr_thr_join(tid, NULL);
@@ -416,20 +410,6 @@ mutex_test(void)
     ASSERT(res == 0);
     print_line("Main thread destroyed mutex");
 
-    if (do_restart) {
-	do_restart = 0;
-
-	print_line("Running test with dynamically initialized mutex");
-
-	print_line("Trying to initialize mutex");
-	res = ethr_mutex_init(&mt_mutex);
-	ASSERT(res == 0);
-	print_line("Initialized mutex");
-
-	goto restart;
-
-    }
-
 }
 
 /*
@@ -438,9 +418,9 @@ mutex_test(void)
  * Tests try lock mutex operation.
  */
 
-static ethr_mutex tlmt_mtx1 = ETHR_MUTEX_INITER;
-static ethr_mutex tlmt_mtx2 = ETHR_MUTEX_INITER;
-static ethr_cond tlmt_cnd2 = ETHR_COND_INITER;
+static ethr_mutex tlmt_mtx1;
+static ethr_mutex tlmt_mtx2;
+static ethr_cond tlmt_cnd2;
 
 static int tlmt_mtx1_locked;
 static int tlmt_mtx1_do_unlock;
@@ -450,32 +430,24 @@ tlmt_thread(void *unused)
 {
     int res;
 
-    res = ethr_mutex_lock(&tlmt_mtx1);
-    ASSERT(res == 0);
-    res = ethr_mutex_lock(&tlmt_mtx2);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&tlmt_mtx1);
+    ethr_mutex_lock(&tlmt_mtx2);
 
     tlmt_mtx1_locked = 1;
-    res = ethr_cond_signal(&tlmt_cnd2);
-    ASSERT(res == 0);
+    ethr_cond_signal(&tlmt_cnd2);
 
     while (!tlmt_mtx1_do_unlock) {
 	res = ethr_cond_wait(&tlmt_cnd2, &tlmt_mtx2);
 	ASSERT(res == 0 || res == EINTR);
     }
 
-    res = ethr_mutex_unlock(&tlmt_mtx2);
-    ASSERT(res == 0);
-    res = ethr_mutex_unlock(&tlmt_mtx1);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&tlmt_mtx2);
+    ethr_mutex_unlock(&tlmt_mtx1);
 
-    res = ethr_mutex_lock(&tlmt_mtx2);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&tlmt_mtx2);
     tlmt_mtx1_locked = 0;
-    res = ethr_cond_signal(&tlmt_cnd2);
-    ASSERT(res == 0);
-    res = ethr_mutex_unlock(&tlmt_mtx2);
-    ASSERT(res == 0);
+    ethr_cond_signal(&tlmt_cnd2);
+    ethr_mutex_unlock(&tlmt_mtx2);
 
     return NULL;
 }
@@ -486,48 +458,49 @@ try_lock_mutex_test(void)
     int i, res;
     ethr_tid tid;
 
+    res = ethr_mutex_init(&tlmt_mtx1);
+    ASSERT(res == 0);
+    res = ethr_mutex_init(&tlmt_mtx2);
+    ASSERT(res == 0);
+    res = ethr_cond_init(&tlmt_cnd2);
+    ASSERT(res == 0);
+
     tlmt_mtx1_locked = 0;
     tlmt_mtx1_do_unlock = 0;
 
     res = ethr_thr_create(&tid, tlmt_thread, NULL, NULL);
     ASSERT(res == 0);
 
-    res = ethr_mutex_lock(&tlmt_mtx2);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&tlmt_mtx2);
 
     while (!tlmt_mtx1_locked) {
 	res = ethr_cond_wait(&tlmt_cnd2, &tlmt_mtx2);
 	ASSERT(res == 0 || res == EINTR);
     }
 
-    res = ethr_mutex_unlock(&tlmt_mtx2);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&tlmt_mtx2);
 
     for (i = 0; i < 10; i++) {
 	res = ethr_mutex_trylock(&tlmt_mtx1);
 	ASSERT(res == EBUSY);
     }
 
-    res = ethr_mutex_lock(&tlmt_mtx2);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&tlmt_mtx2);
 
     tlmt_mtx1_do_unlock = 1;
-    res = ethr_cond_signal(&tlmt_cnd2);
-    ASSERT(res == 0);
+    ethr_cond_signal(&tlmt_cnd2);
 
     while (tlmt_mtx1_locked) {
 	res = ethr_cond_wait(&tlmt_cnd2, &tlmt_mtx2);
 	ASSERT(res == 0 || res == EINTR);
     }
 
-    res = ethr_mutex_unlock(&tlmt_mtx2);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&tlmt_mtx2);
 
     res = ethr_mutex_trylock(&tlmt_mtx1);
     ASSERT(res == 0);
 
-    res = ethr_mutex_unlock(&tlmt_mtx1);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&tlmt_mtx1);
 
     res = ethr_thr_join(tid, NULL);
     ASSERT(res == 0);
@@ -541,328 +514,88 @@ try_lock_mutex_test(void)
 }
 
 /*
- * The recursive mutex test case.
- *
- * Tests recursive mutexes.
- */
-
-#ifdef ETHR_HAVE_ETHR_REC_MUTEX_INIT
-
-static ethr_mutex rmt_mutex
-#ifdef ETHR_REC_MUTEX_INITER 
-                            = ETHR_REC_MUTEX_INITER
-#endif
-                                                   ;
-static int rmt_data;
-
-void *
-rmt_thread(void *unused)
-{
-    int res;
-
-    print_line("Aux thread tries to lock mutex");
-    res = ethr_mutex_lock(&rmt_mutex);
-    ASSERT(res == 0);
-    print_line("Aux thread locked mutex");
-
-    ASSERT(rmt_data == 0);
-
-    rmt_data = 1;
-    print_line("Aux thread wrote");
-
-    print_line("Aux thread goes to sleep for 1 second");
-    do_sleep(1);
-    print_line("Aux thread woke up");
-
-    ASSERT(rmt_data == 1);
-
-    res = ethr_mutex_unlock(&rmt_mutex);
-    ASSERT(res == 0);
-    print_line("Aux thread unlocked mutex");
-
-    return NULL;
-}
-
-#endif
-
-static void
-recursive_mutex_test(void)
-{
-#ifdef ETHR_HAVE_ETHR_REC_MUTEX_INIT
-    int do_restart = 1;
-    int res;
-    ethr_tid tid;
-
-#ifdef ETHR_REC_MUTEX_INITER
-    print_line("Running test with statically initialized mutex");
-#else
-    goto dynamic_init;
-#endif
-
- restart:
-    rmt_data = 0;
-
-    print_line("Main thread tries to lock mutex");
-    res = ethr_mutex_lock(&rmt_mutex);
-    ASSERT(res == 0);
-    print_line("Main thread locked mutex");
-
-    print_line("Main thread tries to lock mutex again");
-    res = ethr_mutex_lock(&rmt_mutex);
-    ASSERT(res == 0);
-    print_line("Main thread locked mutex again");
-
-    ASSERT(rmt_data == 0);
-
-    print_line("Main thread about to create aux thread");
-    res = ethr_thr_create(&tid, rmt_thread, NULL, NULL);
-    ASSERT(res == 0);
-    print_line("Main thread created aux thread");
-
-    print_line("Main thread goes to sleep for 1 second");
-    do_sleep(1);
-    print_line("Main thread woke up");
-
-    ASSERT(rmt_data == 0);
-
-    res = ethr_mutex_unlock(&rmt_mutex);
-    ASSERT(res == 0);
-    print_line("Main thread unlocked mutex");
-
-    print_line("Main thread goes to sleep for 1 second");
-    do_sleep(1);
-    print_line("Main thread woke up");
-
-    ASSERT(rmt_data == 0);
-
-    res = ethr_mutex_unlock(&rmt_mutex);
-    ASSERT(res == 0);
-    print_line("Main thread unlocked mutex again");
-
-    print_line("Main thread goes to sleep for 1 second");
-    do_sleep(1);
-    print_line("Main thread woke up");
-
-    print_line("Main thread tries to lock mutex");
-    res = ethr_mutex_lock(&rmt_mutex);
-    ASSERT(res == 0);
-    print_line("Main thread locked mutex");
-
-    ASSERT(rmt_data == 1);
-
-    print_line("Main thread goes to sleep for 1 second");
-    do_sleep(1);
-    print_line("Main thread woke up");
-
-    ASSERT(rmt_data == 1);
-
-    res = ethr_mutex_unlock(&rmt_mutex);
-    ASSERT(res == 0);
-    print_line("Main thread unlocked mutex");
-
-    res = ethr_thr_join(tid, NULL);
-    ASSERT(res == 0);
-    print_line("Main thread joined aux thread");
-
-    res = ethr_mutex_destroy(&rmt_mutex);
-    ASSERT(res == 0);
-    print_line("Main thread destroyed mutex");
-
-    if (do_restart) {
-#ifndef ETHR_REC_MUTEX_INITER
-    dynamic_init:
-#endif
-	do_restart = 0;
-
-	print_line("Running test with dynamically initialized mutex");
-
-	print_line("Trying to initialize mutex");
-	res = ethr_rec_mutex_init(&rmt_mutex);
-	ASSERT(res == 0);
-	print_line("Initialized mutex");
-
-	goto restart;
-    }
-
-#ifndef ETHR_REC_MUTEX_INITER
-    succeed("Static initializer for recursive mutexes not supported");
-#endif
-
-#else /* #ifdef ETHR_HAVE_ETHR_REC_MUTEX_INIT */
-    skip("Recursive mutexes not supported");
-#endif /* #ifdef ETHR_HAVE_ETHR_REC_MUTEX_INIT */
-}
-
-/*
- * The time now test.
- *
- * Tests ethr_time_now by comparing time values with Erlang.
- */
-#define TNT_MAX_TIME_DIFF 200000
-#define TNT_MAX_TIME_VALUES 52
-
-static void
-time_now_test(void)
-{
-    int scanf_res, time_now_res, i, no_values, max_abs_diff;
-    static ethr_timeval tv[TNT_MAX_TIME_VALUES];
-    static int ms[TNT_MAX_TIME_VALUES];
-
-    i = 0;
-    do {
-	ASSERT(i < TNT_MAX_TIME_VALUES);
-	scanf_res = scanf("%d", &ms[i]);
-	time_now_res = ethr_time_now(&tv[i]);
-	ASSERT(scanf_res == 1);
-	ASSERT(time_now_res == 0);
-#if 0
-	print_line("Got %d; %ld:%ld", ms[i], tv[i].tv_sec, tv[i].tv_nsec);
-#endif
-	i++;
-    } while (ms[i-1] >= 0);
-
-    no_values = i-1;
-
-    ASSERT(ms[0] == 0);
-
-    print_line("TNT_MAX_TIME_DIFF = %d (us)", TNT_MAX_TIME_DIFF);
-
-    max_abs_diff = 0;
-
-    for (i = 1; i < no_values; i++) {
-	long diff;
-	long tn_us;
-	long e_us;
-
-	tn_us = (tv[i].tv_sec - tv[0].tv_sec) * 1000000;
-	tn_us += (tv[i].tv_nsec - tv[0].tv_nsec)/1000;
-
-	e_us = ms[i]*1000;
-	
-	diff = e_us - tn_us;
-
-	print_line("Erlang time = %ld us; ethr_time_now = %ld us; diff %ld us",
-		   e_us, tn_us, diff);
-
-	if (max_abs_diff < abs((int) diff)) {
-	    max_abs_diff = abs((int) diff);
-	}
-
-	ASSERT(e_us - TNT_MAX_TIME_DIFF <= tn_us);
-	ASSERT(tn_us <= e_us + TNT_MAX_TIME_DIFF);
-    }
-
-    print_line("Max absolute diff = %d us", max_abs_diff);
-    succeed("Max absolute diff = %d us", max_abs_diff);
-}
-
-/*
  * The cond wait test case.
  *
  * Tests ethr_cond_wait with ethr_cond_signal and ethr_cond_broadcast.
  */
 
 
-static ethr_mutex cwt_mutex = ETHR_MUTEX_INITER;
-static ethr_cond cwt_cond = ETHR_COND_INITER;
+static ethr_mutex cwt_mutex;
+static ethr_cond cwt_cond;
 static int cwt_counter;
 
 void *
-cwt_thread(void *is_timedwait_test_ptr)
+cwt_thread(void *unused)
 {
-    int use_timedwait = *((int *) is_timedwait_test_ptr);
     int res;
 
-    res = ethr_mutex_lock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&cwt_mutex);
 
-    if (use_timedwait) {
-	ethr_timeval tv;
-	res = ethr_time_now(&tv);
-	ASSERT(res == 0);
-	tv.tv_sec += 3600; /* Make sure we won't time out */
-
-	do {
-	    res = ethr_cond_timedwait(&cwt_cond, &cwt_mutex, &tv);
-	} while (res == EINTR);
-	ASSERT(res == 0);
-    }
-    else {
-	do {
-	    res = ethr_cond_wait(&cwt_cond, &cwt_mutex);
-	} while (res == EINTR);
-	ASSERT(res == 0);
-    }
+    do {
+	res = ethr_cond_wait(&cwt_cond, &cwt_mutex);
+    } while (res == EINTR);
+    ASSERT(res == 0);
 
     cwt_counter++;
 
-    res = ethr_mutex_unlock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&cwt_mutex);
 
     return NULL;
 }
 
 static void
-cond_wait_test(int is_timedwait_test)
+cond_wait_test(void)
 {
-    int do_restart = !is_timedwait_test;
     ethr_tid tid1, tid2;
     int res;
 
-    if (!is_timedwait_test)
-	print_line("Running test with statically initialized mutex and cond");
+    res = ethr_mutex_init(&cwt_mutex);
+    ASSERT(res == 0);
+    res = ethr_cond_init(&cwt_cond);
+    ASSERT(res == 0);
 
- restart:
     /* Wake with signal */
 
     cwt_counter = 0;
 
-    res = ethr_thr_create(&tid1, cwt_thread, (void *) &is_timedwait_test, NULL);
+    res = ethr_thr_create(&tid1, cwt_thread, NULL, NULL);
     ASSERT(res == 0);
-    res = ethr_thr_create(&tid2, cwt_thread, (void *) &is_timedwait_test, NULL);
+    res = ethr_thr_create(&tid2, cwt_thread, NULL, NULL);
     ASSERT(res == 0);
 
     do_sleep(1); /* Make sure threads waits on cond var */
 
-    res = ethr_mutex_lock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&cwt_mutex);
 
-    res = ethr_cond_signal(&cwt_cond); /* Wake one thread */
-    ASSERT(res == 0);
+    ethr_cond_signal(&cwt_cond); /* Wake one thread */
 
     do_sleep(1); /* Make sure awakened thread waits on mutex */
 
     ASSERT(cwt_counter == 0);
 
-    res = ethr_mutex_unlock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&cwt_mutex);
 
     do_sleep(1);  /* Let awakened thread proceed */
 
-    res = ethr_mutex_lock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&cwt_mutex);
 
     ASSERT(cwt_counter == 1);
 
-    res = ethr_cond_signal(&cwt_cond); /* Wake the other thread */
-    ASSERT(res == 0);
+    ethr_cond_signal(&cwt_cond); /* Wake the other thread */
 
     do_sleep(1); /* Make sure awakened thread waits on mutex */
 
     ASSERT(cwt_counter == 1);
 
-    res = ethr_mutex_unlock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&cwt_mutex);
 
     do_sleep(1);  /* Let awakened thread proceed */
 
-    res = ethr_mutex_lock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&cwt_mutex);
 
     ASSERT(cwt_counter == 2);
 
-    res = ethr_mutex_unlock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&cwt_mutex);
 
     res = ethr_thr_join(tid1, NULL);
     ASSERT(res == 0);
@@ -875,35 +608,30 @@ cond_wait_test(int is_timedwait_test)
 
     cwt_counter = 0;
 
-    res = ethr_thr_create(&tid1, cwt_thread, (void *) &is_timedwait_test, NULL);
+    res = ethr_thr_create(&tid1, cwt_thread, NULL, NULL);
     ASSERT(res == 0);
-    res = ethr_thr_create(&tid2, cwt_thread, (void *) &is_timedwait_test, NULL);
+    res = ethr_thr_create(&tid2, cwt_thread, NULL, NULL);
     ASSERT(res == 0);
 
     do_sleep(1); /* Make sure threads waits on cond var */
 
-    res = ethr_mutex_lock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&cwt_mutex);
 
-    res = ethr_cond_broadcast(&cwt_cond); /* Wake the threads */
-    ASSERT(res == 0);
+    ethr_cond_broadcast(&cwt_cond); /* Wake the threads */
 
     do_sleep(1); /* Make sure awakened threads wait on mutex */
 
     ASSERT(cwt_counter == 0);
 
-    res = ethr_mutex_unlock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&cwt_mutex);
 
     do_sleep(1);  /* Let awakened threads proceed */
 
-    res = ethr_mutex_lock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&cwt_mutex);
 
     ASSERT(cwt_counter == 2);
 
-    res = ethr_mutex_unlock(&cwt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&cwt_mutex);
 
     res = ethr_thr_join(tid1, NULL);
     ASSERT(res == 0);
@@ -916,113 +644,6 @@ cond_wait_test(int is_timedwait_test)
     res = ethr_cond_destroy(&cwt_cond);
     ASSERT(res == 0);
 
-    if (do_restart) {
-	do_restart = 0;
-	res = ethr_mutex_init(&cwt_mutex);
-	ASSERT(res == 0);
-	res = ethr_cond_init(&cwt_cond);
-	ASSERT(res == 0);
-	print_line("Running test with dynamically initialized mutex and cond");
-	goto restart;
-    }
-}
-
-/*
- * The cond timedwait test case.
- *
- * Tests ethr_cond_timedwait with ethr_cond_signal and ethr_cond_broadcast.
- */
-
-#define CTWT_MAX_TIME_DIFF 100000
-
-static long
-ctwt_check_timeout(long to)
-{
-    int res;
-    ethr_timeval tva, tvb;
-    long diff, abs_diff;
-
-    res = ethr_time_now(&tva);
-    ASSERT(res == 0);
-
-    tva.tv_sec += to / 1000;
-    tva.tv_nsec += (to % 1000) * 1000000;
-    if (tva.tv_nsec >= 1000000000) {
-	tva.tv_sec++;
-	tva.tv_nsec -= 1000000000;
-	ASSERT(tva.tv_nsec < 1000000000);
-    }
-
-    do {
-	res = ethr_cond_timedwait(&cwt_cond, &cwt_mutex, &tva);
-    } while (res == EINTR);
-    ASSERT(res == ETIMEDOUT);
-
-    res = ethr_time_now(&tvb);
-    ASSERT(res == 0);
-
-    diff = (tvb.tv_sec - tva.tv_sec) * 1000000;
-    diff += (tvb.tv_nsec - tva.tv_nsec)/1000;
-
-    print("Timeout=%ld; ", to);
-    print("tva.tv_sec=%ld tva.tv_nsec=%ld; ", tva.tv_sec, tva.tv_nsec);
-    print("tvb.tv_sec=%ld tvb.tv_nsec=%ld; ", tvb.tv_sec, tvb.tv_nsec);
-    print_line("diff (tvb - tva) = %ld us", diff);
-
-    abs_diff = (long) abs((int) diff);
-
-    ASSERT(CTWT_MAX_TIME_DIFF >= abs_diff);
-    return abs_diff;
-}
-
-static void
-cond_timedwait_test(void)
-{
-    int do_restart = 1;
-    long abs_diff, max_abs_diff = 0;
-    int res;
-
-#define CTWT_UPD_MAX_DIFF if (abs_diff > max_abs_diff) max_abs_diff = abs_diff;
-
-    print_line("Running test with statically initialized mutex and cond");
-
-    print_line("CTWT_MAX_TIME_DIFF=%d", CTWT_MAX_TIME_DIFF);
-
- restart:
-
-    res = ethr_mutex_lock(&cwt_mutex);
-    ASSERT(res == 0);
-
-    abs_diff = ctwt_check_timeout(300);
-    CTWT_UPD_MAX_DIFF;
-    abs_diff = ctwt_check_timeout(700);
-    CTWT_UPD_MAX_DIFF;
-    abs_diff = ctwt_check_timeout(1000);
-    CTWT_UPD_MAX_DIFF;
-    abs_diff = ctwt_check_timeout(2300);
-    CTWT_UPD_MAX_DIFF;
-    abs_diff = ctwt_check_timeout(5100);
-    CTWT_UPD_MAX_DIFF;
-
-    res = ethr_mutex_unlock(&cwt_mutex);
-    ASSERT(res == 0);
-
-    cond_wait_test(1);
-
-    if (do_restart) {
-	do_restart = 0;
-	res = ethr_mutex_init(&cwt_mutex);
-	ASSERT(res == 0);
-	res = ethr_cond_init(&cwt_cond);
-	ASSERT(res == 0);
-	print_line("Running test with dynamically initialized mutex and cond");
-	goto restart;
-    }
-
-    print_line("Max absolute diff = %d us", max_abs_diff);
-    succeed("Max absolute diff = %d us", max_abs_diff);
-
-#undef CTWT_UPD_MAX_DIFF
 }
 
 /*
@@ -1037,9 +658,9 @@ cond_timedwait_test(void)
 static int bct_woken = 0;
 static int bct_waiting = 0;
 static int bct_done = 0;
-static ethr_mutex bct_mutex = ETHR_MUTEX_INITER;
-static ethr_cond bct_cond = ETHR_COND_INITER;
-static ethr_cond bct_cntrl_cond = ETHR_COND_INITER;
+static ethr_mutex bct_mutex;
+static ethr_cond bct_cond;
+static ethr_cond bct_cntrl_cond;
 
 
 static void *
@@ -1047,30 +668,24 @@ bct_thread(void *unused)
 {
     int res;
 
-    res = ethr_mutex_lock(&bct_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&bct_mutex);
 
     while (!bct_done) {
 
 	bct_waiting++;
-	if (bct_waiting == BCT_THREADS) {
-	    res = ethr_cond_signal(&bct_cntrl_cond);
-	    ASSERT(res == 0);
-	}
+	if (bct_waiting == BCT_THREADS)
+	    ethr_cond_signal(&bct_cntrl_cond);
 	do {
 	    res = ethr_cond_wait(&bct_cond, &bct_mutex);
 	} while (res == EINTR);
 	ASSERT(res == 0);
 	bct_woken++;
-	if (bct_woken == BCT_THREADS) {
-	    res = ethr_cond_signal(&bct_cntrl_cond);
-	    ASSERT(res == 0);
-	}
+	if (bct_woken == BCT_THREADS)
+	    ethr_cond_signal(&bct_cntrl_cond);
 
     }
 
-    res = ethr_mutex_unlock(&bct_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&bct_mutex);
 
     return NULL;
 }
@@ -1081,14 +696,20 @@ broadcast_test(void)
     int res, i;
     ethr_tid tid[BCT_THREADS];
 
+    res = ethr_mutex_init(&bct_mutex);
+    ASSERT(res == 0);
+    res = ethr_cond_init(&bct_cntrl_cond);
+    ASSERT(res == 0);
+    res = ethr_cond_init(&bct_cond);
+    ASSERT(res == 0);
+
     for (i = 0; i < BCT_THREADS; i++) {
 	res = ethr_thr_create(&tid[i], bct_thread, NULL, NULL);
 	ASSERT(res == 0);
 
     }
 
-    res = ethr_mutex_lock(&bct_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&bct_mutex);
 
     for (i = 0; i < BCT_NO_OF_WAITS; i++) {
 
@@ -1101,8 +722,7 @@ broadcast_test(void)
 	bct_woken = 0;
 
 	/* Wake all threads */
-	res = ethr_cond_broadcast(&bct_cond);
-	ASSERT(res == 0);
+	ethr_cond_broadcast(&bct_cond);
 
 	while (bct_woken != BCT_THREADS) {
 	    res = ethr_cond_wait(&bct_cntrl_cond, &bct_mutex);
@@ -1114,13 +734,11 @@ broadcast_test(void)
     bct_done = 1;
 
     /* Wake all threads */
-    res = ethr_cond_broadcast(&bct_cond);
-    ASSERT(res == 0);
+    ethr_cond_broadcast(&bct_cond);
 
-    res = ethr_mutex_unlock(&bct_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&bct_mutex);
 
-    for (i = 0; i < BCT_THREADS - 1; i++) {
+    for (i = 0; i < BCT_THREADS; i++) {
 	res = ethr_thr_join(tid[i], NULL);
 	ASSERT(res == 0);
     }
@@ -1143,26 +761,22 @@ broadcast_test(void)
 #define DT_THREADS (50*1024)
 #define DT_BATCH_SIZE 64
 
-static ethr_mutex dt_mutex = ETHR_MUTEX_INITER;
-static ethr_cond dt_cond = ETHR_COND_INITER;
+static ethr_mutex dt_mutex;
+static ethr_cond dt_cond;
 static int dt_count;
 static int dt_limit;
 
 static void *
 dt_thread(void *unused)
 {
-    int res;
-
-    res = ethr_mutex_lock(&dt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&dt_mutex);
 
     dt_count++;
 
     if (dt_count >= dt_limit)
 	ethr_cond_signal(&dt_cond);
 
-    res = ethr_mutex_unlock(&dt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&dt_mutex);
 
     return NULL;
 }
@@ -1174,6 +788,11 @@ detached_thread_test(void)
     ethr_tid tid[DT_BATCH_SIZE];
     int i, j, res;
 
+    res = ethr_mutex_init(&dt_mutex);
+    ASSERT(res == 0);
+    res = ethr_cond_init(&dt_cond);
+    ASSERT(res == 0);
+
     thr_opts.detached = 1;
     dt_count = 0;
     dt_limit = 0;
@@ -1187,14 +806,12 @@ detached_thread_test(void)
 	    ASSERT(res == 0);
 	}
 
-	res = ethr_mutex_lock(&dt_mutex);
-	ASSERT(res == 0);
+	ethr_mutex_lock(&dt_mutex);
 	while (dt_count < dt_limit) {
 	    res = ethr_cond_wait(&dt_cond, &dt_mutex);
 	    ASSERT(res == 0 || res == EINTR);
 	}
-	res = ethr_mutex_unlock(&dt_mutex);
-	ASSERT(res == 0);
+	ethr_mutex_unlock(&dt_mutex);
 
 	print_line("dt_count = %d", dt_count);
     }
@@ -1211,8 +828,8 @@ detached_thread_test(void)
 #define MTT_TIMES 10
 
 static int mtt_terminate;
-static ethr_mutex mtt_mutex = ETHR_MUTEX_INITER;
-static ethr_cond mtt_cond = ETHR_COND_INITER;
+static ethr_mutex mtt_mutex;
+static ethr_cond mtt_cond;
 static char mtt_string[22*MTT_TIMES]; /* 22 is enough for ", %d" */
 
 
@@ -1220,16 +837,14 @@ void *mtt_thread(void *unused)
 {
     int res;
 
-    res = ethr_mutex_lock(&mtt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&mtt_mutex);
 
     while (!mtt_terminate) {
 	res = ethr_cond_wait(&mtt_cond, &mtt_mutex);
 	ASSERT(res == 0 || res == EINTR);
     }
 
-    res = ethr_mutex_unlock(&mtt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&mtt_mutex);
 
     return NULL; 
 }
@@ -1265,16 +880,13 @@ mtt_create_join_threads(void)
     print_line("%d = ethr_thr_create()", res);
     print_line("Number of created threads: %d", no_threads);
 
-    res = ethr_mutex_lock(&mtt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_lock(&mtt_mutex);
 
     mtt_terminate = 1;
 
-    res = ethr_cond_broadcast(&mtt_cond);
-    ASSERT(res == 0);
+    ethr_cond_broadcast(&mtt_cond);
 
-    res = ethr_mutex_unlock(&mtt_mutex);
-    ASSERT(res == 0);
+    ethr_mutex_unlock(&mtt_mutex);
 
     while (ix) {
 	res = ethr_thr_join(tids[--ix], NULL);
@@ -1292,9 +904,14 @@ mtt_create_join_threads(void)
 static void
 max_threads_test(void)
 {
-    int no_threads[MTT_TIMES], i, up, down, eq;
+    int no_threads[MTT_TIMES], i, up, down, eq, res;
     char *str;
 
+    res = ethr_mutex_init(&mtt_mutex);
+    ASSERT(res == 0);
+    res = ethr_cond_init(&mtt_cond);
+    ASSERT(res == 0);
+
     for (i = 0; i < MTT_TIMES; i++) {
 	no_threads[i] = mtt_create_join_threads();
     }
@@ -1326,272 +943,6 @@ max_threads_test(void)
 
 }
 
-
-/*
- * The forksafety test case.
- *
- * Tests forksafety.
- */
-#ifdef __WIN32__
-#define NO_FORK_PRESENT
-#endif
-
-#ifndef NO_FORK_PRESENT
-
-static ethr_mutex ft_test_inner_mutex = ETHR_MUTEX_INITER;
-static ethr_mutex ft_test_outer_mutex = ETHR_MUTEX_INITER;
-static ethr_mutex ft_go_mutex = ETHR_MUTEX_INITER;
-static ethr_cond ft_go_cond = ETHR_COND_INITER;
-static int ft_go;
-static int ft_have_forked;
-
-static void *
-ft_thread(void *unused)
-{
-    int res;
-
-    res = ethr_mutex_lock(&ft_test_outer_mutex);
-    ASSERT(res == 0);
-
-    res = ethr_mutex_lock(&ft_go_mutex);
-    ASSERT(res == 0);
-
-    ft_go = 1;
-    res = ethr_cond_signal(&ft_go_cond);
-    ASSERT(res == 0);
-    res = ethr_mutex_unlock(&ft_go_mutex);
-    ASSERT(res == 0);
-
-    do_sleep(1);
-    ASSERT(!ft_have_forked);
-
-    res = ethr_mutex_lock(&ft_test_inner_mutex);
-    ASSERT(res == 0);
-
-    res = ethr_mutex_unlock(&ft_test_inner_mutex);
-    ASSERT(res == 0);
-
-    do_sleep(1);
-    ASSERT(!ft_have_forked);
-
-    res = ethr_mutex_unlock(&ft_test_outer_mutex);
-    ASSERT(res == 0);
-
-    do_sleep(1);
-    ASSERT(ft_have_forked);
-    
-
-    return NULL;
-}
-
-#endif /* #ifndef NO_FORK_PRESENT */
-
-static void
-forksafety_test(void)
-{
-#ifdef NO_FORK_PRESENT
-    skip("No fork() present; nothing to test");
-#elif defined(DEBUG)
-    skip("Doesn't work in debug build");
-#else
-    char snd_msg[] = "ok, bye!";
-    char rec_msg[sizeof(snd_msg)*2];
-    ethr_tid tid;
-    int res;
-    int fds[2];
-
-
-    res = ethr_mutex_set_forksafe(&ft_test_inner_mutex);
-    if (res == ENOTSUP) {
-	skip("Forksafety not supported on this platform!");
-    }
-    ASSERT(res == 0);
-    res = ethr_mutex_set_forksafe(&ft_test_outer_mutex);
-    ASSERT(res == 0);
-
-
-    res = pipe(fds);
-    ASSERT(res == 0);
-
-    ft_go = 0;
-    ft_have_forked = 0;
-
-    res = ethr_mutex_lock(&ft_go_mutex);
-    ASSERT(res == 0);
-    
-    res = ethr_thr_create(&tid, ft_thread, NULL, NULL);
-    ASSERT(res == 0);
-
-    do {
-	res = ethr_cond_wait(&ft_go_cond, &ft_go_mutex);
-    } while (res == EINTR || !ft_go);
-    ASSERT(res == 0);
-
-    res = ethr_mutex_unlock(&ft_go_mutex);
-    ASSERT(res == 0);
-
-    res = fork();
-    ft_have_forked = 1;
-    if (res == 0) {
-	close(fds[0]);
-	res = ethr_mutex_lock(&ft_test_outer_mutex);
-	if (res != 0)
-	    _exit(1);
-	res = ethr_mutex_lock(&ft_test_inner_mutex);
-	if (res != 0)
-	    _exit(1);
-	res = ethr_mutex_unlock(&ft_test_inner_mutex);
-	if (res != 0)
-	    _exit(1);
-	res = ethr_mutex_unlock(&ft_test_outer_mutex);
-	if (res != 0)
-	    _exit(1);
-
-	res = ethr_mutex_destroy(&ft_test_inner_mutex);
-	if (res != 0)
-	    _exit(1);
-	res = ethr_mutex_destroy(&ft_test_outer_mutex);
-	if (res != 0)
-	    _exit(1);
-
-	res = (int) write(fds[1], (void *) snd_msg, sizeof(snd_msg));
-	if (res != sizeof(snd_msg))
-	    _exit(1);
-	close(fds[1]);
-	_exit(0);
-    }
-    ASSERT(res > 0);
-    close(fds[1]);
-
-    res = (int) read(fds[0], (void *) rec_msg, sizeof(rec_msg));
-    ASSERT(res == (int) sizeof(snd_msg));
-    ASSERT(strcmp(snd_msg, rec_msg) == 0);
-
-    close(fds[0]);
-#endif
-}
-
-
-/*
- * The vfork test case.
- *
- * Tests vfork with threads.
- */
-
-#ifdef __WIN32__
-#define NO_VFORK_PRESENT
-#endif
-
-#ifndef NO_VFORK_PRESENT
-
-#undef vfork
-
-static ethr_mutex vt_mutex = ETHR_MUTEX_INITER;
-
-static void *
-vt_thread(void *vprog)
-{
-    char *prog = (char *) vprog;
-    int res;
-    char snd_msg[] = "ok, bye!";
-    char rec_msg[sizeof(snd_msg)*2];
-    int fds[2];
-    char closefd[20];
-    char writefd[20];
-
-    res = pipe(fds);
-    ASSERT(res == 0);
-
-    res = sprintf(closefd, "%d", fds[0]);
-    ASSERT(res <= 20);
-    res = sprintf(writefd, "%d", fds[1]);
-    ASSERT(res <= 20);
-
-    print("parent: About to vfork and execute ");
-    print("execlp(\"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", NULL)",
-	  prog, prog, "vfork", "exec", snd_msg, closefd, writefd);
-    print_line(" in child");
-    res = vfork();
-    if (res == 0) {
-	execlp(prog, prog, "vfork", "exec", snd_msg, closefd, writefd, NULL);
-	_exit(1);
-    }
-    ASSERT(res > 0);
-
-    print_line("parent: I'm back");
-
-    close(fds[1]);
-
-    res = (int) read(fds[0], (void *) rec_msg, sizeof(rec_msg));
-    print_line("parent: %d = read()", res);
-    print_line("parent: rec_msg=\"%s\"", rec_msg);
-    ASSERT(res == (int) sizeof(snd_msg));
-    ASSERT(strcmp(snd_msg, rec_msg) == 0);
-
-    close(fds[0]);
-
-    return NULL;
-}
-
-#endif /* #ifndef NO_VFORK_PRESENT */
-
-static void
-vfork_test(int argc, char *argv[])
-{
-#ifdef NO_VFORK_PRESENT
-    skip("No vfork() present; nothing to test");
-#else
-    int res;
-    ethr_tid tid;
-
-    if (argc == 6 && strcmp("exec", argv[2]) == 0) {
-	/* We are child after vfork() and execlp() ... */
-
-	char *snd_msg;
-	int closefd;
-	int writefd;
-
-	snd_msg = argv[3];
-	closefd = atoi(argv[4]);
-	writefd = atoi(argv[5]);
-
-	print_line("child: snd_msg=\"%s\"; closefd=%d writefd=%d",
-		   snd_msg, closefd, writefd);
-
-	close(closefd);
-
-	res = (int) write(writefd, (void *) snd_msg, strlen(snd_msg)+1);
-	print_line("child: %d = write()", res);
-	if (res != strlen(snd_msg)+1)
-	    exit(1);
-	close(writefd);
-	print_line("child: bye");
-	exit(0);
-    }
-    ASSERT(argc == 2);
-
-    res = ethr_mutex_set_forksafe(&vt_mutex);
-    ASSERT(res == 0 || res == ENOTSUP);
-    res = ethr_mutex_lock(&vt_mutex);
-    ASSERT(res == 0);
-
-    res = ethr_thr_create(&tid, vt_thread, (void *) argv[0], NULL);
-    ASSERT(res == 0);
-
-    do_sleep(1);
-
-    res = ethr_mutex_unlock(&vt_mutex);
-    ASSERT(res == 0);
-
-    res = ethr_thr_join(tid, NULL);
-    ASSERT(res == 0);
-
-    res = ethr_mutex_destroy(&vt_mutex);
-    ASSERT(res == 0);
-#endif
-}
-
-
 /*
  * The tsd test case.
  *
@@ -1651,11 +1002,8 @@ static int st_data;
 void *
 st_thread(void *unused)
 {
-    int res;
-
     print_line("Aux thread tries to lock spinlock");
-    res = ethr_spin_lock(&st_spinlock);
-    ASSERT(res == 0);
+    ethr_spin_lock(&st_spinlock);
     print_line("Aux thread locked spinlock");
 
     ASSERT(st_data == 0);
@@ -1669,8 +1017,7 @@ st_thread(void *unused)
 
     ASSERT(st_data == 1);
 
-    res = ethr_spin_unlock(&st_spinlock);
-    ASSERT(res == 0);
+    ethr_spin_unlock(&st_spinlock);
     print_line("Aux thread unlocked spinlock");
 
     return NULL;
@@ -1691,8 +1038,7 @@ spinlock_test(void)
     st_data = 0;
 
     print_line("Main thread tries to lock spinlock");
-    res = ethr_spin_lock(&st_spinlock);
-    ASSERT(res == 0);
+    ethr_spin_lock(&st_spinlock);
     print_line("Main thread locked spinlock");
 
     ASSERT(st_data == 0);
@@ -1708,8 +1054,7 @@ spinlock_test(void)
 
     ASSERT(st_data == 0);
 
-    res = ethr_spin_unlock(&st_spinlock);
-    ASSERT(res == 0);
+    ethr_spin_unlock(&st_spinlock);
     print_line("Main thread unlocked spinlock");
 
     print_line("Main thread goes to sleep for 1 second");
@@ -1717,8 +1062,7 @@ spinlock_test(void)
     print_line("Main thread woke up");
 
     print_line("Main thread tries to lock spinlock");
-    res = ethr_spin_lock(&st_spinlock);
-    ASSERT(res == 0);
+    ethr_spin_lock(&st_spinlock);
     print_line("Main thread locked spinlock");
 
     ASSERT(st_data == 1);
@@ -1729,8 +1073,7 @@ spinlock_test(void)
 
     ASSERT(st_data == 1);
 
-    res = ethr_spin_unlock(&st_spinlock);
-    ASSERT(res == 0);
+    ethr_spin_unlock(&st_spinlock);
     print_line("Main thread unlocked spinlock");
 
     res = ethr_thr_join(tid, NULL);
@@ -1757,23 +1100,19 @@ void *
 rwst_thread(void *unused)
 {
     int data;
-    int res;
 
     print_line("Aux thread tries to read lock rwspinlock");
-    res = ethr_read_lock(&rwst_rwspinlock);
-    ASSERT(res == 0);
+    ethr_read_lock(&rwst_rwspinlock);
     print_line("Aux thread read locked rwspinlock");
 
     ASSERT(rwst_data == 4711);
 
     print_line("Aux thread tries to read unlock rwspinlock");
-    res = ethr_read_unlock(&rwst_rwspinlock);
-    ASSERT(res == 0);
+    ethr_read_unlock(&rwst_rwspinlock);
     print_line("Aux thread read unlocked rwspinlock");
 
     print_line("Aux thread tries to write lock rwspinlock");
-    res = ethr_write_lock(&rwst_rwspinlock);
-    ASSERT(res == 0);
+    ethr_write_lock(&rwst_rwspinlock);
     print_line("Aux thread write locked rwspinlock");
 
     data = ++rwst_data;
@@ -1787,8 +1126,7 @@ rwst_thread(void *unused)
     ++rwst_data;
 
     print_line("Aux thread tries to write unlock rwspinlock");
-    res = ethr_write_unlock(&rwst_rwspinlock);
-    ASSERT(res == 0);
+    ethr_write_unlock(&rwst_rwspinlock);
     print_line("Aux thread write unlocked rwspinlock");
 
     return NULL;
@@ -1810,8 +1148,7 @@ rwspinlock_test(void)
     rwst_data = 4711;
 
     print_line("Main thread tries to read lock rwspinlock");
-    res = ethr_read_lock(&rwst_rwspinlock);
-    ASSERT(res == 0);
+    ethr_read_lock(&rwst_rwspinlock);
     print_line("Main thread read locked rwspinlock");
 
     ASSERT(rwst_data == 4711);
@@ -1828,13 +1165,11 @@ rwspinlock_test(void)
     ASSERT(rwst_data == 4711);
 
     print_line("Main thread tries to read unlock rwspinlock");
-    res = ethr_read_unlock(&rwst_rwspinlock);
-    ASSERT(res == 0);
+    ethr_read_unlock(&rwst_rwspinlock);
     print_line("Main thread read unlocked rwspinlock");
 
     print_line("Main thread tries to write lock rwspinlock");
-    res = ethr_write_lock(&rwst_rwspinlock);
-    ASSERT(res == 0);
+    ethr_write_lock(&rwst_rwspinlock);
     print_line("Main thread write locked rwspinlock");
 
     data = ++rwst_data;
@@ -1847,8 +1182,7 @@ rwspinlock_test(void)
     ++rwst_data;
 
     print_line("Main thread tries to write unlock rwspinlock");
-    res = ethr_write_unlock(&rwst_rwspinlock);
-    ASSERT(res == 0);
+    ethr_write_unlock(&rwst_rwspinlock);
     print_line("Main thread write unlocked rwspinlock");
 
     res = ethr_thr_join(tid, NULL);
@@ -1875,23 +1209,19 @@ void *
 rwmt_thread(void *unused)
 {
     int data;
-    int res;
 
     print_line("Aux thread tries to read lock rwmutex");
-    res = ethr_rwmutex_rlock(&rwmt_rwmutex);
-    ASSERT(res == 0);
+    ethr_rwmutex_rlock(&rwmt_rwmutex);
     print_line("Aux thread read locked rwmutex");
 
     ASSERT(rwmt_data == 4711);
 
     print_line("Aux thread tries to read unlock rwmutex");
-    res = ethr_rwmutex_runlock(&rwmt_rwmutex);
-    ASSERT(res == 0);
+    ethr_rwmutex_runlock(&rwmt_rwmutex);
     print_line("Aux thread read unlocked rwmutex");
 
     print_line("Aux thread tries to write lock rwmutex");
-    res = ethr_rwmutex_rwlock(&rwmt_rwmutex);
-    ASSERT(res == 0);
+    ethr_rwmutex_rwlock(&rwmt_rwmutex);
     print_line("Aux thread write locked rwmutex");
 
     data = ++rwmt_data;
@@ -1905,8 +1235,7 @@ rwmt_thread(void *unused)
     ++rwmt_data;
 
     print_line("Aux thread tries to write unlock rwmutex");
-    res = ethr_rwmutex_rwunlock(&rwmt_rwmutex);
-    ASSERT(res == 0);
+    ethr_rwmutex_rwunlock(&rwmt_rwmutex);
     print_line("Aux thread write unlocked rwmutex");
 
     return NULL;
@@ -1928,8 +1257,7 @@ rwmutex_test(void)
     rwmt_data = 4711;
 
     print_line("Main thread tries to read lock rwmutex");
-    res = ethr_rwmutex_rlock(&rwmt_rwmutex);
-    ASSERT(res == 0);
+    ethr_rwmutex_rlock(&rwmt_rwmutex);
     print_line("Main thread read locked rwmutex");
 
     ASSERT(rwmt_data == 4711);
@@ -1946,13 +1274,11 @@ rwmutex_test(void)
     ASSERT(rwmt_data == 4711);
 
     print_line("Main thread tries to read unlock rwmutex");
-    res = ethr_rwmutex_runlock(&rwmt_rwmutex);
-    ASSERT(res == 0);
+    ethr_rwmutex_runlock(&rwmt_rwmutex);
     print_line("Main thread read unlocked rwmutex");
 
     print_line("Main thread tries to write lock rwmutex");
-    res = ethr_rwmutex_rwlock(&rwmt_rwmutex);
-    ASSERT(res == 0);
+    ethr_rwmutex_rwlock(&rwmt_rwmutex);
     print_line("Main thread write locked rwmutex");
 
     data = ++rwmt_data;
@@ -1965,8 +1291,7 @@ rwmutex_test(void)
     ++rwmt_data;
 
     print_line("Main thread tries to write unlock rwmutex");
-    res = ethr_rwmutex_rwunlock(&rwmt_rwmutex);
-    ASSERT(res == 0);
+    ethr_rwmutex_rwunlock(&rwmt_rwmutex);
     print_line("Main thread write unlocked rwmutex");
 
     res = ethr_thr_join(tid, NULL);
@@ -1998,65 +1323,53 @@ static ethr_atomic_t at_data;
 void *
 at_thread(void *unused)
 {
-    int res, i;
+    int i;
     long val, go;
     
 
-    res = ethr_atomic_inctest(&at_ready, &val);
-    ASSERT(res == 0);
+    val = ethr_atomic_inc_read(&at_ready);
     ASSERT(val > 0);
     ASSERT(val <= AT_THREADS);
 
     do {
-	res = ethr_atomic_read(&at_go, &go);
-	ASSERT(res == 0);
+	go = ethr_atomic_read(&at_go);
     } while (!go);
 
     for (i = 0; i < AT_ITER; i++) {
-	res = ethr_atomic_or_old(&at_data, at_set_val, &val);
-	ASSERT(res == 0);
+	val = ethr_atomic_read_bor(&at_data, at_set_val);
 	ASSERT(val >= (i == 0 ? 0 : at_set_val) + (long) 4711);
 	ASSERT(val <= at_max_val);
 
-	res = ethr_atomic_and_old(&at_data, ~at_rm_val, &val);
-	ASSERT(res == 0);
+	val = ethr_atomic_read_band(&at_data, ~at_rm_val);
 	ASSERT(val >= at_set_val + (long) 4711);
 	ASSERT(val <= at_max_val);
 
-	res = ethr_atomic_read(&at_data, &val);
-	ASSERT(res == 0);
+	val = ethr_atomic_read(&at_data);
 	ASSERT(val >= at_set_val + (long) 4711);
 	ASSERT(val <= at_max_val);
 
-	res = ethr_atomic_inctest(&at_data, &val);
-	ASSERT(res == 0);
+	val = ethr_atomic_inc_read(&at_data);
 	ASSERT(val > at_set_val + (long) 4711);
 	ASSERT(val <= at_max_val);
 
-	res = ethr_atomic_dectest(&at_data, &val);
-	ASSERT(res == 0);
+	val = ethr_atomic_dec_read(&at_data);
 	ASSERT(val >= at_set_val + (long) 4711);
 	ASSERT(val <= at_max_val);
 
-	res = ethr_atomic_inc(&at_data);
-	ASSERT(res == 0);
+	ethr_atomic_inc(&at_data);
 
-	res = ethr_atomic_dec(&at_data);
-	ASSERT(res == 0);
+	ethr_atomic_dec(&at_data);
 
-	res = ethr_atomic_addtest(&at_data, (long) 4711, &val);
-	ASSERT(res == 0);
+	val = ethr_atomic_add_read(&at_data, (long) 4711);
 	ASSERT(val >= at_set_val + (long) 2*4711);
 	ASSERT(val <= at_max_val);
 
-	res = ethr_atomic_add(&at_data, (long) -4711);
-	ASSERT(res == 0);
+	ethr_atomic_add(&at_data, (long) -4711);
 	ASSERT(val >= at_set_val + (long) 4711);
 	ASSERT(val <= at_max_val);
     }
 
-    res = ethr_atomic_inc(&at_done);
-    ASSERT(res == 0);
+    ethr_atomic_inc(&at_done);
     return NULL;
 }
 
@@ -2069,14 +1382,13 @@ atomic_test(void)
     ethr_tid tid[AT_THREADS];
     ethr_thr_opts thr_opts = ETHR_THR_OPTS_DEFAULT_INITER;
 
-    if (sizeof(long) > 4) {
+#if ETHR_SIZEOF_PTR > 4
 	at_rm_val = ((long) 1) << 57;
 	at_set_val = ((long) 1) << 60;
-    }
-    else {
+#else
 	at_rm_val = ((long) 1) << 27;
 	at_set_val = ((long) 1) << 30;
-    }
+#endif
 
     at_max_val = at_set_val + at_rm_val + ((long) AT_THREADS + 1) * 4711;
     data_init = at_rm_val + (long) 4711;
@@ -2085,22 +1397,15 @@ atomic_test(void)
     thr_opts.detached = 1;
 
     print_line("Initializing");
-    res = ethr_atomic_init(&at_ready, 0);
-    ASSERT(res == 0);
-    res = ethr_atomic_init(&at_go, 0);
-    ASSERT(res == 0);
-    res = ethr_atomic_init(&at_done, data_init);
-    ASSERT(res == 0);
-    res = ethr_atomic_init(&at_data, data_init);
-    ASSERT(res == 0);
+    ethr_atomic_init(&at_ready, 0);
+    ethr_atomic_init(&at_go, 0);
+    ethr_atomic_init(&at_done, data_init);
+    ethr_atomic_init(&at_data, data_init);
 
-    res = ethr_atomic_read(&at_data, &val);
-    ASSERT(res == 0);
+    val = ethr_atomic_read(&at_data);
     ASSERT(val == data_init);
-    res = ethr_atomic_set(&at_done, 0);
-    ASSERT(res == 0);
-    res = ethr_atomic_read(&at_done, &val);
-    ASSERT(res == 0);
+    ethr_atomic_set(&at_done, 0);
+    val = ethr_atomic_read(&at_done);
     ASSERT(val == 0);
 
     print_line("Creating threads");
@@ -2111,31 +1416,27 @@ atomic_test(void)
 
     print_line("Waiting for threads to ready up");
     do {
-	res = ethr_atomic_read(&at_ready, &val);
-	ASSERT(res == 0);
+	val = ethr_atomic_read(&at_ready);
 	ASSERT(val >= 0);
 	ASSERT(val <= AT_THREADS);
     } while (val != AT_THREADS);
 
     print_line("Letting threads loose");
-    res = ethr_atomic_xchg(&at_go, 17, &val);
-    ASSERT(res == 0);
+    val = ethr_atomic_xchg(&at_go, 17);
     ASSERT(val == 0);
-    res = ethr_atomic_read(&at_go, &val);
-    ASSERT(res == 0);
+    val = ethr_atomic_read(&at_go);
     ASSERT(val == 17);
 
 
     print_line("Waiting for threads to finish");
     do {
-	res = ethr_atomic_read(&at_done, &val);
-	ASSERT(res == 0);
+	val = ethr_atomic_read(&at_done);
 	ASSERT(val >= 0);
 	ASSERT(val <= AT_THREADS);
     } while (val != AT_THREADS);
 
     print_line("Checking result");
-    res = ethr_atomic_read(&at_data, &val);
+    val = ethr_atomic_read(&at_data);
     ASSERT(res == 0);
     ASSERT(val == data_final);
     print_line("Result ok");
@@ -2143,190 +1444,6 @@ atomic_test(void)
 }
 
 
-/*
- * The gate test case.
- *
- * Tests gates.
- */
-
-#define GT_THREADS 10
-
-static ethr_atomic_t gt_wait1;
-static ethr_atomic_t gt_wait2;
-static ethr_atomic_t gt_done;
-
-static ethr_gate gt_gate1;
-static ethr_gate gt_gate2;
-
-void *
-gt_thread(void *thr_no)
-{
-    int no = (int)(long) thr_no;
-    int swait = no % 2 == 0;
-    int res;
-    long done;
-
-
-    do {
-
-	res = ethr_atomic_inc(&gt_wait1);
-	ASSERT(res == 0);
-
-	if (swait)
-	    res = ethr_gate_swait(&gt_gate1, INT_MAX);
-	else
-	    res = ethr_gate_wait(&gt_gate1);
-	ASSERT(res == 0);
-
-	res = ethr_atomic_dec(&gt_wait1);
-	ASSERT(res == 0);
-
-	res = ethr_atomic_inc(&gt_wait2);
-	ASSERT(res == 0);
-
-	if (swait)
-	    res = ethr_gate_swait(&gt_gate2, INT_MAX);
-	else
-	    res = ethr_gate_wait(&gt_gate2);
-	ASSERT(res == 0);
-
-	res = ethr_atomic_dec(&gt_wait2);
-	ASSERT(res == 0);
-
-	res = ethr_atomic_read(&gt_done, &done);
-	ASSERT(res == 0);
-    } while (!done);
-    return NULL;
-}
-
-
-static void
-gate_test(void)
-{
-    long val;
-    int res, i;
-    ethr_tid tid[GT_THREADS];
-
-    print_line("Initializing");
-    res = ethr_atomic_init(&gt_wait1, 0);
-    ASSERT_EQ(res, 0, "%d");
-    res = ethr_atomic_init(&gt_wait2, 0);
-    ASSERT_EQ(res, 0, "%d");
-    res = ethr_atomic_init(&gt_done, 0);
-    ASSERT_EQ(res, 0, "%d");
-    res = ethr_gate_init(&gt_gate1);
-    ASSERT_EQ(res, 0, "%d");
-    res = ethr_gate_init(&gt_gate2);
-    ASSERT_EQ(res, 0, "%d");
-
-    print_line("Creating threads");
-    for (i = 0; i < GT_THREADS; i++) {
-	res = ethr_thr_create(&tid[i], gt_thread, (void *) i, NULL);
-	ASSERT_EQ(res, 0, "%d");
-    }
-
-    print_line("Waiting for threads to ready up");
-    do {
-	res = ethr_atomic_read(&gt_wait1, &val);
-	ASSERT_EQ(res, 0, "%d");
-	ASSERT(0 <= val && val <= GT_THREADS);
-    } while (val != GT_THREADS);
-
-    print_line("Testing");
-
-    res = ethr_gate_let_through(&gt_gate1, 8);
-    ASSERT_EQ(res, 0, "%d");
-
-    WAIT_UNTIL_LIM((res = ethr_atomic_read(&gt_wait2, &val),
-		    (res != 0 || val == 8)),
-		   60);
-
-    res = ethr_atomic_read(&gt_wait1, &val);
-    ASSERT_EQ(res, 0, "%d");
-    ASSERT_EQ(val, GT_THREADS - 8, "%ld");
-
-    res = ethr_atomic_read(&gt_wait2, &val);
-    ASSERT_EQ(res, 0, "%d");
-    ASSERT_EQ(val, 8, "%ld");
-    
-    res = ethr_gate_let_through(&gt_gate2, 4);
-    ASSERT_EQ(res, 0, "%d");
-
-    WAIT_UNTIL_LIM((res = ethr_atomic_read(&gt_wait2, &val),
-		    (res != 0 || val == 4)),
-		   60);
-
-    res = ethr_atomic_read(&gt_wait1, &val);
-    ASSERT_EQ(res, 0, "%d");
-    ASSERT_EQ(val, GT_THREADS - 4, "%ld");
-
-    res = ethr_atomic_read(&gt_wait2, &val);
-    ASSERT_EQ(res, 0, "%d");
-    ASSERT_EQ(val, 4, "%ld");
-    
-    res = ethr_gate_let_through(&gt_gate1, GT_THREADS);
-    ASSERT_EQ(res, 0, "%d");
-
-    WAIT_UNTIL_LIM((res = ethr_atomic_read(&gt_wait2, &val),
-		    (res != 0 || val == GT_THREADS)),
-		   60);
-    res = ethr_atomic_read(&gt_wait1, &val);
-    ASSERT_EQ(res, 0, "%d");
-    ASSERT_EQ(val, 0, "%ld");
-
-    res = ethr_atomic_read(&gt_wait2, &val);
-    ASSERT_EQ(res, 0, "%d");
-    ASSERT_EQ(val, GT_THREADS, "%ld");
-    
-    res = ethr_gate_let_through(&gt_gate2, GT_THREADS);
-    ASSERT_EQ(res, 0, "%d");
-
-    WAIT_UNTIL_LIM((res = ethr_atomic_read(&gt_wait2, &val),
-		    (res != 0 || val == 4)),
-		   60);
-    res = ethr_atomic_read(&gt_wait1, &val);
-    ASSERT_EQ(res, 0, "%d");
-    ASSERT_EQ(val, GT_THREADS - 4, "%ld");
-
-    res = ethr_atomic_read(&gt_wait2, &val);
-    ASSERT_EQ(res, 0, "%d");
-    ASSERT_EQ(val, 4, "%ld");
-    
-    res = ethr_atomic_set(&gt_done, 1);
-    ASSERT_EQ(res, 0, "%d");
-
-    res = ethr_gate_let_through(&gt_gate2, GT_THREADS);
-    ASSERT_EQ(res, 0, "%d");
-    res = ethr_gate_let_through(&gt_gate1, GT_THREADS - 4);
-    ASSERT_EQ(res, 0, "%d");
-
-    WAIT_UNTIL_LIM(((res = ethr_atomic_read(&gt_wait1, &val)) != 0
-		    || (val == 0
-			&& ((res = ethr_atomic_read(&gt_wait2, &val)) != 0
-			    || val == 0))),
-		   60);
-
-    res = ethr_atomic_read(&gt_wait1, &val);
-    ASSERT_EQ(res, 0, "%d");
-    ASSERT_EQ(val, 0, "%ld");
-
-    res = ethr_atomic_read(&gt_wait2, &val);
-    ASSERT_EQ(res, 0, "%d");
-    ASSERT_EQ(val, 0, "%ld");
-    
-    print_line("Joining threads");
-    for (i = 0; i < GT_THREADS; i++) {
-	res = ethr_thr_join(tid[i], NULL);
-	ASSERT_EQ(res, 0, "%d");
-    }
-
-    res = ethr_gate_destroy(&gt_gate1);
-    ASSERT_EQ(res, 0, "%d");
-    res = ethr_gate_destroy(&gt_gate2);
-    ASSERT_EQ(res, 0, "%d");
-
-}
-
 #endif /* #ifndef ETHR_NO_THREAD_LIB */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2342,14 +1459,12 @@ main(int argc, char *argv[])
 #ifndef ETHR_NO_THREAD_LIB
     {
 	char *testcase;
-	int res;
 
 	send_my_pid();
 
 	testcase = argv[1];
-	res = ethr_init(NULL);
 
-	if (res != 0)
+	if (ethr_init(NULL) != 0 || ethr_late_init(NULL) != 0)
 	    fail("Failed to initialize the ethread library");
 
 	if (strcmp(testcase, "create_join_thread") == 0)
@@ -2360,24 +1475,14 @@ main(int argc, char *argv[])
 	    mutex_test();
 	else if (strcmp(testcase, "try_lock_mutex") == 0)
 	    try_lock_mutex_test();
-	else if (strcmp(testcase, "recursive_mutex") == 0)
-	    recursive_mutex_test();
-	else if (strcmp(testcase, "time_now") == 0)
-	    time_now_test();
 	else if (strcmp(testcase, "cond_wait") == 0)
-	    cond_wait_test(0);
-	else if (strcmp(testcase, "cond_timedwait") == 0)
-	    cond_timedwait_test();
+	    cond_wait_test();
 	else if (strcmp(testcase, "broadcast") == 0)
 	    broadcast_test();
 	else if (strcmp(testcase, "detached_thread") == 0)
 	    detached_thread_test();
 	else if (strcmp(testcase, "max_threads") == 0)
 	    max_threads_test();
-	else if (strcmp(testcase, "forksafety") == 0)
-	    forksafety_test();
-	else if (strcmp(testcase, "vfork") == 0)
-	    vfork_test(argc, argv);
 	else if (strcmp(testcase, "tsd") == 0)
 	    tsd_test();
 	else if (strcmp(testcase, "spinlock") == 0)
@@ -2388,8 +1493,6 @@ main(int argc, char *argv[])
 	    rwmutex_test();
 	else if (strcmp(testcase, "atomic") == 0)
 	    atomic_test();
-	else if (strcmp(testcase, "gate") == 0)
-	    gate_test();
 	else
 	    skip("Test case \"%s\" not implemented yet", testcase);
 
diff --git a/erts/test/install_SUITE.erl b/erts/test/install_SUITE.erl
index e14790bc1b..2279ddae00 100644
--- a/erts/test/install_SUITE.erl
+++ b/erts/test/install_SUITE.erl
@@ -29,8 +29,9 @@
 
 %-define(line_trace, 1).
 
--export([all/1, init_per_suite/1, end_per_suite/1,
-	 init_per_testcase/2, fin_per_testcase/2]).
+-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]).
 
 -export([bin_default/1,
 	 bin_default_dirty/1,
@@ -64,27 +65,32 @@
 	       erlang_bindir = "",
 	       bindir_symlinks = ""}).
 
-need_symlink_cases() ->
-    [bin_unreachable_absolute,
-     bin_unreachable_relative,
-     bin_same_dir,
-     bin_ok_symlink,
-     bin_dirname_fail,
+need_symlink_cases() -> 
+    [bin_unreachable_absolute, bin_unreachable_relative,
+     bin_same_dir, bin_ok_symlink, bin_dirname_fail,
      bin_no_use_dirname_fail].
 
-dont_need_symlink_cases() ->
-    [bin_default,
-     bin_default_dirty,
-     bin_outside_eprfx,
-     bin_outside_eprfx_dirty,
-     bin_not_abs,
-     bin_unreasonable_path,
-     'bin white space',
+dont_need_symlink_cases() -> 
+    [bin_default, bin_default_dirty, bin_outside_eprfx,
+     bin_outside_eprfx_dirty, bin_not_abs,
+     bin_unreasonable_path, 'bin white space',
      bin_no_srcfile].
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     dont_need_symlink_cases() ++ need_symlink_cases().
 
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%
 %% The test cases
 %%
@@ -585,7 +591,7 @@ init_per_testcase_aux(true, _OsType, Case, Config) ->
      {test_dir, make_dirs(?config(priv_dir, Config), atom_to_list(Case))}
      | Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
diff --git a/erts/test/nt_SUITE.erl b/erts/test/nt_SUITE.erl
index 530fb55270..8b2d8a7147 100644
--- a/erts/test/nt_SUITE.erl
+++ b/erts/test/nt_SUITE.erl
@@ -22,7 +22,9 @@
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,nt/1,handle_eventlog/2,
+-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,nt/1,handle_eventlog/2,
 	 middleman/1,service_basic/1, service_env/1, user_env/1, synced/1, 
 	 service_prio/1, 
 	 logout/1, debug/1, restart/1, restart_always/1,stopaction/1,
@@ -31,20 +33,38 @@
 
 -define(TEST_SERVICES, [1,2,3,4,5,6,7,8,9,10,11]).
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     case os:type() of
-	{win32,nt} ->
-	    [nt, service_basic, service_env, user_env, synced, service_prio, 
-	     logout, debug,
-	     restart, restart_always, stopaction];
-	_ -> [nt] %%% Just to give a little hint why they are skipped...
+	{win32, nt} ->
+	    [nt, service_basic, service_env, user_env, synced,
+	     service_prio, logout, debug, restart, restart_always,
+	     stopaction];
+	_ -> [nt]
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 init_per_testcase(_Func, Config) ->
     Dog = test_server:timetrap(?TEST_TIMEOUT),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     lists:foreach(fun(X) -> 
 			  catch remove_service("test_service_" ++ 
 					 integer_to_list(X)) end,
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 425ad31782..43655c4844 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -19,7 +19,8 @@
 
 -module(otp_SUITE).
 
--export([all/1,init_per_suite/1,end_per_suite/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_suite/1,end_per_suite/1]).
 -export([undefined_functions/1,deprecated_not_in_obsolete/1,
 	 obsolete_but_not_deprecated/1,call_to_deprecated/1,
          call_to_size_1/1,strong_components/1]).
@@ -28,10 +29,22 @@
 
 -import(lists, [filter/2,foldl/3,foreach/2]).
 
-all(suite) ->
-    [undefined_functions,deprecated_not_in_obsolete,
-     obsolete_but_not_deprecated,call_to_deprecated,
-     call_to_size_1,strong_components].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [undefined_functions, deprecated_not_in_obsolete,
+     obsolete_but_not_deprecated, call_to_deprecated,
+     call_to_size_1, strong_components].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_suite(Config) ->
     Dog = test_server:timetrap(?t:minutes(10)),
diff --git a/erts/test/run_erl_SUITE.erl b/erts/test/run_erl_SUITE.erl
index efeafbad8c..5288e3e827 100644
--- a/erts/test/run_erl_SUITE.erl
+++ b/erts/test/run_erl_SUITE.erl
@@ -19,7 +19,9 @@
 
 -module(run_erl_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,heavy/1,heavier/1,defunct/1]).
 -export([ping_me_back/1]).
 
@@ -29,13 +31,31 @@ init_per_testcase(_Case, Config) ->
     Dog = ?t:timetrap(?t:minutes(2)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    [basic,heavy,heavier,defunct].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic, heavy, heavier, defunct].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 basic(Config) when is_list(Config) ->
     case os:type() of
diff --git a/erts/test/system.spec b/erts/test/system.spec
index 9bfe2dbcf8..e0561ba0b2 100644
--- a/erts/test/system.spec
+++ b/erts/test/system.spec
@@ -1 +1 @@
-{topcase, {dir, "../system_test"}}.
+{suites,"../system_test",all}.
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl
index 8faddeb0d3..acd07b44c5 100644
--- a/erts/test/z_SUITE.erl
+++ b/erts/test/z_SUITE.erl
@@ -35,26 +35,45 @@
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(5)).
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([search_for_core_files/1, core_files/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
     
 
 init_per_testcase(Case, Config) ->
     Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
     [{testcase, Case}, {watchdog, Dog} |Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(doc) -> [];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [core_files].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 
 core_files(doc) ->
     [];
@@ -253,6 +272,8 @@ core_file_search(#core_search_conf{search_dir = Base,
 				     core_cand(Conf, Core, Cores);
 				 "core." ++ _ ->
 				     core_cand(Conf, Core, Cores);
+				 Bin when is_binary(Bin) -> %Icky filename; ignore
+				     Cores;
 				 BName ->
 				     case lists:suffix(".core", BName) of
 					 true -> core_cand(Conf, Core, Cores);
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 6e1338cff5..8a1590e74c 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,8 +17,8 @@
 # %CopyrightEnd%
 # 
 
-VSN = 5.8
-SYSTEM_VSN = R14A
+VSN = 5.8.3
+SYSTEM_VSN = R14B02
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/.gitignore b/lib/.gitignore
index a33916b3bf..56b1ed2b84 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -128,6 +128,7 @@
 /megaco/src/text/megaco_text_parser_v1.erl
 /megaco/src/text/megaco_text_parser_v2.erl
 /megaco/src/text/megaco_text_parser_v3.erl
+/megaco/doc/html/mstone1.jpg
 
 # mnesia
 
@@ -530,6 +531,10 @@
 /percept/doc/src/percept_profile.xml
 /percept/doc/src/percept_ug.xml
 
+# snmp
+
+snmp/doc/intex.html
+
 # syntax_tools
 
 /syntax_tools/doc/src/chapter.xml
diff --git a/lib/Makefile b/lib/Makefile
index f5ffc6f166..00bcf27ee3 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -51,7 +51,7 @@ else
 # --------------
 #
     ERTS_SUB_DIRECTORIES = stdlib sasl kernel compiler
-    OTHER_SUB_DIRECTORIES = tools test_server
+    OTHER_SUB_DIRECTORIES = tools test_server common_test runtime_tools
     ifdef BUILD_ALL
       ifeq ($(findstring win32,$(TARGET)),win32) # BUILD_ALL on win32
         OTHER_SUB_DIRECTORIES += 			\
diff --git a/lib/appmon/doc/src/notes.xml b/lib/appmon/doc/src/notes.xml
index 219b5671a4..ace163bcad 100644
--- a/lib/appmon/doc/src/notes.xml
+++ b/lib/appmon/doc/src/notes.xml
@@ -30,6 +30,37 @@
   </header>
   <p>This document describes the changes made to the Appmon application.</p>
 
+<section><title>Appmon 2.1.13</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    An obsolete compiler directive for native code generation
+	    was removed from a source file.</p>
+          <p>
+	    Own Id: OTP-8839</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Appmon 2.1.12</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Warnings due to new autoimported BIFs removed</p>
+          <p>
+	    Own Id: OTP-8674 Aux Id: OTP-8579 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Appmon 2.1.11</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/appmon/src/appmon_web.erl b/lib/appmon/src/appmon_web.erl
index e8a8422a80..fb7144246c 100644
--- a/lib/appmon/src/appmon_web.erl
+++ b/lib/appmon/src/appmon_web.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -38,12 +38,6 @@
 %% webtool
 -export([configData/0]).
 
-
-%% The following directive caters for (significantly) faster native
-%% code compilation of one function in this file by the HiPE compiler
-%% on register-poor architectures like the x86.
--compile([{hipe,[{regalloc,graph_color}]}]).
-
 -behaviour(gen_server).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/appmon/vsn.mk b/lib/appmon/vsn.mk
index 78b95e5688..fa17345daf 100644
--- a/lib/appmon/vsn.mk
+++ b/lib/appmon/vsn.mk
@@ -1,19 +1 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2010. 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%
-
-APPMON_VSN = 2.1.11
+APPMON_VSN = 2.1.13
diff --git a/lib/asn1/c_src/asn1_erl_driver.c b/lib/asn1/c_src/asn1_erl_driver.c
index fd284e5800..9dd3a0fd7d 100644
--- a/lib/asn1/c_src/asn1_erl_driver.c
+++ b/lib/asn1/c_src/asn1_erl_driver.c
@@ -1407,7 +1407,6 @@ int decode_partial(ErlDrvBinary **drv_binary,unsigned char *in_buf, int in_buf_l
   int msg_index_val;
   int *msg_index, *tag_index, tmp_index;
   int tag_seq_length;
-  char tag_code; /* one of ASN1_SKIPPED, ASN1_OPTIONAL, ASN1_CHOOSEN */
   int wanted_tag, next_tag;
   int buf_end_index = in_buf_len;
   int ret = 0, length, old_index;
@@ -1600,7 +1599,7 @@ int get_value(char *out_buf,
 {
   int len, lenoflen, indef=0, skip_len;
   int ret=0;
-  int start_index, out_index = 0;
+  int start_index;
   
 /*   printf("get_value 1\n\r"); */
   if (in_buf[*msg_index] < 0x80){ /* short definite length */
diff --git a/lib/asn1/doc/src/asn1_ug.xml b/lib/asn1/doc/src/asn1_ug.xml
index f2cd073ec8..12d986308f 100644
--- a/lib/asn1/doc/src/asn1_ug.xml
+++ b/lib/asn1/doc/src/asn1_ug.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,7 +22,7 @@
     </legalnotice>
 
     <title>Asn1</title>
-    <prepared>ETX/DN/SP Kenneth. Lundin</prepared>
+    <prepared>Kenneth Lundin</prepared>
     <docno></docno>
     <date>1999-03-25</date>
     <rev>D</rev>
@@ -41,17 +41,28 @@
          decode functions to be used by Erlang programs sending and
          receiving ASN.1 specified data.</item>
         <item>Run-time functions used by the generated code.</item>
-        <item>Encoding rules supported are <em>BER</em>, the
-        specialized BER version <em>DER</em> and the basic form of
-        aligned and unaligned variants of <em>PER</em>.</item>
+        <item>The supported encoding rules are: 
+	<list>
+	  <item>
+	    Basic Encoding Rules (<em>BER</em>)
+	  </item>
+	  <item>
+	    Distinguished Encoding Rules (<em>DER</em>), a specialized form of BER that is used in security-conscious applications.
+	  </item>
+	  <item>
+	    Packed Encoding Rules (<em>PER</em>) both the aligned and unaligned variant.
+	  </item>
+	  </list>
+	</item>
       </list>
     </section>
 
     <section>
       <title>Overview</title>
-      <p>ASN.1 (Abstract Syntax Notation 1) defines the abstract
-        syntax of information. The purpose of ASN.1 is to have
-        a platform independent language to express types   using a
+      <p>ASN.1 (Abstract Syntax Notation 1) is a formal language for describing data structures to be exchanged between distributed computer systems.
+        The purpose of ASN.1 is to have
+        a platform and programming language independent notation to express 
+	types   using a
         standardized set of rules  for the transformation of values of
         a defined type, into a stream of bytes. This stream of bytes
         can then be sent on a communication channel set  up by the
@@ -102,20 +113,16 @@
         [<cite id="DUBUISSON"></cite>], free to download at 
         <url href="http://www.oss.com/asn1/dubuisson.html">http://www.oss.com/asn1/dubuisson.html </url>.
         </p>
-      <p>Knowledge of Erlang programming is also essential and reading the book 
-        <em>Concurrent Programming in ERLANG</em>,
-        [<cite id="erlbook2"></cite>], is recommended. Part 1 of this is available on the web in 
-        <url href="http://www.erlang.org/download/erlang-book-part1.pdf">PDF</url> format.
-        </p>
     </section>
 
     <section>
       <title>Capability</title>
       <p>This application covers all features of ASN.1 up to the 1997
-      edition of the specification. In the 2002 edition some new
-      extensions came up of which there are support only for some of
-      them. ECN (Cncoding Control Notation) and XML notation are still
-      unsupported. Though, the other features of 2002 edition are
+      edition of the specification. In the 2002 edition of ASN.1 a number of
+      new features where introduced of which some are supported while
+      others are not. For example the
+      ECN (Encoding Control Notation) and XML notation are still
+      unsupported. Though, the other features of the 2002 edition are
       fully or partly supported as shown below:</p>
       <list type="bulleted">
 	<item>
@@ -308,7 +315,7 @@ erlc -o ../asnfiles -I ../asnfiles -I /usr/local/standards/asn1 Person.asn
           <p>Choice of encoding rules, if omitted <c>ber</c> is the
           default. The <c>ber_bin</c> and <c>per_bin</c> options
           allows for optimizations and are therefore recommended
-          instaed of the <c>ber</c> and <c>per</c> options.</p>
+          instead of the <c>ber</c> and <c>per</c> options.</p>
         </item>
         <tag><c>-o OutDirectory</c></tag>
         <item>
@@ -629,7 +636,7 @@ asn1ct:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
       <c>driver</c> options does not affect the encode or decode
       result, just the time spent in run-time. When <c>ber_bin</c> and
       <c>driver</c> or <c>per_bin, optimize</c> and <c>driver</c> is
-      combined the C-code driver is used in choosen parts of encode /
+      combined the C-code driver is used in chosen parts of encode /
       decode procedure.
     </p>
     <table>
@@ -749,11 +756,11 @@ asn1rt:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
        you may want to continue running the old asn1 run-time
        functionality.</item>
       <item>Performance issues: If you have an asn1 system with a lot
-       of cross references you may gain in performance. Meassurements
+       of cross references you may gain in performance. Measurements
        must be done for each case.</item>
     </list>
     <p>You may choose either the plain multi file compilation that just
-      merges the choosen asn1 specs or the <c>{inline,OutputModule}</c>
+      merges the chosen asn1 specs or the <c>{inline,OutputModule}</c>
       that also includes the used asn1 run-time functionality.</p>
     <p>For both cases you need to specify which asn1 specs you will
       compile in a module that must have the extension
@@ -919,7 +926,7 @@ T5 ::= INTEGER (MIN&lt;..-99)
 T6 ::= INTEGER {red(0),blue(1),white(2)}
       </pre>
       <p>The Erlang representation of an ASN.1 INTEGER is an integer or
-        an atom if a so called \011<c>Named NumberList</c> (see T6 above)
+        an atom if a so called <c>Named Number List</c> (see T6 above)
         is specified.</p>
       <p>Below is an example of Erlang code which assigns values for the
         above types: </p>
@@ -934,7 +941,7 @@ T6value3 = white
         ASN.1 defined types. This style of value can be passed directly 
         to the encoder for transformation into a series of bytes.</p>
       <p>The decoder will return an atom if the value corresponds to a
-        symbol in the Named NumberList.</p>
+        symbol in the Named Number List.</p>
     </section>
 
     <section>
@@ -978,8 +985,9 @@ N1 = 'NULL',
       <p>The enumerated type can be used, when the value we wish to 
         describe, may only take one of a set of predefined values.</p>
       <pre>
-DaysOfTheWeek ::= ENUMERATED { sunday(1),monday(2),tuesday(3),
-\011wednesday(4),thursday(5),friday(6),saturday(7) }
+DaysOfTheWeek ::= ENUMERATED { 
+    sunday(1),monday(2),tuesday(3),
+    wednesday(4),thursday(5),friday(6),saturday(7) }
       </pre>
       <p>For example to assign a weekday value in Erlang use the same atom
         as in the <c>Enumerations</c> of the type definition:</p>
@@ -1273,11 +1281,14 @@ Pdu ::= SEQUENCE {
       <p>Values can be assigned in Erlang as shown below:</p>
       <pre>
 MyPdu = #'Pdu'{a=22,b=77.99,c={0,1,2,3,4},d='NULL'}.      </pre>
-      <p>It is also possible to specify the value for each component in 
-        a SEQUENCE or a SET as <c>{ComponentName,Value}</c>. It is not
-        recommended and is not supported if the flags <c>per_bin</c> or
-        <c>ber_bin</c> and <c>optimize</c> were used when the module was
-        compiled.</p>
+<note>
+  <p>
+    In very early versions of the asn1 compiler it was also possible to 
+    specify the values of the components in 
+    a SEQUENCE or a SET as a list of tuples <c>{ComponentName,Value}</c>. 
+    This is no longer supported.
+  </p>
+</note>
       <p>The decode functions will return a record as result when decoding 
         a <c>SEQUENCE</c> or a <c>SET</c>.
                 <marker id="DEFAULT"></marker>
@@ -1293,13 +1304,13 @@ MyPdu = #'Pdu'{a=22,b=77.99,c={0,1,2,3,4},d='NULL'}.      </pre>
       <p>For instance, if the following types exists in a file "File.asn":</p>
       <pre>
 Seq1 ::= SEQUENCE {
-\011a  INTEGER DEFAULT 1,
-\011b  Seq2 DEFAULT {aa TRUE, bb 15}
+    a INTEGER DEFAULT 1,
+    b Seq2 DEFAULT {aa TRUE, bb 15}
 }
 
 Seq2 ::= SEQUENCE {
-\011aa BOOLEAN,
-\011bb INTEGER
+    aa BOOLEAN,
+    bb INTEGER
 }
       </pre>
       <p>Some values and the corresponding encoding in an Erlang terminal
@@ -1331,7 +1342,7 @@ ok
                 <marker id="DEFAULT DER"></marker>
 </p>
       <p>But, the DER encoding format has stronger requirements regarding 
-        default\011values both for SET and SEQUENCE. A more elaborate and time 
+        default values both for SET and SEQUENCE. A more elaborate and time 
         expensive check of default values will take place. The following is
         an example with the same types and values as above but with der 
         encoding format.</p>
@@ -1409,7 +1420,7 @@ Bad ::= SET {i INTEGER,
         values is the same for SET as for SEQUENCE, and is supported by 
         the compiler, <seealso marker="#DEFAULT DER">see above</seealso>.</p>
       <p>Moreover, in DER the elements of a SET will be sorted. If a 
-        component is an untagged choice the sorting have to take place
+        component is an un-tagged choice the sorting have to take place
         in run-time. This fact emphasizes the following recommendation
         if DER encoding format is used.</p>
       <p>The concept of SET is an unusual
@@ -1425,7 +1436,7 @@ Bad ::= SET {i INTEGER,
     </section>
 
     <section>
-      <title>Notes about Extendability for SEQUENCE and SET</title>
+      <title>Notes about Extend-ability for SEQUENCE and SET</title>
       <p>When a SEQUENCE or SET contains an extension marker and 
         extension components like this:</p>
       <pre>
@@ -1498,9 +1509,9 @@ C2 ::= CHOICE {
       <section>
         <title>Extendable CHOICE</title>
         <p>When a CHOICE contains an extension marker and the decoder detects
-          an unknown alternative of the CHIOCE the value is represented as:</p>
+          an unknown alternative of the CHOICE the value is represented as:</p>
         <pre>
-\011  {asn1_ExtAlt, BytesForOpenType}
+{asn1_ExtAlt, BytesForOpenType}
         </pre>
         <p>Where <c>BytesForOpenType</c> is a list of bytes constituting the 
           encoding of the "unknown" CHOICE alternative. </p>
@@ -1630,15 +1641,15 @@ V = #'Emb'{a=["qqqq",[1,2,255]],
         the record name is extended with an underscore and the component
         name. If the embedded structure is deeper with SEQUENCE, SET or
         CHOICE types in the line, each component-/alternative-name will
-        be added to the recordname.</p>
+        be added to the record-name.</p>
       <p>For example:</p>
       <pre>
 Seq ::= SEQUENCE{
-    a\011CHOICE{
-\011b SEQUENCE {
-\011   c  INTEGER
-\011   }
-\011}
+    a CHOICE{
+        b SEQUENCE {
+           c  INTEGER
+        }
+    }
 }      </pre>
       <p>will result in the following record:</p>
       <pre>
@@ -1650,10 +1661,10 @@ Seq ::= SEQUENCE{
       <pre>
 Seq ::= SEQUENCE {
     a SEQUENCE OF SEQUENCE {
-\011       b
+           b
                }
     c SET OF SEQUENCE {
-\011       d
+           d
                }
 }      </pre>
       <p>This results in the records:</p>
@@ -1802,16 +1813,16 @@ GENERAL-PROCEDURES GENERAL-PROCEDURE ::= {
     <pre>
 StartMessage  ::= SEQUENCE {
     msgId  GENERAL-PROCEDURE.&amp;id  ({GENERAL-PROCEDURES}),
-    content GENERAL-PROCEDURE.&amp;Message\011({GENERAL-PROCEDURES}{@msgId}),
+    content GENERAL-PROCEDURE.&amp;Message ({GENERAL-PROCEDURES}{@msgId}),
     }    </pre>
     <p>In the type <c>StartMessage</c> the constraint following the
       <c>content</c> field tells that in a value of type
       <c>StartMessage</c> the value in the <c>content</c> field must
-      come from the same object that is choosen by the <c>msgId</c>
+      come from the same object that is chosen by the <c>msgId</c>
       field.</p>
     <p>So, the value <c>#'StartMessage'{msgId="home",content="Any Printable String"}</c> is legal to encode as a StartMessage
       value, while the value <c>#'StartMessage'{msgId="remote", content="Some String"}</c> is illegal since the constraint
-      in StartMessage tells that when you have choosen a value from a 
+      in StartMessage tells that when you have chosen a value from a 
       specific object in the object set GENERAL-PROCEDURES in the 
       msgId field you have to choose a value from that same object in
       the content field too. In this second case it should have been 
@@ -1831,7 +1842,7 @@ StartMessage  ::= SEQUENCE {
       information object sets. 
       A part of a definition can be supplied as a parameter. For
       instance, if a Type is used in a definition with certain
-      purpose, one want the typename to express the intention. This
+      purpose, one want the type-name to express the intention. This
       can be done with parameterization.</p>
     <p>When many types (or an other ASN.1 entity) only differs in some
       minor cases, but the structure of the types are similar, only
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 5eadb0c90c..c93adeffe2 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -31,6 +31,94 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 1.6.15</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The encoding of ExtensionAdditionGroup (for PER and UPER)
+	    is corrected.</p>
+          <p>
+	    Own Id: OTP-8866 Aux Id: OTP-8797, SEQ-11557 </p>
+        </item>
+        <item>
+          <p>
+	    A race condition when several processes in parallel start
+	    to do encode/decode using the driver could cause an error
+	    log regarding crashing port owner process. This race is
+	    now eliminated.</p>
+          <p>
+	    Own Id: OTP-8948 Aux Id: seq11733 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Asn1 1.6.14.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Extension Addition Groups are now supported by the parser
+	    and in all backends.</p>
+          <p>
+	    Own Id: OTP-8598 Aux Id: seq-11557 </p>
+        </item>
+        <item>
+          <p>
+	    Extension Addition Groups are now supported in nested
+	    types within a SEQUENCE and CHOICE as well (missed that
+	    in previous fix)</p>
+          <p>
+	    Own Id: OTP-8797 Aux Id: seq-11557 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Bug in UNALIGNED PER regarding encoding and decoding of
+	    constrained numbers with a valuerange > 1024. (Thanks to
+	    Vincent de Phily)</p>
+          <p>
+	    Own Id: OTP-8779</p>
+        </item>
+        <item>
+          <p>
+	    Minor corrections in the User Guide.</p>
+          <p>
+	    Own Id: OTP-8829</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Asn1 1.6.14</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    By default, the ASN.1 compiler is now silent in the
+	    absence of warnings or errors. The new '<c>verbose</c>'
+	    option or the '<c>-v</c>' option for <c>erlc</c> can be
+	    given to show extra information (for instance, about the
+	    files that are generated). (Thanks to Tuncer Ayaz.)</p>
+          <p>
+	    Own Id: OTP-8565</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 1.6.13</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/src/asn1.appup.src b/lib/asn1/src/asn1.appup.src
index 753d308684..2d11eddfbf 100644
--- a/lib/asn1/src/asn1.appup.src
+++ b/lib/asn1/src/asn1.appup.src
@@ -1,111 +1,9 @@
 {"%VSN%",
- [
-  {"1.6.8", 
-   [
-    {load_module, asn1rt, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-    {load_module, asn1rt_uper_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin_v2, soft_purge, soft_purge, []},
-    {load_module, asn1rt_check, soft_purge, soft_purge, []},
-    {load_module, asn1rt_driver_handler, soft_purge, soft_purge, []},
-    {apply, {asn1rt_driver_handler,unload_driver,[]}}
-   ] 
-  },
-  {"1.6.8.1", 
-   [
-    {load_module, asn1rt, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-    {load_module, asn1rt_uper_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin_v2, soft_purge, soft_purge, []},
-    {load_module, asn1rt_check, soft_purge, soft_purge, []},
-    {load_module, asn1rt_driver_handler, soft_purge, soft_purge, []},
-    {apply, {asn1rt_driver_handler,unload_driver,[]}}
-   ] 
-  },
-  {"1.6.9", 
-   [
-    {load_module, asn1rt, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-    {load_module, asn1rt_uper_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin_v2, soft_purge, soft_purge, []},
-    {load_module, asn1rt_check, soft_purge, soft_purge, []},
-    {load_module, asn1rt_driver_handler, soft_purge, soft_purge, []},
-    {apply, {asn1rt_driver_handler,unload_driver,[]}}
-   ] 
-  },
-  {"1.6.10", 
-   [
-    {load_module, asn1rt, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-    {load_module, asn1rt_uper_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin_v2, soft_purge, soft_purge, []},
-    {load_module, asn1rt_check, soft_purge, soft_purge, []},
-    {load_module, asn1rt_driver_handler, soft_purge, soft_purge, []},
-    {apply, {asn1rt_driver_handler,unload_driver,[]}}
-   ] 
-  }
+% This version does not change anything of the runtime modules
+% Only changes in compile time modules and thus no need for upgrade on target
+[
  ],
  [ 
-  {"1.6.8", 
-   [
-    {load_module, asn1rt, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-    {load_module, asn1rt_uper_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin_v2, soft_purge, soft_purge, []},
-    {load_module, asn1rt_check, soft_purge, soft_purge, []},
-    {load_module, asn1rt_driver_handler, soft_purge, soft_purge, []},
-    {apply, {asn1rt_driver_handler,unload_driver,[]}}
-   ] 
-  },
-  {"1.6.8.1", 
-   [
-    {load_module, asn1rt, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-    {load_module, asn1rt_uper_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin_v2, soft_purge, soft_purge, []},
-    {load_module, asn1rt_check, soft_purge, soft_purge, []},
-    {load_module, asn1rt_driver_handler, soft_purge, soft_purge, []},
-    {apply, {asn1rt_driver_handler,unload_driver,[]}}
-   ] 
-  },
-  {"1.6.9", 
-   [
-    {load_module, asn1rt, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-    {load_module, asn1rt_uper_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin_v2, soft_purge, soft_purge, []},
-    {load_module, asn1rt_check, soft_purge, soft_purge, []},
-    {load_module, asn1rt_driver_handler, soft_purge, soft_purge, []},
-    {apply, {asn1rt_driver_handler,unload_driver,[]}}
-   ] 
-  },
- {"1.6.10", 
-   [
-    {load_module, asn1rt, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_per_bin_rt2ct, soft_purge, soft_purge, []},
-    {load_module, asn1rt_uper_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin, soft_purge, soft_purge, []},
-    {load_module, asn1rt_ber_bin_v2, soft_purge, soft_purge, []},
-    {load_module, asn1rt_check, soft_purge, soft_purge, []},
-    {load_module, asn1rt_driver_handler, soft_purge, soft_purge, []},
-    {apply, {asn1rt_driver_handler,unload_driver,[]}}
-   ] 
-  }
  ]}.
 
 
diff --git a/lib/asn1/src/asn1_records.hrl b/lib/asn1/src/asn1_records.hrl
index 8a428b744c..59a9acb7e7 100644
--- a/lib/asn1/src/asn1_records.hrl
+++ b/lib/asn1/src/asn1_records.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
 %%
 %%
@@ -36,7 +36,8 @@
 
 -record(module,{pos,name,defid,tagdefault='EXPLICIT',exports={exports,[]},imports={imports,[]}, extensiondefault=empty,typeorval}).
 
--record('SEQUENCE',{pname=false,tablecinf=false,components=[]}).
+-record('ExtensionAdditionGroup',{number}).
+-record('SEQUENCE',{pname=false,tablecinf=false,extaddgroup,components=[]}).
 -record('SET',{pname=false,sorted=false,tablecinf=false,components=[]}).
 -record('ComponentType',{pos,name,typespec,prop,tags,textual_order}).
 -record('ObjectClassFieldType',{classname,class,fieldname,type}).
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index ae681a4a78..947578f07d 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -39,7 +39,7 @@
 	 add_tobe_refed_func/1,add_generated_refed_func/1,
 	 maybe_rename_function/3,latest_sindex/0,current_sindex/0,
 	 set_current_sindex/1,next_sindex/0,maybe_saved_sindex/2,
-	 parse_and_save/2,report_verbose/3]).
+	 parse_and_save/2,verbose/3,warning/3,error/3]).
 
 -include("asn1_records.hrl").
 -include_lib("stdlib/include/erl_compile.hrl").
@@ -103,8 +103,8 @@ compile(File,Options) when is_list(Options) ->
 
 
 compile1(File,Options) when is_list(Options) ->
-    report_verbose("Erlang ASN.1 version ~p compiling ~p ~n",[?vsn,File],Options),
-    report_verbose("Compiler Options: ~p~n",[Options],Options),
+    verbose("Erlang ASN.1 version ~p compiling ~p ~n",[?vsn,File],Options),
+    verbose("Compiler Options: ~p~n",[Options],Options),
     Ext = filename:extension(File),
     Base = filename:basename(File,Ext),
     OutFile = outfile(Base,"",Options),
@@ -149,17 +149,17 @@ compile1(File,Options) when is_list(Options) ->
 inline(true,Name,Module,Options) ->
     RTmodule = get_runtime_mod(Options),
     IgorOptions = igorify_options(remove_asn_flags(Options)),
-    IgorName = filename:rootname(filename:basename(Name)),
+    IgorName = list_to_atom(filename:rootname(filename:basename(Name))),
 %    io:format("*****~nName: ~p~nModules: ~p~nIgorOptions: ~p~n*****~n",
 %	      [IgorName,Modules++RTmodule,IgorOptions]),
-    report_verbose("Inlining modules: ~p in ~p~n",[[Module]++RTmodule,IgorName],Options),
+    verbose("Inlining modules: ~p in ~p~n",[[Module]++RTmodule,IgorName],Options),
     case catch igor:merge(IgorName,[Module]++RTmodule,[{preprocess,true},{stubs,false},{backups,false}]++IgorOptions) of
 	{'EXIT',{undef,Reason}} -> %% module igor first in R10B
-	    io:format("Module igor in syntax_tools must be available:~n~p~n",
-		      [Reason]),
+	    error("Module igor in syntax_tools must be available:~n~p~n",
+		  [Reason],Options),
 	    {error,'no_compilation'};
 	{'EXIT',Reason} ->
-	    io:format("Merge by igor module failed due to ~p~n",[Reason]),
+	    error("Merge by igor module failed due to ~p~n",[Reason],Options),
 	    {error,'no_compilation'};
 	_ ->
 %%	    io:format("compiling output module: ~p~n",[generated_file(Name,IgorOptions)]),
@@ -173,8 +173,8 @@ inline(_,_,_,_) ->
 compile_set(SetBase,Files,Options) 
   when is_list(hd(Files)),is_list(Options) ->
     %% case when there are several input files in a list
-    report_verbose("Erlang ASN.1 version ~p compiling ~p ~n",[?vsn,Files],Options),
-    report_verbose("Compiler Options: ~p~n",[Options],Options),
+    verbose("Erlang ASN.1 version ~p compiling ~p ~n",[?vsn,Files],Options),
+    verbose("Compiler Options: ~p~n",[Options],Options),
     OutFile = outfile(SetBase,"",Options),
     DbFile = outfile(SetBase,"asn1db",Options),
     Includes = [I || {i,I} <- Options],
@@ -728,7 +728,7 @@ parse_set(ScanRes,Options) ->
 scan(File,Options) ->
     case asn1ct_tok:file(File) of
 	{error,Reason} ->
-	    io:format("~p~n",[Reason]),
+	    error("~p~n",[Reason],Options),
 	    {false,{error,Reason}};
         Tokens ->
 	    case lists:member(ss,Options) of
@@ -753,16 +753,17 @@ parse({true,Tokens},File,Options) ->
 	    if 
 		is_integer(Line) ->
 		    BaseName = filename:basename(File),
-		    io:format("syntax error at line ~p in module ~s:~n",
-			      [Line,BaseName]);
+		    error("syntax error at line ~p in module ~s:~n",
+			  [Line,BaseName],Options);
 		true ->
-		    io:format("syntax error in module ~p:~n",[File])
+		    error("syntax error in module ~p:~n",
+			  [File],Options)
 	    end,
 	    print_error_message(Message),
 	    {false,{error,Message}};
 	{error,{Line,_Mod,[Message,Token]}} ->
-	    io:format("syntax error: ~p ~p at line ~p~n",
-		      [Message,Token,Line]),
+	    error("syntax error: ~p ~p at line ~p~n",
+		  [Message,Token,Line],Options),
 	    {false,{error,{Line,[Message,Token]}}};
 	{ok,M} ->
 	    case lists:member(sp,Options) of
@@ -772,7 +773,7 @@ parse({true,Tokens},File,Options) ->
 		    {true,M}
 	    end;
 	OtherError ->
-	    io:format("~p~n",[OtherError])
+	    error("~p~n",[OtherError],Options)
     end;
 parse({false,Tokens},_,_) ->
     {false,Tokens}.
@@ -802,7 +803,7 @@ check({true,M},File,OutFile,Includes,EncodingRule,DbFile,Options,InputMods) ->
 		    NewM = Module#module{typeorval=NewTypeOrVal},
 		    asn1_db:dbput(NewM#module.name,'MODULE',NewM),
 		    asn1_db:dbsave(DbFile,M#module.name),
-		    report_verbose("--~p--~n",[{generated,DbFile}],Options),
+		    verbose("--~p--~n",[{generated,DbFile}],Options),
 		    {true,{M,NewM,GenTypeOrVal}}
 	    end
     end;
@@ -823,11 +824,11 @@ generate({true,{M,_Module,GenTOrV}},OutFile,EncodingRule,Options) ->
 %    io:format("Options: ~p~n",[Options]),
     case catch specialized_decode_prepare(EncodingRule,M,GenTOrV,Options) of
 	{error, enoent} -> ok;
-	{error, Reason} -> io:format("WARNING: Error in configuration"
-				     "file: ~n~p~n",[Reason]);
-	{'EXIT',Reason} -> io:format("WARNING: Internal error when "
-				     "analyzing configuration"
-				     "file: ~n~p~n",[Reason]);
+	{error, Reason} -> warning("Error in configuration "
+				   "file: ~n~p~n",[Reason],Options);
+	{'EXIT',Reason} -> warning("Internal error when "
+				   "analyzing configuration "
+				   "file: ~n~p~n",[Reason],Options);
 	_ -> ok
     end,
 
@@ -835,7 +836,7 @@ generate({true,{M,_Module,GenTOrV}},OutFile,EncodingRule,Options) ->
 	case (catch asn1ct_gen:pgen(OutFile,EncodingRule,
 				   M#module.name,GenTOrV,Options)) of
 	    {'EXIT',Reason2} ->
-		io:format("ERROR: ~p~n",[Reason2]),
+		error("~p~n",[Reason2],Options),
 		{error,Reason2};
 	    _ ->
 		ok
@@ -878,7 +879,8 @@ parse_and_save(Module,S) ->
 		_ -> ok
 	    end;
 	Err ->
-	    io:format("Warning: could not do a consistency check of the ~p file: no asn1 source file was found.~n",[lists:concat([Module,".asn1db"])]),
+	    warning("could not do a consistency check of the ~p file: no asn1 source file was found.~n",
+		    [lists:concat([Module,".asn1db"])],Options),
 	    {error,{asn1,input_file_error,Err}}
     end.
 parse_and_save1(S,File,Options,Includes) ->
@@ -1183,6 +1185,7 @@ is_inline(Options) ->
 	_ ->
 	    lists:keymember(inline,1,Options)
     end.
+
 inline_output(Options,Default) ->
     case [X||{inline,X}<-Options] of
 	[OutputName] ->
@@ -1207,7 +1210,7 @@ compile_py(File,OutFile,Options) ->
 compile(File, _OutFile, Options) ->
     case catch compile(File, make_erl_options(Options)) of
 	Exit = {'EXIT',_Reason} ->
-	    io:format("~p~n~s~n",[Exit,"error"]),
+	    error("~p~n~s~n",[Exit,"error"],Options),
 	    error;
 	{error,_Reason} ->
 	    %% case occurs due to error in asn1ct_parser2,asn1ct_check
@@ -1223,7 +1226,7 @@ compile(File, _OutFile, Options) ->
 	    io:format("~p~n",[ScanRes]),
 	    ok;
 	Unknown -> 
-	    io:format("~p~n~s~n",[Unknown,"error"]),
+	    error("~p~n~s~n",[Unknown,"error"],Options),
 	    error
     end.
 
@@ -1237,7 +1240,7 @@ make_erl_options(Opts) ->
     Includes = Opts#options.includes,
     Defines = Opts#options.defines,
     Outdir = Opts#options.outdir,
-%%    Warning = Opts#options.warning,
+    Warning = Opts#options.warning,
     Verbose = Opts#options.verbose,
     Specific = Opts#options.specific,
     Optimize = Opts#options.optimize,
@@ -1249,10 +1252,10 @@ make_erl_options(Opts) ->
 	    true ->  [verbose];
 	    false -> []
 	end ++
-%%%	case Warning of
-%%%	    0 -> [];
-%%%	    _ -> [report_warnings]
-%%%	end ++
+	case Warning of
+	    0 -> [];
+	    _ -> [warnings]
+	end ++
 	[] ++
 	case Optimize of
 	    1 -> [optimize];
@@ -1276,7 +1279,7 @@ make_erl_options(Opts) ->
 	    uper_bin -> [uper_bin]
 	end,
 
-    Options++[report_errors, {cwd, Cwd}, {outdir, Outdir}|
+    Options++[errors, {cwd, Cwd}, {outdir, Outdir}|
 	      lists:map(fun(Dir) -> {i, Dir} end, Includes)]++Specific.
 
 pretty2(Module,AbsFile) ->
@@ -1674,7 +1677,7 @@ create_pdec_inc_command(ModName,
 % 			     [concat_sequential(lists:reverse(Comms),
 % 					       [LastComm,CompAcc])|Acc]
 			     case lists:reverse(TagCommand) of
-				 [Atom|Comms]�when is_atom(Atom) ->
+				 [Atom|Comms] when is_atom(Atom) ->
 				     [concat_sequential(lists:reverse(Comms),
 							[Atom,CompAcc])|Acc];
 				 [[Command2,Tag2]|Comms] ->
@@ -2518,13 +2521,48 @@ type_check(#'Externaltypereference'{}) ->
  make_suffix(_) ->
      "".
 
-report_verbose(Format, Args, S) ->
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Report functions.
+%%
+%% Errors messages are controlled with the 'errors' compiler option
+%% Warning messages are controlled with the 'warnings' compiler option
+%% Verbose messages are controlled with the 'verbose' compiler option
+
+error(Format, Args, S) ->
+    case is_error(S) of
+	true ->
+	    io:format("Error: " ++ Format, Args);
+	false ->
+	    ok
+    end.
+
+warning(Format, Args, S) ->
+    case is_warning(S) of
+	true ->
+	    io:format("Warning: " ++ Format, Args);
+	false ->
+	    ok
+    end.
+
+verbose(Format, Args, S) ->
     case is_verbose(S) of
-        true ->
-            io:format(Format, Args);
-        false ->
-            ok
+	true ->
+	    io:format(Format, Args);
+	false ->
+	    ok
     end.
 
-is_verbose(S) ->
-    lists:member(verbose, S).
+is_error(S) when is_record(S, state) ->
+    is_error(S#state.options);
+is_error(O) ->
+    lists:member(errors, O) orelse is_verbose(O).
+
+is_warning(S) when is_record(S, state) ->
+    is_warning(S#state.options);
+is_warning(O) ->
+    lists:member(warnings, O) orelse is_verbose(O).
+
+is_verbose(S) when is_record(S, state) ->
+    is_verbose(S#state.options);
+is_verbose(O) ->
+    lists:member(verbose, O).
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 54a5c7e727..8b1ee6e601 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -22,6 +22,8 @@
 %% Main Module for ASN.1 compile time functions
 
 %-compile(export_all).
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([check/2,storeindb/2]).
 %-define(debug,1).
 -include("asn1_records.hrl").
@@ -2027,8 +2029,9 @@ get_objectset_def2(_S,Set,CField) when is_list(Set) ->
 				   set=Set}};
 get_objectset_def2(_S,T = #typedef{typespec=#'ObjectSet'{}},_CField) ->
     T;
-get_objectset_def2(_S,T,_CField) ->
-    io:format("Warning get_objectset_def2: uncontrolled object set structure:~n~p~n",[T]).
+get_objectset_def2(S,T,_CField) ->
+    asn1ct:warning("get_objectset_def2: uncontrolled object set structure:~n~p~n",
+		   [T],S).
     
 type_name(S,#type{def=Def}) ->
     CurrMod = S#state.mname,
@@ -2685,7 +2688,7 @@ normalize_value(S,Type,{'DEFAULT',Value},NameList) ->
 	{'REAL',_,_} ->
 	    normalize_real(Value);
 	{'ENUMERATED',CType,_} ->
-	    normalize_enumerated(Value,CType);
+	    normalize_enumerated(S,Value,CType);
 	{'CHOICE',CType,NewNameList} ->
 	    normalize_choice(S,Value,CType,NewNameList);
 	{'SEQUENCE',CType,NewNameList} ->
@@ -2701,7 +2704,8 @@ normalize_value(S,Type,{'DEFAULT',Value},NameList) ->
 	{'ASN1_OPEN_TYPE',{typefield,_TF},NL} -> %an open type
 	    normalize_objectclassfieldvalue(S,Value,NL);
 	Err ->
-	    io:format("WARNING: could not check default value ~p~nType:~n~p~nNameList:~n~p~n",[Value,Type,Err]),
+	    asn1ct:warning("could not check default value ~p~nType:~n~p~nNameList:~n~p~n",
+			   [Value,Type,Err],S),
 	    Value
     end;
 normalize_value(S,Type,Val,NameList) ->
@@ -2786,23 +2790,23 @@ normalize_bitstring(S,Value,Type)->
 			end,
 		    case catch lists:map(F,RecList) of
 			{error,Reason} ->
-			    io:format("WARNING: default value not "
+			    asn1ct:warning("default value not "
 				      "compatible with type definition ~p~n",
-				      [Reason]),
+				      [Reason],S),
 			    Value;
 			NewList ->
 			    NewList
 		    end;
 		_ ->
-		    io:format("WARNING: default value not "
+		    asn1ct:warning("default value not "
 			      "compatible with type definition ~p~n",
-			      [RecList]),
+			      [RecList],S),
 		    Value
 	    end;
 	{Name,String} when is_atom(Name) ->
 	    normalize_bitstring(S,String,Type);
 	Other ->
-	    io:format("WARNING: illegal default value ~p~n",[Other]),
+	    asn1ct:warning("illegal default value ~p~n",[Other],S),
 	    Value
     end.
 
@@ -2841,12 +2845,13 @@ normalize_octetstring(S,Value,CType) ->
 	    %% check if list elements are valid octet values
 	    lists:map(fun([])-> ok;
 			 (H)when H > 255->
-			      io:format("WARNING: not legal octet value ~p in OCTET STRING, ~p~n",[H,List]);
+			      asn1ct:warning("not legal octet value ~p in OCTET STRING, ~p~n",
+					     [H,List],S);
 			 (_)-> ok
 		      end, List),
 	    List;
 	Other ->
-	    io:format("WARNING: unknown default value ~p~n",[Other]),
+	    asn1ct:warning("unknown default value ~p~n",[Other],S),
 	    Value
     end.
 
@@ -2893,23 +2898,23 @@ normalize_objectdescriptor(Value) ->
 normalize_real(Value) ->
     Value.
 
-normalize_enumerated(#'Externalvaluereference'{value=V},CType) 
+normalize_enumerated(S,#'Externalvaluereference'{value=V},CType)
   when is_list(CType) ->
-    normalize_enumerated2(V,CType);
-normalize_enumerated(Value,CType) when is_atom(Value),is_list(CType) ->
-    normalize_enumerated2(Value,CType);
-normalize_enumerated({Name,EnumV},CType) when is_atom(Name) ->
-    normalize_enumerated(EnumV,CType);
-normalize_enumerated(Value,{CType1,CType2}) when is_list(CType1), is_list(CType2)->
-    normalize_enumerated(Value,CType1++CType2);
-normalize_enumerated(V,CType) ->
-    io:format("WARNING: Enumerated unknown type ~p~n",[CType]),
+    normalize_enumerated2(S,V,CType);
+normalize_enumerated(S,Value,CType) when is_atom(Value),is_list(CType) ->
+    normalize_enumerated2(S,Value,CType);
+normalize_enumerated(S,{Name,EnumV},CType) when is_atom(Name) ->
+    normalize_enumerated(S,EnumV,CType);
+normalize_enumerated(S,Value,{CType1,CType2}) when is_list(CType1), is_list(CType2)->
+    normalize_enumerated(S,Value,CType1++CType2);
+normalize_enumerated(S,V,CType) ->
+    asn1ct:warning("Enumerated unknown type ~p~n",[CType],S),
     V.
-normalize_enumerated2(V,Enum) ->
+normalize_enumerated2(S,V,Enum) ->
     case lists:keysearch(V,1,Enum) of
 	{value,{Val,_}} -> Val;
 	_ -> 
-	    io:format("WARNING: Enumerated value is not correct ~p~n",[V]),
+	    asn1ct:warning("Enumerated value is not correct ~p~n",[V],S),
 	    V
     end.
 
@@ -2920,8 +2925,7 @@ normalize_choice(S,{'CHOICE',{C,V}},CType,NameList) when is_atom(C) ->
 	    {C,normalize_value(S,CT,{'DEFAULT',V},
 			       [Name|NameList])};
 	Other ->
-	    io:format("WARNING: Wrong format of type/value ~p/~p~n",
-		      [Other,V]),
+	    asn1ct:warning("Wrong format of type/value ~p/~p~n",[Other,V],S),
 	    {C,V}
     end;
 normalize_choice(S,{'DEFAULT',ValueList},CType,NameList) when is_list(ValueList) ->
@@ -3097,8 +3101,7 @@ normalize_s_of(SorS,S,Value,Type,NameList) when is_list(Value) ->
 	List when is_list(List) ->
 	    List;
 	_ ->
-	    io:format("WARNING: ~p could not handle value ~p~n",
-		      [SorS,Value]),
+	    asn1ct:warning("~p could not handle value ~p~n",[SorS,Value],S),
 	    Value
     end;
 normalize_s_of(SorS,S,Value,Type,NameList) 
@@ -3150,15 +3153,13 @@ get_normalized_value(S,Val,Type,Func,AddArg) ->
  	    V2 = sort_val_if_set(AddArg,V,Type),
 	    call_Func(update_state(S,ExtM),V2,Type,Func,AddArg);
 	{error,_} ->
-	    io:format("WARNING: default value not "
-		      "comparable ~p~n",[Val]),
+	    asn1ct:warning("default value not comparable ~p~n",[Val],S),
 	    Val;
 	{ExtM,NewVal} ->
 	    V2 = sort_val_if_set(AddArg,NewVal,Type),
 	    call_Func(update_state(S,ExtM),V2,Type,Func,AddArg);
 	_ ->
-	    io:format("WARNING: default value not "
-		      "comparable ~p~n",[Val]),
+	    asn1ct:warning("default value not comparable ~p~n",[Val],S),
 	    Val
     end.
 
@@ -3227,7 +3228,7 @@ check_ptype(_S,_PTDef,Ts) when is_record(Ts,objectclass) ->
 
 
 % check_type(S,Type,ObjSpec={{objectclassname,_},_}) ->
-%     check_class(S,ObjSpec);
+ %     check_class(S,ObjSpec);
 check_type(_S,Type,Ts) when is_record(Type,typedef),
 			   (Type#typedef.checked==true) ->
     Ts;
@@ -3357,6 +3358,7 @@ check_type(S=#state{recordtopname=TopName},Type,Ts) when is_record(Ts,type) ->
 				merge_tags(Tag,?TAG_PRIMITIVE(?N_INTEGER))};
 	    'REAL' ->
 		check_real(S,Constr),
+
 		TempNewDef#newt{tag=merge_tags(Tag,?TAG_PRIMITIVE(?N_REAL))};
 	    {'BIT STRING',NamedNumberList} ->
 		NewL = check_bitstring(S,NamedNumberList,Constr),
@@ -4106,7 +4108,7 @@ resolve_namednumber(S,#typedef{typespec=Type},Name) ->
     case Type#type.def of
 	{'ENUMERATED',NameList} ->
 	    NamedNumberList=check_enumerated(S,NameList,Type#type.constraint),
-	    N = normalize_enumerated(Name,NamedNumberList),
+	    N = normalize_enumerated(S,Name,NamedNumberList),
 	    {value,{_,V}} = lists:keysearch(N,1,NamedNumberList),
 	    V;
 	{'INTEGER',NameList} ->
@@ -5522,24 +5524,9 @@ check_sequence(S,Type,Comps)  ->
 	    Components2 = maybe_automatic_tags(S,Components),
 	    %% check the table constraints from here. The outermost type
 	    %% is Type, the innermost is Comps (the list of components)
-	    NewComps = 
-		case check_each_component(S,Type,Components2) of
-		    NewComponents when is_list(NewComponents) ->
-			check_unique_sequence_tags(S,NewComponents),
-			NewComponents;
-		    Ret = {NewComponents,NewEcomps} ->
-			TagComps = NewComponents ++ 
-			    [Comp#'ComponentType'{prop='OPTIONAL'}|| Comp <- NewEcomps], 
-			%% extension components are like optionals when it comes to tagging
-			check_unique_sequence_tags(S,TagComps),
-			Ret;
-		    Ret = {Root1,NewE,Root2} ->
-			TagComps = Root1 ++ [Comp#'ComponentType'{prop='OPTIONAL'}|| Comp <- NewE]++Root2,
-			%% This is not correct handling if Extension
-			%% contains ExtensionAdditionGroups
-			check_unique_sequence_tags(S,TagComps),
-			Ret
-		end,
+	    NewComps = check_each_component2(S,Type,Components2),
+	    check_unique_sequence_tags(S,NewComps),
+
 	    %% CRelInf is the "leading attribute" information
 	    %% necessary for code generating of the look up in the
 	    %% object set table,
@@ -5553,12 +5540,45 @@ check_sequence(S,Type,Comps)  ->
 	    %% the involved class removed, as the class of the object
 	    %% set.
 	    CompListWithTblInf = get_tableconstraint_info(S,Type,NewComps2),
-
-	    {CRelInf,CompListWithTblInf};
+	    %% If encoding rule is in the PER family the Root Components
+	    %% after the second extension mark should be encoded before
+	    %% all extensions i.e together with the first Root components
+
+	    NewComps3 = textual_order(CompListWithTblInf),
+	    CompListTuple =
+		complist_as_tuple(is_erule_per(S#state.erule),NewComps3),
+	    {CRelInf,CompListTuple};
 	Dupl ->
-		throw({error,{asn1,{duplicate_components,Dupl}}})
+	    throw({error,{asn1,{duplicate_components,Dupl}}})
     end.
 
+complist_as_tuple(Per,CompList) ->
+    complist_as_tuple(Per,CompList,[],[],[],root).
+
+complist_as_tuple(Per,[#'EXTENSIONMARK'{}|T],Acc,Ext,Acc2,root) ->
+    complist_as_tuple(Per,T,Acc,Ext,Acc2,ext);
+complist_as_tuple(Per,[#'EXTENSIONMARK'{}|T],Acc,Ext,Acc2,ext) ->
+    complist_as_tuple(Per,T,Acc,Ext,Acc2,root2);
+complist_as_tuple(_Per,[#'EXTENSIONMARK'{}|_T],_Acc,_Ext,_Acc2,root2) ->
+    throw({error,{asn1,{too_many_extension_marks}}});
+complist_as_tuple(Per,[C|T],Acc,Ext,Acc2,root) ->
+    complist_as_tuple(Per,T,[C|Acc],Ext,Acc2,root);
+complist_as_tuple(Per,[C|T],Acc,Ext,Acc2,ext) ->
+    complist_as_tuple(Per,T,Acc,[C|Ext],Acc2,ext);
+complist_as_tuple(Per,[C|T],Acc,Ext,Acc2,root2) ->
+    complist_as_tuple(Per,T,Acc,Ext,[C|Acc2],root2);
+complist_as_tuple(_Per,[],Acc,_Ext,_Acc2,root) ->
+    lists:reverse(Acc);
+complist_as_tuple(_Per,[],Acc,Ext,_Acc2,ext) ->
+    {lists:reverse(Acc),lists:reverse(Ext)};
+%%complist_as_tuple(_Per = true,[],Acc,Ext,Acc2,root2) ->
+%%    {lists:reverse(Acc)++lists:reverse(Acc2),lists:reverse(Ext)};
+complist_as_tuple(_Per,[],Acc,Ext,Acc2,root2) ->
+    {lists:reverse(Acc),lists:reverse(Ext),lists:reverse(Acc2)}.
+
+is_erule_per(Erule) ->
+    lists:member(Erule,[per,per_bin,uper_bin]).
+
 expand_components(S, [{'COMPONENTS OF',Type}|T]) ->
     CompList = expand_components2(S,get_referenced_type(S,Type#type.def)),
     expand_components(S,CompList) ++ expand_components(S,T);
@@ -5601,13 +5621,26 @@ take_only_rootset([#'EXTENSIONMARK'{}|_T])->
 take_only_rootset([H|T]) ->
     [H|take_only_rootset(T)].
 
-check_unique_sequence_tags(S,[#'ComponentType'{prop=mandatory}|Rest]) ->
-    check_unique_sequence_tags(S,Rest);
-check_unique_sequence_tags(S,[C|Rest]) when is_record(C,'ComponentType') ->
+check_unique_sequence_tags(S,CompList) ->
+    TagComps = case complist_as_tuple(false,CompList) of
+		   {R1,Ext,R2} ->
+		       R1 ++ [C#'ComponentType'{prop='OPTIONAL'}||
+				 C = #'ComponentType'{} <- Ext]++R2;
+		   {R1,Ext} ->
+		       R1 ++ [C#'ComponentType'{prop='OPTIONAL'}||
+				 C = #'ComponentType'{} <- Ext];
+		   _ ->
+		       CompList
+	       end,
+    check_unique_sequence_tags0(S,TagComps).
+
+check_unique_sequence_tags0(S,[#'ComponentType'{prop=mandatory}|Rest]) ->
+    check_unique_sequence_tags0(S,Rest);
+check_unique_sequence_tags0(S,[C=#'ComponentType'{}|Rest]) ->
     check_unique_sequence_tags1(S,Rest,[C]);% optional or default
-check_unique_sequence_tags(S,[_ExtensionMarker|Rest]) ->
-    check_unique_sequence_tags(S,Rest);
-check_unique_sequence_tags(_S,[]) ->
+check_unique_sequence_tags0(S,[_ExtensionMarker|Rest]) ->
+    check_unique_sequence_tags0(S,Rest);
+check_unique_sequence_tags0(_S,[]) ->
     true.
 
 check_unique_sequence_tags1(S,[C|Rest],Acc) when is_record(C,'ComponentType') ->
@@ -5676,9 +5709,9 @@ sort_components(der,S=#state{tname=TypeName},Components) ->
 		end,
     case {untagged_choice(S,CompsList),Ext} of
 	{false,noext} ->
-	    {true,sort_components1(TypeName,CompsList,[],[],[],[])};
+	    {true,sort_components1(S,TypeName,CompsList,[],[],[],[])};
 	{false,_} ->
-	    {true,{sort_components1(TypeName,CompsList,[],[],[],[]), []}};
+	    {true,{sort_components1(S,TypeName,CompsList,[],[],[],[]), []}};
 	{true,noext} ->
 	    %% sort in run-time
 	    {dynamic,R1};
@@ -5690,57 +5723,57 @@ sort_components(per,S=#state{tname=TypeName},Components) ->
     Root = tag_untagged_choice(S,R1++R2),
     case Ext of
 	noext ->
-	    {true,sort_components1(TypeName,Root,[],[],[],[])};
+	    {true,sort_components1(S,TypeName,Root,[],[],[],[])};
 	_ ->
-	    {true,{sort_components1(TypeName,Root,[],[],[],[]),
+	    {true,{sort_components1(S,TypeName,Root,[],[],[],[]),
 		   Ext}}
     end.
 
-sort_components1(TypeName,[C=#'ComponentType'{tags=[{'UNIVERSAL',_}|_R]}|Cs],
+sort_components1(S,TypeName,[C=#'ComponentType'{tags=[{'UNIVERSAL',_}|_R]}|Cs],
 		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
-    sort_components1(TypeName,Cs,[C|UnivAcc],ApplAcc,ContAcc,PrivAcc);
-sort_components1(TypeName,[C=#'ComponentType'{tags=[{'APPLICATION',_}|_R]}|Cs],
+    sort_components1(S,TypeName,Cs,[C|UnivAcc],ApplAcc,ContAcc,PrivAcc);
+sort_components1(S,TypeName,[C=#'ComponentType'{tags=[{'APPLICATION',_}|_R]}|Cs],
 		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
-    sort_components1(TypeName,Cs,UnivAcc,[C|ApplAcc],ContAcc,PrivAcc);
-sort_components1(TypeName,[C=#'ComponentType'{tags=[{'CONTEXT',_}|_R]}|Cs],
+    sort_components1(S,TypeName,Cs,UnivAcc,[C|ApplAcc],ContAcc,PrivAcc);
+sort_components1(S,TypeName,[C=#'ComponentType'{tags=[{'CONTEXT',_}|_R]}|Cs],
 		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
-    sort_components1(TypeName,Cs,UnivAcc,ApplAcc,[C|ContAcc],PrivAcc);
-sort_components1(TypeName,[C=#'ComponentType'{tags=[{'PRIVATE',_}|_R]}|Cs],
+    sort_components1(S,TypeName,Cs,UnivAcc,ApplAcc,[C|ContAcc],PrivAcc);
+sort_components1(S,TypeName,[C=#'ComponentType'{tags=[{'PRIVATE',_}|_R]}|Cs],
 		 UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
-    sort_components1(TypeName,Cs,UnivAcc,ApplAcc,ContAcc,[C|PrivAcc]);
-sort_components1(TypeName,[],UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
+    sort_components1(S,TypeName,Cs,UnivAcc,ApplAcc,ContAcc,[C|PrivAcc]);
+sort_components1(S,TypeName,[],UnivAcc,ApplAcc,ContAcc,PrivAcc) ->
     I = #'ComponentType'.tags,
-    ascending_order_check(TypeName,sort_universal_type(UnivAcc)) ++ 
-	ascending_order_check(TypeName,lists:keysort(I,ApplAcc)) ++
-	ascending_order_check(TypeName,lists:keysort(I,ContAcc)) ++ 
-	ascending_order_check(TypeName,lists:keysort(I,PrivAcc)).
+    ascending_order_check(S,TypeName,sort_universal_type(UnivAcc)) ++
+	ascending_order_check(S,TypeName,lists:keysort(I,ApplAcc)) ++
+	ascending_order_check(S,TypeName,lists:keysort(I,ContAcc)) ++
+	ascending_order_check(S,TypeName,lists:keysort(I,PrivAcc)).
 
-ascending_order_check(TypeName,Components) ->
-    ascending_order_check1(TypeName,Components),
+ascending_order_check(S,TypeName,Components) ->
+    ascending_order_check1(S,TypeName,Components),
     Components.
 
-ascending_order_check1(TypeName,
+ascending_order_check1(S,TypeName,
 		       [C1 = #'ComponentType'{tags=[{_,T}|_]},
 			C2 = #'ComponentType'{tags=[{_,T}|_]}|Rest]) ->
-    io:format("WARNING: Indistinct tag ~p in SET ~p, components ~p and ~p~n",
-	      [T,TypeName,C1#'ComponentType'.name,C2#'ComponentType'.name]),
-    ascending_order_check1(TypeName,[C2|Rest]);
-ascending_order_check1(TypeName,
+    asn1ct:warning("Indistinct tag ~p in SET ~p, components ~p and ~p~n",
+	      [T,TypeName,C1#'ComponentType'.name,C2#'ComponentType'.name],S),
+    ascending_order_check1(S,TypeName,[C2|Rest]);
+ascending_order_check1(S,TypeName,
 		       [C1 = #'ComponentType'{tags=[{'UNIVERSAL',T1}|_]},
 			C2 = #'ComponentType'{tags=[{'UNIVERSAL',T2}|_]}|Rest]) ->
     case (decode_type(T1) == decode_type(T2)) of
 	true ->
-	    io:format("WARNING: Indistinct tags ~p and ~p in"
+	    asn1ct:warning("Indistinct tags ~p and ~p in"
 		      " SET ~p, components ~p and ~p~n",
 		      [T1,T2,TypeName,C1#'ComponentType'.name,
-		       C2#'ComponentType'.name]),
-	    ascending_order_check1(TypeName,[C2|Rest]);
+		       C2#'ComponentType'.name],S),
+	    ascending_order_check1(S,TypeName,[C2|Rest]);
 	_ ->
-	    ascending_order_check1(TypeName,[C2|Rest])
+	    ascending_order_check1(S,TypeName,[C2|Rest])
     end;
-ascending_order_check1(N,[_|Rest]) ->
-    ascending_order_check1(N,Rest);
-ascending_order_check1(_,[]) ->
+ascending_order_check1(S,N,[_|Rest]) ->
+    ascending_order_check1(S,N,Rest);
+ascending_order_check1(_,_,[]) ->
     ok.
     
 sort_universal_type(Components) ->
@@ -5807,8 +5840,10 @@ get_least_tag(TagList) ->
 %% adds the textual order to the components to keep right order of
 %% components in the asn1-value.
 textual_order(Cs) ->
-    Fun = fun(C,Index) ->
-		  {C#'ComponentType'{textual_order=Index},Index+1}
+    Fun = fun(C=#'ComponentType'{},Index) ->
+		  {C#'ComponentType'{textual_order=Index},Index+1};
+	     (Other,Index) ->
+		  {Other,Index}
 	  end,
     {NewCs,_} = textual_order(Cs,Fun,1),
     NewCs.
@@ -5879,7 +5914,6 @@ check_selectiontype2(S,Name,TypeDef) ->
 	    error({type,Msg,S})
     end.
 	    
-
 check_restrictedstring(_S,_Def,_Constr) ->
     ok.
 
@@ -5899,16 +5933,16 @@ check_choice(S,Type,Components) when is_list(Components) ->
 	[] -> 
     %%    sort_canonical(Components),
 	    Components2 = maybe_automatic_tags(S,Components),
-	    %NewComps =
-	    case check_each_alternative(S,Type,Components2) of
-		{NewComponents,NewEcomps} ->		    
-		    check_unique_tags(S,NewComponents ++ NewEcomps),
-		    {NewComponents,NewEcomps};
-		NewComponents ->
-		    check_unique_tags(S,NewComponents),
-		    NewComponents
-	    end;
-
+	    NewComps = check_each_alternative2(S,Type,Components2),
+	    %% ExtensionAdditionGroup markers i.e '[[' ']]' are not
+	    %% significant for encoding/decoding a choice
+	    %% therefore we remove them here
+	    NewComps2 = lists:filter(fun(#'ExtensionAdditionGroup'{}) -> false;
+					('ExtensionAdditionGroupEnd') -> false;
+					(_) -> true
+				     end,NewComps),
+	    check_unique_tags(S,NewComps2),
+	    complist_as_tuple(is_erule_per(S#state.erule),NewComps2);
 	Dupl ->
 	    throw({error,{asn1,{duplicate_choice_alternatives,Dupl}}})
     end;
@@ -6036,12 +6070,17 @@ check_unique2([_|T],Pos,Acc) ->
 check_unique2([],_,Acc) ->
     lists:reverse(Acc).
 
-check_each_component(S,Type,Components) ->
-    check_each_component(S,Type,Components,[],[],[],root1).
 
-check_each_component(S = #state{abscomppath=Path,recordtopname=TopName},Type,
-		     [C|Ct],Acc,Extacc,Acc2,Ext) when is_record(C,'ComponentType') ->
-    #'ComponentType'{name=Cname,typespec=Ts,prop=Prop} = C,
+%% Replaces check_each_component and does the same work except that
+%% it keeps the complist as a flat list and does not create a tuple with root and
+%% extensions separated
+check_each_component2(S,Type,Components) ->
+    check_each_component2(S,Type,Components,[]).
+
+check_each_component2(S = #state{abscomppath=Path,recordtopname=TopName},
+		     Type,
+		     [C = #'ComponentType'{name=Cname,typespec=Ts,prop=Prop}|Ct],
+		     Acc) ->
     NewAbsCPath = 
 	case Ts#type.def of
 	    #'Externaltypereference'{} -> [];
@@ -6058,75 +6097,48 @@ check_each_component(S = #state{abscomppath=Path,recordtopname=TopName},Type,
 	    DefaultValue -> {'DEFAULT',DefaultValue}
 	end,
     NewC = C#'ComponentType'{typespec=CheckedTs,prop=NewProp,tags=NewTags},
-    case Ext of
-	root1 ->
-	    check_each_component(S,Type,Ct,[NewC|Acc],Extacc,Acc2,Ext);
-	ext ->
-	    check_each_component(S,Type,Ct,Acc,[NewC|Extacc],Acc2,Ext);
-	root2 ->
-	    check_each_component(S,Type,Ct,Acc,Extacc,[NewC|Acc2],Ext)
-    end;
-check_each_component(S,Type,[_|Ct],Acc,Extacc,Acc2,root1) -> % skip 'EXTENSIONMARK'
-    check_each_component(S,Type,Ct,Acc,Extacc,Acc2,ext);
-check_each_component(S,Type,[_|Ct],Acc,Extacc,Acc2,ext) -> % skip 'EXTENSIONMARK'
-    check_each_component(S,Type,Ct,Acc,Extacc,Acc2,root2);
-check_each_component(_S,_,[_C|_Ct],_,_,_,root2) -> % 'EXTENSIONMARK'
-    throw({error,{asn1,{too_many_extension_marks}}});
-check_each_component(_S,_,[],Acc,Extacc,_,ext) ->
-    {lists:reverse(Acc),lists:reverse(Extacc)};
-check_each_component(_S,_,[],Acc1,ExtAcc,Acc2,root2) ->
-    {lists:reverse(Acc1),lists:reverse(ExtAcc),lists:reverse(Acc2)};
-check_each_component(_S,_,[],Acc,_,_,root1) ->
+    check_each_component2(S,Type,Ct,[NewC|Acc]);
+
+check_each_component2(S,Type,[OtherMarker|Ct],Acc) ->
+    %% let 'EXTENSIONMARK' and 'ExtensionAdditionGroup' markers pass through as is
+    check_each_component2(S,Type,Ct,[OtherMarker|Acc]);
+check_each_component2(_S,_,[],Acc) ->
     lists:reverse(Acc).
 
-%% check_each_alternative(S,Type,{Rlist,ExtList}) ->
+
+%% check_each_alternative2(S,Type,{Rlist,ExtList}) ->
 %%     {check_each_alternative(S,Type,Rlist),
 %%      check_each_alternative(S,Type,ExtList)};
-check_each_alternative(S,Type,[C|Ct]) ->
-    check_each_alternative(S,Type,[C|Ct],[],[],noext).
+check_each_alternative2(S,Type,[C|Ct]) ->
+    check_each_alternative2(S,Type,[C|Ct],[]).
 
-check_each_alternative(S=#state{abscomppath=Path,recordtopname=TopName},Type,[C|Ct],
-		       Acc,Extacc,Ext) when is_record(C,'ComponentType') ->
-    #'ComponentType'{name=Cname,typespec=Ts,prop=_Prop} = C,
+check_each_alternative2(S=#state{abscomppath=Path,recordtopname=TopName},
+		       Type,
+		       [C = #'ComponentType'{name=Cname,typespec=Ts}|Ct],
+		       Acc) ->
     NewAbsCPath = 
 	case Ts#type.def of
 	    #'Externaltypereference'{} -> [];
 	    _ -> [Cname|Path]
 	end,
-    NewState =
-	S#state{abscomppath=NewAbsCPath,recordtopname=[Cname|TopName]},
-    CheckedTs = check_type(NewState,Type,Ts),
+    CheckedTs = check_type(S#state{abscomppath=NewAbsCPath,
+				   recordtopname=[Cname|TopName]},Type,Ts),
     NewTags = get_taglist(S,CheckedTs),
+
     NewC = C#'ComponentType'{typespec=CheckedTs,tags=NewTags},
-    case Ext of
-	noext ->
-	    check_each_alternative(S,Type,Ct,[NewC|Acc],Extacc,Ext);
-	ext ->
-	    check_each_alternative(S,Type,Ct,Acc,[NewC|Extacc],Ext)
-    end;
+    check_each_alternative2(S,Type,Ct,[NewC|Acc]);
 	    
-check_each_alternative(S,Type,[_|Ct],Acc,Extacc,noext) -> % skip 'EXTENSIONMARK'
-    check_each_alternative(S,Type,Ct,Acc,Extacc,ext);
-check_each_alternative(_S,_,[_C|_Ct],_,_,ext) -> % skip 'EXTENSIONMARK'
-    throw({error,{asn1,{too_many_extension_marks}}});
-check_each_alternative(_S,_,[],Acc,Extacc,ext) ->
-    {lists:reverse(Acc),lists:reverse(Extacc)};
-check_each_alternative(_S,_,[],Acc,_,noext) ->
+check_each_alternative2(S,Type,[OtherMarker|Ct],Acc) ->
+    %% let 'EXTENSIONMARK' and 'ExtensionAdditionGroup' markers pass through as is
+    check_each_alternative2(S,Type,Ct,[OtherMarker|Acc]);
+check_each_alternative2(_S,_,[],Acc) ->
     lists:reverse(Acc).
 
+
 %% componentrelation_leadingattr/2 searches the structure for table
 %% constraints, if any is found componentrelation_leadingattr/5 is
 %% called.
 componentrelation_leadingattr(S,CompList) ->
-    Cs =
-	case CompList of
-	    {Comp1, EComps, Comp2} ->
-		Comp1++EComps++Comp2;
-	    {Components,EComponents} when is_list(Components) ->
-		Components ++ EComponents;
-	    CompList when is_list(CompList) ->
-		CompList
-	end,
 
     %% get_simple_table_if_used/2 should find out whether there are any
     %% component relation constraints in the entire tree of Cs1 that
@@ -6135,12 +6147,22 @@ componentrelation_leadingattr(S,CompList) ->
     %% componentrelation_leadingattr/6. The step when the leading
     %% attribute and the syntax tree is modified to support the code
     %% generating.
-    case get_simple_table_if_used(S,Cs) of
+    case get_simple_table_if_used(S,CompList) of
 	[] -> {false,CompList};
-	STList ->
-	    componentrelation_leadingattr(S,Cs,Cs,STList,[],[])
+	_ ->
+	    componentrelation_leadingattr(S,CompList,CompList,[],[])
     end.
 
+
+%%FIXME expand_ExtAddGroups([C#'ExtensionAdditionGroup'{components=ExtAdds}|T],
+%% 		    CurrPos,PosAcc,CompAcc) ->
+%%     expand_ExtAddGroups(T,CurrPos+ L = lenght(ExtAdds),[{CurrPos,L}|PosAcc],ExtAdds++CompAcc);
+%% expand_ExtAddGroups([C|T],CurrPos,PosAcc,CompAcc) ->
+%%     expand_ExtAddGroups(T,CurrPos+ 1,PosAcc,[C|CompAcc]);
+%% expand_ExtAddGroups([],_CurrPos,PosAcc,CompAcc) ->
+%%     {lists:reverse(PosAcc),lists:reverse(CompAcc)}.
+
+
 %% componentrelation_leadingattr/6 when all components are searched
 %% the new modified components are returned together with the "leading
 %% attribute" information, which later is stored in the tablecinf
@@ -6150,11 +6172,12 @@ componentrelation_leadingattr(S,CompList) ->
 %% is used in code generating phase too, to recognice the proper
 %% components for "open type" encoding and to propagate the result of
 %% the object set lookup when needed.
-componentrelation_leadingattr(_,[],_CompList,_,[],NewCompList) ->
+componentrelation_leadingattr(_,[],_CompList,[],NewCompList) ->
     {false,lists:reverse(NewCompList)};
-componentrelation_leadingattr(_,[],_CompList,_,LeadingAttr,NewCompList) ->
+componentrelation_leadingattr(_,[],_CompList,LeadingAttr,NewCompList) ->
     {lists:last(LeadingAttr),lists:reverse(NewCompList)}; %send all info in Ts later
-componentrelation_leadingattr(S,[C|Cs],CompList,STList,Acc,CompAcc) ->
+
+componentrelation_leadingattr(S,[C= #'ComponentType'{}|Cs],CompList,Acc,CompAcc) ->
     {LAAcc,NewC} =
 	case catch componentrelation1(S,C#'ComponentType'.typespec,
 				      [C#'ComponentType'.name]) of
@@ -6205,7 +6228,7 @@ componentrelation_leadingattr(S,[C|Cs],CompList,STList,Acc,CompAcc) ->
 		%% no constraint was found
 		{[],C}
 	end,
-    componentrelation_leadingattr(S,Cs,CompList,STList,LAAcc++Acc,
+    componentrelation_leadingattr(S,Cs,CompList,LAAcc++Acc,
 				  [NewC|CompAcc]).
 
 object_set_mod_name(_S,ObjSet) when is_atom(ObjSet) ->
@@ -6228,11 +6251,9 @@ object_set_mod_name(S,#'Externaltypereference'{module=M,type=T}) ->
 %% generation of the look up functionality in the object set table are
 %% returned.
 get_simple_table_if_used(S,Cs) ->
-    CNames = lists:map(fun(#'ComponentType'{name=Name}) -> Name;
-			  (_) -> [] %% in case of extension marks
-		       end,
-		       Cs),
-    RefedSimpleTable=any_component_relation(S,Cs,CNames,[],[]),
+    CNames = [Name||#'ComponentType'{name=Name}<-Cs],
+    JustComponents = [C || C = #'ComponentType'{}<-Cs],
+    RefedSimpleTable=any_component_relation(S,JustComponents,CNames,[],[]),
     get_simple_table_info(S,Cs,remove_doubles(RefedSimpleTable)).
 
 remove_doubles(L) ->
@@ -6336,9 +6357,7 @@ simple_table_info(S,Type,_) ->
 %% beginning of the search. CNames holds the names of all components
 %% of the start level, this info is used if an outermost at-notation
 %% is found to check the validity of the at-list.
-any_component_relation(S,[C|Cs],CNames,NamePath,Acc) ->
-    CName = C#'ComponentType'.name,
-    Type = C#'ComponentType'.typespec,
+any_component_relation(S,[#'ComponentType'{name=CName,typespec=Type}|Cs],CNames,NamePath,Acc) ->
     CRelPath =
 	case constraint_member(componentrelation,Type#type.constraint) of
 %%	    [{componentrelation,_,AtNotation}] ->
@@ -6358,9 +6377,9 @@ any_component_relation(S,[C|Cs],CNames,NamePath,Acc) ->
 	case {Type#type.inlined,
 	      asn1ct_gen:type(asn1ct_gen:get_inner(Type#type.def))} of
 	    {no,{constructed,bif}} ->
+
 		{InnerCs,NewNamePath} = 
 		    case get_components(Type#type.def) of
-			{IC1,_IC2} -> {IC1 ++ IC1,[CName|NamePath]};
 			T when is_record(T,type) -> {T,NamePath};
 			IC -> {IC,[CName|NamePath]}
 		    end,
@@ -6384,16 +6403,18 @@ any_component_relation(S,Type,CNames,NamePath,Acc) when is_record(Type,type) ->
 	case {Type#type.inlined,
 	      asn1ct_gen:type(asn1ct_gen:get_inner(Type#type.def))} of
 	    {no,{constructed,bif}} ->
-		InnerCs = 
-		    case get_components(Type#type.def) of
-			{IC1,_IC2} -> IC1 ++ IC1;
-			IC -> IC
-		    end,
+		InnerCs = get_components(Type#type.def),
 		any_component_relation(S,InnerCs,CNames,NamePath,[]);
 	    _ ->
 		[]
 	end,
     InnerAcc  ++ CRelPath ++ Acc;
+%% Just skip the markers for ExtensionAdditionGroup start and end
+%% in this function
+any_component_relation(S,[#'ExtensionAdditionGroup'{}|Cs],CNames,NamePath,Acc) ->
+    any_component_relation(S,Cs,CNames,NamePath,Acc);
+any_component_relation(S,['ExtensionAdditionGroupEnd'|Cs],CNames,NamePath,Acc) ->
+    any_component_relation(S,Cs,CNames,NamePath,Acc);
 any_component_relation(_,[],_,_,Acc) ->
     Acc.
 
@@ -6456,11 +6477,11 @@ get_components(Def) ->
     get_components(any,Def).
 
 get_components(_,#'SEQUENCE'{components=Cs}) ->
-    Cs;
+    tuple2complist(Cs);
 get_components(_,#'SET'{components=Cs}) ->
-    Cs;
+    tuple2complist(Cs);
 get_components(_,{'CHOICE',Cs}) ->
-    Cs;
+    tuple2complist(Cs);
 %do not step in inlined structures
 get_components(any,{'SEQUENCE OF',T = #type{def=_Def,inlined=no}}) ->
 %    get_components(any,Def);
@@ -6471,6 +6492,13 @@ get_components(any,{'SET OF',T = #type{def=_Def,inlined=no}}) ->
 get_components(_,_) ->
     [].
 
+tuple2complist({R,E}) ->
+    R ++ E;
+tuple2complist({R1,E,R2}) ->
+    R1 ++ E ++ R2;
+tuple2complist(List) when is_list(List) ->
+    List.
+
 get_choice_components(_S,{'CHOICE',Components}) when is_list(Components)->
     Components;
 get_choice_components(_S,{'CHOICE',{C1,C2}}) when is_list(C1),is_list(C2) ->
@@ -6731,8 +6759,7 @@ get_tableconstraint_info(S,Type,CheckedTs) ->
 
 get_tableconstraint_info(_S,_Type,[],Acc) ->
     lists:reverse(Acc);
-get_tableconstraint_info(S,Type,[C|Cs],Acc) ->
-    CheckedTs = C#'ComponentType'.typespec,
+get_tableconstraint_info(S,Type,[C=#'ComponentType'{typespec=CheckedTs}|Cs],Acc) ->
     AccComp = 
 	case CheckedTs#type.def of 
 	    %% ObjectClassFieldType
@@ -6768,7 +6795,9 @@ get_tableconstraint_info(S,Type,[C|Cs],Acc) ->
 	    _ ->
 		C
 	end,
-    get_tableconstraint_info(S,Type,Cs,[AccComp|Acc]).
+    get_tableconstraint_info(S,Type,Cs,[AccComp|Acc]);
+get_tableconstraint_info(S,Type,[C|Cs],Acc) ->
+    get_tableconstraint_info(S,Type,Cs,[C|Acc]).
 
 get_referenced_fieldname([{_,FirstFieldname}]) ->
     {FirstFieldname,[]};
@@ -6850,7 +6879,9 @@ get_taglist(S,Type) when is_record(Type,type) ->
 	    [asn1ct_gen:def_to_tag(Tag)]
     end;
 get_taglist(S,{'CHOICE',{Rc,Ec}}) ->
-    get_taglist(S,{'CHOICE',Rc ++ Ec});
+    get_taglist1(S,Rc ++ Ec);
+get_taglist(S,{'CHOICE',{R1,E,R2}}) ->
+    get_taglist1(S,R1 ++ E ++ R2);
 get_taglist(S,{'CHOICE',Components}) ->
     get_taglist1(S,Components);
 %% ObjectClassFieldType OTP-4390
diff --git a/lib/asn1/src/asn1ct_constructed_ber.erl b/lib/asn1/src/asn1ct_constructed_ber.erl
index 51a241ffbd..77b78dcac7 100644
--- a/lib/asn1/src/asn1ct_constructed_ber.erl
+++ b/lib/asn1/src/asn1ct_constructed_ber.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
 %%
 %%
@@ -71,13 +71,15 @@ gen_encode_sequence(Erules,Typename,D) when is_record(D,type) ->
 	    ok
     end,
 
-    {SeqOrSet,TableConsInfo,CompList} = 
+    {SeqOrSet,TableConsInfo,CompList0} =
 	case D#type.def of
 	    #'SEQUENCE'{tablecinf=TCI,components=CL} -> 
 		{'SEQUENCE',TCI,CL};
 	    #'SET'{tablecinf=TCI,components=CL} -> 
 		{'SET',TCI,CL}
 	end,
+    %% filter away extensionAdditiongroup markers
+    CompList = filter_complist(CompList0),
     Ext = extensible(CompList),
     CompList1 = case CompList of
 		    {Rl1,El,Rl2} -> Rl1 ++ El ++ Rl2;
@@ -189,7 +191,11 @@ gen_encode_sequence(Erules,Typename,D) when is_record(D,type) ->
 gen_decode_sequence(Erules,Typename,D) when is_record(D,type) ->
     asn1ct_name:start(),
     asn1ct_name:new(tag),
-    #'SEQUENCE'{tablecinf=TableConsInfo,components=CList} = D#type.def,
+    #'SEQUENCE'{tablecinf=TableConsInfo,components=CList0} = D#type.def,
+
+    %% filter away extensionAdditiongroup markers
+    CList = filter_complist(CList0),
+
     Ext = extensible(CList),
     {CompList,CompList2} = case CList of
 		   {Rl1,El,Rl2} -> {Rl1 ++ El ++ Rl2,CList};
@@ -369,7 +375,10 @@ gen_decode_set(Erules,Typename,D) when is_record(D,type) ->
     asn1ct_name:clear(),
     asn1ct_name:new(term),
     asn1ct_name:new(tag),
-    #'SET'{components=TCompList} = D#type.def,
+    #'SET'{components=TCompList0} = D#type.def,
+
+    %% filter away extensionAdditiongroup markers
+    TCompList = filter_complist(TCompList0),
     Ext = extensible(TCompList),
     ToOptional = fun(mandatory) ->
 			 'OPTIONAL';
@@ -1473,6 +1482,22 @@ extensible({RootList,ExtList}) ->
     {ext,length(RootList)+1,length(ExtList)};
 extensible({_Rl1,_ExtL,_Rl2}) ->
     extensible.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% filter away ExtensionAdditionGroup start and end marks since these
+%% have no significance for the BER encoding
+%%
+filter_complist(CompList) when is_list(CompList) ->
+    lists:filter(fun(#'ExtensionAdditionGroup'{}) ->
+			 false;
+		    ('ExtensionAdditionGroupEnd') ->
+			 false;
+		    (_) ->
+			 true
+		 end, CompList);
+filter_complist({Root,Ext}) ->
+    {Root,filter_complist(Ext)};
+filter_complist({Root1,Ext,Root2}) ->
+    {Root1,filter_complist(Ext),Root2}.
 
 print_attribute_comment(InnerType,Pos,Prop) ->
     CommentLine = "%%-------------------------------------------------",
diff --git a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
index a55ac9db8e..e3be914af4 100644
--- a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
@@ -75,13 +75,15 @@ gen_encode_sequence(Erules,Typename,D) when is_record(D,type) ->
 	    "Val"
 	end,
 
-    {SeqOrSet,TableConsInfo,CompList} = 
+    {SeqOrSet,TableConsInfo,CompList0} =
 	case D#type.def of
 	    #'SEQUENCE'{tablecinf=TCI,components=CL} -> 
 		{'SEQUENCE',TCI,CL};
 	    #'SET'{tablecinf=TCI,components=CL} -> 
 		{'SET',TCI,CL}
 	end,
+    %% filter away extensionAdditiongroup markers
+    CompList = filter_complist(CompList0),
     Ext = extensible(CompList),
     CompList1 = case CompList of
 		    {Rl1,El,Rl2} -> Rl1 ++ El ++ Rl2;
@@ -183,7 +185,10 @@ gen_decode_sequence(Erules,Typename,D) when is_record(D,type) ->
     asn1ct_name:start(),
     asn1ct_name:clear(),
     asn1ct_name:new(tag),
-    #'SEQUENCE'{tablecinf=TableConsInfo,components=CList} = D#type.def,
+    #'SEQUENCE'{tablecinf=TableConsInfo,components=CList0} = D#type.def,
+
+    %% filter away extensionAdditiongroup markers
+    CList = filter_complist(CList0),
     Ext = extensible(CList),
     {CompList,CompList2} = 
 	case CList of
@@ -345,7 +350,9 @@ gen_decode_set(Erules,Typename,D) when is_record(D,type) ->
     asn1ct_name:clear(),
 %%    asn1ct_name:new(term),
     asn1ct_name:new(tag),
-    #'SET'{tablecinf=TableConsInfo,components=TCompList} = D#type.def,
+    #'SET'{tablecinf=TableConsInfo,components=TCompList0} = D#type.def,
+    %% filter away extensionAdditiongroup markers
+    TCompList = filter_complist(TCompList0),
     Ext = extensible(TCompList),
     ToOptional = fun(mandatory) ->
 			 'OPTIONAL';
@@ -1426,6 +1433,22 @@ extensible({RootList,ExtList}) ->
     {ext,length(RootList)+1,length(ExtList)};
 extensible({_Rl1,_Ext,_Rl2}) ->
     extensible.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% filter away ExtensionAdditionGroup start and end marks since these
+%% have no significance for the BER encoding
+%%
+filter_complist(CompList) when is_list(CompList) ->
+    lists:filter(fun(#'ExtensionAdditionGroup'{}) ->
+			 false;
+		    ('ExtensionAdditionGroupEnd') ->
+			 false;
+		    (_) ->
+			 true
+		 end, CompList);
+filter_complist({Root,Ext}) ->
+    {Root,filter_complist(Ext)};
+filter_complist({Root1,Ext,Root2}) ->
+    {Root1,filter_complist(Ext),Root2}.
 
 
 print_attribute_comment(InnerType,Pos,Cname,Prop) ->
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl
index 2a1c0ebc6b..d6f23aca06 100644
--- a/lib/asn1/src/asn1ct_constructed_per.erl
+++ b/lib/asn1/src/asn1ct_constructed_per.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
 %%
 %%
@@ -46,18 +46,29 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
     asn1ct_name:start(),
     asn1ct_name:new(term),
     asn1ct_name:new(bytes),
-    {CompList,TableConsInfo} = 
+    {ExtAddGroup,TmpCompList,TableConsInfo} =
 	case D#type.def of
-	    #'SEQUENCE'{tablecinf=TCI,components=CL} ->
-		{CL,TCI};
+	    #'SEQUENCE'{tablecinf=TCI,components=CL,extaddgroup=ExtAddGroup0} ->
+		{ExtAddGroup0,CL,TCI};
 	    #'SET'{tablecinf=TCI,components=CL} ->
-		{CL,TCI}
+		{undefined,CL,TCI}
 	end,
+
+    CompList = case ExtAddGroup of
+		   undefined ->
+		       TmpCompList;
+		   _ when is_integer(ExtAddGroup) ->
+		       %% This is a fake SEQUENCE representing an ExtensionAdditionGroup
+		       %% Reset the textual order so we get the right
+		       %% index of the components
+		       [Comp#'ComponentType'{textual_order=undefined}||
+			   Comp<-TmpCompList]
+	       end,
     case Typename of
 	['EXTERNAL'] ->
-	    emit({{var,asn1ct_name:next(val)},
+	    emit({{next,val},
 		  " = asn1rt_check:transform_to_EXTERNAL1990(",
-		  {var,asn1ct_name:curr(val)},"),",nl}),
+		  {curr,val},"),",nl}),
 	    asn1ct_name:new(val);
 	_ ->
 	    ok
@@ -66,23 +77,40 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
 	{[],EmptyCL} when EmptyCL == {[],[],[]};EmptyCL == {[],[]};EmptyCL == [] -> 
 	    emit(["%%Variable setting just to eliminate ",
 		  "compiler warning for unused vars!",nl,
-		  "_Val = ",{var,asn1ct_name:curr(val)},",",nl]);
+		  "_Val = ",{curr,val},",",nl]);
 	{[],_} ->
-	    emit([{var,asn1ct_name:next(val)}," = ?RT_PER:list_to_record("]),
+	    emit([{next,val}," = ?RT_PER:list_to_record("]),
 	    emit(["'",asn1ct_gen:list2rname(Typename),"'"]),
-	    emit([", ",{var,asn1ct_name:curr(val)},"),",nl]);
+	    emit([", ",{curr,val},"),",nl]);
 	_ ->
 	    Fixoptcall = ",Opt} = ?RT_PER:fixoptionals(",
-	    emit({"{",{var,asn1ct_name:next(val)},Fixoptcall,
+	    emit({"{",{next,val},Fixoptcall,
 		  {asis,Optionals},",",length(Optionals),
-		  ",",{var,asn1ct_name:curr(val)},"),",nl})
+		  ",",{curr,val},"),",nl})
     end,
     asn1ct_name:new(val),
-    Ext = extensible(CompList),
+    Ext = extensible_enc(CompList),
     case Ext of
 	{ext,_,NumExt} when NumExt > 0 ->
-	    emit(["Extensions = ?RT_PER:fixextensions(",{asis,Ext},
-		  ", ",{curr,val},"),",nl]);
+	    case extgroup_pos_and_length(CompList) of
+		{extgrouppos,ExtGroupPos,ExtGroupLen} ->
+		    Elements = make_elements(ExtGroupPos+1,
+					     "Val1",lists:seq(1,ExtGroupLen)),
+		    emit([
+			  {next,val}," = case [X || X <- [",Elements,
+			  "],X =/= asn1_NOVALUE] of",nl,
+			  "[] -> ",{curr,val},";",nl,
+			  "_ -> setelement(",{asis,ExtGroupPos+1},",",
+			  {curr,val},",",
+			  "{extaddgroup,", Elements,"})",nl,
+			  "end,",nl]),
+		    asn1ct_name:new(val);
+		_ -> % no extensionAdditionGroup
+		    ok
+	    end,
+	    asn1ct_name:new(tmpval),
+	    emit(["Extensions = ?RT_PER:fixextensions(",{asis,Ext},",",
+		  {curr,val},"),",nl]);
 	_ -> true
     end,
     EncObj =
@@ -188,9 +216,10 @@ gen_decode_constructed(Erules,Typename,D) when is_record(D,type) ->
 	    #'SEQUENCE'{tablecinf=TCI,components=CL} ->
 		{add_textual_order(CL),TCI};
 	    #'SET'{tablecinf=TCI,components=CL} ->
-		{add_textual_order(CL),TCI}
+%%		{add_textual_order(CL),TCI}
+		{CL,TCI} % the textual order is already taken care of
 	end,
-    Ext = extensible(CompList),
+    Ext = extensible_dec(CompList),
     MaybeComma1 = case Ext of
 		      {ext,_Pos,_NumExt} -> 
 			  gen_dec_extension_value("Bytes"),
@@ -243,8 +272,9 @@ gen_decode_constructed(Erules,Typename,D) when is_record(D,type) ->
 			{false,false,false}
 		end
 	end,
+    NewCompList = wrap_compList(CompList),
     {AccTerm,AccBytes} =
-	gen_dec_components_call(Erules,Typename,CompList,MaybeComma2,DecObjInf,Ext,length(Optionals)),
+	gen_dec_components_call(Erules,Typename,NewCompList,MaybeComma2,DecObjInf,Ext,length(Optionals)),
     case asn1ct_name:all(term) of
 	[] -> emit(MaybeComma2); % no components at all
 	_ -> emit({com,nl})
@@ -284,30 +314,26 @@ gen_decode_constructed(Erules,Typename,D) when is_record(D,type) ->
 	    emit("   {ASN11994Format,");
 	_ ->
 	    emit(["{{'",RecordName,"'"]),
-	    mkvlist(textual_order(CompList,asn1ct_name:all(term))),
+	    %% CompList is used here because we don't want
+	    %% ExtensionAdditionGroups to be wrapped in SEQUENCES when
+	    %% we are ordering the fields according to textual order
+	    mkvlist(textual_order(to_encoding_order(CompList),asn1ct_name:all(term))),
 	    emit("},")
     end,
-    emit({{var,asn1ct_name:curr(bytes)},"}"}),
+    emit({{curr,bytes},"}"}),
     emit({".",nl,nl}).
 
 textual_order([#'ComponentType'{textual_order=undefined}|_],TermList) ->
     TermList;
 textual_order(CompList,TermList) when is_list(CompList) ->
-    TermTuple = list_to_tuple(TermList), %% ['Term1','Term2',...'TermN']
-    %% OrderList is ordered by canonical order of tags
-    TmpTuple = TermTuple,
-    OrderList = [Ix||#'ComponentType'{textual_order=Ix} <- CompList], 
-    Fun = fun(X,{Tpl,Ix}) ->
-		  
-		  {setelement(X,Tpl,element(Ix,TermTuple)),Ix+1}
-	  end,
-    {Ret,_} = lists:foldl(Fun,{TmpTuple,1},OrderList),
-%%    io:format("TermTuple: ~p~nOrderList: ~p~nRet: ~p~n",[TermTuple,OrderList,tuple_to_list(Ret)]),
-    tuple_to_list(Ret);
+    OrderList = [Ix||#'ComponentType'{textual_order=Ix} <- CompList],
+    [Term||{_,Term}<-
+	       lists:sort(lists:zip(OrderList,
+				    lists:sublist(TermList,length(OrderList))))];
+	       %% sublist is just because Termlist can sometimes be longer than
+	       %% OrderList, which it really shouldn't
 textual_order({Root,Ext},TermList) ->
-    textual_order(Root ++ Ext,TermList);
-textual_order({Root1,Ext,Root2},TermList) ->
-    textual_order(Root1 ++ Ext ++ Root2, TermList).
+    textual_order(Root ++ Ext,TermList).
 
 to_textual_order({Root,Ext}) ->
     {to_textual_order(Root),Ext};
@@ -379,7 +405,7 @@ emit_opt_or_mand_check(Val,Term) ->
 gen_encode_choice(Erule,Typename,D) when is_record(D,type) ->
     {'CHOICE',CompList} = D#type.def,
     emit({"[",nl}),
-    Ext = extensible(CompList),
+    Ext = extensible_enc(CompList),
     gen_enc_choice(Erule,Typename,CompList,Ext),
     emit({nl,"].",nl}).
 
@@ -388,7 +414,7 @@ gen_decode_choice(Erules,Typename,D) when is_record(D,type) ->
     asn1ct_name:clear(),
     asn1ct_name:new(bytes),
     {'CHOICE',CompList} = D#type.def,
-    Ext = extensible(CompList),
+    Ext = extensible_enc(CompList),
     gen_dec_choice(Erules,Typename,CompList,Ext),
     emit({".",nl}).
 
@@ -558,12 +584,53 @@ mkvlist2([H|T]) ->
 mkvlist2([]) ->
     true.
 
-extensible(CompList) when is_list(CompList) ->
+
+extensible_dec(CompList) when is_list(CompList) ->
     noext;
-extensible({RootList,ExtList}) ->
-    {ext,length(RootList)+1,length(ExtList)};
-extensible({Rl1,Ext,_Rl2}) ->
-     {ext,length(Rl1)+1,length(Ext)}.
+extensible_dec({RootList,ExtList}) ->
+    {ext,length(RootList)+1,ext_length(ExtList)};
+extensible_dec({Rl1,Ext,Rl2}) ->
+     {ext,length(Rl1)+length(Rl2)+1,ext_length(Ext)}.
+
+extensible_enc(CompList) when is_list(CompList) ->
+    noext;
+extensible_enc({RootList,ExtList}) ->
+    {ext,length(RootList)+1,ext_length(ExtList)};
+extensible_enc({Rl1,Ext,_Rl2}) ->
+     {ext,length(Rl1)+1,ext_length(Ext)}.
+
+ext_length(ExtList) -> ext_length(ExtList,normal,0).
+ext_length([{'ExtensionAdditionGroup',_Num}|T],_,Acc)->
+    ext_length(T,group,Acc);
+ext_length(['ExtensionAdditionGroupEnd'|T],group,Acc) ->
+    ext_length(T,normal,Acc+1);
+ext_length([#'ComponentType'{}|T],State=group,Acc) ->
+    ext_length(T,State,Acc);
+ext_length([#'ComponentType'{}|T],State=normal,Acc) ->
+    ext_length(T,State,Acc+1);
+ext_length([],_,Acc) ->
+    Acc.
+
+extgroup_pos_and_length(CompList) when is_list(CompList) ->
+    noextgroup;
+extgroup_pos_and_length({RootList,ExtList}) ->
+    extgrouppos(ExtList,length(RootList)+1);
+extgroup_pos_and_length({Rl1,Ext,_Rl2}) ->
+    extgrouppos(Ext,length(Rl1)+1).
+
+extgrouppos([{'ExtensionAdditionGroup',_Num}|T],Pos) ->
+    extgrouppos(T,Pos,0);
+extgrouppos([_|T],Pos) ->
+    extgrouppos(T,Pos+1);
+extgrouppos([],_) ->
+    noextgroup.
+
+extgrouppos(['ExtensionAdditionGroupEnd'|_T],Pos,Len) ->
+    {extgrouppos,Pos,Len};
+extgrouppos([_|T],Pos,Len) ->
+    extgrouppos(T,Pos,Len+1).
+    
+
 
 gen_dec_extension_value(_) ->
     emit({"{Ext,",{next,bytes},"} = ?RT_PER:getext(",{curr,bytes},")"}),
@@ -574,7 +641,11 @@ gen_dec_extension_value(_) ->
 %% there are optional components, start with 2 because first element
 %% is the record name
 
-optionals({L1,_Ext,L2}) -> optionals(L1++L2,[],2); 
+optionals({L1,Ext,L2}) ->
+    Opt1 = optionals(L1,[],2),
+    ExtComps = length([C||C = #'ComponentType'{}<-Ext]),
+    Opt2 = optionals(L2,[],2+length(L1)+ExtComps),
+    Opt1 ++ Opt2;
 optionals({L,_Ext}) -> optionals(L,[],2); 
 optionals(L) -> optionals(L,[],2).
 
@@ -617,6 +688,13 @@ get_optionality_pos(TextPos,OptTable) ->
 	    no_num
     end.
 
+to_encoding_order(Cs) when is_list(Cs) ->
+    Cs;
+to_encoding_order(Cs = {_Root,_Ext}) ->
+    Cs;
+to_encoding_order({R1,Ext,R2}) ->
+    {R1++R2,Ext}.
+
 add_textual_order(Cs) when is_list(Cs) ->
     {NewCs,_} = add_textual_order1(Cs,1),
     NewCs;
@@ -629,26 +707,20 @@ add_textual_order({R1,Ext,R2}) ->
     {NewExt,Num2} = add_textual_order1(Ext,Num1),
     {NewR2,_} = add_textual_order1(R2,Num2),
     {NewR1,NewExt,NewR2}.
-add_textual_order1(Cs=[#'ComponentType'{textual_order=Int}|_],I)
-  when is_integer(Int) ->
-    {Cs,I};
+%%add_textual_order1(Cs=[#'ComponentType'{textual_order=Int}|_],I)
+%%  when is_integer(Int) ->
+%%    {Cs,I};
 add_textual_order1(Cs,NumIn) ->
-    lists:mapfoldl(fun(C,Num) ->
+    lists:mapfoldl(fun(C=#'ComponentType'{},Num) ->
 			   {C#'ComponentType'{textual_order=Num},
-			    Num+1}
+			    Num+1};
+		      (OtherMarker,Num) ->
+			   {OtherMarker,Num}
 		   end,
 		   NumIn,Cs).
 
 gen_enc_components_call(Erule,TopType,{Root1,ExtList,Root2},MaybeComma,DynamicEnc,Ext) ->
-    Rpos = gen_enc_components_call1(Erule,TopType,Root1,1,MaybeComma,DynamicEnc,noext),
-    case Ext of
-	{ext,_,ExtNum} when ExtNum > 0 ->
-	    emit([nl,
-		  ",Extensions",nl]);
-	_ -> true
-    end,
-    Rpos2 = gen_enc_components_call1(Erule,TopType,ExtList,Rpos,MaybeComma,DynamicEnc,Ext),
-    gen_enc_components_call1(Erule,TopType,Root2,Rpos2,MaybeComma,DynamicEnc,noext);
+    gen_enc_components_call(Erule,TopType,{Root1++Root2,ExtList},MaybeComma,DynamicEnc,Ext);
 gen_enc_components_call(Erule,TopType,{CompList,ExtList},MaybeComma,DynamicEnc,Ext) ->
     %% The type has extensionmarker
     Rpos = gen_enc_components_call1(Erule,TopType,CompList,1,MaybeComma,DynamicEnc,noext),
@@ -659,7 +731,8 @@ gen_enc_components_call(Erule,TopType,{CompList,ExtList},MaybeComma,DynamicEnc,E
 	_ -> true
     end,
     %handle extensions
-    gen_enc_components_call1(Erule,TopType,ExtList,Rpos,MaybeComma,DynamicEnc,Ext);
+    NewExtList = wrap_extensionAdditionGroups(ExtList),
+    gen_enc_components_call1(Erule,TopType,NewExtList,Rpos,MaybeComma,DynamicEnc,Ext);
 gen_enc_components_call(Erule,TopType, CompList, MaybeComma, DynamicEnc, Ext) ->
     %% The type has no extensionmarker
     gen_enc_components_call1(Erule,TopType,CompList,1,MaybeComma,DynamicEnc,Ext).
@@ -706,7 +779,7 @@ gen_enc_components_call1(_Erule,_TopType,[],Pos,_,_,_) ->
 	Pos.
 
 gen_enc_component_default(Erule,TopType,Cname,Type,Pos,DynamicEnc,Ext,DefaultVal) ->
-    Element = make_element(Pos+1,"Val1",Cname),
+    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),Cname),
     emit({"case ",Element," of",nl}),
 %    emit({"asn1_DEFAULT -> [];",nl}),
     emit({"DFLT when DFLT == asn1_DEFAULT; DFLT == ",{asis,DefaultVal}," -> [];",nl}),
@@ -719,8 +792,27 @@ gen_enc_component_default(Erule,TopType,Cname,Type,Pos,DynamicEnc,Ext,DefaultVal
     NextElement = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
     gen_enc_line(Erule,TopType,Cname,Type,NextElement, Pos,DynamicEnc,Ext),
     emit({nl,"end"}).
+
+gen_enc_component_optional(Erule,TopType,Cname,
+			   Type=#type{def=#'SEQUENCE'{
+					extaddgroup=Number,
+					components=_ExtGroupCompList}},
+			   Pos,DynamicEnc,Ext) when is_integer(Number) ->
+
+    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),Cname),
+    emit({"case ",Element," of",nl}),
+
+    emit({"asn1_NOVALUE -> [];",nl}),
+    asn1ct_name:new(tmpval),
+    emit({{curr,tmpval}," ->",nl}),
+    InnerType = asn1ct_gen:get_inner(Type#type.def),
+    emit({nl,"%% attribute number ",Pos," with type ",
+	      InnerType,nl}),
+    NextElement = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
+    gen_enc_line(Erule,TopType,Cname,Type,NextElement, Pos,DynamicEnc,Ext),
+    emit({nl,"end"});
 gen_enc_component_optional(Erule,TopType,Cname,Type,Pos,DynamicEnc,Ext) ->
-    Element = make_element(Pos+1,"Val1",Cname),
+    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val)),Cname),
     emit({"case ",Element," of",nl}),
 
     emit({"asn1_NOVALUE -> [];",nl}),
@@ -834,29 +926,7 @@ gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) ->
 	_ -> true
     end.
 gen_dec_components_call(Erule,TopType,{Root1,ExtList,Root2},MaybeComma,DecInfObj,Ext,NumberOfOptionals) ->
-     %% The type has extensionmarker
-     OptTable = create_optionality_table(Root1 ++ Root2),
-     {Rpos,AccTerm,AccBytes} = 
- 	gen_dec_components_call1(Erule,TopType, Root1, 1, OptTable,
- 				 MaybeComma,DecInfObj, noext,[],[],
- 				 NumberOfOptionals),
-     emit([",",nl,"{Extensions,",{next,bytes},"} = "]),
-     emit(["?RT_PER:getextension(Ext,",{curr,bytes},"),",nl]),
-     asn1ct_name:new(bytes),
-     {Epos,AccTermE,AccBytesE} = 
- 	gen_dec_components_call1(Erule,TopType,ExtList,Rpos, OptTable, "",
- 				 DecInfObj,Ext,[],[],NumberOfOptionals),
-     case ExtList of
- 	[] -> true;
- 	_ -> emit([",",nl])
-     end,
-     emit([{next,bytes},"= ?RT_PER:skipextensions(",{curr,bytes},",",
- 	  length(ExtList)+1,",Extensions),",nl]),
-     asn1ct_name:new(bytes),
-     {_RPos2,AccTerm2,AccBytes2} =
- 	gen_dec_components_call1(Erule,TopType,Root2,Epos,OptTable,
- 				 "",DecInfObj,noext,[],[],NumberOfOptionals),
-     {AccTerm++AccTermE++AccTerm2,AccBytes++AccBytesE++AccBytes2};
+    gen_dec_components_call(Erule,TopType,{Root1++Root2,ExtList},MaybeComma,DecInfObj,Ext,NumberOfOptionals);
 gen_dec_components_call(Erule,TopType,{CompList,ExtList},MaybeComma,
 			DecInfObj,Ext,NumberOfOptionals) ->
     %% The type has extensionmarker
@@ -868,8 +938,9 @@ gen_dec_components_call(Erule,TopType,{CompList,ExtList},MaybeComma,
     emit([",",nl,"{Extensions,",{next,bytes},"} = "]),
     emit(["?RT_PER:getextension(Ext,",{curr,bytes},"),",nl]),
     asn1ct_name:new(bytes),
+    NewExtList = wrap_extensionAdditionGroups(ExtList),
     {_Epos,AccTermE,AccBytesE} = 
-	gen_dec_components_call1(Erule,TopType,ExtList,Rpos, OptTable,
+	gen_dec_components_call1(Erule,TopType,NewExtList,Rpos, OptTable,
 				 "",DecInfObj,Ext,[],[],NumberOfOptionals),
     case ExtList of
 	[] -> true;
@@ -942,8 +1013,18 @@ gen_dec_components_call1(Erule,TopType,
 	    asn1ct_name:new(tmpterm),
 	    emit({"{",{curr,tmpterm},", ",{next,bytes},"} = "});
 	_ ->
-	    asn1ct_name:new(term),
-	    emit({"{",{curr,term},",",{next,bytes},"} = "})
+	    case Type of
+		#type{def=#'SEQUENCE'{
+			extaddgroup=Number1,
+			components=ExtGroupCompList1}} when is_integer(Number1)->
+		    emit({"{{_,"}),
+		    emit_extaddgroupTerms(term,ExtGroupCompList1),
+		    emit({"}"});
+		_ ->
+		    asn1ct_name:new(term),
+		    emit({"{",{curr,term}})
+	    end,
+	    emit({",",{next,bytes},"} = "})
     end,
 
     case {Ext,Prop,is_optimized(Erule)} of
@@ -967,11 +1048,24 @@ gen_dec_components_call1(Erule,TopType,
 	{noext,mandatory} -> true; % generate nothing
 	{noext,_} ->
 	    emit([";",nl,"0 ->"]),
-	    gen_dec_component_no_val(TopType,Cname,Type,Prop,Tpos,Ext),
+	    emit(["{"]),
+	    gen_dec_component_no_val(Ext,Prop),
+	    emit({",",{curr,bytes},"}",nl}),
 	    emit([nl,"end"]);
 	_ ->
 	    emit([";",nl,"_  ->",nl]),
-	    gen_dec_component_no_val(TopType,Cname,Type,Prop,Tpos,Ext),
+	    emit(["{"]),
+	    case Type of
+		#type{def=#'SEQUENCE'{
+			extaddgroup=Number2,
+			components=ExtGroupCompList2}} when is_integer(Number2)->
+		    emit({"{extAddGroup,"}),
+		    gen_dec_extaddGroup_no_val(Ext,ExtGroupCompList2),
+		    emit({"}"});
+		_ ->
+		    gen_dec_component_no_val(Ext,Prop)
+	    end,
+	    emit({",",{curr,bytes},"}",nl}),
 	    emit([nl,"end"])
     end,    
     asn1ct_name:new(bytes),
@@ -988,13 +1082,22 @@ gen_dec_components_call1(Erule,TopType,
 gen_dec_components_call1(_,_TopType,[],Pos,_OptTable,_,_,_,AccTerm,AccBytes,_NumberOfOptionals) ->
     {Pos,AccTerm,AccBytes}.
 
-
-gen_dec_component_no_val(_,_,_,{'DEFAULT',DefVal},_,_) ->
-    emit(["{",{asis,DefVal},",",{curr,bytes},"}",nl]);
-gen_dec_component_no_val(_,_,_,'OPTIONAL',_,_) ->
-    emit({"{asn1_NOVALUE,",{curr,bytes},"}",nl});
-gen_dec_component_no_val(_,_,_,mandatory,_,{ext,_,_}) ->
-    emit({"{asn1_NOVALUE,",{curr,bytes},"}",nl}).
+gen_dec_extaddGroup_no_val(Ext,[#'ComponentType'{prop=Prop}])->
+    gen_dec_component_no_val(Ext,Prop),
+    ok;
+gen_dec_extaddGroup_no_val(Ext,[#'ComponentType'{prop=Prop}|Rest])->
+    gen_dec_component_no_val(Ext,Prop),
+    emit({","}),
+    gen_dec_extaddGroup_no_val(Ext,Rest);
+gen_dec_extaddGroup_no_val(_, []) ->
+    ok.
+
+gen_dec_component_no_val(_,{'DEFAULT',DefVal}) ->
+    emit([{asis,DefVal}]);
+gen_dec_component_no_val(_,'OPTIONAL') ->
+    emit({"asn1_NOVALUE"});
+gen_dec_component_no_val({ext,_,_},mandatory) ->
+    emit({"asn1_NOVALUE"}).
     
 
 gen_dec_line(Erule,TopType,Cname,Type,Pos,DecInfObj,Ext,Prop)  ->
@@ -1192,6 +1295,14 @@ gen_enc_choice_tag({C1,C2},_,_) ->
     N2 = get_name_list(C2),
     emit(["?RT_PER:set_choice(element(1,Val),",
 	  {asis,{N1,N2}},", ",{asis,{length(N1),length(N2)}},")"]);
+
+gen_enc_choice_tag({C1,C2,C3},_,_) ->
+    N1 = get_name_list(C1),
+    N2 = get_name_list(C2),
+    N3 = get_name_list(C3),
+    Root = N1 ++ N3,
+    emit(["?RT_PER:set_choice(element(1,Val),",
+	  {asis,{Root,N2}},", ",{asis,{length(Root),length(N2)}},")"]);
 gen_enc_choice_tag(C,_,_) ->
     N = get_name_list(C),
     emit(["?RT_PER:set_choice(element(1,Val),",
@@ -1208,6 +1319,8 @@ get_name_list([], Acc) ->
 
 gen_enc_choice2(Erule,TopType, {L1,L2}, Ext) ->
     gen_enc_choice2(Erule,TopType, L1 ++ L2, 0, Ext);
+gen_enc_choice2(Erule,TopType, {L1,L2,L3}, Ext) ->
+    gen_enc_choice2(Erule,TopType, L1 ++ L3 ++ L2, 0, Ext);
 gen_enc_choice2(Erule,TopType, L, Ext) ->
     gen_enc_choice2(Erule,TopType, L, 0, Ext).
 
@@ -1279,6 +1392,9 @@ gen_dec_choice1(Erule,TopType,CompList,noext) ->
 gen_dec_choice1(Erule,TopType,{RootList,ExtList},Ext) ->
     NewList = RootList ++ ExtList,
     gen_dec_choice1(Erule,TopType, NewList, Ext);
+gen_dec_choice1(Erule,TopType,{RootList,ExtList,RootList2},Ext) ->
+    NewList = RootList ++ RootList2 ++ ExtList,
+    gen_dec_choice1(Erule,TopType, NewList, Ext);
 gen_dec_choice1(Erule,TopType,CompList,{ext,ExtPos,ExtNum}) ->
     emit({"{Choice,",{curr,bytes},
 	  "} = ?RT_PER:getchoice(",{prev,bytes},",",
@@ -1347,6 +1463,18 @@ gen_encode_prim_wrapper(CtgenMod,Erule,Cont,DoTag,Value) ->
     CtgenMod:gen_encode_prim(Erule,Cont,DoTag,Value).
 %    erase(component_type).
 
+make_elements(I,Val,ExtCnames) ->
+    make_elements(I,Val,ExtCnames,[]).
+
+make_elements(I,Val,[ExtCname],Acc)-> % the last one, no comma needed
+    Element = make_element(I,Val,ExtCname),
+    make_elements(I+1,Val,[],[Element|Acc]);
+make_elements(I,Val,[ExtCname|Rest],Acc)->
+    Element = make_element(I,Val,ExtCname),
+    make_elements(I+1,Val,Rest,[", ",Element|Acc]);
+make_elements(_I,_,[],Acc) ->
+    lists:reverse(Acc).
+
 make_element(I,Val,Cname) ->
     case tuple_notation_allowed() of
 	true ->
@@ -1355,6 +1483,55 @@ make_element(I,Val,Cname) ->
 	    io_lib:format("element(~w,~s)",[I,Val])
     end.
 
+emit_extaddgroupTerms(VarSeries,[_]) ->
+    asn1ct_name:new(VarSeries),
+    emit({curr,VarSeries}),
+    ok;
+emit_extaddgroupTerms(VarSeries,[_|Rest]) ->
+    asn1ct_name:new(VarSeries),
+    emit({{curr,VarSeries},","}),
+    emit_extaddgroupTerms(VarSeries,Rest);
+emit_extaddgroupTerms(_,[]) ->
+    ok.
+wrap_compList({Root1,Ext,Root2}) ->
+    {Root1,wrap_extensionAdditionGroups(Ext),Root2};
+wrap_compList({Root1,Ext}) ->
+    {Root1,wrap_extensionAdditionGroups(Ext)};
+wrap_compList(CompList) ->
+    CompList.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%  Will convert all componentTypes following 'ExtensionAdditionGroup'
+%%  up to the matching 'ExtensionAdditionGroupEnd' into one componentType
+%% of type SEQUENCE with the componentTypes as components
+%%
+wrap_extensionAdditionGroups(ExtCompList) ->
+    wrap_extensionAdditionGroups(ExtCompList,[],0).
+
+wrap_extensionAdditionGroups([{'ExtensionAdditionGroup',_Number}|Rest],Acc,0) ->
+    {ExtGroupCompList=
+     [#'ComponentType'{textual_order=TextPos}|_],
+     ['ExtensionAdditionGroupEnd'|Rest2]} =
+	lists:splitwith(fun(#'ComponentType'{}) -> true;
+			   (_) -> false
+			end,
+			Rest),
+    wrap_extensionAdditionGroups(Rest2,
+				 [#'ComponentType'{
+                                  name='ExtAddGroup', % FIXME: handles ony one ExtAddGroup
+                                  typespec=#type{def=#'SEQUENCE'{
+						   extaddgroup=1,% FIXME: handles only one
+						   components=ExtGroupCompList}},
+                                  textual_order = TextPos,
+				  prop='OPTIONAL'}|Acc],length(ExtGroupCompList)-1);
+wrap_extensionAdditionGroups([H=#'ComponentType'{textual_order=Tord}|T],Acc,ExtAddGroupDiff) when is_integer(Tord) ->
+    wrap_extensionAdditionGroups(T,[H#'ComponentType'{
+				      textual_order=Tord - ExtAddGroupDiff}|Acc],ExtAddGroupDiff);
+wrap_extensionAdditionGroups([H|T],Acc,ExtAddGroupDiff) ->
+    wrap_extensionAdditionGroups(T,[H|Acc],ExtAddGroupDiff);
+wrap_extensionAdditionGroups([],Acc,_) ->
+    lists:reverse(Acc).
+
+
 tuple_notation_allowed() ->
     Options = get(encoding_options),
     not (lists:member(optimize,Options) orelse lists:member(uper_bin,Options)).
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index eab5fb4a2a..0844c38353 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -87,7 +87,7 @@ pgen_module(OutFile,Erules,Module,
 % gen_vars(asn1_db:mod_to_vars(Module)),
 % gen_tag_table(AllTypes),
     file:close(Fid),
-    asn1ct:report_verbose("--~p--~n",[{generated,ErlFile}],Options).
+    asn1ct:verbose("--~p--~n",[{generated,ErlFile}],Options).
 
 
 pgen_typeorval(Erules,Module,N2nConvEnums,{Types,Values,_Ptypes,_Classes,Objects,ObjectSets}) ->
@@ -536,14 +536,19 @@ gen_part_decode_funcs({primitive,bif},_TypeName,
 gen_part_decode_funcs(WhatKind,_TypeName,{_,Directive,_,_}) ->
     throw({error,{asn1,{"Not implemented yet",WhatKind," partial incomplete directive:",Directive}}}).
 
+
 gen_types(Erules,Tname,{RootL1,ExtList,RootL2}) 
   when is_list(RootL1), is_list(RootL2) ->
     gen_types(Erules,Tname,RootL1),
-    gen_types(Erules,Tname,ExtList),
+    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
+				       rt2ct_suffix(Erules)])),
+    gen_types(Erules,Tname,Rtmod:extaddgroup2sequence(ExtList)),
     gen_types(Erules,Tname,RootL2);
 gen_types(Erules,Tname,{RootList,ExtList}) when is_list(RootList) ->
     gen_types(Erules,Tname,RootList),
-    gen_types(Erules,Tname,ExtList);
+    Rtmod = list_to_atom(lists:concat(["asn1ct_gen_",erule(Erules),
+				       rt2ct_suffix(Erules)])),
+    gen_types(Erules,Tname,Rtmod:extaddgroup2sequence(ExtList));
 gen_types(Erules,Tname,[{'EXTENSIONMARK',_,_}|Rest]) ->
     gen_types(Erules,Tname,Rest);
 gen_types(Erules,Tname,[ComponentType|Rest]) ->
@@ -1335,9 +1340,9 @@ pgen_hrl(Erules,Module,TypeOrVal,Options,_Indent) ->
 	Y ->
 	    Fid = get(gen_file_out),
 	    file:close(Fid),
-	    asn1ct:report_verbose("--~p--~n",
-		      [{generated,lists:concat([get(outfile),".hrl"])}],
-		      Options),
+	    asn1ct:verbose("--~p--~n",
+			   [{generated,lists:concat([get(outfile),".hrl"])}],
+			   Options),
 	    Y
     end.
 
@@ -1543,19 +1548,18 @@ gen_record2(Name,SeqOrSet,Comps) ->
 
 gen_record2(_Name,_SeqOrSet,[],_Com,_Extension) ->
     true;
-gen_record2(Name,SeqOrSet,[{'EXTENSIONMARK',_,_}|T],Com,Extension) ->
-    gen_record2(Name,SeqOrSet,T,Com,Extension);
-gen_record2(_Name,_SeqOrSet,[H],Com,Extension) ->
-    #'ComponentType'{name=Cname} = H,
+gen_record2(_Name,_SeqOrSet,[H = #'ComponentType'{name=Cname}],Com,Extension) ->
     emit(Com),
     emit({asis,Cname}),
     gen_record_default(H, Extension);
-gen_record2(Name,SeqOrSet,[H|T],Com, Extension) ->
-    #'ComponentType'{name=Cname} = H,
+gen_record2(Name,SeqOrSet,[H = #'ComponentType'{name=Cname}|T],Com, Extension) ->
     emit(Com),
     emit({asis,Cname}),
     gen_record_default(H, Extension),
-    gen_record2(Name,SeqOrSet,T,", ", Extension).
+    gen_record2(Name,SeqOrSet,T,", ", Extension);
+gen_record2(Name,SeqOrSet,[_|T],Com,Extension) ->
+    %% skip EXTENSIONMARK, ExtensionAdditionGroup and other markers
+    gen_record2(Name,SeqOrSet,T,Com,Extension).
 
 gen_record_default(#'ComponentType'{prop='OPTIONAL'}, _)->
     emit(" = asn1_NOVALUE"); 
diff --git a/lib/asn1/src/asn1ct_gen_ber.erl b/lib/asn1/src/asn1ct_gen_ber.erl
index d70586c75c..491ebcb8fd 100644
--- a/lib/asn1/src/asn1ct_gen_ber.erl
+++ b/lib/asn1/src/asn1ct_gen_ber.erl
@@ -33,6 +33,7 @@
 -export([gen_objectset_code/2, gen_obj_code/3]).
 -export([re_wrap_erule/1]).
 -export([unused_var/2]).
+-export([extaddgroup2sequence/1]).
 
 -import(asn1ct_gen, [emit/1,demit/1]).
 
@@ -1734,3 +1735,15 @@ get_object_field(Name,ObjectFields) ->
 	{value,Field} -> Field;
 	false -> false
     end.
+
+%% For BER the ExtensionAdditionGroup notation has no impact on the encoding/decoding
+%% and therefore we only filter away the ExtensionAdditionGroup start and end markers
+%%
+extaddgroup2sequence(ExtList) when is_list(ExtList) ->
+    lists:filter(fun(#'ExtensionAdditionGroup'{}) ->
+			 false;
+		    ('ExtensionAdditionGroupEnd') ->
+			 false;
+		    (_) ->
+			 true
+		 end, ExtList).
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
index a146e92d64..9ec458e351 100644
--- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -33,6 +33,7 @@
 -export([gen_objectset_code/2, gen_obj_code/3]).
 -export([encode_tag_val/3]).
 -export([gen_inc_decode/2,gen_decode_selected/3]).
+-export([extaddgroup2sequence/1]).
 
 -import(asn1ct_gen, [emit/1,demit/1]).
 
@@ -1826,8 +1827,15 @@ mk_object_val(Val, Ack, Len) ->
 add_func(F={_Func,_Arity}) ->
     ets:insert(asn1_functab,{F}).
 
-
-
-
+%% For BER the ExtensionAdditionGroup notation has no impact on the encoding/decoding
+%% and therefore we only filter away the ExtensionAdditionGroup start and end markers
+extaddgroup2sequence(ExtList) when is_list(ExtList) ->
+    lists:filter(fun(#'ExtensionAdditionGroup'{}) ->
+			 false;
+		    ('ExtensionAdditionGroupEnd') ->
+			 false;
+		    (_) ->
+			 true
+		 end, ExtList).
 
 
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 23fb392d60..8313cf1b60 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -31,6 +31,7 @@
 -export([gen_encode/2, gen_encode/3]).
 -export([is_already_generated/2,more_genfields/1,get_class_fields/1,
 	 get_object_field/2]).
+-export([extaddgroup2sequence/1]).
 
 -import(asn1ct_gen, [emit/1,demit/1]).
 
@@ -1393,3 +1394,25 @@ get_object_field(Name,ObjectFields) ->
 	false -> false
     end.
 
+
+%% For PER the ExtensionAdditionGroup notation has significance for the encoding and decoding
+%% the components within the ExtensionAdditionGroup is treated in a similar way as if they
+%% have been specified within a SEQUENCE, therefore we construct a fake sequence type here
+%% so that we can generate code for it
+extaddgroup2sequence(ExtList) ->
+    extaddgroup2sequence(ExtList,[]).
+
+extaddgroup2sequence([{'ExtensionAdditionGroup',Number0}|T],Acc) ->
+    Number = case Number0 of undefined -> 1; _ -> Number0 end,
+    {ExtGroupComps,['ExtensionAdditionGroupEnd'|T2]} =
+     lists:splitwith(fun(Elem) -> is_record(Elem,'ComponentType') end,T),
+    extaddgroup2sequence(T2,[#'ComponentType'{
+                                  name='ExtAddGroup',
+                                  typespec=#type{def=#'SEQUENCE'{
+						   extaddgroup=Number,
+						   components=ExtGroupComps}},
+				  prop='OPTIONAL'}|Acc]);
+extaddgroup2sequence([C|T],Acc) ->
+    extaddgroup2sequence(T,[C|Acc]);
+extaddgroup2sequence([],Acc) ->
+    lists:reverse(Acc).
diff --git a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
index e1feb42a59..4f4fcfafc3 100644
--- a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
+++ b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
@@ -29,6 +29,7 @@
 -export([gen_obj_code/3,gen_objectset_code/2]).
 -export([gen_decode/2, gen_decode/3]).
 -export([gen_encode/2, gen_encode/3]).
+-export([extaddgroup2sequence/1]).
 
 -import(asn1ct_gen, [emit/1,demit/1]).
 -import(asn1ct_gen_per, [is_already_generated/2,more_genfields/1,
@@ -1796,3 +1797,25 @@ dec_enumerated_cases([Name|Rest],Tmpremain,No) ->
 	dec_enumerated_cases(Rest,Tmpremain,No+1);
 dec_enumerated_cases([],_,_) ->
     "".
+
+%% For PER the ExtensionAdditionGroup notation has significance for the encoding and decoding
+%% the components within the ExtensionAdditionGroup is treated in a similar way as if they
+%% have been specified within a SEQUENCE, therefore we construct a fake sequence type here
+%% so that we can generate code for it
+extaddgroup2sequence(ExtList) ->
+    extaddgroup2sequence(ExtList,[]).
+
+extaddgroup2sequence([{'ExtensionAdditionGroup',Number0}|T],Acc) ->
+    Number = case Number0 of undefined -> 1; _ -> Number0 end,
+    {ExtGroupComps,['ExtensionAdditionGroupEnd'|T2]} =
+     lists:splitwith(fun(Elem) -> is_record(Elem,'ComponentType') end,T),
+    extaddgroup2sequence(T2,[#'ComponentType'{
+                                  name='ExtAddGroup',
+                                  typespec=#type{def=#'SEQUENCE'{
+						   extaddgroup=Number,
+						   components=ExtGroupComps}},
+				  prop='OPTIONAL'}|Acc]);
+extaddgroup2sequence([C|T],Acc) ->
+    extaddgroup2sequence(T,[C|Acc]);
+extaddgroup2sequence([],Acc) ->
+    lists:reverse(Acc).
diff --git a/lib/asn1/src/asn1ct_parser2.erl b/lib/asn1/src/asn1ct_parser2.erl
index 46d7ad6fdb..224a535e87 100644
--- a/lib/asn1/src/asn1ct_parser2.erl
+++ b/lib/asn1/src/asn1ct_parser2.erl
@@ -417,10 +417,22 @@ parse_BuiltinType([{'CHARACTER',_},{'STRING',_}|Rest]) ->
     {#type{def='CHARACTER STRING'},Rest};
 
 parse_BuiltinType([{'CHOICE',_},{'{',_}|Rest]) ->
-    {AlternativeTypeLists,Rest2} = parse_AlternativeTypeLists(Rest,get(extensiondefault)),
+    {AlternativeTypeLists,Rest2} = parse_AlternativeTypeLists(Rest),
+    AlternativeTypeLists1 =
+	lists:filter(fun(#'ExtensionAdditionGroup'{}) -> false;
+			('ExtensionAdditionGroupEnd') -> false;
+			(_) -> true
+		     end,AlternativeTypeLists),
     case Rest2 of
 	[{'}',_}|Rest3] ->
-	    {#type{def={'CHOICE',AlternativeTypeLists}},Rest3};
+	    AlternativeTypeLists2 =
+		case {[Ext||Ext = #'EXTENSIONMARK'{} <- AlternativeTypeLists1],
+		      get(extensiondefault)} of
+		    {[],'IMPLIED'} ->  AlternativeTypeLists1 ++ [#'EXTENSIONMARK'{}];
+		    _ -> AlternativeTypeLists1
+		end,
+
+	    {#type{def={'CHOICE',AlternativeTypeLists2}},Rest3};
 	_  ->
 	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
 			       [got,get_token(hd(Rest2)),expected,'}']}})
@@ -479,16 +491,19 @@ parse_BuiltinType([{'REAL',_}|Rest]) ->
     {#type{def='REAL'},Rest};
 parse_BuiltinType([{'RELATIVE-OID',_}|Rest]) ->
     {#type{def='RELATIVE-OID'},Rest};
-parse_BuiltinType([{'SEQUENCE',_},{'{',_},{'...',Line},{'}',_}|Rest]) ->
-    {#type{def=#'SEQUENCE'{components=[{'EXTENSIONMARK',Line,undefined}]}},
+parse_BuiltinType([{'SEQUENCE',_},{'{',_},{'}',_}|Rest]) ->
+    {#type{def=#'SEQUENCE'{components=[]}},
      Rest};
+parse_BuiltinType([{'SEQUENCE',_},{'{',_},{'...',Line},{'}',_}|Rest]) ->
+    {#type{def=#'SEQUENCE'{components=[#'EXTENSIONMARK'{pos = Line}]}},Rest};
 parse_BuiltinType([{'SEQUENCE',_},{'{',_},{'...',Line},{'!',_}|Rest]) ->
     {ExceptionIdentification,Rest2} = parse_ExceptionIdentification(Rest),
     case Rest2 of
 	[{'}',_}|Rest3] ->
-	    {#type{def=#'SEQUENCE'{components=[{'EXTENSIONMARK',
-						Line,
-						ExceptionIdentification}]}},
+	    {#type{def=#'SEQUENCE'{
+		     components=[#'EXTENSIONMARK'{
+				    pos = Line,
+				    val = ExceptionIdentification}]}},
 	     Rest3};
 	_ ->
 	    {ComponentTypeLists,Rest3}=
@@ -537,13 +552,14 @@ parse_BuiltinType([{'SEQUENCE',_},{'OF',_}|Rest]) ->
 
 
 parse_BuiltinType([{'SET',_},{'{',_},{'...',Line},{'}',_}|Rest]) ->
-    {#type{def=#'SET'{components=[{'EXTENSIONMARK',Line,undefined}]}},Rest};
+    {#type{def=#'SET'{components=[#'EXTENSIONMARK'{pos = Line}]}},Rest};
 parse_BuiltinType([{'SET',_},{'{',_},{'...',Line},{'!',_}|Rest]) ->
     {ExceptionIdentification,Rest2} = parse_ExceptionIdentification(Rest),
     case Rest2 of
 	[{'}',_}|Rest3] ->
 	    {#type{def=#'SET'{components=
-			      [{'EXTENSIONMARK',Line,ExceptionIdentification}]}},
+			      [#'EXTENSIONMARK'{pos = Line,
+						val = ExceptionIdentification}]}},
 	     Rest3};
 	_ ->
 	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
@@ -2323,101 +2339,197 @@ to_set(V) when is_list(V) ->
 to_set(V) ->
 	ordsets:from_list([V]).
 
+parse_AlternativeTypeLists(Tokens) ->
+    parse_AlternativeTypeLists(Tokens,[]).
 
-parse_AlternativeTypeLists(Tokens,ExtensionDefault) ->
-    {AltTypeList,Rest1} = parse_AlternativeTypeList(Tokens),
-    {ExtensionAndException,Rest2} = 
-	case Rest1 of
-	    [{',',_},{'...',L1},{'!',_}|Rest12] ->
-		{_,Rest13} = parse_ExceptionIdentification(Rest12),
-		%% Exception info is currently thrown away
-		{[#'EXTENSIONMARK'{pos=L1}],Rest13};
-	    [{',',_},{'...',L1}|Rest12] ->
-		{[#'EXTENSIONMARK'{pos=L1}],Rest12};
-	    _ ->
-		{[],Rest1}
-	end,
-    {AltTypeList2,Rest5} =
-	case ExtensionAndException of
-	    [] ->
-		{AltTypeList,Rest2};
-	    _ ->
-		{ExtensionAddition,Rest3} =
-		    case Rest2 of
-			[{',',_}|Rest23] ->
-			    parse_ExtensionAdditionAlternativeList(Rest23);
-			_ ->
-			    {[],Rest2}
-		    end,
-		{OptionalExtensionMarker,Rest4} =
-		    case Rest3 of
-			[{',',_},{'...',L3}|Rest31] ->
-			    {[#'EXTENSIONMARK'{pos=L3}],Rest31};
-			_ ->
-			    {[],Rest3}
-		    end,
-		{AltTypeList ++ ExtensionAndException ++
-		 ExtensionAddition ++ OptionalExtensionMarker, Rest4}
-	end,
-    AltTypeList3 =
-	case [X || X=#'EXTENSIONMARK'{} <- AltTypeList2] of
-	    [] when ExtensionDefault == 'IMPLIED' ->
-		AltTypeList2 ++ [#'EXTENSIONMARK'{}];
-	    _ ->
-		AltTypeList2
-	end,
-    {AltTypeList3,Rest5}.
-    
+parse_AlternativeTypeLists(Tokens = [{identifier,_,_}|_Rest0],Clist) ->
+    {CompList,Rest1} = parse_AlternativeTypeList(Tokens,[]),
+    parse_AlternativeTypeLists(Rest1,Clist++CompList);
+parse_AlternativeTypeLists([{'...',L1},{'!',_}|Rest02],Clist0) ->
+    {_,Rest03} = parse_ExceptionIdentification(Rest02),
+    %% Exception info is currently thrown away
+    parse_AlternativeTypeLists2(Rest03,Clist0++[#'EXTENSIONMARK'{pos=L1}]);
+parse_AlternativeTypeLists([{',',L1},{'...',_},{'!',_}|Rest02],Clist0) when Clist0 =/= []->
+    {_,Rest03} = parse_ExceptionIdentification(Rest02),
+    %% Exception info is currently thrown away
+    parse_AlternativeTypeLists2(Rest03,Clist0++[#'EXTENSIONMARK'{pos=L1}]);
+
+parse_AlternativeTypeLists([{',',_},{'...',L1}|Rest02],Clist0) when Clist0 =/= []->
+    parse_AlternativeTypeLists2(Rest02,Clist0++[#'EXTENSIONMARK'{pos=L1}]);
+parse_AlternativeTypeLists([{'...',L1}|Rest02],Clist0) ->
+    parse_AlternativeTypeLists2(Rest02,Clist0++[#'EXTENSIONMARK'{pos=L1}]);
+parse_AlternativeTypeLists(Tokens = [{'}',_L1}|_Rest02],Clist0) ->
+    {Clist0,Tokens}.
+
+parse_AlternativeTypeLists2(Tokens,Clist) ->
+    {ExtAdd,Rest} = parse_ExtensionAdditionAlternatives(Tokens,Clist),
+    {Clist2,Rest2} = parse_OptionalExtensionMarker(Rest,lists:flatten(ExtAdd)),
+    case Rest2 of
+	[{',',_}|Rest3] ->
+	    {CompList,Rest4} = parse_AlternativeTypeList(Rest3,[]),
+	    {Clist2 ++ CompList,Rest4};
+	_ ->
+	    {Clist2,Rest2}
+    end.
 
-parse_AlternativeTypeList(Tokens) ->
-    parse_AlternativeTypeList(Tokens,[]).
 
-parse_AlternativeTypeList(Tokens,Acc) ->
-    {NamedType,Rest} = parse_NamedType(Tokens),
+
+parse_AlternativeTypeList([{',',_},Id = {identifier,_,_}|Rest],Acc) when Acc =/= [] ->
+    {AlternativeType,Rest2} = parse_NamedType([Id|Rest]),
+    parse_AlternativeTypeList(Rest2,[AlternativeType|Acc]);
+parse_AlternativeTypeList(Tokens = [{'}',_}|_],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_AlternativeTypeList(Tokens = [{']',_},{']',_}|_],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_AlternativeTypeList(Tokens = [{',',_},{'...',_}|_],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_AlternativeTypeList(Tokens,[]) ->
+    {AlternativeType,Rest} = parse_NamedType(Tokens),
+    parse_AlternativeTypeList(Rest,[AlternativeType]);
+parse_AlternativeTypeList(Tokens,_) ->
+    throw({asn1_error,
+	   {get_line(hd(Tokens)),get(asn1_module),
+	    [got,[get_token(hd(Tokens)),get_token(hd(tl(Tokens)))],
+	     expected,['}',', identifier']]}}).
+
+parse_ExtensionAdditionAlternatives(Tokens =[{',',_}|_],Clist) ->
+    {ExtAddList,Rest2} = parse_ExtensionAdditionAlternativesList(Tokens,[]),
+    {Clist++lists:flatten(ExtAddList),Rest2};
+parse_ExtensionAdditionAlternatives(Tokens,Clist) ->
+    %% Empty
+    {Clist,Tokens}.
+
+parse_ExtensionAdditionAlternativesList([{',',_},Id = {identifier,_,_}|Rest],Acc) ->
+    {AlternativeType,Rest2} = parse_NamedType([Id|Rest]),
+    parse_ExtensionAdditionAlternativesList(Rest2,[AlternativeType|Acc]);
+parse_ExtensionAdditionAlternativesList([{',',_},C1 = {'[',_},C2 = {'[',_}|Rest],Acc) ->
+    {ExtAddGroup,Rest2} = parse_ExtensionAdditionAlternativesGroup([C1,C2|Rest],[]),
+    parse_ExtensionAdditionAlternativesList(Rest2,[ExtAddGroup|Acc]);
+parse_ExtensionAdditionAlternativesList(Tokens = [{'}',_}|_],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_ExtensionAdditionAlternativesList(Tokens = [{',',_},{'...',_}|_],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_ExtensionAdditionAlternativesList(Tokens,_) ->
+    throw({asn1_error,
+	   {get_line(hd(Tokens)),get(asn1_module),
+	    [got,[get_token(hd(Tokens)),get_token(hd(tl(Tokens)))],
+	     expected,['}',', identifier']]}}).
+
+
+parse_ExtensionAdditionAlternativesGroup([ {'[',_},{'[',_},_VsnNr = {number,_,Num},{':',_}|Rest],[]) ->
+    parse_ExtensionAdditionAlternativesGroup2(Rest,Num);
+parse_ExtensionAdditionAlternativesGroup([ {'[',_},{'[',_}|Rest],[]) ->
+    parse_ExtensionAdditionAlternativesGroup2(Rest,undefined);
+parse_ExtensionAdditionAlternativesGroup(Tokens,_) ->
+    throw({asn1_error,
+	   {get_line(hd(Tokens)),get(asn1_module),
+	    [got,[get_token(hd(Tokens)),get_token(hd(tl(Tokens)))],
+	     expected,['[[']]}}).
+
+
+parse_ExtensionAdditionAlternativesGroup2(Tokens,Num) ->
+    {CompTypeList,Rest} = parse_AlternativeTypeList(Tokens,[]),
     case Rest of
-	[{',',_},Id = {identifier,_,_}|Rest2] ->
-	    parse_AlternativeTypeList([Id|Rest2],[NamedType|Acc]);
+	[{']',_},{']',_}|Rest2] ->
+	    {[{'ExtensionAdditionGroup',Num}|CompTypeList] ++
+		['ExtensionAdditionGroupEnd'],Rest2};
 	_ ->
-	    {lists:reverse([NamedType|Acc]),Rest}
-    end.
-
+	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
+			       [got,get_token(hd(Rest)),expected,[']]']]}})
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% parse_AlternativeTypeLists(Tokens,ExtensionDefault) ->
+%%     {AltTypeList,Rest1} = parse_AlternativeTypeList(Tokens),
+%%     {ExtensionAndException,Rest2} =
+%% 	case Rest1 of
+%% 	    [{',',_},{'...',L1},{'!',_}|Rest12] ->
+%% 		{_,Rest13} = parse_ExceptionIdentification(Rest12),
+%% 		%% Exception info is currently thrown away
+%% 		{[#'EXTENSIONMARK'{pos=L1}],Rest13};
+%% 	    [{',',_},{'...',L1}|Rest12] ->
+%% 		{[#'EXTENSIONMARK'{pos=L1}],Rest12};
+%% 	    _ ->
+%% 		{[],Rest1}
+%% 	end,
+%%     {AltTypeList2,Rest5} =
+%% 	case ExtensionAndException of
+%% 	    [] ->
+%% 		{AltTypeList,Rest2};
+%% 	    _ ->
+%% 		{ExtensionAddition,Rest3} =
+%% 		    case Rest2 of
+%% 			[{',',_}|Rest23] ->
+%% 			    parse_ExtensionAdditionAlternativeList(Rest23);
+%% 			_ ->
+%% 			    {[],Rest2}
+%% 		    end,
+%% 		{OptionalExtensionMarker,Rest4} =
+%% 		    case Rest3 of
+%% 			[{',',_},{'...',L3}|Rest31] ->
+%% 			    {[#'EXTENSIONMARK'{pos=L3}],Rest31};
+%% 			_ ->
+%% 			    {[],Rest3}
+%% 		    end,
+%% 		{AltTypeList ++ ExtensionAndException ++
+%% 		 ExtensionAddition ++ OptionalExtensionMarker, Rest4}
+%% 	end,
+%%     AltTypeList3 =
+%% 	case [X || X=#'EXTENSIONMARK'{} <- AltTypeList2] of
+%% 	    [] when ExtensionDefault == 'IMPLIED' ->
+%% 		AltTypeList2 ++ [#'EXTENSIONMARK'{}];
+%% 	    _ ->
+%% 		AltTypeList2
+%% 	end,
+%%     {AltTypeList3,Rest5}.
     
 
-parse_ExtensionAdditionAlternativeList(Tokens) ->
-    parse_ExtensionAdditionAlternativeList(Tokens,[]).
+%% parse_AlternativeTypeList(Tokens) ->
+%%     parse_AlternativeTypeList(Tokens,[]).
+
+%% parse_AlternativeTypeList(Tokens,Acc) ->
+%%     {NamedType,Rest} = parse_NamedType(Tokens),
+%%     case Rest of
+%% 	[{',',_},Id = {identifier,_,_}|Rest2] ->
+%% 	    parse_AlternativeTypeList([Id|Rest2],[NamedType|Acc]);
+%% 	_ ->
+%% 	    {lists:reverse([NamedType|Acc]),Rest}
+%%     end.
+
     
-parse_ExtensionAdditionAlternativeList(Tokens,Acc) ->
-    {Element,Rest0} =
-	case Tokens of
-	    [{identifier,_,_}|_Rest] ->
-		parse_NamedType(Tokens);
-	    [{'[',_},{'[',_}|_] ->
-		parse_ExtensionAdditionAlternatives(Tokens)
-	end,
-    case Rest0 of
-	[{',',_}|Rest01] ->
-	    parse_ExtensionAdditionAlternativeList(Rest01,[Element|Acc]);
-	_  ->
-	    {lists:reverse([Element|Acc]),Rest0}
-    end.
 
-parse_ExtensionAdditionAlternatives([{'[',_},{'[',_}|Rest]) ->
-    parse_ExtensionAdditionAlternatives(Rest,[]);
-parse_ExtensionAdditionAlternatives(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'[[']}}).
+%% parse_ExtensionAdditionAlternativeList(Tokens) ->
+%%     parse_ExtensionAdditionAlternativeList(Tokens,[]).
+
+%% parse_ExtensionAdditionAlternativeList([{'[[',_}|Rest],Acc) ->
+%%     parse_ExtensionAdditionAlternativeList(Rest,Acc);
+%% parse_ExtensionAdditionAlternativeList(Tokens = [{identifier,_,_}|_Rest],Acc) ->
+%%     {Element,Rest0} = parse_NamedType(Tokens);
+%%     case Rest0 of
+%% 	[{',',_}|Rest01] ->
+%% 	    parse_ExtensionAdditionAlternativeList(Rest01,[Element|Acc]);
+%% 	_  ->
+%% 	    {lists:reverse([Element|Acc]),Rest0}
+%%     end.
 
-parse_ExtensionAdditionAlternatives([Id = {identifier,_,_}|Rest],Acc) ->
-    {NamedType, Rest2} = parse_NamedType([Id|Rest]),
-    case Rest2 of
-	[{',',_}|Rest21] ->
-	    parse_ExtensionAdditionAlternatives(Rest21,[NamedType|Acc]);
-	[{']',_},{']',_}|Rest21] ->
-	    {lists:reverse(Acc),Rest21};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,[',',']]']]}})
-    end.
+%% parse_ExtensionAdditionAlternatives([{'[[',_}|Rest]) ->
+%%     parse_ExtensionAdditionAlternatives(Rest,[]);
+%% parse_ExtensionAdditionAlternatives(Tokens) ->
+%%     throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
+%% 		       [got,get_token(hd(Tokens)),expected,'[[']}}).
+
+%% parse_ExtensionAdditionAlternatives([Id = {identifier,_,_}|Rest],Acc) ->
+%%     {NamedType, Rest2} = parse_NamedType([Id|Rest]),
+%%     case Rest2 of
+%% 	[{',',_}|Rest21] ->
+%% 	    parse_ExtensionAdditionAlternatives(Rest21,[NamedType|Acc]);
+%% 	[{']]',_}|Rest21] ->
+%% 	    {lists:reverse(Acc),Rest21};
+%% 	_ ->
+%% 	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
+%% 			       [got,get_token(hd(Rest2)),expected,[',',']]']]}})
+%%     end.
 
 parse_NamedType([{identifier,L1,Idname}|Rest]) ->
     {Type,Rest2} = parse_Type(Rest),
@@ -2428,144 +2540,123 @@ parse_NamedType(Tokens) ->
 
 
 parse_ComponentTypeLists(Tokens) ->
-%    Resulting tuple {ComponentTypeList,Rest1} is returned
-    case Tokens of 
-	[{identifier,_,_}|_Rest0] ->
-	    {Clist,Rest01} = parse_ComponentTypeList(Tokens),
-	    case Rest01 of
-		[{',',_}|Rest02] -> 
-		    parse_ComponentTypeLists(Rest02,Clist); % 5 - 13
-		_ ->
-		    {Clist,Rest01}
-	    end;
-	[{'COMPONENTS',_},{'OF',_}|_Rest] ->
-	    {Clist,Rest01} = parse_ComponentTypeList(Tokens),
-	    case Rest01 of
-		[{',',_}|Rest02] -> 
-		    parse_ComponentTypeLists(Rest02,Clist);
-		_ ->
-		    {Clist,Rest01}
-	    end;
+    parse_ComponentTypeLists(Tokens,[]).
+
+parse_ComponentTypeLists(Tokens = [{identifier,_,_}|_Rest0],Clist) ->
+    {CompList,Rest1} = parse_ComponentTypeList(Tokens,[]),
+    parse_ComponentTypeLists(Rest1,Clist++CompList);
+parse_ComponentTypeLists(Tokens = [{'COMPONENTS',_},{'OF',_}|_Rest],Clist) ->
+    {CompList,Rest1} = parse_ComponentTypeList(Tokens,[]),
+    parse_ComponentTypeLists(Rest1,Clist++CompList);
+parse_ComponentTypeLists([{'...',L1},{'!',_}|Rest02],Clist0) ->
+    {_,Rest03} = parse_ExceptionIdentification(Rest02),
+    %% Exception info is currently thrown away
+    parse_ComponentTypeLists2(Rest03,Clist0++[#'EXTENSIONMARK'{pos=L1}]);
+parse_ComponentTypeLists([{',',L1},{'...',_},{'!',_}|Rest02],Clist0) when Clist0 =/= []->
+    {_,Rest03} = parse_ExceptionIdentification(Rest02),
+    %% Exception info is currently thrown away
+    parse_ComponentTypeLists2(Rest03,Clist0++[#'EXTENSIONMARK'{pos=L1}]);
+
+ parse_ComponentTypeLists([{',',_},{'...',L1}|Rest02],Clist0) when Clist0 =/= []->
+    parse_ComponentTypeLists2(Rest02,Clist0++[#'EXTENSIONMARK'{pos=L1}]);
+parse_ComponentTypeLists([{'...',L1}|Rest02],Clist0) ->
+    parse_ComponentTypeLists2(Rest02,Clist0++[#'EXTENSIONMARK'{pos=L1}]);
+parse_ComponentTypeLists(Tokens = [{'}',_L1}|_Rest02],Clist0) ->
+    {Clist0,Tokens}.
+
+parse_ComponentTypeLists2(Tokens,Clist) ->
+    {ExtAdd,Rest} = parse_ExtensionAdditions(Tokens,Clist),
+    {Clist2,Rest2} = parse_OptionalExtensionMarker(Rest,lists:flatten(ExtAdd)),
+    case Rest2 of
+	[{',',_}|Rest3] ->
+	    {CompList,Rest4} = parse_ComponentTypeList(Rest3,[]),
+	    {Clist2 ++ CompList,Rest4};
 	_ ->
-	    parse_ComponentTypeLists(Tokens,[])
+	    {Clist2,Rest2}
     end.
 
-parse_ComponentTypeLists([{'...',L1},{'!',_}|Rest],Clist1) ->
-    {_,Rest2} = parse_ExceptionIdentification(Rest),
-    %% Exception info is currently thrown away
-    parse_ComponentTypeLists2(Rest2,Clist1++[#'EXTENSIONMARK'{pos=L1}]);
-parse_ComponentTypeLists([{'...',L1}|Rest],Clist1) -> %% first Extensionmark
-    parse_ComponentTypeLists2(Rest,Clist1++[#'EXTENSIONMARK'{pos=L1}]);
-parse_ComponentTypeLists(Tokens,Clist1) ->
-    {Clist1,Tokens}.
-
-
-parse_ComponentTypeLists2(Tokens,Clist1) ->
-    {ExtensionAddition,Rest2} = 
-	case Tokens of
-	    [{',',_}|Rest1] ->
-		parse_ExtensionAdditionList(Rest1);
-	    _ ->
-		{[],Tokens}
-	end,
-    {OptionalExtensionMarker,Rest3} =
-	case Rest2 of
-	    [{',',_},{'...',L2}|Rest21] ->
-		{[#'EXTENSIONMARK'{pos=L2}],Rest21};
-	    _ ->
-		{[],Rest2}
-	end,
-    {RootComponentTypeList,Rest4} =
-	case Rest3 of
-	    [{',',_}|Rest31] ->
-		parse_ComponentTypeList(Rest31);
-	    _ ->
-		{[],Rest3}
-	end,
-    {Clist1 ++ ExtensionAddition ++ OptionalExtensionMarker ++ RootComponentTypeList, Rest4}.
-    
+parse_OptionalExtensionMarker([{',',_},{'...',L1}|Rest],Clist)->
+    {Clist++[#'EXTENSIONMARK'{pos=L1}],Rest};
+parse_OptionalExtensionMarker(Tokens,Clist) ->
+    {Clist,Tokens}.
 
-parse_ComponentTypeList(Tokens) ->
-    parse_ComponentTypeList(Tokens,[]).
 
-parse_ComponentTypeList(Tokens,Acc) ->
+parse_ComponentTypeList([{',',_},Id = {identifier,_,_}|Rest],Acc) when Acc =/= [] ->
+    {ComponentType,Rest2} = parse_ComponentType([Id|Rest]),
+    parse_ComponentTypeList(Rest2,[ComponentType|Acc]);
+parse_ComponentTypeList([{',',_},C1={'COMPONENTS',_},C2={'OF',_}|Rest],Acc) when Acc =/= [] ->
+    {ComponentType,Rest2} = parse_ComponentType([C1,C2|Rest]),
+    parse_ComponentTypeList(Rest2,[ComponentType|Acc]);
+parse_ComponentTypeList(Tokens = [{'}',_}|_],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_ComponentTypeList(Tokens = [{']',_},{']',_}|_],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_ComponentTypeList(Tokens = [{',',_},{'...',_}|_],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_ComponentTypeList(Tokens,[]) ->
     {ComponentType,Rest} = parse_ComponentType(Tokens),
+    parse_ComponentTypeList(Rest,[ComponentType]);
+parse_ComponentTypeList(Tokens,_) ->
+    throw({asn1_error,
+	   {get_line(hd(Tokens)),get(asn1_module),
+	    [got,[get_token(hd(Tokens)),get_token(hd(tl(Tokens)))],
+	     expected,['}',', identifier']]}}).
+
+parse_ExtensionAdditions(Tokens=[{',',_}|_],Clist) ->
+    {ExtAddList,Rest2} = parse_ExtensionAdditionList(Tokens,[]),
+    {Clist++ExtAddList,Rest2};
+parse_ExtensionAdditions(Tokens,Clist) ->
+    %% Empty
+    {Clist,Tokens}.
+
+parse_ExtensionAdditionList([{',',_},Id = {identifier,_,_}|Rest],Acc) ->
+    {ComponentType,Rest2} = parse_ComponentType([Id|Rest]),
+    parse_ExtensionAdditionList(Rest2,[ComponentType|Acc]);
+parse_ExtensionAdditionList([{',',_},C1={'COMPONENTS',_},C2={'OF',_}|Rest],Acc) ->
+    {ComponentType,Rest2} = parse_ComponentType([C1,C2|Rest]),
+    parse_ExtensionAdditionList(Rest2,[ComponentType|Acc]);
+parse_ExtensionAdditionList([{',',_},C1 = {'[',_},C2 = {'[',_}|Rest],Acc) ->
+    {ExtAddGroup,Rest2} = parse_ExtensionAdditionGroup([C1,C2|Rest],[]),
+    parse_ExtensionAdditionList(Rest2,[ExtAddGroup|Acc]);
+parse_ExtensionAdditionList(Tokens = [{'}',_}|_],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_ExtensionAdditionList(Tokens = [{',',_},{'...',_}|_],Acc) ->
+    {lists:reverse(Acc),Tokens};
+parse_ExtensionAdditionList(Tokens,_) ->
+    throw({asn1_error,
+	   {get_line(hd(Tokens)),get(asn1_module),
+	    [got,[get_token(hd(Tokens)),get_token(hd(tl(Tokens)))],
+	     expected,['}',', identifier']]}}).
+
+
+parse_ExtensionAdditionGroup([ {'[',_},{'[',_},_VsnNr = {number,_,Num},{':',_}|Rest],[]) ->
+    parse_ExtensionAdditionGroup2(Rest,Num);
+parse_ExtensionAdditionGroup([ {'[',_},{'[',_}|Rest],[]) ->
+    parse_ExtensionAdditionGroup2(Rest,undefined);
+parse_ExtensionAdditionGroup(Tokens,_) ->
+    throw({asn1_error,
+	   {get_line(hd(Tokens)),get(asn1_module),
+	    [got,[get_token(hd(Tokens)),get_token(hd(tl(Tokens)))],
+	     expected,['[[']]}}).
+
+
+parse_ExtensionAdditionGroup2(Tokens,Num) ->
+    {CompTypeList,Rest} = parse_ComponentTypeList(Tokens,[]),
     case Rest of
-	[{',',_},Id = {identifier,_,_}|Rest2] ->
-	    parse_ComponentTypeList([Id|Rest2],[ComponentType|Acc]);
-	[{',',_},C1={'COMPONENTS',_},C2={'OF',_}|Rest2] ->
-	    parse_ComponentTypeList([C1,C2|Rest2],[ComponentType|Acc]);
-% 	_ ->
-% 	    {lists:reverse([ComponentType|Acc]),Rest}
-	[{'}',_}|_] ->
-	    {lists:reverse([ComponentType|Acc]),Rest};
-% 	[{',',_},{'...',_},{'}',_}|_] ->
-% 	    {lists:reverse([ComponentType|Acc]),Rest};
- 	[{',',_},{'...',_}|_] ->%% here comes the dubble ellipse
-	    {lists:reverse([ComponentType|Acc]),Rest};
+	[{']',_},{']',_}|Rest2] ->
+	    {[{'ExtensionAdditionGroup',Num}|CompTypeList] ++
+		['ExtensionAdditionGroupEnd'],Rest2};
 	_ ->
-	    throw({asn1_error,
-		   {get_line(hd(Tokens)),get(asn1_module),
-		    [got,[get_token(hd(Rest)),get_token(hd(tl(Rest)))],
-		     expected,['}',', identifier']]}})
-    end.
-
-    
-parse_ExtensionAdditionList(Tokens) ->
-    parse_ExtensionAdditionList(Tokens,[]).
-    
-parse_ExtensionAdditionList(Tokens,Acc) ->
-    {Element,Rest0} =
-	case Tokens of
-	    [{identifier,_,_}|_Rest] ->
-		parse_ComponentType(Tokens);
-	    [{'[',_},{'[',_}|_] ->
-		parse_ExtensionAdditions(Tokens);
-	    [{'...',L1}|_Rest] ->
-		{#'EXTENSIONMARK'{pos=L1},Tokens};
-	    _ ->
- 		throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
- 				   [got,get_token(hd(Tokens)),expected,
- 				    [identifier,'[[']]}})
-	end,
-    case Rest0 of
-	[{',',_}|Rest01] ->
-	    parse_ExtensionAdditionList(Rest01,[Element|Acc]);
-	[{'...',_}|Rest01] ->
-	    {lists:reverse([Element|Acc]),Rest01};
-	_  ->
-	    {lists:reverse([Element|Acc]),Rest0}
+	    throw({asn1_error,{get_line(hd(Rest)),get(asn1_module),
+			       [got,get_token(hd(Rest)),expected,[']]']]}})
     end.
 
-parse_ExtensionAdditions([{'[',_},{'[',_}|Rest]) ->
-    parse_ExtensionAdditions(Rest,[]);
-parse_ExtensionAdditions(Tokens) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,'[[']}}).
-
-parse_ExtensionAdditions([_VsnNr = {number,_,_},{':',_}|Rest],Acc) ->
-    %% ignor version number for now
-    parse_ExtensionAdditions(Rest,Acc);
-parse_ExtensionAdditions([Id = {identifier,_,_}|Rest],Acc) ->
-    {ComponentType, Rest2} = parse_ComponentType([Id|Rest]),
-    case Rest2 of
-	[{',',_}|Rest21] ->
-	    parse_ExtensionAdditions(Rest21,[ComponentType|Acc]);
-	[{']',_},{']',_}|Rest21] ->
-	    {lists:reverse(Acc),Rest21};
-	_ ->
-	    throw({asn1_error,{get_line(hd(Rest2)),get(asn1_module),
-			       [got,get_token(hd(Rest2)),expected,[',',']]']]}})
-    end;
-parse_ExtensionAdditions(Tokens,_) ->
-    throw({asn1_error,{get_line(hd(Tokens)),get(asn1_module),
-		       [got,get_token(hd(Tokens)),expected,identifier]}}).
 
 parse_ComponentType([{'COMPONENTS',_},{'OF',_}|Rest]) ->
     {Type,Rest2} = parse_Type(Rest),
     {{'COMPONENTS OF',Type},Rest2};
 parse_ComponentType(Tokens) ->
-    {NamedType,Rest} = parse_NamedType(Tokens),
+    Result = {NamedType,Rest} = parse_NamedType(Tokens),
     case Rest of
 	[{'OPTIONAL',_}|Rest2] ->
 	    {NamedType#'ComponentType'{prop='OPTIONAL'},Rest2};
@@ -2573,7 +2664,7 @@ parse_ComponentType(Tokens) ->
 	    {Value,Rest21} = parse_Value(Rest2),
 	    {NamedType#'ComponentType'{prop={'DEFAULT',Value}},Rest21};
 	_ ->
-	    {NamedType,Rest}
+	    Result
     end.
 
 	    
diff --git a/lib/asn1/src/asn1ct_tok.erl b/lib/asn1/src/asn1ct_tok.erl
index f0ce31bdb2..85199c65ec 100644
--- a/lib/asn1/src/asn1ct_tok.erl
+++ b/lib/asn1/src/asn1ct_tok.erl
@@ -21,7 +21,7 @@
 
 %% Tokenize ASN.1 code (input to parser generated with yecc)   
 
--export([get_name/2,tokenise/2, file/1]).
+-export([get_name/2,tokenise/4, file/1]).
 
 
 file(File) ->
@@ -29,12 +29,9 @@ file(File) ->
 	{error, Reason} ->
 	    {error,{File,file:format_error(Reason)}};
 	{ok,Stream} ->
-	    process0(Stream)
+	    process(Stream,0,[])
     end.
 
-process0(Stream) ->
-    process(Stream,0,[]). 
-
 process(Stream,Lno,R) ->
     process(io:get_line(Stream, ''), Stream,Lno+1,R).
 
@@ -45,131 +42,128 @@ process(eof, Stream,Lno,R) ->
 
 process(L, Stream,Lno,R) when is_list(L) ->
     %%io:format('read:~s',[L]),
-    case catch tokenise(L,Lno) of
+    case catch tokenise(Stream,L,Lno,[]) of
 	{'ERR',Reason} ->
 	    io:format("Tokeniser error on line: ~w ~w~n",[Lno,Reason]),
 	    exit(0);
-	{multiline_comment,NestingLevel} ->
-	    {RestL,Lno2} = process_skip_multiline_comment(Stream,Lno,NestingLevel),
-	    process(RestL,Stream,Lno2,R);
-	T ->
+	{NewLno,T} ->
 	    %%io:format('toks:~w~n',[T]),
-	    process(Stream,Lno,[T|R])
+	    process(Stream,NewLno,[T|R])
     end. 
 
-process_skip_multiline_comment(Stream,Lno,NestingLevel) ->
-    process_skip_multiline_comment(io:get_line(Stream, ''),
-				   Stream, Lno + 1, NestingLevel).
-process_skip_multiline_comment(eof,_Stream,Lno,_NestingLevel) ->
-    io:format("Tokeniser error on line: ~w, premature end of multiline comment~n",[Lno]),
-    exit(0);
-process_skip_multiline_comment(Line,Stream,Lno,NestingLevel) ->
-    case catch skip_multiline_comment(Line,NestingLevel) of
-	{multiline_comment,NestingLevel2} ->
-	    process_skip_multiline_comment(Stream,Lno,NestingLevel2);
-	T ->
-	    {T,Lno}
-    end.
-
-tokenise([H|T],Lno) when $a =< H , H =< $z ->
+tokenise(Stream,[H|T],Lno,R) when $a =< H , H =< $z ->
     {X, T1} = get_name(T, [H]),
-    [{identifier,Lno, list_to_atom(X)}|tokenise(T1,Lno)];
+    tokenise(Stream,T1,Lno,[{identifier,Lno, list_to_atom(X)}|R]);
 
-tokenise([$&,H|T],Lno) when $A =< H , H =< $Z ->
+tokenise(Stream,[$&,H|T],Lno,R) when $A =< H , H =< $Z ->
     {Y, T1} = get_name(T, [H]),
     X = list_to_atom(Y),
-    [{typefieldreference, Lno, X} | tokenise(T1, Lno)];
+    tokenise(Stream,T1,Lno,[{typefieldreference, Lno, X} | R]);
 
-tokenise([$&,H|T],Lno) when $a =< H , H =< $z ->
+tokenise(Stream,[$&,H|T],Lno,R) when $a =< H , H =< $z ->
     {Y, T1} = get_name(T, [H]),
     X = list_to_atom(Y),
-    [{valuefieldreference, Lno, X} | tokenise(T1, Lno)];
+    tokenise(Stream,T1,Lno,[{valuefieldreference, Lno, X} | R]);
 
-tokenise([H|T],Lno) when $A =< H , H =< $Z ->
+tokenise(Stream,[H|T],Lno,R) when $A =< H , H =< $Z ->
     {Y, T1} = get_name(T, [H]),
     X = list_to_atom(Y),
     case reserved_word(X) of
 	true ->
-	    [{X,Lno}|tokenise(T1,Lno)];
+	    tokenise(Stream,T1,Lno,[{X,Lno}|R]);
 	false ->
-	    [{typereference,Lno,X}|tokenise(T1,Lno)];
+	    tokenise(Stream,T1,Lno,[{typereference,Lno,X}|R]);
 	rstrtype ->
-	    [{restrictedcharacterstringtype,Lno,X}|tokenise(T1,Lno)]
+	    tokenise(Stream,T1,Lno,[{restrictedcharacterstringtype,Lno,X}|R])
     end;
 
-tokenise([$-,H|T],Lno) when $0 =< H , H =< $9 ->
+tokenise(Stream,[$-,H|T],Lno,R) when $0 =< H , H =< $9 ->
     {X, T1} = get_number(T, [H]),
-    [{number,Lno,-1 * list_to_integer(X)}|tokenise(T1,Lno)];
+    tokenise(Stream,T1,Lno,[{number,Lno,-1 * list_to_integer(X)}|R]);
 
-tokenise([H|T],Lno) when $0 =< H , H =< $9 ->
+tokenise(Stream,[H|T],Lno,R) when $0 =< H , H =< $9 ->
     {X, T1} = get_number(T, [H]),
-    [{number,Lno,list_to_integer(X)}|tokenise(T1,Lno)];
+    tokenise(Stream,T1,Lno,[{number,Lno,list_to_integer(X)}|R]);
 
-tokenise([$-,$-|T],Lno) ->
-    tokenise(skip_comment(T),Lno);
+tokenise(Stream,[$-,$-|T],Lno,R) ->
+    tokenise(Stream,skip_comment(T),Lno,R);
 
-tokenise([$/,$*|T],Lno) ->
-    tokenise(skip_multiline_comment(T,0),Lno);
+tokenise(Stream,[$/,$*|T],Lno,R) ->
+    {NewLno,T1} = skip_multiline_comment(Stream,T,Lno,0),
+    tokenise(Stream,T1,NewLno,R);
 
-tokenise([$:,$:,$=|T],Lno) ->
-    [{'::=',Lno}|tokenise(T,Lno)];
+tokenise(Stream,[$:,$:,$=|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{'::=',Lno}|R]);
 
-tokenise([$'|T],Lno) ->
+tokenise(Stream,[$'|T],Lno,R) ->
     case catch collect_quoted(T,Lno,[]) of
          {'ERR',_} ->
              throw({'ERR','bad_quote'});
          {Thing, T1} ->
-             [Thing|tokenise(T1,Lno)]
+             tokenise(Stream,T1,Lno,[Thing|R])
     end;
 
-tokenise([$"|T],Lno) ->
-    collect_string(T,Lno);
+tokenise(Stream,[$"|T],Lno,R) ->
+    {Str,T1} = collect_string(T,Lno),
+    tokenise(Stream,T1,Lno,[Str|R]);
+
+tokenise(Stream,[${|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{'{',Lno}|R]);
+
+tokenise(Stream,[$}|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{'}',Lno}|R]);
 
-tokenise([${|T],Lno) ->
-    [{'{',Lno}|tokenise(T,Lno)];
+%% tokenise(Stream,[$],$]|T],Lno,R) ->
+%%     tokenise(Stream,T,Lno,[{']]',Lno}|R]);
 
-tokenise([$}|T],Lno) ->
-    [{'}',Lno}|tokenise(T,Lno)];
+%% Even though x.680 specify '[[' and ']]' as lexical items
+%% it does not work to have them as such since the single [ and ] can
+%% be used beside each other in the SYNTAX OF in x.681
+%% the solution chosen here , i.e. to have them as separate lexical items
+%% will not detect the cases where there is white space between them
+%% which would be an error in the use in ExtensionAdditionGroups
 
-tokenise([$]|T],Lno) ->
-    [{']',Lno}|tokenise(T,Lno)];
+%% tokenise(Stream,[$[,$[|T],Lno,R) ->
+%%     tokenise(Stream,T,Lno,[{'[[',Lno}|R]);
 
-tokenise([$[|T],Lno) ->
-    [{'[',Lno}|tokenise(T,Lno)];
+tokenise(Stream,[$]|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{']',Lno}|R]);
 
-tokenise([$,|T],Lno) ->
-    [{',',Lno}|tokenise(T,Lno)];
+tokenise(Stream,[$[|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{'[',Lno}|R]);
 
-tokenise([$(|T],Lno) ->
-    [{'(',Lno}|tokenise(T,Lno)];
-tokenise([$)|T],Lno) ->
-    [{')',Lno}|tokenise(T,Lno)];
+tokenise(Stream,[$,|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{',',Lno}|R]);
 
-tokenise([$.,$.,$.|T],Lno) ->
-    [{'...',Lno}|tokenise(T,Lno)];
+tokenise(Stream,[$(|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{'(',Lno}|R]);
+tokenise(Stream,[$)|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{')',Lno}|R]);
 
-tokenise([$.,$.|T],Lno) ->
-    [{'..',Lno}|tokenise(T,Lno)];
+tokenise(Stream,[$.,$.,$.|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{'...',Lno}|R]);
 
-tokenise([$.|T],Lno) ->
-    [{'.',Lno}|tokenise(T,Lno)];
-tokenise([$^|T],Lno) ->
-    [{'^',Lno}|tokenise(T,Lno)];
-tokenise([$!|T],Lno) ->
-    [{'!',Lno}|tokenise(T,Lno)];
-tokenise([$||T],Lno) ->
-    [{'|',Lno}|tokenise(T,Lno)];
+tokenise(Stream,[$.,$.|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{'..',Lno}|R]);
 
+tokenise(Stream,[$.|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{'.',Lno}|R]);
+tokenise(Stream,[$^|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{'^',Lno}|R]);
+tokenise(Stream,[$!|T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{'!',Lno}|R]);
+tokenise(Stream,[$||T],Lno,R) ->
+    tokenise(Stream,T,Lno,[{'|',Lno}|R]);
 
-tokenise([H|T],Lno) ->
+tokenise(Stream,[H|T],Lno,R) ->
     case white_space(H) of
 	true ->
-	    tokenise(T,Lno);
+	    tokenise(Stream,T,Lno,R);
 	false ->
-	    [{list_to_atom([H]),Lno}|tokenise(T,Lno)]
+	    tokenise(Stream,T,Lno,[{list_to_atom([H]),Lno}|R])
     end;
-tokenise([],_) ->
-    [].
+tokenise(_Stream,[],Lno,R) ->
+    {Lno,lists:reverse(R)}.
 
 
 collect_string(L,Lno) ->
@@ -181,7 +175,7 @@ collect_string([],_,_) ->
 collect_string([H|T],Lno,Str) ->
     case H of
 	$" ->
-           [{cstring,1,lists:reverse(Str)}|tokenise(T,Lno)];
+           {{cstring,1,lists:reverse(Str)},T};
         Ch ->
            collect_string(T,Lno,[Ch|Str])
     end.
@@ -252,17 +246,23 @@ skip_comment([_|T]) ->
     skip_comment(T).
 
 
-skip_multiline_comment([],L) ->
-    throw({multiline_comment,L});
-skip_multiline_comment([$*,$/|T],0) ->
-    T;
-skip_multiline_comment([$*,$/|T],Level) ->
-    skip_multiline_comment(T,Level - 1);
-skip_multiline_comment([$/,$*|T],Level) ->
-    skip_multiline_comment(T,Level + 1);
-skip_multiline_comment([_|T],Level) ->
-    skip_multiline_comment(T,Level).
-
+skip_multiline_comment(Stream,[],Lno,Level) ->
+    case io:get_line(Stream,'') of
+	eof ->
+	    io:format("Tokeniser error on line: ~w~n"
+		      "premature end of multiline comment~n",[Lno]),
+	    exit(0);
+	Line ->
+	    skip_multiline_comment(Stream,Line,Lno+1,Level)
+    end;
+skip_multiline_comment(_Stream,[$*,$/|T],Lno,0) ->
+    {Lno,T};
+skip_multiline_comment(Stream,[$*,$/|T],Lno,Level) ->
+    skip_multiline_comment(Stream,T,Lno,Level - 1);
+skip_multiline_comment(Stream,[$/,$*|T],Lno,Level) ->
+    skip_multiline_comment(Stream,T,Lno,Level + 1);
+skip_multiline_comment(Stream,[_|T],Lno,Level) ->
+    skip_multiline_comment(Stream,T,Lno,Level).
 
 collect_quoted([$',$B|T],Lno, L) ->
     case check_bin(L) of
diff --git a/lib/asn1/src/asn1rt_ber_bin.erl b/lib/asn1/src/asn1rt_ber_bin.erl
index ab04d981b0..22f9f2ecfd 100644
--- a/lib/asn1/src/asn1rt_ber_bin.erl
+++ b/lib/asn1/src/asn1rt_ber_bin.erl
@@ -2192,12 +2192,12 @@ decode_tag_and_length(Buffer) ->
 %% Check if valid tag
 %%
 %% check_if_valid_tag(Tag, List_of_valid_tags, OptOrMand) -> name of the tag
-%%===============================================================================
+%%============================================================================
 
 check_if_valid_tag(<<0,0,_/binary>>,_,_) ->
     asn1_EOC;
 check_if_valid_tag(<<>>, _, OptOrMand) ->
-    check_if_valid_tag2(false,[],[],OptOrMand);
+    check_if_valid_tag2_error([], OptOrMand);
 check_if_valid_tag(Bytes, ListOfTags, OptOrMand) when is_binary(Bytes) ->
     {Tag, _, _} = decode_tag(Bytes),
     check_if_valid_tag(Tag, ListOfTags, OptOrMand);
@@ -2217,7 +2217,6 @@ check_if_valid_tag(Tag, ListOfTags, OptOrMand) ->
 
 check_if_valid_tag2(_Class_TagNo, [], Tag, MandOrOpt) ->
     check_if_valid_tag2_error(Tag,MandOrOpt);
-
 check_if_valid_tag2(Class_TagNo, [{TagName,TagList}|T], Tag, OptOrMand) ->
     case check_if_valid_tag_loop(Class_TagNo, TagList) of
 	true ->
@@ -2226,7 +2225,7 @@ check_if_valid_tag2(Class_TagNo, [{TagName,TagList}|T], Tag, OptOrMand) ->
 	    check_if_valid_tag2(Class_TagNo, T, Tag, OptOrMand)
     end.
 
--spec(check_if_valid_tag2_error/2 :: (term(),atom()) -> no_return()).
+-spec check_if_valid_tag2_error(term(), atom()) -> no_return().
 
 check_if_valid_tag2_error(Tag,mandatory) ->
     exit({error,{asn1,{invalid_tag,Tag}}});
diff --git a/lib/asn1/src/asn1rt_driver_handler.erl b/lib/asn1/src/asn1rt_driver_handler.erl
index c95b243ae0..cc2b501e16 100644
--- a/lib/asn1/src/asn1rt_driver_handler.erl
+++ b/lib/asn1/src/asn1rt_driver_handler.erl
@@ -71,7 +71,10 @@ load_driver(Reason) ->
     end.
 
 init(FromPid,FromRef) ->
-    register(asn1_driver_owner,self()),
+    case catch register(asn1_driver_owner,self()) of
+	true -> true;
+	_Other -> exit(normal)
+    end,
     Dir = filename:join([code:priv_dir(asn1),"lib"]),
     case catch erl_ddll:load_driver(Dir,asn1_erl_drv) of
 	ok ->
diff --git a/lib/asn1/src/asn1rt_uper_bin.erl b/lib/asn1/src/asn1rt_uper_bin.erl
index a964b835ae..abe178a69e 100644
--- a/lib/asn1/src/asn1rt_uper_bin.erl
+++ b/lib/asn1/src/asn1rt_uper_bin.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -1611,25 +1611,8 @@ complete_NFP(InList) when is_bitstring(InList) ->
 
 %% 10.5.6 NOTE: If "range" satisfies the inequality 2^m < "range" =<
 %% 2^(m+1) then the number of bits = m + 1
-num_bits(1) -> 0;
-num_bits(2) -> 1;
-num_bits(R) when R =< 4 -> 
-    2;
-num_bits(R) when R =< 8 ->
-    3;
-num_bits(R) when R =< 16 ->
-    4;
-num_bits(R) when R =< 32 ->
-    5;	
-num_bits(R) when R =< 64 ->
-    6;
-num_bits(R) when R =< 128 ->
-    7;
-num_bits(R) when R =< 256 ->
-    8;
-num_bits(R) when R =< 512 ->
-    9;
-num_bits(R) when R =< 1024 ->
-    10;
-num_bits(R) ->
-    1+num_bits(R bsr 1).
+
+num_bits(N) ->
+    num_bits(N,1,0).
+num_bits(N,T,B) when N=<T->B;
+num_bits(N,T,B) ->num_bits(N,T bsl 1, B+1).
diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index 5014eb902b..8a23f8e869 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -189,27 +189,16 @@ release_spec: opt
 
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) asn1.spec $(EMAKEFILE) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
-	chmod -f -R u+w $(RELSYSDIR)
-	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+	$(INSTALL_DIR) $(RELSYSDIR)/asn1_SUITE_data
 	$(INSTALL_DIR) $(RELSYSDIR)/asn1_bin_SUITE_data
-	@(cd asn1_SUITE_data; tar cf - *) | (cd $(RELSYSDIR)/asn1_bin_SUITE_data; tar xf -)
 	$(INSTALL_DIR) $(RELSYSDIR)/asn1_bin_v2_SUITE_data
-	@(cd asn1_SUITE_data; tar cf - *) | (cd $(RELSYSDIR)/asn1_bin_v2_SUITE_data; tar xf -)
-
+	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) asn1.spec asn1.cover $(INSTALL_PROGS) $(RELSYSDIR)
+	chmod -f -R u+w $(RELSYSDIR)
+	cd asn1_SUITE_data; tar cfh $(RELSYSDIR)/asn1_SUITE_data.tar *
+	cd $(RELSYSDIR)/asn1_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar
+	cd $(RELSYSDIR)/asn1_bin_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar
+	cd $(RELSYSDIR)/asn1_bin_v2_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar
+	rm $(RELSYSDIR)/asn1_SUITE_data.tar
 
 release_docs_spec:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/asn1/test/asn1.cover b/lib/asn1/test/asn1.cover
new file mode 100644
index 0000000000..589a8b7e3d
--- /dev/null
+++ b/lib/asn1/test/asn1.cover
@@ -0,0 +1,2 @@
+{incl_app,asn1,details}.
+
diff --git a/lib/asn1/test/asn1.spec b/lib/asn1/test/asn1.spec
index 6d9ae924fa..ae96de3a58 100644
--- a/lib/asn1/test/asn1.spec
+++ b/lib/asn1/test/asn1.spec
@@ -1,3 +1 @@
-{topcase, {dir, "../asn1_test"}}.
-
-
+{suites,"../asn1_test",all}.
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
new file mode 100644
index 0000000000..e12dede3f7
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -0,0 +1,2489 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2010. 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%
+%%
+%%
+%%% Purpose : Test suite for the ASN.1 application
+
+-module(asn1_SUITE).
+-define(PER,'per').
+-define(BER,'ber').
+-define(ber_driver(Erule,Func),
+	case Erule of
+           ber_bin_v2 ->
+		Func;
+	    _ -> ok
+	end).
+-define(per_optimize(Erule),
+	case Erule of
+	   ber_bin_v2 ->[optimize];
+           _ -> []
+	end).
+-define(per_bit_opt(FuncCall),
+	case ?BER of
+	   ber_bin_v2 -> FuncCall;
+%	   _ -> {skip,"only for bit optimized per_bin"}
+	   _ -> ok
+	end).
+-define(uper_bin(FuncCall),
+	case ?PER of
+	   per -> FuncCall;
+	   _ -> ok
+	end).
+
+-compile(export_all).
+%%-export([Function/Arity, ...]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+%% records used by test-case default
+-record('Def1',{ bool0, 
+		 bool1 = asn1_DEFAULT, 
+		 bool2 = asn1_DEFAULT, 
+		 bool3 = asn1_DEFAULT}).
+
+%-record('Def2',{
+%bool10, bool11 = asn1_DEFAULT, bool12 = asn1_DEFAULT, bool13}).
+
+%-record('Def3',{
+%bool30 = asn1_DEFAULT, bool31 = asn1_DEFAULT, bool32 = asn1_DEFAULT, bool33 = asn1_DEFAULT}).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, compile}, parse, default_per, default_ber,
+     default_per_opt, per, {group, ber}, testPrim,
+     testPrimStrings, testPrimExternal, testChoPrim,
+     testChoExtension, testChoExternal, testChoOptional,
+     testChoOptionalImplicitTag, testChoRecursive,
+     testChoTypeRefCho, testChoTypeRefPrim,
+     testChoTypeRefSeq, testChoTypeRefSet, testDef, testOpt,
+     testSeqDefault, testSeqExtension, testSeqExternal,
+     testSeqOptional, testSeqPrim, testSeqTag,
+     testSeqTypeRefCho, testSeqTypeRefPrim,
+     testSeqTypeRefSeq, testSeqTypeRefSet, testSeqOf,
+     testSeqOfIndefinite, testSeqOfCho, testSeqOfExternal,
+     testSetDefault, testSetExtension,
+     testExtensionAdditionGroup, testSetExternal,
+     testSeqOfTag, testSetOptional, testSetPrim, testSetTag,
+     testSetTypeRefCho, testSetTypeRefPrim,
+     testSetTypeRefSeq, testSetTypeRefSet, testSetOf,
+     testSetOfCho, testSetOfExternal, testSetOfTag,
+     testEnumExt, value_test, testSeq2738, constructed,
+     ber_decode_error, h323test, testSeqIndefinite,
+     testSetIndefinite, testChoiceIndefinite,
+     per_GeneralString, per_open_type, testInfObjectClass,
+     testParameterizedInfObj, testMergeCompile, testobj,
+     testDeepTConstr, testConstraints, testInvokeMod,
+     testExport, testImport, testCompactBitString,
+     testMegaco, testParamBasic, testMvrasn6,
+     testContextSwitchingTypes, testTypeValueNotation,
+     testOpenTypeImplicitTag, duplicate_tags, rtUI, testROSE,
+     testINSTANCE_OF, testTCAP, testDER, specialized_decodes,
+     special_decode_performance, test_driver_load,
+     test_ParamTypeInfObj, test_WS_ParamClass,
+     test_Defed_ObjectIdentifier, testSelectionType,
+     testSSLspecs, testNortel, test_undecoded_rest,
+     test_inline, testTcapsystem, testNBAPsystem,
+     test_compile_options, testDoubleEllipses,
+     test_modified_x420, testX420, test_x691, ticket_6143,
+     testExtensionAdditionGroup] ++ common() ++ particular().
+
+groups() -> 
+    [{option_tests, [],
+      [test_compile_options, ticket_6143]},
+     {infobj, [],
+      [testInfObjectClass, testParameterizedInfObj,
+       testMergeCompile, testobj, testDeepTConstr]},
+     {performance, [],
+      [testTimer_ber, testTimer_ber_opt_driver, testTimer_per,
+       testTimer_per_opt, testTimer_uper_bin]},
+     {bugs, [],
+      [test_ParamTypeInfObj, test_WS_ParamClass,
+       test_Defed_ObjectIdentifier]},
+     {compile, [],
+      [c_syntax, c_string_per, c_string_ber,
+       c_implicit_before_choice]},
+     {ber, [],
+      [ber_choiceinseq, ber_optional, ber_optional_keyed_list,
+       ber_other]},
+     {app_test, [], [{asn1_app_test, all}]},
+     {appup_test, [], [{asn1_appup_test, all}]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+%all(suite) -> [test_inline,testNBAPsystem,test_compile_options,ticket_6143].
+
+
+init_per_testcase(Func,Config) ->
+    %%?line test_server:format("Func: ~p~n",[Func]),
+    ?line {ok, _} = file:read_file_info(filename:join([?config(priv_dir,Config)])),
+    ?line code:add_patha(?config(priv_dir,Config)),
+    Dog=
+    case Func of
+       testX420 ->
+           test_server:timetrap({minutes,60}); % 60 minutes
+       _ ->
+	   test_server:timetrap({minutes,30}) % 60 minutes
+    end,
+%%    Dog=test_server:timetrap(1800000), % 30 minutes
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Func,Config) ->
+          Dog=?config(watchdog, Config),
+          test_server:timetrap_cancel(Dog).
+
+
+testPrim(suite) -> [];
+testPrim(Config) ->
+    ?line testPrim:compile(Config,?BER,[]),
+    ?line testPrim_cases(?BER),
+    ?line ?ber_driver(?BER,testPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrim_cases(?BER)),
+    ?line testPrim:compile(Config,?PER,[]),
+    ?line testPrim_cases(?PER),
+    ?line ?per_bit_opt(testPrim:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testPrim_cases(?PER)),
+    ?line ?uper_bin(testPrim:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testPrim_cases(uper_bin)),
+    ?line testPrim:compile(Config,?PER,[optimize]),
+    ?line testPrim_cases(?PER).
+
+testPrim_cases(Rules) ->
+    ?line testPrim:bool(Rules),
+    ?line testPrim:int(Rules),
+    ?line testPrim:enum(Rules),
+    ?line testPrim:obj_id(Rules),
+    ?line testPrim:rel_oid(Rules),
+    ?line testPrim:null(Rules),
+    ?line testPrim:real(Rules).
+
+
+testCompactBitString(suite) -> [];
+testCompactBitString(Config) -> 
+
+    ?line testCompactBitString:compile(Config,?BER,[compact_bit_string]),
+    ?line testCompactBitString:compact_bit_string(?BER),
+
+    ?line ?ber_driver(?BER,testCompactBitString:compile(Config,?BER,[compact_bit_string,driver])),
+    ?line ?ber_driver(?BER,testCompactBitString:compact_bit_string(?BER)),
+
+    ?line testCompactBitString:compile(Config,?PER,[compact_bit_string]),
+    ?line testCompactBitString:compact_bit_string(?PER),
+    ?line testCompactBitString:bit_string_unnamed(?PER),
+
+    ?line ?per_bit_opt(testCompactBitString:compile(Config,?PER,
+					[compact_bit_string,optimize])),
+    ?line ?per_bit_opt(testCompactBitString:compact_bit_string(?PER)),
+    ?line ?per_bit_opt(testCompactBitString:bit_string_unnamed(?PER)),
+    ?line ?per_bit_opt(testCompactBitString:ticket_7734(?PER)),
+
+    ?line ?uper_bin(testCompactBitString:compile(Config,uper_bin,
+					[compact_bit_string])),
+    ?line ?uper_bin(testCompactBitString:compact_bit_string(uper_bin)),
+    ?line ?uper_bin(testCompactBitString:bit_string_unnamed(uper_bin)),
+
+    ?line testCompactBitString:compile(Config,?PER,[optimize,compact_bit_string]),
+    ?line testCompactBitString:compact_bit_string(?PER),
+    ?line testCompactBitString:bit_string_unnamed(?PER),
+
+    ?line testCompactBitString:otp_4869(?PER).
+
+
+testPrimStrings(suite) -> [];
+testPrimStrings(Config) ->
+
+    ?line testPrimStrings:compile(Config,?BER,[]),
+    ?line testPrimStrings_cases(?BER),
+    ?line testPrimStrings:more_strings(?BER), %% these are not implemented in per yet
+    ?line ?ber_driver(?BER,testPrimStrings:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrimStrings_cases(?BER)),
+    ?line ?ber_driver(?BER,testPrimStrings:more_strings(?BER)),
+
+    ?line testPrimStrings:compile(Config,?PER,[]),
+    ?line testPrimStrings_cases(?PER),
+
+    ?line ?per_bit_opt(testPrimStrings:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testPrimStrings_cases(?PER)),
+
+    ?line ?uper_bin(testPrimStrings:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testPrimStrings_cases(uper_bin)),
+
+    ?line testPrimStrings:compile(Config,?PER,[optimize]),
+    ?line testPrimStrings_cases(?PER).
+
+testPrimStrings_cases(Rules) ->
+    ?line testPrimStrings:bit_string(Rules),
+    ?line testPrimStrings:bit_string_unnamed(Rules),
+    ?line testPrimStrings:octet_string(Rules),
+    ?line testPrimStrings:numeric_string(Rules),
+    ?line testPrimStrings:other_strings(Rules),
+    ?line testPrimStrings:universal_string(Rules),
+    ?line testPrimStrings:bmp_string(Rules),
+    ?line testPrimStrings:times(Rules),
+    ?line testPrimStrings:utf8_string(Rules).
+    
+
+
+testPrimExternal(suite) -> [];
+testPrimExternal(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testPrimExternal:compile(Config,?BER,[]),
+    ?line testPrimExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrimExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrimExternal_cases(?BER)),
+    
+    ?line testExternal:compile(Config,?PER,[]),     
+    ?line testPrimExternal:compile(Config,?PER,[]), 
+    ?line testPrimExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),     
+    ?line ?per_bit_opt(testPrimExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testPrimExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),     
+    ?line ?uper_bin(testPrimExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testPrimExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),     
+    ?line testPrimExternal:compile(Config,?PER,[optimize]), 
+    ?line testPrimExternal_cases(?PER).
+
+testPrimExternal_cases(Rules) ->
+    ?line testPrimExternal:external(Rules).
+
+
+
+
+testChoPrim(suite) -> [];
+testChoPrim(Config) ->
+
+    ?line testChoPrim:compile(Config,?BER,[]),
+    ?line testChoPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoPrim_cases(?BER)),
+
+    ?line testChoPrim:compile(Config,?PER,[]), 
+    ?line testChoPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testChoPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoPrim_cases(?PER)),
+
+    ?line ?uper_bin(testChoPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoPrim_cases(uper_bin)),
+
+    ?line testChoPrim:compile(Config,?PER,[optimize]), 
+    ?line testChoPrim_cases(?PER).
+
+testChoPrim_cases(Rules) ->
+    ?line testChoPrim:bool(Rules),
+    ?line testChoPrim:int(Rules).
+
+
+
+testChoExtension(suite) -> [];
+testChoExtension(Config) ->
+
+    ?line testChoExtension:compile(Config,?BER,[]),
+    ?line testChoExtension_cases(?BER),          
+
+    ?line ?ber_driver(?BER,testChoExtension:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoExtension_cases(?BER)),
+
+    ?line testChoExtension:compile(Config,?PER,[]),
+    ?line testChoExtension_cases(?PER),          
+
+    ?line ?per_bit_opt(testChoExtension:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testChoExtension_cases(?PER)),
+
+    ?line ?uper_bin(testChoExtension:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testChoExtension_cases(uper_bin)),
+
+    ?line testChoExtension:compile(Config,?PER,[optimize]),
+    ?line testChoExtension_cases(?PER).          
+
+testChoExtension_cases(Rules) ->
+    ?line testChoExtension:extension(Rules).
+
+
+
+testChoExternal(suite) -> [];
+testChoExternal(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testChoExternal:compile(Config,?BER,[]),
+    ?line testChoExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoExternal_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testChoExternal:compile(Config,?PER,[]), 
+    ?line testChoExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testChoExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testChoExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testChoExternal:compile(Config,?PER,[optimize]), 
+    ?line testChoExternal_cases(?PER).
+
+
+testChoExternal_cases(Rules) ->
+    ?line testChoExternal:external(Rules).
+
+
+
+testChoOptional(suite) -> [];
+testChoOptional(Config) ->
+
+    ?line testChoOptional:compile(Config,?BER,[]),
+    ?line testChoOptional_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoOptional:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoOptional_cases(?BER)),
+
+    ?line testChoOptional:compile(Config,?PER,[]), 
+    ?line testChoOptional_cases(?PER),
+
+    ?line ?per_bit_opt(testChoOptional:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoOptional_cases(?PER)),
+
+    ?line ?uper_bin(testChoOptional:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoOptional_cases(uper_bin)),
+
+    ?line testChoOptional:compile(Config,?PER,[optimize]), 
+    ?line testChoOptional_cases(?PER).
+
+testChoOptional_cases(Rules) ->
+    ?line testChoOptional:optional(Rules).
+
+testChoOptionalImplicitTag(suite) -> [];
+testChoOptionalImplicitTag(Config) ->
+    %% Only meaningful for ?BER
+    ?line testChoOptionalImplicitTag:compile(Config,?BER),
+    ?line testChoOptionalImplicitTag:optional(?BER).
+
+
+testChoRecursive(suite) -> [];
+testChoRecursive(Config) ->
+
+    ?line testChoRecursive:compile(Config,?BER,[]),
+    ?line testChoRecursive_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoRecursive:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoRecursive_cases(?BER)),
+
+    ?line testChoRecursive:compile(Config,?PER,[]), 
+    ?line testChoRecursive_cases(?PER),
+
+    ?line ?per_bit_opt(testChoRecursive:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoRecursive_cases(?PER)),
+
+    ?line ?uper_bin(testChoRecursive:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoRecursive_cases(uper_bin)),
+
+    ?line testChoRecursive:compile(Config,?PER,[optimize]), 
+    ?line testChoRecursive_cases(?PER).
+
+testChoRecursive_cases(Rules) ->
+    ?line testChoRecursive:recursive(Rules).
+
+
+
+testChoTypeRefCho(suite) -> [];
+testChoTypeRefCho(Config) ->
+
+    ?line testChoTypeRefCho:compile(Config,?BER,[]),
+    ?line testChoTypeRefCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefCho_cases(?BER)),
+
+    ?line testChoTypeRefCho:compile(Config,?PER,[]), 
+    ?line testChoTypeRefCho_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefCho_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefCho_cases(uper_bin)),
+
+    ?line testChoTypeRefCho:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefCho_cases(?PER).
+
+testChoTypeRefCho_cases(Rules) ->
+    ?line testChoTypeRefCho:choice(Rules).
+
+
+
+testChoTypeRefPrim(suite) -> [];
+testChoTypeRefPrim(Config) ->
+
+    ?line testChoTypeRefPrim:compile(Config,?BER,[]),
+    ?line testChoTypeRefPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefPrim_cases(?BER)),
+
+    ?line testChoTypeRefPrim:compile(Config,?PER,[]), 
+    ?line testChoTypeRefPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefPrim_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefPrim_cases(uper_bin)),
+
+    ?line testChoTypeRefPrim:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefPrim_cases(?PER).
+
+testChoTypeRefPrim_cases(Rules) ->
+    ?line testChoTypeRefPrim:prim(Rules).
+
+
+
+testChoTypeRefSeq(suite) -> [];
+testChoTypeRefSeq(Config) ->
+
+    ?line testChoTypeRefSeq:compile(Config,?BER,[]),
+    ?line testChoTypeRefSeq_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefSeq:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefSeq_cases(?BER)),
+
+    ?line testChoTypeRefSeq:compile(Config,?PER,[]), 
+    ?line testChoTypeRefSeq_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefSeq:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefSeq_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefSeq:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefSeq_cases(uper_bin)),
+
+    ?line testChoTypeRefSeq:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefSeq_cases(?PER).
+
+testChoTypeRefSeq_cases(Rules) ->
+    ?line testChoTypeRefSeq:seq(Rules).
+
+
+
+testChoTypeRefSet(suite) -> [];
+testChoTypeRefSet(Config) ->
+
+    ?line testChoTypeRefSet:compile(Config,?BER,[]),
+    ?line testChoTypeRefSet_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefSet:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefSet_cases(?BER)),
+
+    ?line testChoTypeRefSet:compile(Config,?PER,[]), 
+    ?line testChoTypeRefSet_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefSet:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefSet_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefSet:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefSet_cases(uper_bin)),
+
+    ?line testChoTypeRefSet:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefSet_cases(?PER).
+
+testChoTypeRefSet_cases(Rules) ->
+    ?line testChoTypeRefSet:set(Rules).
+
+
+
+testDef(suite) -> [];
+testDef(Config) ->
+
+    ?line testDef:compile(Config,?BER,[]),
+    ?line testDef_cases(?BER),
+
+    ?line ?ber_driver(?BER,testDef:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDef_cases(?BER)),
+
+    ?line testDef:compile(Config,?PER,[]), 
+    ?line testDef_cases(?PER),
+
+    ?line ?per_bit_opt(testDef:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testDef_cases(?PER)),
+
+    ?line ?uper_bin(testDef:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testDef_cases(uper_bin)),
+
+    ?line testDef:compile(Config,?PER,[optimize]), 
+    ?line testDef_cases(?PER).
+
+testDef_cases(Rules) ->
+    ?line testDef:main(Rules).
+
+
+
+testOpt(suite) -> [];
+testOpt(Config) ->
+
+    ?line testOpt:compile(Config,?BER),
+    ?line testOpt_cases(?BER),
+
+    ?line testOpt:compile(Config,?PER), 
+    ?line testOpt_cases(?PER).          
+
+testOpt_cases(Rules) ->
+    ?line testOpt:main(Rules).
+
+
+testEnumExt(suite) -> [];
+testEnumExt(Config) ->
+
+    ?line testEnumExt:compile(Config,?BER,[]),
+    ?line testEnumExt:main(?BER),
+
+    ?line ?ber_driver(?BER,testEnumExt:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testEnumExt:main(?BER)),
+
+    ?line testEnumExt:compile(Config,?PER,[]),
+    ?line testEnumExt:main(?PER),
+
+    ?line ?per_bit_opt(testEnumExt:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testEnumExt:main(?PER)),
+
+    ?line ?uper_bin(testEnumExt:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testEnumExt:main(uper_bin)),
+
+    ?line testEnumExt:compile(Config,?PER,[optimize]),
+    ?line testEnumExt:main(?PER).
+
+testSeqDefault(doc) -> ["Test of OTP-2523 ENUMERATED with extensionmark."];
+testSeqDefault(suite) -> [];
+testSeqDefault(Config) ->
+
+    ?line testSeqDefault:compile(Config,?BER,[]),
+    ?line testSeqDefault_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqDefault:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqDefault_cases(?BER)),
+
+    ?line testSeqDefault:compile(Config,?PER,[]), 
+    ?line testSeqDefault_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqDefault:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqDefault_cases(?PER)),
+
+    ?line ?uper_bin(testSeqDefault:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqDefault_cases(uper_bin)),
+
+    ?line testSeqDefault:compile(Config,?PER,[optimize]), 
+    ?line testSeqDefault_cases(?PER).
+
+testSeqDefault_cases(Rules) ->
+    ?line testSeqDefault:main(Rules).
+
+
+
+testSeqExtension(suite) -> [];
+testSeqExtension(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqExtension:compile(Config,?BER,[]),
+    ?line testSeqExtension_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExtension:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExtension_cases(?BER)).
+
+testSeqExtension_cases(Rules) ->
+    ?line testSeqExtension:main(Rules).
+
+
+
+testSeqExternal(suite) -> [];
+testSeqExternal(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqExternal:compile(Config,?BER,[]),
+    ?line testSeqExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExternal_cases(?BER)).
+
+testSeqExternal_cases(Rules) ->
+    ?line testSeqExternal:main(Rules).
+
+
+testSeqOptional(suite) -> [];
+testSeqOptional(Config) ->
+
+    ?line testSeqOptional:compile(Config,?BER,[]),
+    ?line testSeqOptional_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqOptional:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOptional_cases(?BER)),
+
+    ?line testSeqOptional:compile(Config,?PER,[]), 
+    ?line testSeqOptional_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqOptional:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOptional_cases(?PER)),
+
+    ?line ?uper_bin(testSeqOptional:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOptional_cases(uper_bin)),
+
+    ?line testSeqOptional:compile(Config,?PER,[optimize]), 
+    ?line testSeqOptional_cases(?PER).
+
+testSeqOptional_cases(Rules) ->
+    ?line testSeqOptional:main(Rules).
+
+
+
+testSeqPrim(suite) -> [];
+testSeqPrim(Config) ->
+
+    ?line testSeqPrim:compile(Config,?BER,[]),
+    ?line testSeqPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqPrim_cases(?BER)),
+
+    ?line testSeqPrim:compile(Config,?PER,[]), 
+    ?line testSeqPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSeqPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqPrim_cases(uper_bin)),
+
+    ?line testSeqPrim:compile(Config,?PER,[optimize]), 
+    ?line testSeqPrim_cases(?PER).
+
+testSeqPrim_cases(Rules) ->
+    ?line testSeqPrim:main(Rules).
+
+
+testSeq2738(doc) -> ["Test of OTP-2738 Detect corrupt optional component."];
+testSeq2738(suite) -> [];
+testSeq2738(Config) ->
+
+    ?line testSeq2738:compile(Config,?BER,[]),
+    ?line testSeq2738_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeq2738:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeq2738_cases(?BER)),
+
+    ?line testSeq2738:compile(Config,?PER,[]), 
+    ?line testSeq2738_cases(?PER),
+
+    ?line ?per_bit_opt(testSeq2738:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeq2738_cases(?PER)),
+
+    ?line ?uper_bin(testSeq2738:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeq2738_cases(uper_bin)),
+
+    ?line testSeq2738:compile(Config,?PER,[optimize]), 
+    ?line testSeq2738_cases(?PER).
+
+testSeq2738_cases(Rules) ->
+    ?line testSeq2738:main(Rules).
+
+
+testSeqTag(suite) -> [];
+testSeqTag(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqTag:compile(Config,?BER,[]),
+    ?line testSeqTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSeqTag:compile(Config,?PER,[]), 
+    ?line testSeqTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSeqTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSeqTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSeqTag:compile(Config,?PER,[optimize]), 
+    ?line testSeqTag_cases(?PER).
+
+testSeqTag_cases(Rules) ->
+    ?line testSeqTag:main(Rules).
+
+
+
+
+testSeqTypeRefCho(suite) -> [];
+testSeqTypeRefCho(Config) ->
+
+    ?line testSeqTypeRefCho:compile(Config,?BER,[]),
+    ?line testSeqTypeRefCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefCho_cases(?BER)),
+
+    ?line testSeqTypeRefCho:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefCho_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefCho_cases(uper_bin)),
+
+    ?line testSeqTypeRefCho:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefCho_cases(?PER).
+
+testSeqTypeRefCho_cases(Rules) ->
+    ?line testSeqTypeRefCho:main(Rules).
+
+
+
+testSeqTypeRefPrim(suite) -> [];
+testSeqTypeRefPrim(Config) ->
+
+    ?line testSeqTypeRefPrim:compile(Config,?BER,[]),
+    ?line testSeqTypeRefPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefPrim_cases(?BER)),
+
+    ?line testSeqTypeRefPrim:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefPrim_cases(uper_bin)),
+
+    ?line testSeqTypeRefPrim:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefPrim_cases(?PER).
+
+testSeqTypeRefPrim_cases(Rules) ->
+    ?line testSeqTypeRefPrim:main(Rules).
+
+
+
+testSeqTypeRefSeq(suite) -> [];
+testSeqTypeRefSeq(Config) ->
+
+    ?line testSeqTypeRefSeq:compile(Config,?BER,[]),
+    ?line testSeqTypeRefSeq_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefSeq:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefSeq_cases(?BER)),
+
+    ?line testSeqTypeRefSeq:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefSeq_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefSeq:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefSeq_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefSeq:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefSeq_cases(uper_bin)),
+
+    ?line testSeqTypeRefSeq:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefSeq_cases(?PER).
+
+testSeqTypeRefSeq_cases(Rules) ->
+    ?line testSeqTypeRefSeq:main(Rules).
+
+
+
+testSeqTypeRefSet(suite) -> [];
+testSeqTypeRefSet(Config) ->
+
+    ?line testSeqTypeRefSet:compile(Config,?BER,[]),
+    ?line testSeqTypeRefSet_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefSet:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefSet_cases(?BER)),
+
+    ?line testSeqTypeRefSet:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefSet_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefSet:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefSet_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefSet:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefSet_cases(uper_bin)),
+
+    ?line testSeqTypeRefSet:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefSet_cases(?PER).
+
+testSeqTypeRefSet_cases(Rules) ->
+    ?line testSeqTypeRefSet:main(Rules).
+
+
+
+
+testSeqOf(suite) -> [];
+testSeqOf(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqOf:compile(Config,?BER,[]),
+    ?line testSeqOf_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqOf:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOf_cases(?BER)),
+
+    ?line testSeqOf:compile(Config,?PER,[]), 
+    ?line testSeqOf_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqOf:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOf_cases(?PER)),
+
+    ?line ?uper_bin(testSeqOf:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOf_cases(uper_bin)),
+
+    ?line testSeqOf:compile(Config,?PER,[optimize]), 
+    ?line testSeqOf_cases(?PER).
+
+testSeqOf_cases(Rules) ->
+    ?line testSeqOf:main(Rules).
+
+
+
+
+testSeqOfCho(suite) -> [];
+testSeqOfCho(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqOfCho:compile(Config,?BER,[]),
+    ?line testSeqOfCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqOfCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfCho_cases(?BER)),
+
+    ?line testSeqOfCho:compile(Config,?PER,[]), 
+    ?line testSeqOfCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqOfCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOfCho_cases(?PER)),
+
+    ?line ?uper_bin(testSeqOfCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOfCho_cases(uper_bin)),
+
+    ?line testSeqOfCho:compile(Config,?PER,[optimize]), 
+    ?line testSeqOfCho_cases(?PER).
+
+testSeqOfIndefinite(suite) -> [];
+testSeqOfIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqOfIndefinite:compile(Config,?BER,[]),
+    ?line testSeqOfIndefinite:main(),
+
+    ?line ?ber_driver(?BER,testSeqOfIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfIndefinite:main()).
+
+testSeqOfCho_cases(Rules) ->
+    ?line testSeqOfCho:main(Rules).
+
+
+testSeqOfExternal(suite) -> [];
+testSeqOfExternal(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqOfExternal:compile(Config,?BER,[]),
+    ?line testSeqOfExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfExternal_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSeqOfExternal:compile(Config,?PER,[]), 
+    ?line testSeqOfExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSeqOfExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOfExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSeqOfExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOfExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSeqOfExternal:compile(Config,?PER,[optimize]), 
+    ?line testSeqOfExternal_cases(?PER).
+
+testSeqOfExternal_cases(Rules) ->
+    ?line testSeqOfExternal:main(Rules).
+
+
+
+testSeqOfTag(suite) -> [];
+testSeqOfTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqOfTag:compile(Config,?BER,[]),
+    ?line testSeqOfTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSeqOfTag:compile(Config,?PER,[]), 
+    ?line testSeqOfTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSeqOfTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOfTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSeqOfTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOfTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSeqOfTag:compile(Config,?PER,[optimize]), 
+    ?line testSeqOfTag_cases(?PER).
+
+testSeqOfTag_cases(Rules) ->
+    ?line testSeqOfTag:main(Rules).
+
+
+
+
+testSetDefault(suite) -> [];
+testSetDefault(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetDefault:compile(Config,?BER,[]),
+    ?line testSetDefault_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetDefault:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetDefault_cases(?BER)),
+
+    ?line testSetDefault:compile(Config,?PER,[]), 
+    ?line testSetDefault_cases(?PER),
+
+    ?line ?per_bit_opt(testSetDefault:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetDefault_cases(?PER)),
+
+    ?line ?uper_bin(testSetDefault:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetDefault_cases(uper_bin)),
+
+    ?line testSetDefault:compile(Config,?PER,[optimize]), 
+    ?line testSetDefault_cases(?PER).
+
+testSetDefault_cases(Rules) ->
+    ?line testSetDefault:main(Rules).
+
+
+testParamBasic(suite) -> [];
+testParamBasic(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testParamBasic:compile(Config,?BER,[]),
+    ?line testParamBasic_cases(?BER),
+
+    ?line ?ber_driver(?BER,testParamBasic:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testParamBasic_cases(?BER)),
+
+    ?line testParamBasic:compile(Config,?PER,[]),
+    ?line testParamBasic_cases(?PER),
+
+    ?line ?per_bit_opt(testParamBasic:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testParamBasic_cases(?PER)),
+
+    ?line ?uper_bin(testParamBasic:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testParamBasic_cases(uper_bin)),
+
+    ?line testParamBasic:compile(Config,?PER,[optimize]),
+    ?line testParamBasic_cases(?PER).
+
+
+testParamBasic_cases(Rules) ->
+    ?line testParamBasic:main(Rules).
+
+testSetExtension(suite) -> [];
+testSetExtension(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetExtension:compile(Config,?BER,[]),
+    ?line testSetExtension_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExtension:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExtension_cases(?BER)).
+
+testSetExtension_cases(Rules) ->
+    ?line testSetExtension:main(Rules).
+
+
+testSetExternal(suite) -> [];
+testSetExternal(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetExternal:compile(Config,?BER,[]),
+    ?line testSetExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExternal_cases(?BER)).
+
+testSetExternal_cases(Rules) ->
+    ?line testSetExternal:main(Rules).
+
+
+testSetOptional(suite) -> [];
+testSetOptional(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetOptional:compile(Config,?BER,[]),
+    ?line testSetOptional_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetOptional:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOptional_cases(?BER)),
+
+    ?line testSetOptional:compile(Config,?PER,[]), 
+    ?line testSetOptional_cases(?PER),
+
+    ?line ?per_bit_opt(testSetOptional:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOptional_cases(?PER)),
+
+    ?line ?uper_bin(testSetOptional:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOptional_cases(uper_bin)),
+
+    ?line testSetOptional:compile(Config,?PER,[optimize]), 
+    ?line testSetOptional_cases(?PER).
+
+testSetOptional_cases(Rules) ->
+    ?line ok = testSetOptional:ticket_7533(Rules),
+    ?line ok = testSetOptional:main(Rules).
+
+
+
+
+testSetPrim(suite) -> [];
+testSetPrim(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetPrim:compile(Config,?BER,[]),
+    ?line testSetPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetPrim_cases(?BER)),
+
+    ?line testSetPrim:compile(Config,?PER,[]), 
+    ?line testSetPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSetPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSetPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetPrim_cases(uper_bin)),
+
+    ?line testSetPrim:compile(Config,?PER,[optimize]), 
+    ?line testSetPrim_cases(?PER).
+
+testSetPrim_cases(Rules) ->
+    ?line testSetPrim:main(Rules).
+
+
+
+testSetTag(suite) -> [];
+testSetTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetTag:compile(Config,?BER,[]),
+    ?line testSetTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSetTag:compile(Config,?PER,[]), 
+    ?line testSetTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSetTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSetTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSetTag:compile(Config,?PER,[optimize]), 
+    ?line testSetTag_cases(?PER).
+
+testSetTag_cases(Rules) ->
+    ?line testSetTag:main(Rules).
+
+
+
+testSetTypeRefCho(suite) -> [];
+testSetTypeRefCho(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefCho:compile(Config,?BER,[]),
+    ?line testSetTypeRefCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefCho_cases(?BER)),
+
+    ?line testSetTypeRefCho:compile(Config,?PER,[]), 
+    ?line testSetTypeRefCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefCho_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefCho_cases(uper_bin)),
+
+    ?line testSetTypeRefCho:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefCho_cases(?PER).
+
+testSetTypeRefCho_cases(Rules) ->
+    ?line testSetTypeRefCho:main(Rules).
+
+
+
+testSetTypeRefPrim(suite) -> [];
+testSetTypeRefPrim(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefPrim:compile(Config,?BER,[]),
+    ?line testSetTypeRefPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefPrim_cases(?BER)),
+
+    ?line testSetTypeRefPrim:compile(Config,?PER,[]), 
+    ?line testSetTypeRefPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefPrim_cases(uper_bin)),
+
+    ?line testSetTypeRefPrim:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefPrim_cases(?PER).
+
+testSetTypeRefPrim_cases(Rules) ->
+    ?line testSetTypeRefPrim:main(Rules).
+
+
+
+testSetTypeRefSeq(suite) -> [];
+testSetTypeRefSeq(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefSeq:compile(Config,?BER,[]),
+    ?line testSetTypeRefSeq_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefSeq:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefSeq_cases(?BER)),
+
+    ?line testSetTypeRefSeq:compile(Config,?PER,[]), 
+    ?line testSetTypeRefSeq_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefSeq:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefSeq_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefSeq:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefSeq_cases(uper_bin)),
+
+    ?line testSetTypeRefSeq:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefSeq_cases(?PER).
+
+testSetTypeRefSeq_cases(Rules) ->
+    ?line testSetTypeRefSeq:main(Rules).
+
+
+
+testSetTypeRefSet(suite) -> [];
+testSetTypeRefSet(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefSet:compile(Config,?BER,[]),
+    ?line testSetTypeRefSet_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefSet:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefSet_cases(?BER)),
+
+    ?line testSetTypeRefSet:compile(Config,?PER,[]), 
+    ?line testSetTypeRefSet_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefSet:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefSet_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefSet:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefSet_cases(uper_bin)),
+
+    ?line testSetTypeRefSet:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefSet_cases(?PER).
+
+testSetTypeRefSet_cases(Rules) ->
+    ?line testSetTypeRefSet:main(Rules).
+
+
+
+testSetOf(suite) -> [];
+testSetOf(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetOf:compile(Config,?BER,[]),
+    ?line testSetOf_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetOf:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOf_cases(?BER)),
+
+    ?line testSetOf:compile(Config,?PER,[]), 
+    ?line testSetOf_cases(?PER),
+
+    ?line ?per_bit_opt(testSetOf:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOf_cases(?PER)),
+
+    ?line ?uper_bin(testSetOf:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOf_cases(uper_bin)),
+
+    ?line testSetOf:compile(Config,?PER,[optimize]), 
+    ?line testSetOf_cases(?PER).
+
+testSetOf_cases(Rules) ->
+    ?line testSetOf:main(Rules).
+
+
+
+testSetOfCho(suite) -> [];
+testSetOfCho(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetOfCho:compile(Config,?BER,[]),
+    ?line testSetOfCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetOfCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfCho_cases(?BER)),
+
+    ?line testSetOfCho:compile(Config,?PER,[]), 
+    ?line testSetOfCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSetOfCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOfCho_cases(?PER)),
+
+    ?line ?uper_bin(testSetOfCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOfCho_cases(uper_bin)),
+
+    ?line testSetOfCho:compile(Config,?PER,[optimize]), 
+    ?line testSetOfCho_cases(?PER).
+
+testSetOfCho_cases(Rules) ->
+    ?line testSetOfCho:main(Rules).
+
+
+testSetOfExternal(suite) -> [];
+testSetOfExternal(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetOfExternal:compile(Config,?BER,[]),
+    ?line testSetOfExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfExternal_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSetOfExternal:compile(Config,?PER,[]), 
+    ?line testSetOfExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSetOfExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOfExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSetOfExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOfExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSetOfExternal:compile(Config,?PER,[optimize]), 
+    ?line testSetOfExternal_cases(?PER).
+
+testSetOfExternal_cases(Rules) ->
+    ?line testSetOfExternal:main(Rules).
+
+
+
+
+testSetOfTag(suite) -> [];
+testSetOfTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetOfTag:compile(Config,?BER,[]),
+    ?line testSetOfTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSetOfTag:compile(Config,?PER,[]), 
+    ?line testSetOfTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSetOfTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOfTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSetOfTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOfTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSetOfTag:compile(Config,?PER,[optimize]), 
+    ?line testSetOfTag_cases(?PER).
+
+testSetOfTag_cases(Rules) ->
+    ?line testSetOfTag:main(Rules).
+
+
+c_syntax(suite) -> [];
+c_syntax(Config) ->
+    ?line DataDir%    ?line testExternal:compile(Config,?PER),     
+%    ?line testPrimExternal:compile(Config,?PER), 
+%    ?line testPrimExternal_cases(?PER).          
+ = ?config(data_dir,Config),
+    ?line _TempDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line {error,_R1} = asn1ct:compile(filename:join(DataDir,"Syntax")),
+    ?line {error,_R2} = asn1ct:compile(filename:join(DataDir,"BadTypeEnding")),
+    ?line {error,_R3} = asn1ct:compile(filename:join(DataDir,
+						    "BadValueAssignment1")),
+    ?line {error,_R4} = asn1ct:compile(filename:join(DataDir,
+                                                    "BadValueAssignment2")),
+    ?line {error,_R5} = asn1ct:compile(filename:join(DataDir,
+						    "BadValueSet")),
+    ?line {error,_R6} = asn1ct:compile(filename:join(DataDir,
+						    "ChoiceBadExtension")),
+    ?line {error,_R7} = asn1ct:compile(filename:join(DataDir,
+						"EnumerationBadExtension")),
+    ?line {error,_R8} = asn1ct:compile(filename:join(DataDir,
+						    "Example")),
+    ?line {error,_R9} = asn1ct:compile(filename:join(DataDir,
+						    "Export1")),
+    ?line {error,_R10} = asn1ct:compile(filename:join(DataDir,
+						     "MissingEnd")),
+    ?line {error,_R11} = asn1ct:compile(filename:join(DataDir,
+						     "SequenceBadComma")),
+    ?line {error,_R12} = asn1ct:compile(filename:join(DataDir,
+						"SequenceBadComponentName")),
+    ?line {error,_R13} = asn1ct:compile(filename:join(DataDir,
+						"SequenceBadComponentType")),
+    ?line {error,_R14} = asn1ct:compile(filename:join(DataDir,
+						"SeqBadComma")).
+
+
+c_string_per(suite) -> [];
+c_string_per(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line TempDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"String"),[?PER,{outdir,TempDir}]).
+
+c_string_ber(suite) -> [];
+c_string_ber(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line TempDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"String"),[?BER,{outdir,TempDir}]).
+
+
+c_implicit_before_choice(suite) -> [];
+c_implicit_before_choice(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line TempDir = ?config(priv_dir,Config),
+    ?line {error,_R2} = asn1ct:compile(filename:join(DataDir,"CCSNARG3"),[?BER,{outdir,TempDir}]).
+
+parse(suite) -> [];
+parse(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    M1 = test_modules(),
+%    M2 = parse_modules(),
+    ?line ok = parse1(M1,DataDir,OutDir).
+
+parse1([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[abs,{outdir,OutDir}]),
+    parse1(T,DataDir,OutDir);
+parse1([],_,_) ->
+    ok.
+
+per(suite) -> [];
+per(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = per1(per_modules(),DataDir,OutDir),
+    ?line ?per_bit_opt(per1_bit_opt(per_modules(),DataDir,OutDir)),
+    ?line ok = per1_opt(per_modules(),DataDir,OutDir).
+
+
+per1([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?PER,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    per1(T,DataDir,OutDir);
+per1([],_,_) ->
+    ok.
+
+per1_bit_opt([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?PER,optimize,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    per1_bit_opt(T,DataDir,OutDir);
+per1_bit_opt([],_,_) ->
+    ok.
+
+per1_opt([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?PER,optimized,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    per1_opt(T,DataDir,OutDir);
+per1_opt([],_,_) ->
+    ok.
+
+
+ber_choiceinseq(suite) ->[];
+ber_choiceinseq(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"ChoiceInSeq"),[?BER,{outdir,OutDir}]).
+
+ber_optional(suite) ->[];
+ber_optional(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"SOpttest"),[?BER,{outdir,OutDir}]),
+    ?line V = {'S',{'A',10,asn1_NOVALUE,asn1_NOVALUE},
+	 {'B',asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE},
+	 {'C',asn1_NOVALUE,111,asn1_NOVALUE}},
+    ?line {ok,B} = asn1_wrapper:encode('SOpttest','S',V),
+    ?line Bytes = lists:flatten(B),
+    ?line V2 = asn1_wrapper:decode('SOpttest','S',Bytes),
+    ?line ok = eq(V,element(2,V2)).
+
+ber_optional_keyed_list(suite) ->[];
+ber_optional_keyed_list(Config) ->
+    case ?BER of
+	ber_bin_v2 -> ok;
+	_ ->
+    	   ?line DataDir = ?config(data_dir,Config),
+    	   ?line OutDir = ?config(priv_dir,Config),
+    	   ?line true = code:add_patha(?config(priv_dir,Config)),
+    	   ?line ok = asn1ct:compile(filename:join(DataDir,"SOpttest"),
+			      [?BER,keyed_list,{outdir,OutDir}]),
+    	   ?line Vrecord = {'S',{'A',10,asn1_NOVALUE,asn1_NOVALUE},
+	      {'B',asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE},
+	      {'C',asn1_NOVALUE,111,asn1_NOVALUE}},
+    	   ?line V = [ {a,[{scriptKey,10}]},
+		       {b,[]},
+		       {c,[{callingPartysCategory,111}]} ],
+    	   ?line {ok,B} = asn1_wrapper:encode('SOpttest','S',V),
+    	   ?line Bytes = lists:flatten(B),
+    	   ?line V2 = asn1_wrapper:decode('SOpttest','S',Bytes),
+    	   ?line ok = eq(Vrecord,element(2,V2))
+    end.
+
+
+eq(V,V) ->
+    ok.
+
+
+ber_other(suite) ->[];
+ber_other(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = ber1(ber_modules(),DataDir,OutDir).
+
+
+ber1([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?BER,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    ber1(T,DataDir,OutDir);
+ber1([],_,_) ->
+    ok.
+
+default_per(suite) ->[];
+default_per(Config) ->
+    default1(?PER,Config,[]).
+
+default_per_opt(suite) -> [];
+default_per_opt(Config) ->
+    ?per_bit_opt(default1(?PER,Config,[optimize])),
+    default1(?PER,Config,[optimize]).
+
+default_ber(suite) ->[];
+default_ber(Config) ->
+    default1(?BER,Config,[]).
+
+default1(Rule,Config,Options) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(DataDir ++ "Def",[Rule,{outdir,OutDir}]++Options),
+    ?line {ok,Bytes1} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true,
+						 bool1 = true,
+						 bool2 = true,
+						 bool3 = true}),
+    ?line {ok,{'Def1',true,true,true,true}} = asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes1)),
+    
+    ?line {ok,Bytes2} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true}),
+    ?line {ok,{'Def1',true,false,false,false}} = asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes2)),
+
+    ?line {ok,Bytes3} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true,bool2=false}),
+    ?line {ok,{'Def1',true,false,false,false}} = asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes3)).
+    
+    
+value_test(suite) ->[];
+value_test(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(DataDir ++ "ObjIdValues",[?BER,{outdir,OutDir}]),
+    ?line {ok,_} = asn1_wrapper:encode('ObjIdValues','ObjIdType','ObjIdValues':'mobileDomainId'()),
+    ?line ok = asn1ct:compile(DataDir ++ "ObjIdValues",[?PER,{outdir,OutDir}]),
+    ?line {ok,_} = asn1_wrapper:encode('ObjIdValues','ObjIdType','ObjIdValues':'mobileDomainId'()),
+    ?line ok = test_bad_values:tests(Config),
+    ok.
+
+
+constructed(suite) ->
+     [];
+constructed(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(DataDir ++ "Constructed",[?BER,{outdir,OutDir}]),
+    ?line {ok,B} = asn1_wrapper:encode('Constructed','S',{'S',false}),
+    ?line [40,3,1,1,0] = lists:flatten(B),
+    ?line {ok,B1} = asn1_wrapper:encode('Constructed','S2',{'S2',false}),
+    ?line [40,5,48,3,1,1,0] = lists:flatten(B1),
+    ?line {ok,B2} = asn1_wrapper:encode('Constructed','I',10),
+    ?line [136,1,10] = lists:flatten(B2),
+    ok.
+    
+ber_decode_error(suite) -> [];
+ber_decode_error(Config) ->
+    ?line ok = ber_decode_error:compile(Config,?BER,[]),
+    ?line ok = ber_decode_error:run([]),
+
+    ?line ok = ?ber_driver(?BER,ber_decode_error:compile(Config,?BER,[driver])),
+    ?line ok = ?ber_driver(?BER,ber_decode_error:run([driver])),
+	ok.   
+
+h323test(suite) -> 
+    [];
+h323test(Config) ->
+    ?line ok = h323test:compile(Config,?PER,[]),
+    ?line ok = h323test:run(?PER),
+    ?line ?per_bit_opt(h323test:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(h323test:run(?PER)),
+    ?line ?uper_bin(h323test:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(h323test:run(uper_bin)),
+    ?line ok = h323test:compile(Config,?PER,[optimize]),
+    ?line ok = h323test:run(?PER),
+    ok.
+
+per_GeneralString(suite) ->
+     [];
+per_GeneralString(Config) ->
+    case erlang:module_loaded('MULTIMEDIA-SYSTEM-CONTROL') of
+	true ->
+	    ok;
+	false ->
+	    h323test:compile(Config,?PER,[])
+    end,
+    UI = [109,64,1,57],
+    ?line {ok,_V} = asn1_wrapper:decode('MULTIMEDIA-SYSTEM-CONTROL',
+				 'MultimediaSystemControlMessage',UI).
+
+per_open_type(suite) ->
+    [];
+per_open_type(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line ok = asn1ct:compile(DataDir ++ "OpenType",[?PER,{outdir,OutDir}]),
+    Stype = {'Stype',10,true},
+    ?line {ok,Bytes} = asn1_wrapper:encode('OpenType','Ot',Stype),
+    ?line {ok,Stype} = asn1_wrapper:decode('OpenType','Ot',Bytes),
+
+    ?line ?per_bit_opt(ok = asn1ct:compile(DataDir ++ "OpenType",
+			      [?PER,optimize,{outdir,OutDir}])),
+    ?line ?per_bit_opt({ok,Bytes}=asn1_wrapper:encode('OpenType','Ot',Stype)),
+    ?line ?per_bit_opt({ok,Stype}=asn1_wrapper:decode('OpenType','Ot',Bytes)),
+
+    ?line ?uper_bin(ok = asn1ct:compile(DataDir ++ "OpenType",
+			      [uper_bin,{outdir,OutDir}])),
+    ?line ?uper_bin({ok,Bytes}=asn1_wrapper:encode('OpenType','Ot',Stype)),
+    ?line ?uper_bin({ok,Stype}=asn1_wrapper:decode('OpenType','Ot',Bytes)),
+
+    ?line ok = asn1ct:compile(DataDir ++ "OpenType",
+			      [?PER,optimize,{outdir,OutDir}]),
+    ?line {ok,Bytes} = asn1_wrapper:encode('OpenType','Ot',Stype),
+    ?line {ok,Stype} = asn1_wrapper:decode('OpenType','Ot',Bytes).
+
+testConstraints(suite) ->
+	[];
+testConstraints(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testConstraints:compile(Config,?BER,[]),
+    ?line testConstraints:int_constraints(?BER),
+
+    ?line ?ber_driver(?BER,testConstraints:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testConstraints:int_constraints(?BER)),
+
+    ?line testConstraints:compile(Config,?PER,[]),
+    ?line testConstraints:int_constraints(?PER),
+    ?line testConstraints:refed_NNL_name(?PER),
+
+    ?line ?per_bit_opt(testConstraints:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testConstraints:int_constraints(?PER)),
+    ?line ?per_bit_opt(testConstraints:refed_NNL_name(?PER)),
+
+    ?line ?uper_bin(testConstraints:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testConstraints:int_constraints(uper_bin)),
+    ?line ?uper_bin(testConstraints:refed_NNL_name(uper_bin)),
+
+    ?line testConstraints:compile(Config,?PER,[optimize]),
+    ?line testConstraints:int_constraints(?PER),
+    ?line testConstraints:refed_NNL_name(?PER).
+
+testSeqIndefinite(suite) -> [];
+testSeqIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqIndefinite:compile(Config,?BER,[]),
+    ?line testSeqIndefinite:main(?BER),
+
+    ?line ?ber_driver(?BER,testSeqIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqIndefinite:main(?BER)).
+
+testSetIndefinite(suite) -> [];
+testSetIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetIndefinite:compile(Config,?BER,[]),
+    ?line testSetIndefinite:main(?BER),
+
+    ?line ?ber_driver(?BER,testSetIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetIndefinite:main(?BER)).
+
+testChoiceIndefinite(suite) -> [];
+testChoiceIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testChoiceIndefinite:compile(Config,?BER,[]),
+    ?line testChoiceIndefinite:main(?BER),
+
+    ?line ?ber_driver(?BER,testChoiceIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoiceIndefinite:main(?BER)).
+
+testInfObjectClass(suite) ->
+    [];
+testInfObjectClass(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line testInfObjectClass:compile(Config,?PER,[]),
+    ?line testInfObjectClass:main(?PER),
+    ?line testInfObj:compile(Config,?PER,[]),
+    ?line testInfObj:main(?PER),
+
+    ?line ?per_bit_opt(testInfObjectClass:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testInfObjectClass:main(?PER)),
+    ?line ?per_bit_opt(testInfObj:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testInfObj:main(?PER)),
+
+    ?line ?uper_bin(testInfObjectClass:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testInfObjectClass:main(uper_bin)),
+    ?line ?uper_bin(testInfObj:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testInfObj:main(uper_bin)),
+
+    ?line testInfObjectClass:compile(Config,?PER,[optimize]),
+    ?line testInfObjectClass:main(?PER),
+    ?line testInfObj:compile(Config,?PER,[optimize]),
+    ?line testInfObj:main(?PER),
+
+    ?line testInfObjectClass:compile(Config,?BER,[]),
+    ?line testInfObjectClass:main(?BER),
+    ?line testInfObj:compile(Config,?BER,[]),
+    ?line testInfObj:main(?BER),
+
+    ?line ?ber_driver(?BER,testInfObjectClass:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testInfObjectClass:main(?BER)),
+    ?line ?ber_driver(?BER,testInfObj:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testInfObj:main(?BER)),
+
+    ?line testInfObj:compile_RANAPfiles(Config,?PER,[]),
+
+    ?line ?per_bit_opt(testInfObj:compile_RANAPfiles(Config,?PER,[optimize])),
+
+    ?line ?uper_bin(testInfObj:compile_RANAPfiles(Config,uper_bin,[])),
+
+    ?line testInfObj:compile_RANAPfiles(Config,?PER,[optimize]),
+
+    ?line testInfObj:compile_RANAPfiles(Config,?BER,[]).
+
+testParameterizedInfObj(suite) ->
+    [];
+testParameterizedInfObj(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line testParameterizedInfObj:compile(Config,?PER,[]),
+    ?line testParameterizedInfObj:main(?PER),
+
+    ?line ?per_bit_opt(testParameterizedInfObj:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testParameterizedInfObj:main(?PER)),
+
+    ?line ?uper_bin(testParameterizedInfObj:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testParameterizedInfObj:main(uper_bin)),
+
+    ?line testParameterizedInfObj:compile(Config,?PER,[optimize]),
+    ?line testParameterizedInfObj:main(?PER),
+
+    ?line testParameterizedInfObj:compile(Config,?BER,[]),
+    ?line testParameterizedInfObj:main(?BER),
+
+    ?line ?ber_driver(?BER,testParameterizedInfObj:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testParameterizedInfObj:main(?BER)).
+
+testMergeCompile(suite) ->
+    [];
+testMergeCompile(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line testMergeCompile:compile(Config,?PER,[]),
+    ?line testMergeCompile:main(?PER),
+    ?line testMergeCompile:mvrasn(?PER),
+
+    ?line ?per_bit_opt(testMergeCompile:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testMergeCompile:main(?PER)),
+    ?line ?per_bit_opt(testMergeCompile:mvrasn(?PER)),
+
+    ?line ?uper_bin(testMergeCompile:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testMergeCompile:main(uper_bin)),
+    ?line ?uper_bin(testMergeCompile:mvrasn(uper_bin)),
+
+    ?line testMergeCompile:compile(Config,?BER,[]),
+    ?line testMergeCompile:main(?BER),
+    ?line testMergeCompile:mvrasn(?BER),
+
+    ?line ?ber_driver(?BER,testMergeCompile:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testMergeCompile:main(?BER)),
+    ?line ?ber_driver(?BER,testMergeCompile:mvrasn(?BER)).
+
+testobj(suite) ->
+    [];
+testobj(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line ok = testRANAP:compile(Config,?PER,[]),
+    ?line ok = testRANAP:testobj(?PER),
+    ?line ok = testParameterizedInfObj:ranap(?PER),
+    
+    ?line ?per_bit_opt(ok = testRANAP:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(ok = testRANAP:testobj(?PER)),
+    ?line ?per_bit_opt(ok = testParameterizedInfObj:ranap(?PER)),
+    
+    ?line ?uper_bin(ok = testRANAP:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(ok = testRANAP:testobj(uper_bin)),
+    ?line ?uper_bin(ok = testParameterizedInfObj:ranap(uper_bin)),
+    
+    ?line ok = testRANAP:compile(Config,?PER,[optimize]),
+    ?line ok = testRANAP:testobj(?PER),
+    ?line ok = testParameterizedInfObj:ranap(?PER),
+
+    ?line ok = testRANAP:compile(Config,?BER,[]),
+    ?line ok = testRANAP:testobj(?BER),
+    ?line ok = testParameterizedInfObj:ranap(?BER),
+
+    ?line ?ber_driver(?BER,testRANAP:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testRANAP:testobj(?BER)),
+    ?line ?ber_driver(?BER,testParameterizedInfObj:ranap(?BER)).
+
+
+testDeepTConstr(suite) ->
+    [];
+testDeepTConstr(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testDeepTConstr:compile(Config,?PER,[]),
+    ?line testDeepTConstr:main(?PER),
+
+    ?line ?per_bit_opt(testDeepTConstr:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testDeepTConstr:main(?PER)),
+
+    ?line ?uper_bin(testDeepTConstr:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testDeepTConstr:main(uper_bin)),
+
+    ?line testDeepTConstr:compile(Config,?PER,[optimize]),
+    ?line testDeepTConstr:main(?PER),
+
+    ?line testDeepTConstr:compile(Config,?BER,[]),
+    ?line testDeepTConstr:main(?BER),
+
+    ?line ?ber_driver(?BER,testDeepTConstr:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDeepTConstr:main(?BER)).
+
+testInvokeMod(suite) ->
+    [];
+testInvokeMod(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line ok = asn1ct:compile(filename:join(DataDir,"PrimStrings"),[{outdir,OutDir}]),
+    ?line {ok,_Result1} = 'PrimStrings':encode('Bs1',[1,0,1,0]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"PrimStrings"),[?PER,{outdir,OutDir}]),
+    ?line {ok,_Result2} = 'PrimStrings':encode('Bs1',[1,0,1,0]).
+
+testExport(suite) ->
+    [];
+testExport(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line {error,{asn1,_Reason}} = asn1ct:compile(filename:join(DataDir,"IllegalExport"),[{outdir,OutDir}]).
+
+testImport(suite) ->
+    [];
+testImport(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line _OutDir = ?config(priv_dir,Config),
+    ?line {error,_} = asn1ct:compile(filename:join(DataDir,"ImportsFrom"),[?BER]),
+    ok.
+
+testMegaco(suite) ->
+    [];
+testMegaco(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    io:format("Config: ~p~n",[Config]),
+    ?line {ok,ModuleName1,ModuleName2} = testMegaco:compile(Config,?BER,[]),
+    ?line ok = testMegaco:main(ModuleName1,Config),
+    ?line ok = testMegaco:main(ModuleName2,Config),
+
+    case ?BER of
+	ber_bin_v2 ->
+	    ?line {ok,ModuleName3,ModuleName4} = testMegaco:compile(Config,?BER,[driver]),
+	    ?line ok = testMegaco:main(ModuleName3,Config),
+	    ?line ok = testMegaco:main(ModuleName4,Config);
+	_-> ok
+    end,
+
+    ?line {ok,ModuleName5,ModuleName6} = testMegaco:compile(Config,?PER,[]),
+    ?line ok = testMegaco:main(ModuleName5,Config),
+    ?line ok = testMegaco:main(ModuleName6,Config),
+
+    ?line ?per_bit_opt({ok,ModuleName5,ModuleName6} = testMegaco:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(ok = testMegaco:main(ModuleName5,Config)),
+    ?line ?per_bit_opt(ok = testMegaco:main(ModuleName6,Config)),
+
+    ?line ?uper_bin({ok,ModuleName5,ModuleName6} = testMegaco:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(ok = testMegaco:main(ModuleName5,Config)),
+    ?line ?uper_bin(ok = testMegaco:main(ModuleName6,Config)),
+
+    ?line {ok,ModuleName7,ModuleName8} = testMegaco:compile(Config,?PER,[optimize]),
+    ?line ok = testMegaco:main(ModuleName7,Config),
+    ?line ok = testMegaco:main(ModuleName8,Config).
+
+
+testMvrasn6(suite) -> [];
+testMvrasn6(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testMvrasn6:compile(Config,?BER),
+    ?line testMvrasn6:main().
+
+testContextSwitchingTypes(suite) -> [];
+testContextSwitchingTypes(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testContextSwitchingTypes:compile(Config,?BER,[]),
+    ?line testContextSwitchingTypes:test(),
+
+    ?line ?ber_driver(?BER,testContextSwitchingTypes:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testContextSwitchingTypes:test()),
+
+    ?line testContextSwitchingTypes:compile(Config,?PER,[]),
+    ?line testContextSwitchingTypes:test(),
+
+    ?line ?per_bit_opt(testContextSwitchingTypes:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testContextSwitchingTypes:test()),
+
+    ?line ?uper_bin(testContextSwitchingTypes:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testContextSwitchingTypes:test()),
+
+    ?line testContextSwitchingTypes:compile(Config,?PER,[optimize]),
+    ?line testContextSwitchingTypes:test().
+
+testTypeValueNotation(suite) -> [];
+testTypeValueNotation(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    case ?BER of
+	Ber when Ber == ber; Ber == ber_bin ->
+	    ?line testTypeValueNotation:compile(Config,?BER,[]),
+	    ?line testTypeValueNotation:main(?BER,dummy);
+	_ ->
+	    ok
+    end,
+
+    ?line ?ber_driver(?BER,testTypeValueNotation:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testTypeValueNotation:main(?BER,optimize)),
+
+    case ?BER of
+	Ber2 when Ber2 == ber; Ber2 == ber_bin ->
+	    ?line testTypeValueNotation:compile(Config,?PER,[]),
+	    ?line testTypeValueNotation:main(?PER,dummy);
+	_ ->
+	    ok
+    end,
+
+    ?line ?per_bit_opt(testTypeValueNotation:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testTypeValueNotation:main(?PER,optimize)),
+
+    ?line ?uper_bin(testTypeValueNotation:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testTypeValueNotation:main(uper_bin,optimize)),
+    case ?BER of
+	Ber3 when Ber3 == ber; Ber3 == ber_bin ->
+	    ?line testTypeValueNotation:compile(Config,?PER,[optimize]),
+	    ?line testTypeValueNotation:main(?PER,optimize);
+	_ ->
+	    ok
+     end.
+
+testOpenTypeImplicitTag(suite) -> [];
+testOpenTypeImplicitTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testOpenTypeImplicitTag:compile(Config,?BER,[]),
+    ?line testOpenTypeImplicitTag:main(?BER),
+
+    ?line ?ber_driver(?BER,testOpenTypeImplicitTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testOpenTypeImplicitTag:main(?BER)),
+
+    ?line testOpenTypeImplicitTag:compile(Config,?PER,[]),
+    ?line testOpenTypeImplicitTag:main(?PER),
+
+    ?line ?per_bit_opt(testOpenTypeImplicitTag:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testOpenTypeImplicitTag:main(?PER)),
+
+    ?line ?uper_bin(testOpenTypeImplicitTag:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testOpenTypeImplicitTag:main(uper_bin)),
+
+    ?line testOpenTypeImplicitTag:compile(Config,?PER,[optimize]),
+    ?line testOpenTypeImplicitTag:main(?PER).
+
+duplicate_tags(suite) -> [];
+duplicate_tags(Config) ->
+	?line DataDir = ?config(data_dir,Config),
+	{error,{asn1,[{error,{type,_,_,'SeqOpt1Imp',{asn1,{duplicates_of_the_tags,_}}}}]}} = 
+	asn1ct:compile(filename:join(DataDir,"SeqOptional2"),[abs]),
+	ok.
+
+rtUI(suite) -> [];
+rtUI(Config) -> 
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Prim"),[?BER]),
+    ?line {ok,_} = asn1rt:info('Prim'),
+
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Prim"),[?PER]),
+    ?line {ok,_} = asn1rt:info('Prim'),
+
+    ?line ok = asn1rt:load_driver(),
+    ?line ok = asn1rt:load_driver(),
+    ?line ok = asn1rt:unload_driver().
+
+testROSE(suite) -> [];
+testROSE(Config) -> 
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testROSE:compile(Config,?BER,[]),
+
+    ?line testROSE:compile(Config,?PER,[]),
+    ?line ?per_bit_opt(testROSE:compile(Config,?PER,[optimize])),
+    ?line ?uper_bin(testROSE:compile(Config,uper_bin,[])),
+    ?line testROSE:compile(Config,?PER,[optimize]).
+
+testINSTANCE_OF(suite) -> [];
+testINSTANCE_OF(Config) ->
+    ?line testINSTANCE_OF:compile(Config,?BER,[]),
+    ?line testINSTANCE_OF:main(?BER),
+
+    ?line ?ber_driver(?BER,testINSTANCE_OF:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testINSTANCE_OF:main(?BER)),
+
+    ?line testINSTANCE_OF:compile(Config,?PER,[]),
+    ?line testINSTANCE_OF:main(?PER),
+
+    ?line ?per_bit_opt(testINSTANCE_OF:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testINSTANCE_OF:main(?PER)),
+
+    ?line ?uper_bin(testINSTANCE_OF:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testINSTANCE_OF:main(uper_bin)),
+
+    ?line testINSTANCE_OF:compile(Config,?PER,[optimize]),
+    ?line testINSTANCE_OF:main(?PER).
+
+testTCAP(suite) -> [];
+testTCAP(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testTCAP:compile(Config,?BER,[]),
+    ?line testTCAP:test(?BER,Config),
+
+    ?line ?ber_driver(?BER,testTCAP:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testTCAP:test(?BER,Config)),
+
+    ?line ?ber_driver(?BER,testTCAP:compile_asn1config(Config,?BER,[asn1config])),
+    ?line ?ber_driver(?BER,testTCAP:test_asn1config()).
+
+testDER(suite) ->[];
+testDER(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testDER:compile(Config,?BER,[]),
+    ?line testDER:test(),
+
+    ?line ?ber_driver(?BER,testDER:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDER:test()),
+
+    ?line testParamBasic:compile_der(Config,?BER),
+    ?line testParamBasic_cases(der),
+
+
+    ?line testSeqSetDefaultVal:compile(Config,?BER),
+    ?line testSeqSetDefaultVal_cases(?BER).
+
+testSeqSetDefaultVal_cases(?BER) ->
+    ?line testSeqSetDefaultVal:main(?BER).
+
+
+specialized_decodes(suite) -> [];
+specialized_decodes(Config) ->
+    ?line test_partial_incomplete_decode:compile(Config,?BER,[optimize]),
+    ?line test_partial_incomplete_decode:test(?BER,Config),
+    ?line test_selective_decode:test(?BER,Config).
+
+special_decode_performance(suite) ->[];
+special_decode_performance(Config) ->
+    ?line ?ber_driver(?BER,test_special_decode_performance:compile(Config,?BER)),
+    ?line ?ber_driver(?BER,test_special_decode_performance:go(all)).
+
+
+test_driver_load(suite) -> [];
+test_driver_load(Config) ->
+    ?line test_driver_load:compile(Config,?PER),
+    ?line test_driver_load:test(?PER,5).
+
+test_ParamTypeInfObj(suite) -> [];
+test_ParamTypeInfObj(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"IN-CS-1-Datatypes"),[ber_bin]).
+
+test_WS_ParamClass(suite) -> [];
+test_WS_ParamClass(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"InformationFramework"),
+				[ber_bin]).
+
+test_Defed_ObjectIdentifier(suite) -> [];
+test_Defed_ObjectIdentifier(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"UsefulDefinitions"),
+				[ber_bin]).
+
+testSelectionType(suite) -> [];
+testSelectionType(Config) ->
+
+    ?line ok = testSelectionTypes:compile(Config,?BER,[]),
+    ?line {ok,_}  = testSelectionTypes:test(),
+
+    ?line ok = testSelectionTypes:compile(Config,?PER,[]),
+    ?line {ok,_}  = testSelectionTypes:test().
+
+testSSLspecs(suite) -> [];
+testSSLspecs(Config) ->
+
+    ?line ok = testSSLspecs:compile(Config,?BER,
+				[optimize,compact_bit_string,der]),
+    ?line testSSLspecs:run(?BER),
+
+    case code:which(asn1ct) of
+       cover_compiled ->
+	   ok;
+       _ ->
+           ?line ok = testSSLspecs:compile_inline(Config,?BER),
+           ?line ok = testSSLspecs:run_inline(?BER)
+    end.
+
+testNortel(suite) -> [];
+testNortel(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),[?BER]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?BER,optimize]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?BER,optimize,driver]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),[?PER]),
+    ?line ?per_bit_opt(ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?PER,optimize])),
+    ?line ?uper_bin(ok = asn1ct:compile(filename:join(DataDir,"Nortel"),[uper_bin])),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?PER,optimize]).
+test_undecoded_rest(suite) -> [];
+test_undecoded_rest(Config) ->
+
+    ?line ok = test_undecoded_rest:compile(Config,?BER,[]),
+    ?line ok = test_undecoded_rest:test([]),
+
+    ?line ok = test_undecoded_rest:compile(Config,?BER,[undec_rest]),
+    ?line ok = test_undecoded_rest:test(undec_rest),
+
+    ?line ok = test_undecoded_rest:compile(Config,?PER,[]),
+    ?line ok = test_undecoded_rest:test([]),
+
+    ?line ?per_bit_opt(ok = test_undecoded_rest:compile(Config,?PER,[optimize,undec_rest])),
+    ?line ?per_bit_opt(ok = test_undecoded_rest:test(undec_rest)),
+
+    ?line ?uper_bin(ok = test_undecoded_rest:compile(Config,uper_bin,[undec_rest])),
+    ?line ?uper_bin(ok = test_undecoded_rest:test(undec_rest)),
+
+    ?line ok = test_undecoded_rest:compile(Config,?PER,[undec_rest]),
+    ?line ok = test_undecoded_rest:test(undec_rest).
+
+test_inline(suite) -> [];
+test_inline(Config) ->
+    case code:which(asn1ct) of
+       cover_compiled ->
+          {skip,"Not runnable when cover compiled"};
+       _  ->
+          ?line ok=test_inline:compile(Config,?BER,[]),
+          ?line test_inline:main(?BER),
+    	  ?line test_inline:inline1(Config,?BER,[]),
+     	  ?line test_inline:performance2()
+    end.
+
+%test_inline_prf(suite) -> [];
+%test_inline_prf(Config) ->
+%    ?line test_inline:performance(Config).
+
+testTcapsystem(suite) -> [];
+testTcapsystem(Config) ->
+    ?line ok=testTcapsystem:compile(Config,?BER,[]).
+
+testNBAPsystem(suite) -> [];
+testNBAPsystem(Config) ->
+    ?line ok=testNBAPsystem:compile(Config,?PER,?per_optimize(?BER)),
+    ?line ok=testNBAPsystem:test(?PER,Config).
+
+test_compile_options(suite) -> [];
+test_compile_options(Config) ->
+    case code:which(asn1ct) of
+       cover_compiled ->
+          {skip,"Not runnable when cover compiled"};
+       _  ->
+    	  ?line ok = test_compile_options:wrong_path(Config),
+    	  ?line ok = test_compile_options:path(Config),
+    	  ?line ok = test_compile_options:noobj(Config),
+	  ?line ok = test_compile_options:record_name_prefix(Config),
+	  ?line ok = test_compile_options:verbose(Config)
+    end.
+testDoubleEllipses(suite) ->  [];
+testDoubleEllipses(Config) ->
+    ?line testDoubleEllipses:compile(Config,?BER,[]),
+    ?line testDoubleEllipses:main(?BER),
+    ?line ?ber_driver(?BER,testDoubleEllipses:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDoubleEllipses:main(?BER)),
+    ?line ?per_bit_opt(testDoubleEllipses:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testDoubleEllipses:main(?PER)),
+    ?line ?uper_bin(testDoubleEllipses:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testDoubleEllipses:main(uper_bin)),
+    ?line testDoubleEllipses:compile(Config,?PER,?per_optimize(?BER)),
+    ?line testDoubleEllipses:main(?PER).
+
+test_modified_x420(suite) -> [];
+test_modified_x420(Config) ->
+    ?line test_modified_x420:compile(Config),
+    ?line test_modified_x420:test_io(Config).
+
+testX420(suite) -> [];
+testX420(Config) ->
+    ?line testX420:compile(?BER,[der],Config),
+    ?line ok = testX420:ticket7759(?BER,Config),
+    ?line testX420:compile(?PER,[],Config).
+
+test_x691(suite) -> [];
+test_x691(Config) ->
+    case ?PER of
+	per ->
+    	   ?line ok = test_x691:compile(Config,uper_bin,[]),
+    	   ?line true = test_x691:cases(uper_bin,unaligned),
+	   ?line ok = test_x691:compile(Config,?PER,[]),
+    	   ?line true = test_x691:cases(?PER,aligned),
+%%	   ?line ok = asn1_test_lib:ticket_7678(Config,[]),
+	   ?line ok = asn1_test_lib:ticket_7708(Config,[]),
+	   ?line ok = asn1_test_lib:ticket_7763(Config);
+	_ ->
+	   ?line ok = test_x691:compile(Config,?PER,?per_optimize(?BER)),
+    	   ?line true = test_x691:cases(?PER,aligned)
+    end.
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[]),
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[compact_bit_string]),
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[optimize]),
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[optimize,compact_bit_string]).
+
+
+ticket_6143(suite) -> [];
+ticket_6143(Config) ->
+    ?line ok = test_compile_options:ticket_6143(Config).
+
+testExtensionAdditionGroup(suite) -> [];
+testExtensionAdditionGroup(Config) ->
+	?line DataDir = ?config(data_dir,Config),
+	?line PrivDir = ?config(priv_dir,Config),
+	?line Path = code:get_path(),
+	?line code:add_patha(PrivDir),
+	DoIt = fun(Erule) ->
+		?line ok = asn1ct:compile(filename:join(DataDir,"Extension-Addition-Group"),[Erule,{outdir,PrivDir}]),
+		?line {ok,_M} = compile:file(filename:join(DataDir,"extensionAdditionGroup"),[{i,PrivDir},{outdir,PrivDir},debug_info]),
+		?line ok = extensionAdditionGroup:run(Erule)
+	       end,
+	?line [DoIt(Rule)|| Rule <- [per_bin,uper_bin,ber_bin]],
+	?line code:set_path(Path).
+
+
+
+% parse_modules() ->
+%	["ImportsFrom"].
+
+per_modules() ->
+	[X || X <- test_modules()].
+ber_modules() ->
+	[X || X <- test_modules(),
+		X =/= "CommonDataTypes",
+		X =/= "DS-EquipmentUser-CommonFunctionOrig-TransmissionPath",
+		X =/= "H323-MESSAGES",
+	        X =/= "H235-SECURITY-MESSAGES",
+	        X =/= "MULTIMEDIA-SYSTEM-CONTROL"].
+test_modules() ->
+    _Modules = [
+	       "BitStr",
+	       "CommonDataTypes",
+	       "Constraints",
+	       "ContextSwitchingTypes",
+	       "DS-EquipmentUser-CommonFunctionOrig-TransmissionPath",
+	       "Enum",
+	       "From",
+	       "H235-SECURITY-MESSAGES",
+	       "H323-MESSAGES",
+	       %%"MULTIMEDIA-SYSTEM-CONTROL", recursive type , problem for asn1ct:value
+	       "Import",
+	       "Int",
+	       "MAP-commonDataTypes",
+% ambigous tags	       "MAP-insertSubscriberData-def",
+	       "Null",
+	       "Octetstr",
+	       "One",
+	       "P-Record",
+	       "P",
+%	       "PDUs",
+	       "Person",
+	       "PrimStrings",
+	       "Real",
+	       "XSeq",
+	       "XSeqOf",
+	       "XSet",
+	       "XSetOf",
+	       "String",
+	       "SwCDR",
+%	       "Syntax",
+	       "Time"
+% ANY	       "Tst",
+%	       "Two",
+% errors that should be detected      "UndefType"
+] ++
+	[
+	 "SeqSetLib", % must be compiled before Seq and Set
+	 "Seq",
+	 "Set",
+	 "SetOf",
+	 "SeqOf",
+	 "Prim",
+	 "Cho",
+	 "Def",
+         "Opt",
+	 "ELDAPv3",
+	 "LDAP"
+	].
+
+
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2005-2010. 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%
+%%
+%%
+
+common() -> 
+[{group, app_test}, {group, appup_test}, testTimer_ber,
+ testTimer_ber_bin, testTimer_ber_bin_opt,
+ testTimer_ber_bin_opt_driver, testTimer_per,
+ testTimer_per_bin, testTimer_per_bin_opt,
+ testTimer_uper_bin, testComment, testName2Number].
+
+
+
+testTimer_ber(suite) -> [];
+testTimer_ber(Config) ->
+    ?line testTimer:compile(Config,ber,[]),
+    ?line testTimer:go(Config,ber).
+
+testTimer_ber_bin(suite) -> [];
+testTimer_ber_bin(Config) ->
+    ?line testTimer:compile(Config,ber_bin,[]),
+    ?line testTimer:go(Config,ber_bin).
+
+testTimer_ber_bin_opt(suite) -> [];
+testTimer_ber_bin_opt(Config) ->
+    ?line testTimer:compile(Config,ber_bin,[optimize]),
+    ?line testTimer:go(Config,ber_bin).
+
+testTimer_ber_bin_opt_driver(suite) -> [];
+testTimer_ber_bin_opt_driver(Config) ->
+    ?line testTimer:compile(Config,ber_bin,[optimize,driver]),
+    ?line testTimer:go(Config,ber_bin).
+
+testTimer_per(suite) -> [];
+testTimer_per(Config) ->
+    ?line testTimer:compile(Config,per,[]),
+    ?line testTimer:go(Config,per).
+
+testTimer_per_bin(suite) -> [];
+testTimer_per_bin(Config) ->
+    ?line testTimer:compile(Config,per_bin,[]),
+    ?line testTimer:go(Config,per_bin).
+
+testTimer_per_bin_opt(suite) -> [];
+testTimer_per_bin_opt(Config) ->
+    ?line testTimer:compile(Config,per_bin,[optimize]),
+    ?line testTimer:go(Config,per_bin).
+
+
+testTimer_uper_bin(suite) -> [];
+testTimer_uper_bin(Config) ->
+    ?line ok=testTimer:compile(Config,uper_bin,[]),
+    ?line {comment,_} = testTimer:go(Config,uper_bin).
+
+%% Test of multiple-line comment, OTP-8043
+testComment(suite) -> [];
+testComment(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+
+    ?line ok = asn1ct:compile(DataDir ++ "Comment",[{outdir,OutDir}]),
+
+    ?line {ok,Enc} = asn1_wrapper:encode('Comment','Seq',{'Seq',12,true}),
+    ?line {ok,{'Seq',12,true}} = asn1_wrapper:decode('Comment','Seq',Enc),
+    ok.
+
+testName2Number(suite) -> [];
+testName2Number(Config) -> 
+    DataDir = ?config(data_dir,Config),
+    OutDir = ?config(priv_dir,Config),
+    N2NOptions = [{n2n,Type}|| Type <- 
+				   ['CauseMisc','CauseProtocol',
+				    %% 'CauseNetwork',
+				    'CauseRadioNetwork',
+				    'CauseTransport','CauseNas']],
+    ?line ok = asn1ct:compile(DataDir ++ "S1AP-IEs",[{outdir,OutDir}]++N2NOptions),
+    ?line true = code:add_patha(OutDir),
+
+    ?line 0 = 'S1AP-IEs':name2num_CauseMisc('control-processing-overload'),
+    ?line 'unknown-PLMN' = 'S1AP-IEs':num2name_CauseMisc(5),
+    ok.
+
+
+particular() -> 
+    [ticket_7407].
+
+ticket_7407(suite) -> [];
+ticket_7407(Config) ->
+    ?line ok = asn1_test_lib:ticket_7407_compile(Config,[]),
+    ?line ok = asn1_test_lib:ticket_7407_code(true),
+
+    ?line ok = asn1_test_lib:ticket_7407_compile(Config,[no_final_padding]),
+    ?line ok = asn1_test_lib:ticket_7407_code(false).
diff --git a/lib/asn1/test/asn1_SUITE.erl.src b/lib/asn1/test/asn1_SUITE.erl.src
index ca73d259af..e1a09adc82 100644
--- a/lib/asn1/test/asn1_SUITE.erl.src
+++ b/lib/asn1/test/asn1_SUITE.erl.src
@@ -74,6 +74,7 @@ all(suite) -> [compile,parse,default_per,default_ber,default_per_opt,per,
 	       testSeqTypeRefPrim, testSeqTypeRefSeq, testSeqTypeRefSet, 
 	       testSeqOf, testSeqOfIndefinite, testSeqOfCho, 
 	       testSeqOfExternal, testSetDefault, testSetExtension, 
+	       testExtensionAdditionGroup,
 	       testSetExternal, testSeqOfTag, testSetOptional, testSetPrim, 
 	       testSetTag, testSetTypeRefCho, testSetTypeRefPrim,
 	       testSetTypeRefSeq, testSetTypeRefSet, testSetOf, testSetOfCho,
@@ -95,7 +96,7 @@ all(suite) -> [compile,parse,default_per,default_ber,default_per_opt,per,
 	       testSSLspecs, testNortel,test_undecoded_rest,
 	       test_inline, testTcapsystem, testNBAPsystem,
 	       test_compile_options,testDoubleEllipses, test_modified_x420,
-	       testX420, test_x691,ticket_6143
+	       testX420, test_x691,ticket_6143, testExtensionAdditionGroup
                ] ++ common() ++ particular().
 
 %all(suite) -> [test_inline,testNBAPsystem,test_compile_options,ticket_6143].
@@ -1036,7 +1037,6 @@ testSetExtension_cases(Rules) ->
     ?line testSetExtension:main(Rules).
 
 
-
 testSetExternal(suite) -> [];
 testSetExternal(Config) ->
     ?line true = code:add_patha(?config(priv_dir,Config)),
@@ -2292,6 +2292,25 @@ ticket_6143(suite) -> [];
 ticket_6143(Config) ->
     ?line ok = test_compile_options:ticket_6143(Config).
 
+testExtensionAdditionGroup(suite) -> [];
+testExtensionAdditionGroup(Config) ->
+	?line DataDir = ?config(data_dir,Config),
+	?line PrivDir = ?config(priv_dir,Config),
+	?line Path = code:get_path(),
+	?line code:add_patha(PrivDir),
+	DoIt = fun(Erule) ->
+		?line ok = asn1ct:compile(filename:join(DataDir,"Extension-Addition-Group"),Erule ++ [{outdir,PrivDir}]),
+		?line {ok,_M} = compile:file(filename:join(DataDir,"extensionAdditionGroup"),[{i,PrivDir},{outdir,PrivDir},debug_info]),
+		?line ok = extensionAdditionGroup:run(Erule),
+	        ?line ok = extensionAdditionGroup:run2(Erule),
+		?line ok = asn1ct:compile(filename:join(DataDir,"EUTRA-RRC-Definitions"),Erule ++ [{record_name_prefix,"RRC-"},{outdir,PrivDir}]),
+		?line ok = extensionAdditionGroup:run3(Erule)
+	       end,
+	?line [DoIt(Rule)|| Rule <- [[per_bin],[per_bin,optimize],[uper_bin]]],
+	%% FIXME problems with automatic tags [ber_bin],[ber_bin,optimize]
+	?line code:set_path(Path).
+
+
 
 % parse_modules() ->
 %	["ImportsFrom"].
diff --git a/lib/asn1/test/asn1_SUITE_data/AA2.asn1db b/lib/asn1/test/asn1_SUITE_data/AA2.asn1db
index 3bf2c1b89d..163dbb032d 100644
--- a/lib/asn1/test/asn1_SUITE_data/AA2.asn1db
+++ b/lib/asn1/test/asn1_SUITE_data/AA2.asn1db
diff --git a/lib/asn1/test/asn1_SUITE_data/EUTRA-RRC-Definitions.asn b/lib/asn1/test/asn1_SUITE_data/EUTRA-RRC-Definitions.asn
index a451874ef0..3b811dafe6 100644
--- a/lib/asn1/test/asn1_SUITE_data/EUTRA-RRC-Definitions.asn
+++ b/lib/asn1/test/asn1_SUITE_data/EUTRA-RRC-Definitions.asn
@@ -1,2640 +1,3155 @@
--- 3GPP TS 36.331 V8.8.0 (2009-12)
--- $Id$
---
-EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
- 
-BEGIN
-
-
-BCCH-BCH-Message ::= SEQUENCE {
-	message					BCCH-BCH-MessageType
-}
-
-BCCH-BCH-MessageType ::=						MasterInformationBlock
-
-
-BCCH-DL-SCH-Message ::= SEQUENCE {
-	message					BCCH-DL-SCH-MessageType
-}
-
-BCCH-DL-SCH-MessageType ::= CHOICE {
-	c1						CHOICE {
-		systemInformation						SystemInformation,
-		systemInformationBlockType1				SystemInformationBlockType1
-	},
-	messageClassExtension	SEQUENCE {}
-}
-
-
-PCCH-Message ::= SEQUENCE {
-	message					PCCH-MessageType
-}
-
-PCCH-MessageType ::= CHOICE {
-	c1						CHOICE {
-		paging									Paging
-	},
-	messageClassExtension	SEQUENCE {}
-}
-
-
-DL-CCCH-Message ::= SEQUENCE {
-	message					DL-CCCH-MessageType
-}
-
-DL-CCCH-MessageType ::= CHOICE {
-	c1						CHOICE {
-		rrcConnectionReestablishment			RRCConnectionReestablishment,
-		rrcConnectionReestablishmentReject		RRCConnectionReestablishmentReject,
-		rrcConnectionReject						RRCConnectionReject,
-		rrcConnectionSetup						RRCConnectionSetup
-	},
-	messageClassExtension	SEQUENCE {}
-}
-
-
-DL-DCCH-Message ::= SEQUENCE {
-	message					DL-DCCH-MessageType
-}
-
-DL-DCCH-MessageType ::= CHOICE {
-	c1						CHOICE {
-		csfbParametersResponseCDMA2000			CSFBParametersResponseCDMA2000,
-		dlInformationTransfer					DLInformationTransfer,
-		handoverFromEUTRAPreparationRequest		HandoverFromEUTRAPreparationRequest,
-		mobilityFromEUTRACommand				MobilityFromEUTRACommand,
-		rrcConnectionReconfiguration			RRCConnectionReconfiguration,
-		rrcConnectionRelease					RRCConnectionRelease,
-		securityModeCommand						SecurityModeCommand,
-		ueCapabilityEnquiry						UECapabilityEnquiry,
-		counterCheck							CounterCheck,
-		spare7 NULL,
-		spare6 NULL, spare5 NULL, spare4 NULL,
-		spare3 NULL, spare2 NULL, spare1 NULL
-	},
-	messageClassExtension	SEQUENCE {}
-}
-
-
-UL-CCCH-Message ::= SEQUENCE {
-	message					UL-CCCH-MessageType
-}
-
-UL-CCCH-MessageType ::= CHOICE {
-	c1						CHOICE {
-		rrcConnectionReestablishmentRequest		RRCConnectionReestablishmentRequest,
-		rrcConnectionRequest					RRCConnectionRequest
-	},
-	messageClassExtension	SEQUENCE {}
-}
-
-
-UL-DCCH-Message ::= SEQUENCE {
-	message					UL-DCCH-MessageType
-}
-
-UL-DCCH-MessageType ::= CHOICE {
-	c1						CHOICE {
-		csfbParametersRequestCDMA2000			CSFBParametersRequestCDMA2000,
-		measurementReport						MeasurementReport,
-		rrcConnectionReconfigurationComplete	RRCConnectionReconfigurationComplete,
-		rrcConnectionReestablishmentComplete	RRCConnectionReestablishmentComplete,
-		rrcConnectionSetupComplete				RRCConnectionSetupComplete,
-		securityModeComplete					SecurityModeComplete,
-		securityModeFailure						SecurityModeFailure,
-		ueCapabilityInformation					UECapabilityInformation,
-          ulHandoverPreparationTransfer			ULHandoverPreparationTransfer,
-		ulInformationTransfer					ULInformationTransfer,
-		counterCheckResponse					CounterCheckResponse,
-		spare5 NULL, spare4 NULL,
-		spare3 NULL, spare2 NULL, spare1 NULL
-	},
-	messageClassExtension	SEQUENCE {}
-}
-
-
-CounterCheck ::=			SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE {
-			counterCheck-r8						CounterCheck-r8-IEs,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-CounterCheck-r8-IEs ::=	SEQUENCE {
-	drb-CountMSB-InfoList				DRB-CountMSB-InfoList,
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL	--Need OP
-}
-
-DRB-CountMSB-InfoList::=		SEQUENCE (SIZE (1..maxDRB)) OF DRB-CountMSB-Info
-
-DRB-CountMSB-Info ::=	SEQUENCE {
-	drb-Identity					DRB-Identity,
-	countMSB-Uplink					INTEGER(0..33554431),
-	countMSB-Downlink				INTEGER(0..33554431)
-}
-
-
-CounterCheckResponse ::=			SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		counterCheckResponse-r8				CounterCheckResponse-r8-IEs,
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-CounterCheckResponse-r8-IEs ::=	SEQUENCE {
-	drb-CountInfoList					DRB-CountInfoList,
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-DRB-CountInfoList ::=			SEQUENCE (SIZE (0..maxDRB)) OF DRB-CountInfo
-
-DRB-CountInfo ::=	SEQUENCE {
-	drb-Identity					DRB-Identity,
-	count-Uplink					INTEGER(0..4294967295),
-	count-Downlink					INTEGER(0..4294967295)
-}
-
-
-CSFBParametersRequestCDMA2000 ::= SEQUENCE {
-	criticalExtensions					CHOICE {
-		csfbParametersRequestCDMA2000-r8	CSFBParametersRequestCDMA2000-r8-IEs,
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-CSFBParametersRequestCDMA2000-r8-IEs ::= SEQUENCE {
-	nonCriticalExtension				SEQUENCE {}						OPTIONAL
-}
-
-CSFBParametersResponseCDMA2000 ::= SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions						CHOICE {
-		csfbParametersResponseCDMA2000-r8		CSFBParametersResponseCDMA2000-r8-IEs,
-		criticalExtensionsFuture				SEQUENCE {}
-	}
-}
-
-CSFBParametersResponseCDMA2000-r8-IEs ::= SEQUENCE {
-	rand									RAND-CDMA2000,
-	mobilityParameters						MobilityParametersCDMA2000,
-	nonCriticalExtension					SEQUENCE {}						OPTIONAL	--Need OP
-}
-
-
-DLInformationTransfer ::=			SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE {
-			dlInformationTransfer-r8			DLInformationTransfer-r8-IEs,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-DLInformationTransfer-r8-IEs ::=	SEQUENCE {
-	dedicatedInfoType					CHOICE {
-		dedicatedInfoNAS					DedicatedInfoNAS,
-		dedicatedInfoCDMA2000-1XRTT			DedicatedInfoCDMA2000,
-		dedicatedInfoCDMA2000-HRPD			DedicatedInfoCDMA2000
-	},
-	nonCriticalExtension				SEQUENCE {}						OPTIONAL	--Need OP
-}
-
-
-HandoverFromEUTRAPreparationRequest ::= SEQUENCE {
-	rrc-TransactionIdentifier		RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE {
-			handoverFromEUTRAPreparationRequest-r8
-												HandoverFromEUTRAPreparationRequest-r8-IEs,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-HandoverFromEUTRAPreparationRequest-r8-IEs ::= SEQUENCE {
-	cdma2000-Type						CDMA2000-Type,
-	rand								RAND-CDMA2000				OPTIONAL,  -- Cond cdma2000-Type
-	mobilityParameters					MobilityParametersCDMA2000	OPTIONAL,  -- Cond cdma2000-Type
-	nonCriticalExtension				SEQUENCE {}					OPTIONAL	-- Need OP
-}
-
-
-MasterInformationBlock ::=			SEQUENCE {
-	dl-Bandwidth						ENUMERATED {
-											n6, n15, n25, n50, n75, n100},
-	phich-Config						PHICH-Config,
-	systemFrameNumber					BIT STRING (SIZE (8)),
-	spare								BIT STRING (SIZE (10))
-}
-
-
-
-MeasurementReport ::=				SEQUENCE {
-	criticalExtensions					CHOICE {
-		c1									CHOICE{
-			measurementReport-r8				MeasurementReport-r8-IEs,
-			spare7 NULL,
-			spare6 NULL, spare5 NULL, spare4 NULL,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-MeasurementReport-r8-IEs ::=		SEQUENCE {
-	measResults							MeasResults,
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-
-MobilityFromEUTRACommand ::=		SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE{
-			mobilityFromEUTRACommand-r8			MobilityFromEUTRACommand-r8-IEs,
-			spare3 NULL, spare2 NULL, spare1 	NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-MobilityFromEUTRACommand-r8-IEs ::=	SEQUENCE {
-	cs-FallbackIndicator				BOOLEAN,
-	purpose								CHOICE{
-		handover							Handover,
-		cellChangeOrder						CellChangeOrder
-	},
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP
-}
-
-Handover ::=						SEQUENCE {
-	targetRAT-Type						ENUMERATED {
-											utra, geran, cdma2000-1XRTT, cdma2000-HRPD,
-											spare4,	spare3, spare2, spare1, ...},
-	targetRAT-MessageContainer			OCTET STRING,
-	nas-SecurityParamFromEUTRA			OCTET STRING (SIZE (1)) 	OPTIONAL,  	-- Cond UTRAGERAN
-	systemInformation					SI-OrPSI-GERAN				OPTIONAL	-- Cond PSHO
-}
-
-CellChangeOrder ::=					SEQUENCE {
-	t304								ENUMERATED {
-											ms100, ms200, ms500, ms1000,
-											ms2000, ms4000, ms8000, spare1},
-	targetRAT-Type						CHOICE {
-			geran							SEQUENCE {
-				physCellId						PhysCellIdGERAN,
-				carrierFreq						CarrierFreqGERAN,
-				networkControlOrder				BIT STRING (SIZE (2)) 		OPTIONAL,	-- Need OP
-				systemInformation				SI-OrPSI-GERAN				OPTIONAL	-- Need OP
-			},
-			...
-	}
-}
-
-SI-OrPSI-GERAN ::=					CHOICE {
-	si									SystemInfoListGERAN,
-	psi									SystemInfoListGERAN
-}
-
-SystemInfoListGERAN ::=				SEQUENCE (SIZE (1..maxGERAN-SI)) OF
-										OCTET STRING (SIZE (1..23))
-
-
-Paging ::=					SEQUENCE {
-	pagingRecordList					PagingRecordList 					OPTIONAL,	-- Need ON
-	systemInfoModification				ENUMERATED {true}					OPTIONAL,	-- Need ON
-	etws-Indication						ENUMERATED {true}					OPTIONAL,	-- Need ON
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP
-}
-
-PagingRecordList ::=				SEQUENCE (SIZE (1..maxPageRec)) OF PagingRecord
-
-PagingRecord ::=					SEQUENCE {
-	ue-Identity							PagingUE-Identity,
-	cn-Domain							ENUMERATED	{ps, cs},
-	...
-}
-
-PagingUE-Identity ::=				CHOICE {
-	s-TMSI								S-TMSI,
-	imsi								IMSI,
-	...
-}
-
-IMSI ::=							SEQUENCE (SIZE (6..21)) OF IMSI-Digit
-
-IMSI-Digit::=						INTEGER (0..9)
-
-
-RRCConnectionReconfiguration ::=	SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE{
-			rrcConnectionReconfiguration-r8		RRCConnectionReconfiguration-r8-IEs,
-			spare7 NULL,
-			spare6 NULL, spare5 NULL, spare4 NULL,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-RRCConnectionReconfiguration-r8-IEs ::= SEQUENCE {
-	measConfig							MeasConfig						OPTIONAL,	-- Need ON
-	mobilityControlInfo					MobilityControlInfo				OPTIONAL,	-- Cond HO
-	dedicatedInfoNASList				SEQUENCE (SIZE(1..maxDRB)) OF
-											DedicatedInfoNAS			OPTIONAL,	-- Cond nonHO
-	radioResourceConfigDedicated		RadioResourceConfigDedicated	OPTIONAL, -- Cond HO-toEUTRA
-	securityConfigHO					SecurityConfigHO				OPTIONAL,	-- Cond HO
-	nonCriticalExtension				SEQUENCE {}						OPTIONAL	-- Need OP
-}
-
-SecurityConfigHO ::=				SEQUENCE {
-	handoverType						CHOICE {
-		intraLTE							SEQUENCE {
-			securityAlgorithmConfig				SecurityAlgorithmConfig		OPTIONAL,	-- Need OP
-			keyChangeIndicator					BOOLEAN,
-			nextHopChainingCount				NextHopChainingCount
-		},
-		interRAT							SEQUENCE {
-			securityAlgorithmConfig				SecurityAlgorithmConfig,
-			nas-SecurityParamToEUTRA			OCTET STRING (SIZE(6))
-		}
-	},
-	...
-}
-
-
-RRCConnectionReconfigurationComplete ::= SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		rrcConnectionReconfigurationComplete-r8
-											RRCConnectionReconfigurationComplete-r8-IEs,
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-RRCConnectionReconfigurationComplete-r8-IEs ::= SEQUENCE {
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-
-RRCConnectionReestablishment ::=	SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE{
-			rrcConnectionReestablishment-r8		RRCConnectionReestablishment-r8-IEs,
-			spare7 NULL,
-			spare6 NULL, spare5 NULL, spare4 	NULL,
-			spare3 NULL, spare2 NULL, spare1 	NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-RRCConnectionReestablishment-r8-IEs ::= SEQUENCE {
-	radioResourceConfigDedicated		RadioResourceConfigDedicated,
-	nextHopChainingCount				NextHopChainingCount,
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP
-}
-
-
-RRCConnectionReestablishmentComplete ::= SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		rrcConnectionReestablishmentComplete-r8
-											RRCConnectionReestablishmentComplete-r8-IEs,
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-RRCConnectionReestablishmentComplete-r8-IEs ::= SEQUENCE {
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-
-RRCConnectionReestablishmentReject ::= SEQUENCE {
-	criticalExtensions					CHOICE {
-		rrcConnectionReestablishmentReject-r8
-											RRCConnectionReestablishmentReject-r8-IEs,
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-RRCConnectionReestablishmentReject-r8-IEs ::= SEQUENCE {
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP
-}
-
-
-RRCConnectionReestablishmentRequest ::= SEQUENCE {
-	criticalExtensions					CHOICE {
-		rrcConnectionReestablishmentRequest-r8
-											RRCConnectionReestablishmentRequest-r8-IEs,
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-RRCConnectionReestablishmentRequest-r8-IEs ::= SEQUENCE {
-	ue-Identity							ReestabUE-Identity,
-	reestablishmentCause				ReestablishmentCause,
-	spare								BIT STRING (SIZE (2))
-}
-
-ReestabUE-Identity ::=				SEQUENCE {
-	c-RNTI								C-RNTI,
-	physCellId							PhysCellId,
-	shortMAC-I							ShortMAC-I
-}
-
-ReestablishmentCause ::=			ENUMERATED {
-										reconfigurationFailure, handoverFailure,
-										otherFailure, spare1}
-
-
-RRCConnectionReject ::=				SEQUENCE {
-	criticalExtensions					CHOICE {
-		c1									CHOICE {
-			rrcConnectionReject-r8				RRCConnectionReject-r8-IEs,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-RRCConnectionReject-r8-IEs ::=		SEQUENCE {
-	waitTime							INTEGER (1..16),
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP
-}
-
-
-RRCConnectionRelease ::=			SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE {
-			rrcConnectionRelease-r8				RRCConnectionRelease-r8-IEs,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-RRCConnectionRelease-r8-IEs ::=		SEQUENCE {
-	releaseCause						ReleaseCause,
-	redirectedCarrierInfo				RedirectedCarrierInfo				OPTIONAL,	-- Need ON
-	idleModeMobilityControlInfo			IdleModeMobilityControlInfo			OPTIONAL,	-- Need OP
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP
-}
-
-ReleaseCause ::=				ENUMERATED {loadBalancingTAUrequired,
-											other,spare2, spare1 }
-
-RedirectedCarrierInfo ::=			CHOICE {
-	eutra								ARFCN-ValueEUTRA,
-	geran								CarrierFreqsGERAN,
-	utra-FDD							ARFCN-ValueUTRA,
-	utra-TDD							ARFCN-ValueUTRA,
-	cdma2000-HRPD						CarrierFreqCDMA2000,
-	cdma2000-1xRTT						CarrierFreqCDMA2000,
-	...
-}
-
-IdleModeMobilityControlInfo ::=		SEQUENCE {
-	freqPriorityListEUTRA				FreqPriorityListEUTRA			OPTIONAL,		-- Need ON
-	freqPriorityListGERAN				FreqsPriorityListGERAN			OPTIONAL,		-- Need ON
-	freqPriorityListUTRA-FDD			FreqPriorityListUTRA-FDD		OPTIONAL,		-- Need ON
-	freqPriorityListUTRA-TDD			FreqPriorityListUTRA-TDD		OPTIONAL,		-- Need ON
-	bandClassPriorityListHRPD			BandClassPriorityListHRPD		OPTIONAL,		-- Need ON
-	bandClassPriorityList1XRTT			BandClassPriorityList1XRTT		OPTIONAL,		-- Need ON
-	t320								ENUMERATED {
-											min5, min10, min20, min30, min60, min120, min180,
-											spare1}						OPTIONAL,		-- Need OR
-	...
-}
-
-FreqPriorityListEUTRA ::=			SEQUENCE (SIZE (1..maxFreq)) OF FreqPriorityEUTRA
-
-FreqPriorityEUTRA ::=				SEQUENCE {
-	carrierFreq							ARFCN-ValueEUTRA,
-	cellReselectionPriority				CellReselectionPriority
-}
-
-FreqsPriorityListGERAN ::=			SEQUENCE (SIZE (1..maxGNFG)) OF FreqsPriorityGERAN
-
-FreqsPriorityGERAN ::=				SEQUENCE {
-	carrierFreqs						CarrierFreqsGERAN,
-	cellReselectionPriority				CellReselectionPriority
-}
-
-FreqPriorityListUTRA-FDD ::=		SEQUENCE (SIZE (1..maxUTRA-FDD-Carrier)) OF FreqPriorityUTRA-FDD
-
-FreqPriorityUTRA-FDD ::=			SEQUENCE {
-	carrierFreq							ARFCN-ValueUTRA,
-	cellReselectionPriority				CellReselectionPriority
-}
-
-FreqPriorityListUTRA-TDD ::=		SEQUENCE (SIZE (1..maxUTRA-TDD-Carrier)) OF FreqPriorityUTRA-TDD
-
-FreqPriorityUTRA-TDD ::=			SEQUENCE {
-	carrierFreq							ARFCN-ValueUTRA,
-	cellReselectionPriority				CellReselectionPriority
-}
-
-BandClassPriorityListHRPD ::=		SEQUENCE (SIZE (1..maxCDMA-BandClass)) OF BandClassPriorityHRPD 
-
-BandClassPriorityHRPD ::=			SEQUENCE {
-	bandClass							BandclassCDMA2000,
-	cellReselectionPriority				CellReselectionPriority
-}
-
-BandClassPriorityList1XRTT ::=	SEQUENCE (SIZE (1..maxCDMA-BandClass)) OF BandClassPriority1XRTT 
-
-BandClassPriority1XRTT ::=		SEQUENCE {
-	bandClass							BandclassCDMA2000,
-	cellReselectionPriority				CellReselectionPriority
-}
-
-RRCConnectionRequest ::=			SEQUENCE {
-	criticalExtensions					CHOICE {
-		rrcConnectionRequest-r8				RRCConnectionRequest-r8-IEs,
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-RRCConnectionRequest-r8-IEs ::=		SEQUENCE {
-	ue-Identity							InitialUE-Identity,
-	establishmentCause					EstablishmentCause,
-	spare								BIT STRING (SIZE (1))
-}
-
-InitialUE-Identity ::=				CHOICE {
-	s-TMSI								S-TMSI,
-	randomValue							BIT STRING (SIZE (40))
-}
-
-EstablishmentCause ::=				ENUMERATED {
-										emergency, highPriorityAccess, mt-Access, mo-Signalling,
-										mo-Data, spare3, spare2, spare1}
-
-
-RRCConnectionSetup ::=				SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE {
-			rrcConnectionSetup-r8				RRCConnectionSetup-r8-IEs,
-			spare7 NULL,
-			spare6 NULL, spare5 NULL, spare4 NULL,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-RRCConnectionSetup-r8-IEs ::=		SEQUENCE {
-	radioResourceConfigDedicated		RadioResourceConfigDedicated,
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP
-}
-
-
-RRCConnectionSetupComplete ::=		SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE{
-			rrcConnectionSetupComplete-r8		RRCConnectionSetupComplete-r8-IEs,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-RRCConnectionSetupComplete-r8-IEs ::= SEQUENCE {
-	selectedPLMN-Identity				INTEGER (1..6),
-	registeredMME						RegisteredMME						OPTIONAL,
-	dedicatedInfoNAS					DedicatedInfoNAS,
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-RegisteredMME ::=					SEQUENCE {
-	plmn-Identity						PLMN-Identity						OPTIONAL,
-	mmegi								BIT STRING (SIZE (16)),
-	mmec								MMEC
-}
-
-
-SecurityModeCommand ::=				SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE{
-			securityModeCommand-r8				SecurityModeCommand-r8-IEs,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-SecurityModeCommand-r8-IEs ::=		SEQUENCE {
-	securityConfigSMC					SecurityConfigSMC,
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP
-}
-
-SecurityConfigSMC ::=					SEQUENCE {
-	securityAlgorithmConfig					SecurityAlgorithmConfig,
-	...
-}
-
-
-SecurityModeComplete ::=			SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		securityModeComplete-r8				SecurityModeComplete-r8-IEs,
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-SecurityModeComplete-r8-IEs ::=		SEQUENCE {
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-
-SecurityModeFailure ::=				SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		securityModeFailure-r8				SecurityModeFailure-r8-IEs,
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-SecurityModeFailure-r8-IEs ::=		SEQUENCE {
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-
-SystemInformation ::=				SEQUENCE {
-	criticalExtensions					CHOICE {
-		systemInformation-r8				SystemInformation-r8-IEs,
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-SystemInformation-r8-IEs ::=		SEQUENCE {
-	sib-TypeAndInfo						SEQUENCE (SIZE (1..maxSIB)) OF CHOICE {
-		sib2								SystemInformationBlockType2,
-		sib3								SystemInformationBlockType3,
-		sib4								SystemInformationBlockType4,
-		sib5								SystemInformationBlockType5,
-		sib6								SystemInformationBlockType6,
-		sib7								SystemInformationBlockType7,
-		sib8								SystemInformationBlockType8,
-		sib9								SystemInformationBlockType9,
-		sib10								SystemInformationBlockType10,
-		sib11								SystemInformationBlockType11,
-		...
-	},
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP
-}
-
-
-SystemInformationBlockType1 ::=		SEQUENCE {
-	cellAccessRelatedInfo				SEQUENCE {
-		plmn-IdentityList					PLMN-IdentityList,
-		trackingAreaCode					TrackingAreaCode,
-		cellIdentity						CellIdentity,
-		cellBarred							ENUMERATED {barred, notBarred},
-		intraFreqReselection				ENUMERATED {allowed, notAllowed},
-		csg-Indication						BOOLEAN,
-		csg-Identity						BIT STRING (SIZE (27))	OPTIONAL	-- Need OR
-	},
-	cellSelectionInfo					SEQUENCE {
-		q-RxLevMin							Q-RxLevMin,
-		q-RxLevMinOffset					INTEGER (1..8)			OPTIONAL	-- Need OP
-	},
-	p-Max								P-Max						OPTIONAL,			-- Need OP
-	freqBandIndicator					INTEGER (1..64),
-	schedulingInfoList					SchedulingInfoList,
-	tdd-Config							TDD-Config					OPTIONAL,	-- Cond TDD
-	si-WindowLength						ENUMERATED {
-											ms1, ms2, ms5, ms10, ms15, ms20,
-											ms40},
-	systemInfoValueTag					INTEGER (0..31),
-	nonCriticalExtension				SEQUENCE {}					OPTIONAL	-- Need OP
-}
-
-PLMN-IdentityList ::=					SEQUENCE (SIZE (1..6)) OF PLMN-IdentityInfo
-
-PLMN-IdentityInfo ::=					SEQUENCE {
-	plmn-Identity							PLMN-Identity,
-	cellReservedForOperatorUse				ENUMERATED {reserved, notReserved}
-}
-
-SchedulingInfoList ::= SEQUENCE (SIZE (1..maxSI-Message)) OF SchedulingInfo
-
-SchedulingInfo ::=	SEQUENCE {
-	si-Periodicity						ENUMERATED {
-											rf8, rf16, rf32, rf64, rf128, rf256, rf512},
-	sib-MappingInfo						SIB-MappingInfo
-}
-
-SIB-MappingInfo ::= SEQUENCE (SIZE (0..maxSIB-1)) OF SIB-Type
-
-SIB-Type ::=						ENUMERATED {
-										sibType3, sibType4, sibType5, sibType6,
-										sibType7, sibType8, sibType9, sibType10,
-										sibType11, spare7, spare6, spare5,
-										spare4, spare3, spare2, spare1, ...}
-
-
-UECapabilityEnquiry ::=				SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE {
-			ueCapabilityEnquiry-r8				UECapabilityEnquiry-r8-IEs,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-UECapabilityEnquiry-r8-IEs ::=		SEQUENCE {
-	ue-CapabilityRequest				UE-CapabilityRequest,
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP
-}
-
-UE-CapabilityRequest ::=		SEQUENCE (SIZE (1..maxRAT-Capabilities)) OF RAT-Type
-
-
-UECapabilityInformation ::=			SEQUENCE {
-	rrc-TransactionIdentifier			RRC-TransactionIdentifier,
-	criticalExtensions					CHOICE {
-		c1									CHOICE{
-			ueCapabilityInformation-r8			UECapabilityInformation-r8-IEs,
-			spare7 NULL,
-			spare6 NULL, spare5 NULL, spare4 NULL,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-UECapabilityInformation-r8-IEs ::=	SEQUENCE {
-	ue-CapabilityRAT-ContainerList		UE-CapabilityRAT-ContainerList,
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-
-ULHandoverPreparationTransfer ::=	SEQUENCE {
-	criticalExtensions					CHOICE {
-		c1									CHOICE {
-			ulHandoverPreparationTransfer-r8		ULHandoverPreparationTransfer-r8-IEs,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture				SEQUENCE {}
-	}
-}
-
-ULHandoverPreparationTransfer-r8-IEs ::= SEQUENCE {
-	cdma2000-Type						CDMA2000-Type,
-	meid								BIT STRING (SIZE (56))	OPTIONAL,
-	dedicatedInfo						DedicatedInfoCDMA2000,
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-
-ULInformationTransfer ::=			SEQUENCE {
-	criticalExtensions					CHOICE {
-		c1									CHOICE {
-			ulInformationTransfer-r8			ULInformationTransfer-r8-IEs,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-ULInformationTransfer-r8-IEs ::=	SEQUENCE {
-	dedicatedInfoType			CHOICE {
-		dedicatedInfoNAS					DedicatedInfoNAS,
-		dedicatedInfoCDMA2000-1XRTT			DedicatedInfoCDMA2000,
-		dedicatedInfoCDMA2000-HRPD			DedicatedInfoCDMA2000
-	},
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-
-SystemInformationBlockType2 ::=		SEQUENCE {
-	ac-BarringInfo						SEQUENCE {
-		ac-BarringForEmergency				BOOLEAN,
-		ac-BarringForMO-Signalling			AC-BarringConfig				OPTIONAL,	-- Need OP
-		ac-BarringForMO-Data				AC-BarringConfig				OPTIONAL	-- Need OP
-	}																		OPTIONAL,	-- Need OP
-	radioResourceConfigCommon			RadioResourceConfigCommonSIB,
-	ue-TimersAndConstants				UE-TimersAndConstants,
-	freqInfo							SEQUENCE {
-		ul-CarrierFreq						ARFCN-ValueEUTRA				OPTIONAL,	-- Need OP
-		ul-Bandwidth						ENUMERATED {n6, n15, n25, n50, n75, n100}
-																			OPTIONAL,	-- Need OP
-		additionalSpectrumEmission			AdditionalSpectrumEmission
-	},
-	mbsfn-SubframeConfigList			MBSFN-SubframeConfigList			OPTIONAL, 	-- Need OR
-	timeAlignmentTimerCommon			TimeAlignmentTimer,
-	...
-}
-
-AC-BarringConfig ::=				SEQUENCE {
-	ac-BarringFactor					ENUMERATED {
-											p00, p05, p10, p15, p20, p25, p30, p40,
-											p50, p60, p70, p75, p80, p85, p90, p95},
-	ac-BarringTime						ENUMERATED {s4, s8, s16, s32, s64, s128, s256, s512},
-	ac-BarringForSpecialAC				BIT STRING (SIZE(5))
-}
-
-MBSFN-SubframeConfigList ::= 		SEQUENCE (SIZE (1..maxMBSFN-Allocations)) OF MBSFN-SubframeConfig
-
-MBSFN-SubframeConfig ::=			SEQUENCE {
-	radioframeAllocationPeriod			ENUMERATED {n1, n2, n4, n8, n16, n32},
-	radioframeAllocationOffset			INTEGER (0..7),
-	subframeAllocation					CHOICE {
-		oneFrame							BIT STRING (SIZE(6)),
-		fourFrames							BIT STRING (SIZE(24))
-	}
-}
-
-SystemInformationBlockType3 ::=		SEQUENCE {
-	cellReselectionInfoCommon			SEQUENCE {
-		q-Hyst								ENUMERATED {
-												dB0, dB1, dB2, dB3, dB4, dB5, dB6, dB8, dB10,
-												dB12, dB14, dB16, dB18, dB20, dB22, dB24},
-		speedStateReselectionPars			SEQUENCE {
-			mobilityStateParameters				MobilityStateParameters,
-			q-HystSF						SEQUENCE {
-				sf-Medium						ENUMERATED {
-														dB-6, dB-4, dB-2, dB0},
-				sf-High							ENUMERATED {
-														dB-6, dB-4, dB-2, dB0}
-			}
-		}																OPTIONAL		-- Need OP
-	},
-	cellReselectionServingFreqInfo		SEQUENCE {
-		s-NonIntraSearch					ReselectionThreshold		OPTIONAL,		-- Need OP
-		threshServingLow					ReselectionThreshold,
-		cellReselectionPriority				CellReselectionPriority
-	},
-	intraFreqCellReselectionInfo		SEQUENCE {
-		q-RxLevMin							Q-RxLevMin,
-		p-Max								P-Max						OPTIONAL,		-- Need OP
-		s-IntraSearch						ReselectionThreshold		OPTIONAL,		-- Need OP
-		allowedMeasBandwidth				AllowedMeasBandwidth		OPTIONAL,		-- Need OP
-		presenceAntennaPort1				PresenceAntennaPort1,
-		neighCellConfig						NeighCellConfig,
-		t-ReselectionEUTRA					T-Reselection,
-		t-ReselectionEUTRA-SF				SpeedStateScaleFactors		OPTIONAL		-- Need OP
-	},
-	...
-}
-
-
-SystemInformationBlockType4 ::=		SEQUENCE {
-	intraFreqNeighCellList				IntraFreqNeighCellList		OPTIONAL,	-- Need OR
-	intraFreqBlackCellList				IntraFreqBlackCellList				OPTIONAL,	-- Need OR
-	csg-PhysCellIdRange					PhysCellIdRange				OPTIONAL,	-- Cond CSG
-	...
-}
-
-IntraFreqNeighCellList ::=		SEQUENCE (SIZE (1..maxCellIntra)) OF IntraFreqNeighCellInfo
-
-IntraFreqNeighCellInfo ::=		SEQUENCE {
-	physCellId								PhysCellId,
-	q-OffsetCell							Q-OffsetRange,
-	...
-}
-
-IntraFreqBlackCellList ::=		SEQUENCE (SIZE (1..maxCellBlack)) OF PhysCellIdRange
-
-
-SystemInformationBlockType5 ::=		SEQUENCE {
-	interFreqCarrierFreqList			InterFreqCarrierFreqList,
-	...
-}
-
-InterFreqCarrierFreqList ::=		SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo
-
-InterFreqCarrierFreqInfo ::=	SEQUENCE {
-	dl-CarrierFreq						ARFCN-ValueEUTRA,
-	q-RxLevMin							Q-RxLevMin,
-	p-Max								P-Max							OPTIONAL,		-- Need OP
-	t-ReselectionEUTRA					T-Reselection,
-	t-ReselectionEUTRA-SF				SpeedStateScaleFactors			OPTIONAL,		-- Need OP
-	threshX-High						ReselectionThreshold,
-	threshX-Low							ReselectionThreshold,
-	allowedMeasBandwidth				AllowedMeasBandwidth,
-	presenceAntennaPort1				PresenceAntennaPort1,
-	cellReselectionPriority				CellReselectionPriority			OPTIONAL,		-- Need OP
-	neighCellConfig						NeighCellConfig,
-	q-OffsetFreq						Q-OffsetRange					DEFAULT dB0,
-	interFreqNeighCellList				InterFreqNeighCellList			OPTIONAL, 		-- Need OR
-	interFreqBlackCellList				InterFreqBlackCellList			OPTIONAL, 		-- Need OR
-	...
-}
-
-InterFreqNeighCellList ::=			SEQUENCE (SIZE (1..maxCellInter)) OF InterFreqNeighCellInfo
-
-InterFreqNeighCellInfo ::=			SEQUENCE {
-	physCellId							PhysCellId,
-	q-OffsetCell						Q-OffsetRange
-}
-
-InterFreqBlackCellList ::=			SEQUENCE (SIZE (1..maxCellBlack)) OF PhysCellIdRange
-
-
-SystemInformationBlockType6 ::=		SEQUENCE {
-	carrierFreqListUTRA-FDD				CarrierFreqListUTRA-FDD			OPTIONAL, 		-- Need OR
-	carrierFreqListUTRA-TDD				CarrierFreqListUTRA-TDD			OPTIONAL, 		-- Need OR
-	t-ReselectionUTRA					T-Reselection,
-	t-ReselectionUTRA-SF				SpeedStateScaleFactors			OPTIONAL,		-- Need OP
-	...
-}
-
-CarrierFreqListUTRA-FDD ::=		SEQUENCE (SIZE (1..maxUTRA-FDD-Carrier)) OF CarrierFreqUTRA-FDD 
-
-CarrierFreqUTRA-FDD ::=		SEQUENCE {
-	carrierFreq							ARFCN-ValueUTRA,
-	cellReselectionPriority				CellReselectionPriority			OPTIONAL, 		-- Need OP
-	threshX-High						ReselectionThreshold,
-	threshX-Low							ReselectionThreshold,
-	q-RxLevMin							INTEGER (-60..-13),
-	p-MaxUTRA							INTEGER (-50..33),
-	q-QualMin							INTEGER (-24..0),
-	...
-}
-
-CarrierFreqListUTRA-TDD ::=		SEQUENCE (SIZE (1..maxUTRA-TDD-Carrier)) OF CarrierFreqUTRA-TDD 
-
-CarrierFreqUTRA-TDD ::=		SEQUENCE {
-	carrierFreq							ARFCN-ValueUTRA,
-	cellReselectionPriority				CellReselectionPriority			OPTIONAL, 		-- Need OP
-	threshX-High						ReselectionThreshold,
-	threshX-Low							ReselectionThreshold,
-	q-RxLevMin							INTEGER (-60..-13),
-	p-MaxUTRA							INTEGER (-50..33),
-	...
-}
-
-
-SystemInformationBlockType7 ::=		SEQUENCE {
-	t-ReselectionGERAN					T-Reselection,
-	t-ReselectionGERAN-SF				SpeedStateScaleFactors				OPTIONAL,	-- Need OR
-	carrierFreqsInfoList				CarrierFreqsInfoListGERAN			OPTIONAL,	-- Need OR
-	...
-}
-
-CarrierFreqsInfoListGERAN ::=			SEQUENCE (SIZE (1..maxGNFG)) OF CarrierFreqsInfoGERAN
-
-CarrierFreqsInfoGERAN ::=			SEQUENCE {
-	carrierFreqs						CarrierFreqsGERAN,
-	commonInfo							SEQUENCE {
-		cellReselectionPriority				CellReselectionPriority			OPTIONAL,	-- Need OP
-		ncc-Permitted						BIT STRING (SIZE (8)),
-		q-RxLevMin							INTEGER (0..45),
-		p-MaxGERAN							INTEGER (0..39)					OPTIONAL,	-- Need OP
-		threshX-High						ReselectionThreshold,
-		threshX-Low							ReselectionThreshold
-	},
-	...
-}
-
-
-SystemInformationBlockType8 ::=		SEQUENCE {
-	systemTimeInfo						SystemTimeInfoCDMA2000				OPTIONAL,	-- Need OR
-	searchWindowSize					INTEGER (0..15)						OPTIONAL,	-- Need OR
-	parametersHRPD						SEQUENCE {
-		preRegistrationInfoHRPD				PreRegistrationInfoHRPD,
-		cellReselectionParametersHRPD		CellReselectionParametersCDMA2000	OPTIONAL -- Need OR
-	}																		OPTIONAL,	-- Need OR
-	parameters1XRTT						SEQUENCE {
-		csfb-RegistrationParam1XRTT			CSFB-RegistrationParam1XRTT		OPTIONAL,	-- Need OP
-		longCodeState1XRTT					BIT STRING (SIZE (42))			OPTIONAL,	-- Need OR
-		cellReselectionParameters1XRTT		CellReselectionParametersCDMA2000	OPTIONAL -- Need OR
-	}																		OPTIONAL,	-- Need OR
-	...
-}
-
-CellReselectionParametersCDMA2000 ::= SEQUENCE {
-	bandClassList						BandClassListCDMA2000,
-	neighCellList						NeighCellListCDMA2000,
-	t-ReselectionCDMA2000      			T-Reselection,
-	t-ReselectionCDMA2000-SF			SpeedStateScaleFactors				OPTIONAL	-- Need OP
-}
-NeighCellListCDMA2000 ::=			SEQUENCE (SIZE (1..16)) OF NeighCellCDMA2000
-
-NeighCellCDMA2000 ::=	SEQUENCE {
-	bandClass							BandclassCDMA2000,
-	neighCellsPerFreqList						NeighCellsPerBandclassListCDMA2000
-}
-
-NeighCellsPerBandclassListCDMA2000 ::= SEQUENCE (SIZE (1..16)) OF NeighCellsPerBandclassCDMA2000
-
-NeighCellsPerBandclassCDMA2000 ::=	SEQUENCE {
-	arfcn							ARFCN-ValueCDMA2000,
-	physCellIdList						PhysCellIdListCDMA2000
-}
-
-PhysCellIdListCDMA2000 ::=			SEQUENCE (SIZE (1..16)) OF PhysCellIdCDMA2000
-
-BandClassListCDMA2000 ::=			SEQUENCE (SIZE (1..maxCDMA-BandClass)) OF BandClassInfoCDMA2000
-
-BandClassInfoCDMA2000 ::=	SEQUENCE {
-	bandClass							BandclassCDMA2000,
-	cellReselectionPriority				CellReselectionPriority				OPTIONAL,	-- Need OP
-	threshX-High						INTEGER (0..63),
-	threshX-Low							INTEGER (0..63),
-	...
-}
-
-
-SystemInformationBlockType9 ::=		SEQUENCE {
-	hnb-Name							OCTET STRING (SIZE(1..48))		OPTIONAL,	-- Need OR
-	...
-}
-
-
-SystemInformationBlockType10 ::=	SEQUENCE {
-	messageIdentifier					BIT STRING (SIZE (16)),
-	serialNumber						BIT STRING (SIZE (16)),
-	warningType							OCTET STRING (SIZE (2)),
-	warningSecurityInfo					OCTET STRING (SIZE (50))		OPTIONAL,		-- Need OP
-	...
-}
-
-
-SystemInformationBlockType11 ::=	SEQUENCE {
-	messageIdentifier					BIT STRING (SIZE (16)),
-	serialNumber						BIT STRING (SIZE (16)),
-	warningMessageSegmentType			ENUMERATED {notLastSegment, lastSegment},
-	warningMessageSegmentNumber			INTEGER (0..63),
-	warningMessageSegment				OCTET STRING,
-	dataCodingScheme					OCTET STRING (SIZE (1)) 		OPTIONAL, 	-- Cond Segment1
-	...
-}
-
-
-AntennaInfoCommon ::=				SEQUENCE {
-	antennaPortsCount					ENUMERATED {an1, an2, an4, spare1}
-}
-
-AntennaInfoDedicated ::=			SEQUENCE {
-	transmissionMode					ENUMERATED {
-											tm1, tm2, tm3, tm4, tm5, tm6,
-											tm7, spare1},
-	codebookSubsetRestriction			CHOICE {
-		n2TxAntenna-tm3						BIT STRING (SIZE (2)),
-		n4TxAntenna-tm3						BIT STRING (SIZE (4)),
-		n2TxAntenna-tm4						BIT STRING (SIZE (6)),
-		n4TxAntenna-tm4						BIT STRING (SIZE (64)),
-		n2TxAntenna-tm5						BIT STRING (SIZE (4)),
-		n4TxAntenna-tm5						BIT STRING (SIZE (16)),
-		n2TxAntenna-tm6						BIT STRING (SIZE (4)),
-		n4TxAntenna-tm6						BIT STRING (SIZE (16))
-	}		OPTIONAL, 															-- Cond TM
-	ue-TransmitAntennaSelection			CHOICE{
-		release							NULL,
-		setup							ENUMERATED {closedLoop, openLoop}
-	}
-}
-
-
-CQI-ReportConfig ::=				SEQUENCE {
-	cqi-ReportModeAperiodic			ENUMERATED {
-											rm12, rm20, rm22, rm30, rm31,
-											spare3, spare2, spare1} OPTIONAL, 			-- Need OR
-	nomPDSCH-RS-EPRE-Offset				INTEGER (-1..6),
-	cqi-ReportPeriodic				CQI-ReportPeriodic	OPTIONAL 				-- Need ON
-}
-
-CQI-ReportPeriodic ::=		CHOICE {
-	release							NULL,
-	setup							SEQUENCE {
-		cqi-PUCCH-ResourceIndex				INTEGER (0.. 1185),
-		cqi-pmi-ConfigIndex					INTEGER (0..1023),
-		cqi-FormatIndicatorPeriodic			CHOICE {
-			widebandCQI							NULL,
-			subbandCQI							SEQUENCE {
-				k									INTEGER (1..4)
-			}
-		},
-		ri-ConfigIndex						INTEGER (0..1023) 	OPTIONAL, 				-- Need OR
-		simultaneousAckNackAndCQI			BOOLEAN
-	}
-}
-
-
-DRB-Identity ::=					INTEGER (1..32)
-
-
-LogicalChannelConfig ::=			SEQUENCE {
-	ul-SpecificParameters				SEQUENCE {
-		priority							INTEGER (1..16),
-		prioritisedBitRate					ENUMERATED {
-												kBps0, kBps8, kBps16, kBps32, kBps64, kBps128,
-												kBps256, infinity, spare8, spare7, spare6,
-												spare5, spare4, spare3, spare2, spare1},
-		bucketSizeDuration					ENUMERATED {
-												ms50, ms100, ms150, ms300, ms500, ms1000, spare2,
-												spare1},
-		logicalChannelGroup					INTEGER (0..3)			OPTIONAL			-- Need OR
-	}		OPTIONAL,																	-- Cond UL
-	...
-}
-
-
-MAC-MainConfig ::=					SEQUENCE {
-	ul-SCH-Config						SEQUENCE {
-		maxHARQ-Tx							ENUMERATED {
-												n1, n2, n3, n4, n5, n6, n7, n8,
-												n10, n12, n16, n20, n24, n28,
-												spare2, spare1}		OPTIONAL,	-- Need ON
-		periodicBSR-Timer					ENUMERATED {
-												sf5, sf10, sf16, sf20, sf32, sf40, sf64, sf80,
-												sf128, sf160, sf320, sf640, sf1280, sf2560,
-												infinity, spare1}	OPTIONAL,	-- Need ON
-		retxBSR-Timer						ENUMERATED {
-												sf320, sf640, sf1280, sf2560, sf5120,
-												sf10240, spare2, spare1},
-		ttiBundling							BOOLEAN
-	}																OPTIONAL, 	-- Need ON
-	drx-Config							DRX-Config					OPTIONAL,	-- Need ON
-	timeAlignmentTimerDedicated			TimeAlignmentTimer,
-	phr-Config							CHOICE {
-		release								NULL,
-		setup								SEQUENCE {
-			periodicPHR-Timer					ENUMERATED {sf10, sf20, sf50, sf100, sf200,
-															sf500, sf1000, infinity},
-			prohibitPHR-Timer					ENUMERATED {sf0, sf10, sf20, sf50, sf100,
-																sf200, sf500, sf1000},
-			dl-PathlossChange					ENUMERATED {dB1, dB3, dB6, infinity}
-		}
-	}																OPTIONAL,	-- Need ON
-	...
-}
-
-DRX-Config ::=						CHOICE {
-	release								NULL,
-	setup								SEQUENCE {
-		onDurationTimer						ENUMERATED {
-												psf1, psf2, psf3, psf4, psf5, psf6,
-												psf8, psf10, psf20, psf30, psf40,
-												psf50, psf60, psf80, psf100,
-												psf200},
-		drx-InactivityTimer					ENUMERATED {
-												psf1, psf2, psf3, psf4, psf5, psf6,
-												psf8, psf10, psf20, psf30, psf40,
-												psf50, psf60, psf80, psf100,
-												psf200, psf300, psf500, psf750,
-												psf1280, psf1920, psf2560, spare10,
-												spare9, spare8, spare7, spare6,
-												spare5, spare4, spare3, spare2,
-												spare1},
-		drx-RetransmissionTimer				ENUMERATED {
-												psf1, psf2, psf4, psf6, psf8, psf16,
-												psf24, psf33},
-		longDRX-CycleStartOffset		CHOICE {
-			sf10							INTEGER(0..9),
-			sf20							INTEGER(0..19),
-			sf32							INTEGER(0..31),
-			sf40							INTEGER(0..39),
-			sf64							INTEGER(0..63),
-			sf80							INTEGER(0..79),
-			sf128							INTEGER(0..127),
-			sf160							INTEGER(0..159),
-			sf256							INTEGER(0..255),
-			sf320							INTEGER(0..319),
-			sf512							INTEGER(0..511),
-			sf640							INTEGER(0..639),
-			sf1024							INTEGER(0..1023),
-			sf1280							INTEGER(0..1279),
-			sf2048							INTEGER(0..2047),
-			sf2560							INTEGER(0..2559)
-		},
-		shortDRX							SEQUENCE {
-			shortDRX-Cycle						ENUMERATED	{
-													sf2, sf5, sf8, sf10, sf16, sf20,
-													sf32, sf40, sf64, sf80, sf128, sf160,
-													sf256, sf320, sf512, sf640},
-			drxShortCycleTimer					INTEGER (1..16)
-		}		OPTIONAL													-- Need OR
-	}
-}
-
-
-PDCP-Config ::=						SEQUENCE {
-	discardTimer						ENUMERATED {
-											ms50, ms100, ms150, ms300, ms500,
-											ms750, ms1500, infinity
-	}															OPTIONAL,			-- Cond Setup
-	rlc-AM								SEQUENCE {
-		statusReportRequired				BOOLEAN
-	}															OPTIONAL,			-- Cond Rlc-AM
-	rlc-UM								SEQUENCE {
-		pdcp-SN-Size						ENUMERATED {len7bits, len12bits}
-	}															OPTIONAL,			-- Cond Rlc-UM
-	headerCompression					CHOICE {
-		notUsed								NULL,
-		rohc								SEQUENCE {
-			maxCID								INTEGER (1..16383)				DEFAULT 15,
-			profiles							SEQUENCE {
-				profile0x0001						BOOLEAN,
-				profile0x0002						BOOLEAN,
-				profile0x0003						BOOLEAN,
-				profile0x0004						BOOLEAN,
-				profile0x0006						BOOLEAN,
-				profile0x0101						BOOLEAN,
-				profile0x0102						BOOLEAN,
-				profile0x0103						BOOLEAN,
-				profile0x0104						BOOLEAN
-			},
-			...
-		}
-	},
-	...
-}
-
-
-PDSCH-ConfigCommon::=		SEQUENCE {
-	referenceSignalPower				INTEGER (-60..50),
-	p-b									INTEGER (0..3)
-}
-
-PDSCH-ConfigDedicated::=		SEQUENCE {
-	p-a									ENUMERATED {
-											dB-6, dB-4dot77, dB-3, dB-1dot77,
-											dB0, dB1, dB2, dB3 }
-}
-
-
-PHICH-Config ::=					SEQUENCE {
-	phich-Duration						ENUMERATED {normal, extended},
-	phich-Resource						ENUMERATED {oneSixth, half, one, two}
-}
-
-
-PhysicalConfigDedicated ::=			SEQUENCE {
-	pdsch-ConfigDedicated				PDSCH-ConfigDedicated			OPTIONAL,		-- Need ON
-	pucch-ConfigDedicated				PUCCH-ConfigDedicated			OPTIONAL,		-- Need ON
-	pusch-ConfigDedicated				PUSCH-ConfigDedicated			OPTIONAL,		-- Need ON
-	uplinkPowerControlDedicated			UplinkPowerControlDedicated		OPTIONAL,		-- Need ON
-	tpc-PDCCH-ConfigPUCCH				TPC-PDCCH-Config 				OPTIONAL,		-- Need ON
-	tpc-PDCCH-ConfigPUSCH				TPC-PDCCH-Config 				OPTIONAL,		-- Need ON
-	cqi-ReportConfig					CQI-ReportConfig				OPTIONAL,		-- Need ON
-	soundingRS-UL-ConfigDedicated		SoundingRS-UL-ConfigDedicated	OPTIONAL,		-- Need ON
-	antennaInfo							CHOICE {
-		explicitValue						AntennaInfoDedicated,
-		defaultValue						NULL
-	}		OPTIONAL,																	-- Need ON
-	schedulingRequestConfig				SchedulingRequestConfig 		OPTIONAL, 		-- Need ON
-	...
-}
-
-
-P-Max ::=				INTEGER (-30..33)
-
-
-PRACH-ConfigSIB ::=			SEQUENCE {
-	rootSequenceIndex					INTEGER (0..837),
-	prach-ConfigInfo					PRACH-ConfigInfo
-}
-
-PRACH-Config ::=				SEQUENCE {
-	rootSequenceIndex					INTEGER (0..837),
-	prach-ConfigInfo					PRACH-ConfigInfo					OPTIONAL	-- Need ON
-}
-
-PRACH-ConfigInfo ::=				SEQUENCE {
-	prach-ConfigIndex					INTEGER (0..63),
-	highSpeedFlag						BOOLEAN,
-	zeroCorrelationZoneConfig			INTEGER (0..15),
-	prach-FreqOffset					INTEGER (0..94)
-}
-
-
-PresenceAntennaPort1 ::=				BOOLEAN
-
-
-PUCCH-ConfigCommon ::=				SEQUENCE {
-	deltaPUCCH-Shift					ENUMERATED {ds1, ds2, ds3},
-	nRB-CQI								INTEGER (0..98),
-	nCS-AN								INTEGER (0..7),
-	n1PUCCH-AN							INTEGER (0..2047)
-}
-
-PUCCH-ConfigDedicated ::=			SEQUENCE {
-	ackNackRepetition					CHOICE{
-		release								NULL,
-		setup								SEQUENCE {
-			repetitionFactor					ENUMERATED { n2, n4, n6, spare1},
-			n1PUCCH-AN-Rep						INTEGER (0..2047)
-		}
-	},
-	tdd-AckNackFeedbackMode				ENUMERATED {bundling, multiplexing}	OPTIONAL	-- Cond TDD
-}
-
-
-PUSCH-ConfigCommon ::=				SEQUENCE {
-	pusch-ConfigBasic					SEQUENCE {
-		n-SB								INTEGER (1..4),
-		hoppingMode							ENUMERATED {interSubFrame, intraAndInterSubFrame},
-		pusch-HoppingOffset					INTEGER (0..98),
-		enable64QAM							BOOLEAN
-	},
-	ul-ReferenceSignalsPUSCH			UL-ReferenceSignalsPUSCH
-}
-
-PUSCH-ConfigDedicated ::=			SEQUENCE {
-	betaOffset-ACK-Index					INTEGER (0..15),
-	betaOffset-RI-Index					INTEGER (0..15),
-	betaOffset-CQI-Index					INTEGER (0..15)
-}
-
-UL-ReferenceSignalsPUSCH ::=		SEQUENCE {
-	groupHoppingEnabled					BOOLEAN,
-	groupAssignmentPUSCH				INTEGER (0..29),
-	sequenceHoppingEnabled				BOOLEAN,
-	cyclicShift							INTEGER (0..7)
-}
-
-
-RACH-ConfigCommon ::=		SEQUENCE {
-	preambleInfo						SEQUENCE {
-		numberOfRA-Preambles				ENUMERATED {
-												n4, n8, n12, n16 ,n20, n24, n28,
-												n32, n36, n40, n44, n48, n52, n56,
-												n60, n64},
-		preamblesGroupAConfig				SEQUENCE {
-			sizeOfRA-PreamblesGroupA			ENUMERATED {
-													n4, n8, n12, n16 ,n20, n24, n28,
-													n32, n36, n40, n44, n48, n52, n56,
-													n60},
-			messageSizeGroupA					ENUMERATED {b56, b144, b208, b256},
-			messagePowerOffsetGroupB			ENUMERATED {
-													minusinfinity, dB0, dB5, dB8, dB10, dB12,
-													dB15, dB18},
-			...
-		}			OPTIONAL													-- Need OP
-	},
-	powerRampingParameters				SEQUENCE {
-		powerRampingStep					ENUMERATED {dB0, dB2,dB4, dB6},
-		preambleInitialReceivedTargetPower	ENUMERATED {
-												dBm-120, dBm-118, dBm-116, dBm-114, dBm-112,
-												dBm-110, dBm-108, dBm-106, dBm-104, dBm-102,
-												dBm-100, dBm-98, dBm-96, dBm-94,
-												dBm-92, dBm-90}
-	},
-	ra-SupervisionInfo					SEQUENCE {
-		preambleTransMax					ENUMERATED {
-												n3, n4, n5, n6, n7,	n8, n10, n20, n50,
-												n100, n200},
-		ra-ResponseWindowSize				ENUMERATED {
-												sf2, sf3, sf4, sf5, sf6, sf7,
-												sf8, sf10},
-		mac-ContentionResolutionTimer		ENUMERATED {
-												sf8, sf16, sf24, sf32, sf40, sf48,
-												sf56, sf64}
-	},
-	maxHARQ-Msg3Tx						INTEGER (1..8),
-	...
-}
-
-
-RACH-ConfigDedicated ::=		SEQUENCE {
-	ra-PreambleIndex					INTEGER (0..63),
-	ra-PRACH-MaskIndex					INTEGER (0..15)
-}
-
-
-RadioResourceConfigCommonSIB ::=	SEQUENCE {
-	rach-ConfigCommon					RACH-ConfigCommon,
-	bcch-Config 						BCCH-Config,
-	pcch-Config 						PCCH-Config,
-	prach-Config						PRACH-ConfigSIB,
-	pdsch-ConfigCommon					PDSCH-ConfigCommon,
-	pusch-ConfigCommon					PUSCH-ConfigCommon,
-	pucch-ConfigCommon					PUCCH-ConfigCommon,
-	soundingRS-UL-ConfigCommon			SoundingRS-UL-ConfigCommon,
-	uplinkPowerControlCommon			UplinkPowerControlCommon,
-	ul-CyclicPrefixLength				UL-CyclicPrefixLength,
-	...
-}
-
-RadioResourceConfigCommon ::=		SEQUENCE {
-	rach-ConfigCommon					RACH-ConfigCommon					OPTIONAL,	-- Need ON
-	prach-Config						PRACH-Config,
-	pdsch-ConfigCommon					PDSCH-ConfigCommon					OPTIONAL,	-- Need ON
-	pusch-ConfigCommon					PUSCH-ConfigCommon,
-	phich-Config						PHICH-Config						OPTIONAL,	-- Need ON
-	pucch-ConfigCommon					PUCCH-ConfigCommon					OPTIONAL,	-- Need ON
-	soundingRS-UL-ConfigCommon			SoundingRS-UL-ConfigCommon			OPTIONAL,	-- Need ON
-	uplinkPowerControlCommon			UplinkPowerControlCommon			OPTIONAL,	-- Need ON
-	antennaInfoCommon					AntennaInfoCommon			OPTIONAL,	-- Need ON
-	p-Max								P-Max								OPTIONAL,	-- Need OP
-	tdd-Config							TDD-Config							OPTIONAL,	-- Cond TDD
-	ul-CyclicPrefixLength				UL-CyclicPrefixLength,
-	...
-}
-
-BCCH-Config ::=						SEQUENCE {
-	modificationPeriodCoeff				ENUMERATED {n2, n4, n8, n16}
-}
-
-PCCH-Config ::=						SEQUENCE {
-	defaultPagingCycle					ENUMERATED {
-											rf32, rf64, rf128, rf256},
-	nB									ENUMERATED {
-											fourT, twoT, oneT, halfT, quarterT, oneEighthT,
-											oneSixteenthT, oneThirtySecondT}
-}
-
-UL-CyclicPrefixLength ::=			ENUMERATED {len1, len2}
-
-
-RadioResourceConfigDedicated ::=		SEQUENCE {
-	srb-ToAddModList					SRB-ToAddModList			OPTIONAL, 		-- Cond HO-Conn
-	drb-ToAddModList					DRB-ToAddModList			OPTIONAL, 		-- Cond HO-toEUTRA
-	drb-ToReleaseList					DRB-ToReleaseList			OPTIONAL, 		-- Need ON
-	mac-MainConfig						CHOICE {
-			explicitValue					MAC-MainConfig,
-			defaultValue					NULL
-	}		OPTIONAL,																-- Cond HO-toEUTRA2
-	sps-Config							SPS-Config 					OPTIONAL,		-- Need ON
-	physicalConfigDedicated				PhysicalConfigDedicated		OPTIONAL,		-- Need ON
-	...
-}
-
-SRB-ToAddModList ::=				SEQUENCE (SIZE (1..2)) OF SRB-ToAddMod
-
-SRB-ToAddMod ::=	SEQUENCE {
-	srb-Identity						INTEGER (1..2),
-	rlc-Config							CHOICE {
-		explicitValue						RLC-Config,
-		defaultValue						NULL
-	}		OPTIONAL,																-- Cond Setup
-	logicalChannelConfig				CHOICE {
-		explicitValue						LogicalChannelConfig,
-		defaultValue						NULL
-	}		OPTIONAL,																-- Cond Setup
-	...
-}
-
-DRB-ToAddModList ::=				SEQUENCE (SIZE (1..maxDRB)) OF DRB-ToAddMod
-
-DRB-ToAddMod ::=	SEQUENCE {
-	eps-BearerIdentity					INTEGER (0..15)			OPTIONAL,		-- Cond DRB-Setup
-	drb-Identity						DRB-Identity,
-	pdcp-Config							PDCP-Config				OPTIONAL,		-- Cond PDCP
-	rlc-Config							RLC-Config				OPTIONAL,		-- Cond Setup
-	logicalChannelIdentity				INTEGER (3..10)			OPTIONAL,		-- Cond DRB-Setup
-	logicalChannelConfig				LogicalChannelConfig	OPTIONAL,		-- Cond Setup
-	...
-}
-
-DRB-ToReleaseList ::=				SEQUENCE (SIZE (1..maxDRB)) OF DRB-Identity
-
-
-RLC-Config ::=				CHOICE {
-	am									SEQUENCE {
-		ul-AM-RLC							UL-AM-RLC,
-		dl-AM-RLC							DL-AM-RLC
-	},
-	um-Bi-Directional					SEQUENCE {
-		ul-UM-RLC							UL-UM-RLC,
-		dl-UM-RLC							DL-UM-RLC
-	},
-	um-Uni-Directional-UL				SEQUENCE {
-		ul-UM-RLC							UL-UM-RLC
-	},
-	um-Uni-Directional-DL				SEQUENCE {
-		dl-UM-RLC							DL-UM-RLC
-	},
-	...
-}
-
-UL-AM-RLC ::=						SEQUENCE {
-	t-PollRetransmit					T-PollRetransmit,
-	pollPDU								PollPDU,
-	pollByte							PollByte,
-	maxRetxThreshold					ENUMERATED {
-											t1, t2, t3, t4, t6, t8, t16, t32}
-}
-
-DL-AM-RLC ::=						SEQUENCE {
-	t-Reordering						T-Reordering,
-	t-StatusProhibit					T-StatusProhibit
-}
-
-UL-UM-RLC ::=						SEQUENCE {
-	sn-FieldLength						SN-FieldLength
-}
-
-DL-UM-RLC ::=						SEQUENCE {
-	sn-FieldLength						SN-FieldLength,
-	t-Reordering						T-Reordering
-}
-
-SN-FieldLength ::=					ENUMERATED {size5, size10}
-
-T-PollRetransmit ::=				ENUMERATED {
-										ms5, ms10, ms15, ms20, ms25, ms30, ms35,
-										ms40, ms45, ms50, ms55, ms60, ms65, ms70,
-										ms75, ms80, ms85, ms90, ms95, ms100, ms105,
-										ms110, ms115, ms120, ms125, ms130, ms135,
-										ms140, ms145, ms150, ms155, ms160, ms165,
-										ms170, ms175, ms180, ms185, ms190, ms195,
-										ms200, ms205, ms210, ms215, ms220, ms225,
-										ms230, ms235, ms240, ms245, ms250, ms300,
-										ms350, ms400, ms450, ms500, spare9, spare8,
-										spare7, spare6, spare5, spare4, spare3,
-										spare2, spare1}
-
-PollPDU ::=							ENUMERATED {
-										p4, p8, p16, p32, p64, p128, p256, pInfinity}
-
-PollByte ::=						ENUMERATED {
-										kB25, kB50, kB75, kB100, kB125, kB250, kB375,
-										kB500, kB750, kB1000, kB1250, kB1500, kB2000,
-										kB3000, kBinfinity, spare1}
-
-T-Reordering ::=					ENUMERATED {
-										ms0, ms5, ms10, ms15, ms20, ms25, ms30, ms35,
-										ms40, ms45, ms50, ms55, ms60, ms65, ms70,
-										ms75, ms80, ms85, ms90, ms95, ms100, ms110,
-										ms120, ms130, ms140, ms150, ms160, ms170,
-										ms180, ms190, ms200, spare1}
-
-T-StatusProhibit ::=				ENUMERATED {
-										ms0, ms5, ms10, ms15, ms20, ms25, ms30, ms35,
-										ms40, ms45, ms50, ms55, ms60, ms65, ms70,
-										ms75, ms80, ms85, ms90, ms95, ms100, ms105,
-										ms110, ms115, ms120, ms125, ms130, ms135,
-										ms140, ms145, ms150, ms155, ms160, ms165,
-										ms170, ms175, ms180, ms185, ms190, ms195,
-										ms200, ms205, ms210, ms215, ms220, ms225,
-										ms230, ms235, ms240, ms245, ms250, ms300,
-										ms350, ms400, ms450, ms500, spare8, spare7,
-										spare6, spare5, spare4, spare3, spare2,
-										spare1}
-
-
-SchedulingRequestConfig ::=		CHOICE {
-	release								NULL,
-	setup								SEQUENCE {
-		sr-PUCCH-ResourceIndex				INTEGER (0..2047),
-		sr-ConfigIndex						INTEGER (0..155),
-		dsr-TransMax						ENUMERATED {
-												n4, n8, n16, n32, n64, spare3, spare2, spare1}
-	}
-}
-
-
-SoundingRS-UL-ConfigCommon ::=		CHOICE {
-	release								NULL,
-	setup								SEQUENCE {
-		srs-BandwidthConfig					ENUMERATED {bw0, bw1, bw2, bw3, bw4, bw5, bw6, bw7},
-		srs-SubframeConfig					ENUMERATED {
-												sc0, sc1, sc2, sc3, sc4, sc5, sc6, sc7,
-												sc8, sc9, sc10, sc11, sc12, sc13, sc14, sc15},
-		ackNackSRS-SimultaneousTransmission	BOOLEAN,
-		srs-MaxUpPts						ENUMERATED {true}			OPTIONAL	-- Cond TDD
-	}
-}
-
-SoundingRS-UL-ConfigDedicated ::=	CHOICE{
-	release								NULL,
-	setup								SEQUENCE {
-		srs-Bandwidth						ENUMERATED {bw0, bw1, bw2, bw3},
-		srs-HoppingBandwidth				ENUMERATED {hbw0, hbw1, hbw2, hbw3},
-		freqDomainPosition					INTEGER (0..23),
-		duration							BOOLEAN,
-		srs-ConfigIndex						INTEGER (0..1023),
-		transmissionComb					INTEGER (0..1),
-		cyclicShift							ENUMERATED {cs0, cs1, cs2, cs3, cs4, cs5, cs6, cs7}
-	}
-}
-
-
-
-SPS-Config ::=	SEQUENCE {
-	semiPersistSchedC-RNTI			C-RNTI					OPTIONAL,			-- Need OR
-	sps-ConfigDL					SPS-ConfigDL			OPTIONAL,			-- Need ON
-	sps-ConfigUL					SPS-ConfigUL			OPTIONAL			-- Need ON
-}
-
-SPS-ConfigDL ::=	CHOICE{
-	release							NULL,
-	setup							SEQUENCE {
-		semiPersistSchedIntervalDL			ENUMERATED {
-												sf10, sf20, sf32, sf40, sf64, sf80,
-												sf128, sf160, sf320, sf640, spare6,
-												spare5, spare4, spare3, spare2,
-												spare1},
-		numberOfConfSPS-Processes			INTEGER (1..8),
-		n1-PUCCH-AN-PersistentList			N1-PUCCH-AN-PersistentList,
-		...
-	}
-}
-
-SPS-ConfigUL ::=	CHOICE {
-	release							NULL,
-	setup							SEQUENCE {
-		semiPersistSchedIntervalUL			ENUMERATED {
-												sf10, sf20, sf32, sf40, sf64, sf80,
-												sf128, sf160, sf320, sf640, spare6,
-												spare5, spare4, spare3, spare2,
-												spare1},
-		implicitReleaseAfter				ENUMERATED {e2, e3, e4, e8},
-		p0-Persistent						SEQUENCE {
-			p0-NominalPUSCH-Persistent			INTEGER (-126..24),
-			p0-UE-PUSCH-Persistent				INTEGER (-8..7)
-		}		OPTIONAL,												-- Need OP
-		twoIntervalsConfig					ENUMERATED {true}			OPTIONAL,	-- Cond TDD
-		...
-	}
-}
-
-N1-PUCCH-AN-PersistentList ::=		SEQUENCE (SIZE (1..4)) OF INTEGER (0..2047)
-
-
-TDD-Config ::=						SEQUENCE {
-	subframeAssignment					ENUMERATED {
-											sa0, sa1, sa2, sa3, sa4, sa5, sa6},
-	specialSubframePatterns				ENUMERATED {
-											ssp0, ssp1, ssp2, ssp3, ssp4,ssp5, ssp6, ssp7,
-											ssp8}
-}
-
-
-TimeAlignmentTimer ::=					ENUMERATED {
-												sf500, sf750, sf1280, sf1920, sf2560, sf5120,
-												sf10240, infinity}
-
-TPC-PDCCH-Config::=					CHOICE {
-	release								NULL,
-	setup								SEQUENCE {
-		tpc-RNTI							BIT STRING (SIZE (16)),
-		tpc-Index							TPC-Index
-	}
-}
-
-TPC-Index ::=							CHOICE {
-	indexOfFormat3							INTEGER (1..15),
-	indexOfFormat3A							INTEGER (1..31)
-}
-
-
-UplinkPowerControlCommon ::=		SEQUENCE {
-	p0-NominalPUSCH						INTEGER (-126..24),
-	alpha								ENUMERATED {al0, al04, al05, al06, al07, al08, al09, al1},
-	p0-NominalPUCCH						INTEGER (-127..-96),
-	deltaFList-PUCCH					DeltaFList-PUCCH,
-	deltaPreambleMsg3					INTEGER (-1..6)
-}
-
-UplinkPowerControlDedicated ::=		SEQUENCE {
-	p0-UE-PUSCH							INTEGER (-8..7),
-	deltaMCS-Enabled					ENUMERATED {en0, en1},
-	accumulationEnabled					BOOLEAN,
-	p0-UE-PUCCH							INTEGER (-8..7),
-	pSRS-Offset							INTEGER (0..15),
-	filterCoefficient					FilterCoefficient					DEFAULT fc4
-}
-
-DeltaFList-PUCCH ::=				SEQUENCE {
-	deltaF-PUCCH-Format1				ENUMERATED {deltaF-2, deltaF0, deltaF2},
-	deltaF-PUCCH-Format1b				ENUMERATED {deltaF1, deltaF3, deltaF5},
-	deltaF-PUCCH-Format2				ENUMERATED {deltaF-2, deltaF0, deltaF1, deltaF2},
-	deltaF-PUCCH-Format2a				ENUMERATED {deltaF-2, deltaF0, deltaF2},
-	deltaF-PUCCH-Format2b				ENUMERATED {deltaF-2, deltaF0, deltaF2}
-}
-
-
-NextHopChainingCount ::=					INTEGER (0..7)
-
-
-SecurityAlgorithmConfig ::=			SEQUENCE {
-	cipheringAlgorithm					ENUMERATED {
-											eea0, eea1, eea2, spare5, spare4, spare3,
-											spare2, spare1, ...},
-	integrityProtAlgorithm				ENUMERATED {
-											reserved, eia1, eia2, spare5, spare4, spare3,
-											spare2, spare1, ...}
-}
-
-
-ShortMAC-I ::=						BIT STRING (SIZE (16))
-
-
-AdditionalSpectrumEmission ::=		INTEGER (1..32)
-
-
-ARFCN-ValueCDMA2000 ::=			INTEGER (0..2047)
-
-
-ARFCN-ValueEUTRA ::=				INTEGER (0..maxEARFCN)
-
-
-ARFCN-ValueGERAN ::=			INTEGER (0..1023)
-
-
-ARFCN-ValueUTRA ::=					INTEGER (0..16383)
-
-
-BandclassCDMA2000 ::=					ENUMERATED {
-											bc0, bc1, bc2, bc3, bc4, bc5, bc6, bc7, bc8,
-											bc9, bc10, bc11, bc12, bc13, bc14, bc15, bc16,
-											bc17, spare14, spare13, spare12, spare11, spare10,
-											spare9, spare8, spare7, spare6, spare5, spare4,
-											spare3, spare2, spare1, ...}
-
-
-BandIndicatorGERAN ::=			ENUMERATED {dcs1800, pcs1900}
-
-
-CarrierFreqCDMA2000 ::=			SEQUENCE {
-	bandClass							BandclassCDMA2000,
-	arfcn							ARFCN-ValueCDMA2000
-}
-
-
-CarrierFreqGERAN ::=			SEQUENCE {
-	arfcn							ARFCN-ValueGERAN,
-	bandIndicator					BandIndicatorGERAN
-}
-
-
-CarrierFreqsGERAN ::=			SEQUENCE {
-	startingARFCN						ARFCN-ValueGERAN,
-	bandIndicator						BandIndicatorGERAN,
-	followingARFCNs						CHOICE {
-		explicitListOfARFCNs				ExplicitListOfARFCNs,
-		equallySpacedARFCNs					SEQUENCE {
-			arfcn-Spacing						INTEGER (1..8),
-			numberOfFollowingARFCNs				INTEGER (0..31)
-		},
-		variableBitMapOfARFCNs				OCTET STRING (SIZE (1..16))
-	}
-}
-
-ExplicitListOfARFCNs ::=			SEQUENCE (SIZE (0..31)) OF ARFCN-ValueGERAN
-
-
-CDMA2000-Type ::=					ENUMERATED {type1XRTT, typeHRPD}
-
-
-CellIdentity ::=					BIT STRING (SIZE (28))
-
-
-CellIndexList ::=						SEQUENCE (SIZE (1..maxCellMeas)) OF CellIndex
-
-CellIndex ::=							INTEGER (1..maxCellMeas)
-
-
-CellReselectionPriority ::=				INTEGER (0..7)
-
-
-CSFB-RegistrationParam1XRTT ::=		SEQUENCE {
-	sid									BIT STRING (SIZE (15)),
-	nid									BIT STRING (SIZE (16)),
-	multipleSID							BOOLEAN,
-	multipleNID							BOOLEAN,
-	homeReg								BOOLEAN,
-	foreignSIDReg						BOOLEAN,
-	foreignNIDReg						BOOLEAN,
-	parameterReg						BOOLEAN,
-	powerUpReg							BOOLEAN,
-	registrationPeriod					BIT STRING (SIZE (7)),
-	registrationZone					BIT STRING (SIZE (12)),
-	totalZone							BIT STRING (SIZE (3)),
-	zoneTimer							BIT STRING (SIZE (3))
-}
-
-
-CellGlobalIdEUTRA ::=					SEQUENCE {
-	plmn-Identity							PLMN-Identity,
-	cellIdentity							CellIdentity
-}
-
-
-CellGlobalIdUTRA ::=					SEQUENCE {
-	plmn-Identity							PLMN-Identity,
-	cellIdentity							BIT STRING (SIZE (28))
-}
-
-
-CellGlobalIdGERAN ::=					SEQUENCE {
-	plmn-Identity							PLMN-Identity,
-	locationAreaCode						BIT STRING (SIZE (16)),
-	cellIdentity						BIT STRING (SIZE (16))
-}
-
-
-CellGlobalIdCDMA2000 ::=				CHOICE {
-	cellGlobalId1XRTT						BIT STRING (SIZE (47)),
-	cellGlobalIdHRPD						BIT STRING (SIZE (128))
-}
-
-
-MobilityControlInfo ::=		SEQUENCE {
-	targetPhysCellId					PhysCellId,
-	carrierFreq							CarrierFreqEUTRA					OPTIONAL,	-- Cond HO-toEUTRA
-	carrierBandwidth					CarrierBandwidthEUTRA				OPTIONAL,	-- Cond HO-toEUTRA
-	additionalSpectrumEmission			AdditionalSpectrumEmission			OPTIONAL,	-- Cond HO-toEUTRA
-	t304								ENUMERATED {
-											ms50, ms100, ms150, ms200, ms500, ms1000,
-											ms2000, spare1},
-	newUE-Identity						C-RNTI,
-	radioResourceConfigCommon			RadioResourceConfigCommon,
-	rach-ConfigDedicated				RACH-ConfigDedicated				OPTIONAL,	-- Need OP
-	...
-}
-
-CarrierBandwidthEUTRA ::=			SEQUENCE {
-	dl-Bandwidth						ENUMERATED {
-												n6, n15, n25, n50, n75, n100, spare10,
-												spare9, spare8, spare7, spare6, spare5,
-												spare4, spare3, spare2, spare1},
-	ul-Bandwidth						ENUMERATED {
-												n6, n15, n25, n50, n75, n100, spare10,
-												spare9, spare8, spare7, spare6, spare5,
-												spare4, spare3, spare2, spare1}	OPTIONAL -- Need OP
-}
-
-CarrierFreqEUTRA ::=				SEQUENCE {
-	dl-CarrierFreq						ARFCN-ValueEUTRA,
-	ul-CarrierFreq						ARFCN-ValueEUTRA				OPTIONAL	-- Cond FDD
-}
-
-
-MobilityParametersCDMA2000 ::=			OCTET STRING
-
-
-MobilityStateParameters ::=			SEQUENCE {
-	t-Evaluation						ENUMERATED {
-											s30, s60, s120, s180, s240, spare3, spare2, spare1},
-	t-HystNormal						ENUMERATED {
-											s30, s60, s120, s180, s240, spare3, spare2, spare1},
-	n-CellChangeMedium					INTEGER (1..16),
-	n-CellChangeHigh					INTEGER (1..16)
-}
-
-
-PhysCellId ::=						INTEGER (0..503)
-
-
-PhysCellIdRange ::=				SEQUENCE {
-	start							PhysCellId,
-	range							ENUMERATED {
-										n4, n8, n12, n16, n24, n32, n48, n64, n84,
-										n96, n128, n168, n252, n504, spare2,
-										spare1} 					OPTIONAL	-- Need OP
-}
-
-
-PhysCellIdCDMA2000 ::=			INTEGER (0..maxPNOffset)
-
-
-PhysCellIdGERAN ::=				SEQUENCE {
-	networkColourCode					BIT STRING (SIZE (3)),
-	baseStationColourCode				BIT STRING (SIZE (3))
-}
-
-
-PhysCellIdUTRA-FDD ::=				INTEGER (0..511)
-
-
-PhysCellIdUTRA-TDD ::=				INTEGER (0..127)
-
-
-PLMN-Identity ::=					SEQUENCE {
-	mcc									MCC					OPTIONAL,					-- Cond MCC
-	mnc									MNC
-}
-
-MCC ::=								SEQUENCE (SIZE (3)) OF
-											MCC-MNC-Digit
-
-MNC ::=								SEQUENCE (SIZE (2..3)) OF
-											MCC-MNC-Digit
-
-MCC-MNC-Digit ::=					INTEGER (0..9)
-
-
-
-PreRegistrationInfoHRPD ::=			SEQUENCE {
-	preRegistrationAllowed				BOOLEAN,
-	preRegistrationZoneId				PreRegistrationZoneIdHRPD	OPTIONAL, -- cond PreRegAllowed
-	secondaryPreRegistrationZoneIdList	SecondaryPreRegistrationZoneIdListHRPD	OPTIONAL -- Need OR
-}
-
-SecondaryPreRegistrationZoneIdListHRPD ::=	SEQUENCE (SIZE (1..2)) OF PreRegistrationZoneIdHRPD
-
-PreRegistrationZoneIdHRPD ::=			INTEGER (0..255)
-
-
-Q-RxLevMin ::=						INTEGER (-70..-22)
-
-
-Q-OffsetRange ::=						ENUMERATED {
-												dB-24, dB-22, dB-20, dB-18, dB-16, dB-14,
-												dB-12, dB-10, dB-8, dB-6, dB-5, dB-4, dB-3,
-												dB-2, dB-1, dB0, dB1, dB2, dB3, dB4, dB5,
-												dB6, dB8, dB10, dB12, dB14, dB16, dB18,
-												dB20, dB22, dB24}
-
-
-Q-OffsetRangeInterRAT ::=					INTEGER (-15..15)
-
-
-ReselectionThreshold ::=				INTEGER (0..31)
-
-
-SpeedStateScaleFactors ::=			SEQUENCE {
-	sf-Medium							ENUMERATED {oDot25, oDot5, oDot75, lDot0},
-	sf-High								ENUMERATED {oDot25, oDot5, oDot75, lDot0}
-}
-
-SystemTimeInfoCDMA2000 ::=			SEQUENCE {
-	cdma-EUTRA-Synchronisation			BOOLEAN,
-	cdma-SystemTime						CHOICE {
-		synchronousSystemTime				BIT STRING (SIZE (39)),
-		asynchronousSystemTime				BIT STRING (SIZE (49))
-	}
-}
-
-
-TrackingAreaCode ::=				BIT STRING (SIZE (16))
-
-
-T-Reselection ::=					INTEGER (0..7)
-
-
-AllowedMeasBandwidth ::=				ENUMERATED {mbw6, mbw15, mbw25, mbw50, mbw75, mbw100}
-
-
-Hysteresis ::=							INTEGER (0..30)
-
-
-MeasConfig ::=						SEQUENCE {
-	-- Measurement objects
-	measObjectToRemoveList				MeasObjectToRemoveList				OPTIONAL,	-- Need ON
-	measObjectToAddModList				MeasObjectToAddModList				OPTIONAL,	-- Need ON
-	-- Reporting configurations
-	reportConfigToRemoveList			ReportConfigToRemoveList			OPTIONAL,	-- Need ON
-	reportConfigToAddModList			ReportConfigToAddModList			OPTIONAL,	-- Need ON
-	-- Measurement identities
-	measIdToRemoveList					MeasIdToRemoveList					OPTIONAL,	-- Need ON
-	measIdToAddModList					MeasIdToAddModList					OPTIONAL,	-- Need ON
-	-- Other parameters
-	quantityConfig						QuantityConfig						OPTIONAL,	-- Need ON
-	measGapConfig						MeasGapConfig						OPTIONAL,	-- Need ON
-	s-Measure							RSRP-Range							OPTIONAL,	-- Need ON
-	preRegistrationInfoHRPD				PreRegistrationInfoHRPD				OPTIONAL, 	-- Need OP
-	speedStatePars			CHOICE {
-		release								NULL,
-		setup								SEQUENCE {
-			mobilityStateParameters				MobilityStateParameters,
-			timeToTrigger-SF					SpeedStateScaleFactors
-		}
-	}																		OPTIONAL,	-- Need ON
-	...
-}
-
-MeasIdToRemoveList ::=				SEQUENCE (SIZE (1..maxMeasId)) OF MeasId
-
-MeasObjectToRemoveList ::=			SEQUENCE (SIZE (1..maxObjectId)) OF MeasObjectId
-
-ReportConfigToRemoveList ::=		SEQUENCE (SIZE (1..maxReportConfigId)) OF ReportConfigId
-
-
-MeasGapConfig ::=					CHOICE {
-	release								NULL,
-	setup								SEQUENCE {
-		gapOffset							CHOICE {
-				gp0									INTEGER (0..39),
-				gp1									INTEGER (0..79),
-				...
-		}
-	}
-}
-
-
-MeasId ::=							INTEGER (1..maxMeasId)
-
-
-MeasIdToAddModList ::=				SEQUENCE (SIZE (1..maxMeasId)) OF MeasIdToAddMod
-
-MeasIdToAddMod ::=	SEQUENCE {
-	measId								MeasId,
-	measObjectId						MeasObjectId,
-	reportConfigId						ReportConfigId
-}
-
-
-MeasObjectCDMA2000 ::=				SEQUENCE {
-	cdma2000-Type						CDMA2000-Type,
-	carrierFreq							CarrierFreqCDMA2000,
-	searchWindowSize					INTEGER (0..15)						OPTIONAL,	-- Need ON
-	offsetFreq							Q-OffsetRangeInterRAT				DEFAULT 0,
-	cellsToRemoveList					CellIndexList						OPTIONAL,	-- Need ON
-	cellsToAddModList					CellsToAddModListCDMA2000			OPTIONAL,	-- Need ON
-	cellForWhichToReportCGI				PhysCellIdCDMA2000					OPTIONAL,	-- Need ON
-	...
-}
-
-CellsToAddModListCDMA2000 ::=		SEQUENCE (SIZE (1..maxCellMeas)) OF CellsToAddModCDMA2000
-
-CellsToAddModCDMA2000 ::=	SEQUENCE {
-	cellIndex							INTEGER (1..maxCellMeas),
-	physCellId							PhysCellIdCDMA2000
-}
-
-
-MeasObjectEUTRA ::=					SEQUENCE {
-	carrierFreq							ARFCN-ValueEUTRA,
-	allowedMeasBandwidth				AllowedMeasBandwidth,
-	presenceAntennaPort1				PresenceAntennaPort1,
-	neighCellConfig						NeighCellConfig,
-	offsetFreq							Q-OffsetRange				DEFAULT dB0,
-	-- Neighbour cell list
-	cellsToRemoveList					CellIndexList				OPTIONAL,		-- Need ON
-	cellsToAddModList					CellsToAddModList			OPTIONAL,		-- Need ON
-	-- Black list
-	blackCellsToRemoveList				CellIndexList				OPTIONAL,		-- Need ON
-	blackCellsToAddModList				BlackCellsToAddModList		OPTIONAL,		-- Need ON
-	cellForWhichToReportCGI				PhysCellId					OPTIONAL, 		-- Need ON
-	...
-}
-
-CellsToAddModList ::=				SEQUENCE (SIZE (1..maxCellMeas)) OF CellsToAddMod
-
-CellsToAddMod ::=	SEQUENCE {
-	cellIndex							INTEGER (1..maxCellMeas),
-	physCellId							PhysCellId,
-	cellIndividualOffset				Q-OffsetRange
-}
-
-BlackCellsToAddModList ::=			SEQUENCE (SIZE (1..maxCellMeas)) OF BlackCellsToAddMod
-
-BlackCellsToAddMod ::=	SEQUENCE {
-	cellIndex							INTEGER (1..maxCellMeas),
-	physCellIdRange						PhysCellIdRange
-}
-
-
-MeasObjectGERAN ::=					SEQUENCE {
-	carrierFreqs						CarrierFreqsGERAN,
-	offsetFreq							Q-OffsetRangeInterRAT		DEFAULT 0,
-	ncc-Permitted						BIT STRING(SIZE (8))		DEFAULT '11111111'B,
-	cellForWhichToReportCGI				PhysCellIdGERAN				OPTIONAL, 	-- Need ON
-	...
-}
-
-
-MeasObjectId ::=					INTEGER (1..maxObjectId)
-
-
-MeasObjectToAddModList ::=			SEQUENCE (SIZE (1..maxObjectId)) OF MeasObjectToAddMod
-
-MeasObjectToAddMod ::=	SEQUENCE {
-	measObjectId						MeasObjectId,
-	measObject							CHOICE {
-		measObjectEUTRA						MeasObjectEUTRA,
-		measObjectUTRA						MeasObjectUTRA,
-		measObjectGERAN						MeasObjectGERAN,
-		measObjectCDMA2000					MeasObjectCDMA2000,
-		...
-	}
-}
-
-
-MeasObjectUTRA ::=					SEQUENCE {
-	carrierFreq							ARFCN-ValueUTRA,
-	offsetFreq							Q-OffsetRangeInterRAT		DEFAULT 0,
-	cellsToRemoveList					CellIndexList				OPTIONAL,			-- Need ON
-	cellsToAddModList					CHOICE {
-		cellsToAddModListUTRA-FDD			CellsToAddModListUTRA-FDD,
-		cellsToAddModListUTRA-TDD			CellsToAddModListUTRA-TDD
-	}																OPTIONAL,			-- Need ON
-	cellForWhichToReportCGI				CHOICE {
-		utra-FDD							PhysCellIdUTRA-FDD,
-		utra-TDD							PhysCellIdUTRA-TDD
-	}																OPTIONAL, 	-- Need ON
-	...
-}
-
-CellsToAddModListUTRA-FDD ::=		SEQUENCE (SIZE (1..maxCellMeas)) OF CellsToAddModUTRA-FDD 
-
-CellsToAddModUTRA-FDD ::=	SEQUENCE {
-	cellIndex							INTEGER (1..maxCellMeas),
-	physCellId							PhysCellIdUTRA-FDD
-}
-
-CellsToAddModListUTRA-TDD ::=		SEQUENCE (SIZE (1..maxCellMeas)) OF CellsToAddModUTRA-TDD 
-
-CellsToAddModUTRA-TDD ::=	SEQUENCE {
-	cellIndex							INTEGER (1..maxCellMeas),
-	physCellId							PhysCellIdUTRA-TDD
-}
-
-
-MeasResults ::=						SEQUENCE {
-	measId								MeasId,
-	measResultServCell					SEQUENCE {
-		rsrpResult							RSRP-Range,
-		rsrqResult							RSRQ-Range
-	},
-	measResultNeighCells				CHOICE {
-		measResultListEUTRA					MeasResultListEUTRA,
-		measResultListUTRA					MeasResultListUTRA,
-		measResultListGERAN					MeasResultListGERAN,
-		measResultsCDMA2000					MeasResultsCDMA2000,
-		...
-	}																		OPTIONAL,
-	...
-}
-
-MeasResultListEUTRA ::=				SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultEUTRA 
-
-MeasResultEUTRA ::=	SEQUENCE {
-	physCellId							PhysCellId,
-	cgi-Info							SEQUENCE {
-		cellGlobalId						CellGlobalIdEUTRA,
-		trackingAreaCode					TrackingAreaCode,
-		plmn-IdentityList					PLMN-IdentityList2 				OPTIONAL
-	}			 												OPTIONAL,
-	measResult							SEQUENCE {
-		rsrpResult							RSRP-Range						OPTIONAL,
-		rsrqResult							RSRQ-Range						OPTIONAL,
-		...
-	}
-}
-
-MeasResultListUTRA ::=				SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultUTRA 
-
-MeasResultUTRA ::=	SEQUENCE {
-	physCellId							CHOICE {
-		fdd									PhysCellIdUTRA-FDD,
-		tdd									PhysCellIdUTRA-TDD
-	},
-	cgi-Info							SEQUENCE {
-		cellGlobalId						CellGlobalIdUTRA,
-		locationAreaCode					BIT STRING (SIZE (16))			OPTIONAL,
-		routingAreaCode						BIT STRING (SIZE (8))			OPTIONAL,
-		plmn-IdentityList					PLMN-IdentityList2 				OPTIONAL
-	}			 												OPTIONAL,
-	measResult							SEQUENCE {
-		utra-RSCP							INTEGER (-5..91)				OPTIONAL,
-		utra-EcN0							INTEGER (0..49)					OPTIONAL,
-		...
-	}
-}
-
-MeasResultListGERAN ::=				SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultGERAN 
-
-MeasResultGERAN ::=	SEQUENCE {
-	carrierFreq							CarrierFreqGERAN,
-	physCellId							PhysCellIdGERAN,
-	cgi-Info							SEQUENCE {
-		cellGlobalId						CellGlobalIdGERAN,
-		routingAreaCode						BIT STRING (SIZE (8))			OPTIONAL
-	}			 															OPTIONAL,
-	measResult							SEQUENCE {
-		rssi								INTEGER (0..63),
-		...
-	}
-}
-
-MeasResultsCDMA2000 ::=				SEQUENCE {
-	preRegistrationStatusHRPD			BOOLEAN,
-	measResultListCDMA2000				MeasResultListCDMA2000
-}
-
-MeasResultListCDMA2000 ::=			SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultCDMA2000
-
-MeasResultCDMA2000 ::=	SEQUENCE {
-	physCellId							PhysCellIdCDMA2000,
-	cgi-Info							CellGlobalIdCDMA2000		 		OPTIONAL,
-	measResult							SEQUENCE {
-		pilotPnPhase						INTEGER	(0..32767)				OPTIONAL,
-		pilotStrength						INTEGER (0..63),
-		...
-	}
-}
-
-PLMN-IdentityList2 ::=				SEQUENCE (SIZE (1..5)) OF PLMN-Identity
-
-
-QuantityConfig ::=					SEQUENCE {
-	quantityConfigEUTRA					QuantityConfigEUTRA					OPTIONAL,	-- Need ON
-	quantityConfigUTRA					QuantityConfigUTRA					OPTIONAL,	-- Need ON
-	quantityConfigGERAN					QuantityConfigGERAN					OPTIONAL,	-- Need ON
-	quantityConfigCDMA2000				QuantityConfigCDMA2000				OPTIONAL,	-- Need ON
-	...
-}
-
-QuantityConfigEUTRA ::=				SEQUENCE {
-	filterCoefficientRSRP				FilterCoefficient					DEFAULT fc4,
-	filterCoefficientRSRQ				FilterCoefficient					DEFAULT fc4
-}
-
-QuantityConfigUTRA ::=				SEQUENCE {
-	measQuantityUTRA-FDD				ENUMERATED {cpich-RSCP, cpich-EcN0},
-	measQuantityUTRA-TDD				ENUMERATED {pccpch-RSCP},
-	filterCoefficient					FilterCoefficient					DEFAULT fc4
-}
-
-QuantityConfigGERAN ::=				SEQUENCE {
-	measQuantityGERAN					ENUMERATED {rssi},
-	filterCoefficient					FilterCoefficient					DEFAULT fc2
-}
-
-QuantityConfigCDMA2000 ::=			SEQUENCE {
-	measQuantityCDMA2000				ENUMERATED {pilotStrength, pilotPnPhaseAndPilotStrength}
-}
-
-
-ReportConfigEUTRA ::=				SEQUENCE {
-	triggerType							CHOICE {
-		event								SEQUENCE {
-			eventId								CHOICE {
-				eventA1								SEQUENCE {
-					a1-Threshold						ThresholdEUTRA
-				},
-				eventA2								SEQUENCE {
-					a2-Threshold						ThresholdEUTRA
-				},
-				eventA3								SEQUENCE {
-					a3-Offset							INTEGER (-30..30),
-					reportOnLeave						BOOLEAN
-				},
-				eventA4								SEQUENCE {
-					a4-Threshold						ThresholdEUTRA
-				},
-				eventA5								SEQUENCE {
-					a5-Threshold1						ThresholdEUTRA,
-					a5-Threshold2						ThresholdEUTRA
-				},
-				...
-			},
-			hysteresis							Hysteresis,
-			timeToTrigger						TimeToTrigger
-		},
-		periodical								SEQUENCE {
-			purpose									ENUMERATED {
-														reportStrongestCells, reportCGI}
-		}
-	},
-	triggerQuantity						ENUMERATED {rsrp, rsrq},
-	reportQuantity						ENUMERATED {sameAsTriggerQuantity, both},
-	maxReportCells						INTEGER (1..maxCellReport),
-	reportInterval						ReportInterval,
-	reportAmount						ENUMERATED {r1, r2, r4, r8, r16, r32, r64, infinity},
-	...
-}
-
-ThresholdEUTRA ::=					CHOICE{
-	threshold-RSRP						RSRP-Range,
-	threshold-RSRQ						RSRQ-Range
-}
-
-
-ReportConfigId ::=					INTEGER (1..maxReportConfigId)
-
-
-ReportConfigInterRAT ::=			SEQUENCE {
-	triggerType							CHOICE {
-		event								SEQUENCE {
-			eventId								CHOICE {
-				eventB1								SEQUENCE {
-					b1-Threshold						CHOICE {
-						b1-ThresholdUTRA					ThresholdUTRA,
-						b1-ThresholdGERAN					ThresholdGERAN,
-						b1-ThresholdCDMA2000				ThresholdCDMA2000
-					}
-				},
-				eventB2								SEQUENCE {
-					b2-Threshold1						ThresholdEUTRA,
-					b2-Threshold2						CHOICE { 				
-						b2-Threshold2UTRA					ThresholdUTRA,
-						b2-Threshold2GERAN					ThresholdGERAN,
-						b2-Threshold2CDMA2000				ThresholdCDMA2000
-					}
-				},
-				...
-			},
-			hysteresis						Hysteresis,
-			timeToTrigger					TimeToTrigger
-		},
-		periodical								SEQUENCE {
-			purpose									ENUMERATED {
-														reportStrongestCells,
-														reportStrongestCellsForSON,
-														reportCGI}
-		}
-	},
-	maxReportCells						INTEGER (1..maxCellReport),
-	reportInterval						ReportInterval,	
-	reportAmount						ENUMERATED {r1, r2, r4, r8, r16, r32, r64, infinity},
-	...
-}
-
-ThresholdUTRA ::=					CHOICE{
-	utra-RSCP							INTEGER (-5..91),
-	utra-EcN0							INTEGER (0..49)
-}
-
-ThresholdGERAN ::= 				INTEGER (0..63)
-
-ThresholdCDMA2000 ::= 			INTEGER (0..63)
-
-
-ReportConfigToAddModList ::=		SEQUENCE (SIZE (1..maxReportConfigId)) OF ReportConfigToAddMod
-
-ReportConfigToAddMod ::=	SEQUENCE {
-	reportConfigId						ReportConfigId,
-	reportConfig						CHOICE {
-		reportConfigEUTRA					ReportConfigEUTRA,
-		reportConfigInterRAT				ReportConfigInterRAT
-	}
-}
-
-
-
-ReportInterval ::=					ENUMERATED {
-										ms120, ms240, ms480, ms640, ms1024, ms2048, ms5120, ms10240,
-										min1, min6, min12, min30, min60, spare3, spare2, spare1}
-
-
-RSRP-Range ::=						INTEGER(0..97)
-
-
-RSRQ-Range ::=						INTEGER(0..34)
-
-
-TimeToTrigger ::=					ENUMERATED {
-										ms0, ms40, ms64, ms80, ms100, ms128, ms160, ms256,
-										ms320, ms480, ms512, ms640, ms1024, ms1280, ms2560,
-										ms5120}
-
-
-C-RNTI ::=							BIT STRING (SIZE (16))
-
-
-DedicatedInfoCDMA2000 ::=				OCTET STRING
-
-
-DedicatedInfoNAS ::=		OCTET STRING
-
-
-FilterCoefficient ::=					ENUMERATED {
-											fc0, fc1, fc2, fc3, fc4, fc5,
-											fc6, fc7, fc8, fc9, fc11, fc13, 
-											fc15, fc17, fc19, spare1, ...}
-
-
-MMEC ::=							BIT STRING (SIZE (8))
-
-
-NeighCellConfig ::=			BIT STRING (SIZE (2))
-
-
-RAND-CDMA2000 ::=						BIT STRING (SIZE (32))
-
-
-RAT-Type ::=						ENUMERATED {
-										eutra, utra, geran-cs, geran-ps, cdma2000-1XRTT,
-										spare3, spare2, spare1, ...}
-
-
-RRC-TransactionIdentifier ::=		INTEGER (0..3)
-
-
-S-TMSI ::=							SEQUENCE {
-	mmec								MMEC,
-	m-TMSI								BIT STRING (SIZE (32))
-}
-
-
-UE-CapabilityRAT-ContainerList ::=SEQUENCE (SIZE (0..maxRAT-Capabilities)) OF UE-CapabilityRAT-Container
-
-UE-CapabilityRAT-Container ::= SEQUENCE {
-	rat-Type							RAT-Type,
-	ueCapabilityRAT-Container			OCTET STRING
-}
-
-
-UE-EUTRA-Capability ::=				SEQUENCE {
-	accessStratumRelease				AccessStratumRelease,
-	ue-Category							INTEGER (1..5),
-	pdcp-Parameters						PDCP-Parameters,
-	phyLayerParameters					PhyLayerParameters,
-	rf-Parameters						RF-Parameters,
-	measParameters						MeasParameters,
-	featureGroupIndicators				BIT STRING (SIZE (32))				OPTIONAL,
-	interRAT-Parameters					SEQUENCE {
-		utraFDD								IRAT-ParametersUTRA-FDD				OPTIONAL,
-		utraTDD128							IRAT-ParametersUTRA-TDD128				OPTIONAL,
-		utraTDD384							IRAT-ParametersUTRA-TDD384				OPTIONAL,
-		utraTDD768							IRAT-ParametersUTRA-TDD768				OPTIONAL,
-		geran								IRAT-ParametersGERAN					OPTIONAL,
-		cdma2000-HRPD						IRAT-ParametersCDMA2000-HRPD			OPTIONAL,
-		cdma2000-1xRTT						IRAT-ParametersCDMA2000-1XRTT			OPTIONAL
-	},
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-AccessStratumRelease ::=			ENUMERATED {
-										rel8, spare7, spare6, spare5, spare4, spare3,
-										spare2, spare1, ...}
-
-PDCP-Parameters ::=					SEQUENCE {
-	supportedROHC-Profiles				SEQUENCE {
-		profile0x0001						BOOLEAN,
-		profile0x0002						BOOLEAN,
-		profile0x0003						BOOLEAN,
-		profile0x0004						BOOLEAN,
-		profile0x0006						BOOLEAN,
-		profile0x0101						BOOLEAN,
-		profile0x0102						BOOLEAN,
-		profile0x0103						BOOLEAN,
-		profile0x0104						BOOLEAN
-	},
-	maxNumberROHC-ContextSessions		ENUMERATED {
-											cs2, cs4, cs8, cs12, cs16, cs24, cs32,
-											cs48, cs64, cs128, cs256, cs512, cs1024,
-											cs16384, spare2, spare1}				DEFAULT cs16,
-	...
-}
-
-PhyLayerParameters ::=				SEQUENCE {
-	ue-TxAntennaSelectionSupported		BOOLEAN,
-	ue-SpecificRefSigsSupported			BOOLEAN
-}
-
-RF-Parameters ::=					SEQUENCE {
-	supportedBandListEUTRA				SupportedBandListEUTRA
-}
-
-SupportedBandListEUTRA ::=			SEQUENCE (SIZE (1..maxBands)) OF SupportedBandEUTRA 
-
-SupportedBandEUTRA ::=				SEQUENCE {
-	bandEUTRA							INTEGER (1..64),
-	halfDuplex							BOOLEAN
-}
-
-MeasParameters ::=					SEQUENCE {
-	bandListEUTRA						BandListEUTRA
-}
-
-BandListEUTRA ::=					SEQUENCE (SIZE (1..maxBands)) OF BandInfoEUTRA 
-
-BandInfoEUTRA ::=					SEQUENCE {
-	interFreqBandList					InterFreqBandList,
-	interRAT-BandList					InterRAT-BandList		OPTIONAL
-}
-
-InterFreqBandList ::=				SEQUENCE (SIZE (1..maxBands)) OF InterFreqBandInfo
-
-InterFreqBandInfo ::=				SEQUENCE {
-	interFreqNeedForGaps				BOOLEAN
-}
-
-InterRAT-BandList ::=				SEQUENCE (SIZE (1..maxBands)) OF InterRAT-BandInfo
-
-InterRAT-BandInfo ::=				SEQUENCE {
-	interRAT-NeedForGaps				BOOLEAN
-}
-
-IRAT-ParametersUTRA-FDD ::=			SEQUENCE {
-	supportedBandListUTRA-FDD			SupportedBandListUTRA-FDD
-}
-
-SupportedBandListUTRA-FDD ::=		SEQUENCE (SIZE (1..maxBands)) OF SupportedBandUTRA-FDD 
-
-SupportedBandUTRA-FDD ::=			ENUMERATED {
-										bandI, bandII, bandIII, bandIV, bandV, bandVI,
-										bandVII, bandVIII, bandIX, bandX, bandXI,
-										bandXII, bandXIII, bandXIV, bandXV, bandXVI, ...}
-
-IRAT-ParametersUTRA-TDD128 ::=		SEQUENCE {
-	supportedBandListUTRA-TDD128		SupportedBandListUTRA-TDD128
-}
-
-SupportedBandListUTRA-TDD128 ::=	SEQUENCE (SIZE (1..maxBands)) OF SupportedBandUTRA-TDD128 
-
-SupportedBandUTRA-TDD128 ::=		ENUMERATED {
-										a, b, c, d, e, f, g, h, i, j, k, l, m, n,
-										o, p, ...}
-
-IRAT-ParametersUTRA-TDD384 ::=		SEQUENCE {
-	supportedBandListUTRA-TDD384		SupportedBandListUTRA-TDD384
-}
-
-SupportedBandListUTRA-TDD384 ::=	SEQUENCE (SIZE (1..maxBands)) OF SupportedBandUTRA-TDD384 
-
-SupportedBandUTRA-TDD384 ::=		ENUMERATED {
-											a, b, c, d, e, f, g, h, i, j, k, l, m, n,
-											o, p, ...}
-
-IRAT-ParametersUTRA-TDD768 ::=		SEQUENCE {
-	supportedBandListUTRA-TDD768		SupportedBandListUTRA-TDD768
-}
-
-SupportedBandListUTRA-TDD768 ::=	SEQUENCE (SIZE (1..maxBands)) OF SupportedBandUTRA-TDD768 
-
-SupportedBandUTRA-TDD768 ::=		ENUMERATED {
-										a, b, c, d, e, f, g, h, i, j, k, l, m, n,
-										o, p, ...}
-
-IRAT-ParametersGERAN ::=			SEQUENCE {
-	supportedBandListGERAN				SupportedBandListGERAN,
-	interRAT-PS-HO-ToGERAN				BOOLEAN
-}
-
-SupportedBandListGERAN ::=			SEQUENCE (SIZE (1..maxBands)) OF SupportedBandGERAN 
-
-SupportedBandGERAN ::=				ENUMERATED {
-										gsm450, gsm480, gsm710, gsm750, gsm810, gsm850,
-										gsm900P, gsm900E, gsm900R, gsm1800, gsm1900,
-										spare5, spare4, spare3, spare2, spare1, ...}
-
-IRAT-ParametersCDMA2000-HRPD ::=	SEQUENCE {
-	supportedBandListHRPD				SupportedBandListHRPD,
-	tx-ConfigHRPD						ENUMERATED {single, dual},
-	rx-ConfigHRPD						ENUMERATED {single, dual}
-}
-
-SupportedBandListHRPD ::=			SEQUENCE (SIZE (1..maxCDMA-BandClass)) OF BandclassCDMA2000
-
-IRAT-ParametersCDMA2000-1XRTT ::=	SEQUENCE {
-	supportedBandList1XRTT				SupportedBandList1XRTT,
-	tx-Config1XRTT						ENUMERATED {single, dual},
-	rx-Config1XRTT						ENUMERATED {single, dual}
-}
-
-SupportedBandList1XRTT ::=			SEQUENCE (SIZE (1..maxCDMA-BandClass)) OF BandclassCDMA2000
-
-
-UE-TimersAndConstants ::=			SEQUENCE {
-	t300								ENUMERATED {
-											ms100, ms200, ms300, ms400, ms600, ms1000, ms1500,
-											ms2000},
-	t301								ENUMERATED {
-											ms100, ms200, ms300, ms400, ms600, ms1000, ms1500,
-											ms2000},
-	t310								ENUMERATED {
-											ms0, ms50, ms100, ms200, ms500, ms1000, ms2000},
-	n310								ENUMERATED {
-											n1, n2, n3, n4, n6, n8, n10, n20},
-	t311								ENUMERATED {
-											ms1000, ms3000, ms5000, ms10000, ms15000,
-											ms20000, ms30000},
-	n311								ENUMERATED {
-											n1, n2, n3, n4, n5, n6, n8, n10},
-	...
-}
-
-
-maxBands					INTEGER ::= 64	-- Maximum number of bands listed in EUTRA UE caps
-maxCDMA-BandClass			INTEGER ::= 32	-- Maximum value of the CDMA band classes
-maxCellBlack				INTEGER ::= 16	-- Maximum number of blacklisted cells
-											--	listed in SIB type 4 and 5
-maxCellInter				INTEGER ::= 16	-- Maximum number of neighbouring inter-frequency
-											-- cells listed in SIB type 5
-maxCellIntra				INTEGER ::= 16	-- Maximum number of neighbouring intra-frequency
-											-- cells listed in SIB type 4
-maxCellMeas					INTEGER ::= 32	-- Maximum number of entries in each of the neighbour 
-											-- cell lists in a measurement object
-maxCellReport				INTEGER ::= 8	-- Maximum number of reported cells
-maxDRB						INTEGER ::= 11	-- Maximum number of Data Radio Bearers
-maxEARFCN					INTEGER ::= 65535	-- Maximum value of EUTRA carrier fequency
-maxFreq						INTEGER ::= 8	-- Maximum number of EUTRA carrier frequencies
-maxGERAN-SI					INTEGER ::= 10	-- Maximum number of GERAN SI blocks that can be
-											-- provided as part of NACC information
-maxGNFG						INTEGER ::= 16	-- Maximum number of GERAN neighbour freq groups
-maxMBSFN-Allocations		INTEGER ::= 8	-- Maximum number of MBSFN frame allocations with
-											-- different offset
-maxMCS-1					INTEGER ::= 16	-- Maximum number of PUCCH formats (MCS)
-maxMeasId					INTEGER ::= 32
-maxObjectId					INTEGER ::= 32
-maxPageRec					INTEGER ::= 16	-- 
-maxPNOffset					INTEGER ::=	511	-- Maximum number of CDMA2000 PNOffsets
-maxRAT-Capabilities			INTEGER ::= 8	-- Maximum number of interworking RATs (incl EUTRA)
-maxReportConfigId			INTEGER ::= 32
-maxSIB						INTEGER ::= 32	-- Maximum number of SIBs
-maxSIB-1					INTEGER ::= 31
-maxSI-Message				INTEGER ::= 32	-- Maximum number of SI messages
-maxUTRA-FDD-Carrier			INTEGER ::= 16	-- Maximum number of UTRA FDD carrier frequencies
-maxUTRA-TDD-Carrier			INTEGER ::= 16	-- Maximum number of UTRA TDD carrier frequencies
-
-
-END
+-- 3GPP TS 36.331 v9.2.0

+-- http://cdmweb.ericsson.se/TeamCenter/controller/ViewDocs?DocumentName=51%2F15519-10%2FFCP1039669%2F11&Revision=A

+

+EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=

+

+BEGIN

+

+

+BCCH-BCH-Message ::= SEQUENCE {

+	message					BCCH-BCH-MessageType

+}

+

+BCCH-BCH-MessageType ::=						MasterInformationBlock

+

+

+BCCH-DL-SCH-Message ::= SEQUENCE {

+	message					BCCH-DL-SCH-MessageType

+}

+

+BCCH-DL-SCH-MessageType ::= CHOICE {

+	c1						CHOICE {

+		systemInformation						SystemInformation,

+		systemInformationBlockType1				SystemInformationBlockType1

+	},

+	messageClassExtension	SEQUENCE {}

+}

+

+

+MCCH-Message ::= 		SEQUENCE {

+	message					MCCH-MessageType

+}

+

+MCCH-MessageType ::= CHOICE {

+	c1							CHOICE {

+		mbsfnAreaConfiguration-r9		MBSFNAreaConfiguration-r9

+	},

+	messageClassExtension	SEQUENCE {}

+}

+

+

+PCCH-Message ::= SEQUENCE {

+	message					PCCH-MessageType

+}

+

+PCCH-MessageType ::= CHOICE {

+	c1						CHOICE {

+		paging									Paging

+	},

+	messageClassExtension	SEQUENCE {}

+}

+

+

+DL-CCCH-Message ::= SEQUENCE {

+	message					DL-CCCH-MessageType

+}

+

+DL-CCCH-MessageType ::= CHOICE {

+	c1						CHOICE {

+		rrcConnectionReestablishment			RRCConnectionReestablishment,

+		rrcConnectionReestablishmentReject		RRCConnectionReestablishmentReject,

+		rrcConnectionReject						RRCConnectionReject,

+		rrcConnectionSetup						RRCConnectionSetup

+	},

+	messageClassExtension	SEQUENCE {}

+}

+

+

+DL-DCCH-Message ::= SEQUENCE {

+	message					DL-DCCH-MessageType

+}

+

+DL-DCCH-MessageType ::= CHOICE {

+	c1						CHOICE {

+		csfbParametersResponseCDMA2000			CSFBParametersResponseCDMA2000,

+		dlInformationTransfer					DLInformationTransfer,

+		handoverFromEUTRAPreparationRequest		HandoverFromEUTRAPreparationRequest,

+		mobilityFromEUTRACommand				MobilityFromEUTRACommand,

+		rrcConnectionReconfiguration			RRCConnectionReconfiguration,

+		rrcConnectionRelease					RRCConnectionRelease,

+		securityModeCommand						SecurityModeCommand,

+		ueCapabilityEnquiry						UECapabilityEnquiry,

+		counterCheck							CounterCheck,

+		ueInformationRequest-r9					UEInformationRequest-r9,

+		spare6 NULL, spare5 NULL, spare4 NULL,

+		spare3 NULL, spare2 NULL, spare1 NULL

+	},

+	messageClassExtension	SEQUENCE {}

+}

+

+

+UL-CCCH-Message ::= SEQUENCE {

+	message					UL-CCCH-MessageType

+}

+

+UL-CCCH-MessageType ::= CHOICE {

+	c1						CHOICE {

+		rrcConnectionReestablishmentRequest		RRCConnectionReestablishmentRequest,

+		rrcConnectionRequest					RRCConnectionRequest

+	},

+	messageClassExtension	SEQUENCE {}

+}

+

+

+UL-DCCH-Message ::= SEQUENCE {

+	message					UL-DCCH-MessageType

+}

+

+UL-DCCH-MessageType ::= CHOICE {

+	c1						CHOICE {

+		csfbParametersRequestCDMA2000			CSFBParametersRequestCDMA2000,

+		measurementReport						MeasurementReport,

+		rrcConnectionReconfigurationComplete	RRCConnectionReconfigurationComplete,

+		rrcConnectionReestablishmentComplete	RRCConnectionReestablishmentComplete,

+		rrcConnectionSetupComplete				RRCConnectionSetupComplete,

+		securityModeComplete					SecurityModeComplete,

+		securityModeFailure						SecurityModeFailure,

+		ueCapabilityInformation					UECapabilityInformation,

+ulHandoverPreparationTransfer			ULHandoverPreparationTransfer,

+		ulInformationTransfer					ULInformationTransfer,

+		counterCheckResponse					CounterCheckResponse,

+		ueInformationResponse-r9				UEInformationResponse-r9,

+		proximityIndication-r9					ProximityIndication-r9,

+				spare3 NULL, spare2 NULL, spare1 NULL

+	},

+	messageClassExtension	SEQUENCE {}

+}

+

+

+CounterCheck ::=			SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE {

+			counterCheck-r8						CounterCheck-r8-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+CounterCheck-r8-IEs ::=	SEQUENCE {

+	drb-CountMSB-InfoList				DRB-CountMSB-InfoList,

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	--Need OP

+}

+

+DRB-CountMSB-InfoList ::=		SEQUENCE (SIZE (1..maxDRB)) OF DRB-CountMSB-Info

+

+DRB-CountMSB-Info ::=	SEQUENCE {

+	drb-Identity					DRB-Identity,

+	countMSB-Uplink					INTEGER(0..33554431),

+	countMSB-Downlink				INTEGER(0..33554431)

+}

+

+

+CounterCheckResponse ::=			SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		counterCheckResponse-r8				CounterCheckResponse-r8-IEs,

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+CounterCheckResponse-r8-IEs ::=	SEQUENCE {

+	drb-CountInfoList					DRB-CountInfoList,

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL

+}

+

+DRB-CountInfoList ::=			SEQUENCE (SIZE (0..maxDRB)) OF DRB-CountInfo

+

+DRB-CountInfo ::=	SEQUENCE {

+	drb-Identity					DRB-Identity,

+	count-Uplink					INTEGER(0..4294967295),

+	count-Downlink					INTEGER(0..4294967295)

+}

+

+

+CSFBParametersRequestCDMA2000 ::= SEQUENCE {

+	criticalExtensions					CHOICE {

+		csfbParametersRequestCDMA2000-r8	CSFBParametersRequestCDMA2000-r8-IEs,

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+CSFBParametersRequestCDMA2000-r8-IEs ::= SEQUENCE {

+	nonCriticalExtension				SEQUENCE {}						OPTIONAL

+}

+

+CSFBParametersResponseCDMA2000 ::= SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions						CHOICE {

+		csfbParametersResponseCDMA2000-r8		CSFBParametersResponseCDMA2000-r8-IEs,

+		criticalExtensionsFuture				SEQUENCE {}

+	}

+}

+

+CSFBParametersResponseCDMA2000-r8-IEs ::= SEQUENCE {

+	rand									RAND-CDMA2000,

+	mobilityParameters						MobilityParametersCDMA2000,

+	nonCriticalExtension					SEQUENCE {}						OPTIONAL	--Need OP

+}

+

+

+DLInformationTransfer ::=			SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE {

+			dlInformationTransfer-r8			DLInformationTransfer-r8-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+DLInformationTransfer-r8-IEs ::=	SEQUENCE {

+	dedicatedInfoType					CHOICE {

+		dedicatedInfoNAS					DedicatedInfoNAS,

+		dedicatedInfoCDMA2000-1XRTT			DedicatedInfoCDMA2000,

+		dedicatedInfoCDMA2000-HRPD			DedicatedInfoCDMA2000

+	},

+	nonCriticalExtension				SEQUENCE {}						OPTIONAL	--Need OP

+}

+

+

+HandoverFromEUTRAPreparationRequest ::= SEQUENCE {

+	rrc-TransactionIdentifier		RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE {

+			handoverFromEUTRAPreparationRequest-r8

+												HandoverFromEUTRAPreparationRequest-r8-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+HandoverFromEUTRAPreparationRequest-r8-IEs ::= SEQUENCE {

+	cdma2000-Type					CDMA2000-Type,

+	rand							RAND-CDMA2000				OPTIONAL,  -- Cond cdma2000-Type

+	mobilityParameters				MobilityParametersCDMA2000	OPTIONAL,  -- Cond cdma2000-Type

+	nonCriticalExtension				HandoverFromEUTRAPreparationRequest-v890-IEs	OPTIONAL

+}

+

+HandoverFromEUTRAPreparationRequest-v890-IEs ::= SEQUENCE {

+	lateR8NonCriticalExtension			OCTET STRING				OPTIONAL,	-- Need OP

+	nonCriticalExtension				HandoverFromEUTRAPreparationRequest-v920-IEs	OPTIONAL

+}

+

+HandoverFromEUTRAPreparationRequest-v920-IEs ::= SEQUENCE {

+	concurrPrepCDMA2000-HRPD-r9		BOOLEAN						OPTIONAL,	-- Cond PSHO

+	nonCriticalExtension				SEQUENCE {}					OPTIONAL	-- Need OP

+}

+

+

+MasterInformationBlock ::=			SEQUENCE {

+	dl-Bandwidth						ENUMERATED {

+											n6, n15, n25, n50, n75, n100},

+	phich-Config						PHICH-Config,

+	systemFrameNumber					BIT STRING (SIZE (8)),

+	spare								BIT STRING (SIZE (10))

+}

+

+

+

+MBSFNAreaConfiguration-r9 ::=		SEQUENCE {

+	commonSF-Alloc-r9					CommonSF-AllocPatternList-r9,

+	commonSF-AllocPeriod-r9				ENUMERATED {

+												rf4, rf8, rf16, rf32, rf64, rf128, rf256},

+	pmch-InfoList-r9					PMCH-InfoList-r9,

+	nonCriticalExtension				SEQUENCE {}			OPTIONAL	-- Need OP

+}

+

+CommonSF-AllocPatternList-r9 ::=	SEQUENCE (SIZE (1..maxMBSFN-Allocations)) OF MBSFN-SubframeConfig

+

+

+MeasurementReport ::=				SEQUENCE {

+	criticalExtensions					CHOICE {

+		c1									CHOICE{

+			measurementReport-r8				MeasurementReport-r8-IEs,

+			spare7 NULL,

+			spare6 NULL, spare5 NULL, spare4 NULL,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+MeasurementReport-r8-IEs ::=		SEQUENCE {

+	measResults							MeasResults,

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL

+}

+

+

+MobilityFromEUTRACommand ::=		SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE{

+			mobilityFromEUTRACommand-r8		MobilityFromEUTRACommand-r8-IEs,

+			mobilityFromEUTRACommand-r9 		MobilityFromEUTRACommand-r9-IEs,

+			spare2 NULL, spare1 	NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+MobilityFromEUTRACommand-r8-IEs ::=	SEQUENCE {

+	cs-FallbackIndicator				BOOLEAN,

+	purpose								CHOICE{

+		handover							Handover,

+		cellChangeOrder						CellChangeOrder

+	},

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP

+}

+

+MobilityFromEUTRACommand-r9-IEs ::=	SEQUENCE {

+	cs-FallbackIndicator				BOOLEAN,

+	purpose								CHOICE{

+		handover							Handover,

+		cellChangeOrder						CellChangeOrder,

+		e-CSFB-r9							E-CSFB-r9,

+		...

+	},

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP

+}

+

+Handover ::=						SEQUENCE {

+	targetRAT-Type						ENUMERATED {

+											utra, geran, cdma2000-1XRTT, cdma2000-HRPD,

+											spare4,	spare3, spare2, spare1, ...},

+	targetRAT-MessageContainer			OCTET STRING,

+	nas-SecurityParamFromEUTRA			OCTET STRING (SIZE (1)) 	OPTIONAL,  	-- Cond UTRAGERAN

+	systemInformation					SI-OrPSI-GERAN				OPTIONAL	-- Cond PSHO

+}

+

+CellChangeOrder ::=				SEQUENCE {

+	t304								ENUMERATED {

+											ms100, ms200, ms500, ms1000,

+											ms2000, ms4000, ms8000, spare1},

+	targetRAT-Type						CHOICE {

+			geran							SEQUENCE {

+				physCellId						PhysCellIdGERAN,

+				carrierFreq						CarrierFreqGERAN,

+				networkControlOrder				BIT STRING (SIZE (2)) 		OPTIONAL,	-- Need OP

+				systemInformation				SI-OrPSI-GERAN				OPTIONAL	-- Need OP

+			},

+			...

+	}

+}

+

+SI-OrPSI-GERAN ::=					CHOICE {

+	si									SystemInfoListGERAN,

+	psi									SystemInfoListGERAN

+}

+

+E-CSFB-r9 ::=						SEQUENCE {

+	messageContCDMA2000-1XRTT-r9		OCTET STRING		OPTIONAL, 	-- Need ON

+	mobilityCDMA2000-HRPD-r9			ENUMERATED {

+											handover, redirection 

+										}					OPTIONAL,	-- Need OP

+	messageContCDMA2000-HRPD-r9		OCTET STRING		OPTIONAL, 	-- Cond concHO

+	redirectCarrierCDMA2000-HRPD-r9	CarrierFreqCDMA2000	OPTIONAL	-- Cond concRedir

+}

+

+

+Paging ::=					SEQUENCE {

+	pagingRecordList				PagingRecordList 					OPTIONAL,	-- Need ON

+	systemInfoModification			ENUMERATED {true}					OPTIONAL,	-- Need ON

+	etws-Indication					ENUMERATED {true}					OPTIONAL,	-- Need ON

+	nonCriticalExtension				Paging-v890-IEs						OPTIONAL

+}

+

+Paging-v890-IEs ::=			SEQUENCE {

+	lateR8NonCriticalExtension		OCTET STRING							OPTIONAL,	-- Need OP

+	nonCriticalExtension			Paging-v920-IEs							OPTIONAL

+}

+

+Paging-v920-IEs ::=			SEQUENCE {

+	cmas-Indication-r9				ENUMERATED {true}					OPTIONAL,	-- Need ON

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP

+}

+

+PagingRecordList ::=				SEQUENCE (SIZE (1..maxPageRec)) OF PagingRecord

+

+PagingRecord ::=					SEQUENCE {

+	ue-Identity							PagingUE-Identity,

+	cn-Domain							ENUMERATED	{ps, cs},

+	...

+}

+

+PagingUE-Identity ::=				CHOICE {

+	s-TMSI								S-TMSI,

+	imsi								IMSI,

+	...

+}

+

+IMSI ::=							SEQUENCE (SIZE (6..21)) OF IMSI-Digit

+

+IMSI-Digit ::=						INTEGER (0..9)

+

+

+ProximityIndication-r9 ::= SEQUENCE {

+	criticalExtensions					CHOICE {

+		c1									CHOICE {

+			proximityIndication-r9				ProximityIndication-r9-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+			},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+ProximityIndication-r9-IEs ::= SEQUENCE {

+	type-r9								ENUMERATED {entering, leaving},

+	carrierFreq-r9						CHOICE {

+		eutra-r9							ARFCN-ValueEUTRA,

+		utra-r9								ARFCN-ValueUTRA,

+		...

+	},

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL

+}

+

+

+RRCConnectionReconfiguration ::=	SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE{

+			rrcConnectionReconfiguration-r8		RRCConnectionReconfiguration-r8-IEs,

+			spare7 NULL,

+			spare6 NULL, spare5 NULL, spare4 NULL,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+RRCConnectionReconfiguration-r8-IEs ::= SEQUENCE {

+	measConfig							MeasConfig						OPTIONAL,	-- Need ON

+	mobilityControlInfo					MobilityControlInfo				OPTIONAL,	-- Cond HO

+	dedicatedInfoNASList				SEQUENCE (SIZE(1..maxDRB)) OF

+											DedicatedInfoNAS			OPTIONAL,	-- Cond nonHO

+	radioResourceConfigDedicated		RadioResourceConfigDedicated	OPTIONAL, -- Cond HO-toEUTRA

+	securityConfigHO					SecurityConfigHO				OPTIONAL,	-- Cond HO

+	nonCriticalExtension				RRCConnectionReconfiguration-v890-IEs	OPTIONAL

+}

+

+RRCConnectionReconfiguration-v890-IEs ::= SEQUENCE {

+	lateR8NonCriticalExtension			OCTET STRING					OPTIONAL,	-- Need OP

+	nonCriticalExtension			RRCConnectionReconfiguration-v920-IEs		OPTIONAL

+}

+

+RRCConnectionReconfiguration-v920-IEs ::= SEQUENCE {

+	otherConfig-r9						OtherConfig-r9					OPTIONAL,	-- Need ON

+	fullConfig-r9						ENUMERATED {true}				OPTIONAL, 	-- Cond HO-Reestab

+	nonCriticalExtension				SEQUENCE {}						OPTIONAL	-- Need OP

+}

+

+SecurityConfigHO ::=				SEQUENCE {

+	handoverType						CHOICE {

+		intraLTE							SEQUENCE {

+			securityAlgorithmConfig				SecurityAlgorithmConfig		OPTIONAL,	-- Cond fullConfig

+			keyChangeIndicator					BOOLEAN,

+			nextHopChainingCount				NextHopChainingCount

+		},

+		interRAT							SEQUENCE {

+			securityAlgorithmConfig				SecurityAlgorithmConfig,

+			nas-SecurityParamToEUTRA			OCTET STRING (SIZE(6))

+		}

+	},

+	...

+}

+

+

+

+RRCConnectionReconfigurationComplete ::= SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		rrcConnectionReconfigurationComplete-r8

+											RRCConnectionReconfigurationComplete-r8-IEs,

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+RRCConnectionReconfigurationComplete-r8-IEs ::= SEQUENCE {

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL

+}

+

+

+RRCConnectionReestablishment ::=	SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE{

+			rrcConnectionReestablishment-r8		RRCConnectionReestablishment-r8-IEs,

+			spare7 NULL,

+			spare6 NULL, spare5 NULL, spare4 	NULL,

+			spare3 NULL, spare2 NULL, spare1 	NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+RRCConnectionReestablishment-r8-IEs ::= SEQUENCE {

+	radioResourceConfigDedicated		RadioResourceConfigDedicated,

+	nextHopChainingCount				NextHopChainingCount,

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP

+}

+

+

+RRCConnectionReestablishmentComplete ::= SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		rrcConnectionReestablishmentComplete-r8

+											RRCConnectionReestablishmentComplete-r8-IEs,

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+RRCConnectionReestablishmentComplete-r8-IEs ::= SEQUENCE {

+	nonCriticalExtension				RRCConnectionReestablishmentComplete-v920-IEs						OPTIONAL

+}

+

+RRCConnectionReestablishmentComplete-v920-IEs ::= SEQUENCE {

+	rlf-InfoAvailable-r9				ENUMERATED {true}				OPTIONAL,

+	nonCriticalExtension				SEQUENCE {}						OPTIONAL

+}

+

+

+RRCConnectionReestablishmentReject ::= SEQUENCE {

+	criticalExtensions					CHOICE {

+		rrcConnectionReestablishmentReject-r8

+											RRCConnectionReestablishmentReject-r8-IEs,

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+RRCConnectionReestablishmentReject-r8-IEs ::= SEQUENCE {

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP

+}

+

+

+RRCConnectionReestablishmentRequest ::= SEQUENCE {

+	criticalExtensions					CHOICE {

+		rrcConnectionReestablishmentRequest-r8

+											RRCConnectionReestablishmentRequest-r8-IEs,

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+RRCConnectionReestablishmentRequest-r8-IEs ::= SEQUENCE {

+	ue-Identity							ReestabUE-Identity,

+	reestablishmentCause				ReestablishmentCause,

+	spare								BIT STRING (SIZE (2))

+}

+

+ReestabUE-Identity ::=				SEQUENCE {

+	c-RNTI								C-RNTI,

+	physCellId							PhysCellId,

+	shortMAC-I							ShortMAC-I

+}

+

+ReestablishmentCause ::=			ENUMERATED {

+										reconfigurationFailure, handoverFailure,

+										otherFailure, spare1}

+

+

+RRCConnectionReject ::=				SEQUENCE {

+	criticalExtensions					CHOICE {

+		c1									CHOICE {

+			rrcConnectionReject-r8				RRCConnectionReject-r8-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+RRCConnectionReject-r8-IEs ::=		SEQUENCE {

+	waitTime							INTEGER (1..16),

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP

+}

+

+

+RRCConnectionRelease ::=			SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE {

+			rrcConnectionRelease-r8				RRCConnectionRelease-r8-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+RRCConnectionRelease-r8-IEs ::=		SEQUENCE {

+	releaseCause						ReleaseCause,

+	redirectedCarrierInfo				RedirectedCarrierInfo				OPTIONAL,	-- Need ON

+	idleModeMobilityControlInfo			IdleModeMobilityControlInfo			OPTIONAL,	-- Need OP

+	nonCriticalExtension				RRCConnectionRelease-v890-IEs		OPTIONAL

+}

+

+RRCConnectionRelease-v890-IEs ::=	SEQUENCE {

+	lateR8NonCriticalExtension			OCTET STRING						OPTIONAL,	-- Need OP

+	nonCriticalExtension				RRCConnectionRelease-v920-IEs		OPTIONAL

+}

+

+RRCConnectionRelease-v920-IEs ::=	SEQUENCE {

+	cellInfoList-r9					CHOICE {

+		geran-r9						CellInfoListGERAN-r9,

+		utra-FDD-r9						CellInfoListUTRA-FDD-r9,

+		utra-TDD-r9						CellInfoListUTRA-TDD-r9,

+		...

+	}															OPTIONAL,	-- Cond Redirection

+	nonCriticalExtension			SEQUENCE {}				OPTIONAL	-- Need OP

+}

+

+ReleaseCause ::=				ENUMERATED {loadBalancingTAUrequired,

+											other,spare2,spare1}

+

+RedirectedCarrierInfo ::=			CHOICE {

+	eutra								ARFCN-ValueEUTRA,

+	geran								CarrierFreqsGERAN,

+	utra-FDD							ARFCN-ValueUTRA,

+	utra-TDD							ARFCN-ValueUTRA,

+	cdma2000-HRPD						CarrierFreqCDMA2000,

+	cdma2000-1xRTT						CarrierFreqCDMA2000,

+	...

+}

+

+IdleModeMobilityControlInfo ::=		SEQUENCE {

+	freqPriorityListEUTRA				FreqPriorityListEUTRA			OPTIONAL,		-- Need ON

+	freqPriorityListGERAN				FreqsPriorityListGERAN			OPTIONAL,		-- Need ON

+	freqPriorityListUTRA-FDD			FreqPriorityListUTRA-FDD		OPTIONAL,		-- Need ON

+	freqPriorityListUTRA-TDD			FreqPriorityListUTRA-TDD		OPTIONAL,		-- Need ON

+	bandClassPriorityListHRPD			BandClassPriorityListHRPD		OPTIONAL,		-- Need ON

+	bandClassPriorityList1XRTT			BandClassPriorityList1XRTT		OPTIONAL,		-- Need ON

+	t320								ENUMERATED {

+											min5, min10, min20, min30, min60, min120, min180,

+											spare1}						OPTIONAL,		-- Need OR

+	...

+}

+

+FreqPriorityListEUTRA ::=			SEQUENCE (SIZE (1..maxFreq)) OF FreqPriorityEUTRA

+

+FreqPriorityEUTRA ::=				SEQUENCE {

+	carrierFreq							ARFCN-ValueEUTRA,

+	cellReselectionPriority				CellReselectionPriority

+}

+

+FreqsPriorityListGERAN ::=			SEQUENCE (SIZE (1..maxGNFG)) OF FreqsPriorityGERAN

+

+FreqsPriorityGERAN ::=				SEQUENCE {

+	carrierFreqs						CarrierFreqsGERAN,

+	cellReselectionPriority				CellReselectionPriority

+}

+

+FreqPriorityListUTRA-FDD ::=		SEQUENCE (SIZE (1..maxUTRA-FDD-Carrier)) OF FreqPriorityUTRA-FDD

+

+FreqPriorityUTRA-FDD ::=			SEQUENCE {

+	carrierFreq							ARFCN-ValueUTRA,

+	cellReselectionPriority				CellReselectionPriority

+}

+

+FreqPriorityListUTRA-TDD ::=		SEQUENCE (SIZE (1..maxUTRA-TDD-Carrier)) OF FreqPriorityUTRA-TDD

+

+FreqPriorityUTRA-TDD ::=			SEQUENCE {

+	carrierFreq							ARFCN-ValueUTRA,

+	cellReselectionPriority				CellReselectionPriority

+}

+

+BandClassPriorityListHRPD ::=		SEQUENCE (SIZE (1..maxCDMA-BandClass)) OF BandClassPriorityHRPD

+

+BandClassPriorityHRPD ::=			SEQUENCE {

+	bandClass							BandclassCDMA2000,

+	cellReselectionPriority				CellReselectionPriority

+}

+

+BandClassPriorityList1XRTT ::=	SEQUENCE (SIZE (1..maxCDMA-BandClass)) OF BandClassPriority1XRTT

+

+BandClassPriority1XRTT ::=			SEQUENCE {

+	bandClass							BandclassCDMA2000,

+	cellReselectionPriority				CellReselectionPriority

+}

+

+CellInfoListGERAN-r9 ::=		SEQUENCE (SIZE (1..maxCellInfo-GERAN-r9 )) OF CellInfoGERAN-r9

+

+CellInfoGERAN-r9 ::=				SEQUENCE {

+	physCellId-r9						PhysCellIdGERAN,

+	carrierFreq-r9						CarrierFreqGERAN,

+	systemInformation-r9				SystemInfoListGERAN

+}

+

+CellInfoListUTRA-FDD-r9 ::=			SEQUENCE (SIZE (1..maxUTRA-CellInfo-r9)) OF CellInfoUTRA-FDD-r9

+

+CellInfoUTRA-FDD-r9 ::=				SEQUENCE {

+	physCellId-r9						PhysCellIdUTRA-FDD,

+	utra-BCCH-Container-r9				OCTET STRING

+}

+

+CellInfoListUTRA-TDD-r9 ::=			SEQUENCE (SIZE (1..maxUTRA-CellInfo-r9)) OF CellInfoUTRA-TDD-r9

+

+CellInfoUTRA-TDD-r9 ::=				SEQUENCE {

+	physCellId-r9						PhysCellIdUTRA-TDD,

+	utra-BCCH-Container-r9				OCTET STRING

+}

+

+

+RRCConnectionRequest ::=			SEQUENCE {

+	criticalExtensions					CHOICE {

+		rrcConnectionRequest-r8				RRCConnectionRequest-r8-IEs,

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+RRCConnectionRequest-r8-IEs ::=		SEQUENCE {

+	ue-Identity							InitialUE-Identity,

+	establishmentCause					EstablishmentCause,

+	spare								BIT STRING (SIZE (1))

+}

+

+InitialUE-Identity ::=				CHOICE {

+	s-TMSI								S-TMSI,

+	randomValue							BIT STRING (SIZE (40))

+}

+

+EstablishmentCause ::=				ENUMERATED {

+										emergency, highPriorityAccess, mt-Access, mo-Signalling,

+										mo-Data, spare3, spare2, spare1}

+

+

+RRCConnectionSetup ::=				SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE {

+			rrcConnectionSetup-r8				RRCConnectionSetup-r8-IEs,

+			spare7 NULL,

+			spare6 NULL, spare5 NULL, spare4 NULL,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+RRCConnectionSetup-r8-IEs ::=		SEQUENCE {

+	radioResourceConfigDedicated		RadioResourceConfigDedicated,

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP

+}

+

+

+RRCConnectionSetupComplete ::=		SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE{

+			rrcConnectionSetupComplete-r8		RRCConnectionSetupComplete-r8-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+RRCConnectionSetupComplete-r8-IEs ::= SEQUENCE {

+	selectedPLMN-Identity				INTEGER (1..6),

+	registeredMME						RegisteredMME						OPTIONAL,

+	dedicatedInfoNAS					DedicatedInfoNAS,

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL

+}

+

+RegisteredMME ::=					SEQUENCE {

+	plmn-Identity						PLMN-Identity						OPTIONAL,

+	mmegi								BIT STRING (SIZE (16)),

+	mmec								MMEC

+}

+

+

+SecurityModeCommand ::=				SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE{

+			securityModeCommand-r8				SecurityModeCommand-r8-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+SecurityModeCommand-r8-IEs ::=		SEQUENCE {

+	securityConfigSMC					SecurityConfigSMC,

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP

+}

+

+SecurityConfigSMC ::=					SEQUENCE {

+	securityAlgorithmConfig					SecurityAlgorithmConfig,

+	...

+}

+

+

+SecurityModeComplete ::=			SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		securityModeComplete-r8				SecurityModeComplete-r8-IEs,

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+SecurityModeComplete-r8-IEs ::=		SEQUENCE {

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL

+}

+

+

+SecurityModeFailure ::=				SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		securityModeFailure-r8				SecurityModeFailure-r8-IEs,

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+SecurityModeFailure-r8-IEs ::=		SEQUENCE {

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL

+}

+

+

+SystemInformation ::=				SEQUENCE {

+	criticalExtensions					CHOICE {

+		systemInformation-r8				SystemInformation-r8-IEs,

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+SystemInformation-r8-IEs ::=		SEQUENCE {

+	sib-TypeAndInfo						SEQUENCE (SIZE (1..maxSIB)) OF CHOICE {

+		sib2								SystemInformationBlockType2,

+		sib3								SystemInformationBlockType3,

+		sib4								SystemInformationBlockType4,

+		sib5								SystemInformationBlockType5,

+		sib6								SystemInformationBlockType6,

+		sib7								SystemInformationBlockType7,

+		sib8								SystemInformationBlockType8,

+		sib9								SystemInformationBlockType9,

+		sib10								SystemInformationBlockType10,

+		sib11								SystemInformationBlockType11,

+		...,

+		sib12-v920							SystemInformationBlockType12-r9,

+		sib13-v920							SystemInformationBlockType13-r9

+	},

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP

+}

+

+

+SystemInformationBlockType1 ::=		SEQUENCE {

+	cellAccessRelatedInfo				SEQUENCE {

+		plmn-IdentityList					PLMN-IdentityList,

+		trackingAreaCode					TrackingAreaCode,

+		cellIdentity						CellIdentity,

+		cellBarred							ENUMERATED {barred, notBarred},

+		intraFreqReselection				ENUMERATED {allowed, notAllowed},

+		csg-Indication						BOOLEAN,

+		csg-Identity						CSG-Identity			OPTIONAL	-- Need OR

+	},

+	cellSelectionInfo					SEQUENCE {

+		q-RxLevMin							Q-RxLevMin,

+		q-RxLevMinOffset					INTEGER (1..8)			OPTIONAL	-- Need OP

+	},

+	p-Max								P-Max						OPTIONAL,			-- Need OP

+	freqBandIndicator					INTEGER (1..64),

+	schedulingInfoList					SchedulingInfoList,

+	tdd-Config							TDD-Config					OPTIONAL,	-- Cond TDD

+	si-WindowLength						ENUMERATED {

+											ms1, ms2, ms5, ms10, ms15, ms20,

+											ms40},

+	systemInfoValueTag					INTEGER (0..31),

+	nonCriticalExtension				SystemInformationBlockType1-v890-IEs					OPTIONAL

+}

+

+SystemInformationBlockType1-v890-IEs::=	SEQUENCE {

+	lateR8NonCriticalExtension				OCTET STRING			OPTIONAL,	-- Need OP

+	nonCriticalExtension					SystemInformationBlockType1-v920-IEs	OPTIONAL

+}

+

+SystemInformationBlockType1-v920-IEs ::=	SEQUENCE {

+	ims-EmergencySupport-r9			ENUMERATED {true}				OPTIONAL,	-- Need OR

+	cellSelectionInfo-v920				CellSelectionInfo-v920				OPTIONAL,	-- Need OP

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP

+}

+

+PLMN-IdentityList ::=					SEQUENCE (SIZE (1..6)) OF PLMN-IdentityInfo

+

+PLMN-IdentityInfo ::=					SEQUENCE {

+	plmn-Identity							PLMN-Identity,

+	cellReservedForOperatorUse				ENUMERATED {reserved, notReserved}

+}

+

+SchedulingInfoList ::= SEQUENCE (SIZE (1..maxSI-Message)) OF SchedulingInfo

+

+SchedulingInfo ::=	SEQUENCE {

+	si-Periodicity						ENUMERATED {

+											rf8, rf16, rf32, rf64, rf128, rf256, rf512},

+	sib-MappingInfo						SIB-MappingInfo

+}

+

+SIB-MappingInfo ::= SEQUENCE (SIZE (0..maxSIB-1)) OF SIB-Type

+

+SIB-Type ::=						ENUMERATED {

+										sibType3, sibType4, sibType5, sibType6,

+										sibType7, sibType8, sibType9, sibType10,

+										sibType11, sibType12-v920, sibType13-v920, spare5,

+										spare4, spare3, spare2, spare1, ...}

+

+CellSelectionInfo-v920 ::=			SEQUENCE {

+	q-QualMin-r9						Q-QualMin-r9,

+	q-QualMinOffset-r9					INTEGER (1..8)						OPTIONAL	-- Need OP

+}

+

+

+UECapabilityEnquiry ::=				SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE {

+			ueCapabilityEnquiry-r8				UECapabilityEnquiry-r8-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+UECapabilityEnquiry-r8-IEs ::=		SEQUENCE {

+	ue-CapabilityRequest				UE-CapabilityRequest,

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL	-- Need OP

+}

+

+UE-CapabilityRequest ::=		SEQUENCE (SIZE (1..maxRAT-Capabilities)) OF RAT-Type

+

+

+UECapabilityInformation ::=			SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1									CHOICE{

+			ueCapabilityInformation-r8			UECapabilityInformation-r8-IEs,

+			spare7 NULL,

+			spare6 NULL, spare5 NULL, spare4 NULL,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+UECapabilityInformation-r8-IEs ::=	SEQUENCE {

+	ue-CapabilityRAT-ContainerList		UE-CapabilityRAT-ContainerList,

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL

+}

+

+

+UEInformationRequest-r9		::=				SEQUENCE {

+	rrc-TransactionIdentifier		RRC-TransactionIdentifier,

+	criticalExtensions				CHOICE {

+		c1								CHOICE {

+			ueInformationRequest-r9				UEInformationRequest-r9-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+UEInformationRequest-r9-IEs ::=		SEQUENCE {

+	rach-ReportReq-r9							BOOLEAN,

+	rlf-ReportReq-r9							BOOLEAN,

+	nonCriticalExtension					SEQUENCE {}					OPTIONAL -- Need OP

+}

+

+

+UEInformationResponse-r9	::=			SEQUENCE {

+	rrc-TransactionIdentifier			RRC-TransactionIdentifier,

+	criticalExtensions					CHOICE {

+		c1								CHOICE {

+			ueInformationResponse-r9				UEInformationResponse-r9-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture				SEQUENCE {}

+	}

+}

+

+UEInformationResponse-r9-IEs ::=		SEQUENCE {

+	rach-Report-r9							SEQUENCE {

+		numberOfPreamblesSent-r9				INTEGER (1..200),

+		contentionDetected-r9					BOOLEAN

+	}																OPTIONAL,

+	rlfReport-r9							RLF-Report-r9			OPTIONAL,

+	nonCriticalExtension					SEQUENCE {}				OPTIONAL

+}

+

+RLF-Report-r9 ::= 					SEQUENCE {

+	measResultLastServCell				SEQUENCE {

+		rsrpResult							RSRP-Range,

+		rsrqResult							RSRQ-Range			OPTIONAL

+	},

+	measResultNeighCells				SEQUENCE {

+		measResultListEUTRA					MeasResultList2EUTRA	OPTIONAL,

+		measResultListUTRA					MeasResultList2UTRA		OPTIONAL,

+		measResultListGERAN					MeasResultListGERAN		OPTIONAL,

+		measResultsCDMA2000					MeasResultList2CDMA2000	OPTIONAL

+	}																OPTIONAL,

+	...

+}

+

+MeasResultList2EUTRA ::=				SEQUENCE (SIZE (1..maxFreq)) OF SEQUENCE {

+	carrierFreq							ARFCN-ValueEUTRA,

+	measResultList						MeasResultListEUTRA

+}

+

+MeasResultList2UTRA ::=				SEQUENCE (SIZE (1..maxCellReport)) OF SEQUENCE {

+	carrierFreq							ARFCN-ValueUTRA,

+	measResultList						MeasResultListUTRA

+}

+

+MeasResultList2CDMA2000 ::=			SEQUENCE (SIZE (1..maxCellReport)) OF SEQUENCE {

+	carrierFreq							CarrierFreqCDMA2000,

+	measResultList						MeasResultsCDMA2000

+}

+

+

+ULHandoverPreparationTransfer ::=	SEQUENCE {

+	criticalExtensions					CHOICE {

+		c1									CHOICE {

+			ulHandoverPreparationTransfer-r8		ULHandoverPreparationTransfer-r8-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture				SEQUENCE {}

+	}

+}

+

+ULHandoverPreparationTransfer-r8-IEs ::= SEQUENCE {

+	cdma2000-Type						CDMA2000-Type,

+	meid								BIT STRING (SIZE (56))	OPTIONAL,

+	dedicatedInfo						DedicatedInfoCDMA2000,

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL

+}

+

+

+ULInformationTransfer ::=			SEQUENCE {

+	criticalExtensions					CHOICE {

+		c1									CHOICE {

+			ulInformationTransfer-r8			ULInformationTransfer-r8-IEs,

+			spare3 NULL, spare2 NULL, spare1 NULL

+		},

+		criticalExtensionsFuture			SEQUENCE {}

+	}

+}

+

+ULInformationTransfer-r8-IEs ::=	SEQUENCE {

+	dedicatedInfoType			CHOICE {

+		dedicatedInfoNAS					DedicatedInfoNAS,

+		dedicatedInfoCDMA2000-1XRTT			DedicatedInfoCDMA2000,

+		dedicatedInfoCDMA2000-HRPD			DedicatedInfoCDMA2000

+	},

+	nonCriticalExtension				SEQUENCE {}							OPTIONAL

+}

+

+

+SystemInformationBlockType2 ::=		SEQUENCE {

+	ac-BarringInfo						SEQUENCE {

+		ac-BarringForEmergency				BOOLEAN,

+		ac-BarringForMO-Signalling			AC-BarringConfig				OPTIONAL,	-- Need OP

+		ac-BarringForMO-Data				AC-BarringConfig				OPTIONAL	-- Need OP

+	}																		OPTIONAL,	-- Need OP

+	radioResourceConfigCommon			RadioResourceConfigCommonSIB,

+	ue-TimersAndConstants				UE-TimersAndConstants,

+	freqInfo							SEQUENCE {

+		ul-CarrierFreq						ARFCN-ValueEUTRA				OPTIONAL,	-- Need OP

+		ul-Bandwidth						ENUMERATED {n6, n15, n25, n50, n75, n100}

+																			OPTIONAL,	-- Need OP

+		additionalSpectrumEmission			AdditionalSpectrumEmission

+	},

+	mbsfn-SubframeConfigList			MBSFN-SubframeConfigList			OPTIONAL, 	-- Need OR

+	timeAlignmentTimerCommon			TimeAlignmentTimer,

+	...,

+	lateR8NonCriticalExtension		OCTET STRING						OPTIONAL,	-- Need OP

+	[[	ssac-BarringForMMTEL-Voice-r9		AC-BarringConfig				OPTIONAL,	-- Need OP

+		ssac-BarringForMMTEL-Video-r9		AC-BarringConfig				OPTIONAL	-- Need OP

+	]]

+}

+

+AC-BarringConfig ::=				SEQUENCE {

+	ac-BarringFactor					ENUMERATED {

+											p00, p05, p10, p15, p20, p25, p30, p40,

+											p50, p60, p70, p75, p80, p85, p90, p95},

+	ac-BarringTime						ENUMERATED {s4, s8, s16, s32, s64, s128, s256, s512},

+	ac-BarringForSpecialAC				BIT STRING (SIZE(5))

+}

+

+MBSFN-SubframeConfigList ::= 		SEQUENCE (SIZE (1..maxMBSFN-Allocations)) OF MBSFN-SubframeConfig

+

+

+SystemInformationBlockType3 ::=		SEQUENCE {

+	cellReselectionInfoCommon			SEQUENCE {

+		q-Hyst								ENUMERATED {

+												dB0, dB1, dB2, dB3, dB4, dB5, dB6, dB8, dB10,

+												dB12, dB14, dB16, dB18, dB20, dB22, dB24},

+		speedStateReselectionPars			SEQUENCE {

+			mobilityStateParameters				MobilityStateParameters,

+			q-HystSF						SEQUENCE {

+				sf-Medium						ENUMERATED {

+														dB-6, dB-4, dB-2, dB0},

+				sf-High							ENUMERATED {

+														dB-6, dB-4, dB-2, dB0}

+			}

+		}																OPTIONAL		-- Need OP

+	},

+	cellReselectionServingFreqInfo		SEQUENCE {

+		s-NonIntraSearch					ReselectionThreshold		OPTIONAL,		-- Need OP

+		threshServingLow					ReselectionThreshold,

+		cellReselectionPriority				CellReselectionPriority

+	},

+	intraFreqCellReselectionInfo		SEQUENCE {

+		q-RxLevMin							Q-RxLevMin,

+		p-Max								P-Max						OPTIONAL,		-- Need OP

+		s-IntraSearch						ReselectionThreshold		OPTIONAL,		-- Need OP

+		allowedMeasBandwidth				AllowedMeasBandwidth		OPTIONAL,		-- Need OP

+		presenceAntennaPort1				PresenceAntennaPort1,

+		neighCellConfig						NeighCellConfig,

+		t-ReselectionEUTRA					T-Reselection,

+		t-ReselectionEUTRA-SF				SpeedStateScaleFactors		OPTIONAL		-- Need OP

+	},

+	...,

+	lateR8NonCriticalExtension				OCTET STRING			OPTIONAL,	-- Need OP

+	[[	s-IntraSearch-v920					SEQUENCE {

+			s-IntraSearchP-r9					ReselectionThreshold,

+			s-IntraSearchQ-r9					ReselectionThresholdQ-r9

+		}																OPTIONAL,		-- Need OP

+		s-NonIntraSearch-v920				SEQUENCE {

+			s-NonIntraSearchP-r9				ReselectionThreshold,

+			s-NonIntraSearchQ-r9				ReselectionThresholdQ-r9

+		}																OPTIONAL,		-- Need OP

+		q-QualMin-r9						Q-QualMin-r9				OPTIONAL,		-- Need OP

+		threshServingLowQ-r9				ReselectionThresholdQ-r9	OPTIONAL		-- Need OP

+	]]

+}

+

+

+SystemInformationBlockType4 ::=		SEQUENCE {

+	intraFreqNeighCellList				IntraFreqNeighCellList		OPTIONAL,	-- Need OR

+	intraFreqBlackCellList				IntraFreqBlackCellList				OPTIONAL,	-- Need OR

+	csg-PhysCellIdRange					PhysCellIdRange				OPTIONAL,	-- Cond CSG

+	...

+}

+

+IntraFreqNeighCellList ::=		SEQUENCE (SIZE (1..maxCellIntra)) OF IntraFreqNeighCellInfo

+

+IntraFreqNeighCellInfo ::=		SEQUENCE {

+	physCellId								PhysCellId,

+	q-OffsetCell							Q-OffsetRange,

+	...

+}

+

+IntraFreqBlackCellList ::=		SEQUENCE (SIZE (1..maxCellBlack)) OF PhysCellIdRange

+

+

+SystemInformationBlockType5 ::=		SEQUENCE {

+	interFreqCarrierFreqList			InterFreqCarrierFreqList,

+	...,

+	lateR8NonCriticalExtension				OCTET STRING				OPTIONAL	-- Need OP

+}

+

+InterFreqCarrierFreqList ::=		SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo

+

+InterFreqCarrierFreqInfo ::=	SEQUENCE {

+	dl-CarrierFreq						ARFCN-ValueEUTRA,

+	q-RxLevMin							Q-RxLevMin,

+	p-Max								P-Max							OPTIONAL,		-- Need OP

+	t-ReselectionEUTRA					T-Reselection,

+	t-ReselectionEUTRA-SF				SpeedStateScaleFactors			OPTIONAL,		-- Need OP

+	threshX-High						ReselectionThreshold,

+	threshX-Low							ReselectionThreshold,

+	allowedMeasBandwidth				AllowedMeasBandwidth,

+	presenceAntennaPort1				PresenceAntennaPort1,

+	cellReselectionPriority				CellReselectionPriority			OPTIONAL,		-- Need OP

+	neighCellConfig						NeighCellConfig,

+	q-OffsetFreq						Q-OffsetRange					DEFAULT dB0,

+	interFreqNeighCellList				InterFreqNeighCellList			OPTIONAL, 		-- Need OR

+	interFreqBlackCellList				InterFreqBlackCellList			OPTIONAL, 		-- Need OR

+	...,

+	[[	q-QualMin-r9					Q-QualMin-r9					OPTIONAL,		-- Need OP

+		threshX-Q-r9					SEQUENCE {

+			threshX-HighQ-r9				ReselectionThresholdQ-r9,

+			threshX-LowQ-r9					ReselectionThresholdQ-r9

+		}																OPTIONAL		-- Cond RSRQ

+	]]

+}

+

+InterFreqNeighCellList ::=			SEQUENCE (SIZE (1..maxCellInter)) OF InterFreqNeighCellInfo

+

+InterFreqNeighCellInfo ::=			SEQUENCE {

+	physCellId							PhysCellId,

+	q-OffsetCell						Q-OffsetRange

+}

+

+InterFreqBlackCellList ::=			SEQUENCE (SIZE (1..maxCellBlack)) OF PhysCellIdRange

+

+

+SystemInformationBlockType6 ::=		SEQUENCE {

+	carrierFreqListUTRA-FDD				CarrierFreqListUTRA-FDD			OPTIONAL, 		-- Need OR

+	carrierFreqListUTRA-TDD				CarrierFreqListUTRA-TDD			OPTIONAL, 		-- Need OR

+	t-ReselectionUTRA					T-Reselection,

+	t-ReselectionUTRA-SF				SpeedStateScaleFactors			OPTIONAL,		-- Need OP

+	...,

+	lateR8NonCriticalExtension			OCTET STRING					OPTIONAL	-- Need OP

+}

+

+CarrierFreqListUTRA-FDD ::=		SEQUENCE (SIZE (1..maxUTRA-FDD-Carrier)) OF CarrierFreqUTRA-FDD 

+

+CarrierFreqUTRA-FDD ::=				SEQUENCE {

+	carrierFreq							ARFCN-ValueUTRA,

+	cellReselectionPriority				CellReselectionPriority			OPTIONAL, 		-- Need OP

+	threshX-High						ReselectionThreshold,

+	threshX-Low							ReselectionThreshold,

+	q-RxLevMin							INTEGER (-60..-13),

+	p-MaxUTRA							INTEGER (-50..33),

+	q-QualMin							INTEGER (-24..0),

+	...,

+	[[	threshX-Q-r9					SEQUENCE {

+			threshX-HighQ-r9				ReselectionThresholdQ-r9,

+			threshX-LowQ-r9					ReselectionThresholdQ-r9

+		}																OPTIONAL		-- Cond RSRQ

+	]]

+}

+

+CarrierFreqListUTRA-TDD ::=		SEQUENCE (SIZE (1..maxUTRA-TDD-Carrier)) OF CarrierFreqUTRA-TDD 

+

+CarrierFreqUTRA-TDD ::=				SEQUENCE {

+	carrierFreq							ARFCN-ValueUTRA,

+	cellReselectionPriority				CellReselectionPriority			OPTIONAL, 		-- Need OP

+	threshX-High						ReselectionThreshold,

+	threshX-Low							ReselectionThreshold,

+	q-RxLevMin							INTEGER (-60..-13),

+	p-MaxUTRA							INTEGER (-50..33),

+	...

+}

+

+

+SystemInformationBlockType7 ::=		SEQUENCE {

+	t-ReselectionGERAN					T-Reselection,

+	t-ReselectionGERAN-SF				SpeedStateScaleFactors				OPTIONAL,	-- Need OR

+	carrierFreqsInfoList				CarrierFreqsInfoListGERAN			OPTIONAL,	-- Need OR

+	...

+}

+

+CarrierFreqsInfoListGERAN ::=			SEQUENCE (SIZE (1..maxGNFG)) OF CarrierFreqsInfoGERAN

+

+CarrierFreqsInfoGERAN ::=			SEQUENCE {

+	carrierFreqs						CarrierFreqsGERAN,

+	commonInfo							SEQUENCE {

+		cellReselectionPriority				CellReselectionPriority			OPTIONAL,	-- Need OP

+		ncc-Permitted						BIT STRING (SIZE (8)),

+		q-RxLevMin							INTEGER (0..45),

+		p-MaxGERAN							INTEGER (0..39)					OPTIONAL,	-- Need OP

+		threshX-High						ReselectionThreshold,

+		threshX-Low							ReselectionThreshold

+	},

+	...

+}

+

+

+SystemInformationBlockType8 ::=		SEQUENCE {

+	systemTimeInfo						SystemTimeInfoCDMA2000				OPTIONAL,	-- Need OR

+	searchWindowSize					INTEGER (0..15)						OPTIONAL,	-- Need OR

+	parametersHRPD						SEQUENCE {

+		preRegistrationInfoHRPD				PreRegistrationInfoHRPD,

+		cellReselectionParametersHRPD		CellReselectionParametersCDMA2000	OPTIONAL -- Need OR

+	}																		OPTIONAL,	-- Need OR

+	parameters1XRTT						SEQUENCE {

+		csfb-RegistrationParam1XRTT			CSFB-RegistrationParam1XRTT		OPTIONAL,	-- Need OP

+		longCodeState1XRTT					BIT STRING (SIZE (42))			OPTIONAL,	-- Need OR

+		cellReselectionParameters1XRTT		CellReselectionParametersCDMA2000	OPTIONAL -- Need OR

+	}																		OPTIONAL,	-- Need OR

+	...,

+	lateR8NonCriticalExtension			OCTET STRING						OPTIONAL,	-- Need OP

+	[[	csfb-SupportForDualRxUEs-r9			BOOLEAN							OPTIONAL,	-- Need OR

+		cellReselectionParametersHRPD-v920	CellReselectionParametersCDMA2000-v920	OPTIONAL,	-- Cond NCL-HRPD

+		cellReselectionParameters1XRTT-v920	CellReselectionParametersCDMA2000-v920	OPTIONAL,	-- Cond NCL-1XRTT

+		csfb-RegistrationParam1XRTT-v920	CSFB-RegistrationParam1XRTT-v920 		OPTIONAL,	-- Cond REG-1XRTT

+		ac-BarringConfig1XRTT-r9			AC-BarringConfig1XRTT-r9		OPTIONAL 	-- Cond REG-1XRTT

+	]]

+}

+

+CellReselectionParametersCDMA2000 ::= SEQUENCE {

+	bandClassList						BandClassListCDMA2000,

+	neighCellList						NeighCellListCDMA2000,

+	t-ReselectionCDMA2000      			T-Reselection,

+	t-ReselectionCDMA2000-SF			SpeedStateScaleFactors				OPTIONAL	-- Need OP

+}

+

+CellReselectionParametersCDMA2000-v920 ::= SEQUENCE {

+	neighCellList-v920						NeighCellListCDMA2000-v920

+}

+

+NeighCellListCDMA2000 ::=			SEQUENCE (SIZE (1..16)) OF NeighCellCDMA2000

+

+NeighCellCDMA2000 ::=	SEQUENCE {

+	bandClass							BandclassCDMA2000,

+	neighCellsPerFreqList				NeighCellsPerBandclassListCDMA2000

+}

+

+NeighCellsPerBandclassListCDMA2000 ::= SEQUENCE (SIZE (1..16)) OF NeighCellsPerBandclassCDMA2000

+

+NeighCellsPerBandclassCDMA2000 ::=	SEQUENCE {

+	arfcn								ARFCN-ValueCDMA2000,

+	physCellIdList						PhysCellIdListCDMA2000

+}

+

+NeighCellListCDMA2000-v920 ::=		SEQUENCE (SIZE (1..16)) OF NeighCellCDMA2000-v920

+

+NeighCellCDMA2000-v920 ::=			SEQUENCE {

+	neighCellsPerFreqList-v920			NeighCellsPerBandclassListCDMA2000-v920

+}

+

+NeighCellsPerBandclassListCDMA2000-v920 ::= SEQUENCE (SIZE (1..16)) OF NeighCellsPerBandclassCDMA2000-v920

+

+NeighCellsPerBandclassCDMA2000-v920 ::=	SEQUENCE {

+	physCellIdList-v920					PhysCellIdListCDMA2000-v920

+}

+

+PhysCellIdListCDMA2000 ::=			SEQUENCE (SIZE (1..16)) OF PhysCellIdCDMA2000

+

+PhysCellIdListCDMA2000-v920 ::=		SEQUENCE (SIZE (0..24)) OF PhysCellIdCDMA2000

+

+BandClassListCDMA2000 ::=			SEQUENCE (SIZE (1..maxCDMA-BandClass)) OF BandClassInfoCDMA2000

+

+BandClassInfoCDMA2000 ::=	SEQUENCE {

+	bandClass							BandclassCDMA2000,

+	cellReselectionPriority				CellReselectionPriority				OPTIONAL,	-- Need OP

+	threshX-High						INTEGER (0..63),

+	threshX-Low							INTEGER (0..63),

+	...

+}

+

+AC-BarringConfig1XRTT-r9 ::=		SEQUENCE {

+	ac-Barring0to9-r9					INTEGER (0..63),

+	ac-Barring10-r9						INTEGER (0..7),

+	ac-Barring11-r9						INTEGER (0..7),

+	ac-Barring12-r9						INTEGER (0..7),

+	ac-Barring13-r9						INTEGER (0..7),

+	ac-Barring14-r9						INTEGER (0..7),

+	ac-Barring15-r9						INTEGER (0..7),

+	ac-BarringMsg-r9					INTEGER (0..7),

+	ac-BarringReg-r9					INTEGER (0..7),

+	ac-BarringEmg-r9					INTEGER (0..7)

+}

+

+

+SystemInformationBlockType9 ::=		SEQUENCE {

+	hnb-Name							OCTET STRING (SIZE(1..48))		OPTIONAL,	-- Need OR

+	...

+}

+

+

+SystemInformationBlockType10 ::=	SEQUENCE {

+	messageIdentifier					BIT STRING (SIZE (16)),

+	serialNumber						BIT STRING (SIZE (16)),

+	warningType							OCTET STRING (SIZE (2)),

+	warningSecurityInfo					OCTET STRING (SIZE (50))		OPTIONAL,		-- Need OP

+	...

+}

+

+

+SystemInformationBlockType11 ::=	SEQUENCE {

+	messageIdentifier					BIT STRING (SIZE (16)),

+	serialNumber						BIT STRING (SIZE (16)),

+	warningMessageSegmentType			ENUMERATED {notLastSegment, lastSegment},

+	warningMessageSegmentNumber			INTEGER (0..63),

+	warningMessageSegment				OCTET STRING,

+	dataCodingScheme					OCTET STRING (SIZE (1)) 		OPTIONAL, 	-- Cond Segment1

+	...

+}

+

+

+SystemInformationBlockType12-r9 ::=	SEQUENCE {

+	messageIdentifier-r9				BIT STRING (SIZE (16)),

+	serialNumber-r9						BIT STRING (SIZE (16)),

+	warningMessageSegmentType-r9		ENUMERATED {notLastSegment, lastSegment},

+	warningMessageSegmentNumber-r9		INTEGER (0..63),

+	warningMessageSegment-r9			OCTET STRING,

+	dataCodingScheme-r9					OCTET STRING (SIZE (1)) 		OPTIONAL, 	-- Cond Segment1

+	lateR9NonCriticalExtension			OCTET STRING					OPTIONAL,	-- Need OP

+	...

+}

+

+

+SystemInformationBlockType13-r9 ::=	SEQUENCE {

+	mbsfn-AreaInfoList-r9				MBSFN-AreaInfoList-r9,

+	notificationConfig-r9				MBMS-NotificationConfig-r9,

+	lateR9NonCriticalExtension			OCTET STRING					OPTIONAL,	-- Need OP

+	...

+}

+

+

+AntennaInfoCommon ::=				SEQUENCE {

+	antennaPortsCount					ENUMERATED {an1, an2, an4, spare1}

+}

+

+AntennaInfoDedicated ::=			SEQUENCE {

+	transmissionMode					ENUMERATED {

+											tm1, tm2, tm3, tm4, tm5, tm6,

+											tm7, tm8-v920},

+	codebookSubsetRestriction			CHOICE {

+		n2TxAntenna-tm3						BIT STRING (SIZE (2)),

+		n4TxAntenna-tm3						BIT STRING (SIZE (4)),

+		n2TxAntenna-tm4						BIT STRING (SIZE (6)),

+		n4TxAntenna-tm4						BIT STRING (SIZE (64)),

+		n2TxAntenna-tm5						BIT STRING (SIZE (4)),

+		n4TxAntenna-tm5						BIT STRING (SIZE (16)),

+		n2TxAntenna-tm6						BIT STRING (SIZE (4)),

+		n4TxAntenna-tm6						BIT STRING (SIZE (16))

+	}		OPTIONAL, 															-- Cond TM

+	ue-TransmitAntennaSelection			CHOICE{

+		release							NULL,

+		setup							ENUMERATED {closedLoop, openLoop}

+	}

+}

+

+AntennaInfoDedicated-v920 ::=		SEQUENCE {

+	codebookSubsetRestriction-v920		CHOICE {

+		n2TxAntenna-tm8-r9					BIT STRING (SIZE (6)),

+		n4TxAntenna-tm8-r9					BIT STRING (SIZE (32))

+	}		OPTIONAL 															-- Cond TM8

+}

+

+

+CQI-ReportConfig ::=				SEQUENCE {

+	cqi-ReportModeAperiodic			ENUMERATED {

+											rm12, rm20, rm22, rm30, rm31,

+											spare3, spare2, spare1} OPTIONAL, 			-- Need OR

+	nomPDSCH-RS-EPRE-Offset				INTEGER (-1..6),

+	cqi-ReportPeriodic				CQI-ReportPeriodic	OPTIONAL 				-- Need ON

+}

+

+CQI-ReportConfig-v920 ::=		SEQUENCE {

+	cqi-Mask-r9						ENUMERATED {setup}		OPTIONAL,		-- Cond cqi-Setup

+	pmi-RI-Report-r9				ENUMERATED {setup}		OPTIONAL		-- Cond PMIRI

+}

+

+CQI-ReportPeriodic ::=		CHOICE {

+	release							NULL,

+	setup							SEQUENCE {

+		cqi-PUCCH-ResourceIndex				INTEGER (0.. 1185),

+		cqi-pmi-ConfigIndex					INTEGER (0..1023),

+		cqi-FormatIndicatorPeriodic			CHOICE {

+			widebandCQI							NULL,

+			subbandCQI							SEQUENCE {

+				k									INTEGER (1..4)

+			}

+		},

+		ri-ConfigIndex						INTEGER (0..1023) 	OPTIONAL, 				-- Need OR

+		simultaneousAckNackAndCQI			BOOLEAN

+	}

+}

+

+

+DRB-Identity ::=					INTEGER (1..32)

+

+

+LogicalChannelConfig ::=			SEQUENCE {

+	ul-SpecificParameters				SEQUENCE {

+		priority							INTEGER (1..16),

+		prioritisedBitRate					ENUMERATED {

+												kBps0, kBps8, kBps16, kBps32, kBps64, kBps128,

+												kBps256, infinity, spare8, spare7, spare6,

+												spare5, spare4, spare3, spare2, spare1},

+		bucketSizeDuration					ENUMERATED {

+												ms50, ms100, ms150, ms300, ms500, ms1000, spare2,

+												spare1},

+		logicalChannelGroup					INTEGER (0..3)			OPTIONAL			-- Need OR

+	}		OPTIONAL,																	-- Cond UL

+	...,

+	[[	logicalChannelSR-Mask-r9			ENUMERATED {setup}		OPTIONAL		-- Cond SRmask

+	]]

+}

+

+

+MAC-MainConfig ::=					SEQUENCE {

+	ul-SCH-Config						SEQUENCE {

+		maxHARQ-Tx							ENUMERATED {

+												n1, n2, n3, n4, n5, n6, n7, n8,

+												n10, n12, n16, n20, n24, n28,

+												spare2, spare1}		OPTIONAL,	-- Need ON

+		periodicBSR-Timer					ENUMERATED {

+												sf5, sf10, sf16, sf20, sf32, sf40, sf64, sf80,

+												sf128, sf160, sf320, sf640, sf1280, sf2560,

+												infinity, spare1}	OPTIONAL,	-- Need ON

+		retxBSR-Timer						ENUMERATED {

+												sf320, sf640, sf1280, sf2560, sf5120,

+												sf10240, spare2, spare1},

+		ttiBundling							BOOLEAN

+	}																OPTIONAL, 	-- Need ON

+	drx-Config							DRX-Config					OPTIONAL,	-- Need ON

+	timeAlignmentTimerDedicated			TimeAlignmentTimer,

+	phr-Config							CHOICE {

+		release								NULL,

+		setup								SEQUENCE {

+			periodicPHR-Timer					ENUMERATED {sf10, sf20, sf50, sf100, sf200,

+															sf500, sf1000, infinity},

+			prohibitPHR-Timer					ENUMERATED {sf0, sf10, sf20, sf50, sf100,

+																sf200, sf500, sf1000},

+			dl-PathlossChange					ENUMERATED {dB1, dB3, dB6, infinity}

+		}

+	}																OPTIONAL,	-- Need ON

+	...,

+	[[	sr-ProhibitTimer-r9					INTEGER (0..7)			OPTIONAL	-- Need ON

+	]]

+}

+

+DRX-Config ::=						CHOICE {

+	release								NULL,

+	setup								SEQUENCE {

+		onDurationTimer						ENUMERATED {

+												psf1, psf2, psf3, psf4, psf5, psf6,

+												psf8, psf10, psf20, psf30, psf40,

+												psf50, psf60, psf80, psf100,

+												psf200},

+		drx-InactivityTimer					ENUMERATED {

+												psf1, psf2, psf3, psf4, psf5, psf6,

+												psf8, psf10, psf20, psf30, psf40,

+												psf50, psf60, psf80, psf100,

+												psf200, psf300, psf500, psf750,

+												psf1280, psf1920, psf2560, spare10,

+												spare9, spare8, spare7, spare6,

+												spare5, spare4, spare3, spare2,

+												spare1},

+		drx-RetransmissionTimer				ENUMERATED {

+												psf1, psf2, psf4, psf6, psf8, psf16,

+												psf24, psf33},

+		longDRX-CycleStartOffset		CHOICE {

+			sf10							INTEGER(0..9),

+			sf20							INTEGER(0..19),

+			sf32							INTEGER(0..31),

+			sf40							INTEGER(0..39),

+			sf64							INTEGER(0..63),

+			sf80							INTEGER(0..79),

+			sf128							INTEGER(0..127),

+			sf160							INTEGER(0..159),

+			sf256							INTEGER(0..255),

+			sf320							INTEGER(0..319),

+			sf512							INTEGER(0..511),

+			sf640							INTEGER(0..639),

+			sf1024							INTEGER(0..1023),

+			sf1280							INTEGER(0..1279),

+			sf2048							INTEGER(0..2047),

+			sf2560							INTEGER(0..2559)

+		},

+		shortDRX							SEQUENCE {

+			shortDRX-Cycle						ENUMERATED	{

+													sf2, sf5, sf8, sf10, sf16, sf20,

+													sf32, sf40, sf64, sf80, sf128, sf160,

+													sf256, sf320, sf512, sf640},

+			drxShortCycleTimer					INTEGER (1..16)

+		}		OPTIONAL													-- Need OR

+	}

+}

+

+

+PDCP-Config ::=						SEQUENCE {

+	discardTimer						ENUMERATED {

+											ms50, ms100, ms150, ms300, ms500,

+											ms750, ms1500, infinity

+	}															OPTIONAL,			-- Cond Setup

+	rlc-AM								SEQUENCE {

+		statusReportRequired				BOOLEAN

+	}															OPTIONAL,			-- Cond Rlc-AM

+	rlc-UM								SEQUENCE {

+		pdcp-SN-Size						ENUMERATED {len7bits, len12bits}

+	}															OPTIONAL,			-- Cond Rlc-UM

+	headerCompression					CHOICE {

+		notUsed								NULL,

+		rohc								SEQUENCE {

+			maxCID								INTEGER (1..16383)				DEFAULT 15,

+			profiles							SEQUENCE {

+				profile0x0001						BOOLEAN,

+				profile0x0002						BOOLEAN,

+				profile0x0003						BOOLEAN,

+				profile0x0004						BOOLEAN,

+				profile0x0006						BOOLEAN,

+				profile0x0101						BOOLEAN,

+				profile0x0102						BOOLEAN,

+				profile0x0103						BOOLEAN,

+				profile0x0104						BOOLEAN

+			},

+			...

+		}

+	},

+	...

+}

+

+

+PDSCH-ConfigCommon ::=		SEQUENCE {

+	referenceSignalPower				INTEGER (-60..50),

+	p-b									INTEGER (0..3)

+}

+

+PDSCH-ConfigDedicated::=		SEQUENCE {

+	p-a									ENUMERATED {

+											dB-6, dB-4dot77, dB-3, dB-1dot77,

+											dB0, dB1, dB2, dB3}

+}

+

+

+PHICH-Config ::=					SEQUENCE {

+	phich-Duration						ENUMERATED {normal, extended},

+	phich-Resource						ENUMERATED {oneSixth, half, one, two}

+}

+

+

+PhysicalConfigDedicated ::=		SEQUENCE {

+	pdsch-ConfigDedicated				PDSCH-ConfigDedicated			OPTIONAL,		-- Need ON

+	pucch-ConfigDedicated				PUCCH-ConfigDedicated			OPTIONAL,		-- Need ON

+	pusch-ConfigDedicated				PUSCH-ConfigDedicated			OPTIONAL,		-- Need ON

+	uplinkPowerControlDedicated		UplinkPowerControlDedicated		OPTIONAL,		-- Need ON

+	tpc-PDCCH-ConfigPUCCH				TPC-PDCCH-Config 				OPTIONAL,		-- Need ON

+	tpc-PDCCH-ConfigPUSCH				TPC-PDCCH-Config 				OPTIONAL,		-- Need ON

+	cqi-ReportConfig					CQI-ReportConfig				OPTIONAL,		-- Need ON

+	soundingRS-UL-ConfigDedicated		SoundingRS-UL-ConfigDedicated	OPTIONAL,		-- Need ON

+	antennaInfo							CHOICE {

+		explicitValue						AntennaInfoDedicated,

+		defaultValue						NULL

+	}		OPTIONAL,																	-- Need ON

+	schedulingRequestConfig			SchedulingRequestConfig		OPTIONAL, 			-- Need ON

+	...,

+	[[	cqi-ReportConfig-v920				CQI-ReportConfig-v920		OPTIONAL,		-- Need ON

+		antennaInfo-v920					AntennaInfoDedicated-v920	OPTIONAL		-- Need ON

+	]]

+}

+

+

+P-Max ::=				INTEGER (-30..33)

+

+

+PRACH-ConfigSIB ::=				SEQUENCE {

+	rootSequenceIndex					INTEGER (0..837),

+	prach-ConfigInfo					PRACH-ConfigInfo

+}

+

+PRACH-Config ::=					SEQUENCE {

+	rootSequenceIndex					INTEGER (0..837),

+	prach-ConfigInfo					PRACH-ConfigInfo					OPTIONAL	-- Need ON

+}

+

+PRACH-ConfigInfo ::=				SEQUENCE {

+	prach-ConfigIndex					INTEGER (0..63),

+	highSpeedFlag						BOOLEAN,

+	zeroCorrelationZoneConfig			INTEGER (0..15),

+	prach-FreqOffset					INTEGER (0..94)

+}

+

+

+PresenceAntennaPort1 ::=				BOOLEAN

+

+

+PUCCH-ConfigCommon ::=				SEQUENCE {

+	deltaPUCCH-Shift					ENUMERATED {ds1, ds2, ds3},

+	nRB-CQI								INTEGER (0..98),

+	nCS-AN								INTEGER (0..7),

+	n1PUCCH-AN							INTEGER (0..2047)

+}

+

+PUCCH-ConfigDedicated ::=			SEQUENCE {

+	ackNackRepetition					CHOICE{

+		release								NULL,

+		setup								SEQUENCE {

+			repetitionFactor					ENUMERATED {n2, n4, n6, spare1},

+			n1PUCCH-AN-Rep						INTEGER (0..2047)

+		}

+	},

+	tdd-AckNackFeedbackMode				ENUMERATED {bundling, multiplexing}	OPTIONAL	-- Cond TDD

+}

+

+

+PUSCH-ConfigCommon ::=				SEQUENCE {

+	pusch-ConfigBasic					SEQUENCE {

+		n-SB								INTEGER (1..4),

+		hoppingMode							ENUMERATED {interSubFrame, intraAndInterSubFrame},

+		pusch-HoppingOffset					INTEGER (0..98),

+		enable64QAM							BOOLEAN

+	},

+	ul-ReferenceSignalsPUSCH			UL-ReferenceSignalsPUSCH

+}

+

+PUSCH-ConfigDedicated ::=			SEQUENCE {

+	betaOffset-ACK-Index					INTEGER (0..15),

+	betaOffset-RI-Index					INTEGER (0..15),

+	betaOffset-CQI-Index					INTEGER (0..15)

+}

+

+UL-ReferenceSignalsPUSCH ::=		SEQUENCE {

+	groupHoppingEnabled					BOOLEAN,

+	groupAssignmentPUSCH				INTEGER (0..29),

+	sequenceHoppingEnabled				BOOLEAN,

+	cyclicShift							INTEGER (0..7)

+}

+

+

+RACH-ConfigCommon ::=		SEQUENCE {

+	preambleInfo						SEQUENCE {

+		numberOfRA-Preambles				ENUMERATED {

+												n4, n8, n12, n16 ,n20, n24, n28,

+												n32, n36, n40, n44, n48, n52, n56,

+												n60, n64},

+		preamblesGroupAConfig				SEQUENCE {

+			sizeOfRA-PreamblesGroupA			ENUMERATED {

+													n4, n8, n12, n16 ,n20, n24, n28,

+													n32, n36, n40, n44, n48, n52, n56,

+													n60},

+			messageSizeGroupA					ENUMERATED {b56, b144, b208, b256},

+			messagePowerOffsetGroupB			ENUMERATED {

+													minusinfinity, dB0, dB5, dB8, dB10, dB12,

+													dB15, dB18},

+			...

+		}			OPTIONAL													-- Need OP

+	},

+	powerRampingParameters				SEQUENCE {

+		powerRampingStep					ENUMERATED {dB0, dB2,dB4, dB6},

+		preambleInitialReceivedTargetPower	ENUMERATED {

+												dBm-120, dBm-118, dBm-116, dBm-114, dBm-112,

+												dBm-110, dBm-108, dBm-106, dBm-104, dBm-102,

+												dBm-100, dBm-98, dBm-96, dBm-94,

+												dBm-92, dBm-90}

+	},

+	ra-SupervisionInfo					SEQUENCE {

+		preambleTransMax					ENUMERATED {

+												n3, n4, n5, n6, n7,	n8, n10, n20, n50,

+												n100, n200},

+		ra-ResponseWindowSize				ENUMERATED {

+												sf2, sf3, sf4, sf5, sf6, sf7,

+												sf8, sf10},

+		mac-ContentionResolutionTimer		ENUMERATED {

+												sf8, sf16, sf24, sf32, sf40, sf48,

+												sf56, sf64}

+	},

+	maxHARQ-Msg3Tx						INTEGER (1..8),

+	...

+}

+

+

+RACH-ConfigDedicated ::=		SEQUENCE {

+	ra-PreambleIndex					INTEGER (0..63),

+	ra-PRACH-MaskIndex					INTEGER (0..15)

+}

+

+

+RadioResourceConfigCommonSIB ::=	SEQUENCE {

+	rach-ConfigCommon					RACH-ConfigCommon,

+	bcch-Config 						BCCH-Config,

+	pcch-Config 						PCCH-Config,

+	prach-Config						PRACH-ConfigSIB,

+	pdsch-ConfigCommon					PDSCH-ConfigCommon,

+	pusch-ConfigCommon					PUSCH-ConfigCommon,

+	pucch-ConfigCommon					PUCCH-ConfigCommon,

+	soundingRS-UL-ConfigCommon			SoundingRS-UL-ConfigCommon,

+	uplinkPowerControlCommon			UplinkPowerControlCommon,

+	ul-CyclicPrefixLength				UL-CyclicPrefixLength,

+	...

+}

+

+RadioResourceConfigCommon ::=		SEQUENCE {

+	rach-ConfigCommon					RACH-ConfigCommon					OPTIONAL,	-- Need ON

+	prach-Config						PRACH-Config,

+	pdsch-ConfigCommon					PDSCH-ConfigCommon					OPTIONAL,	-- Need ON

+	pusch-ConfigCommon					PUSCH-ConfigCommon,

+	phich-Config						PHICH-Config						OPTIONAL,	-- Need ON

+	pucch-ConfigCommon					PUCCH-ConfigCommon					OPTIONAL,	-- Need ON

+	soundingRS-UL-ConfigCommon			SoundingRS-UL-ConfigCommon			OPTIONAL,	-- Need ON

+	uplinkPowerControlCommon			UplinkPowerControlCommon			OPTIONAL,	-- Need ON

+	antennaInfoCommon					AntennaInfoCommon			OPTIONAL,	-- Need ON

+	p-Max								P-Max								OPTIONAL,	-- Need OP

+	tdd-Config							TDD-Config							OPTIONAL,	-- Cond TDD

+	ul-CyclicPrefixLength				UL-CyclicPrefixLength,

+	...

+}

+

+BCCH-Config ::=						SEQUENCE {

+	modificationPeriodCoeff				ENUMERATED {n2, n4, n8, n16}

+}

+

+PCCH-Config ::=						SEQUENCE {

+	defaultPagingCycle					ENUMERATED {

+											rf32, rf64, rf128, rf256},

+	nB									ENUMERATED {

+											fourT, twoT, oneT, halfT, quarterT, oneEighthT,

+											oneSixteenthT, oneThirtySecondT}

+}

+

+UL-CyclicPrefixLength ::=			ENUMERATED {len1, len2}

+

+

+RadioResourceConfigDedicated ::=		SEQUENCE {

+	srb-ToAddModList					SRB-ToAddModList			OPTIONAL, 		-- Cond HO-Conn

+	drb-ToAddModList					DRB-ToAddModList			OPTIONAL, 		-- Cond HO-toEUTRA

+	drb-ToReleaseList					DRB-ToReleaseList			OPTIONAL, 		-- Need ON

+	mac-MainConfig						CHOICE {

+			explicitValue					MAC-MainConfig,

+			defaultValue					NULL

+	}		OPTIONAL,																-- Cond HO-toEUTRA2

+	sps-Config							SPS-Config 					OPTIONAL,		-- Need ON

+	physicalConfigDedicated				PhysicalConfigDedicated		OPTIONAL,		-- Need ON

+	...,

+	[[	rlf-TimersAndConstants-r9			RLF-TimersAndConstants-r9		OPTIONAL	-- Need ON

+	]]

+}

+

+SRB-ToAddModList ::=				SEQUENCE (SIZE (1..2)) OF SRB-ToAddMod

+

+SRB-ToAddMod ::=	SEQUENCE {

+	srb-Identity						INTEGER (1..2),

+	rlc-Config							CHOICE {

+		explicitValue						RLC-Config,

+		defaultValue						NULL

+	}		OPTIONAL,																-- Cond Setup

+	logicalChannelConfig				CHOICE {

+		explicitValue						LogicalChannelConfig,

+		defaultValue						NULL

+	}		OPTIONAL,																-- Cond Setup

+	...

+}

+

+DRB-ToAddModList ::=				SEQUENCE (SIZE (1..maxDRB)) OF DRB-ToAddMod

+

+DRB-ToAddMod ::=	SEQUENCE {

+	eps-BearerIdentity					INTEGER (0..15)			OPTIONAL,		-- Cond DRB-Setup

+	drb-Identity						DRB-Identity,

+	pdcp-Config							PDCP-Config				OPTIONAL,		-- Cond PDCP

+	rlc-Config							RLC-Config				OPTIONAL,		-- Cond Setup

+	logicalChannelIdentity				INTEGER (3..10)			OPTIONAL,		-- Cond DRB-Setup

+	logicalChannelConfig				LogicalChannelConfig	OPTIONAL,		-- Cond Setup

+	...

+}

+

+DRB-ToReleaseList ::=				SEQUENCE (SIZE (1..maxDRB)) OF DRB-Identity

+

+

+RLC-Config ::=				CHOICE {

+	am									SEQUENCE {

+		ul-AM-RLC							UL-AM-RLC,

+		dl-AM-RLC							DL-AM-RLC

+	},

+	um-Bi-Directional					SEQUENCE {

+		ul-UM-RLC							UL-UM-RLC,

+		dl-UM-RLC							DL-UM-RLC

+	},

+	um-Uni-Directional-UL				SEQUENCE {

+		ul-UM-RLC							UL-UM-RLC

+	},

+	um-Uni-Directional-DL				SEQUENCE {

+		dl-UM-RLC							DL-UM-RLC

+	},

+	...

+}

+

+UL-AM-RLC ::=						SEQUENCE {

+	t-PollRetransmit					T-PollRetransmit,

+	pollPDU								PollPDU,

+	pollByte							PollByte,

+	maxRetxThreshold					ENUMERATED {

+											t1, t2, t3, t4, t6, t8, t16, t32}

+}

+

+DL-AM-RLC ::=						SEQUENCE {

+	t-Reordering						T-Reordering,

+	t-StatusProhibit					T-StatusProhibit

+}

+

+UL-UM-RLC ::=						SEQUENCE {

+	sn-FieldLength						SN-FieldLength

+}

+

+DL-UM-RLC ::=						SEQUENCE {

+	sn-FieldLength						SN-FieldLength,

+	t-Reordering						T-Reordering

+}

+

+SN-FieldLength ::=					ENUMERATED {size5, size10}

+

+T-PollRetransmit ::=				ENUMERATED {

+										ms5, ms10, ms15, ms20, ms25, ms30, ms35,

+										ms40, ms45, ms50, ms55, ms60, ms65, ms70,

+										ms75, ms80, ms85, ms90, ms95, ms100, ms105,

+										ms110, ms115, ms120, ms125, ms130, ms135,

+										ms140, ms145, ms150, ms155, ms160, ms165,

+										ms170, ms175, ms180, ms185, ms190, ms195,

+										ms200, ms205, ms210, ms215, ms220, ms225,

+										ms230, ms235, ms240, ms245, ms250, ms300,

+										ms350, ms400, ms450, ms500, spare9, spare8,

+										spare7, spare6, spare5, spare4, spare3,

+										spare2, spare1}

+

+PollPDU ::=							ENUMERATED {

+										p4, p8, p16, p32, p64, p128, p256, pInfinity}

+

+PollByte ::=						ENUMERATED {

+										kB25, kB50, kB75, kB100, kB125, kB250, kB375,

+										kB500, kB750, kB1000, kB1250, kB1500, kB2000,

+										kB3000, kBinfinity, spare1}

+

+T-Reordering ::=					ENUMERATED {

+										ms0, ms5, ms10, ms15, ms20, ms25, ms30, ms35,

+										ms40, ms45, ms50, ms55, ms60, ms65, ms70,

+										ms75, ms80, ms85, ms90, ms95, ms100, ms110,

+										ms120, ms130, ms140, ms150, ms160, ms170,

+										ms180, ms190, ms200, spare1}

+

+T-StatusProhibit ::=				ENUMERATED {

+										ms0, ms5, ms10, ms15, ms20, ms25, ms30, ms35,

+										ms40, ms45, ms50, ms55, ms60, ms65, ms70,

+										ms75, ms80, ms85, ms90, ms95, ms100, ms105,

+										ms110, ms115, ms120, ms125, ms130, ms135,

+										ms140, ms145, ms150, ms155, ms160, ms165,

+										ms170, ms175, ms180, ms185, ms190, ms195,

+										ms200, ms205, ms210, ms215, ms220, ms225,

+										ms230, ms235, ms240, ms245, ms250, ms300,

+										ms350, ms400, ms450, ms500, spare8, spare7,

+										spare6, spare5, spare4, spare3, spare2,

+										spare1}

+

+

+RLF-TimersAndConstants-r9 ::=			CHOICE {

+	release									NULL,

+	setup									SEQUENCE {

+		t301-r9								ENUMERATED {

+												ms100, ms200, ms300, ms400, ms600, ms1000, ms1500,

+												ms2000},

+		t310-r9								ENUMERATED {

+												ms0, ms50, ms100, ms200, ms500, ms1000, ms2000},

+		n310-r9								ENUMERATED {

+												n1, n2, n3, n4, n6, n8, n10, n20},

+		t311-r9								ENUMERATED {

+												ms1000, ms3000, ms5000, ms10000, ms15000,

+												ms20000, ms30000},

+		n311-r9								ENUMERATED {

+												n1, n2, n3, n4, n5, n6, n8, n10},

+		...

+	}

+}

+

+

+SchedulingRequestConfig ::=		CHOICE {

+	release								NULL,

+	setup								SEQUENCE {

+		sr-PUCCH-ResourceIndex				INTEGER (0..2047),

+		sr-ConfigIndex						INTEGER (0..157),

+		dsr-TransMax						ENUMERATED {

+												n4, n8, n16, n32, n64, spare3, spare2, spare1}

+	}

+}

+

+

+SoundingRS-UL-ConfigCommon ::=		CHOICE {

+	release								NULL,

+	setup								SEQUENCE {

+		srs-BandwidthConfig					ENUMERATED {bw0, bw1, bw2, bw3, bw4, bw5, bw6, bw7},

+		srs-SubframeConfig					ENUMERATED {

+												sc0, sc1, sc2, sc3, sc4, sc5, sc6, sc7,

+												sc8, sc9, sc10, sc11, sc12, sc13, sc14, sc15},

+		ackNackSRS-SimultaneousTransmission	BOOLEAN,

+		srs-MaxUpPts						ENUMERATED {true}			OPTIONAL	-- Cond TDD

+	}

+}

+

+SoundingRS-UL-ConfigDedicated ::=	CHOICE{

+	release								NULL,

+	setup								SEQUENCE {

+		srs-Bandwidth						ENUMERATED {bw0, bw1, bw2, bw3},

+		srs-HoppingBandwidth				ENUMERATED {hbw0, hbw1, hbw2, hbw3},

+		freqDomainPosition					INTEGER (0..23),

+		duration							BOOLEAN,

+		srs-ConfigIndex						INTEGER (0..1023),

+		transmissionComb					INTEGER (0..1),

+		cyclicShift							ENUMERATED {cs0, cs1, cs2, cs3, cs4, cs5, cs6, cs7}

+	}

+}

+

+

+

+SPS-Config ::=	SEQUENCE {

+	semiPersistSchedC-RNTI			C-RNTI					OPTIONAL,			-- Need OR

+	sps-ConfigDL					SPS-ConfigDL			OPTIONAL,			-- Need ON

+	sps-ConfigUL					SPS-ConfigUL			OPTIONAL			-- Need ON

+}

+

+SPS-ConfigDL ::=	CHOICE{

+	release							NULL,

+	setup							SEQUENCE {

+		semiPersistSchedIntervalDL			ENUMERATED {

+												sf10, sf20, sf32, sf40, sf64, sf80,

+												sf128, sf160, sf320, sf640, spare6,

+												spare5, spare4, spare3, spare2,

+												spare1},

+		numberOfConfSPS-Processes			INTEGER (1..8),

+		n1-PUCCH-AN-PersistentList			N1-PUCCH-AN-PersistentList,

+		...

+	}

+}

+

+SPS-ConfigUL ::=	CHOICE {

+	release							NULL,

+	setup							SEQUENCE {

+		semiPersistSchedIntervalUL			ENUMERATED {

+												sf10, sf20, sf32, sf40, sf64, sf80,

+												sf128, sf160, sf320, sf640, spare6,

+												spare5, spare4, spare3, spare2,

+												spare1},

+		implicitReleaseAfter				ENUMERATED {e2, e3, e4, e8},

+		p0-Persistent						SEQUENCE {

+			p0-NominalPUSCH-Persistent			INTEGER (-126..24),

+			p0-UE-PUSCH-Persistent				INTEGER (-8..7)

+		}		OPTIONAL,												-- Need OP

+		twoIntervalsConfig					ENUMERATED {true}			OPTIONAL,	-- Cond TDD

+		...

+	}

+}

+

+N1-PUCCH-AN-PersistentList ::=		SEQUENCE (SIZE (1..4)) OF INTEGER (0..2047)

+

+

+TDD-Config ::=						SEQUENCE {

+	subframeAssignment					ENUMERATED {

+											sa0, sa1, sa2, sa3, sa4, sa5, sa6},

+	specialSubframePatterns				ENUMERATED {

+											ssp0, ssp1, ssp2, ssp3, ssp4,ssp5, ssp6, ssp7,

+											ssp8}

+}

+

+

+TimeAlignmentTimer ::=					ENUMERATED {

+												sf500, sf750, sf1280, sf1920, sf2560, sf5120,

+												sf10240, infinity}

+

+TPC-PDCCH-Config ::=					CHOICE {

+	release								NULL,

+	setup								SEQUENCE {

+		tpc-RNTI							BIT STRING (SIZE (16)),

+		tpc-Index							TPC-Index

+	}

+}

+

+TPC-Index ::=							CHOICE {

+	indexOfFormat3							INTEGER (1..15),

+	indexOfFormat3A							INTEGER (1..31)

+}

+

+

+UplinkPowerControlCommon ::=		SEQUENCE {

+	p0-NominalPUSCH						INTEGER (-126..24),

+	alpha								ENUMERATED {al0, al04, al05, al06, al07, al08, al09, al1},

+	p0-NominalPUCCH						INTEGER (-127..-96),

+	deltaFList-PUCCH					DeltaFList-PUCCH,

+	deltaPreambleMsg3					INTEGER (-1..6)

+}

+

+UplinkPowerControlDedicated ::=		SEQUENCE {

+	p0-UE-PUSCH							INTEGER (-8..7),

+	deltaMCS-Enabled					ENUMERATED {en0, en1},

+	accumulationEnabled					BOOLEAN,

+	p0-UE-PUCCH							INTEGER (-8..7),

+	pSRS-Offset							INTEGER (0..15),

+	filterCoefficient					FilterCoefficient					DEFAULT fc4

+}

+

+DeltaFList-PUCCH ::=				SEQUENCE {

+	deltaF-PUCCH-Format1				ENUMERATED {deltaF-2, deltaF0, deltaF2},

+	deltaF-PUCCH-Format1b				ENUMERATED {deltaF1, deltaF3, deltaF5},

+	deltaF-PUCCH-Format2				ENUMERATED {deltaF-2, deltaF0, deltaF1, deltaF2},

+	deltaF-PUCCH-Format2a				ENUMERATED {deltaF-2, deltaF0, deltaF2},

+	deltaF-PUCCH-Format2b				ENUMERATED {deltaF-2, deltaF0, deltaF2}

+}

+

+

+NextHopChainingCount ::=					INTEGER (0..7)

+

+

+SecurityAlgorithmConfig ::=			SEQUENCE {

+	cipheringAlgorithm					ENUMERATED {

+											eea0, eea1, eea2, spare5, spare4, spare3,

+											spare2, spare1, ...},

+	integrityProtAlgorithm				ENUMERATED {

+											eia0-v920, eia1, eia2, spare5, spare4, spare3,

+											spare2, spare1, ...}

+}

+

+

+ShortMAC-I ::=						BIT STRING (SIZE (16))

+

+

+AdditionalSpectrumEmission ::=		INTEGER (1..32)

+

+

+ARFCN-ValueCDMA2000 ::=			INTEGER (0..2047)

+

+

+ARFCN-ValueEUTRA ::=				INTEGER (0..maxEARFCN)

+

+

+ARFCN-ValueGERAN ::=			INTEGER (0..1023)

+

+

+ARFCN-ValueUTRA ::=					INTEGER (0..16383)

+

+

+BandclassCDMA2000 ::=					ENUMERATED {

+											bc0, bc1, bc2, bc3, bc4, bc5, bc6, bc7, bc8,

+											bc9, bc10, bc11, bc12, bc13, bc14, bc15, bc16,

+											bc17, spare14, spare13, spare12, spare11, spare10,

+											spare9, spare8, spare7, spare6, spare5, spare4,

+											spare3, spare2, spare1, ...}

+

+

+BandIndicatorGERAN ::=			ENUMERATED {dcs1800, pcs1900}

+

+

+CarrierFreqCDMA2000 ::=			SEQUENCE {

+	bandClass							BandclassCDMA2000,

+	arfcn							ARFCN-ValueCDMA2000

+}

+

+

+CarrierFreqGERAN ::=			SEQUENCE {

+	arfcn							ARFCN-ValueGERAN,

+	bandIndicator					BandIndicatorGERAN

+}

+

+

+CarrierFreqsGERAN ::=			SEQUENCE {

+	startingARFCN						ARFCN-ValueGERAN,

+	bandIndicator						BandIndicatorGERAN,

+	followingARFCNs						CHOICE {

+		explicitListOfARFCNs				ExplicitListOfARFCNs,

+		equallySpacedARFCNs					SEQUENCE {

+			arfcn-Spacing						INTEGER (1..8),

+			numberOfFollowingARFCNs				INTEGER (0..31)

+		},

+		variableBitMapOfARFCNs				OCTET STRING (SIZE (1..16))

+	}

+}

+

+ExplicitListOfARFCNs ::=			SEQUENCE (SIZE (0..31)) OF ARFCN-ValueGERAN

+

+

+CDMA2000-Type ::=					ENUMERATED {type1XRTT, typeHRPD}

+

+

+CellIdentity ::=					BIT STRING (SIZE (28))

+

+

+CellIndexList ::=						SEQUENCE (SIZE (1..maxCellMeas)) OF CellIndex

+

+CellIndex ::=							INTEGER (1..maxCellMeas)

+

+

+CellReselectionPriority ::=				INTEGER (0..7)

+

+

+CSFB-RegistrationParam1XRTT ::=		SEQUENCE {

+	sid									BIT STRING (SIZE (15)),

+	nid									BIT STRING (SIZE (16)),

+	multipleSID							BOOLEAN,

+	multipleNID							BOOLEAN,

+	homeReg								BOOLEAN,

+	foreignSIDReg						BOOLEAN,

+	foreignNIDReg						BOOLEAN,

+	parameterReg						BOOLEAN,

+	powerUpReg							BOOLEAN,

+	registrationPeriod					BIT STRING (SIZE (7)),

+	registrationZone					BIT STRING (SIZE (12)),

+	totalZone							BIT STRING (SIZE (3)),

+	zoneTimer							BIT STRING (SIZE (3))

+}

+

+CSFB-RegistrationParam1XRTT-v920 ::=	SEQUENCE {

+	powerDownReg-r9						ENUMERATED {true}

+}

+

+

+CellGlobalIdEUTRA ::=					SEQUENCE {

+	plmn-Identity							PLMN-Identity,

+	cellIdentity							CellIdentity

+}

+

+

+CellGlobalIdUTRA ::=					SEQUENCE {

+	plmn-Identity							PLMN-Identity,

+	cellIdentity							BIT STRING (SIZE (28))

+}

+

+

+CellGlobalIdGERAN ::=					SEQUENCE {

+	plmn-Identity							PLMN-Identity,

+	locationAreaCode						BIT STRING (SIZE (16)),

+	cellIdentity						BIT STRING (SIZE (16))

+}

+

+

+CellGlobalIdCDMA2000 ::=				CHOICE {

+	cellGlobalId1XRTT						BIT STRING (SIZE (47)),

+	cellGlobalIdHRPD						BIT STRING (SIZE (128))

+}

+

+

+CSG-Identity ::=					BIT STRING (SIZE (27))

+

+

+MobilityControlInfo ::=		SEQUENCE {

+	targetPhysCellId					PhysCellId,

+	carrierFreq							CarrierFreqEUTRA					OPTIONAL,	-- Cond HO-toEUTRA

+	carrierBandwidth					CarrierBandwidthEUTRA				OPTIONAL,	-- Cond HO-toEUTRA

+	additionalSpectrumEmission			AdditionalSpectrumEmission			OPTIONAL,	-- Cond HO-toEUTRA

+	t304								ENUMERATED {

+											ms50, ms100, ms150, ms200, ms500, ms1000,

+											ms2000, spare1},

+	newUE-Identity						C-RNTI,

+	radioResourceConfigCommon			RadioResourceConfigCommon,

+	rach-ConfigDedicated				RACH-ConfigDedicated				OPTIONAL,	-- Need OP

+	...

+}

+

+CarrierBandwidthEUTRA ::=			SEQUENCE {

+	dl-Bandwidth						ENUMERATED {

+												n6, n15, n25, n50, n75, n100, spare10,

+												spare9, spare8, spare7, spare6, spare5,

+												spare4, spare3, spare2, spare1},

+	ul-Bandwidth						ENUMERATED {

+												n6, n15, n25, n50, n75, n100, spare10,

+												spare9, spare8, spare7, spare6, spare5,

+												spare4, spare3, spare2, spare1}	OPTIONAL -- Need OP

+}

+

+CarrierFreqEUTRA ::=				SEQUENCE {

+	dl-CarrierFreq						ARFCN-ValueEUTRA,

+	ul-CarrierFreq						ARFCN-ValueEUTRA				OPTIONAL	-- Cond FDD

+}

+

+

+MobilityParametersCDMA2000 ::=			OCTET STRING

+

+

+MobilityStateParameters ::=			SEQUENCE {

+	t-Evaluation						ENUMERATED {

+											s30, s60, s120, s180, s240, spare3, spare2, spare1},

+	t-HystNormal						ENUMERATED {

+											s30, s60, s120, s180, s240, spare3, spare2, spare1},

+	n-CellChangeMedium					INTEGER (1..16),

+	n-CellChangeHigh					INTEGER (1..16)

+}

+

+

+PhysCellId ::=						INTEGER (0..503)

+

+

+PhysCellIdRange ::=				SEQUENCE {

+	start							PhysCellId,

+	range							ENUMERATED {

+										n4, n8, n12, n16, n24, n32, n48, n64, n84,

+										n96, n128, n168, n252, n504, spare2,

+										spare1} 					OPTIONAL	-- Need OP

+}

+

+

+PhysCellIdCDMA2000 ::=			INTEGER (0..maxPNOffset)

+

+

+PhysCellIdGERAN ::=				SEQUENCE {

+	networkColourCode					BIT STRING (SIZE (3)),

+	baseStationColourCode				BIT STRING (SIZE (3))

+}

+

+

+PhysCellIdUTRA-FDD ::=				INTEGER (0..511)

+

+

+PhysCellIdUTRA-TDD ::=				INTEGER (0..127)

+

+

+PLMN-Identity ::=					SEQUENCE {

+	mcc									MCC					OPTIONAL,					-- Cond MCC

+	mnc									MNC

+}

+

+MCC ::=								SEQUENCE (SIZE (3)) OF

+											MCC-MNC-Digit

+

+MNC ::=								SEQUENCE (SIZE (2..3)) OF

+											MCC-MNC-Digit

+

+MCC-MNC-Digit ::=					INTEGER (0..9)

+

+

+

+PreRegistrationInfoHRPD ::=			SEQUENCE {

+	preRegistrationAllowed				BOOLEAN,

+	preRegistrationZoneId				PreRegistrationZoneIdHRPD	OPTIONAL, -- cond PreRegAllowed

+	secondaryPreRegistrationZoneIdList	SecondaryPreRegistrationZoneIdListHRPD	OPTIONAL -- Need OR

+}

+

+SecondaryPreRegistrationZoneIdListHRPD ::=	SEQUENCE (SIZE (1..2)) OF PreRegistrationZoneIdHRPD

+

+PreRegistrationZoneIdHRPD ::=			INTEGER (0..255)

+

+

+Q-QualMin-r9 ::=					INTEGER (-34..-3)

+

+

+Q-RxLevMin ::=						INTEGER (-70..-22)

+

+

+Q-OffsetRange ::=						ENUMERATED {

+												dB-24, dB-22, dB-20, dB-18, dB-16, dB-14,

+												dB-12, dB-10, dB-8, dB-6, dB-5, dB-4, dB-3,

+												dB-2, dB-1, dB0, dB1, dB2, dB3, dB4, dB5,

+												dB6, dB8, dB10, dB12, dB14, dB16, dB18,

+												dB20, dB22, dB24}

+

+

+Q-OffsetRangeInterRAT ::=					INTEGER (-15..15)

+

+

+ReselectionThreshold ::=				INTEGER (0..31)

+

+

+ReselectionThresholdQ-r9 ::=			INTEGER (0..31)

+

+

+SpeedStateScaleFactors ::=			SEQUENCE {

+	sf-Medium							ENUMERATED {oDot25, oDot5, oDot75, lDot0},

+	sf-High								ENUMERATED {oDot25, oDot5, oDot75, lDot0}

+}

+

+SystemInfoListGERAN ::=				SEQUENCE (SIZE (1..maxGERAN-SI)) OF

+										OCTET STRING (SIZE (1..23))

+

+

+SystemTimeInfoCDMA2000 ::=			SEQUENCE {

+	cdma-EUTRA-Synchronisation			BOOLEAN,

+	cdma-SystemTime						CHOICE {

+		synchronousSystemTime				BIT STRING (SIZE (39)),

+		asynchronousSystemTime				BIT STRING (SIZE (49))

+	}

+}

+

+

+TrackingAreaCode ::=				BIT STRING (SIZE (16))

+

+

+T-Reselection ::=					INTEGER (0..7)

+

+

+AllowedMeasBandwidth ::=				ENUMERATED {mbw6, mbw15, mbw25, mbw50, mbw75, mbw100}

+

+

+Hysteresis ::=							INTEGER (0..30)

+

+

+MeasConfig ::=						SEQUENCE {

+	-- Measurement objects

+	measObjectToRemoveList				MeasObjectToRemoveList				OPTIONAL,	-- Need ON

+	measObjectToAddModList				MeasObjectToAddModList				OPTIONAL,	-- Need ON

+	-- Reporting configurations

+	reportConfigToRemoveList			ReportConfigToRemoveList			OPTIONAL,	-- Need ON

+	reportConfigToAddModList			ReportConfigToAddModList			OPTIONAL,	-- Need ON

+	-- Measurement identities

+	measIdToRemoveList					MeasIdToRemoveList					OPTIONAL,	-- Need ON

+	measIdToAddModList					MeasIdToAddModList					OPTIONAL,	-- Need ON

+	-- Other parameters

+	quantityConfig						QuantityConfig						OPTIONAL,	-- Need ON

+	measGapConfig						MeasGapConfig						OPTIONAL,	-- Need ON

+	s-Measure							RSRP-Range							OPTIONAL,	-- Need ON

+	preRegistrationInfoHRPD				PreRegistrationInfoHRPD				OPTIONAL, 	-- Need OP

+	speedStatePars			CHOICE {

+		release								NULL,

+		setup								SEQUENCE {

+			mobilityStateParameters				MobilityStateParameters,

+			timeToTrigger-SF					SpeedStateScaleFactors

+		}

+	}																		OPTIONAL,	-- Need ON

+	...

+}

+

+MeasIdToRemoveList ::=				SEQUENCE (SIZE (1..maxMeasId)) OF MeasId

+

+MeasObjectToRemoveList ::=			SEQUENCE (SIZE (1..maxObjectId)) OF MeasObjectId

+

+ReportConfigToRemoveList ::=		SEQUENCE (SIZE (1..maxReportConfigId)) OF ReportConfigId

+

+

+MeasGapConfig ::=					CHOICE {

+	release								NULL,

+	setup								SEQUENCE {

+		gapOffset							CHOICE {

+				gp0									INTEGER (0..39),

+				gp1									INTEGER (0..79),

+				...

+		}

+	}

+}

+

+

+MeasId ::=							INTEGER (1..maxMeasId)

+

+

+MeasIdToAddModList ::=				SEQUENCE (SIZE (1..maxMeasId)) OF MeasIdToAddMod

+

+MeasIdToAddMod ::=	SEQUENCE {

+	measId								MeasId,

+	measObjectId						MeasObjectId,

+	reportConfigId						ReportConfigId

+}

+

+

+MeasObjectCDMA2000 ::=				SEQUENCE {

+	cdma2000-Type						CDMA2000-Type,

+	carrierFreq							CarrierFreqCDMA2000,

+	searchWindowSize					INTEGER (0..15)						OPTIONAL,	-- Need ON

+	offsetFreq							Q-OffsetRangeInterRAT				DEFAULT 0,

+	cellsToRemoveList					CellIndexList						OPTIONAL,	-- Need ON

+	cellsToAddModList					CellsToAddModListCDMA2000			OPTIONAL,	-- Need ON

+	cellForWhichToReportCGI				PhysCellIdCDMA2000					OPTIONAL,	-- Need ON

+	...

+}

+

+CellsToAddModListCDMA2000 ::=		SEQUENCE (SIZE (1..maxCellMeas)) OF CellsToAddModCDMA2000

+

+CellsToAddModCDMA2000 ::=	SEQUENCE {

+	cellIndex							INTEGER (1..maxCellMeas),

+	physCellId							PhysCellIdCDMA2000

+}

+

+

+MeasObjectEUTRA ::=					SEQUENCE {

+	carrierFreq							ARFCN-ValueEUTRA,

+	allowedMeasBandwidth				AllowedMeasBandwidth,

+	presenceAntennaPort1				PresenceAntennaPort1,

+	neighCellConfig						NeighCellConfig,

+	offsetFreq							Q-OffsetRange				DEFAULT dB0,

+	-- Neighbour cell list

+	cellsToRemoveList					CellIndexList				OPTIONAL,		-- Need ON

+	cellsToAddModList					CellsToAddModList			OPTIONAL,		-- Need ON

+	-- Black list

+	blackCellsToRemoveList				CellIndexList				OPTIONAL,		-- Need ON

+	blackCellsToAddModList				BlackCellsToAddModList		OPTIONAL,		-- Need ON

+	cellForWhichToReportCGI				PhysCellId					OPTIONAL, 		-- Need ON

+	...

+}

+

+CellsToAddModList ::=				SEQUENCE (SIZE (1..maxCellMeas)) OF CellsToAddMod

+

+CellsToAddMod ::=	SEQUENCE {

+	cellIndex							INTEGER (1..maxCellMeas),

+	physCellId							PhysCellId,

+	cellIndividualOffset				Q-OffsetRange

+}

+

+BlackCellsToAddModList ::=			SEQUENCE (SIZE (1..maxCellMeas)) OF BlackCellsToAddMod

+

+BlackCellsToAddMod ::=	SEQUENCE {

+	cellIndex							INTEGER (1..maxCellMeas),

+	physCellIdRange						PhysCellIdRange

+}

+

+

+MeasObjectGERAN ::=					SEQUENCE {

+	carrierFreqs						CarrierFreqsGERAN,

+	offsetFreq							Q-OffsetRangeInterRAT		DEFAULT 0,

+	ncc-Permitted						BIT STRING(SIZE (8))		DEFAULT '11111111'B,

+	cellForWhichToReportCGI				PhysCellIdGERAN				OPTIONAL, 	-- Need ON

+	...

+}

+

+

+MeasObjectId ::=					INTEGER (1..maxObjectId)

+

+

+MeasObjectToAddModList ::=			SEQUENCE (SIZE (1..maxObjectId)) OF MeasObjectToAddMod

+

+MeasObjectToAddMod ::=	SEQUENCE {

+	measObjectId						MeasObjectId,

+	measObject							CHOICE {

+		measObjectEUTRA						MeasObjectEUTRA,

+		measObjectUTRA						MeasObjectUTRA,

+		measObjectGERAN						MeasObjectGERAN,

+		measObjectCDMA2000					MeasObjectCDMA2000,

+		...

+	}

+}

+

+

+MeasObjectUTRA ::=					SEQUENCE {

+	carrierFreq							ARFCN-ValueUTRA,

+	offsetFreq							Q-OffsetRangeInterRAT		DEFAULT 0,

+	cellsToRemoveList					CellIndexList				OPTIONAL,			-- Need ON

+	cellsToAddModList					CHOICE {

+		cellsToAddModListUTRA-FDD			CellsToAddModListUTRA-FDD,

+		cellsToAddModListUTRA-TDD			CellsToAddModListUTRA-TDD

+	}																OPTIONAL,			-- Need ON

+	cellForWhichToReportCGI				CHOICE {

+		utra-FDD							PhysCellIdUTRA-FDD,

+		utra-TDD							PhysCellIdUTRA-TDD

+	}																OPTIONAL, 	-- Need ON

+	...

+}

+

+CellsToAddModListUTRA-FDD ::=		SEQUENCE (SIZE (1..maxCellMeas)) OF CellsToAddModUTRA-FDD 

+

+CellsToAddModUTRA-FDD ::=	SEQUENCE {

+	cellIndex							INTEGER (1..maxCellMeas),

+	physCellId							PhysCellIdUTRA-FDD

+}

+

+CellsToAddModListUTRA-TDD ::=		SEQUENCE (SIZE (1..maxCellMeas)) OF CellsToAddModUTRA-TDD 

+

+CellsToAddModUTRA-TDD ::=	SEQUENCE {

+	cellIndex							INTEGER (1..maxCellMeas),

+	physCellId							PhysCellIdUTRA-TDD

+}

+

+

+MeasResults ::=						SEQUENCE {

+	measId								MeasId,

+	measResultServCell					SEQUENCE {

+		rsrpResult							RSRP-Range,

+		rsrqResult							RSRQ-Range

+	},

+	measResultNeighCells				CHOICE {

+		measResultListEUTRA					MeasResultListEUTRA,

+		measResultListUTRA					MeasResultListUTRA,

+		measResultListGERAN					MeasResultListGERAN,

+		measResultsCDMA2000					MeasResultsCDMA2000,

+		...

+	}																		OPTIONAL,

+	...,

+	[[	measResultForECID-r9				MeasResultForECID-r9			OPTIONAL

+	]]

+}

+

+MeasResultListEUTRA ::=				SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultEUTRA 

+

+MeasResultEUTRA ::=	SEQUENCE {

+	physCellId							PhysCellId,

+	cgi-Info							SEQUENCE {

+		cellGlobalId						CellGlobalIdEUTRA,

+		trackingAreaCode					TrackingAreaCode,

+		plmn-IdentityList					PLMN-IdentityList2 				OPTIONAL

+	}			 												OPTIONAL,

+	measResult							SEQUENCE {

+		rsrpResult							RSRP-Range						OPTIONAL,

+		rsrqResult							RSRQ-Range						OPTIONAL,

+		...,

+		[[	additionalSI-Info-r9				AdditionalSI-Info-r9				OPTIONAL

+		]]

+	}

+}

+

+MeasResultListUTRA ::=				SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultUTRA 

+

+MeasResultUTRA ::=	SEQUENCE {

+	physCellId							CHOICE {

+		fdd									PhysCellIdUTRA-FDD,

+		tdd									PhysCellIdUTRA-TDD

+	},

+	cgi-Info							SEQUENCE {

+		cellGlobalId						CellGlobalIdUTRA,

+		locationAreaCode					BIT STRING (SIZE (16))			OPTIONAL,

+		routingAreaCode						BIT STRING (SIZE (8))			OPTIONAL,

+		plmn-IdentityList					PLMN-IdentityList2 				OPTIONAL

+	}			 												OPTIONAL,

+	measResult							SEQUENCE {

+		utra-RSCP							INTEGER (-5..91)				OPTIONAL,

+		utra-EcN0							INTEGER (0..49)					OPTIONAL,

+		...,

+		[[	additionalSI-Info-r9				AdditionalSI-Info-r9				OPTIONAL

+		]]

+	}

+}

+

+MeasResultListGERAN ::=				SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultGERAN 

+

+MeasResultGERAN ::=	SEQUENCE {

+	carrierFreq							CarrierFreqGERAN,

+	physCellId							PhysCellIdGERAN,

+	cgi-Info							SEQUENCE {

+		cellGlobalId						CellGlobalIdGERAN,

+		routingAreaCode						BIT STRING (SIZE (8))			OPTIONAL

+	}			 															OPTIONAL,

+	measResult							SEQUENCE {

+		rssi								INTEGER (0..63),

+		...

+	}

+}

+

+MeasResultsCDMA2000 ::=				SEQUENCE {

+	preRegistrationStatusHRPD			BOOLEAN,

+	measResultListCDMA2000				MeasResultListCDMA2000

+}

+

+MeasResultListCDMA2000 ::=			SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultCDMA2000

+

+MeasResultCDMA2000 ::=	SEQUENCE {

+	physCellId							PhysCellIdCDMA2000,

+	cgi-Info							CellGlobalIdCDMA2000		 		OPTIONAL,

+	measResult							SEQUENCE {

+		pilotPnPhase						INTEGER	(0..32767)				OPTIONAL,

+		pilotStrength						INTEGER (0..63),

+		...

+	}

+}

+

+MeasResultForECID-r9 ::=		SEQUENCE {

+	ue-RxTxTimeDiffResult-r9				INTEGER (0..4095),

+	currentSFN-r9							BIT STRING (SIZE (10))

+}

+

+PLMN-IdentityList2 ::=				SEQUENCE (SIZE (1..5)) OF PLMN-Identity

+

+AdditionalSI-Info-r9 ::=			SEQUENCE {

+	csg-MemberStatus-r9				ENUMERATED {member}				OPTIONAL,

+	csg-Identity-r9						CSG-Identity						OPTIONAL

+}

+

+

+QuantityConfig ::=					SEQUENCE {

+	quantityConfigEUTRA					QuantityConfigEUTRA					OPTIONAL,	-- Need ON

+	quantityConfigUTRA					QuantityConfigUTRA					OPTIONAL,	-- Need ON

+	quantityConfigGERAN					QuantityConfigGERAN					OPTIONAL,	-- Need ON

+	quantityConfigCDMA2000				QuantityConfigCDMA2000				OPTIONAL,	-- Need ON

+	...

+}

+

+QuantityConfigEUTRA ::=				SEQUENCE {

+	filterCoefficientRSRP				FilterCoefficient					DEFAULT fc4,

+	filterCoefficientRSRQ				FilterCoefficient					DEFAULT fc4

+}

+

+QuantityConfigUTRA ::=				SEQUENCE {

+	measQuantityUTRA-FDD				ENUMERATED {cpich-RSCP, cpich-EcN0},

+	measQuantityUTRA-TDD				ENUMERATED {pccpch-RSCP},

+	filterCoefficient					FilterCoefficient					DEFAULT fc4

+}

+

+QuantityConfigGERAN ::=				SEQUENCE {

+	measQuantityGERAN					ENUMERATED {rssi},

+	filterCoefficient					FilterCoefficient					DEFAULT fc2

+}

+

+QuantityConfigCDMA2000 ::=			SEQUENCE {

+	measQuantityCDMA2000				ENUMERATED {pilotStrength, pilotPnPhaseAndPilotStrength}

+}

+

+

+ReportConfigEUTRA ::=				SEQUENCE {

+	triggerType							CHOICE {

+		event								SEQUENCE {

+			eventId								CHOICE {

+				eventA1								SEQUENCE {

+					a1-Threshold						ThresholdEUTRA

+				},

+				eventA2								SEQUENCE {

+					a2-Threshold						ThresholdEUTRA

+				},

+				eventA3								SEQUENCE {

+					a3-Offset							INTEGER (-30..30),

+					reportOnLeave						BOOLEAN

+				},

+				eventA4								SEQUENCE {

+					a4-Threshold						ThresholdEUTRA

+				},

+				eventA5								SEQUENCE {

+					a5-Threshold1						ThresholdEUTRA,

+					a5-Threshold2						ThresholdEUTRA

+				},

+				...

+			},

+			hysteresis							Hysteresis,

+			timeToTrigger						TimeToTrigger

+		},

+		periodical								SEQUENCE {

+			purpose									ENUMERATED {

+														reportStrongestCells, reportCGI}

+		}

+	},

+	triggerQuantity						ENUMERATED {rsrp, rsrq},

+	reportQuantity						ENUMERATED {sameAsTriggerQuantity, both},

+	maxReportCells						INTEGER (1..maxCellReport),

+	reportInterval						ReportInterval,

+	reportAmount						ENUMERATED {r1, r2, r4, r8, r16, r32, r64, infinity},

+	...,

+	[[	si-RequestForHO-r9					ENUMERATED {setup}		OPTIONAL,	-- Cond reportCGI

+		ue-RxTxTimeDiffPeriodical-r9		ENUMERATED {setup}		OPTIONAL	-- Need OR

+	]]

+}

+

+ThresholdEUTRA ::=					CHOICE{

+	threshold-RSRP						RSRP-Range,

+	threshold-RSRQ						RSRQ-Range

+}

+

+

+ReportConfigId ::=					INTEGER (1..maxReportConfigId)

+

+

+ReportConfigInterRAT ::=			SEQUENCE {

+	triggerType							CHOICE {

+		event								SEQUENCE {

+			eventId								CHOICE {

+				eventB1								SEQUENCE {

+					b1-Threshold						CHOICE {

+						b1-ThresholdUTRA					ThresholdUTRA,

+						b1-ThresholdGERAN					ThresholdGERAN,

+						b1-ThresholdCDMA2000				ThresholdCDMA2000

+					}

+				},

+				eventB2								SEQUENCE {

+					b2-Threshold1						ThresholdEUTRA,

+					b2-Threshold2						CHOICE {

+						b2-Threshold2UTRA					ThresholdUTRA,

+						b2-Threshold2GERAN					ThresholdGERAN,

+						b2-Threshold2CDMA2000				ThresholdCDMA2000

+					}

+				},

+				...

+			},

+			hysteresis						Hysteresis,

+			timeToTrigger					TimeToTrigger

+		},

+		periodical								SEQUENCE {

+			purpose									ENUMERATED {

+														reportStrongestCells,

+														reportStrongestCellsForSON,

+														reportCGI}

+		}

+	},

+	maxReportCells						INTEGER (1..maxCellReport),

+	reportInterval						ReportInterval,	

+	reportAmount						ENUMERATED {r1, r2, r4, r8, r16, r32, r64, infinity},

+	...,

+	[[	si-RequestForHO-r9					ENUMERATED {setup}		OPTIONAL	-- Cond reportCGI

+	]]

+}

+

+ThresholdUTRA ::=					CHOICE{

+	utra-RSCP							INTEGER (-5..91),

+	utra-EcN0							INTEGER (0..49)

+}

+

+ThresholdGERAN ::= 				INTEGER (0..63)

+

+ThresholdCDMA2000 ::= 			INTEGER (0..63)

+

+

+ReportConfigToAddModList ::=		SEQUENCE (SIZE (1..maxReportConfigId)) OF ReportConfigToAddMod

+

+ReportConfigToAddMod ::=	SEQUENCE {

+	reportConfigId						ReportConfigId,

+	reportConfig						CHOICE {

+		reportConfigEUTRA					ReportConfigEUTRA,

+		reportConfigInterRAT				ReportConfigInterRAT

+	}

+}

+

+

+

+ReportInterval ::=					ENUMERATED {

+										ms120, ms240, ms480, ms640, ms1024, ms2048, ms5120, ms10240,

+										min1, min6, min12, min30, min60, spare3, spare2, spare1}

+

+

+RSRP-Range ::=						INTEGER(0..97)

+

+

+RSRQ-Range ::=						INTEGER(0..34)

+

+

+TimeToTrigger ::=					ENUMERATED {

+										ms0, ms40, ms64, ms80, ms100, ms128, ms160, ms256,

+										ms320, ms480, ms512, ms640, ms1024, ms1280, ms2560,

+										ms5120}

+

+

+C-RNTI ::=							BIT STRING (SIZE (16))

+

+

+DedicatedInfoCDMA2000 ::=				OCTET STRING

+

+

+DedicatedInfoNAS ::=		OCTET STRING

+

+

+FilterCoefficient ::=					ENUMERATED {

+											fc0, fc1, fc2, fc3, fc4, fc5,

+											fc6, fc7, fc8, fc9, fc11, fc13, 

+											fc15, fc17, fc19, spare1, ...}

+

+

+MMEC ::=							BIT STRING (SIZE (8))

+

+

+NeighCellConfig ::=			BIT STRING (SIZE (2))

+

+

+OtherConfig-r9 ::= SEQUENCE	{

+	reportProximityConfig-r9			ReportProximityConfig-r9		OPTIONAL,	-- Need ON

+	...

+}

+

+ReportProximityConfig-r9 ::= SEQUENCE {

+	proximityIndicationEUTRA-r9		ENUMERATED {enabled}			OPTIONAL, 		-- Need OR

+	proximityIndicationUTRA-r9		ENUMERATED {enabled}			OPTIONAL		-- Need OR

+}

+

+

+RAND-CDMA2000 ::=						BIT STRING (SIZE (32))

+

+

+RAT-Type ::=						ENUMERATED {

+										eutra, utra, geran-cs, geran-ps, cdma2000-1XRTT,

+										spare3, spare2, spare1, ...}

+

+

+RRC-TransactionIdentifier ::=		INTEGER (0..3)

+

+

+S-TMSI ::=							SEQUENCE {

+	mmec								MMEC,

+	m-TMSI								BIT STRING (SIZE (32))

+}

+

+

+UE-CapabilityRAT-ContainerList ::=SEQUENCE (SIZE (0..maxRAT-Capabilities)) OF UE-CapabilityRAT-Container

+

+UE-CapabilityRAT-Container ::= SEQUENCE {

+	rat-Type							RAT-Type,

+	ueCapabilityRAT-Container			OCTET STRING

+}

+

+

+UE-EUTRA-Capability ::=				SEQUENCE {

+	accessStratumRelease				AccessStratumRelease,

+	ue-Category							INTEGER (1..5),

+	pdcp-Parameters						PDCP-Parameters,

+	phyLayerParameters					PhyLayerParameters,

+	rf-Parameters						RF-Parameters,

+	measParameters						MeasParameters,

+	featureGroupIndicators				BIT STRING (SIZE (32))				OPTIONAL,

+	interRAT-Parameters					SEQUENCE {

+		utraFDD								IRAT-ParametersUTRA-FDD				OPTIONAL,

+		utraTDD128							IRAT-ParametersUTRA-TDD128				OPTIONAL,

+		utraTDD384							IRAT-ParametersUTRA-TDD384				OPTIONAL,

+		utraTDD768							IRAT-ParametersUTRA-TDD768				OPTIONAL,

+		geran								IRAT-ParametersGERAN					OPTIONAL,

+		cdma2000-HRPD						IRAT-ParametersCDMA2000-HRPD			OPTIONAL,

+		cdma2000-1xRTT						IRAT-ParametersCDMA2000-1XRTT			OPTIONAL

+	},

+	nonCriticalExtension					UE-EUTRA-Capability-v920-IEs		OPTIONAL

+}

+

+UE-EUTRA-Capability-v920-IEs ::=			SEQUENCE {

+	phyLayerParameters-v920						PhyLayerParameters-v920,

+	interRAT-ParametersGERAN-v920				IRAT-ParametersGERAN-v920,

+	interRAT-ParametersUTRA-v920				IRAT-ParametersUTRA-v920			OPTIONAL,

+	interRAT-Parameters-v920					IRAT-ParametersCDMA2000-1XRTT-v920	OPTIONAL,

+	deviceType-r9								ENUMERATED {noBenFromBatConsumpOpt}	OPTIONAL,

+	csg-ProximityIndicationParameters-r9		CSG-ProximityIndicationParameters-r9,

+	neighCellSI-AcquisitionParameters-r9		NeighCellSI-AcquisitionParameters-r9,

+	son-Parameters-r9							SON-Parameters-r9,

+	nonCriticalExtension						SEQUENCE {}							OPTIONAL

+}

+

+AccessStratumRelease ::=			ENUMERATED {

+										rel8, rel9, spare6, spare5, spare4, spare3,

+										spare2, spare1, ...}

+

+PDCP-Parameters ::=					SEQUENCE {

+	supportedROHC-Profiles				SEQUENCE {

+		profile0x0001						BOOLEAN,

+		profile0x0002						BOOLEAN,

+		profile0x0003						BOOLEAN,

+		profile0x0004						BOOLEAN,

+		profile0x0006						BOOLEAN,

+		profile0x0101						BOOLEAN,

+		profile0x0102						BOOLEAN,

+		profile0x0103						BOOLEAN,

+		profile0x0104						BOOLEAN

+	},

+	maxNumberROHC-ContextSessions		ENUMERATED {

+											cs2, cs4, cs8, cs12, cs16, cs24, cs32,

+											cs48, cs64, cs128, cs256, cs512, cs1024,

+											cs16384, spare2, spare1}				DEFAULT cs16,

+	...

+}

+

+PhyLayerParameters ::=				SEQUENCE {

+	ue-TxAntennaSelectionSupported		BOOLEAN,

+	ue-SpecificRefSigsSupported			BOOLEAN

+}

+

+PhyLayerParameters-v920 ::=			SEQUENCE {

+	enhancedDualLayerFDD-Supported-r9	BOOLEAN,

+	enhancedDualLayerTDD-Supported-r9	BOOLEAN

+}

+

+RF-Parameters ::=					SEQUENCE {

+	supportedBandListEUTRA				SupportedBandListEUTRA

+}

+

+SupportedBandListEUTRA ::=			SEQUENCE (SIZE (1..maxBands)) OF SupportedBandEUTRA 

+

+SupportedBandEUTRA ::=				SEQUENCE {

+	bandEUTRA							INTEGER (1..64),

+	halfDuplex							BOOLEAN

+}

+

+MeasParameters ::=					SEQUENCE {

+	bandListEUTRA						BandListEUTRA

+}

+

+BandListEUTRA ::=					SEQUENCE (SIZE (1..maxBands)) OF BandInfoEUTRA 

+

+BandInfoEUTRA ::=					SEQUENCE {

+	interFreqBandList					InterFreqBandList,

+	interRAT-BandList					InterRAT-BandList		OPTIONAL

+}

+

+InterFreqBandList ::=				SEQUENCE (SIZE (1..maxBands)) OF InterFreqBandInfo

+

+InterFreqBandInfo ::=				SEQUENCE {

+	interFreqNeedForGaps				BOOLEAN

+}

+

+InterRAT-BandList ::=				SEQUENCE (SIZE (1..maxBands)) OF InterRAT-BandInfo

+

+InterRAT-BandInfo ::=				SEQUENCE {

+	interRAT-NeedForGaps				BOOLEAN

+}

+

+IRAT-ParametersUTRA-FDD ::=			SEQUENCE {

+	supportedBandListUTRA-FDD			SupportedBandListUTRA-FDD

+}

+

+IRAT-ParametersUTRA-v920 ::=		SEQUENCE {

+	e-Redirection-r9					ENUMERATED {supported}

+}

+

+SupportedBandListUTRA-FDD ::=		SEQUENCE (SIZE (1..maxBands)) OF SupportedBandUTRA-FDD 

+

+SupportedBandUTRA-FDD ::=			ENUMERATED {

+										bandI, bandII, bandIII, bandIV, bandV, bandVI,

+										bandVII, bandVIII, bandIX, bandX, bandXI,

+										bandXII, bandXIII, bandXIV, bandXV, bandXVI, ...}

+

+IRAT-ParametersUTRA-TDD128 ::=		SEQUENCE {

+	supportedBandListUTRA-TDD128		SupportedBandListUTRA-TDD128

+}

+

+SupportedBandListUTRA-TDD128 ::=	SEQUENCE (SIZE (1..maxBands)) OF SupportedBandUTRA-TDD128 

+

+SupportedBandUTRA-TDD128 ::=		ENUMERATED {

+										a, b, c, d, e, f, g, h, i, j, k, l, m, n,

+										o, p, ...}

+

+IRAT-ParametersUTRA-TDD384 ::=		SEQUENCE {

+	supportedBandListUTRA-TDD384		SupportedBandListUTRA-TDD384

+}

+

+SupportedBandListUTRA-TDD384 ::=	SEQUENCE (SIZE (1..maxBands)) OF SupportedBandUTRA-TDD384 

+

+SupportedBandUTRA-TDD384 ::=		ENUMERATED {

+											a, b, c, d, e, f, g, h, i, j, k, l, m, n,

+											o, p, ...}

+

+IRAT-ParametersUTRA-TDD768 ::=		SEQUENCE {

+	supportedBandListUTRA-TDD768		SupportedBandListUTRA-TDD768

+}

+

+SupportedBandListUTRA-TDD768 ::=	SEQUENCE (SIZE (1..maxBands)) OF SupportedBandUTRA-TDD768 

+

+SupportedBandUTRA-TDD768 ::=		ENUMERATED {

+										a, b, c, d, e, f, g, h, i, j, k, l, m, n,

+										o, p, ...}

+

+IRAT-ParametersGERAN ::=			SEQUENCE {

+	supportedBandListGERAN				SupportedBandListGERAN,

+	interRAT-PS-HO-ToGERAN				BOOLEAN

+}

+

+IRAT-ParametersGERAN-v920 ::=			SEQUENCE {

+	dtm-r9									ENUMERATED {supported}			OPTIONAL,

+	e-RedirectionGERAN-r9					ENUMERATED {supported}			OPTIONAL

+}

+

+SupportedBandListGERAN ::=			SEQUENCE (SIZE (1..maxBands)) OF SupportedBandGERAN 

+

+SupportedBandGERAN ::=				ENUMERATED {

+										gsm450, gsm480, gsm710, gsm750, gsm810, gsm850,

+										gsm900P, gsm900E, gsm900R, gsm1800, gsm1900,

+										spare5, spare4, spare3, spare2, spare1, ...}

+

+IRAT-ParametersCDMA2000-HRPD ::=	SEQUENCE {

+	supportedBandListHRPD				SupportedBandListHRPD,

+	tx-ConfigHRPD						ENUMERATED {single, dual},

+	rx-ConfigHRPD						ENUMERATED {single, dual}

+}

+

+SupportedBandListHRPD ::=			SEQUENCE (SIZE (1..maxCDMA-BandClass)) OF BandclassCDMA2000

+

+IRAT-ParametersCDMA2000-1XRTT ::=	SEQUENCE {

+	supportedBandList1XRTT				SupportedBandList1XRTT,

+	tx-Config1XRTT						ENUMERATED {single, dual},

+	rx-Config1XRTT						ENUMERATED {single, dual}

+}

+

+IRAT-ParametersCDMA2000-1XRTT-v920 ::=	SEQUENCE {

+	e-CSFB-r9							ENUMERATED {supported},

+	e-CSFB-ConcPS-Mob-r9				ENUMERATED {notSupported, supported}

+}

+

+SupportedBandList1XRTT ::=			SEQUENCE (SIZE (1..maxCDMA-BandClass)) OF BandclassCDMA2000

+

+CSG-ProximityIndicationParameters-r9 ::=		SEQUENCE {

+	intraFreqProximityIndicationSupported-r9		BOOLEAN,

+	interFreqProximityIndicationSupported-r9		BOOLEAN,

+	utran-ProximityIndicationSupported-r9			BOOLEAN

+}

+

+NeighCellSI-AcquisitionParameters-r9 ::=		SEQUENCE {

+	intraFreqSI-AcquisitionForHO-Supported-r9		BOOLEAN,

+	interFreqSI-AcquisitionForHO-Supported-r9		BOOLEAN,

+	utran-SI-AcquisitionForHO-Supported-r9			BOOLEAN

+}

+

+SON-Parameters-r9 ::=				SEQUENCE {

+	rach-ReportSupported-r9				BOOLEAN

+}

+

+

+UE-TimersAndConstants ::=			SEQUENCE {

+	t300								ENUMERATED {

+											ms100, ms200, ms300, ms400, ms600, ms1000, ms1500,

+											ms2000},

+	t301								ENUMERATED {

+											ms100, ms200, ms300, ms400, ms600, ms1000, ms1500,

+											ms2000},

+	t310								ENUMERATED {

+											ms0, ms50, ms100, ms200, ms500, ms1000, ms2000},

+	n310								ENUMERATED {

+											n1, n2, n3, n4, n6, n8, n10, n20},

+	t311								ENUMERATED {

+											ms1000, ms3000, ms5000, ms10000, ms15000,

+											ms20000, ms30000},

+	n311								ENUMERATED {

+											n1, n2, n3, n4, n5, n6, n8, n10},

+	...

+}

+

+

+MBMS-NotificationConfig-r9 ::=				SEQUENCE {

+	notificationRepetitionCoeff-r9		ENUMERATED {n2, n4},

+	notificationOffset-r9				INTEGER (0..10),

+	notificationSF-Index-r9				INTEGER (1..6)

+}

+

+

+MBSFN-AreaInfoList-r9 ::=			SEQUENCE (SIZE(1..maxMBSFN-Area)) OF MBSFN-AreaInfo-r9

+

+MBSFN-AreaInfo-r9 ::=				SEQUENCE {

+	mbsfn-AreaId-r9						INTEGER (0..255),

+	non-MBSFNregionLength				ENUMERATED {s1, s2},

+	notificationIndicator-r9				INTEGER (0..7),

+	mcch-Config-r9						SEQUENCE {

+		mcch-RepetitionPeriod-r9			ENUMERATED {rf32, rf64, rf128, rf256},

+		mcch-Offset-r9						INTEGER (0..10),

+		mcch-ModificationPeriod-r9			ENUMERATED {rf512, rf1024},

+		sf-AllocInfo-r9						BIT STRING (SIZE(6)),

+		signallingMCS-r9					ENUMERATED {n2, n7, n13, n19}

+	},

+	...

+}

+

+

+MBSFN-SubframeConfig ::=			SEQUENCE {

+	radioframeAllocationPeriod			ENUMERATED {n1, n2, n4, n8, n16, n32},

+	radioframeAllocationOffset			INTEGER (0..7),

+	subframeAllocation					CHOICE {

+		oneFrame							BIT STRING (SIZE(6)),

+		fourFrames							BIT STRING (SIZE(24))

+	}

+}

+

+PMCH-InfoList-r9 ::=				SEQUENCE (SIZE (0..maxPMCH-PerMBSFN)) OF PMCH-Info-r9

+

+PMCH-Info-r9 ::=					SEQUENCE {

+	pmch-Config-r9						PMCH-Config-r9,

+	mbms-SessionInfoList-r9			MBMS-SessionInfoList-r9,

+	...

+}

+

+MBMS-SessionInfoList-r9 ::=		SEQUENCE (SIZE (0..maxSessionPerPMCH)) OF MBMS-SessionInfo-r9

+

+MBMS-SessionInfo-r9 ::=			SEQUENCE {

+	tmgi-r9								TMGI-r9,

+	sessionId-r9						OCTET STRING (SIZE (1)) 		OPTIONAL, 	-- Need OR

+	logicalChannelIdentity-r9			INTEGER (0..maxSessionPerPMCH-1),

+	...

+}

+

+PMCH-Config-r9 ::=					SEQUENCE {

+	sf-AllocEnd-r9						INTEGER (0..1535),

+	dataMCS-r9							INTEGER (0..28),

+	mch-SchedulingPeriod-r9			ENUMERATED {

+										rf8, rf16, rf32, rf64, rf128, rf256, rf512, rf1024},

+	...

+}

+

+TMGI-r9 ::=						SEQUENCE {

+	plmn-Id-r9							CHOICE {

+		plmn-Index-r9						INTEGER (1..6),

+		explicitValue-r9					PLMN-Identity

+	},

+	serviceId-r9						OCTET STRING (SIZE (3))

+}

+

+

+maxBands					INTEGER ::= 64	-- Maximum number of bands listed in EUTRA UE caps

+maxCDMA-BandClass			INTEGER ::= 32	-- Maximum value of the CDMA band classes

+maxCellBlack				INTEGER ::= 16	-- Maximum number of blacklisted cells

+											--	listed in SIB type 4 and 5

+maxCellInter				INTEGER ::= 16	-- Maximum number of neighbouring inter-frequency

+											-- cells listed in SIB type 5

+maxCellIntra				INTEGER ::= 16	-- Maximum number of neighbouring intra-frequency

+											-- cells listed in SIB type 4

+maxCellMeas					INTEGER ::= 32	-- Maximum number of entries in each of the neighbour

+											-- cell lists in a measurement object

+maxCellReport				INTEGER ::= 8	-- Maximum number of reported cells

+maxDRB						INTEGER ::= 11	-- Maximum number of Data Radio Bearers

+maxEARFCN					INTEGER ::= 65535	-- Maximum value of EUTRA carrier fequency

+maxFreq						INTEGER ::= 8	-- Maximum number of EUTRA carrier frequencies

+maxCellInfo-GERAN-r9 		INTEGER ::=	32	-- Maximum number of GERAN cells for which system in-

+											-- formation can be provided as redirection assistance

+maxGERAN-SI					INTEGER ::= 10	-- Maximum number of GERAN SI blocks that can be

+											-- provided as part of NACC information

+maxGNFG						INTEGER ::= 16	-- Maximum number of GERAN neighbour freq groups

+maxMBSFN-Allocations		INTEGER ::= 8	-- Maximum number of MBSFN frame allocations with

+											-- different offset

+maxMBSFN-Area				INTEGER ::= 8

+maxSessionPerPMCH			INTEGER ::= 29

+maxSessionPerPMCH-1			INTEGER ::= 28

+maxPMCH-PerMBSFN			INTEGER ::= 15

+maxMeasId					INTEGER ::= 32

+maxObjectId					INTEGER ::= 32

+maxPageRec					INTEGER ::= 16	-- 

+maxPNOffset					INTEGER ::=	511	-- Maximum number of CDMA2000 PNOffsets

+maxRAT-Capabilities			INTEGER ::= 8	-- Maximum number of interworking RATs (incl EUTRA)

+maxReportConfigId			INTEGER ::= 32

+maxSIB						INTEGER ::= 32	-- Maximum number of SIBs

+maxSIB-1					INTEGER ::= 31

+maxSI-Message				INTEGER ::= 32	-- Maximum number of SI messages

+maxUTRA-FDD-Carrier			INTEGER ::= 16	-- Maximum number of UTRA FDD carrier frequencies

+maxUTRA-TDD-Carrier			INTEGER ::= 16	-- Maximum number of UTRA TDD carrier frequencies

+maxUTRA-CellInfo-r9			INTEGER ::=	16	-- Maximum number of cells for which system information

+											-- can be provided as redirection assistance

+

+

+END

diff --git a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
new file mode 100644
index 0000000000..fc244c30a2
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
@@ -0,0 +1,82 @@
+--
+-- %CopyrightBegin%
+--
+-- Copyright Ericsson AB 2001-2010. 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%
+
+Extension-Addition-Group DEFINITIONS AUTOMATIC TAGS ::=
+
+BEGIN
+
+-- fetched from ITU-T Rec. X691 (07/2002)
+
+Ax ::= SEQUENCE {
+    a INTEGER (250..253),
+    b BOOLEAN,
+    c CHOICE {
+        d INTEGER,
+	...,
+
+	[[
+	    e BOOLEAN,
+	    f IA5String
+	]],
+	...
+    },
+    ...,
+    [[
+        g NumericString (SIZE(3)),
+	h BOOLEAN OPTIONAL
+    ]]
+,
+    ...,
+    i BMPString OPTIONAL,
+    j PrintableString OPTIONAL
+
+}
+
+-- valAx Ax ::= { a 253, b TRUE, c e: TRUE, g "123", h TRUE }
+
+Ax2 ::= SEQUENCE {
+    a INTEGER (250..253),
+    b BOOLEAN,
+    ...,
+    ug NumericString
+
+}
+
+-- The value { a 253, b TRUE, c e: TRUE, g "123", h TRUE }
+-- is encoded in PER as
+-- Hexadecimal view
+-- 9E000180 010291A4
+
+-- is encoded in Unaligned PER as
+-- 9E000600 040A4690
+
+Ax3 ::= SEQUENCE {
+    a INTEGER (250..253),
+    b BOOLEAN,
+    s SEQUENCE {
+        sa INTEGER,
+	sb BOOLEAN,
+	...,
+	[[
+	    sextaddgroup INTEGER OPTIONAL
+	]]
+    }
+}
+
+-- { a 253, b TRUE, s {sa 17, sb TRUE, sextaddgroup 11}}
+END
diff --git a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
new file mode 100644
index 0000000000..5fcec23756
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
@@ -0,0 +1,132 @@
+%%%-------------------------------------------------------------------
+%%% File    : extensionAdditionGroup.erl
+%%% Author  : Kenneth Lundin
+%%% Description :
+%%%
+%%% Created : 18 May 2010 by kenneth
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2010. 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(extensionAdditionGroup).
+-include("Extension-Addition-Group.hrl").
+
+
+-compile(export_all).
+
+run(Erule) ->
+    Val = #'Ax'{a=253, b = true, c= {e,true}, g="123", h = true},
+    io:format("~p:~p~n",[Erule,Val]),
+    {ok,List}= asn1rt:encode('Extension-Addition-Group','Ax',Val),
+    Enc = iolist_to_binary(List),
+    io:format("~p~n",[Enc]),
+    {ok,Val2} = asn1rt:decode('Extension-Addition-Group','Ax',Enc),
+    io:format("~p~n",[Val2]),
+    case Val2 of
+	Val -> ok;
+	_ -> exit({expected,Val, got, Val2})
+    end.
+
+run2(Erule) ->
+    Val = #'Ax3'{a=253, b = true, s = #'Ax3_s'{sa = 11, sb = true, sextaddgroup = 17}},
+    io:format("~p:~p~n",[Erule,Val]),
+    {ok,List}= asn1rt:encode('Extension-Addition-Group','Ax3',Val),
+    Enc = iolist_to_binary(List),
+    io:format("~p~n",[Enc]),
+    {ok,Val2} = asn1rt:decode('Extension-Addition-Group','Ax3',Enc),
+    io:format("~p~n",[Val2]),
+    case Val2 of
+	Val -> ok;
+	_ -> exit({expected,Val, got, Val2})
+    end.
+
+run3(Erule) ->
+    Val = 
+{'RRC-DL-DCCH-Message',
+ {c1,
+  {rrcConnectionReconfiguration,
+   {'RRC-RRCConnectionReconfiguration',0,
+    {c1,
+     {'rrcConnectionReconfiguration-r8',
+      {'RRC-RRCConnectionReconfiguration-r8-IEs',
+       {'RRC-MeasConfig',asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
+        asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
+        asn1_NOVALUE,asn1_NOVALUE},
+       asn1_NOVALUE,
+       [[80,66,0,5,10,0,5,0,24,11,7,84,54,33,0,1,1,0,0,0,1,39,5,66,127,0,0,1],
+        []],
+       {'RRC-RadioResourceConfigDedicated',
+        [{'RRC-SRB-ToAddMod',1,
+          {explicitValue,
+           {am,
+            {'RRC-RLC-Config_am',
+             {'RRC-UL-AM-RLC',ms45,pInfinity,kBinfinity,t4},
+             {'RRC-DL-AM-RLC',ms35,ms0}}}},
+          {explicitValue,
+           {'RRC-LogicalChannelConfig',
+            {'RRC-LogicalChannelConfig_ul-SpecificParameters',3,infinity,
+             ms50,0},
+            asn1_NOVALUE}}}],
+        [{'RRC-DRB-ToAddMod',3,3,
+          {'RRC-PDCP-Config',infinity,
+           {'RRC-PDCP-Config_rlc-AM',false},
+           asn1_NOVALUE,
+           {notUsed,'NULL'}},
+          {am,
+           {'RRC-RLC-Config_am',
+            {'RRC-UL-AM-RLC',ms70,p256,kBinfinity,t4},
+            {'RRC-DL-AM-RLC',ms35,ms40}}},
+          3,
+          {'RRC-LogicalChannelConfig',
+           {'RRC-LogicalChannelConfig_ul-SpecificParameters',5,infinity,ms50,
+            1},
+           asn1_NOVALUE}},
+         {'RRC-DRB-ToAddMod',4,4,
+          {'RRC-PDCP-Config',infinity,
+           {'RRC-PDCP-Config_rlc-AM',false},
+           asn1_NOVALUE,
+           {notUsed,'NULL'}},
+          {am,
+           {'RRC-RLC-Config_am',
+            {'RRC-UL-AM-RLC',ms70,p256,kBinfinity,t4},
+            {'RRC-DL-AM-RLC',ms35,ms40}}},
+          4,
+          {'RRC-LogicalChannelConfig',
+           {'RRC-LogicalChannelConfig_ul-SpecificParameters',5,infinity,ms50,
+            1},
+           asn1_NOVALUE}}],
+        asn1_NOVALUE,
+        {explicitValue,
+         {'RRC-MAC-MainConfig',
+          {'RRC-MAC-MainConfig_ul-SCH-Config',n4,sf10,sf10240,false},
+          asn1_NOVALUE,sf500,
+          {setup,{'RRC-MAC-MainConfig_phr-Config_setup',sf200,sf200,dB3}},
+          asn1_NOVALUE}},
+        asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE},
+       asn1_NOVALUE,asn1_NOVALUE}}}}}}},
+        io:format("~p:~p~n",[Erule,Val]),
+    {ok,List}= asn1rt:encode('EUTRA-RRC-Definitions','DL-DCCH-Message',Val),
+    Enc = iolist_to_binary(List),
+    io:format("Result from encode:~n~p~n",[Enc]),
+    {ok,Val2} = asn1rt:decode('EUTRA-RRC-Definitions','DL-DCCH-Message',Enc),
+    io:format("Result from decode:~n~p~n",[Val2]),
+    case Val2 of
+	Val -> ok;
+	_ -> exit({expected,Val, got, Val2})
+    end.
+
diff --git a/lib/asn1/test/asn1_app_test.erl b/lib/asn1/test/asn1_app_test.erl
index 23a7e691e7..c3797f08b2 100644
--- a/lib/asn1/test/asn1_app_test.erl
+++ b/lib/asn1/test/asn1_app_test.erl
@@ -26,21 +26,24 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 fields,
-	 modules,
-	 exportall,
-	 app_depend
-	],
-    {req, [], {conf, app_init, Cases, app_fin}}.
+all() -> 
+    [fields, modules, exportall, app_depend].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-app_init(suite) -> [];
-app_init(doc) -> [];
-app_init(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
     case is_app(asn1) of
 	{ok, AppFile} ->
 	    io:format("AppFile: ~n~p~n", [AppFile]),
@@ -60,9 +63,9 @@ is_app(App) ->
     end.
 
 
-app_fin(suite) -> [];
-app_fin(doc) -> [];
-app_fin(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
diff --git a/lib/asn1/test/asn1_appup_test.erl b/lib/asn1/test/asn1_appup_test.erl
index 81701328a6..a2c1423eda 100644
--- a/lib/asn1/test/asn1_appup_test.erl
+++ b/lib/asn1/test/asn1_appup_test.erl
@@ -21,23 +21,29 @@
 %% Purpose: Verify the application specifics of the asn1 application
 %%----------------------------------------------------------------------
 -module(asn1_appup_test).
-
+-compile({no_auto_import,[error/1]}).
 -compile(export_all).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 appup
-	],
-    {req, [], {conf, appup_init, Cases, appup_fin}}.
+all() -> 
+    [appup].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-appup_init(suite) -> [];
-appup_init(doc) -> [];
-appup_init(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
     AppFile   = file_name(asn1, ".app"),
     AppupFile = file_name(asn1, ".appup"),
     [{app_file, AppFile}, {appup_file, AppupFile}|Config].
@@ -48,9 +54,9 @@ file_name(App, Ext) ->
     filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
 
 
-appup_fin(suite) -> [];
-appup_fin(doc) -> [];
-appup_fin(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
diff --git a/lib/asn1/test/asn1_bin_SUITE.erl b/lib/asn1/test/asn1_bin_SUITE.erl
new file mode 100644
index 0000000000..d8c5dd5b27
--- /dev/null
+++ b/lib/asn1/test/asn1_bin_SUITE.erl
@@ -0,0 +1,2382 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2010. 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%
+%%
+%%
+%%% Purpose : Test suite for the ASN.1 application
+
+-module(asn1_bin_SUITE).
+-define(PER,'per_bin').
+-define(BER,'ber_bin').
+-define(ber_driver(Erule,Func),
+	case Erule of
+           ber_bin_v2 ->
+		Func;
+	    _ -> ok
+	end).
+-define(per_optimize(Erule),
+	case Erule of
+	   ber_bin_v2 ->[optimize];
+           _ -> []
+	end).
+-define(per_bit_opt(FuncCall),
+	case ?BER of
+	   ber_bin_v2 -> FuncCall;
+%	   _ -> {skip,"only for bit optimized per_bin"}
+	   _ -> ok
+	end).
+-define(uper_bin(FuncCall),
+	case ?PER of
+	   per -> FuncCall;
+	   _ -> ok
+	end).
+
+-compile(export_all).
+%%-export([Function/Arity, ...]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+%% records used by test-case default
+-record('Def1',{bool0, bool1 = asn1_DEFAULT, 
+		bool2 = asn1_DEFAULT, 
+		bool3 = asn1_DEFAULT}).
+
+%-record('Def2',{
+%bool10, bool11 = asn1_DEFAULT, bool12 = asn1_DEFAULT, bool13}).
+
+%-record('Def3',{
+%bool30 = asn1_DEFAULT, bool31 = asn1_DEFAULT, bool32 = asn1_DEFAULT, bool33 = asn1_DEFAULT}).
+
+
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, compile}, parse, default_per, default_ber,
+     default_per_opt, per, {group, ber}, testPrim,
+     testPrimStrings, testPrimExternal, testChoPrim,
+     testChoExtension, testChoExternal, testChoOptional,
+     testChoOptionalImplicitTag, testChoRecursive,
+     testChoTypeRefCho, testChoTypeRefPrim,
+     testChoTypeRefSeq, testChoTypeRefSet, testDef, testOpt,
+     testSeqDefault, testSeqExtension, testSeqExternal,
+     testSeqOptional, testSeqPrim, testSeqTag,
+     testSeqTypeRefCho, testSeqTypeRefPrim,
+     testSeqTypeRefSeq, testSeqTypeRefSet, testSeqOf,
+     testSeqOfIndefinite, testSeqOfCho, testSeqOfExternal,
+     testSetDefault, testSetExtension,
+     testExtensionAdditionGroup, testSetExternal,
+     testSeqOfTag, testSetOptional, testSetPrim, testSetTag,
+     testSetTypeRefCho, testSetTypeRefPrim,
+     testSetTypeRefSeq, testSetTypeRefSet, testSetOf,
+     testSetOfCho, testSetOfExternal, testSetOfTag,
+     testEnumExt, value_test, testSeq2738, constructed,
+     ber_decode_error, h323test, testSeqIndefinite,
+     testSetIndefinite, testChoiceIndefinite,
+     per_GeneralString, per_open_type, testInfObjectClass,
+     testParameterizedInfObj, testMergeCompile, testobj,
+     testDeepTConstr, testConstraints, testInvokeMod,
+     testExport, testImport, testCompactBitString,
+     testMegaco, testParamBasic, testMvrasn6,
+     testContextSwitchingTypes, testTypeValueNotation,
+     testOpenTypeImplicitTag, duplicate_tags, rtUI, testROSE,
+     testINSTANCE_OF, testTCAP, testDER, specialized_decodes,
+     special_decode_performance, test_driver_load,
+     test_ParamTypeInfObj, test_WS_ParamClass,
+     test_Defed_ObjectIdentifier, testSelectionType,
+     testSSLspecs, testNortel, test_undecoded_rest,
+     test_inline, testTcapsystem, testNBAPsystem,
+     test_compile_options, testDoubleEllipses,
+     test_modified_x420, testX420, test_x691, ticket_6143,
+     testExtensionAdditionGroup] ++ common() ++ particular().
+
+groups() -> 
+    [{option_tests, [],
+      [test_compile_options, ticket_6143]},
+     {infobj, [],
+      [testInfObjectClass, testParameterizedInfObj,
+       testMergeCompile, testobj, testDeepTConstr]},
+     {performance, [],
+      [testTimer_ber, testTimer_ber_opt_driver, testTimer_per,
+       testTimer_per_opt, testTimer_uper_bin]},
+     {bugs, [],
+      [test_ParamTypeInfObj, test_WS_ParamClass,
+       test_Defed_ObjectIdentifier]},
+     {compile, [],
+      [c_syntax, c_string_per, c_string_ber,
+       c_implicit_before_choice]},
+     {ber, [],
+      [ber_choiceinseq, ber_optional, ber_optional_keyed_list,
+       ber_other]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+%all(suite) -> [test_inline,testNBAPsystem,test_compile_options,ticket_6143].
+
+init_per_testcase(Func,Config) ->
+    %%?line test_server:format("Func: ~p~n",[Func]),
+    ?line {ok, _} = file:read_file_info(filename:join([?config(priv_dir,Config)])),
+    ?line code:add_patha(?config(priv_dir,Config)),
+    Dog=
+    case Func of
+       testX420 ->
+           test_server:timetrap({minutes,60}); % 60 minutes
+       _ ->
+	   test_server:timetrap({minutes,30}) % 60 minutes
+    end,
+%%    Dog=test_server:timetrap(1800000), % 30 minutes
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Func,Config) ->
+          Dog=?config(watchdog, Config),
+          test_server:timetrap_cancel(Dog).
+
+
+testPrim(suite) -> [];
+testPrim(Config) ->
+    ?line testPrim:compile(Config,?BER,[]),
+    ?line testPrim_cases(?BER),
+    ?line ?ber_driver(?BER,testPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrim_cases(?BER)),
+    ?line testPrim:compile(Config,?PER,[]),
+    ?line testPrim_cases(?PER),
+    ?line ?per_bit_opt(testPrim:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testPrim_cases(?PER)),
+    ?line ?uper_bin(testPrim:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testPrim_cases(uper_bin)),
+    ?line testPrim:compile(Config,?PER,[optimize]),
+    ?line testPrim_cases(?PER).
+
+testPrim_cases(Rules) ->
+    ?line testPrim:bool(Rules),
+    ?line testPrim:int(Rules),
+    ?line testPrim:enum(Rules),
+    ?line testPrim:obj_id(Rules),
+    ?line testPrim:rel_oid(Rules),
+    ?line testPrim:null(Rules),
+    ?line testPrim:real(Rules).
+
+
+testCompactBitString(suite) -> [];
+testCompactBitString(Config) -> 
+
+    ?line testCompactBitString:compile(Config,?BER,[compact_bit_string]),
+    ?line testCompactBitString:compact_bit_string(?BER),
+
+    ?line ?ber_driver(?BER,testCompactBitString:compile(Config,?BER,[compact_bit_string,driver])),
+    ?line ?ber_driver(?BER,testCompactBitString:compact_bit_string(?BER)),
+
+    ?line testCompactBitString:compile(Config,?PER,[compact_bit_string]),
+    ?line testCompactBitString:compact_bit_string(?PER),
+    ?line testCompactBitString:bit_string_unnamed(?PER),
+
+    ?line ?per_bit_opt(testCompactBitString:compile(Config,?PER,
+					[compact_bit_string,optimize])),
+    ?line ?per_bit_opt(testCompactBitString:compact_bit_string(?PER)),
+    ?line ?per_bit_opt(testCompactBitString:bit_string_unnamed(?PER)),
+    ?line ?per_bit_opt(testCompactBitString:ticket_7734(?PER)),
+
+    ?line ?uper_bin(testCompactBitString:compile(Config,uper_bin,
+					[compact_bit_string])),
+    ?line ?uper_bin(testCompactBitString:compact_bit_string(uper_bin)),
+    ?line ?uper_bin(testCompactBitString:bit_string_unnamed(uper_bin)),
+
+    ?line testCompactBitString:compile(Config,?PER,[optimize,compact_bit_string]),
+    ?line testCompactBitString:compact_bit_string(?PER),
+    ?line testCompactBitString:bit_string_unnamed(?PER),
+
+    ?line testCompactBitString:otp_4869(?PER).
+
+
+testPrimStrings(suite) -> [];
+testPrimStrings(Config) ->
+
+    ?line testPrimStrings:compile(Config,?BER,[]),
+    ?line testPrimStrings_cases(?BER),
+    ?line testPrimStrings:more_strings(?BER), %% these are not implemented in per yet
+    ?line ?ber_driver(?BER,testPrimStrings:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrimStrings_cases(?BER)),
+    ?line ?ber_driver(?BER,testPrimStrings:more_strings(?BER)),
+
+    ?line testPrimStrings:compile(Config,?PER,[]),
+    ?line testPrimStrings_cases(?PER),
+
+    ?line ?per_bit_opt(testPrimStrings:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testPrimStrings_cases(?PER)),
+
+    ?line ?uper_bin(testPrimStrings:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testPrimStrings_cases(uper_bin)),
+
+    ?line testPrimStrings:compile(Config,?PER,[optimize]),
+    ?line testPrimStrings_cases(?PER).
+
+testPrimStrings_cases(Rules) ->
+    ?line testPrimStrings:bit_string(Rules),
+    ?line testPrimStrings:bit_string_unnamed(Rules),
+    ?line testPrimStrings:octet_string(Rules),
+    ?line testPrimStrings:numeric_string(Rules),
+    ?line testPrimStrings:other_strings(Rules),
+    ?line testPrimStrings:universal_string(Rules),
+    ?line testPrimStrings:bmp_string(Rules),
+    ?line testPrimStrings:times(Rules),
+    ?line testPrimStrings:utf8_string(Rules).
+    
+
+
+testPrimExternal(suite) -> [];
+testPrimExternal(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testPrimExternal:compile(Config,?BER,[]),
+    ?line testPrimExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrimExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrimExternal_cases(?BER)),
+    
+    ?line testExternal:compile(Config,?PER,[]),     
+    ?line testPrimExternal:compile(Config,?PER,[]), 
+    ?line testPrimExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),     
+    ?line ?per_bit_opt(testPrimExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testPrimExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),     
+    ?line ?uper_bin(testPrimExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testPrimExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),     
+    ?line testPrimExternal:compile(Config,?PER,[optimize]), 
+    ?line testPrimExternal_cases(?PER).
+
+testPrimExternal_cases(Rules) ->
+    ?line testPrimExternal:external(Rules).
+
+
+
+
+testChoPrim(suite) -> [];
+testChoPrim(Config) ->
+
+    ?line testChoPrim:compile(Config,?BER,[]),
+    ?line testChoPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoPrim_cases(?BER)),
+
+    ?line testChoPrim:compile(Config,?PER,[]), 
+    ?line testChoPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testChoPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoPrim_cases(?PER)),
+
+    ?line ?uper_bin(testChoPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoPrim_cases(uper_bin)),
+
+    ?line testChoPrim:compile(Config,?PER,[optimize]), 
+    ?line testChoPrim_cases(?PER).
+
+testChoPrim_cases(Rules) ->
+    ?line testChoPrim:bool(Rules),
+    ?line testChoPrim:int(Rules).
+
+
+
+testChoExtension(suite) -> [];
+testChoExtension(Config) ->
+
+    ?line testChoExtension:compile(Config,?BER,[]),
+    ?line testChoExtension_cases(?BER),          
+
+    ?line ?ber_driver(?BER,testChoExtension:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoExtension_cases(?BER)),
+
+    ?line testChoExtension:compile(Config,?PER,[]),
+    ?line testChoExtension_cases(?PER),          
+
+    ?line ?per_bit_opt(testChoExtension:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testChoExtension_cases(?PER)),
+
+    ?line ?uper_bin(testChoExtension:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testChoExtension_cases(uper_bin)),
+
+    ?line testChoExtension:compile(Config,?PER,[optimize]),
+    ?line testChoExtension_cases(?PER).          
+
+testChoExtension_cases(Rules) ->
+    ?line testChoExtension:extension(Rules).
+
+
+
+testChoExternal(suite) -> [];
+testChoExternal(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testChoExternal:compile(Config,?BER,[]),
+    ?line testChoExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoExternal_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testChoExternal:compile(Config,?PER,[]), 
+    ?line testChoExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testChoExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testChoExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testChoExternal:compile(Config,?PER,[optimize]), 
+    ?line testChoExternal_cases(?PER).
+
+
+testChoExternal_cases(Rules) ->
+    ?line testChoExternal:external(Rules).
+
+
+
+testChoOptional(suite) -> [];
+testChoOptional(Config) ->
+
+    ?line testChoOptional:compile(Config,?BER,[]),
+    ?line testChoOptional_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoOptional:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoOptional_cases(?BER)),
+
+    ?line testChoOptional:compile(Config,?PER,[]), 
+    ?line testChoOptional_cases(?PER),
+
+    ?line ?per_bit_opt(testChoOptional:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoOptional_cases(?PER)),
+
+    ?line ?uper_bin(testChoOptional:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoOptional_cases(uper_bin)),
+
+    ?line testChoOptional:compile(Config,?PER,[optimize]), 
+    ?line testChoOptional_cases(?PER).
+
+testChoOptional_cases(Rules) ->
+    ?line testChoOptional:optional(Rules).
+
+testChoOptionalImplicitTag(suite) -> [];
+testChoOptionalImplicitTag(Config) ->
+    %% Only meaningful for ?BER
+    ?line testChoOptionalImplicitTag:compile(Config,?BER),
+    ?line testChoOptionalImplicitTag:optional(?BER).
+
+
+testChoRecursive(suite) -> [];
+testChoRecursive(Config) ->
+
+    ?line testChoRecursive:compile(Config,?BER,[]),
+    ?line testChoRecursive_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoRecursive:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoRecursive_cases(?BER)),
+
+    ?line testChoRecursive:compile(Config,?PER,[]), 
+    ?line testChoRecursive_cases(?PER),
+
+    ?line ?per_bit_opt(testChoRecursive:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoRecursive_cases(?PER)),
+
+    ?line ?uper_bin(testChoRecursive:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoRecursive_cases(uper_bin)),
+
+    ?line testChoRecursive:compile(Config,?PER,[optimize]), 
+    ?line testChoRecursive_cases(?PER).
+
+testChoRecursive_cases(Rules) ->
+    ?line testChoRecursive:recursive(Rules).
+
+
+
+testChoTypeRefCho(suite) -> [];
+testChoTypeRefCho(Config) ->
+
+    ?line testChoTypeRefCho:compile(Config,?BER,[]),
+    ?line testChoTypeRefCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefCho_cases(?BER)),
+
+    ?line testChoTypeRefCho:compile(Config,?PER,[]), 
+    ?line testChoTypeRefCho_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefCho_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefCho_cases(uper_bin)),
+
+    ?line testChoTypeRefCho:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefCho_cases(?PER).
+
+testChoTypeRefCho_cases(Rules) ->
+    ?line testChoTypeRefCho:choice(Rules).
+
+
+
+testChoTypeRefPrim(suite) -> [];
+testChoTypeRefPrim(Config) ->
+
+    ?line testChoTypeRefPrim:compile(Config,?BER,[]),
+    ?line testChoTypeRefPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefPrim_cases(?BER)),
+
+    ?line testChoTypeRefPrim:compile(Config,?PER,[]), 
+    ?line testChoTypeRefPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefPrim_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefPrim_cases(uper_bin)),
+
+    ?line testChoTypeRefPrim:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefPrim_cases(?PER).
+
+testChoTypeRefPrim_cases(Rules) ->
+    ?line testChoTypeRefPrim:prim(Rules).
+
+
+
+testChoTypeRefSeq(suite) -> [];
+testChoTypeRefSeq(Config) ->
+
+    ?line testChoTypeRefSeq:compile(Config,?BER,[]),
+    ?line testChoTypeRefSeq_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefSeq:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefSeq_cases(?BER)),
+
+    ?line testChoTypeRefSeq:compile(Config,?PER,[]), 
+    ?line testChoTypeRefSeq_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefSeq:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefSeq_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefSeq:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefSeq_cases(uper_bin)),
+
+    ?line testChoTypeRefSeq:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefSeq_cases(?PER).
+
+testChoTypeRefSeq_cases(Rules) ->
+    ?line testChoTypeRefSeq:seq(Rules).
+
+
+
+testChoTypeRefSet(suite) -> [];
+testChoTypeRefSet(Config) ->
+
+    ?line testChoTypeRefSet:compile(Config,?BER,[]),
+    ?line testChoTypeRefSet_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefSet:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefSet_cases(?BER)),
+
+    ?line testChoTypeRefSet:compile(Config,?PER,[]), 
+    ?line testChoTypeRefSet_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefSet:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefSet_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefSet:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefSet_cases(uper_bin)),
+
+    ?line testChoTypeRefSet:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefSet_cases(?PER).
+
+testChoTypeRefSet_cases(Rules) ->
+    ?line testChoTypeRefSet:set(Rules).
+
+
+
+testDef(suite) -> [];
+testDef(Config) ->
+
+    ?line testDef:compile(Config,?BER,[]),
+    ?line testDef_cases(?BER),
+
+    ?line ?ber_driver(?BER,testDef:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDef_cases(?BER)),
+
+    ?line testDef:compile(Config,?PER,[]), 
+    ?line testDef_cases(?PER),
+
+    ?line ?per_bit_opt(testDef:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testDef_cases(?PER)),
+
+    ?line ?uper_bin(testDef:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testDef_cases(uper_bin)),
+
+    ?line testDef:compile(Config,?PER,[optimize]), 
+    ?line testDef_cases(?PER).
+
+testDef_cases(Rules) ->
+    ?line testDef:main(Rules).
+
+
+
+testOpt(suite) -> [];
+testOpt(Config) ->
+
+    ?line testOpt:compile(Config,?BER),
+    ?line testOpt_cases(?BER),
+
+    ?line testOpt:compile(Config,?PER), 
+    ?line testOpt_cases(?PER).          
+
+testOpt_cases(Rules) ->
+    ?line testOpt:main(Rules).
+
+
+testEnumExt(suite) -> [];
+testEnumExt(Config) ->
+
+    ?line testEnumExt:compile(Config,?BER,[]),
+    ?line testEnumExt:main(?BER),
+
+    ?line ?ber_driver(?BER,testEnumExt:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testEnumExt:main(?BER)),
+
+    ?line testEnumExt:compile(Config,?PER,[]),
+    ?line testEnumExt:main(?PER),
+
+    ?line ?per_bit_opt(testEnumExt:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testEnumExt:main(?PER)),
+
+    ?line ?uper_bin(testEnumExt:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testEnumExt:main(uper_bin)),
+
+    ?line testEnumExt:compile(Config,?PER,[optimize]),
+    ?line testEnumExt:main(?PER).
+
+testSeqDefault(doc) -> ["Test of OTP-2523 ENUMERATED with extensionmark."];
+testSeqDefault(suite) -> [];
+testSeqDefault(Config) ->
+
+    ?line testSeqDefault:compile(Config,?BER,[]),
+    ?line testSeqDefault_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqDefault:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqDefault_cases(?BER)),
+
+    ?line testSeqDefault:compile(Config,?PER,[]), 
+    ?line testSeqDefault_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqDefault:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqDefault_cases(?PER)),
+
+    ?line ?uper_bin(testSeqDefault:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqDefault_cases(uper_bin)),
+
+    ?line testSeqDefault:compile(Config,?PER,[optimize]), 
+    ?line testSeqDefault_cases(?PER).
+
+testSeqDefault_cases(Rules) ->
+    ?line testSeqDefault:main(Rules).
+
+
+
+testSeqExtension(suite) -> [];
+testSeqExtension(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqExtension:compile(Config,?BER,[]),
+    ?line testSeqExtension_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExtension:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExtension_cases(?BER)).
+
+testSeqExtension_cases(Rules) ->
+    ?line testSeqExtension:main(Rules).
+
+
+
+testSeqExternal(suite) -> [];
+testSeqExternal(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqExternal:compile(Config,?BER,[]),
+    ?line testSeqExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExternal_cases(?BER)).
+
+testSeqExternal_cases(Rules) ->
+    ?line testSeqExternal:main(Rules).
+
+
+testSeqOptional(suite) -> [];
+testSeqOptional(Config) ->
+
+    ?line testSeqOptional:compile(Config,?BER,[]),
+    ?line testSeqOptional_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqOptional:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOptional_cases(?BER)),
+
+    ?line testSeqOptional:compile(Config,?PER,[]), 
+    ?line testSeqOptional_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqOptional:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOptional_cases(?PER)),
+
+    ?line ?uper_bin(testSeqOptional:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOptional_cases(uper_bin)),
+
+    ?line testSeqOptional:compile(Config,?PER,[optimize]), 
+    ?line testSeqOptional_cases(?PER).
+
+testSeqOptional_cases(Rules) ->
+    ?line testSeqOptional:main(Rules).
+
+
+
+testSeqPrim(suite) -> [];
+testSeqPrim(Config) ->
+
+    ?line testSeqPrim:compile(Config,?BER,[]),
+    ?line testSeqPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqPrim_cases(?BER)),
+
+    ?line testSeqPrim:compile(Config,?PER,[]), 
+    ?line testSeqPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSeqPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqPrim_cases(uper_bin)),
+
+    ?line testSeqPrim:compile(Config,?PER,[optimize]), 
+    ?line testSeqPrim_cases(?PER).
+
+testSeqPrim_cases(Rules) ->
+    ?line testSeqPrim:main(Rules).
+
+
+testSeq2738(doc) -> ["Test of OTP-2738 Detect corrupt optional component."];
+testSeq2738(suite) -> [];
+testSeq2738(Config) ->
+
+    ?line testSeq2738:compile(Config,?BER,[]),
+    ?line testSeq2738_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeq2738:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeq2738_cases(?BER)),
+
+    ?line testSeq2738:compile(Config,?PER,[]), 
+    ?line testSeq2738_cases(?PER),
+
+    ?line ?per_bit_opt(testSeq2738:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeq2738_cases(?PER)),
+
+    ?line ?uper_bin(testSeq2738:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeq2738_cases(uper_bin)),
+
+    ?line testSeq2738:compile(Config,?PER,[optimize]), 
+    ?line testSeq2738_cases(?PER).
+
+testSeq2738_cases(Rules) ->
+    ?line testSeq2738:main(Rules).
+
+
+testSeqTag(suite) -> [];
+testSeqTag(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqTag:compile(Config,?BER,[]),
+    ?line testSeqTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSeqTag:compile(Config,?PER,[]), 
+    ?line testSeqTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSeqTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSeqTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSeqTag:compile(Config,?PER,[optimize]), 
+    ?line testSeqTag_cases(?PER).
+
+testSeqTag_cases(Rules) ->
+    ?line testSeqTag:main(Rules).
+
+
+
+
+testSeqTypeRefCho(suite) -> [];
+testSeqTypeRefCho(Config) ->
+
+    ?line testSeqTypeRefCho:compile(Config,?BER,[]),
+    ?line testSeqTypeRefCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefCho_cases(?BER)),
+
+    ?line testSeqTypeRefCho:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefCho_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefCho_cases(uper_bin)),
+
+    ?line testSeqTypeRefCho:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefCho_cases(?PER).
+
+testSeqTypeRefCho_cases(Rules) ->
+    ?line testSeqTypeRefCho:main(Rules).
+
+
+
+testSeqTypeRefPrim(suite) -> [];
+testSeqTypeRefPrim(Config) ->
+
+    ?line testSeqTypeRefPrim:compile(Config,?BER,[]),
+    ?line testSeqTypeRefPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefPrim_cases(?BER)),
+
+    ?line testSeqTypeRefPrim:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefPrim_cases(uper_bin)),
+
+    ?line testSeqTypeRefPrim:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefPrim_cases(?PER).
+
+testSeqTypeRefPrim_cases(Rules) ->
+    ?line testSeqTypeRefPrim:main(Rules).
+
+
+
+testSeqTypeRefSeq(suite) -> [];
+testSeqTypeRefSeq(Config) ->
+
+    ?line testSeqTypeRefSeq:compile(Config,?BER,[]),
+    ?line testSeqTypeRefSeq_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefSeq:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefSeq_cases(?BER)),
+
+    ?line testSeqTypeRefSeq:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefSeq_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefSeq:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefSeq_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefSeq:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefSeq_cases(uper_bin)),
+
+    ?line testSeqTypeRefSeq:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefSeq_cases(?PER).
+
+testSeqTypeRefSeq_cases(Rules) ->
+    ?line testSeqTypeRefSeq:main(Rules).
+
+
+
+testSeqTypeRefSet(suite) -> [];
+testSeqTypeRefSet(Config) ->
+
+    ?line testSeqTypeRefSet:compile(Config,?BER,[]),
+    ?line testSeqTypeRefSet_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefSet:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefSet_cases(?BER)),
+
+    ?line testSeqTypeRefSet:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefSet_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefSet:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefSet_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefSet:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefSet_cases(uper_bin)),
+
+    ?line testSeqTypeRefSet:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefSet_cases(?PER).
+
+testSeqTypeRefSet_cases(Rules) ->
+    ?line testSeqTypeRefSet:main(Rules).
+
+
+
+
+testSeqOf(suite) -> [];
+testSeqOf(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqOf:compile(Config,?BER,[]),
+    ?line testSeqOf_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqOf:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOf_cases(?BER)),
+
+    ?line testSeqOf:compile(Config,?PER,[]), 
+    ?line testSeqOf_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqOf:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOf_cases(?PER)),
+
+    ?line ?uper_bin(testSeqOf:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOf_cases(uper_bin)),
+
+    ?line testSeqOf:compile(Config,?PER,[optimize]), 
+    ?line testSeqOf_cases(?PER).
+
+testSeqOf_cases(Rules) ->
+    ?line testSeqOf:main(Rules).
+
+
+
+
+testSeqOfCho(suite) -> [];
+testSeqOfCho(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqOfCho:compile(Config,?BER,[]),
+    ?line testSeqOfCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqOfCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfCho_cases(?BER)),
+
+    ?line testSeqOfCho:compile(Config,?PER,[]), 
+    ?line testSeqOfCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqOfCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOfCho_cases(?PER)),
+
+    ?line ?uper_bin(testSeqOfCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOfCho_cases(uper_bin)),
+
+    ?line testSeqOfCho:compile(Config,?PER,[optimize]), 
+    ?line testSeqOfCho_cases(?PER).
+
+testSeqOfIndefinite(suite) -> [];
+testSeqOfIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqOfIndefinite:compile(Config,?BER,[]),
+    ?line testSeqOfIndefinite:main(),
+
+    ?line ?ber_driver(?BER,testSeqOfIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfIndefinite:main()).
+
+testSeqOfCho_cases(Rules) ->
+    ?line testSeqOfCho:main(Rules).
+
+
+testSeqOfExternal(suite) -> [];
+testSeqOfExternal(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqOfExternal:compile(Config,?BER,[]),
+    ?line testSeqOfExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfExternal_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSeqOfExternal:compile(Config,?PER,[]), 
+    ?line testSeqOfExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSeqOfExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOfExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSeqOfExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOfExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSeqOfExternal:compile(Config,?PER,[optimize]), 
+    ?line testSeqOfExternal_cases(?PER).
+
+testSeqOfExternal_cases(Rules) ->
+    ?line testSeqOfExternal:main(Rules).
+
+
+
+testSeqOfTag(suite) -> [];
+testSeqOfTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqOfTag:compile(Config,?BER,[]),
+    ?line testSeqOfTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSeqOfTag:compile(Config,?PER,[]), 
+    ?line testSeqOfTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSeqOfTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOfTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSeqOfTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOfTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSeqOfTag:compile(Config,?PER,[optimize]), 
+    ?line testSeqOfTag_cases(?PER).
+
+testSeqOfTag_cases(Rules) ->
+    ?line testSeqOfTag:main(Rules).
+
+
+
+
+testSetDefault(suite) -> [];
+testSetDefault(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetDefault:compile(Config,?BER,[]),
+    ?line testSetDefault_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetDefault:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetDefault_cases(?BER)),
+
+    ?line testSetDefault:compile(Config,?PER,[]), 
+    ?line testSetDefault_cases(?PER),
+
+    ?line ?per_bit_opt(testSetDefault:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetDefault_cases(?PER)),
+
+    ?line ?uper_bin(testSetDefault:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetDefault_cases(uper_bin)),
+
+    ?line testSetDefault:compile(Config,?PER,[optimize]), 
+    ?line testSetDefault_cases(?PER).
+
+testSetDefault_cases(Rules) ->
+    ?line testSetDefault:main(Rules).
+
+
+testParamBasic(suite) -> [];
+testParamBasic(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testParamBasic:compile(Config,?BER,[]),
+    ?line testParamBasic_cases(?BER),
+
+    ?line ?ber_driver(?BER,testParamBasic:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testParamBasic_cases(?BER)),
+
+    ?line testParamBasic:compile(Config,?PER,[]),
+    ?line testParamBasic_cases(?PER),
+
+    ?line ?per_bit_opt(testParamBasic:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testParamBasic_cases(?PER)),
+
+    ?line ?uper_bin(testParamBasic:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testParamBasic_cases(uper_bin)),
+
+    ?line testParamBasic:compile(Config,?PER,[optimize]),
+    ?line testParamBasic_cases(?PER).
+
+
+testParamBasic_cases(Rules) ->
+    ?line testParamBasic:main(Rules).
+
+testSetExtension(suite) -> [];
+testSetExtension(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetExtension:compile(Config,?BER,[]),
+    ?line testSetExtension_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExtension:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExtension_cases(?BER)).
+
+testSetExtension_cases(Rules) ->
+    ?line testSetExtension:main(Rules).
+
+
+testSetExternal(suite) -> [];
+testSetExternal(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetExternal:compile(Config,?BER,[]),
+    ?line testSetExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExternal_cases(?BER)).
+
+testSetExternal_cases(Rules) ->
+    ?line testSetExternal:main(Rules).
+
+
+testSetOptional(suite) -> [];
+testSetOptional(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetOptional:compile(Config,?BER,[]),
+    ?line testSetOptional_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetOptional:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOptional_cases(?BER)),
+
+    ?line testSetOptional:compile(Config,?PER,[]), 
+    ?line testSetOptional_cases(?PER),
+
+    ?line ?per_bit_opt(testSetOptional:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOptional_cases(?PER)),
+
+    ?line ?uper_bin(testSetOptional:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOptional_cases(uper_bin)),
+
+    ?line testSetOptional:compile(Config,?PER,[optimize]), 
+    ?line testSetOptional_cases(?PER).
+
+testSetOptional_cases(Rules) ->
+    ?line ok = testSetOptional:ticket_7533(Rules),
+    ?line ok = testSetOptional:main(Rules).
+
+
+
+
+testSetPrim(suite) -> [];
+testSetPrim(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetPrim:compile(Config,?BER,[]),
+    ?line testSetPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetPrim_cases(?BER)),
+
+    ?line testSetPrim:compile(Config,?PER,[]), 
+    ?line testSetPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSetPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSetPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetPrim_cases(uper_bin)),
+
+    ?line testSetPrim:compile(Config,?PER,[optimize]), 
+    ?line testSetPrim_cases(?PER).
+
+testSetPrim_cases(Rules) ->
+    ?line testSetPrim:main(Rules).
+
+
+
+testSetTag(suite) -> [];
+testSetTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetTag:compile(Config,?BER,[]),
+    ?line testSetTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSetTag:compile(Config,?PER,[]), 
+    ?line testSetTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSetTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSetTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSetTag:compile(Config,?PER,[optimize]), 
+    ?line testSetTag_cases(?PER).
+
+testSetTag_cases(Rules) ->
+    ?line testSetTag:main(Rules).
+
+
+
+testSetTypeRefCho(suite) -> [];
+testSetTypeRefCho(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefCho:compile(Config,?BER,[]),
+    ?line testSetTypeRefCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefCho_cases(?BER)),
+
+    ?line testSetTypeRefCho:compile(Config,?PER,[]), 
+    ?line testSetTypeRefCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefCho_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefCho_cases(uper_bin)),
+
+    ?line testSetTypeRefCho:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefCho_cases(?PER).
+
+testSetTypeRefCho_cases(Rules) ->
+    ?line testSetTypeRefCho:main(Rules).
+
+
+
+testSetTypeRefPrim(suite) -> [];
+testSetTypeRefPrim(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefPrim:compile(Config,?BER,[]),
+    ?line testSetTypeRefPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefPrim_cases(?BER)),
+
+    ?line testSetTypeRefPrim:compile(Config,?PER,[]), 
+    ?line testSetTypeRefPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefPrim_cases(uper_bin)),
+
+    ?line testSetTypeRefPrim:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefPrim_cases(?PER).
+
+testSetTypeRefPrim_cases(Rules) ->
+    ?line testSetTypeRefPrim:main(Rules).
+
+
+
+testSetTypeRefSeq(suite) -> [];
+testSetTypeRefSeq(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefSeq:compile(Config,?BER,[]),
+    ?line testSetTypeRefSeq_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefSeq:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefSeq_cases(?BER)),
+
+    ?line testSetTypeRefSeq:compile(Config,?PER,[]), 
+    ?line testSetTypeRefSeq_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefSeq:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefSeq_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefSeq:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefSeq_cases(uper_bin)),
+
+    ?line testSetTypeRefSeq:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefSeq_cases(?PER).
+
+testSetTypeRefSeq_cases(Rules) ->
+    ?line testSetTypeRefSeq:main(Rules).
+
+
+
+testSetTypeRefSet(suite) -> [];
+testSetTypeRefSet(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefSet:compile(Config,?BER,[]),
+    ?line testSetTypeRefSet_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefSet:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefSet_cases(?BER)),
+
+    ?line testSetTypeRefSet:compile(Config,?PER,[]), 
+    ?line testSetTypeRefSet_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefSet:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefSet_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefSet:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefSet_cases(uper_bin)),
+
+    ?line testSetTypeRefSet:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefSet_cases(?PER).
+
+testSetTypeRefSet_cases(Rules) ->
+    ?line testSetTypeRefSet:main(Rules).
+
+
+
+testSetOf(suite) -> [];
+testSetOf(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetOf:compile(Config,?BER,[]),
+    ?line testSetOf_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetOf:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOf_cases(?BER)),
+
+    ?line testSetOf:compile(Config,?PER,[]), 
+    ?line testSetOf_cases(?PER),
+
+    ?line ?per_bit_opt(testSetOf:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOf_cases(?PER)),
+
+    ?line ?uper_bin(testSetOf:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOf_cases(uper_bin)),
+
+    ?line testSetOf:compile(Config,?PER,[optimize]), 
+    ?line testSetOf_cases(?PER).
+
+testSetOf_cases(Rules) ->
+    ?line testSetOf:main(Rules).
+
+
+
+testSetOfCho(suite) -> [];
+testSetOfCho(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetOfCho:compile(Config,?BER,[]),
+    ?line testSetOfCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetOfCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfCho_cases(?BER)),
+
+    ?line testSetOfCho:compile(Config,?PER,[]), 
+    ?line testSetOfCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSetOfCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOfCho_cases(?PER)),
+
+    ?line ?uper_bin(testSetOfCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOfCho_cases(uper_bin)),
+
+    ?line testSetOfCho:compile(Config,?PER,[optimize]), 
+    ?line testSetOfCho_cases(?PER).
+
+testSetOfCho_cases(Rules) ->
+    ?line testSetOfCho:main(Rules).
+
+
+testSetOfExternal(suite) -> [];
+testSetOfExternal(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetOfExternal:compile(Config,?BER,[]),
+    ?line testSetOfExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfExternal_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSetOfExternal:compile(Config,?PER,[]), 
+    ?line testSetOfExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSetOfExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOfExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSetOfExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOfExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSetOfExternal:compile(Config,?PER,[optimize]), 
+    ?line testSetOfExternal_cases(?PER).
+
+testSetOfExternal_cases(Rules) ->
+    ?line testSetOfExternal:main(Rules).
+
+
+
+
+testSetOfTag(suite) -> [];
+testSetOfTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetOfTag:compile(Config,?BER,[]),
+    ?line testSetOfTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSetOfTag:compile(Config,?PER,[]), 
+    ?line testSetOfTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSetOfTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOfTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSetOfTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOfTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSetOfTag:compile(Config,?PER,[optimize]), 
+    ?line testSetOfTag_cases(?PER).
+
+testSetOfTag_cases(Rules) ->
+    ?line testSetOfTag:main(Rules).
+
+
+c_syntax(suite) -> [];
+c_syntax(Config) ->
+    ?line DataDir%    ?line testExternal:compile(Config,?PER),     
+%    ?line testPrimExternal:compile(Config,?PER), 
+%    ?line testPrimExternal_cases(?PER).          
+ = ?config(data_dir,Config),
+    ?line _TempDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line {error,_R1} = asn1ct:compile(filename:join(DataDir,"Syntax")),
+    ?line {error,_R2} = asn1ct:compile(filename:join(DataDir,"BadTypeEnding")),
+    ?line {error,_R3} = asn1ct:compile(filename:join(DataDir,
+						    "BadValueAssignment1")),
+    ?line {error,_R4} = asn1ct:compile(filename:join(DataDir,
+                                                    "BadValueAssignment2")),
+    ?line {error,_R5} = asn1ct:compile(filename:join(DataDir,
+						    "BadValueSet")),
+    ?line {error,_R6} = asn1ct:compile(filename:join(DataDir,
+						    "ChoiceBadExtension")),
+    ?line {error,_R7} = asn1ct:compile(filename:join(DataDir,
+						"EnumerationBadExtension")),
+    ?line {error,_R8} = asn1ct:compile(filename:join(DataDir,
+						    "Example")),
+    ?line {error,_R9} = asn1ct:compile(filename:join(DataDir,
+						    "Export1")),
+    ?line {error,_R10} = asn1ct:compile(filename:join(DataDir,
+						     "MissingEnd")),
+    ?line {error,_R11} = asn1ct:compile(filename:join(DataDir,
+						     "SequenceBadComma")),
+    ?line {error,_R12} = asn1ct:compile(filename:join(DataDir,
+						"SequenceBadComponentName")),
+    ?line {error,_R13} = asn1ct:compile(filename:join(DataDir,
+						"SequenceBadComponentType")),
+    ?line {error,_R14} = asn1ct:compile(filename:join(DataDir,
+						"SeqBadComma")).
+
+
+c_string_per(suite) -> [];
+c_string_per(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line TempDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"String"),[?PER,{outdir,TempDir}]).
+
+c_string_ber(suite) -> [];
+c_string_ber(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line TempDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"String"),[?BER,{outdir,TempDir}]).
+
+
+c_implicit_before_choice(suite) -> [];
+c_implicit_before_choice(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line TempDir = ?config(priv_dir,Config),
+    ?line {error,_R2} = asn1ct:compile(filename:join(DataDir,"CCSNARG3"),[?BER,{outdir,TempDir}]).
+
+parse(suite) -> [];
+parse(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    M1 = test_modules(),
+%    M2 = parse_modules(),
+    ?line ok = parse1(M1,DataDir,OutDir).
+
+parse1([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[abs,{outdir,OutDir}]),
+    parse1(T,DataDir,OutDir);
+parse1([],_,_) ->
+    ok.
+
+per(suite) -> [];
+per(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = per1(per_modules(),DataDir,OutDir),
+    ?line ?per_bit_opt(per1_bit_opt(per_modules(),DataDir,OutDir)),
+    ?line ok = per1_opt(per_modules(),DataDir,OutDir).
+
+
+per1([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?PER,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    per1(T,DataDir,OutDir);
+per1([],_,_) ->
+    ok.
+
+per1_bit_opt([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?PER,optimize,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    per1_bit_opt(T,DataDir,OutDir);
+per1_bit_opt([],_,_) ->
+    ok.
+
+per1_opt([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?PER,optimized,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    per1_opt(T,DataDir,OutDir);
+per1_opt([],_,_) ->
+    ok.
+
+
+ber_choiceinseq(suite) ->[];
+ber_choiceinseq(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"ChoiceInSeq"),[?BER,{outdir,OutDir}]).
+
+ber_optional(suite) ->[];
+ber_optional(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"SOpttest"),[?BER,{outdir,OutDir}]),
+    ?line V = {'S',{'A',10,asn1_NOVALUE,asn1_NOVALUE},
+	 {'B',asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE},
+	 {'C',asn1_NOVALUE,111,asn1_NOVALUE}},
+    ?line {ok,B} = asn1_wrapper:encode('SOpttest','S',V),
+    ?line Bytes = lists:flatten(B),
+    ?line V2 = asn1_wrapper:decode('SOpttest','S',Bytes),
+    ?line ok = eq(V,element(2,V2)).
+
+ber_optional_keyed_list(suite) ->[];
+ber_optional_keyed_list(Config) ->
+    case ?BER of
+	ber_bin_v2 -> ok;
+	_ ->
+    	   ?line DataDir = ?config(data_dir,Config),
+    	   ?line OutDir = ?config(priv_dir,Config),
+    	   ?line true = code:add_patha(?config(priv_dir,Config)),
+    	   ?line ok = asn1ct:compile(filename:join(DataDir,"SOpttest"),
+			      [?BER,keyed_list,{outdir,OutDir}]),
+    	   ?line Vrecord = {'S',{'A',10,asn1_NOVALUE,asn1_NOVALUE},
+	      {'B',asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE},
+	      {'C',asn1_NOVALUE,111,asn1_NOVALUE}},
+    	   ?line V = [ {a,[{scriptKey,10}]},
+		       {b,[]},
+		       {c,[{callingPartysCategory,111}]} ],
+    	   ?line {ok,B} = asn1_wrapper:encode('SOpttest','S',V),
+    	   ?line Bytes = lists:flatten(B),
+    	   ?line V2 = asn1_wrapper:decode('SOpttest','S',Bytes),
+    	   ?line ok = eq(Vrecord,element(2,V2))
+    end.
+
+
+eq(V,V) ->
+    ok.
+
+
+ber_other(suite) ->[];
+ber_other(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = ber1(ber_modules(),DataDir,OutDir).
+
+
+ber1([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?BER,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    ber1(T,DataDir,OutDir);
+ber1([],_,_) ->
+    ok.
+
+default_per(suite) ->[];
+default_per(Config) ->
+    default1(?PER,Config,[]).
+
+default_per_opt(suite) -> [];
+default_per_opt(Config) ->
+    ?per_bit_opt(default1(?PER,Config,[optimize])),
+    default1(?PER,Config,[optimize]).
+
+default_ber(suite) ->[];
+default_ber(Config) ->
+    default1(?BER,Config,[]).
+
+default1(Rule,Config,Options) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(DataDir ++ "Def",[Rule,{outdir,OutDir}]++Options),
+    ?line {ok,Bytes1} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true,
+						 bool1 = true,
+						 bool2 = true,
+						 bool3 = true}),
+    ?line {ok,{'Def1',true,true,true,true}} = asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes1)),
+    
+    ?line {ok,Bytes2} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true}),
+    ?line {ok,{'Def1',true,false,false,false}} = asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes2)),
+
+    ?line {ok,Bytes3} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true,bool2=false}),
+    ?line {ok,{'Def1',true,false,false,false}} = asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes3)).
+    
+    
+value_test(suite) ->[];
+value_test(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(DataDir ++ "ObjIdValues",[?BER,{outdir,OutDir}]),
+    ?line {ok,_} = asn1_wrapper:encode('ObjIdValues','ObjIdType','ObjIdValues':'mobileDomainId'()),
+    ?line ok = asn1ct:compile(DataDir ++ "ObjIdValues",[?PER,{outdir,OutDir}]),
+    ?line {ok,_} = asn1_wrapper:encode('ObjIdValues','ObjIdType','ObjIdValues':'mobileDomainId'()),
+    ?line ok = test_bad_values:tests(Config),
+    ok.
+
+
+constructed(suite) ->
+     [];
+constructed(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(DataDir ++ "Constructed",[?BER,{outdir,OutDir}]),
+    ?line {ok,B} = asn1_wrapper:encode('Constructed','S',{'S',false}),
+    ?line [40,3,1,1,0] = lists:flatten(B),
+    ?line {ok,B1} = asn1_wrapper:encode('Constructed','S2',{'S2',false}),
+    ?line [40,5,48,3,1,1,0] = lists:flatten(B1),
+    ?line {ok,B2} = asn1_wrapper:encode('Constructed','I',10),
+    ?line [136,1,10] = lists:flatten(B2),
+    ok.
+    
+ber_decode_error(suite) -> [];
+ber_decode_error(Config) ->
+    ?line ok = ber_decode_error:compile(Config,?BER,[]),
+    ?line ok = ber_decode_error:run([]),
+
+    ?line ok = ?ber_driver(?BER,ber_decode_error:compile(Config,?BER,[driver])),
+    ?line ok = ?ber_driver(?BER,ber_decode_error:run([driver])),
+	ok.   
+
+h323test(suite) -> 
+    [];
+h323test(Config) ->
+    ?line ok = h323test:compile(Config,?PER,[]),
+    ?line ok = h323test:run(?PER),
+    ?line ?per_bit_opt(h323test:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(h323test:run(?PER)),
+    ?line ?uper_bin(h323test:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(h323test:run(uper_bin)),
+    ?line ok = h323test:compile(Config,?PER,[optimize]),
+    ?line ok = h323test:run(?PER),
+    ok.
+
+per_GeneralString(suite) ->
+     [];
+per_GeneralString(Config) ->
+    case erlang:module_loaded('MULTIMEDIA-SYSTEM-CONTROL') of
+	true ->
+	    ok;
+	false ->
+	    h323test:compile(Config,?PER,[])
+    end,
+    UI = [109,64,1,57],
+    ?line {ok,_V} = asn1_wrapper:decode('MULTIMEDIA-SYSTEM-CONTROL',
+				 'MultimediaSystemControlMessage',UI).
+
+per_open_type(suite) ->
+    [];
+per_open_type(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line ok = asn1ct:compile(DataDir ++ "OpenType",[?PER,{outdir,OutDir}]),
+    Stype = {'Stype',10,true},
+    ?line {ok,Bytes} = asn1_wrapper:encode('OpenType','Ot',Stype),
+    ?line {ok,Stype} = asn1_wrapper:decode('OpenType','Ot',Bytes),
+
+    ?line ?per_bit_opt(ok = asn1ct:compile(DataDir ++ "OpenType",
+			      [?PER,optimize,{outdir,OutDir}])),
+    ?line ?per_bit_opt({ok,Bytes}=asn1_wrapper:encode('OpenType','Ot',Stype)),
+    ?line ?per_bit_opt({ok,Stype}=asn1_wrapper:decode('OpenType','Ot',Bytes)),
+
+    ?line ?uper_bin(ok = asn1ct:compile(DataDir ++ "OpenType",
+			      [uper_bin,{outdir,OutDir}])),
+    ?line ?uper_bin({ok,Bytes}=asn1_wrapper:encode('OpenType','Ot',Stype)),
+    ?line ?uper_bin({ok,Stype}=asn1_wrapper:decode('OpenType','Ot',Bytes)),
+
+    ?line ok = asn1ct:compile(DataDir ++ "OpenType",
+			      [?PER,optimize,{outdir,OutDir}]),
+    ?line {ok,Bytes} = asn1_wrapper:encode('OpenType','Ot',Stype),
+    ?line {ok,Stype} = asn1_wrapper:decode('OpenType','Ot',Bytes).
+
+testConstraints(suite) ->
+	[];
+testConstraints(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testConstraints:compile(Config,?BER,[]),
+    ?line testConstraints:int_constraints(?BER),
+
+    ?line ?ber_driver(?BER,testConstraints:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testConstraints:int_constraints(?BER)),
+
+    ?line testConstraints:compile(Config,?PER,[]),
+    ?line testConstraints:int_constraints(?PER),
+    ?line testConstraints:refed_NNL_name(?PER),
+
+    ?line ?per_bit_opt(testConstraints:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testConstraints:int_constraints(?PER)),
+    ?line ?per_bit_opt(testConstraints:refed_NNL_name(?PER)),
+
+    ?line ?uper_bin(testConstraints:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testConstraints:int_constraints(uper_bin)),
+    ?line ?uper_bin(testConstraints:refed_NNL_name(uper_bin)),
+
+    ?line testConstraints:compile(Config,?PER,[optimize]),
+    ?line testConstraints:int_constraints(?PER),
+    ?line testConstraints:refed_NNL_name(?PER).
+
+testSeqIndefinite(suite) -> [];
+testSeqIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqIndefinite:compile(Config,?BER,[]),
+    ?line testSeqIndefinite:main(?BER),
+
+    ?line ?ber_driver(?BER,testSeqIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqIndefinite:main(?BER)).
+
+testSetIndefinite(suite) -> [];
+testSetIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetIndefinite:compile(Config,?BER,[]),
+    ?line testSetIndefinite:main(?BER),
+
+    ?line ?ber_driver(?BER,testSetIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetIndefinite:main(?BER)).
+
+testChoiceIndefinite(suite) -> [];
+testChoiceIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testChoiceIndefinite:compile(Config,?BER,[]),
+    ?line testChoiceIndefinite:main(?BER),
+
+    ?line ?ber_driver(?BER,testChoiceIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoiceIndefinite:main(?BER)).
+
+testInfObjectClass(suite) ->
+    [];
+testInfObjectClass(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line testInfObjectClass:compile(Config,?PER,[]),
+    ?line testInfObjectClass:main(?PER),
+    ?line testInfObj:compile(Config,?PER,[]),
+    ?line testInfObj:main(?PER),
+
+    ?line ?per_bit_opt(testInfObjectClass:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testInfObjectClass:main(?PER)),
+    ?line ?per_bit_opt(testInfObj:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testInfObj:main(?PER)),
+
+    ?line ?uper_bin(testInfObjectClass:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testInfObjectClass:main(uper_bin)),
+    ?line ?uper_bin(testInfObj:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testInfObj:main(uper_bin)),
+
+    ?line testInfObjectClass:compile(Config,?PER,[optimize]),
+    ?line testInfObjectClass:main(?PER),
+    ?line testInfObj:compile(Config,?PER,[optimize]),
+    ?line testInfObj:main(?PER),
+
+    ?line testInfObjectClass:compile(Config,?BER,[]),
+    ?line testInfObjectClass:main(?BER),
+    ?line testInfObj:compile(Config,?BER,[]),
+    ?line testInfObj:main(?BER),
+
+    ?line ?ber_driver(?BER,testInfObjectClass:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testInfObjectClass:main(?BER)),
+    ?line ?ber_driver(?BER,testInfObj:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testInfObj:main(?BER)),
+
+    ?line testInfObj:compile_RANAPfiles(Config,?PER,[]),
+
+    ?line ?per_bit_opt(testInfObj:compile_RANAPfiles(Config,?PER,[optimize])),
+
+    ?line ?uper_bin(testInfObj:compile_RANAPfiles(Config,uper_bin,[])),
+
+    ?line testInfObj:compile_RANAPfiles(Config,?PER,[optimize]),
+
+    ?line testInfObj:compile_RANAPfiles(Config,?BER,[]).
+
+testParameterizedInfObj(suite) ->
+    [];
+testParameterizedInfObj(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line testParameterizedInfObj:compile(Config,?PER,[]),
+    ?line testParameterizedInfObj:main(?PER),
+
+    ?line ?per_bit_opt(testParameterizedInfObj:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testParameterizedInfObj:main(?PER)),
+
+    ?line ?uper_bin(testParameterizedInfObj:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testParameterizedInfObj:main(uper_bin)),
+
+    ?line testParameterizedInfObj:compile(Config,?PER,[optimize]),
+    ?line testParameterizedInfObj:main(?PER),
+
+    ?line testParameterizedInfObj:compile(Config,?BER,[]),
+    ?line testParameterizedInfObj:main(?BER),
+
+    ?line ?ber_driver(?BER,testParameterizedInfObj:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testParameterizedInfObj:main(?BER)).
+
+testMergeCompile(suite) ->
+    [];
+testMergeCompile(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line testMergeCompile:compile(Config,?PER,[]),
+    ?line testMergeCompile:main(?PER),
+    ?line testMergeCompile:mvrasn(?PER),
+
+    ?line ?per_bit_opt(testMergeCompile:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testMergeCompile:main(?PER)),
+    ?line ?per_bit_opt(testMergeCompile:mvrasn(?PER)),
+
+    ?line ?uper_bin(testMergeCompile:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testMergeCompile:main(uper_bin)),
+    ?line ?uper_bin(testMergeCompile:mvrasn(uper_bin)),
+
+    ?line testMergeCompile:compile(Config,?BER,[]),
+    ?line testMergeCompile:main(?BER),
+    ?line testMergeCompile:mvrasn(?BER),
+
+    ?line ?ber_driver(?BER,testMergeCompile:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testMergeCompile:main(?BER)),
+    ?line ?ber_driver(?BER,testMergeCompile:mvrasn(?BER)).
+
+testobj(suite) ->
+    [];
+testobj(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line ok = testRANAP:compile(Config,?PER,[]),
+    ?line ok = testRANAP:testobj(?PER),
+    ?line ok = testParameterizedInfObj:ranap(?PER),
+    
+    ?line ?per_bit_opt(ok = testRANAP:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(ok = testRANAP:testobj(?PER)),
+    ?line ?per_bit_opt(ok = testParameterizedInfObj:ranap(?PER)),
+    
+    ?line ?uper_bin(ok = testRANAP:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(ok = testRANAP:testobj(uper_bin)),
+    ?line ?uper_bin(ok = testParameterizedInfObj:ranap(uper_bin)),
+    
+    ?line ok = testRANAP:compile(Config,?PER,[optimize]),
+    ?line ok = testRANAP:testobj(?PER),
+    ?line ok = testParameterizedInfObj:ranap(?PER),
+
+    ?line ok = testRANAP:compile(Config,?BER,[]),
+    ?line ok = testRANAP:testobj(?BER),
+    ?line ok = testParameterizedInfObj:ranap(?BER),
+
+    ?line ?ber_driver(?BER,testRANAP:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testRANAP:testobj(?BER)),
+    ?line ?ber_driver(?BER,testParameterizedInfObj:ranap(?BER)).
+
+
+testDeepTConstr(suite) ->
+    [];
+testDeepTConstr(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testDeepTConstr:compile(Config,?PER,[]),
+    ?line testDeepTConstr:main(?PER),
+
+    ?line ?per_bit_opt(testDeepTConstr:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testDeepTConstr:main(?PER)),
+
+    ?line ?uper_bin(testDeepTConstr:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testDeepTConstr:main(uper_bin)),
+
+    ?line testDeepTConstr:compile(Config,?PER,[optimize]),
+    ?line testDeepTConstr:main(?PER),
+
+    ?line testDeepTConstr:compile(Config,?BER,[]),
+    ?line testDeepTConstr:main(?BER),
+
+    ?line ?ber_driver(?BER,testDeepTConstr:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDeepTConstr:main(?BER)).
+
+testInvokeMod(suite) ->
+    [];
+testInvokeMod(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line ok = asn1ct:compile(filename:join(DataDir,"PrimStrings"),[{outdir,OutDir}]),
+    ?line {ok,_Result1} = 'PrimStrings':encode('Bs1',[1,0,1,0]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"PrimStrings"),[?PER,{outdir,OutDir}]),
+    ?line {ok,_Result2} = 'PrimStrings':encode('Bs1',[1,0,1,0]).
+
+testExport(suite) ->
+    [];
+testExport(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line {error,{asn1,_Reason}} = asn1ct:compile(filename:join(DataDir,"IllegalExport"),[{outdir,OutDir}]).
+
+testImport(suite) ->
+    [];
+testImport(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line _OutDir = ?config(priv_dir,Config),
+    ?line {error,_} = asn1ct:compile(filename:join(DataDir,"ImportsFrom"),[?BER]),
+    ok.
+
+testMegaco(suite) ->
+    [];
+testMegaco(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    io:format("Config: ~p~n",[Config]),
+    ?line {ok,ModuleName1,ModuleName2} = testMegaco:compile(Config,?BER,[]),
+    ?line ok = testMegaco:main(ModuleName1,Config),
+    ?line ok = testMegaco:main(ModuleName2,Config),
+
+    case ?BER of
+	ber_bin_v2 ->
+	    ?line {ok,ModuleName3,ModuleName4} = testMegaco:compile(Config,?BER,[driver]),
+	    ?line ok = testMegaco:main(ModuleName3,Config),
+	    ?line ok = testMegaco:main(ModuleName4,Config);
+	_-> ok
+    end,
+
+    ?line {ok,ModuleName5,ModuleName6} = testMegaco:compile(Config,?PER,[]),
+    ?line ok = testMegaco:main(ModuleName5,Config),
+    ?line ok = testMegaco:main(ModuleName6,Config),
+
+    ?line ?per_bit_opt({ok,ModuleName5,ModuleName6} = testMegaco:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(ok = testMegaco:main(ModuleName5,Config)),
+    ?line ?per_bit_opt(ok = testMegaco:main(ModuleName6,Config)),
+
+    ?line ?uper_bin({ok,ModuleName5,ModuleName6} = testMegaco:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(ok = testMegaco:main(ModuleName5,Config)),
+    ?line ?uper_bin(ok = testMegaco:main(ModuleName6,Config)),
+
+    ?line {ok,ModuleName7,ModuleName8} = testMegaco:compile(Config,?PER,[optimize]),
+    ?line ok = testMegaco:main(ModuleName7,Config),
+    ?line ok = testMegaco:main(ModuleName8,Config).
+
+
+testMvrasn6(suite) -> [];
+testMvrasn6(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testMvrasn6:compile(Config,?BER),
+    ?line testMvrasn6:main().
+
+testContextSwitchingTypes(suite) -> [];
+testContextSwitchingTypes(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testContextSwitchingTypes:compile(Config,?BER,[]),
+    ?line testContextSwitchingTypes:test(),
+
+    ?line ?ber_driver(?BER,testContextSwitchingTypes:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testContextSwitchingTypes:test()),
+
+    ?line testContextSwitchingTypes:compile(Config,?PER,[]),
+    ?line testContextSwitchingTypes:test(),
+
+    ?line ?per_bit_opt(testContextSwitchingTypes:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testContextSwitchingTypes:test()),
+
+    ?line ?uper_bin(testContextSwitchingTypes:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testContextSwitchingTypes:test()),
+
+    ?line testContextSwitchingTypes:compile(Config,?PER,[optimize]),
+    ?line testContextSwitchingTypes:test().
+
+testTypeValueNotation(suite) -> [];
+testTypeValueNotation(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    case ?BER of
+	Ber when Ber == ber; Ber == ber_bin ->
+	    ?line testTypeValueNotation:compile(Config,?BER,[]),
+	    ?line testTypeValueNotation:main(?BER,dummy);
+	_ ->
+	    ok
+    end,
+
+    ?line ?ber_driver(?BER,testTypeValueNotation:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testTypeValueNotation:main(?BER,optimize)),
+
+    case ?BER of
+	Ber2 when Ber2 == ber; Ber2 == ber_bin ->
+	    ?line testTypeValueNotation:compile(Config,?PER,[]),
+	    ?line testTypeValueNotation:main(?PER,dummy);
+	_ ->
+	    ok
+    end,
+
+    ?line ?per_bit_opt(testTypeValueNotation:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testTypeValueNotation:main(?PER,optimize)),
+
+    ?line ?uper_bin(testTypeValueNotation:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testTypeValueNotation:main(uper_bin,optimize)),
+    case ?BER of
+	Ber3 when Ber3 == ber; Ber3 == ber_bin ->
+	    ?line testTypeValueNotation:compile(Config,?PER,[optimize]),
+	    ?line testTypeValueNotation:main(?PER,optimize);
+	_ ->
+	    ok
+     end.
+
+testOpenTypeImplicitTag(suite) -> [];
+testOpenTypeImplicitTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testOpenTypeImplicitTag:compile(Config,?BER,[]),
+    ?line testOpenTypeImplicitTag:main(?BER),
+
+    ?line ?ber_driver(?BER,testOpenTypeImplicitTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testOpenTypeImplicitTag:main(?BER)),
+
+    ?line testOpenTypeImplicitTag:compile(Config,?PER,[]),
+    ?line testOpenTypeImplicitTag:main(?PER),
+
+    ?line ?per_bit_opt(testOpenTypeImplicitTag:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testOpenTypeImplicitTag:main(?PER)),
+
+    ?line ?uper_bin(testOpenTypeImplicitTag:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testOpenTypeImplicitTag:main(uper_bin)),
+
+    ?line testOpenTypeImplicitTag:compile(Config,?PER,[optimize]),
+    ?line testOpenTypeImplicitTag:main(?PER).
+
+duplicate_tags(suite) -> [];
+duplicate_tags(Config) ->
+	?line DataDir = ?config(data_dir,Config),
+	{error,{asn1,[{error,{type,_,_,'SeqOpt1Imp',{asn1,{duplicates_of_the_tags,_}}}}]}} = 
+	asn1ct:compile(filename:join(DataDir,"SeqOptional2"),[abs]),
+	ok.
+
+rtUI(suite) -> [];
+rtUI(Config) -> 
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Prim"),[?BER]),
+    ?line {ok,_} = asn1rt:info('Prim'),
+
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Prim"),[?PER]),
+    ?line {ok,_} = asn1rt:info('Prim'),
+
+    ?line ok = asn1rt:load_driver(),
+    ?line ok = asn1rt:load_driver(),
+    ?line ok = asn1rt:unload_driver().
+
+testROSE(suite) -> [];
+testROSE(Config) -> 
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testROSE:compile(Config,?BER,[]),
+
+    ?line testROSE:compile(Config,?PER,[]),
+    ?line ?per_bit_opt(testROSE:compile(Config,?PER,[optimize])),
+    ?line ?uper_bin(testROSE:compile(Config,uper_bin,[])),
+    ?line testROSE:compile(Config,?PER,[optimize]).
+
+testINSTANCE_OF(suite) -> [];
+testINSTANCE_OF(Config) ->
+    ?line testINSTANCE_OF:compile(Config,?BER,[]),
+    ?line testINSTANCE_OF:main(?BER),
+
+    ?line ?ber_driver(?BER,testINSTANCE_OF:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testINSTANCE_OF:main(?BER)),
+
+    ?line testINSTANCE_OF:compile(Config,?PER,[]),
+    ?line testINSTANCE_OF:main(?PER),
+
+    ?line ?per_bit_opt(testINSTANCE_OF:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testINSTANCE_OF:main(?PER)),
+
+    ?line ?uper_bin(testINSTANCE_OF:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testINSTANCE_OF:main(uper_bin)),
+
+    ?line testINSTANCE_OF:compile(Config,?PER,[optimize]),
+    ?line testINSTANCE_OF:main(?PER).
+
+testTCAP(suite) -> [];
+testTCAP(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testTCAP:compile(Config,?BER,[]),
+    ?line testTCAP:test(?BER,Config),
+
+    ?line ?ber_driver(?BER,testTCAP:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testTCAP:test(?BER,Config)),
+
+    ?line ?ber_driver(?BER,testTCAP:compile_asn1config(Config,?BER,[asn1config])),
+    ?line ?ber_driver(?BER,testTCAP:test_asn1config()).
+
+testDER(suite) ->[];
+testDER(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testDER:compile(Config,?BER,[]),
+    ?line testDER:test(),
+
+    ?line ?ber_driver(?BER,testDER:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDER:test()),
+
+    ?line testParamBasic:compile_der(Config,?BER),
+    ?line testParamBasic_cases(der),
+
+
+    ?line testSeqSetDefaultVal:compile(Config,?BER),
+    ?line testSeqSetDefaultVal_cases(?BER).
+
+testSeqSetDefaultVal_cases(?BER) ->
+    ?line testSeqSetDefaultVal:main(?BER).
+
+
+specialized_decodes(suite) -> [];
+specialized_decodes(Config) ->
+    ?line test_partial_incomplete_decode:compile(Config,?BER,[optimize]),
+    ?line test_partial_incomplete_decode:test(?BER,Config),
+    ?line test_selective_decode:test(?BER,Config).
+
+special_decode_performance(suite) ->[];
+special_decode_performance(Config) ->
+    ?line ?ber_driver(?BER,test_special_decode_performance:compile(Config,?BER)),
+    ?line ?ber_driver(?BER,test_special_decode_performance:go(all)).
+
+
+test_driver_load(suite) -> [];
+test_driver_load(Config) ->
+    ?line test_driver_load:compile(Config,?PER),
+    ?line test_driver_load:test(?PER,5).
+
+test_ParamTypeInfObj(suite) -> [];
+test_ParamTypeInfObj(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"IN-CS-1-Datatypes"),[ber_bin]).
+
+test_WS_ParamClass(suite) -> [];
+test_WS_ParamClass(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"InformationFramework"),
+				[ber_bin]).
+
+test_Defed_ObjectIdentifier(suite) -> [];
+test_Defed_ObjectIdentifier(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"UsefulDefinitions"),
+				[ber_bin]).
+
+testSelectionType(suite) -> [];
+testSelectionType(Config) ->
+
+    ?line ok = testSelectionTypes:compile(Config,?BER,[]),
+    ?line {ok,_}  = testSelectionTypes:test(),
+
+    ?line ok = testSelectionTypes:compile(Config,?PER,[]),
+    ?line {ok,_}  = testSelectionTypes:test().
+
+testSSLspecs(suite) -> [];
+testSSLspecs(Config) ->
+
+    ?line ok = testSSLspecs:compile(Config,?BER,
+				[optimize,compact_bit_string,der]),
+    ?line testSSLspecs:run(?BER),
+
+    case code:which(asn1ct) of
+       cover_compiled ->
+	   ok;
+       _ ->
+           ?line ok = testSSLspecs:compile_inline(Config,?BER),
+           ?line ok = testSSLspecs:run_inline(?BER)
+    end.
+
+testNortel(suite) -> [];
+testNortel(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),[?BER]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?BER,optimize]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?BER,optimize,driver]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),[?PER]),
+    ?line ?per_bit_opt(ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?PER,optimize])),
+    ?line ?uper_bin(ok = asn1ct:compile(filename:join(DataDir,"Nortel"),[uper_bin])),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?PER,optimize]).
+test_undecoded_rest(suite) -> [];
+test_undecoded_rest(Config) ->
+
+    ?line ok = test_undecoded_rest:compile(Config,?BER,[]),
+    ?line ok = test_undecoded_rest:test([]),
+
+    ?line ok = test_undecoded_rest:compile(Config,?BER,[undec_rest]),
+    ?line ok = test_undecoded_rest:test(undec_rest),
+
+    ?line ok = test_undecoded_rest:compile(Config,?PER,[]),
+    ?line ok = test_undecoded_rest:test([]),
+
+    ?line ?per_bit_opt(ok = test_undecoded_rest:compile(Config,?PER,[optimize,undec_rest])),
+    ?line ?per_bit_opt(ok = test_undecoded_rest:test(undec_rest)),
+
+    ?line ?uper_bin(ok = test_undecoded_rest:compile(Config,uper_bin,[undec_rest])),
+    ?line ?uper_bin(ok = test_undecoded_rest:test(undec_rest)),
+
+    ?line ok = test_undecoded_rest:compile(Config,?PER,[undec_rest]),
+    ?line ok = test_undecoded_rest:test(undec_rest).
+
+test_inline(suite) -> [];
+test_inline(Config) ->
+    case code:which(asn1ct) of
+       cover_compiled ->
+          {skip,"Not runnable when cover compiled"};
+       _  ->
+          ?line ok=test_inline:compile(Config,?BER,[]),
+          ?line test_inline:main(?BER),
+    	  ?line test_inline:inline1(Config,?BER,[]),
+     	  ?line test_inline:performance2()
+    end.
+
+%test_inline_prf(suite) -> [];
+%test_inline_prf(Config) ->
+%    ?line test_inline:performance(Config).
+
+testTcapsystem(suite) -> [];
+testTcapsystem(Config) ->
+    ?line ok=testTcapsystem:compile(Config,?BER,[]).
+
+testNBAPsystem(suite) -> [];
+testNBAPsystem(Config) ->
+    ?line ok=testNBAPsystem:compile(Config,?PER,?per_optimize(?BER)),
+    ?line ok=testNBAPsystem:test(?PER,Config).
+
+test_compile_options(suite) -> [];
+test_compile_options(Config) ->
+    case code:which(asn1ct) of
+       cover_compiled ->
+          {skip,"Not runnable when cover compiled"};
+       _  ->
+    	  ?line ok = test_compile_options:wrong_path(Config),
+    	  ?line ok = test_compile_options:path(Config),
+    	  ?line ok = test_compile_options:noobj(Config),
+	  ?line ok = test_compile_options:record_name_prefix(Config),
+	  ?line ok = test_compile_options:verbose(Config)
+    end.
+testDoubleEllipses(suite) ->  [];
+testDoubleEllipses(Config) ->
+    ?line testDoubleEllipses:compile(Config,?BER,[]),
+    ?line testDoubleEllipses:main(?BER),
+    ?line ?ber_driver(?BER,testDoubleEllipses:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDoubleEllipses:main(?BER)),
+    ?line ?per_bit_opt(testDoubleEllipses:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testDoubleEllipses:main(?PER)),
+    ?line ?uper_bin(testDoubleEllipses:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testDoubleEllipses:main(uper_bin)),
+    ?line testDoubleEllipses:compile(Config,?PER,?per_optimize(?BER)),
+    ?line testDoubleEllipses:main(?PER).
+
+test_modified_x420(suite) -> [];
+test_modified_x420(Config) ->
+    ?line test_modified_x420:compile(Config),
+    ?line test_modified_x420:test_io(Config).
+
+testX420(suite) -> [];
+testX420(Config) ->
+    ?line testX420:compile(?BER,[der],Config),
+    ?line ok = testX420:ticket7759(?BER,Config),
+    ?line testX420:compile(?PER,[],Config).
+
+test_x691(suite) -> [];
+test_x691(Config) ->
+    case ?PER of
+	per ->
+    	   ?line ok = test_x691:compile(Config,uper_bin,[]),
+    	   ?line true = test_x691:cases(uper_bin,unaligned),
+	   ?line ok = test_x691:compile(Config,?PER,[]),
+    	   ?line true = test_x691:cases(?PER,aligned),
+%%	   ?line ok = asn1_test_lib:ticket_7678(Config,[]),
+	   ?line ok = asn1_test_lib:ticket_7708(Config,[]),
+	   ?line ok = asn1_test_lib:ticket_7763(Config);
+	_ ->
+	   ?line ok = test_x691:compile(Config,?PER,?per_optimize(?BER)),
+    	   ?line true = test_x691:cases(?PER,aligned)
+    end.
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[]),
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[compact_bit_string]),
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[optimize]),
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[optimize,compact_bit_string]).
+
+
+ticket_6143(suite) -> [];
+ticket_6143(Config) ->
+    ?line ok = test_compile_options:ticket_6143(Config).
+
+testExtensionAdditionGroup(suite) -> [];
+testExtensionAdditionGroup(Config) ->
+	?line DataDir = ?config(data_dir,Config),
+	?line PrivDir = ?config(priv_dir,Config),
+	?line Path = code:get_path(),
+	?line code:add_patha(PrivDir),
+	DoIt = fun(Erule) ->
+		?line ok = asn1ct:compile(filename:join(DataDir,"Extension-Addition-Group"),[Erule,{outdir,PrivDir}]),
+		?line {ok,_M} = compile:file(filename:join(DataDir,"extensionAdditionGroup"),[{i,PrivDir},{outdir,PrivDir},debug_info]),
+		?line ok = extensionAdditionGroup:run(Erule)
+	       end,
+	?line [DoIt(Rule)|| Rule <- [per_bin,uper_bin,ber_bin]],
+	?line code:set_path(Path).
+
+
+
+% parse_modules() ->
+%	["ImportsFrom"].
+
+per_modules() ->
+	[X || X <- test_modules()].
+ber_modules() ->
+	[X || X <- test_modules(),
+		X =/= "CommonDataTypes",
+		X =/= "DS-EquipmentUser-CommonFunctionOrig-TransmissionPath",
+		X =/= "H323-MESSAGES",
+	        X =/= "H235-SECURITY-MESSAGES",
+	        X =/= "MULTIMEDIA-SYSTEM-CONTROL"].
+test_modules() ->
+    _Modules = [
+	       "BitStr",
+	       "CommonDataTypes",
+	       "Constraints",
+	       "ContextSwitchingTypes",
+	       "DS-EquipmentUser-CommonFunctionOrig-TransmissionPath",
+	       "Enum",
+	       "From",
+	       "H235-SECURITY-MESSAGES",
+	       "H323-MESSAGES",
+	       %%"MULTIMEDIA-SYSTEM-CONTROL", recursive type , problem for asn1ct:value
+	       "Import",
+	       "Int",
+	       "MAP-commonDataTypes",
+% ambigous tags	       "MAP-insertSubscriberData-def",
+	       "Null",
+	       "Octetstr",
+	       "One",
+	       "P-Record",
+	       "P",
+%	       "PDUs",
+	       "Person",
+	       "PrimStrings",
+	       "Real",
+	       "XSeq",
+	       "XSeqOf",
+	       "XSet",
+	       "XSetOf",
+	       "String",
+	       "SwCDR",
+%	       "Syntax",
+	       "Time"
+% ANY	       "Tst",
+%	       "Two",
+% errors that should be detected      "UndefType"
+] ++
+	[
+	 "SeqSetLib", % must be compiled before Seq and Set
+	 "Seq",
+	 "Set",
+	 "SetOf",
+	 "SeqOf",
+	 "Prim",
+	 "Cho",
+	 "Def",
+         "Opt",
+	 "ELDAPv3",
+	 "LDAP"
+	].
+
+
+common() -> 
+[].
+
+particular() -> 
+[].
diff --git a/lib/asn1/test/asn1_bin_v2_SUITE.erl b/lib/asn1/test/asn1_bin_v2_SUITE.erl
new file mode 100644
index 0000000000..43d6ba0c6e
--- /dev/null
+++ b/lib/asn1/test/asn1_bin_v2_SUITE.erl
@@ -0,0 +1,2474 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2010. 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%
+%%
+%%
+%%% Purpose : Test suite for the ASN.1 application
+
+-module(asn1_bin_v2_SUITE).
+-define(PER,'per_bin').
+-define(BER,'ber_bin_v2').
+-define(ber_driver(Erule,Func),
+	case Erule of
+           ber_bin_v2 ->
+		Func;
+	    _ -> ok
+	end).
+-define(per_optimize(Erule),
+	case Erule of
+	   ber_bin_v2 ->[optimize];
+           _ -> []
+	end).
+-define(per_bit_opt(FuncCall),
+	case ?BER of
+	   ber_bin_v2 -> FuncCall;
+%	   _ -> {skip,"only for bit optimized per_bin"}
+	   _ -> ok
+	end).
+-define(uper_bin(FuncCall),
+	case ?PER of
+	   per -> FuncCall;
+	   _ -> ok
+	end).
+
+-compile(export_all).
+%%-export([Function/Arity, ...]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+%% records used by test-case default
+-record('Def1',{
+bool0, bool1 = asn1_DEFAULT, bool2 = asn1_DEFAULT, bool3 = asn1_DEFAULT}).
+
+%-record('Def2',{
+%bool10, bool11 = asn1_DEFAULT, bool12 = asn1_DEFAULT, bool13}).
+
+%-record('Def3',{
+%bool30 = asn1_DEFAULT, bool31 = asn1_DEFAULT, bool32 = asn1_DEFAULT, bool33 = asn1_DEFAULT}).
+
+
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, compile}, parse, default_per, default_ber,
+     default_per_opt, per, {group, ber}, testPrim,
+     testPrimStrings, testPrimExternal, testChoPrim,
+     testChoExtension, testChoExternal, testChoOptional,
+     testChoOptionalImplicitTag, testChoRecursive,
+     testChoTypeRefCho, testChoTypeRefPrim,
+     testChoTypeRefSeq, testChoTypeRefSet, testDef, testOpt,
+     testSeqDefault, testSeqExtension, testSeqExternal,
+     testSeqOptional, testSeqPrim, testSeqTag,
+     testSeqTypeRefCho, testSeqTypeRefPrim,
+     testSeqTypeRefSeq, testSeqTypeRefSet, testSeqOf,
+     testSeqOfIndefinite, testSeqOfCho, testSeqOfExternal,
+     testSetDefault, testSetExtension,
+     testExtensionAdditionGroup, testSetExternal,
+     testSeqOfTag, testSetOptional, testSetPrim, testSetTag,
+     testSetTypeRefCho, testSetTypeRefPrim,
+     testSetTypeRefSeq, testSetTypeRefSet, testSetOf,
+     testSetOfCho, testSetOfExternal, testSetOfTag,
+     testEnumExt, value_test, testSeq2738, constructed,
+     ber_decode_error, h323test, testSeqIndefinite,
+     testSetIndefinite, testChoiceIndefinite,
+     per_GeneralString, per_open_type, testInfObjectClass,
+     testParameterizedInfObj, testMergeCompile, testobj,
+     testDeepTConstr, testConstraints, testInvokeMod,
+     testExport, testImport, testCompactBitString,
+     testMegaco, testParamBasic, testMvrasn6,
+     testContextSwitchingTypes, testTypeValueNotation,
+     testOpenTypeImplicitTag, duplicate_tags, rtUI, testROSE,
+     testINSTANCE_OF, testTCAP, testDER, specialized_decodes,
+     special_decode_performance, test_driver_load,
+     test_ParamTypeInfObj, test_WS_ParamClass,
+     test_Defed_ObjectIdentifier, testSelectionType,
+     testSSLspecs, testNortel, test_undecoded_rest,
+     test_inline, testTcapsystem, testNBAPsystem,
+     test_compile_options, testDoubleEllipses,
+     test_modified_x420, testX420, test_x691, ticket_6143,
+     testExtensionAdditionGroup] ++ common() ++ particular().
+
+groups() -> 
+    [{option_tests, [],
+      [test_compile_options, ticket_6143]},
+     {infobj, [],
+      [testInfObjectClass, testParameterizedInfObj,
+       testMergeCompile, testobj, testDeepTConstr]},
+     {performance, [],
+      [testTimer_ber, testTimer_ber_opt_driver, testTimer_per,
+       testTimer_per_opt, testTimer_uper_bin]},
+     {bugs, [],
+      [test_ParamTypeInfObj, test_WS_ParamClass,
+       test_Defed_ObjectIdentifier]},
+     {compile, [],
+      [c_syntax, c_string_per, c_string_ber,
+       c_implicit_before_choice]},
+     {ber, [],
+      [ber_choiceinseq, ber_optional, ber_optional_keyed_list,
+       ber_other]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+%all(suite) -> [test_inline,testNBAPsystem,test_compile_options,ticket_6143].
+
+init_per_testcase(Func,Config) ->
+    %%?line test_server:format("Func: ~p~n",[Func]),
+    ?line {ok, _} = file:read_file_info(filename:join([?config(priv_dir,Config)])),
+    ?line code:add_patha(?config(priv_dir,Config)),
+    Dog=
+    case Func of
+       testX420 ->
+           test_server:timetrap({minutes,60}); % 60 minutes
+       _ ->
+	   test_server:timetrap({minutes,30}) % 60 minutes
+    end,
+    %%    Dog=test_server:timetrap(1800000), % 30 minutes
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Func,Config) ->
+          Dog=?config(watchdog, Config),
+          test_server:timetrap_cancel(Dog).
+
+
+testPrim(suite) -> [];
+testPrim(Config) ->
+    ?line testPrim:compile(Config,?BER,[]),
+    ?line testPrim_cases(?BER),
+    ?line ?ber_driver(?BER,testPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrim_cases(?BER)),
+    ?line testPrim:compile(Config,?PER,[]),
+    ?line testPrim_cases(?PER),
+    ?line ?per_bit_opt(testPrim:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testPrim_cases(?PER)),
+    ?line ?uper_bin(testPrim:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testPrim_cases(uper_bin)),
+    ?line testPrim:compile(Config,?PER,[optimize]),
+    ?line testPrim_cases(?PER).
+
+testPrim_cases(Rules) ->
+    ?line testPrim:bool(Rules),
+    ?line testPrim:int(Rules),
+    ?line testPrim:enum(Rules),
+    ?line testPrim:obj_id(Rules),
+    ?line testPrim:rel_oid(Rules),
+    ?line testPrim:null(Rules),
+    ?line testPrim:real(Rules).
+
+
+testCompactBitString(suite) -> [];
+testCompactBitString(Config) -> 
+
+    ?line testCompactBitString:compile(Config,?BER,[compact_bit_string]),
+    ?line testCompactBitString:compact_bit_string(?BER),
+
+    ?line ?ber_driver(?BER,testCompactBitString:compile(Config,?BER,[compact_bit_string,driver])),
+    ?line ?ber_driver(?BER,testCompactBitString:compact_bit_string(?BER)),
+
+    ?line testCompactBitString:compile(Config,?PER,[compact_bit_string]),
+    ?line testCompactBitString:compact_bit_string(?PER),
+    ?line testCompactBitString:bit_string_unnamed(?PER),
+
+    ?line ?per_bit_opt(testCompactBitString:compile(Config,?PER,
+					[compact_bit_string,optimize])),
+    ?line ?per_bit_opt(testCompactBitString:compact_bit_string(?PER)),
+    ?line ?per_bit_opt(testCompactBitString:bit_string_unnamed(?PER)),
+    ?line ?per_bit_opt(testCompactBitString:ticket_7734(?PER)),
+
+    ?line ?uper_bin(testCompactBitString:compile(Config,uper_bin,
+					[compact_bit_string])),
+    ?line ?uper_bin(testCompactBitString:compact_bit_string(uper_bin)),
+    ?line ?uper_bin(testCompactBitString:bit_string_unnamed(uper_bin)),
+
+    ?line testCompactBitString:compile(Config,?PER,[optimize,compact_bit_string]),
+    ?line testCompactBitString:compact_bit_string(?PER),
+    ?line testCompactBitString:bit_string_unnamed(?PER),
+
+    ?line testCompactBitString:otp_4869(?PER).
+
+
+testPrimStrings(suite) -> [];
+testPrimStrings(Config) ->
+
+    ?line testPrimStrings:compile(Config,?BER,[]),
+    ?line testPrimStrings_cases(?BER),
+    ?line testPrimStrings:more_strings(?BER), %% these are not implemented in per yet
+    ?line ?ber_driver(?BER,testPrimStrings:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrimStrings_cases(?BER)),
+    ?line ?ber_driver(?BER,testPrimStrings:more_strings(?BER)),
+
+    ?line testPrimStrings:compile(Config,?PER,[]),
+    ?line testPrimStrings_cases(?PER),
+
+    ?line ?per_bit_opt(testPrimStrings:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testPrimStrings_cases(?PER)),
+
+    ?line ?uper_bin(testPrimStrings:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testPrimStrings_cases(uper_bin)),
+
+    ?line testPrimStrings:compile(Config,?PER,[optimize]),
+    ?line testPrimStrings_cases(?PER).
+
+testPrimStrings_cases(Rules) ->
+    ?line testPrimStrings:bit_string(Rules),
+    ?line testPrimStrings:bit_string_unnamed(Rules),
+    ?line testPrimStrings:octet_string(Rules),
+    ?line testPrimStrings:numeric_string(Rules),
+    ?line testPrimStrings:other_strings(Rules),
+    ?line testPrimStrings:universal_string(Rules),
+    ?line testPrimStrings:bmp_string(Rules),
+    ?line testPrimStrings:times(Rules),
+    ?line testPrimStrings:utf8_string(Rules).
+    
+
+
+testPrimExternal(suite) -> [];
+testPrimExternal(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testPrimExternal:compile(Config,?BER,[]),
+    ?line testPrimExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrimExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testPrimExternal_cases(?BER)),
+    
+    ?line testExternal:compile(Config,?PER,[]),     
+    ?line testPrimExternal:compile(Config,?PER,[]), 
+    ?line testPrimExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),     
+    ?line ?per_bit_opt(testPrimExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testPrimExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),     
+    ?line ?uper_bin(testPrimExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testPrimExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),     
+    ?line testPrimExternal:compile(Config,?PER,[optimize]), 
+    ?line testPrimExternal_cases(?PER).
+
+testPrimExternal_cases(Rules) ->
+    ?line testPrimExternal:external(Rules).
+
+
+
+
+testChoPrim(suite) -> [];
+testChoPrim(Config) ->
+
+    ?line testChoPrim:compile(Config,?BER,[]),
+    ?line testChoPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoPrim_cases(?BER)),
+
+    ?line testChoPrim:compile(Config,?PER,[]), 
+    ?line testChoPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testChoPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoPrim_cases(?PER)),
+
+    ?line ?uper_bin(testChoPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoPrim_cases(uper_bin)),
+
+    ?line testChoPrim:compile(Config,?PER,[optimize]), 
+    ?line testChoPrim_cases(?PER).
+
+testChoPrim_cases(Rules) ->
+    ?line testChoPrim:bool(Rules),
+    ?line testChoPrim:int(Rules).
+
+
+
+testChoExtension(suite) -> [];
+testChoExtension(Config) ->
+
+    ?line testChoExtension:compile(Config,?BER,[]),
+    ?line testChoExtension_cases(?BER),          
+
+    ?line ?ber_driver(?BER,testChoExtension:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoExtension_cases(?BER)),
+
+    ?line testChoExtension:compile(Config,?PER,[]),
+    ?line testChoExtension_cases(?PER),          
+
+    ?line ?per_bit_opt(testChoExtension:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testChoExtension_cases(?PER)),
+
+    ?line ?uper_bin(testChoExtension:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testChoExtension_cases(uper_bin)),
+
+    ?line testChoExtension:compile(Config,?PER,[optimize]),
+    ?line testChoExtension_cases(?PER).          
+
+testChoExtension_cases(Rules) ->
+    ?line testChoExtension:extension(Rules).
+
+
+
+testChoExternal(suite) -> [];
+testChoExternal(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testChoExternal:compile(Config,?BER,[]),
+    ?line testChoExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoExternal_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testChoExternal:compile(Config,?PER,[]), 
+    ?line testChoExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testChoExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testChoExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testChoExternal:compile(Config,?PER,[optimize]), 
+    ?line testChoExternal_cases(?PER).
+
+
+testChoExternal_cases(Rules) ->
+    ?line testChoExternal:external(Rules).
+
+
+
+testChoOptional(suite) -> [];
+testChoOptional(Config) ->
+
+    ?line testChoOptional:compile(Config,?BER,[]),
+    ?line testChoOptional_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoOptional:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoOptional_cases(?BER)),
+
+    ?line testChoOptional:compile(Config,?PER,[]), 
+    ?line testChoOptional_cases(?PER),
+
+    ?line ?per_bit_opt(testChoOptional:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoOptional_cases(?PER)),
+
+    ?line ?uper_bin(testChoOptional:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoOptional_cases(uper_bin)),
+
+    ?line testChoOptional:compile(Config,?PER,[optimize]), 
+    ?line testChoOptional_cases(?PER).
+
+testChoOptional_cases(Rules) ->
+    ?line testChoOptional:optional(Rules).
+
+testChoOptionalImplicitTag(suite) -> [];
+testChoOptionalImplicitTag(Config) ->
+    %% Only meaningful for ?BER
+    ?line testChoOptionalImplicitTag:compile(Config,?BER),
+    ?line testChoOptionalImplicitTag:optional(?BER).
+
+
+testChoRecursive(suite) -> [];
+testChoRecursive(Config) ->
+
+    ?line testChoRecursive:compile(Config,?BER,[]),
+    ?line testChoRecursive_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoRecursive:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoRecursive_cases(?BER)),
+
+    ?line testChoRecursive:compile(Config,?PER,[]), 
+    ?line testChoRecursive_cases(?PER),
+
+    ?line ?per_bit_opt(testChoRecursive:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoRecursive_cases(?PER)),
+
+    ?line ?uper_bin(testChoRecursive:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoRecursive_cases(uper_bin)),
+
+    ?line testChoRecursive:compile(Config,?PER,[optimize]), 
+    ?line testChoRecursive_cases(?PER).
+
+testChoRecursive_cases(Rules) ->
+    ?line testChoRecursive:recursive(Rules).
+
+
+
+testChoTypeRefCho(suite) -> [];
+testChoTypeRefCho(Config) ->
+
+    ?line testChoTypeRefCho:compile(Config,?BER,[]),
+    ?line testChoTypeRefCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefCho_cases(?BER)),
+
+    ?line testChoTypeRefCho:compile(Config,?PER,[]), 
+    ?line testChoTypeRefCho_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefCho_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefCho_cases(uper_bin)),
+
+    ?line testChoTypeRefCho:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefCho_cases(?PER).
+
+testChoTypeRefCho_cases(Rules) ->
+    ?line testChoTypeRefCho:choice(Rules).
+
+
+
+testChoTypeRefPrim(suite) -> [];
+testChoTypeRefPrim(Config) ->
+
+    ?line testChoTypeRefPrim:compile(Config,?BER,[]),
+    ?line testChoTypeRefPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefPrim_cases(?BER)),
+
+    ?line testChoTypeRefPrim:compile(Config,?PER,[]), 
+    ?line testChoTypeRefPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefPrim_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefPrim_cases(uper_bin)),
+
+    ?line testChoTypeRefPrim:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefPrim_cases(?PER).
+
+testChoTypeRefPrim_cases(Rules) ->
+    ?line testChoTypeRefPrim:prim(Rules).
+
+
+
+testChoTypeRefSeq(suite) -> [];
+testChoTypeRefSeq(Config) ->
+
+    ?line testChoTypeRefSeq:compile(Config,?BER,[]),
+    ?line testChoTypeRefSeq_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefSeq:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefSeq_cases(?BER)),
+
+    ?line testChoTypeRefSeq:compile(Config,?PER,[]), 
+    ?line testChoTypeRefSeq_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefSeq:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefSeq_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefSeq:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefSeq_cases(uper_bin)),
+
+    ?line testChoTypeRefSeq:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefSeq_cases(?PER).
+
+testChoTypeRefSeq_cases(Rules) ->
+    ?line testChoTypeRefSeq:seq(Rules).
+
+
+
+testChoTypeRefSet(suite) -> [];
+testChoTypeRefSet(Config) ->
+
+    ?line testChoTypeRefSet:compile(Config,?BER,[]),
+    ?line testChoTypeRefSet_cases(?BER),
+
+    ?line ?ber_driver(?BER,testChoTypeRefSet:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoTypeRefSet_cases(?BER)),
+
+    ?line testChoTypeRefSet:compile(Config,?PER,[]), 
+    ?line testChoTypeRefSet_cases(?PER),
+
+    ?line ?per_bit_opt(testChoTypeRefSet:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testChoTypeRefSet_cases(?PER)),
+
+    ?line ?uper_bin(testChoTypeRefSet:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testChoTypeRefSet_cases(uper_bin)),
+
+    ?line testChoTypeRefSet:compile(Config,?PER,[optimize]), 
+    ?line testChoTypeRefSet_cases(?PER).
+
+testChoTypeRefSet_cases(Rules) ->
+    ?line testChoTypeRefSet:set(Rules).
+
+
+
+testDef(suite) -> [];
+testDef(Config) ->
+
+    ?line testDef:compile(Config,?BER,[]),
+    ?line testDef_cases(?BER),
+
+    ?line ?ber_driver(?BER,testDef:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDef_cases(?BER)),
+
+    ?line testDef:compile(Config,?PER,[]), 
+    ?line testDef_cases(?PER),
+
+    ?line ?per_bit_opt(testDef:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testDef_cases(?PER)),
+
+    ?line ?uper_bin(testDef:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testDef_cases(uper_bin)),
+
+    ?line testDef:compile(Config,?PER,[optimize]), 
+    ?line testDef_cases(?PER).
+
+testDef_cases(Rules) ->
+    ?line testDef:main(Rules).
+
+
+
+testOpt(suite) -> [];
+testOpt(Config) ->
+
+    ?line testOpt:compile(Config,?BER),
+    ?line testOpt_cases(?BER),
+
+    ?line testOpt:compile(Config,?PER), 
+    ?line testOpt_cases(?PER).          
+
+testOpt_cases(Rules) ->
+    ?line testOpt:main(Rules).
+
+
+testEnumExt(suite) -> [];
+testEnumExt(Config) ->
+
+    ?line testEnumExt:compile(Config,?BER,[]),
+    ?line testEnumExt:main(?BER),
+
+    ?line ?ber_driver(?BER,testEnumExt:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testEnumExt:main(?BER)),
+
+    ?line testEnumExt:compile(Config,?PER,[]),
+    ?line testEnumExt:main(?PER),
+
+    ?line ?per_bit_opt(testEnumExt:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testEnumExt:main(?PER)),
+
+    ?line ?uper_bin(testEnumExt:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testEnumExt:main(uper_bin)),
+
+    ?line testEnumExt:compile(Config,?PER,[optimize]),
+    ?line testEnumExt:main(?PER).
+
+testSeqDefault(doc) -> ["Test of OTP-2523 ENUMERATED with extensionmark."];
+testSeqDefault(suite) -> [];
+testSeqDefault(Config) ->
+
+    ?line testSeqDefault:compile(Config,?BER,[]),
+    ?line testSeqDefault_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqDefault:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqDefault_cases(?BER)),
+
+    ?line testSeqDefault:compile(Config,?PER,[]), 
+    ?line testSeqDefault_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqDefault:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqDefault_cases(?PER)),
+
+    ?line ?uper_bin(testSeqDefault:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqDefault_cases(uper_bin)),
+
+    ?line testSeqDefault:compile(Config,?PER,[optimize]), 
+    ?line testSeqDefault_cases(?PER).
+
+testSeqDefault_cases(Rules) ->
+    ?line testSeqDefault:main(Rules).
+
+
+
+testSeqExtension(suite) -> [];
+testSeqExtension(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqExtension:compile(Config,?BER,[]),
+    ?line testSeqExtension_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExtension:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExtension_cases(?BER)).
+
+testSeqExtension_cases(Rules) ->
+    ?line testSeqExtension:main(Rules).
+
+
+
+testSeqExternal(suite) -> [];
+testSeqExternal(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqExternal:compile(Config,?BER,[]),
+    ?line testSeqExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqExternal_cases(?BER)).
+
+testSeqExternal_cases(Rules) ->
+    ?line testSeqExternal:main(Rules).
+
+
+testSeqOptional(suite) -> [];
+testSeqOptional(Config) ->
+
+    ?line testSeqOptional:compile(Config,?BER,[]),
+    ?line testSeqOptional_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqOptional:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOptional_cases(?BER)),
+
+    ?line testSeqOptional:compile(Config,?PER,[]), 
+    ?line testSeqOptional_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqOptional:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOptional_cases(?PER)),
+
+    ?line ?uper_bin(testSeqOptional:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOptional_cases(uper_bin)),
+
+    ?line testSeqOptional:compile(Config,?PER,[optimize]), 
+    ?line testSeqOptional_cases(?PER).
+
+testSeqOptional_cases(Rules) ->
+    ?line testSeqOptional:main(Rules).
+
+
+
+testSeqPrim(suite) -> [];
+testSeqPrim(Config) ->
+
+    ?line testSeqPrim:compile(Config,?BER,[]),
+    ?line testSeqPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqPrim_cases(?BER)),
+
+    ?line testSeqPrim:compile(Config,?PER,[]), 
+    ?line testSeqPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSeqPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqPrim_cases(uper_bin)),
+
+    ?line testSeqPrim:compile(Config,?PER,[optimize]), 
+    ?line testSeqPrim_cases(?PER).
+
+testSeqPrim_cases(Rules) ->
+    ?line testSeqPrim:main(Rules).
+
+
+testSeq2738(doc) -> ["Test of OTP-2738 Detect corrupt optional component."];
+testSeq2738(suite) -> [];
+testSeq2738(Config) ->
+
+    ?line testSeq2738:compile(Config,?BER,[]),
+    ?line testSeq2738_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeq2738:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeq2738_cases(?BER)),
+
+    ?line testSeq2738:compile(Config,?PER,[]), 
+    ?line testSeq2738_cases(?PER),
+
+    ?line ?per_bit_opt(testSeq2738:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeq2738_cases(?PER)),
+
+    ?line ?uper_bin(testSeq2738:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeq2738_cases(uper_bin)),
+
+    ?line testSeq2738:compile(Config,?PER,[optimize]), 
+    ?line testSeq2738_cases(?PER).
+
+testSeq2738_cases(Rules) ->
+    ?line testSeq2738:main(Rules).
+
+
+testSeqTag(suite) -> [];
+testSeqTag(Config) ->
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqTag:compile(Config,?BER,[]),
+    ?line testSeqTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSeqTag:compile(Config,?PER,[]), 
+    ?line testSeqTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSeqTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSeqTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSeqTag:compile(Config,?PER,[optimize]), 
+    ?line testSeqTag_cases(?PER).
+
+testSeqTag_cases(Rules) ->
+    ?line testSeqTag:main(Rules).
+
+
+
+
+testSeqTypeRefCho(suite) -> [];
+testSeqTypeRefCho(Config) ->
+
+    ?line testSeqTypeRefCho:compile(Config,?BER,[]),
+    ?line testSeqTypeRefCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefCho_cases(?BER)),
+
+    ?line testSeqTypeRefCho:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefCho_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefCho_cases(uper_bin)),
+
+    ?line testSeqTypeRefCho:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefCho_cases(?PER).
+
+testSeqTypeRefCho_cases(Rules) ->
+    ?line testSeqTypeRefCho:main(Rules).
+
+
+
+testSeqTypeRefPrim(suite) -> [];
+testSeqTypeRefPrim(Config) ->
+
+    ?line testSeqTypeRefPrim:compile(Config,?BER,[]),
+    ?line testSeqTypeRefPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefPrim_cases(?BER)),
+
+    ?line testSeqTypeRefPrim:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefPrim_cases(uper_bin)),
+
+    ?line testSeqTypeRefPrim:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefPrim_cases(?PER).
+
+testSeqTypeRefPrim_cases(Rules) ->
+    ?line testSeqTypeRefPrim:main(Rules).
+
+
+
+testSeqTypeRefSeq(suite) -> [];
+testSeqTypeRefSeq(Config) ->
+
+    ?line testSeqTypeRefSeq:compile(Config,?BER,[]),
+    ?line testSeqTypeRefSeq_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefSeq:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefSeq_cases(?BER)),
+
+    ?line testSeqTypeRefSeq:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefSeq_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefSeq:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefSeq_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefSeq:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefSeq_cases(uper_bin)),
+
+    ?line testSeqTypeRefSeq:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefSeq_cases(?PER).
+
+testSeqTypeRefSeq_cases(Rules) ->
+    ?line testSeqTypeRefSeq:main(Rules).
+
+
+
+testSeqTypeRefSet(suite) -> [];
+testSeqTypeRefSet(Config) ->
+
+    ?line testSeqTypeRefSet:compile(Config,?BER,[]),
+    ?line testSeqTypeRefSet_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqTypeRefSet:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqTypeRefSet_cases(?BER)),
+
+    ?line testSeqTypeRefSet:compile(Config,?PER,[]), 
+    ?line testSeqTypeRefSet_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqTypeRefSet:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqTypeRefSet_cases(?PER)),
+
+    ?line ?uper_bin(testSeqTypeRefSet:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqTypeRefSet_cases(uper_bin)),
+
+    ?line testSeqTypeRefSet:compile(Config,?PER,[optimize]), 
+    ?line testSeqTypeRefSet_cases(?PER).
+
+testSeqTypeRefSet_cases(Rules) ->
+    ?line testSeqTypeRefSet:main(Rules).
+
+
+
+
+testSeqOf(suite) -> [];
+testSeqOf(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqOf:compile(Config,?BER,[]),
+    ?line testSeqOf_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqOf:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOf_cases(?BER)),
+
+    ?line testSeqOf:compile(Config,?PER,[]), 
+    ?line testSeqOf_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqOf:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOf_cases(?PER)),
+
+    ?line ?uper_bin(testSeqOf:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOf_cases(uper_bin)),
+
+    ?line testSeqOf:compile(Config,?PER,[optimize]), 
+    ?line testSeqOf_cases(?PER).
+
+testSeqOf_cases(Rules) ->
+    ?line testSeqOf:main(Rules).
+
+
+
+
+testSeqOfCho(suite) -> [];
+testSeqOfCho(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqOfCho:compile(Config,?BER,[]),
+    ?line testSeqOfCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSeqOfCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfCho_cases(?BER)),
+
+    ?line testSeqOfCho:compile(Config,?PER,[]), 
+    ?line testSeqOfCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSeqOfCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOfCho_cases(?PER)),
+
+    ?line ?uper_bin(testSeqOfCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOfCho_cases(uper_bin)),
+
+    ?line testSeqOfCho:compile(Config,?PER,[optimize]), 
+    ?line testSeqOfCho_cases(?PER).
+
+testSeqOfIndefinite(suite) -> [];
+testSeqOfIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqOfIndefinite:compile(Config,?BER,[]),
+    ?line testSeqOfIndefinite:main(),
+
+    ?line ?ber_driver(?BER,testSeqOfIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfIndefinite:main()).
+
+testSeqOfCho_cases(Rules) ->
+    ?line testSeqOfCho:main(Rules).
+
+
+testSeqOfExternal(suite) -> [];
+testSeqOfExternal(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqOfExternal:compile(Config,?BER,[]),
+    ?line testSeqOfExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfExternal_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSeqOfExternal:compile(Config,?PER,[]), 
+    ?line testSeqOfExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSeqOfExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOfExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSeqOfExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOfExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSeqOfExternal:compile(Config,?PER,[optimize]), 
+    ?line testSeqOfExternal_cases(?PER).
+
+testSeqOfExternal_cases(Rules) ->
+    ?line testSeqOfExternal:main(Rules).
+
+
+
+testSeqOfTag(suite) -> [];
+testSeqOfTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSeqOfTag:compile(Config,?BER,[]),
+    ?line testSeqOfTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqOfTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSeqOfTag:compile(Config,?PER,[]), 
+    ?line testSeqOfTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSeqOfTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSeqOfTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSeqOfTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSeqOfTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSeqOfTag:compile(Config,?PER,[optimize]), 
+    ?line testSeqOfTag_cases(?PER).
+
+testSeqOfTag_cases(Rules) ->
+    ?line testSeqOfTag:main(Rules).
+
+
+
+
+testSetDefault(suite) -> [];
+testSetDefault(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetDefault:compile(Config,?BER,[]),
+    ?line testSetDefault_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetDefault:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetDefault_cases(?BER)),
+
+    ?line testSetDefault:compile(Config,?PER,[]), 
+    ?line testSetDefault_cases(?PER),
+
+    ?line ?per_bit_opt(testSetDefault:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetDefault_cases(?PER)),
+
+    ?line ?uper_bin(testSetDefault:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetDefault_cases(uper_bin)),
+
+    ?line testSetDefault:compile(Config,?PER,[optimize]), 
+    ?line testSetDefault_cases(?PER).
+
+testSetDefault_cases(Rules) ->
+    ?line testSetDefault:main(Rules).
+
+
+testParamBasic(suite) -> [];
+testParamBasic(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testParamBasic:compile(Config,?BER,[]),
+    ?line testParamBasic_cases(?BER),
+
+    ?line ?ber_driver(?BER,testParamBasic:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testParamBasic_cases(?BER)),
+
+    ?line testParamBasic:compile(Config,?PER,[]),
+    ?line testParamBasic_cases(?PER),
+
+    ?line ?per_bit_opt(testParamBasic:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testParamBasic_cases(?PER)),
+
+    ?line ?uper_bin(testParamBasic:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testParamBasic_cases(uper_bin)),
+
+    ?line testParamBasic:compile(Config,?PER,[optimize]),
+    ?line testParamBasic_cases(?PER).
+
+
+testParamBasic_cases(Rules) ->
+    ?line testParamBasic:main(Rules).
+
+testSetExtension(suite) -> [];
+testSetExtension(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetExtension:compile(Config,?BER,[]),
+    ?line testSetExtension_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExtension:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExtension_cases(?BER)).
+
+testSetExtension_cases(Rules) ->
+    ?line testSetExtension:main(Rules).
+
+
+testSetExternal(suite) -> [];
+testSetExternal(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetExternal:compile(Config,?BER,[]),
+    ?line testSetExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetExternal_cases(?BER)).
+
+testSetExternal_cases(Rules) ->
+    ?line testSetExternal:main(Rules).
+
+
+testSetOptional(suite) -> [];
+testSetOptional(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetOptional:compile(Config,?BER,[]),
+    ?line testSetOptional_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetOptional:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOptional_cases(?BER)),
+
+    ?line testSetOptional:compile(Config,?PER,[]), 
+    ?line testSetOptional_cases(?PER),
+
+    ?line ?per_bit_opt(testSetOptional:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOptional_cases(?PER)),
+
+    ?line ?uper_bin(testSetOptional:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOptional_cases(uper_bin)),
+
+    ?line testSetOptional:compile(Config,?PER,[optimize]), 
+    ?line testSetOptional_cases(?PER).
+
+testSetOptional_cases(Rules) ->
+    ?line ok = testSetOptional:ticket_7533(Rules),
+    ?line ok = testSetOptional:main(Rules).
+
+
+
+
+testSetPrim(suite) -> [];
+testSetPrim(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetPrim:compile(Config,?BER,[]),
+    ?line testSetPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetPrim_cases(?BER)),
+
+    ?line testSetPrim:compile(Config,?PER,[]), 
+    ?line testSetPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSetPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSetPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetPrim_cases(uper_bin)),
+
+    ?line testSetPrim:compile(Config,?PER,[optimize]), 
+    ?line testSetPrim_cases(?PER).
+
+testSetPrim_cases(Rules) ->
+    ?line testSetPrim:main(Rules).
+
+
+
+testSetTag(suite) -> [];
+testSetTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetTag:compile(Config,?BER,[]),
+    ?line testSetTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSetTag:compile(Config,?PER,[]), 
+    ?line testSetTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSetTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSetTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSetTag:compile(Config,?PER,[optimize]), 
+    ?line testSetTag_cases(?PER).
+
+testSetTag_cases(Rules) ->
+    ?line testSetTag:main(Rules).
+
+
+
+testSetTypeRefCho(suite) -> [];
+testSetTypeRefCho(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefCho:compile(Config,?BER,[]),
+    ?line testSetTypeRefCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefCho_cases(?BER)),
+
+    ?line testSetTypeRefCho:compile(Config,?PER,[]), 
+    ?line testSetTypeRefCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefCho_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefCho_cases(uper_bin)),
+
+    ?line testSetTypeRefCho:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefCho_cases(?PER).
+
+testSetTypeRefCho_cases(Rules) ->
+    ?line testSetTypeRefCho:main(Rules).
+
+
+
+testSetTypeRefPrim(suite) -> [];
+testSetTypeRefPrim(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefPrim:compile(Config,?BER,[]),
+    ?line testSetTypeRefPrim_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefPrim:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefPrim_cases(?BER)),
+
+    ?line testSetTypeRefPrim:compile(Config,?PER,[]), 
+    ?line testSetTypeRefPrim_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefPrim:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefPrim_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefPrim:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefPrim_cases(uper_bin)),
+
+    ?line testSetTypeRefPrim:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefPrim_cases(?PER).
+
+testSetTypeRefPrim_cases(Rules) ->
+    ?line testSetTypeRefPrim:main(Rules).
+
+
+
+testSetTypeRefSeq(suite) -> [];
+testSetTypeRefSeq(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefSeq:compile(Config,?BER,[]),
+    ?line testSetTypeRefSeq_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefSeq:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefSeq_cases(?BER)),
+
+    ?line testSetTypeRefSeq:compile(Config,?PER,[]), 
+    ?line testSetTypeRefSeq_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefSeq:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefSeq_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefSeq:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefSeq_cases(uper_bin)),
+
+    ?line testSetTypeRefSeq:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefSeq_cases(?PER).
+
+testSetTypeRefSeq_cases(Rules) ->
+    ?line testSetTypeRefSeq:main(Rules).
+
+
+
+testSetTypeRefSet(suite) -> [];
+testSetTypeRefSet(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetTypeRefSet:compile(Config,?BER,[]),
+    ?line testSetTypeRefSet_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetTypeRefSet:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetTypeRefSet_cases(?BER)),
+
+    ?line testSetTypeRefSet:compile(Config,?PER,[]), 
+    ?line testSetTypeRefSet_cases(?PER),
+
+    ?line ?per_bit_opt(testSetTypeRefSet:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetTypeRefSet_cases(?PER)),
+
+    ?line ?uper_bin(testSetTypeRefSet:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetTypeRefSet_cases(uper_bin)),
+
+    ?line testSetTypeRefSet:compile(Config,?PER,[optimize]), 
+    ?line testSetTypeRefSet_cases(?PER).
+
+testSetTypeRefSet_cases(Rules) ->
+    ?line testSetTypeRefSet:main(Rules).
+
+
+
+testSetOf(suite) -> [];
+testSetOf(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetOf:compile(Config,?BER,[]),
+    ?line testSetOf_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetOf:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOf_cases(?BER)),
+
+    ?line testSetOf:compile(Config,?PER,[]), 
+    ?line testSetOf_cases(?PER),
+
+    ?line ?per_bit_opt(testSetOf:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOf_cases(?PER)),
+
+    ?line ?uper_bin(testSetOf:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOf_cases(uper_bin)),
+
+    ?line testSetOf:compile(Config,?PER,[optimize]), 
+    ?line testSetOf_cases(?PER).
+
+testSetOf_cases(Rules) ->
+    ?line testSetOf:main(Rules).
+
+
+
+testSetOfCho(suite) -> [];
+testSetOfCho(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetOfCho:compile(Config,?BER,[]),
+    ?line testSetOfCho_cases(?BER),
+
+    ?line ?ber_driver(?BER,testSetOfCho:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfCho_cases(?BER)),
+
+    ?line testSetOfCho:compile(Config,?PER,[]), 
+    ?line testSetOfCho_cases(?PER),
+
+    ?line ?per_bit_opt(testSetOfCho:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOfCho_cases(?PER)),
+
+    ?line ?uper_bin(testSetOfCho:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOfCho_cases(uper_bin)),
+
+    ?line testSetOfCho:compile(Config,?PER,[optimize]), 
+    ?line testSetOfCho_cases(?PER).
+
+testSetOfCho_cases(Rules) ->
+    ?line testSetOfCho:main(Rules).
+
+
+testSetOfExternal(suite) -> [];
+testSetOfExternal(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetOfExternal:compile(Config,?BER,[]),
+    ?line testSetOfExternal_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfExternal_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSetOfExternal:compile(Config,?PER,[]), 
+    ?line testSetOfExternal_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSetOfExternal:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOfExternal_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSetOfExternal:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOfExternal_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSetOfExternal:compile(Config,?PER,[optimize]), 
+    ?line testSetOfExternal_cases(?PER).
+
+testSetOfExternal_cases(Rules) ->
+    ?line testSetOfExternal:main(Rules).
+
+
+
+
+testSetOfTag(suite) -> [];
+testSetOfTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testExternal:compile(Config,?BER,[]),
+    ?line testSetOfTag:compile(Config,?BER,[]),
+    ?line testSetOfTag_cases(?BER),
+
+    ?line ?ber_driver(?BER,testExternal:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetOfTag_cases(?BER)),
+
+    ?line testExternal:compile(Config,?PER,[]),
+    ?line testSetOfTag:compile(Config,?PER,[]), 
+    ?line testSetOfTag_cases(?PER),
+
+    ?line ?per_bit_opt(testExternal:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testSetOfTag:compile(Config,?PER,[optimize])), 
+    ?line ?per_bit_opt(testSetOfTag_cases(?PER)),
+
+    ?line ?uper_bin(testExternal:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testSetOfTag:compile(Config,uper_bin,[])), 
+    ?line ?uper_bin(testSetOfTag_cases(uper_bin)),
+
+    ?line testExternal:compile(Config,?PER,[optimize]),
+    ?line testSetOfTag:compile(Config,?PER,[optimize]), 
+    ?line testSetOfTag_cases(?PER).
+
+testSetOfTag_cases(Rules) ->
+    ?line testSetOfTag:main(Rules).
+
+
+c_syntax(suite) -> [];
+c_syntax(Config) ->
+    ?line DataDir%    ?line testExternal:compile(Config,?PER),     
+%    ?line testPrimExternal:compile(Config,?PER), 
+%    ?line testPrimExternal_cases(?PER).          
+ = ?config(data_dir,Config),
+    ?line _TempDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line {error,_R1} = asn1ct:compile(filename:join(DataDir,"Syntax")),
+    ?line {error,_R2} = asn1ct:compile(filename:join(DataDir,"BadTypeEnding")),
+    ?line {error,_R3} = asn1ct:compile(filename:join(DataDir,
+						    "BadValueAssignment1")),
+    ?line {error,_R4} = asn1ct:compile(filename:join(DataDir,
+                                                    "BadValueAssignment2")),
+    ?line {error,_R5} = asn1ct:compile(filename:join(DataDir,
+						    "BadValueSet")),
+    ?line {error,_R6} = asn1ct:compile(filename:join(DataDir,
+						    "ChoiceBadExtension")),
+    ?line {error,_R7} = asn1ct:compile(filename:join(DataDir,
+						"EnumerationBadExtension")),
+    ?line {error,_R8} = asn1ct:compile(filename:join(DataDir,
+						    "Example")),
+    ?line {error,_R9} = asn1ct:compile(filename:join(DataDir,
+						    "Export1")),
+    ?line {error,_R10} = asn1ct:compile(filename:join(DataDir,
+						     "MissingEnd")),
+    ?line {error,_R11} = asn1ct:compile(filename:join(DataDir,
+						     "SequenceBadComma")),
+    ?line {error,_R12} = asn1ct:compile(filename:join(DataDir,
+						"SequenceBadComponentName")),
+    ?line {error,_R13} = asn1ct:compile(filename:join(DataDir,
+						"SequenceBadComponentType")),
+    ?line {error,_R14} = asn1ct:compile(filename:join(DataDir,
+						"SeqBadComma")).
+
+
+c_string_per(suite) -> [];
+c_string_per(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line TempDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"String"),[?PER,{outdir,TempDir}]).
+
+c_string_ber(suite) -> [];
+c_string_ber(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line TempDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"String"),[?BER,{outdir,TempDir}]).
+
+
+c_implicit_before_choice(suite) -> [];
+c_implicit_before_choice(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line TempDir = ?config(priv_dir,Config),
+    ?line {error,_R2} = asn1ct:compile(filename:join(DataDir,"CCSNARG3"),[?BER,{outdir,TempDir}]).
+
+parse(suite) -> [];
+parse(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    M1 = test_modules(),
+%    M2 = parse_modules(),
+    ?line ok = parse1(M1,DataDir,OutDir).
+
+parse1([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[abs,{outdir,OutDir}]),
+    parse1(T,DataDir,OutDir);
+parse1([],_,_) ->
+    ok.
+
+per(suite) -> [];
+per(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = per1(per_modules(),DataDir,OutDir),
+    ?line ?per_bit_opt(per1_bit_opt(per_modules(),DataDir,OutDir)),
+    ?line ok = per1_opt(per_modules(),DataDir,OutDir).
+
+
+per1([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?PER,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    per1(T,DataDir,OutDir);
+per1([],_,_) ->
+    ok.
+
+per1_bit_opt([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?PER,optimize,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    per1_bit_opt(T,DataDir,OutDir);
+per1_bit_opt([],_,_) ->
+    ok.
+
+per1_opt([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?PER,optimized,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    per1_opt(T,DataDir,OutDir);
+per1_opt([],_,_) ->
+    ok.
+
+
+ber_choiceinseq(suite) ->[];
+ber_choiceinseq(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"ChoiceInSeq"),[?BER,{outdir,OutDir}]).
+
+ber_optional(suite) ->[];
+ber_optional(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"SOpttest"),[?BER,{outdir,OutDir}]),
+    ?line V = {'S',{'A',10,asn1_NOVALUE,asn1_NOVALUE},
+	 {'B',asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE},
+	 {'C',asn1_NOVALUE,111,asn1_NOVALUE}},
+    ?line {ok,B} = asn1_wrapper:encode('SOpttest','S',V),
+    ?line Bytes = lists:flatten(B),
+    ?line V2 = asn1_wrapper:decode('SOpttest','S',Bytes),
+    ?line ok = eq(V,element(2,V2)).
+
+ber_optional_keyed_list(suite) ->[];
+ber_optional_keyed_list(Config) ->
+    case ?BER of
+	ber_bin_v2 -> ok;
+	_ ->
+    	   ?line DataDir = ?config(data_dir,Config),
+    	   ?line OutDir = ?config(priv_dir,Config),
+    	   ?line true = code:add_patha(?config(priv_dir,Config)),
+    	   ?line ok = asn1ct:compile(filename:join(DataDir,"SOpttest"),
+			      [?BER,keyed_list,{outdir,OutDir}]),
+    	   ?line Vrecord = {'S',{'A',10,asn1_NOVALUE,asn1_NOVALUE},
+	      {'B',asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE},
+	      {'C',asn1_NOVALUE,111,asn1_NOVALUE}},
+    	   ?line V = [ {a,[{scriptKey,10}]},
+		       {b,[]},
+		       {c,[{callingPartysCategory,111}]} ],
+    	   ?line {ok,B} = asn1_wrapper:encode('SOpttest','S',V),
+    	   ?line Bytes = lists:flatten(B),
+    	   ?line V2 = asn1_wrapper:decode('SOpttest','S',Bytes),
+    	   ?line ok = eq(Vrecord,element(2,V2))
+    end.
+
+
+eq(V,V) ->
+    ok.
+
+
+ber_other(suite) ->[];
+ber_other(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = ber1(ber_modules(),DataDir,OutDir).
+
+
+ber1([M|T],DataDir,OutDir) ->
+    ?line ok = asn1ct:compile(DataDir ++ M,[?BER,{outdir,OutDir}]),
+    ?line ok = asn1ct:test(list_to_atom(M)),
+    ber1(T,DataDir,OutDir);
+ber1([],_,_) ->
+    ok.
+
+default_per(suite) ->[];
+default_per(Config) ->
+    default1(?PER,Config,[]).
+
+default_per_opt(suite) -> [];
+default_per_opt(Config) ->
+    ?per_bit_opt(default1(?PER,Config,[optimize])),
+    default1(?PER,Config,[optimize]).
+
+default_ber(suite) ->[];
+default_ber(Config) ->
+    default1(?BER,Config,[]).
+
+default1(Rule,Config,Options) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(DataDir ++ "Def",[Rule,{outdir,OutDir}]++Options),
+    ?line {ok,Bytes1} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true,
+						 bool1 = true,
+						 bool2 = true,
+						 bool3 = true}),
+    ?line {ok,{'Def1',true,true,true,true}} = asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes1)),
+    
+    ?line {ok,Bytes2} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true}),
+    ?line {ok,{'Def1',true,false,false,false}} = asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes2)),
+
+    ?line {ok,Bytes3} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true,bool2=false}),
+    ?line {ok,{'Def1',true,false,false,false}} = asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes3)).
+    
+    
+value_test(suite) ->[];
+value_test(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(DataDir ++ "ObjIdValues",[?BER,{outdir,OutDir}]),
+    ?line {ok,_} = asn1_wrapper:encode('ObjIdValues','ObjIdType','ObjIdValues':'mobileDomainId'()),
+    ?line ok = asn1ct:compile(DataDir ++ "ObjIdValues",[?PER,{outdir,OutDir}]),
+    ?line {ok,_} = asn1_wrapper:encode('ObjIdValues','ObjIdType','ObjIdValues':'mobileDomainId'()),
+    ?line ok = test_bad_values:tests(Config),
+    ok.
+
+
+constructed(suite) ->
+     [];
+constructed(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    ?line ok = asn1ct:compile(DataDir ++ "Constructed",[?BER,{outdir,OutDir}]),
+    ?line {ok,B} = asn1_wrapper:encode('Constructed','S',{'S',false}),
+    ?line [40,3,1,1,0] = lists:flatten(B),
+    ?line {ok,B1} = asn1_wrapper:encode('Constructed','S2',{'S2',false}),
+    ?line [40,5,48,3,1,1,0] = lists:flatten(B1),
+    ?line {ok,B2} = asn1_wrapper:encode('Constructed','I',10),
+    ?line [136,1,10] = lists:flatten(B2),
+    ok.
+    
+ber_decode_error(suite) -> [];
+ber_decode_error(Config) ->
+    ?line ok = ber_decode_error:compile(Config,?BER,[]),
+    ?line ok = ber_decode_error:run([]),
+
+    ?line ok = ?ber_driver(?BER,ber_decode_error:compile(Config,?BER,[driver])),
+    ?line ok = ?ber_driver(?BER,ber_decode_error:run([driver])),
+	ok.   
+
+h323test(suite) -> 
+    [];
+h323test(Config) ->
+    ?line ok = h323test:compile(Config,?PER,[]),
+    ?line ok = h323test:run(?PER),
+    ?line ?per_bit_opt(h323test:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(h323test:run(?PER)),
+    ?line ?uper_bin(h323test:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(h323test:run(uper_bin)),
+    ?line ok = h323test:compile(Config,?PER,[optimize]),
+    ?line ok = h323test:run(?PER),
+    ok.
+
+per_GeneralString(suite) ->
+     [];
+per_GeneralString(Config) ->
+    case erlang:module_loaded('MULTIMEDIA-SYSTEM-CONTROL') of
+	true ->
+	    ok;
+	false ->
+	    h323test:compile(Config,?PER,[])
+    end,
+    UI = [109,64,1,57],
+    ?line {ok,_V} = asn1_wrapper:decode('MULTIMEDIA-SYSTEM-CONTROL',
+				 'MultimediaSystemControlMessage',UI).
+
+per_open_type(suite) ->
+    [];
+per_open_type(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line ok = asn1ct:compile(DataDir ++ "OpenType",[?PER,{outdir,OutDir}]),
+    Stype = {'Stype',10,true},
+    ?line {ok,Bytes} = asn1_wrapper:encode('OpenType','Ot',Stype),
+    ?line {ok,Stype} = asn1_wrapper:decode('OpenType','Ot',Bytes),
+
+    ?line ?per_bit_opt(ok = asn1ct:compile(DataDir ++ "OpenType",
+			      [?PER,optimize,{outdir,OutDir}])),
+    ?line ?per_bit_opt({ok,Bytes}=asn1_wrapper:encode('OpenType','Ot',Stype)),
+    ?line ?per_bit_opt({ok,Stype}=asn1_wrapper:decode('OpenType','Ot',Bytes)),
+
+    ?line ?uper_bin(ok = asn1ct:compile(DataDir ++ "OpenType",
+			      [uper_bin,{outdir,OutDir}])),
+    ?line ?uper_bin({ok,Bytes}=asn1_wrapper:encode('OpenType','Ot',Stype)),
+    ?line ?uper_bin({ok,Stype}=asn1_wrapper:decode('OpenType','Ot',Bytes)),
+
+    ?line ok = asn1ct:compile(DataDir ++ "OpenType",
+			      [?PER,optimize,{outdir,OutDir}]),
+    ?line {ok,Bytes} = asn1_wrapper:encode('OpenType','Ot',Stype),
+    ?line {ok,Stype} = asn1_wrapper:decode('OpenType','Ot',Bytes).
+
+testConstraints(suite) ->
+	[];
+testConstraints(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testConstraints:compile(Config,?BER,[]),
+    ?line testConstraints:int_constraints(?BER),
+
+    ?line ?ber_driver(?BER,testConstraints:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testConstraints:int_constraints(?BER)),
+
+    ?line testConstraints:compile(Config,?PER,[]),
+    ?line testConstraints:int_constraints(?PER),
+    ?line testConstraints:refed_NNL_name(?PER),
+
+    ?line ?per_bit_opt(testConstraints:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testConstraints:int_constraints(?PER)),
+    ?line ?per_bit_opt(testConstraints:refed_NNL_name(?PER)),
+
+    ?line ?uper_bin(testConstraints:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testConstraints:int_constraints(uper_bin)),
+    ?line ?uper_bin(testConstraints:refed_NNL_name(uper_bin)),
+
+    ?line testConstraints:compile(Config,?PER,[optimize]),
+    ?line testConstraints:int_constraints(?PER),
+    ?line testConstraints:refed_NNL_name(?PER).
+
+testSeqIndefinite(suite) -> [];
+testSeqIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSeqIndefinite:compile(Config,?BER,[]),
+    ?line testSeqIndefinite:main(?BER),
+
+    ?line ?ber_driver(?BER,testSeqIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSeqIndefinite:main(?BER)).
+
+testSetIndefinite(suite) -> [];
+testSetIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testSetIndefinite:compile(Config,?BER,[]),
+    ?line testSetIndefinite:main(?BER),
+
+    ?line ?ber_driver(?BER,testSetIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testSetIndefinite:main(?BER)).
+
+testChoiceIndefinite(suite) -> [];
+testChoiceIndefinite(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testChoiceIndefinite:compile(Config,?BER,[]),
+    ?line testChoiceIndefinite:main(?BER),
+
+    ?line ?ber_driver(?BER,testChoiceIndefinite:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testChoiceIndefinite:main(?BER)).
+
+testInfObjectClass(suite) ->
+    [];
+testInfObjectClass(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line testInfObjectClass:compile(Config,?PER,[]),
+    ?line testInfObjectClass:main(?PER),
+    ?line testInfObj:compile(Config,?PER,[]),
+    ?line testInfObj:main(?PER),
+
+    ?line ?per_bit_opt(testInfObjectClass:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testInfObjectClass:main(?PER)),
+    ?line ?per_bit_opt(testInfObj:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testInfObj:main(?PER)),
+
+    ?line ?uper_bin(testInfObjectClass:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testInfObjectClass:main(uper_bin)),
+    ?line ?uper_bin(testInfObj:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testInfObj:main(uper_bin)),
+
+    ?line testInfObjectClass:compile(Config,?PER,[optimize]),
+    ?line testInfObjectClass:main(?PER),
+    ?line testInfObj:compile(Config,?PER,[optimize]),
+    ?line testInfObj:main(?PER),
+
+    ?line testInfObjectClass:compile(Config,?BER,[]),
+    ?line testInfObjectClass:main(?BER),
+    ?line testInfObj:compile(Config,?BER,[]),
+    ?line testInfObj:main(?BER),
+
+    ?line ?ber_driver(?BER,testInfObjectClass:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testInfObjectClass:main(?BER)),
+    ?line ?ber_driver(?BER,testInfObj:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testInfObj:main(?BER)),
+
+    ?line testInfObj:compile_RANAPfiles(Config,?PER,[]),
+
+    ?line ?per_bit_opt(testInfObj:compile_RANAPfiles(Config,?PER,[optimize])),
+
+    ?line ?uper_bin(testInfObj:compile_RANAPfiles(Config,uper_bin,[])),
+
+    ?line testInfObj:compile_RANAPfiles(Config,?PER,[optimize]),
+
+    ?line testInfObj:compile_RANAPfiles(Config,?BER,[]).
+
+testParameterizedInfObj(suite) ->
+    [];
+testParameterizedInfObj(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line testParameterizedInfObj:compile(Config,?PER,[]),
+    ?line testParameterizedInfObj:main(?PER),
+
+    ?line ?per_bit_opt(testParameterizedInfObj:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testParameterizedInfObj:main(?PER)),
+
+    ?line ?uper_bin(testParameterizedInfObj:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testParameterizedInfObj:main(uper_bin)),
+
+    ?line testParameterizedInfObj:compile(Config,?PER,[optimize]),
+    ?line testParameterizedInfObj:main(?PER),
+
+    ?line testParameterizedInfObj:compile(Config,?BER,[]),
+    ?line testParameterizedInfObj:main(?BER),
+
+    ?line ?ber_driver(?BER,testParameterizedInfObj:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testParameterizedInfObj:main(?BER)).
+
+testMergeCompile(suite) ->
+    [];
+testMergeCompile(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line testMergeCompile:compile(Config,?PER,[]),
+    ?line testMergeCompile:main(?PER),
+    ?line testMergeCompile:mvrasn(?PER),
+
+    ?line ?per_bit_opt(testMergeCompile:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testMergeCompile:main(?PER)),
+    ?line ?per_bit_opt(testMergeCompile:mvrasn(?PER)),
+
+    ?line ?uper_bin(testMergeCompile:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testMergeCompile:main(uper_bin)),
+    ?line ?uper_bin(testMergeCompile:mvrasn(uper_bin)),
+
+    ?line testMergeCompile:compile(Config,?BER,[]),
+    ?line testMergeCompile:main(?BER),
+    ?line testMergeCompile:mvrasn(?BER),
+
+    ?line ?ber_driver(?BER,testMergeCompile:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testMergeCompile:main(?BER)),
+    ?line ?ber_driver(?BER,testMergeCompile:mvrasn(?BER)).
+
+testobj(suite) ->
+    [];
+testobj(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    
+    ?line ok = testRANAP:compile(Config,?PER,[]),
+    ?line ok = testRANAP:testobj(?PER),
+    ?line ok = testParameterizedInfObj:ranap(?PER),
+    
+    ?line ?per_bit_opt(ok = testRANAP:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(ok = testRANAP:testobj(?PER)),
+    ?line ?per_bit_opt(ok = testParameterizedInfObj:ranap(?PER)),
+    
+    ?line ?uper_bin(ok = testRANAP:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(ok = testRANAP:testobj(uper_bin)),
+    ?line ?uper_bin(ok = testParameterizedInfObj:ranap(uper_bin)),
+    
+    ?line ok = testRANAP:compile(Config,?PER,[optimize]),
+    ?line ok = testRANAP:testobj(?PER),
+    ?line ok = testParameterizedInfObj:ranap(?PER),
+
+    ?line ok = testRANAP:compile(Config,?BER,[]),
+    ?line ok = testRANAP:testobj(?BER),
+    ?line ok = testParameterizedInfObj:ranap(?BER),
+
+    ?line ?ber_driver(?BER,testRANAP:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testRANAP:testobj(?BER)),
+    ?line ?ber_driver(?BER,testParameterizedInfObj:ranap(?BER)).
+
+
+testDeepTConstr(suite) ->
+    [];
+testDeepTConstr(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testDeepTConstr:compile(Config,?PER,[]),
+    ?line testDeepTConstr:main(?PER),
+
+    ?line ?per_bit_opt(testDeepTConstr:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testDeepTConstr:main(?PER)),
+
+    ?line ?uper_bin(testDeepTConstr:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testDeepTConstr:main(uper_bin)),
+
+    ?line testDeepTConstr:compile(Config,?PER,[optimize]),
+    ?line testDeepTConstr:main(?PER),
+
+    ?line testDeepTConstr:compile(Config,?BER,[]),
+    ?line testDeepTConstr:main(?BER),
+
+    ?line ?ber_driver(?BER,testDeepTConstr:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDeepTConstr:main(?BER)).
+
+testInvokeMod(suite) ->
+    [];
+testInvokeMod(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line ok = asn1ct:compile(filename:join(DataDir,"PrimStrings"),[{outdir,OutDir}]),
+    ?line {ok,_Result1} = 'PrimStrings':encode('Bs1',[1,0,1,0]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"PrimStrings"),[?PER,{outdir,OutDir}]),
+    ?line {ok,_Result2} = 'PrimStrings':encode('Bs1',[1,0,1,0]).
+
+testExport(suite) ->
+    [];
+testExport(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line {error,{asn1,_Reason}} = asn1ct:compile(filename:join(DataDir,"IllegalExport"),[{outdir,OutDir}]).
+
+testImport(suite) ->
+    [];
+testImport(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line _OutDir = ?config(priv_dir,Config),
+    ?line {error,_} = asn1ct:compile(filename:join(DataDir,"ImportsFrom"),[?BER]),
+    ok.
+
+testMegaco(suite) ->
+    [];
+testMegaco(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+    io:format("Config: ~p~n",[Config]),
+    ?line {ok,ModuleName1,ModuleName2} = testMegaco:compile(Config,?BER,[]),
+    ?line ok = testMegaco:main(ModuleName1,Config),
+    ?line ok = testMegaco:main(ModuleName2,Config),
+
+    case ?BER of
+	ber_bin_v2 ->
+	    ?line {ok,ModuleName3,ModuleName4} = testMegaco:compile(Config,?BER,[driver]),
+	    ?line ok = testMegaco:main(ModuleName3,Config),
+	    ?line ok = testMegaco:main(ModuleName4,Config);
+	_-> ok
+    end,
+
+    ?line {ok,ModuleName5,ModuleName6} = testMegaco:compile(Config,?PER,[]),
+    ?line ok = testMegaco:main(ModuleName5,Config),
+    ?line ok = testMegaco:main(ModuleName6,Config),
+
+    ?line ?per_bit_opt({ok,ModuleName5,ModuleName6} = testMegaco:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(ok = testMegaco:main(ModuleName5,Config)),
+    ?line ?per_bit_opt(ok = testMegaco:main(ModuleName6,Config)),
+
+    ?line ?uper_bin({ok,ModuleName5,ModuleName6} = testMegaco:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(ok = testMegaco:main(ModuleName5,Config)),
+    ?line ?uper_bin(ok = testMegaco:main(ModuleName6,Config)),
+
+    ?line {ok,ModuleName7,ModuleName8} = testMegaco:compile(Config,?PER,[optimize]),
+    ?line ok = testMegaco:main(ModuleName7,Config),
+    ?line ok = testMegaco:main(ModuleName8,Config).
+
+
+testMvrasn6(suite) -> [];
+testMvrasn6(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testMvrasn6:compile(Config,?BER),
+    ?line testMvrasn6:main().
+
+testContextSwitchingTypes(suite) -> [];
+testContextSwitchingTypes(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testContextSwitchingTypes:compile(Config,?BER,[]),
+    ?line testContextSwitchingTypes:test(),
+
+    ?line ?ber_driver(?BER,testContextSwitchingTypes:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testContextSwitchingTypes:test()),
+
+    ?line testContextSwitchingTypes:compile(Config,?PER,[]),
+    ?line testContextSwitchingTypes:test(),
+
+    ?line ?per_bit_opt(testContextSwitchingTypes:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testContextSwitchingTypes:test()),
+
+    ?line ?uper_bin(testContextSwitchingTypes:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testContextSwitchingTypes:test()),
+
+    ?line testContextSwitchingTypes:compile(Config,?PER,[optimize]),
+    ?line testContextSwitchingTypes:test().
+
+testTypeValueNotation(suite) -> [];
+testTypeValueNotation(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    case ?BER of
+	Ber when Ber == ber; Ber == ber_bin ->
+	    ?line testTypeValueNotation:compile(Config,?BER,[]),
+	    ?line testTypeValueNotation:main(?BER,dummy);
+	_ ->
+	    ok
+    end,
+
+    ?line ?ber_driver(?BER,testTypeValueNotation:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testTypeValueNotation:main(?BER,optimize)),
+
+    case ?BER of
+	Ber2 when Ber2 == ber; Ber2 == ber_bin ->
+	    ?line testTypeValueNotation:compile(Config,?PER,[]),
+	    ?line testTypeValueNotation:main(?PER,dummy);
+	_ ->
+	    ok
+    end,
+
+    ?line ?per_bit_opt(testTypeValueNotation:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testTypeValueNotation:main(?PER,optimize)),
+
+    ?line ?uper_bin(testTypeValueNotation:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testTypeValueNotation:main(uper_bin,optimize)),
+    case ?BER of
+	Ber3 when Ber3 == ber; Ber3 == ber_bin ->
+	    ?line testTypeValueNotation:compile(Config,?PER,[optimize]),
+	    ?line testTypeValueNotation:main(?PER,optimize);
+	_ ->
+	    ok
+     end.
+
+testOpenTypeImplicitTag(suite) -> [];
+testOpenTypeImplicitTag(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testOpenTypeImplicitTag:compile(Config,?BER,[]),
+    ?line testOpenTypeImplicitTag:main(?BER),
+
+    ?line ?ber_driver(?BER,testOpenTypeImplicitTag:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testOpenTypeImplicitTag:main(?BER)),
+
+    ?line testOpenTypeImplicitTag:compile(Config,?PER,[]),
+    ?line testOpenTypeImplicitTag:main(?PER),
+
+    ?line ?per_bit_opt(testOpenTypeImplicitTag:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testOpenTypeImplicitTag:main(?PER)),
+
+    ?line ?uper_bin(testOpenTypeImplicitTag:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testOpenTypeImplicitTag:main(uper_bin)),
+
+    ?line testOpenTypeImplicitTag:compile(Config,?PER,[optimize]),
+    ?line testOpenTypeImplicitTag:main(?PER).
+
+duplicate_tags(suite) -> [];
+duplicate_tags(Config) ->
+	?line DataDir = ?config(data_dir,Config),
+	{error,{asn1,[{error,{type,_,_,'SeqOpt1Imp',{asn1,{duplicates_of_the_tags,_}}}}]}} = 
+	asn1ct:compile(filename:join(DataDir,"SeqOptional2"),[abs]),
+	ok.
+
+rtUI(suite) -> [];
+rtUI(Config) -> 
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Prim"),[?BER]),
+    ?line {ok,_} = asn1rt:info('Prim'),
+
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Prim"),[?PER]),
+    ?line {ok,_} = asn1rt:info('Prim'),
+
+    ?line ok = asn1rt:load_driver(),
+    ?line ok = asn1rt:load_driver(),
+    ?line ok = asn1rt:unload_driver().
+
+testROSE(suite) -> [];
+testROSE(Config) -> 
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testROSE:compile(Config,?BER,[]),
+
+    ?line testROSE:compile(Config,?PER,[]),
+    ?line ?per_bit_opt(testROSE:compile(Config,?PER,[optimize])),
+    ?line ?uper_bin(testROSE:compile(Config,uper_bin,[])),
+    ?line testROSE:compile(Config,?PER,[optimize]).
+
+testINSTANCE_OF(suite) -> [];
+testINSTANCE_OF(Config) ->
+    ?line testINSTANCE_OF:compile(Config,?BER,[]),
+    ?line testINSTANCE_OF:main(?BER),
+
+    ?line ?ber_driver(?BER,testINSTANCE_OF:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testINSTANCE_OF:main(?BER)),
+
+    ?line testINSTANCE_OF:compile(Config,?PER,[]),
+    ?line testINSTANCE_OF:main(?PER),
+
+    ?line ?per_bit_opt(testINSTANCE_OF:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testINSTANCE_OF:main(?PER)),
+
+    ?line ?uper_bin(testINSTANCE_OF:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testINSTANCE_OF:main(uper_bin)),
+
+    ?line testINSTANCE_OF:compile(Config,?PER,[optimize]),
+    ?line testINSTANCE_OF:main(?PER).
+
+testTCAP(suite) -> [];
+testTCAP(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testTCAP:compile(Config,?BER,[]),
+    ?line testTCAP:test(?BER,Config),
+
+    ?line ?ber_driver(?BER,testTCAP:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testTCAP:test(?BER,Config)),
+
+    ?line ?ber_driver(?BER,testTCAP:compile_asn1config(Config,?BER,[asn1config])),
+    ?line ?ber_driver(?BER,testTCAP:test_asn1config()).
+
+testDER(suite) ->[];
+testDER(Config) ->
+    ?line true = code:add_patha(?config(priv_dir,Config)),
+
+    ?line testDER:compile(Config,?BER,[]),
+    ?line testDER:test(),
+
+    ?line ?ber_driver(?BER,testDER:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDER:test()),
+
+    ?line testParamBasic:compile_der(Config,?BER),
+    ?line testParamBasic_cases(der),
+
+
+    ?line testSeqSetDefaultVal:compile(Config,?BER),
+    ?line testSeqSetDefaultVal_cases(?BER).
+
+testSeqSetDefaultVal_cases(?BER) ->
+    ?line testSeqSetDefaultVal:main(?BER).
+
+
+specialized_decodes(suite) -> [];
+specialized_decodes(Config) ->
+    ?line test_partial_incomplete_decode:compile(Config,?BER,[optimize]),
+    ?line test_partial_incomplete_decode:test(?BER,Config),
+    ?line test_selective_decode:test(?BER,Config).
+
+special_decode_performance(suite) ->[];
+special_decode_performance(Config) ->
+    ?line ?ber_driver(?BER,test_special_decode_performance:compile(Config,?BER)),
+    ?line ?ber_driver(?BER,test_special_decode_performance:go(all)).
+
+
+test_driver_load(suite) -> [];
+test_driver_load(Config) ->
+    ?line test_driver_load:compile(Config,?PER),
+    ?line test_driver_load:test(?PER,5).
+
+test_ParamTypeInfObj(suite) -> [];
+test_ParamTypeInfObj(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"IN-CS-1-Datatypes"),[ber_bin]).
+
+test_WS_ParamClass(suite) -> [];
+test_WS_ParamClass(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"InformationFramework"),
+				[ber_bin]).
+
+test_Defed_ObjectIdentifier(suite) -> [];
+test_Defed_ObjectIdentifier(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"UsefulDefinitions"),
+				[ber_bin]).
+
+testSelectionType(suite) -> [];
+testSelectionType(Config) ->
+
+    ?line ok = testSelectionTypes:compile(Config,?BER,[]),
+    ?line {ok,_}  = testSelectionTypes:test(),
+
+    ?line ok = testSelectionTypes:compile(Config,?PER,[]),
+    ?line {ok,_}  = testSelectionTypes:test().
+
+testSSLspecs(suite) -> [];
+testSSLspecs(Config) ->
+
+    ?line ok = testSSLspecs:compile(Config,?BER,
+				[optimize,compact_bit_string,der]),
+    ?line testSSLspecs:run(?BER),
+
+    case code:which(asn1ct) of
+       cover_compiled ->
+	   ok;
+       _ ->
+           ?line ok = testSSLspecs:compile_inline(Config,?BER),
+           ?line ok = testSSLspecs:run_inline(?BER)
+    end.
+
+testNortel(suite) -> [];
+testNortel(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),[?BER]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?BER,optimize]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?BER,optimize,driver]),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),[?PER]),
+    ?line ?per_bit_opt(ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?PER,optimize])),
+    ?line ?uper_bin(ok = asn1ct:compile(filename:join(DataDir,"Nortel"),[uper_bin])),
+    ?line ok = asn1ct:compile(filename:join(DataDir,"Nortel"),
+				[?PER,optimize]).
+test_undecoded_rest(suite) -> [];
+test_undecoded_rest(Config) ->
+
+    ?line ok = test_undecoded_rest:compile(Config,?BER,[]),
+    ?line ok = test_undecoded_rest:test([]),
+
+    ?line ok = test_undecoded_rest:compile(Config,?BER,[undec_rest]),
+    ?line ok = test_undecoded_rest:test(undec_rest),
+
+    ?line ok = test_undecoded_rest:compile(Config,?PER,[]),
+    ?line ok = test_undecoded_rest:test([]),
+
+    ?line ?per_bit_opt(ok = test_undecoded_rest:compile(Config,?PER,[optimize,undec_rest])),
+    ?line ?per_bit_opt(ok = test_undecoded_rest:test(undec_rest)),
+
+    ?line ?uper_bin(ok = test_undecoded_rest:compile(Config,uper_bin,[undec_rest])),
+    ?line ?uper_bin(ok = test_undecoded_rest:test(undec_rest)),
+
+    ?line ok = test_undecoded_rest:compile(Config,?PER,[undec_rest]),
+    ?line ok = test_undecoded_rest:test(undec_rest).
+
+test_inline(suite) -> [];
+test_inline(Config) ->
+    case code:which(asn1ct) of
+       cover_compiled ->
+          {skip,"Not runnable when cover compiled"};
+       _  ->
+          ?line ok=test_inline:compile(Config,?BER,[]),
+          ?line test_inline:main(?BER),
+    	  ?line test_inline:inline1(Config,?BER,[]),
+     	  ?line test_inline:performance2()
+    end.
+
+%test_inline_prf(suite) -> [];
+%test_inline_prf(Config) ->
+%    ?line test_inline:performance(Config).
+
+testTcapsystem(suite) -> [];
+testTcapsystem(Config) ->
+    ?line ok=testTcapsystem:compile(Config,?BER,[]).
+
+testNBAPsystem(suite) -> [];
+testNBAPsystem(Config) ->
+    ?line ok=testNBAPsystem:compile(Config,?PER,?per_optimize(?BER)),
+    ?line ok=testNBAPsystem:test(?PER,Config).
+
+test_compile_options(suite) -> [];
+test_compile_options(Config) ->
+    case code:which(asn1ct) of
+       cover_compiled ->
+          {skip,"Not runnable when cover compiled"};
+       _  ->
+    	  ?line ok = test_compile_options:wrong_path(Config),
+    	  ?line ok = test_compile_options:path(Config),
+    	  ?line ok = test_compile_options:noobj(Config),
+	  ?line ok = test_compile_options:record_name_prefix(Config),
+	  ?line ok = test_compile_options:verbose(Config)
+    end.
+testDoubleEllipses(suite) ->  [];
+testDoubleEllipses(Config) ->
+    ?line testDoubleEllipses:compile(Config,?BER,[]),
+    ?line testDoubleEllipses:main(?BER),
+    ?line ?ber_driver(?BER,testDoubleEllipses:compile(Config,?BER,[driver])),
+    ?line ?ber_driver(?BER,testDoubleEllipses:main(?BER)),
+    ?line ?per_bit_opt(testDoubleEllipses:compile(Config,?PER,[optimize])),
+    ?line ?per_bit_opt(testDoubleEllipses:main(?PER)),
+    ?line ?uper_bin(testDoubleEllipses:compile(Config,uper_bin,[])),
+    ?line ?uper_bin(testDoubleEllipses:main(uper_bin)),
+    ?line testDoubleEllipses:compile(Config,?PER,?per_optimize(?BER)),
+    ?line testDoubleEllipses:main(?PER).
+
+test_modified_x420(suite) -> [];
+test_modified_x420(Config) ->
+    ?line test_modified_x420:compile(Config),
+    ?line test_modified_x420:test_io(Config).
+
+testX420(suite) -> [];
+testX420(Config) ->
+    ?line testX420:compile(?BER,[der],Config),
+    ?line ok = testX420:ticket7759(?BER,Config),
+    ?line testX420:compile(?PER,[],Config).
+
+test_x691(suite) -> [];
+test_x691(Config) ->
+    case ?PER of
+	per ->
+    	   ?line ok = test_x691:compile(Config,uper_bin,[]),
+    	   ?line true = test_x691:cases(uper_bin,unaligned),
+	   ?line ok = test_x691:compile(Config,?PER,[]),
+    	   ?line true = test_x691:cases(?PER,aligned),
+%%	   ?line ok = asn1_test_lib:ticket_7678(Config,[]),
+	   ?line ok = asn1_test_lib:ticket_7708(Config,[]),
+	   ?line ok = asn1_test_lib:ticket_7763(Config);
+	_ ->
+	   ?line ok = test_x691:compile(Config,?PER,?per_optimize(?BER)),
+    	   ?line true = test_x691:cases(?PER,aligned)
+    end.
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[]),
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[compact_bit_string]),
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[optimize]),
+%%    ?line ok = asn1_test_lib:ticket_7876(Config,?PER,[optimize,compact_bit_string]).
+
+
+ticket_6143(suite) -> [];
+ticket_6143(Config) ->
+    ?line ok = test_compile_options:ticket_6143(Config).
+
+testExtensionAdditionGroup(suite) -> [];
+testExtensionAdditionGroup(Config) ->
+	?line DataDir = ?config(data_dir,Config),
+	?line PrivDir = ?config(priv_dir,Config),
+	?line Path = code:get_path(),
+	?line code:add_patha(PrivDir),
+	DoIt = fun(Erule) ->
+		?line ok = asn1ct:compile(filename:join(DataDir,"Extension-Addition-Group"),[Erule,{outdir,PrivDir}]),
+		?line {ok,_M} = compile:file(filename:join(DataDir,"extensionAdditionGroup"),[{i,PrivDir},{outdir,PrivDir},debug_info]),
+		?line ok = extensionAdditionGroup:run(Erule)
+	       end,
+	?line [DoIt(Rule)|| Rule <- [per_bin,uper_bin,ber_bin]],
+	?line code:set_path(Path).
+
+
+
+% parse_modules() ->
+%	["ImportsFrom"].
+
+per_modules() ->
+	[X || X <- test_modules()].
+ber_modules() ->
+	[X || X <- test_modules(),
+		X =/= "CommonDataTypes",
+		X =/= "DS-EquipmentUser-CommonFunctionOrig-TransmissionPath",
+		X =/= "H323-MESSAGES",
+	        X =/= "H235-SECURITY-MESSAGES",
+	        X =/= "MULTIMEDIA-SYSTEM-CONTROL"].
+test_modules() ->
+    _Modules = [
+	       "BitStr",
+	       "CommonDataTypes",
+	       "Constraints",
+	       "ContextSwitchingTypes",
+	       "DS-EquipmentUser-CommonFunctionOrig-TransmissionPath",
+	       "Enum",
+	       "From",
+	       "H235-SECURITY-MESSAGES",
+	       "H323-MESSAGES",
+	       %%"MULTIMEDIA-SYSTEM-CONTROL", recursive type , problem for asn1ct:value
+	       "Import",
+	       "Int",
+	       "MAP-commonDataTypes",
+% ambigous tags	       "MAP-insertSubscriberData-def",
+	       "Null",
+	       "Octetstr",
+	       "One",
+	       "P-Record",
+	       "P",
+%	       "PDUs",
+	       "Person",
+	       "PrimStrings",
+	       "Real",
+	       "XSeq",
+	       "XSeqOf",
+	       "XSet",
+	       "XSetOf",
+	       "String",
+	       "SwCDR",
+%	       "Syntax",
+	       "Time"
+% ANY	       "Tst",
+%	       "Two",
+% errors that should be detected      "UndefType"
+] ++
+	[
+	 "SeqSetLib", % must be compiled before Seq and Set
+	 "Seq",
+	 "Set",
+	 "SetOf",
+	 "SeqOf",
+	 "Prim",
+	 "Cho",
+	 "Def",
+         "Opt",
+	 "ELDAPv3",
+	 "LDAP"
+	].
+
+
+common() -> 
+[].
+
+particular() -> 
+[smp, ticket7904].
+
+
+smp(suite) -> [];
+smp(Config)  ->
+    case erlang:system_info(smp_support) of
+	true ->
+	    NumOfProcs = erlang:system_info(schedulers),
+	    io:format("smp starting ~p workers\n",[NumOfProcs]),
+
+            ?line Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
+	    ?line ok = testNBAPsystem:compile(Config,per_bin,[optimize]),
+
+            Parent = self(),
+	    
+	    ?line ok = asn1rt:load_driver(),
+	
+	    smp2(Parent,NumOfProcs,Msg,2),
+
+	    N = 10000,
+
+            ?line {Time1,ok} = timer:tc(?MODULE,smp2,[Parent,NumOfProcs,Msg, N]),
+	    ?line {Time1S,ok} = timer:tc(?MODULE,sequential,[NumOfProcs * N,Msg]),
+
+	    ?line ok = testNBAPsystem:compile(Config,ber_bin,[optimize,driver]),
+            ?line {Time2,ok} = timer:tc(?MODULE,smp2,[Parent,NumOfProcs,Msg, N]),
+
+	    ?line {Time2S,ok} = timer:tc(?MODULE,sequential,[NumOfProcs * N,Msg]),
+
+            {comment,lists:flatten(io_lib:format("Encode/decode time parallell with ~p cores: ~p [microsecs]~nEncode/decode time sequential: ~p [microsecs]",[NumOfProcs,Time1+Time2,Time1S+Time2S]))};
+        false ->
+            {skipped,"No smp support"}
+    end.
+
+smp2(Parent,NumOfProcs,Msg, N) ->
+    Pids = [spawn_link(fun() -> worker(Msg,Parent, N) end)
+		    || _ <- lists:seq(1,NumOfProcs)],
+    ?line ok = wait_pids(Pids).
+
+worker(Msg, Parent, N) ->
+    %% io:format("smp worker ~p with ~p worker loops.~n",[self(), N]),
+    worker_loop(N, Msg),
+    Parent ! self().
+
+worker_loop(0, _Msg) ->
+    ok;
+worker_loop(N, Msg) ->
+    ?line {ok,B}=asn1_wrapper:encode('NBAP-PDU-Discriptions',
+				     'NBAP-PDU',
+				     Msg),
+    ?line {ok,_Msg}=asn1_wrapper:decode('NBAP-PDU-Discriptions',
+				     'NBAP-PDU',
+				     B),
+    worker_loop(N - 1, Msg).
+
+
+wait_pids([]) -> 
+    ok;
+wait_pids(Pids) ->
+    receive
+	Pid when is_pid(Pid) ->
+	    ?line true = lists:member(Pid,Pids),
+	    Others = lists:delete(Pid,Pids),
+	    io:format("wait_pid got ~p, still waiting for ~p\n",[Pid,Others]),
+	    wait_pids(Others);
+        Err ->
+	    io:format("Err: ~p~n",[Err]),
+	    ?line exit(Err)
+    end.
+
+sequential(N,Msg) ->
+     %%io:format("sequential encode/decode with N = ~p~n",[N]),
+     worker_loop(N,Msg).
+    
+-record('InitiatingMessage',{procedureCode,criticality,value}).
+-record('Iu-ReleaseCommand',{first,second}).
+
+ticket7904(suite) -> [];
+ticket7904(Config) ->
+    ?line DataDir = ?config(data_dir,Config),
+    ?line OutDir = ?config(priv_dir,Config),
+
+    ?line ok = asn1ct:compile(DataDir ++ 
+		      "RANAPextract1",[per_bin,optimize,{outdir,OutDir}]),
+
+    Val1 = #'InitiatingMessage'{procedureCode=1,
+				criticality=ignore,
+				value=#'Iu-ReleaseCommand'{
+				  first=13,
+				  second=true}},
+
+    ?line {ok,_} = 'RANAPextract1':encode('InitiatingMessage', Val1),
+    asn1rt:unload_driver(),
+    ?line {ok,_} = 'RANAPextract1':encode('InitiatingMessage', Val1).
diff --git a/lib/asn1/test/test_compile_options.erl b/lib/asn1/test/test_compile_options.erl
index 83f38c5e6d..5e027cdedb 100644
--- a/lib/asn1/test/test_compile_options.erl
+++ b/lib/asn1/test/test_compile_options.erl
@@ -132,7 +132,7 @@ verbose(Config) when is_list(Config) ->
     ?line ok = asn1ct:compile(Asn1File, [{i,DataDir},{outdir,OutDir},noobj,verbose]),
     ?line test_server:capture_stop(),
     ?line [Line0|_] = test_server:capture_get(),
-    ?line lists:prefix("Erlang ASN.1 version", Line0),
+    ?line true = lists:prefix("Erlang ASN.1 version", Line0),
 
     %% Test non-verbose compile
     ?line test_server:capture_start(),
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 32151a0cac..e900a52286 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1,318 +1,2 @@
-#next version number to use is 1.6.14 | 1.7 | 2.0
-ASN1_VSN = 1.6.13
-
-TICKETS = OTP-8463
-
-TICKETS_1.6.13 = \
-	OTP-8463
-
-TICKETS_1.6.12 = \
-	OTP-8256
-
-TICKETS_1.6.11 = \
-	OTP-8136 \
-	OTP-8047 \
-	OTP-8046 \
-	OTP-8043 \
-	OTP-7972
-
-TICKETS_1.6.10 = \
-	OTP-7954 \
-	OTP-7953
-
-TICKETS_1.6.10 = \
-	OTP-7954 \
-	OTP-7953
-
-TICKETS_1.6.9 = \
-	OTP-7909 \
-	OTP-7904
-
-TICKETS_1.6.8.1 = \
-	OTP-7900 \
-	OTP-7910
-
-TICKETS_1.6.8 = \
-	OTP-7876
-
-TICKETS_1.6.7 = \
-	OTP-7801 \
-	OTP-7806
-
-TICKETS_1.6.6 = \
-	OTP-7759 \
-	OTP-7763
-
-TICKETS_1.6.5 = \
-	OTP-7734
-
-TICKETS_1.6.4 = \
-	OTP-7708
-
-TICKETS_1.6.3 = \
-	OTP-7681 \
-	OTP-7678
-
-TICKETS_1.6.2 = \
-	OTP-7608
-
-TICKETS_1.6.1 = \
-	OTP-7602 \
-	OTP-7533 \
-	OTP-7476 \
-	OTP-7334 \
-	OTP-7332 \
-	OTP-7322 \
-	OTP-7306 \
-	OTP-7299 \
-	OTP-7295 \
-	OTP-7204 \
-	OTP-7174 \
-	OTP-7166
-
-TICKETS_1.6 = \
-	OTP-7407 \
-	OTP-7403 \
-	OTP-7400 \
-	OTP-7375 \
-	OTP-7374 \
-	OTP-7335
-
-TICKETS_1.5.2 = \
-	OTP-7263 \
-	OTP-7264 \
-	OTP-7268 \
-	OTP-7269 \
-	OTP-7273
-
-TICKETS_1.5.1 = \
-	OTP-7149 \
-	OTP-7151 \
-	OTP-7154 \
-	OTP-7155 \
-	OTP-7169 \
-	OTP-7171 \
-	OTP-7193 \
-	OTP-7199
-
-TICKETS_1.5 = \
-	OTP-6835 \
-	OTP-6882
-
-TICKETS_1.4.7 = \
-	OTP-6828
-
-TICKETS_1.4.6 = \
-	OTP-5067 \
-	OTP-6763 \
-	OTP-6769 \
-	OTP-6770 \
-	OTP-6786
-
-TICKETS_1.4.5 = \
-	OTP-6493 \
-	OTP-6601 \
-	OTP-6695 \
-	OTP-6698 \
-	OTP-6702 \
-	OTP-6707 \
-	OTP-6717
-
-TICKETS_1.4.4.14 = \
-	OTP-6462 \
-	OTP-6506
-
-TICKETS_1.4.4.13 = \
-	OTP-6405
-
-TICKETS_1.4.4.12 = \
-	OTP-6314
-
-TICKETS_1.4.4.11 = \
-	OTP-6143
-
-TICKETS_1.4.4.10 = \
-	OTP-6111 \
-	OTP-5932
-
-TICKETS_1.4.4.9 = \
-	OTP-5783 \
-	OTP-5788 \
-	OTP-5812 \
-	OTP-5831 \
-	OPT-5832
-
-TICKETS_1.4.4.8 = \
-	OTP-5687 \
-	OTP-5688 \
-	OTP-5689 \
-	OTP-5701 \
-	OTP-5710
-
-TICKETS_1.4.4.7 = \
-	OTP-5477 \
-	OTP-5509 \
-	OTP-5511 \
-	OTP-5602 \
-	OTP-5616
-
-TICKETS_1.4.4.6 = \
-	OTP-5457 \
-	OTP-5466
-
-TICKETS_1.4.4.5 = \
-	OTP-5302 \
-	OTP-5378
-
-TICKETS_1.4.4.4 = \
-	OTP-5240 \
-	OTP-5243
-
-TICKETS_1.4.4.3 = \
-	OTP-5103 \
-	OTP-5104
-
-TICKETS_1.4.4.2 = \
-	OTP-5022
-
-TICKETS_1.4.4.1 = \
-	OTP-4970
-
-TICKETS_1.4.4 = \
-	OTP-4893 \
-	OTP-4894 \
-	OTP-4895 \
-	OTP-4917 \
-	OTP-4918 \
-	OTP-4919 \
-	OTP-4944 \
-	OTP-4953 \
-	OTP-4955 \
-	OTP-4957 \
-	OTP-4965
-
-TICKETS_1.4.3.1 = \
-	OTP-4866 \
-	OTP-4869 \
-	OTP-4872
-
-TICKETS_1.4.3 = \
-	OTP-4832 \
-	OTP-4833 \
-	OTP-4835 \
-	OTP-4856
-
-TICKETS_1.4.2.1 = \
-	OTP-4773 \
-	OTP-4791 \
-	OTP-4792 \
-	OTP-4797 \
-	OTP-4798 \
-	OTP-4799 \
-	OTP-4809
-
-# OTP R9C
-TICKETS_1.4.2 = \
-	OTP-4693 \
-	OTP-4744
-
-TICKETS_1.4.1.1 = \
-	OTP-4663 \
-	OTP-4665 \
-	OTP-4666
-
-TICKETS_1.4.1 = \
-	OTP-4559 \
-	OTP-4560 \
-	OTP-4590 \
-	OTP-4591 \
-	OTP-4592 \
-	OTP-4631 \
-	OTP-4633
-
-TICKETS_1.4 = \
-	OTP-3304
-
-TICKETS_1.3.3.1 = \
-	OTP-4353 \
-	OTP-4354 \
-	OTP-4390 \
-	OTP-4395
-
-TICKETS_1.3.3 = \
-	OTP-4381 \
-	OTP-4358 \
-	OTP-4355 \
-	OTP-4275 \
-	OTP-4248 \
-	OTP-4247 \
-	OTP-4242 \
-	OTP-4235 \
-	OTP-4234 \
-	OTP-4232 \
-	OTP-4200 \
-	OTP-4161 \
-	OTP-4129
-
-TICKETS_1.3.2 = \
-	OTP-4094 \
-	OTP-4103 \
-	OTP-3980 \
-	OTP-4073
-
-TICKETS_1.3.1.1 = \
-	OTP-4037 \
-	OTP-4057 \
-	OTP-4058
-
-TICKETS_1.3.1 = \
-	OTP-4025 \
-	OTP-4026 
-
-TICKETS_1.3 = \
-	OTP-3463 \
-	OTP-3659 \
-	OTP-3978 \
-	OTP-3979 \
-	OTP-3981 \
-	OTP-3982 \
-	OTP-3983 \
-	OTP-3985 \
-	OTP-3988 \
-	OTP-3984 \
-	OTP-3994
-
-TICKETS_1.2.9.6 = \
-	OTP-3830
-
-TICKETS_1.2.9.5 = \
-	OTP-3713 \
-	OTP-3796 \
-	OTP-3811 
-
-TICKETS_1.2.9.3 = \
-	OTP-3700 \
-	OTP-3701
-
-TICKETS_1.2.9.2 = \
-	OTP-xxxx
-
-TICKETS_1.2.9.1 = \
-	OTP-xxxx
-
-TICKETS_1.2.9 = \
-	OTP-3569 \
-	OTP-3573
-
-TICKETS_1.2.8 = \
-	OTP-3496
-
-TICKETS_1.2.7 = \
-	OTP-3395
-
-TICKETS_1.2.6 = \
-	OTP-3352
-
-TICKETS_1.2.5 = \
-	OTP-3341
-
+#next version number to use is 1.6.15 | 1.7 | 2.0
+ASN1_VSN = 1.6.15
diff --git a/lib/common_test/AUTHORS b/lib/common_test/AUTHORS
index 152ec1868f..ff443e89e8 100644
--- a/lib/common_test/AUTHORS
+++ b/lib/common_test/AUTHORS
@@ -5,3 +5,4 @@ Siri Hansen
 Kenneth Lundin
 Ingela Anderton
 Niclas Eklund
+Andrey Pampukha
diff --git a/lib/common_test/Makefile b/lib/common_test/Makefile
index ebca4523ab..aecec1a50d 100644
--- a/lib/common_test/Makefile
+++ b/lib/common_test/Makefile
@@ -1,19 +1,19 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2003-2010. 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%
 #
 
diff --git a/lib/common_test/doc/src/Makefile b/lib/common_test/doc/src/Makefile
index a2c014418d..a914dd0c19 100644
--- a/lib/common_test/doc/src/Makefile
+++ b/lib/common_test/doc/src/Makefile
@@ -45,13 +45,14 @@ CT_MODULES = \
 	ct_ssh \
 	ct_rpc \
 	ct_snmp \
-	unix_telnet
+	unix_telnet \
+	ct_slave
 
 CT_XML_FILES = $(CT_MODULES:=.xml)
 
 XML_APPLICATION_FILES = ref_man.xml
-XML_REF1_FILES = run_test.xml
-XML_REF3_FILES = $(CT_XML_FILES)
+XML_REF1_FILES = ct_run.xml
+XML_REF3_FILES = $(CT_XML_FILES) ct_hooks.xml
 XML_REF6_FILES = common_test_app.xml
 
 XML_PART_FILES = part.xml 
@@ -70,6 +71,7 @@ XML_CHAPTER_FILES = \
 	cover_chapter.xml \
 	ct_master_chapter.xml \
 	event_handler_chapter.xml \
+	ct_hooks_chapter.xml \
 	dependencies_chapter.xml \
 	notes.xml \
 	notes_history.xml 
diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index 7b52883f8a..b4e4b45d62 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>Common Test</title>
@@ -131,7 +131,8 @@
 	<type>
 	<v> Info = {timetrap,Time} | {require,Required} | 
 	    {require,Name,Required} | {userdata,UserData} |
-	    {silent_connections,Conns} | {stylesheet,CSSFile}</v>
+	    {silent_connections,Conns} | {stylesheet,CSSFile} | 
+	    {ct_hooks, CTHs}</v>
 	<v> Time = MilliSec | {seconds,integer()} | {minutes,integer()}
 	  | {hours,integer()}</v>
 	<v> MilliSec = integer()</v>
@@ -143,6 +144,9 @@
 	<v> UserData = term()</v>
 	<v> Conns = [atom()]</v>
 	<v> CSSFile = string()</v>
+	<v> CTHs = [CTHModule | {CTHModule, CTHInitArgs}]</v>
+	<v> CTHModule = atom()</v>
+	<v> CTHInitArgs = term()</v>
 	</type>
 	<desc>	
 	  
@@ -170,6 +174,10 @@
 	<p>With <c>userdata</c>, it is possible for the user to
 	  specify arbitrary test suite related information which can be 
 	  read by calling <c>ct:userdata/2</c>.</p>
+
+	  <p>The <c>ct_hooks</c> tag specifies which 
+	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
+	  are to be run together with this suite.</p>
 	
 	<p>Other tuples than the ones defined will simply be ignored.</p>
 
@@ -337,7 +345,7 @@
       </func>
       
     <func>
-      <name>Module:testcase() -> [Info] </name>
+      <name>Module:Testcase() -> [Info] </name>
       <fsummary>Test case info function. </fsummary>
       <type>
 	<v> Info = {timetrap,Time} | {require,Required} | 
@@ -396,7 +404,7 @@
       
     
     <func>
-	<name>Module:testcase(Config) ->  void() | {skip,Reason} | {comment,Comment} | {save_config,SaveConfig} | {skip_and_save,Reason,SaveConfig} | exit() </name>
+	<name>Module:Testcase(Config) ->  void() | {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/config_file_chapter.xml b/lib/common_test/doc/src/config_file_chapter.xml
index a22a5270c1..59151a73ec 100644
--- a/lib/common_test/doc/src/config_file_chapter.xml
+++ b/lib/common_test/doc/src/config_file_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,15 +13,15 @@
       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>Config Files</title>
+    <title>External Configuration Data</title>
     <prepared>Siri Hansen, Peter Andersson</prepared>
     <docno></docno>
     <date></date>
@@ -32,16 +32,19 @@
   <section>
     <title>General</title>
 
-    <p>The Common Test framework uses configuration files to
-    describe data related to a test and/or an SUT (System Under Test). 
-    The configuration data makes it possible to change properties without 
-    changing the test program itself. Configuration data can for example be:</p>
+    <p>To avoid hard coding data values related to the test and/or SUT (System
+    Under Test) in the test suites, the data may instead be specified by means
+    of configuration files or strings that Common Test reads before
+    the start of a test run. External configuration data makes it possible to
+    change test properties without having to modify the actual test suites
+    using the data. Examples of configuration data:</p>
 
     <list>
       <item>Addresses to the test plant or other instruments</item>
-      <item>Filenames for files needed by the test</item>
-      <item>Program names for programs that shall be run by the test</item>
-      <item>Any other variable that is needed by the test</item>
+      <item>User login information</item>
+      <item>Names of files needed by the test</item>
+      <item>Names of programs that should be executed during the test</item>
+      <item>Any other variable needed by the test</item>
     </list>
 
   </section>
@@ -51,12 +54,12 @@
 
     <p>A configuration file can contain any number of elements of the type:</p>
     <pre>
-      {Key,Value}.</pre>
+      {CfgVarName,Value}.</pre>
 
     <p>where</p>
     <pre>
-      Key = atom()
-      Value = term() | [{Key,Value}]</pre>
+      CfgVarName = atom()
+      Value = term() | [{CfgVarName,Value}]</pre>
 
   </section>
 
@@ -65,8 +68,8 @@
     <marker id="require_config_data"></marker>
 
     <p>In a test suite, one must <em>require</em> that a configuration 
-    variable exists before attempting to read the associated 
-    value in a test case.</p>
+    variable (<c>CfgVarName</c> in the definition above) exists before
+    attempting to read the associated value in a test case or config function.</p>
 
     <p><c>require</c> is an assert statement that can be part of the <seealso
     marker="write_test_chapter#suite">test suite info function</seealso> or
@@ -83,13 +86,13 @@
 
     <p>A <c>require</c> statement in the test suite info- or test case 
     info-list should look like this:
-    <c>{require,Required}</c> or <c>{require,Name,Required}</c>. The
-    arguments <c>Name</c> and <c>Required</c> are the same as the
+    <c>{require,CfgVarName}</c> or <c>{require,AliasName,CfgVarName}</c>.
+    The arguments <c>AliasName</c> and <c>CfgVarName</c> are the same as the
     arguments to <c>ct:require/[1,2]</c> which are described in the
     reference manual for <seealso marker="ct">ct</seealso>.
-    <c>Name</c> becomes an alias for the configuration variable
-    <c>Required</c>, and can be used as reference to the configuration
-    data value. The configuration variable may be associated with an
+    <c>AliasName</c> becomes an alias for the configuration variable,
+    and can be used as reference to the configuration data value.
+    The configuration variable may be associated with an
     arbitrary number of alias names, but each name must be unique within
     the same test suite. There are two main uses for alias names:</p>
     <list>
@@ -180,7 +183,126 @@
   </section>
 
   <section>
-    <title>Examples</title>
+    <title>User specific configuration data formats</title>
+
+    <p>It is possible for the user to specify configuration data on a
+      different format than key-value tuples in a text file, as described
+      so far. The data can e.g. be read from arbitrary files, fetched from
+      the web over http, or requested from a user specific process.
+      To support this, Common Test provides a callback module plugin
+      mechanism to handle configuration data.</p>
+
+    <section>
+      <title>Default callback modules for handling configuration data</title>
+      <p>The Common Test application includes default callback modules
+	for handling configuration data specified in standard config files
+	(see above) and in xml files:</p>
+      <list>
+        <item>
+          <c>ct_config_plain</c> - for reading configuration files with
+          key-value tuples (standard format). This handler will be used to
+          parse configuration files if no user callback is specified.
+        </item>
+        <item>
+          <c>ct_config_xml</c> - for reading configuration data from XML
+          files.
+        </item>
+      </list>
+    </section>
+
+    <section>
+      <title>Using XML configuration files</title>
+      <p>This is an example of an XML configuration file:</p>
+      <pre><![CDATA[
+<config>
+    <ftp_host>
+        <ftp>"targethost"</ftp>
+        <username>"tester"</username>
+        <password>"letmein"</password>
+    </ftp_host>
+    <lm_directory>"/test/loadmodules"</lm_directory>
+</config>]]></pre>
+
+      <p>This configuration file, once read, will produce the same configuration
+      variables as the following text file:</p>
+      <pre>
+{ftp_host, [{ftp,"targethost"},
+            {username,"tester"},
+            {password,"letmein"}]}.
+
+{lm_directory, "/test/loadmodules"}.</pre>
+    </section>
+
+    <section>
+      <title>How to implement a user specific handler</title>
+
+      <p>The user specific handler can be written to handle special
+	configuration file formats. The parameter can be either file
+	name(s) or configuration string(s) (the empty list is valid).</p>
+
+      <p>The callback module implementing the handler is responsible for
+	checking correctness of configuration strings.</p>
+
+      <p>To perform validation of the configuration strings, the callback module
+	should have the following function exported:</p>
+
+      <p><c>Callback:check_parameter/1</c></p>
+      <p>The input argument will be passed from Common Test, as defined in the test
+	specification or given as an option to <c>ct_run</c> or <c>ct:run_test</c>.</p>
+
+      <p>The return value should be any of the following values indicating if given
+	configuration parameter is valid:</p>
+      <list>
+        <item>
+          <c>{ok, {file, FileName}}</c> - parameter is a file name and
+          the file exists,
+        </item>
+        <item>
+          <c>{ok, {config, ConfigString}}</c> - parameter is a config string
+          and it is correct,
+        </item>
+        <item>
+          <c>{error, {nofile, FileName}}</c> - there is no file with the given
+          name in the current directory,
+        </item>
+        <item>
+          <c>{error, {wrong_config, ConfigString}}</c> - the configuration string
+          is wrong.
+        </item>
+      </list>
+
+      <p>To perform reading of configuration data - initially before the tests
+	start, or as a result of data being reloaded during test execution -
+	the following function should be exported from the callback module:</p>
+
+      <p><c>Callback:read_config/1</c></p>
+
+      <p>The input argument is the same as for the <c>check_parameter/1</c> function.</p>
+      <p>The return value should be either:</p>
+
+      <list>
+        <item>
+          <c>{ok, Config}</c> - if the configuration variables are read successfully,
+        </item>
+        <item>
+          <c>{error, Error, ErrorDetails}</c> - if the callback module fails to
+          proceed with the given configuration parameters.
+        </item>
+      </list>
+      <p><c>Config</c> is the proper Erlang key-value list, with possible
+	key-value sublists as values, like for the configuration file
+	example above:</p>
+
+      <pre>
+        [{ftp_host, [{ftp, "targethost"}, {username, "tester"}, {password, "letmein"}]},
+        {lm_directory, "/test/loadmodules"}]</pre>
+
+    </section>
+
+  </section>
+
+  <section>
+    <title>Examples of configuration data handling</title>
 
     <p>A config file for using the FTP client to access files on a remote
       host could look like this:</p>
@@ -188,28 +310,33 @@
     <pre>
     {ftp_host, [{ftp,"targethost"},
                 {username,"tester"},
-	        {password,"letmein"}]}.
+                {password,"letmein"}]}.
 
     {lm_directory, "/test/loadmodules"}.</pre>
-    <p>Example of how to assert that the configuration data is available and 
+
+    <p>The XML version shown in the chapter above can also be used, but it should be
+    explicitly specified that the <c>ct_config_xml</c> callback module is to be
+    used by Common Test.</p>
+
+    <p>Example of how to assert that the configuration data is available and
       use it for an FTP session:</p>
     <pre>
     init_per_testcase(ftptest, Config) ->
         {ok,_} = ct_ftp:open(ftp),
-	Config.
+        Config.
 
     end_per_testcase(ftptest, _Config) ->
         ct_ftp:close(ftp).
 
     ftptest() ->
         [{require,ftp,ftp_host},
-	 {require,lm_directory}].
+         {require,lm_directory}].
 
     ftptest(Config) ->
-	Remote = filename:join(ct:get_config(lm_directory), "loadmodX"),
+        Remote = filename:join(ct:get_config(lm_directory), "loadmodX"),
         Local = filename:join(?config(priv_dir,Config), "loadmodule"),
         ok = ct_ftp:recv(ftp, Remote, Local),
-	...</pre>
+        ...</pre>
     
     <p>An example of how the above functions could be rewritten
       if necessary to open multiple connections to the FTP server:</p>
@@ -217,7 +344,7 @@
     init_per_testcase(ftptest, Config) ->
         {ok,Handle1} = ct_ftp:open(ftp_host),
         {ok,Handle2} = ct_ftp:open(ftp_host),
-	[{ftp_handles,[Handle1,Handle2]} | Config].
+        [{ftp_handles,[Handle1,Handle2]} | Config].
 
     end_per_testcase(ftptest, Config) ->
         lists:foreach(fun(Handle) -> ct_ftp:close(Handle) end, 
@@ -225,17 +352,117 @@
 
     ftptest() ->
         [{require,ftp_host},
-	 {require,lm_directory}].
+         {require,lm_directory}].
 
     ftptest(Config) ->
-	Remote = filename:join(ct:get_config(lm_directory), "loadmodX"),
+        Remote = filename:join(ct:get_config(lm_directory), "loadmodX"),
         Local = filename:join(?config(priv_dir,Config), "loadmodule"),
         [Handle | MoreHandles] = ?config(ftp_handles,Config),
         ok = ct_ftp:recv(Handle, Remote, Local),
-	...</pre>
+        ...</pre>
       
   </section>
 
+  <section>
+    <title>Example of user specific configuration handler</title>
+    <p>A simple configuration handling driver which will ask an external server for
+      configuration data can be implemented this way:</p>
+    <pre>
+-module(config_driver).
+-export([read_config/1, check_parameter/1]).
+
+read_config(ServerName)->
+    ServerModule = list_to_atom(ServerName),
+    ServerModule:start(),
+    ServerModule:get_config().
+
+check_parameter(ServerName)->
+    ServerModule = list_to_atom(ServerName),
+    case code:is_loaded(ServerModule) of
+        {file, _}->
+            {ok, {config, ServerName}};
+        false->
+            case code:load_file(ServerModule) of
+                {module, ServerModule}->
+                    {ok, {config, ServerName}};
+                {error, nofile}->
+                    {error, {wrong_config, "File not found: " ++ ServerName ++ ".beam"}}
+            end
+    end.</pre>
+
+    <p>The configuration string for this driver may be "config_server", if the
+      config_server.erl module below is compiled and exists in the code path
+      during test execution:</p>
+    <pre>
+-module(config_server).
+-export([start/0, stop/0, init/1, get_config/0, loop/0]).
+
+-define(REGISTERED_NAME, ct_test_config_server).
+
+start()->
+    case whereis(?REGISTERED_NAME) of
+        undefined->
+            spawn(?MODULE, init, [?REGISTERED_NAME]),
+            wait();
+        _Pid->
+        ok
+    end,
+    ?REGISTERED_NAME.
+
+init(Name)->
+    register(Name, self()),
+    loop().
+
+get_config()->
+    call(self(), get_config).
+
+stop()->
+    call(self(), stop).
+
+call(Client, Request)->
+    case whereis(?REGISTERED_NAME) of
+        undefined->
+            {error, not_started, Request};
+        Pid->
+            Pid ! {Client, Request},
+            receive
+                Reply->
+                    {ok, Reply}
+            after 4000->
+                {error, timeout, Request}
+            end
+    end.
+
+loop()->
+    receive
+        {Pid, stop}->
+            Pid ! ok;
+        {Pid, get_config}->
+            {D,T} = erlang:localtime(),
+            Pid !
+                [{localtime, [{date, D}, {time, T}]},
+                 {node, erlang:node()},
+                 {now, erlang:now()},
+                 {config_server_pid, self()},
+                 {config_server_vsn, ?vsn}],
+            ?MODULE:loop()
+    end.
+
+wait()->
+    case whereis(?REGISTERED_NAME) of
+        undefined->
+            wait();
+        _Pid->
+            ok
+    end.</pre>
+
+    <p>In this example, the handler also provides the ability to dynamically reload
+      configuration variables. If <c>ct:reload_config(localtime)</c> is called from
+      the test case function, all variables loaded with <c>config_driver:read_config/1</c>
+      will be updated with their latest values, and the new value for variable
+      <c>localtime</c> will be returned.</p>
+  </section>
+
 </chapter>
 
 
diff --git a/lib/common_test/doc/src/cover_chapter.xml b/lib/common_test/doc/src/cover_chapter.xml
index 6e4f59ef73..377409ed7b 100644
--- a/lib/common_test/doc/src/cover_chapter.xml
+++ b/lib/common_test/doc/src/cover_chapter.xml
@@ -94,10 +94,10 @@
 
     <p>To activate the code coverage support, you simply specify the
       name of the cover specification file as you start Common Test.
-      This you do either by using the <c>-cover</c> flag with <c>run_test</c>.
+      This you do either by using the <c>-cover</c> flag with <c>ct_run</c>.
       Example:</p>
 
-    <p><c>$ run_test -dir $TESTOBJS/db -cover $TESTOBJS/db/config/db.coverspec</c></p>
+    <p><c>$ ct_run -dir $TESTOBJS/db -cover $TESTOBJS/db/config/db.coverspec</c></p>
     
     <p>You may also pass the cover specification file name in a
       call to <c>ct:run_test/1</c>, by adding a <c>{cover,CoverSpec}</c>
diff --git a/lib/common_test/doc/src/ct_hooks.xml b/lib/common_test/doc/src/ct_hooks.xml
new file mode 100644
index 0000000000..0d59ce3b22
--- /dev/null
+++ b/lib/common_test/doc/src/ct_hooks.xml
@@ -0,0 +1,556 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2010</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>Common Test Hooks</title>
+    <prepared>Lukas Larsson</prepared>
+    <responsible>Lukas Larsson</responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date>2010-12-02</date>
+    <rev>PA1</rev>
+    <file>ct_hooks.sgml</file>
+  </header>
+  <module>ct_hooks</module> 
+  <modulesummary>A callback interface on top of Common Test</modulesummary>
+
+  <description>
+
+    <warning><p>This feature is in alpha release right now. This means that the 
+	interface may change in the future and that there may be bugs. We 
+	encourage you to use this feature, but be prepared 
+	that there might be bugs and that the interface might change
+	inbetween releases.</p></warning>
+
+    <p>The <em>Common Test Hook</em> (henceforth called CTH) framework allows 
+      extensions of the default behaviour of Common Test by means of callbacks 
+      before and after all test suite calls. It is meant for advanced users of
+      Common Test which want to abstract out behaviour which is common to
+      multiple test suites. </p>
+
+    <p>In brief, Common Test Hooks allows you to:</p>
+
+    <list>
+      <item>Manipulate the runtime config before each suite 
+      configuration call</item>
+      <item>Manipulate the return of all suite configuration calls and in 
+      extension the result of the test themselves.</item>
+    </list>
+    
+    <p>The following sections describe the mandatory and optional CTH
+    functions Common Test will call during test execution. For more details
+    see <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso> in 
+    the User's Guide.</p>
+
+    <p>For information about how to add a CTH to your suite see 
+    <seealso marker="ct_hooks_chapter#installing">Installing a CTH
+    </seealso> in the User's Guide.</p>
+
+    <note><p>See the
+	<seealso marker="ct_hooks_chapter#example">Example CTH</seealso>
+	in the User's Guide for a minimal example of a CTH. </p></note>
+    
+  </description>
+
+  <section>
+    <title>CALLBACK FUNCTIONS</title>
+    <p>The following functions define the callback interface
+      for a Common Test Hook.</p>
+  </section>
+  
+  <funcs>
+    <func>
+      <name>Module:init(Id, Opts) -&gt; State</name>
+      <fsummary>Initiates the Common Test Hook</fsummary>
+      <type>
+	<v>Id = reference() | term()</v>
+	<v>Opts = term()</v>
+	<v>State = term()</v>
+      </type>
+      
+      <desc>	
+	<p> MANDATORY </p>
+
+	<p>Always called before any other callback function. 
+	  Use this to initiate any common state. 
+	  It should return a state for this CTH.</p>
+
+	<p><c>Id</c> is the return value of 
+	  <seealso marker="#Module:id-1">id/1</seealso>, or a <c>reference</c>
+	  (created using 
+	  <seealso marker="erts:erlang#make_ref-0">make_ref/0</seealso>)
+	  if <seealso marker="#Module:id-1">id/1</seealso> is not implemented.
+	</p>
+
+	<p>For details about when init is called see
+	  <seealso marker="ct_hooks_chapter#scope">scope</seealso>
+	  in the User's Guide.</p>
+	      
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:pre_init_per_suite(SuiteName, Config, CTHState) -&gt; 
+              Result</name>
+      <fsummary>Called before init_per_suite</fsummary>
+      <type>
+	<v>SuiteName = atom()</v>
+	<v>Config = NewConfig = [{Key,Value}]</v>
+	<v>CTHState = NewCTHState = term()</v>
+	<v>Result = {Return, NewCTHState}</v>
+	<v>Return = NewConfig | SkipOrFail</v>
+	<v>SkipOrFail = {fail, Reason} | {skip, Reason}</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+
+	<p>This function is called before 
+	<seealso marker="common_test#Module:init_per_suite-1">
+	  init_per_suite</seealso> if it exists. 
+	It typically contains initialization/logging which needs to be done 
+	before init_per_suite is called. 
+	If <c>{skip,Reason}</c> or <c>{fail,Reason}</c> is returned, 
+	init_per_suite and all test cases of the suite will be skipped and
+	Reason printed in the overview log of the suite.</p>
+	
+	<p><c>SuiteName</c> is the name of the suite to be run.</p>
+
+	<p><c>Config</c> is the original config list of the test suite.</p>
+
+	<p><c>CTHState</c> is the current internal state of the CTH.</p>
+
+	<p><c>Return</c> is the result of the init_per_suite function.
+	If it is <c>{skip,Reason}</c> or <c>{fail,Reason}</c> 
+	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite
+	</seealso> will never be called, instead the initiation is considered 
+	to be skipped/failed respectively. If a <c>NewConfig</c> list
+	is returned, <seealso marker="common_test#Module:init_per_suite-1">
+	init_per_suite</seealso> will be called with that <c>NewConfig</c> list.
+	See <seealso marker="ct_hooks_chapter#pre">
+	Pre Hooks</seealso> in the User's Guide for more details.</p>
+	
+	
+	<p>Note that this function is only called if the CTH has been added 
+	before init_per_suite is run, see 
+	<seealso marker="ct_hooks_chapter#scope">CTH Scoping</seealso> 
+	in the User's Guide for details.</p>
+      </desc>
+    </func>
+    
+    <func>
+      <name>Module:post_init_per_suite(SuiteName, Config, Return, CTHState) -&gt; 
+              Result</name>
+      <fsummary>Called after init_per_suite</fsummary>
+      <type>
+	<v>SuiteName = atom()</v>
+	<v>Config = [{Key,Value}]</v>
+	<v>Return = NewReturn = Config | SkipOrFail | term()</v>
+	<v>SkipOrFail = {fail, Reason} | {skip, Reason} | term()</v>
+	<v>CTHState = NewCTHState = term()</v>
+	<v>Result = {NewReturn, NewCTHState}</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+
+	<p>This function is called after
+	<seealso marker="common_test#Module:init_per_suite-1">
+	  init_per_suite</seealso> if it exists. It typically contains extra 
+	checks to make sure that all the correct dependencies have
+	been started correctly.</p>
+	
+	<p><c>Return</c> is what 
+	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite
+	</seealso> returned, i.e. {fail,Reason}, {skip,Reason}, a <c>Config</c>
+	list or a term describing how 
+	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite
+	</seealso> failed.</p>
+
+	<p><c>NewReturn</c> is the possibly modified return value of
+	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite
+	</seealso>. It is here possible to recover from a failure in 
+	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite
+	</seealso> by returning the <c>ConfigList</c> with the <c>tc_status</c>
+	element removed. See <seealso marker="ct_hooks_chapter#post">
+	Post Hooks</seealso> in the User's Guide for more details.</p>
+
+	<p><c>CTHState</c> is the current internal state of the CTH.</p>
+
+	<p>Note that this function is only called if the CTH has been added 
+	before or in init_per_suite, see 
+	<seealso marker="ct_hooks_chapter#scope">CTH Scoping</seealso> 
+	in the User's Guide for details.</p>
+      </desc>
+    </func>
+    
+    <func>
+      <name>Module:pre_init_per_group(GroupName, Config, CTHState) -&gt; 
+              Result</name>
+      <fsummary>Called before init_per_group</fsummary>
+      <type>
+	<v>GroupName = atom()</v>
+	<v>Config = NewConfig = [{Key,Value}]</v>
+	<v>CTHState = NewCTHState = term()</v>
+	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
+	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+	
+	<p>This function is called before
+	<seealso marker="common_test#Module:init_per_group-2">
+	  init_per_group</seealso> if it exists. It behaves the same way as 
+	<seealso marker="ct_hooks#Module:pre_init_per_suite-3">
+	pre_init_per_suite</seealso>, but for the
+	<seealso marker="common_test#Module:init_per_group-2">
+	init_per_group</seealso> instead.</p>
+      </desc>
+    </func>
+    
+    <func>
+      <name>Module:post_init_per_group(GroupName, Config, Return, CTHState) -&gt; 
+              Result</name>
+      <fsummary>Called after init_per_group</fsummary>
+      <type>
+	<v>GroupName = atom()</v>
+	<v>Config = [{Key,Value}]</v>
+	<v>Return = NewReturn = Config | SkipOrFail | term()</v>
+	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+	<v>CTHState = NewCTHState = term()</v>
+	<v>Result = {NewReturn, NewCTHState}</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+
+	<p>This function is called after
+	<seealso marker="common_test#Module:init_per_group-2">
+	  init_per_group</seealso> if it exists. It behaves the same way as 
+	<seealso marker="ct_hooks#Module:post_init_per_suite-4">
+	post_init_per_suite</seealso>, but for the
+	<seealso marker="common_test#Module:init_per_group-2">
+	init_per_group</seealso> instead.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:pre_init_per_testcase(TestcaseName, Config, CTHState) -&gt; 
+              Result</name>
+      <fsummary>Called before init_per_testcase</fsummary>
+      <type>
+	<v>TestcaseName = atom()</v>
+	<v>Config = NewConfig = [{Key,Value}]</v>
+	<v>CTHState = NewCTHState = term()</v>
+	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
+	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+
+	<p>This function is called before
+	<seealso marker="common_test#Module:init_per_testcase-2">
+	  init_per_testcase</seealso> if it exists. It behaves the same way as 
+	<seealso marker="ct_hooks#Module:pre_init_per_suite-3">
+	pre_init_per_suite</seealso>, but for the
+	<seealso marker="common_test#Module:init_per_testcase-2">
+	init_per_testcase</seealso> function instead.</p>
+
+	<p>Note that it is not possible to add CTH's here right now, 
+	that feature might be added later, 
+	but it would right now break backwards compatability.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:post_end_per_testcase(TestcaseName, Config, Return, CTHState)
+               -&gt; Result</name>
+      <fsummary>Called after end_per_testcase</fsummary>
+      <type>
+	<v>TestcaseName = atom()</v>
+	<v>Config = [{Key,Value}]</v>
+	<v>Return = NewReturn = Config | SkipOrFail | term()</v>
+	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+	<v>CTHState = NewCTHState = term()</v>
+	<v>Result = {NewReturn, NewCTHState}</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+
+	<p>This function is called after
+	<seealso marker="common_test#Module:end_per_testcase-2">
+	  end_per_testcase</seealso> if it exists. It behaves the same way as 
+	<seealso marker="ct_hooks#Module:post_init_per_suite-4">
+	post_init_per_suite</seealso>, but for the
+	<seealso marker="common_test#Module:end_per_testcase-2">
+	end_per_testcase</seealso> function instead.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:pre_end_per_group(GroupName, Config, CTHState) -&gt; 
+              Result</name>
+      <fsummary>Called before end_per_group</fsummary>
+      <type>
+	<v>GroupName = atom()</v>
+	<v>Config = NewConfig = [{Key,Value}]</v>
+	<v>CTHState = NewCTHState = term()</v>
+	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
+	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+	
+	<p>This function is called before
+	<seealso marker="common_test#Module:end_per_group-2">
+	end_per_group</seealso> if it exists. It behaves the same way as 
+	<seealso marker="ct_hooks#Module:pre_init_per_suite-3">
+	pre_init_per_suite</seealso>, but for the
+	<seealso marker="common_test#Module:end_per_group-2">
+	end_per_group</seealso> function instead.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:post_end_per_group(GroupName, Config, Return, CTHState) -&gt; 
+              Result</name>
+      <fsummary>Called after end_per_group</fsummary>
+      <type>
+	<v>GroupName = atom()</v>
+	<v>Config = [{Key,Value}]</v>
+	<v>Return = NewReturn = Config | SkipOrFail | term()</v>
+	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+	<v>CTHState = NewCTHState = term()</v>
+	<v>Result = {NewReturn, NewCTHState}</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+
+	<p>This function is called after
+	<seealso marker="common_test#Module:end_per_group-2">
+	  end_per_group</seealso> if it exists. It behaves the same way as 
+	<seealso marker="ct_hooks#Module:post_init_per_suite-4">
+	post_init_per_suite</seealso>, but for the
+	<seealso marker="common_test#Module:end_per_group-2">
+	end_per_group</seealso> function instead.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:pre_end_per_suite(SuiteName, Config, CTHState) -&gt; 
+              Result</name>
+      <fsummary>Called before end_per_suite</fsummary>
+      <type>
+	<v>SuiteName = atom()</v>
+	<v>Config = NewConfig = [{Key,Value}]</v>
+	<v>CTHState = NewCTHState = term()</v>
+	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
+	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+
+	<p>This function is called before
+	<seealso marker="common_test#Module:end_per_suite-1">
+	  end_per_suite</seealso> if it exists. It behaves the same way as 
+	<seealso marker="ct_hooks#Module:pre_init_per_suite-3">
+	pre_init_per_suite</seealso>, but for the
+	<seealso marker="common_test#Module:end_per_suite-2">
+	end_per_suite</seealso> function instead.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:post_end_per_suite(SuiteName, Config, Return, CTHState) -&gt; 
+              Result</name>
+      <fsummary>Called after end_per_suite</fsummary>
+      <type>
+	<v>SuiteName = atom()</v>
+	<v>Config = [{Key,Value}]</v>
+	<v>Return = NewReturn = Config | SkipOrFail | term()</v>
+	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+	<v>CTHState = NewCTHState = term()</v>
+	<v>Result = {NewReturn, NewCTHState}</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+
+	<p>This function is called after
+	<seealso marker="common_test#Module:end_per_suite-1">
+	  end_per_suite</seealso> if it exists. It behaves the same way as 
+	<seealso marker="ct_hooks#Module:post_init_per_suite-4">
+	post_init_per_suite</seealso>, but for the
+	<seealso marker="common_test#Module:end_per_suite-2">
+	end_per_suite</seealso> function instead.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:on_tc_fail(TestcaseName, Reason, CTHState) -&gt; 
+              NewCTHState</name>
+      <fsummary>Called after the CTH scope ends</fsummary>
+      <type>
+	<v>TestcaseName = init_per_suite | end_per_suite | 
+	                  init_per_group | end_per_group | atom()</v>
+	<v>Reason = term()</v>
+	<v>CTHState = NewCTHState = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+
+	<p>This function is called whenever a testcase fails. 
+	It is called after the post function has been called for 
+	the testcase which failed. i.e. 
+	if init_per_suite fails this function is called after 
+	<seealso marker="#Module:post_init_per_suite-4">
+	  post_init_per_suite</seealso>, and if a testcase fails it is called 
+	  after <seealso marker="#Module:post_end_per_testcase-4">
+	  post_end_per_testcase</seealso>.</p>
+
+	<p>The data which comes with the Reason follows the same format as the
+	<seealso marker="event_handler_chapter#failreason">FailReason
+	</seealso> in the <seealso marker="event_handler_chapter#tc_done">tc_done</seealso> event.
+	See <seealso marker="event_handler_chapter#events">Event Handling
+	</seealso> in the User's Guide for details.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:on_tc_skip(TestcaseName, Reason, CTHState) -&gt; 
+              NewCTHState</name>
+      <fsummary>Called after the CTH scope ends</fsummary>
+      <type>
+	<v>TestcaseName = end_per_suite | init_per_group | 
+                          end_per_group | atom()</v>
+	<v>Reason = {tc_auto_skip | tc_user_skip, term()}</v>
+	<v>CTHState = NewCTHState = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+
+	<p>This function is called whenever a testcase is skipped. 
+	It is called after the post function has been called for the 
+	testcase which was skipped. 
+	i.e. if init_per_group is skipped this function is called after 
+	<seealso marker="#Module:post_init_per_suite-4">post_init_per_group
+	</seealso>, and if a testcase is skipped it is called after 
+	<seealso marker="#Module:post_end_per_testcase-4">post_end_per_testcase
+	</seealso>.</p>
+
+	<p>The data which comes with the Reason follows the same format as 
+	<seealso marker="event_handler_chapter#tc_auto_skip">tc_auto_skip
+	</seealso> and <seealso marker="event_handler_chapter#tc_user_skip">
+	tc_user_skip</seealso> events.
+	See <seealso marker="event_handler_chapter#events">Event Handling
+	</seealso> in the User's Guide for details.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:terminate(CTHState)</name>
+      <fsummary>Called after the CTH scope ends</fsummary>
+      <type>
+	<v>CTHState = term()</v>
+      </type>
+      
+      <desc>	
+	<p> OPTIONAL </p>
+
+	<p>This function is called at the end of a CTH's 
+	<seealso marker="ct_hooks_chapter#scope">scope</seealso>. 
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:id(Opts) -&gt; Id</name>
+      <fsummary>Called before the init function of a CTH</fsummary>
+      <type>
+	<v>Opts = term()</v>
+	<v>Id = term()</v>
+      </type>
+      
+      <desc>
+	<p> OPTIONAL </p>
+	
+	<p>The <c>Id</c> is used to uniquely identify a CTH instance, 
+	if two CTH's return the same <c>Id</c> the second CTH is ignored
+	and subsequent calls to the CTH will only be made to the first
+	instance. For more information see 
+	<seealso marker="ct_hooks_chapter#installing">Installing a CTH
+	</seealso> in the User's Guide.
+        </p>
+
+	<p>This function should NOT have any side effects as it might 
+	be called multiple times by Common Test.</p>
+	
+	<p>If not implemented the CTH will act as if this function returned a
+	  call to <c>make_ref/0</c>.</p>
+      </desc>
+    </func>
+
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
new file mode 100644
index 0000000000..fc5ab48e1b
--- /dev/null
+++ b/lib/common_test/doc/src/ct_hooks_chapter.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2011</year><year>2011</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>Common Test Hooks</title>
+    <prepared>Lukas Larsson</prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+    <file>ct_hooks_chapter.xml</file>
+  </header>
+
+  <marker id="general"></marker>
+  <section>
+    <title>General</title>
+    <warning><p>This feature is in alpha release right now. This means that the 
+	interface may change in the future and that there may be bugs. We 
+	encourage you to use this feature, but be prepared 
+	that there might be bugs and that the interface might change
+	inbetween releases.</p></warning>
+    <p>
+      The <em>Common Test Hook</em> (henceforth called CTH) framework allows 
+      extensions of the default behaviour of Common Test by means of hooks 
+      before and after all test suite calls. CTHs allow advanced Common Test
+      users to abstract out behaviour which is common to multiple test suites
+      without littering all test suites with library calls. Some example 
+      usages are: logging, starting and monitoring external systems, 
+      building C files needed by the tests and much more!</p>
+
+    <p>In brief, Common Test Hooks allows you to:</p>
+
+    <list>
+      <item>Manipulate the runtime config before each suite 
+      configuration call</item>
+      <item>Manipulate the return of all suite configuration calls and in 
+      extension the result of the test themselves.</item>
+    </list>
+    
+    <p>The following sections describe how to use CTHs, when they are run 
+      and how to manipulate your test results in a CTH</p>
+
+    <warning><p>When executing within a CTH all timetraps are shutoff. So
+	if your CTH never returns, the entire test run will be stalled!</p>
+    </warning>
+
+  </section>
+  
+  <marker id="installing"></marker>
+  <section>
+    <title>Installing a CTH</title>
+    <p>There are multiple ways to install a CTH in your test run. You can do it
+      for all tests in a run, for specific test suites and for specific groups 
+      within a test suite. If you want a CTH to be present in all test suites 
+      within your test run there are three different ways to accomplish that.
+    </p>
+
+    <list>
+      <item>Add <c>-ct_hooks</c> as an argument to 
+      <seealso marker="run_test_chapter#ct_run">ct_run</seealso>. 
+      To add multiple CTHs using this method append them to each other
+      using the keyword <c>and</c>, i.e. 
+      <c>ct_run -ct_hooks cth1 [{debug,true}] and cth2 ...</c>.</item>
+      <item>Add the <c>ct_hooks</c> tag to your 
+      <seealso marker="run_test_chapter#test_specifications">
+      Test Specification</seealso></item>
+      <item>Add the <c>ct_hooks</c> tag to your call to 
+      <seealso marker="ct#run_test-1">ct:run_test/1</seealso></item>
+    </list>
+
+    <p>You can also add CTHs within a test suite. This is done by returning
+    <c>{ct_hooks,[CTH]}</c> in the config list from 
+    <seealso marker="common_test#Module:suite-0">suite/0</seealso>,
+    <seealso marker="common_test#Module:init_per_suite-1">
+      init_per_suite/1</seealso> or
+      <seealso marker="common_test#Module:init_per_group-2">
+    init_per_group/2</seealso>. <c>CTH</c> in this case can be either
+    only the module name of the CTH or a tuple with the module name and the
+    initial arguments to the CTH. Eg:
+    <c>{ct_hooks,[my_cth_module]}</c> or 
+    <c>{ct_hooks,[{my_cth_module,[{debug,true}]}]}</c></p>
+
+    <section>
+      <title>Overriding CTHs</title>
+      <p>By default each installation of a CTH will cause a new instance of it
+	to be activated. This can cause problems if you want to be able to 
+	override CTHs in test specifications while still having them in the
+	suite info function. The 
+	<seealso marker="ct_hooks#Module:id-1">id/1</seealso>
+	callback exists to address this problem. By returning the same
+	<c>id</c> in both places, Common Test knows that this CTH
+	has already been installed and will not try to install it again.</p>
+    </section>
+
+  </section>
+
+  <marker id="scope"/>
+  <section>
+    <title>CTH Scope</title>
+    <p>Once the CTH is installed into a certain test run it will be there until
+      its scope is expired. The scope of a CTH depends on when it is 
+      installed.
+      The <seealso marker="ct_hooks#Module:init-2">init/2</seealso> is 
+      called at the beginning of the scope and the 
+      <seealso marker="ct_hooks#Module:terminate-1">terminate/1
+    </seealso> function is called when the scope ends.</p>
+    <table>
+      <row>
+	<cell><em>CTH Installed in</em></cell>
+	<cell><em>CTH scope begins before</em></cell>
+	<cell><em>CTH scope ends after</em></cell>
+      </row>
+      <row>
+	<cell><seealso marker="run_test_chapter#ct_run">ct_run</seealso></cell>
+	<cell>the first test suite is to be run.</cell>
+	<cell>the last test suite has been run.</cell>
+      </row>
+      <row>
+	<cell><seealso marker="ct#run_test-1">ct:run_test</seealso></cell>
+	<cell>the first test suite is to be run.</cell>
+	<cell>the last test suite has been run.</cell>
+      </row>
+      <row>
+	<cell><seealso marker="run_test_chapter#test_specifications">
+	  Test Specification</seealso></cell>
+	<cell>the first test suite is to be run.</cell>
+	<cell>the last test suite has been run.</cell>
+      </row>
+      <row>
+	<cell><seealso marker="common_test#Module:suite-0">suite/0
+	</seealso></cell>
+	<cell><seealso marker="ct_hooks#Module:pre_init_per_suite-3">
+	    pre_init_per_suite/3</seealso> is called.</cell>
+	<cell><seealso marker="ct_hooks#Module:post_end_per_suite-4">
+	  post_end_per_suite/4</seealso> has been called for that test suite.</cell>
+      </row>
+      <row>
+	<cell><seealso marker="common_test#Module:init_per_suite-1">
+	  init_per_suite/1</seealso></cell>
+	<cell><seealso marker="ct_hooks#Module:post_init_per_suite-4">
+	    post_init_per_suite/4</seealso> is called.</cell>
+	<cell><seealso marker="ct_hooks#Module:post_end_per_suite-4">
+	  post_end_per_suite/4</seealso> has been called for that test suite.</cell>
+      </row>
+      <row>
+	<cell><seealso marker="common_test#Module:init_per_group-2">
+	  init_per_group/2</seealso></cell>
+	<cell><seealso marker="ct_hooks#Module:post_init_per_group-4">
+	    post_init_per_group/4</seealso> is called.</cell>
+	<cell><seealso marker="ct_hooks#Module:post_end_per_suite-4">
+	  post_end_per_group/4</seealso> has been called for that group.</cell>
+      </row>
+    <tcaption>Scope of a CTH</tcaption>
+    </table>
+    
+    <section>
+      <title>CTH Processes and Tables</title>
+      <p>CTHs are run with the same process scoping as normal test suites
+	i.e. a different process will execute the init_per_suite hooks then the
+	init_per_group or per_testcase hooks. So if you want to spawn a 
+	process in the CTH you cannot link with the CTH process as it will exit 
+	after the post hook ends. Also if you for some reason need an ETS 
+	table with your CTH, you will have to spawn a process which handles 
+	it.</p>
+    </section>
+    
+  </section>
+
+  <marker id="manipulating"/>
+  <section>
+    <title>Manipulating tests</title>
+    <p>It is through CTHs possible to manipulate the results of tests and 
+    configuration functions. The main purpose of doing this with CTHs is to
+    allow common patterns to be abstracted out from test test suites and applied to
+    multiple test suites without duplicating any code. All of the callback
+    functions for a CTH follow a common interface, this interface is 
+    described below.</p>
+
+    <p>It is only possible to hook into test function which exists in the test 
+      suite. So in order for a CTH to hook in before 
+      <seealso marker="common_test#Module:init_per_suite-1">init_per_suite</seealso>, 
+      the <seealso marker="common_test#Module:init_per_suite-1">init_per_suite</seealso> 
+      function must exist in the test suite.</p>
+
+    <marker id="pre"/>
+    <section>
+      <title>Pre Hooks</title>
+      <p>
+	It is possible in a CTH to hook in behaviour before 
+	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite</seealso>, 
+	<seealso marker="common_test#Module:init_per_suite-1">init_per_group</seealso>, 
+	<seealso marker="common_test#Module:init_per_suite-1">init_per_testcase</seealso>, 
+	<seealso marker="common_test#Module:init_per_suite-1">end_per_group</seealso> and 
+	<seealso marker="common_test#Module:init_per_suite-1">end_per_suite</seealso>. 
+	This is done in the CTH functions called pre_&lt;name of function&gt;.
+	All of these functions take the same three arguments: <c>Name</c>, 
+	<c>Config</c> and <c>CTHState</c>. The return value of the CTH function
+	is always a combination of an result for the suite/group/test and an 
+	updated <c>CTHState</c>. If you want the test suite to continue on 
+	executing you should return the config list which you want the test to 
+	use as the result. If you for some reason want to skip/fail the test, 
+	return a tuple with <c>skip</c> or <c>fail</c> and a reason as the 
+	result. Example:
+      </p>
+      <code>pre_init_per_suite(SuiteName, Config, CTHState) -&gt;
+  case db:connect() of
+    {error,_Reason} -&gt;
+      {{fail, "Could not connect to DB"}, CTHState};
+    {ok, Handle} -&gt;
+      {[{db_handle, Handle} | Config], CTHState#state{ handle = Handle }}
+  end.</code>
+	
+    </section>
+    
+    <marker id="post"/>
+    <section>
+      <title>Post Hooks</title>
+      <p>It is also possible in a CTH to hook in behaviour after 
+      <seealso marker="common_test#Module:init_per_suite-1">init_per_suite</seealso>, 
+      <seealso marker="common_test#Module:init_per_suite-1">init_per_group</seealso>, 
+      <seealso marker="common_test#Module:init_per_suite-1">end_per_testcase</seealso>, 
+      <seealso marker="common_test#Module:init_per_suite-1">end_per_group</seealso> and 
+      <seealso marker="common_test#Module:init_per_suite-1">end_per_suite</seealso>.
+      This is done in the CTH functions called post_&lt;name of function&gt;. 
+      All of these function take the same four arguments: <c>Name</c>, 
+      <c>Config</c>, <c>Return</c> and <c>CTHState</c>. <c>Config</c> in this
+      case is the same <c>Config</c> as the testcase is called with. 
+      <c>Return</c> is the value returned by the testcase. If the testcase 
+      failed by crashing, <c>Return</c> will be 
+      <c>{'EXIT',{{Error,Reason},Stacktrace}}</c>.</p>
+      
+      <p>The return value of the CTH function is always a combination of an
+	result for the suite/group/test and an updated <c>CTHState</c>. If
+	you want the callback to not affect the outcome of the test you should
+	return the <c>Return</c> data as it is given to the CTH. You can also
+	modify the result of the test. By returning the <c>Config</c> list
+	with the <c>tc_status</c> element removed you can recover from a test 
+	failure. As in all the pre hooks, it is also possible to fail/skip
+	the test case in the post hook. Example: </p>
+
+      <code>post_end_per_testcase(_TC, Config, {'EXIT',{_,_}}, CTHState) -&gt;
+  case db:check_consistency() of
+    true ->
+      %% DB is good, pass the test.
+      {proplists:delete(tc_status, Config), CTHState};
+    false ->
+      %% DB is not good, mark as skipped instead of failing
+      {{skip, "DB is inconsisten!"}, CTHState}
+  end;
+post_end_per_testcase(_TC, Config, Return, CTHState) -&gt;
+  %% Do nothing if tc does not crash.
+  {Return, CTHState}.</code>
+
+      <note>Recovering from a testcase failure using CTHs should only be done as
+	a last resort. If used wrongly it could become very difficult to 
+	determine which tests pass or fail in a test run</note>
+  
+    </section>
+
+    <marker id="skip_n_fail"/>
+    <section>
+      <title>Skip and Fail hooks</title>
+      <p>
+	After any post hook has been executed for all installed CTHs, 
+	<seealso marker="ct_hooks#Module:on_tc_fail-3">on_tc_fail</seealso>
+	or <seealso marker="ct_hooks#Module:on_tc_fail-3">on_tc_skip</seealso> 
+	might be called if the testcase failed or was skipped 
+	respectively. You cannot affect the outcome of the tests any further at 
+	this point. 
+      </p>
+    </section>
+
+  </section>
+
+  <marker id="example"/>
+  <section>
+     <title>Example CTH</title>
+     <p>The CTH below will log information about a test run into a format 
+       parseable by <seealso marker="kernel:file#consult-1">file:consult/1</seealso>.
+     </p>
+     <code>%%% @doc Common Test Example Common Test Hook module.
+-module(example_cth).
+
+%% Callbacks
+-export([id/1]).
+-export([init/2]).
+
+-export([pre_init_per_suite/3]).
+-export([post_init_per_suite/4]).
+-export([pre_end_per_suite/3]).
+-export([post_end_per_suite/4]).
+
+-export([pre_init_per_group/3]).
+-export([post_init_per_group/4]).
+-export([pre_end_per_group/3]).
+-export([post_end_per_group/4]).
+
+-export([pre_init_per_testcase/3]).
+-export([post_end_per_testcase/4]).
+
+-export([on_tc_fail/3]).
+-export([on_tc_skip/3]).
+
+-export([terminate/1]).
+
+-record(state, { file_handle, total, suite_total, ts, tcs, data }).
+
+%% @doc Return a unique id for this CTH.
+id(Opts) ->
+  proplists:get_value(filename, Opts, "/tmp/file.log").
+
+%% @doc Always called before any other callback function. Use this to initiate
+%% any common state. 
+init(Id, Opts) ->
+    {ok,D} = file:open(Id,[write]),
+    #state{ file_handle = D, total = 0, data = [] }.
+
+%% @doc Called before init_per_suite is called. 
+pre_init_per_suite(Suite,Config,State) ->
+    {Config, State#state{ suite_total = 0, tcs = [] }}.
+
+%% @doc Called after init_per_suite.
+post_init_per_suite(Suite,Config,Return,State) ->
+    {Return, State}.
+
+%% @doc Called before end_per_suite. 
+pre_end_per_suite(Suite,Config,State) ->
+    {Config, State}.
+
+%% @doc Called after end_per_suite. 
+post_end_per_suite(Suite,Config,Return,State) ->
+    Data = {suites, Suite, State#state.suite_total, lists:reverse(State#state.tcs)},
+    {Return, State#state{ data = [Data | State#state.data] ,
+                          total = State#state.total + State#state.suite_total } }.
+
+%% @doc Called before each init_per_group.
+pre_init_per_group(Group,Config,State) ->
+    {Config, State}.
+
+%% @doc Called after each init_per_group.
+post_init_per_group(Group,Config,Return,State) ->
+    {Return, State}.
+
+%% @doc Called after each end_per_group. 
+pre_end_per_group(Group,Config,State) ->
+    {Config, State}.
+
+%% @doc Called after each end_per_group. 
+post_end_per_group(Group,Config,Return,State) ->
+    {Return, State}.
+
+%% @doc Called before each test case.
+pre_init_per_testcase(TC,Config,State) ->
+    {Config, State#state{ ts = now(), total = State#state.suite_total + 1 } }.
+
+%% @doc Called after each test case.
+post_end_per_testcase(TC,Config,Return,State) ->
+    TCInfo = {testcase, TC, Return, timer:now_diff(now(), State#state.ts)},
+    {Return, State#state{ ts = undefined, tcs = [TCInfo | State#state.tcs] } }.
+
+%% @doc Called after post_init_per_suite, post_end_per_suite, post_init_per_group,
+%% post_end_per_group and post_end_per_testcase if the suite, group or test case failed.
+on_tc_fail(TC, Reason, State) ->
+    State.
+
+%% @doc Called when a test case is skipped by either user action
+%% or due to an init function failing.  
+on_tc_skip(TC, Reason, State) ->
+    State.
+
+%% @doc Called when the scope of the CTH is done
+terminate(State) ->
+    io:format(State#state.file_handle, "~p.~n",
+               [{test_run, State#state.total, State#state.data}]),
+    file:close(State#state.file_handle),
+    ok.</code>
+  </section>
+
+</chapter>
+
+
+
+
diff --git a/lib/common_test/doc/src/ct_master_chapter.xml b/lib/common_test/doc/src/ct_master_chapter.xml
index 79288cfe4c..f4f0ecad62 100644
--- a/lib/common_test/doc/src/ct_master_chapter.xml
+++ b/lib/common_test/doc/src/ct_master_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>Using Common Test for Large Scale Testing</title>
@@ -30,6 +30,7 @@
   </header>
 
   <section>
+    <marker id="general"></marker>
     <title>General</title>
     <p>Large scale automated testing requires running multiple independent 
       test sessions in parallel. This is accomplished by running
@@ -102,9 +103,10 @@
       <p><c>ct_master:abort()</c> (stop all) or <c>ct_master:abort(Nodes)</c></p>
 
       <p>For detailed information about the <c>ct_master</c> API, please see the 
-      manual page for this module.</p>
+      <seealso marker="ct_master">manual page</seealso> for this module.</p>
   </section>
   <section>
+    <marker id="test_specifications"></marker>
     <title>Test Specifications</title>
     <p>The test specifications used as input to CT Master are fully compatible with the
     specifications used as input to the regular CT server. The syntax is described in the 
@@ -186,7 +188,7 @@
     <seealso marker="run_test_chapter#test_specifications">Running Test Suites</seealso>
     chapter). The result is that any test specified to run on a node with the same
     name as the Common Test node in question (typically <c>ct@somehost</c> if started
-    with the <c>run_test</c> script), will be performed. Tests without explicit
+    with the <c>ct_run</c> program), will be performed. Tests without explicit
     node association will always be performed too of course!</p>
 
     <note><p>It is recommended that absolute paths are used for log directories,
@@ -194,6 +196,56 @@
     current working directory settings are not important.</p></note>
   </section>
 
+  <section>
+    <title>Automatic startup of test target nodes</title>
+    <marker id="ct_slave"></marker>
+    <p>Is is possible to automatically start, and perform initial actions, on
+      test target nodes by using the test specification term <c>init</c>.</p>
+    <p>Currently, two sub-terms are supported, <c>node_start</c> and <c>eval</c>.</p>
+    <p>Example:</p>
+    <pre>
+     {node, node1, node1@host1}.
+     {node, node2, node1@host2}.
+     {node, node3, node2@host2}.
+     {node, node4, node1@host3}.
+     {init, node1, [{node_start, [{callback_module, my_slave_callback}]}]}.
+     {init, [node2, node3], {node_start, [{username, "ct_user"}, {password, "ct_password"}]}}.
+     {init, node4, {eval, {module, function, []}}}.</pre>
+
+    <p>This test specification declares that <c>node1@host1</c> is to be started using
+      the user callback function <c>callback_module:my_slave_callback/0</c>, and nodes
+      <c>node1@host2</c> and <c>node2@host2</c> will be started with the default callback
+      module <c>ct_slave</c>. The given user name and password is used to log into remote
+      host <c>host2</c>. Also, the function <c>module:function/0</c> will be evaluated on
+      <c>node1@host3</c>, and the result of this call will be printed to the log.</p>
+
+    <p>The default <seealso marker="ct_slave">ct_slave</seealso> callback module,
+      which is part of the Common Test application, has the following features:
+    <list>
+     <item>Starting Erlang target nodes on local or remote hosts
+       (ssh is used for communication).
+     </item>
+     <item>Ability to start an Erlang emulator with additional flags
+       (any flags supported by <c>erl</c> are supported).
+     </item>
+     <item>Supervision of a node being started by means of internal callback
+        functions. Used to prevent hanging nodes. (Configurable).
+     </item>
+     <item>Monitoring of the master node by the slaves. A slave node may be
+        stopped in case the master node terminates. (Configurable).
+     </item>
+     <item>Execution of user functions after a slave node is started.
+        Functions can be given as a list of {Module, Function, Arguments} tuples.
+     </item>
+    </list>
+    </p>
+    <p>Note that it is possible to specify an <c>eval</c> term for the node as well
+    as <c>startup_functions</c> in the <c>node_start</c> options list. In this
+    case first the node will be started, then the <c>startup_functions</c> are
+    executed, and finally functions specified with <c>eval</c> are called.
+    </p>
+  </section>
+
 </chapter>
 
 
diff --git a/lib/common_test/doc/src/ct_run.xml b/lib/common_test/doc/src/ct_run.xml
new file mode 100644
index 0000000000..1ab563d74f
--- /dev/null
+++ b/lib/common_test/doc/src/ct_run.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="latin1" ?>
+<!DOCTYPE comref SYSTEM "comref.dtd">
+
+<comref>
+  <header>
+    <copyright>
+      <year>2007</year><year>2010</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>The ct_run program</title>
+    <prepared>Peter Andersson</prepared>
+    <responsible>Peter Andersson</responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date>2010-04-01</date>
+    <rev>PA2</rev>
+    <file>ct_run.xml</file>
+  </header>
+  <com>ct_run</com>
+  <comsummary>Program used for starting Common Test from the
+    OS command line.
+  </comsummary>
+
+  <description>
+  <p>The <c>ct_run</c> program is automatically installed with Erlang/OTP
+    and Common Test (please see the Installation chapter in the Common
+    Test User's Guide for more information). The program accepts a number
+    of different start flags. Some flags trigger <c>ct_run</c>
+    to start the Common Test application and pass on data to it. Some
+    flags start an Erlang node prepared for running Common Test in a
+    particular mode.</p>
+
+  <p>There is an interface function that corresponds to this program,
+    called <c>ct:run_test/1</c>, for starting Common Test from the Erlang
+    shell (or an Erlang program). Please see the <c>ct</c> man page for
+    details.</p>
+
+  <p><c>ct_run</c> also accepts Erlang emulator flags. These are used
+    when <c>ct_run</c> calls <c>erl</c> to start the Erlang node
+    (making it possible to e.g. add directories to the code server path,
+    change the cookie on the node, start additional applications, etc).</p>
+
+  <p>With the optional flag:</p>
+  <pre>-erl_args</pre>
+  <p>it's possible to divide the options on the <c>ct_run</c> command line into
+    two groups, one that Common Test should process (those preceding <c>-erl_args</c>),
+    and one it should completely ignore and pass on directly to the emulator
+    (those following <c>-erl_args</c>). Options preceding <c>-erl_args</c> that Common Test
+    doesn't recognize, also get passed on to the emulator untouched.
+    By means of <c>-erl_args</c> the user may specify flags with the same name, but
+    with different destinations, on the <c>ct_run</c> command line.</p>
+  <p>If <c>-pa</c> or <c>-pz</c> flags are specified in the Common Test group of options
+    (preceding <c>-erl_args</c>), relative directories will be converted to
+    absolute and re-inserted into the code path by Common Test (to avoid
+    problems loading user modules when Common Test changes working directory
+    during test runs). Common Test will however ignore <c>-pa</c> and <c>-pz</c> flags
+    following <c>-erl_args</c> on the command line. These directories are added
+    to the code path normally (i.e. on specified form)</p>
+
+  <p>If <c>ct_run</c> is called with option:</p>
+    <pre>-help</pre>
+    <p>it prints all valid start flags to stdout.</p>
+  </description>
+
+  <marker id="ct_run"></marker>
+
+  <section>
+    <title>Run tests from command line</title>
+    <pre>
+	ct_run [-dir TestDir1 TestDir2 .. TestDirN] |
+	[-suite Suite1 Suite2 .. SuiteN
+	 [[-group Group1 Group2 .. GroupN] [-case Case1 Case2 .. CaseN]]]
+	[-step [config | keep_inactive]]
+	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
+	[-userconfig CallbackModule1 ConfigString1 and CallbackModule2
+	 ConfigString2 and .. and CallbackModuleN ConfigStringN]
+	[-decrypt_key Key] | [-decrypt_file KeyFile]
+	[-label Label]
+	[-logdir LogDir]
+	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
+	[-stylesheet CSSFile]
+	[-cover CoverCfgFile]
+	[-event_handler EvHandler1 EvHandler2 .. EvHandlerN] |
+        [-event_handler_init EvHandler1 InitArg1 and
+	 EvHandler2 InitArg2 and .. EvHandlerN InitArgN]
+	[-include InclDir1 InclDir2 .. InclDirN]
+	[-no_auto_compile]
+	[-muliply_timetraps Multiplier]
+	[-scale_timetraps]
+        [-repeat N [-force_stop]] |
+        [-duration HHMMSS [-force_stop]] |
+        [-until [YYMoMoDD]HHMMSS [-force_stop]]
+	[-basic_html]</pre>
+  </section>
+  <section>
+    <title>Run tests using test specification</title>
+    <pre>
+	ct_run -spec TestSpec1 TestSpec2 .. TestSpecN
+	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
+	[-userconfig CallbackModule1 ConfigString1 and CallbackModule2
+         ConfigString2 and .. and CallbackModuleN ConfigStringN]
+	[-decrypt_key Key] | [-decrypt_file KeyFile]
+	[-label Label]
+	[-logdir LogDir]
+	[-allow_user_terms]
+	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
+	[-stylesheet CSSFile]
+	[-cover CoverCfgFile]
+	[-event_handler EvHandler1 EvHandler2 .. EvHandlerN] |
+        [-event_handler_init EvHandler1 InitArg1 and
+	 EvHandler2 InitArg2 and .. EvHandlerN InitArgN]
+	[-include InclDir1 InclDir2 .. InclDirN]
+	[-no_auto_compile]
+	[-muliply_timetraps Multiplier]
+	[-scale_timetraps]
+        [-repeat N [-force_stop]] |
+        [-duration HHMMSS [-force_stop]] |
+        [-until [YYMoMoDD]HHMMSS [-force_stop]]
+	[-basic_html]</pre>
+  </section>
+  <section>
+    <title>Run tests in web based GUI</title>
+    <pre>
+        ct_run -vts [-browser Browser]
+        [-dir TestDir1 TestDir2 .. TestDirN] |
+        [-suite Suite [[-group Group] [-case Case]]]
+	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
+	[-userconfig CallbackModule1 ConfigString1 and CallbackModule2
+         ConfigString2 and .. and CallbackModuleN ConfigStringN]
+	[-decrypt_key Key] | [-decrypt_file KeyFile]
+	[-include InclDir1 InclDir2 .. InclDirN]
+	[-no_auto_compile]
+	[-muliply_timetraps Multiplier]
+	[-scale_timetraps]
+	[-basic_html]</pre>
+  </section>
+  <section>
+    <title>Refresh the HTML index files</title>
+    <pre>
+	ct_run -refresh_logs [-logdir LogDir] [-basic_html]</pre>
+  </section>
+  <section>
+    <title>Run CT in interactive mode</title>
+    <pre>
+	ct_run -shell
+	[-config ConfigFile1 ConfigFile2 ... ConfigFileN]
+	[-userconfig CallbackModule1 ConfigString1 and CallbackModule2
+         ConfigString2 and .. and CallbackModuleN ConfigStringN]
+	[-decrypt_key Key] | [-decrypt_file KeyFile]</pre>
+  </section>
+  <section>
+    <title>Start a Common Test Master node</title>
+    <pre>
+	ct_run -ctmaster</pre>
+  </section>
+
+  <section>
+    <title>See also</title>
+    <p>Please read the <seealso marker="run_test_chapter">Running Test Suites</seealso>
+      chapter in the Common Test User's Guide for information about the meaning of the
+      different start flags.</p>
+  </section>
+
+</comref>
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index a550810850..a01feb59d1 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>Event Handling</title>
@@ -61,36 +61,35 @@
     itself.</p>
   </section>
   <section>
+    <marker id="usage"></marker>
     <title>Usage</title>
     <p>Event handlers may be installed by means of an <c>event_handler</c>
-    start flag (<c>run_test</c>) or option (<c>ct:run_test/1</c>), where the
+    start flag (<c>ct_run</c>) or option (<c>ct:run_test/1</c>), where the
     argument specifies the names of one or more event handler modules.
     Example:</p>
-    <p><c>$ run_test -suite test/my_SUITE -event_handler handlers/my_evh1 
+    <p><c>$ ct_run -suite test/my_SUITE -event_handler handlers/my_evh1 
     handlers/my_evh2 -pa $PWD/handlers</c></p>
+    <p>Use the <c><![CDATA[ct_run -event_handler_init]]></c> option instead of
+      <c><![CDATA[-event_handler]]></c> to pass start arguments to the event handler
+      init function.</p>
     <p>All event handler modules must have gen_event behaviour. Note also that 
     these modules must be precompiled, and that their locations must be
     added explicitly to the Erlang code server search path (like in the
     example).</p>
 
-    <p>It is not possible to specify start arguments to the event handlers when
-    using the <c>run_test</c> script. You may however pass along start arguments
-    if you use the <c>ct:run_test/1</c> function. An event_handler tuple in the argument 
-    <c>Opts</c> has the following definition (see also <c>ct:run_test/1</c> in the 
-    reference manual):</p>
+    <p>An event_handler tuple in the argument <c>Opts</c> has the following
+      definition (see also <c>ct:run_test/1</c> in the reference manual):</p>
 
     <pre>
     {event_handler,EventHandlers}
 
     EventHandlers = EH | [EH]
     EH = atom() | {atom(),InitArgs} | {[atom()],InitArgs}
-    InitArgs = [term()] 
-    </pre>
+    InitArgs = [term()]</pre>
 
     <p>Example:</p>
     <pre>
-    1> ct:run_test([{suite,"test/my_SUITE"},{event_handler,[my_evh1,{my_evh2,[node()]}]}]).
-    </pre>
+    1> ct:run_test([{suite,"test/my_SUITE"},{event_handler,[my_evh1,{my_evh2,[node()]}]}]).</pre>
     <p>This will install two event handlers for the <c>my_SUITE</c> test. Event handler
     <c>my_evh1</c> is started with <c>[]</c> as argument to the init function. Event handler
     <c>my_evh2</c> is started with the name of the current node in the init argument list.</p>
@@ -122,6 +121,7 @@
     node the event has originated from (only relevant for CT Master event handlers).
     <c>data</c> is specific for the particular event.</p>
 
+    <marker id="events"></marker>
     <p><em>General events:</em></p>
 
     <list>
@@ -174,6 +174,7 @@
 	are also given.
 	</p></item>
 
+      <marker id="tc_done"/>
       <item><c>#event{name = tc_done, data = {Suite,FuncOrGroup,Result}}</c>
         <p><c>Suite = atom()</c>, name of the suite.</p>
         <p><c>FuncOrGroup = Func | {Conf,GroupName,GroupProperties}</c></p>
@@ -183,12 +184,14 @@
 	      (unknown if init- or end function times out).</p>
         <p><c>GroupProperties = list()</c>, list of execution properties for the group.</p>
         <p><c>Result = ok | {skipped,SkipReason} | {failed,FailReason}</c>, the result.</p>
+	<marker id="skipreason"/>
         <p><c>SkipReason = {require_failed,RequireInfo} | 
 	                   {require_failed_in_suite0,RequireInfo} | 
 	                   {failed,{Suite,init_per_testcase,FailInfo}} | 
                            UserTerm</c>, 
 	      the reason why the case has been skipped.</p>
-	<p><c>FailReason = {error,FailInfo} | 
+	<marker id="failreason"/>
+        <p><c>FailReason = {error,FailInfo} | 
 	                   {error,{RunTimeError,StackTrace}} | 
                            {timetrap_timeout,integer()} | 
 			   {failed,{Suite,end_per_testcase,FailInfo}}</c>, reason for failure.</p>	
@@ -211,6 +214,7 @@
 	<c>end_per_testcase</c> for the case failed.
 	</p></item>
 
+	<marker id="tc_auto_skip"></marker>
       <item><c>#event{name = tc_auto_skip, data = {Suite,Func,Reason}}</c>
         <p><c>Suite = atom()</c>, the name of the suite.</p>
         <p><c>Func = atom()</c>, the name of the test case or configuration function.</p>
@@ -236,7 +240,8 @@
 	skipped because of <c>init_per_testcase</c> failing, since that information is carried with
 	the <c>tc_done</c> event.
 	</p></item>
-
+	
+	<marker id="tc_user_skip"></marker>
       <item><c>#event{name = tc_user_skip, data = {Suite,TestCase,Comment}}</c>
         <p><c>Suite = atom()</c>, name of the suite.</p>
         <p><c>TestCase = atom()</c>, name of the test case.</p>
diff --git a/lib/common_test/doc/src/install_chapter.xml b/lib/common_test/doc/src/install_chapter.xml
index e1ff5abf6a..89c497962d 100644
--- a/lib/common_test/doc/src/install_chapter.xml
+++ b/lib/common_test/doc/src/install_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2009</year>
+      <year>2007</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>Installation</title>
@@ -33,82 +33,77 @@
     <marker id="general"></marker>
     <title>General information</title>
 
-    <p>The two main interfaces for running tests with Common Test 
-    are an executable Bourne shell script named <c>run_test</c> and an
-    erlang module named <c>ct</c>. The shell script will work on Unix/Linux
-    (and Linux-like environments such as Cygwin on Windows) and the
-    <c>ct</c> interface functions can be called from the Erlang shell
-    (or from any Erlang function) on any supported platform.</p>
-    
-    <p>The Common Test application is installed with the Erlang/OTP
-    system and no explicit installation is required to start using
-    Common Test by means of the interface functions in the <c>ct</c>
-    module. If you wish to use <c>run_test</c>, however, this script
-    needs to be generated first, according to the instructions below.</p>
-    </section>
+    <p>The two main interfaces for running tests with Common Test
+      are an executable program named ct_run and an
+      erlang module named <c>ct</c>. The ct_run program
+      is compiled for the underlying operating system (e.g. Unix/Linux
+      or Windows) during the build of the Erlang/OTP system, and is
+      installed automatically with other executable programs in
+      the top level <c>bin</c> directory of Erlang/OTP.
+      The <c>ct</c> interface functions can be called from the Erlang shell,
+      or from any Erlang function, on any supported platform.</p>
+
+    <p>A legacy Bourne shell script - named run_test - exists,
+      which may be manually generated and installed. This script may be used
+      instead of the ct_run program mentioned above, e.g. if the user
+      wishes to modify or customize the Common Test start flags in a simpler
+      way than making changes to the ct_run C program.</p>
 
-  <section>
-    <title>Unix/Linux</title>
-
-    <p>Go to the <c><![CDATA[common_test-<vsn>]]></c> directory, located
-    among the other OTP applications (under the OTP lib directory). Here you
-    execute the <c>install.sh</c> script with argument <c>local</c>:</p>
-
-    <p><c> 
-    $ ./install.sh local 
-    </c></p>    
+    <p>The Common Test application is installed with the Erlang/OTP
+      system and no additional installation step is required to start using
+      Common Test by means of the ct_run executable program, and/or the interface
+      functions in the <c>ct</c> module. If you wish to use the legacy Bourne
+      shell script version run_test, however, this script needs to be
+      generated first, according to the instructions below.</p>
+
+    <p><note>Before reading on, please note that since Common Test version
+	1.5, the run_test shell script is no longer required for starting
+	tests with Common Test from the OS command line. The ct_run
+	program (descibed above) is the new recommended command line interface
+	for Common Test. The shell script exists mainly for legacy reasons and
+	may not be updated in future releases of Common Test. It may even be removed.
+    </note></p>
+
+    <p>Optional step to generate a shell script for starting Common Test:</p>
+    <p>To generate the run_test shell script, navigate to the
+      <c><![CDATA[common_test-<vsn>]]></c> directory, located among the other
+      OTP applications (under the OTP lib directory). Here execute the
+      <c>install.sh</c> script with argument <c>local</c>:</p>
+
+    <p><c>
+	$ ./install.sh local
+    </c></p>
     
-    <p>This generates the executable <c>run_test</c> script in the 
-    <c><![CDATA[common_test-<vsn>/priv/bin]]></c> directory. The script
-    will include absolute paths to the Common Test and Test Server
-    application directories, so it's possible to copy or move the script to
-    a different location on the file system, if desired, without having to
-    update it. It's of course possible to leave the script under the
-    <c>priv/bin</c> directory and update the PATH variable accordingly (or
-    create a link or alias to it).</p>
-
-    <p>If you, for any reason, have copied Common Test and Test Server 
-    to a different location than the default OTP lib directory, you can
-    generate a <c>run_test</c> script with a different top level directory, 
-    simply by specifying the directory, instead of <c>local</c>, when running
-    <c>install.sh</c>. Example:</p>
-
-    <p><c> 
-    $ install.sh /usr/local/test_tools
+    <p>This generates the executable run_test script in the
+      <c><![CDATA[common_test-<vsn>/priv/bin]]></c> directory. The script
+      will include absolute paths to the Common Test and Test Server
+      application directories, so it's possible to copy or move the script to
+      a different location on the file system, if desired, without having to
+      update it. It's of course possible to leave the script under the
+      <c>priv/bin</c> directory and update the PATH variable accordingly (or
+      create a link or alias to it).</p>
+
+    <p>If you, for any reason, have copied Common Test and Test Server
+      to a different location than the default OTP lib directory, you can
+      generate a run_test script with a different top level directory,
+      simply by specifying the directory, instead of <c>local</c>, when running
+      <c>install.sh</c>. Example:</p>
+
+    <p><c>
+	$ install.sh /usr/local/test_tools
     </c></p>
 
     <p>Note that the <c><![CDATA[common_test-<vsn>]]></c> and
-    <c><![CDATA[test_server-<vsn>]]></c> directories must be located under the
-    same top directory. Note also that the install script does not copy files 
-    or update environment variables. It only generates the <c>run_test</c> 
-    script.</p> 
+      <c><![CDATA[test_server-<vsn>]]></c> directories must be located under the
+      same top directory. Note also that the install script does not copy files
+      or update environment variables. It only generates the run_test
+      script.</p>
     
-    <p>Whenever you install a new version of Erlang/OTP, the <c>run_test</c>
-    script needs to be regenerated, or updated manually with new directory names
-    (new version numbers), for it to "see" the latest Common Test and Test Server
-    versions.</p>
+    <p>Whenever you install a new version of Erlang/OTP, the run_test
+      script needs to be regenerated, or updated manually with new directory names
+      (new version numbers), for it to "see" the latest Common Test and Test Server
+      versions.</p>
 
-    <p>For more information on the <c>run_test</c> script and the <c>ct</c>
-    module, please see the reference manual.</p>
-    </section>
-
-  <section>
-    <title>Windows</title>
-
-    <p>On Windows it is very convenient to use Cygwin (<c>www.cygwin.com</c>)
-    for running Common Test and Erlang, since it enables you to use the
-    <c>run_test</c> script for starting Common Test. If you are a Cygwin
-    user, simply follow the instructions above for generating the <c>run_test</c>
-    script.</p>
-
-    <p>If you do not use Cygwin, you have to rely on the API functions
-    in the <c>ct</c> module (instead of <c>run_test</c>) for running
-    Common Test as described initially in this chapter.</p>
-
-    <p>If you, for any reason, have chosen to store Common Test and Test Server 
-    in a different location than the default OTP lib directory, make 
-    sure the <c>ebin</c> directories of these applications are included 
-    in the Erlang code server path (so the application modules can be loaded).</p>
     </section>
 </chapter>
 
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 4f5f6caa8c..2fd5dcf4f1 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -32,6 +32,266 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.5.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Updated ct:get_status documentation to describe
+	    no_tests_running return value.</p>
+          <p>
+	    Own Id: OTP-8895 Aux Id: seq11701 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed race condition test failures in the test suites
+	    testing common test's parallel groups feature.</p>
+          <p>
+	    Own Id: OTP-8921</p>
+        </item>
+        <item>
+          <p>
+	    The include directive of testspecs now work when used on
+	    a remote node.</p>
+          <p>
+	    Own Id: OTP-8935 Aux Id: seq11731 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    ct:parse_table can now handle multiline sql rows</p>
+          <p>
+	    Own Id: OTP-8907 Aux Id: seq11702 </p>
+        </item>
+        <item>
+          <p>
+	    The run_test executable has been renamed to the less
+	    generic ct_run to better work with other applications.
+	    run_test will remain until R16B at which point it will be
+	    removed.</p>
+          <p>
+	    Own Id: OTP-8936</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Returning {return_group_result,failed} from end_per_group
+	    in a group that is part of a sequence, did not cause the
+	    proceeding cases (or groups) to get skipped. This has
+	    been fixed.</p>
+          <p>
+	    Own Id: OTP-8753 Aux Id: seq11644 </p>
+        </item>
+        <item>
+          <p>
+	    ct:install now works as the documentation describes.</p>
+          <p>
+	    Own Id: OTP-8818 Aux Id: seq-11666 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Common Test has been updated to handle start options and
+	    test specification terms for test case groups (and test
+	    cases in groups). Also, an option named 'label', has been
+	    added that associates the test run with a name that
+	    Common Test prints in the overview HTML logs.</p>
+          <p>
+	    Own Id: OTP-8725 Aux Id: OTP-8727 </p>
+        </item>
+        <item>
+          <p>
+	    Andrey Pampukha has been added to the AUTHORS file. Thank
+	    you Andrey for your work on configuration data handling,
+	    Large Scale Testing improvements, and other useful
+	    updates and fixes.</p>
+          <p>
+	    Own Id: OTP-8803</p>
+        </item>
+        <item>
+          <p>
+	    The Configuration Data chapter in the User's Guide has
+	    been updated.</p>
+          <p>
+	    Own Id: OTP-8804</p>
+        </item>
+        <item>
+          <p>
+	    Milliseconds are now included in timestamps in Common
+	    Test log entries. (Thanks to Tomas Johansson.)</p>
+          <p>
+	    Own Id: OTP-8808</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Process calls using monitors in Common Test would not
+	    clear the inbox of remaining DOWN messages. This has been
+	    fixed.</p>
+          <p>
+	    Own Id: OTP-8621 Aux Id: seq11560 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    It is now possible for the user to provide specific
+	    callback modules that handle test configuration data, so
+	    that data on arbitray form can be accessed (e.g. by
+	    reading files or by communicating with a configuration
+	    server process). Two default callback modules have been
+	    introduced in Common Test: ct_config_plain and
+	    ct_config_xml. The former is used to handle the
+	    traditional Common Test configuration files (with terms
+	    on key-value tuple form) and the latter to handle
+	    configuration data on XML representation.</p>
+          <p>
+	    Own Id: OTP-8485</p>
+        </item>
+        <item>
+          <p>
+	    It is now possible to execute test suites that are not
+	    necessarily available on the local file system, but have
+	    been loaded on the test node in advance (e.g. sent as
+	    binaries from a remote node and loaded by RPC). A
+	    requirement is that the no_auto_compile (or
+	    {auto_compile,false}) parameter has been set.</p>
+          <p>
+	    Own Id: OTP-8490 Aux Id: seq11500 </p>
+        </item>
+        <item>
+          <p>
+	    Test Server will now call the end_per_testcase/2 function
+	    even if the test case has been terminated explicitly
+	    (with abort_current_testcase/1), or after a timetrap
+	    timeout. Under these circumstances the return value of
+	    end_per_testcase is completely ignored. Therefore the
+	    function will not be able to change the reason for test
+	    case termination by returning {fail,Reason}, nor will it
+	    be able to save data with {save_config,Data}.</p>
+          <p>
+	    Own Id: OTP-8500 Aux Id: seq11521 </p>
+        </item>
+        <item>
+          <p>
+	    It is now possible to use the test specification term
+	    'init' to start Common Test nodes automatically, as well
+	    as have initial function calls evaluated on the nodes. A
+	    default callback module for the 'init' term, ct_slave,
+	    has been introduced to enable Common Test Master to
+	    perform host login and node startup operations over ssh.</p>
+          <p>
+	    Own Id: OTP-8570</p>
+        </item>
+        <item>
+          <p>
+	    The run_test script has been replaced by a program (with
+	    the same name) which can be executed without explicit
+	    installation. The start flags are the same as for the
+	    legacy start script.</p>
+          <p>
+	    Own Id: OTP-8650</p>
+        </item>
+        <item>
+          <p>
+	    Previously, a repeat property of a test case group
+	    specified the number of times the group should be
+	    repeated after the main test run. I.e. {repeat,N} would
+	    case the group to execute 1+N times. To be consistent
+	    with the behaviour of the run_test repeat option, this
+	    has been changed. N now specifies the absolute number of
+	    executions instead.</p>
+          <p>
+	    Own Id: OTP-8689 Aux Id: seq11502 </p>
+        </item>
+        <item>
+          <p>
+	    With the run_test -erl_args option, it's possible to
+	    divide the options on the run_test command line into ones
+	    that Common Test should process (those preceding
+	    -erl_args, and ones it should ignore (those succeeding
+	    -erl_args). Options preceding -erl_args that Common Test
+	    doesn't recognize are also ignored (i.e. the same
+	    behaviour as earlier versions of Common Test).</p>
+          <p>
+	    Own Id: OTP-8690 Aux Id: OTP-8650 </p>
+        </item>
+        <item>
+          <p>
+	    Directories added with -pa or -pz in the pre-erl_args
+	    part of the run_test command line will be converted from
+	    relative to absolute, this to avoid problems loading user
+	    modules when Common Test switches working directory
+	    during the test run.</p>
+          <p>
+	    Own Id: OTP-8691 Aux Id: OTP-8650 </p>
+        </item>
+        <item>
+          <p>
+	    The timetrap handling has been made more user
+	    controllable by means of new start options and new ct
+	    interface functions. With the 'multiply_timetraps' start
+	    option, it's possible to specify a value which all
+	    timetrap timeout values get multiplied by. This is useful
+	    e.g. to extend the timetraps temporarily while running
+	    cover or trace. The 'scale_timetraps' start option
+	    switches on or off the Test Server timetrap scaling
+	    feature (which tries to detect if the tests may benefit
+	    from extended timetraps, e.g. due to running certain test
+	    tools, and performs the scaling automatically).
+	    Furthermore, the ct:timetrap/1 function has been
+	    introduced, which makes it possible to set/reset
+	    timetraps during test execution. Also, a ct:sleep/1
+	    function is now available, which takes the timetrap
+	    parameters into account when calculating the time to
+	    suspend the process.</p>
+          <p>
+	    Own Id: OTP-8693</p>
+        </item>
+        <item>
+          <p>
+	    A new run_test start option, event_handler_init, has been
+	    added that takes a start argument which gets passed to
+	    the init function of the event handler.</p>
+          <p>
+	    Own Id: OTP-8694</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.4.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/doc/src/part.xml b/lib/common_test/doc/src/part.xml
index 53a4cb1bbf..41371b60be 100644
--- a/lib/common_test/doc/src/part.xml
+++ b/lib/common_test/doc/src/part.xml
@@ -75,6 +75,7 @@
   <xi:include href="ct_master_chapter.xml"/>
   <xi:include href="event_handler_chapter.xml"/>
   <xi:include href="dependencies_chapter.xml"/>
+  <xi:include href="ct_hooks_chapter.xml"/>
   <xi:include href="why_test_chapter.xml"/>
 </part>
           
diff --git a/lib/common_test/doc/src/ref_man.xml b/lib/common_test/doc/src/ref_man.xml
index beb3ed3247..631e3871c2 100644
--- a/lib/common_test/doc/src/ref_man.xml
+++ b/lib/common_test/doc/src/ref_man.xml
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>Common Test Reference Manual</title>
@@ -63,7 +63,7 @@
       Server application.</p>
   </description>
   <xi:include href="common_test_app.xml"/>
-  <xi:include href="run_test.xml"/>
+  <xi:include href="ct_run.xml"/>
   <!-- If you make modifications in the module list below,
        you also need to update CT_MODULES in Makefile. -->
   <xi:include href="ct.xml"/>
@@ -75,6 +75,8 @@
   <xi:include href="ct_snmp.xml"/>
   <xi:include href="ct_telnet.xml"/>
   <xi:include href="unix_telnet.xml"/>
+  <xi:include href="ct_slave.xml"/>
+  <xi:include href="ct_hooks.xml"/>
 </application>
 
 
diff --git a/lib/common_test/doc/src/run_test.xml b/lib/common_test/doc/src/run_test.xml
deleted file mode 100644
index d9dd22d411..0000000000
--- a/lib/common_test/doc/src/run_test.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE comref SYSTEM "comref.dtd">
-
-<comref>
-  <header>
-    <copyright>
-      <year>2007</year><year>2009</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>The run_test shell script</title>
-    <prepared>Peter Andersson</prepared>
-    <responsible>Peter Andersson</responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2007-07-04</date>
-    <rev>PA1</rev>
-    <file>run_test.xml</file>
-  </header>
-  <com>run_test</com> 
-  <comsummary>Shell script used for starting
-  Common Test from the Unix command line.
-  </comsummary>
-
-  <description>
-  <p>The <c>run_test</c> script is automatically generated as Common
-  Test is installed (please see the Installation chapter in the Common
-  Test User's Guide for more information). The script accepts a number 
-  of different start flags. Some flags trigger <c>run_test</c>
-  to start the Common Test application and pass on data to it. Some
-  flags start an Erlang node prepared for running Common Test in a
-  particular mode.</p>
-  <p><c>run_test</c> also accepts Erlang emulator
-  flags. These are used when <c>run_test</c> calls <c>erl</c> to
-  start the Erlang node (making it possible to e.g. add directories to
-  the code server path, change the cookie on the node, start
-  additional applications, etc).</p>
-  <p>If <c>run_test</c> is called without parameters, it prints all valid
-  start flags to stdout.</p>
-  </description>
-
-  <section>
-    <title>Run tests from command line</title>
-    <pre>
-    	run_test [-dir TestDir1 TestDir2 .. TestDirN] |	
-	[-suite Suite1 Suite2 .. SuiteN 
-	 [[-group Group1 Group2 .. GroupN] [-case Case1 Case2 .. CaseN]]]
-	[-step [config | keep_inactive]]
-	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
-	[-decrypt_key Key] | [-decrypt_file KeyFile]
-	[-logdir LogDir]
-	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
-	[-stylesheet CSSFile]
-	[-cover CoverCfgFile]
-	[-event_handler EvHandler1 EvHandler2 .. EvHandlerN]
-	[-include InclDir1 InclDir2 .. InclDirN]
-	[-no_auto_compile]
-        [-repeat N [-force_stop]] |
-        [-duration HHMMSS [-force_stop]] |
-        [-until [YYMoMoDD]HHMMSS [-force_stop]]
-	[-basic_html]</pre>
-  </section>
-  <section>
-    <title>Run tests using test specification</title>
-    <pre>
-	run_test -spec TestSpec1 TestSpec2 .. TestSpecN
-	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
-	[-decrypt_key Key] | [-decrypt_file KeyFile]
-	[-logdir LogDir]
-	[-allow_user_terms]
-	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
-	[-stylesheet CSSFile]
-	[-cover CoverCfgFile]
-	[-event_handler EvHandler1 EvHandler2 .. EvHandlerN]
-	[-include InclDir1 InclDir2 .. InclDirN]
-	[-no_auto_compile]
-        [-repeat N [-force_stop]] |
-        [-duration HHMMSS [-force_stop]] |
-        [-until [YYMoMoDD]HHMMSS [-force_stop]]
-	[-basic_html]</pre>
-  </section>
-  <section>
-    <title>Run tests in web based GUI</title>
-    <pre>
-        run_test -vts [-browser Browser]
-	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
-	[-decrypt_key Key] | [-decrypt_file KeyFile]
-        [-dir TestDir1 TestDir2 .. TestDirN] |
-        [-suite Suite [[-group Group] [-case Case]]]
-	[-include InclDir1 InclDir2 .. InclDirN]
-	[-no_auto_compile]
-	[-basic_html]</pre>
-  </section>
-  <section>
-    <title>Refresh the HTML index files</title>
-    <pre>
-	run_test -refresh_logs [-logdir LogDir] [-basic_html]</pre>
-  </section>
-  <section>
-    <title>Run CT in interactive mode</title>
-    <pre>
-	run_test -shell 
-	[-config ConfigFile1 ConfigFile2 ... ConfigFileN]
-	[-decrypt_key Key] | [-decrypt_file KeyFile]</pre>
-  </section>
-  <section>
-    <title>Start an Erlang node with a given name</title>
-    <pre>
-	run_test -ctname NodeName</pre>
-  </section>
-  <section>
-    <title>Start a Common Test Master node</title>
-    <pre>
-	run_test -ctmaster</pre>
-  </section>
-
-  <section>
-  <title>See also</title>
-  <p>Please read the <seealso marker="run_test_chapter">Running Test Suites</seealso>
-  chapter in the Common Test User's Guide for information about the meaning of the
-  different start flags.</p>
-  </section>
-
-</comref>
-
-
diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index d731d18783..f052adf25e 100644
--- a/lib/common_test/doc/src/run_test_chapter.xml
+++ b/lib/common_test/doc/src/run_test_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,15 +13,15 @@
       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>Running Test Suites</title>
+    <title>Running Tests</title>
     <prepared>Peter Andersson, Kenneth Lundin</prepared>
     <docno></docno>
     <date></date>
@@ -71,7 +71,7 @@
 
     <p>If test suites or help modules include header files stored in other
       locations than the test directory, you may specify these include directories
-      by means of the <c><![CDATA[-include]]></c> flag with <c><![CDATA[run_test]]></c>, 
+      by means of the <c><![CDATA[-include]]></c> flag with <c><![CDATA[ct_run]]></c>, 
       or the <c><![CDATA[include]]></c> option with <c><![CDATA[ct:run_test/1]]></c>.
       In addition to this, an include path may be specified with an OS
       environment variable; <c><![CDATA[CT_INCLUDE_PATH]]></c>. Example (bash):</p>
@@ -93,36 +93,46 @@
       there instead.</p>
 
     <p>It is possible to disable the automatic compilation feature by using the
-      <c><![CDATA[-no_auto_compile]]></c> flag with <c><![CDATA[run_test]]></c>, or
+      <c><![CDATA[-no_auto_compile]]></c> flag with <c><![CDATA[ct_run]]></c>, or
       the <c><![CDATA[{auto_compile,false}]]></c> option with 
       <c><![CDATA[ct:run_test/1]]></c>. With automatic compilation
       disabled, the user is responsible for compiling the test suite modules 
-      (and any help modules) before the test run. Common Test will only verify 
-      that the specified test suites exist before starting the tests.</p> 
+      (and any help modules) before the test run. If the modules can not be loaded
+      from the local file system during startup of Common Test, the user needs to
+      pre-load the modules before starting the test. Common Test will only verify
+      that the specified test suites exist (i.e. that they are, or can be, loaded).
+      This is useful e.g. if the test suites are transferred and loaded as binaries via
+      RPC from a remote node.</p>
   </section>
 
+  <marker id="ct_run"></marker>
   <section>
-    <title>Running tests from the UNIX command line</title>
+    <title>Running tests from the OS command line</title>
     
-    <p>The script <c>run_test</c> can be used for running tests from
-      the Unix/Linux command line, e.g.
+    <p>The <c>ct_run</c> program can be used for running tests from
+      the OS command line, e.g.
     </p>
     <list>
-      <item><c><![CDATA[run_test -config <configfilenames> -dir <dirs>]]></c></item>
-      <item><c><![CDATA[run_test -config <configfilenames> -suite <suiteswithfullpath>]]></c>
+      <item><c><![CDATA[ct_run -config <configfilenames> -dir <dirs>]]></c></item>
+      <item><c><![CDATA[ct_run -config <configfilenames> -suite <suiteswithfullpath>]]></c>
       </item>
-      <item><c><![CDATA[run_test -config <configfilenames> -suite <suitewithfullpath>
+      <item><c><![CDATA[ct_run -userconfig <callbackmodulename> <configfilenames> -suite <suiteswithfullpath>]]></c>
+      </item>
+      <item><c><![CDATA[ct_run -config <configfilenames> -suite <suitewithfullpath>
 	      -group <groupnames> -case <casenames>]]></c></item>
     </list>
     <p>Examples:</p>
-    <p><c>$ run_test -config $CFGS/sys1.cfg $CFGS/sys2.cfg -dir $SYS1_TEST $SYS2_TEST</c></p>
-    <p><c>$ run_test -suite $SYS1_TEST/setup_SUITE $SYS2_TEST/config_SUITE</c></p>
-    <p><c>$ run_test -suite $SYS1_TEST/setup_SUITE -case start stop</c></p>
-    <p><c>$ run_test -suite $SYS1_TEST/setup_SUITE -group installation -case start stop</c></p>
+    <p><c>$ ct_run -config $CFGS/sys1.cfg $CFGS/sys2.cfg -dir $SYS1_TEST $SYS2_TEST</c></p>
+    <p><c>$ ct_run -userconfig ct_config_xml $CFGS/sys1.xml $CFGS/sys2.xml -dir $SYS1_TEST $SYS2_TEST</c></p>
+    <p><c>$ ct_run -suite $SYS1_TEST/setup_SUITE $SYS2_TEST/config_SUITE</c></p>
+    <p><c>$ ct_run -suite $SYS1_TEST/setup_SUITE -case start stop</c></p>
+    <p><c>$ ct_run -suite $SYS1_TEST/setup_SUITE -group installation -case start stop</c></p>
     
-    <p>Other flags that may be used with <c>run_test</c>:</p>
+    <p>Other flags that may be used with <c>ct_run</c>:</p>
     <list>
       <item><c><![CDATA[-logdir <dir>]]></c>, specifies where the HTML log files are to be written.</item>
+      <item><c><![CDATA[-label <name_of_test_run>]]></c>, associates the test run with a name that gets printed
+	in the overview HTML log files.</item>
       <item><c>-refresh_logs</c>, refreshes the top level HTML index files.</item>
       <item><c>-vts</c>, start web based GUI (see below).</item>
       <item><c>-shell</c>, start interactive shell mode (see below).</item>
@@ -136,8 +146,16 @@
 	<seealso marker="cover_chapter#cover">Code Coverage Analysis</seealso>).</item>
       <item><c><![CDATA[-event_handler <event_handlers>]]></c>, to install 
         <seealso marker="event_handler_chapter#event_handling">event handlers</seealso>.</item>
+      <item><c><![CDATA[-event_handler_init <event_handlers>]]></c>, to install
+        <seealso marker="event_handler_chapter#event_handling">event handlers</seealso> including start arguments.</item>
+      <item><c><![CDATA[-ct_hooks <ct_hooks>]]></c>, to install
+        <seealso marker="ct_hooks_chapter#installing">Common Test Hooks</seealso> including start arguments.</item>
       <item><c><![CDATA[-include]]></c>, specifies include directories (see above).</item>
       <item><c><![CDATA[-no_auto_compile]]></c>, disables the automatic test suite compilation feature (see above).</item>
+      <item><c><![CDATA[-multiply_timetraps <n>]]></c>, extends <seealso marker="write_test_chapter#timetraps">timetrap
+	  timeout</seealso> values.</item>
+      <item><c><![CDATA[-scale_timetraps <bool>]]></c>, enables automatic <seealso marker="write_test_chapter#timetraps">timetrap
+	  timeout</seealso> scaling.</item>
       <item><c><![CDATA[-repeat <n>]]></c>, tells Common Test to repeat the tests n times (see below).</item> 
       <item><c><![CDATA[-duration <time>]]></c>, tells Common Test to repeat the tests for duration of time (see below).</item> 
       <item><c><![CDATA[-until <stop_time>]]></c>, tells Common Test to repeat the tests until stop_time (see below).</item> 
@@ -152,20 +170,20 @@
     <note><p>Directories passed to Common Test may have either relative or absolute paths.</p></note>
 
     <note><p>Arbitrary start flags to the Erlang Runtime System may also be passed as
-             parameters to <c>run_test</c>. It is, for example, useful to be able to
+             parameters to <c>ct_run</c>. It is, for example, useful to be able to
 	     pass directories that should be added to the Erlang code server search path
 	     with the <c>-pa</c> or <c>-pz</c> flag. If you have common help- or library 
 	     modules for test suites (separately compiled), stored in other directories 
 	     than the test suite directories, these help/lib directories are preferrably
 	     added to the code path this way. Example:</p>
-	  <p><c>$ run_test -dir ./chat_server -logdir ./chat_server/testlogs -pa $PWD/chat_server/ebin</c></p>
+	  <p><c>$ ct_run -dir ./chat_server -logdir ./chat_server/testlogs -pa $PWD/chat_server/ebin</c></p>
 	  <p>Note how in this example, the absolute path of the <c>chat_server/ebin</c>
 	     directory is passed to the code server. This is essential since relative
 	     paths are stored by the code server as relative, and Common Test changes 
 	     the current working directory of the Erlang Runtime System during the test run!</p>
     </note>
     
-    <p>For details on how to generate the <c>run_test</c> script, see the 
+    <p>For more information about the <c>ct_run</c> program, see the
       <seealso marker="install_chapter#general">Installation</seealso> chapter.
     </p>
   </section>
@@ -173,35 +191,36 @@
   <section>
     <title>Running tests from the Web based GUI</title>
     
-    <p>The web based GUI, VTS, is started with the <c>run_test</c>
-      script. From the GUI you can load config files, and select
+    <p>The web based GUI, VTS, is started with the <c>ct_run</c>
+      program. From the GUI you can load config files, and select
       directories, suites and cases to run. You can also state the
       config files, directories, suites and cases on the command line
       when starting the web based GUI.
     </p>
     
     <list>
-      <item><c>run_test -vts</c></item>
-      <item><c><![CDATA[run_test -vts -config <configfilename>]]></c></item>
-      <item><c><![CDATA[run_test -vts -config <configfilename> -suite <suitewithfullpath>
+      <item><c>ct_run -vts</c></item>
+      <item><c><![CDATA[ct_run -vts -config <configfilename>]]></c></item>
+      <item><c><![CDATA[ct_run -vts -config <configfilename> -suite <suitewithfullpath>
 	      -case <casename>]]></c></item>
     </list>
     
     <p>From the GUI you can run tests and view the result and the logs.
     </p>
     
-    <p>Note that <c>run_test -vts</c> will try to open the Common Test start
+    <p>Note that <c>ct_run -vts</c> will try to open the Common Test start
       page in an existing web browser window or start the browser if it is
       not running. Which browser should be started may be specified with
       the browser start command option:</p>
-      <p><c><![CDATA[run_test -vts -browser <browser_start_cmd>]]></c></p>
+      <p><c><![CDATA[ct_run -vts -browser <browser_start_cmd>]]></c></p>
       <p>Example:</p>
-      <p><c><![CDATA[$ run_test -vts -browser 'firefox&']]></c></p>
+      <p><c><![CDATA[$ ct_run -vts -browser 'firefox&']]></c></p>
       <p>Note that the browser must run as a separate OS process or VTS will hang!</p>
-      <p>If no specific browser start command is specified, netscape will
+      <p>If no specific browser start command is specified, Firefox will
         be the default browser on Unix platforms and Internet Explorer on Windows.
-	If Common Test fails to start a browser automatically, start your 
-	favourite browser manually instead and type in the URL that Common Test
+	If Common Test fails to start a browser automatically, or <c>'none'</c> is
+	specified as the value for -browser (i.e. <c>-browser none</c>), start your
+	favourite browser manually and type in the URL that Common Test
 	displays in the shell.</p>    
   </section>
   
@@ -211,10 +230,10 @@
     <p>Common Test provides an Erlang API for running tests. The main (and most
       flexible) function for specifying and executing tests is called
       <c>ct:run_test/1</c>. This function takes the same start parameters as
-      the <c>run_test</c> script described above, only the flags are instead
+      the <c>ct_run</c> program described above, only the flags are instead
       given as options in a list of key-value tuples. E.g. a test specified 
-      with <c>run_test</c> like:</p>
-      <p><c>$ run_test -suite ./my_SUITE -logdir ./results</c></p> 
+      with <c>ct_run</c> like:</p>
+      <p><c>$ ct_run -suite ./my_SUITE -logdir ./results</c></p> 
       <p>is with <c>ct:run_test/1</c> specified as:</p> 
       <p><c>1> ct:run_test([{suite,"./my_SUITE"},{logdir,"./results"}]).</c></p>
       <p>For detailed documentation, please see the <c>ct</c> manual page.</p>    
@@ -237,16 +256,17 @@
       manually and call <c>ct:install/1</c> to install any configuration
       data you might need (use <c>[]</c> as argument otherwise), then
       call <c>ct:start_interactive/0</c> to start Common Test. If you use
-      the <c>run_test</c> script, you may start the Erlang shell and Common Test
+      the <c>ct_run</c> program, you may start the Erlang shell and Common Test
       in the same go by using the <c>-shell</c> and, optionally, the <c>-config</c>
-      flag:
+      and/or <c>-userconfig</c> flag. Examples:
     </p>
     <list>
-      <item><c>run_test -shell</c></item>
-      <item><c><![CDATA[run_test -shell -config <configfilename>]]></c></item>
+      <item><c>ct_run -shell</c></item>
+      <item><c><![CDATA[ct_run -shell -config cfg/db.cfg]]></c></item>
+      <item><c><![CDATA[ct_run -shell -userconfig db_login testuser x523qZ]]></c></item>
     </list>
     
-    <p>If no config file is given with the <c>run_test</c> command,
+    <p>If no config file is given with the <c>ct_run</c> command,
       a warning will be displayed. If Common Test has been run from the same
       directory earlier, the same config file(s) will be used
       again. If Common Test has not been run from this directory before, no
@@ -268,14 +288,15 @@
        2> ct_telnet:open(unix_telnet).
        {ok,&lt;0.105.0&gt;}
        4> ct_telnet:cmd(unix_telnet, "ls .").
-       {ok,["ls .","file1  ...",...]}</pre>
+       {ok,["ls .","file1  ...",...]}
+    </pre>
     
     <p>Everything that Common Test normally prints in the test case logs,
       will in the interactive mode be written to a log named
       <c>ctlog.html</c> in the <c><![CDATA[ct_run.<timestamp>]]></c>
       directory. A link to this file will be available in the file
       named <c>last_interactive.html</c> in the directory from which
-      you executed <c>run_test</c>. Currently, specifying a different
+      you executed <c>ct_run</c>. Currently, specifying a different
       root directory for the logs than the current working directory,
       is not supported.</p>
     
@@ -291,7 +312,7 @@
   <section>
     <title>Step by step execution of test cases with the Erlang Debugger</title>
    
-    <p>By means of <c>run_test -step [opts]</c>, or by passing the 
+    <p>By means of <c>ct_run -step [opts]</c>, or by passing the 
        <c>{step,Opts}</c> option to <c>ct:run_test/1</c>, it is possible
        to get the Erlang Debugger started automatically and use its
        graphical interface to investigate the state of the current test 
@@ -315,60 +336,109 @@
        with <c>dir</c>.</p>       
   </section>
 
+  <marker id="test_specifications"></marker>
   <section>
-    <marker id="test_specifications"></marker>
     <title>Using test specifications</title>
     
-    <p>The most expressive way to specify what to test is to use a so 
-      called test specification. A test specification is a sequence of 
-      Erlang terms. The terms may be declared in a text file or passed 
-      to the test server at runtime as a list (see <c>run_testspec/1</c>
-      in the manual page for <c>ct</c>). There are two general types 
-      of terms: configuration terms and test specification terms.</p>
-    <p>With configuration terms it is possible to import configuration 
-      data (similar to <c>run_test -config</c>), specify HTML log 
-      directories (similar to <c>run_test -logdir</c>), give aliases 
-      to test nodes and test directories (to make a specification
-      easier to read and maintain), enable code coverage analysis
-      (see the <seealso marker="cover_chapter#cover">Code Coverage 
-       Analysis</seealso> chapter) and specify event_handler plugins 
+    <p>The most flexible way to specify what to test, is to use a so
+      called test specification. A test specification is a sequence of
+      Erlang terms. The terms may be declared in a text file or passed
+      to the test server at runtime as a list
+      (see <c>run_testspec/1</c> in the manual page
+      for <c>ct</c>). There are two general types of terms:
+      configuration terms and test specification terms.</p>
+    <p>With configuration terms it is possible to e.g. label the test
+      run (similar to <c>ct_run -label</c>), evaluate arbitrary expressions
+      before starting a test, import configuration
+      data (similar to
+      <c>ct_run -config/-userconfig</c>), specify HTML log directories (similar
+      to
+      <c>ct_run -logdir</c>), give aliases to test nodes and test
+      directories (to make a specification easier to read and
+      maintain), enable code coverage analysis (see
+      the <seealso marker="cover_chapter#cover">Code Coverage
+      Analysis</seealso> chapter) and specify event_handler plugins
       (see the <seealso marker="event_handler_chapter#event_handling">
-       Event Handling</seealso> chapter). There is also a term
-       for specifying include directories that should be passed on
-       to the compiler when automatic compilation is performed 
-       (similar to <c>run_test -include</c>, see above).</p>
-    <p>With test specification terms it is possible to state exactly which
-      tests should run and in which order. A test term specifies either
-      one or more suites or one or more test cases. An arbitrary number of test 
-      terms may be declared in sequence. A test term can also specify one or 
-      more test suites or test cases to be skipped. Skipped suites and cases 
-      are not executed and show up in the HTML test log as SKIPPED.</p>
-
-    <note><p>It is not yet possible to specify test case groups in
-      test specifications. This will be supported in a soon upcoming 
-      release.</p></note>
+      Event Handling</seealso> chapter). There is also a term for
+      specifying include directories that should be passed on to the
+      compiler when automatic compilation is performed (similar
+      to <c>ct_run -include</c>, see above).</p>
+    <p>With test specification terms it is possible to state exactly
+      which tests should run and in which order. A test term specifies
+      either one or more suites, one or more test case groups, or one
+      or more test cases in a group or suite.</p>
+    <p>An arbitrary number of test terms may be declared in sequence.
+      Common Test will by default compile the terms into one or more tests 
+      to be performed in one resulting test run. Note that a term that
+      specifies a set of test cases will "swallow" one that only
+      specifies a subset of these cases. E.g. the result of merging
+      one term that specifies that all cases in suite S should be
+      executed, with another term specifying only test case X and Y in
+      S, is a test of all cases in S. However, if a term specifying
+      test case X and Y in S is merged with a term specifying case Z
+      in S, the result is a test of X, Y and Z in S. To disable this
+      behaviour, it is possible in test specification to set the 
+      <c>merge_tests</c> term to <c>false</c>.</p>
+    <p>A test term can also specify one or more test suites, groups,
+      or test cases to be skipped. Skipped suites, groups and cases
+      are not executed and show up in the HTML test log files as
+      SKIPPED.</p>
+    <p>When a test case group is specified, the resulting test
+      executes the
+      <c>init_per_group</c> function, followed by all test cases and
+      sub groups (including their configuration functions), and
+      finally the <c>end_per_group</c> function. Also if particular
+      test cases in a group are specified, <c>init_per_group</c>
+      and <c>end_per_group</c> for the group in question are
+      called. If a group which is defined (in <c>Suite:group/0</c>) to
+      be a sub group of another group, is specified (or particular test
+      cases of a sub group are), Common Test will call the configuration
+      functions for the top level groups as well as for the sub group
+      in question (making it possible to pass configuration data all
+      the way from <c>init_per_suite</c> down to the test cases in the
+      sub group).</p>
 
     <p>Below is the test specification syntax. Test specifications can
-      be used to run tests both in a single test host environment and in 
-      a distributed Common Test environment. Node parameters are only relevant in the 
-      latter (see the chapter about running Common Test in distributed mode for information). 
-      For details on the event_handler term, see the 
-      <seealso marker="event_handler_chapter#event_handling">Event Handling</seealso>
-      chapter.</p>
+      be used to run tests both in a single test host environment and
+      in a distributed Common Test environment (Large Scale
+      Testing). The node parameters in the init term are only
+      relevant in the latter (see the
+      <seealso marker="ct_master_chapter#test_specifications">Large
+      Scale Testing</seealso> chapter for information). For details on
+      the event_handler term, see the
+      <seealso marker="event_handler_chapter#event_handling">Event
+      Handling</seealso> chapter.</p>
       <p>Config terms:</p>
     <pre>
       {node, NodeAlias, Node}.
+
+      {init, InitOptions}.
+      {init, [NodeAlias], InitOptions}.
+
+      {label, Label}.
+      {label, NodeRefs, Label}.
+
+      {multiply_timetraps, N}.
+      {multiply_timetraps, NodeRefs, N}.
+
+      {scale_timetraps, Bool}.
+      {scale_timetraps, NodeRefs, Bool}.
  
       {cover, CoverSpecFile}.
-      {cover, NodeRef, CoverSpecFile}.
+      {cover, NodeRefs, CoverSpecFile}.
       
       {include, IncludeDirs}.
       {include, NodeRefs, IncludeDirs}.
 
       {config, ConfigFiles}.
       {config, NodeRefs, ConfigFiles}.
+
+      {userconfig, {CallbackModule, ConfigStrings}}.
+      {userconfig, NodeRefs, {CallbackModule, ConfigStrings}}.
       
       {alias, DirAlias, Dir}.
+
+      {merge_tests, Bool}.
       
       {logdir, LogDir}.                                        
       {logdir, NodeRefs, LogDir}.
@@ -377,12 +447,21 @@
       {event_handler, NodeRefs, EventHandlers}.
       {event_handler, EventHandlers, InitArgs}.
       {event_handler, NodeRefs, EventHandlers, InitArgs}.
+
+      {ct_hooks, CTHModules}.
+      {ct_hooks, NodeRefs, CTHModules}.
     </pre>
       <p>Test terms:</p>
     <pre>
       {suites, DirRef, Suites}.                                
       {suites, NodeRefs, DirRef, Suites}.
       
+      {groups, DirRef, Suite, Groups}.
+      {groups, NodeRefsDirRef, Suite, Groups}.
+
+      {groups, DirRef, Suite, Group, {cases,Cases}}.
+      {groups, NodeRefsDirRef, Suite, Group, {cases,Cases}}.
+
       {cases, DirRef, Suite, Cases}.                           
       {cases, NodeRefs, DirRef, Suite, Cases}.
 
@@ -395,9 +474,12 @@
       <p>Types:</p>
     <pre>
       NodeAlias     = atom()
+      InitOptions   = term()
       Node          = node()
       NodeRef       = NodeAlias | Node | master
       NodeRefs      = all_nodes | [NodeRef] | NodeRef
+      N             = integer()
+      Bool          = true | false
       CoverSpecFile = string()
       IncludeDirs   = string() | [string()]
       ConfigFiles   = string() | [string()]
@@ -406,8 +488,14 @@
       LogDir        = string()
       EventHandlers = atom() | [atom()]
       InitArgs      = [term()]
+      CTHModules    = [CTHModule | {CTHModule, CTHInitArgs}]
+      CTHModule     = atom()
+      CTHInitArgs   = term()
       DirRef        = DirAlias | Dir
       Suites        = atom() | [atom()] | all
+      Suite         = atom()
+      Groups        = atom() | [atom()] | all
+      Group         = atom()
       Cases         = atom() | [atom()] | all
       Comment       = string() | ""
     </pre>
@@ -449,13 +537,18 @@
       <item>Secondly, the test for system t2 should run. The included suites are
 	t2B and t2C. Included are also test cases test4, test1 and test7 in suite
 	t2A. Note that the test cases will be executed in the specified order.</item>
-      <item>Lastly, all suites for systems t3 are to be completely skipped and this 
+      <item>Lastly, all suites for systems t3 are to be completely skipped and this
 	should be explicitly noted in the log files.</item>
     </list>
+    <p>It is possible to specify initialization options for nodes defined in the
+      test specification. Currently, there are options to start the node and/or to
+      evaluate any function on the node.
+      See the <seealso marker="ct_master_chapter#ct_slave">Automatic startup of
+      the test target nodes</seealso> chapter for details.</p>
     <p>It is possible for the user to provide a test specification that
       includes (for Common Test) unrecognizable terms. If this is desired,
       the <c>-allow_user_terms</c> flag should be used when starting tests with
-      <c>run_test</c>. This forces Common Test to ignore unrecognizable terms.
+      <c>ct_run</c>. This forces Common Test to ignore unrecognizable terms.
       Note that in this mode, Common Test is not able to check the specification 
       for errors as efficiently as if the scanner runs in default mode. 
       If <c>ct:run_test/1</c> is used for starting the tests, the relaxed scanner 
@@ -581,11 +674,11 @@
 	</pre>
 
 	<p>To install the CSS file (Common Test inlines the definition in the 
-	  HTML code), the name may be provided when executing <c>run_test</c>.
+	  HTML code), the name may be provided when executing <c>ct_run</c>.
 	  Example:</p>
 
 	<pre>
-	  $ run_test -dir $TEST/prog -stylesheet $TEST/styles/test_categories.css
+	  $ ct_run -dir $TEST/prog -stylesheet $TEST/styles/test_categories.css
 	</pre>
 
 	  <p>Categories in a CSS file installed with the <c>-stylesheet</c> flag
@@ -658,7 +751,7 @@
        means of time, it is also possible to specify what action Common Test should 
        take upon timeout. Either Common Test performs all tests in the current run before stopping, 
        or it stops as soon as the current test job is finished. Repetition can be activated by
-       means of <c>run_test</c> start flags, or tuples in the <c>ct:run:test/1</c>
+       means of <c>ct_run</c> start flags, or tuples in the <c>ct:run:test/1</c>
        option list argument. The flags (options in parenthesis) are:</p>
        <list>
        <item><c>-repeat N ({repeat,N})</c>, where <c>N</c> is a positive integer.</item>
@@ -694,7 +787,7 @@
 
        <p>Example 1:</p>
        <pre>
-          $ run_test -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -duration 001000 -force_stop</pre>
+          $ ct_run -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -duration 001000 -force_stop</pre>
        <p>Here the suites in test directory to1, followed by the suites in to2, will be executed 
           in one test run. A timeout event will occur after 10 minutes. As long as there is time 
 	  left, Common Test will repeat the test run (i.e. starting over with the to1 test). 
@@ -707,7 +800,7 @@
           $ date
 	  Fri Sep 28 15:00:00 MEST 2007
 
-          $ run_test -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -until 160000</pre>
+          $ ct_run -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -until 160000</pre>
        <p>Here the same test run as in the example above will be executed (and possibly repeated). 
           In this example, however, the timeout will occur after 1 hour and when that happens,
 	  Common Test will finish the entire test run before stopping (i.e. the to1 and to2 test
@@ -715,7 +808,7 @@
        
        <p>Example 3:</p>
        <pre>
-          $ run_test -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -repeat 5</pre>
+          $ ct_run -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -repeat 5</pre>
        <p>Here the test run, including both the to1 and the to2 test, will be repeated 5 times.</p>
 
        <note><p>This feature should not be confused with the <c>repeat</c> property of a test
@@ -734,7 +827,7 @@
 	of the <c>-silent_connections</c> flag:</p>
       
       <pre>
-	run_test -silent_connections [conn_types]
+	ct_run -silent_connections [conn_types]
       </pre>
       
       <p>where <c>conn_types</c> specifies <c>telnet, ftp, rpc</c> and/or <c>snmp</c>.</p>
@@ -742,11 +835,11 @@
       <p>Example:</p>
       
       <pre>
-	run_test ... -silent_connections telnet ftp</pre>
+	ct_run ... -silent_connections telnet ftp</pre>
       <p>switches off logging for telnet and ftp connections.</p>
       
       <pre>
-	run_test ... -silent_connections</pre>
+	ct_run ... -silent_connections</pre>
       <p>switches off logging for all connection types.</p>
       
       
diff --git a/lib/common_test/doc/src/test_structure_chapter.xml b/lib/common_test/doc/src/test_structure_chapter.xml
index c8628b3a7a..b9ca59135d 100644
--- a/lib/common_test/doc/src/test_structure_chapter.xml
+++ b/lib/common_test/doc/src/test_structure_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>Test Structure</title>
@@ -144,10 +144,10 @@
 	be used when the test suite needs to write to files.
       </item>
 
-      <tag><em>run_test</em></tag>
+      <tag><em>ct_run</em></tag>
       <item>
-        The name of an executable Bourne shell script that may be
-	used on Linux/Unix as an interface for specifying and running
+        The name of an executable program that may be
+	used as an interface for specifying and running
 	tests with Common Test. 
       </item>
 
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 212e3d85be..76493d3616 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>Writing Test Suites</title>
@@ -115,6 +115,7 @@
     </p>
   </section>
 
+  <marker id="per_testcase"/>
   <section>
     <title>Init and end per test case</title>
 
@@ -157,6 +158,15 @@
       <c>{skipped,Reason}</c> (where Reason is a user specific term).
     </p>
 
+    <p>The <c>end_per_testcase/2</c> function is called even after a
+      test case terminates due to a call to <c>ct:abort_current_testcase/1</c>,
+      or after a timetrap timeout. However, <c>end_per_testcase</c>
+      will then execute on a different process than the test case
+      function, and in this situation, <c>end_per_testcase</c> will
+      not be able to change the reason for test case termination by
+      returning <c>{fail,Reason}</c>, nor will it be able to save data with
+      <c>{save_config,Data}</c>.</p>
+
     <p>If <c>init_per_testcase</c> crashes, the test case itself is skipped 
     automatically (so called <em>auto skipped</em>). If <c>init_per_testcase</c>
     returns a <c>skip</c> tuple, also then will the test case be skipped (so
@@ -682,12 +692,33 @@
       <c>end_per_suite</c> execute, like test cases, on dedicated Erlang
       processes.
     </p>
+  </section>
 
+  <section>
+    <title>Timetrap timeouts</title>
+    <marker id="timetraps"></marker>
     <p>The default time limit for a test case is 30 minutes, unless a
-      <c>timetrap</c> is specified either by the test case info function
-      or the <c>suite/0</c> function.
-    </p>
-
+      <c>timetrap</c> is specified either by the suite info function
+      or a test case info function. The timetrap timeout value defined
+      in <c>suite/0</c> is the value that will be used for each test case
+      in the suite (as well as for the configuration functions
+      <c>init_per_suite/1</c> and <c>end_per_suite</c>). A timetrap timeout
+      value set with the test case info function will override the value set
+      by <c>suite/0</c>, but only for that particular test case.</p>
+    <p>It is also possible to set/reset a timetrap during test case (or
+      configuration function) execution. This is done by calling
+      <c>ct:timetrap/1</c>. This function will cancel the current timetrap
+      and start a new one.</p>
+    <p>Timetrap values can be extended with a multiplier value specified at
+      startup with the <c>multiply_timetraps</c> option. It is also possible
+      to let Test Server decide to scale up timetrap timeout values
+      automatically, e.g. if tools such as cover or trace are running during
+      the test. This feature is disabled by default and can be enabled with
+      the <c>scale_timetraps</c> start option.</p>
+    <p>If a test case needs to suspend itself for a time that also gets
+      multipled by <c>multiply_timetraps</c>, and possibly scaled up if
+      <c>scale_timetraps</c> is enabled, the function <c>ct:sleep/1</c>
+      may be called.</p>
   </section>
 
   <section>
diff --git a/lib/common_test/priv/Makefile.in b/lib/common_test/priv/Makefile.in
index f144847a29..a6ac0f1a02 100644
--- a/lib/common_test/priv/Makefile.in
+++ b/lib/common_test/priv/Makefile.in
@@ -56,8 +56,9 @@ ifneq ($(findstring win32,$(TARGET)),win32)
 #
 # Files
 #
-FILES = vts.tool run_test.in
-SCRIPTS = install.sh
+FILES = vts.tool
+SCRIPTS = 
+IMAGES = tile1.jpg
 
 #
 # Rules
@@ -83,14 +84,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 ifeq ($(XNIX),true)
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
-	$(INSTALL_SCRIPT) $(SCRIPTS) $(RELSYSDIR)
-	$(INSTALL_DATA) $(FILES) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) $(RELSYSDIR)/priv
+	$(INSTALL_DATA) $(FILES) $(IMAGES) $(RELSYSDIR)/priv
 else
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
-	$(INSTALL_SCRIPT) $(SCRIPTS) $(RELSYSDIR)
-	$(INSTALL_DATA) $(FILES) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) $(RELSYSDIR)/priv
+	$(INSTALL_DATA) $(FILES) $(IMAGES) $(RELSYSDIR)/priv
 endif
 
 release_docs_spec:
@@ -105,6 +104,7 @@ else
 # Files
 #
 FILES = vts.tool 
+IMAGES = tile1.jpg
 
 #
 # Rules
@@ -123,8 +123,8 @@ clean:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
-	$(INSTALL_DATA) $(FILES) $(RELSYSDIR)/priv
+	$(INSTALL_DIR) $(RELSYSDIR)/priv
+	$(INSTALL_DATA) $(FILES) $(IMAGES) $(RELSYSDIR)/priv
 
 release_docs_spec:
 
diff --git a/lib/common_test/priv/tile1.jpg b/lib/common_test/priv/tile1.jpg
new file mode 100644
index 0000000000..8749383716
--- /dev/null
+++ b/lib/common_test/priv/tile1.jpg
diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
index e7e2d1275d..378a7ba08c 100644
--- a/lib/common_test/src/Makefile
+++ b/lib/common_test/src/Makefile
@@ -1,19 +1,19 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2003-2010. 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%
 #
 
@@ -63,7 +63,13 @@ MODULES= \
 	ct_telnet_client \
 	ct_make \
 	vts \
-	unix_telnet
+	unix_telnet \
+	ct_config \
+	ct_config_plain \
+	ct_config_xml \
+	ct_slave \
+        ct_hooks\
+        ct_hooks_lock
 
 TARGET_MODULES= $(MODULES:%=$(EBIN)/%)
 
diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src
index 7b72932ad4..b42173f412 100644
--- a/lib/common_test/src/common_test.app.src
+++ b/lib/common_test/src/common_test.app.src
@@ -1,19 +1,19 @@
 % This is an -*- erlang -*- file.
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2009-2010. 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%
 
 {application, common_test,
@@ -42,10 +42,15 @@
 	     ct_testspec,
 	     ct_util,
 	     unix_telnet,
-	     vts
+	     vts,
+	     ct_config,
+	     ct_config_plain,
+	     ct_config_xml,
+	     ct_slave
 	    ]},
   {registered, [ct_logs,
 		ct_util_server,
+		ct_config_server,
 		ct_make_ref,
 		vts,
 		ct_master,
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 8ae041e5b4..b0a92dcc15 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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%
 %%
 
@@ -59,18 +59,22 @@
 %% Test suite API
 -export([require/1, require/2,
 	 get_config/1, get_config/2, get_config/3,
+	 reload_config/1,
 	 log/1, log/2, log/3,
 	 print/1, print/2, print/3,
 	 pal/1, pal/2, pal/3,
 	 fail/1, comment/1,
-	 testcases/2, userdata/2, userdata/3]).
+	 testcases/2, userdata/2, userdata/3,
+	 timetrap/1, sleep/1]).
+
+%% New API for manipulating with config handlers
+-export([add_config/2, remove_config/2]).
 
 %% Other interface functions
 -export([get_status/0, abort_current_testcase/1,
 	 encrypt_config_file/2, encrypt_config_file/3,
 	 decrypt_config_file/2, decrypt_config_file/3]).
 
-
 -export([get_target_name/1]).
 -export([parse_table/1, listenv/1]).
 
@@ -93,7 +97,7 @@
 %%% <code>install([{config,["config_node.ctc","config_user.ctc"]}])</code>.</p>
 %%%
 %%% <p>Note that this function is automatically run by the
-%%% <code>run_test</code> script.</p>
+%%% <code>ct_run</code> program.</p>
 install(Opts) ->
     ct_run:install(Opts).
 
@@ -134,22 +138,31 @@ run(TestDirs) ->
 %%%-----------------------------------------------------------------
 %%% @spec run_test(Opts) -> Result
 %%%   Opts = [OptTuples]
-%%%   OptTuples = {config,CfgFiles} | {dir,TestDirs} | {suite,Suites} |
-%%%               {testcase,Cases} | {group,Groups} | {spec,TestSpecs} | 
-%%%               {allow_user_terms,Bool} | {logdir,LogDir} | 
-%%%               {silent_connections,Conns} | {cover,CoverSpecFile} | 
-%%%               {step,StepOpts} | {event_handler,EventHandlers} | {include,InclDirs} | 
-%%%               {auto_compile,Bool} | {repeat,N} | {duration,DurTime} | 
-%%%               {until,StopTime} | {force_stop,Bool} | {decrypt,DecryptKeyOrFile} |
-%%%               {refresh_logs,LogDir} | {basic_html,Bool}
-%%%   CfgFiles = [string()] | string()
+%%%   OptTuples = {dir,TestDirs} | {suite,Suites} | {group,Groups} |
+%%%               {testcase,Cases} | {spec,TestSpecs} | {label,Label} |
+%%%               {config,CfgFiles} | {userconfig, UserConfig} |
+%%%               {allow_user_terms,Bool} | {logdir,LogDir} |
+%%%               {silent_connections,Conns} | {stylesheet,CSSFile} |
+%%%               {cover,CoverSpecFile} | {step,StepOpts} |
+%%%               {event_handler,EventHandlers} | {include,InclDirs} |
+%%%               {auto_compile,Bool} | {multiply_timetraps,M} | {scale_timetraps,Bool} |
+%%%               {repeat,N} | {duration,DurTime} | {until,StopTime} |
+%%%               {force_stop,Bool} | {decrypt,DecryptKeyOrFile} |
+%%%               {refresh_logs,LogDir} | {basic_html,Bool} | 
+%%%               {ct_hooks, CTHs}
 %%%   TestDirs = [string()] | string()
 %%%   Suites = [string()] | string()
 %%%   Cases = [atom()] | atom()
 %%%   Groups = [atom()] | atom()
 %%%   TestSpecs = [string()] | string()
+%%%   Label = string() | atom()
+%%%   CfgFiles = [string()] | string()
+%%%   UserConfig = [{CallbackMod,CfgStrings}] | {CallbackMod,CfgStrings}
+%%%   CallbackMod = atom()
+%%%   CfgStrings = [string()] | string()
 %%%   LogDir = string()
 %%%   Conns = all | [atom()]
+%%%   CSSFile = string()
 %%%   CoverSpecFile = string()
 %%%   StepOpts = [StepOpt] | []
 %%%   StepOpt = config | keep_inactive
@@ -157,19 +170,24 @@ run(TestDirs) ->
 %%%   EH = atom() | {atom(),InitArgs} | {[atom()],InitArgs}
 %%%   InitArgs = [term()]
 %%%   InclDirs = [string()] | string()
+%%%   M = integer()
 %%%   N = integer()
 %%%   DurTime = string(HHMMSS)
 %%%   StopTime = string(YYMoMoDDHHMMSS) | string(HHMMSS)
 %%%   DecryptKeyOrFile = {key,DecryptKey} | {file,DecryptFile}
 %%%   DecryptKey = string()
 %%%   DecryptFile = string()
+%%%   CTHs = [CTHModule | {CTHModule, CTHInitArgs}]
+%%%   CTHModule = atom()
+%%%   CTHInitArgs = term()
 %%%   Result = [TestResult] | {error,Reason}
 %%% @doc Run tests as specified by the combination of options in <code>Opts</code>.
-%%% The options are the same as those used with the <code>run_test</code> script.
+%%% The options are the same as those used with the
+%%% <seealso marker="ct_run#ct_run"><code>ct_run</code></seealso> program.
 %%% Note that here a <code>TestDir</code> can be used to point out the path to 
 %%% a <code>Suite</code>. Note also that the option <code>testcase</code>
-%%% corresponds to the <code>-case</code> option in the <code>run_test</code> 
-%%% script. Configuration files specified in <code>Opts</code> will be 
+%%% corresponds to the <code>-case</code> option in the <code>ct_run</code> 
+%%% program. Configuration files specified in <code>Opts</code> will be
 %%% installed automatically at startup.
 run_test(Opts) ->
     ct_run:run_test(Opts).
@@ -211,7 +229,7 @@ step(TestDir,Suite,Case,Opts) ->
 %%%
 %%% <p>From this mode all test case support functions can be executed
 %%% directly from the erlang shell. The interactive mode can also be
-%%% started from the unix command line with <code>run_test -shell
+%%% started from the OS command line with <code>ct_run -shell
 %%% [-config File...]</code>.</p>
 %%%
 %%% <p>If any functions using "required config data" (e.g. telnet or
@@ -269,7 +287,7 @@ stop_interactive() ->
 %%% @see get_config/2
 %%% @see get_config/3
 require(Required) ->
-    ct_util:require(Required).
+    ct_config:require(Required).
 
 %%%-----------------------------------------------------------------
 %%% @spec require(Name,Required) -> ok | {error,Reason}
@@ -304,19 +322,19 @@ require(Required) ->
 %%% @see get_config/2
 %%% @see get_config/3
 require(Name,Required) ->
-    ct_util:require(Name,Required).
+    ct_config:require(Name,Required).
 
 %%%-----------------------------------------------------------------
 %%% @spec get_config(Required) -> Value
 %%% @equiv get_config(Required,undefined,[])
 get_config(Required) ->
-    ct_util:get_config(Required,undefined,[]).
+    ct_config:get_config(Required,undefined,[]).
 
 %%%-----------------------------------------------------------------
 %%% @spec get_config(Required,Default) -> Value
 %%% @equiv get_config(Required,Default,[])
 get_config(Required,Default) ->
-    ct_util:get_config(Required,Default,[]).
+    ct_config:get_config(Required,Default,[]).
 
 %%%-----------------------------------------------------------------
 %%% @spec get_config(Required,Default,Opts) -> ValueOrElement
@@ -375,7 +393,26 @@ get_config(Required,Default) ->
 %%% @see require/1
 %%% @see require/2
 get_config(Required,Default,Opts) ->
-    ct_util:get_config(Required,Default,Opts).
+    ct_config:get_config(Required,Default,Opts).
+
+%%%-----------------------------------------------------------------
+%%% @spec reload_config(Required) -> ValueOrElement
+%%%      Required = KeyOrName | {KeyOrName,SubKey}
+%%%      KeyOrName = atom()
+%%%      SubKey = atom()
+%%%      ValueOrElement = term()
+%%%
+%%% @doc Reload config file which contains specified configuration key.
+%%%
+%%% <p>This function performs updating of the configuration data from which the
+%%% given configuration variable was read, and returns the (possibly) new
+%%% value of this variable.</p>
+%%% <p>Note that if some variables were present in the configuration but are not loaded
+%%% using this function, they will be removed from the configuration table together
+%%% with their aliases.</p>
+%%%
+reload_config(Required)->
+    ct_config:reload_config(Required).
 
 %%%-----------------------------------------------------------------
 %%% @spec log(Format) -> ok
@@ -661,7 +698,7 @@ userdata(TestDir, Suite, Case) ->
 
 
 %%%-----------------------------------------------------------------
-%%% @spec get_status() -> TestStatus | {error,Reason}
+%%% @spec get_status() -> TestStatus | {error,Reason} | no_tests_running
 %%%       TestStatus = [StatusElem]
 %%%       StatusElem = {current,{Suite,TestCase}} | {successful,Successful} |
 %%%                    {failed,Failed} | {skipped,Skipped} | {total,Total}
@@ -734,7 +771,7 @@ abort_current_testcase(Reason) ->
 %%%      <p>See the <code>crypto</code> application for details on DES3
 %%%      encryption/decryption.</p>
 encrypt_config_file(SrcFileName, EncryptFileName) ->
-    ct_util:encrypt_config_file(SrcFileName, EncryptFileName).
+    ct_config:encrypt_config_file(SrcFileName, EncryptFileName).
 
 %%%-----------------------------------------------------------------
 %%% @spec encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile) -> 
@@ -754,7 +791,7 @@ encrypt_config_file(SrcFileName, EncryptFileName) ->
 %%%      <p>See the <code>crypto</code> application for details on DES3
 %%%      encryption/decryption.</p>
 encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile) ->
-    ct_util:encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile).
+    ct_config:encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile).
 
 %%%-----------------------------------------------------------------
 %%% @spec decrypt_config_file(EncryptFileName, TargetFileName) -> 
@@ -770,7 +807,7 @@ encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile) ->
 %%%      <code>.ct_config.crypt</code> in the current directory, or the
 %%%      home directory of the user (it is searched for in that order).</p>
 decrypt_config_file(EncryptFileName, TargetFileName) ->
-    ct_util:decrypt_config_file(EncryptFileName, TargetFileName).
+    ct_config:decrypt_config_file(EncryptFileName, TargetFileName).
 
 %%%-----------------------------------------------------------------
 %%% @spec decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile) -> 
@@ -785,5 +822,65 @@ decrypt_config_file(EncryptFileName, TargetFileName) ->
 %%%      file contents is saved in the target file. The key must have the
 %%%      the same value as that used for encryption.</p>
 decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile) ->
-    ct_util:decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile).
+    ct_config:decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile).
+
+
+%%%-----------------------------------------------------------------
+%%% @spec add_config(Callback, Config) -> ok | {error, Reason}
+%%%       Callback = atom()
+%%%       Config = string()
+%%%       Reason = term()
+%%%
+%%% @doc <p>This function loads configuration variables using the
+%%% 	 given callback module and configuration string. Callback module
+%%%	 should be either loaded or present in the code part. Loaded
+%%%	 configuration variables can later be removed using
+%%%	 <code>remove_config/2</code> function.</p>
+add_config(Callback, Config)->
+    ct_config:add_config(Callback, Config).
 
+%%%-----------------------------------------------------------------
+%%% @spec remove_config(Callback, Config) -> ok
+%%%       Callback = atom()
+%%%       Config = string()
+%%%       Reason = term()
+%%%
+%%% @doc <p>This function removes configuration variables (together with
+%%%	 their aliases) which were loaded with specified callback module and
+%%%	 configuration string.</p>
+remove_config(Callback, Config) ->
+    ct_config:remove_config(Callback, Config).
+
+%%%-----------------------------------------------------------------
+%%% @spec timetrap(Time) -> ok
+%%%       Time = {hours,Hours} | {minutes,Mins} | {seconds,Secs} | Millisecs | infinity
+%%%       Hours = integer()
+%%%       Mins = integer()
+%%%       Secs = integer()
+%%%       Millisecs = integer() | float()
+%%%
+%%% @doc <p>Use this function to set a new timetrap for the running test case.</p>
+timetrap(Time) ->
+    test_server:timetrap(Time).
+
+%%%-----------------------------------------------------------------
+%%% @spec sleep(Time) -> ok
+%%%       Time = {hours,Hours} | {minutes,Mins} | {seconds,Secs} | Millisecs | infinity
+%%%       Hours = integer()
+%%%       Mins = integer()
+%%%       Secs = integer()
+%%%       Millisecs = integer() | float()
+%%%
+%%% @doc <p>This function, similar to <c>timer:sleep/1</c>, suspends the test
+%%%      case for specified time. However, this function also multiplies
+%%%      <c>Time</c> with the 'multiply_timetraps' value (if set) and under
+%%%      certain circumstances also scales up the time automatically
+%%%      if 'scale_timetraps' is set to true (default is false).</p>
+sleep({hours,Hs}) ->
+    sleep(trunc(Hs * 1000 * 60 * 60));
+sleep({minutes,Ms}) ->
+    sleep(trunc(Ms * 1000 * 60));
+sleep({seconds,Ss}) ->
+    sleep(trunc(Ss * 1000));
+sleep(Time) ->
+    test_server:adjusted_sleep(Time).
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
new file mode 100644
index 0000000000..6b75937668
--- /dev/null
+++ b/lib/common_test/src/ct_config.erl
@@ -0,0 +1,804 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%----------------------------------------------------------------------
+%% File    : ct_config.erl
+%% Description : CT module for reading and manipulating of configuration
+%%		 data
+%%
+%% Created : 15 February 2010
+%%----------------------------------------------------------------------
+-module(ct_config).
+
+-export([start/1, stop/0]).
+
+-export([read_config_files/1,
+	get_config_file_list/1]).
+
+-export([require/1, require/2]).
+
+-export([get_config/1, get_config/2, get_config/3,
+	get_all_config/0]).
+
+-export([set_default_config/2, set_default_config/3]).
+
+-export([delete_default_config/1]).
+
+-export([reload_config/1, update_config/2]).
+
+-export([release_allocated/0]).
+
+-export([encrypt_config_file/2, encrypt_config_file/3,
+	 decrypt_config_file/2, decrypt_config_file/3,
+	 get_crypt_key_from_file/0, get_crypt_key_from_file/1]).
+
+-export([get_ref_from_name/1, get_name_from_ref/1, get_key_from_name/1]).
+
+-export([check_config_files/1, add_default_callback/1, prepare_config_list/1]).
+
+-export([add_config/2, remove_config/2]).
+
+-include("ct_util.hrl").
+
+-define(cryptfile, ".ct_config.crypt").
+
+-record(ct_conf,{key,value,handler,config,ref,name='_UNDEF',default=false}).
+
+start(Mode) ->
+    case whereis(ct_config_server) of
+	undefined ->
+	    Me = self(),
+	    Pid = spawn_link(fun() -> do_start(Me) end),
+	    receive
+		{Pid,started} -> Pid;
+		{Pid,Error} -> exit(Error)
+	    end;
+	Pid ->
+	    case ct_util:get_mode() of
+		interactive when Mode==interactive ->
+		    Pid;
+		interactive ->
+		    {error,interactive_mode};
+		_OtherMode ->
+		    Pid
+	    end
+    end.
+
+do_start(Parent) ->
+    process_flag(trap_exit,true),
+    register(ct_config_server,self()),
+    ct_util:create_table(?attr_table,bag,#ct_conf.key),
+    {ok,StartDir} = file:get_cwd(),
+    Opts = case ct_util:read_opts() of
+	       {ok,Opts1} ->
+		   Opts1;
+	       Error ->
+		   Parent ! {self(),Error},
+		   exit(Error)
+	   end,
+    case read_config_files(Opts) of
+	ok ->
+	    Parent ! {self(),started},
+	    loop(StartDir);
+	ReadError ->
+	    Parent ! {self(),ReadError},
+	    exit(ReadError)
+    end.
+
+stop() ->
+    case whereis(ct_config_server) of
+	undefined -> ok;
+	_ -> call({stop})
+    end.
+
+call(Msg) ->
+    MRef = erlang:monitor(process, whereis(ct_config_server)),
+    Ref = make_ref(),
+    ct_config_server ! {Msg,{self(),Ref}},
+    receive
+	{Ref, Result} ->
+	    erlang:demonitor(MRef, [flush]),
+	    Result;
+	{'DOWN',MRef,process,_,Reason} ->
+	    {error,{ct_util_server_down,Reason}}
+    end.
+
+return({To,Ref},Result) ->
+    To ! {Ref, Result}.
+
+loop(StartDir) ->
+    receive
+	{{require,Name,Tag,SubTags},From} ->
+	    Result = do_require(Name,Tag,SubTags),
+	    return(From,Result),
+	    loop(StartDir);
+	{{set_default_config,{Config,Scope}},From} ->
+	    set_config(Config,{true,Scope}),
+	    return(From,ok),
+	    loop(StartDir);
+	{{set_default_config,{Name,Config,Scope}},From} ->
+	    set_config(Name,Config,{true,Scope}),
+	    return(From,ok),
+	    loop(StartDir);
+	{{delete_default_config,Scope},From} ->
+	    delete_config({true,Scope}),
+	    return(From,ok),
+	    loop(StartDir);
+	{{update_config,{Name,NewConfig}},From} ->
+	    update_conf(Name,NewConfig),
+	    return(From,ok),
+	    loop(StartDir);
+	{{reload_config, KeyOrName},From}->
+	    NewValue = reload_conf(KeyOrName),
+	    return(From, NewValue),
+	    loop(StartDir);
+	{{stop},From} ->
+	    ets:delete(?attr_table),
+	    file:set_cwd(StartDir),
+	    return(From,ok)
+    end.
+
+set_default_config(NewConfig, Scope) ->
+    call({set_default_config, {NewConfig, Scope}}).
+
+set_default_config(Name, NewConfig, Scope) ->
+    call({set_default_config, {Name, NewConfig, Scope}}).
+
+delete_default_config(Scope) ->
+    call({delete_default_config, Scope}).
+
+update_config(Name, Config) ->
+    call({update_config, {Name, Config}}).
+
+reload_config(KeyOrName) ->
+    call({reload_config, KeyOrName}).
+
+process_default_configs(Opts) ->
+    case lists:keysearch(config, 1, Opts) of
+	{value,{_,Files=[File|_]}} when is_list(File) ->
+	    Files;
+	{value,{_,File=[C|_]}} when is_integer(C) ->
+	    [File];
+	{value,{_,[]}} ->
+	    [];
+	false ->
+	    []
+    end.
+
+process_user_configs(Opts, Acc) ->
+    case lists:keytake(userconfig, 1, Opts) of
+	false ->
+	    lists:reverse(Acc);
+	{value, {userconfig, Config=[{_,_}|_]}, NewOpts} ->
+	    Acc1 = lists:map(fun({_Callback, []}=Cfg) ->
+				     Cfg;
+				({Callback, Files=[File|_]}) when is_list(File) ->
+				     {Callback, Files};
+				({Callback, File=[C|_]}) when is_integer(C) ->
+				     {Callback, [File]}
+			     end, Config),
+	    process_user_configs(NewOpts, lists:reverse(Acc1)++Acc);
+	{value, {userconfig, {Callback, []}}, NewOpts} ->
+	    process_user_configs(NewOpts, [{Callback, []} | Acc]);
+	{value, {userconfig, {Callback, Files=[File|_]}}, NewOpts} when is_list(File) ->
+		process_user_configs(NewOpts, [{Callback, Files} | Acc]);
+	{value, {userconfig, {Callback, File=[C|_]}}, NewOpts} when is_integer(C) ->
+		process_user_configs(NewOpts, [{Callback, [File]} | Acc])
+    end.
+
+get_config_file_list(Opts) ->
+    DefaultConfigs = process_default_configs(Opts),
+    CfgFiles =
+	if
+	    DefaultConfigs == []->
+		[];
+	    true->
+		[{?ct_config_txt, DefaultConfigs}]
+	end ++
+	process_user_configs(Opts, []),
+    CfgFiles.
+
+add_default_callback(Opts) ->
+    case lists:keytake(config, 1, Opts) of
+	{value, {config, [File | _] = Files}, NoConfigOpts}
+	  when is_integer(File) =/= true ->
+	    [{config, lists:flatmap(fun add_def_cb/1, Files)} | NoConfigOpts];
+	{value, {config, File}, NoConfigOpts} ->
+	    [{config, add_def_cb(File)} | NoConfigOpts];
+	false ->
+	    Opts
+    end.
+
+add_def_cb([]) ->
+    [];
+add_def_cb(Config) when is_tuple(Config) ->
+    [Config];
+add_def_cb([H|_T] = Config ) when is_integer(H) ->
+    [{?ct_config_txt, [Config]}].
+
+read_config_files(Opts) ->
+    AddCallback = fun(CallBack, []) ->
+			[{CallBack, []}];
+		     (CallBack, [F|_]=Files) when is_integer(F) ->
+			[{CallBack, Files}];
+		     (CallBack, [F|_]=Files) when is_list(F) ->
+			lists:map(fun(X) -> {CallBack, X} end, Files)
+		  end,
+
+    ConfigFiles = case lists:keyfind(config, 1, Opts) of
+		      {config,ConfigLists}->
+                          lists:foldr(fun({Callback,Files}, Acc) ->
+					      AddCallback(Callback,Files)
+						  ++ Acc
+				      end,[],ConfigLists);
+		      false->
+			  []
+		  end,
+    read_config_files_int(ConfigFiles, fun store_config/3).
+
+read_config_files_int([{Callback, File}|Files], FunToSave) ->
+    case Callback:read_config(File) of
+	{ok, Config} ->
+	    FunToSave(Config, Callback, File),
+	    read_config_files_int(Files, FunToSave);
+	{error, ErrorName, ErrorDetail}->
+	    {user_error, {ErrorName, File, ErrorDetail}}
+    end;
+read_config_files_int([], _FunToSave) ->
+    ok.
+
+store_config(Config, Callback, File) ->
+    [ets:insert(?attr_table,
+		#ct_conf{key=Key,
+			 value=Val,
+			 handler=Callback,
+			 config=File,
+			 ref=ct_util:ct_make_ref(),
+			 default=false}) ||
+	{Key,Val} <- Config].
+
+keyfindall(Key, Pos, List) ->
+    [E || E <- List, element(Pos, E) =:= Key].
+
+rewrite_config(Config, Callback, File) ->
+    OldRows = ets:match_object(?attr_table,
+				#ct_conf{handler=Callback,
+					 config=File,_='_'}),
+    ets:match_delete(?attr_table,
+		     #ct_conf{handler=Callback,
+			      config=File,_='_'}),
+    Updater = fun({Key, Value}) ->
+	case keyfindall(Key, #ct_conf.key, OldRows) of
+	    []->
+		ets:insert(?attr_table,
+			   #ct_conf{key=Key,
+				    value=Value,
+				    handler=Callback,
+				    config=File,
+				    ref=ct_util:ct_make_ref()});
+	    RowsToUpdate ->
+		Inserter = fun(Row) ->
+				   ets:insert(?attr_table,
+					      Row#ct_conf{value=Value,
+							  ref=ct_util:ct_make_ref()})
+			   end,
+		lists:foreach(Inserter, RowsToUpdate)
+	end
+	      end,
+    [Updater({Key, Value})||{Key, Value}<-Config].
+
+set_config(Config,Default) ->
+    set_config('_UNDEF',Config,Default).
+
+set_config(Name,Config,Default) ->
+    [ets:insert(?attr_table,
+		#ct_conf{key=Key,value=Val,ref=ct_util:ct_make_ref(),
+			 name=Name,default=Default}) ||
+	{Key,Val} <- Config].
+
+get_config(KeyOrName) ->
+    get_config(KeyOrName,undefined,[]).
+
+get_config(KeyOrName,Default) ->
+    get_config(KeyOrName,Default,[]).
+
+get_config(KeyOrName,Default,Opts) when is_atom(KeyOrName) ->
+    case lookup_config(KeyOrName) of
+	[] ->
+	    Default;
+	[{_Ref,Val}|_] = Vals ->
+	    case {lists:member(all,Opts),lists:member(element,Opts)} of
+		{true,true} ->
+		    [{KeyOrName,V} || {_R,V} <- lists:sort(Vals)];
+		{true,false} ->
+		    [V || {_R,V} <- lists:sort(Vals)];
+		{false,true} ->
+		    {KeyOrName,Val};
+		{false,false} ->
+		    Val
+	    end
+    end;
+
+get_config({KeyOrName,SubKey},Default,Opts) ->
+    case lookup_config(KeyOrName) of
+	[] ->
+	    Default;
+	Vals ->
+	    Vals1 = case [Val || {_Ref,Val} <- lists:sort(Vals)] of
+			Result=[L|_] when is_list(L) ->
+			    case L of
+				[{_,_}|_] ->
+				    Result;
+				_ ->
+				    []
+			    end;
+			_ ->
+			    []
+		    end,
+	    case get_subconfig([SubKey],Vals1,[],Opts) of
+		{ok,[{_,SubVal}|_]=SubVals} ->
+		    case {lists:member(all,Opts),lists:member(element,Opts)} of
+			{true,true} ->
+			    [{{KeyOrName,SubKey},Val} || {_,Val} <- SubVals];
+			{true,false} ->
+			    [Val || {_SubKey,Val} <- SubVals];
+			{false,true} ->
+			    {{KeyOrName,SubKey},SubVal};
+			{false,false} ->
+			    SubVal
+		    end;
+		_ ->
+		    Default
+	    end
+    end.
+
+get_subconfig(SubKeys,Values) ->
+    get_subconfig(SubKeys,Values,[],[]).
+
+get_subconfig(SubKeys,[Value|Rest],Mapped,Opts) ->
+    case do_get_config(SubKeys,Value,[]) of
+	{ok,SubMapped} ->
+	    case lists:member(all,Opts) of
+		true ->
+		    get_subconfig(SubKeys,Rest,Mapped++SubMapped,Opts);
+		false ->
+		    {ok,SubMapped}
+	    end;
+	_Error ->
+	    get_subconfig(SubKeys,Rest,Mapped,Opts)
+    end;
+get_subconfig(SubKeys,[],[],_) ->
+    {error,{not_available,SubKeys}};
+get_subconfig(_SubKeys,[],Mapped,_) ->
+    {ok,Mapped}.
+
+do_get_config([Key|Required],Available,Mapped) ->
+    case lists:keysearch(Key,1,Available) of
+	{value,{Key,Value}} ->
+	    NewAvailable = lists:keydelete(Key,1,Available),
+	    NewMapped = [{Key,Value}|Mapped],
+	    do_get_config(Required,NewAvailable,NewMapped);
+	false ->
+	    {error,{not_available,Key}}
+    end;
+do_get_config([],_Available,Mapped) ->
+    {ok,lists:reverse(Mapped)}.
+
+get_all_config() ->
+    ets:select(?attr_table,[{#ct_conf{name='$1',key='$2',value='$3',
+				      default='$4',_='_'},
+			     [],
+			     [{{'$1','$2','$3','$4'}}]}]).
+
+lookup_config(KeyOrName) ->
+    case lookup_name(KeyOrName) of
+	[] ->
+	    lookup_key(KeyOrName);
+	Values ->
+	    Values
+    end.
+
+lookup_name(Name) ->
+    ets:select(?attr_table,[{#ct_conf{ref='$1',value='$2',name=Name,_='_'},
+			     [],
+			     [{{'$1','$2'}}]}]).
+lookup_key(Key) ->
+    ets:select(?attr_table,[{#ct_conf{key=Key,ref='$1',value='$2',name='_UNDEF',_='_'},
+			     [],
+			     [{{'$1','$2'}}]}]).
+
+lookup_handler_for_config({Key, _Subkey}) ->
+    lookup_handler_for_config(Key);
+lookup_handler_for_config(KeyOrName) ->
+    case lookup_handler_for_name(KeyOrName) of
+	[] ->
+	    lookup_handler_for_key(KeyOrName);
+	Values ->
+	    Values
+    end.
+
+lookup_handler_for_name(Name) ->
+    ets:select(?attr_table,[{#ct_conf{handler='$1',config='$2',name=Name,_='_'},
+			     [],
+			     [{{'$1','$2'}}]}]).
+
+lookup_handler_for_key(Key) ->
+    ets:select(?attr_table,[{#ct_conf{handler='$1',config='$2',key=Key,_='_'},
+			     [],
+			     [{{'$1','$2'}}]}]).
+
+
+update_conf(Name, NewConfig) ->
+    Old = ets:select(?attr_table,[{#ct_conf{name=Name,_='_'},[],['$_']}]),
+    lists:foreach(fun(OldElem) ->
+			  NewElem = OldElem#ct_conf{value=NewConfig},
+			  ets:delete_object(?attr_table, OldElem),
+			  ets:insert(?attr_table, NewElem)
+		  end, Old),
+    ok.
+
+reload_conf(KeyOrName) ->
+    case lookup_handler_for_config(KeyOrName) of
+	[]->
+	    undefined;
+	HandlerList->
+	    HandlerList2 = lists:usort(HandlerList),
+	    read_config_files_int(HandlerList2, fun rewrite_config/3),
+	    get_config(KeyOrName)
+    end.
+
+release_allocated() ->
+    Allocated = ets:select(?attr_table,[{#ct_conf{name='$1',_='_'},
+					 [{'=/=','$1','_UNDEF'}],
+					 ['$_']}]),
+    release_allocated(Allocated).
+release_allocated([H|T]) ->
+    ets:delete_object(?attr_table,H),
+    ets:insert(?attr_table,H#ct_conf{name='_UNDEF'}),
+    release_allocated(T);
+release_allocated([]) ->
+    ok.
+
+allocate(Name,Key,SubKeys) ->
+    case ets:match_object(?attr_table,#ct_conf{key=Key,name='_UNDEF',_='_'}) of
+	[] ->
+	    {error,{not_available,Key}};
+	Available ->
+	    case allocate_subconfig(Name,SubKeys,Available,false) of
+		ok ->
+		    ok;
+		Error ->
+		    Error
+	    end
+    end.
+
+allocate_subconfig(Name,SubKeys,[C=#ct_conf{value=Value}|Rest],Found) ->
+    case do_get_config(SubKeys,Value,[]) of
+	{ok,_SubMapped} ->
+	    ets:insert(?attr_table,C#ct_conf{name=Name}),
+	    allocate_subconfig(Name,SubKeys,Rest,true);
+	_Error ->
+	    allocate_subconfig(Name,SubKeys,Rest,Found)
+    end;
+allocate_subconfig(_Name,_SubKeys,[],true) ->
+    ok;
+allocate_subconfig(_Name,SubKeys,[],false) ->
+    {error,{not_available,SubKeys}}.
+
+delete_config(Default) ->
+    ets:match_delete(?attr_table,#ct_conf{default=Default,_='_'}),
+    ok.
+
+require(Key) when is_atom(Key) ->
+    require({Key,[]});
+require({Key,SubKeys}) when is_atom(Key) ->
+    allocate('_UNDEF',Key,to_list(SubKeys));
+require(Key) ->
+    {error,{invalid,Key}}.
+
+require(Name,Key) when is_atom(Key) ->
+    require(Name,{Key,[]});
+require(Name,{Key,SubKeys}) when is_atom(Name), is_atom(Key) ->
+    call({require,Name,Key,to_list(SubKeys)});
+require(Name,Keys) ->
+    {error,{invalid,{Name,Keys}}}.
+
+to_list(X) when is_list(X) -> X;
+to_list(X) -> [X].
+
+do_require(Name,Key,SubKeys) when is_list(SubKeys) ->
+    case get_key_from_name(Name) of
+	{error,_} ->
+	    allocate(Name,Key,SubKeys);
+	{ok,Key} ->
+	    %% already allocated - check that it has all required subkeys
+	    Vals = [Val || {_Ref,Val} <- lookup_name(Name)],
+	    case get_subconfig(SubKeys,Vals) of
+		{ok,_SubMapped} ->
+		    ok;
+		Error ->
+		    Error
+	    end;
+	{ok,OtherKey} ->
+	    {error,{name_in_use,Name,OtherKey}}
+    end.
+
+encrypt_config_file(SrcFileName, EncryptFileName) ->
+    case get_crypt_key_from_file() of
+	{error,_} = E ->
+	    E;
+	Key ->
+	    encrypt_config_file(SrcFileName, EncryptFileName, {key,Key})
+    end.
+
+get_ref_from_name(Name) ->
+    case ets:select(?attr_table,[{#ct_conf{name=Name,ref='$1',_='_'},
+				  [],
+				  ['$1']}]) of
+	[Ref] ->
+	    {ok,Ref};
+	_ ->
+	    {error,{no_such_name,Name}}
+    end.
+
+get_name_from_ref(Ref) ->
+    case ets:select(?attr_table,[{#ct_conf{name='$1',ref=Ref,_='_'},
+				  [],
+				  ['$1']}]) of
+	[Name] ->
+	    {ok,Name};
+	_ ->
+	    {error,{no_such_ref,Ref}}
+    end.
+
+get_key_from_name(Name) ->
+    case ets:select(?attr_table,[{#ct_conf{name=Name,key='$1',_='_'},
+				  [],
+				  ['$1']}]) of
+	[Key|_] ->
+	    {ok,Key};
+	_ ->
+	    {error,{no_such_name,Name}}
+    end.
+
+encrypt_config_file(SrcFileName, EncryptFileName, {file,KeyFile}) ->
+    case get_crypt_key_from_file(KeyFile) of
+	{error,_} = E ->
+	    E;
+	Key ->
+	    encrypt_config_file(SrcFileName, EncryptFileName, {key,Key})
+    end;
+
+encrypt_config_file(SrcFileName, EncryptFileName, {key,Key}) ->
+    crypto:start(),
+    {K1,K2,K3,IVec} = make_crypto_key(Key),
+    case file:read_file(SrcFileName) of
+	{ok,Bin0} ->
+	    Bin1 = term_to_binary({SrcFileName,Bin0}),
+	    Bin2 = case byte_size(Bin1) rem 8 of
+		       0 -> Bin1;
+		       N -> list_to_binary([Bin1,random_bytes(8-N)])
+		   end,
+	    EncBin = crypto:des3_cbc_encrypt(K1, K2, K3, IVec, Bin2),
+	    case file:write_file(EncryptFileName, EncBin) of
+		ok ->
+		    io:format("~s --(encrypt)--> ~s~n",
+			      [SrcFileName,EncryptFileName]),
+		    ok;
+		{error,Reason} ->
+		    {error,{Reason,EncryptFileName}}
+	    end;
+	{error,Reason} ->
+	    {error,{Reason,SrcFileName}}
+    end.
+
+decrypt_config_file(EncryptFileName, TargetFileName) ->
+    case get_crypt_key_from_file() of
+	{error,_} = E ->
+	    E;
+	Key ->
+	    decrypt_config_file(EncryptFileName, TargetFileName, {key,Key})
+    end.
+
+decrypt_config_file(EncryptFileName, TargetFileName, {file,KeyFile}) ->
+    case get_crypt_key_from_file(KeyFile) of
+	{error,_} = E ->
+	    E;
+	Key ->
+	    decrypt_config_file(EncryptFileName, TargetFileName, {key,Key})
+    end;
+
+decrypt_config_file(EncryptFileName, TargetFileName, {key,Key}) ->
+    crypto:start(),
+    {K1,K2,K3,IVec} = make_crypto_key(Key),
+    case file:read_file(EncryptFileName) of
+	{ok,Bin} ->
+	    DecBin = crypto:des3_cbc_decrypt(K1, K2, K3, IVec, Bin),
+	    case catch binary_to_term(DecBin) of
+		{'EXIT',_} ->
+		    {error,bad_file};
+		{_SrcFile,SrcBin} ->
+		    case TargetFileName of
+			undefined ->
+			    {ok,SrcBin};
+			_ ->
+			    case file:write_file(TargetFileName, SrcBin) of
+				ok ->
+				    io:format("~s --(decrypt)--> ~s~n",
+					      [EncryptFileName,TargetFileName]),
+				    ok;
+				{error,Reason} ->
+				    {error,{Reason,TargetFileName}}
+			    end
+		    end
+	    end;
+	{error,Reason} ->
+	    {error,{Reason,EncryptFileName}}
+    end.
+
+get_crypt_key_from_file(File) ->
+    case file:read_file(File) of
+	{ok,Bin} ->
+	    case catch string:tokens(binary_to_list(Bin), [$\n,$\r]) of
+		[Key] ->
+		    Key;
+		_ ->
+		    {error,{bad_crypt_file,File}}
+	    end;
+	{error,Reason} ->
+	    {error,{Reason,File}}
+    end.
+
+get_crypt_key_from_file() ->
+    CwdFile = filename:join(".",?cryptfile),
+    {Result,FullName} =
+	case file:read_file(CwdFile) of
+	    {ok,Bin} ->
+		{Bin,CwdFile};
+	    _ ->
+		case init:get_argument(home) of
+		    {ok,[[Home]]} ->
+			HomeFile = filename:join(Home,?cryptfile),
+			case file:read_file(HomeFile) of
+			    {ok,Bin} ->
+				{Bin,HomeFile};
+			    _ ->
+				{{error,no_crypt_file},noent}
+			end;
+		    _ ->
+			{{error,no_crypt_file},noent}
+		end
+	end,
+    case FullName of
+	noent ->
+	    Result;
+	_ ->
+	    case catch string:tokens(binary_to_list(Result), [$\n,$\r]) of
+		[Key] ->
+		    io:format("~nCrypt key file: ~s~n", [FullName]),
+		    Key;
+		_ ->
+		    {error,{bad_crypt_file,FullName}}
+	    end
+    end.
+
+make_crypto_key(String) ->
+    <<K1:8/binary,K2:8/binary>> = First = erlang:md5(String),
+    <<K3:8/binary,IVec:8/binary>> = erlang:md5([First|lists:reverse(String)]),
+    {K1,K2,K3,IVec}.
+
+random_bytes(N) ->
+    {A,B,C} = now(),
+    random:seed(A, B, C),
+    random_bytes_1(N, []).
+
+random_bytes_1(0, Acc) -> Acc;
+random_bytes_1(N, Acc) -> random_bytes_1(N-1, [random:uniform(255)|Acc]).
+
+check_callback_load(Callback) ->
+    case code:is_loaded(Callback) of
+	{file, _Filename}->
+	    check_exports(Callback);
+	false->
+	    case code:load_file(Callback) of
+		{module, Callback}->
+		    check_exports(Callback);
+		{error, Error}->
+		    {error, Error}
+	    end
+    end.
+
+check_exports(Callback) ->
+    Fs = Callback:module_info(exports),
+    case {lists:member({check_parameter,1},Fs),
+	  lists:member({read_config,1},Fs)} of
+	{true, true} ->
+	    {ok, Callback};
+	_ ->
+	    {error, missing_callback_functions}
+    end.
+
+check_config_files(Configs) ->
+    ConfigChecker = fun
+	({Callback, [F|_R]=Files}) ->
+	    case check_callback_load(Callback) of
+		{ok, Callback} ->
+			if is_integer(F) ->
+				Callback:check_parameter(Files);
+			   is_list(F) ->
+				lists:map(fun(File) ->
+						  Callback:check_parameter(File)
+					  end,
+					  Files)
+			end;
+		{error, Why}->
+		    {error, {callback, {Callback,Why}}}
+	    end;
+	({Callback, []}) ->
+	    case check_callback_load(Callback) of
+		{ok, Callback}->
+		     Callback:check_parameter([]);
+		{error, Why}->
+		     {error, {callback, {Callback,Why}}}
+	    end
+    end,
+    lists:keysearch(error, 1, lists:flatten(lists:map(ConfigChecker, Configs))).
+
+prepare_user_configs([ConfigString|UserConfigs], Acc, new) ->
+    prepare_user_configs(UserConfigs,
+			 [{list_to_atom(ConfigString), []}|Acc],
+			 cur);
+prepare_user_configs(["and"|UserConfigs], Acc, _) ->
+    prepare_user_configs(UserConfigs, Acc, new);
+prepare_user_configs([ConfigString|UserConfigs], [{LastMod, LastList}|Acc], cur) ->
+    prepare_user_configs(UserConfigs,
+			 [{LastMod, [ConfigString|LastList]}|Acc],
+			 cur);
+prepare_user_configs([], Acc, _) ->
+    Acc.
+
+prepare_config_list(Args) ->
+    ConfigFiles = case lists:keysearch(ct_config, 1, Args) of
+		      {value,{ct_config,Files}}->
+			  [{?ct_config_txt,[filename:absname(F) || F <- Files]}];
+		      false->
+			  []
+		  end,
+    UserConfigs = case lists:keysearch(userconfig, 1, Args) of
+		      {value,{userconfig,UserConfigFiles}}->
+			  prepare_user_configs(UserConfigFiles, [], new);
+		      false->
+			  []
+		  end,
+    ConfigFiles ++ UserConfigs.
+
+% TODO: add logging of the loaded configuration file to the CT FW log!!!
+add_config(Callback, []) ->
+    read_config_files_int([{Callback, []}], fun store_config/3);
+add_config(Callback, [File|_Files]=Config) when is_list(File) ->
+    lists:foreach(fun(CfgStr) ->
+	read_config_files_int([{Callback, CfgStr}], fun store_config/3) end,
+	Config);
+add_config(Callback, [C|_]=Config) when is_integer(C) ->
+    read_config_files_int([{Callback, Config}], fun store_config/3),
+    ok.
+
+remove_config(Callback, Config) ->
+    ets:match_delete(?attr_table,
+		     #ct_conf{handler=Callback,
+			      config=Config,_='_'}),
+    ok.
diff --git a/lib/common_test/src/ct_config_plain.erl b/lib/common_test/src/ct_config_plain.erl
new file mode 100644
index 0000000000..3fbc8af9fb
--- /dev/null
+++ b/lib/common_test/src/ct_config_plain.erl
@@ -0,0 +1,109 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%----------------------------------------------------------------------
+%% File    : ct_config_plain.erl
+%% Description : CT callback module for reading configs from text files
+%%
+%% Created : 15 February 2010
+%%----------------------------------------------------------------------
+-module(ct_config_plain).
+-export([read_config/1, check_parameter/1]).
+
+read_config(ConfigFile) ->
+    case file:consult(ConfigFile) of
+	{ok,Config} ->
+	    {ok, Config};
+	{error,enoent} ->
+	    {error, config_file_error, enoent};
+	{error,Reason} ->
+	    Key =
+		case application:get_env(common_test, decrypt) of
+		    {ok,KeyOrFile} ->
+			case KeyOrFile of
+			    {key,K} ->
+				K;
+			    {file,F} ->
+				ct_config:get_crypt_key_from_file(F)
+			end;
+		    _ ->
+			ct_config:get_crypt_key_from_file()
+		end,
+	    case Key of
+		{error,no_crypt_file} ->
+		    {error, config_file_error, Reason};
+		{error,CryptError} ->
+		    {error, decrypt_file_error, CryptError};
+		_ when is_list(Key) ->
+		    case ct_config:decrypt_config_file(ConfigFile, undefined, {key,Key}) of
+			{ok,CfgBin} ->
+			    case read_config_terms(CfgBin) of
+				{error,ReadFail} ->
+				    {error, config_file_error, ReadFail};
+				Config ->
+				    {ok, Config}
+			    end;
+			{error,DecryptFail} ->
+			    {error, decrypt_config_error, DecryptFail}
+		    end;
+		_ ->
+		    {error, bad_decrypt_key, Key}
+	    end
+    end.
+
+% check if config file exists
+check_parameter(File)->
+    case filelib:is_file(File) of
+	true->
+	    {ok, {file, File}};
+	false->
+	    {error, {nofile, File}}
+    end.
+
+read_config_terms(Bin) when is_binary(Bin) ->
+    case catch binary_to_list(Bin) of
+	{'EXIT',_} ->
+	    {error,invalid_textfile};
+	Lines ->
+	    read_config_terms(Lines)
+    end;
+read_config_terms(Lines) when is_list(Lines) ->
+    read_config_terms1(erl_scan:tokens([], Lines, 0), 1, [], []).
+
+read_config_terms1({done,{ok,Ts,EL},Rest}, L, Terms, _) ->
+    case erl_parse:parse_term(Ts) of
+	{ok,Term} when Rest == [] ->
+	    lists:reverse([Term|Terms]);
+	{ok,Term} ->
+	    read_config_terms1(erl_scan:tokens([], Rest, 0),
+			       EL+1, [Term|Terms], Rest);
+	_ ->
+	    {error,{bad_term,{L,EL}}}
+    end;
+read_config_terms1({done,{eof,_},_}, _, Terms, Rest) when Rest == [] ->
+    lists:reverse(Terms);
+read_config_terms1({done,{eof,EL},_}, L, _, _) ->
+    {error,{bad_term,{L,EL}}};
+read_config_terms1({done,{error,Info,EL},_}, L, _, _) ->
+    {error,{Info,{L,EL}}};
+read_config_terms1({more,_}, L, Terms, Rest) ->
+    case string:tokens(Rest, [$\n,$\r,$\t]) of
+	[] ->
+	    lists:reverse(Terms);
+	_ ->
+	    {error,{bad_term,L}}
+    end.
diff --git a/lib/common_test/src/ct_config_xml.erl b/lib/common_test/src/ct_config_xml.erl
new file mode 100644
index 0000000000..8a6e75e635
--- /dev/null
+++ b/lib/common_test/src/ct_config_xml.erl
@@ -0,0 +1,118 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%----------------------------------------------------------------------
+%% File    : ct_config_xml.erl
+%% Description : CT callback module for reading configs from XML files
+%%
+%% Created : 16 February 2010
+%%----------------------------------------------------------------------
+-module(ct_config_xml).
+-export([read_config/1, check_parameter/1]).
+
+% read config file
+read_config(ConfigFile) ->
+    case catch do_read_xml_config(ConfigFile) of
+	{ok, Config}->
+	    {ok, Config};
+	{error, Error, ErroneousString}->
+	    {error, Error, ErroneousString}
+    end.
+
+% check file exists
+check_parameter(File)->
+    case filelib:is_file(File) of
+	true->
+	    {ok, {file, File}};
+	false->
+	    {error, {nofile, File}}
+    end.
+
+% actual reading of the config
+do_read_xml_config(ConfigFile)->
+    case catch xmerl_sax_parser:file(ConfigFile,
+	    [{event_fun, fun event/3},
+	    {event_state, []}]) of
+	{ok, EntityList, _}->
+	    {ok, lists:reverse(transform_entity_list(EntityList))};
+	Oops->
+	    {error, parsing_failed, Oops}
+    end.
+
+% event callback for xmerl_sax_parser
+event(Event, _LineNo, State) ->
+    tag(Event, State).
+
+% document start
+tag(startDocument, State) ->
+    State;
+
+% start of the config
+tag({startElement, _Uri, "config", _QName, _Attributes}, []) ->
+	[{"config", []}];
+
+% start tag
+tag({startElement, _Uri, Name, _QName, _Attributes}, Tags) ->
+	[{Name, []}|Tags];
+
+% value
+tag({characters, String}, [{Tag, _Value}|Tags]) ->
+	[{Tag, String}|Tags];
+
+% end tag
+tag({endElement, _Uri, _Name, _QName},
+        [Entity, {PrevEntityTag, PrevEntityValue}|Tags]) ->
+	NewHead = {PrevEntityTag, [Entity|PrevEntityValue]},
+	[NewHead|Tags];
+
+% end of the config
+tag({endElement, _Uri, "config", _QName}, [{"config", Config}]) ->
+	Config;
+
+% end of document, return result
+tag(endDocument,  {_Tags, Result}) ->
+    Result;
+
+% default
+tag(_El, State) ->
+	State.
+
+% transform of the ugly deeply nested entity list to the key-value "tree"
+transform_entity_list(EntityList)->
+    lists:map(fun transform_entity/1, EntityList).
+
+% transform entity from {list(), list()} to {atom(), term()}
+transform_entity({Tag, [Value|Rest]}) when
+    is_tuple(Value)->
+	{list_to_atom(Tag), transform_entity_list(lists:reverse([Value|Rest]))};
+transform_entity({Tag, String})->
+    case list_to_term(String) of
+	{ok, Value}->
+	    {list_to_atom(Tag), Value};
+	Error->
+	     throw(Error)
+    end.
+
+% transform a string with Erlang terms
+list_to_term(String) ->
+    {ok, T, _} = erl_scan:string(String++"."),
+    case catch erl_parse:parse_term(T) of
+        {ok, Term} ->
+            {ok, Term};
+        Error ->
+            {error, Error, String}
+    end.
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index ed8b564921..b61eda7152 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -24,11 +24,15 @@
 
 -module(ct_framework).
 
--export([init_tc/3, end_tc/3, get_suite/2, report/2, warn/1]).
+-export([init_tc/3, end_tc/4, get_suite/2, report/2, warn/1]).
 -export([error_notification/4]).
 
+-export([overview_html_header/1]).
+
 -export([error_in_suite/1, ct_init_per_group/2, ct_end_per_group/2]).
 
+-export([make_all_conf/3, make_conf/5]).
+
 -include("ct_event.hrl").
 -include("ct_util.hrl").
 
@@ -101,7 +105,8 @@ init_tc1(Mod,Func,[Config0],DoInit) when is_list(Config0) ->
 		[{saved_config,{LastFunc,SavedConfig}} | 
 		 lists:keydelete(saved_config,1,Config0)];
 	    {{LastSuite,InitOrEnd},SavedConfig} when InitOrEnd == init_per_suite ;
-						     InitOrEnd == end_per_suite -> % last suite
+						     InitOrEnd == end_per_suite ->
+		%% last suite
 		[{saved_config,{LastSuite,SavedConfig}} | 
 		 lists:keydelete(saved_config,1,Config0)];
 	    undefined ->
@@ -113,9 +118,9 @@ init_tc1(Mod,Func,[Config0],DoInit) when is_list(Config0) ->
 	    ok;
 	true ->
 	    %% delete all default values used in previous suite
-	    ct_util:delete_default_config(suite),
+	    ct_config:delete_default_config(suite),
 	    %% release all name -> key bindings (once per suite)
-	    ct_util:release_allocated()
+	    ct_config:release_allocated()
     end,
     TestCaseInfo =
 	case catch apply(Mod,Func,[]) of
@@ -125,7 +130,7 @@ init_tc1(Mod,Func,[Config0],DoInit) when is_list(Config0) ->
     %% clear all config data default values set by previous
     %% testcase info function (these should only survive the
     %% testcase, not the whole suite)
-    ct_util:delete_default_config(testcase),
+    ct_config:delete_default_config(testcase),
     case add_defaults(Mod,Func,TestCaseInfo,DoInit) of
 	Error = {suite0_failed,_} ->
 	    ct_logs:init_tc(),
@@ -161,6 +166,7 @@ init_tc2(Mod,Func,SuiteInfo,MergeResult,Config,DoInit) ->
 	    _ ->
 		MergeResult
 	end,
+
     %% timetrap must be handled before require
     MergedInfo1 = timetrap_first(MergedInfo, [], []),
     %% tell logger to use specified style sheet
@@ -201,7 +207,7 @@ init_tc2(Mod,Func,SuiteInfo,MergeResult,Config,DoInit) ->
 	    {skip,{require_failed_in_suite0,Reason}};
 	{error,Reason} ->
 	    {auto_skip,{require_failed,Reason}};
-	FinalConfig ->
+	{ok, FinalConfig} ->
 	    case MergeResult of
 		{error,Reason} ->
 		    %% suite0 configure finished now, report that 
@@ -210,13 +216,25 @@ init_tc2(Mod,Func,SuiteInfo,MergeResult,Config,DoInit) ->
 		_ ->
 		    case get('$test_server_framework_test') of
 			undefined ->
-			    FinalConfig;
+			    ct_suite_init(Mod, FuncSpec, FinalConfig);
 			Fun ->
-			    Fun(init_tc, FinalConfig)
+			    case Fun(init_tc, FinalConfig) of
+				NewConfig when is_list(NewConfig) ->
+				    {ok,NewConfig};
+				Else ->
+				    Else
+			    end
 		    end
 	    end
     end.
-	    
+
+ct_suite_init(Mod, Func, [Config]) when is_list(Config) ->
+    case ct_hooks:init_tc( Mod, Func, Config) of
+	NewConfig when is_list(NewConfig) ->
+	    {ok, [NewConfig]};
+	Else ->
+	    Else
+    end.
 
 add_defaults(Mod,Func,FuncInfo,DoInit) ->
     case (catch Mod:suite()) of
@@ -233,7 +251,9 @@ add_defaults(Mod,Func,FuncInfo,DoInit) ->
 			      (_) -> false
 			   end, SuiteInfo) of
 		true ->
-		    SuiteInfo1 = merge_with_suite_defaults(Mod,SuiteInfo),
+		    SuiteInfoNoCTH = 
+			lists:keydelete(ct_hooks,1,SuiteInfo),
+		    SuiteInfo1 = merge_with_suite_defaults(Mod,SuiteInfoNoCTH),
 		    case add_defaults1(Mod,Func,FuncInfo,SuiteInfo1,DoInit) of
 			Error = {error,_} -> {SuiteInfo1,Error};
 			MergedInfo -> {SuiteInfo1,MergedInfo}
@@ -244,8 +264,8 @@ add_defaults(Mod,Func,FuncInfo,DoInit) ->
 	_ ->
 	    {suite0_failed,bad_return_value}
     end.
-    
-add_defaults1(_Mod,init_per_suite,[],SuiteInfo,_) ->
+
+add_defaults1(_Mod,init_per_suite,[],SuiteInfo,_DoInit) ->
     SuiteInfo;
 
 add_defaults1(Mod,Func,FuncInfo,SuiteInfo,DoInit) ->
@@ -253,15 +273,27 @@ add_defaults1(Mod,Func,FuncInfo,SuiteInfo,DoInit) ->
     %% can result in weird behaviour (suite values get overwritten)
     SuiteReqs = 
 	[SDDef || SDDef <- SuiteInfo,
-		  require == element(1,SDDef)],
-    case [element(2,Clash) || Clash <- SuiteReqs, 
-	  true == lists:keymember(element(2,Clash),2,FuncInfo)] of
+		  ((require == element(1,SDDef)) or
+		   (default_config == element(1,SDDef)))],
+    FuncReqs =
+	[FIDef || FIDef <- FuncInfo,
+		  require == element(1,FIDef)],
+    case [element(2,Clash) || Clash <- SuiteReqs,
+			      require == element(1, Clash),
+			      true == lists:keymember(element(2,Clash),2,
+						      FuncReqs)] of
 	[] ->
 	    add_defaults2(Mod,Func,FuncInfo,SuiteInfo,SuiteReqs,DoInit);
 	Clashes ->
 	    {error,{config_name_already_in_use,Clashes}}
     end.
 
+add_defaults2(Mod,init_per_suite,IPSInfo,SuiteInfo,SuiteReqs,false) ->
+    %% not common practise to use a test case info function for
+    %% init_per_suite (usually handled by suite/0), but let's support
+    %% it just in case...
+    add_defaults2(Mod,init_per_suite,IPSInfo,SuiteInfo,SuiteReqs,true);
+
 add_defaults2(_Mod,_Func,FuncInfo,SuiteInfo,_,false) ->
     %% include require elements from test case info, but not from suite/0
     %% (since we've already required those vars)
@@ -344,6 +376,8 @@ configure([{timetrap,off}|Rest],Info,SuiteInfo,Scope,Config) ->
 configure([{timetrap,Time}|Rest],Info,SuiteInfo,Scope,Config) ->
     Dog = test_server:timetrap(Time),
     configure(Rest,Info,SuiteInfo,Scope,[{watchdog,Dog}|Config]);
+configure([{ct_hooks, Hook} | Rest], Info, SuiteInfo, Scope, Config) ->
+    configure(Rest, Info, SuiteInfo, Scope, [{ct_hooks, Hook} | Config]);
 configure([_|Rest],Info,SuiteInfo,Scope,Config) ->
     configure(Rest,Info,SuiteInfo,Scope,Config);
 configure([],_,_,_,Config) ->
@@ -381,10 +415,10 @@ try_set_default(Name,Key,Info,Where) ->
 	{_,[]} -> 
 	    no_default;
 	{'_UNDEF',_} ->
-    	    [ct_util:set_default_config([CfgVal],Where) || CfgVal <- CfgElems],
+	    [ct_config:set_default_config([CfgVal],Where) || CfgVal <- CfgElems],
 	    ok;
 	_ ->
-    	    [ct_util:set_default_config(Name,[CfgVal],Where) || CfgVal <- CfgElems],
+	    [ct_config:set_default_config(Name,[CfgVal],Where) || CfgVal <- CfgElems],
 	    ok
     end.
 	    
@@ -400,14 +434,14 @@ try_set_default(Name,Key,Info,Where) ->
 %%%
 %%% @doc Test server framework callback, called by the test_server
 %%% when a test case is finished.
-end_tc(?MODULE,error_in_suite,_) ->		% bad start!
+end_tc(?MODULE,error_in_suite,_, _) ->		% bad start!
     ok;
-end_tc(Mod,Func,{TCPid,Result,[Args]}) when is_pid(TCPid) ->
-    end_tc(Mod,Func,TCPid,Result,Args);
-end_tc(Mod,Func,{Result,[Args]}) ->
-    end_tc(Mod,Func,self(),Result,Args).
+end_tc(Mod,Func,{TCPid,Result,[Args]}, Return) when is_pid(TCPid) ->
+    end_tc(Mod,Func,TCPid,Result,Args,Return);
+end_tc(Mod,Func,{Result,[Args]}, Return) ->
+    end_tc(Mod,Func,self(),Result,Args,Return).
 
-end_tc(Mod,Func,TCPid,Result,Args) ->
+end_tc(Mod,Func,TCPid,Result,Args,Return) ->
     case lists:keysearch(watchdog,1,Args) of
 	{value,{watchdog,Dog}} -> test_server:timetrap_cancel(Dog);
 	false -> ok
@@ -430,8 +464,10 @@ end_tc(Mod,Func,TCPid,Result,Args) ->
 	    {_,GroupName,_Props} = Group ->			       
 		case lists:keysearch(save_config,1,Args) of
 		    {value,{save_config,SaveConfig}} ->
-			ct_util:save_suite_data(last_saved_config,
-						{Mod,{group,GroupName}},SaveConfig),
+			ct_util:save_suite_data(
+			  last_saved_config,
+			  {Mod,{group,GroupName}},
+			  SaveConfig),
 			Group;
 		    false ->
 			Group
@@ -448,12 +484,33 @@ end_tc(Mod,Func,TCPid,Result,Args) ->
 	end,
     ct_util:reset_silent_connections(),
 
-    %% send sync notification so that event handlers may print
-    %% in the log file before it gets closed
-    ct_event:sync_notify(#event{name=tc_done,
-				node=node(),
-				data={Mod,FuncSpec,tag(Result)}}),
-    case Result of
+    case get('$test_server_framework_test') of
+	undefined ->
+	    {FinalResult,FinalNotify} =
+		case ct_hooks:end_tc(
+			    Mod, FuncSpec, Args, Result, Return) of
+		    '$ct_no_change' ->
+			{FinalResult = ok,Result};
+		    FinalResult ->
+			{FinalResult,FinalResult}
+		end,
+	    % send sync notification so that event handlers may print
+	    % in the log file before it gets closed
+	    ct_event:sync_notify(#event{name=tc_done,
+					node=node(),
+					data={Mod,FuncSpec,
+					      tag_cth(FinalNotify)}});
+	Fun ->
+	    % send sync notification so that event handlers may print
+	    % in the log file before it gets closed
+	    ct_event:sync_notify(#event{name=tc_done,
+					node=node(),
+					data={Mod,FuncSpec,tag(Result)}}),
+	    FinalResult = Fun(end_tc, Return)
+    end,
+
+    
+    case FinalResult of
 	{skip,{sequence_failed,_,_}} ->
 	    %% ct_logs:init_tc is never called for a skipped test case
 	    %% in a failing sequence, so neither should end_tc	    
@@ -472,12 +529,7 @@ end_tc(Mod,Func,TCPid,Result,Args) ->
 	_ -> 
 	    ok
     end,
-    case get('$test_server_framework_test') of
-	undefined ->
-	    ok;
-	Fun ->
-	    Fun(end_tc, ok)
-    end.
+    FinalResult.	    
 
 %% {error,Reason} | {skip,Reason} | {timetrap_timeout,TVal} | 
 %% {testcase_aborted,Reason} | testcase_aborted_or_killed | 
@@ -493,6 +545,21 @@ tag(E = testcase_aborted_or_killed) ->
 tag(Other) ->
     Other.
 
+tag_cth({STag,Reason}) when STag == skip; STag == skipped -> 
+    {skipped,Reason};
+tag_cth({fail, Reason}) ->
+    {failed, {error,Reason}};
+tag_cth(E = {ETag,_}) when ETag == error; ETag == 'EXIT'; 
+                       ETag == timetrap_timeout;
+                       ETag == testcase_aborted -> 
+    {failed,E};
+tag_cth(E = testcase_aborted_or_killed) ->
+    {failed,E};
+tag_cth(List) when is_list(List) ->
+    ok;
+tag_cth(Other) ->
+    Other.
+
 %%%-----------------------------------------------------------------
 %%% @spec error_notification(Mod,Func,Args,Error) -> ok
 %%%      Mod = atom()
@@ -631,12 +698,12 @@ group_or_func(Func, _Config) ->
 %%%      and every test case. If the former, all test cases in the suite
 %%%      should be returned. 
 
-get_suite(Mod, all) ->    
+get_suite(Mod, all) ->
     case catch apply(Mod, groups, []) of
 	{'EXIT',_} ->
 	    get_all(Mod, []);
 	GroupDefs when is_list(GroupDefs) ->
-	    case catch check_groups(Mod, GroupDefs) of
+	    case catch 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
@@ -651,96 +718,224 @@ get_suite(Mod, all) ->
 
 %%!============================================================
 %%! Note: The handling of sequences in get_suite/2 and get_all/2
-%%! is deprecated and should be removed after OTP R13!
+%%! is deprecated and should be removed at some point...
 %%!============================================================
 
-get_suite(Mod, Name) ->
-    %% Name may be name of a group or a test case. If it's a group,
-    %% it should be expanded to list of cases (in a conf term)
+%% group
+get_suite(Mod, Group={conf,Props,_Init,TCs,_End}) ->
+    Name = proplists:get_value(name, Props),
     case catch apply(Mod, groups, []) of
 	{'EXIT',_} ->
-	    get_seq(Mod, Name);
+	    [Group];
 	GroupDefs when is_list(GroupDefs) ->
-	    case catch check_groups(Mod, GroupDefs) of
+	    case catch 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]]}];
+		[] ->
+		    {error,{invalid_group_spec,Name}};
 		ConfTests ->
-		    FindConf = fun({conf,Props,_,_,_}) ->
-				       case proplists:get_value(name, Props) of
-					   Name -> true;
-					   _    -> false
-				       end
-			       end,					 
-		    case lists:filter(FindConf, ConfTests) of
-			[] ->			% must be a test case
-			    get_seq(Mod, Name);
-			[ConfTest|_] ->
-			    ConfTest
+		    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 proplists:get_value(name, element(2, hd(ConfTests))) of
+				Name ->		% top group
+				    delete_subs(ConfTests, ConfTests);
+				_ ->
+				    []
+			    end;
+			false ->
+			    delete_subs(ConfTests, ConfTests)
 		    end
 	    end;
 	_ ->
 	    E = "Bad return value from "++atom_to_list(Mod)++":groups/0",
 	    [{?MODULE,error_in_suite,[[{error,list_to_atom(E)}]]}]
-    end.
+    end;
 
-check_groups(_Mod, []) ->
-    [];
-check_groups(Mod, Defs) ->
-    check_groups(Mod, Defs, Defs, []).
+%% testcase
+get_suite(Mod, Name) ->
+     get_seq(Mod, Name).
 
-check_groups(Mod, [TC | Gs], Defs, Levels) when is_atom(TC), length(Levels)>0 ->
-    [TC | check_groups(Mod, Gs, Defs, Levels)];
+%%%-----------------------------------------------------------------
 
-check_groups(Mod, [{group,SubName} | Gs], Defs, Levels) when is_atom(SubName) ->
-    case lists:member(SubName, Levels) of
-	true ->
-	    E = "Cyclic reference to group "++atom_to_list(SubName)++
-		" in "++atom_to_list(Mod)++":groups/0",
-	    throw({error,list_to_atom(E)});
-	false ->	    
-	    case find_group(Mod, SubName, Defs) of
-		{error,_} = Error ->
-		    throw(Error);
-		G ->
-		    [check_groups(Mod, [G], Defs, Levels) | 
-		     check_groups(Mod, Gs, Defs, Levels)]
-	    end
+find_groups(Mod, Name, TCs, GroupDefs) ->
+    Found = find(Mod, Name, TCs, GroupDefs, [], GroupDefs, false),
+    Trimmed = trim(Found),
+    %% I cannot find a reason to why this function is called,
+    %% It deletes any group which is referenced in any other
+    %% group. i.e.
+    %% groups() ->
+    %%   [{test, [], [testcase1]},
+    %%    {testcases, [], [{group, test}]}].
+    %% Would be changed to
+    %% groups() ->
+    %%   [{testcases, [], [testcase1]}].
+    %% instead of what I believe is correct:
+    %% groups() ->
+    %%   [{test, [], [testcase1]},
+    %%    {testcases, [], [testcase1]}].
+    %% Have to double check with peppe
+    delete_subs(Trimmed, Trimmed),
+    Trimmed.
+
+find(Mod, all, _TCs, [{Name,Props,Tests} | Gs], Known, Defs, _) 
+  when is_atom(Name), is_list(Props), is_list(Tests) ->
+    cyclic_test(Mod, Name, Known),
+    [make_conf(Mod, Name, Props,
+	       find(Mod, all, all, Tests, [Name | Known], Defs, true)) |
+     find(Mod, all, all, Gs, [], Defs, true)];
+
+find(Mod, Name, TCs, [{Name,Props,Tests} | _Gs], Known, Defs, false)
+  when is_atom(Name), is_list(Props), is_list(Tests) ->
+    cyclic_test(Mod, Name, Known),
+    case TCs of
+	all ->
+	    [make_conf(Mod, Name, Props,
+		       find(Mod, Name, TCs, Tests, [Name | Known], Defs, true))];
+	_ ->
+	    Tests1 = [TC || TC <- TCs,
+			    lists:member(TC, Tests) == true],
+	    [make_conf(Mod, Name, Props, Tests1)]
     end;
 
-check_groups(Mod, [{Name,Tests} | Gs], Defs, Levels) when is_atom(Name),
-							  is_list(Tests) ->
-    check_groups(Mod, [{Name,[],Tests} | Gs], Defs, Levels);
-
-check_groups(Mod, [{Name,Props,Tests} | Gs], Defs, Levels) when is_atom(Name),
-								is_list(Props),
-								is_list(Tests) ->
-    {TestSpec,Levels1} = 
-	case Levels of
-	    [] ->
-		{check_groups(Mod, Tests, Defs, [Name]),[]};
-	    _ ->
-		{check_groups(Mod, Tests, Defs, [Name|Levels]),Levels}
-	end,
-    [make_conf(Mod, Name, Props, TestSpec) | 
-     check_groups(Mod, Gs, Defs, Levels1)];
+find(Mod, Name, TCs, [{Name1,Props,Tests} | Gs], Known, Defs, false)
+  when is_atom(Name1), is_list(Props), is_list(Tests) ->
+    cyclic_test(Mod, Name1, Known),
+    [make_conf(Mod,Name1,Props,
+		   find(Mod, Name, TCs, Tests, [Name1 | Known], Defs, false)) |
+     find(Mod, Name, TCs, Gs, [], Defs, false)];
+
+find(Mod, Name, _TCs, [{Name,_Props,_Tests} | _Gs], _Known, _Defs, true)
+  when is_atom(Name) ->
+    E = "Duplicate groups named "++atom_to_list(Name)++" in "++
+	atom_to_list(Mod)++":groups/0",
+    throw({error,list_to_atom(E)});
 
-check_groups(Mod, [BadTerm | _Gs], _Defs, Levels) ->
-    Where = if length(Levels) == 0 ->
+find(Mod, Name, all, [{Name1,Props,Tests} | Gs], Known, Defs, true)
+  when is_atom(Name1), is_list(Props), is_list(Tests) ->
+    cyclic_test(Mod, Name1, Known),
+    [make_conf(Mod, Name1, Props,
+	       find(Mod, Name, all, Tests, [Name1 | Known], Defs, true)) |
+     find(Mod, Name, all, Gs, [], Defs, true)];
+
+find(Mod, Name, TCs, [{group,Name1} | Gs], Known, Defs, Found) 
+  when is_atom(Name1) ->
+    find(Mod, Name, TCs, [expand(Mod, Name1, Defs) | Gs], Known, Defs, Found);
+
+%% Undocumented remote group feature, use with caution
+find(Mod, Name, TCs, [{group, ExtMod, ExtGrp} | Gs], Known, Defs, true)
+  when is_atom(ExtMod), is_atom(ExtGrp) ->
+    ExternalDefs = ExtMod:groups(),
+    ExternalTCs = find(ExtMod, ExtGrp, TCs, [{group, ExtGrp}],
+                       [], ExternalDefs, false),
+     ExternalTCs ++ find(Mod, Name, TCs, Gs, Known, Defs, true);
+
+find(Mod, Name, TCs, [{Name1,Tests} | Gs], Known, Defs, Found)
+  when is_atom(Name1), is_list(Tests) ->
+    find(Mod, Name, TCs, [{Name1,[],Tests} | Gs], Known, Defs, Found);
+
+find(Mod, Name, TCs, [_TC | Gs], Known, Defs, false) ->
+    find(Mod, Name, TCs, Gs, Known, Defs, false);
+
+find(Mod, Name, TCs, [TC | Gs], Known, Defs, true) when is_atom(TC) ->
+    [{Mod, TC} | find(Mod, Name, TCs, Gs, Known, Defs, true)];
+
+find(Mod, Name, TCs, [{ExternalTC, Case} = TC | Gs], Known, Defs, true)
+  when is_atom(ExternalTC),
+       is_atom(Case) ->
+    [TC | find(Mod, Name, TCs, Gs, Known, Defs, true)];
+
+find(Mod, _Name, _TCs, [BadTerm | _Gs], Known, _Defs, _Found) ->
+    Where = if length(Known) == 0 ->
 		    atom_to_list(Mod)++":groups/0";
 	       true ->
-		    "group "++atom_to_list(lists:last(Levels))++
+		    "group "++atom_to_list(lists:last(Known))++
 			" in "++atom_to_list(Mod)++":groups/0"
 	    end,		 
     Term = io_lib:format("~p", [BadTerm]),
     E = "Bad term "++lists:flatten(Term)++" in "++Where,
     throw({error,list_to_atom(E)});
 
-check_groups(_Mod, [], _Defs, _) ->
+find(_Mod, _Name, _TCs,  [], _Known, _Defs, false) ->
+    ['$NOMATCH'];
+
+find(_Mod, _Name, _TCs,  [], _Known, _Defs, _Found) ->
     [].
 
-find_group(Mod, Name, Defs) ->
+delete_subs([{conf, _,_,_,_} = Conf | Confs], All) ->
+    All1 = delete_conf(Conf, All),
+    case is_sub(Conf, All1) of
+	true ->
+	    delete_subs(Confs, All1);
+	false ->
+	    delete_subs(Confs, All)
+    end;
+delete_subs([_Else | Confs], All) ->
+    delete_subs(Confs, All);
+delete_subs([], All) ->
+    All.
+
+delete_conf({conf,Props,_,_,_}, Confs) ->
+    Name = proplists:get_value(name, Props),
+    [Conf || Conf = {conf,Props0,_,_,_} <- Confs,
+	     Name =/= proplists:get_value(name, Props0)].
+
+is_sub({conf,Props,_,_,_}=Conf, [{conf,_,_,Tests,_} | Confs]) ->
+    Name = proplists:get_value(name, Props),
+    case lists:any(fun({conf,Props0,_,_,_}) ->
+			   case proplists:get_value(name, Props0) of
+			       N when N == Name ->
+				   true;
+			       _ ->
+				   false
+			   end;
+		      (_) ->
+			   false
+		   end, Tests) of
+	true ->
+	    true;
+	false ->
+	    is_sub(Conf, Tests) or is_sub(Conf, Confs)
+    end;
+
+is_sub(Conf, [_TC | Tests]) ->
+    is_sub(Conf, Tests);
+
+is_sub(_Conf, []) ->
+    false.
+
+trim(['$NOMATCH' | Tests]) ->
+    trim(Tests);
+
+trim([{conf,Props,Init,Tests,End} | Confs]) ->
+    case trim(Tests) of
+	[] ->
+	    trim(Confs);
+	Trimmed ->
+	    [{conf,Props,Init,Trimmed,End} | trim(Confs)]
+    end;
+
+trim([TC | Tests]) ->
+    [TC | trim(Tests)];
+
+trim([]) ->
+    [].
+
+cyclic_test(Mod, Name, Names) ->
+    case lists:member(Name, Names) of
+	true ->
+	    E = "Cyclic reference to group "++atom_to_list(Name)++
+		" in "++atom_to_list(Mod)++":groups/0",
+	    throw({error,list_to_atom(E)});
+	false ->
+	    ok
+    end.
+
+expand(Mod, Name, Defs) ->
     case lists:keysearch(Name, 1, Defs) of
 	{value,Def} -> 
 	    Def;
@@ -750,7 +945,50 @@ find_group(Mod, Name, Defs) ->
 	    throw({error,list_to_atom(E)})
     end.
 
+make_all_conf(Dir, Mod, _Props) ->
+    case code:is_loaded(Mod) of
+	false ->
+	    code:load_abs(filename:join(Dir,atom_to_list(Mod)));
+	_ ->
+	    ok
+    end,
+    make_all_conf(Mod).
+
+make_all_conf(Mod) ->
+    case catch apply(Mod, groups, []) of
+	{'EXIT',_} ->
+	    {error,{invalid_group_definition,Mod}};
+	GroupDefs when is_list(GroupDefs) ->
+	    case catch 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]]}];
+		[] ->
+		    {error,{invalid_group_spec,Mod}};
+		ConfTests ->
+		    [{conf,Props,Init,all,End} ||
+			{conf,Props,Init,_,End}
+			    <- delete_subs(ConfTests, ConfTests)]
+	    end
+    end.
+
+make_conf(Dir, Mod, Name, Props, TestSpec) ->
+    case code:is_loaded(Mod) of
+	false ->
+	    code:load_abs(filename:join(Dir,atom_to_list(Mod)));
+	_ ->
+	    ok
+    end,
+    make_conf(Mod, Name, Props, TestSpec).
+
 make_conf(Mod, Name, Props, TestSpec) ->
+    case code:is_loaded(Mod) of
+	false ->
+	    code:load_file(Mod);
+	_ ->
+	    ok
+    end,
     {InitConf,EndConf} =
 	case erlang:function_exported(Mod,init_per_group,2) of
 	    true ->
@@ -761,6 +999,7 @@ make_conf(Mod, Name, Props, TestSpec) ->
 	end,
     {conf,[{name,Name}|Props],InitConf,TestSpec,EndConf}.
 
+%%%-----------------------------------------------------------------
 
 get_all(Mod, ConfTests) ->	
     case catch apply(Mod, all, []) of
@@ -776,31 +1015,11 @@ get_all(Mod, ConfTests) ->
 		    [{?MODULE,error_in_suite,[[{error,What}]]}];
 		SeqsAndTCs ->
 		    %% expand group references in all() using ConfTests
-		    Expand =
-			fun({group,Name}) ->
-				FindConf = 
-				    fun({conf,Props,_,_,_}) ->
-					    case proplists:get_value(name, Props) of
-						Name -> true;
-						_    -> false
-					    end
-					   end,					 
-				case lists:filter(FindConf, ConfTests) of
-				    [ConfTest|_] ->
-					ConfTest;
-				    [] ->
-					E = "Invalid reference to group "++
-					    atom_to_list(Name)++" in "++
-					    atom_to_list(Mod)++":all/0",
-					throw({error,list_to_atom(E)})
-				end;
-			   (SeqOrTC) -> SeqOrTC
-			end,
-		    case catch lists:map(Expand, SeqsAndTCs) of
+		    case catch expand_groups(SeqsAndTCs, ConfTests, Mod) of
 			{error,_} = Error ->
 			    [{?MODULE,error_in_suite,[[Error]]}];
 			Tests ->
-			    Tests
+			    delete_subs(Tests, Tests)
 		    end
 	    end;
 	Skip = {skip,_Reason} ->
@@ -811,6 +1030,30 @@ get_all(Mod, ConfTests) ->
 	    [{?MODULE,error_in_suite,[[{error,Reason}]]}]
     end.
 
+expand_groups([H | T], ConfTests, Mod) ->
+    [expand_groups(H, ConfTests, Mod) | expand_groups(T, ConfTests, Mod)];
+expand_groups([], _ConfTests, _Mod) ->
+    [];
+expand_groups({group,Name}, ConfTests, Mod) ->
+    FindConf = 
+	fun({conf,Props,_,_,_}) ->
+		case proplists:get_value(name, Props) of
+		    Name -> true;
+		    _    -> false
+		end
+	end,					 
+    case lists:filter(FindConf, ConfTests) of
+	[ConfTest|_] ->
+	    expand_groups(ConfTest, ConfTests, Mod);
+	[] ->
+	    E = "Invalid reference to group "++
+		atom_to_list(Name)++" in "++
+		atom_to_list(Mod)++":all/0",
+	    throw({error,list_to_atom(E)})
+    end;
+expand_groups(SeqOrTC, _ConfTests, _Mod) ->
+    SeqOrTC.
+
 
 %%!============================================================
 %%! The support for sequences by means of using sequences/0
@@ -980,6 +1223,18 @@ report(What,Data) ->
 	    ok;
 	tc_done ->
 	    {_Suite,Case,Result} = Data,
+	    case Result of
+		{failed, _} ->
+		    ct_hooks:on_tc_fail(What, Data);
+		{skipped,{failed,{_,init_per_testcase,_}}} ->
+		    ct_hooks:on_tc_skip(tc_auto_skip, Data);
+		{skipped,{require_failed,_}} ->
+		    ct_hooks:on_tc_skip(tc_auto_skip, Data);
+		{skipped,_} ->
+		    ct_hooks:on_tc_skip(tc_user_skip, Data);
+		_Else ->
+		    ok
+	    end,
 	    case {Case,Result} of
 		{init_per_suite,_} ->
 		    ok;
@@ -997,8 +1252,8 @@ report(What,Data) ->
 		    add_to_stats(auto_skipped);
 		{_,{skipped,_}} ->
 		    add_to_stats(user_skipped);
-		{_,{FailOrSkip,_Reason}} ->
-		    add_to_stats(FailOrSkip)
+		{_,{SkipOrFail,_Reason}} ->
+		    add_to_stats(SkipOrFail)
 	    end;
 	tc_user_skip ->	    
 	    %% test case specified as skipped in testspec
@@ -1006,6 +1261,7 @@ report(What,Data) ->
 	    ct_event:sync_notify(#event{name=tc_user_skip,
 					node=node(),
 					data=Data}),
+	    ct_hooks:on_tc_skip(What, Data),
 	    add_to_stats(user_skipped);
 	tc_auto_skip ->
 	    %% test case skipped because of error in init_per_suite
@@ -1018,6 +1274,7 @@ report(What,Data) ->
 	    ct_event:sync_notify(#event{name=tc_auto_skip,
 					node=node(),
 					data=Data}),
+	    ct_hooks:on_tc_skip(What, Data),
 	    if Case /= end_per_suite, Case /= end_per_group -> 
 		    add_to_stats(auto_skipped);
 	       true -> 
@@ -1076,4 +1333,31 @@ add_data_dir(File,Config) when is_list(File) ->
 	    File
     end.
 
+%%%-----------------------------------------------------------------
+%%% @spec overview_html_header(TestName) -> Header
+overview_html_header(TestName) ->
+    TestName1 = lists:flatten(io_lib:format("~p", [TestName])),
+    Label = case application:get_env(common_test, test_label) of
+		{ok,Lbl} when Lbl =/= undefined ->
+		    "<H1><FONT color=\"green\">" ++ Lbl ++ "</FONT></H1>\n";
+		_        ->
+		    ""
+	    end,
+    Bgr = case ct_logs:basic_html() of
+	      true ->
+		  "";
+	      false ->
+		  CTPath = code:lib_dir(common_test),
+		  TileFile = filename:join(filename:join(CTPath,"priv"),"tile1.jpg"),
+		  " background=\"" ++ TileFile ++ "\""
+	  end,
+
+    ["<html>\n",
+     "<head><title>Test ", TestName1, " results</title>\n",
+     "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
+     "</head>\n",
+     "<body", Bgr, " bgcolor=\"white\" text=\"black\" ",
+     "link=\"blue\" vlink=\"purple\" alink=\"red\">\n",
+     Label,
+     "<H2>Results from test ", TestName1, "</H2>\n"].
 
diff --git a/lib/common_test/src/ct_gen_conn.erl b/lib/common_test/src/ct_gen_conn.erl
index a31e57c7ea..5aab4dd2dd 100644
--- a/lib/common_test/src/ct_gen_conn.erl
+++ b/lib/common_test/src/ct_gen_conn.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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%
 %%
 
@@ -76,7 +76,7 @@ start(Name,Address,InitData,CallbackMod) ->
 	    MRef = erlang:monitor(process,Pid),
 	    receive 
 		{connected,Pid} -> 
-		    erlang:demonitor(MRef),
+		    erlang:demonitor(MRef, [flush]),
 		    ct_util:register_connection(Name,Address,CallbackMod,Pid),
 		    {ok,Pid};
 		{Error,Pid} ->
@@ -182,7 +182,7 @@ call(Pid,Msg) ->
     Pid ! {Msg,{self(),Ref}},
     receive
 	{Ref, Result} -> 
-	    erlang:demonitor(MRef),
+	    erlang:demonitor(MRef, [flush]),
 	    case Result of
 		{retry,_Data} ->
 		    call(Pid,Result);
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
new file mode 100644
index 0000000000..77b7566d9e
--- /dev/null
+++ b/lib/common_test/src/ct_hooks.erl
@@ -0,0 +1,305 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2010. 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%
+%%
+
+%%% @doc Common Test Framework test execution control module.
+%%%
+%%% <p>This module is a proxy for calling and handling common test hooks.</p>
+
+-module(ct_hooks).
+
+%% API Exports
+-export([init/1]).
+-export([init_tc/3]).
+-export([end_tc/5]).
+-export([terminate/1]).
+-export([on_tc_skip/2]).
+-export([on_tc_fail/2]).
+
+-type proplist() :: [{atom(),term()}].
+
+%% If you change this, remember to update ct_util:look -> stop clause as well.
+-define(config_name, ct_hooks).
+
+%% -------------------------------------------------------------------------
+%% API Functions
+%% -------------------------------------------------------------------------
+
+%% @doc Called before any suites are started
+-spec init(State :: term()) -> ok |
+			       {error, Reason :: term()}.
+init(Opts) ->
+    call([{Hook, call_id, undefined} || Hook <- get_new_hooks(Opts)],
+	 ok, init, []).
+		      
+
+%% @doc Called after all suites are done.
+-spec terminate(Hooks :: term()) ->
+    ok.
+terminate(Hooks) ->
+    call([{HookId, fun call_terminate/3} || {HookId,_,_} <- Hooks],
+	 ct_hooks_terminate_dummy, terminate, Hooks),
+    ok.
+
+%% @doc Called as each test case is started. This includes all configuration
+%% tests.
+-spec init_tc(Mod :: atom(), Func :: atom(), Args :: list()) ->
+    NewConfig :: proplist() |
+    {skip, Reason :: term()} |
+    {auto_skip, Reason :: term()} |
+    {fail, Reason :: term()}.
+init_tc(ct_framework, _Func, Args) ->
+    Args;
+init_tc(Mod, init_per_suite, Config) ->
+    Info = case catch proplists:get_value(ct_hooks, Mod:suite()) of
+	       List when is_list(List) -> 
+		   [{ct_hooks,List}];
+	       _Else ->
+		   []
+	   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, Opts}, Config) ->
+    maybe_start_locker(Mod, GroupName, Opts),
+    call(fun call_generic/3, Config, [pre_init_per_group, GroupName]);
+init_tc(_Mod, {end_per_group, GroupName, _}, Config) ->
+    call(fun call_generic/3, Config, [pre_end_per_group, GroupName]);
+init_tc(_Mod, TC, Config) ->
+    call(fun call_generic/3, Config, [pre_init_per_testcase, TC]).
+
+%% @doc Called as each test case is completed. This includes all configuration
+%% tests.
+-spec end_tc(Mod :: atom(),
+	     Func :: atom(),
+	     Args :: list(),
+	     Result :: term(),
+	     Resturn :: term()) ->
+    NewConfig :: proplist() |
+    {skip, Reason :: term()} |
+    {auto_skip, Reason :: term()} |
+    {fail, Reason :: term()} |
+    ok | '$ct_no_change'.
+end_tc(ct_framework, _Func, _Args, Result, _Return) ->
+    Result;
+
+end_tc(Mod, init_per_suite, Config, _Result, Return) ->
+    call(fun call_generic/3, Return, [post_init_per_suite, Mod, Config],
+	 '$ct_no_change');
+
+end_tc(Mod, end_per_suite, Config, Result, _Return) ->
+    call(fun call_generic/3, Result, [post_end_per_suite, Mod, Config],
+	'$ct_no_change');
+
+end_tc(_Mod, {init_per_group, GroupName, _}, Config, _Result, Return) ->
+    call(fun call_generic/3, Return, [post_init_per_group, GroupName, Config],
+	 '$ct_no_change');
+
+end_tc(Mod, {end_per_group, GroupName, Opts}, Config, Result, _Return) ->
+    Res = call(fun call_generic/3, Result,
+	       [post_end_per_group, GroupName, Config], '$ct_no_change'),
+    maybe_stop_locker(Mod, GroupName,Opts),
+    Res;
+
+end_tc(_Mod, TC, Config, Result, _Return) ->
+    call(fun call_generic/3, Result, [post_end_per_testcase, TC, Config],
+	'$ct_no_change').
+
+on_tc_skip(How, {_Suite, Case, Reason}) ->
+    call(fun call_cleanup/3, {How, Reason}, [on_tc_skip, Case]).
+
+on_tc_fail(_How, {_Suite, Case, Reason}) ->
+    call(fun call_cleanup/3, Reason, [on_tc_fail, Case]).
+
+%% -------------------------------------------------------------------------
+%% Internal Functions
+%% -------------------------------------------------------------------------
+call_id(Mod, Config, Meta) when is_atom(Mod) ->
+    call_id({Mod, []}, Config, Meta);
+call_id({Mod, Opts}, Config, Scope) ->
+    Id = catch_apply(Mod,id,[Opts], make_ref()),
+    {Config, {Id, scope(Scope), {Mod, {Id,Opts}}}}.
+	
+call_init({Mod,{Id,Opts}},Config,_Meta) ->
+    NewState = Mod:init(Id, Opts),
+    {Config, {Mod, NewState}}.
+
+call_terminate({Mod, State}, _, _) ->
+    catch_apply(Mod,terminate,[State], ok),
+    {[],{Mod,State}}.
+
+call_cleanup({Mod, State}, Reason, [Function | Args]) ->
+    NewState = catch_apply(Mod,Function, Args ++ [Reason, State],
+			   State),
+    {Reason, {Mod, NewState}}.
+
+call_generic({Mod, State}, Value, [Function | Args]) ->
+    {NewValue, NewState} = catch_apply(Mod, Function, Args ++ [Value, State],
+				       {Value,State}),
+    {NewValue, {Mod, NewState}}.
+
+%% Generic call function
+call(Fun, Config, Meta) ->
+    maybe_lock(),
+    Hooks = get_hooks(),
+    Res = call([{HookId,Fun} || {HookId,_, _} <- Hooks] ++
+		   get_new_hooks(Config, Fun),
+	       remove(?config_name,Config), Meta, Hooks),
+    maybe_unlock(),
+    Res.
+
+call(Fun, Config, Meta, NoChangeRet) when is_function(Fun) ->
+    case call(Fun,Config,Meta) of
+	Config -> NoChangeRet;
+	NewReturn -> NewReturn
+    end;
+
+call([{Hook, call_id, NextFun} | Rest], Config, Meta, Hooks) ->
+    try
+	{Config, {NewId, _, _} = NewHook} = call_id(Hook, Config, Meta),
+	{NewHooks, NewRest} = 
+	    case lists:keyfind(NewId, 1, Hooks) of
+		false when NextFun =:= undefined ->
+		    {Hooks ++ [NewHook],
+		     [{NewId, fun call_init/3} | Rest]};
+		ExistingHook when is_tuple(ExistingHook) ->
+		    {Hooks, Rest};
+		_ ->
+		    {Hooks ++ [NewHook],
+		     [{NewId, fun call_init/3},{NewId,NextFun} | Rest]}
+	    end,
+	call(NewRest, Config, Meta, NewHooks)
+    catch Error:Reason ->
+	    Trace = erlang:get_stacktrace(),
+	    ct_logs:log("Suite Hook","Failed to start a CTH: ~p:~p",
+			[Error,{Reason,Trace}]),
+	    call([], {fail,"Failed to start CTH"
+		      ", see the CT Log for details"}, Meta, Hooks)
+    end;
+call([{HookId, Fun} | Rest], Config, Meta, Hooks) ->
+    try
+        {_,Scope,ModState} = lists:keyfind(HookId, 1, Hooks),
+        {NewConf, NewHookInfo} =  Fun(ModState, Config, Meta),
+        NewCalls = get_new_hooks(NewConf, Fun),
+        NewHooks = lists:keyreplace(HookId, 1, Hooks, {HookId, Scope, NewHookInfo}),
+        call(NewCalls  ++ Rest, remove(?config_name, NewConf), Meta,
+             terminate_if_scope_ends(HookId, Meta, NewHooks))
+    catch throw:{error_in_cth_call,Reason} ->
+            call(Rest, {fail, Reason}, Meta,
+                 terminate_if_scope_ends(HookId, Meta, Hooks))
+    end;
+call([], Config, _Meta, Hooks) ->
+    save_suite_data_async(Hooks),
+    Config.
+
+remove(Key,List) when is_list(List) ->
+    [Conf || Conf <- List, is_tuple(Conf) =:= false
+		 orelse element(1, Conf) =/= Key];
+remove(_, Else) ->
+    Else.
+
+%% Translate scopes, i.e. init_per_group,group1 -> end_per_group,group1 etc
+scope([pre_init_per_testcase, TC|_]) ->
+    [post_end_per_testcase, TC];
+scope([pre_init_per_group, GroupName|_]) ->
+    [post_end_per_group, GroupName];
+scope([post_init_per_group, GroupName|_]) ->
+    [post_end_per_group, GroupName];
+scope([pre_init_per_suite, SuiteName|_]) ->
+    [post_end_per_suite, SuiteName];
+scope([post_init_per_suite, SuiteName|_]) ->
+    [post_end_per_suite, SuiteName];
+scope(init) ->
+    none.
+
+terminate_if_scope_ends(HookId, [Function,Tag|T], Hooks) when T =/= [] ->
+    terminate_if_scope_ends(HookId,[Function,Tag],Hooks);
+terminate_if_scope_ends(HookId, Function, Hooks) ->
+    case lists:keyfind(HookId, 1, Hooks) of
+        {HookId, Function, _ModState} = Hook ->
+            terminate([Hook]),
+            lists:keydelete(HookId, 1, Hooks);
+        _ ->
+            Hooks
+    end.
+
+%% Fetch hook functions
+get_new_hooks(Config, Fun) ->
+    lists:foldl(fun(NewHook, Acc) ->
+			[{NewHook, call_id, Fun} | Acc]
+		end, [], get_new_hooks(Config)).
+
+get_new_hooks(Config) when is_list(Config) ->
+    lists:flatmap(fun({?config_name, HookConfigs}) ->
+			  HookConfigs;
+		     (_) ->
+			  []
+		  end, Config);
+get_new_hooks(_Config) ->
+    [].
+
+save_suite_data_async(Hooks) ->
+    ct_util:save_suite_data_async(?config_name, Hooks).
+
+get_hooks() ->
+    ct_util:read_suite_data(?config_name).
+
+catch_apply(M,F,A, Default) ->
+    try
+	apply(M,F,A)
+    catch error:Reason ->
+	    case erlang:get_stacktrace() of
+            %% Return the default if it was the CTH module which did not have the function.
+		[{M,F,A}|_] when Reason == undef ->
+		    Default;
+		Trace ->
+		    ct_logs:log("Suite Hook","Call to CTH failed: ~p:~p",
+				[error,{Reason,Trace}]),
+		    throw({error_in_cth_call,
+			   lists:flatten(
+			     io_lib:format("~p:~p/~p CTH call failed",
+					   [M,F,length(A)]))})
+	    end
+    end.
+
+
+%% We need to lock around the state for parallel groups only. This is because
+%% we will get several processes reading and writing the state for a single
+%% cth at the same time.
+maybe_start_locker(Mod,GroupName,Opts) ->
+    case lists:member(parallel,Opts) of
+	true ->
+	    {ok, _Pid} = ct_hooks_lock:start({Mod,GroupName});
+	false ->
+	    ok
+    end.
+
+maybe_stop_locker(Mod,GroupName,Opts) ->
+    case lists:member(parallel,Opts) of
+	true ->
+	    stopped = ct_hooks_lock:stop({Mod,GroupName});
+	false ->
+	    ok
+    end.
+
+
+maybe_lock() ->
+    locked = ct_hooks_lock:request().
+
+maybe_unlock() ->
+    unlocked = ct_hooks_lock:release().
diff --git a/lib/common_test/src/ct_hooks_lock.erl b/lib/common_test/src/ct_hooks_lock.erl
new file mode 100644
index 0000000000..98794201bb
--- /dev/null
+++ b/lib/common_test/src/ct_hooks_lock.erl
@@ -0,0 +1,132 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2010. 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%
+%%
+
+%%% @doc Common Test Framework test execution control module.
+%%%
+%%% <p>This module is a proxy for calling and handling locks in 
+%%%    common test hooks.</p>
+
+-module(ct_hooks_lock).
+
+-behaviour(gen_server).
+
+%% API
+-export([start/1, stop/1, request/0, release/0]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+-define(SERVER, ?MODULE). 
+
+-record(state, { id, locked = false, requests = [] }).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+%% @doc Starts the server
+start(Id) ->
+    case gen_server:start({local, ?SERVER}, ?MODULE, Id, []) of
+	{error,{already_started, Pid}} ->
+	    {ok,Pid};
+	Else ->
+	    Else
+    end.
+
+stop(Id) ->
+    try
+	gen_server:call(?SERVER, {stop,Id})
+    catch exit:{noproc,_} ->
+	    stopped
+    end.
+    
+request() ->
+    try
+	gen_server:call(?SERVER,{request,self()},infinity)
+    catch exit:{noproc,_} ->
+	    locked
+    end.
+
+release() ->
+    try
+	gen_server:call(?SERVER,{release,self()})
+    catch exit:{noproc,_} ->
+	    unlocked
+    end.
+
+%%%===================================================================
+%%% gen_server callbacks
+%%%===================================================================
+
+%% @doc Initiates the server
+init(Id) ->
+    {ok, #state{ id = Id }}.
+
+%% @doc Handling call messages
+handle_call({stop,Id}, _From, #state{ id = Id, requests = Reqs } = State) ->
+    [gen_server:reply(Req, locker_stopped) || {Req,_ReqId} <- Reqs],
+    {stop, normal, stopped, State};
+handle_call({stop,_Id}, _From, State) ->
+    {reply, stopped, State};
+handle_call({request, Pid}, _From, #state{ locked = false,
+					  requests = [] } = State) ->
+    Ref = monitor(process, Pid),
+    {reply, locked, State#state{ locked = {true, Pid, Ref}} };
+handle_call({request, Pid}, From, #state{ requests = Reqs } = State) ->
+    {noreply, State#state{ requests = Reqs ++ [{From,Pid}] }};
+handle_call({release, Pid}, _From, #state{ locked = {true, Pid, Ref},
+					  requests = []} = State) ->
+    demonitor(Ref,[flush]),
+    {reply, unlocked, State#state{ locked = false }};
+handle_call({release, Pid}, _From,
+	    #state{ locked = {true, Pid, Ref},
+		    requests = [{NextFrom,NextPid}|Rest]} = State) ->
+    demonitor(Ref,[flush]),
+    gen_server:reply(NextFrom,locked),
+    NextRef = monitor(process, NextPid),
+    {reply,unlocked,State#state{ locked = {true, NextPid, NextRef},
+				 requests = Rest } };
+handle_call({release, _Pid}, _From, State) ->
+    {reply, not_locked, State}.
+    
+%% @doc Handling cast messages
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+%% @doc Handling all non call/cast messages
+handle_info({'DOWN',Ref,process,Pid,_},
+	    #state{ locked = {true, Pid, Ref},
+		    requests = [{NextFrom,NextPid}|Rest] } = State) ->
+    gen_server:reply(NextFrom, locked),
+    NextRef = monitor(process, NextPid),
+    {noreply,State#state{ locked = {true, NextPid, NextRef},
+			  requests = Rest } }.
+
+%% @doc This function is called by a gen_server when it is about to terminate. 
+terminate(_Reason, _State) ->
+    ok.
+
+%% @doc Convert process state when code is changed
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%% -------------------------------------------------------------------------
+%% Internal Functions
+%% -------------------------------------------------------------------------
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index bd1a89ae1f..f8ace73cbf 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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%
 %%
 
@@ -36,7 +36,8 @@
 -export([make_all_suites_index/1,make_all_runs_index/1]).
 
 %% Logging stuff directly from testcase
--export([tc_log/3,tc_print/3,tc_pal/3]).
+-export([tc_log/3,tc_print/3,tc_pal/3,
+	 basic_html/0]).
 
 %% Simulate logger process for use without ct environment running
 -export([simulate/0]).
@@ -57,7 +58,7 @@
 -define(table_color2,"#E4F0FE").
 -define(table_color3,"#F0F8FF").
 
--define(testname_width, 70).
+-define(testname_width, 60).
 
 -define(abs(Name), filename:absname(Name)).
 
@@ -80,7 +81,7 @@ init(Mode) ->
     MRef = erlang:monitor(process,Pid),
     receive 
 	{started,Pid,Result} -> 
-	    erlang:demonitor(MRef),
+	    erlang:demonitor(MRef, [flush]),
 	    Result;
 	{'DOWN',MRef,process,_,Reason} ->
 	    exit({could_not_start_process,?MODULE,Reason})
@@ -163,7 +164,7 @@ call(Msg) ->
 	    ?MODULE ! {Msg,{self(),Ref}},
 	    receive
 		{Ref, Result} -> 
-		    erlang:demonitor(MRef),
+		    erlang:demonitor(MRef, [flush]),
 		    Result;
 		{'DOWN',MRef,process,_,Reason}  -> 
 		    {error,{process_down,?MODULE,Reason}}
@@ -383,11 +384,14 @@ maybe_log_timestamp() ->
 		  [{"<i>~s</i>",[log_timestamp({MS,S,US})]}]})
     end.
 
-log_timestamp(Now) ->
-    put(log_timestamp,Now),
-    {_,{H,M,S}} = calendar:now_to_local_time(Now),
-    lists:flatten(io_lib:format("~2.2.0w:~2.2.0w:~2.2.0w",
-				[H,M,S])).
+log_timestamp({MS,S,US}) ->
+    put(log_timestamp, {MS,S,US}),
+    {{Year,Month,Day}, {Hour,Min,Sec}} =
+        calendar:now_to_local_time({MS,S,US}),
+    MilliSec = trunc(US/1000),
+    lists:flatten(io_lib:format("~4.10.0B-~2.10.0B-~2.10.0B "
+                                "~2.10.0B:~2.10.0B:~2.10.0B.~3.10.0B",
+                                [Year,Month,Day,Hour,Min,Sec,MilliSec])).
 
 %%%-----------------------------------------------------------------
 %%% The logger server
@@ -460,9 +464,11 @@ logger_loop(State) ->
 					    {'EXIT',_Reason} ->
 						Fd = State#logger_state.ct_log_fd,
 						io:format(Fd, 
-							  "Logging fails! Str: ~p, Args: ~p~n",
+							  "Logging fails! "
+							  "Str: ~p, Args: ~p~n",
 							  [Str,Args]),
-						%% stop the testcase, we need to see the fault
+						%% stop the testcase, we need
+						%% to see the fault
 						exit(Pid,logging_failed),
 						ok;
 					    IoStr when IoList == [] ->
@@ -505,7 +511,7 @@ logger_loop(State) ->
 	    logger_loop(State);
 	{set_stylesheet,TC,SSFile} ->
 	    Fd = State#logger_state.ct_log_fd,
-	    io:format(Fd, "~p uses external style sheet: ~s~n", [TC,SSFile]),
+	    io:format(Fd, "~p loading external style sheet: ~s~n", [TC,SSFile]),
 	    logger_loop(State#logger_state{stylesheet=SSFile});
 	{clear_stylesheet,_} when State#logger_state.stylesheet == undefined ->
 	    logger_loop(State);
@@ -716,7 +722,7 @@ make_last_run_index1(StartTime,IndexName) ->
 		[Log];
 	    Logs ->
 		case read_totals_file(?totals_name) of
-		    {_Node,Logs0,_Totals} ->
+		    {_Node,_Lbl,Logs0,_Totals} ->
 			insert_dirs(Logs,Logs0);
 		    _ ->
 			%% someone deleted the totals file!?
@@ -728,10 +734,15 @@ make_last_run_index1(StartTime,IndexName) ->
 	    {ok,Bin} -> binary_to_term(Bin);
 	    _ -> []
 	end,
-    {ok,Index0,Totals} = make_last_run_index(Logs1, index_header(StartTime),
+    Label = case application:get_env(common_test, test_label) of
+		{ok,Lbl} -> Lbl;
+		_ -> undefined
+	    end,
+    {ok,Index0,Totals} = make_last_run_index(Logs1,
+					     index_header(Label,StartTime),
 					     0, 0, 0, 0, 0, Missing),
     %% write current Totals to file, later to be used in all_runs log
-    write_totals_file(?totals_name,Logs1,Totals),
+    write_totals_file(?totals_name,Label,Logs1,Totals),
     Index = [Index0|index_footer()],
     case force_write_file(IndexName, Index) of
 	ok ->
@@ -761,7 +772,7 @@ make_last_run_index([Name|Rest], Result, TotSucc, TotFail, UserSkip, AutoSkip,
 				TotNotBuilt, Missing);
 	LastLogDir ->
 	    SuiteName = filename:rootname(filename:basename(Name)),
-	    case make_one_index_entry(SuiteName, LastLogDir, false, Missing) of
+	    case make_one_index_entry(SuiteName, LastLogDir, "-", false, Missing) of
 		{Result1,Succ,Fail,USkip,ASkip,NotBuilt} ->
 		    %% for backwards compatibility
 		    AutoSkip1 = case catch AutoSkip+ASkip of
@@ -780,18 +791,18 @@ make_last_run_index([], Result, TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuil
     {ok, [Result|total_row(TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt, false)],
      {TotSucc,TotFail,UserSkip,AutoSkip,TotNotBuilt}}.
 
-make_one_index_entry(SuiteName, LogDir, All, Missing) ->
+make_one_index_entry(SuiteName, LogDir, Label, All, Missing) ->
     case count_cases(LogDir) of
 	{Succ,Fail,UserSkip,AutoSkip} ->
 	    NotBuilt = not_built(SuiteName, LogDir, All, Missing),
-	    NewResult = make_one_index_entry1(SuiteName, LogDir, Succ, Fail, 
+	    NewResult = make_one_index_entry1(SuiteName, LogDir, Label, Succ, Fail,
 					      UserSkip, AutoSkip, NotBuilt, All),
 	    {NewResult,Succ,Fail,UserSkip,AutoSkip,NotBuilt};
 	error ->
 	    error
     end.
 
-make_one_index_entry1(SuiteName, Link, Success, Fail, UserSkip, AutoSkip, 
+make_one_index_entry1(SuiteName, Link, Label, Success, Fail, UserSkip, AutoSkip,
 		      NotBuilt, All) ->
     LogFile = filename:join(Link, ?suitelog_name ++ ".html"),
     CrashDumpName = SuiteName ++ "_erl_crash.dump",
@@ -803,7 +814,7 @@ make_one_index_entry1(SuiteName, Link, Success, Fail, UserSkip, AutoSkip,
 	    false ->
 		""
 	end,
-    {Timestamp,Node,AllInfo} = 
+    {Lbl,Timestamp,Node,AllInfo} =
 	case All of
 	    {true,OldRuns} -> 
 		[_Prefix,NodeOrDate|_] = string:tokens(Link,"."),
@@ -811,20 +822,21 @@ make_one_index_entry1(SuiteName, Link, Success, Fail, UserSkip, AutoSkip,
 			    0 -> "-";
 			    _ -> NodeOrDate
 			end,
-		N = ["<TD ALIGN=right>",Node1,"</TD>\n"],
+		N = ["<TD ALIGN=right><FONT SIZE=-1>",Node1,"</FONT></TD>\n"],
 		CtRunDir = filename:dirname(filename:dirname(Link)),
-		T = ["<TD>",timestamp(CtRunDir),"</TD>\n"],
+		L = ["<TD ALIGN=center><FONT SIZE=-1><B>",Label,"</FONT></B></TD>\n"],
+		T = ["<TD><FONT SIZE=-1>",timestamp(CtRunDir),"</FONT></TD>\n"],
 		CtLogFile = filename:join(CtRunDir,?ct_log_name),
 		OldRunsLink = 
 		    case OldRuns of
 			[] -> "none";
 			_ ->  "<A HREF=\""++?all_runs_name++"\">Old Runs</A>"
 		    end,
-		A=["<TD><A HREF=\"",CtLogFile,"\">CT Log</A></TD>\n",
-		   "<TD>",OldRunsLink,"</TD>\n"],
-		{T,N,A};
+		A=["<TD><FONT SIZE=-1><A HREF=\"",CtLogFile,"\">CT Log</A></FONT></TD>\n",
+		   "<TD><FONT SIZE=-1>",OldRunsLink,"</FONT></TD>\n"],
+		{L,T,N,A};
 	    false ->
-		{"","",""}
+		{"","","",""}
 	end,
     NotBuiltStr =
 	if NotBuilt == 0 ->
@@ -851,7 +863,8 @@ make_one_index_entry1(SuiteName, Link, Success, Fail, UserSkip, AutoSkip,
 		{UserSkip+AutoSkip,integer_to_list(UserSkip),ASStr}
 	end,
     ["<TR valign=top>\n",
-     "<TD><A HREF=\"",LogFile,"\">",SuiteName,"</A>",CrashDumpLink,"</TD>\n",
+     "<TD><FONT SIZE=-1><A HREF=\"",LogFile,"\">",SuiteName,"</A>",CrashDumpLink,"</FONT></TD>\n",
+     Lbl,
      Timestamp,
      "<TD ALIGN=right>",integer_to_list(Success),"</TD>\n",
      "<TD ALIGN=right>",FailStr,"</TD>\n",
@@ -862,12 +875,14 @@ make_one_index_entry1(SuiteName, Link, Success, Fail, UserSkip, AutoSkip,
      AllInfo,
      "</TR>\n"].
 total_row(Success, Fail, UserSkip, AutoSkip, NotBuilt, All) ->
-    {TimestampCell,AllInfo} = 
+    {Label,TimestampCell,AllInfo} =
 	case All of
-	    true -> 
-		{"<TD>&nbsp;</TD>\n","<TD>&nbsp;</TD>\n<TD>&nbsp;</TD>\n"};
+	    true ->
+		{"<TD>&nbsp;</TD>\n",
+		 "<TD>&nbsp;</TD>\n",
+		 "<TD>&nbsp;</TD>\n<TD>&nbsp;</TD>\n"};
 	    false ->
-		{"",""}
+		{"","",""}
 	end,
 
     {AllSkip,UserSkipStr,AutoSkipStr} =
@@ -877,6 +892,7 @@ total_row(Success, Fail, UserSkip, AutoSkip, NotBuilt, All) ->
 	end,
     ["<TR valign=top>\n",
      "<TD><B>Total</B></TD>",
+     Label,
      TimestampCell,
      "<TD ALIGN=right><B>",integer_to_list(Success),"<B></TD>\n",
      "<TD ALIGN=right><B>",integer_to_list(Fail),"<B></TD>\n",
@@ -937,13 +953,21 @@ term_to_text(Term) ->
 
 %%% Headers and footers.
 
-index_header(StartTime) ->
-    [header("Test Results " ++ format_time(StartTime)) | 
+index_header(Label, StartTime) ->
+    Head =
+	case Label of
+	    undefined ->
+		header("Test Results", format_time(StartTime));
+	    _ ->
+		header("Test Results for \"" ++ Label ++ "\"",
+		       format_time(StartTime))
+	end,
+    [Head |
      ["<CENTER>\n",
       "<P><A HREF=\"",?ct_log_name,"\">Common Test Framework Log</A></P>",
       "<TABLE border=\"3\" cellpadding=\"5\" "
       "BGCOLOR=\"",?table_color3,"\">\n"
-      "<th><B>Name</B></th>\n",
+      "<th><B>Test Name</B></th>\n",
             "<th><font color=\"",?table_color3,"\">_</font>Ok"
           "<font color=\"",?table_color3,"\">_</font></th>\n"
       "<th>Failed</th>\n",
@@ -952,13 +976,17 @@ index_header(StartTime) ->
       "\n"]].
 
 all_suites_index_header() ->
+    {ok,Cwd} = file:get_cwd(),
+    LogDir = filename:basename(Cwd),
+    AllRuns = "All test runs in \"" ++ LogDir ++ "\"",
     [header("Test Results") | 
      ["<CENTER>\n",
-      "<A HREF=\"",?all_runs_name,"\">All Test Runs in this directory</A>\n",
+      "<A HREF=\"",?all_runs_name,"\">",AllRuns,"</A>\n",
       "<br><br>\n",
       "<TABLE border=\"3\" cellpadding=\"5\" "
       "BGCOLOR=\"",?table_color2,"\">\n"
-      "<th>Name</th>\n",
+      "<th>Test Name</th>\n",
+      "<th>Label</th>\n",
       "<th>Test Run Started</th>\n",
       "<th><font color=\"",?table_color2,"\">_</font>Ok"
           "<font color=\"",?table_color2,"\">_</font></th>\n"
@@ -971,13 +999,17 @@ all_suites_index_header() ->
       "\n"]].
 
 all_runs_header() ->
-    [header("All test runs in current directory") |
+    {ok,Cwd} = file:get_cwd(),
+    LogDir = filename:basename(Cwd),
+    Title = "All test runs in \"" ++ LogDir ++ "\"",
+    [header(Title) |
      ["<CENTER><TABLE border=\"3\" cellpadding=\"5\" "
       "BGCOLOR=\"",?table_color1,"\">\n"
       "<th><B>History</B></th>\n"
       "<th><B>Node</B></th>\n"
+      "<th><B>Label</B></th>\n"
       "<th>Tests</th>\n"
-      "<th><B>Names</B></th>\n"
+      "<th><B>Test Names</B></th>\n"
       "<th>Total</th>\n"
       "<th><font color=\"",?table_color1,"\">_</font>Ok"
           "<font color=\"",?table_color1,"\">_</font></th>\n"
@@ -987,12 +1019,23 @@ all_runs_header() ->
       "\n"]].
 
 header(Title) ->
+    header1(Title, "").
+header(Title, SubTitle) ->
+    header1(Title, SubTitle).
+
+header1(Title, SubTitle) ->
+    SubTitleHTML = if SubTitle =/= "" ->
+			   ["<CENTER>\n",
+			    "<H2>" ++ SubTitle ++ "</H2>\n",
+			    "</CENTER>\n<BR>\n"];
+		      true -> "<BR>\n"
+		   end,
     ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"
      "<!-- autogenerated by '"++atom_to_list(?MODULE)++"'. -->\n"
      "<HTML>\n",
      "<HEAD>\n",
 
-     "<TITLE>" ++ Title ++ "</TITLE>\n",
+     "<TITLE>" ++ Title ++ " " ++ SubTitle ++ "</TITLE>\n",
      "<META HTTP-EQUIV=\"CACHE-CONTROL\" CONTENT=\"NO-CACHE\">\n",
 
      "</HEAD>\n",
@@ -1004,6 +1047,7 @@ header(Title) ->
      "<CENTER>\n",
      "<H1>" ++ Title ++ "</H1>\n",
      "</CENTER>\n",
+     SubTitleHTML,
 
      "<!-- ---- CONTENT ---- -->\n"].
 
@@ -1013,19 +1057,28 @@ index_footer() ->
 
 footer() ->
      ["<P><CENTER>\n"
-     "<HR>\n"
-     "<P><FONT SIZE=-1>\n"
-     "Copyright &copy; ", year(),
-     " <A HREF=\"http://erlang.ericsson.se\">Open Telecom Platform</A><BR>\n"
-     "Updated: <!date>", current_time(), "<!/date><BR>\n"
-     "</FONT>\n"
-     "</CENTER>\n"
-     "</body>\n"].
+      "<BR><BR>\n"
+      "<HR>\n"
+      "<P><FONT SIZE=-1>\n"
+      "Copyright &copy; ", year(),
+      " <A HREF=\"http://erlang.ericsson.se\">Open Telecom Platform</A><BR>\n"
+      "Updated: <!date>", current_time(), "<!/date><BR>\n"
+      "</FONT>\n"
+      "</CENTER>\n"
+      "</body>\n"].
 
 
 body_tag() ->
-    "<body bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#0000FF\""
-	"vlink=\"#800080\" alink=\"#FF0000\">\n".
+    case basic_html() of
+	true ->
+	    "<body bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#0000FF\" "
+		"vlink=\"#800080\" alink=\"#FF0000\">\n";
+	false ->
+	    CTPath = code:lib_dir(common_test),
+	    TileFile = filename:join(filename:join(CTPath,"priv"),"tile1.jpg"),
+	    "<body background=\"" ++ TileFile ++ "\" bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#0000FF\" "
+		"vlink=\"#800080\" alink=\"#FF0000\">\n"
+    end.
 
 current_time() ->
     format_time(calendar:local_time()).
@@ -1217,7 +1270,7 @@ runentry(Dir, BasicHtml) ->
     TotalsFile = filename:join(Dir,?totals_name),
     TotalsStr =
 	case read_totals_file(TotalsFile) of
-	    {Node,Logs,{TotSucc,TotFail,UserSkip,AutoSkip,NotBuilt}} ->
+	    {Node,Label,Logs,{TotSucc,TotFail,UserSkip,AutoSkip,NotBuilt}} ->
 		TotFailStr =
 		    if TotFail > 0 ->  
 			    ["<FONT color=\"red\">",
@@ -1263,6 +1316,7 @@ runentry(Dir, BasicHtml) ->
 		    end,
 		Total = TotSucc+TotFail+AllSkip,
 		A = ["<TD ALIGN=center><FONT SIZE=-1>",Node,"</FONT></TD>\n",
+		     "<TD ALIGN=center><FONT SIZE=-1><B>",Label,"</B></FONT></TD>\n",
 		     "<TD ALIGN=right>",NoOfTests,"</TD>\n"],
 		B = if BasicHtml ->
 			    ["<TD ALIGN=center><FONT SIZE=-1>",TestNamesTrunc,"</FONT></TD>\n"];
@@ -1283,17 +1337,19 @@ runentry(Dir, BasicHtml) ->
 	end,	    
     Index = filename:join(Dir,?index_name),
     ["<TR>\n"
-     "<TD><A HREF=\"",Index,"\">",timestamp(Dir),"</A>",TotalsStr,"</TD>\n"
+     "<TD><FONT SIZE=-1><A HREF=\"",Index,"\">",timestamp(Dir),"</A>",TotalsStr,"</FONT></TD>\n"
      "</TR>\n"].
 
-write_totals_file(Name,Logs,Totals) ->
+write_totals_file(Name,Label,Logs,Totals) ->
     AbsName = ?abs(Name),
     notify_and_lock_file(AbsName),
     force_write_file(AbsName,
 		     term_to_binary({atom_to_list(node()),
-				     Logs,Totals})),
+				     Label,Logs,Totals})),
     notify_and_unlock_file(AbsName).
 
+%% this function needs to convert from old formats to new so that old
+%% test results (prev ct versions) can be listed together with new
 read_totals_file(Name) ->
     AbsName = ?abs(Name),
     notify_and_lock_file(AbsName),
@@ -1303,12 +1359,23 @@ read_totals_file(Name) ->
 		case catch binary_to_term(Bin) of
 		    {'EXIT',_Reason} ->		% corrupt file
 			{"-",[],undefined};
-		    R = {Node,Ls,Tot} -> 
+		    {Node,Label,Ls,Tot} ->	% all info available
+			Label1 = case Label of
+				     undefined -> "-";
+				     _         -> Label
+				 end,
 			case Tot of
-			    {_,_,_,_,_} ->	% latest format
-				R;		
+			    {_Ok,_Fail,_USkip,_ASkip,_NoBuild} ->  % latest format
+				{Node,Label1,Ls,Tot};
 			    {TotSucc,TotFail,AllSkip,NotBuilt} ->
-				{Node,Ls,{TotSucc,TotFail,AllSkip,undefined,NotBuilt}}
+				{Node,Label1,Ls,{TotSucc,TotFail,AllSkip,undefined,NotBuilt}}
+			end;
+		    {Node,Ls,Tot} ->		% no label found
+			case Tot of
+			    {_Ok,_Fail,_USkip,_ASkip,_NoBuild} ->  % latest format
+				{Node,"-",Ls,Tot};
+			    {TotSucc,TotFail,AllSkip,NotBuilt} ->
+				{Node,"-",Ls,{TotSucc,TotFail,AllSkip,undefined,NotBuilt}}
 			end;
 		    %% for backwards compatibility
 		    {Ls,Tot}    -> {"-",Ls,Tot};
@@ -1411,7 +1478,7 @@ make_all_suites_index1(When,AllSuitesLogDirs) ->
 make_all_suites_index2(IndexName,AllSuitesLogDirs) ->
     {ok,Index0,_Totals} = make_all_suites_index3(AllSuitesLogDirs,
 						 all_suites_index_header(),
-						 0, 0, 0, 0, 0),
+						 0, 0, 0, 0, 0, []),
     Index = [Index0|index_footer()],
     case force_write_file(IndexName, Index) of
 	ok ->
@@ -1421,14 +1488,25 @@ make_all_suites_index2(IndexName,AllSuitesLogDirs) ->
     end.
 
 make_all_suites_index3([{SuiteName,[LastLogDir|OldDirs]}|Rest],
-		       Result, TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt) ->
+		       Result, TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt,
+		       Labels) ->
     [EntryDir|_] = filename:split(LastLogDir),
     Missing = 
 	case file:read_file(filename:join(EntryDir,?missing_suites_info)) of
 	    {ok,Bin} -> binary_to_term(Bin);
 	    _ -> []
 	end,
-    case make_one_index_entry(SuiteName, LastLogDir, {true,OldDirs}, Missing) of
+    {Label,Labels1} =
+	case proplists:get_value(EntryDir, Labels) of
+	    undefined ->
+		case read_totals_file(filename:join(EntryDir,?totals_name)) of
+		    {_,Lbl,_,_} -> {Lbl,[{EntryDir,Lbl}|Labels]};
+		    _           -> {"-",[{EntryDir,"-"}|Labels]}
+		end;
+	    Lbl ->
+		{Lbl,Labels}
+	end,
+    case make_one_index_entry(SuiteName, LastLogDir, Label, {true,OldDirs}, Missing) of
 	{Result1,Succ,Fail,USkip,ASkip,NotBuilt} ->
 	    %% for backwards compatibility
 	    AutoSkip1 = case catch AutoSkip+ASkip of
@@ -1437,13 +1515,13 @@ make_all_suites_index3([{SuiteName,[LastLogDir|OldDirs]}|Rest],
 			end,
 	    make_all_suites_index3(Rest, [Result|Result1], TotSucc+Succ, 
 				   TotFail+Fail, UserSkip+USkip, AutoSkip1,
-				   TotNotBuilt+NotBuilt);
+				   TotNotBuilt+NotBuilt,Labels1);
 	error ->
 	    make_all_suites_index3(Rest, Result, TotSucc, TotFail, 
-				   UserSkip, AutoSkip, TotNotBuilt)
+				   UserSkip, AutoSkip, TotNotBuilt,Labels1)
     end;
 make_all_suites_index3([], Result, TotSucc, TotFail, UserSkip, AutoSkip, 
-		       TotNotBuilt) ->
+		       TotNotBuilt,_) ->
     {ok, [Result|total_row(TotSucc, TotFail, UserSkip, AutoSkip, TotNotBuilt,true)], 
      {TotSucc,TotFail,UserSkip,AutoSkip,TotNotBuilt}}.
 
diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl
index 7eb2c3cfef..2ea2ba106a 100644
--- a/lib/common_test/src/ct_master.erl
+++ b/lib/common_test/src/ct_master.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2006-2010. 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%
 %%
 
@@ -28,7 +28,7 @@
 
 -export([abort/0,abort/1,progress/0]).
 
--export([init_master/6, init_node_ctrl/3]).
+-export([init_master/7, init_node_ctrl/3]).
 
 -export([status/2]).
 
@@ -49,7 +49,8 @@
 %%%   OptTuples = {config,CfgFiles} | {dir,TestDirs} | {suite,Suites} |
 %%%               {testcase,Cases} | {spec,TestSpecs} | {allow_user_terms,Bool} | 
 %%%               {logdir,LogDir} | {event_handler,EventHandlers} | 
-%%%               {silent_connections,Conns} | {cover,CoverSpecFile}
+%%%               {silent_connections,Conns} | {cover,CoverSpecFile} |
+%%%		  {userconfig, UserCfgFiles}
 %%%       CfgFiles = string() | [string()]
 %%%       TestDirs = string() | [string()]
 %%%       Suites = atom() | [atom()]
@@ -98,11 +99,16 @@ run([TS|TestSpecs],AllowUserTerms,InclNodes,ExclNodes) when is_list(TS),
 	    {error,Reason} ->
 		{error,Reason};
 	    TSRec=#testspec{logdir=AllLogDirs,
-			    config=AllCfgFiles,
+			    config=StdCfgFiles,
+			    userconfig=UserCfgFiles,
+			    include=AllIncludes,
+			    init=AllInitOpts,
 			    event_handler=AllEvHs} ->
+	        AllCfgFiles = {StdCfgFiles, UserCfgFiles},
 		RunSkipPerNode = ct_testspec:prepare_tests(TSRec),
 		RunSkipPerNode2 = exclude_nodes(ExclNodes,RunSkipPerNode),
-		run_all(RunSkipPerNode2,AllLogDirs,AllCfgFiles,AllEvHs,[],[],TS1)
+		run_all(RunSkipPerNode2,AllLogDirs,AllCfgFiles,AllEvHs,
+			AllIncludes,[],[],AllInitOpts,TS1)
 	end,
     [{TS,Result} | run(TestSpecs,AllowUserTerms,InclNodes,ExclNodes)];
 run([],_,_,_) ->
@@ -157,10 +163,15 @@ run_on_node([TS|TestSpecs],AllowUserTerms,Node) when is_list(TS),is_atom(Node) -
 	    {error,Reason} ->
 		{error,Reason};
 	    TSRec=#testspec{logdir=AllLogDirs,
-			    config=AllCfgFiles,
+			    config=StdCfgFiles,
+			    init=AllInitOpts,
+			    include=AllIncludes,
+			    userconfig=UserCfgFiles,
 			    event_handler=AllEvHs} ->
+	        AllCfgFiles = {StdCfgFiles, UserCfgFiles},
 		{Run,Skip} = ct_testspec:prepare_tests(TSRec,Node),
-		run_all([{Node,Run,Skip}],AllLogDirs,AllCfgFiles,AllEvHs,[],[],TS1)
+		run_all([{Node,Run,Skip}],AllLogDirs,AllCfgFiles,AllEvHs,
+			AllIncludes, [],[],AllInitOpts,TS1)
 	end,
     [{TS,Result} | run_on_node(TestSpecs,AllowUserTerms,Node)];
 run_on_node([],_,_) ->
@@ -180,7 +191,9 @@ run_on_node(TestSpecs,Node) ->
 
 
 
-run_all([{Node,Run,Skip}|Rest],AllLogDirs,AllCfgFiles,AllEvHs,NodeOpts,LogDirs,Specs) ->
+run_all([{Node,Run,Skip}|Rest],AllLogDirs,
+	{AllStdCfgFiles, AllUserCfgFiles}=AllCfgFiles,
+	AllEvHs,AllIncludes,NodeOpts,LogDirs,InitOptions,Specs) ->
     LogDir =
 	lists:foldl(fun({N,Dir},_Found) when N == Node ->
 			    Dir;
@@ -191,29 +204,47 @@ run_all([{Node,Run,Skip}|Rest],AllLogDirs,AllCfgFiles,AllEvHs,NodeOpts,LogDirs,S
 		       (_Dir,Found) ->
 			    Found
 		    end,".",AllLogDirs),
-    CfgFiles =
+
+    StdCfgFiles =
 	lists:foldr(fun({N,F},Fs) when N == Node -> [F|Fs];
 		       ({_N,_F},Fs) -> Fs;
 		       (F,Fs) -> [F|Fs]
-		    end,[],AllCfgFiles),
+		    end,[],AllStdCfgFiles),
+    UserCfgFiles =
+         lists:foldr(fun({N,F},Fs) when N == Node -> [{userconfig, F}|Fs];
+		       ({_N,_F},Fs) -> Fs;
+		       (F,Fs) -> [{userconfig, F}|Fs]
+		    end,[],AllUserCfgFiles),
+    
+    Includes = lists:foldr(fun({N,I},Acc) when N =:= Node ->
+				   [I|Acc];
+			      ({_,_},Acc) ->
+				   Acc;
+			      (I,Acc) ->
+				   [I | Acc]
+			   end, [], AllIncludes),
     EvHs =
 	lists:foldr(fun({N,H,A},Hs) when N == Node -> [{H,A}|Hs];
 		       ({_N,_H,_A},Hs) -> Hs;
 		       ({H,A},Hs) -> [{H,A}|Hs]
 		    end,[],AllEvHs),
+
     NO = {Node,[{prepared_tests,{Run,Skip},Specs},
 		{logdir,LogDir},
-		{config,CfgFiles},
-		{event_handler,EvHs}]},
-    run_all(Rest,AllLogDirs,AllCfgFiles,AllEvHs,[NO|NodeOpts],[LogDir|LogDirs],Specs);
-run_all([],AllLogDirs,_,AllEvHs,NodeOpts,LogDirs,Specs) ->
+		{include, Includes},
+		{config,StdCfgFiles},
+		{event_handler,EvHs}] ++ UserCfgFiles},
+    run_all(Rest,AllLogDirs,AllCfgFiles,AllEvHs,AllIncludes,
+	    [NO|NodeOpts],[LogDir|LogDirs],InitOptions,Specs);
+run_all([],AllLogDirs,_,AllEvHs,_AllIncludes,
+	NodeOpts,LogDirs,InitOptions,Specs) ->
     Handlers = [{H,A} || {Master,H,A} <- AllEvHs, Master == master],
     MasterLogDir = case lists:keysearch(master,1,AllLogDirs) of
 		       {value,{_,Dir}} -> Dir;
 		       false -> "."
 		   end,
     log(tty,"Master Logdir","~s",[MasterLogDir]),
-    start_master(lists:reverse(NodeOpts),Handlers,MasterLogDir,LogDirs,Specs),
+    start_master(lists:reverse(NodeOpts),Handlers,MasterLogDir,LogDirs,InitOptions,Specs),
     ok.
     
 
@@ -251,17 +282,17 @@ progress() ->
 %%% MASTER, runs on central controlling node.
 %%%-----------------------------------------------------------------
 start_master(NodeOptsList) ->
-    start_master(NodeOptsList,[],".",[],[]).
+    start_master(NodeOptsList,[],".",[],[],[]).
 
-start_master(NodeOptsList,EvHandlers,MasterLogDir,LogDirs,Specs) ->
+start_master(NodeOptsList,EvHandlers,MasterLogDir,LogDirs,InitOptions,Specs) ->
     Master = spawn_link(?MODULE,init_master,[self(),NodeOptsList,EvHandlers,
-					     MasterLogDir,LogDirs,Specs]),
+					     MasterLogDir,LogDirs,InitOptions,Specs]),
     receive 
 	{Master,Result} -> Result
     end.	    
 
 %%% @hidden
-init_master(Parent,NodeOptsList,EvHandlers,MasterLogDir,LogDirs,Specs) ->
+init_master(Parent,NodeOptsList,EvHandlers,MasterLogDir,LogDirs,InitOptions,Specs) ->
     case whereis(ct_master) of
 	undefined ->
 	    register(ct_master,self()),
@@ -314,10 +345,10 @@ init_master(Parent,NodeOptsList,EvHandlers,MasterLogDir,LogDirs,Specs) ->
 	Pid when is_pid(Pid) ->
 	    ok
     end,
-    init_master1(Parent,NodeOptsList,LogDirs).
+    init_master1(Parent,NodeOptsList,InitOptions,LogDirs).
 
-init_master1(Parent,NodeOptsList,LogDirs) ->
-    {Inaccessible,NodeOptsList1} = ping_nodes(NodeOptsList,[],[]),
+init_master1(Parent,NodeOptsList,InitOptions,LogDirs) ->
+    {Inaccessible,NodeOptsList1,InitOptions1} = init_nodes(NodeOptsList,InitOptions),
     case Inaccessible of
 	[] ->
 	    init_master2(Parent,NodeOptsList,LogDirs);
@@ -331,7 +362,7 @@ init_master1(Parent,NodeOptsList,LogDirs) ->
 			"Proceeding without: ~p",[Inaccessible]),
 		    init_master2(Parent,NodeOptsList1,LogDirs);
 		"r\n" ->
-		    init_master1(Parent,NodeOptsList,LogDirs);
+		    init_master1(Parent,NodeOptsList,InitOptions1,LogDirs);
 		_ ->
 		    log(html,"Aborting Tests","",[]),
 		    ct_master_event:stop(),
@@ -542,6 +573,9 @@ get_pid(Node,NodeCtrlPids) ->
 	    undefined
     end.
 
+ping_nodes(NodeOptions)->
+    ping_nodes(NodeOptions, [], []).
+
 ping_nodes([NO={Node,_Opts}|NOs],Inaccessible,NodeOpts) ->
     case net_adm:ping(Node) of
 	pong ->
@@ -678,13 +712,80 @@ call(Pid,Msg) ->
 		 {'DOWN', Ref, _, _, _} ->
 		     {error,master_died}
 	     end,	    
-    erlang:demonitor(Ref),
+    erlang:demonitor(Ref, [flush]),
     Return.
 
 reply(Result,To) ->
     To ! {self(),Result},
     ok.
 
+init_nodes(NodeOptions, InitOptions)->
+    ping_nodes(NodeOptions),
+    start_nodes(InitOptions),
+    eval_on_nodes(InitOptions),
+    {Inaccessible, NodeOptions1}=ping_nodes(NodeOptions),
+    InitOptions1 = filter_accessible(InitOptions, Inaccessible),
+    {Inaccessible, NodeOptions1, InitOptions1}.
+
+% only nodes which are inaccessible now, should be initiated later
+filter_accessible(InitOptions, Inaccessible)->
+    [{Node,Option}||{Node,Option}<-InitOptions, lists:member(Node, Inaccessible)].
+
+start_nodes(InitOptions)->
+    lists:foreach(fun({NodeName, Options})->
+	[NodeS,HostS]=string:tokens(atom_to_list(NodeName), "@"),
+	Node=list_to_atom(NodeS),
+	Host=list_to_atom(HostS),
+	HasNodeStart = lists:keymember(node_start, 1, Options),
+	IsAlive = lists:member(NodeName, nodes()),
+	case {HasNodeStart, IsAlive} of
+	    {false, false}->
+		io:format("WARNING: Node ~p is not alive but has no node_start option~n", [NodeName]);
+	    {false, true}->
+		io:format("Node ~p is alive~n", [NodeName]);
+	    {true, false}->
+		{node_start, NodeStart} = lists:keyfind(node_start, 1, Options),
+		{value, {callback_module, Callback}, NodeStart2}=
+		    lists:keytake(callback_module, 1, NodeStart),
+		case Callback:start(Host, Node, NodeStart2) of
+		    {ok, NodeName} ->
+			io:format("Node ~p started successfully with callback ~p~n", [NodeName,Callback]);
+		    {error, Reason, _NodeName} ->
+			io:format("Failed to start node ~p with callback ~p! Reason: ~p~n", [NodeName, Callback, Reason])
+		end;
+	    {true, true}->
+		io:format("WARNING: Node ~p is alive but has node_start option~n", [NodeName])
+	end
+    end,
+    InitOptions).
+
+eval_on_nodes(InitOptions)->
+    lists:foreach(fun({NodeName, Options})->
+	HasEval = lists:keymember(eval, 1, Options),
+	IsAlive = lists:member(NodeName, nodes()),
+	case {HasEval, IsAlive} of
+	    {false,_}->
+		ok;
+	    {true,false}->
+		io:format("WARNING: Node ~p is not alive but has eval option ~n", [NodeName]);
+	    {true,true}->
+		{eval, MFAs} = lists:keyfind(eval, 1, Options),
+		evaluate(NodeName, MFAs)
+        end
+    end,
+    InitOptions).
+
+evaluate(Node, [{M,F,A}|MFAs])->
+    case rpc:call(Node, M, F, A) of
+        {badrpc,Reason}->
+	    io:format("WARNING: Failed to call ~p:~p/~p on node ~p due to ~p~n", [M,F,length(A),Node,Reason]);
+	Result->
+	    io:format("Called ~p:~p/~p on node ~p, result: ~p~n", [M,F,length(A),Node,Result])
+    end,
+    evaluate(Node, MFAs);
+evaluate(_Node, [])->
+    ok.
+
 %cast(Msg) ->
 %    cast(whereis(ct_master),Msg).
 
diff --git a/lib/common_test/src/ct_master_logs.erl b/lib/common_test/src/ct_master_logs.erl
index 63f60b1182..244faace06 100644
--- a/lib/common_test/src/ct_master_logs.erl
+++ b/lib/common_test/src/ct_master_logs.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2006-2010. 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%
 %%
 
@@ -44,7 +44,7 @@ start(LogDir,Nodes) ->
     MRef = erlang:monitor(process,Pid),
     receive 
 	{started,Pid,Result} -> 
-	    erlang:demonitor(MRef),
+	    erlang:demonitor(MRef, [flush]),
 	    {Pid,Result};
 	{'DOWN',MRef,process,_,Reason} ->
 	    exit({could_not_start_process,?MODULE,Reason})
@@ -435,7 +435,7 @@ call(Msg) ->
 	    ?MODULE ! {Msg,{self(),Ref}},
 	    receive
 		{Ref, Result} -> 
-		    erlang:demonitor(MRef),
+		    erlang:demonitor(MRef, [flush]),
 		    Result;
 		{'DOWN',MRef,process,_,Reason}  -> 
 		    {error,{process_down,?MODULE,Reason}}
diff --git a/lib/common_test/src/ct_repeat.erl b/lib/common_test/src/ct_repeat.erl
index 7ac6e045d7..be3c485b75 100644
--- a/lib/common_test/src/ct_repeat.erl
+++ b/lib/common_test/src/ct_repeat.erl
@@ -1,26 +1,26 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2007-2010. 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%
 %%
 
 %%% @doc Common Test Framework module that handles repeated test runs
 %%%
 %%% <p>This module exports functions for repeating tests. The following
-%%% script flags (or equivalent ct:run_test/1 options) are supported:
+%%% start flags (or equivalent ct:run_test/1 options) are supported:
 %%% -until <StopTime>, StopTime = YYMoMoDDHHMMSS | HHMMSS
 %%% -duration <DurTime>, DurTime = HHMMSS
 %%% -force_stop
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 6b1063f74c..f50a46a241 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -24,7 +24,6 @@
 
 -module(ct_run).
 
-
 %% Script interface
 -export([script_start/0,script_usage/0]).
 
@@ -46,26 +45,84 @@
 -define(abs(Name), filename:absname(Name)).
 -define(testdir(Name, Suite), ct_util:get_testdir(Name, Suite)).
 
+-record(opts, {label,
+	       vts,
+	       shell,
+	       cover,
+	       coverspec,
+	       step,
+	       logdir,
+	       config = [],
+	       event_handlers = [],
+	       ct_hooks = [],
+	       include = [],
+	       silent_connections,
+	       stylesheet,
+	       multiply_timetraps = 1,
+	       scale_timetraps = false,
+	       testspecs = [],
+	       tests}).
+
 %%%-----------------------------------------------------------------
 %%% @spec script_start() -> void()
 %%%
-%%% @doc Start tests via the run_test script.
-%%% 
-%%% <p>Example:<br/><code>./run_test -config config.ctc -dir
+%%% @doc Start tests via the ct_run program or script.
+%%%
+%%% <p>Example:<br/><code>./ct_run -config config.ctc -dir
 %%% $TEST_DIR</code></p>
 %%%
-%%% <p>Example:<br/><code>./run_test -config config.ctc -suite
+%%% <p>Example:<br/><code>./ct_run -config config.ctc -suite
 %%% $SUITE_PATH/$SUITE_NAME [-case $CASE_NAME]</code></p>
 %%%
 script_start() ->
     process_flag(trap_exit, true),
-    Args = merge_arguments(init:get_arguments()),
+    Init = init:get_arguments(),
+    CtArgs = lists:takewhile(fun({ct_erl_args,_}) -> false;
+				(_) -> true end, Init),
+
+    %% convert relative dirs added with pa or pz (pre erl_args on
+    %% the ct_run command line) to absolute so that app modules
+    %% can be found even after CT changes CWD to logdir
+    rel_to_abs(CtArgs),
+
+    Args =
+	case application:get_env(common_test, run_test_start_opts) of
+	    {ok,EnvStartOpts} ->
+		FlagFilter = fun(Flags) ->
+				     lists:filter(fun({root,_}) -> false;
+						     ({progname,_}) -> false;
+						     ({home,_}) -> false;
+						     ({noshell,_}) -> false;
+						     ({noinput,_}) -> false;
+						     (_) -> true
+						  end, Flags)
+			     end,
+		%% used for purpose of testing the run_test interface
+		io:format(user, "~n-------------------- START ARGS --------------------~n", []),
+		io:format(user, "--- Init args:~n~p~n", [FlagFilter(Init)]),
+		io:format(user, "--- CT args:~n~p~n", [FlagFilter(CtArgs)]),
+		EnvArgs = opts2args(EnvStartOpts),
+		io:format(user, "--- Env opts -> args:~n~p~n   =>~n~p~n",
+			  [EnvStartOpts,EnvArgs]),
+		Merged = merge_arguments(CtArgs ++ EnvArgs),
+		io:format(user, "--- Merged args:~n~p~n", [FlagFilter(Merged)]),
+		io:format(user, "----------------------------------------------------~n~n", []),
+		Merged;
+	    _ ->
+		merge_arguments(CtArgs)
+	end,
+    case proplists:get_value(help, Args) of
+	undefined -> script_start(Args);
+	_ -> script_usage()
+    end.
+
+script_start(Args) ->
     Tracing = start_trace(Args),
-    Res = 
+    Res =
 	case ct_repeat:loop_test(script, Args) of
-	    false ->	    
+	    false ->
 		{ok,Cwd} = file:get_cwd(),
-		CTVsn = 
+		CTVsn =
 		    case filename:basename(code:lib_dir(common_test)) of
 			CTBase when is_list(CTBase) ->
 			    case string:tokens(CTBase, "-") of
@@ -76,7 +133,7 @@ script_start() ->
 		io:format("~nCommon Test~s starting (cwd is ~s)~n~n", [CTVsn,Cwd]),
 		Self = self(),
 		Pid = spawn_link(fun() -> script_start1(Self, Args) end),
-	        receive 
+	        receive
 		    {'EXIT',Pid,Reason} ->
 			case Reason of
 			    {user_error,What} ->
@@ -98,326 +155,384 @@ script_start() ->
 		Result
 	end,
     stop_trace(Tracing),
+    timer:sleep(1000),
     Res.
 
 script_start1(Parent, Args) ->
-    case lists:keymember(preload, 1, Args) of
-	true -> preload();
-	false -> ok
-    end,
-
-    VtsOrShell = 
-	case lists:keymember(vts, 1, Args) of
-	    true -> 
-		vts;
-	    false ->
-		case lists:keymember(shell, 1, Args) of
-		    true -> shell;
-		    false -> false
-		end
-	end,
-    LogDir =
-	case lists:keysearch(logdir, 1, Args) of
-	    {value,{logdir,[LogD]}} -> LogD;
-	    false -> "."
-	end,
-    EvHandlers =	
-	case lists:keysearch(event_handler, 1, Args) of
-	    {value,{event_handler,Handlers}} -> 
-		lists:map(fun(H) -> {list_to_atom(H),[]} end, Handlers);
-	    false -> 
-		[]
-	end,
-    Cover = 
-	case lists:keysearch(cover, 1, Args) of
-	    {value,{cover,CoverFile}} -> 
-		{cover,?abs(CoverFile)};
-	    false -> 
-		false
-	end,
-
-    case lists:keysearch(ct_decrypt_key, 1, Args) of
-	{value,{_,[DecryptKey]}} ->
+    %% read general start flags
+    Label = get_start_opt(label, fun([Lbl]) -> Lbl end, Args),
+    Vts = get_start_opt(vts, true, Args),
+    Shell = get_start_opt(shell, true, Args),
+    Cover = get_start_opt(cover, fun([CoverFile]) -> ?abs(CoverFile) end, Args),
+    LogDir = get_start_opt(logdir, fun([LogD]) -> LogD end, Args),
+    MultTT = get_start_opt(multiply_timetraps,
+			   fun([MT]) -> list_to_integer(MT) end, 1, Args),
+    ScaleTT = get_start_opt(scale_timetraps,
+			    fun([CT]) -> list_to_atom(CT);
+			       ([]) -> true
+			    end, false, Args),
+    EvHandlers = event_handler_args2opts(Args),
+    CTHooks = ct_hooks_args2opts(Args),
+
+    %% check flags and set corresponding application env variables
+
+    %% ct_decrypt_key | ct_decrypt_file
+    case proplists:get_value(ct_decrypt_key, Args) of
+	[DecryptKey] ->
 	    application:set_env(common_test, decrypt, {key,DecryptKey});
-	false ->
-	    case lists:keysearch(ct_decrypt_file, 1, Args) of
-		{value,{_,[DecryptFile]}} ->
-		    application:set_env(common_test, decrypt, 
-					{file,filename:absname(DecryptFile)});
-		false ->
+	undefined ->
+	    case proplists:get_value(ct_decrypt_file, Args) of
+		[DecryptFile] ->
+		    application:set_env(common_test, decrypt,
+					{file,?abs(DecryptFile)});
+		undefined ->
 		    application:unset_env(common_test, decrypt)
 	    end
     end,
-
-    case lists:keysearch(no_auto_compile, 1, Args) of
-	{value,_} ->
-	    application:set_env(common_test, auto_compile, false);
-	false ->
-	    application:set_env(common_test, auto_compile, true),
-
-	    InclDirs =
-		case lists:keysearch(include,1,Args) of
-		    {value,{include,Incl}} when is_list(hd(Incl)) ->
-			Incl;		    
-		    {value,{include,Incl}} when is_list(Incl) ->
-			[Incl];
+    %% no_auto_compile + include
+    IncludeDirs =
+	case proplists:get_value(no_auto_compile, Args) of
+	    undefined ->
+		application:set_env(common_test, auto_compile, true),
+		InclDirs =
+		    case proplists:get_value(include, Args) of
+			Incl when is_list(hd(Incl)) ->
+			    Incl;
+			Incl when is_list(Incl) ->
+			    [Incl];
+			undefined ->
+			    []
+		    end,
+		case os:getenv("CT_INCLUDE_PATH") of
 		    false ->
-			[]
-		end,
-	    case os:getenv("CT_INCLUDE_PATH") of
-		false ->
-		    application:set_env(common_test, include, InclDirs);
-		CtInclPath ->
-		    InclDirs1 = string:tokens(CtInclPath,[$:,$ ,$,]),
-		    application:set_env(common_test, include, InclDirs1++InclDirs)
-	    end
-    end,
-
-    case lists:keysearch(basic_html, 1, Args) of
-	{value,_} ->
-	    application:set_env(common_test, basic_html, true);
-	false ->
-	    application:set_env(common_test, basic_html, false)
-    end,
-
-    Result =
-	case lists:keysearch(refresh_logs, 1, Args) of
-	    {value,{refresh_logs,Refresh}} ->
-		LogDir1 = case Refresh of
-			      [] -> LogDir;
-			      [RefreshDir] -> ?abs(RefreshDir)
-			  end,
-		{ok,Cwd} = file:get_cwd(),
-		file:set_cwd(LogDir1),
-		timer:sleep(500),		% give the shell time to print version etc
-		io:nl(),
-		case catch ct_logs:make_all_suites_index(refresh) of
-		    {'EXIT',ASReason} ->
-			file:set_cwd(Cwd),
-			{error,{all_suites_index,ASReason}};
-		    _ ->
-			case catch ct_logs:make_all_runs_index(refresh) of
-			    {'EXIT',ARReason} ->
-				file:set_cwd(Cwd),
-				{error,{all_runs_index,ARReason}};
-			    _ ->
-				file:set_cwd(Cwd),
-				io:format("Logs in ~s refreshed!~n~n", [LogDir1]),
-				timer:sleep(500), % time to flush io before quitting
-				ok
-			end
+			application:set_env(common_test, include, InclDirs),
+			InclDirs;
+		    CtInclPath ->
+			AllInclDirs =
+			    string:tokens(CtInclPath,[$:,$ ,$,]) ++ InclDirs,
+			application:set_env(common_test, include, AllInclDirs),
+			AllInclDirs
 		end;
-	    false ->    
-		case lists:keysearch(ct_config, 1, Args) of
-		    {value,{ct_config,ConfigFiles}} ->
-			case lists:keysearch(spec, 1, Args) of
-			    false ->
-				case get_configfiles(ConfigFiles, [], LogDir,
-						     EvHandlers) of
-				    ok ->
-					script_start2(VtsOrShell, ConfigFiles,
-						      EvHandlers, Args, LogDir,
-						      Cover);
-				    Error ->
-					Error
-				end;
-			    _ ->
-				script_start2(VtsOrShell, ConfigFiles,
-					      EvHandlers, Args, LogDir, Cover)
-			end;
-		    false ->
-			case install([{config,[]},
-				      {event_handler,EvHandlers}],
-				     LogDir) of
-			    ok ->
-				script_start2(VtsOrShell, [], EvHandlers,
-					      Args, LogDir, Cover);
-			    Error ->
-				Error
-			end
-		end
+	    _ ->
+		application:set_env(common_test, auto_compile, false),
+		[]
 	end,
+    %% silent connections
+    SilentConns =
+	get_start_opt(silent_connections,
+		      fun(["all"]) -> [];
+			 (Conns) -> [list_to_atom(Conn) || Conn <- Conns]
+		      end, Args),
+    %% stylesheet
+    Stylesheet = get_start_opt(stylesheet,
+			       fun([SS]) -> ?abs(SS) end, Args),
+    %% basic_html - used by ct_logs
+    case proplists:get_value(basic_html, Args) of
+	undefined ->
+	    application:set_env(common_test, basic_html, false);
+	_ ->
+	    application:set_env(common_test, basic_html, true)
+    end,
+
+   StartOpts = #opts{label = Label, vts = Vts, shell = Shell, cover = Cover,
+		     logdir = LogDir, event_handlers = EvHandlers,
+		     ct_hooks = CTHooks,
+		     include = IncludeDirs,
+		     silent_connections = SilentConns,
+		     stylesheet = Stylesheet,
+		     multiply_timetraps = MultTT,
+		     scale_timetraps = ScaleTT},
+
+    %% check if log files should be refreshed or go on to run tests...
+    Result = run_or_refresh(StartOpts, Args),
+    %% send final results to starting process waiting in script_start/0
     Parent ! {self(), Result}.
 
-get_configfiles([File|Files], Acc, LogDir, EvHandlers) ->
-    case filelib:is_file(File) of
-	true ->
-	    get_configfiles(Files, [?abs(File)|Acc],
-			    LogDir, EvHandlers);
-	false ->
-	    {error,{cant_read_config_file,File}}
-    end;
-get_configfiles([], Acc, LogDir, EvHandlers) ->
-    install([{config,lists:reverse(Acc)}, {event_handler,EvHandlers}], LogDir).
+run_or_refresh(StartOpts = #opts{logdir = LogDir}, Args) ->
+    case proplists:get_value(refresh_logs, Args) of
+	undefined ->
+	    script_start2(StartOpts, Args);
+	Refresh ->
+	    LogDir1 = case Refresh of
+			  [] -> which(logdir,LogDir);
+			  [RefreshDir] -> ?abs(RefreshDir)
+		      end,
+	    {ok,Cwd} = file:get_cwd(),
+	    file:set_cwd(LogDir1),
+	    %% give the shell time to print version etc
+	    timer:sleep(500),
+	    io:nl(),
+	    case catch ct_logs:make_all_suites_index(refresh) of
+		{'EXIT',ASReason} ->
+		    file:set_cwd(Cwd),
+		    {error,{all_suites_index,ASReason}};
+		_ ->
+		    case catch ct_logs:make_all_runs_index(refresh) of
+			{'EXIT',ARReason} ->
+			    file:set_cwd(Cwd),
+			    {error,{all_runs_index,ARReason}};
+			_ ->
+			    file:set_cwd(Cwd),
+			    io:format("Logs in ~s refreshed!~n~n", [LogDir1]),
+			    timer:sleep(500), % time to flush io before quitting
+			    ok
+		    end
+	    end
+    end.
 
-script_start2(false, ConfigFiles, EvHandlers, Args, LogDir, Cover) ->
-    case lists:keysearch(spec, 1, Args) of
-	{value,{spec,[]}} ->
+script_start2(StartOpts = #opts{vts = undefined,
+				shell = undefined}, Args) ->
+    TestSpec = proplists:get_value(spec, Args),
+    {Terms,Opts} =
+	case TestSpec of
+	    Specs when Specs =/= [], Specs =/= undefined ->
+		%% using testspec as input for test
+		Relaxed = get_start_opt(allow_user_terms, true, false, Args),
+		case catch ct_testspec:collect_tests_from_file(Specs, Relaxed) of
+		    {E,Reason} when E == error ; E == 'EXIT' ->
+			{{error,Reason},StartOpts};
+		    TS ->
+			SpecStartOpts = get_data_for_node(TS, node()),
+
+			Label = choose_val(StartOpts#opts.label,
+					   SpecStartOpts#opts.label),
+
+			LogDir = choose_val(StartOpts#opts.logdir,
+					    SpecStartOpts#opts.logdir),
+
+			Cover = choose_val(StartOpts#opts.cover,
+					   SpecStartOpts#opts.cover),
+			MultTT = choose_val(StartOpts#opts.multiply_timetraps,
+					    SpecStartOpts#opts.multiply_timetraps),
+			ScaleTT = choose_val(StartOpts#opts.scale_timetraps,
+					     SpecStartOpts#opts.scale_timetraps),
+			AllEvHs = merge_vals([StartOpts#opts.event_handlers,
+					      SpecStartOpts#opts.event_handlers]),
+			AllCTHooks = merge_vals(
+					[StartOpts#opts.ct_hooks,
+					 SpecStartOpts#opts.ct_hooks]),
+			
+			AllInclude = merge_vals([StartOpts#opts.include,
+						 SpecStartOpts#opts.include]),
+			application:set_env(common_test, include, AllInclude),
+
+			{TS,StartOpts#opts{label = Label,
+					   testspecs = Specs,
+					   cover = Cover,
+					   logdir = LogDir,
+					   config = SpecStartOpts#opts.config,
+					   event_handlers = AllEvHs,
+					   ct_hooks = AllCTHooks,
+					   include = AllInclude,
+					   multiply_timetraps = MultTT,
+					   scale_timetraps = ScaleTT}}
+		end;
+	    _ ->
+		{undefined,StartOpts}
+	end,
+    %% read config/userconfig from start flags
+    InitConfig = ct_config:prepare_config_list(Args),
+    TheLogDir = which(logdir, Opts#opts.logdir),
+    case {TestSpec,Terms} of
+	{_,{error,_}=Error} ->
+	    Error;
+	{[],_} ->
 	    {error,no_testspec_specified};
-	{value,{spec,Specs}} ->
-	    Relaxed = lists:keymember(allow_user_terms, 1, Args),
-	    %% using testspec as input for test
-	    case catch ct_testspec:collect_tests_from_file(Specs, Relaxed) of
-		{error,Reason} ->
-		    {error,Reason};
-		TS ->
-		    {LogDir1,TSCoverFile,ConfigFiles1,EvHandlers1,Include1} = 
-			get_data_for_node(TS,node()),
-		    UserInclude =
-			case application:get_env(common_test, include) of
-			    {ok,Include} -> Include++Include1;
-			    _ -> Include1
-			end,
-		    application:set_env(common_test, include, UserInclude),
-		    LogDir2 = which_logdir(LogDir,LogDir1),
-		    CoverOpt = case {Cover,TSCoverFile} of
-				   {false,undef} -> [];
-				   {_,undef} ->     [Cover];
-				   {false,_} ->     [{cover,TSCoverFile}]
-			       end,
-		    case get_configfiles(ConfigFiles++ConfigFiles1,
-					 [], LogDir2,
-					 EvHandlers++EvHandlers1) of
-			ok ->
-			    {Run,Skip} = ct_testspec:prepare_tests(TS, node()),
-			    do_run(Run, Skip, CoverOpt, Args, LogDir2);
-			Error ->
-			    Error
-		    end
+	{undefined,_} ->   % no testspec used
+	    case check_and_install_configfiles(InitConfig, TheLogDir,
+					       Opts#opts.event_handlers,
+					       Opts#opts.ct_hooks) of
+		ok ->      % go on read tests from start flags
+		    script_start3(Opts#opts{config=InitConfig,
+					    logdir=TheLogDir}, Args);
+		Error ->
+		    Error
 	    end;
-	false ->
-	    script_start3(false, ConfigFiles, EvHandlers, Args, LogDir, Cover)
+	{_,_} ->           % testspec used
+	    %% merge config from start flags with config from testspec
+	    AllConfig = merge_vals([InitConfig, Opts#opts.config]),
+	    case check_and_install_configfiles(AllConfig, TheLogDir,
+					       Opts#opts.event_handlers,
+					       Opts#opts.ct_hooks) of
+		ok ->      % read tests from spec
+		    {Run,Skip} = ct_testspec:prepare_tests(Terms, node()),
+		    do_run(Run, Skip, Opts#opts{config=AllConfig,
+						logdir=TheLogDir}, Args);
+		Error ->
+		    Error
+	    end
     end;
-script_start2(VtsOrShell, ConfigFiles, EvHandlers, Args, LogDir, Cover) ->
-    script_start3(VtsOrShell, ConfigFiles, EvHandlers, Args, LogDir, Cover).
 
-script_start3(VtsOrShell, ConfigFiles, EvHandlers, Args, LogDir, Cover) ->
-    case lists:keysearch(dir, 1, Args) of
-	{value,{dir,[]}} ->
-	    {error,no_dir_specified};
-	{value,{dir,Dirs}} ->
-	    script_start4(VtsOrShell, ConfigFiles, EvHandlers, tests(Dirs),
-			  Cover, Args, LogDir);
+script_start2(StartOpts, Args) ->
+    %% read config/userconfig from start flags
+    InitConfig = ct_config:prepare_config_list(Args),
+    LogDir = which(logdir, StartOpts#opts.logdir),
+    case check_and_install_configfiles(InitConfig, LogDir,
+				       StartOpts#opts.event_handlers,
+				       StartOpts#opts.ct_hooks) of
+	ok ->      % go on read tests from start flags
+	    script_start3(StartOpts#opts{config=InitConfig,
+					 logdir=LogDir}, Args);
+	Error ->
+	    Error
+    end.
+
+check_and_install_configfiles(Configs, LogDir, EvHandlers, CTHooks) ->
+    case ct_config:check_config_files(Configs) of
 	false ->
-	    case lists:keysearch(suite, 1, Args) of
-		{value,{suite,[]}} ->
+	    install([{config,Configs},
+		     {event_handler,EvHandlers},
+		     {ct_hooks,CTHooks}], LogDir);
+	{value,{error,{nofile,File}}} ->
+	    {error,{cant_read_config_file,File}};
+	{value,{error,{wrong_config,Message}}}->
+	    {error,{wrong_config,Message}};
+	{value,{error,{callback,Info}}} ->
+	    {error,{cant_load_callback_module,Info}}
+    end.
+
+script_start3(StartOpts, Args) ->
+    case proplists:get_value(dir, Args) of
+	[] ->
+	    {error,no_dir_specified};
+	Dirs when is_list(Dirs) ->
+	    script_start4(StartOpts#opts{tests = tests(Dirs)}, Args);
+	undefined ->
+	    case proplists:get_value(suite, Args) of
+		[] ->
 		    {error,no_suite_specified};
-		{value,{suite,Suites}} ->
-		    StepOrCover =
-			case lists:keysearch(step, 1, Args) of
-			    {value,Step} -> Step;
-			    false -> Cover
-			end,
-		    S2M = fun(S) ->
-				  {filename:dirname(S),
-				   list_to_atom(
-				     filename:rootname(filename:basename(S)))}
-			  end,
-		    DirMods = lists:map(S2M, Suites),
-		    {Specified,GroupsAndCases} =
-			case {lists:keysearch(group, 1, Args),
-			      lists:keysearch('case', 1, Args)} of
-			    {{value,{_,Gs}},{value,{_,Cs}}} -> {true,Gs++Cs};
-			    {{value,{_,Gs}},_}              -> {true,Gs};
-			    {_,{value,{_,Cs}}}              -> {true,Cs};
-			    _                               -> {false,[]}
-			end,
-		    if Specified, length(GroupsAndCases) == 0 ->
-			    {error,no_case_or_group_specified};
-		       Specified, length(DirMods) > 1 ->
+		Suites when is_list(Suites) ->
+		    StartOpts1 =
+			get_start_opt(step,
+				      fun(Step) ->
+					      StartOpts#opts{step = Step,
+							     cover = undefined}
+				      end, StartOpts, Args),
+		    DirMods = [suite_to_test(S) || S <- Suites],
+		    case groups_and_cases(proplists:get_value(group, Args),
+					  proplists:get_value(testcase, Args)) of
+			Error = {error,_} ->
+			    Error;
+			[] when DirMods =/= [] ->
+			    Ts = tests(DirMods),
+			    script_start4(StartOpts1#opts{tests = Ts}, Args);
+			GroupsAndCases when length(DirMods) == 1 ->
+			    Ts = tests(DirMods, GroupsAndCases),
+			    script_start4(StartOpts1#opts{tests = Ts}, Args);
+			[_,_|_] when length(DirMods) > 1 ->
 			    {error,multiple_suites_and_cases};
-		       length(GroupsAndCases) > 0, length(DirMods) == 1 ->
-			    GsAndCs = lists:map(fun(C) -> list_to_atom(C) end, 
-						GroupsAndCases),
-			    script_start4(VtsOrShell, ConfigFiles, EvHandlers,
-					  tests(DirMods, GsAndCs),
-					  StepOrCover, Args, LogDir);
-		       not Specified, length(DirMods) > 0 ->
-			    script_start4(VtsOrShell, ConfigFiles, EvHandlers,
-					  tests(DirMods), 
-					  StepOrCover, Args, LogDir);
-		       true ->
-			    {error,incorrect_suite_and_case_options}
+			_ ->
+			    {error,incorrect_suite_option}
 		    end;
-		false when VtsOrShell=/=false ->
-		    script_start4(VtsOrShell, ConfigFiles, EvHandlers,
-				  [], Cover, Args, LogDir);
-		false ->
-		    script_usage(),
-		    {error,incorrect_usage}
+		undefined ->
+		    if StartOpts#opts.vts ; StartOpts#opts.shell ->
+			    script_start4(StartOpts#opts{tests = []}, Args);
+		       true ->
+			    script_usage(),
+			    {error,incorrect_usage}
+		    end
 	    end
     end.
 
-script_start4(vts, ConfigFiles, EvHandlers, Tests, false, _Args, LogDir) ->
+script_start4(#opts{vts = true, config = Config, event_handlers = EvHandlers,
+		    tests = Tests, logdir = LogDir}, _Args) ->
+    ConfigFiles =
+	lists:foldl(fun({ct_config_plain,CfgFiles}, AllFiles) when
+			      is_list(hd(CfgFiles)) ->
+			    AllFiles ++ CfgFiles;
+		       ({ct_config_plain,CfgFile}, AllFiles) when
+			      is_integer(hd(CfgFile)) ->
+			    AllFiles ++ [CfgFile];
+		       (_, AllFiles) ->
+			    AllFiles
+		    end, [], Config),
     vts:init_data(ConfigFiles, EvHandlers, ?abs(LogDir), Tests);
-script_start4(shell, ConfigFiles, EvHandlers, _Tests, false, Args, LogDir) ->
-    Opts = [{config,ConfigFiles},{event_handler,EvHandlers}],
-    if ConfigFiles == [] ->
+
+script_start4(#opts{label = Label, shell = true, config = Config,
+		    event_handlers = EvHandlers,
+		    ct_hooks = CTHooks,
+		    logdir = LogDir, testspecs = Specs}, _Args) ->
+    %% label - used by ct_logs
+    application:set_env(common_test, test_label, Label),
+
+    InstallOpts = [{config,Config},{event_handler,EvHandlers},
+		   {ct_hooks, CTHooks}],
+    if Config == [] ->
 	    ok;
        true ->
-	    io:format("\nInstalling: ~p\n\n", [ConfigFiles])
+	    io:format("\nInstalling: ~p\n\n", [Config])
     end,
-    case install(Opts) of
+    case install(InstallOpts) of
 	ok ->
 	    ct_util:start(interactive, LogDir),
-	    log_ts_names(Args),
+	    log_ts_names(Specs),
 	    io:nl(),
 	    ok;
 	Error ->
 	    Error
     end;
-script_start4(vts, _CfgFs, _EvHs, _Tests, _Cover={cover,_}, _Args, _LogDir) ->
-    %% Add support later (maybe).
-    script_usage(),
-    erlang:halt();
-script_start4(shell, _CfgFs, _EvHs, _Tests, _Cover={cover,_}, _Args, _LogDir) ->
-    %% Add support later (maybe).
-    script_usage();
-script_start4(false, _CfgFs, _EvHs, Tests, Cover={cover,_}, Args, LogDir) ->
-    do_run(Tests, [], [Cover], Args, LogDir);
-script_start4(false, _ConfigFiles, _EvHandlers, Tests, false, Args, LogDir) ->
-    do_run(Tests, [], [], Args, LogDir);
-script_start4(false, _ConfigFiles, _EvHandlers, Test, Step, Args, LogDir) ->
-    do_run(Test, [], [Step], Args, LogDir);
-script_start4(vts, _ConfigFiles, _EvHandlers, _Test, _Step, _Args, _LogDir) ->
-    script_usage(),
+
+script_start4(#opts{vts = true, cover = Cover}, _) ->
+    case Cover of
+	undefined ->
+	    script_usage();
+	_ ->
+	    %% Add support later (maybe).
+	    io:format("\nCan't run cover in vts mode.\n\n", [])
+    end,
     erlang:halt();
-script_start4(shell, _ConfigFiles, _EvHandlers, _Test, _Step, _Args, _LogDir) ->
-    script_usage().
+
+script_start4(#opts{shell = true, cover = Cover}, _) ->
+    case Cover of
+	undefined ->
+	    script_usage();
+	_ ->
+	    %% Add support later (maybe).
+	    io:format("\nCan't run cover in interactive mode.\n\n", [])
+    end;
+
+script_start4(Opts = #opts{tests = Tests}, Args) ->
+    do_run(Tests, [], Opts, Args).
 
 %%%-----------------------------------------------------------------
 %%% @spec script_usage() -> ok
-%%% @doc Print script usage information for <code>run_test</code>.
+%%% @doc Print usage information for <code>ct_run</code>.
 script_usage() ->
     io:format("\n\nUsage:\n\n"),
     io:format("Run tests in web based GUI:\n\n"
-	      "\trun_test -vts [-browser Browser]"
+	      "\tct_run -vts [-browser Browser]"
 	      "\n\t[-config ConfigFile1 ConfigFile2 .. ConfigFileN]"
 	      "\n\t[-decrypt_key Key] | [-decrypt_file KeyFile]"
 	      "\n\t[-dir TestDir1 TestDir2 .. TestDirN] |"
 	      "\n\t[-suite Suite [-case Case]]"
-	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]" 
+	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
+	      "\n\t[-multiply_timetraps N]"
+	      "\n\t[-scale_timetraps]"
 	      "\n\t[-basic_html]\n\n"),
     io:format("Run tests from command line:\n\n"
-	      "\trun_test [-dir TestDir1 TestDir2 .. TestDirN] |"
+	      "\tct_run [-dir TestDir1 TestDir2 .. TestDirN] |"
 	      "\n\t[-suite Suite1 Suite2 .. SuiteN [-case Case1 Case2 .. CaseN]]"
 	      "\n\t[-step [config | keep_inactive]]"
 	      "\n\t[-config ConfigFile1 ConfigFile2 .. ConfigFileN]"
+	      "\n\t[-userconfig CallbackModule ConfigFile1 .. ConfigFileN]"
 	      "\n\t[-decrypt_key Key] | [-decrypt_file KeyFile]"
 	      "\n\t[-logdir LogDir]"
 	      "\n\t[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]"
 	      "\n\t[-stylesheet CSSFile]"
 	      "\n\t[-cover CoverCfgFile]"
 	      "\n\t[-event_handler EvHandler1 EvHandler2 .. EvHandlerN]"
-	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]" 
+	      "\n\t[-ct_hooks CTHook1 CTHook2 .. CTHookN]"
+	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
-	      "\n\t[-basic_html]" 
-	      "\n\t[-repeat N [-force_stop]] |" 
+	      "\n\t[-multiply_timetraps N]"
+	      "\n\t[-scale_timetraps]"
+	      "\n\t[-basic_html]"
+	      "\n\t[-repeat N [-force_stop]] |"
 	      "\n\t[-duration HHMMSS [-force_stop]] |"
 	      "\n\t[-until [YYMoMoDD]HHMMSS [-force_stop]]\n\n"),
     io:format("Run tests using test specification:\n\n"
-	      "\trun_test -spec TestSpec1 TestSpec2 .. TestSpecN"
+	      "\tct_run -spec TestSpec1 TestSpec2 .. TestSpecN"
 	      "\n\t[-config ConfigFile1 ConfigFile2 .. ConfigFileN]"
 	      "\n\t[-decrypt_key Key] | [-decrypt_file KeyFile]"
 	      "\n\t[-logdir LogDir]"
@@ -426,21 +541,23 @@ script_usage() ->
 	      "\n\t[-stylesheet CSSFile]"
 	      "\n\t[-cover CoverCfgFile]"
 	      "\n\t[-event_handler EvHandler1 EvHandler2 .. EvHandlerN]"
-	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]" 
+	      "\n\t[-ct_hooks CTHook1 CTHook2 .. CTHookN]"
+	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
-	      "\n\t[-basic_html]" 
-	      "\n\t[-repeat N [-force_stop]] |" 
+	      "\n\t[-multiply_timetraps N]"
+	      "\n\t[-scale_timetraps]"
+	      "\n\t[-basic_html]"
+	      "\n\t[-repeat N [-force_stop]] |"
 	      "\n\t[-duration HHMMSS [-force_stop]] |"
 	      "\n\t[-until [YYMoMoDD]HHMMSS [-force_stop]]\n\n"),
     io:format("Refresh the HTML index files:\n\n"
-	      "\trun_test -refresh_logs [LogDir]"
+	      "\tct_run -refresh_logs [LogDir]"
 	      "[-logdir LogDir] "
 	      "[-basic_html]\n\n"),
     io:format("Run CT in interactive mode:\n\n"
-	      "\trun_test -shell"
+	      "\tct_run -shell"
 	      "\n\t[-config ConfigFile1 ConfigFile2 .. ConfigFileN]"
 	      "\n\t[-decrypt_key Key] | [-decrypt_file KeyFile]\n\n").
-	      
 
 %%%-----------------------------------------------------------------
 %%% @hidden
@@ -449,6 +566,9 @@ install(Opts) ->
     install(Opts, ".").
 
 install(Opts, LogDir) ->
+
+    ConfOpts = ct_config:add_default_callback(Opts),
+
     case application:get_env(common_test, decrypt) of
 	{ok,_} ->
 	    ok;
@@ -465,10 +585,10 @@ install(Opts, LogDir) ->
 	    VarFile = variables_file_name(LogDir),
 	    case file:open(VarFile, [write]) of
 		{ok,Fd} ->
-		    [io:format(Fd, "~p.\n", [Opt]) || Opt <- Opts],
+		    [io:format(Fd, "~p.\n", [Opt]) || Opt <- ConfOpts ],
 		    file:close(Fd),
 		    ok;
-		{error,Reason} -> 
+		{error,Reason} ->
 		    io:format("CT failed to install configuration data. Please "
 			      "verify that the log directory exists and that "
 			      "write permission is set.\n\n", []),
@@ -487,69 +607,62 @@ variables_file_name(Dir) ->
     filename:join(Dir, "variables-"++atom_to_list(node())).
 
 %%%-----------------------------------------------------------------
-%%% @hidden
+%%% @spec run_test(Opts) -> Result
+%%%   Opts = [tuple()]
+%%%   Result = [TestResult] | {error,Reason}
+%%%
+%%% @doc Start tests from the erlang shell or from an erlang program.
 %%% @equiv ct:run_test/1
+%%%-----------------------------------------------------------------
 
-%%   Opts = [OptTuples]
-%%   OptTuples = {config,CfgFiles} | {dir,TestDirs} | {suite,Suites} |
-%%               {testcase,Cases} | {spec,TestSpecs} | {allow_user_terms,Bool} |
-%%               {logdir,LogDir} | {cover,CoverSpecFile} | {step,StepOpts} |
-%%               {silent_connections,Conns} | {event_handler,EventHandlers} | 
-%%               {include,InclDirs} | {auto_compile,Bool} | 
-%%               {repeat,N} | {duration,DurTime} | {until,StopTime} | {force_stop,Bool} |
-%%               {decrypt,KeyOrFile}
-
-run_test(Opt) when is_tuple(Opt) ->
-    run_test([Opt]);
-
-run_test(Opts) when is_list(Opts) ->
-    case lists:keysearch(refresh_logs, 1, Opts) of
-	{value,{_,RefreshDir}} ->
-	    refresh_logs(?abs(RefreshDir)),
-	    ok;
-	false ->
-	    Tracing = start_trace(Opts),
+run_test(StartOpt) when is_tuple(StartOpt) ->
+    run_test([StartOpt]);
+
+run_test(StartOpts) when is_list(StartOpts) ->
+    case proplists:get_value(refresh_logs, StartOpts) of
+	undefined ->
+	    Tracing = start_trace(StartOpts),
 	    {ok,Cwd} = file:get_cwd(),
-	    io:format("~nCommon Test starting (cwd is ~s)~n~n", [Cwd]),	    
+	    io:format("~nCommon Test starting (cwd is ~s)~n~n", [Cwd]),
 	    Res =
-		case ct_repeat:loop_test(func, Opts) of
+		case ct_repeat:loop_test(func, StartOpts) of
 		    false ->
-			case catch run_test1(Opts) of
-			    {'EXIT',Reason} -> 
+			case catch run_test1(StartOpts) of
+			    {'EXIT',Reason} ->
 				file:set_cwd(Cwd),
 				{error,Reason};
-			    Result -> 
+			    Result ->
 				Result
 			end;
 		    Result ->
 			Result
 		end,
 	    stop_trace(Tracing),
-	    Res
+	    Res;
+	RefreshDir ->
+	    refresh_logs(?abs(RefreshDir)),
+	    ok
     end.
 
-run_test1(Opts) ->
-    LogDir =
-	case lists:keysearch(logdir, 1, Opts) of
-	    {value,{_,LD}} when is_list(LD) -> LD;
-	    false -> "."
-	end,
-    CfgFiles =
-	case lists:keysearch(config, 1, Opts) of
-	    {value,{_,Files=[File|_]}} when is_list(File) ->
-		Files;
-	    {value,{_,File=[C|_]}} when is_integer(C) ->
-		[File];
-	    {value,{_,[]}} ->
-		[];
-	    false ->
-		[]
-	end,
+run_test1(StartOpts) ->
+    %% label
+    Label = get_start_opt(label, fun(Lbl) when is_list(Lbl) -> Lbl;
+				    (Lbl) when is_atom(Lbl) -> atom_to_list(Lbl)
+				 end, StartOpts),
+    %% logdir
+    LogDir = get_start_opt(logdir, fun(LD) when is_list(LD) -> LD end,
+			   StartOpts),
+    %% config & userconfig
+    CfgFiles = ct_config:get_config_file_list(StartOpts),
+
+    %% event handlers
     EvHandlers =
-	case lists:keysearch(event_handler, 1, Opts) of
-	    {value,{_,H}} when is_atom(H) ->
+	case proplists:get_value(event_handler, StartOpts) of
+	    undefined ->
+		[];
+	    H when is_atom(H) ->
 		[{H,[]}];
-	    {value,{_,H}} ->
+	    H ->
 		Hs =
 		    if is_tuple(H) -> [H];
 		       is_list(H) -> H;
@@ -564,41 +677,42 @@ run_test1(Opts) ->
 				    {EH,Args};
 			       (_) ->
 				    []
-			    end, Hs));
-	    _ ->
-		[]
-	end,
-    SilentConns =
-	case lists:keysearch(silent_connections, 1, Opts) of
-	    {value,{_,all}} ->
-		[];
-	    {value,{_,Conns}} ->
-		Conns;
-	    _ ->
-		undefined
-	end,
-    Cover = 
-	case lists:keysearch(cover, 1, Opts) of
-	    {value,{_,CoverFile}} ->
-		[{cover,?abs(CoverFile)}];
-	    _ ->
-		[]
+			    end, Hs))
 	end,
+
+    %% CT Hooks
+    CTHooks = get_start_opt(ct_hooks, value, [], StartOpts),
+
+    %% silent connections
+    SilentConns = get_start_opt(silent_connections,
+				fun(all) -> [];
+				   (Conns) -> Conns
+				end, StartOpts),
+    %% stylesheet
+    Stylesheet = get_start_opt(stylesheet,
+			       fun(SS) -> ?abs(SS) end,
+			       StartOpts),
+    %% code coverage
+    Cover = get_start_opt(cover,
+			  fun(CoverFile) -> ?abs(CoverFile) end, StartOpts),
+
+    %% timetrap manipulation
+    MultiplyTT = get_start_opt(multiply_timetraps, value, 1, StartOpts),
+    ScaleTT = get_start_opt(scale_timetraps, value, false, StartOpts),
+
+    %% auto compile & include files
     Include =
-	case lists:keysearch(auto_compile, 1, Opts) of
-	    {value,{auto_compile,ACBool}} ->
-		application:set_env(common_test, auto_compile, ACBool),
-		[];
-	    _ ->
+	case proplists:get_value(auto_compile, StartOpts) of
+	    undefined ->
 		application:set_env(common_test, auto_compile, true),		
 		InclDirs =
-		    case lists:keysearch(include, 1, Opts) of
-			{value,{include,Incl}}  when is_list(hd(Incl)) ->
-			    Incl;		    
-			{value,{include,Incl}} when is_list(Incl) ->
-			    [Incl];
-			false ->
-			    []
+		    case proplists:get_value(include, StartOpts) of
+			undefined ->
+			    [];
+			Incl when is_list(hd(Incl)) ->
+			    Incl;
+			Incl when is_list(Incl) ->
+			    [Incl]
 		    end,
 		case os:getenv("CT_INCLUDE_PATH") of
 		    false ->
@@ -609,117 +723,187 @@ run_test1(Opts) ->
 			AllInclDirs = InclDirs1++InclDirs,
 			application:set_env(common_test, include, AllInclDirs),
 			AllInclDirs
-		end
+		end;
+	    ACBool ->
+		application:set_env(common_test, auto_compile, ACBool),
+		[]
 	end,
 
-    case lists:keysearch(decrypt, 1, Opts) of
-	{value,{_,Key={key,_}}} ->
+    %% decrypt config file
+    case proplists:get_value(decrypt, StartOpts) of
+	undefined ->
+	    application:unset_env(common_test, decrypt);
+	Key={key,_} ->
 	    application:set_env(common_test, decrypt, Key);
-	{value,{_,{file,KeyFile}}} ->
-	    application:set_env(common_test, decrypt, {file,filename:absname(KeyFile)});
-	false ->
-	    application:unset_env(common_test, decrypt)
+	{file,KeyFile} ->
+	    application:set_env(common_test, decrypt, {file,?abs(KeyFile)})
     end,
 
-    case lists:keysearch(basic_html, 1, Opts) of
-	{value,{basic_html,BasicHtmlBool}} ->
-	    application:set_env(common_test, basic_html, BasicHtmlBool);
-	_ ->
-	    application:set_env(common_test, basic_html, false)
+    %% basic html - used by ct_logs
+    case proplists:get_value(basic_html, StartOpts) of
+	undefined ->
+	    application:set_env(common_test, basic_html, false);
+	BasicHtmlBool ->
+	    application:set_env(common_test, basic_html, BasicHtmlBool)
     end,
 
-    case lists:keysearch(spec, 1, Opts) of
-	{value,{_,Specs}} ->
-	    Relaxed =
-		case lists:keysearch(allow_user_terms, 1, Opts) of
-		    {value,{_,true}} -> true;
-		    _ -> false
-		end,	    
-	    %% using testspec(s) as input for test
-	    run_spec_file(LogDir, CfgFiles, EvHandlers, Include, Specs, Relaxed, Cover,
-			 replace_opt([{silent_connections,SilentConns}], Opts));
-	false ->
-	    case lists:keysearch(prepared_tests, 1, Opts) of
+    %% stepped execution
+    Step = get_start_opt(step, value, StartOpts),
+
+    Opts = #opts{label = Label,
+		 cover = Cover, step = Step, logdir = LogDir, config = CfgFiles,
+		 event_handlers = EvHandlers,
+		 ct_hooks = CTHooks,
+		 include = Include,
+		 silent_connections = SilentConns,
+		 stylesheet = Stylesheet,
+		 multiply_timetraps = MultiplyTT,
+		 scale_timetraps = ScaleTT},
+
+    %% test specification
+    case proplists:get_value(spec, StartOpts) of
+	undefined ->
+	    case lists:keysearch(prepared_tests, 1, StartOpts) of
 		{value,{_,{Run,Skip},Specs}} ->	% use prepared tests
-		    run_prepared(LogDir, CfgFiles, EvHandlers,
-				 Run, Skip, Cover,
-				 replace_opt([{silent_connections,SilentConns},
-					      {spec,Specs}],Opts));
-		false ->		% use dir|suite|case
-		    StepOrCover =
-			case lists:keysearch(step, 1, Opts) of
-			    {value,Step} -> [Step];
-			    false -> Cover
-			end,
-		    run_dir(LogDir, CfgFiles, EvHandlers, StepOrCover,
-			    replace_opt([{silent_connections,SilentConns}], Opts))
-	    end
+		    run_prepared(Run, Skip, Opts#opts{testspecs = Specs},
+				 StartOpts);
+		false ->
+		    run_dir(Opts, StartOpts)
+	    end;
+	Specs ->
+	    Relaxed = get_start_opt(allow_user_terms, value, false, StartOpts),
+	    %% using testspec(s) as input for test
+	    run_spec_file(Relaxed, Opts#opts{testspecs = Specs}, StartOpts)
     end.
 
-replace_opt([O={Key,_Val}|Os], Opts) ->
-    [O | replace_opt(Os, lists:keydelete(Key, 1, Opts))];
-replace_opt([], Opts) ->
-    Opts.
-
-run_spec_file(LogDir, CfgFiles, EvHandlers, Include, Specs, Relaxed, Cover, Opts) ->
+run_spec_file(Relaxed,
+	      Opts = #opts{testspecs = Specs, config = CfgFiles},
+	      StartOpts) ->
     Specs1 = case Specs of
 		 [X|_] when is_integer(X) -> [Specs];
 		 _ -> Specs
 	     end,
-    AbsSpecs = lists:map(fun(SF) -> ?abs(SF) end, Specs1), 
+    AbsSpecs = lists:map(fun(SF) -> ?abs(SF) end, Specs1),
     log_ts_names(AbsSpecs),
     case catch ct_testspec:collect_tests_from_file(AbsSpecs, Relaxed) of
-	{error,CTReason} ->
+	{Error,CTReason} when Error == error ; Error == 'EXIT' ->
 	    exit(CTReason);
 	TS ->
-	    {LogDir1,TSCoverFile,CfgFiles1,EvHandlers1,Include1} = 
-		get_data_for_node(TS, node()),
-	    application:set_env(common_test, include, Include++Include1),
-	    LogDir2 = which_logdir(LogDir, LogDir1),
-	    CoverOpt = case {Cover,TSCoverFile} of
-			   {[],undef} -> [];
-			   {_,undef} ->  Cover;
-			   {[],_} ->     [{cover,TSCoverFile}]
-		       end,
-	    case get_configfiles(CfgFiles++CfgFiles1, [], LogDir2,
-				 EvHandlers++EvHandlers1) of
+	    SpecOpts = get_data_for_node(TS, node()),
+	    Label = choose_val(Opts#opts.label,
+			       SpecOpts#opts.label),
+	    LogDir = choose_val(Opts#opts.logdir,
+				SpecOpts#opts.logdir),
+	    AllConfig = merge_vals([CfgFiles, SpecOpts#opts.config]),
+	    Cover = choose_val(Opts#opts.cover,
+			       SpecOpts#opts.cover),
+	    MultTT = choose_val(Opts#opts.multiply_timetraps,
+				SpecOpts#opts.multiply_timetraps),
+	    ScaleTT = choose_val(Opts#opts.scale_timetraps,
+				 SpecOpts#opts.scale_timetraps),
+	    AllEvHs = merge_vals([Opts#opts.event_handlers,
+				  SpecOpts#opts.event_handlers]),
+	    AllInclude = merge_vals([Opts#opts.include,
+				     SpecOpts#opts.include]),
+
+	    AllCTHooks = merge_vals([Opts#opts.ct_hooks,
+				      SpecOpts#opts.ct_hooks]),
+	    
+	    application:set_env(common_test, include, AllInclude),
+
+	    case check_and_install_configfiles(AllConfig,
+					       which(logdir,LogDir),
+					       AllEvHs,
+					       AllCTHooks) of
 		ok ->
+		    Opts1 = Opts#opts{label = Label,
+				      cover = Cover,
+				      logdir = which(logdir, LogDir),
+				      config = AllConfig,
+				      event_handlers = AllEvHs,
+				      include = AllInclude,
+				      testspecs = AbsSpecs,
+				      multiply_timetraps = MultTT,
+				      scale_timetraps = ScaleTT,
+				      ct_hooks = AllCTHooks},
 		    {Run,Skip} = ct_testspec:prepare_tests(TS, node()),
-		    do_run(Run, Skip, CoverOpt,
-			   replace_opt([{spec,AbsSpecs}], Opts),
-			   LogDir2);
+		    reformat_result(catch do_run(Run, Skip, Opts1, StartOpts));
 		{error,GCFReason} ->
 		    exit(GCFReason)
 	    end
     end.
 
-run_prepared(LogDir, CfgFiles, EvHandlers, Run, Skip, Cover, Opts) ->
-    case get_configfiles(CfgFiles, [], LogDir, EvHandlers) of
+run_prepared(Run, Skip, Opts = #opts{logdir = LogDir,
+				     config = CfgFiles,
+				     event_handlers = EvHandlers,
+				     ct_hooks = CTHooks},
+	     StartOpts) ->
+    LogDir1 = which(logdir, LogDir),
+    case check_and_install_configfiles(CfgFiles, LogDir1,
+				       EvHandlers, CTHooks) of
 	ok ->
-	    do_run(Run, Skip, Cover, Opts, LogDir);
+	    reformat_result(catch do_run(Run, Skip, Opts#opts{logdir = LogDir1},
+					 StartOpts));
 	{error,Reason} ->
 	    exit(Reason)
-    end.    
-
-run_dir(LogDir, CfgFiles, EvHandlers, StepOrCover, Opts) ->
-    AbsCfgFiles = 
-	lists:map(fun(F) -> 
-			  AbsName = ?abs(F),
-			  case filelib:is_file(AbsName) of
-			      true -> AbsName;
-			      false -> exit({no_such_file,AbsName})
-			  end
-		  end, CfgFiles), 
-
-    case install([{config,AbsCfgFiles},{event_handler,EvHandlers}], LogDir) of
+    end.
+
+check_config_file(Callback, File)->
+    case code:is_loaded(Callback) of
+	false ->
+	    case code:load_file(Callback) of
+		{module,_} -> ok;
+		{error,Why} -> exit({cant_load_callback_module,Why})
+	    end;
+	_ ->
+	    ok
+    end,
+    case Callback:check_parameter(File) of
+	{ok,{file,File}}->
+	    ?abs(File);
+	{ok,{config,_}}->
+	    File;
+	{error,{wrong_config,Message}}->
+	    exit({wrong_config,{Callback,Message}});
+	{error,{nofile,File}}->
+	    exit({no_such_file,?abs(File)})
+    end.
+
+run_dir(Opts = #opts{logdir = LogDir,
+		     config = CfgFiles,
+		     event_handlers = EvHandlers,
+		     ct_hooks = CTHook }, StartOpts) ->
+    LogDir1 = which(logdir, LogDir),
+    Opts1 = Opts#opts{logdir = LogDir1},
+    AbsCfgFiles =
+	lists:map(fun({Callback,FileList})->
+			  case code:is_loaded(Callback) of
+			      {file,_Path}->
+				  ok;
+			      false ->
+				  case code:load_file(Callback) of
+				      {module,Callback}->
+					  ok;
+				      {error,_}->
+					  exit({no_such_module,Callback})
+				  end
+			  end,
+			  {Callback,
+			   lists:map(fun(File)->
+					     check_config_file(Callback, File)
+				     end, FileList)}
+		  end, CfgFiles),
+    case install([{config,AbsCfgFiles},
+		  {event_handler,EvHandlers},
+		  {ct_hooks, CTHook}], LogDir1) of
 	ok -> ok;
 	{error,IReason} -> exit(IReason)
     end,
-    case lists:keysearch(dir,1,Opts) of
+    case lists:keysearch(dir, 1, StartOpts) of
 	{value,{_,Dirs=[Dir|_]}} when not is_integer(Dir),
 	                              length(Dirs)>1 ->
 	    %% multiple dirs (no suite)
-	    do_run(tests(Dirs), [], StepOrCover, Opts, LogDir);
+	    reformat_result(catch do_run(tests(Dirs), [], Opts1, StartOpts));
 	false ->				% no dir
 	    %% fun for converting suite name to {Dir,Mod} tuple
 	    S2M = fun(S) when is_list(S) ->
@@ -728,105 +912,139 @@ run_dir(LogDir, CfgFiles, EvHandlers, StepOrCover, Opts) ->
 		     (A) ->
 			  {".",A}
 		  end,
-	    case lists:keysearch(suite, 1, Opts) of
+	    case lists:keysearch(suite, 1, StartOpts) of
 		{value,{_,Suite}} when is_integer(hd(Suite)) ; is_atom(Suite) ->
 		    {Dir,Mod} = S2M(Suite),
-		    case listify(proplists:get_value(group, Opts, [])) ++
-			 listify(proplists:get_value(testcase, Opts, [])) of
+		    case groups_and_cases(proplists:get_value(group, StartOpts),
+					  proplists:get_value(testcase, StartOpts)) of
+			Error = {error,_} ->
+			    exit(Error);
 			[] ->
-			    do_run(tests(Dir, listify(Mod)), [], StepOrCover, Opts, LogDir);
+			    reformat_result(catch do_run(tests(Dir, listify(Mod)),
+							 [], Opts1, StartOpts));
 			GsAndCs ->
-			    do_run(tests(Dir, Mod, GsAndCs), [], StepOrCover, Opts, LogDir)
+			    reformat_result(catch do_run(tests(Dir, Mod, GsAndCs),
+							 [], Opts1, StartOpts))
 		    end;
 		{value,{_,Suites}} ->
-		    do_run(tests(lists:map(S2M, Suites)), [], StepOrCover, Opts, LogDir);
+		    reformat_result(catch do_run(tests(lists:map(S2M, Suites)),
+						 [], Opts1, StartOpts));
 		_ ->
 		    exit(no_tests_specified)
-	    end;		   
+	    end;
 	{value,{_,Dir}} ->
-	    case lists:keysearch(suite, 1, Opts) of
+	    case lists:keysearch(suite, 1, StartOpts) of
 		{value,{_,Suite}} when is_integer(hd(Suite)) ; is_atom(Suite) ->
-		    Mod = if is_atom(Suite) -> Suite; 
-			     true -> list_to_atom(Suite) 
+		    Mod = if is_atom(Suite) -> Suite;
+			     true -> list_to_atom(Suite)
 			  end,
-		    case listify(proplists:get_value(group, Opts, [])) ++
-			 listify(proplists:get_value(testcase, Opts, [])) of
+		    case groups_and_cases(proplists:get_value(group, StartOpts),
+					  proplists:get_value(testcase, StartOpts)) of
+			Error = {error,_} ->
+			    exit(Error);
 			[] ->
-			    do_run(tests(Dir, listify(Mod)), [], StepOrCover, Opts, LogDir);
+			    reformat_result(catch do_run(tests(Dir, listify(Mod)),
+							 [], Opts1, StartOpts));
 			GsAndCs ->
-			    do_run(tests(Dir, Mod, GsAndCs), [], StepOrCover, Opts, LogDir)
+			    reformat_result(catch do_run(tests(Dir, Mod, GsAndCs),
+							 [], Opts1, StartOpts))
 		    end;
 		{value,{_,Suites=[Suite|_]}} when is_list(Suite) ->
 		    Mods = lists:map(fun(Str) -> list_to_atom(Str) end, Suites),
-		    do_run(tests(delistify(Dir), Mods), [], StepOrCover, Opts, LogDir);		    
+		    reformat_result(catch do_run(tests(delistify(Dir), Mods),
+						 [], Opts1, StartOpts));
 		{value,{_,Suites}} ->
-		    do_run(tests(delistify(Dir), Suites), [], StepOrCover, Opts, LogDir);		    
+		    reformat_result(catch do_run(tests(delistify(Dir), Suites),
+						 [], Opts1, StartOpts));
 	        false ->			% no suite, only dir
-		    do_run(tests(listify(Dir)), [], StepOrCover, Opts, LogDir)
-	    end   
+		    reformat_result(catch do_run(tests(listify(Dir)),
+						 [], Opts1, StartOpts))
+	    end
     end.
 
 %%%-----------------------------------------------------------------
-%%% @hidden
+%%% @spec run_testspec(TestSpec) -> Result
+%%%   TestSpec = [term()]
 %%%
+%%% @doc Run test specified by <code>TestSpec</code>. The terms are
+%%% the same as those used in test specification files.
+%%% @equiv ct:run_testspec/1
+%%%-----------------------------------------------------------------
 
-%% using testspec(s) as input for test
 run_testspec(TestSpec) ->
     {ok,Cwd} = file:get_cwd(),
     io:format("~nCommon Test starting (cwd is ~s)~n~n", [Cwd]),
     case catch run_testspec1(TestSpec) of
-	{'EXIT',Reason} -> 
+	{'EXIT',Reason} ->
 	    file:set_cwd(Cwd),
 	    {error,Reason};
-	Result -> 
+	Result ->
 	    Result
     end.
 
 run_testspec1(TestSpec) ->
-    case ct_testspec:collect_tests_from_list(TestSpec,false) of
-	{error,CTReason} ->
+    case catch ct_testspec:collect_tests_from_list(TestSpec, false) of
+	{E,CTReason}  when E == error ; E == 'EXIT' ->
 	    exit(CTReason);
 	TS ->
-	    {LogDir,TSCoverFile,CfgFiles,EvHandlers,Include} = 
-		get_data_for_node(TS,node()),
-	    case os:getenv("CT_INCLUDE_PATH") of
-		false ->
-		    application:set_env(common_test, include, Include);
-		CtInclPath ->
-		    EnvInclude = string:tokens(CtInclPath, [$:,$ ,$,]),
-		    application:set_env(common_test, include, EnvInclude++Include)
-	    end,
-	    CoverOpt = if TSCoverFile == undef -> [];
-			  true -> [{cover,TSCoverFile}]
-		       end,
-	    case get_configfiles(CfgFiles,[],LogDir,EvHandlers) of
+	    Opts = get_data_for_node(TS, node()),
+
+	    AllInclude =
+		case os:getenv("CT_INCLUDE_PATH") of
+		    false ->
+			Opts#opts.include;
+		    CtInclPath ->
+			EnvInclude = string:tokens(CtInclPath, [$:,$ ,$,]),
+			EnvInclude++Opts#opts.include
+		end,
+	    application:set_env(common_test, include, AllInclude),
+	    LogDir1 = which(logdir,Opts#opts.logdir),
+	    case check_and_install_configfiles(Opts#opts.config, LogDir1,
+					       Opts#opts.event_handlers,
+					       Opts#opts.ct_hooks) of
 		ok ->
-		    {Run,Skip} = ct_testspec:prepare_tests(TS,node()),
-		    do_run(Run,Skip,CoverOpt,[],LogDir);
+		    Opts1 = Opts#opts{testspecs = [],
+				      logdir = LogDir1,
+				      include = AllInclude},
+		    {Run,Skip} = ct_testspec:prepare_tests(TS, node()),
+		    reformat_result(catch do_run(Run, Skip, Opts1, []));
 		{error,GCFReason} ->
 		    exit(GCFReason)
 	    end
     end.
 
-
-get_data_for_node(#testspec{logdir=LogDirs,
-			    cover=CoverFs,
-			    config=Cfgs,
-			    event_handler=EvHs,
-			    include=Incl}, Node) ->
-    LogDir = case lists:keysearch(Node,1,LogDirs) of
-		 {value,{Node,Dir}} -> Dir;
-		 false -> "."
+get_data_for_node(#testspec{label = Labels,
+			    logdir = LogDirs,
+			    cover = CoverFs,
+			    config = Cfgs,
+			    userconfig = UsrCfgs,
+			    event_handler = EvHs,
+			    ct_hooks = CTHooks,
+			    include = Incl,
+			    multiply_timetraps = MTs,
+			    scale_timetraps = STs}, Node) ->
+    Label = proplists:get_value(Node, Labels),
+    LogDir = case proplists:get_value(Node, LogDirs) of
+		 undefined -> ".";
+		 Dir -> Dir
 	     end,
-    Cover = case lists:keysearch(Node,1,CoverFs) of
-		{value,{Node,CovFile}} -> CovFile;
-		false -> undef
-	    end,
-    ConfigFiles = [F || {N,F} <- Cfgs, N==Node],
+    Cover = proplists:get_value(Node, CoverFs),
+    MT = proplists:get_value(Node, MTs),
+    ST = proplists:get_value(Node, STs),
+    ConfigFiles = [{?ct_config_txt,F} || {N,F} <- Cfgs, N==Node] ++
+	[CBF || {N,CBF} <- UsrCfgs, N==Node],
     EvHandlers =  [{H,A} || {N,H,A} <- EvHs, N==Node],
+    FiltCTHooks = [Hook || {N,Hook} <- CTHooks, N==Node],
     Include =  [I || {N,I} <- Incl, N==Node],
-    {LogDir,Cover,ConfigFiles,EvHandlers,Include}.
-
+    #opts{label = Label,
+	  logdir = LogDir,
+	  cover = Cover,
+	  config = ConfigFiles,
+	  event_handlers = EvHandlers,
+	  ct_hooks = FiltCTHooks,
+	  include = Include,
+	  multiply_timetraps = MT,
+	  scale_timetraps = ST}.
 
 refresh_logs(LogDir) ->
     {ok,Cwd} = file:get_cwd(),
@@ -851,11 +1069,19 @@ refresh_logs(LogDir) ->
 	    end
     end.
 
-which_logdir(".",Dir) ->
-    Dir;
-which_logdir(Dir,_) ->
+which(logdir, undefined) ->
+    ".";
+which(logdir, Dir) ->
     Dir.
-	   
+
+choose_val(undefined, V1) ->
+    V1;
+choose_val(V0, _V1) ->
+    V0.
+
+merge_vals(Vs) ->
+    lists:append(Vs).
+
 listify([C|_]=Str) when is_integer(C) -> [Str];
 listify(L) when is_list(L) -> L;
 listify(E) -> [E].
@@ -869,22 +1095,45 @@ delistify(E)   -> E.
 %%% @equiv ct:run/3
 run(TestDir, Suite, Cases) ->
     install([]),
-    do_run(tests(TestDir, Suite, Cases), []).
+    reformat_result(catch do_run(tests(TestDir, Suite, Cases), [])).
 
 %%%-----------------------------------------------------------------
 %%% @hidden
 %%% @equiv ct:run/2
 run(TestDir, Suite) when is_list(TestDir), is_integer(hd(TestDir)) ->
     install([]),
-    do_run(tests(TestDir, Suite), []).
+    reformat_result(catch do_run(tests(TestDir, Suite), [])).
 
 %%%-----------------------------------------------------------------
 %%% @hidden
 %%% @equiv ct:run/1
 run(TestDirs) ->
     install([]),
-    do_run(tests(TestDirs), []).
+    reformat_result(catch do_run(tests(TestDirs), [])).
 
+reformat_result({user_error,Reason}) ->
+    {error,Reason};
+reformat_result(Result) ->
+    Result.
+
+suite_to_test(Suite) ->
+    {filename:dirname(Suite),list_to_atom(filename:rootname(filename:basename(Suite)))}.
+
+groups_and_cases(Gs, Cs) when ((Gs == undefined) or (Gs == [])) and
+			      ((Cs == undefined) or (Cs == [])) ->
+    [];
+groups_and_cases(Gs, Cs) when Gs == undefined ; Gs == [] ->
+    [ensure_atom(C) || C <- listify(Cs)];
+groups_and_cases(Gs, Cs) when Cs == undefined ; Cs == [] ->
+    [{ensure_atom(G),all} || G <- listify(Gs)];
+groups_and_cases(G, Cs) when is_atom(G) ->
+    [{G,[ensure_atom(C) || C <- listify(Cs)]}];
+groups_and_cases([G], Cs) ->
+    [{ensure_atom(G),[ensure_atom(C) || C <- listify(Cs)]}];
+groups_and_cases([_,_|_] , Cs) when Cs =/= [] ->
+    {error,multiple_groups_and_cases};
+groups_and_cases(_Gs, _Cs) ->
+    {error,incorrect_group_or_case_option}.
 
 tests(TestDir, Suites, []) when is_list(TestDir), is_integer(hd(TestDir)) ->
     [{?testdir(TestDir,Suites),ensure_atom(Suites),all}];
@@ -901,30 +1150,52 @@ tests(TestDir) when is_list(TestDir), is_integer(hd(TestDir)) ->
 tests(TestDirs) when is_list(TestDirs), is_list(hd(TestDirs)) ->
     [{?testdir(TestDir,all),all,all} || TestDir <- TestDirs].
 
-do_run(Tests, Opt) ->
-    do_run(Tests, [], Opt, [], ".").
+do_run(Tests, Misc) when is_list(Misc) ->
+    do_run(Tests, Misc, ".").
 
-do_run(Tests, Opt, LogDir) ->
-    do_run(Tests, [], Opt, [], LogDir).
+do_run(Tests, Misc, LogDir) when is_list(Misc) ->
+    Opts =
+	case proplists:get_value(step, Misc) of
+	    undefined ->
+		#opts{};
+	    StepOpts ->
+		#opts{step = StepOpts}
+	end,
+    Opts1 =
+	case proplists:get_value(cover, Misc) of
+	    undefined ->
+		Opts;
+	    CoverFile ->
+		Opts#opts{cover = CoverFile}
+	end,
+    do_run(Tests, [], Opts1#opts{logdir = LogDir}, []).
+
+do_run(Tests, Skip, Opts, Args) ->
+    #opts{label = Label, cover = Cover} = Opts,
+
+    %% label - used by ct_logs
+    TestLabel =
+	if Label == undefined -> undefined;
+	   is_atom(Label)     -> atom_to_list(Label);
+	   is_list(Label)     -> Label;
+	   true               -> undefined
+	end,
+    application:set_env(common_test, test_label, TestLabel),
 
-do_run(Tests, Skip, Opt, Args, LogDir) ->
     case code:which(test_server) of
 	non_existing ->
 	    exit({error,no_path_to_test_server});
 	_ ->
-	    Opt1 = 
-		case lists:keysearch(cover, 1, Opt) of
-		    {value,{_,CoverFile}} ->
-			case ct_cover:get_spec(CoverFile) of
-			    {error,Reason} ->
-				exit({error,Reason});
-			    Spec ->
-				[{cover_spec,Spec} |
-				 lists:keydelete(cover, 1, Opt)]
-			end;
-		    _ ->
-			Opt
-		end,
+	    Opts1 = if Cover == undefined ->
+			    Opts;
+		       true ->
+			    case ct_cover:get_spec(Cover) of
+				{error,Reason} ->
+				    exit({error,Reason});
+				CoverSpec ->
+				    Opts#opts{coverspec = CoverSpec}
+			    end
+		    end,
 	    %% This env variable is used by test_server to determine
 	    %% which framework it runs under.
 	    case os:getenv("TEST_SERVER_FRAMEWORK") of
@@ -935,60 +1206,58 @@ do_run(Tests, Skip, Opt, Args, LogDir) ->
 		Other ->
 		    erlang:display(list_to_atom("Note: TEST_SERVER_FRAMEWORK = " ++ Other))
 	    end,
-	    case ct_util:start(LogDir) of
+	    case ct_util:start(Opts#opts.logdir) of
 		{error,interactive_mode} ->
 		    io:format("CT is started in interactive mode. "
 			      "To exit this mode, run ct:stop_interactive().\n"
 			      "To enter the interactive mode again, "
 			      "run ct:start_interactive()\n\n",[]),
 		    {error,interactive_mode};
-
 		_Pid ->
-		    %% save style sheet info
-		    case lists:keysearch(stylesheet, 1, Args) of
-			{value,{_,SSFile}} ->
-			    ct_util:set_testdata({stylesheet,SSFile});
-			_ ->
-			    ct_util:set_testdata({stylesheet,undefined})
-		    end,
-
-		    case lists:keysearch(silent_connections, 1, Args) of
-			{value,{silent_connections,undefined}} ->
-			    ok;
-			{value,{silent_connections,[]}} ->
+		    %% save stylesheet info
+		    ct_util:set_testdata({stylesheet,Opts#opts.stylesheet}),
+		    %% enable silent connections
+		    case Opts#opts.silent_connections of
+			[] ->
 			    Conns = ct_util:override_silence_all_connections(),
 			    ct_logs:log("Silent connections", "~p", [Conns]);
-			{value,{silent_connections,Cs}} ->
-			    Conns = lists:map(fun(S) when is_list(S) ->
-						      list_to_atom(S);
-						 (A) -> A
-					      end, Cs),
+			Conns when is_list(Conns) ->
 			    ct_util:override_silence_connections(Conns),
 			    ct_logs:log("Silent connections", "~p", [Conns]);
 			_ ->
 			    ok
 		    end,
-		    log_ts_names(Args),
+		    log_ts_names(Opts1#opts.testspecs),
 		    TestSuites = suite_tuples(Tests),
 
-		    {SuiteMakeErrors,AllMakeErrors} =
+		    {_TestSuites1,SuiteMakeErrors,AllMakeErrors} =
 			case application:get_env(common_test, auto_compile) of
 			    {ok,false} ->
-				SuitesNotFound = verify_suites(TestSuites),
-				{SuitesNotFound,SuitesNotFound};
+				{TestSuites1,SuitesNotFound} =
+				    verify_suites(TestSuites),
+				{TestSuites1,SuitesNotFound,SuitesNotFound};
 			    _ ->
 				{SuiteErrs,HelpErrs} = auto_compile(TestSuites),
-				{SuiteErrs,SuiteErrs++HelpErrs}
+				{TestSuites,SuiteErrs,SuiteErrs++HelpErrs}
 			end,
 
 		    case continue(AllMakeErrors) of
 			true ->
 			    SavedErrors = save_make_errors(SuiteMakeErrors),
 			    ct_repeat:log_loop_info(Args),
-			    {Tests1,Skip1} = final_tests(Tests,[],Skip,SavedErrors),
-			    R = do_run_test(Tests1, Skip1, Opt1),
-			    ct_util:stop(normal),
-			    R;
+
+			    {Tests1,Skip1} = final_tests(Tests,Skip,SavedErrors),
+
+			    R = (catch do_run_test(Tests1, Skip1, Opts1)),
+			    case R of
+				{EType,_} = Error when EType == user_error ;
+						       EType == error ->
+				    ct_util:stop(clean),
+				    exit(Error);
+				_ ->
+				    ct_util:stop(normal),
+				    R
+			    end;
 			false ->
 			    io:nl(),
 			    ct_util:stop(clean),
@@ -1012,7 +1281,7 @@ auto_compile(TestSuites) ->
 	case application:get_env(common_test, include) of
 	    {ok,UserInclDirs} when length(UserInclDirs) > 0 ->
 		io:format("Including the following directories:~n"),
-		[begin io:format("~p~n",[UserInclDir]), {i,UserInclDir} end || 
+		[begin io:format("~p~n",[UserInclDir]), {i,UserInclDir} end ||
 		 UserInclDir <- UserInclDirs];
 	    _ ->
 		[]
@@ -1020,11 +1289,11 @@ auto_compile(TestSuites) ->
     SuiteMakeErrors =
 	lists:flatmap(fun({TestDir,Suite} = TS) ->
 			      case run_make(suites, TestDir, Suite, UserInclude) of
-				  {error,{make_failed,Bad}} -> 
+				  {error,{make_failed,Bad}} ->
 				      [{TS,Bad}];
-				  {error,_} -> 
+				  {error,_} ->
 				      [{TS,[filename:join(TestDir,"*_SUITE")]}];
-				  _ -> 
+				  _ ->
 				      []
 			      end
 		      end, TestSuites),
@@ -1048,39 +1317,63 @@ auto_compile(TestSuites) ->
 		      true ->		    % already visited
 			  {Done,Failed}
 		  end
-	  end, {[],[]}, TestSuites),    
+	  end, {[],[]}, TestSuites),
     {SuiteMakeErrors,lists:reverse(HelpMakeErrors)}.
 
 %% verify that specified test suites exist (if auto compile is disabled)
 verify_suites(TestSuites) ->
     io:nl(),
-    Verify = 
-	fun({Dir,Suite},NotFound) ->
+    Verify =
+	fun({Dir,Suite}=DS,{Found,NotFound}) ->
 		case locate_test_dir(Dir, Suite) of
 		    {ok,TestDir} ->
 			if Suite == all ->
-				NotFound;
+				{[DS|Found],NotFound};
 			   true ->
-				Beam = filename:join(TestDir, atom_to_list(Suite)++".beam"),
+				Beam = filename:join(TestDir,
+						     atom_to_list(Suite)++".beam"),
 				case filelib:is_regular(Beam) of
-				    true  -> 
-					NotFound;
-				    false -> 
-					Name = filename:join(TestDir, atom_to_list(Suite)),
-					io:format("Suite ~w not found in directory ~s~n", 
-						  [Suite,TestDir]),
-					[{{Dir,Suite},[Name]} | NotFound]
+				    true  ->
+					{[DS|Found],NotFound};
+				    false ->
+					case code:is_loaded(Suite) of
+					    {file,SuiteFile} ->
+						%% test suite is already loaded and
+						%% since auto_compile == false,
+						%% let's assume the user has
+						%% loaded the beam file explicitly
+						ActualDir = filename:dirname(SuiteFile),
+						{[{ActualDir,Suite}|Found],NotFound};
+					    false ->
+						Name =
+						    filename:join(TestDir,
+								  atom_to_list(Suite)),
+						io:format(user,
+							  "Suite ~w not found"
+							  "in directory ~s~n",
+							  [Suite,TestDir]),
+						{Found,[{DS,[Name]}|NotFound]}
+					end
 				end
 			end;
 		    {error,_Reason} ->
-			io:format("Directory ~s is invalid~n", [Dir]),
-			Name = filename:join(Dir, atom_to_list(Suite)),
-			[{{Dir,Suite},[Name]} | NotFound]
+			case code:is_loaded(Suite) of
+			    {file,SuiteFile} ->
+				%% test suite is already loaded and since
+				%% auto_compile == false, let's assume the
+				%% user has loaded the beam file explicitly
+				ActualDir = filename:dirname(SuiteFile),
+				{[{ActualDir,Suite}|Found],NotFound};
+			    false ->
+				io:format(user, "Directory ~s is invalid~n", [Dir]),
+				Name = filename:join(Dir, atom_to_list(Suite)),
+				{Found,[{DS,[Name]}|NotFound]}
+			end
 		end
 	end,
-    lists:reverse(lists:foldl(Verify, [], TestSuites)).
-		     
-    
+    {ActualFound,Missing} = lists:foldl(Verify, {[],[]}, TestSuites),
+    {lists:reverse(ActualFound),lists:reverse(Missing)}.
+
 save_make_errors([]) ->
     [];
 save_make_errors(Errors) ->
@@ -1096,7 +1389,7 @@ get_bad_suites([{{_TestDir,_Suite},Failed}|Errors], BadSuites) ->
 get_bad_suites([], BadSuites) ->
     BadSuites.
 
-    
+
 
 %%%-----------------------------------------------------------------
 %%% @hidden
@@ -1107,7 +1400,7 @@ step(TestDir, Suite, Case) ->
 %%%-----------------------------------------------------------------
 %%% @hidden
 %%% @equiv ct:step/4
-step(TestDir, Suite, Case, Opts) when is_list(TestDir), is_atom(Suite), is_atom(Case), 
+step(TestDir, Suite, Case, Opts) when is_list(TestDir), is_atom(Suite), is_atom(Case),
 				   Suite =/= all, Case =/= all ->
     do_run([{TestDir,Suite,Case}], [{step,Opts}]).
 
@@ -1121,8 +1414,13 @@ suite_tuples([{TestDir,Suite,_} | Tests]) when is_atom(Suite) ->
 suite_tuples([]) ->
     [].
 
-final_tests([{TestDir,Suites,_}|Tests],
-	    Final, Skip, Bad) when is_list(Suites), is_atom(hd(Suites)) ->
+final_tests(Tests, Skip, Bad) ->
+    {Tests1,Skip1} = final_tests1(Tests, [], Skip, Bad),
+    Skip2 = final_skip(Skip1, []),
+    {Tests1,Skip2}.
+
+final_tests1([{TestDir,Suites,_}|Tests], Final, Skip, Bad) when
+      is_list(Suites), is_atom(hd(Suites)) ->
 %     Separate =
 % 	fun(S,{DoSuite,Dont}) ->		
 % 		case lists:keymember({TestDir,S},1,Bad) of
@@ -1140,10 +1438,10 @@ final_tests([{TestDir,Suites,_}|Tests],
 
     Skip1 = [{TD,S,"Make failed"} || {{TD,S},_} <- Bad, S1 <- Suites,
 				     S == S1, TD == TestDir],
-    Final1 = [{TestDir,S,all} || S <- Suites], 
-    final_tests(Tests, lists:reverse(Final1)++Final, Skip++Skip1, Bad);
+    Final1 = [{TestDir,S,all} || S <- Suites],
+    final_tests1(Tests, lists:reverse(Final1)++Final, Skip++Skip1, Bad);
 
-final_tests([{TestDir,all,all}|Tests], Final, Skip, Bad) ->
+final_tests1([{TestDir,all,all}|Tests], Final, Skip, Bad) ->
     MissingSuites =
 	case lists:keysearch({TestDir,all}, 1, Bad) of
 	    {value,{_,Failed}} ->
@@ -1153,27 +1451,59 @@ final_tests([{TestDir,all,all}|Tests], Final, Skip, Bad) ->
 	end,
     Missing = [{TestDir,S,"Make failed"} || S <- MissingSuites],
     Final1 = [{TestDir,all,all}|Final],
-    final_tests(Tests, Final1, Skip++Missing, Bad);
+    final_tests1(Tests, Final1, Skip++Missing, Bad);
 
-final_tests([{TestDir,Suite,Cases}|Tests],
-	    Final, Skip, Bad) when Cases==[]; Cases==all  ->
-    final_tests([{TestDir,[Suite],all}|Tests], Final, Skip, Bad);
+final_tests1([{TestDir,Suite,Cases}|Tests], Final, Skip, Bad) when
+      Cases==[]; Cases==all  ->
+    final_tests1([{TestDir,[Suite],all}|Tests], Final, Skip, Bad);
 
-final_tests([{TestDir,Suite,Cases}|Tests], Final, Skip, Bad) ->
+final_tests1([{TestDir,Suite,GrsOrCs}|Tests], Final, Skip, Bad) when
+      is_list(GrsOrCs) ->
     case lists:keymember({TestDir,Suite}, 1, Bad) of
-	false ->
-	    Do = {TestDir,Suite,Cases},
-	    final_tests(Tests, [Do|Final], Skip, Bad);
 	true ->
-	    Do = {TestDir,Suite,Cases},
-	    Skip1 = Skip ++ [{TestDir,Suite,Cases,"Make failed"}],
-	    final_tests(Tests, [Do|Final], Skip1, Bad)
+	    Skip1 = Skip ++ [{TestDir,Suite,all,"Make failed"}],
+	    final_tests1(Tests, [{TestDir,Suite,all}|Final], Skip1, Bad);
+	false ->
+	    GrsOrCs1 =
+		lists:flatmap(
+		  %% for now, only flat group defs are allowed as
+		  %% start options and test spec terms
+		  fun({all,all}) ->
+			  ct_framework:make_all_conf(TestDir,
+						      Suite, []);
+		     ({skipped,Group,TCs}) ->
+			  [ct_framework:make_conf(TestDir, Suite,
+						  Group, [skipped], TCs)];
+		     ({Group,TCs}) ->
+			  [ct_framework:make_conf(TestDir, Suite,
+						  Group, [], TCs)];
+		     (TC) ->
+			  [TC]
+		  end, GrsOrCs),
+	    Do = {TestDir,Suite,GrsOrCs1},
+	    final_tests1(Tests, [Do|Final], Skip, Bad)
     end;
 
-final_tests([], Final, Skip, _Bad) ->
+final_tests1([], Final, Skip, _Bad) ->
     {lists:reverse(Final),Skip}.
 
-continue([]) ->    
+final_skip([{TestDir,Suite,{all,all},Reason}|Skips], Final) ->
+    SkipConf =  ct_framework:make_conf(TestDir, Suite, all, [], all),
+    Skip = {TestDir,Suite,SkipConf,Reason},
+    final_skip(Skips, [Skip|Final]);
+
+final_skip([{TestDir,Suite,{Group,TCs},Reason}|Skips], Final) ->
+    Conf =  ct_framework:make_conf(TestDir, Suite, Group, [], TCs),
+    Skip = {TestDir,Suite,Conf,Reason},
+    final_skip(Skips, [Skip|Final]);
+
+final_skip([Skip|Skips], Final) ->
+    final_skip(Skips, [Skip|Final]);
+
+final_skip([], Final) ->
+    lists:reverse(Final).
+
+continue([]) ->
     true;
 continue(_MakeErrors) ->
     io:nl(),
@@ -1214,7 +1544,7 @@ set_group_leader_same_as_shell() ->
 			     false
 		     end
 	     end,	
-    case [P || P <- processes(), GS2or3(P), 
+    case [P || P <- processes(), GS2or3(P),
 	       true == lists:keymember(shell,1,element(2,process_info(P,dictionary)))] of
 	[GL|_] ->
 	    group_leader(GL, self());
@@ -1238,29 +1568,29 @@ check_and_add([{TestDir0,M,_} | Tests], Added) ->
 check_and_add([], _) ->
     ok.
 
-do_run_test(Tests, Skip, Opt) ->
+do_run_test(Tests, Skip, Opts) ->
     case check_and_add(Tests, []) of
 	ok ->
 	    ct_util:set_testdata({stats,{0,0,{0,0}}}),
 	    ct_util:set_testdata({cover,undefined}),
 	    test_server_ctrl:start_link(local),
-	    case lists:keysearch(cover_spec, 1, Opt) of
-		{value,{_,CovData={CovFile,
-				   CovNodes,
-				   _CovImport,
-				   CovExport,
-				   #cover{app        = CovApp,
-					  level      = CovLevel,
-					  excl_mods  = CovExcl,
-					  incl_mods  = CovIncl,
-					  cross      = CovCross,
-					  src        = _CovSrc}}}} ->
+	    case Opts#opts.coverspec of
+		CovData={CovFile,
+			 CovNodes,
+			 _CovImport,
+			 CovExport,
+			 #cover{app        = CovApp,
+				level      = CovLevel,
+				excl_mods  = CovExcl,
+				incl_mods  = CovIncl,
+				cross      = CovCross,
+				src        = _CovSrc}} ->
 		    ct_logs:log("COVER INFO","Using cover specification file: ~s~n"
 				"App: ~w~n"
 				"Cross cover: ~w~n"
 				"Including ~w modules~n"
 				"Excluding ~w modules",
-				[CovFile,CovApp,CovCross,length(CovIncl),length(CovExcl)]), 
+				[CovFile,CovApp,CovCross,length(CovIncl),length(CovExcl)]),
 
 		    %% cover export file will be used for export and import
 		    %% between tests so make sure it doesn't exist initially
@@ -1293,33 +1623,38 @@ do_run_test(Tests, Skip, Opt) ->
 		    true;
 		_ ->
 		    false
-	    end,	 
+	    end,
+
 	    %% let test_server expand the test tuples and count no of cases
 	    {Suites,NoOfCases} = count_test_cases(Tests, Skip),
 	    Suites1 = delete_dups(Suites),
 	    NoOfTests = length(Tests),
 	    NoOfSuites = length(Suites1),
-	    ct_util:warn_duplicates(Suites1),	    
+	    ct_util:warn_duplicates(Suites1),
 	    {ok,Cwd} = file:get_cwd(),
 	    io:format("~nCWD set to: ~p~n", [Cwd]),
 	    if NoOfCases == unknown ->
-		    io:format("~nTEST INFO: ~w test(s), ~w suite(s)~n~n", 
+		    io:format("~nTEST INFO: ~w test(s), ~w suite(s)~n~n",
 			      [NoOfTests,NoOfSuites]),
-		    ct_logs:log("TEST INFO","~w test(s), ~w suite(s)", 
+		    ct_logs:log("TEST INFO","~w test(s), ~w suite(s)",
 				[NoOfTests,NoOfSuites]);
 	       true ->
-		    io:format("~nTEST INFO: ~w test(s), ~w case(s) in ~w suite(s)~n~n", 
+		    io:format("~nTEST INFO: ~w test(s), ~w case(s) in ~w suite(s)~n~n",
 			      [NoOfTests,NoOfCases,NoOfSuites]),
-		    ct_logs:log("TEST INFO","~w test(s), ~w case(s) in ~w suite(s)", 
+		    ct_logs:log("TEST INFO","~w test(s), ~w case(s) in ~w suite(s)",
 				[NoOfTests,NoOfCases,NoOfSuites])
 	    end,
+
+	    test_server_ctrl:multiply_timetraps(Opts#opts.multiply_timetraps),
+	    test_server_ctrl:scale_timetraps(Opts#opts.scale_timetraps),
+
 	    ct_event:notify(#event{name=start_info,
 				   node=node(),
 				   data={NoOfTests,NoOfSuites,NoOfCases}}),
-	    CleanUp = add_jobs(Tests, Skip, Opt, []),
+	    CleanUp = add_jobs(Tests, Skip, Opts, []),
 	    unlink(whereis(test_server_ctrl)),
-	    catch test_server_ctrl:wait_finish(), 
-	    %% check if last testcase has left a "dead" trace window 
+	    catch test_server_ctrl:wait_finish(),
+	    %% check if last testcase has left a "dead" trace window
 	    %% behind, and if so, kill it
 	    case ct_util:get_testdata(interpret) of
 		{_What,kill,{TCPid,AttPid}} ->
@@ -1327,8 +1662,8 @@ do_run_test(Tests, Skip, Opt) ->
 		_ ->
 		    ok
 	    end,
-	    lists:foreach(fun(Suite) -> 
-				  maybe_cleanup_interpret(Suite, Opt) 
+	    lists:foreach(fun(Suite) ->
+				  maybe_cleanup_interpret(Suite, Opts#opts.step)
 			  end, CleanUp);
 	Error ->
 	    Error
@@ -1344,21 +1679,32 @@ count_test_cases(Tests, Skip) ->
     SendResult = fun(Me, Result) -> Me ! {no_of_cases,Result} end,
     TSPid = test_server_ctrl:start_get_totals(SendResult),
     Ref = erlang:monitor(process, TSPid),
-    add_jobs(Tests, Skip, [], []),
-    {Suites,NoOfCases} = count_test_cases1(length(Tests), 0, [], Ref),
-    erlang:demonitor(Ref),
-    test_server_ctrl:stop_get_totals(),
-    {Suites,NoOfCases}.
+    add_jobs(Tests, Skip, #opts{}, []),
+    Counted = (catch count_test_cases1(length(Tests), 0, [], Ref)),
+    erlang:demonitor(Ref, [flush]),
+    case Counted of
+	{error,{test_server_died}} = Error ->
+	    throw(Error);
+	{error,Reason} ->
+	    unlink(whereis(test_server_ctrl)),
+	    test_server_ctrl:stop(),
+	    throw({user_error,Reason});
+	Result ->
+	    test_server_ctrl:stop_get_totals(),
+	    Result
+    end.
 
 count_test_cases1(0, N, Suites, _) ->
     {lists:flatten(Suites), N};
 count_test_cases1(Jobs, N, Suites, Ref) ->
     receive
-	{no_of_cases,{Ss,N1}} -> 
+	{_,{error,_Reason} = Error} ->
+	    throw(Error);
+	{no_of_cases,{Ss,N1}} ->
 	    count_test_cases1(Jobs-1, add_known(N,N1), [Ss|Suites], Ref);
-	{'DOWN', Ref, _, _, _} -> 
-	    {[],0}
-    end.				      
+	{'DOWN', Ref, _, _, Info} ->
+	    throw({error,{test_server_died,Info}})
+    end.
 
 add_known(unknown, _) ->
     unknown;
@@ -1367,72 +1713,109 @@ add_known(_, unknown) ->
 add_known(N, N1) ->
     N+N1.
 
-add_jobs([{TestDir,all,_}|Tests], Skip, Opt, CleanUp) ->
+add_jobs([{TestDir,all,_}|Tests], Skip, Opts, CleanUp) ->
     Name = get_name(TestDir),
     case catch test_server_ctrl:add_dir_with_skip(Name, TestDir,
 						  skiplist(TestDir,Skip)) of
-	{'EXIT',_} -> 
+	{'EXIT',_} ->
 	    CleanUp;
 	_ ->
 	    wait_for_idle(),
-	    add_jobs(Tests, Skip, Opt, CleanUp)
+	    add_jobs(Tests, Skip, Opts, CleanUp)
     end;
-add_jobs([{TestDir,[Suite],all}|Tests], Skip, Opt, CleanUp) when is_atom(Suite) ->
-    add_jobs([{TestDir,Suite,all}|Tests], Skip, Opt, CleanUp);
-add_jobs([{TestDir,Suites,all}|Tests], Skip, Opt, CleanUp) when is_list(Suites) ->
+add_jobs([{TestDir,[Suite],all}|Tests], Skip, Opts, CleanUp) when is_atom(Suite) ->
+    add_jobs([{TestDir,Suite,all}|Tests], Skip, Opts, CleanUp);
+add_jobs([{TestDir,Suites,all}|Tests], Skip, Opts, CleanUp) when is_list(Suites) ->
     Name = get_name(TestDir) ++ ".suites",
     case catch test_server_ctrl:add_module_with_skip(Name, Suites,
 						     skiplist(TestDir,Skip)) of
-	{'EXIT',_} -> 
+	{'EXIT',_} ->
 	    CleanUp;
 	_ ->
 	    wait_for_idle(),
-	    add_jobs(Tests, Skip, Opt, CleanUp)
+	    add_jobs(Tests, Skip, Opts, CleanUp)
     end;
-add_jobs([{TestDir,Suite,all}|Tests], Skip, Opt, CleanUp) ->
-    case maybe_interpret(Suite, all, Opt) of
+add_jobs([{TestDir,Suite,all}|Tests], Skip, Opts, CleanUp) ->
+    case maybe_interpret(Suite, all, Opts) of
 	ok ->
 	    Name =  get_name(TestDir) ++ "." ++ atom_to_list(Suite),
 	    case catch test_server_ctrl:add_module_with_skip(Name, [Suite],
 							     skiplist(TestDir,Skip)) of
-		{'EXIT',_} -> 
+		{'EXIT',_} ->
+		    CleanUp;
+		_ ->
+		    wait_for_idle(),
+		    add_jobs(Tests, Skip, Opts, [Suite|CleanUp])
+	    end;
+	Error ->
+	    Error
+    end;
+
+%% group (= conf case in test_server)
+add_jobs([{TestDir,Suite,Confs}|Tests], Skip, Opts, CleanUp) when
+      element(1, hd(Confs)) == conf ->
+    Group = fun(Conf) -> proplists:get_value(name, element(2, Conf)) end,
+    TestCases = fun(Conf) -> element(4, Conf) end,
+    TCTestName = fun(all) -> "";
+		    ([C]) when is_atom(C) -> "." ++ atom_to_list(C);
+		    (Cs) when is_list(Cs) -> ".cases"
+		 end,
+    GrTestName =
+	case Confs of
+	    [Conf] ->
+		"." ++ atom_to_list(Group(Conf)) ++ TCTestName(TestCases(Conf));
+	    _ ->
+		".groups"
+	end,
+    TestName = get_name(TestDir) ++ "." ++ atom_to_list(Suite) ++ GrTestName,
+    case maybe_interpret(Suite, init_per_group, Opts) of
+	ok ->
+	    case catch test_server_ctrl:add_conf_with_skip(TestName, Suite, Confs,
+							   skiplist(TestDir,Skip)) of
+		{'EXIT',_} ->
 		    CleanUp;
 		_ ->
 		    wait_for_idle(),
-		    add_jobs(Tests, Skip, Opt, [Suite|CleanUp])
+		    add_jobs(Tests, Skip, Opts, [Suite|CleanUp])
 	    end;
 	Error ->
 	    Error
     end;
-add_jobs([{TestDir,Suite,[Case]}|Tests], Skip, Opt, CleanUp) when is_atom(Case) ->
-    add_jobs([{TestDir,Suite,Case}|Tests], Skip, Opt, CleanUp);
-add_jobs([{TestDir,Suite,Cases}|Tests], Skip, Opt, CleanUp) when is_list(Cases) ->
-    case maybe_interpret(Suite, Cases, Opt) of
+
+%% test case
+add_jobs([{TestDir,Suite,[Case]}|Tests], Skip, Opts, CleanUp) when is_atom(Case) ->
+    add_jobs([{TestDir,Suite,Case}|Tests], Skip, Opts, CleanUp);
+
+add_jobs([{TestDir,Suite,Cases}|Tests], Skip, Opts, CleanUp) when is_list(Cases) ->
+    Cases1 = lists:map(fun({GroupName,_}) when is_atom(GroupName) -> GroupName;
+			  (Case) -> Case
+		       end, Cases),
+    case maybe_interpret(Suite, Cases1, Opts) of
 	ok ->
 	    Name =  get_name(TestDir) ++ "." ++	atom_to_list(Suite) ++ ".cases",
-	    case catch test_server_ctrl:add_cases_with_skip(Name, Suite, Cases,
+	    case catch test_server_ctrl:add_cases_with_skip(Name, Suite, Cases1,
 							    skiplist(TestDir,Skip)) of
-		{'EXIT',_} -> 
+		{'EXIT',_} ->
 		    CleanUp;
 		_ ->
 		    wait_for_idle(),
-		    add_jobs(Tests, Skip, Opt, [Suite|CleanUp])
+		    add_jobs(Tests, Skip, Opts, [Suite|CleanUp])
 	    end;
 	Error ->
 	    Error
     end;
-add_jobs([{TestDir,Suite,Case}|Tests], Skip, Opt, CleanUp) when is_atom(Case) ->
-    case maybe_interpret(Suite, Case, Opt) of
+add_jobs([{TestDir,Suite,Case}|Tests], Skip, Opts, CleanUp) when is_atom(Case) ->
+    case maybe_interpret(Suite, Case, Opts) of
 	ok ->
-	    Name = get_name(TestDir) ++	"." ++ atom_to_list(Suite) ++ "." ++ 
+	    Name = get_name(TestDir) ++	"." ++ atom_to_list(Suite) ++ "." ++
 		atom_to_list(Case),
 	    case catch test_server_ctrl:add_case_with_skip(Name, Suite, Case,
 							   skiplist(TestDir,Skip)) of
-		{'EXIT',_} -> 
+		{'EXIT',_} ->
 		    CleanUp;
 		_ ->
 		    wait_for_idle(),
-		    add_jobs(Tests, Skip, Opt, [Suite|CleanUp])
+		    add_jobs(Tests, Skip, Opts, [Suite|CleanUp])
 	    end;
 	Error ->
 	    Error
@@ -1453,7 +1836,7 @@ wait_for_idle() ->
 			 idle -> ok;
 			 {'DOWN', Ref, _, _, _} -> error
 		     end,
-	    erlang:demonitor(Ref),
+	    erlang:demonitor(Ref, [flush]),
 	    ct_util:update_last_run_index(),
 	    Result
     end.
@@ -1482,7 +1865,7 @@ get_name(Dir) ->
 	end,
     Base = filename:basename(TestDir),
     case filename:basename(filename:dirname(TestDir)) of
-	"" -> 
+	"" ->
 	    Base;
 	TopDir ->
 	    TopDir ++ "." ++ Base
@@ -1513,15 +1896,15 @@ run_make(Targets, TestDir0, Mod, UserInclude) ->
 				       {i,CtInclude},
 				       {i,XmerlInclude},
 				       debug_info],
-	    Result = 
+	    Result =
 		if Mod == all ; Targets == helpmods ->
 			case (catch ct_make:all([noexec|ErlFlags])) of
-			    {'EXIT',_} = Failure -> 
+			    {'EXIT',_} = Failure ->
 				Failure;
 			    MakeInfo ->
 				FileTest = fun(F, suites) -> is_suite(F);
-					      (F, helpmods) -> not is_suite(F);
-					      (_, _) -> true end, 
+					      (F, helpmods) -> not is_suite(F)
+					   end,
 				Files = lists:flatmap(fun({F,out_of_date}) ->
 							      case FileTest(F, Targets) of
 								  true -> [F];
@@ -1535,7 +1918,7 @@ run_make(Targets, TestDir0, Mod, UserInclude) ->
 		   true ->
 			(catch ct_make:files([Mod], [load|ErlFlags]))
 		end,
-	    
+
 	    ok = file:set_cwd(Cwd),
 	    %% send finished_make notification
 	    ct_event:notify(#event{name=finished_make,
@@ -1549,7 +1932,7 @@ run_make(Targets, TestDir0, Mod, UserInclude) ->
 		    {error,{make_crashed,TestDir,Reason}};
 		{error,ModInfo} ->
 		    io:format("{error,make_failed}\n", []),
-		    Bad = [filename:join(TestDir, M) || {M,R} <- ModInfo, 
+		    Bad = [filename:join(TestDir, M) || {M,R} <- ModInfo,
 							R == error],
 		    {error,{make_failed,Bad}}
 	    end;
@@ -1561,8 +1944,8 @@ run_make(Targets, TestDir0, Mod, UserInclude) ->
 get_dir(App, Dir) ->
     filename:join(code:lib_dir(App), Dir).
 
-maybe_interpret(Suite, Cases, [{step,StepOpts}]) ->
-    %% if other suite has run before this one, check if last testcase 
+maybe_interpret(Suite, Cases, #opts{step = StepOpts}) when StepOpts =/= undefined ->
+    %% if other suite has run before this one, check if last testcase
     %% has left a "dead" trace window behind, and if so, kill it
     case ct_util:get_testdata(interpret) of
 	{_What,kill,{TCPid,AttPid}} ->
@@ -1605,7 +1988,7 @@ maybe_interpret2(Suite, Cases, StepOpts) ->
     WinOp = case lists:member(keep_inactive, ensure_atom(StepOpts)) of
 		true -> no_kill;
 		false -> kill
-	    end,		    
+	    end,
     ct_util:set_testdata({interpret,{{Suite,Cases},WinOp,
 				     {undefined,undefined}}}),
     ok.
@@ -1621,37 +2004,44 @@ set_break_on_config(Suite, StepOpts) ->
 	    ok
     end.
 
-maybe_cleanup_interpret(Suite, [{step,_}]) ->
-    i:iq(Suite);
-maybe_cleanup_interpret(_, _) ->
-    ok.
+maybe_cleanup_interpret(_, undefined) ->
+    ok;
+maybe_cleanup_interpret(Suite, _) ->
+    i:iq(Suite).
+
+log_ts_names([]) ->
+    ok;
+log_ts_names(Specs) ->
+    List = lists:map(fun(Name) ->
+			     Name ++ " "
+		     end, Specs),
+    ct_logs:log("Test Specification file(s)", "~s",
+		[lists:flatten(List)]).
 
-log_ts_names(Args) ->
-    case lists:keysearch(spec, 1, Args) of
-	{value,{_,Specs}} ->
-	    List = lists:map(fun(Name) ->
-				     Name ++ " "
-			     end, Specs),
-	    ct_logs:log("Test Specification file(s)", "~s",
-			[lists:flatten(List)]);
-	_ ->
-	    ok
-    end.
-			  
 merge_arguments(Args) ->
     merge_arguments(Args, []).
 
 merge_arguments([LogDir={logdir,_}|Args], Merged) ->
     merge_arguments(Args, handle_arg(replace, LogDir, Merged));
+
 merge_arguments([CoverFile={cover,_}|Args], Merged) ->
     merge_arguments(Args, handle_arg(replace, CoverFile, Merged));
-merge_arguments([Arg={_,_}|Args], Merged) ->
+
+merge_arguments([{'case',TC}|Args], Merged) ->
+    merge_arguments(Args, handle_arg(merge, {testcase,TC}, Merged));
+
+merge_arguments([Arg|Args], Merged) ->
     merge_arguments(Args, handle_arg(merge, Arg, Merged));
+
 merge_arguments([], Merged) ->
     Merged.
 
 handle_arg(replace, {Key,Elems}, [{Key,_}|Merged]) ->
     [{Key,Elems}|Merged];
+handle_arg(merge, {event_handler_init,Elems}, [{event_handler_init,PrevElems}|Merged]) ->
+    [{event_handler_init,PrevElems++["add"|Elems]}|Merged];
+handle_arg(merge, {userconfig,Elems}, [{userconfig,PrevElems}|Merged]) ->
+    [{userconfig,PrevElems++["add"|Elems]}|Merged];
 handle_arg(merge, {Key,Elems}, [{Key,PrevElems}|Merged]) ->
     [{Key,PrevElems++Elems}|Merged];
 handle_arg(Op, Arg, [Other|Merged]) ->
@@ -1659,6 +2049,205 @@ handle_arg(Op, Arg, [Other|Merged]) ->
 handle_arg(_,Arg,[]) ->
     [Arg].
 
+get_start_opt(Key, IfExists, Args) ->
+    get_start_opt(Key, IfExists, undefined, Args).
+
+get_start_opt(Key, IfExists, IfNotExists, Args) ->
+    case lists:keysearch(Key, 1, Args) of
+	{value,{Key,Val}} when is_function(IfExists) ->
+	    IfExists(Val);
+	{value,{Key,Val}} when IfExists == value ->
+	    Val;
+	{value,{Key,_Val}} ->
+	    IfExists;
+	_ ->
+	    IfNotExists
+    end.
+
+ct_hooks_args2opts(Args) ->
+    ct_hooks_args2opts(
+      proplists:get_value(ct_hooks, Args, []),[]).
+
+ct_hooks_args2opts([CTH,Arg,"and"| Rest],Acc) ->
+    ct_hooks_args2opts(Rest,[{list_to_atom(CTH),
+				     parse_cth_args(Arg)}|Acc]);
+ct_hooks_args2opts([CTH], Acc) ->
+    ct_hooks_args2opts([CTH,"and"],Acc);
+ct_hooks_args2opts([CTH, "and" | Rest], Acc) ->
+    ct_hooks_args2opts(Rest,[list_to_atom(CTH)|Acc]);
+ct_hooks_args2opts([CTH, Args], Acc) ->
+    ct_hooks_args2opts([CTH, Args, "and"],Acc);
+ct_hooks_args2opts([],Acc) ->
+    lists:reverse(Acc).
+
+parse_cth_args(String) ->
+    try
+	true = io_lib:printable_list(String),
+	{ok,Toks,_} = erl_scan:string(String++"."),
+	{ok, Args} = erl_parse:parse_term(Toks),
+	Args
+    catch _:_ ->
+	    String
+    end.
+
+
+event_handler_args2opts(Args) ->
+    case proplists:get_value(event_handler, Args) of
+	undefined ->
+	    event_handler_args2opts([], Args);
+	EHs ->
+	    event_handler_args2opts([{list_to_atom(EH),[]} || EH <- EHs], Args)
+    end.
+event_handler_args2opts(Default, Args) ->
+    case proplists:get_value(event_handler_init, Args) of
+	undefined ->
+	    Default;
+	EHs ->
+	    event_handler_init_args2opts(EHs)
+    end.
+event_handler_init_args2opts([EH, Arg, "and" | EHs]) ->
+    [{list_to_atom(EH),lists:flatten(io_lib:format("~s",[Arg]))} |
+     event_handler_init_args2opts(EHs)];
+event_handler_init_args2opts([EH, Arg]) ->
+    [{list_to_atom(EH),lists:flatten(io_lib:format("~s",[Arg]))}];
+event_handler_init_args2opts([]) ->
+    [].
+
+%% This function reads pa and pz arguments, converts dirs from relative
+%% to absolute, and re-inserts them in the code path. The order of the
+%% dirs in the code path remain the same. Note however that since this
+%% function is only used for arguments "pre run_test erl_args", the order
+%% relative dirs "post run_test erl_args" is not kept!
+rel_to_abs(CtArgs) ->
+    {PA,PZ} = get_pa_pz(CtArgs, [], []),
+    io:format(user, "~n", []),
+    [begin
+	 code:del_path(filename:basename(D)),
+	 Abs = filename:absname(D),
+	 code:add_pathz(Abs),
+	 if D /= Abs ->
+		 io:format(user, "Converting ~p to ~p and re-inserting "
+			   "with add_pathz/1~n",
+			   [D, Abs]);
+	    true ->
+		 ok
+	 end
+     end || D <- PZ],
+    [begin
+	 code:del_path(filename:basename(D)),
+	 Abs = filename:absname(D),
+	 code:add_patha(Abs),
+	 if D /= Abs ->
+		 io:format(user, "Converting ~p to ~p and re-inserting "
+			   "with add_patha/1~n",
+			   [D, Abs]);
+	    true ->ok
+	 end
+     end || D <- PA],
+    io:format(user, "~n", []).
+
+get_pa_pz([{pa,Dirs} | Args], PA, PZ) ->
+    get_pa_pz(Args, PA ++ Dirs, PZ);
+get_pa_pz([{pz,Dirs} | Args], PA, PZ) ->
+    get_pa_pz(Args, PA, PZ ++ Dirs);
+get_pa_pz([_ | Args], PA, PZ) ->
+    get_pa_pz(Args, PA, PZ);
+get_pa_pz([], PA, PZ) ->
+    {PA,PZ}.
+
+%% This function translates ct:run_test/1 start options
+%% to ct_run start arguments (on the init arguments format) -
+%% this is useful mainly for testing the ct_run start functions.
+opts2args(EnvStartOpts) ->
+    lists:flatmap(fun({config,CfgFiles}) ->
+			  [{ct_config,[CfgFiles]}];
+		     ({userconfig,{CBM,CfgStr=[X|_]}}) when is_integer(X) ->
+			  [{userconfig,[atom_to_list(CBM),CfgStr]}];
+		     ({userconfig,{CBM,CfgStrs}}) when is_list(CfgStrs) ->
+			  [{userconfig,[atom_to_list(CBM) | CfgStrs]}];
+		     ({userconfig,UserCfg}) when is_list(UserCfg) ->
+			  Strs =
+			      lists:map(fun({CBM,CfgStr=[X|_]}) when is_integer(X) ->
+						[atom_to_list(CBM),CfgStr,"and"];
+					   ({CBM,CfgStrs}) when is_list(CfgStrs) ->
+						[atom_to_list(CBM) | CfgStrs] ++ ["and"]
+					end, UserCfg),
+			  [_LastAnd|StrsR] = lists:reverse(lists:flatten(Strs)),
+			  [{userconfig,lists:reverse(StrsR)}];
+		     ({testcase,Case}) when is_atom(Case) ->
+			  [{'case',[atom_to_list(Case)]}];
+		     ({testcase,Cases}) ->
+			  [{'case',[atom_to_list(C) || C <- Cases]}];
+		     ({'case',Cases}) ->
+			  [{'case',[atom_to_list(C) || C <- Cases]}];
+		     ({allow_user_terms,true}) ->
+			  [{allow_user_terms,[]}];
+		     ({allow_user_terms,false}) ->
+			  [];
+		     ({auto_compile,false}) ->
+			  [{no_auto_compile,[]}];
+		     ({auto_compile,true}) ->
+			  [];
+		     ({scale_timetraps,true}) ->
+			  [{scale_timetraps,[]}];
+		     ({scale_timetraps,false}) ->
+			  [];
+		     ({force_stop,true}) ->
+			  [{force_stop,[]}];
+		     ({force_stop,false}) ->
+			  [];
+		     ({decrypt,{key,Key}}) ->
+			  [{ct_decrypt_key,[Key]}];
+		     ({decrypt,{file,File}}) ->
+			  [{ct_decrypt_file,[File]}];
+		     ({basic_html,true}) ->
+			  ({basic_html,[]});
+		     ({basic_html,false}) ->
+			  [];
+		     ({event_handler,EH}) when is_atom(EH) ->
+			  [{event_handler,[atom_to_list(EH)]}];
+		     ({event_handler,EHs}) when is_list(EHs) ->
+			  [{event_handler,[atom_to_list(EH) || EH <- EHs]}];
+		     ({event_handler,{EH,Arg}}) when is_atom(EH) ->
+			  ArgStr = lists:flatten(io_lib:format("~p", [Arg])),
+			  [{event_handler_init,[atom_to_list(EH),ArgStr]}];
+		     ({event_handler,{EHs,Arg}}) when is_list(EHs) ->
+			  ArgStr = lists:flatten(io_lib:format("~p", [Arg])),
+			  Strs = lists:map(fun(EH) ->
+						   [atom_to_list(EH),ArgStr,"and"]
+					   end, EHs),
+			  [_LastAnd|StrsR] = lists:reverse(lists:flatten(Strs)),
+			  [{event_handler_init,lists:reverse(StrsR)}];
+		     ({ct_hooks,[]}) ->
+			  [];
+		     ({ct_hooks,CTHs}) when is_list(CTHs) ->
+			  io:format(user,"ct_hooks: ~p",[CTHs]),
+			  Strs = lists:flatmap(
+				   fun({CTH,Arg}) ->
+					   [atom_to_list(CTH),
+					    lists:flatten(
+					      io_lib:format("~p",[Arg])),
+					    "and"];
+				      (CTH) when is_atom(CTH) ->
+					   [atom_to_list(CTH),"and"]
+				   end,CTHs),
+			  [_LastAnd|StrsR] = lists:reverse(Strs),
+			  io:format(user,"return: ~p",[lists:reverse(StrsR)]),
+			  [{ct_hooks,lists:reverse(StrsR)}];
+		     ({Opt,As=[A|_]}) when is_atom(A) ->
+			  [{Opt,[atom_to_list(Atom) || Atom <- As]}];
+		     ({Opt,Strs=[S|_]}) when is_list(S) ->
+			  [{Opt,Strs}];
+		     ({Opt,A}) when is_atom(A) ->
+			  [{Opt,[atom_to_list(A)]}];
+		     ({Opt,I}) when is_integer(I) ->
+			  [{Opt,[integer_to_list(I)]}];
+		     ({Opt,S}) when is_list(S) ->
+			  [{Opt,[S]}];
+		     (Opt) ->
+			  Opt
+		  end, EnvStartOpts).
+
 locate_test_dir(Dir, Suite) ->
     TestDir = case ct_util:is_test_dir(Dir) of
 		  true  -> Dir;
@@ -1723,18 +2312,18 @@ start_trace(Args) ->
 	    case file:consult(TraceSpec) of
 		{ok,Terms} ->
 		    case catch do_trace(Terms) of
-			ok -> 
+			ok ->
 			    true;
 			{_,Error} ->
 			    io:format("Warning! Tracing not started. Reason: ~p~n~n",
 				      [Error]),
 			    false
-		    end;		           
+		    end;
 		{_,Error} ->
 		    io:format("Warning! Tracing not started. Reason: ~p~n~n",
 			      [Error]),
 		    false
-	    end;	    			
+	    end;
 	false ->
 	    false		
     end.
@@ -1743,64 +2332,32 @@ do_trace(Terms) ->
     dbg:tracer(),
     dbg:p(self(), [sos,call]),
     lists:foreach(fun({m,M}) ->
-			  case dbg:tpl(M,[{'_',[],[{return_trace}]}]) of
+			  case dbg:tpl(M,x) of
+			      {error,What} -> exit({error,{tracing_failed,What}});
+			      _ -> ok
+			  end;
+		     ({me,M}) ->
+			  case dbg:tp(M,[{'_',[],[{exception_trace},
+						  {message,{caller}}]}]) of
 			      {error,What} -> exit({error,{tracing_failed,What}});
 			      _ -> ok
-			  end;			  
+			  end;
 		     ({f,M,F}) ->
-			  case dbg:tpl(M,F,[{'_',[],[{return_trace}]}]) of
+			  case dbg:tpl(M,F,[{'_',[],[{exception_trace},
+						     {message,{caller}}]}]) of
 			      {error,What} -> exit({error,{tracing_failed,What}});
 			      _ -> ok
-			  end;			  
+			  end;
 		     (Huh) ->
 			  exit({error,{unrecognized_trace_term,Huh}})
 		  end, Terms),
     ok.
-			 
+
 stop_trace(true) ->
     dbg:stop_clear();
 stop_trace(false) ->
     ok.
 
-preload() ->
-    io:format("~nLoading Common Test and Test Server modules...~n~n"),
-    preload_mod([ct_logs,
-		 ct_make,
-		 ct_telnet,
-		 ct,
-		 ct_master,
-		 ct_testspec,
-		 ct_cover,
-		 ct_master_event,
-		 ct_util,
-		 ct_event,           
-		 ct_master_logs,
-		 ct_framework,
-		 teln,
-		 ct_ftp,
-		 ct_rpc,
-		 unix_telnet,
-		 ct_gen_conn,
-		 ct_line,
-		 ct_snmp,
-		 test_server_sup,
-		 test_server,
-		 test_server_ctrl,
-		 test_server_h,
-		 test_server_line,
-		 test_server_node]).
-
-preload_mod([M|Ms]) ->
-    case code:is_loaded(M) of
-	false ->
-	    {module,M} = code:load_file(M),
-	    preload_mod(Ms);
-	_ ->
-	    ok
-    end;
-preload_mod([]) ->
-    ok.
-    
 ensure_atom(Atom) when is_atom(Atom) ->
     Atom;
 ensure_atom(String) when is_list(String), is_integer(hd(String)) ->
@@ -1809,4 +2366,3 @@ ensure_atom(List) when is_list(List) ->
     [ensure_atom(Item) || Item <- List];
 ensure_atom(Other) ->				
     Other.
-		  
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
new file mode 100644
index 0000000000..aa3413fa89
--- /dev/null
+++ b/lib/common_test/src/ct_slave.erl
@@ -0,0 +1,439 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+
+%%% @doc Common Test Framework functions for starting and stopping nodes for
+%%% Large Scale Testing.
+%%%
+%%% <p>This module exports functions which are used by the Common Test Master
+%%% to start and stop "slave" nodes. It is the default callback module for the
+%%% <code>{init, node_start}</code> term of the Test Specification.</p>
+
+%%----------------------------------------------------------------------
+%% File    : ct_slave.erl
+%% Description : CT module for starting nodes for large-scale testing.
+%%
+%% Created : 7 April 2010
+%%----------------------------------------------------------------------
+-module(ct_slave).
+
+-export([start/1, start/2, start/3, stop/1, stop/2]).
+
+-export([slave_started/2, slave_ready/2, monitor_master/1]).
+
+-record(options, {username, password, boot_timeout, init_timeout,
+		  startup_timeout, startup_functions, monitor_master,
+		  kill_if_fail, erl_flags}).
+
+%%%-----------------------------------------------------------------
+%%% @spec start(Node) -> Result
+%%%   Node = atom()
+%%%   Result = {ok, NodeName} |
+%%%	       {error, already_started, NodeName} |
+%%%	       {error, started_not_connected, NodeName} |
+%%%	       {error, boot_timeout, NodeName} |
+%%%	       {error, init_timeout, NodeName} |
+%%%	       {error, startup_timeout, NodeName} |
+%%%	       {error, not_alive, NodeName}
+%%%   NodeName = atom()
+%%% @doc Starts an Erlang node with name <code>Node</code> on the local host.
+%%% @see start/3
+start(Node) ->
+    start(gethostname(), Node).
+
+%%%-----------------------------------------------------------------
+%%% @spec start(Host, Node) -> Result
+%%%   Node = atom()
+%%%   Host = atom()
+%%%   Result = {ok, NodeName} |
+%%%	       {error, already_started, NodeName} |
+%%%	       {error, started_not_connected, NodeName} |
+%%%	       {error, boot_timeout, NodeName} |
+%%%	       {error, init_timeout, NodeName} |
+%%%	       {error, startup_timeout, NodeName} |
+%%%	       {error, not_alive, NodeName}
+%%%   NodeName = atom()
+%%% @doc Starts an Erlang node with name <code>Node</code> on host
+%%% <code>Host</code> with the default options.
+%%% @see start/3
+start(Host, Node) ->
+    start(Host, Node, []).
+
+%%%-----------------------------------------------------------------
+%%% @spec start(Host, Node, Opts) -> Result
+%%%   Node = atom()
+%%%   Host = atom()
+%%%   Opts = [OptTuples]
+%%%   OptTuples = {username, Username} |
+%%%		  {password, Password} |
+%%%   		  {boot_timeout, BootTimeout} | {init_timeout, InitTimeout} |
+%%%		  {startup_timeout, StartupTimeout} |
+%%%		  {startup_functions, StartupFunctions} |
+%%%		  {monitor_master, Monitor} |
+%%%		  {kill_if_fail, KillIfFail} |
+%%%		  {erl_flags, ErlangFlags}
+%%%   Username = string()
+%%%   Password = string()
+%%%   BootTimeout = integer()
+%%%   InitTimeout = integer()
+%%%   StartupTimeout = integer()
+%%%   StartupFunctions = [StartupFunctionSpec]
+%%%   StartupFunctionSpec = {Module, Function, Arguments}
+%%%   Module = atom()
+%%%   Function = atom()
+%%%   Arguments = [term]
+%%%   Monitor = bool()
+%%%   KillIfFail = bool()
+%%%   ErlangFlags = string()
+%%%   Result = {ok, NodeName} | {error, already_started, NodeName} |
+%%%	       {error, started_not_connected, NodeName} |
+%%%	       {error, boot_timeout, NodeName} |
+%%%	       {error, init_timeout, NodeName} |
+%%%	       {error, startup_timeout, NodeName} |
+%%%	       {error, not_alive, NodeName}
+%%%   NodeName = atom()
+%%% @doc Starts an Erlang node with name <code>Node</code> on host
+%%% <code>Host</code> as specified by the combination of options in
+%%% <code>Opts</code>.
+%%%
+%%% <p>Options <code>Username</code> and <code>Password</code> will be used
+%%% to log in onto the remote host <code>Host</code>.
+%%% Username, if omitted, defaults to the current user name,
+%%% and password is empty by default.</p>
+%%%
+%%% <p>A list of functions specified in the <code>Startup</code> option will be
+%%% executed after startup of the node. Note that all used modules should be
+%%% present in the code path on the <code>Host</code>.</p>
+%%%
+%%% <p>The timeouts are applied as follows:
+%%% <list>
+%%%  <item>
+%%%   <code>BootTimeout</code> - time to start the Erlang node, in seconds.
+%%%   Defaults to 3 seconds. If node does not become pingable within this time,
+%%%   the result <code>{error, boot_timeout, NodeName}</code> is returned;
+%%%  </item>
+%%%  <item>
+%%%   <code>InitTimeout</code> - time to wait for the node until it calls the
+%%%    internal callback function informing master about successfull startup.
+%%%    Defaults to one second.
+%%%    In case of timed out message the result
+%%%    <code>{error, init_timeout, NodeName}</code> is returned;
+%%%  </item>
+%%%  <item>
+%%%   <code>StartupTimeout</code> - time to wait intil the node finishes to run
+%%%    the <code>StartupFunctions</code>. Defaults to one second.
+%%%    If this timeout occurs, the result
+%%%    <code>{error, startup_timeout, NodeName}</code> is returned.
+%%%  </item>
+%%% </list></p>
+%%%
+%%% <p>Option <code>monitor_master</code> specifies, if the slave node should be
+%%% stopped in case of master node stop. Defaults to false.</p>
+%%%
+%%% <p>Option <code>kill_if_fail</code> specifies, if the slave node should be
+%%% killed in case of a timeout during initialization or startup.
+%%% Defaults to true. Note that node also may be still alive it the boot
+%%% timeout occurred, but it will not be killed in this case.</p>
+%%%
+%%% <p>Option <code>erlang_flags</code> specifies, which flags will be added
+%%% to the parameters of the <code>erl</code> executable.</p>
+%%%
+%%% <p>Special return values are:
+%%% <list>
+%%%  <item><code>{error, already_started, NodeName}</code> - if the node with
+%%%   the given name is already started on a given host;</item>
+%%%  <item><code>{error, started_not_connected, NodeName}</code> - if node is
+%%%  started, but not connected to the master node.</item>
+%%%  <item><code>{error, not_alive, NodeName}</code> - if node on which the
+%%%   <code>ct_slave:start/3</code> is called, is not alive. Note that
+%%%   <code>NodeName</code> is the name of current node in this case.</item>
+%%% </list></p>
+%%%
+start(Host, Node, Options) ->
+    ENode = enodename(Host, Node),
+    case erlang:is_alive() of
+	false->
+	    {error, not_alive, node()};
+	true->
+	    case is_started(ENode) of
+		false->
+		    OptionsRec = fetch_options(Options),
+		    do_start(Host, Node, OptionsRec);
+		{true, not_connected}->
+		    {error, started_not_connected, ENode};
+		{true, connected}->
+		    {error, already_started, ENode}
+	    end
+    end.
+
+%%% @spec stop(Node) -> Result
+%%%   Node = atom()
+%%%   Result = {ok, NodeName} |
+%%%	       {error, not_started, NodeName} |
+%%%	       {error, not_connected, NodeName} |
+%%%            {error, stop_timeout, NodeName}
+%%%   NodeName = atom()
+%%% @doc Stops the running Erlang node with name <code>Node</code> on
+%%% the localhost.
+stop(Node) ->
+    stop(gethostname(), Node).
+
+%%% @spec stop(Host, Node) -> Result
+%%%   Host = atom()
+%%%   Node = atom()
+%%%   Result = {ok, NodeName} |
+%%%	       {error, not_started, NodeName} |
+%%%	       {error, not_connected, NodeName} |
+%%%            {error, stop_timeout, NodeName}
+%%%   NodeName = atom()
+%%% @doc Stops the running Erlang node with name <code>Node</code> on
+%%% host <code>Host</code>.
+stop(Host, Node) ->
+    ENode = enodename(Host, Node),
+    case is_started(ENode) of
+	{true, connected}->
+	     do_stop(ENode);
+	{true, not_connected}->
+	     {error, not_connected, ENode};
+	false->
+	     {error, not_started, ENode}
+    end.
+
+%%% fetch an option value from the tagged tuple list with default
+get_option_value(Key, OptionList, Default) ->
+    case lists:keyfind(Key, 1, OptionList) of
+	false->
+	     Default;
+	{Key, Value}->
+	     Value
+    end.
+
+%%% convert option list to the option record, fill all defaults
+fetch_options(Options) ->
+    UserName = get_option_value(username, Options, []),
+    Password = get_option_value(password, Options, []),
+    BootTimeout = get_option_value(boot_timeout, Options, 3),
+    InitTimeout = get_option_value(init_timeout, Options, 1),
+    StartupTimeout = get_option_value(startup_timeout, Options, 1),
+    StartupFunctions = get_option_value(startup_functions, Options, []),
+    Monitor = get_option_value(monitor_master, Options, false),
+    KillIfFail = get_option_value(kill_if_fail, Options, true),
+    ErlFlags = get_option_value(erl_flags, Options, []),
+    #options{username=UserName, password=Password,
+	     boot_timeout=BootTimeout, init_timeout=InitTimeout,
+	     startup_timeout=StartupTimeout, startup_functions=StartupFunctions,
+	     monitor_master=Monitor, kill_if_fail=KillIfFail, erl_flags=ErlFlags}.
+
+% send a message when slave node is started
+% @hidden
+slave_started(ENode, MasterPid) ->
+    MasterPid ! {node_started, ENode},
+    ok.
+
+% send a message when slave node has finished startup
+% @hidden
+slave_ready(ENode, MasterPid) ->
+    MasterPid ! {node_ready, ENode},
+    ok.
+
+% start monitoring of the master node
+% @hidden
+monitor_master(MasterNode) ->
+    spawn(fun() -> monitor_master_int(MasterNode) end).
+
+% code of the masterdeath-waiter process
+monitor_master_int(MasterNode) ->
+    erlang:monitor_node(MasterNode, true),
+    receive
+        {nodedown, MasterNode}->
+	    init:stop()
+    end.
+
+% check if node is listed in the nodes()
+is_connected(ENode) ->
+    [N||N<-nodes(), N==ENode] == [ENode].
+
+% check if node is alive (ping and disconnect if pingable)
+is_started(ENode) ->
+    case is_connected(ENode) of
+	true->
+	    {true, connected};
+	false->
+	    case net_adm:ping(ENode) of
+		pang->
+		    false;
+		pong->
+		    erlang:disconnect_node(ENode),
+		    {true, not_connected}
+	    end
+    end.
+
+% make a Erlang node name from name and hostname
+enodename(Host, Node) ->
+    list_to_atom(atom_to_list(Node)++"@"++atom_to_list(Host)).
+
+% performs actual start of the "slave" node
+do_start(Host, Node, Options) ->
+    ENode = enodename(Host, Node),
+    Functions =
+	lists:concat([[{ct_slave, slave_started, [ENode, self()]}],
+		      Options#options.startup_functions,
+		      [{ct_slave, slave_ready, [ENode, self()]}]]),
+    Functions2 = if
+	Options#options.monitor_master->
+	    [{ct_slave, monitor_master, [node()]}|Functions];
+	true->
+	    Functions
+    end,
+    MasterHost = gethostname(),
+    if
+	MasterHost == Host ->
+	    spawn_local_node(Node, Options);
+	true->
+	    spawn_remote_node(Host, Node, Options)
+    end,
+    BootTimeout = Options#options.boot_timeout,
+    InitTimeout = Options#options.init_timeout,
+    StartupTimeout = Options#options.startup_timeout,
+    Result = case wait_for_node_alive(ENode, BootTimeout) of
+	pong->
+            call_functions(ENode, Functions2),
+	    receive
+		{node_started, ENode}->
+		    receive
+			{node_ready, ENode}->
+			    {ok, ENode}
+		    after StartupTimeout*1000->
+			{error, startup_timeout, ENode}
+		    end
+	    after InitTimeout*1000 ->
+		{error, init_timeout, ENode}
+	    end;
+        pang->
+	    {error, boot_timeout, ENode}
+    end,
+    case Result of
+	{ok, ENode}->
+	     ok;
+	{error, Timeout, ENode}
+	     when ((Timeout==init_timeout) or (Timeout==startup_timeout)) and
+		  Options#options.kill_if_fail->
+	     do_stop(ENode);
+	_-> ok
+    end,
+    Result.
+
+% are we using fully qualified hostnames
+long_or_short() ->
+    case net_kernel:longnames() of
+	true->
+	    " -name ";
+	false->
+	    " -sname "
+    end.
+
+% get the localhost's name, depending on the using name policy
+gethostname() ->
+    Hostname = case net_kernel:longnames() of
+	true->
+	    net_adm:localhost();
+	_->
+	    {ok, Name}=inet:gethostname(),
+	    Name
+    end,
+    list_to_atom(Hostname).
+
+% get cmd for starting Erlang
+get_cmd(Node, Flags) ->
+    Cookie = erlang:get_cookie(),
+    "erl -detached -noinput -setcookie "++ atom_to_list(Cookie) ++
+    long_or_short() ++ atom_to_list(Node) ++ " " ++ Flags.
+
+% spawn node locally
+spawn_local_node(Node, Options) ->
+    ErlFlags = Options#options.erl_flags,
+    Cmd = get_cmd(Node, ErlFlags),
+    open_port({spawn, Cmd}, [stream]).
+
+% start crypto and ssh if not yet started
+check_for_ssh_running() ->
+    case application:get_application(crypto) of
+	undefined->
+	    application:start(crypto),
+	    case application:get_application(ssh) of
+		undefined->
+		    application:start(ssh);
+		{ok, ssh}->
+		    ok
+	    end;
+	{ok, crypto}->
+	    ok
+    end.
+
+% spawn node remotely
+spawn_remote_node(Host, Node, Options) ->
+    Username = Options#options.username,
+    Password = Options#options.password,
+    ErlFlags = Options#options.erl_flags,
+    SSHOptions = case {Username, Password} of
+	{[], []}->
+	    [];
+	{_, []}->
+	    [{user, Username}];
+	{_, _}->
+	    [{user, Username}, {password, Password}]
+    end ++ [{silently_accept_hosts, true}],
+    check_for_ssh_running(),
+    {ok, SSHConnRef} = ssh:connect(atom_to_list(Host), 22, SSHOptions),
+    {ok, SSHChannelId} = ssh_connection:session_channel(SSHConnRef, infinity),
+    ssh_connection:exec(SSHConnRef, SSHChannelId, get_cmd(Node, ErlFlags), infinity).
+
+% call functions on a remote Erlang node
+call_functions(_Node, []) ->
+    ok;
+call_functions(Node, [{M, F, A}|Functions]) ->
+    rpc:call(Node, M, F, A),
+    call_functions(Node, Functions).
+
+% wait N seconds until node is pingable
+wait_for_node_alive(_Node, 0) ->
+    pang;
+wait_for_node_alive(Node, N) ->
+    timer:sleep(1000),
+    case net_adm:ping(Node) of
+	pong->
+	    pong;
+	pang->
+	    wait_for_node_alive(Node, N-1)
+    end.
+
+% call init:stop on a remote node
+do_stop(ENode) ->
+    spawn(ENode, init, stop, []),
+    wait_for_node_dead(ENode, 5).
+
+% wait N seconds until node is disconnected
+wait_for_node_dead(Node, 0) ->
+    {error, stop_timeout, Node};
+wait_for_node_dead(Node, N) ->
+    timer:sleep(1000),
+    case lists:member(Node, nodes()) of
+	true->
+	    wait_for_node_dead(Node, N-1);
+	false->
+	    {ok, Node}
+    end.
diff --git a/lib/common_test/src/ct_snmp.erl b/lib/common_test/src/ct_snmp.erl
index 7ff88ad7d3..8fe63e8ed1 100644
--- a/lib/common_test/src/ct_snmp.erl
+++ b/lib/common_test/src/ct_snmp.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2004-2010. 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%
 %%
 
@@ -332,7 +332,7 @@ set_info(Config) ->
 register_users(MgrAgentConfName, Users) ->
     {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
     NewSnmpVals = lists:keyreplace(users, 1, SnmpVals, {users, Users}),
-    ct_util:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
+    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
     setup_users(Users).
 
 %%% @spec register_agents(MgrAgentConfName, ManagedAgents) -> ok | {error, Reason}
@@ -347,7 +347,7 @@ register_agents(MgrAgentConfName, ManagedAgents) ->
     {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
     NewSnmpVals = lists:keyreplace(managed_agents, 1, SnmpVals,
 				   {managed_agents, ManagedAgents}),
-    ct_util:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
+    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
     setup_managed_agents(ManagedAgents).
 
 %%% @spec register_usm_users(MgrAgentConfName, UsmUsers) ->  ok | {error, Reason}
@@ -361,7 +361,7 @@ register_agents(MgrAgentConfName, ManagedAgents) ->
 register_usm_users(MgrAgentConfName, UsmUsers) ->
     {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
     NewSnmpVals = lists:keyreplace(users, 1, SnmpVals, {usm_users, UsmUsers}),
-    ct_util:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
+    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
     EngineID = ct:get_config({MgrAgentConfName, engine_id}, ?ENGINE_ID),
     setup_usm_users(UsmUsers, EngineID).
 
@@ -376,7 +376,7 @@ unregister_users(MgrAgentConfName) ->
 		      ct:get_config({MgrAgentConfName, users})),
     {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
     NewSnmpVals = lists:keyreplace(users, 1, SnmpVals, {users, []}),
-    ct_util:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
+    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
     takedown_users(Users).
 
 %%% @spec unregister_agents(MgrAgentConfName) ->  ok | {error, Reason}
@@ -393,7 +393,7 @@ unregister_agents(MgrAgentConfName) ->
     {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
     NewSnmpVals = lists:keyreplace(managed_agents, 1, SnmpVals, 
 				   {managed_agents, []}),
-    ct_util:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
+    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
     takedown_managed_agents(ManagedAgents).
 
 
@@ -409,7 +409,7 @@ update_usm_users(MgrAgentConfName, UsmUsers) ->
     {snmp, SnmpVals} = ct:get_config(MgrAgentConfName),
     NewSnmpVals = lists:keyreplace(usm_users, 1, SnmpVals, 
 				   {usm_users, UsmUsers}),
-    ct_util:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
+    ct_config:update_config(MgrAgentConfName, {snmp, NewSnmpVals}),
     EngineID = ct:get_config({MgrAgentConfName, engine_id}, ?ENGINE_ID),
     do_update_usm_users(UsmUsers, EngineID). 
 
diff --git a/lib/common_test/src/ct_telnet_client.erl b/lib/common_test/src/ct_telnet_client.erl
index 1a12c5e343..d703b39ac5 100644
--- a/lib/common_test/src/ct_telnet_client.erl
+++ b/lib/common_test/src/ct_telnet_client.erl
@@ -35,8 +35,6 @@
 -export([open/1, open/2, open/3, open/4, close/1]).
 -export([send_data/2, get_data/1]).
 
--define(DBG, false).
-
 -define(TELNET_PORT, 23).
 -define(OPEN_TIMEOUT,10000).
 -define(IDLE_TIMEOUT,10000).
@@ -287,35 +285,38 @@ get_subcmd([?SE | Rest], Acc) ->
 get_subcmd([Opt | Rest], Acc) ->
     get_subcmd(Rest, [Opt | Acc]).
 
-
+-ifdef(debug).
 dbg(_Str,_Args) ->
-    if ?DBG -> io:format(_Str,_Args);
-       true -> ok
+    io:format(_Str,_Args).
+
+cmd_dbg(_Cmd) ->
+    case _Cmd of
+	[?IAC|Cmd1] ->
+	    cmd_dbg(Cmd1);
+	[Ctrl|Opts] ->
+	    CtrlStr =
+		case Ctrl of
+		    ?DO ->   "DO";
+		    ?DONT -> "DONT";
+		    ?WILL -> "WILL";
+		    ?WONT -> "WONT";
+		    ?NOP ->  "NOP";
+		    _ ->     "CMD"
+		end,
+	    Opts1 =
+		case Opts of
+		    [Opt] -> Opt;
+		    _ -> Opts
+		end,
+	    io:format("~s(~w): ~w\n", [CtrlStr,Ctrl,Opts1]);
+	Any  ->
+	    io:format("Unexpected in cmd_dbg:~n~w~n",[Any])
     end.
 
+-else.
+dbg(_Str,_Args) ->
+    ok.
+
 cmd_dbg(_Cmd) ->
-     if ?DBG ->
- 	    case _Cmd of
- 		[?IAC|Cmd1] ->
- 		    cmd_dbg(Cmd1);
- 		[Ctrl|Opts] ->
- 		    CtrlStr = 
- 			case Ctrl of
- 			    ?DO ->   "DO";
- 			    ?DONT -> "DONT";
- 			    ?WILL -> "WILL";
- 			    ?WONT -> "WONT";
- 			    ?NOP ->  "NOP";
- 			    _ ->     "CMD"
- 			end,
- 		    Opts1 =
- 			case Opts of 
- 			    [Opt] -> Opt;
- 			    _ -> Opts
- 			end,
- 		    io:format("~s(~w): ~w\n", [CtrlStr,Ctrl,Opts1]);
- 		Any  ->
- 		    io:format("Unexpected in cmd_dbg:~n~w~n",[Any])
- 	    end;
-        true -> ok
-     end.
+    ok.
+-endif.
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index 4378ec5a52..2c7cd3577c 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework functions handlig test specifikations.
+%%% @doc Common Test Framework functions handling test specifications.
 %%%
 %%% <p>This module exports functions that are used within CT to
 %%% scan and parse test specifikations.</p>
@@ -68,7 +68,8 @@ prepare_tests(TestSpec) when is_record(TestSpec,testspec) ->
     %% Create initial list of {Node,{Run,Skip}} tuples
     NodeList = lists:map(fun(N) -> {N,{[],[]}} end, list_nodes(TestSpec)),
     %% Get all Run tests sorted per node basis.
-    NodeList1 = run_per_node(Run,NodeList),    
+    NodeList1 = run_per_node(Run,NodeList, 
+			     TestSpec#testspec.merge_tests),    
     %% Get all Skip entries sorted per node basis.
     NodeList2 = skip_per_node(Skip,NodeList1),
     %% Change representation.
@@ -89,11 +90,17 @@ prepare_tests(TestSpec) when is_record(TestSpec,testspec) ->
 %% run_per_node/2 takes the Run list as input and returns a list
 %% of {Node,RunPerNode,[]} tuples where the tests have been sorted
 %% on a per node basis.
-run_per_node([{{Node,Dir},Test}|Ts],Result) ->
+run_per_node([{{Node,Dir},Test}|Ts],Result, MergeTests) ->
     {value,{Node,{Run,Skip}}} = lists:keysearch(Node,1,Result),
-    Run1 = merge_tests(Dir,Test,Run),
-    run_per_node(Ts,insert_in_order({Node,{Run1,Skip}},Result));
-run_per_node([],Result) ->
+    Run1 = case MergeTests of
+	       false ->
+		   append({Dir, Test}, Run);
+	       true ->
+		   merge_tests(Dir,Test,Run)
+	   end,
+    run_per_node(Ts,insert_in_order({Node,{Run1,Skip}},Result), 
+		 MergeTests);
+run_per_node([],Result,_) ->
     Result.
 
 merge_tests(Dir,Test={all,_},TestDirs) ->
@@ -185,7 +192,15 @@ prepare_cases(Node,Dir,Suite,Cases) ->
 	    {[{{Node,Dir},{Suite,all}}],SkipAll};
 	Skipped ->
 	    %% note: this adds a test even if only skip is specified
-	    PrepC = lists:foldr(fun({C,{skip,_Cmt}},Acc) ->
+	    PrepC = lists:foldr(fun({{G,Cs},{skip,_Cmt}}, Acc) when
+					  is_atom(G) ->
+					case lists:keymember(G, 1, Cases) of
+					    true ->
+						Acc;
+					    false ->
+						[{skipped,G,Cs}|Acc]
+					end;
+				   ({C,{skip,_Cmt}},Acc) ->
 					case lists:member(C,Cases) of
 					    true ->
 						Acc;
@@ -194,7 +209,7 @@ prepare_cases(Node,Dir,Suite,Cases) ->
 					end;
 				   (C,Acc) -> [C|Acc]
 				end, [], Cases),
-	    {{{Node,Dir},{Suite,PrepC}},Skipped}
+    {{{Node,Dir},{Suite,PrepC}},Skipped}
     end.
 
 get_skipped_suites(Node,Dir,Suites) ->
@@ -210,7 +225,7 @@ get_skipped_cases(Node,Dir,Suite,Cases) ->
     case lists:keysearch(all,1,Cases) of
 	{value,{all,{skip,Cmt}}} ->
 	    [{{Node,Dir},{Suite,Cmt}}];
-	false ->
+	_ ->
 	    get_skipped_cases1(Node,Dir,Suite,Cases)
     end.
 
@@ -270,34 +285,11 @@ collect_tests(Terms,TestSpec,Relaxed) ->
     put(relaxed,Relaxed),
     TestSpec1 = get_global(Terms,TestSpec),
     TestSpec2 = get_all_nodes(Terms,TestSpec1),
-    case catch evaluate(Terms,TestSpec2) of
-	{error,{Node,{M,F,A},Reason}} ->
-	    io:format("Error! Common Test failed to evaluate ~w:~w/~w on ~w. "
-		      "Reason: ~p~n~n", [M,F,A,Node,Reason]);
-	_ -> ok
-    end,
-    add_tests(Terms,TestSpec2).
-    
-evaluate([{eval,NodeRef,{M,F,Args}}|Ts],Spec) ->
-    Node = ref2node(NodeRef,Spec#testspec.nodes),
-    case rpc:call(Node,M,F,Args) of
-	{badrpc,Reason} ->
-	    throw({error,{Node,{M,F,length(Args)},Reason}});
-	_ ->
-	    ok
-    end,
-    evaluate(Ts,Spec);
-evaluate([{eval,{M,F,Args}}|Ts],Spec) ->
-    case catch apply(M,F,Args) of
-	{'EXIT',Reason} ->
-	    throw({error,{node(),{M,F,length(Args)},Reason}});
-	_ ->
-	    ok
-    end,
-    evaluate(Ts,Spec);
-evaluate([],_Spec) ->
-    ok.
+    {Terms2, TestSpec3} = filter_init_terms(Terms, [], TestSpec2),
+    add_tests(Terms2,TestSpec3).
 
+get_global([{merge_tests, Bool} | Ts], Spec) ->
+    get_global(Ts,Spec#testspec{ merge_tests = Bool });
 get_global([{alias,Ref,Dir}|Ts],Spec=#testspec{alias=Refs}) ->
     get_global(Ts,Spec#testspec{alias=[{Ref,get_absdir(Dir,Spec)}|Refs]});
 get_global([{node,Ref,Node}|Ts],Spec=#testspec{nodes=Refs}) ->
@@ -305,6 +297,26 @@ get_global([{node,Ref,Node}|Ts],Spec=#testspec{nodes=Refs}) ->
 get_global([_|Ts],Spec) -> get_global(Ts,Spec);
 get_global([],Spec) -> Spec.
 
+get_absfile(Callback, FullName,#testspec{spec_dir=SpecDir}) ->
+    % we need to temporary switch to new cwd here, because
+    % otherwise config files cannot be found
+    {ok, OldWd} = file:get_cwd(),
+    ok = file:set_cwd(SpecDir),
+    R =  Callback:check_parameter(FullName),
+    ok = file:set_cwd(OldWd),
+    case R of
+	{ok, {file, FullName}}->
+	    File = filename:basename(FullName),
+	    Dir = get_absname(filename:dirname(FullName),SpecDir),
+	    filename:join(Dir,File);
+	{ok, {config, FullName}}->
+	    FullName;
+	{error, {nofile, FullName}}->
+	    FullName;
+	{error, {wrong_config, FullName}}->
+	    FullName
+    end.
+
 get_absfile(FullName,#testspec{spec_dir=SpecDir}) ->
     File = filename:basename(FullName),
     Dir = get_absname(filename:dirname(FullName),SpecDir),
@@ -353,6 +365,66 @@ get_all_nodes([_|Ts],Spec) ->
 get_all_nodes([],Spec) ->
     Spec.
 
+filter_init_terms([{init, InitOptions}|Ts], NewTerms, Spec)->
+    filter_init_terms([{init, list_nodes(Spec), InitOptions}|Ts], NewTerms, Spec);
+filter_init_terms([{init, NodeRef, InitOptions}|Ts], NewTerms, Spec)
+    when is_atom(NodeRef)->
+    filter_init_terms([{init, [NodeRef], InitOptions}|Ts], NewTerms, Spec);
+filter_init_terms([{init, NodeRefs, InitOption}|Ts], NewTerms, Spec) when is_tuple(InitOption) ->
+    filter_init_terms([{init, NodeRefs, [InitOption]}|Ts], NewTerms, Spec);
+filter_init_terms([{init, [NodeRef|NodeRefs], InitOptions}|Ts], NewTerms, Spec=#testspec{init=InitData})->
+    NodeStartOptions = case lists:keyfind(node_start, 1, InitOptions) of
+	{node_start, NSOptions}->
+	    case lists:keyfind(callback_module, 1, NSOptions) of
+		{callback_module, _Callback}->
+		    NSOptions;
+		false->
+		    [{callback_module, ct_slave}|NSOptions]
+	    end;
+	false->
+	    []
+    end,
+    EvalTerms = case lists:keyfind(eval, 1, InitOptions) of
+	{eval, MFA} when is_tuple(MFA)->
+	    [MFA];
+	{eval, MFAs} when is_list(MFAs)->
+	    MFAs;
+	false->
+	    []
+    end,
+    Node = ref2node(NodeRef,Spec#testspec.nodes),
+    InitData2 = add_option({node_start, NodeStartOptions}, Node, InitData, true),
+    InitData3 = add_option({eval, EvalTerms}, Node, InitData2, false),
+    filter_init_terms([{init, NodeRefs, InitOptions}|Ts], NewTerms, Spec#testspec{init=InitData3});
+filter_init_terms([{init, [], _}|Ts], NewTerms, Spec)->
+    filter_init_terms(Ts, NewTerms, Spec);
+filter_init_terms([Term|Ts], NewTerms, Spec)->
+    filter_init_terms(Ts, [Term|NewTerms], Spec);
+filter_init_terms([], NewTerms, Spec)->
+    {lists:reverse(NewTerms), Spec}.
+
+add_option({Key, Value}, Node, List, WarnIfExists) when is_list(Value)->
+    OldOptions = case lists:keyfind(Node, 1, List) of
+	{Node, Options}->
+	    Options;
+	false->
+	    []
+    end,
+    NewOption = case lists:keyfind(Key, 1, OldOptions) of
+	{Key, OldOption} when WarnIfExists, OldOption/=[]->
+	    io:format("There is an option ~w=~w already defined for node ~p, skipping new ~w~n",
+		[Key, OldOption, Node, Value]),
+	    OldOption;
+	{Key, OldOption}->
+	    OldOption ++ Value;
+	false->
+	    Value
+    end,
+    lists:keystore(Node, 1, List,
+	{Node, lists:keystore(Key, 1, OldOptions, {Key, NewOption})});
+add_option({Key, Value}, Node, List, WarnIfExists)->
+    add_option({Key, [Value]}, Node, List, WarnIfExists).
+
 save_nodes(Nodes,Spec=#testspec{nodes=NodeRefs}) ->
     NodeRefs1 =
 	lists:foldr(fun(all_nodes,NR) ->
@@ -375,6 +447,15 @@ save_nodes(Nodes,Spec=#testspec{nodes=NodeRefs}) ->
 list_nodes(#testspec{nodes=NodeRefs}) ->
     lists:map(fun({_Ref,Node}) -> Node end, NodeRefs).		      
 
+
+
+%%     ---------------------------------------------------------
+%%   /                                                           \
+%%  |  When adding tests, remember to update valid_terms/0 also!  |
+%%   \                                                           /
+%%     ---------------------------------------------------------
+
+
 %% Associate a "global" logdir with all nodes
 %% except those with specific logdir, e.g:
 %% ["/tmp/logdir",{ct1@finwe,"/tmp/logdir2"}]
@@ -400,6 +481,24 @@ add_tests([{logdir,Node,Dir}|Ts],Spec) ->
 add_tests([{logdir,Dir}|Ts],Spec) ->
     add_tests([{logdir,all_nodes,Dir}|Ts],Spec);
 
+%% --- label ---
+add_tests([{label,all_nodes,Lbl}|Ts],Spec) ->
+    Labels = Spec#testspec.label,
+    Tests = [{label,N,Lbl} || N <- list_nodes(Spec),
+			      lists:keymember(ref2node(N,Spec#testspec.nodes),
+					      1,Labels) == false],
+    add_tests(Tests++Ts,Spec);
+add_tests([{label,Nodes,Lbl}|Ts],Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,label,[Lbl],Ts,Spec#testspec.nodes),
+    add_tests(Ts1,Spec);
+add_tests([{label,Node,Lbl}|Ts],Spec) ->
+    Labels = Spec#testspec.label,
+    Labels1 = [{ref2node(Node,Spec#testspec.nodes),Lbl} |
+	       lists:keydelete(ref2node(Node,Spec#testspec.nodes),1,Labels)],
+    add_tests(Ts,Spec#testspec{label=Labels1});
+add_tests([{label,Lbl}|Ts],Spec) ->
+    add_tests([{label,all_nodes,Lbl}|Ts],Spec);
+
 %% --- cover ---
 add_tests([{cover,all_nodes,File}|Ts],Spec) ->
     Tests = lists:map(fun(N) -> {cover,N,File} end, list_nodes(Spec)),
@@ -415,6 +514,36 @@ add_tests([{cover,Node,File}|Ts],Spec) ->
 add_tests([{cover,File}|Ts],Spec) ->
     add_tests([{cover,all_nodes,File}|Ts],Spec);
 
+%% --- multiply_timetraps ---
+add_tests([{multiply_timetraps,all_nodes,MT}|Ts],Spec) ->
+    Tests = lists:map(fun(N) -> {multiply_timetraps,N,MT} end, list_nodes(Spec)),
+    add_tests(Tests++Ts,Spec);
+add_tests([{multiply_timetraps,Nodes,MT}|Ts],Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,multiply_timetraps,[MT],Ts,Spec#testspec.nodes),
+    add_tests(Ts1,Spec);
+add_tests([{multiply_timetraps,Node,MT}|Ts],Spec) ->
+    MTs = Spec#testspec.multiply_timetraps,
+    MTs1 = [{ref2node(Node,Spec#testspec.nodes),MT} |
+	    lists:keydelete(ref2node(Node,Spec#testspec.nodes),1,MTs)],
+    add_tests(Ts,Spec#testspec{multiply_timetraps=MTs1});
+add_tests([{multiply_timetraps,MT}|Ts],Spec) ->
+    add_tests([{multiply_timetraps,all_nodes,MT}|Ts],Spec);
+
+%% --- scale_timetraps ---
+add_tests([{scale_timetraps,all_nodes,ST}|Ts],Spec) ->
+    Tests = lists:map(fun(N) -> {scale_timetraps,N,ST} end, list_nodes(Spec)),
+    add_tests(Tests++Ts,Spec);
+add_tests([{scale_timetraps,Nodes,ST}|Ts],Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,scale_timetraps,[ST],Ts,Spec#testspec.nodes),
+    add_tests(Ts1,Spec);
+add_tests([{scale_timetraps,Node,ST}|Ts],Spec) ->
+    STs = Spec#testspec.scale_timetraps,
+    STs1 = [{ref2node(Node,Spec#testspec.nodes),ST} |
+	    lists:keydelete(ref2node(Node,Spec#testspec.nodes),1,STs)],
+    add_tests(Ts,Spec#testspec{scale_timetraps=STs1});
+add_tests([{scale_timetraps,ST}|Ts],Spec) ->
+    add_tests([{scale_timetraps,all_nodes,ST}|Ts],Spec);
+
 %% --- config ---
 add_tests([{config,all_nodes,Files}|Ts],Spec) ->
     Tests = lists:map(fun(N) -> {config,N,Files} end, list_nodes(Spec)),
@@ -434,6 +563,27 @@ add_tests([{config,Node,F}|Ts],Spec) ->
 add_tests([{config,Files}|Ts],Spec) ->
     add_tests([{config,all_nodes,Files}|Ts],Spec);
 
+
+%% --- userconfig ---
+add_tests([{userconfig,all_nodes,CBF}|Ts],Spec) ->
+    Tests = lists:map(fun(N) -> {userconfig,N,CBF} end, list_nodes(Spec)),
+    add_tests(Tests++Ts,Spec);
+add_tests([{userconfig,Nodes,CBF}|Ts],Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,userconfig,[CBF],Ts,Spec#testspec.nodes),
+    add_tests(Ts1,Spec);
+add_tests([{userconfig,Node,[{Callback, Config}|CBF]}|Ts],Spec) ->
+    Cfgs = Spec#testspec.userconfig,
+    Node1 = ref2node(Node,Spec#testspec.nodes),
+    add_tests([{userconfig,Node,CBF}|Ts],
+	      Spec#testspec{userconfig=[{Node1,{Callback,
+				get_absfile(Callback, Config ,Spec)}}|Cfgs]});
+add_tests([{userconfig,_Node,[]}|Ts],Spec) ->
+    add_tests(Ts,Spec);
+add_tests([{userconfig,Node,CBF}|Ts],Spec) ->
+    add_tests([{userconfig,Node,[CBF]}|Ts],Spec);
+add_tests([{userconfig,CBF}|Ts],Spec) ->
+    add_tests([{userconfig,all_nodes,CBF}|Ts],Spec);
+
 %% --- event_handler ---
 add_tests([{event_handler,all_nodes,Hs}|Ts],Spec) ->
     Tests = lists:map(fun(N) -> {event_handler,N,Hs,[]} end, list_nodes(Spec)),
@@ -482,6 +632,20 @@ add_tests([{event_handler,Node,H,Args}|Ts],Spec) when is_atom(H) ->
     Node1 = ref2node(Node,Spec#testspec.nodes),
     add_tests(Ts,Spec#testspec{event_handler=[{Node1,H,Args}|EvHs]});
 
+%% --- ct_hooks --
+add_tests([{ct_hooks, all_nodes, Hooks} | Ts], Spec) ->
+    Tests = [{ct_hooks,N,Hooks} || N <- list_nodes(Spec)],
+    add_tests(Tests ++ Ts, Spec);
+add_tests([{ct_hooks, Node, [Hook|Hooks]}|Ts], Spec) ->
+    SuiteCbs = Spec#testspec.ct_hooks,
+    Node1 = ref2node(Node,Spec#testspec.nodes),
+    add_tests([{ct_hooks, Node, Hooks} | Ts],
+	      Spec#testspec{ct_hooks = [{Node1,Hook} | SuiteCbs]});
+add_tests([{ct_hooks, _Node, []}|Ts], Spec) ->
+    add_tests(Ts, Spec);
+add_tests([{ct_hooks, Hooks}|Ts], Spec) ->
+    add_tests([{ct_hooks, all_nodes, Hooks}|Ts], Spec);
+
 %% --- include ---
 add_tests([{include,all_nodes,InclDirs}|Ts],Spec) ->
     Tests = lists:map(fun(N) -> {include,N,InclDirs} end, list_nodes(Spec)),
@@ -513,7 +677,41 @@ add_tests([{suites,Node,Dir,Ss}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = insert_suites(ref2node(Node,Spec#testspec.nodes),
 			   ref2dir(Dir,Spec#testspec.alias),
-			   Ss,Tests),
+			   Ss,Tests, Spec#testspec.merge_tests),
+    add_tests(Ts,Spec#testspec{tests=Tests1});
+
+%% --- groups ---
+%% Later make it possible to specify group execution properties
+%% that will override thse in the suite. Also make it possible
+%% create dynamic groups in specification, i.e. to group test cases
+%% by means of groups defined only in the test specification.
+add_tests([{groups,all_nodes,Dir,Suite,Gs}|Ts],Spec) ->
+    add_tests([{groups,list_nodes(Spec),Dir,Suite,Gs}|Ts],Spec);
+add_tests([{groups,all_nodes,Dir,Suite,Gs,{cases,TCs}}|Ts],Spec) ->
+    add_tests([{groups,list_nodes(Spec),Dir,Suite,Gs,{cases,TCs}}|Ts],Spec);
+add_tests([{groups,Dir,Suite,Gs}|Ts],Spec) ->
+    add_tests([{groups,all_nodes,Dir,Suite,Gs}|Ts],Spec);
+add_tests([{groups,Dir,Suite,Gs,{cases,TCs}}|Ts],Spec) ->
+    add_tests([{groups,all_nodes,Dir,Suite,Gs,{cases,TCs}}|Ts],Spec);
+add_tests([{groups,Nodes,Dir,Suite,Gs}|Ts],Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,groups,[Dir,Suite,Gs],Ts,Spec#testspec.nodes),
+    add_tests(Ts1,Spec);
+add_tests([{groups,Nodes,Dir,Suite,Gs,{cases,TCs}}|Ts],Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,groups,[Dir,Suite,Gs,{cases,TCs}],Ts,Spec#testspec.nodes),
+    add_tests(Ts1,Spec);
+add_tests([{groups,Node,Dir,Suite,Gs}|Ts],Spec) ->
+    Tests = Spec#testspec.tests,
+    Tests1 = insert_groups(ref2node(Node,Spec#testspec.nodes),
+			   ref2dir(Dir,Spec#testspec.alias),
+			   Suite,Gs,all,Tests,
+			   Spec#testspec.merge_tests),
+    add_tests(Ts,Spec#testspec{tests=Tests1});
+add_tests([{groups,Node,Dir,Suite,Gs,{cases,TCs}}|Ts],Spec) ->
+    Tests = Spec#testspec.tests,
+    Tests1 = insert_groups(ref2node(Node,Spec#testspec.nodes),
+			   ref2dir(Dir,Spec#testspec.alias),
+			   Suite,Gs,TCs,Tests,
+			   Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
 
 %% --- cases ---
@@ -528,7 +726,7 @@ add_tests([{cases,Node,Dir,Suite,Cs}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = insert_cases(ref2node(Node,Spec#testspec.nodes),
 			  ref2dir(Dir,Spec#testspec.alias),
-			  Suite,Cs,Tests),
+			  Suite,Cs,Tests, Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
 
 %% --- skip_suites ---
@@ -543,7 +741,38 @@ add_tests([{skip_suites,Node,Dir,Ss,Cmt}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = skip_suites(ref2node(Node,Spec#testspec.nodes),
 			 ref2dir(Dir,Spec#testspec.alias),
-			 Ss,Cmt,Tests),
+			 Ss,Cmt,Tests,
+			 Spec#testspec.merge_tests),
+    add_tests(Ts,Spec#testspec{tests=Tests1});
+
+%% --- skip_groups ---
+add_tests([{skip_groups,all_nodes,Dir,Suite,Gs,Cmt}|Ts],Spec) ->
+    add_tests([{skip_groups,list_nodes(Spec),Dir,Suite,Gs,Cmt}|Ts],Spec);
+add_tests([{skip_groups,all_nodes,Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec) ->
+    add_tests([{skip_groups,list_nodes(Spec),Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec);
+add_tests([{skip_groups,Dir,Suite,Gs,Cmt}|Ts],Spec) ->
+    add_tests([{skip_groups,all_nodes,Dir,Suite,Gs,Cmt}|Ts],Spec);
+add_tests([{skip_groups,Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec) ->
+    add_tests([{skip_groups,all_nodes,Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec);
+add_tests([{skip_groups,Nodes,Dir,Suite,Gs,Cmt}|Ts],Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,skip_groups,[Dir,Suite,Gs,Cmt],Ts,Spec#testspec.nodes),
+    add_tests(Ts1,Spec);
+add_tests([{skip_groups,Nodes,Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,skip_groups,[Dir,Suite,Gs,{cases,TCs},Cmt],Ts,Spec#testspec.nodes),
+    add_tests(Ts1,Spec);
+add_tests([{skip_groups,Node,Dir,Suite,Gs,Cmt}|Ts],Spec) ->
+    Tests = Spec#testspec.tests,
+    Tests1 = skip_groups(ref2node(Node,Spec#testspec.nodes),
+			 ref2dir(Dir,Spec#testspec.alias),
+			 Suite,Gs,all,Cmt,Tests,
+			 Spec#testspec.merge_tests),
+    add_tests(Ts,Spec#testspec{tests=Tests1});
+add_tests([{skip_groups,Node,Dir,Suite,Gs,{cases,TCs},Cmt}|Ts],Spec) ->
+    Tests = Spec#testspec.tests,
+    Tests1 = skip_groups(ref2node(Node,Spec#testspec.nodes),
+			 ref2dir(Dir,Spec#testspec.alias),
+			 Suite,Gs,TCs,Cmt,Tests,
+			 Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
 
 %% --- skip_cases ---
@@ -558,7 +787,7 @@ add_tests([{skip_cases,Node,Dir,Suite,Cs,Cmt}|Ts],Spec) ->
     Tests = Spec#testspec.tests,
     Tests1 = skip_cases(ref2node(Node,Spec#testspec.nodes),
 			ref2dir(Dir,Spec#testspec.alias),
-			Suite,Cs,Cmt,Tests),
+			Suite,Cs,Cmt,Tests,Spec#testspec.merge_tests),
     add_tests(Ts,Spec#testspec{tests=Tests1});
 
 %% --- handled/errors ---
@@ -568,6 +797,9 @@ add_tests([{alias,_,_}|Ts],Spec) ->		% handled
 add_tests([{node,_,_}|Ts],Spec) ->		% handled
     add_tests(Ts,Spec);
 
+add_tests([{merge_tests, _} | Ts], Spec) -> % handled
+    add_tests(Ts,Spec);
+
 %% check if it's a CT term that has bad format or if the user seems to
 %% have added something of his/her own, which we'll let pass if relaxed
 %% mode is enabled.
@@ -614,18 +846,77 @@ separate([],_,_,_) ->
     
 
 %% Representation:
-%% {{Node,Dir},[{Suite1,[case11,case12,...]},{Suite2,[case21,case22,...]},...]}
-%% {{Node,Dir},[{Suite1,{skip,Cmt}},{Suite2,[{case21,{skip,Cmt}},case22,...]},...]}
-
-insert_suites(Node,Dir,[S|Ss],Tests) ->
-    Tests1 = insert_cases(Node,Dir,S,all,Tests),
-    insert_suites(Node,Dir,Ss,Tests1);
-insert_suites(_Node,_Dir,[],Tests) ->
+%% {{Node,Dir},[{Suite1,[GrOrCase11,GrOrCase12,...]},
+%%              {Suite2,[GrOrCase21,GrOrCase22,...]},...]}
+%% {{Node,Dir},[{Suite1,{skip,Cmt}},
+%%              {Suite2,[{GrOrCase21,{skip,Cmt}},GrOrCase22,...]},...]}
+%% GrOrCase = {GroupName,[Case1,Case2,...]} | Case
+
+insert_suites(Node,Dir,[S|Ss],Tests, MergeTests) ->
+    Tests1 = insert_cases(Node,Dir,S,all,Tests,MergeTests),
+    insert_suites(Node,Dir,Ss,Tests1,MergeTests);
+insert_suites(_Node,_Dir,[],Tests,_MergeTests) ->
     Tests;
-insert_suites(Node,Dir,S,Tests) ->
-    insert_suites(Node,Dir,[S],Tests).
+insert_suites(Node,Dir,S,Tests,MergeTests) ->
+    insert_suites(Node,Dir,[S],Tests,MergeTests).
+
+insert_groups(Node,Dir,Suite,Group,Cases,Tests,MergeTests) 
+  when is_atom(Group) ->
+    insert_groups(Node,Dir,Suite,[Group],Cases,Tests,MergeTests);
+insert_groups(Node,Dir,Suite,Groups,Cases,Tests,false) when
+      ((Cases == all) or is_list(Cases)) and is_list(Groups) ->
+    Groups1 = [{Gr,Cases} || Gr <- Groups],
+    append({{Node,Dir},[{Suite,Groups1}]},Tests);
+insert_groups(Node,Dir,Suite,Groups,Cases,Tests,true) when
+      ((Cases == all) or is_list(Cases)) and is_list(Groups) ->
+    case lists:keysearch({Node,Dir},1,Tests) of
+	{value,{{Node,Dir},[{all,_}]}} ->
+	    Tests;
+	{value,{{Node,Dir},Suites0}} ->
+	    Suites1 = insert_groups1(Suite,
+				     [{Gr,Cases} || Gr <- Groups],
+				     Suites0),
+	    insert_in_order({{Node,Dir},Suites1},Tests);
+	false ->
+	    Groups1 = [{Gr,Cases} || Gr <- Groups],
+	    insert_in_order({{Node,Dir},[{Suite,Groups1}]},Tests)
+    end;
+insert_groups(Node,Dir,Suite,Groups,Case,Tests, MergeTests) 
+  when is_atom(Case) ->
+    Cases = if Case == all -> all; true -> [Case] end,
+    insert_groups(Node,Dir,Suite,Groups,Cases,Tests, MergeTests).
+
+insert_groups1(_Suite,_Groups,all) ->
+    all;
+insert_groups1(Suite,Groups,Suites0) ->
+    case lists:keysearch(Suite,1,Suites0) of
+	{value,{Suite,all}} ->
+	    Suites0;
+	{value,{Suite,GrAndCases0}} ->
+	    GrAndCases = insert_groups2(Groups,GrAndCases0),
+	    insert_in_order({Suite,GrAndCases},Suites0);
+	false ->
+	    insert_in_order({Suite,Groups},Suites0)
+    end.
 
-insert_cases(Node,Dir,Suite,Cases,Tests) when is_list(Cases) ->
+insert_groups2(_Groups,all) ->
+    all;
+insert_groups2([Group={GrName,Cases}|Groups],GrAndCases) ->
+    case lists:keysearch(GrName,1,GrAndCases) of
+	{value,{GrName,all}} ->
+	    GrAndCases;
+	{value,{GrName,Cases0}} ->
+	    Cases1 = insert_in_order(Cases,Cases0),
+	    insert_groups2(Groups,insert_in_order({GrName,Cases1},GrAndCases));
+	false ->
+	    insert_groups2(Groups,insert_in_order(Group,GrAndCases))
+    end;
+insert_groups2([],GrAndCases) ->
+    GrAndCases.
+
+insert_cases(Node,Dir,Suite,Cases,Tests,false) when is_list(Cases) ->
+    append({{Node,Dir},[{Suite,Cases}]},Tests);
+insert_cases(Node,Dir,Suite,Cases,Tests,true) when is_list(Cases) ->
     case lists:keysearch({Node,Dir},1,Tests) of
 	{value,{{Node,Dir},[{all,_}]}} ->
 	    Tests;
@@ -635,8 +926,8 @@ insert_cases(Node,Dir,Suite,Cases,Tests) when is_list(Cases) ->
 	false ->
 	    insert_in_order({{Node,Dir},[{Suite,Cases}]},Tests)
     end;
-insert_cases(Node,Dir,Suite,Case,Tests) when is_atom(Case) ->
-    insert_cases(Node,Dir,Suite,[Case],Tests).
+insert_cases(Node,Dir,Suite,Case,Tests,MergeTests) when is_atom(Case) ->
+    insert_cases(Node,Dir,Suite,[Case],Tests,MergeTests).
 
 insert_cases1(_Suite,_Cases,all) ->
     all;
@@ -651,15 +942,59 @@ insert_cases1(Suite,Cases,Suites0) ->
 	    insert_in_order({Suite,Cases},Suites0)
     end.
 
-skip_suites(Node,Dir,[S|Ss],Cmt,Tests) ->
-    Tests1 = skip_cases(Node,Dir,S,all,Cmt,Tests),
-    skip_suites(Node,Dir,Ss,Cmt,Tests1);
-skip_suites(_Node,_Dir,[],_Cmt,Tests) ->
+skip_suites(Node,Dir,[S|Ss],Cmt,Tests,MergeTests) ->
+    Tests1 = skip_cases(Node,Dir,S,all,Cmt,Tests,MergeTests),
+    skip_suites(Node,Dir,Ss,Cmt,Tests1,MergeTests);
+skip_suites(_Node,_Dir,[],_Cmt,Tests,_MergeTests) ->
     Tests;
-skip_suites(Node,Dir,S,Cmt,Tests) ->
-    skip_suites(Node,Dir,[S],Cmt,Tests).
+skip_suites(Node,Dir,S,Cmt,Tests,MergeTests) ->
+    skip_suites(Node,Dir,[S],Cmt,Tests,MergeTests).
+
+skip_groups(Node,Dir,Suite,Group,all,Cmt,Tests,MergeTests) 
+  when is_atom(Group) ->
+    skip_groups(Node,Dir,Suite,[Group],all,Cmt,Tests,MergeTests);
+skip_groups(Node,Dir,Suite,Group,Cases,Cmt,Tests,MergeTests) 
+  when is_atom(Group) ->
+    skip_groups(Node,Dir,Suite,[Group],Cases,Cmt,Tests,MergeTests);
+skip_groups(Node,Dir,Suite,Groups,Case,Cmt,Tests,MergeTests) 
+  when is_atom(Case),Case =/= all ->
+    skip_groups(Node,Dir,Suite,Groups,[Case],Cmt,Tests,MergeTests);
+skip_groups(Node,Dir,Suite,Groups,Cases,Cmt,Tests,false) when
+      ((Cases == all) or is_list(Cases)) and is_list(Groups) ->
+    Suites1 = skip_groups1(Suite,[{Gr,Cases} || Gr <- Groups],Cmt,[]),
+    append({{Node,Dir},Suites1},Tests);
+skip_groups(Node,Dir,Suite,Groups,Cases,Cmt,Tests,true) when
+      ((Cases == all) or is_list(Cases)) and is_list(Groups) ->
+    Suites =
+	case lists:keysearch({Node,Dir},1,Tests) of
+	    {value,{{Node,Dir},Suites0}} ->
+		Suites0;
+	    false ->
+		[]
+	end,
+    Suites1 = skip_groups1(Suite,[{Gr,Cases} || Gr <- Groups],Cmt,Suites),
+    insert_in_order({{Node,Dir},Suites1},Tests);
+skip_groups(Node,Dir,Suite,Groups,Case,Cmt,Tests,MergeTests) 
+  when is_atom(Case) ->
+    Cases = if Case == all -> all; true -> [Case] end,
+    skip_groups(Node,Dir,Suite,Groups,Cases,Cmt,Tests,MergeTests).
+
+skip_groups1(Suite,Groups,Cmt,Suites0) ->
+    SkipGroups = lists:map(fun(Group) ->
+				   {Group,{skip,Cmt}}
+			   end,Groups),
+    case lists:keysearch(Suite,1,Suites0) of
+	{value,{Suite,GrAndCases0}} ->
+	    GrAndCases1 = GrAndCases0 ++ SkipGroups,
+	    insert_in_order({Suite,GrAndCases1},Suites0);
+	false ->
+	    insert_in_order({Suite,SkipGroups},Suites0)
+    end.
 
-skip_cases(Node,Dir,Suite,Cases,Cmt,Tests) when is_list(Cases) ->
+skip_cases(Node,Dir,Suite,Cases,Cmt,Tests,false) when is_list(Cases) ->
+    Suites1 = skip_cases1(Suite,Cases,Cmt,[]),
+    append({{Node,Dir},Suites1},Tests);
+skip_cases(Node,Dir,Suite,Cases,Cmt,Tests,true) when is_list(Cases) ->
     Suites =
 	case lists:keysearch({Node,Dir},1,Tests) of
 	    {value,{{Node,Dir},Suites0}} ->
@@ -669,8 +1004,8 @@ skip_cases(Node,Dir,Suite,Cases,Cmt,Tests) when is_list(Cases) ->
 	end,
     Suites1 = skip_cases1(Suite,Cases,Cmt,Suites),
     insert_in_order({{Node,Dir},Suites1},Tests);
-skip_cases(Node,Dir,Suite,Case,Cmt,Tests) when is_atom(Case) ->
-    skip_cases(Node,Dir,Suite,[Case],Cmt,Tests).
+skip_cases(Node,Dir,Suite,Case,Cmt,Tests,MergeTests) when is_atom(Case) ->
+    skip_cases(Node,Dir,Suite,[Case],Cmt,Tests,MergeTests).
 
 skip_cases1(Suite,Cases,Cmt,Suites0) ->
     SkipCases = lists:map(fun(C) ->
@@ -684,6 +1019,9 @@ skip_cases1(Suite,Cases,Cmt,Suites0) ->
 	    insert_in_order({Suite,SkipCases},Suites0)
     end.
 
+append(Elem, List) ->
+    List ++ [Elem].
+
 insert_in_order([E|Es],List) ->
     List1 = insert_elem(E,List,[]),
     insert_in_order(Es,List1);
@@ -753,21 +1091,37 @@ valid_terms() ->
      {cover,3},
      {config,2},
      {config,3},
+     {userconfig,2},
+     {userconfig,3},
      {alias,3},
+     {merge_tests,1},
      {logdir,2},
      {logdir,3},
+     {label,2},
+     {label,3},
      {event_handler,2},
      {event_handler,3},
      {event_handler,4},
+     {ct_hooks,2},
+     {ct_hooks,3},
+     {multiply_timetraps,2},
+     {multiply_timetraps,3},
+     {scale_timetraps,2},
+     {scale_timetraps,3},
      {include,2},
      {include,3},
-
      {suites,3},
      {suites,4},
+     {groups,4},
+     {groups,5},
+     {groups,6},
      {cases,4},
      {cases,5},
      {skip_suites,4},
      {skip_suites,5},
+     {skip_groups,5},
+     {skip_groups,6},
+     {skip_groups,7},
      {skip_cases,5},
      {skip_cases,6}
     ].
@@ -816,7 +1170,3 @@ common_letters([L|Ls],Term,Count) ->
     end;
 common_letters([],_,Count) -> 
     Count.
-
-
-    
-	
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index ba3d789f8d..0476e1599f 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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%
 %%
 
@@ -30,12 +30,11 @@
 -export([register_connection/4,unregister_connection/1,
 	 does_connection_exist/3,get_key_from_name/1]).
 
--export([require/1, require/2, get_config/1, get_config/2, get_config/3,	 
-	 set_default_config/2, set_default_config/3, delete_default_config/1,
-	 get_all_config/0, update_config/2, 
-	 release_allocated/0, close_connections/0]).
+-export([close_connections/0]).
 
--export([save_suite_data/3, save_suite_data/2, read_suite_data/1, 
+-export([save_suite_data/3, save_suite_data/2,
+	 save_suite_data_async/3, save_suite_data_async/2,
+	 read_suite_data/1, 
 	 delete_suite_data/0, delete_suite_data/1, match_delete_suite_data/1,
 	 delete_testdata/0, delete_testdata/1, set_testdata/1, get_testdata/1,
 	 update_testdata/2]).
@@ -46,6 +45,8 @@
 	 silence_all_connections/0, silence_connections/1, is_silenced/1, 
 	 reset_silent_connections/0]).
 
+-export([get_mode/0, create_table/3, read_opts/0]).
+
 -export([set_cwd/1, reset_cwd/0]).
 
 -export([parse_table/1]).
@@ -56,23 +57,15 @@
 
 -export([is_test_dir/1, get_testdir/2]).
 
--export([encrypt_config_file/2, encrypt_config_file/3,
-	 decrypt_config_file/2, decrypt_config_file/3]).
-
--export([kill_attached/2, get_attached/1]).
+-export([kill_attached/2, get_attached/1, ct_make_ref/0]).
 
 -export([warn_duplicates/1]).
 
 -include("ct_event.hrl").
 -include("ct_util.hrl").
 
--record(ct_conf,{key,value,ref,name='_UNDEF',default=false}).  
-%% default = {true,suite} | {true,testcase} | false
-
 -record(suite_data, {key,name,value}).
 
--define(cryptfile, ".ct_config.crypt").
-
 %%%-----------------------------------------------------------------
 %%% @spec start(Mode) -> Pid | exit(Error)
 %%%       Mode = normal | interactive
@@ -119,7 +112,6 @@ start(Mode,LogDir) ->
 do_start(Parent,Mode,LogDir) ->
     process_flag(trap_exit,true),
     register(ct_util_server,self()),
-    create_table(?attr_table,bag,#ct_conf.key),
     create_table(?conn_table,#conn.handle),
     create_table(?board_table,2),
     create_table(?suite_table,#suite_data.key),
@@ -135,7 +127,6 @@ do_start(Parent,Mode,LogDir) ->
 		   Parent ! {self(),Error},
 		   exit(Error)
 	   end,
-
     %% start an event manager (if not already started by master)
     case ct_event:start_link() of
 	{error,{already_started,_}} ->
@@ -148,38 +139,45 @@ do_start(Parent,Mode,LogDir) ->
 		    ct_event:add_handler([{vts,VtsPid}])
 	    end
     end,
-    case read_config_files(Opts) of
-	ok ->
-	    %% add user handlers
-	    case lists:keysearch(event_handler,1,Opts) of
-		{value,{_,Handlers}} ->
-		    Add = fun({H,Args}) ->
-				  case catch gen_event:add_handler(?CT_EVMGR_REF,H,Args) of
-				      ok -> ok;
-				      {'EXIT',Why} -> exit(Why);
-				      Other -> exit({event_handler,Other})
-				  end
-			  end,
-		    case catch lists:foreach(Add,Handlers) of
-			{'EXIT',Reason} ->
-			    Parent ! {self(),Reason};
-			_ ->
-			    ok
-		    end;
-		false ->
+    %% start ct_config server
+    ct_config:start(Mode),
+    %% add user event handlers
+    case lists:keysearch(event_handler,1,Opts) of
+	{value,{_,Handlers}} ->
+	    Add = fun({H,Args}) ->
+			  case catch gen_event:add_handler(?CT_EVMGR_REF,H,Args) of
+			      ok -> ok;
+			      {'EXIT',Why} -> exit(Why);
+			      Other -> exit({event_handler,Other})
+			  end
+		  end,
+	    case catch lists:foreach(Add,Handlers) of
+		{'EXIT',Reason} ->
+		    Parent ! {self(),Reason};
+		_ ->
 		    ok
-	    end,
-	    {StartTime,TestLogDir} = ct_logs:init(Mode),
-	    ct_event:notify(#event{name=test_start,
-				   node=node(),
-				   data={StartTime,
-					 lists:flatten(TestLogDir)}}),
-	    Parent ! {self(),started},
-	    loop(Mode,[],StartDir);
-	ReadError ->
-	    Parent ! {self(),ReadError},
-	    exit(ReadError)
-    end.
+	    end;
+	false ->
+	    ok
+    end,
+    {StartTime,TestLogDir} = ct_logs:init(Mode),
+
+    %% Initiate ct_hooks
+    case catch ct_hooks:init(Opts) of
+	ok ->
+	    ok;
+	{_,CTHReason} ->
+	    ct_logs:tc_print('Suite Callback',CTHReason,[]),
+	    Parent ! {self(), CTHReason},
+	    self() ! {{stop,normal},{self(),make_ref()}}
+    end,
+
+    ct_event:notify(#event{name=test_start,
+			   node=node(),
+			   data={StartTime,
+				 lists:flatten(TestLogDir)}}),
+    Parent ! {self(),started},
+    loop(Mode,[],StartDir).
 
 create_table(TableName,KeyPos) ->
     create_table(TableName,set,KeyPos).
@@ -197,105 +195,6 @@ read_opts() ->
 	    {error,{bad_installation,Error}}
     end.
 
-read_config_files(Opts) ->
-    ConfigFiles =
-	lists:foldl(fun({config,Files},Acc) ->
-			    Acc ++ Files;
-		       (_,Acc) ->
-			    Acc
-		    end,[],Opts),
-    read_config_files1(ConfigFiles).
-
-read_config_files1([ConfigFile|Files]) ->
-    case file:consult(ConfigFile) of
-	{ok,Config} -> 
-	    set_config(Config),
-	    read_config_files1(Files);
-	{error,enoent} ->
-	    {user_error,{config_file_error,ConfigFile,enoent}};
-	{error,Reason} ->
-	    Key =
-		case application:get_env(common_test, decrypt) of
-		    {ok,KeyOrFile} ->
-			case KeyOrFile of
-			    {key,K} ->
-				K;
-			    {file,F} ->
-				get_crypt_key_from_file(F)
-			end;
-		    _ ->
-			get_crypt_key_from_file()
-		end,
-	    case Key of
-		{error,no_crypt_file} ->
-		    {user_error,{config_file_error,ConfigFile,Reason}};
-		{error,CryptError} ->
-		    {user_error,{decrypt_file_error,ConfigFile,CryptError}};
-		_ when is_list(Key) ->
-		    case decrypt_config_file(ConfigFile, undefined, {key,Key}) of
-			{ok,CfgBin} ->
-			    case read_config_terms(CfgBin) of
-				{error,ReadFail} ->
-				    {user_error,{config_file_error,ConfigFile,ReadFail}};
-				Config ->
-				    set_config(Config),
-				    read_config_files1(Files)
-			    end;
-			{error,DecryptFail} ->
-			    {user_error,{decrypt_config_error,ConfigFile,DecryptFail}}
-		    end;
-		_ ->
-		    {user_error,{bad_decrypt_key,ConfigFile,Key}}
-	    end
-    end;
-read_config_files1([]) ->
-    ok.
-
-read_config_terms(Bin) when is_binary(Bin) ->
-    case catch binary_to_list(Bin) of
-	{'EXIT',_} ->
-	    {error,invalid_textfile};
-	Lines ->
-	    read_config_terms(Lines)
-    end;
-read_config_terms(Lines) when is_list(Lines) ->
-    read_config_terms1(erl_scan:tokens([], Lines, 0), 1, [], []).
-
-read_config_terms1({done,{ok,Ts,EL},Rest}, L, Terms, _) ->
-    case erl_parse:parse_term(Ts) of
-	{ok,Term} when Rest == [] ->
-	    lists:reverse([Term|Terms]);
-	{ok,Term} ->
-	    read_config_terms1(erl_scan:tokens([], Rest, 0), 
-			       EL+1, [Term|Terms], Rest);
-	_ ->
-	    {error,{bad_term,{L,EL}}}
-    end;
-read_config_terms1({done,{eof,_},_}, _, Terms, Rest) when Rest == [] ->
-    lists:reverse(Terms);
-read_config_terms1({done,{eof,EL},_}, L, _, _) ->
-    {error,{bad_term,{L,EL}}};
-read_config_terms1({done,{error,Info,EL},_}, L, _, _) ->
-    {error,{Info,{L,EL}}};
-read_config_terms1({more,_}, L, Terms, Rest) ->
-    case string:tokens(Rest, [$\n,$\r,$\t]) of
-	[] ->
-	    lists:reverse(Terms);
-	_ ->
-	    {error,{bad_term,L}}
-    end.
-
-set_default_config(NewConfig, Scope) ->
-    call({set_default_config, {NewConfig, Scope}}).
-
-set_default_config(Name, NewConfig, Scope) ->
-    call({set_default_config, {Name, NewConfig, Scope}}).
-
-delete_default_config(Scope) ->
-    call({delete_default_config, Scope}).
-
-update_config(Name, Config) ->
-    call({update_config, {Name, Config}}).
 
 save_suite_data(Key, Value) ->
     call({save_suite_data, {Key, undefined, Value}}).
@@ -303,6 +202,12 @@ save_suite_data(Key, Value) ->
 save_suite_data(Key, Name, Value) ->
     call({save_suite_data, {Key, Name, Value}}).
 
+save_suite_data_async(Key, Value) ->
+    save_suite_data_async(Key, undefined, Value).
+
+save_suite_data_async(Key, Name, Value) ->
+    cast({save_suite_data, {Key, Name, Value}}).
+
 read_suite_data(Key) ->
     call({read_suite_data, Key}).
 
@@ -342,26 +247,6 @@ loop(Mode,TestData,StartDir) ->
 	    ct_logs:make_last_run_index(),
 	    return(From,ok),
 	    loop(Mode,TestData,StartDir);
-	{{require,Name,Tag,SubTags},From} ->
-	    Result = do_require(Name,Tag,SubTags),
-	    return(From,Result),
-	    loop(Mode,TestData,StartDir);
-	{{set_default_config,{Config,Scope}},From} ->
-	    set_config(Config,{true,Scope}),
-	    return(From,ok),
-	    loop(Mode,TestData,StartDir);
-	{{set_default_config,{Name,Config,Scope}},From} ->
-	    set_config(Name,Config,{true,Scope}),
-	    return(From,ok),
-	    loop(Mode,TestData,StartDir);
-	{{delete_default_config,Scope},From} ->
-	    delete_config({true,Scope}),
-	    return(From,ok),
-	    loop(Mode,TestData,StartDir);
-	{{update_config,{Name,NewConfig}},From} ->
-	    update_conf(Name,NewConfig),
-	    return(From,ok),
-	    loop(Mode,TestData,StartDir);
 	{{save_suite_data,{Key,Name,Value}},From} ->
 	    ets:insert(?suite_table, #suite_data{key=Key,
 						 name=Name,
@@ -403,6 +288,9 @@ loop(Mode,TestData,StartDir) ->
 	    TestData1 = lists:keydelete(Key,1,TestData),
 	    return(From,ok),
 	    loop(Mode,[New|TestData1],StartDir);
+	{{get_testdata, all}, From} ->
+	    return(From, TestData),
+	    loop(From, TestData, StartDir);
 	{{get_testdata,Key},From} ->
 	    case lists:keysearch(Key,1,TestData) of
 		{value,{Key,Val}} ->
@@ -434,15 +322,22 @@ loop(Mode,TestData,StartDir) ->
 	    ct_event:sync_notify(#event{name=test_done,
 					node=node(),
 					data=Time}),
-	    ets:delete(?attr_table),
+	    Callbacks = ets:lookup_element(?suite_table,
+					   ct_hooks,
+					   #suite_data.value),
+	    ct_hooks:terminate(Callbacks),
 	    close_connections(ets:tab2list(?conn_table)),
 	    ets:delete(?conn_table),
 	    ets:delete(?board_table),
 	    ets:delete(?suite_table),
 	    ct_logs:close(How),
-	    file:set_cwd(StartDir),
 	    ct_event:stop(),
+	    ct_config:stop(),
+	    file:set_cwd(StartDir),
 	    return(From,ok);
+	{Ref, _Msg} when is_reference(Ref) ->
+	    %% This clause is used when doing cast operations.
+	    loop(Mode,TestData,StartDir);
 	{get_mode,From} ->
 	    return(From,Mode),
 	    loop(Mode,TestData,StartDir);
@@ -463,6 +358,8 @@ close_connections([#conn{handle=Handle,callback=CB}|Conns]) ->
 close_connections([]) ->
     ok.
 
+get_key_from_name(Name)->
+    ct_config:get_key_from_name(Name).
 
 %%%-----------------------------------------------------------------
 %%% @spec register_connection(TargetName,Address,Callback,Handle) -> 
@@ -480,7 +377,7 @@ close_connections([]) ->
 %%% test is finished by calling <code>Callback:close/1</code>.</p>
 register_connection(TargetName,Address,Callback,Handle) ->
     TargetRef = 
-	case get_ref_from_name(TargetName) of
+	case ct_config:get_ref_from_name(TargetName) of
 	    {ok,Ref} ->
 		Ref;
 	    _ ->
@@ -518,7 +415,7 @@ unregister_connection(Handle) ->
 %%%
 %%% @doc Check if a connection already exists.
 does_connection_exist(TargetName,Address,Callback) ->
-    case get_ref_from_name(TargetName) of
+    case ct_config:get_ref_from_name(TargetName) of
 	{ok,TargetRef} ->
 	    case ets:select(?conn_table,[{#conn{handle='$1',
 						targetref=TargetRef,
@@ -548,7 +445,7 @@ does_connection_exist(TargetName,Address,Callback) ->
 %%% @doc Return all connections for the <code>Callback</code> on the
 %%% given target (<code>TargetName</code>).
 get_connections(TargetName,Callback) ->
-    case get_ref_from_name(TargetName) of
+    case ct_config:get_ref_from_name(TargetName) of
 	{ok,Ref} ->
 	    {ok,ets:select(?conn_table,[{#conn{handle='$1',
 					       address='$2',
@@ -568,250 +465,11 @@ get_target_name(ConnPid) ->
 				  [],
 				  ['$1']}]) of
 	[TargetRef] ->
-	    get_name_from_ref(TargetRef);
+	    ct_config:get_name_from_ref(TargetRef);
 	[] ->
 	    {error,{unknown_connection,ConnPid}}
     end.
 
-
-%%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:require/1
-require(Key) when is_atom(Key) ->
-    require({Key,[]});
-require({Key,SubKeys}) when is_atom(Key) ->
-    allocate('_UNDEF',Key,to_list(SubKeys));
-require(Key) ->
-    {error,{invalid,Key}}.
-
-
-%%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:require/2
-require(Name,Key) when is_atom(Key) ->
-    require(Name,{Key,[]});
-require(Name,{Key,SubKeys}) when is_atom(Name), is_atom(Key) ->
-    call({require,Name,Key,to_list(SubKeys)});
-require(Name,Keys) ->
-    {error,{invalid,{Name,Keys}}}.
-
-to_list(X) when is_list(X) -> X;
-to_list(X) -> [X].
-
-do_require(Name,Key,SubKeys) when is_list(SubKeys) ->
-    case get_key_from_name(Name) of
-	{error,_} ->
-	    allocate(Name,Key,SubKeys);		    
-	{ok,Key} ->
-	    %% already allocated - check that it has all required subkeys
-	    Vals = [Val || {_Ref,Val} <- lookup_name(Name)],
-	    case get_subconfig(SubKeys,Vals) of
-		{ok,_SubMapped} ->
-		    ok;
-		Error ->
-		    Error
-	    end;
-	{ok,OtherKey} ->
-	    {error,{name_in_use,Name,OtherKey}}
-    end.
-
-allocate(Name,Key,SubKeys) ->
-    case ets:match_object(?attr_table,#ct_conf{key=Key,name='_UNDEF',_='_'}) of
-	[] ->
-	    {error,{not_available,Key}};
-	Available ->
-	    case allocate_subconfig(Name,SubKeys,Available,false) of
-		ok ->
-		    ok;
-		Error ->
-		    Error
-	    end
-    end.
-
-allocate_subconfig(Name,SubKeys,[C=#ct_conf{value=Value}|Rest],Found) ->
-    case do_get_config(SubKeys,Value,[]) of
-	{ok,_SubMapped} ->
-	    ets:insert(?attr_table,C#ct_conf{name=Name}),
-	    allocate_subconfig(Name,SubKeys,Rest,true);
-	_Error ->
-	    allocate_subconfig(Name,SubKeys,Rest,Found)
-    end;
-allocate_subconfig(_Name,_SubKeys,[],true) ->
-    ok;
-allocate_subconfig(_Name,SubKeys,[],false) ->
-    {error,{not_available,SubKeys}}.
-
-
-
-
-%%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:get_config/1
-get_config(KeyOrName) ->
-    get_config(KeyOrName,undefined,[]).
-
-%%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:get_config/2
-get_config(KeyOrName,Default) ->
-    get_config(KeyOrName,Default,[]).
-
-%%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:get_config/3
-get_config(KeyOrName,Default,Opts) when is_atom(KeyOrName) ->
-    case lookup_config(KeyOrName) of
-	[] ->
-	    Default;
-	[{_Ref,Val}|_] = Vals ->
-	    case {lists:member(all,Opts),lists:member(element,Opts)} of
-		{true,true} ->
-		    [{KeyOrName,V} || {_R,V} <- lists:sort(Vals)];
-		{true,false} ->
-		    [V || {_R,V} <- lists:sort(Vals)];
-		{false,true} ->
-		    {KeyOrName,Val};
-		{false,false} ->
-		    Val
-	    end
-    end;
-		
-get_config({KeyOrName,SubKey},Default,Opts) ->
-    case lookup_config(KeyOrName) of
-	[] ->
-	    Default;
-	Vals ->
-	    Vals1 = case [Val || {_Ref,Val} <- lists:sort(Vals)] of
-			Result=[L|_] when is_list(L) ->
-			    case L of
-				[{_,_}|_] ->
-				    Result;
-				_ ->
-				    []
-			    end;
-			_ ->
-			    []
-		    end,				    
-	    case get_subconfig([SubKey],Vals1,[],Opts) of
-		{ok,[{_,SubVal}|_]=SubVals} ->
-		    case {lists:member(all,Opts),lists:member(element,Opts)} of
-			{true,true} ->
-			    [{{KeyOrName,SubKey},Val} || {_,Val} <- SubVals];
-			{true,false} ->
-			    [Val || {_SubKey,Val} <- SubVals];
-			{false,true} ->
-			    {{KeyOrName,SubKey},SubVal};
-			{false,false} ->
-			    SubVal
-		    end;
-		_ ->
-		    Default
-	    end
-    end.
-		    
-
-get_subconfig(SubKeys,Values) ->
-    get_subconfig(SubKeys,Values,[],[]).
-
-get_subconfig(SubKeys,[Value|Rest],Mapped,Opts) ->
-    case do_get_config(SubKeys,Value,[]) of
-	{ok,SubMapped} ->
-	    case lists:member(all,Opts) of
-		true ->
-		    get_subconfig(SubKeys,Rest,Mapped++SubMapped,Opts);
-		false ->
-		    {ok,SubMapped}
-	    end;
-	_Error ->
-	    get_subconfig(SubKeys,Rest,Mapped,Opts)
-    end;
-get_subconfig(SubKeys,[],[],_) ->
-    {error,{not_available,SubKeys}};
-get_subconfig(_SubKeys,[],Mapped,_) ->
-    {ok,Mapped}.
-
-do_get_config([Key|Required],Available,Mapped) ->
-    case lists:keysearch(Key,1,Available) of
-	{value,{Key,Value}} ->
-	    NewAvailable = lists:keydelete(Key,1,Available),
-	    NewMapped = [{Key,Value}|Mapped],
-	    do_get_config(Required,NewAvailable,NewMapped);
-	false ->
-	    {error,{not_available,Key}}
-    end;
-do_get_config([],_Available,Mapped) ->
-    {ok,lists:reverse(Mapped)}.
-
-get_all_config() ->
-    ets:select(?attr_table,[{#ct_conf{name='$1',key='$2',value='$3',
-				      default='$4',_='_'},
-			     [],
-			     [{{'$1','$2','$3','$4'}}]}]).
-
-lookup_config(KeyOrName) ->
-    case lookup_name(KeyOrName) of
-	[] ->
-	    lookup_key(KeyOrName);
-	Values ->
-	    Values
-    end.
-
-lookup_name(Name) ->
-    ets:select(?attr_table,[{#ct_conf{ref='$1',value='$2',name=Name,_='_'},
-			     [],
-			     [{{'$1','$2'}}]}]).
-lookup_key(Key) ->
-    ets:select(?attr_table,[{#ct_conf{key=Key,ref='$1',value='$2',name='_UNDEF',_='_'},
-			     [],
-			     [{{'$1','$2'}}]}]).
-
-set_config(Config) ->
-    set_config('_UNDEF',Config,false).
-
-set_config(Config,Default) ->
-    set_config('_UNDEF',Config,Default).
-
-set_config(Name,Config,Default) ->
-    [ets:insert(?attr_table,
-		#ct_conf{key=Key,value=Val,ref=ct_make_ref(),
-			 name=Name,default=Default}) ||
-	{Key,Val} <- Config].
-
-delete_config(Default) ->
-    ets:match_delete(?attr_table,#ct_conf{default=Default,_='_'}),
-    ok.
-
-
-%%%-----------------------------------------------------------------
-%%% @spec release_allocated() -> ok
-%%%
-%%% @doc Release all allocated resources, but don't take down any
-%%% connections.
-release_allocated() ->
-    Allocated = ets:select(?attr_table,[{#ct_conf{name='$1',_='_'},
-					 [{'=/=','$1','_UNDEF'}],
-					 ['$_']}]),
-    release_allocated(Allocated).
-release_allocated([H|T]) ->
-    ets:delete_object(?attr_table,H),
-    ets:insert(?attr_table,H#ct_conf{name='_UNDEF'}),
-    release_allocated(T);
-release_allocated([]) ->
-    ok.
-
-%%%-----------------------------------------------------------------
-%%% @spec 
-%%%
-%%% @doc 
-update_conf(Name, NewConfig) ->
-    Old = ets:select(?attr_table,[{#ct_conf{name=Name,_='_'},[],['$_']}]),
-    lists:foreach(fun(OldElem) ->
-			  NewElem = OldElem#ct_conf{value=NewConfig},
-			  ets:delete_object(?attr_table, OldElem),
-			  ets:insert(?attr_table, NewElem)
-		  end, Old),
-    ok.
-				       
 %%%-----------------------------------------------------------------
 %%% @spec close_connections() -> ok
 %%%
@@ -928,10 +586,37 @@ listenv(Telnet) ->
 %%% @hidden
 %%% @equiv ct:parse_table/1
 parse_table(Data) ->
-    [Heading|Lines]=
-	[remove_space(string:tokens(L, "|"),[]) || L <- Data, hd(L)==$|],
+    {Heading, Rest} = get_headings(Data),
+    Lines = parse_row(Rest,[],size(Heading)),
     {Heading,Lines}.
 
+get_headings(["|" ++ Headings | Rest]) ->
+    {remove_space(string:tokens(Headings, "|"),[]), Rest};
+get_headings([_ | Rest]) ->
+    get_headings(Rest);
+get_headings([]) ->
+    {{},[]}.
+
+parse_row(["|" ++ _ = Row | T], Rows, NumCols) when NumCols > 1 ->
+    case string:tokens(Row, "|") of
+	Values when length(Values) =:= NumCols ->
+	    parse_row(T,[remove_space(Values,[])|Rows], NumCols);
+	Values when length(Values) < NumCols ->
+	    parse_row([Row ++"\n"++ hd(T) | tl(T)], Rows, NumCols)
+    end;
+parse_row(["|" ++ _ = Row | T], Rows, 1 = NumCols) ->
+    case string:rchr(Row, $|) of
+	1 ->
+	    parse_row([Row ++"\n"++hd(T) | tl(T)], Rows, NumCols);
+	_Else ->
+	    parse_row(T, [remove_space(string:tokens(Row,"|"),[])|Rows],
+		      NumCols)
+    end;
+parse_row([_Skip | T], Rows, NumCols) ->
+    parse_row(T, Rows, NumCols);
+parse_row([], Rows, _NumCols) ->
+    lists:reverse(Rows).
+
 remove_space([Str|Rest],Acc) ->
     remove_space(Rest,[string:strip(string:strip(Str),both,$')|Acc]);
 remove_space([],Acc) ->
@@ -995,167 +680,6 @@ get_testdir(Dir, _) ->
 %%% @spec 
 %%%
 %%% @doc
-encrypt_config_file(SrcFileName, EncryptFileName) ->
-    case get_crypt_key_from_file() of
-	{error,_} = E ->
-	    E;
-	Key ->
-	    encrypt_config_file(SrcFileName, EncryptFileName, {key,Key})
-    end.
-
-%%%-----------------------------------------------------------------
-%%% @spec 
-%%%
-%%% @doc
-encrypt_config_file(SrcFileName, EncryptFileName, {file,KeyFile}) ->
-    case get_crypt_key_from_file(KeyFile) of
-	{error,_} = E ->
-	    E;
-	Key ->
-	    encrypt_config_file(SrcFileName, EncryptFileName, {key,Key})
-    end;
-
-encrypt_config_file(SrcFileName, EncryptFileName, {key,Key}) ->    
-    crypto:start(),
-    {K1,K2,K3,IVec} = make_crypto_key(Key),
-    case file:read_file(SrcFileName) of
-	{ok,Bin0} ->
-	    Bin1 = term_to_binary({SrcFileName,Bin0}),
-	    Bin2 = case byte_size(Bin1) rem 8 of
-		       0 -> Bin1;
-		       N -> list_to_binary([Bin1,random_bytes(8-N)])
-		   end,
-	    EncBin = crypto:des3_cbc_encrypt(K1, K2, K3, IVec, Bin2),
-	    case file:write_file(EncryptFileName, EncBin) of
-		ok ->
-		    io:format("~s --(encrypt)--> ~s~n", 
-			      [SrcFileName,EncryptFileName]),
-		    ok;
-		{error,Reason} ->
-		    {error,{Reason,EncryptFileName}}
-	    end;
-	{error,Reason} ->
-	    {error,{Reason,SrcFileName}}
-    end.		    
-
-%%%-----------------------------------------------------------------
-%%% @spec 
-%%%
-%%% @doc
-decrypt_config_file(EncryptFileName, TargetFileName) ->
-    case get_crypt_key_from_file() of
-	{error,_} = E ->
-	    E;
-	Key ->
-	    decrypt_config_file(EncryptFileName, TargetFileName, {key,Key})
-    end.
-    
-
-%%%-----------------------------------------------------------------
-%%% @spec 
-%%%
-%%% @doc
-decrypt_config_file(EncryptFileName, TargetFileName, {file,KeyFile}) ->
-    case get_crypt_key_from_file(KeyFile) of
-	{error,_} = E ->
-	    E;
-	Key ->
-	    decrypt_config_file(EncryptFileName, TargetFileName, {key,Key})
-    end;
-
-decrypt_config_file(EncryptFileName, TargetFileName, {key,Key}) ->
-    crypto:start(),
-    {K1,K2,K3,IVec} = make_crypto_key(Key),
-    case file:read_file(EncryptFileName) of
-	{ok,Bin} ->
-	    DecBin = crypto:des3_cbc_decrypt(K1, K2, K3, IVec, Bin),
-	    case catch binary_to_term(DecBin) of
-		{'EXIT',_} ->
-		    {error,bad_file};
-		{_SrcFile,SrcBin} ->
-		    case TargetFileName of
-			undefined ->
-			    {ok,SrcBin};
-			_ ->					  
-			    case file:write_file(TargetFileName, SrcBin) of
-				ok ->
-				    io:format("~s --(decrypt)--> ~s~n", 
-					      [EncryptFileName,TargetFileName]),
-				    ok;
-				{error,Reason} ->
-				    {error,{Reason,TargetFileName}}
-			    end
-		    end
-	    end;
-	{error,Reason} ->
-	    {error,{Reason,EncryptFileName}}
-    end.
-
-
-get_crypt_key_from_file(File) ->
-    case file:read_file(File) of
-	{ok,Bin} ->
-	    case catch string:tokens(binary_to_list(Bin), [$\n,$\r]) of
-		[Key] ->
-		    Key;
-		_ ->
-		    {error,{bad_crypt_file,File}}
-	    end;
-	{error,Reason} ->
-	    {error,{Reason,File}}
-    end.
-
-get_crypt_key_from_file() ->
-    CwdFile = filename:join(".",?cryptfile),
-    {Result,FullName} =
-	case file:read_file(CwdFile) of
-	    {ok,Bin} ->
-		{Bin,CwdFile};
-	    _ ->
-		case init:get_argument(home) of
-		    {ok,[[Home]]} ->
-			HomeFile = filename:join(Home,?cryptfile),
-			case file:read_file(HomeFile) of
-			    {ok,Bin} ->
-				{Bin,HomeFile};
-			    _ ->
-				{{error,no_crypt_file},noent}
-			end;
-		    _ ->
-			{{error,no_crypt_file},noent}
-		end
-	end,
-    case FullName of
-	noent ->
-	    Result;
-	_ ->
-	    case catch string:tokens(binary_to_list(Result), [$\n,$\r]) of
-		[Key] ->
-		    io:format("~nCrypt key file: ~s~n", [FullName]),
-		    Key;
-		_ ->
-		    {error,{bad_crypt_file,FullName}}
-	    end
-    end.
-
-make_crypto_key(String) ->
-    <<K1:8/binary,K2:8/binary>> = First = erlang:md5(String),
-    <<K3:8/binary,IVec:8/binary>> = erlang:md5([First|lists:reverse(String)]),
-    {K1,K2,K3,IVec}.
-
-random_bytes(N) ->
-    {A,B,C} = now(),
-    random:seed(A, B, C),
-    random_bytes_1(N, []).
-
-random_bytes_1(0, Acc) -> Acc;
-random_bytes_1(N, Acc) -> random_bytes_1(N-1, [random:uniform(255)|Acc]).
-
-
-%%%-----------------------------------------------------------------
-%%% @spec 
-%%%
-%%% @doc
 get_attached(TCPid) ->
     case dbg_iserver:safe_call({get_attpid,TCPid}) of
 	{ok,AttPid} when is_pid(AttPid) ->
@@ -1210,7 +734,7 @@ call(Msg) ->
     ct_util_server ! {Msg,{self(),Ref}},
     receive
 	{Ref, Result} -> 
-	    erlang:demonitor(MRef),
+	    erlang:demonitor(MRef, [flush]),
 	    Result;
 	{'DOWN',MRef,process,_,Reason}  -> 
 	    {error,{ct_util_server_down,Reason}}
@@ -1219,6 +743,9 @@ call(Msg) ->
 return({To,Ref},Result) ->
     To ! {Ref, Result}.
 
+cast(Msg) ->
+    ct_util_server ! {Msg, {ct_util_server, make_ref()}}.
+
 seconds(T) ->
     test_server:seconds(T).
 
@@ -1244,37 +771,6 @@ ct_make_ref_loop(N) ->
 	    From ! {self(),N},
 	    ct_make_ref_loop(N+1)
     end.
-
-get_ref_from_name(Name) ->
-    case ets:select(?attr_table,[{#ct_conf{name=Name,ref='$1',_='_'},
-				  [],
-				  ['$1']}]) of
-	[Ref] ->
-	    {ok,Ref};
-	_ ->
-	    {error,{no_such_name,Name}}
-    end.
-    
-get_name_from_ref(Ref) ->
-    case ets:select(?attr_table,[{#ct_conf{name='$1',ref=Ref,_='_'},
-				  [],
-				  ['$1']}]) of
-	[Name] ->
-	    {ok,Name};
-	_ ->
-	    {error,{no_such_ref,Ref}}
-    end.
-    
-get_key_from_name(Name) ->
-    case ets:select(?attr_table,[{#ct_conf{name=Name,key='$1',_='_'},
-				  [],
-				  ['$1']}]) of
-	[Key|_] ->
-	    {ok,Key};
-	_ ->
-	    {error,{no_such_name,Name}}
-    end.
- 
    
 abs_name(Dir0) ->
     Abs = filename:absname(Dir0),
diff --git a/lib/common_test/src/ct_util.hrl b/lib/common_test/src/ct_util.hrl
index c1dc14f943..f0255c533c 100644
--- a/lib/common_test/src/ct_util.hrl
+++ b/lib/common_test/src/ct_util.hrl
@@ -29,13 +29,20 @@
 
 -record(testspec, {spec_dir,
 	           nodes=[],
+		   init=[],
+		   label=[],
 		   logdir=["."],
 		   cover=[],
 		   config=[],
+		   userconfig=[],
 		   event_handler=[],
+		   ct_hooks=[],
 		   include=[],
+		   multiply_timetraps=[],
+		   scale_timetraps=[],
 		   alias=[],
-		   tests=[]}).
+		   tests=[],
+		   merge_tests = true }).
 
 -record(cover, {app=none,
 		level=details,
@@ -50,3 +57,4 @@
 -define(CT_MEVMGR_REF, ct_master_event).
 
 -define(missing_suites_info, "missing_suites.info").
+-define(ct_config_txt, ct_config_plain).
diff --git a/lib/common_test/src/vts.erl b/lib/common_test/src/vts.erl
index ad4845a7c3..2ee982d726 100644
--- a/lib/common_test/src/vts.erl
+++ b/lib/common_test/src/vts.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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%
 %%
 
@@ -100,7 +100,7 @@ start_link() ->
 	    MRef = erlang:monitor(process,Pid),
 	    receive
 		{Pid,started} -> 
-		    erlang:demonitor(MRef),
+		    erlang:demonitor(MRef, [flush]),
 		    {ok,Pid};
 		{'DOWN',MRef,process,_,Reason} -> 
 		    {error,{vts,died,Reason}}
@@ -160,11 +160,13 @@ init(Parent) ->
 
 loop(State) ->
     receive
-	{{init_data,ConfigFiles,EvHandlers,LogDir,Tests},From} ->
-	    ct_install(State),
+	{{init_data,Config,EvHandlers,LogDir,Tests},From} ->
+	    %% ct:pal("State#state.current_log_dir=~p", [State#state.current_log_dir]),
+	    NewState = State#state{config=Config,event_handler=EvHandlers,
+			current_log_dir=LogDir,tests=Tests},
+	    ct_install(NewState),
 	    return(From,ok),
-	    loop(#state{config=ConfigFiles,event_handler=EvHandlers,
-			current_log_dir=LogDir,tests=Tests});
+	    loop(NewState);
 	{start_page,From} ->
 	    return(From,start_page1()),
 	    loop(State);
@@ -257,7 +259,7 @@ call(Msg) ->
 	    Pid ! {Msg,{self(),Ref}},
 	    receive
 		{Ref, Result} -> 
-		    erlang:demonitor(MRef),
+		    erlang:demonitor(MRef, [flush]),
 		    Result;
 		{'DOWN',MRef,process,_,Reason}  -> 
 		    {error,{process_down,Pid,Reason}}
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index 35ba22aa59..be4b4c32b8 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -27,13 +27,21 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 MODULES= \
 	ct_test_support \
 	ct_test_support_eh \
+	ct_userconfig_callback \
 	ct_smoke_test_SUITE \
 	ct_event_handler_SUITE \
 	ct_groups_test_1_SUITE \
 	ct_groups_test_2_SUITE \
+	ct_sequence_1_SUITE \
+	ct_repeat_1_SUITE \
+	ct_testspec_1_SUITE \
 	ct_skip_SUITE \
 	ct_error_SUITE \
-	ct_test_server_if_1_SUITE
+	ct_test_server_if_1_SUITE \
+	ct_config_SUITE \
+	ct_master_SUITE \
+	ct_misc_1_SUITE \
+	ct_hooks_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -64,15 +72,15 @@ EBIN = .
 #.PHONY: make_emakefile
 
 #make_emakefile:
-#	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) \
-#	'*_SUITE_make' > $(EMAKEFILE)
 #	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
-#	>> $(EMAKEFILE)
+#	> $(EMAKEFILE)
 
 tests debug opt:
+	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
 	rm -f $(TARGET_FILES)
+#	rm -f $(EMAKEFILE)
 	rm -f core
 
 docs:
@@ -87,7 +95,7 @@ release_spec: opt
 release_tests_spec:
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(ERL_FILES) $(COVERFILE) $(RELSYSDIR)
-	$(INSTALL_PROGRAM) common_test.spec $(RELSYSDIR)
+	$(INSTALL_DATA) common_test.spec $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/common_test/test/common_test.spec b/lib/common_test/test/common_test.spec
index 7619a75b31..8755b08117 100644
--- a/lib/common_test/test/common_test.spec
+++ b/lib/common_test/test/common_test.spec
@@ -1 +1 @@
-{topcase, {dir, "../common_test"}}.
+{suites,"../common_test_test",all}.
\ No newline at end of file
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
new file mode 100644
index 0000000000..2ddc7d6422
--- /dev/null
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -0,0 +1,275 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_config_SUITE
+%%%
+%%% Description:
+%%% Test configuration handling in Common Test suites.
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_config_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),
+    PathDir = filename:join(DataDir, "config/test"),
+    Config1 = ct_test_support:init_per_suite([{path_dirs,[PathDir]} | Config]),
+    PrivDir = ?config(priv_dir, Config1),
+    ConfigDir = filename:join(PrivDir, "config"),
+    ok = file:make_dir(ConfigDir),
+    [{config_dir,ConfigDir} | Config1].
+
+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(install_config = TestCase, Config) ->
+    ok = rpc:call(proplists:get_value(ct_node, Config), ct_config, stop, []),
+    ct_test_support:end_per_testcase(TestCase, Config);
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [require, install_config, userconfig_static,
+     userconfig_dynamic, testspec_legacy, testspec_static,
+     testspec_dynamic].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+require(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    run_test(config_static_SUITE,
+	     Config,
+	     {config, filename:join(DataDir, "config/config.txt")},
+             ["config_static_SUITE"]).
+
+install_config(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    CTNode = proplists:get_value(ct_node, Config),
+    rpc:call(CTNode, ct, install,
+	     [[{config, [filename:join(DataDir, "config/config.txt")]}]]),
+    case rpc:call(CTNode, ct_config, start, [interactive]) of
+	Pid when is_pid(Pid) ->
+	    ok
+    end.
+
+
+userconfig_static(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    run_test(config_static_SUITE,
+	     Config,
+	     {userconfig, {ct_config_xml, filename:join(DataDir, "config/config.xml")}},
+             ["config_static_SUITE"]).
+
+userconfig_dynamic(Config) when is_list(Config) ->
+    run_test(config_dynamic_SUITE,
+	     Config,
+	     {userconfig, {config_driver, "config_server"}},
+             ["config_dynamic_SUITE"]).
+
+testspec_legacy(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    ConfigDir = ?config(config_dir, Config),
+    make_spec(DataDir, ConfigDir,
+	      "spec_legacy.spec",
+	      [config_static_SUITE],
+	      [{config, filename:join(DataDir, "config/config.txt")}]),
+    run_test(config_static_SUITE,
+	     Config,
+	     {spec, filename:join(ConfigDir, "spec_legacy.spec")},
+             []),
+    file:delete(filename:join(ConfigDir, "spec_legacy.spec")).
+
+testspec_static(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    ConfigDir = ?config(config_dir, Config),
+    make_spec(DataDir, ConfigDir,
+	      "spec_static.spec",
+	      [config_static_SUITE],
+	      [{userconfig, {ct_config_xml, filename:join(DataDir, "config/config.xml")}}]),
+    run_test(config_static_SUITE,
+	     Config,
+	     {spec, filename:join(ConfigDir, "spec_static.spec")},
+             []),
+    file:delete(filename:join(ConfigDir, "spec_static.spec")).
+
+testspec_dynamic(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    ConfigDir = ?config(config_dir, Config),
+    make_spec(DataDir, ConfigDir, "spec_dynamic.spec",
+	      [config_dynamic_SUITE],
+	      [{userconfig, {config_driver, "config_server"}}]),
+    run_test(config_dynamic_SUITE,
+	     Config,
+	     {spec, filename:join(ConfigDir, "spec_dynamic.spec")},
+             []),
+    file:delete(filename:join(ConfigDir, "spec_dynamic.spec")).
+
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+make_spec(DataDir, ConfigDir, Filename, Suites, Config)->
+    {ok, Fd} = file:open(filename:join(ConfigDir, Filename), [write]),
+    ok = file:write(Fd,
+		    io_lib:format("{suites, \"~sconfig/test/\", ~p}.~n", [DataDir, Suites])),
+    lists:foreach(fun(C)-> ok=file:write(Fd, io_lib:format("~p.~n", [C])) end, Config),
+    ok = file:close(Fd).
+
+run_test(Name, Config, CTConfig, SuiteNames)->
+    DataDir = ?config(data_dir, Config),
+    Joiner = fun(Suite) -> filename:join(DataDir, "config/test/"++Suite) end,
+    Suites = lists:map(Joiner, SuiteNames),
+    {Opts,ERPid} = setup_env({suite,Suites}, Config, CTConfig),
+    ok = ct_test_support:run(Opts, Config),
+    TestEvents = ct_test_support:get_events(ERPid, Config),
+    ct_test_support:log_events(Name,
+			       reformat_events(TestEvents, ?eh),
+			       ?config(config_dir, Config)),
+    ExpEvents = events_to_check(Name),
+    ok = ct_test_support:verify_events(ExpEvents, TestEvents, Config).
+
+setup_env(Test, Config, CTConfig) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [Test,{event_handler,{?eh,EvHArgs}}, CTConfig],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+reformat_events(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% 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) ->
+    expected_events(Test) ++ events_to_check(Test, N-1).
+
+expected_events(config_static_SUITE)->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,8}},
+     {?eh,tc_start,{config_static_SUITE,init_per_suite}},
+     {?eh,tc_done,{config_static_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{config_static_SUITE,test_get_config_simple}},
+     {?eh,tc_done,{config_static_SUITE,test_get_config_simple,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{config_static_SUITE,test_get_config_nested}},
+     {?eh,tc_done,{config_static_SUITE,test_get_config_nested,ok}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     {?eh,tc_start,{config_static_SUITE,test_default_suitewide}},
+     {?eh,tc_done,{config_static_SUITE,test_default_suitewide,ok}},
+     {?eh,test_stats,{3,0,{0,0}}},
+     {?eh,tc_start,{config_static_SUITE,test_config_name_already_in_use1}},
+     {?eh,tc_done,
+      {config_static_SUITE,test_config_name_already_in_use1,{skipped,{config_name_already_in_use,[x1]}}}},
+     {?eh,test_stats,{3,0,{1,0}}},
+     {?eh,tc_start,{config_static_SUITE,test_default_tclocal}},
+     {?eh,tc_done,{config_static_SUITE,test_default_tclocal,ok}},
+     {?eh,test_stats,{4,0,{1,0}}},
+     {?eh,tc_start,{config_static_SUITE,test_config_name_already_in_use2}},
+     {?eh,tc_done,
+      {config_static_SUITE,test_config_name_already_in_use2,
+       {skipped,{config_name_already_in_use,[x1,alias]}}}},
+     {?eh,test_stats,{4,0,{2,0}}},
+     {?eh,tc_start,{config_static_SUITE,test_alias_tclocal}},
+     {?eh,tc_done,{config_static_SUITE,test_alias_tclocal,ok}},
+     {?eh,test_stats,{5,0,{2,0}}},
+     {?eh,tc_start,{config_static_SUITE,test_get_config_undefined}},
+     {?eh,tc_done,{config_static_SUITE,test_get_config_undefined,ok}},
+     {?eh,test_stats,{6,0,{2,0}}},
+     {?eh,tc_start,{config_static_SUITE,end_per_suite}},
+     {?eh,tc_done,{config_static_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+expected_events(config_dynamic_SUITE)->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,5}},
+     {?eh,tc_start,{config_dynamic_SUITE,init_per_suite}},
+     {?eh,tc_done,{config_dynamic_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{config_dynamic_SUITE,test_get_known_variable}},
+     {?eh,tc_done,
+      {config_dynamic_SUITE,test_get_known_variable,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{config_dynamic_SUITE,test_localtime_update}},
+     {?eh,tc_done,{config_dynamic_SUITE,test_localtime_update,ok}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     {?eh,tc_start,{config_dynamic_SUITE,test_server_pid}},
+     {?eh,tc_done,{config_dynamic_SUITE,test_server_pid,ok}},
+     {?eh,test_stats,{3,0,{0,0}}},
+     {?eh,tc_start,
+      {config_dynamic_SUITE,test_disappearable_variable}},
+     {?eh,tc_done,
+      {config_dynamic_SUITE,test_disappearable_variable,ok}},
+     {?eh,test_stats,{4,0,{0,0}}},
+     {?eh,tc_start,
+      {config_dynamic_SUITE,test_disappearable_variable_alias}},
+     {?eh,tc_done,
+      {config_dynamic_SUITE,test_disappearable_variable_alias,ok}},
+     {?eh,test_stats,{5,0,{0,0}}},
+     {?eh,tc_start,{config_dynamic_SUITE,end_per_suite}},
+     {?eh,tc_done,{config_dynamic_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/config.txt b/lib/common_test/test/ct_config_SUITE_data/config/config.txt
new file mode 100644
index 0000000000..fcbffcd7f3
--- /dev/null
+++ b/lib/common_test/test/ct_config_SUITE_data/config/config.txt
@@ -0,0 +1,31 @@
+{x, suite}.
+{gen_cfg,
+	[
+		{a,a_value},
+		{b,b_value}
+	]}.
+{gen_cfg2,
+	[
+		{c, "Hello, world!"},
+		{d, atom_value},
+		{e, {tuple,1,"third value",[]}},
+		{f, []},
+		{g, [1,atom,"string",13.6,{1,2,3}]}
+	]}.
+{gen_cfg3,
+	[
+		{h,
+		[
+			{i, third1},
+			{j, "Third2"},
+			{k, 'THIRD3'}
+		]},
+		{l,
+		[
+			{m,
+			[
+				{n, "N"},
+				{o, 'O'}
+			]}
+		]}
+	]}.
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/config.xml b/lib/common_test/test/ct_config_SUITE_data/config/config.xml
new file mode 100644
index 0000000000..0a3e5f2e31
--- /dev/null
+++ b/lib/common_test/test/ct_config_SUITE_data/config/config.xml
@@ -0,0 +1,27 @@
+<config>
+	<x>suite</x>
+	<gen_cfg>
+		<a>a_value</a>
+		<b>b_value</b>
+	</gen_cfg>
+	<gen_cfg2>
+		<c>"Hello, world!"</c>
+		<d>atom_value</d>
+		<e>{tuple,1,"third value",[]}</e>
+		<f>[]</f>
+		<g>[1,atom,"string",13.6,{1,2,3}]</g>
+	</gen_cfg2>
+	<gen_cfg3>
+		<h>
+			<i>third1</i>
+			<j>"Third2"</j>
+			<k>'THIRD3'</k>
+		</h>
+		<l>
+			<m>
+				<n>"N"</n>
+				<o>'O'</o>
+			</m>
+		</l>
+	</gen_cfg3>
+</config>
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_driver.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_driver.erl
new file mode 100644
index 0000000000..d93faf6ec6
--- /dev/null
+++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_driver.erl
@@ -0,0 +1,46 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_config_SUITE
+%%%
+%%% Description:
+%%% Config driver used in the CT's tests (config_2_SUITE)
+%%%-------------------------------------------------------------------
+-module(config_driver).
+-export([read_config/1, check_parameter/1]).
+
+read_config(ServerName)->
+    ServerModule = list_to_atom(ServerName),
+    ServerModule:start(),
+    ServerModule:get_config().
+
+check_parameter(ServerName)->
+    ServerModule = list_to_atom(ServerName),
+    case code:is_loaded(ServerModule) of
+	{file, _}->
+	    {ok, {config, ServerName}};
+	false->
+	    case code:load_file(ServerModule) of
+		{module, ServerModule}->
+		    {ok, {config, ServerName}};
+		{error, nofile}->
+		    {error, {wrong_config, "File not found: " ++ ServerName ++ ".beam"}}
+	    end
+    end.
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
new file mode 100644
index 0000000000..8ee12a2e4d
--- /dev/null
+++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
@@ -0,0 +1,145 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: config_dynamic_SUITE
+%%%
+%%% Description:
+%%% Test suite for common_test which tests the userconfig functionality
+%%%-------------------------------------------------------------------
+-module(config_dynamic_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%% This suite will be run with dynamic userconfig
+%% test_driver.erl is compliant to ct_config_* callback
+%% and test_server is simple server for getting runtime-changing data
+%% which will return the list with the following variables:
+%% localtime = the erlang:localtime() result in list [{date, Date}, {time, Time}]
+%% node = erlang:node() - can be compared in the testcase
+%% now = erlang:now() - easier to compare than localtime()
+%% config_server_pid - pid of the config server, should NOT change!
+%% config_server_vsn - .19
+%% config_server_iteration - a number of iteration config_server's loop done
+%% disappearable_variable - hereAmI - will be absent on even iterations
+
+suite() ->
+    [
+     {timetrap, {seconds,10}}
+    ].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_) ->
+    ok.
+
+all() -> [test_get_known_variable, test_localtime_update,
+	  test_server_pid, test_disappearable_variable,
+	  test_disappearable_variable_alias].
+
+init_per_testcase(_, Config) ->
+    Config.
+
+end_per_testcase(_, _) ->
+    ok.
+
+% test that usual config works
+test_get_known_variable(_)->
+    Node = erlang:node(),
+    0.19 = ct:get_config(config_server_vsn),
+    Node = ct:get_config(node),
+    ok.
+
+% localtime will be updated in 5 seconds, check that
+test_localtime_update(_)->
+    Seconds = 5,
+    LT1 = ct:get_config(localtime),
+    timer:sleep(Seconds*1000),
+    LT2 = ct:reload_config(localtime),
+    case is_diff_ok(LT1, LT2, Seconds) of
+	{false, Actual, Exp}->
+	    ct:fail(io_lib:format("Time difference ~p is not ok, expected ~p", [Actual, Exp]));
+	true->
+	    ok
+    end.
+
+% server pid should not change
+test_server_pid()->
+    [{require, cfvsn, config_server_vsn}].
+test_server_pid(_)->
+    Pid = ct:get_config(config_server_pid),
+    Pid = ct:reload_config(config_server_pid),
+    Vsn = ct:get_config(config_server_vsn),
+    % aliases remain after config reloading
+    Vsn = ct:get_config(cfvsn),
+    ok.
+
+% test that variables may disappear from the config_2_SUITE
+test_disappearable_variable(_)->
+    % ask CT for config_server_iteration variable
+    Iter = ct:reload_config(config_server_iteration),
+    % here we should reload this variable in case it's odd
+    if Iter rem 2 == 1->
+	Iter2 = ct:reload_config(config_server_iteration),
+	Iter2 = Iter+1;
+	true->ok
+    end,
+    % now disappearable_variable should be in place
+    hereAmI = ct:get_config(disappearable_variable),
+    % and now it should disappear
+    undefined = ct:reload_config(disappearable_variable).
+
+% alias of disappearable_variable should disappear too
+test_disappearable_variable_alias(_)->
+    % the same rules apply for this testcase as for previous one
+    Iter = ct:reload_config(config_server_iteration),
+    Iter2 = if
+	Iter rem 2 == 1 ->
+	    NewIter = ct:reload_config(config_server_iteration),
+	    NewIter = Iter+1;
+	true->
+	    Iter
+    end,
+    ct:require(diav, disappearable_variable),
+    hereAmI = ct:get_config(disappearable_variable),
+    hereAmI = ct:get_config(diav),
+    ct:reload_config(disappearable_variable),
+    undefined = ct:get_config(disappearable_variable),
+    % after reloading, it's even again
+    Iter3=ct:get_config(config_server_iteration),
+    Iter3 = Iter2+1,
+    % and alias does not exist
+    undefined = ct:get_config(diav).
+
+my_dt_to_datetime([{date, D},{time, T}])->
+    {D, T}.
+
+is_diff_ok(DT1, DT2, Seconds)->
+    GS1 = calendar:datetime_to_gregorian_seconds(my_dt_to_datetime(DT1)),
+    GS2 = calendar:datetime_to_gregorian_seconds(my_dt_to_datetime(DT2)),
+    if
+	GS2-GS1 > Seconds+Seconds/2;
+	GS2-GS1 < Seconds-Seconds/2->
+	    {false, GS2-GS1, Seconds};
+	true->
+	    true
+    end.
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl
new file mode 100644
index 0000000000..8463fea645
--- /dev/null
+++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl
@@ -0,0 +1,93 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_config_SUITE
+%%%
+%%% Description:
+%%% Config server used in the CT's tests (config_2_SUITE)
+%%%-------------------------------------------------------------------
+-module(config_server).
+-export([start/0, stop/0, loop/1, init/1, get_config/0]).
+
+-define(REGISTERED_NAME, ct_test_config_server).
+-define(vsn, 0.19).
+
+start()->
+    case whereis(?REGISTERED_NAME) of
+        undefined->
+	    spawn(?MODULE, init, [?REGISTERED_NAME]),
+	    wait();
+	_Pid->
+	    ok
+    end,
+    ?REGISTERED_NAME.
+
+init(Name)->
+    register(Name, self()),
+    loop(0).
+
+get_config()->
+    call(self(), get_config).
+
+stop()->
+    call(self(), stop).
+
+call(Client, Request)->
+    case whereis(?REGISTERED_NAME) of
+	undefined->
+	    {error, not_started, Request};
+	Pid->
+	    Pid ! {Client, Request},
+	    receive
+	        Reply->
+		    {ok, Reply}
+	    after 4000->
+		{error, timeout, Request}
+	    end
+    end.
+
+loop(Iteration)->
+    receive
+	{Pid, stop}->
+	    Pid ! ok;
+	{Pid, get_config}->
+	    {D,T} = erlang:localtime(),
+	    Config =
+		[{localtime, [{date, D}, {time, T}]},
+		 {node, erlang:node()},
+		 {config_server_iteration, Iteration},
+		 {now, erlang:now()},
+		 {config_server_pid, self()},
+		 {config_server_vsn, ?vsn}],
+	    Config2 = if Iteration rem 2 == 0->
+		Config ++ [{disappearable_variable, hereAmI}];
+		true-> Config
+	    end,
+	    Pid ! Config2,
+	    ?MODULE:loop(Iteration+1)
+    end.
+
+wait()->
+    case whereis(?REGISTERED_NAME) of
+	undefined->
+	    wait();
+	_Pid->
+	    ok
+    end.
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
new file mode 100644
index 0000000000..8751a2e8f3
--- /dev/null
+++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_static_SUITE.erl
@@ -0,0 +1,123 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: config_static_SUITE
+%%%
+%%% Description:
+%%% Test suite for common_test which tests the get_config and require
+%%% functionality
+%%%-------------------------------------------------------------------
+-module(config_static_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+% The config contains variables:
+% x - atom
+% gen_cfg - list with two key-values tagged with a and b
+% gen_cfg2 - list of five key-values tagged with c, d, e, f and g
+% gen_cfg3 - list of two complex key-values taggen with:
+%	h: three elements inside - i, j and k
+%	l: m inside, contains n and o
+
+suite() ->
+    [
+     {timetrap, {seconds,10}},
+     %% x1 doesn't exist in cfg-file!
+     {require, x1, x},
+     {require, gen_cfg3},
+     {require, alias, gen_cfg},
+     %% x1 default value
+     {x1, {x,suite}}
+    ].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_) ->
+    ok.
+
+all() -> [test_get_config_simple, test_get_config_nested, test_default_suitewide,
+	  test_config_name_already_in_use1, test_default_tclocal,
+	  test_config_name_already_in_use2, test_alias_tclocal,
+	  test_get_config_undefined].
+
+init_per_testcase(_, Config) ->
+    Config.
+
+end_per_testcase(_, _) ->
+    ok.
+
+%% test getting a simple value
+test_get_config_simple(_)->
+    suite = ct:get_config(x),
+    ok.
+
+%% test getting a nested value
+test_get_config_nested(_)->
+    a_value = ct:get_config({gen_cfg, a}),
+    ok.
+
+%% test suite-wide default value
+test_default_suitewide(_)->
+    suite = ct:get_config(x1),
+    ok.
+
+%% should get skipped
+test_config_name_already_in_use1() ->
+    [{timetrap, {seconds,2}},
+     {require, x1, x},
+     {x1, {x,test2}}].
+test_config_name_already_in_use1(_) ->
+    ct:fail("Test should've been skipped, you shouldn't see this!"),
+    ok.
+
+%% test defaults in a testcase
+test_default_tclocal() ->
+    [{timetrap, {seconds,3}},
+     {require, y1, y},
+     {y1, {y,test3}}].
+test_default_tclocal(_) ->
+    test3 = ct:get_config(y1),
+    ok.
+
+%% should get skipped
+test_config_name_already_in_use2() ->
+    [{require,alias,something},
+     {alias,{something,else}},
+     {require, x1, x},
+     {x1, {x,test4}}].
+test_config_name_already_in_use2(_) ->
+    ct:fail("Test should've been skipped, you shouldn't see this!"),
+    ok.
+
+%% test aliases
+test_alias_tclocal() ->
+    [{require,newalias,gen_cfg}].
+test_alias_tclocal(_) ->
+    A = [{a,a_value},{b,b_value}] = ct:get_config(newalias),
+    A = ct:get_config(gen_cfg),
+    ok.
+
+%% test for getting undefined variables
+test_get_config_undefined(_) ->
+    undefined = ct:get_config(y1),
+    ok.
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index be75d768fc..17faf5ee3f 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -29,7 +29,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 -define(eh, ct_test_support_eh).
@@ -56,16 +56,22 @@ init_per_testcase(TestCase, Config) ->
 end_per_testcase(TestCase, Config) ->
     ct_test_support:end_per_testcase(TestCase, Config).
 
-all(doc) -> 
-    [""];
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [cfg_error, lib_error, no_compile, timetrap_end_conf,
+     timetrap_normal, timetrap_extended].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-all(suite) -> 
-    [
-     cfg_error,
-     lib_error,
-     no_compile
-    ].
-     
 
 %%--------------------------------------------------------------------
 %% TEST CASES
@@ -84,17 +90,22 @@ cfg_error(Config) when is_list(Config) ->
 	      Join(DataDir, "cfg_error_6_SUITE"),
 	      Join(DataDir, "cfg_error_7_SUITE"),
 	      Join(DataDir, "cfg_error_8_SUITE"),
-	      Join(DataDir, "cfg_error_9_SUITE")
+	      Join(DataDir, "cfg_error_9_SUITE"),
+	      Join(DataDir, "cfg_error_10_SUITE"),
+	      Join(DataDir, "cfg_error_11_SUITE"),
+	      Join(DataDir, "cfg_error_12_SUITE"),
+	      Join(DataDir, "cfg_error_13_SUITE"),
+	      Join(DataDir, "cfg_error_14_SUITE")
 	     ],
-    {Opts,ERPid} = setup({suite,Suites}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    {Opts,ERPid} = setup([{suite,Suites}], Config),
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(cfg_error, 
 			       reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(cfg_error),    
+    TestEvents = events_to_check(cfg_error),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 
@@ -104,17 +115,17 @@ lib_error(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     Join = fun(D, S) -> filename:join(D, "error/test/"++S) end,
     Suites = [Join(DataDir, "lib_error_1_SUITE")],
-    {Opts,ERPid} = setup({suite,Suites}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    {Opts,ERPid} = setup([{suite,Suites}], Config),
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(lib_error, 
 			       reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(lib_error),    
+    TestEvents = events_to_check(lib_error),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
-    
+
 
 %%%-----------------------------------------------------------------
 %%% 
@@ -122,17 +133,75 @@ no_compile(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     Join = fun(D, S) -> filename:join(D, "error/test/"++S) end,
     Suites = [Join(DataDir, "no_compile_SUITE")],
-    {Opts,ERPid} = setup({suite,Suites}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    {Opts,ERPid} = setup([{suite,Suites}], Config),
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(no_compile, 
 			       reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(no_compile),    
+    TestEvents = events_to_check(no_compile),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+timetrap_end_conf(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Join = fun(D, S) -> filename:join(D, "error/test/"++S) end,
+    Suites = [Join(DataDir, "timetrap_1_SUITE")],
+    {Opts,ERPid} = setup([{suite,Suites}], Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(timetrap_end_conf,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config)),
+
+    TestEvents = events_to_check(timetrap_end_conf),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+timetrap_normal(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Join = fun(D, S) -> filename:join(D, "error/test/"++S) end,
+    Suite = Join(DataDir, "timetrap_2_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},
+			  {userconfig,{ct_userconfig_callback,
+				       "multiply 1 scale false"}}],
+			 Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(timetrap_normal,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config)),
+
+    TestEvents = events_to_check(timetrap_normal),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+timetrap_extended(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Join = fun(D, S) -> filename:join(D, "error/test/"++S) end,
+    Suite = Join(DataDir, "timetrap_2_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},
+			  {multiply_timetraps,2},
+			  {scale_timetraps,false},
+			  {userconfig,{ct_userconfig_callback,
+				       "multiply 2 scale false"}}],
+			 Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(timetrap_extended,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config)),
+
+    TestEvents = events_to_check(timetrap_extended),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
-    
 
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
@@ -142,23 +211,32 @@ 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 ++ [Test,{event_handler,{?eh,EvHArgs}}],
+    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).
-%reformat(Events, _EH) ->
-%    Events.
+						%reformat(Events, _EH) ->
+						%    Events.
 
 %%%-----------------------------------------------------------------
 %%% 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(cfg_error) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{9,9,33}},
+     {?eh,start_info,{14,14,42}},
 
      {?eh,tc_start,{cfg_error_1_SUITE,init_per_suite}},
      {?eh,tc_done,
@@ -173,7 +251,7 @@ test_events(cfg_error) ->
      {?eh,test_stats,{0,0,{0,2}}},
      {?eh,tc_auto_skip,
       {cfg_error_1_SUITE,end_per_suite,{failed,{cfg_error_1_SUITE,init_per_suite,
-				      {'EXIT',init_per_suite_fails}}}}},
+						{'EXIT',init_per_suite_fails}}}}},
 
      {?eh,tc_start,{cfg_error_2_SUITE,init_per_suite}},
      {?eh,tc_done,
@@ -303,12 +381,12 @@ test_events(cfg_error) ->
       {?eh,tc_auto_skip,
        {cfg_error_8_SUITE,tc1,
 	{failed,{cfg_error_8_SUITE,init_per_group,
-	  {'EXIT',{init_per_group_fails,g1}}}}}},
+		 {'EXIT',{init_per_group_fails,g1}}}}}},
       {?eh,test_stats,{4,0,{0,11}}},
       {?eh,tc_auto_skip,
        {cfg_error_8_SUITE,end_per_group,
 	{failed,{cfg_error_8_SUITE,init_per_group,
-	  {'EXIT',{init_per_group_fails,g1}}}}}}],
+		 {'EXIT',{init_per_group_fails,g1}}}}}}],
 
      [{?eh,tc_start,{cfg_error_8_SUITE,{init_per_group,g2,[]}}},
       {?eh,tc_done,{cfg_error_8_SUITE,
@@ -321,7 +399,7 @@ test_events(cfg_error) ->
       {?eh,tc_auto_skip,{cfg_error_8_SUITE,end_per_group,
 			 {failed,{cfg_error_8_SUITE,init_per_group,
 				  {timetrap_timeout,2000}}}}}],
-     
+
      [{?eh,tc_start,{cfg_error_8_SUITE,{init_per_group,g3,[]}}},
       {?eh,tc_done,
        {cfg_error_8_SUITE,{init_per_group,g3,[]},
@@ -361,7 +439,7 @@ test_events(cfg_error) ->
       {?eh,test_stats,{5,0,{0,13}}},
       {?eh,tc_start,{cfg_error_8_SUITE,{end_per_group,g4,[]}}},
       {?eh,tc_done,{cfg_error_8_SUITE,{end_per_group,g4,[]},ok}}],
-     
+
      [{?eh,tc_start,{cfg_error_8_SUITE,{init_per_group,g5,[]}}},
       {?eh,tc_done,{cfg_error_8_SUITE,{init_per_group,g5,[]},ok}},
       {?eh,tc_start,{cfg_error_8_SUITE,tc1}},
@@ -470,6 +548,59 @@ test_events(cfg_error) ->
      {?eh,tc_start,{cfg_error_9_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_9_SUITE,end_per_suite,ok}},
 
+     {?eh,tc_start,{cfg_error_10_SUITE,init_per_suite}},
+     {?eh,tc_done,{cfg_error_10_SUITE,init_per_suite,
+		   {failed,{error,fail_init_per_suite}}}},
+     {?eh,tc_auto_skip,{cfg_error_10_SUITE,tc1,
+			{failed,{cfg_error_10_SUITE,init_per_suite,
+				 {failed,fail_init_per_suite}}}}},
+     {?eh,test_stats,{12,3,{0,19}}},
+     {?eh,tc_auto_skip,{cfg_error_10_SUITE,end_per_suite,
+			{failed,{cfg_error_10_SUITE,init_per_suite,
+				 {failed,fail_init_per_suite}}}}},
+     {?eh,tc_start,{cfg_error_11_SUITE,init_per_suite}},
+     {?eh,tc_done,{cfg_error_11_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{cfg_error_11_SUITE,tc1}},
+     {?eh,tc_done,{cfg_error_11_SUITE,tc1,
+		   {skipped,{config_name_already_in_use,[dummy0]}}}},
+     {?eh,test_stats,{12,3,{1,19}}},
+     {?eh,tc_start,{cfg_error_11_SUITE,tc2}},
+     {?eh,tc_done,{cfg_error_11_SUITE,tc2,ok}},
+     {?eh,test_stats,{13,3,{1,19}}},
+     {?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,{cfg_error_12_SUITE,tc1,{failed,{timetrap_timeout,500}}}},
+     {?eh,test_stats,{13,4,{1,19}}},
+     {?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,4,{1,19}}},
+     {?eh,tc_start,{cfg_error_12_SUITE,tc3}},
+     {?eh,tc_done,{cfg_error_12_SUITE,tc3,ok}},
+     {?eh,test_stats,{15,4,{1,19}}},
+     {?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,4,{1,19}}},
+     {?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,4,{1,19}}},
+     {?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,4,{1,19}}},
+     {?eh,tc_start,{cfg_error_14_SUITE,end_per_suite}},
+     {?eh,tc_done,{cfg_error_14_SUITE,end_per_suite,
+		   {comment,
+		    "should succeed since ct_fw cancels timetrap in end_tc"}}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
@@ -555,4 +686,91 @@ test_events(lib_error) ->
     ];
 
 test_events(no_compile) ->
-    [].
+    [];
+
+test_events(timetrap_end_conf) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,6}},
+     {?eh,tc_start,{timetrap_1_SUITE,init_per_suite}},
+     {?eh,tc_done,{timetrap_1_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{timetrap_1_SUITE,tc1}},
+     {?eh,tc_done,
+      {timetrap_1_SUITE,tc1,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,1,{0,0}}},
+     {?eh,tc_start,{timetrap_1_SUITE,tc2}},
+     {?eh,tc_done,
+      {timetrap_1_SUITE,tc2,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,2,{0,0}}},
+     {?eh,tc_start,{timetrap_1_SUITE,tc3}},
+     {?eh,tc_done,
+      {timetrap_1_SUITE,tc3,{failed,{testcase_aborted,testing_end_conf}}}},
+     {?eh,test_stats,{0,3,{0,0}}},
+     {?eh,tc_start,{timetrap_1_SUITE,tc4}},
+     {?eh,tc_done,
+      {timetrap_1_SUITE,tc4,{failed,{testcase_aborted,testing_end_conf}}}},
+     {?eh,test_stats,{0,4,{0,0}}},
+     {?eh,tc_start,{timetrap_1_SUITE,tc5}},
+     {?eh,tc_done,
+      {timetrap_1_SUITE,tc5,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,5,{0,0}}},
+     {?eh,tc_start,{timetrap_1_SUITE,tc6}},
+     {?eh,tc_done,
+      {timetrap_1_SUITE,tc6,{failed,{testcase_aborted,testing_end_conf}}}},
+     {?eh,test_stats,{0,6,{0,0}}},
+     {?eh,tc_start,{timetrap_1_SUITE,end_per_suite}},
+     {?eh,tc_done,{timetrap_1_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(timetrap_normal) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,3}},
+     {?eh,tc_start,{timetrap_2_SUITE,init_per_suite}},
+     {?eh,tc_done,{timetrap_2_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{timetrap_2_SUITE,tc0}},
+     {?eh,tc_done,
+      {timetrap_2_SUITE,tc0,{failed,{timetrap_timeout,3000}}}},
+     {?eh,test_stats,{0,1,{0,0}}},
+     {?eh,tc_start,{timetrap_2_SUITE,tc1}},
+     {?eh,tc_done,
+      {timetrap_2_SUITE,tc1,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,2,{0,0}}},
+     {?eh,tc_start,{timetrap_2_SUITE,tc2}},
+     {?eh,tc_done,
+      {timetrap_2_SUITE,tc2,{failed,{timetrap_timeout,500}}}},
+     {?eh,test_stats,{0,3,{0,0}}},
+     {?eh,tc_start,{timetrap_2_SUITE,end_per_suite}},
+     {?eh,tc_done,{timetrap_2_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(timetrap_extended) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,3}},
+     {?eh,tc_start,{timetrap_2_SUITE,init_per_suite}},
+     {?eh,tc_done,{timetrap_2_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{timetrap_2_SUITE,tc0}},
+     {?eh,tc_done,
+      {timetrap_2_SUITE,tc0,{failed,{timetrap_timeout,6000}}}},
+     {?eh,test_stats,{0,1,{0,0}}},
+     {?eh,tc_start,{timetrap_2_SUITE,tc1}},
+     {?eh,tc_done,
+      {timetrap_2_SUITE,tc1,{failed,{timetrap_timeout,2000}}}},
+     {?eh,test_stats,{0,2,{0,0}}},
+     {?eh,tc_start,{timetrap_2_SUITE,tc2}},
+     {?eh,tc_done,
+      {timetrap_2_SUITE,tc2,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,3,{0,0}}},
+     {?eh,tc_start,{timetrap_2_SUITE,end_per_suite}},
+     {?eh,tc_done,{timetrap_2_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_10_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_10_SUITE.erl
new file mode 100644
index 0000000000..9f9a90372b
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_10_SUITE.erl
@@ -0,0 +1,123 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(cfg_error_10_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,2}},
+     {require, dummy0}, {default_config, dummy0, "suite/0"},
+     {require, dummy1}, {default_config, dummy1, "suite/0"},
+     {require, dummy2}, {default_config, dummy2, "suite/0"}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_suite() ->
+    put('$test_server_framework_test',
+	fun(init_tc, _Default) -> {fail,fail_init_per_suite};
+	   (_, Default) -> Default
+	end),
+    [{require, dummy3}, {default_config, dummy3, "init_per_suite/0"},
+     {timetrap,3000}].
+
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_suite(Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    done.
+
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() ->
+    [tc1].
+
+tc1(_) ->
+    exit(should_never_run).
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_11_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_11_SUITE.erl
new file mode 100644
index 0000000000..ce94533110
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_11_SUITE.erl
@@ -0,0 +1,134 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(cfg_error_11_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,2}},
+     {require, dummy0}, {default_config, dummy0, "suite/0"},
+     {require, dummy1}, {default_config, dummy1, "suite/0"},
+     {require, dummy2}, {default_config, dummy2, "suite/0"}].
+
+
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_suite() ->
+    put('$test_server_framework_test',
+	fun(end_tc, _Default) -> {fail,fail_end_per_suite};
+	   (_, Default) -> Default
+	end),
+    [{require, dummy3}, {default_config, dummy3, "end_per_suite/0"},
+     {timetrap,3000}].
+
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    done.
+
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() ->
+    [tc1, tc2].
+
+tc1() ->
+    [{require, dummy0}, {default_config, dummy0, "tc1"}].
+
+tc1(_) ->
+    dummy.
+
+tc2() ->
+    [{timetrap,1}].
+
+tc2(_) ->
+    dummy.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl
new file mode 100644
index 0000000000..806d3caf72
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl
@@ -0,0 +1,88 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(cfg_error_12_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+init_per_testcase(_, Config) ->
+    Config.
+
+end_per_testcase(tc2, _Config) ->
+    timer:sleep(2000),
+    exit(this_should_not_be_printed);
+end_per_testcase(tc4, _Config) ->
+    timer:sleep(2000),
+    exit(this_should_not_be_printed);
+end_per_testcase(_, _) ->
+    ok.
+
+all() ->
+    [tc1, tc2, tc3, tc4].
+
+%%%-----------------------------------------------------------------
+tc1() ->
+    put('$test_server_framework_test',
+	fun(init_tc, _Default) ->
+		ct:pal("init_tc(~p): Night time...",[self()]),
+		timer:sleep(2000),
+		ct:pal("init_tc(~p): Day time!",[self()]),
+		exit(this_should_not_be_printed);
+	   (_, Default) -> Default
+	end),
+    [{timetrap,500}].
+
+tc1(_) ->
+    exit(this_should_not_be_printed).
+
+%%%-----------------------------------------------------------------
+tc2() ->
+    [{timetrap,500}].
+
+tc2(_) ->
+    ok.
+
+%%%-----------------------------------------------------------------
+tc3() ->
+    [{timetrap,500}].
+
+tc3(_) ->
+    put('$test_server_framework_test',
+	fun(end_tc, _Default) ->
+		ct:pal("end_tc(~p): Night time...",[self()]),
+		timer:sleep(1000),
+		ct:pal("end_tc(~p): Day time!",[self()]);
+	   (_, Default) -> Default
+	end),
+    {comment,"should succeed since ct_fw cancels timetrap in end_tc"}.
+
+%%%-----------------------------------------------------------------
+tc4() ->
+    put('$test_server_framework_test',
+	fun(end_tc, _Default) ->
+		ct:pal("end_tc(~p): Night time...",[self()]),
+		timer:sleep(1000),
+		ct:pal("end_tc(~p): Day time!",[self()]);
+	   (_, Default) -> Default
+	end),
+    [{timetrap,500}].
+
+tc4(_) ->
+    ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_13_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_13_SUITE.erl
new file mode 100644
index 0000000000..c8a3c1d15e
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_13_SUITE.erl
@@ -0,0 +1,47 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(cfg_error_13_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+init_per_suite() ->
+    put('$test_server_framework_test',
+	fun(end_tc, _Default) ->
+		ct:pal("end_tc(~p): Night time...",[self()]),
+		timer:sleep(1000),
+		ct:pal("end_tc(~p): Day time!",[self()]);
+	   (_, Default) -> Default
+	end),
+    [{timetrap,500}].
+
+init_per_suite(Config) ->
+    ct:comment("should succeed since ct_fw cancels timetrap in end_tc"),
+    Config.
+
+end_per_suite(_) ->
+    ok.
+
+all() ->
+    [tc1].
+
+%%%-----------------------------------------------------------------
+tc1(_) ->
+    dummy.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_14_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_14_SUITE.erl
new file mode 100644
index 0000000000..960d0f61b0
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_14_SUITE.erl
@@ -0,0 +1,46 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(cfg_error_14_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite() ->
+    put('$test_server_framework_test',
+	fun(end_tc, _Default) ->
+		ct:pal("end_tc(~p): Night time...",[self()]),
+		timer:sleep(1000),
+		ct:pal("end_tc(~p): Day time!",[self()]);
+	   (_, Default) -> Default
+	end),
+    [{timetrap,500}].
+
+end_per_suite(_Config) ->
+    {comment,"should succeed since ct_fw cancels timetrap in end_tc"}.
+
+all() ->
+    [tc1].
+
+%%%-----------------------------------------------------------------
+tc1(_) ->
+    dummy.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_3_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_3_SUITE.erl
index bf01bb52d9..08c57887ef 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_3_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_3_SUITE.erl
@@ -37,7 +37,8 @@ suite() ->
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
     timer:sleep(5000),
-    Config.
+    exit(shouldnt_happen).
+%    Config.
 
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
new file mode 100644
index 0000000000..cb3109349b
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
@@ -0,0 +1,194 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(timetrap_1_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,1}}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    TabPid = spawn(fun() ->
+			   ets:new(?MODULE, [named_table, set, public]),
+			   ets:insert(?MODULE, {last_case,ok}),
+			   receive _ -> ok end
+		   end),
+    [{tab,TabPid} | Config].
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_suite(Config) ->
+    exit(?config(tab, Config), kill),
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_testcase(TC, Config) ->
+    {_,_} = process_info(?config(tab, Config), priority),
+    [{_,ok}] = ets:lookup(?MODULE, last_case),
+    ets:insert(?MODULE, {last_case,fail}),
+    init_per_testcase1(TC, Config).
+
+init_per_testcase1(tc1, Config) ->
+    [{tc,tc1}|Config];
+
+init_per_testcase1(tc2, Config) ->
+    [{tc,tc2}|Config];
+
+init_per_testcase1(tc3, Config) ->
+    [{tc,tc3}|Config];
+
+init_per_testcase1(tc4, Config) ->
+    [{tc,tc4},{default_timeout,5000}|Config];
+
+init_per_testcase1(tc5, Config) ->
+    [{tc,tc5}|Config];
+
+init_per_testcase1(tc6, Config) ->
+    [{tc,tc6}|Config].
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(TC, Config) ->
+    {_,_} = process_info(?config(tab, Config), priority),
+    [{_,fail}] = ets:lookup(?MODULE, last_case),
+    ets:insert(?MODULE, {last_case,ok}),
+    end_per_testcase1(TC, Config).
+
+end_per_testcase1(tc1, Config) ->
+    ct:pal("end_per_testcase(tc1): ~p", [Config]),
+    tc1 = ?config(tc, Config),
+    {failed,timetrap_timeout} = ?config(tc_status, Config),
+    ok;
+
+end_per_testcase1(tc2, Config) ->
+    ct:pal("end_per_testcase(tc2): ~p", [Config]),
+    tc2 = ?config(tc, Config),
+    {failed,timetrap_timeout} = ?config(tc_status, Config),
+    timer:sleep(2000);
+
+end_per_testcase1(tc3, Config) ->
+    ct:pal("end_per_testcase(tc3): ~p", [Config]),
+    tc3 = ?config(tc, Config),
+    {failed,{testcase_aborted,testing_end_conf}} = ?config(tc_status, Config),
+    ok;
+
+end_per_testcase1(tc4, Config) ->
+    ct:pal("end_per_testcase(tc4): ~p", [Config]),
+    tc4 = ?config(tc, Config),
+    {failed,{testcase_aborted,testing_end_conf}} = ?config(tc_status, Config),
+    timer:sleep(2000);
+
+end_per_testcase1(tc5, Config) ->
+    ct:pal("end_per_testcase(tc5): ~p", [Config]),
+    tc5 = ?config(tc, Config),
+    exit(end_per_tc_fail_after_timeout);
+
+end_per_testcase1(tc6, Config) ->
+    ct:pal("end_per_testcase(tc6): ~p", [Config]),
+    tc6 = ?config(tc, Config),
+    exit(end_per_tc_fail_after_abort).
+
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() ->
+    [tc1, tc2, tc3, tc4, tc5, tc6].
+
+tc1(_) ->
+    timer:sleep(2000).
+
+tc2(_) ->
+    timer:sleep(2000).
+
+tc3(_) ->
+    spawn(ct, abort_current_testcase, [testing_end_conf]),
+    timer:sleep(2000).
+
+tc4(_) ->
+    spawn(ct, abort_current_testcase, [testing_end_conf]),
+    timer:sleep(2000).
+
+tc5(_) ->
+    timer:sleep(2000).
+
+tc6(_) ->
+    spawn(ct, abort_current_testcase, [testing_end_conf]),
+    timer:sleep(2000).
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl
new file mode 100644
index 0000000000..99bb400137
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl
@@ -0,0 +1,138 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(timetrap_2_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,3}},
+     {require,multiply},
+     {require,scale}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_testcase(tc1, Config) ->
+    ct:timetrap({seconds,1}),
+    Config;
+
+init_per_testcase(tc3, Config) ->
+    ct:timetrap({seconds,1}),
+    Config;
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_, Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() ->
+    [tc0,tc1,tc2].
+
+tc0(_) ->
+    N = list_to_integer(ct:get_config(multiply)),
+    ct:comment(io_lib:format("TO after ~w sec", [3*N])),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc1(_) ->
+    N =list_to_integer( ct:get_config(multiply)),
+    ct:comment(io_lib:format("TO after ~w sec", [1*N])),
+    ct:sleep({seconds,5}),
+    ok.
+
+tc2(_) ->
+    N = list_to_integer(ct:get_config(multiply)),
+    ct:comment(io_lib:format("TO after ~w sec", [0.5*N])),
+    ct:timetrap(500),
+    ct:sleep(2000),
+    ok.
diff --git a/lib/common_test/test/ct_event_handler_SUITE.erl b/lib/common_test/test/ct_event_handler_SUITE.erl
index bafd32f937..b27770881d 100644
--- a/lib/common_test/test/ct_event_handler_SUITE.erl
+++ b/lib/common_test/test/ct_event_handler_SUITE.erl
@@ -28,7 +28,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %-include_lib("common_test/include/ct_event.hrl").
 
@@ -56,12 +56,21 @@ init_per_testcase(TestCase, Config) ->
 end_per_testcase(TestCase, Config) ->
     ct_test_support:end_per_testcase(TestCase, Config).
 
-all(doc) -> 
-    [];
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all(suite) -> 
+all() -> 
     [start_stop, results].
 
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
 
 %%--------------------------------------------------------------------
 %% TEST CASES
@@ -88,7 +97,7 @@ start_stop(Config) when is_list(Config) ->
 
     ERPid = ct_test_support:start_event_receiver(Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    ok = ct_test_support:run(Opts, Config),
     
     Events = ct_test_support:get_events(ERPid, Config),    
 
@@ -110,8 +119,7 @@ start_stop(Config) when is_list(Config) ->
 	 {eh_A,test_done,{'DEF','STOP_TIME'}},
 	 {eh_A,stop_logging,[]}],
 
-    ok = ct_test_support:verify_events(TestEvents, Events, Config),
-    {comment,"NOTE! Known problem with test_start event!"}.
+    ok = ct_test_support:verify_events(TestEvents++TestEvents, Events, Config).
 
 
 results(doc) -> 
@@ -135,7 +143,7 @@ results(Config) when is_list(Config) ->
 
     ERPid = ct_test_support:start_event_receiver(Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    ok = ct_test_support:run(Opts, Config),
     
     Events = ct_test_support:get_events(ERPid, Config),
     
@@ -163,7 +171,7 @@ results(Config) when is_list(Config) ->
 	 {eh_A,test_done,{'DEF','STOP_TIME'}},
 	 {eh_A,stop_logging,[]}],
 
-    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+    ok = ct_test_support:verify_events(TestEvents++TestEvents, Events, Config).
 
 
 %%%-----------------------------------------------------------------
diff --git a/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl b/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl
index 6e526f15a2..54cf3a22e7 100644
--- a/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl
+++ b/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2008-2010. 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%
 %%
 
@@ -44,6 +44,19 @@
 %% Description: Whenever a new event handler is added to an event manager,
 %% this function is called to initialize the event handler.
 %%--------------------------------------------------------------------
+init(String = [X|_]) when is_integer(X) ->
+    case erl_scan:string(String++".") of
+	{ok,Ts,_} ->
+	    case erl_parse:parse_term(Ts) of
+		{ok,Args} ->
+		    init(Args);
+		_ ->
+		    init(String)
+	    end;
+	_ ->
+	    init(String)
+    end;
+
 init(Args) ->
     
     S1 = case lists:keysearch(cbm, 1, Args) of
diff --git a/lib/common_test/test/ct_groups_test_1_SUITE.erl b/lib/common_test/test/ct_groups_test_1_SUITE.erl
index 1761b773f5..3712bc0e33 100644
--- a/lib/common_test/test/ct_groups_test_1_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_1_SUITE.erl
@@ -29,7 +29,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 -define(eh, ct_test_support_eh).
@@ -56,12 +56,21 @@ init_per_testcase(TestCase, Config) ->
 end_per_testcase(TestCase, Config) ->
     ct_test_support:end_per_testcase(TestCase, Config).
 
-all(doc) -> 
-    ["Run smoke tests of Common Test."];
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [groups_suite_1, groups_suite_2, groups_suites_1,
+     groups_dir_1, groups_dirs_1].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
 
-all(suite) -> 
-    [groups_suite_1, groups_suite_2,
-     groups_suites_1, groups_dir_1, groups_dirs_1].
 
 %%--------------------------------------------------------------------
 %% TEST CASES
@@ -76,14 +85,14 @@ groups_suite_1(Config) when is_list(Config) ->
     Suite = filename:join(DataDir, "groups_1/test/groups_11_SUITE"),
 
     {Opts,ERPid} = setup({suite,Suite}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(groups_suite_1, 
 			       reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(groups_suite_1),
+    TestEvents = events_to_check(groups_suite_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
     
 
@@ -96,14 +105,14 @@ groups_suite_2(Config) when is_list(Config) ->
     Suite = filename:join(DataDir, "groups_1/test/groups_12_SUITE"),
 
     {Opts,ERPid} = setup({suite,Suite}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(groups_suite_2, 
 			       reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(groups_suite_2),
+    TestEvents = events_to_check(groups_suite_2),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).  
     
 
@@ -117,14 +126,14 @@ groups_suites_1(Config) when is_list(Config) ->
 	      filename:join(DataDir, "groups_1/test/groups_12_SUITE")],
 
     {Opts,ERPid} = setup({suite,Suites}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(groups_suites_1, 
 			       reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(groups_suites_1),
+    TestEvents = events_to_check(groups_suites_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).  
 
 
@@ -137,14 +146,14 @@ groups_dir_1(Config) when is_list(Config) ->
     Dir = filename:join(DataDir, "groups_1"),
 
     {Opts,ERPid} = setup({dir,Dir}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(groups_dir_1, 
 			       reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(groups_dir_1),
+    TestEvents = events_to_check(groups_dir_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).  
 
 %%%-----------------------------------------------------------------
@@ -157,14 +166,14 @@ groups_dirs_1(Config) when is_list(Config) ->
 	    filename:join(DataDir, "groups_2")],
 
     {Opts,ERPid} = setup({dir,Dirs}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(groups_dirs_1, 
 			       reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(groups_dirs_1),
+    TestEvents = events_to_check(groups_dirs_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).  
 
 
@@ -188,6 +197,14 @@ reformat(Events, EH) ->
 %%%-----------------------------------------------------------------
 %%% 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(groups_suite_1) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
@@ -327,14 +344,14 @@ test_events(groups_suite_2) ->
  		 {?eh,tc_start,{groups_12_SUITE,testcase_2a}},
 		 {?eh,tc_done,{groups_12_SUITE,testcase_2a,ok}},
 
-		 [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]}}},
-		  {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]},ok}},		 
+		 [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+		  {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]},ok}},
 		   {?eh,tc_start,{groups_12_SUITE,testcase_3a}},
 		   {?eh,tc_done,{groups_12_SUITE,testcase_3a,ok}},
 		   {?eh,tc_start,{groups_12_SUITE,testcase_3b}},
 		   {?eh,tc_done,{groups_12_SUITE,testcase_3b,ok}},
-		  {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]}}},
-		  {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]},ok}}],
+		  {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}},
+		  {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]},ok}}],
 
 		 [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[]}}},
 		  {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[]},ok}},
@@ -361,12 +378,8 @@ test_events(groups_suite_2) ->
       
       {parallel,[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_5,[parallel]}}},
 		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_5,[parallel]},ok}},
-
-		 %% the done event could come in during the parallel subgroup
-		 %% and we can't test that, yet...
-		 %% {?eh,tc_start,{groups_12_SUITE,testcase_5a}},
-		 %% {?eh,tc_done,{groups_12_SUITE,testcase_5a,ok}},
-
+		 {?eh,tc_start,{groups_12_SUITE,testcase_5a}},
+		 {?eh,tc_done,{groups_12_SUITE,testcase_5a,ok}},
 		 {parallel,[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_6,[parallel]}}},
 			    {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_6,[parallel]},ok}},
 		  
@@ -525,14 +538,14 @@ test_events(groups_suites_1) ->
 		{?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_2,[parallel]},ok}},
 		{?eh,tc_start,{groups_12_SUITE,testcase_2a}},
 		{?eh,tc_done,{groups_12_SUITE,testcase_2a,ok}},
-		[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]}}},
-		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]},ok}},
+		[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]},ok}},
 		 {?eh,tc_start,{groups_12_SUITE,testcase_3a}},
 		 {?eh,tc_done,{groups_12_SUITE,testcase_3a,ok}},
 		 {?eh,tc_start,{groups_12_SUITE,testcase_3b}},
 		 {?eh,tc_done,{groups_12_SUITE,testcase_3b,ok}},
-		 {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]}}},
-		 {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]},ok}}],
+		 {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}},
+		 {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]},ok}}],
 		[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[]}}},
 		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[]},ok}},
 		 {?eh,tc_start,{groups_12_SUITE,testcase_3a}},
@@ -555,12 +568,8 @@ test_events(groups_suites_1) ->
       {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_4,[]},ok}},
        {parallel,[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_5,[parallel]}}},
 		  {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_5,[parallel]},ok}},
-
-		  %% the done event could come in during the parallel subgroup
-		  %% and we can't test that, yet...
-		  %% {?eh,tc_start,{groups_12_SUITE,testcase_5a}},
-		  %% {?eh,tc_done,{groups_12_SUITE,testcase_5a,ok}},
-		  
+		  {?eh,tc_start,{groups_12_SUITE,testcase_5a}},
+		  {?eh,tc_done,{groups_12_SUITE,testcase_5a,ok}},
 		   {parallel,[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_6,[parallel]}}},
 			      {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_6,[parallel]},ok}},
 			       [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_7,[sequence]}}},
@@ -715,14 +724,14 @@ test_events(groups_dir_1) ->
 		{?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_2,[parallel]},ok}},
 		{?eh,tc_start,{groups_12_SUITE,testcase_2a}},
 		{?eh,tc_done,{groups_12_SUITE,testcase_2a,ok}},
-		[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]}}},
-		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]},ok}},
+		[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]},ok}},
 		 {?eh,tc_start,{groups_12_SUITE,testcase_3a}},
 		 {?eh,tc_done,{groups_12_SUITE,testcase_3a,ok}},
 		 {?eh,tc_start,{groups_12_SUITE,testcase_3b}},
 		 {?eh,tc_done,{groups_12_SUITE,testcase_3b,ok}},
-		 {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]}}},
-		 {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]},ok}}],
+		 {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}},
+		 {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]},ok}}],
 		[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[]}}},
 		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[]},ok}},
 		 {?eh,tc_start,{groups_12_SUITE,testcase_3a}},
@@ -745,12 +754,8 @@ test_events(groups_dir_1) ->
       {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_4,[]},ok}},
       {parallel,[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_5,[parallel]}}},
 		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_5,[parallel]},ok}},
-
-		 %% the done event could come in during the parallel subgroup
-		 %% and we can't test that, yet...
-		 %% {?eh,tc_start,{groups_12_SUITE,testcase_5a}},
-		 %% {?eh,tc_done,{groups_12_SUITE,testcase_5a,ok}},
-		 
+		 {?eh,tc_start,{groups_12_SUITE,testcase_5a}},
+		 {?eh,tc_done,{groups_12_SUITE,testcase_5a,ok}},
 		 {parallel,[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_6,[parallel]}}},
 			    {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_6,[parallel]},ok}},
 			    [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_7,[sequence]}}},
@@ -906,14 +911,14 @@ test_events(groups_dirs_1) ->
 		{?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_2,[parallel]},ok}},
 		{?eh,tc_start,{groups_12_SUITE,testcase_2a}},
 		{?eh,tc_done,{groups_12_SUITE,testcase_2a,ok}},
-		[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]}}},
-		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,1}]},ok}},
+		[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]},ok}},
 		 {?eh,tc_start,{groups_12_SUITE,testcase_3a}},
 		 {?eh,tc_done,{groups_12_SUITE,testcase_3a,ok}},
 		 {?eh,tc_start,{groups_12_SUITE,testcase_3b}},
 		 {?eh,tc_done,{groups_12_SUITE,testcase_3b,ok}},
-		 {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]}}},
-		 {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,1}]},ok}}],
+		 {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}},
+		 {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]},ok}}],
 		[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_3,[]}}},
 		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_3,[]},ok}},
 		 {?eh,tc_start,{groups_12_SUITE,testcase_3a}},
@@ -936,12 +941,8 @@ test_events(groups_dirs_1) ->
       {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_4,[]},ok}},
       {parallel,[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_5,[parallel]}}},
 		 {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_5,[parallel]},ok}},
-		 
-		 %% the done event could come in during the parallel subgroup
-		 %% and we can't test that, yet...
-		 %% {?eh,tc_start,{groups_12_SUITE,testcase_5a}},		 
-		 %% {?eh,tc_done,{groups_12_SUITE,testcase_5a,ok}},
-
+		 {?eh,tc_start,{groups_12_SUITE,testcase_5a}},
+		 {?eh,tc_done,{groups_12_SUITE,testcase_5a,ok}},
 		 {parallel,[{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_6,[parallel]}}},
 			    {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_6,[parallel]},ok}},
 			    [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_7,[sequence]}}},
@@ -1138,17 +1139,17 @@ test_events(groups_dirs_1) ->
        {?eh,tc_start,{groups_22_SUITE,testcase_2a}},
        {?eh,tc_done,{groups_22_SUITE,testcase_2a,ok}},
        [{?eh,tc_start,
-         {groups_22_SUITE,{init_per_group,test_group_3,[{repeat,1}]}}},
+         {groups_22_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
 	{?eh,tc_done,
-         {groups_22_SUITE,{init_per_group,test_group_3,[{repeat,1}]},ok}},
+         {groups_22_SUITE,{init_per_group,test_group_3,[{repeat,2}]},ok}},
 	{?eh,tc_start,{groups_22_SUITE,testcase_3a}},
 	{?eh,tc_done,{groups_22_SUITE,testcase_3a,ok}},
 	{?eh,tc_start,{groups_22_SUITE,testcase_3b}},
 	{?eh,tc_done,{groups_22_SUITE,testcase_3b,ok}},
 	{?eh,tc_start,
-         {groups_22_SUITE,{end_per_group,test_group_3,[{repeat,1}]}}},
+         {groups_22_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}},
 	{?eh,tc_done,
-         {groups_22_SUITE,{end_per_group,test_group_3,[{repeat,1}]},ok}}],
+         {groups_22_SUITE,{end_per_group,test_group_3,[{repeat,2}]},ok}}],
        [{?eh,tc_start,
 	 {groups_22_SUITE,{init_per_group,test_group_3,[]}}},
 	{?eh,tc_done,
@@ -1181,12 +1182,8 @@ test_events(groups_dirs_1) ->
          {groups_22_SUITE,{init_per_group,test_group_5,[parallel]}}},
 	{?eh,tc_done,
          {groups_22_SUITE,{init_per_group,test_group_5,[parallel]},ok}},
-
-	%% the done event could come in during the parallel subgroup
-	%% and we can't test that, yet...
-	%% {?eh,tc_start,{groups_22_SUITE,testcase_5a}},
-	%% {?eh,tc_done,{groups_22_SUITE,testcase_5a,ok}},
-
+	{?eh,tc_start,{groups_22_SUITE,testcase_5a}},
+	{?eh,tc_done,{groups_22_SUITE,testcase_5a,ok}},
 	{parallel,
 	 [{?eh,tc_start,
 	   {groups_22_SUITE,{init_per_group,test_group_6,[parallel]}}},
diff --git a/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_11_SUITE.erl b/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_11_SUITE.erl
index c6d50443d0..c69400e938 100644
--- a/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_11_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_11_SUITE.erl
@@ -99,6 +99,7 @@ init_per_group(Group, Config) ->
     {Grs,_} = grs_and_tcs(),
     case lists:member(Group, Grs) of
 	true ->
+	    ct:comment(Group),
 	    init = ?config(suite,Config),
 	    [{Group,Group} | Config];
 	false ->
@@ -109,6 +110,7 @@ end_per_group(Group, Config) ->
     {Grs,_} = grs_and_tcs(),
     case lists:member(Group, Grs) of
 	true ->
+	    ct:comment(Group),
 	    init = ?config(suite,Config),
 	    Group = ?config(Group,Config),
 	    ok;
diff --git a/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_12_SUITE.erl b/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_12_SUITE.erl
index b261ef581f..ec90ef95d1 100644
--- a/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_12_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_1/test/groups_12_SUITE.erl
@@ -37,7 +37,7 @@ groups() ->
       
       {test_group_2, [parallel], [testcase_2a,
 				  
-				  {test_group_3, [{repeat,1}], 
+				  {test_group_3, [{repeat,2}],
 				   [testcase_3a, testcase_3b]},			  
 				  
 				  testcase_2b]},
@@ -102,8 +102,8 @@ init_per_group(Group, Config) ->
 		io_lib:format("shuffled, ~w", [S]);
 	    {test_group_1b,[{name,test_group_1b},parallel]} -> "parallel";
 	    {test_group_2,[{name,test_group_2},parallel]} -> "parallel";
-	    {test_group_3,[{name,test_group_3},{repeat,1}]} -> "repeat 1";
-	    {test_group_3,[{name,test_group_3}]} -> "repeat 0";
+	    {test_group_3,[{name,test_group_3},{repeat,2}]} -> "repeat 2";
+	    {test_group_3,[{name,test_group_3}]} -> "repeat 1";
 	    {test_group_4,[{name,test_group_4}]} -> ok;
 	    {test_group_5,[{name,test_group_5},parallel]} -> "parallel";
 	    {test_group_6,[{name,test_group_6},parallel]} -> "parallel";
@@ -275,6 +275,10 @@ testcase_5a(Config) ->
     test_group_5 = ?config(test_group_5,Config),
     undefined = ?config(testcase_3,Config),
     testcase_5a = ?config(testcase_5a,Config),
+    %% increase chance the done event will come
+    %% during execution of subgroup (could be
+    %% tricky to handle)
+    timer:sleep(3),
     ok.
 testcase_5b() -> 
     [].
diff --git a/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2/test/groups_22_SUITE.erl b/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2/test/groups_22_SUITE.erl
index 2e19cf6310..ec0adc5df0 100644
--- a/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2/test/groups_22_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_1_SUITE_data/groups_2/test/groups_22_SUITE.erl
@@ -37,7 +37,7 @@ groups() ->
       
       {test_group_2, [parallel], [testcase_2a,
 				  
-				  {test_group_3, [{repeat,1}], 
+				  {test_group_3, [{repeat,2}],
 				   [testcase_3a, testcase_3b]},			  
 				  
 				  testcase_2b]},
@@ -102,8 +102,8 @@ init_per_group(Group, Config) ->
 		io_lib:format("shuffled, ~w", [S]);
 	    {test_group_1b,[{name,test_group_1b},parallel]} -> "parallel";
 	    {test_group_2,[{name,test_group_2},parallel]} -> "parallel";
-	    {test_group_3,[{name,test_group_3},{repeat,1}]} -> "repeat 1";
-	    {test_group_3,[{name,test_group_3}]} -> "repeat 0";
+	    {test_group_3,[{name,test_group_3},{repeat,2}]} -> "repeat 2";
+	    {test_group_3,[{name,test_group_3}]} -> "repeat 1";
 	    {test_group_4,[{name,test_group_4}]} -> ok;
 	    {test_group_5,[{name,test_group_5},parallel]} -> "parallel";
 	    {test_group_6,[{name,test_group_6},parallel]} -> "parallel";
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE.erl
index 5a60d855b7..32e8d0c6d7 100644
--- a/lib/common_test/test/ct_groups_test_2_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_2_SUITE.erl
@@ -29,7 +29,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 -define(eh, ct_test_support_eh).
@@ -56,11 +56,20 @@ init_per_testcase(TestCase, Config) ->
 end_per_testcase(TestCase, Config) ->
     ct_test_support:end_per_testcase(TestCase, Config).
 
-all(doc) -> 
-    ["Run smoke tests of Common Test."];
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [missing_conf, repeat_1].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> 
-    [missing_conf].
 
 %%--------------------------------------------------------------------
 %% TEST CASES
@@ -75,16 +84,35 @@ missing_conf(Config) when is_list(Config) ->
     Suite = filename:join(DataDir, "groups_1/missing_conf_SUITE"),
 
     {Opts,ERPid} = setup({suite,Suite}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(missing_conf_SUITE, 
 			       reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(missing_conf),
+    TestEvents = events_to_check(missing_conf),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+repeat_1(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    Suite = filename:join(DataDir, "groups_1/repeat_1_SUITE"),
+
+    {Opts,ERPid} = setup({suite,Suite}, Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(repeat_1,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config)),
+
+    TestEvents = events_to_check(repeat_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
-    
+
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
@@ -105,6 +133,127 @@ reformat(Events, EH) ->
 %%%-----------------------------------------------------------------
 %%% 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(missing_conf) ->
-    exit(must_handle_this).
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,2}},
+     {?eh,tc_start,{ct_framework,ct_init_per_group}},
+     {?eh,tc_done,{ct_framework,ct_init_per_group,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{missing_conf_SUITE,tc1}},
+     {?eh,tc_done,{missing_conf_SUITE,tc1,ok}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     {?eh,tc_start,{missing_conf_SUITE,tc2}},
+     {?eh,tc_done,{missing_conf_SUITE,tc2,ok}},
+     {?eh,test_stats,{3,0,{0,0}}},
+     {?eh,tc_start,{ct_framework,ct_end_per_group}},
+     {?eh,tc_done,{ct_framework,ct_end_per_group,ok}},
+     {?eh,test_stats,{4,0,{0,0}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(repeat_1) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     {?eh,tc_start,{repeat_1_SUITE,init_per_suite}},
+     {?eh,tc_done,{repeat_1_SUITE,init_per_suite,ok}},
+     [{?eh,tc_start,
+       {repeat_1_SUITE,{init_per_group,test_group_1,[{repeat,2}]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,{init_per_group,test_group_1,[{repeat,2}]},ok}},
+      {?eh,tc_start,{repeat_1_SUITE,testcase_1a}},
+      {?eh,tc_done,{repeat_1_SUITE,testcase_1a,ok}},
+      {?eh,test_stats,{1,0,{0,0}}},
+      {?eh,tc_start,{repeat_1_SUITE,testcase_1b}},
+      {?eh,tc_done,{repeat_1_SUITE,testcase_1b,ok}},
+      {?eh,test_stats,{2,0,{0,0}}},
+      {?eh,tc_start,
+       {repeat_1_SUITE,{end_per_group,test_group_1,[{repeat,2}]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,{end_per_group,test_group_1,[{repeat,2}]},ok}}],
+     [{?eh,tc_start,
+       {repeat_1_SUITE,{init_per_group,test_group_1,[]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,{init_per_group,test_group_1,[]},ok}},
+      {?eh,tc_start,{repeat_1_SUITE,testcase_1a}},
+      {?eh,tc_done,{repeat_1_SUITE,testcase_1a,ok}},
+      {?eh,test_stats,{3,0,{0,0}}},
+      {?eh,tc_start,{repeat_1_SUITE,testcase_1b}},
+      {?eh,tc_done,{repeat_1_SUITE,testcase_1b,ok}},
+      {?eh,test_stats,{4,0,{0,0}}},
+      {?eh,tc_start,
+       {repeat_1_SUITE,{end_per_group,test_group_1,[]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,{end_per_group,test_group_1,[]},ok}}],
+     [{?eh,tc_start,
+       {repeat_1_SUITE,{init_per_group,test_group_2,[]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,{init_per_group,test_group_2,[]},ok}},
+      {?eh,tc_start,{repeat_1_SUITE,testcase_2a}},
+      {?eh,tc_done,{repeat_1_SUITE,testcase_2a,ok}},
+      {?eh,test_stats,{5,0,{0,0}}},
+      {?eh,tc_start,{repeat_1_SUITE,testcase_2b}},
+      {?eh,tc_done,{repeat_1_SUITE,testcase_2b,ok}},
+      {?eh,test_stats,{6,0,{0,0}}},
+      {?eh,tc_start,
+       {repeat_1_SUITE,{end_per_group,test_group_2,[]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,{end_per_group,test_group_2,[]},ok}}],
+     [{?eh,tc_start,
+       {repeat_1_SUITE,
+	{init_per_group,test_group_3,[]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,
+	{init_per_group,test_group_3,[]},
+	ok}},
+      {?eh,tc_start,{repeat_1_SUITE,testcase_3a}},
+      {?eh,tc_done,{repeat_1_SUITE,testcase_3a,ok}},
+      {?eh,test_stats,{7,0,{0,0}}},
+      [{?eh,tc_start,
+        {repeat_1_SUITE,
+	 {init_per_group,test_group_4,[]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {init_per_group,test_group_4,[]},
+	 ok}},
+       {?eh,tc_start,{repeat_1_SUITE,testcase_4a}},
+       {?eh,tc_done,{repeat_1_SUITE,testcase_4a,ok}},
+       {?eh,test_stats,{8,0,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,testcase_4b}},
+       {?eh,tc_done,{repeat_1_SUITE,testcase_4b,ok}},
+       {?eh,test_stats,{9,0,{0,0}}},
+       {?eh,tc_start,
+        {repeat_1_SUITE,
+	 {end_per_group,test_group_4,[]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {end_per_group,test_group_4,[]},
+	 ok}}],
+      {?eh,tc_start,{repeat_1_SUITE,testcase_3b}},
+      {?eh,tc_done,{repeat_1_SUITE,testcase_3b,ok}},
+      {?eh,test_stats,{10,0,{0,0}}},
+      {?eh,tc_start,
+       {repeat_1_SUITE,
+	{end_per_group,test_group_3,[]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,
+	{end_per_group,test_group_3,[]},
+	ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,end_per_suite}},
+     {?eh,tc_done,{repeat_1_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE_data/cfgs/groups_2.1.cfg b/lib/common_test/test/ct_groups_test_2_SUITE_data/cfgs/groups_2.1.cfg
new file mode 100644
index 0000000000..4928505157
--- /dev/null
+++ b/lib/common_test/test/ct_groups_test_2_SUITE_data/cfgs/groups_2.1.cfg
@@ -0,0 +1 @@
+{dummy_key, "dummy_data"}.
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_1/repeat_1_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_1/repeat_1_SUITE.erl
new file mode 100644
index 0000000000..b4b9b03ca5
--- /dev/null
+++ b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_1/repeat_1_SUITE.erl
@@ -0,0 +1,105 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(repeat_1_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%====================================================================
+%% COMMON TEST CALLBACK FUNCTIONS
+%%====================================================================
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+groups() ->
+    [
+      {test_group_1, [{repeat,2}], [testcase_1a,testcase_1b]},
+      {test_group_2, [{repeat,1}], [testcase_2a,testcase_2b]},
+
+      {test_group_3, [{repeat_until_all_fail,1}],
+       [testcase_3a,
+	{test_group_4, [{repeat_until_any_fail,1}],
+	 [testcase_4a, testcase_4b]},
+	testcase_3b]}
+     ].
+
+all() ->
+    [
+     {group, test_group_1},
+     {group, test_group_2},
+     {group, test_group_3}
+    ].
+
+%%--------------------------------------------------------------------
+%% Suite Configuration
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Group Configuration
+%%--------------------------------------------------------------------
+
+init_per_group(Group, Config) ->
+    Group = proplists:get_value(name,?config(tc_group_properties,Config)),
+    ct:comment(Group),
+    Config.
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Testcase Configuration
+%%--------------------------------------------------------------------
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Testcases
+%%--------------------------------------------------------------------
+
+testcase_1a(_) ->
+    ok.
+testcase_1b(_) ->
+    ok.
+
+testcase_2a(_) ->
+    ok.
+testcase_2b(_) ->
+    ok.
+
+testcase_3a(_) ->
+    ok.
+testcase_3b(_) ->
+    ok.
+
+testcase_4a(_) ->
+    ok.
+testcase_4b(_) ->
+    ok.
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_21_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_21_SUITE.erl
new file mode 100644
index 0000000000..2533ac8e84
--- /dev/null
+++ b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_21_SUITE.erl
@@ -0,0 +1,281 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(groups_21_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%====================================================================
+%% COMMON TEST CALLBACK FUNCTIONS
+%%====================================================================
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+groups() ->
+    [
+      {test_group_1a, [testcase_1a,testcase_1b]},
+
+      {test_group_1b, [], [testcase_1a,testcase_1b]},
+
+      {test_group_2, [], [testcase_2a,
+
+			  {test_group_3, [], [testcase_3a,
+					      testcase_3b]},
+			  testcase_2b]},
+
+      {test_group_4, [{test_group_5, [], [testcase_5a,
+
+					  {group, test_group_6},
+
+					  testcase_5b]}]},
+
+      {test_group_6, [{group, test_group_7}]},
+
+      {test_group_7, [testcase_7a,testcase_7b]}
+     ].
+
+all() ->
+    [testcase_1,
+     {group, test_group_1a},
+     {group, test_group_1b},
+     testcase_2,
+     {group, test_group_2},
+     testcase_3,
+     {group, test_group_4}].
+
+%% this func only for internal test purposes
+grs_and_tcs() ->
+    {[
+      test_group_1a, test_group_1b,
+      test_group_2, test_group_3,
+      test_group_4, test_group_5,
+      test_group_6, test_group_7
+     ],
+     [
+      testcase_1,
+      testcase_1a, testcase_1b,
+      testcase_2,
+      testcase_2a, testcase_2b,
+      testcase_3a, testcase_3b,
+      testcase_3,
+      testcase_5a, testcase_5b,
+      testcase_7a, testcase_7b
+     ]}.
+
+%%--------------------------------------------------------------------
+%% Suite Configuration
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    [{suite,init}|Config].
+
+end_per_suite(Config) ->
+    init = ?config(suite,Config).
+
+%%--------------------------------------------------------------------
+%% Group Configuration
+%%--------------------------------------------------------------------
+
+init_per_group(Group, Config) ->
+    [{name,Group}] = ?config(tc_group_properties,Config),
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    ct:comment(io_lib:format("~w", [Group])),
+	    init = ?config(suite,Config),
+	    [{Group,Group} | Config];
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+end_per_group(Group, Config) ->
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    init = ?config(suite,Config),
+	    Group = ?config(Group,Config),
+	    ok;
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+%%--------------------------------------------------------------------
+%% Testcase Configuration
+%%--------------------------------------------------------------------
+
+init_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    [{TestCase,TestCase} | Config];
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+end_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    TestCase = ?config(TestCase,Config),
+	    ok;
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+
+%%--------------------------------------------------------------------
+%% Testcases
+%%--------------------------------------------------------------------
+
+testcase_1() ->
+    [].
+testcase_1(Config) ->
+    init = ?config(suite,Config),
+    testcase_1 = ?config(testcase_1,Config),
+    ok.
+
+testcase_1a() ->
+    [].
+testcase_1a(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    testcase_1a = ?config(testcase_1a,Config),
+    ok.
+testcase_1b() ->
+    [].
+testcase_1b(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    undefined = ?config(testcase_1a,Config),
+    testcase_1b = ?config(testcase_1b,Config),
+    ok.
+
+testcase_2() ->
+    [].
+testcase_2(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_1a,Config),
+    undefined = ?config(test_group_1b,Config),
+    testcase_2 = ?config(testcase_2,Config),
+    ok.
+
+testcase_2a() ->
+    [].
+testcase_2a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    testcase_2a = ?config(testcase_2a,Config),
+    ok.
+testcase_2b() ->
+    [].
+testcase_2b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    undefined = ?config(testcase_2a,Config),
+    testcase_2b = ?config(testcase_2b,Config),
+    ok.
+
+testcase_3a() ->
+    [].
+testcase_3a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_2b,Config),
+    testcase_3a = ?config(testcase_3a,Config),
+    ok.
+testcase_3b() ->
+    [].
+testcase_3b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_3a,Config),
+    testcase_3b = ?config(testcase_3b,Config),
+    ok.
+
+testcase_3() ->
+    [].
+testcase_3(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_2,Config),
+    undefined = ?config(test_group_3,Config),
+    testcase_3 = ?config(testcase_3,Config),
+    ok.
+
+testcase_5a() ->
+    [].
+testcase_5a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_3,Config),
+    testcase_5a = ?config(testcase_5a,Config),
+    ok.
+testcase_5b() ->
+    [].
+testcase_5b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_5a,Config),
+    testcase_5b = ?config(testcase_5b,Config),
+    ok.
+
+testcase_7a() ->
+    [].
+testcase_7a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    testcase_7a = ?config(testcase_7a,Config),
+    ok.
+testcase_7b() ->
+    [].
+testcase_7b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    undefined = ?config(testcase_7a,Config),
+    testcase_7b = ?config(testcase_7b,Config),
+    ok.
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl
new file mode 100644
index 0000000000..cd517876df
--- /dev/null
+++ b/lib/common_test/test/ct_groups_test_2_SUITE_data/groups_2/groups_22_SUITE.erl
@@ -0,0 +1,314 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(groups_22_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%====================================================================
+%% COMMON TEST CALLBACK FUNCTIONS
+%%====================================================================
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+groups() ->
+    [
+      {test_group_1a, [shuffle], [testcase_1a,testcase_1b,testcase_1c]},
+
+      {test_group_1b, [parallel], [testcase_1a,testcase_1b]},
+
+      {test_group_2, [parallel], [testcase_2a,
+
+				  {test_group_3, [{repeat,1}],
+				   [testcase_3a, testcase_3b]},
+
+				  testcase_2b]},
+
+      {test_group_4, [{test_group_5, [parallel], [testcase_5a,
+
+						  {group, test_group_6},
+
+						  testcase_5b]}]},
+
+      {test_group_6, [parallel], [{group, test_group_7}]},
+
+      {test_group_7, [sequence], [testcase_7a,testcase_7b]}
+     ].
+
+all() ->
+    [{group, test_group_1a},
+     {group, test_group_1b},
+     testcase_1,
+     testcase_2,
+     {group, test_group_2},
+     testcase_3,
+     {group, test_group_4}].
+
+%% this func only for internal test purposes
+grs_and_tcs() ->
+    {[
+      test_group_1a, test_group_1b,
+      test_group_2, test_group_3,
+      test_group_4, test_group_5,
+      test_group_6, test_group_7
+     ],
+     [
+      testcase_1a, testcase_1b, testcase_1c,
+      testcase_1,
+      testcase_2,
+      testcase_2a, testcase_2b,
+      testcase_3a, testcase_3b,
+      testcase_3,
+      testcase_5a, testcase_5b,
+      testcase_7a, testcase_7b
+     ]}.
+
+%%--------------------------------------------------------------------
+%% Suite Configuration
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    [{suite,init}|Config].
+
+end_per_suite(Config) ->
+    init = ?config(suite,Config).
+
+%%--------------------------------------------------------------------
+%% Group Configuration
+%%--------------------------------------------------------------------
+
+init_per_group(Group, Config) ->
+    Cmt =
+	case {Group,?config(tc_group_properties,Config)} of
+	    {test_group_1a,[{shuffle,S},{name,test_group_1a}]} ->
+		io_lib:format("shuffled, ~w", [S]);
+	    {test_group_1b,[{name,test_group_1b},parallel]} -> "parallel";
+	    {test_group_2,[{name,test_group_2},parallel]} -> "parallel";
+	    {test_group_3,[{name,test_group_3},{repeat,1}]} -> "repeat 1";
+	    {test_group_3,[{name,test_group_3}]} -> "repeat 0";
+	    {test_group_4,[{name,test_group_4}]} -> ok;
+	    {test_group_5,[{name,test_group_5},parallel]} -> "parallel";
+	    {test_group_6,[{name,test_group_6},parallel]} -> "parallel";
+	    {test_group_7,[{name,test_group_7},sequence]} -> "sequence"
+	end,
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    init = ?config(suite,Config),
+	    ct:comment(io_lib:format("~w, ~s", [Group,Cmt])),
+	    [{Group,Group} | Config];
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+end_per_group(Group, Config) ->
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    init = ?config(suite,Config),
+	    Group = ?config(Group,Config),
+	    ok;
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+%%--------------------------------------------------------------------
+%% Testcase Configuration
+%%--------------------------------------------------------------------
+
+init_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    [{TestCase,TestCase} | Config];
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+end_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    TestCase = ?config(TestCase,Config),
+	    ok;
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+
+%%--------------------------------------------------------------------
+%% Testcases
+%%--------------------------------------------------------------------
+
+testcase_1a() ->
+    [].
+testcase_1a(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    testcase_1a = ?config(testcase_1a,Config),
+    ok.
+testcase_1b() ->
+    [].
+testcase_1b(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    undefined = ?config(testcase_1a,Config),
+    testcase_1b = ?config(testcase_1b,Config),
+    ok.
+
+testcase_1c() ->
+    [].
+testcase_1c(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    undefined = ?config(testcase_1b,Config),
+    testcase_1c = ?config(testcase_1c,Config),
+    ok.
+
+testcase_1() ->
+    [].
+testcase_1(Config) ->
+    init = ?config(suite,Config),
+    testcase_1 = ?config(testcase_1,Config),
+    ok.
+
+testcase_2() ->
+    [].
+testcase_2(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_1a,Config),
+    undefined = ?config(test_group_1b,Config),
+    testcase_2 = ?config(testcase_2,Config),
+    ok.
+
+testcase_2a() ->
+    [].
+testcase_2a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    testcase_2a = ?config(testcase_2a,Config),
+    ok.
+testcase_2b() ->
+    [].
+testcase_2b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    undefined = ?config(testcase_2a,Config),
+    testcase_2b = ?config(testcase_2b,Config),
+    ok.
+
+testcase_3a() ->
+    [].
+testcase_3a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_2b,Config),
+    testcase_3a = ?config(testcase_3a,Config),
+    ok.
+testcase_3b() ->
+    [].
+testcase_3b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_3a,Config),
+    testcase_3b = ?config(testcase_3b,Config),
+    ok.
+
+testcase_3() ->
+    [].
+testcase_3(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_2,Config),
+    undefined = ?config(test_group_3,Config),
+    testcase_3 = ?config(testcase_3,Config),
+    ok.
+
+testcase_5a() ->
+    [].
+testcase_5a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_3,Config),
+    testcase_5a = ?config(testcase_5a,Config),
+    %% increase chance the done event will come
+    %% during execution of subgroup (could be
+    %% tricky to handle)
+    timer:sleep(3),
+    ok.
+testcase_5b() ->
+    [].
+testcase_5b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_5a,Config),
+    testcase_5b = ?config(testcase_5b,Config),
+    ok.
+
+testcase_7a() ->
+    [].
+testcase_7a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    testcase_7a = ?config(testcase_7a,Config),
+    ok.
+testcase_7b() ->
+    [].
+testcase_7b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    undefined = ?config(testcase_7a,Config),
+    testcase_7b = ?config(testcase_7b,Config),
+    ok.
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
new file mode 100644
index 0000000000..1e187aa205
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -0,0 +1,1021 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_error_SUITE
+%%%
+%%% Description: 
+%%% Test various errors in Common Test suites.
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_hooks_SUITE).
+
+-compile(export_all).
+
+-include_lib("test_server/include/test_server.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),
+    TestDir = filename:join(DataDir,"cth/tests/"),
+    CTHs = filelib:wildcard(filename:join(TestDir,"*_cth.erl")),
+    io:format("CTHs: ~p",[CTHs]),
+    [io:format("Compiling ~p: ~p",
+	    [FileName,compile:file(FileName,[{outdir,TestDir},debug_info])]) ||
+	FileName <- CTHs],
+    ct_test_support:init_per_suite([{path_dirs,[TestDir]} | 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,{seconds,20}}].
+
+all() ->
+    all(suite).
+
+all(suite) -> 
+    lists:reverse(
+      [
+       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_per_suite_state_cth, scope_per_group_state_cth, 
+       scope_suite_state_cth,
+       fail_pre_suite_cth, fail_post_suite_cth, skip_pre_suite_cth,
+       skip_post_suite_cth, recover_post_suite_cth, update_config_cth,
+       state_update_cth, options_cth, same_id_cth, 
+       fail_n_skip_with_minimal_cth
+      ]
+    )
+	.
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%% 
+one_cth(Config) when is_list(Config) -> 
+    do_test(one_empty_cth, "ct_cth_empty_SUITE.erl",[empty_cth], Config).
+
+two_cth(Config) when is_list(Config) -> 
+    do_test(two_empty_cth, "ct_cth_empty_SUITE.erl",[empty_cth,empty_cth],
+	    Config).
+
+faulty_cth_no_init(Config) when is_list(Config) ->
+    do_test(faulty_cth_no_init, "ct_cth_empty_SUITE.erl",[askjhdkljashdkaj],
+	    Config,{error,"Failed to start CTH, see the "
+		   "CT Log for details"}).
+
+faulty_cth_id_no_init(Config) when is_list(Config) ->
+    do_test(faulty_cth_id_no_init, "ct_cth_empty_SUITE.erl",[id_no_init_cth],
+	    Config,{error,"Failed to start CTH, see the "
+		   "CT Log for details"}).
+
+minimal_cth(Config) when is_list(Config) ->
+    do_test(minimal_cth, "ct_cth_empty_SUITE.erl",[minimal_cth],Config).
+
+minimal_and_maximal_cth(Config) when is_list(Config) ->
+    do_test(minimal_and_maximal_cth, "ct_cth_empty_SUITE.erl",
+	    [minimal_cth, empty_cth],Config).
+    
+faulty_cth_undef(Config) when is_list(Config) ->
+    do_test(faulty_cth_undef, "ct_cth_empty_SUITE.erl",
+	    [undef_cth],Config).
+
+faulty_cth_exit_in_init_scope_suite(Config) when is_list(Config) ->
+    do_test(faulty_cth_exit_in_init_scope_suite, 
+	    "ct_exit_in_init_scope_suite_cth_SUITE.erl",
+	    [],Config).
+
+faulty_cth_exit_in_init(Config) when is_list(Config) ->
+    do_test(faulty_cth_exit_in_init, "ct_cth_empty_SUITE.erl",
+	    [crash_init_cth], Config,
+	    {error,"Failed to start CTH, see the "
+	     "CT Log for details"}).
+
+faulty_cth_exit_in_id(Config) when is_list(Config) ->
+    do_test(faulty_cth_exit_in_id, "ct_cth_empty_SUITE.erl",
+	    [crash_id_cth], Config,
+	    {error,"Failed to start CTH, see the "
+	     "CT Log for details"}).
+
+scope_per_suite_cth(Config) when is_list(Config) ->
+    do_test(scope_per_suite_cth, "ct_scope_per_suite_cth_SUITE.erl",
+	    [],Config).
+
+scope_suite_cth(Config) when is_list(Config) ->
+    do_test(scope_suite_cth, "ct_scope_suite_cth_SUITE.erl",
+	    [],Config).
+
+scope_per_group_cth(Config) when is_list(Config) ->
+    do_test(scope_per_group_cth, "ct_scope_per_group_cth_SUITE.erl",
+	    [],Config).
+
+scope_per_suite_state_cth(Config) when is_list(Config) ->
+    do_test(scope_per_suite_state_cth, "ct_scope_per_suite_state_cth_SUITE.erl",
+	    [],Config).
+
+scope_suite_state_cth(Config) when is_list(Config) ->
+    do_test(scope_suite_state_cth, "ct_scope_suite_state_cth_SUITE.erl",
+	    [],Config).
+
+scope_per_group_state_cth(Config) when is_list(Config) ->
+    do_test(scope_per_group_state_cth, "ct_scope_per_group_state_cth_SUITE.erl",
+	    [],Config).
+
+fail_pre_suite_cth(Config) when is_list(Config) ->
+    do_test(fail_pre_suite_cth, "ct_cth_empty_SUITE.erl",
+	    [fail_pre_suite_cth],Config).
+
+fail_post_suite_cth(Config) when is_list(Config) ->
+    do_test(fail_post_suite_cth, "ct_cth_empty_SUITE.erl",
+	    [fail_post_suite_cth],Config).
+
+skip_pre_suite_cth(Config) when is_list(Config) ->
+    do_test(skip_pre_suite_cth, "ct_cth_empty_SUITE.erl",
+	    [skip_pre_suite_cth],Config).
+
+skip_post_suite_cth(Config) when is_list(Config) ->
+    do_test(skip_post_suite_cth, "ct_cth_empty_SUITE.erl",
+	    [skip_post_suite_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).
+
+update_config_cth(Config) when is_list(Config) ->
+    do_test(update_config_cth, "ct_update_config_SUITE.erl",
+	    [update_config_cth],Config).
+
+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).
+
+options_cth(Config) when is_list(Config) ->
+    do_test(options_cth, "ct_cth_empty_SUITE.erl",
+	    [{empty_cth,[test]}],Config).
+    
+same_id_cth(Config) when is_list(Config) ->
+    do_test(same_id_cth, "ct_cth_empty_SUITE.erl",
+	    [same_id_cth,same_id_cth],Config).
+
+fail_n_skip_with_minimal_cth(Config) when is_list(Config) ->
+    do_test(fail_n_skip_with_minimal_cth, "ct_cth_fail_one_skip_one_SUITE.erl",
+	    [minimal_terminate_cth],Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+do_test(Tag, SWC, CTHs, Config) ->
+    do_test(Tag, SWC, CTHs, Config, ok).
+do_test(Tag, SWC, CTHs, Config, {error,_} = Res) ->
+    do_test(Tag, SWC, CTHs, Config, Res, 1);
+do_test(Tag, SWC, CTHs, Config, Res) ->
+    do_test(Tag, SWC, CTHs, Config, Res, 2).
+
+do_test(Tag, SuiteWildCard, CTHs, Config, Res, EC) ->
+    
+    DataDir = ?config(data_dir, Config),
+    Suites = filelib:wildcard(
+	       filename:join([DataDir,"cth/tests",SuiteWildCard])),
+    {Opts,ERPid} = setup([{suite,Suites},
+			  {ct_hooks,CTHs},{label,Tag}], Config),
+    Res = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Tag, 
+			       reformat(Events, ?eh), 
+			       ?config(priv_dir, Config)),
+
+    TestEvents = events_to_check(Tag, EC),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+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).
+%reformat(Events, _EH) ->
+%    Events.
+
+%%%-----------------------------------------------------------------
+%%% 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(one_empty_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?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,[test_case,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_end_per_testcase,[test_case,'$proplist','_',[]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,test_case,ok}},
+     
+     {?eh,tc_start,{ct_cth_empty_SUITE,end_per_suite}},
+     {?eh,cth,{empty_cth,pre_end_per_suite,
+	       [ct_cth_empty_SUITE,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_end_per_suite,[ct_cth_empty_SUITE,'$proplist','_',[]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(two_empty_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{'_',id,[[]]}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,cth,{'_',id,[[]]}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
+     {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',post_init_per_suite,[ct_cth_empty_SUITE,'$proplist','$proplist',[]]}},
+     {?eh,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,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,cth,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[]]}},
+     {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,test_case,ok}},
+     
+     {?eh,tc_start,{ct_cth_empty_SUITE,end_per_suite}},
+     {?eh,cth,{'_',pre_end_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',pre_end_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',post_end_per_suite,[ct_cth_empty_SUITE,'$proplist','_',[]]}},
+     {?eh,cth,{'_',post_end_per_suite,[ct_cth_empty_SUITE,'$proplist','_',[]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{'_',terminate,[[]]}},
+     {?eh,cth,{'_',terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(faulty_cth_no_init) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(faulty_cth_id_no_init) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{'_',id,[[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {negative,{?eh,tc_start,'_'},
+      {?eh,test_done,{'DEF','STOP_TIME'}}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(minimal_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {negative,{?eh,cth,{'_',id,['_',[]]}},
+      {?eh,cth,{'_',init,['_',[]]}}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,init_per_suite,ok}},
+
+     {?eh,tc_start,{ct_cth_empty_SUITE,test_case}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,test_case,ok}},
+     
+     {?eh,tc_start,{ct_cth_empty_SUITE,end_per_suite}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(minimal_and_maximal_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {negative,{?eh,cth,{'_',id,['_',[]]}},
+      {?eh,cth,{'_',init,['_',[]]}}},
+     {?eh,cth,{'_',id,[[]]}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
+     {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {?eh,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,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,test_case,ok}},
+     
+     {?eh,tc_start,{ct_cth_empty_SUITE,end_per_suite}},
+     {?eh,cth,{'_',pre_end_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',post_end_per_suite,[ct_cth_empty_SUITE,'$proplist','_',[]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{'_',terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(faulty_cth_undef) ->
+    FailReasonStr = "undef_cth:pre_init_per_suite/3 CTH call failed",
+    FailReason = {ct_cth_empty_SUITE,init_per_suite,
+		  {failed,FailReasonStr}},
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,init_per_suite,
+		  {failed, {error,FailReasonStr}}}},
+     {?eh,cth,{'_',on_tc_fail,'_'}},
+
+     {?eh,tc_auto_skip,{ct_cth_empty_SUITE,test_case,
+			{failed, FailReason}}},
+     {?eh,cth,{'_',on_tc_skip,'_'}},
+     
+     {?eh,tc_auto_skip,{ct_cth_empty_SUITE,end_per_suite,
+			{failed, FailReason}}},
+     {?eh,cth,{'_',on_tc_skip,'_'}},
+     
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(faulty_cth_exit_in_init_scope_suite) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',init_per_suite}},
+     {?eh,cth,{empty_cth,init,['_',[]]}},
+     {?eh,tc_done,
+      {ct_exit_in_init_scope_suite_cth_SUITE,init_per_suite,
+       {failed,
+	{error,
+	 "Failed to start CTH, see the CT Log for details"}}}},
+     {?eh,tc_auto_skip,
+      {ct_exit_in_init_scope_suite_cth_SUITE,test_case,
+       {failed,
+	{ct_exit_in_init_scope_suite_cth_SUITE,init_per_suite,
+	 {failed,
+	  "Failed to start CTH, see the CT Log for details"}}}}},
+     {?eh,tc_auto_skip,
+      {ct_exit_in_init_scope_suite_cth_SUITE,end_per_suite,
+       {failed,
+	{ct_exit_in_init_scope_suite_cth_SUITE,init_per_suite,
+	 {failed,
+	  "Failed to start CTH, see the CT Log for details"}}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(faulty_cth_exit_in_init) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{empty_cth,init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(faulty_cth_exit_in_id) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {negative, {?eh,tc_start,'_'},
+      {?eh,test_done,{'DEF','STOP_TIME'}}},
+     {?eh,stop_logging,[]}];
+
+test_events(scope_per_suite_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_scope_per_suite_cth_SUITE,init_per_suite}},
+     {?eh,cth,{'_',id,[[]]}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,cth,{'_',post_init_per_suite,[ct_scope_per_suite_cth_SUITE,'$proplist','$proplist',[]]}},
+     {?eh,tc_done,{ct_scope_per_suite_cth_SUITE,init_per_suite,ok}},
+
+     {?eh,tc_start,{ct_scope_per_suite_cth_SUITE,test_case}},
+     {?eh,cth,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[]]}},
+     {?eh,tc_done,{ct_scope_per_suite_cth_SUITE,test_case,ok}},
+     
+     {?eh,tc_start,{ct_scope_per_suite_cth_SUITE,end_per_suite}},
+     {?eh,cth,{'_',pre_end_per_suite,
+	       [ct_scope_per_suite_cth_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',post_end_per_suite,[ct_scope_per_suite_cth_SUITE,'$proplist','_',[]]}},
+     {?eh,cth,{'_',terminate,[[]]}},
+     {?eh,tc_done,{ct_scope_per_suite_cth_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+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}},
+     {?eh,cth,{'_',id,[[]]}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,cth,{'_',pre_init_per_suite,[ct_scope_suite_cth_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',post_init_per_suite,[ct_scope_suite_cth_SUITE,'$proplist','$proplist',[]]}},
+     {?eh,tc_done,{ct_scope_suite_cth_SUITE,init_per_suite,ok}},
+
+     {?eh,tc_start,{ct_scope_suite_cth_SUITE,test_case}},
+     {?eh,cth,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[]]}},
+     {?eh,tc_done,{ct_scope_suite_cth_SUITE,test_case,ok}},
+     
+     {?eh,tc_start,{ct_scope_suite_cth_SUITE,end_per_suite}},
+     {?eh,cth,{'_',pre_end_per_suite,[ct_scope_suite_cth_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',post_end_per_suite,[ct_scope_suite_cth_SUITE,'$proplist','_',[]]}},
+     {?eh,cth,{'_',terminate,[[]]}},
+     {?eh,tc_done,{ct_scope_suite_cth_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'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_scope_per_group_cth_SUITE,init_per_suite}},
+     {?eh,tc_done,{ct_scope_per_group_cth_SUITE,init_per_suite,ok}},
+
+     [{?eh,tc_start,{ct_scope_per_group_cth_SUITE,{init_per_group,group1,[]}}},
+      {?eh,cth,{'_',id,[[]]}},
+      {?eh,cth,{'_',init,['_',[]]}},
+      {?eh,cth,{'_',post_init_per_group,[group1,'$proplist','$proplist',[]]}},
+      {?eh,tc_done,{ct_scope_per_group_cth_SUITE,{init_per_group,group1,[]},ok}},
+      
+      {?eh,tc_start,{ct_scope_per_group_cth_SUITE,test_case}},
+      {?eh,cth,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+      {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[]]}},
+      {?eh,tc_done,{ct_scope_per_group_cth_SUITE,test_case,ok}},
+      
+      {?eh,tc_start,{ct_scope_per_group_cth_SUITE,{end_per_group,group1,[]}}},
+      {?eh,cth,{'_',pre_end_per_group,[group1,'$proplist',[]]}},
+      {?eh,cth,{'_',post_end_per_group,[group1,'$proplist','_',[]]}},
+      {?eh,cth,{'_',terminate,[[]]}},
+      {?eh,tc_done,{ct_scope_per_group_cth_SUITE,{end_per_group,group1,[]},ok}}],
+     
+     {?eh,tc_start,{ct_scope_per_group_cth_SUITE,end_per_suite}},
+     {?eh,tc_done,{ct_scope_per_group_cth_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(scope_per_suite_state_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_scope_per_suite_state_cth_SUITE,init_per_suite}},
+     {?eh,cth,{'_',id,[[test]]}},
+     {?eh,cth,{'_',init,['_',[test]]}},
+     {?eh,cth,{'_',post_init_per_suite,[ct_scope_per_suite_state_cth_SUITE,'$proplist','$proplist',[test]]}},
+     {?eh,tc_done,{ct_scope_per_suite_state_cth_SUITE,init_per_suite,ok}},
+
+     {?eh,tc_start,{ct_scope_per_suite_state_cth_SUITE,test_case}},
+     {?eh,cth,{'_',pre_init_per_testcase,[test_case,'$proplist',[test]]}},
+     {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[test]]}},
+     {?eh,tc_done,{ct_scope_per_suite_state_cth_SUITE,test_case,ok}},
+     
+     {?eh,tc_start,{ct_scope_per_suite_state_cth_SUITE,end_per_suite}},
+     {?eh,cth,{'_',pre_end_per_suite,
+	       [ct_scope_per_suite_state_cth_SUITE,'$proplist',[test]]}},
+     {?eh,cth,{'_',post_end_per_suite,[ct_scope_per_suite_state_cth_SUITE,'$proplist','_',[test]]}},
+     {?eh,cth,{'_',terminate,[[test]]}},
+     {?eh,tc_done,{ct_scope_per_suite_state_cth_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(scope_suite_state_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_scope_suite_state_cth_SUITE,init_per_suite}},
+     {?eh,cth,{'_',id,[[test]]}},
+     {?eh,cth,{'_',init,['_',[test]]}},
+     {?eh,cth,{'_',pre_init_per_suite,[ct_scope_suite_state_cth_SUITE,'$proplist',[test]]}},
+     {?eh,cth,{'_',post_init_per_suite,[ct_scope_suite_state_cth_SUITE,'$proplist','$proplist',[test]]}},
+     {?eh,tc_done,{ct_scope_suite_state_cth_SUITE,init_per_suite,ok}},
+
+     {?eh,tc_start,{ct_scope_suite_state_cth_SUITE,test_case}},
+     {?eh,cth,{'_',pre_init_per_testcase,[test_case,'$proplist',[test]]}},
+     {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[test]]}},
+     {?eh,tc_done,{ct_scope_suite_state_cth_SUITE,test_case,ok}},
+     
+     {?eh,tc_start,{ct_scope_suite_state_cth_SUITE,end_per_suite}},
+     {?eh,cth,{'_',pre_end_per_suite,[ct_scope_suite_state_cth_SUITE,'$proplist',[test]]}},
+     {?eh,cth,{'_',post_end_per_suite,[ct_scope_suite_state_cth_SUITE,'$proplist','_',[test]]}},
+     {?eh,cth,{'_',terminate,[[test]]}},
+     {?eh,tc_done,{ct_scope_suite_state_cth_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(scope_per_group_state_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_scope_per_group_state_cth_SUITE,init_per_suite}},
+     {?eh,tc_done,{ct_scope_per_group_state_cth_SUITE,init_per_suite,ok}},
+
+     [{?eh,tc_start,{ct_scope_per_group_state_cth_SUITE,{init_per_group,group1,[]}}},
+      {?eh,cth,{'_',id,[[test]]}},
+      {?eh,cth,{'_',init,['_',[test]]}},
+      {?eh,cth,{'_',post_init_per_group,[group1,'$proplist','$proplist',[test]]}},
+      {?eh,tc_done,{ct_scope_per_group_state_cth_SUITE,{init_per_group,group1,[]},ok}},
+      
+      {?eh,tc_start,{ct_scope_per_group_state_cth_SUITE,test_case}},
+      {?eh,cth,{'_',pre_init_per_testcase,[test_case,'$proplist',[test]]}},
+      {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[test]]}},
+      {?eh,tc_done,{ct_scope_per_group_state_cth_SUITE,test_case,ok}},
+      
+      {?eh,tc_start,{ct_scope_per_group_state_cth_SUITE,{end_per_group,group1,[]}}},
+      {?eh,cth,{'_',pre_end_per_group,[group1,'$proplist',[test]]}},
+      {?eh,cth,{'_',post_end_per_group,[group1,'$proplist','_',[test]]}},
+      {?eh,cth,{'_',terminate,[[test]]}},
+      {?eh,tc_done,{ct_scope_per_group_state_cth_SUITE,{end_per_group,group1,[]},ok}}],
+     
+     {?eh,tc_start,{ct_scope_per_group_state_cth_SUITE,end_per_suite}},
+     {?eh,tc_done,{ct_scope_per_group_state_cth_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(fail_pre_suite_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+
+     
+     {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
+     {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',post_init_per_suite,[ct_cth_empty_SUITE,'$proplist',
+					{fail,"Test failure"},[]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,init_per_suite,
+                   {failed, {error,"Test failure"}}}},
+     {?eh,cth,{'_',on_tc_fail,
+	       [init_per_suite,{failed,"Test failure"},[]]}},
+
+     
+     {?eh,tc_auto_skip,{ct_cth_empty_SUITE,test_case,
+                        {failed,{ct_cth_empty_SUITE,init_per_suite,
+				 {failed,"Test failure"}}}}},
+     {?eh,cth,{'_',on_tc_skip,
+	       [test_case, {tc_auto_skip,
+			    {failed, {ct_cth_empty_SUITE, init_per_suite,
+				     {failed, "Test failure"}}}},[]]}},
+
+     
+     {?eh,tc_auto_skip, {ct_cth_empty_SUITE, end_per_suite,
+                         {failed, {ct_cth_empty_SUITE, init_per_suite,
+				   {failed, "Test failure"}}}}},
+     {?eh,cth,{'_',on_tc_skip,
+	       [end_per_suite, {tc_auto_skip,
+				{failed, {ct_cth_empty_SUITE, init_per_suite,
+					  {failed, "Test failure"}}}},[]]}},
+
+     
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth, {'_',terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(fail_post_suite_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
+     {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',post_init_per_suite,[ct_cth_empty_SUITE,'$proplist','$proplist',[]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,init_per_suite,
+		   {failed,{error,"Test failure"}}}},
+     {?eh,cth,{'_',on_tc_fail,[init_per_suite, {failed,"Test failure"}, []]}},
+
+     {?eh,tc_auto_skip,{ct_cth_empty_SUITE,test_case,
+                        {failed,{ct_cth_empty_SUITE,init_per_suite,
+				 {failed,"Test failure"}}}}},
+     {?eh,cth,{'_',on_tc_skip,[test_case,{tc_auto_skip,'_'},[]]}},
+     
+     {?eh,tc_auto_skip, {ct_cth_empty_SUITE, end_per_suite,
+                         {failed, {ct_cth_empty_SUITE, init_per_suite,
+				   {failed, "Test failure"}}}}},
+     {?eh,cth,{'_',on_tc_skip,[end_per_suite,{tc_auto_skip,'_'},[]]}},
+
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth, {'_',terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(skip_pre_suite_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
+     {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',post_init_per_suite,[ct_cth_empty_SUITE,'$proplist',{skip,"Test skip"},[]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,init_per_suite,{skipped,"Test skip"}}},
+     {?eh,cth,{'_',on_tc_skip,
+	       [init_per_suite,{tc_user_skip,{skipped,"Test skip"}},[]]}},
+
+     {?eh,tc_auto_skip,{ct_cth_empty_SUITE,test_case,"Test skip"}},
+     {?eh,cth,{'_',on_tc_skip,[test_case,{tc_auto_skip,"Test skip"},[]]}},
+     
+     {?eh,tc_auto_skip, {ct_cth_empty_SUITE, end_per_suite,"Test skip"}},
+     {?eh,cth,{'_',on_tc_skip,[end_per_suite,{tc_auto_skip,"Test skip"},[]]}},
+
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth, {'_',terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(skip_post_suite_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     
+     {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
+     {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {?eh,cth,{'_',post_init_per_suite,[ct_cth_empty_SUITE,'$proplist','$proplist',[]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,init_per_suite,{skipped,"Test skip"}}},
+     {?eh,cth,{'_',on_tc_skip,
+	       [init_per_suite,{tc_user_skip,{skipped,"Test skip"}},[]]}},
+
+     {?eh,tc_auto_skip,{ct_cth_empty_SUITE,test_case,"Test skip"}},
+     {?eh,cth,{'_',on_tc_skip,[test_case,{tc_auto_skip,"Test skip"},[]]}},
+     
+     {?eh,tc_auto_skip, {ct_cth_empty_SUITE, end_per_suite,"Test skip"}},
+     {?eh,cth,{'_',on_tc_skip,[end_per_suite,{tc_auto_skip,"Test skip"},[]]}},
+     
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{'_',terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(recover_post_suite_cth) ->
+    Suite = ct_cth_fail_per_suite_SUITE,
+    [
+     {?eh,start_logging,'_'},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{Suite,init_per_suite}},
+     {?eh,cth,{'_',pre_init_per_suite,[Suite,'$proplist','$proplist']}},
+     {?eh,cth,{'_',post_init_per_suite,[Suite,contains([tc_status]),
+					{'EXIT',{'_','_'}},[]]}},
+     {?eh,tc_done,{Suite,init_per_suite,ok}},
+
+     {?eh,tc_start,{Suite,test_case}},
+     {?eh,cth,{'_',pre_init_per_testcase,
+	       [test_case, not_contains([tc_status]),[]]}},
+     {?eh,cth,{'_',post_end_per_testcase,
+	       [test_case, contains([tc_status]),'_',[]]}},
+     {?eh,tc_done,{Suite,test_case,ok}},
+     
+     {?eh,tc_start,{Suite,end_per_suite}},
+     {?eh,cth,{'_',pre_end_per_suite,
+	       [Suite,not_contains([tc_status]),[]]}},
+     {?eh,cth,{'_',post_end_per_suite,
+	       [Suite,not_contains([tc_status]),'_',[]]}},
+     {?eh,tc_done,{Suite,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{'_',terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(update_config_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     
+     {?eh,tc_start,{ct_update_config_SUITE,init_per_suite}},
+     {?eh,cth,{'_',pre_init_per_suite,
+	       [ct_update_config_SUITE,contains([]),[]]}},
+     {?eh,cth,{'_',post_init_per_suite,
+	       [ct_update_config_SUITE,
+		'$proplist',
+		contains(
+			  [init_per_suite,
+			   pre_init_per_suite]),
+		[]]}},
+     {?eh,tc_done,{ct_update_config_SUITE,init_per_suite,ok}},
+
+     {?eh,tc_start,{ct_update_config_SUITE, {init_per_group,group1,[]}}},
+     {?eh,cth,{'_',pre_init_per_group,
+	       [group1,contains(
+			 [post_init_per_suite,
+			  init_per_suite,
+			  pre_init_per_suite]),
+		[]]}},
+     {?eh,cth,{'_',post_init_per_group,
+	       [group1,
+		contains(
+		  [post_init_per_suite,
+		   init_per_suite,
+		   pre_init_per_suite]),
+		contains(
+		  [init_per_group,
+		   pre_init_per_group,
+		   post_init_per_suite,
+		   init_per_suite,
+		   pre_init_per_suite]),
+	       []]}},
+     {?eh,tc_done,{ct_update_config_SUITE,{init_per_group,group1,[]},ok}},
+
+     {?eh,tc_start,{ct_update_config_SUITE,test_case}},
+     {?eh,cth,{'_',pre_init_per_testcase,
+	       [test_case,contains(
+			    [post_init_per_group,
+			     init_per_group,
+			     pre_init_per_group,
+			     post_init_per_suite,
+			     init_per_suite,
+			     pre_init_per_suite]),
+		[]]}},
+     {?eh,cth,{'_',post_end_per_testcase,
+	       [test_case,contains(
+			    [init_per_testcase,
+			     pre_init_per_testcase,
+			     post_init_per_group,
+			     init_per_group,
+			     pre_init_per_group,
+			     post_init_per_suite,
+			     init_per_suite,
+			     pre_init_per_suite]),
+		ok,[]]}},
+     {?eh,tc_done,{ct_update_config_SUITE,test_case,ok}},
+
+     {?eh,tc_start,{ct_update_config_SUITE, {end_per_group,group1,[]}}},
+     {?eh,cth,{'_',pre_end_per_group,
+	       [group1,contains(
+			 [post_init_per_group,
+			  init_per_group,
+			  pre_init_per_group,
+			  post_init_per_suite,
+			  init_per_suite,
+			  pre_init_per_suite]),
+		[]]}},
+     {?eh,cth,{'_',post_end_per_group,
+	       [group1,
+		contains(
+		  [pre_end_per_group,
+		   post_init_per_group,
+		   init_per_group,
+		   pre_init_per_group,
+		   post_init_per_suite,
+		   init_per_suite,
+		   pre_init_per_suite]),
+	       ok,[]]}},
+     {?eh,tc_done,{ct_update_config_SUITE,{end_per_group,group1,[]},ok}},
+     
+     {?eh,tc_start,{ct_update_config_SUITE,end_per_suite}},
+     {?eh,cth,{'_',pre_end_per_suite,
+	       [ct_update_config_SUITE,contains(
+					 [post_init_per_suite,
+					  init_per_suite,
+					  pre_init_per_suite]),
+		[]]}},
+     {?eh,cth,{'_',post_end_per_suite,
+	       [ct_update_config_SUITE,contains(
+					 [pre_end_per_suite,
+					  post_init_per_suite,
+					  init_per_suite,
+					  pre_init_per_suite]),
+	       '_',[]]}},
+     {?eh,tc_done,{ct_update_config_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{'_',terminate,[contains(
+				[post_end_per_suite,
+				 pre_end_per_suite,
+				 post_init_per_suite,
+				 init_per_suite,
+				 pre_init_per_suite])]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(state_update_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',init_per_suite}},
+     
+     {?eh,tc_done,{'_',end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{'_',terminate,[contains(
+				[post_end_per_suite,pre_end_per_suite,
+				 post_end_per_group,pre_end_per_group,
+				 {not_in_order,
+				  [post_end_per_testcase,pre_init_per_testcase,
+				   on_tc_skip,post_end_per_testcase,
+				   pre_init_per_testcase,on_tc_fail,
+				   post_end_per_testcase,pre_init_per_testcase]
+				 },
+				 post_init_per_group,pre_init_per_group,
+				 post_init_per_suite,pre_init_per_suite,
+				 init])]}},
+     {?eh,cth,{'_',terminate,[contains(
+				[post_end_per_suite,pre_end_per_suite,
+				 post_end_per_group,pre_end_per_group,
+				 {not_in_order,
+				  [post_end_per_testcase,pre_init_per_testcase,
+				   on_tc_skip,post_end_per_testcase,
+				   pre_init_per_testcase,on_tc_fail,
+				   post_end_per_testcase,pre_init_per_testcase]
+				 },
+				 post_init_per_group,pre_init_per_group,
+				 post_init_per_suite,pre_init_per_suite,
+				 init]
+			       )]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(options_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{empty_cth,init,['_',[test]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
+     {?eh,cth,{empty_cth,pre_init_per_suite,
+	       [ct_cth_empty_SUITE,'$proplist',[test]]}},
+     {?eh,cth,{empty_cth,post_init_per_suite,
+	       [ct_cth_empty_SUITE,'$proplist','$proplist',[test]]}},
+     {?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,[test_case,'$proplist',[test]]}},
+     {?eh,cth,{empty_cth,post_end_per_testcase,[test_case,'$proplist','_',[test]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,test_case,ok}},
+     
+     {?eh,tc_start,{ct_cth_empty_SUITE,end_per_suite}},
+     {?eh,cth,{empty_cth,pre_end_per_suite,
+	       [ct_cth_empty_SUITE,'$proplist',[test]]}},
+     {?eh,cth,{empty_cth,post_end_per_suite,[ct_cth_empty_SUITE,'$proplist','_',[test]]}},
+     {?eh,tc_done,{ct_cth_empty_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[test]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(same_id_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{'_',id,[[]]}},
+     {?eh,cth,{'_',init,[same_id_cth,[]]}},
+     {?eh,cth,{'_',id,[[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
+     {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {negative,
+       {?eh,cth,{'_',pre_init_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+      {?eh,cth,{'_',post_init_per_suite,
+		[ct_cth_empty_SUITE,'$proplist','$proplist',[]]}}},
+     {negative,
+      {?eh,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,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {negative,
+      {?eh,cth,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+      {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[]]}}},
+     {negative,
+      {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[]]}},
+      {?eh,tc_done,{ct_cth_empty_SUITE,test_case,ok}}},
+     
+     {?eh,tc_start,{ct_cth_empty_SUITE,end_per_suite}},
+     {?eh,cth,{'_',pre_end_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+     {negative,
+      {?eh,cth,{'_',pre_end_per_suite,[ct_cth_empty_SUITE,'$proplist',[]]}},
+      {?eh,cth,{'_',post_end_per_suite,[ct_cth_empty_SUITE,'$proplist','_',[]]}}},
+     {negative,
+      {?eh,cth,{'_',post_end_per_suite,
+		[ct_cth_empty_SUITE,'$proplist','_',[]]}},
+      {?eh,tc_done,{ct_cth_empty_SUITE,end_per_suite,ok}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{'_',terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(fail_n_skip_with_minimal_cth) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',init_per_suite}},
+     
+     {?eh,tc_done,{'_',end_per_suite,ok}},
+     {?eh,cth,{'_',terminate,[[]]}},
+     {?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_hooks_SUITE_data/cth/tests/crash_id_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/crash_id_cth.erl
new file mode 100644
index 0000000000..02c36e378c
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/crash_id_cth.erl
@@ -0,0 +1,34 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(crash_id_cth).

+

+

+-include_lib("common_test/src/ct_util.hrl").

+-include_lib("common_test/include/ct_event.hrl").

+

+

+%% CT Hooks

+-export([id/1]).

+

+id(Opts) ->

+    empty_cth:id(Opts),

+    exit(diediedie).

+

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/crash_init_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/crash_init_cth.erl
new file mode 100644
index 0000000000..6ed23565f6
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/crash_init_cth.erl
@@ -0,0 +1,34 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(crash_init_cth).

+

+

+-include_lib("common_test/src/ct_util.hrl").

+-include_lib("common_test/include/ct_event.hrl").

+

+

+%% CT Hooks

+-export([init/2]).

+

+init(Id, Opts) ->

+    empty_cth:init(Id, Opts),

+    exit(diediedie).

+

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_empty_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_empty_SUITE.erl
new file mode 100644
index 0000000000..499069b382
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_empty_SUITE.erl
@@ -0,0 +1,47 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_cth_empty_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) ->

+    Config.

+

+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_cth_fail_one_skip_one_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_fail_one_skip_one_SUITE.erl
new file mode 100644
index 0000000000..017812c719
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_fail_one_skip_one_SUITE.erl
@@ -0,0 +1,64 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_cth_fail_one_skip_one_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_group(_Group,Config) ->

+    Config.

+

+end_per_group(_Group,_Config) ->

+    ok.

+

+init_per_testcase(test_case2, Config) ->

+    {skip,"skip it"};

+init_per_testcase(_TestCase, Config) ->

+    Config.

+

+end_per_testcase(_TestCase, _Config) ->

+    ok.

+

+groups() ->

+    [{group1,[parallel],[{group2,[parallel],[test_case1,test_case2,test_case3]}]}].

+

+all() ->

+    [{group,group1}].

+

+%% Test cases starts here.

+test_case1(Config) ->

+    ok = nok.

+

+test_case2(Config) ->

+    ok.

+

+test_case3(Config) ->

+    ok.

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_fail_per_suite_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_fail_per_suite_SUITE.erl
new file mode 100644
index 0000000000..136a15ec96
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_fail_per_suite_SUITE.erl
@@ -0,0 +1,47 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_cth_fail_per_suite_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) ->

+    ok = nok.

+

+end_per_suite(_Config) ->

+    ok.

+

+init_per_testcase(_TestCase, Config) ->

+    Config.

+

+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_exit_in_init_scope_suite_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_exit_in_init_scope_suite_cth_SUITE.erl
new file mode 100644
index 0000000000..42be0a659e
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_exit_in_init_scope_suite_cth_SUITE.erl
@@ -0,0 +1,50 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_exit_in_init_scope_suite_cth_SUITE).

+

+-suite_defaults([{timetrap, {minutes, 10}}]).

+

+%% Note: This directive should only be used in test suites.

+-compile(export_all).

+

+-include_lib("common_test/include/ct.hrl").

+

+%% Test server callback functions

+suite() ->

+    [{ct_hooks,[crash_init_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].

+

+%% 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_scope_per_group_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_group_cth_SUITE.erl
new file mode 100644
index 0000000000..628bca774c
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_group_cth_SUITE.erl
@@ -0,0 +1,56 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_scope_per_group_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

+init_per_suite(Config) ->

+    Config.

+

+end_per_suite(_Config) ->

+    ok.

+

+init_per_testcase(_TestCase, Config) ->

+    Config.

+

+end_per_testcase(_TestCase, _Config) ->

+    ok.

+

+init_per_group(GroupName, Config) ->

+    [{ct_hooks,[empty_cth]}|Config].

+

+end_per_group(GroupName, Config) ->

+    ok.

+

+all() ->

+    [{group,group1}].

+

+groups() ->

+    [{group1,[],[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_scope_per_group_state_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_group_state_cth_SUITE.erl
new file mode 100644
index 0000000000..14ea52bf8c
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_group_state_cth_SUITE.erl
@@ -0,0 +1,56 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_scope_per_group_state_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

+init_per_suite(Config) ->

+    Config.

+

+end_per_suite(_Config) ->

+    ok.

+

+init_per_testcase(_TestCase, Config) ->

+    Config.

+

+end_per_testcase(_TestCase, _Config) ->

+    ok.

+

+init_per_group(_GroupName, Config) ->

+    [{ct_hooks,[{empty_cth,[test]}]}|Config].

+

+end_per_group(_GroupName, _Config) ->

+    ok.

+

+all() ->

+    [{group,group1}].

+

+groups() ->

+    [{group1,[],[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_scope_per_suite_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_suite_cth_SUITE.erl
new file mode 100644
index 0000000000..5c1658be44
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_suite_cth_SUITE.erl
@@ -0,0 +1,47 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_scope_per_suite_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

+init_per_suite(Config) ->

+    [{ct_hooks,[empty_cth]}|Config].

+

+end_per_suite(_Config) ->

+    ok.

+

+init_per_testcase(_TestCase, Config) ->

+    Config.

+

+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_scope_per_suite_state_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_suite_state_cth_SUITE.erl
new file mode 100644
index 0000000000..96d00e3b28
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_suite_state_cth_SUITE.erl
@@ -0,0 +1,47 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_scope_per_suite_state_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

+init_per_suite(Config) ->

+    [{ct_hooks,[{empty_cth,[test]}]}|Config].

+

+end_per_suite(_Config) ->

+    ok.

+

+init_per_testcase(_TestCase, Config) ->

+    Config.

+

+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_scope_per_tc_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_tc_cth_SUITE.erl
new file mode 100644
index 0000000000..fa632444c5
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_tc_cth_SUITE.erl
@@ -0,0 +1,110 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_scope_per_tc_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

+%%--------------------------------------------------------------------

+%% @doc

+%% Config - [tuple()]

+%%   A list of key/value pairs, holding the test case configuration.

+%%

+%% 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.

+%%

+%% @spec init_per_suite(Config) -> Config

+%% @end

+%%--------------------------------------------------------------------

+init_per_suite(Config) ->

+    Config.

+

+%%--------------------------------------------------------------------

+%% @doc

+%% Config - [tuple()]

+%%   A list of key/value pairs, holding the test case configuration.

+%%

+%% Cleanup after the whole suite

+%%

+%% @spec end_per_suite(Config) -> _

+%% @end

+%%--------------------------------------------------------------------

+end_per_suite(_Config) ->

+    ok.

+

+%%--------------------------------------------------------------------

+%% @doc

+%% 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.

+%%

+%% Initiation before each test case

+%%

+%% Note: This function is free to add any key/value pairs to the Config

+%% variable, but should NOT alter/remove any existing entries.

+%% Initiation before each test case

+%%

+%% @spec init_per_testcase(TestCase, Config) -> Config

+%% @end

+%%--------------------------------------------------------------------

+init_per_testcase(_TestCase, Config) ->

+    [{ct_hooks,[empty_cth]}|Config].

+

+%%--------------------------------------------------------------------

+%% @doc

+%% 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.

+%%

+%% Cleanup after each test case

+%%

+%% @spec end_per_testcase(TestCase, Config) -> _

+%% @end

+%%--------------------------------------------------------------------

+end_per_testcase(_TestCase, _Config) ->

+    ok.

+

+%%--------------------------------------------------------------------

+%% @doc

+%% TestCases - [Case]

+%% Case - atom()

+%%   Name of a test case.

+%%

+%% Returns a list of all test cases in this test suite

+%%

+%% @spec all() -> TestCases

+%% @end

+%%--------------------------------------------------------------------

+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_scope_suite_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_cth_SUITE.erl
new file mode 100644
index 0000000000..988a0969ca
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_cth_SUITE.erl
@@ -0,0 +1,50 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_scope_suite_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,[empty_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].

+

+%% 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_scope_suite_state_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_state_cth_SUITE.erl
new file mode 100644
index 0000000000..18b68fbcdc
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_state_cth_SUITE.erl
@@ -0,0 +1,50 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_scope_suite_state_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,[{empty_cth,[test]}]}].

+

+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].

+

+%% 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_update_config_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl
new file mode 100644
index 0000000000..57fea347f6
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl
@@ -0,0 +1,56 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(ct_update_config_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) ->

+    [{init_per_suite,now()}|Config].

+

+end_per_suite(_Config) ->

+    ok.

+

+init_per_testcase(_TestCase, Config) ->

+    [{init_per_testcase,now()}|Config].

+

+end_per_testcase(_TestCase, _Config) ->

+    ok.

+

+init_per_group(GroupName, Config) ->

+    [{init_per_group,now()}|Config].

+

+end_per_group(GroupName, Config) ->

+    ok.

+

+all() ->

+    [{group,group1}].

+

+groups() ->

+    [{group1,[],[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
new file mode 100644
index 0000000000..5d07cd3dea
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
@@ -0,0 +1,278 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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%

+%%

+

+%%% @doc Common Test Example Suite Callback module.

+%%%

+%%% <p>This module gives an example of a common test CTH (Common Test Hook).

+%%% There are many ways to add a CTH to a test run, you can do it either in

+%%% the command line using -ct_hook, in a test spec using

+%%% {ct_hook,M} or in the suite it self by returning ct_hook

+%%% from either suite/0, init_per_suite/1, init_per_group/2 and

+%%% init_per_testcase/2. The scope of the CTH is determined by where is it

+%%% started. If it is started in the command line or test spec then it will

+%%% be stopped at the end of all tests. If it is started in init_per_suite,

+%%% it will be stopped after end_per_suite and so on. See terminate

+%%% documentation for a table describing the scoping machanics. 

+%%%

+%%% All of callbacks except init/1 in a CTH are optional.</p>

+

+-module(empty_cth).

+

+%% CT Hooks

+-export([id/1]).

+-export([init/2]).

+

+-export([pre_init_per_suite/3]).

+-export([post_init_per_suite/4]).

+-export([pre_end_per_suite/3]).

+-export([post_end_per_suite/4]).

+

+-export([pre_init_per_group/3]).

+-export([post_init_per_group/4]).

+-export([pre_end_per_group/3]).

+-export([post_end_per_group/4]).

+

+-export([pre_init_per_testcase/3]).

+-export([post_end_per_testcase/4]).

+

+-export([on_tc_fail/3]).

+-export([on_tc_skip/3]).

+

+-export([terminate/1]).

+

+-include_lib("common_test/src/ct_util.hrl").

+-include_lib("common_test/include/ct_event.hrl").

+

+-type proplist() :: list({atom(),term()}).

+-type config() :: proplist().

+-type reason() :: term().

+-type skip_or_fail() :: {skip, reason()} |

+                        {auto_skip, reason()} |

+                        {fail, reason()} | 

+			{'EXIT',reason()}.

+

+-record(state, { id = ?MODULE :: term()}).

+

+%% @doc 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 :: proplist()) ->

+    State :: #state{}.

+init(Id, Opts) ->

+    gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),

+					    data = {?MODULE, init, [Id, Opts]}}),

+    Opts.

+

+%% @doc The ID is used to uniquly identify an CTH instance, if two CTH's 

+%% return the same ID the seconds CTH is ignored. This function should NOT 

+%% have any side effects as it might be called multiple times by common test.

+-spec id(Opts :: proplist()) ->

+    Id :: term().

+id(Opts) ->

+    gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),

+					    data = {?MODULE, id, [Opts]}}),

+    now().

+

+%% @doc Called before init_per_suite is called. Note that this callback is

+%% only called if the CTH is added before init_per_suite is run (eg. in a test

+%% specification, suite/0 function etc).

+%% You can change the config in the this function.

+-spec pre_init_per_suite(Suite :: atom(),

+		     Config :: config(),

+		     State :: #state{}) ->

+    {config() | skip_or_fail(), NewState :: #state{}}.

+pre_init_per_suite(Suite,Config,State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, pre_init_per_suite,

+				     [Suite,Config,State]}}),

+    {Config, State}.

+

+%% @doc Called after init_per_suite.

+%% you can change the return value in this function.

+-spec post_init_per_suite(Suite :: atom(),

+			  Config :: config(),

+			  Return :: config() | skip_or_fail(),

+			  State :: #state{}) ->

+    {config() | skip_or_fail(), NewState :: #state{}}.

+post_init_per_suite(Suite,Config,Return,State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, post_init_per_suite,

+				     [Suite,Config,Return,State]}}),

+    {Return, State}.

+

+%% @doc Called before end_per_suite. The config/state can be changed here,

+%% though it will only affect the *end_per_suite function.

+-spec pre_end_per_suite(Suite :: atom(),

+		    Config :: config() | skip_or_fail(),

+		    State :: #state{}) ->

+    {ok | skip_or_fail(), NewState :: #state{}}.

+pre_end_per_suite(Suite,Config,State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, pre_end_per_suite,

+				     [Suite,Config,State]}}),

+    {Config, State}.

+

+%% @doc Called after end_per_suite. Note that the config cannot be

+%% changed here, only the status of the suite.

+-spec post_end_per_suite(Suite :: atom(),

+			 Config :: config(),

+			 Return :: term(),

+			 State :: #state{}) ->

+    {ok | skip_or_fail(), NewState :: #state{}}.

+post_end_per_suite(Suite,Config,Return,State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, post_end_per_suite,

+				     [Suite,Config,Return,State]}}),

+    {Return, State}.

+

+%% @doc Called before each init_per_group.

+%% You can change the config in this function.

+-spec pre_init_per_group(Group :: atom(),

+		     Config :: config(),

+		     State :: #state{}) ->

+    {config() | skip_or_fail(), NewState :: #state{}}.

+pre_init_per_group(Group,Config,State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, pre_init_per_group,

+				     [Group,Config,State]}}),

+    {Config, State}.

+

+%% @doc Called after each init_per_group.

+%% You can change the return value in this function.

+-spec post_init_per_group(Group :: atom(),

+			  Config :: config(),

+			  Return :: config() | skip_or_fail(),

+			  State :: #state{}) ->

+    {config() | skip_or_fail(), NewState :: #state{}}.

+post_init_per_group(Group,Config,Return,State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, post_init_per_group,

+				     [Group,Config,Return,State]}}),

+    {Return, State}.

+

+%% @doc Called after each end_per_group. The config/state can be changed here,

+%% though it will only affect the *end_per_group functions.

+-spec pre_end_per_group(Group :: atom(),

+			Config :: config() | skip_or_fail(),

+			State :: #state{}) ->

+    {ok | skip_or_fail(), NewState :: #state{}}.

+pre_end_per_group(Group,Config,State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, pre_end_per_group,

+				     [Group,Config,State]}}),

+    {Config, State}.

+

+%% @doc Called after each end_per_group. Note that the config cannot be

+%% changed here, only the status of the group.

+-spec post_end_per_group(Group :: atom(),

+			 Config :: config(),

+			 Return :: term(),

+			 State :: #state{}) ->

+    {ok | skip_or_fail(), NewState :: #state{}}.

+post_end_per_group(Group,Config,Return,State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, post_end_per_group,

+				     [Group,Config,Return,State]}}),

+    {Return, State}.

+

+%% @doc Called before each test case.

+%% You can change the config in this function.

+-spec pre_init_per_testcase(TC :: atom(),

+		  Config :: config(),

+		  State :: #state{}) ->

+    {config() | skip_or_fail(), NewState :: #state{}}.

+pre_init_per_testcase(TC,Config,State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, pre_init_per_testcase,

+				     [TC,Config,State]}}),

+    {Config, State}.

+

+%% @doc Called after each test case. Note that the config cannot be

+%% changed here, only the status of the test case.

+-spec post_end_per_testcase(TC :: atom(),

+			    Config :: config(),

+			    Return :: term(),

+			    State :: #state{}) ->

+    {ok | skip_or_fail(), NewState :: #state{}}.

+post_end_per_testcase(TC,Config,Return,State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, post_end_per_testcase,

+				     [TC,Config,Return,State]}}),

+    {Return, State}.

+

+%% @doc Called after post_init_per_suite, post_end_per_suite, post_init_per_group,

+%% post_end_per_group and post_end_per_tc if the suite, group or test case failed.

+%% This function should be used for extra cleanup which might be needed.

+%% It is not possible to modify the config or the status of the test run.

+-spec on_tc_fail(TC :: init_per_suite | end_per_suite |

+		 init_per_group | end_per_group | atom(),

+		 Reason :: term(), State :: #state{}) ->

+    NewState :: #state{}.

+on_tc_fail(TC, Reason, State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, on_tc_fail,

+				     [TC,Reason,State]}}),

+    State.

+

+%% @doc Called when a test case is skipped by either user action

+%% or due to an init function failing. Test case can be

+%% end_per_suite, init_per_group, end_per_group and the actual test cases. 

+-spec on_tc_skip(TC :: end_per_suite |

+		 init_per_group | end_per_group | atom(),

+		 {tc_auto_skip, {failed, {Mod :: atom(), Function :: atom(), Reason :: term()}}} |

+         {tc_user_skip, {skipped, Reason :: term()}},

+          State :: #state{}) ->

+    NewState :: #state{}.

+on_tc_skip(TC, Reason, State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, on_tc_skip,

+				     [TC,Reason,State]}}),

+    State.

+

+%% @doc Called when the scope of the CTH is done, this depends on

+%% when the CTH was specified. This translation table describes when this

+%% function is called.

+%%

+%%  | Started in          |     terminate called    |

+%%  |---------------------|-------------------------|

+%%  | command_line        | after all tests are run |

+%%  | test spec           | after all tests are run |

+%%  | suite/0             | after SUITE is done     |

+%%  | init_per_suite/1    | after SUITE is done     |

+%%  | init_per_group/2    | after group is done     |

+%%  |-----------------------------------------------|

+%%

+-spec terminate(State :: #state{}) ->

+    term().

+terminate(State) ->

+    gen_event:notify(

+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),

+			     data = {?MODULE, terminate, [State]}}),

+    ok.

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_post_suite_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_post_suite_cth.erl
new file mode 100644
index 0000000000..b4c26259a6
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_post_suite_cth.erl
@@ -0,0 +1,72 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(fail_post_suite_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),

+    {{fail, "Test failure"}, 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(Group,Config,State) ->

+    empty_cth:pre_init_per_group(Group,Config,State).

+

+post_init_per_group(Group,Config,Return,State) ->

+    empty_cth:post_init_per_group(Group,Config,Return,State).

+

+pre_end_per_group(Group,Config,State) ->

+    empty_cth:pre_end_per_group(Group,Config,State).

+

+post_end_per_group(Group,Config,Return,State) ->

+    empty_cth:post_end_per_group(Group,Config,Return,State).

+

+pre_init_per_testcase(TC,Config,State) ->

+    empty_cth:pre_init_per_testcase(TC,Config,State).

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    empty_cth:post_end_per_testcase(TC,Config,Return,State).

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State).

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

+terminate(State) ->

+    empty_cth:terminate(State).

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_pre_suite_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_pre_suite_cth.erl
new file mode 100644
index 0000000000..acf80a1b2e
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_pre_suite_cth.erl
@@ -0,0 +1,72 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(fail_pre_suite_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),

+    {{fail, "Test failure"}, 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(Group,Config,State) ->

+    empty_cth:pre_init_per_group(Group,Config,State).

+

+post_init_per_group(Group,Config,Return,State) ->

+    empty_cth:post_init_per_group(Group,Config,Return,State).

+

+pre_end_per_group(Group,Config,State) ->

+    empty_cth:pre_end_per_group(Group,Config,State).

+

+post_end_per_group(Group,Config,Return,State) ->

+    empty_cth:post_end_per_group(Group,Config,Return,State).

+

+pre_init_per_testcase(TC,Config,State) ->

+    empty_cth:pre_init_per_testcase(TC,Config,State).

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    empty_cth:post_end_per_testcase(TC,Config,Return,State).

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State).

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

+terminate(State) ->

+    empty_cth:terminate(State).

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/id_no_init_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/id_no_init_cth.erl
new file mode 100644
index 0000000000..58ed400e1c
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/id_no_init_cth.erl
@@ -0,0 +1,32 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(id_no_init_cth).

+

+

+-include_lib("common_test/src/ct_util.hrl").

+-include_lib("common_test/include/ct_event.hrl").

+

+

+%% CT Hooks

+-export([id/1]).

+

+id(Opts) ->

+    empty_cth:id(Opts).

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_cth.erl
new file mode 100644
index 0000000000..a18f4bf2f3
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_cth.erl
@@ -0,0 +1,33 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(minimal_cth).

+

+

+-include_lib("common_test/src/ct_util.hrl").

+-include_lib("common_test/include/ct_event.hrl").

+

+

+%% CT Hooks

+-export([init/2]).

+

+init(Id, Opts) ->

+    empty_cth:init(Id, Opts).

+

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_terminate_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_terminate_cth.erl
new file mode 100644
index 0000000000..79cd55f68e
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_terminate_cth.erl
@@ -0,0 +1,38 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(minimal_terminate_cth).

+

+

+-include_lib("common_test/src/ct_util.hrl").

+-include_lib("common_test/include/ct_event.hrl").

+

+

+%% CT Hooks

+-export([init/2]).

+-export([terminate/1]).

+

+init(Id, Opts) ->

+    empty_cth:init(Id, Opts).

+

+terminate(State) ->

+    empty_cth:terminate(State).

+    

+

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/recover_post_suite_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/recover_post_suite_cth.erl
new file mode 100644
index 0000000000..01a932bd59
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/recover_post_suite_cth.erl
@@ -0,0 +1,74 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(recover_post_suite_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,{'EXIT',Reason} = Return,State) ->

+    empty_cth:post_init_per_suite(Suite,Config,Return,State),

+    {lists:keydelete(tc_status,1,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(Group,Config,State) ->

+    empty_cth:pre_init_per_group(Group,Config,State).

+

+post_init_per_group(Group,Config,Return,State) ->

+    empty_cth:post_init_per_group(Group,Config,Return,State).

+

+pre_end_per_group(Group,Config,State) ->

+    empty_cth:pre_end_per_group(Group,Config,State).

+

+post_end_per_group(Group,Config,Return,State) ->

+    empty_cth:post_end_per_group(Group,Config,Return,State).

+

+pre_init_per_testcase(TC,Config,State) ->

+    empty_cth:pre_init_per_testcase(TC,Config,State).

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    empty_cth:post_end_per_testcase(TC,Config,Return,State).

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State).

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

+terminate(State) ->

+    empty_cth:terminate(State).

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/same_id_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/same_id_cth.erl
new file mode 100644
index 0000000000..acfb93fe26
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/same_id_cth.erl
@@ -0,0 +1,75 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(same_id_cth).

+

+

+-include_lib("common_test/src/ct_util.hrl").

+-include_lib("common_test/include/ct_event.hrl").

+

+

+%% CT Hooks

+-compile(export_all).

+

+id(Opts) ->

+    empty_cth:id(Opts),

+    ?MODULE.

+

+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(Group,Config,State) ->

+    empty_cth:pre_init_per_group(Group,Config,State).

+

+post_init_per_group(Group,Config,Return,State) ->

+    empty_cth:post_init_per_group(Group,Config,Return,State).

+

+pre_end_per_group(Group,Config,State) ->

+    empty_cth:pre_end_per_group(Group,Config,State).

+

+post_end_per_group(Group,Config,Return,State) ->

+    empty_cth:post_end_per_group(Group,Config,Return,State).

+

+pre_init_per_testcase(TC,Config,State) ->

+    empty_cth:pre_init_per_testcase(TC,Config,State).

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    empty_cth:post_end_per_testcase(TC,Config,Return,State).

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State).

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

+terminate(State) ->

+    empty_cth:terminate(State).

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_post_suite_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_post_suite_cth.erl
new file mode 100644
index 0000000000..6d4605b33b
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_post_suite_cth.erl
@@ -0,0 +1,72 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(skip_post_suite_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),

+    {{skip, "Test skip"}, 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(Group,Config,State) ->

+    empty_cth:pre_init_per_group(Group,Config,State).

+

+post_init_per_group(Group,Config,Return,State) ->

+    empty_cth:post_init_per_group(Group,Config,Return,State).

+

+pre_end_per_group(Group,Config,State) ->

+    empty_cth:pre_end_per_group(Group,Config,State).

+

+post_end_per_group(Group,Config,Return,State) ->

+    empty_cth:post_end_per_group(Group,Config,Return,State).

+

+pre_init_per_testcase(TC,Config,State) ->

+    empty_cth:pre_init_per_testcase(TC,Config,State).

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    empty_cth:post_end_per_testcase(TC,Config,Return,State).

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State).

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

+terminate(State) ->

+    empty_cth:terminate(State).

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_suite_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_suite_cth.erl
new file mode 100644
index 0000000000..49efd0d0cd
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_suite_cth.erl
@@ -0,0 +1,73 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(skip_pre_suite_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),

+    {{skip, "Test skip"}, 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(Group,Config,State) ->

+    empty_cth:pre_init_per_group(Group,Config,State).

+

+post_init_per_group(Group,Config,Return,State) ->

+    empty_cth:post_init_per_group(Group,Config,Return,State).

+

+pre_end_per_group(Group,Config,State) ->

+    empty_cth:pre_end_per_group(Group,Config,State).

+

+post_end_per_group(Group,Config,Return,State) ->

+    empty_cth:post_end_per_group(Group,Config,Return,State).

+

+pre_init_per_testcase(TC,Config,State) ->

+    empty_cth:pre_init_per_testcase(TC,Config,State).

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    empty_cth:post_end_per_testcase(TC,Config,Return,State).

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State).

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

+terminate(State) ->

+    empty_cth:terminate(State).

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl
new file mode 100644
index 0000000000..53d75e6ce3
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl
@@ -0,0 +1,83 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(state_update_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) ->

+    State = empty_cth:init(Id, Opts),

+    [init|State].

+

+pre_init_per_suite(Suite, Config, State) ->

+    empty_cth:pre_init_per_suite(Suite,Config,State),

+    {Config, [pre_init_per_suite|State]}.

+

+post_init_per_suite(Suite,Config,Return,State) ->

+    empty_cth:post_init_per_suite(Suite,Config,Return,State),

+    {Config, [post_init_per_suite|State]}.

+

+pre_end_per_suite(Suite,Config,State) ->

+    empty_cth:pre_end_per_suite(Suite,Config,State),

+    {Config, [pre_end_per_suite|State]}.

+

+post_end_per_suite(Suite,Config,Return,State) ->

+    empty_cth:post_end_per_suite(Suite,Config,Return,State),

+    {Return, [post_end_per_suite|State]}.

+

+pre_init_per_group(Group,Config,State) ->

+    empty_cth:pre_init_per_group(Group,Config,State),

+    {Config, [pre_init_per_group|State]}.

+

+post_init_per_group(Group,Config,Return,State) ->

+    empty_cth:post_init_per_group(Group,Config,Return,State),

+    {Return, [post_init_per_group|State]}.

+

+pre_end_per_group(Group,Config,State) ->

+    empty_cth:pre_end_per_group(Group,Config,State),

+    {Config, [pre_end_per_group|State]}.

+

+post_end_per_group(Group,Config,Return,State) ->

+    empty_cth:post_end_per_group(Group,Config,Return,State),

+    {Return, [post_end_per_group|State]}.

+

+pre_init_per_testcase(TC,Config,State) ->

+    empty_cth:pre_init_per_testcase(TC,Config,State),

+    {Config, [pre_init_per_testcase|State]}.

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    empty_cth:post_end_per_testcase(TC,Config,Return,State),

+    {Return, [post_end_per_testcase|State]}.

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State),

+    [on_tc_fail|State].

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State),

+    [on_tc_skip|State].

+

+terminate(State) ->

+    empty_cth:terminate(State).

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/undef_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/undef_cth.erl
new file mode 100644
index 0000000000..4c44ef025b
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/undef_cth.erl
@@ -0,0 +1,71 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(undef_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) ->

+    lists:flaten([1,2,[3,4]]).

+

+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(Group,Config,State) ->

+    empty_cth:pre_init_per_group(Group,Config,State).

+

+post_init_per_group(Group,Config,Return,State) ->

+    empty_cth:post_init_per_group(Group,Config,Return,State).

+

+pre_end_per_group(Group,Config,State) ->

+    empty_cth:pre_end_per_group(Group,Config,State).

+

+post_end_per_group(Group,Config,Return,State) ->

+    empty_cth:post_end_per_group(Group,Config,Return,State).

+

+pre_init_per_testcase(TC,Config,State) ->

+    empty_cth:pre_init_per_testcase(TC,Config,State).

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    empty_cth:post_end_per_testcase(TC,Config,Return,State).

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State).

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

+terminate(State) ->

+    empty_cth:terminate(State).

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl
new file mode 100644
index 0000000000..788ef2cec2
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl
@@ -0,0 +1,82 @@
+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 2010. 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(update_config_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),

+    {[{pre_init_per_suite,now()}|Config],State}.

+

+post_init_per_suite(Suite,Config,Return,State) ->

+    empty_cth:post_init_per_suite(Suite,Config,Return,State),

+    {[{post_init_per_suite,now()}|Return],State}.

+

+pre_end_per_suite(Suite,Config,State) ->

+    empty_cth:pre_end_per_suite(Suite,Config,State),

+    {[{pre_end_per_suite,now()}|Config],State}.

+

+post_end_per_suite(Suite,Config,Return,State) ->

+    empty_cth:post_end_per_suite(Suite,Config,Return,State),

+    NewConfig = [{post_end_per_suite,now()}|Config],

+    {NewConfig,NewConfig}.

+

+pre_init_per_group(Group,Config,State) ->

+    empty_cth:pre_init_per_group(Group,Config,State),

+    {[{pre_init_per_group,now()}|Config],State}.

+

+post_init_per_group(Group,Config,Return,State) ->

+    empty_cth:post_init_per_group(Group,Config,Return,State),

+    {[{post_init_per_group,now()}|Return],State}.

+

+pre_end_per_group(Group,Config,State) ->

+    empty_cth:pre_end_per_group(Group,Config,State),

+    {[{pre_end_per_group,now()}|Config],State}.

+

+post_end_per_group(Group,Config,Return,State) ->

+    empty_cth:post_end_per_group(Group,Config,Return,State),

+    {[{post_end_per_group,now()}|Config],State}.

+

+pre_init_per_testcase(TC,Config,State) ->

+    empty_cth:pre_init_per_testcase(TC,Config,State),

+    {[{pre_init_per_testcase,now()}|Config],State}.

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    empty_cth:post_end_per_testcase(TC,Config,Return,State),

+    {[{post_end_per_testcase,now()}|Config],State}.

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State).

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

+terminate(State) ->

+    empty_cth:terminate(State).

diff --git a/lib/common_test/test/ct_master_SUITE.erl b/lib/common_test/test/ct_master_SUITE.erl
new file mode 100644
index 0000000000..e208397296
--- /dev/null
+++ b/lib/common_test/test/ct_master_SUITE.erl
@@ -0,0 +1,223 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_master_SUITE
+%%%
+%%% Description:
+%%% Test ct_master.
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_master_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).
+
+-define(TEMP_DIR, case os:type() of
+		      {win32,_} ->
+			  "c:/Temp";
+		      _ ->
+			  "/tmp"
+		  end).
+
+%%--------------------------------------------------------------------
+%% 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) ->
+    ct_test_support:init_per_suite(Config).
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    NodeCount = 5,
+    NodeNames = [list_to_atom("t_"++integer_to_list(N)) ||
+		 N <- lists:seq(1, NodeCount)],
+    ct_test_support:init_per_testcase(
+      TestCase,[{node_names,NodeNames},
+		{master, true}|Config]).
+
+end_per_testcase(TestCase, Config) ->
+    case os:type() of
+	{win32,_} ->
+	    %% If this is a windows run the logs are saved to /tmp and
+	    %% then moved to private_dir as a tar because otherwise
+	    %% the file names become too long! :(
+	    Files = filelib:wildcard(filename:join(?TEMP_DIR,"slave.*")),
+	    erl_tar:create(
+	      filename:join(
+		proplists:get_value(priv_dir,Config),"slaves.tar.gz"),
+	      Files,[compressed]),
+	    os:cmd("rm -rf "++filename:join(?TEMP_DIR,"slave.*"));
+	_ ->
+	    ok
+    end,
+    
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [ct_master_test].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+ct_master_test(Config) when is_list(Config)->
+    NodeNames = proplists:get_value(node_names, Config),
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+
+    FileName = filename:join(PrivDir, "ct_master_spec.spec"),
+    Suites = [master_SUITE],
+    TSFile = make_spec(DataDir, FileName, NodeNames, Suites, Config),
+    ERPid = ct_test_support:start_event_receiver(Config),
+    spawn(ct@ancalagon,
+	  fun() ->
+		  dbg:tracer(),dbg:p(all,c),
+		  dbg:tpl(erlang, spawn_link, 4,x),
+		  receive ok -> ok end
+	  end),
+
+    [{TSFile, ok}] = run_test(ct_master_test, FileName, Config),
+
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(groups_suite_1, 
+			       reformat(Events, ?eh), 
+			       ?config(priv_dir, Config)),
+    find_events(NodeNames, [{tc_start,{master_SUITE,init_per_suite}},
+			    {tc_start,{master_SUITE,first_testcase}},
+			    {tc_start,{master_SUITE,second_testcase}},
+			    {tc_start,{master_SUITE,third_testcase}},
+			    {tc_start,{master_SUITE,end_per_suite}}],
+	       Events),
+    
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+make_spec(DataDir, FileName, NodeNames, Suites, Config)->
+    {ok, HostName} = inet:gethostname(),
+
+    N = lists:map(fun(NodeName)->
+	    {node, NodeName, list_to_atom(atom_to_list(NodeName)++"@"++HostName)}
+	end,
+	NodeNames),
+
+    C = lists:map(fun(NodeName)->
+	Rnd = random:uniform(2),
+	if Rnd == 1->
+	    {config, NodeName, filename:join(DataDir, "master/config.txt")};
+	true->
+	    {userconfig, NodeName, {ct_config_xml, filename:join(DataDir, "master/config.xml")}}
+        end
+	end,
+	NodeNames),
+
+    NS = lists:map(fun(NodeName)->
+	     {init, NodeName, [
+				{node_start, [{startup_functions, []}, {monitor_master, true}]},
+				{eval, {erlang, nodes, []}}
+			      ]
+	     }
+	 end,
+	 NodeNames),
+
+    S = [{suites, NodeNames, filename:join(DataDir, "master"), Suites}],
+
+    PrivDir = ?config(priv_dir, Config),
+    LD = lists:map(fun(NodeName)->
+	     {logdir, NodeName, get_log_dir(os:type(),PrivDir, NodeName)}
+         end,
+	 NodeNames) ++ [{logdir, master, PrivDir}],
+    EvHArgs = [{cbm,ct_test_support},{trace_level,?config(trace_level,Config)}],
+    EH = [{event_handler,master,[?eh],EvHArgs}],
+
+    Include = [{include,filename:join([DataDir,"master/include"])}],
+
+    ct_test_support:write_testspec(N++Include++EH++C++S++LD++NS, FileName).
+
+get_log_dir({win32,_},PrivDir, NodeName)->
+    case filelib:is_dir(?TEMP_DIR) of
+	false ->
+	    file:make_dir(?TEMP_DIR);
+	_ ->
+	    ok
+    end,
+    get_log_dir(tmp, ?TEMP_DIR,NodeName);
+get_log_dir(_,PrivDir,NodeName) ->
+    LogDir = filename:join(PrivDir, io_lib:format("slave.~p", [NodeName])),
+    file:make_dir(LogDir),
+    LogDir.
+
+run_test(_Name, FileName, Config)->
+    [{FileName, ok}] = ct_test_support:run(ct_master, run, [FileName], Config).
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+find_events([], _CheckEvents, _) ->
+    ok;
+find_events([NodeName|NodeNames],CheckEvents,AllEvents) ->
+    find_events(NodeNames, CheckEvents,
+		remove_events(add_host(NodeName),CheckEvents, AllEvents, [])).
+
+remove_events(Node,[{Name,Data} | RestChecks],
+	      [{?eh,#event{ name = Name, node = Node, data = Data }}|RestEvs],
+	       Acc) ->
+    remove_events(Node, RestChecks, RestEvs, Acc);
+remove_events(Node, Checks, [Event|RestEvs], Acc) ->
+    remove_events(Node, Checks, RestEvs, [Event | Acc]);
+remove_events(_Node, [], [], Acc) ->
+    lists:reverse(Acc);
+remove_events(Node, Events, [], Acc) ->
+    test_server:format("Could not find events: ~p in ~p for node ~p",
+	   [Events, lists:reverse(Acc), Node]),
+    exit(event_not_found).
+
+add_host(NodeName) ->
+    {ok, HostName} = inet:gethostname(),
+    list_to_atom(atom_to_list(NodeName)++"@"++HostName).
+    
+expected_events(_)->
+    [].
diff --git a/lib/common_test/test/ct_master_SUITE_data/master/config.txt b/lib/common_test/test/ct_master_SUITE_data/master/config.txt
new file mode 100644
index 0000000000..3baf9e392c
--- /dev/null
+++ b/lib/common_test/test/ct_master_SUITE_data/master/config.txt
@@ -0,0 +1,2 @@
+{a, b}.
+{c, d}.
diff --git a/lib/common_test/test/ct_master_SUITE_data/master/config.xml b/lib/common_test/test/ct_master_SUITE_data/master/config.xml
new file mode 100644
index 0000000000..c031f45f35
--- /dev/null
+++ b/lib/common_test/test/ct_master_SUITE_data/master/config.xml
@@ -0,0 +1,4 @@
+<config>
+	<a>b</a>
+	<c>d</c>
+</config>
diff --git a/lib/ssl/examples/certs/ebin/.gitignore b/lib/common_test/test/ct_master_SUITE_data/master/include/test.hrl
index e69de29bb2..e69de29bb2 100644
--- a/lib/ssl/examples/certs/ebin/.gitignore
+++ b/lib/common_test/test/ct_master_SUITE_data/master/include/test.hrl
diff --git a/lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl b/lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl
new file mode 100644
index 0000000000..032d69ad9f
--- /dev/null
+++ b/lib/common_test/test/ct_master_SUITE_data/master/master_SUITE.erl
@@ -0,0 +1,58 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: master_SUITE
+%%%
+%%% Description:
+%%% Test suite for common_test which tests the ct_master functionality
+%%%-------------------------------------------------------------------
+-module(master_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include("test.hrl").
+
+suite() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_) ->
+    ok.
+
+all() -> [first_testcase, second_testcase, third_testcase].
+
+init_per_testcase(_, Config) ->
+    Config.
+
+end_per_testcase(_, _) ->
+    ok.
+
+first_testcase(_)->
+    b = ct:get_config(a).
+
+second_testcase(_)->
+    d = ct:get_config(c).
+
+third_testcase(_)->
+    A = 4,
+    A = 2*2.
diff --git a/lib/common_test/test/ct_misc_1_SUITE.erl b/lib/common_test/test/ct_misc_1_SUITE.erl
new file mode 100644
index 0000000000..f5904ca180
--- /dev/null
+++ b/lib/common_test/test/ct_misc_1_SUITE.erl
@@ -0,0 +1,228 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_misc_1_SUITE
+%%%
+%%% Description:
+%%% Test misc things in Common Test suites.
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_misc_1_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("test_server/include/test_server_line.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) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+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() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [beam_me_up, {group,parse_table}].
+
+groups() -> 
+    [{parse_table,[parallel], 
+      [parse_table_empty, parse_table_single,
+       parse_table_multiline_row,
+       parse_table_one_column_multiline,
+       parse_table_one_column_simple]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+beam_me_up(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    CTNode = ?config(ct_node, Config),
+
+    %% Path = rpc:call(CTNode, code, get_path, []),
+    %% [_ | Parts] = lists:reverse(filename:split(DataDir)),
+    %% TSDir = filename:join(lists:reverse(Parts)),
+    %% true = rpc:call(CTNode, code, del_path, [TSDir]),
+
+    Mods = [beam_1_SUITE, beam_2_SUITE],
+    Suites = [atom_to_list(M) || M <- Mods],
+    [{error,_} = rpc:call(CTNode, code, load_file, [M]) || M <- Mods],
+
+    code:add_path(DataDir),
+    CRes =
+	[compile:file(filename:join(DataDir,F),
+		      [verbose,report_errors,
+		       report_warnings,binary]) || F <- Suites],
+
+    [{module,_} = rpc:call(CTNode, code, load_binary,
+			   [Mod, atom_to_list(Mod), Bin]) ||
+	{ok,Mod,Bin} <- CRes],
+
+    {Opts,ERPid} = setup([{suite,Suites},{auto_compile,false}], Config),
+
+    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(beam_me_up,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config)),
+
+    TestEvents = events_to_check(beam_me_up, 1),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+parse_table_empty(Config) when is_list(Config) ->
+
+    String = ["+----+-------+---------+---------+----------+------+--------+",
+	      "| id | col11 | col2222 | col3333 | col4     | col5 | col6666 |",
+	      "+----+-------+---------+---------+----------+------+--------+",
+	      "+----+-------+---------+---------+----------+------+--------+",
+	      "Query Done: 0 records selected"],
+
+    {{"id","col11","col2222","col3333","col4","col5","col6666"},[]} =
+	ct:parse_table(String).
+
+
+parse_table_single(Config) when is_list(Config) ->
+
+    String = ["+------+--------+--------------+------------+------------------+---------+--------+---------+-----------+",
+	      "| id | col1 | col2 | col3 | col4 | col5 | col6 | col7 | col8 |",
+"+------+--------+--------------+------------+------------------+---------+--------+---------+-----------+",
+	      "| 0 | 0 | -1407231560 | -256 | -1407231489 | 1500 | 1 | 1 | 1 |",
+	      "+------+--------+--------------+------------+------------------+---------+--------+---------+-----------+"
+	      "Query Done: 1 record selected"],
+
+    {{"id","col1","col2","col3","col4","col5","col6","col7","col8"},
+     [{"0","0","-1407231560","-256","-1407231489", "1500","1","1","1"}]} =
+	ct:parse_table(String).
+
+parse_table_multiline_row(Config) when is_list(Config) ->
+    
+    String = ["+------+--------+--------------+------------+------------------+---------+--------+---------+-----------+",
+	      "| id | col1 | col2 | col3 | col4 | col5 | col6 | col7 | col8 |",
+"+------+--------+--------------+------------+------------------+---------+--------+---------+-----------+",
+	      "| 0 | 0 | Free test string",
+	      " on more lines",
+	      "than one",
+	      "| -256 | -1407231489 | 1500 | 1 | 1 | 1 |",
+	      "+------+--------+--------------+------------+------------------+---------+--------+---------+-----------+"
+	      "Query Done: 1 record selected"],
+
+    {{"id","col1","col2","col3","col4","col5","col6","col7","col8"},
+     [{"0","0","Free test string\n on more lines\nthan one\n",
+       "-256","-1407231489", "1500","1","1","1"}]} =
+	ct:parse_table(String).
+
+parse_table_one_column_simple(Config) when is_list(Config) ->
+
+    String = ["|test|","|test value|"],
+
+    {{"test"},[{"test value"}]} = ct:parse_table(String).
+
+parse_table_one_column_multiline(Config) when is_list(Config) ->
+    String = ["|test|","|test","value|"],
+
+    {{"test"},[{"test\nvalue"}]} = ct:parse_table(String).
+	
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+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).
+%reformat(Events, _EH) ->
+%    Events.
+
+%%%-----------------------------------------------------------------
+%%% 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(beam_me_up) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{2,2,4}},
+     {?eh,tc_start,{beam_1_SUITE,init_per_suite}},
+     {?eh,tc_done,{beam_1_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{beam_1_SUITE,tc1}},
+     {?eh,tc_done,{beam_1_SUITE,tc1,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{beam_1_SUITE,tc2}},
+     {?eh,tc_done,{beam_1_SUITE,tc2,{failed,{error,'tc2 failed'}}}},
+     {?eh,test_stats,{1,1,{0,0}}},
+     {?eh,tc_start,{beam_1_SUITE,end_per_suite}},
+     {?eh,tc_done,{beam_1_SUITE,end_per_suite,ok}},
+     {?eh,tc_start,{beam_2_SUITE,init_per_suite}},
+     {?eh,tc_done,{beam_2_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{beam_2_SUITE,tc1}},
+     {?eh,tc_done,{beam_2_SUITE,tc1,ok}},
+     {?eh,test_stats,{2,1,{0,0}}},
+     {?eh,tc_start,{beam_2_SUITE,tc2}},
+     {?eh,tc_done,{beam_2_SUITE,tc2,{failed,{error,'tc2 failed'}}}},
+     {?eh,test_stats,{2,2,{0,0}}},
+     {?eh,tc_start,{beam_2_SUITE,end_per_suite}},
+     {?eh,tc_done,{beam_2_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
diff --git a/lib/common_test/test/ct_misc_1_SUITE_data/beam_1_SUITE.erl b/lib/common_test/test/ct_misc_1_SUITE_data/beam_1_SUITE.erl
new file mode 100644
index 0000000000..382bdefded
--- /dev/null
+++ b/lib/common_test/test/ct_misc_1_SUITE_data/beam_1_SUITE.erl
@@ -0,0 +1,134 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(beam_1_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% COMMON TEST CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%%
+%% Info = [tuple()]
+%%   List of key/value pairs.
+%%
+%% Description: Returns list of tuples to set default properties
+%%              for the suite.
+%%
+%% Note: The suite/0 function is only meant to be used to return
+%% default data values, not perform any other operations.
+%%--------------------------------------------------------------------
+suite() ->
+    [
+     {timetrap,{seconds,10}}
+    ].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the suite.
+%%
+%% Description: Initialization before the 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) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%%
+%% Description: Cleanup after the suite.
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%%
+%% TestCase = atom()
+%%   Name of the test case that is about to run.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the test case.
+%%
+%% Description: Initialization before each test case.
+%%
+%% Note: This function is free to add any key/value pairs to the Config
+%% variable, but should NOT alter/remove any existing entries.
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%%
+%% TestCase = atom()
+%%   Name of the test case that is finished.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%%
+%% Description: Cleanup after each test case.
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: all() -> TestCases | {skip,Reason}
+%%
+%% TestCases = [TestCase | {sequence,SeqName}]
+%% TestCase = atom()
+%%   Name of a test case.
+%% SeqName = atom()
+%%   Name of a test case sequence.
+%% Reason = term()
+%%   The reason for skipping all test cases.
+%%
+%% Description: Returns the list of test cases that are to be executed.
+%%--------------------------------------------------------------------
+all() ->
+    [tc1, tc2].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+tc1(_Config) ->
+    ct:comment("tc1 executed"),
+    ok.
+
+tc2(_Config) ->
+    exit('tc2 failed').
diff --git a/lib/common_test/test/ct_misc_1_SUITE_data/beam_2_SUITE.erl b/lib/common_test/test/ct_misc_1_SUITE_data/beam_2_SUITE.erl
new file mode 100644
index 0000000000..70c1f2b471
--- /dev/null
+++ b/lib/common_test/test/ct_misc_1_SUITE_data/beam_2_SUITE.erl
@@ -0,0 +1,134 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(beam_2_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% COMMON TEST CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%%
+%% Info = [tuple()]
+%%   List of key/value pairs.
+%%
+%% Description: Returns list of tuples to set default properties
+%%              for the suite.
+%%
+%% Note: The suite/0 function is only meant to be used to return
+%% default data values, not perform any other operations.
+%%--------------------------------------------------------------------
+suite() ->
+    [
+     {timetrap,{seconds,10}}
+    ].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the suite.
+%%
+%% Description: Initialization before the 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) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%%
+%% Description: Cleanup after the suite.
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%%
+%% TestCase = atom()
+%%   Name of the test case that is about to run.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the test case.
+%%
+%% Description: Initialization before each test case.
+%%
+%% Note: This function is free to add any key/value pairs to the Config
+%% variable, but should NOT alter/remove any existing entries.
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%%
+%% TestCase = atom()
+%%   Name of the test case that is finished.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%%
+%% Description: Cleanup after each test case.
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: all() -> TestCases | {skip,Reason}
+%%
+%% TestCases = [TestCase | {sequence,SeqName}]
+%% TestCase = atom()
+%%   Name of a test case.
+%% SeqName = atom()
+%%   Name of a test case sequence.
+%% Reason = term()
+%%   The reason for skipping all test cases.
+%%
+%% Description: Returns the list of test cases that are to be executed.
+%%--------------------------------------------------------------------
+all() ->
+    [tc1, tc2].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+tc1(_Config) ->
+    ct:comment("tc1 executed"),
+    ok.
+
+tc2(_Config) ->
+    exit('tc2 failed').
diff --git a/lib/common_test/test/ct_repeat_1_SUITE.erl b/lib/common_test/test/ct_repeat_1_SUITE.erl
new file mode 100644
index 0000000000..40ef3e42fb
--- /dev/null
+++ b/lib/common_test/test/ct_repeat_1_SUITE.erl
@@ -0,0 +1,1539 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_repeat_1_SUITE.erl
+%%%
+%%% Description:
+%%% Test some simple test case group scenarios with repeat.
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_repeat_1_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) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+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() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [repeat_cs, repeat_cs_and_grs, repeat_seq,
+     repeat_cs_until_any_ok, repeat_gr_until_any_ok,
+     repeat_cs_until_any_fail, repeat_gr_until_any_fail,
+     repeat_cs_until_all_ok, repeat_gr_until_all_ok,
+     repeat_cs_until_all_fail, repeat_gr_until_all_fail,
+     repeat_seq_until_any_fail,
+     repeat_shuffled_seq_until_any_fail].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+repeat_cs(Config) when is_list(Config) ->
+    execute(repeat_cs,
+	    "repeat_1_SUITE", repeat_cs,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_cs_and_grs(Config) when is_list(Config) ->
+    execute(repeat_cs_and_grs,
+	    "repeat_1_SUITE", repeat_cs_and_grs,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_seq(Config) when is_list(Config) ->
+    execute(repeat_seq,
+	    "repeat_1_SUITE", repeat_seq,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_cs_until_any_ok(Config) when is_list(Config) ->
+    execute(repeat_cs_until_any_ok,
+	    "repeat_1_SUITE", repeat_cs_until_any_ok,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_gr_until_any_ok(Config) when is_list(Config) ->
+    execute(repeat_gr_until_any_ok,
+	    "repeat_1_SUITE", repeat_gr_until_any_ok,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_cs_until_any_fail(Config) when is_list(Config) ->
+    execute(repeat_cs_until_any_fail,
+	    "repeat_1_SUITE", repeat_cs_until_any_fail,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_gr_until_any_fail(Config) when is_list(Config) ->
+    execute(repeat_gr_until_any_fail,
+	    "repeat_1_SUITE", repeat_gr_until_any_fail,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_cs_until_all_ok(Config) when is_list(Config) ->
+    execute(repeat_cs_until_all_ok,
+	    "repeat_1_SUITE", repeat_cs_until_all_ok,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_gr_until_all_ok(Config) when is_list(Config) ->
+    execute(repeat_gr_until_all_ok,
+	    "repeat_1_SUITE", repeat_gr_until_all_ok,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_cs_until_all_fail(Config) when is_list(Config) ->
+    execute(repeat_cs_until_all_fail,
+	    "repeat_1_SUITE", repeat_cs_until_all_fail,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_gr_until_all_fail(Config) when is_list(Config) ->
+    execute(repeat_gr_until_all_fail,
+	    "repeat_1_SUITE", repeat_gr_until_all_fail,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_seq_until_any_fail(Config) when is_list(Config) ->
+    execute(repeat_seq_until_any_fail,
+	    "repeat_1_SUITE", repeat_seq_until_any_fail,
+	    Config).
+%%%-------------------------------------------------------------------
+repeat_shuffled_seq_until_any_fail(Config) when is_list(Config) ->
+    execute(repeat_shuffled_seq_until_any_fail,
+	    "repeat_1_SUITE", repeat_shuffled_seq_until_any_fail,
+	    Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+execute(TestCase, SuiteName, Group, Config) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, SuiteName),
+
+    {Opts,ERPid} = setup([{suite,Suite},{group,Group},{label,TestCase}], Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(TestCase,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config)),
+
+    TestEvents = events_to_check(TestCase),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+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).
+%reformat(Events, _EH) ->
+%    Events.
+
+%%%-----------------------------------------------------------------
+%%% 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_cs) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_1,[]},ok}},
+       {?eh,test_stats,{2,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs_1,[]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_2,[{repeat,2}]},ok}},
+       {?eh,test_stats,{4,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs_2,[{repeat,2}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_2,[]},ok}},
+       {?eh,test_stats,{6,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs_2,[]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_cs_and_grs) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_and_grs,[{repeat,2}]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,tc_fail_1,{failed,{error,{{badmatch,2},'_'}}}}},
+      {?eh,test_stats,{1,1,{0,0}}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_result,[]},ok}},
+       {?eh,test_stats,{2,1,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_fail_result,[]},
+		     {return_group_result,failed}}}],
+      {?eh,test_stats,{3,1,{0,0}}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_init,[]},
+		     {failed,{error,fails_on_purpose}}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {failed,{repeat_1_SUITE,init_per_group,
+				   {'EXIT',fails_on_purpose}}}}},
+       {?eh,test_stats,{3,1,{0,1}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			  {failed,{repeat_1_SUITE,init_per_group,
+				   {'EXIT',fails_on_purpose}}}}}],
+      {?eh,test_stats,{4,1,{0,1}}},
+      {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs_and_grs,[{repeat,2}]},ok}}],
+     [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_and_grs,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,test_stats,{5,1,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,tc_fail_1,{failed,{error,{{badmatch,2},'_'}}}}},
+      {?eh,test_stats,{5,2,{0,1}}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_result,[]},ok}},
+       {?eh,test_stats,{6,2,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_fail_result,[]},
+		     {return_group_result,failed}}}],
+      {?eh,test_stats,{7,2,{0,1}}},
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_init,[]},
+		     {failed,{error,fails_on_purpose}}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {failed,{repeat_1_SUITE,init_per_group,
+				   {'EXIT',fails_on_purpose}}}}},
+       {?eh,test_stats,{7,2,{0,2}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			  {failed,{repeat_1_SUITE,init_per_group,
+				   {'EXIT',fails_on_purpose}}}}}],
+      {?eh,test_stats,{8,2,{0,2}}},
+      {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_cs_and_grs,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(repeat_seq) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_seq,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_1,[sequence,{repeat,2}]},
+		     ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+       {?eh,test_stats,{1,1,{0,0}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+			  {failed,{repeat_1_SUITE,tc_fail_1}}}},
+       {?eh,test_stats,{1,1,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_1,[sequence,{repeat,2}]},
+		     ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_seq_1,
+				     [sequence]},ok}},
+       {?eh,test_stats,{2,2,{0,2}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_seq_1,
+				     [sequence]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_2,[sequence,{repeat,2}]},
+		     ok}},
+       {?eh,test_stats,{3,2,{0,2}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_result,[]},ok}},
+	{?eh,test_stats,{4,2,{0,2}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_fail_result,[]},
+		      {return_group_result,failed}}}],
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+			  {group_result,gr_fail_result,failed}}},
+       {?eh,test_stats,{4,2,{0,3}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_2,[sequence,{repeat,2}]},
+		     ok}}],
+      [{?eh,tc_done,
+        {repeat_1_SUITE,{init_per_group,repeat_seq_2,[sequence]},ok}},
+       {?eh,test_stats,{6,2,{0,4}}},
+       {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_seq_2,
+				     [sequence]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_3,[sequence,{repeat,2}]},
+		     ok}},
+       {?eh,test_stats,{7,2,{0,4}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init,[]},
+		      {failed,{error,fails_on_purpose}}}},
+	{?eh,test_stats,{7,2,{0,5}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,
+			    {repeat_1_SUITE,init_per_group,
+			     {'EXIT',fails_on_purpose}}}}}],
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+			  {group_result,gr_fail_init,failed}}},
+       {?eh,test_stats,{7,2,{0,6}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_3,[sequence,{repeat,2}]},
+		     ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_3,[sequence]},ok}},
+       {?eh,test_stats,{8,2,{0,8}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_3,[sequence]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_4,[sequence,{repeat,2}]},
+		     ok}},
+       {?eh,test_stats,{8,3,{0,8}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,
+			  tc_ok_1,{failed,{repeat_1_SUITE,tc_fail_1}}}},
+       {?eh,test_stats,{8,3,{0,9}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,
+			  tc_ok_1,{failed,{repeat_1_SUITE,tc_fail_1}}}},
+       {?eh,test_stats,{8,3,{0,10}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_4,[sequence,{repeat,2}]},
+		     ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_seq_4,[sequence]},ok}},
+       {?eh,test_stats,{8,4,{0,12}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_4,[sequence]},ok}}],
+
+      {?eh,tc_done,{repeat_1_SUITE,{end_per_group,repeat_seq,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_cs_until_any_ok) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_cs_until_any_ok,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_any_ok_1,
+		      [{repeat_until_any_ok,3}]},ok}},
+       {?eh,test_stats,{0,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{0,3,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_any_ok_1,
+		      [{repeat_until_any_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_any_ok_1,
+		      [{repeat_until_any_ok,2}]},ok}},
+       {?eh,test_stats,{0,5,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,ok}},
+       {?eh,test_stats,{1,5,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_any_ok_1,
+		      [{repeat_until_any_ok,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_any_ok_2,
+		      [{repeat_until_any_ok,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{2,5,{0,0}}},
+       {?eh,test_stats,{2,6,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_any_ok_2,
+		      [{repeat_until_any_ok,3}]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_cs_until_any_ok,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_gr_until_any_ok) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,
+       {repeat_1_SUITE,{init_per_group,repeat_gr_until_any_ok,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_any_ok_1,
+		      [{repeat_until_any_ok,3}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_result,[]},ok}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_fail_result,[]},
+		      {return_group_result,failed}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_1,
+		     {failed,{error,{{badmatch,2},'_'}}}}},
+       {?eh,test_stats,{1,1,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init,[]},
+		      {failed,{error,fails_on_purpose}}}},
+	{?eh,test_stats,{1,1,{0,1}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',fails_on_purpose}}}}}],
+       {?eh,test_stats,{1,2,{0,1}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_result_then_ok,[]},ok}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_fail_result_then_ok,[]},
+		      {return_group_result,failed}}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_any_ok_1,
+		      [{repeat_until_any_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_any_ok_1,
+		      [{repeat_until_any_ok,2}]},ok}},
+       %% ...
+       {?eh,test_stats,{3,4,{0,2}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_result_then_ok,[]},ok}},
+         {?eh,test_stats,{4,4,{0,2}}},
+        {?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_fail_result_then_ok,[]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_gr_until_any_ok_1,
+		     [{repeat_until_any_ok,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_any_ok_2,
+		      [{repeat_until_any_ok,3}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_fail_result,[]},
+		      {return_group_result,failed}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_1,
+		     {failed,{error,{{badmatch,2},'_'}}}}},
+       {?eh,test_stats,{5,5,{0,2}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{5,6,{0,2}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init,[]},
+		      {failed,{error,fails_on_purpose}}}},
+         {?eh,test_stats,{5,6,{0,3}}},
+         {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			    {failed,{repeat_1_SUITE,init_per_group,
+				     {'EXIT',fails_on_purpose}}}}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_any_ok_2,
+		      [{repeat_until_any_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_any_ok_2,
+		      [{repeat_until_any_ok,2}]},ok}},
+        {?eh,test_stats,{6,7,{0,3}}},
+        {?eh,tc_start,{repeat_1_SUITE,tc_fail_then_ok_1}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,ok}},
+        {?eh,test_stats,{7,7,{0,3}}},
+        [{?eh,tc_done,{repeat_1_SUITE,
+		       {init_per_group,gr_fail_init,[]},
+		       {failed,{error,fails_on_purpose}}}},
+	 {?eh,test_stats,{7,7,{0,4}}},
+	 {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			    {failed,{repeat_1_SUITE,init_per_group,
+				     {'EXIT',fails_on_purpose}}}}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_any_ok_2,
+		      [{repeat_until_any_ok,2}]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_gr_until_any_ok,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_cs_until_any_fail) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     {?eh,tc_start,{repeat_1_SUITE,init_per_suite}},
+     {?eh,tc_done,{repeat_1_SUITE,init_per_suite,ok}},
+     [{?eh,tc_start,
+       {repeat_1_SUITE,{init_per_group,repeat_cs_until_any_fail,[]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,{init_per_group,repeat_cs_until_any_fail,[]},ok}},
+      [{?eh,tc_start,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,3}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,3}]},
+	 ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{2,0,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+       {?eh,test_stats,{3,0,{0,0}}},
+       {?eh,tc_start,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,3}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,3}]},
+	 ok}}],
+      [{?eh,tc_start,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,2}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,2}]},
+	 ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{4,0,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{5,0,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+       {?eh,tc_done,
+	{repeat_1_SUITE,tc_ok_then_fail_1,
+	 {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{5,1,{0,0}}},
+       {?eh,tc_start,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,2}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_1,
+	  [{repeat_until_any_fail,2}]},
+	 ok}}],
+      [{?eh,tc_start,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_2,
+	  [{repeat_until_any_fail,3}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {init_per_group,repeat_cs_until_any_fail_2,
+	  [{repeat_until_any_fail,3}]},
+	 ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,tc_done,
+	{repeat_1_SUITE,tc_fail_1,
+	 {failed,
+	  {error,
+	   {{badmatch,2},
+	    [{repeat_1_SUITE,tc_fail_1,1},
+	     {repeat_1_SUITE,tc_fail_1,1},
+	     {test_server,my_apply,3},
+	     {test_server,ts_tc,3},
+	     {test_server,run_test_case_eval1,6},
+	     {test_server,run_test_case_eval,8}]}}}}},
+       {?eh,test_stats,{5,2,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_2}},
+       {?eh,tc_done,
+	{repeat_1_SUITE,tc_fail_2,{failed,{error,exit_on_purpose}}}},
+       {?eh,test_stats,{5,3,{0,0}}},
+       {?eh,tc_start,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_2,
+	  [{repeat_until_any_fail,3}]}}},
+       {?eh,tc_done,
+        {repeat_1_SUITE,
+	 {end_per_group,repeat_cs_until_any_fail_2,
+	  [{repeat_until_any_fail,3}]},
+	 ok}}],
+      {?eh,tc_start,
+       {repeat_1_SUITE,{end_per_group,repeat_cs_until_any_fail,[]}}},
+      {?eh,tc_done,
+       {repeat_1_SUITE,{end_per_group,repeat_cs_until_any_fail,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,end_per_suite}},
+     {?eh,tc_done,{repeat_1_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_gr_until_any_fail) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+ {?eh,start_info,{1,1,unknown}},
+ {?eh,tc_start,{repeat_1_SUITE,init_per_suite}},
+ {?eh,tc_done,{repeat_1_SUITE,init_per_suite,ok}},
+ [{?eh,tc_start,
+      {repeat_1_SUITE,{init_per_group,repeat_gr_until_any_fail,[]}}},
+  {?eh,tc_done,
+      {repeat_1_SUITE,{init_per_group,repeat_gr_until_any_fail,[]},ok}},
+   [{?eh,tc_start,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,3}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,3}]},
+            ok}},
+     [{?eh,tc_start,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+      {?eh,tc_start,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     [{?eh,tc_start,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_result,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_result,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{3,0,{0,0}}},
+      {?eh,tc_start,
+          {repeat_1_SUITE,{end_per_group,gr_ok_then_fail_result,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,{end_per_group,gr_ok_then_fail_result,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+     {?eh,test_stats,{4,0,{0,0}}},
+    {?eh,tc_start,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,3}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,3}]},
+            ok}}],
+   [{?eh,tc_start,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,2}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,2}]},
+            ok}},
+     [{?eh,tc_start,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{5,0,{0,0}}},
+      {?eh,tc_start,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+     {?eh,test_stats,{6,0,{0,0}}},
+     [{?eh,tc_start,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_result,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_result,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{7,0,{0,0}}},
+      {?eh,tc_start,
+          {repeat_1_SUITE,{end_per_group,gr_ok_then_fail_result,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,
+              {end_per_group,gr_ok_then_fail_result,[]},
+              {return_group_result,failed}}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+     {?eh,test_stats,{8,0,{0,0}}},
+    {?eh,tc_start,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,2}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_1,
+                [{repeat_until_any_fail,2}]},
+            ok}}],
+   [{?eh,tc_start,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,3}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,3}]},
+            ok}},
+     [{?eh,tc_start,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{9,0,{0,0}}},
+      {?eh,tc_start,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+     {?eh,test_stats,{10,0,{0,0}}},
+     [{?eh,tc_start,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_init,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_init,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{11,0,{0,0}}},
+      {?eh,tc_start,
+          {repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+     {?eh,test_stats,{12,0,{0,0}}},
+    {?eh,tc_start,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,3}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {end_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,3}]},
+            ok}}],
+   [{?eh,tc_start,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,2}]}}},
+    {?eh,tc_done,
+        {repeat_1_SUITE,
+            {init_per_group,repeat_gr_until_any_fail_2,
+                [{repeat_until_any_fail,2}]},
+            ok}},
+     [{?eh,tc_start,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{13,0,{0,0}}},
+      {?eh,tc_start,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+      {?eh,tc_done,
+                          {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+     {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+     {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+     {?eh,test_stats,{14,0,{0,0}}},
+     [{?eh,tc_start,
+          {repeat_1_SUITE,{init_per_group,gr_ok_then_fail_init,[]}}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,
+              {init_per_group,gr_ok_then_fail_init,[]},
+              {failed,{error,failing_this_time}}}},
+       {?eh,tc_auto_skip,
+           {repeat_1_SUITE,tc_ok_1,
+               {failed,
+                   {repeat_1_SUITE,init_per_group,
+                       {'EXIT',failing_this_time}}}}},
+       {?eh,test_stats,{14,0,{0,1}}},
+       {?eh,tc_auto_skip,
+           {repeat_1_SUITE,end_per_group,
+               {failed,
+                   {repeat_1_SUITE,init_per_group,
+                       {'EXIT',failing_this_time}}}}}],
+      {?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+      {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+      {?eh,test_stats,{15,0,{0,1}}},
+     {?eh,tc_start,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_2,
+                 [{repeat_until_any_fail,2}]}}},
+     {?eh,tc_done,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_2,
+                 [{repeat_until_any_fail,2}]},
+             ok}}],
+    [{?eh,tc_start,
+         {repeat_1_SUITE,
+             {init_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,3}]}}},
+     {?eh,tc_done,
+         {repeat_1_SUITE,
+             {init_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,3}]},
+             ok}},
+      {?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+      {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+      {?eh,test_stats,{16,0,{0,1}}},
+      [{?eh,tc_start,
+                           {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+       {?eh,tc_done,
+                           {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+        {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+        {?eh,test_stats,{17,0,{0,1}}},
+       {?eh,tc_start,
+                           {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+       {?eh,tc_done,
+                           {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+      {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+      {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+      {?eh,test_stats,{18,0,{0,1}}},
+     {?eh,tc_start,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,3}]}}},
+     {?eh,tc_done,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,3}]},
+             ok}}],
+    [{?eh,tc_start,
+         {repeat_1_SUITE,
+             {init_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,2}]}}},
+     {?eh,tc_done,
+         {repeat_1_SUITE,
+             {init_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,2}]},
+             ok}},
+      {?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+      {?eh,tc_done,
+          {repeat_1_SUITE,tc_ok_then_fail_1,
+              {failed,{error,failing_this_time}}}},
+      {?eh,test_stats,{18,1,{0,1}}},
+      [{?eh,tc_start,
+                           {repeat_1_SUITE,{init_per_group,gr_ok_1,[]}}},
+       {?eh,tc_done,
+                           {repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+        {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+        {?eh,test_stats,{19,1,{0,1}}},
+       {?eh,tc_start,
+                           {repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+       {?eh,tc_done,
+                           {repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+      {?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+      {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+      {?eh,test_stats,{20,1,{0,1}}},
+     {?eh,tc_start,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,2}]}}},
+     {?eh,tc_done,
+         {repeat_1_SUITE,
+             {end_per_group,repeat_gr_until_any_fail_3,
+                 [{repeat_until_any_fail,2}]},
+             ok}}],
+   {?eh,tc_start,
+       {repeat_1_SUITE,{end_per_group,repeat_gr_until_any_fail,[]}}},
+   {?eh,tc_done,
+       {repeat_1_SUITE,{end_per_group,repeat_gr_until_any_fail,[]},ok}}],
+  {?eh,tc_start,{repeat_1_SUITE,end_per_suite}},
+  {?eh,tc_done,{repeat_1_SUITE,end_per_suite,ok}},
+  {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_cs_until_all_ok) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,repeat_cs_until_all_ok,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_ok_1,
+		      [{repeat_until_all_ok,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{0,1,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{1,1,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_2,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{1,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_ok_1,
+		      [{repeat_until_all_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_ok_1,
+		      [{repeat_until_all_ok,2}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,ok}},
+       {?eh,test_stats,{2,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{3,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_2,ok}},
+       {?eh,test_stats,{4,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_ok_1,
+		      [{repeat_until_all_ok,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_ok_2,
+		      [{repeat_until_all_ok,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{6,2,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_ok_2,
+		      [{repeat_until_all_ok,3}]},ok}}],
+
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_cs_until_all_ok,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_gr_until_all_ok) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_gr_until_all_ok,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_1,
+		      [{repeat_until_all_ok,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	{?eh,test_stats,{2,0,{0,0}}},
+	{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{2,1,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_result_then_ok,[]},ok}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	{?eh,test_stats,{3,1,{0,0}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_fail_result_then_ok,[]},
+		      {return_group_result,failed}}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_ok_1,
+		      [{repeat_until_all_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_1,
+		      [{repeat_until_all_ok,2}]},ok}},
+       {?eh,test_stats,{5,1,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,ok}},
+       {?eh,test_stats,{6,1,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_result_then_ok,[]},ok}},
+	{?eh,test_stats,{7,1,{0,0}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_fail_result_then_ok,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_ok_1,
+		      [{repeat_until_all_ok,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_2,
+		      [{repeat_until_all_ok,3}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init_then_ok,[]},
+		      {failed,{error,failing_this_time}}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',failing_this_time}}}}},
+	{?eh,test_stats,{7,1,{0,1}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',failing_this_time}}}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{8,1,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_ok_2,
+		      [{repeat_until_all_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_2,
+		      [{repeat_until_all_ok,2}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init_then_ok,[]},ok}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+        {?eh,test_stats,{9,1,{0,1}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_fail_init_then_ok,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{10,1,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_ok_2,
+		      [{repeat_until_all_ok,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_3,
+		      [{repeat_until_all_ok,3}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+        {?eh,test_stats,{11,1,{0,1}}},
+	{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{11,2,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_ok_3,
+		      [{repeat_until_all_ok,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_ok_3,
+		      [{repeat_until_all_ok,2}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_ok_1,[]},ok}},
+        {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+        {?eh,test_stats,{12,2,{0,1}}},
+	{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_then_ok_1,ok}},
+       {?eh,test_stats,{13,2,{0,1}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_ok_3,
+		      [{repeat_until_all_ok,2}]},ok}}],
+
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_gr_until_all_ok,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_cs_until_all_fail) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_cs_until_all_fail,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_fail_1,
+		      [{repeat_until_all_fail,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{1,1,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_2,ok}},
+       {?eh,test_stats,{2,1,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_fail_1,
+		      [{repeat_until_all_fail,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_fail_1,
+		      [{repeat_until_all_fail,2}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{2,2,{0,0}}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{2,3,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_2,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{2,4,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_fail_1,
+		      [{repeat_until_all_fail,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_cs_until_all_fail_2,
+		      [{repeat_until_all_fail,3}]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{2,5,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_cs_until_all_fail_2,
+		      [{repeat_until_all_fail,3}]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_cs_until_all_fail,[]},ok}}],
+
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_gr_until_all_fail) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_gr_until_all_fail,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_fail_1,
+		      [{repeat_until_all_fail,3}]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{0,1,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init,[]},
+		      {failed,{error,fails_on_purpose}}}},
+	{?eh,test_stats,{0,1,{0,1}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',fails_on_purpose}}}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+       {?eh,test_stats,{1,1,{0,1}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,
+				      gr_ok_then_fail_result,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_fail_1,
+		      [{repeat_until_all_fail,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_fail_1,
+		      [{repeat_until_all_fail,2}]},ok}},
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{2,2,{0,1}}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_fail_init,[]},
+		      {failed,{error,fails_on_purpose}}}},
+        {?eh,test_stats,{2,2,{0,2}}},
+        {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',fails_on_purpose}}}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{2,3,{0,2}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,
+				      gr_ok_then_fail_result,[]},ok}},
+	{?eh,test_stats,{3,3,{0,2}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_ok_then_fail_result,[]},
+		      {return_group_result,failed}}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_fail_1,
+		      [{repeat_until_all_fail,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_fail_2,
+		      [{repeat_until_all_fail,3}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init,[]},ok}}],
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{4,4,{0,2}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_fail_2,
+		      [{repeat_until_all_fail,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_fail_2,
+		      [{repeat_until_all_fail,2}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_ok_then_fail_init,[]},
+		      {failed,{error,failing_this_time}}}},
+	{?eh,test_stats,{4,4,{0,3}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',failing_this_time}}}}}],
+       {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
+       {?eh,test_stats,{4,5,{0,3}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_fail_2,
+		      [{repeat_until_all_fail,2}]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_fail_3,
+		      [{repeat_until_all_fail,3}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_fail_result,[]},
+		      {return_group_result,failed}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+       {?eh,test_stats,{6,5,{0,3}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_fail_3,
+		      [{repeat_until_all_fail,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_gr_until_all_fail_3,
+		      [{repeat_until_all_fail,2}]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_fail_result,[]},
+		      {return_group_result,failed}}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{7,6,{0,3}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_gr_until_all_fail_3,
+		      [{repeat_until_all_fail,2}]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_gr_until_all_fail,[]},ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+test_events(repeat_seq_until_any_fail) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_seq_until_any_fail,[]},ok}},
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_1,
+		      [sequence,{repeat_until_any_fail,2}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{2,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_1,
+		      [sequence,{repeat_until_any_fail,2}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,
+		      repeat_seq_until_any_fail_1,[sequence]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{4,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,
+		      repeat_seq_until_any_fail_1,[sequence]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_2,
+		      [{repeat_until_any_fail,2},sequence]},ok}},
+       {?eh,test_stats,{5,0,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,test_stats,{7,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_2,
+		      [{repeat_until_any_fail,2},sequence]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_2,[sequence]},
+		     ok}},
+       {?eh,test_stats,{8,0,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,test_stats,{10,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_2,[sequence]},
+		     ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_3,
+		      [sequence,{repeat_until_any_fail,3}]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{11,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+       {?eh,test_stats,{12,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+       {?eh,test_stats,{13,0,{0,0}}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_3,
+		      [sequence,{repeat_until_any_fail,3}]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_3,
+		      [{repeat_until_any_fail,2},sequence]},ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{15,0,{0,0}}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
+		     {failed,{error,failing_this_time}}}},
+       {?eh,test_stats,{15,1,{0,0}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+			  {failed,{repeat_1_SUITE,tc_ok_then_fail_1}}}},
+       {?eh,test_stats,{15,1,{0,1}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {failed,{repeat_1_SUITE,tc_ok_then_fail_1}}}},
+       {?eh,test_stats,{15,1,{0,2}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_3,
+		      [{repeat_until_any_fail,2},sequence]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_4,
+		      [{repeat_until_any_fail,3},sequence]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,
+				      gr_ok_then_fail_result,[]},ok}}],
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{18,1,{0,2}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_4,
+		      [{repeat_until_any_fail,3},sequence]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_4,
+		      [{repeat_until_any_fail,2},sequence]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,gr_ok_then_fail_result,[]},
+		      {return_group_result,failed}}}],
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {group_result,gr_ok_then_fail_result,failed}}},
+       {?eh,test_stats,{19,1,{0,3}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {group_result,gr_ok_then_fail_result,failed}}},
+       {?eh,test_stats,{19,1,{0,4}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_4,
+		      [{repeat_until_any_fail,2},sequence]},ok}}],
+
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_5,
+		      [{repeat_until_any_fail,3},sequence]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init,[]},ok}}],
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_2,[]},ok}}],
+       {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+       {?eh,test_stats,{23,1,{0,4}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_5,
+		      [{repeat_until_any_fail,3},sequence]},ok}}],
+      [{?eh,tc_done,{repeat_1_SUITE,
+		     {init_per_group,repeat_seq_until_any_fail_5,
+		      [{repeat_until_any_fail,2},sequence]},ok}},
+       [{?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+       [{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,gr_ok_then_fail_init,[]},
+		      {failed,{error,failing_this_time}}}},
+	{?eh,test_stats,{24,1,{0,5}}},
+	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			   {failed,{repeat_1_SUITE,init_per_group,
+				    {'EXIT',failing_this_time}}}}}],
+       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			  {group_result,gr_ok_then_fail_init,failed}}},
+       {?eh,test_stats,{24,1,{0,6}}},
+      {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+			 {group_result,gr_ok_then_fail_init,failed}}},
+       {?eh,test_stats,{24,1,{0,7}}},
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_seq_until_any_fail_5,
+		      [{repeat_until_any_fail,2},sequence]},ok}}],
+      {?eh,tc_done,{repeat_1_SUITE,
+		    {end_per_group,repeat_seq_until_any_fail,[]},ok}}],
+
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}];
+
+%%! Note that when testing shuffled groups, ct_test_support expects
+%%! both the start and done event for cases and init/end_per_group
+test_events(repeat_shuffled_seq_until_any_fail) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+
+     [{?eh,tc_done,{repeat_1_SUITE,
+		    {init_per_group,repeat_shuffled_seq_until_any_fail,[]},
+		    ok}},
+
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		       {init_per_group,repeat_shuffled_seq_until_any_fail_1,
+			[{shuffle,'_'},sequence,
+			 {repeat_until_any_fail,2}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_1,
+		       [{shuffle,'_'},sequence,
+			{repeat_until_any_fail,2}]},ok}},
+	{?eh,test_stats,{2,0,{0,0}}},
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_1,
+			[sequence,shuffle,{repeat_until_any_fail,2}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_1,
+		       [sequence,shuffle,{repeat_until_any_fail,2}]},ok}}]},
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		       {init_per_group,repeat_shuffled_seq_until_any_fail_1,
+			[{shuffle,'_'},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_1,
+		       [{shuffle,'_'},sequence]},ok}},
+	{?eh,test_stats,{4,0,{0,0}}},
+	{?eh,tc_start,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_1,
+		       [{shuffle,repeated},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_1,
+		       [{shuffle,repeated},sequence]},ok}}]},
+
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_2,
+		       [{shuffle,{1,2,3}},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_2,
+		       [{shuffle,{1,2,3}},{repeat_until_any_fail,2},sequence]},
+		      ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+	{?eh,test_stats,{7,0,{0,0}}},
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_2,
+			[{repeat_until_any_fail,2},{shuffle,{1,2,3}},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_2,
+		       [{repeat_until_any_fail,2},{shuffle,{1,2,3}},sequence]},
+		      ok}}]},
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		       {init_per_group,repeat_shuffled_seq_until_any_fail_2,
+			[{shuffle,'_'},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_2,
+		       [{shuffle,'_'},sequence]},ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_2,
+			[{shuffle,repeated},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_2,
+		       [{shuffle,repeated},sequence]},ok}}]},
+
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,'_'},sequence,
+			{repeat_until_any_fail,3}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,'_'},sequence,
+			{repeat_until_any_fail,3}]},ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_2}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_2,ok}},
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+	{?eh,test_stats,{14,0,{0,0}}},
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_3,
+			[shuffle,sequence,{repeat_until_any_fail,3}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [shuffle,sequence,{repeat_until_any_fail,3}]},ok}}]},
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,'_'},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,'_'},{repeat_until_any_fail,2},sequence]},
+		      ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_then_fail_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
+		      {failed,{error,failing_this_time}}}},
+	{?eh,tc_start,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,repeated},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_3,
+		       [{shuffle,repeated},{repeat_until_any_fail,2},sequence]},
+		      ok}}]},
+
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_4,
+		       [{shuffle,{1,2,3}},{repeat_until_any_fail,3},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_4,
+		       [{shuffle,{1,2,3}},{repeat_until_any_fail,3},sequence]},
+		      ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,
+					gr_ok_then_fail_result,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,
+				       gr_ok_then_fail_result,[]},ok}}],
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_4,
+			[{repeat_until_any_fail,3},sequence,{shuffle,{1,2,3}}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_4,
+		       [{repeat_until_any_fail,3},sequence,{shuffle,{1,2,3}}]},
+		      ok}}]},
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		       {init_per_group,repeat_shuffled_seq_until_any_fail_4,
+			[{shuffle,'_'},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_4,
+		       [{shuffle,'_'},{repeat_until_any_fail,2},sequence]},
+		      ok}},
+	[{?eh,tc_start,{repeat_1_SUITE,
+			{end_per_group,gr_ok_then_fail_result,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,
+		       {end_per_group,gr_ok_then_fail_result,[]},
+		       {return_group_result,failed}}}],
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_4,
+			[{shuffle,repeated},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_4,
+		       [{shuffle,repeated},{repeat_until_any_fail,2},sequence]},
+		      ok}}]},
+
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		       {init_per_group,repeat_shuffled_seq_until_any_fail_5,
+			[{shuffle,{1,2,3}},{repeat_until_any_fail,3},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_5,
+		       [{shuffle,{1,2,3}},{repeat_until_any_fail,3},sequence]},
+		      ok}},
+	{?eh,tc_start,{repeat_1_SUITE,tc_ok_1}},
+	{?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_1,[]},ok}}],
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,gr_ok_2,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,gr_ok_2,[]},ok}}],
+	[{?eh,tc_start,{repeat_1_SUITE,{end_per_group,
+					gr_ok_then_fail_init,[]}}},
+	 {?eh,tc_done,{repeat_1_SUITE,{end_per_group,
+				       gr_ok_then_fail_init,[]},ok}}],
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_5,
+			[{repeat_until_any_fail,3},sequence,{shuffle,{1,2,3}}]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_5,
+		       [{repeat_until_any_fail,3},sequence,{shuffle,{1,2,3}}]},
+		      ok}}]},
+      {shuffle,
+       [{?eh,tc_start,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_5,
+		       [{shuffle,'_'},{repeat_until_any_fail,2},
+			sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {init_per_group,repeat_shuffled_seq_until_any_fail_5,
+		       [{shuffle,'_'},{repeat_until_any_fail,2},
+			sequence]},ok}},
+	[{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+			    {failed,{repeat_1_SUITE,init_per_group,
+				     {'EXIT',failing_this_time}}}}}],
+	{?eh,tc_start,{repeat_1_SUITE,
+		       {end_per_group,repeat_shuffled_seq_until_any_fail_5,
+			[{shuffle,repeated},{repeat_until_any_fail,2},sequence]}}},
+	{?eh,tc_done,{repeat_1_SUITE,
+		      {end_per_group,repeat_shuffled_seq_until_any_fail_5,
+		       [{shuffle,repeated},{repeat_until_any_fail,2},sequence]},
+		      ok}}]},
+
+       {?eh,tc_done,{repeat_1_SUITE,
+		     {end_per_group,repeat_shuffled_seq_until_any_fail,[]},
+		     ok}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}].
diff --git a/lib/common_test/test/ct_repeat_1_SUITE_data/repeat_1_SUITE.erl b/lib/common_test/test/ct_repeat_1_SUITE_data/repeat_1_SUITE.erl
new file mode 100644
index 0000000000..fb8d31edd4
--- /dev/null
+++ b/lib/common_test/test/ct_repeat_1_SUITE_data/repeat_1_SUITE.erl
@@ -0,0 +1,373 @@
+%%%-------------------------------------------------------------------
+%%% @author Peter Andersson <[email protected]>
+%%% @copyright (C) 2010, Peter Andersson
+%%% @doc
+%%%
+%%% @end
+%%% Created : 11 Aug 2010 by Peter Andersson <[email protected]>
+%%%-------------------------------------------------------------------
+-module(repeat_1_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% @spec suite() -> Info
+%% Info = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+%%--------------------------------------------------------------------
+%% @spec init_per_suite(Config0) ->
+%%     Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    spawn(fun() -> db() end),
+    Config.
+%%--------------------------------------------------------------------
+%% @spec end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    db(stop, ok),
+    ok.
+
+db() ->
+    register(?MODULE, self()),
+    db_loop([]).
+
+db_loop(Dict) ->
+    receive
+	{insert,From,Key,Val} ->
+	    From ! {?MODULE,ok},
+	    db_loop([{Key,Val} | proplists:delete(Key, Dict)]);
+	{lookup,From,Key}  ->
+	    From ! {?MODULE,proplists:get_value(Key, Dict)},
+	    db_loop(Dict);
+	{delete,From,Key} ->
+	    From ! {?MODULE,ok},
+	    db_loop(proplists:delete(Key, Dict));
+	{stop,From,_} ->
+	    From ! {?MODULE,ok}
+    end.
+
+ db(Op, Key, Val) ->
+    ?MODULE ! {Op,self(),Key,Val},
+    receive {?MODULE,Result} -> Result end.
+
+ db(Op, Key) ->
+    ?MODULE ! {Op,self(),Key},
+    receive {?MODULE,Result} -> Result end.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_group(G, Config) when G == gr_ok_1 ; G == gr_ok_2 ;
+			       G == gr_fail_result;
+			       G == gr_ok_then_fail_result ->
+    ct:comment(G),
+    Config;
+
+init_per_group(G, _Config) when G == gr_fail_init ->
+    ct:comment(G),
+    exit(fails_on_purpose);
+
+init_per_group(G, Config) when G == gr_ok_then_fail_init ->
+    ct:comment(G),
+    do_2nd_time(G,
+		fun() -> exit(failing_this_time) end,
+		fun() -> Config end);
+
+init_per_group(G, Config) when G == gr_fail_init_then_ok ->
+    ct:comment(G),
+    do_2nd_time(G,
+		fun() -> Config end,
+		fun() -> exit(failing_this_time) end);
+
+init_per_group(G, Config) ->
+    ct:comment(G),
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_group(G, _Config) when G == gr_fail_result ->
+    ct:comment(G),
+    {return_group_result,failed};
+
+end_per_group(G, _Config) when G == gr_ok_then_fail_result ->
+    ct:comment(G),
+    do_2nd_time(G,
+		fun() -> {return_group_result,failed} end,
+		fun() -> ok end);
+
+end_per_group(G, _Config) when G == gr_fail_result_then_ok ->
+    ct:comment(G),
+    do_2nd_time(G,
+		fun() -> ok end,
+		fun() -> {return_group_result,failed} end);
+
+end_per_group(G, _Config) ->
+    ct:comment(G),
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1} | {fail,Reason}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%% @end
+%%--------------------------------------------------------------------
+groups() ->
+    [
+     %%---------------------------------------------------------------
+     {repeat_cs, [], [{group,repeat_cs_0},
+		      {group,repeat_cs_1},
+		      {group,repeat_cs_2}]},
+     {repeat_cs_0, [{repeat,0}], [tc_ok_1,tc_ok_2]},
+     {repeat_cs_1, [{repeat,1}], [tc_ok_1,tc_ok_2]},
+     {repeat_cs_2, [{repeat,2}], [tc_ok_1,tc_ok_2]},
+
+     {repeat_cs_and_grs, [{repeat,2}], [{group,gr_ok_1},tc_fail_1,
+					{group,gr_fail_result},tc_ok_1,
+					{group,gr_fail_init},tc_ok_2]},
+
+     %%---------------------------------------------------------------
+     {repeat_seq, [], [{group,repeat_seq_1},
+		       {group,repeat_seq_2},
+		       {group,repeat_seq_3},
+		       {group,repeat_seq_4}]},
+     {repeat_seq_1, [sequence,{repeat,2}], [tc_ok_1,tc_fail_1,tc_ok_2]},
+     {repeat_seq_2, [sequence,{repeat,2}], [tc_ok_1,{group,gr_fail_result},tc_ok_2]},
+     {repeat_seq_3, [sequence,{repeat,2}], [tc_ok_1,{group,gr_fail_init},tc_ok_2]},
+     {repeat_seq_4, [sequence,{repeat,2}], [tc_fail_1,{group,gr_ok_1},tc_ok_1]},
+
+     %%---------------------------------------------------------------
+     {repeat_cs_until_any_ok, [], [{group,repeat_cs_until_any_ok_1},
+				   {group,repeat_cs_until_any_ok_2}]},
+     {repeat_cs_until_any_ok_1, [{repeat_until_any_ok,3}], [tc_fail_1,
+							    tc_fail_2,
+							    tc_fail_then_ok_1]},
+     {repeat_cs_until_any_ok_2, [{repeat_until_any_ok,3}], [tc_ok_1,tc_fail_1]},
+
+     %%---------------------------------------------------------------
+     {repeat_gr_until_any_ok, [], [{group,repeat_gr_until_any_ok_1},
+				   {group,repeat_gr_until_any_ok_2}]},
+     {repeat_gr_until_any_ok_1, [{repeat_until_any_ok,3}],
+      [{group,gr_fail_result}, tc_fail_1, {group,gr_fail_init}, tc_fail_2,
+       {group,gr_fail_result_then_ok}]},
+     {repeat_gr_until_any_ok_2, [{repeat_until_any_ok,3}],
+      [{group,gr_fail_result}, tc_fail_1, tc_fail_then_ok_1,
+       {group,gr_fail_init}]},
+
+     %%---------------------------------------------------------------
+     {repeat_cs_until_any_fail, [], [{group,repeat_cs_until_any_fail_1},
+				     {group,repeat_cs_until_any_fail_2}]},
+     {repeat_cs_until_any_fail_1, [{repeat_until_any_fail,3}], [tc_ok_1,
+								tc_ok_2,
+								tc_ok_then_fail_1]},
+     {repeat_cs_until_any_fail_2, [{repeat_until_any_fail,3}], [tc_fail_1,tc_fail_2]},
+
+     %%---------------------------------------------------------------
+     {repeat_gr_until_any_fail, [], [{group,repeat_gr_until_any_fail_1},
+				     {group,repeat_gr_until_any_fail_2},
+				     {group,repeat_gr_until_any_fail_3}]},
+     {repeat_gr_until_any_fail_1, [{repeat_until_any_fail,3}],
+      [{group,gr_ok_1}, tc_ok_1, {group,gr_ok_then_fail_result}, tc_ok_2]},
+     {repeat_gr_until_any_fail_2, [{repeat_until_any_fail,3}],
+      [{group,gr_ok_1}, tc_ok_1, {group,gr_ok_then_fail_init}, tc_ok_2]},
+     {repeat_gr_until_any_fail_3, [{repeat_until_any_fail,3}], [tc_ok_then_fail_1,
+								{group,gr_ok_1},
+								tc_ok_1]},
+
+     %%---------------------------------------------------------------
+     {repeat_cs_until_all_ok, [], [{group,repeat_cs_until_all_ok_1},
+				   {group,repeat_cs_until_all_ok_2}]},
+     {repeat_cs_until_all_ok_1, [{repeat_until_all_ok,3}], [tc_fail_then_ok_1,
+							    tc_ok_1,
+							    tc_fail_then_ok_2]},
+     {repeat_cs_until_all_ok_2, [{repeat_until_all_ok,3}], [tc_ok_1,tc_ok_2]},
+
+     %%---------------------------------------------------------------
+     {repeat_gr_until_all_ok, [], [{group,repeat_gr_until_all_ok_1},
+				   {group,repeat_gr_until_all_ok_2},
+				   {group,repeat_gr_until_all_ok_3}]},
+     {repeat_gr_until_all_ok_1, [{repeat_until_all_ok,3}],
+      [tc_ok_1, {group,gr_ok_1}, tc_fail_then_ok_1, {group,gr_fail_result_then_ok}]},
+     {repeat_gr_until_all_ok_2, [{repeat_until_all_ok,3}],
+      [{group,gr_fail_init_then_ok}, tc_ok_1]},
+     {repeat_gr_until_all_ok_3, [{repeat_until_all_ok,3}],
+      [{group,gr_ok_1}, tc_fail_then_ok_1]},
+
+     %%---------------------------------------------------------------
+     {repeat_cs_until_all_fail, [], [{group,repeat_cs_until_all_fail_1},
+				     {group,repeat_cs_until_all_fail_2}]},
+     {repeat_cs_until_all_fail_1, [{repeat_until_all_fail,3}], [tc_ok_then_fail_1,
+								tc_fail_1,
+								tc_ok_then_fail_2]},
+     {repeat_cs_until_all_fail_2, [{repeat_until_all_fail,3}], [tc_fail_1]},
+
+     %%---------------------------------------------------------------
+     {repeat_gr_until_all_fail, [], [{group,repeat_gr_until_all_fail_1},
+				     {group,repeat_gr_until_all_fail_2},
+				     {group,repeat_gr_until_all_fail_3}]},
+     {repeat_gr_until_all_fail_1, [{repeat_until_all_fail,3}],
+      [tc_fail_1, {group,gr_fail_init}, tc_ok_then_fail_1, {group,gr_ok_then_fail_result}]},
+     {repeat_gr_until_all_fail_2, [{repeat_until_all_fail,3}],
+      [{group,gr_ok_then_fail_init}, tc_fail_1]},
+     {repeat_gr_until_all_fail_3, [{repeat_until_all_fail,3}],
+      [{group,gr_fail_result}, tc_ok_then_fail_1]},
+
+     %%---------------------------------------------------------------
+     {repeat_seq_until_any_fail, [], [{group,repeat_seq_until_any_fail_1},
+				      {group,repeat_seq_until_any_fail_2},
+				      {group,repeat_seq_until_any_fail_3},
+				      {group,repeat_seq_until_any_fail_4},
+				      {group,repeat_seq_until_any_fail_5}]},
+     {repeat_seq_until_any_fail_1, [sequence,{repeat_until_any_fail,2}],
+      [tc_ok_1, tc_ok_2]},
+     {repeat_seq_until_any_fail_2, [{repeat_until_any_fail,2},sequence],
+      [tc_ok_1, {group,gr_ok_1}, tc_ok_2]},
+     {repeat_seq_until_any_fail_3, [sequence,{repeat_until_any_fail,3}],
+      [tc_ok_1, tc_ok_then_fail_1, tc_ok_2, {group,gr_ok_1}]},
+     {repeat_seq_until_any_fail_4, [{repeat_until_any_fail,3},sequence],
+      [{group,gr_ok_then_fail_result}, {group,gr_ok_1}, tc_ok_1]},
+     {repeat_seq_until_any_fail_5, [{repeat_until_any_fail,3},sequence],
+      [{group,gr_ok_1}, {group,gr_ok_then_fail_init}, {group,gr_ok_2}, tc_ok_1]},
+
+     %%---------------------------------------------------------------
+     {repeat_shuffled_seq_until_any_fail, [], [{group,repeat_shuffled_seq_until_any_fail_1},
+					       {group,repeat_shuffled_seq_until_any_fail_2},
+					       {group,repeat_shuffled_seq_until_any_fail_3},
+					       {group,repeat_shuffled_seq_until_any_fail_4},
+					       {group,repeat_shuffled_seq_until_any_fail_5}]},
+     {repeat_shuffled_seq_until_any_fail_1, [sequence,shuffle,{repeat_until_any_fail,2}],
+      [tc_ok_1, tc_ok_2]},
+     {repeat_shuffled_seq_until_any_fail_2, [{repeat_until_any_fail,2},{shuffle,{1,2,3}},sequence],
+      [tc_ok_1, {group,gr_ok_1}, tc_ok_2]},
+     {repeat_shuffled_seq_until_any_fail_3, [shuffle,sequence,{repeat_until_any_fail,3}],
+      [tc_ok_1, tc_ok_then_fail_1, tc_ok_2, {group,gr_ok_1}]},
+     {repeat_shuffled_seq_until_any_fail_4, [{repeat_until_any_fail,3},sequence,{shuffle,{1,2,3}}],
+      [{group,gr_ok_then_fail_result}, {group,gr_ok_1}, tc_ok_1]},
+     {repeat_shuffled_seq_until_any_fail_5, [{repeat_until_any_fail,3},sequence,{shuffle,{1,2,3}}],
+      [{group,gr_ok_1}, {group,gr_ok_then_fail_init}, {group,gr_ok_2}, tc_ok_1]},
+
+     %%---------------------------------------------------------------
+     {gr_ok_1, [], [tc_ok_1]},
+
+     {gr_ok_2, [], [tc_ok_1]},
+
+     {gr_fail_init, [], [tc_ok_1]},
+
+     {gr_fail_result, [], [tc_ok_1]},
+
+     {gr_ok_then_fail_init, [], [tc_ok_1]},
+
+     {gr_ok_then_fail_result, [], [tc_ok_1]},
+
+     {gr_fail_result_then_ok, [], [tc_ok_1]},
+
+     {gr_fail_init_then_ok, [], [tc_ok_1]}
+    ].
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() ->
+    [].
+
+tc_ok_1(_) ->
+    ok.
+
+tc_ok_2(_) ->
+    ok.
+
+tc_fail_1(_) ->
+    x=2.
+
+tc_fail_2(_) ->
+    exit(exit_on_purpose).
+
+tc_ok_then_fail_1(_) ->
+    do_2nd_time(tc_ok_then_fail_1,
+		fun() -> exit(failing_this_time) end,
+		fun() -> ok end),
+    ok.
+
+tc_ok_then_fail_2(_) ->
+    do_2nd_time(tc_ok_then_fail_2,
+		fun() -> exit(failing_this_time) end,
+		fun() -> ok end),
+    ok.
+
+tc_fail_then_ok_1(_) ->
+    do_2nd_time(tc_fail_then_ok_1,
+		fun() -> ok end,
+		fun() -> exit(failing_this_time) end),
+    ok.
+
+tc_fail_then_ok_2(_) ->
+    do_2nd_time(tc_fail_then_ok_2,
+		fun() -> ok end,
+		fun() -> exit(failing_this_time) end),
+    ok.
+
+do_2nd_time(Case, True, False) ->
+    case db(lookup, Case) of
+	undefined ->
+	    db(insert, Case, 1),
+	    False();
+	1 ->
+	    ct:log("This is the second call...", []),
+	    db(delete, Case),
+	    True()
+    end.
diff --git a/lib/common_test/test/ct_sequence_1_SUITE.erl b/lib/common_test/test/ct_sequence_1_SUITE.erl
new file mode 100644
index 0000000000..0876a6f8b8
--- /dev/null
+++ b/lib/common_test/test/ct_sequence_1_SUITE.erl
@@ -0,0 +1,311 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_sequence_1_SUITE
+%%%
+%%% Description:
+%%% Test sequences
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_sequence_1_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) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+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() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [subgroup_return_fail, subgroup_init_fail,
+     subgroup_after_failed_case,
+     case_after_subgroup_return_fail,
+     case_after_subgroup_fail_init].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+
+subgroup_return_fail(Config) when is_list(Config) ->
+    execute(subgroup_return_fail,
+	    "subgroups_1_SUITE", subgroup_return_fail,
+	    Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+subgroup_init_fail(Config) when is_list(Config) ->
+    execute(subgroup_init_fail,
+	    "subgroups_1_SUITE", subgroup_init_fail,
+	    Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+subgroup_after_failed_case(Config) when is_list(Config) ->
+    execute(subgroup_after_failed_case,
+	    "subgroups_1_SUITE", subgroup_after_failed_case,
+	    Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+case_after_subgroup_return_fail(Config) when is_list(Config) ->
+    execute(case_after_subgroup_return_fail,
+	    "subgroups_1_SUITE", case_after_subgroup_return_fail,
+	    Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+case_after_subgroup_fail_init(Config) when is_list(Config) ->
+    execute(case_after_subgroup_fail_init,
+	    "subgroups_1_SUITE", case_after_subgroup_fail_init,
+	    Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+execute(TestCase, SuiteName, Group, Config) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, SuiteName),
+
+    {Opts,ERPid} = setup([{suite,Suite},{group,Group},{label,TestCase}], Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(TestCase,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config)),
+
+    TestEvents = events_to_check(TestCase),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+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).
+%reformat(Events, _EH) ->
+%    Events.
+
+%%%-----------------------------------------------------------------
+%%% 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(subgroup_return_fail) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,2}},
+     [{?eh,tc_start,
+       {subgroups_1_SUITE,{init_per_group,subgroup_return_fail,[sequence]}}},
+      {?eh,tc_done,
+       {subgroups_1_SUITE,{init_per_group,subgroup_return_fail,[sequence]},ok}},
+      [{?eh,tc_start,
+	{subgroups_1_SUITE,{init_per_group,return_fail,[]}}},
+       {?eh,tc_done,
+        {subgroups_1_SUITE,{init_per_group,return_fail,[]},ok}},
+       {?eh,tc_start,{subgroups_1_SUITE,failing_tc}},
+       {?eh,tc_done,
+	{subgroups_1_SUITE,failing_tc,{failed,{error,{{badmatch,3},'_'}}}}},
+       {?eh,test_stats,{0,1,{0,0}}},
+       {?eh,tc_start,
+	{subgroups_1_SUITE,{end_per_group,return_fail,[]}}},
+       {?eh,tc_done,{subgroups_1_SUITE,{end_per_group,return_fail,[]},
+		     {return_group_result,failed}}}],
+      {?eh,tc_auto_skip,
+       {subgroups_1_SUITE,ok_tc,{group_result,return_fail,failed}}},
+      {?eh,test_stats,{0,1,{0,1}}},
+      {?eh,tc_start,
+       {subgroups_1_SUITE,{end_per_group,subgroup_return_fail,[sequence]}}},
+      {?eh,tc_done,
+       {subgroups_1_SUITE,{end_per_group,subgroup_return_fail,[sequence]},
+	{return_group_result,failed}}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(subgroup_init_fail) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,2}},
+     [{?eh,tc_start,
+       {subgroups_1_SUITE,{init_per_group,subgroup_init_fail,[sequence]}}},
+      {?eh,tc_done,
+       {subgroups_1_SUITE,{init_per_group,subgroup_init_fail,[sequence]},ok}},
+      [{?eh,tc_start,{subgroups_1_SUITE,{init_per_group,fail_init,[]}}},
+       {?eh,tc_done,{subgroups_1_SUITE,{init_per_group,fail_init,[]},
+		     {failed,{error,init_per_group_fails_on_purpose}}}},
+       {?eh,tc_auto_skip,{subgroups_1_SUITE,ok_tc,
+			  {failed,{subgroups_1_SUITE,init_per_group,
+				   {'EXIT',init_per_group_fails_on_purpose}}}}},
+       {?eh,test_stats,{0,0,{0,1}}},
+       {?eh,tc_auto_skip,{subgroups_1_SUITE,end_per_group,
+             {failed,{subgroups_1_SUITE,init_per_group,
+		      {'EXIT',init_per_group_fails_on_purpose}}}}}],
+      {?eh,tc_auto_skip,{subgroups_1_SUITE,ok_tc,{group_result,fail_init,failed}}},
+      {?eh,test_stats,{0,0,{0,2}}},
+      {?eh,tc_start,{subgroups_1_SUITE,{end_per_group,subgroup_init_fail,[sequence]}}},
+      {?eh,tc_done,{subgroups_1_SUITE,
+		    {end_per_group,subgroup_init_fail,[sequence]},
+		    {return_group_result,failed}}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(subgroup_after_failed_case) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,2}},
+     [{?eh,tc_start,{subgroups_1_SUITE,
+		     {init_per_group,subgroup_after_failed_case,[sequence]}}},
+      {?eh,tc_done,{subgroups_1_SUITE,
+		    {init_per_group,subgroup_after_failed_case,[sequence]},ok}},
+      {?eh,tc_start,{subgroups_1_SUITE,failing_tc}},
+      {?eh,tc_done,{subgroups_1_SUITE,failing_tc,{failed,{error,{{badmatch,3},'_'}}}}},
+      {?eh,test_stats,{0,1,{0,0}}},
+      {?eh,tc_auto_skip,{subgroups_1_SUITE,ok_tc,{failed,{subgroups_1_SUITE,failing_tc}}}},
+      {?eh,test_stats,{0,1,{0,1}}},
+      {?eh,tc_start,{subgroups_1_SUITE,
+		     {end_per_group,subgroup_after_failed_case,[sequence]}}},
+      {?eh,tc_done,{subgroups_1_SUITE,
+		    {end_per_group,subgroup_after_failed_case,[sequence]},
+		    {return_group_result,failed}}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+];
+
+test_events(case_after_subgroup_return_fail) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,2}},
+     [{?eh,tc_start,{subgroups_1_SUITE,
+		     {init_per_group,case_after_subgroup_return_fail,[sequence]}}},
+      {?eh,tc_done,{subgroups_1_SUITE,
+		    {init_per_group,case_after_subgroup_return_fail,[sequence]},ok}},
+      [{?eh,tc_start,{subgroups_1_SUITE,{init_per_group,return_fail,[]}}},
+       {?eh,tc_done,{subgroups_1_SUITE,{init_per_group,return_fail,[]},ok}},
+       {?eh,tc_start,{subgroups_1_SUITE,failing_tc}},
+       {?eh,tc_done,{subgroups_1_SUITE,failing_tc,{failed,{error,{{badmatch,3},'_'}}}}},
+       {?eh,test_stats,{0,1,{0,0}}},
+       {?eh,tc_start,{subgroups_1_SUITE,{end_per_group,return_fail,[]}}},
+       {?eh,tc_done,{subgroups_1_SUITE,{end_per_group,return_fail,[]},
+		     {return_group_result,failed}}}],
+      {?eh,tc_auto_skip,{subgroups_1_SUITE,ok_tc,{group_result,return_fail,failed}}},
+      {?eh,test_stats,{0,1,{0,1}}},
+      {?eh,tc_start,{subgroups_1_SUITE,
+		     {end_per_group,case_after_subgroup_return_fail,[sequence]}}},
+      {?eh,tc_done,{subgroups_1_SUITE,
+		    {end_per_group,case_after_subgroup_return_fail,[sequence]},
+		    {return_group_result,failed}}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(case_after_subgroup_fail_init) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,2}},
+     [{?eh,tc_start,{subgroups_1_SUITE,
+		     {init_per_group,case_after_subgroup_fail_init,[sequence]}}},
+      {?eh,tc_done,{subgroups_1_SUITE,
+		    {init_per_group,case_after_subgroup_fail_init,[sequence]},ok}},
+      [{?eh,tc_start,{subgroups_1_SUITE,{init_per_group,fail_init,[]}}},
+       {?eh,tc_done,{subgroups_1_SUITE,
+		     {init_per_group,fail_init,[]},
+		     {failed,{error,init_per_group_fails_on_purpose}}}},
+       {?eh,tc_auto_skip,{subgroups_1_SUITE,ok_tc,
+			  {failed,
+			   {subgroups_1_SUITE,init_per_group,
+			    {'EXIT',init_per_group_fails_on_purpose}}}}},
+       {?eh,test_stats,{0,0,{0,1}}},
+       {?eh,tc_auto_skip,{subgroups_1_SUITE,end_per_group,
+			  {failed,
+			   {subgroups_1_SUITE,init_per_group,
+			    {'EXIT',init_per_group_fails_on_purpose}}}}}],
+
+      {?eh,tc_auto_skip,
+       {subgroups_1_SUITE,ok_tc,{group_result,fail_init,failed}}},
+      {?eh,test_stats,{0,0,{0,2}}},
+      {?eh,tc_start,{subgroups_1_SUITE,
+		     {end_per_group,case_after_subgroup_fail_init,[sequence]}}},
+      {?eh,tc_done,{subgroups_1_SUITE,
+		    {end_per_group,case_after_subgroup_fail_init,[sequence]},
+		    {return_group_result,failed}}}],
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
diff --git a/lib/common_test/test/ct_sequence_1_SUITE_data/subgroups_1_SUITE.erl b/lib/common_test/test/ct_sequence_1_SUITE_data/subgroups_1_SUITE.erl
new file mode 100644
index 0000000000..741b1165c1
--- /dev/null
+++ b/lib/common_test/test/ct_sequence_1_SUITE_data/subgroups_1_SUITE.erl
@@ -0,0 +1,108 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2010. 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(subgroups_1_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+all() ->
+    [{group, subgroup_return_fail},
+     {group, subgroup_init_fail},
+     {group, subgroup_after_failed_case},
+     {group, case_after_subgroup_return_fail},
+     {group, case_after_subgroup_fail_init}].
+
+groups() ->
+    [{return_fail, [], [failing_tc]},
+     {fail_init, [], [ok_tc]},
+     {ok_group, [], [ok_tc]},
+
+     {subgroup_return_fail, [sequence], [{group, return_fail}, {group, ok_group}]},
+
+     {subgroup_init_fail, [sequence], [{group, fail_init}, {group, ok_group}]},
+
+     {subgroup_after_failed_case, [sequence], [failing_tc, {group, ok_group}]},
+
+     {case_after_subgroup_return_fail, [sequence], [{group, return_fail}, ok_tc]},
+
+     {case_after_subgroup_fail_init, [sequence], [{group, fail_init}, ok_tc]}
+    ].
+
+failed_subgroup(subgroup_return_fail) -> return_fail;
+failed_subgroup(subgroup_init_fail) -> fail_init;
+failed_subgroup(case_after_subgroup_return_fail) -> return_fail;
+failed_subgroup(case_after_subgroup_fail_init) -> fail_init;
+failed_subgroup(_) -> undefined.
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(fail_init, Config) ->
+    ct:comment(fail_init),
+    exit(init_per_group_fails_on_purpose);
+
+init_per_group(Group, Config) ->
+    ct:comment(Group),
+    [{Group,failed_subgroup(Group)} | Config].
+
+end_per_group(subgroup_after_failed_case, Config) ->
+    ct:comment(subgroup_after_failed_case),
+    Status = ?config(tc_group_result, Config),
+    [{subgroups_1_SUITE,failing_tc}] = proplists:get_value(failed, Status),
+    {return_group_result,failed};
+
+end_per_group(Group, Config) when Group == subgroup_return_fail;
+				  Group == subgroup_init_fail;
+				  Group == case_after_subgroup_return_fail;
+				  Group == case_after_subgroup_fail_init ->
+    ct:comment(Group),
+    Status = ?config(tc_group_result, Config),
+    Failed = proplists:get_value(failed, Status),
+    true = lists:member({group_result,?config(Group,Config)}, Failed),
+    {return_group_result,failed};
+
+end_per_group(return_fail, Config) ->
+    ct:comment(return_fail),
+    Status = ?config(tc_group_result, Config),
+    [{subgroups_1_SUITE,failing_tc}] = proplists:get_value(failed, Status),
+    {return_group_result,failed};
+
+end_per_group(Group, _Config) ->
+    ct:comment(Group),
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(failing_tc, Config) ->
+    {failed,_} = proplists:get_value(tc_status, Config),
+    ok;
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+failing_tc(_Config) ->
+    2=3.
+
+ok_tc(_Config) ->
+    ok.
diff --git a/lib/common_test/test/ct_skip_SUITE.erl b/lib/common_test/test/ct_skip_SUITE.erl
index 9f428723f5..2b64062e4d 100644
--- a/lib/common_test/test/ct_skip_SUITE.erl
+++ b/lib/common_test/test/ct_skip_SUITE.erl
@@ -29,7 +29,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 -define(eh, ct_test_support_eh).
@@ -56,14 +56,20 @@ init_per_testcase(TestCase, Config) ->
 end_per_testcase(TestCase, Config) ->
     ct_test_support:end_per_testcase(TestCase, Config).
 
-all(doc) -> 
-    [""];
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [auto_skip, user_skip].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
 
-all(suite) -> 
-    [
-     auto_skip,
-     user_skip
-    ].
      
 
 %%--------------------------------------------------------------------
@@ -89,14 +95,14 @@ auto_skip(Config) when is_list(Config) ->
 	     ],
 
     {Opts,ERPid} = setup({suite,Suites}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(auto_skip, 
 			       reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(auto_skip),    
+    TestEvents = events_to_check(auto_skip),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
     
 
@@ -112,14 +118,14 @@ user_skip(Config) when is_list(Config) ->
 	      Join(DataDir, "user_skip_5_SUITE")],
 
     {Opts,ERPid} = setup({suite,Suites}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(user_skip, 
 			       reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(user_skip),    
+    TestEvents = events_to_check(user_skip),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
@@ -142,6 +148,15 @@ reformat(Events, EH) ->
 %%%-----------------------------------------------------------------
 %%% 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(auto_skip) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
diff --git a/lib/common_test/test/ct_smoke_test_SUITE.erl b/lib/common_test/test/ct_smoke_test_SUITE.erl
index f1c695f614..096171f951 100644
--- a/lib/common_test/test/ct_smoke_test_SUITE.erl
+++ b/lib/common_test/test/ct_smoke_test_SUITE.erl
@@ -29,7 +29,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 -define(eh, ct_test_support_eh).
@@ -112,14 +112,22 @@ end_per_testcase(TestCase, Config) ->
 %% Description: Returns a description of the test suite (doc) and a
 %%              list of all test cases in the suite (suite).
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Run smoke tests of Common Test."];
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all(suite) -> 
-    [dir1, dir2, dir1_2,
-     suite11, suite21, suite11_21,
+all() -> 
+    [dir1, dir2, dir1_2, suite11, suite21, suite11_21,
      tc111, tc211, tc111_112].
 
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
 
 %%--------------------------------------------------------------------
 %% TEST CASES
@@ -162,7 +170,7 @@ dir1(Config) when is_list(Config) ->
 
     ERPid = ct_test_support:start_event_receiver(Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    ok = ct_test_support:run(Opts, Config),
 
     Events = ct_test_support:get_events(ERPid, Config),
 
@@ -170,7 +178,7 @@ dir1(Config) when is_list(Config) ->
 			       ct_test_support:reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(dir1),    
+    TestEvents = events_to_check(dir1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
@@ -191,7 +199,7 @@ dir2(Config) when is_list(Config) ->
 
     ERPid = ct_test_support:start_event_receiver(Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    ok = ct_test_support:run(Opts, Config),
 
     Events = ct_test_support:get_events(ERPid, Config),
     
@@ -199,7 +207,7 @@ dir2(Config) when is_list(Config) ->
 			       ct_test_support:reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(dir2),    
+    TestEvents = events_to_check(dir2),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
@@ -221,7 +229,7 @@ dir1_2(Config) when is_list(Config) ->
 
     ERPid = ct_test_support:start_event_receiver(Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    ok = ct_test_support:run(Opts, Config),
 
     Events = ct_test_support:get_events(ERPid, Config),
     
@@ -229,7 +237,7 @@ dir1_2(Config) when is_list(Config) ->
 			       ct_test_support:reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(dir1_2),    
+    TestEvents = events_to_check(dir1_2),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
@@ -251,7 +259,7 @@ suite11(Config) when is_list(Config) ->
 
     ERPid = ct_test_support:start_event_receiver(Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    ok = ct_test_support:run(Opts, Config),
 
     Events = ct_test_support:get_events(ERPid, Config),
     
@@ -259,7 +267,7 @@ suite11(Config) when is_list(Config) ->
 			       ct_test_support:reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(suite11),    
+    TestEvents = events_to_check(suite11),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
@@ -280,7 +288,7 @@ suite21(Config) when is_list(Config) ->
 
     ERPid = ct_test_support:start_event_receiver(Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    ok = ct_test_support:run(Opts, Config),
 
     Events = ct_test_support:get_events(ERPid, Config),
     
@@ -288,7 +296,7 @@ suite21(Config) when is_list(Config) ->
 			       ct_test_support:reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(suite21),    
+    TestEvents = events_to_check(suite21),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
@@ -311,7 +319,7 @@ suite11_21(Config) when is_list(Config) ->
 
     ERPid = ct_test_support:start_event_receiver(Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    ok = ct_test_support:run(Opts, Config),
 
     Events = ct_test_support:get_events(ERPid, Config),
     
@@ -319,7 +327,7 @@ suite11_21(Config) when is_list(Config) ->
 			       ct_test_support:reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(suite11_21),    
+    TestEvents = events_to_check(suite11_21),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
@@ -342,7 +350,7 @@ tc111(Config) when is_list(Config) ->
 
     ERPid = ct_test_support:start_event_receiver(Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    ok = ct_test_support:run(Opts, Config),
 
     Events = ct_test_support:get_events(ERPid, Config),
     
@@ -350,7 +358,7 @@ tc111(Config) when is_list(Config) ->
 			       ct_test_support:reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(tc111),    
+    TestEvents = events_to_check(tc111),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
@@ -372,7 +380,7 @@ tc211(Config) when is_list(Config) ->
 
     ERPid = ct_test_support:start_event_receiver(Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    ok = ct_test_support:run(Opts, Config),
 
     Events = ct_test_support:get_events(ERPid, Config),
     
@@ -380,7 +388,7 @@ tc211(Config) when is_list(Config) ->
 			       ct_test_support:reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(tc211),    
+    TestEvents = events_to_check(tc211),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
@@ -403,7 +411,7 @@ tc111_112(Config) when is_list(Config) ->
 
     ERPid = ct_test_support:start_event_receiver(Config),
 
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),
+    ok = ct_test_support:run(Opts, Config),
     
     Events = ct_test_support:get_events(ERPid, Config),
     
@@ -411,7 +419,7 @@ tc111_112(Config) when is_list(Config) ->
 			       ct_test_support:reformat(Events, ?eh), 
 			       ?config(priv_dir, Config)),
 
-    TestEvents = test_events(tc111_112),    
+    TestEvents = events_to_check(tc111_112),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 
@@ -423,8 +431,16 @@ eh_opts(Config) ->
     Level = ?config(trace_level, Config),
     [{event_handler,{?eh,[{cbm,ct_test_support},{trace_level,Level}]}}].
 
+events_to_check(Test) ->
+    %% 2 tests (ct:run_test + script_start) is default
+    events_to_check(Test, 2).
+
+events_to_check(_, 0) ->
+    [];
+events_to_check(Test, N) ->
+    events(Test) ++ events_to_check(Test, N-1).
 
-test_events(Test) when Test == dir1 ; Test == dir2 ;
+events(Test) when Test == dir1 ; Test == dir2 ;
 		       Test == suite11 ; Test == suite21 ->
     Suite = if Test == dir1 ; Test == suite11 -> happy_11_SUITE;
 	       true -> happy_21_SUITE
@@ -465,7 +481,7 @@ test_events(Test) when Test == dir1 ; Test == dir2 ;
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
-test_events(Test) when Test == dir1_2 ; Test == suite11_21 ->
+events(Test) when Test == dir1_2 ; Test == suite11_21 ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
@@ -532,7 +548,7 @@ test_events(Test) when Test == dir1_2 ; Test == suite11_21 ->
      {?eh,stop_logging,[]}
     ];
 
-test_events(Test) when Test == tc111 ; Test == tc211 ->
+events(Test) when Test == tc111 ; Test == tc211 ->
     Suite = if Test == tc111 -> happy_11_SUITE; true -> happy_21_SUITE end,
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
@@ -549,7 +565,7 @@ test_events(Test) when Test == tc111 ; Test == tc211 ->
      {?eh,stop_logging,[]}
     ];
 
-test_events(tc111_112) ->    
+events(tc111_112) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
index 069f8c75fc..44c30d7a38 100644
--- a/lib/common_test/test/ct_test_server_if_1_SUITE.erl
+++ b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
@@ -29,7 +29,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 -define(eh, ct_test_support_eh).
@@ -56,13 +56,20 @@ init_per_testcase(TestCase, Config) ->
 end_per_testcase(TestCase, Config) ->
     ct_test_support:end_per_testcase(TestCase, Config).
 
-all(doc) -> 
-    [""];
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [ts_if_1].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
 
-all(suite) -> 
-    [
-     ts_if_1
-    ].
      
 
 %%--------------------------------------------------------------------
@@ -87,14 +94,14 @@ ts_if_1(Config) when is_list(Config) ->
 
     TestSpecName = ct_test_support:write_testspec(TestSpec, PrivDir, "ts_if_1_spec"),
     {Opts,ERPid} = setup({spec,TestSpecName}, Config),
-    ok = ct_test_support:run(ct, run_test, [Opts], Config),    
+    ok = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
     ct_test_support:log_events(ts_if_1, 
 			       reformat(Events, ?eh), 
 			       PrivDir),
 
-    TestEvents = test_events(ts_if_1),    
+    TestEvents = events_to_check(ts_if_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
         
 
@@ -119,6 +126,15 @@ reformat(Events, EH) ->
 %%%-----------------------------------------------------------------
 %%% 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(ts_if_1) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
@@ -193,14 +209,14 @@ test_events(ts_if_1) ->
        {?eh,tc_done,{ts_if_1_SUITE,{end_per_group,g2,[parallel]},ok}}]},
 
      {?eh,tc_start,{ts_if_1_SUITE,tc12}},
-     {?eh,tc_done,{undefined,undefined,{testcase_aborted,{abort_current_testcase,tc12},'_'}}},
+     {?eh,tc_done,{ts_if_1_SUITE,tc12,{failed,{testcase_aborted,'stopping tc12'}}}},
      {?eh,test_stats,{2,5,{3,6}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc13}},
      {?eh,tc_done,{ts_if_1_SUITE,tc13,ok}},
      {?eh,test_stats,{3,5,{3,6}}},
      {?eh,tc_start,{ts_if_1_SUITE,end_per_suite}},
      {?eh,tc_done,{ts_if_1_SUITE,end_per_suite,ok}},
-%%!
+
      {?eh,tc_start,{ts_if_2_SUITE,init_per_suite}},
      {?eh,tc_done,{ts_if_2_SUITE,init_per_suite,
 		   {failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl
index 8e90df21ce..47cea190dd 100644
--- a/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl
+++ b/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_1_SUITE.erl
@@ -93,6 +93,10 @@ init_per_testcase(_TestCase, Config) ->
 %%--------------------------------------------------------------------
 end_per_testcase(tc2, Config) ->
     timer:sleep(5000);
+end_per_testcase(tc12, Config) ->
+    ct:comment("end_per_testcase(tc12) called!"),
+    ct:pal("end_per_testcase(tc12) called!", []),
+    ok;
 end_per_testcase(_TestCase, _Config) ->
     ok.
 
@@ -180,9 +184,9 @@ gtc2(_) ->
     exit(should_have_been_skipped).
 
 tc12(_) ->
-    F = fun() -> ct:abort_current_testcase({abort_current_testcase,tc12}) end,
+    F = fun() -> ct:abort_current_testcase('stopping tc12') end,
     spawn(F),
-    timer:sleep(500),
+    timer:sleep(1000),
     exit(should_have_been_aborted).
 
 tc13(_) ->
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 6148e3280e..b4f1a0e71f 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2008-2010. 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%
 %%
 
@@ -23,12 +23,13 @@
 %%%
 -module(ct_test_support).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 -export([init_per_suite/1, init_per_suite/2, end_per_suite/1,
-	 init_per_testcase/2, end_per_testcase/2, write_testspec/3, 
-	 run/4, get_opts/1, wait_for_ct_stop/1]).
+	 init_per_testcase/2, end_per_testcase/2,
+	 write_testspec/2, write_testspec/3,
+	 run/2, run/4, get_opts/1, wait_for_ct_stop/1]).
 
 -export([handle_event/2, start_event_receiver/1, get_events/2,
 	 verify_events/3, reformat/2, log_events/3]).
@@ -42,6 +43,14 @@ init_per_suite(Config) ->
     init_per_suite(Config, 50).
 
 init_per_suite(Config, Level) ->
+    case os:type() of
+	{win32, _} ->
+	    %% Extend timeout for windows as starting node
+	    %% can take a long time there
+	    test_server:timetrap( 120000 * test_server:timetrap_scale_factor());
+	_ ->
+	    ok
+    end,
     case delete_old_logs(os:type(), Config) of
 	{'EXIT',DelLogsReason} ->
 	    test_server:format(0, "Failed to delete old log directories: ~p~n", 
@@ -49,23 +58,40 @@ init_per_suite(Config, Level) ->
 	_ ->
 	    ok
     end,
+    
+    start_slave(Config, Level).
+
+start_slave(Config,Level) ->
     [_,Host] = string:tokens(atom_to_list(node()), "@"),
+    
+    test_server:format(0, "Trying to start ~s~n", ["ct@"++Host]),
     case slave:start(Host, ct, []) of
 	{error,Reason} ->
 	    test_server:fail(Reason);
 	{ok,CTNode} ->
 	    test_server:format(0, "Node ~p started~n", [CTNode]),
+	    IsCover = test_server:is_cover(),
+	    if IsCover ->
+		cover:start(CTNode);
+	    true->
+		ok
+	    end,
 	    DataDir = ?config(data_dir, Config),
 	    PrivDir = ?config(priv_dir, Config),
 
 	    %% PrivDir as well as directory of Test Server suites
 	    %% have to be in code path on Common Test node.
-	    true = rpc:call(CTNode, code, add_patha, [PrivDir]),
 	    [_ | Parts] = lists:reverse(filename:split(DataDir)),
 	    TSDir = filename:join(lists:reverse(Parts)),
-	    true = rpc:call(CTNode, code, add_patha, [TSDir]),
-	    test_server:format(Level, "Dirs added to code path (on ~w):~n"
-			       "~s~n~s~n", [CTNode,TSDir,PrivDir]),
+	    AddPathDirs = case ?config(path_dirs, Config) of
+			      undefined -> [];
+			      Ds -> Ds
+			  end,
+	    PathDirs = [PrivDir,TSDir | AddPathDirs],
+	    [true = rpc:call(CTNode, code, add_patha, [D]) || D <- PathDirs],
+	    test_server:format(Level, "Dirs added to code path (on ~w):~n",
+			       [CTNode]),
+	    [io:format("~s~n", [D]) || D <- PathDirs],
 
 	    TraceFile = filename:join(DataDir, "ct.trace"),
 	    case file:read_file_info(TraceFile) of
@@ -87,6 +113,7 @@ end_per_suite(Config) ->
     CTNode = ?config(ct_node, Config),
     PrivDir = ?config(priv_dir, Config),
     true = rpc:call(CTNode, code, del_path, [filename:join(PrivDir,"")]),
+    cover:stop(CTNode),
     slave:stop(CTNode),
     ok.
 
@@ -95,9 +122,17 @@ end_per_suite(Config) ->
 
 init_per_testcase(_TestCase, Config) ->
     {_,{_,LogDir}} = lists:keysearch(logdir, 1, get_opts(Config)),
-    test_server:format("See Common Test logs here:\n"
-		       "<a href=\"file://~s/all_runs.html\">~s/all_runs.html</a>",
-		       [LogDir,LogDir]),
+    case lists:keysearch(master, 1, Config) of
+	false->
+	    test_server:format("See Common Test logs here:\n\n"
+			       "<a href=\"file://~s/all_runs.html\">~s/all_runs.html</a>\n"
+			       "<a href=\"file://~s/index.html\">~s/index.html</a>",
+			       [LogDir,LogDir,LogDir,LogDir]);
+	{value, _}->
+	    test_server:format("See CT Master Test logs here:\n\n"
+		       "<a href=\"file://~s/master_runs.html\">~s/master_runs.html</a>",
+		       [LogDir,LogDir])
+    end,
     Config.
 
 %%%-----------------------------------------------------------------
@@ -105,15 +140,23 @@ init_per_testcase(_TestCase, Config) ->
 
 end_per_testcase(_TestCase, Config) ->
     CTNode = ?config(ct_node, Config),
-    wait_for_ct_stop(CTNode),
-    ok.
-
+    case wait_for_ct_stop(CTNode) of
+	%% Common test was not stopped to we restart node.
+	false ->
+	    cover:stop(CTNode),
+	    slave:stop(CTNode),
+	    start_slave(Config,proplists:get_value(trace_level,Config)),
+	    {fail, "Could not stop common_test"};
+	true ->
+	    ok
+    end.
 
 %%%-----------------------------------------------------------------
 %%% 
-
 write_testspec(TestSpec, Dir, Name) ->
-    TSFile = filename:join(Dir, Name),
+    write_testspec(TestSpec, filename:join(Dir, Name)).
+
+write_testspec(TestSpec, TSFile) ->
     {ok,Dev} = file:open(TSFile, [write]),
     [io:format(Dev, "~p.~n", [Entry]) || Entry <- TestSpec],
     file:close(Dev),
@@ -158,10 +201,32 @@ get_opts(Config) ->
 
 %%%-----------------------------------------------------------------
 %%% 
+run(Opts, Config) ->
+    CTNode = ?config(ct_node, Config),
+    Level = ?config(trace_level, Config),
+    %% use ct interface
+    test_server:format(Level, "~n[RUN #1] Calling ct:run_test(~p) on ~p~n",
+		       [Opts, CTNode]),
+    Result1 = rpc:call(CTNode, ct, run_test, [Opts]),
+
+    %% use run_test interface (simulated)
+    test_server:format(Level, "Saving start opts on ~p: ~p~n", [CTNode,Opts]),
+    rpc:call(CTNode, application, set_env, [common_test, run_test_start_opts, Opts]),
+    test_server:format(Level, "[RUN #2] Calling ct_run:script_start() on ~p~n", [CTNode]),
+    Result2 = rpc:call(CTNode, ct_run, script_start, []),
+    case {Result1,Result2} of
+	{ok,ok} ->
+	    ok;
+	{E,_} when E =/= ok ->
+	    E;
+	{_,E} when E =/= ok ->
+	    E
+    end.
+
 run(M, F, A, Config) ->
     CTNode = ?config(ct_node, Config),
     Level = ?config(trace_level, Config),
-    test_server:format(Level, "Calling ~w:~w(~p) on ~p~n", 
+    test_server:format(Level, "~nCalling ~w:~w(~p) on ~p~n",
 		       [M, F, A, CTNode]),
     rpc:call(CTNode, M, F, A).
 
@@ -175,11 +240,11 @@ wait_for_ct_stop(CTNode) ->
 
 wait_for_ct_stop(0, CTNode) ->
     test_server:format(0, "Giving up! Stopping ~p.", [CTNode]),
-    ok;
+    false;
 wait_for_ct_stop(Retries, CTNode) ->
     case rpc:call(CTNode, erlang, whereis, [ct_util_server]) of
 	undefined ->
-	    ok;
+	    true;
 	Pid ->
 	    test_server:format(0, "Waiting for CT (~p) to finish (~p)...", 
 			       [Pid,Retries]),
@@ -231,8 +296,12 @@ verify_events(TEvs, Evs, Config) ->
 	    ok
     end.
 
+verify_events1([TestEv|_], [{TEH,#event{name=stop_logging,node=Node,data=_}}|_], Node, _)
+  when element(1,TestEv) == TEH, element(2,TestEv) =/= stop_logging ->
+    test_server:format("Failed to find ~p in the list of events!~n", [TestEv]),
+    exit({event_not_found,TestEv});
+
 verify_events1(TEvs = [TestEv | TestEvs], Evs = [_|Events], Node, Config) ->
-%%    test_server:format("Next expected event: ~p~n", [TestEv]),
     case catch locate(TestEv, Node, Evs, Config) of
 	nomatch ->
 	    verify_events1(TEvs, Events, Node, Config);
@@ -303,13 +372,33 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 		case Evs of		
 		    [{TEH,#event{name=tc_start, 
 				 node=Node, 
-				 data={M,{init_per_group,GroupName,Props}}}},
-		     {TEH,#event{name=tc_done, 
-				 node=Node, 
-				 data={M,{init_per_group,GroupName,Props},R}}} | Es] ->
+				 data={M,{init_per_group,
+					  GroupName,Props}}}}|Es] ->
+			%% Use dropwhile here as a tc_done from a
+			%% previous testcase might sneak in here
+			EvsG = lists:dropwhile(
+				fun({EH,#event{name=tc_done, 
+						node=EvNode, 
+						data={EvM,{init_per_group,
+							   EvGroupName,
+							   EvProps},EvR}}})
+				   when TEH == EH, EvNode == Node, EvM == M,
+					EvGroupName == GroupName,
+					EvProps == Props,
+					EvR == R ->
+					false;
+				   ({EH,#event{name=stop_logging,
+						node=EvNode,data=_}})
+				   when EH == TEH, EvNode == Node ->
+					exit({group_init_done_not_found,
+					      GroupName,Props});
+				   (_) ->
+					true
+				end, Es),	      
+			
 			test_server:format("Found ~p!", [InitStart]),
 			test_server:format("Found ~p!", [InitDone]),
-			{TEs,Es};
+			{TEs,EvsG};
 		    _ ->
 			nomatch
 		end;
@@ -332,6 +421,10 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 					     EH == TEH, EvNode == Node, 
 					     Mod == M, Func == F ->
 					   false;
+				      ({EH,#event{name=stop_logging,
+						  node=EvNode,data=_}}) when
+					     EH == TEH, EvNode == Node ->
+					   exit({tc_start_not_found,TEv});
 				      (_) ->
 					   true
 				   end, Evs1),
@@ -345,6 +438,10 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 					  EH == TEH, EvNode == Node, 
 					  Mod == M, Func == F ->
 					false;
+				   ({EH,#event{name=stop_logging,
+					       node=EvNode,data=_}}) when
+					  EH == TEH, EvNode == Node ->
+					exit({tc_done_not_found,TEv});
 				   (_) ->
 					true
 				end, Evs2),
@@ -388,6 +485,10 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 					  EH == TEH, EvNode == Node, Mod == M,
 					  EvGName == GroupName, EvProps == Props ->
 					false;
+				   ({EH,#event{name=stop_logging,
+					       node=EvNode,data=_}}) when
+					  EH == TEH, EvNode == Node ->
+					exit({tc_start_not_found,TEv});
 				   (_) ->
 					true
 				end, RemEvs),
@@ -410,6 +511,10 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 					  EH == TEH, EvNode == Node, Mod == M,
 					  EvGName == GroupName, EvProps == Props, Res == R ->
 					false;
+				   ({EH,#event{name=stop_logging,
+					       node=EvNode,data=_}}) when
+					  EH == TEH, EvNode == Node ->
+					exit({tc_done_not_found,TEv});
 				   (_) ->
 					true
 				end, RemEvs),
@@ -429,6 +534,10 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 					       data={Mod,end_per_group,Reason}}}) when
 				   EH == TEH, EvNode == Node, Mod == M, Reason == R ->
 					false;
+				   ({EH,#event{name=stop_logging,
+					       node=EvNode,data=_}}) when
+					  EH == TEH, EvNode == Node ->
+					exit({tc_auto_skip_not_found,TEv});
 				   (_) ->
 					true
 				end, RemEvs),
@@ -533,6 +642,10 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 					     EH == TEH, EvNode == Node, 
 					     Mod == M, Func == F ->
 					   false;
+				      ({EH,#event{name=stop_logging,
+						  node=EvNode,data=_}}) when
+					     EH == TEH, EvNode == Node ->
+					   exit({tc_start_not_found,TEv});
 				      (_) ->
 					   true
 				   end, Evs1),
@@ -576,6 +689,10 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 					  EH == TEH, EvNode == Node, Mod == M,
 					  EvGName == GroupName ->
 					false;
+				   ({EH,#event{name=stop_logging,
+					       node=EvNode,data=_}}) when
+					  EH == TEH, EvNode == Node ->
+					exit({tc_start_not_found,TEv});
 				   (_) ->
 					true
 				end, RemEvs),
@@ -611,6 +728,10 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 					  EH == TEH, EvNode == Node, Mod == M,
 					  EvGName == GroupName, Res == R ->
 					false;
+				   ({EH,#event{name=stop_logging,
+					       node=EvNode,data=_}}) when
+					  EH == TEH, EvNode == Node ->
+					exit({tc_done_not_found,TEv});
 				   (_) ->
 					true
 				end, RemEvs),
@@ -643,6 +764,10 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 					       data={Mod,end_per_group,Reason}}}) when
 				   EH == TEH, EvNode == Node, Mod == M, Reason == R ->
 					false;
+				   ({EH,#event{name=stop_logging,
+					       node=EvNode,data=_}}) when
+					  EH == TEH, EvNode == Node ->
+					exit({tc_auto_skip_not_found,TEv});
 				   (_) ->
 					true
 				end, RemEvs),
@@ -762,22 +887,49 @@ locate({TEH,tc_done,{undefined,undefined,{testcase_aborted,
 	    nomatch
     end;
 
-%% matches any event of type Name
-locate({TEH,Name,Data}, Node, [Ev|Evs], Config) when Data == '_' ->
-    case Ev of
-	{TEH,#event{name=Name, node=Node}} ->
-	    {Config,Evs};
+%% Negative matching: Given two events, the first should not be present before
+%% the other is matched. 
+locate({negative,NotMatch, Match} = Neg, Node, Evs, Config) ->
+    case locate(NotMatch, Node, Evs, Config) of
+	nomatch ->
+	    locate(Match, Node, Evs, Config);
 	_ ->
-	    nomatch
+	    exit({found_negative_event,Neg})
     end;
 
-locate({TEH,Name,Data}, Node, [Ev|Evs], Config) ->
-    case Ev of
-	{TEH,#event{name=Name, node=Node, data=Data}} ->
-	    {Config,Evs};
-	_ ->
+%% matches any event of type Name
+locate({TEH,Name,Data}, Node, [{TEH,#event{name=Name,
+					   data = EvData,
+					   node = Node}}|Evs],
+       Config) ->
+    try match_data(Data, EvData) of
+	match ->
+	    {Config,Evs}
+    catch _:_ ->
 	    nomatch
-    end.
+    end;
+
+locate({_TEH,_Name,_Data}, _Node, [_|_Evs], _Config) ->
+    nomatch.
+
+match_data(D,D) ->
+    match;
+match_data('_',_) ->
+    match;
+match_data(Fun,Data) when is_function(Fun) ->
+    Fun(Data);
+match_data('$proplist',Proplist) ->
+    match_data(
+      fun(List) ->
+	      lists:foreach(fun({_,_}) -> ok end,List)
+      end,Proplist);
+match_data([H1|MatchT],[H2|ValT]) ->
+    match_data(H1,H2),
+    match_data(MatchT,ValT);
+match_data(Tuple1,Tuple2) when is_tuple(Tuple1),is_tuple(Tuple2) ->
+    match_data(tuple_to_list(Tuple1),tuple_to_list(Tuple2));
+match_data([],[]) ->
+    match.
 
 log_events(TC, Events, PrivDir) ->
     LogFile = filename:join(PrivDir, atom_to_list(TC)++".events"),
@@ -785,7 +937,8 @@ log_events(TC, Events, PrivDir) ->
     io:format(Dev, "[~n", []),
     log_events1(Events, Dev, " "),
     file:close(Dev),
-    io:format("Events written to logfile: ~p~n", [LogFile]),
+    io:format("Events written to logfile: <a href=\"file://~s\">~s</a>~n",
+	      [LogFile,LogFile]),
     io:format(user, "Events written to logfile: ~p~n", [LogFile]).
 
 log_events1(Evs, Dev, "") ->
diff --git a/lib/common_test/test/ct_test_support_eh.erl b/lib/common_test/test/ct_test_support_eh.erl
index fd3ae18746..70f73b9b81 100644
--- a/lib/common_test/test/ct_test_support_eh.erl
+++ b/lib/common_test/test/ct_test_support_eh.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2009-2010. 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%
 %%
 
@@ -44,8 +44,20 @@
 %% Description: Whenever a new event handler is added to an event manager,
 %% this function is called to initialize the event handler.
 %%--------------------------------------------------------------------
+init(String = [X|_]) when is_integer(X) ->
+    case erl_scan:string(String++".") of
+	{ok,Ts,_} ->
+	    case erl_parse:parse_term(Ts) of
+		{ok,Args} ->
+		    init(Args);
+		_ ->
+		    init(String)
+	    end;
+	_ ->
+	    init(String)
+    end;
+
 init(Args) ->
-    
     S1 = case lists:keysearch(cbm, 1, Args) of
 	     {_,{cbm,CBM}} ->
 		 #state{cbm=CBM};
@@ -58,7 +70,8 @@ init(Args) ->
 	     _ ->
 		 S1
 	 end,
-    print(S2#state.trace_level, "Event Handler ~w started!~n", [?MODULE]),
+    print(S2#state.trace_level, "Event Handler ~w started with ~p~n",
+	  [?MODULE,Args]),
     {ok,S2}.
 
 %%--------------------------------------------------------------------
diff --git a/lib/common_test/test/ct_testspec_1_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE.erl
new file mode 100644
index 0000000000..e080e074bf
--- /dev/null
+++ b/lib/common_test/test/ct_testspec_1_SUITE.erl
@@ -0,0 +1,1380 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_testspec_1_SUITE
+%%%
+%%% Description:
+%%% Test test specifications
+%%%
+%%% The suites used for the test are located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_testspec_1_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) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+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() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [all_suites, skip_all_suites, suite, skip_suite,
+     all_testcases, skip_all_testcases, testcase,
+     skip_testcase, all_groups, skip_all_groups, group,
+     skip_group, group_all_testcases,
+     skip_group_all_testcases, group_testcase,
+     skip_group_testcase, topgroup, subgroup, skip_subgroup,
+     subgroup_all_testcases, skip_subgroup_all_testcases,
+     subgroup_testcase, skip_subgroup_testcase,
+     sub_skipped_by_top, testcase_in_multiple_groups,
+     order_of_tests_in_multiple_dirs_no_merge_tests,
+     order_of_tests_in_multiple_suites_no_merge_tests,
+     order_of_suites_in_multiple_dirs_no_merge_tests,
+     order_of_groups_in_multiple_dirs_no_merge_tests,
+     order_of_groups_in_multiple_suites_no_merge_tests,
+     order_of_tests_in_multiple_dirs,
+     order_of_tests_in_multiple_suites,
+     order_of_suites_in_multiple_dirs,
+     order_of_groups_in_multiple_dirs,
+     order_of_groups_in_multiple_suites,
+     order_of_tests_in_multiple_suites_with_skip_no_merge_tests,
+     order_of_tests_in_multiple_suites_with_skip,
+     all_plus_one_tc_no_merge_tests,
+     all_plus_one_tc].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+
+all_suites(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "suites_1"),
+    TestSpec = [{label,"all_suites"},
+		{suites,TestDir,all}],
+
+    setup_and_execute(all_suites, TestSpec, Config).
+
+skip_all_suites(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "suites_1"),
+    TestSpec = [{label,skip_all_suites},
+		{suites,TestDir,all},
+		{skip_suites,TestDir,all,"SKIPPED!"}],
+
+    setup_and_execute(skip_all_suites, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+suite(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "suites_1"),
+    TestSpec = [{label,undefined},
+		{suites,TestDir,simple_1_SUITE}],
+
+    setup_and_execute(suite, TestSpec, Config).
+
+skip_suite(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "suites_1"),
+    TestSpec = [{suites,TestDir,[simple_1_SUITE,simple_2_SUITE]},
+		{skip_suites,TestDir,simple_1_SUITE,"SKIPPED!"}],
+
+    setup_and_execute(skip_suite, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+all_testcases(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "suites_1"),
+    TestSpec = [{cases,TestDir,simple_1_SUITE,all}],
+
+    setup_and_execute(all_testcases, TestSpec, Config).
+
+skip_all_testcases(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "suites_1"),
+    TestSpec = [{suites,TestDir,[simple_1_SUITE]},
+		{skip_cases,TestDir,simple_1_SUITE,all,"SKIPPED!"}],
+
+    setup_and_execute(skip_all_testcases, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+testcase(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "suites_1"),
+    TestSpec = [{cases,TestDir,simple_1_SUITE,tc1}],
+
+    setup_and_execute(testcase, TestSpec, Config).
+
+skip_testcase(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "suites_1"),
+    TestSpec = [{cases,TestDir,simple_1_SUITE,[tc1,tc2]},
+		{cases,TestDir,simple_2_SUITE,[tc2,tc1]},
+		{skip_cases,TestDir,simple_1_SUITE,[tc1],"SKIPPED!"},
+		{skip_cases,TestDir,simple_2_SUITE,tc2,"SKIPPED!"}],
+
+    setup_and_execute(skip_testcase, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+all_groups(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_11_SUITE,all}],
+
+    setup_and_execute(all_groups, TestSpec, Config).
+
+skip_all_groups(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_11_SUITE,all},
+		{skip_groups,TestDir,groups_11_SUITE,all,"SKIPPED!"}],
+
+    setup_and_execute(skip_all_groups, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+group(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_11_SUITE,test_group_1a}],
+
+    setup_and_execute(group, TestSpec, Config).
+
+skip_group(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_11_SUITE,[test_group_1a,
+						 test_group_1b]},
+		{skip_groups,TestDir,groups_11_SUITE,
+		 [test_group_1b,test_group_2,test_group_7],"SKIPPED!"}],
+
+    setup_and_execute(skip_group, TestSpec, Config).
+
+
+%%%-----------------------------------------------------------------
+%%%
+
+group_all_testcases(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_11_SUITE,test_group_1a,{cases,all}}],
+
+    setup_and_execute(group_all_testcases, TestSpec, Config).
+
+skip_group_all_testcases(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_11_SUITE,[test_group_1a,
+						 test_group_1b]},
+		{skip_groups,TestDir,groups_11_SUITE,
+		 test_group_1b,{cases,all},"SKIPPED!"},
+		{skip_groups,TestDir,groups_11_SUITE,
+		 test_group_1a,{cases,all},"SKIPPED!"}],
+
+    setup_and_execute(skip_group_all_testcases, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+group_testcase(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_11_SUITE,test_group_1a,{cases,testcase_1a}}],
+
+    setup_and_execute(group_testcase, TestSpec, Config).
+
+skip_group_testcase(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_11_SUITE,test_group_1a,
+		 {cases,[testcase_1a,testcase_1b]}},
+		{groups,TestDir,groups_11_SUITE,test_group_1b,
+		 {cases,[testcase_1b,testcase_1a]}},
+		{skip_groups,TestDir,groups_11_SUITE,
+		 test_group_1a,{cases,testcase_1b},"SKIPPED!"},
+		{skip_groups,TestDir,groups_11_SUITE,
+		 test_group_1b,{cases,[testcase_1a]},"SKIPPED!"}],
+
+    setup_and_execute(skip_group_testcase, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+topgroup(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_12_SUITE,test_group_2},
+		{groups,TestDir,groups_12_SUITE,test_group_4}],
+
+    setup_and_execute(topgroup, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+subgroup(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_12_SUITE,test_group_3}],
+
+    setup_and_execute(subgroup, TestSpec, Config).
+
+skip_subgroup(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_12_SUITE,[test_group_4]},
+		{skip_groups,TestDir,groups_12_SUITE,
+		 test_group_8,"SKIPPED!"}],
+
+    setup_and_execute(skip_subgroup, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+subgroup_all_testcases(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_12_SUITE,
+		 test_group_5,{cases,all}},
+		{groups,TestDir,groups_12_SUITE,
+		 test_group_3,{cases,all}}],
+
+    setup_and_execute(subgroup_all_testcases, TestSpec, Config).
+
+skip_subgroup_all_testcases(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_12_SUITE,test_group_4},
+		{skip_groups,TestDir,groups_12_SUITE,
+		 test_group_5,{cases,all},"SKIPPED!"}],
+
+    setup_and_execute(skip_subgroup_all_testcases, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+subgroup_testcase(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_12_SUITE,
+		 test_group_7,{cases,testcase_7a}},
+		{groups,TestDir,groups_12_SUITE,
+		 test_group_3,{cases,testcase_3b}}],
+
+    setup_and_execute(subgroup_testcase, TestSpec, Config).
+
+skip_subgroup_testcase(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_12_SUITE,test_group_5},
+		{skip_groups,TestDir,groups_12_SUITE,
+		 test_group_7,{cases,[testcase_7a,testcase_7b]},"SKIPPED!"}],
+
+    setup_and_execute(skip_subgroup_testcase, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+%%!
+%%! Somewhat weird result from this one:
+%%!
+sub_skipped_by_top(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir,groups_12_SUITE,test_group_5},
+		{skip_groups,TestDir,groups_12_SUITE,test_group_4,"SKIPPED!"}],
+
+    setup_and_execute(sub_skipped_by_top, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+testcase_in_multiple_groups(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir = filename:join(DataDir, "groups_1"),
+    TestSpec = [{cases,TestDir,groups_12_SUITE,[testcase_1a,testcase_1b]},
+		{skip_cases,TestDir,groups_12_SUITE,[testcase_1b],"SKIPPED!"}],
+
+    setup_and_execute(testcase_in_multiple_groups, TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_tests_in_multiple_dirs_no_merge_tests(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestDir2 = filename:join(DataDir, "groups_2"),
+    TestSpec = [{merge_tests, false},
+		{cases,TestDir1,groups_12_SUITE,[testcase_1a]},
+		{cases,TestDir2,groups_22_SUITE,[testcase_1]},
+		{cases,TestDir1,groups_12_SUITE,[testcase_1b]}],
+
+    setup_and_execute(order_of_tests_in_multiple_dirs_no_merge_tests, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_tests_in_multiple_suites_no_merge_tests(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestSpec = [{merge_tests, false},
+		{cases,TestDir1,groups_12_SUITE,[testcase_1a]},
+		{cases,TestDir1,groups_11_SUITE,[testcase_1]},
+		{cases,TestDir1,groups_12_SUITE,[testcase_1b]}],
+
+    setup_and_execute(order_of_tests_in_multiple_suites_no_merge_tests, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_suites_in_multiple_dirs_no_merge_tests(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestDir2 = filename:join(DataDir, "groups_2"),
+    TestSpec = [{merge_tests, false},
+		{suites,TestDir1,groups_12_SUITE},
+		{suites,TestDir2,groups_22_SUITE},
+		{suites,TestDir1,groups_11_SUITE}],
+
+    setup_and_execute(order_of_suites_in_multiple_dirs_no_merge_tests, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_groups_in_multiple_dirs_no_merge_tests(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestDir2 = filename:join(DataDir, "groups_2"),
+    TestSpec = [{merge_tests, false},
+		{groups,TestDir1,groups_12_SUITE,test_group_1a},
+		{groups,TestDir2,groups_22_SUITE,test_group_1a},
+		{groups,TestDir1,groups_12_SUITE,test_group_1b}],
+
+    setup_and_execute(order_of_groups_in_multiple_dirs_no_merge_tests, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_groups_in_multiple_suites_no_merge_tests(Config) 
+  when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestSpec = [{merge_tests, false},
+		{groups,TestDir1,groups_12_SUITE,test_group_1a},
+		{groups,TestDir1,groups_11_SUITE,test_group_1a},
+		{groups,TestDir1,groups_12_SUITE,test_group_1b}],
+
+    setup_and_execute(order_of_groups_in_multiple_suites_no_merge_tests, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_tests_in_multiple_suites_with_skip_no_merge_tests(Config) 
+  when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestSpec = [{merge_tests, false},
+		{cases,TestDir1,groups_12_SUITE,[testcase_1a]},
+		{cases,TestDir1,groups_11_SUITE,[testcase_1]},
+		{cases,TestDir1,groups_12_SUITE,[testcase_1b]},
+		{cases,TestDir1,groups_11_SUITE,[testcase_2]},
+		{skip_cases,TestDir1,groups_12_SUITE,[testcase_1b],"Skip it"}],
+
+    setup_and_execute(
+      order_of_tests_in_multiple_suites_with_skip_no_merge_tests,
+      TestSpec, Config).
+     
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_tests_in_multiple_dirs(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestDir2 = filename:join(DataDir, "groups_2"),
+    TestSpec = [{cases,TestDir1,groups_12_SUITE,[testcase_1a]},
+		{cases,TestDir2,groups_22_SUITE,[testcase_1]},
+		{cases,TestDir1,groups_12_SUITE,[testcase_1b]}],
+
+    setup_and_execute(order_of_tests_in_multiple_dirs, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_tests_in_multiple_suites(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestSpec = [{cases,TestDir1,groups_12_SUITE,[testcase_1a]},
+		{cases,TestDir1,groups_11_SUITE,[testcase_1]},
+		{cases,TestDir1,groups_12_SUITE,[testcase_1b]}],
+
+    setup_and_execute(order_of_tests_in_multiple_suites, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_suites_in_multiple_dirs(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestDir2 = filename:join(DataDir, "groups_2"),
+    TestSpec = [{suites,TestDir1,groups_12_SUITE},
+		{suites,TestDir2,groups_22_SUITE},
+		{suites,TestDir1,groups_11_SUITE}],
+
+    setup_and_execute(order_of_suites_in_multiple_dirs, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_groups_in_multiple_dirs(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestDir2 = filename:join(DataDir, "groups_2"),
+    TestSpec = [{groups,TestDir1,groups_12_SUITE,test_group_1a},
+		{groups,TestDir2,groups_22_SUITE,test_group_1a},
+		{groups,TestDir1,groups_12_SUITE,test_group_1b}],
+
+    setup_and_execute(order_of_groups_in_multiple_dirs, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_groups_in_multiple_suites(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestSpec = [{groups,TestDir1,groups_12_SUITE,test_group_1a},
+		{groups,TestDir1,groups_11_SUITE,test_group_1a},
+		{groups,TestDir1,groups_12_SUITE,test_group_1b}],
+
+    setup_and_execute(order_of_groups_in_multiple_suites, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+order_of_tests_in_multiple_suites_with_skip(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestSpec = [{cases,TestDir1,groups_12_SUITE,[testcase_1a]},
+		{cases,TestDir1,groups_11_SUITE,[testcase_1]},
+		{cases,TestDir1,groups_12_SUITE,[testcase_1b]},
+		{cases,TestDir1,groups_11_SUITE,[testcase_2]},
+		{skip_cases,TestDir1,groups_12_SUITE,[testcase_1b],"Skip it!"}],
+
+    setup_and_execute(order_of_tests_in_multiple_suites_with_skip, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+all_plus_one_tc_no_merge_tests(Config) when is_list(Config) ->
+    
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestSpec = [{merge_tests,false},
+		{suites,TestDir1,groups_12_SUITE},
+		{cases,TestDir1,groups_12_SUITE,[testcase_1a]}],
+
+    setup_and_execute(all_plus_one_tc_no_merge_tests, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+
+all_plus_one_tc(Config) when is_list(Config) ->
+    
+    DataDir = ?config(data_dir, Config),
+
+    TestDir1 = filename:join(DataDir, "groups_1"),
+    TestSpec = [{suites,TestDir1,groups_12_SUITE},
+		{cases,TestDir1,groups_12_SUITE,[testcase_1a]}],
+
+    setup_and_execute(all_plus_one_tc, 
+		      TestSpec, Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup_and_execute(TCName, TestSpec, Config) ->
+    SpecFile = create_spec_file(?config(priv_dir, Config),
+				TCName, TestSpec),
+    TestTerms =
+	case lists:keymember(label, 1, TestSpec) of
+	    true -> [{spec,SpecFile}];
+	    false -> [{spec,SpecFile},{label,TCName}]
+	end,
+    {Opts,ERPid} = setup(TestTerms, Config),
+    ok = ct_test_support:run(Opts, Config),
+    TestSpec1 = [{logdir,proplists:get_value(logdir,Opts)},
+		 {label,proplists:get_value(label,TestTerms)} | TestSpec],
+    ok = ct_test_support:run(ct, run_testspec, [TestSpec1], Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(TCName,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config)),
+
+    TestEvents = events_to_check(TCName),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+create_spec_file(SpecDir, TCName, TestSpec) ->
+    FileName = filename:join(SpecDir,
+			     atom_to_list(TCName)++".spec"),
+    {ok,Dev} = file:open(FileName, [write]),
+    [io:format(Dev, "~p.~n", [Term]) || Term <- TestSpec],
+    file:close(Dev),
+    io:format("~nTest spec created here~n~n<a href=\"file://~s\">~s</a>~n",
+	      [FileName,FileName]),
+    FileName.
+
+setup(Test, Config) when is_tuple(Test) ->
+    setup([Test], Config);
+setup(Tests, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ Tests ++ [{event_handler,{?eh,EvHArgs}}],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+%reformat(Events, _EH) ->
+%    Events.
+
+%%%-----------------------------------------------------------------
+%%% 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(all_suites) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{simple_1_SUITE,init_per_suite}},
+     {?eh,tc_done,{simple_1_SUITE,end_per_suite,'_'}},
+     {?eh,tc_start,{simple_2_SUITE,init_per_suite}},
+     {?eh,test_stats,{4,0,{0,0}}},
+     {?eh,tc_done,{simple_2_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(skip_all_suites) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_user_skip,{simple_1_SUITE,all,"SKIPPED!"}},
+     {?eh,tc_user_skip,{simple_2_SUITE,all,"SKIPPED!"}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(suite) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{simple_1_SUITE,init_per_suite}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     {?eh,tc_done,{simple_1_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+ 
+test_events(skip_suite) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_user_skip,{simple_1_SUITE,all,"SKIPPED!"}},
+     {?eh,tc_done,{simple_2_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(all_testcases) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{simple_1_SUITE,init_per_suite}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     {?eh,tc_done,{simple_1_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+ 
+test_events(skip_all_testcases) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_user_skip,{simple_1_SUITE,all,"SKIPPED!"}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(testcase) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{simple_1_SUITE,init_per_suite}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {negative,{?eh,test_stats,{2,0,{0,0}}},
+      {?eh,tc_done,{simple_1_SUITE,end_per_suite,'_'}}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+ 
+test_events(skip_testcase) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{simple_1_SUITE,init_per_suite}},
+     {?eh,tc_user_skip,{simple_1_SUITE,tc1,"SKIPPED!"}},
+     {?eh,tc_start,{simple_1_SUITE,tc2}},
+     {?eh,tc_start,{simple_1_SUITE,end_per_suite}},
+
+     {?eh,tc_start,{simple_2_SUITE,init_per_suite}},
+     {?eh,tc_user_skip,{simple_2_SUITE,tc2,"SKIPPED!"}},
+     {?eh,tc_start,{simple_2_SUITE,tc1}},
+     {?eh,test_stats,{2,0,{2,0}}},
+     {?eh,tc_start,{simple_2_SUITE,end_per_suite}},
+     
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(all_groups) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
+     {?eh,test_stats,{12,0,{0,0}}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+ 
+test_events(skip_all_groups) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
+     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_1a},"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{1,0}}},
+     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_1b},"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{2,0}}},
+     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_2},"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{3,0}}},
+     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_4},"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{4,0}}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(group) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
+     {?eh,tc_start,{groups_11_SUITE,{init_per_group,test_group_1a,[]}}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1a}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1b}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1a,[]},'_'}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+ 
+test_events(skip_group) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
+     
+     {?eh,tc_start,{groups_11_SUITE,{init_per_group,test_group_1a,[]}}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1a}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1b}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1a,[]},'_'}},
+     
+     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_1b},"SKIPPED!"}},
+     {?eh,test_stats,{2,0,{1,0}}},
+     {negative,{?eh,tc_user_skip,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(group_all_testcases) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
+     {?eh,tc_start,{groups_11_SUITE,{init_per_group,test_group_1a,[]}}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1a}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1b}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1a,[]},'_'}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+ 
+test_events(skip_group_all_testcases) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
+     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_1a},"SKIPPED!"}},
+     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_1b},"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{2,0}}},
+     {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(group_testcase) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
+     {?eh,tc_start,{groups_11_SUITE,{init_per_group,test_group_1a,[]}}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1a}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {negative,{?eh,test_stats,{2,0,{0,0}}},
+      {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1a,[]},'_'}}},
+
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+ 
+test_events(skip_group_testcase) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
+     
+     {?eh,tc_start,{groups_11_SUITE,{init_per_group,test_group_1a,[]}}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1a}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
+     {?eh,test_stats,{1,0,{1,0}}},
+     {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1a,[]},'_'}},
+     
+     {?eh,tc_start,{groups_11_SUITE,{init_per_group,test_group_1b,[]}}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1b}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
+     {?eh,test_stats,{2,0,{2,0}}},
+     {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1b,[]},'_'}},
+
+     {negative,{?eh,tc_user_skip,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(topgroup) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+     
+     {parallel, 
+      [{?eh,tc_start,
+	{groups_12_SUITE,{init_per_group,test_group_2,[parallel]}}},
+       {?eh,tc_done,
+	{groups_12_SUITE,{init_per_group,test_group_2,[parallel]},ok}},
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}}
+       ],
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_3,[]}}},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_3,[]}}}
+       ],
+       {?eh,test_stats,{6,0,{0,0}}},
+       {?eh,tc_start,
+	{groups_12_SUITE,{end_per_group,test_group_2,[parallel]}}},
+       {?eh,tc_done,
+	{groups_12_SUITE,{end_per_group,test_group_2,[parallel]},ok}}]},
+
+     [{?eh,tc_start,
+       {groups_12_SUITE,{init_per_group,test_group_4,[]}}},
+      {parallel,
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]}}},
+	{?eh,tc_done,
+	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]},ok}},
+	{parallel,
+	 [{?eh,tc_start,
+	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]}}},
+	  {?eh,tc_done,
+	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]},ok}},
+	  [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_7,'_'}}},
+	   {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_7,'_'}}}],
+	  {shuffle,
+	   [{?eh,tc_start,
+	     {groups_12_SUITE,{init_per_group,test_group_8,
+			       [{shuffle,'_'},sequence]}}},
+	    {?eh,tc_done,
+	     {groups_12_SUITE,{init_per_group,test_group_8,
+			       [{shuffle,'_'},sequence]},ok}},
+	    {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_8,
+					    [shuffle,sequence]}}},
+	    {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_8,
+					    [shuffle,sequence]},ok}}
+	   ]},
+	  {?eh,tc_start,
+	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]}}},
+	  {?eh,tc_done,
+	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]},ok}}
+	 ]},
+	{?eh,test_stats,{12,0,{0,0}}},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]}}},
+	{?eh,tc_done,
+	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]},ok}}]},
+      {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_4,[]}}}],
+
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(subgroup) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+
+     {parallel, 
+      [{?eh,tc_start,
+	{groups_12_SUITE,{init_per_group,test_group_2,[parallel]}}},
+       {?eh,tc_done,
+	{groups_12_SUITE,{init_per_group,test_group_2,[parallel]},ok}},
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}}
+       ],
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_3,[]}}},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_3,[]}}}
+       ],
+       {?eh,test_stats,{4,0,{0,0}}},
+       {?eh,tc_start,
+	{groups_12_SUITE,{end_per_group,test_group_2,[parallel]}}},
+       {?eh,tc_done,
+	{groups_12_SUITE,{end_per_group,test_group_2,[parallel]},ok}}]},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+ 
+test_events(skip_subgroup) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+
+     [{?eh,tc_start,
+       {groups_12_SUITE,{init_per_group,test_group_4,[]}}},
+      {parallel,
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]}}},
+	{?eh,tc_done,
+	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]},ok}},
+	{parallel,
+	 [{?eh,tc_start,
+	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]}}},
+	  {?eh,tc_done,
+	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]},ok}},
+	  [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_7,'_'}}},
+	   {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_7,'_'}}}],
+	  {?eh,tc_user_skip,
+	   {groups_12_SUITE,{group,test_group_8},"SKIPPED!"}},
+	  {?eh,tc_start,
+	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]}}},
+	  {?eh,tc_done,
+	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]},ok}}
+	 ]},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]}}},
+	{?eh,tc_done,
+	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]},ok}}]},
+      {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_4,[]}}}],
+
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(subgroup_all_testcases) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+
+     [{?eh,tc_start,
+       {groups_12_SUITE,{init_per_group,test_group_4,[]}}},
+      {parallel,
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]}}},
+	{?eh,tc_done,
+	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]},ok}},
+	{parallel,
+	 [{?eh,tc_start,
+	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]}}},
+	  {?eh,tc_done,
+	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]},ok}},
+	  [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_7,'_'}}},
+	   {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_7,'_'}}}],
+	  {shuffle,
+	   [{?eh,tc_start,
+	     {groups_12_SUITE,{init_per_group,test_group_8,
+			       [{shuffle,'_'},sequence]}}},
+	    {?eh,tc_done,
+	     {groups_12_SUITE,{init_per_group,test_group_8,
+			       [{shuffle,'_'},sequence]},ok}},
+	    {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_8,
+					    [shuffle,sequence]}}},
+	    {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_8,
+					    [shuffle,sequence]},ok}}
+	   ]},
+	  {?eh,tc_start,
+	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]}}},
+	  {?eh,tc_done,
+	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]},ok}}
+	 ]},
+	{?eh,test_stats,{6,0,{0,0}}},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]}}},
+	{?eh,tc_done,
+	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]},ok}}]},
+      {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_4,[]}}}],
+
+     {parallel, 
+      [{?eh,tc_start,
+	{groups_12_SUITE,{init_per_group,test_group_2,[parallel]}}},
+       {?eh,tc_done,
+	{groups_12_SUITE,{init_per_group,test_group_2,[parallel]},ok}},
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}}
+       ],
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_3,[]}}},
+	{?eh,test_stats,{10,0,{0,0}}},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_3,[]}}}
+       ],
+       {?eh,tc_start,
+	{groups_12_SUITE,{end_per_group,test_group_2,[parallel]}}},
+       {?eh,tc_done,
+	{groups_12_SUITE,{end_per_group,test_group_2,[parallel]},ok}}]},
+
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+ 
+test_events(skip_subgroup_all_testcases) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+
+     [{?eh,tc_start,
+       {groups_12_SUITE,{init_per_group,test_group_4,[]}}},
+      {?eh,tc_done,
+       {groups_12_SUITE,{init_per_group,test_group_4,[]},ok}},
+      {?eh,tc_user_skip,{groups_12_SUITE,{group,test_group_5},"SKIPPED!"}},
+      {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_4,[]}}},
+      {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_4,[]},ok}}
+     ],
+
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(subgroup_testcase) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+
+     [{?eh,tc_start,
+       {groups_12_SUITE,{init_per_group,test_group_4,[]}}},
+      {parallel,
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]}}},
+	{?eh,tc_done,
+	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]},ok}},
+	{parallel,
+	 [{?eh,tc_start,
+	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]}}},
+	  {?eh,tc_done,
+	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]},ok}},
+	  [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_7,'_'}}},
+	   {?eh,test_stats,{1,0,{0,0}}},
+	   {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_7,'_'}}}],
+	  {?eh,tc_start,
+	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]}}},
+	  {?eh,tc_done,
+	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]},ok}}
+	 ]},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]}}},
+	{?eh,tc_done,
+	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]},ok}}]},
+      {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_4,[]}}}],
+
+     {parallel, 
+      [{?eh,tc_start,
+	{groups_12_SUITE,{init_per_group,test_group_2,[parallel]}}},
+       {?eh,tc_done,
+	{groups_12_SUITE,{init_per_group,test_group_2,[parallel]},ok}},
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_3,[{repeat,2}]}}},
+	{?eh,test_stats,{2,0,{0,0}}},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_3,[{repeat,2}]}}}
+       ],
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_3,[]}}},
+	{?eh,test_stats,{3,0,{0,0}}},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_3,[]}}}
+       ],
+       {?eh,tc_start,
+	{groups_12_SUITE,{end_per_group,test_group_2,[parallel]}}},
+       {?eh,tc_done,
+	{groups_12_SUITE,{end_per_group,test_group_2,[parallel]},ok}}]},
+
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+ 
+test_events(skip_subgroup_testcase) ->
+    [
+
+    {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+
+     [{?eh,tc_start,
+       {groups_12_SUITE,{init_per_group,test_group_4,[]}}},
+      {parallel,
+       [{?eh,tc_start,
+	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]}}},
+	{?eh,tc_done,
+	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]},ok}},
+	{parallel,
+	 [{?eh,tc_start,
+	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]}}},
+	  {?eh,tc_done,
+	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]},ok}},
+	  [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_7,'_'}}},
+	   {?eh,tc_user_skip, {groups_12_SUITE,testcase_7a,"SKIPPED!"}},
+           {?eh,test_stats,{1,0,{1,0}}},
+           {?eh,tc_user_skip, {groups_12_SUITE,testcase_7b,"SKIPPED!"}},
+           {?eh,test_stats,{1,0,{2,0}}},
+	   {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_7,'_'}}}],
+	  {shuffle,
+	   [{?eh,tc_start,
+	     {groups_12_SUITE,{init_per_group,test_group_8,
+			       [{shuffle,'_'},sequence]}}},
+	    {?eh,tc_done,
+	     {groups_12_SUITE,{init_per_group,test_group_8,
+			       [{shuffle,'_'},sequence]},ok}},
+	    {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_8,
+					    [shuffle,sequence]}}},
+	    {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_8,
+					    [shuffle,sequence]},ok}}
+	   ]},
+	  {?eh,tc_start,
+	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]}}},
+	  {?eh,tc_done,
+	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]},ok}}
+	 ]},
+	{?eh,test_stats,{4,0,{2,0}}},
+	{?eh,tc_start,
+	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]}}},
+	{?eh,tc_done,
+	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]},ok}}]},
+      {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_4,[]}}}],
+
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+     
+    ];
+
+test_events(sub_skipped_by_top) ->
+    [
+     {?eh,start_logging,'_'},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+
+     {?eh,tc_user_skip,{groups_12_SUITE,{group,test_group_4},"SKIPPED!"}},
+
+     {negative,
+      {?eh,tc_user_skip,{groups_12_SUITE,{group,test_group_4},"SKIPPED!"}},
+      {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}}},
+
+     {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+    ];
+
+test_events(testcase_in_multiple_groups) ->
+    [];
+
+test_events(order_of_tests_in_multiple_dirs_no_merge_tests) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
+     {?eh,tc_done, {groups_12_SUITE,testcase_1a,
+		    {failed,{error,{test_case_failed,no_group_data}}}}},
+     {?eh,tc_start,{groups_22_SUITE,testcase_1}},
+     {?eh,tc_done,{groups_22_SUITE,testcase_1,ok}},
+     {?eh,tc_start,{groups_12_SUITE,testcase_1b}},
+     {?eh,tc_done, {groups_12_SUITE,testcase_1b,
+		    {failed,{error,{test_case_failed,no_group_data}}}}},
+     {?eh,stop_logging,[]}
+    ];
+test_events(order_of_tests_in_multiple_suites_no_merge_tests) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
+     {?eh,tc_done,{groups_12_SUITE,testcase_1a,'_'}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1}},
+     {?eh,tc_done,{groups_11_SUITE,testcase_1,ok}},
+     {?eh,tc_start,{groups_12_SUITE,testcase_1b}},
+     {?eh,tc_done,{groups_12_SUITE,testcase_1b,'_'}},
+     {?eh,stop_logging,[]}
+    ];
+test_events(order_of_suites_in_multiple_dirs_no_merge_tests) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+     {?eh,tc_done,{groups_12_SUITE,init_per_suite,'_'}},
+     {?eh,tc_start,{groups_12_SUITE,end_per_suite}},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+     {?eh,tc_start,{groups_22_SUITE,init_per_suite}},
+     {?eh,tc_done,{groups_22_SUITE,init_per_suite,'_'}},
+     {?eh,tc_start,{groups_22_SUITE,end_per_suite}},
+     {?eh,tc_done,{groups_22_SUITE,end_per_suite,'_'}},
+     {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
+     {?eh,tc_done,{groups_11_SUITE,init_per_suite,'_'}},
+     {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,'_'}},
+     {?eh,stop_logging,[]}];
+test_events(order_of_groups_in_multiple_dirs_no_merge_tests) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     
+     {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1a,'_'}}},
+     {?eh,tc_done, {groups_12_SUITE,{end_per_group,test_group_1a,'_'},'_'}},
+
+     {?eh,tc_start, {groups_22_SUITE,{init_per_group,test_group_1a,'_'}}},
+     {?eh,tc_done, {groups_22_SUITE,{end_per_group,test_group_1a,'_'},'_'}},
+      
+     {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1b,'_'}}},
+     {?eh,tc_done, {groups_12_SUITE,{end_per_group,test_group_1b,'_'},'_'}},
+
+     {?eh,stop_logging,[]}];
+test_events(order_of_groups_in_multiple_suites_no_merge_tests) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     
+     {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1a,'_'}}},
+     {?eh,tc_done, {groups_12_SUITE,{end_per_group,test_group_1a,'_'},'_'}},
+
+     {?eh,tc_start, {groups_11_SUITE,{init_per_group,test_group_1a,'_'}}},
+     {?eh,tc_done, {groups_11_SUITE,{end_per_group,test_group_1a,'_'},'_'}},
+      
+     {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1b,'_'}}},
+     {?eh,tc_done, {groups_12_SUITE,{end_per_group,test_group_1b,'_'},'_'}},
+
+     {?eh,stop_logging,[]}];
+test_events(order_of_tests_in_multiple_suites_with_skip_no_merge_tests) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
+     {?eh,tc_done,{groups_12_SUITE,testcase_1a,'_'}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1}},
+     {?eh,tc_done,{groups_11_SUITE,testcase_1,ok}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_1b,'_'}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_2}},
+     {?eh,tc_done,{groups_11_SUITE,testcase_2,ok}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(order_of_tests_in_multiple_dirs) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
+     {?eh,tc_done,
+      {groups_12_SUITE,testcase_1a,
+       {failed,{error,{test_case_failed,no_group_data}}}}},
+     {?eh,tc_start,{groups_12_SUITE,testcase_1b}},
+     {?eh,tc_done,
+      {groups_12_SUITE,testcase_1b,
+       {failed,{error,{test_case_failed,no_group_data}}}}},
+     {?eh,tc_start,{groups_22_SUITE,testcase_1}},
+     {?eh,tc_done,{groups_22_SUITE,testcase_1,ok}},
+     {?eh,stop_logging,[]}
+    ];
+test_events(order_of_tests_in_multiple_suites) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
+     {?eh,tc_done,{groups_12_SUITE,testcase_1a,'_'}},
+
+     {?eh,tc_start,{groups_12_SUITE,testcase_1b}},
+     {?eh,tc_done,{groups_12_SUITE,testcase_1b,'_'}},
+
+     {?eh,tc_start,{groups_11_SUITE,testcase_1}},
+     {?eh,tc_done,{groups_11_SUITE,testcase_1,ok}},
+     {?eh,stop_logging,[]}
+    ];
+test_events(order_of_suites_in_multiple_dirs) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+     {?eh,tc_done,{groups_12_SUITE,init_per_suite,'_'}},
+     {?eh,tc_start,{groups_12_SUITE,end_per_suite}},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+
+     {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
+     {?eh,tc_done,{groups_11_SUITE,init_per_suite,'_'}},
+     {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,'_'}},
+
+     {?eh,tc_start,{groups_22_SUITE,init_per_suite}},
+     {?eh,tc_done,{groups_22_SUITE,init_per_suite,'_'}},
+     {?eh,tc_start,{groups_22_SUITE,end_per_suite}},
+     {?eh,tc_done,{groups_22_SUITE,end_per_suite,'_'}},
+     {?eh,stop_logging,[]}];
+test_events(order_of_groups_in_multiple_dirs) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     
+     {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1a,'_'}}},
+     {?eh,tc_done, {groups_12_SUITE,{end_per_group,test_group_1a,'_'},'_'}},
+
+     {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1b,'_'}}},
+     {?eh,tc_done, {groups_12_SUITE,{end_per_group,test_group_1b,'_'},'_'}},
+
+     {?eh,tc_start, {groups_22_SUITE,{init_per_group,test_group_1a,'_'}}},
+     {?eh,tc_done, {groups_22_SUITE,{end_per_group,test_group_1a,'_'},'_'}},
+
+     {?eh,stop_logging,[]}];
+test_events(order_of_groups_in_multiple_suites) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     
+     {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1a,'_'}}},
+     {?eh,tc_done, {groups_12_SUITE,{end_per_group,test_group_1a,'_'},'_'}},
+
+     {?eh,tc_start, {groups_12_SUITE,{init_per_group,test_group_1b,'_'}}},
+     {?eh,tc_done, {groups_12_SUITE,{end_per_group,test_group_1b,'_'},'_'}},
+
+     {?eh,tc_start, {groups_11_SUITE,{init_per_group,test_group_1a,'_'}}},
+     {?eh,tc_done, {groups_11_SUITE,{end_per_group,test_group_1a,'_'},'_'}},
+
+     {?eh,stop_logging,[]}];
+
+test_events(order_of_tests_in_multiple_suites_with_skip) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,tc_start,{groups_12_SUITE,testcase_1a}},
+     {?eh,tc_done,{groups_12_SUITE,testcase_1a,'_'}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_1b,'_'}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_1}},
+     {?eh,tc_done,{groups_11_SUITE,testcase_1,ok}},
+     {?eh,tc_start,{groups_11_SUITE,testcase_2}},
+     {?eh,tc_done,{groups_11_SUITE,testcase_2,ok}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(all_plus_one_tc_no_merge_tests) ->
+
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(all_plus_one_tc) ->
+
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+     {negative,{?eh,tc_start,{groups_12_SUITE,init_per_suite}},
+      {?eh,stop_logging,[]}}
+    ];
+
+test_events(_) ->
+    [
+    ].
diff --git a/lib/common_test/test/ct_testspec_1_SUITE_data/groups_1/groups_11_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE_data/groups_1/groups_11_SUITE.erl
new file mode 100644
index 0000000000..4f11d8a0e8
--- /dev/null
+++ b/lib/common_test/test/ct_testspec_1_SUITE_data/groups_1/groups_11_SUITE.erl
@@ -0,0 +1,281 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2010. 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(groups_11_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%====================================================================
+%% COMMON TEST CALLBACK FUNCTIONS
+%%====================================================================
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+groups() ->
+    [
+      {test_group_1a, [testcase_1a,testcase_1b]},
+
+      {test_group_1b, [], [testcase_1a,testcase_1b]},
+
+      {test_group_2, [], [testcase_2a,
+
+			  {test_group_3, [], [testcase_3a,
+					      testcase_3b]},
+			  testcase_2b]},
+
+      {test_group_4, [{test_group_5, [], [testcase_5a,
+
+					  {group, test_group_6},
+
+					  testcase_5b]}]},
+      {test_group_6, [{group, test_group_7}]},
+
+      {test_group_7, [testcase_7a,testcase_7b]}
+     ].
+
+all() ->
+    [testcase_1,
+     {group, test_group_1a},
+     {group, test_group_1b},
+     testcase_2,
+     {group, test_group_2},
+     testcase_3,
+     {group, test_group_4}].
+
+%% this func only for internal test purposes
+grs_and_tcs() ->
+    {[
+      test_group_1a, test_group_1b,
+      test_group_2, test_group_3,
+      test_group_4, test_group_5,
+      test_group_6, test_group_7
+     ],
+     [
+      testcase_1,
+      testcase_1a, testcase_1b,
+      testcase_2,
+      testcase_2a, testcase_2b,
+      testcase_3a, testcase_3b,
+      testcase_3,
+      testcase_5a, testcase_5b,
+      testcase_7a, testcase_7b
+     ]}.
+
+%%--------------------------------------------------------------------
+%% Suite Configuration
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    [{suite,init}|Config].
+
+end_per_suite(Config) ->
+    init = ?config(suite,Config).
+
+%%--------------------------------------------------------------------
+%% Group Configuration
+%%--------------------------------------------------------------------
+
+init_per_group(Group, Config) ->
+    [{name,Group}] = ?config(tc_group_properties,Config),
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    ct:comment(Group),
+	    init = ?config(suite,Config),
+	    [{Group,Group} | Config];
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+end_per_group(Group, Config) ->
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    ct:comment(Group),
+	    init = ?config(suite,Config),
+	    Group = ?config(Group,Config),
+	    ok;
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+%%--------------------------------------------------------------------
+%% Testcase Configuration
+%%--------------------------------------------------------------------
+
+init_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    [{TestCase,TestCase} | Config];
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+end_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    TestCase = ?config(TestCase,Config),
+	    ok;
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+
+%%--------------------------------------------------------------------
+%% Testcases
+%%--------------------------------------------------------------------
+
+testcase_1() ->
+    [].
+testcase_1(Config) ->
+    init = ?config(suite,Config),
+    testcase_1 = ?config(testcase_1,Config),
+    ok.
+
+testcase_1a() ->
+    [].
+testcase_1a(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    testcase_1a = ?config(testcase_1a,Config),
+    ok.
+testcase_1b() ->
+    [].
+testcase_1b(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    undefined = ?config(testcase_1a,Config),
+    testcase_1b = ?config(testcase_1b,Config),
+    ok.
+
+testcase_2() ->
+    [].
+testcase_2(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_1a,Config),
+    undefined = ?config(test_group_1b,Config),
+    testcase_2 = ?config(testcase_2,Config),
+    ok.
+
+testcase_2a() ->
+    [].
+testcase_2a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    testcase_2a = ?config(testcase_2a,Config),
+    ok.
+testcase_2b() ->
+    [].
+testcase_2b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    undefined = ?config(testcase_2a,Config),
+    testcase_2b = ?config(testcase_2b,Config),
+    ok.
+
+testcase_3a() ->
+    [].
+testcase_3a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_2b,Config),
+    testcase_3a = ?config(testcase_3a,Config),
+    ok.
+testcase_3b() ->
+    [].
+testcase_3b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_3a,Config),
+    testcase_3b = ?config(testcase_3b,Config),
+    ok.
+
+testcase_3() ->
+    [].
+testcase_3(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_2,Config),
+    undefined = ?config(test_group_3,Config),
+    testcase_3 = ?config(testcase_3,Config),
+    ok.
+
+testcase_5a() ->
+    [].
+testcase_5a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_3,Config),
+    testcase_5a = ?config(testcase_5a,Config),
+    ok.
+testcase_5b() ->
+    [].
+testcase_5b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_5a,Config),
+    testcase_5b = ?config(testcase_5b,Config),
+    ok.
+
+testcase_7a() ->
+    [].
+testcase_7a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    testcase_7a = ?config(testcase_7a,Config),
+    ok.
+testcase_7b() ->
+    [].
+testcase_7b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    undefined = ?config(testcase_7a,Config),
+    testcase_7b = ?config(testcase_7b,Config),
+    ok.
diff --git a/lib/common_test/test/ct_testspec_1_SUITE_data/groups_1/groups_12_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE_data/groups_1/groups_12_SUITE.erl
new file mode 100644
index 0000000000..69c06f9b83
--- /dev/null
+++ b/lib/common_test/test/ct_testspec_1_SUITE_data/groups_1/groups_12_SUITE.erl
@@ -0,0 +1,344 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2010. 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(groups_12_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%====================================================================
+%% COMMON TEST CALLBACK FUNCTIONS
+%%====================================================================
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+groups() ->
+    [
+      {test_group_1a, [shuffle], [testcase_1a,testcase_1b,testcase_1c]},
+
+      {test_group_1b, [parallel], [testcase_1a,testcase_1b]},
+
+      {test_group_2, [parallel], [testcase_2a,
+
+				  {test_group_3, [{repeat,2}],
+				   [testcase_3a, testcase_3b]},
+
+				  testcase_2b]},
+
+      {test_group_4, [{test_group_5, [parallel], [testcase_5a,
+
+						  {group, test_group_6},
+
+						  testcase_5b]}]},
+
+      {test_group_6, [parallel], [{group, test_group_7},
+				  {group, test_group_8}]},
+
+      {test_group_7, [sequence], [testcase_7a,testcase_7b]},
+
+      {test_group_8, [shuffle,sequence], [testcase_8a,testcase_8b]}
+     ].
+
+all() ->
+    [{group, test_group_1a},
+     {group, test_group_1b},
+     testcase_1,
+     testcase_2,
+     {group, test_group_2},
+     testcase_3,
+     {group, test_group_4}].
+
+%% this func only for internal test purposes
+grs_and_tcs() ->
+    {[
+      test_group_1a, test_group_1b,
+      test_group_2, test_group_3,
+      test_group_4, test_group_5,
+      test_group_6, test_group_7,
+      test_group_8
+     ],
+     [
+      testcase_1a, testcase_1b, testcase_1c,
+      testcase_1,
+      testcase_2,
+      testcase_2a, testcase_2b,
+      testcase_3a, testcase_3b,
+      testcase_3,
+      testcase_5a, testcase_5b,
+      testcase_7a, testcase_7b,
+      testcase_8a, testcase_8b
+     ]}.
+
+%%--------------------------------------------------------------------
+%% Suite Configuration
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    [{suite,init}|Config].
+
+end_per_suite(Config) ->
+    init = ?config(suite,Config).
+
+%%--------------------------------------------------------------------
+%% Group Configuration
+%%--------------------------------------------------------------------
+
+init_per_group(Group, Config) ->
+    Cmt =
+	case {Group,?config(tc_group_properties,Config)} of
+	    {test_group_1a,[{shuffle,S},{name,test_group_1a}]} ->
+		io_lib:format("shuffled, ~w", [S]);
+	    {test_group_1b,[{name,test_group_1b},parallel]} -> "parallel";
+	    {test_group_2,[{name,test_group_2},parallel]} -> "parallel";
+	    {test_group_3,[{name,test_group_3},{repeat,2}]} -> "repeat 2";
+	    {test_group_3,[{name,test_group_3}]} -> "repeat 1";
+	    {test_group_4,[{name,test_group_4}]} -> ok;
+	    {test_group_5,[{name,test_group_5},parallel]} -> "parallel";
+	    {test_group_6,[{name,test_group_6},parallel]} -> "parallel";
+	    {test_group_7,[{name,test_group_7},sequence]} -> "sequence";
+	    {test_group_8,[{shuffle,_},{name,test_group_8},sequence]} ->
+		"shuffle & sequence"
+	end,
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    init = ?config(suite,Config),
+	    ct:comment(io_lib:format("~w, ~s", [Group,Cmt])),
+	    [{Group,Group} | Config];
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+end_per_group(Group, Config) ->
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    init = ?config(suite,Config),
+	    Group = ?config(Group,Config),
+	    ok;
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+%%--------------------------------------------------------------------
+%% Testcase Configuration
+%%--------------------------------------------------------------------
+
+init_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    [{TestCase,TestCase} | Config];
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+end_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    TestCase = ?config(TestCase,Config),
+	    ok;
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+
+%%--------------------------------------------------------------------
+%% Testcases
+%%--------------------------------------------------------------------
+
+testcase_1a() ->
+    [].
+testcase_1a(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    testcase_1a = ?config(testcase_1a,Config),
+    ok.
+testcase_1b() ->
+    [].
+testcase_1b(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    undefined = ?config(testcase_1a,Config),
+    testcase_1b = ?config(testcase_1b,Config),
+    ok.
+
+testcase_1c() ->
+    [].
+testcase_1c(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    undefined = ?config(testcase_1b,Config),
+    testcase_1c = ?config(testcase_1c,Config),
+    ok.
+
+testcase_1() ->
+    [].
+testcase_1(Config) ->
+    init = ?config(suite,Config),
+    testcase_1 = ?config(testcase_1,Config),
+    ok.
+
+testcase_2() ->
+    [].
+testcase_2(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_1a,Config),
+    undefined = ?config(test_group_1b,Config),
+    testcase_2 = ?config(testcase_2,Config),
+    ok.
+
+testcase_2a() ->
+    [].
+testcase_2a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    testcase_2a = ?config(testcase_2a,Config),
+    ok.
+testcase_2b() ->
+    [].
+testcase_2b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    undefined = ?config(testcase_2a,Config),
+    testcase_2b = ?config(testcase_2b,Config),
+    ok.
+
+testcase_3a() ->
+    [].
+testcase_3a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_2b,Config),
+    testcase_3a = ?config(testcase_3a,Config),
+    ok.
+testcase_3b() ->
+    [].
+testcase_3b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_3a,Config),
+    testcase_3b = ?config(testcase_3b,Config),
+    ok.
+
+testcase_3() ->
+    [].
+testcase_3(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_2,Config),
+    undefined = ?config(test_group_3,Config),
+    testcase_3 = ?config(testcase_3,Config),
+    ok.
+
+testcase_5a() ->
+    [].
+testcase_5a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_3,Config),
+    testcase_5a = ?config(testcase_5a,Config),
+    %% increase chance the done event will come
+    %% during execution of subgroup (could be
+    %% tricky to handle)
+    timer:sleep(3),
+    ok.
+testcase_5b() ->
+    [].
+testcase_5b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_5a,Config),
+    testcase_5b = ?config(testcase_5b,Config),
+    ok.
+
+testcase_7a() ->
+    [].
+testcase_7a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    testcase_7a = ?config(testcase_7a,Config),
+    ok.
+testcase_7b() ->
+    [].
+testcase_7b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    undefined = ?config(testcase_7a,Config),
+    testcase_7b = ?config(testcase_7b,Config),
+    ok.
+
+testcase_8a() ->
+    [].
+testcase_8a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_8 = ?config(test_group_8,Config),
+    testcase_8a = ?config(testcase_8a,Config),
+    ok.
+testcase_8b() ->
+    [].
+testcase_8b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_8 = ?config(test_group_8,Config),
+    undefined = ?config(testcase_8a,Config),
+    testcase_8b = ?config(testcase_8b,Config),
+    ok.
diff --git a/lib/common_test/test/ct_testspec_1_SUITE_data/groups_2/groups_21_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE_data/groups_2/groups_21_SUITE.erl
new file mode 100644
index 0000000000..2533ac8e84
--- /dev/null
+++ b/lib/common_test/test/ct_testspec_1_SUITE_data/groups_2/groups_21_SUITE.erl
@@ -0,0 +1,281 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(groups_21_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%====================================================================
+%% COMMON TEST CALLBACK FUNCTIONS
+%%====================================================================
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+groups() ->
+    [
+      {test_group_1a, [testcase_1a,testcase_1b]},
+
+      {test_group_1b, [], [testcase_1a,testcase_1b]},
+
+      {test_group_2, [], [testcase_2a,
+
+			  {test_group_3, [], [testcase_3a,
+					      testcase_3b]},
+			  testcase_2b]},
+
+      {test_group_4, [{test_group_5, [], [testcase_5a,
+
+					  {group, test_group_6},
+
+					  testcase_5b]}]},
+
+      {test_group_6, [{group, test_group_7}]},
+
+      {test_group_7, [testcase_7a,testcase_7b]}
+     ].
+
+all() ->
+    [testcase_1,
+     {group, test_group_1a},
+     {group, test_group_1b},
+     testcase_2,
+     {group, test_group_2},
+     testcase_3,
+     {group, test_group_4}].
+
+%% this func only for internal test purposes
+grs_and_tcs() ->
+    {[
+      test_group_1a, test_group_1b,
+      test_group_2, test_group_3,
+      test_group_4, test_group_5,
+      test_group_6, test_group_7
+     ],
+     [
+      testcase_1,
+      testcase_1a, testcase_1b,
+      testcase_2,
+      testcase_2a, testcase_2b,
+      testcase_3a, testcase_3b,
+      testcase_3,
+      testcase_5a, testcase_5b,
+      testcase_7a, testcase_7b
+     ]}.
+
+%%--------------------------------------------------------------------
+%% Suite Configuration
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    [{suite,init}|Config].
+
+end_per_suite(Config) ->
+    init = ?config(suite,Config).
+
+%%--------------------------------------------------------------------
+%% Group Configuration
+%%--------------------------------------------------------------------
+
+init_per_group(Group, Config) ->
+    [{name,Group}] = ?config(tc_group_properties,Config),
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    ct:comment(io_lib:format("~w", [Group])),
+	    init = ?config(suite,Config),
+	    [{Group,Group} | Config];
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+end_per_group(Group, Config) ->
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    init = ?config(suite,Config),
+	    Group = ?config(Group,Config),
+	    ok;
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+%%--------------------------------------------------------------------
+%% Testcase Configuration
+%%--------------------------------------------------------------------
+
+init_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    [{TestCase,TestCase} | Config];
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+end_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    TestCase = ?config(TestCase,Config),
+	    ok;
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+
+%%--------------------------------------------------------------------
+%% Testcases
+%%--------------------------------------------------------------------
+
+testcase_1() ->
+    [].
+testcase_1(Config) ->
+    init = ?config(suite,Config),
+    testcase_1 = ?config(testcase_1,Config),
+    ok.
+
+testcase_1a() ->
+    [].
+testcase_1a(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    testcase_1a = ?config(testcase_1a,Config),
+    ok.
+testcase_1b() ->
+    [].
+testcase_1b(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    undefined = ?config(testcase_1a,Config),
+    testcase_1b = ?config(testcase_1b,Config),
+    ok.
+
+testcase_2() ->
+    [].
+testcase_2(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_1a,Config),
+    undefined = ?config(test_group_1b,Config),
+    testcase_2 = ?config(testcase_2,Config),
+    ok.
+
+testcase_2a() ->
+    [].
+testcase_2a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    testcase_2a = ?config(testcase_2a,Config),
+    ok.
+testcase_2b() ->
+    [].
+testcase_2b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    undefined = ?config(testcase_2a,Config),
+    testcase_2b = ?config(testcase_2b,Config),
+    ok.
+
+testcase_3a() ->
+    [].
+testcase_3a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_2b,Config),
+    testcase_3a = ?config(testcase_3a,Config),
+    ok.
+testcase_3b() ->
+    [].
+testcase_3b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_3a,Config),
+    testcase_3b = ?config(testcase_3b,Config),
+    ok.
+
+testcase_3() ->
+    [].
+testcase_3(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_2,Config),
+    undefined = ?config(test_group_3,Config),
+    testcase_3 = ?config(testcase_3,Config),
+    ok.
+
+testcase_5a() ->
+    [].
+testcase_5a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_3,Config),
+    testcase_5a = ?config(testcase_5a,Config),
+    ok.
+testcase_5b() ->
+    [].
+testcase_5b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_5a,Config),
+    testcase_5b = ?config(testcase_5b,Config),
+    ok.
+
+testcase_7a() ->
+    [].
+testcase_7a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    testcase_7a = ?config(testcase_7a,Config),
+    ok.
+testcase_7b() ->
+    [].
+testcase_7b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    undefined = ?config(testcase_7a,Config),
+    testcase_7b = ?config(testcase_7b,Config),
+    ok.
diff --git a/lib/common_test/test/ct_testspec_1_SUITE_data/groups_2/groups_22_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE_data/groups_2/groups_22_SUITE.erl
new file mode 100644
index 0000000000..cd517876df
--- /dev/null
+++ b/lib/common_test/test/ct_testspec_1_SUITE_data/groups_2/groups_22_SUITE.erl
@@ -0,0 +1,314 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(groups_22_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%====================================================================
+%% COMMON TEST CALLBACK FUNCTIONS
+%%====================================================================
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+groups() ->
+    [
+      {test_group_1a, [shuffle], [testcase_1a,testcase_1b,testcase_1c]},
+
+      {test_group_1b, [parallel], [testcase_1a,testcase_1b]},
+
+      {test_group_2, [parallel], [testcase_2a,
+
+				  {test_group_3, [{repeat,1}],
+				   [testcase_3a, testcase_3b]},
+
+				  testcase_2b]},
+
+      {test_group_4, [{test_group_5, [parallel], [testcase_5a,
+
+						  {group, test_group_6},
+
+						  testcase_5b]}]},
+
+      {test_group_6, [parallel], [{group, test_group_7}]},
+
+      {test_group_7, [sequence], [testcase_7a,testcase_7b]}
+     ].
+
+all() ->
+    [{group, test_group_1a},
+     {group, test_group_1b},
+     testcase_1,
+     testcase_2,
+     {group, test_group_2},
+     testcase_3,
+     {group, test_group_4}].
+
+%% this func only for internal test purposes
+grs_and_tcs() ->
+    {[
+      test_group_1a, test_group_1b,
+      test_group_2, test_group_3,
+      test_group_4, test_group_5,
+      test_group_6, test_group_7
+     ],
+     [
+      testcase_1a, testcase_1b, testcase_1c,
+      testcase_1,
+      testcase_2,
+      testcase_2a, testcase_2b,
+      testcase_3a, testcase_3b,
+      testcase_3,
+      testcase_5a, testcase_5b,
+      testcase_7a, testcase_7b
+     ]}.
+
+%%--------------------------------------------------------------------
+%% Suite Configuration
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    [{suite,init}|Config].
+
+end_per_suite(Config) ->
+    init = ?config(suite,Config).
+
+%%--------------------------------------------------------------------
+%% Group Configuration
+%%--------------------------------------------------------------------
+
+init_per_group(Group, Config) ->
+    Cmt =
+	case {Group,?config(tc_group_properties,Config)} of
+	    {test_group_1a,[{shuffle,S},{name,test_group_1a}]} ->
+		io_lib:format("shuffled, ~w", [S]);
+	    {test_group_1b,[{name,test_group_1b},parallel]} -> "parallel";
+	    {test_group_2,[{name,test_group_2},parallel]} -> "parallel";
+	    {test_group_3,[{name,test_group_3},{repeat,1}]} -> "repeat 1";
+	    {test_group_3,[{name,test_group_3}]} -> "repeat 0";
+	    {test_group_4,[{name,test_group_4}]} -> ok;
+	    {test_group_5,[{name,test_group_5},parallel]} -> "parallel";
+	    {test_group_6,[{name,test_group_6},parallel]} -> "parallel";
+	    {test_group_7,[{name,test_group_7},sequence]} -> "sequence"
+	end,
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    init = ?config(suite,Config),
+	    ct:comment(io_lib:format("~w, ~s", [Group,Cmt])),
+	    [{Group,Group} | Config];
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+end_per_group(Group, Config) ->
+    {Grs,_} = grs_and_tcs(),
+    case lists:member(Group, Grs) of
+	true ->
+	    init = ?config(suite,Config),
+	    Group = ?config(Group,Config),
+	    ok;
+	false ->
+	    ct:fail({bad_group,Group})
+    end.
+
+%%--------------------------------------------------------------------
+%% Testcase Configuration
+%%--------------------------------------------------------------------
+
+init_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    [{TestCase,TestCase} | Config];
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+end_per_testcase(TestCase, Config) ->
+    {_,TCs} = grs_and_tcs(),
+    case lists:member(TestCase, TCs) of
+	true ->
+	    init = ?config(suite,Config),
+	    TestCase = ?config(TestCase,Config),
+	    ok;
+	false ->
+	    ct:fail({unknown_testcase,TestCase})
+    end.
+
+
+%%--------------------------------------------------------------------
+%% Testcases
+%%--------------------------------------------------------------------
+
+testcase_1a() ->
+    [].
+testcase_1a(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    testcase_1a = ?config(testcase_1a,Config),
+    ok.
+testcase_1b() ->
+    [].
+testcase_1b(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    undefined = ?config(testcase_1a,Config),
+    testcase_1b = ?config(testcase_1b,Config),
+    ok.
+
+testcase_1c() ->
+    [].
+testcase_1c(Config) ->
+    init = ?config(suite,Config),
+    case ?config(test_group_1a,Config) of
+	test_group_1a -> ok;
+	_ ->
+	    case ?config(test_group_1b,Config) of
+		test_group_1b -> ok;
+		_ -> ct:fail(no_group_data)
+	    end
+    end,
+    undefined = ?config(testcase_1b,Config),
+    testcase_1c = ?config(testcase_1c,Config),
+    ok.
+
+testcase_1() ->
+    [].
+testcase_1(Config) ->
+    init = ?config(suite,Config),
+    testcase_1 = ?config(testcase_1,Config),
+    ok.
+
+testcase_2() ->
+    [].
+testcase_2(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_1a,Config),
+    undefined = ?config(test_group_1b,Config),
+    testcase_2 = ?config(testcase_2,Config),
+    ok.
+
+testcase_2a() ->
+    [].
+testcase_2a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    testcase_2a = ?config(testcase_2a,Config),
+    ok.
+testcase_2b() ->
+    [].
+testcase_2b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    undefined = ?config(testcase_2a,Config),
+    testcase_2b = ?config(testcase_2b,Config),
+    ok.
+
+testcase_3a() ->
+    [].
+testcase_3a(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_2b,Config),
+    testcase_3a = ?config(testcase_3a,Config),
+    ok.
+testcase_3b() ->
+    [].
+testcase_3b(Config) ->
+    init = ?config(suite,Config),
+    test_group_2 = ?config(test_group_2,Config),
+    test_group_3 = ?config(test_group_3,Config),
+    undefined = ?config(testcase_3a,Config),
+    testcase_3b = ?config(testcase_3b,Config),
+    ok.
+
+testcase_3() ->
+    [].
+testcase_3(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_2,Config),
+    undefined = ?config(test_group_3,Config),
+    testcase_3 = ?config(testcase_3,Config),
+    ok.
+
+testcase_5a() ->
+    [].
+testcase_5a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_3,Config),
+    testcase_5a = ?config(testcase_5a,Config),
+    %% increase chance the done event will come
+    %% during execution of subgroup (could be
+    %% tricky to handle)
+    timer:sleep(3),
+    ok.
+testcase_5b() ->
+    [].
+testcase_5b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    undefined = ?config(testcase_5a,Config),
+    testcase_5b = ?config(testcase_5b,Config),
+    ok.
+
+testcase_7a() ->
+    [].
+testcase_7a(Config) ->
+    init = ?config(suite,Config),
+    undefined = ?config(test_group_3,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    testcase_7a = ?config(testcase_7a,Config),
+    ok.
+testcase_7b() ->
+    [].
+testcase_7b(Config) ->
+    init = ?config(suite,Config),
+    test_group_4 = ?config(test_group_4,Config),
+    test_group_5 = ?config(test_group_5,Config),
+    test_group_6 = ?config(test_group_6,Config),
+    test_group_7 = ?config(test_group_7,Config),
+    undefined = ?config(testcase_7a,Config),
+    testcase_7b = ?config(testcase_7b,Config),
+    ok.
diff --git a/lib/common_test/test/ct_testspec_1_SUITE_data/suites_1/simple_1_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE_data/suites_1/simple_1_SUITE.erl
new file mode 100644
index 0000000000..b789851134
--- /dev/null
+++ b/lib/common_test/test/ct_testspec_1_SUITE_data/suites_1/simple_1_SUITE.erl
@@ -0,0 +1,146 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2010. 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(simple_1_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% COMMON TEST CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%%
+%% Info = [tuple()]
+%%   List of key/value pairs.
+%%
+%% Description: Returns list of tuples to set default properties
+%%              for the suite.
+%%
+%% Note: The suite/0 function is only meant to be used to return
+%% default data values, not perform any other operations.
+%%--------------------------------------------------------------------
+suite() ->
+    [
+     {timetrap,{seconds,10}}
+    ].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the suite.
+%%
+%% Description: Initialization before the 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) ->
+    [{ips,ips_data} | Config].
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%%
+%% Description: Cleanup after the suite.
+%%--------------------------------------------------------------------
+end_per_suite(Config) ->
+    ips_data = ?config(ips, Config).
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%%
+%% TestCase = atom()
+%%   Name of the test case that is about to run.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the test case.
+%%
+%% Description: Initialization before each test case.
+%%
+%% Note: This function is free to add any key/value pairs to the Config
+%% variable, but should NOT alter/remove any existing entries.
+%%--------------------------------------------------------------------
+init_per_testcase(TestCase, Config) ->
+    [{TestCase,{TestCase,data}} | Config].
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%%
+%% TestCase = atom()
+%%   Name of the test case that is finished.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%%
+%% Description: Cleanup after each test case.
+%%--------------------------------------------------------------------
+end_per_testcase(TestCase, Config) ->
+    {TestCase,data} = ?config(TestCase, Config).
+
+%%--------------------------------------------------------------------
+%% Function: all() -> TestCases | {skip,Reason}
+%%
+%% TestCases = [TestCase | {sequence,SeqName}]
+%% TestCase = atom()
+%%   Name of a test case.
+%% SeqName = atom()
+%%   Name of a test case sequence.
+%% Reason = term()
+%%   The reason for skipping all test cases.
+%%
+%% Description: Returns the list of test cases that are to be executed.
+%%--------------------------------------------------------------------
+all() ->
+    [tc1,
+     tc2].
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+tc1() ->
+    [{userdata,{info, "This is a testcase"}}].
+
+tc1(Config) ->
+    ips_data = ?config(ips, Config),
+    {tc1,data} = ?config(tc1, Config),
+    ok.
+
+tc2() ->
+    [{timetrap,5000}].
+
+tc2(Config) ->
+    ips_data = ?config(ips, Config),
+    undefined = ?config(tc1, Config),
+    {tc2,data} = ?config(tc2, Config),
+    ok.
diff --git a/lib/common_test/test/ct_testspec_1_SUITE_data/suites_1/simple_2_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE_data/suites_1/simple_2_SUITE.erl
new file mode 100644
index 0000000000..eb7e9cdf7b
--- /dev/null
+++ b/lib/common_test/test/ct_testspec_1_SUITE_data/suites_1/simple_2_SUITE.erl
@@ -0,0 +1,146 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2010. 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(simple_2_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% COMMON TEST CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%%
+%% Info = [tuple()]
+%%   List of key/value pairs.
+%%
+%% Description: Returns list of tuples to set default properties
+%%              for the suite.
+%%
+%% Note: The suite/0 function is only meant to be used to return
+%% default data values, not perform any other operations.
+%%--------------------------------------------------------------------
+suite() ->
+    [
+     {timetrap,{seconds,10}}
+    ].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the suite.
+%%
+%% Description: Initialization before the 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) ->
+    [{ips,ips_data} | Config].
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%%
+%% Description: Cleanup after the suite.
+%%--------------------------------------------------------------------
+end_per_suite(Config) ->
+    ips_data = ?config(ips, Config).
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%%
+%% TestCase = atom()
+%%   Name of the test case that is about to run.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the test case.
+%%
+%% Description: Initialization before each test case.
+%%
+%% Note: This function is free to add any key/value pairs to the Config
+%% variable, but should NOT alter/remove any existing entries.
+%%--------------------------------------------------------------------
+init_per_testcase(TestCase, Config) ->
+    [{TestCase,{TestCase,data}} | Config].
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%%
+%% TestCase = atom()
+%%   Name of the test case that is finished.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%%
+%% Description: Cleanup after each test case.
+%%--------------------------------------------------------------------
+end_per_testcase(TestCase, Config) ->
+    {TestCase,data} = ?config(TestCase, Config).
+
+%%--------------------------------------------------------------------
+%% Function: all() -> TestCases | {skip,Reason}
+%%
+%% TestCases = [TestCase | {sequence,SeqName}]
+%% TestCase = atom()
+%%   Name of a test case.
+%% SeqName = atom()
+%%   Name of a test case sequence.
+%% Reason = term()
+%%   The reason for skipping all test cases.
+%%
+%% Description: Returns the list of test cases that are to be executed.
+%%--------------------------------------------------------------------
+all() ->
+    [tc1,
+     tc2].
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+tc1() ->
+    [{userdata,{info, "This is a testcase"}}].
+
+tc1(Config) ->
+    ips_data = ?config(ips, Config),
+    {tc1,data} = ?config(tc1, Config),
+    ok.
+
+tc2() ->
+    [{timetrap,5000}].
+
+tc2(Config) ->
+    ips_data = ?config(ips, Config),
+    undefined = ?config(tc1, Config),
+    {tc2,data} = ?config(tc2, Config),
+    ok.
diff --git a/lib/common_test/test/ct_userconfig_callback.erl b/lib/common_test/test/ct_userconfig_callback.erl
new file mode 100644
index 0000000000..ca51bf240b
--- /dev/null
+++ b/lib/common_test/test/ct_userconfig_callback.erl
@@ -0,0 +1,32 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(ct_userconfig_callback).
+
+-export([check_parameter/1, read_config/1]).
+
+read_config(Str) ->
+    KeyVals = string:tokens(Str, " "),
+    {ok,read_config1(KeyVals)}.
+
+read_config1([Key,Val | KeyVals]) ->
+    [{list_to_atom(Key),Val} | read_config1(KeyVals)];
+read_config1([]) ->
+    [].
+
+check_parameter(Str) ->
+    {ok,{config,Str}}.
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index cdb8e1f71c..1a820848b5 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1,3 +1,3 @@
-COMMON_TEST_VSN = 1.4.8
+COMMON_TEST_VSN = 1.5.2
 
 
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index e1f24b602d..f2af932aef 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -164,6 +164,70 @@
               for details.</p>
           </item>
 
+          <tag><c>makedep</c></tag>
+          <item>
+            <p>Produce a Makefile rule to track headers dependencies.
+              No object file is produced.
+            </p>
+            <p>By default, this rule is written to
+              <c><![CDATA[<File>.Pbeam]]></c>. However, if the option
+                <c>binary</c> is set, nothing is written and the rule is
+                returned in <c>Binary</c>.
+            </p>
+            <p>For instance, if one has the following module:
+            </p>
+            <code>
+-module(module).
+
+-include_lib("eunit/include/eunit.hrl").
+-include("header.hrl").
+            </code>
+            <p>Here is the Makefile rule generated by this option:
+            </p>
+            <code>
+module.beam: module.erl \
+  /usr/local/lib/erlang/lib/eunit/include/eunit.hrl \
+  header.hrl
+            </code>
+          </item>
+
+          <tag><c>{makedep_output, Output}</c></tag>
+          <item>
+            <p>Write generated rule(s) to <c>Output</c> instead of the
+              default <c><![CDATA[<File>.Pbeam]]></c>. <c>Output</c>
+              can be a filename or an <c>io_device()</c>. To write to
+              stdout, use <c>standard_io</c>. However if <c>binary</c>
+              is set, nothing is written to <c>Output</c> and the
+              result is returned to the caller with
+              <c>{ok, ModuleName, Binary}</c>.
+            </p>
+          </item>
+
+          <tag><c>{makedep_target, Target}</c></tag>
+          <item>
+            <p>Change the name of the rule emitted to <c>Target</c>.
+            </p>
+          </item>
+
+          <tag><c>makedep_quote_target</c></tag>
+          <item>
+            <p>Characters in <c>Target</c> special to make(1) are quoted.
+            </p>
+          </item>
+
+          <tag><c>makedep_add_missing</c></tag>
+          <item>
+            <p>Consider missing headers as generated files and add them to the
+              dependencies.
+            </p>
+          </item>
+
+          <tag><c>makedep_phony</c></tag>
+          <item>
+            <p>Add a phony target for each dependency.
+            </p>
+          </item>
+
           <tag><c>'P'</c></tag>
           <item>
             <p>Produces a listing of the parsed code after preprocessing
@@ -310,9 +374,9 @@
 	    (there will not even be a warning if there is a mismatch).</p>
           </item>
 
-          <tag><c>{no_auto_import,[F/A, ...]}</c></tag>
+          <tag><c>{no_auto_import,[{F,A}, ...]}</c></tag>
           <item>
-	  <p>Makes the function <c>F/A</c> no longer beeing
+	  <p>Makes the function <c>F/A</c> no longer being
           auto-imported from the module <c>erlang</c>, which resolves
           BIF name clashes. This option has to be used to resolve name
           clashes with BIFs auto-imported before R14A, if one wants to
@@ -323,8 +387,12 @@
 	  without module prefix to local or imported functions before
 	  trying auto-imported BIFs. If the BIF is to be
 	  called, use the <c>erlang</c> module prefix in the call, not
-	  <c>{ no_auto_import,[F/A, ...]}</c></p>
+	  <c>{ no_auto_import,[{F,A}, ...]}</c></p>
 	  </note>
+	  <p>If this option is written in the source code, as a 
+	  <c>-compile</c> directive, the syntax <c>F/A</c> can be used instead 
+	  of <c>{F,A}</c>. Example:</p>
+	  <code>-compile({no_auto_import,[error/1]}).</code>
 	  </item>
 
         </taglist>
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 7ea000a895..9d89b17afb 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -31,6 +31,171 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 4.7.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Two compiler bugs (that would cause the compiler to
+	    terminate) reported by Christopher Williams have been
+	    fixed.</p>
+          <p>
+	    Own Id: OTP-8949</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The compiler would translate binary comprehensions
+	    containing tail segments in a way that would would
+	    confuse Dialyzer. For instance:</p>
+	    <p><c>[42 || &lt;&lt;_:8/integer, _/bits&gt;&gt; &lt;=
+	    Bits]</c></p>
+          <p>
+	    would produce a Dialyzer warning.</p>
+          <p>
+	    Own Id: OTP-8864</p>
+        </item>
+        <item>
+          <p>
+	    Code such as <c>foo(A) -&gt; &lt;&lt;A:0&gt;&gt;</c>
+	    would crash the compiler.</p>
+          <p>
+	    Own Id: OTP-8865</p>
+        </item>
+        <item>
+          <p>
+	    The compiler could fail with an internal error when
+	    variables were exported from a receive block but the
+	    return value of the receive block were not used. (Thanks
+	    to Jim Engquist for reporting this error.)</p>
+          <p>
+	    Own Id: OTP-8888</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 4.7.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Eliminated warnings for auto-imported BIF clashes.</p>
+          <p>
+	    Own Id: OTP-8840</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 4.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Several problems in the inliner have been fixed.</p>
+          <p>
+	    Own Id: OTP-8552</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The module binary from EEP31 (and EEP9) is implemented.</p>
+          <p>
+	    Own Id: OTP-8217</p>
+        </item>
+        <item>
+	    <p>Local and imported functions now override the
+	    auto-imported BIFs when the names clash. The pre R14
+	    behaviour was that auto-imported BIFs would override
+	    local functions. To avoid that old programs change
+	    behaviour, the following will generate an error:</p>
+	    <list><item><p>Doing a call without explicit module name
+	    to a local function having a name clashing with the name
+	    of an auto-imported BIF that was present (and
+	    auto-imported) before OTP R14A</p></item>
+	    <item><p>Explicitly importing a function having a name
+	    clashing with the name of an autoimported BIF that was
+	    present (and autoimported) before OTP R14A</p></item>
+	    <item><p>Using any form of the old compiler directive
+	    <c>nowarn_bif_clash</c></p></item> </list> <p>If the BIF
+	    was added or auto-imported in OTP R14A or later,
+	    overriding it with an import or a local function will
+	    only result in a warning,</p> <p>To resolve clashes, you
+	    can either use the explicit module name <c>erlang</c> to
+	    call the BIF, or you can remove the auto-import of that
+	    specific BIF by using the new compiler directive
+	    <c>-compile({no_auto_import,[F/A]}).</c>, which makes all
+	    calls to the local or imported function without explicit
+	    module name pass without warnings or errors.</p> <p>The
+	    change makes it possible to add auto-imported BIFs
+	    without breaking or silently changing old code in the
+	    future. However some current code ingeniously utilizing
+	    the old behaviour or the <c>nowarn_bif_clash</c> compiler
+	    directive, might need changing to be accepted by the
+	    compiler.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8579</p>
+        </item>
+        <item>
+	    <p>The undocumented, unsupport, and deprecated function
+	    <c>lists:flat_length/1</c> has been removed.</p>
+          <p>
+	    Own Id: OTP-8584</p>
+        </item>
+        <item>
+	    <p>Nested records can now be accessed without
+	    parenthesis. See the Reference Manual for examples.
+	    (Thanks to YAMASHINA Hio and Tuncer Ayaz.)</p>
+          <p>
+	    Own Id: OTP-8597</p>
+        </item>
+        <item>
+	    <p>It is now possible to suppress the warning in code
+	    such as "<c>list_to_integer(S), ok</c>" by assigning the
+	    ignored value "_" like this: "<c>_ = list_to_integer(S),
+	    ok</c>".</p>
+          <p>
+	    Own Id: OTP-8602</p>
+        </item>
+        <item>
+	    <p><c>receive</c> statements that can only read out a
+	    newly created reference are now specially optimized so
+	    that it will execute in constant time regardless of the
+	    number of messages in the receive queue for the process.
+	    That optimization will benefit calls to
+	    <c>gen_server:call()</c>. (See <c>gen:do_call/4</c> for
+	    an example of a receive statement that will be
+	    optimized.)</p>
+          <p>
+	    Own Id: OTP-8623</p>
+        </item>
+        <item>
+	    <p>The compiler optimizes record operations better.</p>
+          <p>
+	    Own Id: OTP-8668</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 4.6.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
index 0f6d2f6193..9da9253f5b 100644
--- a/lib/compiler/src/Makefile
+++ b/lib/compiler/src/Makefile
@@ -118,7 +118,9 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 ifeq ($(NATIVE_LIBS_ENABLED),yes)
 ERL_COMPILE_FLAGS += +native
 endif
-ERL_COMPILE_FLAGS += +inline +warn_unused_import -I../../stdlib/include -I$(EGEN) -W
+ERL_COMPILE_FLAGS += +inline +warn_unused_import \
+ +warnings_as_errors \
+ -I../../stdlib/include -I$(EGEN) -W
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index 9c6f835ab0..c45874597a 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -36,12 +36,13 @@ function({function,Name,Arity,CLabel,Is0}, Lc0) ->
 
 	%% Collect basic blocks and optimize them.
 	Is2 = blockify(Is1),
-	Is3 = beam_utils:live_opt(Is2),
-	Is4 = opt_blocks(Is3),
-	Is5 = beam_utils:delete_live_annos(Is4),
+	Is3 = move_allocates(Is2),
+	Is4 = beam_utils:live_opt(Is3),
+	Is5 = opt_blocks(Is4),
+	Is6 = beam_utils:delete_live_annos(Is5),
 
 	%% Optimize bit syntax.
-	{Is,Lc} = bsm_opt(Is5, Lc0),
+	{Is,Lc} = bsm_opt(Is6, Lc0),
 
 	%% Done.
 	{{function,Name,Arity,CLabel,Is},Lc}
@@ -156,11 +157,7 @@ opt_blocks([I|Is]) ->
 opt_blocks([]) -> [].
 
 opt_block(Is0) ->
-    %% We explicitly move any allocate instruction upwards before optimising
-    %% moves, to avoid any potential problems with the calculation of live
-    %% registers.
-    Is1 = move_allocates(Is0),
-    Is = find_fixpoint(fun opt/1, Is1),
+    Is = find_fixpoint(fun opt/1, Is0),
     opt_alloc(Is).
 
 find_fixpoint(OptFun, Is0) ->
@@ -170,11 +167,21 @@ find_fixpoint(OptFun, Is0) ->
     end.
 
 %% move_allocates(Is0) -> Is
-%%  Move allocates upwards in the instruction stream, in the hope of
-%%  getting more possibilities for optimizing away moves later.
-
-move_allocates(Is) ->
-    move_allocates_1(reverse(Is), []).
+%%  Move allocate instructions upwards in the instruction stream, in the
+%%  hope of getting more possibilities for optimizing away moves later.
+%%
+%%  NOTE: Moving allocation instructions is only safe because it is done
+%%  immediately after code generation so that we KNOW that if {x,X} is
+%%  initialized, all x registers with lower numbers are also initialized.
+%%  That assumption may not be true after other optimizations, such as
+%%  the beam_utils:live_opt/1 optimization.
+
+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([{set,[],[],{alloc,_,_}=Alloc}|Is0], Acc0) ->
     {Is,Acc} = move_allocates_2(Alloc, Is0, Acc0),
diff --git a/lib/compiler/src/beam_dict.erl b/lib/compiler/src/beam_dict.erl
index 4ffe8bc606..a1f994dfbd 100644
--- a/lib/compiler/src/beam_dict.erl
+++ b/lib/compiler/src/beam_dict.erl
@@ -33,7 +33,7 @@
 	 exports = []		    :: [{label(), arity(), label()}],
 	 locals = []		    :: [{label(), arity(), label()}],
 	 imports = gb_trees:empty() :: gb_tree(),      	%{{M,F,A},Index}
-	 strings = []		    :: [string()],	%String pool
+	 strings = <<>>		    :: binary(),	%String pool
 	 lambdas = [],				%[{...}]
 	 literals = dict:new()	    :: dict(),	%Format: {Literal,Number}
 	 next_atom = 1		    :: pos_integer(),
@@ -119,10 +119,11 @@ import(Mod0, Name0, Arity, #asm{imports=Imp0,next_import=NextIndex}=D0)
 
 string(Str, Dict) when is_list(Str) ->
     #asm{strings=Strings,string_offset=NextOffset} = Dict,
-    case old_string(Str, Strings) of
+    StrBin = list_to_binary(Str),
+    case old_string(StrBin, Strings) of
 	none ->
-	    NewDict = Dict#asm{strings=Strings++Str,
-			       string_offset=NextOffset+length(Str)},
+	    NewDict = Dict#asm{strings = <<Strings/binary,StrBin/binary>>,
+			       string_offset=NextOffset+byte_size(StrBin)},
 	    {NextOffset,NewDict};
 	Offset when is_integer(Offset) ->
 	    {NextOffset-Offset,Dict}
@@ -187,7 +188,7 @@ import_table(#asm{imports=Imp,next_import=NumImports}) ->
     ImpTab = [MFA || {MFA,_} <- Sorted],
     {NumImports,ImpTab}.
 
--spec string_table(bdict()) -> {non_neg_integer(), [string()]}.
+-spec string_table(bdict()) -> {non_neg_integer(), binary()}.
 
 string_table(#asm{strings=Strings,string_offset=Size}) ->
     {Size,Strings}.
@@ -217,15 +218,12 @@ literal_table(#asm{literals=Tab,next_literal=NumLiterals}) ->
 my_term_to_binary(Term) ->
     term_to_binary(Term, [{minor_version,1}]).
 
-%% Search for string Str in the string pool Pool.
+%% Search for binary string Str in the binary string pool Pool.
 %%    old_string(Str, Pool) -> none | Index
--spec old_string(string(), [string()]) -> 'none' | pos_integer().
-
-old_string([C|Str]=Str0, [C|Pool]) ->
-    case lists:prefix(Str, Pool) of
-	true -> length(Pool)+1;
-	false -> old_string(Str0, Pool)
-    end;
-old_string([_|_]=Str, [_|Pool]) ->
-    old_string(Str, Pool);
-old_string([_|_], []) -> none.
+-spec old_string(binary(), binary()) -> 'none' | pos_integer().
+
+old_string(Str, Pool) ->
+    case binary:match(Pool, Str) of
+        nomatch -> none;
+        {Start,_Length} -> byte_size(Pool) - Start
+    end.
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index 761d4ffec0..45cdf8a659 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -407,16 +407,23 @@ check_liveness(R, [{bif,Op,{f,Fail},Ss,D}|Is], St0) ->
 	Other ->
 	    Other
     end;
-check_liveness(R, [{gc_bif,Op,{f,Fail},_,Ss,D}|Is], St0) ->
-    case check_liveness_fail(R, Op, Ss, Fail, St0) of
-	{killed,St} = Killed ->
-	    case member(R, Ss) of
-		true -> {used,St};
-		false when R =:= D -> Killed;
-		false -> check_liveness(R, Is, St)
-	    end;
-	Other ->
-	    Other
+check_liveness(R, [{gc_bif,Op,{f,Fail},Live,Ss,D}|Is], St0) ->
+    case R of
+	{x,X} when X >= Live ->
+	    {killed,St0};
+	{x,_} ->
+	    {used,St0};
+	_ ->
+	    case check_liveness_fail(R, Op, Ss, Fail, St0) of
+		{killed,St}=Killed ->
+		    case member(R, Ss) of
+			true -> {used,St};
+			false when R =:= D -> Killed;
+			false -> check_liveness(R, Is, St)
+		    end;
+		Other ->
+		    Other
+	    end
     end;
 check_liveness(R, [{bs_add,{f,0},Ss,D}|Is], St) ->
     case member(R, Ss) of
@@ -482,10 +489,13 @@ check_liveness(R, [{bs_context_to_binary,S}|Is], St) ->
 	S -> {used,St};
 	_ -> check_liveness(R, Is, St)
     end;
-check_liveness(R, [{loop_rec,{f,_},{x,0}}|Is], St) ->
+check_liveness(R, [{loop_rec,{f,_},{x,0}}|_], St) ->
     case R of
-	{x,_} -> {killed,St};
-	_ -> check_liveness(R, Is, St)
+	{x,_} ->
+	    {killed,St};
+	_ ->
+	    %% y register. Rarely happens. Be very conversative.
+	    {unknown,St}
     end;
 check_liveness(R, [{loop_rec_end,{f,Fail}}|_], St) ->
     check_liveness_at(R, Fail, St);
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index f3a2b01e04..fb267b35b6 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -20,6 +20,8 @@
 
 -compile({no_auto_import,[min/2]}).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([file/1, files/1]).
 
 %% Interface for compiler.
diff --git a/lib/compiler/src/cerl.erl b/lib/compiler/src/cerl.erl
index d1fd9d40e2..4b74d60e9f 100644
--- a/lib/compiler/src/cerl.erl
+++ b/lib/compiler/src/cerl.erl
@@ -973,7 +973,7 @@ atom_name(Node) ->
 
 %% TODO: replace the use of the unofficial 'write_string/2'.
 
--spec atom_lit(cerl()) -> string().
+-spec atom_lit(cerl()) -> nonempty_string().
 
 atom_lit(Node) ->
     io_lib:write_string(atom_name(Node), $'). %' stupid Emacs.
@@ -1079,7 +1079,7 @@ char_val(Node) ->
 %%
 %% @see c_char/1
 
--spec char_lit(c_literal()) -> string().
+-spec char_lit(c_literal()) -> nonempty_string().
 
 char_lit(Node) ->
     io_lib:write_char(char_val(Node)).
@@ -1178,7 +1178,7 @@ string_val(Node) ->
 %%
 %% @see c_string/1
 
--spec string_lit(c_literal()) -> string().
+-spec string_lit(c_literal()) -> nonempty_string().
 
 string_lit(Node) ->
     io_lib:write_string(string_val(Node)).
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index 4642fb68b3..ce8a5bf864 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -41,8 +41,7 @@
 
 -type option() :: atom() | {atom(), term()} | {'d', atom(), term()}.
 
--type line()     :: integer().
--type err_info() :: {line(), module(), term()}. %% ErrorDescriptor
+-type err_info() :: {erl_scan:line(), module(), term()}. %% ErrorDescriptor
 -type errors()   :: [{file:filename(), [err_info()]}].
 -type warnings() :: [{file:filename(), [err_info()]}].
 -type mod_ret()  :: {'ok', module()}
@@ -70,7 +69,7 @@
 
 file(File) -> file(File, ?DEFAULT_OPTIONS).
 
--spec file(module() | file:filename(), [option()]) -> comp_ret().
+-spec file(module() | file:filename(), [option()] | option()) -> comp_ret().
 
 file(File, Opts) when is_list(Opts) ->
     do_compile({file,File}, Opts++env_default_opts());
@@ -88,6 +87,8 @@ forms(Forms, Opt) when is_atom(Opt) ->
 %% would have generated a Beam file, false otherwise (if only a binary or a
 %% listing file would have been generated).
 
+-spec output_generated([option()]) -> boolean().
+
 output_generated(Opts) ->
     noenv_output_generated(Opts++env_default_opts()).
 
@@ -96,6 +97,8 @@ output_generated(Opts) ->
 %% for default options.
 %%
 
+-spec noenv_file(module() | file:filename(), [option()] | option()) -> comp_ret().
+
 noenv_file(File, Opts) when is_list(Opts) ->
     do_compile({file,File}, Opts);
 noenv_file(File, Opt) ->
@@ -106,10 +109,13 @@ noenv_forms(Forms, Opts) when is_list(Opts) ->
 noenv_forms(Forms, Opt) when is_atom(Opt) ->
     noenv_forms(Forms, [Opt|?DEFAULT_OPTIONS]).
 
+-spec noenv_output_generated([option()]) -> boolean().
+
 noenv_output_generated(Opts) ->
+    {_,Passes} = passes(file, expand_opts(Opts)),
     any(fun ({save_binary,_F}) -> true;
 	    (_Other) -> false
-	end, passes(file, expand_opts(Opts))).
+	end, Passes).
 
 %%
 %%  Local functions
@@ -200,6 +206,9 @@ format_error(write_error) ->
 format_error({rename,From,To,Error}) ->
     io_lib:format("failed to rename ~s to ~s: ~s",
 		  [From,To,file:format_error(Error)]);
+format_error({delete,File,Error}) ->
+    io_lib:format("failed to delete file ~s: ~s",
+		  [File,file:format_error(Error)]);
 format_error({delete_temp,File,Error}) ->
     io_lib:format("failed to delete temporary file ~s: ~s",
 		  [File,file:format_error(Error)]);
@@ -216,16 +225,16 @@ format_error({module_name,Mod,Filename}) ->
 		  [Mod,Filename]).
 
 %% The compile state record.
--record(compile, {filename="",
-		  dir="",
-		  base="",
-		  ifile="",
-		  ofile="",
+-record(compile, {filename="" :: file:filename(),
+		  dir=""      :: file:filename(),
+		  base=""     :: file:filename(),
+		  ifile=""    :: file:filename(),
+		  ofile=""    :: file:filename(),
 		  module=[],
 		  code=[],
 		  core_code=[],
 		  abstract_code=[],		%Abstract code for debugger.
-		  options=[],
+		  options=[]  :: [option()],
 		  errors=[],
 		  warnings=[]}).
 
@@ -235,26 +244,12 @@ internal(Master, Input, Opts) ->
 		      end}.
 
 internal({forms,Forms}, Opts) ->
-    Ps = passes(forms, Opts),
+    {_,Ps} = passes(forms, Opts),
     internal_comp(Ps, "", "", #compile{code=Forms,options=Opts});
 internal({file,File}, Opts) ->
-    Ps = passes(file, Opts),
+    {Ext,Ps} = passes(file, Opts),
     Compile = #compile{options=Opts},
-    case member(from_core, Opts) of
-	true -> internal_comp(Ps, File, ".core", Compile);
-	false ->
-	    case member(from_beam, Opts) of
-		true ->
-		    internal_comp(Ps, File, ".beam", Compile);
-		false ->
-		    case member(from_asm, Opts) orelse member(asm, Opts) of
-			true ->
-			    internal_comp(Ps, File, ".S", Compile);
-			false ->
-			    internal_comp(Ps, File, ".erl", Compile)
-		    end
-	    end
-    end.
+    internal_comp(Ps, File, Ext, Compile).
 
 internal_comp(Passes, File, Suffix, St0) ->
     Dir = filename:dirname(File),
@@ -362,42 +357,52 @@ mpf(Ms) ->
     [{File,[M || {F,M} <- Ms, F =:= File]} ||
 	File <- lists:usort([F || {F,_} <- Ms])].
 
-%% passes(form|file, [Option]) -> [{Name,PassFun}]
-%%  Figure out which passes that need to be run.
-
-passes(forms, Opts) ->
-    case member(from_core, Opts) of
-	true ->
-	    select_passes(core_passes(), Opts);
-	false ->
-	    select_passes(standard_passes(), Opts)
+%% passes(forms|file, [Option]) -> {Extension,[{Name,PassFun}]}
+%%  Figure out the extension of the input file and which passes
+%%  that need to be run.
+
+passes(Type, Opts) ->
+    {Ext,Passes0} = passes_1(Opts),
+    Passes1 = case Type of
+		  file -> Passes0;
+		  forms -> tl(Passes0)
+	      end,
+    Passes = select_passes(Passes1, Opts),
+
+    %% If the last pass saves the resulting binary to a file,
+    %% insert a first pass to remove the file (unless the
+    %% source file is a BEAM file).
+    {Ext,case last(Passes) of
+	     {save_binary,_Fun} ->
+		 case Passes of
+		     [{read_beam_file,_}|_] ->
+			 %% The BEAM is both input and output.
+			 %% Don't remove it.
+			 Passes;
+		     _ ->
+			 [?pass(remove_file)|Passes]
+		 end;
+	     _ ->
+		 Passes
+	 end}.
+
+passes_1([Opt|Opts]) ->
+    case pass(Opt) of
+	{_,_}=Res -> Res;
+	none -> passes_1(Opts)
     end;
-passes(file, Opts) ->
-    case member(from_beam, Opts) of
-	true ->
-	    Ps = [?pass(read_beam_file)|binary_passes()],
-	    select_passes(Ps, Opts);
-	false ->
-	    Ps = case member(from_asm, Opts) orelse member(asm, Opts) of
-		     true ->
-			 [?pass(beam_consult_asm)|asm_passes()];
-		     false ->
-			 case member(from_core, Opts) of
-			     true ->
-				 [?pass(parse_core)|core_passes()];
-			     false ->
-				 [?pass(parse_module)|standard_passes()]
-			 end
-		 end,
-	    Fs = select_passes(Ps, Opts),
-
-	    %% If the last pass saves the resulting binary to a file,
-	    %% insert a first pass to remove the file.
-	    case last(Fs)  of
-		{save_binary,_Fun} -> [?pass(remove_file)|Fs];
-		_Other -> Fs
-	    end
-    end.
+passes_1([]) ->
+    {".erl",[?pass(parse_module)|standard_passes()]}.
+
+pass(from_core) ->
+    {".core",[?pass(parse_core)|core_passes()]};
+pass(from_asm) ->
+    {".S",[?pass(beam_consult_asm)|asm_passes()]};
+pass(asm) ->
+    pass(from_asm);
+pass(from_beam) ->
+    {".beam",[?pass(read_beam_file)|binary_passes()]};
+pass(_) -> none.
 
 %% select_passes([Command], Opts) -> [{Name,Function}]
 %%  Interpret the lists of commands to return a pure list of passes.
@@ -430,6 +435,8 @@ passes(file, Opts) ->
 %%			file will be Ext.  (Ext should not contain
 %%			a period.)   No more passes will be run.
 %%
+%%    done              End compilation at this point.
+%%
 %%    {done,Ext}        End compilation at this point. Produce a listing
 %%                      as with {listing,Ext}, unless 'binary' is
 %%                      specified, in which case the current
@@ -463,6 +470,8 @@ select_passes([{src_listing,Ext}|_], _Opts) ->
     [{listing,fun (St) -> src_listing(Ext, St) end}];
 select_passes([{listing,Ext}|_], _Opts) ->
     [{listing,fun (St) -> listing(Ext, St) end}];
+select_passes([done|_], _Opts) ->
+    [];
 select_passes([{done,Ext}|_], Opts) ->
     select_passes([{unless,binary,{listing,Ext}}], Opts);
 select_passes([{iff,Flag,Pass}|Ps], Opts) ->
@@ -545,6 +554,13 @@ select_list_passes_1([], _, Acc) ->
 
 standard_passes() ->
     [?pass(transform_module),
+
+     {iff,makedep,[
+	 ?pass(makedep),
+	 {unless,binary,?pass(makedep_output)}
+       ]},
+     {iff,makedep,done},
+
      {iff,'dpp',{listing,"pp"}},
      ?pass(lint_module),
      {iff,'P',{src_listing,"P"}},
@@ -819,6 +835,10 @@ foldl_transform(St, [T|Ts]) ->
 	{'EXIT',R} ->
 	    Es = [{St#compile.ifile,[{none,compile,{parse_transform,T,R}}]}],
 	    {error,St#compile{errors=St#compile.errors ++ Es}};
+	{warning, Forms, Ws} ->
+	    foldl_transform(
+	      St#compile{code=Forms,
+			 warnings=St#compile.warnings ++ Ws}, Ts);
 	Forms ->
 	    foldl_transform(St#compile{code=Forms}, Ts)
     end;
@@ -828,7 +848,6 @@ get_core_transforms(Opts) -> [M || {core_transform,M} <- Opts].
 
 core_transforms(St) ->
     %% The options field holds the complete list of options at this
-
     Ts = get_core_transforms(St#compile.options),
     foldl_core_transforms(St, Ts).
 
@@ -893,6 +912,184 @@ core_lint_module(St) ->
 			      errors=St#compile.errors ++ Es}}
     end.
 
+makedep(#compile{code=Code,options=Opts}=St) ->
+    Ifile = St#compile.ifile,
+    Ofile = St#compile.ofile,
+
+    %% Get the target of the Makefile rule.
+    Target0 =
+	case proplists:get_value(makedep_target, Opts) of
+	    undefined ->
+		%% The target is derived from the output filename: possibly
+		%% remove the current working directory to obtain a relative
+		%% path.
+		shorten_filename(Ofile);
+	    T ->
+		%% The caller specified one.
+		T
+	end,
+
+    %% Quote the target is the called asked for this.
+    Target1 = case proplists:get_value(makedep_quote_target, Opts) of
+		  true ->
+		      %% For now, only "$" is replaced by "$$".
+		      Fun = fun
+				($$) -> "$$";
+				(C)  -> C
+			    end,
+		      map(Fun, Target0);
+		  _ ->
+		      Target0
+	      end,
+    Target = Target1 ++ ":",
+
+    %% List the dependencies (includes) for this target.
+    {MainRule,PhonyRules} = makedep_add_headers(
+      Ifile,          % The input file name.
+      Code,           % The parsed source.
+      [],             % The list of dependencies already added.
+      length(Target), % The current line length.
+      Target,         % The target.
+      "",             % Phony targets.
+      Opts),
+
+    %% Prepare the content of the Makefile. For instance:
+    %%   hello.erl: hello.hrl common.hrl
+    %%
+    %% Or if phony targets are enabled:
+    %%   hello.erl: hello.hrl common.hrl
+    %%
+    %%   hello.hrl:
+    %%
+    %%   common.hrl:
+    Makefile = case proplists:get_value(makedep_phony, Opts) of
+		   true -> MainRule ++ PhonyRules;
+		   _ -> MainRule
+	       end,
+    {ok,St#compile{code=iolist_to_binary([Makefile,"\n"])}}.
+
+makedep_add_headers(Ifile, [{attribute,_,file,{File,_}}|Rest],
+		    Included, LineLen, MainTarget, Phony, Opts) ->
+    %% The header "File" exists, add it to the dependencies.
+    {Included1,LineLen1,MainTarget1,Phony1} =
+	makedep_add_header(Ifile, Included, LineLen, MainTarget, Phony, File),
+    makedep_add_headers(Ifile, Rest, Included1, LineLen1,
+			MainTarget1, Phony1, Opts);
+makedep_add_headers(Ifile, [{error,{_,epp,{include,file,File}}}|Rest],
+		    Included, LineLen, MainTarget, Phony, Opts) ->
+    %% The header "File" doesn't exist, do we add it to the dependencies?
+    case proplists:get_value(makedep_add_missing, Opts) of
+        true ->
+            {Included1,LineLen1,MainTarget1,Phony1} =
+		makedep_add_header(Ifile, Included, LineLen, MainTarget,
+				   Phony, File),
+            makedep_add_headers(Ifile, Rest, Included1, LineLen1,
+				MainTarget1, Phony1, Opts);
+        _ ->
+            makedep_add_headers(Ifile, Rest, Included, LineLen,
+				MainTarget, Phony, Opts)
+    end;
+makedep_add_headers(Ifile, [_|Rest], Included, LineLen,
+		    MainTarget, Phony, Opts) ->
+    makedep_add_headers(Ifile, Rest, Included,
+			LineLen, MainTarget, Phony, Opts);
+makedep_add_headers(_Ifile, [], _Included, _LineLen,
+		    MainTarget, Phony, _Opts) ->
+    {MainTarget,Phony}.
+
+makedep_add_header(Ifile, Included, LineLen, MainTarget, Phony, File) ->
+    case member(File, Included) of
+	true ->
+	    %% This file was already listed in the dependencies, skip it.
+            {Included,LineLen,MainTarget,Phony};
+	false ->
+            Included1 = [File|Included],
+
+	    %% Remove "./" in front of the dependency filename.
+	    File1 = case File of
+			"./" ++ File0 -> File0;
+			_ -> File
+	    end,
+
+	    %% Prepare the phony target name.
+	    Phony1 = case File of
+			 Ifile -> Phony;
+			 _     -> Phony ++ "\n\n" ++ File1 ++ ":"
+	    end,
+
+	    %% Add the file to the dependencies. Lines longer than 76 columns
+	    %% are splitted.
+	    if
+		LineLen + 1 + length(File1) > 76 ->
+                    LineLen1 = 2 + length(File1),
+                    MainTarget1 = MainTarget ++ " \\\n  " ++ File1,
+                    {Included1,LineLen1,MainTarget1,Phony1};
+		true ->
+                    LineLen1 = LineLen + 1 + length(File1),
+                    MainTarget1 = MainTarget ++ " " ++ File1,
+                    {Included1,LineLen1,MainTarget1,Phony1}
+	    end
+    end.
+
+makedep_output(#compile{code=Code,options=Opts,ofile=Ofile}=St) ->
+    %% Write this Makefile (Code) to the selected output.
+    %% If no output is specified, the default is to write to a file named after
+    %% the output file.
+    Output0 = case proplists:get_value(makedep_output, Opts) of
+		  undefined ->
+		      %% Prepare the default filename.
+		      outfile(filename:basename(Ofile, ".beam"), "Pbeam", Opts);
+		  O ->
+		      O
+	      end,
+
+    %% If the caller specified an io_device(), there's nothing to do. If he
+    %% specified a filename, we must create it. Furthermore, this created file
+    %% must be closed before returning.
+    Ret = case Output0 of
+	      _ when is_list(Output0) ->
+		  case file:delete(Output0) of
+		      Ret2 when Ret2 =:= ok; Ret2 =:= {error,enoent} ->
+			  case file:open(Output0, [write]) of
+			      {ok,IODev} ->
+				  {ok,IODev,true};
+			      {error,Reason2} ->
+				  {error,open,Reason2}
+			  end;
+		      {error,Reason1} ->
+			  {error,delete,Reason1}
+		  end;
+	      _ ->
+		  {ok,Output0,false}
+	  end,
+
+    case Ret of
+	{ok,Output1,CloseOutput} ->
+	    try
+		%% Write the Makefile.
+		io:fwrite(Output1, "~s", [Code]),
+		%% Close the file if relevant.
+		if
+		    CloseOutput -> file:close(Output1);
+		    true -> ok
+		end,
+		{ok,St}
+	    catch
+		exit:_ ->
+		    %% Couldn't write to output Makefile.
+		    Err = {St#compile.ifile,[{none,?MODULE,write_error}]},
+		    {error,St#compile{errors=St#compile.errors++[Err]}}
+	    end;
+	{error,open,Reason} ->
+	    %% Couldn't open output Makefile.
+	    Err = {St#compile.ifile,[{none,?MODULE,{open,Reason}}]},
+	    {error,St#compile{errors=St#compile.errors++[Err]}};
+	{error,delete,Reason} ->
+	    %% Couldn't open output Makefile.
+	    Err = {St#compile.ifile,[{none,?MODULE,{delete,Output0,Reason}}]},
+	    {error,St#compile{errors=St#compile.errors++[Err]}}
+    end.
+
 %% expand_module(State) -> State'
 %%  Do the common preprocessing of the input forms.
 
@@ -1172,12 +1369,12 @@ write_binary(Name, Bin, St) ->
 %% report_errors(State) -> ok
 %% report_warnings(State) -> ok
 
-report_errors(St) ->
-    case member(report_errors, St#compile.options) of
+report_errors(#compile{options=Opts,errors=Errors}) ->
+    case member(report_errors, Opts) of
 	true ->
 	    foreach(fun ({{F,_L},Eds}) -> list_errors(F, Eds);
 			({F,Eds}) -> list_errors(F, Eds) end,
-		    St#compile.errors);
+		    Errors);
 	false -> ok
     end.
 
diff --git a/lib/compiler/src/core_lint.erl b/lib/compiler/src/core_lint.erl
index b633f568c9..b513a8965c 100644
--- a/lib/compiler/src/core_lint.erl
+++ b/lib/compiler/src/core_lint.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -65,7 +65,8 @@
                   | {'return_mismatch', fa()} | {'undefined_function', fa()}
                   | {'duplicate_var', cerl:var_name(), fa()}
                   | {'unbound_var', cerl:var_name(), fa()}
-                  | {'undefined_function', fa(), fa()}.
+                  | {'undefined_function', fa(), fa()}
+                  | {'tail_segment_not_at_end', fa()}.
 
 -type error()    :: {module(), err_desc()}.
 -type warning()  :: {module(), term()}.
@@ -116,7 +117,9 @@ format_error({duplicate_var,N,{F,A}}) ->
 format_error({unbound_var,N,{F,A}}) ->
     io_lib:format("unbound variable ~s in ~w/~w", [N,F,A]);
 format_error({undefined_function,{F1,A1},{F2,A2}}) ->
-    io_lib:format("undefined function ~w/~w in ~w/~w", [F1,A1,F2,A2]).
+    io_lib:format("undefined function ~w/~w in ~w/~w", [F1,A1,F2,A2]);
+format_error({tail_segment_not_at_end,{F,A}}) ->
+    io_lib:format("binary tail segment not at end in ~w/~w", [F,A]).
 
 -type ret() :: {'ok', [{module(), [warning(),...]}]}
              | {'error', [{module(), [error(),...]}],
@@ -450,7 +453,8 @@ pattern(#c_cons{hd=H,tl=T}, Def, Ps, St) ->
     pattern_list([H,T], Def, Ps, St);
 pattern(#c_tuple{es=Es}, Def, Ps, St) ->
     pattern_list(Es, Def, Ps, St);
-pattern(#c_binary{segments=Ss}, Def, Ps, St) ->
+pattern(#c_binary{segments=Ss}, Def, Ps, St0) ->
+    St = pat_bin_tail_check(Ss, St0),
     pat_bin(Ss, Def, Ps, St);
 pattern(#c_alias{var=V,pat=P}, Def, Ps, St0) ->
     {Vvs,St1} = variable(V, Ps, St0),
@@ -482,6 +486,19 @@ pat_segment(#c_bitstr{val=V,size=S,type=T}, Def0, Ps0, St0) ->
 pat_segment(_, Def, Ps, St) ->
     {Ps,Def,add_error({not_bs_pattern,St#lint.func}, St)}.
 
+%% pat_bin_tail_check([Elem], State) -> State.
+%%  There must be at most one tail segment (a size-less segment of
+%%  type binary) and it must occur at the end.
+
+pat_bin_tail_check([#c_bitstr{size=#c_literal{val=all}}], St) ->
+    %% Size-less field is OK at the end of the list of segments.
+    St;
+pat_bin_tail_check([#c_bitstr{size=#c_literal{val=all}}|_], St) ->
+    add_error({tail_segment_not_at_end,St#lint.func}, St);
+pat_bin_tail_check([_|Ss], St) ->
+    pat_bin_tail_check(Ss, St);
+pat_bin_tail_check([], St) -> St.
+
 %% pat_bit_expr(SizePat, Type, Defined, State) -> State.
 %%  Check the Size pattern, this is an input!  Because of optimizations,
 %%  we must allow any kind of constant and literal here.
diff --git a/lib/compiler/src/rec_env.erl b/lib/compiler/src/rec_env.erl
index 77005a6f9d..31a1f8b0b7 100644
--- a/lib/compiler/src/rec_env.erl
+++ b/lib/compiler/src/rec_env.erl
@@ -34,8 +34,6 @@
 
 -export_type([environment/0]).
 
--import(erlang, [max/2]).
-
 -ifdef(DEBUG).
 -export([test/1, test_custom/1, test_custom/2]).
 -endif.
@@ -588,7 +586,7 @@ new_key(N, R, _T, F, Env) ->
     new_key(generate(N, R1), R1, 0, F, Env).
 
 start_range(Env) ->
-    max(env_size(Env) * ?START_RANGE_FACTOR, ?MINIMUM_RANGE).
+    erlang:max(env_size(Env) * ?START_RANGE_FACTOR, ?MINIMUM_RANGE).
 
 %% The previous key might or might not be used to compute the next key
 %% to be tried. It is currently not used.
diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl
index 948937c438..f24a46c5a9 100644
--- a/lib/compiler/src/v3_codegen.erl
+++ b/lib/compiler/src/v3_codegen.erl
@@ -235,7 +235,7 @@ 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, St0#cg.ultimate_failure,
+    {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),
@@ -1523,7 +1523,9 @@ cg_binary_size_1([], Bits, Acc) ->
 	[{1,_}|_] ->
 	    {bs_init_bits,cg_binary_bytes_to_bits(Sizes, [])};
 	[{8,_}|_] ->
-	    {bs_init2,[E || {8,E} <- Sizes]}
+	    {bs_init2,[E || {8,E} <- Sizes]};
+	[] ->
+	    {bs_init_bits,[]}
     end.
 
 cg_binary_size_2({integer,N}, U, _, Next, Bits, Acc) ->
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index f6bb45787c..2da24b2908 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -892,25 +892,22 @@ lc_tq(Line, E, [{generate,Lg,P,G}|Qs0], Mc, St0) ->
 lc_tq(Line, E, [{b_generate,Lg,P,G}|Qs0], Mc, St0) ->
     {Gs,Qs1} =  splitwith(fun is_guard_test/1, Qs0),
     {Name,St1} = new_fun_name("blc", St0),
-    {Tname,St2} = new_var_name(St1),
-    LA = lineno_anno(Line, St2),
+    LA = lineno_anno(Line, St1),
     LAnno = #a{anno=LA},
-    HeadBinPattern = pattern(P,St2),
-    #c_binary{segments=Ps} = HeadBinPattern,
-    {EPs,St3} = emasculate_segments(Ps,St2),
-    Tail = #c_var{anno=LA,name=Tname},
-    TailSegment = #c_bitstr{val=Tail,size=#c_literal{val=all},
-			    unit=#c_literal{val=1},
-			    type=#c_literal{val=binary},
-			    flags=#c_literal{val=[big,unsigned]}},
-    Pattern = HeadBinPattern#c_binary{segments=Ps ++ [TailSegment]},
-    EPattern = HeadBinPattern#c_binary{segments=EPs ++ [TailSegment]},
+    HeadBinPattern = pattern(P, St1),
+    #c_binary{segments=Ps0} = HeadBinPattern,
+    {Ps,Tail,St2} = append_tail_segment(Ps0, St1),
+    {EPs,St3} = emasculate_segments(Ps, St2),
+    Pattern = HeadBinPattern#c_binary{segments=Ps},
+    EPattern = HeadBinPattern#c_binary{segments=EPs},
     {Arg,St4} = new_var(St3),
     {Guardc,St5} = lc_guard_tests(Gs, St4),	%These are always flat!
+    Tname = Tail#c_var.name,
     {Nc,[],St6} = expr({call,Lg,{atom,Lg,Name},[{var,Lg,Tname}]}, St5),
     {Bc,Bps,St7} = lc_tq(Line, E, Qs1, Nc, St6),
     {Gc,Gps,St10} = safe(G, St7),		%Will be a function argument!
     Fc = function_clause([Arg], LA, {Name,1}),
+    {TailSegList,_,St} = append_tail_segment([], St10),
     Cs = [#iclause{anno=#a{anno=[compiler_generated|LA]},
 		   pats=[Pattern],
 		   guard=Guardc,
@@ -922,14 +919,14 @@ lc_tq(Line, E, [{b_generate,Lg,P,G}|Qs0], Mc, St0) ->
 				 op=#c_var{anno=LA,name={Name,1}},
 				 args=[Tail]}]},
 	  #iclause{anno=LAnno,
-		   pats=[#c_binary{anno=LA, segments=[TailSegment]}],guard=[],
+		   pats=[#c_binary{anno=LA,segments=TailSegList}],guard=[],
 		   body=[Mc]}],
     Fun = #ifun{anno=LAnno,id=[],vars=[Arg],clauses=Cs,fc=Fc},
     {#iletrec{anno=LAnno,defs=[{{Name,1},Fun}],
 	      body=Gps ++ [#iapply{anno=LAnno,
 				   op=#c_var{anno=LA,name={Name,1}},
 				   args=[Gc]}]},
-     [],St10};
+     [],St};
 lc_tq(Line, E, [Fil0|Qs0], Mc, St0) ->
     %% Special case sequences guard tests.
     LA = lineno_anno(Line, St0),
@@ -1037,26 +1034,24 @@ bc_tq1(Line, E, [{b_generate,Lg,P,G}|Qs0], AccExpr, St0) ->
     {Gs,Qs1} =  splitwith(fun is_guard_test/1, Qs0),
     {Name,St1} = new_fun_name("lbc", St0),
     LA = lineno_anno(Line, St1),
-    {[Tail,AccVar],St2} = new_vars(LA, 2, St1),
+    {AccVar,St2} = new_var(LA, St1),
     LAnno = #a{anno=LA},
     HeadBinPattern = pattern(P, St2),
-    #c_binary{segments=Ps} = HeadBinPattern,
-    {EPs,St3} = emasculate_segments(Ps, St2),
-    TailSegment = #c_bitstr{val=Tail,size=#c_literal{val=all},
-			    unit=#c_literal{val=1},
-			    type=#c_literal{val=binary},
-			    flags=#c_literal{val=[big,unsigned]}},
-    Pattern = HeadBinPattern#c_binary{segments=Ps ++ [TailSegment]},
-    EPattern = HeadBinPattern#c_binary{segments=EPs ++ [TailSegment]},
-    {Arg,St4} = new_var(St3),
+    #c_binary{segments=Ps0} = HeadBinPattern,
+    {Ps,Tail,St3} = append_tail_segment(Ps0, St2),
+    {EPs,St4} = emasculate_segments(Ps, St3),
+    Pattern = HeadBinPattern#c_binary{segments=Ps},
+    EPattern = HeadBinPattern#c_binary{segments=EPs},
+    {Arg,St5} = new_var(St4),
     NewMore = {call,Lg,{atom,Lg,Name},[{var,Lg,Tail#c_var.name},
 				       {var,Lg,AccVar#c_var.name}]},
-    {Guardc,St5} = lc_guard_tests(Gs, St4),	%These are always flat!
-    {Bc,Bps,St6} = bc_tq1(Line, E, Qs1, AccVar, St5),
-    {Nc,Nps,St7} = expr(NewMore, St6),
-    {Gc,Gps,St8} = safe(G, St7),		%Will be a function argument!
+    {Guardc,St6} = lc_guard_tests(Gs, St5),	%These are always flat!
+    {Bc,Bps,St7} = bc_tq1(Line, E, Qs1, AccVar, St6),
+    {Nc,Nps,St8} = expr(NewMore, St7),
+    {Gc,Gps,St9} = safe(G, St8),	 %Will be a function argument!
     Fc = function_clause([Arg,AccVar], LA, {Name,2}),
     Body = Bps ++ Nps ++ [#iset{var=AccVar,arg=Bc},Nc],
+    {TailSegList,_,St} = append_tail_segment([], St9),
     Cs = [#iclause{anno=LAnno,
 		   pats=[Pattern,AccVar],
 		   guard=Guardc,
@@ -1066,7 +1061,7 @@ bc_tq1(Line, E, [{b_generate,Lg,P,G}|Qs0], AccExpr, St0) ->
 		   guard=[],
 		   body=Nps ++ [Nc]},
 	  #iclause{anno=LAnno,
-		   pats=[#c_binary{anno=LA,segments=[TailSegment]},AccVar],
+		   pats=[#c_binary{anno=LA,segments=TailSegList},AccVar],
 		   guard=[],
 		   body=[AccVar]}],
     Fun = #ifun{anno=LAnno,id=[],vars=[Arg,AccVar],clauses=Cs,fc=Fc},
@@ -1074,7 +1069,7 @@ bc_tq1(Line, E, [{b_generate,Lg,P,G}|Qs0], AccExpr, St0) ->
 	      body=Gps ++ [#iapply{anno=LAnno,
 				   op=#c_var{anno=LA,name={Name,2}},
 				   args=[Gc,AccExpr]}]},
-     [],St8};
+     [],St};
 bc_tq1(Line, E, [Fil0|Qs0], AccVar, St0) ->
     %% Special case sequences guard tests.
     LA = lineno_anno(Line, St0),
@@ -1120,6 +1115,29 @@ bc_tq1(_, {bin,Bl,Elements}, [], AccVar, St0) ->
     %%Anno = Anno0#a{anno=[compiler_generated|A]},
     {set_anno(E, Anno),Pre,St}.
 
+append_tail_segment(Segs, St) ->
+    app_tail_seg(Segs, St, []).
+
+app_tail_seg([#c_bitstr{val=Var0,size=#c_literal{val=all}}=Seg0]=L,
+	     St0, Acc) ->
+    case Var0 of
+	#c_var{name='_'} ->
+	    {Var,St} = new_var(St0),
+	    Seg = Seg0#c_bitstr{val=Var},
+	    {reverse(Acc, [Seg]),Var,St};
+	#c_var{} ->
+	    {reverse(Acc, L),Var0,St0}
+    end;
+app_tail_seg([H|T], St, Acc) ->
+    app_tail_seg(T, St, [H|Acc]);
+app_tail_seg([], St0, Acc) ->
+    {Var,St} = new_var(St0),
+    Tail = #c_bitstr{val=Var,size=#c_literal{val=all},
+		     unit=#c_literal{val=1},
+		     type=#c_literal{val=binary},
+		     flags=#c_literal{val=[unsigned,big]}},
+    {reverse(Acc, [Tail]),Var,St}.
+
 emasculate_segments(Segs, St) ->
     emasculate_segments(Segs, St, []).
 
diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl
index fbe4d8617e..3b33a08cf7 100644
--- a/lib/compiler/src/v3_kernel.erl
+++ b/lib/compiler/src/v3_kernel.erl
@@ -147,6 +147,7 @@ attributes([]) -> [].
 include_attribute(type) -> false;
 include_attribute(spec) -> false;
 include_attribute(opaque) -> false;
+include_attribute(export_type) -> false;
 include_attribute(_) -> true.
 
 function({#c_var{name={F,Arity}=FA},Body}, St0) ->
diff --git a/lib/compiler/src/v3_kernel_pp.erl b/lib/compiler/src/v3_kernel_pp.erl
index a300dd283f..e363a5387a 100644
--- a/lib/compiler/src/v3_kernel_pp.erl
+++ b/lib/compiler/src/v3_kernel_pp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -20,10 +20,12 @@
 
 -module(v3_kernel_pp).
 
--include("v3_kernel.hrl").
-
 -export([format/1]).
 
+%%-define(INCLUDE_ANNOTATIONS, 1).
+
+-include("v3_kernel.hrl").
+
 %% These are "internal" structures in sys_kernel which are here for
 %% debugging purposes.
 -record(iset, {anno=[],vars,arg,body}).
@@ -50,28 +52,33 @@ format(Node) -> format(Node, #ctxt{}).
 
 format(Node, Ctxt) ->
     case canno(Node) of
-%% 	[] ->
-%% 	    format_1(Node, Ctxt);
-%% 	[L,{file,_}] when is_integer(L) ->
-%% 	    format_1(Node, Ctxt);
-%% 	#k{a=Anno}=K when Anno =/= [] ->
-%% 	    format(setelement(2, Node, K#k{a=[]}), Ctxt);
-%% 	List ->
-%% 	    format_anno(List, Ctxt, fun (Ctxt1) ->
-%% 					    format_1(Node, Ctxt1)
-%% 				    end);
-	_ ->
-	    format_1(Node, Ctxt)
+	[] ->
+	    format_1(Node, Ctxt);
+	[L,{file,_}] when is_integer(L) ->
+	    format_1(Node, Ctxt);
+	#k{a=Anno}=K when Anno =/= [] ->
+	    format(setelement(2, Node, K#k{a=[]}), Ctxt);
+	List ->
+	    format_anno(List, Ctxt, fun (Ctxt1) ->
+					    format_1(Node, Ctxt1)
+				    end)
     end.
 
-%% format_anno(Anno, Ctxt0, ObjFun) ->
-%%     Ctxt1 = ctxt_bump_indent(Ctxt0, 1),
-%%     ["( ",
-%%      ObjFun(Ctxt0),
-%%      nl_indent(Ctxt1),
-%%      "-| ",io_lib:write(Anno),
-%%      " )"].
-    
+
+-ifndef(INCLUDE_ANNOTATIONS).
+%% Don't include annotations (for readability).
+format_anno(_Anno, Ctxt, ObjFun) ->
+    ObjFun(Ctxt).
+-else.
+%% Include annotations (for debugging of annotations).
+format_anno(Anno, Ctxt0, ObjFun) ->
+    Ctxt1 = ctxt_bump_indent(Ctxt0, 1),
+    ["( ",
+     ObjFun(Ctxt0),
+     nl_indent(Ctxt1),
+     "-| ",io_lib:write(Anno),
+     " )"].
+-endif.
 
 %% format_1(Kexpr, Context) -> string().
 
@@ -107,6 +114,8 @@ format_1(#k_bin_int{size=Sz,unit=U,flags=Fs,val=Val,next=Next}, Ctxt) ->
     [format_bin_seg_1(S, Ctxt),
      format_bin_seg(Next, ctxt_bump_indent(Ctxt, 2))];
 format_1(#k_bin_end{}, _Ctxt) -> "#<>#";
+format_1(#k_literal{val=Term}, _Ctxt) ->
+    io_lib:format("~p", [Term]);
 format_1(#k_local{name=N,arity=A}, Ctxt) ->
     "local " ++ format_fa_pair({N,A}, Ctxt);
 format_1(#k_remote{mod=M,name=N,arity=A}, _Ctxt) ->
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index 2d08e71e09..934bf39393 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -153,7 +153,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) compiler.dynspec compiler.cover \
+	$(INSTALL_DATA) compiler.spec compiler.cover \
 		$(EMAKEFILE) $(ERL_FILES) $(CORE_FILES) $(RELSYSDIR)
 	$(INSTALL_DATA) $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) \
 		$(INLINE_ERL_FILES) $(RELSYSDIR)
diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index 84cfd16e60..2438fad6ca 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -18,16 +18,35 @@
 %%
 -module(andor_SUITE).
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 t_case/1,t_and_or/1,t_andalso/1,t_orelse/1,inside/1,overlap/1,
 	 combined/1,in_case/1,before_and_inside_if/1]).
 	 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(andor_SUITE),
+    [t_case, t_and_or, t_andalso, t_orelse, inside, overlap,
+     combined, in_case, before_and_inside_if].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [t_case,t_and_or,t_andalso,t_orelse,inside,overlap,combined,in_case,
-     before_and_inside_if].
 
 t_case(Config) when is_list(Config) ->
     %% We test boolean cases almost but not quite like cases
diff --git a/lib/compiler/test/apply_SUITE.erl b/lib/compiler/test/apply_SUITE.erl
index f23dd6c2db..f309042911 100644
--- a/lib/compiler/test/apply_SUITE.erl
+++ b/lib/compiler/test/apply_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -18,15 +18,34 @@
 %%
 -module(apply_SUITE).
 
--export([all/1,mfa/1,fun_apply/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,mfa/1,fun_apply/1]).
 
 -export([foo/0,bar/1,baz/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(apply_SUITE),
+    [mfa, fun_apply].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [mfa,fun_apply].
 
 -define(APPLY0(M, F), (fun(Res) -> Res = M:F() end)(apply(M, F, []))).
 -define(APPLY1(M, F, A1), (fun(Res) -> Res = M:F(A1) end)(apply(M, F, [A1]))).
diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index 74b5d7c7eb..7fca737a20 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -18,7 +18,9 @@
 %%
 -module(beam_validator_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 beam_files/1,compiler_bug/1,stupid_but_valid/1,
 	 xrange/1,yrange/1,stack/1,call_last/1,merge_undefined/1,
 	 uninit/1,unsafe_catch/1,
@@ -30,34 +32,49 @@
 	 state_after_fault_in_catch/1,no_exception_in_catch/1,
 	 undef_label/1,illegal_instruction/1,failing_gc_guard_bif/1]).
 	 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = test_server:timetrap(?t:minutes(10)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
+end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [beam_files,compiler_bug,stupid_but_valid,
-     xrange,yrange,stack,call_last,merge_undefined,
-     uninit,unsafe_catch,
-     dead_code,mult_labels,
-     overwrite_catchtag,overwrite_trytag,accessing_tags,bad_catch_try,
-     cons_guard,
-     freg_range,freg_uninit,freg_state,
-     bin_match,bin_aligned,
-     bad_dsetel,state_after_fault_in_catch,no_exception_in_catch,
-     undef_label,illegal_instruction,failing_gc_guard_bif].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(beam_validator_SUITE),
+    [beam_files, compiler_bug, stupid_but_valid, xrange,
+     yrange, stack, call_last, merge_undefined, uninit,
+     unsafe_catch, dead_code, mult_labels,
+     overwrite_catchtag, overwrite_trytag, accessing_tags,
+     bad_catch_try, cons_guard, freg_range, freg_uninit,
+     freg_state, bin_match, bin_aligned, bad_dsetel,
+     state_after_fault_in_catch, no_exception_in_catch,
+     undef_label, illegal_instruction, failing_gc_guard_bif].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 beam_files(Config) when is_list(Config) ->
-    ?line {ok,Cwd} = file:get_cwd(),
-    ?line Parent = filename:dirname(Cwd),
-    ?line Wc = filename:join([Parent,"*","*.beam"]),
+    ?line DataDir = proplists:get_value(data_dir, Config),
+    ?line Wc = filename:join([DataDir,"..","..","*","*.beam"]),
     %% Must have at least two files here, or there will be
     %% a grammatical error in the output of the io:format/2 call below. ;-)
     ?line [_,_|_] = Fs = filelib:wildcard(Wc),
diff --git a/lib/compiler/test/bs_bincomp_SUITE.erl b/lib/compiler/test/bs_bincomp_SUITE.erl
index a64a5d590b..28801bd7d0 100644
--- a/lib/compiler/test/bs_bincomp_SUITE.erl
+++ b/lib/compiler/test/bs_bincomp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -21,19 +21,36 @@
 
 -module(bs_bincomp_SUITE).
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 byte_aligned/1,bit_aligned/1,extended_byte_aligned/1,
 	 extended_bit_aligned/1,mixed/1,filters/1,trim_coverage/1,
-	 nomatch/1,sizes/1]).
+	 nomatch/1,sizes/1,tail/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [byte_aligned,bit_aligned,extended_byte_aligned,
-     extended_bit_aligned,mixed,filters,trim_coverage,
-     nomatch,sizes].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
+all() -> 
+    test_lib:recompile(bs_bincomp_SUITE),
+    [byte_aligned, bit_aligned, extended_byte_aligned,
+     extended_bit_aligned, mixed, filters, trim_coverage,
+     nomatch, sizes, tail].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
 
 byte_aligned(Config) when is_list(Config) ->
     cs_init(),
@@ -270,6 +287,38 @@ sizes(Config) when is_list(Config) ->
     ?line cs_end(),
     ok.
 
+tail(Config) when is_list(Config) ->
+    ?line [] = tail_1(<<0:7>>),
+    ?line [0] = tail_1(<<0>>),
+    ?line [0] = tail_1(<<0:12>>),
+    ?line [0,0] = tail_1(<<0:20>>),
+
+    ?line [] = tail_2(<<0:7>>),
+    ?line [42] = tail_2(<<0>>),
+    ?line [] = tail_2(<<0:12>>),
+    ?line [42,42] = tail_2(<<0,1>>),
+
+    ?line <<>> = tail_3(<<0:7>>),
+    ?line <<42>> = tail_3(<<0>>),
+    ?line <<42>> = tail_3(<<0:12>>),
+    ?line <<42,42>> = tail_3(<<0:20>>),
+
+    ?line [] = tail_4(<<0:15>>),
+    ?line [7] = tail_4(<<7,8>>),
+    ?line [9] = tail_4(<<9,17:12>>),
+    ok.
+
+tail_1(Bits) ->
+    [X || <<X:8/integer, _/bits>> <= Bits].
+
+tail_2(Bits) ->
+    [42 || <<_:8/integer, _/bytes>> <= Bits].
+
+tail_3(Bits) ->
+    << <<42>> || <<_:8/integer, _/bits>> <= Bits >>.
+
+tail_4(Bits) ->
+    [X || <<X:8/integer, Tail/bits>> <= Bits, bit_size(Tail) >= 8].
 
 
 cs_init() ->
diff --git a/lib/compiler/test/bs_bit_binaries_SUITE.erl b/lib/compiler/test/bs_bit_binaries_SUITE.erl
index 6337460b13..052289e00c 100644
--- a/lib/compiler/test/bs_bit_binaries_SUITE.erl
+++ b/lib/compiler/test/bs_bit_binaries_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -21,19 +21,39 @@
 
 -module(bs_bit_binaries_SUITE).
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 misc/1,horrid_match/1,test_bitstr/1,test_bit_size/1,asymmetric_tests/1,
 	 big_asymmetric_tests/1,binary_to_and_from_list/1,
 	 big_binary_to_and_from_list/1,send_and_receive/1,
 	 send_and_receive_alot/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(bs_bit_binaries_SUITE),
+    [misc, horrid_match, test_bitstr, test_bit_size,
+     asymmetric_tests, big_asymmetric_tests,
+     binary_to_and_from_list, big_binary_to_and_from_list,
+     send_and_receive, send_and_receive_alot].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [misc,horrid_match,test_bitstr,test_bit_size,asymmetric_tests,
-     big_asymmetric_tests,binary_to_and_from_list,big_binary_to_and_from_list,
-     send_and_receive,send_and_receive_alot].
 
 misc(Config) when is_list(Config) ->
     ?line <<1:100>> = <<1:100>>,
diff --git a/lib/compiler/test/bs_construct_SUITE.erl b/lib/compiler/test/bs_construct_SUITE.erl
index 1862a28bbe..c430b12b70 100644
--- a/lib/compiler/test/bs_construct_SUITE.erl
+++ b/lib/compiler/test/bs_construct_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -23,23 +23,44 @@
 
 -module(bs_construct_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 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]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(bs_construct_SUITE),
+    [two, test1, fail, float_bin, in_guard, in_catch,
+     nasty_literals, side_effect, opt, otp_7556, float_arith,
+     otp_8054].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [two,test1,fail,float_bin,in_guard,in_catch,nasty_literals,
-     side_effect,opt,otp_7556,float_arith,otp_8054].
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = test_server:timetrap(?t:minutes(1)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
+end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
@@ -66,6 +87,8 @@ id(I) -> I.
 
 l(I_13, I_big1, I_16, Bin) ->
     [
+     ?T(<<I_13:0>>,
+	[]),
      ?T(<<-43>>,
 	[256-43]),
      ?T(<<4:4,7:4>>,
@@ -208,7 +231,7 @@ one_test({C_bin, E_bin, Str, Result}) ->
 		    ok;
 		%% For situations where the final bits may not matter, like
 		%% for floats:
-		N when integer(N) ->
+		N when is_integer(N) ->
 		    io:format("Info: compiled and interpreted differ in the"
 			      " last bytes:~n ~p, ~p.~n",
 			      [bitstring_to_list(C_bin), bitstring_to_list(E_bin)]),
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index caaa587006..d674f273f0 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -20,7 +20,9 @@
 -module(bs_match_SUITE).
 -compile(nowarn_shadow_vars).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 fun_shadow/1,int_float/1,otp_5269/1,null_fields/1,wiger/1,
 	 bin_tail/1,save_restore/1,shadowed_size_var/1,
 	 partitioned_bs_match/1,function_clause/1,
@@ -35,24 +37,45 @@
 
 -export([coverage_id/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [fun_shadow,int_float,otp_5269,null_fields,wiger,bin_tail,save_restore,
-     shadowed_size_var,partitioned_bs_match,function_clause,unit,
-     shared_sub_bins,bin_and_float,dec_subidentifiers,skip_optional_tag,
-     wfbm,degenerated_match,bs_sum,coverage,multiple_uses,zero_label,
-     followed_by_catch,matching_meets_construction,simon,matching_and_andalso,
-     otp_7188,otp_7233,otp_7240,otp_7498,match_string,zero_width,bad_size,
-     haystack,cover_beam_bool].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(bs_match_SUITE),
+    [fun_shadow, int_float, otp_5269, null_fields, wiger,
+     bin_tail, save_restore, shadowed_size_var,
+     partitioned_bs_match, function_clause, unit,
+     shared_sub_bins, bin_and_float, dec_subidentifiers,
+     skip_optional_tag, wfbm, degenerated_match, bs_sum,
+     coverage, multiple_uses, zero_label, followed_by_catch,
+     matching_meets_construction, simon,
+     matching_and_andalso, otp_7188, otp_7233, otp_7240,
+     otp_7498, match_string, zero_width, bad_size, haystack,
+     cover_beam_bool].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = test_server:timetrap(?t:minutes(1)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
+end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
diff --git a/lib/compiler/test/bs_utf_SUITE.erl b/lib/compiler/test/bs_utf_SUITE.erl
index 4281874a24..af57688347 100644
--- a/lib/compiler/test/bs_utf_SUITE.erl
+++ b/lib/compiler/test/bs_utf_SUITE.erl
@@ -19,18 +19,37 @@
 
 -module(bs_utf_SUITE).
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 utf8_roundtrip/1,unused_utf_char/1,utf16_roundtrip/1,
 	 utf32_roundtrip/1,guard/1,extreme_tripping/1,
 	 literals/1,coverage/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(bs_utf_SUITE),
+    [utf8_roundtrip, unused_utf_char, utf16_roundtrip,
+     utf32_roundtrip, guard, extreme_tripping, literals,
+     coverage].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [utf8_roundtrip,unused_utf_char,utf16_roundtrip,
-     utf32_roundtrip,guard,extreme_tripping,
-     literals,coverage].
 
 utf8_roundtrip(Config) when is_list(Config) ->
     ?line [utf8_roundtrip_1(P) || P <- utf_data()],
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index d4843c9eba..ba225b66d0 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -20,34 +20,46 @@
 
 -module(compilation_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -compile(export_all).
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [self_compile_old_inliner,self_compile,
-     compiler_1,compiler_3,compiler_5,
-     beam_compiler_1, beam_compiler_2, beam_compiler_3,
-     beam_compiler_4, beam_compiler_5, beam_compiler_6,
-     beam_compiler_7, beam_compiler_8, beam_compiler_9,
-     beam_compiler_10, beam_compiler_11, beam_compiler_12,
-     nested_tuples_in_case_expr,
-     otp_2330, guards, vsn,
-     otp_2380, otp_2141, otp_2173, otp_4790,
-     const_list_256,
-     bin_syntax_1, bin_syntax_2, bin_syntax_3,
-     bin_syntax_4, bin_syntax_5, bin_syntax_6,
-     live_var, convopts,
-     bad_functional_value,
-     catch_in_catch, redundant_case, long_string,
-     otp_5076, complex_guard, otp_5092, otp_5151,
-     otp_5235,otp_5244,
-     trycatch_4, opt_crash,
-     otp_5404,otp_5436,otp_5481,otp_5553,otp_5632,
-     otp_5714,otp_5872,otp_6121,otp_6121a,otp_6121b,
-     otp_7202,otp_7345,on_load
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(compilation_SUITE),
+    [self_compile_old_inliner, self_compile, compiler_1,
+     compiler_3, compiler_5, beam_compiler_1,
+     beam_compiler_2, beam_compiler_3, beam_compiler_4,
+     beam_compiler_5, beam_compiler_6, beam_compiler_7,
+     beam_compiler_8, beam_compiler_9, beam_compiler_10,
+     beam_compiler_11, beam_compiler_12,
+     nested_tuples_in_case_expr, otp_2330, guards,
+     {group, vsn}, otp_2380, otp_2141, otp_2173, otp_4790,
+     const_list_256, bin_syntax_1, bin_syntax_2,
+     bin_syntax_3, bin_syntax_4, bin_syntax_5, bin_syntax_6,
+     live_var, convopts, bad_functional_value,
+     catch_in_catch, redundant_case, long_string, otp_5076,
+     complex_guard, otp_5092, otp_5151, otp_5235, otp_5244,
+     trycatch_4, opt_crash, otp_5404, otp_5436, otp_5481,
+     otp_5553, otp_5632, otp_5714, otp_5872, otp_6121,
+     otp_6121a, otp_6121b, otp_7202, otp_7345, on_load,
+     string_table,otp_8949_a,otp_8949_a].
+
+groups() -> 
+    [{vsn, [], [vsn_1, vsn_2, vsn_3]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 -define(comp(N),
 	N(Config) when is_list(Config) -> try_it(N, Config)).
@@ -151,7 +163,7 @@ split({int, N}, <<N:16,B:N/binary,T/binary>>) ->
 beam_compiler_7(doc) ->
     "Code snippet submitted from Ulf Wiger which fails in R3 Beam.";
 beam_compiler_7(suite) -> [];
-beam_compiler_7(Config) when list(Config) ->
+beam_compiler_7(Config) when is_list(Config) ->
     ?line done = empty(2, false).
 
 empty(N, Toggle) when N > 0 ->
@@ -311,12 +323,11 @@ from(H, [H | T]) -> T;
 from(H, [_ | T]) -> from(H, T);
 from(_, []) -> [].
 
-vsn(suite) -> [vsn_1, vsn_2, vsn_3].
 
 vsn_1(doc) ->
     "Test generation of 'vsn' attribute";
 vsn_1(suite) -> [];
-vsn_1(Conf) when list(Conf) ->
+vsn_1(Conf) when is_list(Conf) ->
     ?line M = vsn_1,
 
     ?line compile_load(M, ?config(data_dir, Conf), Conf),
@@ -340,7 +351,7 @@ vsn_1(Conf) when list(Conf) ->
 vsn_2(doc) ->
     "Test overriding of generation of 'vsn' attribute";
 vsn_2(suite) -> [];
-vsn_2(Conf) when list(Conf) ->
+vsn_2(Conf) when is_list(Conf) ->
     ?line M = vsn_2,
 
     ?line compile_load(M, ?config(data_dir, Conf), Conf),
@@ -356,7 +367,7 @@ vsn_2(Conf) when list(Conf) ->
 vsn_3(doc) ->
     "Test that different code yields different generated 'vsn'";
 vsn_3(suite) -> [];
-vsn_3(Conf) when list(Conf) ->
+vsn_3(Conf) when is_list(Conf) ->
     ?line M = vsn_3,
 
     ?line compile_load(M, ?config(data_dir, Conf), Conf),
@@ -596,4 +607,55 @@ otp_7345(ObjRef, _RdEnv, Args) ->
 		       10},
     id(LlUnitdataReq).
 
+%% Check the generation of the string table.
+
+string_table(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line File = filename:join(DataDir, "string_table.erl"),
+    ?line {ok,string_table,Beam,[]} = compile:file(File, [return, binary]),
+    ?line {ok,{string_table,[StringTableChunk]}} = beam_lib:chunks(Beam, ["StrT"]),
+    ?line {"StrT", <<"stringabletringtable">>} = StringTableChunk,
+    ok.
+
+otp_8949_a(Config) when is_list(Config) ->
+    value = otp_8949_a(),
+    ok.
+
+-record(cs, {exs,keys = [],flags = 1}).
+-record(exs, {children = []}).
+
+otp_8949_a() ->
+    case id([#cs{}]) of
+        [#cs{}=Cs] ->
+            SomeVar = id(value),
+	    if
+		Cs#cs.flags band 1 =/= 0 ->
+		    id(SomeVar);
+		(((Cs#cs.exs)#exs.children /= [])
+                 and
+		   (Cs#cs.flags band (1 bsl 0 bor (1 bsl 22)) == 0));
+		Cs#cs.flags band (1 bsl 22) =/= 0 ->
+		    ok
+	    end
+    end.
+    
+otp_8949_b(Config) when is_list(Config) ->
+    self() ! something,
+    ?line value = otp_8949_b([], false),
+    ?line {'EXIT',_} = (catch otp_8949_b([], true)),
+    ok.
+
+%% Would cause an endless loop in beam_utils.
+otp_8949_b(A, B) ->
+    Var = id(value),
+    if
+	A == [], B == false ->
+	    ok
+    end,
+    receive
+        something ->
+	    id(Var)
+    end.
+    
+
 id(I) -> I.
diff --git a/lib/compiler/test/compilation_SUITE_data/string_table.erl b/lib/compiler/test/compilation_SUITE_data/string_table.erl
new file mode 100644
index 0000000000..1da1d015dd
--- /dev/null
+++ b/lib/compiler/test/compilation_SUITE_data/string_table.erl
@@ -0,0 +1,8 @@
+-module(string_table).
+-export([f/1, g/1]).
+
+f(<<"string">>) -> string;
+f(<<"stringtable">>) -> stringtable.
+
+g(<<"stringtable">>) -> stringtable;
+g(<<"table">>) -> table.
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index e1cc5dafb5..037c078fd0 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -20,33 +20,50 @@
 
 %% Tests compile:file/1 and compile:file/2 with various options.
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 app_test/1,
 	 file_1/1, module_mismatch/1, big_file/1, outdir/1, 
-	 binary/1, cond_and_ifdef/1, listings/1, listings_big/1,
+	 binary/1, makedep/1, cond_and_ifdef/1, listings/1, listings_big/1,
 	 other_output/1, package_forms/1, encrypted_abstr/1,
-	 bad_record_use/1, bad_record_use1/1, bad_record_use2/1, strict_record/1,
+	 bad_record_use1/1, bad_record_use2/1, strict_record/1,
 	 missing_testheap/1, cover/1, env/1, core/1, asm/1]).
 
 -export([init/3]).
 
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
 %% To cover the stripping of 'type' and 'spec' in beam_asm.
 -type all_return_type() :: [atom()].
--spec all('suite' | [_]) -> all_return_type().
-
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [app_test,
-     file_1, module_mismatch, big_file, outdir, binary,
-     cond_and_ifdef, listings, listings_big,
-     other_output, package_forms,
-     encrypted_abstr,
-     bad_record_use, strict_record,
+-spec all() -> all_return_type().
+
+all() -> 
+    test_lib:recompile(compile_SUITE),
+    [app_test, file_1, module_mismatch, big_file, outdir,
+     binary, makedep, cond_and_ifdef, listings, listings_big,
+     other_output, package_forms, encrypted_abstr,
+     {group, bad_record_use}, strict_record,
      missing_testheap, cover, env, core, asm].
 
+groups() -> 
+    [{bad_record_use, [],
+      [bad_record_use1, bad_record_use2]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
 
 %% Test that the Application file has no `basic' errors.";
 app_test(Config) when is_list(Config) ->
@@ -132,6 +149,76 @@ binary(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
+%% Tests that the dependencies-Makefile-related options work.
+
+makedep(Config) when is_list(Config) ->
+    ?line Dog = test_server:timetrap(test_server:seconds(60)),
+    ?line {Simple,Target} = files(Config, "makedep"),
+    ?line DataDir = ?config(data_dir, Config),
+    ?line SimpleRootname = filename:rootname(Simple),
+    ?line IncludeDir = filename:join(filename:dirname(Simple), "include"),
+    ?line IncludeOptions = [
+      {d,need_foo},
+      {d,foo_value,42},
+      {d,include_generated},
+      {i,IncludeDir}
+    ],
+    %% Basic rule.
+    ?line BasicMf1Name = SimpleRootname ++ "-basic1.mk",
+    ?line {ok,BasicMf1} = file:read_file(BasicMf1Name),
+    ?line {ok,_,Mf1} = compile:file(Simple, [binary,makedep]),
+    ?line BasicMf1 = makedep_canonicalize_result(Mf1, DataDir),
+    %% Basic rule with one existing header.
+    ?line BasicMf2Name = SimpleRootname ++ "-basic2.mk",
+    ?line {ok,BasicMf2} = file:read_file(BasicMf2Name),
+    ?line {ok,_,Mf2} = compile:file(Simple, [binary,makedep|IncludeOptions]),
+    ?line BasicMf2 = makedep_canonicalize_result(Mf2, DataDir),
+    %% Rule with one existing header and one missing header.
+    ?line MissingMfName = SimpleRootname ++ "-missing.mk",
+    ?line {ok,MissingMf} = file:read_file(MissingMfName),
+    ?line {ok,_,Mf3} = compile:file(Simple,
+      [binary,makedep,makedep_add_missing|IncludeOptions]),
+    ?line MissingMf = makedep_canonicalize_result(Mf3, DataDir),
+    %% Rule with modified target.
+    ?line TargetMf1Name = SimpleRootname ++ "-target1.mk",
+    ?line {ok,TargetMf1} = file:read_file(TargetMf1Name),
+    ?line {ok,_,Mf4} = compile:file(Simple,
+      [binary,makedep,{makedep_target,"$target"}|IncludeOptions]),
+    ?line TargetMf1 = makedep_modify_target(
+      makedep_canonicalize_result(Mf4, DataDir), "$$target"),
+    %% Rule with quoted modified target.
+    ?line TargetMf2Name = SimpleRootname ++ "-target2.mk",
+    ?line {ok,TargetMf2} = file:read_file(TargetMf2Name),
+    ?line {ok,_,Mf5} = compile:file(Simple,
+      [binary,makedep,{makedep_target,"$target"},makedep_quote_target|
+        IncludeOptions]),
+    ?line TargetMf2 = makedep_modify_target(
+      makedep_canonicalize_result(Mf5, DataDir), "$$target"),
+    %% Basic rule written to some file.
+    ?line {ok,_} = compile:file(Simple,
+      [makedep,{makedep_output,Target}|IncludeOptions]),
+    ?line {ok,Mf6} = file:read_file(Target),
+    ?line BasicMf2 = makedep_canonicalize_result(Mf6, DataDir),
+
+    ?line ok = file:delete(Target),
+    ?line ok = file:del_dir(filename:dirname(Target)),
+    ?line test_server:timetrap_cancel(Dog),
+    ok.
+
+makedep_canonicalize_result(Mf, DataDir) ->
+    Mf0 = binary_to_list(Mf),
+    %% Replace the Datadir by "$(srcdir)".
+    Mf1 = re:replace(Mf0, DataDir, "$(srcdir)/",
+      [global,multiline,{return,list}]),
+    %% Long lines are splitted, put back everything on one line.
+    Mf2 = re:replace(Mf1, "\\\\\n  ", "", [global,multiline,{return,list}]),
+    list_to_binary(Mf2).
+
+makedep_modify_target(Mf, Target) ->
+    Mf0 = binary_to_list(Mf),
+    Mf1 = re:replace(Mf0, Target, "$target", [{return,list}]),
+    list_to_binary(Mf1).
+
 %% Tests that conditional compilation, defining values, including files work.
 
 cond_and_ifdef(Config) when is_list(Config) ->
@@ -465,7 +552,6 @@ exists(Name) ->
 	{error, _} -> false
     end.
 
-bad_record_use(suite) ->  [bad_record_use1, bad_record_use2].
 
 %% Tests that the compiler does not accept
 %% bad use of records.
diff --git a/lib/compiler/test/compile_SUITE_data/simple-basic1.mk b/lib/compiler/test/compile_SUITE_data/simple-basic1.mk
new file mode 100644
index 0000000000..4073fa82d0
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/simple-basic1.mk
@@ -0,0 +1 @@
+simple.beam: $(srcdir)/simple.erl
diff --git a/lib/compiler/test/compile_SUITE_data/simple-basic2.mk b/lib/compiler/test/compile_SUITE_data/simple-basic2.mk
new file mode 100644
index 0000000000..761d1d9582
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/simple-basic2.mk
@@ -0,0 +1 @@
+simple.beam: $(srcdir)/simple.erl $(srcdir)/include/simple.hrl
diff --git a/lib/compiler/test/compile_SUITE_data/simple-missing.mk b/lib/compiler/test/compile_SUITE_data/simple-missing.mk
new file mode 100644
index 0000000000..b13d44ec36
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/simple-missing.mk
@@ -0,0 +1 @@
+simple.beam: $(srcdir)/simple.erl $(srcdir)/include/simple.hrl generated.hrl
diff --git a/lib/compiler/test/compile_SUITE_data/simple-target1.mk b/lib/compiler/test/compile_SUITE_data/simple-target1.mk
new file mode 100644
index 0000000000..dd9fa0d6e5
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/simple-target1.mk
@@ -0,0 +1 @@
+$target: $(srcdir)/simple.erl $(srcdir)/include/simple.hrl
diff --git a/lib/compiler/test/compile_SUITE_data/simple-target2.mk b/lib/compiler/test/compile_SUITE_data/simple-target2.mk
new file mode 100644
index 0000000000..a5fc6f461d
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/simple-target2.mk
@@ -0,0 +1 @@
+$$target: $(srcdir)/simple.erl $(srcdir)/include/simple.hrl
diff --git a/lib/compiler/test/compile_SUITE_data/simple.erl b/lib/compiler/test/compile_SUITE_data/simple.erl
index 2021056388..0c1c70a778 100644
--- a/lib/compiler/test/compile_SUITE_data/simple.erl
+++ b/lib/compiler/test/compile_SUITE_data/simple.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -37,3 +37,7 @@ foo() ->
     {?included_value, ?foo_value}.
 
 -endif.
+
+-ifdef(include_generated).
+-include("generated.hrl").
+-endif.
diff --git a/lib/compiler/test/compiler.cover b/lib/compiler/test/compiler.cover
index 69d284ea6c..9fc4c7dd43 100644
--- a/lib/compiler/test/compiler.cover
+++ b/lib/compiler/test/compiler.cover
@@ -1,3 +1,5 @@
+{incl_app,compiler,details}.
+
 %% -*- erlang -*-
-{exclude,[sys_pre_attributes,core_scan,core_parse]}.
+{excl_mods,[sys_pre_attributes,core_scan,core_parse]}.
 
diff --git a/lib/compiler/test/compiler.dynspec b/lib/compiler/test/compiler.dynspec
deleted file mode 100644
index 7e452cef6c..0000000000
--- a/lib/compiler/test/compiler.dynspec
+++ /dev/null
@@ -1,10 +0,0 @@
-%% -*- erlang -*-
-%% You can test this file using this command.
-%%    file:script("compiler.dynspec", [{'Os',"Unix"}]).
-
-case Os of
-    "VxWorks" ->
-	[{skip,{compile_SUITE,listings,"VxWorks filesystem too slow"}}];
-    _ ->
-	[]
-end.
diff --git a/lib/compiler/test/compiler.spec b/lib/compiler/test/compiler.spec
new file mode 100644
index 0000000000..f2546c3ced
--- /dev/null
+++ b/lib/compiler/test/compiler.spec
@@ -0,0 +1,2 @@
+%% -*- erlang -*-
+{suites,"../compiler_test",all}.
diff --git a/lib/compiler/test/core_SUITE.erl b/lib/compiler/test/core_SUITE.erl
index 54cf799057..c5969b5580 100644
--- a/lib/compiler/test/core_SUITE.erl
+++ b/lib/compiler/test/core_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -18,10 +18,12 @@
 %%
 -module(core_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 dehydrated_itracer/1,nested_tries/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(comp(N),
 	N(Config) when is_list(Config) -> try_it(N, Config)).
@@ -30,14 +32,32 @@ init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = test_server:timetrap(?t:minutes(5)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
+end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [dehydrated_itracer,nested_tries].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(core_SUITE),
+    [dehydrated_itracer, nested_tries].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 ?comp(dehydrated_itracer).
 ?comp(nested_tries).
diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index 5f2c905d4a..c13e4d2162 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -18,18 +18,37 @@
 %%
 -module(core_fold_SUITE).
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 t_element/1,setelement/1,t_length/1,append/1,t_apply/1,bifs/1,
 	 eq/1,nested_call_in_case/1,coverage/1]).
 
 -export([foo/0,foo/1,foo/2,foo/3]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(core_fold_SUITE),
+    [t_element, setelement, t_length, append, t_apply, bifs,
+     eq, nested_call_in_case, coverage].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [t_element,setelement,t_length,append,t_apply,bifs,
-     eq,nested_call_in_case,coverage].
 
 t_element(Config) when is_list(Config) ->
     X = make_ref(),
diff --git a/lib/compiler/test/error_SUITE.erl b/lib/compiler/test/error_SUITE.erl
index 0874225a62..2bb3fea438 100644
--- a/lib/compiler/test/error_SUITE.erl
+++ b/lib/compiler/test/error_SUITE.erl
@@ -18,14 +18,32 @@
 %%
 -module(error_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 head_mismatch_line/1,warnings_as_errors/1, bif_clashes/1]).
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [head_mismatch_line,warnings_as_errors,bif_clashes].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(error_SUITE),
+    [head_mismatch_line, warnings_as_errors, bif_clashes].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 
 bif_clashes(Config) when is_list(Config) ->
@@ -127,7 +145,7 @@ bif_clashes(Config) when is_list(Config) ->
              ">>,
            [],
           {error,
-           [{4,erl_lint,illegal_guard_expr}],
+           [{4,erl_lint,{illegal_guard_local_call,{length,1}}}],
            []} }],
     ?line [] = run2(Config, Ts3),
     Ts4 = [{bif_clashes9,
@@ -140,7 +158,7 @@ bif_clashes(Config) when is_list(Config) ->
              ">>,
            [],
           {error,
-           [{5,erl_lint,illegal_guard_expr}],
+           [{5,erl_lint,{illegal_guard_local_call,{length,1}}}],
            []} }],
     ?line [] = run2(Config, Ts4),
 
diff --git a/lib/compiler/test/float_SUITE.erl b/lib/compiler/test/float_SUITE.erl
index b48b1daa32..cad144ea63 100644
--- a/lib/compiler/test/float_SUITE.erl
+++ b/lib/compiler/test/float_SUITE.erl
@@ -17,13 +17,34 @@
 %% %CopyrightEnd%
 %%
 -module(float_SUITE).
--export([all/1,pending/1,bif_calls/1,math_functions/1,mixed_float_and_int/1]).
+-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]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(float_SUITE),
+    [pending, bif_calls, math_functions,
+     mixed_float_and_int].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [pending,bif_calls,math_functions,mixed_float_and_int].
 
 %% Thanks to Tobias Lindahl <[email protected]>
 %% Shows the effect of pending exceptions on the x86.
diff --git a/lib/compiler/test/fun_SUITE.erl b/lib/compiler/test/fun_SUITE.erl
index fb2667245a..dbf2416f3c 100644
--- a/lib/compiler/test/fun_SUITE.erl
+++ b/lib/compiler/test/fun_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -18,14 +18,33 @@
 %%
 -module(fun_SUITE).
 
--export([all/1,
+-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]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(fun_SUITE),
+    [test1, overwritten_fun, otp_7202, bif_fun].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [test1,overwritten_fun,otp_7202,bif_fun].
 
 %%% The help functions below are copied from emulator:bs_construct_SUITE.
 
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index 8f23bd2e5a..482564a32b 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -18,9 +18,10 @@
 %%
 -module(guard_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 misc/1,const_cond/1,basic_not/1,complex_not/1,nested_nots/1,
 	 semicolon/1,complex_semicolon/1,comma/1,
 	 or_guard/1,more_or_guards/1,
@@ -33,17 +34,33 @@
 	 basic_andalso_orelse/1,traverse_dcd/1,
 	 check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1]).
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [misc,const_cond,basic_not,complex_not,nested_nots,
-     semicolon,complex_semicolon,
-     comma,or_guard,more_or_guards,
-     complex_or_guards,and_guard,
-     xor_guard,more_xor_guards,
-     build_in_guard,old_guard_tests,gbif,
-     t_is_boolean,is_function_2,tricky,rel_ops,literal_type_tests,
-     basic_andalso_orelse,traverse_dcd,check_qlc_hrl,andalso_semi,
-     t_tuple_size,binary_part].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(guard_SUITE),
+    [misc, const_cond, basic_not, complex_not, nested_nots,
+     semicolon, complex_semicolon, comma, or_guard,
+     more_or_guards, complex_or_guards, and_guard, xor_guard,
+     more_xor_guards, build_in_guard, old_guard_tests, gbif,
+     t_is_boolean, is_function_2, tricky, rel_ops,
+     literal_type_tests, basic_andalso_orelse, traverse_dcd,
+     check_qlc_hrl, andalso_semi, t_tuple_size, binary_part].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 misc(Config) when is_list(Config) ->
     ?line 42 = case id(42) of
@@ -94,8 +111,8 @@ const_cond(Config) when is_list(Config) ->
 const_cond(T, Sz) ->
     case T of
 	_X when false -> never;
-	_X when tuple(T), eq == eq, tuple_size(T) == Sz -> ok;
-	_X when tuple(T), eq == leq, tuple_size(T) =< Sz -> ok;
+	_X when is_tuple(T), eq == eq, tuple_size(T) == Sz -> ok;
+	_X when is_tuple(T), eq == leq, tuple_size(T) =< Sz -> ok;
 	_X -> error
     end.
 
@@ -1137,7 +1154,7 @@ make_test([{T,L}|Ts]) ->
 make_test([]) -> [].
 
 test(T, L) ->
-    S0 = io_lib:format("begin io:format(\"~~p~~n\", [{~p,~p}]), if ~w(~w) -> true; true -> false end end. ", [T,L,T,L]),
+    S0 = io_lib:format("begin io:format(\"~~p~n\", [{~p,~p}]), if ~w(~w) -> true; true -> false end end. ", [T,L,T,L]),
     S = lists:flatten(S0),
     {ok,Toks,_Line} = erl_scan:string(S),
     {ok,E} = erl_parse:parse_exprs(Toks),
@@ -1145,7 +1162,7 @@ test(T, L) ->
     {match,0,{atom,0,Val},hd(E)}.
 
 test(T, L1, L2) ->
-    S0 = io_lib:format("begin io:format(\"~~p~~n\", [{~p,~p,~p}]), if ~w(~w, ~w) -> true; true -> false end end. ", [T,L1,L2,T,L1,L2]),
+    S0 = io_lib:format("begin io:format(\"~~p~n\", [{~p,~p,~p}]), if ~w(~w, ~w) -> true; true -> false end end. ", [T,L1,L2,T,L1,L2]),
     S = lists:flatten(S0),
     {ok,Toks,_Line} = erl_scan:string(S),
     {ok,E} = erl_parse:parse_exprs(Toks),
diff --git a/lib/compiler/test/inline_SUITE.erl b/lib/compiler/test/inline_SUITE.erl
index 396fb450b7..7b9600c2f6 100644
--- a/lib/compiler/test/inline_SUITE.erl
+++ b/lib/compiler/test/inline_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -20,7 +20,7 @@
 
 -module(inline_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -compile(export_all).
 -compile({inline,[badarg/2]}).
@@ -28,10 +28,29 @@
 %% Needed by test case `lists'.
 -compile(inline_list_funcs).
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [attribute,bsdecode,bsdes,barnes2,decode1,smith,itracer,pseudoknot,lists,
-     really_inlined,otp_7223,coverage].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(inline_SUITE),
+    [attribute, bsdecode, bsdes, barnes2, decode1, smith,
+     itracer, pseudoknot, lists, really_inlined, otp_7223,
+     coverage].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 attribute(Config) when is_list(Config) ->
     Name = "attribute",
@@ -49,7 +68,7 @@ attribute(Config) when is_list(Config) ->
     ok.
 
 -define(comp(Name),
-	Name(Config) when list(Config) ->
+	Name(Config) when is_list(Config) ->
 	       try_inline(Name, Config)).
 
 ?comp(bsdecode).
diff --git a/lib/compiler/test/lc_SUITE.erl b/lib/compiler/test/lc_SUITE.erl
index 40bf67e1fa..bcdcf2fd9f 100644
--- a/lib/compiler/test/lc_SUITE.erl
+++ b/lib/compiler/test/lc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -19,21 +19,41 @@
 -module(lc_SUITE).
 
 -author('[email protected]').
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,deeply_nested/1,no_generator/1,
 	 empty_generator/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(lc_SUITE),
+    [basic, deeply_nested, no_generator, empty_generator].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [basic,deeply_nested,no_generator,empty_generator].
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = test_server:timetrap(?t:minutes(1)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
+end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
@@ -160,7 +180,7 @@ empty_generator(Config) when is_list(Config) ->
 id(I) -> I.
     
 fc(Args, {'EXIT',{function_clause,[{?MODULE,_,Args}|_]}}) -> ok;
-fc(Args, {'EXIT',{function_clause,[{?MODULE,Name,Arity}|_]}})
+fc(Args, {'EXIT',{function_clause,[{?MODULE,_,Arity}|_]}})
   when length(Args) =:= Arity ->
     true = test_server:is_native(?MODULE);
 fc(Args, {'EXIT',{{case_clause,ActualArgs},_}})
diff --git a/lib/compiler/test/match_SUITE.erl b/lib/compiler/test/match_SUITE.erl
index fd51b777ac..b9b9fdd158 100644
--- a/lib/compiler/test/match_SUITE.erl
+++ b/lib/compiler/test/match_SUITE.erl
@@ -18,17 +18,36 @@
 %%
 -module(match_SUITE).
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 pmatch/1,mixed/1,aliases/1,match_in_call/1,
 	 untuplify/1,shortcut_boolean/1,letify_guard/1,
 	 selectify/1,underscore/1]).
 	 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(match_SUITE),
+    [pmatch, mixed, aliases, match_in_call, untuplify,
+     shortcut_boolean, letify_guard, selectify, underscore].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [pmatch,mixed,aliases,match_in_call,untuplify,shortcut_boolean,
-     letify_guard,selectify,underscore].
 
 pmatch(Config) when is_list(Config) ->
     ?line ok = doit(1),
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index 450a4e279d..bf8d6c7b7c 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -18,11 +18,13 @@
 %%
 -module(misc_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 tobias/1,empty_string/1,md5/1,silly_coverage/1,
 	 confused_literals/1,integer_encoding/1,override_bif/1]).
 	 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% For the override_bif testcase.
 %% NB, no other testcases in this testsuite can use these without erlang:prefix!
@@ -45,17 +47,34 @@ init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = test_server:timetrap(?t:minutes(10)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
+end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
 
--spec all(any()) -> misc_SUITE_test_cases().
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+-spec all() -> misc_SUITE_test_cases().
+all() -> 
+    test_lib:recompile(misc_SUITE),
+    [tobias, empty_string, md5, silly_coverage,
+     confused_literals, integer_encoding, override_bif].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [tobias,empty_string,md5,silly_coverage,confused_literals,
-     integer_encoding, override_bif].
 
 
 %%
diff --git a/lib/compiler/test/num_bif_SUITE.erl b/lib/compiler/test/num_bif_SUITE.erl
index 912f7366dd..29610aec6e 100644
--- a/lib/compiler/test/num_bif_SUITE.erl
+++ b/lib/compiler/test/num_bif_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(num_bif_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Tests optimization of the BIFs:
 %% 	abs/1
@@ -30,17 +30,37 @@
 %%	round/1
 %%	trunc/1
 
--export([all/1, t_abs/1, t_float/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, t_abs/1, t_float/1,
 	 t_float_to_list/1, t_integer_to_list/1,
 	 t_list_to_integer/1,
-	 t_list_to_float/1, t_list_to_float_safe/1, t_list_to_float_risky/1,
+	 t_list_to_float_safe/1, t_list_to_float_risky/1,
 	 t_round/1, t_trunc/1]).
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(num_bif_SUITE),
     [t_abs, t_float, t_float_to_list, t_integer_to_list,
-     t_list_to_float, t_list_to_integer,
-     t_round, t_trunc].
+     {group, t_list_to_float}, t_list_to_integer, t_round,
+     t_trunc].
+
+groups() -> 
+    [{t_list_to_float, [],
+      [t_list_to_float_safe, t_list_to_float_risky]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 t_abs(Config) when is_list(Config) ->
     %% Floats.
@@ -142,7 +162,6 @@ t_integer_to_list(Config) when is_list(Config) ->
 
 %% Tests list_to_float/1.
 
-t_list_to_float(suite) -> [t_list_to_float_safe, t_list_to_float_risky].
 
 t_list_to_float_safe(Config) when is_list(Config) ->
     ?line 0.0 = list_to_float("0.0"),
diff --git a/lib/compiler/test/parteval_SUITE.erl b/lib/compiler/test/parteval_SUITE.erl
index 3ef84571b9..b8faaf5f87 100644
--- a/lib/compiler/test/parteval_SUITE.erl
+++ b/lib/compiler/test/parteval_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -18,11 +18,31 @@
 %%
 -module(parteval_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, pe2/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, pe2/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [pe2].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> [pe2].
 
 %% (This is more general than needed, since we once compiled the same
 %% source code with and without a certain option.)
diff --git a/lib/compiler/test/pmod_SUITE.erl b/lib/compiler/test/pmod_SUITE.erl
index 13503ce905..f9fcae6ba8 100644
--- a/lib/compiler/test/pmod_SUITE.erl
+++ b/lib/compiler/test/pmod_SUITE.erl
@@ -18,20 +18,40 @@
 %%
 -module(pmod_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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, otp_8447/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(pmod_SUITE),
     [basic, otp_8447].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = test_server:timetrap(?t:minutes(1)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
+end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
diff --git a/lib/compiler/test/receive_SUITE.erl b/lib/compiler/test/receive_SUITE.erl
index fca3f0387b..bf6f289656 100644
--- a/lib/compiler/test/receive_SUITE.erl
+++ b/lib/compiler/test/receive_SUITE.erl
@@ -20,23 +20,42 @@
 
 -module(receive_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
-	 recv/1,coverage/1,otp_7980/1,ref_opt/1]).
+-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/1,recv/1,coverage/1,otp_7980/1,ref_opt/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 init_per_testcase(_Case, Config) ->
     ?line Dog = test_server:timetrap(test_server:minutes(2)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [recv,coverage,otp_7980,ref_opt].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(receive_SUITE),
+    [recv, coverage, otp_7980, ref_opt, export].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 -record(state, {ena = true}).
 
@@ -205,4 +224,25 @@ collect_recv_opt_instrs(Code) ->
 		end] || {function,_,_,_,Is} <- Code],
     lists:append(L).
 
+export(Config) when is_list(Config) ->
+    Ref = make_ref(),
+    ?line self() ! {result,Ref,42},
+    ?line 42 = export_1(Ref),
+    ?line {error,timeout} = export_1(Ref),
+    ok.
+
+export_1(Reference) ->
+    id(Reference),
+    receive
+	{result,Reference,Result} ->
+	    Result
+    after 1 ->
+	    Result = {error,timeout}
+    end,
+    %% Result ({x,1}) is used, but not the return value ({x,0})
+    %% of the receive. Used to be incorrectly optimized
+    %% by beam_block.
+    id({build,self()}),
+    Result.
+
 id(I) -> I.
diff --git a/lib/compiler/test/record_SUITE.erl b/lib/compiler/test/record_SUITE.erl
index f26ff769c7..6f85adbb77 100644
--- a/lib/compiler/test/record_SUITE.erl
+++ b/lib/compiler/test/record_SUITE.erl
@@ -20,9 +20,11 @@
 
 -module(record_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 errors/1,record_test_2/1,record_test_3/1,record_access_in_guards/1,
 	 guard_opt/1,eval_once/1,foobar/1,missing_test_heap/1, nested_access/1]).
 
@@ -30,15 +32,34 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = test_server:timetrap(test_server:minutes(2)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [errors,record_test_2,record_test_3,record_access_in_guards,
-     guard_opt,eval_once,foobar,missing_test_heap,nested_access].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(record_SUITE),
+    [errors, record_test_2, record_test_3,
+     record_access_in_guards, guard_opt, eval_once, foobar,
+     missing_test_heap, nested_access].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 -record(foo, {a,b,c,d}).
 -record(bar, {a,b,c,d}).
diff --git a/lib/compiler/test/test_lib.erl b/lib/compiler/test/test_lib.erl
index d8799952a9..53d8c04169 100644
--- a/lib/compiler/test/test_lib.erl
+++ b/lib/compiler/test/test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -41,7 +41,7 @@ smoke_disasm(Mod) when is_atom(Mod) ->
     smoke_disasm(code:which(Mod));
 smoke_disasm(File) when is_list(File) ->
     Res = beam_disasm:file(File),
-    {beam_file,Mod} = {element(1, Res),element(2, Res)}.
+    {beam_file,_Mod} = {element(1, Res),element(2, Res)}.
 
 %% Retrieve the "interesting" compiler options (options for optimization
 %% and compatibility) for the given module.
@@ -62,16 +62,16 @@ opt_opts(Mod) ->
 		    (_) -> 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. This function retrieves the path to
-%% the original data directory.
+%% Some test suites gets cloned (e.g. to "record_SUITE" to
+%% "record_no_opt_SUITE"), but the data directory is not cloned.
+%% This function retrieves the path to the original data directory.
 
 get_data_dir(Config) ->
     Data0 = ?config(data_dir, Config),
-    {ok,Data1,_} = regexp:sub(Data0, "_no_opt_SUITE", "_SUITE"),
-    {ok,Data2,_} = regexp:sub(Data1, "_post_opt_SUITE", "_SUITE"),
-    {ok,Data,_} = regexp:sub(Data2, "_inline_SUITE", "_SUITE"),
-    Data.
+    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).
 
 %% p_run(fun(Data) -> ok|error, List) -> ok
 %%  Will fail the test case if there were any errors.
diff --git a/lib/compiler/test/trycatch_SUITE.erl b/lib/compiler/test/trycatch_SUITE.erl
index c2f6dc24be..db438e28f8 100644
--- a/lib/compiler/test/trycatch_SUITE.erl
+++ b/lib/compiler/test/trycatch_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -18,21 +18,40 @@
 %%
 -module(trycatch_SUITE).
 
--export([all/1,basic/1,lean_throw/1,try_of/1,try_after/1,%after_bind/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,basic/1,lean_throw/1,
+	 try_of/1,try_after/1,%after_bind/1,
 	 catch_oops/1,after_oops/1,eclectic/1,rethrow/1,
 	 nested_of/1,nested_catch/1,nested_after/1,
 	 nested_horrid/1,last_call_optimization/1,bool/1,
 	 plain_catch_coverage/1,andalso_orelse/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(trycatch_SUITE),
+    [basic, lean_throw, try_of, try_after, catch_oops,
+     after_oops, eclectic, rethrow, nested_of, nested_catch,
+     nested_after, nested_horrid, last_call_optimization,
+     bool, plain_catch_coverage, andalso_orelse].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [basic,lean_throw,try_of,try_after,%after_bind,
-     catch_oops,after_oops,eclectic,rethrow,
-     nested_of,nested_catch,nested_after,
-     nested_horrid,last_call_optimization,
-     bool,plain_catch_coverage,andalso_orelse].
 
 
 basic(Conf) when is_list(Conf) ->
diff --git a/lib/compiler/test/warnings_SUITE.erl b/lib/compiler/test/warnings_SUITE.erl
index 5ed8836c70..75e2b17de4 100644
--- a/lib/compiler/test/warnings_SUITE.erl
+++ b/lib/compiler/test/warnings_SUITE.erl
@@ -26,12 +26,14 @@
 -define(privdir, "warnings_SUITE_priv").
 -define(t, test_server).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(datadir, ?config(data_dir, Conf)).
 -define(privdir, ?config(priv_dir, Conf)).
 -endif.
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2]).
+-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([pattern/1,pattern2/1,pattern3/1,pattern4/1,
 	 guard/1,bad_arith/1,bool_cases/1,bad_apply/1,
@@ -44,16 +46,34 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    test_lib:recompile(?MODULE),
-    [pattern,pattern2,pattern3,pattern4,
-     guard,bad_arith,bool_cases,bad_apply,files,effect,
-     bin_opt_info,bin_construction].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    test_lib:recompile(warnings_SUITE),
+    [pattern, pattern2, pattern3, pattern4, guard,
+     bad_arith, bool_cases, bad_apply, files, effect,
+     bin_opt_info, bin_construction].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 pattern(Config) when is_list(Config) ->
     %% Test warnings generated by v3_core.
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index a5e6de7b5f..d180ecd4e2 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 4.6.5
+COMPILER_VSN = 4.7.2
diff --git a/lib/cosEvent/doc/src/notes.xml b/lib/cosEvent/doc/src/notes.xml
index b6c4531901..1a5c8afa17 100644
--- a/lib/cosEvent/doc/src/notes.xml
+++ b/lib/cosEvent/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2010</year>
+      <year>1999</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,42 +33,48 @@
   </header>
 
   <section>
-    <title>cosEvent 2.1.9</title>
+    <title>cosEvent 2.1.10</title>
 
     <section>
       <title>Improvements and New Features</title>
       <list type="bulleted">
         <item>
           <p>
-            Test suites published.</p>
+            Eliminated Dialyzer warnings when using exit or throw.</p>
           <p>
-            Own Id: OTP-8543 Aux Id:</p>
+            Own Id: OTP-9050 Aux Id:</p>
         </item>
       </list>
     </section>
   </section>
 
   <section>
-    <title>cosEvent 2.1.8</title>
+    <title>cosEvent 2.1.9</title>
 
     <section>
       <title>Improvements and New Features</title>
       <list type="bulleted">
         <item>
           <p>
-            Removed the usage of the codeinclude tag in the documentation.</p>
+            Test suites published.</p>
           <p>
-            Own Id: OTP-8409 Aux Id:</p>
+            Own Id: OTP-8543 Aux Id:</p>
         </item>
       </list>
     </section>
+  </section>
+
+  <section>
+    <title>cosEvent 2.1.8</title>
 
     <section>
-      <title>Fixed Bugs and Malfunctions</title>
+      <title>Improvements and New Features</title>
       <list type="bulleted">
         <item>
-          <p>The documentation EIX file was not generated.</p>
-          <p>Own id: OTP-8355 Aux Id:</p>
+          <p>
+            Removed the usage of the codeinclude tag in the documentation.</p>
+          <p>
+            Own Id: OTP-8409 Aux Id:</p>
         </item>
       </list>
     </section>
diff --git a/lib/cosEvent/src/cosEventApp.erl b/lib/cosEvent/src/cosEventApp.erl
index 084490f845..143c241448 100644
--- a/lib/cosEvent/src/cosEventApp.erl
+++ b/lib/cosEvent/src/cosEventApp.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -66,26 +66,31 @@
 %% Effect   : Install necessary data in the IFR DB
 %%------------------------------------------------------------
 install() -> 
-    install_loop(?IDL_MODULES, []).
+    case install_loop(?IDL_MODULES, []) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    exit(Reason)
+    end.
 
 install_loop([], _) ->
     ok;
 install_loop([H|T], Accum) ->
     case catch H:'oe_register'() of
 	{'EXIT',{unregistered,App}} ->
-	    ?write_ErrorMsg("Unable to register '~p'; application ~p not registered.
-Trying to unregister ~p~n", [H,App,Accum]),
+	    ?write_ErrorMsg("Unable to register '~p'; application ~p not registered.\n"
+ 			    "Trying to unregister ~p~n", [H,App,Accum]),
 	    uninstall_loop(Accum, {exit, register});
 	{'EXCEPTION',_} ->
-	    ?write_ErrorMsg("Unable to register '~p'; propably already registered.
-You are adviced to confirm this.
-Trying to unregister ~p~n", [H,Accum]),
+ 	    ?write_ErrorMsg("Unable to register '~p'; propably already registered.\n"
+			    "You are adviced to confirm this.\n"
+			    "Trying to unregister ~p~n", [H,Accum]),
 	    uninstall_loop(Accum, {exit, register});
 	ok ->
 	    install_loop(T, [H|Accum]);
 	_ ->
-	    ?write_ErrorMsg("Unable to register '~p'; reason unknown.
-Trying to unregister ~p~n", [H,Accum]),
+ 	    ?write_ErrorMsg("Unable to register '~p'; reason unknown.\n"
+			    "Trying to unregister ~p~n", [H,Accum]),
 	    uninstall_loop(Accum, {exit, register})
     end.
 
@@ -96,27 +101,32 @@ Trying to unregister ~p~n", [H,Accum]),
 %% Effect   : Remove data related to cosEvent from the IFR DB
 %%------------------------------------------------------------
 uninstall() -> 
-    uninstall_loop(lists:reverse(?IDL_MODULES), ok).
+    case uninstall_loop(lists:reverse(?IDL_MODULES), ok) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    exit(Reason)
+    end.
 
 uninstall_loop([],ok) ->
     ok;
 uninstall_loop([],{exit, register}) ->
-    exit({?MODULE, "oe_register failed"});
+    {error, {?MODULE, "oe_register failed"}};
 uninstall_loop([],{exit, unregister}) ->
-    exit({?MODULE, "oe_unregister failed"});
+    {error, {?MODULE, "oe_unregister failed"}};
 uninstall_loop([],{exit, both}) ->
-    exit({?MODULE, "oe_register and, for some of those already registered, oe_unregister failed"});
+    {error, {?MODULE, "oe_register and, for some of those already registered, oe_unregister failed"}};
 uninstall_loop([H|T], Status) ->
     case catch H:'oe_unregister'() of
 	ok ->
 	    uninstall_loop(T, Status);
 	_ when Status == ok ->
-	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.
-You are adviced to confirm this.~n",[H]),
+	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.\n"
+			    "You are adviced to confirm this.\n",[H]),
 	    uninstall_loop(T, {exit, unregister});
 	_ ->
-	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.
-You are adviced to confirm this.~n",[H]),
+	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.\n"
+			    "You are adviced to confirm this.\n",[H]),
 	    uninstall_loop(T, {exit, both})
     end.
 	
diff --git a/lib/cosEvent/test/Makefile b/lib/cosEvent/test/Makefile
index 3d95075ee1..d37d3e4e3c 100644
--- a/lib/cosEvent/test/Makefile
+++ b/lib/cosEvent/test/Makefile
@@ -34,6 +34,7 @@ RELSYSDIR = $(RELEASE_PATH)/cosEvent_test
 # Target Specs
 # ----------------------------------------------------
 TEST_SPEC_FILE = cosEvent.spec
+COVER_FILE = cosEvent.cover
 
 
 IDL_FILES = \
@@ -146,7 +147,7 @@ release_docs_spec:
 release_tests_spec: tests
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(ERL_FILES) $(RELSYSDIR)
+		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
 	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
 	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
diff --git a/lib/cosEvent/test/cosEvent.cover b/lib/cosEvent/test/cosEvent.cover
new file mode 100644
index 0000000000..df12ea3ca9
--- /dev/null
+++ b/lib/cosEvent/test/cosEvent.cover
@@ -0,0 +1,2 @@
+{incl_app,cosEvent,details}.
+
diff --git a/lib/cosEvent/test/cosEvent.spec b/lib/cosEvent/test/cosEvent.spec
index 910f7a7c28..f793693779 100644
--- a/lib/cosEvent/test/cosEvent.spec
+++ b/lib/cosEvent/test/cosEvent.spec
@@ -1,19 +1 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2010. 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%
-%%
-{topcase, {dir, "../cosEvent_test"}}.
+{suites,"../cosEvent_test",all}.
diff --git a/lib/cosEvent/test/event_channel_SUITE.erl b/lib/cosEvent/test/event_channel_SUITE.erl
index 2b0cf1fe30..6c7194e8c7 100644
--- a/lib/cosEvent/test/event_channel_SUITE.erl
+++ b/lib/cosEvent/test/event_channel_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -22,7 +22,7 @@
 
 -module(event_channel_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
@@ -53,21 +53,33 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, event_objects_api/1, events_api/1, events_sync_api/1, 
-	 cases/0, init_all/1, finish_all/1, 
-	 init_per_testcase/2, fin_per_testcase/2, app_test/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 event_objects_api/1, events_api/1, events_sync_api/1, 
+	 cases/0, init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2, app_test/1]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
 
-all(doc) -> ["API tests for the cosEvent interfaces", ""];
-all(suite) -> {req,
-               [mnesia, orber],
-               {conf, init_all, cases(), finish_all}}.
- 
-cases() ->
-    [events_api, events_sync_api, event_objects_api, app_test].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [events_api, events_sync_api, event_objects_api,
+     app_test].
 
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
@@ -78,12 +90,12 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
     Path = code:which(?MODULE),
     code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
     mnesia:delete_schema([node()]),
@@ -96,7 +108,7 @@ init_all(Config) when is_list(Config) ->
     oe_event_test_server:oe_register(),
     Config.
 
-finish_all(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     oe_event_test_server:oe_unregister(),
     cosEventApp:stop(),
     cosEventApp:uninstall(),
diff --git a/lib/cosEvent/test/event_test_PullC_impl.erl b/lib/cosEvent/test/event_test_PullC_impl.erl
index 186d1cbd51..4b81572cad 100644
--- a/lib/cosEvent/test/event_test_PullC_impl.erl
+++ b/lib/cosEvent/test/event_test_PullC_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
diff --git a/lib/cosEvent/test/event_test_PullS_impl.erl b/lib/cosEvent/test/event_test_PullS_impl.erl
index b7fa0c34f0..81685980fb 100644
--- a/lib/cosEvent/test/event_test_PullS_impl.erl
+++ b/lib/cosEvent/test/event_test_PullS_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
diff --git a/lib/cosEvent/test/event_test_PushC_impl.erl b/lib/cosEvent/test/event_test_PushC_impl.erl
index 6eadf74a31..c2be1d4c08 100644
--- a/lib/cosEvent/test/event_test_PushC_impl.erl
+++ b/lib/cosEvent/test/event_test_PushC_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
diff --git a/lib/cosEvent/test/event_test_PushS_impl.erl b/lib/cosEvent/test/event_test_PushS_impl.erl
index da82e97211..35cfc66e6b 100644
--- a/lib/cosEvent/test/event_test_PushS_impl.erl
+++ b/lib/cosEvent/test/event_test_PushS_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
diff --git a/lib/cosEvent/test/generated_SUITE.erl b/lib/cosEvent/test/generated_SUITE.erl
index 2d75b18451..b3c8f91267 100644
--- a/lib/cosEvent/test/generated_SUITE.erl
+++ b/lib/cosEvent/test/generated_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -25,7 +25,7 @@
 
 -module(generated_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -71,12 +71,12 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -84,19 +84,42 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["This suite is for testing IC generated files"];
-all(suite) -> 
-    ['CosEventChannelAdmin_AlreadyConnected', 'CosEventChannelAdmin_TypeError',
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    ['CosEventChannelAdmin_AlreadyConnected',
+     'CosEventChannelAdmin_TypeError',
      'CosEventComm_Disconnected',
-     'CosEventChannelAdmin_ConsumerAdmin', 'CosEventChannelAdmin_EventChannel',
-     'CosEventChannelAdmin_ProxyPullConsumer', 'CosEventChannelAdmin_ProxyPullSupplier',
-     'CosEventChannelAdmin_ProxyPushConsumer', 'CosEventChannelAdmin_ProxyPushSupplier',
-     'CosEventChannelAdmin_SupplierAdmin', oe_CosEventComm_CAdmin,
-     oe_CosEventComm_Channel, oe_CosEventComm_Event, oe_CosEventComm_PullerS,
-     oe_CosEventComm_PusherS, 'CosEventComm_PullConsumer', 
-     'CosEventComm_PullSupplier', 'CosEventComm_PushConsumer',
+     'CosEventChannelAdmin_ConsumerAdmin',
+     'CosEventChannelAdmin_EventChannel',
+     'CosEventChannelAdmin_ProxyPullConsumer',
+     'CosEventChannelAdmin_ProxyPullSupplier',
+     'CosEventChannelAdmin_ProxyPushConsumer',
+     'CosEventChannelAdmin_ProxyPushSupplier',
+     'CosEventChannelAdmin_SupplierAdmin',
+     oe_CosEventComm_CAdmin, oe_CosEventComm_Channel,
+     oe_CosEventComm_Event, oe_CosEventComm_PullerS,
+     oe_CosEventComm_PusherS, 'CosEventComm_PullConsumer',
+     'CosEventComm_PullSupplier',
+     'CosEventComm_PushConsumer',
      'CosEventComm_PushSupplier'].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -105,7 +128,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/cosEvent/vsn.mk b/lib/cosEvent/vsn.mk
index 9f326b39b6..38999db5fa 100644
--- a/lib/cosEvent/vsn.mk
+++ b/lib/cosEvent/vsn.mk
@@ -1,15 +1,3 @@
 
-COSEVENT_VSN = 2.1.9
+COSEVENT_VSN = 2.1.10
 
-TICKETS = OTP-8543
-
-TICKETS_2.1.8 = OTP-8355 \
-	OTP-8409
-
-TICKETS_2.1.7 = OTP-8201
-
-TICKETS_2.1.6 = OTP-7987
-
-TICKETS_2.1.5 = OTP-7837
-
-TICKETS_2.1.4 = OTP-7595
diff --git a/lib/cosEventDomain/doc/src/notes.xml b/lib/cosEventDomain/doc/src/notes.xml
index deb1985c86..522dcea829 100644
--- a/lib/cosEventDomain/doc/src/notes.xml
+++ b/lib/cosEventDomain/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2010</year>
+      <year>2001</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,7 +32,24 @@
   </header>
 
   <section>
+    <title>cosEventDomain 1.1.10</title>
+
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Eliminated Dialyzer warnings when using exit or throw.</p>
+          <p>
+            Own Id: OTP-9050 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
+  <section>
     <title>cosEventDomain 1.1.9</title>
+
     <section>
       <title>Improvements and New Features</title>
       <list type="bulleted">
@@ -44,7 +61,6 @@
         </item>
       </list>
     </section>
-
   </section>
 
   <section>
diff --git a/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl b/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl
index 0b73100540..f5dd6d5c14 100644
--- a/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl
+++ b/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -778,12 +778,17 @@ get_qos(_OE_This, #state{cyclic = Cyclic, diamonds = Diamonds} = State) ->
 %%----------------------------------------------------------------------
 set_qos(_OE_This, State, NewQoS) ->
     QoS = cosEventDomainApp:get_qos(NewQoS),
-    set_qos_helper(QoS, State, []).
+    case set_qos_helper(QoS, State, []) of
+	{ok, NewState} ->
+	    {reply, ok, NewState};
+	{error, Errors} ->
+	    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors})
+    end.
     
 set_qos_helper([], State, []) ->
-    {reply, ok, State};
+    {ok, State}; %{reply, ok, State};
 set_qos_helper([], _, Errors) ->
-    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors});
+    {error, Errors};
 set_qos_helper([{?DiamondDetection, Diamonds}|T], #state{diamonds = Diamonds} = State,
 	       Errors) ->
     set_qos_helper(T, State, Errors);
@@ -828,12 +833,17 @@ set_qos_helper([{?CycleDetection, _}|T], #state{cyclic = Cyclic} = State, Errors
 %%----------------------------------------------------------------------
 validate_qos(_OE_This, State, WantedQoS) ->
     QoS = cosEventDomainApp:get_qos(WantedQoS),
-    {reply, {ok, validate_qos_helper(QoS, State, [], [])}, State}.
+    case validate_qos_helper(QoS, State, [], []) of
+	{ok, Properties} ->
+	    {reply, {ok, Properties}, State};
+	{error, Errors} ->
+	    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors})
+    end.
 
 validate_qos_helper([], _, Properties, []) ->
-    Properties;
+    {ok, Properties};
 validate_qos_helper([], _, _, Errors) ->
-    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors});
+    {error, Errors};
 validate_qos_helper([{?DiamondDetection, ?ForbidDiamonds}|T], State, Properties, 
 		    Errors) ->
     case get_diamonds_helper(State, false) of
diff --git a/lib/cosEventDomain/src/cosEventDomainApp.erl b/lib/cosEventDomain/src/cosEventDomainApp.erl
index d57f51443c..734e4deccb 100644
--- a/lib/cosEventDomain/src/cosEventDomainApp.erl
+++ b/lib/cosEventDomain/src/cosEventDomainApp.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -270,12 +270,17 @@ create_id() ->
 get_qos([]) ->
     [];
 get_qos(Properties) ->
-    get_qos(Properties, [], []).
+    case get_qos(Properties, [], []) of
+	{ok, Supported} ->
+	    Supported;
+	{error, Unsupported} ->
+	    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Unsupported})
+    end.
 
 get_qos([], Supported, []) ->
-    Supported;
+    {ok, Supported};
 get_qos([], _, Unsupported) ->
-    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Unsupported});
+    {error, Unsupported};
 get_qos([#'CosNotification_Property'{name = ?CycleDetection,
 				     value= #any{value = ?AuthorizeCycles}}|T], 
 	Supported, Unsupported) ->
diff --git a/lib/cosEventDomain/test/Makefile b/lib/cosEventDomain/test/Makefile
index 9893b05b8c..5b53690c6b 100644
--- a/lib/cosEventDomain/test/Makefile
+++ b/lib/cosEventDomain/test/Makefile
@@ -34,6 +34,7 @@ RELSYSDIR = $(RELEASE_PATH)/cosEventDomain_test
 # Target Specs
 # ----------------------------------------------------
 TEST_SPEC_FILE = cosEventDomain.spec
+COVER_FILE = cosEventDomain.cover
 
 
 MODULES =  \
@@ -99,6 +100,6 @@ release_docs_spec:
 release_tests_spec: tests
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(TEST_SPEC_FILE) \
-		$(ERL_FILES) $(RELSYSDIR)
+		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
 	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
 
diff --git a/lib/cosEventDomain/test/cosEventDomain.cover b/lib/cosEventDomain/test/cosEventDomain.cover
new file mode 100644
index 0000000000..f87f6d97bf
--- /dev/null
+++ b/lib/cosEventDomain/test/cosEventDomain.cover
@@ -0,0 +1,2 @@
+{incl_app,cosEventDomain,details}.
+
diff --git a/lib/cosEventDomain/test/cosEventDomain.spec b/lib/cosEventDomain/test/cosEventDomain.spec
index 0d3e307071..bcee74c5f1 100644
--- a/lib/cosEventDomain/test/cosEventDomain.spec
+++ b/lib/cosEventDomain/test/cosEventDomain.spec
@@ -1,19 +1 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2001-2010. 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%
-%%
-{topcase, {dir, "../cosEventDomain_test"}}.
+{suites,"../cosEventDomain_test",all}.
diff --git a/lib/cosEventDomain/test/event_domain_SUITE.erl b/lib/cosEventDomain/test/event_domain_SUITE.erl
index ddf0af3489..2793f94639 100644
--- a/lib/cosEventDomain/test/event_domain_SUITE.erl
+++ b/lib/cosEventDomain/test/event_domain_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -22,7 +22,7 @@
 
 -module(event_domain_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("cosNotification/include/CosNotifyChannelAdmin.hrl").
 -include_lib("cosNotification/include/CosNotification.hrl").
@@ -56,20 +56,31 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, event_domain_api/1, event_domain_factory_api/1,
-	 cases/0, init_all/1, finish_all/1, 
-	 init_per_testcase/2, fin_per_testcase/2, app_test/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 event_domain_api/1, event_domain_factory_api/1,
+	 cases/0, init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2, app_test/1]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
 
-all(doc) -> ["API tests for the cosEventDomain interfaces", ""];
-all(suite) -> {req,
-               [mnesia, orber, cosNotification],
-               {conf, init_all, cases(), finish_all}}.
- 
-cases() ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
     [event_domain_api, event_domain_factory_api, app_test].
 
 %%-----------------------------------------------------------------
@@ -81,12 +92,12 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
     mnesia:delete_schema([node()]),
     mnesia:create_schema([node()]),
     ok = corba:orb_init([{flags, 16#02}, 
@@ -102,7 +113,7 @@ init_all(Config) when is_list(Config) ->
     cosEventDomainApp:start(),
     Config.
 
-finish_all(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     cosEventDomainApp:stop(),
     cosEventDomainApp:uninstall(),
     cosNotificationApp:stop(),
diff --git a/lib/cosEventDomain/test/generated_SUITE.erl b/lib/cosEventDomain/test/generated_SUITE.erl
index 6c6996ca79..575568a7b9 100644
--- a/lib/cosEventDomain/test/generated_SUITE.erl
+++ b/lib/cosEventDomain/test/generated_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -25,7 +25,7 @@
 
 -module(generated_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -71,12 +71,11 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -84,17 +83,41 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["This suite is for testing IC generated files"];
-all(suite) -> 
-    ['CosEventDomainAdmin', 'CosEventDomainAdmin_DiamondSeq',
-     'CosEventDomainAdmin_AlreadyExists', 'CosEventDomainAdmin_DomainIDSeq',
-     'CosEventDomainAdmin_Connection', 'CosEventDomainAdmin_ConnectionIDSeq',
-     'CosEventDomainAdmin_ConnectionNotFound', 'CosEventDomainAdmin_CycleCreationForbidden',
-     'CosEventDomainAdmin_CycleSeq', 'CosEventDomainAdmin_DiamondCreationForbidden',
-     'CosEventDomainAdmin_DomainNotFound', 'CosEventDomainAdmin_MemberIDSeq',
-     'CosEventDomainAdmin_RouteSeq', 'CosEventDomainAdmin_EventDomainFactory',
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    ['CosEventDomainAdmin',
+     'CosEventDomainAdmin_DiamondSeq',
+     'CosEventDomainAdmin_AlreadyExists',
+     'CosEventDomainAdmin_DomainIDSeq',
+     'CosEventDomainAdmin_Connection',
+     'CosEventDomainAdmin_ConnectionIDSeq',
+     'CosEventDomainAdmin_ConnectionNotFound',
+     'CosEventDomainAdmin_CycleCreationForbidden',
+     'CosEventDomainAdmin_CycleSeq',
+     'CosEventDomainAdmin_DiamondCreationForbidden',
+     'CosEventDomainAdmin_DomainNotFound',
+     'CosEventDomainAdmin_MemberIDSeq',
+     'CosEventDomainAdmin_RouteSeq',
+     'CosEventDomainAdmin_EventDomainFactory',
      'CosEventDomainAdmin_EventDomain'].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -103,7 +126,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/cosEventDomain/vsn.mk b/lib/cosEventDomain/vsn.mk
index dceee34181..f4a77ab7a8 100644
--- a/lib/cosEventDomain/vsn.mk
+++ b/lib/cosEventDomain/vsn.mk
@@ -1,15 +1,3 @@
 
-COSEVENTDOMAIN_VSN = 1.1.9
+COSEVENTDOMAIN_VSN = 1.1.10
 
-TICKETS = OTP-8543
-
-TICKETS_1.1.8 = OTP-8353 \
-	OTP-8355
-
-TICKETS_1.1.7 = OTP-8201
-
-TICKETS_1.1.6 = OTP-7987
-
-TICKETS_1.1.5 = OTP-7837
-
-TICKETS_1.1.4 = OTP-7595
diff --git a/lib/cosFileTransfer/test/Makefile b/lib/cosFileTransfer/test/Makefile
new file mode 100644
index 0000000000..cb181bdb66
--- /dev/null
+++ b/lib/cosFileTransfer/test/Makefile
@@ -0,0 +1,133 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2000-2010. 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%
+#
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+VSN=$(COSFILETRANSFER_VSN)
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/cosFileTransfer_test
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+TEST_SPEC_FILE = cosFileTransfer.spec
+COVER_FILE = cosFileTransfer.cover
+
+
+IDL_FILES = 
+
+IDLOUTDIR = idl_output
+
+MODULES =  \
+	fileTransfer_SUITE \
+
+GEN_MODULES = \
+
+GEN_HRL_FILES = \
+
+ERL_FILES = $(MODULES:%=%.erl)
+
+HRL_FILES =
+
+GEN_FILES = \
+	$(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
+	$(GEN_MODULES:%=$(IDLOUTDIR)/%.erl) 
+
+GEN_TARGET_FILES = $(GEN_MODULES:%=$(IDLOUTDIR)/%.$(EMULATOR))
+
+SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
+
+TARGET_FILES = \
+	$(GEN_TARGET_FILES) \
+	$(SUITE_TARGET_FILES)
+
+
+# ----------------------------------------------------
+# PROGRAMS
+# ----------------------------------------------------
+LOCAL_CLASSPATH = $(ERL_TOP)lib/cosFileTransfer/priv:$(ERL_TOP)lib/cosFileTransfer/test
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosFileTransfer/ebin \
+	-pa $(ERL_TOP)/lib/cosFileTransfer/src \
+	-pa $(ERL_TOP)/lib/cosFileTransfer/include \
+	-pa $(ERL_TOP)/lib/cosProperty/ebin \
+	-pa $(ERL_TOP)/lib/cosProperty/include \
+	-pa $(ERL_TOP)/lib/orber/ebin \
+	-pa $(ERL_TOP)/lib/ic/ebin
+
+ERL_COMPILE_FLAGS +=  \
+	$(ERL_IDL_FLAGS) \
+	-pa $(ERL_TOP)/lib/orber/include \
+	-pa $(ERL_TOP)/lib/cosProperty/include \
+	-pa $(ERL_TOP)/internal_tools/test_server/ebin \
+	-pa $(ERL_TOP)/lib/cosFileTransfer/ebin \
+	-pa $(ERL_TOP)/lib/cosFileTransfer/include \
+	-pa $(ERL_TOP)/lib/cosFileTransfer/test/idl_output \
+	-I$(ERL_TOP)/lib/orber/include \
+	-I$(ERL_TOP)/lib/cosProperty/include \
+	-I$(ERL_TOP)/lib/cosFileTransfer/src \
+	-I$(ERL_TOP)/lib/cosFileTransfer/include \
+	-I$(ERL_TOP)/lib/cosFileTransfer \
+	-I$(ERL_TOP)/lib/cosFileTransfer/test/$(IDLOUTDIR) \
+	-I$(ERL_TOP)/lib/test_server/include
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+
+tests debug opt: $(TARGET_FILES)
+
+clean:
+	rm -f idl_output/*
+	rm -f $(TARGET_FILES) 
+	rm -f errs core *~
+
+docs:
+
+# ----------------------------------------------------
+# Special Targets
+# ----------------------------------------------------
+
+# ----------------------------------------------------
+# Release Targets
+# ---------------------------------------------------- 
+# We don't copy generated intermediate erlang and hrl files
+
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: 
+
+release_docs_spec:
+
+release_tests_spec: tests
+	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
+		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
+	chmod -f -R u+w $(RELSYSDIR)
diff --git a/lib/cosFileTransfer/test/cosFileTransfer.cover b/lib/cosFileTransfer/test/cosFileTransfer.cover
new file mode 100644
index 0000000000..063dd66990
--- /dev/null
+++ b/lib/cosFileTransfer/test/cosFileTransfer.cover
@@ -0,0 +1,2 @@
+{incl_app,cosFileTransfer,details}.
+
diff --git a/lib/cosFileTransfer/test/cosFileTransfer.spec b/lib/cosFileTransfer/test/cosFileTransfer.spec
new file mode 100644
index 0000000000..290b27d048
--- /dev/null
+++ b/lib/cosFileTransfer/test/cosFileTransfer.spec
@@ -0,0 +1 @@
+{suites,"../cosFileTransfer_test", all}.
diff --git a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
new file mode 100644
index 0000000000..1e27139ed1
--- /dev/null
+++ b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
@@ -0,0 +1,972 @@
+%%-----------------------------------------------------------------------
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2000-2010. 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%
+%%
+%%
+%%----------------------------------------------------------------------
+%% File    : fileTransfer_SUITE.erl
+%% Purpose : 
+%%----------------------------------------------------------------------
+
+-module(fileTransfer_SUITE).
+
+%%--------------- INCLUDES -----------------------------------
+-include_lib("cosFileTransfer/src/cosFileTransferApp.hrl").
+
+-include_lib("test_server/include/test_server.hrl").
+
+%%--------------- DEFINES ------------------------------------
+-define(default_timeout, ?t:minutes(20)).
+-define(match(ExpectedRes, Expr),
+        fun() ->
+               AcTuAlReS = (catch (Expr)),
+               case AcTuAlReS of
+                   ExpectedRes ->
+                       io:format("------ CORRECT RESULT ------~n~p~n",
+                                 [AcTuAlReS]),
+                       AcTuAlReS;
+                   _ ->
+                       io:format("###### ERROR ERROR ######~n~p~n",
+                                 [AcTuAlReS]),
+                       exit(AcTuAlReS)
+               end
+       end()).
+ 
+-define(matchnopr(ExpectedRes, Expr),
+        fun() ->
+               AcTuAlReS = (catch (Expr)),
+               case AcTuAlReS of
+                   ExpectedRes ->
+                       io:format("------ CORRECT RESULT (~p) ------~n", [?LINE]),
+                       AcTuAlReS;
+                   _ ->
+                       io:format("###### ERROR ERROR ######~n~p~n",
+                                 [AcTuAlReS]),
+                       exit(AcTuAlReS)
+               end
+       end()).
+ 
+
+
+
+ 
+%%-----------------------------------------------------------------
+%% External exports
+%%-----------------------------------------------------------------
+-export([all/0,suite/0,groups/0,
+	 init_per_group/2,end_per_group/2, 
+	 cases/0, 
+	 init_per_suite/1, 
+	 end_per_suite/1, 
+	 fileIterator_api/1,
+	 fts_ftp_file_api/1, 
+	 fts_ftp_file_ssl_api/1, 
+	 fts_ftp_dir_api/1, 
+	 fts_native_file_api/1, 
+	 fts_native_file_ssl_api/1, 
+	 fts_native_dir_api/1, 
+	 init_per_testcase/2, 
+	 end_per_testcase/2,
+	 install_data/2,
+	 uninstall_data/1,
+	 slave_sup/0,
+	 app_test/1]).
+
+%%-----------------------------------------------------------------
+%% Func: all/1
+%% Args: 
+%% Returns: 
+%%-----------------------------------------------------------------
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [fts_ftp_dir_api, fts_ftp_file_api,
+     fts_ftp_file_ssl_api, fts_native_dir_api,
+     fts_native_file_api, fts_native_file_ssl_api,
+     fileIterator_api, app_test].
+
+%%-----------------------------------------------------------------
+%% Init and cleanup functions.
+%%-----------------------------------------------------------------
+
+init_per_testcase(_Case, Config) ->
+    ?line Dog=test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) ->
+    case code:which(crypto) of
+	Res when is_atom(Res) ->
+	    {skip,"Could not start crypto!"};
+	_Else ->
+	    orber:jump_start(),
+	    cosProperty:install(),
+	    cosProperty:start(),
+	    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
+	    %% Client
+	    cosFileTransferApp:configure(ssl_client_certfile,
+					 filename:join([Dir, "client", "cert.pem"])),
+	    cosFileTransferApp:configure(ssl_client_cacertfile,
+					 filename:join([Dir, "client", "cacerts.pem"])),
+	    cosFileTransferApp:configure(ssl_client_verify, 1),
+	    cosFileTransferApp:configure(ssl_client_depth, 0),
+	    %% Server
+	    cosFileTransferApp:configure(ssl_server_certfile,
+					 filename:join([Dir, "server", "cert.pem"])),
+	    cosFileTransferApp:configure(ssl_server_cacertfile,
+					 filename:join([Dir, "server", "cacerts.pem"])),
+	    cosFileTransferApp:configure(ssl_server_verify, 1),
+	    cosFileTransferApp:configure(ssl_server_depth, 0),
+	    crypto:start(),
+	    ssl:start(),
+	    cosFileTransferApp:install(),
+	    cosFileTransferApp:start(),
+	    if
+		is_list(Config) ->
+		    Config;
+		true ->
+		    exit("Config not a list")
+	    end
+    end.
+
+end_per_suite(Config) ->
+    ssl:stop(),
+    crypto:stop(),
+    cosFileTransferApp:stop(),
+    cosProperty:stop(),
+    cosProperty:uninstall(),
+    cosFileTransferApp:uninstall(),
+    orber:jump_stop(),
+    Config.
+
+%%-----------------------------------------------------------------
+%%  Local definitions
+%%-----------------------------------------------------------------
+-define(FTP_USER, "anonymous").
+-define(FTP_PASS, "fileTransfer_SUITE@localhost").
+-define(TEST_DIR,["/", "incoming"]).
+
+
+-define(FTP_PORT, 21).
+-define(FTP_ACC,  "anonymous").
+ 
+-define(BAD_HOST, "badhostname").
+-define(BAD_USER, "baduser").
+-define(BAD_DIR,  "baddirectory").
+
+-define(TEST_FILE_DATA,   "If this file exists after a completed test an error occurred.").   
+-define(TEST_FILE_DATA2,  "1234567890123").
+
+
+%%-----------------------------------------------------------------
+%%  aoo-file test
+%%-----------------------------------------------------------------
+app_test(doc) -> [];
+app_test(suite) -> [];
+app_test(_Config) ->
+    ?line ok=?t:app_test(cosFileTransfer),
+    ok.
+
+%%-----------------------------------------------------------------
+%%  FileIterator API tests 
+%%-----------------------------------------------------------------
+fileIterator_api(doc) -> ["CosFileTransfer FileIterator API tests.", ""];
+fileIterator_api(suite) -> [];
+fileIterator_api(Config) ->
+    case ftp_host(Config) of
+	{skipped, SkippedReason} ->
+	    {skipped, SkippedReason};
+	Host ->
+	    
+	    ?line {ok, Node} = create_node("fileIterator_api", 4008, normal),
+	    ?line ?match(ok, remote_apply(Node, ?MODULE, install_data, 
+					  [tcp, {{'NATIVE', 
+						  'cosFileTransferNATIVE_file'}, Host, 
+						 "fileIterator_api"}])),
+	    
+            %% Create a Virtual File System.
+%%    ?line VFS = ?match({_,_,_,_,_,_},
+%%		 cosFileTransferApp:create_VFS({'NATIVE', 
+%%						'cosFileTransferNATIVE_file'}, 
+%%					       [], Host, ?FTP_PORT)),
+	    ?line VFS = ?matchnopr({'IOP_IOR',"IDL:omg.org/CosFileTransfer/VirtualFileSystem:1.0",_}, 
+				   corba:string_to_object("corbaname::1.2@localhost:4008/NameService#fileIterator_api")),
+
+            %% Start two File Transfer Sessions (Source and Target).
+	    ?line {FS, Dir} = ?matchnopr({{_,_,_},{_,_,_}},
+			'CosFileTransfer_VirtualFileSystem':login(VFS, 
+								  ?FTP_USER, 
+								  ?FTP_PASS, 
+								  ?FTP_ACC)),
+
+            %% Do some basic test on one of the Directories attributes.
+	    ?line ?match([_H|_], 'CosFileTransfer_Directory':'_get_name'(Dir)),
+	    ?line ?match([_H|_], 'CosFileTransfer_Directory':'_get_complete_file_name'(Dir)),
+	    ?line ?match({'IOP_IOR',[],[]}, 'CosFileTransfer_Directory':'_get_parent'(Dir)),
+	    ?line ?matchnopr(FS, 'CosFileTransfer_Directory':'_get_associated_session'(Dir)),
+	    {ok,[],FileIter} = ?match({ok,[],_}, 'CosFileTransfer_Directory':list(Dir, 0)),
+            %% Usually the working directory for the test is not empty so no need for
+            %% creating files of our own?!
+	    #any{value=Children} = ?match({any, _, _},
+					  'CosPropertyService_PropertySet':
+					  get_property_value(Dir, "num_children")),
+
+	    if
+		Children > 5 ->
+		    ?line ?matchnopr({true, _}, 'CosFileTransfer_FileIterator':next_one(FileIter)),
+		    ?line ?matchnopr({true, _}, 'CosFileTransfer_FileIterator':next_n(FileIter, 3)),
+		    ?line ?matchnopr({true, _}, 'CosFileTransfer_FileIterator':next_n(FileIter, 
+										      Children)),
+		    ?line ?matchnopr({false, _}, 'CosFileTransfer_FileIterator':next_one(FileIter)),
+		    ?line ?match({false, []}, 'CosFileTransfer_FileIterator':next_n(FileIter, 1)),
+		    ok;
+		true ->
+	    ok
+	    end,
+	    ?line ?match(ok, 'CosFileTransfer_FileIterator':destroy(FileIter)),
+	    ?line ?match(false, corba_object:non_existent(FS)),
+	    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':logout(FS)),
+            %% To make sure Orber can remove it from mnesia.
+	    timer:sleep(1000),
+	    ?line ?match(true, corba_object:non_existent(FS)),
+	    ?line ?match(ok, remote_apply(Node, ?MODULE, uninstall_data, ["fileIterator_api"])),
+	    stop_orber_remote(Node, normal),
+	    ok
+    end.
+    
+
+%%-----------------------------------------------------------------
+%%  FileTransferSession API tests 
+%%-----------------------------------------------------------------
+fts_ftp_file_api(doc) -> ["CosFileTransfer FTP FileTransferSession API tests.", ""];
+fts_ftp_file_api(suite) -> [];
+fts_ftp_file_api(Config) ->
+    ?line {ok, Node} = create_node("ftp_file_api", 4004, normal),
+    file_helper(Config, 'FTP', ?TEST_DIR, Node, 4004, "ftp_file_api", tcp).
+
+fts_ftp_file_ssl_api(doc) -> ["CosFileTransfer FTP FileTransferSession API tests.", ""];
+fts_ftp_file_ssl_api(suite) -> [];
+fts_ftp_file_ssl_api(Config) ->
+    case os:type() of
+        vxworks ->
+	    {skipped, "No SSL-support for VxWorks."};
+        _ ->
+	    ?line {ok, Node} = create_node("ftp_file_api_ssl", {4005, 1}, ssl),
+	    file_helper(Config, 'FTP', ?TEST_DIR, Node, 4005, "ftp_file_api_ssl", ssl)
+    end.
+
+fts_native_file_api(doc) -> ["CosFileTransfer NATIVE FileTransferSession API tests.", ""];
+fts_native_file_api(suite) -> [];
+fts_native_file_api(Config) ->
+    ?line {ok, Node} = create_node("native_file_api", 4006, normal),
+    {ok, Pwd} = file:get_cwd(),
+    file_helper(Config,{'NATIVE', 'cosFileTransferNATIVE_file'},filename:split(Pwd),
+		Node, 4006, "native_file_api", tcp).
+				 
+fts_native_file_ssl_api(doc) -> ["CosFileTransfer NATIVE FileTransferSession API tests.", ""];
+fts_native_file_ssl_api(suite) -> [];
+fts_native_file_ssl_api(Config) ->
+    case os:type() of
+        vxworks ->
+	    {skipped, "No SSL-support for VxWorks."};
+        _ ->
+	    ?line {ok, Node} = create_node("native_file_ssl_api", {4007, 1}, ssl),
+	    {ok, Pwd} = file:get_cwd(),
+	    file_helper(Config,{'NATIVE', 'cosFileTransferNATIVE_file'},filename:split(Pwd),
+			Node, 4007, "native_file_ssl_api", ssl)
+    end.   
+				 
+
+
+file_helper(Config, WhichType, TEST_DIR, Node, Port, Name, Type) ->
+    case ftp_host(Config) of
+	{skipped, SkippedReason} ->
+	    {skipped, SkippedReason};
+	Host ->
+	    TEST_SOURCE  = TEST_DIR ++ [create_name(remove_me_source)],
+	    TEST_SOURCE2 = TEST_DIR ++ [create_name(remove_me_source)],
+	    TEST_TARGET  = TEST_DIR ++ [create_name(remove_me_target)],
+	    
+	    io:format("<<<<<< CosFileTransfer Testing Configuration >>>>>>~n",[]),
+	    io:format("Source: ~p~nTarget: ~p~n", [TEST_SOURCE, TEST_TARGET]),
+	    
+	    ?line ?match(ok, remote_apply(Node, ?MODULE, install_data, 
+					  [Type, {WhichType, Host, Name}])),
+
+	    ?line VFST = ?match({'IOP_IOR',"IDL:omg.org/CosFileTransfer/VirtualFileSystem:1.0",_}, 
+				corba:string_to_object("corbaname::1.2@localhost:"++integer_to_list(Port)++"/NameService#"++Name)),
+
+
+            %% Create a Virtual File System.
+	    ?line VFS = ?match({_,_,_,_,_,_},
+			       cosFileTransferApp:create_VFS(WhichType, [], Host, ?FTP_PORT, 
+							     [{protocol, Type}])),
+            %% Start two File Transfer Sessions (Source and Target).
+	    ?line {FST, _DirT} = ?match({{_,_,_},{_,_,_}},
+					'CosFileTransfer_VirtualFileSystem':login(VFST, 
+										  ?FTP_USER, 
+										  ?FTP_PASS, 
+										  ?FTP_ACC)),
+	    ?line {FSS, DirS} = ?match({{_,_,_,_,_,_},{_,_,_,_,_,_}},
+				       'CosFileTransfer_VirtualFileSystem':login(VFS, 
+										 ?FTP_USER, 
+										 ?FTP_PASS, 
+										 ?FTP_ACC)),
+
+            %% Do some basic test on one of the Directories attributes.
+	    ?line ?match([_H|_], 'CosFileTransfer_Directory':'_get_name'(DirS)),
+	    ?line ?match([_H|_], 'CosFileTransfer_Directory':'_get_complete_file_name'(DirS)),
+	    ?line ?match({'IOP_IOR',[],[]}, 'CosFileTransfer_Directory':'_get_parent'(DirS)),
+	    ?line ?match(FSS, 'CosFileTransfer_Directory':'_get_associated_session'(DirS)),
+
+            %% Get a FileList before we create any new Files
+	    ?line #'CosFileTransfer_FileWrapper'{the_file = Dir} = 
+		?match({'CosFileTransfer_FileWrapper', _, ndirectory},
+		       'CosFileTransfer_FileTransferSession':get_file(FSS, TEST_DIR)),
+	    ?line {ok,FileList, Iter1} = ?match({ok,_,_}, 'CosFileTransfer_Directory':list(Dir, 10)),
+	    ?line loop_files(FileList),
+
+	    case Iter1 of
+		{'IOP_IOR',[],[]} ->
+		    ok;
+		_->
+		    ?line ?match(ok, 'CosFileTransfer_FileIterator':destroy(Iter1))
+	    end,
+	    
+	    #any{value=Count1} = ?match({any, _, _}, 'CosPropertyService_PropertySet':
+					get_property_value(Dir, "num_children")),
+	    
+            %% Now we want to transfer a file from source to target. First, we'll create
+            %% a a file to work with.
+	    ?line create_file_on_source_node(WhichType, Config, Host, 
+					     filename:join(TEST_SOURCE), TEST_DIR, 
+					     ?TEST_FILE_DATA),
+	    ?line create_file_on_source_node(WhichType, Config, Host, 
+					     filename:join(TEST_SOURCE2), TEST_DIR, 
+					     ?TEST_FILE_DATA2),
+
+	    ?line #'CosFileTransfer_FileWrapper'{the_file = FileS} = 
+		?matchnopr({'CosFileTransfer_FileWrapper', _, nfile},
+			   'CosFileTransfer_FileTransferSession':get_file(FSS, TEST_SOURCE)),
+	    ?line #'CosFileTransfer_FileWrapper'{the_file = FileS2} = 
+		?matchnopr({'CosFileTransfer_FileWrapper', _, nfile},
+			   'CosFileTransfer_FileTransferSession':get_file(FSS, TEST_SOURCE2)),
+	    
+	    #any{value=Count2} = ?match({any, _, _}, 'CosPropertyService_PropertySet':
+					get_property_value(Dir, "num_children")),
+	    timer:sleep(2000),
+	    ?match(true, (Count1+2 == Count2)),
+
+            %% Create a target File
+	    ?line FileT = ?matchnopr({_,_,_}, 
+				     'CosFileTransfer_FileTransferSession':create_file(FST, TEST_TARGET)),
+            %% Try to delete the non-existing file.
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_FileTransferSession':delete(FST, FileT)),
+
+	    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':transfer(FSS, FileS, FileT)),
+    
+            %% Remove this test when ftp supports append.
+	    case WhichType of
+		{'NATIVE', 'cosFileTransferNATIVE_file'} ->
+		    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':append(FSS, FileS, FileT)),
+		    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':insert(FSS, FileS2, FileT, 7));
+		_->
+		    ok
+	    end,
+	    
+            %% Delete source and target files
+	    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':delete(FSS, FileS)),
+	    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':delete(FSS, FileS2)),
+	    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':delete(FST, FileT)),
+
+            %% Should be back where we started.
+	    timer:sleep(2000),
+	    #any{value=Count3} = ?match({any, _, _}, 'CosPropertyService_PropertySet':
+					get_property_value(Dir, "num_children")),
+	    ?match(true, (Count1 == Count3)),
+
+
+	    ?line ?match(false, corba_object:non_existent(FSS)),
+	    ?line ?match(false, corba_object:non_existent(FST)),
+	    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':logout(FSS)),
+	    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':logout(FST)),
+            %% To make sure Orber can remove it from mnesia.
+	    timer:sleep(2000),
+	    ?line ?match(true, corba_object:non_existent(FSS)),
+	    ?line ?match(true, corba_object:non_existent(FST)),
+	    ?line ?match(ok, remote_apply(Node, ?MODULE, uninstall_data, [Name])),
+	    stop_orber_remote(Node, normal),
+	    ok
+    end.
+
+%%-----------------------------------------------------------------
+%%  FileTransferSession API tests 
+%%-----------------------------------------------------------------
+fts_ftp_dir_api(doc) -> ["CosFileTransfer FTP FileTransferSession API tests.", ""];
+fts_ftp_dir_api(suite) -> [];
+fts_ftp_dir_api(Config) ->
+    ?line {ok, Node} = create_node("ftp_dir_api", 4009, normal),
+    dir_helper(Config, 'FTP', ?TEST_DIR, Node, 4009, "ftp_dir_api").
+
+
+fts_native_dir_api(doc) -> ["CosFileTransfer NATIVE FileTransferSession API tests.", ""];
+fts_native_dir_api(suite) -> [];
+fts_native_dir_api(Config) ->
+    ?line {ok, Node} = create_node("native_dir_api", 4010, normal),
+    {ok, Pwd} = file:get_cwd(),
+    dir_helper(Config, {'NATIVE', 'cosFileTransferNATIVE_file'}, 
+	       filename:split(Pwd), Node, 4010, "native_dir_api").
+
+dir_helper(Config, WhichType, TEST_DIR, Node, Port, Name) ->
+    case ftp_host(Config) of
+	{skipped, SkippedReason} ->
+	    {skipped, SkippedReason};
+	Host ->
+	    TEST_DIR_LEVEL1 = TEST_DIR ++ [create_name(remove_me_dir1)],
+	    TEST_DIR_LEVEL2 = TEST_DIR_LEVEL1 ++ [create_name(remove_me_dir2)],
+	    
+	    io:format("<<<<<< CosFileTransfer Testing Configuration >>>>>>~n",[]),
+	    io:format("Top Dir: ~p~nLevel2 Dir: ~p~n", [TEST_DIR_LEVEL1, TEST_DIR_LEVEL2]),
+	    
+	    ?line ?match(ok, remote_apply(Node, ?MODULE, install_data, 
+					  [tcp, {WhichType, Host, Name}])),
+	    
+	    ?line VFS = ?matchnopr({'IOP_IOR',"IDL:omg.org/CosFileTransfer/VirtualFileSystem:1.0",_}, 
+				   corba:string_to_object("corbaname::1.2@localhost:"++integer_to_list(Port)++"/NameService#"++Name)),
+	    
+            %% Start two File Transfer Sessions (Source and Target).
+	    ?line {FS, DirS} = ?matchnopr({{'IOP_IOR',_,_}, _},
+					  'CosFileTransfer_VirtualFileSystem':login(VFS, 
+										    ?FTP_USER, 
+										    ?FTP_PASS, 
+										    ?FTP_ACC)),
+
+            %% Do some basic test on one of the Directories attributes.
+	    ?line ?match([_H|_], 'CosFileTransfer_Directory':'_get_name'(DirS)),
+	    ?line ?match([_H|_], 'CosFileTransfer_Directory':'_get_complete_file_name'(DirS)),
+	    ?line ?match({'IOP_IOR',[],[]}, 'CosFileTransfer_Directory':'_get_parent'(DirS)),
+	    ?line ?matchnopr(FS, 'CosFileTransfer_Directory':'_get_associated_session'(DirS)),
+
+            %% Create a Root Directory. Currently we only need to create one but
+            %% later on, when supporting other protocols than FTP it's not enough.
+	    ?line Dir1 =  'CosFileTransfer_FileTransferSession':create_directory(FS, 
+										 TEST_DIR_LEVEL1),
+	    io:format("<<<<<< CosFileTransfer Testing Properties >>>>>>~n",[]),
+	    ?line ?match({ok, [tk_long, tk_boolean]}, 
+			 'CosFileTransfer_Directory':get_allowed_property_types(Dir1)),
+	    ?line ?match({ok, [_,_]}, 
+			 'CosFileTransfer_Directory':get_allowed_properties(Dir1)),
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':define_property_with_mode(Dir1, 
+									       "num_children",
+									       #any{typecode=tk_long, value=0},
+									       fixed_readonly)),
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':define_property_with_mode(Dir1, 
+									       "wrong",
+									       #any{typecode=tk_long, value=0},
+									       fixed_readonly)),
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':define_property_with_mode(Dir1, 
+									       "num_children",
+									       #any{typecode=tk_short, value=0},
+									       fixed_readonly)),
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':define_property_with_mode(Dir1, 
+									       "num_children",
+									       #any{typecode=tk_long, value=0},
+									       fixed_normal)),
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':define_properties_with_modes(Dir1, 
+										  [#'CosPropertyService_PropertyDef'
+										   {property_name  = "num_children", 
+										    property_value = #any{typecode=tk_long, value=0}, 
+										    property_mode  = fixed_readonly}])),
+	    ?line ?match(fixed_readonly, 
+			 'CosFileTransfer_Directory':get_property_mode(Dir1, "num_children")),
+	    ?line ?match({true,
+			  [#'CosPropertyService_PropertyMode'{property_name = "num_children", 
+							      property_mode = fixed_readonly}]}, 
+			 'CosFileTransfer_Directory':get_property_modes(Dir1, ["num_children"])),
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':set_property_mode(Dir1, "num_children", fixed_readonly)),
+	    
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':
+			 set_property_modes(Dir1, 
+					    [#'CosPropertyService_PropertyMode'
+					     {property_name = "num_children", 
+					      property_mode = fixed_readonly}])),
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':
+			 set_property_modes(Dir1, 
+					    [#'CosPropertyService_PropertyMode'
+					     {property_name = "wrong", 
+					      property_mode = fixed_readonly}])),
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':
+			 set_property_modes(Dir1, 
+					    [#'CosPropertyService_PropertyMode'
+					     {property_name = "num_children", 
+					      property_mode = fixed_normal}])),
+	    ?line ?match({'EXCEPTION', _},
+			 'CosFileTransfer_Directory':define_property(Dir1, 
+								     "num_children",
+								     #any{typecode=tk_long, value=0})),
+	    ?line ?match({'EXCEPTION', _},
+			 'CosFileTransfer_Directory':define_property(Dir1, 
+								     "wrong",
+								     #any{typecode=tk_long, value=0})),
+	    ?line ?match({'EXCEPTION', _},
+			 'CosFileTransfer_Directory':define_property(Dir1, 
+								     "num_children",
+								     #any{typecode=tk_short, value=0})),
+	    
+	    ?line ?match({'EXCEPTION', _},
+			 'CosFileTransfer_Directory':define_property(Dir1, 
+								     "num_children",
+								     #any{typecode=tk_long, value=0})),
+
+	    ?line ?match({'EXCEPTION', _},
+			 'CosFileTransfer_Directory':
+			 define_properties(Dir1, 
+					   [#'CosPropertyService_Property'
+					    {property_name = "num_children", 
+					     property_value = #any{typecode=tk_long, 
+								   value=0}}])),
+	    ?line ?match({'EXCEPTION', _},
+			 'CosFileTransfer_Directory':
+			 define_properties(Dir1, 
+					   [#'CosPropertyService_Property'
+					    {property_name = "wrong", 
+					     property_value = #any{typecode=tk_long, 
+								   value=0}}])),
+	    ?line ?match({'EXCEPTION', _},
+			 'CosFileTransfer_Directory':
+			 define_properties(Dir1, 
+					   [#'CosPropertyService_Property'
+					    {property_name = "num_children", 
+					     property_value = #any{typecode=tk_short, 
+								   value=0}}])),
+	    ?line ?match(2, 'CosFileTransfer_Directory':get_number_of_properties(Dir1)),
+
+	    ?line ?match({ok, ["num_children", "is_directory"], {'IOP_IOR',[],[]}}, 
+			 'CosFileTransfer_Directory':get_all_property_names(Dir1, 2)),
+	    ?line ?match({ok, ["is_directory"], _}, 
+			 'CosFileTransfer_Directory':get_all_property_names(Dir1, 1)),
+	    
+	    ?line ?match(#any{}, 
+			 'CosFileTransfer_Directory':get_property_value(Dir1, "num_children")),
+	    ?line ?match(#any{}, 
+			 'CosFileTransfer_Directory':get_property_value(Dir1, "is_directory")),
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':get_property_value(Dir1, "wrong")),
+	    
+	    ?line ?match({true, 
+			  [#'CosPropertyService_Property'{property_name = "num_children"}]}, 
+			 'CosFileTransfer_Directory':get_properties(Dir1, ["num_children"])),
+	    ?line ?match({false, 
+			  [#'CosPropertyService_Property'{property_name = "wrong"}]},
+			 'CosFileTransfer_Directory':get_properties(Dir1, ["wrong"])),
+	    
+	    ?line ?match({ok, [_],_}, 
+			 'CosFileTransfer_Directory':get_all_properties(Dir1, 1)),
+	    ?line ?match({ok, [_,_], {'IOP_IOR',[],[]}}, 
+			 'CosFileTransfer_Directory':get_all_properties(Dir1, 2)),
+	    
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':delete_property(Dir1, "num_children")),
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':delete_property(Dir1, "wrong")),
+	    
+	    
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':delete_properties(Dir1, ["num_children"])),
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_Directory':delete_properties(Dir1, ["wrong"])),
+	    ?line ?match(false, 'CosFileTransfer_Directory':delete_all_properties(Dir1)),
+	    ?line ?match(true, 
+			 'CosFileTransfer_Directory':is_property_defined(Dir1, "num_children")),
+	    ?line ?match(false, 
+			 'CosFileTransfer_Directory':is_property_defined(Dir1, "wrong")),
+
+            %% The Top Dir should be empty and ...
+	    ?line ?match({ok,[],_}, 'CosFileTransfer_Directory':list(Dir1, 1000)),
+	    ?line ?match( #any{value=0},
+			  'CosPropertyService_PropertySet':get_property_value(Dir1, "num_children")),
+            %% Create a sub-directory.
+	    ?line Dir2 = 'CosFileTransfer_FileTransferSession':create_directory(FS, 
+										TEST_DIR_LEVEL2),
+	    ?line ?match( #any{value=1},
+			  'CosPropertyService_PropertySet':get_property_value(Dir1, "num_children")),
+	    
+	    ?line ?match({ok, [_,_], {'IOP_IOR',[],[]}}, 
+			 'CosFileTransfer_Directory':get_all_properties(Dir1, 2)),
+	    ?line {_,_,Iterator1} = ?match({ok, [_], _}, 
+					   'CosFileTransfer_Directory':get_all_properties(Dir1, 1)),
+	    ?line ?match({false, [_]}, 
+			 'CosPropertyService_PropertiesIterator':next_n(Iterator1,4)),
+	    
+	    ?line {_,_,Iterator0} = ?match({ok, [], _}, 
+					   'CosFileTransfer_Directory':get_all_properties(Dir1, 0)),
+	    
+	    ?line ?match({false, [_, {'CosPropertyService_Property',
+				      "num_children",{any,tk_long,1}}]},
+			 'CosPropertyService_PropertiesIterator':next_n(Iterator0,4)),
+	    
+	    ?line ?match({true, 
+			  [#'CosPropertyService_Property'{property_name = "num_children"}]}, 
+			 'CosFileTransfer_Directory':get_properties(Dir1, ["num_children"])),
+	    
+            %% The Top Directory is not emtpy any more and ...
+	    ?line {ok,[#'CosFileTransfer_FileWrapper'{the_file = DirRef}],_} = 
+		?matchnopr({ok,[{'CosFileTransfer_FileWrapper', _, ndirectory}],_}, 
+			   'CosFileTransfer_Directory':list(Dir1, 1000)),
+            %% ... its name eq. to 'TEST_DIR_LEVEL2'
+	    ?line ?match(TEST_DIR_LEVEL2, 
+			 'CosFileTransfer_Directory':'_get_complete_file_name'(DirRef)),
+	    
+	    ?line #'CosFileTransfer_FileWrapper'{the_file = Dir3} = 
+		?matchnopr({'CosFileTransfer_FileWrapper', _, ndirectory},
+			   'CosFileTransfer_FileTransferSession':get_file(FS, TEST_DIR_LEVEL1)),
+	    
+            %% Must get the same result for the 'get_file' operation.
+	    ?line {ok,[#'CosFileTransfer_FileWrapper'{the_file = DirRef2}],_} = 
+		?matchnopr({ok,[{'CosFileTransfer_FileWrapper', _, ndirectory}],_}, 
+			   'CosFileTransfer_Directory':list(Dir3,1000)),
+	    ?line ?match(TEST_DIR_LEVEL2, 
+			 'CosFileTransfer_Directory':'_get_complete_file_name'(DirRef2)),
+	    
+            %% Since the top directory isn't empty deleting it must fail.
+	    ?line ?match({'EXCEPTION', _}, 
+			 'CosFileTransfer_FileTransferSession':delete(FS, Dir1)),
+	    
+            %% Delete the sub-directory and ...
+	    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':delete(FS, Dir2)),
+            %% ... see if the top directory realyy is empty.
+	    ?line ?match({ok,[],_}, 'CosFileTransfer_Directory':list(Dir1, 1000)),
+
+	    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':delete(FS, Dir1)),
+            %% Test if the top directory been removed as intended.
+	    ?line ?match({'EXCEPTION', {'CosFileTransfer_FileNotFoundException', _, _}},
+			 'CosFileTransfer_FileTransferSession':get_file(FS, TEST_DIR_LEVEL1)),
+
+	    ?line ?match(false, corba_object:non_existent(FS)),
+	    ?line ?match(ok, 'CosFileTransfer_FileTransferSession':logout(FS)),
+            %% To make sure Orber can remove it from mnesia.
+	    timer:sleep(1000),
+	    ?line ?match(true, corba_object:non_existent(FS)),
+	    ?line ?match(ok, remote_apply(Node, ?MODULE, uninstall_data, [Name])),
+	    stop_orber_remote(Node, normal),
+	    ok
+    end.
+
+
+%%-----------------------------------------------------------------
+%%  Internal functions
+%%-----------------------------------------------------------------
+ftp_host(Config) ->
+    case ?config(ftp_remote_host, Config) of
+	undefined ->
+	    {skipped, "The configuration parameter 'ftp_remote_host' not defined."};
+	Host ->
+	    Host
+    end.
+
+loop_files([]) ->
+    io:format("@@@ DONE @@@~n", []);
+loop_files([#'CosFileTransfer_FileWrapper'{the_file = H}|T]) ->
+    FullName = 'CosFileTransfer_File':'_get_complete_file_name'(H),
+    Name = 'CosFileTransfer_File':'_get_name'(H),
+    io:format("FULL NAME: ~p   SHORT NAME: ~p~n", [FullName, Name]),
+    loop_files(T).
+
+
+create_file_on_source_node('FTP', _Config, Host, FileName, Path, Data) ->
+    io:format("<<<<<< CosFileTransfer Testing File >>>>>>~n",[]),
+    io:format("Host: ~p~nPath: ~p~nFile: ~p~n", [Host, Path, FileName]),
+    {ok, Pid} = ?match({ok, _}, inets:start(ftpc, [{host, Host}], stand_alone)),
+    ?match(ok, ftp:user(Pid, ?FTP_USER, ?FTP_PASS)),
+    ?match(ok, ftp:cd(Pid, Path)),
+    ?match(ok, ftp:send_bin(Pid, list_to_binary(Data), FileName)),
+    ?match(ok, inets:stop(ftpc, Pid));
+create_file_on_source_node({'NATIVE', _}, _Config, Host, FileName, Path, Data) ->
+    io:format("<<<<<< CosFileTransfer Testing File >>>>>>~n",[]),
+    io:format("Host: ~p~nPath: ~p~nFile: ~p~n", [Host, Path, FileName]),
+    ?match(ok, file:write_file(FileName, list_to_binary(Data))).
+    
+create_name(Type) ->
+    {MSec, Sec, USec} = erlang:now(),
+    lists:concat([Type,'_',MSec, '_', Sec, '_', USec]).
+
+
+
+
+%%------------------------------------------------------------
+%% function : create_node/4
+%% Arguments: Name - the name of the new node (atom())
+%%            Port - which iiop_port (integer())
+%%            Domain - which domain.
+%%            Type - if /4 used the types defines the extra arguments
+%%                   to be used.
+%% Returns  : {ok, Node} | {error, _}
+%% Effect   : Starts a new slave-node with given (optinally)
+%%            extra arguments. If fails it retries 'Retries' times.
+%%------------------------------------------------------------
+create_node(Name, Port, normal) ->
+    Args = basic_args(Name),
+    create_node(Name, Port, 10, normal, Args, []);
+create_node(Name, {Port, _Depth}, ssl) ->
+    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
+    Args = basic_args(Name),
+    {ok, Node} = create_node(list_to_atom(Name), Port, 10, ssl, Args, []),
+    %% Client
+    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_client_certfile,
+					  filename:join([Dir, "client", "cert.pem"])]),
+    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_client_cacertfile,
+					  filename:join([Dir, "client", "cacerts.pem"])]),
+    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_client_keyfile,
+					  filename:join([Dir, "client", "key.pem"])]),
+    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_client_verify, 1]),
+    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_client_depth, 0]),
+    
+    %% Server
+    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_server_certfile,
+					  filename:join([Dir, "server", "cert.pem"])]),
+    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_server_cacertfile,
+					  filename:join([Dir, "server", "cacerts.pem"])]),
+    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_server_keyfile,
+					  filename:join([Dir, "server", "key.pem"])]),
+    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_server_verify, 1]),
+    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_server_depth, 0]),
+    {ok, Node}.
+
+%create_node(Name, {Port, Depth}, ssl) ->
+%    TestLibs = filename:join(filename:dirname(code:which(?MODULE)), "ssl_data"),
+%    Args = basic_args(Name),
+%    SArgs = basic_ssl_args(TestLibs, Args),
+%    LArgs = level_based_ssl(Depth, TestLibs, SArgs),
+%    create_node(list_to_atom(Name), Port, 10, ssl, LArgs, [{sslpath, TestLibs}]).
+
+create_node(Name, Port, Retries, Type, Args, Options) ->
+    [_, Host] = ?match([_,_],string:tokens(atom_to_list(node()), [$@])),
+    case starter(Host, Name, Args) of
+	{ok, NewNode} ->
+            ?line ?match(pong, net_adm:ping(NewNode)),
+            {ok, Cwd} = file:get_cwd(),
+            Path = code:get_path(),
+            ?line ?match(ok, rpc:call(NewNode, file, set_cwd, [Cwd])),
+            true = rpc:call(NewNode, code, set_path, [Path]),
+	    ?match(ok, start_orber_remote(NewNode, Type, Options, Port)),
+            spawn_link(NewNode, ?MODULE, slave_sup, []),
+            rpc:multicall([node() | nodes()], global, sync, []),
+            {ok, NewNode};
+        {error, Reason} when Retries == 0->
+            {error, Reason};
+        {error, Reason} ->          
+            io:format("Could not start slavenode ~p ~p retrying~n", 
+                      [{Host, Name, Args}, Reason]),
+            timer:sleep(500),
+            create_node(Name, Port, Retries - 1, Type, Args, Options)
+    end.
+
+starter(Host, Name, Args) ->
+    case os:type() of
+        vxworks ->
+            test_server:start_node(Name, slave, [{args,Args}]);
+        _ ->
+            slave:start(Host, Name, Args)
+    end.
+
+slave_sup() ->
+    process_flag(trap_exit, true),
+    receive
+        {'EXIT', _, _} -> 
+            case os:type() of
+                vxworks ->
+                    erlang:halt();
+                _  ->
+                    ignore
+            end
+    end.
+
+
+%%------------------------------------------------------------
+%% function : destroy_node
+%% Arguments: Node - which node to destroy.
+%%            Type - normal | ssl
+%% Returns  : 
+%% Effect   : 
+%%------------------------------------------------------------
+-ifdef(false).
+destroy_node(Node, Type) ->
+    stopper(Node, Type).
+
+stopper(Node, Type) ->
+    catch stop_orber_remote(Node, Type),
+    case os:type() of
+        vxworks ->
+            test_server:stop_node(Node);
+        _ ->
+            slave:stop(Node)
+    end.
+-endif.
+  
+%%------------------------------------------------------------
+%% function : remote_apply
+%% Arguments: N - Node, M - Module,
+%%            F - Function, A - Arguments (list)
+%% Returns  : 
+%% Effect   : 
+%%------------------------------------------------------------
+remote_apply(N, M,F,A) ->
+    case rpc:call(N, M, F, A) of
+	{badrpc, Reason} ->
+	    exit(Reason);
+	Other ->
+	    Other
+    end.
+
+%%------------------------------------------------------------
+%% function : stop_orber_remote
+%% Arguments: Node - which node to stop orber on.
+%%            Type - normal | ssl | light | .......
+%% Returns  : ok
+%% Effect   : Stops orber on given node and, if specified,
+%%            other applications or programs.
+%%------------------------------------------------------------
+stop_orber_remote(Node, ssl) ->
+    rpc:call(Node, ssl, stop, []),
+    rpc:call(Node, crypto, stop, []),
+    orb_rpc_blast(Node, ssl);
+stop_orber_remote(Node, Type) ->
+    orb_rpc_blast(Node, Type).
+
+orb_rpc_blast(Node, _) ->
+    rpc:call(Node, cosFileTransferApp, stop, []),
+    rpc:call(Node, cosProperty, stop, []),
+    rpc:call(Node, cosFileTransferApp, uninstall, []),
+    rpc:call(Node, cosProperty, uninstall, []),
+    rpc:call(Node, orber, jump_stop, []).
+
+%%------------------------------------------------------------
+%% function : start_orber_remote
+%% Arguments: Node - which node to start orber on.
+%%            Type - normal | ssl | light | .......
+%% Returns  : ok
+%% Effect   : Starts orber on given node and, if specified,
+%%            other applications or programs.
+%%------------------------------------------------------------
+start_orber_remote(Node, ssl, _Options, Port) ->
+    rpc:call(Node, ssl, start, []),
+    rpc:call(Node, crypto, start, []),
+    rpc:call(Node, ssl, seed, ["testing"]),
+    orb_rpc_setup(Node, ssl, Port);
+start_orber_remote(Node, Type, _, Port) ->
+    orb_rpc_setup(Node, Type, Port).
+
+orb_rpc_setup(Node, _, Port) ->
+    rpc:call(Node, orber, jump_start, [Port]),
+    rpc:call(Node, cosProperty, install, []),
+    rpc:call(Node, cosProperty, start, []),
+    rpc:call(Node, cosFileTransferApp, install, []).
+
+%%--------------- MISC FUNCTIONS -----------------------------
+basic_args(_Name) ->
+    TestLibs = filename:dirname(code:which(?MODULE)),
+    " -orber orber_debug_level 10" ++
+	" -pa " ++
+        TestLibs ++ 
+	" -pa " ++
+        filename:join(TestLibs, "all_SUITE_data") ++ 
+        " -pa " ++ 
+        filename:dirname(code:which(cosFileTransferApp)).
+
+-ifdef(false).
+basic_ssl_args(TestLibs, Args) ->
+%    Args ++
+%	" -cosFileTransfer ssl_client_certfile \\\"" ++
+%	filename:join(TestLibs, "ssl_client_cert.pem") ++
+%	"\\\" -cosFileTransfer ssl_server_certfile \\\""++
+%	filename:join(TestLibs, "ssl_server_cert.pem")++"\\\"".
+
+    io:format("<<<<<< SSL LIBS ~p >>>>>>~n",[TestLibs]),
+    NewArgs = Args ++
+	" -cosFileTransfer ssl_client_certfile \\\"" ++
+	filename:join(TestLibs, "ssl_client_cert.pem") ++
+	"\\\" -cosFileTransfer ssl_server_certfile \\\""++
+	filename:join(TestLibs, "ssl_server_cert.pem")++"\\\"",
+    io:format("<<<<<< SSL LIBS ARGS ~p >>>>>>~n",[NewArgs]),
+    NewArgs.
+
+level_based_ssl(1, _TestLibs, Args) ->
+    Args;
+level_based_ssl(2, _TestLibs, Args) ->
+    Args.% ++
+%	" -cosFileTransfer ssl_server_depth 2 " ++
+%	" -cosFileTransfer ssl_client_depth 2 " ++
+%	" -cosFileTransfer ssl_server_verify " ++
+%	" -cosFileTransfer ssl_client_verify " ++
+%	" -cosFileTransfer ssl_server_cacertfile " ++
+%	" -cosFileTransfer ssl_client_cacertfile " ++
+
+-endif.
+
+install_data(Protocol, {WhichType, Host, Name}) ->
+    io:format("<<<<<< Starting ~p/~p VFS at ~p/~p>>>>>>~n",
+	      [Protocol, WhichType, Host, Name]),
+    %% Create a Virtual File System.
+    ?line VFS = ?match({_,_,_,_,_,_},
+		       cosFileTransferApp:create_VFS(WhichType, [], Host, ?FTP_PORT, 
+						     [{protocol, Protocol}])),
+    NS = corba:resolve_initial_references("NameService"),
+    NC1 = lname_component:set_id(lname_component:create(), Name),
+    N = lname:insert_component(lname:create(), 1, NC1),
+    'CosNaming_NamingContext':rebind(NS, N, VFS).
+
+uninstall_data(Name) ->
+    ?line VFS = ?match({_,_,_,_,_,_}, 
+		       corba:string_to_object("corbaname:rir:/NameService#"++Name)),
+    ?line ?match(ok, corba:dispose(VFS)),
+    ok.
+    
+
+
+%%------------------- EOF MODULE-----------------------------------
diff --git a/lib/cosFileTransfer/vsn.mk b/lib/cosFileTransfer/vsn.mk
index 2700ecb3e3..ef8ee53c5e 100644
--- a/lib/cosFileTransfer/vsn.mk
+++ b/lib/cosFileTransfer/vsn.mk
@@ -1,16 +1 @@
 COSFILETRANSFER_VSN = 1.1.10
-
-TICKETS = \
-	OTP-8355 \
-	OTP-8374
-
-
-TICKETS_1.1.9 = OTP-8201
-
-TICKETS_1.1.8 = OTP-7987
-
-TICKETS_1.1.7 = OTP-7837
-
-TICKETS_1.1.6 = \
-	OTP-7595 \
-	OTP-7599
\ No newline at end of file
diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml
index de5a3e5f4c..125e25e67e 100644
--- a/lib/cosNotification/doc/src/notes.xml
+++ b/lib/cosNotification/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,60 @@
     <file>notes.xml</file>
   </header>
 
+  <section><title>cosNotification 1.1.16</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Eliminated Dialyzer warnings when using exit or throw.</p>
+          <p>
+	    Own Id: OTP-9050</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+  <section><title>cosNotification 1.1.15</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Switched from using the deprecated regexp to re instead.</p>
+          <p>
+	    Own Id: OTP-8846</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section>
+    <title>cosNotification 1.1.14</title>
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Test suites published.</p>
+          <p>
+            Own Id: OTP-8543 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <list type="bulleted">
+        <item>
+          <p>Added missing trailing bracket to define in hrl-file.</p>
+          <p>Own Id: OTP-8489 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
   <section>
     <title>cosNotification 1.1.14</title>
     <section>
@@ -64,15 +118,15 @@
       <list type="bulleted">
         <item>
           <p>Removed superfluous VT in the documentation.</p>
-          <p>Own id: OTP-8353 Aux Id:</p>
+          <p>Own Id: OTP-8353 Aux Id:</p>
         </item>
         <item>
           <p>Removed superfluous backslash in the documentation.</p>
-          <p>Own id: OTP-8354 Aux Id:</p>
+          <p>Own Id: OTP-8354 Aux Id:</p>
         </item>
         <item>
           <p>The documentation EIX file was not generated.</p>
-          <p>Own id: OTP-8355 Aux Id:</p>
+          <p>Own Id: OTP-8355 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -104,7 +158,7 @@
         <item>
           <p>Obsolete guards, e.g. record vs is_record, has been changed
              to avoid compiler warnings.</p>
-          <p>Own id: OTP-7987</p>
+          <p>Own Id: OTP-7987</p>
         </item>
       </list>
     </section>
@@ -118,7 +172,7 @@
       <list type="bulleted">
         <item>
           <p>Updated file headers.</p>
-          <p>Own id: OTP-7837 Aux Id:</p>
+          <p>Own Id: OTP-7837 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -132,7 +186,7 @@
       <list type="bulleted">
         <item>
           <p>Documentation source included in open source releases.</p>
-          <p>Own id: OTP-7595 Aux Id:</p>
+          <p>Own Id: OTP-7595 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -147,7 +201,7 @@
         <item>
           <p>The CosNotification proxy objects ignored the gcLimit option, instead
              the gcTime value was used.</p>
-          <p>Own id: OTP-7553 Aux Id:</p>
+          <p>Own Id: OTP-7553 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -161,7 +215,7 @@
       <list type="bulleted">
         <item>
           <p>Updated file headers.</p>
-          <p>Own id: OTP-7011</p>
+          <p>Own Id: OTP-7011</p>
         </item>
       </list>
     </section>
@@ -175,7 +229,7 @@
       <list type="bulleted">
         <item>
           <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own id: OTP-6754</p>
+          <p>Own Id: OTP-6754</p>
         </item>
       </list>
     </section>
@@ -189,7 +243,7 @@
       <list type="bulleted">
         <item>
           <p>Minor Makefile changes.</p>
-          <p>Own id: OTP-6701</p>
+          <p>Own Id: OTP-6701</p>
         </item>
       </list>
     </section>
@@ -203,7 +257,7 @@
       <list type="bulleted">
         <item>
           <p>Removed some unused code.</p>
-          <p>Own id: OTP-6527</p>
+          <p>Own Id: OTP-6527</p>
         </item>
       </list>
     </section>
@@ -219,7 +273,7 @@
           <p>A user can now define the QoS EventReliability to be 
             Persistent. Note, this is only a lightweight version
             and events will be lost if a proxy is terminated.</p>
-          <p>Own id: OTP-5923</p>
+          <p>Own Id: OTP-5923</p>
         </item>
       </list>
     </section>
@@ -235,7 +289,7 @@
           <p>Possible to configure cosNotification not to type check,
             by invoking corba_object:is_a/2, supplied IOR:s. When
             a type check fails, the feedback has been improved.</p>
-          <p>Own id: OTP-5823 Aux Id: seq10143</p>
+          <p>Own Id: OTP-5823 Aux Id: seq10143</p>
         </item>
       </list>
     </section>
@@ -249,7 +303,7 @@
       <list type="bulleted">
         <item>
           <p>The app-file contained duplicated modules.</p>
-          <p>Own id: OTP-4976</p>
+          <p>Own Id: OTP-4976</p>
         </item>
       </list>
     </section>
@@ -268,7 +322,7 @@
             Interface Repository. It is necessary to re-compile all IDL-files
             and use COS-applications, including Orber, compiled with
             IC-4.2.</p>
-          <p>Own id: OTP-4576</p>
+          <p>Own Id: OTP-4576</p>
         </item>
       </list>
     </section>
diff --git a/lib/cosNotification/src/CosNotification_Common.erl b/lib/cosNotification/src/CosNotification_Common.erl
index 0e0f1da0d5..af9b2d4368 100644
--- a/lib/cosNotification/src/CosNotification_Common.erl
+++ b/lib/cosNotification/src/CosNotification_Common.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -28,7 +28,6 @@
 
 %%--------------- INCLUDES -----------------------------------
 -include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
 %% Application files
 -include("CosNotification.hrl").
 -include("CosNotifyChannelAdmin.hrl").
@@ -945,14 +944,19 @@ check_limits(LQS, NPR) ->
 %%            supported.
 %%------------------------------------------------------------
 validate_event_qos(Wanted, Curr) ->
-    v_e_q_helper(Wanted, Curr, []),
-    [].
+    case v_e_q_helper(Wanted, Curr, []) of
+	ok ->
+	    [];
+	{error, Unsupp} ->
+	    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Unsupp})
+    end.
+
 v_e_q_helper([], _Curr, []) ->
-    %% Parsed all and foynd no conflicts.
+    %% Parsed all and found no conflicts.
     ok;
 v_e_q_helper([], _Curr, Unsupp) ->
     %% Not possible to use these requested QoS.
-    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Unsupp});
+    {error, Unsupp};
 
 %%--- EventReliability ---%%
 v_e_q_helper([#'CosNotification_Property'{name=?not_EventReliability, 
@@ -1071,30 +1075,38 @@ v_e_q_helper(What, _, _) ->
 %%            LQS     - local representation of QoS.
 %% Returns  : {NewOMGStyleQoS, NewLocalQoS} | #'CosNotification_UnsupportedQoS'{}
 %%------------------------------------------------------------
-set_properties([], Curr, channelAdm, _, [], NewQoS,_,_,LAS) ->
+set_properties(Wanted, Current, Type, Supported, Unsupp, NewQoS, Parent, Childs, LQS) ->
+    case do_set_properties(Wanted, Current, Type, Supported, Unsupp, NewQoS, Parent, Childs, LQS) of
+	{error, Exc} ->
+	     corba:raise(Exc);
+	Result ->
+	    Result
+    end.
+
+do_set_properties([], Curr, channelAdm, _, [], NewQoS,_,_,LAS) ->
     merge_properties(NewQoS, Curr, LAS);
-set_properties([], Curr, _, _, [], NewQoS,_,_,LQS) ->
+do_set_properties([], Curr, _, _, [], NewQoS,_,_,LQS) ->
     %% set_local_qos and merge_properties are help functions found at the end of QoS
     %% functions.
     NewLQS = set_local_qos(NewQoS, LQS),
     merge_properties(NewQoS, Curr, NewLQS);
-set_properties([], _, channelAdm, _, Unsupp, _,_,_,_) ->
-    corba:raise(#'CosNotification_UnsupportedAdmin'{admin_err = Unsupp});
-set_properties([], _, _, _, Unsupp, _,_,_,_) ->
-    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Unsupp});
+do_set_properties([], _, channelAdm, _, Unsupp, _,_,_,_) ->
+    {error, #'CosNotification_UnsupportedAdmin'{admin_err = Unsupp}};
+do_set_properties([], _, _, _, Unsupp, _,_,_,_) ->
+    {error, #'CosNotification_UnsupportedQoS'{qos_err = Unsupp}};
 
-set_properties([Req|Tail], Curr, Type, Supported, Unsupp, NewQoS, Parent, Childs,LQS) ->
+do_set_properties([Req|Tail], Curr, Type, Supported, Unsupp, NewQoS, Parent, Childs,LQS) ->
     %% set_values and is_supported are help functions found at the end of QoS
     %% functions.
     case set_values(is_supported(Supported, Req), Req, Type, Curr, Parent, Childs,LQS) of
 	{unsupported, U} ->
-	    set_properties(Tail, Curr, Type, Supported, [U|Unsupp], NewQoS, Parent, Childs,LQS);
+	    do_set_properties(Tail, Curr, Type, Supported, [U|Unsupp], NewQoS, Parent, Childs,LQS);
 	{ok, S, NewLQS} ->
-	    set_properties(Tail, Curr, Type, Supported, Unsupp, [S|NewQoS], Parent, Childs,NewLQS);
+	    do_set_properties(Tail, Curr, Type, Supported, Unsupp, [S|NewQoS], Parent, Childs,NewLQS);
 	{ok, S} ->
-	    set_properties(Tail, Curr, Type, Supported, Unsupp, [S|NewQoS], Parent, Childs,LQS);
+	    do_set_properties(Tail, Curr, Type, Supported, Unsupp, [S|NewQoS], Parent, Childs,LQS);
 	ok ->
-	    set_properties(Tail, Curr, Type, Supported, Unsupp, NewQoS, Parent, Childs,LQS)
+	    do_set_properties(Tail, Curr, Type, Supported, Unsupp, NewQoS, Parent, Childs,LQS)
     end.
     
 
diff --git a/lib/cosNotification/src/cosNotification_Filter.erl b/lib/cosNotification/src/cosNotification_Filter.erl
index dd3b5beb93..7201f7d6e2 100644
--- a/lib/cosNotification/src/cosNotification_Filter.erl
+++ b/lib/cosNotification/src/cosNotification_Filter.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -877,9 +877,9 @@ check_wildcard(Types, Which, WC, Domain, Type) ->
 	end,
     check_types(Types, Which, NewWC).
 
-%% Change '*' to '.*', see regexp:parse/2 documentation.
+%% Change '*' to '.*', see re:compile/1 documentation.
 convert_wildcard([], Acc) ->
-    case regexp:parse(lists:reverse(Acc)) of
+    case re:compile(lists:reverse(Acc)) of
 	{ok, Expr} ->
 	    Expr;
 	_ ->
@@ -900,37 +900,37 @@ match_types(_, _, []) ->
     false;
 match_types(Domain, Type, [{domain, WCDomain, Type}|T]) ->
     L=length(Domain),
-    case catch regexp:matches(Domain, WCDomain) of
-	{match, []} ->
+    case catch re:run(Domain, WCDomain) of
+	nomatch ->
 	    match_types(Domain, Type, T);
-	{match, [{1, L}]} ->
+	{match, [{0, L}]} ->
 	    true;
 	_->
 	    match_types(Domain, Type, T)
     end;
 match_types(Domain, Type, [{type, Domain, WCType}|T]) ->
     L=length(Type),
-    case catch regexp:matches(Type, WCType) of
-	{match, []} ->
+    case catch re:run(Type, WCType) of
+	nomatch ->
 	    match_types(Domain, Type, T);
-	{match, [{1, L}]} ->
+	{match, [{0, L}]} ->
 	    true;
 	_->
 	    match_types(Domain, Type, T)
     end;
 match_types(Domain, Type, [{both, WCDomain, WCType}|T]) ->
     L1=length(Domain),
-    case catch regexp:matches(Domain, WCDomain) of
-	{match, []} ->
+    case catch re:run(Domain, WCDomain) of
+	nomatch ->
 	    match_types(Domain, Type, T);
-	{match, [{1, L1}]} ->
+	{match, [{0, L1}]} ->
 	    L2=length(Type),
-	    case catch regexp:matches(Type, WCType) of
-		{match, []} ->
+	    case catch re:run(Type, WCType) of
+		nomatch ->
 		    match_types(Domain, Type, T);
-		{match, [{1, L2}]} ->
+		{match, [{0, L2}]} ->
 		    true;
-		_->
+		_ ->
 		    match_types(Domain, Type, T)
 	    end;
 	_->
diff --git a/lib/cosNotification/test/Makefile b/lib/cosNotification/test/Makefile
index df8f9e919b..d29c9c3245 100644
--- a/lib/cosNotification/test/Makefile
+++ b/lib/cosNotification/test/Makefile
@@ -34,6 +34,7 @@ RELSYSDIR = $(RELEASE_PATH)/cosNotification_test
 # Target Specs
 # ----------------------------------------------------
 TEST_SPEC_FILE = cosNotification.spec
+COVER_FILE = cosNotification.cover
 
 
 IDL_FILES = 
@@ -182,7 +183,7 @@ release_docs_spec:
 release_tests_spec: tests
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(ERL_FILES) $(RELSYSDIR)
+		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
 	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
 		$(RELSYSDIR)/$(IDLOUTDIR)
diff --git a/lib/cosNotification/test/cosNotification.cover b/lib/cosNotification/test/cosNotification.cover
new file mode 100644
index 0000000000..604f313521
--- /dev/null
+++ b/lib/cosNotification/test/cosNotification.cover
@@ -0,0 +1,2 @@
+{incl_app,cosNotification,details}.
+
diff --git a/lib/cosNotification/test/cosNotification.spec b/lib/cosNotification/test/cosNotification.spec
index 8df89e7908..8ec1baca33 100644
--- a/lib/cosNotification/test/cosNotification.spec
+++ b/lib/cosNotification/test/cosNotification.spec
@@ -1,19 +1 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2010. 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%
-%%
-{topcase, {dir, "../cosNotification_test"}}.
+{suites,"../cosNotification_test",all}.
diff --git a/lib/cosNotification/test/eventDB_SUITE.erl b/lib/cosNotification/test/eventDB_SUITE.erl
index 9ddfb3d902..ee521d4111 100644
--- a/lib/cosNotification/test/eventDB_SUITE.erl
+++ b/lib/cosNotification/test/eventDB_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -41,7 +41,7 @@
 
 -include("idl_output/notify_test.hrl").
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %%--------------- DEFINES ------------------------------------
 -define(default_timeout, ?t:minutes(20)).
@@ -259,25 +259,37 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1, reorder_api/1, lookup_api/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 cases/0, init_per_suite/1, end_per_suite/1, reorder_api/1, 
+	 lookup_api/1,
 	 discard_api/1, max_events_api/1, gc_api/1, auto_gc_api/1,
 	 start_stop_time_api/1, mapping_filter_api/1, persisten_event_api/1,
-	 init_per_testcase/2, fin_per_testcase/2]).
+	 init_per_testcase/2, end_per_testcase/2]).
 
 %%-----------------------------------------------------------------
 %% Func: all/1
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for the cosNotification interfaces", ""];
-all(suite) -> {req,
-               [mnesia, orber],
-               {conf, init_all, cases(), finish_all}}.
- 
-cases() ->
-    [persisten_event_api, start_stop_time_api, mapping_filter_api, 
-     max_events_api, discard_api, reorder_api, lookup_api, gc_api,
-     auto_gc_api].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [persisten_event_api, start_stop_time_api,
+     mapping_filter_api, max_events_api, discard_api,
+     reorder_api, lookup_api, gc_api, auto_gc_api].
 
 
 	
@@ -290,12 +302,12 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     Path = code:which(?MODULE),
     code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
     orber:jump_start(),
@@ -308,7 +320,7 @@ init_all(Config) ->
             exit("Config not a list")
     end.
  
-finish_all(Config) ->
+end_per_suite(Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     cosTime:stop(),
diff --git a/lib/cosNotification/test/generated_SUITE.erl b/lib/cosNotification/test/generated_SUITE.erl
index 34b84041f0..20abfde018 100644
--- a/lib/cosNotification/test/generated_SUITE.erl
+++ b/lib/cosNotification/test/generated_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -25,7 +25,7 @@
 
 -module(generated_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -71,12 +71,12 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -84,52 +84,110 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["This suite is for testing IC generated files"];
-all(suite) -> 
-    ['CosNotification', 'CosNotification_AdminPropertiesAdmin', 
-     'CosNotification_EventHeader', 'CosNotification_EventType',
-     'CosNotification_FixedEventHeader', 'CosNotification_NamedPropertyRange',
-     'CosNotification_Property', 'CosNotification_PropertyError',
-     'CosNotification_PropertyRange', 'CosNotification_QoSAdmin',
-     'CosNotification_StructuredEvent', 'CosNotification_UnsupportedAdmin',
-     'CosNotification_UnsupportedQoS', 'CosNotification_EventBatch',
-     'CosNotification_EventTypeSeq', 'CosNotification_NamedPropertyRangeSeq',
-     'CosNotification_PropertyErrorSeq', 'CosNotifyChannelAdmin_AdminLimit',
-     'CosNotifyChannelAdmin_AdminNotFound', 'CosNotifyChannelAdmin_ChannelNotFound',
-     'CosNotifyChannelAdmin_ConnectionAlreadyActive', 'CosNotifyChannelAdmin_ConnectionAlreadyInactive',
-     'CosNotifyChannelAdmin_NotConnected', 'CosNotifyChannelAdmin_AdminIDSeq',
-     'CosNotifyChannelAdmin_ChannelIDSeq', 'CosNotifyChannelAdmin_ProxyIDSeq',
-     'CosNotifyFilter_CallbackNotFound', 'CosNotifyFilter_ConstraintExp',
-     'CosNotifyFilter_ConstraintInfo', 'CosNotifyFilter_ConstraintNotFound',
-     'CosNotifyFilter_DuplicateConstraintID', 'CosNotifyFilter_FilterNotFound',
-     'CosNotifyFilter_InvalidConstraint', 'CosNotifyFilter_InvalidGrammar',
-     'CosNotifyFilter_InvalidValue', 'CosNotifyFilter_MappingConstraintInfo',
-     'CosNotifyFilter_MappingConstraintPair', 'CosNotifyFilter_UnsupportedFilterableData',
-     'CosNotifyFilter_CallbackIDSeq', 'CosNotifyFilter_ConstraintExpSeq',
-     'CosNotifyFilter_ConstraintIDSeq', 'CosNotifyFilter_ConstraintInfoSeq',
-     'CosNotifyFilter_FilterIDSeq', 'CosNotifyFilter_MappingConstraintInfoSeq',
-     'CosNotifyFilter_MappingConstraintPairSeq', 'CosNotifyComm_InvalidEventType',
-     'CosNotifyChannelAdmin_ConsumerAdmin', 'CosNotifyChannelAdmin_EventChannel',
-     'CosNotifyChannelAdmin_EventChannelFactory', 'CosNotifyChannelAdmin_ProxyConsumer',
-     'CosNotifyChannelAdmin_ProxyNotFound', 'CosNotifyChannelAdmin_ProxyPullConsumer',
-     'CosNotifyChannelAdmin_ProxyPullSupplier', 'CosNotifyChannelAdmin_ProxyPushConsumer',
-     'CosNotifyChannelAdmin_ProxyPushSupplier', 'CosNotifyChannelAdmin_ProxySupplier',
-     'CosNotifyChannelAdmin_SequenceProxyPullConsumer', 'CosNotifyChannelAdmin_SequenceProxyPullSupplier',
-     'CosNotifyChannelAdmin_SequenceProxyPushConsumer', 'CosNotifyChannelAdmin_SequenceProxyPushSupplier',
-     'CosNotifyChannelAdmin_StructuredProxyPullConsumer', 'CosNotifyChannelAdmin_StructuredProxyPullSupplier',
-     'CosNotifyChannelAdmin_StructuredProxyPushConsumer', 'CosNotifyChannelAdmin_StructuredProxyPushSupplier',
-     'CosNotifyChannelAdmin_SupplierAdmin', 'CosNotifyFilter_Filter',
-     'CosNotifyFilter_FilterAdmin', 'CosNotifyFilter_FilterFactory',
-     'CosNotifyFilter_MappingFilter', 'CosNotifyComm_NotifyPublish',
-     'CosNotifyComm_NotifySubscribe', 'CosNotifyComm_PullConsumer',
-     'CosNotifyComm_PullSupplier', 'CosNotifyComm_PushConsumer',
-     'CosNotifyComm_PushSupplier', 'CosNotifyComm_SequencePullConsumer',
-     'CosNotifyComm_SequencePullSupplier', 'CosNotifyComm_SequencePushConsumer',
-     'CosNotifyComm_SequencePushSupplier', 'CosNotifyComm_StructuredPullConsumer',
-     'CosNotifyComm_StructuredPullSupplier', 'CosNotifyComm_StructuredPushConsumer',
-     'CosNotifyComm_StructuredPushSupplier', 'oe_CosNotificationComm_Event',
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    ['CosNotification',
+     'CosNotification_AdminPropertiesAdmin',
+     'CosNotification_EventHeader',
+     'CosNotification_EventType',
+     'CosNotification_FixedEventHeader',
+     'CosNotification_NamedPropertyRange',
+     'CosNotification_Property',
+     'CosNotification_PropertyError',
+     'CosNotification_PropertyRange',
+     'CosNotification_QoSAdmin',
+     'CosNotification_StructuredEvent',
+     'CosNotification_UnsupportedAdmin',
+     'CosNotification_UnsupportedQoS',
+     'CosNotification_EventBatch',
+     'CosNotification_EventTypeSeq',
+     'CosNotification_NamedPropertyRangeSeq',
+     'CosNotification_PropertyErrorSeq',
+     'CosNotifyChannelAdmin_AdminLimit',
+     'CosNotifyChannelAdmin_AdminNotFound',
+     'CosNotifyChannelAdmin_ChannelNotFound',
+     'CosNotifyChannelAdmin_ConnectionAlreadyActive',
+     'CosNotifyChannelAdmin_ConnectionAlreadyInactive',
+     'CosNotifyChannelAdmin_NotConnected',
+     'CosNotifyChannelAdmin_AdminIDSeq',
+     'CosNotifyChannelAdmin_ChannelIDSeq',
+     'CosNotifyChannelAdmin_ProxyIDSeq',
+     'CosNotifyFilter_CallbackNotFound',
+     'CosNotifyFilter_ConstraintExp',
+     'CosNotifyFilter_ConstraintInfo',
+     'CosNotifyFilter_ConstraintNotFound',
+     'CosNotifyFilter_DuplicateConstraintID',
+     'CosNotifyFilter_FilterNotFound',
+     'CosNotifyFilter_InvalidConstraint',
+     'CosNotifyFilter_InvalidGrammar',
+     'CosNotifyFilter_InvalidValue',
+     'CosNotifyFilter_MappingConstraintInfo',
+     'CosNotifyFilter_MappingConstraintPair',
+     'CosNotifyFilter_UnsupportedFilterableData',
+     'CosNotifyFilter_CallbackIDSeq',
+     'CosNotifyFilter_ConstraintExpSeq',
+     'CosNotifyFilter_ConstraintIDSeq',
+     'CosNotifyFilter_ConstraintInfoSeq',
+     'CosNotifyFilter_FilterIDSeq',
+     'CosNotifyFilter_MappingConstraintInfoSeq',
+     'CosNotifyFilter_MappingConstraintPairSeq',
+     'CosNotifyComm_InvalidEventType',
+     'CosNotifyChannelAdmin_ConsumerAdmin',
+     'CosNotifyChannelAdmin_EventChannel',
+     'CosNotifyChannelAdmin_EventChannelFactory',
+     'CosNotifyChannelAdmin_ProxyConsumer',
+     'CosNotifyChannelAdmin_ProxyNotFound',
+     'CosNotifyChannelAdmin_ProxyPullConsumer',
+     'CosNotifyChannelAdmin_ProxyPullSupplier',
+     'CosNotifyChannelAdmin_ProxyPushConsumer',
+     'CosNotifyChannelAdmin_ProxyPushSupplier',
+     'CosNotifyChannelAdmin_ProxySupplier',
+     'CosNotifyChannelAdmin_SequenceProxyPullConsumer',
+     'CosNotifyChannelAdmin_SequenceProxyPullSupplier',
+     'CosNotifyChannelAdmin_SequenceProxyPushConsumer',
+     'CosNotifyChannelAdmin_SequenceProxyPushSupplier',
+     'CosNotifyChannelAdmin_StructuredProxyPullConsumer',
+     'CosNotifyChannelAdmin_StructuredProxyPullSupplier',
+     'CosNotifyChannelAdmin_StructuredProxyPushConsumer',
+     'CosNotifyChannelAdmin_StructuredProxyPushSupplier',
+     'CosNotifyChannelAdmin_SupplierAdmin',
+     'CosNotifyFilter_Filter', 'CosNotifyFilter_FilterAdmin',
+     'CosNotifyFilter_FilterFactory',
+     'CosNotifyFilter_MappingFilter',
+     'CosNotifyComm_NotifyPublish',
+     'CosNotifyComm_NotifySubscribe',
+     'CosNotifyComm_PullConsumer',
+     'CosNotifyComm_PullSupplier',
+     'CosNotifyComm_PushConsumer',
+     'CosNotifyComm_PushSupplier',
+     'CosNotifyComm_SequencePullConsumer',
+     'CosNotifyComm_SequencePullSupplier',
+     'CosNotifyComm_SequencePushConsumer',
+     'CosNotifyComm_SequencePushSupplier',
+     'CosNotifyComm_StructuredPullConsumer',
+     'CosNotifyComm_StructuredPullSupplier',
+     'CosNotifyComm_StructuredPushConsumer',
+     'CosNotifyComm_StructuredPushSupplier',
+     oe_CosNotificationComm_Event,
      'CosNotification_PropertySeq'].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -138,7 +196,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/cosNotification/test/grammar_SUITE.erl b/lib/cosNotification/test/grammar_SUITE.erl
index 30aec89e5f..6dbd353dbe 100644
--- a/lib/cosNotification/test/grammar_SUITE.erl
+++ b/lib/cosNotification/test/grammar_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -42,7 +42,7 @@
 
 -include("idl_output/notify_test.hrl").
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %%--------------- DEFINES ------------------------------------
 -define(default_timeout, ?t:minutes(20)).
@@ -64,10 +64,11 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 cases/0, init_per_suite/1, end_per_suite/1, 
 	 union_api/1, enum_api/1, simple_types_api/1,
 	 components_api/1, positional_api/1, variable_api/1,
-	 init_per_testcase/2, fin_per_testcase/2]).
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -import(cosNotification_Filter, [create_filter/1, eval/2]).
 
@@ -76,15 +77,25 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for the cosNotification interfaces", ""];
-all(suite) -> {req,
-               [],
-               {conf, init_all, cases(), finish_all}}.
- 
-cases() ->
-    [variable_api, union_api, enum_api, simple_types_api, components_api,
-     positional_api].
-	
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [variable_api, union_api, enum_api, simple_types_api,
+     components_api, positional_api].
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -96,14 +107,14 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     Path = code:which(?MODULE),
     code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
     if
@@ -113,7 +124,7 @@ init_all(Config) ->
             exit("Config not a list")
     end.
  
-finish_all(Config) ->
+end_per_suite(Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     Config.
diff --git a/lib/cosNotification/test/notification_SUITE.erl b/lib/cosNotification/test/notification_SUITE.erl
index e2c560e4de..99a3f62bc2 100644
--- a/lib/cosNotification/test/notification_SUITE.erl
+++ b/lib/cosNotification/test/notification_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -40,7 +40,7 @@
 
 -include("idl_output/notify_test.hrl").
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %%--------------- DEFINES ------------------------------------
 -define(default_timeout, ?t:minutes(20)).
@@ -123,10 +123,11 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1, qos_api/1, adm_api/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
+	 init_per_suite/1, end_per_suite/1, qos_api/1, adm_api/1,
 	 cosevent_api/1, filter_adm_api/1, events_api/1, events2_api/1,
 	 event_qos_api/1, filter_api/1, mapping_filter_api/1, subscription_api/1, 
-	 init_per_testcase/2, fin_per_testcase/2, persistent_max_events_api/1,
+	 init_per_testcase/2, end_per_testcase/2, persistent_max_events_api/1,
 	 persistent_timeout_events_api/1, persistent_recover_events_api/1,
 	 app_test/1]).
 
@@ -137,19 +138,28 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for the cosNotification interfaces", ""];
-all(suite) -> {req,
-               [mnesia, orber],
-               {conf, init_all, cases(), finish_all}}.
- 
-cases() ->
-    [persistent_max_events_api, persistent_timeout_events_api,
-     persistent_recover_events_api, mapping_filter_api, filter_api, filter_adm_api,
-     event_qos_api, qos_api, adm_api, cosevent_api, subscription_api, 
-     events_api, events2_api, app_test].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
+cases() -> 
+    [persistent_max_events_api,
+     persistent_timeout_events_api,
+     persistent_recover_events_api, mapping_filter_api,
+     filter_api, filter_adm_api, event_qos_api, qos_api,
+     adm_api, cosevent_api, subscription_api, events_api,
+     events2_api, app_test].
 
-	
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -161,14 +171,14 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     Path = code:which(?MODULE),
     code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
     ok = corba:orb_init([{flags, 16#02}, {orber_debug_level, 10}]),
@@ -184,7 +194,7 @@ init_all(Config) ->
             exit("Config not a list")
     end.
  
-finish_all(Config) ->
+end_per_suite(Config) ->
     cosNotificationApp:stop(),
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
diff --git a/lib/cosNotification/test/notify_test_impl.erl b/lib/cosNotification/test/notify_test_impl.erl
index 483610befd..dae7777089 100644
--- a/lib/cosNotification/test/notify_test_impl.erl
+++ b/lib/cosNotification/test/notify_test_impl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
diff --git a/lib/cosNotification/vsn.mk b/lib/cosNotification/vsn.mk
index a19facffd5..6613385579 100644
--- a/lib/cosNotification/vsn.mk
+++ b/lib/cosNotification/vsn.mk
@@ -1,18 +1,2 @@
-COSNOTIFICATION_VSN = 1.1.14
+COSNOTIFICATION_VSN = 1.1.16
 
-TICKETS = OTP-8489 \
-	OTP-8543
-
-TICKETS_1.1.13 = OTP-8353 \
-	OTP-8354 \
-	OTP-8355
-
-TICKETS_1.1.12 = OTP-8201
-
-TICKETS_1.1.11 = OTP-7987
-
-TICKETS_1.1.10 = OTP-7837
-
-TICKETS_1.1.9 = OTP-7595
-
-TICKETS_1.1.8 = OTP-7553
diff --git a/lib/cosProperty/doc/src/notes.xml b/lib/cosProperty/doc/src/notes.xml
index 11e6205ee9..d7d52514ce 100644
--- a/lib/cosProperty/doc/src/notes.xml
+++ b/lib/cosProperty/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -54,6 +54,34 @@
       <title>Fixed Bugs and Malfunctions</title>
       <list type="bulleted">
         <item>
+          <p>Eliminated Dialyzer warnings when using exit or throw.</p>
+          <p>Own id: OTP-9050 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
+  <section>
+    <title>cosProperty 1.1.12</title>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <list type="bulleted">
+        <item>
+          <p>Test suites published.</p>
+          <p>Own id: OTP-8543 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
+  <section>
+    <title>cosProperty 1.1.11</title>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <list type="bulleted">
+        <item>
           <p>The documentation EIX file was not generated.</p>
           <p>Own id: OTP-8355 Aux Id:</p>
         </item>
diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl
index b099026b88..202df42b61 100644
--- a/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl
+++ b/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -152,12 +152,18 @@ create_initial_propertysetdef(_OE_This, State, PropDefs) ->
 %% Internal functions
 %%======================================================================
 evaluate_propertysetdef(SetDefs) ->
-    evaluate_propertysetdef(SetDefs, [], []).
+    case evaluate_propertysetdef(SetDefs, [], []) of
+	{ok, NewProperties} ->
+	    NewProperties;
+	{error, Exc} ->
+	    corba:raise(#'CosPropertyService_MultipleExceptions'{exceptions = Exc})
+    end.
+
 evaluate_propertysetdef([], NewProperties, []) ->
     %% No exceptions found.
-    NewProperties;
+    {ok, NewProperties};
 evaluate_propertysetdef([], _, Exc) ->
-    corba:raise(#'CosPropertyService_MultipleExceptions'{exceptions = Exc});
+    {error, Exc};
 evaluate_propertysetdef([#'CosPropertyService_PropertyDef'
 			 {property_name = Name,
 			  property_value = Value,
diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl
index ad3cdb62d4..4bc29b99ac 100644
--- a/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl
+++ b/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -153,12 +153,18 @@ create_initial_propertyset(_OE_This, State, Properties) ->
 %% Internal functions
 %%======================================================================
 evaluate_propertyset(Sets) ->
-    evaluate_propertyset(Sets, [], []).
+    case evaluate_propertyset(Sets, [], []) of
+	{ok, NewProperties} ->
+	    NewProperties;
+	{error, Exc} ->
+	    corba:raise(#'CosPropertyService_MultipleExceptions'{exceptions = Exc})
+    end.
+
 evaluate_propertyset([], NewProperties, []) ->
     %% No exceptions found.
-    NewProperties;
+    {ok, NewProperties};
 evaluate_propertyset([], _, Exc) ->
-    corba:raise(#'CosPropertyService_MultipleExceptions'{exceptions = Exc});
+    {error, Exc};
 evaluate_propertyset([#'CosPropertyService_Property'
 		      {property_name = Name,
 		       property_value = Value}|T], X, Exc) ->
diff --git a/lib/cosProperty/test/Makefile b/lib/cosProperty/test/Makefile
index ac0f4e298d..d4ae5cad3d 100644
--- a/lib/cosProperty/test/Makefile
+++ b/lib/cosProperty/test/Makefile
@@ -34,6 +34,7 @@ RELSYSDIR = $(RELEASE_PATH)/cosProperty_test
 # Target Specs
 # ----------------------------------------------------
 TEST_SPEC_FILE = cosProperty.spec
+COVER_FILE = cosProperty.cover
 
 
 IDL_FILES = 
@@ -121,7 +122,7 @@ release_docs_spec:
 release_tests_spec: tests
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(ERL_FILES) $(RELSYSDIR)
+		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
 	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
 #	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
 #	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
diff --git a/lib/cosProperty/test/cosProperty.cover b/lib/cosProperty/test/cosProperty.cover
new file mode 100644
index 0000000000..a0f5f17671
--- /dev/null
+++ b/lib/cosProperty/test/cosProperty.cover
@@ -0,0 +1,2 @@
+{incl_app,cosProperty,details}.
+
diff --git a/lib/cosProperty/test/cosProperty.spec b/lib/cosProperty/test/cosProperty.spec
index d3e0001eef..d3d44321c8 100644
--- a/lib/cosProperty/test/cosProperty.spec
+++ b/lib/cosProperty/test/cosProperty.spec
@@ -1,20 +1 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2000-2010. 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%
-%%
-{topcase, {dir, "../cosProperty_test"}}.
-
+{suites,"../cosProperty_test",all}.
diff --git a/lib/cosProperty/test/generated_SUITE.erl b/lib/cosProperty/test/generated_SUITE.erl
index 80a7953949..63c0c0dd6a 100644
--- a/lib/cosProperty/test/generated_SUITE.erl
+++ b/lib/cosProperty/test/generated_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -25,7 +25,7 @@
 
 -module(generated_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -71,12 +71,12 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -84,21 +84,51 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["This suite is for testing IC generated files"];
-all(suite) -> 
-    ['CosPropertyService_ConflictingProperty', 'CosPropertyService_ConstraintNotSupported',
-     'CosPropertyService_FixedProperty', 'CosPropertyService_InvalidPropertyName', 
-     'CosPropertyService_MultipleExceptions', 'CosPropertyService_Properties', 
-     'CosPropertyService_Property', 'CosPropertyService_PropertyDef', 
-     'CosPropertyService_PropertyDefs', 'CosPropertyService_PropertyException', 
-     'CosPropertyService_PropertyExceptions', 'CosPropertyService_PropertyMode', 
-     'CosPropertyService_PropertyModes', 'CosPropertyService_PropertyNames', 
-     'CosPropertyService_PropertyNotFound', 'CosPropertyService_PropertyTypes', 
-     'CosPropertyService_ReadOnlyProperty', 'CosPropertyService_UnsupportedMode', 
-     'CosPropertyService_UnsupportedProperty', 'CosPropertyService_UnsupportedTypeCode', 
-     'CosPropertyService_PropertyNamesIterator', 'CosPropertyService_PropertiesIterator', 
-     'CosPropertyService_PropertySet', 'CosPropertyService_PropertySetDef', 
-     'CosPropertyService_PropertySetDefFactory', 'CosPropertyService_PropertySetFactory'].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    ['CosPropertyService_ConflictingProperty',
+     'CosPropertyService_ConstraintNotSupported',
+     'CosPropertyService_FixedProperty',
+     'CosPropertyService_InvalidPropertyName',
+     'CosPropertyService_MultipleExceptions',
+     'CosPropertyService_Properties',
+     'CosPropertyService_Property',
+     'CosPropertyService_PropertyDef',
+     'CosPropertyService_PropertyDefs',
+     'CosPropertyService_PropertyException',
+     'CosPropertyService_PropertyExceptions',
+     'CosPropertyService_PropertyMode',
+     'CosPropertyService_PropertyModes',
+     'CosPropertyService_PropertyNames',
+     'CosPropertyService_PropertyNotFound',
+     'CosPropertyService_PropertyTypes',
+     'CosPropertyService_ReadOnlyProperty',
+     'CosPropertyService_UnsupportedMode',
+     'CosPropertyService_UnsupportedProperty',
+     'CosPropertyService_UnsupportedTypeCode',
+     'CosPropertyService_PropertyNamesIterator',
+     'CosPropertyService_PropertiesIterator',
+     'CosPropertyService_PropertySet',
+     'CosPropertyService_PropertySetDef',
+     'CosPropertyService_PropertySetDefFactory',
+     'CosPropertyService_PropertySetFactory'].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 %%-----------------------------------------------------------------
@@ -109,7 +139,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/cosProperty/test/property_SUITE.erl b/lib/cosProperty/test/property_SUITE.erl
index 8fed3128ef..df6b56113e 100644
--- a/lib/cosProperty/test/property_SUITE.erl
+++ b/lib/cosProperty/test/property_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -32,7 +32,7 @@
 -include_lib("cosProperty/src/cosProperty.hrl").
 -include_lib("cosProperty/include/CosPropertyService.hrl").
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
  
 %%--------------- DEFINES ------------------------------------
 -define(default_timeout, ?t:minutes(20)).
@@ -86,8 +86,9 @@
 %% External exports
 %%-----------------------------------------------------------------
 %% Fixed exports
--export([all/1, cases/0, init_all/1, finish_all/1, 
-	 init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2]).
 %% Test cases
 -export([create_setdef_api/1, create_set_api/1, define_with_mode_api/1,
 	 define_api/1, names_iterator_api/1, properties_iterator_api/1,
@@ -98,16 +99,24 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for the cosProperty interfaces", ""];
-all(suite) -> {req,
-               [mnesia, orber],
-               {conf, init_all, cases(), finish_all}}.
- 
-cases() ->
-    [create_setdef_api, create_set_api, define_with_mode_api, define_api,
-     names_iterator_api, properties_iterator_api, app_test].
- 
- 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+cases() -> 
+    [create_setdef_api, create_set_api,
+     define_with_mode_api, define_api, names_iterator_api,
+     properties_iterator_api, app_test].
  
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
@@ -120,14 +129,14 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
  
  
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
  
-init_all(Config) ->
+init_per_suite(Config) ->
     Path = code:which(?MODULE),
     code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
     orber:jump_start(),
@@ -141,7 +150,7 @@ init_all(Config) ->
             exit("Config not a list")
     end.
  
-finish_all(Config) ->
+end_per_suite(Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     application:stop(cosProperty),
diff --git a/lib/cosProperty/vsn.mk b/lib/cosProperty/vsn.mk
index 3d594a8329..deb1eb0450 100644
--- a/lib/cosProperty/vsn.mk
+++ b/lib/cosProperty/vsn.mk
@@ -1,13 +1,2 @@
-COSPROPERTY_VSN = 1.1.12
+COSPROPERTY_VSN = 1.1.13
 
-TICKETS = OTP-8543
-
-TICKETS_1.1.11 = OTP-8355
-
-TICKETS_1.1.10 = OTP-8201
-
-TICKETS_1.1.9 = OTP-7987
-
-TICKETS_1.1.8 = OTP-7837
-
-TICKETS_1.1.7 = OTP-7595
diff --git a/lib/cosTime/doc/src/notes.xml b/lib/cosTime/doc/src/notes.xml
index 40ebf42753..718ca23bc5 100644
--- a/lib/cosTime/doc/src/notes.xml
+++ b/lib/cosTime/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,6 +33,22 @@
   </header>
 
   <section>
+    <title>cosTime 1.1.10</title>
+
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Eliminated Dialyzer warnings when using exit or throw.</p>
+          <p>
+            Own Id: OTP-9050 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
+  <section>
     <title>cosTime 1.1.9</title>
 
     <section>
diff --git a/lib/cosTime/src/cosTime.erl b/lib/cosTime/src/cosTime.erl
index f4e67570ad..f7d03650af 100644
--- a/lib/cosTime/src/cosTime.erl
+++ b/lib/cosTime/src/cosTime.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -71,29 +71,39 @@
 %%------------------------------------------------------------
 
 install_time() -> 
-    install_loop(?IDL_TIME_MODULES,[]).
+    case install_loop(?IDL_TIME_MODULES,[]) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    exit(Reason)
+    end.
 
 install_timerevent() -> 
-    install_loop(?IDL_TIMEREVENT_MODULES,[]).
+    case install_loop(?IDL_TIMEREVENT_MODULES,[]) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    exit(Reason)
+    end.
 
 install_loop([], _) ->
     ok;
 install_loop([H|T], Accum) ->
     case catch H:'oe_register'() of
 	{'EXIT',{unregistered,App}} ->
-	    ?write_ErrorMsg("Unable to register '~p'; application ~p not registered.
-Trying to unregister ~p~n", [H,App,Accum]),
+	    ?write_ErrorMsg("Unable to register '~p'; application ~p not registered.\n"
+			    "Trying to unregister ~p\n", [H,App,Accum]),
 	    uninstall_loop(Accum, {exit, register});
 	{'EXCEPTION',_} ->
-	    ?write_ErrorMsg("Unable to register '~p'; propably already registered.
-You are adviced to confirm this.
-Trying to unregister ~p~n", [H,Accum]),
+	    ?write_ErrorMsg("Unable to register '~p'; propably already registered.\n"
+			    "You are adviced to confirm this.\n"
+			    "Trying to unregister ~p\n", [H,Accum]),
 	    uninstall_loop(Accum, {exit, register});
 	ok ->
 	    install_loop(T, [H|Accum]);
 	_ ->
-	    ?write_ErrorMsg("Unable to register '~p'; reason unknown.
-Trying to unregister ~p~n", [H,Accum]),
+ 	    ?write_ErrorMsg("Unable to register '~p'; reason unknown.\n"
+			    "Trying to unregister ~p\n", [H,Accum]),
 	    uninstall_loop(Accum, {exit, register})
     end.
 
@@ -105,33 +115,43 @@ Trying to unregister ~p~n", [H,Accum]),
 %%------------------------------------------------------------
 
 uninstall_time() -> 
-    uninstall_loop(lists:reverse(?IDL_TIME_MODULES),ok).
+    case uninstall_loop(lists:reverse(?IDL_TIME_MODULES),ok) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    exit(Reason)
+    end.
 
 uninstall_timerevent() -> 
-    uninstall_loop(lists:reverse(?IDL_TIMEREVENT_MODULES),ok).
+    case uninstall_loop(lists:reverse(?IDL_TIMEREVENT_MODULES),ok) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    exit(Reason)
+    end.
 
 uninstall_loop([],ok) ->
     ok;
 uninstall_loop([],{exit, register}) ->
-    exit({?MODULE, "oe_register failed"});
+    {error, {?MODULE, "oe_register failed"}};
 uninstall_loop([],{exit, unregister}) ->
-    exit({?MODULE, "oe_unregister failed"});
+    {error, {?MODULE, "oe_unregister failed"}};
 uninstall_loop([],{exit, both}) ->
-    exit({?MODULE, "oe_register and, for some of those already registered, oe_unregister failed"});
+    {error, {?MODULE, "oe_register and, for some of those already registered, oe_unregister failed"}};
 uninstall_loop([H|T], Status) ->
     case catch H:'oe_unregister'() of
 	ok ->
 	    uninstall_loop(T, Status);
 	_ when Status == ok ->
-	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.
-You are adviced to confirm this.~n",[H]),
+	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.\n"
+			    "You are adviced to confirm this.~n",[H]),
 	    uninstall_loop(T, {exit, unregister});
 	_ ->
-	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.
-You are adviced to confirm this.~n",[H]),
+ 	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.\n"
+			    "You are adviced to confirm this.~n",[H]),
 	    uninstall_loop(T, {exit, both})
     end.
-	
+
 %%------------------------------------------------------------
 %% function : start/stop
 %% Arguments: 
diff --git a/lib/cosTime/test/Makefile b/lib/cosTime/test/Makefile
index fde5c4facc..96f469afcd 100644
--- a/lib/cosTime/test/Makefile
+++ b/lib/cosTime/test/Makefile
@@ -34,6 +34,7 @@ RELSYSDIR = $(RELEASE_PATH)/cosTime_test
 # Target Specs
 # ----------------------------------------------------
 TEST_SPEC_FILE = cosTime.spec
+COVER_FILE = cosTime.cover
 
 
 IDL_FILES = 
@@ -127,7 +128,7 @@ release_docs_spec:
 release_tests_spec: tests
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(ERL_FILES) $(RELSYSDIR)
+		$(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
 	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
 #	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
 #	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
diff --git a/lib/cosTime/test/cosTime.cover b/lib/cosTime/test/cosTime.cover
new file mode 100644
index 0000000000..81a05b8cfd
--- /dev/null
+++ b/lib/cosTime/test/cosTime.cover
@@ -0,0 +1,2 @@
+{incl_app,cosTime,details}.
+
diff --git a/lib/cosTime/test/cosTime.spec b/lib/cosTime/test/cosTime.spec
index 3f50946043..8bf6f740fe 100644
--- a/lib/cosTime/test/cosTime.spec
+++ b/lib/cosTime/test/cosTime.spec
@@ -1,19 +1 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2000-2010. 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%
-%%
-{topcase, {dir, "../cosTime_test"}}.
+{suites,"../cosTime_test",all}.
diff --git a/lib/cosTime/test/generated_SUITE.erl b/lib/cosTime/test/generated_SUITE.erl
index 3a2153528f..465d02288f 100644
--- a/lib/cosTime/test/generated_SUITE.erl
+++ b/lib/cosTime/test/generated_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -25,7 +25,7 @@
 
 -module(generated_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -71,12 +71,12 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -84,13 +84,31 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["This suite is for testing IC generated files"];
-all(suite) -> 
-    ['TimeBase_IntervalT', 'TimeBase_UtcT', 'CosTime_TimeUnavailable', 
-     'CosTimerEvent_TimerEventT', 'CosTime_TIO', 'CosTime_TimeService',
-     'CosTime_UTO', 'CosTimerEvent_TimerEventHandler', 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    ['TimeBase_IntervalT', 'TimeBase_UtcT',
+     'CosTime_TimeUnavailable', 'CosTimerEvent_TimerEventT',
+     'CosTime_TIO', 'CosTime_TimeService', 'CosTime_UTO',
+     'CosTimerEvent_TimerEventHandler',
      'CosTimerEvent_TimerEventService'].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -99,7 +117,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/cosTime/test/time_SUITE.erl b/lib/cosTime/test/time_SUITE.erl
index bb00395885..646097a086 100644
--- a/lib/cosTime/test/time_SUITE.erl
+++ b/lib/cosTime/test/time_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -27,9 +27,9 @@
 
 
 %%--------------- INCLUDES -----------------------------------
--include("../src/cosTimeApp.hrl").
+-include_lib("cosTime/src/cosTimeApp.hrl").
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %%--------------- DEFINES ------------------------------------
 -define(default_timeout, ?t:minutes(20)).
@@ -67,8 +67,9 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1, time_api/1, timerevent_api/1,
-	 init_per_testcase/2, fin_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
+	 init_per_suite/1, end_per_suite/1, time_api/1, timerevent_api/1,
+	 init_per_testcase/2, end_per_testcase/2,
 	 app_test/1]).
 
 %%-----------------------------------------------------------------
@@ -76,12 +77,22 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for the cosTime interfaces", ""];
-all(suite) -> {req,
-               [mnesia, orber],
-               {conf, init_all, cases(), finish_all}}.
- 
-cases() ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
     [time_api, timerevent_api, app_test].
 
 
@@ -97,14 +108,14 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     Path = code:which(?MODULE),
     code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
     mnesia:delete_schema([node()]),
@@ -123,7 +134,7 @@ init_all(Config) ->
             exit("Config not a list")
     end.
  
-finish_all(Config) ->
+end_per_suite(Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     cosTime:uninstall_time(),
diff --git a/lib/cosTime/vsn.mk b/lib/cosTime/vsn.mk
index 9d8057e8db..ebc5aff1cc 100644
--- a/lib/cosTime/vsn.mk
+++ b/lib/cosTime/vsn.mk
@@ -1,13 +1,2 @@
-COSTIME_VSN = 1.1.9
+COSTIME_VSN = 1.1.10
 
-TICKETS = OTP-8543
-
-TICKETS_1.1.8 = OTP-8355
-
-TICKETS_1.1.7 = OTP-8201
-
-TICKETS_1.1.6 = OTP-7987
-
-TICKETS_1.1.5 = OTP-7837
-
-TICKETS_1.1.4 = OTP-7595
diff --git a/lib/cosTransactions/test/Makefile b/lib/cosTransactions/test/Makefile
index 8b1264d404..6bc532aa82 100644
--- a/lib/cosTransactions/test/Makefile
+++ b/lib/cosTransactions/test/Makefile
@@ -38,6 +38,7 @@ RELSYSDIR = $(RELEASE_PATH)/cosTransactions_test
 # Target Specs
 # ----------------------------------------------------
 TEST_SPEC_FILE = cosTransactions.spec
+COVER_FILE = cosTransactions.cover
 
 
 IDL_FILES = \
@@ -142,7 +143,7 @@ release_docs_spec:
 release_tests_spec: tests
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
+		$(COVER_FILE) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
 	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELSYSDIR)/$(IDLOUTDIR)
 	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
diff --git a/lib/cosTransactions/test/cosTransactions.cover b/lib/cosTransactions/test/cosTransactions.cover
new file mode 100644
index 0000000000..b27bae999d
--- /dev/null
+++ b/lib/cosTransactions/test/cosTransactions.cover
@@ -0,0 +1,2 @@
+{incl_app,cosTransactions,details}.
+
diff --git a/lib/cosTransactions/test/cosTransactions.spec b/lib/cosTransactions/test/cosTransactions.spec
index 8ad9259964..9918c8ca16 100644
--- a/lib/cosTransactions/test/cosTransactions.spec
+++ b/lib/cosTransactions/test/cosTransactions.spec
@@ -1,19 +1 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2010. 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%
-%%
-{topcase, {dir, "../cosTransactions_test"}}.
+{suites,"../cosTransactions_test",all}.
diff --git a/lib/cosTransactions/test/etrap_test_lib.erl b/lib/cosTransactions/test/etrap_test_lib.erl
index 913a94510f..18a1cda35b 100644
--- a/lib/cosTransactions/test/etrap_test_lib.erl
+++ b/lib/cosTransactions/test/etrap_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
diff --git a/lib/cosTransactions/test/generated_SUITE.erl b/lib/cosTransactions/test/generated_SUITE.erl
index cc54eb168e..65a94266ab 100644
--- a/lib/cosTransactions/test/generated_SUITE.erl
+++ b/lib/cosTransactions/test/generated_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -26,7 +26,7 @@
 
 -module(generated_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -72,12 +72,12 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -85,21 +85,49 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["This suite is for testing IC generated files"];
-all(suite) -> 
-    ['CosTransactions_Control', 'CosTransactions_Coordinator',
-     'CosTransactions_HeuristicCommit', 'CosTransactions_HeuristicHazard',
-     'CosTransactions_HeuristicMixed', 'CosTransactions_HeuristicRollback',
-     'CosTransactions_Inactive', 'CosTransactions_InvalidControl',
-     'CosTransactions_NoTransaction', 'CosTransactions_NotPrepared',
-     'CosTransactions_NotSubtransaction', 'CosTransactions_RecoveryCoordinator',
-     'CosTransactions_Resource', 'CosTransactions_SubtransactionAwareResource',
-     'CosTransactions_SubtransactionsUnavailable', 'CosTransactions_Terminator',
-     'CosTransactions_TransactionFactory', 'CosTransactions_Unavailable',
-     'CosTransactions_SynchronizationUnavailable', 'CosTransactions_TransIdentity',
-     'CosTransactions_PropagationContext', 'CosTransactions_otid_t',
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    ['CosTransactions_Control',
+     'CosTransactions_Coordinator',
+     'CosTransactions_HeuristicCommit',
+     'CosTransactions_HeuristicHazard',
+     'CosTransactions_HeuristicMixed',
+     'CosTransactions_HeuristicRollback',
+     'CosTransactions_Inactive',
+     'CosTransactions_InvalidControl',
+     'CosTransactions_NoTransaction',
+     'CosTransactions_NotPrepared',
+     'CosTransactions_NotSubtransaction',
+     'CosTransactions_RecoveryCoordinator',
+     'CosTransactions_Resource',
+     'CosTransactions_SubtransactionAwareResource',
+     'CosTransactions_SubtransactionsUnavailable',
+     'CosTransactions_Terminator',
+     'CosTransactions_TransactionFactory',
+     'CosTransactions_Unavailable',
+     'CosTransactions_SynchronizationUnavailable',
+     'CosTransactions_TransIdentity',
+     'CosTransactions_PropagationContext',
+     'CosTransactions_otid_t',
      'CosTransactions_WrongTransaction', 'ETraP_Server'].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -108,7 +136,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/cosTransactions/test/transactions_SUITE.erl b/lib/cosTransactions/test/transactions_SUITE.erl
index 8385d5a0fb..27272eeb40 100644
--- a/lib/cosTransactions/test/transactions_SUITE.erl
+++ b/lib/cosTransactions/test/transactions_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -28,7 +28,7 @@
 -include_lib("cosTransactions/include/CosTransactions.hrl").
 -include("etrap_test_lib.hrl").
  
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(default_timeout, ?t:minutes(20)).
 
@@ -36,20 +36,31 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1, resource_api/1, etrap_api/1,
-	init_per_testcase/2, fin_per_testcase/2, app_test/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0,
+	 init_per_suite/1, end_per_suite/1, resource_api/1, etrap_api/1,
+	 init_per_testcase/2, end_per_testcase/2, app_test/1]).
  
 %%-----------------------------------------------------------------
 %% Func: all/1
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for the cosTransactions interfaces", ""];
-all(suite) -> {req,
-               [mnesia, orber],
-               {conf, init_all, cases(), finish_all}}.
- 
-cases() ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
     [etrap_api, resource_api, app_test].
 
 
@@ -67,7 +78,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     'oe_etrap_test':'oe_unregister'(), 
     'oe_CosTransactions':'oe_unregister'(), 
     Path = code:which(?MODULE),
@@ -76,7 +87,7 @@ fin_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     mnesia:delete_schema([node()]),
     mnesia:create_schema([node()]),
     orber:install([node()]),
@@ -89,7 +100,7 @@ init_all(Config) ->
             exit("Config not a list")
     end.
  
-finish_all(Config) ->
+end_per_suite(Config) ->
     application:stop(orber),
     application:stop(mnesia),
     mnesia:delete_schema([node()]),
diff --git a/lib/cosTransactions/vsn.mk b/lib/cosTransactions/vsn.mk
index 34775be7e4..82e46f51dd 100644
--- a/lib/cosTransactions/vsn.mk
+++ b/lib/cosTransactions/vsn.mk
@@ -1,14 +1 @@
 COSTRANSACTIONS_VSN = 1.2.10
-
-TICKETS = OTP-8489 \
-	OTP-8543
-
-TICKETS_1.2.9 = OTP-8355
-
-TICKETS_1.2.8 = OTP-8201
-
-TICKETS_1.2.7 = OTP-7987
-
-TICKETS_1.2.6 = OTP-7837
-
-TICKETS_1.2.5 = OTP-7595
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index e728db18eb..040adcfd09 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -68,13 +68,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/crypto-$(VSN)
 # ----------------------------------------------------
 # Misc Macros
 # ----------------------------------------------------
-OBJS = $(OBJDIR)/crypto.o
+OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o
 NIF_MAKEFILE = $(PRIVDIR)/Makefile
 
 ifeq ($(findstring win32,$(TARGET)), win32)
-NIF_LIB = $(LIBDIR)/crypto.dll
+NIF_LIB = $(LIBDIR)/crypto$(TYPEMARKER).dll
 else
-NIF_LIB = $(LIBDIR)/crypto.so
+NIF_LIB = $(LIBDIR)/crypto$(TYPEMARKER).so
 endif
 
 ifeq ($(HOST_OS),)
@@ -102,20 +102,30 @@ $(OBJDIR):
 $(LIBDIR):
 	-@mkdir -p $(LIBDIR)
 
-$(OBJDIR)/%.o: %.c
+$(OBJDIR)/%$(TYPEMARKER).o: %.c
 	$(INSTALL_DIR) $(OBJDIR)
 	$(CC) -c -o $@ $(ALL_CFLAGS) $<
 
-$(LIBDIR)/crypto.so: $(OBJS)
+$(LIBDIR)/crypto$(TYPEMARKER).so: $(OBJS)
 	$(INSTALL_DIR) $(LIBDIR) 
 	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(CRYPTO_LINK_LIB)
 
-$(LIBDIR)/crypto.dll: $(OBJS)
+$(LIBDIR)/crypto$(TYPEMARKER).dll: $(OBJS)
 	$(INSTALL_DIR) $(LIBDIR)
 	$(LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(OBJS) -llibeay32
 
 clean:
-	rm -f $(NIF_LIB) $(OBJS)
+ifeq ($(findstring win32,$(TARGET)), win32)
+	rm -f $(LIBDIR)/crypto.dll
+	rm -f $(LIBDIR)/crypto.debug.dll
+else
+	rm -f $(LIBDIR)/crypto.so
+	rm -f $(LIBDIR)/crypto.debug.so
+	rm -f $(LIBDIR)/crypto.valgrind.so
+endif
+	rm -f $(OBJDIR)/crypto.o
+	rm -f $(OBJDIR)/crypto.debug.o
+	rm -f $(OBJDIR)/crypto.valgrind.o
 	rm -f core *~
 
 docs:
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index bb639054a6..0e7e63eb73 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -62,10 +62,16 @@
     #  define ERL_VALGRIND_MAKE_MEM_DEFINED(ptr,size) \
     VALGRIND_MAKE_MEM_DEFINED(ptr,size)
 
-    #  define ERL_VALGRIND_ASSERT_MEM_DEFINED(ptr,size) \
-    ((void) ((VALGRIND_CHECK_MEM_IS_DEFINED(ptr,size) == 0) ? 1 : \
-    (fprintf(stderr,"\r\n####### VALGRIND_ASSSERT(%p,%d) failed at %s:%d\r\n",\
-	(ptr),(size), __FILE__, __LINE__), abort(), 0)))
+    #   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)
@@ -126,6 +132,7 @@ static ERL_NIF_TERM des_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
 static ERL_NIF_TERM des_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM des_ede3_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM aes_ctr_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rand_bytes_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rand_bytes_3(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[]);
@@ -194,11 +201,13 @@ static ErlNifFunc nif_funcs[] = {
     {"des_ecb_crypt", 3, des_ecb_crypt},
     {"des_ede3_cbc_crypt", 6, des_ede3_cbc_crypt},
     {"aes_cfb_128_crypt", 4, aes_cfb_128_crypt},
+    {"aes_ctr_encrypt", 3, aes_ctr_encrypt},
+    {"aes_ctr_decrypt", 3, aes_ctr_encrypt},
     {"rand_bytes", 1, rand_bytes_1},
     {"rand_bytes", 3, rand_bytes_3},
     {"rand_uniform_nif", 2, rand_uniform_nif},
     {"mod_exp_nif", 3, mod_exp_nif},
-    {"dss_verify", 3, dss_verify},
+    {"dss_verify", 4, dss_verify},
     {"rsa_verify", 4, rsa_verify},
     {"aes_cbc_crypt", 4, aes_cbc_crypt},
     {"exor", 2, exor},
@@ -207,7 +216,7 @@ static ErlNifFunc nif_funcs[] = {
     {"rc4_encrypt_with_state", 2, rc4_encrypt_with_state},
     {"rc2_40_cbc_crypt", 4, rc2_40_cbc_crypt},
     {"rsa_sign_nif", 3, rsa_sign_nif},
-    {"dss_sign_nif", 2, dss_sign_nif},
+    {"dss_sign_nif", 3, dss_sign_nif},
     {"rsa_public_crypt", 4, rsa_public_crypt},
     {"rsa_private_crypt", 4, rsa_private_crypt},
     {"dh_generate_parameters_nif", 2, dh_generate_parameters_nif},
@@ -255,6 +264,7 @@ 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 int is_ok_load_info(ErlNifEnv* env, ERL_NIF_TERM load_info)
@@ -322,6 +332,7 @@ static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
     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");
 
     *priv_data = NULL;
     library_refc++;
@@ -652,6 +663,34 @@ static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TE
     return ret;
 }
 
+/* Common for both encrypt and decrypt
+*/
+static ERL_NIF_TERM aes_ctr_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, IVec, Data) */    
+    ErlNifBinary key, ivec, text;
+    AES_KEY aes_key;
+    unsigned char ivec_clone[16]; /* writable copy */
+    unsigned char ecount_buf[AES_BLOCK_SIZE];
+    unsigned int num = 0;
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
+	|| AES_set_encrypt_key(key.data, key.size*8, &aes_key) != 0
+	|| !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);    
+    memset(ecount_buf, 0, sizeof(ecount_buf));
+    AES_ctr128_encrypt((unsigned char *) text.data,
+		       enif_make_new_binary(env, text.size, &ret), 
+		       text.size, &aes_key, ivec_clone, ecount_buf, &num);
+
+    /* To do an incremental {en|de}cryption, the state to to keep between calls
+	must include ivec_clone, ecount_buf and num. */
+    return ret;
+}
+
 static ERL_NIF_TERM rand_bytes_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Bytes) */     
     unsigned bytes;
@@ -704,12 +743,13 @@ static int get_bn_from_mpint(ErlNifEnv* env, ERL_NIF_TERM term, BIGNUM** bnp)
 
 static ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Lo,Hi) */
-    BIGNUM *bn_from, *bn_to, *bn_rand;
+    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);
     }
 
@@ -766,17 +806,16 @@ static int inspect_mpint(ErlNifEnv* env, ERL_NIF_TERM term, ErlNifBinary* bin)
 }
 
 static ERL_NIF_TERM dss_verify(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data,Signature,Key=[P, Q, G, Y]) */
+{/* (DigestType,Data,Signature,Key=[P, Q, G, Y]) */
     ErlNifBinary data_bin, sign_bin;
-    BIGNUM *dsa_p, *dsa_q, *dsa_g, *dsa_y;
+    BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL, *dsa_y = NULL;
     unsigned char hmacbuf[SHA_DIGEST_LENGTH];
     ERL_NIF_TERM head, tail;
     DSA *dsa;
     int i;
 
-    if (!inspect_mpint(env,argv[0],&data_bin)
-	|| !inspect_mpint(env,argv[1],&sign_bin)
-	|| !enif_get_list_cell(env, argv[2], &head, &tail)
+    if (!inspect_mpint(env, argv[2], &sign_bin)
+	|| !enif_get_list_cell(env, argv[3], &head, &tail)
 	|| !get_bn_from_mpint(env, head, &dsa_p)
 	|| !enif_get_list_cell(env, tail, &head, &tail)
 	|| !get_bn_from_mpint(env, head, &dsa_q)
@@ -785,10 +824,23 @@ static ERL_NIF_TERM dss_verify(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
 	|| !enif_get_list_cell(env, tail, &head, &tail)
 	|| !get_bn_from_mpint(env, head, &dsa_y)
 	|| !enif_is_empty_list(env,tail)) {
-
+    badarg:
+	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 enif_make_badarg(env);
     }
-    SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
+    if (argv[0] == atom_sha && inspect_mpint(env, argv[1], &data_bin)) {
+	SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
+    }
+    else if (argv[0] == atom_none && enif_inspect_binary(env, argv[1], &data_bin)
+	     && data_bin.size == SHA_DIGEST_LENGTH) {
+	memcpy(hmacbuf, data_bin.data, SHA_DIGEST_LENGTH);
+    }
+    else {
+	goto badarg;
+    }
 
     dsa = DSA_new();
     dsa->p = dsa_p;
@@ -941,7 +993,7 @@ static ERL_NIF_TERM rc4_encrypt_with_state(ErlNifEnv* env, int argc, const ERL_N
     RC4(rc4_key, data.size, data.data,
 	enif_make_new_binary(env, data.size, &new_data));
 
-    return enif_make_tuple2(env,argv[0],new_data);
+    return enif_make_tuple2(env,new_state,new_data);
 }   
 
 static ERL_NIF_TERM rc2_40_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
@@ -1023,7 +1075,7 @@ static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 }
 
 static ERL_NIF_TERM dss_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data,Key=[P,Q,G,PrivKey]) */
+{/* (DigesType, Data, Key=[P,Q,G,PrivKey]) */
     ErlNifBinary data_bin, ret_bin;
     ERL_NIF_TERM head, tail;
     unsigned char hmacbuf[SHA_DIGEST_LENGTH];
@@ -1032,8 +1084,7 @@ static ERL_NIF_TERM dss_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
     int i;
 
     dsa->pub_key  = NULL;
-    if (!inspect_mpint(env, argv[0], &data_bin)
-	|| !enif_get_list_cell(env, argv[1], &head, &tail)
+    if (!enif_get_list_cell(env, argv[2], &head, &tail)
 	|| !get_bn_from_mpint(env, head, &dsa->p)
 	|| !enif_get_list_cell(env, tail, &head, &tail)
 	|| !get_bn_from_mpint(env, head, &dsa->q)
@@ -1042,13 +1093,21 @@ static ERL_NIF_TERM dss_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 	|| !enif_get_list_cell(env, tail, &head, &tail)
 	|| !get_bn_from_mpint(env, head, &dsa->priv_key)
 	|| !enif_is_empty_list(env,tail)) {
-
+	goto badarg;	
+    }
+    if (argv[0] == atom_sha && inspect_mpint(env, argv[1], &data_bin)) {
+	SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
+    }
+    else if (argv[0] == atom_none && enif_inspect_binary(env,argv[1],&data_bin) 
+	     && data_bin.size == SHA_DIGEST_LENGTH) {
+	memcpy(hmacbuf, data_bin.data, SHA_DIGEST_LENGTH);
+    }
+    else {
+    badarg:
 	DSA_free(dsa);
 	return enif_make_badarg(env);
     }
 
-    SHA1(data_bin.data+4, data_bin.size-4, hmacbuf);
-
     enif_alloc_binary(DSA_size(dsa), &ret_bin);
     i =  DSA_sign(NID_sha1, hmacbuf, SHA_DIGEST_LENGTH,
 		  ret_bin.data, &dsa_s_len, dsa);
@@ -1103,7 +1162,7 @@ static ERL_NIF_TERM rsa_public_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TER
     enif_alloc_binary(RSA_size(rsa), &ret_bin); 
 
     if (argv[3] == atom_true) {
-	ERL_VALGRIND_ASSERT_MEM_DEFINED(buf+i,data_len);
+	ERL_VALGRIND_ASSERT_MEM_DEFINED(data_bin.data,data_bin.size);
 	i = RSA_public_encrypt(data_bin.size, data_bin.data,
 			       ret_bin.data, rsa, padding);
 	if (i > 0) {
@@ -1123,6 +1182,7 @@ static ERL_NIF_TERM rsa_public_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TER
 	return enif_make_binary(env,&ret_bin);
     }
     else {
+	enif_release_binary(&ret_bin);
 	return atom_error;
     }
 }
@@ -1151,7 +1211,7 @@ static ERL_NIF_TERM rsa_private_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TE
     enif_alloc_binary(RSA_size(rsa), &ret_bin); 
 
     if (argv[3] == atom_true) {
-	ERL_VALGRIND_ASSERT_MEM_DEFINED(buf+i,data_len);
+	ERL_VALGRIND_ASSERT_MEM_DEFINED(data_bin.data,data_bin.size);
 	i = RSA_private_encrypt(data_bin.size, data_bin.data,
 				ret_bin.data, rsa, padding);
 	if (i > 0) {
@@ -1171,6 +1231,7 @@ static ERL_NIF_TERM rsa_private_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TE
 	return enif_make_binary(env,&ret_bin);
     }
     else {
+	enif_release_binary(&ret_bin);
 	return atom_error;
     }
 }
@@ -1250,7 +1311,7 @@ static ERL_NIF_TERM dh_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_
 	|| !enif_get_list_cell(env, tail, &head, &tail)
 	|| !get_bn_from_mpint(env, head, &dh_params->g)
 	|| !enif_is_empty_list(env, tail)) {
-
+	DH_free(dh_params);
 	return enif_make_badarg(env);
     }
 
@@ -1277,7 +1338,7 @@ static ERL_NIF_TERM dh_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_
 static ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (OthersPublicKey, MyPrivateKey, DHParams=[P,G]) */
     DH* dh_params = DH_new();
-    BIGNUM* pubkey;
+    BIGNUM* pubkey = NULL;
     int i;
     ErlNifBinary ret_bin;
     ERL_NIF_TERM ret, head, tail;
@@ -1305,6 +1366,7 @@ static ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_T
 	    ret = atom_error;
 	}
     }
+    if (pubkey) BN_free(pubkey);
     DH_free(dh_params);
     return ret;
 }
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 256eab3e3c..c407350c47 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -53,7 +53,7 @@
         <p>aes: Advanced Encryption Standard (AES) (FIPS 197) </p>
       </item>
       <item>
-        <p>ecb, cbc, cfb, ofb: Recommendation for Block Cipher Modes
+        <p>ecb, cbc, cfb, ofb, ctr: Recommendation for Block Cipher Modes
           of Operation (NIST SP 800-38A).</p>
       </item>
       <item>
@@ -557,6 +557,34 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       </desc>
     </func>
     <func>
+      <name>aes_ctr_encrypt(Key, IVec, Text) -> Cipher</name>
+      <fsummary>Encrypt <c>Text</c>according to AES in Counter mode</fsummary>
+      <type>
+        <v>Key = Text = iolist() | binary()</v>
+        <v>IVec = Cipher = binary()</v>
+      </type>
+      <desc>
+      <p>Encrypts <c>Text</c> according to AES in Counter mode (CTR). <c>Text</c>
+        can be any number of bytes. <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).</p>
+    </desc>
+    </func>
+    <func>
+      <name>aes_ctr_decrypt(Key, IVec, Cipher) -> Text</name>
+      <fsummary>Decrypt <c>Cipher</c>according to AES in Counter mode</fsummary>
+      <type>
+        <v>Key = Cipher = iolist() | binary()</v>
+        <v>IVec = Text = binary()</v>
+      </type>
+      <desc>
+      <p>Decrypts <c>Cipher</c> according to AES in Counter mode (CTR). <c>Cipher</c>
+        can be any number of bytes. <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).</p>
+    </desc>
+    </func>
+    <func>
       <name>erlint(Mpint) -> N</name>
       <name>mpint(N) -> Mpint</name>
       <fsummary>Convert between binary multi-precision integer and erlang big integer</fsummary>
@@ -755,39 +783,44 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
       
     <func>
       <name>dss_sign(Data, Key) -> Signature</name>
+      <name>dss_sign(DigestType, Data, Key) -> Signature</name>
       <fsummary>Sign the data using dsa with given private key.</fsummary>
       <type>
-        <v>Digest = Mpint</v>
+        <v>DigestType = sha | none (default is sha)</v>
+        <v>Data = Mpint | ShaDigest</v>
         <v>Key = [P, Q, G, X]</v>
         <v>P, Q, G, X = Mpint</v>
 	<d> Where <c>P</c>, <c>Q</c> and <c>G</c> are the dss
 	  parameters and <c>X</c> is the private key.</d>
-        <v>Mpint = binary()</v>
+        <v>ShaDigest = binary() with length 20 bytes</v>
         <v>Signature = binary()</v>
       </type>
       <desc>
-        <p>Calculates the sha digest of the <c>Data</c>
-	  and creates a DSS signature with the private key <c>Key</c>
-	  of the digest.</p>
+        <p>Creates a DSS signature with the private key <c>Key</c> of a digest.
+        If <c>DigestType</c> is 'sha', the digest is calculated as SHA1 of <c>Data</c>.
+        If <c>DigestType</c> is 'none', <c>Data</c> is the precalculated SHA1 digest.</p>
       </desc>
     </func>
 
     <func>
       <name>dss_verify(Data, Signature, Key) -> Verified</name>
+      <name>dss_verify(DigestType, Data, Signature, Key) -> Verified</name>
       <fsummary>Verify the data and signature using dsa with given public key.</fsummary>
       <type>
         <v>Verified = boolean()</v>
-        <v>Digest, Signature = Mpint</v>
+        <v>DigestType = sha | none</v>
+        <v>Data = Mpint | ShaDigest</v>
+        <v>Signature = Mpint</v>
         <v>Key = [P, Q, G, Y]</v>
         <v>P, Q, G, Y = Mpint</v>
 	<d> Where <c>P</c>, <c>Q</c> and <c>G</c> are the dss
 	  parameters and <c>Y</c> is the public key.</d>
-        <v>Mpint = binary()</v>
+        <v>ShaDigest = binary() with length 20 bytes</v>
       </type>
       <desc>
-        <p>Calculates the sha digest of the <c>Data</c> and verifies that the
-          digest matches the DSS signature using the public key <c>Key</c>.
-	</p>
+        <p>Verifies that a digest matches the DSS signature using the public key <c>Key</c>.
+        If <c>DigestType</c> is 'sha', the digest is calculated as SHA1 of <c>Data</c>.
+        If <c>DigestType</c> is 'none', <c>Data</c> is the precalculated SHA1 digest.</p>
       </desc>
     </func>
 
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 6b9d1f56f1..54dd0cb01f 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -30,6 +30,108 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 2.0.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    AES CTR encryption support in <c>crypto</c>.</p>
+          <p>
+	    Own Id: OTP-8752 Aux Id: seq11642 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Crypto 2.0.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Crypto dialyzer type error in md5_mac and sha_mac.</p>
+          <p>
+	    Own Id: OTP-8718</p>
+        </item>
+        <item>
+          <p>
+	    RC4 stream cipher didn't work. This since the new NIF
+	    implementation of <c>crypto:rc4_encrypt_with_state/2</c>
+	    introduced in <c>crypto-2.0</c> didn't return an updated
+	    state. (Thanks to Paul Guyot)</p>
+          <p>
+	    Own Id: OTP-8781</p>
+        </item>
+        <item>
+          <p>
+	    A number of memory leaks in the crypto NIF library have
+	    been fixed.</p>
+          <p>
+	    Own Id: OTP-8810</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Added erlang:system_info(build_type) which makes it
+	    easier to chose drivers, NIF libraries, etc based on
+	    build type of the runtime system.</p>
+          <p>
+	    The NIF library for crypto can now be built for valgrind
+	    and/or debug as separate NIF libraries that will be
+	    automatically loaded if the runtime system has been built
+	    with a matching build type.</p>
+          <p>
+	    Own Id: OTP-8760</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Crypto 2.0</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    crypto application changed to use NIFs instead of driver.</p>
+          <p>
+	    Own Id: OTP-8333</p>
+        </item>
+        <item>
+          <p>
+	    des_ecb_encrypt/2 and des_ecb_decrypt/2 has been added to
+	    the crypto module. The crypto:md4/1 function has been
+	    documented.</p>
+          <p>
+	    Own Id: OTP-8551</p>
+        </item>
+        <item>
+	    <p>The undocumented, unsupport, and deprecated function
+	    <c>lists:flat_length/1</c> has been removed.</p>
+          <p>
+	    Own Id: OTP-8584</p>
+        </item>
+        <item>
+          <p>
+	    New variants of <c>crypto:dss_sign</c> and
+	    <c>crypto:dss_verify</c> with an extra argument to
+	    control how the digest is calculated.</p>
+          <p>
+	    Own Id: OTP-8700</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 1.6.4</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/crypto/src/crypto.app.src b/lib/crypto/src/crypto.app.src
index a24760a781..5548b6a1b5 100644
--- a/lib/crypto/src/crypto.app.src
+++ b/lib/crypto/src/crypto.app.src
@@ -1,23 +1,23 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1999-2010. 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%
 %%
 {application, crypto,
-   [{description, "CRYPTO version 1"},
+   [{description, "CRYPTO version 2"},
     {vsn, "%VSN%"},
     {modules, [crypto,
 	       crypto_app,
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 5b1ce96caf..d6e2e033c0 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -40,8 +40,8 @@
 -export([exor/2]).
 -export([rc4_encrypt/2, rc4_set_key/1, rc4_encrypt_with_state/2]).
 -export([rc2_40_cbc_encrypt/3, rc2_40_cbc_decrypt/3]).
--export([dss_verify/3, rsa_verify/3, rsa_verify/4]).
--export([dss_sign/2, rsa_sign/2, rsa_sign/3]).
+-export([dss_verify/3, dss_verify/4, rsa_verify/3, rsa_verify/4]).
+-export([dss_sign/2, dss_sign/3, rsa_sign/2, rsa_sign/3]).
 -export([rsa_public_encrypt/3, rsa_private_decrypt/3]).
 -export([rsa_private_encrypt/3, rsa_public_decrypt/3]).
 -export([dh_generate_key/1, dh_generate_key/2, dh_compute_key/3]).
@@ -51,6 +51,7 @@
 -export([aes_cbc_128_encrypt/3, aes_cbc_128_decrypt/3]).
 -export([aes_cbc_256_encrypt/3, aes_cbc_256_decrypt/3]).
 -export([aes_cbc_ivec/1]).
+-export([aes_ctr_encrypt/3, aes_ctr_decrypt/3]).
 
 -export([dh_generate_parameters/2, dh_check/1]). %% Testing see below
 
@@ -80,8 +81,13 @@
 		    rc2_40_cbc_encrypt, rc2_40_cbc_decrypt,
 		    %% idea_cbc_encrypt, idea_cbc_decrypt,
 		    aes_cbc_256_encrypt, aes_cbc_256_decrypt,
+            aes_ctr_encrypt, aes_ctr_decrypt,
 		    info_lib]).
 
+-type rsa_digest_type() :: 'md5' | 'sha'.
+-type dss_digest_type() :: 'none' | 'sha'.
+-type crypto_integer() :: binary() | integer().
+
 -define(nif_stub,nif_stub_error(?LINE)).
 
 -on_load(on_load/0).
@@ -89,22 +95,42 @@
 -define(CRYPTO_NIF_VSN,101).
 
 on_load() ->
-    LibName = "crypto",
+    LibBaseName = "crypto",
     PrivDir = code:priv_dir(crypto),
-    Lib1 = filename:join([PrivDir, "lib", LibName]),
-    Status = case erlang:load_nif(Lib1, ?CRYPTO_NIF_VSN) of
+    LibName = case erlang:system_info(build_type) of
+		  opt ->
+		      LibBaseName;
+		  Type ->
+		      LibTypeName = LibBaseName ++ "."  ++ atom_to_list(Type),
+		      case (filelib:wildcard(
+			      filename:join(
+				[PrivDir,
+				 "lib",
+				 LibTypeName ++ "*"])) /= []) orelse
+			  (filelib:wildcard(
+			     filename:join(
+			       [PrivDir,
+				"lib", 
+				erlang:system_info(system_architecture),
+				LibTypeName ++ "*"])) /= []) of
+			  true -> LibTypeName;
+			  false -> LibBaseName
+		      end
+	      end,
+    Lib = filename:join([PrivDir, "lib", LibName]),
+    Status = case erlang:load_nif(Lib, ?CRYPTO_NIF_VSN) of
 		 ok -> ok;
 		 {error, {load_failed, _}}=Error1 ->
-		     LibDir2 = 
+		     ArchLibDir = 
 			 filename:join([PrivDir, "lib", 
 					erlang:system_info(system_architecture)]),
 		     Candidate =
-			 filelib:wildcard(filename:join([LibDir2,LibName ++ "*" ])),
+			 filelib:wildcard(filename:join([ArchLibDir,LibName ++ "*" ])),
 		     case Candidate of
 			 [] -> Error1;
 			 _ ->
-			     Lib2 = filename:join([LibDir2, LibName]),
-			     erlang:load_nif(Lib2, ?CRYPTO_NIF_VSN)
+			     ArchLib = filename:join([ArchLibDir, LibName]),
+			     erlang:load_nif(ArchLib, ?CRYPTO_NIF_VSN)
 		     end;
 		 Error1 -> Error1
 	     end,
@@ -115,10 +141,9 @@ on_load() ->
 				   "OpenSSL might not be installed on this system.~n",[E,Str]),
 	    Status
     end.
-    
 
 nif_stub_error(Line) ->
-    erlang:error({nif_not_loaded,module,?MODULE,line,Line}).
+    erlang:nif_error({nif_not_loaded,module,?MODULE,line,Line}).
 
 start() ->
     application:start(crypto).
@@ -146,6 +171,12 @@ version() -> ?CRYPTO_VSN.
 %%
 %%  MD5
 %%
+
+-spec md5(iodata()) -> binary().
+-spec md5_init() -> binary().
+-spec md5_update(binary(), iodata()) -> binary().
+-spec md5_final(binary()) -> binary().
+
 md5(_Data) -> ?nif_stub.
 md5_init() -> ?nif_stub.
 md5_update(_Context, _Data) -> ?nif_stub.
@@ -154,6 +185,11 @@ md5_final(_Context) -> ?nif_stub.
 %%
 %%  MD4
 %%
+-spec md4(iodata()) -> binary().
+-spec md4_init() -> binary().
+-spec md4_update(binary(), iodata()) -> binary().
+-spec md4_final(binary()) -> binary().
+
 md4(_Data) -> ?nif_stub.
 md4_init() -> ?nif_stub.
 md4_update(_Context, _Data) -> ?nif_stub.
@@ -162,6 +198,11 @@ md4_final(_Context) -> ?nif_stub.
 %%
 %% SHA
 %%
+-spec sha(iodata()) -> binary().
+-spec sha_init() -> binary().
+-spec sha_update(binary(), iodata()) -> binary().
+-spec sha_final(binary()) -> binary().
+
 sha(_Data) -> ?nif_stub.
 sha_init() -> ?nif_stub.
 sha_update(_Context, _Data) -> ?nif_stub.
@@ -175,6 +216,9 @@ sha_final(_Context) -> ?nif_stub.
 %%
 %%  MD5_MAC
 %%
+-spec md5_mac(iodata(), iodata()) -> binary().
+-spec md5_mac_96(iodata(), iodata()) -> binary().
+
 md5_mac(Key, Data) ->
     md5_mac_n(Key,Data,16).
 
@@ -186,6 +230,9 @@ md5_mac_n(_Key,_Data,_MacSz) -> ?nif_stub.
 %%
 %%  SHA_MAC
 %%
+-spec sha_mac(iodata(), iodata()) -> binary().
+-spec sha_mac_96(iodata(), iodata()) -> binary().
+
 sha_mac(Key, Data) ->
     sha_mac_n(Key,Data,20).
 
@@ -201,6 +248,9 @@ sha_mac_n(_Key,_Data,_MacSz) -> ?nif_stub.
 %%
 %% DES - in cipher block chaining mode (CBC)
 %%
+-spec des_cbc_encrypt(iodata(), binary(), iodata()) -> binary().
+-spec des_cbc_decrypt(iodata(), binary(), iodata()) -> binary().
+
 des_cbc_encrypt(Key, IVec, Data) ->
     des_cbc_crypt(Key, IVec, Data, true).
 
@@ -215,6 +265,8 @@ des_cbc_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 %% Returns the IVec to be used in the next iteration of 
 %% des_cbc_[encrypt|decrypt].
 %%
+-spec des_cbc_ivec(iodata()) -> binary().
+
 des_cbc_ivec(Data) when is_binary(Data) -> 
     {_, IVec} = split_binary(Data, size(Data) - 8),
     IVec;
@@ -224,6 +276,9 @@ des_cbc_ivec(Data) when is_list(Data) ->
 %%
 %% DES - in electronic codebook mode (ECB)
 %%
+-spec des_ecb_encrypt(iodata(), iodata()) -> binary().
+-spec des_ecb_decrypt(iodata(), iodata()) -> binary().
+
 des_ecb_encrypt(Key, Data) ->
     des_ecb_crypt(Key, Data, true).
 des_ecb_decrypt(Key, Data) ->
@@ -233,6 +288,11 @@ des_ecb_crypt(_Key, _Data, _IsEncrypt) -> ?nif_stub.
 %%
 %% DES3 - in cipher block chaining mode (CBC)
 %%
+-spec des3_cbc_encrypt(iodata(), iodata(), iodata(), binary(), iodata()) ->
+			     binary().
+-spec des3_cbc_decrypt(iodata(), iodata(), iodata(), binary(), iodata()) ->
+			     binary().
+
 des3_cbc_encrypt(Key1, Key2, Key3, IVec, Data) ->
     des_ede3_cbc_encrypt(Key1, Key2, Key3, IVec, Data).
 des_ede3_cbc_encrypt(Key1, Key2, Key3, IVec, Data) ->
@@ -248,6 +308,14 @@ des_ede3_cbc_crypt(_Key1, _Key2, _Key3, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 %%
 %% Blowfish
 %%
+-spec blowfish_ecb_encrypt(iodata(), iodata()) -> binary().
+-spec blowfish_ecb_decrypt(iodata(), iodata()) -> binary().
+-spec blowfish_cbc_encrypt(iodata(), binary(), iodata()) -> binary().
+-spec blowfish_cbc_decrypt(iodata(), binary(), iodata()) -> binary().
+-spec blowfish_cfb64_encrypt(iodata(), binary(), iodata()) -> binary().
+-spec blowfish_cfb64_decrypt(iodata(), binary(), iodata()) -> binary().
+-spec blowfish_ofb64_encrypt(iodata(), binary(), iodata()) -> binary().
+
 blowfish_ecb_encrypt(Key, Data) ->
     bf_ecb_crypt(Key,Data, true).
 
@@ -277,6 +345,9 @@ blowfish_ofb64_encrypt(_Key, _IVec, _Data) -> ?nif_stub.
 %%
 %% AES in cipher feedback mode (CFB)
 %%
+-spec aes_cfb_128_encrypt(iodata(), binary(), iodata()) -> binary().
+-spec aes_cfb_128_decrypt(iodata(), binary(), iodata()) -> binary().
+
 aes_cfb_128_encrypt(Key, IVec, Data) ->
     aes_cfb_128_crypt(Key, IVec, Data, true).
 
@@ -289,6 +360,10 @@ aes_cfb_128_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 %% 
 %% RAND - pseudo random numbers using RN_ functions in crypto lib
 %%
+-spec rand_bytes(non_neg_integer()) -> binary().
+-spec rand_uniform(crypto_integer(), crypto_integer()) ->
+			  crypto_integer().
+
 rand_bytes(_Bytes) -> ?nif_stub.
 rand_bytes(_Bytes, _Topmask, _Bottommask) -> ?nif_stub.
 
@@ -331,9 +406,16 @@ mod_exp_nif(_Base,_Exp,_Mod) -> ?nif_stub.
 %%
 %% DSS, RSA - verify
 %%
+-spec dss_verify(binary(), binary(), [binary()]) -> boolean().
+-spec dss_verify(dss_digest_type(), binary(), binary(), [binary()]) -> boolean().
+-spec rsa_verify(binary(), binary(), [binary()]) -> boolean().
+-spec rsa_verify(rsa_digest_type(), binary(), binary(), [binary()]) ->
+			boolean().
 
 %% Key = [P,Q,G,Y]   P,Q,G=DSSParams  Y=PublicKey
-dss_verify(_Data,_Signature,_Key) -> ?nif_stub.    
+dss_verify(Data,Signature,Key) ->
+    dss_verify(sha, Data, Signature, Key).    
+dss_verify(_Type,_Data,_Signature,_Key) -> ?nif_stub.    
 
 % Key = [E,N]  E=PublicExponent N=PublicModulus
 rsa_verify(Data,Signature,Key) ->
@@ -345,13 +427,20 @@ rsa_verify(_Type,_Data,_Signature,_Key) -> ?nif_stub.
 %% DSS, RSA - sign
 %%
 %% Key = [P,Q,G,X]   P,Q,G=DSSParams  X=PrivateKey
-dss_sign(Data, Key) ->
-    case dss_sign_nif(Data,Key) of
+-spec dss_sign(binary(), [binary()]) -> binary().
+-spec dss_sign(dss_digest_type(), binary(), [binary()]) -> binary().
+-spec rsa_sign(binary(), [binary()]) -> binary().
+-spec rsa_sign(rsa_digest_type(), binary(), [binary()]) -> binary().
+
+dss_sign(Data,Key) ->
+    dss_sign(sha,Data,Key).
+dss_sign(Type, Data, Key) ->
+    case dss_sign_nif(Type,Data,Key) of
 	error -> erlang:error(badkey, [Data, Key]);
 	Sign -> Sign
     end.
 
-dss_sign_nif(_Data,_Key) -> ?nif_stub.
+dss_sign_nif(_Type,_Data,_Key) -> ?nif_stub.
 
 %% Key = [E,N,D]  E=PublicExponent N=PublicModulus  D=PrivateExponent
 rsa_sign(Data,Key) ->
@@ -368,6 +457,16 @@ rsa_sign_nif(_Type,_Data,_Key) -> ?nif_stub.
 %%
 %%  rsa_public_encrypt
 %%  rsa_private_decrypt
+-type rsa_padding() :: 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' | 'rsa_no_padding'.
+
+-spec rsa_public_encrypt(binary(), [binary()], rsa_padding()) ->
+				binary().
+-spec rsa_public_decrypt(binary(), [binary()], rsa_padding()) ->
+				binary().
+-spec rsa_private_encrypt(binary(), [binary()], rsa_padding()) ->
+				binary().
+-spec rsa_private_decrypt(binary(), [binary()], rsa_padding()) ->
+				binary().
 
 %% Binary, Key = [E,N]
 rsa_public_encrypt(BinMesg, Key, Padding) ->
@@ -409,6 +508,14 @@ rsa_public_decrypt(BinMesg, Key, Padding) ->
 %%
 %% AES - with 128 or 256 bit key in cipher block chaining mode (CBC)
 %%
+-spec aes_cbc_128_encrypt(iodata(), binary(), iodata()) ->
+				 binary().
+-spec aes_cbc_128_decrypt(iodata(), binary(), iodata()) ->
+				 binary().
+-spec aes_cbc_256_encrypt(iodata(), binary(), iodata()) ->
+				 binary().
+-spec aes_cbc_256_decrypt(iodata(), binary(), iodata()) ->
+				 binary().
 
 aes_cbc_128_encrypt(Key, IVec, Data) ->
     aes_cbc_crypt(Key, IVec, Data, true).
@@ -437,17 +544,31 @@ aes_cbc_ivec(Data) when is_binary(Data) ->
 aes_cbc_ivec(Data) when is_list(Data) ->
     aes_cbc_ivec(list_to_binary(Data)).
 
+%%
+%% AES - in counter mode (CTR)
+%%
+-spec aes_ctr_encrypt(iodata(), binary(), iodata()) ->
+				 binary().
+-spec aes_ctr_decrypt(iodata(), binary(), iodata()) ->
+				 binary().
+ 
+aes_ctr_encrypt(_Key, _IVec, _Data) -> ?nif_stub.
+aes_ctr_decrypt(_Key, _IVec, _Cipher) -> ?nif_stub.
 
 %%
 %% XOR - xor to iolists and return a binary
 %% NB doesn't check that they are the same size, just concatenates
 %% them and sends them to the driver
 %%
+-spec exor(iodata(), iodata()) -> binary().
+
 exor(_A, _B) -> ?nif_stub.
 
 %%
 %% RC4 - symmetric stream cipher
 %%
+-spec rc4_encrypt(iodata(), iodata()) -> binary().
+
 rc4_encrypt(_Key, _Data) -> ?nif_stub.
 rc4_set_key(_Key) -> ?nif_stub.
 rc4_encrypt_with_state(_State, _Data) -> ?nif_stub.
@@ -490,6 +611,10 @@ dh_check([_Prime,_Gen]) -> ?nif_stub.
 
 %% DHParameters = [P (Prime)= mpint(), G(Generator) = mpint()]
 %% PrivKey = mpint()
+-spec dh_generate_key([binary()]) -> {binary(),binary()}.
+-spec dh_generate_key(binary()|undefined, [binary()]) ->
+			     {binary(),binary()}.
+
 dh_generate_key(DHParameters) ->
     dh_generate_key(undefined, DHParameters).
 dh_generate_key(PrivateKey, DHParameters) ->
@@ -502,6 +627,8 @@ dh_generate_key_nif(_PrivateKey, _DHParameters) -> ?nif_stub.
 
 %% DHParameters = [P (Prime)= mpint(), G(Generator) = mpint()]
 %% MyPrivKey, OthersPublicKey = mpint() 
+-spec dh_compute_key(binary(), binary(), [binary()]) -> binary().
+
 dh_compute_key(OthersPublicKey, MyPrivateKey, DHParameters) ->
     case dh_compute_key_nif(OthersPublicKey,MyPrivateKey,DHParameters) of
 	error -> erlang:error(computation_failed, [OthersPublicKey,MyPrivateKey,DHParameters]);
diff --git a/lib/crypto/test/Makefile b/lib/crypto/test/Makefile
index e728875027..f4689a23df 100644
--- a/lib/crypto/test/Makefile
+++ b/lib/crypto/test/Makefile
@@ -76,7 +76,7 @@ release_spec:
 
 release_tests_spec: $(TEST_TARGET)
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) crypto.spec $(RELTEST_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) crypto.spec crypto.cover $(RELTEST_FILES) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 
 release_docs_spec:
diff --git a/lib/crypto/test/blowfish_SUITE.erl b/lib/crypto/test/blowfish_SUITE.erl
index d117e7cc3d..735433cd47 100644
--- a/lib/crypto/test/blowfish_SUITE.erl
+++ b/lib/crypto/test/blowfish_SUITE.erl
@@ -23,7 +23,7 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("test_server_line.hrl").
 
 -define(TIMEOUT, 120000). % 2 min
@@ -45,8 +45,12 @@
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    crypto:start(),
-    Config.
+    case catch crypto:start() of
+	ok ->
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto!"}
+    end.
 
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
@@ -100,15 +104,20 @@ end_per_testcase(_TestCase, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) ->
-    ["Test Blowfish functionality"];
-
-all(suite) ->
-    [ecb,
-     cbc,
-     cfb64,
-     ofb64
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+[ecb, cbc, cfb64, ofb64].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 %% Test cases start here.
 %%--------------------------------------------------------------------
diff --git a/lib/crypto/test/crypto.cover b/lib/crypto/test/crypto.cover
new file mode 100644
index 0000000000..61ee372ec5
--- /dev/null
+++ b/lib/crypto/test/crypto.cover
@@ -0,0 +1,2 @@
+{incl_app,crypto,details}.
+
diff --git a/lib/crypto/test/crypto.spec b/lib/crypto/test/crypto.spec
index 7ba5696189..cc09970cb3 100644
--- a/lib/crypto/test/crypto.spec
+++ b/lib/crypto/test/crypto.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../crypto_test"}}.
-
+{suites,"../crypto_test",all}.
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 08d7a0ce99..b29b067967 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -18,12 +18,11 @@
 %%
 -module(crypto_SUITE).
 
--include("test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, 
+-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,
-	 fin_per_testcase/2,
+	 end_per_testcase/2,
 	 info/1,
 	 link_test/1,
 	 md5/1,
@@ -44,6 +43,7 @@
 	 aes_cfb/1,
 	 aes_cbc/1,
 	 aes_cbc_iter/1,
+	 aes_ctr/1,
 	 mod_exp_test/1,
 	 rand_uniform_test/1,
 	 rsa_verify_test/1,
@@ -54,53 +54,48 @@
 	 dh/1,
 	 exor_test/1,
 	 rc4_test/1,
+	 rc4_stream_test/1,
 	 blowfish_cfb64/1,
 	 smp/1,
 	 cleanup/1]).
 
 -export([hexstr2bin/1]).
 
-all(suite) ->
-    [link_test,
-     {conf,info,[md5,
-		 md5_update,
-		 md4,
-		 md4_update,
-		 md5_mac,
-		 md5_mac_io,
-		 sha,
-		 sha_update,
-%% 		 sha256,
-%% 		 sha256_update,
-%% 		 sha512,
-%% 		 sha512_update,
-		 des_cbc,
-		 aes_cfb,
-		 aes_cbc,
-		 aes_cbc_iter,
-		 des_cbc_iter,
-		 des_ecb,
-		 rand_uniform_test,
-		 rsa_verify_test,
-		 dsa_verify_test,
-		 rsa_sign_test,
-		 dsa_sign_test,	 
-		 rsa_encrypt_decrypt,
-		 dh, 
-		 exor_test,
-		 rc4_test,
-		 mod_exp_test,
-		 blowfish_cfb64,
-		 smp],
-      cleanup}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [link_test, md5, md5_update, md4, md4_update, md5_mac,
+     md5_mac_io, sha, sha_update, 
+     %% sha256, sha256_update, sha512,sha512_update,
+     des_cbc, aes_cfb, aes_cbc,
+     aes_cbc_iter, aes_ctr, des_cbc_iter, des_ecb, rand_uniform_test,
+     rsa_verify_test, dsa_verify_test, rsa_sign_test,
+     dsa_sign_test, rsa_encrypt_decrypt, dh, exor_test,
+     rc4_test, rc4_stream_test, mod_exp_test, blowfish_cfb64,
+     smp].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 init_per_testcase(_Name,Config) ->
     io:format("init_per_testcase\n"),
     ?line crypto:start(),
     Config.
 
-fin_per_testcase(_Name,Config) ->
-    io:format("fin_per_testcase\n"),
+end_per_testcase(_Name,Config) ->
+    io:format("end_per_testcase\n"),
     ?line crypto:stop(),
     Config.
 
@@ -617,6 +612,65 @@ aes_cbc_decrypt_iter(Key,IVec,Data, Acc) ->
     aes_cbc_decrypt_iter(Key,IVec2,Rest, <<Acc/binary, Plain/binary>>).
 
 
+aes_ctr(doc) -> "CTR";
+aes_ctr(Config) when is_list(Config) ->
+    %% Sample data from NIST Spec.Publ. 800-38A
+    %% F.5.1 CTR-AES128.Encrypt
+    Key128 = hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),
+    Samples128 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff", % Input Block
+                   "6bc1bee22e409f96e93d7e117393172a", % Plaintext
+                   "874d6191b620e3261bef6864990db6ce"},% Ciphertext
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
+                   "ae2d8a571e03ac9c9eb76fac45af8e51",
+                   "9806f66b7970fdff8617187bb9fffdff"},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
+                   "30c81c46a35ce411e5fbc1191a0a52ef",
+                   "5ae4df3edbd5d35e5b4f09020db03eab"},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
+                   "f69f2445df4f9b17ad2b417be66c3710",
+                   "1e031dda2fbe03d1792170a0f3009cee"}],
+    lists:foreach(fun(S) -> aes_ctr_do(Key128,S) end, Samples128),
+
+    %% F.5.3  CTR-AES192.Encrypt
+    Key192 =  hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
+    Samples192 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff", % Input Block
+                   "6bc1bee22e409f96e93d7e117393172a", % Plaintext
+                   "1abc932417521ca24f2b0459fe7e6e0b"},% Ciphertext
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
+                   "ae2d8a571e03ac9c9eb76fac45af8e51",
+                   "090339ec0aa6faefd5ccc2c6f4ce8e94"},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
+                   "30c81c46a35ce411e5fbc1191a0a52ef",
+                   "1e36b26bd1ebc670d1bd1d665620abf7"},
+                  {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
+                   "f69f2445df4f9b17ad2b417be66c3710",
+                   "4f78a7f6d29809585a97daec58c6b050"}],    
+    lists:foreach(fun(S) -> aes_ctr_do(Key192,S) end, Samples192),
+
+    %% F.5.5  CTR-AES256.Encrypt
+    Key256 = hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
+    Samples256 = [{"f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",  % Input Block
+                    "6bc1bee22e409f96e93d7e117393172a", % Plaintext
+                    "601ec313775789a5b7a7f504bbf3d228"},% Ciphertext
+                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff00",
+                    "ae2d8a571e03ac9c9eb76fac45af8e51",
+                    "f443e3ca4d62b59aca84e990cacaf5c5"},
+                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff01",
+                    "30c81c46a35ce411e5fbc1191a0a52ef",
+                    "2b0930daa23de94ce87017ba2d84988d"},
+                   {"f0f1f2f3f4f5f6f7f8f9fafbfcfdff02",
+                    "f69f2445df4f9b17ad2b417be66c3710",
+                    "dfc9c58db67aada613c2dd08457941a6"}],
+    lists:foreach(fun(S) -> aes_ctr_do(Key256,S) end, Samples256).
+
+
+aes_ctr_do(Key,{IVec, Plain, Cipher}) ->
+    ?line I = hexstr2bin(IVec),
+    ?line P = hexstr2bin(Plain),
+    ?line C = crypto:aes_ctr_encrypt(Key, I, P),
+    ?line m(C, hexstr2bin(Cipher)),
+    ?line m(P, crypto:aes_ctr_decrypt(Key, I, C)).
+
 %%
 %%
 mod_exp_test(doc) ->
@@ -770,18 +824,18 @@ dsa_verify_test(Config) when is_list(Config) ->
 		crypto:mpint(Key)
 	       ],
     
-    ?line m(crypto:dss_verify(sized_binary(Msg), sized_binary(SigBlob),
+    ?line m(my_dss_verify(sized_binary(Msg), sized_binary(SigBlob),
 			      ValidKey), true),
 
     BadMsg  = one_bit_wrong(Msg),
-    ?line m(crypto:dss_verify(sized_binary(BadMsg), sized_binary(SigBlob),
+    ?line m(my_dss_verify(sized_binary(BadMsg), sized_binary(SigBlob),
 			      ValidKey), false),
     BadSig = one_bit_wrong(SigBlob),
-    ?line m(crypto:dss_verify(sized_binary(Msg), sized_binary(BadSig),
+    ?line m(my_dss_verify(sized_binary(Msg), sized_binary(BadSig),
 			      ValidKey), false),
     SizeErr = size(SigBlob) - 13,
     
-    BadArg = (catch crypto:dss_verify(sized_binary(Msg), <<SizeErr:32, SigBlob/binary>>,
+    BadArg = (catch my_dss_verify(sized_binary(Msg), <<SizeErr:32, SigBlob/binary>>,
 				      ValidKey)),
     ?line m(element(1,element(2,BadArg)), badarg),
     
@@ -791,9 +845,12 @@ dsa_verify_test(Config) when is_list(Config) ->
 		  crypto:mpint(Key+17)
 		 ],
     
-    ?line m(crypto:dss_verify(sized_binary(Msg), sized_binary(SigBlob),
+    ?line m(my_dss_verify(sized_binary(Msg), sized_binary(SigBlob),
 			      InValidKey), false).
 
+
+one_bit_wrong(List) when is_list(List) ->
+    lists:map(fun(Bin) -> one_bit_wrong(Bin) end, List);
 one_bit_wrong(Bin) ->
     Half = size(Bin) div 2,
     <<First:Half/binary, Byte:8, Last/binary>> = Bin,
@@ -843,15 +900,15 @@ dsa_sign_test(Config) when is_list(Config) ->
     ParamG = 18320614775012672475365915366944922415598782131828709277168615511695849821411624805195787607930033958243224786899641459701930253094446221381818858674389863050420226114787005820357372837321561754462061849169568607689530279303056075793886577588606958623645901271866346406773590024901668622321064384483571751669,
 
     Params = [crypto:mpint(ParamP), crypto:mpint(ParamQ), crypto:mpint(ParamG)],
-    ?line Sig1 = crypto:dss_sign(sized_binary(Msg), Params ++ [crypto:mpint(PrivKey)]),
+    ?line Sig1 = my_dss_sign(sized_binary(Msg), Params ++ [crypto:mpint(PrivKey)]),
     
-    ?line m(crypto:dss_verify(sized_binary(Msg), sized_binary(Sig1), 
+    ?line m(my_dss_verify(sized_binary(Msg), Sig1, 
 			      Params ++ [crypto:mpint(PubKey)]), true),
     
-    ?line m(crypto:dss_verify(sized_binary(one_bit_wrong(Msg)), sized_binary(Sig1), 
+    ?line m(my_dss_verify(sized_binary(one_bit_wrong(Msg)), Sig1, 
 			      Params ++ [crypto:mpint(PubKey)]), false),
     
-    ?line m(crypto:dss_verify(sized_binary(Msg), sized_binary(one_bit_wrong(Sig1)), 
+    ?line m(my_dss_verify(sized_binary(Msg), one_bit_wrong(Sig1), 
 			      Params ++ [crypto:mpint(PubKey)]), false),
 
     %%?line Bad = crypto:dss_sign(sized_binary(Msg), [Params, crypto:mpint(PubKey)]),
@@ -976,6 +1033,21 @@ rc4_test(Config) when is_list(Config) ->
     CT2 = binary_to_list(crypto:rc4_encrypt(K, R2)),
     ok.
 
+rc4_stream_test(doc) ->
+    ["Test rc4 stream encryption ."];
+rc4_stream_test(suite) ->
+    [];
+rc4_stream_test(Config) when is_list(Config) ->
+    CT1 = <<"hej">>,
+    CT2 = <<" p� dig">>,
+    K = "apaapa",
+    State0 = crypto:rc4_set_key(K),
+    {State1, R1} = crypto:rc4_encrypt_with_state(State0, CT1),
+    {_State2, R2} = crypto:rc4_encrypt_with_state(State1, CT2),
+    R = list_to_binary([R1, R2]),
+    <<71,112,14,44,140,33,212,144,155,47>> = R,
+    ok.
+
 blowfish_cfb64(doc) -> ["Test Blowfish encrypt/decrypt."];
 blowfish_cfb64(suite) -> [];
 blowfish_cfb64(Config) when is_list(Config) ->   			
@@ -1026,7 +1098,7 @@ worker_loop(0, _) ->
 worker_loop(N, Config) ->
     Funcs = { md5, md5_update, md5_mac, md5_mac_io, sha, sha_update, des_cbc,
 	      aes_cfb, aes_cbc, des_cbc_iter, rand_uniform_test, 
-	      rsa_verify_test, exor_test, rc4_test, mod_exp_test },
+	      rsa_verify_test, exor_test, rc4_test, rc4_stream_test, mod_exp_test },
 
     F = element(random:uniform(size(Funcs)),Funcs),
     %%io:format("worker ~p calling ~p\n",[self(),F]),
@@ -1132,3 +1204,24 @@ zero_bin(N) when is_integer(N) ->
     <<0:N8/integer>>;
 zero_bin(B) when is_binary(B) ->
     zero_bin(size(B)).
+
+my_dss_verify(Data,[Sign|Tail],Key) ->
+    Res = my_dss_verify(Data,sized_binary(Sign),Key),
+    case Tail of
+        [] ->  Res;
+        _ -> ?line Res = my_dss_verify(Data,Tail,Key)
+    end;       
+my_dss_verify(Data,Sign,Key) ->
+    ?line Res = crypto:dss_verify(Data, Sign, Key),
+    ?line Res = crypto:dss_verify(sha, Data, Sign, Key),
+    ?line <<_:32,Raw/binary>> = Data,
+    ?line Res = crypto:dss_verify(none, crypto:sha(Raw), Sign, Key),
+    Res.
+
+my_dss_sign(Data,Key) ->
+    ?line S1 = crypto:dss_sign(Data, Key),
+    ?line S2 = crypto:dss_sign(sha, Data, Key),
+    ?line <<_:32,Raw/binary>> = Data,
+    ?line S3 = crypto:dss_sign(none, crypto:sha(Raw), Key),
+    [S1,S2,S3].
+
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index d04736fc2b..4b35c7c0b4 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 2.0
+CRYPTO_VSN = 2.0.2
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index afd49e8593..2f8bdc36a1 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -32,6 +32,60 @@
   <p>This document describes the changes made to the Debugger
     application.</p>
 
+<section><title>Debugger 3.2.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Miscellaneous updates</p>
+          <p>
+	    Own Id: OTP-8976</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Debugger 3.2.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Type specs have been added/cleaned up. (Thanks to Kostis
+	    Sagonas.)</p>
+          <p>
+	    Own Id: OTP-8757</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Debugger 3.2.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Warnings due to new autoimported BIFs removed</p>
+          <p>
+	    Own Id: OTP-8674 Aux Id: OTP-8579 </p>
+        </item>
+        <item>
+          <p>
+	    The predefined builtin type tid() has been removed.
+	    Instead, ets:tid() should be used.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8687</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Debugger 3.2.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/debugger/src/dbg_debugged.erl b/lib/debugger/src/dbg_debugged.erl
index b56ebef14a..3732c40c73 100644
--- a/lib/debugger/src/dbg_debugged.erl
+++ b/lib/debugger/src/dbg_debugged.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -19,6 +19,8 @@
 -module(dbg_debugged).
 
 %% External exports
+%% Avoid warning for local function demonitor/1 clashing with autoimported BIF.
+-compile({no_auto_import,[demonitor/1]}).
 -export([eval/3]).
 
 %%====================================================================
diff --git a/lib/debugger/src/dbg_icmd.erl b/lib/debugger/src/dbg_icmd.erl
index 7ccb9793a3..a26b16c82d 100644
--- a/lib/debugger/src/dbg_icmd.erl
+++ b/lib/debugger/src/dbg_icmd.erl
@@ -94,7 +94,7 @@ break_p(Mod, Line, Le, Bs) ->
 		    Bool = case Cond of
 			       null -> true;
 			       {CM, CN} ->
-				   try apply(CM, CN, [Bs]) of
+				   try CM:CN(Bs) of
 				       true -> true;
 				       false -> false;
 				       _Term -> false
@@ -245,7 +245,7 @@ handle_int_msg({attached, AttPid}, Status, _Bs,
 
     %% Tell attached process in which module evalution is located
     if
-	Le==1 ->
+	Le =:= 1 ->
 	    tell_attached({attached, undefined, -1, get(trace)});
 	true ->
 	    tell_attached({attached, M, Line, get(trace)}),
@@ -269,7 +269,7 @@ handle_int_msg(detached, _Status, _Bs, _Ieval) ->
 handle_int_msg({old_code,Mod}, Status, Bs,
 	       #ieval{level=Le,module=M}=Ieval) ->
     if
-	Status==idle, Le==1 ->
+	Status =:= idle, Le =:= 1 ->
 	    erase([Mod|db]),
 	    put(cache, []);
 	true ->
@@ -352,9 +352,9 @@ set_stack_trace(true) ->
     set_stack_trace(all);
 set_stack_trace(Flag) ->    
     if
-	Flag==false ->
+	Flag =:= false ->
 	    put(stack, []);
-	Flag==no_tail; Flag==all ->
+	Flag =:= no_tail; Flag =:= all ->
 	    ignore
     end,
     put(trace_stack, Flag),
@@ -367,7 +367,7 @@ bindings(Bs, nostack) ->
     Bs;
 bindings(Bs, SP) ->
     case dbg_ieval:stack_level() of
-	Le when SP>Le ->
+	Le when SP > Le ->
 	    Bs;
 	_ ->
 	    dbg_ieval:bindings(SP)
@@ -377,7 +377,6 @@ messages() ->
     {messages, Msgs} = erlang:process_info(get(self), messages),
     Msgs.
 
-
 %%====================================================================
 %% Evaluating expressions within process context
 %%====================================================================
@@ -398,7 +397,7 @@ eval_restricted({From,_Mod,Cmd,SP}, Bs) ->
 	    From ! {self(), {eval_rsp, Rsp}}
     end.
 
-eval_nonrestricted({From,Mod,Cmd,SP}, Bs, #ieval{level=Le}) when SP<Le->
+eval_nonrestricted({From,Mod,Cmd,SP}, Bs, #ieval{level=Le}) when SP < Le->
     %% Evaluate in stack
     eval_restricted({From, Mod, Cmd, SP}, Bs),
     Bs;
@@ -424,15 +423,15 @@ eval_nonrestricted({From, _Mod, Cmd, _SP}, Bs,
 eval_nonrestricted_1({match,_,{var,_,Var},Expr}, Bs, Ieval) ->
     {value,Res,Bs2} = 
 	dbg_ieval:eval_expr(Expr, Bs, Ieval#ieval{last_call=false}),
-    Bs3 = case lists:keysearch(Var, 1, Bs) of
-	      {value, {Var,_Value}} ->
+    Bs3 = case lists:keyfind(Var, 1, Bs) of
+	      {Var,_Value} ->
 		  lists:keyreplace(Var, 1, Bs2, {Var,Res});
 	      false -> [{Var,Res} | Bs2]
 	  end,
     {Res,Bs3};
 eval_nonrestricted_1({var,_,Var}, Bs, _Ieval) ->
-    Res = case lists:keysearch(Var, 1, Bs) of
-	      {value, {Var, Value}} -> Value;
+    Res = case lists:keyfind(Var, 1, Bs) of
+	      {Var, Value} -> Value;
 	      false -> unbound
 	  end,
     {Res,Bs};
@@ -458,7 +457,6 @@ parse_cmd(Cmd, LineNo) ->
     {ok,Forms} = erl_parse:parse_exprs(Tokens),
     Forms.
 
-
 %%====================================================================
 %% Library functions for attached process handling
 %%====================================================================
@@ -470,13 +468,12 @@ tell_attached(Msg) ->
 	    AttPid ! {self(), Msg}
     end.
 
-
 %%====================================================================
 %% get_binding/2
 %%====================================================================
 
 get_binding(Var, Bs) ->
-    case lists:keysearch(Var, 1, Bs) of
-	{value, {Var, Value}} -> {value, Value};
+    case lists:keyfind(Var, 1, Bs) of
+	{Var, Value} -> {value, Value};
 	false -> unbound
     end.
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl
index c13fda7ac1..476dfd8796 100644
--- a/lib/debugger/src/dbg_ieval.erl
+++ b/lib/debugger/src/dbg_ieval.erl
@@ -120,9 +120,9 @@ check_exit_msg({'EXIT', Int, Reason}, _Bs, #ieval{level=Le}) ->
     %% This *must* be interpreter which has terminated,
     %% we are not linked to anyone else
     if
-	Le==1 ->
+	Le =:= 1 ->
 	    exit(Reason);
-	Le>1 ->
+	Le > 1 ->
 	    exit({Int, Reason})
     end;
 check_exit_msg({'DOWN',_,_,_,Reason}, Bs,
@@ -139,9 +139,9 @@ check_exit_msg({'DOWN',_,_,_,Reason}, Bs,
 	    %%   importance in this case
 	    %% If we don't save them, however, post-mortem analysis
 	    %% of the process isn't possible
-	    undefined when Le==1 -> % died outside interpreted code
+	    undefined when Le =:= 1 -> % died outside interpreted code
 		{};
-	    undefined when Le>1 ->
+	    undefined when Le > 1 ->
 		StackBin = term_to_binary(get(stack)),
 		{{Mod, Li}, Bs, StackBin};
 
@@ -152,9 +152,9 @@ check_exit_msg({'DOWN',_,_,_,Reason}, Bs,
     dbg_iserver:cast(get(int), {set_exit_info,self(),ExitInfo}),
 
    if
-	Le==1 ->
+	Le =:= 1 ->
 	    exit(Reason);
-	Le>1 ->
+	Le > 1 ->
 	    exit({get(self), Reason})
     end;
 check_exit_msg(_Msg, _Bs, _Ieval) ->
@@ -271,7 +271,7 @@ meta_loop(Debugged, Bs, #ieval{level=Le} = Ieval) ->
 	    end;
 
 	%% Re-entry to Meta from non-interpreted code
-	{re_entry, Debugged, {eval,{M,F,As}}} when Le==1 ->
+	{re_entry, Debugged, {eval,{M,F,As}}} when Le =:= 1 ->
 	    %% Reset process dictionary
 	    %% This is really only necessary if the process left
 	    %% interpreted code at a call level > 1
@@ -346,7 +346,7 @@ push(MFA, Bs, #ieval{level=Le,module=Cm,line=Li,last_call=Lc}) ->
 		[] -> put(stack, [Entry]);
 		[_Entry|Entries] -> put(stack, [Entry|Entries])
 	    end;
-	_ -> % all | no_tail when Lc==false
+	_ -> % all | no_tail when Lc =:= false
 	    put(stack, [Entry|get(stack)])
     end.
 
@@ -413,10 +413,10 @@ sublist(L, Start, Length) ->
     lists:sublist(L, Start, Length).
 
 fix_stacktrace2([{_,{{M,F,As1},_,_}}, {_,{{M,F,As2},_,_}}|_])
-  when length(As1)==length(As2) ->
+  when length(As1) =:= length(As2) ->
     [{M,F,As1}];
 fix_stacktrace2([{_,{{Fun,As1},_,_}}, {_,{{Fun,As2},_,_}}|_])
-  when length(As1)==length(As2) ->
+  when length(As1) =:= length(As2) ->
     [{Fun,As1}];
 fix_stacktrace2([{_,{MFA,_,_}}|Entries]) ->
     [MFA|fix_stacktrace2(Entries)];
@@ -465,9 +465,9 @@ stack_frame(SP, Dir, [{SP, _}|Stack]) ->
     case Stack of
 	[{Le, {_MFA,Where,Bs}}|_] ->
 	    {Le, Where, Bs};
-	[] when Dir==up ->
+	[] when Dir =:= up ->
 	    top;
-	[] when Dir==down ->
+	[] when Dir =:= down ->
 	    bottom
     end;
 stack_frame(SP, Dir, [_Entry|Stack]) ->
@@ -509,7 +509,7 @@ trace(What, Args, true) ->
 			 end,
 		  io_lib:format("   (~w) receive " ++ Tail, [Le]);
 		      
-	      received when Args==null ->
+	      received when Args =:= null ->
 		  io_lib:format("~n", []);
 	      received -> % Args=Msg
 		  io_lib:format("~n<== ~p~n", [Args]);
@@ -586,8 +586,8 @@ eval_mfa(Debugged, M, F, As, Ieval) ->
     end.
 
 eval_function(Mod, Fun, As0, Bs0, _Called, Ieval) when is_function(Fun);
-						       Mod==?MODULE,
-						       Fun==eval_fun ->
+						       Mod =:= ?MODULE,
+						       Fun =:= eval_fun ->
     #ieval{level=Le, line=Li, last_call=Lc} = Ieval,
     case lambda(Fun, As0) of
 	{Cs,Module,Name,As,Bs} ->
@@ -657,7 +657,7 @@ eval_function(Mod, Name, As0, Bs0, Called, Ieval) ->
 lambda(eval_fun, [Cs,As,Bs,{Mod,Name}=F]) ->
     %% Fun defined in interpreted code, called from outside
     if 
-	length(element(3,hd(Cs))) == length(As) ->
+	length(element(3,hd(Cs))) =:= length(As) ->
 	    db_ref(Mod),  %% Adds ref between module and process
 	    {Cs,Mod,Name,As,Bs};
 	true -> 
@@ -672,7 +672,7 @@ lambda(Fun, As) when is_function(Fun) ->
 	    {env, [{Mod,Name},Bs,Cs]} = erlang:fun_info(Fun, env),
 	    {arity, Arity} = erlang:fun_info(Fun, arity),
 	    if 
-		length(As) == Arity ->
+		length(As) =:= Arity ->
 		    db_ref(Mod), %% Adds ref between module and process
 		    {Cs,Mod,Name,As,Bs};
 		true ->
@@ -731,7 +731,7 @@ db_ref(Mod) ->
 		ModDb ->
 		    Node = node(get(int)),
 		    DbRef = if
-				Node/=node() -> {Node,ModDb};
+				Node =/= node() -> {Node,ModDb};
 				true -> ModDb
 			    end,
 		    put([Mod|db], DbRef),
@@ -741,13 +741,12 @@ db_ref(Mod) ->
 	    DbRef
     end.
 
-
 cache(Key, Data) ->
     put(cache, lists:sublist([{Key,Data}|get(cache)], 5)).
 	    
 cached(Key) ->
-    case lists:keysearch(Key, 1, get(cache))  of
-	{value,{Key,Data}} -> Data;
+    case lists:keyfind(Key, 1, get(cache))  of
+	{Key,Data} -> Data;
 	false -> false
     end.
 
@@ -844,7 +843,7 @@ expr({'try',Line,Es,CaseCs,CatchCs,[]}, Bs0, Ieval0) ->
 		    case_clauses(Val, CaseCs, Bs, try_clause, Ieval)
 	    end
     catch
-	Class:Reason when CatchCs=/=[] ->
+	Class:Reason when CatchCs =/= [] ->
 	    catch_clauses({Class,Reason,[]}, CatchCs, Bs0, Ieval)
     end;
 expr({'try',Line,Es,CaseCs,CatchCs,As}, Bs0, Ieval0) ->
@@ -1498,10 +1497,7 @@ guard(Gs, Bs) -> or_guard(Gs, Bs).
     
 or_guard([G|Gs], Bs) ->
     %% Short-circuit OR.
-    case and_guard(G, Bs) of
-	true -> true;
-	false -> or_guard(Gs, Bs)
-    end;
+    and_guard(G, Bs) orelse or_guard(Gs, Bs);
 or_guard([], _) -> false.
 
 and_guard([G|Gs], Bs) ->
@@ -1598,8 +1594,7 @@ match1({bin,_,Fs}, B, Bs0, BBs0) when is_bitstring(B) ->
     try eval_bits:match_bits(Fs, B, Bs1, BBs,
 			     fun(L, R, Bs) -> match1(L, R, Bs, BBs) end,
 			     fun(E, Bs) -> expr(E, Bs, #ieval{}) end,
-			     false) of
-	Match -> Match
+			     false)
     catch
 	_:_ -> throw(nomatch)
     end;
@@ -1687,7 +1682,7 @@ merge_bindings([{Name,V}|B1s], B2s, Ieval) ->
     case binding(Name, B2s) of
 	{value,V} -> % Already there, and the same
 	    merge_bindings(B1s, B2s, Ieval);
-	{value,_} when Name=='_' -> % Already there, but anonymous
+	{value,_} when Name =:= '_' -> % Already there, but anonymous
 	    B2s1 = lists:keydelete('_', 1, B2s),
 	    [{Name,V}|merge_bindings(B1s, B2s1, Ieval)];
 	{value,_} -> % Already there, but different => badmatch
diff --git a/lib/debugger/src/dbg_iload.erl b/lib/debugger/src/dbg_iload.erl
index 1216338006..2ae0c333da 100644
--- a/lib/debugger/src/dbg_iload.erl
+++ b/lib/debugger/src/dbg_iload.erl
@@ -1,64 +1,60 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1998-2010. 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(dbg_iload).
 
-%% External exports
 -export([load_mod/4]).
 
-%% Internal exports
--export([load_mod1/4]).
-
 %%====================================================================
 %% External exports
 %%====================================================================
 
 %%--------------------------------------------------------------------
 %% load_mod(Mod, File, Binary, Db) -> {ok, Mod}
-%%   Mod = atom()
+%%   Mod = module()
 %%   File = string() Source file (including path)
 %%   Binary = binary()
 %%   Db = ETS identifier
 %% Load a new module into the database.
 %%
-%% We want the loading of a module to be syncronous  so no other
+%% We want the loading of a module to be synchronous so that no other
 %% process tries to interpret code in a module not being completely
 %% loaded. This is achieved as this function is called from
 %% dbg_iserver. We are suspended until the module has been loaded.
 %%--------------------------------------------------------------------
+-spec load_mod(Mod, file:filename(), binary(), ets:tid()) ->
+        {'ok', Mod} when is_subtype(Mod, atom()).
+
 load_mod(Mod, File, Binary, Db) ->
     Flag = process_flag(trap_exit, true),
-    Pid = spawn_link(?MODULE, load_mod1, [Mod, File, Binary, Db]),
+    Pid = spawn_link(fun () -> load_mod1(Mod, File, Binary, Db) end),
     receive
 	{'EXIT', Pid, What} ->
 	    process_flag(trap_exit, Flag),
 	    What
     end.
 
-%%====================================================================
-%% Internal exports
-%%====================================================================
+-spec load_mod1(atom(), file:filename(), binary(), ets:tid()) -> no_return().
 
 load_mod1(Mod, File, Binary, Db) ->
     store_module(Mod, File, Binary, Db),
     exit({ok, Mod}).
 
-
 %%====================================================================
 %% Internal functions
 %%====================================================================
@@ -84,7 +80,7 @@ store_module(Mod, File, Binary, Db) ->
     Attr = store_forms(Forms, Mod, Db, Exp, []),
     erase(mod_md5),
     erase(current_function),
-%    store_funs(Db, Mod),
+    %% store_funs(Db, Mod),
     erase(vcount),
     erase(funs),
     erase(fun_count),
@@ -412,8 +408,7 @@ expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,fault}},[_]=As}) ->
     {dbg,Line,fault,expr_list(As)};
 expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,exit}},[_]=As}) ->
     {dbg,Line,exit,expr_list(As)};
-expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,apply}},As0}) 
-  when length(As0) == 3 ->
+expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,apply}},[_,_,_]=As0}) ->
     As = expr_list(As0),
     {apply,Line,As};
 expr({call,Line,{remote,_,{atom,_,Mod},{atom,_,Func}},As0}) ->
@@ -521,15 +516,9 @@ expr(Other) ->
 %%  here as sys_pre_expand has transformed source.
 
 is_guard_test({op,_,Op,L,R}) ->
-    case erl_internal:comp_op(Op, 2) of
-	true -> is_gexpr_list([L,R]);
-	false -> false
-    end;
+    erl_internal:comp_op(Op, 2) andalso is_gexpr_list([L,R]);
 is_guard_test({call,_,{remote,_,{atom,_,erlang},{atom,_,Test}},As}) ->
-    case erl_internal:type_test(Test, length(As)) of
-	true -> is_gexpr_list(As);
-	false -> false
-    end;
+    erl_internal:type_test(Test, length(As)) andalso is_gexpr_list(As);
 is_guard_test({atom,_,true}) -> true;
 is_guard_test(_) -> false.
 
@@ -546,22 +535,12 @@ is_gexpr({call,_,{remote,_,{atom,_,erlang},{atom,_,F}},As}) ->
     Ar = length(As),
     case erl_internal:guard_bif(F, Ar) of
 	true -> is_gexpr_list(As);
-	false ->
-	    case erl_internal:arith_op(F, Ar) of
-		true -> is_gexpr_list(As);
-		false -> false
-	    end
+	false -> erl_internal:arith_op(F, Ar) andalso is_gexpr_list(As)
     end;
 is_gexpr({op,_,Op,A}) ->
-    case erl_internal:arith_op(Op, 1) of
-	true -> is_gexpr(A);
-	false -> false
-    end;
+    erl_internal:arith_op(Op, 1) andalso is_gexpr(A);
 is_gexpr({op,_,Op,A1,A2}) ->
-    case erl_internal:arith_op(Op, 2) of
-	true -> is_gexpr_list([A1,A2]);
-	false -> false
-    end;
+    erl_internal:arith_op(Op, 2) andalso is_gexpr_list([A1,A2]);
 is_gexpr(_) -> false.
 
 is_gexpr_list(Es) -> lists:all(fun (E) -> is_gexpr(E) end, Es).
diff --git a/lib/debugger/src/dbg_iserver.erl b/lib/debugger/src/dbg_iserver.erl
index 4c1e9ccb7b..59188d83a2 100644
--- a/lib/debugger/src/dbg_iserver.erl
+++ b/lib/debugger/src/dbg_iserver.erl
@@ -155,11 +155,8 @@ handle_call(get_stack_trace, _From, State) ->
 
 %% Retrieving information
 handle_call(snapshot, _From, State) ->
-    Reply = lists:map(fun(Proc) ->
-			      {Proc#proc.pid, Proc#proc.function,
-			       Proc#proc.status, Proc#proc.info}
-		      end,
-		      State#state.procs),
+    Reply = [{Proc#proc.pid, Proc#proc.function,
+	      Proc#proc.status, Proc#proc.info} || Proc <- State#state.procs],
     {reply, Reply, State};
 handle_call({get_meta, Pid}, _From, State) ->
     Reply = case get_proc({pid, Pid}, State#state.procs) of
@@ -181,21 +178,21 @@ handle_call({get_attpid, Pid}, _From, State) ->
 
 %% Breakpoint handling
 handle_call({new_break, Point, Options}, _From, State) ->
-    case lists:keysearch(Point, 1, State#state.breaks) of
+    case lists:keymember(Point, 1, State#state.breaks) of
 	false ->
 	    Break = {Point, Options},
 	    send_all([subscriber, meta, attached],
 		     {new_break, Break}, State),
 	    Breaks = keyinsert(Break, 1, State#state.breaks),
 	    {reply, ok, State#state{breaks=Breaks}};
-	{value, _Break} ->
+	true ->
 	    {reply, {error, break_exists}, State}
     end;
 handle_call(all_breaks, _From, State) ->
     {reply, State#state.breaks, State};
 handle_call({all_breaks, Mod}, _From, State) ->
     Reply = lists:filter(fun({{M,_L}, _Options}) ->
-				 if M==Mod -> true; true -> false end
+				 M =/= Mod
 			 end,
 			 State#state.breaks),
     {reply, Reply, State};
@@ -276,7 +273,7 @@ handle_call({contents, Mod, Pid}, _From, State) ->
     Db = State#state.db,
     [{{Mod, refs}, ModDbs}] = ets:lookup(Db, {Mod, refs}),
     ModDb = if
-		Pid==any -> hd(ModDbs);
+		Pid =:= any -> hd(ModDbs);
 		true ->
 		    lists:foldl(fun(T, not_found) ->
 					[{T, Pids}] = ets:lookup(Db, T),
@@ -295,7 +292,7 @@ handle_call({raw_contents, Mod, Pid}, _From, State) ->
     Db = State#state.db,
     [{{Mod, refs}, ModDbs}] = ets:lookup(Db, {Mod, refs}),
     ModDb = if
-		Pid==any -> hd(ModDbs);
+		Pid =:= any -> hd(ModDbs);
 		true ->
 		    lists:foldl(fun(T, not_found) ->
 					[{T, Pids}] = ets:lookup(Db, T),
@@ -360,15 +357,15 @@ handle_cast({set_stack_trace, Flag}, State) ->
 %% Retrieving information
 handle_cast(clear, State) ->
     Procs = lists:filter(fun(#proc{status=Status}) ->
-				 if Status==exit -> false; true -> true end
+				 Status =/= exit
 			 end,
 			 State#state.procs),
     {noreply, State#state{procs=Procs}};
 
 %% Breakpoint handling
 handle_cast({delete_break, Point}, State) ->
-    case lists:keysearch(Point, 1, State#state.breaks) of
-	{value, _Break} ->
+    case lists:keymember(Point, 1, State#state.breaks) of
+	true ->
 	    send_all([subscriber, meta, attached],
 		     {delete_break, Point}, State),
 	    Breaks = lists:keydelete(Point, 1, State#state.breaks),
@@ -377,8 +374,8 @@ handle_cast({delete_break, Point}, State) ->
 	    {noreply, State}
     end;
 handle_cast({break_option, Point, Option, Value}, State) ->
-    case lists:keysearch(Point, 1, State#state.breaks) of
-	{value, {Point, Options}} ->
+    case lists:keyfind(Point, 1, State#state.breaks) of
+	{Point, Options} ->
 	    N = case Option of
 		    status -> 1;
 		    action -> 2;
@@ -399,7 +396,7 @@ handle_cast(no_break, State) ->
 handle_cast({no_break, Mod}, State) ->
     send_all([subscriber, meta, attached], {no_break, Mod}, State),
     Breaks = lists:filter(fun({{M, _L}, _O}) ->
-				  if M==Mod -> false; true -> true end
+				  M =/= Mod
 			  end,
 			  State#state.breaks),
     {noreply, State#state{breaks=Breaks}};
@@ -409,7 +406,7 @@ handle_cast({set_status, Meta, Status, Info}, State) ->
     {true, Proc} = get_proc({meta, Meta}, State#state.procs),
     send_all(subscriber, {new_status, Proc#proc.pid, Status, Info}, State),
     if
-	Status==break ->
+	Status =:= break ->
 	    auto_attach(break, State#state.auto, Proc);
 	true -> ignore
     end,
@@ -526,11 +523,10 @@ code_change(_OldVsn, State, _Extra) ->
 %% Internal functions
 %%====================================================================
 
-auto_attach(Why, Auto, Proc) when is_record(Proc, proc) ->
-    case Proc#proc.attpid of
-	AttPid when is_pid(AttPid) -> ignore;
-	undefined ->
-	    auto_attach(Why, Auto, Proc#proc.pid)
+auto_attach(Why, Auto, #proc{attpid = Attpid, pid = Pid}) ->
+    case Attpid of
+	undefined -> auto_attach(Why, Auto, Pid);
+	_ when is_pid(Attpid) -> ignore
     end;
 auto_attach(Why, Auto, Pid) when is_pid(Pid) ->
     case Auto of
@@ -545,7 +541,7 @@ auto_attach(Why, Auto, Pid) when is_pid(Pid) ->
 
 keyinsert(Tuple1, N, [Tuple2|Tuples]) ->
     if
-	element(N, Tuple1)<element(N, Tuple2) ->
+	element(N, Tuple1) < element(N, Tuple2) ->
 	    [Tuple1, Tuple2|Tuples];
 	true ->
 	    [Tuple2 | keyinsert(Tuple1, N, Tuples)]
@@ -576,7 +572,7 @@ send_all([], _Msg, _State) -> ok;
 send_all(subscriber, Msg, State) ->
     send_all(State#state.subs, Msg);
 send_all(meta, Msg, State) ->
-    Metas = lists:map(fun(Proc) -> Proc#proc.meta end, State#state.procs),
+    Metas = [Proc#proc.meta || Proc <- State#state.procs],
     send_all(Metas, Msg);
 send_all(attached, Msg, State) ->
     AttPids= mapfilter(fun(Proc) ->
@@ -600,7 +596,7 @@ get_proc({Type, Pid}, Procs) ->
 		meta -> #proc.meta;
 		attpid -> #proc.attpid
 	    end,
-    case lists:keysearch(Pid, Index, Procs) of
-	{value, Proc} -> {true, Proc};
-	false -> false
+    case lists:keyfind(Pid, Index, Procs) of
+	false -> false;
+	Proc -> {true, Proc}
     end.
diff --git a/lib/debugger/src/dbg_ui_break_win.erl b/lib/debugger/src/dbg_ui_break_win.erl
index a56fe36828..0c1e25e703 100644
--- a/lib/debugger/src/dbg_ui_break_win.erl
+++ b/lib/debugger/src/dbg_ui_break_win.erl
@@ -268,12 +268,7 @@ handle_event({gs, _Id, click, _Data, ["Ok"|_]}, WinInfo) ->
 		IndexL ->
 		    Funcs = WinInfo#winInfo.funcs,
 		    Breaks =
-			lists:map(fun(Index) ->
-					  Func = lists:nth(Index+1,
-							   Funcs),
-					  [Mod | Func]
-				  end,
-				  IndexL),
+			[[Mod|lists:nth(Index+1, Funcs)] || Index <- IndexL],
 		    {break, Breaks, enable}
 	    end
     end;
diff --git a/lib/debugger/src/dbg_ui_filedialog_win.erl b/lib/debugger/src/dbg_ui_filedialog_win.erl
index f7d76076a5..79ccf20946 100644
--- a/lib/debugger/src/dbg_ui_filedialog_win.erl
+++ b/lib/debugger/src/dbg_ui_filedialog_win.erl
@@ -202,8 +202,7 @@ handle_event({gs, 'Files', doubleclick, _Data, _Arg}, WinInfo) ->
 handle_event({gs, _Id, click, select, _Arg}, _WinInfo) ->
     {select, gs:read('Selection', text)};
 handle_event({gs, _Id, click, multiselect, _Arg}, WinInfo) ->
-    Files = lists:map(fun(File) -> untag(File) end,
-		      gs:read('Files', items)),
+    Files = [untag(File) || File <- gs:read('Files', items)],
     {multiselect, WinInfo#winInfo.cwd, Files};
 handle_event({gs, _Id, click, filter, _Arg}, WinInfo) ->
     {Cwd, Pattern} = update_win(gs:read('Filter', text),
@@ -286,7 +285,7 @@ max_existing([Name | Names]) ->
 max_existing(Dir, [Name | Names]) ->
     Dir2 = filename:join(Dir, Name),
     case filelib:is_file(Dir2, erl_prim_loader) of
-	true when Names==[] -> {Dir2, []};
+	true when Names =:= [] -> {Dir2, []};
 	true -> max_existing(Dir2, Names);
 	false -> {Dir, [Name | Names]}
     end.
@@ -309,11 +308,8 @@ extra_filter([], _Dir, _Fun) -> [].
 get_subdirs(Dir) ->
     case erl_prim_loader:list_dir(Dir) of
 	{ok, FileNames} ->
-	    X = lists:filter(fun(FileName) ->
-				     File = filename:join(Dir, FileName),
-				     filelib:is_dir(File, erl_prim_loader)
-			     end,
-			     FileNames),
+	    X = [FN || FN <- FileNames,
+		       filelib:is_dir(filename:join(Dir, FN), erl_prim_loader)],
 	    lists:sort(X);
 	_Error ->
 	    []
@@ -335,4 +331,3 @@ compare([], [$/|File]) ->
     File;
 compare(_, _) ->
     error.
-    
diff --git a/lib/debugger/src/dbg_ui_mon.erl b/lib/debugger/src/dbg_ui_mon.erl
index 8888075124..82fe210968 100644
--- a/lib/debugger/src/dbg_ui_mon.erl
+++ b/lib/debugger/src/dbg_ui_mon.erl
@@ -162,7 +162,7 @@ init2(CallingPid, Mode, SFile, GS) ->
     CallingPid ! {initialization_complete, self()},
 
     if
-	SFile==default ->
+	SFile =:= default ->
 	    loop(State3);
 	true ->
 	    loop(load_settings(SFile, State3))
@@ -226,7 +226,7 @@ loop(State) ->
 	    gui_cmd(stopped, State);
 
 	%% From the GUI
-	GuiEvent when is_tuple(GuiEvent), element(1, GuiEvent)==gs ->
+	GuiEvent when is_tuple(GuiEvent), element(1, GuiEvent) =:= gs ->
 	    Cmd = dbg_ui_mon_win:handle_event(GuiEvent,State#state.win),
 	    State2 = gui_cmd(Cmd, State),
 	    loop(State2);
@@ -269,7 +269,7 @@ gui_cmd(ignore, State) ->
     State;
 gui_cmd(stopped, State) ->
     if
-	State#state.starter==true -> int:stop();
+	State#state.starter =:= true -> int:stop();
 	true -> int:auto_attach(false)
     end,
     exit(stop);
@@ -413,9 +413,9 @@ gui_cmd({'Trace Window', TraceWin}, State) ->
     State2;
 gui_cmd({'Auto Attach', When}, State) ->
     if
-	When==[] -> int:auto_attach(false);
+	When =:= [] -> int:auto_attach(false);
 	true ->
-	    Flags = lists:map(fun(Name) -> map(Name) end, When),
+	    Flags = [map(Name) || Name <- When],
 	    int:auto_attach(Flags, trace_function(State))
     end,
     State;
@@ -676,7 +676,7 @@ load_settings2(Settings, State) ->
 			      Break,
 			  int:break(Mod, Line),
 			  if
-			      Status==inactive ->
+			      Status =:= inactive ->
 				  int:disable_break(Mod, Line);
 			      true -> ignore
 			  end,
@@ -700,12 +700,8 @@ save_settings(SFile, State) ->
 		int:auto_attach(),
 		int:stack_trace(),
 		State#state.backtrace,
-		lists:map(fun(Mod) ->
-				  int:file(Mod)
-			  end,
-			  int:interpreted()),
+		[int:file(Mod) || Mod <- int:interpreted()],
 		int:all_breaks()},
-
     Binary = term_to_binary({debugger_settings, Settings}),
     case file:write_file(SFile, Binary) of
 	ok ->
@@ -720,13 +716,12 @@ save_settings(SFile, State) ->
 %%====================================================================
 
 registered_name(Pid) ->
-
     %% Yield in order to give Pid more time to register its name
     timer:sleep(200),
 
     Node = node(Pid),
     if
-	Node==node() ->
+	Node =:= node() ->
 	    case erlang:process_info(Pid, registered_name) of
 		{registered_name, Name} -> Name;
 		_ -> undefined
diff --git a/lib/debugger/src/dbg_ui_mon_win.erl b/lib/debugger/src/dbg_ui_mon_win.erl
index ba2f94c550..66e59a822a 100644
--- a/lib/debugger/src/dbg_ui_mon_win.erl
+++ b/lib/debugger/src/dbg_ui_mon_win.erl
@@ -224,8 +224,7 @@ select(MenuItem, Bool) ->
 %%--------------------------------------------------------------------
 add_module(WinInfo, Menu, Mod) ->
     Modules = WinInfo#winInfo.modules,
-    case lists:keysearch(Mod, #moduleInfo.module, Modules) of
-	{value, _ModInfo} -> WinInfo;
+    case lists:keymember(Mod, #moduleInfo.module, Modules) of
 	false ->
 	    %% Create a menu for the module
 	    Font = dbg_ui_win:font(normal),
@@ -244,7 +243,8 @@ add_module(WinInfo, Menu, Mod) ->
 	    gs:config(WinInfo#winInfo.listbox, {add, Mod}),
 
 	    ModInfo = #moduleInfo{module=Mod, menubtn=MenuBtn},
-	    WinInfo#winInfo{modules=[ModInfo | Modules]}
+	    WinInfo#winInfo{modules=[ModInfo | Modules]};
+	true -> WinInfo
     end.
     
 %%--------------------------------------------------------------------
@@ -491,14 +491,13 @@ handle_event({gs, _Id, click, autoattach, _Arg}, WinInfo) ->
 
 %% Process grid
 handle_event({gs, _Id, keypress, _Data, [Key|_]}, WinInfo) when
-  Key=='Up'; Key=='Down' ->
-    Dir = if Key=='Up' -> up; Key=='Down' -> down end,
+  Key =:= 'Up'; Key =:= 'Down' ->
+    Dir = if Key =:= 'Up' -> up; Key =:= 'Down' -> down end,
     Row = move(WinInfo, Dir),
-
     if Row>1 ->
 	    WinInfo2 = highlight(WinInfo, Row),
-	    {value, #procInfo{pid=Pid}} =
-		lists:keysearch(Row, #procInfo.row, WinInfo#winInfo.processes),
+	    #procInfo{pid=Pid} =
+		lists:keyfind(Row, #procInfo.row, WinInfo#winInfo.processes),
 	    {focus, Pid, WinInfo2};
        true ->
 	    ignore
@@ -515,10 +514,9 @@ handle_event(_GSEvent, _WinInfo) ->
 move(WinInfo, Dir) ->
     Row = WinInfo#winInfo.focus,
     Last = WinInfo#winInfo.row,
-
     if
-	Dir==up, Row>1 -> Row-1;
-	Dir==down, Row<Last -> Row+1;
+	Dir =:= up, Row > 1 -> Row-1;
+	Dir =:= down, Row < Last -> Row+1;
 	true -> Row
     end.
 
@@ -533,7 +531,6 @@ highlight(WinInfo, Row) ->
     GridLine2 = gs:read(Grid, {obj_at_row, Row}),
     gs:config(GridLine2, {fg, white}),
     WinInfo#winInfo{focus=Row}.
-    
 
 %%====================================================================
 %% Internal functions
@@ -545,7 +542,7 @@ configure(WinInfo, {W, H}) ->
     Dx = NewW - gs:read(Grid, width),
     Dy = H-42 - gs:read(Grid, height),
     if
-	(Dx+Dy)=/=0 ->
+	(Dx+Dy) =/= 0 ->
 	    gs:config(Grid, [{width, NewW}, {height, H-30}]),
 	    Cols = calc_columnwidths(NewW),
 	    gs:config(Grid, Cols);
@@ -555,10 +552,9 @@ configure(WinInfo, {W, H}) ->
 
 calc_columnwidths(Width) ->
     W = if
-	    Width=<?Wg -> ?Wg;
+	    Width =< ?Wg -> ?Wg;
 	    true -> Width
 	end,
-    First = lists:map(fun (X) -> round(X) end,
-		      [0.13*W, 0.27*W, 0.18*W, 0.18*W]),
+    First = [round(X) || X <- [0.13*W, 0.27*W, 0.18*W, 0.18*W]],
     Last = W - lists:sum(First) - 30,
     {columnwidths, First++[Last]}.
diff --git a/lib/debugger/src/dbg_ui_trace_win.erl b/lib/debugger/src/dbg_ui_trace_win.erl
index c6f041a63d..82d4199630 100644
--- a/lib/debugger/src/dbg_ui_trace_win.erl
+++ b/lib/debugger/src/dbg_ui_trace_win.erl
@@ -147,17 +147,17 @@ configure(WinInfo, TraceWin) ->
     H = gs:read(Win, height),
 
     H2 = if
-	     Bu1==close, Bu2==open ->
+	     Bu1 =:= close, Bu2 =:= open ->
 		 resize_button_area(open, width, W-4),
 		 gs:config('ButtonArea', {height, 30}),
 		 H+30;
-	     Bu1==open, Bu2==close ->
+	     Bu1 =:= open, Bu2 =:= close ->
 		 gs:config('ButtonArea', [{width, 0}, {height, 0}]),
 		 H-30;
 	     true -> H
 	 end,
     H3 = if
-	     Ev1==close, Ev2==open, Bi1==open ->
+	     Ev1 =:= close, Ev2 =:= open, Bi1 =:= open ->
 		 Wnew1 = round((W-10-4)/2), % W = window/2 - rb - pads
 		 Hbi1 = gs:read('BindArea', height), % H = bind area h
 		 resize_eval_area(open, width, Wnew1),
@@ -167,25 +167,25 @@ configure(WinInfo, TraceWin) ->
 		 resize_bind_area(open, width,
 				  Wnew1-gs:read('BindArea', width)),
 		 H2;
-	     Ev1==close, Ev2==open, Bi1==close ->
+	     Ev1 =:= close, Ev2 =:= open, Bi1 =:= close ->
 		 resize_eval_area(open, width, W-4),
 		 resize_eval_area(open, height, 200),
 		 H2+200;
-	     Ev1==open, Ev2==close, Bi1==open ->
+	     Ev1 =:= open, Ev2 =:= close, Bi1 =:= open ->
 		 gs:config('EvalArea', [{width,0}, {height,0}]),
 		 gs:config('RB3', [{width, 0}, {height, 0}]),
 		 Wnew2 = W-4,
 		 resize_bind_area(open, width,
 				  Wnew2-gs:read('BindArea', width)),
 		 H2;
-	     Ev1==open, Ev2==close, Bi1==close ->
+	     Ev1 =:= open, Ev2 =:= close, Bi1 =:= close ->
 		 Hs1 = gs:read('EvalArea', height),
 		 gs:config('EvalArea', [{width, 0}, {height, 0}]),
 		 H2-Hs1;
 	     true -> H2
 	 end,
     H4 = if
-	     Bi1==close, Bi2==open, Ev2==open ->
+	     Bi1 =:= close, Bi2 =:= open, Ev2 =:= open ->
 		 Wnew3 = round((W-10-4)/2), % W = window/2 - rb - pads
 		 Hs2 = gs:read('EvalArea', height), % H = eval area h
 		 resize_bind_area(open, width, Wnew3),
@@ -194,29 +194,29 @@ configure(WinInfo, TraceWin) ->
 		 resize_eval_area(open, width,
 				  Wnew3-gs:read('EvalArea', width)),
 		 H3;
-	     Bi1==close, Bi2==open, Ev2==close ->
+	     Bi1 =:= close, Bi2 =:= open, Ev2 =:= close ->
 		 resize_bind_area(open, width, W-4),
 		 resize_bind_area(open, height, 200),
 		 H3+200;
-	     Bi1==open, Bi2==close, Ev2==open ->
+	     Bi1 =:= open, Bi2 =:= close, Ev2 =:= open ->
 		 gs:config('BindArea', [{width, 0}, {height, 0}]),
 		 gs:config('RB3', [{width, 0}, {height, 0}]),
 		 Wnew4 = W-4,
 		 resize_eval_area(open, width,
 				  Wnew4-gs:read('EvalArea', width)),
 		 H3;
-	     Bi1==open, Bi2==close, Ev2==close ->
+	     Bi1 =:= open, Bi2 =:= close, Ev2 =:= close ->
 		 Hbi2 = gs:read('BindArea', height),
 		 gs:config('BindArea', [{width, 0}, {height, 0}]),
 		 H3-Hbi2;
 	     true -> H3
 	 end,
     H5 = if
-	     Tr1==close, Tr2==open ->
+	     Tr1 =:= close, Tr2 =:= open ->
 		 resize_trace_area(open, width, W-4),
 		 resize_trace_area(open, height, 200),
 		 H4+200;
-	     Tr1==open, Tr2==close ->
+	     Tr1 =:= open, Tr2 =:= close ->
 		 Hf = gs:read('TraceArea', height),
 		 gs:config('TraceArea', [{width, 0}, {height, 0}]),
 		 H4-Hf;
@@ -226,10 +226,10 @@ configure(WinInfo, TraceWin) ->
 
     RB1old = rb1(OldFlags), RB1new = rb1(NewFlags),
     if
-	RB1old==close, RB1new==open ->
+	RB1old =:= close, RB1new =:= open ->
 	    gs:config('RB1', [{width, W-4}, {height, 10}]),
 	    gs:config(Win, {height, gs:read(Win, height)+10});
-	RB1old==open, RB1new==close ->
+	RB1old =:= open, RB1new =:= close ->
 	    gs:config('RB1', [{width, 0}, {height, 0}, lower]),
 	    gs:config(Win, {height, gs:read(Win, height)-10});
 	true -> ignore
@@ -237,10 +237,10 @@ configure(WinInfo, TraceWin) ->
 
     RB2old = rb2(OldFlags), RB2new = rb2(NewFlags),
     if
-	RB2old==close, RB2new==open ->
+	RB2old =:= close, RB2new =:= open ->
 	    gs:config('RB2', [{width, W-4}, {height, 10}]),
 	    gs:config(Win, {height,gs:read(Win, height)+10});
-	RB2old==open, RB2new==close ->		
+	RB2old =:= open, RB2new =:= close ->
 	    gs:config('RB2', [{width, 0}, {height, 0}, lower]),
 	    gs:config(Win, {height, gs:read(Win, height)-10});
 	true -> ignore
@@ -301,15 +301,15 @@ select(MenuItem, Bool) ->
 %%     Cond = null | {Mod, Func}
 %%--------------------------------------------------------------------
 add_break(WinInfo, Menu, {{Mod,Line},[Status|_Options]}=Break) ->
-    case lists:keysearch(Mod, 1, WinInfo#winInfo.editors) of
-	{value, {Mod, Editor}} ->
+    case lists:keyfind(Mod, 1, WinInfo#winInfo.editors) of
+	{Mod, Editor} ->
 	    add_break_to_code(Editor, Line, Status);
 	false -> ignore
     end,
     add_break_to_menu(WinInfo, Menu, Break).
 
 add_break_to_code(Editor, Line, Status) ->
-    Color = if Status==active -> red; Status==inactive -> blue end,
+    Color = if Status =:= active -> red; Status =:= inactive -> blue end,
     config_editor(Editor, [{overwrite,{{Line,0},"-@-  "}},
 			   {fg,{{{Line,0},{Line,lineend}}, Color}}]).
 
@@ -330,8 +330,8 @@ add_break_to_menu(WinInfo, Menu, {Point, [Status|_Options]=Options}) ->
 %%     Cond = null | {Mod, Func}
 %%--------------------------------------------------------------------
 update_break(WinInfo, {{Mod,Line},[Status|_Options]}=Break) ->
-    case lists:keysearch(Mod, 1, WinInfo#winInfo.editors) of
-	{value, {Mod, Editor}} ->
+    case lists:keyfind(Mod, 1, WinInfo#winInfo.editors) of
+	{Mod, Editor} ->
 	    add_break_to_code(Editor, Line, Status);
 	false -> ignore
     end,
@@ -352,8 +352,8 @@ update_break_in_menu(WinInfo, {Point, [Status|_Options]=Options}) ->
 %%   Point = {Mod, Line}
 %%--------------------------------------------------------------------
 delete_break(WinInfo, {Mod,Line}=Point) ->
-    case lists:keysearch(Mod, 1, WinInfo#winInfo.editors) of
-	{value, {Mod, Editor}} -> delete_break_from_code(Editor, Line);
+    case lists:keyfind(Mod, 1, WinInfo#winInfo.editors) of
+	{Mod, Editor} -> delete_break_from_code(Editor, Line);
 	false -> ignore
     end,
     delete_break_from_menu(WinInfo, Point).
@@ -379,11 +379,11 @@ clear_breaks(WinInfo) ->
     clear_breaks(WinInfo, all).
 clear_breaks(WinInfo, Mod) ->
     Remove = if
-		 Mod==all -> WinInfo#winInfo.breaks;
+		 Mod =:= all -> WinInfo#winInfo.breaks;
 		 true ->
 		     lists:filter(fun(#breakInfo{point={Mod2,_L}}) ->
 					  if
-					      Mod2==Mod -> true;
+					      Mod2 =:= Mod -> true;
 					      true -> false
 					  end
 				  end,
@@ -450,8 +450,8 @@ display(Arg) ->
 %% Note: remove_code/2 should not be used for currently shown module.
 %%--------------------------------------------------------------------
 is_shown(WinInfo, Mod) ->
-    case lists:keysearch(Mod, 1, WinInfo#winInfo.editors) of
-	{value, {Mod, Editor}} ->
+    case lists:keyfind(Mod, 1, WinInfo#winInfo.editors) of
+	{Mod, Editor} ->
 	    gs:config(Editor, raise),
 	    {true, WinInfo#winInfo{editor={Mod, Editor}}};
 	false -> false
@@ -459,24 +459,22 @@ is_shown(WinInfo, Mod) ->
 
 show_code(WinInfo, Mod, Contents) ->
     Editors = WinInfo#winInfo.editors,
-    {Flag, Editor} = case lists:keysearch(Mod, 1, Editors) of
-			 {value, {Mod, Ed}} -> {existing, Ed};
+    {Flag, Editor} = case lists:keyfind(Mod, 1, Editors) of
+			 {Mod, Ed} -> {existing, Ed};
 			 false -> {new, code_editor()}
 		     end,
-
     %% Insert code and update breakpoints, if any
     config_editor(Editor, [raise, clear]),
     show_code(Editor, Contents),
     lists:foreach(fun(BreakInfo) ->
 			  case BreakInfo#breakInfo.point of
-			      {Mod2, Line} when Mod2==Mod ->
+			      {Mod2, Line} when Mod2 =:= Mod ->
 				  Status = BreakInfo#breakInfo.status,
 				  add_break_to_code(Editor, Line,Status);
 			      _Point -> ignore
 			  end
 		  end,
 		  WinInfo#winInfo.breaks),
-
     case Flag of
 	existing ->
 	    WinInfo#winInfo{editor={Mod, Editor}};
@@ -485,7 +483,7 @@ show_code(WinInfo, Mod, Contents) ->
 			    editors=[{Mod, Editor} | Editors]}
     end.
 	
-show_code(Editor, Text) when length(Text)>1500 ->
+show_code(Editor, Text) when length(Text) > 1500 ->
     %% Add some text at a time so that other processes may get scheduled
     Str = string:sub_string(Text, 1, 1500),
     config_editor(Editor, {insert,{'end', Str}}),
@@ -494,21 +492,19 @@ show_code(Editor, Text) ->
     config_editor(Editor, {insert,{'end',Text}}).
 
 show_no_code(WinInfo) ->
-    {value, {'$top', Editor}} =
-	lists:keysearch('$top', 1, WinInfo#winInfo.editors),
+    {'$top', Editor} = lists:keyfind('$top', 1, WinInfo#winInfo.editors),
     gs:config(Editor, raise),
     WinInfo#winInfo{editor={'$top', Editor}}.
 
 remove_code(WinInfo, Mod) ->
     Editors = WinInfo#winInfo.editors,
-    case lists:keysearch(Mod, 1, Editors) of
-	{value, {Mod, Editor}} ->
+    case lists:keyfind(Mod, 1, Editors) of
+	{Mod, Editor} ->
 	    gs:destroy(Editor),
 	    WinInfo#winInfo{editors=lists:keydelete(Mod, 1, Editors)};
 	false ->
 	    WinInfo
     end.
-    
 
 %%--------------------------------------------------------------------
 %% mark_line(WinInfo, Line, How) -> WinInfo
@@ -522,7 +518,7 @@ mark_line(WinInfo, Line, How) ->
     mark_line2(Editor, WinInfo#winInfo.marked_line, false),
     mark_line2(Editor, Line, How),
     if
-	Line/=0 -> config_editor(Editor, {vscrollpos, Line-5});
+	Line =/= 0 -> config_editor(Editor, {vscrollpos, Line-5});
 	true -> ignore
     end,
     WinInfo#winInfo{marked_line=Line}.
@@ -537,7 +533,7 @@ mark_line2(Editor, Line, How) ->
 		 false -> "   "
 	     end,
     Font = if
-	       How==false -> dbg_ui_win:font(normal);
+	       How =:= false -> dbg_ui_win:font(normal);
 	       true -> dbg_ui_win:font(bold)
 	   end,
     config_editor(Editor, [{overwrite, {{Line,5}, Prefix}},
@@ -558,10 +554,10 @@ select_line(WinInfo, Line) ->
     %% help window, it must be checked that it is correct
     Size = gs:read(Editor, size),
     if
-	Line==0 ->
+	Line =:= 0 ->
 	    select_line(Editor, WinInfo#winInfo.selected_line, false),
 	    WinInfo#winInfo{selected_line=0};
-	Line<Size ->
+	Line < Size ->
 	    select_line(Editor, Line, true),
 	    config_editor(Editor, {vscrollpos, Line-5}),
 	    WinInfo#winInfo{selected_line=Line};
@@ -712,10 +708,10 @@ handle_event({gs, Editor, buttonpress, code_editor, _Arg}, WinInfo) ->
 	{Row, _} ->
 	    {Mod, _Editor} = WinInfo#winInfo.editor,
 	    Point = {Mod, Row},
-	    case lists:keysearch(Point, #breakInfo.point,
+	    case lists:keymember(Point, #breakInfo.point,
 				 WinInfo#winInfo.breaks) of
-		{value, _BreakInfo} -> {break, Point, delete};
-		false -> {break, Point, add}
+		false -> {break, Point, add};
+		true  -> {break, Point, delete}
 	    end;
 	{Row2, _} ->
 	    select_line(Editor, Row2, true),
@@ -776,7 +772,7 @@ code_editor() ->
 
 code_editor(Name, W, H) ->
     Editor = if
-		 Name==null -> gs:editor('CodeArea', []);
+		 Name =:= null -> gs:editor('CodeArea', []);
 		 true -> gs:editor(Name, 'CodeArea', [])
 	     end,
     gs:config(Editor, [{x,5}, {y,30}, {width,W}, {height,H},
@@ -814,8 +810,8 @@ buttons() ->
      {'Where','WhereButton'}, {'Up','UpButton'}, {'Down','DownButton'}].
 
 is_button(Name) ->
-    case lists:keysearch(Name, 1, buttons()) of
-	{value, {Name, Button}} -> {true, Button};
+    case lists:keyfind(Name, 1, buttons()) of
+	{Name, Button} -> {true, Button};
 	false -> false
     end.
 
@@ -847,7 +843,7 @@ resize_button_area(open, width, Diff) ->
 
 eval_area({Ev,Bi}, X, Y, FrameOpts, Win) ->
     {W,H} = if
-		Ev==open -> {289,200};
+		Ev =:= open -> {289,200};
 		true -> {0,0}
 	    end,
     Font = dbg_ui_win:font(normal),
@@ -870,7 +866,7 @@ eval_area({Ev,Bi}, X, Y, FrameOpts, Win) ->
 	       {font_style,{{{1,0},'end'},Font}}]),
     gs:config('EvalEditor', {enable, false}),
     if
-	Ev==open, Bi==close -> resize_eval_area(Ev, width, 257);
+	Ev =:= open, Bi =:= close -> resize_eval_area(Ev, width, 257);
 	true -> ignore
     end.
 
@@ -891,7 +887,7 @@ resize_eval_area(open, Key, Diff) ->
 
 bind_area({Ev,Bi}, X, Y, FrameOpts, Win) ->
     {W,H} = if
-		Bi==open -> {249,200};
+		Bi =:= open -> {249,200};
 		true -> {0,0}
 	    end,
     gs:frame('BindArea', Win,
@@ -908,7 +904,7 @@ bind_area({Ev,Bi}, X, Y, FrameOpts, Win) ->
 		 {text,{1,"Name"}}, {text,{2,"Value"}}, {font,Font}]),
     gs:config('BindGrid', {rows,{1,1}}),
     if
-	Bi==open, Ev==close -> resize_bind_area(Bi, width, 297);
+	Bi =:= open, Ev =:= close -> resize_bind_area(Bi, width, 297);
 	true -> ignore
     end.
 
@@ -993,15 +989,15 @@ resizebar(Flag, Name, X, Y, W, H, Obj) ->
 
 rb1({_Bu,Ev,Bi,Tr}) ->
     if
-	Ev==close, Bi==close, Tr==close -> close;
+	Ev =:= close, Bi =:= close, Tr =:= close -> close;
 	true -> open
     end.
     
 rb2({_Bu,Ev,Bi,Tr}) ->
     if
-	Tr==open ->
+	Tr =:= open ->
 	    if
-		Ev==close, Bi==close -> close;
+		Ev =:= close, Bi =:= close -> close;
 		true -> open
 	    end;
 	true -> close
@@ -1009,7 +1005,7 @@ rb2({_Bu,Ev,Bi,Tr}) ->
     
 rb3({_Bu,Ev,Bi,_Tr}) ->
     if
-	Ev==open, Bi==open -> open;
+	Ev =:= open, Bi =:= open -> open;
 	true -> close
     end.
 
@@ -1067,7 +1063,7 @@ configure(WinInfo, NewW, NewH) ->
 
     %% Adjust width unless it is unchanged or less than minimum width
     if
-	OldW/=NewW ->
+	OldW =/= NewW ->
 	    {Dcode,Deval,Dbind} = configure_widths(OldW,NewW,Flags),
 	    resize_code_area(WinInfo, width, Dcode),
 	    case rb1(Flags) of
@@ -1090,7 +1086,7 @@ configure(WinInfo, NewW, NewH) ->
     
     %% Adjust height unless it is unchanged or less than minimum height
     if
-	OldH/=NewH ->
+	OldH =/= NewH ->
 	    {Dcode2,Deval2,Dtrace} = configure_heights(OldH,NewH,Flags),
 	    resize_code_area(WinInfo, height, Dcode2),
 	    resize_eval_area(Ev, height, Deval2),
@@ -1117,11 +1113,11 @@ configure_widths(OldW, NewW, Flags) ->
     %% Check how much the frames can be resized in reality
     Limits = if
 		 %% Window larger
-		 NewW>OldW ->
+		 NewW > OldW ->
 		     if
-			 Ev==open,Bi==open -> {0,Diff,Diff};
-			 Ev==open -> {0,Diff,0};
-			 Bi==open -> {0,0,Diff};
+			 Ev =:= open, Bi =:= open -> {0,Diff,Diff};
+			 Ev =:= open -> {0,Diff,0};
+			 Bi =:= open -> {0,0,Diff};
 			 true -> {Diff,0,0}
 		     end;
 		 
@@ -1129,12 +1125,12 @@ configure_widths(OldW, NewW, Flags) ->
 		 %% and current size
 		 OldW>NewW ->
 		     if
-			 Ev==open,Bi==open ->
+			 Ev =:= open, Bi =:= open ->
 			     {0,
 			      gs:read('EvalArea',width)-204,
 			      gs:read('BindArea',width)-112};
-			 Ev==open -> {0,Diff,0};
-			 Bi==open -> {0,0,Diff};
+			 Ev =:= open -> {0,Diff,0};
+			 Bi =:= open -> {0,0,Diff};
 			 true -> {Diff,0,0}
 		     end
 	     end,
@@ -1142,13 +1138,13 @@ configure_widths(OldW, NewW, Flags) ->
     case Limits of
 
 	%% No Shell or Bind frame, larger window
-	{T,0,0} when NewW>OldW -> {T,0,0};
+	{T,0,0} when NewW > OldW -> {T,0,0};
 	
 	%% No Shell or Bind frame, smaller window
-	{T,0,0} when OldW>NewW -> {-T,0,0};
+	{T,0,0} when OldW > NewW -> {-T,0,0};
 
 	%% Window larger; divide Diff among the frames and return result
-	{_,Sf,B} when NewW>OldW ->
+	{_,Sf,B} when NewW > OldW ->
 	    {_,Sf2,B2} = divide([{0,0},{0,Sf},{0,B}],Diff),
 	    {Sf2+B2,Sf2,B2};
 
@@ -1171,33 +1167,33 @@ configure_heights(OldH, NewH, Flags) ->
     %% Check how much the frames can be resized in reality
     {T,Sf,Ff} = if
 		  %% Window larger
-		  NewH>OldH ->
+		  NewH > OldH ->
 		      {Diff,
 		       if
-			   Ev==close, Bi==close -> 0;
+			   Ev =:= close, Bi =:= close -> 0;
 			   true -> Diff
 		       end,
 		       if
-			   Tr==open -> Diff;
+			   Tr =:= open -> Diff;
 			   true -> 0
 		       end};
 
 		  %% Window smaller; get difference between min size
 		  %% and current size
-		  OldH>NewH ->
+		  OldH > NewH ->
 		      {gs:read('CodeArea',height)-100,
 		       if
-			   Ev==close, Bi==close -> 0;
+			   Ev =:= close, Bi =:= close -> 0;
 			   true ->
 			       if
-				   Ev==open ->
+				   Ev =:= open ->
 				       gs:read('EvalArea',height)-100;
-				   Bi==open ->
+				   Bi =:= open ->
 				       gs:read('BindArea',height)-100
 			       end
 		       end,
 		       if
-			   Tr==open -> gs:read('TraceArea',height)-100;
+			   Tr =:= open -> gs:read('TraceArea',height)-100;
 			   true -> 0
 		       end}
 	      end,
@@ -1251,10 +1247,8 @@ divide(L, Diff) ->
 
     if
 	%% All of Diff has been distributed
-	D==0 -> {T,S,F};
-	
+	D =:= 0 -> {T,S,F};
 	true ->
-    
 	    %% For each element, try to add as much as possible of D
 	    {NewT,Dt} = divide2(D,T,Tmax),
 	    {NewS,Ds} = divide2(D,S,Smax),
@@ -1296,25 +1290,25 @@ resize(WinInfo, ResizeBar) ->
 	       rblimits('RB2',W,H),
 	       rblimits('RB3',W,H)).
 
-resizeloop(WI, RB, Prev, {Min1,Max1},{Min2,Max2},{Min3,Max3}) ->
+resizeloop(WI, RB, Prev, {Min1,Max1}, {Min2,Max2}, {Min3,Max3}) ->
     receive
-	{gs,_,motion,_,[_,Y]} when RB=='RB1', Y>Min1,Y<Max1 ->
+	{gs,_,motion,_,[_,Y]} when RB =:= 'RB1', Y > Min1, Y < Max1 ->
 	    gs:config('RB1', {y,Y}),
-	    resizeloop(WI, RB, Y, {Min1,Max1},{Min2,Max2},{Min3,Max3});
-	{gs,_,motion,_,_} when RB=='RB1' ->
-	    resizeloop(WI, RB, Prev,{Min1,Max1},{Min2,Max2},{Min3,Max3});
+	    resizeloop(WI, RB, Y, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
+	{gs,_,motion,_,_} when RB =:= 'RB1' ->
+	    resizeloop(WI, RB, Prev, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
 	
-	{gs,_,motion,_,[_,Y]} when RB=='RB2', Y>Min2,Y<Max2 ->
+	{gs,_,motion,_,[_,Y]} when RB =:= 'RB2', Y > Min2, Y < Max2 ->
 	    gs:config('RB2', {y,Y}),
-	    resizeloop(WI, RB, Y, {Min1,Max1},{Min2,Max2},{Min3,Max3});
-	{gs,_,motion,_,_} when RB=='RB2' ->
-	    resizeloop(WI, RB, Prev,{Min1,Max1},{Min2,Max2},{Min3,Max3});
+	    resizeloop(WI, RB, Y, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
+	{gs,_,motion,_,_} when RB =:= 'RB2' ->
+	    resizeloop(WI, RB, Prev, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
 	 
-	{gs,_,motion,_,[X,_]} when RB=='RB3', X>Min3,X<Max3 ->
+	{gs,_,motion,_,[X,_]} when RB =:= 'RB3', X > Min3, X < Max3 ->
 	    gs:config('RB3', {x,X}),
-	    resizeloop(WI, RB, X, {Min1,Max1},{Min2,Max2},{Min3,Max3});
-	{gs,_,motion,_,_} when RB=='RB3' ->
-	    resizeloop(WI, RB, Prev,{Min1,Max1},{Min2,Max2},{Min3,Max3});
+	    resizeloop(WI, RB, X, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
+	{gs,_,motion,_,_} when RB =:= 'RB3' ->
+	    resizeloop(WI, RB, Prev, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
 	
 	{gs,_,buttonrelease,_,_} ->
 	    resize_win(WI, RB, Prev)
@@ -1329,7 +1323,7 @@ resize_win(WinInfo, 'RB1', Y) ->
     %% Resize Code, Evaluator and Binding areas
     resize_code_area(WinInfo, height, -Diff),
     if
-	S==close, Bi==close, F==open ->
+	S =:= close, Bi =:= close, F =:= open ->
 	    resize_trace_area(open, height, Diff);
 	true ->
 	    resize_eval_area(S, height, Diff),
@@ -1388,7 +1382,7 @@ rblimits('RB1',_W,H) ->
     RB2 = gs:read('RB2',height),
     FF = gs:read('TraceArea',height),
     Max = case RB2 of
-	      0 when FF/=0 ->
+	      0 when FF =/= 0 ->
 		  H-112;
 	      _ ->
 		  Y = gs:read('RB2',y),
@@ -1397,18 +1391,14 @@ rblimits('RB1',_W,H) ->
     
     {Min,Max};
 rblimits('RB2',_W,H) ->
-
-    %% TraceFrame should not have height <100
+    %% TraceFrame should not have height < 100
     Max = H-112,
-    
     %% Min is decided by a minimum distance to 'RB1'
     Y = gs:read('RB1',y),
     Min = erlang:min(Max,Y+140),
-    
     {Min,Max};
 
 rblimits('RB3',W,_H) ->
-    
     %% Neither CodeArea nor BindArea should occupy 
     %% less than 1/3 of the total window width and EvalFrame should
     %% be at least 289 pixels wide
@@ -1484,7 +1474,7 @@ helpwin_action(gotoline, default, AttPid, _Editor, Data, Win) ->
     end,
     Data;
 helpwin_action(search, case_sensitive, _AttPid, _Ed, {Pos, CS}, _Win) ->
-    Bool = if CS==true -> false; CS==false -> true end,
+    Bool = if CS =:= true -> false; CS =:= false -> true end,
     {Pos, Bool};
 helpwin_action(search, default, _AttPid, Editor, {Pos, CS}, Win) ->
     gs:config(lbl(Win), {label, {text, ""}}),
@@ -1517,13 +1507,9 @@ search(Str, Editor, Max, {Row, Col}, CS) ->
 
 lowercase(true, Str) -> Str;
 lowercase(false, Str) ->
-    lists:map(fun(Char) ->
-		      if
-			  Char>=$A, Char=<$Z -> Char+32;
-			  true -> Char
-		      end
-	      end,
-	      Str).
+    [if Char >= $A, Char =< $Z -> Char+32;
+	true -> Char
+     end || Char <- Str].
 
 mark_string(Editor, {Row, Col}, Str) ->
     Between = {{Row,Col}, {Row,Col+length(Str)}},
@@ -1540,10 +1526,9 @@ unmark_string(Editor, {Row, Col}) ->
 		       {fg, {Between, black}}]).
 
 helpwin(Type, GS, {X, Y}) ->
-    W = 200, Pad=10, Wbtn = 50,
+    W = 200, Pad = 10, Wbtn = 50,
 
-    Title =
-	case Type of search -> "Search"; gotoline -> "Go To Line" end,
+    Title = case Type of search -> "Search"; gotoline -> "Go To Line" end,
     Win = gs:window(GS, [{title, Title}, {x, X}, {y, Y}, {width, W},
 			 {destroy, true}]),
     
diff --git a/lib/debugger/src/dbg_ui_view.erl b/lib/debugger/src/dbg_ui_view.erl
index 075275f196..7350a830a8 100644
--- a/lib/debugger/src/dbg_ui_view.erl
+++ b/lib/debugger/src/dbg_ui_view.erl
@@ -21,9 +21,6 @@
 %% External exports
 -export([start/2]).
 
-%% Internal exports
--export([init/3]).
-
 -record(state, {gs,                % term() Graphics system id
 		win,               % term() Attach process window data
 		coords,            % {X,Y} Mouse point position
@@ -42,7 +39,7 @@ start(GS, Mod) ->
     Title = "View Module " ++ atom_to_list(Mod),
     case dbg_ui_winman:is_started(Title) of
 	true -> ignore;
-	false -> spawn(?MODULE, init, [GS, Mod, Title])
+	false -> spawn(fun () -> init(GS, Mod, Title) end)
     end.
 
 
@@ -51,7 +48,6 @@ start(GS, Mod) ->
 %%====================================================================
 
 init(GS, Mod, Title) ->
-
     %% Subscribe to messages from the interpreter
     int:subscribe(),
 
diff --git a/lib/debugger/src/dbg_ui_win.erl b/lib/debugger/src/dbg_ui_win.erl
index 74ff2503ab..9bed6a1ec5 100644
--- a/lib/debugger/src/dbg_ui_win.erl
+++ b/lib/debugger/src/dbg_ui_win.erl
@@ -24,7 +24,6 @@
 	 create_menus/2, select/2, selected/1,
 	 add_break/2, update_break/2, delete_break/1,
 	 motion/2
-	 
 	]).
 
 -record(break, {mb, smi, emi, dimi, demi}).
@@ -49,11 +48,11 @@ init() ->
 font(Style) ->
     GS = init(),
     Style2 = if
-		 Style==normal -> [];
+		 Style =:= normal -> [];
 		 true -> [Style]
 	     end,
     case gs:read(GS, {choose_font, {screen,Style2,12}}) of
-	Font when element(1, Font)==screen ->
+	Font when element(1, Font) =:= screen ->
 	    Font;
 	_ ->
 	    gs:read(GS, {choose_font, {courier,Style2,12}})
@@ -168,8 +167,7 @@ select(MenuItem, Bool) ->
 %%--------------------------------------------------------------------
 selected(Menu) ->
     Children = gs:read(Menu, children),
-    Selected = lists:filter(fun(Child) -> gs:read(Child, select) end,
-			    Children),
+    Selected = [gs:read(Child, select) || Child <- Children],
     lists:map(fun(Child) ->
 		      {text, Name} = gs:read(Child, label),
 		      list_to_atom(Name)
diff --git a/lib/debugger/src/dbg_ui_winman.erl b/lib/debugger/src/dbg_ui_winman.erl
index 71023cd0d6..398735a7ca 100644
--- a/lib/debugger/src/dbg_ui_winman.erl
+++ b/lib/debugger/src/dbg_ui_winman.erl
@@ -120,9 +120,9 @@ init(_Arg) ->
     {ok, #state{}}.
 
 handle_call({is_started, Title}, _From, State) ->
-    Reply = case lists:keysearch(Title, #win.title, State#state.wins) of
-		{value, Win} -> {true, Win#win.win};
-		false -> false
+    Reply = case lists:keyfind(Title, #win.title, State#state.wins) of
+		false -> false;
+		Win -> {true, Win#win.win}
 	    end,
     {reply, Reply, State}.
 
@@ -134,8 +134,8 @@ handle_cast({insert, Pid, Title, Win}, State) ->
 
 handle_cast({clear_process, Title}, State) ->
     OldWins = State#state.wins,
-    Wins = case lists:keysearch(Title, #win.title, OldWins) of
-		 {value, #win{owner=Pid}} ->     
+    Wins = case lists:keyfind(Title, #win.title, OldWins) of
+		 #win{owner=Pid} ->
 		   Msg = {dbg_ui_winman, destroy},
 		   Pid ! Msg,
 		   lists:keydelete(Title, #win.title, OldWins);
@@ -147,7 +147,7 @@ handle_cast({clear_process, Title}, State) ->
 handle_info({'EXIT', Pid, _Reason}, State) ->
     [Mon | _Wins] = State#state.wins,
     if
-	Pid==Mon#win.owner -> {stop, normal, State};
+	Pid =:= Mon#win.owner -> {stop, normal, State};
 	true ->
 	    Wins2 = lists:keydelete(Pid, #win.owner, State#state.wins),
 	    inform_all(Wins2),
diff --git a/lib/debugger/src/dbg_wx_break_win.erl b/lib/debugger/src/dbg_wx_break_win.erl
index 5dafb0fbe6..78733c98c8 100644
--- a/lib/debugger/src/dbg_wx_break_win.erl
+++ b/lib/debugger/src/dbg_wx_break_win.erl
@@ -206,11 +206,7 @@ handle_event(#wx{id=OKorListBox, event=#wxCommand{type=OkorDoubleClick}},
        OkorDoubleClick =:= command_listbox_doubleclicked ->
     Mod = wxComboBox:getValue(Text),
     {_, IndexL} = wxListBox:getSelections(LB),
-    Breaks = lists:map(fun(Index) ->
-			       Func = lists:nth(Index+1, Funcs),
-			       [list_to_atom(Mod) | Func]
-		       end,
-		       IndexL),
+    Breaks = [[list_to_atom(Mod)|lists:nth(Index+1, Funcs)] || Index <- IndexL],
     wxDialog:destroy(Win),
     {break, Breaks, enable};
 handle_event(#wx{id=?wxID_OK},#winInfo{win=Win,text=Text, entries=Es, trigger=Trigger}) ->
diff --git a/lib/debugger/src/dbg_wx_interpret.erl b/lib/debugger/src/dbg_wx_interpret.erl
index f711ba679d..ffcfbcf36b 100644
--- a/lib/debugger/src/dbg_wx_interpret.erl
+++ b/lib/debugger/src/dbg_wx_interpret.erl
@@ -115,11 +115,11 @@ interpret_all(Dir, [File0|Files], Mode, Window, Errors) ->
 interpret_all(_Dir, [], _Mode, _Window, []) ->
     true;
 interpret_all(Dir, [], _Mode, Window, Errors) ->
-    Msg = lists:map(fun(Name) ->		      
-			    File = filename:join(Dir, Name),
-			    Error = format_error(int:interpretable(File)),
-			    ["\n   ",Name,": ",Error]
-		    end, Errors),
+    Msg = [begin
+	       File = filename:join(Dir, Name),
+	       Error = format_error(int:interpretable(File)),
+	       ["\n   ",Name,": ",Error]
+	   end || Name <- Errors],
     All = ["Error when interpreting: ", Msg],
     dbg_wx_win:confirm(Window, lists:flatten(All)),
     true.
diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
index 3f55c38d35..6bdec994b1 100644
--- a/lib/debugger/src/dbg_wx_mon.erl
+++ b/lib/debugger/src/dbg_wx_mon.erl
@@ -170,7 +170,7 @@ init2(CallingPid, Mode, SFile, GS) ->
     CallingPid ! {initialization_complete, self()},
 
     if
-	SFile==default ->
+	SFile =:= default ->
 	    loop(State3);
 	true ->
 	    loop(load_settings(SFile, State3))
@@ -268,7 +268,7 @@ gui_cmd(ignore, State) ->
     State;
 gui_cmd(stopped, State) ->
     if
-	State#state.starter==true -> int:stop();
+	State#state.starter =:= true -> int:stop();
 	true -> int:auto_attach(false)
     end,
     exit(stop);
@@ -420,9 +420,9 @@ gui_cmd({'Trace Window', TraceWin}, State) ->
     State2;
 gui_cmd({'Auto Attach', When}, State) ->
     if
-	When==[] -> int:auto_attach(false);
+	When =:= [] -> int:auto_attach(false);
 	true ->
-	    Flags = lists:map(fun(Name) -> map(Name) end, When),
+	    Flags = [map(Name) || Name <- When],
 	    int:auto_attach(Flags, trace_function(State))
     end,
     State;
@@ -691,12 +691,12 @@ load_settings2(Settings, State) ->
 			      Break,
 			  int:break(Mod, Line),
 			  if
-			      Status==inactive ->
+			      Status =:= inactive ->
 				  int:disable_break(Mod, Line);
 			      true -> ignore
 			  end,
 			  if
-			      Action/=enable ->
+			      Action =/= enable ->
 				  int:action_at_break(Mod,Line,Action);
 			      true -> ignore
 			  end,
@@ -715,10 +715,7 @@ save_settings(SFile, State) ->
 		int:auto_attach(),
 		int:stack_trace(),
 		State#state.backtrace,
-		lists:map(fun(Mod) ->
-				  int:file(Mod)
-			  end,
-			  int:interpreted()),
+		[int:file(Mod) || Mod <- int:interpreted()],
 		int:all_breaks()},
 
     Binary = term_to_binary({debugger_settings, Settings}),
@@ -741,7 +738,7 @@ registered_name(Pid) ->
 
     Node = node(Pid),
     if
-	Node==node() ->
+	Node =:= node() ->
 	    case erlang:process_info(Pid, registered_name) of
 		{registered_name, Name} -> Name;
 		_ -> undefined
diff --git a/lib/debugger/src/dbg_wx_mon_win.erl b/lib/debugger/src/dbg_wx_mon_win.erl
index 8ad4f4213f..04c3501b8c 100644
--- a/lib/debugger/src/dbg_wx_mon_win.erl
+++ b/lib/debugger/src/dbg_wx_mon_win.erl
@@ -266,8 +266,7 @@ select(MenuItem, Bool) ->
 add_module(WinInfo, MenuName, Mod) ->
     Win = WinInfo#winInfo.window,
     Modules = WinInfo#winInfo.modules,
-    case lists:keysearch(Mod, #moduleInfo.module, Modules) of
-	{value, _ModInfo} -> WinInfo;
+    case lists:keymember(Mod, #moduleInfo.module, Modules) of
 	false ->
 	    %% Create a menu for the module
 	    Menu = get(MenuName),
@@ -284,8 +283,9 @@ add_module(WinInfo, MenuName, Mod) ->
 	    wxListBox:append(WinInfo#winInfo.listbox, atom_to_list(Mod)),
 	    
 	    ModInfo = #moduleInfo{module=Mod, menubtn={Menu,MenuBtn}},
-	    WinInfo#winInfo{modules=[ModInfo | Modules]}
-    end.
+	    WinInfo#winInfo{modules=[ModInfo | Modules]};
+	true -> WinInfo
+   end.
     
 %%--------------------------------------------------------------------
 %% delete_module(WinInfo, Mod) -> WinInfo
@@ -559,8 +559,7 @@ handle_event(#wx{event=#wxCommand{type=command_checkbox_clicked}},
 handle_event(#wx{event=#wxList{type=command_list_item_selected,
 			       itemIndex=Row}}, WinInfo) ->
     #winInfo{processes=Pids} = WinInfo,
-    {value, #procInfo{pid=Pid}} = 
-	lists:keysearch(Row, #procInfo.row, Pids),
+    #procInfo{pid=Pid} = lists:keyfind(Row, #procInfo.row, Pids),
     {focus, Pid, WinInfo#winInfo{focus=Row}};
 handle_event(#wx{event=#wxList{type=command_list_item_activated}}, 
 	     _WinInfo) ->
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl
index f9fdf593c4..6675ea33e7 100644
--- a/lib/debugger/src/dbg_wx_trace.erl
+++ b/lib/debugger/src/dbg_wx_trace.erl
@@ -180,12 +180,12 @@ init_contents(Breaks, State) ->
 
     State#state{win=Win}.
 
-loop(#state{meta=Meta} = State) ->
+loop(#state{meta=Meta, win=Win} = State) ->
     receive
 	%% From the GUI main window
-	GuiEvent when element(1, GuiEvent)==wx ->
+	GuiEvent when element(1, GuiEvent) =:= wx ->
 	    Cmd = wx:batch(fun() -> 
-				   dbg_wx_trace_win:handle_event(GuiEvent,State#state.win)
+				   dbg_wx_trace_win:handle_event(GuiEvent,Win)
 			   end),
 	    State2 = gui_cmd(Cmd, State),
 	    loop(State2);
@@ -211,11 +211,11 @@ loop(#state{meta=Meta} = State) ->
 
 	%% From the dbg_wx_winman process (Debugger window manager)
 	{dbg_ui_winman, update_windows_menu, Data} ->
-	    Window = dbg_wx_trace_win:get_window(State#state.win),
+	    Window = dbg_wx_trace_win:get_window(Win),
 	    dbg_wx_winman:update_windows_menu(Window,Data),
 	    loop(State);
 	{dbg_ui_winman, destroy} ->
-	    dbg_wx_trace_win:stop(State#state.win),
+	    dbg_wx_trace_win:stop(Win),
 	    exit(stop)
     end.
 
@@ -269,7 +269,7 @@ gui_cmd('Continue', State) ->
     int:meta(State#state.meta, continue),
     {Status, Mod, Line} = State#state.status,
     if
-	Status==wait_break ->
+	Status =:= wait_break ->
 	    Win = dbg_wx_trace_win:unmark_line(State#state.win),
 	    gui_enable_functions(wait_running),
 	    State#state{win=Win, status={wait_running,Mod,Line}};
@@ -291,7 +291,7 @@ gui_cmd('Stop', State) ->
     int:meta(State#state.meta, stop),
     {Status, Mod, Line} = State#state.status,
     if
-	Status==wait_running ->
+	Status =:= wait_running ->
 	    Win = dbg_wx_trace_win:mark_line(State#state.win, Line,
 					     break),
 	    gui_enable_functions(wait_break),
@@ -421,7 +421,7 @@ gui_cmd('Function Break...', State) ->
 gui_cmd('Enable All', State) ->
     Breaks = int:all_breaks(),
     ThisMod = State#state.cm,
-    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod==ThisMod ->
+    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod =:= ThisMod ->
 			  int:enable_break(Mod, Line);
 		      (_Break) ->
 			  ignore
@@ -431,7 +431,7 @@ gui_cmd('Enable All', State) ->
 gui_cmd('Disable All', State) ->
     Breaks = int:all_breaks(),
     ThisMod = State#state.cm,
-    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod==ThisMod ->
+    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod =:= ThisMod ->
 			  int:disable_break(Mod, Line);
 		      (_Break) ->
 			  ignore
@@ -458,7 +458,7 @@ gui_cmd({'Trace Window', TraceWin}, State) ->
     Win = dbg_wx_trace_win:configure(State#state.win, TraceWin),
     {Status,_,_} = State#state.status,
     if
-	Status==break; Status==wait_break ->
+	Status =:= break; Status =:= wait_break ->
 	    gui_enable_btrace(Trace, State#state.stack_trace);
 	true -> ignore
     end,
@@ -467,7 +467,7 @@ gui_cmd({'Stack Trace', [Name]}, State) ->
     int:meta(State#state.meta, stack_trace, map(Name)),
     {Status,_,_} = State#state.status,
     if
-	Status==break; Status==wait_break ->
+	Status =:= break; Status =:= wait_break ->
 	    gui_enable_btrace(State#state.trace, map(Name));
 	true -> ignore
     end,
@@ -490,9 +490,9 @@ gui_cmd('Debugger', State) ->
 gui_cmd({user_command, Cmd}, State) ->
     {Status, _Mod, _Line} = State#state.status,
     if
-	Status==break;
-	Status==wait_break;
-	Status==wait_running ->
+	Status =:= break;
+	Status =:= wait_break;
+	Status =:= wait_running ->
 	    Cm = State#state.cm,
 	    Arg = case State#state.stack of
 		      {Cur, Max} when Cur<Max -> {Cm, Cmd, Cur};
@@ -531,14 +531,14 @@ add_break(WI, Coords, Type, Mod, Line) ->
 
 int_cmd({interpret, Mod}, State) ->
     if
-	Mod==State#state.cm ->
+	Mod =:= State#state.cm ->
 	    State#state{cm_obsolete=true};
 	true ->
 	    State
     end;
 int_cmd({no_interpret, Mod}, State) ->
     if
-	Mod==State#state.cm ->
+	Mod =:= State#state.cm ->
 	    State#state{cm_obsolete=true};
 	true ->
 	    Win = dbg_wx_trace_win:remove_code(State#state.win, Mod),
@@ -584,7 +584,7 @@ meta_cmd({re_entry, dbg_ieval, eval_fun}, State) ->
 meta_cmd({re_entry, Mod, _Func}, State) ->
     Obs = State#state.cm_obsolete,
     case State#state.cm of
-	Mod when Obs==true ->
+	Mod when Obs =:= true ->
 	    Win = gui_load_module(State#state.win, Mod,State#state.pid),
 	    State#state{win=Win, cm_obsolete=false};
 	Mod -> State;
@@ -630,11 +630,11 @@ meta_cmd({func_at, Mod, Line, Cur}, State) ->
     gui_enable_functions(idle),
     dbg_wx_trace_win:display(State#state.win, idle),
     State#state{win=Win, cm=Mod, status={idle,Mod,Line}, stack=Stack};
-meta_cmd({wait_at, Mod, Line, Cur}, #state{status={Status,_,_}}=State)
-  when Status/=init, Status/=break ->
+meta_cmd({wait_at, Mod, Line, Cur}, #state{status={Status,_,_}, win=Win}=State)
+  when Status =/= init, Status =/= break ->
     Stack = {Cur,Cur},
     gui_enable_functions(wait_running),
-    dbg_wx_trace_win:display(State#state.win, {wait,Mod,Line}),
+    dbg_wx_trace_win:display(Win, {wait,Mod,Line}),
     State#state{status={wait_running,Mod,Line}, stack=Stack};
 meta_cmd({wait_at, Mod, Line, Cur}, State) ->
     Stack = {Cur,Cur},
@@ -675,7 +675,7 @@ meta_cmd({stack_trace, Flag}, State) ->
     gui_enable_updown(Flag, State#state.stack),
     {Status,_,_} = State#state.status,
     if
-	Status==break; Status==wait_break ->
+	Status =:= break; Status =:= wait_break ->
 	    gui_enable_btrace(State#state.trace, Flag);
 	true -> ignore
     end,
@@ -813,7 +813,7 @@ gui_enable_functions(Status) ->
 gui_enable_updown(Flag, Stack) ->
     {Enable, Disable} =
 	if
-	    Flag==false -> {[], ['Up', 'Down']};
+	    Flag =:= false -> {[], ['Up', 'Down']};
 	    true ->
 		case Stack of
 		    {1,1} -> {[], ['Up', 'Down']};
@@ -826,14 +826,14 @@ gui_enable_updown(Flag, Stack) ->
     dbg_wx_trace_win:enable(Enable, true),
     dbg_wx_trace_win:enable(Disable, false),
     if
-	Enable==[] -> dbg_wx_trace_win:enable(['Where'], false);
+	Enable =:= [] -> dbg_wx_trace_win:enable(['Where'], false);
 	true -> dbg_wx_trace_win:enable(['Where'], true)
     end.
 
 gui_enable_btrace(Trace, StackTrace) ->
     Bool = if
-	       Trace==false -> false;
-	       StackTrace==false -> false;
+	       Trace =:= false -> false;
+	       StackTrace =:= false -> false;
 	       true -> true
 	   end,
     dbg_wx_trace_win:enable(['Back Trace'], Bool).
diff --git a/lib/debugger/src/dbg_wx_trace_win.erl b/lib/debugger/src/dbg_wx_trace_win.erl
index 2b4a1164ad..720b913024 100755
--- a/lib/debugger/src/dbg_wx_trace_win.erl
+++ b/lib/debugger/src/dbg_wx_trace_win.erl
@@ -410,11 +410,11 @@ clear_breaks(WinInfo) ->
     clear_breaks(WinInfo, all).
 clear_breaks(WinInfo, Mod) ->
     Remove = if
-		 Mod==all -> WinInfo#winInfo.breaks;
+		 Mod =:= all -> WinInfo#winInfo.breaks;
 		 true ->
 		     lists:filter(fun(#breakInfo{point={Mod2,_L}}) ->
 					  if
-					      Mod2==Mod -> true;
+					      Mod2 =:= Mod -> true;
 					      true -> false
 					  end
 				  end,
@@ -481,8 +481,8 @@ display(#winInfo{window=Win, sb=Sb},Arg) ->
 %% Note: remove_code/2 should not be used for currently shown module.
 %%--------------------------------------------------------------------
 is_shown(WinInfo, Mod) ->
-    case lists:keysearch(Mod, 1, WinInfo#winInfo.editors) of
-	{value, {Mod, Editor}} ->
+    case lists:keyfind(Mod, 1, WinInfo#winInfo.editors) of
+	{Mod, Editor} ->
 	    gs:config(Editor, raise),  %% BUGBUG
 	    {true, WinInfo#winInfo{editor={Mod, Editor}}};
 	false -> false
@@ -494,7 +494,7 @@ show_code(WinInfo = #winInfo{editor={_, Ed}}, Mod, Contents) ->
     
     lists:foreach(fun(BreakInfo) ->
 			  case BreakInfo#breakInfo.point of
-			      {Mod2, Line} when Mod2==Mod ->
+			      {Mod2, Line} when Mod2 =:= Mod ->
 				  Status = BreakInfo#breakInfo.status,
 				  dbg_wx_code:add_break_to_code(Ed, Line,Status);
 			      _Point -> ignore
@@ -540,10 +540,10 @@ select_line(WinInfo, Line) ->
     %% help window, it must be checked that it is correct
     Size = dbg_wx_code:get_no_lines(Ed),
     if
-	Line==0 ->
+	Line =:= 0 ->
 	    dbg_wx_code:goto_line(Ed,1),
 	    WinInfo#winInfo{selected_line=0};
-	Line<Size ->
+	Line < Size ->
 	    dbg_wx_code:goto_line(Ed,Line),
 	    WinInfo#winInfo{selected_line=Line};
 	true ->
@@ -764,8 +764,8 @@ handle_event(#wx{event=#wxStyledText{type=stc_doubleclick}},
 	     WinInfo = #winInfo{editor={Mod,Ed}}) ->
     Line = wxStyledTextCtrl:getCurrentLine(Ed),
     Point = {Mod, Line+1},
-    case lists:keysearch(Point, #breakInfo.point,WinInfo#winInfo.breaks) of
-	{value, _BreakInfo} -> {break, Point, delete};
+    case lists:keymember(Point, #breakInfo.point, WinInfo#winInfo.breaks) of
+	true -> {break, Point, delete};
 	false -> {break, Point, add}
     end;
 
@@ -837,7 +837,7 @@ handle_event(#wx{id=?SEARCH_ENTRY, event=#wxCommand{cmdString=Str}},
 
 %% Button area
 handle_event(#wx{id=ID, event=#wxCommand{type=command_button_clicked}},_Wi) ->
-    {value, {Button, _}} = lists:keysearch(ID, 2, buttons()),
+    {Button, _} = lists:keyfind(ID, 2, buttons()),
     Button;
 
 %% Evaluator area
@@ -908,8 +908,8 @@ buttons() ->
      {'Where',?WhereButton}, {'Up',?UpButton}, {'Down',?DownButton}].
 
 is_button(Name) ->
-    case lists:keysearch(Name, 1, buttons()) of
-	{value, {Name, Button}} -> {true, Button};
+    case lists:keyfind(Name, 1, buttons()) of
+	{Name, Button} -> {true, Button};
 	false -> false
     end.
 
diff --git a/lib/debugger/src/dbg_wx_view.erl b/lib/debugger/src/dbg_wx_view.erl
index 6d34e5650c..8ff89a4847 100644
--- a/lib/debugger/src/dbg_wx_view.erl
+++ b/lib/debugger/src/dbg_wx_view.erl
@@ -23,9 +23,6 @@
 %% External exports
 -export([start/2]).
 
-%% Internal exports
--export([init/4]).
-
 -record(state, {gs,                % term() Graphics system id
 		win,               % term() Attach process window data
 		coords,            % {X,Y} Mouse point position
@@ -46,7 +43,7 @@ start(GS, Mod) ->
 	true -> ignore;
 	false -> 
 	    Env = wx:get_env(),
-	    spawn_link(?MODULE, init, [GS, Env, Mod, Title])
+	    spawn_link(fun () -> init(GS, Env, Mod, Title) end)
     end.
 
 
@@ -84,7 +81,7 @@ loop(State) ->
     receive
 
 	%% From the GUI main window
-	GuiEvent when element(1, GuiEvent)==wx ->
+	GuiEvent when element(1, GuiEvent) =:= wx ->
 	    Cmd = wx:batch(fun() -> 
 				   dbg_wx_trace_win:handle_event(GuiEvent, State#state.win)
 			   end),
@@ -167,7 +164,7 @@ gui_cmd('Function Break...', State) ->
 gui_cmd('Enable All', State) ->
     Breaks = int:all_breaks(),
     ThisMod = State#state.mod,
-    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod==ThisMod ->
+    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod =:= ThisMod ->
 			  int:enable_break(Mod, Line);
 		      (_Break) ->
 			  ignore
@@ -177,7 +174,7 @@ gui_cmd('Enable All', State) ->
 gui_cmd('Disable All', State) ->
     Breaks = int:all_breaks(),
     ThisMod = State#state.mod,
-    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod==ThisMod ->
+    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod =:= ThisMod ->
 			  int:disable_break(Mod, Line);
 		      (_Break) ->
 			  ignore
@@ -214,21 +211,19 @@ add_break(GS, Coords, Type, Mod, Line) ->
 
 %%--Commands from the interpreter-------------------------------------
 
-int_cmd({new_break, {{Mod,_Line},_Options}=Break}, #state{mod=Mod}=State) ->
-    Win = dbg_wx_trace_win:add_break(State#state.win, 'Break', Break),
-    State#state{win=Win};
-int_cmd({delete_break, {Mod,_Line}=Point}, #state{mod=Mod}=State) ->
-    Win = dbg_wx_trace_win:delete_break(State#state.win, Point),
-    State#state{win=Win};
-int_cmd({break_options, {{Mod,_Line},_Options}=Break}, #state{mod=Mod}=State) ->
-    Win = dbg_wx_trace_win:update_break(State#state.win, Break),
-    State#state{win=Win};
-int_cmd(no_break, State) ->
-    Win = dbg_wx_trace_win:clear_breaks(State#state.win),
-    State#state{win=Win};
-int_cmd({no_break, _Mod}, State) ->
-    Win = dbg_wx_trace_win:clear_breaks(State#state.win),
-    State#state{win=Win};
+int_cmd({new_break, {{Mod,_Line},_Options}=Break},
+	#state{mod = Mod, win = Win}=State) ->
+    State#state{win = dbg_wx_trace_win:add_break(Win, 'Break', Break)};
+int_cmd({delete_break, {Mod,_Line}=Point},
+	#state{mod = Mod, win = Win}=State) ->
+    State#state{win = dbg_wx_trace_win:delete_break(Win, Point)};
+int_cmd({break_options, {{Mod,_Line},_Options}=Break},
+	#state{mod = Mod, win = Win}=State) ->
+    State#state{win = dbg_wx_trace_win:update_break(Win, Break)};
+int_cmd(no_break, #state{win = Win}=State) ->
+    State#state{win = dbg_wx_trace_win:clear_breaks(Win)};
+int_cmd({no_break, _Mod}, #state{win = Win}=State) ->
+    State#state{win = dbg_wx_trace_win:clear_breaks(Win)};
 int_cmd(_, State) ->
     State.
 
diff --git a/lib/debugger/src/dbg_wx_winman.erl b/lib/debugger/src/dbg_wx_winman.erl
index 1daabe3435..d0ddfeb51a 100755
--- a/lib/debugger/src/dbg_wx_winman.erl
+++ b/lib/debugger/src/dbg_wx_winman.erl
@@ -118,9 +118,9 @@ init([]) ->
     {ok, #state{}}.
 
 handle_call({is_started, Title}, _From, State) ->
-    Reply = case lists:keysearch(Title, #win.title, State#state.wins) of
-		{value, Win} -> {true, Win#win.win};
-		false -> false
+    Reply = case lists:keyfind(Title, #win.title, State#state.wins) of
+		false -> false;
+		Win -> {true, Win#win.win}
 	    end,
     {reply, Reply, State}.
 
@@ -132,8 +132,8 @@ handle_cast({insert, Pid, Title, Win}, State) ->
 
 handle_cast({clear_process, Title}, State) ->
     OldWins = State#state.wins,
-    Wins = case lists:keysearch(Title, #win.title, OldWins) of
-		 {value, #win{owner=Pid}} ->     
+    Wins = case lists:keyfind(Title, #win.title, OldWins) of
+	       #win{owner=Pid} ->
 		   Msg = {dbg_ui_winman, destroy},
 		   Pid ! Msg,
 		   lists:keydelete(Title, #win.title, OldWins);
@@ -145,7 +145,7 @@ handle_cast({clear_process, Title}, State) ->
 handle_info({'EXIT', Pid, _Reason}, State) ->
     [Mon | _Wins] = State#state.wins,
     if
-	Pid==Mon#win.owner -> {stop, normal, State};
+	Pid =:= Mon#win.owner -> {stop, normal, State};
 	true ->
 	    Wins2 = lists:keydelete(Pid, #win.owner, State#state.wins),
 	    inform_all(Wins2),
diff --git a/lib/debugger/src/i.erl b/lib/debugger/src/i.erl
index 7c2fb22946..476a53482e 100644
--- a/lib/debugger/src/i.erl
+++ b/lib/debugger/src/i.erl
@@ -31,7 +31,6 @@
 iv() ->
     Vsn = string:substr(filename:basename(code:lib_dir(debugger)), 10),
     list_to_atom(Vsn).
-    
 
 %% -------------------------------------------
 %% Start a new graphical monitor.
@@ -288,10 +287,9 @@ ia(X,Y,Z) ->
 %% -------------------------------------------
 
 ia(Pid,Fnk) ->
-    case lists:keysearch(Pid, 1, int:snapshot()) of
-	{value, _PidTuple} ->
-	    int:attach(Pid,Fnk);
-	false -> no_proc
+    case lists:keymember(Pid, 1, int:snapshot()) of
+	false -> no_proc;
+	true  -> int:attach(Pid,Fnk)
     end.
 
 ia(X,Y,Z,Fnk) ->
diff --git a/lib/debugger/src/int.erl b/lib/debugger/src/int.erl
index eeb4df4a8e..9ee2102a19 100644
--- a/lib/debugger/src/int.erl
+++ b/lib/debugger/src/int.erl
@@ -261,7 +261,7 @@ del_break_in(Mod, Func, Arity) when is_atom(Mod), is_atom(Func), is_integer(Arit
     end.
 
 first_lines(Clauses) ->
-    lists:map(fun(Clause) -> first_line(Clause) end, Clauses).
+    [first_line(Clause) || Clause <- Clauses].
 
 first_line({clause,_L,_Vars,_,Exprs}) ->
     first_line(Exprs);
@@ -469,10 +469,10 @@ contents(Mod, Pid) ->
 %%   Arity = integer()
 %%--------------------------------------------------------------------
 functions(Mod) ->
-    lists:filter(fun([module_info, _Arity]) -> false;
-		    (_Func) -> true
-		 end,
-		 dbg_iserver:call({functions, Mod})).
+    [F || F <- dbg_iserver:call({functions, Mod}), functions_1(F)].
+
+functions_1([module_info, _Arity]) -> false;
+functions_1(_Func) -> true.
 
 
 %%====================================================================
diff --git a/lib/debugger/test/Makefile b/lib/debugger/test/Makefile
new file mode 100644
index 0000000000..47e307fcf9
--- /dev/null
+++ b/lib/debugger/test/Makefile
@@ -0,0 +1,106 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1998-2010. 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%
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+MODULES= \
+	andor_SUITE \
+	bs_bincomp_SUITE \
+	bs_construct_SUITE \
+	bs_match_bin_SUITE \
+	bs_match_int_SUITE \
+	bs_match_misc_SUITE \
+	bs_match_tail_SUITE \
+	bs_utf_SUITE \
+	bug_SUITE \
+	erl_eval_SUITE \
+	dbg_ui_SUITE \
+	debugger_SUITE \
+	int_SUITE \
+	int_break_SUITE \
+	int_eval_SUITE \
+	guard_SUITE \
+	exception_SUITE \
+	fun_SUITE \
+	lc_SUITE \
+	record_SUITE \
+	trycatch_SUITE \
+	test_lib \
+	cleanup
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+INSTALL_PROGS= $(TARGET_FILES)
+
+EMAKEFILE=Emakefile
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/debugger_test
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+
+ERL_MAKE_FLAGS +=
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+
+EBIN = .
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+make_emakefile:
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
+	> $(EMAKEFILE)
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
+	>> $(EMAKEFILE)
+
+tests debug opt: make_emakefile
+	erl $(ERL_MAKE_FLAGS) -make
+
+clean:
+	rm -f $(EMAKEFILE)
+	rm -f $(TARGET_FILES) $(GEN_FILES)
+	rm -f core
+
+docs:
+
+# ----------------------------------------------------
+# Release Target
+# ----------------------------------------------------
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+
+release_tests_spec: make_emakefile
+	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) debugger.spec debugger.cover $(RELSYSDIR)
+	chmod -f -R u+w $(RELSYSDIR)
+	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+
+release_docs_spec:
diff --git a/lib/debugger/test/andor_SUITE.erl b/lib/debugger/test/andor_SUITE.erl
new file mode 100644
index 0000000000..68b2f521d6
--- /dev/null
+++ b/lib/debugger/test/andor_SUITE.erl
@@ -0,0 +1,320 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2010. 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(andor_SUITE).
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 t_andalso/1,t_orelse/1,inside/1,overlap/1,
+	 combined/1,in_case/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    ?line Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+cases() -> 
+    [t_andalso, t_orelse, inside, overlap, combined,
+     in_case].
+
+t_andalso(Config) when is_list(Config) ->
+    Bs = [true,false],
+    Ps = [{X,Y} || X <- Bs, Y <- Bs],
+    lists:foreach(fun (P) -> t_andalso_1(P) end, Ps),
+
+    ?line true = true andalso true,
+    ?line false = true andalso false,
+    ?line false = false andalso true,
+    ?line false = false andalso false,
+
+    ?line false = false andalso glurf,
+    ?line false = false andalso exit(exit_now),
+
+    ?line true = not id(false) andalso not id(false),
+    ?line false = not id(false) andalso not id(true),
+    ?line false = not id(true) andalso not id(false),
+    ?line false = not id(true) andalso not id(true),
+
+    ?line {'EXIT',{badarg,_}} = (catch not id(glurf) andalso id(true)),
+    ?line {'EXIT',{badarg,_}} = (catch not id(false) andalso not id(glurf)),
+    ?line false = id(false) andalso not id(glurf),
+    ?line false = false andalso not id(glurf),
+
+    ok.
+
+t_orelse(Config) when is_list(Config) ->
+    Bs = [true,false],
+    Ps = [{X,Y} || X <- Bs, Y <- Bs],
+    lists:foreach(fun (P) -> t_orelse_1(P) end, Ps),
+
+    ?line true = true orelse true,
+    ?line true = true orelse false,
+    ?line true = false orelse true,
+    ?line false = false orelse false,
+
+    ?line true = true orelse glurf,
+    ?line true = true orelse exit(exit_now),
+
+    ?line true = not id(false) orelse not id(false),
+    ?line true = not id(false) orelse not id(true),
+    ?line true = not id(true) orelse not id(false),
+    ?line false = not id(true) orelse not id(true),
+
+    ?line {'EXIT',{badarg,_}} = (catch not id(glurf) orelse id(true)),
+    ?line {'EXIT',{badarg,_}} = (catch not id(true) orelse not id(glurf)),
+    ?line true = id(true) orelse not id(glurf),
+    ?line true = true orelse not id(glurf),
+
+    ok.
+
+t_andalso_1({X,Y}) ->
+    io:fwrite("~w andalso ~w: ",[X,Y]),
+    V1 = echo(X) andalso echo(Y),
+    V1 = if
+	     X andalso Y -> true;
+	     true -> false
+	 end,
+    check(V1, X and Y).
+
+t_orelse_1({X,Y}) ->
+    io:fwrite("~w orelse ~w: ",[X,Y]),
+    V1 = echo(X) orelse echo(Y),
+    V1 = if
+	     X orelse Y -> true;
+	     true -> false
+	 end,
+    check(V1, X or Y).
+
+inside(Config) when is_list(Config) ->
+    ?line true = inside(-8, 1),
+    ?line false = inside(-53.5, -879798),
+    ?line false = inside(1.0, -879),
+    ?line false = inside(59, -879),
+    ?line false = inside(-11, 1.0),
+    ?line false = inside(100, 0.2),
+    ?line false = inside(100, 1.2),
+    ?line false = inside(-53.5, 4),
+    ?line false = inside(1.0, 5.3),
+    ?line false = inside(59, 879),
+    ok.
+
+inside(Xm, Ym) ->
+    X = -10.0,
+    Y = -2.0,
+    W = 20.0,
+    H = 4.0,
+    Res = inside(Xm, Ym, X, Y, W, H),
+    Res = if
+	      X =< Xm andalso Xm < X+W andalso Y =< Ym andalso Ym < Y+H -> true;
+	      true -> false
+	  end,
+    case not id(Res) of
+	Outside ->
+	    Outside = if
+			  not(X =< Xm andalso Xm < X+W andalso Y =< Ym andalso Ym < Y+H) -> true;
+			  true -> false
+		      end
+    end,
+    {Res,Xm,Ym,X,Y,W,H} = inside_guard(Xm, Ym, X, Y, W, H),
+    io:format("~p =< ~p andalso ~p < ~p andalso ~p =< ~p andalso ~p < ~p ==> ~p",
+	      [X,Xm,Xm,X+W,Y,Ym,Ym,Y+H,Res]),
+    Res.
+
+inside(Xm, Ym, X, Y, W, H) ->
+    X =< Xm andalso Xm < X+W andalso Y =< Ym andalso Ym < Y+H.
+
+inside_guard(Xm, Ym, X, Y, W, H) when X =< Xm andalso Xm < X+W
+				      andalso Y =< Ym andalso Ym < Y+H ->
+    {true,Xm,Ym,X,Y,W,H};
+inside_guard(Xm, Ym, X, Y, W, H) ->
+    {false,Xm,Ym,X,Y,W,H}.
+
+overlap(Config) when is_list(Config) ->
+    ?line true = overlap(7.0, 2.0, 8.0, 0.5),
+    ?line true = overlap(7.0, 2.0, 8.0, 2.5),
+    ?line true = overlap(7.0, 2.0, 5.3, 2),
+    ?line true = overlap(7.0, 2.0, 0.0, 100.0),
+
+    ?line false = overlap(-1, 2, -35, 0.5),
+    ?line false = overlap(-1, 2, 777, 0.5),
+    ?line false = overlap(-1, 2, 2, 10),
+    ?line false = overlap(2, 10, 12, 55.3),
+    ok.
+
+overlap(Pos1, Len1, Pos2, Len2) ->
+    Res = case Pos1 of
+	      Pos1 when (Pos2 =< Pos1 andalso Pos1 < Pos2+Len2)
+			orelse (Pos1 =< Pos2 andalso Pos2 < Pos1+Len1) ->
+		  true;
+	      Pos1 -> false
+	  end,
+    Res = (Pos2 =< Pos1 andalso Pos1 < Pos2+Len2)
+	orelse (Pos1 =< Pos2 andalso Pos2 < Pos1+Len1),
+    Res = case Pos1 of
+	      Pos1 when (Pos2 =< Pos1 andalso Pos1 < Pos2+Len2)
+			orelse (Pos1 =< Pos2 andalso Pos2 < Pos1+Len1) ->
+		  true;
+	      Pos1 -> false
+	  end,
+    id(Res).
+
+
+-define(COMB(A,B,C), (A andalso B orelse C)).
+
+combined(Config) when is_list(Config) ->
+    ?line false = comb(false, false, false),
+    ?line true = comb(false, false, true),
+    ?line false = comb(false, true, false),
+    ?line true = comb(false, true, true),
+
+    ?line false = comb(true, false, false),
+    ?line true = comb(true, true, false),
+    ?line true = comb(true, false, true),
+    ?line true = comb(true, true, true),
+
+    ?line false = comb(false, blurf, false),
+    ?line true = comb(false, blurf, true),
+    ?line true = comb(true, true, blurf),
+
+    ?line false = ?COMB(false, false, false),
+    ?line true = ?COMB(false, false, true),
+    ?line false = ?COMB(false, true, false),
+    ?line true = ?COMB(false, true, true),
+
+    ?line false = ?COMB(true, false, false),
+    ?line true = ?COMB(true, true, false),
+    ?line true = ?COMB(true, false, true),
+    ?line true = ?COMB(true, true, true),
+
+    ?line false = ?COMB(false, blurf, false),
+    ?line true = ?COMB(false, blurf, true),
+    ?line true = ?COMB(true, true, blurf),
+
+    ok.
+-undef(COMB).
+
+comb(A, B, C) ->
+    Res = A andalso B orelse C,
+    Res = if
+	      A andalso B orelse C -> true;
+	      true -> false
+	  end,
+    NotRes = if
+		 not(A andalso B orelse C) -> true;
+		 true -> false
+	     end,
+    NotRes = id(not Res),
+    Res = A andalso B orelse C,
+    Res = if
+	      A andalso B orelse C -> true;
+	      true -> false
+	  end,
+    NotRes = id(not Res),
+    Res = if
+	      A andalso B orelse C -> true;
+	      true -> false
+	  end,
+    id(Res).
+
+%% Test that a boolean expression in a case expression is properly
+%% optimized (in particular, that the error behaviour is correct).
+in_case(Config) when is_list(Config) ->
+    ?line edge_rings = in_case_1(1, 1, 1, 1, 1),
+    ?line not_loop = in_case_1(0.5, 1, 1, 1, 1),
+    ?line loop = in_case_1(0.5, 0.9, 1.1, 1, 4),
+    ?line {'EXIT',{badarith,_}} = (catch in_case_1(1, 1, 1, 1, 0)),
+    ?line {'EXIT',{badarith,_}} = (catch in_case_1(1, 1, 1, 1, nan)),
+    ?line {'EXIT',{badarg,_}} = (catch in_case_1(1, 1, 1, blurf, 1)),
+    ?line {'EXIT',{badarith,_}} = (catch in_case_1([nan], 1, 1, 1, 1)),
+    ok.
+
+in_case_1(LenUp, LenDw, LenN, Rotation, Count) ->
+    Res = in_case_1_body(LenUp, LenDw, LenN, Rotation, Count),
+    Res = in_case_1_guard(LenUp, LenDw, LenN, Rotation, Count),
+    Res.
+
+in_case_1_body(LenUp, LenDw, LenN, Rotation, Count) ->
+    case (LenUp/Count > 0.707) and (LenN/Count > 0.707) and
+	(abs(Rotation) > 0.707) of
+	true ->
+	    edge_rings;
+	false ->
+	    case (LenUp >= 1) or (LenDw >= 1) or
+		(LenN =< 1) or (Count < 4) of
+		true ->
+		    not_loop;
+		false ->
+		    loop
+	    end
+    end.
+
+in_case_1_guard(LenUp, LenDw, LenN, Rotation, Count) ->
+    case (LenUp/Count > 0.707) andalso (LenN/Count > 0.707) andalso
+	(abs(Rotation) > 0.707) of
+	true -> edge_rings;
+	false when LenUp >= 1 orelse LenDw >= 1 orelse
+	LenN =< 1 orelse Count < 4 -> not_loop;
+	false -> loop
+    end.
+
+check(V1, V0) ->
+    if V1 /= V0 ->
+	    io:fwrite("error: ~w.\n", [V1]),
+	    ?t:fail();
+       true ->
+	    io:fwrite("ok: ~w.\n", [V1])
+    end.
+
+echo(X) ->
+    io:fwrite("eval(~w); ",[X]),
+    X.
+
+id(I) -> I.
diff --git a/lib/debugger/test/bs_bincomp_SUITE.erl b/lib/debugger/test/bs_bincomp_SUITE.erl
new file mode 100644
index 0000000000..f341700c3b
--- /dev/null
+++ b/lib/debugger/test/bs_bincomp_SUITE.erl
@@ -0,0 +1,126 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-2010. 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%
+%%
+
+%%
+%% Originally based on Per Gustafsson's test suite.
+%%
+
+-module(bs_bincomp_SUITE).
+
+-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,
+	 byte_aligned/1,bit_aligned/1,extended_byte_aligned/1,
+	 extended_bit_aligned/1,mixed/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [byte_aligned, bit_aligned, extended_byte_aligned,
+     extended_bit_aligned, mixed].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+byte_aligned(Config) when is_list(Config) ->
+    ?line <<"abcdefg">> = << <<(X+32)>> || <<X>> <= <<"ABCDEFG">> >>,
+    ?line <<1:32/little,2:32/little,3:32/little,4:32/little>> =
+	<< <<X:32/little>> || <<X:32>> <= <<1:32,2:32,3:32,4:32>> >>,
+    ?line <<1:32/little,2:32/little,3:32/little,4:32/little>> =
+	<< <<X:32/little>> || <<X:16>> <= <<1:16,2:16,3:16,4:16>> >>,
+  ok.
+
+bit_aligned(Config) when is_list(Config) ->
+    ?line <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>> =
+	<< <<(X+32):7>> || <<X>> <= <<"ABCDEFG">> >>,
+    ?line <<"ABCDEFG">> =
+	<< <<(X-32)>> || <<X:7>> <= <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>> >>,
+    ?line <<1:31/little,2:31/little,3:31/little,4:31/little>> =
+	<< <<X:31/little>> || <<X:31>> <= <<1:31,2:31,3:31,4:31>> >>,
+    ?line <<1:31/little,2:31/little,3:31/little,4:31/little>> =
+	<< <<X:31/little>> || <<X:15>> <= <<1:15,2:15,3:15,4:15>> >>,
+  ok.
+
+extended_byte_aligned(Config) when is_list(Config) ->
+    ?line <<"abcdefg">> = << <<(X+32)>> || X <- "ABCDEFG" >>,
+    ?line "abcdefg" = [(X+32) || <<X>> <= <<"ABCDEFG">>],
+    ?line <<1:32/little,2:32/little,3:32/little,4:32/little>> =
+	<< <<X:32/little>> || X <- [1,2,3,4] >>,
+    ?line [256,512,768,1024] =
+	[X || <<X:16/little>> <= <<1:16,2:16,3:16,4:16>>],
+  ok.
+
+extended_bit_aligned(Config) when is_list(Config) ->
+    ?line <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>> =
+	<< <<(X+32):7>> || X <- "ABCDEFG" >>,
+    ?line "ABCDEFG" = [(X-32) || <<X:7>> <= <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>>],
+    ?line <<1:31/little,2:31/little,3:31/little,4:31/little>> =
+	<< <<X:31/little>> || X <- [1,2,3,4] >>,
+    ?line [256,512,768,1024] =
+	[X || <<X:15/little>> <= <<1:15,2:15,3:15,4:15>>],
+    ok.
+
+mixed(Config) when is_list(Config) ->
+    ?line <<2,3,3,4,4,5,5,6>> =
+	<< <<(X+Y)>> || <<X>> <= <<1,2,3,4>>, <<Y>> <= <<1,2>> >>,
+    ?line <<2,3,3,4,4,5,5,6>> =
+	<< <<(X+Y)>> || <<X>> <= <<1,2,3,4>>, Y <- [1,2] >>,
+    ?line <<2,3,3,4,4,5,5,6>> =
+	<< <<(X+Y)>> || X <- [1,2,3,4], Y <- [1,2] >>,
+    ?line [2,3,3,4,4,5,5,6] =
+	[(X+Y) || <<X>> <= <<1,2,3,4>>, <<Y>> <= <<1,2>>],
+    ?line [2,3,3,4,4,5,5,6] =
+	[(X+Y) || <<X>> <= <<1,2,3,4>>, Y <- [1,2]],
+    ?line <<2:3,3:3,3:3,4:3,4:3,5:3,5:3,6:3>> =
+	<< <<(X+Y):3>> || <<X:3>> <= <<1:3,2:3,3:3,4:3>>, <<Y:3>> <= <<1:3,2:3>> >>,
+    ?line <<2:3,3:3,3:3,4:3,4:3,5:3,5:3,6:3>> =
+	<< <<(X+Y):3>> || <<X:3>> <= <<1:3,2:3,3:3,4:3>>, Y <- [1,2] >>,
+    ?line <<2:3,3:3,3:3,4:3,4:3,5:3,5:3,6:3>> =
+	<< <<(X+Y):3>> || X <- [1,2,3,4], Y <- [1,2] >>,
+    ?line [2,3,3,4,4,5,5,6] =
+	[(X+Y) || <<X:3>> <= <<1:3,2:3,3:3,4:3>>, <<Y:3>> <= <<1:3,2:3>>],
+    ?line [2,3,3,4,4,5,5,6] =
+	[(X+Y) || <<X:3>> <= <<1:3,2:3,3:3,4:3>>, Y <- [1,2]],
+    ok.
diff --git a/lib/debugger/test/bs_construct_SUITE.erl b/lib/debugger/test/bs_construct_SUITE.erl
new file mode 100644
index 0000000000..c51e7fbf4c
--- /dev/null
+++ b/lib/debugger/test/bs_construct_SUITE.erl
@@ -0,0 +1,446 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2000-2010. 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(bs_construct_SUITE).
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 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,
+	 coerce_to_float/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [test1, test2, test3, test4, test5, testf, not_used,
+     in_guard, coerce_to_float].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+big(1) ->
+    57285702734876389752897683.
+
+i(X) -> X.
+
+r(L) ->
+    lists:reverse(L).
+
+-define(T(B, L), {B, ??B, L}).
+-define(N(B), {B, ??B, unknown}).
+
+-define(FAIL(Expr), ?line {'EXIT',{badarg,_}} = (catch Expr)).
+
+l(I_13, I_big1) ->
+    [
+     ?T(<<-43>>,
+	[256-43]),
+     ?T(<<56>>,
+	[56]),
+     ?T(<<1,2>>,
+	[1, 2]),
+     ?T(<<4:4, 7:4>>,
+	[4*16+7]),
+     ?T(<<777:16/big>>,
+	[3, 9]),
+     ?T(<<777:16/little>>,
+	[9, 3]),
+     ?T(<<0.0:32/float>>,
+	[0,0,0,0]),
+     ?T(<<0.125:32/float>>,
+	[62,0,0,0]),
+     ?T(<<0.125:32/little-float>>,
+	[0,0,0,62]),
+     ?T(<<I_big1:32>>,
+	[138, 99, 0, 147]),
+     ?T(<<57285702734876389752897684:32>>,
+	[138, 99, 0, 148]),
+     ?T(<<I_big1:32/little>>,
+	r([138, 99, 0, 147])),
+     ?T(<<-1:17/unit:8>>,
+	lists:duplicate(17, 255)),
+
+     ?T(<<I_13>>,
+	[13]),
+
+     ?T(<<4:8/unit:2,5:2/unit:8>>,
+	[0, 4, 0, 5]),
+
+     ?T(<<1:1, 0:6, 1:1>>,
+	[129]),
+     ?T(<<1:1/little, 0:6/little, 1:1/little>>,
+	[129]),
+
+     ?T(<<<<1,2>>/binary>>,
+	[1, 2]),
+     ?T(<<<<1,2>>:1/binary>>,
+	[1]),
+     ?T(<<4,3,<<1,2>>:1/binary>>,
+	[4,3,1]),
+
+     ?T(<<(256*45+47)>>,
+	[47]),
+
+     ?T(<<57:0>>,
+	[]),
+
+     ?T(<<"apa">>,
+	"apa"),
+
+     ?T(<<1:3,"string",9:5>>,
+	[46,110,142,77,45,204,233]),
+
+     ?T(<<>>,
+	[]),
+
+     ?T(<<37.98:64/native-float>>,
+	native_3798()),
+
+     ?T(<<32978297842987249827298387697777669766334937:128/native-integer>>,
+	native_bignum())
+
+     ].
+
+native_3798() ->
+    case <<1:16/native>> of
+	<<0,1>> -> [64,66,253,112,163,215,10,61];
+	<<1,0>> -> [61,10,215,163,112,253,66,64]
+    end.
+
+native_bignum() ->
+    case <<1:16/native>> of
+	<<0,1>> -> [129,205,18,177,1,213,170,101,39,231,109,128,176,11,73,217];
+	<<1,0>> -> [217,73,11,176,128,109,231,39,101,170,213,1,177,18,205,129]
+    end.
+
+evaluate(Str, Vars) ->
+    {ok,Tokens,_} =
+	erl_scan:string(Str ++ " . "),
+    {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
+    case erl_eval:expr(Expr, Vars) of
+	{value, Result, _} ->
+	    Result
+    end.
+
+eval_list([], _Vars) ->
+    [];
+eval_list([{C_bin, Str, Bytes} | Rest], Vars) ->
+    case catch evaluate(Str, Vars) of
+	{'EXIT', Error} ->
+	    io:format("Evaluation error: ~p, ~p, ~p~n", [Str, Vars, Error]),
+	    exit(Error);
+	E_bin ->
+	    [{C_bin, E_bin, Str, Bytes} | eval_list(Rest, Vars)]
+    end.
+
+one_test({C_bin, E_bin, Str, Bytes}) when list(Bytes) ->
+    io:format("  ~s, ~p~n", [Str, Bytes]),
+    Bin = list_to_binary(Bytes),
+    if
+	C_bin == Bin ->
+	    ok;
+	true ->
+	    io:format("ERROR: Compiled: ~p. Expected ~p. Got ~p.~n",
+		      [Str, Bytes, binary_to_list(C_bin)]),
+	    test_server:fail(comp)
+    end,
+    if
+	E_bin == Bin ->
+	    ok;
+	true ->
+	    io:format("ERROR: Interpreted: ~p. Expected ~p. Got ~p.~n",
+		      [Str, Bytes, binary_to_list(E_bin)]),
+	    test_server:fail(comp)
+    end;
+one_test({C_bin, E_bin, Str, Result}) ->
+    io:format("  ~s ~p~n", [Str, C_bin]),
+    if
+	C_bin == E_bin ->
+	    ok;
+	true ->
+	    Arbitrary = case Result of
+			    unknown ->
+				size(C_bin);
+			    _ ->
+				Result
+			end,
+	    case equal_lists(binary_to_list(C_bin),
+			     binary_to_list(E_bin),
+			     Arbitrary) of
+		false ->
+		    io:format("ERROR: Compiled not equal to interpreted:"
+			      "~n ~p, ~p.~n",
+			      [binary_to_list(C_bin), binary_to_list(E_bin)]),
+		    test_server:fail(comp);
+		0 ->
+		    ok;
+		%% For situations where the final bits may not matter, like
+		%% for floats:
+		N when integer(N) ->
+		    io:format("Info: compiled and interpreted differ in the"
+			      " last bytes:~n ~p, ~p.~n",
+			      [binary_to_list(C_bin), binary_to_list(E_bin)]),
+		    ok
+	    end
+    end.
+
+equal_lists([], [], _) ->
+    0;
+equal_lists([], _, _) ->
+    false;
+equal_lists(_, [], _) ->
+    false;
+equal_lists([A|AR], [A|BR], R) ->
+    equal_lists(AR, BR, R);
+equal_lists(A, B, R) ->
+    if
+	length(A) /= length(B) ->
+	    false;
+	length(A) =< R ->
+	    R;
+	true ->
+	    false
+    end.
+
+%%% Simple working cases
+test1(suite) -> [];
+test1(Config) when list(Config) ->
+    ?line I_13 = i(13),
+    ?line I_big1 = big(1),
+    ?line Vars = [{'I_13', I_13},
+		  {'I_big1', I_big1}],
+    ?line lists:foreach(fun one_test/1, eval_list(l(I_13, I_big1), Vars)).
+
+%%% Misc
+
+%%% <<A:S, A:(N-S)>>
+comp(N, A, S) ->
+    M1 = (1 bsl S) - 1,
+    M2 = (1 bsl (N-S)) - 1,
+    [((A band M1) bsl (N-S)) bor (A band M2)].
+
+gen(N, S, A) ->
+    [?T(<<A:S, A:(N-S)>>, comp(N, A, S))].
+
+gen_l(N, S, A) ->
+    [?T(<<A:S/little, A:(N-S)/little>>, comp(N, A, S))].
+
+test2(suite) -> [];
+test2(Config) when list(Config) ->
+    ?line test2(0, 8, 2#10101010101010101),
+    ?line test2(0, 8, 2#1111111111).
+
+test2(End, End, _) ->
+    ok;
+test2(I, End, A) ->
+    test2(I, A),
+    test2(I+1, End, A).
+
+test2(S, A) ->
+    N = 8,
+    Vars = [{'A',A}, {'N',N}, {'S',S}],
+    io:format("Vars: ~p\n", [Vars]),
+    lists:foreach(fun one_test/1, eval_list(gen(N, S, A), Vars)),
+    lists:foreach(fun one_test/1, eval_list(gen_l(N, S, A), Vars)).
+
+%%% Tests without facit
+
+t3() ->
+    [?N(<<4711:13, 9876:13, 3:6>>),
+     ?N(<<4.57:64/float>>),
+     ?N(<<4.57:32/float>>),
+
+     ?N(<<>>)
+    ].
+
+test3(suite) -> [];
+test3(Config) when list(Config) ->
+    ?line Vars = [],
+    ?line lists:foreach(fun one_test/1, eval_list(t3(), Vars)).
+
+gen_u(N, S, A) ->
+    [?N(<<A:S, A:(N-S)>>)].
+
+gen_u_l(N, S, A) ->
+    [?N(<<A:S/little, A:(N-S)/little>>)].
+
+test4(suite) -> [];
+test4(Config) when list(Config) ->
+    ?line test4(0, 16, 2#10101010101010101),
+    ?line test4(0, 16, 2#1111111111).
+
+test4(End, End, _) ->
+    ok;
+test4(I, End, A) ->
+    test4(I, A),
+    test4(I+1, End, A).
+
+test4(S, A) ->
+    N = 16,
+    Vars = [{'A', A}, {'N', 16}, {'S', S}],
+    lists:foreach(fun one_test/1, eval_list(gen_u(N, S, A), Vars)),
+    lists:foreach(fun one_test/1, eval_list(gen_u_l(N, S, A), Vars)).
+
+gen_b(N, S, A) ->
+    [?T(<<A:S/binary-unit:1, A:(N-S)/binary-unit:1>>,
+	binary_to_list(<<A:S/binary-unit:1, A:(N-S)/binary-unit:1>>))].
+
+test5(suite) -> [];
+test5(doc) -> ["OTP-3995"];
+test5(Config) when list(Config) ->
+    ?line test5(0, 8, <<73>>),
+    ?line test5(0, 8, <<68>>).
+
+test5(End, End, _) ->
+    ok;
+test5(I, End, A) ->
+    test5(I, A),
+    test5(I+1, End, A).
+
+test5(S, A) ->
+    N = 8,
+    Vars = [{'A', A}, {'N', 8}, {'S', S}],
+    lists:foreach(fun one_test/1, eval_list(gen_b(N, S, A), Vars)).
+
+%%% Failure cases
+testf(suite) -> [];
+testf(Config) when list(Config) ->
+    ?FAIL(<<3.14>>),
+    ?FAIL(<<<<1,2>>>>),
+
+    ?FAIL(<<2.71/binary>>),
+    ?FAIL(<<24334/binary>>),
+    ?FAIL(<<24334344294788947129487129487219847/binary>>),
+
+    ?FAIL(<<<<1,2,3>>/float>>),
+
+    %% Negative field widths.
+    testf_1(-8, <<1,2,3,4,5>>),
+
+    ?FAIL(<<42:(-16)>>),
+    ?FAIL(<<3.14:(-8)/float>>),
+    ?FAIL(<<<<23,56,0,2>>:(-16)/binary>>),
+    ?FAIL(<<<<23,56,0,2>>:(2.5)/binary>>),
+    ?FAIL(<<<<23,56,0,2>>:(anka)>>),
+
+    ok.
+
+testf_1(W, B) ->
+    ?FAIL(<<42:W>>),
+    ?FAIL(<<3.14:W/float>>),
+    ?FAIL(<<B:W/binary>>).
+
+not_used(doc) ->
+    "Test that constructed binaries that are not used will still give an exception.";
+not_used(Config) when is_list(Config) ->
+    ?line ok = not_used1(3, <<"dum">>),
+    ?line ?FAIL(not_used1(3, "dum")),
+    ?line ?FAIL(not_used2(444, -2)),
+    ?line ?FAIL(not_used2(444, anka)),
+    ?line ?FAIL(not_used3(444)),
+    ok.
+
+not_used1(I, BinString) ->
+    <<I:32,BinString/binary>>,
+    ok.
+
+not_used2(I, Sz) ->
+    <<I:Sz>>,
+    ok.
+
+not_used3(I) ->
+    <<I:(-8)>>,
+    ok.
+
+in_guard(Config) when list(Config) ->
+    ?line 1 = in_guard(<<16#74ad:16>>, 16#e95, 5),
+    ?line 2 = in_guard(<<16#3A,16#F7,"hello">>, 16#3AF7, <<"hello">>),
+    ?line 3 = in_guard(<<16#FBCD:14,3.1415/float,3:2>>, 16#FBCD, 3.1415),
+    nope = in_guard(<<1>>, 42, b),
+    nope = in_guard(<<1>>, a, b),
+    nope = in_guard(<<1,2>>, 1, 1),
+    nope = in_guard(<<4,5>>, 1, 2.71),
+    nope = in_guard(<<4,5>>, 1, <<12,13>>),
+    ok.
+
+in_guard(Bin, A, B) when <<A:13,B:3>> == Bin -> 1;
+in_guard(Bin, A, B) when <<A:16,B/binary>> == Bin -> 2;
+in_guard(Bin, A, B) when <<A:14,B/float,3:2>> == Bin -> 3;
+in_guard(Bin, A, B) when {a,b,<<A:14,B/float,3:2>>} == Bin -> cant_happen;
+in_guard(_, _, _) -> nope.
+
+-define(COF(Int0),
+	?line (fun(Int) ->
+		       true = <<Int:32/float>> =:= <<(float(Int)):32/float>>,
+		       true = <<Int:64/float>> =:= <<(float(Int)):64/float>>
+			   end)(nonliteral(Int0)),
+	?line true = <<Int0:32/float>> =:= <<(float(Int0)):32/float>>,
+	?line true = <<Int0:64/float>> =:= <<(float(Int0)):64/float>>).
+
+-define(COF64(Int0),
+	?line (fun(Int) ->
+		       true = <<Int:64/float>> =:= <<(float(Int)):64/float>>
+			   end)(nonliteral(Int0)),
+	?line true = <<Int0:64/float>> =:= <<(float(Int0)):64/float>>).
+
+nonliteral(X) -> X.
+
+coerce_to_float(Config) when list(Config) ->
+    ?COF(0),
+    ?COF(-1),
+    ?COF(1),
+    ?COF(42),
+    ?COF(255),
+    ?COF(-255),
+    ?COF(38474),
+    ?COF(387498738948729893849444444443),
+    ?COF(-37489378937773899999999999999993),
+    ?COF64(298748888888888888888888888883478264866528467367364766666666666666663),
+    ?COF64(-367546729879999999999947826486652846736736476555566666663),
+    ok.
diff --git a/lib/debugger/test/bs_match_bin_SUITE.erl b/lib/debugger/test/bs_match_bin_SUITE.erl
new file mode 100644
index 0000000000..fe2a8d6698
--- /dev/null
+++ b/lib/debugger/test/bs_match_bin_SUITE.erl
@@ -0,0 +1,128 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2000-2010. 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(bs_match_bin_SUITE).
+
+-author('[email protected]').
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 byte_split_binary/1,bit_split_binary/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [byte_split_binary, bit_split_binary].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+byte_split_binary(doc) -> "Tries to split a binary at all byte-aligned positions.";
+byte_split_binary(suite) -> [];
+byte_split_binary(Config) when list(Config) ->
+    ?line L = lists:seq(0, 57),
+    ?line B = mkbin(L),
+    ?line byte_split(L, B, size(B)).
+
+byte_split(L, B, Pos) when Pos >= 0 ->
+    ?line Sz1 = Pos,
+    ?line Sz2 = size(B) - Pos,
+    ?line <<B1:Sz1/binary,B2:Sz2/binary>> = B,
+    ?line B1 = list_to_binary(lists:sublist(L, 1, Pos)),
+    ?line B2 = list_to_binary(lists:nthtail(Pos, L)),
+    ?line byte_split(L, B, Pos-1);
+byte_split(_L, _B, _) -> ok.
+
+bit_split_binary(doc) -> "Tries to split a binary at all positions.";
+bit_split_binary(suite) -> [];
+bit_split_binary(Config) when list(Config) ->
+    Fun = fun(Bin, List, SkipBef, N) ->
+		  ?line SkipAft = 8*size(Bin) - N - SkipBef,
+		  io:format("~p, ~p, ~p", [SkipBef,N,SkipAft]),
+		  ?line <<_I1:SkipBef,OutBin:N/binary-unit:1,_I2:SkipAft>> = Bin,
+		  ?line OutBin = make_bin_from_list(List, N)
+	  end,
+    ?line bit_split_binary1(Fun, erlang:md5(<<1,2,3>>)),
+    ok.
+
+bit_split_binary1(Action, Bin) ->
+    BitList = bits_to_list(binary_to_list(Bin), 16#80),
+    bit_split_binary2(Action, Bin, BitList, 0).
+
+bit_split_binary2(Action, Bin, [_|T]=List, Bef) ->
+    bit_split_binary3(Action, Bin, List, Bef, size(Bin)*8),
+    bit_split_binary2(Action, Bin, T, Bef+1);
+bit_split_binary2(_Action, _Bin, [], _Bef) -> ok.
+
+bit_split_binary3(Action, Bin, List, Bef, Aft) when Bef =< Aft ->
+    Action(Bin, List, Bef, (Aft-Bef) div 8 * 8),
+    bit_split_binary3(Action, Bin, List, Bef, Aft-8);
+bit_split_binary3(_, _, _, _, _) -> ok.
+
+make_bin_from_list(_List, 0) ->
+    mkbin([]);
+make_bin_from_list(List, N) ->
+    list_to_binary([make_int(List, 8, 0),
+		    make_bin_from_list(lists:nthtail(8, List), N-8)]).
+
+
+make_int(_List, 0, Acc) -> Acc;
+make_int([H|T], N, Acc) -> make_int(T, N-1, Acc bsl 1 bor H).
+
+bits_to_list([_H|T], 0) -> bits_to_list(T, 16#80);
+bits_to_list([H|_]=List, Mask) ->
+    [case H band Mask of
+	 0 -> 0;
+	 _ -> 1
+     end|bits_to_list(List, Mask bsr 1)];
+bits_to_list([], _) -> [].
+
+
+mkbin(L) when list(L) -> list_to_binary(L).
diff --git a/lib/debugger/test/bs_match_int_SUITE.erl b/lib/debugger/test/bs_match_int_SUITE.erl
new file mode 100644
index 0000000000..c667e7cbce
--- /dev/null
+++ b/lib/debugger/test/bs_match_int_SUITE.erl
@@ -0,0 +1,244 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2000-2010. 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(bs_match_int_SUITE).
+
+-author('[email protected]').
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 integer/1,signed_integer/1,dynamic/1,more_dynamic/1,mml/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+-import(lists, [seq/2]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [cases()].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [integer, signed_integer, dynamic, more_dynamic, mml].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(4)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+integer(suite) -> [];
+integer(Config) when list(Config) ->
+    ?line 0 = get_int(mkbin([])),
+    ?line 0 = get_int(mkbin([0])),
+    ?line 42 = get_int(mkbin([42])),
+    ?line 255 = get_int(mkbin([255])),
+    ?line 256 = get_int(mkbin([1,0])),
+    ?line 257 = get_int(mkbin([1,1])),
+    ?line 258 = get_int(mkbin([1,2])),
+    ?line 258 = get_int(mkbin([1,2])),
+    ?line 65534 = get_int(mkbin([255,254])),
+    ?line 16776455 = get_int(mkbin([255,253,7])),
+    ?line 4245492555 = get_int(mkbin([253,13,19,75])),
+    ?line Eight = [200,1,19,128,222,42,97,111],
+    ?line cmp128(Eight, uint(Eight)),
+    ?line fun_clause(catch get_int(mkbin(seq(1,5)))),
+    ok.
+
+get_int(<<I:0>>) -> I;
+get_int(<<I:8>>) -> I;
+get_int(<<I:16>>) -> I;
+get_int(<<I:24>>) -> I;
+get_int(<<I:32>>) -> I.
+
+cmp128(<<I:128>>, I) -> equal;
+cmp128(_B, _I) -> not_equal.
+
+signed_integer(suite) -> [];
+signed_integer(Config) when list(Config) ->
+    ?line {no_match,_} = sint(mkbin([])),
+    ?line {no_match,_} = sint(mkbin([1,2,3])),
+    ?line 127 = sint(mkbin([127])),
+    ?line -1 = sint(mkbin([255])),
+    ?line -128 = sint(mkbin([128])),
+    ?line 42 = sint(mkbin([42,255])),
+    ?line 127 = sint(mkbin([127,255])).
+
+sint(Bin) ->
+    case Bin of
+	<<I:8/signed>> -> I;
+	<<I:8/signed,_:3,_:5>> -> I;
+	Other -> {no_match,Other}
+    end.
+
+uint(L) -> uint(L, 0).
+uint([H|T], Acc) -> uint(T, Acc bsl 8 bor H);
+uint([], Acc) -> Acc.
+
+dynamic(Config) when list(Config) ->
+    dynamic(mkbin([255]), 8),
+    dynamic(mkbin([255,255]), 16),
+    dynamic(mkbin([255,255,255]), 24),
+    dynamic(mkbin([255,255,255,255]), 32),
+    ok.
+
+dynamic(Bin, S1) when S1 >= 0 ->
+    S2 = size(Bin) * 8 - S1,
+    dynamic(Bin, S1, S2, (1 bsl S1) - 1, (1 bsl S2) - 1),
+    dynamic(Bin, S1-1);
+dynamic(_Bin, _) -> ok.
+
+dynamic(Bin, S1, S2, A, B) ->
+%    io:format("~p ~p ~p ~p\n", [S1,S2,A,B]),
+    case Bin of
+	<<A:S1,B:S2>> ->
+	    io:format("~p ~p ~p ~p\n", [S1,S2,A,B]),
+	    ok;
+	_Other ->
+	    erlang:error(badmatch, [Bin,S1,S2,A,B])
+    end.
+
+more_dynamic(doc) -> "Extract integers at different alignments and of different sizes.";
+more_dynamic(Config) when list(Config) ->
+
+    % Unsigned big-endian numbers.
+    Unsigned  = fun(Bin, List, SkipBef, N) ->
+			SkipAft = 8*size(Bin) - N - SkipBef,
+			<<_I1:SkipBef,Int:N,_I2:SkipAft>> = Bin,
+			Int = make_int(List, N, 0)
+		end,
+    ?line more_dynamic1(Unsigned, funny_binary(42)),
+
+    % Signed big-endian numbers.
+    Signed  = fun(Bin, List, SkipBef, N) ->
+		      SkipAft = 8*size(Bin) - N - SkipBef,
+		      <<_I1:SkipBef,Int:N/signed,_I2:SkipAft>> = Bin,
+		      case make_signed_int(List, N) of
+			  Int -> ok;
+			  Other ->
+			      io:format("Bin = ~p,", [Bin]),
+			      io:format("SkipBef = ~p, N = ~p", [SkipBef,N]),
+			      io:format("Expected ~p, got ~p", [Int,Other]),
+			      ?t:fail()
+		      end
+	      end,
+    ?line more_dynamic1(Signed, funny_binary(43)),
+
+    % Unsigned little-endian numbers.
+    UnsLittle  = fun(Bin, List, SkipBef, N) ->
+			 SkipAft = 8*size(Bin) - N - SkipBef,
+			 <<_I1:SkipBef,Int:N/little,_I2:SkipAft>> = Bin,
+			 Int = make_int(big_to_little(List, N), N, 0)
+		 end,
+    ?line more_dynamic1(UnsLittle, funny_binary(44)),
+
+    % Signed little-endian numbers.
+    SignLittle  = fun(Bin, List, SkipBef, N) ->
+			  SkipAft = 8*size(Bin) - N - SkipBef,
+			  <<_I1:SkipBef,Int:N/signed-little,_I2:SkipAft>> = Bin,
+			  Little = big_to_little(List, N),
+			  Int = make_signed_int(Little, N)
+		  end,
+    ?line more_dynamic1(SignLittle, funny_binary(45)),
+
+    ok.
+
+funny_binary(N) ->
+    B0 = erlang:md5([N]),
+    {B1,_B2} = split_binary(B0, size(B0) div 2),
+    B1.
+
+more_dynamic1(Action, Bin) ->
+    BitList = bits_to_list(binary_to_list(Bin), 16#80),
+    more_dynamic2(Action, Bin, BitList, 0).
+
+more_dynamic2(Action, Bin, [_|T]=List, Bef) ->
+    more_dynamic3(Action, Bin, List, Bef, size(Bin)*8),
+    more_dynamic2(Action, Bin, T, Bef+1);
+more_dynamic2(_Action, _Bin, [], _Bef) -> ok.
+
+more_dynamic3(Action, Bin, List, Bef, Aft) when Bef =< Aft ->
+%%    io:format("~p, ~p", [Bef,Aft-Bef]),
+    Action(Bin, List, Bef, Aft-Bef),
+    more_dynamic3(Action, Bin, List, Bef, Aft-1);
+more_dynamic3(_, _, _, _, _) -> ok.
+
+big_to_little(List, N) -> big_to_little(List, N, []).
+
+big_to_little([B0,B1,B2,B3,B4,B5,B6,B7|T], N, Acc) when N >= 8 ->
+    big_to_little(T, N-8, [B0,B1,B2,B3,B4,B5,B6,B7|Acc]);
+big_to_little(List, N, Acc) -> lists:sublist(List, 1, N) ++ Acc.
+
+make_signed_int(_List, 0) -> 0;
+make_signed_int([0|_T]=List, N) -> make_int(List, N, 0);
+make_signed_int([1|_T]=List0, N) ->
+    List1 = reversed_sublist(List0, N, []),
+    List2 = two_complement_and_reverse(List1, 1, []),
+    -make_int(List2, length(List2), 0).
+
+reversed_sublist(_List, 0, Acc) -> Acc;
+reversed_sublist([H|T], N, Acc) -> reversed_sublist(T, N-1, [H|Acc]).
+
+two_complement_and_reverse([H|T], Carry, Acc) ->
+    Sum = 1-H+Carry,
+    two_complement_and_reverse(T, Sum div 2, [Sum rem 2|Acc]);
+two_complement_and_reverse([], Carry, Acc) -> [Carry|Acc].
+
+make_int(_List, 0, Acc) -> Acc;
+make_int([H|T], N, Acc) -> make_int(T, N-1, Acc bsl 1 bor H).
+
+bits_to_list([_H|T], 0) -> bits_to_list(T, 16#80);
+bits_to_list([H|_]=List, Mask) ->
+    [case H band Mask of
+	 0 -> 0;
+	 _ -> 1
+     end|bits_to_list(List, Mask bsr 1)];
+bits_to_list([], _) -> [].
+
+fun_clause({'EXIT',{function_clause,_}}) -> ok.
+mkbin(L) when list(L) -> list_to_binary(L).
+
+mml(Config) when list(Config) ->
+    ?line single_byte_binary = mml_choose(<<42>>),
+    ?line multi_byte_binary = mml_choose(<<42,43>>).
+
+mml_choose(<<_A:8>>) -> single_byte_binary;
+mml_choose(<<_A:8, _T/binary>>) -> multi_byte_binary.
diff --git a/lib/debugger/test/bs_match_misc_SUITE.erl b/lib/debugger/test/bs_match_misc_SUITE.erl
new file mode 100644
index 0000000000..e7ea355c9d
--- /dev/null
+++ b/lib/debugger/test/bs_match_misc_SUITE.erl
@@ -0,0 +1,166 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2000-2010. 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(bs_match_misc_SUITE).
+
+-author('[email protected]').
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 bound_var/1,bound_tail/1,t_float/1,little_float/1,sean/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [bound_var, bound_tail, t_float, little_float, sean].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+bound_var(doc) -> "Test matching of bound variables.";
+bound_var(Config) when list(Config) ->
+    ?line ok = bound_var(42, 13, <<42,13>>),
+    ?line nope = bound_var(42, 13, <<42,255>>),
+    ?line nope = bound_var(42, 13, <<154,255>>),
+    ok.
+
+bound_var(A, B, <<A:8,B:8>>) -> ok;
+bound_var(_, _, _) -> nope.
+
+bound_tail(doc) -> "Test matching of a bound tail.";
+bound_tail(Config) when list(Config) ->
+    ?line ok = bound_tail(<<>>, <<13,14>>),
+    ?line ok = bound_tail(<<2,3>>, <<1,1,2,3>>),
+    ?line nope = bound_tail(<<2,3>>, <<1,1,2,7>>),
+    ?line nope = bound_tail(<<2,3>>, <<1,1,2,3,4>>),
+    ?line nope = bound_tail(<<2,3>>, <<>>),
+    ok.
+
+bound_tail(T, <<_:16,T/binary>>) -> ok;
+bound_tail(_, _) -> nope.
+
+t_float(Config) when list(Config) ->
+    F = f1(),
+    G = f_one(),
+
+    ?line G = match_float(<<63,128,0,0>>, 32, 0),
+    ?line G = match_float(<<63,240,0,0,0,0,0,0>>, 64, 0),
+
+    ?line fcmp(F, match_float(<<F:32/float>>, 32, 0)),
+    ?line fcmp(F, match_float(<<F:64/float>>, 64, 0)),
+    ?line fcmp(F, match_float(<<1:1,F:32/float,127:7>>, 32, 1)),
+    ?line fcmp(F, match_float(<<1:1,F:64/float,127:7>>, 64, 1)),
+    ?line fcmp(F, match_float(<<1:13,F:32/float,127:3>>, 32, 13)),
+    ?line fcmp(F, match_float(<<1:13,F:64/float,127:3>>, 64, 13)),
+    ok.
+
+
+fcmp(F1, F2) when (F1 - F2) / F2 < 0.0000001 -> ok.
+
+match_float(Bin0, Fsz, I) ->
+    Bin = make_sub_bin(Bin0),
+    Bsz = size(Bin) * 8,
+    Tsz = Bsz - Fsz - I,
+    <<_:I,F:Fsz/float,_:Tsz>> = Bin,
+    F.
+
+little_float(Config) when list(Config) ->
+    F = f2(),
+    G = f_one(),
+
+    ?line G = match_float_little(<<0,0,0,0,0,0,240,63>>, 64, 0),
+    ?line G = match_float_little(<<0,0,128,63>>, 32, 0),
+
+    ?line fcmp(F, match_float_little(<<F:32/float-little>>, 32, 0)),
+    ?line fcmp(F, match_float_little(<<F:64/float-little>>, 64, 0)),
+    ?line fcmp(F, match_float_little(<<1:1,F:32/float-little,127:7>>, 32, 1)),
+    ?line fcmp(F, match_float_little(<<1:1,F:64/float-little,127:7>>, 64, 1)),
+    ?line fcmp(F, match_float_little(<<1:13,F:32/float-little,127:3>>, 32, 13)),
+    ?line fcmp(F, match_float_little(<<1:13,F:64/float-little,127:3>>, 64, 13)),
+
+    ok.
+
+match_float_little(Bin0, Fsz, I) ->
+    Bin = make_sub_bin(Bin0),
+    Bsz = size(Bin) * 8,
+    Tsz = Bsz - Fsz - I,
+    <<_:I,F:Fsz/float-little,_:Tsz>> = Bin,
+    F.
+
+
+make_sub_bin(Bin0) ->
+    Sz = size(Bin0),
+    Bin1 = <<37,Bin0/binary,38,39>>,
+    <<_:8,Bin:Sz/binary,_:8,_:8>> = Bin1,
+    Bin.
+
+f1() ->
+    3.1415.
+
+f2() ->
+    2.7133.
+
+f_one() ->
+    1.0.
+
+sean(Config) when list(Config) ->
+    ?line small = sean1(<<>>),
+    ?line small = sean1(<<1>>),
+    ?line small = sean1(<<1,2>>),
+    ?line small = sean1(<<1,2,3>>),
+    ?line large = sean1(<<1,2,3,4>>),
+
+    ?line small = sean1(<<4>>),
+    ?line small = sean1(<<4,5>>),
+    ?line small = sean1(<<4,5,6>>),
+    ?line {'EXIT',{function_clause,_}} = (catch sean1(<<4,5,6,7>>)),
+    ok.
+
+sean1(<<B/binary>>) when size(B) < 4 ->	small;
+sean1(<<1, _B/binary>>) -> large.
diff --git a/lib/debugger/test/bs_match_tail_SUITE.erl b/lib/debugger/test/bs_match_tail_SUITE.erl
new file mode 100644
index 0000000000..282eebcd25
--- /dev/null
+++ b/lib/debugger/test/bs_match_tail_SUITE.erl
@@ -0,0 +1,120 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2000-2010. 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(bs_match_tail_SUITE).
+
+-author('[email protected]').
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 aligned/1,unaligned/1,zero_tail/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [aligned, unaligned, zero_tail].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+aligned(doc) -> "Test aligned tails.";
+aligned(Config) when list(Config) ->
+    ?line Tail1 = mkbin([]),
+    ?line {258,Tail1} = al_get_tail_used(mkbin([1,2])),
+    ?line Tail2 = mkbin(lists:seq(1, 127)),
+    ?line {35091,Tail2} = al_get_tail_used(mkbin([137,19|Tail2])),
+
+    ?line 64896 = al_get_tail_unused(mkbin([253,128])),
+    ?line 64895 = al_get_tail_unused(mkbin([253,127|lists:seq(42, 255)])),
+
+    ?line Tail3 = mkbin(lists:seq(0, 19)),
+    ?line {0,Tail1} = get_dyn_tail_used(Tail1, 0),
+    ?line {0,Tail3} = get_dyn_tail_used(mkbin([Tail3]), 0),
+    ?line {73,Tail3} = get_dyn_tail_used(mkbin([73|Tail3]), 8),
+
+    ?line 0 = get_dyn_tail_unused(mkbin([]), 0),
+    ?line 233 = get_dyn_tail_unused(mkbin([233]), 8),
+    ?line 23 = get_dyn_tail_unused(mkbin([23,22,2]), 8),
+    ok.
+
+al_get_tail_used(<<A:16,T/binary>>) -> {A,T}.
+al_get_tail_unused(<<A:16,_T/binary>>) -> A.
+
+unaligned(doc) -> "Test that an non-aligned tail cannot be matched out.";
+unaligned(Config) when list(Config) ->
+    ?line {'EXIT',{function_clause,_}} = (catch get_tail_used(mkbin([42]))),
+    ?line {'EXIT',{{badmatch,_},_}} = (catch get_dyn_tail_used(mkbin([137]), 3)),
+    ?line {'EXIT',{function_clause,_}} = (catch get_tail_unused(mkbin([42,33]))),
+    ?line {'EXIT',{{badmatch,_},_}} = (catch get_dyn_tail_unused(mkbin([44]), 7)),
+    ok.
+
+get_tail_used(<<A:1,T/binary>>) -> {A,T}.
+
+get_tail_unused(<<A:15,_/binary>>) -> A.
+
+get_dyn_tail_used(Bin, Sz) ->
+    <<A:Sz,T/binary>> = Bin,
+    {A,T}.
+
+get_dyn_tail_unused(Bin, Sz) ->
+    <<A:Sz,_T/binary>> = Bin,
+    A.
+
+zero_tail(doc) -> "Test that zero tails are tested correctly.";
+zero_tail(Config) when list(Config) ->
+    ?line 7 = (catch test_zero_tail(mkbin([7]))),
+    ?line {'EXIT',{function_clause,_}} = (catch test_zero_tail(mkbin([1,2]))),
+    ?line {'EXIT',{function_clause,_}} = (catch test_zero_tail2(mkbin([1,2,3]))),
+    ok.
+
+test_zero_tail(<<A:8>>) -> A.
+
+test_zero_tail2(<<_A:4,_B:4>>) -> ok.
+
+mkbin(L) when list(L) -> list_to_binary(L).
diff --git a/lib/debugger/test/bs_utf_SUITE.erl b/lib/debugger/test/bs_utf_SUITE.erl
new file mode 100644
index 0000000000..b61638fa25
--- /dev/null
+++ b/lib/debugger/test/bs_utf_SUITE.erl
@@ -0,0 +1,305 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2010. 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(bs_utf_SUITE).
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_suite/1,end_per_suite/1,
+	 init_per_testcase/2,end_per_testcase/2,
+	 utf8_roundtrip/1,unused_utf_char/1,utf16_roundtrip/1,
+	 utf32_roundtrip/1,guard/1,extreme_tripping/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+-compile([no_jopt,time]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [utf8_roundtrip, unused_utf_char, utf16_roundtrip,
+     utf32_roundtrip, guard, extreme_tripping].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+utf8_roundtrip(Config) when is_list(Config) ->
+    ?line [utf8_roundtrip_1(P) || P <- utf_data()],
+    ok.
+
+utf8_roundtrip_1({Str,Bin,Bin}) ->
+    ?line Str = utf8_to_list(Bin),
+    ?line Bin = list_to_utf8(Str),
+    ?line [ok = utf8_guard(C, <<42,C/utf8>>) || C <- Str],
+    ?line [error = utf8_guard(C, <<C/utf8>>) || C <- Str],
+    ok.
+
+utf8_guard(C, Bin) when <<42,C/utf8>> =:= Bin -> ok;
+utf8_guard(_, _) -> error.
+
+utf8_to_list(<<C/utf8,T/binary>>) ->
+    [C|utf8_to_list(T)];
+utf8_to_list(<<>>) -> [].
+
+list_to_utf8(L) ->
+    list_to_utf8(L, <<>>).
+
+list_to_utf8([H|T], Bin) ->
+    list_to_utf8(T, <<Bin/binary,H/utf8>>);
+list_to_utf8([], Bin) -> Bin.
+
+unused_utf_char(Config) when is_list(Config) ->
+    [true = utf8_len(Utf8) =:= length(Str) ||
+	{Str,Utf8} <- utf_data()],
+    ok.
+
+utf8_len(B) ->
+    utf8_len(B, 0).
+
+utf8_len(<<_/utf8,T/binary>>, N) ->
+    utf8_len(T, N+1);
+utf8_len(<<>>, N) -> N.
+
+utf16_roundtrip(Config) when is_list(Config) ->
+    ?line {Str,Big,Big,Little,Little} = utf16_data(),
+    ?line 4 = utf16_big_len(Big),
+    ?line 4 = utf16_little_len(Little),
+    ?line Str = big_utf16_to_list(Big),
+    ?line Str = little_utf16_to_list(Little),
+
+    ?line Big = list_to_big_utf16(Str),
+    ?line Little = list_to_little_utf16(Str),
+
+    ok.
+
+utf16_big_len(B) ->
+    utf16_big_len(B, 0).
+
+utf16_big_len(<<_/utf16,T/binary>>, N) ->
+    utf16_big_len(T, N+1);
+utf16_big_len(<<>>, N) -> N.
+
+utf16_little_len(B) ->
+    utf16_little_len(B, 0).
+
+utf16_little_len(<<_/little-utf16,T/binary>>, N) ->
+    utf16_little_len(T, N+1);
+utf16_little_len(<<>>, N) -> N.
+
+list_to_big_utf16(List) ->
+    list_to_big_utf16(List, <<>>).
+
+list_to_big_utf16([H|T], Bin) ->
+    list_to_big_utf16(T, <<Bin/binary,H/utf16>>);
+list_to_big_utf16([], Bin) -> Bin.
+
+list_to_little_utf16(List) ->
+    list_to_little_utf16(List, <<>>).
+
+list_to_little_utf16([H|T], Bin) ->
+    list_to_little_utf16(T, <<Bin/binary,H/little-utf16>>);
+list_to_little_utf16([], Bin) -> Bin.
+
+big_utf16_to_list(<<H/utf16,T/binary>>) ->
+    [H|big_utf16_to_list(T)];
+big_utf16_to_list(<<>>) -> [].
+
+little_utf16_to_list(<<H/little-utf16,T/binary>>) ->
+    [H|little_utf16_to_list(T)];
+little_utf16_to_list(<<>>) -> [].
+
+utf32_roundtrip(Config) when is_list(Config) ->
+    ?line {Str,Big,Big,Little,Little} = utf32_data(),
+    ?line 4 = utf32_big_len(Big),
+    ?line 4 = utf32_little_len(Little),
+    ?line Str = big_utf32_to_list(Big),
+    ?line Str = little_utf32_to_list(Little),
+
+    ?line Big = list_to_big_utf32(Str),
+    ?line Little = list_to_little_utf32(Str),
+
+    ok.
+
+utf32_big_len(B) ->
+    utf32_big_len(B, 0).
+
+utf32_big_len(<<_/utf32,T/binary>>, N) ->
+    utf32_big_len(T, N+1);
+utf32_big_len(<<>>, N) -> N.
+
+utf32_little_len(B) ->
+    utf32_little_len(B, 0).
+
+utf32_little_len(<<_/little-utf32,T/binary>>, N) ->
+    utf32_little_len(T, N+1);
+utf32_little_len(<<>>, N) -> N.
+
+list_to_big_utf32(List) ->
+    list_to_big_utf32(List, <<>>).
+
+list_to_big_utf32([H|T], Bin) ->
+    list_to_big_utf32(T, <<Bin/binary,H/utf32>>);
+list_to_big_utf32([], Bin) -> Bin.
+
+list_to_little_utf32(List) ->
+    list_to_little_utf32(List, <<>>).
+
+list_to_little_utf32([H|T], Bin) ->
+    list_to_little_utf32(T, <<Bin/binary,H/little-utf32>>);
+list_to_little_utf32([], Bin) -> Bin.
+
+big_utf32_to_list(<<H/utf32,T/binary>>) ->
+    [H|big_utf32_to_list(T)];
+big_utf32_to_list(<<>>) -> [].
+
+little_utf32_to_list(<<H/little-utf32,T/binary>>) ->
+    [H|little_utf32_to_list(T)];
+little_utf32_to_list(<<>>) -> [].
+
+
+guard(Config) when is_list(Config) ->
+    ?line error = do_guard(16#D800),
+    ok.
+
+do_guard(C) when byte_size(<<C/utf8>>) =/= 42 -> ok;
+do_guard(C) when byte_size(<<C/utf16>>) =/= 42 -> ok;
+do_guard(C) when byte_size(<<C/utf32>>) =/= 42 -> ok;
+do_guard(_) -> error.
+
+%% The purpose of this test is to make sure that
+%% the delayed creation of sub-binaries works.
+
+extreme_tripping(Config) when is_list(Config) ->
+    ?line Unicode = lists:seq(0, 1024),
+    ?line Utf8 = unicode_to_utf8(Unicode, <<>>),
+    ?line Utf16 = utf8_to_utf16(Utf8, <<>>),
+    ?line Utf32 = utf8_to_utf32(Utf8, <<>>),
+    ?line Utf32 = utf16_to_utf32(Utf16, <<>>),
+    ?line Utf8 = utf32_to_utf8(Utf32, <<>>),
+    ?line Unicode = utf32_to_unicode(Utf32),
+    ok.
+
+unicode_to_utf8([C|T], Bin) ->
+    unicode_to_utf8(T, <<Bin/bytes,C/utf8>>);
+unicode_to_utf8([], Bin) -> Bin.
+
+utf8_to_utf16(<<C/utf8,T/binary>>, Bin) ->
+    utf8_to_utf16(T, <<Bin/bytes,C/utf16>>);
+utf8_to_utf16(<<>>, Bin) -> Bin.
+
+utf16_to_utf32(<<C/utf16,T/binary>>, Bin) ->
+    utf16_to_utf32(T, <<Bin/bytes,C/utf32>>);
+utf16_to_utf32(<<>>, Bin) -> Bin.
+
+utf8_to_utf32(<<C/utf8,T/binary>>, Bin) ->
+    utf8_to_utf32(T, <<Bin/bytes,C/utf32>>);
+utf8_to_utf32(<<>>, Bin) -> Bin.
+
+utf32_to_utf8(<<C/utf32,T/binary>>, Bin) ->
+    utf32_to_utf8(T, <<Bin/bytes,C/utf8>>);
+utf32_to_utf8(<<>>, Bin) -> Bin.
+
+utf32_to_unicode(<<C/utf32,T/binary>>) ->
+    [C|utf32_to_unicode(T)];
+utf32_to_unicode(<<>>) -> [].
+
+utf_data() ->
+%% From RFC-3629.
+
+    %% Give the compiler a change to do some constant propagation.
+    NotIdentical = 16#2262,
+
+    [
+     %% "A<NOT IDENTICAL TO><ALPHA>."
+     {[16#0041,NotIdentical,16#0391,16#002E],
+      <<16#0041/utf8,NotIdentical/utf8,16#0391/utf8,16#002E/utf8>>,
+      <<16#41,16#E2,16#89,16#A2,16#CE,16#91,16#2E>>},
+
+     %% Korean "hangugeo" (meaning "the Korean language")
+     {[16#D55C,16#AD6D,16#C5B4],
+      <<16#D55C/utf8,16#AD6D/utf8,16#C5B4/utf8>>,
+      <<16#ED,16#95,16#9C,16#EA,16#B5,16#AD,16#EC,16#96,16#B4>>},
+
+     %% Japanese "nihongo" (meaning "the Japanese language").
+     {[16#65E5,16#672C,16#8A9E],
+      <<16#65E5/utf8,16#672C/utf8,16#8A9E/utf8>>,
+      <<16#E6,16#97,16#A5,16#E6,16#9C,16#AC,16#E8,16#AA,16#9E>>}
+    ].
+
+utf16_data() ->
+    %% Example from RFC-2781. "*=Ra", where "*" represents a
+    %% hypothetical Ra hieroglyph (code point 16#12345).
+
+    %% Give the compiler a change to do some constant propagation.
+    RaHieroglyph = 16#12345,
+
+    %% First as a list of Unicode characters.
+    {[RaHieroglyph,16#3D,16#52,16#61],
+
+     %% Big endian (the two binaries should be equal).
+     <<RaHieroglyph/big-utf16,16#3D/big-utf16,16#52/big-utf16,16#61/big-utf16>>,
+     <<16#D8,16#08,16#DF,16#45,16#00,16#3D,16#00,16#52,16#00,16#61>>,
+
+     %% Little endian (the two binaries should be equal).
+     <<RaHieroglyph/little-utf16,16#3D/little-utf16,
+      16#52/little-utf16,16#61/little-utf16>>,
+     <<16#08,16#D8,16#45,16#DF,16#3D,16#00,16#52,16#00,16#61,16#00>>}.
+
+utf32_data() ->
+    %% "A<NOT IDENTICAL TO><ALPHA>."
+    NotIdentical = 16#2262,
+    {[16#0041,NotIdentical,16#0391,16#002E],
+
+     %% Big endian.
+     <<16#0041/utf32,NotIdentical/utf32,16#0391/utf32,16#002E/utf32>>,
+     <<16#41:32,NotIdentical:32,16#0391:32,16#2E:32>>,
+
+     %% Little endian.
+     <<16#0041/little-utf32,NotIdentical/little-utf32,
+      16#0391/little-utf32,16#002E/little-utf32>>,
+     <<16#41:32/little,NotIdentical:32/little,
+      16#0391:32/little,16#2E:32/little>>}.
diff --git a/lib/debugger/test/bug_SUITE.erl b/lib/debugger/test/bug_SUITE.erl
new file mode 100644
index 0000000000..d881b9ab08
--- /dev/null
+++ b/lib/debugger/test/bug_SUITE.erl
@@ -0,0 +1,95 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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(bug_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+
+-export([otp2163/1, otp4845/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, ticket_tests}].
+
+groups() -> 
+    [{ticket_tests, [], [otp2163, otp4845]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+
+otp2163(doc) -> ["BIF exit reason"];
+otp2163(suite) -> [];
+otp2163(Config) when list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+
+    %% First compile and get the expected results:
+
+    ?line FileName = filename:join(DataDir, "otp2163"),
+    ?line {module,otp2163} = code:load_abs(FileName),
+
+    ?line {'EXIT',{badarg,[ApplyRes|_]}} = (catch otp2163:apply_test()),
+    ?line {'EXIT',{badarg,[ListRes|_]}} = (catch otp2163:list_to_atom_test()),
+
+    %% Then interpret, and check if the results are OK.
+    ?line {module,otp2163} = int:i(FileName),
+
+    ?line ok = io:format("Expecting ~p", [ApplyRes]),
+    ?line {'EXIT',{badarg,[ApplyRes|_]}} = (catch otp2163:apply_test()),
+    ?line ok = io:format("Expecting ~p", [ListRes]),
+    ?line {'EXIT',{badarg,[ListRes|_]}} = (catch otp2163:list_to_atom_test()),
+    ok.
+
+
+otp4845(doc) -> ["BIF not loading and not bug compatible, OTP-4845 OTP-4859"];
+otp4845(suite) -> [];
+otp4845(Config) when list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+
+    %% First compile and get the expected results:
+
+    ?line FileName = filename:join(DataDir, "otp4845"),
+    ?line {module,otp4845} = code:load_abs(FileName),
+
+    ?line CompiledRes = (catch otp4845:test()),
+    ?line ok = io:format("Compiled ~p", [CompiledRes]),
+
+    %% Then interpret, and check if the results are OK.
+    ?line {module,otp4845} = int:i(FileName),
+
+    ?line IntRes = (catch otp4845:test()),
+    ?line ok = io:format("Interpreted ~p", [IntRes]),
+
+    ?line CompiledRes = IntRes,
+    ok.
diff --git a/lib/debugger/test/bug_SUITE_data/Makefile.src b/lib/debugger/test/bug_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..792b3299e1
--- /dev/null
+++ b/lib/debugger/test/bug_SUITE_data/Makefile.src
@@ -0,0 +1,25 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2000-2010. 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%
+#
+all: otp2163.@EMULATOR@ otp4845.@EMULATOR@
+EFLAGS=+debug_info
+
+otp2163.@EMULATOR@: otp2163.erl
+	erlc $(EFLAGS) otp2163.erl
+otp4845.@EMULATOR@: otp4845.erl
+	erlc $(EFLAGS) otp4845.erl
diff --git a/lib/debugger/test/bug_SUITE_data/otp2163.erl b/lib/debugger/test/bug_SUITE_data/otp2163.erl
new file mode 100644
index 0000000000..4e3c487ef7
--- /dev/null
+++ b/lib/debugger/test/bug_SUITE_data/otp2163.erl
@@ -0,0 +1,60 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+
+%%
+%%% Purpose : Test OTP-2163
+
+-module(otp2163).
+
+
+-export([apply_test/0, list_to_atom_test/0, error/1]).
+-export([test/0]).
+
+apply_test() ->
+    M = {},
+    apply(M,dummy,[]).
+
+list_to_atom_test() ->
+    list_to_atom(id({1,2})).
+
+id(I) -> I.
+
+%% OTP-4845 OTP 4859
+-record(sune, {a,sd,g,s}).
+-record(error, {a,sd,g,s}).
+
+test() ->
+    sune = error(#sune{}),
+    {false,false} = error(false),
+    {true,true}  = error(true),
+    error(#error{}).
+
+error(X) ->
+    if
+	is_record(X, sune) ->
+	    sune;
+	X ->
+	    {true, X};
+	not X ->
+	    {false, X};
+	not is_record(X, error) ->
+	    error;
+	true ->
+	    ok
+    end.
diff --git a/lib/debugger/test/bug_SUITE_data/otp4845.erl b/lib/debugger/test/bug_SUITE_data/otp4845.erl
new file mode 100644
index 0000000000..18ca08b977
--- /dev/null
+++ b/lib/debugger/test/bug_SUITE_data/otp4845.erl
@@ -0,0 +1,52 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2010. 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%
+%%
+
+%%
+%%% Purpose : Test OTP-4845
+
+-module(otp4845).
+
+
+%%-export([error/1]).
+-export([test/0]).
+
+%% OTP-4845 OTP 4859
+-record(sune, {a,sd,g,s}).
+-record(error, {a,sd,g,s}).
+
+test() ->
+    R1 = error(#sune{}),
+    R2 = error(false),
+    R3 = error(true),
+    R4 = error(#error{}),
+    {R1,R2,R3,R4}.
+
+error(X) ->
+    if
+	is_record(X, sune) ->
+	    sune;
+	X ->
+	    {true, X};
+	not X ->
+	    {false, X};
+	not is_record(X, error) ->
+	    error;
+	true ->
+	    ok
+    end.
diff --git a/lib/debugger/test/cleanup.erl b/lib/debugger/test/cleanup.erl
new file mode 100644
index 0000000000..5f1ea71d2e
--- /dev/null
+++ b/lib/debugger/test/cleanup.erl
@@ -0,0 +1,56 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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(cleanup).
+
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, cleanup/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+all() -> 
+[cleanup].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+cleanup(suite) -> [];
+cleanup(_) ->
+    ?line Mods = int:interpreted(),
+    ?line ok = int:n(Mods),
+    case whereis(interpret) of
+	undefined ->
+	    ok;
+	Pid ->
+	    exit(Pid, kill)
+    end,
+    case whereis(int_db) of
+	undefined ->
+	    ok;
+	Pid2 ->
+	    exit(Pid2, kill)
+    end,
+    ok.
diff --git a/lib/debugger/test/dbg_ui_SUITE.erl b/lib/debugger/test/dbg_ui_SUITE.erl
new file mode 100644
index 0000000000..e59c23442a
--- /dev/null
+++ b/lib/debugger/test/dbg_ui_SUITE.erl
@@ -0,0 +1,269 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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(dbg_ui_SUITE).
+
+
+-include_lib("test_server/include/test_server.hrl").
+
+
+% Test server specific exports
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+
+% Test cases must be exported.
+-export ([dbg_ui/1]).
+
+% Manual test suites/cases exports
+-export([start1/1, interpret1/1, quit1/1,
+	 start2/1, interpret2/1, break2/1, options2/1, quit2/1,
+	 interpret3/1, all_step3/1,all_next3/1,save3/1,restore3/1,finish3/1,
+	 killinit3/1, killone3/1, killall3/1, deleteone3/1, deleteall3/1,
+	 viewbreak4/1, delete4/1,
+	 attach5/1, normal5/1, exit5/1, options5/1,
+	 distsetup6/1, all_step6/1, all_next6/1]).
+
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+init_per_testcase(_Func, Config) ->
+    Dog=test_server:timetrap(60*1000),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Func, Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog).
+
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [dbg_ui, {group, manual_tests}].
+
+groups() -> 
+    [{manual_tests, [],
+      [start1, interpret1, quit1, start2, interpret2, break2,
+       options2, interpret3, all_step3, all_next3, save3,
+       restore3, finish3, killinit3, killone3, killall3,
+       deleteone3, deleteall3, viewbreak4, delete4, attach5,
+       normal5, exit5, options5, distsetup6, all_step6,
+       all_next6]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+dbg_ui (doc) ->
+    ["Debugger GUI"];
+
+dbg_ui (suite) ->
+    [];
+
+dbg_ui (_Config) ->
+    case os:getenv("DISPLAY") of
+	false ->
+	    {skipped,"No display"};
+	Other when is_list(Other) ->
+%	    ?line {ok, Pid} = debugger:start (),
+%	    ?line ok = is_pid (Pid),
+%	    ?line true = erlang:is_process_alive(Pid),
+%	    ?line ok = debugger:stop(),
+%	    ?line false = erlang:is_process_alive(Pid)
+	    {skipped,"Gunilla: Workaround"}
+    end.
+
+%% check/2 - returns the result for the specified testcase.
+%% pass - means the user has run the case, and it passed
+%% fail - means the user has run the case, and it failed
+%% unknown - means the user has (tried to) run the case, and the result is unclear.
+%% skip - means the user has not yet run the case.
+
+check(Case, Config) ->
+
+    ?line DataDir = ?config(data_dir, Config),
+    ?line ResultFileName =  filename:join([DataDir, "manual_results.erl"]),
+    case file:consult(ResultFileName) of
+	{ok, Results} ->
+	    ?line io:format("Results: ~p~n",[Results]),
+	    case Results of
+		[] ->
+		    no_result;
+		%% Incomplete "sanity" check of file contents.
+		[{_Key,_Value}|_Rest] ->
+		    case lists:keysearch(Case, 1, Results) of
+			{value, {Case, Value}} ->
+			    Value;		% pass, fail, unknown
+			false ->
+			    no_result;				% skip
+			_Otherwise ->
+			    {error, "Contents of results file not valid"}
+		    end;
+		_Otherwise2 ->
+		    {error, "Contents of results file not valid"}
+	    end;
+	_Otherwise3 ->
+	    {error, "Problems reading results file"}
+    end.
+
+
+
+
+
+
+-define(MAN_CASE(Name,Doc, Description),
+	Name(doc) -> [Doc];
+	Name(suite) -> [];
+	Name(Config) ->
+	       ?line io:format("Checking ~p~n",[Name]),
+	       ?line io:format("Config = ~p~n",[Config]),
+	       case check(Name, Config) of
+		   pass ->
+		       ?line ok;
+		   fail ->
+		       ?line test_server:fail("Manual test failed");
+		   unknown ->
+		       ?line {skipped, "Manual test result unknown"};
+
+		   no_result ->
+		       ?line {skipped, Description};
+
+		   {error, _Reason} ->
+%%		       Text = lists:flatten(
+%%				io_lib:format("[File problem: ~s]~s",
+%%		       [Reason,Description])),
+		       ?line {skipped, Description}
+	       end
+		  ).
+
+
+%% SET 1
+?MAN_CASE(start1, "Start the debugger from the toolbar",
+	  "Before proceeding with the test cases, please move or remove
+the directory .erlang_tools/debugger in your home directory. Next,
+please start the debugger from the toolbar").
+
+?MAN_CASE(interpret1, "Interpreting modules",
+	  "In this test case and all of the ones following, the source code
+files to use can be found in the test data directory for this debugger test
+ suite (probably in
+/clearcase/otp/tools/debugger/test/dbg_ui_SUITE_data/manual_data/src ).
+Interpret one module").
+
+?MAN_CASE(quit1, "Quit the debugger",
+"Quit the debugger using File->Exit in the main window").
+
+
+%% SET 2
+?MAN_CASE(start2, "Start the debugger from the shell",
+"Start the debugger from the shell. Use debugger:start()").
+
+?MAN_CASE(interpret2, "Interpret all modules",
+"Interpret all modules").
+
+?MAN_CASE(break2, "Set break points",
+"Set break points").
+
+?MAN_CASE(options2, "Set options to attach on break",
+"Set options to attach on break").
+
+?MAN_CASE(quit2, "Quit the debugger",
+"Quit the debugger using the close box in the main window title frame").
+
+
+%% SET3
+?MAN_CASE(interpret3, "Test attach options",
+"Start the debugger and interpret the modules [test, lists1, ordsets1]. Close the Interpret dialog. Set Attach on First Call and Attach on Break.").
+
+?MAN_CASE(all_step3, "Click Step through all evaluation",
+"In the shell, call test:test1(). Use the Step button, the Process->Step menu item and the ctrl-s shortcut to step through the *entire* execution of the call. (Approx 36 steps). Then close the Attach window. The result printed in the shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}").
+
+?MAN_CASE(all_next3,"Click Next through all evaluation",
+"Again call test:test1() in the shell. This time Use the Next button,  the Process->Next menu and the ctrl-n shortcut to quickly step over the execution of the four lines in the test1-function. The result printed in the shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}").
+
+?MAN_CASE(save3, "Save the debugger state",
+"Use File->Save Settings to save the debugger state with the name 'three.state'").
+
+?MAN_CASE(restore3,"Quit the debugger, restart and restore the state",
+"Quit the debugger. Start it again. Use File->Load Settings to restore the state saved in 'three.state'. Check that the Attach-options are the same as what you set them to in the interpret3 test case. Check that the three modules [test,lists1,ordsets1] are interpreted.").
+
+
+?MAN_CASE(finish3, "Finish the current function body",
+"Call the fucntion test:test1() from the shell. Press Finish to evaluate the remaining lines in the function. The result printed in the shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}").
+
+?MAN_CASE(killinit3,"Set up for killing and clearing processes",
+"Call test:test2() from the shell. Set a break point at the last line of test:test2. Click Continue. This should open three new attach windows. One for each spawn called in test:test2/0.   ").
+
+?MAN_CASE(killone3, "Kill a process and clear it",
+"In one of the newly openend Attach windows: select Process->Kill. A message should appear above the Code Area in the Attach window. Use Windows->Monitor to verify that the Monitor window also shows that the process has been killed. In the Monitor window: select Edit->Clear. This should do two things: 1) close/remove the window of the killed process. 2) Remove the entry of the killed process from the monitor window.").
+
+?MAN_CASE(killall3,"KIll all processes, and clear them",
+"In the Monitor window: Select Edit->Kill All. Verify that all processes have been killed (in their respective windows and in the monitor window). Windows will be raised as their processes die. Next select, Edit->Clear. All attach windows should now be closed. Their entris should also disappear from the monitor window. The shell should have reported: ** exited: killed **").
+
+?MAN_CASE(deleteone3,"Delete/uniterpret one module",
+"In the Monitor window: Select Module->test->Delete. This should remove the breakpoints set in the test module, and the test module should disappear from the Module menu.").
+
+?MAN_CASE(deleteall3,"Delete/uniterpret all modules",
+"In the Monitor window: Select Module->Delete All Modules. This should remove all modules from the Module menu. ").
+
+%% SET 4
+
+
+
+?MAN_CASE(viewbreak4, "Test the View window",
+"Restore the settings from the three.state file again. In the Monitor window: Use Module->test->View to view the source code of the test module. In the View window, select Break->Line Break and set a break at line 53. Check that it appears in the View window and in the Monitor Window Break-menu. Also in the View window, select Break->Function Break and set a break at function test:test4. Check that the break (at line 59) appears in the View Window and in the Monitor Window Break-menu.").
+
+?MAN_CASE(delete4, "Remove breaks",
+"Use the Break->Delete All function in the View window to remove all breaks in the test module. Check that they are all removed. Close the View window.").
+
+%% SET 5
+
+?MAN_CASE(attach5,"Set attach options",
+"Set the attach options to only attach on exit").
+
+?MAN_CASE(normal5, "Test normal exit",
+"Call test:test12(normal) in the shell. This should return the atom 'done', and no windows should be opened.").
+
+?MAN_CASE(exit5, "Test abnormal exit",
+"Call test:test12(crash) in the shell. This should give the error message ** exited: crash **, and an attach window should be opened highlighting the last line in the test12-function.").
+
+?MAN_CASE(options5, "Experiment with the frames in the attach window",
+"Try all possible configurations of the [Button, Evaluator, Bindings, Trace] Frames in the attach window and see that the expected frames are shown/hidden.").
+
+
+%% SET 6 (Distribution)
+
+?MAN_CASE(distsetup6,"Set up distribution",
+"Start two erlang systems [foo,bar] (with option -sname), make them aware of eachother using net_adm:ping/1. Start the debugger on foo. Interpret the modules [test, lists1, ordsets1]. Set attach on First call.  ").
+
+
+
+
+?MAN_CASE(all_step6, "Click Step through all evaluation",
+"In the bar shell, call test:test1().This should open an attach window. Use the Step button, the Process->Step menu item and the ctrl-s shortcut to step through the *entire* execution of the call. (Approx 36 steps). Then close the Attach window. The result printed in the bar shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}").
+
+?MAN_CASE(all_next6,"Click Next through all evaluation",
+"Again, in the bar shell, call test:test1(). This time Use the Next button,  the Process->Next menu and the ctrl-n shortcut to quickly step over the execution of the four lines in the test1-function. The result printed in the shell should be: {\"peter\",[1,2,4,a,b,c],\"olin\"}").
diff --git a/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/lists1.erl b/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/lists1.erl
new file mode 100644
index 0000000000..0214983c11
--- /dev/null
+++ b/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/lists1.erl
@@ -0,0 +1,469 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+
+%%
+%% Purpose : Basic lists processing functions.
+
+-module(lists1).
+
+
+-export([member/2, append/2, append/1, subtract/2, reverse/1, reverse/2,
+	 nth/2, nthtail/2, prefix/2, suffix/2, last/1,
+	 seq/2, seq/3, sum/1, duplicate/2, min/1, max/1, sublist/2, sublist/3,
+	 delete/2, sort/1, merge/2, concat/1,
+	 flatten/1, flatten/2, flat_length/1, flatlength/1,
+	 keymember/3, keysearch/3, keydelete/3, keyreplace/4,
+	 keysort/2, keymerge/3, keymap/3, keymap/4]).
+
+-export([all/2,any/2,map/2,flatmap/2,foldl/3,foldr/3,filter/2,zf/2,
+	 mapfoldl/3,mapfoldr/3,foreach/2,takewhile/2,dropwhile/2,splitwith/2]).
+-export([all/3,any/3,map/3,flatmap/3,foldl/4,foldr/4,filter/3,zf/3,
+	 mapfoldl/4,mapfoldr/4,foreach/3]).
+
+%% member(X, L) -> (true | false)
+%%  test if X is a member of the list L
+
+member(X, [X|_]) -> true;
+member(X, [_|Y]) ->
+	member(X, Y);
+member(X, []) -> false.
+
+%% append(X, Y) appends lists X and Y
+
+append(L1, L2) -> L1 ++ L2.
+
+%% append(L) appends the list of lists L
+
+append([E]) -> E;
+append([H|T]) -> H ++ append(T);
+append([]) -> [].
+
+%% subtract(List1, List2) subtract elements in List2 form List1.
+
+subtract(L1, L2) -> L1 -- L2.
+
+%% reverse(L) reverse all elements in the list L
+
+reverse(X) -> reverse(X, []).
+
+reverse([H|T], Y) ->
+    reverse(T, [H|Y]);
+reverse([], X) -> X.
+
+%% nth(N, L) returns the N`th element of the list L
+%% nthtail(N, L) returns the N`th tail of the list L
+
+nth(1, [H|T]) -> H;
+nth(N, [_|T]) when N > 1 ->
+    nth(N - 1, T).
+
+nthtail(1, [H|T]) -> T;
+nthtail(N, [H|T]) when N > 1 ->
+    nthtail(N - 1, T);
+nthtail(0, L) when list(L) -> L.
+
+%% prefix(Prefix, List) -> (true | false)
+
+prefix([X|PreTail], [X|Tail]) ->
+    prefix(PreTail, Tail);
+prefix([], List) -> true;
+prefix(_,_) -> false.
+
+
+%% suffix(Suffix, List) -> (true | false)
+
+suffix(Suffix, Suffix) -> true;
+suffix(Suffix, [_|Tail]) ->
+    suffix(Suffix, Tail);
+suffix(Suffix, []) -> false.
+
+%% last(List) returns the last element in a list.
+
+last([E]) -> E;
+last([E|Es]) ->
+    last(Es).
+
+%% seq(Min, Max) -> [Min,Min+1, ..., Max]
+%% seq(Min, Max, Incr) -> [Min,Min+Incr, ..., Max]
+%%  returns the sequence Min..Max
+%%  Min <= Max and Min and Max must be integers
+
+seq(Min, Max) when integer(Min), integer(Max), Min =< Max ->
+    seq(Min, Max, 1, []).
+
+seq(Min, Max, Incr) ->
+    seq(Min, Min + ((Max-Min) div Incr) * Incr, Incr, []).
+
+seq(Min, Min, I, L) -> [Min|L];
+seq(Min, Max, I, L) -> seq(Min, Max-I, I, [Max|L]).
+
+%% sum(L) suns the sum of the elements in L
+
+sum(L)          -> sum(L, 0).
+sum([H|T], Sum) -> sum(T, Sum + H);
+sum([], Sum)    -> Sum.
+
+%% duplicate(N, X) -> [X,X,X,.....,X]  (N times)
+%%   return N copies of X
+
+duplicate(N, X) when integer(N), N >= 0 -> duplicate(N, X, []).
+
+duplicate(0, _, L) -> L;
+duplicate(N, X, L) -> duplicate(N-1, X, [X|L]).
+
+
+%% min(L) -> returns the minimum element of the list L
+
+min([H|T]) -> min(T, H).
+
+min([H|T], Min) when H < Min -> min(T, H);
+min([_|T], Min)              -> min(T, Min);
+min([],    Min)              -> Min.
+
+%% max(L) -> returns the maximum element of the list L
+
+max([H|T]) -> max(T, H).
+
+max([H|T], Max) when H > Max -> max(T, H);
+max([_|T], Max)              -> max(T, Max);
+max([],    Max)              -> Max.
+
+%% sublist(List, Start, Length)
+%%  Returns the sub-list starting at Start of length Length.
+
+sublist(List, S, L) when L >= 0 ->
+    sublist(nthtail(S-1, List), L).
+
+sublist([H|T], L) when L > 0 ->
+    [H|sublist(T, L-1)];
+sublist(List, L) -> [].
+
+%% delete(Item, List) -> List'
+%%  Delete the first occurance of Item from the list L.
+
+delete(Item, [Item|Rest]) -> Rest;
+delete(Item, [H|Rest]) ->
+    [H|delete(Item, Rest)];
+delete(Item, []) -> [].
+
+%% sort(L) -> sorts the list L
+
+sort([X]) -> [X];
+sort([])  -> [];
+sort(X)   -> split_and_sort(X, [], []).
+
+split_and_sort([A,B|T], X, Y) ->
+    split_and_sort(T, [A|X], [B|Y]);
+split_and_sort([H], X, Y) ->
+    split_and_sort([], [H|X], Y);
+split_and_sort([], X, Y) ->
+    merge(sort(X), sort(Y), []).
+
+%% merge(X, Y) -> L
+%%  merges two sorted lists X and Y
+
+merge(X, Y) -> merge(X, Y, []).
+
+merge([H1|T1], [H2|T2], L) when H1 < H2 ->
+    merge(T1, [H2|T2], [H1|L]);
+merge(T1, [H2|T2], L) ->
+    merge(T1, T2, [H2|L]);
+merge([H|T], T2, L) ->
+    merge(T, T2, [H|L]);
+merge([], [], L) ->
+    reverse(L).
+
+%% concat(L) concatinate the list representation of the elements
+%%  in L - the elements in L can be atoms, integers of strings.
+%%  Returns a list of characters.
+
+concat(List) ->
+    flatmap(fun thing_to_list/1, List).
+
+thing_to_list(X) when integer(X) -> integer_to_list(X);
+thing_to_list(X) when float(X)	 -> float_to_list(X);
+thing_to_list(X) when atom(X)	 -> atom_to_list(X);
+thing_to_list(X) when list(X)	 -> X.		%Assumed to be a string
+
+%% flatten(List)
+%% flatten(List, Tail)
+%%  Flatten a list, adding optional tail.
+
+flatten(List) ->
+    flatten(List, [], []).
+
+flatten(List, Tail) ->
+    flatten(List, [], Tail).
+
+flatten([H|T], Cont, Tail) when list(H) ->
+    flatten(H, [T|Cont], Tail);
+flatten([H|T], Cont, Tail) ->
+    [H|flatten(T, Cont, Tail)];
+flatten([], [H|Cont], Tail) ->
+    flatten(H, Cont, Tail);
+flatten([], [], Tail) ->
+    Tail.
+
+%% flat_length(List) (undocumented can be rmove later)
+%%  Calculate the length of a list of lists.
+
+flat_length(List) -> flatlength(List).
+
+%% flatlength(List)
+%%  Calculate the length of a list of lists.
+
+flatlength(List) ->
+    flatlength(List, 0).
+
+flatlength([H|T], L) when list(H) ->
+    flatlength(H, flatlength(T, L));
+flatlength([H|T], L) ->
+    flatlength(T, L + 1);
+flatlength([], L) -> L.
+
+%% keymember(Key, Index, [Tuple])
+%% keysearch(Key, Index, [Tuple])
+%% keydelete(Key, Index, [Tuple])
+%% keyreplace(Key, Index, [Tuple], NewTuple)
+%% keysort(Index, [Tuple])
+%% keymerge(Index, [Tuple], [Tuple])
+%% keymap(Function, Index, [Tuple])
+%% keymap(Function, ExtraArgs, Index, [Tuple])
+
+keymember(Key, N, [T|Ts]) when element(N, T) == Key -> true;
+keymember(Key, N, [T|Ts]) ->
+    keymember(Key, N, Ts);
+keymember(Key, N, []) -> false.
+
+keysearch(Key, N, [H|T]) when element(N, H) == Key ->
+    {value, H};
+keysearch(Key, N, [H|T]) ->
+    keysearch(Key, N, T);
+keysearch(Key, N, []) -> false.
+
+keydelete(Key, N, [H|T]) when element(N, H) == Key -> T;
+keydelete(Key, N, [H|T]) ->
+    [H|keydelete(Key, N, T)];
+keydelete(Key, N, []) -> [].
+
+keyreplace(Key, Pos, [Tup|Tail], New) when element(Pos, Tup) == Key ->
+    [New|Tail];
+keyreplace(Key, Pos, [H|T], New) ->
+    [H|keyreplace(Key, Pos, T, New)];
+keyreplace(Key, Pos, [], New) -> [].
+
+keysort(Index, [X]) -> [X];
+keysort(Index, [])  -> [];
+keysort(Index, X)   -> split_and_keysort(X, [], [], Index).
+
+split_and_keysort([A,B|T], X, Y, Index) ->
+    split_and_keysort(T, [A|X], [B|Y], Index);
+split_and_keysort([H], X, Y, Index) ->
+    split_and_keysort([], [H|X], Y, Index);
+split_and_keysort([], X, Y, Index) ->
+    keymerge(Index, keysort(Index, X), keysort(Index, Y), []).
+
+keymerge(Index, X, Y) -> keymerge(Index, X, Y, []).
+
+keymerge(I, [H1|T1], [H2|T2], L) when element(I, H1) < element(I, H2) ->
+    keymerge(I, T1, [H2|T2], [H1|L]);
+keymerge(Index, T1, [H2|T2], L) ->
+    keymerge(Index,T1, T2, [H2|L]);
+keymerge(Index,[H|T], T2, L) ->
+    keymerge(Index,T, T2, [H|L]);
+keymerge(Index, [], [], L) ->
+    reverse(L).
+
+keymap(Fun, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, Fun(element(Index, Tup)))|keymap(Fun, Index, Tail)];
+keymap( _, _ , []) -> [].
+
+keymap(Fun, ExtraArgs, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
+    keymap(Fun, ExtraArgs, Index, Tail)];
+keymap( _, _ , _, []) -> [].
+
+%% all(Predicate, List)
+%% any(Predicate, List)
+%% map(Function, List)
+%% flatmap(Function, List)
+%% foldl(Function, First, List)
+%% foldr(Function, Last, List)
+%% filter(Predicate, List)
+%% zf(Function, List)
+%% mapfoldl(Function, First, List)
+%% mapfoldr(Function, Last, List)
+%% foreach(Function, List)
+%% takewhile(Predicate, List)
+%% dropwhile(Predicate, List)
+%% splitwith(Predicate, List)
+%%  for list programming. Function here is either a 'fun' or a tuple
+%%  {Module,Name} and we use apply/2 to evaluate. The name zf is a joke!
+%%
+%%  N.B. Unless where the functions actually needs it only foreach/2/3,
+%%  which is meant to be used for its side effects, has a defined order
+%%  of evaluation.
+%%
+%%  There are also versions with an extra argument, ExtraArgs, which is a
+%%  list of extra arguments to each call.
+
+all(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> all(Pred, Tail);
+	false -> false
+    end;
+all(Pred, []) -> true.
+
+any(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> true;
+	false -> any(Pred, Tail)
+    end;
+any(Pred, []) -> false.
+
+map(F, List) -> [ F(E) || E <- List ].
+
+flatmap(F, [Hd|Tail]) ->
+    F(Hd) ++ flatmap(F, Tail);
+flatmap(F, []) -> [].
+
+foldl(F, Accu, [Hd|Tail]) ->
+    foldl(F, F(Hd, Accu), Tail);
+foldl(F, Accu, []) -> Accu.
+
+foldr(F, Accu, [Hd|Tail]) ->
+    F(Hd, foldr(F, Accu, Tail));
+foldr(F, Accu, []) -> Accu.
+
+filter(Pred, List) -> [ E || E <- List, Pred(E) ].
+
+zf(F, [Hd|Tail]) ->
+    case F(Hd) of
+	true ->
+	    [Hd|zf(F, Tail)];
+	{true,Val} ->
+	    [Val|zf(F, Tail)];
+	false ->
+	    zf(F, Tail)
+    end;
+zf(F, []) -> [].
+
+foreach(F, [Hd|Tail]) ->
+    F(Hd),
+    foreach(F, Tail);
+foreach(F, []) -> ok.
+
+mapfoldl(F, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = F(Hd, Accu0),
+    {Rs,Accu2} = mapfoldl(F, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl(F, Accu, []) -> {[],Accu}.
+
+mapfoldr(F, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr(F, Accu0, Tail),
+    {R,Accu2} = F(Hd, Accu1),
+    {[R|Rs],Accu2};
+mapfoldr(F, Accu, []) -> {[],Accu}.
+
+takewhile(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> [Hd|takewhile(Pred, Tail)];
+	false -> []
+    end;
+takewhile(Pred, []) -> [].
+
+dropwhile(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> dropwhile(Pred, Tail);
+	false -> [Hd|Tail]
+    end;
+dropwhile(Pred, []) -> [].
+
+splitwith(Pred, List) -> splitwith(Pred, List, []).
+
+splitwith(Pred, [Hd|Tail], Taken) ->
+    case Pred(Hd) of
+	true -> splitwith(Pred, Tail, [Hd|Taken]);
+	false -> {reverse(Taken), [Hd|Tail]}
+    end;
+splitwith(Pred, [], Taken) -> {reverse(Taken),[]}.
+
+%% Versions of the above functions with extra arguments.
+
+all(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> all(Pred, Eas, Tail);
+	false -> false
+    end;
+all(Pred, Eas, []) -> true.
+
+any(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> true;
+	false -> any(Pred, Eas, Tail)
+    end;
+any(Pred, Eas, []) -> false.
+
+map(F, Eas, List) -> [ apply(F, [E|Eas]) || E <- List ].
+
+flatmap(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]) ++ flatmap(F, Eas, Tail);
+flatmap(F, Eas, []) -> [].
+
+foldl(F, Eas, Accu, [Hd|Tail]) ->
+    foldl(F, Eas, apply(F, [Hd,Accu|Eas]), Tail);
+foldl(F, Eas, Accu, []) -> Accu.
+
+foldr(F, Eas, Accu, [Hd|Tail]) ->
+    apply(F, [Hd,foldr(F, Eas, Accu, Tail)|Eas]);
+foldr(F, Eas, Accu, []) ->
+    Accu.
+
+filter(Pred, Eas, List) -> [ E || E <- List, apply(Pred, [E|Eas]) ].
+
+zf(F, Eas, [Hd|Tail]) ->
+    case apply(F, [Hd|Eas]) of
+	true ->
+	    [Hd|zf(F, Eas, Tail)];
+	{true,Val} ->
+	    [Val|zf(F, Eas, Tail)];
+	false ->
+	    zf(F, Eas, Tail)
+    end;
+zf(F, Eas, []) -> [].
+
+foreach(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]),
+    foreach(F, Eas, Tail);
+foreach(F, Eas, []) -> ok.
+
+mapfoldl(F, Eas, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = apply(F, [Hd,Accu0|Eas]),
+    {Rs,Accu2} = mapfoldl(F, Eas, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl(F, Eas, Accu, []) -> {[],Accu}.
+
+mapfoldr(F, Eas, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr(F, Eas, Accu0, Tail),
+    {R,Accu2} = apply(F, [Hd,Accu1|Eas]),
+    {[R|Rs],Accu2};
+mapfoldr(F, Eas, Accu, []) -> {[],Accu}.
+
+%% takewhile/2, dropwhile/2 and splitwith/2 do not have versions with
+%% extra arguments as this going to be discontinued.
diff --git a/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/ordsets1.erl b/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/ordsets1.erl
new file mode 100644
index 0000000000..ea72150bca
--- /dev/null
+++ b/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/ordsets1.erl
@@ -0,0 +1,188 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+
+%%
+%% Purpose : Functions for manipulating sets as ordered lists.
+
+%% As yet some of these are not very efficiently written.
+
+-module(ordsets1).
+
+-export([new_set/0,is_set/1,set_to_list/1,list_to_set/1]).
+-export([is_element/2,add_element/2,del_element/2]).
+-export([union/2,union/1,intersection/2,intersection/1]).
+-export([subtract/2,subset/2]).
+
+%% new_set()
+%%  Return a new empty ordered set.
+
+new_set() ->
+    [].
+
+%% is_set(Set)
+%%  Return 'true' if Set is an ordered set of elements, else 'false'.
+
+is_set([E|Es]) ->
+    is_set(Es, E);
+is_set([]) ->
+    true.
+
+is_set([E2|Es], E1) when E1 < E2 ->
+    is_set(Es, E2);
+is_set([E2|Es], E1) ->
+    false;
+is_set([], E1) ->
+    true.
+
+%% set_to_list(OrdSet)
+%%  Return the elements in OrdSet as a list.
+
+set_to_list(S) ->
+    S.
+
+%% list_to_set(List)
+%%  Build an ordered set from the elements in List.
+
+list_to_set([E|Es]) ->
+    add_element(E, list_to_set(Es));
+list_to_set([]) ->
+    [].
+
+%% is_element(Element, OrdSet)
+%%  Return 'true' if Element is an element of OrdSet, else 'false'.
+
+is_element(E, [H|Es]) when E < H ->
+    false;
+is_element(E, [H|Es]) when E == H ->
+    true;
+is_element(E, [H|Es]) when E > H ->
+    is_element(E, Es);
+is_element(E, []) ->
+    false.
+
+%% add_element(Element, OrdSet)
+%%  Return OrdSet with Element inserted in it.
+
+add_element(E, [H|Es]) when E < H ->
+    [E,H|Es];
+add_element(E, [H|Es]) when E == H ->
+    [H|Es];
+add_element(E, [H|Es]) when E > H ->
+    [H|add_element(E, Es)];
+add_element(E, []) ->
+    [E].
+
+%% del_element(Element, OrdSet)
+%%  Return OrdSet but with Element removed.
+
+del_element(E, [H|Es]) when E < H ->
+    [H|Es];
+del_element(E, [H|Es]) when E == H ->
+    Es;
+del_element(E, [H|Es]) when E > H ->
+    [H|del_element(E, Es)];
+del_element(E, []) ->
+    [].
+
+%% union(Set1, Set2)
+%%  Return the union of Set1 and Set2.
+
+union([H1|Es1], [H2|Es2]) when H1 < H2 ->
+    [H1|union(Es1, [H2|Es2])];
+union([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    [H1|union(Es1, Es2)];
+union([H1|Es1], [H2|Es2]) when H1 > H2 ->
+    [H2|union([H1|Es1], Es2)];
+union([], Es2) ->
+    Es2;
+union(Es1, []) ->
+    Es1.
+
+%% union(OrdSets)
+%%  Return the union of the list of sets.
+
+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.
+
+%% intersection(Set1, Set2)
+%%  Return the intersection of Set1 and Set2.
+
+intersection([H1|Es1], [H2|Es2]) when H1 < H2 ->
+    intersection(Es1, [H2|Es2]);
+intersection([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    [H1|intersection(Es1, Es2)];
+intersection([H1|Es1], [H2|Es2]) when H1 > H2 ->
+    intersection([H1|Es1], Es2);
+intersection([], Es2) ->
+    [];
+intersection(Es1, []) ->
+    [].
+
+%% intersection(OrdSets)
+%%  Return the intersection of the list of sets.
+
+intersection([S1,S2|Ss]) ->
+    intersection1(intersection(S1,S2), Ss);
+intersection([S]) ->
+    S;
+intersection([]) ->
+    [].
+
+intersection1(S1, [S2|Ss]) ->
+    intersection1(intersection(S1, S2), Ss);
+intersection1(S1, []) ->
+    S1.
+
+%% subtract(Set1, Set2)
+%%  Return all and only the elements of Set1 which are not also in Set2.
+
+subtract([H1|Es1], [H2|Es2]) when H1 < H2 ->
+    [H1|subtract(Es1, [H2|Es2])];
+subtract([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    subtract(Es1, Es2);
+subtract([H1|Es1], [H2|Es2]) when H1 > H2 ->
+    subtract([H1|Es1], Es2);
+subtract([], Es2) ->
+    [];
+subtract(Es1, []) ->
+    Es1.
+
+%% subset(Set1, Set2)
+%%  Return 'true' when every element of Set1 is also a member of Set2,
+%%  else 'false'.
+
+subset([H1|Es1], [H2|Es2]) when H1 < H2 ->	%H1 not in Set2
+    false;
+subset([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    subset(Es1, Es2);
+subset([H1|Es1], [H2|Es2]) when H1 > H2 ->
+    subset([H1|Es1], Es2);
+subset([], Es2) ->
+    true;
+subset(Es1, []) ->
+    false.
diff --git a/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/test.erl b/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/test.erl
new file mode 100644
index 0000000000..a48a7e112f
--- /dev/null
+++ b/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/test.erl
@@ -0,0 +1,157 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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(test).
+
+%%-compile(export_all).
+-export([test1/0,
+	 test2/0,
+	 test3/0,
+	 test4/0,
+	 test5/0,
+	 test6/1,
+	 test7/0,
+	 test8/1,
+	 test9/0,
+	 test10/0,
+	 test11/0,
+	 test12/1
+	]).
+
+
+-export([test9_server/1]).
+
+
+test1() ->
+    R1 = lists1:reverse("retep"),
+    R2 = ordsets1:list_to_set([b,c,a,2,4,1]),
+    R3 = lists1:reverse("nilo"),
+    {R1,R2, R3}.
+
+test2() ->
+    R1 = spawn(lists1,reverse,["retep"]),
+    R2 = spawn(ordsets1,list_to_set,[[b,c,a,2,4,1]]),
+    R3 = spawn(lists1,reverse,["nilo"]),
+    {R1,R2, R3}.
+
+
+test3() ->
+    A = a,
+    Pid = spawn(?MODULE, test1,[]),
+    B = b,
+    {A, B, Pid}.
+
+test4() ->
+    Pid = spawn(?MODULE, test1,[]),
+    A = a,
+    B = b,
+    {A, B, Pid}.
+test5() ->
+    L1 = [a,b,c],
+    L = length(L1),
+    A = a,
+    B = b,
+    {A, B, L, L1}.
+
+
+
+test6(0) ->
+    ok;
+test6(N) when N>0 ->
+    spawn(lists1,reverse,["adolfiparisrorsirapifloda"]),
+    test6(N-1).
+
+
+test7() ->
+    CurDirReturn = file:get_cwd(),
+    {ok, CurDir} = CurDirReturn,
+    DirListReturn = file:list_dir(CurDir),
+    {ok, DirList} = DirListReturn,
+    io:format("~w~n",[DirList]).
+
+
+test8(List) ->
+    %% foo
+    %%bar
+    %% foo
+    %%bar
+    %% foo
+    %%bar
+    %% foo
+    %%bar
+
+    L2 =  [gamma|List],
+    {L2, List}.
+
+test9() ->
+    S1 = spawn(?MODULE, test9_server,[self()]),
+    S2 = spawn(?MODULE, test9_server,[bongo]),
+    S3 = spawn(?MODULE, test9_server,[42]),
+
+    test9_loop(S1,S2,S3).
+
+test9_loop(S1,S2,S3) ->
+    receive
+	{S1, hej} ->
+	    io:format("S1 ~n"),
+	    test9_loop(S1,S2,S3);
+	{S2, hej} ->
+	    io:format("S2 ~n"),
+	    test9_loop(S1,S2,S3);
+	{S3, hej} ->
+	    io:format("S3 ~n"),
+	    test9_loop(S1,S2,S3)
+    end.
+
+
+test9_server(Pid) ->
+    io:format("started server: ~p~n",[Pid]),
+    test9_server1(Pid).
+
+test9_server1(Pid) ->
+    Pad = {pad, Pid},
+    test9_server2(Pad).
+
+test9_server2(Pad) ->
+    {pad, Pid} = Pad,
+    Pid ! {self(), hej}.
+
+
+
+
+
+test10() ->
+    receive
+	X ->
+	    done
+    after 20000 ->
+	    timeout
+    end.
+
+test11() ->
+    receive
+	X ->
+	    done
+    end.
+
+test12(normal) ->
+    done;
+test12(crash) ->
+    exit(crash).
diff --git a/lib/debugger/test/debugger.cover b/lib/debugger/test/debugger.cover
new file mode 100644
index 0000000000..509ddc0ec1
--- /dev/null
+++ b/lib/debugger/test/debugger.cover
@@ -0,0 +1,2 @@
+{incl_app,debugger,details}.
+
diff --git a/lib/debugger/test/debugger.spec b/lib/debugger/test/debugger.spec
new file mode 100644
index 0000000000..7aef026e77
--- /dev/null
+++ b/lib/debugger/test/debugger.spec
@@ -0,0 +1 @@
+{suites,"../debugger_test",all}.
diff --git a/lib/debugger/test/debugger_SUITE.erl b/lib/debugger/test/debugger_SUITE.erl
new file mode 100644
index 0000000000..747d9e343d
--- /dev/null
+++ b/lib/debugger/test/debugger_SUITE.erl
@@ -0,0 +1,144 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2010. 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(debugger_SUITE).
+
+%% Test break points.
+
+-include_lib("test_server/include/test_server.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,
+	 app_test/1,erts_debug/1,encrypted_debug_info/1,
+	 no_abstract_code/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [app_test, erts_debug, no_abstract_code,
+     encrypted_debug_info].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(_Case, Config) ->
+    Dog=test_server:timetrap(?t:minutes(0.5)),
+    [{watchdog, Dog}|Config].
+end_per_testcase(_Case, Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+app_test(Config) when is_list(Config) ->
+    ?line ?t:app_test(debugger),
+    ok.
+
+erts_debug(Config) when is_list(Config) ->
+    c:l(erts_debug),
+    ok.
+
+no_abstract_code(Config) when is_list(Config) ->
+    ?line PrivDir = ?config(priv_dir, Config),
+    ?line Simple = filename:join(PrivDir, "simple"),
+    ?line Source = Simple ++ ".erl",
+    ?line BeamFile = Simple ++ ".beam",
+    ?line simple_file(Source),
+
+    %% Compile module without abstract code.
+    CompileFlags = [{outdir,PrivDir}],
+    ?line {ok,_} = compile:file(Source, CompileFlags),
+    ?line error = int:i(Simple),
+
+    %% Cleanup.
+    ?line ok = file:delete(Source),
+    ?line ok = file:delete(BeamFile),
+
+    ok.
+
+encrypted_debug_info(Config) when is_list(Config) ->
+    try	begin crypto:start(), crypto:info(), crypto:stop(), ok end of
+	ok ->
+	    encrypted_debug_info_1(Config)
+    catch
+	error:_ ->
+	    {skip,"The crypto application is missing or broken"}
+    end.
+
+encrypted_debug_info_1(Config) ->
+    ?line PrivDir = ?config(priv_dir, Config),
+    ?line Simple = filename:join(PrivDir, "simple"),
+    ?line Source = Simple ++ ".erl",
+    ?line BeamFile = Simple ++ ".beam",
+    ?line simple_file(Source),
+
+    %% Compile module.
+    Key = "_This a Crypto Key_",
+    CompileFlags = [{outdir,PrivDir},debug_info,{debug_info_key,Key}],
+    ?line {ok,_} = compile:file(Source, CompileFlags),
+
+    %% Interpret module
+    ?line ok = beam_lib:crypto_key_fun(simple_crypto_fun(Key)),
+    ?line {module,simple} = int:i(Simple),
+
+    %% Remove key.
+    ?line {ok,_} = beam_lib:clear_crypto_key_fun(),
+    ?line error = int:i(Simple),
+
+    %% Cleanup.
+    ?line ok = file:delete(Source),
+    ?line ok = file:delete(BeamFile),
+
+    ok.
+
+simple_crypto_fun(Key) ->
+    fun(init) -> ok;
+       ({debug_info, des3_cbc, simple, _}) -> Key
+    end.
+
+
+simple_file(File) ->
+    simple_file(File, simple).
+
+simple_file(File, Module) ->
+    simple_file(File, Module, member).
+
+simple_file(File, Module, F) ->
+    B = list_to_binary(["-module(", atom_to_list(Module), "). "
+			"-export([t/0]). "
+			"t() -> "
+			"    t([]). "
+			"t(L) -> "
+			"    lists:",
+			atom_to_list(F), "(a, L). "]),
+    ok = file:write_file(File, B).
diff --git a/lib/debugger/test/debugger_test.erl b/lib/debugger/test/debugger_test.erl
new file mode 100644
index 0000000000..a64bed5db1
--- /dev/null
+++ b/lib/debugger/test/debugger_test.erl
@@ -0,0 +1,154 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+
+%%
+%%%----------------------------------------------------------------------
+%%% Purpose : This is the test module to be used in with the test cases
+%%%           in the debugger test document.
+%%%----------------------------------------------------------------------
+
+-module(debugger_test).
+
+
+-export ([installation_ok/0,
+	  list/0,
+	  fac/1,
+	  c_break/1]).
+
+
+-define (INT_DIR, "misc").      % The directory of the Interpreter directory
+-define (INT, "interpreter").   % The Interpreter directory name.
+-define (DBG, "debugger").      % Debugger name
+
+
+%%% installation_ok  /0
+%%%
+
+installation_ok () ->
+    debugger_ok (),
+    interpreter_ok ().
+
+
+
+%%% debugger_ok  /0
+%%%
+
+debugger_ok () ->
+    L = code:get_path (),
+
+    case debugger_in_codepath (L) of
+	{true, Msg} ->
+	    out_put (Msg);
+
+	Other ->
+	    out_put (Other)
+    end.
+
+
+
+%%% debugger_in_codepath  /2
+%%%
+
+debugger_in_codepath ([]) ->
+    Msg = io_lib:format ("False: ~s not in code path", [?DBG]),
+    lists:flatten (Msg);
+
+debugger_in_codepath ([Path | T]) ->
+    case string:str (Path, ?DBG) =/= 0 of
+	true ->
+	    Msg = io_lib:format ("Ok: ~s in code path (~s)", [?DBG, Path]),
+	    Msg1 = lists:flatten (Msg),
+	    {true, Msg1};
+
+	_Other ->
+	    debugger_in_codepath (T)
+    end.
+
+
+
+%%% interpreter_ok  /0
+%%%
+
+interpreter_ok () ->
+    Root_dir = code:root_dir (),
+    Misc_dir = filename:join (Root_dir, ?INT_DIR),
+
+    In_misc = case file:list_dir (Misc_dir) of
+		  {ok, L} ->
+		      lists:member (?INT, L);
+
+		  Other ->
+		      Other
+	      end,
+
+    case In_misc of
+	true ->
+	    Msg =  io_lib:format ("Ok: ~s is in ~s", [?INT, ?INT_DIR]),
+	    Msg1 = lists:flatten (Msg),
+	    out_put (Msg1);
+
+	Other1 ->
+	    Msg = io_lib:format ("Error: interpreter in misc - ~s", [Other1]),
+	    Msg1 = lists:flatten (Msg),
+	    out_put (Msg1)
+    end.
+
+
+
+%%% list  /0
+%%%
+
+list () ->
+    A = [1, 2, 3, 4, 5],
+    B = [a, b, c, d, e],
+    lists:append (A, B).
+
+
+
+%%% fac  /1
+%%%
+
+fac (0) ->
+    1;
+
+
+fac (N) ->
+    N * fac (N - 1).
+
+
+
+%%% c_break  /1
+%%%
+
+c_break (Bindings) ->
+    case int:get_binding ('N', Bindings) of
+	{value, 3} ->
+	    true;
+
+	_Other ->
+	    false
+    end.
+
+
+
+%%% out_put  /1
+%%%
+
+out_put (X) ->
+    io:format ("~n~p~n", [X]).
diff --git a/lib/debugger/test/debugger_testdoc.fm5 b/lib/debugger/test/debugger_testdoc.fm5
new file mode 100644
index 0000000000..56882b8bd5
--- /dev/null
+++ b/lib/debugger/test/debugger_testdoc.fm5
diff --git a/lib/debugger/test/erl_eval_SUITE.erl b/lib/debugger/test/erl_eval_SUITE.erl
new file mode 100644
index 0000000000..67ca3d4867
--- /dev/null
+++ b/lib/debugger/test/erl_eval_SUITE.erl
@@ -0,0 +1,1406 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2003-2010. 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(erl_eval_SUITE).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+
+-export([guard_1/1, guard_2/1,
+	 match_pattern/1,
+	 match_bin/1,
+	 string_plusplus/1,
+	 pattern_expr/1,
+         guard_3/1, guard_4/1,
+         lc/1,
+         simple_cases/1,
+         unary_plus/1,
+         apply_atom/1,
+         otp_5269/1,
+         otp_6539/1,
+         otp_6543/1,
+         otp_6787/1,
+         otp_6977/1,
+	 otp_7550/1,
+         otp_8133/1,
+         funs/1,
+	 try_catch/1,
+	 eval_expr_5/1]).
+
+%%
+%% Define to run outside of test server
+%%
+%%-define(STANDALONE,1).
+
+-import(lists,[concat/1, sort/1]).
+
+-export([count_down/2, count_down_fun/0, do_apply/2,
+         local_func/3, local_func_value/2]).
+
+-ifdef(STANDALONE).
+-define(config(A,B),config(A,B)).
+-export([config/2]).
+-define(line, noop, ).
+config(priv_dir,_) ->
+    ".".
+-else.
+-include_lib("test_server/include/test_server.hrl").
+-export([init_per_testcase/2, end_per_testcase/2]).
+% Default timetrap timeout (set in init_per_testcase).
+-define(default_timeout, ?t:minutes(1)).
+init_per_testcase(_Case, Config) ->
+    ?line Dog = ?t:timetrap(?default_timeout),
+    [{watchdog, Dog} | Config].
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+-endif.
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [guard_1, guard_2, match_pattern, string_plusplus,
+     pattern_expr, match_bin, guard_3, guard_4, lc,
+     simple_cases, unary_plus, apply_atom, otp_5269,
+     otp_6539, otp_6543, otp_6787, otp_6977, otp_7550,
+     otp_8133, funs, try_catch, eval_expr_5].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+guard_1(doc) ->
+    ["(OTP-2405)"];
+guard_1(suite) ->
+    [];
+guard_1(Config) when is_list(Config) ->
+    ?line {ok,Tokens ,_} =
+	erl_scan:string("if a+4 == 4 -> yes; true -> no end. "),
+    ?line {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
+    ?line no = guard_1_compiled(),
+    ?line {value, no, []} = erl_eval:expr(Expr, []),
+    ok.
+
+guard_1_compiled() ->
+    if a+4 == 4 -> yes; true -> no end.
+
+guard_2(doc) ->
+    ["Similar to guard_1, but type-correct"];
+guard_2(suite) ->
+    [];
+guard_2(Config) when is_list(Config) ->
+    ?line {ok,Tokens ,_} =
+	erl_scan:string("if 6+4 == 4 -> yes; true -> no end. "),
+    ?line {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
+    ?line no = guard_2_compiled(),
+    ?line {value, no, []} = erl_eval:expr(Expr, []),
+    ok.
+
+guard_2_compiled() ->
+    if 6+4 == 4 -> yes; true -> no end.
+
+string_plusplus(doc) ->
+    ["OTP-3069: syntactic sugar string ++ ..."];
+string_plusplus(suite) ->
+    [];
+string_plusplus(Config) when is_list(Config) ->
+    ?line check(fun() -> case "abc" of "ab" ++ L -> L end end,
+		"case \"abc\" of \"ab\" ++ L -> L end. ",
+		"c"),
+    ?line check(fun() -> case "abcde" of "ab" ++ "cd" ++ L -> L end end,
+		"case \"abcde\" of \"ab\" ++ \"cd\" ++ L -> L end. ",
+		"e"),
+    ?line check(fun() -> case "abc" of [97, 98] ++ L -> L end end,
+		"case \"abc\" of [97, 98] ++ L -> L end. ",
+		"c"),
+    ok.
+
+match_pattern(doc) ->
+    ["OTP-2983: match operator in pattern"];
+match_pattern(suite) ->
+    [];
+match_pattern(Config) when is_list(Config) ->
+    ?line check(fun() -> case {a, b} of {a, _X}=Y -> {x,Y} end end,
+		"case {a, b} of {a, X}=Y -> {x,Y} end. ",
+		{x, {a, b}}),
+    ?line check(fun() -> case {a, b} of Y={a, _X} -> {x,Y} end end,
+		"case {a, b} of Y={a, X} -> {x,Y} end. ",
+		{x, {a, b}}),
+    ?line check(fun() -> case {a, b} of Y={a, _X}=Z -> {Z,Y} end end,
+		"case {a, b} of Y={a, X}=Z -> {Z,Y} end. ",
+		{{a, b}, {a, b}}),
+    ?line check(fun() -> A = 4, B = 28, <<13:(A+(X=B))>>, X end,
+                "begin A = 4, B = 28, <<13:(A+(X=B))>>, X end.",
+                28),
+    ok.
+
+match_bin(doc) ->
+    ["binary match problems"];
+match_bin(suite) ->
+    [];
+match_bin(Config) when is_list(Config) ->
+    ?line check(fun() -> <<"abc">> = <<"abc">> end,
+		"<<\"abc\">> = <<\"abc\">>. ",
+		<<"abc">>),
+    ?line check(fun() ->
+			<<Size,B:Size/binary,Rest/binary>> = <<2,"AB","CD">>,
+			{Size,B,Rest}
+		end,
+		"begin <<Size,B:Size/binary,Rest/binary>> = <<2,\"AB\",\"CD\">>, "
+		"{Size,B,Rest} end. ",
+		{2,<<"AB">>,<<"CD">>}),
+    ok.
+
+pattern_expr(doc) ->
+    ["OTP-3144: compile-time expressions in pattern"];
+pattern_expr(suite) ->
+    [];
+pattern_expr(Config) when is_list(Config) ->
+    ?line check(fun() -> case 4 of 2+2 -> ok end end,
+		"case 4 of 2+2 -> ok end. ",
+		ok),
+    ?line check(fun() -> case 2 of +2 -> ok end end,
+		"case 2 of +2 -> ok end. ",
+		ok),
+    ok.
+
+guard_3(doc) ->
+    ["OTP-4518."];
+guard_3(suite) ->
+    [];
+guard_3(Config) when is_list(Config) ->
+    ?line check(fun() -> if false -> false; true -> true end end,
+                "if false -> false; true -> true end.",
+                true),
+    ?line check(fun() -> if <<"hej">> == <<"hopp">> -> true;
+                            true -> false end end,
+                "begin if <<\"hej\">> == <<\"hopp\">> -> true;
+                          true -> false end end.",
+                false),
+    ?line check(fun() -> if <<"hej">> == <<"hej">> -> true;
+                            true -> false end end,
+                "begin if <<\"hej\">> == <<\"hej\">> -> true;
+                          true -> false end end.",
+                true),
+    ok.
+
+guard_4(doc) ->
+    ["OTP-4885."];
+guard_4(suite) ->
+    [];
+guard_4(Config) when is_list(Config) ->
+    ?line check(fun() -> if {erlang,'+'}(3,a) -> true ; true -> false end end,
+                "if {erlang,'+'}(3,a) -> true ; true -> false end.",
+                false),
+    ?line check(fun() -> if {erlang,is_integer}(3) -> true ; true -> false end
+                end,
+                "if {erlang,is_integer}(3) -> true ; true -> false end.",
+                true),
+    ?line check(fun() -> [X || X <- [1,2,3], erlang:is_integer(X)] end,
+                "[X || X <- [1,2,3], erlang:is_integer(X)].",
+                [1,2,3]),
+    ?line check(fun() -> if is_atom(is_integer(a)) -> true ; true -> false end
+                end,
+                "if is_atom(is_integer(a)) -> true ; true -> false end.",
+                true),
+    ?line check(fun() -> if {erlang,is_atom}({erlang,is_integer}(a)) -> true;
+                            true -> false end end,
+                "if {erlang,is_atom}({erlang,is_integer}(a)) -> true; "
+                "true -> false end.",
+                true),
+    ?line check(fun() -> if is_atom(3+a) -> true ; true -> false end end,
+                "if is_atom(3+a) -> true ; true -> false end.",
+                false),
+    ?line check(fun() -> if erlang:is_atom(3+a) -> true ; true -> false end
+                end,
+                "if erlang:is_atom(3+a) -> true ; true -> false end.",
+                false),
+    ok.
+
+
+lc(doc) ->
+    ["OTP-4518."];
+lc(suite) ->
+    [];
+lc(Config) when is_list(Config) ->
+    ?line check(fun() -> X = 32, [X || X <- [1,2,3]] end,
+                "begin X = 32, [X || X <- [1,2,3]] end.",
+                [1,2,3]),
+    ?line check(fun() -> X = 32,
+                         [X || <<X:X>> <- [<<1:32>>,<<2:32>>,<<3:8>>]] end,
+    %% "binsize variable"          ^
+                "begin X = 32,
+                 [X || <<X:X>> <- [<<1:32>>,<<2:32>>,<<3:8>>]] end.",
+                [1,2]),
+    ?line check(fun() -> Y = 13,[X || {X,Y} <- [{1,2}]] end,
+                "begin Y = 13,[X || {X,Y} <- [{1,2}]] end.",
+                [1]),
+    ?line error_check("begin [A || X <- [{1,2}], 1 == A] end.",
+                      {unbound_var,'A'}),
+    ?line error_check("begin X = 32,
+                        [{Y,W} || X <- [1,2,32,Y=4], Z <- [1,2,W=3]] end.",
+                      {unbound_var,'Y'}),
+    ?line error_check("begin X = 32,<<A:B>> = <<100:X>> end.",
+                      {unbound_var,'B'}),
+    ?line check(fun() -> [X || X <- [1,2,3,4], not (X < 2)] end,
+                "begin [X || X <- [1,2,3,4], not (X < 2)] end.",
+                [2,3,4]),
+    ?line check(fun() -> [X || X <- [true,false], X] end,
+                "[X || X <- [true,false], X].", [true]),
+    ok.
+
+simple_cases(doc) ->
+    ["Simple cases, just to cover some code."];
+simple_cases(suite) ->
+    [];
+simple_cases(Config) when is_list(Config) ->
+    ?line check(fun() -> A = $C end, "A = $C.", $C),
+    %% ?line check(fun() -> A = 3.14 end, "A = 3.14.", 3.14),
+    ?line check(fun() -> self() ! a, A = receive a -> true end end,
+                "begin self() ! a, A = receive a -> true end end.",
+                true),
+    ?line check(fun() -> c:flush(), self() ! a, self() ! b, self() ! c,
+                         receive b -> b end,
+                         {messages, [a,c]} =
+                             erlang:process_info(self(), messages),
+                         c:flush() end,
+                "begin c:flush(), self() ! a, self() ! b, self() ! c,"
+                "receive b -> b end,"
+                "{messages, [a,c]} ="
+                "     erlang:process_info(self(), messages), c:flush() end.",
+                ok),
+    ?line check(fun() -> self() ! a, A = receive a -> true
+                                         after 0 -> false end end,
+                "begin self() ! a, A = receive a -> true"
+                "                      after 0 -> false end end.",
+                true),
+    ?line check(fun() -> c:flush(), self() ! a, self() ! b, self() ! c,
+                         receive b -> b after 0 -> true end,
+                         {messages, [a,c]} =
+                             erlang:process_info(self(), messages),
+                         c:flush() end,
+                "begin c:flush(), self() ! a, self() ! b, self() ! c,"
+                "receive b -> b after 0 -> true end,"
+                "{messages, [a,c]} ="
+                "     erlang:process_info(self(), messages), c:flush() end.",
+                ok),
+    ?line check(fun() -> receive _ -> true after 10 -> false end end,
+                "receive _ -> true after 10 -> false end.",
+                false),
+    ?line check(fun() -> F = fun(A) -> A end, true = 3 == F(3) end,
+                "begin F = fun(A) -> A end, true = 3 == F(3) end.",
+                true),
+    ?line check(fun() -> F = fun(A) -> A end, true = 3 == apply(F, [3]) end,
+                "begin F = fun(A) -> A end, true = 3 == apply(F,[3]) end.",
+                true),
+    ?line check(fun() -> catch throw(a) end, "catch throw(a).", a),
+    ?line check(fun() -> catch a end, "catch a.", a),
+    ?line check(fun() -> 4 == 3 end, "4 == 3.", false),
+    ?line check(fun() -> not true end, "not true.", false),
+    ?line check(fun() -> -3 end, "-3.", -3),
+
+    ?line error_check("3.0 = 4.0.", {badmatch,4.0}),
+    ?line check(fun() -> <<(3.0+2.0):32/float>> = <<5.0:32/float>> end,
+                "<<(3.0+2.0):32/float>> = <<5.0:32/float>>.",
+                <<5.0:32/float>>),
+
+    ?line check(fun() -> false andalso kludd end, "false andalso kludd.",
+                false),
+    ?line check(fun() -> true andalso true end, "true andalso true.",
+                true),
+    ?line check(fun() -> true andalso false end, "true andalso false.",
+                false),
+    ?line check(fun() -> true andalso kludd end, "true andalso kludd.",
+                kludd),
+    ?line error_check("kladd andalso kludd.", {badarg,kladd}),
+
+    ?line check(fun() -> if false andalso kludd -> a; true -> b end end,
+                "if false andalso kludd -> a; true -> b end.",
+                b),
+    ?line check(fun() -> if true andalso true -> a; true -> b end end,
+                "if true andalso true -> a; true -> b end.",
+                a),
+    ?line check(fun() -> if true andalso false -> a; true -> b end end,
+                "if true andalso false -> a; true -> b end.",
+                b),
+
+    ?line check(fun() -> true orelse kludd end,
+                "true orelse kludd.", true),
+    ?line check(fun() -> false orelse false end,
+                "false orelse false.", false),
+    ?line check(fun() -> false orelse true end,
+                "false orelse true.", true),
+    ?line check(fun() -> false orelse kludd end,
+                "false orelse kludd.", kludd),
+    ?line error_check("kladd orelse kludd.", {badarg,kladd}),
+    ?line error_check("[X || X <- [1,2,3], begin 1 end].",{bad_filter,1}),
+    ?line error_check("[X || X <- a].",{bad_generator,a}),
+
+    ?line check(fun() -> if true orelse kludd -> a; true -> b end end,
+                "if true orelse kludd -> a; true -> b end.", a),
+    ?line check(fun() -> if false orelse false -> a; true -> b end end,
+                "if false orelse false -> a; true -> b end.", b),
+    ?line check(fun() -> if false orelse true -> a; true -> b end end,
+                "if false orelse true -> a; true -> b end.", a),
+
+    ?line check(fun() -> [X || X <- [1,2,3], X+2] end,
+                "[X || X <- [1,2,3], X+2].", []),
+
+    ?line check(fun() -> [X || X <- [1,2,3], [X] == [X || X <- [2]]] end,
+                "[X || X <- [1,2,3], [X] == [X || X <- [2]]].",
+                [2]),
+    ?line check(fun() -> F = fun(1) -> ett; (2) -> zwei end,
+                         ett = F(1), zwei = F(2) end,
+                "begin F = fun(1) -> ett; (2) -> zwei end,
+                         ett = F(1), zwei = F(2) end.",
+                zwei),
+    ?line check(fun() -> F = fun(X) when X == 1 -> ett;
+                                (X) when X == 2 -> zwei end,
+                         ett = F(1), zwei = F(2) end,
+                "begin F = fun(X) when X == 1 -> ett;
+                              (X) when X == 2 -> zwei end,
+                         ett = F(1), zwei = F(2) end.",
+                zwei),
+    ?line error_check("begin F = fun(1) -> ett end, zwei = F(2) end.",
+                      function_clause),
+    ?line check(fun() -> if length([1]) == 1 -> yes;
+                            true -> no end end,
+                "if length([1]) == 1 -> yes;
+                            true -> no end.",
+                yes),
+    ?line check(fun() -> if is_integer(3) -> true; true -> false end end,
+                "if is_integer(3) -> true; true -> false end.", true),
+    ?line check(fun() -> if integer(3) -> true; true -> false end end,
+                "if integer(3) -> true; true -> false end.", true),
+    ?line check(fun() -> if is_float(3) -> true; true -> false end end,
+                "if is_float(3) -> true; true -> false end.", false),
+    ?line check(fun() -> if float(3) -> true; true -> false end end,
+                "if float(3) -> true; true -> false end.", false),
+    ?line check(fun() -> if is_number(3) -> true; true -> false end end,
+                "if is_number(3) -> true; true -> false end.", true),
+    ?line check(fun() -> if number(3) -> true; true -> false end end,
+                "if number(3) -> true; true -> false end.", true),
+    ?line check(fun() -> if is_atom(a) -> true; true -> false end end,
+                "if is_atom(a) -> true; true -> false end.", true),
+    ?line check(fun() -> if atom(a) -> true; true -> false end end,
+                "if atom(a) -> true; true -> false end.", true),
+    ?line check(fun() -> if is_list([]) -> true; true -> false end end,
+                "if is_list([]) -> true; true -> false end.", true),
+    ?line check(fun() -> if list([]) -> true; true -> false end end,
+                "if list([]) -> true; true -> false end.", true),
+    ?line check(fun() -> if is_tuple({}) -> true; true -> false end end,
+                "if is_tuple({}) -> true; true -> false end.", true),
+    ?line check(fun() -> if tuple({}) -> true; true -> false end end,
+                "if tuple({}) -> true; true -> false end.", true),
+    ?line check(fun() -> if is_pid(self()) -> true; true -> false end end,
+                "if is_pid(self()) -> true; true -> false end.", true),
+    ?line check(fun() -> if pid(self()) -> true; true -> false end end,
+                "if pid(self()) -> true; true -> false end.", true),
+    ?line check(fun() -> R = make_ref(), if is_reference(R) -> true;
+                                            true -> false end end,
+                "begin R = make_ref(), if is_reference(R) -> true;"
+                "true -> false end end.", true),
+    ?line check(fun() -> R = make_ref(), if reference(R) -> true;
+                                            true -> false end end,
+                "begin R = make_ref(), if reference(R) -> true;"
+                "true -> false end end.", true),
+    ?line check(fun() -> if is_port(a) -> true; true -> false end end,
+                "if is_port(a) -> true; true -> false end.", false),
+    ?line check(fun() -> if port(a) -> true; true -> false end end,
+                "if port(a) -> true; true -> false end.", false),
+    ?line check(fun() -> if is_function(a) -> true; true -> false end end,
+                "if is_function(a) -> true; true -> false end.", false),
+    ?line check(fun() -> if function(a) -> true; true -> false end end,
+                "if function(a) -> true; true -> false end.", false),
+    ?line check(fun() -> if is_binary(<<>>) -> true; true -> false end end,
+                "if is_binary(<<>>) -> true; true -> false end.", true),
+    ?line check(fun() -> if binary(<<>>) -> true; true -> false end end,
+                "if binary(<<>>) -> true; true -> false end.", true),
+    ?line check(fun() -> if is_integer(a) == true -> yes;
+                            true -> no end end,
+                "if is_integer(a) == true -> yes;
+                            true -> no end.",
+                no),
+    ?line check(fun() -> if [] -> true; true -> false end end,
+                "if [] -> true; true -> false end.", false),
+    ?line error_check("if lists:member(1,[1]) -> true; true -> false end.",
+                      illegal_guard_expr),
+    ?line error_check("if false -> true end.", if_clause),
+    ?line check(fun() -> if a+b -> true; true -> false end end,
+                "if a + b -> true; true -> false end.", false),
+    ?line check(fun() -> if + b -> true; true -> false end end,
+                "if + b -> true; true -> false end.", false),
+    ?line error_check("case foo of bar -> true end.", {case_clause,foo}),
+    ?line error_check("case 4 of 2+a -> true; _ -> false end.",
+                      illegal_pattern),
+    ?line error_check("case 4 of +a -> true; _ -> false end.",
+                      illegal_pattern),
+    ?line check(fun() -> case a of
+                             X when X == b -> one;
+                             X when X == a -> two
+                         end end,
+                "begin case a of
+                             X when X == b -> one;
+                             X when X == a -> two
+                         end end.", two),
+    ?line error_check("3 = 4.", {badmatch,4}),
+    ?line error_check("a = 3.", {badmatch,3}),
+    %% ?line error_check("3.1 = 2.7.",{badmatch,2.7}),
+    ?line error_check("$c = 4.", {badmatch,4}),
+    ?line check(fun() -> $c = $c end, "$c = $c.", $c),
+    ?line check(fun() -> _ = bar end, "_ = bar.", bar),
+    ?line check(fun() -> A = 14, A = 14 end,
+                "begin A = 14, A = 14 end.", 14),
+    ?line error_check("begin A = 14, A = 16 end.", {badmatch,16}),
+    ?line error_check("\"hej\" = \"san\".", {badmatch,"san"}),
+    ?line check(fun() -> "hej" = "hej" end,
+                "\"hej\" = \"hej\".", "hej"),
+    ?line error_check("[] = [a].", {badmatch,[a]}),
+    ?line check(fun() -> [] = [] end, "[] = [].", []),
+    ?line error_check("[a] = [].", {badmatch,[]}),
+    ?line error_check("{a,b} = 34.", {badmatch,34}),
+    ?line check(fun() -> <<X:7>> = <<8:7>>, X end,
+		"begin <<X:7>> = <<8:7>>, X end.", 8),
+    ?line error_check("<<34:32>> = \"hej\".", {badmatch,"hej"}),
+    ?line check(fun() -> trunc((1 * 3 div 3 + 4 - 3) / 1) rem 2 end,
+                "begin trunc((1 * 3 div 3 + 4 - 3) / 1) rem 2 end.", 0),
+    ?line check(fun() -> (2#101 band 2#10101) bor (2#110 bxor 2#010) end,
+                "(2#101 band 2#10101) bor (2#110 bxor 2#010).", 5),
+    ?line check(fun() -> (2#1 bsl 4) + (2#10000 bsr 3) end,
+                "(2#1 bsl 4) + (2#10000 bsr 3).", 18),
+    ?line check(fun() -> ((1<3) and ((1 =:= 2) or (1 =/= 2))) xor (1=<2) end,
+                "((1<3) and ((1 =:= 2) or (1 =/= 2))) xor (1=<2).", false),
+    ?line check(fun() -> (a /= b) or (2 > 4) or (3 >= 3) end,
+                "(a /= b) or (2 > 4) or (3 >= 3).", true),
+    ?line check(fun() -> "hej" ++ "san" =/= "hejsan" -- "san" end,
+                "\"hej\" ++ \"san\" =/= \"hejsan\" -- \"san\".", true),
+    ?line check(fun() -> (bnot 1) < -0 end, "(bnot (+1)) < -0.", true),
+    ok.
+
+unary_plus(doc) ->
+    ["OTP-4929. Unary plus rejects non-numbers."];
+unary_plus(suite) ->
+    [];
+unary_plus(Config) when is_list(Config) ->
+    ?line check(fun() -> F = fun(X) -> + X end,
+                         true = -1 == F(-1) end,
+                "begin F = fun(X) -> + X end,"
+                "      true = -1 == F(-1) end.", true, ['F'], none, none),
+    ?line error_check("+a.", badarith),
+    ok.
+
+apply_atom(doc) ->
+    ["OTP-5064. Can no longer apply atoms."];
+apply_atom(suite) ->
+    [];
+apply_atom(Config) when is_list(Config) ->
+    ?line error_check("[X || X <- [[1],[2]],
+                             begin L = length, L(X) =:= 1 end].",
+                      {badfun,length}),
+    ok.
+
+otp_5269(doc) ->
+    ["OTP-5269. Bugs in the bit syntax."];
+otp_5269(suite) ->
+    [];
+otp_5269(Config) when is_list(Config) ->
+    ?line check(fun() -> L = 8,
+                         F = fun(<<A:L,B:A>>) -> B end,
+                         F(<<16:8, 7:16>>)
+                end,
+                "begin
+                   L = 8, F = fun(<<A:L,B:A>>) -> B end, F(<<16:8, 7:16>>)
+                 end.",
+                7),
+    ?line check(fun() -> L = 8,
+                         F = fun(<<L:L,B:L>>) -> B end,
+                         F(<<16:8, 7:16>>)
+                end,
+                "begin
+                   L = 8, F = fun(<<L:L,B:L>>) -> B end, F(<<16:8, 7:16>>)
+                 end.",
+                7),
+    ?line check(fun() -> L = 8, <<A:L,B:A>> = <<16:8, 7:16>>, B end,
+                "begin L = 8, <<A:L,B:A>> = <<16:8, 7:16>>, B end.",
+                7),
+    ?line error_check("begin L = 8, <<L:L,B:L>> = <<16:8, 7:16>> end.",
+                      {badmatch,<<16:8,7:16>>}),
+
+    ?line error_check("begin <<L:16,L:L>> = <<16:16,8:16>>, L end.",
+                      {badmatch, <<16:16,8:16>>}),
+    ?line check(fun() -> U = 8, (fun(<<U:U>>) -> U end)(<<32:8>>) end,
+                "begin U = 8, (fun(<<U:U>>) -> U end)(<<32:8>>) end.",
+                32),
+    ?line check(fun() -> U = 8, [U || <<U:U>> <- [<<32:8>>]] end,
+                "begin U = 8, [U || <<U:U>> <- [<<32:8>>]] end.",
+                [32]),
+    ?line error_check("(fun({3,<<A:32,A:32>>}) -> a end)
+                          ({3,<<17:32,19:32>>}).",
+                      function_clause),
+    ?line check(fun() -> [X || <<A:8,
+                                 B:A>> <- [<<16:8,19:16>>],
+                               <<X:8>> <- [<<B:8>>]] end,
+                "[X || <<A:8,
+                                 B:A>> <- [<<16:8,19:16>>],
+                               <<X:8>> <- [<<B:8>>]].",
+                [19]),
+    ok.
+
+otp_6539(doc) ->
+    ["OTP-6539. try/catch bugs."];
+otp_6539(suite) ->
+    [];
+otp_6539(Config) when is_list(Config) ->
+    ?line check(fun() ->
+                        F = fun(A,B) ->
+                                    try A+B
+                                    catch _:_ -> dontthinkso
+                                    end
+                            end,
+                        lists:zipwith(F, [1,2], [2,3])
+                end,
+                "begin
+                     F = fun(A,B) ->
+                                 try A+B
+                                 catch _:_ -> dontthinkso
+                                 end
+                         end,
+                     lists:zipwith(F, [1,2], [2,3])
+                 end.",
+                [3, 5]),
+    ok.
+
+otp_6543(doc) ->
+    ["OTP-6543. bitlevel binaries."];
+otp_6543(suite) ->
+    [];
+otp_6543(Config) when is_list(Config) ->
+    ?line check(fun() ->
+                        << <<X>> || <<X>> <- [1,2,3] >>
+                end,
+                "<< <<X>> || <<X>> <- [1,2,3] >>.",
+                <<>>),
+    ?line check(fun() ->
+                        << <<X>> || X <- [1,2,3] >>
+                end,
+                "<< <<X>> || X <- [1,2,3] >>.",
+                <<1,2,3>>),
+    ?line check(fun() ->
+                        << <<X:8>> || <<X:2>> <= <<"hej">> >>
+                end,
+                "<< <<X:8>> || <<X:2>> <= <<\"hej\">> >>.",
+                <<1,2,2,0,1,2,1,1,1,2,2,2>>),
+    ?line check(fun() ->
+                        << <<X:8>> ||
+                            <<65,X:4>> <= <<65,7:4,65,3:4,66,8:4>> >>
+                end,
+                "<< <<X:8>> ||
+                            <<65,X:4>> <= <<65,7:4,65,3:4,66,8:4>> >>.",
+                <<7,3>>),
+    ?line check(fun() -> <<34:18/big>> end,
+                "<<34:18/big>>.",
+                <<0,8,2:2>>),
+    ?line check(fun() -> <<34:18/big-unit:2>> end,
+                "<<34:18/big-unit:2>>.",
+                <<0,0,0,2,2:4>>),
+    ?line check(fun() -> <<34:18/little>> end,
+                "<<34:18/little>>.",
+                <<34,0,0:2>>),
+    ?line case eval_string("<<34:18/native>>.") of
+              <<0,8,2:2>> -> ok;
+              <<34,0,0:2>> -> ok
+          end,
+    ?line check(fun() -> <<34:18/big-signed>> end,
+                "<<34:18/big-signed>>.",
+                <<0,8,2:2>>),
+    ?line check(fun() -> <<34:18/little-signed>> end,
+                "<<34:18/little-signed>>.",
+                <<34,0,0:2>>),
+    ?line case eval_string("<<34:18/native-signed>>.") of
+              <<0,8,2:2>> -> ok;
+              <<34,0,0:2>> -> ok
+          end,
+    ?line check(fun() -> <<34:18/big-unsigned>> end,
+                "<<34:18/big-unsigned>>.",
+                <<0,8,2:2>>),
+    ?line check(fun() -> <<34:18/little-unsigned>> end,
+                "<<34:18/little-unsigned>>.",
+                <<34,0,0:2>>),
+    ?line case eval_string("<<34:18/native-unsigned>>.") of
+              <<0,8,2:2>> -> ok;
+              <<34,0,0:2>> -> ok
+          end,
+    ?line check(fun() -> <<3.14:32/float-big>> end,
+                "<<3.14:32/float-big>>.",
+                <<64,72,245,195>>),
+    ?line check(fun() -> <<3.14:32/float-little>> end,
+                "<<3.14:32/float-little>>.",
+                <<195,245,72,64>>),
+    ?line case eval_string("<<3.14:32/float-native>>.") of
+              <<64,72,245,195>> -> ok;
+              <<195,245,72,64>> -> ok
+          end,
+    ?line error_check("<<(<<17,3:2>>)/binary>>.", badarg),
+    ?line check(fun() -> <<(<<17,3:2>>)/bitstring>> end,
+                "<<(<<17,3:2>>)/bitstring>>.",
+                <<17,3:2>>),
+    ?line check(fun() -> <<(<<17,3:2>>):10/bitstring>> end,
+                "<<(<<17,3:2>>):10/bitstring>>.",
+                <<17,3:2>>),
+    ?line check(fun() -> <<<<344:17>>/binary-unit:17>> end,
+		"<<<<344:17>>/binary-unit:17>>.",
+		<<344:17>>),
+
+    ?line check(fun() -> <<X:18/big>> = <<34:18/big>>, X end,
+                "begin <<X:18/big>> = <<34:18/big>>, X end.",
+                34),
+    ?line check(fun() -> <<X:18/big-unit:2>> = <<34:18/big-unit:2>>, X end,
+                "begin <<X:18/big-unit:2>> = <<34:18/big-unit:2>>, X end.",
+                34),
+    ?line check(fun() -> <<X:18/little>> = <<34:18/little>>, X end,
+                "begin <<X:18/little>> = <<34:18/little>>, X end.",
+                34),
+    ?line check(fun() -> <<X:18/native>> = <<34:18/native>>, X end,
+                "begin <<X:18/native>> = <<34:18/native>>, X end.",
+                34),
+    ?line check(fun() -> <<X:18/big-signed>> = <<34:18/big-signed>>, X end,
+                "begin <<X:18/big-signed>> = <<34:18/big-signed>>, X end.",
+                34),
+    ?line check(fun() -> <<X:18/little-signed>> = <<34:18/little-signed>>,
+                         X end,
+                "begin <<X:18/little-signed>> = <<34:18/little-signed>>,
+                       X end.",
+                34),
+    ?line check(fun() -> <<X:18/native-signed>> = <<34:18/native-signed>>,
+                         X end,
+                "begin <<X:18/native-signed>> = <<34:18/native-signed>>,
+                       X end.",
+                34),
+    ?line check(fun() -> <<X:18/big-unsigned>> = <<34:18/big-unsigned>>,
+                         X end,
+                "begin <<X:18/big-unsigned>> = <<34:18/big-unsigned>>,
+                       X end.",
+                34),
+    ?line check(fun() ->
+                        <<X:18/little-unsigned>> = <<34:18/little-unsigned>>,
+                        X end,
+                "begin <<X:18/little-unsigned>> = <<34:18/little-unsigned>>,
+                       X end.",
+                34),
+    ?line check(fun() ->
+                        <<X:18/native-unsigned>> = <<34:18/native-unsigned>>,
+                        X end,
+                "begin <<X:18/native-unsigned>> = <<34:18/native-unsigned>>,
+                       X end.",
+                34),
+    ?line check(fun() -> <<X:32/float-big>> = <<2.0:32/float-big>>, X end,
+                "begin <<X:32/float-big>> = <<2.0:32/float-big>>,
+                        X end.",
+                2.0),
+    ?line check(fun() -> <<X:32/float-little>> = <<2.0:32/float-little>>,
+                         X end,
+                "begin <<X:32/float-little>> = <<2.0:32/float-little>>,
+                        X end.",
+                2.0),
+    ?line check(fun() -> <<X:32/float-native>> = <<2.0:32/float-native>>,
+                         X end,
+                "begin <<X:32/float-native>> = <<2.0:32/float-native>>,
+                        X end.",
+                2.0),
+
+    ?line check(
+            fun() ->
+                    [X || <<"hej",X:8>> <= <<"hej",8,"san",9,"hej",17,"hej">>]
+            end,
+            "[X || <<\"hej\",X:8>> <=
+                        <<\"hej\",8,\"san\",9,\"hej\",17,\"hej\">>].",
+            [8,17]),
+    ?line check(
+            fun() ->
+                    L = 8, << <<B:32>> || <<L:L,B:L>> <= <<16:8, 7:16>> >>
+            end,
+            "begin L = 8, << <<B:32>> || <<L:L,B:L>> <= <<16:8, 7:16>> >>
+             end.",
+            <<0,0,0,7>>),
+    %% Test the Value part of a binary segment.
+    %% "Old" bugs have been fixed (partial_eval is called on Value).
+    ?line check(fun() -> [ 3 || <<17/float>> <= <<17.0/float>>] end,
+                "[ 3 || <<17/float>> <= <<17.0/float>>].",
+                [3]),
+    ?line check(fun() -> [ 3 || <<17/float>> <- [<<17.0/float>>]] end,
+                "[ 3 || <<17/float>> <- [<<17.0/float>>]].",
+                [3]),
+    ?line check(fun() -> [ X || <<17/float,X:3>> <= <<17.0/float,2:3>>] end,
+                "[ X || <<17/float,X:3>> <= <<17.0/float,2:3>>].",
+                [2]),
+    ?line check(fun() ->
+                 [ foo || <<(1 bsl 1023)/float>> <= <<(1 bsl 1023)/float>>]
+                end,
+                "[ foo || <<(1 bsl 1023)/float>> <= <<(1 bsl 1023)/float>>].",
+                [foo]),
+    ?line check(fun() ->
+                 [ foo || <<(1 bsl 1023)/float>> <- [<<(1 bsl 1023)/float>>]]
+                end,
+               "[ foo || <<(1 bsl 1023)/float>> <- [<<(1 bsl 1023)/float>>]].",
+                [foo]),
+    ?line error_check("[ foo || <<(1 bsl 1024)/float>> <-
+                            [<<(1 bsl 1024)/float>>]].",
+                      badarg),
+    ?line check(fun() ->
+                 [ foo || <<(1 bsl 1024)/float>> <- [<<(1 bsl 1023)/float>>]]
+                end,
+                "[ foo || <<(1 bsl 1024)/float>> <-
+                            [<<(1 bsl 1023)/float>>]].",
+                []),
+    ?line check(fun() ->
+                 [ foo || <<(1 bsl 1024)/float>> <= <<(1 bsl 1023)/float>>]
+                end,
+                "[ foo || <<(1 bsl 1024)/float>> <=
+                            <<(1 bsl 1023)/float>>].",
+                []),
+    ?line check(fun() ->
+                        L = 8,
+                        [{L,B} || <<L:L,B:L/float>> <= <<32:8,7:32/float>>]
+                end,
+                "begin L = 8,
+                       [{L,B} || <<L:L,B:L/float>> <= <<32:8,7:32/float>>]
+                 end.",
+                [{32,7.0}]),
+    ?line check(fun() ->
+                        L = 8,
+                        [{L,B} || <<L:L,B:L/float>> <- [<<32:8,7:32/float>>]]
+                end,
+                "begin L = 8,
+                       [{L,B} || <<L:L,B:L/float>> <- [<<32:8,7:32/float>>]]
+                 end.",
+                [{32,7.0}]),
+    ?line check(fun() ->
+                        [foo || <<"s">> <= <<"st">>]
+                end,
+                "[foo || <<\"s\">> <= <<\"st\">>].",
+                [foo]),
+    ?line check(fun() -> <<_:32>> = <<17:32>> end,
+                "<<_:32>> = <<17:32>>.",
+                <<17:32>>),
+    ?line check(fun() -> [foo || <<_:32>> <= <<17:32,20:32>>] end,
+                "[foo || <<_:32>> <= <<17:32,20:32>>].",
+                [foo,foo]),
+
+    ?line check(fun() -> << <<X:32>> || X <- [1,2,3], X > 1 >> end,
+                "<< <<X:32>> || X <- [1,2,3], X > 1 >>.",
+                <<0,0,0,2,0,0,0,3>>),
+    ?line error_check("[X || <<X>> <= [a,b]].",{bad_generator,[a,b]}),
+    ok.
+
+otp_6787(doc) ->
+    ["OTP-6787. bitlevel binaries."];
+otp_6787(suite) ->
+    [];
+otp_6787(Config) when is_list(Config) ->
+    ?line check(
+            fun() -> <<16:(1024*1024)>> = <<16:(1024*1024)>> end,
+            "<<16:(1024*1024)>> = <<16:(1024*1024)>>.",
+            <<16:1048576>>),
+    ok.
+
+otp_6977(doc) ->
+    ["OTP-6977. ++ bug."];
+otp_6977(suite) ->
+    [];
+otp_6977(Config) when is_list(Config) ->
+    ?line check(
+            fun() -> (fun([$X] ++ _) -> ok end)("X") end,
+            "(fun([$X] ++ _) -> ok end)(\"X\").",
+            ok),
+    ok.
+
+otp_7550(doc) ->
+    ["OTP-7550. Support for UTF-8, UTF-16, UTF-32."];
+otp_7550(Config) when is_list(Config) ->
+
+    %% UTF-8.
+    ?line check(
+	    fun() -> <<65>> = <<65/utf8>> end,
+	    "<<65>> = <<65/utf8>>.",
+	    <<65>>),
+    ?line check(
+	    fun() -> <<350/utf8>> = <<197,158>> end,
+	    "<<350/utf8>> = <<197,158>>.",
+	    <<197,158>>),
+    ?line check(
+	    fun() -> <<$b,$j,$\303,$\266,$r,$n>> = <<"bj\366rn"/utf8>> end,
+	    "<<$b,$j,$\303,$\266,$r,$n>> = <<\"bj\366rn\"/utf8>>.",
+	    <<$b,$j,$\303,$\266,$r,$n>>),
+
+    %% UTF-16.
+    ?line check(
+	    fun() -> <<0,65>> = <<65/utf16>> end,
+	    "<<0,65>> = <<65/utf16>>.",
+	    <<0,65>>),
+    ?line check(
+	    fun() -> <<16#D8,16#08,16#DF,16#45>> = <<16#12345/utf16>> end,
+	    "<<16#D8,16#08,16#DF,16#45>> = <<16#12345/utf16>>.",
+	    <<16#D8,16#08,16#DF,16#45>>),
+    ?line check(
+	    fun() -> <<16#08,16#D8,16#45,16#DF>> = <<16#12345/little-utf16>> end,
+	    "<<16#08,16#D8,16#45,16#DF>> = <<16#12345/little-utf16>>.",
+	    <<16#08,16#D8,16#45,16#DF>>),
+
+    ?line check(
+	    fun() -> <<350/utf16>> = <<1,94>> end,
+	    "<<350/utf16>> = <<1,94>>.",
+	    <<1,94>>),
+    ?line check(
+	    fun() -> <<350/little-utf16>> = <<94,1>> end,
+	    "<<350/little-utf16>> = <<94,1>>.",
+	    <<94,1>>),
+    ?line check(
+	    fun() -> <<16#12345/utf16>> = <<16#D8,16#08,16#DF,16#45>> end,
+	    "<<16#12345/utf16>> = <<16#D8,16#08,16#DF,16#45>>.",
+	    <<16#D8,16#08,16#DF,16#45>>),
+    ?line check(
+	    fun() -> <<16#12345/little-utf16>> = <<16#08,16#D8,16#45,16#DF>> end,
+	    "<<16#12345/little-utf16>> = <<16#08,16#D8,16#45,16#DF>>.",
+	    <<16#08,16#D8,16#45,16#DF>>),
+
+    %% UTF-32.
+    ?line check(
+	    fun() -> <<16#12345/utf32>> = <<16#0,16#01,16#23,16#45>> end,
+	    "<<16#12345/utf32>> = <<16#0,16#01,16#23,16#45>>.",
+	    <<16#0,16#01,16#23,16#45>>),
+    ?line check(
+	    fun() -> <<16#0,16#01,16#23,16#45>> = <<16#12345/utf32>> end,
+	    "<<16#0,16#01,16#23,16#45>> = <<16#12345/utf32>>.",
+	    <<16#0,16#01,16#23,16#45>>),
+    ?line check(
+	    fun() -> <<16#12345/little-utf32>> = <<16#45,16#23,16#01,16#00>> end,
+	    "<<16#12345/little-utf32>> = <<16#45,16#23,16#01,16#00>>.",
+	    <<16#45,16#23,16#01,16#00>>),
+    ?line check(
+	    fun() -> <<16#12345/little-utf32>> end,
+	    "<<16#12345/little-utf32>>.",
+	    <<16#45,16#23,16#01,16#00>>),
+
+    %% Mixed.
+    ?line check(
+	    fun() -> <<16#41,16#12345/utf32,16#0391:16,16#2E:8>> end,
+	    "<<16#41,16#12345/utf32,16#0391:16,16#2E:8>>.",
+	    <<16#41,16#00,16#01,16#23,16#45,16#03,16#91,16#2E>>),
+    ok.
+
+
+otp_8133(doc) ->
+    ["OTP-8133. Bit comprehension bug."];
+otp_8133(suite) ->
+    [];
+otp_8133(Config) when is_list(Config) ->
+    ?line check(
+            fun() ->
+                  E = fun(N) ->
+                              if
+                                  is_integer(N) -> <<N/integer>>;
+                                  true -> throw(foo)
+                              end
+                      end,
+                  try << << (E(V))/binary >> || V <- [1,2,3,a] >>
+                  catch foo -> ok
+                  end
+            end,
+            "begin
+                 E = fun(N) ->
+                            if is_integer(N) -> <<N/integer>>;
+                               true -> throw(foo)
+                            end
+                     end,
+                 try << << (E(V))/binary >> || V <- [1,2,3,a] >>
+                 catch foo -> ok
+                 end
+             end.",
+            ok),
+    ?line check(
+            fun() ->
+                  E = fun(N) ->
+                              if
+                                  is_integer(N) -> <<N/integer>>;
+                                  true -> erlang:error(foo)
+                              end
+                      end,
+                  try << << (E(V))/binary >> || V <- [1,2,3,a] >>
+                  catch error:foo -> ok
+                  end
+            end,
+            "begin
+                 E = fun(N) ->
+                            if is_integer(N) -> <<N/integer>>;
+                               true -> erlang:error(foo)
+                            end
+                     end,
+                 try << << (E(V))/binary >> || V <- [1,2,3,a] >>
+                 catch error:foo -> ok
+                 end
+             end.",
+            ok),
+    ok.
+
+funs(doc) ->
+    ["Simple cases, just to cover some code."];
+funs(suite) ->
+    [];
+funs(Config) when is_list(Config) ->
+    do_funs(none, none),
+    do_funs(lfh(), none),
+    do_funs(lfh(), efh()),
+
+    ?line error_check("nix:foo().", {access_not_allowed,nix}, lfh(), efh()),
+    ?line error_check("bar().", undef, none, none),
+
+    ?line check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
+                         F1(F1, 1000) end,
+                "begin F1 = fun(F,N) -> count_down(F, N) end,"
+                "F1(F1,1000) end.",
+		0, ['F1'], lfh(), none),
+
+    ?line check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
+                         F1(F1, 1000) end,
+                "begin F1 = fun(F,N) -> count_down(F, N) end,"
+                "F1(F1,1000) end.",
+		0, ['F1'], lfh_value(), none),
+
+    ?line check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
+                         F1(F1, 1000) end,
+                "begin F1 = fun(F,N) -> count_down(F, N) end,"
+                "F1(F1,1000) end.",
+		0, ['F1'], lfh_value_extra(), none),
+
+    ?line check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
+                         F1(F1, 1000) end,
+                "begin F1 = fun(F,N) -> count_down(F, N) end,"
+                "F1(F1,1000) end.",
+		0, ['F1'], {?MODULE,local_func_value}, none),
+    %% This is not documented, and only for backward compatibility (good!).
+    B0 = erl_eval:new_bindings(),
+    ?line check(fun() -> is_function(?MODULE:count_down_fun()) end,
+                "begin is_function(count_down_fun()) end.",
+                true, [], {?MODULE,local_func,[B0]},none),
+
+    EF = fun({timer,sleep}, As) when length(As) == 1 -> exit({got_it,sleep});
+            ({M,F}, As) -> apply(M, F, As)
+         end,
+    EFH = {value, EF},
+    ?line error_check("apply(timer, sleep, [1]).", got_it, none, EFH),
+    ?line error_check("begin F = fun(T) -> timer:sleep(T) end,F(1) end.",
+                      got_it, none, EFH),
+    ?line error_check("fun c/1.", undef),
+    ?line error_check("fun a:b/0().", undef),
+
+    MaxArgs = 20,
+    ?line [true] =
+        lists:usort([run_many_args(SAs) || SAs <- many_args(MaxArgs)]),
+    ?line {'EXIT',{{argument_limit,_},_}} =
+        (catch run_many_args(many_args1(MaxArgs+1))),
+    ok.
+
+run_many_args({S, As}) ->
+    apply(eval_string(S), As) =:= As.
+
+many_args(N) ->
+    [many_args1(I) || I <- lists:seq(1, N)].
+
+many_args1(N) ->
+    F = fun(L, P) ->
+                tl(lists:flatten([","++P++integer_to_list(E) || E <- L]))
+        end,
+    L = lists:seq(1, N),
+    T = F(L, "V"),
+    S = lists:flatten(io_lib:format("fun(~s) -> [~s] end.", [T, T])),
+    {S, L}.
+
+do_funs(LFH, EFH) ->
+    %% LFH is not really used by these examples...
+
+    %% These tests do not prove that tail recursive functions really
+    %% work (that the process does not grow); one should also run them
+    %% manually with 1000 replaced by 1000000.
+
+    M = atom_to_list(?MODULE),
+    ?line check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
+                         F1(F1, 1000) end,
+                concat(["begin F1 = fun(F,N) -> ", M,
+                        ":count_down(F, N) end, F1(F1,1000) end."]),
+		0, ['F1'], LFH, EFH),
+    ?line check(fun() -> F1 = fun(F,N) -> apply(?MODULE,count_down,[F,N])
+                              end, F1(F1, 1000) end,
+                concat(["begin F1 = fun(F,N) -> apply(", M,
+                        ",count_down,[F, N]) end, F1(F1,1000) end."]),
+		0, ['F1'], LFH, EFH),
+    ?line check(fun() -> F1 = fun(F,N) -> {?MODULE,count_down}(F,N)
+                              end, F1(F1, 1000) end,
+                concat(["begin F1 = fun(F,N) -> {", M,
+                        ",count_down}(F, N) end, F1(F1,1000) end."]),
+		0, ['F1'], LFH, EFH),
+    ?line check(fun() -> F = fun(F,N) when N > 0 -> apply(F,[F,N-1]);
+                                (_F,0) -> ok end,
+                         F(F, 1000)
+                end,
+                "begin F = fun(F,N) when N > 0 -> apply(F,[F,N-1]);"
+                             "(_F,0) -> ok end,"
+                       "F(F, 1000) end.",
+                ok, ['F'], LFH, EFH),
+    ?line check(fun() -> F = fun(F,N) when N > 0 ->
+                                     apply(erlang,apply,[F,[F,N-1]]);
+                                (_F,0) -> ok end,
+                         F(F, 1000)
+                end,
+                "begin F = fun(F,N) when N > 0 ->"
+                                   "apply(erlang,apply,[F,[F,N-1]]);"
+                             "(_F,0) -> ok end,"
+                       "F(F, 1000) end.",
+                ok, ['F'], LFH, EFH),
+    ?line check(fun() -> F = count_down_fun(),
+                         SF = fun(SF, F1, N) -> F(SF, F1, N) end,
+                         SF(SF, F, 1000) end,
+                concat(["begin F = ", M, ":count_down_fun(),"
+                        "SF = fun(SF, F1, N) -> F(SF, F1, N) end,"
+                        "SF(SF, F, 1000) end."]),
+                ok, ['F','SF'], LFH, EFH),
+
+
+    ?line check(fun() -> F = fun(X) -> A = 1+X, {X,A} end,
+                         true = {2,3} == F(2) end,
+                "begin F = fun(X) -> A = 1+X, {X,A} end,
+                       true = {2,3} == F(2) end.", true, ['F'], LFH, EFH),
+    ?line check(fun() -> F = fun(X) -> {erlang,'+'}(X,2) end,
+                         true = 3 == F(1) end,
+                "begin F = fun(X) -> {erlang,'+'}(X,2) end,"
+                "      true = 3 == F(1) end.", true, ['F'],
+               LFH, EFH),
+    ?line check(fun() -> F = fun(X) -> byte_size(X) end,
+                         ?MODULE:do_apply(F,<<"hej">>) end,
+                concat(["begin F = fun(X) -> size(X) end,",
+                        M,":do_apply(F,<<\"hej\">>) end."]),
+                3, ['F'], LFH, EFH),
+
+    ?line check(fun() -> F1 = fun(X, Z) -> {X,Z} end,
+                         Z = 5,
+                         F2 = fun(X, Y) -> F1(Z,{X,Y}) end,
+                         F3 = fun(X, Y) -> {a,F1(Z,{X,Y})} end,
+                         {5,{x,y}} = F2(x,y),
+                         {a,{5,{y,x}}} = F3(y,x),
+                         {5,{5,y}} = F2(Z,y),
+                         true = {5,{x,5}} == F2(x,Z) end,
+                "begin F1 = fun(X, Z) -> {X,Z} end,
+                       Z = 5,
+                       F2 = fun(X, Y) -> F1(Z,{X,Y}) end,
+                       F3 = fun(X, Y) -> {a,F1(Z,{X,Y})} end,
+                       {5,{x,y}} = F2(x,y),
+                       {a,{5,{y,x}}} = F3(y,x),
+                       {5,{5,y}} = F2(Z,y),
+                       true = {5,{x,5}} == F2(x,Z) end.",
+                true, ['F1','Z','F2','F3'], LFH, EFH),
+    ?line check(fun() -> F = fun(X) -> byte_size(X) end,
+                         F2 = fun(Y) -> F(Y) end,
+                         ?MODULE:do_apply(F2,<<"hej">>) end,
+                concat(["begin F = fun(X) -> size(X) end,",
+                        "F2 = fun(Y) -> F(Y) end,",
+                        M,":do_apply(F2,<<\"hej\">>) end."]),
+                3, ['F','F2'], LFH, EFH),
+    ?line check(fun() -> Z = 5, F = fun(X) -> {Z,X} end,
+                         F2 = fun(Z) -> F(Z) end, F2(3) end,
+                "begin Z = 5, F = fun(X) -> {Z,X} end,
+                       F2 = fun(Z) -> F(Z) end, F2(3) end.",
+                {5,3},['F','F2','Z'], LFH, EFH),
+    ?line check(fun() -> F = fun(Z) -> Z end,
+                         F2 = fun(X) -> F(X), Z = {X,X}, Z end,
+                         {1,1} = F2(1), Z = 7, Z end,
+                "begin F = fun(Z) -> Z end,
+                       F2 = fun(X) -> F(X), Z = {X,X}, Z end,
+                       {1,1} = F2(1), Z = 7, Z end.", 7, ['F','F2','Z'],
+                LFH, EFH),
+    ?line check(fun() -> F = fun(F, N) -> [?MODULE:count_down(F,N) || X <-[1]]
+                             end, F(F,2) end,
+                concat(["begin F = fun(F, N) -> [", M,
+                       ":count_down(F,N) || X <-[1]] end, F(F,2) end."]),
+                [[[0]]], ['F'], LFH, EFH),
+    ok.
+
+count_down(F, N) when N > 0 ->
+    F(F, N-1);
+count_down(_F, N) ->
+    N.
+
+count_down_fun() ->
+    fun(SF,F,N) when N > 0 -> SF(SF,F,N-1);
+       (_SF,_F,_N) -> ok
+    end.
+
+do_apply(F, V) ->
+    F(V).
+
+lfh() ->
+    {eval, fun(F, As, Bs) -> local_func(F, As, Bs) end}.
+
+local_func(F, As0, Bs0) when is_atom(F) ->
+    {As,Bs} = erl_eval:expr_list(As0, Bs0, {eval,lfh()}),
+    case erlang:function_exported(?MODULE, F, length(As)) of
+	true ->
+	    {value,apply(?MODULE, F, As),Bs};
+	false ->
+	    {value,apply(shell_default, F, As),Bs}
+    end.
+
+lfh_value_extra() ->
+    %% Not documented.
+    {value, fun(F, As) -> local_func_value(F, As) end, []}.
+
+lfh_value() ->
+    {value, fun(F, As) -> local_func_value(F, As) end}.
+
+local_func_value(F, As) when is_atom(F) ->
+    case erlang:function_exported(?MODULE, F, length(As)) of
+	true ->
+	    apply(?MODULE, F, As);
+	false ->
+	    apply(shell_default, F, As)
+    end.
+
+efh() ->
+    {value, fun(F, As) -> external_func(F, As) end}.
+
+external_func({M,_}, _As) when M == nix ->
+    exit({{access_not_allowed,M},[mfa]});
+external_func(F, As) when is_function(F) ->
+    apply(F, As);
+external_func({M,F}, As) ->
+    apply(M, F, As).
+
+
+
+try_catch(doc) ->
+    ["Test try-of-catch-after-end statement"];
+try_catch(suite) ->
+    [];
+try_catch(Config) when is_list(Config) ->
+    %% Match in of with catch
+    ?line check(fun() -> try 1 of 1 -> 2 catch _:_ -> 3 end end,
+		"try 1 of 1 -> 2 catch _:_ -> 3 end.", 2),
+    ?line check(fun() -> try 1 of 1 -> 2; 3 -> 4 catch _:_ -> 5 end end,
+		"try 1 of 1 -> 2; 3 -> 4 catch _:_ -> 5 end.", 2),
+    ?line check(fun() -> try 3 of 1 -> 2; 3 -> 4 catch _:_ -> 5 end end,
+		"try 3 of 1 -> 2; 3 -> 4 catch _:_ -> 5 end.", 4),
+    %% Just after
+    ?line check(fun () -> X = try 1 after put(try_catch, 2) end,
+			  {X,get(try_catch)} end,
+		"begin X = try 1 after put(try_catch, 2) end, "
+		"{X,get(try_catch)} end.", {1,2}),
+    %% Match in of with after
+    ?line check(fun() -> X = try 1 of 1 -> 2 after put(try_catch, 3) end,
+			 {X,get(try_catch)} end,
+		"begin X = try 1 of 1 -> 2 after put(try_catch, 3) end, "
+		"{X,get(try_catch)} end.", {2,3}),
+    ?line check(fun() -> X = try 1 of 1 -> 2; 3 -> 4
+			     after put(try_catch, 5) end,
+			 {X,get(try_catch)} end,
+		"begin X = try 1 of 1 -> 2; 3 -> 4 "
+		"          after put(try_catch, 5) end, "
+		"      {X,get(try_catch)} end.", {2,5}),
+    ?line check(fun() -> X = try 3 of 1 -> 2; 3 -> 4
+			     after put(try_catch, 5) end,
+			 {X,get(try_catch)} end,
+		"begin X = try 3 of 1 -> 2; 3 -> 4 "
+		"          after put(try_catch, 5) end, "
+		"      {X,get(try_catch)} end.", {4,5}),
+    %% Nomatch in of
+    ?line error_check("try 1 of 2 -> 3 catch _:_ -> 4 end.",
+		      {try_clause,1}),
+    %% Nomatch in of with after
+    ?line check(fun () -> {'EXIT',{{try_clause,1},_}} =
+			      begin catch try 1 of 2 -> 3
+				          after put(try_catch, 4) end end,
+			  get(try_catch) end,
+		"begin {'EXIT',{{try_clause,1},_}} = "
+		"          begin catch try 1 of 2 -> 3 "
+		"                      after put(try_catch, 4) end end, "
+		"      get(try_catch) end. ", 4),
+    %% Exception in try
+    ?line check(fun () -> try 1=2 catch error:{badmatch,2} -> 3 end end,
+		"try 1=2 catch error:{badmatch,2} -> 3 end.", 3),
+    ?line check(fun () -> try 1=2 of 3 -> 4
+			  catch error:{badmatch,2} -> 5 end end,
+		"try 1=2 of 3 -> 4 "
+		"catch error:{badmatch,2} -> 5 end.", 5),
+    %% Exception in try with after
+    ?line check(fun () -> X = try 1=2
+			      catch error:{badmatch,2} -> 3
+			      after put(try_catch, 4) end,
+			  {X,get(try_catch)} end,
+		"begin X = try 1=2 "
+		"          catch error:{badmatch,2} -> 3 "
+		"          after put(try_catch, 4) end, "
+		"      {X,get(try_catch)} end. ", {3,4}),
+    ?line check(fun () -> X = try 1=2 of 3 -> 4
+			      catch error:{badmatch,2} -> 5
+			      after put(try_catch, 6) end,
+			  {X,get(try_catch)} end,
+		"begin X = try 1=2 of 3 -> 4"
+		"          catch error:{badmatch,2} -> 5 "
+		"          after put(try_catch, 6) end, "
+		"      {X,get(try_catch)} end. ", {5,6}),
+    %% Uncaught exception
+    ?line error_check("try 1=2 catch error:undefined -> 3 end. ",
+		      {badmatch,2}),
+    ?line error_check("try 1=2 of 3 -> 4 catch error:undefined -> 5 end. ",
+		      {badmatch,2}),
+    %% Uncaught exception with after
+    ?line check(fun () -> {'EXIT',{{badmatch,2},_}} =
+			      begin catch try 1=2
+					  after put(try_catch, 3) end end,
+			  get(try_catch) end,
+		"begin {'EXIT',{{badmatch,2},_}} = "
+		"          begin catch try 1=2 "
+		"                      after put(try_catch, 3) end end, "
+		"      get(try_catch) end. ", 3),
+    ?line check(fun () -> {'EXIT',{{badmatch,2},_}} =
+			      begin catch try 1=2 of 3 -> 4
+					  after put(try_catch, 5) end end,
+			  get(try_catch) end,
+		"begin {'EXIT',{{badmatch,2},_}} = "
+		"          begin catch try 1=2 of 3 -> 4"
+		"                      after put(try_catch, 5) end end, "
+		"      get(try_catch) end. ", 5),
+    ?line check(fun () -> {'EXIT',{{badmatch,2},_}} =
+			      begin catch try 1=2 catch error:undefined -> 3
+					  after put(try_catch, 4) end end,
+			  get(try_catch) end,
+		"begin {'EXIT',{{badmatch,2},_}} = "
+		"          begin catch try 1=2 catch error:undefined -> 3 "
+		"                      after put(try_catch, 4) end end, "
+		"      get(try_catch) end. ", 4),
+    ?line check(fun () -> {'EXIT',{{badmatch,2},_}} =
+			      begin catch try 1=2 of 3 -> 4
+					  catch error:undefined -> 5
+					  after put(try_catch, 6) end end,
+			  get(try_catch) end,
+		"begin {'EXIT',{{badmatch,2},_}} = "
+		"          begin catch try 1=2 of 3 -> 4 "
+		"                      catch error:undefined -> 5 "
+		"                      after put(try_catch, 6) end end, "
+		"      get(try_catch) end. ", 6),
+    ok.
+
+
+eval_expr_5(doc) ->
+    ["(OTP-7933)"];
+eval_expr_5(suite) ->
+    [];
+eval_expr_5(Config) when is_list(Config) ->
+    ?line {ok,Tokens ,_} =
+	erl_scan:string("if a+4 == 4 -> yes; true -> no end. "),
+    ?line {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
+    ?line {value, no, []} = erl_eval:expr(Expr, [], none, none, none),
+    ?line no = erl_eval:expr(Expr, [], none, none, value),
+    try
+	erl_eval:expr(Expr, [], none, none, 4711),
+	?line function_clause = should_never_reach_here
+    catch
+	error:function_clause ->
+	    ok
+    end.
+
+%% Check the string in different contexts: as is; in fun; from compiled code.
+check(F, String, Result) ->
+    check1(F, String, Result),
+    FunString = concat(["fun() -> ", no_final_dot(String), " end(). "]),
+    check1(F, FunString, Result),
+    CompileString = concat(["hd(lists:map(fun(_) -> ", no_final_dot(String),
+                            " end, [foo])). "]),
+    check1(F, CompileString, Result).
+
+check1(F, String, Result) ->
+    Result = F(),
+    case catch parse_and_run(String) of
+        {value, Result, _} ->
+            ok;
+        Other ->
+            test_server:fail({eval, Other, Result})
+    end.
+
+check(F, String, Result, BoundVars, LFH, EFH) ->
+    Result = F(),
+    case catch parse_and_run(String, LFH, EFH) of
+        {value, Result, Bs} ->
+            %% We just assume that Bs is an orddict...
+            Keys = orddict:fetch_keys(Bs),
+            case sort(BoundVars) == Keys of
+                true ->
+                    ok;
+                false ->
+                    test_server:fail({check, BoundVars, Keys})
+            end,
+            ok;
+        Other ->
+            test_server:fail({check, Other, Result})
+    end.
+
+error_check(String, Result) ->
+    case catch parse_and_run(String) of
+        {'EXIT', {Result,_}} ->
+            ok;
+        Other ->
+            test_server:fail({eval, Other, Result})
+    end.
+
+error_check(String, Result, LFH, EFH) ->
+    case catch parse_and_run(String, LFH, EFH) of
+        {'EXIT', {Result,_}} ->
+            ok;
+        Other ->
+            test_server:fail({eval, Other, Result})
+    end.
+
+eval_string(String) ->
+    {value, Result, _} = parse_and_run(String),
+    Result.
+
+parse_and_run(String) ->
+    {ok,Tokens,_} = erl_scan:string(String),
+    {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
+    erl_eval:expr(Expr, []).
+
+parse_and_run(String, LFH, EFH) ->
+    {ok,Tokens,_} = erl_scan:string(String),
+    {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
+    erl_eval:expr(Expr, [], LFH, EFH).
+
+no_final_dot(S) ->
+    case lists:reverse(S) of
+        " ." ++ R -> lists:reverse(R);
+        "." ++ R -> lists:reverse(R);
+        _ -> S
+    end.
diff --git a/lib/debugger/test/exception_SUITE.erl b/lib/debugger/test/exception_SUITE.erl
new file mode 100644
index 0000000000..e6d627b40e
--- /dev/null
+++ b/lib/debugger/test/exception_SUITE.erl
@@ -0,0 +1,270 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2010. 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(exception_SUITE).
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 badmatch/1,pending_errors/1,nil_arith/1]).
+
+-export([bad_guy/2]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [badmatch, pending_errors, nil_arith].
+
+-define(try_match(E),
+	catch ?MODULE:bar(),
+	{'EXIT', {{badmatch, nomatch}, _}} = (catch E = nomatch)).
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+badmatch(doc) -> "Test that deliberately bad matches are reported correctly.";
+badmatch(suite) -> [];
+badmatch(Config) when list(Config) ->
+    ?line ?try_match(a),
+    ?line ?try_match(42),
+    ?line ?try_match({a, b, c}),
+    ?line ?try_match([]),
+    ?line ?try_match(1.0),
+    ok.
+
+pending_errors(doc) ->
+    ["Test various exceptions, in the presence of a previous error suppressed ",
+     "in a guard."];
+pending_errors(suite) -> [];
+pending_errors(Config) when list(Config) ->
+    ?line pending(e_badmatch, {badmatch, b}),
+    ?line pending(x, function_clause),
+    ?line pending(e_case, {case_clause, xxx}),
+    ?line pending(e_if, if_clause),
+    ?line pending(e_badarith, badarith),
+    ?line pending(e_undef, undef),
+    ?line pending(e_timeoutval, timeout_value),
+    ?line pending(e_badarg, badarg),
+    ?line pending(e_badarg_spawn, badarg),
+    ok.
+
+bad_guy(pe_badarith, Other) when Other+1 == 0 -> % badarith (suppressed)
+    ok;
+bad_guy(pe_badarg, Other) when length(Other) > 0 -> % badarg (suppressed)
+    ok;
+bad_guy(_, e_case) ->
+    case xxx of
+	ok -> ok
+    end;					% case_clause
+bad_guy(_, e_if) ->
+    if
+	a == b -> ok
+    end;					% if_clause
+bad_guy(_, e_badarith) ->
+    1+b;					% badarith
+bad_guy(_, e_undef) ->
+    non_existing_module:foo();			% undef
+bad_guy(_, e_timeoutval) ->
+    receive
+	after arne ->				% timeout_value
+		ok
+	end;
+bad_guy(_, e_badarg) ->
+    node(xxx);					% badarg
+bad_guy(_, e_badarg_spawn) ->
+    spawn({}, {}, {});				% badarg
+bad_guy(_, e_badmatch) ->
+    a = b.					% badmatch
+
+pending(Arg, Expected) ->
+    pending(pe_badarith, Arg, Expected),
+    pending(pe_badarg, Arg, Expected).
+
+pending(First, Second, Expected) ->
+    pending_catched(First, Second, Expected),
+    pending_exit_message([First, Second], Expected).
+
+pending_catched(First, Second, Expected) ->
+    ok = io:format("Catching bad_guy(~p, ~p)", [First, Second]),
+    case catch bad_guy(First, Second) of
+	{'EXIT', Reason} ->
+	    pending(Reason, bad_guy, [First, Second], Expected);
+	Other ->
+	    test_server:fail({not_exit, Other})
+    end.
+
+pending_exit_message(Args, Expected) ->
+    ok = io:format("Trapping EXITs from spawn_link(~p, ~p, ~p)",
+		   [?MODULE, bad_guy, Args]),
+    process_flag(trap_exit, true),
+    Pid = spawn_link(?MODULE, bad_guy, Args),
+    receive
+	{'EXIT', Pid, Reason} ->
+	    pending(Reason, bad_guy, Args, Expected);
+	Other ->
+	    test_server:fail({unexpected_message, Other})
+    after 10000 ->
+	    test_server:fail(timeout)
+    end,
+    process_flag(trap_exit, false).
+
+pending({badarg,[{erlang,Bif,BifArgs},{?MODULE,Func,Arity}|_]}, Func, Args, _Code)
+  when atom(Bif), list(BifArgs), length(Args) == Arity -> %Threaded code.
+    ok;
+pending({badarg,[{erlang,Bif,BifArgs},{?MODULE,Func,Args}|_]}, Func, Args, _Code)
+  when atom(Bif), list(BifArgs) -> %From interpreted code.
+    ok;
+pending({undef,[{non_existing_module,foo,[]}|_]}, _, _, _) ->
+    ok;
+pending({function_clause,[{?MODULE,Func,Args}|_]}, Func, Args, _Code) ->
+    ok;
+pending({Code,[{?MODULE,Func,Arity}|_]}, Func, Args, Code) when length(Args) == Arity -> %Threaded code
+    ok;
+pending({Code,[{?MODULE,Func,Args}|_]}, Func, Args, Code) -> %From interpreted code.
+    ok;
+pending(Reason, Func, Args, Code) ->
+    test_server:fail({bad_exit_reason,Reason,{Func,Args,Code}}).
+
+nil_arith(doc) ->
+    "Test that doing arithmetics on [] gives a badarith EXIT and not a crash.";
+nil_arith(suite) ->
+    [];
+nil_arith(Config) when list(Config) ->
+    ?line ba_plus_minus_times([], []),
+
+    ?line ba_plus_minus_times([], 0),
+    ?line ba_plus_minus_times([], 42),
+    ?line ba_plus_minus_times([], 38724978123478923784),
+    ?line ba_plus_minus_times([], 38.72),
+
+    ?line ba_plus_minus_times(0, []),
+    ?line ba_plus_minus_times(334, []),
+    ?line ba_plus_minus_times(387249797813478923784, []),
+    ?line ba_plus_minus_times(344.22, []),
+
+    ?line ba_div_rem([], []),
+
+    ?line ba_div_rem([], 0),
+    ?line ba_div_rem([], 1),
+    ?line ba_div_rem([], 42),
+    ?line ba_div_rem([], 38724978123478923784),
+    ?line ba_div_rem(344.22, []),
+
+    ?line ba_div_rem(0, []),
+    ?line ba_div_rem(1, []),
+    ?line ba_div_rem(334, []),
+    ?line ba_div_rem(387249797813478923784, []),
+    ?line ba_div_rem(344.22, []),
+
+    ?line ba_div_rem(344.22, 0.0),
+    ?line ba_div_rem(1, 0.0),
+    ?line ba_div_rem(392873498733971, 0.0),
+
+    ?line ba_bop([], []),
+    ?line ba_bop(0, []),
+    ?line ba_bop(42, []),
+    ?line ba_bop(-42342742987343, []),
+    ?line ba_bop(238.342, []),
+    ?line ba_bop([], 0),
+    ?line ba_bop([], -243),
+    ?line ba_bop([], 243),
+    ?line ba_bop([], 2438724982478933),
+    ?line ba_bop([], 3987.37),
+
+    ?line ba_bnot([]),
+    ?line ba_bnot(23.33),
+
+    ?line ba_shift([], []),
+    ?line ba_shift([], 0),
+    ?line ba_shift([], 4),
+    ?line ba_shift([], -4),
+    ?line ba_shift([], 2343333333333),
+    ?line ba_shift([], -333333333),
+    ?line ba_shift([], 234.00),
+    ?line ba_shift(23, []),
+    ?line ba_shift(0, []),
+    ?line ba_shift(-3433443433433323, []),
+    ?line ba_shift(433443433433323, []),
+    ?line ba_shift(343.93, []),
+    ok.
+
+ba_plus_minus_times(A, B) ->
+    io:format("~p + ~p", [A, B]),
+    {'EXIT', {badarith, _}} = (catch A + B),
+    io:format("~p - ~p", [A, B]),
+    {'EXIT', {badarith, _}} = (catch A - B),
+    io:format("~p * ~p", [A, B]),
+    {'EXIT', {badarith, _}} = (catch A * B).
+
+ba_div_rem(A, B) ->
+    io:format("~p / ~p", [A, B]),
+    {'EXIT', {badarith, _}} = (catch A / B),
+    io:format("~p div ~p", [A, B]),
+    {'EXIT', {badarith, _}} = (catch A div B),
+    io:format("~p rem ~p", [A, B]),
+    {'EXIT', {badarith, _}} = (catch A rem B).
+
+ba_bop(A, B) ->
+    io:format("~p band ~p", [A, B]),
+    {'EXIT', {badarith, _}} = (catch A band B),
+    io:format("~p bor ~p", [A, B]),
+    {'EXIT', {badarith, _}} = (catch A bor B),
+    io:format("~p bxor ~p", [A, B]),
+    {'EXIT', {badarith, _}} = (catch A bxor B).
+
+ba_shift(A, B) ->
+    io:format("~p bsl ~p", [A, B]),
+    {'EXIT', {badarith, _}} = (catch A bsl B),
+    io:format("~p bsr ~p", [A, B]),
+    {'EXIT', {badarith, _}} = (catch A bsr B).
+
+ba_bnot(A) ->
+    io:format("bnot ~p", [A]),
+    {'EXIT', {badarith, _}} = (catch bnot A).
diff --git a/lib/debugger/test/fun_SUITE.erl b/lib/debugger/test/fun_SUITE.erl
new file mode 100644
index 0000000000..f56c6fe4bf
--- /dev/null
+++ b/lib/debugger/test/fun_SUITE.erl
@@ -0,0 +1,246 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2010. 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(fun_SUITE).
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 good_call/1,bad_apply/1,bad_fun_call/1,badarity/1,
+	 ext_badarity/1,otp_6061/1]).
+-export([nothing/0]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [good_call, bad_apply, bad_fun_call, badarity,
+     ext_badarity, otp_6061].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+good_call(Config) when is_list(Config) ->
+    ?line F = fun() -> ok end,
+    ?line ok = F(),
+    ?line FF = fun ?MODULE:nothing/0,
+    ?line ok = FF(),
+    ok.
+
+bad_apply(doc) ->
+    "Test that the correct EXIT code is returned for all types of bad funs.";
+bad_apply(suite) -> [];
+bad_apply(Config) when is_list(Config) ->
+    ?line bad_apply_fc(42, [0]),
+    ?line bad_apply_fc(xx, [1]),
+    ?line bad_apply_fc({}, [2]),
+    ?line bad_apply_fc({1}, [3]),
+    ?line bad_apply_fc({1,2,3}, [4]),
+    ?line bad_apply_fc({1,2,3}, [5]),
+    ?line bad_apply_fc({1,2,3,4}, [6]),
+    ?line bad_apply_fc({1,2,3,4,5,6}, [7]),
+    ?line bad_apply_fc({1,2,3,4,5}, [8]),
+    ?line bad_apply_badarg({1,2}, [9]),
+    ok.
+
+bad_apply_fc(Fun, Args) ->
+    Res = (catch apply(Fun, Args)),
+    erlang:garbage_collect(),
+    erlang:yield(),
+    case Res of
+	{'EXIT',{{badfun,Fun},_Where}} ->
+	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res]);
+	Other ->
+	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res]),
+	    ?t:fail({bad_result,Other})
+    end.
+
+bad_apply_badarg(Fun, Args) ->
+    Res = (catch apply(Fun, Args)),
+    erlang:garbage_collect(),
+    erlang:yield(),
+    case Res of
+	{'EXIT',{{badfun,Fun},_Where}} ->
+	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res]);
+	Other ->
+	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res]),
+	    ?t:fail({bad_result, Other})
+    end.
+
+bad_fun_call(doc) ->
+    "Try directly calling bad funs.";
+bad_fun_call(suite) -> [];
+bad_fun_call(Config) when is_list(Config) ->
+    ?line bad_call_fc(42),
+    ?line bad_call_fc(xx),
+    ?line bad_call_fc({}),
+    ?line bad_call_fc({1}),
+    ?line bad_call_fc({1,2,3}),
+    ?line bad_call_fc({1,2,3}),
+    ?line bad_call_fc({1,2,3,4}),
+    ?line bad_call_fc({1,2,3,4,5,6}),
+    ?line bad_call_fc({1,2,3,4,5}),
+    ?line bad_call_fc({1,2}),
+    ok.
+
+bad_call_fc(Fun) ->
+    Args = [some,stupid,args],
+    Res = (catch Fun(Args)),
+    case Res of
+	{'EXIT',{{badfun,Fun},_Where}} ->
+	    ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]);
+	Other ->
+	    ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]),
+	    ?t:fail({bad_result,Other})
+    end.
+
+%% Call and apply valid external funs with wrong number of arguments.
+
+badarity(Config) when is_list(Config) ->
+    ?line Fun = fun() -> ok end,
+    ?line Stupid = {stupid,arguments},
+    ?line Args = [some,{stupid,arguments},here],
+
+    %% Simple call.
+
+    ?line Res = (catch Fun(some, Stupid, here)),
+    erlang:garbage_collect(),
+    erlang:yield(),
+    case Res of
+	{'EXIT',{{badarity,{Fun,Args}},[_|_]}} ->
+	    ?line ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]);
+	_ ->
+	    ?line ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]),
+	    ?line ?t:fail({bad_result,Res})
+    end,
+
+    %% Apply.
+
+    ?line Res2 = (catch apply(Fun, Args)),
+    erlang:garbage_collect(),
+    erlang:yield(),
+    case Res2 of
+	{'EXIT',{{badarity,{Fun,Args}},[_|_]}} ->
+	    ?line ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]);
+	_ ->
+	    ?line ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]),
+	    ?line ?t:fail({bad_result,Res2})
+    end,
+    ok.
+
+%% Call and apply valid external funs with wrong number of arguments.
+
+ext_badarity(Config) when is_list(Config) ->
+    ?line Fun = fun ?MODULE:nothing/0,
+    ?line Stupid = {stupid,arguments},
+    ?line Args = [some,{stupid,arguments},here],
+
+    %% Simple call.
+
+    ?line Res = (catch Fun(some, Stupid, here)),
+    erlang:garbage_collect(),
+    erlang:yield(),
+    case Res of
+	{'EXIT',{{badarity,{Fun,Args}},_}} ->
+	    ?line ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]);
+	_ ->
+	    ?line ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]),
+	    ?line ?t:fail({bad_result,Res})
+    end,
+
+    %% Apply.
+
+    ?line Res2 = (catch apply(Fun, Args)),
+    erlang:garbage_collect(),
+    erlang:yield(),
+    case Res2 of
+	{'EXIT',{{badarity,{Fun,Args}},_}} ->
+	    ?line ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]);
+	_ ->
+	    ?line ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]),
+	    ?line ?t:fail({bad_result,Res2})
+    end,
+    ok.
+
+nothing() ->
+    ok.
+
+otp_6061(suite) ->
+    [];
+otp_6061(doc) ->
+    ["Test handling of fun expression referring to uninterpreted code"];
+otp_6061(Config) when is_list(Config) ->
+
+    ?line OrigFlag = process_flag(trap_exit, true),
+
+    ?line Self = self(),
+    ?line Pid = spawn_link(fun() -> test_otp_6061(Self) end),
+
+    receive
+	working ->
+	    ?line ok;
+	not_working ->
+	    ?line ?t:fail(not_working);
+	{'EXIT', Pid, Reason} ->
+	    ?line ?t:fail({crash, Reason})
+    after
+	5000 ->
+	    ?line ?t:fail(timeout)
+    end,
+
+    ?line process_flag(trap_exit, OrigFlag),
+
+    ok.
+
+test_otp_6061(Starter) ->
+    Passes = [2],
+    PassesF = [fun() -> Starter ! not_working end,
+	       fun() -> Starter ! working end,
+	       fun() -> Starter ! not_working end],
+    lists:foreach(fun(P)->(lists:nth(P,PassesF))() end,Passes).
diff --git a/lib/debugger/test/guard_SUITE.erl b/lib/debugger/test/guard_SUITE.erl
new file mode 100644
index 0000000000..dd8a2fe4d5
--- /dev/null
+++ b/lib/debugger/test/guard_SUITE.erl
@@ -0,0 +1,1492 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2010. 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(guard_SUITE).
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 bad_arith/1,bad_tuple/1,test_heap_guards/1,guard_bifs/1,
+	 type_tests/1,const_guard/1,
+	 const_cond/1,basic_not/1,complex_not/1,
+	 semicolon/1,complex_semicolon/1,comma/1,
+	 or_guard/1,more_or_guards/1,
+	 complex_or_guards/1,and_guard/1,
+	 xor_guard/1,more_xor_guards/1,
+	 old_guard_tests/1,
+	 build_in_guard/1,gbif/1,
+	 t_is_boolean/1,is_function_2/1,
+	 tricky/1,rel_ops/1,
+	 basic_andalso_orelse/1,traverse_dcd/1,
+	 check_qlc_hrl/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+-export([init/4]).
+-import(lists, [member/2]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [bad_arith, bad_tuple, test_heap_guards, guard_bifs,
+     type_tests, const_guard, const_cond, basic_not,
+     complex_not, semicolon, complex_semicolon, comma,
+     or_guard, more_or_guards, complex_or_guards, and_guard,
+     xor_guard, more_xor_guards, build_in_guard,
+     old_guard_tests, gbif, t_is_boolean, is_function_2,
+     tricky, rel_ops, basic_andalso_orelse, traverse_dcd,
+     check_qlc_hrl].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    ?line Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+bad_arith(doc) -> "Test that a bad arithmetic operation in a guard works correctly.";
+bad_arith(suite) -> [];
+bad_arith(Config) when list(Config) ->
+    ?line 5 = bad_arith1(2, 3),
+    ?line 10 = bad_arith1(1, infinity),
+    ?line 10 = bad_arith1(infinity, 1),
+    ?line 42 = bad_div(24, 0),
+    ok.
+
+bad_arith1(T1, T2) when T1+T2 < 10 ->
+    T1+T2;
+bad_arith1(_, _) ->
+    10.
+
+bad_div(A, B) when A/B > 0 ->
+    A/B;
+bad_div(A, B) when A div B > 0 ->
+    A div B;
+bad_div(_A, _B) ->
+    42.
+
+bad_tuple(doc) -> "Test that bad arguments to element/2 are handled correctly.";
+bad_tuple(suite) -> [];
+bad_tuple(Config) when list(Config) ->
+    ?line error = bad_tuple1(a),
+    ?line error = bad_tuple1({a, b}),
+    ?line x = bad_tuple1({x, b}),
+    ?line y = bad_tuple1({a, b, y}),
+    ok.
+
+bad_tuple1(T) when element(1, T) == x -> x;
+bad_tuple1(T) when element(3, T) == y -> y;
+bad_tuple1(_) -> error.
+
+test_heap_guards(doc) -> "";
+test_heap_guards(suite) -> [];
+test_heap_guards(Config) when list(Config) ->
+    ?line process_flag(trap_exit, true),
+    ?line Tuple = {a, tuple, is, built, here, xxx},
+    ?line List = [a, list, is, built, here],
+
+    ?line try_fun(fun a_case/1, [Tuple], [Tuple]),
+    ?line try_fun(fun a_case/1, [List], [List, List]),
+    ?line try_fun(fun a_case/1, [a], [a]),
+
+    ?line try_fun(fun an_if/1, [Tuple], [Tuple]),
+    ?line try_fun(fun an_if/1, [List], [List, List]),
+    ?line try_fun(fun an_if/1, [a], [a]),
+
+    ?line try_fun(fun receive_test/1, [Tuple], [Tuple]),
+    ?line try_fun(fun receive_test/1, [List], [List, List]),
+    ?line try_fun(fun receive_test/1, [a], [a]),
+    ok.
+
+a_case(V) ->
+    case V of
+	T when T == {a, tuple, is, built, here, xxx} ->
+	    [T];
+	L when L == [a, list, is, built, here] ->
+	    [L, L];
+	a ->
+	    [a]
+    end.
+
+an_if(V) ->
+    if
+	V == {a, tuple, is, built, here, xxx} ->
+	    [V];
+	V == [a, list, is, built, here] ->
+	    [V, V];
+	V == a ->
+	    [a]
+    end.
+
+receive_test(V) ->
+    self() ! V,
+    a_receive().
+
+a_receive() ->
+    receive
+	T when T == {a, tuple, is, built, here, xxx} ->
+	    [T];
+	L when L == [a, list, is, built, here] ->
+	    [L, L];
+	a ->
+	    [a]
+    end.
+
+try_fun(Fun, Args, Result) ->
+    try_fun(16, Fun, Args, Result, []).
+
+try_fun(0, _, _, _, _) ->
+    ok;
+try_fun(Iter, Fun, Args, Result, Filler) ->
+    Pid = spawn_link(?MODULE, init, [self(),Fun,Args,list_to_tuple(Filler)]),
+    receive
+	{'EXIT',Pid,{result,Result}} ->
+	    ?line try_fun(Iter-1, Fun, Args, Result, [0|Filler]);
+	{'EXIT',Pid,{result,Other}} ->
+	    ?line io:format("Expected ~p; got ~p~n", [Result,Other]),
+	    ?line test_server:fail();
+	Other ->
+	    ?line test_server:fail({unexpected_message,Other})
+    end.
+
+init(_ReplyTo, Fun, Args, Filler) ->
+    Result = {result, apply(Fun, Args)},
+    dummy(Filler),
+    io:format("~p: result = ~p\n", [?LINE,Result]),
+    exit(Result).
+
+dummy(_) ->
+    ok.
+
+guard_bifs(doc) -> "Test all guard bifs with nasty (but legal arguments).";
+guard_bifs(suite) -> [];
+guard_bifs(Config) when list(Config) ->
+    ?line Big = -237849247829874297658726487367328971246284736473821617265433,
+    ?line Float = 387924.874,
+
+    %% Succeding use of guard bifs.
+
+    ?line try_gbif('abs/1', Big, -Big),
+    ?line try_gbif('float/1', Big, float(Big)),
+    ?line try_gbif('trunc/1', Float, 387924.0),
+    ?line try_gbif('round/1', Float, 387925.0),
+    ?line try_gbif('length/1', [], 0),
+
+    ?line try_gbif('length/1', [a], 1),
+    ?line try_gbif('length/1', [a, b], 2),
+    ?line try_gbif('length/1', lists:seq(0, 31), 32),
+
+    ?line try_gbif('hd/1', [a], a),
+    ?line try_gbif('hd/1', [a, b], a),
+
+    ?line try_gbif('tl/1', [a], []),
+    ?line try_gbif('tl/1', [a, b], [b]),
+    ?line try_gbif('tl/1', [a, b, c], [b, c]),
+
+    ?line try_gbif('size/1', {}, 0),
+    ?line try_gbif('size/1', {a}, 1),
+    ?line try_gbif('size/1', {a, b}, 2),
+    ?line try_gbif('size/1', {a, b, c}, 3),
+    ?line try_gbif('size/1', list_to_binary([]), 0),
+    ?line try_gbif('size/1', list_to_binary([1]), 1),
+    ?line try_gbif('size/1', list_to_binary([1, 2]), 2),
+    ?line try_gbif('size/1', list_to_binary([1, 2, 3]), 3),
+
+    ?line try_gbif('element/2', {x}, {1, x}),
+    ?line try_gbif('element/2', {x, y}, {1, x}),
+    ?line try_gbif('element/2', {x, y}, {2, y}),
+
+    ?line try_gbif('self/0', 0, self()),
+    ?line try_gbif('node/0', 0, node()),
+    ?line try_gbif('node/1', self(), node()),
+
+    %% Failing use of guard bifs.
+
+    ?line try_fail_gbif('abs/1', Big, 1),
+    ?line try_fail_gbif('abs/1', [], 1),
+
+    ?line try_fail_gbif('float/1', Big, 42),
+    ?line try_fail_gbif('float/1', [], 42),
+
+    ?line try_fail_gbif('trunc/1', Float, 0.0),
+    ?line try_fail_gbif('trunc/1', [], 0.0),
+
+    ?line try_fail_gbif('round/1', Float, 1.0),
+    ?line try_fail_gbif('round/1', [], a),
+
+    ?line try_fail_gbif('length/1', [], 1),
+    ?line try_fail_gbif('length/1', [a], 0),
+    ?line try_fail_gbif('length/1', a, 0),
+    ?line try_fail_gbif('length/1', {a}, 0),
+
+    ?line try_fail_gbif('hd/1', [], 0),
+    ?line try_fail_gbif('hd/1', [a], x),
+    ?line try_fail_gbif('hd/1', x, x),
+
+    ?line try_fail_gbif('tl/1', [], 0),
+    ?line try_fail_gbif('tl/1', [a], x),
+    ?line try_fail_gbif('tl/1', x, x),
+
+    ?line try_fail_gbif('size/1', {}, 1),
+    ?line try_fail_gbif('size/1', [], 0),
+    ?line try_fail_gbif('size/1', [a], 1),
+
+    ?line try_fail_gbif('element/2', {}, {1, x}),
+    ?line try_fail_gbif('element/2', {x}, {1, y}),
+    ?line try_fail_gbif('element/2', [], {1, z}),
+
+    ?line try_fail_gbif('self/0', 0, list_to_pid("<0.0.0>")),
+    ?line try_fail_gbif('node/0', 0, xxxx),
+    ?line try_fail_gbif('node/1', self(), xxx),
+    ?line try_fail_gbif('node/1', yyy, xxx),
+    ok.
+
+try_gbif(Id, X, Y) ->
+    case guard_bif(Id, X, Y) of
+	{Id, X, Y} ->
+	    io:format("guard_bif(~p, ~p, ~p) -- ok", [Id, X, Y]);
+	Other ->
+	    ?line ok = io:format("guard_bif(~p, ~p, ~p) -- bad result: ~p\n",
+				 [Id, X, Y, Other]),
+	    ?line test_server:fail()
+    end.
+
+try_fail_gbif(Id, X, Y) ->
+    case catch guard_bif(Id, X, Y) of
+	{'EXIT', {function_clause,{?MODULE,guard_bif,[Id,X,Y]}}} -> %Jam
+	    io:format("guard_bif(~p, ~p, ~p) -- ok", [Id,X,Y]);
+	{'EXIT', {function_clause,[{?MODULE,guard_bif,[Id,X,Y]}|_]}} ->	%Beam
+	    io:format("guard_bif(~p, ~p, ~p) -- ok", [Id,X,Y]);
+	Other ->
+	    ?line ok = io:format("guard_bif(~p, ~p, ~p) -- bad result: ~p\n",
+				 [Id, X, Y, Other]),
+	    ?line test_server:fail()
+    end.
+
+guard_bif('abs/1', X, Y) when abs(X) == Y ->
+    {'abs/1', X, Y};
+guard_bif('float/1', X, Y) when float(X) == Y ->
+    {'float/1', X, Y};
+guard_bif('trunc/1', X, Y) when trunc(X) == Y ->
+    {'trunc/1', X, Y};
+guard_bif('round/1', X, Y) when round(X) == Y ->
+    {'round/1', X, Y};
+guard_bif('length/1', X, Y) when length(X) == Y ->
+    {'length/1', X, Y};
+guard_bif('hd/1', X, Y) when hd(X) == Y ->
+    {'hd/1', X, Y};
+guard_bif('tl/1', X, Y) when tl(X) == Y ->
+    {'tl/1', X, Y};
+guard_bif('size/1', X, Y) when size(X) == Y ->
+    {'size/1', X, Y};
+guard_bif('element/2', X, {Pos, Expected}) when element(Pos, X) == Expected ->
+    {'element/2', X, {Pos, Expected}};
+guard_bif('self/0', X, Y) when self() == Y ->
+    {'self/0', X, Y};
+guard_bif('node/0', X, Y) when node() == Y ->
+    {'node/0', X, Y};
+guard_bif('node/1', X, Y) when node(X) == Y ->
+    {'node/1', X, Y}.
+
+type_tests(doc) -> "Test the type tests.";
+type_tests(suite) -> [];
+type_tests(Config) when list(Config) ->
+    ?line Types = all_types(),
+    ?line Tests = type_test_desc(),
+    ?line put(errors, 0),
+    ?line put(violations, 0),
+    ?line type_tests(Tests, Types),
+    ?line case {get(errors), get(violations)} of
+	      {0, 0} ->
+		  ok;
+	      {0, N} ->
+		  {comment, integer_to_list(N) ++ " standard violation(s)"};
+	      {Errors, Violations} ->
+		  io:format("~p sub test(s) failed, ~p violation(s)",
+			    [Errors, Violations]),
+		  ?line test_server:fail()
+	  end.
+
+type_tests([{Test, AllowedTypes}| T], AllTypes) ->
+    type_tests(Test, AllTypes, AllowedTypes),
+    type_tests(T, AllTypes);
+type_tests([], _) ->
+    ok.
+
+type_tests(Test, [Type|T], Allowed) ->
+    {TypeTag, Value} = Type,
+    case member(TypeTag, Allowed) of
+	true ->
+	    case catch type_test(Test, Value) of
+		Test ->
+		    ok;
+		_Other ->
+		    io:format("Test ~p(~p) failed", [Test, Value]),
+		    put(errors, get(errors) + 1)
+	    end;
+	false ->
+	    case catch type_test(Test, Value) of
+		{'EXIT', {function_clause, {?MODULE, type_test, [Test, Value]}}} ->
+		    ok;
+		{'EXIT', {function_clause,[{?MODULE,type_test,[Test,Value]}|_]}} ->
+		    ok;
+		{'EXIT',Other} ->
+		    ?line test_server:fail({unexpected_error_reason,Other});
+		tuple when function(Value) ->
+		    io:format("Standard violation: Test ~p(~p) should fail",
+			      [Test, Value]),
+		    put(violations, get(violations) + 1);
+		_Other ->
+		    io:format("Test ~p(~p) succeeded (should fail)", [Test, Value]),
+		    put(errors, get(errors) + 1)
+	    end
+    end,
+    type_tests(Test, T, Allowed);
+type_tests(_, [], _) ->
+    ok.
+
+all_types() ->
+    [{small, 42},
+     {big, 392742928742947293873938792874019287447829874290742},
+     {float, 3.14156},
+     {nil, []},
+     {cons, [a]},
+     {tuple, {a, b}},
+     {atom, xxxx},
+     {ref, make_ref()},
+     {pid, self()},
+     {port, open_port({spawn, efile}, [])},
+     {function, fun(X) -> X+1, "" end},
+     {binary, list_to_binary([])}].
+
+type_test_desc() ->
+    [{integer, [small, big]},
+     {float, [float]},
+     {number, [small, big, float]},
+     {atom, [atom]},
+     {list, [cons, nil]},
+     {nonempty_list, [cons]},
+     {nil, [nil]},
+     {tuple, [tuple]},
+     {pid, [pid]},
+     {port, [port]},
+     {reference, [ref]},
+     {function, [function]}].
+
+type_test(integer, X) when integer(X) ->
+    integer;
+type_test(float, X) when float(X) ->
+    float;
+type_test(number, X) when number(X) ->
+    number;
+type_test(atom, X) when atom(X) ->
+    atom;
+type_test(list, X) when list(X) ->
+    list;
+type_test(nonempty_list, [_]) ->
+    nonempty_list;
+type_test(nil, []) ->
+    nil;
+type_test(tuple, X) when tuple(X) ->
+    tuple;
+type_test(pid, X) when pid(X) ->
+    pid;
+type_test(reference, X) when reference(X) ->
+    reference;
+type_test(port, X) when port(X) ->
+    port;
+type_test(binary, X) when binary(X) ->
+    binary;
+type_test(function, X) when function(X) ->
+    function.
+
+const_guard(Config) when is_list(Config) ->
+    ?line if
+	      (0 == 0) and ((0 == 0) or (0 == 0)) ->
+		  ok
+	  end.
+
+
+const_cond(Config) when is_list(Config) ->
+    ?line ok = const_cond({}, 0),
+    ?line ok = const_cond({a}, 1),
+    ?line error = const_cond({a,b}, 3),
+    ?line error = const_cond({a}, 0),
+    ?line error = const_cond({a,b}, 1),
+    ok.
+
+const_cond(T, Sz) ->
+    case T of
+	_X when false -> never;
+	_X when tuple(T), eq == eq, size(T) == Sz -> ok;
+	_X when tuple(T), eq == leq, size(T) =< Sz -> ok;
+	_X -> error
+    end.
+
+basic_not(Config) when is_list(Config) ->
+    True = id(true),
+    False = id(false),
+    Glurf = id(glurf),
+    A = id(5),
+    B = id(37.5),
+    C = id(-1),
+    D = id(5),
+    ATuple = {False,True,Glurf},
+
+    ?line check(fun() -> if not false -> ok; true -> error end end, ok),
+    ?line check(fun() -> if not true -> ok; true -> error end end, error),
+    ?line check(fun() -> if not False -> ok; true -> error end end, ok),
+    ?line check(fun() -> if not True -> ok; true -> error end end, error),
+
+    ?line check(fun() -> if A > B -> gt; A < B -> lt; A == B -> eq end end, lt),
+    ?line check(fun() -> if A > C -> gt; A < C -> lt; A == C -> eq end end, gt),
+    ?line check(fun() -> if A > D -> gt; A < D -> lt; A == D -> eq end end, eq),
+
+    ?line check(fun() -> if not (7 > 453) -> le; not (7 < 453) -> ge;
+			    not (7 == 453) -> ne; true -> eq end end, le),
+    ?line check(fun() -> if not (7 > -8) -> le; not (7 < -8) -> ge;
+			    not (7 == -8) -> ne; true -> eq end end, ge),
+    ?line check(fun() -> if not (7 > 7) -> le; not (7 < 7) -> ge;
+			    not (7 == 7) -> ne; true -> eq end end, le),
+
+    ?line check(fun() -> if not (A > B) -> le; not (A < B) -> ge;
+			    not (A == B) -> ne; true -> eq end end, le),
+    ?line check(fun() -> if not (A > C) -> le; not (A < C) -> ge;
+			    not (A == C) -> ne; true -> eq end end, ge),
+    ?line check(fun() -> if not (A > D) -> le; not (A < D) -> ge;
+			    not (A == D) -> ne; true -> eq end end, le),
+
+    ?line check(fun() -> if not element(1, ATuple) -> ok; true -> error end end, ok),
+    ?line check(fun() -> if not element(2, ATuple) -> ok; true -> error end end, error),
+    ?line check(fun() -> if not element(3, ATuple) -> ok; true -> error end end, error),
+
+    ?line check(fun() -> if not glurf -> ok; true -> error end end, error),
+    ?line check(fun() -> if not Glurf -> ok; true -> error end end, error),
+
+    ok.
+
+complex_not(Config) when is_list(Config) ->
+    ATuple = id({false,true,gurka}),
+    ?line check(fun() -> if not(element(1, ATuple)) -> ok; true -> error end end, ok),
+    ?line check(fun() -> if not(element(2, ATuple)) -> ok; true -> error end end, error),
+
+    ?line check(fun() -> if not(element(3, ATuple) == gurka) -> ok;
+			    true -> error end end, error),
+    ?line check(fun() -> if not(element(3, ATuple) =/= gurka) -> ok;
+			    true -> error end end, ok),
+
+    ?line check(fun() -> if {a,not(element(2, ATuple))} == {a,false} -> ok;
+			    true -> error end end, ok),
+    ?line check(fun() -> if {a,not(element(1, ATuple))} == {a,false} -> ok;
+			    true -> error end end, error),
+
+    ?line check(fun() -> if not(element(1, ATuple) or element(3, ATuple)) -> ok;
+			    true -> error end end, error),
+
+    %% orelse
+    ?line check(fun() -> if not(element(1, ATuple) orelse element(3, ATuple)) -> ok;
+			    true -> error end end, error),
+
+    ok.
+
+semicolon(Config) when is_list(Config) ->
+
+    %% True/false combined using ';' (literal atoms).
+
+    ?line check(fun() -> if true; false -> ok end end, ok),
+    ?line check(fun() -> if false; true -> ok end end, ok),
+    ?line check(fun() -> if true; true -> ok end end, ok),
+    ?line check(fun() -> if false; false -> ok; true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} = (catch if false; false -> ok end),
+			exit
+		end, exit),
+
+    %% True/false combined used ';'.
+
+    True = id(true),
+    False = id(false),
+
+    ?line check(fun() -> if True; False -> ok end end, ok),
+    ?line check(fun() -> if False; True -> ok end end, ok),
+    ?line check(fun() -> if True; True -> ok end end, ok),
+    ?line check(fun() -> if False; False -> ok; true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} = (catch if False; False -> ok end),
+			exit
+		end, exit),
+
+    %% Combine true/false with a non-boolean value.
+    Glurf = id(glurf),
+
+
+    ?line check(fun() -> if True; Glurf -> ok end end, ok),
+    ?line check(fun() -> if Glurf; True -> ok end end, ok),
+    ?line check(fun() -> if Glurf; Glurf -> ok; true -> error end end, error),
+    ?line check(fun() -> if False; Glurf -> ok; true -> error end end, error),
+    ?line check(fun() -> if Glurf; False -> ok; true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} = (catch if Glurf; Glurf -> ok end),
+			exit
+		end, exit),
+
+    %% Combine true/false with errors.
+
+    ATuple = id({false,true,gurka}),
+
+    ?line check(fun() -> if True; element(42, ATuple) -> ok end end, ok),
+    ?line check(fun() -> if element(42, ATuple); True -> ok end end, ok),
+    ?line check(fun() -> if element(42, ATuple); element(42, ATuple) -> ok;
+			    true -> error end end, error),
+    ?line check(fun() -> if False; element(42, ATuple) -> ok;
+			    true -> error end end, error),
+    ?line check(fun() -> if element(42, ATuple);
+			    False -> ok; true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} =
+			    (catch if element(42, ATuple);
+				      element(42, ATuple) -> ok end),
+			exit
+		end, exit),
+
+    ok.
+
+complex_semicolon(Config) when is_list(Config) ->
+    ?line ok = csemi1(int, {blurf}),
+    ?line ok = csemi1(string, {blurf}),
+    ?line ok = csemi1(float, [a]),
+    ?line error = csemi1(35, 42),
+
+    %% 2
+    ?line ok = csemi2({}, {a,b,c}),
+    ?line ok = csemi2({1,3.5}, {a,b,c}),
+    ?line ok = csemi2(dum, {a,b,c}),
+
+    ?line ok = csemi2({45,-19.3}, {}),
+    ?line ok = csemi2({45,-19.3}, {dum}),
+    ?line ok = csemi2({45,-19.3}, {dum,dum}),
+
+    ?line error = csemi2({45}, {dum}),
+    ?line error = csemi2([], {dum}),
+    ?line error = csemi2({dum}, []),
+    ?line error = csemi2([], []),
+
+    %% 3
+    ?line csemi3(fun csemi3a/4),
+    ?line csemi3(fun csemi3b/4),
+    ?line csemi3(fun csemi3c/4),
+
+    %% 4
+    ?line csemi4(fun csemi4a/4),
+    ?line csemi4(fun csemi4b/4),
+    ?line csemi4(fun csemi4c/4),
+    ?line csemi4(fun csemi4d/4),
+
+    %% 4, 'orelse' instead of 'or'
+    ?line csemi4_orelse(fun csemi4_orelse_a/4),
+    ?line csemi4_orelse(fun csemi4_orelse_b/4),
+    ?line csemi4_orelse(fun csemi4_orelse_c/4),
+    ?line csemi4_orelse(fun csemi4_orelse_d/4),
+
+    ok.
+
+csemi1(Type, Val) when is_list(Val), Type == float;
+		       Type == int; Type == string -> ok;
+csemi1(_, _) -> error.
+
+csemi2(A, B) when size(A) > 1; size(B) > 2 -> ok;
+csemi2(_, _) -> error.
+
+csemi3(Csemi3) ->
+    ok = Csemi3({}, {a,b,c}, [0], [0]),
+    ok = Csemi3({1,3.5}, {a,b,c}, -1, -1),
+    ok = Csemi3(dum, {a,b,c}, 0.0, 0.0),
+    ok = Csemi3(dum, {c}, b, a),
+    ok = Csemi3(dum, <<1,2,3>>, 0.0, 0.0),
+    ok = Csemi3(<<3.5/float>>, {a,b,c}, -1, -1),
+
+    ok = Csemi3({45,-19.3}, {}, [], []),
+    ok = Csemi3({45,-19.3}, {dum}, 42, 42),
+    ok = Csemi3({45,-19.3}, {dum,dum}, 33, 33),
+
+    ok = Csemi3({45}, {dum}, 1.0, 0),
+    ok = Csemi3([a], {dum}, 1.0, 0),
+    ok = Csemi3({dum}, [], 1.0, 0),
+    ok = Csemi3([], [], 1.0, 0),
+    ok = Csemi3(blurf, {dum}, 1.0, 0),
+    ok = Csemi3({a}, blurf, 1.0, 0),
+    ok = Csemi3([a], [dum], 1.0, 0),
+    ok = Csemi3({dum}, [], 1.0, 0),
+    ok = Csemi3([], [], 1.0, 0),
+
+    error = Csemi3({45}, {dum}, 0, 0),
+    error = Csemi3([a], {dum}, 0, 0),
+    error = Csemi3({dum}, [], 0, 0),
+    error = Csemi3([], [], 0, 0),
+    ok.
+
+csemi3a(A, B, X, Y) when X > Y; size(A) > 1; size(B) > 2 -> ok;
+csemi3a(_, _, _, _) -> error.
+
+csemi3b(A, B, X, Y) when size(A) > 1; X > Y; size(B) > 2 -> ok;
+csemi3b(_, _, _, _) -> error.
+
+csemi3c(A, B, X, Y) when size(A) > 1; size(B) > 2; X > Y -> ok;
+csemi3c(_, _, _, _) -> error.
+
+
+csemi4(Test) ->
+    ok = Test({a,b}, 2, {c,d}, 2),
+    ok = Test({1,2,3}, 0, [], 0),
+    ok = Test({}, 2, blurf, 0),
+    ok = Test({}, 2, {1}, 2),
+
+    error = Test([], 4, {}, 0),
+    error = Test({}, 0, [a,b], 4),
+    error = Test({}, 0, [a,b], 0),
+    error = Test([], 0, {}, 0),
+    error = Test({}, 0, {}, 0),
+
+    ok.
+
+csemi4a(A, X, B, Y) when (size(A) > 1) or (X > 1);
+			 (size(B) > 1) or (Y > 1) -> ok;
+csemi4a(_, _, _, _) -> error.
+
+csemi4b(A, X, B, Y) when (X > 1) or (size(A) > 1);
+			 (size(B) > 1) or (Y > 1) -> ok;
+csemi4b(_, _, _, _) -> error.
+
+csemi4c(A, X, B, Y) when (size(A) > 1) or (X > 1);
+			 (Y > 1) or (size(B) > 1) -> ok;
+csemi4c(_, _, _, _) -> error.
+
+csemi4d(A, X, B, Y) when (X > 1) or (size(A) > 1);
+			 (Y > 1) or (size(B) > 1) -> ok;
+csemi4d(_, _, _, _) -> error.
+
+
+csemi4_orelse(Test) ->
+    ok = Test({a,b}, 2, {c,d}, 2),
+    ok = Test({1,2,3}, 0, [], 0),
+    ok = Test({}, 2, blurf, 0),
+    ok = Test({}, 2, {1}, 2),
+
+    ?line error = Test([], 1, {}, 0),
+
+    ok.
+
+csemi4_orelse_a(A, X, B, Y) when (size(A) > 1) orelse (X > 1);
+			 (size(B) > 1) orelse (Y > 1) -> ok;
+csemi4_orelse_a(_, _, _, _) -> error.
+
+csemi4_orelse_b(A, X, B, Y) when (X > 1) orelse (size(A) > 1);
+			 (size(B) > 1) orelse (Y > 1) -> ok;
+csemi4_orelse_b(_, _, _, _) -> error.
+
+csemi4_orelse_c(A, X, B, Y) when (size(A) > 1) orelse (X > 1);
+                           (Y > 1) orelse (size(B) > 1) -> ok;
+csemi4_orelse_c(_, _, _, _) -> error.
+
+csemi4_orelse_d(A, X, B, Y) when (X > 1) or (size(A) > 1);
+			 (Y > 1) or (size(B) > 1) -> ok;
+csemi4_orelse_d(_, _, _, _) -> error.
+
+
+comma(Config) when is_list(Config) ->
+
+    %% ',' combinations of literal true/false.
+
+    ?line check(fun() -> if true, false -> ok; true -> error end end, error),
+    ?line check(fun() -> if false, true -> ok; true -> error end end, error),
+    ?line check(fun() -> if true, true -> ok end end, ok),
+    ?line check(fun() -> if false, false -> ok; true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} =
+			    (catch if true, false -> ok;
+				      false, true -> ok;
+				      false, false -> ok
+				   end),
+			exit
+		end, exit),
+
+    %% ',' combinations of true/false in variables.
+
+    True = id(true),
+    False = id(false),
+
+    ?line check(fun() -> if True, False -> ok; true -> error end end, error),
+    ?line check(fun() -> if False, True -> ok; true -> error end end, error),
+    ?line check(fun() -> if True, True -> ok end end, ok),
+    ?line check(fun() -> if False, False -> ok; true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} =
+			    (catch if True, False -> ok;
+				      False, True -> ok;
+				      False, False -> ok
+				   end),
+			exit
+		end, exit),
+
+    %% ',' combinations of true/false, and non-boolean in variables.
+
+    Glurf = id(glurf),
+
+    ?line check(fun() -> if True, Glurf -> ok; true -> error end end, error),
+    ?line check(fun() -> if Glurf, True -> ok; true -> error end end, error),
+    ?line check(fun() -> if True, True -> ok end end, ok),
+    ?line check(fun() -> if Glurf, Glurf -> ok; true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} =
+			    (catch if True, Glurf -> ok;
+				      Glurf, True -> ok;
+				      Glurf, Glurf -> ok
+				   end),
+			exit
+		end, exit),
+
+    %% ',' combinations of true/false with errors.
+    ATuple = id({a,b,c}),
+
+    ?line check(fun() -> if True, element(42, ATuple) -> ok;
+			    true -> error end end, error),
+    ?line check(fun() -> if element(42, ATuple), True -> ok;
+			    true -> error end end, error),
+    ?line check(fun() -> if True, True -> ok end end, ok),
+    ?line check(fun() -> if element(42, ATuple), element(42, ATuple) -> ok;
+			    true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} =
+			    (catch if True, element(42, ATuple) -> ok;
+				      element(42, ATuple), True -> ok;
+				      element(42, ATuple), element(42, ATuple) -> ok
+				   end),
+			exit
+		end, exit),
+
+    ok.
+
+or_guard(Config) when is_list(Config) ->
+    True = id(true),
+    False = id(false),
+    Glurf = id(glurf),
+
+    %% 'or' combinations of literal true/false.
+    ?line check(fun() -> if true or false -> ok end end, ok),
+    ?line check(fun() -> if false or true -> ok end end, ok),
+    ?line check(fun() -> if true or true -> ok end end, ok),
+    ?line check(fun() -> if false or false -> ok; true -> error end end, error),
+
+    ?line check(fun() -> if glurf or true -> ok; true -> error end end, error),
+    ?line check(fun() -> if true or glurf -> ok; true -> error end end, error),
+    ?line check(fun() -> if glurf or glurf -> ok; true -> error end end, error),
+
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} = (catch if false or false -> ok end),
+			exit
+		end, exit),
+
+
+    %% 'or' combinations using variables containing true/false.
+    ?line check(fun() -> if True or False -> ok end end, ok),
+    ?line check(fun() -> if False or True -> ok end end, ok),
+    ?line check(fun() -> if True or True -> ok end end, ok),
+    ?line check(fun() -> if False or False -> ok; true -> error end end, error),
+
+    ?line check(fun() -> if True or Glurf -> ok; true -> error end end, error),
+    ?line check(fun() -> if Glurf or True -> ok; true -> error end end, error),
+    ?line check(fun() -> if Glurf or Glurf -> ok; true -> error end end, error),
+
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} = (catch if False or False -> ok end),
+			exit
+		end, exit),
+
+    ok.
+
+more_or_guards(Config) when is_list(Config) ->
+    True = id(true),
+    False = id(false),
+    ATuple = id({false,true,gurka}),
+
+    ?line check(fun() ->
+			if element(42, ATuple) or False -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if False or element(42, ATuple) -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if element(18, ATuple) or element(42, ATuple) -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if True or element(42, ATuple) -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if element(42, ATuple) or True -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if element(1, ATuple) or element(42, ATuple) or True -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if element(1, ATuple) or True or element(42, ATuple) -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if
+			    (<<False:8>> == <<0>>) or element(2, ATuple) -> ok;
+			    true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if
+			    element(2, ATuple) or (<<True:8>> == <<1>>) -> ok;
+			    true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if element(2, ATuple) or element(42, ATuple) -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if
+			    element(1, ATuple) or
+			    element(2, ATuple) or
+			    element(19, ATuple) -> ok;
+			    true -> error end
+		end, error),
+    ok.
+
+complex_or_guards(Config) when is_list(Config) ->
+    %% complex_or_1/2
+    ?line ok = complex_or_1({a,b,c,d}, {1,2,3}),
+    ?line ok = complex_or_1({a,b,c,d}, {1}),
+    ?line ok = complex_or_1({a}, {1,2,3}),
+    ?line error = complex_or_1({a}, {1}),
+
+    ?line error = complex_or_1(1, 2),
+    ?line error = complex_or_1([], {a,b,c,d}),
+    ?line error = complex_or_1({a,b,c,d}, []),
+
+
+    %% complex_or_2/1
+    ?line ok = complex_or_2({true,{}}),
+    ?line ok = complex_or_2({false,{a}}),
+    ?line ok = complex_or_2({false,{a,b,c}}),
+    ?line ok = complex_or_2({true,{a,b,c,d}}),
+
+    ?line error = complex_or_2({blurf,{a,b,c}}),
+
+    ?line error = complex_or_2({true}),
+    ?line error = complex_or_2({true,no_tuple}),
+    ?line error = complex_or_2({true,[]}),
+
+    %% complex_or_3/2
+    ?line ok = complex_or_3({true}, {}),
+    ?line ok = complex_or_3({false}, {a}),
+    ?line ok = complex_or_3({false}, {a,b,c}),
+    ?line ok = complex_or_3({true}, {a,b,c,d}),
+    ?line ok = complex_or_3({false}, <<1,2,3>>),
+    ?line ok = complex_or_3({true}, <<1,2,3,4>>),
+
+    ?line error = complex_or_3(blurf, {a,b,c}),
+
+    ?line error = complex_or_3({false}, <<1,2,3,4>>),
+    ?line error = complex_or_3([], <<1,2>>),
+    ?line error = complex_or_3({true}, 45),
+    ?line error = complex_or_3(<<>>, <<>>),
+
+    %% complex_or_4/2
+    ?line ok = complex_or_4(<<1,2,3>>, {true}),
+    ?line ok = complex_or_4(<<1,2,3>>, {false}),
+    ?line ok = complex_or_4(<<1,2,3>>, {true}),
+    ?line ok = complex_or_4({1,2,3}, {true}),
+    ?line error = complex_or_4({1,2,3,4}, {false}),
+
+    ?line error = complex_or_4(<<1,2,3,4>>, []),
+    ?line error = complex_or_4([], {true}),
+
+    %% complex_or_5/2
+    ?line ok = complex_or_5(<<1>>, {false}),
+    ?line ok = complex_or_5(<<1,2,3>>, {true}),
+    ?line ok = complex_or_5(<<1,2,3,4>>, {false}),
+    ?line ok = complex_or_5({1,2,3}, {false}),
+    ?line ok = complex_or_5({1,2,3,4}, {false}),
+
+    ?line error = complex_or_5(blurf, {false}),
+    ?line error = complex_or_5(<<1>>, klarf),
+    ?line error = complex_or_5(blurf, klarf),
+
+    %% complex_or_6/2
+    ?line ok = complex_or_6({true,true}, {1,2,3,4}),
+    ?line ok = complex_or_6({true,true}, <<1,2,3,4>>),
+    ?line ok = complex_or_6({false,false}, <<1,2,3,4>>),
+    ?line ok = complex_or_6({false,true}, <<1>>),
+    ?line ok = complex_or_6({true,false}, {1}),
+    ?line ok = complex_or_6({true,true}, {1}),
+
+    ?line error = complex_or_6({false,false}, {1}),
+
+    ?line error = complex_or_6({true}, {1,2,3,4}),
+    ?line error = complex_or_6({}, {1,2,3,4}),
+    ?line error = complex_or_6([], {1,2,3,4}),
+    ?line error = complex_or_6([], {1,2,3,4}),
+    ?line error = complex_or_6({true,false}, klurf),
+
+    ok.
+
+complex_or_1(A, B) ->
+    if
+	((3 < size(A)) and (size(A) < 9)) or
+	((2 < size(B)) and (size(B) < 7)) -> ok;
+	true -> error
+    end.
+
+complex_or_2(Tuple) ->
+    if
+	element(1, Tuple) or not (size(element(2, Tuple)) > 3) -> ok;
+	true -> error
+    end.
+
+complex_or_3(A, B) ->
+    if
+	not (size(B) > 3) or element(1, A) -> ok;
+	true -> error
+    end.
+
+complex_or_4(A, B) ->
+    if
+	not (is_tuple(A) and (size(A) > 3)) or element(1, B) -> ok;
+	true -> error
+    end.
+
+complex_or_5(A, B) ->
+    if
+	not (is_tuple(A) or (size(A) > 3)) or not element(1, B) -> ok;
+	true -> error
+    end.
+
+complex_or_6(A, B) ->
+    if
+	not (not element(1, A) and not element(2, A)) or
+	not (not (size(B) > 3)) -> ok;
+	true -> error
+    end.
+
+and_guard(Config) when is_list(Config) ->
+
+    %% 'and' combinations of literal true/false.
+
+    ?line check(fun() -> if true and false -> ok; true -> error end end, error),
+    ?line check(fun() -> if false and true -> ok; true -> error end end, error),
+    ?line check(fun() -> if true and true -> ok end end, ok),
+    ?line check(fun() -> if false and false -> ok; true -> error end end, error),
+
+    ?line check(fun() -> if glurf and true -> ok; true -> error end end, error),
+    ?line check(fun() -> if true and glurf -> ok; true -> error end end, error),
+    ?line check(fun() -> if glurf and glurf -> ok; true -> error end end, error),
+
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} =
+			    (catch if true and false -> ok;
+				      false and true -> ok;
+				      false and false -> ok
+				   end),
+			exit
+		end, exit),
+
+    %% 'and' combinations of true/false in variables.
+
+    True = id(true),
+    False = id(false),
+
+    ?line check(fun() -> if True and False -> ok; true -> error end end, error),
+    ?line check(fun() -> if False and True -> ok; true -> error end end, error),
+    ?line check(fun() -> if True and True -> ok end end, ok),
+    ?line check(fun() -> if False and False -> ok; true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} =
+			    (catch if True and False -> ok;
+				      False and True -> ok;
+				      False and False -> ok
+				   end),
+			exit
+		end, exit),
+
+    %% 'and' combinations of true/false and a non-boolean in variables.
+
+    Glurf = id(glurf),
+
+    ?line check(fun() -> if True and Glurf -> ok; true -> error end end, error),
+    ?line check(fun() -> if Glurf and True -> ok; true -> error end end, error),
+    ?line check(fun() -> if True and True -> ok end end, ok),
+    ?line check(fun() -> if Glurf and Glurf -> ok; true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} =
+			    (catch if True and Glurf -> ok;
+				      Glurf and True -> ok;
+				      Glurf and Glurf -> ok
+				   end),
+			exit
+		end, exit),
+
+    %% 'and' combinations of true/false with errors.
+    ATuple = id({a,b,c}),
+
+    ?line check(fun() -> if True and element(42, ATuple) -> ok;
+			    true -> error end end, error),
+    ?line check(fun() -> if element(42, ATuple) and True -> ok;
+			    true -> error end end, error),
+    ?line check(fun() -> if True and True -> ok end end, ok),
+    ?line check(fun() -> if element(42, ATuple) and element(42, ATuple) -> ok;
+			    true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} =
+			    (catch if True and element(42, ATuple) -> ok;
+				      element(42, ATuple) and True -> ok;
+				      element(42, ATuple) and element(42, ATuple) -> ok
+				   end),
+			exit
+		end, exit),
+
+    ?line ok = relprod({'Set',a,b}, {'Set',a,b}),
+
+    ok.
+
+relprod(R1, R2) when (erlang:size(R1) =:= 3) and (erlang:element(1,R1) =:= 'Set'), (erlang:size(R2) =:= 3) and (erlang:element(1,R2) =:= 'Set') ->
+    ok.
+
+
+xor_guard(Config) when is_list(Config) ->
+
+    %% 'xor' combinations of literal true/false.
+    ?line check(fun() -> if true xor false -> ok end end, ok),
+    ?line check(fun() -> if false xor true -> ok end end, ok),
+    ?line check(fun() -> if true xor true -> ok; true -> error end end, error),
+    ?line check(fun() -> if false xor false -> ok; true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} = (catch if false xor false -> ok end),
+			exit
+		end, exit),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} = (catch if true xor true -> ok end),
+			exit
+		end, exit),
+
+
+    %% 'xor' combinations using variables containing true/false.
+
+    True = id(true),
+    False = id(false),
+
+    ?line check(fun() -> if True xor False -> ok end end, ok),
+    ?line check(fun() -> if False xor True -> ok end end, ok),
+    ?line check(fun() -> if True xor True -> ok; true -> error end end, error),
+    ?line check(fun() -> if False xor False -> ok; true -> error end end, error),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} = (catch if False xor False -> ok end),
+			exit
+		end, exit),
+    ?line check(fun() ->
+			{'EXIT',{if_clause,_}} = (catch if True xor True -> ok end),
+			exit
+		end, exit),
+
+    ok.
+
+more_xor_guards(Config) when is_list(Config) ->
+    True = id(true),
+    False = id(false),
+    ATuple = id({false,true,gurka}),
+
+    ?line check(fun() ->
+			if element(42, ATuple) xor False -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if False xor element(42, ATuple) xor False -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if element(18, ATuple) xor element(42, ATuple) -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if True xor element(42, ATuple) -> ok;
+			   true -> error end
+		end, error),
+
+    ?line check(fun() ->
+			if element(42, ATuple) xor True -> ok;
+			   true -> error end
+		end, error),
+    ok.
+
+build_in_guard(Config) when is_list(Config) ->
+    SubBin = <<5.0/float>>,
+    ?line B = <<1,SubBin/binary,3.5/float>>,
+    ?line if
+	      B =:= <<1,SubBin/binary,3.5/float>> -> ok
+	  end.
+
+old_guard_tests(Config) when list(Config) ->
+    %% Check that all the old guard tests are still recognized.
+    ?line list = og(Config),
+    ?line atom = og(an_atom),
+    ?line binary = og(<<1,2>>),
+    ?line float = og(3.14),
+    ?line integer = og(43),
+    ?line a_function = og(fun() -> ok end),
+    ?line pid = og(self()),
+    ?line reference = og(make_ref()),
+    ?line tuple = og({}),
+
+    ?line number = on(45.333),
+    ?line number = on(-19),
+    ok.
+
+og(V) when atom(V) -> atom;
+og(V) when binary(V) -> binary;
+og(V) when float(V) -> float;
+og(V) when integer(V) -> integer;
+og(V) when function(V) -> a_function;
+og(V) when list(V) -> list;
+og(V) when pid(V) -> pid;
+og(V) when port(V) -> port;
+og(V) when reference(V) -> reference;
+og(V) when tuple(V) -> tuple;
+og(_) -> what.
+
+on(V) when number(V) -> number;
+on(_) -> not_number.
+
+gbif(Config) when is_list(Config) ->
+    ?line error = gbif_1(1, {false,true}),
+    ?line ok = gbif_1(2, {false,true}),
+    ok.
+
+gbif_1(P, T) when element(P, T) -> ok;
+gbif_1(_, _) -> error.
+
+
+t_is_boolean(Config) when is_list(Config) ->
+    ?line true = is_boolean(true),
+    ?line true = is_boolean(false),
+    ?line true = is_boolean(id(true)),
+    ?line true = is_boolean(id(false)),
+
+    ?line false = is_boolean(glurf),
+    ?line false = is_boolean(id(glurf)),
+
+    ?line false = is_boolean([]),
+    ?line false = is_boolean(id([])),
+    ?line false = is_boolean(42),
+    ?line false = is_boolean(id(-42)),
+
+    ?line false = is_boolean(math:pi()),
+    ?line false = is_boolean(384793478934378924978439789873478934897),
+
+    ?line false = is_boolean(id(self())),
+    ?line false = is_boolean(id({x,y,z})),
+    ?line false = is_boolean(id([a,b,c])),
+    ?line false = is_boolean(id(make_ref())),
+    ?line false = is_boolean(id(<<1,2,3>>)),
+
+    ?line ok = bool(true),
+    ?line ok = bool(false),
+    ?line ok = bool(id(true)),
+    ?line ok = bool(id(false)),
+
+    ?line error = bool(glurf),
+    ?line error = bool(id(glurf)),
+
+    ?line error = bool([]),
+    ?line error = bool(id([])),
+    ?line error = bool(42),
+    ?line error = bool(id(-42)),
+
+    ?line error = bool(math:pi()),
+    ?line error = bool(384793478934378924978439789873478934897),
+
+    ?line error = bool(id(self())),
+    ?line error = bool(id({x,y,z})),
+    ?line error = bool(id([a,b,c])),
+    ?line error = bool(id(make_ref())),
+    ?line error = bool(id(<<1,2,3>>)),
+
+    ok.
+
+bool(X) when is_boolean(X) -> ok;
+bool(_) -> error.
+
+
+is_function_2(Config) when is_list(Config) ->
+    true = is_function(id(fun ?MODULE:all/1), 1),
+    true = is_function(id(fun() -> ok end), 0),
+    false = is_function(id(fun ?MODULE:all/1), 0),
+    false = is_function(id(fun() -> ok end), 1),
+
+    F = fun(_) -> ok end,
+    if
+	is_function(F, 1) -> ok
+    end.
+
+tricky(Config) when is_list(Config) ->
+    ?line not_ok = tricky_1(1, 2),
+    ?line not_ok = tricky_1(1, blurf),
+    ?line not_ok = tricky_1(foo, 2),
+    ?line not_ok = tricky_1(a, b),
+
+    ?line false = rb(100000, [1], 42),
+    ?line true = rb(100000, [], 42),
+    ?line true = rb(555, [a,b,c], 19),
+    ok.
+
+tricky_1(X, Y) when abs((X == 1) or (Y == 2)) -> ok;
+tricky_1(_, _) -> not_ok.
+
+%% From dets_v9:read_buckets/11, simplified.
+
+rb(Size, ToRead, SoFar) when SoFar + Size < 81920; ToRead == [] -> true;
+rb(_, _, _) -> false.
+
+
+-define(T(Op,A,B),
+	ok = if A Op B -> ok; true -> error end,
+	ok = if not (A Op B) -> error; true -> ok end,
+	(fun(X, Y, True, False) ->
+		 ok = if X Op Y -> ok; true -> error end,
+		 ok = if False; X Op Y; False -> ok; true -> error end,
+		 ok = if X Op Y, True -> ok; true -> error end,
+		 ok = if not (X Op Y) -> error; true -> ok end,
+		 ok = if False; not (X Op Y); False -> error; true -> ok end
+	 end)(id(A), id(B), id(true), id(false))).
+
+-define(F(Op,A,B),
+	ok = if A Op B -> error; true -> ok end,
+	ok = if not (A Op B) -> ok; true -> error end,
+	(fun(X, Y, True, False) ->
+		 ok = if X Op Y -> error; true -> ok end,
+		 ok = if False; X Op Y; False -> error; true -> ok end,
+		 ok = if not (X Op Y); False -> ok; true -> error end,
+		 ok = if not (X Op Y), True -> ok; true -> error end
+	 end)(id(A), id(B), id(true), id(false))).
+
+
+rel_ops(Config) when is_list(Config) ->
+    ?line ?T(=/=, 1, 1.0),
+    ?line ?F(=/=, 2, 2),
+    ?line ?F(=/=, {a}, {a}),
+
+    ?line ?F(/=, a, a),
+    ?line ?F(/=, 0, 0.0),
+    ?line ?T(/=, 0, 1),
+    ?line ?F(/=, {a}, {a}),
+
+    ?line ?T(==, 1, 1.0),
+    ?line ?F(==, a, {}),
+
+    ?line ?F(=:=, 1, 1.0),
+    ?line ?T(=:=, 42.0, 42.0),
+
+    ?line ?F(>, a, b),
+    ?line ?T(>, 42, 1.0),
+    ?line ?F(>, 42, 42.0),
+
+    ?line ?T(<, a, b),
+    ?line ?F(<, 42, 1.0),
+    ?line ?F(<, 42, 42.0),
+
+    ?line ?T(=<, 1.5, 5),
+    ?line ?F(=<, -9, -100.344),
+    ?line ?T(=<, 42, 42.0),
+
+    ?line ?T(>=, 42, 42.0),
+    ?line ?F(>=, a, b),
+    ?line ?T(>=, 1.0, 0),
+
+    ok.
+
+-undef(TestOp).
+
+basic_andalso_orelse(Config) when is_list(Config) ->
+    ?line T = id({type,integers,23,42}),
+    ?line 65 = if
+		   ((element(1, T) =:= type) andalso (size(T) =:= 4) andalso
+		    element(2, T) == integers) ->
+		       element(3, T) + element(4, T);
+		   true -> error
+	       end,
+    ?line 65 = case [] of
+		   [] when ((element(1, T) =:= type) andalso (size(T) =:= 4) andalso
+			    element(2, T) == integers) ->
+		       element(3, T) + element(4, T)
+	       end,
+
+    ?line 42 = basic_rt({type,integers,40,2}),
+    ?line 5.0 = basic_rt({vector,{3.0,4.0}}),
+    ?line 20 = basic_rt(['+',3,7]),
+    ?line {'Set',a,b} = basic_rt({{'Set',a,b},{'Set',a,b}}),
+    ?line 12 = basic_rt({klurf,4}),
+
+    ?line error = basic_rt({type,integers,40,2,3}),
+    ?line error = basic_rt({kalle,integers,40,2}),
+    ?line error = basic_rt({kalle,integers,40,2}),
+    ?line error = basic_rt({1,2}),
+    ?line error = basic_rt([]),
+
+    RelProdBody =
+	fun(R1, R2) ->
+		if
+		    (erlang:size(R1) =:= 3) andalso (erlang:element(1,R1) =:= 'Set'),
+		    (erlang:size(R2) =:= 3) andalso (erlang:element(1,R2) =:= 'Set') ->
+			ok
+		end
+	end,
+
+    ?line ok = RelProdBody({'Set',a,b}, {'Set',a,b}),
+    ok.
+
+basic_rt(T) when is_tuple(T) andalso size(T) =:= 4 andalso element(1, T) =:= type andalso
+		 element(2, T) == integers ->
+    element(3, T) + element(4, T);
+basic_rt(T) when is_tuple(T) andalso size(T) =:= 2 andalso element(1, T) =:= vector ->
+    {X,Y} = element(2, T),
+    if
+	is_float(X), is_float(Y) ->
+	    math:sqrt(X*X+Y*Y)
+    end;
+basic_rt(['+',A,B]) ->
+    2*id(A+B);
+basic_rt({R1,R2}) when erlang:size(R1) =:= 3 andalso erlang:element(1,R1) =:= 'Set',
+		       erlang:size(R2) =:= 3 andalso erlang:element(1,R2) =:= 'Set' ->
+    R1 = id(R1),
+    R2 = id(R2),
+    R1;
+basic_rt(T) when is_tuple(T) andalso size(T) =:= 2 andalso element(1, T) =:= klurf ->
+    3*id(element(2, T));
+basic_rt(_) ->
+    error.
+
+traverse_dcd(Config) when is_list(Config) ->
+    L0 = [{log_header,dcd_log,"1.0",a,b,c},{log_header,dcd_log,"2.0",a,b,c},
+	  {log_header,dcd_log,"0.0",a,b,c},blurf],
+    {cont,[{log_header,dcd_log,"0.0",a,b,c},blurf],log,funny} =
+	traverse_dcd({cont,L0}, log, funny),
+    L1 = [{log_header,dcd_log,"1.0"}],
+    {cont,L1,log,funny} = traverse_dcd({cont,L1}, log, funny),
+    L2 = [{a,tuple}],
+    {cont,L2,log,funny} = traverse_dcd({cont,L2}, log, funny),
+    ok.
+
+%% The function starts out with 3 arguments in {x,0}, {x,1}, {x,2}.
+%% The outer match of a two tuple will places the first element in {x,3} and
+%% second in {x,4}. The guard for the first clause must make ensure that all of those
+%% registers are restored befor entering the second clause.
+%%
+%% (From mnesia_checkpoint.erl, modified.)
+
+traverse_dcd({Cont,[LogH|Rest]},Log,Fun)
+  when is_tuple(LogH) andalso size(LogH) =:= 6 andalso element(1, LogH) =:= log_header
+andalso erlang:element(2,LogH) == dcd_log,
+is_tuple(LogH) andalso size(LogH) =:= 6 andalso element(1, LogH) =:= log_header
+andalso erlang:element(3,LogH) >= "1.0" ->
+    traverse_dcd({Cont,Rest},Log,Fun);
+traverse_dcd({Cont,Recs},Log,Fun) ->
+    {Cont,Recs,Log,Fun}.
+
+
+check_qlc_hrl(Config) when is_list(Config) ->
+    St = {r1,false,dum},
+    ?line foo = cqlc(qlc, q, [{lc,1,2,3}], St),
+    ?line foo = cqlc(qlc, q, [{lc,1,2,3},b], St),
+    ?line St = cqlc(qlc, q, [], St),
+    ?line St = cqlc(qlc, blurf, [{lc,1,2,3},b], St),
+    ?line St = cqlc(q, q, [{lc,1,2,3},b], St),
+    ?line St = cqlc(qlc, q, [{lc,1,2,3},b,c], St),
+    ?line St = cqlc(qlc, q, [a,b], St),
+    ?line {r1,true,kalle} = cqlc(qlc, q, [{lc,1,2,3},b], {r1,true,kalle}),
+    ok.
+
+%% From erl_lint.erl; original name was check_qlc_hrl/4.
+cqlc(M, F, As, St) ->
+    Arity = length(As),
+    case As of
+        [{lc,_L,_E,_Qs}|_] when M =:= qlc, F =:= q,
+                                Arity < 3,
+                                not (((element(1, St) =:= r1) orelse fail) and (size(St) =:= 3) and element(2, St)) ->
+            foo;
+        _ ->
+            St
+    end.
+
+
+
+%% Call this function to turn off constant propagation.
+id(I) -> I.
+
+check(F, Result) ->
+    case F() of
+	Result -> ok;
+	Other ->
+	    io:format("Expected: ~p\n", [Result]),
+	    io:format("     Got: ~p\n", [Other]),
+	    test_server:fail()
+    end.
diff --git a/lib/debugger/test/int_SUITE.erl b/lib/debugger/test/int_SUITE.erl
new file mode 100644
index 0000000000..fb3a828fa1
--- /dev/null
+++ b/lib/debugger/test/int_SUITE.erl
@@ -0,0 +1,291 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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(int_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+%% Test server specific exports
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases
+-export([interpret/1, guards/1, interpretable/1]).
+-export([ append_1/1, append_2/1, member/1, reverse/1]).
+
+%% Default timetrap timeout (set in init_per_testcase)
+-define(default_timeout, ?t:minutes(1)).
+
+init_per_testcase(interpretable, Config) ->
+    ?line Dog=test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config];
+init_per_testcase(_Case, Config) ->
+
+    %% Interpret some existing and non-existing modules
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {module, lists1} = int:i(filename:join([DataDir,lists1])),
+    ?line {module, guards} = int:i(filename:join([DataDir,guards])),
+
+    ?line Dog=test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(interpretable, Config) ->
+    ?line Dog=?config(watchdog, Config),
+    ?line test_server:timetrap_cancel(Dog),
+    ok;
+end_per_testcase(_Case, Config) ->
+
+    %% Quit interpreting
+    ?line ok = int:n(lists1),
+    ?line ok = int:n(guards),
+
+    ?line Dog=?config(watchdog, Config),
+    ?line test_server:timetrap_cancel(Dog),
+    ?line ok.
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [interpret, guards, {group, list_suite}, interpretable].
+
+groups() -> 
+    [{list_suite, [], [{group, append}, reverse, member]},
+     {append, [], [append_1, append_2]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+interpret(suite) ->
+    [];
+interpret(doc) ->
+    ["Interpreting modules"];
+interpret(Config) when is_list(Config) ->
+    ?line int:n(int:interpreted()),
+
+    %% Interpret some existing and non-existing modules
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {module, lists1} = int:i(filename:join([DataDir,lists1])),
+    ?line {module, ordsets1} = int:i(filename:join([DataDir,ordsets1])),
+    ?line error = int:i(non_existent_module),
+
+    %% Check that the interpreter has the right view.
+    ?line ExpectedResult = lists:sort([lists1, ordsets1]),
+    ?line Result = int:interpreted(),
+    ?line ExpectedResult = lists:sort(Result),
+
+    %% Uniterpret the modules.
+    ?line ok = int:n(non_existent_module),
+    ?line ok = int:n(lists1),
+    ?line [ordsets1] = int:interpreted(),
+    ?line ok = int:n("ordsets1"),
+    ?line [] = int:interpreted(),
+
+    ok.
+
+guards(suite) ->
+    [];
+guards(doc) ->
+    "Evaluate guards.";
+guards(Config) when is_list(Config) ->
+    ok = guards:guards().
+
+
+
+
+append_1(suite) ->
+    [];
+append_1(doc) ->
+    [];
+append_1(Config) when is_list(Config) ->
+    ?line test_server:format("In append_1~n"),
+    ?line test_server:format("code:which(lists1)=~p~n",
+			     [code:which(lists1)]),
+    ?line test_server:format("lists1:append([a],[b])=~p~n",
+			     [spawn_eval(lists1,append,[[a],[b]])]),
+
+    ?line "abcdef"=spawn_eval(lists1,append,[["abc","def"]]),
+    ?line [hej, du,[glade, [bagare]]]=
+	spawn_eval(lists1,append,[[[hej], [du], [[glade, [bagare]]]]]),
+    ?line [10, [elem]]=spawn_eval(lists1,append,[[[10], [[elem]]]]),
+    ok.
+
+append_2(suite) ->
+    [];
+append_2(doc) ->
+    [];
+append_2(Config) when is_list(Config) ->
+    ?line test_server:format("In append_2~n"),
+    ?line test_server:format("code:which(lists1)=~p~n",
+			     [code:which(lists1)]),
+
+    ?line "abcdef"=spawn_eval(lists1,append,["abc", "def"]),
+    ?line [hej, du]=spawn_eval(lists1,append,[[hej], [du]]),
+    ?line [10, [elem]]=spawn_eval(lists1,append,[[10], [[elem]]]),
+    ok.
+
+reverse(suite) ->
+    [];
+reverse(doc) ->
+    [];
+reverse(Config) when is_list(Config) ->
+    ?line ok=reverse_test(0),
+    ?line ok=reverse_test(1),
+    ?line ok=reverse_test(2),
+    ?line ok=reverse_test(537),
+    ok.
+
+reverse_test(0) ->
+    case spawn_eval(lists1,reverse,[[]]) of
+	[] ->
+	    ok;
+	_Other ->
+	    error
+    end;
+reverse_test(Num) ->
+    List=spawn_eval(lists1,reverse,
+		    [['The Element'|lists1:duplicate(Num, 'Ele')]]),
+    case spawn_eval(lists1,reverse,[List]) of
+	['The Element'|_Rest] ->
+	    ok;
+	_Other ->
+	    error
+    end.
+
+member(suite) ->
+    [];
+member(doc) ->
+    ["Tests the lists1:member() implementation. The function "
+     "is `non-blocking', and only processes 2000 elements "
+     "at a time.",
+     "This test case depends on lists1:reverse() to work, "
+     "wich is tested in a separate test case."];
+member(Config) when list(Config) ->
+    ?line ok=member_test(0),
+    ?line ok=member_test(1),
+    ?line ok=member_test(100),
+    ?line ok=member_test(537),
+    ok.
+
+member_test(0) ->
+    case spawn_eval(lists1,member,['The Element', []]) of
+	false ->
+	    ok;
+	true ->
+	    {error, 'Found (!?)'}
+    end;
+member_test(Num) ->
+    List=spawn_eval(lists1,reverse,
+		    [['The Element'|spawn_eval(lists1,duplicate,
+					       [Num, 'Elem'])]]),
+    case spawn_eval(lists1,member,['The Element', List]) of
+	true ->
+	    ok;
+	false ->
+	    {error, not_found}
+    end.
+
+spawn_eval(M,F,A) ->
+    Self = self(),
+    spawn(fun() -> evaluator(Self, M,F,A) end),
+    receive
+	Result ->
+	    Result
+    end.
+
+evaluator(Pid, M,F,A) ->
+    Pid ! (catch apply(M,F,A)).
+
+interpretable(suite) ->
+    [];
+interpretable(doc) ->
+    ["Test int:interpretable/1"];
+interpretable(Config) when is_list(Config) ->
+
+    %% First make sure that 'lists1' is not loaded
+    case code:is_loaded(lists1) of
+	{file, _Loaded} ->
+	    ?line code:purge(lists1),
+	    ?line code:delete(lists1),
+	    ?line code:purge(lists1);
+	false -> ignore
+    end,
+
+    %% true
+    ?line DataDir = filename:dirname(?config(data_dir, Config)),
+    ?line true = code:add_patha(DataDir),
+    ?line true = int:interpretable(lists1),
+    ?line true = int:interpretable(filename:join([DataDir,lists1])),
+    ?line true = code:del_path(DataDir),
+
+    %% {error, no_src}
+    ?line PrivDir = filename:join(?config(priv_dir, Config), ""),
+    ?line {ok, _} = file:copy(filename:join([DataDir,"lists1.beam"]),
+			      filename:join([PrivDir,"lists1.beam"])),
+    ?line true = code:add_patha(PrivDir),
+
+    ?line {error, no_src} = int:interpretable(lists1),
+    ?line ok = file:delete(filename:join([PrivDir,"lists1.beam"])),
+
+    %% {error, no_beam}
+    Src = filename:join([PrivDir,"lists1.erl"]),
+    ?line {ok, _} = file:copy(filename:join([DataDir,"lists1.erl"]),
+			      Src),
+    ?line {error, no_beam} = int:interpretable(Src),
+
+    %% {error, no_debug_info}
+    ?line {ok, _} = compile:file(Src, [{outdir,PrivDir}]),
+    ?line {error, no_debug_info} = int:interpretable(Src),
+    ?line {error, no_debug_info} = int:interpretable(lists1),
+    ?line ok = file:delete(Src),
+    ?line true = code:del_path(PrivDir),
+
+    %% {error, badarg}
+    ?line {error, badarg} = int:interpretable(pride),
+    ?line {error, badarg} = int:interpretable("prejudice.erl"),
+
+    %% {error, {app,App}}
+    ?line {error, {app,_}} = int:interpretable(file),
+    ?line {error, {app,_}} = int:interpretable(lists),
+    ?line {error, {app,_}} = int:interpretable(gs),
+    ?line case int:interpretable(dbg_ieval) of
+	      {error, {app,_}} ->
+		  ok;
+	      {error, badarg} ->
+		  case code:which(dbg_ieval) of
+		      cover_compiled ->
+			  ok;
+		      Other1 ->
+			  ?line ?t:fail({unexpected_result, Other1})
+		  end;
+	      Other2 ->
+		  ?line ?t:fail({unexpected_result, Other2})
+	  end,
+
+    ok.
diff --git a/lib/debugger/test/int_SUITE_data/Makefile.src b/lib/debugger/test/int_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..95b96b5d00
--- /dev/null
+++ b/lib/debugger/test/int_SUITE_data/Makefile.src
@@ -0,0 +1,39 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2000-2010. 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%
+#
+EFLAGS=+debug_info
+all: guards.@EMULATOR@ lists1.@EMULATOR@ my_lists.@EMULATOR@ \
+     ordsets1.@EMULATOR@ test.@EMULATOR@ test1.@EMULATOR@
+
+guards.@EMULATOR@: guards.erl
+	erlc $(EFLAGS) guards.erl
+
+lists1.@EMULATOR@: lists1.erl
+	erlc $(EFLAGS) lists1.erl
+
+my_lists.@EMULATOR@: my_lists.erl
+	erlc $(EFLAGS) my_lists.erl
+
+ordsets1.@EMULATOR@: ordsets1.erl
+	erlc $(EFLAGS) ordsets1.erl
+
+test.@EMULATOR@: test.erl
+	erlc $(EFLAGS) test.erl
+
+test1.@EMULATOR@: test1.erl
+	erlc $(EFLAGS) test1.erl
diff --git a/lib/debugger/test/int_SUITE_data/guards.erl b/lib/debugger/test/int_SUITE_data/guards.erl
new file mode 100644
index 0000000000..c847bb6a8c
--- /dev/null
+++ b/lib/debugger/test/int_SUITE_data/guards.erl
@@ -0,0 +1,108 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2010. 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(guards).
+
+-export([guards/0]).
+
+guards() ->
+    ok = t(),
+    ok = f(),
+    ok = ct(1),
+    ok = multi(1),
+    ok = multi(2),
+    ok = multi(3).
+
+%% The following tests are always true.
+t() when integer(42) ->
+    ok;
+t() when float(2.0) ->
+    ok;
+t() when number(7) ->
+    ok;
+t() when number(3.14) ->
+    ok;
+t() when atom(error) ->
+    ok;
+t() when list([a]) ->
+    ok;
+t() when tuple({}) ->
+    ok;
+t() when tuple({1, 2}) ->
+    ok.
+
+%% The following tests are always false.
+f() when integer(a) ->
+    ok;
+f() when float(b) ->
+    ok;
+f() when number(c) ->
+    ok;
+f() when atom(42) ->
+    ok;
+f() when list(33) ->
+    ok;
+f() when list({}) ->
+    ok;
+f() when list({1, 2}) ->
+    ok;
+f() when tuple(33) ->
+    ok;
+f() when tuple([a]) ->
+    ok;
+f() when tuple([]) ->
+    ok;
+f() when tuple(35) ->
+    ok;
+f() ->
+    ok.
+
+%% The following tests are always true.
+ct(X) ->
+    case X of
+	Y when integer(42) ->
+	    ok;
+	Y when float(2.0) ->
+	    ok;
+	Y when number(7) ->
+	    ok;
+	Y when number(3.14) ->
+	    ok;
+	Y when atom(error) ->
+	    ok;
+	Y when list([a]) ->
+	    ok;
+	Y when tuple({}) ->
+	    ok;
+	Y when tuple({1, 2}) ->
+	    ok
+    end.
+
+multi(X) ->
+    case X of
+	Y when float(Y) ; integer(Y) ->
+	    ok;
+	Y when Y > 1, Y < 10 ; atom(Y) ->
+	    ok;
+	Y when Y == 4, number(Y) ; list(Y) ->
+	    pannkaka;
+	Y when Y==3 ; Y==5 ; Y==6 ->
+	    ok
+    end.
diff --git a/lib/debugger/test/int_SUITE_data/lists1.erl b/lib/debugger/test/int_SUITE_data/lists1.erl
new file mode 100644
index 0000000000..0214983c11
--- /dev/null
+++ b/lib/debugger/test/int_SUITE_data/lists1.erl
@@ -0,0 +1,469 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+
+%%
+%% Purpose : Basic lists processing functions.
+
+-module(lists1).
+
+
+-export([member/2, append/2, append/1, subtract/2, reverse/1, reverse/2,
+	 nth/2, nthtail/2, prefix/2, suffix/2, last/1,
+	 seq/2, seq/3, sum/1, duplicate/2, min/1, max/1, sublist/2, sublist/3,
+	 delete/2, sort/1, merge/2, concat/1,
+	 flatten/1, flatten/2, flat_length/1, flatlength/1,
+	 keymember/3, keysearch/3, keydelete/3, keyreplace/4,
+	 keysort/2, keymerge/3, keymap/3, keymap/4]).
+
+-export([all/2,any/2,map/2,flatmap/2,foldl/3,foldr/3,filter/2,zf/2,
+	 mapfoldl/3,mapfoldr/3,foreach/2,takewhile/2,dropwhile/2,splitwith/2]).
+-export([all/3,any/3,map/3,flatmap/3,foldl/4,foldr/4,filter/3,zf/3,
+	 mapfoldl/4,mapfoldr/4,foreach/3]).
+
+%% member(X, L) -> (true | false)
+%%  test if X is a member of the list L
+
+member(X, [X|_]) -> true;
+member(X, [_|Y]) ->
+	member(X, Y);
+member(X, []) -> false.
+
+%% append(X, Y) appends lists X and Y
+
+append(L1, L2) -> L1 ++ L2.
+
+%% append(L) appends the list of lists L
+
+append([E]) -> E;
+append([H|T]) -> H ++ append(T);
+append([]) -> [].
+
+%% subtract(List1, List2) subtract elements in List2 form List1.
+
+subtract(L1, L2) -> L1 -- L2.
+
+%% reverse(L) reverse all elements in the list L
+
+reverse(X) -> reverse(X, []).
+
+reverse([H|T], Y) ->
+    reverse(T, [H|Y]);
+reverse([], X) -> X.
+
+%% nth(N, L) returns the N`th element of the list L
+%% nthtail(N, L) returns the N`th tail of the list L
+
+nth(1, [H|T]) -> H;
+nth(N, [_|T]) when N > 1 ->
+    nth(N - 1, T).
+
+nthtail(1, [H|T]) -> T;
+nthtail(N, [H|T]) when N > 1 ->
+    nthtail(N - 1, T);
+nthtail(0, L) when list(L) -> L.
+
+%% prefix(Prefix, List) -> (true | false)
+
+prefix([X|PreTail], [X|Tail]) ->
+    prefix(PreTail, Tail);
+prefix([], List) -> true;
+prefix(_,_) -> false.
+
+
+%% suffix(Suffix, List) -> (true | false)
+
+suffix(Suffix, Suffix) -> true;
+suffix(Suffix, [_|Tail]) ->
+    suffix(Suffix, Tail);
+suffix(Suffix, []) -> false.
+
+%% last(List) returns the last element in a list.
+
+last([E]) -> E;
+last([E|Es]) ->
+    last(Es).
+
+%% seq(Min, Max) -> [Min,Min+1, ..., Max]
+%% seq(Min, Max, Incr) -> [Min,Min+Incr, ..., Max]
+%%  returns the sequence Min..Max
+%%  Min <= Max and Min and Max must be integers
+
+seq(Min, Max) when integer(Min), integer(Max), Min =< Max ->
+    seq(Min, Max, 1, []).
+
+seq(Min, Max, Incr) ->
+    seq(Min, Min + ((Max-Min) div Incr) * Incr, Incr, []).
+
+seq(Min, Min, I, L) -> [Min|L];
+seq(Min, Max, I, L) -> seq(Min, Max-I, I, [Max|L]).
+
+%% sum(L) suns the sum of the elements in L
+
+sum(L)          -> sum(L, 0).
+sum([H|T], Sum) -> sum(T, Sum + H);
+sum([], Sum)    -> Sum.
+
+%% duplicate(N, X) -> [X,X,X,.....,X]  (N times)
+%%   return N copies of X
+
+duplicate(N, X) when integer(N), N >= 0 -> duplicate(N, X, []).
+
+duplicate(0, _, L) -> L;
+duplicate(N, X, L) -> duplicate(N-1, X, [X|L]).
+
+
+%% min(L) -> returns the minimum element of the list L
+
+min([H|T]) -> min(T, H).
+
+min([H|T], Min) when H < Min -> min(T, H);
+min([_|T], Min)              -> min(T, Min);
+min([],    Min)              -> Min.
+
+%% max(L) -> returns the maximum element of the list L
+
+max([H|T]) -> max(T, H).
+
+max([H|T], Max) when H > Max -> max(T, H);
+max([_|T], Max)              -> max(T, Max);
+max([],    Max)              -> Max.
+
+%% sublist(List, Start, Length)
+%%  Returns the sub-list starting at Start of length Length.
+
+sublist(List, S, L) when L >= 0 ->
+    sublist(nthtail(S-1, List), L).
+
+sublist([H|T], L) when L > 0 ->
+    [H|sublist(T, L-1)];
+sublist(List, L) -> [].
+
+%% delete(Item, List) -> List'
+%%  Delete the first occurance of Item from the list L.
+
+delete(Item, [Item|Rest]) -> Rest;
+delete(Item, [H|Rest]) ->
+    [H|delete(Item, Rest)];
+delete(Item, []) -> [].
+
+%% sort(L) -> sorts the list L
+
+sort([X]) -> [X];
+sort([])  -> [];
+sort(X)   -> split_and_sort(X, [], []).
+
+split_and_sort([A,B|T], X, Y) ->
+    split_and_sort(T, [A|X], [B|Y]);
+split_and_sort([H], X, Y) ->
+    split_and_sort([], [H|X], Y);
+split_and_sort([], X, Y) ->
+    merge(sort(X), sort(Y), []).
+
+%% merge(X, Y) -> L
+%%  merges two sorted lists X and Y
+
+merge(X, Y) -> merge(X, Y, []).
+
+merge([H1|T1], [H2|T2], L) when H1 < H2 ->
+    merge(T1, [H2|T2], [H1|L]);
+merge(T1, [H2|T2], L) ->
+    merge(T1, T2, [H2|L]);
+merge([H|T], T2, L) ->
+    merge(T, T2, [H|L]);
+merge([], [], L) ->
+    reverse(L).
+
+%% concat(L) concatinate the list representation of the elements
+%%  in L - the elements in L can be atoms, integers of strings.
+%%  Returns a list of characters.
+
+concat(List) ->
+    flatmap(fun thing_to_list/1, List).
+
+thing_to_list(X) when integer(X) -> integer_to_list(X);
+thing_to_list(X) when float(X)	 -> float_to_list(X);
+thing_to_list(X) when atom(X)	 -> atom_to_list(X);
+thing_to_list(X) when list(X)	 -> X.		%Assumed to be a string
+
+%% flatten(List)
+%% flatten(List, Tail)
+%%  Flatten a list, adding optional tail.
+
+flatten(List) ->
+    flatten(List, [], []).
+
+flatten(List, Tail) ->
+    flatten(List, [], Tail).
+
+flatten([H|T], Cont, Tail) when list(H) ->
+    flatten(H, [T|Cont], Tail);
+flatten([H|T], Cont, Tail) ->
+    [H|flatten(T, Cont, Tail)];
+flatten([], [H|Cont], Tail) ->
+    flatten(H, Cont, Tail);
+flatten([], [], Tail) ->
+    Tail.
+
+%% flat_length(List) (undocumented can be rmove later)
+%%  Calculate the length of a list of lists.
+
+flat_length(List) -> flatlength(List).
+
+%% flatlength(List)
+%%  Calculate the length of a list of lists.
+
+flatlength(List) ->
+    flatlength(List, 0).
+
+flatlength([H|T], L) when list(H) ->
+    flatlength(H, flatlength(T, L));
+flatlength([H|T], L) ->
+    flatlength(T, L + 1);
+flatlength([], L) -> L.
+
+%% keymember(Key, Index, [Tuple])
+%% keysearch(Key, Index, [Tuple])
+%% keydelete(Key, Index, [Tuple])
+%% keyreplace(Key, Index, [Tuple], NewTuple)
+%% keysort(Index, [Tuple])
+%% keymerge(Index, [Tuple], [Tuple])
+%% keymap(Function, Index, [Tuple])
+%% keymap(Function, ExtraArgs, Index, [Tuple])
+
+keymember(Key, N, [T|Ts]) when element(N, T) == Key -> true;
+keymember(Key, N, [T|Ts]) ->
+    keymember(Key, N, Ts);
+keymember(Key, N, []) -> false.
+
+keysearch(Key, N, [H|T]) when element(N, H) == Key ->
+    {value, H};
+keysearch(Key, N, [H|T]) ->
+    keysearch(Key, N, T);
+keysearch(Key, N, []) -> false.
+
+keydelete(Key, N, [H|T]) when element(N, H) == Key -> T;
+keydelete(Key, N, [H|T]) ->
+    [H|keydelete(Key, N, T)];
+keydelete(Key, N, []) -> [].
+
+keyreplace(Key, Pos, [Tup|Tail], New) when element(Pos, Tup) == Key ->
+    [New|Tail];
+keyreplace(Key, Pos, [H|T], New) ->
+    [H|keyreplace(Key, Pos, T, New)];
+keyreplace(Key, Pos, [], New) -> [].
+
+keysort(Index, [X]) -> [X];
+keysort(Index, [])  -> [];
+keysort(Index, X)   -> split_and_keysort(X, [], [], Index).
+
+split_and_keysort([A,B|T], X, Y, Index) ->
+    split_and_keysort(T, [A|X], [B|Y], Index);
+split_and_keysort([H], X, Y, Index) ->
+    split_and_keysort([], [H|X], Y, Index);
+split_and_keysort([], X, Y, Index) ->
+    keymerge(Index, keysort(Index, X), keysort(Index, Y), []).
+
+keymerge(Index, X, Y) -> keymerge(Index, X, Y, []).
+
+keymerge(I, [H1|T1], [H2|T2], L) when element(I, H1) < element(I, H2) ->
+    keymerge(I, T1, [H2|T2], [H1|L]);
+keymerge(Index, T1, [H2|T2], L) ->
+    keymerge(Index,T1, T2, [H2|L]);
+keymerge(Index,[H|T], T2, L) ->
+    keymerge(Index,T, T2, [H|L]);
+keymerge(Index, [], [], L) ->
+    reverse(L).
+
+keymap(Fun, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, Fun(element(Index, Tup)))|keymap(Fun, Index, Tail)];
+keymap( _, _ , []) -> [].
+
+keymap(Fun, ExtraArgs, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
+    keymap(Fun, ExtraArgs, Index, Tail)];
+keymap( _, _ , _, []) -> [].
+
+%% all(Predicate, List)
+%% any(Predicate, List)
+%% map(Function, List)
+%% flatmap(Function, List)
+%% foldl(Function, First, List)
+%% foldr(Function, Last, List)
+%% filter(Predicate, List)
+%% zf(Function, List)
+%% mapfoldl(Function, First, List)
+%% mapfoldr(Function, Last, List)
+%% foreach(Function, List)
+%% takewhile(Predicate, List)
+%% dropwhile(Predicate, List)
+%% splitwith(Predicate, List)
+%%  for list programming. Function here is either a 'fun' or a tuple
+%%  {Module,Name} and we use apply/2 to evaluate. The name zf is a joke!
+%%
+%%  N.B. Unless where the functions actually needs it only foreach/2/3,
+%%  which is meant to be used for its side effects, has a defined order
+%%  of evaluation.
+%%
+%%  There are also versions with an extra argument, ExtraArgs, which is a
+%%  list of extra arguments to each call.
+
+all(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> all(Pred, Tail);
+	false -> false
+    end;
+all(Pred, []) -> true.
+
+any(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> true;
+	false -> any(Pred, Tail)
+    end;
+any(Pred, []) -> false.
+
+map(F, List) -> [ F(E) || E <- List ].
+
+flatmap(F, [Hd|Tail]) ->
+    F(Hd) ++ flatmap(F, Tail);
+flatmap(F, []) -> [].
+
+foldl(F, Accu, [Hd|Tail]) ->
+    foldl(F, F(Hd, Accu), Tail);
+foldl(F, Accu, []) -> Accu.
+
+foldr(F, Accu, [Hd|Tail]) ->
+    F(Hd, foldr(F, Accu, Tail));
+foldr(F, Accu, []) -> Accu.
+
+filter(Pred, List) -> [ E || E <- List, Pred(E) ].
+
+zf(F, [Hd|Tail]) ->
+    case F(Hd) of
+	true ->
+	    [Hd|zf(F, Tail)];
+	{true,Val} ->
+	    [Val|zf(F, Tail)];
+	false ->
+	    zf(F, Tail)
+    end;
+zf(F, []) -> [].
+
+foreach(F, [Hd|Tail]) ->
+    F(Hd),
+    foreach(F, Tail);
+foreach(F, []) -> ok.
+
+mapfoldl(F, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = F(Hd, Accu0),
+    {Rs,Accu2} = mapfoldl(F, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl(F, Accu, []) -> {[],Accu}.
+
+mapfoldr(F, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr(F, Accu0, Tail),
+    {R,Accu2} = F(Hd, Accu1),
+    {[R|Rs],Accu2};
+mapfoldr(F, Accu, []) -> {[],Accu}.
+
+takewhile(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> [Hd|takewhile(Pred, Tail)];
+	false -> []
+    end;
+takewhile(Pred, []) -> [].
+
+dropwhile(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> dropwhile(Pred, Tail);
+	false -> [Hd|Tail]
+    end;
+dropwhile(Pred, []) -> [].
+
+splitwith(Pred, List) -> splitwith(Pred, List, []).
+
+splitwith(Pred, [Hd|Tail], Taken) ->
+    case Pred(Hd) of
+	true -> splitwith(Pred, Tail, [Hd|Taken]);
+	false -> {reverse(Taken), [Hd|Tail]}
+    end;
+splitwith(Pred, [], Taken) -> {reverse(Taken),[]}.
+
+%% Versions of the above functions with extra arguments.
+
+all(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> all(Pred, Eas, Tail);
+	false -> false
+    end;
+all(Pred, Eas, []) -> true.
+
+any(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> true;
+	false -> any(Pred, Eas, Tail)
+    end;
+any(Pred, Eas, []) -> false.
+
+map(F, Eas, List) -> [ apply(F, [E|Eas]) || E <- List ].
+
+flatmap(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]) ++ flatmap(F, Eas, Tail);
+flatmap(F, Eas, []) -> [].
+
+foldl(F, Eas, Accu, [Hd|Tail]) ->
+    foldl(F, Eas, apply(F, [Hd,Accu|Eas]), Tail);
+foldl(F, Eas, Accu, []) -> Accu.
+
+foldr(F, Eas, Accu, [Hd|Tail]) ->
+    apply(F, [Hd,foldr(F, Eas, Accu, Tail)|Eas]);
+foldr(F, Eas, Accu, []) ->
+    Accu.
+
+filter(Pred, Eas, List) -> [ E || E <- List, apply(Pred, [E|Eas]) ].
+
+zf(F, Eas, [Hd|Tail]) ->
+    case apply(F, [Hd|Eas]) of
+	true ->
+	    [Hd|zf(F, Eas, Tail)];
+	{true,Val} ->
+	    [Val|zf(F, Eas, Tail)];
+	false ->
+	    zf(F, Eas, Tail)
+    end;
+zf(F, Eas, []) -> [].
+
+foreach(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]),
+    foreach(F, Eas, Tail);
+foreach(F, Eas, []) -> ok.
+
+mapfoldl(F, Eas, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = apply(F, [Hd,Accu0|Eas]),
+    {Rs,Accu2} = mapfoldl(F, Eas, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl(F, Eas, Accu, []) -> {[],Accu}.
+
+mapfoldr(F, Eas, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr(F, Eas, Accu0, Tail),
+    {R,Accu2} = apply(F, [Hd,Accu1|Eas]),
+    {[R|Rs],Accu2};
+mapfoldr(F, Eas, Accu, []) -> {[],Accu}.
+
+%% takewhile/2, dropwhile/2 and splitwith/2 do not have versions with
+%% extra arguments as this going to be discontinued.
diff --git a/lib/debugger/test/int_SUITE_data/my_lists.erl b/lib/debugger/test/int_SUITE_data/my_lists.erl
new file mode 100644
index 0000000000..98eb4396e3
--- /dev/null
+++ b/lib/debugger/test/int_SUITE_data/my_lists.erl
@@ -0,0 +1,5681 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+
+%%
+%%% A rather large file to test the attach delay.
+%%% Use only the ordinary lists commands.
+
+-module(my_lists).
+
+
+-export([member/2, append/2, append/1, subtract/2, reverse/1, reverse/2,
+	 nth/2, nthtail/2, prefix/2, suffix/2, last/1,
+	 seq/2, seq/3, sum/1, duplicate/2, min/1, max/1, sublist/2, sublist/3,
+	 delete/2, sort/1, merge/2, concat/1,
+	 flatten/1, flatten/2, flat_length/1, flatlength/1,
+	 keymember/3, keysearch/3, keydelete/3, keyreplace/4,
+	 keysort/2, keymerge/3, keymap/3, keymap/4]).
+
+-export([all/2,any/2,map/2,flatmap/2,foldl/3,foldr/3,filter/2,zf/2,
+	 mapfoldl/3,mapfoldr/3,foreach/2,takewhile/2,dropwhile/2,splitwith/2]).
+-export([all/3,any/3,map/3,flatmap/3,foldl/4,foldr/4,filter/3,zf/3,
+	 mapfoldl/4,mapfoldr/4,foreach/3]).
+
+%% member(X, L) -> (true | false)
+%%  test if X is a member of the list L
+
+member(X, [X|_]) -> true;
+member(X, [_|Y]) ->
+	member(X, Y);
+member(X, []) -> false.
+
+%% append(X, Y) appends lists X and Y
+
+append(L1, L2) -> L1 ++ L2.
+
+%% append(L) appends the list of lists L
+
+append([E]) -> E;
+append([H|T]) -> H ++ append(T);
+append([]) -> [].
+
+%% subtract(List1, List2) subtract elements in List2 form List1.
+
+subtract(L1, L2) -> L1 -- L2.
+
+%% reverse(L) reverse all elements in the list L
+
+reverse(X) -> reverse(X, []).
+
+reverse([H|T], Y) ->
+    reverse(T, [H|Y]);
+reverse([], X) -> X.
+
+%% nth(N, L) returns the N`th element of the list L
+%% nthtail(N, L) returns the N`th tail of the list L
+
+nth(1, [H|T]) -> H;
+nth(N, [_|T]) when N > 1 ->
+    nth(N - 1, T).
+
+nthtail(1, [H|T]) -> T;
+nthtail(N, [H|T]) when N > 1 ->
+    nthtail(N - 1, T);
+nthtail(0, L) when list(L) -> L.
+
+%% prefix(Prefix, List) -> (true | false)
+
+prefix([X|PreTail], [X|Tail]) ->
+    prefix(PreTail, Tail);
+prefix([], List) -> true;
+prefix(_,_) -> false.
+
+
+%% suffix(Suffix, List) -> (true | false)
+
+suffix(Suffix, Suffix) -> true;
+suffix(Suffix, [_|Tail]) ->
+    suffix(Suffix, Tail);
+suffix(Suffix, []) -> false.
+
+%% last(List) returns the last element in a list.
+
+last([E]) -> E;
+last([E|Es]) ->
+    last(Es).
+
+%% seq(Min, Max) -> [Min,Min+1, ..., Max]
+%% seq(Min, Max, Incr) -> [Min,Min+Incr, ..., Max]
+%%  returns the sequence Min..Max
+%%  Min <= Max and Min and Max must be integers
+
+seq(Min, Max) when integer(Min), integer(Max), Min =< Max ->
+    seq(Min, Max, 1, []).
+
+seq(Min, Max, Incr) ->
+    seq(Min, Min + ((Max-Min) div Incr) * Incr, Incr, []).
+
+seq(Min, Min, I, L) -> [Min|L];
+seq(Min, Max, I, L) -> seq(Min, Max-I, I, [Max|L]).
+
+%% sum(L) suns the sum of the elements in L
+
+sum(L)          -> sum(L, 0).
+sum([H|T], Sum) -> sum(T, Sum + H);
+sum([], Sum)    -> Sum.
+
+%% duplicate(N, X) -> [X,X,X,.....,X]  (N times)
+%%   return N copies of X
+
+duplicate(N, X) when integer(N), N >= 0 -> duplicate(N, X, []).
+
+duplicate(0, _, L) -> L;
+duplicate(N, X, L) -> duplicate(N-1, X, [X|L]).
+
+
+%% min(L) -> returns the minimum element of the list L
+
+min([H|T]) -> min(T, H).
+
+min([H|T], Min) when H < Min -> min(T, H);
+min([_|T], Min)              -> min(T, Min);
+min([],    Min)              -> Min.
+
+%% max(L) -> returns the maximum element of the list L
+
+max([H|T]) -> max(T, H).
+
+max([H|T], Max) when H > Max -> max(T, H);
+max([_|T], Max)              -> max(T, Max);
+max([],    Max)              -> Max.
+
+%% sublist(List, Start, Length)
+%%  Returns the sub-list starting at Start of length Length.
+
+sublist(List, S, L) when L >= 0 ->
+    sublist(nthtail(S-1, List), L).
+
+sublist([H|T], L) when L > 0 ->
+    [H|sublist(T, L-1)];
+sublist(List, L) -> [].
+
+%% delete(Item, List) -> List'
+%%  Delete the first occurance of Item from the list L.
+
+delete(Item, [Item|Rest]) -> Rest;
+delete(Item, [H|Rest]) ->
+    [H|delete(Item, Rest)];
+delete(Item, []) -> [].
+
+%% sort(L) -> sorts the list L
+
+sort([X]) -> [X];
+sort([])  -> [];
+sort(X)   -> split_and_sort(X, [], []).
+
+split_and_sort([A,B|T], X, Y) ->
+    split_and_sort(T, [A|X], [B|Y]);
+split_and_sort([H], X, Y) ->
+    split_and_sort([], [H|X], Y);
+split_and_sort([], X, Y) ->
+    merge(sort(X), sort(Y), []).
+
+%% merge(X, Y) -> L
+%%  merges two sorted lists X and Y
+
+merge(X, Y) -> merge(X, Y, []).
+
+merge([H1|T1], [H2|T2], L) when H1 < H2 ->
+    merge(T1, [H2|T2], [H1|L]);
+merge(T1, [H2|T2], L) ->
+    merge(T1, T2, [H2|L]);
+merge([H|T], T2, L) ->
+    merge(T, T2, [H|L]);
+merge([], [], L) ->
+    reverse(L).
+
+%% concat(L) concatinate the list representation of the elements
+%%  in L - the elements in L can be atoms, integers of strings.
+%%  Returns a list of characters.
+
+concat(List) ->
+    flatmap(fun thing_to_list/1, List).
+
+thing_to_list(X) when integer(X) -> integer_to_list(X);
+thing_to_list(X) when float(X)	 -> float_to_list(X);
+thing_to_list(X) when atom(X)	 -> atom_to_list(X);
+thing_to_list(X) when list(X)	 -> X.		%Assumed to be a string
+
+%% flatten(List)
+%% flatten(List, Tail)
+%%  Flatten a list, adding optional tail.
+
+flatten(List) ->
+    flatten(List, [], []).
+
+flatten(List, Tail) ->
+    flatten(List, [], Tail).
+
+flatten([H|T], Cont, Tail) when list(H) ->
+    flatten(H, [T|Cont], Tail);
+flatten([H|T], Cont, Tail) ->
+    [H|flatten(T, Cont, Tail)];
+flatten([], [H|Cont], Tail) ->
+    flatten(H, Cont, Tail);
+flatten([], [], Tail) ->
+    Tail.
+
+%% flat_length(List) (undocumented can be rmove later)
+%%  Calculate the length of a list of lists.
+
+flat_length(List) -> flatlength(List).
+
+%% flatlength(List)
+%%  Calculate the length of a list of lists.
+
+flatlength(List) ->
+    flatlength(List, 0).
+
+flatlength([H|T], L) when list(H) ->
+    flatlength(H, flatlength(T, L));
+flatlength([H|T], L) ->
+    flatlength(T, L + 1);
+flatlength([], L) -> L.
+
+%% keymember(Key, Index, [Tuple])
+%% keysearch(Key, Index, [Tuple])
+%% keydelete(Key, Index, [Tuple])
+%% keyreplace(Key, Index, [Tuple], NewTuple)
+%% keysort(Index, [Tuple])
+%% keymerge(Index, [Tuple], [Tuple])
+%% keymap(Function, Index, [Tuple])
+%% keymap(Function, ExtraArgs, Index, [Tuple])
+
+keymember(Key, N, [T|Ts]) when element(N, T) == Key -> true;
+keymember(Key, N, [T|Ts]) ->
+    keymember(Key, N, Ts);
+keymember(Key, N, []) -> false.
+
+keysearch(Key, N, [H|T]) when element(N, H) == Key ->
+    {value, H};
+keysearch(Key, N, [H|T]) ->
+    keysearch(Key, N, T);
+keysearch(Key, N, []) -> false.
+
+keydelete(Key, N, [H|T]) when element(N, H) == Key -> T;
+keydelete(Key, N, [H|T]) ->
+    [H|keydelete(Key, N, T)];
+keydelete(Key, N, []) -> [].
+
+keyreplace(Key, Pos, [Tup|Tail], New) when element(Pos, Tup) == Key ->
+    [New|Tail];
+keyreplace(Key, Pos, [H|T], New) ->
+    [H|keyreplace(Key, Pos, T, New)];
+keyreplace(Key, Pos, [], New) -> [].
+
+keysort(Index, [X]) -> [X];
+keysort(Index, [])  -> [];
+keysort(Index, X)   -> split_and_keysort(X, [], [], Index).
+
+split_and_keysort([A,B|T], X, Y, Index) ->
+    split_and_keysort(T, [A|X], [B|Y], Index);
+split_and_keysort([H], X, Y, Index) ->
+    split_and_keysort([], [H|X], Y, Index);
+split_and_keysort([], X, Y, Index) ->
+    keymerge(Index, keysort(Index, X), keysort(Index, Y), []).
+
+keymerge(Index, X, Y) -> keymerge(Index, X, Y, []).
+
+keymerge(I, [H1|T1], [H2|T2], L) when element(I, H1) < element(I, H2) ->
+    keymerge(I, T1, [H2|T2], [H1|L]);
+keymerge(Index, T1, [H2|T2], L) ->
+    keymerge(Index,T1, T2, [H2|L]);
+keymerge(Index,[H|T], T2, L) ->
+    keymerge(Index,T, T2, [H|L]);
+keymerge(Index, [], [], L) ->
+    reverse(L).
+
+keymap(Fun, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, Fun(element(Index, Tup)))|keymap(Fun, Index, Tail)];
+keymap( _, _ , []) -> [].
+
+keymap(Fun, ExtraArgs, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
+    keymap(Fun, ExtraArgs, Index, Tail)];
+keymap( _, _ , _, []) -> [].
+
+%% all(Predicate, List)
+%% any(Predicate, List)
+%% map(Function, List)
+%% flatmap(Function, List)
+%% foldl(Function, First, List)
+%% foldr(Function, Last, List)
+%% filter(Predicate, List)
+%% zf(Function, List)
+%% mapfoldl(Function, First, List)
+%% mapfoldr(Function, Last, List)
+%% foreach(Function, List)
+%% takewhile(Predicate, List)
+%% dropwhile(Predicate, List)
+%% splitwith(Predicate, List)
+%%  for list programming. Function here is either a 'fun' or a tuple
+%%  {Module,Name} and we use apply/2 to evaluate. The name zf is a joke!
+%%
+%%  N.B. Unless where the functions actually needs it only foreach/2/3,
+%%  which is meant to be used for its side effects, has a defined order
+%%  of evaluation.
+%%
+%%  There are also versions with an extra argument, ExtraArgs, which is a
+%%  list of extra arguments to each call.
+
+all(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> all(Pred, Tail);
+	false -> false
+    end;
+all(Pred, []) -> true.
+
+any(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> true;
+	false -> any(Pred, Tail)
+    end;
+any(Pred, []) -> false.
+
+map(F, List) -> [ F(E) || E <- List ].
+
+flatmap(F, [Hd|Tail]) ->
+    F(Hd) ++ flatmap(F, Tail);
+flatmap(F, []) -> [].
+
+foldl(F, Accu, [Hd|Tail]) ->
+    foldl(F, F(Hd, Accu), Tail);
+foldl(F, Accu, []) -> Accu.
+
+foldr(F, Accu, [Hd|Tail]) ->
+    F(Hd, foldr(F, Accu, Tail));
+foldr(F, Accu, []) -> Accu.
+
+filter(Pred, List) -> [ E || E <- List, Pred(E) ].
+
+zf(F, [Hd|Tail]) ->
+    case F(Hd) of
+	true ->
+	    [Hd|zf(F, Tail)];
+	{true,Val} ->
+	    [Val|zf(F, Tail)];
+	false ->
+	    zf(F, Tail)
+    end;
+zf(F, []) -> [].
+
+foreach(F, [Hd|Tail]) ->
+    F(Hd),
+    foreach(F, Tail);
+foreach(F, []) -> ok.
+
+mapfoldl(F, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = F(Hd, Accu0),
+    {Rs,Accu2} = mapfoldl(F, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl(F, Accu, []) -> {[],Accu}.
+
+mapfoldr(F, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr(F, Accu0, Tail),
+    {R,Accu2} = F(Hd, Accu1),
+    {[R|Rs],Accu2};
+mapfoldr(F, Accu, []) -> {[],Accu}.
+
+takewhile(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> [Hd|takewhile(Pred, Tail)];
+	false -> []
+    end;
+takewhile(Pred, []) -> [].
+
+dropwhile(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> dropwhile(Pred, Tail);
+	false -> [Hd|Tail]
+    end;
+dropwhile(Pred, []) -> [].
+
+splitwith(Pred, List) -> splitwith(Pred, List, []).
+
+splitwith(Pred, [Hd|Tail], Taken) ->
+    case Pred(Hd) of
+	true -> splitwith(Pred, Tail, [Hd|Taken]);
+	false -> {reverse(Taken), [Hd|Tail]}
+    end;
+splitwith(Pred, [], Taken) -> {reverse(Taken),[]}.
+
+%% Versions of the above functions with extra arguments.
+
+all(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> all(Pred, Eas, Tail);
+	false -> false
+    end;
+all(Pred, Eas, []) -> true.
+
+any(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> true;
+	false -> any(Pred, Eas, Tail)
+    end;
+any(Pred, Eas, []) -> false.
+
+map(F, Eas, List) -> [ apply(F, [E|Eas]) || E <- List ].
+
+flatmap(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]) ++ flatmap(F, Eas, Tail);
+flatmap(F, Eas, []) -> [].
+
+foldl(F, Eas, Accu, [Hd|Tail]) ->
+    foldl(F, Eas, apply(F, [Hd,Accu|Eas]), Tail);
+foldl(F, Eas, Accu, []) -> Accu.
+
+foldr(F, Eas, Accu, [Hd|Tail]) ->
+    apply(F, [Hd,foldr(F, Eas, Accu, Tail)|Eas]);
+foldr(F, Eas, Accu, []) ->
+    Accu.
+
+filter(Pred, Eas, List) -> [ E || E <- List, apply(Pred, [E|Eas]) ].
+
+zf(F, Eas, [Hd|Tail]) ->
+    case apply(F, [Hd|Eas]) of
+	true ->
+	    [Hd|zf(F, Eas, Tail)];
+	{true,Val} ->
+	    [Val|zf(F, Eas, Tail)];
+	false ->
+	    zf(F, Eas, Tail)
+    end;
+zf(F, Eas, []) -> [].
+
+foreach(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]),
+    foreach(F, Eas, Tail);
+foreach(F, Eas, []) -> ok.
+
+mapfoldl(F, Eas, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = apply(F, [Hd,Accu0|Eas]),
+    {Rs,Accu2} = mapfoldl(F, Eas, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl(F, Eas, Accu, []) -> {[],Accu}.
+
+mapfoldr(F, Eas, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr(F, Eas, Accu0, Tail),
+    {R,Accu2} = apply(F, [Hd,Accu1|Eas]),
+    {[R|Rs],Accu2};
+mapfoldr(F, Eas, Accu, []) -> {[],Accu}.
+
+%% takewhile/2, dropwhile/2 and splitwith/2 do not have versions with
+%% extra arguments as this going to be discontinued.
+
+
+
+
+
+%%% +++++++++++++++++++++++++++++++++++++++
+%%%
+%%% Same as above but with "_1" added to the function names
+%%%
+
+
+%% member_1(X, L) -> (true | false)
+%%  test if X is a member of the list L
+
+%member_1(X, [X|_]) -> true;
+%member_1(X, [_|Y]) ->
+%	member_1(X, Y);
+%member_1(X, []) -> false.
+
+member_1(X, L) when list(L) ->
+    case erlang:member_1(X, L) of
+	L1 when list(L1) ->
+	    receive after 1 -> ok end,
+	    member_1(X, L1);
+	Boolean ->
+	    Boolean
+    end.
+
+%% append_1(X, Y) appends lists X and Y
+
+append_1(L1, L2) -> L1 ++ L2.
+
+%% append_1(L) appends the list of lists L
+
+append_1([E]) -> E;
+append_1([H|T]) -> H ++ append_1(T);
+append_1([]) -> [].
+
+%% subtract_1(List1, List2) subtract elements in List2 form List1.
+
+subtract_1(L1, L2) -> L1 -- L2.
+
+%% reverse_1(L) reverse all elements in the list L
+
+reverse_1(X) -> reverse_1(X, []).
+
+%reverse_1([H|T], Y) ->
+%    reverse_1(T, [H|Y]);
+%reverse_1([], X) -> X.
+
+reverse_1(List0, Result0) when list(List0) ->
+    case erlang:reverse_1(List0, Result0) of
+	{List, Result} ->
+	    receive after 1 -> ok end,
+	    reverse_1(List, Result);
+	Result ->
+	    Result
+    end.
+
+
+%% nth_1(N, L) returns the N`th element of the list L
+%% nthtail_1(N, L) returns the N`th tail of the list L
+
+nth_1(1, [H|T]) -> H;
+nth_1(N, [_|T]) when N > 1 ->
+    nth_1(N - 1, T).
+
+nthtail_1(1, [H|T]) -> T;
+nthtail_1(N, [H|T]) when N > 1 ->
+    nthtail_1(N - 1, T);
+nthtail_1(0, L) when list(L) -> L.
+
+%% prefix_1(Prefix, List) -> (true | false)
+
+prefix_1([X|PreTail], [X|Tail]) ->
+    prefix_1(PreTail, Tail);
+prefix_1([], List) -> true;
+prefix_1(_,_) -> false.
+
+
+%% suffix_1(Suffix, List) -> (true | false)
+
+suffix_1(Suffix, Suffix) -> true;
+suffix_1(Suffix, [_|Tail]) ->
+    suffix_1(Suffix, Tail);
+suffix_1(Suffix, []) -> false.
+
+%% last(List) returns the last element in a list.
+
+last_1([E]) -> E;
+last_1([E|Es]) ->
+    last_1(Es).
+
+%% seq(Min, Max) -> [Min,Min+1, ..., Max]
+%% seq(Min, Max, Incr) -> [Min,Min+Incr, ..., Max]
+%%  returns the sequence Min..Max
+%%  Min <= Max and Min and Max must be integers
+
+seq_1(Min, Max) when integer(Min), integer(Max), Min =< Max ->
+    seq_1(Min, Max, 1, []).
+
+seq_1(Min, Max, Incr) ->
+    seq_1(Min, Min + ((Max-Min) div Incr) * Incr, Incr, []).
+
+seq_1(Min, Min, I, L) -> [Min|L];
+seq_1(Min, Max, I, L) -> seq_1(Min, Max-I, I, [Max|L]).
+
+%% sum(L) suns the sum of the elements in L
+
+sum_1(L)          -> sum_1(L, 0).
+sum_1([H|T], Sum) -> sum_1(T, Sum + H);
+sum_1([], Sum)    -> Sum.
+
+%% duplicate(N, X) -> [X,X,X,.....,X]  (N times)
+%%   return N copies of X
+
+duplicate_1(N, X) when integer(N), N >= 0 -> duplicate_1(N, X, []).
+
+duplicate_1(0, _, L) -> L;
+duplicate_1(N, X, L) -> duplicate_1(N-1, X, [X|L]).
+
+
+%% min(L) -> returns the minimum element of the list L
+
+min_1([H|T]) -> min_1(T, H).
+
+min_1([H|T], Min) when H < Min -> min_1(T, H);
+min_1([_|T], Min)              -> min_1(T, Min);
+min_1([],    Min)              -> Min.
+
+%% max(L) -> returns the maximum element of the list L
+
+max_1([H|T]) -> max_1(T, H).
+
+max_1([H|T], Max) when H > Max -> max_1(T, H);
+max_1([_|T], Max)              -> max_1(T, Max);
+max_1([],    Max)              -> Max.
+
+%% sublist(List, Start, Length)
+%%  Returns the sub-list starting at Start of length Length.
+
+sublist_1(List, S, L) when L >= 0 ->
+    sublist_1(nthtail_1(S-1, List), L).
+
+sublist_1([H|T], L) when L > 0 ->
+    [H|sublist_1(T, L-1)];
+sublist_1(List, L) -> [].
+
+%% delete(Item, List) -> List'
+%%  Delete the first occurance of Item from the list L.
+
+delete_1(Item, [Item|Rest]) -> Rest;
+delete_1(Item, [H|Rest]) ->
+    [H|delete_1(Item, Rest)];
+delete_1(Item, []) -> [].
+
+%% sort(L) -> sorts the list L
+
+sort_1([X]) -> [X];
+sort_1([])  -> [];
+sort_1(X)   -> split_and_sort_1(X, [], []).
+
+split_and_sort_1([A,B|T], X, Y) ->
+    split_and_sort_1(T, [A|X], [B|Y]);
+split_and_sort_1([H], X, Y) ->
+    split_and_sort_1([], [H|X], Y);
+split_and_sort_1([], X, Y) ->
+    merge_1(sort_1(X), sort_1(Y), []).
+
+%% merge(X, Y) -> L
+%%  merges two sorted lists X and Y
+
+merge_1(X, Y) -> merge_1(X, Y, []).
+
+merge_1([H1|T1], [H2|T2], L) when H1 < H2 ->
+    merge_1(T1, [H2|T2], [H1|L]);
+merge_1(T1, [H2|T2], L) ->
+    merge_1(T1, T2, [H2|L]);
+merge_1([H|T], T2, L) ->
+    merge_1(T, T2, [H|L]);
+merge_1([], [], L) ->
+    reverse_1(L).
+
+%% concat(L) concatinate the list representation of the elements
+%%  in L - the elements in L can be atoms, integers of strings.
+%%  Returns a list of characters.
+
+concat_1(List) ->
+    flatmap_1(fun thing_to_list/1, List).
+
+thing_to_list_1(X) when integer(X) -> integer_to_list(X);
+thing_to_list_1(X) when float(X)	 -> float_to_list(X);
+thing_to_list_1(X) when atom(X)	 -> atom_to_list(X);
+thing_to_list_1(X) when list(X)	 -> X.		%Assumed to be a string
+
+%% flatten(List)
+%% flatten(List, Tail)
+%%  Flatten a list, adding optional tail.
+
+flatten_1(List) ->
+    flatten_1(List, [], []).
+
+flatten_1(List, Tail) ->
+    flatten_1(List, [], Tail).
+
+flatten_1([H|T], Cont, Tail) when list(H) ->
+    flatten_1(H, [T|Cont], Tail);
+flatten_1([H|T], Cont, Tail) ->
+    [H|flatten_1(T, Cont, Tail)];
+flatten_1([], [H|Cont], Tail) ->
+    flatten_1(H, Cont, Tail);
+flatten_1([], [], Tail) ->
+    Tail.
+
+%% flat_length(List) (undocumented can be rmove later)
+%%  Calculate the length of a list of lists.
+
+flat_length_1(List) -> flatlength_1(List).
+
+%% flatlength(List)
+%%  Calculate the length of a list of lists.
+
+flatlength_1(List) ->
+    flatlength_1(List, 0).
+
+flatlength_1([H|T], L) when list(H) ->
+    flatlength_1(H, flatlength_1(T, L));
+flatlength_1([H|T], L) ->
+    flatlength_1(T, L + 1);
+flatlength_1([], L) -> L.
+
+%% keymember(Key, Index, [Tuple])
+%% keysearch(Key, Index, [Tuple])
+%% keydelete(Key, Index, [Tuple])
+%% keyreplace(Key, Index, [Tuple], NewTuple)
+%% keysort(Index, [Tuple])
+%% keymerge(Index, [Tuple], [Tuple])
+%% keymap(Function, Index, [Tuple])
+%% keymap(Function, ExtraArgs, Index, [Tuple])
+
+keymember_1(Key, N, [T|Ts]) when element(N, T) == Key -> true;
+keymember_1(Key, N, [T|Ts]) ->
+    keymember_1(Key, N, Ts);
+keymember_1(Key, N, []) -> false.
+
+keysearch_1(Key, N, [H|T]) when element(N, H) == Key ->
+    {value, H};
+keysearch_1(Key, N, [H|T]) ->
+    keysearch_1(Key, N, T);
+keysearch_1(Key, N, []) -> false.
+
+keydelete_1(Key, N, [H|T]) when element(N, H) == Key -> T;
+keydelete_1(Key, N, [H|T]) ->
+    [H|keydelete_1(Key, N, T)];
+keydelete_1(Key, N, []) -> [].
+
+keyreplace_1(Key, Pos, [Tup|Tail], New) when element(Pos, Tup) == Key ->
+    [New|Tail];
+keyreplace_1(Key, Pos, [H|T], New) ->
+    [H|keyreplace_1(Key, Pos, T, New)];
+keyreplace_1(Key, Pos, [], New) -> [].
+
+keysort_1(Index, [X]) -> [X];
+keysort_1(Index, [])  -> [];
+keysort_1(Index, X)   -> split_and_keysort_1(X, [], [], Index).
+
+split_and_keysort_1([A,B|T], X, Y, Index) ->
+    split_and_keysort_1(T, [A|X], [B|Y], Index);
+split_and_keysort_1([H], X, Y, Index) ->
+    split_and_keysort_1([], [H|X], Y, Index);
+split_and_keysort_1([], X, Y, Index) ->
+    keymerge_1(Index, keysort_1(Index, X), keysort_1(Index, Y), []).
+
+keymerge_1(Index, X, Y) -> keymerge_1(Index, X, Y, []).
+
+keymerge_1(I, [H1|T1], [H2|T2], L) when element(I, H1) < element(I, H2) ->
+    keymerge_1(I, T1, [H2|T2], [H1|L]);
+keymerge_1(Index, T1, [H2|T2], L) ->
+    keymerge_1(Index,T1, T2, [H2|L]);
+keymerge_1(Index,[H|T], T2, L) ->
+    keymerge_1(Index,T, T2, [H|L]);
+keymerge_1(Index, [], [], L) ->
+    reverse_1(L).
+
+keymap_1(Fun, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, Fun(element(Index, Tup)))|keymap_1(Fun, Index, Tail)];
+keymap_1( _, _ , []) -> [].
+
+keymap_1(Fun, ExtraArgs, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
+    keymap_1(Fun, ExtraArgs, Index, Tail)];
+keymap_1( _, _ , _, []) -> [].
+
+%% all(Predicate, List)
+%% any(Predicate, List)
+%% map(Function, List)
+%% flatmap(Function, List)
+%% foldl(Function, First, List)
+%% foldr(Function, Last, List)
+%% filter(Predicate, List)
+%% zf(Function, List)
+%% mapfoldl(Function, First, List)
+%% mapfoldr(Function, Last, List)
+%% foreach(Function, List)
+%% takewhile(Predicate, List)
+%% dropwhile(Predicate, List)
+%% splitwith(Predicate, List)
+%%  for list programming. Function here is either a 'fun' or a tuple
+%%  {Module,Name} and we use apply/2 to evaluate. The name zf is a joke!
+%%
+%%  N.B. Unless where the functions actually needs it only foreach/2/3,
+%%  which is meant to be used for its side effects, has a defined order
+%%  of evaluation.
+%%
+%%  There are also versions with an extra argument, ExtraArgs, which is a
+%%  list of extra arguments to each call.
+
+all_1(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> all_1(Pred, Tail);
+	false -> false
+    end;
+all_1(Pred, []) -> true.
+
+any_1(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> true;
+	false -> any_1(Pred, Tail)
+    end;
+any_1(Pred, []) -> false.
+
+map_1(F, List) -> [ F(E) || E <- List ].
+
+flatmap_1(F, [Hd|Tail]) ->
+    F(Hd) ++ flatmap_1(F, Tail);
+flatmap_1(F, []) -> [].
+
+foldl_1(F, Accu, [Hd|Tail]) ->
+    foldl_1(F, F(Hd, Accu), Tail);
+foldl_1(F, Accu, []) -> Accu.
+
+foldr_1(F, Accu, [Hd|Tail]) ->
+    F(Hd, foldr_1(F, Accu, Tail));
+foldr_1(F, Accu, []) -> Accu.
+
+filter_1(Pred, List) -> [ E || E <- List, Pred(E) ].
+
+zF(F, [Hd|Tail]) ->
+    case F(Hd) of
+	true ->
+	    [Hd|zF(F, Tail)];
+	{true,Val} ->
+	    [Val|zF(F, Tail)];
+	false ->
+	    zF(F, Tail)
+    end;
+zF(F, []) -> [].
+
+foreach_1(F, [Hd|Tail]) ->
+    F(Hd),
+    foreach_1(F, Tail);
+foreach_1(F, []) -> ok.
+
+mapfoldl_1(F, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = F(Hd, Accu0),
+    {Rs,Accu2} = mapfoldl_1(F, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl_1(F, Accu, []) -> {[],Accu}.
+
+mapfoldr_1(F, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr_1(F, Accu0, Tail),
+    {R,Accu2} = F(Hd, Accu1),
+    {[R|Rs],Accu2};
+mapfoldr_1(F, Accu, []) -> {[],Accu}.
+
+takewhile_1(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> [Hd|takewhile_1(Pred, Tail)];
+	false -> []
+    end;
+takewhile_1(Pred, []) -> [].
+
+dropwhile_1(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> dropwhile_1(Pred, Tail);
+	false -> [Hd|Tail]
+    end;
+dropwhile_1(Pred, []) -> [].
+
+splitwith_1(Pred, List) -> splitwith_1(Pred, List, []).
+
+splitwith_1(Pred, [Hd|Tail], Taken) ->
+    case Pred(Hd) of
+	true -> splitwith_1(Pred, Tail, [Hd|Taken]);
+	false -> {reverse_1(Taken), [Hd|Tail]}
+    end;
+splitwith_1(Pred, [], Taken) -> {reverse_1(Taken),[]}.
+
+%% Versions of the above functions with extra arguments.
+
+all_1(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> all_1(Pred, Eas, Tail);
+	false -> false
+    end;
+all_1(Pred, Eas, []) -> true.
+
+any_1(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> true;
+	false -> any_1(Pred, Eas, Tail)
+    end;
+any_1(Pred, Eas, []) -> false.
+
+map_1(F, Eas, List) -> [ apply(F, [E|Eas]) || E <- List ].
+
+flatmap_1(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]) ++ flatmap_1(F, Eas, Tail);
+flatmap_1(F, Eas, []) -> [].
+
+foldl_1(F, Eas, Accu, [Hd|Tail]) ->
+    foldl_1(F, Eas, apply(F, [Hd,Accu|Eas]), Tail);
+foldl_1(F, Eas, Accu, []) -> Accu.
+
+foldr_1(F, Eas, Accu, [Hd|Tail]) ->
+    apply(F, [Hd,foldr_1(F, Eas, Accu, Tail)|Eas]);
+foldr_1(F, Eas, Accu, []) ->
+    Accu.
+
+filter_1(Pred, Eas, List) -> [ E || E <- List, apply(Pred, [E|Eas]) ].
+
+zF(F, Eas, [Hd|Tail]) ->
+    case apply(F, [Hd|Eas]) of
+	true ->
+	    [Hd|zF(F, Eas, Tail)];
+	{true,Val} ->
+	    [Val|zF(F, Eas, Tail)];
+	false ->
+	    zF(F, Eas, Tail)
+    end;
+zF(F, Eas, []) -> [].
+
+foreach_1(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]),
+    foreach_1(F, Eas, Tail);
+foreach_1(F, Eas, []) -> ok.
+
+mapfoldl_1(F, Eas, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = apply(F, [Hd,Accu0|Eas]),
+    {Rs,Accu2} = mapfoldl_1(F, Eas, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl_1(F, Eas, Accu, []) -> {[],Accu}.
+
+mapfoldr_1(F, Eas, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr_1(F, Eas, Accu0, Tail),
+    {R,Accu2} = apply(F, [Hd,Accu1|Eas]),
+    {[R|Rs],Accu2};
+mapfoldr_1(F, Eas, Accu, []) -> {[],Accu}.
+
+%% takewhile/2, dropwhile/2 and splitwith/2 do not have versions with
+%% extra arguments as this going to be discontinued.
+
+
+
+
+
+
+%%% +++++++++++++++++++++
+%%%
+%%% "_2"
+
+
+
+
+
+%% member_2(X, L) -> _2(true | false)
+%%  test if X is a member of the list L
+
+%member_2(X, [X|_]) -> true;
+%member_2(X, [_|Y]) ->
+%	member_2(X, Y);
+%member_2(X, []) -> false.
+
+member_2(X, L) when list(L) ->
+    case erlang:member_2(X, L) of
+	L1 when list(L1) ->
+	    receive after 1 -> ok end,
+	    member_2(X, L1);
+	Boolean ->
+	    Boolean
+    end.
+
+%% append_2(X, Y) appends lists X and Y
+
+append_2(L1, L2) -> L1 ++ L2.
+
+%% append_2(L) appends the list of lists L
+
+append_2([E]) -> E;
+append_2([H|T]) -> H ++ append_2(T);
+append_2([]) -> [].
+
+%% subtract_2(List1, List2) subtract elements in List2 form List1.
+
+subtract_2(L1, L2) -> L1 -- L2.
+
+%% reverse_2(L) reverse all elements in the list L
+
+reverse_2(X) -> reverse_2(X, []).
+
+%reverse_2([H|T], Y) ->
+%    reverse_2(T, [H|Y]);
+%reverse_2([], X) -> X.
+
+reverse_2(List0, Result0) when list(List0) ->
+    case erlang:reverse_2(List0, Result0) of
+	{List, Result} ->
+	    receive after 1 -> ok end,
+	    reverse_2(List, Result);
+	Result ->
+	    Result
+    end.
+
+
+%% nth_2(N, L) returns the N`th element of the list L
+%% nthtail_2(N, L) returns the N`th tail of the list L
+
+nth_2(1, [H|T]) -> H;
+nth_2(N, [_|T]) when N > 1 ->
+    nth_2(N - 1, T).
+
+nthtail_2(1, [H|T]) -> T;
+nthtail_2(N, [H|T]) when N > 1 ->
+    nthtail_2(N - 1, T);
+nthtail_2(0, L) when list(L) -> L.
+
+%% prefix_2(Prefix, List) -> _2(true | false)
+
+prefix_2([X|PreTail], [X|Tail]) ->
+    prefix_2(PreTail, Tail);
+prefix_2([], List) -> true;
+prefix_2(_,_) -> false.
+
+
+%% suffix_2(Suffix, List) -> _2(true | false)
+
+suffix_2(Suffix, Suffix) -> true;
+suffix_2(Suffix, [_|Tail]) ->
+    suffix_2(Suffix, Tail);
+suffix_2(Suffix, []) -> false.
+
+%% last_2(List) returns the last element in a list.
+
+last_2([E]) -> E;
+last_2([E|Es]) ->
+    last_2(Es).
+
+%% seq_2(Min, Max) -> [Min,Min+1, ..., Max]
+%% seq_2(Min, Max, Incr) -> [Min,Min+Incr, ..., Max]
+%%  returns the sequence Min..Max
+%%  Min <= Max and Min and Max must be integers
+
+seq_2(Min, Max) when integer(Min), integer(Max), Min =< Max ->
+    seq_2(Min, Max, 1, []).
+
+seq_2(Min, Max, Incr) ->
+    seq_2(Min, Min + ((Max-Min) div Incr) * Incr, Incr, []).
+
+seq_2(Min, Min, I, L) -> [Min|L];
+seq_2(Min, Max, I, L) -> seq_2(Min, Max-I, I, [Max|L]).
+
+%% sum_2(L) suns the sum of the elements in L
+
+sum_2(L)          -> sum_2(L, 0).
+sum_2([H|T], Sum) -> sum_2(T, Sum + H);
+sum_2([], Sum)    -> Sum.
+
+%% duplicate_2(N, X) -> [X,X,X,.....,X]  _2(N times)
+%%   return N copies of X
+
+duplicate_2(N, X) when integer(N), N >= 0 -> duplicate_2(N, X, []).
+
+duplicate_2(0, _, L) -> L;
+duplicate_2(N, X, L) -> duplicate_2(N-1, X, [X|L]).
+
+
+%% min_2(L) -> returns the minimum element of the list L
+
+min_2([H|T]) -> min_2(T, H).
+
+min_2([H|T], Min) when H < Min -> min_2(T, H);
+min_2([_|T], Min)              -> min_2(T, Min);
+min_2([],    Min)              -> Min.
+
+%% max_2(L) -> returns the maximum element of the list L
+
+max_2([H|T]) -> max_2(T, H).
+
+max_2([H|T], Max) when H > Max -> max_2(T, H);
+max_2([_|T], Max)              -> max_2(T, Max);
+max_2([],    Max)              -> Max.
+
+%% sublist(List, Start, Length)
+%%  Returns the sub-list starting at Start of length Length.
+
+sublist_2(List, S, L) when L >= 0 ->
+    sublist_2(nthtail_2(S-1, List), L).
+
+sublist_2([H|T], L) when L > 0 ->
+    [H|sublist_2(T, L-1)];
+sublist_2(List, L) -> [].
+
+%% delete_2(Item, List) -> List'
+%%  Delete the first occurance of Item from the list L.
+
+delete_2(Item, [Item|Rest]) -> Rest;
+delete_2(Item, [H|Rest]) ->
+    [H|delete_2(Item, Rest)];
+delete_2(Item, []) -> [].
+
+%% sort_2(L) -> sorts the list L
+
+sort_2([X]) -> [X];
+sort_2([])  -> [];
+sort_2(X)   -> split_and_sort_2(X, [], []).
+
+split_and_sort_2([A,B|T], X, Y) ->
+    split_and_sort_2(T, [A|X], [B|Y]);
+split_and_sort_2([H], X, Y) ->
+    split_and_sort_2([], [H|X], Y);
+split_and_sort_2([], X, Y) ->
+    merge_2(sort_2(X), sort_2(Y), []).
+
+%% merge_2(X, Y) -> L
+%%  merges two sorted lists X and Y
+
+merge_2(X, Y) -> merge_2(X, Y, []).
+
+merge_2([H1|T1], [H2|T2], L) when H1 < H2 ->
+    merge_2(T1, [H2|T2], [H1|L]);
+merge_2(T1, [H2|T2], L) ->
+    merge_2(T1, T2, [H2|L]);
+merge_2([H|T], T2, L) ->
+    merge_2(T, T2, [H|L]);
+merge_2([], [], L) ->
+    reverse_2(L).
+
+%% concat_2(L) concatinate the list representation of the elements
+%%  in L - the elements in L can be atoms, integers of strings.
+%%  Returns a list of characters.
+
+concat_2(List) ->
+    flatmap_2(fun thing_to_list/1, List).
+
+thing_to_list_2(X) when integer(X) -> integer_to_list(X);
+thing_to_list_2(X) when float(X)	 -> float_to_list(X);
+thing_to_list_2(X) when atom(X)	 -> atom_to_list(X);
+thing_to_list_2(X) when list(X)	 -> X.		%Assumed to be a string
+
+%% flatten_2(List)
+%% flatten_2(List, Tail)
+%%  Flatten a list, adding optional tail.
+
+flatten_2(List) ->
+    flatten_2(List, [], []).
+
+flatten_2(List, Tail) ->
+    flatten_2(List, [], Tail).
+
+flatten_2([H|T], Cont, Tail) when list(H) ->
+    flatten_2(H, [T|Cont], Tail);
+flatten_2([H|T], Cont, Tail) ->
+    [H|flatten_2(T, Cont, Tail)];
+flatten_2([], [H|Cont], Tail) ->
+    flatten_2(H, Cont, Tail);
+flatten_2([], [], Tail) ->
+    Tail.
+
+%% flat_length_2(List) _2(undocumented can be rmove later)
+%%  Calculate the length of a list of lists.
+
+flat_length_2(List) -> flatlength_2(List).
+
+%% flatlength_2(List)
+%%  Calculate the length of a list of lists.
+
+flatlength_2(List) ->
+    flatlength_2(List, 0).
+
+flatlength_2([H|T], L) when list(H) ->
+    flatlength_2(H, flatlength_2(T, L));
+flatlength_2([H|T], L) ->
+    flatlength_2(T, L + 1);
+flatlength_2([], L) -> L.
+
+%% keymember_2(Key, Index, [Tuple])
+%% keysearch_2(Key, Index, [Tuple])
+%% keydelete_2(Key, Index, [Tuple])
+%% keyreplace_2(Key, Index, [Tuple], NewTuple)
+%% keysort_2(Index, [Tuple])
+%% keymerge_2(Index, [Tuple], [Tuple])
+%% keymap_2(Function, Index, [Tuple])
+%% keymap_2(Function, ExtraArgs, Index, [Tuple])
+
+keymember_2(Key, N, [T|Ts]) when element(N, T) == Key -> true;
+keymember_2(Key, N, [T|Ts]) ->
+    keymember_2(Key, N, Ts);
+keymember_2(Key, N, []) -> false.
+
+keysearch_2(Key, N, [H|T]) when element(N, H) == Key ->
+    {value, H};
+keysearch_2(Key, N, [H|T]) ->
+    keysearch_2(Key, N, T);
+keysearch_2(Key, N, []) -> false.
+
+keydelete_2(Key, N, [H|T]) when element(N, H) == Key -> T;
+keydelete_2(Key, N, [H|T]) ->
+    [H|keydelete_2(Key, N, T)];
+keydelete_2(Key, N, []) -> [].
+
+keyreplace_2(Key, Pos, [Tup|Tail], New) when element(Pos, Tup) == Key ->
+    [New|Tail];
+keyreplace_2(Key, Pos, [H|T], New) ->
+    [H|keyreplace_2(Key, Pos, T, New)];
+keyreplace_2(Key, Pos, [], New) -> [].
+
+keysort_2(Index, [X]) -> [X];
+keysort_2(Index, [])  -> [];
+keysort_2(Index, X)   -> split_and_keysort_2(X, [], [], Index).
+
+split_and_keysort_2([A,B|T], X, Y, Index) ->
+    split_and_keysort_2(T, [A|X], [B|Y], Index);
+split_and_keysort_2([H], X, Y, Index) ->
+    split_and_keysort_2([], [H|X], Y, Index);
+split_and_keysort_2([], X, Y, Index) ->
+    keymerge_2(Index, keysort_2(Index, X), keysort_2(Index, Y), []).
+
+keymerge_2(Index, X, Y) -> keymerge_2(Index, X, Y, []).
+
+keymerge_2(I, [H1|T1], [H2|T2], L) when element(I, H1) < element(I, H2) ->
+    keymerge_2(I, T1, [H2|T2], [H1|L]);
+keymerge_2(Index, T1, [H2|T2], L) ->
+    keymerge_2(Index,T1, T2, [H2|L]);
+keymerge_2(Index,[H|T], T2, L) ->
+    keymerge_2(Index,T, T2, [H|L]);
+keymerge_2(Index, [], [], L) ->
+    reverse_2(L).
+
+keymap_2(Fun, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, Fun(element(Index, Tup)))|keymap_2(Fun, Index, Tail)];
+keymap_2( _, _ , []) -> [].
+
+keymap_2(Fun, ExtraArgs, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
+    keymap_2(Fun, ExtraArgs, Index, Tail)];
+keymap_2( _, _ , _, []) -> [].
+
+%% all_2(Predicate, List)
+%% any_2(Predicate, List)
+%% map_2(Function, List)
+%% flatmap_2(Function, List)
+%% foldl_2(Function, First, List)
+%% foldr_2(Function, Last, List)
+%% filter_2(Predicate, List)
+%% zF(Function, List)
+%% mapfoldl_2(Function, First, List)
+%% mapfoldr_2(Function, Last, List)
+%% foreach_2(Function, List)
+%% takewhile_2(Predicate, List)
+%% dropwhile_2(Predicate, List)
+%% splitwith_2(Predicate, List)
+%%  for list programming. Function here is either a 'fun' or a tuple
+%%  {Module,Name} and we use apply/2 to evaluate. The name zf is a joke!
+%%
+%%  N.B. Unless where the functions actually needs it only foreach/2/3,
+%%  which is meant to be used for its side effects, has a defined order
+%%  of evaluation.
+%%
+%%  There are also versions with an extra argument, ExtraArgs, which is a
+%%  list of extra arguments to each call.
+
+all_2(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> all_2(Pred, Tail);
+	false -> false
+    end;
+all_2(Pred, []) -> true.
+
+any_2(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> true;
+	false -> any_2(Pred, Tail)
+    end;
+any_2(Pred, []) -> false.
+
+map_2(F, List) -> [ F(E) || E <- List ].
+
+flatmap_2(F, [Hd|Tail]) ->
+    F(Hd) ++ flatmap_2(F, Tail);
+flatmap_2(F, []) -> [].
+
+foldl_2(F, Accu, [Hd|Tail]) ->
+    foldl_2(F, F(Hd, Accu), Tail);
+foldl_2(F, Accu, []) -> Accu.
+
+foldr_2(F, Accu, [Hd|Tail]) ->
+    F(Hd, foldr_2(F, Accu, Tail));
+foldr_2(F, Accu, []) -> Accu.
+
+filter_2(Pred, List) -> [ E || E <- List, Pred(E) ].
+
+zF_2(F, [Hd|Tail]) ->
+    case F(Hd) of
+	true ->
+	    [Hd|zF_2(F, Tail)];
+	{true,Val} ->
+	    [Val|zF_2(F, Tail)];
+	false ->
+	    zF_2(F, Tail)
+    end;
+zF_2(F, []) -> [].
+
+foreach_2(F, [Hd|Tail]) ->
+    F(Hd),
+    foreach_2(F, Tail);
+foreach_2(F, []) -> ok.
+
+mapfoldl_2(F, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = F(Hd, Accu0),
+    {Rs,Accu2} = mapfoldl_2(F, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl_2(F, Accu, []) -> {[],Accu}.
+
+mapfoldr_2(F, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr_2(F, Accu0, Tail),
+    {R,Accu2} = F(Hd, Accu1),
+    {[R|Rs],Accu2};
+mapfoldr_2(F, Accu, []) -> {[],Accu}.
+
+takewhile_2(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> [Hd|takewhile_2(Pred, Tail)];
+	false -> []
+    end;
+takewhile_2(Pred, []) -> [].
+
+dropwhile_2(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> dropwhile_2(Pred, Tail);
+	false -> [Hd|Tail]
+    end;
+dropwhile_2(Pred, []) -> [].
+
+splitwith_2(Pred, List) -> splitwith_2(Pred, List, []).
+
+splitwith_2(Pred, [Hd|Tail], Taken) ->
+    case Pred(Hd) of
+	true -> splitwith_2(Pred, Tail, [Hd|Taken]);
+	false -> {reverse_2(Taken), [Hd|Tail]}
+    end;
+splitwith_2(Pred, [], Taken) -> {reverse_2(Taken),[]}.
+
+%% Versions of the above functions with extra arguments.
+
+all_2(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> all_2(Pred, Eas, Tail);
+	false -> false
+    end;
+all_2(Pred, Eas, []) -> true.
+
+any_2(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> true;
+	false -> any_2(Pred, Eas, Tail)
+    end;
+any_2(Pred, Eas, []) -> false.
+
+map_2(F, Eas, List) -> [ apply(F, [E|Eas]) || E <- List ].
+
+flatmap_2(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]) ++ flatmap_2(F, Eas, Tail);
+flatmap_2(F, Eas, []) -> [].
+
+foldl_2(F, Eas, Accu, [Hd|Tail]) ->
+    foldl_2(F, Eas, apply(F, [Hd,Accu|Eas]), Tail);
+foldl_2(F, Eas, Accu, []) -> Accu.
+
+foldr_2(F, Eas, Accu, [Hd|Tail]) ->
+    apply(F, [Hd,foldr_2(F, Eas, Accu, Tail)|Eas]);
+foldr_2(F, Eas, Accu, []) ->
+    Accu.
+
+filter_2(Pred, Eas, List) -> [ E || E <- List, apply(Pred, [E|Eas]) ].
+
+zF_2(F, Eas, [Hd|Tail]) ->
+    case apply(F, [Hd|Eas]) of
+	true ->
+	    [Hd|zF_2(F, Eas, Tail)];
+	{true,Val} ->
+	    [Val|zF_2(F, Eas, Tail)];
+	false ->
+	    zF_2(F, Eas, Tail)
+    end;
+zF_2(F, Eas, []) -> [].
+
+foreach_2(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]),
+    foreach_2(F, Eas, Tail);
+foreach_2(F, Eas, []) -> ok.
+
+mapfoldl_2(F, Eas, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = apply(F, [Hd,Accu0|Eas]),
+    {Rs,Accu2} = mapfoldl_2(F, Eas, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl_2(F, Eas, Accu, []) -> {[],Accu}.
+
+mapfoldr_2(F, Eas, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr_2(F, Eas, Accu0, Tail),
+    {R,Accu2} = apply(F, [Hd,Accu1|Eas]),
+    {[R|Rs],Accu2};
+mapfoldr_2(F, Eas, Accu, []) -> {[],Accu}.
+
+%% takewhile/2, dropwhile/2 and splitwith/2 do not have versions with
+%% extra arguments as this going to be discontinued.
+
+
+
+
+
+%%% +++++++++++++++++++
+%%%
+%%% With "_3"
+
+
+
+
+%% member_3(X, L) -> _3(true | false)
+%%  test if X is a member of the list L
+
+%member_3(X, [X|_]) -> true;
+%member_3(X, [_|Y]) ->
+%	member_3(X, Y);
+%member_3(X, []) -> false.
+
+member_3(X, L) when list(L) ->
+    case erlang:member(X, L) of
+	L1 when list(L1) ->
+	    receive after 1 -> ok end,
+	    member_3(X, L1);
+	Boolean ->
+	    Boolean
+    end.
+
+%% append_3(X, Y) appends lists X and Y
+
+append_3(L1, L2) -> L1 ++ L2.
+
+%% append_3(L) appends the list of lists L
+
+append_3([E]) -> E;
+append_3([H|T]) -> H ++ append_3(T);
+append_3([]) -> [].
+
+%% subtract_3(List1, List2) subtract elements in List2 form List1.
+
+subtract_3(L1, L2) -> L1 -- L2.
+
+%% reverse_3(L) reverse all elements in the list L
+
+reverse_3(X) -> reverse_3(X, []).
+
+%reverse_3([H|T], Y) ->
+%    reverse_3(T, [H|Y]);
+%reverse_3([], X) -> X.
+
+reverse_3(List0, Result0) when list(List0) ->
+    case erlang:reverse_3(List0, Result0) of
+	{List, Result} ->
+	    receive after 1 -> ok end,
+	    reverse_3(List, Result);
+	Result ->
+	    Result
+    end.
+
+
+%% nth_3(N, L) returns the N`th element of the list L
+%% nthtail_3(N, L) returns the N`th tail of the list L
+
+nth_3(1, [H|T]) -> H;
+nth_3(N, [_|T]) when N > 1 ->
+    nth_3(N - 1, T).
+
+nthtail_3(1, [H|T]) -> T;
+nthtail_3(N, [H|T]) when N > 1 ->
+    nthtail_3(N - 1, T);
+nthtail_3(0, L) when list(L) -> L.
+
+%% prefix_3(Prefix, List) -> _3(true | false)
+
+prefix_3([X|PreTail], [X|Tail]) ->
+    prefix_3(PreTail, Tail);
+prefix_3([], List) -> true;
+prefix_3(_,_) -> false.
+
+
+%% suffix_3(Suffix, List) -> _3(true | false)
+
+suffix_3(Suffix, Suffix) -> true;
+suffix_3(Suffix, [_|Tail]) ->
+    suffix_3(Suffix, Tail);
+suffix_3(Suffix, []) -> false.
+
+%% last_3(List) returns the last element in a list.
+
+last_3([E]) -> E;
+last_3([E|Es]) ->
+    last_3(Es).
+
+%% seq_3(Min, Max) -> [Min,Min+1, ..., Max]
+%% seq_3(Min, Max, Incr) -> [Min,Min+Incr, ..., Max]
+%%  returns the sequence Min..Max
+%%  Min <= Max and Min and Max must be integers
+
+seq_3(Min, Max) when integer(Min), integer(Max), Min =< Max ->
+    seq_3(Min, Max, 1, []).
+
+seq_3(Min, Max, Incr) ->
+    seq_3(Min, Min + ((Max-Min) div Incr) * Incr, Incr, []).
+
+seq_3(Min, Min, I, L) -> [Min|L];
+seq_3(Min, Max, I, L) -> seq_3(Min, Max-I, I, [Max|L]).
+
+%% sum_3(L) suns the sum of the elements in L
+
+sum_3(L)          -> sum_3(L, 0).
+sum_3([H|T], Sum) -> sum_3(T, Sum + H);
+sum_3([], Sum)    -> Sum.
+
+%% duplicate_3(N, X) -> [X,X,X,.....,X]  _3(N times)
+%%   return N copies of X
+
+duplicate_3(N, X) when integer(N), N >= 0 -> duplicate_3(N, X, []).
+
+duplicate_3(0, _, L) -> L;
+duplicate_3(N, X, L) -> duplicate_3(N-1, X, [X|L]).
+
+
+%% min_3(L) -> returns the minimum element of the list L
+
+min_3([H|T]) -> min_3(T, H).
+
+min_3([H|T], Min) when H < Min -> min_3(T, H);
+min_3([_|T], Min)              -> min_3(T, Min);
+min_3([],    Min)              -> Min.
+
+%% max_3(L) -> returns the maximum element of the list L
+
+max_3([H|T]) -> max_3(T, H).
+
+max_3([H|T], Max) when H > Max -> max_3(T, H);
+max_3([_|T], Max)              -> max_3(T, Max);
+max_3([],    Max)              -> Max.
+
+%% sublist_3(List, Start, Length)
+%%  Returns the sub-list starting at Start of length Length.
+
+sublist_3(List, S, L) when L >= 0 ->
+    sublist_3(nthtail_3(S-1, List), L).
+
+sublist_3([H|T], L) when L > 0 ->
+    [H|sublist_3(T, L-1)];
+sublist_3(List, L) -> [].
+
+%% delete_3(Item, List) -> List'
+%%  Delete the first occurance of Item from the list L.
+
+delete_3(Item, [Item|Rest]) -> Rest;
+delete_3(Item, [H|Rest]) ->
+    [H|delete_3(Item, Rest)];
+delete_3(Item, []) -> [].
+
+%% sort_3(L) -> sorts the list L
+
+sort_3([X]) -> [X];
+sort_3([])  -> [];
+sort_3(X)   -> split_and_sort_3(X, [], []).
+
+split_and_sort_3([A,B|T], X, Y) ->
+    split_and_sort_3(T, [A|X], [B|Y]);
+split_and_sort_3([H], X, Y) ->
+    split_and_sort_3([], [H|X], Y);
+split_and_sort_3([], X, Y) ->
+    merge_3(sort_3(X), sort_3(Y), []).
+
+%% merge_3(X, Y) -> L
+%%  merges two sorted lists X and Y
+
+merge_3(X, Y) -> merge_3(X, Y, []).
+
+merge_3([H1|T1], [H2|T2], L) when H1 < H2 ->
+    merge_3(T1, [H2|T2], [H1|L]);
+merge_3(T1, [H2|T2], L) ->
+    merge_3(T1, T2, [H2|L]);
+merge_3([H|T], T2, L) ->
+    merge_3(T, T2, [H|L]);
+merge_3([], [], L) ->
+    reverse_3(L).
+
+%% concat_3(L) concatinate the list representation of the elements
+%%  in L - the elements in L can be atoms, integers of strings.
+%%  Returns a list of characters.
+
+concat_3(List) ->
+    flatmap_3(fun thing_to_list/1, List).
+
+thing_to_list_3(X) when integer(X) -> integer_to_list(X);
+thing_to_list_3(X) when float(X)	 -> float_to_list(X);
+thing_to_list_3(X) when atom(X)	 -> atom_to_list(X);
+thing_to_list_3(X) when list(X)	 -> X.		%Assumed to be a string
+
+%% flatten_3(List)
+%% flatten_3(List, Tail)
+%%  Flatten a list, adding optional tail.
+
+flatten_3(List) ->
+    flatten_3(List, [], []).
+
+flatten_3(List, Tail) ->
+    flatten_3(List, [], Tail).
+
+flatten_3([H|T], Cont, Tail) when list(H) ->
+    flatten_3(H, [T|Cont], Tail);
+flatten_3([H|T], Cont, Tail) ->
+    [H|flatten_3(T, Cont, Tail)];
+flatten_3([], [H|Cont], Tail) ->
+    flatten_3(H, Cont, Tail);
+flatten_3([], [], Tail) ->
+    Tail.
+
+%% flat_length_3(List) _3(undocumented can be rmove later)
+%%  Calculate the length of a list of lists.
+
+flat_length_3(List) -> flatlength_3(List).
+
+%% flatlength_3(List)
+%%  Calculate the length of a list of lists.
+
+flatlength_3(List) ->
+    flatlength_3(List, 0).
+
+flatlength_3([H|T], L) when list(H) ->
+    flatlength_3(H, flatlength_3(T, L));
+flatlength_3([H|T], L) ->
+    flatlength_3(T, L + 1);
+flatlength_3([], L) -> L.
+
+%% keymember_3(Key, Index, [Tuple])
+%% keysearch_3(Key, Index, [Tuple])
+%% keydelete_3(Key, Index, [Tuple])
+%% keyreplace_3(Key, Index, [Tuple], NewTuple)
+%% keysort_3(Index, [Tuple])
+%% keymerge_3(Index, [Tuple], [Tuple])
+%% keymap_3(Function, Index, [Tuple])
+%% keymap_3(Function, ExtraArgs, Index, [Tuple])
+
+keymember_3(Key, N, [T|Ts]) when element(N, T) == Key -> true;
+keymember_3(Key, N, [T|Ts]) ->
+    keymember_3(Key, N, Ts);
+keymember_3(Key, N, []) -> false.
+
+keysearch_3(Key, N, [H|T]) when element(N, H) == Key ->
+    {value, H};
+keysearch_3(Key, N, [H|T]) ->
+    keysearch_3(Key, N, T);
+keysearch_3(Key, N, []) -> false.
+
+keydelete_3(Key, N, [H|T]) when element(N, H) == Key -> T;
+keydelete_3(Key, N, [H|T]) ->
+    [H|keydelete_3(Key, N, T)];
+keydelete_3(Key, N, []) -> [].
+
+keyreplace_3(Key, Pos, [Tup|Tail], New) when element(Pos, Tup) == Key ->
+    [New|Tail];
+keyreplace_3(Key, Pos, [H|T], New) ->
+    [H|keyreplace_3(Key, Pos, T, New)];
+keyreplace_3(Key, Pos, [], New) -> [].
+
+keysort_3(Index, [X]) -> [X];
+keysort_3(Index, [])  -> [];
+keysort_3(Index, X)   -> split_and_keysort_3(X, [], [], Index).
+
+split_and_keysort_3([A,B|T], X, Y, Index) ->
+    split_and_keysort_3(T, [A|X], [B|Y], Index);
+split_and_keysort_3([H], X, Y, Index) ->
+    split_and_keysort_3([], [H|X], Y, Index);
+split_and_keysort_3([], X, Y, Index) ->
+    keymerge_3(Index, keysort_3(Index, X), keysort_3(Index, Y), []).
+
+keymerge_3(Index, X, Y) -> keymerge_3(Index, X, Y, []).
+
+keymerge_3(I, [H1|T1], [H2|T2], L) when element(I, H1) < element(I, H2) ->
+    keymerge_3(I, T1, [H2|T2], [H1|L]);
+keymerge_3(Index, T1, [H2|T2], L) ->
+    keymerge_3(Index,T1, T2, [H2|L]);
+keymerge_3(Index,[H|T], T2, L) ->
+    keymerge_3(Index,T, T2, [H|L]);
+keymerge_3(Index, [], [], L) ->
+    reverse_3(L).
+
+keymap_3(Fun, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, Fun(element(Index, Tup)))|keymap_3(Fun, Index, Tail)];
+keymap_3( _, _ , []) -> [].
+
+keymap_3(Fun, ExtraArgs, Index, [Tup|Tail]) ->
+   [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
+    keymap_3(Fun, ExtraArgs, Index, Tail)];
+keymap_3( _, _ , _, []) -> [].
+
+%% all_3(Predicate, List)
+%% any_3(Predicate, List)
+%% map_3(Function, List)
+%% flatmap_3(Function, List)
+%% foldl_3(Function, First, List)
+%% foldr_3(Function, Last, List)
+%% filter_3(Predicate, List)
+%% zF(Function, List)
+%% mapfoldl_3(Function, First, List)
+%% mapfoldr_3(Function, Last, List)
+%% foreach_3(Function, List)
+%% takewhile_3(Predicate, List)
+%% dropwhile_3(Predicate, List)
+%% splitwith_3(Predicate, List)
+%%  for list programming. Function here is either a 'fun' or a tuple
+%%  {Module,Name} and we use apply/2 to evaluate. The name zf is a joke!
+%%
+%%  N.B. Unless where the functions actually needs it only foreach/2/3,
+%%  which is meant to be used for its side effects, has a defined order
+%%  of evaluation.
+%%
+%%  There are also versions with an extra argument, ExtraArgs, which is a
+%%  list of extra arguments to each call.
+
+all_3(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> all_3(Pred, Tail);
+	false -> false
+    end;
+all_3(Pred, []) -> true.
+
+any_3(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> true;
+	false -> any_3(Pred, Tail)
+    end;
+any_3(Pred, []) -> false.
+
+map_3(F, List) -> [ F(E) || E <- List ].
+
+flatmap_3(F, [Hd|Tail]) ->
+    F(Hd) ++ flatmap_3(F, Tail);
+flatmap_3(F, []) -> [].
+
+foldl_3(F, Accu, [Hd|Tail]) ->
+    foldl_3(F, F(Hd, Accu), Tail);
+foldl_3(F, Accu, []) -> Accu.
+
+foldr_3(F, Accu, [Hd|Tail]) ->
+    F(Hd, foldr_3(F, Accu, Tail));
+foldr_3(F, Accu, []) -> Accu.
+
+filter_3(Pred, List) -> [ E || E <- List, Pred(E) ].
+
+zF_3(F, [Hd|Tail]) ->
+    case F(Hd) of
+	true ->
+	    [Hd|zF_3(F, Tail)];
+	{true,Val} ->
+	    [Val|zF_3(F, Tail)];
+	false ->
+	    zF_3(F, Tail)
+    end;
+zF_3(F, []) -> [].
+
+foreach_3(F, [Hd|Tail]) ->
+    F(Hd),
+    foreach_3(F, Tail);
+foreach_3(F, []) -> ok.
+
+mapfoldl_3(F, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = F(Hd, Accu0),
+    {Rs,Accu2} = mapfoldl_3(F, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl_3(F, Accu, []) -> {[],Accu}.
+
+mapfoldr_3(F, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr_3(F, Accu0, Tail),
+    {R,Accu2} = F(Hd, Accu1),
+    {[R|Rs],Accu2};
+mapfoldr_3(F, Accu, []) -> {[],Accu}.
+
+takewhile_3(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> [Hd|takewhile_3(Pred, Tail)];
+	false -> []
+    end;
+takewhile_3(Pred, []) -> [].
+
+dropwhile_3(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+	true -> dropwhile_3(Pred, Tail);
+	false -> [Hd|Tail]
+    end;
+dropwhile_3(Pred, []) -> [].
+
+splitwith_3(Pred, List) -> splitwith_3(Pred, List, []).
+
+splitwith_3(Pred, [Hd|Tail], Taken) ->
+    case Pred(Hd) of
+	true -> splitwith_3(Pred, Tail, [Hd|Taken]);
+	false -> {reverse_3(Taken), [Hd|Tail]}
+    end;
+splitwith_3(Pred, [], Taken) -> {reverse_3(Taken),[]}.
+
+%% Versions of the above functions with extra arguments.
+
+all_3(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> all_3(Pred, Eas, Tail);
+	false -> false
+    end;
+all_3(Pred, Eas, []) -> true.
+
+any_3(Pred, Eas, [Hd|Tail]) ->
+    case apply(Pred, [Hd|Eas]) of
+	true -> true;
+	false -> any_3(Pred, Eas, Tail)
+    end;
+any_3(Pred, Eas, []) -> false.
+
+map_3(F, Eas, List) -> [ apply(F, [E|Eas]) || E <- List ].
+
+flatmap_3(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]) ++ flatmap_3(F, Eas, Tail);
+flatmap_3(F, Eas, []) -> [].
+
+foldl_3(F, Eas, Accu, [Hd|Tail]) ->
+    foldl_3(F, Eas, apply(F, [Hd,Accu|Eas]), Tail);
+foldl_3(F, Eas, Accu, []) -> Accu.
+
+foldr_3(F, Eas, Accu, [Hd|Tail]) ->
+    apply(F, [Hd,foldr_3(F, Eas, Accu, Tail)|Eas]);
+foldr_3(F, Eas, Accu, []) ->
+    Accu.
+
+filter_3(Pred, Eas, List) -> [ E || E <- List, apply(Pred, [E|Eas]) ].
+
+zF_3(F, Eas, [Hd|Tail]) ->
+    case apply(F, [Hd|Eas]) of
+	true ->
+	    [Hd|zF(F, Eas, Tail)];
+	{true,Val} ->
+	    [Val|zF(F, Eas, Tail)];
+	false ->
+	    zF(F, Eas, Tail)
+    end;
+zF_3(F, Eas, []) -> [].
+
+foreach_3(F, Eas, [Hd|Tail]) ->
+    apply(F, [Hd|Eas]),
+    foreach_3(F, Eas, Tail);
+foreach_3(F, Eas, []) -> ok.
+
+mapfoldl_3(F, Eas, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = apply(F, [Hd,Accu0|Eas]),
+    {Rs,Accu2} = mapfoldl_3(F, Eas, Accu1, Tail),
+    {[R|Rs],Accu2};
+mapfoldl_3(F, Eas, Accu, []) -> {[],Accu}.
+
+mapfoldr_3(F, Eas, Accu0, [Hd|Tail]) ->
+    {Rs,Accu1} = mapfoldr_3(F, Eas, Accu0, Tail),
+    {R,Accu2} = apply(F, [Hd,Accu1|Eas]),
+    {[R|Rs],Accu2};
+mapfoldr_3(F, Eas, Accu, []) -> {[],Accu}.
+
+%% takewhile/2, dropwhile/2 and splitwith/2 do not have versions with
+%% extra arguments as this going to be discontinued.
+
+
+
+
+lots_of_atoms () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms1 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms2 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms3 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms4 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms5 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms6 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms7 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms8 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms9 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms10 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms11 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
+
+
+lots_of_atoms12 () ->
+
+Aa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Af = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ag = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ah = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aba = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aca = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ada = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aea = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aga = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aha = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aab = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahb = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aac = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aec = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahc = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aad = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Add = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aed = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahd = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aae = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ace = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ade = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aee = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Age = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahe = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+
+Aaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+
+Aaaaaa= 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahaaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aabaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aebaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahbaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aacaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Accaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aecaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahcaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aadaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Acdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Addaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aedaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Agdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ahdaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aaeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Abeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aceaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Adeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aeeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Afeaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Ageaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg',
+
+Aheaaa = 'rnevgoirnvire iriej iirejgierjg ioegjrigj oiegj oijetig oijtgej oj oiejg iojetijwokfopkewmf irjgo ergjerifjiugnuignuit euhg uieuignuiergnuienrgueringiun uiegniuerngui iugne uegniuetgniuetgnuientg unegngiuethgiueugnieg'.
diff --git a/lib/debugger/test/int_SUITE_data/ordsets1.erl b/lib/debugger/test/int_SUITE_data/ordsets1.erl
new file mode 100644
index 0000000000..a01d35eb51
--- /dev/null
+++ b/lib/debugger/test/int_SUITE_data/ordsets1.erl
@@ -0,0 +1,191 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+
+%%
+%% Copyright (C) 1991, Ellemtel Telecommunications Systems Laboratories
+%% File    : ordsets.erl
+%% Author  : Robert Virding
+%% Purpose : Functions for manipulating sets as ordered lists.
+
+%% As yet some of these are not very efficiently written.
+
+-module(ordsets1).
+
+-export([new_set/0,is_set/1,set_to_list/1,list_to_set/1]).
+-export([is_element/2,add_element/2,del_element/2]).
+-export([union/2,union/1,intersection/2,intersection/1]).
+-export([subtract/2,subset/2]).
+
+%% new_set()
+%%  Return a new empty ordered set.
+
+new_set() ->
+    [].
+
+%% is_set(Set)
+%%  Return 'true' if Set is an ordered set of elements, else 'false'.
+
+is_set([E|Es]) ->
+    is_set(Es, E);
+is_set([]) ->
+    true.
+
+is_set([E2|Es], E1) when E1 < E2 ->
+    is_set(Es, E2);
+is_set([E2|Es], E1) ->
+    false;
+is_set([], E1) ->
+    true.
+
+%% set_to_list(OrdSet)
+%%  Return the elements in OrdSet as a list.
+
+set_to_list(S) ->
+    S.
+
+%% list_to_set(List)
+%%  Build an ordered set from the elements in List.
+
+list_to_set([E|Es]) ->
+    add_element(E, list_to_set(Es));
+list_to_set([]) ->
+    [].
+
+%% is_element(Element, OrdSet)
+%%  Return 'true' if Element is an element of OrdSet, else 'false'.
+
+is_element(E, [H|Es]) when E < H ->
+    false;
+is_element(E, [H|Es]) when E == H ->
+    true;
+is_element(E, [H|Es]) when E > H ->
+    is_element(E, Es);
+is_element(E, []) ->
+    false.
+
+%% add_element(Element, OrdSet)
+%%  Return OrdSet with Element inserted in it.
+
+add_element(E, [H|Es]) when E < H ->
+    [E,H|Es];
+add_element(E, [H|Es]) when E == H ->
+    [H|Es];
+add_element(E, [H|Es]) when E > H ->
+    [H|add_element(E, Es)];
+add_element(E, []) ->
+    [E].
+
+%% del_element(Element, OrdSet)
+%%  Return OrdSet but with Element removed.
+
+del_element(E, [H|Es]) when E < H ->
+    [H|Es];
+del_element(E, [H|Es]) when E == H ->
+    Es;
+del_element(E, [H|Es]) when E > H ->
+    [H|del_element(E, Es)];
+del_element(E, []) ->
+    [].
+
+%% union(Set1, Set2)
+%%  Return the union of Set1 and Set2.
+
+union([H1|Es1], [H2|Es2]) when H1 < H2 ->
+    [H1|union(Es1, [H2|Es2])];
+union([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    [H1|union(Es1, Es2)];
+union([H1|Es1], [H2|Es2]) when H1 > H2 ->
+    [H2|union([H1|Es1], Es2)];
+union([], Es2) ->
+    Es2;
+union(Es1, []) ->
+    Es1.
+
+%% union(OrdSets)
+%%  Return the union of the list of sets.
+
+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.
+
+%% intersection(Set1, Set2)
+%%  Return the intersection of Set1 and Set2.
+
+intersection([H1|Es1], [H2|Es2]) when H1 < H2 ->
+    intersection(Es1, [H2|Es2]);
+intersection([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    [H1|intersection(Es1, Es2)];
+intersection([H1|Es1], [H2|Es2]) when H1 > H2 ->
+    intersection([H1|Es1], Es2);
+intersection([], Es2) ->
+    [];
+intersection(Es1, []) ->
+    [].
+
+%% intersection(OrdSets)
+%%  Return the intersection of the list of sets.
+
+intersection([S1,S2|Ss]) ->
+    intersection1(intersection(S1,S2), Ss);
+intersection([S]) ->
+    S;
+intersection([]) ->
+    [].
+
+intersection1(S1, [S2|Ss]) ->
+    intersection1(intersection(S1, S2), Ss);
+intersection1(S1, []) ->
+    S1.
+
+%% subtract(Set1, Set2)
+%%  Return all and only the elements of Set1 which are not also in Set2.
+
+subtract([H1|Es1], [H2|Es2]) when H1 < H2 ->
+    [H1|subtract(Es1, [H2|Es2])];
+subtract([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    subtract(Es1, Es2);
+subtract([H1|Es1], [H2|Es2]) when H1 > H2 ->
+    subtract([H1|Es1], Es2);
+subtract([], Es2) ->
+    [];
+subtract(Es1, []) ->
+    Es1.
+
+%% subset(Set1, Set2)
+%%  Return 'true' when every element of Set1 is also a member of Set2,
+%%  else 'false'.
+
+subset([H1|Es1], [H2|Es2]) when H1 < H2 ->	%H1 not in Set2
+    false;
+subset([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    subset(Es1, Es2);
+subset([H1|Es1], [H2|Es2]) when H1 > H2 ->
+    subset([H1|Es1], Es2);
+subset([], Es2) ->
+    true;
+subset(Es1, []) ->
+    false.
diff --git a/lib/debugger/test/int_SUITE_data/test.erl b/lib/debugger/test/int_SUITE_data/test.erl
new file mode 100644
index 0000000000..679b266380
--- /dev/null
+++ b/lib/debugger/test/int_SUITE_data/test.erl
@@ -0,0 +1,152 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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(test).
+
+%%-compile(export_all).
+-export([test1/0,
+	 test2/0,
+	 test3/0,
+	 test4/0,
+	 test5/0,
+	 test6/1,
+	 test7/0,
+	 test8/1,
+	 test9/0,
+	 test10/0,
+	 test11/0
+	]).
+
+
+-export([test9_server/1]).
+
+
+test1() ->
+    R1 = lists1:reverse("retep"),
+    R2 = ordsets1:list_to_set([b,c,a,2,4,1]),
+    R3 = lists1:reverse("nilo"),
+    {R1,R2, R3}.
+
+test2() ->
+    R1 = spawn(lists1,reverse,["retep"]),
+    R2 = spawn(ordsets1,list_to_set,[[b,c,a,2,4,1]]),
+    R3 = spawn(lists1,reverse,["nilo"]),
+    {R1,R2, R3}.
+
+
+test3() ->
+    A = a,
+    Pid = spawn(?MODULE, test1,[]),
+    B = b,
+    {A, B, Pid}.
+
+test4() ->
+    Pid = spawn(?MODULE, test1,[]),
+    A = a,
+    B = b,
+    {A, B, Pid}.
+test5() ->
+    L1 = [a,b,c],
+    L = length(L1),
+    A = a,
+    B = b,
+    {A, B, L, L1}.
+
+
+
+test6(0) ->
+    ok;
+test6(N) when N>0 ->
+    spawn(lists1,reverse,["adolfiparisrorsirapifloda"]),
+    test6(N-1).
+
+
+test7() ->
+    CurDirReturn = file:get_cwd(),
+    {ok, CurDir} = CurDirReturn,
+    DirListReturn = file:list_dir(CurDir),
+    {ok, DirList} = DirListReturn,
+    io:format("~w~n",[DirList]).
+
+
+test8(List) ->
+    %% foo
+    %%bar
+    %% foo
+    %%bar
+    %% foo
+    %%bar
+    %% foo
+    %%bar
+
+    L2 =  [gamma|List],
+    {L2, List}.
+
+test9() ->
+    S1 = spawn(?MODULE, test9_server,[self()]),
+    S2 = spawn(?MODULE, test9_server,[bongo]),
+    S3 = spawn(?MODULE, test9_server,[42]),
+
+    test9_loop(S1,S2,S3).
+
+test9_loop(S1,S2,S3) ->
+    receive
+	{S1, hej} ->
+	    io:format("S1 ~n"),
+	    test9_loop(S1,S2,S3);
+	{S2, hej} ->
+	    io:format("S2 ~n"),
+	    test9_loop(S1,S2,S3);
+	{S3, hej} ->
+	    io:format("S3 ~n"),
+	    test9_loop(S1,S2,S3)
+    end.
+
+
+test9_server(Pid) ->
+    io:format("started server: ~p~n",[Pid]),
+    test9_server1(Pid).
+
+test9_server1(Pid) ->
+    Pad = {pad, Pid},
+    test9_server2(Pad).
+
+test9_server2(Pad) ->
+    {pad, Pid} = Pad,
+    Pid ! {self(), hej}.
+
+
+
+
+
+test10() ->
+    receive
+	X ->
+	    done
+    after 20000 ->
+	    timeout
+    end.
+
+test11() ->
+    receive
+	X ->
+	    done
+    end.
diff --git a/lib/debugger/test/int_SUITE_data/test1.erl b/lib/debugger/test/int_SUITE_data/test1.erl
new file mode 100644
index 0000000000..a93416cbac
--- /dev/null
+++ b/lib/debugger/test/int_SUITE_data/test1.erl
@@ -0,0 +1,34 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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(test1).
+
+-compile(export_all).
+
+
+foo() ->
+	A = [1,2,3],
+	B = [a,b,c],
+	C = [d,e,f],
+	D = my_lists:append(A,B),
+	E = my_lists:append(D,C),
+	F = [1],
+	G = my_lists:append(E,F),
+	{A,B,C,D,E,F,G}.
diff --git a/lib/debugger/test/int_break_SUITE.erl b/lib/debugger/test/int_break_SUITE.erl
new file mode 100644
index 0000000000..d2ffd2938d
--- /dev/null
+++ b/lib/debugger/test/int_break_SUITE.erl
@@ -0,0 +1,112 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2010. 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(int_break_SUITE).
+
+%% Test break points.
+
+-include_lib("test_server/include/test_server.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,cleanup/1]).
+
+-export([auto_attach/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic, cleanup].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(_Case, Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line Mod = ordsets1,
+    ?line {module,Mod} = int:i(filename:join(DataDir, Mod)),
+    ?line ok = io:format("Interpreted modules: ~p", [int:interpreted()]),
+    ?line Dog = test_server:timetrap(?t:minutes(0.5)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    ?line ok = io:format("Interpreted modules: ~p", [int:interpreted()]),
+    ?line Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+basic(doc) -> "Tests setting a few break points.";
+basic(suite) -> [];
+basic(Config) when list(Config) ->
+    ?line int:auto_attach([init], {?MODULE,auto_attach}),
+    ?line S1 = [] = ordsets1:new_set(),
+    ?line ok = i:ib(ordsets1, 86),
+    ?line S2 = [xxx] = ordsets1:add_element(xxx, S1),
+    ?line S3 = [xxx,y] = ordsets1:add_element(y, S2),
+    ?line ok = i:ib(ordsets1, union, 2),
+    ?line [xxx,y,z] = ordsets1:union(S3, [z]),
+    ok.
+
+cleanup(doc) -> "Make sure that the auto-attach flag is turned off.";
+cleanup(suite) -> [];
+cleanup(Config) when list(Config) ->
+    ?line int:auto_attach(false),
+    ok.
+
+auto_attach(Pid) ->
+    {ok, Meta} = int:attached(Pid),
+    io:format("Pid = ~p; Meta = ~p", [Pid,Meta]),
+    link(Meta),
+    attach_loop(Pid, Meta).
+
+attach_loop(Pid, Meta) ->
+    receive
+	Msg ->
+	    io:format("attached: ~p", [Msg]),
+	    attach_cmd(Msg, Pid, Meta),
+	    attach_loop(Pid, Meta)
+    end.
+
+attach_cmd({Meta,{break_at,ordsets1,36,2}}, _Pid, Meta) ->
+    int:meta(Meta, continue);
+attach_cmd({Meta,{break_at,ordsets1,87,_}}, _Pid, Meta) ->
+    int:meta(Meta, continue);
+attach_cmd({Meta,{break_at,ordsets1,89,_}}, _Pid, Meta) ->
+    int:meta(Meta, continue);
+attach_cmd({Meta,{break_at,ordsets1,Line,_}}, _Pid, Meta) when 107 =< Line, Line =< 115 ->
+    int:meta(Meta, finish);
+attach_cmd({Meta,{break_at,_Mod,_Line,_Other}}=Cmd, _Pid, Meta) ->
+    io:format("attached: no action for ~p", [Cmd]);
+attach_cmd(_, _Pid, _Meta) ->
+    ok.
diff --git a/lib/debugger/test/int_break_SUITE_data/Makefile.src b/lib/debugger/test/int_break_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..0d1ee35a67
--- /dev/null
+++ b/lib/debugger/test/int_break_SUITE_data/Makefile.src
@@ -0,0 +1,25 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2000-2010. 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%
+#
+
+EFLAGS=+debug_info
+
+all: ordsets1.@EMULATOR@
+
+ordsets1.@EMULATOR@: ordsets1.erl
+	erlc $(EFLAGS) ordsets1.erl
diff --git a/lib/debugger/test/int_break_SUITE_data/ordsets1.erl b/lib/debugger/test/int_break_SUITE_data/ordsets1.erl
new file mode 100644
index 0000000000..6300c6097c
--- /dev/null
+++ b/lib/debugger/test/int_break_SUITE_data/ordsets1.erl
@@ -0,0 +1,188 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2010. 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%
+%%
+
+%%
+%% Purpose : Functions for manipulating sets as ordered lists.
+
+%% As yet some of these are not very efficiently written.
+
+-module(ordsets1).
+
+-export([new_set/0,is_set/1,set_to_list/1,list_to_set/1]).
+-export([is_element/2,add_element/2,del_element/2]).
+-export([union/2,union/1,intersection/2,intersection/1]).
+-export([subtract/2,subset/2]).
+
+%% new_set()
+%%  Return a new empty ordered set.
+
+new_set() ->
+    [].
+
+%% is_set(Set)
+%%  Return 'true' if Set is an ordered set of elements, else 'false'.
+
+is_set([E|Es]) ->
+    is_set(Es, E);
+is_set([]) ->
+    true.
+
+is_set([E2|Es], E1) when E1 < E2 ->
+    is_set(Es, E2);
+is_set([E2|Es], E1) ->
+    false;
+is_set([], E1) ->
+    true.
+
+%% set_to_list(OrdSet)
+%%  Return the elements in OrdSet as a list.
+
+set_to_list(S) ->
+    S.
+
+%% list_to_set(List)
+%%  Build an ordered set from the elements in List.
+
+list_to_set([E|Es]) ->
+    add_element(E, list_to_set(Es));
+list_to_set([]) ->
+    [].
+
+%% is_element(Element, OrdSet)
+%%  Return 'true' if Element is an element of OrdSet, else 'false'.
+
+is_element(E, [H|Es]) when E < H ->
+    false;
+is_element(E, [H|Es]) when E == H ->
+    true;
+is_element(E, [H|Es]) when E > H ->
+    is_element(E, Es);
+is_element(E, []) ->
+    false.
+
+%% add_element(Element, OrdSet)
+%%  Return OrdSet with Element inserted in it.
+
+add_element(E, [H|_]=Es) when E < H ->
+    [E|Es];
+add_element(E, [H|_]=Es) when E == H ->
+    Es;
+add_element(E, [H|Es]) when E > H ->
+    [H|add_element(E, Es)];
+add_element(E, []) ->
+    [E].
+
+%% del_element(Element, OrdSet)
+%%  Return OrdSet but with Element removed.
+
+del_element(E, [H|_]=Es) when E < H ->
+    Es;
+del_element(E, [H|Es]) when E == H ->
+    Es;
+del_element(E, [H|Es]) when E > H ->
+    [H|del_element(E, Es)];
+del_element(E, []) ->
+    [].
+
+%% union(Set1, Set2)
+%%  Return the union of Set1 and Set2.
+
+union([H1|Es1], [H2|_]=Es2) when H1 < H2 ->
+    [H1|union(Es1, Es2)];
+union([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    [H1|union(Es1, Es2)];
+union([H1|_]=Es1, [H2|Es2]) when H1 > H2 ->
+    [H2|union(Es1, Es2)];
+union([], Es2) ->
+    Es2;
+union(Es1, []) ->
+    Es1.
+
+%% union(OrdSets)
+%%  Return the union of the list of sets.
+
+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.
+
+%% intersection(Set1, Set2)
+%%  Return the intersection of Set1 and Set2.
+
+intersection([H1|Es1], [H2|_]=Es2) when H1 < H2 ->
+    intersection(Es1, Es2);
+intersection([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    [H1|intersection(Es1, Es2)];
+intersection([H1|_]=Es1, [H2|Es2]) when H1 > H2 ->
+    intersection(Es1, Es2);
+intersection([], Es2) ->
+    [];
+intersection(Es1, []) ->
+    [].
+
+%% intersection(OrdSets)
+%%  Return the intersection of the list of sets.
+
+intersection([S1,S2|Ss]) ->
+    intersection1(intersection(S1,S2), Ss);
+intersection([S]) ->
+    S;
+intersection([]) ->
+    [].
+
+intersection1(S1, [S2|Ss]) ->
+    intersection1(intersection(S1, S2), Ss);
+intersection1(S1, []) ->
+    S1.
+
+%% subtract(Set1, Set2)
+%%  Return all and only the elements of Set1 which are not also in Set2.
+
+subtract([H1|Es1], [H2|_]=Es2) when H1 < H2 ->
+    [H1|subtract(Es1, Es2)];
+subtract([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    subtract(Es1, Es2);
+subtract([H1|_]=Es1, [H2|Es2]) when H1 > H2 ->
+    subtract(Es1, Es2);
+subtract([], Es2) ->
+    [];
+subtract(Es1, []) ->
+    Es1.
+
+%% subset(Set1, Set2)
+%%  Return 'true' when every element of Set1 is also a member of Set2,
+%%  else 'false'.
+
+subset([H1|Es1], [H2|Es2]) when H1 < H2 ->	%H1 not in Set2
+    false;
+subset([H1|Es1], [H2|Es2]) when H1 == H2 ->
+    subset(Es1, Es2);
+subset([H1|Es1], [H2|Es2]) when H1 > H2 ->
+    subset([H1|Es1], Es2);
+subset([], Es2) ->
+    true;
+subset(Es1, []) ->
+    false.
diff --git a/lib/debugger/test/int_eval_SUITE.erl b/lib/debugger/test/int_eval_SUITE.erl
new file mode 100644
index 0000000000..6051bfc5ed
--- /dev/null
+++ b/lib/debugger/test/int_eval_SUITE.erl
@@ -0,0 +1,291 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2010. 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(int_eval_SUITE).
+
+%% Purpose: Deeper test of the evaluator.
+
+-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,
+	 bifs_outside_erlang/1, spawning/1, applying/1,
+	 catch_and_throw/1, external_call/1, test_module_info/1,
+	 apply_interpreted_fun/1, apply_uninterpreted_fun/1,
+	 interpreted_exit/1, otp_8310/1]).
+
+%% Helpers.
+-export([applier/3]).
+
+-define(IM, my_int_eval_module).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]},
+	    {timetrap,{minutes,1}}].
+
+all() -> 
+    [bifs_outside_erlang, spawning, applying,
+     catch_and_throw, external_call, test_module_info,
+     apply_interpreted_fun, apply_uninterpreted_fun,
+     interpreted_exit, otp_8310].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(_Case, Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {module,?IM} = int:i(filename:join(DataDir, ?IM)),
+    ?line ok = io:format("Interpreted modules: ~p",[int:interpreted()]),
+    Config.
+
+end_per_testcase(_Case, _Config) ->
+    ok = io:format("Interpreted modules: ~p", [int:interpreted()]),
+    ok.
+
+bifs_outside_erlang(doc) ->
+    "Test that BIFs outside the erlang module are correctly evaluated.";
+bifs_outside_erlang(suite) ->
+    [];
+bifs_outside_erlang(Config) when is_list(Config) ->
+    Fun = fun() ->
+		  Id = ?IM:ets_new(),
+		  Self = self(),
+		  ok = io:format("Self: ~p", [Self]),
+		  Info = ets:info(Id),
+		  Self = proplists:get_value(owner, Info),
+		  ?IM:ets_delete(Id),
+		  ok
+	  end,
+    ?line ok = spawn_eval(Fun),
+    ok.
+
+spawning(doc) ->
+    "Try evalutate spawn_link/3.";
+spawning(suite) ->
+    [];
+spawning(Config) when is_list(Config) ->
+    ?line ok = spawn_eval(fun() -> ?IM:spawn_test() end).
+
+applying(doc) ->
+    "Try various sorts of applies.";
+applying(suite) ->
+    [];
+applying(Config) when is_list(Config) ->
+    Fun = fun({number,X}, {number,Y}) -> X+Y end,
+    ?line ok = spawn_eval(fun() -> ?IM:apply_test(Fun) end).
+
+catch_and_throw(doc) ->
+    "Test catch and throw/1.";
+catch_and_throw(suite) ->
+    [];
+catch_and_throw(Config) when is_list(Config) ->
+    {a,ball} = spawn_eval(fun() -> ok = ?IM:catch_a_ball(),
+				   catch ?IM:throw_a_ball() end),
+
+    %% Throw and catch without any extra outer catch.
+
+    ?line process_flag(trap_exit, true),
+    ?line Pid1 = spawn_link(fun() -> exit(?IM:catch_a_ball()) end),
+    receive
+	{'EXIT',Pid1,ok} -> ok;
+	{'EXIT',Pid1,Bad1} -> ?line ?t:fail({bad_message,Bad1})
+    after 5000 ->
+	    ?line ?t:fail(timeout)
+    end,
+
+
+    %% Throw without catch.
+
+    ?line Pid2 = spawn_link(fun() -> ?IM:throw_a_ball() end),
+    receive
+	{'EXIT',Pid2,{{nocatch,{a,ball}},[_|_]}} -> ok;
+	{'EXIT',Pid2,Bad2} -> ?line ?t:fail({bad_message,Bad2})
+    after 5000 ->
+	    ?line ?t:fail(timeout)
+    end,
+
+    ?line ok = ?IM:more_catch(fun(_) -> ?IM:exit_me() end),
+    ?line ok = ?IM:more_catch(fun(_) -> exit({unint, exit}) end),
+    ?line {a, ball} = ?IM:more_catch(fun(_) -> ?IM:throw_a_ball() end),
+    ?line {b, ball} = ?IM:more_catch(fun(_) -> throw({b,ball}) end),
+
+    ExitInt = {'EXIT',{int,exit}},
+    ExitU   = {'EXIT',{unint,exit}},
+
+    ?line ExitInt = (catch ?IM:more_nocatch(fun(_) -> ?IM:exit_me() end)),
+    ?line ExitU   = (catch ?IM:more_nocatch(fun(_) -> exit({unint, exit}) end)),
+    ?line {a, ball} = (catch {error, ?IM:more_nocatch(fun(_) -> ?IM:throw_a_ball() end)}),
+    ?line {b, ball} = (catch {error, ?IM:more_nocatch(fun(_) -> throw({b,ball}) end)}),
+    ok.
+
+external_call(doc) ->
+    "Test external calls.";
+external_call(suite) ->
+    [];
+external_call(Config) when is_list(Config) ->
+    ?line ok = spawn_eval(fun() -> ?IM:external_call_test({some,stupid,data}) end).
+
+test_module_info(doc) ->
+    "Test the module_info/0,1 functions.";
+test_module_info(suite) ->
+    [];
+test_module_info(Config) when is_list(Config) ->
+    ?line ModInfo = ?IM:module_info(),
+    ?line {value,{exports,Exp}} = lists:keysearch(exports, 1, ModInfo),
+    ?line {value,{attributes,Attr}} = lists:keysearch(attributes, 1, ModInfo),
+    ?line Exp = ?IM:module_info(exports),
+    ?line Attr = ?IM:module_info(attributes),
+    ?line {value,{stupid_attribute,[{a,b}]}} =
+	lists:keysearch(stupid_attribute, 1, Attr),
+
+    %% Check exports using a list comprehension in the module itself.
+
+    ?line ok = ?IM:check_exports(Exp),
+
+    %% Call module_info/0,1 from the module itself.
+
+    ?line ok = ?IM:check_module_info(ModInfo, Exp),
+
+    ok.
+
+apply_interpreted_fun(doc) ->
+    "Apply a fun defined in interpreted code.";
+apply_interpreted_fun(suite) -> [];
+apply_interpreted_fun(Config) when is_list(Config) ->
+
+    %% Called from uninterpreted code
+    ?line F1 = spawn_eval(fun() -> ?IM:give_me_a_fun_0() end),
+    ?line perfectly_alright = spawn_eval(fun() -> F1() end),
+    ?line ATerm = {a,term},
+    ?line F2 = spawn_eval(fun() -> ?IM:give_me_a_fun_0(ATerm) end),
+    ?line {ok,ATerm} = spawn_eval(fun() -> F2() end),
+
+    %% Called from uninterpreted code, badarity
+    ?line {'EXIT',{{badarity,{F1,[snape]}},[{?MODULE,_,_}|_]}} =
+	spawn_eval(fun() -> F1(snape) end),
+
+    %% Called from uninterpreted code, error in fun
+    ?line F3 = spawn_eval(fun() -> ?IM:give_me_a_bad_fun() end),
+    ?line {'EXIT',{snape,[{?IM,_FunName,_}|_]}} =
+	spawn_eval(fun() -> F3(snape) end),
+
+    %% Called from within interpreted code
+    ?line perfectly_alright = spawn_eval(fun() -> ?IM:do_apply(F1) end),
+
+    %% Called from within interpreted code, badarity
+    ?line {'EXIT',{{badarity,{F1,[snape]}},[{?IM,do_apply,_}|_]}} =
+	spawn_eval(fun() -> ?IM:do_apply(F1, snape) end),
+
+    %% Called from within interpreted code, error in fun
+    ?line {'EXIT',{snape,[{?IM,_FunName,_}|_]}} =
+	spawn_eval(fun() -> ?IM:do_apply(F3, snape) end),
+
+    %% Try some more complex funs.
+    ?line F4 = ?IM:give_me_a_fun_1(14, 42),
+    ?line {false,yes,yeah,false} =
+	F4({{1,nope},{14,yes},{42,yeah},{100,forget_it}}),
+    ?line [this_is_ok,me_too] =
+	F4([{-24,no_way},{15,this_is_ok},{1333,forget_me},{37,me_too}]),
+
+    %% OTP-5837
+    %% Try fun with guard containing variable bound in environment
+    ?line [yes,no,no,no] = ?IM:otp_5837(1),
+
+    ok.
+
+apply_uninterpreted_fun(doc) ->
+    "Apply a fun defined outside interpreted code.";
+apply_uninterpreted_fun(suite) -> [];
+apply_uninterpreted_fun(Config) when is_list(Config) ->
+
+    ?line F1 = fun(snape) ->
+		       erlang:error(snape);
+		  (_Arg) ->
+		       perfectly_alright
+	       end,
+
+    %% Ok
+    ?line perfectly_alright =
+	spawn_eval(fun() -> ?IM:do_apply(F1, any_arg) end),
+
+    %% Badarity (evaluated in dbg_debugged, which calls erlang:apply/2)
+    ?line {'EXIT',{{badarity,{F1,[]}},[{erlang,apply,_}|_]}} =
+	spawn_eval(fun() -> ?IM:do_apply(F1) end),
+
+    %% Error in fun
+    ?line {'EXIT',{snape,[{?MODULE,_FunName,_}|_]}} =
+	spawn_eval(fun() -> ?IM:do_apply(F1, snape) end),
+
+    ok.
+
+%%
+%% Try executing an interpreted exit/1 call.
+%%
+
+interpreted_exit(Config) when is_list(Config) ->
+    ?line process_flag(trap_exit, true),
+    ?line Reason = make_ref(),
+    ?line Pid = spawn_link(fun() -> ?IM:please_call_exit(Reason) end),
+    ?line receive
+	      {'EXIT',Pid,Reason} ->
+		  ok;
+	      {'EXIT',Pid,BadReason} ->
+		  ?line ?t:fail({bad_message,BadReason})
+	  after 10000 ->
+		  ?line ?t:fail(timeout)
+	  end,
+    ok.
+
+otp_8310(doc) ->
+    "OTP-8310. Bugfixes lc/bc and andalso/orelse.";
+otp_8310(Config) when is_list(Config) ->
+    ?line ok = ?IM:otp_8310(),
+    ok.
+
+applier(M, F, A) ->
+    Res = apply(M, F, A),
+    io:format("~p:~p(~p) => ~p\n", [M,F,A,Res]),
+    Res.
+
+%%
+%% Evaluate in another process, to prevent the test_case process to become
+%% interpreted.
+%%
+
+spawn_eval(Fun) ->
+    Self = self(),
+    spawn_link(fun() -> Self ! (catch Fun()) end),
+    receive
+	Result ->
+	    Result
+    end.
diff --git a/lib/debugger/test/int_eval_SUITE_data/Makefile.src b/lib/debugger/test/int_eval_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..28a1432157
--- /dev/null
+++ b/lib/debugger/test/int_eval_SUITE_data/Makefile.src
@@ -0,0 +1,26 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2000-2010. 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%
+#
+
+
+EFLAGS=+debug_info
+
+all: my_int_eval_module.@EMULATOR@
+
+my_int_eval_module.@EMULATOR@: my_int_eval_module.erl
+	erlc $(EFLAGS) my_int_eval_module.erl
diff --git a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
new file mode 100644
index 0000000000..997ee6e17d
--- /dev/null
+++ b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
@@ -0,0 +1,245 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2010. 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(my_int_eval_module).
+-stupid_attribute({a,b}).
+
+-export([ets_new/0,ets_delete/1,spawn_test/0,apply_test/1,external_call_test/1]).
+-export([check_exports/1,check_module_info/2]).
+-export([give_me_a_fun_0/0,give_me_a_fun_0/1,give_me_a_fun_1/2,
+	 give_me_a_bad_fun/0, do_apply/1, do_apply/2]).
+-export([please_call_exit/1,i_will_do_the_exit/1]).
+-export([more_catch/1,more_nocatch/1,exit_me/0]).
+-export([f/1, f_try/1, f_catch/1]).
+-export([otp_5837/1, otp_8310/0]).
+
+%% Internal exports.
+-export([echo/2,my_subtract/2,catch_a_ball/0,throw_a_ball/0]).
+-export([i_am_exported/1]).
+
+-import(lists, [member/2]).
+
+-define(line,put(test_server_loc,{?MODULE,?LINE}),).
+-define(t,test_server).
+-define(m,test_server:match).
+-define(config,test_server:lookup_config).
+
+ets_new() ->
+    Id = ets:new(my_int_eval_table, [private]),
+    Id.
+
+ets_delete(Tab) ->
+    ets:delete(Tab).
+
+%% Spawning.
+
+spawn_test() ->
+    Term = {a,tuple},
+    Pid = spawn_link(?MODULE, echo, [self(),Term]),
+    receive
+	{result,Pid,Term} -> ok;
+	Other -> {bad_response,Other}
+    after 5000 ->
+	    timeout
+    end.
+
+echo(Parent, Term) ->
+    Parent ! {result,self(),Term}.
+
+%% Applying.
+
+apply_test(Fun) ->
+    42 = Fun(number(2), number(40)),
+    12 = apply(Fun, [number(7),number(5)]),
+
+    Mod = module(),
+    Func = func(),
+    [a] = Mod:my_subtract(same([a,b,c]), same([b,c])),
+    [a,b] = Mod:Func(same([a,b,c]), same([c])),
+    [a,b,d] = ?MODULE:Func(same([a,b,c,d]), same([c])),
+    [d,e] = apply(Mod, Func, [same([d,e,f]), same([f])]),
+    [3] = apply(?MODULE, Func, [same([3,4]),same([4])]),
+
+    %% This is obsolete, but it should work anyway.
+    HomeMadeFun = {?MODULE,my_subtract},
+    [a] = HomeMadeFun(same([a,x,c]), same([x,c])),
+    [x] = apply(HomeMadeFun, [[x,y],[y,z]]),
+
+    ok.
+
+number(X) -> {number,X}.
+module() -> ?MODULE.
+func() -> my_subtract.
+same(X) -> X.
+
+my_subtract(X, Y) -> X -- Y.
+
+%% Catch and throw.
+
+catch_a_ball() ->
+    {a,ball} = (catch throw_a_ball()),
+    ok.
+
+throw_a_ball() ->
+    throw({a,ball}),
+    not_ok.
+
+exit_me() ->
+    exit({int,exit}).
+
+more_catch(Fun) ->
+    case catch lists:filter(Fun, [a]) of
+	{'EXIT', {_, exit}} ->
+	    ok;
+	Else -> Else
+    end.
+
+more_nocatch(Fun) ->
+    lists:filter(Fun, [a]).
+
+%% External calls.
+
+external_call_test(Data) ->
+    {'EXIT',{undef,[{?MODULE,not_exported,[42,Data]}|_]}} =
+	(catch ?MODULE:not_exported(42, Data)),
+    {yes,Data} = i_am_exported(Data),
+    {yes,Data} = ?MODULE:i_am_exported(Data),
+
+    %% Excercise the function cache in the interpreter.
+
+    {ok,Data,[a,b]} = not_exported(Data, [a,b]),
+    {yes,Data} = i_am_exported(Data),
+    {ok,Data,[a,b]} = not_exported(Data, [a,b]),
+    {'EXIT',{undef,[{?MODULE,not_exported,[7,Data]}|_]}} =
+	(catch ?MODULE:not_exported(7, Data)),
+    {yes,Data} = ?MODULE:i_am_exported(Data),
+    ok.
+
+not_exported(N, D) ->
+    {ok,N,D}.
+
+i_am_exported(D) ->
+    {yes,D}.
+
+%% The module_info/0,1 functions and list comprehensions (funs).
+
+check_exports(Exp) ->
+    %% Check the structure of the export list and that there are more
+    %% than 4 elements.
+
+    Exp = [{F,A} || {F,A} <- Exp, erlang:is_atom(F), erlang:is_integer(A)],
+    case length(Exp) of
+	Len when Len > 4 -> ok
+    end.
+
+check_module_info(ModInfo, Exports) ->
+    ModInfo = module_info(),
+    Exports = module_info(exports),
+    ok.
+
+%% Testcase apply_interpreted_fun/1.
+
+give_me_a_fun_0() ->
+    fun() -> perfectly_alright end.
+
+give_me_a_fun_0(Term) ->
+    fun() -> {ok,Term} end.
+
+give_me_a_fun_1(Min, Max) ->
+    Seq = lists:seq(Min, Max),
+    fun (L) when list(L) ->
+	    [Info || {Key,Info} <- L, lists:member(Key, Seq)];
+	(T) when tuple(T) ->
+	    L = tuple_to_list(T),
+	    F = fun({Key,Info}) ->
+			case lists:member(Key, Seq) of
+			    true -> Info;
+			    false -> false
+			end
+		end,
+	    list_to_tuple(lists:map(F, L))
+    end.
+
+give_me_a_bad_fun() ->
+    fun(Arg) -> erlang:error(Arg) end.
+
+do_apply(Fun) ->
+    Fun().
+do_apply(Fun, Arg) ->
+    Fun(Arg).
+
+
+please_call_exit(Reason) ->
+    put(asked_to_call_exit, Reason),
+    put(will_call_my_good_friend, ''),
+    Res = int_eval_SUITE:applier(?MODULE, i_will_do_the_exit, [Reason]),
+
+    %% We don't want a tail-recursive call above.
+    io:format("Returned from exit/1 -- how strange\n").
+
+i_will_do_the_exit(Reason) ->
+    exit(Reason).
+
+f(Arg) ->
+    g(Arg).
+
+f_try(Arg) ->
+    try g(Arg)
+    catch
+	Class:Reason ->
+	    {Class, Reason}
+    end.
+
+f_catch(Arg) ->
+    catch g(Arg).
+
+g({error, Reason}) ->
+    erlang:error(Reason);
+g({exit, Reason}) ->
+    erlang:exit(Reason);
+g({throw, Reason}) ->
+    erlang:throw(Reason);
+g(Value) ->
+    Value.
+
+otp_5837(N) ->
+    n(N).
+
+n(N) ->
+    lists:map(fun(X) when N==X ->
+		      yes;
+		 (_) ->
+		      no
+	      end,
+	      [1,2,3,4]).
+
+otp_8310() ->
+    a = if (false orelse a) =:= a -> a; true -> b end,
+    F1 = fun() -> a end,
+    {'EXIT',{{bad_filter,a},_}} =
+        (catch {a, [X || X <- [1,2,3], _ = F1()]}),
+    F2 = fun() -> << 3:8 >> end,
+    {'EXIT',{{bad_filter,<<3>>},_}} =
+        (catch {a, << << X >> || << X >> <= << 7:8 >>,_ = F2() >>}),
+    {'EXIT',{{bad_generator,a},_}} =
+        (catch {a, [X || X <- a]}),
+    {'EXIT',{{bad_generator,b},_}} =
+        (catch {a, << <<X>>  || << X >> <= b >>}),
+    ok.
diff --git a/lib/debugger/test/lc_SUITE.erl b/lib/debugger/test/lc_SUITE.erl
new file mode 100644
index 0000000000..f8ab9311e9
--- /dev/null
+++ b/lib/debugger/test/lc_SUITE.erl
@@ -0,0 +1,88 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2010. 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(lc_SUITE).
+
+-author('[email protected]').
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 basic/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [basic].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+basic(Config) when list(Config) ->
+    ?line L0 = lists:seq(1, 10),
+    ?line L1 = my_map(fun(X) -> {x,X} end, L0),
+    ?line L1 = [{x,X} || X <- L0],
+    ?line L0 = my_map(fun({x,X}) -> X end, L1),
+    ?line [1,2,3,4,5] = [X || X <- L0, X < 6],
+    ?line [4,5,6] = [X || X <- L0, X > 3, X < 7],
+    ?line [] = [X || X <- L0, X > 32, X < 7],
+    ?line [1,3,5,7,9] = [X || X <- L0, odd(X)],
+
+    %% Error cases.
+    ?line [] = [X || X <- L1, X+1 < 2],
+    ?line [] = [{xx,X} || X <- L0, element(2, X) == no_no_no],
+    ?line {'EXIT',_}  = (catch [X || X <- L1, odd(X)]),
+
+    ok.
+
+my_map(F, L) ->
+    [F(X) || X <- L].
+
+odd(X) ->
+    X rem 2 == 1.
diff --git a/lib/debugger/test/record_SUITE.erl b/lib/debugger/test/record_SUITE.erl
new file mode 100644
index 0000000000..83351231d7
--- /dev/null
+++ b/lib/debugger/test/record_SUITE.erl
@@ -0,0 +1,266 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2010. 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%
+%%
+
+%%
+%%% Purpose : Test records.
+
+-module(record_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 errors/1,record_test/1,eval_once/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [errors, record_test, eval_once].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+-record(foo, {a,b,c,d}).
+-record(bar, {a,b,c,d}).
+-record(barf, {a,b,c,d,e}).
+
+errors(Config) when is_list(Config) ->
+    Foo = #foo{a=1,b=2,c=3,d=4},
+    ?line #foo{a=19,b=42,c=3,d=4} = update_foo(Foo, 19, 42),
+
+    ?line {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19)),
+    ?line {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19, 35)),
+    ?line {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19, 35, 17)),
+    ?line {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19, 35, 17, 42)),
+
+    ?line {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19)),
+    ?line {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19, 35)),
+    ?line {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19, 35, 17)),
+    ?line {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19, 35, 17, 42)),
+    ?line {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19,
+								 35, 17, 42, -2)),
+
+    ok.
+
+update_foo(#foo{}=R, A, B) ->
+    R#foo{a=A,b=B}.
+
+update_foo_bar(#foo{}=R, A) ->
+    R#bar{a=A}.
+
+update_foo_bar(#foo{}=R, A, _B) ->
+    R#bar{a=A,b=A}.
+
+update_foo_bar(#foo{}=R, A, _B, C) ->
+    R#bar{a=A,b=A,c=C}.
+
+update_foo_bar(#foo{}=R, A, _B, C, D) ->
+    R#bar{a=A,b=A,c=C,d=D}.
+
+update_foo_barf(#foo{}=R, A) ->
+    R#barf{a=A}.
+
+update_foo_barf(#foo{}=R, A, _B) ->
+    R#barf{a=A,b=A}.
+
+update_foo_barf(#foo{}=R, A, _B, C) ->
+    R#barf{a=A,b=A,c=C}.
+
+update_foo_barf(#foo{}=R, A, _B, C, D) ->
+    R#barf{a=A,b=A,c=C,d=D}.
+
+update_foo_barf(#foo{}=R, A, _B, C, D, E) ->
+    R#barf{a=A,b=A,c=C,d=D,e=E}.
+
+
+-define(TrueGuard(Expr), if Expr -> ok; true -> ?t:fail() end).
+-define(FalseGuard(Expr), if Expr -> ?t:fail(); true -> ok end).
+
+record_test(Config) when is_list(Config) ->
+    ?line true = is_record(#foo{}, foo),
+    ?line false = is_record(#foo{}, barf),
+    ?line false = is_record({foo}, foo),
+
+    ?line true = erlang:is_record(#foo{}, foo),
+    ?line false = erlang:is_record(#foo{}, barf),
+    ?line false = erlang:is_record({foo}, foo),
+
+    ?line false = is_record([], foo),
+    ?line false = is_record(Config, foo),
+
+    ?line ?TrueGuard(is_record(#foo{}, foo)),
+    ?line ?FalseGuard(is_record(#foo{}, barf)),
+    ?line ?FalseGuard(is_record({foo}, foo)),
+
+    ?line ?TrueGuard(erlang:is_record(#foo{}, foo)),
+    ?line ?FalseGuard(erlang:is_record(#foo{}, barf)),
+    ?line ?FalseGuard(erlang:is_record({foo}, foo)),
+
+    ?line ?FalseGuard(is_record([], foo)),
+    ?line ?FalseGuard(is_record(Config, foo)),
+
+    %% 'not is_record/2' to test guard optimization.
+
+    ?line ?FalseGuard(not is_record(#foo{}, foo)),
+    ?line ?TrueGuard(not is_record(#foo{}, barf)),
+    ?line ?TrueGuard(not is_record({foo}, foo)),
+
+    ?line ?FalseGuard(not erlang:is_record(#foo{}, foo)),
+    ?line ?TrueGuard(not erlang:is_record(#foo{}, barf)),
+    ?line ?TrueGuard(not erlang:is_record({foo}, foo)),
+
+    Foo = id(#foo{}),
+    ?line ?FalseGuard(not erlang:is_record(Foo, foo)),
+    ?line ?TrueGuard(not erlang:is_record(Foo, barf)),
+
+    ?line ?TrueGuard(not is_record(Config, foo)),
+
+    ?line ?TrueGuard(not is_record(a, foo)),
+    ?line ?TrueGuard(not is_record([], foo)),
+
+    %% Pass non-literal first argument.
+
+    ?line true = is_record(id(#foo{}), foo),
+    ?line false = is_record(id(#foo{}), barf),
+    ?line false = is_record(id({foo}), foo),
+
+    ?line true = erlang:is_record(id(#foo{}), foo),
+    ?line false = erlang:is_record(id(#foo{}), barf),
+    ?line false = erlang:is_record(id({foo}), foo),
+
+    NoRec1 = id(blurf),
+    NoRec2 = id([]),
+
+    ?line ?TrueGuard(not is_record(NoRec1, foo)),
+    ?line ?TrueGuard(not is_record(NoRec2, foo)),
+
+    %% Force the use of guard bifs by using the 'xor' operation.
+
+    False = id(false),
+    ?line ?TrueGuard(is_record(#foo{}, foo) xor False),
+    ?line ?FalseGuard(is_record(#foo{}, barf) xor False),
+    ?line ?FalseGuard(is_record({foo}, foo) xor False ),
+
+    ?line ?TrueGuard(is_record(Foo, foo) xor False),
+    ?line ?FalseGuard(is_record(Foo, barf) xor False),
+
+
+    %% Implicit guards by using a list comprehension.
+
+    List = id([1,#foo{a=2},3,#bar{d=4},5,#foo{a=6},7]),
+
+    ?line [#foo{a=2},#foo{a=6}] = [X || X <- List, is_record(X, foo)],
+    ?line [#bar{d=4}] = [X || X <- List, is_record(X, bar)],
+    ?line [1,#foo{a=2},3,5,#foo{a=6},7] =
+	[X || X <- List, not is_record(X, bar)],
+    ?line [1,3,5,7] =
+	[X || X <- List, ((not is_record(X, bar)) and (not is_record(X, foo)))],
+    ?line [#foo{a=2},#bar{d=4},#foo{a=6}] =
+	[X || X <- List, ((is_record(X, bar)) or (is_record(X, foo)))],
+    ?line [1,3,#bar{d=4}] =
+	[X || X <- List, ((is_record(X, bar)) or (X < 5))],
+
+    ?line MyList = [#foo{a=3},x,[],{a,b}],
+    ?line [#foo{a=3}] = [X || X <- MyList, is_record(X, foo)],
+    ?line [x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo)],
+    ?line [#foo{a=3}] = [X || X <- MyList, begin is_record(X, foo) end],
+    ?line [x,[],{a,b}] = [X || X <- MyList, begin not is_record(X, foo) end],
+    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList, is_record(X, foo) or
+					     not is_binary(X)],
+    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo) or
+					     not is_binary(X)],
+    ?line [#foo{a=3}] = [X || X <- MyList, is_record(X, foo) or is_reference(X)],
+    ?line [x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo) or
+				   is_reference(X)],
+    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList,
+					 begin is_record(X, foo) or
+						   not is_binary(X) end],
+    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList,
+					 begin not is_record(X, foo) or
+						   not is_binary(X) end],
+    ?line [#foo{a=3}] = [X || X <- MyList,
+			      begin is_record(X, foo) or is_reference(X) end],
+    ?line [x,[],{a,b}] = [X || X <- MyList,
+			       begin not is_record(X, foo) or
+					 is_reference(X) end],
+    ok.
+
+eval_once(Config) when is_list(Config) ->
+    ?line once(fun(GetRec) ->
+		       true = erlang:is_record(GetRec(), foo)
+	       end, #foo{}),
+    ?line once(fun(GetRec) ->
+		       (GetRec())#foo{a=1}
+	       end, #foo{}),
+    ?line once(fun(GetRec) ->
+		       (GetRec())#foo{a=1,b=2}
+	       end, #foo{}),
+    ?line once(fun(GetRec) ->
+		       (GetRec())#foo{a=1,b=2,c=3}
+	       end, #foo{}),
+    ?line once(fun(GetRec) ->
+		       (GetRec())#foo{a=1,b=2,c=3,d=4}
+	       end, #foo{}),
+    ok.
+
+once(Test, Record) ->
+    put(?MODULE, 0),
+    GetRec = fun() ->
+		     put(?MODULE, 1+get(?MODULE)),
+		     Record
+	     end,
+    Result = Test(GetRec),
+    case get(?MODULE) of
+	1 -> ok;
+	N ->
+	    io:format("Evaluated ~w times\n", [N]),
+	    ?t:fail()
+    end,
+    Result.
+
+id(I) -> I.
diff --git a/lib/debugger/test/test_lib.erl b/lib/debugger/test/test_lib.erl
new file mode 100644
index 0000000000..541375e64a
--- /dev/null
+++ b/lib/debugger/test/test_lib.erl
@@ -0,0 +1,29 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2000-2010. 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(test_lib).
+
+-export([interpret/1]).
+
+interpret(Mod) when atom(Mod) ->
+    case lists:member(Mod, int:interpreted()) of
+	true -> ok;
+	false -> {module,Mod} = i:ii(Mod)
+    end.
diff --git a/lib/debugger/test/trycatch_SUITE.erl b/lib/debugger/test/trycatch_SUITE.erl
new file mode 100644
index 0000000000..aa9d898c02
--- /dev/null
+++ b/lib/debugger/test/trycatch_SUITE.erl
@@ -0,0 +1,810 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2003-2010. 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(trycatch_SUITE).
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
+	 basic/1,lean_throw/1,try_of/1,try_after/1,%after_bind/1,
+	 catch_oops/1,after_oops/1,eclectic/1,rethrow/1,
+	 nested_of/1,nested_catch/1,nested_after/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [basic, lean_throw, try_of, try_after, catch_oops,
+     after_oops, eclectic, rethrow, nested_of, nested_catch,
+     nested_after].
+
+init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
+    Dog = test_server:timetrap(?t:minutes(1)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line test_lib:interpret(?MODULE),
+    ?line true = lists:member(?MODULE, int:interpreted()),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ok.
+
+basic(Conf) when is_list(Conf) ->
+    ?line 2 =
+	try my_div(4, 2)
+	catch
+            Class:Reason -> {Class,Reason}
+	end,
+    ?line error =
+        try my_div(1, 0)
+        catch
+            error:badarith -> error
+        end,
+    ?line error =
+        try 1/0
+        catch
+            error:badarith -> error
+        end,
+    ?line ok =
+        try my_add(53, atom)
+        catch
+            error:badarith -> ok
+        end,
+    ?line exit_nisse =
+        try exit(nisse)
+	catch
+            exit:nisse -> exit_nisse
+        end,
+    ?line ok =
+        try throw(kalle)
+        catch
+            kalle -> ok
+        end,
+
+    %% Try some stuff where the compiler will optimize away the try.
+
+    V = id({a,variable}),
+    ?line V = try V catch nisse -> error end,
+    ?line 42 = try 42 catch nisse -> error end,
+    ?line [V] = try [V] catch nisse -> error end,
+    ?line {ok,V} = try {ok,V} catch nisse -> error end,
+
+    %% Same idea, but use an after too.
+
+    ?line V = try V catch nisse -> error after after_call() end,
+    ?line after_clean(),
+    ?line 42 = try 42 after after_call() end,
+    ?line after_clean(),
+    ?line [V] = try [V] catch nisse -> error after after_call() end,
+    ?line after_clean(),
+    ?line {ok,V} = try {ok,V} after after_call() end,
+
+    %% Try/of
+    ?line ok = try V of
+              {a,variable} -> ok
+              catch nisse -> erro
+          end,
+
+    ok.
+
+after_call() ->
+    put(basic, after_was_called).
+
+after_clean() ->
+    after_was_called = erase(basic).
+
+lean_throw(Conf) when is_list(Conf) ->
+    ?line {throw,kalle} =
+        try throw(kalle)
+        catch
+            Kalle -> {throw,Kalle}
+        end,
+    ?line {exit,kalle} =
+        try exit(kalle)
+        catch
+            Throw1 -> {throw,Throw1};
+	    exit:Reason1 -> {exit,Reason1}
+        end,
+    ?line {exit,kalle} =
+        try exit(kalle)
+        catch
+	    exit:Reason2 -> {exit,Reason2};
+            Throw2 -> {throw,Throw2}
+        end,
+    ?line {exit,kalle} =
+        try try exit(kalle)
+            catch
+                Throw3 -> {throw,Throw3}
+            end
+        catch
+            exit:Reason3 -> {exit,Reason3}
+        end,
+    ok.
+
+try_of(Conf) when is_list(Conf) ->
+    ?line {ok,{some,content}} =
+	try_of_1({value,{good,{some,content}}}),
+    ?line {error,[other,content]} =
+	try_of_1({value,{bad,[other,content]}}),
+    ?line {caught,{exit,{ex,it,[reason]}}} =
+	try_of_1({exit,{ex,it,[reason]}}),
+    ?line {caught,{throw,[term,{in,a,{tuple}}]}} =
+	try_of_1({throw,[term,{in,a,{tuple}}]}),
+    ?line {caught,{error,[bad,arg]}} =
+	try_of_1({error,[bad,arg]}),
+    ?line {caught,{error,badarith}} =
+	try_of_1({'div',{1,0}}),
+    ?line {caught,{error,badarith}} =
+	try_of_1({'add',{a,0}}),
+    ?line {caught,{error,badarg}} =
+	try_of_1({'abs',x}),
+    ?line {caught,{error,function_clause}} =
+	try_of_1(illegal),
+    ?line {error,{try_clause,{some,other_garbage}}} =
+	try try_of_1({value,{some,other_garbage}})
+        catch error:Reason -> {error,Reason}
+        end,
+    ok.
+
+try_of_1(X) ->
+    try foo(X) of
+        {good,Y} -> {ok,Y};
+	{bad,Y} -> {error,Y}
+    catch
+	Class:Reason ->
+             {caught,{Class,Reason}}
+    end.
+
+try_after(Conf) when is_list(Conf) ->
+    ?line {{ok,[some,value],undefined},finalized} =
+	try_after_1({value,{ok,[some,value]}},finalized),
+    ?line {{error,badarith,undefined},finalized} =
+	try_after_1({'div',{1,0}},finalized),
+    ?line {{error,badarith,undefined},finalized} =
+	try_after_1({'add',{1,a}},finalized),
+    ?line {{error,badarg,undefined},finalized} =
+	try_after_1({'abs',a},finalized),
+    ?line {{error,[the,{reason}],undefined},finalized} =
+	try_after_1({error,[the,{reason}]},finalized),
+    ?line {{throw,{thrown,[reason]},undefined},finalized} =
+	try_after_1({throw,{thrown,[reason]}},finalized),
+    ?line {{exit,{exited,{reason}},undefined},finalized} =
+	try_after_1({exit,{exited,{reason}}},finalized),
+    ?line {{error,function_clause,undefined},finalized} =
+	try_after_1(function_clause,finalized),
+    ?line ok =
+	try try_after_1({'add',{1,1}}, finalized)
+        catch
+            error:{try_clause,2} -> ok
+	end,
+    ?line finalized = erase(try_after),
+    ?line ok =
+        try try foo({exit,[reaso,{n}]})
+            after put(try_after, finalized)
+            end
+        catch
+            exit:[reaso,{n}] -> ok
+        end,
+    ok.
+
+try_after_1(X, Y) ->
+    erase(try_after),
+    Try =
+        try foo(X) of
+	    {ok,Value} -> {ok,Value,get(try_after)}
+        catch
+	    Reason -> {throw,Reason,get(try_after)};
+	    error:Reason -> {error,Reason,get(try_after)};
+	    exit:Reason ->  {exit,Reason,get(try_after)}
+        after
+	    put(try_after, Y)
+        end,
+    {Try,erase(try_after)}.
+
+-ifdef(begone).
+
+after_bind(Conf) when is_list(Conf) ->
+    V = [make_ref(),self()|value],
+    ?line {value,{value,V}} =
+	after_bind_1({value,V}, V, {value,V}),
+    ok.
+
+after_bind_1(X, V, Y) ->
+    try
+        Try =
+            try foo(X) of
+                V -> value
+            catch
+                C1:V -> {caught,C1}
+            after
+                After = foo(Y)
+	    end,
+        {Try,After}
+    of
+        V -> {value,V}
+    catch
+        C:D -> {caught,{C,D}}
+    end.
+
+-endif.
+
+catch_oops(Conf) when is_list(Conf) ->
+    V = {v,[a,l|u],{e},self()},
+    ?line {value,V} = catch_oops_1({value,V}),
+    ?line {value,1} = catch_oops_1({'div',{1,1}}),
+    ?line {error,badarith} = catch_oops_1({'div',{1,0}}),
+    ?line {error,function_clause} = catch_oops_1(function_clause),
+    ?line {throw,V} = catch_oops_1({throw,V}),
+    ?line {exit,V} = catch_oops_1({exit,V}),
+    ok.
+
+catch_oops_1(X) ->
+    Ref = make_ref(),
+    try try foo({error,Ref})
+        catch
+            error:Ref ->
+	        foo(X)
+        end of
+        Value -> {value,Value}
+    catch
+        Class:Data -> {Class,Data}
+    end.
+
+
+
+after_oops(Conf) when is_list(Conf) ->
+    V = {self(),make_ref()},
+    ?line {{value,V},V} = after_oops_1({value,V}, {value,V}),
+    ?line {{exit,V},V} = after_oops_1({exit,V}, {value,V}),
+    ?line {{error,V},undefined} = after_oops_1({value,V}, {error,V}),
+    ?line {{error,function_clause},undefined} =
+	after_oops_1({exit,V}, function_clause),
+    ok.
+
+after_oops_1(X, Y) ->
+    erase(after_oops),
+    Try =
+        try try foo(X)
+            after
+                put(after_oops, foo(Y))
+            end of
+            V -> {value,V}
+        catch
+            C:D -> {C,D}
+        end,
+    {Try,erase(after_oops)}.
+
+
+
+eclectic(Conf) when is_list(Conf) ->
+    V = {make_ref(),3.1415926535,[[]|{}]},
+    ?line {{value,{value,V},V},V} =
+	eclectic_1({foo,{value,{value,V}}}, undefined, {value,V}),
+    ?line {{'EXIT',{V,[{?MODULE,foo,_}|_]}},V} =
+	eclectic_1({catch_foo,{error,V}}, undefined, {value,V}),
+    ?line {{error,{exit,V},{'EXIT',V}},V} =
+	eclectic_1({foo,{error,{exit,V}}}, error, {value,V}),
+    ?line {{value,{value,V},V},{'EXIT',{badarith,[{?MODULE,my_add,_}|_]}}} =
+	eclectic_1({foo,{value,{value,V}}}, undefined, {'add',{0,a}}),
+    ?line {{'EXIT',V},V} =
+	eclectic_1({catch_foo,{exit,V}}, undefined, {throw,V}),
+    ?line {{error,{'div',{1,0}},{'EXIT',{badarith,[{?MODULE,my_div,_}|_]}}}, {'EXIT',V}} =
+	eclectic_1({foo,{error,{'div',{1,0}}}}, error, {exit,V}),
+    ?line {{{error,V},{'EXIT',{V,[{?MODULE,foo,_}|_]}}},{'EXIT',V}} =
+	eclectic_1({catch_foo,{throw,{error,V}}}, undefined, {exit,V}),
+    %%
+    ?line {{value,{value,{value,V},V}},V} =
+	eclectic_2({value,{value,V}}, undefined, {value,V}),
+    ?line {{value,{throw,{value,V},V}},V} =
+	eclectic_2({throw,{value,V}}, throw, {value,V}),
+    ?line {{caught,{'EXIT',V}},undefined} =
+	eclectic_2({value,{value,V}}, undefined, {exit,V}),
+    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,_}|_]}}},undefined} =
+	eclectic_2({error,{value,V}}, throw, {error,V}),
+    ?line {{caught,{'EXIT',{badarg,[{erlang,abs,[V]}|_]}}},V} =
+	eclectic_2({value,{'abs',V}}, undefined, {value,V}),
+    ?line {{caught,{'EXIT',{badarith,[{?MODULE,my_add,_}|_]}}},V} =
+	eclectic_2({exit,{'add',{0,a}}}, exit, {value,V}),
+    ?line {{caught,{'EXIT',V}},undefined} =
+	eclectic_2({value,{error,V}}, undefined, {exit,V}),
+    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,_}|_]}}},undefined} =
+	eclectic_2({throw,{'div',{1,0}}}, throw, {error,V}),
+    ok.
+
+eclectic_1(X, C, Y) ->
+    erase(eclectic),
+    Done = make_ref(),
+    Try =
+        try case X of
+		{catch_foo,V} -> catch {Done,foo(V)};
+		{foo,V} -> {Done,foo(V)}
+	    end of
+            {Done,D} -> {value,D,catch foo(D)};
+	    {'EXIT',_}=Exit -> Exit;
+	    D -> {D,catch foo(D)}
+        catch
+            C:D -> {C,D,catch foo(D)}
+        after
+            put(eclectic, catch foo(Y))
+        end,
+    {Try,erase(eclectic)}.
+
+eclectic_2(X, C, Y) ->
+    Done = make_ref(),
+    erase(eclectic),
+    Catch =
+	case
+            catch
+            {Done,
+             try foo(X) of
+                 V -> {value,V,foo(V)}
+             catch
+                 C:D -> {C,D,foo(D)}
+             after
+                 put(eclectic, foo(Y))
+             end} of
+            {Done,Z} -> {value,Z};
+            Z -> {caught,Z}
+        end,
+    {Catch,erase(eclectic)}.
+
+rethrow(Conf) when is_list(Conf) ->
+    V = {a,[b,{c,self()},make_ref]},
+    ?line {value2,value1} =
+	rethrow_1({value,V}, V),
+    ?line {caught2,{error,V}} =
+	rethrow_2({error,V}, undefined),
+    ?line {caught2,{exit,V}} =
+	rethrow_1({exit,V}, error),
+    ?line {caught2,{throw,V}} =
+	rethrow_1({throw,V}, undefined),
+    ?line {caught2,{throw,V}} =
+	rethrow_2({throw,V}, undefined),
+    ?line {caught2,{error,badarith}} =
+	rethrow_1({'add',{0,a}}, throw),
+    ?line {caught2,{error,function_clause}} =
+	rethrow_2(function_clause, undefined),
+    ?line {caught2,{error,{try_clause,V}}} =
+	rethrow_1({value,V}, exit),
+    ?line {value2,{caught1,V}} =
+	rethrow_1({error,V}, error),
+    ?line {value2,{caught1,V}} =
+	rethrow_1({exit,V}, exit),
+    ?line {value2,caught1} =
+	rethrow_2({throw,V}, V),
+    ok.
+
+rethrow_1(X, C1) ->
+    try try foo(X) of
+            C1 -> value1
+        catch
+            C1:D1 -> {caught1,D1}
+        end of
+        V2 -> {value2,V2}
+    catch
+        C2:D2 -> {caught2,{C2,D2}}
+    end.
+
+rethrow_2(X, C1) ->
+    try try foo(X) of
+            C1 -> value1
+        catch
+            C1 -> caught1 % Implicit class throw:
+        end of
+        V2 -> {value2,V2}
+    catch
+        C2:D2 -> {caught2,{C2,D2}}
+    end.
+
+
+
+nested_of(Conf) when is_list(Conf) ->
+    V = {[self()|make_ref()],1.4142136},
+    ?line {{value,{value1,{V,x2}}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_of_1({{value,{V,x1}},void,{V,x1}},
+		    {value,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{throw,{V,x2}}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_of_1({{value,{V,x1}},void,{V,x1}},
+		    {throw,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarith}},
+	   undefined,
+	   {V,x4},
+	   finalized} =
+	nested_of_1({{value,{V,x1}},void,{V,x1}},
+		    {throw,{V,x2}}, {'div',{1,0}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarith}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_of_1({{value,{V,x1}},void,{V,x1}},
+		    {throw,{V,x2}}, {'div',{1,0}}, {'add',{0,b}}),
+    %%
+    ?line {{caught,{error,{try_clause,{V,x1}}}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_of_1({{value,{V,x1}},void,try_clause},
+		    void, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{exit,{V,x3}}},
+	   undefined,
+	   {V,x4},
+	   finalized} =
+	nested_of_1({{value,{V,x1}},void,try_clause},
+		    void, {exit,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{throw,{V,x4}}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_of_1({{value,{V,x1}},void,try_clause},
+		    void, {exit,{V,x3}}, {throw,{V,x4}}),
+    %%
+    ?line {{value,{caught1,{V,x2}}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_of_1({{error,{V,x1}},error,{V,x1}},
+		    {value,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarith}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_of_1({{error,{V,x1}},error,{V,x1}},
+		    {'add',{1,c}}, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarith}},
+	   undefined,
+	   {V,x4},
+	   finalized} =
+	nested_of_1({{error,{V,x1}},error,{V,x1}},
+		    {'add',{1,c}}, {'div',{17,0}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarg}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_of_1({{error,{V,x1}},error,{V,x1}},
+		    {'add',{1,c}}, {'div',{17,0}}, {'abs',V}),
+    %%
+    ?line {{caught,{error,badarith}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_of_1({{'add',{2,c}},rethrow,void},
+		    void, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarg}},
+	   undefined,
+	   {V,x4},
+	   finalized} =
+	nested_of_1({{'add',{2,c}},rethrow,void},
+		    void, {'abs',V}, {value,{V,x4}}),
+    ?line {{caught,{error,function_clause}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_of_1({{'add',{2,c}},rethrow,void},
+		    void, {'abs',V}, function_clause),
+    ok.
+
+nested_of_1({X1,C1,V1},
+	    X2, X3, X4) ->
+    erase(nested3),
+    erase(nested4),
+    erase(nested),
+    Self = self(),
+    Try =
+	try
+            try self()
+            of
+                Self ->
+                    try
+                        foo(X1)
+	            of
+	                V1 -> {value1,foo(X2)}
+                    catch
+                        C1:V1 -> {caught1,foo(X2)}
+	            after
+                        put(nested3, foo(X3))
+                    end
+            after
+                put(nested4, foo(X4))
+            end
+        of
+            V -> {value,V}
+        catch
+            C:D -> {caught,{C,D}}
+        after
+            put(nested, finalized)
+	end,
+    {Try,erase(nested3),erase(nested4),erase(nested)}.
+
+
+
+nested_catch(Conf) when is_list(Conf) ->
+    V = {[make_ref(),1.4142136,self()]},
+    ?line {{value,{value1,{V,x2}}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_catch_1({{value,{V,x1}},void,{V,x1}},
+		    {value,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{throw,{V,x2}}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_catch_1({{value,{V,x1}},void,{V,x1}},
+		    {throw,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarith}},
+	   undefined,
+	   {V,x4},
+	   finalized} =
+	nested_catch_1({{value,{V,x1}},void,{V,x1}},
+		    {throw,{V,x2}}, {'div',{1,0}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarith}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_catch_1({{value,{V,x1}},void,{V,x1}},
+		    {throw,{V,x2}}, {'div',{1,0}}, {'add',{0,b}}),
+    %%
+    ?line {{caught,{error,{try_clause,{V,x1}}}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_catch_1({{value,{V,x1}},void,try_clause},
+		    void, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{exit,{V,x3}}},
+	   undefined,
+	   {V,x4},
+	   finalized} =
+	nested_catch_1({{value,{V,x1}},void,try_clause},
+		    void, {exit,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{throw,{V,x4}}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_catch_1({{value,{V,x1}},void,try_clause},
+		    void, {exit,{V,x3}}, {throw,{V,x4}}),
+    %%
+    ?line {{value,{caught1,{V,x2}}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_catch_1({{error,{V,x1}},error,{V,x1}},
+		    {value,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarith}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_catch_1({{error,{V,x1}},error,{V,x1}},
+		    {'add',{1,c}}, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarith}},
+	   undefined,
+	   {V,x4},
+	   finalized} =
+	nested_catch_1({{error,{V,x1}},error,{V,x1}},
+		    {'add',{1,c}}, {'div',{17,0}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarg}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_catch_1({{error,{V,x1}},error,{V,x1}},
+		    {'add',{1,c}}, {'div',{17,0}}, {'abs',V}),
+    %%
+    ?line {{caught,{error,badarith}},
+	   {V,x3},
+	   {V,x4},
+	   finalized} =
+	nested_catch_1({{'add',{2,c}},rethrow,void},
+		    void, {value,{V,x3}}, {value,{V,x4}}),
+    ?line {{caught,{error,badarg}},
+	   undefined,
+	   {V,x4},
+	   finalized} =
+	nested_catch_1({{'add',{2,c}},rethrow,void},
+		    void, {'abs',V}, {value,{V,x4}}),
+    ?line {{caught,{error,function_clause}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_catch_1({{'add',{2,c}},rethrow,void},
+		    void, {'abs',V}, function_clause),
+    ok.
+
+nested_catch_1({X1,C1,V1},
+	    X2, X3, X4) ->
+    erase(nested3),
+    erase(nested4),
+    erase(nested),
+    Throw = make_ref(),
+    Try =
+	try
+            try throw(Throw)
+            catch
+		Throw ->
+                    try
+                        foo(X1)
+	            of
+	                V1 -> {value1,foo(X2)}
+                    catch
+                        C1:V1 -> {caught1,foo(X2)}
+	            after
+                        put(nested3, foo(X3))
+                    end
+            after
+                put(nested4, foo(X4))
+            end
+        of
+            V -> {value,V}
+        catch
+            C:D -> {caught,{C,D}}
+        after
+            put(nested, finalized)
+	end,
+    {Try,erase(nested3),erase(nested4),erase(nested)}.
+
+nested_after(Conf) when is_list(Conf) ->
+    V = [{make_ref(),1.4142136,self()}],
+    ?line {value,
+	   {V,x3},
+	   {value1,{V,x2}},
+	   finalized} =
+	nested_after_1({{value,{V,x1}},void,{V,x1}},
+		       {value,{V,x2}}, {value,{V,x3}}),
+    ?line {{caught,{error,{V,x2}}},
+	   {V,x3},
+	   undefined,
+	   finalized} =
+	nested_after_1({{value,{V,x1}},void,{V,x1}},
+		       {error,{V,x2}}, {value,{V,x3}}),
+    ?line {{caught,{exit,{V,x3}}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_after_1({{value,{V,x1}},void,{V,x1}},
+		       {error,{V,x2}}, {exit,{V,x3}}),
+    %%
+    ?line {{caught,{error,{try_clause,{V,x1}}}},
+	   {V,x3},
+	   undefined,
+	   finalized} =
+	nested_after_1({{value,{V,x1}},void,try_clause},
+		       void, {value,{V,x3}}),
+    ?line {{caught,{error,badarith}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_after_1({{value,{V,x1}},void,try_clause},
+		       void, {'div',{17,0}}),
+    %%
+    ?line {value,
+	   {V,x3},
+	   {caught1,{V,x2}},
+	   finalized} =
+	nested_after_1({{throw,{V,x1}},throw,{V,x1}},
+		       {value,{V,x2}}, {value,{V,x3}}),
+    ?line {{caught,{error,badarith}},
+	   {V,x3},
+	   undefined,
+	   finalized} =
+	nested_after_1({{throw,{V,x1}},throw,{V,x1}},
+		       {'add',{a,b}}, {value,{V,x3}}),
+    ?line {{caught,{error,badarg}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_after_1({{throw,{V,x1}},throw,{V,x1}},
+		       {'add',{a,b}}, {'abs',V}),
+    %%
+    ?line {{caught,{throw,{V,x1}}},
+	   {V,x3},
+	   undefined,
+	   finalized} =
+	nested_after_1({{throw,{V,x1}},rethrow,void},
+		       void, {value,{V,x3}}),
+    ?line {{caught,{error,badarith}},
+	   undefined,
+	   undefined,
+	   finalized} =
+	nested_after_1({{throw,{V,x1}},rethrow,void},
+		       void, {'div',{1,0}}),
+    ok.
+
+nested_after_1({X1,C1,V1},
+	    X2, X3) ->
+    erase(nested3),
+    erase(nested4),
+    erase(nested),
+    Self = self(),
+    Try =
+	try
+            try self()
+            after
+                After =
+                    try
+                        foo(X1)
+	            of
+	                V1 -> {value1,foo(X2)}
+                    catch
+                        C1:V1 -> {caught1,foo(X2)}
+	            after
+                        put(nested3, foo(X3))
+                    end,
+                put(nested4, After)
+            end
+        of
+            Self -> value
+        catch
+            C:D -> {caught,{C,D}}
+        after
+            put(nested, finalized)
+	end,
+    {Try,erase(nested3),erase(nested4),erase(nested)}.
+
+foo({value,Value}) -> Value;
+foo({'div',{A,B}}) ->
+    my_div(A, B);
+foo({'add',{A,B}}) ->
+    my_add(A, B);
+foo({'abs',X}) ->
+    my_abs(X);
+foo({error,Error}) ->
+    erlang:error(Error);
+foo({throw,Throw}) ->
+    erlang:throw(Throw);
+foo({exit,Exit}) ->
+    erlang:exit(Exit);
+foo({raise,{Class,Reason}}) ->
+    erlang:raise(Class, Reason).
+%%foo(function_clause) -> % must not be defined!
+
+my_div(A, B) ->
+    A div B.
+
+my_add(A, B) ->
+    A + B.
+
+my_abs(X) -> abs(X).
+
+id(I) -> I.
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index 5ce37a6bde..b9786b4a75 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 3.2.2
+DEBUGGER_VSN = 3.2.5
diff --git a/lib/dialyzer/RELEASE_NOTES b/lib/dialyzer/RELEASE_NOTES
index b668142327..3fd5e9cc7d 100644
--- a/lib/dialyzer/RELEASE_NOTES
+++ b/lib/dialyzer/RELEASE_NOTES
@@ -3,6 +3,42 @@
 		(in reversed chronological order)
 ==============================================================================
 
+Version 2.4.0 (in Erlang/OTP R14B01)
+------------------------------------
+ - Added ability to supply multiple PLTs for the analysis (option --plts).
+   Currently these PLTs must be independent (i.e., no module appears in more
+   than one PLT) and there must not include files with module name clashes.
+ - Strengthened and streamlined hard-coded type information for some BIFs
+   and key library functions.
+ - Fixed pretty rare infinite loop when refining the types of an SCC whose
+   functions all returned none() (thanks to Stavros Aronis).
+ - Fixed pretty rare crash when taking the infimum of two tuple_sets.
+ - Fixed pretty rare crash when using parameterized types containing unbound
+   variables (thanks to Nicolas Trangez for reporting it).
+ - Deeper unfolding of recursive types (thanks to Maria Christakis).
+ - Fixed some incomplete and erroneous specs in modules of kernel and stdlib.
+ - Fixed problems in the handling of remote types in records used as types
+   (thanks to Nico Kruber for the report and to Maria Christakis for the fix).
+ - Fixed handling of nested opaque types (thanks to Thorsten Schuett for
+   reporting it and to Maria Christakis for fixing it).
+
+Version 2.3.1 (in Erlang/OTP R14B)
+----------------------------------
+ - Eliminated warnings for auto-imported BIF clashes.
+
+Version 2.3.0 (in Erlang/OTP R14A)
+----------------------------------
+ - Dialyzer properly supports the new attribute -export_type and checks
+   that remote types only refer to exported types. A warning is produced
+   if some files/applications refer to types defined in modules which are
+   neither in the PLT nor in the analyzed applications.
+ - Support for detecting data races involving whereis/1 and unregister/1.
+ - More precise identification of the reason(s) why a record construction
+   violates the types declared for its fields.
+ - Fixed bug in the handling of the 'or' guard.
+ - Better handling of the erlang:element/2 BIF.
+ - Complete handling of Erlang BIFs.
+
 Version 2.2.0 (in Erlang/OTP R13B04)
 ------------------------------------
  - Much better support for opaque types (thanks to Manouk Manoukian).
diff --git a/lib/dialyzer/doc/manual.txt b/lib/dialyzer/doc/manual.txt
index 470ddd6c73..1d7a1a6222 100644
--- a/lib/dialyzer/doc/manual.txt
+++ b/lib/dialyzer/doc/manual.txt
@@ -123,70 +123,87 @@ The exit status of the command line version is:
 
 
 Usage: dialyzer [--help] [--version] [--shell] [--quiet] [--verbose]
-		[-pa dir]* [--plt plt] [-Ddefine]* [-I include_dir]* 
-		[--output_plt file] [-Wwarn]* [--src]  [--gui | --wx]
-		[files_or_dirs] [-r dirs] [--apps applications] [-o outfile]
+		[-pa dir]* [--plt plt] [--plts plt*] [-Ddefine]*
+                [-I include_dir]* [--output_plt file] [-Wwarn]*
+                [--src] [--gui | --wx] [files_or_dirs] [-r dirs]
+                [--apps applications] [-o outfile]
 		[--build_plt] [--add_to_plt] [--remove_from_plt]
 		[--check_plt] [--no_check_plt] [--plt_info] [--get_warnings]
-                [--no_native]
+                [--no_native] [--fullpath]
 
 Options: 
    files_or_dirs (for backwards compatibility also as: -c files_or_dirs)
        Use Dialyzer from the command line to detect defects in the
        specified files or directories containing .erl or .beam files,
-       depending on the type of the analysis
+       depending on the type of the analysis.
    -r dirs
        Same as the previous but the specified directories are searched
        recursively for subdirectories containing .erl or .beam files in
-       them, depending on the type of analysis
+       them, depending on the type of analysis.
    --apps applications
-       Option typically used when building or modifying PLT as in:
+       Option typically used when building or modifying a plt as in:
          dialyzer --build_plt --apps erts kernel stdlib mnesia ...
        to conveniently refer to library applications corresponding to the
        Erlang/OTP installation. However, the option is general and can also
        be used during analysis in order to refer to Erlang/OTP applications.
        In addition, file or directory names can also be included, as in:
          dialyzer --apps inets ssl ./ebin ../other_lib/ebin/my_module.beam
+   -o outfile (or --output outfile)
+       When using Dialyzer from the command line, send the analysis
+       results to the specified outfile rather than to stdout.
    --raw
        When using Dialyzer from the command line, output the raw analysis
        results (Erlang terms) instead of the formatted result.
        The raw format is easier to post-process (for instance, to filter
-       warnings or to output HTML pages)
+       warnings or to output HTML pages).
    --src
-       Override the default, which is to analyze BEAM bytecode, and
-       analyze starting from Erlang source code instead
+       Override the default, which is to analyze BEAM files, and
+       analyze starting from Erlang source code instead.
    -Dname (or -Dname=value)
-       When analyzing from source, pass the define to Dialyzer (**)
+       When analyzing from source, pass the define to Dialyzer. (**)
    -I include_dir
-       When analyzing from source, pass the include_dir to Dialyzer (**)
+       When analyzing from source, pass the include_dir to Dialyzer. (**)
    -pa dir
        Include dir in the path for Erlang (useful when analyzing files
-       that have '-include_lib()' directives)
+       that have '-include_lib()' directives).
    --output_plt file
-       Store the plt at the specified file after building it
+       Store the plt at the specified file after building it.
    --plt plt
        Use the specified plt as the initial plt (if the plt was built 
-       during setup the files will be checked for consistency)
+       during setup the files will be checked for consistency).
+   --plts plt*
+      Merge the specified plts to create the initial plt -- requires
+      that the plts are disjoint (i.e., do not have any module
+      appearing in more than one plt).
+      The plts are created in the usual way:
+        dialyzer --build_plt --output_plt plt_1 files_to_include
+        ...
+        dialyzer --build_plt --output_plt plt_n files_to_include
+      and then can be used in either of the following ways:
+        dialyzer files_to_analyze --plts plt_1 ... plt_n
+      or:
+        dialyzer --plts plt_1 ... plt_n -- files_to_analyze
+      (Note the -- delimiter in the second case)
    -Wwarn
        A family of options which selectively turn on/off warnings
-       (for help on the names of warnings use dialyzer -Whelp)
+       (for help on the names of warnings use dialyzer -Whelp).
    --shell
-       Do not disable the Erlang shell while running the GUI
+       Do not disable the Erlang shell while running the GUI.
    --version (or -v)
-       Prints the Dialyzer version and some more information and exits
+       Print the Dialyzer version and some more information and exit.
    --help (or -h)
-       Prints this message and exits
+       Print this message and exit.
    --quiet (or -q)
-       Makes Dialyzer a bit more quiet
+       Make Dialyzer a bit more quiet.
    --verbose
-       Makes Dialyzer a bit more verbose
+       Make Dialyzer a bit more verbose.
    --build_plt
        The analysis starts from an empty plt and creates a new one from the
        files specified with -c and -r. Only works for beam files.
        Use --plt or --output_plt to override the default plt location.
    --add_to_plt
        The plt is extended to also include the files specified with -c and -r.
-       Use --plt to specify wich plt to start from, and --output_plt to 
+       Use --plt to specify which plt to start from, and --output_plt to
        specify where to put the plt. Note that the analysis might include 
        files from the plt if they depend on the new files. 
        This option only works with beam files.
@@ -195,25 +212,27 @@ Options:
        from the plt. Note that this may cause a re-analysis of the remaining
        dependent files.
    --check_plt
-       Checks the plt for consistency and rebuilds it if it is not up-to-date.
+       Check the plt for consistency and rebuild it if it is not up-to-date.
    --no_check_plt
        Skip the plt check when running Dialyzer. Useful when working with
        installed plts that never change.
    --plt_info
-       Makes Dialyzer print information about the plt and then quit. The plt 
-       can be specified with --plt.
+       Make Dialyzer print information about the plt and then quit. The plt
+       can be specified with --plt(s).
    --get_warnings
-       Makes Dialyzer emit warnings even when manipulating the plt. Only 
-       emits warnings for files that are actually analyzed.
+       Make Dialyzer emit warnings even when manipulating the plt. Warnings
+       are only emitted for files that are actually analyzed.
    --dump_callgraph file
        Dump the call graph into the specified file whose format is determined
        by the file name extension. Supported extensions are: raw, dot, and ps.
        If something else is used as file name extension, default format '.raw'
        will be used.
    --no_native (or -nn)
-       Bypass the native code compilation of some key files that dialyzer
+       Bypass the native code compilation of some key files that Dialyzer
        heuristically performs when dialyzing many files; this avoids the
        compilation time but it may result in (much) longer analysis time.
+  --fullpath
+      Display the full path names of files for which warnings are emitted.
    --gui
        Use the gs-based GUI.
    --wx
@@ -231,12 +250,17 @@ Warning options:
      Suppress warnings for unused functions.
   -Wno_improper_lists
      Suppress warnings for construction of improper lists.
+  -Wno_tuple_as_fun
+     Suppress warnings for using tuples instead of funs.
   -Wno_fun_app
      Suppress warnings for fun applications that will fail.
   -Wno_match
      Suppress warnings for patterns that are unused or cannot match.
+  -Wno_opaque
+     Suppress warnings for violations of opaqueness of data types.
   -Wunmatched_returns ***
-     Include warnings for function calls which ignore the return value(s).
+     Include warnings for function calls which ignore a structured return
+     value or do not match against one of many possible return value(s).
   -Werror_handling ***
      Include warnings for functions that only return by means of an exception.
   -Wrace_conditions ***
@@ -257,7 +281,7 @@ The following options are also available but their use is not recommended:
      Warn when the -spec is different than the success typing.
 
 Note:
-   *** These are options that turn on warnings rather than turning them off.
+   *** Identifies options that turn on warnings rather than turning them off.
 
 
 -----------------------------------------------
@@ -294,6 +318,7 @@ Option   :: {files,          [Filename :: string()]}
 	  | {defines,        [{Macro :: atom(), Value :: term()}]}
 	  | {from,           src_code | byte_code} %% Defaults to byte_code
 	  | {init_plt,       FileName :: string()} %% If changed from default
+          | {plts,           [FileName :: string()]} %% If changed from default
 	  | {include_dirs,   [DirName :: string()]} 
 	  | {output_file,    FileName :: string()}
 	  | {output_plt,     FileName :: string()}
diff --git a/lib/dialyzer/doc/src/dialyzer.xml b/lib/dialyzer/doc/src/dialyzer.xml
index 1ec2ce830a..8813d51f1f 100644
--- a/lib/dialyzer/doc/src/dialyzer.xml
+++ b/lib/dialyzer/doc/src/dialyzer.xml
@@ -64,81 +64,146 @@
     ]]></code>
     <p>Usage:</p>
     <code type="none"><![CDATA[
-   dialyzer [--help] [--version] [--shell] [--quiet] [--verbose]
-		[-pa dir]* [--plt plt] [-Ddefine]* [-I include_dir]* 
-		[--output_plt file] [-Wwarn]* [--src] 
-		[-c applications] [-r applications] [-o outfile]
+       dialyzer [--help] [--version] [--shell] [--quiet] [--verbose]
+		[-pa dir]* [--plt plt] [--plts plt*] [-Ddefine]*
+                [-I include_dir]* [--output_plt file] [-Wwarn]*
+                [--src] [--gui | --wx] [files_or_dirs] [-r dirs]
+                [--apps applications] [-o outfile]
 		[--build_plt] [--add_to_plt] [--remove_from_plt]
 		[--check_plt] [--no_check_plt] [--plt_info] [--get_warnings]
+                [--no_native] [--fullpath]
     ]]></code>
     <p>Options:</p>
     <taglist>
-      <tag><c><![CDATA[-c applications]]></c>(or <c><![CDATA[--command-line applications]]></c>)</tag>
-      <item>use Dialyzer from the command line (no GUI) to detect defects in the
-       specified applications (directories or <c><![CDATA[.erl]]></c> or <c><![CDATA[.beam]]></c> files)</item>
-      <tag><c><![CDATA[-r applications]]></c></tag>
-      <item>same as <c><![CDATA[-c]]></c> only that directories are searched recursively for 
-       subdirectories containing <c><![CDATA[.erl]]></c> or <c><![CDATA[.beam]]></c> files (depending on the 
-       type of analysis)</item>
-      <tag><c><![CDATA[-o outfile]]></c>(or <c><![CDATA[--output outfile]]></c>)</tag>
-      <item>when using Dialyzer from the command line, send the analysis
-       results in the specified <c><![CDATA[outfile]]></c> rather than in stdout</item>
-      <tag><c><![CDATA[--src]]></c></tag>
-      <item>override the default, which is to analyze debug compiled BEAM 
-       bytecode, and analyze starting from Erlang source code instead</item>
+      <tag><c><![CDATA[files_or_dirs]]></c> (for backwards compatibility also
+        as: <c><![CDATA[-c files_or_dirs]]></c></tag>
+      <item>Use Dialyzer from the command line to detect defects in the
+        specified files or directories containing <c><![CDATA[.erl]]></c> or
+         <c><![CDATA[.beam]]></c> files, depending on the type of the
+         analysis.</item>
+      <tag><c><![CDATA[-r dirs]]></c></tag>
+      <item>Same as the previous but the specified directories are searched
+        recursively for subdirectories containing <c><![CDATA[.erl]]></c> or
+        <c><![CDATA[.beam]]></c> files in them, depending on the type of
+        analysis.</item>
+      <tag><c><![CDATA[--apps applications]]></c></tag>
+      <item>Option typically used when building or modifying a plt as in:
+        <code type="none"><![CDATA[
+           dialyzer --build_plt --apps erts kernel stdlib mnesia ...
+        ]]></code>
+        to conveniently refer to library applications corresponding to the
+        Erlang/OTP installation. However, the option is general and can also
+        be used during analysis in order to refer to Erlang/OTP applications.
+        In addition, file or directory names can also be included, as in:
+        <code type="none"><![CDATA[
+           dialyzer --apps inets ssl ./ebin ../other_lib/ebin/my_module.beam
+        ]]></code></item>
+      <tag><c><![CDATA[-o outfile]]></c> (or
+        <c><![CDATA[--output outfile]]></c>)</tag>
+      <item>When using Dialyzer from the command line, send the analysis
+        results to the specified outfile rather than to stdout.</item>
       <tag><c><![CDATA[--raw]]></c></tag>
       <item>When using Dialyzer from the command line, output the raw analysis
-       results (Erlang terms) instead of the formatted result.
-       The raw format is easier to post-process (for instance, to filter
-       warnings or to output HTML pages).</item>
-      <tag><c><![CDATA[-Dname]]></c>(or <c><![CDATA[-Dname=value]]></c>)</tag>
-      <item>when analyzing from source, pass the define to Dialyzer (**)</item>
+        results (Erlang terms) instead of the formatted result. The raw format
+        is easier to post-process (for instance, to filter warnings or to
+        output HTML pages).</item>
+      <tag><c><![CDATA[--src]]></c></tag>
+      <item>Override the default, which is to analyze BEAM files, and
+        analyze starting from Erlang source code instead.</item>
+      <tag><c><![CDATA[-Dname]]></c> (or <c><![CDATA[-Dname=value]]></c>)</tag>
+      <item>When analyzing from source, pass the define to Dialyzer. (**)</item>
       <tag><c><![CDATA[-I include_dir]]></c></tag>
-      <item>when analyzing from source, pass the <c><![CDATA[include_dir]]></c> to Dialyzer (**)</item>
+      <item>When analyzing from source, pass the <c><![CDATA[include_dir]]></c>
+        to Dialyzer. (**)</item>
       <tag><c><![CDATA[-pa dir]]></c></tag>
-      <item>Include <c><![CDATA[dir]]></c> in the path for Erlang. Useful when analyzing files
-       that have <c><![CDATA[-include_lib()]]></c> directives.</item>
+      <item>Include <c><![CDATA[dir]]></c> in the path for Erlang (useful when
+        analyzing files that have <c><![CDATA['-include_lib()']]></c>
+        directives).</item>
       <tag><c><![CDATA[--output_plt file]]></c></tag>
-      <item>Store the PLT at the specified location after building it.</item>
+      <item>Store the plt at the specified file after building it.</item>
       <tag><c><![CDATA[--plt plt]]></c></tag>
-      <item>Use the specified plt as the initial persistent lookup table.</item>
+      <item>Use the specified plt as the initial plt (if the plt was built
+        during setup the files will be checked for consistency).</item>
+      <tag><c><![CDATA[--plts plt*]]></c></tag>
+      <item>Merge the specified plts to create the initial plt -- requires
+        that the plts are disjoint (i.e., do not have any module
+        appearing in more than one plt).
+        The plts are created in the usual way:
+        <code type="none"><![CDATA[
+           dialyzer --build_plt --output_plt plt_1 files_to_include
+           ...
+           dialyzer --build_plt --output_plt plt_n files_to_include
+        ]]></code>
+        and then can be used in either of the following ways:
+        <code type="none"><![CDATA[
+           dialyzer files_to_analyze --plts plt_1 ... plt_n
+        ]]></code>
+        or:
+        <code type="none"><![CDATA[
+           dialyzer --plts plt_1 ... plt_n -- files_to_analyze
+        ]]></code>
+        (Note the -- delimiter in the second case)</item>
       <tag><c><![CDATA[-Wwarn]]></c></tag>
-      <item>a family of option which selectively turn on/off warnings.
-       (for help on the names of warnings use <c><![CDATA[dialyzer -Whelp]]></c>)</item>
+      <item>A family of options which selectively turn on/off warnings
+        (for help on the names of warnings use
+        <c><![CDATA[dialyzer -Whelp]]></c>).</item>
       <tag><c><![CDATA[--shell]]></c></tag>
-      <item>do not disable the Erlang shell while running the GUI</item>
-      <tag><c><![CDATA[--version (or -v)]]></c></tag>
-      <item>prints the Dialyzer version and some more information and exits</item>
-      <tag><c><![CDATA[--help (or -h)]]></c></tag>
-      <item>prints this message and exits</item>
-      <tag><c><![CDATA[--quiet (or -q)]]></c></tag>
-      <item>makes Dialyzer a bit more quiet</item>
+      <item>Do not disable the Erlang shell while running the GUI.</item>
+      <tag><c><![CDATA[--version]]></c> (or <c><![CDATA[-v]]></c>)</tag>
+      <item>Print the Dialyzer version and some more information and
+        exit.</item>
+      <tag><c><![CDATA[--help]]></c> (or <c><![CDATA[-h]]></c>)</tag>
+      <item>Print this message and exit.</item>
+      <tag><c><![CDATA[--quiet]]></c> (or <c><![CDATA[-q]]></c>)</tag>
+      <item>Make Dialyzer a bit more quiet.</item>
       <tag><c><![CDATA[--verbose]]></c></tag>
-      <item>makes Dialyzer a bit more verbose</item>
-      <tag><c><![CDATA[--check_plt]]></c></tag>
-      <item>Only checks if the initial PLT is up to date and rebuilds it if this is not the case</item>
-      <tag><c><![CDATA[--no_check_plt (or -n)]]></c></tag>
-      <item>Skip the PLT integrity check when running Dialyzer.
-       Useful when working with installed PLTs that never change.</item>
+      <item>Make Dialyzer a bit more verbose.</item>
       <tag><c><![CDATA[--build_plt]]></c></tag>
-      <item>The analysis starts from an empty PLT and creates a new one from
-       the files specified with -c and -r. Only works for beam files.
-       Use --plt or --output_plt to override the default PLT location.</item>
-      <tag><c><![CDATA[--add_to_plt]]></c></tag>   
-      <item> The PLT is extended to also include the files specified with 
-       -c and -r. Use --plt to specify which PLT to start from, and --output_plt 
-       to specify where to put the PLT. Note that the analysis might include 
-       files from the PLT if they depend on the new files. 
-       This option only works with beam files.</item>
+      <item>The analysis starts from an empty plt and creates a new one from
+        the files specified with <c><![CDATA[-c]]></c> and
+        <c><![CDATA[-r]]></c>. Only works for beam files. Use
+        <c><![CDATA[--plt]]></c> or <c><![CDATA[--output_plt]]></c> to
+        override the default plt location.</item>
+       <tag><c><![CDATA[--add_to_plt]]></c></tag>
+       <item>The plt is extended to also include the files specified with
+         <c><![CDATA[-c]]></c> and <c><![CDATA[-r]]></c>. Use
+         <c><![CDATA[--plt]]></c> to specify which plt to start from,
+         and <c><![CDATA[--output_plt]]></c> to specify where to put the plt.
+         Note that the analysis might include files from the plt if they depend
+         on the new files. This option only works with beam files.</item>
        <tag><c><![CDATA[--remove_from_plt]]></c></tag>
-       <item>The information from the files specified with -c and -r is removed
-       from the PLT. Note that this may cause a re-analysis of the remaining
-       dependent files.</item>
+       <item>The information from the files specified with
+         <c><![CDATA[-c]]></c> and <c><![CDATA[-r]]></c> is removed
+         from the plt. Note that this may cause a re-analysis of the remaining
+         dependent files.</item>
+       <tag><c><![CDATA[--check_plt]]></c></tag>
+       <item>Check the plt for consistency and rebuild it if it is not
+         up-to-date.</item>
+       <tag><c><![CDATA[--no_check_plt]]></c></tag>
+       <item>Skip the plt check when running Dialyzer. Useful when working with
+         installed plts that never change.</item>
+       <tag><c><![CDATA[--plt_info]]></c></tag>
+       <item>Make Dialyzer print information about the plt and then quit. The
+         plt can be specified with <c><![CDATA[--plt(s)]]></c>.</item>
        <tag><c><![CDATA[--get_warnings]]></c></tag>
-       <item>Makes Dialyzer emit warnings even when manipulating the PLT. Only 
-       emits warnings for files that are actually analyzed. The default is to
-       not emit any warnings when manipulating the PLT. This option has no 
-       effect when performing a normal analysis.</item>
+       <item>Make Dialyzer emit warnings even when manipulating the plt.
+         Warnings are only emitted for files that are actually analyzed.</item>
+       <tag><c><![CDATA[--dump_callgraph file]]></c></tag>
+       <item>Dump the call graph into the specified file whose format is
+         determined by the file name extension. Supported extensions are: raw,
+         dot, and ps. If something else is used as file name extension, default
+         format '.raw' will be used.</item>
+       <tag><c><![CDATA[--no_native]]></c> (or <c><![CDATA[-nn]]></c>)</tag>
+       <item>Bypass the native code compilation of some key files that Dialyzer
+         heuristically performs when dialyzing many files; this avoids the
+         compilation time but it may result in (much) longer analysis
+         time.</item>
+       <tag><c><![CDATA[--fullpath]]></c></tag>
+       <item>Display the full path names of files for which warnings are emitted.</item>
+       <tag><c><![CDATA[--gui]]></c></tag>
+       <item>Use the gs-based GUI.</item>
+       <tag><c><![CDATA[--wx]]></c></tag>
+       <item>Use the wx-based GUI.</item>
     </taglist>
     <note>
       <p>* denotes that multiple occurrences of these options are possible.</p>
@@ -148,33 +213,49 @@
     <p>Warning options:</p>
     <taglist>
       <tag><c><![CDATA[-Wno_return]]></c></tag>
-      <item>Suppress warnings for functions of no return.</item>
+      <item>Suppress warnings for functions that will never return a
+        value.</item>
       <tag><c><![CDATA[-Wno_unused]]></c></tag>
       <item>Suppress warnings for unused functions.</item>
       <tag><c><![CDATA[-Wno_improper_lists]]></c></tag>
       <item>Suppress warnings for construction of improper lists.</item>
+      <tag><c><![CDATA[-Wno_tuple_as_fun]]></c></tag>
+      <item>Suppress warnings for using tuples instead of funs.</item>
       <tag><c><![CDATA[-Wno_fun_app]]></c></tag>
       <item>Suppress warnings for fun applications that will fail.</item>
       <tag><c><![CDATA[-Wno_match]]></c></tag>
       <item>Suppress warnings for patterns that are unused or cannot
        match.</item>
+      <tag><c><![CDATA[-Wno_opaque]]></c></tag>
+      <item>Suppress warnings for violations of opaqueness of data types.</item>
+      <tag><c><![CDATA[-Wunmatched_returns]]></c>***</tag>
+      <item>Include warnings for function calls which ignore a structured return
+        value or do not match against one of many possible return
+        value(s).</item>
       <tag><c><![CDATA[-Werror_handling]]></c>***</tag>
       <item>Include warnings for functions that only return by means of an
        exception.</item>
-      <tag><c><![CDATA[-Wunmatched_returns]]></c>***</tag>
-      <item>Include warnings for function calls which ignore a structured return
-       value or do not match against one of many possible return value(s).</item>
+      <tag><c><![CDATA[-Wrace_conditions]]></c>***</tag>
+      <item>Include warnings for possible race conditions.</item>
+      <tag><c><![CDATA[-Wbehaviours]]></c>***</tag>
+      <item>Include warnings about behaviour callbacks which drift from the
+       published recommended interfaces.</item>
       <tag><c><![CDATA[-Wunderspecs]]></c>***</tag>
       <item>Warn about underspecified functions 
-      (the -spec is strictly more allowing than the success typing)</item>
+      (the -spec is strictly more allowing than the success typing).</item>
+    </taglist>
+    <p>The following options are also available but their use is not
+      recommended: (they are mostly for Dialyzer developers and internal
+      debugging)</p>
+    <taglist>
       <tag><c><![CDATA[-Woverspecs]]></c>***</tag>
       <item>Warn about overspecified functions 
-      (the -spec is strictly less allowing than the success typing)</item>
+      (the -spec is strictly less allowing than the success typing).</item>
       <tag><c><![CDATA[-Wspecdiffs]]></c>***</tag>
-      <item>Warn when the -spec is different than the success typing</item>
+      <item>Warn when the -spec is different than the success typing.</item>
     </taglist>
     <note>
-      <p>*** These are options that turn on warnings rather than
+      <p>*** Identifies options that turn on warnings rather than
       turning them off.</p>
     </note>
   </section>
@@ -203,6 +284,7 @@ Option   : {files,          [Filename : string()]}
          | {defines,        [{Macro: atom(), Value : term()}]}
          | {from,           src_code | byte_code} %% Defaults to byte_code
          | {init_plt,       FileName : string()}  %% If changed from default
+         | {plts,           [FileName :: string()]} %% If changed from default
          | {include_dirs,   [DirName : string()]} 
          | {output_file,    FileName : string()}
          | {output_plt,     FileName :: string()}
@@ -215,8 +297,11 @@ WarnOpts : no_return
          | no_improper_lists
          | no_fun_app
          | no_match
+         | no_opaque
          | no_fail_call
          | error_handling
+         | race_conditions
+         | behaviours
          | unmatched_returns
          | overspecs
          | underspecs
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index b6106b928a..3678291be7 100755
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -31,6 +31,90 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 2.4.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> - Fixed pretty rare infinite loop when refining the
+	    types of an SCC whose functions all returned none()
+	    (thanks to Stavros Aronis). </p><p> - Fixed pretty rare
+	    crash when taking the infimum of two tuple_sets. </p>
+          <p>
+	    Own Id: OTP-8979</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> - Added ability to supply multiple PLTs for the
+	    analysis (option --plts). Currently these PLTs must be
+	    independent (i.e., no module appears in more than one
+	    PLT) and there must not include files with module name
+	    clashes.</p><p> - Strengthened and streamlined hard-coded
+	    type information for some BIFs and key library
+	    functions.</p>
+          <p>
+	    Own Id: OTP-8962</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Dialyzer 2.3.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Eliminated warnings for auto-imported BIF clashes.</p>
+          <p>
+	    Own Id: OTP-8840</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Dialyzer 2.3.0</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Various changes to dialyzer-related files for R14.</p>
+          <p>
+	    - Dialyzer properly supports the new attribute
+	    -export_type and checks that remote types only refer to
+	    exported types. A warning is produced if some
+	    files/applications refer to types defined in modules
+	    which are neither in the PLT nor in the analyzed
+	    applications.</p>
+          <p>
+	    - Support for detecting data races involving whereis/1
+	    and unregister/1.</p>
+          <p>
+	    - More precise identification of the reason(s) why a
+	    record construction violates the types declared for its
+	    fields.</p>
+          <p>
+	    - Fixed bug in the handling of the 'or' guard.</p>
+          <p>
+	    - Better handling of the erlang:element/2 BIF.</p>
+          <p>
+	    - Complete handling of Erlang BIFs.</p>
+          <p>
+	    Own Id: OTP-8699</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 2.2.0</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/dialyzer/src/dialyzer.erl b/lib/dialyzer/src/dialyzer.erl
index 3b7b68e8c4..dde0c17c39 100644
--- a/lib/dialyzer/src/dialyzer.erl
+++ b/lib/dialyzer/src/dialyzer.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. 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
@@ -33,12 +33,13 @@
 %% NOTE: Only functions exported by this module are available to
 %%       other applications.
 %%--------------------------------------------------------------------
--export([plain_cl/0, 
-	 run/1, 
+-export([plain_cl/0,
+	 run/1,
 	 gui/0,
 	 gui/1,
 	 plt_info/1,
-	 format_warning/1]).
+	 format_warning/1,
+	 format_warning/2]).
 
 -include("dialyzer.hrl").
 
@@ -48,6 +49,8 @@
 %%  - run/1:            Erlang interface for a command line-like analysis
 %%  - gui/0/1:          Erlang interface for the gui.
 %%  - format_warning/1: Get the string representation of a warning.
+%%  - format_warning/1: Likewise, but with an option whether
+%%			to display full path names or not
 %%  - plt_info/1:       Get information of the specified plt.
 %%--------------------------------------------------------------------
 
@@ -55,7 +58,7 @@
 
 plain_cl() ->
   case dialyzer_cl_parse:start() of
-    {check_init, Opts} -> 
+    {check_init, Opts} ->
       cl_halt(cl_check_init(Opts), Opts);
     {plt_info, Opts} ->
       cl_halt(cl_print_plt_info(Opts), Opts);
@@ -72,7 +75,7 @@ plain_cl() ->
 	false ->
 	  gui_halt(internal_gui(Type, Opts), Opts)
       end;
-    {cl, Opts} -> 
+    {cl, Opts} ->
       case Opts#options.check_plt of
 	true ->
 	  case cl_check_init(Opts#options{get_warnings = false}) of
@@ -82,7 +85,7 @@ plain_cl() ->
 	false ->
 	  cl_halt(cl(Opts), Opts)
       end;
-    {error, Msg} -> 
+    {error, Msg} ->
       cl_error(Msg)
   end.
 
@@ -106,27 +109,35 @@ cl_print_plt_info(Opts) ->
       end,
   doit(F).
 
-print_plt_info(#options{init_plt = PLT, output_file = OutputFile}) ->
+print_plt_info(#options{init_plts = PLTs, output_file = OutputFile}) ->
+  PLTInfo = get_plt_info(PLTs),
+  do_print_plt_info(PLTInfo, OutputFile).
+
+get_plt_info([PLT|PLTs]) ->
   String =
     case dialyzer_plt:included_files(PLT) of
       {ok, Files} ->
-	io_lib:format("The PLT ~s includes the following files:\n~p\n",
+	io_lib:format("The PLT ~s includes the following files:\n~p\n\n",
 		      [PLT, Files]);
       {error, read_error} ->
-	Msg = io_lib:format("Could not read the PLT file ~p\n", [PLT]),
+	Msg = io_lib:format("Could not read the PLT file ~p\n\n", [PLT]),
 	throw({dialyzer_error, Msg});
       {error, no_such_file} ->
-	Msg = io_lib:format("The PLT file ~p does not exist\n", [PLT]),
+	Msg = io_lib:format("The PLT file ~p does not exist\n\n", [PLT]),
 	throw({dialyzer_error, Msg})
     end,
+  String ++ get_plt_info(PLTs);
+get_plt_info([]) -> "".
+
+do_print_plt_info(PLTInfo, OutputFile) ->
   case OutputFile =:= none of
     true ->
-      io:format("~s", [String]),
+      io:format("~s", [PLTInfo]),
       ?RET_NOTHING_SUSPICIOUS;
     false ->
       case file:open(OutputFile, [write]) of
 	{ok, FileDesc} ->
-	  io:format(FileDesc, "~s", [String]),
+	  io:format(FileDesc, "~s", [PLTInfo]),
 	  ok = file:close(FileDesc),
 	  ?RET_NOTHING_SUSPICIOUS;
 	{error, Reason} ->
@@ -146,7 +157,7 @@ cl(Opts) ->
 -spec run(dial_options()) -> [dial_warning()].
 
 run(Opts) ->
-  try dialyzer_options:build([{report_mode, quiet}, 
+  try dialyzer_options:build([{report_mode, quiet},
 			      {erlang_mode, true}|Opts]) of
     {error, Msg} ->
       throw({dialyzer_error, Msg});
@@ -161,7 +172,7 @@ run(Opts) ->
 	  throw({dialyzer_error, ErrorMsg1})
       end
   catch
-    throw:{dialyzer_error, ErrorMsg} -> 
+    throw:{dialyzer_error, ErrorMsg} ->
       erlang:error({dialyzer_error, lists:flatten(ErrorMsg)})
   end.
 
@@ -225,25 +236,31 @@ plt_info(Plt) ->
 %% Machinery
 %%-----------
 
+-type doit_ret() :: {'ok', dial_ret()} | {'error', string()}.
+
 doit(F) ->
-  try 
+  try
     {ok, F()}
   catch
     throw:{dialyzer_error, Msg} ->
       {error, lists:flatten(Msg)}
   end.
 
+-spec cl_error(string()) -> no_return().
+
 cl_error(Msg) ->
   cl_halt({error, Msg}, #options{}).
 
+-spec gui_halt(doit_ret(), #options{}) -> no_return().
+
 gui_halt(R, Opts) ->
   cl_halt(R, Opts#options{report_mode = quiet}).
 
--spec cl_halt({'ok',dial_ret()} | {'error',string()}, #options{}) -> no_return().
+-spec cl_halt(doit_ret(), #options{}) -> no_return().
 
-cl_halt({ok, R = ?RET_NOTHING_SUSPICIOUS}, #options{report_mode = quiet}) -> 
+cl_halt({ok, R = ?RET_NOTHING_SUSPICIOUS}, #options{report_mode = quiet}) ->
   halt(R);
-cl_halt({ok, R = ?RET_DISCREPANCIES}, #options{report_mode = quiet}) -> 
+cl_halt({ok, R = ?RET_DISCREPANCIES}, #options{report_mode = quiet}) ->
   halt(R);
 cl_halt({ok, R = ?RET_NOTHING_SUSPICIOUS}, #options{}) ->
   io:put_chars("done (passed successfully)\n"),
@@ -267,11 +284,19 @@ cl_check_log(Output) ->
 
 -spec format_warning(dial_warning()) -> string().
 
-format_warning({_Tag, {File, Line}, Msg}) when is_list(File), 
-					       is_integer(Line) ->
-  BaseName = filename:basename(File),
+format_warning(W) ->
+  format_warning(W, basename).
+
+-spec format_warning(dial_warning(), fopt()) -> string().
+
+format_warning({_Tag, {File, Line}, Msg}, FOpt) when is_list(File),
+						     is_integer(Line) ->
+  F = case FOpt of
+	fullpath -> File;
+	basename -> filename:basename(File)
+      end,
   String = lists:flatten(message_to_string(Msg)),
-  lists:flatten(io_lib:format("~s:~w: ~s", [BaseName, Line, String])).
+  lists:flatten(io_lib:format("~s:~w: ~s", [F, Line, String])).
 
 
 %%-----------------------------------------------------------------------------
@@ -290,7 +315,7 @@ message_to_string({app_call, [M, F, Args, Culprit, ExpectedType, FoundType]}) ->
 message_to_string({bin_construction, [Culprit, Size, Seg, Type]}) ->
   io_lib:format("Binary construction will fail since the ~s field ~s in"
 		" segment ~s has type ~s\n", [Culprit, Size, Seg, Type]);
-message_to_string({call, [M, F, Args, ArgNs, FailReason, 
+message_to_string({call, [M, F, Args, ArgNs, FailReason,
 			  SigArgs, SigRet, Contract]}) ->
   io_lib:format("The call ~w:~w~s ", [M, F, Args]) ++
     call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet, Contract);
@@ -311,6 +336,8 @@ message_to_string({guard_fail, [Arg1, Infix, Arg2]}) ->
   io_lib:format("Guard test ~s ~s ~s can never succeed\n", [Arg1, Infix, Arg2]);
 message_to_string({guard_fail, [Guard, Args]}) ->
   io_lib:format("Guard test ~w~s can never succeed\n", [Guard, Args]);
+message_to_string({neg_guard_fail, [Guard, Args]}) ->
+  io_lib:format("Guard test not(~w~s) can never succeed\n", [Guard, Args]);
 message_to_string({guard_fail_pat, [Pat, Type]}) ->
   io_lib:format("Clause guard cannot succeed. The ~s was matched"
 		" against the type ~s\n", [Pat, Type]);
@@ -329,9 +356,9 @@ 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, [Types, Name]}) ->
+message_to_string({record_constr, [RecConstr, FieldDiffs]}) ->
   io_lib:format("Record construction ~s violates the"
-		" declared type for #~w{}\n", [Types, Name]);
+		" declared type of field ~s\n", [RecConstr, FieldDiffs]);
 message_to_string({record_constr, [Name, Field, Type]}) ->
   io_lib:format("Record construction violates the declared type for #~w{}"
 		" since ~s cannot be of type ~s\n", [Name, Field, Type]);
@@ -358,7 +385,7 @@ message_to_string({contract_diff, [M, F, _A, Contract, Sig]}) ->
 		[M, F, Contract, M, F, Sig]);
 message_to_string({contract_subtype, [M, F, _A, Contract, Sig]}) ->
   io_lib:format("Type specification ~w:~w~s"
-		" is a subtype of the success typing: ~w:~w~s\n", 
+		" is a subtype of the success typing: ~w:~w~s\n",
 		[M, F, Contract, M, F, Sig]);
 message_to_string({contract_supertype, [M, F, _A, Contract, Sig]}) ->
   io_lib:format("Type specification ~w:~w~s"
@@ -379,7 +406,7 @@ message_to_string({spec_missing_fun, [M, F, A]}) ->
 		[M, F, A]);
 %%----- Warnings for opaque type violations -------------------
 message_to_string({call_with_opaque, [M, F, Args, ArgNs, ExpArgs]}) ->
-  io_lib:format("The call ~w:~w~s contains ~s argument when ~s\n",
+  io_lib:format("The call ~w:~w~s contains ~s when ~s\n",
 		[M, F, Args, form_positions(ArgNs), form_expected(ExpArgs)]);
 message_to_string({call_without_opaque, [M, F, Args, ExpectedTriples]}) ->
   io_lib:format("The call ~w:~w~s does not have ~s\n",
@@ -427,7 +454,7 @@ message_to_string({spec_missing, [B, F, A]}) ->
 %% Auxiliary functions below
 %%-----------------------------------------------------------------------------
 
-call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet, 
+call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet,
 			{IsOverloaded, Contract}) ->
   PositionString = form_position_string(ArgNs),
   case FailReason of
@@ -442,7 +469,7 @@ call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet,
 			" from the success typing arguments: ~s\n",
 			[PositionString, SigArgs])
       end;
-    only_contract -> 
+    only_contract ->
       case (ArgNs =:= []) orelse IsOverloaded of
 	true ->
 	  %% We do not know which arguments caused the failure
@@ -494,7 +521,7 @@ form_position_string(ArgNs) ->
   case ArgNs of
     [] -> "";
     [N1] -> ordinal(N1);
-    [_,_|_] -> 
+    [_,_|_] ->
       [Last|Prevs] = lists:reverse(ArgNs),
       ", " ++ Head = lists:flatten([io_lib:format(", ~s",[ordinal(N)]) ||
 				     N <- lists:reverse(Prevs)]),
diff --git a/lib/dialyzer/src/dialyzer.hrl b/lib/dialyzer/src/dialyzer.hrl
index 2da8ed2e5d..aa3f703af2 100644
--- a/lib/dialyzer/src/dialyzer.hrl
+++ b/lib/dialyzer/src/dialyzer.hrl
@@ -2,7 +2,7 @@
 %%%
 %%% %CopyrightBegin%
 %%%
-%%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%%% Copyright Ericsson AB 2006-2011. 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
@@ -31,7 +31,7 @@
 -define(RET_DISCREPANCIES, 2).
 
 -type dial_ret() :: ?RET_NOTHING_SUSPICIOUS
-                  | ?RET_INTERNAL_ERROR 
+                  | ?RET_INTERNAL_ERROR
                   | ?RET_DISCREPANCIES.
 
 %%--------------------------------------------------------------------
@@ -87,7 +87,7 @@
 %%--------------------------------------------------------------------
 %% THIS TYPE SHOULD ONE DAY DISAPPEAR -- IT DOES NOT BELONG HERE
 %%--------------------------------------------------------------------
- 
+
 -type ordset(T)      :: [T] .      %% XXX: temporarily
 
 %%--------------------------------------------------------------------
@@ -102,6 +102,8 @@
 -type dial_define()   :: {atom(), term()}.
 -type dial_option()   :: {atom(), term()}.
 -type dial_options()  :: [dial_option()].
+-type fopt()          :: 'basename' | 'fullpath'.
+-type format()        :: 'formatted' | 'raw'.
 -type label()	      :: non_neg_integer().
 -type rep_mode()      :: 'quiet' | 'normal' | 'verbose'.
 -type start_from()    :: 'byte_code' | 'src_code'.
@@ -129,7 +131,7 @@
 		  defines         = []		   :: [dial_define()],
 		  from            = byte_code	   :: start_from(),
 		  get_warnings    = maybe          :: boolean() | 'maybe',
-		  init_plt        = none	   :: 'none' | file:filename(),
+		  init_plts       = []	           :: [file:filename()],
 		  include_dirs    = []		   :: [file:filename()],
 		  output_plt      = none           :: 'none' | file:filename(),
 		  legal_warnings  = ordsets:new()  :: ordset(dial_warn_tag()),
@@ -137,10 +139,10 @@
 		  erlang_mode     = false	   :: boolean(),
 		  use_contracts   = true           :: boolean(),
 		  output_file     = none	   :: 'none' | file:filename(),
-		  output_format   = formatted      :: 'raw' | 'formatted',
+		  output_format   = formatted      :: format(),
+		  filename_opt	  = basename       :: fopt(),
 		  callgraph_file  = ""             :: file:filename(),
-		  check_plt       = true           :: boolean()
-		 }).
+		  check_plt       = true           :: boolean()}).
 
 -record(contract, {contracts	  = []		   :: [contract_pair()],
 		   args		  = []		   :: [erl_types:erl_type()],
diff --git a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
index e3dd690470..abad1f3a75 100644
--- a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
+++ b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
@@ -21,7 +21,7 @@
 %%%-------------------------------------------------------------------
 %%% File    : dialyzer_analysis_callgraph.erl
 %%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created :  5 Apr 2005 by Tobias Lindahl <[email protected]>
 %%%-------------------------------------------------------------------
@@ -32,7 +32,7 @@
 
 -include("dialyzer.hrl").
 
--record(analysis_state, 
+-record(analysis_state,
 	{
 	  codeserver                    :: dialyzer_codeserver:codeserver(),
 	  analysis_type  = succ_typings :: anal_type(),
@@ -44,7 +44,7 @@
 	  plt                           :: dialyzer_plt:plt(),
 	  start_from     = byte_code    :: start_from(),
 	  use_contracts  = true         :: boolean(),
-	  behaviours = {false,[]}   :: {boolean(),[atom()]}
+	  behaviours     = {false,[]}   :: {boolean(),[atom()]}
 	 }).
 
 -record(server_state, {parent :: pid(), legal_warnings :: [dial_warn_tag()]}).
@@ -83,10 +83,10 @@ loop(#server_state{parent = Parent, legal_warnings = LegalWarnings} = State,
 	  send_warnings(Parent, SendWarnings)
       end,
       loop(State, Analysis, ExtCalls);
-    {AnalPid, cserver, CServer, Plt} -> 
+    {AnalPid, cserver, CServer, Plt} ->
       send_codeserver_plt(Parent, CServer, Plt),
       loop(State, Analysis, ExtCalls);
-    {AnalPid, done, Plt, DocPlt} ->      
+    {AnalPid, done, Plt, DocPlt} ->
       case ExtCalls =:= none of
 	true ->
 	  send_analysis_done(Parent, Plt, DocPlt);
@@ -176,7 +176,7 @@ analysis_start(Parent, Analysis) ->
   NonExportsList = sets:to_list(NonExports),
   Plt3 = dialyzer_plt:delete_list(State3#analysis_state.plt, NonExportsList),
   Plt4 = dialyzer_plt:delete_contract_list(Plt3, NonExportsList),
-  send_codeserver_plt(Parent, CServer, State3#analysis_state.plt), 
+  send_codeserver_plt(Parent, CServer, State3#analysis_state.plt),
   send_analysis_done(Parent, Plt4, State3#analysis_state.doc_plt).
 
 analyze_callgraph(Callgraph, State) ->
@@ -229,24 +229,24 @@ compile_and_store(Files, #analysis_state{codeserver = CServer,
 		  {error, Reason} ->
 		    {TmpCG, TmpCServer, [{File, Reason}|TmpFailed], TmpNoWarn,
                      TmpMods};
-		  {ok, NewCG, NoWarn, NewCServer, Mod} -> 
+		  {ok, NewCG, NoWarn, NewCServer, Mod} ->
 		    {NewCG, NewCServer, TmpFailed, NoWarn++TmpNoWarn,
                      [Mod|TmpMods]}
 		end
 	    end;
 	  byte_code ->
-	    fun(File, {TmpCG, TmpCServer, TmpFailed, TmpNoWarn, TmpMods}) -> 
+	    fun(File, {TmpCG, TmpCServer, TmpFailed, TmpNoWarn, TmpMods}) ->
 		case compile_byte(File, TmpCG, TmpCServer, UseContracts) of
 		  {error, Reason} ->
 		    {TmpCG, TmpCServer, [{File, Reason}|TmpFailed], TmpNoWarn,
                      TmpMods};
-		  {ok, NewCG, NoWarn, NewCServer, Mod} -> 
+		  {ok, NewCG, NoWarn, NewCServer, Mod} ->
 		    {NewCG, NewCServer, TmpFailed, NoWarn++TmpNoWarn,
                      [Mod|TmpMods]}
 		end
 	    end
 	end,
-  {NewCallgraph1, NewCServer, Failed, NoWarn, Modules} = 
+  {NewCallgraph1, NewCServer, Failed, NoWarn, Modules} =
     lists:foldl(Fun, {Callgraph, CServer, [], [], []}, Files),
   case Failed =:= [] of
     true ->
@@ -255,7 +255,7 @@ compile_and_store(Files, #analysis_state{codeserver = CServer,
         lists:foldl(fun({Mod, F}, Dict) -> dict:append(Mod, F, Dict) end,
                     dict:new(), NewFiles),
       check_for_duplicate_modules(ModDict);
-    false -> 
+    false ->
       Msg = io_lib:format("Could not scan the following file(s): ~p",
 			  [lists:flatten(Failed)]),
       exit({error, Msg})
@@ -268,14 +268,14 @@ compile_and_store(Files, #analysis_state{codeserver = CServer,
   if UnknownBehaviours =:= [] -> ok;
      true -> send_unknown_behaviours(Parent, UnknownBehaviours)
   end,
-  State1 = State#analysis_state{behaviours = {BehChk,KnownBehaviours}},
+  State1 = State#analysis_state{behaviours = {BehChk, KnownBehaviours}},
   NewCallgraph2 = cleanup_callgraph(State1, NewCServer, NewCallgraph1, Modules),
   {T3, _} = statistics(runtime),
   Msg2 = io_lib:format("done in ~.2f secs\n", [(T3-T2)/1000]),
-  send_log(Parent, Msg2),  
+  send_log(Parent, Msg2),
   {NewCallgraph2, sets:from_list(NoWarn), NewCServer}.
 
-cleanup_callgraph(#analysis_state{plt = InitPlt, parent = Parent, 
+cleanup_callgraph(#analysis_state{plt = InitPlt, parent = Parent,
 				  codeserver = CodeServer,
 				  behaviours = {BehChk, KnownBehaviours}
 				 },
@@ -298,9 +298,9 @@ cleanup_callgraph(#analysis_state{plt = InitPlt, parent = Parent,
 		       not dialyzer_plt:contains_mfa(InitPlt, To)],
   {BadCalls1, RealExtCalls} =
     if ExtCalls1 =:= [] -> {[], []};
-       true -> 
+       true ->
 	ModuleSet = sets:from_list(Modules),
-	lists:partition(fun({_From, {M, _F, _A}}) -> 
+	lists:partition(fun({_From, {M, _F, _A}}) ->
 			    sets:is_element(M, ModuleSet) orelse
 			      dialyzer_plt:contains_module(InitPlt, M)
 			end, ExtCalls1)
@@ -367,14 +367,14 @@ compile_byte(File, Callgraph, CServer, UseContracts) ->
 	  case dialyzer_utils:get_record_and_type_info(AbstrCode) of
 	    {error, _} = Error -> Error;
 	    {ok, RecInfo} ->
-	      CServer1 = 
+	      CServer1 =
 		dialyzer_codeserver:store_temp_records(Mod, RecInfo, CServer),
 	      case UseContracts of
 		true ->
 		  case dialyzer_utils:get_spec_info(Mod, AbstrCode, RecInfo) of
 		    {error, _} = Error -> Error;
 		    {ok, SpecInfo} ->
-		      CServer2 = 
+		      CServer2 =
 			dialyzer_codeserver:store_temp_contracts(Mod, SpecInfo,
 								 CServer1),
 		      store_core(Mod, Core, NoWarn, Callgraph, CServer2)
@@ -398,7 +398,7 @@ store_core(Mod, Core, NoWarn, Callgraph, CServer) ->
   store_code_and_build_callgraph(Mod, LabeledCore, Callgraph, CServer3, NoWarn).
 
 abs_get_nowarn(Abs, M) ->
-  [{M, F, A} 
+  [{M, F, A}
    || {attribute, _, compile, {nowarn_unused_function, {F, A}}} <- Abs].
 
 get_exported_types_from_core(Core) ->
@@ -421,7 +421,7 @@ label_core(Core, CServer) ->
   NextLabel = dialyzer_codeserver:get_next_core_label(CServer),
   CoreTree = cerl:from_records(Core),
   {LabeledTree, NewNextLabel} = cerl_trees:label(CoreTree, NextLabel),
-  {cerl:to_records(LabeledTree), 
+  {cerl:to_records(LabeledTree),
    dialyzer_codeserver:set_next_core_label(NewNextLabel, CServer)}.
 
 store_code_and_build_callgraph(Mod, Core, Callgraph, CServer, NoWarn) ->
@@ -455,8 +455,12 @@ expand_files([File|Left], Ext, FileAcc) ->
   case filelib:is_dir(File) of
     true ->
       {ok, List} = file:list_dir(File),
-      NewFiles =
-        [filename:join(File, X) || X <- List, filename:extension(X) =:= Ext],
+      NewFiles = lists:foldl(fun (X, Acc) ->
+				 case filename:extension(X) =:= Ext of
+				   true -> [filename:join(File, X)|Acc];
+				   false -> Acc
+				 end
+			     end, FileAcc, List),
       expand_files(Left, Ext, NewFiles);
     false ->
       expand_files(Left, Ext, [File|FileAcc])
@@ -489,7 +493,8 @@ rcv_and_send_ext_types(Parent) ->
   Self = self(),
   Self ! {Self, done},
   ExtTypes = rcv_ext_types(Self, []),
-  Parent ! {Self, ext_types, ExtTypes}.
+  Parent ! {Self, ext_types, ExtTypes},
+  ok.
 
 rcv_ext_types(Self, ExtTypes) ->
   receive
@@ -515,7 +520,7 @@ filter_warnings(LegalWarnings, Warnings) ->
 send_analysis_done(Parent, Plt, DocPlt) ->
   Parent ! {self(), done, Plt, DocPlt},
   ok.
-  
+
 send_ext_calls(Parent, ExtCalls) ->
   Parent ! {self(), ext_calls, ExtCalls},
   ok.
@@ -539,7 +544,7 @@ send_mod_deps(Parent, ModuleDeps) ->
   Parent ! {self(), mod_deps, ModuleDeps},
   ok.
 
-format_bad_calls([{{_, _, _}, {_, module_info, A}}|Left], CodeServer, Acc) 
+format_bad_calls([{{_, _, _}, {_, module_info, A}}|Left], CodeServer, Acc)
   when A =:= 0; A =:= 1 ->
   format_bad_calls(Left, CodeServer, Acc);
 format_bad_calls([{FromMFA, {M, F, A} = To}|Left], CodeServer, Acc) ->
@@ -552,7 +557,7 @@ format_bad_calls([], _CodeServer, Acc) ->
   Acc.
 
 find_call_file_and_line(Tree, MFA) ->
-  Fun = 
+  Fun =
     fun(SubTree, Acc) ->
 	case cerl:is_c_call(SubTree) of
 	  true ->
diff --git a/lib/dialyzer/src/dialyzer_behaviours.erl b/lib/dialyzer/src/dialyzer_behaviours.erl
index 3fae816cfe..47ce9ba6eb 100644
--- a/lib/dialyzer/src/dialyzer_behaviours.erl
+++ b/lib/dialyzer/src/dialyzer_behaviours.erl
@@ -34,19 +34,25 @@
 	 translate_behaviour_api_call/5, translatable_behaviours/1,
 	 translate_callgraph/3]).
 
+-export_type([behaviour/0, behaviour_api_dict/0]).
+
 %%--------------------------------------------------------------------
 
 -include("dialyzer.hrl").
 
 %%--------------------------------------------------------------------
 
+-type behaviour() :: atom().
+
 -record(state, {plt        :: dialyzer_plt:plt(),
 		codeserver :: dialyzer_codeserver:codeserver(),
-		filename   :: string(),
-		behlines   :: [{atom(), number()}]}).
+		filename   :: file:filename(),
+		behlines   :: [{behaviour(), non_neg_integer()}]}).
+
+%%--------------------------------------------------------------------
 
 -spec get_behaviours([module()], dialyzer_codeserver:codeserver()) ->
-  {[atom()], [atom()]}.
+  {[behaviour()], [behaviour()]}.
 
 get_behaviours(Modules, Codeserver) ->
   get_behaviours(Modules, Codeserver, [], []).
@@ -59,29 +65,37 @@ check_callbacks(Module, Attrs, Plt, Codeserver) ->
   {Behaviours, BehLines} = get_behaviours(Attrs),
   case Behaviours of
     [] -> [];
-     _ -> {_Var,Code} =
-	    dialyzer_codeserver:lookup_mfa_code({Module,module_info,0},
-						Codeserver),
-	  File = get_file(cerl:get_ann(Code)),
-	  State = #state{plt = Plt, codeserver = Codeserver, filename = File,
-			 behlines = BehLines},
-	  Warnings = get_warnings(Module, Behaviours, State),
-	  [add_tag_file_line(Module, W, State) || W <- Warnings]
+    _ ->
+      MFA = {Module,module_info,0},
+      {_Var,Code} = dialyzer_codeserver:lookup_mfa_code(MFA, Codeserver),
+      File = get_file(cerl:get_ann(Code)),
+      State = #state{plt = Plt, codeserver = Codeserver, filename = File,
+		     behlines = BehLines},
+      Warnings = get_warnings(Module, Behaviours, State),
+      [add_tag_file_line(Module, W, State) || W <- Warnings]
   end.
 
--spec translatable_behaviours(cerl:c_module()) -> [{atom(),[_]}].
+-spec translatable_behaviours(cerl:c_module()) -> behaviour_api_dict().
 
 translatable_behaviours(Tree) ->
   Attrs = cerl:module_attrs(Tree),
   {Behaviours, _BehLines} = get_behaviours(Attrs),
   [{B, Calls} || B <- Behaviours, (Calls = behaviour_api_calls(B)) =/= []].
 
--spec get_behaviour_apis([atom()]) -> [mfa()].
+-spec get_behaviour_apis([behaviour()]) -> [mfa()].
 
 get_behaviour_apis(Behaviours) ->
   get_behaviour_apis(Behaviours, []).
 
--spec translate_behaviour_api_call(_, _, _, _, _) -> _.
+-spec translate_behaviour_api_call(dialyzer_races:mfa_or_funlbl(),
+				   [erl_types:erl_type()],
+				   [dialyzer_races:core_vars()],
+				   module(),
+				   behaviour_api_dict()) ->
+				      {dialyzer_races:mfa_or_funlbl(),
+				       [erl_types:erl_type()],
+				       [dialyzer_races:core_vars()]}
+					| 'plain_call'.
 
 translate_behaviour_api_call(_Fun, _ArgTypes, _Args, _Module, []) ->
   plain_call;
@@ -101,8 +115,9 @@ translate_behaviour_api_call({Module, Fun, Arity}, ArgTypes, Args,
 translate_behaviour_api_call(_Fun, _ArgTypes, _Args, _Module, _BehApiInfo) ->
   plain_call.
 
--spec translate_callgraph([{atom(), _}], atom(), dialyzer_callgraph:callgraph())
-			  -> dialyzer_callgraph:callgraph().
+-spec translate_callgraph(behaviour_api_dict(), atom(),
+			  dialyzer_callgraph:callgraph()) ->
+			     dialyzer_callgraph:callgraph().
 
 translate_callgraph([{Behaviour,_}|Behaviours], Module, Callgraph) ->
   UsedCalls = [Call || {_From, {M, _F, _A}} = Call <-
@@ -263,7 +278,7 @@ get_line([]) -> -1.
 get_file([{file, File}|_]) -> File;
 get_file([_|Tail]) -> get_file(Tail).
 
-%%------------------------------------------------------------------------------
+%%-----------------------------------------------------------------------------
 
 get_behaviours([], _Codeserver, KnownAcc, UnknownAcc) ->
   {KnownAcc, UnknownAcc};
@@ -292,7 +307,7 @@ call_behaviours([Behaviour|Rest], KnownAcc, UnknownAcc) ->
     _:_ -> call_behaviours(Rest, KnownAcc, [Behaviour | UnknownAcc])
   end.
 
-%-------------------------------------------------------------------------------
+%------------------------------------------------------------------------------
 
 get_behaviour_apis([], Acc) ->
   Acc;
@@ -301,14 +316,22 @@ get_behaviour_apis([Behaviour | Rest], Acc) ->
 	   {{Fun, Arity}, _} <- behaviour_api_calls(Behaviour)],
   get_behaviour_apis(Rest, MFAs ++ Acc).
 
-%-------------------------------------------------------------------------------
+%------------------------------------------------------------------------------
 
 nth_or_0(0, _List, Zero) ->
   Zero;
 nth_or_0(N, List, _Zero) ->
   lists:nth(N, List).
 
-%-------------------------------------------------------------------------------
+%------------------------------------------------------------------------------
+
+-type behaviour_api_dict()::[{behaviour(), behaviour_api_info()}].
+-type behaviour_api_info()::[{original_fun(), replacement_fun()}].
+-type original_fun()::{atom(), arity()}.
+-type replacement_fun()::{atom(), arity(), arg_list()}.
+-type arg_list()::[byte()].
+
+-spec behaviour_api_calls(behaviour()) -> behaviour_api_info().
 
 behaviour_api_calls(gen_server) ->
   [{{start_link, 3}, {init, 1, [2]}},
diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl
index 1d02c4f0dc..86f1ba4696 100644
--- a/lib/dialyzer/src/dialyzer_cl.erl
+++ b/lib/dialyzer/src/dialyzer_cl.erl
@@ -2,7 +2,7 @@
 %%-------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. 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
@@ -29,6 +29,10 @@
 
 -module(dialyzer_cl).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([start/1]).
 
 -include("dialyzer.hrl").
@@ -42,13 +46,14 @@
 	 legal_warnings  = ordsets:new()  :: [dial_warn_tag()],
 	 mod_deps        = dict:new()     :: dict(),
 	 output          = standard_io	  :: io:device(),
-	 output_format   = formatted      :: 'raw' | 'formatted',
+	 output_format   = formatted      :: format(),
+	 filename_opt    = basename       :: fopt(),
 	 output_plt      = none           :: 'none' | file:filename(),
 	 plt_info        = none           :: 'none' | dialyzer_plt:plt_info(),
 	 report_mode     = normal         :: rep_mode(),
 	 return_status= ?RET_NOTHING_SUSPICIOUS	:: dial_ret(),
 	 stored_warnings = []             :: [dial_warning()],
-	 unknown_behaviours = []          :: [atom()]
+	 unknown_behaviours = []          :: [dialyzer_behaviours:behaviour()]
 	}).
 
 %%--------------------------------------------------------------------
@@ -77,11 +82,15 @@ build_plt(Opts) ->
 init_opts_for_build(Opts) ->
   case Opts#options.output_plt =:= none of
     true ->
-      case Opts#options.init_plt of
-	none -> Opts#options{init_plt = none, output_plt = get_default_plt()};
-	Plt  -> Opts#options{init_plt = none, output_plt = Plt}
+      case Opts#options.init_plts of
+	[] -> Opts#options{output_plt = get_default_output_plt()};
+	[Plt] -> Opts#options{init_plts = [], output_plt = Plt};
+        Plts ->
+          Msg = io_lib:format("Could not build multiple PLT files: ~s\n",
+                              [format_plts(Plts)]),
+          error(Msg)
       end;
-    false -> Opts#options{init_plt = none}
+    false -> Opts#options{init_plts = []}
   end.
 
 %%--------------------------------------------------------------------
@@ -94,39 +103,58 @@ add_to_plt(Opts) ->
 init_opts_for_add(Opts) ->
   case Opts#options.output_plt =:= none of
     true ->
-      case Opts#options.init_plt of
-	none -> Opts#options{output_plt = get_default_plt(),
-			     init_plt = get_default_plt()};
-	Plt  -> Opts#options{output_plt = Plt}
+      case Opts#options.init_plts of
+	[] -> Opts#options{output_plt = get_default_output_plt(),
+                           init_plts = get_default_init_plt()};
+	[Plt] -> Opts#options{output_plt = Plt};
+        Plts ->
+          Msg = io_lib:format("Could not add to multiple PLT files: ~s\n",
+                              [format_plts(Plts)]),
+          error(Msg)
       end;
     false ->
-      case Opts#options.init_plt =:= none of
-	true  -> Opts#options{init_plt = get_default_plt()};
+      case Opts#options.init_plts =:= [] of
+	true  -> Opts#options{init_plts = get_default_init_plt()};
 	false -> Opts
       end
   end.
 
 %%--------------------------------------------------------------------
 
-check_plt(Opts) ->
+check_plt(#options{init_plts = []} = Opts) ->
   Opts1 = init_opts_for_check(Opts),
-  report_check(Opts),
-  plt_common(Opts1, [], []).
+  report_check(Opts1),
+  plt_common(Opts1, [], []);
+check_plt(#options{init_plts = Plts} = Opts) ->
+  check_plt_aux(Plts, Opts).
+
+check_plt_aux([_] = Plt, Opts) ->
+  Opts1 = Opts#options{init_plts = Plt},
+  Opts2 = init_opts_for_check(Opts1),
+  report_check(Opts2),
+  plt_common(Opts2, [], []);
+check_plt_aux([Plt|Plts], Opts) ->
+  Opts1 = Opts#options{init_plts = [Plt]},
+  Opts2 = init_opts_for_check(Opts1),
+  report_check(Opts2),
+  plt_common(Opts2, [], []),
+  check_plt_aux(Plts, Opts).
 
 init_opts_for_check(Opts) ->
-  Plt =
-    case Opts#options.init_plt of
-      none -> get_default_plt();
-      Plt0 -> Plt0
+  InitPlt =
+    case Opts#options.init_plts of
+      []-> get_default_init_plt();
+      Plt -> Plt
     end,
+  [OutputPlt] = InitPlt,
   Opts#options{files         = [],
 	       files_rec     = [],
 	       analysis_type = plt_check,
 	       defines       = [],
 	       from          = byte_code,
-	       init_plt      = Plt,
+	       init_plts     = InitPlt,
 	       include_dirs  = [],
-	       output_plt    = Plt,
+	       output_plt    = OutputPlt,
 	       use_contracts = true
 	      }.
 
@@ -140,21 +168,25 @@ remove_from_plt(Opts) ->
 init_opts_for_remove(Opts) ->
   case Opts#options.output_plt =:= none of
     true ->
-      case Opts#options.init_plt of
-	none -> Opts#options{output_plt = get_default_plt(),
-			     init_plt = get_default_plt()};
-	Plt  -> Opts#options{output_plt = Plt}
+      case Opts#options.init_plts of
+	[] -> Opts#options{output_plt = get_default_output_plt(),
+                           init_plts = get_default_init_plt()};
+	[Plt] -> Opts#options{output_plt = Plt};
+        Plts ->
+          Msg = io_lib:format("Could not remove from multiple PLT files: ~s\n",
+                              [format_plts(Plts)]),
+          error(Msg)
       end;
     false ->
-      case Opts#options.init_plt =:= none of
-	true  -> Opts#options{init_plt = get_default_plt()};
+      case Opts#options.init_plts =:= [] of
+	true  -> Opts#options{init_plts = get_default_init_plt()};
 	false -> Opts
       end
   end.
 
 %%--------------------------------------------------------------------
 
-plt_common(Opts, RemoveFiles, AddFiles) ->
+plt_common(#options{init_plts = [InitPlt]} = Opts, RemoveFiles, AddFiles) ->
   case check_plt(Opts, RemoveFiles, AddFiles) of
     ok ->
       case Opts#options.report_mode of
@@ -170,7 +202,7 @@ plt_common(Opts, RemoveFiles, AddFiles) ->
       report_failed_plt_check(Opts, DiffMd5),
       {AnalFiles, RemovedMods, ModDeps1} = 
 	expand_dependent_modules(Md5, DiffMd5, ModDeps),
-      Plt = clean_plt(Opts#options.init_plt, RemovedMods),
+      Plt = clean_plt(InitPlt, RemovedMods),
       case AnalFiles =:= [] of
 	true ->
 	  %% Only removed stuff. Just write the PLT.
@@ -182,19 +214,19 @@ plt_common(Opts, RemoveFiles, AddFiles) ->
       end;
     {error, no_such_file} ->
       Msg = io_lib:format("Could not find the PLT: ~s\n~s",
-			  [Opts#options.init_plt, default_plt_error_msg()]),
+			  [InitPlt, default_plt_error_msg()]),
       error(Msg);
     {error, not_valid} ->
       Msg = io_lib:format("The file: ~s is not a valid PLT file\n~s",
-			  [Opts#options.init_plt, default_plt_error_msg()]),
+			  [InitPlt, default_plt_error_msg()]),
       error(Msg);
     {error, read_error} ->
       Msg = io_lib:format("Could not read the PLT: ~s\n~s",
-			  [Opts#options.init_plt, default_plt_error_msg()]),
+			  [InitPlt, default_plt_error_msg()]),
       error(Msg);
     {error, {no_file_to_remove, F}} ->
       Msg = io_lib:format("Could not remove the file ~s from the PLT: ~s\n",
-			  [F, Opts#options.init_plt]),
+			  [F, InitPlt]),
       error(Msg)
   end.
 
@@ -214,8 +246,7 @@ default_plt_error_msg() ->
 
 %%--------------------------------------------------------------------
 
-check_plt(Opts, RemoveFiles, AddFiles) ->
-  Plt = Opts#options.init_plt,
+check_plt(#options{init_plts = [Plt]} = Opts, RemoveFiles, AddFiles) ->
   case dialyzer_plt:check_plt(Plt, RemoveFiles, AddFiles) of
     {old_version, _MD5} = OldVersion ->
       report_old_version(Opts),
@@ -230,14 +261,14 @@ check_plt(Opts, RemoveFiles, AddFiles) ->
 
 %%--------------------------------------------------------------------
 
-report_check(#options{report_mode = ReportMode, init_plt = InitPlt}) ->
+report_check(#options{report_mode = ReportMode, init_plts = [InitPlt]}) ->
   case ReportMode of
     quiet -> ok;
     _ ->
       io:format("  Checking whether the PLT ~s is up-to-date...", [InitPlt])
   end.
 
-report_old_version(#options{report_mode = ReportMode, init_plt = InitPlt}) ->
+report_old_version(#options{report_mode = ReportMode, init_plts = [InitPlt]}) ->
   case ReportMode of
     quiet -> ok;
     _ ->
@@ -260,7 +291,7 @@ report_failed_plt_check(#options{analysis_type = AnalType,
 
 report_analysis_start(#options{analysis_type = Type,
 			       report_mode = ReportMode,
-			       init_plt = InitPlt, 
+			       init_plts = InitPlts,
 			       output_plt = OutputPlt}) ->
   case ReportMode of
     quiet -> ok;
@@ -268,6 +299,7 @@ report_analysis_start(#options{analysis_type = Type,
       io:format("  "),
       case Type of
 	plt_add ->
+          [InitPlt] = InitPlts,
 	  case InitPlt =:= OutputPlt of
 	    true -> io:format("Adding information to ~s...", [OutputPlt]);
 	    false -> io:format("Adding information from ~s to ~s...", 
@@ -278,6 +310,7 @@ report_analysis_start(#options{analysis_type = Type,
 	plt_check ->
 	  io:format("Rebuilding the information in ~s...", [OutputPlt]);
 	plt_remove ->
+          [InitPlt] = InitPlts,
 	  case InitPlt =:= OutputPlt of
 	    true -> io:format("Removing information from ~s...", [OutputPlt]);
 	    false -> io:format("Removing information from ~s to ~s...", 
@@ -316,16 +349,28 @@ report_md5_diff(List) ->
 
 %%--------------------------------------------------------------------
 
-get_default_plt() ->
+get_default_init_plt() ->
+  [dialyzer_plt:get_default_plt()].
+
+get_default_output_plt() ->
   dialyzer_plt:get_default_plt().
 
 %%--------------------------------------------------------------------
 
+format_plts([Plt]) -> Plt;
+format_plts([Plt|Plts]) ->
+  Plt ++ ", " ++ format_plts(Plts).
+
+%%--------------------------------------------------------------------
+
 do_analysis(Options) ->
   Files = get_files_from_opts(Options),
-  case Options#options.init_plt of
-    none -> do_analysis(Files, Options, dialyzer_plt:new(), none);
-    File -> do_analysis(Files, Options, dialyzer_plt:from_file(File), none)
+  case Options#options.init_plts of
+    [] -> do_analysis(Files, Options, dialyzer_plt:new(), none);
+    PltFiles ->
+      Plts = [dialyzer_plt:from_file(F) || F <- PltFiles],
+      Plt = dialyzer_plt:merge_plts_or_report_conflicts(PltFiles, Plts),
+      do_analysis(Files, Options, Plt, none)
   end.
   
 do_analysis(Files, Options, Plt, PltInfo) ->
@@ -488,8 +533,10 @@ hc(Mod) ->
 new_state() ->
   #cl_state{}.
 
-init_output(State0, #options{output_file = OutFile, output_format = OutFormat}) ->
-  State = State0#cl_state{output_format = OutFormat},
+init_output(State0, #options{output_file = OutFile,
+			     output_format = OutFormat,
+			     filename_opt = FOpt}) ->
+  State = State0#cl_state{output_format = OutFormat, filename_opt = FOpt},
   case OutFile =:= none of
     true ->
       State;
@@ -555,7 +602,7 @@ cl_loop(State, LogCache) ->
       cl_loop(State, LogCache)
   end.
 
--spec failed_anal_msg(string(), [_]) -> string().
+-spec failed_anal_msg(string(), [_]) -> nonempty_string().
 
 failed_anal_msg(Reason, LogCache) ->
   Msg = "Analysis failed with error: " ++ Reason ++ "\n",
@@ -577,7 +624,7 @@ format_log_cache(LogCache) ->
 store_warnings(#cl_state{stored_warnings = StoredWarnings} = St, Warnings) ->
   St#cl_state{stored_warnings = StoredWarnings ++ Warnings}.
 
--spec store_unknown_behaviours(#cl_state{}, [_]) -> #cl_state{}.
+-spec store_unknown_behaviours(#cl_state{}, [dialyzer_behaviours:behaviour()]) -> #cl_state{}.
 
 store_unknown_behaviours(#cl_state{unknown_behaviours = Behs} = St, Beh) ->
   St#cl_state{unknown_behaviours = Beh ++ Behs}.
@@ -722,6 +769,7 @@ print_warnings(#cl_state{stored_warnings = []}) ->
   ok;
 print_warnings(#cl_state{output = Output,
 			 output_format = Format,
+			 filename_opt = FOpt,
 			 stored_warnings = Warnings}) ->
   PrWarnings = process_warnings(Warnings),
   case PrWarnings of
@@ -729,7 +777,7 @@ print_warnings(#cl_state{output = Output,
     [_|_] ->
       S = case Format of
 	    formatted ->
-	      [dialyzer:format_warning(W) || W <- PrWarnings];
+	      [dialyzer:format_warning(W, FOpt) || W <- PrWarnings];
 	    raw ->
 	      [io_lib:format("~p. \n", [W]) || W <- PrWarnings]
 	  end,
diff --git a/lib/dialyzer/src/dialyzer_cl_parse.erl b/lib/dialyzer/src/dialyzer_cl_parse.erl
index 9a522e906a..f9baf36822 100644
--- a/lib/dialyzer/src/dialyzer_cl_parse.erl
+++ b/lib/dialyzer/src/dialyzer_cl_parse.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. 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
@@ -20,6 +20,8 @@
 
 -module(dialyzer_cl_parse).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([start/0]).
 -export([collect_args/1]).	% used also by typer_options.erl
 
@@ -131,16 +133,25 @@ cl(["-o"++Output|T]) ->
 cl(["--raw"|T]) ->
   put(dialyzer_output_format, raw),
   cl(T);
+cl(["--fullpath"|T]) ->
+  put(dialyzer_filename_opt, fullpath),
+  cl(T);
 cl(["-pa", Path|T]) ->
   case code:add_patha(Path) of
     true -> cl(T);
     {error, _} -> error("Bad directory for -pa: "++Path)
   end;
-cl(["--plt", PLT|T]) ->
-  put(dialyzer_init_plt, PLT),
-  cl(T);
 cl(["--plt"]) ->
   error("No plt specified for --plt");
+cl(["--plt", PLT|T]) ->
+  put(dialyzer_init_plts, [PLT]),
+  cl(T);
+cl(["--plts"]) ->
+  error("No plts specified for --plts");
+cl(["--plts"|T]) ->
+  {PLTs, NewT} = get_plts(T, []),
+  put(dialyzer_init_plts, PLTs),
+  cl(NewT);
 cl(["-q"|T]) ->
   put(dialyzer_options_report_mode, quiet),
   cl(T);
@@ -235,6 +246,7 @@ init() ->
   put(dialyzer_options_defines,   DefaultOpts#options.defines),
   put(dialyzer_options_files,     DefaultOpts#options.files),
   put(dialyzer_output_format,     formatted),
+  put(dialyzer_filename_opt,      basename),
   put(dialyzer_options_check_plt, DefaultOpts#options.check_plt),
   ok.
 
@@ -273,6 +285,7 @@ cl_options() ->
    {files_rec, get(dialyzer_options_files_rec)},
    {output_file, get(dialyzer_output)},
    {output_format, get(dialyzer_output_format)},
+   {filename_opt, get(dialyzer_filename_opt)},
    {analysis_type, get(dialyzer_options_analysis_type)},
    {get_warnings, get(dialyzer_options_get_warnings)},
    {callgraph_file, get(dialyzer_callgraph_file)}
@@ -282,7 +295,7 @@ common_options() ->
   [{defines, get(dialyzer_options_defines)},
    {from, get(dialyzer_options_from)},
    {include_dirs, get(dialyzer_include)},
-   {init_plt, get(dialyzer_init_plt)},
+   {plts, get(dialyzer_init_plts)},
    {output_plt, get(dialyzer_output_plt)},
    {report_mode, get(dialyzer_options_report_mode)},
    {use_spec, get(dialyzer_options_use_contracts)},
@@ -307,6 +320,13 @@ get_lib_dir([], Acc) ->
 
 %%-----------------------------------------------------------------------
 
+get_plts(["--"|T], Acc) -> {lists:reverse(Acc), T};
+get_plts(["-"++_Opt = H|T], Acc) -> {lists:reverse(Acc), [H|T]};
+get_plts([H|T], Acc) -> get_plts(T, [H|Acc]);
+get_plts([], Acc) -> {lists:reverse(Acc), []}.
+
+%%-----------------------------------------------------------------------
+
 help_warnings() ->
   S = warning_options_msg(),
   io:put_chars(S),
@@ -314,23 +334,24 @@ help_warnings() ->
 
 help_message() ->
   S = "Usage: dialyzer [--help] [--version] [--shell] [--quiet] [--verbose]
-		[-pa dir]* [--plt plt] [-Ddefine]* [-I include_dir]* 
-		[--output_plt file] [-Wwarn]* [--src] [--gui | --wx]
-		[files_or_dirs] [-r dirs] [--apps applications] [-o outfile]
+		[-pa dir]* [--plt plt] [--plts plt*] [-Ddefine]*
+                [-I include_dir]* [--output_plt file] [-Wwarn]*
+                [--src] [--gui | --wx] [files_or_dirs] [-r dirs]
+                [--apps applications] [-o outfile]
 		[--build_plt] [--add_to_plt] [--remove_from_plt]
 		[--check_plt] [--no_check_plt] [--plt_info] [--get_warnings]
-                [--no_native]
+                [--no_native] [--fullpath]
 Options:
   files_or_dirs (for backwards compatibility also as: -c files_or_dirs)
       Use Dialyzer from the command line to detect defects in the
       specified files or directories containing .erl or .beam files,
-      depending on the type of the analysis
+      depending on the type of the analysis.
   -r dirs
       Same as the previous but the specified directories are searched
       recursively for subdirectories containing .erl or .beam files in
-      them, depending on the type of analysis
+      them, depending on the type of analysis.
   --apps applications
-      Option typically used when building or modifying a PLT as in:
+      Option typically used when building or modifying a plt as in:
         dialyzer --build_plt --apps erts kernel stdlib mnesia ...
       to conveniently refer to library applications corresponding to the
       Erlang/OTP installation. However, the option is general and can also
@@ -339,75 +360,90 @@ Options:
         dialyzer --apps inets ssl ./ebin ../other_lib/ebin/my_module.beam
   -o outfile (or --output outfile)
       When using Dialyzer from the command line, send the analysis
-      results to the specified \"outfile\" rather than to stdout
+      results to the specified outfile rather than to stdout.
   --raw
       When using Dialyzer from the command line, output the raw analysis
       results (Erlang terms) instead of the formatted result.
       The raw format is easier to post-process (for instance, to filter
-      warnings or to output HTML pages)
+      warnings or to output HTML pages).
   --src
       Override the default, which is to analyze BEAM files, and
-      analyze starting from Erlang source code instead
+      analyze starting from Erlang source code instead.
   -Dname (or -Dname=value)
-      When analyzing from source, pass the define to Dialyzer (**)
+      When analyzing from source, pass the define to Dialyzer. (**)
   -I include_dir
-      When analyzing from source, pass the include_dir to Dialyzer (**)
+      When analyzing from source, pass the include_dir to Dialyzer. (**)
   -pa dir
       Include dir in the path for Erlang (useful when analyzing files
-      that have '-include_lib()' directives)
+      that have '-include_lib()' directives).
   --output_plt file
-      Store the plt at the specified file after building it
+      Store the plt at the specified file after building it.
   --plt plt
       Use the specified plt as the initial plt (if the plt was built 
-      during setup the files will be checked for consistency)
+      during setup the files will be checked for consistency).
+  --plts plt*
+      Merge the specified plts to create the initial plt -- requires
+      that the plts are disjoint (i.e., do not have any module
+      appearing in more than one plt).
+      The plts are created in the usual way:
+        dialyzer --build_plt --output_plt plt_1 files_to_include
+        ...
+        dialyzer --build_plt --output_plt plt_n files_to_include
+      and then can be used in either of the following ways:
+        dialyzer files_to_analyze --plts plt_1 ... plt_n
+      or:
+        dialyzer --plts plt_1 ... plt_n -- files_to_analyze
+      (Note the -- delimiter in the second case)
   -Wwarn
       A family of options which selectively turn on/off warnings
-      (for help on the names of warnings use dialyzer -Whelp)
+      (for help on the names of warnings use dialyzer -Whelp).
   --shell
-      Do not disable the Erlang shell while running the GUI
+      Do not disable the Erlang shell while running the GUI.
   --version (or -v)
-      Prints the Dialyzer version and some more information and exits
+      Print the Dialyzer version and some more information and exit.
   --help (or -h)
-      Prints this message and exits
+      Print this message and exit.
   --quiet (or -q)
-      Makes Dialyzer a bit more quiet
+      Make Dialyzer a bit more quiet.
   --verbose
-      Makes Dialyzer a bit more verbose
+      Make Dialyzer a bit more verbose.
   --build_plt
       The analysis starts from an empty plt and creates a new one from the
       files specified with -c and -r. Only works for beam files.
-      Use --plt or --output_plt to override the default plt location.
+      Use --plt(s) or --output_plt to override the default plt location.
   --add_to_plt
       The plt is extended to also include the files specified with -c and -r.
-      Use --plt to specify wich plt to start from, and --output_plt to 
-      specify where to put the plt. Note that the analysis might include 
-      files from the plt if they depend on the new files. 
+      Use --plt(s) to specify which plt to start from, and --output_plt to
+      specify where to put the plt. Note that the analysis might include
+      files from the plt if they depend on the new files.
       This option only works with beam files.
   --remove_from_plt
       The information from the files specified with -c and -r is removed
       from the plt. Note that this may cause a re-analysis of the remaining
       dependent files.
   --check_plt
-      Checks the plt for consistency and rebuilds it if it is not up-to-date.
+      Check the plt for consistency and rebuild it if it is not up-to-date.
       Actually, this option is of rare use as it is on by default.
   --no_check_plt (or -n)
       Skip the plt check when running Dialyzer. Useful when working with
       installed plts that never change.
   --plt_info
-      Makes Dialyzer print information about the plt and then quit. The plt 
-      can be specified with --plt.
+      Make Dialyzer print information about the plt and then quit. The plt
+      can be specified with --plt(s).
   --get_warnings
-      Makes Dialyzer emit warnings even when manipulating the plt. Only 
-      emits warnings for files that are actually analyzed.
+      Make Dialyzer emit warnings even when manipulating the plt. Warnings
+      are only emitted for files that are actually analyzed.
   --dump_callgraph file
       Dump the call graph into the specified file whose format is determined
       by the file name extension. Supported extensions are: raw, dot, and ps.
       If something else is used as file name extension, default format '.raw'
       will be used.
   --no_native (or -nn)
-      Bypass the native code compilation of some key files that dialyzer
+      Bypass the native code compilation of some key files that Dialyzer
       heuristically performs when dialyzing many files; this avoids the
       compilation time but it may result in (much) longer analysis time.
+  --fullpath
+      Display the full path names of files for which warnings are emitted.
   --gui
       Use the gs-based GUI.
   --wx
diff --git a/lib/dialyzer/src/dialyzer_codeserver.erl b/lib/dialyzer/src/dialyzer_codeserver.erl
index 3cf090712c..b2097f7e53 100644
--- a/lib/dialyzer/src/dialyzer_codeserver.erl
+++ b/lib/dialyzer/src/dialyzer_codeserver.erl
@@ -21,7 +21,7 @@
 %%%-------------------------------------------------------------------
 %%% File    : dialyzer_codeserver.erl
 %%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created :  4 Apr 2005 by Tobias Lindahl <[email protected]>
 %%%-------------------------------------------------------------------
@@ -33,7 +33,7 @@
 	 finalize_records/2,
 	 get_contracts/1,
          get_exported_types/1,
-	 get_exports/1, 
+	 get_exports/1,
 	 get_records/1,
 	 get_next_core_label/1,
 	 get_temp_contracts/1,
@@ -86,7 +86,7 @@ new() ->
 delete(#codeserver{table_pid = TablePid}) ->
   table__delete(TablePid).
 
--spec insert(module(), cerl:c_module(), codeserver()) -> codeserver().
+-spec insert(atom(), cerl:c_module(), codeserver()) -> codeserver().
 
 insert(Mod, ModCode, CS) ->
   NewTablePid = table__insert(CS#codeserver.table_pid, Mod, ModCode),
@@ -129,7 +129,7 @@ get_exports(#codeserver{exports = Exports}) ->
 finalize_exported_types(Set, CS) ->
   CS#codeserver{exported_types = Set, temp_exported_types = sets:new()}.
 
--spec lookup_mod_code(module(), codeserver()) -> cerl:c_module().
+-spec lookup_mod_code(atom(), codeserver()) -> cerl:c_module().
 
 lookup_mod_code(Mod, CS) when is_atom(Mod) ->
   table__lookup(CS#codeserver.table_pid, Mod).
@@ -149,7 +149,7 @@ get_next_core_label(#codeserver{next_core_label = NCL}) ->
 set_next_core_label(NCL, CS) ->
   CS#codeserver{next_core_label = NCL}.
 
--spec store_records(module(), dict(), codeserver()) -> codeserver().
+-spec store_records(atom(), dict(), codeserver()) -> codeserver().
 
 store_records(Mod, Dict, #codeserver{records = RecDict} = CS)
   when is_atom(Mod) ->
@@ -158,7 +158,7 @@ store_records(Mod, Dict, #codeserver{records = RecDict} = CS)
     false -> CS#codeserver{records = dict:store(Mod, Dict, RecDict)}
   end.
 
--spec lookup_mod_records(module(), codeserver()) -> dict(). 
+-spec lookup_mod_records(atom(), codeserver()) -> dict().
 
 lookup_mod_records(Mod, #codeserver{records = RecDict})
   when is_atom(Mod) ->
@@ -167,12 +167,12 @@ lookup_mod_records(Mod, #codeserver{records = RecDict})
     {ok, Dict} -> Dict
   end.
 
--spec get_records(codeserver()) -> dict(). 
+-spec get_records(codeserver()) -> dict().
 
 get_records(#codeserver{records = RecDict}) ->
   RecDict.
 
--spec store_temp_records(module(), dict(), codeserver()) -> codeserver().
+-spec store_temp_records(atom(), dict(), codeserver()) -> codeserver().
 
 store_temp_records(Mod, Dict, #codeserver{temp_records = TempRecDict} = CS)
   when is_atom(Mod) ->
@@ -181,7 +181,7 @@ store_temp_records(Mod, Dict, #codeserver{temp_records = TempRecDict} = CS)
     false -> CS#codeserver{temp_records = dict:store(Mod, Dict, TempRecDict)}
   end.
 
--spec get_temp_records(codeserver()) -> dict(). 
+-spec get_temp_records(codeserver()) -> dict().
 
 get_temp_records(#codeserver{temp_records = TempRecDict}) ->
   TempRecDict.
@@ -191,12 +191,12 @@ get_temp_records(#codeserver{temp_records = TempRecDict}) ->
 set_temp_records(Dict, CS) ->
   CS#codeserver{temp_records = Dict}.
 
--spec finalize_records(dict(), codeserver()) -> codeserver(). 
+-spec finalize_records(dict(), codeserver()) -> codeserver().
 
 finalize_records(Dict, CS) ->
   CS#codeserver{records = Dict, temp_records = dict:new()}.
 
--spec store_contracts(module(), dict(), codeserver()) -> codeserver(). 
+-spec store_contracts(atom(), dict(), codeserver()) -> codeserver().
 
 store_contracts(Mod, Dict, #codeserver{contracts = C} = CS) when is_atom(Mod) ->
   case dict:size(Dict) =:= 0 of
@@ -204,7 +204,7 @@ store_contracts(Mod, Dict, #codeserver{contracts = C} = CS) when is_atom(Mod) ->
     false -> CS#codeserver{contracts = dict:store(Mod, Dict, C)}
   end.
 
--spec lookup_mod_contracts(module(), codeserver()) -> dict().
+-spec lookup_mod_contracts(atom(), codeserver()) -> dict().
 
 lookup_mod_contracts(Mod, #codeserver{contracts = ContDict})
   when is_atom(Mod) ->
@@ -213,7 +213,7 @@ lookup_mod_contracts(Mod, #codeserver{contracts = ContDict})
     {ok, Dict} -> Dict
   end.
 
--spec lookup_mfa_contract(mfa(), codeserver()) -> 
+-spec lookup_mfa_contract(mfa(), codeserver()) ->
          'error' | {'ok', dialyzer_contracts:file_contract()}.
 
 lookup_mfa_contract({M,_F,_A} = MFA, #codeserver{contracts = ContDict}) ->
@@ -222,12 +222,12 @@ lookup_mfa_contract({M,_F,_A} = MFA, #codeserver{contracts = ContDict}) ->
     {ok, Dict} -> dict:find(MFA, Dict)
   end.
 
--spec get_contracts(codeserver()) -> dict(). 
+-spec get_contracts(codeserver()) -> dict().
 
 get_contracts(#codeserver{contracts = ContDict}) ->
   ContDict.
 
--spec store_temp_contracts(module(), dict(), codeserver()) -> codeserver(). 
+-spec store_temp_contracts(atom(), dict(), codeserver()) -> codeserver().
 
 store_temp_contracts(Mod, Dict, #codeserver{temp_contracts = C} = CS)
   when is_atom(Mod) ->
@@ -291,7 +291,7 @@ table__loop(Cached, Map) ->
       Pid ! {self(), Mod, Ans},
       table__loop({Mod, Ans}, Map);
     {insert, List} ->
-      NewMap = lists:foldl(fun({Key, Val}, AccMap) -> 
+      NewMap = lists:foldl(fun({Key, Val}, AccMap) ->
 			       dict:store(Key, Val, AccMap)
 			   end, Map, List),
       table__loop(Cached, NewMap)
diff --git a/lib/dialyzer/src/dialyzer_contracts.erl b/lib/dialyzer/src/dialyzer_contracts.erl
index 2bedf99e42..bcdcf2685d 100644
--- a/lib/dialyzer/src/dialyzer_contracts.erl
+++ b/lib/dialyzer/src/dialyzer_contracts.erl
@@ -21,7 +21,7 @@
 -module(dialyzer_contracts).
 
 -export([check_contract/2,
-	 check_contracts/3, 
+	 check_contracts/3,
 	 contracts_without_fun/3,
 	 contract_to_string/1,
 	 get_invalid_contract_warnings/3,
@@ -106,13 +106,13 @@ contract_to_string(#contract{forms = Forms}) ->
 contract_to_string_1([{Contract, []}]) ->
   strip_fun(erl_types:t_form_to_string(Contract));
 contract_to_string_1([{Contract, []}|Rest]) ->
-  strip_fun(erl_types:t_form_to_string(Contract)) ++ "\n    ; " 
+  strip_fun(erl_types:t_form_to_string(Contract)) ++ "\n    ; "
     ++ contract_to_string_1(Rest);
 contract_to_string_1([{Contract, Constraints}]) ->
-  strip_fun(erl_types:t_form_to_string(Contract)) ++ " when " 
+  strip_fun(erl_types:t_form_to_string(Contract)) ++ " when "
     ++ constraints_to_string(Constraints);
 contract_to_string_1([{Contract, Constraints}|Rest]) ->
-  strip_fun(erl_types:t_form_to_string(Contract)) ++ " when " 
+  strip_fun(erl_types:t_form_to_string(Contract)) ++ " when "
     ++ constraints_to_string(Constraints) ++ ";" ++
     contract_to_string_1(Rest).
 
@@ -130,7 +130,7 @@ constraints_to_string([{type, _, constraint, [{atom, _, What}, Types]}]) ->
     sequence([erl_types:t_form_to_string(T) || T <- Types], ",") ++ ")";
 constraints_to_string([{type, _, constraint, [{atom, _, What}, Types]}|Rest]) ->
   atom_to_list(What) ++ "(" ++
-    sequence([erl_types:t_form_to_string(T) || T <- Types], ",") 
+    sequence([erl_types:t_form_to_string(T) || T <- Types], ",")
     ++ "), " ++ constraints_to_string(Rest).
 
 sequence([], _Delimiter) -> "";
@@ -156,27 +156,30 @@ process_contract_remote_types(CodeServer) ->
     end,
   NewContractDict = dict:map(ModuleFun, TmpContractDict),
   dialyzer_codeserver:finalize_contracts(NewContractDict, CodeServer).
-  
+
 -spec check_contracts([{mfa(), file_contract()}],
 		      dialyzer_callgraph:callgraph(), dict()) -> plt_contracts().
 
 check_contracts(Contracts, Callgraph, FunTypes) ->
   FoldFun =
-    fun(Label, Type, NewContracts) -> 
-	{ok, {M,F,A} = MFA} = dialyzer_callgraph:lookup_name(Label, Callgraph),
-	case orddict:find(MFA, Contracts) of
-	  {ok, {_FileLine, Contract}} -> 
-	    case check_contract(Contract, Type) of
-	      ok ->
-		case erl_bif_types:is_known(M, F, A) of
-		  true ->
-		    %% Disregard the contracts since 
-		    %% this is a known function.
-		    NewContracts;
-		  false ->
-		    [{MFA, Contract}|NewContracts]
+    fun(Label, Type, NewContracts) ->
+	case dialyzer_callgraph:lookup_name(Label, Callgraph) of
+	  {ok, {M,F,A} = MFA} ->
+	    case orddict:find(MFA, Contracts) of
+	      {ok, {_FileLine, Contract}} ->
+		case check_contract(Contract, Type) of
+		  ok ->
+		    case erl_bif_types:is_known(M, F, A) of
+		      true ->
+			%% Disregard the contracts since
+			%% this is a known function.
+			NewContracts;
+		      false ->
+			[{MFA, Contract}|NewContracts]
+		    end;
+		  {error, _Error} -> NewContracts
 		end;
-	      {error, _Error} -> NewContracts
+	      error -> NewContracts
 	    end;
 	  error -> NewContracts
 	end
@@ -187,8 +190,8 @@ check_contracts(Contracts, Callgraph, FunTypes) ->
 -spec check_contract(#contract{}, erl_types:erl_type()) -> 'ok' | {'error', term()}.
 
 check_contract(#contract{contracts = Contracts}, SuccType) ->
-  try 
-    Contracts1 = [{Contract, insert_constraints(Constraints, dict:new())} 
+  try
+    Contracts1 = [{Contract, insert_constraints(Constraints, dict:new())}
 		  || {Contract, Constraints} <- Contracts],
     Contracts2 = [erl_types:t_subst(Contract, Dict)
 		  || {Contract, Dict} <- Contracts1],
@@ -197,7 +200,7 @@ check_contract(#contract{contracts = Contracts}, SuccType) ->
       error ->
 	{error, {overlapping_contract, []}};
       ok ->
-	InfList = [erl_types:t_inf(Contract, SuccType, opaque) 
+	InfList = [erl_types:t_inf(Contract, SuccType, opaque)
 		   || Contract <- Contracts2],
 	case check_contract_inf_list(InfList, SuccType) of
 	  {error, _} = Invalid -> Invalid;
@@ -229,7 +232,7 @@ check_contract_inf_list([FunType|Left], SuccType) ->
       STRange = erl_types:t_fun_range(SuccType),
       case erl_types:t_is_none_or_unit(STRange) of
 	true -> ok;
-	false -> 
+	false ->
 	  Range = erl_types:t_fun_range(FunType),
 	  case erl_types:t_is_none(erl_types:t_inf(STRange, Range, opaque)) of
 	    true -> check_contract_inf_list(Left, SuccType);
@@ -261,9 +264,9 @@ check_extraneous_1(Contract, SuccType) ->
 
 process_contracts(OverContracts, Args) ->
   process_contracts(OverContracts, Args, erl_types:t_none()).
-  
+
 process_contracts([OverContract|Left], Args, AccRange) ->
-  NewAccRange = 
+  NewAccRange =
     case process_contract(OverContract, Args) of
       error -> AccRange;
       {ok, Range} -> erl_types:t_sup(AccRange, Range)
@@ -276,12 +279,12 @@ process_contracts([], _Args, AccRange) ->
 
 process_contract({Contract, Constraints}, CallTypes0) ->
   CallTypesFun = erl_types:t_fun(CallTypes0, erl_types:t_any()),
-  ContArgsFun = erl_types:t_fun(erl_types:t_fun_args(Contract), 
+  ContArgsFun = erl_types:t_fun(erl_types:t_fun_args(Contract),
 				erl_types:t_any()),
   ?debug("Instance: Contract:  ~s\n          Arguments: ~s\n",
-	 [erl_types:t_to_string(ContArgsFun), 
+	 [erl_types:t_to_string(ContArgsFun),
 	  erl_types:t_to_string(CallTypesFun)]),
-  case solve_constraints(ContArgsFun, CallTypesFun, Constraints) of 
+  case solve_constraints(ContArgsFun, CallTypesFun, Constraints) of
     {ok, VarDict} ->
       {ok, erl_types:t_subst(erl_types:t_fun_range(Contract), VarDict)};
     error -> error
@@ -291,7 +294,7 @@ solve_constraints(Contract, Call, Constraints) ->
   %% First make sure the call follows the constraints
   CDict = insert_constraints(Constraints, dict:new()),
   Contract1 = erl_types:t_subst(Contract, CDict),
-  %% Just a safe over-approximation. 
+  %% Just a safe over-approximation.
   %% TODO: Find the types for type variables properly
   ContrArgs = erl_types:t_fun_args(Contract1),
   CallArgs = erl_types:t_fun_args(Call),
@@ -312,7 +315,7 @@ solve_constraints(Contract, Call, Constraints) ->
 -spec contracts_without_fun(dict(), [_], dialyzer_callgraph:callgraph()) -> [dial_warning()].
 
 contracts_without_fun(Contracts, AllFuns0, Callgraph) ->
-  AllFuns1 = [{dialyzer_callgraph:lookup_name(Label, Callgraph), Arity} 
+  AllFuns1 = [{dialyzer_callgraph:lookup_name(Label, Callgraph), Arity}
 	      || {Label, Arity} <- AllFuns0],
   AllFuns2 = [{M, F, A} || {{ok, {M, F, _}}, A} <- AllFuns1],
   AllContractMFAs = dict:fetch_keys(Contracts),
@@ -354,9 +357,9 @@ contract_from_form(Forms, RecDict) ->
   {CFuns, Forms1} = contract_from_form(Forms, RecDict, [], []),
   #tmp_contract{contract_funs = CFuns, forms = Forms1}.
 
-contract_from_form([{type, _, 'fun', [_, _]} = Form | Left], RecDict, 
+contract_from_form([{type, _, 'fun', [_, _]} = Form | Left], RecDict,
 		   TypeAcc, FormAcc) ->
-  TypeFun = 
+  TypeFun =
     fun(ExpTypes, AllRecords) ->
 	Type = erl_types:t_from_form(Form, RecDict),
 	NewType = erl_types:t_solve_remote(Type, ExpTypes, AllRecords),
@@ -365,10 +368,10 @@ contract_from_form([{type, _, 'fun', [_, _]} = Form | Left], RecDict,
   NewTypeAcc = [TypeFun | TypeAcc],
   NewFormAcc = [{Form, []} | FormAcc],
   contract_from_form(Left, RecDict, NewTypeAcc, NewFormAcc);
-contract_from_form([{type, _L1, bounded_fun, 
+contract_from_form([{type, _L1, bounded_fun,
 		     [{type, _L2, 'fun', [_, _]} = Form, Constr]}| Left],
 		   RecDict, TypeAcc, FormAcc) ->
-  TypeFun = 
+  TypeFun =
     fun(ExpTypes, AllRecords) ->
 	Constr1 = [constraint_from_form(C, RecDict, ExpTypes, AllRecords)
                    || C <- Constr],
@@ -376,14 +379,14 @@ contract_from_form([{type, _L1, bounded_fun,
 	Type = erl_types:t_from_form(Form, RecDict, VarDict),
 	NewType = erl_types:t_solve_remote(Type, ExpTypes, AllRecords),
 	{NewType, Constr1}
-    end,  
+    end,
   NewTypeAcc = [TypeFun | TypeAcc],
   NewFormAcc = [{Form, Constr} | FormAcc],
   contract_from_form(Left, RecDict, NewTypeAcc, NewFormAcc);
-contract_from_form([], _RecDict, TypeAcc, FormAcc) -> 
+contract_from_form([], _RecDict, TypeAcc, FormAcc) ->
   {lists:reverse(TypeAcc), lists:reverse(FormAcc)}.
 
-constraint_from_form({type, _, constraint, [{atom, _, is_subtype}, 
+constraint_from_form({type, _, constraint, [{atom, _, is_subtype},
 					    [Type1, Type2]]}, RecDict,
                      ExpTypes, AllRecords) ->
   T1 = erl_types:t_from_form(Type1, RecDict),
@@ -396,7 +399,7 @@ constraint_from_form({type, _, constraint, [{atom,_,Name}, List]}, _RecDict,
   N = length(List),
   throw({error, io_lib:format("Unsupported type guard ~w/~w\n", [Name, N])}).
 
-%% Gets the most general domain of a list of domains of all 
+%% Gets the most general domain of a list of domains of all
 %% the overloaded contracts
 
 general_domain(List) ->
@@ -425,7 +428,7 @@ get_invalid_contract_warnings_modules([Mod|Mods], CodeServer, Plt, Acc) ->
 get_invalid_contract_warnings_modules([], _CodeServer, _Plt, Acc) ->
   Acc.
 
-get_invalid_contract_warnings_funs([{MFA, {FileLine, Contract}}|Left], 
+get_invalid_contract_warnings_funs([{MFA, {FileLine, Contract}}|Left],
 				   Plt, RecDict, Acc) ->
   case dialyzer_plt:lookup(Plt, MFA) of
     none ->
@@ -453,15 +456,15 @@ get_invalid_contract_warnings_funs([{MFA, {FileLine, Contract}}|Left],
 		BifRet = erl_bif_types:type(M, F, A),
 		BifSig = erl_types:t_fun(BifArgs, BifRet),
 		case check_contract(Contract, BifSig) of
-		  {error, _} -> 
+		  {error, _} ->
 		    [invalid_contract_warning(MFA, FileLine, BifSig, RecDict)
 		     |Acc];
 		  ok ->
-		    picky_contract_check(CSig, BifSig, MFA, FileLine, 
+		    picky_contract_check(CSig, BifSig, MFA, FileLine,
 					 Contract, RecDict, Acc)
 		end;
 	      false ->
-		picky_contract_check(CSig, Sig, MFA, FileLine, Contract, 
+		picky_contract_check(CSig, Sig, MFA, FileLine, Contract,
 				     RecDict, Acc)
 	    end
 	end,
@@ -485,12 +488,12 @@ picky_contract_check(CSig0, Sig0, MFA, FileLine, Contract, RecDict, Acc) ->
   Sig = erl_types:t_abstract_records(Sig0, RecDict),
   case erl_types:t_is_equal(CSig, Sig) of
     true -> Acc;
-    false -> 
+    false ->
       case (erl_types:t_is_none(erl_types:t_fun_range(Sig)) andalso
 	    erl_types:t_is_unit(erl_types:t_fun_range(CSig))) of
 	true -> Acc;
 	false ->
-	  case extra_contract_warning(MFA, FileLine, Contract, 
+	  case extra_contract_warning(MFA, FileLine, Contract,
 				      CSig, Sig, RecDict) of
 	    no_warning -> Acc;
 	    {warning, Warning} -> [Warning|Acc]
@@ -509,16 +512,16 @@ extra_contract_warning({M, F, A}, FileLine, Contract, CSig, Sig, RecDict) ->
       ContractString = contract_to_string(Contract),
       {Tag, Msg} =
 	case erl_types:t_is_subtype(CSig, Sig) of
-	  true -> 
-	    {?WARN_CONTRACT_SUBTYPE, 
+	  true ->
+	    {?WARN_CONTRACT_SUBTYPE,
 	     {contract_subtype, [M, F, A, ContractString, SigString]}};
 	  false ->
 	    case erl_types:t_is_subtype(Sig, CSig) of
 	      true ->
-		{?WARN_CONTRACT_SUPERTYPE, 
+		{?WARN_CONTRACT_SUPERTYPE,
 		 {contract_supertype, [M, F, A, ContractString, SigString]}};
 	      false ->
-		{?WARN_CONTRACT_NOT_EQUAL, 
+		{?WARN_CONTRACT_NOT_EQUAL,
 		 {contract_diff, [M, F, A, ContractString, SigString]}}
 	    end
 	end,
diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index a3c7114ee1..2ffbcd3e82 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -21,7 +21,7 @@
 %%%-------------------------------------------------------------------
 %%% File    : dialyzer_dataflow.erl
 %%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created : 19 Apr 2005 by Tobias Lindahl <[email protected]>
 %%%-------------------------------------------------------------------
@@ -30,6 +30,7 @@
 
 -export([get_fun_types/4, get_warnings/5, format_args/3]).
 
+%% Data structure interfaces.
 -export([state__add_warning/2, state__cleanup/1,
          state__get_callgraph/1, state__get_races/1,
          state__get_records/1, state__put_callgraph/2,
@@ -42,7 +43,7 @@
 
 -include("dialyzer.hrl").
 
--import(erl_types, 
+-import(erl_types,
 	[any_none/1, t_any/0, t_atom/0, t_atom/1, t_atom_vals/1,
 	 t_binary/0, t_boolean/0,
 	 t_bitstr/0, t_bitstr/2, t_bitstr_concat/1, t_bitstr_match/2,
@@ -90,14 +91,15 @@
 		fun_tab		     :: dict(),
 		plt		     :: dialyzer_plt:plt(),
 		opaques              :: [erl_types:erl_type()],
-		races                :: dialyzer_races:races(),
-		records              :: dict(),
+		races = dialyzer_races:new() :: dialyzer_races:races(),
+		records = dict:new() :: dict(),
 		tree_map	     :: dict(),
 		warning_mode = false :: boolean(),
 		warnings = []        :: [dial_warning()],
 		work                 :: {[_], [_], set()},
 		module               :: module(),
-		behaviour_api_info = [] :: [{atom(),[_]}]}).
+		behaviour_api_dict = [] ::
+		  dialyzer_behaviours:behaviour_api_dict()}).
 
 %% Exported Types
 
@@ -165,20 +167,20 @@ get_top_level_signatures(Code, Records) ->
 				error ->
 				  Arity = cerl:fname_arity(V),
 				  Type = t_fun(lists:duplicate(Arity,
-							       t_none()), 
+							       t_none()),
 					       t_none()),
 				  dict:store(Label, Type, Acc);
 				{ok, _} -> Acc
 			      end
 			  end, FunTypes, cerl:module_defs(Tree)),
   dialyzer_callgraph:delete(Callgraph),
-  Sigs = [{{cerl:fname_id(V), cerl:fname_arity(V)}, 
-	   dict:fetch(get_label(F), FunTypes1)} 
+  Sigs = [{{cerl:fname_id(V), cerl:fname_arity(V)},
+	   dict:fetch(get_label(F), FunTypes1)}
 	  || {V, F} <- cerl:module_defs(Tree)],
   ordsets:from_list(Sigs).
 
 get_def_plt() ->
-  try 
+  try
     dialyzer_plt:from_file(dialyzer_plt:get_default_plt())
   catch
     throw:{dialyzer_error, _} -> dialyzer_plt:new()
@@ -204,7 +206,7 @@ annotate_module(Code, Plt) ->
 annotate(Tree, State) ->
   case cerl:subtrees(Tree) of
     [] -> set_type(Tree, State);
-    List -> 
+    List ->
       NewSubTrees = [[annotate(Subtree, State) || Subtree <- Group]
 		     || Group <- List],
       NewTree = cerl:update_tree(Tree, NewSubTrees),
@@ -216,9 +218,9 @@ set_type(Tree, State) ->
     'fun' ->
       Type = state__fun_type(Tree, State),
       case t_is_any(Type) of
-	true -> 
+	true ->
 	  cerl:set_ann(Tree, delete_ann(typesig, cerl:get_ann(Tree)));
-	false -> 
+	false ->
 	  cerl:set_ann(Tree, append_ann(typesig, Type, cerl:get_ann(Tree)))
       end;
     apply ->
@@ -226,10 +228,10 @@ set_type(Tree, State) ->
 	unknown -> Tree;
 	ReturnType ->
 	  case t_is_any(ReturnType) of
-	    true -> 
+	    true ->
 	      cerl:set_ann(Tree, delete_ann(type, cerl:get_ann(Tree)));
-	    false -> 
-	      cerl:set_ann(Tree, append_ann(type, ReturnType, 
+	    false ->
+	      cerl:set_ann(Tree, append_ann(type, ReturnType,
 					    cerl:get_ann(Tree)))
 	  end
       end;
@@ -238,7 +240,7 @@ set_type(Tree, State) ->
   end.
 
 append_ann(Tag, Val, [X | Xs]) ->
-  if tuple_size(X) >= 1, element(1, X) =:= Tag -> 
+  if tuple_size(X) >= 1, element(1, X) =:= Tag ->
       append_ann(Tag, Val, Xs);
      true ->
       [X | append_ann(Tag, Val, Xs)]
@@ -247,7 +249,7 @@ append_ann(Tag, Val, []) ->
   [{Tag, Val}].
 
 delete_ann(Tag, [X | Xs]) ->
-  if tuple_size(X) >= 1, element(1, X) =:= Tag -> 
+  if tuple_size(X) >= 1, element(1, X) =:= Tag ->
       delete_ann(Tag, Xs);
      true ->
       [X | delete_ann(Tag, Xs)]
@@ -316,21 +318,21 @@ analyze_loop(#state{callgraph = Callgraph, races = Races} = State) ->
     {Fun, NewState} ->
       ArgTypes = state__get_args(Fun, NewState),
       case any_none(ArgTypes) of
-	true -> 
-	  ?debug("Not handling1 ~w: ~s\n", 
-		 [state__lookup_name(get_label(Fun), State), 
+	true ->
+	  ?debug("Not handling1 ~w: ~s\n",
+		 [state__lookup_name(get_label(Fun), State),
 		  t_to_string(t_product(ArgTypes))]),
 	  analyze_loop(NewState);
-	false -> 
+	false ->
 	  case state__fun_env(Fun, NewState) of
-	    none -> 
-	      ?debug("Not handling2 ~w: ~s\n", 
-		     [state__lookup_name(get_label(Fun), State), 
+	    none ->
+	      ?debug("Not handling2 ~w: ~s\n",
+		     [state__lookup_name(get_label(Fun), State),
 		      t_to_string(t_product(ArgTypes))]),
 	      analyze_loop(NewState);
 	    Map ->
-	      ?debug("Handling fun ~p: ~s\n", 
-		     [state__lookup_name(get_label(Fun), State), 
+	      ?debug("Handling fun ~p: ~s\n",
+		     [state__lookup_name(get_label(Fun), State),
 		      t_to_string(state__fun_type(Fun, NewState))]),
 	      NewState1 = state__mark_fun_as_handled(NewState, Fun),
 	      Vars = cerl:fun_vars(Fun),
@@ -341,19 +343,19 @@ analyze_loop(#state{callgraph = Callgraph, races = Races} = State) ->
               RaceAnalysis = dialyzer_races:get_race_analysis(Races),
               NewState3 =
                 case RaceDetection andalso RaceAnalysis of
-                  true ->             
+                  true ->
                     NewState2 = state__renew_curr_fun(
                       state__lookup_name(FunLabel, NewState1), FunLabel,
                       NewState1),
                     state__renew_race_list([], 0, NewState2);
 		  false -> NewState1
                 end,
-	      {NewState4, _Map2, BodyType} = 
+	      {NewState4, _Map2, BodyType} =
 		traverse(Body, Map1, NewState3),
-	      ?debug("Done analyzing: ~w:~s\n", 
+	      ?debug("Done analyzing: ~w:~s\n",
 		     [state__lookup_name(get_label(Fun), State),
 		      t_to_string(t_fun(ArgTypes, BodyType))]),
-              NewState5 = 
+              NewState5 =
                 case RaceDetection andalso RaceAnalysis of
                   true ->
 		    Races1 = NewState4#state.races,
@@ -384,7 +386,7 @@ traverse(Tree, Map, State) ->
       %% This only happens when checking for illegal record patterns
       %% so the handling is a bit rudimentary.
       traverse(cerl:alias_pat(Tree), Map, State);
-    apply -> 
+    apply ->
       handle_apply(Tree, Map, State);
     binary ->
       Segs = cerl:binary_segments(Tree),
@@ -418,7 +420,7 @@ traverse(Tree, Map, State) ->
       %% By not including the variables in scope we can assure that we
       %% will get the current function type when using the variables.
       FoldFun = fun({Var, Fun}, {AccState, AccMap}) ->
-		    {NewAccState, NewAccMap0, FunType} = 
+		    {NewAccState, NewAccMap0, FunType} =
 		      traverse(Fun, AccMap, AccState),
 		    NewAccMap = enter_type(Var, FunType, NewAccMap0),
 		    {NewAccState, NewAccMap}
@@ -430,7 +432,7 @@ traverse(Tree, Map, State) ->
       case cerl:unfold_literal(Tree) of
 	Tree ->
 	  Type = literal_type(Tree),
-	  NewType = 
+	  NewType =
 	    case erl_types:t_opaque_match_atom(Type, State#state.opaques) of
 	      [Opaque] -> Opaque;
 	      _ -> Type
@@ -448,8 +450,8 @@ traverse(Tree, Map, State) ->
 	  bs_init_writable -> t_from_term(<<>>);
 	  Other -> erlang:error({'Unsupported primop', Other})
 	end,
-      {State, Map, Type};      
-    'receive' -> 
+      {State, Map, Type};
+    'receive' ->
       handle_receive(Tree, Map, State);
     seq ->
       Arg = cerl:seq_arg(Tree),
@@ -459,13 +461,13 @@ traverse(Tree, Map, State) ->
 	true ->
 	  SMA;
 	false ->
-	  State2 = 
+	  State2 =
 	    case (t_is_any(ArgType) orelse t_is_simple(ArgType)
 		                    orelse is_call_to_send(Arg)) of
 	      true -> % do not warn in these cases
 		State1;
 	      false ->
-		state__add_warning(State1, ?WARN_UNMATCHED_RETURN, Arg, 
+		state__add_warning(State1, ?WARN_UNMATCHED_RETURN, Arg,
 				   {unmatched_return,
 				    [format_type(ArgType, State1)]})
 	    end,
@@ -483,12 +485,12 @@ traverse(Tree, Map, State) ->
     var ->
       ?debug("Looking up unknown variable: ~p\n", [Tree]),
       case state__lookup_type_for_rec_var(Tree, State) of
-	error -> 
+	error ->
 	  LType = lookup_type(Tree, Map),
 	  Opaques = State#state.opaques,
 	  case t_opaque_match_record(LType, Opaques) of
 	    [Opaque] -> {State, Map, Opaque};
-	    _ -> 
+	    _ ->
 	      case t_opaque_match_atom(LType, Opaques) of
 		[Opaque] -> {State, Map, Opaque};
 		_ -> {State, Map, LType}
@@ -508,7 +510,7 @@ traverse_list([Tree|Tail], Map, State, Acc) ->
   traverse_list(Tail, Map1, State1, [Type|Acc]);
 traverse_list([], Map, State, Acc) ->
   {State, Map, lists:reverse(Acc)}.
-  
+
 %%________________________________________
 %%
 %% Special instructions
@@ -520,7 +522,7 @@ handle_apply(Tree, Map, State) ->
   {State1, Map1, ArgTypes} = traverse_list(Args, Map, State),
   {State2, Map2, OpType} = traverse(Op, Map1, State1),
   case any_none(ArgTypes) of
-    true -> 
+    true ->
       {State2, Map2, t_none()};
     false ->
       {CallSitesKnown, FunList} =
@@ -535,7 +537,7 @@ handle_apply(Tree, Map, State) ->
 	  OpType1 = t_inf(OpType, t_fun(Arity, t_any())),
 	  case t_is_none(OpType1) of
 	    true ->
-	      Msg = {fun_app_no_fun, 
+	      Msg = {fun_app_no_fun,
 		     [format_cerl(Op), format_type(OpType, State2), Arity]},
 	      State3 = state__add_warning(State2, ?WARN_FAILING_CALL,
 					  Tree, Msg),
@@ -543,7 +545,7 @@ handle_apply(Tree, Map, State) ->
 	    false ->
 	      NewArgs = t_inf_lists(ArgTypes, t_fun_args(OpType1)),
 	      case any_none(NewArgs) of
-		true -> 
+		true ->
 		  Msg = {fun_app_args,
 			 [format_args(Args, ArgTypes, State),
 			  format_type(OpType, State)]},
@@ -556,7 +558,7 @@ handle_apply(Tree, Map, State) ->
 	      end
 	  end;
 	true ->
-	  FunInfoList = [{local, state__fun_info(Fun, State)} 
+	  FunInfoList = [{local, state__fun_info(Fun, State)}
 			 || Fun <- FunList],
 	  handle_apply_or_call(FunInfoList, Args, ArgTypes, Map2, Tree, State1)
       end
@@ -564,7 +566,7 @@ handle_apply(Tree, Map, State) ->
 
 handle_apply_or_call(FunInfoList, Args, ArgTypes, Map, Tree, State) ->
   None = t_none(),
-  handle_apply_or_call(FunInfoList, Args, ArgTypes, Map, Tree, State, 
+  handle_apply_or_call(FunInfoList, Args, ArgTypes, Map, Tree, State,
 		       [None || _ <- ArgTypes], None).
 
 handle_apply_or_call([{local, external}|Left], Args, ArgTypes, Map, Tree, State,
@@ -579,7 +581,7 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
   Any = t_any(),
   AnyArgs = [Any || _ <- Args],
   GenSig = {AnyArgs, fun(_) -> t_any() end},
-  {CArgs, CRange} = 
+  {CArgs, CRange} =
     case Contr of
       {value, #contract{args = As} = C} ->
 	{As, fun(FunArgs) ->
@@ -629,9 +631,9 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
 	end
     end,
   ArgModeMask = [case lists:member(Arg, Opaques) of
-	       true -> opaque;
-	       false -> structured
-	     end || Arg <- ArgTypes],
+                   true -> opaque;
+                   false -> structured
+                 end || Arg <- ArgTypes],
   NewArgsSig = t_inf_lists_masked(SigArgs, ArgTypes, ArgModeMask),
   NewArgsContract = t_inf_lists_masked(CArgs, ArgTypes, ArgModeMask),
   NewArgsBif = t_inf_lists_masked(BifArgs, ArgTypes, ArgModeMask),
@@ -639,7 +641,7 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
   NewArgTypes = t_inf_lists_masked(NewArgTypes0, NewArgsBif, ArgModeMask),
   BifRet = BifRange(NewArgTypes),
   {TmpArgTypes, TmpArgsContract} =
-    case (TypeOfApply == remote) andalso (not IsBIF) of
+    case (TypeOfApply =:= remote) andalso (not IsBIF) of
       true ->
 	List1 = lists:zip(CArgs, NewArgTypes),
 	List2 = lists:zip(CArgs, NewArgsContract),
@@ -650,16 +652,17 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
       false  -> {NewArgTypes, NewArgsContract}
     end,
   ContrRet = CRange(TmpArgTypes),
-  RetMode = case t_contains_opaque(ContrRet) orelse t_contains_opaque(BifRet) of
-	   true  -> opaque;
-	   false -> structured
-	 end,
+  RetMode =
+    case t_contains_opaque(ContrRet) orelse t_contains_opaque(BifRet) of
+      true  -> opaque;
+      false -> structured
+    end,
   RetWithoutLocal = t_inf(t_inf(ContrRet, BifRet, RetMode), SigRange, RetMode),
   ?debug("--------------------------------------------------------\n", []),
   ?debug("Fun: ~p\n", [Fun]),
   ?debug("Args: ~s\n", [erl_types:t_to_string(t_product(ArgTypes))]),
   ?debug("NewArgsSig: ~s\n", [erl_types:t_to_string(t_product(NewArgsSig))]),
-  ?debug("NewArgsContract: ~s\n", 
+  ?debug("NewArgsContract: ~s\n",
 	 [erl_types:t_to_string(t_product(NewArgsContract))]),
   ?debug("NewArgsBif: ~s\n", [erl_types:t_to_string(t_product(NewArgsBif))]),
   ?debug("NewArgTypes: ~s\n", [erl_types:t_to_string(t_product(NewArgTypes))]),
@@ -679,11 +682,11 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
 	%%               respective callback module's function.
 
 	Module = State#state.module,
-	BehApiInfo = State#state.behaviour_api_info,
+	BehApiDict = State#state.behaviour_api_dict,
 	{RealFun, RealArgTypes, RealArgs} =
 	  case dialyzer_behaviours:translate_behaviour_api_call(Fun, ArgTypes,
 								Args, Module,
-								BehApiInfo) of
+								BehApiDict) of
 	    plain_call    -> {Fun, ArgTypes, Args};
 	    BehaviourAPI  -> BehaviourAPI
 	  end,
@@ -700,10 +703,10 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
 	FailedSig = any_none(NewArgsSig),
 	FailedContract = any_none([CRange(TmpArgsContract)|NewArgsContract]),
 	FailedBif = any_none([BifRange(NewArgsBif)|NewArgsBif]),
-	InfSig = t_inf(t_fun(SigArgs, SigRange), 
+	InfSig = t_inf(t_fun(SigArgs, SigRange),
 		       t_fun(BifArgs, BifRange(BifArgs))),
 	FailReason = apply_fail_reason(FailedSig, FailedBif, FailedContract),
-        Msg = get_apply_fail_msg(Fun, Args, ArgTypes, NewArgTypes, InfSig, 
+        Msg = get_apply_fail_msg(Fun, Args, ArgTypes, NewArgTypes, InfSig,
 				 Contr, CArgs, State1, FailReason),
 	WarnType = case Msg of
 		     {call, _} -> ?WARN_FAILING_CALL;
@@ -727,15 +730,15 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
       remote ->
         add_bif_warnings(Fun, NewArgTypes, Tree, State2)
     end,
-  NewAccArgTypes = 
+  NewAccArgTypes =
     case FailedConj of
       true -> AccArgTypes;
       false -> [t_sup(X, Y) || {X, Y} <- lists:zip(NewArgTypes, AccArgTypes)]
     end,
   NewAccRet = t_sup(AccRet, t_inf(RetWithoutLocal, LocalRet, opaque)),
-  handle_apply_or_call(Left, Args, ArgTypes, Map, Tree, 
+  handle_apply_or_call(Left, Args, ArgTypes, Map, Tree,
 		       State3, NewAccArgTypes, NewAccRet);
-handle_apply_or_call([], Args, _ArgTypes, Map, _Tree, State, 
+handle_apply_or_call([], Args, _ArgTypes, Map, _Tree, State,
 		     AccArgTypes, AccRet) ->
   NewMap = enter_type_lists(Args, AccArgTypes, Map),
   {State, NewMap, AccRet}.
@@ -747,13 +750,13 @@ apply_fail_reason(FailedSig, FailedBif, FailedContract) ->
     true                                                      -> both
   end.
 
-get_apply_fail_msg(Fun, Args, ArgTypes, NewArgTypes, 
+get_apply_fail_msg(Fun, Args, ArgTypes, NewArgTypes,
 		   Sig, Contract, ContrArgs, State, FailReason) ->
   ArgStrings = format_args(Args, ArgTypes, State),
   ContractInfo =
     case Contract of
       {value, #contract{} = C} ->
-	{dialyzer_contracts:is_overloaded(C), 
+	{dialyzer_contracts:is_overloaded(C),
 	 dialyzer_contracts:contract_to_string(C)};
       none -> {false, none}
     end,
@@ -767,7 +770,7 @@ get_apply_fail_msg(Fun, Args, ArgTypes, NewArgTypes,
     {M, F, _A} ->
       case is_opaque_type_test_problem(Fun, NewArgTypes, State) of
 	true ->
-	  [Opaque] = NewArgTypes, 
+	  [Opaque] = NewArgTypes,
 	  {opaque_type_test, [atom_to_list(F), erl_types:t_to_string(Opaque)]};
 	false ->
 	  SigArgs = t_fun_args(Sig),
@@ -791,7 +794,7 @@ get_apply_fail_msg(Fun, Args, ArgTypes, NewArgTypes,
 		  {call_without_opaque, [M, F, ArgStrings, ExpectedTriples]};
 		false -> %% there is a structured term clash in some argument
 		  {call, [M, F, ArgStrings,
-			  ArgNs, FailReason, 
+			  ArgNs, FailReason,
 			  format_sig_args(Sig, State),
 			  format_type(t_fun_range(Sig), State),
 			  ContractInfo]}
@@ -799,8 +802,8 @@ get_apply_fail_msg(Fun, Args, ArgTypes, NewArgTypes,
 	  end
       end;
     Label when is_integer(Label) ->
-      {apply, [ArgStrings, 
-	       ArgNs, FailReason, 
+      {apply, [ArgStrings,
+	       ArgNs, FailReason,
 	       format_sig_args(Sig, State),
 	       format_type(t_fun_range(Sig), State),
 	       ContractInfo]}
@@ -828,7 +831,7 @@ is_opaque_type_test_problem(Fun, ArgTypes, State) ->
 			 FN =:= is_number;    FN =:= is_pid; FN =:= is_port;
 			 FN =:= is_reference; FN =:= is_tuple ->
       [Type] = ArgTypes,
-      erl_types:t_is_opaque(Type) andalso 
+      erl_types:t_is_opaque(Type) andalso
 	not lists:member(Type, State#state.opaques);
     _ -> false
   end.
@@ -1045,7 +1048,7 @@ handle_cons(Tree, Map, State) ->
   Tl = cerl:cons_tl(Tree),
   {State1, Map1, HdType} = traverse(Hd, Map, State),
   {State2, Map2, TlType} = traverse(Tl, Map1, State1),
-  State3 = 
+  State3 =
     case t_is_none(t_inf(TlType, t_list())) of
       true ->
 	Msg = {improper_list_constr, [format_type(TlType, State2)]},
@@ -1090,7 +1093,7 @@ handle_let(Tree, Map, #state{callgraph = Callgraph, races = Races} = State) ->
         case cerl:is_literal(Mod) andalso
              cerl:concrete(Mod) =:= ets andalso
              cerl:is_literal(Name) andalso
-             cerl:concrete(Name) =:= new of            
+             cerl:concrete(Name) =:= new of
           true ->
             NewTable = dialyzer_races:get_new_table(State1#state.races),
             renew_public_tables(Vars, NewTable,
@@ -1114,7 +1117,7 @@ handle_module(Tree, Map, State) ->
   %% By not including the variables in scope we can assure that we
   %% will get the current function type when using the variables.
   Defs = cerl:module_defs(Tree),
-  PartFun = fun({_Var, Fun}) -> 
+  PartFun = fun({_Var, Fun}) ->
 		state__is_escaping(get_label(Fun), State)
 	    end,
   {Defs1, Defs2} = lists:partition(PartFun, Defs),
@@ -1145,12 +1148,12 @@ handle_receive(Tree, Map,
                                RaceListSize + 1, State);
       false -> State
     end,
-  {MapList, State2, ReceiveType} = 
+  {MapList, State2, ReceiveType} =
     handle_clauses(Clauses, ?no_arg, t_any(), t_any(), State1, [], Map,
                    [], []),
   Map1 = join_maps(MapList, Map),
   {State3, Map2, TimeoutType} = traverse(Timeout, Map1, State2),
-  case (t_is_atom(TimeoutType) andalso 
+  case (t_is_atom(TimeoutType) andalso
 	(t_atom_vals(TimeoutType) =:= ['infinity'])) of
     true ->
       {State3, Map2, ReceiveType};
@@ -1170,17 +1173,17 @@ handle_try(Tree, Map, State) ->
   Vars = cerl:try_vars(Tree),
   Body = cerl:try_body(Tree),
   Handler = cerl:try_handler(Tree),
-  {State1, Map1, ArgType} = traverse(Arg, Map, State),      
+  {State1, Map1, ArgType} = traverse(Arg, Map, State),
   Map2 = mark_as_fresh(Vars, Map1),
   {SuccState, SuccMap, SuccType} =
     case bind_pat_vars(Vars, t_to_tlist(ArgType), [], Map2, State1) of
       {error, _, _, _, _} ->
 	{State1, map__new(), t_none()};
       {SuccMap1, VarTypes} ->
-	%% Try to bind the argument. Will only succeed if 
+	%% Try to bind the argument. Will only succeed if
 	%% it is a simple structured term.
 	SuccMap2 =
-	  case bind_pat_vars_reverse([Arg], [t_product(VarTypes)], [], 
+	  case bind_pat_vars_reverse([Arg], [t_product(VarTypes)], [],
 				     SuccMap1, State1) of
 	    {error, _, _, _, _} -> SuccMap1;
 	    {SM, _} -> SM
@@ -1214,10 +1217,10 @@ handle_tuple(Tree, Map, State) ->
 		  RecFields = t_tuple_args(RecStruct),
 		  case bind_pat_vars(Elements, RecFields, [], Map1, State1) of
 		    {error, _, ErrorPat, ErrorType, _} ->
-		      Msg = {record_constr, 
+		      Msg = {record_constr,
 			     [TagVal, format_patterns(ErrorPat),
 			      format_type(ErrorType, State1)]},
-		      State2 = state__add_warning(State1, ?WARN_MATCHING, 
+		      State2 = state__add_warning(State1, ?WARN_MATCHING,
 						  Tree, Msg),
 		      {State2, Map1, t_none()};
 		    {Map2, _ETypes} ->
@@ -1226,26 +1229,24 @@ handle_tuple(Tree, Map, State) ->
 		_ ->
 		  case state__lookup_record(TagVal, length(Left), State1) of
 		    error -> {State1, Map1, TupleType};
-		    {ok, Prototype} ->
-		      %% io:format("In handle_tuple:\n  Prototype = ~p\n", [Prototype]),
-		      InfTupleType = t_inf(Prototype, TupleType),
-		      %% io:format("  TupleType = ~p,\n  Inf = ~p\n", [TupleType, InfTupleType]),
+		    {ok, RecType} ->
+		      InfTupleType = t_inf(RecType, TupleType),
 		      case t_is_none(InfTupleType) of
 			true ->
-			  Msg = {record_constr, 
-				 [format_type(TupleType, State1), TagVal]},
-			  State2 = state__add_warning(State1, ?WARN_MATCHING, 
+			  RecC = format_type(TupleType, State1),
+			  FieldDiffs = format_field_diffs(TupleType, State1),
+			  Msg = {record_constr, [RecC, FieldDiffs]},
+			  State2 = state__add_warning(State1, ?WARN_MATCHING,
 						      Tree, Msg),
 			  {State2, Map1, t_none()};
 			false ->
-			  case bind_pat_vars(Elements, t_tuple_args(Prototype),
+			  case bind_pat_vars(Elements, t_tuple_args(RecType),
 					     [], Map1, State1) of
 			    {error, bind, ErrorPat, ErrorType, _} ->
-			      %% io:format("error\n", []),
-			      Msg = {record_constr, 
+			      Msg = {record_constr,
 				     [TagVal, format_patterns(ErrorPat),
 				      format_type(ErrorType, State1)]},
-			      State2 = state__add_warning(State1, ?WARN_MATCHING, 
+			      State2 = state__add_warning(State1, ?WARN_MATCHING,
 							  Tree, Msg),
 			      {State2, Map1, t_none()};
 			    {Map2, ETypes} ->
@@ -1307,7 +1308,7 @@ handle_clauses([C|Left], Arg, ArgType, OrigArgType,
 handle_clauses([], _Arg, _ArgType, _OrigArgType,
 	       #state{callgraph = Callgraph, races = Races} = State,
                CaseTypes, _MapIn, Acc, ClauseAcc) ->
-  State1 = 
+  State1 =
     case dialyzer_callgraph:get_race_detection(Callgraph) andalso
          dialyzer_races:get_race_analysis(Races) of
       true ->
@@ -1315,7 +1316,7 @@ handle_clauses([], _Arg, _ArgType, _OrigArgType,
           [dialyzer_races:end_case_new(ClauseAcc)|
            dialyzer_races:get_race_list(Races)],
           dialyzer_races:get_race_list_size(Races) + 1, State);
-      false -> State 
+      false -> State
     end,
   {lists:reverse(Acc), State1, t_sup(CaseTypes)}.
 
@@ -1326,7 +1327,7 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
   Body = cerl:clause_body(C),
   RaceDetection = dialyzer_callgraph:get_race_detection(Callgraph),
   RaceAnalysis = dialyzer_races:get_race_analysis(Races),
-  State1 = 
+  State1 =
     case RaceDetection andalso RaceAnalysis of
       true ->
         state__renew_fun_args(Pats, State);
@@ -1341,7 +1342,7 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
       true ->
 	{error, bind, Pats, ArgType0, ArgType0};
       false ->
-	ArgTypes = 
+	ArgTypes =
 	  case t_is_any(ArgType0) of
 	    true -> [ArgType0 || _ <- Pats];
 	    false -> t_to_tlist(ArgType0)
@@ -1350,7 +1351,7 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
     end,
   case BindRes of
     {error, BindOrOpaque, NewPats, Type, OpaqueTerm} ->
-      ?debug("Failed binding pattern: ~s\nto ~s\n", 
+      ?debug("Failed binding pattern: ~s\nto ~s\n",
 	     [cerl_prettypr:format(C), format_type(ArgType0, State1)]),
       case state__warning_mode(State1) of
         false ->
@@ -1361,7 +1362,7 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
 	      bind   -> format_patterns(Pats);
 	      opaque -> format_patterns(NewPats)
 	    end,
-	  {Msg, Force} = 
+	  {Msg, Force} =
 	    case t_is_none(ArgType0) of
 	      true ->
 		PatTypes = [PatString, format_type(OrigArgType, State1)],
@@ -1377,13 +1378,13 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
 		  {_, _} -> {{pattern_match_cov, PatTypes}, false}
 		end;
 	      false ->
-		%% Try to find out if this is a default clause in a list 
+		%% Try to find out if this is a default clause in a list
 		%% comprehension and supress this. A real Hack(tm)
 		Force0 =
 		  case is_compiler_generated(cerl:get_ann(C)) of
 		    true ->
 		      case Pats of
-			[Pat] -> 
+			[Pat] ->
 			  case cerl:is_c_cons(Pat) of
 			    true ->
 			      not (cerl:is_c_var(cerl:cons_hd(Pat)) andalso
@@ -1400,9 +1401,9 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
 		  end,
 		PatTypes = case BindOrOpaque of
 			     bind -> [PatString, format_type(ArgType0, State1)];
-			     opaque -> [PatString, format_type(Type, State1), 
+			     opaque -> [PatString, format_type(Type, State1),
 					format_type(OpaqueTerm, State1)]
-			      end,					
+			      end,
 		FailedMsg = case BindOrOpaque of
 			      bind  -> {pattern_match, PatTypes};
 			      opaque -> {opaque_match, PatTypes}
@@ -1422,9 +1423,9 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
 	case Arg =:= ?no_arg of
 	  true -> Map2;
 	  false ->
-	    %% Try to bind the argument. Will only succeed if 
+	    %% Try to bind the argument. Will only succeed if
 	    %% it is a simple structured term.
-	    case bind_pat_vars_reverse([Arg], [t_product(PatTypes)], 
+	    case bind_pat_vars_reverse([Arg], [t_product(PatTypes)],
 				       [], Map2, State1) of
 	      {error, _, _, _, _} -> Map2;
 	      {NewMap, _} -> NewMap
@@ -1438,11 +1439,11 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
 	    t_subtract(t_product(t_to_tlist(ArgType0)), GenType)
 	end,
       case bind_guard(Guard, Map3, State1) of
-	{error, Reason} -> 
-	  ?debug("Failed guard: ~s\n", 
+	{error, Reason} ->
+	  ?debug("Failed guard: ~s\n",
 		 [cerl_prettypr:format(C, [{hook, cerl_typean:pp_hook()}])]),
 	  PatString = format_patterns(Pats),
-	  DefaultMsg = 
+	  DefaultMsg =
 	    case Pats =:= [] of
 	      true -> {guard_fail, []};
 	      false ->
@@ -1456,6 +1457,7 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
 		  false ->
 		    WarnType = case Msg of
 				 {guard_fail, _} -> ?WARN_MATCHING;
+				 {neg_guard_fail, _} -> ?WARN_MATCHING;
 				 {opaque_guard, _} -> ?WARN_OPAQUE
 			       end,
 		    state__add_warning(State1, WarnType, FailGuard, Msg);
@@ -1472,7 +1474,7 @@ do_clause(C, Arg, ArgType0, OrigArgType, Map,
 
 bind_subst(Arg, Pats, Map) ->
   case cerl:type(Arg) of
-    values -> 
+    values ->
       bind_subst_list(cerl:values_es(Arg), Pats, Map);
     var ->
       [Pat] = Pats,
@@ -1501,16 +1503,16 @@ bind_subst_list([], [], Map) ->
 %%
 
 bind_pat_vars(Pats, Types, Acc, Map, State) ->
-  try 
+  try
     bind_pat_vars(Pats, Types, Acc, Map, State, false)
-  catch 
+  catch
     throw:Error -> Error % Error = {error, bind | opaque, ErrorPats, ErrorType}
   end.
 
 bind_pat_vars_reverse(Pats, Types, Acc, Map, State) ->
-  try 
+  try
     bind_pat_vars(Pats, Types, Acc, Map, State, true)
-  catch 
+  catch
     throw:Error -> Error % Error = {error, bind | opaque, ErrorPats, ErrorType}
   end.
 
@@ -1522,7 +1524,7 @@ bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
 	AliasPat = cerl:alias_pat(Pat),
 	Var = cerl:alias_var(Pat),
 	Map1 = enter_subst(Var, AliasPat, Map),
-	{Map2, [PatType]} = bind_pat_vars([AliasPat], [Type], [], 
+	{Map2, [PatType]} = bind_pat_vars([AliasPat], [Type], [],
 					  Map1, State, Rev),
 	{enter_type(Var, PatType, Map2), PatType};
       binary ->
@@ -1543,18 +1545,18 @@ bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
       cons ->
 	Cons = t_inf(Type, t_cons()),
 	case t_is_none(Cons) of
-	  true -> 
+	  true ->
 	    bind_opaque_pats(t_cons(), Type, Pat, Map, State, Rev);
 	  false ->
-	    {Map1, [HdType, TlType]} = 
+	    {Map1, [HdType, TlType]} =
 	      bind_pat_vars([cerl:cons_hd(Pat), cerl:cons_tl(Pat)],
-			    [t_cons_hd(Cons), t_cons_tl(Cons)], 
+			    [t_cons_hd(Cons), t_cons_tl(Cons)],
 			    [], Map, State, Rev),
 	    {Map1, t_cons(HdType, TlType)}
 	end;
       literal ->
 	Literal = literal_type(Pat),
-	LiteralOrOpaque = 
+	LiteralOrOpaque =
 	  case t_opaque_match_atom(Literal, State#state.opaques) of
 	    [Opaque] -> Opaque;
 	    _ -> Literal
@@ -1566,7 +1568,7 @@ bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
 	end;
       tuple ->
 	Es = cerl:tuple_es(Pat),
-	Prototype = 
+	Prototype =
 	  case Es of
 	    [] -> t_tuple([]);
 	    [Tag|Left] ->
@@ -1587,10 +1589,10 @@ bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
 	  false ->
 	    SubTuples = t_tuple_subtypes(Tuple),
 	    %% Need to call the top function to get the try-catch wrapper
-	    Results = 
+	    Results =
 	      case Rev of
 		true ->
-		  [bind_pat_vars_reverse(Es, t_tuple_args(SubTuple), [], 
+		  [bind_pat_vars_reverse(Es, t_tuple_args(SubTuple), [],
 					 Map, State)
 		   || SubTuple <- SubTuples];
 		false ->
@@ -1634,12 +1636,12 @@ bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
 	  end,
 	%% Must do inf when binding args to pats. Vars in pats are fresh.
 	VarType2 = t_inf(VarType1, Type),
-	VarType3 = 
+	VarType3 =
 	  case Opaques =/= [] of
 	    true ->
 	      case t_opaque_match_record(VarType2, Opaques) of
 		[OpaqueRec] -> OpaqueRec;
-		_ -> 
+		_ ->
 		  case t_opaque_match_atom(VarType2, Opaques) of
 		    [OpaqueAtom] -> OpaqueAtom;
 		    _ -> VarType2
@@ -1650,9 +1652,9 @@ bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
 	case t_is_none(VarType3) of
 	  true ->
 	    case t_find_opaque_mismatch(VarType1, Type) of
-	      {ok, T1, T2}  -> 
+	      {ok, T1, T2}  ->
 		bind_error([Pat], T1, T2, opaque);
-	      error -> 
+	      error ->
 		bind_error([Pat], Type, t_none(), bind)
 	    end;
 	  false ->
@@ -1747,17 +1749,17 @@ bind_opaque_pats(GenType, Type, Pat, Map, State, Rev) ->
 
 bind_guard(Guard, Map, State) ->
   try bind_guard(Guard, Map, dict:new(), pos, State) of
-      {Map1, _Type} -> Map1
+    {Map1, _Type} -> Map1
   catch
     throw:{fail, Warning} -> {error, Warning};
     throw:{fatal_fail, Warning} -> {error, Warning}
   end.
 
 bind_guard(Guard, Map, Env, Eval, State) ->
-  ?debug("Handling ~w guard: ~s\n", 
+  ?debug("Handling ~w guard: ~s\n",
 	 [Eval, cerl_prettypr:format(Guard, [{noann, true}])]),
   case cerl:type(Guard) of
-    binary -> 
+    binary ->
       {Map, t_binary()};
     'case' ->
       Arg = cerl:case_arg(Guard),
@@ -1795,10 +1797,10 @@ bind_guard(Guard, Map, Env, Eval, State) ->
     var ->
       ?debug("Looking for var(~w)...", [cerl_trees:get_label(Guard)]),
       case dict:find(get_label(Guard), Env) of
-	error -> 
+	error ->
 	  ?debug("Did not find it\n", []),
 	  Type = lookup_type(Guard, Map),
-	  Constr = 
+	  Constr =
 	    case Eval of
 	      pos -> t_atom(true);
 	      neg -> t_atom(false);
@@ -1806,7 +1808,7 @@ bind_guard(Guard, Map, Env, Eval, State) ->
 	    end,
 	  Inf = t_inf(Constr, Type),
 	  {enter_type(Guard, Inf, Map), Inf};
-	{ok, Tree} -> 
+	{ok, Tree} ->
 	  ?debug("Found it\n", []),
 	  {Map1, Type} = bind_guard(Tree, Map, Env, Eval, State),
 	  {enter_type(Guard, Type, Map1), Type}
@@ -1829,7 +1831,7 @@ handle_guard_call(Guard, Map, Env, Eval, State) ->
       handle_guard_type_test(Guard, F, Map, Env, Eval, State);
     {erlang, is_function, 2} ->
       handle_guard_is_function(Guard, Map, Env, Eval, State);
-    MFA when (MFA =:= {erlang, internal_is_record, 3}) or 
+    MFA when (MFA =:= {erlang, internal_is_record, 3}) or
 	     (MFA =:= {erlang, is_record, 3}) ->
       handle_guard_is_record(Guard, Map, Env, Eval, State);
     {erlang, '=:=', 2} ->
@@ -1842,7 +1844,7 @@ handle_guard_call(Guard, Map, Env, Eval, State) ->
       handle_guard_or(Guard, Map, Env, Eval, State);
     {erlang, 'not', 1} ->
       handle_guard_not(Guard, Map, Env, Eval, State);
-    {erlang, Comp, 2} when Comp =:= '<'; Comp =:= '=<'; 
+    {erlang, Comp, 2} when Comp =:= '<'; Comp =:= '=<';
                            Comp =:= '>'; Comp =:= '>=' ->
       handle_guard_comp(Guard, Comp, Map, Env, Eval, State);
     _ ->
@@ -1868,8 +1870,8 @@ handle_guard_gen_fun({M, F, A}, Guard, Map, Env, Eval, State) ->
     true ->
       %% Is this an error-bif?
       case t_is_none(erl_bif_types:type(M, F, A)) of
-	true -> signal_guard_fail(Guard, As, State);
-	false -> signal_guard_fatal_fail(Guard, As, State)
+	true -> signal_guard_fail(Eval, Guard, As, State);
+	false -> signal_guard_fatal_fail(Eval, Guard, As, State)
       end;
     false ->
       BifArgs = case erl_bif_types:arg_types(M, F, A) of
@@ -1877,7 +1879,7 @@ handle_guard_gen_fun({M, F, A}, Guard, Map, Env, Eval, State) ->
 		  List -> List
 		end,
       Map2 = enter_type_lists(Args, t_inf_lists(BifArgs, As0, Mode), Map1),
-      Ret = 
+      Ret =
 	case Eval of
 	  pos -> t_inf(t_atom(true), BifRet);
 	  neg -> t_inf(t_atom(false), BifRet);
@@ -1886,7 +1888,7 @@ handle_guard_gen_fun({M, F, A}, Guard, Map, Env, Eval, State) ->
       case t_is_none(Ret) of
 	true ->
 	  case Eval =:= pos of
-	    true -> signal_guard_fail(Guard, As, State);
+	    true -> signal_guard_fail(Eval, Guard, As, State);
 	    false -> throw({fail, none})
 	  end;
 	false -> {Map2, Ret}
@@ -1894,14 +1896,14 @@ handle_guard_gen_fun({M, F, A}, Guard, Map, Env, Eval, State) ->
   end.
 
 handle_guard_type_test(Guard, F, Map, Env, Eval, State) ->
-  [Arg] = cerl:call_args(Guard),      
+  [Arg] = cerl:call_args(Guard),
   {Map1, ArgType} = bind_guard(Arg, Map, Env, dont_know, State),
   case bind_type_test(Eval, F, ArgType, State) of
-    error -> 
+    error ->
       ?debug("Type test: ~w failed\n", [F]),
-      signal_guard_fail(Guard, [ArgType], State);
-    {ok, NewArgType, Ret} -> 
-      ?debug("Type test: ~w succeeded, NewType: ~s, Ret: ~s\n", 
+      signal_guard_fail(Eval, Guard, [ArgType], State);
+    {ok, NewArgType, Ret} ->
+      ?debug("Type test: ~w succeeded, NewType: ~s, Ret: ~s\n",
 	     [F, t_to_string(NewArgType), t_to_string(Ret)]),
       {enter_type(Arg, NewArgType, Map1), Ret}
   end.
@@ -1932,13 +1934,13 @@ bind_type_test(Eval, TypeTest, ArgType, State) ->
       end;
     neg ->
       case Mode of
-	opaque -> 
+	opaque ->
 	  Struct = erl_types:t_opaque_structure(ArgType),
 	  case t_is_none(t_subtract(Struct, Type)) of
 	    true -> error;
 	    false  -> {ok, ArgType, t_atom(false)}
 	  end;
-	structured ->  
+	structured ->
 	  Sub = t_subtract(ArgType, Type),
 	  case t_is_none(Sub) of
 	    true -> error;
@@ -1962,21 +1964,22 @@ handle_guard_comp(Guard, Comp, Map, Env, Eval, State) ->
 	true  when Eval =:= pos ->       {Map, t_atom(true)};
 	true  when Eval =:= dont_know -> {Map, t_atom(true)};
 	true  when Eval =:= neg ->       {Map, t_atom(true)};
-	false when Eval =:= pos -> signal_guard_fail(Guard, ArgTypes, State);
+	false when Eval =:= pos ->
+	  signal_guard_fail(Eval, Guard, ArgTypes, State);
 	false when Eval =:= dont_know -> {Map, t_atom(false)};
 	false when Eval =:= neg ->       {Map, t_atom(false)}
       end;
     {literal, var} when IsInt1 andalso IsInt2 andalso (Eval =:= pos) ->
       case bind_comp_literal_var(Arg1, Arg2, Type2, Comp, Map1) of
-	error -> signal_guard_fail(Guard, ArgTypes, State);
+	error -> signal_guard_fail(Eval, Guard, ArgTypes, State);
 	{ok, NewMap} -> {NewMap, t_atom(true)}
       end;
     {var, literal} when IsInt1 andalso IsInt2 andalso (Eval =:= pos) ->
       case bind_comp_literal_var(Arg2, Arg1, Type1, invert_comp(Comp), Map1) of
-	error -> signal_guard_fail(Guard, ArgTypes, State);
+	error -> signal_guard_fail(Eval, Guard, ArgTypes, State);
 	{ok, NewMap} -> {NewMap, t_atom(true)}
       end;
-    {_, _} -> 
+    {_, _} ->
       handle_guard_gen_fun({erlang, Comp, 2}, Guard, Map, Env, Eval, State)
   end.
 
@@ -2013,7 +2016,7 @@ handle_guard_is_function(Guard, Map, Env, Eval, State) ->
   [FunType0, ArityType0] = ArgTypes0,
   ArityType = t_inf(ArityType0, t_integer()),
   case t_is_none(ArityType) of
-    true -> signal_guard_fail(Guard, ArgTypes0, State);
+    true -> signal_guard_fail(Eval, Guard, ArgTypes0, State);
     false ->
       FunTypeConstr =
 	case t_number_vals(ArityType) of
@@ -2023,9 +2026,9 @@ handle_guard_is_function(Guard, Map, Env, Eval, State) ->
 	end,
       FunType = t_inf(FunType0, FunTypeConstr),
       case t_is_none(FunType) of
-	true -> 
+	true ->
 	  case Eval of
-	    pos -> signal_guard_fail(Guard, ArgTypes0, State);
+	    pos -> signal_guard_fail(Eval, Guard, ArgTypes0, State);
 	    neg -> {Map1, t_atom(false)};
 	    dont_know -> {Map1, t_atom(false)}
 	  end;
@@ -2059,16 +2062,16 @@ handle_guard_is_record(Guard, Map, Env, Eval, State) ->
     end,
   Type = t_inf(NewTupleType, RecType, Mode),
   case t_is_none(Type) of
-    true -> 
+    true ->
       case Eval of
-	pos -> signal_guard_fail(Guard, 
-				 [RecType, t_from_term(Tag), 
+	pos -> signal_guard_fail(Eval, Guard,
+				 [RecType, t_from_term(Tag),
 				  t_from_term(Arity)],
 				 State);
 	neg -> {Map1, t_atom(false)};
 	dont_know -> {Map1, t_atom(false)}
       end;
-    false -> 
+    false ->
       case Eval of
 	pos -> {enter_type(Rec, Type, Map1), t_atom(true)};
 	neg -> {Map1, t_atom(false)};
@@ -2081,20 +2084,20 @@ handle_guard_eq(Guard, Map, Env, Eval, State) ->
   case {cerl:type(Arg1), cerl:type(Arg2)} of
     {literal, literal} ->
       case cerl:concrete(Arg1) =:= cerl:concrete(Arg2) of
-	true -> 
-	  if 
+	true ->
+	  if
 	    Eval =:= pos -> {Map, t_atom(true)};
 	    Eval =:= neg -> throw({fail, none});
 	    Eval =:= dont_know -> {Map, t_atom(true)}
 	  end;
 	false ->
-	  if 
+	  if
 	    Eval =:= neg -> {Map, t_atom(false)};
 	    Eval =:= dont_know -> {Map, t_atom(false)};
-	    Eval =:= pos -> 
+	    Eval =:= pos ->
 	      ArgTypes = [t_from_term(cerl:concrete(Arg1)),
 			  t_from_term(cerl:concrete(Arg2))],
-	      signal_guard_fail(Guard, ArgTypes, State)
+	      signal_guard_fail(Eval, Guard, ArgTypes, State)
 	  end
       end;
     {literal, _} when Eval =:= pos ->
@@ -2146,10 +2149,10 @@ handle_guard_eqeq(Guard, Map, Env, Eval, State) ->
 	false ->
 	  if Eval =:= neg -> {Map, t_atom(false)};
 	     Eval =:= dont_know -> {Map, t_atom(false)};
-	     Eval =:= pos -> 
+	     Eval =:= pos ->
 	      ArgTypes = [t_from_term(cerl:concrete(Arg1)),
 			  t_from_term(cerl:concrete(Arg2))],
-	      signal_guard_fail(Guard, ArgTypes, State)
+	      signal_guard_fail(Eval, Guard, ArgTypes, State)
 	  end
       end;
     {literal, _} when Eval =:= pos ->
@@ -2163,7 +2166,7 @@ handle_guard_eqeq(Guard, Map, Env, Eval, State) ->
 bind_eqeq_guard(Guard, Arg1, Arg2, Map, Env, Eval, State) ->
   {Map1, Type1} = bind_guard(Arg1, Map, Env, dont_know, State),
   {Map2, Type2} = bind_guard(Arg2, Map1, Env, dont_know, State),
-  ?debug("Types are:~s =:= ~s\n", [t_to_string(Type1), 
+  ?debug("Types are:~s =:= ~s\n", [t_to_string(Type1),
 				   t_to_string(Type2)]),
   Inf = t_inf(Type1, Type2),
   case t_is_none(Inf) of
@@ -2171,7 +2174,7 @@ bind_eqeq_guard(Guard, Arg1, Arg2, Map, Env, Eval, State) ->
       case Eval of
 	neg -> {Map2, t_atom(false)};
 	dont_know -> {Map2, t_atom(false)};
-	pos -> signal_guard_fail(Guard, [Type1, Type2], State)
+	pos -> signal_guard_fail(Eval, Guard, [Type1, Type2], State)
       end;
     false ->
       case Eval of
@@ -2198,29 +2201,29 @@ bind_eqeq_guard(Guard, Arg1, Arg2, Map, Env, Eval, State) ->
   end.
 
 bind_eqeq_guard_lit_other(Guard, Arg1, Arg2, Map, Env, State) ->
-  %% Assumes positive evaluation
+  Eval = dont_know,
   case cerl:concrete(Arg1) of
     true ->
       {_, Type} = MT = bind_guard(Arg2, Map, Env, pos, State),
       case t_is_atom(true, Type) of
 	true -> MT;
-	false -> 
-	  {_, Type0} = bind_guard(Arg2, Map, Env, dont_know, State),
-	  signal_guard_fail(Guard, [Type0, t_atom(true)], State)
+	false ->
+	  {_, Type0} = bind_guard(Arg2, Map, Env, Eval, State),
+	  signal_guard_fail(Eval, Guard, [Type0, t_atom(true)], State)
       end;
-    false -> 
+    false ->
       {Map1, Type} = bind_guard(Arg2, Map, Env, neg, State),
       case t_is_atom(false, Type) of
 	true -> {Map1, t_atom(true)};
-	false -> 
-	  {_, Type0} = bind_guard(Arg2, Map, Env, dont_know, State),
-	  signal_guard_fail(Guard, [Type0, t_atom(true)], State)
+	false ->
+	  {_, Type0} = bind_guard(Arg2, Map, Env, Eval, State),
+	  signal_guard_fail(Eval, Guard, [Type0, t_atom(true)], State)
       end;
     Term ->
       LitType = t_from_term(Term),
-      {Map1, Type} = bind_guard(Arg2, Map, Env, dont_know, State),
+      {Map1, Type} = bind_guard(Arg2, Map, Env, Eval, State),
       case t_is_subtype(LitType, Type) of
-	false -> signal_guard_fail(Guard, [Type, LitType], State);
+	false -> signal_guard_fail(Eval, Guard, [Type, LitType], State);
 	true ->
 	  case cerl:is_c_var(Arg2) of
 	    true -> {enter_type(Arg2, LitType, Map1), t_atom(true)};
@@ -2244,48 +2247,54 @@ handle_guard_and(Guard, Map, Env, Eval, State) ->
 	  end
       end;
     neg ->
-      {Map1, Type1} = 
+      {Map1, Type1} =
 	try bind_guard(Arg1, Map, Env, neg, State)
 	catch throw:{fail, _} -> bind_guard(Arg2, Map, Env, pos, State)
 	end,
-      {Map2, Type2} = 
-	try bind_guard(Arg1, Map, Env, neg, State)
-	catch throw:{fail, _} -> bind_guard(Arg2, Map, Env, pos, State)
+      {Map2, Type2} =
+	try bind_guard(Arg2, Map, Env, neg, State)
+	catch throw:{fail, _} -> bind_guard(Arg1, Map, Env, pos, State)
 	end,
       case t_is_atom(false, Type1) orelse t_is_atom(false, Type2) of
 	true -> {join_maps([Map1, Map2], Map), t_atom(false)};
 	false -> throw({fail, none})
       end;
     dont_know ->
-      True = t_atom(true),
       {Map1, Type1} = bind_guard(Arg1, Map, Env, dont_know, State),
-      case t_is_none(t_inf(Type1, t_boolean())) of
-	true -> throw({fail, none});
+      {Map2, Type2} = bind_guard(Arg2, Map, Env, dont_know, State),
+      Bool1 = t_inf(Type1, t_boolean()),
+      Bool2 = t_inf(Type2, t_boolean()),
+      case t_is_none(Bool1) orelse t_is_none(Bool2) of
+	true -> throw({fatal_fail, none});
 	false ->
-	  {Map2, Type2} = bind_guard(Arg2, Map1, Env, Eval, State),
-	  case t_is_none(t_inf(Type2, t_boolean())) of
-	    true -> throw({fail, none});
-	    false -> {Map2, True}
-	  end
+	  NewMap = join_maps([Map1, Map2], Map),
+	  NewType =
+	    case {t_atom_vals(Bool1), t_atom_vals(Bool2)} of
+	      {['true'] , ['true'] } -> t_atom(true);
+	      {['false'], _        } -> t_atom(false);
+	      {_        , ['false']} -> t_atom(false);
+	      {_        , _        } -> t_boolean()
+	    end,
+	  {NewMap, NewType}
       end
   end.
 
 handle_guard_or(Guard, Map, Env, Eval, State) ->
   [Arg1, Arg2] = cerl:call_args(Guard),
   case Eval of
-	pos ->
-      {Map1, Bool1} = 
+    pos ->
+      {Map1, Bool1} =
 	try bind_guard(Arg1, Map, Env, pos, State)
-	catch 
+	catch
 	  throw:{fail,_} -> bind_guard(Arg1, Map, Env, dont_know, State)
 	end,
-      {Map2, Bool2} = 
+      {Map2, Bool2} =
 	try bind_guard(Arg2, Map, Env, pos, State)
-	catch 
+	catch
 	  throw:{fail,_} -> bind_guard(Arg2, Map, Env, dont_know, State)
 	end,
       case ((t_is_atom(true, Bool1) andalso t_is_boolean(Bool2))
-	    orelse 
+	    orelse
 	    (t_is_atom(true, Bool2) andalso t_is_boolean(Bool1))) of
 	true -> {join_maps([Map1, Map2], Map), t_atom(true)};
 	false -> throw({fail, none})
@@ -2302,30 +2311,41 @@ handle_guard_or(Guard, Map, Env, Eval, State) ->
 	  end
       end;
     dont_know ->
-      {Map1, Bool1} = bind_guard(Arg1, Map, Env, dont_know, State),
-      {Map2, Bool2} = bind_guard(Arg2, Map, Env, dont_know, State),
-      case t_is_boolean(Bool1) andalso t_is_boolean(Bool2) of
-	true -> {join_maps([Map1, Map2], Map), t_sup(Bool1, Bool2)};
-	false -> throw({fail, none})
+      {Map1, Type1} = bind_guard(Arg1, Map, Env, dont_know, State),
+      {Map2, Type2} = bind_guard(Arg2, Map, Env, dont_know, State),
+      Bool1 = t_inf(Type1, t_boolean()),
+      Bool2 = t_inf(Type2, t_boolean()),
+      case t_is_none(Bool1) orelse t_is_none(Bool2) of
+	true -> throw({fatal_fail, none});
+	false ->
+	  NewMap = join_maps([Map1, Map2], Map),
+	  NewType =
+	    case {t_atom_vals(Bool1), t_atom_vals(Bool2)} of
+	      {['false'], ['false']} -> t_atom(false);
+	      {['true'] , _        } -> t_atom(true);
+	      {_        , ['true'] } -> t_atom(true);
+	      {_        , _        } -> t_boolean()
+	    end,
+	  {NewMap, NewType}
       end
   end.
 
 handle_guard_not(Guard, Map, Env, Eval, State) ->
   [Arg] = cerl:call_args(Guard),
   case Eval of
-    neg -> 
+    neg ->
       {Map1, Type} = bind_guard(Arg, Map, Env, pos, State),
       case t_is_atom(true, Type) of
 	true -> {Map1, t_atom(false)};
 	false -> throw({fail, none})
       end;
-    pos -> 
+    pos ->
       {Map1, Type} = bind_guard(Arg, Map, Env, neg, State),
       case t_is_atom(false, Type) of
 	true -> {Map1, t_atom(true)};
 	false -> throw({fail, none})
       end;
-    dont_know -> 
+    dont_know ->
       {Map1, Type} = bind_guard(Arg, Map, Env, dont_know, State),
       Bool = t_inf(Type, t_boolean()),
       case t_is_none(Bool) of
@@ -2348,23 +2368,25 @@ bind_guard_list([G|Gs], Map, Env, Eval, State, Acc) ->
 bind_guard_list([], Map, _Env, _Eval, _State, Acc) ->
   {Map, lists:reverse(Acc)}.
 
--spec signal_guard_fail(cerl:c_call(), [erl_types:erl_type()], state()) ->
-        no_return().
+-type eval() :: 'pos' | 'neg' | 'dont_know'.
 
-signal_guard_fail(Guard, ArgTypes, State) ->
+-spec signal_guard_fail(eval(), cerl:c_call(), [erl_types:erl_type()],
+			state()) -> no_return().
+
+signal_guard_fail(Eval, Guard, ArgTypes, State) ->
   Args = cerl:call_args(Guard),
   F = cerl:atom_val(cerl:call_name(Guard)),
   MFA = {cerl:atom_val(cerl:call_module(Guard)), F, length(Args)},
   Msg =
     case is_infix_op(MFA) of
-      true -> 
+      true ->
 	[ArgType1, ArgType2] = ArgTypes,
 	[Arg1, Arg2] = Args,
-	{guard_fail, [format_args_1([Arg1], [ArgType1], State), 
+	{guard_fail, [format_args_1([Arg1], [ArgType1], State),
 		      atom_to_list(F),
 		      format_args_1([Arg2], [ArgType2], State)]};
       false ->
-	mk_guard_msg(F, Args, ArgTypes, State)
+	mk_guard_msg(Eval, F, Args, ArgTypes, State)
     end,
   throw({fail, {Guard, Msg}}).
 
@@ -2379,26 +2401,31 @@ is_infix_op({erlang, '>=', 2}) -> true;
 is_infix_op({M, F, A}) when is_atom(M), is_atom(F),
 			    is_integer(A), 0 =< A, A =< 255 -> false.
 
--spec signal_guard_fatal_fail(cerl:c_call(), [erl_types:erl_type()], state()) ->
-        no_return().
+-spec signal_guard_fatal_fail(eval(), cerl:c_call(), [erl_types:erl_type()],
+			      state()) -> no_return().
 
-signal_guard_fatal_fail(Guard, ArgTypes, State) ->
-  Args = cerl:call_args(Guard),      
+signal_guard_fatal_fail(Eval, Guard, ArgTypes, State) ->
+  Args = cerl:call_args(Guard),
   F = cerl:atom_val(cerl:call_name(Guard)),
-  Msg = mk_guard_msg(F, Args, ArgTypes, State),
+  Msg = mk_guard_msg(Eval, F, Args, ArgTypes, State),
   throw({fatal_fail, {Guard, Msg}}).
 
-mk_guard_msg(F, Args, ArgTypes, State) ->
+mk_guard_msg(Eval, F, Args, ArgTypes, State) ->
   FArgs = [F, format_args(Args, ArgTypes, State)],
   case any_has_opaque_subtype(ArgTypes) of
     true -> {opaque_guard, FArgs};
-    false -> {guard_fail, FArgs}
+    false ->
+      case Eval of
+	neg -> {neg_guard_fail, FArgs};
+	pos -> {guard_fail, FArgs};
+	dont_know -> {guard_fail, FArgs}
+      end
   end.
-  
+
 bind_guard_case_clauses(Arg, Clauses, Map, Env, Eval, State) ->
   Clauses1 = filter_fail_clauses(Clauses),
   {GenMap, GenArgType} = bind_guard(Arg, Map, Env, dont_know, State),
-  bind_guard_case_clauses(GenArgType, GenMap, Arg, Clauses1, Map, Env, Eval, 
+  bind_guard_case_clauses(GenArgType, GenMap, Arg, Clauses1, Map, Env, Eval,
 			  t_none(), [], State).
 
 filter_fail_clauses([Clause|Left]) ->
@@ -2415,7 +2442,7 @@ filter_fail_clauses([Clause|Left]) ->
 filter_fail_clauses([]) ->
   [].
 
-bind_guard_case_clauses(GenArgType, GenMap, ArgExpr, [Clause|Left], 
+bind_guard_case_clauses(GenArgType, GenMap, ArgExpr, [Clause|Left],
 			Map, Env, Eval, AccType, AccMaps, State) ->
   Pats = cerl:clause_pats(Clause),
   {NewMap0, ArgType} =
@@ -2429,7 +2456,7 @@ bind_guard_case_clauses(GenArgType, GenMap, ArgExpr, [Clause|Left],
 		false -> bind_guard(ArgExpr, Map, Env, neg, State);
 		_ -> {GenMap, GenArgType}
 	      end
-	    catch 
+	    catch
 	      throw:{fail, _} -> {none, GenArgType}
 	    end;
 	  false ->
@@ -2459,7 +2486,7 @@ bind_guard_case_clauses(GenArgType, GenMap, ArgExpr, [Clause|Left],
   NewGenArgType = t_subtract(GenArgType, GenPatType),
   case (NewMap1 =:= none) orelse t_is_none(GenArgType) of
     true ->
-      bind_guard_case_clauses(NewGenArgType, GenMap, ArgExpr, Left, Map, Env, 
+      bind_guard_case_clauses(NewGenArgType, GenMap, ArgExpr, Left, Map, Env,
 			      Eval, AccType, AccMaps, State);
     false ->
       {NewAccType, NewAccMaps} =
@@ -2469,15 +2496,15 @@ bind_guard_case_clauses(GenArgType, GenMap, ArgExpr, [Clause|Left],
 	    true -> throw({fail, none});
 	    false -> ok
 	  end,
-	  {NewMap3, CType} = bind_guard(cerl:clause_body(Clause), NewMap2, 
+	  {NewMap3, CType} = bind_guard(cerl:clause_body(Clause), NewMap2,
 					Env, Eval, State),
 	  case Eval of
-	    pos -> 
+	    pos ->
 	      case t_is_atom(true, CType) of
 		true -> ok;
 		false -> throw({fail, none})
 	      end;
-	    neg -> 
+	    neg ->
 	      case t_is_atom(false, CType) of
 		true -> ok;
 		false -> throw({fail, none})
@@ -2489,10 +2516,10 @@ bind_guard_case_clauses(GenArgType, GenMap, ArgExpr, [Clause|Left],
 	catch
 	  throw:{fail, _What} -> {AccType, AccMaps}
 	end,
-      bind_guard_case_clauses(NewGenArgType, GenMap, ArgExpr, Left, Map, Env, 
+      bind_guard_case_clauses(NewGenArgType, GenMap, ArgExpr, Left, Map, Env,
 			      Eval, NewAccType, NewAccMaps, State)
   end;
-bind_guard_case_clauses(_GenArgType, _GenMap, _ArgExpr, [], Map, _Env, _Eval, 
+bind_guard_case_clauses(_GenArgType, _GenMap, _ArgExpr, [], Map, _Env, _Eval,
 			AccType, AccMaps, _State) ->
   case t_is_none(AccType) of
     true -> throw({fail, none});
@@ -2578,7 +2605,7 @@ enter_type(Key, Val, {Map, Subst} = MS) ->
 enter_subst(Key, Val, {Map, Subst} = MS) ->
   KeyLabel = get_label(Key),
   case cerl:is_literal(Val) of
-    true -> 
+    true ->
       NewMap = dict:store(KeyLabel, literal_type(Val), Map),
       {NewMap, Subst};
     false ->
@@ -2600,13 +2627,13 @@ enter_subst(Key, Val, {Map, Subst} = MS) ->
       end
   end.
 
-lookup_type(Key, {Map, Subst}) -> 
+lookup_type(Key, {Map, Subst}) ->
   lookup(Key, Map, Subst, t_none()).
 
 lookup(Key, Map, Subst, AnyNone) ->
   case cerl:is_literal(Key) of
     true -> literal_type(Key);
-    false -> 
+    false ->
       Label = get_label(Key),
       case dict:find(Label, Subst) of
 	{ok, NewKey} -> lookup(NewKey, Map, Subst, AnyNone);
@@ -2671,7 +2698,7 @@ get_label(T) ->
 
 t_is_simple(ArgType) ->
   t_is_atom(ArgType) orelse t_is_number(ArgType) orelse t_is_port(ArgType)
-    orelse t_is_pid(ArgType) orelse t_is_reference(ArgType) 
+    orelse t_is_pid(ArgType) orelse t_is_reference(ArgType)
     orelse t_is_nil(ArgType).
 
 %% t_is_structured(ArgType) ->
@@ -2689,8 +2716,8 @@ is_call_to_send(Tree) ->
       Mod = cerl:call_module(Tree),
       Name = cerl:call_name(Tree),
       Arity = cerl:call_arity(Tree),
-      cerl:is_c_atom(Mod) 
-	andalso cerl:is_c_atom(Name) 
+      cerl:is_c_atom(Mod)
+	andalso cerl:is_c_atom(Name)
 	andalso (cerl:atom_val(Name) =:= '!')
 	andalso (cerl:atom_val(Mod) =:= erlang)
 	andalso (Arity =:= 2)
@@ -2716,7 +2743,7 @@ filter_match_fail([Clause] = Cls) ->
 filter_match_fail([H|T]) ->
   [H|filter_match_fail(T)];
 filter_match_fail([]) ->
-  %% This can actually happen, for example in 
+  %% This can actually happen, for example in
   %%      receive after 1 -> ok end
   [].
 
@@ -2733,9 +2760,11 @@ determine_mode(Type, Opaques) ->
 %%% ===========================================================================
 
 state__new(Callgraph, Tree, Plt, Module, Records, BehaviourTranslations) ->
+  Opaques = erl_types:module_builtin_opaques(Module) ++
+    erl_types:t_opaque_from_records(Records),
   TreeMap = build_tree_map(Tree),
   Funs = dict:fetch_keys(TreeMap),
-  FunTab = init_fun_tab(Funs, dict:new(), TreeMap, Callgraph, Plt),
+  FunTab = init_fun_tab(Funs, dict:new(), TreeMap, Callgraph, Plt, Opaques),
   Work = init_work([get_label(Tree)]),
   Env = dict:store(top, map__new(), dict:new()),
   Opaques = erl_types:module_builtin_opaques(Module) ++
@@ -2743,12 +2772,12 @@ state__new(Callgraph, Tree, Plt, Module, Records, BehaviourTranslations) ->
   #state{callgraph = Callgraph, envs = Env, fun_tab = FunTab, opaques = Opaques,
 	 plt = Plt, races = dialyzer_races:new(), records = Records,
 	 warning_mode = false, warnings = [], work = Work, tree_map = TreeMap,
-	 module = Module, behaviour_api_info = BehaviourTranslations}.
+	 module = Module, behaviour_api_dict = BehaviourTranslations}.
 
 state__mark_fun_as_handled(#state{fun_tab = FunTab} = State, Fun0) ->
   Fun = get_label(Fun0),
   case dict:find(Fun, FunTab) of
-    {ok, {not_handled, Entry}} -> 
+    {ok, {not_handled, Entry}} ->
       State#state{fun_tab = dict:store(Fun, Entry, FunTab)};
     {ok, {_, _}} ->
       State
@@ -2802,7 +2831,7 @@ state__add_warning(State, Tag, Tree, Msg) ->
 
 state__add_warning(#state{warning_mode = false} = State, _, _, _, _) ->
   State;
-state__add_warning(#state{warnings = Warnings, warning_mode = true} = State, 
+state__add_warning(#state{warnings = Warnings, warning_mode = true} = State,
 		   Tag, Tree, Msg, Force) ->
   Ann = cerl:get_ann(Tree),
   case Force of
@@ -2850,7 +2879,7 @@ state__get_warnings(#state{tree_map = TreeMap, fun_tab = FunTab,
 	    {Name, Contract} =
 	      case dialyzer_callgraph:lookup_name(FunLbl, Callgraph) of
 		error -> {[], none};
-		{ok, {_M, F, A} = MFA} -> 
+		{ok, {_M, F, A} = MFA} ->
 		  {[F, A], dialyzer_plt:lookup_contract(Plt, MFA)}
 	      end,
 	    case t_is_none(Ret) of
@@ -2868,19 +2897,19 @@ state__get_warnings(#state{tree_map = TreeMap, fun_tab = FunTab,
 		    case classify_returns(Fun) of
 		      no_match ->
 			Msg = {no_return, [no_match|Name]},
-			state__add_warning(AccState, ?WARN_RETURN_NO_RETURN, 
+			state__add_warning(AccState, ?WARN_RETURN_NO_RETURN,
 					   Fun, Msg);
 		      only_explicit ->
 			Msg = {no_return, [only_explicit|Name]},
-			state__add_warning(AccState, ?WARN_RETURN_ONLY_EXIT, 
+			state__add_warning(AccState, ?WARN_RETURN_ONLY_EXIT,
 					   Fun, Msg);
 		      only_normal ->
 			Msg = {no_return, [only_normal|Name]},
-			state__add_warning(AccState, ?WARN_RETURN_NO_RETURN, 
+			state__add_warning(AccState, ?WARN_RETURN_NO_RETURN,
 					   Fun, Msg);
 		      both ->
 			Msg = {no_return, [both|Name]},
-			state__add_warning(AccState, ?WARN_RETURN_NO_RETURN, 
+			state__add_warning(AccState, ?WARN_RETURN_NO_RETURN,
 					   Fun, Msg)
 		    end;
 		  false ->
@@ -2918,10 +2947,10 @@ state__lookup_name(Fun, #state{callgraph = Callgraph}) ->
 
 state__lookup_record(Tag, Arity, #state{records = Records}) ->
   case erl_types:lookup_record(Tag, Arity, Records) of
-    {ok, Fields} -> 
+    {ok, Fields} ->
       {ok, t_tuple([t_atom(Tag)|
 		    [FieldType || {_FieldName, FieldType} <- Fields]])};
-    error -> 
+    error ->
       error
   end.
 
@@ -2944,15 +2973,15 @@ build_tree_map(Tree) ->
     end,
   cerl_trees:fold(Fun, dict:new(), Tree).
 
-init_fun_tab([top|Left], Dict, TreeMap, Callgraph, Plt) ->
+init_fun_tab([top|Left], Dict, TreeMap, Callgraph, Plt, Opaques) ->
   NewDict = dict:store(top, {not_handled, {[], t_none()}}, Dict),
-  init_fun_tab(Left, NewDict, TreeMap, Callgraph, Plt);
-init_fun_tab([Fun|Left], Dict, TreeMap, Callgraph, Plt) ->
+  init_fun_tab(Left, NewDict, TreeMap, Callgraph, Plt, Opaques);
+init_fun_tab([Fun|Left], Dict, TreeMap, Callgraph, Plt, Opaques) ->
   Arity = cerl:fun_arity(dict:fetch(Fun, TreeMap)),
   FunEntry =
     case dialyzer_callgraph:is_escaping(Fun, Callgraph) of
       true ->
-	Args = lists:duplicate(Arity, t_any()),
+        Args = lists:duplicate(Arity, t_any()),
 	case lookup_fun_sig(Fun, Callgraph, Plt) of
 	  none -> {Args, t_unit()};
 	  {value, {RetType, _}} ->
@@ -2964,8 +2993,8 @@ init_fun_tab([Fun|Left], Dict, TreeMap, Callgraph, Plt) ->
       false -> {lists:duplicate(Arity, t_none()), t_unit()}
     end,
   NewDict = dict:store(Fun, {not_handled, FunEntry}, Dict),
-  init_fun_tab(Left, NewDict, TreeMap, Callgraph, Plt);
-init_fun_tab([], Dict, _TreeMap, _Callgraph, _Plt) ->
+  init_fun_tab(Left, NewDict, TreeMap, Callgraph, Plt, Opaques);
+init_fun_tab([], Dict, _TreeMap, _Callgraph, _Plt, _Opaques) ->
   Dict.
 
 state__update_fun_env(Tree, Map, #state{envs = Envs} = State) ->
@@ -2992,7 +3021,7 @@ state__all_fun_types(#state{fun_tab = FunTab}) ->
   dict:map(fun(_Fun, {Args, Ret}) -> t_fun(Args, Ret)end, Tab1).
 
 state__fun_type(Fun, #state{fun_tab = FunTab}) ->
-  Label = 
+  Label =
     if is_integer(Fun) -> Fun;
        true -> get_label(Fun)
     end,
@@ -3003,10 +3032,10 @@ state__fun_type(Fun, #state{fun_tab = FunTab}) ->
       t_fun(A, R)
   end.
 
-state__update_fun_entry(Tree, ArgTypes, Out0, 
+state__update_fun_entry(Tree, ArgTypes, Out0,
 			#state{fun_tab=FunTab, callgraph=CG, plt=Plt} = State)->
   Fun = get_label(Tree),
-  Out1 = 
+  Out1 =
     if Fun =:= top -> Out0;
        true ->
 	case lookup_fun_sig(Fun, CG, Plt) of
@@ -3018,15 +3047,15 @@ state__update_fun_entry(Tree, ArgTypes, Out0,
   case dict:find(Fun, FunTab) of
     {ok, {ArgTypes, OldOut}} ->
       case t_is_equal(OldOut, Out) of
-	true -> 
-	  ?debug("Fixpoint for ~w: ~s\n", 
-		 [state__lookup_name(Fun, State), 
+	true ->
+	  ?debug("Fixpoint for ~w: ~s\n",
+		 [state__lookup_name(Fun, State),
 		  t_to_string(t_fun(ArgTypes, Out))]),
 	  State;
 	false ->
 	  NewEntry = {ArgTypes, Out},
-	  ?debug("New Entry for ~w: ~s\n", 
-		 [state__lookup_name(Fun, State), 
+	  ?debug("New Entry for ~w: ~s\n",
+		 [state__lookup_name(Fun, State),
 		  t_to_string(t_fun(ArgTypes, Out))]),
 	  NewFunTab = dict:store(Fun, NewEntry, FunTab),
 	  State1 = State#state{fun_tab = NewFunTab},
@@ -3035,8 +3064,8 @@ state__update_fun_entry(Tree, ArgTypes, Out0,
     {ok, {NewArgTypes, _OldOut}} ->
       %% Can only happen in self-recursive functions. Only update the out type.
       NewEntry = {NewArgTypes, Out},
-      ?debug("New Entry for ~w: ~s\n", 
-	     [state__lookup_name(Fun, State), 
+      ?debug("New Entry for ~w: ~s\n",
+	     [state__lookup_name(Fun, State),
 	      t_to_string(t_fun(NewArgTypes, Out))]),
       NewFunTab = dict:store(Fun, NewEntry, FunTab),
       State1 = State#state{fun_tab = NewFunTab},
@@ -3055,9 +3084,9 @@ state__add_work_from_fun(Tree, #state{callgraph = Callgraph,
 	MFAList ->
 	  LabelList = [dialyzer_callgraph:lookup_label(MFA, Callgraph)
 		       || MFA <- MFAList],
-	  %% Must filter the result for results in this module.	  
+	  %% Must filter the result for results in this module.
 	  FilteredList = [L || {ok, L} <- LabelList, dict:is_key(L, TreeMap)],
-	  ?debug("~w: Will try to add:~w\n", 
+	  ?debug("~w: Will try to add:~w\n",
 		 [state__lookup_name(get_label(Tree), State), MFAList]),
 	  lists:foldl(fun(L, AccState) ->
 			  state__add_work(L, AccState)
@@ -3088,15 +3117,15 @@ state__fun_info(external, #state{}) ->
   external;
 state__fun_info({_, _, _} = MFA, #state{plt = PLT}) ->
   {MFA,
-   dialyzer_plt:lookup(PLT, MFA), 
+   dialyzer_plt:lookup(PLT, MFA),
    dialyzer_plt:lookup_contract(PLT, MFA),
    t_any()};
 state__fun_info(Fun, #state{callgraph = CG, fun_tab = FunTab, plt = PLT}) ->
   {Sig, Contract} =
     case dialyzer_callgraph:lookup_name(Fun, CG) of
-      error -> 
+      error ->
 	{dialyzer_plt:lookup(PLT, Fun), none};
-      {ok, MFA} -> 
+      {ok, MFA} ->
 	{dialyzer_plt:lookup(PLT, MFA), dialyzer_plt:lookup_contract(PLT, MFA)}
     end,
   LocalRet =
@@ -3124,18 +3153,18 @@ state__find_apply_return(Tree, #state{callgraph = Callgraph} = State) ->
 forward_args(Fun, ArgTypes, #state{work = Work, fun_tab = FunTab} = State) ->
   {OldArgTypes, OldOut, Fixpoint} =
     case dict:find(Fun, FunTab) of
-      {ok, {not_handled, {OldArgTypes0, OldOut0}}} -> 
+      {ok, {not_handled, {OldArgTypes0, OldOut0}}} ->
 	{OldArgTypes0, OldOut0, false};
       {ok, {OldArgTypes0, OldOut0}} ->
-	{OldArgTypes0, OldOut0, 
+	{OldArgTypes0, OldOut0,
 	 t_is_subtype(t_product(ArgTypes), t_product(OldArgTypes0))}
     end,
   case Fixpoint of
     true -> State;
-    false -> 
+    false ->
       NewArgTypes = [t_sup(X, Y) || {X, Y} <- lists:zip(ArgTypes, OldArgTypes)],
       NewWork = add_work(Fun, Work),
-      ?debug("~w: forwarding args ~s\n", 
+      ?debug("~w: forwarding args ~s\n",
 	     [state__lookup_name(Fun, State),
 	      t_to_string(t_product(NewArgTypes))]),
       NewFunTab = dict:store(Fun, {NewArgTypes, OldOut}, FunTab),
@@ -3250,7 +3279,7 @@ get_file([_|Tail]) -> get_file(Tail).
 is_compiler_generated(Ann) ->
   lists:member(compiler_generated, Ann) orelse (get_line(Ann) < 1).
 
--spec format_args([term()], [erl_types:erl_type()], state()) ->
+-spec format_args([cerl:cerl()], [erl_types:erl_type()], state()) ->
   nonempty_string().
 
 format_args([], [], _State) ->
@@ -3258,9 +3287,6 @@ format_args([], [], _State) ->
 format_args(ArgList, TypeList, State) ->
   "(" ++ format_args_1(ArgList, TypeList, State) ++ ")".
 
--spec format_args_1([term(),...], [erl_types:erl_type(),...], state()) ->
-  string().
-
 format_args_1([Arg], [Type], State) ->
   format_arg(Arg) ++ format_type(Type, State);
 format_args_1([Arg|Args], [Type|Types], State) ->
@@ -3293,6 +3319,11 @@ format_arg(Arg) ->
 format_type(Type, #state{records = R}) ->
   t_to_string(Type, R).
 
+-spec format_field_diffs(erl_types:erl_type(), state()) -> string().
+
+format_field_diffs(RecConstruction, #state{records = R}) ->
+  erl_types:record_field_diffs_to_string(RecConstruction, R).
+
 -spec format_sig_args(erl_types:erl_type(), state()) -> string().
 
 format_sig_args(Type, #state{records = R}) ->
@@ -3300,12 +3331,12 @@ format_sig_args(Type, #state{records = R}) ->
   case SigArgs of
     [] -> "()";
     [SArg|SArgs] ->
-      lists:flatten("(" ++ t_to_string(SArg, R) 
+      lists:flatten("(" ++ t_to_string(SArg, R)
 		        ++ ["," ++ t_to_string(T, R) || T <- SArgs] ++ ")")
     end.
 
 format_cerl(Tree) ->
-  cerl_prettypr:format(cerl:set_ann(Tree, []), 
+  cerl_prettypr:format(cerl:set_ann(Tree, []),
 		       [{hook, dialyzer_utils:pp_hook()},
 			{noann, true},
 			{paper, 100000}, %% These guys strip
@@ -3368,7 +3399,7 @@ find_terminals(Tree) ->
 	true ->
 	  M = cerl:concrete(M0),
 	  F = cerl:concrete(F0),
-	  case (erl_bif_types:is_known(M, F, A) 
+	  case (erl_bif_types:is_known(M, F, A)
 		andalso t_is_none(erl_bif_types:type(M, F, A))) of
 	    true -> {true, false};
 	    false -> {false, true}
@@ -3383,12 +3414,12 @@ find_terminals(Tree) ->
     letrec -> find_terminals(cerl:letrec_body(Tree));
     literal -> {false, true};
     primop -> {false, false}; %% match_fail, etc. are not explicit exits.
-    'receive' -> 
+    'receive' ->
       Timeout = cerl:receive_timeout(Tree),
       Clauses = cerl:receive_clauses(Tree),
       case (cerl:is_literal(Timeout) andalso
 	    (cerl:concrete(Timeout) =:= infinity)) of
-	true -> 
+	true ->
 	  if Clauses =:= [] -> {false, true}; %% A never ending receive.
 	     true -> find_terminals_list(Clauses)
 	  end;
@@ -3456,11 +3487,11 @@ find_rec_warnings_tuple(Tree, State) ->
 	      TagVal = cerl:atom_val(Tag),
 	      case state__lookup_record(TagVal, length(Left), State) of
 		error -> State;
-		{ok, Prototype} -> 
+		{ok, Prototype} ->
 		  InfTupleType = t_inf(Prototype, TupleType),
 		  case t_is_none(InfTupleType) of
 		    true ->
-		      Msg = {record_matching, 
+		      Msg = {record_matching,
 			     [format_patterns([Tree]), TagVal]},
 		      state__add_warning(State, ?WARN_MATCHING, Tree, Msg);
 		    false ->
@@ -3478,7 +3509,7 @@ find_rec_warnings_tuple(Tree, State) ->
 %%----------------------------------------------------------------------------
 
 -ifdef(DEBUG_PP).
-debug_pp(Tree, true) -> 
+debug_pp(Tree, true) ->
   io:put_chars(cerl_prettypr:format(Tree, [{hook, cerl_typean:pp_hook()}])),
   io:nl(),
   ok;
diff --git a/lib/dialyzer/src/dialyzer_gui.erl b/lib/dialyzer/src/dialyzer_gui.erl
index f353638cdf..4436330f7f 100644
--- a/lib/dialyzer/src/dialyzer_gui.erl
+++ b/lib/dialyzer/src/dialyzer_gui.erl
@@ -88,8 +88,8 @@
 
 -spec start(#options{}) -> ?RET_NOTHING_SUSPICIOUS.
 
-start(DialyzerOptions = #options{from = From, init_plt = InitPltFile,
-				 legal_warnings = LegalWarnings}) ->
+start(#options{from = From, init_plts = InitPltFiles,
+               legal_warnings = LegalWarnings} = DialyzerOptions) ->
   process_flag(trap_exit, true),
 
   GS = gs:start(),
@@ -336,9 +336,13 @@ start(DialyzerOptions = #options{from = From, init_plt = InitPltFile,
   gs:config(Packer, WH),
   {ok, CWD} = file:get_cwd(),
   
-  InitPlt = try dialyzer_plt:from_file(InitPltFile)
-	    catch throw:{dialyzer_error, _} -> dialyzer_plt:new()
-	    end,
+  InitPlt =
+    case InitPltFiles of
+      [] -> dialyzer_plt:new();
+      _ ->
+        Plts = [dialyzer_plt:from_file(F) || F <- InitPltFiles],
+        dialyzer_plt:merge_plts_or_report_conflicts(InitPltFiles, Plts)
+    end,
 
   State = #gui_state{add_all = AddAll,
 		     add_file = AddFile,
diff --git a/lib/dialyzer/src/dialyzer_gui_wx.erl b/lib/dialyzer/src/dialyzer_gui_wx.erl
index 2e309d7ec1..e711c15ea7 100644
--- a/lib/dialyzer/src/dialyzer_gui_wx.erl
+++ b/lib/dialyzer/src/dialyzer_gui_wx.erl
@@ -88,7 +88,7 @@ start(DialyzerOptions) ->
   State = wx:batch(fun() -> create_window(Wx, DialyzerOptions) end),
   gui_loop(State).
 
-create_window(Wx, DialyzerOptions) ->
+create_window(Wx, #options{init_plts = InitPltFiles} = DialyzerOptions) ->
   {ok, Host} = inet:gethostname(),
 
   %%---------- initializing frame ---------
@@ -258,11 +258,15 @@ create_window(Wx, DialyzerOptions) ->
 	       plt = PltMenu,
 	       options =OptionsMenu,
 	       help = HelpMenu},
- 
-  InitPlt = try dialyzer_plt:from_file(DialyzerOptions#options.init_plt)
-	    catch throw:{dialyzer_error, _} -> dialyzer_plt:new()
-	    end,
 
+  InitPlt =
+    case InitPltFiles of
+      [] -> dialyzer_plt:new();
+      _ ->
+        Plts = [dialyzer_plt:from_file(F) || F <- InitPltFiles],
+        dialyzer_plt:merge_plts_or_report_conflicts(InitPltFiles, Plts)
+    end,
+  
   #gui_state{add = AddButton,
 	     add_dir = AddDirButton,
 	     add_rec = AddRecButton,
diff --git a/lib/dialyzer/src/dialyzer_options.erl b/lib/dialyzer/src/dialyzer_options.erl
index da0e1f9aaf..b5cefd16ca 100644
--- a/lib/dialyzer/src/dialyzer_options.erl
+++ b/lib/dialyzer/src/dialyzer_options.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. 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
@@ -53,14 +53,21 @@ build(Opts) ->
   InitPlt = dialyzer_plt:get_default_plt(),
   DefaultOpts = #options{},
   DefaultOpts1 = DefaultOpts#options{legal_warnings = DefaultWarns1,
-				      init_plt = InitPlt},
-  try 
-    NewOpts = build_options(Opts, DefaultOpts1),
+                                     init_plts = [InitPlt]},
+  try
+    Opts1 = preprocess_opts(Opts),
+    NewOpts = build_options(Opts1, DefaultOpts1),
     postprocess_opts(NewOpts)
   catch
     throw:{dialyzer_options_error, Msg} -> {error, Msg}
   end.
 
+preprocess_opts([]) -> [];
+preprocess_opts([{init_plt, File}|Opts]) ->
+  [{plts, [File]}|preprocess_opts(Opts)];
+preprocess_opts([Opt|Opts]) ->
+  [Opt|preprocess_opts(Opts)].
+
 postprocess_opts(Opts = #options{}) ->
   Opts1 = check_output_plt(Opts),
   adapt_get_warnings(Opts1).
@@ -144,9 +151,9 @@ build_options([{OptionName, Value} = Term|Rest], Options) ->
       build_options(Rest, Options#options{from = Value});
     get_warnings ->
       build_options(Rest, Options#options{get_warnings = Value});
-    init_plt ->
-      assert_filenames([Term], [Value]),
-      build_options(Rest, Options#options{init_plt = Value});
+    plts ->
+      assert_filenames(Term, Value),
+      build_options(Rest, Options#options{init_plts = Value});
     include_dirs ->
       assert_filenames(Term, Value),
       OldVal = Options#options.include_dirs,
@@ -162,6 +169,9 @@ build_options([{OptionName, Value} = Term|Rest], Options) ->
     output_format ->
       assert_output_format(Value),
       build_options(Rest, Options#options{output_format = Value});
+    filename_opt ->
+      assert_filename_opt(Value),
+      build_options(Rest, Options#options{filename_opt = Value});
     output_plt ->
       assert_filename(Value),
       build_options(Rest, Options#options{output_plt = Value});
@@ -184,7 +194,7 @@ build_options([], Options) ->
 assert_filenames(Term, [FileName|Left]) when length(FileName) >= 0 ->
   case filelib:is_file(FileName) orelse filelib:is_dir(FileName) of
     true -> ok;
-    false -> bad_option("No such file or directory", FileName)
+    false -> bad_option("No such file, directory or application", FileName)
   end,
   assert_filenames(Term, Left);
 assert_filenames(_Term, []) ->
@@ -211,6 +221,13 @@ assert_output_format(formatted) ->
 assert_output_format(Term) ->
   bad_option("Illegal value for output_format", Term).
 
+assert_filename_opt(basename) ->
+  ok;
+assert_filename_opt(fullpath) ->
+  ok;
+assert_filename_opt(Term) ->
+  bad_option("Illegal value for filename_opt", Term).
+
 assert_plt_op(#options{analysis_type = OldVal}, 
 	      #options{analysis_type = NewVal}) ->
   case is_plt_mode(OldVal) andalso is_plt_mode(NewVal) of
diff --git a/lib/dialyzer/src/dialyzer_plt.erl b/lib/dialyzer/src/dialyzer_plt.erl
index c10375eea2..a7ba270c41 100644
--- a/lib/dialyzer/src/dialyzer_plt.erl
+++ b/lib/dialyzer/src/dialyzer_plt.erl
@@ -21,13 +21,15 @@
 %%%-------------------------------------------------------------------
 %%% File    : dialyzer_plt.erl
 %%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : Interface to display information in the persistent 
+%%% Description : Interface to display information in the persistent
 %%%               lookup tables.
 %%%
 %%% Created : 23 Jul 2004 by Tobias Lindahl <[email protected]>
 %%%-------------------------------------------------------------------
 -module(dialyzer_plt).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([check_plt/3,
 	 compute_md5_from_files/1,
 	 contains_mfa/2,
@@ -49,6 +51,7 @@
 	 lookup_contract/2,
 	 lookup_module/2,
 	 merge_plts/1,
+         merge_plts_or_report_conflicts/2,
 	 new/0,
 	 plt_and_info_from_file/1,
 	 get_specs/1,
@@ -101,7 +104,7 @@
 new() ->
   #plt{}.
 
--spec delete_module(plt(), module()) -> plt().
+-spec delete_module(plt(), atom()) -> plt().
 
 delete_module(#plt{info = Info, types = Types, contracts = Contracts,
                    exported_types = ExpTypes}, Mod) ->
@@ -136,7 +139,7 @@ delete_contract_list(#plt{contracts = Contracts} = PLT, List) ->
   PLT#plt{contracts = table_delete_list(Contracts, List)}.
 
 %% -spec insert(plt(), mfa() | integer(), {_, _}) -> plt().
-%% 
+%%
 %% insert(#plt{info = Info} = PLT, Id, Types) ->
 %%   PLT#plt{info = table_insert(Info, Id, Types)}.
 
@@ -177,12 +180,12 @@ get_exported_types(#plt{exported_types = ExpTypes}) ->
 
 -type mfa_types() :: {mfa(), erl_types:erl_type(), [erl_types:erl_type()]}.
 
--spec lookup_module(plt(), module()) -> 'none' | {'value', [mfa_types()]}.
+-spec lookup_module(plt(), atom()) -> 'none' | {'value', [mfa_types()]}.
 
 lookup_module(#plt{info = Info}, M) when is_atom(M) ->
   table_lookup_module(Info, M).
 
--spec contains_module(plt(), module()) -> boolean().
+-spec contains_module(plt(), atom()) -> boolean().
 
 contains_module(#plt{info = Info, contracts = Cs}, M) when is_atom(M) ->
   table_contains_module(Info, M) orelse table_contains_module(Cs, M).
@@ -190,7 +193,7 @@ contains_module(#plt{info = Info, contracts = Cs}, M) when is_atom(M) ->
 -spec contains_mfa(plt(), mfa()) -> boolean().
 
 contains_mfa(#plt{info = Info, contracts = Contracts}, MFA) ->
-  (table_lookup(Info, MFA) =/= none) 
+  (table_lookup(Info, MFA) =/= none)
     orelse (table_lookup(Contracts, MFA) =/= none).
 
 -spec get_default_plt() -> file:filename().
@@ -221,10 +224,10 @@ from_file(FileName, ReturnInfo) ->
   case get_record_from_file(FileName) of
     {ok, Rec} ->
       case check_version(Rec) of
-	error -> 
+	error ->
 	  Msg = io_lib:format("Old PLT file ~s\n", [FileName]),
 	  error(Msg);
-	ok -> 
+	ok ->
 	  Plt = #plt{info = Rec#file_plt.info,
 		     types = Rec#file_plt.types,
 		     contracts = Rec#file_plt.contracts,
@@ -238,13 +241,14 @@ from_file(FileName, ReturnInfo) ->
 	  end
       end;
     {error, Reason} ->
-      error(io_lib:format("Could not read PLT file ~s: ~p\n", 
+      error(io_lib:format("Could not read PLT file ~s: ~p\n",
 			  [FileName, Reason]))
   end.
 
--type inc_file_err_rsn() :: 'no_such_file' | 'read_error'.
--spec included_files(file:filename()) -> {'ok', [file:filename()]} 
-				      |  {'error', inc_file_err_rsn()}.
+-type err_rsn() :: 'not_valid' | 'no_such_file' | 'read_error'.
+
+-spec included_files(file:filename()) -> {'ok', [file:filename()]}
+				      |  {'error', err_rsn()}.
 
 included_files(FileName) ->
   case get_record_from_file(FileName) of
@@ -268,12 +272,12 @@ get_record_from_file(FileName) ->
       try binary_to_term(Bin) of
 	  #file_plt{} = FilePLT -> {ok, FilePLT};
 	  _ -> {error, not_valid}
-      catch 
+      catch
 	_:_ -> {error, not_valid}
       end;
     {error, enoent} ->
       {error, no_such_file};
-    {error, _} -> 
+    {error, _} ->
       {error, read_error}
   end.
 
@@ -289,15 +293,47 @@ merge_plts(List) ->
        exported_types = sets_merge(ExpTypesList),
        contracts = table_merge(ContractsList)}.
 
+-spec merge_disj_plts([plt()]) -> plt().
+
+merge_disj_plts(List) ->
+  InfoList = [Info || #plt{info = Info} <- List],
+  TypesList = [Types || #plt{types = Types} <- List],
+  ExpTypesList = [ExpTypes || #plt{exported_types = ExpTypes} <- List],
+  ContractsList = [Contracts || #plt{contracts = Contracts} <- List],
+  #plt{info = table_disj_merge(InfoList),
+       types = table_disj_merge(TypesList),
+       exported_types = sets_disj_merge(ExpTypesList),
+       contracts = table_disj_merge(ContractsList)}.
+
+-spec merge_plts_or_report_conflicts([file:filename()], [plt()]) -> plt().
+
+merge_plts_or_report_conflicts(PltFiles, Plts) ->
+  try
+    merge_disj_plts(Plts)
+  catch throw:{dialyzer_error, not_disjoint_plts} ->
+      IncFiles = lists:append([begin {ok, Fs} = included_files(F), Fs end
+                               || F <- PltFiles]),
+      ConfFiles = find_duplicates(IncFiles),
+      Msg = io_lib:format("Could not merge PLTs since they are not disjoint\n"
+                          "The following files are included in more than one "
+                          "PLTs:\n~p\n", [ConfFiles]),
+      error(Msg)
+  end.
+
+find_duplicates(List) ->
+  ModList = [filename:basename(E) || E <- List],
+  SortedList = lists:usort(ModList),
+  lists:usort(ModList -- SortedList).
+  
 -spec to_file(file:filename(), plt(), mod_deps(), {[file_md5()], mod_deps()}) -> 'ok'.
 
 to_file(FileName,
 	#plt{info = Info, types = Types, contracts = Contracts,
              exported_types = ExpTypes},
 	ModDeps, {MD5, OldModDeps}) ->
-  NewModDeps = dict:merge(fun(_Key, OldVal, NewVal) -> 
+  NewModDeps = dict:merge(fun(_Key, OldVal, NewVal) ->
 			      ordsets:union(OldVal, NewVal)
-			  end, 
+			  end,
 			  OldModDeps, ModDeps),
   ImplMd5 = compute_implementation_md5(),
   Record = #file_plt{version = ?VSN,
@@ -312,16 +348,15 @@ to_file(FileName,
   case file:write_file(FileName, Bin) of
     ok -> ok;
     {error, Reason} ->
-      Msg = io_lib:format("Could not write PLT file ~s: ~w\n", 
+      Msg = io_lib:format("Could not write PLT file ~s: ~w\n",
 			  [FileName, Reason]),
       throw({dialyzer_error, Msg})
   end.
 
 -type md5_diff()    :: [{'differ', atom()} | {'removed', atom()}].
--type check_error() :: 'not_valid' | 'no_such_file' | 'read_error'
-                     | {'no_file_to_remove', file:filename()}.
-      
--spec check_plt(file:filename(), [file:filename()], [file:filename()]) -> 
+-type check_error() :: err_rsn() | {'no_file_to_remove', file:filename()}.
+
+-spec check_plt(file:filename(), [file:filename()], [file:filename()]) ->
 	 'ok'
        | {'error', check_error()}
        | {'differ', [file_md5()], md5_diff(), mod_deps()}
@@ -331,7 +366,7 @@ check_plt(FileName, RemoveFiles, AddFiles) ->
   case get_record_from_file(FileName) of
     {ok, #file_plt{file_md5_list = Md5, mod_deps = ModDeps} = Rec} ->
       case check_version(Rec) of
-	ok -> 
+	ok ->
 	  case compute_new_md5(Md5, RemoveFiles, AddFiles) of
 	    ok -> ok;
 	    {differ, NewMd5, DiffMd5} -> {differ, NewMd5, DiffMd5, ModDeps};
@@ -388,7 +423,7 @@ compute_md5_from_files(Files) ->
 
 compute_md5_from_file(File) ->
   case filelib:is_regular(File) of
-    false -> 
+    false ->
       Msg = io_lib:format("Not a regular file: ~s\n", [File]),
       throw({dialyzer_error, Msg});
     true ->
@@ -419,7 +454,7 @@ init_md5_list_1([{File, _Md5}|Md5Left], [{remove, File}|DiffLeft], Acc) ->
   init_md5_list_1(Md5Left, DiffLeft, Acc);
 init_md5_list_1([{File, _Md5} = Entry|Md5Left], [{add, File}|DiffLeft], Acc) ->
   init_md5_list_1(Md5Left, DiffLeft, [Entry|Acc]);
-init_md5_list_1([{File1, _Md5} = Entry|Md5Left] = Md5List, 
+init_md5_list_1([{File1, _Md5} = Entry|Md5Left] = Md5List,
 		[{Tag, File2}|DiffLeft] = DiffList, Acc) ->
   case File1 < File2 of
     true -> init_md5_list_1(Md5Left, DiffList, [Entry|Acc]);
@@ -450,7 +485,7 @@ get_specs(#plt{info = Info}) ->
 beam_file_to_module(Filename) ->
   list_to_atom(filename:basename(Filename, ".beam")).
 
--spec get_specs(plt(), module(), atom(), arity_patt()) -> 'none' | string().
+-spec get_specs(plt(), atom(), atom(), arity_patt()) -> 'none' | string().
 
 get_specs(#plt{info = Info}, M, F, A) when is_atom(M), is_atom(F) ->
   MFA = {M, F, A},
@@ -460,7 +495,7 @@ get_specs(#plt{info = Info}, M, F, A) when is_atom(M), is_atom(F) ->
   end.
 
 create_specs([{{M, F, _A}, {Ret, Args}}|Left], M) ->
-  [io_lib:format("-spec ~w(~s) -> ~s\n", 
+  [io_lib:format("-spec ~w(~s) -> ~s\n",
 		 [F, expand_args(Args), erl_types:t_to_string(Ret)])
    | create_specs(Left, M)];
 create_specs(List = [{{M, _F, _A}, {_Ret, _Args}}| _], _M) ->
@@ -516,7 +551,7 @@ table_insert_list(Plt, [{Key, Val}|Left]) ->
 table_insert_list(Plt, []) ->
   Plt.
 
-table_insert(Plt, Key, {_Ret, _Arg} = Obj) -> 
+table_insert(Plt, Key, {_Ret, _Arg} = Obj) ->
   dict:store(Key, Obj, Plt);
 table_insert(Plt, Key, #contract{} = C) ->
   dict:store(Key, C, Plt).
@@ -554,6 +589,25 @@ table_merge([Plt|Plts], Acc) ->
   NewAcc = dict:merge(fun(_Key, Val, Val) -> Val end, Plt, Acc),
   table_merge(Plts, NewAcc).
 
+table_disj_merge([H|T]) ->
+  table_disj_merge(T, H).
+
+table_disj_merge([], Acc) ->
+  Acc;
+table_disj_merge([Plt|Plts], Acc) ->
+  case table_is_disjoint(Plt, Acc) of
+    true ->
+      NewAcc = dict:merge(fun(_Key, _Val1, _Val2) -> gazonk end,
+                          Plt, Acc),
+      table_disj_merge(Plts, NewAcc);
+    false -> throw({dialyzer_error, not_disjoint_plts})
+  end.
+
+table_is_disjoint(T1, T2) ->
+  K1 = dict:fetch_keys(T1),
+  K2 = dict:fetch_keys(T2),
+  lists:all(fun(E) -> not lists:member(E, K2) end, K1).
+
 sets_merge([H|T]) ->
   sets_merge(T, H).
 
@@ -563,6 +617,19 @@ sets_merge([Plt|Plts], Acc) ->
   NewAcc = sets:union(Plt, Acc),
   sets_merge(Plts, NewAcc).
 
+sets_disj_merge([H|T]) ->
+  sets_disj_merge(T, H).
+
+sets_disj_merge([], Acc) ->
+  Acc;
+sets_disj_merge([Plt|Plts], Acc) ->
+  case sets:is_disjoint(Plt, Acc) of
+    true ->
+      NewAcc = sets:union(Plt, Acc),
+      sets_disj_merge(Plts, NewAcc);
+    false -> throw({dialyzer_error, not_disjoint_plts})
+  end.
+
 %%---------------------------------------------------------------------------
 %% Debug utilities.
 
@@ -592,7 +659,7 @@ pp_non_returning() ->
 			      [M, F, dialyzer_utils:format_sig(Type)])
 		end, lists:sort(None)).
 
--spec pp_mod(module()) -> 'ok'.
+-spec pp_mod(atom()) -> 'ok'.
 
 pp_mod(Mod) when is_atom(Mod) ->
   PltFile = get_default_plt(),
diff --git a/lib/dialyzer/src/dialyzer_races.erl b/lib/dialyzer/src/dialyzer_races.erl
index fb16e6a75f..ee9d5e88a3 100644
--- a/lib/dialyzer/src/dialyzer_races.erl
+++ b/lib/dialyzer/src/dialyzer_races.erl
@@ -21,7 +21,7 @@
 %%%----------------------------------------------------------------------
 %%% File    : dialyzer_races.erl
 %%% Author  : Maria Christakis <[email protected]>
-%%% Description : Utility functions for race condition detection 
+%%% Description : Utility functions for race condition detection
 %%%
 %%% Created : 21 Nov 2008 by Maria Christakis <[email protected]>
 %%%----------------------------------------------------------------------
@@ -39,7 +39,7 @@
          let_tag_new/2, new/0, put_curr_fun/3, put_fun_args/2,
          put_race_analysis/2, put_race_list/3]).
 
--export_type([races/0]).
+-export_type([races/0, mfa_or_funlbl/0, core_vars/0]).
 
 -include("dialyzer.hrl").
 
@@ -82,7 +82,7 @@
 -type call()       :: 'whereis' | 'register' | 'unregister' | 'ets_new'
                     | 'ets_lookup' | 'ets_insert' | 'mnesia_dirty_read1'
                     | 'mnesia_dirty_read2' | 'mnesia_dirty_write1'
-                    | 'mnesia_dirty_write2' | 'function_call'. 
+                    | 'mnesia_dirty_write2' | 'function_call'.
 -type race_tag()   :: 'whereis_register' | 'whereis_unregister'
                     | 'ets_lookup_insert' | 'mnesia_dirty_read_write'.
 
@@ -118,7 +118,7 @@
                      var_map    :: dict()}).
 
 -type case_tags()  :: 'beg_case' | #beg_clause{} | #end_clause{} | #end_case{}.
--type code()       :: [#dep_call{} | #warn_call{} | #fun_call{} |
+-type code()       :: [#dep_call{} | #fun_call{} | #warn_call{} |
                        #curr_fun{} | #let_tag{} | case_tags() | race_tag()].
 
 -type table_var()  :: label() | ?no_label.
@@ -159,7 +159,7 @@
 %%% ===========================================================================
 
 -spec store_race_call(mfa_or_funlbl(), [erl_types:erl_type()], [core_vars()],
-                      file_line(), dialyzer_dataflow:state()) -> 
+                      file_line(), dialyzer_dataflow:state()) ->
   dialyzer_dataflow:state().
 
 store_race_call(Fun, ArgTypes, Args, FileLine, State) ->
@@ -168,7 +168,7 @@ store_race_call(Fun, ArgTypes, Args, FileLine, State) ->
   CurrFunLabel = Races#races.curr_fun_label,
   RaceTags = Races#races.race_tags,
   CleanState = dialyzer_dataflow:state__records_only(State),
-  {NewRaceList, NewRaceListSize, NewRaceTags, NewTable} = 
+  {NewRaceList, NewRaceListSize, NewRaceTags, NewTable} =
     case CurrFun of
       {_Module, module_info, A} when A =:= 0 orelse A =:= 1 ->
         {[], 0, RaceTags, no_t};
@@ -424,7 +424,7 @@ fixup_race_forward_pullout(CurrFun, CurrFunLabel, Calls, Code, RaceList,
                 Races = dialyzer_dataflow:state__get_races(State),
                 {RetCurrFun, RetCurrFunLabel, RetCalls, RetCode,
                  RetRaceList, RetRaceVarMap, RetFunDefVars, RetFunCallVars,
-                 RetFunArgTypes, RetNestingLevel} = 
+                 RetFunArgTypes, RetNestingLevel} =
                   fixup_race_forward_helper(NewCurrFun,
                       NewCurrFunLabel, Fun, Int, NewCalls, NewCalls,
                       [#curr_fun{status = out, mfa = NewCurrFun,
@@ -479,23 +479,11 @@ fixup_race_forward(CurrFun, CurrFunLabel, Calls, Code, RaceList,
               _Other ->
                 {RaceList, [], NestingLevel, false}
             end;
-          #dep_call{call_name = ets_lookup, args = DepCallArgs} ->
+          #dep_call{call_name = ets_lookup} ->
             case RaceWarnTag of
               ?WARN_ETS_LOOKUP_INSERT ->
-                [Tab, Names, _, _] = DepCallArgs,
-                case compare_var_list(Tab,
-                  dialyzer_callgraph:get_public_tables(Callgraph),
-                  RaceVarMap)
-                  orelse
-                  length(Names --
-                  dialyzer_callgraph:get_named_tables(Callgraph)) <
-                  length(Names) of
-                  true ->
-                    {[Head#dep_call{var_map = RaceVarMap}|RaceList],
-                     [], NestingLevel, false};
-                  false ->
-                    {RaceList, [], NestingLevel, false}
-                end;
+                {[Head#dep_call{var_map = RaceVarMap}|RaceList],
+                 [], NestingLevel, false};
               _Other ->
                 {RaceList, [], NestingLevel, false}
             end;
@@ -517,23 +505,11 @@ fixup_race_forward(CurrFun, CurrFunLabel, Calls, Code, RaceList,
               _Other ->
                 {RaceList, [], NestingLevel, false}
             end;
-  	  #warn_call{call_name = ets_insert, args = WarnCallArgs} ->
+  	  #warn_call{call_name = ets_insert} ->
             case RaceWarnTag of
               ?WARN_ETS_LOOKUP_INSERT ->
-                [Tab, Names, _, _] = WarnCallArgs,
-                case compare_var_list(Tab,
-                  dialyzer_callgraph:get_public_tables(Callgraph),
-                  RaceVarMap)
-                  orelse
-                  length(Names --
-                  dialyzer_callgraph:get_named_tables(Callgraph)) <
-                  length(Names) of
-                  true ->
-                    {[Head#warn_call{var_map = RaceVarMap}|RaceList],
-                     [], NestingLevel, false};
-                  false ->
-                    {RaceList, [], NestingLevel, false}
-                end;
+                {[Head#warn_call{var_map = RaceVarMap}|RaceList],
+                 [], NestingLevel, false};
               _Other ->
                 {RaceList, [], NestingLevel, false}
             end;
@@ -578,7 +554,7 @@ fixup_race_forward(CurrFun, CurrFunLabel, Calls, Code, RaceList,
           RaceTag ->
             PublicTables = dialyzer_callgraph:get_public_tables(Callgraph),
             NamedTables = dialyzer_callgraph:get_named_tables(Callgraph),
-            WarnVarArgs1 = 
+            WarnVarArgs1 =
               var_type_analysis(FunDefVars, FunArgTypes, WarnVarArgs,
                                 RaceWarnTag, RaceVarMap,
                                 dialyzer_dataflow:state__records_only(State)),
@@ -600,7 +576,7 @@ fixup_race_forward(CurrFun, CurrFunLabel, Calls, Code, RaceList,
                     [#warn_call{call_name = ets_insert, args = WarnVarArgs,
                                 var_map = RaceVarMap}],
                   [Tab, Names, _, _] = WarnVarArgs,
-                  case IsPublic orelse 
+                  case IsPublic orelse
                     compare_var_list(Tab, PublicTables, RaceVarMap)
                     orelse
                     length(Names -- NamedTables) < length(Names) of
@@ -638,7 +614,7 @@ fixup_race_forward(CurrFun, CurrFunLabel, Calls, Code, RaceList,
                  #curr_fun{mfa = CurrFun2, label = CurrFunLabel2,
                            var_map = RaceVarMap2, def_vars = FunDefVars2,
                            call_vars = FunCallVars2, arg_types = FunArgTypes2},
-                 Code2, NestingLevel2} = 
+                 Code2, NestingLevel2} =
                   remove_clause(NewRL,
                                 #curr_fun{mfa = CurrFun, label = CurrFunLabel,
                                           var_map = RaceVarMap1,
@@ -650,7 +626,7 @@ fixup_race_forward(CurrFun, CurrFunLabel, Calls, Code, RaceList,
                  RaceVarMap2, FunDefVars2, FunCallVars2, FunArgTypes2,
                  NestingLevel2, false};
               false ->
-                {CurrFun, CurrFunLabel, Tail, NewRL, RaceVarMap1, 
+                {CurrFun, CurrFunLabel, Tail, NewRL, RaceVarMap1,
                  FunDefVars, FunCallVars, FunArgTypes, NewNL, false}
             end;
           #end_clause{arg = Arg, pats = Pats, guard = Guard} ->
@@ -895,7 +871,7 @@ do_clause(RaceList, WarnVarArgs, RaceWarnTag, RaceVarMap, CurrLevel,
           PublicTables, NamedTables) ->
   {DepList, IsPublic, Continue} =
     get_deplist_paths(fixup_case_path(RaceList, 0), WarnVarArgs,
-		      RaceWarnTag, RaceVarMap, CurrLevel, 
+		      RaceWarnTag, RaceVarMap, CurrLevel,
                       PublicTables, NamedTables),
   {fixup_case_rest_paths(RaceList, 0), DepList, IsPublic, Continue}.
 
@@ -965,7 +941,7 @@ fixup_race_forward_helper(CurrFun, CurrFunLabel, Fun, FunLabel,
        #curr_fun{mfa = NewCurrFun, label = NewCurrFunLabel,
                  var_map = NewRaceVarMap, def_vars = NewFunDefVars,
                  call_vars = NewFunCallVars, arg_types = NewFunArgTypes},
-       NewCode, NewNestingLevel} = 
+       NewCode, NewNestingLevel} =
         remove_clause(RaceList,
         #curr_fun{mfa = CurrFun, label = CurrFunLabel, var_map = RaceVarMap,
                   def_vars = FunDefVars, call_vars = FunCallVars,
@@ -997,7 +973,7 @@ fixup_race_forward_helper(CurrFun, CurrFunLabel, Fun, FunLabel,
                        arg_types = NewFunTypes}],
             [#curr_fun{status = in, mfa = Fun,
                        label = FunLabel, var_map = NewRaceVarMap,
-                       def_vars = Args, call_vars = NewFunArgs, 
+                       def_vars = Args, call_vars = NewFunArgs,
                        arg_types = NewFunTypes}|
             lists:reverse(StateRaceList)] ++
             RetC, NewRaceVarMap),
@@ -1062,7 +1038,7 @@ fixup_race_backward(CurrFun, Calls, CallsToAnalyze, Parents, Height) ->
   case Height =:= 0 of
     true -> Parents;
     false ->
-      case Calls of 
+      case Calls of
         [] ->
           case is_integer(CurrFun) orelse lists:member(CurrFun, Parents) of
             true -> Parents;
@@ -1221,7 +1197,7 @@ are_bound_vars(Vars1, Vars2, RaceVarMap) ->
 callgraph__renew_tables(Table, Callgraph) ->
   case Table of
     {named, NameLabel, Names} ->
-      PTablesToAdd = 
+      PTablesToAdd =
         case NameLabel of
           ?no_label -> [];
           _Other -> [NameLabel]
@@ -1440,7 +1416,7 @@ lists_key_members_lists_helper(Elem, List, N) when is_integer(Elem) ->
   end;
 lists_key_members_lists_helper(_Elem, _List, _N) ->
   [0].
-          
+
 lists_key_replace(N, List, NewMember) ->
   {Before, [_|After]} = lists:split(N - 1, List),
   Before ++ [NewMember|After].
@@ -1490,7 +1466,7 @@ refine_race_helper(RaceCall, VarArgs, WarnVarArgs, RaceWarnTag, DependencyList,
     false -> DependencyList
   end.
 
-remove_clause(RaceList, CurrTuple, Code, NestingLevel) -> 
+remove_clause(RaceList, CurrTuple, Code, NestingLevel) ->
   NewRaceList = fixup_case_rest_paths(RaceList, 0),
   {NewCurrTuple, NewCode} =
     cleanup_clause_code(CurrTuple, Code, 0, NestingLevel),
@@ -1623,7 +1599,7 @@ compare_ets_insert(OldWarnVarArgs, NewWarnVarArgs, RaceVarMap) ->
         end
     end,
   case Bool of
-    true -> 
+    true ->
       case any_args(Old4) of
         true ->
           case compare_list_vars(Old3, ets_list_args(New3), [], RaceVarMap) of
@@ -1692,7 +1668,6 @@ compare_types(VarArgs, WarnVarArgs, RaceWarnTag, RaceVarMap) ->
             false ->
               compare_var_list(VA1, WVA1, RaceVarMap) orelse
                 compare_argtypes(VA2, WVA2)
-                
           end
       end;
     ?WARN_WHEREIS_UNREGISTER ->
@@ -1717,12 +1692,12 @@ compare_types(VarArgs, WarnVarArgs, RaceWarnTag, RaceVarMap) ->
           false ->
             case any_args(WVA2) of
               true -> compare_var_list(VA1, WVA1, RaceVarMap);
-              false -> 
+              false ->
                 compare_var_list(VA1, WVA1, RaceVarMap) orelse
                   compare_argtypes(VA2, WVA2)
             end
         end,
-      Bool andalso  
+      Bool andalso
         (case any_args(VA4) of
            true ->
              compare_var_list(VA3, WVA3, RaceVarMap);
@@ -2159,7 +2134,7 @@ race_var_map_guard_helper1(Arg, Pats, RaceVarMap, Op) ->
                     _Else -> {RaceVarMap, false}
                   end;
                 false -> {RaceVarMap, false}
-              end;                   
+              end;
             _Other -> {RaceVarMap, false}
           end;
         _Other -> {RaceVarMap, false}
@@ -2242,7 +2217,7 @@ var_analysis(FunDefArgs, FunCallArgs, WarnVarArgs, RaceWarnTag) ->
       [WVA1, WVA2|T] = WarnVarArgs,
       ArgNos = lists_key_members_lists(WVA1, FunDefArgs),
       [[lists_get(N, FunCallArgs) || N <- ArgNos], WVA2|T]
-  end.     
+  end.
 
 var_type_analysis(FunDefArgs, FunCallTypes, WarnVarArgs, RaceWarnTag,
                   RaceVarMap, CleanState) ->
@@ -2287,7 +2262,7 @@ var_type_analysis(FunDefArgs, FunCallTypes, WarnVarArgs, RaceWarnTag,
             ets_tuple_argtypes1(lists:nth(N2 + 1, FunVarArgs), [], [], 0),
             []),
           FirstVarArg ++ [Vars2, NewWVA4]
-          
+
       end;
     ?WARN_MNESIA_DIRTY_READ_WRITE ->
       [WVA1, WVA2|T] = WarnVarArgs,
@@ -2331,7 +2306,7 @@ get_race_warn(Fun, Args, ArgTypes, DepList, State) ->
 
 -spec get_race_warnings(races(), dialyzer_dataflow:state()) ->
   {races(), dialyzer_dataflow:state()}.
-  
+
 get_race_warnings(#races{race_warnings = RaceWarnings}, State) ->
   get_race_warnings_helper(RaceWarnings, State).
 
@@ -2431,12 +2406,12 @@ end_clause_new(Arg, Pats, Guard) ->
   #end_clause{arg = Arg, pats = Pats, guard = Guard}.
 
 -spec get_curr_fun(races()) -> mfa_or_funlbl().
-  
+
 get_curr_fun(#races{curr_fun = CurrFun}) ->
   CurrFun.
 
 -spec get_curr_fun_args(races()) -> core_args().
-  
+
 get_curr_fun_args(#races{curr_fun_args = CurrFunArgs}) ->
   CurrFunArgs.
 
@@ -2446,17 +2421,17 @@ get_new_table(#races{new_table = Table}) ->
   Table.
 
 -spec get_race_analysis(races()) -> boolean().
-  
+
 get_race_analysis(#races{race_analysis = RaceAnalysis}) ->
   RaceAnalysis.
 
 -spec get_race_list(races()) -> code().
-  
+
 get_race_list(#races{race_list = RaceList}) ->
   RaceList.
 
 -spec get_race_list_size(races()) -> non_neg_integer().
-  
+
 get_race_list_size(#races{race_list_size = RaceListSize}) ->
   RaceListSize.
 
@@ -2484,10 +2459,10 @@ put_fun_args(Args, #races{curr_fun_args = CurrFunArgs} = Races) ->
     empty -> Races#races{curr_fun_args = Args};
     _Other -> Races
   end.
-  
+
 -spec put_race_analysis(boolean(), races()) ->
   races().
-  
+
 put_race_analysis(Analysis, Races) ->
   Races#races{race_analysis = Analysis}.
 
diff --git a/lib/dialyzer/src/dialyzer_succ_typings.erl b/lib/dialyzer/src/dialyzer_succ_typings.erl
index 1ff4783852..8bfc66fc39 100644
--- a/lib/dialyzer/src/dialyzer_succ_typings.erl
+++ b/lib/dialyzer/src/dialyzer_succ_typings.erl
@@ -435,7 +435,7 @@ format_scc(SCC) ->
 %%
 %% ============================================================================
 
--spec doit(module() | string()) -> 'ok'.
+-spec doit(atom() | file:filename()) -> 'ok'.
 
 doit(Module) ->
   {ok, AbstrCode} = dialyzer_utils:get_abstract_code_from_src(Module),
diff --git a/lib/dialyzer/src/dialyzer_typesig.erl b/lib/dialyzer/src/dialyzer_typesig.erl
index 35b283a00a..c45615d670 100644
--- a/lib/dialyzer/src/dialyzer_typesig.erl
+++ b/lib/dialyzer/src/dialyzer_typesig.erl
@@ -21,7 +21,7 @@
 %%%-------------------------------------------------------------------
 %%% File    : dialyzer_typesig.erl
 %%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created : 25 Apr 2005 by Tobias Lindahl <[email protected]>
 %%%-------------------------------------------------------------------
@@ -31,12 +31,12 @@
 -export([analyze_scc/5]).
 -export([get_safe_underapprox/2]).
 
--import(erl_types, 
+-import(erl_types,
 	[t_any/0, t_atom/0, t_atom_vals/1,
 	 t_binary/0, t_bitstr/0, t_bitstr/2, t_bitstr_concat/1, t_boolean/0,
 	 t_collect_vars/1, t_cons/2, t_cons_hd/1, t_cons_tl/1,
 	 t_float/0, t_from_range/2, t_from_term/1,
-	 t_fun/0, t_fun/2, t_fun_args/1, t_fun_range/1, 
+	 t_fun/0, t_fun/2, t_fun_args/1, t_fun_range/1,
 	 t_has_var/1,
 	 t_inf/2, t_inf/3, t_integer/0,
 	 t_is_any/1, t_is_atom/1, t_is_atom/2, t_is_cons/1, t_is_equal/2,
@@ -44,7 +44,7 @@
 	 t_is_integer/1, t_non_neg_integer/0,
 	 t_is_list/1, t_is_nil/1, t_is_none/1, t_is_number/1,
 
-	 t_is_subtype/2, t_limit/2, t_list/0, t_list/1, 
+	 t_is_subtype/2, t_limit/2, t_list/0, t_list/1,
 	 t_list_elements/1, t_nonempty_list/1, t_maybe_improper_list/0,
 	 t_module/0, t_number/0, t_number_vals/1,
 	 t_opaque_match_record/2, t_opaque_matching_structure/2,
@@ -101,7 +101,7 @@
 		name_map      = dict:new() :: dict(),
 		next_label                 :: label(),
 		non_self_recs = []         :: [label()],
-		plt                        :: dialyzer_plt:plt(), 
+		plt                        :: dialyzer_plt:plt(),
 		prop_types    = dict:new() :: dict(),
 		records       = dict:new() :: dict(),
 		opaques       = []         :: [erl_types:erl_type()],
@@ -140,8 +140,8 @@
 %%             where Def = {Var, Fun} as in the Core Erlang module definitions.
 %%                   Records = dict(RecName, {Arity, [{FieldName, FieldType}]})
 %% NextLabel - An integer that is higher than any label in the code.
-%% CallGraph - A callgraph as produced by dialyzer_callgraph.erl 
-%%             Note: The callgraph must have been built with all the 
+%% CallGraph - A callgraph as produced by dialyzer_callgraph.erl
+%%             Note: The callgraph must have been built with all the
 %%                   code that the SCC is a part of.
 %% PLT       - A dialyzer PLT. This PLT should contain available information
 %%             about functions that can be called by this SCC.
@@ -150,7 +150,7 @@
 %%-----------------------------------------------------------------------------
 
 -spec analyze_scc(typesig_scc(), label(),
-		  dialyzer_callgraph:callgraph(), 
+		  dialyzer_callgraph:callgraph(),
 		  dialyzer_plt:plt(), dict()) -> dict().
 
 analyze_scc(SCC, NextLabel, CallGraph, Plt, PropTypes) ->
@@ -202,7 +202,7 @@ traverse(Tree, DefinedVars, State) ->
       {State1, OpType} = traverse(Op, DefinedVars, State0),
       {State2, FunType} = state__get_fun_prototype(OpType, Arity, State1),
       State3 = state__store_conj(FunType, eq, OpType, State2),
-      State4 = state__store_conj(mk_var(Tree), sub, t_fun_range(FunType), 
+      State4 = state__store_conj(mk_var(Tree), sub, t_fun_range(FunType),
 				 State3),
       State5 = state__store_conj_lists(ArgTypes, sub, t_fun_args(FunType),
 				       State4),
@@ -216,7 +216,7 @@ traverse(Tree, DefinedVars, State) ->
 	  end
       end;
     binary ->
-      {State1, SegTypes} = traverse_list(cerl:binary_segments(Tree), 
+      {State1, SegTypes} = traverse_list(cerl:binary_segments(Tree),
 					 DefinedVars, State),
       Type = mk_fun_var(fun(Map) ->
 			    TmpSegTypes = lookup_type_list(SegTypes, Map),
@@ -227,7 +227,7 @@ traverse(Tree, DefinedVars, State) ->
       Size = cerl:bitstr_size(Tree),
       UnitVal = cerl:int_val(cerl:bitstr_unit(Tree)),
       Val = cerl:bitstr_val(Tree),
-      {State1, [SizeType, ValType]} = 
+      {State1, [SizeType, ValType]} =
 	traverse_list([Size, Val], DefinedVars, State),
       {State2, TypeConstr} =
 	case cerl:bitstr_bitsize(Tree) of
@@ -250,7 +250,7 @@ traverse(Tree, DefinedVars, State) ->
 	    case state__is_in_match(State1) of
 	      true ->
 		Flags = cerl:concrete(cerl:bitstr_flags(Tree)),
-		mk_fun_var(bitstr_val_constr(SizeType, UnitVal, Flags), 
+		mk_fun_var(bitstr_val_constr(SizeType, UnitVal, Flags),
 			   [SizeType]);
 	      false -> t_integer()
 	    end;
@@ -282,7 +282,7 @@ traverse(Tree, DefinedVars, State) ->
 	false ->
 	  ConsVar = mk_var(Tree),
 	  ConsType = mk_fun_var(fun(Map) ->
-				    t_cons(lookup_type(HdVar, Map), 
+				    t_cons(lookup_type(HdVar, Map),
 					   lookup_type(TlVar, Map))
 				end, [HdVar, TlVar]),
 	  HdType = mk_fun_var(fun(Map) ->
@@ -299,8 +299,8 @@ traverse(Tree, DefinedVars, State) ->
 				    true -> t_cons_tl(Cons)
 				  end
 			      end, [ConsVar]),
-	  State2 = state__store_conj_lists([HdVar, TlVar, ConsVar], sub, 
-					   [HdType, TlType, ConsType], 
+	  State2 = state__store_conj_lists([HdVar, TlVar, ConsVar], sub,
+					   [HdType, TlType, ConsType],
 					   State1),
 	  {State2, ConsVar}
       end;
@@ -314,33 +314,35 @@ traverse(Tree, DefinedVars, State) ->
 	  error -> t_fun(length(Vars), t_none());
 	  {ok, Dom} -> t_fun(Dom, t_none())
 	end,
-      State2 = 
+      TreeVar = mk_var(Tree),
+      State2 =
 	try
 	  State1 = case state__add_prop_constrs(Tree, State0) of
 		     not_called -> State0;
 		     PropState -> PropState
 		   end,
 	  {BodyState, BodyVar} = traverse(Body, DefinedVars1, State1),
-	  state__store_conj(mk_var(Tree), eq, 
+	  state__store_conj(TreeVar, eq,
 			    t_fun(mk_var_list(Vars), BodyVar), BodyState)
 	catch
 	  throw:error ->
-	    state__store_conj(mk_var(Tree), eq, FunFailType, State0)
+	    state__store_conj(TreeVar, eq, FunFailType, State0)
 	end,
       Cs = state__cs(State2),
-      State3 = state__store_constrs(mk_var(Tree), Cs, State2),
-      Ref = mk_constraint_ref(mk_var(Tree), get_deps(Cs)),
+      State3 = state__store_constrs(TreeVar, Cs, State2),
+      Ref = mk_constraint_ref(TreeVar, get_deps(Cs)),
       OldCs = state__cs(State),
       State4 = state__new_constraint_context(State3),
       State5 = state__store_conj_list([OldCs, Ref], State4),
       State6 = state__store_fun_arity(Tree, State5),
-      {State6, mk_var(Tree)};
+      State7 = state__add_fun_to_scc(TreeVar, State6),
+      {State7, TreeVar};
     'let' ->
       Vars = cerl:let_vars(Tree),
       Arg = cerl:let_arg(Tree),
       Body = cerl:let_body(Tree),
       {State1, ArgVars} = traverse(Arg, DefinedVars, State),
-      State2 = state__store_conj(t_product(mk_var_list(Vars)), eq, 
+      State2 = state__store_conj(t_product(mk_var_list(Vars)), eq,
 				 ArgVars, State1),
       DefinedVars1 = add_def_list(Vars, DefinedVars),
       traverse(Body, DefinedVars1, State2);
@@ -353,12 +355,12 @@ traverse(Tree, DefinedVars, State) ->
       DefinedVars1 = add_def_list(Vars, DefinedVars),
       {State2, _} = traverse_list(Funs, DefinedVars1, State1),
       traverse(Body, DefinedVars1, State2);
-    literal ->      
+    literal ->
       %% This is needed for finding records
       case cerl:unfold_literal(Tree) of
-	Tree -> 
+	Tree ->
 	  Type = t_from_term(cerl:concrete(Tree)),
-	  NewType = 
+	  NewType =
 	    case erl_types:t_opaque_match_atom(Type, State#state.opaques) of
 	      [Opaque] -> Opaque;
 	      _ -> Type
@@ -370,7 +372,7 @@ traverse(Tree, DefinedVars, State) ->
       Defs = cerl:module_defs(Tree),
       Funs = [Fun || {_Var, Fun} <- Defs],
       Vars = [Var || {Var, _Fun} <- Defs],
-      DefinedVars1 = add_def_list(Vars, DefinedVars),      
+      DefinedVars1 = add_def_list(Vars, DefinedVars),
       State1 = state__store_funs(Vars, Funs, State),
       FoldFun = fun(Fun, AccState) ->
 		    {S, _} = traverse(Fun, DefinedVars1,
@@ -388,7 +390,7 @@ traverse(Tree, DefinedVars, State) ->
     'receive' ->
       Clauses = filter_match_fail(cerl:receive_clauses(Tree)),
       Timeout = cerl:receive_timeout(Tree),
-      case (cerl:is_c_atom(Timeout) andalso 
+      case (cerl:is_c_atom(Timeout) andalso
 	    (cerl:atom_val(Timeout) =:= infinity)) of
 	true ->
 	  handle_clauses(Clauses, mk_var(Tree), [], DefinedVars, State);
@@ -421,7 +423,7 @@ traverse(Tree, DefinedVars, State) ->
 		      case t_has_var(Var) of
 			true ->
 			  {AccState1, NewVar} = state__mk_var(AccState),
-			  {NewVar, 
+			  {NewVar,
 			   state__store_conj(Var, eq, NewVar, AccState1)};
 			false ->
 			  {Var, AccState}
@@ -431,7 +433,7 @@ traverse(Tree, DefinedVars, State) ->
 	    {TmpState, t_tuple(NewEvars)}
 	end,
       case Elements of
-	[Tag|Fields] -> 
+	[Tag|Fields] ->
 	  case cerl:is_c_atom(Tag) of
 	    true ->
 	      %% Check if an opaque term is constructed.
@@ -534,7 +536,7 @@ handle_try(Tree, DefinedVars, State) ->
   Handler = cerl:try_handler(Tree),
   State1 = state__new_constraint_context(State),
   {ArgBodyState, BodyVar} =
-    try 
+    try
       {State2, ArgVar} = traverse(Arg, DefinedVars, State1),
       DefinedVars1 = add_def_list(Vars, DefinedVars),
       {State3, BodyVar1} = traverse(Body, DefinedVars1, State2),
@@ -542,17 +544,17 @@ handle_try(Tree, DefinedVars, State) ->
 				 State3),
       {State4, BodyVar1}
     catch
-      throw:error -> 
+      throw:error ->
 	{State1, t_none()}
     end,
   State6 = state__new_constraint_context(ArgBodyState),
   {HandlerState, HandlerVar} =
     try
-      DefinedVars2 = add_def_list([X || X <- EVars, cerl:is_c_var(X)], 
+      DefinedVars2 = add_def_list([X || X <- EVars, cerl:is_c_var(X)],
 				  DefinedVars),
       traverse(Handler, DefinedVars2, State6)
     catch
-      throw:error -> 
+      throw:error ->
 	{State6, t_none()}
     end,
   ArgBodyCs = state__cs(ArgBodyState),
@@ -561,7 +563,7 @@ handle_try(Tree, DefinedVars, State) ->
   OldCs = state__cs(State),
   case state__is_in_guard(State) of
     true ->
-      Conj1 = mk_conj_constraint_list([ArgBodyCs, 
+      Conj1 = mk_conj_constraint_list([ArgBodyCs,
 				       mk_constraint(BodyVar, eq, TreeVar)]),
       Disj = mk_disj_constraint_list([Conj1,
 				      mk_constraint(HandlerVar, eq, TreeVar)]),
@@ -573,14 +575,14 @@ handle_try(Tree, DefinedVars, State) ->
       {NewCs, ReturnVar} =
 	case {t_is_none(BodyVar), t_is_none(HandlerVar)} of
 	  {false, false} ->
-	    Conj1 = 
+	    Conj1 =
 	      mk_conj_constraint_list([ArgBodyCs,
 				       mk_constraint(TreeVar, eq, BodyVar)]),
-	    Conj2 = 
+	    Conj2 =
 	      mk_conj_constraint_list([HandlerCs,
 				       mk_constraint(TreeVar, eq, HandlerVar)]),
 	    Disj = mk_disj_constraint_list([Conj1, Conj2]),
-	    {Disj, mk_var(Tree)};
+	    {Disj, TreeVar};
 	  {false, true} ->
 	    {mk_conj_constraint_list([ArgBodyCs,
 				      mk_constraint(TreeVar, eq, BodyVar)]),
@@ -603,7 +605,7 @@ handle_try(Tree, DefinedVars, State) ->
 %% Call
 %%
 
-handle_call(Call, DefinedVars, State) ->      
+handle_call(Call, DefinedVars, State) ->
   Args = cerl:call_args(Call),
   Mod = cerl:call_module(Call),
   Fun = cerl:call_name(Call),
@@ -618,7 +620,7 @@ handle_call(Call, DefinedVars, State) ->
       case state__lookup_rec_var_in_scope(MFA, State) of
 	error ->
 	  case get_bif_constr(MFA, Dst, ArgVars, State1) of
-	    none -> 
+	    none ->
 	      {get_plt_constr(MFA, Dst, ArgVars, State1), Dst};
 	    C ->
 	      {state__store_conj(C, State1), Dst}
@@ -647,7 +649,7 @@ get_plt_constr(MFA, Dst, ArgVars, State) ->
       case PltRes of
 	none -> State;
 	{value, {PltRetType, PltArgTypes}} ->
-	  state__store_conj_lists([Dst|ArgVars], sub, 
+	  state__store_conj_lists([Dst|ArgVars], sub,
 				  [PltRetType|PltArgTypes], State)
       end;
     {value, #contract{args = GenArgs} = C} ->
@@ -655,7 +657,7 @@ get_plt_constr(MFA, Dst, ArgVars, State) ->
 	case PltRes of
 	  none ->
 	    {mk_fun_var(fun(Map) ->
-			    ArgTypes = lookup_type_list(ArgVars, Map), 
+			    ArgTypes = lookup_type_list(ArgVars, Map),
 			    dialyzer_contracts:get_contract_return(C, ArgTypes)
 			end, ArgVars), GenArgs};
 	  {value, {PltRetType, PltArgTypes}} ->
@@ -692,7 +694,7 @@ filter_match_fail([Clause] = Cls) ->
 filter_match_fail([H|T]) ->
   [H|filter_match_fail(T)];
 filter_match_fail([]) ->
-  %% This can actually happen, for example in 
+  %% This can actually happen, for example in
   %%      receive after 1 -> ok end
   [].
 
@@ -714,16 +716,16 @@ handle_clauses(Clauses, TopVar, Arg, Action, DefinedVars, State) ->
     if length(Clauses) > ?MAX_NOF_CLAUSES -> overflow;
        true -> []
     end,
-  {State1, CList} = handle_clauses_1(Clauses, TopVar, Arg, DefinedVars, 
+  {State1, CList} = handle_clauses_1(Clauses, TopVar, Arg, DefinedVars,
 				     State, SubtrTypeList, []),
   {NewCs, NewState} =
     case Action of
-      none -> 
+      none ->
 	if CList =:= [] -> throw(error);
 	   true -> {CList, State1}
 	end;
-      _ -> 
-	try 
+      _ ->
+	try
 	  {State2, ActionVar} = traverse(Action, DefinedVars, State1),
 	  TmpC = mk_constraint(TopVar, eq, ActionVar),
 	  ActionCs = mk_conj_constraint_list([state__cs(State2),TmpC]),
@@ -740,7 +742,7 @@ handle_clauses(Clauses, TopVar, Arg, Action, DefinedVars, State) ->
   FinalState = state__new_constraint_context(NewState),
   {state__store_conj_list([OldCs, NewCList], FinalState), TopVar}.
 
-handle_clauses_1([Clause|Tail], TopVar, Arg, DefinedVars, 
+handle_clauses_1([Clause|Tail], TopVar, Arg, DefinedVars,
 		 State, SubtrTypes, Acc) ->
   State0 = state__new_constraint_context(State),
   Pats = cerl:clause_pats(Clause),
@@ -749,22 +751,22 @@ handle_clauses_1([Clause|Tail], TopVar, Arg, DefinedVars,
   NewSubtrTypes =
     case SubtrTypes =:= overflow of
       true -> overflow;
-      false -> 
+      false ->
 	ordsets:add_element(get_safe_underapprox(Pats, Guard), SubtrTypes)
     end,
-  try 
+  try
     DefinedVars1 = add_def_from_tree_list(Pats, DefinedVars),
     State1 = state__set_in_match(State0, true),
     {State2, PatVars} = traverse_list(Pats, DefinedVars1, State1),
     State3 =
       case Arg =:= [] of
 	true -> State2;
-        false -> 
+        false ->
 	  S = state__store_conj(Arg, eq, t_product(PatVars), State2),
 	  case SubtrTypes =:= overflow of
 	    true -> S;
 	    false ->
-	      SubtrPatVar = mk_fun_var(fun(Map) -> 
+	      SubtrPatVar = mk_fun_var(fun(Map) ->
 					   TmpType = lookup_type(Arg, Map),
 					   t_subtract_list(TmpType, SubtrTypes)
 				       end, [Arg]),
@@ -772,15 +774,15 @@ handle_clauses_1([Clause|Tail], TopVar, Arg, DefinedVars,
 	  end
       end,
     State4 = handle_guard(Guard, DefinedVars1, State3),
-    {State5, BodyVar} = traverse(Body, DefinedVars1, 
+    {State5, BodyVar} = traverse(Body, DefinedVars1,
 				 state__set_in_match(State4, false)),
     State6 = state__store_conj(TopVar, eq, BodyVar, State5),
     Cs = state__cs(State6),
-    handle_clauses_1(Tail, TopVar, Arg, DefinedVars, State6, 
+    handle_clauses_1(Tail, TopVar, Arg, DefinedVars, State6,
 		     NewSubtrTypes, [Cs|Acc])
   catch
-    throw:error -> 
-      handle_clauses_1(Tail, TopVar, Arg, DefinedVars, 
+    throw:error ->
+      handle_clauses_1(Tail, TopVar, Arg, DefinedVars,
 		       State, NewSubtrTypes, Acc)
   end;
 handle_clauses_1([], _TopVar, _Arg, _DefinedVars, State, _SubtrType, Acc) ->
@@ -792,7 +794,7 @@ get_safe_underapprox(Pats, Guard) ->
   try
     Map1 = cerl_trees:fold(fun(X, Acc) ->
 			       case cerl:is_c_var(X) of
-				 true -> 
+				 true ->
 				   dict:store(cerl_trees:get_label(X), t_any(),
 					      Acc);
 				 false -> Acc
@@ -804,8 +806,8 @@ get_safe_underapprox(Pats, Guard) ->
 	     false ->
 	       case cerl:is_c_var(Guard) of
 		 false -> Map2;
-		 true -> 
-		   dict:store(cerl_trees:get_label(Guard), 
+		 true ->
+		   dict:store(cerl_trees:get_label(Guard),
 			      t_from_term(true), Map2)
 	       end
 	   end,
@@ -819,8 +821,8 @@ get_underapprox_from_guard(Tree, Map) ->
   True = t_from_term(true),
   case cerl:type(Tree) of
     call ->
-      case {cerl:concrete(cerl:call_module(Tree)), 
-	    cerl:concrete(cerl:call_name(Tree)), 
+      case {cerl:concrete(cerl:call_module(Tree)),
+	    cerl:concrete(cerl:call_name(Tree)),
 	    length(cerl:call_args(Tree))} of
 	{erlang, is_function, 2} ->
 	  [Fun, Arity] = cerl:call_args(Tree),
@@ -856,15 +858,15 @@ get_underapprox_from_guard(Tree, Map) ->
 		{erlang, '==', 2} -> throw(dont_know);
 		{erlang, 'and', 2} ->
 		  [Arg1, Arg2] = cerl:call_args(Tree),
-		  case ((cerl:is_c_var(Arg1) orelse cerl:is_literal(Arg1)) 
+		  case ((cerl:is_c_var(Arg1) orelse cerl:is_literal(Arg1))
 			andalso
 			(cerl:is_c_var(Arg2) orelse cerl:is_literal(Arg2))) of
 		    true ->
 		      {Arg1Type, _} = get_underapprox_from_guard(Arg1, Map),
 		      {Arg2Type, _} = get_underapprox_from_guard(Arg2, Map),
-		      case (t_is_equal(True, Arg1Type) andalso 
+		      case (t_is_equal(True, Arg1Type) andalso
 			    t_is_equal(True, Arg2Type)) of
-			true -> {True, Map}; 
+			true -> {True, Map};
 			false -> throw(dont_know)
 		      end;
 		    false ->
@@ -876,7 +878,7 @@ get_underapprox_from_guard(Tree, Map) ->
 	  end
       end;
     var ->
-      Type = 
+      Type =
 	case dict:find(cerl_trees:get_label(Tree), Map) of
 	  error -> throw(dont_know);
 	  {ok, T} -> T
@@ -931,7 +933,7 @@ bitstr_constr(SizeType, UnitVal) ->
 	      MinSize = erl_types:number_min(TmpSizeType),
 	      t_bitstr(UnitVal, MinSize * UnitVal)
 	  end;
-	false -> 
+	false ->
 	  t_bitstr(UnitVal, 0)
       end
   end.
@@ -975,9 +977,9 @@ get_safe_underapprox_1([Pat|Left], Acc, Map) ->
       end;
     binary ->
       %% TODO: Can maybe do something here
-      throw(dont_know);      
+      throw(dont_know);
     cons ->
-      {[Hd, Tl], Map1} = 
+      {[Hd, Tl], Map1} =
 	get_safe_underapprox_1([cerl:cons_hd(Pat), cerl:cons_tl(Pat)], [], Map),
       case t_is_any(Tl) of
 	true -> get_safe_underapprox_1(Left, [t_nonempty_list(Hd)|Acc], Map1);
@@ -1020,7 +1022,7 @@ get_safe_underapprox_1([], Acc, Map) ->
 %% Guards
 %%
 
-handle_guard(Guard, DefinedVars, State) ->  
+handle_guard(Guard, DefinedVars, State) ->
   True = t_from_term(true),
   State1 = state__set_in_guard(State, true),
   State2 = state__new_constraint_context(State1),
@@ -1039,7 +1041,7 @@ handle_guard(Guard, DefinedVars, State) ->
 %%
 %%=============================================================================
 
-get_bif_constr({erlang, Op, 2}, Dst, Args = [Arg1, Arg2], _State) 
+get_bif_constr({erlang, Op, 2}, Dst, Args = [Arg1, Arg2], _State)
   when Op =:= '+'; Op =:= '-'; Op =:= '*' ->
   ReturnType = mk_fun_var(fun(Map) ->
 			      TmpArgTypes = lookup_type_list(Args, Map),
@@ -1047,14 +1049,14 @@ get_bif_constr({erlang, Op, 2}, Dst, Args = [Arg1, Arg2], _State)
 			  end, Args),
   ArgFun =
     fun(A, Pos) ->
-	F = 
+	F =
 	  fun(Map) ->
 	      DstType = lookup_type(Dst, Map),
 	      AType = lookup_type(A, Map),
 	      case t_is_integer(DstType) of
 		true ->
 		  case t_is_integer(AType) of
-		    true -> 
+		    true ->
 		      eval_inv_arith(Op, Pos, DstType, AType);
 		    false  ->
 		      %% This must be temporary.
@@ -1062,7 +1064,7 @@ get_bif_constr({erlang, Op, 2}, Dst, Args = [Arg1, Arg2], _State)
 		  end;
 		false ->
 		  case t_is_float(DstType) of
-		    true -> 
+		    true ->
 		      case t_is_integer(AType) of
 			true -> t_float();
 			false -> t_number()
@@ -1079,9 +1081,9 @@ get_bif_constr({erlang, Op, 2}, Dst, Args = [Arg1, Arg2], _State)
   mk_conj_constraint_list([mk_constraint(Dst, sub, ReturnType),
 			   mk_constraint(Arg1, sub, Arg1FunVar),
 			   mk_constraint(Arg2, sub, Arg2FunVar)]);
-get_bif_constr({erlang, Op, 2}, Dst, [Arg1, Arg2] = Args, _State) 
+get_bif_constr({erlang, Op, 2}, Dst, [Arg1, Arg2] = Args, _State)
   when Op =:= '<'; Op =:= '=<'; Op =:= '>'; Op =:= '>=' ->
-  ArgFun = 
+  ArgFun =
     fun(LocalArg1, LocalArg2, LocalOp) ->
 	fun(Map) ->
 	    DstType = lookup_type(Dst, Map),
@@ -1098,19 +1100,19 @@ get_bif_constr({erlang, Op, 2}, Dst, [Arg1, Arg2] = Args, _State)
 		    Max2 = erl_types:number_max(Arg2Type),
 		    Min2 = erl_types:number_min(Arg2Type),
 		    case LocalOp of
-		      '=<' -> 
+		      '=<' ->
 			if IsTrue  -> t_from_range(Min1, Max2);
 			   IsFalse -> t_from_range(range_inc(Min2), Max1)
 			end;
-		      '<'  -> 
+		      '<'  ->
 			if IsTrue  -> t_from_range(Min1, range_dec(Max2));
 			   IsFalse -> t_from_range(Min2, Max1)
 			end;
-		      '>=' -> 
+		      '>=' ->
 			if IsTrue  -> t_from_range(Min2, Max1);
 			   IsFalse -> t_from_range(Min1, range_dec(Max2))
 			end;
-		      '>'  -> 
+		      '>'  ->
 			if IsTrue  -> t_from_range(range_inc(Min2), Max1);
 			   IsFalse -> t_from_range(Min1, Max2)
 			end
@@ -1131,7 +1133,7 @@ get_bif_constr({erlang, Op, 2}, Dst, [Arg1, Arg2] = Args, _State)
   DstArgs = [Dst, Arg1, Arg2],
   Arg1Var = mk_fun_var(Arg1Fun, DstArgs),
   Arg2Var = mk_fun_var(Arg2Fun, DstArgs),
-  DstVar = mk_fun_var(fun(Map) -> 
+  DstVar = mk_fun_var(fun(Map) ->
 			  TmpArgTypes = lookup_type_list(Args, Map),
 			  erl_bif_types:type(erlang, Op, 2, TmpArgTypes)
 		      end, Args),
@@ -1143,9 +1145,9 @@ get_bif_constr({erlang, '++', 2}, Dst, [Hd, Tl] = Args, _State) ->
 	      DstType = lookup_type(Dst, Map),
 	      case t_is_cons(DstType) of
 		true -> t_list(t_cons_hd(DstType));
-		false -> 
+		false ->
 		  case t_is_list(DstType) of
-		    true -> 
+		    true ->
 		      case t_is_nil(DstType) of
 			true -> DstType;
 			false -> t_list(t_list_elements(DstType))
@@ -1160,7 +1162,7 @@ get_bif_constr({erlang, '++', 2}, Dst, [Hd, Tl] = Args, _State) ->
 		true -> t_sup(t_cons_tl(DstType), DstType);
 		false ->
 		  case t_is_list(DstType) of
-		    true -> 
+		    true ->
 		      case t_is_nil(DstType) of
 			true -> DstType;
 			false -> t_list(t_list_elements(DstType))
@@ -1170,10 +1172,10 @@ get_bif_constr({erlang, '++', 2}, Dst, [Hd, Tl] = Args, _State) ->
 	      end
 	  end,
   DstL = [Dst],
-  HdVar = mk_fun_var(HdFun, DstL),  
+  HdVar = mk_fun_var(HdFun, DstL),
   TlVar = mk_fun_var(TlFun, DstL),
   ArgTypes = erl_bif_types:arg_types(erlang, '++', 2),
-  ReturnType = mk_fun_var(fun(Map) -> 
+  ReturnType = mk_fun_var(fun(Map) ->
 			      TmpArgTypes = lookup_type_list(Args, Map),
 			      erl_bif_types:type(erlang, '++', 2, TmpArgTypes)
 			  end, Args),
@@ -1198,7 +1200,7 @@ get_bif_constr({erlang, is_function, 2}, Dst, [Fun, Arity], _State) ->
   ArgFun = fun(Map) ->
 	       DstType = lookup_type(Dst, Map),
 	       case t_is_atom(true, DstType) of
-		 true -> 
+		 true ->
 		   ArityType = lookup_type(Arity, Map),
 		   case t_number_vals(ArityType) of
 		     unknown -> t_fun();
@@ -1231,7 +1233,7 @@ get_bif_constr({erlang, is_record, 2}, Dst, [Var, Tag] = Args, _State) ->
 	       end
 	   end,
   ArgV = mk_fun_var(ArgFun, [Dst]),
-  DstFun = fun(Map) -> 
+  DstFun = fun(Map) ->
 	       TmpArgTypes = lookup_type_list(Args, Map),
 	       erl_bif_types:type(erlang, is_record, 2, TmpArgTypes)
 	   end,
@@ -1241,7 +1243,7 @@ get_bif_constr({erlang, is_record, 2}, Dst, [Var, Tag] = Args, _State) ->
 			   mk_constraint(Var, sub, ArgV)]);
 get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
   %% TODO: Revise this to make it precise for Tag and Arity.
-  ArgFun = 
+  ArgFun =
     fun(Map) ->
 	case t_is_atom(true, lookup_type(Dst, Map)) of
 	  true ->
@@ -1257,14 +1259,14 @@ get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
 			GenRecord = t_tuple([TagType|AnyElems]),
 			case t_atom_vals(TagType) of
 			  [TagVal] ->
-			    case state__lookup_record(State, TagVal, 
+			    case state__lookup_record(State, TagVal,
 						      ArityVal - 1) of
 			      {ok, Type} ->
 				AllOpaques = State#state.opaques,
 				case t_opaque_match_record(Type, AllOpaques) of
 				  [Opaque] -> Opaque;
 				  _ -> Type
-				end;			      
+				end;
 			      error -> GenRecord
 			    end;
 			  _ -> GenRecord
@@ -1279,9 +1281,9 @@ get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
 	end
     end,
   ArgV = mk_fun_var(ArgFun, [Tag, Arity, Dst]),
-  DstFun = fun(Map) -> 
+  DstFun = fun(Map) ->
 	       [TmpVar, TmpTag, TmpArity] = TmpArgTypes = lookup_type_list(Args, Map),
-	       TmpArgTypes2 = 
+	       TmpArgTypes2 =
 		 case lists:member(TmpVar, State#state.opaques) of
 		   true ->
 		     case t_is_integer(TmpArity) of
@@ -1293,7 +1295,7 @@ get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
 				 case t_atom_vals(TmpTag) of
 				   [TmpTagVal] ->
 				     case state__lookup_record(State, TmpTagVal, TmpArityVal - 1) of
-				       {ok, TmpType} -> 
+				       {ok, TmpType} ->
 					 case t_is_none(t_inf(TmpType, TmpVar, opaque)) of
 					   true  -> TmpArgTypes;
 					   false -> [TmpType, TmpTag, TmpArity]
@@ -1312,7 +1314,7 @@ get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
 		 end,
 	       erl_bif_types:type(erlang, is_record, 3, TmpArgTypes2)
 	   end,
-  DstV = mk_fun_var(DstFun, Args),  
+  DstV = mk_fun_var(DstFun, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arity, sub, t_integer()),
 			   mk_constraint(Tag, sub, t_atom()),
@@ -1334,7 +1336,7 @@ get_bif_constr({erlang, 'and', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 			     true -> False;
 			     false -> t_boolean()
 			   end;
-			 false -> 
+			 false ->
 			   t_boolean()
 		       end
 		   end
@@ -1349,7 +1351,7 @@ get_bif_constr({erlang, 'and', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 		   case t_is_atom(false, Arg2Type) of
 		     true -> False;
 		     false ->
-		       case (t_is_atom(true, Arg1Type) 
+		       case (t_is_atom(true, Arg1Type)
 			     andalso t_is_atom(true, Arg2Type)) of
 			 true -> True;
 			 false -> t_boolean()
@@ -1378,7 +1380,7 @@ get_bif_constr({erlang, 'or', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 			     true -> True;
 			     false -> t_boolean()
 			   end;
-			 false -> 
+			 false ->
 			   t_boolean()
 		       end
 		   end
@@ -1393,7 +1395,7 @@ get_bif_constr({erlang, 'or', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 		   case t_is_atom(true, Arg2Type) of
 		     true -> True;
 		     false ->
-		       case (t_is_atom(false, Arg1Type) 
+		       case (t_is_atom(false, Arg1Type)
 			     andalso t_is_atom(false, Arg2Type)) of
 			 true -> False;
 			 false -> t_boolean()
@@ -1404,9 +1406,13 @@ get_bif_constr({erlang, 'or', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
   ArgV1 = mk_fun_var(ArgFun(Arg2), [Arg2, Dst]),
   ArgV2 = mk_fun_var(ArgFun(Arg1), [Arg1, Dst]),
   DstV = mk_fun_var(DstFun, Args),
-  Disj = mk_disj_constraint_list([mk_constraint(Arg1, sub, True),
-				  mk_constraint(Arg2, sub, True),
-				  mk_constraint(Dst, sub, False)]),
+  F = fun(A) ->
+	  try [mk_constraint(A, sub, True)]
+	  catch throw:error -> []
+	  end
+      end,
+  Constrs = F(Arg1) ++ F(Arg2),
+  Disj = mk_disj_constraint_list([mk_constraint(Dst, sub, False)|Constrs]),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arg1, sub, ArgV1),
 			   mk_constraint(Arg2, sub, ArgV2),
@@ -1414,7 +1420,7 @@ get_bif_constr({erlang, 'or', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 get_bif_constr({erlang, 'not', 1}, Dst, [Arg] = Args, _State) ->
   True = t_from_term(true),
   False = t_from_term(false),
-  Fun = fun(Var) -> 
+  Fun = fun(Var) ->
 	    fun(Map) ->
 		Type = lookup_type(Var, Map),
 		case t_is_atom(true, Type) of
@@ -1439,7 +1445,7 @@ get_bif_constr({erlang, '=:=', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 	    OtherVarType = lookup_type(OtherVar, Map),
 	    case t_is_atom(true, DstType) of
 	      true -> OtherVarType;
-	      false -> 
+	      false ->
 		case t_is_atom(false, DstType) of
 		  true ->
 		    case is_singleton_type(OtherVarType) of
@@ -1492,7 +1498,7 @@ get_bif_constr({erlang, '==', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 		  true ->
 		    case t_is_number(VarType) of
 		      true -> t_number();
-		      false -> 
+		      false ->
 			case t_is_atom(VarType) of
 			  true -> VarType;
 			  false -> t_any()
@@ -1511,7 +1517,8 @@ get_bif_constr({erlang, '==', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
 			   mk_constraint(Arg1, sub, ArgV1),
 			   mk_constraint(Arg2, sub, ArgV2)]);
-get_bif_constr({erlang, element, 2} = _BIF, Dst, Args, State) ->
+get_bif_constr({erlang, element, 2} = _BIF, Dst, Args,
+               #state{cs = Constrs} = State) ->
   GenType = erl_bif_types:type(erlang, element, 2),
   case t_is_none(GenType) of
     true -> ?debug("Bif: ~w failed\n", [_BIF]), throw(error);
@@ -1525,9 +1532,14 @@ get_bif_constr({erlang, element, 2} = _BIF, Dst, Args, State) ->
 		erl_bif_types:type(erlang, element, 2, ATs2)
 	    end,
       ReturnType = mk_fun_var(Fun, Args),
-      ArgTypes = erl_bif_types:arg_types(erlang, element, 2),      
+      ArgTypes = erl_bif_types:arg_types(erlang, element, 2),
       Cs = mk_constraints(Args, sub, ArgTypes),
-      mk_conj_constraint_list([mk_constraint(Dst, sub, ReturnType)|Cs])
+      NewCs =
+        case find_element(Args, Constrs) of
+          'unknown' -> Cs;
+          Elem -> [mk_constraint(Dst, eq, Elem)|Cs]
+        end,
+      mk_conj_constraint_list([mk_constraint(Dst, sub, ReturnType)|NewCs])
   end;
 get_bif_constr({M, F, A} = _BIF, Dst, Args, State) ->
   GenType = erl_bif_types:type(M, F, A),
@@ -1541,7 +1553,7 @@ get_bif_constr({M, F, A} = _BIF, Dst, Args, State) ->
 		    false -> T
 		  end
 	end,
-      ReturnType = mk_fun_var(fun(Map) -> 
+      ReturnType = mk_fun_var(fun(Map) ->
 				  TmpArgTypes0 = lookup_type_list(Args, Map),
 				  TmpArgTypes = [UnopaqueFun(T) || T<- TmpArgTypes0],
 				  erl_bif_types:type(M, F, A, TmpArgTypes)
@@ -1561,12 +1573,12 @@ get_bif_constr({M, F, A} = _BIF, Dst, Args, State) ->
       end
   end.
 
-eval_inv_arith('+', _Pos, Dst, Arg) -> 
+eval_inv_arith('+', _Pos, Dst, Arg) ->
   erl_bif_types:type(erlang, '-', 2, [Dst, Arg]);
-eval_inv_arith('*', _Pos, Dst, Arg) -> 
+eval_inv_arith('*', _Pos, Dst, Arg) ->
   case t_number_vals(Arg) of
     [0] -> t_integer();
-    _ -> 
+    _ ->
       TmpRet = erl_bif_types:type(erlang, 'div', 2, [Dst, Arg]),
       Zero = t_from_term(0),
       %% If 0 is not part of the result, it cannot be part of the argument.
@@ -1575,9 +1587,9 @@ eval_inv_arith('*', _Pos, Dst, Arg) ->
 	true -> TmpRet
       end
   end;
-eval_inv_arith('-', 1, Dst, Arg) -> 
+eval_inv_arith('-', 1, Dst, Arg) ->
   erl_bif_types:type(erlang, '-', 2, [Arg, Dst]);
-eval_inv_arith('-', 2, Dst, Arg) -> 
+eval_inv_arith('-', 2, Dst, Arg) ->
   erl_bif_types:type(erlang, '+', 2, [Arg, Dst]).
 
 range_inc(neg_inf) -> neg_inf;
@@ -1614,7 +1626,7 @@ get_bif_test_constr(Dst, Arg, Type, State) ->
 		       end;
 		     false ->  t_from_term(false)
 		   end;
-		 false -> 
+		 false ->
 		   case t_is_subtype(ArgType, Type) of
 		     true -> t_from_term(true);
 		     false -> t_boolean()
@@ -1632,11 +1644,11 @@ get_bif_test_constr(Dst, Arg, Type, State) ->
 %%=============================================================================
 
 solve([Fun], State) ->
-  ?debug("============ Analyzing Fun: ~w ===========\n", 
+  ?debug("============ Analyzing Fun: ~w ===========\n",
 	 [debug_lookup_name(Fun)]),
   solve_fun(Fun, dict:new(), State);
 solve([_|_] = SCC, State) ->
-  ?debug("============ Analyzing SCC: ~w ===========\n", 
+  ?debug("============ Analyzing SCC: ~w ===========\n",
 	 [[debug_lookup_name(F) || F <- SCC]]),
   solve_scc(SCC, dict:new(), State, false).
 
@@ -1655,7 +1667,7 @@ solve_fun(Fun, FunMap, State) ->
 
 solve_scc(SCC, Map, State, TryingUnit) ->
   State1 = state__mark_as_non_self_rec(SCC, State),
-  Vars0 = [{Fun, state__get_rec_var(Fun, State)} || Fun <- SCC],  
+  Vars0 = [{Fun, state__get_rec_var(Fun, State)} || Fun <- SCC],
   Vars = [Var || {_, {ok, Var}} <- Vars0],
   Funs = [Fun || {Fun, {ok, _}} <- Vars0],
   Types = unsafe_lookup_type_list(Funs, Map),
@@ -1682,7 +1694,7 @@ solve_scc(SCC, Map, State, TryingUnit) ->
 	false ->
 	  Map2
       end;
-    false -> 
+    false ->
       ?debug("SCC ~w did not reach fixpoint\n", [SCC]),
       solve_scc(SCC, Map2, State, TryingUnit)
   end.
@@ -1704,29 +1716,29 @@ scc_fold_fun(F, FunMap, State) ->
 						  format_type(NewType)]),
   NewFunMap.
 
-solve_ref_or_list(#constraint_ref{id = Id, deps = Deps}, 
+solve_ref_or_list(#constraint_ref{id = Id, deps = Deps},
 		  Map, MapDict, State) ->
-  {OldLocalMap, Check} = 
+  {OldLocalMap, Check} =
     case dict:find(Id, MapDict) of
       error -> {dict:new(), false};
       {ok, M} -> {M, true}
-    end,  
+    end,
   ?debug("Checking ref to fun: ~w\n", [debug_lookup_name(Id)]),
   CheckDeps = ordsets:del_element(t_var_name(Id), Deps),
   case Check andalso maps_are_equal(OldLocalMap, Map, CheckDeps) of
-    true -> 
+    true ->
       ?debug("Equal\n", []),
       {ok, MapDict, Map};
     false ->
       ?debug("Not equal. Solving\n", []),
       Cs = state__get_cs(Id, State),
-      Res = 
+      Res =
 	case state__is_self_rec(Id, State) of
 	  true -> solve_self_recursive(Cs, Map, MapDict, Id, t_none(), State);
 	  false -> solve_ref_or_list(Cs, Map, MapDict, State)
 	end,
       case Res of
-	{error, NewMapDict} ->	  
+	{error, NewMapDict} ->
 	  ?debug("Error solving for function ~p\n", [debug_lookup_name(Id)]),
 	  Arity = state__fun_arity(Id, State),
 	  FunType =
@@ -1755,17 +1767,17 @@ solve_ref_or_list(#constraint_ref{id = Id, deps = Deps},
   end;
 solve_ref_or_list(#constraint_list{type=Type, list = Cs, deps = Deps, id = Id},
 		  Map, MapDict, State) ->
-  {OldLocalMap, Check} = 
+  {OldLocalMap, Check} =
     case dict:find(Id, MapDict) of
       error -> {dict:new(), false};
       {ok, M} -> {M, true}
     end,
   ?debug("Checking ref to list: ~w\n", [Id]),
   case Check andalso maps_are_equal(OldLocalMap, Map, Deps) of
-    true -> 
+    true ->
       ?debug("~w equal ~w\n", [Type, Id]),
       {ok, MapDict, Map};
-    false -> 
+    false ->
       ?debug("~w not equal: ~w. Solving\n", [Type, Id]),
       solve_clist(Cs, Type, Id, Deps, MapDict, Map, State)
   end.
@@ -1793,7 +1805,7 @@ solve_self_recursive(Cs, Map, MapDict, Id, RecType0, State) ->
 	     [[{X, format_type(Y)} || {X, Y} <- dict:to_list(NewMap)]]),
       NewRecType = unsafe_lookup_type(Id, NewMap),
       case t_is_equal(NewRecType, RecType0) of
-	true -> 	  
+	true ->
 	  {ok, NewMapDict, enter_type(RecVar, NewRecType, NewMap)};
 	false ->
 	  solve_self_recursive(Cs, Map, MapDict, Id, NewRecType, State)
@@ -1801,7 +1813,7 @@ solve_self_recursive(Cs, Map, MapDict, Id, RecType0, State) ->
   end.
 
 solve_clist(Cs, conj, Id, Deps, MapDict, Map, State) ->
-  case solve_cs(Cs, Map, MapDict, State) of 
+  case solve_cs(Cs, Map, MapDict, State) of
     {error, _} = Error -> Error;
     {ok, NewMapDict, NewMap} = Ret ->
       case Cs of
@@ -1821,12 +1833,12 @@ solve_clist(Cs, disj, Id, _Deps, MapDict, Map, State) ->
 	      {ok, NewDict, NewMap} -> {{ok, NewMap}, NewDict};
 	      {error, _NewDict} = Error -> Error
 	    end
-	end,  
+	end,
   {Maps, NewMapDict} = lists:mapfoldl(Fun, MapDict, Cs),
   case [X || {ok, X} <- Maps] of
     [] -> {error, NewMapDict};
-    MapList -> 
-      NewMap = join_maps(MapList),      
+    MapList ->
+      NewMap = join_maps(MapList),
       {ok, dict:store(Id, NewMap, NewMapDict), NewMap}
   end.
 
@@ -1844,13 +1856,13 @@ solve_cs([#constraint{} = C|Tail], Map, MapDict, State) ->
   case solve_one_c(C, Map, State#state.opaques) of
     error ->
       ?debug("+++++++++++\nFailed: ~s :: ~s ~w ~s :: ~s\n+++++++++++\n",
-	     [format_type(C#constraint.lhs), 
+	     [format_type(C#constraint.lhs),
 	      format_type(lookup_type(C#constraint.lhs, Map)),
 	      C#constraint.op,
-	      format_type(C#constraint.rhs), 
+	      format_type(C#constraint.rhs),
 	      format_type(lookup_type(C#constraint.rhs, Map))]),
       {error, MapDict};
-    {ok, NewMap} -> 
+    {ok, NewMap} ->
       solve_cs(Tail, NewMap, MapDict, State)
   end;
 solve_cs([], Map, MapDict, _State) ->
@@ -1863,7 +1875,7 @@ solve_one_c(#constraint{lhs = Lhs, rhs = Rhs, op = Op}, Map, Opaques) ->
   ?debug("Solving: ~s :: ~s ~w ~s :: ~s\n\tInf: ~s\n",
 	 [format_type(Lhs), format_type(LhsType), Op,
 	  format_type(Rhs), format_type(RhsType), format_type(Inf)]),
-  case t_is_none(Inf) of 
+  case t_is_none(Inf) of
     true -> error;
     false ->
       case Op of
@@ -1887,8 +1899,8 @@ solve_subtype(Type, Inf, Map, Opaques) ->
       try t_unify(Type, Inf, Opaques) of
 	{_, List} -> {ok, enter_type_list(List, Map)}
       catch
-	throw:{mismatch, _T1, _T2} -> 
-	  ?debug("Mismatch between ~s and ~s\n", 
+	throw:{mismatch, _T1, _T2} ->
+	  ?debug("Mismatch between ~s and ~s\n",
 		 [format_type(_T1), format_type(_T2)]),
 	  error
       end.
@@ -1936,9 +1948,9 @@ maps_are_equal_1(Map1, Map2, [H|Tail]) ->
   T2 = lookup_type(H, Map2),
   case t_is_equal(T1, T2) of
     true -> maps_are_equal_1(Map1, Map2, Tail);
-    false -> 
+    false ->
       ?debug("~w: ~s =/= ~s\n", [H, format_type(T1), format_type(T2)]),
-      false      
+      false
   end;
 maps_are_equal_1(_Map1, _Map2, []) ->
   true.
@@ -1953,7 +1965,7 @@ prune_keys(Map1, Map2, Deps) ->
     true ->
       Keys1 = dict:fetch_keys(Map1),
       case length(Keys1) > NofDeps of
-	true -> 
+	true ->
 	  Set1 = lists:sort(Keys1),
 	  Set2 = lists:sort(dict:fetch_keys(Map2)),
 	  ordsets:intersection(ordsets:union(Set1, Set2), Deps);
@@ -2035,7 +2047,7 @@ lookup_type(Key, Map) ->
 mk_var(Var) ->
   case cerl:is_literal(Var) of
     true -> Var;
-    false -> 
+    false ->
       case cerl:is_c_values(Var) of
 	true -> t_product(mk_var_no_lit_list(cerl:values_es(Var)));
 	false -> t_var(cerl_trees:get_label(Var))
@@ -2064,7 +2076,7 @@ new_state(SCC0, NextLabel, CallGraph, Plt, PropTypes) ->
   NameMap = dict:from_list([{MFA, Var} || {MFA, {Var, _Fun}, _Rec} <- SCC0]),
   SCC = [mk_var(Fun) || {_MFA, {_Var, Fun}, _Rec} <- SCC0],
   #state{callgraph = CallGraph, name_map = NameMap, next_label = NextLabel,
-	 prop_types = PropTypes, plt = Plt, scc = SCC}.
+	 prop_types = PropTypes, plt = Plt, scc = ordsets:from_list(SCC)}.
 
 state__set_rec_dict(State, RecDict) ->
   State#state{records = RecDict}.
@@ -2076,10 +2088,10 @@ state__set_opaques(#state{records = RecDict} = State, {M, _F, _A}) ->
 
 state__lookup_record(#state{records = Records}, Tag, Arity) ->
   case erl_types:lookup_record(Tag, Arity, Records) of
-    {ok, Fields} -> 
+    {ok, Fields} ->
       {ok, t_tuple([t_from_term(Tag)|
 		    [FieldType || {_FieldName, FieldType} <- Fields]])};
-    error -> 
+    error ->
       error
   end.
 
@@ -2098,12 +2110,12 @@ state__is_in_guard(#state{in_guard = Bool}) ->
 state__get_fun_prototype(Op, Arity, State) ->
   case t_is_fun(Op) of
     true -> {State, Op};
-    false -> 
+    false ->
       {State1, [Ret|Args]} = state__mk_vars(Arity+1, State),
       Fun = t_fun(Args, Ret),
       {State1, Fun}
   end.
-    
+
 state__lookup_rec_var_in_scope(MFA, #state{name_map = NameMap}) ->
   dict:find(MFA, NameMap).
 
@@ -2115,11 +2127,11 @@ state__store_fun_arity(Tree, #state{fun_arities = Map} = State) ->
 state__fun_arity(Id, #state{fun_arities = Map}) ->
   dict:fetch(Id, Map).
 
-state__lookup_undef_var(Tree, #state{callgraph = CG, plt = Plt}) ->  
+state__lookup_undef_var(Tree, #state{callgraph = CG, plt = Plt}) ->
   Label = cerl_trees:get_label(Tree),
   case dialyzer_callgraph:lookup_rec_var(Label, CG) of
     error -> error;
-    {ok, MFA} -> 
+    {ok, MFA} ->
       case dialyzer_plt:lookup(Plt, MFA) of
 	none -> error;
 	{value, {RetType, ArgTypes}} -> {ok, t_fun(ArgTypes, RetType)}
@@ -2155,6 +2167,9 @@ get_apply_constr(FunLabels, Dst, ArgTypes, #state{callgraph = CG} = State) ->
 state__scc(#state{scc = SCC}) ->
   SCC.
 
+state__add_fun_to_scc(Fun, #state{scc = SCC} = State) ->
+  State#state{scc = ordsets:add_element(Fun, SCC)}.
+
 state__plt(#state{plt = PLT}) ->
   PLT.
 
@@ -2179,7 +2194,7 @@ state__add_prop_constrs(Tree, #state{prop_types = PropTypes} = State) ->
 	  case erl_types:any_none(ArgTypes) of
 	    true -> not_called;
 	    false ->
-	      ?debug("Adding propagated constr: ~s for function ~w\n", 
+	      ?debug("Adding propagated constr: ~s for function ~w\n",
 		     [format_type(FunType), debug_lookup_name(mk_var(Tree))]),
 	      FunVar = mk_var(Tree),
 	      state__store_conj(FunVar, sub, FunType, State)
@@ -2225,7 +2240,7 @@ state__store_conj_lists_1([], _Op, [], State) ->
 
 state__mk_var(#state{next_label = NL} = State) ->
   {State#state{next_label = NL+1}, t_var(NL)}.
-  
+
 state__mk_vars(N, #state{next_label = NL} = State) ->
   NewLabel = NL + N,
   Vars = [t_var(X) || X <- lists:seq(NL, NewLabel-1)],
@@ -2235,7 +2250,7 @@ state__store_constrs(Id, Cs, #state{cmap = Dict} = State) ->
   NewDict = dict:store(Id, Cs, Dict),
   State#state{cmap = NewDict}.
 
-state__get_cs(Var, #state{cmap = Dict}) ->  
+state__get_cs(Var, #state{cmap = Dict}) ->
   dict:fetch(Var, Dict).
 
 %% The functions here will not be treated as self recursive.
@@ -2286,7 +2301,7 @@ mk_constraint(Lhs, Op, Rhs) ->
 	  %% This constraint is constant. Solve it immediately.
 	  case solve_one_c(C, dict:new(), []) of
 	    error -> throw(error);
-	    _ -> 
+	    _ ->
 	      %% This is always true, keep it anyway for logistic reasons
 	      C
 	  end;
@@ -2335,7 +2350,7 @@ mk_constraint_1(Lhs, eq, Rhs) when Lhs < Rhs ->
 mk_constraint_1(Lhs, eq, Rhs) ->
   #constraint{lhs = Rhs, op = eq, rhs = Lhs};
 mk_constraint_1(Lhs, Op, Rhs) ->
-  #constraint{lhs = Lhs, op = Op, rhs = Rhs}.  
+  #constraint{lhs = Lhs, op = Op, rhs = Rhs}.
 
 mk_constraints([Lhs|LhsTail], Op, [Rhs|RhsTail]) ->
   [mk_constraint(Lhs, Op, Rhs)|mk_constraints(LhsTail, Op, RhsTail)];
@@ -2350,7 +2365,7 @@ mk_constraint_list(Type, List) ->
   List2 = ordsets:filter(fun(X) -> get_deps(X) =/= [] end, List1),
   Deps = calculate_deps(List2),
   case Deps =:= [] of
-    true -> #constraint_list{type = conj, 
+    true -> #constraint_list{type = conj,
 			     list = [mk_constraint(t_any(), eq, t_any())],
 			     deps = []};
     false -> #constraint_list{type = Type, list = List2, deps = Deps}
@@ -2372,11 +2387,11 @@ update_constraint_list(CL, List) ->
 %% We expand guard constraints into dijunctive normal form to gain
 %% precision in simple guards. However, because of the exponential
 %% growth of this expansion in the presens of disjunctions we can even
-%% get into trouble while expanding. 
+%% get into trouble while expanding.
 %%
 %% To limit this we only expand when the number of disjunctions are
 %% below a certain limit. This limit is currently set based on the
-%% behaviour of boolean 'or'. 
+%% behaviour of boolean 'or'.
 %%
 %%         V1 = V2 or V3
 %%
@@ -2395,7 +2410,7 @@ update_constraint_list(CL, List) ->
 -define(DISJ_NORM_FORM_LIMIT, 28).
 
 mk_disj_norm_form(#constraint_list{} = CL) ->
-  try 
+  try
     List1 = expand_to_conjunctions(CL),
     mk_disj_constraint_list(List1)
   catch
@@ -2409,7 +2424,7 @@ expand_to_conjunctions(#constraint_list{type = conj, list = List}) ->
     true -> [mk_conj_constraint_list(List1)];
     false ->
       case List2 of
-	[JustOneList] -> 
+	[JustOneList] ->
 	  [mk_conj_constraint_list([L|List1]) || L <- JustOneList];
 	_ ->
 	  combine_conj_lists(List2, List1)
@@ -2422,7 +2437,7 @@ expand_to_conjunctions(#constraint_list{type = disj, list = List}) ->
   List1 = [C || C <- List, is_simple_constraint(C)],
   %% Just an assert.
   [] = [C || #constraint{} = C <- List1],
-  Expanded = lists:flatten([expand_to_conjunctions(C) 
+  Expanded = lists:flatten([expand_to_conjunctions(C)
 			    || #constraint_list{} = C <- List]),
   ReturnList = Expanded ++ List1,
   if length(ReturnList) > ?DISJ_NORM_FORM_LIMIT -> throw(too_many_disj);
@@ -2467,7 +2482,7 @@ wrap_simple_constr(#constraint_list{} = C) -> C;
 wrap_simple_constr(#constraint_ref{} = C) -> C.
 
 enumerate_constraints(State) ->
-  Cs = [mk_constraint_ref(Id, get_deps(state__get_cs(Id, State))) 
+  Cs = [mk_constraint_ref(Id, get_deps(state__get_cs(Id, State)))
 	|| Id <- state__scc(State)],
   {_, _, NewState} = enumerate_constraints(Cs, 0, [], State),
   NewState.
@@ -2475,9 +2490,9 @@ enumerate_constraints(State) ->
 enumerate_constraints([#constraint_ref{id = Id} = C|Tail], N, Acc, State) ->
   Cs = state__get_cs(Id, State),
   {[NewCs], NewN, NewState1} = enumerate_constraints([Cs], N, [], State),
-  NewState2 = state__store_constrs(Id, NewCs, NewState1),  
+  NewState2 = state__store_constrs(Id, NewCs, NewState1),
   enumerate_constraints(Tail, NewN+1, [C|Acc], NewState2);
-enumerate_constraints([#constraint_list{type = conj, list = List} = C|Tail], 
+enumerate_constraints([#constraint_list{type = conj, list = List} = C|Tail],
 		      N, Acc, State) ->
   %% Separate the flat constraints from the deep ones to make a
   %% separate fixpoint interation over the flat ones for speed.
@@ -2496,7 +2511,7 @@ enumerate_constraints([#constraint_list{type = conj, list = List} = C|Tail],
     end,
   NewAcc = [C#constraint_list{list = NewList, id = {list, N3}}|Acc],
   enumerate_constraints(Tail, N3+1, NewAcc, State2);
-enumerate_constraints([#constraint_list{list = List, type = disj} = C|Tail], 
+enumerate_constraints([#constraint_list{list = List, type = disj} = C|Tail],
 		      N, Acc, State) ->
   {NewList, NewN, NewState} = enumerate_constraints(List, N, [], State),
   NewAcc = [C#constraint_list{list = NewList, id = {list, NewN}}|Acc],
@@ -2515,7 +2530,7 @@ group_constraints_in_components(Cs, N) ->
   case find_dep_components(DepList, []) of
     [_] -> {Cs, N};
     [_|_] = Components ->
-      ConstrComp = [[C || #constraint{deps = D} = C <- Cs, 
+      ConstrComp = [[C || #constraint{deps = D} = C <- Cs,
 			  ordsets:is_subset(D, Comp)]
 		    || Comp <- Components],
       lists:mapfoldl(fun(CComp, TmpN) ->
@@ -2545,7 +2560,7 @@ find_dep_components([], AccSet, Ungrouped) ->
 %% Put the fun ref constraints last in any conjunction since we need
 %% to separate the environment from the interior of the function.
 order_fun_constraints(State) ->
-  Cs = [mk_constraint_ref(Id, get_deps(state__get_cs(Id, State))) 
+  Cs = [mk_constraint_ref(Id, get_deps(state__get_cs(Id, State)))
 	|| Id <- state__scc(State)],
   order_fun_constraints(Cs, State).
 
@@ -2565,8 +2580,8 @@ order_fun_constraints([#constraint_list{list = List, type = Type} = C|Tail],
     case Type of
       conj -> order_fun_constraints(List, [], [], State);
       disj ->
-	FoldFun = fun(X, AccState) -> 
-		      {[NewX], NewAccState} = 
+	FoldFun = fun(X, AccState) ->
+		      {[NewX], NewAccState} =
 			order_fun_constraints([X], [], [], AccState),
 		      {NewX, NewAccState}
 		  end,
@@ -2588,7 +2603,7 @@ order_fun_constraints([], Funs, Acc, State) ->
 
 is_singleton_non_number_type(Type) ->
   case t_is_number(Type) of
-    true -> false;    
+    true -> false;
     false -> is_singleton_type(Type)
   end.
 
@@ -2613,6 +2628,41 @@ is_singleton_type(Type) ->
       end
   end.
 
+find_element(Args, Cs) ->
+  [Pos, Tuple] = Args,
+  case erl_types:t_is_number(Pos) of
+    true ->
+      case erl_types:t_number_vals(Pos) of
+        'unknown' -> 'unknown';
+        [I] ->
+          case find_constraint(Tuple, Cs) of
+            'unknown' -> 'unknown';
+            #constraint{lhs = ExTuple} ->
+              case erl_types:t_is_tuple(ExTuple) of
+                true ->
+                  Elems = erl_types:t_tuple_args(ExTuple),
+                  Elem = lists:nth(I, Elems),
+                  case erl_types:t_is_var(Elem) of
+                    true -> Elem;
+                    false -> 'unknown'
+                  end;
+                false -> 'unknown'
+              end
+          end;
+        _ -> 'unknown'
+      end;
+    false -> 'unknown'
+  end.
+
+find_constraint(_Tuple, []) ->
+  'unknown';
+find_constraint(Tuple, [#constraint{op = 'eq', rhs = Tuple} = C|_]) ->
+  C;
+find_constraint(Tuple, [#constraint_list{list = List}|Cs]) ->
+  find_constraint(Tuple, List ++ Cs);
+find_constraint(Tuple, [_|Cs]) ->
+  find_constraint(Tuple, Cs).
+
 %% ============================================================================
 %%
 %%  Pretty printer and debug facilities.
@@ -2638,7 +2688,7 @@ format_type(Type) ->
 -ifdef(DEBUG_NAME_MAP).
 debug_make_name_map(Vars, Funs) ->
   Map = get(dialyzer_typesig_map),
-  NewMap = 
+  NewMap =
     if Map =:= undefined -> debug_make_name_map(Vars, Funs, dict:new());
        true              -> debug_make_name_map(Vars, Funs, Map)
     end,
@@ -2676,15 +2726,15 @@ pp_constraints(Cs, State) ->
   io:nl(),
   Res.
 
-pp_constraints([List|Tail], Separator, Level, MaxDepth, 
+pp_constraints([List|Tail], Separator, Level, MaxDepth,
 	       State) when is_list(List) ->
   pp_constraints(List++Tail, Separator, Level, MaxDepth, State);
-pp_constraints([#constraint_ref{id = Id}|Left], Separator, 
+pp_constraints([#constraint_ref{id = Id}|Left], Separator,
 	       Level, MaxDepth, State) ->
   Cs = state__get_cs(Id, State),
   io:format("%Ref ~w%", [t_var_name(Id)]),
   pp_constraints([Cs|Left], Separator, Level, MaxDepth, State);
-pp_constraints([#constraint{lhs = Lhs, op = Op, rhs = Rhs}], _Separator, 
+pp_constraints([#constraint{lhs = Lhs, op = Op, rhs = Rhs}], _Separator,
 	       Level, MaxDepth, _State) ->
   io:format("~s ~w ~s", [format_type(Lhs), Op, format_type(Rhs)]),
   erlang:max(Level, MaxDepth);
@@ -2721,7 +2771,7 @@ pp_constrs_scc(_SCC, _State) ->
 
 constraints_to_dot_scc(SCC, State) ->
   io:format("SCC: ~p\n", [SCC]),
-  Name = lists:flatten([io_lib:format("'~w'", [debug_lookup_name(Fun)]) 
+  Name = lists:flatten([io_lib:format("'~w'", [debug_lookup_name(Fun)])
 			|| Fun <- SCC]),
   Cs = [state__get_cs(Fun, State) || Fun <- SCC],
   constraints_to_dot(Cs, Name, State).
@@ -2737,22 +2787,22 @@ constraints_to_dot(Cs0, Name, State) ->
 
 constraints_to_nodes([{Name, #constraint_list{type = Type, list = List, id=Id}}
 		      |Left], N, Level, Graph, Opts, State) ->
-  N1 = N + length(List), 
+  N1 = N + length(List),
   NewList = lists:zip(lists:seq(N, N1 - 1), List),
   Names = [SubName || {SubName, _C} <- NewList],
   Edges = [{Name, SubName} || SubName <- Names],
-  ThisNode = [{Name, Opt} || Opt <- [{label, 
+  ThisNode = [{Name, Opt} || Opt <- [{label,
 				      lists:flatten(io_lib:format("~w", [Id]))},
 				     {shape, get_shape(Type)},
 				     {level, Level}]],
-  {NewGraph, NewOpts, N2} = constraints_to_nodes(NewList, N1, Level+1, 
-						 [Edges|Graph], 
+  {NewGraph, NewOpts, N2} = constraints_to_nodes(NewList, N1, Level+1,
+						 [Edges|Graph],
 						 [ThisNode|Opts], State),
   constraints_to_nodes(Left, N2, Level, NewGraph, NewOpts, State);
 constraints_to_nodes([{Name, #constraint{lhs = Lhs, op = Op, rhs = Rhs}}|Left],
 		     N, Level, Graph, Opts, State) ->
-  Label = lists:flatten(io_lib:format("~s ~w ~s", 
-				      [format_type(Lhs), Op, 
+  Label = lists:flatten(io_lib:format("~s ~w ~s",
+				      [format_type(Lhs), Op,
 				       format_type(Rhs)])),
   ThisNode = [{Name, Opt} || Opt <- [{label, Label}, {level, Level}]],
   NewOpts = [ThisNode|Opts],
@@ -2761,20 +2811,20 @@ constraints_to_nodes([{Name, #constraint_ref{id = Id0}}|Left],
 		     N, Level, Graph, Opts, State) ->
   Id = debug_lookup_name(Id0),
   CList = state__get_cs(Id0, State),
-  ThisNode = [{Name, Opt} || Opt <- [{label, 
+  ThisNode = [{Name, Opt} || Opt <- [{label,
 				      lists:flatten(io_lib:format("~w", [Id]))},
 				     {shape, ellipse},
-				     {level, Level}]],  
-  NewList = [{N, CList}],  
-  {NewGraph, NewOpts, N1} = constraints_to_nodes(NewList, N + 1, Level + 1, 
+				     {level, Level}]],
+  NewList = [{N, CList}],
+  {NewGraph, NewOpts, N1} = constraints_to_nodes(NewList, N + 1, Level + 1,
 						 [{Name, N}|Graph],
 						 [ThisNode|Opts], State),
   constraints_to_nodes(Left, N1, Level, NewGraph, NewOpts, State);
 constraints_to_nodes([], N, _Level, Graph, Opts, _State) ->
   {lists:flatten(Graph), lists:flatten(Opts), N}.
-  
+
 get_shape(conj) -> box;
-get_shape(disj) -> diamond.  
+get_shape(disj) -> diamond.
 
 -else.
 constraints_to_dot_scc(_SCC, _State) ->
diff --git a/lib/dialyzer/src/dialyzer_utils.erl b/lib/dialyzer/src/dialyzer_utils.erl
index f5bfc6ad2f..248fdf6835 100644
--- a/lib/dialyzer/src/dialyzer_utils.erl
+++ b/lib/dialyzer/src/dialyzer_utils.erl
@@ -21,7 +21,7 @@
 %%%-------------------------------------------------------------------
 %%% File    : dialyzer_utils.erl
 %%% Author  : Tobias Lindahl <[email protected]>
-%%% Description : 
+%%% Description :
 %%%
 %%% Created :  5 Dec 2006 by Tobias Lindahl <[email protected]>
 %%%-------------------------------------------------------------------
@@ -66,7 +66,7 @@ print_types1([{opaque, _Name} = Key|T], RecDict) ->
   io:format("\n~w: ~w\n", [Key, erl_types:t_from_form(Form, RecDict)]),
   print_types1(T, RecDict);
 print_types1([{record, _Name} = Key|T], RecDict) ->
-  {ok, [{Arity, Fields} = AF]} = dict:find(Key, RecDict),
+  {ok, [{_Arity, _Fields} = AF]} = dict:find(Key, RecDict),
   io:format("~w: ~w\n\n", [Key, AF]),
   print_types1(T, RecDict).
 -define(debug(D_), print_types(D_)).
@@ -74,12 +74,11 @@ print_types1([{record, _Name} = Key|T], RecDict) ->
 -define(debug(D_), ok).
 -endif.
 
-%%
-%%  Types that need to be imported from somewhere else
-%%
+%% ----------------------------------------------------------------------------
 
--type abstract_code() :: [tuple()]. %% XXX: refine
--type comp_options()  :: [atom()].  %% XXX: a restricted set of options is used
+-type abstract_code() :: [tuple()]. %% XXX: import from somewhere
+-type comp_options()  :: [compile:option()].
+-type mod_or_fname()  :: atom() | file:filename().
 
 %% ============================================================================
 %%
@@ -87,13 +86,13 @@ print_types1([{record, _Name} = Key|T], RecDict) ->
 %%
 %% ============================================================================
 
--spec get_abstract_code_from_src(atom() | file:filename()) ->
+-spec get_abstract_code_from_src(mod_or_fname()) ->
 	{'ok', abstract_code()} | {'error', [string()]}.
 
 get_abstract_code_from_src(File) ->
   get_abstract_code_from_src(File, src_compiler_opts()).
 
--spec get_abstract_code_from_src(atom() | file:filename(), comp_options()) ->
+-spec get_abstract_code_from_src(mod_or_fname(), comp_options()) ->
 	{'ok', abstract_code()} | {'error', [string()]}.
 
 get_abstract_code_from_src(File, Opts) ->
@@ -176,7 +175,7 @@ get_record_and_type_info(AbstractCode) ->
 get_record_and_type_info(AbstractCode, Module, RecDict) ->
   get_record_and_type_info(AbstractCode, Module, [], RecDict).
 
-get_record_and_type_info([{attribute, _, record, {Name, Fields0}}|Left], 
+get_record_and_type_info([{attribute, _, record, {Name, Fields0}}|Left],
 			 Module, Records, RecDict) ->
   {ok, Fields} = get_record_fields(Fields0, RecDict),
   Arity = length(Fields),
@@ -189,7 +188,7 @@ get_record_and_type_info([{attribute, _, type, {{record, Name}, Fields0, []}}
   Arity = length(Fields),
   NewRecDict = dict:store({record, Name}, [{Arity, Fields}], RecDict),
   get_record_and_type_info(Left, Module, Records, NewRecDict);
-get_record_and_type_info([{attribute, _, Attr, {Name, TypeForm}}|Left], 
+get_record_and_type_info([{attribute, _, Attr, {Name, TypeForm}}|Left],
 			 Module, Records, RecDict) when Attr =:= 'type';
                                                         Attr =:= 'opaque' ->
   try
@@ -198,7 +197,7 @@ get_record_and_type_info([{attribute, _, Attr, {Name, TypeForm}}|Left],
   catch
     throw:{error, _} = Error -> Error
   end;
-get_record_and_type_info([{attribute, _, Attr, {Name, TypeForm, Args}}|Left], 
+get_record_and_type_info([{attribute, _, Attr, {Name, TypeForm, Args}}|Left],
 			 Module, Records, RecDict) when Attr =:= 'type';
                                                         Attr =:= 'opaque' ->
   try
@@ -212,15 +211,15 @@ get_record_and_type_info([_Other|Left], Module, Records, RecDict) ->
 get_record_and_type_info([], _Module, Records, RecDict) ->
   case type_record_fields(lists:reverse(Records), RecDict) of
     {ok, _NewRecDict} = Ok ->
-      ?debug(NewRecDict),
+      ?debug(_NewRecDict),
       Ok;
-    {Name, {error, Error}} ->
+    {error, Name, Error} ->
       {error, lists:flatten(io_lib:format("  Error while parsing #~w{}: ~s\n",
 					  [Name, Error]))}
   end.
 
 add_new_type(TypeOrOpaque, Name, TypeForm, ArgForms, Module, RecDict) ->
-  case erl_types:type_is_defined(TypeOrOpaque, Name, RecDict) of 
+  case erl_types:type_is_defined(TypeOrOpaque, Name, RecDict) of
     true ->
       throw({error, io_lib:format("Type already defined: ~w\n", [Name])});
     false ->
@@ -238,7 +237,7 @@ add_new_type(TypeOrOpaque, Name, TypeForm, ArgForms, Module, RecDict) ->
 get_record_fields(Fields, RecDict) ->
   get_record_fields(Fields, RecDict, []).
 
-get_record_fields([{typed_record_field, OrdRecField, TypeForm}|Left], 
+get_record_fields([{typed_record_field, OrdRecField, TypeForm}|Left],
 		  RecDict, Acc) ->
   Name =
     case OrdRecField of
@@ -270,9 +269,9 @@ type_record_fields([RecKey|Recs], RecDict) ->
     RecDict2 = dict:update(RecKey, Fun, RecDict1),
     type_record_fields(Recs, RecDict2)
   catch
-    throw:{error, _} = Error ->
+    throw:{error, Error} ->
       {record, Name} = RecKey,
-      {Name, Error}
+      {error, Name, Error}
   end.
 
 -spec process_record_remote_types(dialyzer_codeserver:codeserver()) -> dialyzer_codeserver:codeserver().
@@ -313,19 +312,19 @@ merge_records(NewRecords, OldRecords) ->
 %%
 %% ============================================================================
 
--spec get_spec_info(module(), abstract_code(), dict()) ->
+-spec get_spec_info(atom(), abstract_code(), dict()) ->
         {'ok', dict()} | {'error', string()}.
 
 get_spec_info(ModName, AbstractCode, RecordsDict) ->
   get_spec_info(AbstractCode, dict:new(), RecordsDict, ModName, "nofile").
 
-%% TypeSpec is a list of conditional contracts for a function. 
+%% TypeSpec is a list of conditional contracts for a function.
 %% Each contract is of the form {[Argument], Range, [Constraint]} where
 %%  - Argument and Range are in erl_types:erl_type() format and
 %%  - Constraint is of the form {subtype, T1, T2} where T1 and T2
 %%    are erl_types:erl_type()
 
-get_spec_info([{attribute, Ln, spec, {Id, TypeSpec}}|Left], 
+get_spec_info([{attribute, Ln, spec, {Id, TypeSpec}}|Left],
 	      SpecDict, RecordsDict, ModName, File) when is_list(TypeSpec) ->
   MFA = case Id of
 	  {_, _, _} = T -> T;
@@ -340,7 +339,7 @@ get_spec_info([{attribute, Ln, spec, {Id, TypeSpec}}|Left],
     {ok, {{OtherFile, L},_C}} ->
       {Mod, Fun, Arity} = MFA,
       Msg = io_lib:format("  Contract for function ~w:~w/~w "
-			  "already defined in ~s:~w\n", 
+			  "already defined in ~s:~w\n",
 			  [Mod, Fun, Arity, OtherFile, L]),
       throw({error, Msg})
   catch
@@ -376,11 +375,12 @@ sets_filter([Mod|Mods], ExpTypes) ->
 %%
 %% ============================================================================
 
--spec src_compiler_opts() -> comp_options().
+-spec src_compiler_opts() -> [compile:option(),...].
 
 src_compiler_opts() ->
-  [no_copt, to_core, binary, return_errors, 
-   no_inline, strict_record_tests, strict_record_updates].
+  [no_copt, to_core, binary, return_errors,
+   no_inline, strict_record_tests, strict_record_updates,
+   no_is_record_optimization].
 
 -spec get_module(abstract_code()) -> module().
 
@@ -400,7 +400,7 @@ cleanup_parse_transforms([]) ->
 -spec format_errors([{module(), string()}]) -> [string()].
 
 format_errors([{Mod, Errors}|Left]) ->
-  FormatedError = 
+  FormatedError =
     [io_lib:format("~s:~w: ~s\n", [Mod, Line, M:format_error(Desc)])
      || {Line, M, Desc} <- Errors],
   [lists:flatten(FormatedError) | format_errors(Left)];
@@ -475,7 +475,7 @@ pp_size(Size, Ctxt, Cont) ->
   end.
 
 pp_opts(Type, Flags) ->
-  FinalFlags = 
+  FinalFlags =
     case cerl:atom_val(Type) of
       binary -> [];
       float -> keep_endian(cerl:concrete(Flags));
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index e3e3f6d668..b2902e95ed 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 2.2.0
+DIALYZER_VSN = 2.4.0
diff --git a/lib/docbuilder/doc/src/notes.xml b/lib/docbuilder/doc/src/notes.xml
index 725aae0a68..4b8c04f323 100644
--- a/lib/docbuilder/doc/src/notes.xml
+++ b/lib/docbuilder/doc/src/notes.xml
@@ -31,6 +31,37 @@
   <p>This document describes the changes made to the DocBuilder
      application.</p>
 
+<section><title>Docbuilder 0.9.8.9</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Fix compatibility issues with docbuilder for R11
+	    documentation patches. </p>
+          <p>
+	    Own Id: OTP-8946</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Docbuilder 0.9.8.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fixed problem with a centered table that was
+	    transformed into an xml document which then produced
+	    mis-formatted html. </p>
+          <p>
+	    Own Id: OTP-8784</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Docbuilder 0.9.8.7</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/docbuilder/src/docb_edoc_xml_cb.erl b/lib/docbuilder/src/docb_edoc_xml_cb.erl
index 4dba843341..90491bc007 100644
--- a/lib/docbuilder/src/docb_edoc_xml_cb.erl
+++ b/lib/docbuilder/src/docb_edoc_xml_cb.erl
@@ -340,9 +340,7 @@ otp_xmlify_e(#xmlElement{name=code} = E) ->    % 4)
 	    [E#xmlElement{content=Content}]
     end;
 otp_xmlify_e(#xmlElement{name=Tag} = E)        % 5a
-  when Tag==h1; Tag==h2; Tag==h3; Tag==h4; Tag==h5;
-       Tag==center;
-       Tag==font ->
+  when Tag==h1; Tag==h2; Tag==h3; Tag==h4; Tag==h5 ->
     Content = text_only(E#xmlElement.content),
     [E#xmlElement{name=b, content=Content}];
 otp_xmlify_e(#xmlElement{name=Tag} = E)        % 5b-c)
@@ -354,21 +352,16 @@ otp_xmlify_e(#xmlElement{name=table} = E) ->   % 6)
 	module ->
 	    otp_xmlify_table(E#xmlElement.content);
 	overview ->
-	    case get_attrval(border, E) of
-		"" -> % implies border="0"
-		    [{p, otp_xmlify_table(E#xmlElement.content)}];
-		"0" ->
-		    [{p, otp_xmlify_table(E#xmlElement.content)}];
-		_Val ->
-		    Content0 = otp_xmlify_e(E#xmlElement.content),
-		    Summary = #xmlText{value=get_attrval(summary, E)},
-		    TCaption = E#xmlElement{name=tcaption,
-					    attributes=[],
-					    content=[Summary]},
-		    Content = Content0 ++ [TCaption],
-		    [E#xmlElement{attributes=[], content=Content}]
-	    end
+	    Content0 = otp_xmlify_e(E#xmlElement.content),
+	    Summary = #xmlText{value=get_attrval(summary, E)},
+	    TCaption = E#xmlElement{name=tcaption,
+				    attributes=[],
+				    content=[Summary]},
+	    Content = Content0 ++ [TCaption],
+	    [E#xmlElement{attributes=[], content=Content}]
     end;
+otp_xmlify_e(#xmlElement{name=tbody} = E) ->
+    otp_xmlify_e(E#xmlElement.content);
 otp_xmlify_e(#xmlElement{name=sup} = E) ->     % 7)
     Text = get_text(E),
     [#xmlText{parents = E#xmlElement.parents,
@@ -478,31 +471,29 @@ otp_xmlify_a_href("#"++_ = Marker, Es0) -> % <seealso marker="#what">
 otp_xmlify_a_href("http:"++_ = URL, Es0) -> % external URL
     {URL, Es0};
 otp_xmlify_a_href("OTPROOT"++AppRef, Es0) -> % <.. marker="App:FileRef
-    case split(AppRef, "/") of
-	[AppS, "doc", FileRef1] ->
-	    FileRef = AppS++":"++otp_xmlify_a_fileref(FileRef1, AppS),
-	    [#xmlText{value=Str0} = T] = Es0,
-	    Str = case split(Str0, "/") of
-		      %% //Application
-		      [AppS2] ->
-			  %% AppS2 can differ from AppS
-			  %% Example: xmerl/XMerL
-			  AppS2;
-		      [_AppS,ModRef] ->
-			  case split(ModRef, ":") of
-			      %% //Application/Module
-			      [Module] ->
-				  Module++"(3)";
-			      %% //Application/Module:Type()
-			      [_Module,_Type] ->
-				  ModRef
-			  end;
-		      %% //Application/Module:Function/Arity
-		      [_AppS,ModFunc,Arity] ->
-			  ModFunc++"/"++Arity
-		  end,
-	    {FileRef, [T#xmlText{value=Str}]}
-    end;
+    [AppS, "doc", FileRef1] = split(AppRef, "/"),
+    FileRef = AppS++":"++otp_xmlify_a_fileref(FileRef1, AppS),
+    [#xmlText{value=Str0} = T] = Es0,
+    Str = case split(Str0, "/") of
+	      %% //Application
+	      [AppS2] ->
+		  %% AppS2 can differ from AppS
+		  %% Example: xmerl/XMerL
+		  AppS2;
+	      [_AppS,ModRef] ->
+		  case split(ModRef, ":") of
+		      %% //Application/Module
+		      [Module] ->
+			  Module++"(3)";
+		      %% //Application/Module:Type()
+		      [_Module,_Type] ->
+			  ModRef
+		  end;
+	      %% //Application/Module:Function/Arity
+	      [_AppS,ModFunc,Arity] ->
+		  ModFunc++"/"++Arity
+	  end,
+    {FileRef, [T#xmlText{value=Str}]};
 otp_xmlify_a_href("../"++File, Es0) ->
     %% Special case: This kind of relative path is used on some
     %% places within i.e. EDoc and refers to a file within the same
@@ -639,13 +630,13 @@ otp_xmlify_table([#xmlText{} = E|Es]) ->
     [E | otp_xmlify_table(Es)];
 otp_xmlify_table([#xmlElement{name=tbody} = E|Es]) ->
     otp_xmlify_table(E#xmlElement.content)++otp_xmlify_table(Es);
-otp_xmlify_table([#xmlElement{name=tr} = E|Es]) ->
+otp_xmlify_table([#xmlElement{name=tr, content=Content}|Es]) ->
     %% Insert newlines between table rows
-    otp_xmlify_table(E#xmlElement.content)++[{br,[]}]++otp_xmlify_table(Es);
-otp_xmlify_table([#xmlElement{name=th} = E|Es]) ->
-    [{em, E#xmlElement.content} | otp_xmlify_table(Es)];
-otp_xmlify_table([#xmlElement{name=td} = E|Es]) ->
-    otp_xmlify_e(E#xmlElement.content) ++ otp_xmlify_table(Es);
+    otp_xmlify_table(Content)++[{br,[]}]++otp_xmlify_table(Es);
+otp_xmlify_table([#xmlElement{name=th, content=Content}|Es]) ->
+    [{em, Content} | otp_xmlify_table(Es)];
+otp_xmlify_table([#xmlElement{name=td, content=Content}|Es]) ->
+    otp_xmlify_e(Content) ++ otp_xmlify_table(Es);
 otp_xmlify_table([]) ->
     [].
 
@@ -1155,8 +1146,8 @@ get_text(#xmlElement{content=[E]}) ->
 
 %% text_only(Es) -> Ts
 %% Takes a list of xmlElement and xmlText and return a lists of xmlText.
-text_only([#xmlElement{} = E |Es]) ->
-    text_only(E#xmlElement.content) ++ text_only(Es);
+text_only([#xmlElement{content = Content}|Es]) ->
+    text_only(Content) ++ text_only(Es);
 text_only([#xmlText{} = E |Es]) ->
     [E | text_only(Es)];
 text_only([]) ->
diff --git a/lib/docbuilder/src/docb_html.erl b/lib/docbuilder/src/docb_html.erl
index 9aea4c8a66..bdfc5ea876 100644
--- a/lib/docbuilder/src/docb_html.erl
+++ b/lib/docbuilder/src/docb_html.erl
@@ -283,16 +283,16 @@ rule([term|_], {_, [ID], _}, Opts) ->
 			    ID,
 			    "</strong></em> "]}, Opts};
 		TermList ->
-		    case lists:keysearch(ID, 1, TermList) of
+		    case lists:keyfind(ID, 1, TermList) of
 			false ->
 			    {{drop, ["<em><strong>", ID,
 				    "</strong></em> "]},
 			     Opts};
-			{value, {ID, Name, _Description, _Resp}} ->
+			{ID, Name, _Description, _Resp} ->
 			    {{drop, ["<em><strong>", Name,
 				     "</strong></em> "]},
 			     Opts};
-			{value, {ID, Name, _Description}} ->
+			{ID, Name, _Description} ->
 			    {{drop, [ "<em><strong>", Name,
 				      "</strong></em> "]},
 			     Opts}
@@ -306,16 +306,16 @@ rule([term|_], {_, [ID], _}, Opts) ->
 		TermList ->
 		    PartApplication =
 			docb_util:lookup_option(part_application, Opts),
-		    case lists:keysearch(ID, 1, TermList) of
+		    case lists:keyfind(ID, 1, TermList) of
 			false ->
 			    {{drop, ["<a href=\"", PartApplication,
 				    "_term.html#", ID, "\">", ID,
 				    "</a> "]}, Opts};
-			{value, {ID, Name, _Description, _Resp}} ->
+			{ID, Name, _Description, _Resp} ->
 			    {{drop, ["<a href=\"", PartApplication,
 				    "_term.html#", ID, "\">", Name,
 				    "</a> "]}, Opts};
-			{value, {ID, Name, _Description}} ->
+			{ID, Name, _Description} ->
 			    {{drop, ["<a href=\"", PartApplication,
 				    "_term.html#", ID, "\">", Name,
 				    "</a> "]}, Opts}
@@ -331,17 +331,16 @@ rule([cite|_], {_, [ID], _}, Opts) ->
 		    {{drop, ["<em><strong>", ID, "</strong></em> "]},
 		     Opts};
 		CiteList ->
-		    case lists:keysearch(ID, 1, CiteList) of
+		    case lists:keyfind(ID, 1, CiteList) of
 			false ->
 			    {{drop,
 			      ["<em><strong>", ID, "</strong></em> "]},
 			     Opts};
-	
-		{value, {ID, Name, _Description, _Resp}} ->
+			{ID, Name, _Description, _Resp} ->
 			    {{drop, ["<em><strong>", Name,
 				     "</strong></em> "]},
 			     Opts};
-			{value, {ID, Name, _Description}} ->
+			{ID, Name, _Description} ->
 			    {{drop, ["<em><strong>", Name,
 				     "</strong></em> "]},
 			     Opts}
@@ -355,18 +354,18 @@ rule([cite|_], {_, [ID], _}, Opts) ->
 		CiteList ->
 		    PartApp =
 			docb_util:lookup_option(part_application, Opts),
-		    case lists:keysearch(ID, 1, CiteList) of
+		    case lists:keyfind(ID, 1, CiteList) of
 			false ->
 			    {{drop, ["<a href=\"", PartApp,
 				     "_cite.html#", ID, "\">", ID,
 				     "</a> "]},
 			     Opts};
-			{value, {ID, Name, _Description, _Resp}} ->
+			{ID, Name, _Description, _Resp} ->
 			    {{drop, ["<a href=\"", PartApp,
 				    "_cite.html#", ID, "\">", Name,
 				     "</a> "]},
 			     Opts};
-			{value, {ID, Name, _Description}} ->
+			{ID, Name, _Description} ->
 			    {{drop, ["<a href=\"", PartApp,
 				    "_cite.html#", ID, "\">", Name,
 				     "</a> "]},
@@ -376,7 +375,7 @@ rule([cite|_], {_, [ID], _}, Opts) ->
     end;
 
 rule([code|_], {_, [Type], [{pcdata, _, Code}]}, Opts) ->
-    case lists:member(Type,["ERL","C","NONE"]) of
+    case lists:member(Type, ["ERL","C","NONE"]) of
 	true ->
 	    {{drop, ["\n<div class=\"example\"><pre>\n", docb_html_util:element_cdata_to_html(Code),
 		     "\n</pre></div>\n"]}, Opts};
diff --git a/lib/docbuilder/src/docb_html_util.erl b/lib/docbuilder/src/docb_html_util.erl
index b2951706ea..02ce8b52a7 100644
--- a/lib/docbuilder/src/docb_html_util.erl
+++ b/lib/docbuilder/src/docb_html_util.erl
@@ -136,7 +136,6 @@ copy_pics(Src, Dest, Opts) ->
     Dir = code:lib_dir(docbuilder),
     InFile = filename:join([Dir, "etc", Src]),
     OutFile = docb_util:outfile(Dest, "", Opts),
-
     case filelib:last_modified(OutFile) of
 	0 -> % File doesn't exist
 	    file:copy(InFile, OutFile);
@@ -156,10 +155,10 @@ copy_pics(Src, Dest, Opts) ->
 %%--Resolve header data-------------------------------------------------
 
 extract_header_data(Key, {header, [], List}) ->
-    case lists:keysearch(Key, 1, List) of
-	{value, {Key, [], []}} ->
+    case lists:keyfind(Key, 1, List) of
+	{Key, [], []} ->
 	    "";
-	{value, {Key, [], [{pcdata, [], Value}]}} ->
+	{Key, [], [{pcdata, [], Value}]} ->
 	    pcdata_to_html(Value);
 	false ->
 	    ""
@@ -253,7 +252,7 @@ make_anchor_href(HRef) ->
 	{ok, [HRef]} ->
 	    %% No `#' in HRef, i.e. only path
 	    make_anchor_href(HRef, "");
-	 {ok, [Path, Fragment]}->
+	 {ok, [Path, Fragment]} ->
 	    make_anchor_href(Path, Fragment)
     end.
 
@@ -398,10 +397,10 @@ count_sections([]) ->
 %%--Make a ToC----------------------------------------------------------
 
 format_toc(Toc) ->
-    lists:map(fun({Number, Title}) ->
-		      [Number, " <a href = \"#", Number,
-		       "\">", Title, "</a><br/>\n"]
-	      end, Toc).
+    [format_toc1(T) || T <- Toc].
+
+format_toc1({Number, Title}) ->
+    [Number, " <a href = \"#", Number, "\">", Title, "</a><br/>\n"].
 
 %%--Convert HTML ISO Latin 1 characters to ordinary characters----------
 
diff --git a/lib/docbuilder/src/docb_main.erl b/lib/docbuilder/src/docb_main.erl
index ef21f65557..4f5f035a65 100644
--- a/lib/docbuilder/src/docb_main.erl
+++ b/lib/docbuilder/src/docb_main.erl
@@ -34,14 +34,23 @@
 %% Parses the source file File and transforms the result to html,
 %% latex and/or man page format.
 process(File, Opts) ->
-
-    File1 = File ++ ".tmpconv",
-    os:cmd("sed -e 's/xi:include[ \t]*href/include file/g' -e 's/xmlns:xi=\"http:\\/\\/www.w3.org\\/2001\\/XInclude\"//g' < " ++ 
-	   File ++ ".xml > " ++ File1 ++ ".xml"), %LATH
+    
+    SrcType = docb_util:lookup_option(src_type, Opts),
+
+    File1 = 
+	case SrcType of
+	    ".xml" ->
+		FileTmp = File ++ ".tmpconv",
+		os:cmd("sed -e 's/xi:include[ \t]*href/include file/g' -e 's/xmlns:xi=\"http:\\/\\/www.w3.org\\/2001\\/XInclude\"//g' < " ++ 
+		       File ++ ".xml > " ++ FileTmp ++ ".xml"),
+		FileTmp;
+	    ".sgml"  ->
+		File
+	end,		
     
     case parse1(File1, Opts) of
 	errors ->
-	    file:delete(File1 ++ ".xml"),
+	    delete_tmp_file(SrcType, File1),
 	    errors;
 	{ok, Tree} ->
 	    From = element(1, Tree),
@@ -55,22 +64,28 @@ process(File, Opts) ->
 
 	    %% If no target format is specified, assume HTML:
 	    Tos = if
-		      Tos0==[] -> [html];
+		      Tos0 =:= [] -> [html];
 		      true -> Tos0
 		  end,
 
 	    Result = [transform(From, To, Opts, File, Tree)||To <- Tos], 
 	    case lists:member(transformation_error,Result) of 
 		true -> 	
-		    file:delete(File1 ++ ".xml"),
+		    delete_tmp_file(SrcType, File1),
 		    errors;
 		_ -> 
-		    file:delete(File1 ++ ".xml"),
+		    delete_tmp_file(SrcType, File1),
 		    ok
 	    end
     
     end.
 
+
+delete_tmp_file(".xml", File) ->
+    file:delete(File ++ ".xml");
+delete_tmp_file(_, _) ->
+    ok.
+
 %%----------------------------------------------------------------------
 
 %% parse(File, Opts) -> {ok, Tree} | errors
@@ -327,12 +342,8 @@ verify(Tree) -> verify(Tree, [], 1).
 verify({pcdata, Optional, _}, Path, Level) ->
     verify_optional(Optional, Path, Level);
 verify({Tag, Optional, Args}, Path, Level) when is_list(Args) ->
-    case verify_optional(Optional, Path, Level) of
-	true ->
-	    verify_list(Args, [Tag|Path], Level);
-	false ->
-	    false
-    end;
+    verify_optional(Optional, Path, Level)
+	andalso verify_list(Args, [Tag|Path], Level);
 verify(Other, Path, Level) ->
     verify_error(Other, Path, Level).
 
@@ -342,12 +353,7 @@ verify_error(X, Path, Level) ->
     false.
 
 verify_list([H|T], Path, Level) ->
-    case verify(H, Path, Level) of
-	true ->
-	    verify_list(T, Path, Level +1);
-	false ->
-	    false
-    end;
+    verify(H, Path, Level) andalso verify_list(T, Path, Level + 1);
 verify_list([], _, _) ->
     true.
 
@@ -419,7 +425,7 @@ edit1_list(_Tag, [], _Op) ->
 %% Actual transformation of tree structure to desired format.
 transform(From, To, Opts, File, Tree) ->
     Filter = if
-		 To==html; To==kwic ->
+		 To =:= html; To =:= kwic ->
 		     list_to_atom("docb_tr_" ++ atom_to_list(From) ++
 				  [$2|atom_to_list(To)]);
 		 true ->
@@ -427,7 +433,7 @@ transform(From, To, Opts, File, Tree) ->
 				  [$2|atom_to_list(To)])
 	     end,
 
-    case catch apply(Filter, transform, [File, Tree, Opts]) of
+    case catch Filter:transform(File, Tree, Opts) of
 
 	%% R5C
 	{'EXIT', {undef, [{Filter, transform, [File, Tree, Opts]}|_]}}->
@@ -459,9 +465,9 @@ transform(From, To, Opts, File, Tree) ->
 finish_transform(Tree, File, Opts, Filter) ->
     {Str, NewOpts} = pp(Tree, [], 1, Filter, Opts),
     Extension =
-	case catch apply(Filter, extension, [NewOpts]) of
+	case catch Filter:extension(NewOpts) of
 	    {'EXIT', _} ->
-		apply(Filter, extension, []);
+		Filter:extension();
 	    Others ->
 		Others
 	end,
@@ -606,7 +612,7 @@ include_all(Fd) ->
 	eof ->
 	    [];
 	ListOfChars ->
-	    lists:append(ListOfChars, include_all(Fd))
+	    ListOfChars ++ include_all(Fd)
     end.
 
 extract(File, Fd, StartTag, StopTag, State) ->
diff --git a/lib/docbuilder/src/docb_pretty_format.erl b/lib/docbuilder/src/docb_pretty_format.erl
index 0c4fb0507b..25dcd8987b 100644
--- a/lib/docbuilder/src/docb_pretty_format.erl
+++ b/lib/docbuilder/src/docb_pretty_format.erl
@@ -47,7 +47,7 @@ term(Term) ->
 %% the next line to need an "extra" indent!).
 term([], Indent) ->
     {Indent, [$[,$]]};
-term(L, Indent) when list(L) ->
+term(L, Indent) when is_list(L) ->
     case is_string(L) of
 	true ->
 	    {Indent, io_lib:write_string(L)};
@@ -59,7 +59,7 @@ term(L, Indent) when list(L) ->
 		    write_simple_list(L, Indent)
 	    end
     end;
-term(T, Indent) when tuple(T) ->
+term(T, Indent) when is_tuple(T) ->
     case complex_tuple(T) of
 	true ->
 	    write_complex_tuple(T, Indent);
diff --git a/lib/docbuilder/src/docb_tr_application2html.erl b/lib/docbuilder/src/docb_tr_application2html.erl
index 4084cfe6ba..d8cb214d0a 100644
--- a/lib/docbuilder/src/docb_tr_application2html.erl
+++ b/lib/docbuilder/src/docb_tr_application2html.erl
@@ -119,8 +119,8 @@ transform(File, {application, _Attrs, [Header|Rest]}, Opts0) ->
 		case docb_main:parse1("fascicules", Opts0) of
 		    {ok, Parse} ->
 			FascData = get_fasc_data(Parse),
-                        case lists:keysearch(File, 1, FascData) of
-			    {value, {_, _, "YES", _}} ->
+                        case lists:keyfind(File, 1, FascData) of
+			    {_, _, "YES", _} ->
 				OrigFile =
 				    docb_util:outfile(File++"_frame",
 						      ".html", Opts0),
@@ -167,7 +167,7 @@ concat_files([File|Rest], Body, Opts) ->
 	    %% Remove the reference manual header
 	    [{Ref, [], [_Hdr| NewBody]}] = NewParse,
 	    RefParse = [{Ref, [], NewBody}],
-	    lists:append(Body, concat_files(Rest, RefParse, Opts));
+	    Body ++ concat_files(Rest, RefParse, Opts);
 	errors ->
 	    errors
     end;
@@ -216,7 +216,7 @@ make_toc([{lib, Attrs, More}|Rest]) ->
 make_toc([{com, Attrs, More}|Rest]) ->
     [{com, Attrs, More}|make_toc(Rest)];
 make_toc([{_Tag, _Attrs, More}|Rest]) ->
-    lists:append(make_toc(More), make_toc(Rest)).
+    make_toc(More) ++ make_toc(Rest).
 
 rule([module|_], {_, [File], _}) ->
     {"<small><a target=\"document\" href=\"" ++
@@ -280,9 +280,7 @@ get_fasc_data({fascicules, _, Fascs}) ->
       Fascs).
 
 get_avals(Atts) ->
-    lists:map(fun(Tuple) ->
-		      element(3, Tuple) end,
-	      Atts).
+    [element(3, Tuple) || Tuple <- Atts].
 
 get_pc_text([{pcdata, _, Text}]) ->
     Text.
diff --git a/lib/docbuilder/src/docb_tr_cite2html.erl b/lib/docbuilder/src/docb_tr_cite2html.erl
index 4ecbfa4e91..77f1c4e636 100644
--- a/lib/docbuilder/src/docb_tr_cite2html.erl
+++ b/lib/docbuilder/src/docb_tr_cite2html.erl
@@ -39,24 +39,22 @@ purge_body([], _) ->
 purge_body([{pcdata,_Attrs,_More}|Rest], CiteList) ->
     purge_body(Rest, CiteList);
 purge_body([{cite,[{"ID","CDATA",ID}],More}|Rest], CiteList) ->
-    case lists:keysearch(ID, 1, CiteList) of
+    case lists:keyfind(ID, 1, CiteList) of
 	false ->
 	    [{cite, [{"NAME","CDATA",ID}, {"ID","CDATA",ID}], More}|
 	     purge_body(Rest, CiteList)];
-	{value, {ID, Name, _Description, _Responsible}} ->
+	{ID, Name, _Description, _Responsible} ->
 	    [{cite, [{"NAME","CDATA",Name}, {"ID","CDATA",ID}], More}|
 	     purge_body(Rest, CiteList)];
-	{value, {ID, Name, _Description}} ->
+	{ID, Name, _Description} ->
 	    [{cite, [{"NAME","CDATA",Name}, {"ID","CDATA",ID}], More}|
 	     purge_body(Rest, CiteList)]
     end;
 purge_body([{_Tag,_Attrs,More}|Rest], CiteList) ->
-    lists:append(purge_body(More, CiteList),
-		 purge_body(Rest, CiteList)).
+    purge_body(More, CiteList) ++ purge_body(Rest, CiteList).
 
 rule([header|_], _) ->
     {drop, ""};
-
 rule(_, _) ->
     {drop, ""}.
 
@@ -91,19 +89,19 @@ rule([cite|_], {_,[Name,ID], [{citedef,[],[{pcdata,[],Def}]}]}, Opts) ->
 	    false -> [];
 	    Value  -> Value
 	end,
-    case lists:keysearch(ID, 1, CiteList) of
+    case lists:keyfind(ID, 1, CiteList) of
 	false ->
 	    {{drop,"\n<dt><a name=\"" ++ ID ++ "\">" ++ 
 	      "<strong>" ++ ID ++ "</strong></a></dt>\n<dd>" ++
 	      docb_html_util:pcdata_to_html(Def) ++ "\n</dd>\n"}, Opts};
-	{value, {ID, Name, Description, _Responsible}} ->
+	{ID, Name, Description, _Responsible} ->
 	    docb_util:message(warning,
 			      "Global cite ~s overriding local", [ID]),
 	    {{drop,"\n<dt><a name=\"" ++ ID ++ "\">" ++
 	      "<strong>" ++ Name ++ "</strong></a></dt>\n<dd>" ++
 	      docb_html_util:pcdata_to_html(Description) ++ "\n</dd>\n"},
 	     Opts};
-	{value, {ID, Name, Description}} ->
+	{ID, Name, Description} ->
 	    docb_util:message(warning,
 			      "Global cite ~s overriding local", [ID]),
 	    {{drop,"\n<dt><a name=\"" ++ ID ++ "\">" ++ 
@@ -117,19 +115,19 @@ rule([cite|_], {_,[Name,ID],_}, Opts) ->
 	    false -> [];
 	    Value  ->	Value
 	end,
-    case lists:keysearch(ID, 1, CiteList) of
+    case lists:keyfind(ID, 1, CiteList) of
 	false ->
 	    docb_util:message(error,
 			      "The cite ~s has no definition", [ID]),
 	    {{drop,"\n<dt><a name=\"" ++ ID ++ "\">" ++ 
 	      "<strong>" ++ ID ++ "</strong></a></dt>\n<dd>" ++
 	      "??" ++ "\n</dd>\n"}, Opts};
-	{value, {ID, Name, Description, _Responsible}} ->
+	{ID, Name, Description, _Responsible} ->
 	    {{drop,"\n<dt><a name=\"" ++ ID ++ "\">" ++
 	      "<strong>" ++ Name ++ "</strong></a></dt>\n<dd>" ++
 	      docb_html_util:pcdata_to_html(Description) ++ "\n</dd>\n"},
 	     Opts};
-	{value, {ID, Name, Description}} ->
+	{ID, Name, Description} ->
 	    {{drop,"\n<dt><a name=\"" ++ ID ++ "\">" ++ 
 	      "<strong>" ++ Name ++ "</strong></a></dt>\n<dd>" ++
 	      docb_html_util:pcdata_to_html(Description) ++ "\n</dd>\n"}, Opts}
diff --git a/lib/docbuilder/src/docb_tr_index2html.erl b/lib/docbuilder/src/docb_tr_index2html.erl
index bbf419f3ef..312342add2 100644
--- a/lib/docbuilder/src/docb_tr_index2html.erl
+++ b/lib/docbuilder/src/docb_tr_index2html.erl
@@ -73,9 +73,7 @@ prune_flat([], _) ->
     [].
 
 keep_pcdata(Trees) ->
-    lists:filter(fun({pcdata, _, _}) -> true;
-		    (_) -> false
-		 end, Trees).
+    [T || T = {pcdata, _, _} <- Trees].
 
 new_trees(FileFuncs) ->
     Files0 = [{File, RefType} || {File, RefType, _} <- FileFuncs],
diff --git a/lib/docbuilder/src/docb_tr_part2html.erl b/lib/docbuilder/src/docb_tr_part2html.erl
index dd44c4a8df..30befe8432 100644
--- a/lib/docbuilder/src/docb_tr_part2html.erl
+++ b/lib/docbuilder/src/docb_tr_part2html.erl
@@ -93,8 +93,8 @@ transform(File, {part, _Attrs, [Header| Rest]}, Opts0) ->
 		case docb_main:parse1("fascicules", Opts0) of
 		    {ok, Parse} ->
 			FascData = get_fasc_data(Parse),
-			case lists:keysearch(File, 1, FascData) of
-			    {value, {_, _, "YES", _}} ->
+			case lists:keyfind(File, 1, FascData) of
+			    {_, _, "YES", _} ->
 				OrigFile =
 				    docb_util:outfile(File++"_frame",
 						      ".html", Opts0),
@@ -137,7 +137,7 @@ concat_files([File | Rest], Body, ChLevel, Opts, TP, TOpts, Ext) ->
     case docb_main:parse1(File, Opts) of
 	{ok, Parse} ->
 	    {TopTag, Attrs, [Header = {header, _, HeaderContents} | More]} = Parse,
-	    {value,{title,_,Title}} = lists:keysearch(title,1,HeaderContents),
+	    {title,_,Title} = lists:keyfind(title,1,HeaderContents),
 	    NewMore = [{section, [], [{title, [], Title}| More]}],
 	    NewParse = {TopTag, Attrs, [Header| NewMore]},
 	    if
@@ -156,9 +156,8 @@ concat_files([File | Rest], Body, ChLevel, Opts, TP, TOpts, Ext) ->
 		docb_html_util:number(NewParse,
 				      integer_to_list(ChLevel), File),
 	    {_, [], [_| NewBody]} = NumberTree,
-	    lists:append(Body,
-			 concat_files(Rest, NewBody, ChLevel+1, Opts,
-				      TP, TOpts, Ext));
+	    Body ++ concat_files(Rest, NewBody, ChLevel+1, Opts,
+				 TP, TOpts, Ext);
 	errors ->
 	    throw({error,"Parse error when building chapter "++File})
     end;
@@ -232,9 +231,7 @@ get_fasc_data({fascicules, _, Fascs}) ->
       Fascs).
 
 get_avals(Atts) ->
-    lists:map(fun(Tuple) ->
-		      element(3, Tuple) end,
-	      Atts).
+    [element(3, Tuple) || Tuple <- Atts].
 
 get_pc_text([{pcdata, _, Text}]) ->
     Text.
diff --git a/lib/docbuilder/src/docb_tr_term2html.erl b/lib/docbuilder/src/docb_tr_term2html.erl
index 0a993cebb1..a3c4a5312a 100644
--- a/lib/docbuilder/src/docb_tr_term2html.erl
+++ b/lib/docbuilder/src/docb_tr_term2html.erl
@@ -39,24 +39,22 @@ purge_body([], _) ->
 purge_body([{pcdata,_Attrs,_More}|Rest], TermList) ->
     purge_body(Rest, TermList);
 purge_body([{term,[{"ID","CDATA",ID}],More}|Rest], TermList) ->
-    case lists:keysearch(ID, 1, TermList) of
+    case lists:keyfind(ID, 1, TermList) of
 	false ->
 	    [{term,[{"NAME","CDATA",ID},{"ID","CDATA",ID}],More}|
 	     purge_body(Rest, TermList)];
-	{value, {ID, Name, _Description, _Responsible}} ->
+	{ID, Name, _Description, _Responsible} ->
 	    [{term,[{"NAME","CDATA",Name},{"ID","CDATA",ID}],More}|
 	     purge_body(Rest, TermList)];
-	{value, {ID, Name, _Description}} ->
+	{ID, Name, _Description} ->
 	    [{term,[{"NAME","CDATA",Name},{"ID","CDATA",ID}],More}|
 	     purge_body(Rest, TermList)]
     end;
 purge_body([{_Tag,_Attrs,More}|Rest], TermList) ->
-    lists:append(purge_body(More, TermList),
-		 purge_body(Rest, TermList)).
+    purge_body(More, TermList) ++ purge_body(Rest, TermList).
 
 rule([header|_], _) ->
     {drop, ""};
-
 rule(_, _) ->
     {drop, ""}.
 
@@ -82,19 +80,19 @@ rule([term|_], {_,[Name,ID],[{termdef,[],[{pcdata,[],Def}]}]}, Opts) ->
 		   false -> [];
 		   Value  -> Value
 	       end,
-    case lists:keysearch(ID, 1, TermList) of
+    case lists:keyfind(ID, 1, TermList) of
 	false ->
 	    {{drop,"\n<dt><a name=\"" ++ ID ++ "\">" ++ 
 	      "<strong>" ++ ID ++ "</strong></a>\n</dt>\n<dd>" ++
 	      docb_html_util:pcdata_to_html(Def) ++ "\n</dd>\n"}, Opts};
-	{value, {ID, Name, Description, _Responsible}} ->
+	{ID, Name, Description, _Responsible} ->
 	    docb_util:message(warning,
 			      "Global term ~s overriding local", [ID]),
 	    {{drop,"\n<dt><a name=\"" ++ ID ++ "\">" ++
 	      "<strong>" ++ Name ++ "</strong></a></dt>\n<dd>" ++
 	      docb_html_util:pcdata_to_html(Description) ++ "\n</dd>\n"},
 	     Opts};
-	{value, {ID, Name, Description}} ->
+	{ID, Name, Description} ->
 	    docb_util:message(warning,
 			      "Global term ~s overriding local", [ID]),
 	    {{drop, "\n<dt><a name=\"" ++ ID ++ "\">" ++ 
@@ -107,19 +105,19 @@ rule([term|_], {_,[Name,ID],_}, Opts) ->
 		   false -> [];
 		   Value  -> Value
 	       end,
-    case lists:keysearch(ID, 1, TermList) of
+    case lists:keyfind(ID, 1, TermList) of
 	false ->
 	    docb_util:message(error,
 			      "The term ~s has no definition", [ID]),
 	    {{drop, "\n<dt><a name=\"" ++ ID ++ "\">" ++ 
 	      "<strong>" ++ ID ++ "</strong></a></dt>\n<dd>" ++
 	      "??" ++ "\n</dd>\n"}, Opts};
-	{value, {ID, Name, Description, _Responsible}} ->
+	{ID, Name, Description, _Responsible} ->
 	    {{drop, "\n<dt><a name=\"" ++ ID ++ "\">" ++
 	      "<strong>" ++ Name ++ "</strong></a></dt>\n<dd>" ++
 	      docb_html_util:pcdata_to_html(Description) ++ "\n</dd>\n"},
 	     Opts};
-	{value, {ID, Name, Description}} ->
+	{ID, Name, Description} ->
 	    {{drop, "\n<dt><a name=\"" ++ ID ++ "\">" ++ 
 	      "<strong>" ++ Name ++ "</strong></a></dt>\n<dd>" ++
 	      docb_html_util:pcdata_to_html(Description) ++ "\n</dd>\n"}, Opts}
diff --git a/lib/docbuilder/src/docb_transform.erl b/lib/docbuilder/src/docb_transform.erl
index a432038adf..9c7561b07b 100644
--- a/lib/docbuilder/src/docb_transform.erl
+++ b/lib/docbuilder/src/docb_transform.erl
@@ -135,8 +135,8 @@ parse([Opt | _RawOpts], _Opts) ->
 get_defs(Type, File, Opts) ->
     Key = {defs,Type},
     {PrevDefs, Opts2} =
-	case lists:keysearch(Key, 1, Opts) of
-	    {value, {_, Defs0}} ->
+	case lists:keyfind(Key, 1, Opts) of
+	    {_, Defs0} ->
 		{Defs0, lists:keydelete(Key, 1, Opts)};
 	    false ->
 		{[], Opts}
diff --git a/lib/docbuilder/src/docb_util.erl b/lib/docbuilder/src/docb_util.erl
index 59673ef3a4..9b2eec7733 100644
--- a/lib/docbuilder/src/docb_util.erl
+++ b/lib/docbuilder/src/docb_util.erl
@@ -61,7 +61,7 @@ html_snippet(What, Opts) ->
     case lookup_option(html_mod, Opts) of
 	false -> "";
 	Module ->
-	    case catch apply(Module, What, []) of
+	    case catch Module:What() of
 		HTML when is_list(HTML) ->
 		    HTML;
 		{'EXIT', {undef, _}} ->
@@ -82,7 +82,7 @@ html_snippet(What, Arg, Opts) ->
     case lookup_option(html_mod, Opts) of
 	false -> "";
 	Module ->
-	    case catch apply(Module, What, [Arg]) of
+	    case catch Module:What(Arg) of
 		HTML when is_list(HTML) ->
 		    HTML;
 		{'EXIT', {undef, _}} ->
@@ -106,8 +106,8 @@ html_snippet(What, Arg, Opts) ->
 
 %% lookup_option(Opt, Opts) -> Value | false
 lookup_option(Opt, Opts) ->
-  case lists:keysearch(Opt, 1, Opts) of
-      {value, {Opt,Value}} -> Value;
+  case lists:keyfind(Opt, 1, Opts) of
+      {Opt,Value} -> Value;
       false -> false
   end.
 
diff --git a/lib/docbuilder/src/docb_xmerl_tree_cb.erl b/lib/docbuilder/src/docb_xmerl_tree_cb.erl
index d57f55bff8..bc62069230 100644
--- a/lib/docbuilder/src/docb_xmerl_tree_cb.erl
+++ b/lib/docbuilder/src/docb_xmerl_tree_cb.erl
@@ -188,8 +188,8 @@ attrs(DTD, Tag, GivenAttrs) ->
     merge_attrs(Tag, default_attrs(DTD, Tag), GivenAttrs).
 
 merge_attrs(Tag, [{NameA, Type, DefVal}|Default], GivenAttrs) ->
-    Val = case lists:keysearch(NameA, #xmlAttribute.name, GivenAttrs) of
-	      {value, #xmlAttribute{value=Val0}} -> Val0;
+    Val = case lists:keyfind(NameA, #xmlAttribute.name, GivenAttrs) of
+	      #xmlAttribute{value=Val0} -> Val0;
 	      false -> DefVal
 	  end,
     Attr = {attr_name(NameA), Type, attr_val(Type, Val)},
diff --git a/lib/docbuilder/test/Makefile b/lib/docbuilder/test/Makefile
index 080479ee71..96b940033e 100644
--- a/lib/docbuilder/test/Makefile
+++ b/lib/docbuilder/test/Makefile
@@ -71,7 +71,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SPEC_FILES) $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) $(SPEC_FILES) docb.cover $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/docbuilder/test/docb.cover b/lib/docbuilder/test/docb.cover
new file mode 100644
index 0000000000..80bab6eba7
--- /dev/null
+++ b/lib/docbuilder/test/docb.cover
@@ -0,0 +1,2 @@
+{incl_app,docbuilder,details}
+
diff --git a/lib/docbuilder/test/docb_SUITE.erl b/lib/docbuilder/test/docb_SUITE.erl
index c871130521..d286824539 100644
--- a/lib/docbuilder/test/docb_SUITE.erl
+++ b/lib/docbuilder/test/docb_SUITE.erl
@@ -17,13 +17,32 @@
 %%
 -module(docb_SUITE).
 
--export([all/1,html/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,html/1]).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -include_lib("kernel/include/file.hrl").
 
-all(suite) -> [html].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+[html].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 html(suite) -> [];
 html(Config) when is_list(Config) ->
diff --git a/lib/docbuilder/vsn.mk b/lib/docbuilder/vsn.mk
index 2852ebcc8b..1209b80d94 100644
--- a/lib/docbuilder/vsn.mk
+++ b/lib/docbuilder/vsn.mk
@@ -1,14 +1 @@
-DOCB_VSN = 0.9.8.7
-
-TICKETS = OTP-8343
-
-TICKETS_0.9.8.6 = OTP-8201
-
-TICKETS_0.9.8.5 = OTP-7851
-
-TICKETS_0.9.8.4 = OTP-7236
-
-TICKETS_0.9.8.1 = OTP-7236
-
-
-
+DOCB_VSN = 0.9.8.9
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index 74fa2d3ab6..afcccf22b5 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -31,6 +31,36 @@
   <p>This document describes the changes made to the EDoc
     application.</p>
 
+<section><title>Edoc 0.7.6.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Compiler warnings were eliminated.</p>
+          <p>
+	    Own Id: OTP-8855</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Edoc 0.7.6.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Edoc now uses the new API functions to <c>inets</c>
+	    instead of the deprecated ones.</p>
+          <p>
+	    Own Id: OTP-8749</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Edoc 0.7.6.6</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl
index ec452a5929..75b3bb451a 100644
--- a/lib/edoc/src/edoc.erl
+++ b/lib/edoc/src/edoc.erl
@@ -58,6 +58,8 @@
 	 read_comments/1, read_comments/2,
 	 read_source/1, read_source/2]).
 
+-compile({no_auto_import,[error/1]}).
+
 -import(edoc_report, [report/2, report/3, error/1, error/3]).
 
 -include("edoc.hrl").
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index 900f0b3040..6cc2f5cd9b 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -482,7 +482,7 @@ local_defs([]) -> [];
 local_defs(Es) ->
     [?NL,
      {ul, [{class, "definitions"}],
-      lists:concat([[{li, [{tt, localdef(E)}]}, ?NL] || E <- Es])}].
+      lists:append([[{li, [{tt, localdef(E)}]}, ?NL] || E <- Es])}].
 
 localdef(E = #xmlElement{content = Es}) ->
     (case get_elem(typevar, Es) of
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl
index 47e61f7932..c1f95a7a67 100644
--- a/lib/edoc/src/edoc_lib.erl
+++ b/lib/edoc/src/edoc_lib.erl
@@ -288,11 +288,13 @@ parse_expr(S, L) ->
 %% content in e.g.
 %% <a href="overview-summary.html#mtag-author">`@author'</a> tags.
 
-%% @type info() = #info{name = string(),
-%%                      mail = string(),
-%%                      uri = string()}
+%% @type info() = #info{name  = string(),
+%%                      email = string(),
+%%                      uri   = string()}
 
--record(info, {name = "", email = "", uri = ""}).
+-record(info, {name = ""  :: string(),
+	       email = "" :: string(),
+	       uri = ""   :: string()}).
 
 parse_contact(S, L) ->
     I = scan_name(S, L, #info{}, []),
@@ -472,7 +474,7 @@ uri_get_file(File0) ->
 
 uri_get_http(URI) ->
     %% Try using option full_result=false
-    case catch {ok, http:request(get, {URI,[]}, [],
+    case catch {ok, httpc:request(get, {URI,[]}, [],
 				 [{full_result, false}])} of
 	{'EXIT', _} ->
 	    uri_get_http_r10(URI);
@@ -482,7 +484,7 @@ uri_get_http(URI) ->
 
 uri_get_http_r10(URI) ->
     %% Try most general form of request
-    Result = (catch {ok, http:request(get, {URI,[]}, [], [])}),
+    Result = (catch {ok, httpc:request(get, {URI,[]}, [], [])}),
     uri_get_http_1(Result, URI).
 
 uri_get_http_1(Result, URI) ->
@@ -988,6 +990,14 @@ get_plugin(Key, Default, Opts) ->
 %% ---------------------------------------------------------------------
 %% Error handling
 
+-type line() :: erl_scan:line().
+-type err()  :: 'eof'
+	      | {'missing', char()}
+	      | {line(), atom(), string()}
+	      | string().
+
+-spec throw_error(err(), line()) -> no_return().
+
 throw_error({missing, C}, L) ->
     throw_error({"missing '~c'.", [C]}, L);
 throw_error(eof, L) ->
diff --git a/lib/edoc/src/edoc_macros.erl b/lib/edoc/src/edoc_macros.erl
index 2874e2940c..5b512cb53a 100644
--- a/lib/edoc/src/edoc_macros.erl
+++ b/lib/edoc/src/edoc_macros.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @private
 %% @copyright 2001-2005 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
@@ -317,6 +315,14 @@ macro_content([C | Cs], As, L, N) ->
 macro_content([], _As, _L, _N) ->
     throw('end').
 
+-type line() :: erl_scan:line().
+-type err()  :: 'unterminated_macro'
+	      | 'macro_name'
+	      | {'macro_name', string()}
+	      | {string(), [string()]}.
+
+-spec throw_error(line(), err()) -> no_return().
+
 throw_error(L, unterminated_macro) ->
     throw_error(L, {"unexpected end of macro.", []});
 throw_error(L, macro_name) ->
diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl
index 0eea8ae66f..91ee5a1b2b 100644
--- a/lib/edoc/src/edoc_parser.yrl
+++ b/lib/edoc/src/edoc_parser.yrl
@@ -404,6 +404,8 @@ parse_throws(S, L) ->
 
 %% ---------------------------------------------------------------------
 
+-spec throw_error(term(), erl_scan:line()) -> no_return().
+
 throw_error({L, M, D}, _L0) ->
     throw({error,L,{format_error,M,D}});
 throw_error({parse_spec, E}, L) ->
diff --git a/lib/edoc/src/edoc_refs.erl b/lib/edoc/src/edoc_refs.erl
index c2146bbe02..edc30674c0 100644
--- a/lib/edoc/src/edoc_refs.erl
+++ b/lib/edoc/src/edoc_refs.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @private
 %% @copyright 2003 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
diff --git a/lib/edoc/src/edoc_report.erl b/lib/edoc/src/edoc_report.erl
index b87c58dde3..ee54c60c90 100644
--- a/lib/edoc/src/edoc_report.erl
+++ b/lib/edoc/src/edoc_report.erl
@@ -27,6 +27,8 @@
 
 -module(edoc_report).
 
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([error/1,
 	 error/2,
 	 error/3,
diff --git a/lib/edoc/src/edoc_run.erl b/lib/edoc/src/edoc_run.erl
index 37025d6621..96e5ea4631 100644
--- a/lib/edoc/src/edoc_run.erl
+++ b/lib/edoc/src/edoc_run.erl
@@ -42,6 +42,8 @@
 
 -export([file/1, application/1, packages/1, files/1, toc/1]).
 
+-compile({no_auto_import,[error/1]}).
+
 -import(edoc_report, [report/2, error/1]).
 
 
diff --git a/lib/edoc/src/edoc_tags.erl b/lib/edoc/src/edoc_tags.erl
index 1f2cb99c75..c0b861e08a 100644
--- a/lib/edoc/src/edoc_tags.erl
+++ b/lib/edoc/src/edoc_tags.erl
@@ -330,6 +330,10 @@ parse_typedef(Data, Line, _Env, _Where) ->
 	    Def
     end.
 
+-type line() :: erl_scan:line().
+
+-spec parse_file(_, line(), _, _) -> no_return().
+
 parse_file(Data, Line, Env, _Where) ->
     case edoc_lib:parse_expr(Data, Line) of
 	{string, _, File0} ->
@@ -344,6 +348,8 @@ parse_file(Data, Line, Env, _Where) ->
 	    throw_error(Line, file_not_string)
     end.
 
+-spec parse_header(_, line(), _, _) -> no_return().
+
 parse_header(Data, Line, Env, {Where, _}) ->
     parse_header(Data, Line, Env, Where);
 parse_header(Data, Line, Env, Where) when is_list(Where) ->
@@ -362,6 +368,13 @@ parse_header(Data, Line, Env, Where) when is_list(Where) ->
 	    throw_error(Line, file_not_string)
     end.
 
+-type err() :: 'file_not_string'
+             | {'file_not_found', file:filename()}
+             | {'read_file', file:filename(), term()}
+             | string().
+
+-spec throw_error(line(), err()) -> no_return().
+
 throw_error(L, {read_file, File, R}) ->
     throw_error(L, {"error reading file '~s': ~w",
 		    [edoc_lib:filename(File), R]});
diff --git a/lib/edoc/src/edoc_types.erl b/lib/edoc/src/edoc_types.erl
index 85c9ee6f2a..b0255f793d 100644
--- a/lib/edoc/src/edoc_types.erl
+++ b/lib/edoc/src/edoc_types.erl
@@ -14,8 +14,6 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
 %% @private
 %% @copyright 2001-2003 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
diff --git a/lib/edoc/test/Makefile b/lib/edoc/test/Makefile
index 4ce9799f6d..f77bbaa09b 100644
--- a/lib/edoc/test/Makefile
+++ b/lib/edoc/test/Makefile
@@ -59,7 +59,7 @@ release_spec: opt
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) edoc.spec $(RELSYSDIR)
+	$(INSTALL_DATA) edoc.spec edoc.cover $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/edoc/test/edoc.cover b/lib/edoc/test/edoc.cover
new file mode 100644
index 0000000000..50140fafde
--- /dev/null
+++ b/lib/edoc/test/edoc.cover
@@ -0,0 +1,2 @@
+{incl_app,edoc,details}.
+
diff --git a/lib/edoc/test/edoc.spec b/lib/edoc/test/edoc.spec
index 8443a28028..8371427270 100644
--- a/lib/edoc/test/edoc.spec
+++ b/lib/edoc/test/edoc.spec
@@ -1 +1 @@
-{topcase, {dir, "../edoc_test"}}.
+{suites,"../edoc_test",all}.
diff --git a/lib/edoc/test/edoc_SUITE.erl b/lib/edoc/test/edoc_SUITE.erl
index ea833f89b2..0d57591e3e 100644
--- a/lib/edoc/test/edoc_SUITE.erl
+++ b/lib/edoc/test/edoc_SUITE.erl
@@ -17,17 +17,36 @@
 %%
 -module(edoc_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %% Test cases
 -export([build_std/1]).
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [build_std].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 build_std(suite) ->
     [];
 build_std(doc) ->
diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk
index 2de2641b4a..e030174862 100644
--- a/lib/edoc/vsn.mk
+++ b/lib/edoc/vsn.mk
@@ -1 +1 @@
-EDOC_VSN = 0.7.6.6
+EDOC_VSN = 0.7.6.8
diff --git a/lib/erl_docgen/Makefile b/lib/erl_docgen/Makefile
index c5bed632a5..93a6353cac 100644
--- a/lib/erl_docgen/Makefile
+++ b/lib/erl_docgen/Makefile
@@ -1,19 +1,20 @@
-# ``The contents of this file are subject to the Erlang Public License,
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 1996-2010. 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 via the world wide web at http://www.erlang.org/.
+# 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.
 # 
-# 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$
+# %CopyrightEnd%
 #
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
@@ -22,9 +23,11 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 # Macros
 #
 
-SUB_DIRECTORIES = priv 
+SUB_DIRECTORIES = src priv 
 #doc/src
 
+include vsn.mk
+VSN = $(ERL_DOCGEN_VSN)
 
 SPECIAL_TARGETS = 
 
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index ee74e598d9..c7a7926c40 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -29,7 +29,69 @@
     <file>notes.xml</file>
   </header>
   <p>This document describes the changes made to the erl_docgen application.</p>
-    <section><title>Erl_Docgen 0.2</title>
+    <section><title>Erl_Docgen 0.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix format_man_pages so it handles all man sections
+	    and remove warnings/errors in various man pages. </p>
+          <p>
+	    Own Id: OTP-8600</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Support for using Dialyzer specifications and types
+	    has been added. This is an experimental release; changes
+	    are expected before the new functionality is used when
+	    building the OTP documentation. </p>
+          <p>
+	    Own Id: OTP-8720</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fixed the transformation from xml to html of the
+	    funcs block in comref pages. </p>
+          <p>
+	    Own Id: OTP-8792</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>erl_docgen 0.2.1</title>
+
+	<section><title>Fixed Bugs and Malfunctions</title>
+	  <list>
+	    <item>
+	      <p>
+                The text within code examples (CODE and PRE tags) will not be 
+                space normalized for man pages.
+              </p>
+	      <p>
+	        Own Id: OTP-8476
+              </p>
+	    </item>
+	  </list>
+	</section>
+
+    </section>
+
+    <section><title>erl_docgen 0.2</title>
 
 	<section><title>Improvements and New Features</title>
 	  <list>
diff --git a/lib/xmerl/src/xmerl_dtd.erl b/lib/erl_docgen/ebin/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/xmerl/src/xmerl_dtd.erl
+++ b/lib/erl_docgen/ebin/.gitignore
diff --git a/lib/erl_docgen/priv/bin/specs_gen.escript b/lib/erl_docgen/priv/bin/specs_gen.escript
new file mode 100644
index 0000000000..840fed6dd5
--- /dev/null
+++ b/lib/erl_docgen/priv/bin/specs_gen.escript
@@ -0,0 +1,129 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+
+%%% <script> [-I<dir>]... [-o<dir>] [-module Module] [File]
+%%%
+%%% Use EDoc and the layout module 'otp_specs' to create an XML file
+%%% containing Dialyzer types and specifications (-type, -spec).
+%%%
+%%% Options:
+%%%
+%%%  "-o<dir>" The output directory for the created file.
+%%%            Default is ".".
+%%%  "-I<dir>" Directory to be searched when including a file.
+%%%  "-module Module"
+%%%            Module name to use when there is no File argument.
+%%%            A temporary file will be created.
+%%%            Exactly one of -module Module and File must be given.
+%%%
+%%% The name of the generated file is "specs_<module>.xml". Its exact
+%%% format is not further described here.
+
+main(Args) ->
+    case catch parse(Args, [], ".", no_module) of
+        {ok, FileSpec, InclFs, Dir} ->
+            call_edoc(FileSpec, InclFs, Dir);
+        {error, Msg} ->
+            io:format("~s\n", [Msg]),
+            usage()
+    end.
+
+parse(["-o"++Dir | Opts], InclFs, _, Module) ->
+    parse(Opts, InclFs, Dir, Module);
+parse(["-I"++I | Opts], InclFs, Dir, Module) ->
+    parse(Opts, [I | InclFs], Dir, Module);
+parse(["-module", Module | Opts], InclFs, Dir, _) ->
+    parse(Opts, InclFs, Dir, Module);
+parse([File], InclFs, Dir, no_module) ->
+    {ok, {file, File}, lists:reverse(InclFs), Dir};
+parse([_], _, _, _) ->
+    {error, io_lib:format("Cannot have both -module option and file", [])};
+parse([], _, _, no_module) ->
+    {error, io_lib:format("Missing -module option or file", [])};
+parse([], InclFs, Dir, Module) ->
+    {ok, {module, Module}, lists:reverse(InclFs), Dir};
+parse(Args, _, _, _) ->
+    {error, io_lib:format("Bad arguments: ~p", [Args])}.
+
+usage() ->
+    io:format("usage:  ~s [-I<include_dir>]... [-o<out_dir>] "
+              "[-module <module>] [file]\n", [escript:script_name()]),
+    halt(1).
+
+call_edoc(FileSpec, InclFs, Dir) ->
+    Incl = [{includes, InclFs}],
+    Pre = [{preprocess, true}],
+    Choice = [{dialyzer_specs, all}],
+    DirOpt = [{dir, Dir}],
+    Pretty = [{pretty_print, erl_pp}],
+    Layout = [{layout, otp_specs},
+              {file_suffix, ".specs"},
+              {stylesheet, ""}],
+    Warn = [{report_missing_type, false},
+            {report_type_mismatch, false}],
+    OptionList = (DirOpt ++ Choice ++ Pre ++ Warn ++ Pretty ++ Layout ++ Incl),
+    {File, TmpFile} = case FileSpec of
+                          {file, File0} ->
+                              {File0, false};
+                          {module, Module} ->
+                              {create_tmp_file(Dir, Module), true}
+                      end,
+    try edoc:files([File], OptionList) of
+        ok ->
+            clean_up(Dir, File, TmpFile),
+            rename(Dir, File)
+    catch
+        _:_ ->
+            io:format("EDoc could not process file '~s'\n", [File]),
+            clean_up(Dir, File, TmpFile),
+            halt(3)
+    end.
+
+rename(Dir, F) ->
+    Mod = filename:basename(F, ".erl"),
+    Old = filename:join(Dir, Mod ++ ".specs"),
+    New = filename:join(Dir, "specs_" ++ Mod ++ ".xml"),
+    case file:rename(Old, New) of
+        ok ->
+            ok;
+        {error, R} ->
+            R1 = file:format_error(R),
+            io:format("could not rename file '~s': ~s\n", [New, R1]),
+            halt(2)
+    end.
+
+clean_up(Dir, File, TmpFile) ->
+    [file:delete(File) || TmpFile],
+    _ = [file:delete(filename:join(Dir, F)) ||
+            F <- ["packages-frame.html",
+                  "overview-summary.html",
+                  "modules-frame.html",
+                  "index.html", "erlang.png", "edoc-info"]],
+    ok.
+
+create_tmp_file(Dir, Module) ->
+    TmpFile = filename:join(Dir, Module++".erl"),
+    case file:write_file(TmpFile, "-module(" ++ Module ++ ").\n") of
+        ok ->
+            TmpFile;
+        {error, R} ->
+            R1 = file:format_error(R),
+            io:format("could not write file '~s': ~s\n", [TmpFile, R1]),
+            halt(2)
+    end.
diff --git a/lib/erl_docgen/priv/bin/xref_mod_app.escript b/lib/erl_docgen/priv/bin/xref_mod_app.escript
new file mode 100755
index 0000000000..fcc3a96ada
--- /dev/null
+++ b/lib/erl_docgen/priv/bin/xref_mod_app.escript
@@ -0,0 +1,107 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+
+%%% Find all applications and all modules given a root directory.
+%%% Output an XML file that can be used for finding which application
+%%% a given module belongs to.
+%%%
+%%% Options:
+%%%
+%%%  "-topdir <D>"  Applications are found under D/lib/.
+%%%                 The default value is $ERL_TOP.
+%%%
+%%%  "-outfile <F>" Output is written onto F.
+%%%                 The default value is "mod2app.xml".
+%%%
+%%% The output file has the following format:
+%%%
+%%% <?xml version="1.0"?>
+%%% <mod2app>
+%%%    <module name="ModName1">AppName1</module>
+%%%    ...
+%%% <mod2app>
+%%%
+%%% meaning that module ModName1 resides in application AppName1.
+
+main(Args) ->
+    case catch parse(Args, os:getenv("ERL_TOP"), "mod2app.xml") of
+        {ok, TopDir, OutFile} ->
+            case modapp(TopDir) of
+                [] ->
+                    io:format("no applications found\n"),
+                    halt(3);
+                MA ->
+                    Layout = layout(MA),
+                    XML = xmerl:export_simple(Layout, xmerl_xml),
+                    write_file(XML, OutFile)
+            end;
+        {error, Msg} ->
+	    io:format("~s\n", [Msg]),
+	    usage()
+    end.
+
+parse(["-topdir", TopDir | Opts], _, OutFile) ->
+    parse(Opts, TopDir, OutFile);
+parse(["-outfile", OutFile | Opts], TopDir, _) ->
+    parse(Opts, TopDir, OutFile);
+parse([], TopDir, OutFile) ->
+    {ok, TopDir, OutFile};
+parse([Opt | _], _, _) ->
+    {error, io_lib:format("Bad option: ~p", [Opt])}.
+
+usage() ->
+    io:format("usage:  ~s [-topdir <dir>] [-outfile <file>]\n",
+             [escript:script_name()]),
+    halt(1).
+
+modapp(TopDir) ->
+    AppDirs = filelib:wildcard(filename:join([TopDir,"lib","*"])),
+    AM = [appmods(D) || D <- AppDirs],
+    lists:keysort(1, [{M,A} || {A,Ms} <- AM, M <- Ms]).
+
+%% It's OK if too much data is generated as long as all applications
+%% and all modules are mentioned.
+appmods(D) ->
+    ErlFiles = filelib:wildcard(filename:join([D,"src","*.erl"])),
+    AppV = filename:basename(D),
+    App = case string:rstr(AppV, "-") of
+              0 -> AppV;
+              P -> string:sub_string(AppV, 1, P-1)
+          end,
+    {App, [filename:basename(EF, ".erl") || EF <- ErlFiles]}.
+
+-include_lib("xmerl/include/xmerl.hrl").
+
+-define(IND(N), lists:duplicate(N, $\s)).
+-define(NL, "\n").
+
+layout(MAL) ->
+    ML = lists:append([[?IND(2),{module,[{name,M}],[A]},?NL] || {M,A} <- MAL]),
+    [?NL,{mod2app,[?NL|ML]},?NL].
+
+write_file(Text, File) ->
+    case file:open(File, [write]) of
+	{ok, FD} ->
+	    io:put_chars(FD, Text),
+	    ok = file:close(FD);
+	{error, R} ->
+	    R1 = file:format_error(R),
+	    io:format("could not write file '~s': ~s\n", [File, R1]),
+	    halt(2)
+    end.
diff --git a/lib/erl_docgen/priv/docbuilder_dtd/common.refs.dtd b/lib/erl_docgen/priv/docbuilder_dtd/common.refs.dtd
index 7b9974fbda..c1237766e1 100644
--- a/lib/erl_docgen/priv/docbuilder_dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/docbuilder_dtd/common.refs.dtd
@@ -26,15 +26,18 @@
 
 <!ELEMENT description         (%block;|quote|br|marker|warning|note)* >
 <!ELEMENT funcs               (func)+ >
-<!ELEMENT func                (name+,fsummary,type?,desc?) >
+<!ELEMENT func                (name+,type_desc+,fsummary,type?,desc?) >
 <!-- ELEMENT name is defined in each ref dtd -->
 <!ELEMENT fsummary            (#PCDATA|c|em)* >
 <!ELEMENT type                (v,d?)+ >
 <!ELEMENT v                   (#PCDATA) >
 <!ELEMENT d                   (#PCDATA|c|em)* >
-<!ELEMENT desc                (%block;|quote|br|marker|warning|note)* >
+<!ELEMENT desc                (%block;|quote|br|marker|warning|note|anno)* >
 <!ELEMENT authors             (aname,email)+ >
 <!ELEMENT aname               (#PCDATA) >
 <!ELEMENT email               (#PCDATA) >
 <!ELEMENT section             (marker*,title,(%block;|quote|br|marker|
                                warning|note)*) >
+<!ELEMENT datatypes           (datatype)+ >
+<!ELEMENT datatype            (name+,desc?) >
+<!ELEMENT type_desc           (#PCDATA) >
diff --git a/lib/erl_docgen/priv/docbuilder_dtd/erlref.dtd b/lib/erl_docgen/priv/docbuilder_dtd/erlref.dtd
index 21656a1446..9905086ff4 100644
--- a/lib/erl_docgen/priv/docbuilder_dtd/erlref.dtd
+++ b/lib/erl_docgen/priv/docbuilder_dtd/erlref.dtd
@@ -22,7 +22,7 @@
 %common.refs;
 
 <!ELEMENT erlref              (header,module,modulesummary,description, 
-			       (section|funcs)*,authors?) >
+			       (section|funcs|datatypes)*,authors?) >
 <!ELEMENT module              (#PCDATA) >
 <!ELEMENT modulesummary       (#PCDATA) >
 
diff --git a/lib/erl_docgen/priv/dtd_man_entities/xhtml-lat1.ent b/lib/erl_docgen/priv/dtd_man_entities/xhtml-lat1.ent
index 3df9970a43..7a07e2c406 100644
--- a/lib/erl_docgen/priv/dtd_man_entities/xhtml-lat1.ent
+++ b/lib/erl_docgen/priv/dtd_man_entities/xhtml-lat1.ent
@@ -21,26 +21,26 @@
 <!ENTITY sect   "&#167;"> <!-- section sign, U+00A7 ISOnum -->
 <!ENTITY uml    "&#168;"> <!-- diaeresis = spacing diaeresis,
                                   U+00A8 ISOdia -->
-<!ENTITY copy   "&#169;"> <!-- copyright sign, U+00A9 ISOnum -->
+<!ENTITY copy   "(C)"> <!-- copyright sign, U+00A9 ISOnum -->
 <!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
-                                  = left pointing guillemet, U+00AB ISOnum -->
+<!ENTITY laquo  "&#34;"> <!-- left-pointing double angle quotation mark
+                                  = left pointing guillemetn = " in man pages, U+00AB ISOnum -->
 <!ENTITY not    "&#172;"> <!-- not sign = discretionary hyphen,
                                   U+00AC ISOnum -->
-<!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
+<!ENTITY shy    ""> <!-- soft hyphen = discretionary hyphen,
                                   U+00AD ISOnum -->
-<!ENTITY reg    "&#174;"> <!-- registered sign = registered trade mark sign,
+<!ENTITY reg    "(R)"> <!-- registered sign = registered trade mark sign,
                                   U+00AE ISOnum -->
 <!ENTITY macr   "&#175;"> <!-- macron = spacing macron = overline
                                   = APL overbar, U+00AF ISOdia -->
 <!ENTITY deg    "&#176;"> <!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "&#177;"> <!-- plus-minus sign = plus-or-minus sign,
+<!ENTITY plusmn "+/-"> <!-- plus-minus sign = plus-or-minus sign,
                                   U+00B1 ISOnum -->
 <!ENTITY sup2   "&#178;"> <!-- superscript two = superscript digit two
                                   = squared, U+00B2 ISOnum -->
 <!ENTITY sup3   "&#179;"> <!-- superscript three = superscript digit three
                                   = cubed, U+00B3 ISOnum -->
-<!ENTITY acute  "&#180;"> <!-- acute accent = spacing acute,
+<!ENTITY acute  "'"> <!-- acute accent = spacing acute,
                                   U+00B4 ISOdia -->
 <!ENTITY micro  "&#181;"> <!-- micro sign, U+00B5 ISOnum -->
 <!ENTITY para   "&#182;"> <!-- pilcrow sign = paragraph sign,
@@ -62,134 +62,134 @@
                                   = fraction three quarters, U+00BE ISOnum -->
 <!ENTITY iquest "&#191;"> <!-- inverted question mark
                                   = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "&#192;"> <!-- latin capital letter A with grave
+<!ENTITY Agrave "A"> <!-- latin capital letter A with grave
                                   = latin capital letter A grave,
                                   U+00C0 ISOlat1 -->
-<!ENTITY Aacute "&#193;"> <!-- latin capital letter A with acute,
+<!ENTITY Aacute "A"> <!-- latin capital letter A with acute,
                                   U+00C1 ISOlat1 -->
-<!ENTITY Acirc  "&#194;"> <!-- latin capital letter A with circumflex,
+<!ENTITY Acirc  "A"> <!-- latin capital letter A with circumflex,
                                   U+00C2 ISOlat1 -->
-<!ENTITY Atilde "&#195;"> <!-- latin capital letter A with tilde,
+<!ENTITY Atilde "A"> <!-- latin capital letter A with tilde,
                                   U+00C3 ISOlat1 -->
-<!ENTITY Auml   "&#196;"> <!-- latin capital letter A with diaeresis,
+<!ENTITY Auml   "A"> <!-- latin capital letter A with diaeresis,
                                   U+00C4 ISOlat1 -->
-<!ENTITY Aring  "&#197;"> <!-- latin capital letter A with ring above
+<!ENTITY Aring  "A"> <!-- latin capital letter A with ring above
                                   = latin capital letter A ring,
                                   U+00C5 ISOlat1 -->
-<!ENTITY AElig  "&#198;"> <!-- latin capital letter AE
+<!ENTITY AElig  "AE"> <!-- latin capital letter AE
                                   = latin capital ligature AE,
                                   U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "&#199;"> <!-- latin capital letter C with cedilla,
+<!ENTITY Ccedil "C"> <!-- latin capital letter C with cedilla,
                                   U+00C7 ISOlat1 -->
-<!ENTITY Egrave "&#200;"> <!-- latin capital letter E with grave,
+<!ENTITY Egrave "E"> <!-- latin capital letter E with grave,
                                   U+00C8 ISOlat1 -->
-<!ENTITY Eacute "&#201;"> <!-- latin capital letter E with acute,
+<!ENTITY Eacute "E"> <!-- latin capital letter E with acute,
                                   U+00C9 ISOlat1 -->
-<!ENTITY Ecirc  "&#202;"> <!-- latin capital letter E with circumflex,
+<!ENTITY Ecirc  "E"> <!-- latin capital letter E with circumflex,
                                   U+00CA ISOlat1 -->
-<!ENTITY Euml   "&#203;"> <!-- latin capital letter E with diaeresis,
+<!ENTITY Euml   "E"> <!-- latin capital letter E with diaeresis,
                                   U+00CB ISOlat1 -->
-<!ENTITY Igrave "&#204;"> <!-- latin capital letter I with grave,
+<!ENTITY Igrave "I"> <!-- latin capital letter I with grave,
                                   U+00CC ISOlat1 -->
-<!ENTITY Iacute "&#205;"> <!-- latin capital letter I with acute,
+<!ENTITY Iacute "I"> <!-- latin capital letter I with acute,
                                   U+00CD ISOlat1 -->
-<!ENTITY Icirc  "&#206;"> <!-- latin capital letter I with circumflex,
+<!ENTITY Icirc  "I"> <!-- latin capital letter I with circumflex,
                                   U+00CE ISOlat1 -->
-<!ENTITY Iuml   "&#207;"> <!-- latin capital letter I with diaeresis,
+<!ENTITY Iuml   "I"> <!-- latin capital letter I with diaeresis,
                                   U+00CF ISOlat1 -->
 <!ENTITY ETH    "&#208;"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "&#209;"> <!-- latin capital letter N with tilde,
+<!ENTITY Ntilde "N"> <!-- latin capital letter N with tilde,
                                   U+00D1 ISOlat1 -->
-<!ENTITY Ograve "&#210;"> <!-- latin capital letter O with grave,
+<!ENTITY Ograve "O"> <!-- latin capital letter O with grave,
                                   U+00D2 ISOlat1 -->
-<!ENTITY Oacute "&#211;"> <!-- latin capital letter O with acute,
+<!ENTITY Oacute "O"> <!-- latin capital letter O with acute,
                                   U+00D3 ISOlat1 -->
-<!ENTITY Ocirc  "&#212;"> <!-- latin capital letter O with circumflex,
+<!ENTITY Ocirc  "O"> <!-- latin capital letter O with circumflex,
                                   U+00D4 ISOlat1 -->
-<!ENTITY Otilde "&#213;"> <!-- latin capital letter O with tilde,
+<!ENTITY Otilde "O"> <!-- latin capital letter O with tilde,
                                   U+00D5 ISOlat1 -->
-<!ENTITY Ouml   "&#214;"> <!-- latin capital letter O with diaeresis,
+<!ENTITY Ouml   "O"> <!-- latin capital letter O with diaeresis,
                                   U+00D6 ISOlat1 -->
-<!ENTITY times  "&#215;"> <!-- multiplication sign, U+00D7 ISOnum -->
+<!ENTITY times  "x"> <!-- multiplication sign, U+00D7 ISOnum -->
 <!ENTITY Oslash "&#216;"> <!-- latin capital letter O with stroke
                                   = latin capital letter O slash,
                                   U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "&#217;"> <!-- latin capital letter U with grave,
+<!ENTITY Ugrave "U"> <!-- latin capital letter U with grave,
                                   U+00D9 ISOlat1 -->
-<!ENTITY Uacute "&#218;"> <!-- latin capital letter U with acute,
+<!ENTITY Uacute "U"> <!-- latin capital letter U with acute,
                                   U+00DA ISOlat1 -->
-<!ENTITY Ucirc  "&#219;"> <!-- latin capital letter U with circumflex,
+<!ENTITY Ucirc  "U"> <!-- latin capital letter U with circumflex,
                                   U+00DB ISOlat1 -->
-<!ENTITY Uuml   "&#220;"> <!-- latin capital letter U with diaeresis,
+<!ENTITY Uuml   "U"> <!-- latin capital letter U with diaeresis,
                                   U+00DC ISOlat1 -->
-<!ENTITY Yacute "&#221;"> <!-- latin capital letter Y with acute,
+<!ENTITY Yacute "Y"> <!-- latin capital letter Y with acute,
                                   U+00DD ISOlat1 -->
 <!ENTITY THORN  "&#222;"> <!-- latin capital letter THORN,
                                   U+00DE ISOlat1 -->
 <!ENTITY szlig  "&#223;"> <!-- latin small letter sharp s = ess-zed,
                                   U+00DF ISOlat1 -->
-<!ENTITY agrave "&#224;"> <!-- latin small letter a with grave
+<!ENTITY agrave "a"> <!-- latin small letter a with grave
                                   = latin small letter a grave,
                                   U+00E0 ISOlat1 -->
-<!ENTITY aacute "&#225;"> <!-- latin small letter a with acute,
+<!ENTITY aacute "a"> <!-- latin small letter a with acute,
                                   U+00E1 ISOlat1 -->
-<!ENTITY acirc  "&#226;"> <!-- latin small letter a with circumflex,
+<!ENTITY acirc  "a"> <!-- latin small letter a with circumflex,
                                   U+00E2 ISOlat1 -->
-<!ENTITY atilde "&#227;"> <!-- latin small letter a with tilde,
+<!ENTITY atilde "a"> <!-- latin small letter a with tilde,
                                   U+00E3 ISOlat1 -->
-<!ENTITY auml   "&#228;"> <!-- latin small letter a with diaeresis,
+<!ENTITY auml   "a"> <!-- latin small letter a with diaeresis,
                                   U+00E4 ISOlat1 -->
-<!ENTITY aring  "&#229;"> <!-- latin small letter a with ring above
+<!ENTITY aring  "a"> <!-- latin small letter a with ring above
                                   = latin small letter a ring,
                                   U+00E5 ISOlat1 -->
-<!ENTITY aelig  "&#230;"> <!-- latin small letter ae
+<!ENTITY aelig  "ae"> <!-- latin small letter ae
                                   = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "&#231;"> <!-- latin small letter c with cedilla,
+<!ENTITY ccedil "c"> <!-- latin small letter c with cedilla,
                                   U+00E7 ISOlat1 -->
-<!ENTITY egrave "&#232;"> <!-- latin small letter e with grave,
+<!ENTITY egrave "e"> <!-- latin small letter e with grave,
                                   U+00E8 ISOlat1 -->
-<!ENTITY eacute "&#233;"> <!-- latin small letter e with acute,
+<!ENTITY eacute "e"> <!-- latin small letter e with acute,
                                   U+00E9 ISOlat1 -->
-<!ENTITY ecirc  "&#234;"> <!-- latin small letter e with circumflex,
+<!ENTITY ecirc  "e"> <!-- latin small letter e with circumflex,
                                   U+00EA ISOlat1 -->
-<!ENTITY euml   "&#235;"> <!-- latin small letter e with diaeresis,
+<!ENTITY euml   "e"> <!-- latin small letter e with diaeresis,
                                   U+00EB ISOlat1 -->
-<!ENTITY igrave "&#236;"> <!-- latin small letter i with grave,
+<!ENTITY igrave "i"> <!-- latin small letter i with grave,
                                   U+00EC ISOlat1 -->
-<!ENTITY iacute "&#237;"> <!-- latin small letter i with acute,
+<!ENTITY iacute "i"> <!-- latin small letter i with acute,
                                   U+00ED ISOlat1 -->
-<!ENTITY icirc  "&#238;"> <!-- latin small letter i with circumflex,
+<!ENTITY icirc  "i"> <!-- latin small letter i with circumflex,
                                   U+00EE ISOlat1 -->
-<!ENTITY iuml   "&#239;"> <!-- latin small letter i with diaeresis,
+<!ENTITY iuml   "i"> <!-- latin small letter i with diaeresis,
                                   U+00EF ISOlat1 -->
 <!ENTITY eth    "&#240;"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "&#241;"> <!-- latin small letter n with tilde,
+<!ENTITY ntilde "n"> <!-- latin small letter n with tilde,
                                   U+00F1 ISOlat1 -->
-<!ENTITY ograve "&#242;"> <!-- latin small letter o with grave,
+<!ENTITY ograve "o"> <!-- latin small letter o with grave,
                                   U+00F2 ISOlat1 -->
-<!ENTITY oacute "&#243;"> <!-- latin small letter o with acute,
+<!ENTITY oacute "o"> <!-- latin small letter o with acute,
                                   U+00F3 ISOlat1 -->
-<!ENTITY ocirc  "&#244;"> <!-- latin small letter o with circumflex,
+<!ENTITY ocirc  "o"> <!-- latin small letter o with circumflex,
                                   U+00F4 ISOlat1 -->
-<!ENTITY otilde "&#245;"> <!-- latin small letter o with tilde,
+<!ENTITY otilde "o"> <!-- latin small letter o with tilde,
                                   U+00F5 ISOlat1 -->
-<!ENTITY ouml   "&#246;"> <!-- latin small letter o with diaeresis,
+<!ENTITY ouml   "o"> <!-- latin small letter o with diaeresis,
                                   U+00F6 ISOlat1 -->
 <!ENTITY divide "&#247;"> <!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "&#248;"> <!-- latin small letter o with stroke,
+<!ENTITY oslash "o"> <!-- latin small letter o with stroke,
                                   = latin small letter o slash,
                                   U+00F8 ISOlat1 -->
-<!ENTITY ugrave "&#249;"> <!-- latin small letter u with grave,
+<!ENTITY ugrave "u"> <!-- latin small letter u with grave,
                                   U+00F9 ISOlat1 -->
-<!ENTITY uacute "&#250;"> <!-- latin small letter u with acute,
+<!ENTITY uacute "u"> <!-- latin small letter u with acute,
                                   U+00FA ISOlat1 -->
-<!ENTITY ucirc  "&#251;"> <!-- latin small letter u with circumflex,
+<!ENTITY ucirc  "u"> <!-- latin small letter u with circumflex,
                                   U+00FB ISOlat1 -->
-<!ENTITY uuml   "&#252;"> <!-- latin small letter u with diaeresis,
+<!ENTITY uuml   "u"> <!-- latin small letter u with diaeresis,
                                   U+00FC ISOlat1 -->
-<!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
+<!ENTITY yacute "y"> <!-- latin small letter y with acute,
                                   U+00FD ISOlat1 -->
 <!ENTITY thorn  "&#254;"> <!-- latin small letter thorn with,
                                   U+00FE ISOlat1 -->
-<!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
+<!ENTITY yuml   "y"> <!-- latin small letter y with diaeresis,
                                   U+00FF ISOlat1 -->
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index 5614b02bb7..732560e303 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--      
+<!--
      #
      # %CopyrightBegin%
      #
@@ -17,15 +17,315 @@
      # under the License.
      #
      # %CopyrightEnd%
-     
+
      -->
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:fn="http://www.w3.org/2005/02/xpath-functions"> 
+  xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
 
   <xsl:include href="db_html_params.xsl"/>
 
+  <!-- Start of Dialyzer type/spec tags.
+       See also the template matching "name" and the template "menu.funcs"
+  -->
+
+  <xsl:param name="specs_file" select="''"/>
+  <xsl:variable name="i" select="document($specs_file)"></xsl:variable>
+
+  <xsl:param name="mod2app_file" select="''"/>
+  <xsl:variable name="m2a" select="document($mod2app_file)"></xsl:variable>
+  <xsl:key name="mod2app" match="module" use="@name"/>
+
+  <xsl:template name="err">
+    <xsl:param name="m"/>
+    <xsl:param name="n"/>
+    <xsl:param name="a"/>
+    <xsl:param name="s"/>
+    <xsl:message terminate="yes">
+  Error <xsl:if test="$m != ''"><xsl:value-of select ="$m"/>:</xsl:if>
+	 <xsl:value-of
+		   select="$n"/>/<xsl:value-of
+		   select="$a"/>: <xsl:value-of select="$s"/>
+    </xsl:message>
+  </xsl:template>
+
+  <xsl:template name="spec_name">
+    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
+    <xsl:variable name="mod" select="@mod"/>
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="clause" select="@clause"/>
+    <xsl:variable name="spec0" select=
+        "$i/specs/module[@name=$curModule]/spec
+             [name=$name and arity=$arity
+              and (string-length($mod) = 0 or module = $mod)]"/>
+    <xsl:variable name="spec" select="$spec0[string-length($clause) = 0
+                                             or position() = $clause]"/>
+    <xsl:if test="count($spec) = 0">
+      <xsl:call-template name="err">
+	<xsl:with-param name="m" select="$mod"/>
+	<xsl:with-param name="n" select="$name"/>
+	<xsl:with-param name="a" select="$arity"/>
+	<xsl:with-param name="s">unknown spec</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+
+    <xsl:variable name="arity_clause">
+      <xsl:choose>
+	<xsl:when test="string-length(@clause) > 0">
+	  <xsl:value-of select="@arity"/>/<xsl:value-of select="@clause"/>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:value-of select="@arity"/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="ancestor::cref">
+	<xsl:message terminate="yes">
+          Error: did not expect a 'name' tag with name/arity attributes here!
+	</xsl:message>
+      </xsl:when>
+      <xsl:when test="ancestor::erlref">
+	<a name="{$name}-{$arity_clause}"></a>
+        <xsl:choose>
+          <xsl:when test="string(@with_guards) = 'no'">
+            <xsl:apply-templates select="$spec/contract/clause/head"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="contract">
+              <xsl:with-param name="contract" select="$spec/contract"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="contract">
+    <xsl:param name="contract"/>
+    <xsl:call-template name="clause">
+      <xsl:with-param name="clause" select="$contract/clause"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="clause">
+    <xsl:param name="clause"/>
+    <xsl:variable name="type_desc" select="../type_desc"/>
+    <xsl:for-each select="$clause">
+      <xsl:apply-templates select="head"/>
+      <xsl:if test="count(guard) > 0">
+	<xsl:call-template name="guard">
+	  <xsl:with-param name="guard" select="guard"/>
+	  <xsl:with-param name="type_desc" select="$type_desc"/>
+	</xsl:call-template>
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="head">
+    <span class="bold_code">
+      <xsl:apply-templates/>
+    </span>
+    <br/>
+  </xsl:template>
+
+  <xsl:template name="guard">
+    <xsl:param name="guard"/>
+    <xsl:param name="type_desc"/>
+    <div class="REFBODY"><p>Types:</p>
+      <xsl:call-template name="subtype">
+	<xsl:with-param name="subtype" select="$guard/subtype"/>
+	<xsl:with-param name="type_desc" select="$type_desc"/>
+      </xsl:call-template>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="subtype">
+    <xsl:param name="subtype"/>
+    <xsl:param name="type_desc"/>
+    <xsl:for-each select="$subtype">
+      <xsl:variable name="tname" select="typename"/>
+      <xsl:variable name="tdesc" select="$type_desc[@name = $tname]"/>
+      <div class="REFTYPES">
+	<span class="bold_code">
+	  <xsl:apply-templates select="string"/>
+	</span>
+      </div>
+      <xsl:apply-templates select="$type_desc[@name = $tname]"/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!-- Note: <type_desc> has not been implemented for data types. -->
+
+  <!-- Similar to <d> -->
+  <xsl:template match="type_desc">
+    <div class="REFBODY">
+      <xsl:apply-templates/>
+    </div>
+  </xsl:template>
+
+  <!-- This is for debugging. All modules! -->
+  <xsl:template match="all_etypes">
+    <xsl:for-each select= "$i//type">
+      <pre>
+	<span class="bold_code">
+	  <xsl:apply-templates select="typedecl"/>
+	</span><xsl:text>
+</xsl:text>
+      </pre>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!-- Datatypes -->
+  <xsl:template match="datatypes">
+    <h3>
+      <xsl:text>DATA TYPES</xsl:text>
+    </h3>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <!-- Datatype -->
+  <xsl:template match="datatype">
+    <p><xsl:apply-templates select="name"/></p>
+    <xsl:apply-templates select="desc"/>
+  </xsl:template>
+
+  <xsl:template match="typehead">
+    <span class="bold_code">
+      <xsl:apply-templates/>
+    </span><br/>
+  </xsl:template>
+
+  <!-- local_defs -->
+  <xsl:template match="local_defs">
+    <div class="REFBODY">
+      <xsl:apply-templates>
+      </xsl:apply-templates>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="local_def">
+    <div class="REFTYPES">
+      <span class="bold_code">
+        <xsl:apply-templates/>
+      </span>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="type_name">
+    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
+    <xsl:variable name="mod" select="@mod"/>
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="n_vars">
+      <xsl:choose>
+	<xsl:when test="string-length(@n_vars) > 0">
+	  <xsl:value-of select="@n_vars"/>
+	</xsl:when>
+	<xsl:otherwise>
+          <xsl:value-of select="0"/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="string-length($name) > 0">
+	<xsl:variable name="type" select=
+	    "$i/specs/module[@name=$curModule]/type
+		 [name=$name and n_vars=$n_vars
+		  and (string-length($mod) = 0 or module = $mod)]"/>
+
+	<xsl:if test="count($type) != 1">
+	  <xsl:call-template name="err">
+	    <xsl:with-param name="m" select="$mod"/>
+	    <xsl:with-param name="n" select="$name"/>
+	    <xsl:with-param name="a" select="$n_vars"/>
+	    <xsl:with-param name="s">unknown type</xsl:with-param>
+	  </xsl:call-template>
+	</xsl:if>
+	<xsl:apply-templates select="$type/typedecl"/>
+      </xsl:when>
+      <xsl:otherwise>
+	<span class="bold_code">
+	  <xsl:value-of select="."/>
+	</span>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- Used both in <datatype> and in <func>! -->
+  <xsl:template match="anno">
+    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
+    <xsl:variable name="anno" select="normalize-space(text())"/>
+    <xsl:variable name="namespec"
+                  select="ancestor::desc/preceding-sibling::name"/>
+    <xsl:if test="count($namespec) = 0 and string-length($specs_file) > 0">
+      <xsl:call-template name="err">
+	<xsl:with-param name="s">cannot find 'name' (<xsl:value-of select="$anno"/>)
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+
+    <xsl:variable name="mod" select="$namespec/@mod"/>
+    <xsl:variable name="name" select="$namespec/@name"/>
+    <xsl:variable name="arity" select="$namespec/@arity"/>
+    <xsl:variable name="clause" select="$namespec/@clause"/>
+    <xsl:variable name="tmp_n_vars" select="$namespec/@n_vars"/>
+    <xsl:variable name="n_vars">
+      <xsl:choose>
+	<xsl:when test="string-length($tmp_n_vars) > 0">
+	  <xsl:value-of select="$tmp_n_vars"/>
+	</xsl:when>
+	<xsl:otherwise>
+          <xsl:value-of select="0"/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="spec0" select=
+        "$i/specs/module[@name=$curModule]/spec
+             [name=$name and arity=$arity
+              and (string-length($mod) = 0 or module = $mod)]"/>
+    <xsl:variable name="spec_annos" select=
+         "$spec0[string-length($clause) = 0
+                 or position() = $clause]/anno[.=$anno]"/>
+    <xsl:variable name="type_annos" select=
+        "$i/specs/module[@name=$curModule]/type
+             [name=$name and n_vars=$n_vars
+              and (string-length($mod) = 0 or module = $mod)]/anno[.=$anno]"/>
+
+    <xsl:if test="count($spec_annos) = 0
+                  and count($type_annos) = 0
+	          and string-length($specs_file) > 0">
+      <xsl:variable name="n">
+        <xsl:choose>
+          <xsl:when test="string-length($arity) = 0">
+            <xsl:value-of select="$n_vars"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$arity"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:call-template name="err">
+	<xsl:with-param name="m" select="$mod"/>
+	<xsl:with-param name="n" select="$name"/>
+	<xsl:with-param name="a" select="$n"/>
+	<xsl:with-param name="s">unknown annotation <xsl:value-of select="$anno"/>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:value-of select="$anno"/>
+  </xsl:template>
+
+  <!-- Used for indentation of formatted types and specs -->
+  <xsl:template match="nbsp">
+    <xsl:text>&#160;</xsl:text>
+  </xsl:template>
+
+  <!-- End of Dialyzer type/spec tags -->
+
   <!-- Page layout -->
   <xsl:template name="pagelayout">
     <xsl:param name="chapnum"/>
@@ -36,19 +336,19 @@
         <title>Erlang -- <xsl:value-of select="header/title"/></title>
       </head>
       <body bgcolor="white" text="#000000" link="#0000ff" vlink="#ff00ff" alink="#ff0000">
-        
+
         <div id="container">
           <script id="js" type="text/javascript" language="JavaScript" src="{$topdocdir}/js/flipmenu/flipmenu.js"/>
           <script id="js2" type="text/javascript" src="{$topdocdir}/js/erlresolvelinks.js"></script>
           <script language="JavaScript" type="text/javascript">
             <xsl:text disable-output-escaping="yes"><![CDATA[
-            <!--            
+            <!--
               function getWinHeight() {
                 var myHeight = 0;
                 if( typeof( window.innerHeight ) == 'number' ) {
                   //Non-IE
                   myHeight = window.innerHeight;
-                } else if( document.documentElement && ( document.documentElement.clientWidth || 
+                } else if( document.documentElement && ( document.documentElement.clientWidth ||
                                                          document.documentElement.clientHeight ) ) {
                   //IE 6+ in 'standards compliant mode'
                   myHeight = document.documentElement.clientHeight;
@@ -56,7 +356,7 @@
                   //IE 4 compatible
                   myHeight = document.body.clientHeight;
                 }
-                return myHeight;            
+                return myHeight;
               }
 
               function setscrollpos() {
@@ -64,16 +364,16 @@
                  document.getElementById("leftnav").scrollTop = objf.offsetTop - getWinHeight()/2;
               }
 
-              function addEvent(obj, evType, fn){ 
-                if (obj.addEventListener){ 
-                obj.addEventListener(evType, fn, true); 
-                return true; 
-              } else if (obj.attachEvent){ 
-                var r = obj.attachEvent("on"+evType, fn); 
-                return r; 
-              } else { 
-                return false; 
-              } 
+              function addEvent(obj, evType, fn){
+                if (obj.addEventListener){
+                obj.addEventListener(evType, fn, true);
+                return true;
+              } else if (obj.attachEvent){
+                var r = obj.attachEvent("on"+evType, fn);
+                return r;
+              } else {
+                return false;
+              }
              }
 
              addEvent(window, 'load', setscrollpos);
@@ -85,7 +385,7 @@
             <xsl:with-param name="chapnum" select="$chapnum"/>
             <xsl:with-param name="curModule" select="$curModule"/>
           </xsl:call-template>
-   
+
           <div id="content">
             <div class="innertube">
 
@@ -124,17 +424,17 @@
     <xsl:if test="$lname = 'releasenotes'">
       <!-- .../part -->
       <xsl:call-template name="releasenotes.content" />
-    </xsl:if> 
+    </xsl:if>
     <xsl:if test="$lname = 'part'">
       <!-- .../part -->
       <xsl:call-template name="part.content" />
-    </xsl:if>    
+    </xsl:if>
     <xsl:if test="$lname = 'chapter'">
       <!-- .../part/chapter -->
       <xsl:call-template name="chapter.content">
         <xsl:with-param name="chapnum" select="$chapnum"/>
       </xsl:call-template>
-    </xsl:if>  
+    </xsl:if>
     <xsl:if test="$lname = 'application'">
       <!-- .../application -->
       <xsl:call-template name="app.content" />
@@ -178,37 +478,37 @@
     <small>
       <xsl:if test="boolean(/book/parts/part)">
         <a href="users_guide.html">User's Guide</a><br/>
-      </xsl:if> 
+      </xsl:if>
       <xsl:if test="boolean(/book/applications)">
         <a href="index.html">Reference Manual</a><br/>
-      </xsl:if> 
+      </xsl:if>
       <xsl:if test="boolean(/book/releasenotes)">
         <a href="release_notes.html">Release Notes</a><br/>
-      </xsl:if> 
+      </xsl:if>
       <a href="{$pdfdir}/{$appname}-{$appver}.pdf">PDF</a><br/>
       <a href="{$topdocdir}/index.html">Top</a>
     </small>
   </xsl:template>
-        
+
   <xsl:template name="menu_middle">
     <!-- small>
       <xsl:choose>
         <xsl:when test="ancestor::parts">
           <a href="users_guide_bibliography.html">Bibliography</a><br/>
           <a href="users_guide_glossary.html">Glossary</a><br/>
-        </xsl:when> 
-        <xsl:when test="ancestor::applications"> 
+        </xsl:when>
+        <xsl:when test="ancestor::applications">
           <a href="ref_man_bibliography.html">Bibliography</a><br/>
           <a href="ref_man_glossary.html">Glossary</a><br/>
-        </xsl:when>        
+        </xsl:when>
       </xsl:choose>
     </small -->
     <br/>
 
     <a href="javascript:openAllFlips()">Expand All</a><br/>
     <a href="javascript:closeAllFlips()">Contract All</a>
-  </xsl:template>        
-  
+  </xsl:template>
+
 
   <!-- Book -->
   <xsl:template match="/book">
@@ -243,7 +543,7 @@
 
   <!-- Chapter/Section -->
   <xsl:template match="chapter/section">
-    <xsl:param name="chapnum"/>  
+    <xsl:param name="chapnum"/>
     <h3>
       <a name="{generate-id(title)}">
         <xsl:value-of select="$chapnum"/>.<xsl:number/>&#160;
@@ -302,7 +602,7 @@
 
 
   <!-- Lists -->
-  
+
   <xsl:template match="list">
     <xsl:param name="chapnum"/>
     <ul>
@@ -330,7 +630,7 @@
       </xsl:apply-templates>
     </dl>
   </xsl:template>
-  
+
   <xsl:template match="taglist/tag">
     <xsl:param name="chapnum"/>
     <dt>
@@ -377,7 +677,7 @@
           </xsl:apply-templates>
         </p>
       </div>
-    </div>          
+    </div>
   </xsl:template>
 
  <!-- Paragraph -->
@@ -402,7 +702,7 @@
   </xsl:template>
 
   <xsl:template match="em">
-    <strong><xsl:apply-templates/></strong> 
+    <strong><xsl:apply-templates/></strong>
   </xsl:template>
 
   <!-- Code -->
@@ -507,7 +807,7 @@
   <!-- Part -->
   <xsl:template match="part">
     <!-- Generate Glossary for Users Guide -->
-    <!--xsl:call-template name="glossary"> 
+    <!--xsl:call-template name="glossary">
     <xsl:with-param name="type">users_guide</xsl:with-param>
     </xsl:call-template-->
 
@@ -530,9 +830,9 @@
 
     <center><h4>Version <xsl:value-of select="$appver"/></h4></center>
     <center><h4><xsl:value-of select="$gendate"/></h4></center>
-    
+
     <xsl:apply-templates select="chapter"/>
-          
+
   </xsl:template>
 
   <!-- Menu.ug -->
@@ -565,10 +865,10 @@
           </xsl:call-template>
         </ul>
       </div>
-    </div>            
+    </div>
   </xsl:template>
-  
-  
+
+
   <xsl:template name="menu.chapter">
     <xsl:param name="entries"/>
     <xsl:param name="chapnum"/>
@@ -596,7 +896,7 @@
             <a href="{$chapter_file}.html">
               Top of chapter
             </a>
-          </li>         
+          </li>
           <xsl:call-template name="menu.section">
             <xsl:with-param name="entries"
               select="section[title]"/>
@@ -623,7 +923,7 @@
   <!-- Chapter (if top tag)-->
   <xsl:template match="/chapter">
 
-    <xsl:document href="{substring-before(header/file, '.xml')}.html" method="html" encoding="UTF-8" indent="yes" 
+    <xsl:document href="{substring-before(header/file, '.xml')}.html" method="html" encoding="UTF-8" indent="yes"
       doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN">
 
       <xsl:call-template name="pagelayout">
@@ -635,7 +935,7 @@
   <!-- Chapter -->
   <xsl:template match="chapter">
 
-    <xsl:document href="{substring-before(header/file, '.xml')}.html" method="html" encoding="UTF-8" indent="yes" 
+    <xsl:document href="{substring-before(header/file, '.xml')}.html" method="html" encoding="UTF-8" indent="yes"
       doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN">
 
       <xsl:call-template name="pagelayout">
@@ -670,7 +970,7 @@
   <xsl:template match="application">
 
     <!-- Generate Glossary for Ref. Manual -->
-    <!--xsl:call-template name="glossary"> 
+    <!--xsl:call-template name="glossary">
       <xsl:with-param name="type">ref_man</xsl:with-param>
     </xsl:call-template-->
 
@@ -678,7 +978,7 @@
     <!--xsl:call-template name="bibliography">
       <xsl:with-param name="type">ref_man</xsl:with-param>
     </xsl:call-template-->
-    
+
 
     <xsl:document href="{$outdir}/index.html" method="html" encoding="UTF-8" indent="yes" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN">
 
@@ -695,9 +995,9 @@
 
     <center><h4>Version <xsl:value-of select="$appver"/></h4></center>
     <center><h4><xsl:value-of select="$gendate"/></h4></center>
-    
+
     <xsl:apply-templates select="erlref|cref|comref|fileref|appref"/>
-          
+
   </xsl:template>
 
   <!-- Menu.ref -->
@@ -730,16 +1030,16 @@
           </xsl:call-template>
         </ul>
       </div>
-    </div>            
+    </div>
   </xsl:template>
-  
-  
+
+
   <xsl:template name="menu.ref2">
     <xsl:param name="entries"/>
     <!--xsl:param name="genFuncMenu"/-->
     <xsl:param name="curModule"/>
     <xsl:for-each select="$entries">
-      
+
       <xsl:variable name="cval">
         <xsl:choose>
           <xsl:when test="local-name() = 'erlref'">
@@ -767,9 +1067,9 @@
           <xsl:when test="local-name() = 'fileref'">false</xsl:when>
           <xsl:when test="descendant::funcs">true</xsl:when>
           <xsl:otherwise>false</xsl:otherwise>
-        </xsl:choose>        
+        </xsl:choose>
       </xsl:variable>
-      
+
       <xsl:variable name="expanded">
         <xsl:choose>
           <xsl:when test="$curModule = $cval">true</xsl:when>
@@ -796,7 +1096,7 @@
                 <a href="{$link_cval}.html">
                   Top of manual page
                 </a>
-              </li>         
+              </li>
               <xsl:call-template name="menu.funcs">
                 <xsl:with-param name="entries"
                   select="funcs/func/name"/>
@@ -823,7 +1123,7 @@
             </xsl:otherwise>
           </xsl:choose>
         </xsl:otherwise>
-      </xsl:choose>        
+      </xsl:choose>
     </xsl:for-each>
   </xsl:template>
 
@@ -831,7 +1131,7 @@
   <xsl:template name="menu.funcs">
     <xsl:param name="entries"/>
     <xsl:param name="basename"/>
-    
+
     <xsl:for-each select="$entries">
 
       <xsl:choose>
@@ -840,74 +1140,97 @@
           <xsl:choose>
             <xsl:when test="string-length($fname) > 0">
               <li title="{$fname}">
-                <a href="{$basename}.html#{$fname}">  
+                <a href="{$basename}.html#{$fname}">
                   <xsl:value-of select="$fname"/>()
                 </a>
-              </li>           
+              </li>
             </xsl:when>
             <xsl:otherwise>
               <li title="{name/nametext}">
-                <a href="{$basename}.html#{name/nametext}">  
+                <a href="{$basename}.html#{name/nametext}">
                   <xsl:value-of select="nametext"/>()
-                </a> 
-              </li>    
+                </a>
+              </li>
             </xsl:otherwise>
-          </xsl:choose> 
+          </xsl:choose>
         </xsl:when>
-        
+
         <xsl:when test="ancestor::erlref">
-          
+
           <xsl:variable name="tmpstring">
             <xsl:value-of select="substring-before(substring-after(., '('), '->')"/>
-          </xsl:variable>     
-            
+          </xsl:variable>
+
           <xsl:variable name="ustring">
             <xsl:choose>
               <xsl:when test="string-length($tmpstring) > 0">
                 <xsl:call-template name="remove-paren">
                   <xsl:with-param name="string" select="$tmpstring"/>
-                </xsl:call-template>            
+                </xsl:call-template>
               </xsl:when>
               <xsl:otherwise>
                 <xsl:call-template name="remove-paren">
                   <xsl:with-param name="string" select="substring-after(., '(')"/>
-                </xsl:call-template>                      
+                </xsl:call-template>
               </xsl:otherwise>
             </xsl:choose>
-          </xsl:variable>      
-          
+          </xsl:variable>
+
           <xsl:variable name="arity">
-            <xsl:call-template name="calc-arity">
-              <xsl:with-param name="string" select="substring-before($ustring, ')')"/>
-              <xsl:with-param name="no-of-pars" select="0"/> 
-            </xsl:call-template>
-          </xsl:variable> 
-          
+            <xsl:choose>
+              <xsl:when test="string-length(@arity) > 0">
+                <!-- Dialyzer spec -->
+                <xsl:choose>
+                  <xsl:when test="string-length(@clause) > 0">
+                    <xsl:value-of select="@arity"/>/<xsl:value-of select="@clause"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="@arity"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:when>
+              <xsl:otherwise>
+		<xsl:call-template name="calc-arity">
+		  <xsl:with-param name="string" select="substring-before($ustring, ')')"/>
+		  <xsl:with-param name="no-of-pars" select="0"/>
+		</xsl:call-template>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:variable>
+
           <xsl:variable name="fname">
-            <xsl:variable name="fname1">
-              <xsl:value-of select="substring-before(., '(')"/>
-            </xsl:variable>
-            <xsl:variable name="fname2">
-              <xsl:value-of select="substring-after($fname1, 'erlang:')"/>
-            </xsl:variable>
             <xsl:choose>
-              <xsl:when test="string-length($fname2) > 0">   
-                <xsl:value-of select="$fname2"/>
+              <xsl:when test="string-length(@name) > 0">
+                <!-- Dialyzer spec -->
+                <xsl:value-of select="@name"/>
               </xsl:when>
               <xsl:otherwise>
-                <xsl:value-of select="$fname1"/>
+		<xsl:variable name="fname1">
+		  <xsl:value-of select="substring-before(., '(')"/>
+		</xsl:variable>
+		<xsl:variable name="fname2">
+		  <xsl:value-of select="substring-after($fname1, 'erlang:')"/>
+		</xsl:variable>
+		<xsl:choose>
+		  <xsl:when test="string-length($fname2) > 0">
+		    <xsl:value-of select="$fname2"/>
+		  </xsl:when>
+		  <xsl:otherwise>
+		    <xsl:value-of select="$fname1"/>
+		  </xsl:otherwise>
+		</xsl:choose>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:variable>
-            
+
           <li title="{$fname}-{$arity}">
-            <a href="{$basename}.html#{$fname}-{$arity}">                                             
+            <a href="{$basename}.html#{$fname}-{$arity}">
               <xsl:value-of select="$fname"/>/<xsl:value-of select="$arity"/>
             </a>
-          </li>      
+          </li>
         </xsl:when>
       </xsl:choose>
-      
+
     </xsl:for-each>
   </xsl:template>
 
@@ -1148,7 +1471,7 @@
   <!-- Func -->
   <xsl:template match="func">
     <xsl:param name="partnum"/>
-   
+
     <p><xsl:apply-templates select="name"/></p>
 
     <xsl:apply-templates select="fsummary|type|desc">
@@ -1157,34 +1480,50 @@
 
   </xsl:template>
 
+
   <xsl:template match="name">
+    <xsl:choose>
+      <!-- @arity is mandatory when referring to a specification -->
+      <xsl:when test="string-length(@arity) > 0">
+        <xsl:call-template name="spec_name"/>
+      </xsl:when>
+      <xsl:when test="ancestor::datatype">
+        <xsl:call-template name="type_name"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="name"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="name">
 
     <xsl:variable name="tmpstring">
       <xsl:value-of select="substring-before(substring-after(., '('), '->')"/>
-    </xsl:variable>     
+    </xsl:variable>
 
     <xsl:variable name="ustring">
       <xsl:choose>
         <xsl:when test="string-length($tmpstring) > 0">
           <xsl:call-template name="remove-paren">
             <xsl:with-param name="string" select="$tmpstring"/>
-          </xsl:call-template>            
+          </xsl:call-template>
         </xsl:when>
         <xsl:otherwise>
           <xsl:call-template name="remove-paren">
             <xsl:with-param name="string" select="substring-after(., '(')"/>
-          </xsl:call-template>                      
+          </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>
-    </xsl:variable>      
-        
+    </xsl:variable>
+
     <xsl:variable name="arity">
       <xsl:call-template name="calc-arity">
         <xsl:with-param name="string" select="substring-before($ustring, ')')"/>
-        <xsl:with-param name="no-of-pars" select="0"/> 
+        <xsl:with-param name="no-of-pars" select="0"/>
       </xsl:call-template>
-    </xsl:variable> 
-    
+    </xsl:variable>
+
     <xsl:choose>
       <xsl:when test="ancestor::cref">
         <a name="{substring-before(nametext, '(')}"><span class="bold_code"><xsl:value-of select="ret"/><xsl:text> </xsl:text><xsl:value-of select="nametext"/></span></a><br/>
@@ -1198,7 +1537,7 @@
             <xsl:value-of select="substring-after($fname1, 'erlang:')"/>
           </xsl:variable>
           <xsl:choose>
-            <xsl:when test="string-length($fname2) > 0">   
+            <xsl:when test="string-length($fname2) > 0">
               <xsl:value-of select="$fname2"/>
             </xsl:when>
             <xsl:otherwise>
@@ -1208,22 +1547,24 @@
         </xsl:variable>
         <a name="{$fname}-{$arity}"><span class="bold_code"><xsl:value-of select="."/></span></a><br/>
       </xsl:when>
+      <xsl:otherwise>
+        <span class="bold_code"><xsl:value-of select="."/></span>
+      </xsl:otherwise>
     </xsl:choose>
-      
-  </xsl:template>
 
+  </xsl:template>
 
   <!-- Type -->
   <xsl:template match="type">
     <xsl:param name="partnum"/>
 
-    <div class="REFBODY"><p>Types:</p>  
+    <div class="REFBODY"><p>Types:</p>
 
       <xsl:apply-templates>
         <xsl:with-param name="partnum" select="$partnum"/>
       </xsl:apply-templates>
     </div>
-    
+
   </xsl:template>
 
 
@@ -1282,16 +1623,37 @@
         <xsl:variable name="modulepart"><xsl:value-of select="substring-before($filepart, ':')"/></xsl:variable>
         <xsl:choose>
           <xsl:when test="string-length($modulepart) > 0">
-            <xsl:variable name="filepart1"><xsl:value-of select="substring-after($filepart, ':')"/></xsl:variable>     
+            <xsl:variable name="filepart1"><xsl:value-of select="substring-after($filepart, ':')"/></xsl:variable>
             <span class="bold_code"><a href="javascript:erlhref('{$topdocdir}/../','{$modulepart}','{$filepart1}.html#{$linkpart}');"><xsl:apply-templates/></a></span>
           </xsl:when>
           <xsl:otherwise>
             <xsl:choose>
+              <!-- Dialyzer seealso (the application is unknown) -->
+              <xsl:when test="string-length($specs_file) > 0
+                              and count($i/specs/module[@name=$filepart]) = 0">
+                <!-- Deemed to slow; use key() instead
+		<xsl:variable name="app"
+                              select="$m2a/mod2app/module[@name=$filepart]"/>
+                -->
+                <xsl:variable name="reftext" select="text()"/>
+                <xsl:for-each select="$m2a">
+                  <xsl:variable name="app" select="key('mod2app', $filepart)"/>
+		  <xsl:choose>
+		    <xsl:when test="string-length($app) > 0">
+		      <span class="bold_code"><a href="javascript:erlhref('{$topdocdir}/../','{$app}','{$filepart}.html');"><xsl:value-of select="$reftext"/></a></span>
+		    </xsl:when>
+		    <xsl:otherwise>
+		      <!-- Unknown application; no link -->
+		      <xsl:value-of select="$reftext"/>
+		    </xsl:otherwise>
+		  </xsl:choose>
+                </xsl:for-each>
+              </xsl:when>
               <xsl:when test="string-length($linkpart) > 0">
                 <span class="bold_code"><a href="{$filepart}.html#{$linkpart}"><xsl:apply-templates/></a></span>
               </xsl:when>
-              <xsl:otherwise>        
-                <span class="bold_code"><a href="{$filepart}.html"><xsl:apply-templates/></a></span>        
+              <xsl:otherwise>
+                <span class="bold_code"><a href="{$filepart}.html"><xsl:apply-templates/></a></span>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:otherwise>
@@ -1304,16 +1666,16 @@
           </xsl:when>
           <xsl:otherwise>
             <xsl:variable name="modulepart"><xsl:value-of select="substring-before(@marker, ':')"/></xsl:variable>
-            
+
             <xsl:choose>
               <xsl:when test="string-length($modulepart) > 0">
-                <xsl:variable name="filepart1"><xsl:value-of select="substring-after(@marker, ':')"/></xsl:variable>     
+                <xsl:variable name="filepart1"><xsl:value-of select="substring-after(@marker, ':')"/></xsl:variable>
                 <span class="bold_code"><a href="javascript:erlhref('{$topdocdir}/../','{$modulepart}','{$filepart1}.html');"><xsl:apply-templates/></a></span>
               </xsl:when>
               <xsl:otherwise>
-                <span class="bold_code"><a href="{@marker}.html"><xsl:apply-templates/></a></span>        
+                <span class="bold_code"><a href="{@marker}.html"><xsl:apply-templates/></a></span>
               </xsl:otherwise>
-            </xsl:choose>            
+            </xsl:choose>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:otherwise>
@@ -1338,16 +1700,16 @@
         <xsl:choose>
           <xsl:when test="ancestor::parts">
             <a href="users_guide_glossary.html#{@id}"><xsl:value-of select="@id"/></a>
-          </xsl:when> 
-          <xsl:when test="ancestor::applications"> 
+          </xsl:when>
+          <xsl:when test="ancestor::applications">
             <a href="ref_man_glossary.html#{@id}"><xsl:value-of select="@id"/></a>
-          </xsl:when>        
+          </xsl:when>
         </xsl:choose>
       </xsl:when>
       <xsl:otherwise>
         <a href="{$topdocdir}/glossary.html#{@id}"><xsl:value-of select="@id"/></a>
       </xsl:otherwise>
-    </xsl:choose -->            
+    </xsl:choose -->
   </xsl:template>
 
   <xsl:template match="cite">
@@ -1371,9 +1733,9 @@
 
     <center><h4>Version <xsl:value-of select="$appver"/></h4></center>
     <center><h4><xsl:value-of select="$gendate"/></h4></center>
-    
+
     <xsl:apply-templates select="chapter"/>
-          
+
   </xsl:template>
 
   <!-- Menu.rn -->
@@ -1406,7 +1768,7 @@
           </xsl:call-template>
         </ul>
       </div>
-    </div>            
+    </div>
   </xsl:template>
 
   <!-- Glossary -->
@@ -1419,14 +1781,14 @@
         <title>Erlang Documentation -- <xsl:value-of select="header/title"/></title>
       </head>
       <body bgcolor="white" text="#000000" link="#0000ff" vlink="#ff00ff" alink="#ff0000">
-        
+
         <div id="container">
           <script id="js" type="text/javascript" language="JavaScript" src="{$topdocdir}/js/flipmenu/flipmenu.js"/>
           <script id="js2" type="text/javascript" src="{$topdocdir}/js/erlresolvelinks.js"></script>
 
           <!-- Generate menu -->
           <xsl:call-template name="menu"/>
-   
+
           <div id="content">
             <div class="innertube">
               <h1>Glossary</h1>
@@ -1474,14 +1836,14 @@
         <title>Erlang Documentation -- <xsl:value-of select="header/title"/></title>
       </head>
       <body bgcolor="white" text="#000000" link="#0000ff" vlink="#ff00ff" alink="#ff0000">
-        
+
         <div id="container">
           <script id="js" type="text/javascript" language="JavaScript" src="{$topdocdir}/js/flipmenu/flipmenu.js"/>
           <script id="js2" type="text/javascript" src="{$topdocdir}/js/erlresolvelinks.js"></script>
 
           <!-- Generate menu -->
           <xsl:call-template name="menu"/>
-   
+
           <div id="content">
             <div class="innertube">
               <h1>Bibliography</h1>
@@ -1494,8 +1856,8 @@
                   <tr>
                     <td><xsl:value-of select="@id"/></td>
                     <td><xsl:value-of select="citedef"/></td>
-                  </tr>     
-                </xsl:if>                
+                  </tr>
+                </xsl:if>
               </xsl:for-each>
             </table>
 
@@ -1525,7 +1887,7 @@
   <xsl:template name="calc-arity">
     <xsl:param name="string"/>
     <xsl:param name="no-of-pars"/>
-   
+
     <xsl:variable name="length">
       <xsl:value-of select="string-length($string)"/>
     </xsl:variable>
@@ -1534,8 +1896,8 @@
       <xsl:when test="$length > 0">
         <xsl:call-template name="calc-arity">
           <xsl:with-param name="string" select="substring-after($string, ',')"/>
-          <xsl:with-param name="no-of-pars" select="$no-of-pars+1"/> 
-        </xsl:call-template>        
+          <xsl:with-param name="no-of-pars" select="$no-of-pars+1"/>
+        </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="$no-of-pars"/>
@@ -1550,9 +1912,9 @@
     <xsl:variable name="str1">
       <xsl:call-template name="remove-paren-1">
         <xsl:with-param name="string" select="$string"/>
-        <xsl:with-param name="start">(</xsl:with-param> 
-        <xsl:with-param name="end">)</xsl:with-param> 
-      </xsl:call-template>    
+        <xsl:with-param name="start">(</xsl:with-param>
+        <xsl:with-param name="end">)</xsl:with-param>
+      </xsl:call-template>
     </xsl:variable>
 
     <xsl:variable name="str2">
@@ -1560,7 +1922,7 @@
         <xsl:with-param name="string" select="$str1"/>
         <xsl:with-param name="start">{</xsl:with-param>
         <xsl:with-param name="end">}</xsl:with-param>
-      </xsl:call-template>    
+      </xsl:call-template>
     </xsl:variable>
 
     <xsl:variable name="str3">
@@ -1568,7 +1930,7 @@
         <xsl:with-param name="string" select="$str2"/>
         <xsl:with-param name="start">[</xsl:with-param>
         <xsl:with-param name="end">]</xsl:with-param>
-      </xsl:call-template>    
+      </xsl:call-template>
     </xsl:variable>
 
     <xsl:value-of select="$str3"/>
@@ -1580,7 +1942,7 @@
     <xsl:param name="string"/>
     <xsl:param name="start"/>
     <xsl:param name="end"/>
-   
+
     <xsl:variable name="tmp1">
       <xsl:value-of select="substring-before($string, $start)"/>
     </xsl:variable>
@@ -1593,7 +1955,7 @@
         <xsl:variable name="retstring">
           <xsl:call-template name="remove-paren">
             <xsl:with-param name="string" select="$tmp2"/>
-          </xsl:call-template>        
+          </xsl:call-template>
         </xsl:variable>
         <xsl:value-of select="concat(concat($tmp1, 'x'), $retstring)"/>
       </xsl:when>
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index a2b1e755e2..2a8fb9fe3e 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--      
+<!--
      #
      # %CopyrightBegin%
      #
@@ -17,24 +17,294 @@
      # under the License.
      #
      # %CopyrightEnd%
-     
+
      -->
 
 <xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:preserve-space elements="code pre"/>
   <xsl:strip-space elements="*"/>
   <xsl:output method="text" encoding="UTF-8" indent="no"/>
 
+  <!-- Start of Dialyzer type/spec tags. See also the template matching "name"
+  -->
+
+  <!-- Note: specs data for *one* module (as opposed to html and pdf) -->
+  <xsl:param name="specs_file" select="''"/>
+  <xsl:variable name="i" select="document($specs_file)"></xsl:variable>
+
+  <xsl:template name="err">
+    <xsl:param name="m"/>
+    <xsl:param name="n"/>
+    <xsl:param name="a"/>
+    <xsl:param name="s"/>
+    <xsl:message terminate="yes">
+  Error <xsl:if test="$m != ''"><xsl:value-of select ="$m"/>:</xsl:if>
+	 <xsl:value-of
+		   select="$n"/>/<xsl:value-of
+		   select="$a"/>: <xsl:value-of select="$s"/>
+    </xsl:message>
+  </xsl:template>
+
+  <xsl:template name="spec_name">
+    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
+    <xsl:variable name="mod" select="@mod"/>
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="clause" select="@clause"/>
+    <xsl:variable name="spec0" select=
+        "$i/module[@name=$curModule]/spec
+             [name=$name and arity=$arity
+              and (string-length($mod) = 0 or module = $mod)]"/>
+    <xsl:variable name="spec" select="$spec0[string-length($clause) = 0
+                                             or position() = $clause]"/>
+    <xsl:if test="count($spec) = 0">
+      <xsl:call-template name="err">
+	<xsl:with-param name="m" select="$mod"/>
+	<xsl:with-param name="n" select="$name"/>
+	<xsl:with-param name="a" select="$arity"/>
+	<xsl:with-param name="s">unknown spec</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+
+    <xsl:choose>
+      <xsl:when test="ancestor::cref">
+	<xsl:message terminate="yes">
+          Error: did not expect a 'name' tag with name/arity attributes here!
+	</xsl:message>
+      </xsl:when>
+      <xsl:when test="ancestor::erlref">
+	<xsl:choose>
+	  <xsl:when test="string(@with_guards) = 'no'">
+	     <xsl:apply-templates select="$spec/contract/clause/head"/>
+	  </xsl:when>
+	  <xsl:otherwise>
+            <xsl:call-template name="contract">
+              <xsl:with-param name="contract" select="$spec/contract"/>
+            </xsl:call-template>
+	  </xsl:otherwise>
+	</xsl:choose>
+        <xsl:text>&#10;.br</xsl:text>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="contract">
+    <xsl:param name="contract"/>
+    <xsl:call-template name="clause">
+      <xsl:with-param name="clause" select="$contract/clause"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="clause">
+    <xsl:param name="clause"/>
+    <xsl:variable name="type_desc" select="../type_desc"/>
+    <xsl:for-each select="$clause">
+      <xsl:apply-templates select="head"/>
+      <xsl:if test="count(guard) > 0">
+	<xsl:call-template name="guard">
+	  <xsl:with-param name="guard" select="guard"/>
+	  <xsl:with-param name="type_desc" select="$type_desc"/>
+	</xsl:call-template>
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="head">
+    <xsl:text>&#10;.nf&#10;</xsl:text>
+    <xsl:text>&#10;.B&#10;</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>&#10;.br</xsl:text>
+    <xsl:text>&#10;.fi</xsl:text>
+  </xsl:template>
+
+  <xsl:template name="guard">
+    <xsl:param name="guard"/>
+    <xsl:param name="type_desc"/>
+    <xsl:text>&#10;.RS</xsl:text>
+    <xsl:text>&#10;.TP</xsl:text>
+    <xsl:text>&#10;Types</xsl:text>
+    <xsl:call-template name="subtype">
+      <xsl:with-param name="subtype" select="$guard/subtype"/>
+      <xsl:with-param name="type_desc" select="$type_desc"/>
+    </xsl:call-template>
+    <xsl:text>&#10;.RE</xsl:text>
+  </xsl:template>
+
+  <xsl:template name="subtype">
+    <xsl:param name="subtype"/>
+    <xsl:param name="type_desc"/>
+    <xsl:for-each select="$subtype">
+      <xsl:variable name="tname" select="typename"/>
+      <xsl:variable name="tdesc" select="$type_desc[@name = $tname]"/>
+        <xsl:text>&#10;</xsl:text>
+        <xsl:apply-templates select="string"/>
+        <xsl:text>&#10;.br</xsl:text>
+      <xsl:apply-templates select="$type_desc[@name = $tname]"/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!-- Note: <type_desc> has not been implemented for data types. -->
+
+  <!-- Similar to <d> -->
+  <xsl:template match="type_desc">
+    <xsl:text>&#10;</xsl:text><xsl:apply-templates/>
+    <xsl:text>&#10;.br</xsl:text>
+  </xsl:template>
+
+  <!-- Datatypes -->
+  <xsl:template match="datatypes">
+    <xsl:text>&#10;.SH DATA TYPES</xsl:text>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <!-- Datatype -->
+  <xsl:template match="datatype">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="typehead">
+    <xsl:text>&#10;.nf&#10;</xsl:text>
+    <xsl:text>&#10;.B&#10;</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>&#10;.br</xsl:text>
+    <xsl:text>&#10;.fi</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="local_defs">
+    <xsl:text>&#10;.RS</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>&#10;.RE</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="local_def">
+    <xsl:text>&#10;</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>&#10;.br</xsl:text>
+  </xsl:template>
+
+  <xsl:template name="type_name">
+    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
+    <xsl:variable name="mod" select="@mod"/>
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="n_vars">
+      <xsl:choose>
+	<xsl:when test="string-length(@n_vars) > 0">
+	  <xsl:value-of select="@n_vars"/>
+	</xsl:when>
+	<xsl:otherwise>
+          <xsl:value-of select="0"/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="string-length($name) > 0">
+	<xsl:variable name="type" select=
+	    "$i/module[@name=$curModule]/type
+		 [name=$name and n_vars=$n_vars
+		  and (string-length($mod) = 0 or module = $mod)]"/>
+
+	<xsl:if test="count($type) != 1">
+	  <xsl:call-template name="err">
+	    <xsl:with-param name="m" select="$mod"/>
+	    <xsl:with-param name="n" select="$name"/>
+	    <xsl:with-param name="a" select="$n_vars"/>
+	    <xsl:with-param name="s">unknown type</xsl:with-param>
+	  </xsl:call-template>
+	</xsl:if>
+	<xsl:apply-templates select="$type/typedecl"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>&#10;.nf&#10;</xsl:text>
+        <xsl:text>&#10;.B&#10;</xsl:text>
+        <xsl:apply-templates/>
+        <xsl:text>&#10;.br</xsl:text>
+        <xsl:text>&#10;.fi</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- Used both in <datatype> and in <func>! -->
+  <xsl:template match="anno">
+    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
+    <xsl:variable name="anno" select="normalize-space(text())"/>
+    <xsl:variable name="namespec"
+                  select="ancestor::desc/preceding-sibling::name"/>
+    <xsl:if test="count($namespec) = 0 and string-length($specs_file) > 0">
+      <xsl:call-template name="err">
+	<xsl:with-param name="s">cannot find 'name' (<xsl:value-of select="$anno"/>)
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+
+    <xsl:variable name="mod" select="$namespec/@mod"/>
+    <xsl:variable name="name" select="$namespec/@name"/>
+    <xsl:variable name="arity" select="$namespec/@arity"/>
+    <xsl:variable name="clause" select="$namespec/@clause"/>
+    <xsl:variable name="tmp_n_vars" select="$namespec/@n_vars"/>
+    <xsl:variable name="n_vars">
+      <xsl:choose>
+	<xsl:when test="string-length($tmp_n_vars) > 0">
+	  <xsl:value-of select="$tmp_n_vars"/>
+	</xsl:when>
+	<xsl:otherwise>
+          <xsl:value-of select="0"/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="spec0" select=
+        "$i/module[@name=$curModule]/spec
+             [name=$name and arity=$arity
+              and (string-length($mod) = 0 or module = $mod)]"/>
+    <xsl:variable name="spec_annos" select=
+         "$spec0[string-length($clause) = 0
+                 or position() = $clause]/anno[.=$anno]"/>
+    <xsl:variable name="type_annos" select=
+        "$i/module[@name=$curModule]/type
+             [name=$name and n_vars=$n_vars
+              and (string-length($mod) = 0 or module = $mod)]/anno[.=$anno]"/>
+
+    <xsl:if test="count($spec_annos) = 0
+                  and count($type_annos) = 0
+	          and string-length($specs_file) > 0">
+      <xsl:variable name="n">
+        <xsl:choose>
+          <xsl:when test="string-length($arity) = 0">
+            <xsl:value-of select="$n_vars"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$arity"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:call-template name="err">
+	<xsl:with-param name="m" select="$mod"/>
+	<xsl:with-param name="n" select="$name"/>
+	<xsl:with-param name="a" select="$n"/>
+	<xsl:with-param name="s">unknown annotation <xsl:value-of select="$anno"/>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:value-of select="$anno"/>
+  </xsl:template>
+
+  <!-- Used for indentation of formatted types and specs -->
+  <xsl:template match="nbsp">
+    <xsl:text> </xsl:text>
+  </xsl:template>
+
+  <!-- End of Dialyzer type/spec tags -->
+
   <!-- Header -->
   <xsl:template match="header">
   </xsl:template>
-  
+
   <!-- Section/Title -->
   <xsl:template match="section/title">
   </xsl:template>
-  
+
   <!-- *ref/Section -->
   <xsl:template match="erlref/section|comref/section|cref/section|fileref/section|appref/section">
     <xsl:text>&#10;.SH "</xsl:text><xsl:value-of select="translate(title, 'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/><xsl:text>"&#10;</xsl:text>
@@ -49,11 +319,11 @@
 
 
   <!-- Lists -->
-  
+
   <xsl:template match="list">
     <xsl:text>&#10;.RS 2</xsl:text>
     <xsl:apply-templates/>
-    <xsl:text>&#10;.RE</xsl:text>
+    <xsl:text>&#10;.RE&#10;</xsl:text>
   </xsl:template>
 
   <xsl:template match="list/item">
@@ -66,9 +336,9 @@
   <xsl:template match="taglist">
     <xsl:text>&#10;.RS 2</xsl:text>
     <xsl:apply-templates select="tag|item"/>
-    <xsl:text>&#10;.RE</xsl:text>
+    <xsl:text>&#10;.RE&#10;</xsl:text>
   </xsl:template>
-  
+
   <xsl:template match="taglist/tag">
     <xsl:text>&#10;.TP 2&#10;</xsl:text>
     <xsl:text>.B&#10;</xsl:text>
@@ -76,7 +346,7 @@
   </xsl:template>
 
   <xsl:template match="taglist/item">
-    <xsl:apply-templates/>        
+    <xsl:apply-templates/>
   </xsl:template>
 
   <xsl:template match="item/p">
@@ -88,10 +358,10 @@
         <xsl:value-of select="$content"/>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:text>&#10;.RS 2</xsl:text>     
-        <xsl:text>&#10;.LP&#10;&#10;.LP&#10;</xsl:text>     
+        <xsl:text>&#10;.RS 2</xsl:text>
+        <xsl:text>&#10;.LP&#10;&#10;.LP&#10;</xsl:text>
         <xsl:value-of select="$content"/>
-        <xsl:text>&#10;.RE</xsl:text>     
+        <xsl:text>&#10;.RE</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -171,7 +441,7 @@
   <xsl:template match="application">
       <xsl:apply-templates/>
   </xsl:template>
-  
+
   <!-- Erlref -->
   <xsl:template match="/erlref">
     <xsl:variable name="companyname">
@@ -184,7 +454,7 @@
 
     <xsl:text>.TH </xsl:text><xsl:value-of select="module"/><xsl:text> 3 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "</xsl:text><xsl:value-of select="$companyname"/><xsl:text>" "Erlang Module Definition"&#10;</xsl:text>
     <xsl:text>.SH NAME&#10;</xsl:text>
-    <xsl:value-of select="module"/><xsl:text> \- </xsl:text><xsl:value-of select="modulesummary"/><xsl:text>&#10;</xsl:text>  
+    <xsl:value-of select="module"/><xsl:text> \- </xsl:text><xsl:value-of select="modulesummary"/><xsl:text>&#10;</xsl:text>
     <xsl:apply-templates/>
   </xsl:template>
 
@@ -199,7 +469,7 @@
     </xsl:variable>
    <xsl:text>.TH </xsl:text><xsl:value-of select="com"/><xsl:text> 1 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "</xsl:text><xsl:value-of select="$companyname"/><xsl:text>" "User Commands"&#10;</xsl:text>
     <xsl:text>.SH NAME&#10;</xsl:text>
-    <xsl:value-of select="com"/><xsl:text> \- </xsl:text><xsl:value-of select="comsummary"/><xsl:text>&#10;</xsl:text>  
+    <xsl:value-of select="com"/><xsl:text> \- </xsl:text><xsl:value-of select="comsummary"/><xsl:text>&#10;</xsl:text>
     <xsl:apply-templates/>
   </xsl:template>
 
@@ -214,7 +484,7 @@
     </xsl:variable>
     <xsl:text>.TH </xsl:text><xsl:value-of select="lib"/><xsl:text> 3 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "</xsl:text><xsl:value-of select="$companyname"/><xsl:text>" "C Library Functions"&#10;</xsl:text>
     <xsl:text>.SH NAME&#10;</xsl:text>
-    <xsl:value-of select="lib"/><xsl:text> \- </xsl:text><xsl:value-of select="libsummary"/><xsl:text>&#10;</xsl:text>  
+    <xsl:value-of select="lib"/><xsl:text> \- </xsl:text><xsl:value-of select="libsummary"/><xsl:text>&#10;</xsl:text>
     <xsl:apply-templates/>
   </xsl:template>
 
@@ -229,7 +499,7 @@
     </xsl:variable>
     <xsl:text>.TH </xsl:text><xsl:value-of select="file"/><xsl:text> 5 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "</xsl:text><xsl:value-of select="$companyname"/><xsl:text>" "Files"&#10;</xsl:text>
     <xsl:text>.SH NAME&#10;</xsl:text>
-    <xsl:value-of select="file"/><xsl:text> \- </xsl:text><xsl:value-of select="filesummary"/><xsl:text>&#10;</xsl:text>  
+    <xsl:value-of select="file"/><xsl:text> \- </xsl:text><xsl:value-of select="filesummary"/><xsl:text>&#10;</xsl:text>
     <xsl:apply-templates/>
   </xsl:template>
 
@@ -244,7 +514,7 @@
     </xsl:variable>
     <xsl:text>.TH </xsl:text><xsl:value-of select="app"/><xsl:text> 7 "</xsl:text><xsl:value-of select="$appname"/><xsl:text> </xsl:text><xsl:value-of select="$appver"/><xsl:text>" "</xsl:text><xsl:value-of select="$companyname"/><xsl:text>" "Erlang Application Definition"&#10;</xsl:text>
     <xsl:text>.SH NAME&#10;</xsl:text>
-    <xsl:value-of select="app"/><xsl:text> \- </xsl:text><xsl:value-of select="appsummary"/><xsl:text>&#10;</xsl:text>  
+    <xsl:value-of select="app"/><xsl:text> \- </xsl:text><xsl:value-of select="appsummary"/><xsl:text>&#10;</xsl:text>
     <xsl:apply-templates/>
   </xsl:template>
 
@@ -271,10 +541,26 @@
   <!-- Func -->
   <xsl:template match="func">
     <xsl:text>&#10;.LP</xsl:text>
-    <xsl:apply-templates/>
+    <xsl:apply-templates select="name"/>
+    <xsl:apply-templates select="fsummary|type|desc"/>
   </xsl:template>
 
   <xsl:template match="name">
+    <xsl:choose>
+      <!-- @arity is mandatory when referring to a specification -->
+      <xsl:when test="string-length(@arity) > 0">
+        <xsl:call-template name="spec_name"/>
+      </xsl:when>
+      <xsl:when test="ancestor::datatype">
+        <xsl:call-template name="type_name"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="name"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="name">
     <xsl:text>&#10;.B&#10;</xsl:text>
     <xsl:apply-templates/>
     <xsl:text>&#10;.br</xsl:text>
@@ -296,7 +582,7 @@
     <xsl:text>&#10;</xsl:text><xsl:value-of select="normalize-space(text())"/>
     <xsl:text>&#10;.br</xsl:text>
   </xsl:template>
-  
+
   <!-- D -->
   <xsl:template match="d">
     <xsl:text>&#10;</xsl:text><xsl:apply-templates/>
@@ -316,7 +602,7 @@
     <!-- This tag is skipped for now. -->
   </xsl:template>
 
- 
+
   <!-- Authors -->
   <xsl:template match="authors">
     <xsl:text>&#10;.SH AUTHORS</xsl:text>
@@ -336,11 +622,28 @@
     <xsl:text>&gt;</xsl:text>
   </xsl:template>
 
+  <!-- Do not noramlize any text within pre and code tags. -->
+  <xsl:template match="pre/text()">
+      <xsl:call-template name="replace-string">
+        <xsl:with-param name="text" select="." />
+        <xsl:with-param name="replace" select="&quot;\&quot;" />
+        <xsl:with-param name="with" select="&quot;\\&quot;" />
+      </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template match="code/text()">
+      <xsl:call-template name="replace-string">
+        <xsl:with-param name="text" select="." />
+        <xsl:with-param name="replace" select="&quot;\&quot;" />
+        <xsl:with-param name="with" select="&quot;\\&quot;" />
+      </xsl:call-template>
+  </xsl:template>
+
   <!-- Replace ' by \&' ans . by \&. -->
   <xsl:template match="text()">
     <xsl:variable name="startstring">
       <xsl:value-of select="normalize-space()"/><xsl:text> </xsl:text>
-    </xsl:variable>    
+    </xsl:variable>
     <xsl:variable name="rep1">
       <xsl:call-template name="replace-string">
         <xsl:with-param name="text" select="$startstring" />
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index e12b4d219a..1e80c360b8 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--      
+<!--
      #
      # %CopyrightBegin%
      #
@@ -17,7 +17,7 @@
      # under the License.
      #
      # %CopyrightEnd%
-     
+
      -->
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -27,16 +27,310 @@
 
   <xsl:include href="db_pdf_params.xsl"/>
 
+  <!-- Start of Dialyzer type/spec tags.
+       See also the template matching "name" and the template "bookmarks6"
+  -->
+
+  <xsl:param name="specs_file" select="''"/>
+  <xsl:variable name="i" select="document($specs_file)"></xsl:variable>
+
+  <xsl:template name="err">
+    <xsl:param name="m"/>
+    <xsl:param name="n"/>
+    <xsl:param name="a"/>
+    <xsl:param name="s"/>
+    <xsl:message terminate="yes">
+  Error <xsl:if test="$m != ''"><xsl:value-of select ="$m"/>:</xsl:if>
+	 <xsl:value-of
+		   select="$n"/>/<xsl:value-of
+		   select="$a"/>: <xsl:value-of select="$s"/>
+    </xsl:message>
+  </xsl:template>
+
+  <xsl:template name="spec_name">
+    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
+    <xsl:variable name="mod" select="@mod"/>
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="clause" select="@clause"/>
+    <xsl:variable name="spec0" select=
+        "$i/specs/module[@name=$curModule]/spec
+             [name=$name and arity=$arity
+              and (string-length($mod) = 0 or module = $mod)]"/>
+    <xsl:variable name="spec" select="$spec0[string-length($clause) = 0
+                                             or position() = $clause]"/>
+    <xsl:if test="count($spec) = 0">
+      <xsl:call-template name="err">
+	<xsl:with-param name="m" select="$mod"/>
+	<xsl:with-param name="n" select="$name"/>
+	<xsl:with-param name="a" select="$arity"/>
+	<xsl:with-param name="s">unknown spec</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+
+    <xsl:choose>
+      <xsl:when test="ancestor::cref">
+	<xsl:message terminate="yes">
+          Error: did not expect a 'name' tag with name/arity attributes here!
+	</xsl:message>
+      </xsl:when>
+      <xsl:when test="ancestor::erlref">
+        <fo:block id="{generate-id()}">
+	  <xsl:choose>
+            <xsl:when test="string(@with_guards) = 'no'">
+               <xsl:apply-templates select="$spec/contract/clause/head"/>
+            </xsl:when>
+            <xsl:otherwise>
+	      <xsl:call-template name="contract">
+		<xsl:with-param name="contract" select="$spec/contract"/>
+	      </xsl:call-template>
+            </xsl:otherwise>
+          </xsl:choose>
+        </fo:block>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="contract">
+    <xsl:param name="contract"/>
+    <xsl:call-template name="clause">
+      <xsl:with-param name="clause" select="$contract/clause"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="clause">
+    <xsl:param name="clause"/>
+    <xsl:variable name="type_desc" select="../type_desc"/>
+    <xsl:for-each select="$clause">
+      <xsl:apply-templates select="head"/>
+      <xsl:if test="count(guard) > 0">
+	<xsl:call-template name="guard">
+	  <xsl:with-param name="guard" select="guard"/>
+	  <xsl:with-param name="type_desc" select="$type_desc"/>
+	</xsl:call-template>
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="head">
+    <fo:block xsl:use-attribute-sets="function-name">
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+
+  <xsl:template name="guard">
+    <fo:block>
+      <xsl:text>Types:</xsl:text>
+    </fo:block>
+    <fo:list-block xsl:use-attribute-sets="type-listblock">
+      <xsl:call-template name="subtype">
+	<xsl:with-param name="subtype" select="$guard/subtype"/>
+	<xsl:with-param name="type_desc" select="$type_desc"/>
+      </xsl:call-template>
+    </fo:list-block>
+  </xsl:template>
+
+  <xsl:template name="subtype">
+    <xsl:param name="subtype"/>
+    <xsl:param name="type_desc"/>
+    <xsl:for-each select="$subtype">
+      <xsl:variable name="tname" select="typename"/>
+      <xsl:variable name="tdesc" select="$type_desc[@name = $tname]"/>
+      <fo:list-item xsl:use-attribute-sets="type-listitem">
+	<fo:list-item-label end-indent="label-end()">
+	  <fo:block>
+	  </fo:block>
+	</fo:list-item-label>
+	<fo:list-item-body start-indent="body-start()" format="justify">
+	  <fo:block font-weight="bold">
+            <xsl:apply-templates select="string"/>
+	  </fo:block>
+	</fo:list-item-body>
+      </fo:list-item>
+      <xsl:apply-templates select="$type_desc[@name = $tname]"/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!-- Note: <type_desc> has not been implemented for data types. -->
+
+  <!-- Similar to <d> -->
+  <xsl:template match="type_desc">
+    <fo:list-item xsl:use-attribute-sets="type-listitem">
+      <fo:list-item-label end-indent="label-end()"><fo:block></fo:block>
+      </fo:list-item-label>
+      <fo:list-item-body start-indent="body-start()" format="justify">
+        <fo:block>
+          <xsl:apply-templates/>
+        </fo:block>
+      </fo:list-item-body>
+    </fo:list-item>
+  </xsl:template>
+
+  <!-- Datatypes -->
+  <xsl:template match="datatypes">
+    <fo:block  xsl:use-attribute-sets="h3">
+      <xsl:text>Data Types</xsl:text>
+    </fo:block>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <!-- Datatype -->
+  <xsl:template match="datatype">
+    <fo:block xsl:use-attribute-sets="function-name">
+      <xsl:apply-templates select="name"/>
+    </fo:block>
+    <xsl:apply-templates select="desc"/>
+  </xsl:template>
+
+  <!-- Like <head>... -->
+  <xsl:template match="typehead">
+    <fo:block xsl:use-attribute-sets="function-name">
+      <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+
+  <!-- Like <guard>, except "Types:"... -->
+  <xsl:template match="local_defs">
+    <fo:list-block xsl:use-attribute-sets="type-listblock">
+      <xsl:apply-templates/>
+    </fo:list-block>
+  </xsl:template>
+
+  <!-- Like <subtype>... -->
+  <xsl:template match="local_def">
+    <fo:list-item xsl:use-attribute-sets="type-listitem">
+      <fo:list-item-label end-indent="label-end()">
+        <fo:block>
+        </fo:block>
+      </fo:list-item-label>
+      <fo:list-item-body start-indent="body-start()" format="justify">
+        <fo:block font-weight="bold">
+          <xsl:apply-templates/>
+        </fo:block>
+      </fo:list-item-body>
+    </fo:list-item>
+  </xsl:template>
+
+  <xsl:template name="type_name">
+    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
+    <xsl:variable name="mod" select="@mod"/>
+    <xsl:variable name="name" select="@name"/>
+    <xsl:variable name="n_vars">
+      <xsl:choose>
+	<xsl:when test="string-length(@n_vars) > 0">
+	  <xsl:value-of select="@n_vars"/>
+	</xsl:when>
+	<xsl:otherwise>
+          <xsl:value-of select="0"/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="string-length($name) > 0">
+	<xsl:variable name="type" select=
+	    "$i/specs/module[@name=$curModule]/type
+		 [name=$name and n_vars=$n_vars
+		  and (string-length($mod) = 0 or module = $mod)]"/>
+
+	<xsl:if test="count($type) != 1">
+	  <xsl:call-template name="err">
+	    <xsl:with-param name="m" select="$mod"/>
+	    <xsl:with-param name="n" select="$name"/>
+	    <xsl:with-param name="a" select="$n_vars"/>
+	    <xsl:with-param name="s">unknown type</xsl:with-param>
+	  </xsl:call-template>
+	</xsl:if>
+	<xsl:apply-templates select="$type/typedecl"/>
+      </xsl:when>
+      <xsl:otherwise>
+	<fo:inline font-weight="bold" xsl:use-attribute-sets="type-listitem">
+	<xsl:value-of select="."/>
+	</fo:inline>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- Used both in <datatype> and in <func>! -->
+  <xsl:template match="anno">
+    <xsl:variable name="curModule" select="ancestor::erlref/module"/>
+    <xsl:variable name="anno" select="normalize-space(text())"/>
+    <xsl:variable name="namespec"
+                  select="ancestor::desc/preceding-sibling::name"/>
+    <xsl:if test="count($namespec) = 0 and string-length($specs_file) > 0">
+      <xsl:call-template name="err">
+	<xsl:with-param name="s">cannot find 'name' (<xsl:value-of select="$anno"/>)
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+
+    <xsl:variable name="mod" select="$namespec/@mod"/>
+    <xsl:variable name="name" select="$namespec/@name"/>
+    <xsl:variable name="arity" select="$namespec/@arity"/>
+    <xsl:variable name="clause" select="$namespec/@clause"/>
+    <xsl:variable name="tmp_n_vars" select="$namespec/@n_vars"/>
+    <xsl:variable name="n_vars">
+      <xsl:choose>
+	<xsl:when test="string-length($tmp_n_vars) > 0">
+	  <xsl:value-of select="$tmp_n_vars"/>
+	</xsl:when>
+	<xsl:otherwise>
+          <xsl:value-of select="0"/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="spec0" select=
+        "$i/specs/module[@name=$curModule]/spec
+             [name=$name and arity=$arity
+              and (string-length($mod) = 0 or module = $mod)]"/>
+    <xsl:variable name="spec_annos" select=
+         "$spec0[string-length($clause) = 0
+                 or position() = $clause]/anno[.=$anno]"/>
+    <xsl:variable name="type_annos" select=
+        "$i/specs/module[@name=$curModule]/type
+             [name=$name and n_vars=$n_vars
+              and (string-length($mod) = 0 or module = $mod)]/anno[.=$anno]"/>
+
+    <xsl:if test="count($spec_annos) = 0
+                  and count($type_annos) = 0
+	          and string-length($specs_file) > 0">
+      <xsl:variable name="n">
+        <xsl:choose>
+          <xsl:when test="string-length($arity) = 0">
+            <xsl:value-of select="$n_vars"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$arity"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:call-template name="err">
+	<xsl:with-param name="m" select="$mod"/>
+	<xsl:with-param name="n" select="$name"/>
+	<xsl:with-param name="a" select="$n"/>
+	<xsl:with-param name="s">unknown annotation <xsl:value-of select="$anno"/>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:value-of select="$anno"/>
+  </xsl:template>
+
+  <!-- Used for indentation of formatted types and specs -->
+  <xsl:template match="nbsp">
+    <xsl:text>&#160;</xsl:text>
+  </xsl:template>
+
+  <!-- End of Dialyzer type/spec tags -->
 
   <xsl:template match="/">
     <xsl:apply-templates select="book"/>
   </xsl:template>
 
-  
+
   <xsl:template match="book">
     <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-      <!-- Master pages -->          
+      <!-- Master pages -->
       <fo:layout-master-set>
         <fo:simple-page-master
             master-name="cover"
@@ -47,7 +341,7 @@
           <xsl:attribute name="page-width">
             <xsl:value-of select="$page-width"/>
           </xsl:attribute>
-          <fo:region-body 
+          <fo:region-body
               margin="0mm"/>
         </fo:simple-page-master>
 
@@ -63,7 +357,7 @@
           <xsl:attribute name="page-width">
             <xsl:value-of select="$page-width"/>
           </xsl:attribute>
-          <fo:region-body 
+          <fo:region-body
               margin-top="15mm"
               margin-bottom="20mm"/>
           <fo:region-before
@@ -100,10 +394,10 @@
 
         <fo:page-sequence-master master-name="document">
           <fo:repeatable-page-master-alternatives>
-            <fo:conditional-page-master-reference 
+            <fo:conditional-page-master-reference
                 master-reference="left-page"
                 odd-or-even="even"/>
-            <fo:conditional-page-master-reference 
+            <fo:conditional-page-master-reference
                 master-reference="right-page"
                 odd-or-even="odd"/>
           </fo:repeatable-page-master-alternatives>
@@ -166,7 +460,7 @@
 
         <fo:flow flow-name="xsl-region-body">
           <fo:block>
-            
+
           </fo:block>
           <xsl:apply-templates select="parts"/>
 
@@ -189,7 +483,7 @@
 
   <!-- Cover page -->
   <xsl:template match="header/title">
-    <fo:page-sequence 
+    <fo:page-sequence
         font-family="sans-serif"
         force-page-count="even"
         master-reference="cover">
@@ -242,7 +536,7 @@
   the License for the specific language governing rights and limitations
   under the License.
 
-  The Initial Developer of the Original Code is 
+  The Initial Developer of the Original Code is
 -->
           <xsl:value-of select="$companyname"/>.
         </fo:block>
@@ -281,22 +575,22 @@
   <xsl:template name="bookmarks1">
     <xsl:param name="entries"/>
     <xsl:if test="$entries != ''">
-      
+
       <fo:bookmark internal-destination="{generate-id(/book/parts/part)}"
         starting-state="hide">
         <fo:bookmark-title>User's Guide</fo:bookmark-title>
-        
+
         <xsl:for-each select="$entries">
           <xsl:call-template name="bookmarks2">
             <xsl:with-param name="entries"
               select="chapter[header/title]"/>
           </xsl:call-template>
         </xsl:for-each>
-        
+
       </fo:bookmark>
     </xsl:if>
   </xsl:template>
-  
+
   <xsl:template name="bookmarks2">
     <xsl:param name="entries"/>
     <xsl:for-each select="$entries">
@@ -341,7 +635,7 @@
         starting-state="hide">
         <fo:bookmark-title>Reference Manual</fo:bookmark-title>
         <xsl:for-each select="$entries">
-          
+
           <xsl:call-template name="bookmarks5">
             <xsl:with-param name="entries"
               select="erlref[module]|comref[com]|cref[lib]|fileref[file]|appref[app]"/>
@@ -387,7 +681,7 @@
           <fo:bookmark internal-destination="{generate-id(nametext)}" starting-state="hide">
             <xsl:variable name="fname">
               <xsl:value-of select="substring-before(nametext, '(')"/>
-            </xsl:variable> 
+            </xsl:variable>
             <fo:bookmark-title>
               <xsl:choose>
                 <xsl:when test="string-length($fname) > 0">
@@ -396,7 +690,7 @@
                 <xsl:otherwise>
                   <xsl:value-of select="nametext"/>()
                 </xsl:otherwise>
-              </xsl:choose>                 
+              </xsl:choose>
             </fo:bookmark-title>
           </fo:bookmark>
         </xsl:when>
@@ -404,60 +698,76 @@
           <fo:bookmark internal-destination="{generate-id(.)}" starting-state="hide">
             <xsl:variable name="tmpstring">
               <xsl:value-of select="substring-before(substring-after(., '('), '->')"/>
-            </xsl:variable>     
+            </xsl:variable>
 
             <xsl:variable name="ustring">
               <xsl:choose>
                 <xsl:when test="string-length($tmpstring) > 0">
                   <xsl:call-template name="remove-paren">
                     <xsl:with-param name="string" select="$tmpstring"/>
-                  </xsl:call-template>            
+                  </xsl:call-template>
                 </xsl:when>
                 <xsl:otherwise>
                   <xsl:call-template name="remove-paren">
                     <xsl:with-param name="string" select="substring-after(., '(')"/>
-                  </xsl:call-template>                      
+                  </xsl:call-template>
                 </xsl:otherwise>
               </xsl:choose>
-            </xsl:variable>      
+            </xsl:variable>
 
             <xsl:variable name="arity">
-              <xsl:call-template name="calc-arity">
-                <xsl:with-param name="string" select="substring-before($ustring, ')')"/>
-                <xsl:with-param name="no-of-pars" select="0"/> 
-              </xsl:call-template>
-            </xsl:variable> 
-
-            <xsl:variable name="fname">
-              <xsl:variable name="fname1">
-                <xsl:value-of select="substring-before(., '(')"/>
-              </xsl:variable>
-              <xsl:variable name="fname2">
-                <xsl:value-of select="substring-after($fname1, 'erlang:')"/>
-              </xsl:variable>
-              <xsl:choose>
-                <xsl:when test="string-length($fname2) > 0">   
-                  <xsl:value-of select="$fname2"/>
-                </xsl:when>
+	      <xsl:choose>
+		<xsl:when test="string-length(@arity) > 0">
+		  <!-- Dialyzer spec -->
+		  <xsl:value-of select="@arity"/>
+		</xsl:when>
                 <xsl:otherwise>
-                  <xsl:value-of select="$fname1"/>
+                  <xsl:call-template name="calc-arity">
+                    <xsl:with-param name="string" select="substring-before($ustring, ')')"/>
+                    <xsl:with-param name="no-of-pars" select="0"/>
+                  </xsl:call-template>
                 </xsl:otherwise>
               </xsl:choose>
             </xsl:variable>
 
+            <xsl:variable name="fname">
+	      <xsl:choose>
+		<xsl:when test="string-length(@name) > 0">
+		  <!-- Dialyzer spec -->
+		  <xsl:value-of select="@name"/>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:variable name="fname1">
+		    <xsl:value-of select="substring-before(., '(')"/>
+		  </xsl:variable>
+		  <xsl:variable name="fname2">
+		    <xsl:value-of select="substring-after($fname1, 'erlang:')"/>
+		  </xsl:variable>
+		  <xsl:choose>
+		    <xsl:when test="string-length($fname2) > 0">
+		      <xsl:value-of select="$fname2"/>
+		    </xsl:when>
+		    <xsl:otherwise>
+		      <xsl:value-of select="$fname1"/>
+		    </xsl:otherwise>
+		  </xsl:choose>
+		</xsl:otherwise>
+	      </xsl:choose>
+            </xsl:variable>
+
             <fo:bookmark-title>
               <xsl:value-of select="$fname"/>/<xsl:value-of select="$arity"/>
             </fo:bookmark-title>
           </fo:bookmark>
         </xsl:when>
       </xsl:choose>
-      
+
     </xsl:for-each>
   </xsl:template>
 
 
   <!-- UG part -->
-  
+
   <!-- Parts -->
   <xsl:template match="parts">
     <xsl:apply-templates select="part"/>
@@ -491,7 +801,7 @@
         <xsl:value-of select="$partnum"/>.<xsl:number/>&#160;&#160;<xsl:value-of select="header/title"/>
       </fo:marker>
       <xsl:value-of select="$partnum"/>.<xsl:number/>&#160;&#160;<xsl:value-of select="header/title"/>
-      
+
     </fo:block>
 
     <xsl:apply-templates select="section|quote|warning|note|br|image|marker|table|p|pre|code|list|taglist|codeinclude|erleval">
@@ -567,7 +877,7 @@
  </xsl:template>
 
   <!-- Lists -->
-  
+
   <xsl:template match="list">
     <xsl:param name="partnum"/>
     <fo:list-block xsl:use-attribute-sets="listblock">
@@ -692,7 +1002,7 @@
     </xsl:variable>
 
     <fo:block xsl:use-attribute-sets="code">
-      <xsl:apply-templates select="text()"/> 
+      <xsl:apply-templates select="text()"/>
     </fo:block>
 
     <xsl:if test="@caption">
@@ -711,7 +1021,7 @@
     </xsl:variable>
 
     <fo:block xsl:use-attribute-sets="code">
-      <xsl:apply-templates/> 
+      <xsl:apply-templates/>
     </fo:block>
 
     <xsl:if test="@caption">
@@ -734,23 +1044,23 @@
     <xsl:variable name="partnum">
       <xsl:number level="any" from="book" count="part|application"/>
     </xsl:variable>
-    
-    <fo:block xsl:use-attribute-sets="h1" id="{generate-id()}">         
+
+    <fo:block xsl:use-attribute-sets="h1" id="{generate-id()}">
       <xsl:if test="/book/header/title">
         <xsl:value-of select="$partnum"/>&#160;&#160;&#160;
       <xsl:text>Reference Manual</xsl:text>
-      </xsl:if>          
+      </xsl:if>
     </fo:block>
-    
-    
+
+
     <xsl:apply-templates select="description">
       <xsl:with-param name="partnum" select="$partnum"/>
     </xsl:apply-templates>
-    
+
     <xsl:apply-templates select="erlref|comref|cref|fileref|appref">
       <xsl:with-param name="partnum" select="$partnum"/>
     </xsl:apply-templates>
-    
+
   </xsl:template>
 
   <!-- Erlref -->
@@ -763,7 +1073,7 @@
         <fo:marker marker-class-name="chapter-title">
           <xsl:value-of select="module"/>
         </fo:marker>
-        <xsl:value-of select="module"/>                  
+        <xsl:value-of select="module"/>
       </fo:block>
       <xsl:text>Erlang module</xsl:text>
     </fo:block>
@@ -784,7 +1094,7 @@
         <fo:marker marker-class-name="chapter-title">
           <xsl:value-of select="com"/>
         </fo:marker>
-        <xsl:value-of select="com"/>                  
+        <xsl:value-of select="com"/>
       </fo:block>
       <xsl:text>Command</xsl:text>
     </fo:block>
@@ -805,7 +1115,7 @@
         <fo:marker marker-class-name="chapter-title">
           <xsl:value-of select="lib"/>
         </fo:marker>
-        <xsl:value-of select="lib"/>                  
+        <xsl:value-of select="lib"/>
       </fo:block>
       <xsl:text>C Library</xsl:text>
     </fo:block>
@@ -826,7 +1136,7 @@
         <fo:marker marker-class-name="chapter-title">
           <xsl:value-of select="file"/>
         </fo:marker>
-        <xsl:value-of select="file"/>                  
+        <xsl:value-of select="file"/>
       </fo:block>
       <xsl:text>Name</xsl:text>
     </fo:block>
@@ -847,7 +1157,7 @@
         <fo:marker marker-class-name="chapter-title">
           <xsl:value-of select="app"/>
         </fo:marker>
-        <xsl:value-of select="app"/>                  
+        <xsl:value-of select="app"/>
       </fo:block>
       <xsl:text>Application</xsl:text>
     </fo:block>
@@ -900,9 +1210,7 @@
   <xsl:template match="func">
     <xsl:param name="partnum"/>
 
-    <fo:block xsl:use-attribute-sets="function-name">
-      <xsl:apply-templates select="name"/>
-    </fo:block>
+    <xsl:apply-templates select="name"/>
 
     <xsl:apply-templates select="fsummary|type|desc">
       <xsl:with-param name="partnum" select="$partnum"/>
@@ -914,15 +1222,35 @@
   <xsl:template match="name">
     <xsl:param name="partnum"/>
     <xsl:choose>
+      <!-- @arity is mandatory when referring to a specification -->
+      <xsl:when test="string-length(@arity) > 0">
+        <xsl:call-template name="spec_name"/>
+      </xsl:when>
+      <xsl:when test="ancestor::datatype">
+        <xsl:call-template name="type_name"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <fo:block xsl:use-attribute-sets="function-name">
+          <xsl:call-template name="name">
+            <xsl:with-param name="partnum" select="$partnum"/>
+          </xsl:call-template>
+        </fo:block>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="name">
+    <xsl:param name="partnum"/>
+    <xsl:choose>
       <xsl:when test="ancestor::cref">
         <fo:block id="{generate-id(nametext)}">
-          <xsl:value-of select="ret"/><xsl:text> </xsl:text><xsl:value-of select="nametext"/>        
-        </fo:block>   
+          <xsl:value-of select="ret"/><xsl:text> </xsl:text><xsl:value-of select="nametext"/>
+        </fo:block>
       </xsl:when>
       <xsl:otherwise>
         <fo:block id="{generate-id(.)}">
-          <xsl:value-of select="."/>                  
-        </fo:block>   
+          <xsl:value-of select="."/>
+        </fo:block>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -931,9 +1259,9 @@
   <!-- Type -->
   <xsl:template match="type">
     <xsl:param name="partnum"/>
-    
+
     <fo:block>
-      <xsl:text>Types:</xsl:text>      
+      <xsl:text>Types:</xsl:text>
     </fo:block>
 
     <fo:list-block xsl:use-attribute-sets="type-listblock">
@@ -1001,9 +1329,9 @@
     <xsl:param name="chapnum"/>
     <xsl:variable name="tabnum">
       <xsl:number level="any" from="chapter" count="table"/>
-    </xsl:variable>   
+    </xsl:variable>
     <fo:table xsl:use-attribute-sets="table">
-    <fo:table-body>      
+    <fo:table-body>
       <xsl:apply-templates select="row">
         <xsl:with-param name="chapnum" select="$chapnum"/>
         <xsl:with-param name="tabnum" select="$tabnum"/>
@@ -1107,7 +1435,7 @@
   <xsl:template name="calc-arity">
     <xsl:param name="string"/>
     <xsl:param name="no-of-pars"/>
-   
+
     <xsl:variable name="length">
       <xsl:value-of select="string-length($string)"/>
     </xsl:variable>
@@ -1116,8 +1444,8 @@
       <xsl:when test="$length > 0">
         <xsl:call-template name="calc-arity">
           <xsl:with-param name="string" select="substring-after($string, ',')"/>
-          <xsl:with-param name="no-of-pars" select="$no-of-pars+1"/> 
-        </xsl:call-template>        
+          <xsl:with-param name="no-of-pars" select="$no-of-pars+1"/>
+        </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="$no-of-pars"/>
@@ -1131,9 +1459,9 @@
     <xsl:variable name="str1">
       <xsl:call-template name="remove-paren-1">
         <xsl:with-param name="string" select="$string"/>
-        <xsl:with-param name="start">(</xsl:with-param> 
-        <xsl:with-param name="end">)</xsl:with-param> 
-      </xsl:call-template>    
+        <xsl:with-param name="start">(</xsl:with-param>
+        <xsl:with-param name="end">)</xsl:with-param>
+      </xsl:call-template>
     </xsl:variable>
 
     <xsl:variable name="str2">
@@ -1141,7 +1469,7 @@
         <xsl:with-param name="string" select="$str1"/>
         <xsl:with-param name="start">{</xsl:with-param>
         <xsl:with-param name="end">}</xsl:with-param>
-      </xsl:call-template>    
+      </xsl:call-template>
     </xsl:variable>
 
     <xsl:variable name="str3">
@@ -1149,7 +1477,7 @@
         <xsl:with-param name="string" select="$str2"/>
         <xsl:with-param name="start">[</xsl:with-param>
         <xsl:with-param name="end">]</xsl:with-param>
-      </xsl:call-template>    
+      </xsl:call-template>
     </xsl:variable>
 
     <xsl:value-of select="$str3"/>
@@ -1161,7 +1489,7 @@
     <xsl:param name="string"/>
     <xsl:param name="start"/>
     <xsl:param name="end"/>
-   
+
     <xsl:variable name="tmp1">
       <xsl:value-of select="substring-before($string, $start)"/>
     </xsl:variable>
@@ -1174,7 +1502,7 @@
         <xsl:variable name="retstring">
           <xsl:call-template name="remove-paren">
             <xsl:with-param name="string" select="$tmp2"/>
-          </xsl:call-template>        
+          </xsl:call-template>
         </xsl:variable>
         <xsl:value-of select="concat(concat($tmp1, 'x'), $retstring)"/>
       </xsl:when>
diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
new file mode 100644
index 0000000000..8e81bccd59
--- /dev/null
+++ b/lib/erl_docgen/src/Makefile
@@ -0,0 +1,96 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1996-2010. 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%
+#
+
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+VSN=$(ERL_DOCGEN_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/erl_docgen-$(VSN)
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+MODULES = \
+	otp_specs
+
+HRL_FILES = 
+
+ERL_FILES = $(MODULES:%=%.erl)
+
+TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
+
+APP_FILE = erl_docgen.app
+
+APP_SRC = $(APP_FILE).src
+APP_TARGET = $(EBIN)/$(APP_FILE)
+
+APPUP_FILE = erl_docgen.appup
+
+APPUP_SRC= $(APPUP_FILE).src
+APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+ERL_COMPILE_FLAGS += -I../../xmerl/include
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+debug opt: $(TARGET_FILES)
+
+clean:
+	rm -f $(TARGET_FILES)
+	rm -f core
+
+docs:
+
+
+# ----------------------------------------------------
+# Special Build Targets
+# ----------------------------------------------------
+
+$(APP_TARGET): $(APP_SRC) ../vsn.mk
+	sed -e 's;%VSN%;$(VSN);' $< > $@
+
+$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+	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) $(TARGET_FILES) $(RELSYSDIR)/ebin
+
+release_docs_spec:
+
diff --git a/lib/erl_docgen/src/erl_docgen.app.src b/lib/erl_docgen/src/erl_docgen.app.src
new file mode 100644
index 0000000000..1720464b6d
--- /dev/null
+++ b/lib/erl_docgen/src/erl_docgen.app.src
@@ -0,0 +1,12 @@
+{application, erl_docgen,
+ [{description, "Misc tools for building documentation"},
+  {vsn, "%VSN%"},
+  {modules, [otp_specs
+	    ]
+  },
+  {registered,[]},
+  {applications, [kernel,stdlib]},
+  {env, []
+  }
+ ]
+}.
diff --git a/lib/erl_docgen/src/erl_docgen.appup.src b/lib/erl_docgen/src/erl_docgen.appup.src
new file mode 100644
index 0000000000..54a63833e6
--- /dev/null
+++ b/lib/erl_docgen/src/erl_docgen.appup.src
@@ -0,0 +1 @@
+{"%VSN%",[],[]}.
diff --git a/lib/erl_docgen/src/otp_specs.erl b/lib/erl_docgen/src/otp_specs.erl
new file mode 100644
index 0000000000..728ddb2e6e
--- /dev/null
+++ b/lib/erl_docgen/src/otp_specs.erl
@@ -0,0 +1,701 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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(otp_specs).
+
+-export([module/2, package/2, overview/2, type/1]).
+
+-include("xmerl.hrl").
+
+-define(XML_EXPORT, xmerl_xml).
+-define(DEFAULT_XML_EXPORT, ?XML_EXPORT).
+-define(DEFAULT_PP, erl_pp).
+-define(IND(N), #xmlText{value="\n" ++ lists:duplicate(N, $\s)}).
+-define(NL, "\n").
+
+module(Element, Options) ->
+    XML = layout_module(Element, init_opts(Options)),
+    Export = proplists:get_value(xml_export, Options,
+				 ?DEFAULT_XML_EXPORT),
+    xmerl:export_simple(XML, Export, [#xmlAttribute{name=prolog,
+                                                    value=""}]).
+
+-record(opts, {pretty_print, file_suffix}).
+
+init_opts(Options) ->
+    #opts{pretty_print = proplists:get_value(pretty_print,
+                                             Options, ?DEFAULT_PP),
+          %% It *is* depending on edoc.hrl!
+          file_suffix = proplists:get_value(file_suffix, Options, ".html")}.
+
+layout_module(#xmlElement{name = module, content = Es}=E, Opts) ->
+    Name = get_attrval(name, E),
+    Functions = [{function_name(Elem), Elem} ||
+                    Elem <- get_content(functions, Es)],
+    Types = [{type_name(Elem), Elem} || Elem <- get_content(typedecls, Es)],
+    Body = [{module,
+             [{name,[Name]}],
+             ([?NL] ++ types(lists:sort(Types), Opts)
+              ++ functions(lists:sort(Functions), Opts)
+              ++ timestamp())}],
+    Body.
+
+timestamp() ->
+    [{timestamp, [io_lib:fwrite("Generated by EDoc, ~s, ~s.",
+                                [edoc_lib:datestr(date()),
+                                 edoc_lib:timestr(time())])]},?NL].
+
+functions(Fs, Opts) ->
+    lists:flatmap(fun ({Name, E}) -> function(Name, E, Opts) end, Fs).
+
+function(Name, #xmlElement{content = Es}, Opts) ->
+    TS = get_content(typespec, Es),
+    Spec = typespec(TS, Opts),
+    [{spec,(Name
+            ++ [?IND(2),{contract,Spec}]
+            ++ typespec_annos(TS))},
+     ?NL].
+
+function_name(E) ->
+    [] = get_attrval(module, E),
+    [?IND(2),{name,[atom(get_attrval(name, E))]},
+     ?IND(2),{arity,[get_attrval(arity, E)]}].
+
+label_anchor(Content, E) ->
+    case get_attrval(label, E) of
+	"" -> Content;
+	Ref -> [{marker, [{id, Ref}], Content}]
+    end.
+
+typespec([], _Opts) -> [];
+typespec(Es, Opts) ->
+    {Head, LDefs} = collect_clause(Es, Opts),
+    clause(Head, LDefs) ++ [?IND(2)].
+
+collect_clause(Es, Opts) ->
+    Name = t_name(get_elem(erlangName, Es)),
+    Defs = get_elem(localdef, Es),
+    [Type] = get_elem(type, Es),
+    {format_spec(Name, Type, Opts), collect_local_defs(Defs, Opts)}.
+
+clause(Head, LDefs) ->
+    FC = [?IND(6),{head,Head}] ++ local_clause_defs(LDefs),
+    [?IND(4),{clause,FC}].
+
+local_clause_defs([]) -> [];
+local_clause_defs(LDefs) ->
+    LocalDefs = [{subtype,T} || T <- coalesce_local_defs(LDefs, [])],
+    [?IND(6),{guard,margin(8, LocalDefs)}].
+
+types(Ts, Opts) ->
+    lists:flatmap(fun ({Name, E}) -> typedecl(Name, E, Opts) end, Ts).
+
+typedecl(Name, E=#xmlElement{content = Es}, Opts) ->
+    TD = get_content(typedef, Es),
+    TypeDef = typedef(E, TD, Opts),
+    [{type,(Name
+            ++ [?IND(2),{typedecl, TypeDef}]
+            ++ typedef_annos(TD))},
+      ?NL].
+
+type_name(#xmlElement{content = Es}) ->
+    Typedef = get_content(typedef, Es),
+    [E] = get_elem(erlangName, Typedef),
+    Args = get_content(argtypes, Typedef),
+    [] = get_attrval(module, E),
+    [?IND(2),{name,[atom(get_attrval(name, E))]},
+     ?IND(2),{n_vars,[integer_to_list(length(Args))]}].
+
+typedef(E, Es, Opts) ->
+    Ns = get_elem(erlangName, Es),
+    Name =
+        ([t_name(Ns), "("]
+         ++ seq(fun t_utype_elem/1, get_content(argtypes, Es), [")"])),
+    LDefs = collect_local_defs(get_elem(localdef, Es), Opts),
+    TypeHead = case get_elem(type, Es) of
+                   [] -> label_anchor(Name, E);
+                   Type -> (label_anchor(Name, E)
+                            ++ format_type(Name, Type, Opts))
+               end,
+    ([?IND(6),{typehead,TypeHead}]
+     ++ local_type_defs(LDefs, [])).
+
+local_type_defs([], _) -> [];
+local_type_defs(LDefs, Last) ->
+    LocalDefs = [{local_def,T} || T <- coalesce_local_defs(LDefs, Last)],
+    [?IND(6),{local_defs,margin(8, LocalDefs)}].
+
+collect_local_defs(Es, Opts) ->
+    [collect_localdef(E, Opts) || E <- Es].
+
+collect_localdef(E = #xmlElement{content = Es}, Opts) ->
+    Name = case get_elem(typevar, Es) of
+               [] ->
+                   label_anchor(N0 = t_abstype(get_content(abstype, Es)), E);
+               [V] ->
+                   N0 = t_var(V)
+           end,
+    {Name,N0,format_type(N0, get_elem(type, Es), Opts)}.
+
+%% "A = t(), B = t()" is coalesced into "A = B = t()".
+%% Names as B above are kept, but the formated string is empty.
+coalesce_local_defs([], _Last) ->
+    [];
+coalesce_local_defs([{Name,N0,TypeS} | L], Last) when Name =:= N0 ->
+    cld(L, [{Name,N0}], TypeS, Last);
+coalesce_local_defs([{Name,N0,TypeS} | L], Last) ->
+    [local_def(N0, Name, TypeS, Last, L) | coalesce_local_defs(L, Last)].
+
+cld([{Name,N0,TypeS} | L], Names, TypeS, Last) when Name =:= N0 ->
+    cld(L, [{Name,N0} | Names], TypeS, Last);
+cld(L, Names0, TypeS, Last) ->
+    Names = [{_,Name0} | Names1] = lists:reverse(Names0),
+    NS = join([N || {N,_} <- Names], [" = "]),
+    ([local_def(Name0, NS, TypeS, Last, L) |
+      [local_def(N0, "", "", [], L) || {_,N0} <- Names1]]
+     ++ coalesce_local_defs(L, Last)).
+
+local_def(Name, NS, TypeS, Last, L) ->
+    [{typename,Name},{string,NS ++ TypeS ++ [Last || L =:= []]}].
+
+%% join([], Sep) when is_list(Sep) ->
+%%     [];
+join([H|T], Sep) ->
+    H ++ lists:append([Sep ++ X || X <- T]).
+
+%% Use the default formatting of EDoc, which creates references, and
+%% then insert newlines and indentation according to erl_pp (the
+%% (fast) Erlang pretty printer).
+format_spec(Name, Type, #opts{pretty_print = erl_pp}=Opts) ->
+    try
+        L = t_clause(Name, Type),
+        O = pp_clause(Name, Type),
+        {R, ".\n"} = diaf(L, O, Opts),
+        R
+    catch _:_ ->
+        %% Example: "@spec ... -> record(a)"
+        format_spec(Name, Type, Opts#opts{pretty_print=default})
+    end;
+format_spec(Sep, Type, _Opts) ->
+    t_clause(Sep, Type).
+
+t_clause(Name, Type) ->
+    #xmlElement{content = [#xmlElement{name = 'fun', content = C}]} = Type,
+    [Name] ++ t_fun(C).
+
+pp_clause(Pre, Type) ->
+    Types = ot_utype([Type]),
+    Atom = lists:duplicate(iolist_size(Pre), $a),
+    L1 = erl_pp:attribute({attribute,0,spec,{{list_to_atom(Atom),0},[Types]}}),
+    "-spec " ++ L2 = lists:flatten(L1),
+    L3 = Pre ++ lists:nthtail(length(Atom), L2),
+    re:replace(L3, "\n      ", "\n", [{return,list},global]).
+
+format_type(Name, Type, #opts{pretty_print = erl_pp}=Opts) ->
+    try
+        L = t_utype(Type),
+        O = pp_type(Name, Type),
+        {R, ".\n"} = diaf(L, O, Opts),
+        [" = "] ++ R
+    catch _:_ ->
+        %% Example: "t() = record(a)."
+        format_type(Name, Type, Opts#opts{pretty_print=default})
+    end;
+format_type(_Name, Type, _Opts) ->
+    [" = "] ++ t_utype(Type).
+
+pp_type(Prefix, Type) ->
+    Atom = list_to_atom(lists:duplicate(iolist_size(Prefix), $a)),
+    L1 = erl_pp:attribute({attribute,0,type,{Atom,ot_utype(Type),[]}}),
+    {L2,N} = case lists:dropwhile(fun(C) -> C =/= $: end, lists:flatten(L1)) of
+                 ":: " ++ L3 -> {L3,9}; % compensation for extra "()" and ":"
+                 "::\n" ++ L3 -> {"\n"++L3,6}
+             end,
+    Ss = lists:duplicate(N, $\s),
+    re:replace(L2, "\n"++Ss, "\n", [{return,list},global]).
+
+diaf(L, O0, Opts) ->
+    {R0, O} = diaf(L, [], O0, [], Opts),
+    R1 = rewrite_some_predefs(lists:reverse(R0)),
+    R = indentation(lists:flatten(R1)),
+    {R, O}.
+
+diaf([C | L], St, [C | O], R, Opts) ->
+    diaf(L, St, O, [[C] | R], Opts);
+diaf(" "++L, St, O, R, Opts) ->
+    diaf(L, St, O, R, Opts);
+diaf("", [Cs | St], O, R, Opts) ->
+    diaf(Cs, St, O, R, Opts);
+diaf("", [], O, R, _Opts) ->
+    {R, O};
+diaf(L, St, " "++O, R, Opts) ->
+    diaf(L, St, O, [" " | R], Opts);
+diaf(L, St, "\n"++O, R, Opts) ->
+    Ss = lists:takewhile(fun(C) -> C =:= $\s end, O),
+    diaf(L, St, lists:nthtail(length(Ss), O), ["\n"++Ss | R], Opts);
+diaf([{seealso, HRef0, S0} | L], St, O0, R, Opts) ->
+    {S, O} = diaf(S0, app_fix(O0), Opts),
+    HRef = fix_mod_ref(HRef0, Opts),
+    diaf(L, St, O, [{seealso, HRef, S} | R], Opts);
+diaf("="++L, St, "::"++O, R, Opts) ->
+    %% EDoc uses "=" for record field types; Dialyzer uses "::". Maybe
+    %% there should be an option for this, possibly affecting other
+    %% similar discrepancies.
+    diaf(L, St, O, ["=" | R], Opts);
+diaf([Cs | L], St, O, R, Opts) ->
+    diaf(Cs, [L | St], O, R, Opts).
+
+rewrite_some_predefs(S) ->
+    xpredef(lists:flatten(S)).
+
+xpredef([]) ->
+    [];
+xpredef("neg_integer()"++L) ->
+    ["integer() =< -1"] ++ xpredef(L);
+xpredef("non_neg_integer()"++L) ->
+    ["integer() >= 0"] ++ xpredef(L);
+xpredef("pos_integer()"++L) ->
+    ["integer() >= 1"] ++ xpredef(L);
+xpredef([T | Es]) when is_tuple(T) ->
+    [T | xpredef(Es)];
+xpredef([E | Es]) ->
+    [[E] | xpredef(Es)].
+
+indentation([]) ->
+    [];
+indentation([$\n|L]) ->
+    [{br,[]}|indent(L)];
+indentation([T | Es]) when is_tuple(T) ->
+    [T | indentation(Es)];
+indentation([E|L]) ->
+    [[E]|indentation(L)].
+
+indent([$\s|L]) ->
+    [{nbsp,[]}|indent(L)];
+indent(L) ->
+    indentation(L).
+
+app_fix(L) ->
+    try
+        {"//" ++ R1,L2} = app_fix(L, 1),
+        [App, Mod] = string:tokens(R1, "/"),
+        "//" ++ atom(App) ++ "/" ++ atom(Mod) ++ L2
+    catch _:_ -> L
+    end.
+
+app_fix(L, I) -> % a bit slow
+    {L1, L2} = lists:split(I, L),
+    case erl_scan:tokens([], L1 ++ ". ", 1) of
+        {done, {ok,[{atom,_,Atom}|_],_}, _} -> {atom_to_list(Atom), L2};
+        _ -> app_fix(L, I+1)
+    end.
+
+%% Remove the file suffix from module references.
+fix_mod_ref(HRef, #opts{file_suffix = ""}) ->
+    HRef;
+fix_mod_ref([{marker, S}]=HRef0, #opts{file_suffix = FS}) ->
+    {A, B} = lists:splitwith(fun(C) -> C =/= $# end, S),
+    case lists:member($:, A) of
+        true ->
+            HRef0; % should "save" most application references "http:"
+        false ->
+            case {lists:suffix(FS, A), B} of
+                {true, "#"++_} ->
+                    [{marker, lists:sublist(A, length(A)-length(FS)) ++ B}];
+                _ ->
+                    HRef0
+            end
+    end.
+
+see(E, Es) ->
+    case href(E) of
+	[] -> Es;
+	Ref ->
+	    [{seealso, Ref, Es}]
+    end.
+
+href(E) ->
+    case get_attrval(href, E) of
+	"" -> [];
+	URI ->
+	    [{marker, URI}]
+    end.
+
+atom(String) ->
+    io_lib:write_atom(list_to_atom(String)).
+
+t_name([E]) ->
+    N = get_attrval(name, E),
+    case get_attrval(module, E) of
+	"" -> atom(N);
+	M ->
+	    S = atom(M) ++ ":" ++ atom(N),
+	    case get_attrval(app, E) of
+		"" -> S;
+		A -> "//" ++ atom(A) ++ "/" ++ S
+	    end
+    end.
+
+t_utype([E]) ->
+    t_utype_elem(E).
+
+t_utype_elem(E=#xmlElement{content = Es}) ->
+    case get_attrval(name, E) of
+	"" -> t_type(Es);
+	Name ->
+	    T = t_type(Es),
+	    case T of
+		[Name] -> T;    % avoid generating "Foo::Foo"
+		T -> [Name] ++ ["::"] ++ T
+	    end
+    end.
+
+t_type([E=#xmlElement{name = typevar}]) ->
+    t_var(E);
+t_type([E=#xmlElement{name = atom}]) ->
+    t_atom(E);
+t_type([E=#xmlElement{name = integer}]) ->
+    t_integer(E);
+t_type([E=#xmlElement{name = range}]) ->
+    t_range(E);
+t_type([E=#xmlElement{name = binary}]) ->
+    t_binary(E);
+t_type([E=#xmlElement{name = float}]) ->
+    t_float(E);
+t_type([#xmlElement{name = nil}]) ->
+    t_nil();
+t_type([#xmlElement{name = list, content = Es}]) ->
+    t_list(Es);
+t_type([#xmlElement{name = nonempty_list, content = Es}]) ->
+    t_nonempty_list(Es);
+t_type([#xmlElement{name = tuple, content = Es}]) ->
+    t_tuple(Es);
+t_type([#xmlElement{name = 'fun', content = Es}]) ->
+    ["fun("] ++ t_fun(Es) ++ [")"];
+t_type([E = #xmlElement{name = record, content = Es}]) ->
+    t_record(E, Es);
+t_type([E = #xmlElement{name = abstype, content = Es}]) ->
+    t_abstype(E, Es);
+t_type([#xmlElement{name = union, content = Es}]) ->
+    t_union(Es).
+
+t_var(E) ->
+    [get_attrval(name, E)].
+
+t_atom(E) ->
+    [get_attrval(value, E)].
+
+t_integer(E) ->
+    [get_attrval(value, E)].
+
+t_range(E) ->
+    [get_attrval(value, E)].
+
+t_binary(E) ->
+    [get_attrval(value, E)].
+
+t_float(E) ->
+    [get_attrval(value, E)].
+
+t_nil() ->
+    ["[]"].
+
+t_list(Es) ->
+    ["["] ++ t_utype(get_elem(type, Es)) ++ ["]"].
+
+t_nonempty_list(Es) ->
+    ["["] ++ t_utype(get_elem(type, Es)) ++ [", ...]"].
+
+t_tuple(Es) ->
+    ["{"] ++ seq(fun t_utype_elem/1, Es, ["}"]).
+
+t_fun(Es) ->
+    ["("] ++ seq(fun t_utype_elem/1, get_content(argtypes, Es),
+		 [") -> "] ++ t_utype(get_elem(type, Es))).
+
+t_record(E, Es) ->
+    Name = ["#"] ++ t_type(get_elem(atom, Es)),
+    case get_elem(field, Es) of
+        [] ->
+            see(E, [Name, "{}"]);
+        Fs ->
+            see(E, Name) ++ ["{"] ++ seq(fun t_field/1, Fs, ["}"])
+    end.
+
+t_field(#xmlElement{content = Es}) ->
+    t_type(get_elem(atom, Es)) ++ [" = "] ++ t_utype(get_elem(type, Es)).
+
+t_abstype(E, Es) ->
+    Name = t_name(get_elem(erlangName, Es)),
+    case get_elem(type, Es) of
+        [] ->
+            see(E, [Name, "()"]);
+        Ts ->
+            see(E, [Name]) ++ ["("] ++ seq(fun t_utype_elem/1, Ts, [")"])
+    end.
+
+t_abstype(Es) ->
+    ([t_name(get_elem(erlangName, Es)), "("]
+     ++ seq(fun t_utype_elem/1, get_elem(type, Es), [")"])).
+
+t_union(Es) ->
+    seq(fun t_utype_elem/1, Es, " | ", []).
+
+seq(F, Es, Tail) ->
+    seq(F, Es, ", ", Tail).
+
+seq(F, [E], _Sep, Tail) ->
+    F(E) ++ Tail;
+seq(F, [E | Es], Sep, Tail) ->
+    F(E) ++ [Sep] ++ seq(F, Es, Sep, Tail);
+seq(_F, [], _Sep, Tail) ->
+    Tail.
+
+get_elem(Name, [#xmlElement{name = Name} = E | Es]) ->
+    [E | get_elem(Name, Es)];
+get_elem(Name, [_ | Es]) ->
+    get_elem(Name, Es);
+get_elem(_, []) ->
+    [].
+
+get_attr(Name, [#xmlAttribute{name = Name} = A | As]) ->
+    [A | get_attr(Name, As)];
+get_attr(Name, [_ | As]) ->
+    get_attr(Name, As);
+get_attr(_, []) ->
+    [].
+
+get_attrval(Name, #xmlElement{attributes = As}) ->
+    case get_attr(Name, As) of
+	[#xmlAttribute{value = V}] ->
+	    V;
+	[] -> ""
+    end.
+
+get_content(Name, Es) ->
+    case get_elem(Name, Es) of
+	[#xmlElement{content = Es1}] ->
+	    Es1;
+	[] -> []
+    end.
+
+overview(_, _Options) -> [].
+
+package(_, _Options) -> [].
+
+type(_) -> [].
+
+%% ---------------------------------------------------------------------
+
+ot_utype([E]) ->
+    ot_utype_elem(E).
+
+ot_utype_elem(E=#xmlElement{content = Es}) ->
+    case get_attrval(name, E) of
+	"" -> ot_type(Es);
+	N ->
+            Name = {var,0,list_to_atom(N)},
+	    T = ot_type(Es),
+	    case T of
+		Name -> T;
+                T -> {ann_type,0,[Name, T]}
+	    end
+    end.
+
+ot_type([E=#xmlElement{name = typevar}]) ->
+    ot_var(E);
+ot_type([E=#xmlElement{name = atom}]) ->
+    ot_atom(E);
+ot_type([E=#xmlElement{name = integer}]) ->
+    ot_integer(E);
+ot_type([E=#xmlElement{name = range}]) ->
+    ot_range(E);
+ot_type([E=#xmlElement{name = binary}]) ->
+    ot_binary(E);
+ot_type([E=#xmlElement{name = float}]) ->
+    ot_float(E);
+ot_type([#xmlElement{name = nil}]) ->
+    ot_nil();
+ot_type([#xmlElement{name = list, content = Es}]) ->
+    ot_list(Es);
+ot_type([#xmlElement{name = nonempty_list, content = Es}]) ->
+    ot_nonempty_list(Es);
+ot_type([#xmlElement{name = tuple, content = Es}]) ->
+    ot_tuple(Es);
+ot_type([#xmlElement{name = 'fun', content = Es}]) ->
+    ot_fun(Es);
+ot_type([#xmlElement{name = record, content = Es}]) ->
+    ot_record(Es);
+ot_type([#xmlElement{name = abstype, content = Es}]) ->
+     ot_abstype(Es);
+ot_type([#xmlElement{name = union, content = Es}]) ->
+    ot_union(Es).
+
+ot_var(E) ->
+    {var,0,list_to_atom(get_attrval(name, E))}.
+
+ot_atom(E) ->
+    {ok, [Atom], _} = erl_scan:string(get_attrval(value, E), 0),
+    Atom.
+
+ot_integer(E) ->
+    {integer,0,list_to_integer(get_attrval(value, E))}.
+
+ot_range(E) ->
+    [I1, I2] = string:tokens(get_attrval(value, E), "."),
+    {type,0,range,[{integer,0,list_to_integer(I1)},
+                   {integer,0,list_to_integer(I2)}]}.
+
+ot_binary(E) ->
+    {Base, Unit} =
+        case string:tokens(get_attrval(value, E), ",:*><") of
+            [] ->
+                {0, 0};
+            ["_",B] ->
+                {list_to_integer(B), 0};
+            ["_","_",U] ->
+                {0, list_to_integer(U)};
+            ["_",B,_,"_",U] ->
+                {list_to_integer(B), list_to_integer(U)}
+        end,
+    {type,0,binary,[{integer,0,Base},{integer,0,Unit}]}.
+
+ot_float(E) ->
+    {float,0,list_to_float(get_attrval(value, E))}.
+
+ot_nil() ->
+    {nil,0}.
+
+ot_list(Es) ->
+    {type,0,list,[ot_utype(get_elem(type, Es))]}.
+
+ot_nonempty_list(Es) ->
+    {type,0,nonempty_list,[ot_utype(get_elem(type, Es))]}.
+
+ot_tuple(Es) ->
+    {type,0,tuple,[ot_utype_elem(E) || E <- Es]}.
+
+ot_fun(Es) ->
+    Range = ot_utype(get_elem(type, Es)),
+    Args = [ot_utype_elem(A) || A <- get_content(argtypes, Es)],
+    {type,0,'fun',[{type,0,product,Args},Range]}.
+
+ot_record(Es) ->
+    {type,0,record,[ot_type(get_elem(atom, Es)) |
+                    [ot_field(F) || F <- get_elem(field, Es)]]}.
+
+ot_field(#xmlElement{content = Es}) ->
+    {type,0,field_type,
+     [ot_type(get_elem(atom, Es)), ot_utype(get_elem(type, Es))]}.
+
+ot_abstype(Es) ->
+    ot_name(get_elem(erlangName, Es),
+            [ot_utype_elem(Elem) || Elem <- get_elem(type, Es)]).
+
+ot_union(Es) ->
+    {type,0,union,[ot_utype_elem(E) || E <- Es]}.
+
+ot_name(Es, T) ->
+    case ot_name(Es) of
+        [Mod, ":", Atom] ->
+            {remote_type,0,[{atom,0,list_to_atom(Mod)},
+                            {atom,0,list_to_atom(Atom)},T]};
+        "tuple" when T =:= [] ->
+            {type,0,tuple,any};
+        Atom ->
+            {type,0,list_to_atom(Atom),T}
+    end.
+
+ot_name([E]) ->
+    Atom = get_attrval(name, E),
+    case get_attrval(module, E) of
+	"" -> Atom;
+	M ->
+	    case get_attrval(app, E) of
+		"" ->
+                    [M, ":", Atom];
+                A ->
+                    ["//"++A++"/" ++ M, ":", Atom] % EDoc only!
+	    end
+    end.
+
+%% Returns exactly those annotations that can be referred to. Note
+%% that a Dialyzer type/spec (currently) can have more annotations
+%% than can be represented by EDoc types. Note also that edoc_dia
+%% has annotated all type variables with themselves.
+typespec_annos([]) -> [?NL];
+typespec_annos([_|Es]) ->
+    annotations(clause_annos(Es)).
+
+clause_annos(Es) ->
+    [annos(get_elem(type, Es)), local_defs_annos(get_elem(localdef, Es))].
+
+typedef_annos(Es) ->
+    annotations([(case get_elem(type, Es) of
+                      [] -> [];
+                      T -> annos(T)
+                  end
+                  ++ lists:flatmap(fun annos_elem/1,
+                                   get_content(argtypes, Es))),
+                 local_defs_annos(get_elem(localdef, Es))]).
+
+local_defs_annos(Es) ->
+    lists:flatmap(fun localdef_annos/1, Es).
+
+localdef_annos(#xmlElement{content = Es}) ->
+    annos(get_elem(type, Es)).
+
+annotations(AnnoL) ->
+    Annos = lists:usort(lists:flatten(AnnoL)),
+    margin(2, Annos).
+
+margin(N, L) ->
+    lists:append([[?IND(N),E] || E <- L]) ++ [?IND(N-2)].
+
+annos([E]) ->
+    annos_elem(E).
+
+annos_elem(E=#xmlElement{content = Es}) ->
+    case get_attrval(name, E) of
+	"" -> annos_type(Es);
+        "..." -> annos_type(Es); % compensate for a kludge in edoc_dia.erl
+	N ->
+            [{anno,[N]} | annos_type(Es)]
+    end.
+
+annos_type([#xmlElement{name = list, content = Es}]) ->
+    annos(get_elem(type, Es));
+annos_type([#xmlElement{name = nonempty_list, content = Es}]) ->
+    annos(get_elem(type, Es));
+annos_type([#xmlElement{name = tuple, content = Es}]) ->
+    lists:flatmap(fun annos_elem/1, Es);
+annos_type([#xmlElement{name = 'fun', content = Es}]) ->
+    (annos(get_elem(type, Es))
+     ++ lists:flatmap(fun annos_elem/1, get_content(argtypes, Es)));
+annos_type([#xmlElement{name = record, content = Es}]) ->
+    lists:append([annos(get_elem(type, Es1)) ||
+                     #xmlElement{content = Es1} <- get_elem(field, Es)]);
+annos_type([#xmlElement{name = abstype, content = Es}]) ->
+    lists:flatmap(fun annos_elem/1, get_elem(type, Es));
+annos_type([#xmlElement{name = union, content = Es}]) ->
+    lists:flatmap(fun annos_elem/1, Es);
+annos_type([E=#xmlElement{name = typevar}]) ->
+    annos_elem(E);
+annos_type(_) ->
+    [].
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index dd74ae9ddd..fb0f5ca0cd 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1,22 +1 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2009-2010. 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%
-#
-
-ERL_DOCGEN_VSN = 0.2
-
-TICKETS	= 
+ERL_DOCGEN_VSN = 0.2.3
diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in
index 7728cb97be..72ac8c7bbf 100644
--- a/lib/erl_interface/configure.in
+++ b/lib/erl_interface/configure.in
@@ -288,13 +288,7 @@ case "$threads_disabled" in
 	        ;;
 	    win32_threads)
 		EI_THREADS="true"	
-		AC_MSG_CHECKING([for __declspec(thread) usability])
-		if test "X$GCC" = "Xyes"; then
-		    AC_MSG_RESULT([no])
-		else
-		    THR_DEFS="$THR_DEFS -DUSE_DECLSPEC_THREAD"
-		    AC_MSG_RESULT([yes])
-		fi
+		THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0500 -DWINVER=0x0500"
 		;;
 	    pthread)	
 		EI_THREADS="true"
diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml
index 9083ae02b0..de4e4b4301 100644
--- a/lib/erl_interface/doc/src/ei.xml
+++ b/lib/erl_interface/doc/src/ei.xml
@@ -581,7 +581,7 @@ ei_x_encode_empty_list(&amp;x);
           <c><![CDATA[term]]></c> union, it is decoded, and the appropriate field
           in <c><![CDATA[term->value]]></c> is set, and <c><![CDATA[*index]]></c> is
           incremented by the term size.</p>
-        <p>The function returns 0 on successful encoding, -1 on error,
+        <p>The function returns 0 on successful decoding, -1 on error,
           and 1 if the term seems alright, but does not fit in the
           <c><![CDATA[term]]></c> structure. If it returns 0, the <c><![CDATA[index]]></c>
           will be incremented, and the <c><![CDATA[term]]></c> contains the
@@ -641,12 +641,14 @@ ei_x_encode_empty_list(&amp;x);
         <p></p>
         <pre>
 ~a - an atom, char*
+~c - a character, char
 ~s - a string, char*
 ~i - an integer, int
 ~l - a long integer, long int
 ~u - a unsigned long integer, unsigned long int
 ~f - a float, float
 ~d - a double float, double float
+~p - an Erlang PID, erlang_pid*
         </pre>
         <p>For instance, to encode a tuple with some stuff:</p>
         <pre>
diff --git a/lib/erl_interface/doc/src/ei_connect.xml b/lib/erl_interface/doc/src/ei_connect.xml
index abf705f9e2..f562615ddd 100644
--- a/lib/erl_interface/doc/src/ei_connect.xml
+++ b/lib/erl_interface/doc/src/ei_connect.xml
@@ -4,7 +4,7 @@
 <cref>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -54,7 +54,7 @@
       the operation, if the primitive does not complete within the time
       specified, the function will return an error and
       <c><![CDATA[erl_errno]]></c> will be set to <c><![CDATA[ETIMEDOUT]]></c>. With
-      communication primitive is ment an operation on the socket, like
+      communication primitive is meant an operation on the socket, like
       <c><![CDATA[connect]]></c>, <c><![CDATA[accept]]></c>, <c><![CDATA[recv]]></c> or <c><![CDATA[send]]></c>.</p>
     <p>Obviously the timeouts are for implementing fault tolerance,
       not to keep hard realtime promises. The <c><![CDATA[_tmo]]></c> functions
@@ -116,7 +116,7 @@
 int n = 0;
 struct in_addr addr;
 ei_cnode ec;
-addr = inet_addr("150.236.14.75");
+addr.s_addr = inet_addr("150.236.14.75");
 if (ei_connect_xinit(&ec,
                      "chivas",
                      "madonna",
@@ -132,7 +132,7 @@ if (ei_connect_xinit(&ec,
           </p>
         <code type="none"><![CDATA[
 if (ei_connect_init(&ec, "madonna", "cookie...", n++) < 0) {
-    fprintf("ERROR when initializing: %d",erl_errno);
+    fprintf(stderr,"ERROR when initializing: %d",erl_errno);
     exit(-1);
 }
         ]]></code>
@@ -177,7 +177,7 @@ int fd = ei_connect(&ec, NODE);
 
 /*** Variant 2 ***/
 struct in_addr addr;
-addr = inet_addr(IP_ADDR);
+addr.s_addr = inet_addr(IP_ADDR);
 fd = ei_xconnect(&ec, &addr, ALIVE);
         ]]></code>
       </desc>
@@ -508,7 +508,7 @@ if (ei_decode_version(result.buff, &index) < 0
           same as the port number that was previously bound to the socket.</p>
         <p><c><![CDATA[addr]]></c> is the 32-bit IP address of the local host.</p>
         <p>To unregister with epmd, simply close the returned
-          descriptor. See also <c><![CDATA[ei_unpublish()]]></c>.</p>
+          descriptor. Do not use <c><![CDATA[ei_unpublish()]]></c>, which is deprecated anyway.</p>
         <p>On success, the functions return a descriptor connecting the
           calling process to epmd. On failure, they return -1 and set
           <c><![CDATA[erl_errno]]></c> to <c><![CDATA[EIO]]></c>.</p>
@@ -558,18 +558,21 @@ typedef struct {
     </func>
     <func>
       <name><ret>int</ret><nametext>ei_unpublish(ei_cnode *ec)</nametext></name>
-      <fsummary>Unpublish a node name</fsummary>
+      <fsummary>Forcefully unpublish a node name</fsummary>
       <desc>
         <p>This function can be called by a process to unregister a
-          specified node from epmd on the localhost. This may be
-          useful, for example, when epmd has not detected the failure of a
-          node, and will not allow the name to be reused. If you use this
-          function to unregister your own process, be sure to also close
-          the descriptor that was returned by <c><![CDATA[ei_publish()]]></c>.</p>
-        <note>
-          <p>Careless use of this function may have unpredictable
-            results, if the registered node is in fact still running.</p>
-        </note>
+          specified node from epmd on the localhost. This is however usually not 
+	  allowed, unless epmd was started with the -relaxed_command_check 
+	  flag, which it normally isn't.</p>
+
+	  <p>To unregister a node you have published, you should
+	  close the descriptor that was returned by  
+	  <c><![CDATA[ei_publish()]]></c>.</p> 
+
+        <warning>
+          <p>This function is deprecated and will be removed in a future 
+	  release.</p>
+        </warning>
         <p><c><![CDATA[ec]]></c> is the node structure of the node to unregister.</p>
         <p>If the node was successfully unregistered from epmd, the
           function returns 0. Otherwise, it returns -1 and sets
diff --git a/lib/erl_interface/doc/src/erl_connect.xml b/lib/erl_interface/doc/src/erl_connect.xml
index b2235925b2..bd5e637244 100644
--- a/lib/erl_interface/doc/src/erl_connect.xml
+++ b/lib/erl_interface/doc/src/erl_connect.xml
@@ -4,7 +4,7 @@
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -451,7 +451,7 @@ typedef struct {
         <p><c><![CDATA[port]]></c> is the local name to register, and should be the
           same as the port number that was previously bound to the socket.</p>
         <p>To unregister with epmd, simply close the returned
-          descriptor. See also <c><![CDATA[erl_unpublish()]]></c>.
+          descriptor.
           </p>
         <p>On success, the functions return a descriptor connecting the
           calling process to epmd. On failure, they return -1 and set
@@ -507,21 +507,24 @@ typedef struct {
     </func>
     <func>
       <name><ret>int</ret><nametext>erl_unpublish(alive)</nametext></name>
-      <fsummary>Unpublish a node name</fsummary>
+      <fsummary>Forcefully unpublish a node name</fsummary>
       <type>
         <v>char *alive;</v>
       </type>
       <desc>
-        <p>This function can be called by a process to unregister a
-          specified node name from epmd on the localhost. This may be
-          useful, for example, when epmd has not detected the failure of a
-          node, and will not allow the name to be reused. If you use this
-          function to unregister your own process, be sure to also close
-          the descriptor that was returned by <c><![CDATA[erl_publish()]]></c>.</p>
-        <note>
-          <p>Careless use of this function may have unpredictable
-            results, if the registered node is in fact still running.</p>
-        </note>
+       <p>This function can be called by a process to unregister a
+          specified node from epmd on the localhost. This is however usually not 
+	  allowed, unless epmd was started with the -relaxed_command_check 
+	  flag, which it normally isn't.</p>
+
+	  <p>To unregister a node you have published, you should instead
+	  close the descriptor that was returned by  
+	  <c><![CDATA[ei_publish()]]></c>.</p> 
+
+        <warning>
+          <p>This function is deprecated and will be removed in a future 
+	  release.</p>
+        </warning>
         <p><c><![CDATA[alive]]></c> is the name of the node to unregister, i.e., the
           first component of the nodename, without the <c><![CDATA[@hostname]]></c>.</p>
         <p>If the node was successfully unregistered from epmd, the
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 14aec4a4d9..de5ba61938 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -30,6 +30,163 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.7.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    erl_call: remove get_hostent</p>
+          <p>
+	    get_hostent does not properly handle IPv4 addresses on
+	    little endian platforms and fails with hostnames
+	    beginning with a number. Remove get_hostent and use
+	    ei_gethostbyname directly since gethostbyname supports
+	    IPv4 addresses.</p>
+          <p>
+	    (Thanks to Michael Santos)</p>
+          <p>
+	    Own Id: OTP-8890</p>
+        </item>
+        <item>
+	    <p> teach ei_x_format to handle unary - and + (Thanks to
+	    Steve Vinoski)</p>
+          <p>
+	    Own Id: OTP-8891</p>
+        </item>
+        <item>
+	    <p>Fix zero byte allocation in registry. (Thanks to
+	    Michael Santos)</p>
+          <p>
+	    Own Id: OTP-8893</p>
+        </item>
+        <item>
+	    <p> Check the length of the node name to prevent an
+	    overflow. Memory error control of ei_alloc_big. (Thanks
+	    to Michael Santos) </p>
+          <p>
+	    Own Id: OTP-8943</p>
+        </item>
+        <item>
+          <p>
+	    erl_term_len() in erl_interface could returned too large
+	    values for integers (since R14B) and too small values for
+	    refs (since R9B).</p>
+          <p>
+	    Own Id: OTP-8945</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.7.1.1</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>
+		The <c>erl_interface</c> tracelevel for erlang messages was incorrect. This has now been fixed.
+	    </p>
+          <p>
+	    Own Id: OTP-8874</p>
+        </item>
+    </list>
+    </section>
+
+</section>
+<section><title>Erl_Interface 3.7.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Removed unused variable in <c>ei_decode_term.c</c>.</p>
+          <p>
+	    Fixed faulty deallocation in <c>erl_call</c>.</p>
+          <p>
+	    Own Id: OTP-8748</p>
+        </item>
+        <item>
+	    <p>ei_connect: correct man page examples (Thanks to
+	    Michael Santos)</p>
+          <p>
+	    Own Id: OTP-8813</p>
+        </item>
+        <item>
+	    <p>ei: prevent overflow in <c>ei_connect_init</c> and
+	    <c>ei_xconnect</c></p> <p>Add length check of the buffer
+	    before copying. (Thanks to Michael Santos)</p>
+          <p>
+	    Own Id: OTP-8814</p>
+        </item>
+        <item>
+	    <p>Remove DECLSPEC feature which fails on Windows Vista
+	    and use the fallback implementation instead.</p>
+          <p>
+	    Own Id: OTP-8826</p>
+        </item>
+        <item>
+	    <p>erl_call: fix multiple buffer overflows (Thanks to
+	    Michael Santos)</p>
+          <p>
+	    Own Id: OTP-8827</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Fix incorrect writev iovec buffer handling in
+	    <c>erl_interface</c> (Thanks to Steve Vinoski)</p>
+          <p>
+	    Own Id: OTP-8837</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.7</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>compact IEEE 754 double encoding in external binary
+	    format for ei</p> <list><item><p>Implement the compact
+	    IEEE 754 double encoding in external binary format for
+	    ei. Encoding for ei now always produces the NEW_FLOAT_EXT
+	    format. Decoding and term printing handle both the old
+	    ERL_FLOAT_EXT encoding and the new NEW_FLOAT_EXT
+	    encoding. </p></item> <item><p>Legacy erl_interface code
+	    also handles the new encoding, but still produces the
+	    ERL_FLOAT_EXT encoding by default.</p></item>
+	    <item><p>Also enable the DFLAG_NEW_FLOATS distribution
+	    flag.</p></item> <item><p>ei_get_type() will return
+	    ERL_FLOAT_EXT regardless if the external format is
+	    encoded with ERL_FLOAT_EXT or NEW_FLOAT_EXT for
+	    doubles.</p></item> <item><p>Reduce the number of copies
+	    of the code for encoding and decoding doubles throughout
+	    ei and erl_interface by instead calling the ei encoding
+	    and decoding functions wherever possible.</p></item>
+	    <item><p>Restore commented-out float tests in
+	    ei_decode_SUITE and ei_encode_SUITE in
+	    lib/erl_interface/test. Modify them to make them match
+	    the style of other tests in the same suites.</p></item>
+	    </list> <p>These changes are based on an ei float patch
+	    from Serge Aleynikov originally submitted against R12B-2
+	    in July 2008 and reworked by Steve Vinoski May 2010.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8684</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.6.5</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/erl_interface/include/ei.h b/lib/erl_interface/include/ei.h
index d1a697615a..ae815b414a 100644
--- a/lib/erl_interface/include/ei.h
+++ b/lib/erl_interface/include/ei.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1998-2010. 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%
  */
 #ifndef EI_H
@@ -80,21 +80,24 @@
 #define ERL_NO_TIMEOUT -1
 
 /* these are the control message types */
-#define ERL_LINK          1
-#define ERL_SEND          2
-#define ERL_EXIT          3
-#define ERL_UNLINK        4
-#define ERL_NODE_LINK     5
-#define ERL_REG_SEND      6
-#define ERL_GROUP_LEADER  7
-#define ERL_EXIT2         8
-#define ERL_PASS_THROUGH      'p'
+#define ERL_LINK           1
+#define ERL_SEND           2
+#define ERL_EXIT           3
+#define ERL_UNLINK         4
+#define ERL_NODE_LINK      5
+#define ERL_REG_SEND       6
+#define ERL_GROUP_LEADER   7
+#define ERL_EXIT2          8
+#define ERL_PASS_THROUGH  'p'
 
 /* new ones for tracing, from Kenneth */
-#define ERL_SEND_TT      12
-#define ERL_EXIT_TT      13
-#define ERL_REG_SEND_TT  16
-#define ERL_EXIT2_TT     18
+#define ERL_SEND_TT        12
+#define ERL_EXIT_TT        13
+#define ERL_REG_SEND_TT    16
+#define ERL_EXIT2_TT       18
+#define ERL_MONITOR_P      19
+#define ERL_DEMONITOR_P    20
+#define ERL_MONITOR_P_EXIT 21
 
 
 /* -------------------------------------------------------------------- */
@@ -110,6 +113,7 @@
 #define ERL_SMALL_INTEGER_EXT 'a'
 #define ERL_INTEGER_EXT       'b'
 #define ERL_FLOAT_EXT         'c'
+#define NEW_FLOAT_EXT         'F'
 #define ERL_ATOM_EXT          'd'
 #define ERL_REFERENCE_EXT     'e'
 #define ERL_NEW_REFERENCE_EXT 'r'
@@ -718,11 +722,9 @@ int ei_x_encode_bignum(ei_x_buff *x, mpz_t obj);
 #define EI_LONGLONG __int64
 #define EI_ULONGLONG unsigned __int64
 #else
-#ifndef VXWORKS
 #define EI_LONGLONG long long
 #define EI_ULONGLONG unsigned long long
 #endif
-#endif
 
 #ifndef VXWORKS
 int ei_decode_longlong(const char *buf, int *index, EI_LONGLONG *p);
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index d2d0a7e7c1..6dc6ebb348 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2000-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2000-2010. 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%
  */
 /*
@@ -366,16 +366,16 @@ static int initWinSock(void)
     WORD wVersionRequested;  
     WSADATA wsaData; 
     int i; 
-    /* FIXME problem for threaded ? */ 
-    static int initialized = 0;
+
+    static LONG volatile initialized = 0;
     
     wVersionRequested = MAKEWORD(1, 1); 
-    if (!initialized) {
-	initialized = 1;
+    if (InterlockedCompareExchange((LPLONG) &initialized,1L,0L) == 0L) {
 	/* FIXME not terminate, just a message?! */
 	if ((i = WSAStartup(wVersionRequested, &wsaData))) {
 	    EI_TRACE_ERR1("ei_connect_init",
 			  "ERROR: can't initialize windows sockets: %d",i);
+	    initialized = 2L;
 	    return 0;
 	}
 	
@@ -383,10 +383,14 @@ static int initWinSock(void)
 	    EI_TRACE_ERR0("initWinSock","ERROR: this version of windows "
 			  "sockets not supported");
 	    WSACleanup(); 
+	    initialized = 2L;
 	    return 0;
 	}
+	initialized = 3L;
+    } else while (initialized < 2) {
+	SwitchToThread();
     }
-    return 1;
+    return (int) (initialized - 2);
 }
 #endif
 
@@ -502,10 +506,14 @@ int ei_connect_init(ei_cnode* ec, const char* this_node_name,
 	return ERL_ERROR;
     }
 
-    if (this_node_name == NULL)
+    if (this_node_name == NULL) {
 	sprintf(thisalivename, "c%d", (int) getpid());
-    else
+    } else if (strlen(this_node_name) >= sizeof(thisalivename)) {
+	EI_TRACE_ERR0("ei_connect_init","ERROR: this_node_name too long");
+	return ERL_ERROR;
+    } else {
 	strcpy(thisalivename, this_node_name);
+    }
     
     if ((hp = ei_gethostbyname(thishostname)) == 0) {
 	/* Looking up IP given hostname fails. We must be on a standalone
@@ -930,7 +938,7 @@ int ei_do_receive_msg(int fd, int staticbuffer_p,
 	return ERL_ERROR;
     }
     x->index = x->buffsz;
-    switch (msg->msgtype) {	/* FIXME are these all? */
+    switch (msg->msgtype) {	/* FIXME does not handle trace tokens and monitors */
     case ERL_SEND:
     case ERL_REG_SEND:
     case ERL_LINK:
@@ -938,7 +946,6 @@ int ei_do_receive_msg(int fd, int staticbuffer_p,
     case ERL_GROUP_LEADER:
     case ERL_EXIT:
     case ERL_EXIT2:
-    case ERL_NODE_LINK:
 	return ERL_MSG;
 	
     default:
@@ -1321,9 +1328,11 @@ static int send_name_or_challenge(int fd, char *nodename,
     put8(s, 'n');
     put16be(s, version);
     put32be(s, (DFLAG_EXTENDED_REFERENCES
+		| DFLAG_DIST_MONITOR
 		| DFLAG_EXTENDED_PIDS_PORTS
 		| DFLAG_FUN_TAGS
-		| DFLAG_NEW_FUN_TAGS));
+		| DFLAG_NEW_FUN_TAGS
+                | DFLAG_NEW_FLOATS));
     if (f_chall)
 	put32be(s, challenge);
     memcpy(s, nodename, strlen(nodename));
@@ -1393,6 +1402,11 @@ static int recv_challenge(int fd, unsigned *challenge,
 	goto error;
     }
 	    
+    if (!(*flags & DFLAG_NEW_FLOATS)) {
+	EI_TRACE_ERR0("recv_challenge","<- RECV_CHALLENGE peer cannot "
+		      "handle binary float encoding");
+	goto error;
+    }
 
     if (getpeername(fd, (struct sockaddr *) &sin, &sin_len) < 0) {
 	EI_TRACE_ERR0("recv_challenge","<- RECV_CHALLENGE can't get peername");
diff --git a/lib/erl_interface/src/connect/ei_connect_int.h b/lib/erl_interface/src/connect/ei_connect_int.h
index 9926f799df..3c42b49b82 100644
--- a/lib/erl_interface/src/connect/ei_connect_int.h
+++ b/lib/erl_interface/src/connect/ei_connect_int.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2001-2010. 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%
  */
 /*
@@ -101,6 +101,7 @@ extern int h_errno;
 #define DFLAG_FUN_TAGS            16
 #define DFLAG_NEW_FUN_TAGS        0x80
 #define DFLAG_EXTENDED_PIDS_PORTS 0x100
+#define DFLAG_NEW_FLOATS          0x800
 
 ei_cnode   *ei_fd_to_cnode(int fd);
 int         ei_distversion(int fd);
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c
index 42aeab22b1..24a030c468 100644
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -601,7 +601,7 @@ struct hostent *ei_gethostbyaddr_r(const char *addr,
 #ifndef HAVE_GETHOSTBYNAME_R
   return my_gethostbyaddr_r(addr,length,type,hostp,buffer,buflen,h_errnop);
 #else
-#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000))
+#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__))
   struct hostent *result;
 
   gethostbyaddr_r(addr, length, type, hostp, buffer, buflen, &result,
@@ -628,7 +628,7 @@ struct hostent *ei_gethostbyname_r(const char *name,
 #ifndef HAVE_GETHOSTBYNAME_R
   return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
 #else
-#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000))
+#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__))
   struct hostent *result;
 
   gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);
diff --git a/lib/erl_interface/src/connect/eirecv.c b/lib/erl_interface/src/connect/eirecv.c
index 51fc32d65c..86852f947d 100644
--- a/lib/erl_interface/src/connect/eirecv.c
+++ b/lib/erl_interface/src/connect/eirecv.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2010. 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
@@ -107,7 +107,7 @@ ei_recv_internal (int fd,
   
   switch (msg->msgtype) {
   case ERL_SEND:          /* { SEND, Cookie, ToPid } */
-    if (ei_tracelevel > 0) show_this_msg = 1;
+    if (ei_tracelevel >= 4) show_this_msg = 1;
     if (ei_decode_atom(header,&index,msg->cookie) 
 	|| ei_decode_pid(header,&index,&msg->to))
     {
@@ -118,7 +118,7 @@ ei_recv_internal (int fd,
     break;
 
   case ERL_REG_SEND:     /* { REG_SEND, From, Cookie, ToName } */
-    if (ei_tracelevel > 0) show_this_msg = 1;
+    if (ei_tracelevel >= 4) show_this_msg = 1;
     if (ei_decode_pid(header,&index,&msg->from) 
 	|| ei_decode_atom(header,&index,msg->cookie) 
 	|| ei_decode_atom(header,&index,msg->toname))
@@ -133,7 +133,7 @@ ei_recv_internal (int fd,
   case ERL_LINK:         /* { LINK, From, To } */
   case ERL_UNLINK:       /* { UNLINK, From, To } */
   case ERL_GROUP_LEADER: /* { GROUP_LEADER, From, To } */
-    if (ei_tracelevel > 1) show_this_msg = 1;
+    if (ei_tracelevel >= 4) show_this_msg = 1;
     if (ei_decode_pid(header,&index,&msg->from) 
 	|| ei_decode_pid(header,&index,&msg->to))
     {
@@ -145,7 +145,7 @@ ei_recv_internal (int fd,
     
   case ERL_EXIT:         /* { EXIT, From, To, Reason } */
   case ERL_EXIT2:        /* { EXIT2, From, To, Reason } */
-    if (ei_tracelevel > 1) show_this_msg = 1;
+    if (ei_tracelevel >= 4) show_this_msg = 1;
     if (ei_decode_pid(header,&index,&msg->from) 
 	|| ei_decode_pid(header,&index,&msg->to))
     {
@@ -156,7 +156,7 @@ ei_recv_internal (int fd,
     break;
     
   case ERL_SEND_TT:      /* { SEND_TT, Cookie, ToPid, TraceToken } */
-    if (ei_tracelevel > 0) show_this_msg = 1;
+    if (ei_tracelevel >= 4) show_this_msg = 1;
     if (ei_decode_atom(header,&index,msg->cookie) 
 	|| ei_decode_pid(header,&index,&msg->to)
 	|| ei_decode_trace(header,&index,&msg->token))
@@ -169,7 +169,7 @@ ei_recv_internal (int fd,
     break;
 
   case ERL_REG_SEND_TT: /* { REG_SEND_TT, From, Cookie, ToName, TraceToken } */
-    if (ei_tracelevel > 0) show_this_msg = 1;
+    if (ei_tracelevel >= 4) show_this_msg = 1;
     if (ei_decode_pid(header,&index,&msg->from) 
 	|| ei_decode_atom(header,&index,msg->cookie) 
 	|| ei_decode_atom(header,&index,msg->toname)
@@ -184,7 +184,7 @@ ei_recv_internal (int fd,
 
   case ERL_EXIT_TT:     /* { EXIT_TT, From, To, TraceToken, Reason } */
   case ERL_EXIT2_TT:    /* { EXIT2_TT, From, To, TraceToken, Reason } */
-    if (ei_tracelevel > 1) show_this_msg = 1;
+    if (ei_tracelevel >= 4) show_this_msg = 1;
     if (ei_decode_pid(header,&index,&msg->from) 
 	|| ei_decode_pid(header,&index,&msg->to)
 	|| ei_decode_trace(header,&index,&msg->token))
@@ -196,10 +196,6 @@ ei_recv_internal (int fd,
     ei_trace(1,&msg->token); /* turn on tracing */
     break;
 
-  case ERL_NODE_LINK:   /* { NODE_LINK } */
-    if (ei_tracelevel > 1) show_this_msg = 1;
-    break;
-
   default:
     /* unknown type, just put any remaining bytes into buffer */
     break;
diff --git a/lib/erl_interface/src/connect/send.c b/lib/erl_interface/src/connect/send.c
index cd832db4ea..57e32903cf 100644
--- a/lib/erl_interface/src/connect/send.c
+++ b/lib/erl_interface/src/connect/send.c
@@ -87,8 +87,7 @@ int ei_send_encoded_tmo(int fd, const erlang_pid *to,
     put8(s, ERL_PASS_THROUGH);			      /*   1 */
 				/*** sum: 1070 */
 
-    /* FIXME incorrect level */
-    if (ei_tracelevel > 0)
+    if (ei_tracelevel >= 4)
 	ei_show_sendmsg(stderr,header,msg);
 
 #ifdef HAVE_WRITEV
diff --git a/lib/erl_interface/src/connect/send_exit.c b/lib/erl_interface/src/connect/send_exit.c
index 098797c96d..d4e6605a2c 100644
--- a/lib/erl_interface/src/connect/send_exit.c
+++ b/lib/erl_interface/src/connect/send_exit.c
@@ -88,8 +88,7 @@ int ei_send_exit_tmo(int fd, const erlang_pid *from, const erlang_pid *to,
   put32be(s, index - 4);                                /*   4 */
   put8(s, ERL_PASS_THROUGH);                                /*   1 */
                                           /*** sum: len + 1080 */
-  /* FIXME incorrect level */
-  if (ei_tracelevel > 1)
+  if (ei_tracelevel >= 4)
       ei_show_sendmsg(stderr,msgbuf,NULL);
 
   ei_write_fill_t(fd,msgbuf,index,ms); 
diff --git a/lib/erl_interface/src/connect/send_reg.c b/lib/erl_interface/src/connect/send_reg.c
index 8f0e40309c..779b1b8359 100644
--- a/lib/erl_interface/src/connect/send_reg.c
+++ b/lib/erl_interface/src/connect/send_reg.c
@@ -82,8 +82,7 @@ int ei_send_reg_encoded_tmo(int fd, const erlang_pid *from,
     put32be(s, index + msglen - 4);                       /*   4 */
     put8(s, ERL_PASS_THROUGH);                                /*   1 */
                                                 /*** sum: 1336 */
-    /* FIXME incorrect level.... */
-    if (ei_tracelevel > 0) 
+    if (ei_tracelevel >= 4) 
 	ei_show_sendmsg(stderr,header,msg);
 
 #ifdef HAVE_WRITEV
diff --git a/lib/erl_interface/src/decode/decode_atom.c b/lib/erl_interface/src/decode/decode_atom.c
index b247bd4e17..ef28838b79 100644
--- a/lib/erl_interface/src/decode/decode_atom.c
+++ b/lib/erl_interface/src/decode/decode_atom.c
@@ -31,6 +31,8 @@ int ei_decode_atom(const char *buf, int *index, char *p)
 
   len = get16be(s);
 
+  if (len > MAXATOMLEN) return -1;
+
   if (p) {
     memmove(p,s,len); 
     p[len] = (char)0;
diff --git a/lib/erl_interface/src/decode/decode_big.c b/lib/erl_interface/src/decode/decode_big.c
index efe9c6e5d9..b5e9b45a3b 100644
--- a/lib/erl_interface/src/decode/decode_big.c
+++ b/lib/erl_interface/src/decode/decode_big.c
@@ -74,7 +74,7 @@ erlang_big *ei_alloc_big(unsigned int digit_bytes) {
     memset(b,(char)0,sizeof(erlang_big));
     if ( (b->digits = malloc(2*n)) == NULL) {
         free(b);
-        return 0;
+        return NULL;
     }
    
     b->arity = digit_bytes;
diff --git a/lib/erl_interface/src/decode/decode_double.c b/lib/erl_interface/src/decode/decode_double.c
index 66dbe474ec..ed6e39655e 100644
--- a/lib/erl_interface/src/decode/decode_double.c
+++ b/lib/erl_interface/src/decode/decode_double.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1998-2010. 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%
  */
 #include <stdio.h>
@@ -26,14 +26,22 @@ int ei_decode_double(const char *buf, int *index, double *p)
 {
   const char *s = buf + *index;
   const char *s0 = s;
-  double f;
+  FloatExt f;
 
-  if (get8(s) != ERL_FLOAT_EXT) return -1;
-  
-  if (sscanf(s, "%lf", &f) != 1) return -1;
+  switch (get8(s)) {
+    case ERL_FLOAT_EXT:
+      if (sscanf(s, "%lf", &f.d) != 1) return -1;
+      s += 31;
+      break;
+    case NEW_FLOAT_EXT:
+      /* IEEE 754 format */
+      f.val = get64be(s);
+      break;
+    default:
+      return -1;
+  }
 
-  s += 31;
-  if (p) *p = f;
+  if (p) *p = f.d;
   *index += s-s0; 
   return 0; 
 }
diff --git a/lib/erl_interface/src/decode/decode_pid.c b/lib/erl_interface/src/decode/decode_pid.c
index 5f2aec3b44..48a0c68240 100644
--- a/lib/erl_interface/src/decode/decode_pid.c
+++ b/lib/erl_interface/src/decode/decode_pid.c
@@ -33,6 +33,8 @@ int ei_decode_pid(const char *buf, int *index, erlang_pid *p)
   if (get8(s) != ERL_ATOM_EXT) return -1;
 
   len = get16be(s);
+
+  if (len > MAXATOMLEN) return -1;
   
   if (p) {
     memmove(p->node, s, len);
diff --git a/lib/erl_interface/src/decode/decode_port.c b/lib/erl_interface/src/decode/decode_port.c
index 7fb7d8d414..296ebae024 100644
--- a/lib/erl_interface/src/decode/decode_port.c
+++ b/lib/erl_interface/src/decode/decode_port.c
@@ -34,6 +34,8 @@ int ei_decode_port(const char *buf, int *index, erlang_port *p)
 
   len = get16be(s);
 
+  if (len > MAXATOMLEN) return -1;
+
   if (p) {
     memmove(p->node, s, len);
     p->node[len] = (char)0;
diff --git a/lib/erl_interface/src/decode/decode_ref.c b/lib/erl_interface/src/decode/decode_ref.c
index 6fc2cd6533..691b51fe2d 100644
--- a/lib/erl_interface/src/decode/decode_ref.c
+++ b/lib/erl_interface/src/decode/decode_ref.c
@@ -35,6 +35,8 @@ int ei_decode_ref(const char *buf, int *index, erlang_ref *p)
 
       len = get16be(s);
 
+      if (len > MAXATOMLEN) return -1;
+
       if (p) {
 	  memmove(p->node, s, len);
 	  p->node[len] = (char)0;
@@ -62,6 +64,7 @@ int ei_decode_ref(const char *buf, int *index, erlang_ref *p)
       /* then the nodename */
       if (get8(s) != ERL_ATOM_EXT) return -1;
       len = get16be(s);
+      if (len > MAXATOMLEN) return -1;
 
       if (p) {
 	  memmove(p->node, s, len);
diff --git a/lib/erl_interface/src/decode/decode_skip.c b/lib/erl_interface/src/decode/decode_skip.c
index 316b5bee98..f6c5d861ab 100644
--- a/lib/erl_interface/src/decode/decode_skip.c
+++ b/lib/erl_interface/src/decode/decode_skip.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2002-2010. 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%
  */
 #include "eidef.h"
@@ -77,6 +77,7 @@ int ei_skip_term(const char* buf, int* index)
 	if (ei_decode_big(buf, index, NULL) < 0) return -1;
 	break;
     case ERL_FLOAT_EXT:
+    case NEW_FLOAT_EXT:
 	if (ei_decode_double(buf, index, NULL) < 0) return -1;
 	break;
     case ERL_FUN_EXT:
diff --git a/lib/erl_interface/src/encode/encode_double.c b/lib/erl_interface/src/encode/encode_double.c
index 53f3d52ba6..148a49f73a 100644
--- a/lib/erl_interface/src/encode/encode_double.c
+++ b/lib/erl_interface/src/encode/encode_double.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1998-2010. 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%
  */
 #include <stdio.h>
@@ -27,13 +27,13 @@ int ei_encode_double(char *buf, int *index, double p)
   char *s = buf + *index;
   char *s0 = s;
 
-  if (!buf) s ++;
+  if (!buf)
+    s += 9;
   else {
-    put8(s,ERL_FLOAT_EXT);
-    memset(s, 0, 31);
-    sprintf(s, "%.20e", p);
+    /* IEEE 754 format */
+    put8(s, NEW_FLOAT_EXT);
+    put64be(s, ((FloatExt*)&p)->val);
   }
-  s += 31;
 
   *index += s-s0; 
 
diff --git a/lib/erl_interface/src/epmd/ei_epmd.h b/lib/erl_interface/src/epmd/ei_epmd.h
index 40e5ece572..ccacfed244 100644
--- a/lib/erl_interface/src/epmd/ei_epmd.h
+++ b/lib/erl_interface/src/epmd/ei_epmd.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2010. 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
@@ -40,20 +40,13 @@
 #define EI_MYPROTO 0 /* tcp/ip */
 #endif
 
-/* epmd r3 protocol */
-#ifndef EI_EPMD_ALIVE_REQ
-#define EI_EPMD_ALIVE_REQ     'a'
-#define EI_EPMD_ALIVE_OK_RESP 'Y'
-#define EI_EPMD_PORT_REQ      'p'
-#define EI_EPMD_STOP_REQ      's'
-#endif
-
 /* epmd r4 */
 #ifndef EI_EPMD_ALIVE2_REQ
 #define EI_EPMD_ALIVE2_REQ  120
 #define EI_EPMD_ALIVE2_RESP 121
 #define EI_EPMD_PORT2_REQ   122
 #define EI_EPMD_PORT2_RESP  119
+#define EI_EPMD_STOP_REQ      's'
 #endif
 
 /* internal functions */
diff --git a/lib/erl_interface/src/epmd/epmd_port.c b/lib/erl_interface/src/epmd/epmd_port.c
index 663b38d2d4..698c75c217 100644
--- a/lib/erl_interface/src/epmd/epmd_port.c
+++ b/lib/erl_interface/src/epmd/epmd_port.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2010. 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
@@ -92,64 +92,6 @@ int ei_epmd_connect_tmo(struct in_addr *inaddr, unsigned ms)
   return sd;
 }
 
-/* get the given node's listen port using old epmd protocol */
-static int ei_epmd_r3_port (struct in_addr *addr, const char *alive,
-			    unsigned ms)
-{
-  char buf[EPMDBUF];
-  char *s = buf;
-  int len = strlen(alive) + 1;
-  int fd;
-  int port;
-  int res;
-#if defined(VXWORKS)
-  char ntoabuf[32];
-#endif
-  
-  put16be(s,len);
-  put8(s,EI_EPMD_PORT_REQ);
-  strcpy(s,alive);
-
-  /* connect to epmd */
-  if ((fd = ei_epmd_connect_tmo(addr,ms)) < 0) 
-  {
-      /* ei_epmd_connect_tmo() sets erl_errno */
-      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;
-  }
-
-#ifdef VXWORKS
-  /* FIXME use union/macro for level. Correct level? */
-  if (ei_tracelevel > 2) {
-    inet_ntoa_b(*addr,ntoabuf);
-    EI_TRACE_CONN2("ei_epmd_r3_port",
-		   "-> PORT_REQ alive=%s ip=%s",alive,ntoabuf);
-  }
-#else
-  EI_TRACE_CONN2("ei_epmd_r3_port",
-		 "-> PORT_REQ alive=%s ip=%s",alive,inet_ntoa(*addr));
-#endif
-  
-  if ((res = ei_read_fill_t(fd, buf, 2, ms)) != 2) {
-    EI_TRACE_ERR0("ei_epmd_r3_port","<- CLOSE");
-    closesocket(fd);
-    erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-    return -1;
-  }
-  closesocket(fd);
-  s = buf;
-  port = get16be(s);
-
-  EI_TRACE_CONN1("ei_epmd_r3_port","<- PORT_RESP port=%d",port);
-
-  return port;
-}
-
 static int ei_epmd_r4_port (struct in_addr *addr, const char *alive,
 			    int *dist, unsigned ms)
 {
@@ -164,6 +106,12 @@ static int ei_epmd_r4_port (struct in_addr *addr, const char *alive,
 #if defined(VXWORKS)
   char ntoabuf[32];
 #endif
+
+  if (len > sizeof(buf) - 3)
+  {
+      erl_errno = ERANGE;
+      return -1;
+  }
   
   put16be(s,len);
   put8(s,EI_EPMD_PORT2_REQ);
@@ -285,15 +233,6 @@ int ei_epmd_port_tmo (struct in_addr *addr, const char *alive, int *dist,
 {
   int i;
 
-  /* try the new one first, then the old one */
-  i = ei_epmd_r4_port(addr,alive,dist,ms);
-
-  /* -2: new protocol not understood */
-  if (i == -2) {
-    *dist = 0; 
-    i = ei_epmd_r3_port(addr,alive,ms);
-  }
-
-  return i;
+  return ei_epmd_r4_port(addr,alive,dist,ms);
 }
 
diff --git a/lib/erl_interface/src/epmd/epmd_publish.c b/lib/erl_interface/src/epmd/epmd_publish.c
index 09b3dce43b..d45fe644c0 100644
--- a/lib/erl_interface/src/epmd/epmd_publish.c
+++ b/lib/erl_interface/src/epmd/epmd_publish.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2010. 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
@@ -55,62 +55,6 @@
 
 /* publish our listen port and alive name */
 /* return the (useless) creation number */
-static int ei_epmd_r3_publish (int port, const char *alive, unsigned ms)
-{
-  char buf[EPMDBUF];
-  char *s = buf;
-  int fd;
-  int len = strlen(alive) + 3;
-  int res,creation;
-
-  s = buf;
-  put16be(s,len);
-  put8(s,EI_EPMD_ALIVE_REQ);
-  put16be(s,port); 
-  strcpy(s, alive);
-
-  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;
-  }
-
-  EI_TRACE_CONN2("ei_epmd_r3_publish",
-		 "-> ALIVE_REQ alive=%s port=%d",alive,port);
-
-  if ((res = ei_read_fill_t(fd, buf, 3, ms)) != 3) {
-    closesocket(fd);
-    erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-    return -1;
-  }
-
-  s = buf;
-  if ((res=get8(s)) != EI_EPMD_ALIVE_OK_RESP) {
-      EI_TRACE_ERR1("ei_epmd_r3_publish",
-		    "<- ALIVE_NOK result=%d (failure)",res);
-    closesocket(fd);
-    erl_errno = EIO;
-    return -1;
-  }
-
-  creation = get16be(s);
-
-  EI_TRACE_CONN1("ei_epmd_r3_publish","<- ALIVE_OK creation=%d",creation);
-
-  /* Don't close fd here! It keeps us registered with epmd */
-
-  /* probably should save fd so we can close it later... */
-  /* epmd_saveconn(OPEN,fd,alive); */
-
-  /* return the creation number, for no good reason */
-  /* return creation; */
-
-  /* no! return the descriptor */
-  return fd;
-}
-
 /* publish our listen port and alive name */
 /* return the (useless) creation number */
 /* this protocol is a lot more complex than the old one */
@@ -125,6 +69,12 @@ static int ei_epmd_r4_publish (int port, const char *alive, unsigned ms)
   int n;
   int res, creation;
   
+  if (len > sizeof(buf)-2)
+  {
+    erl_errno = ERANGE;
+    return -1;
+  }
+
   s = buf;
   put16be(s,len);
 
@@ -200,15 +150,7 @@ int ei_epmd_publish(int port, const char *alive)
 
 int ei_epmd_publish_tmo(int port, const char *alive, unsigned ms)
 {
-  int i;
-
-  /* try the new one first, then the old one */
-  i = ei_epmd_r4_publish(port,alive, ms);
-
-  /* -2: new protocol not understood */
-  if (i == -2) i = ei_epmd_r3_publish(port,alive, ms);
-
-  return i;
+  return ei_epmd_r4_publish(port,alive, ms);;
 }
 
 
diff --git a/lib/erl_interface/src/epmd/epmd_unpublish.c b/lib/erl_interface/src/epmd/epmd_unpublish.c
index 08662fe1ec..495cbab44c 100644
--- a/lib/erl_interface/src/epmd/epmd_unpublish.c
+++ b/lib/erl_interface/src/epmd/epmd_unpublish.c
@@ -59,6 +59,11 @@ int ei_unpublish_tmo(const char *alive, unsigned ms)
     int len = 1 + strlen(alive);
     int fd, res;
 
+    if (len > sizeof(buf)-3) {
+	erl_errno = ERANGE;
+	return -1;
+    }
+
     put16be(s,len);
     put8(s,EI_EPMD_STOP_REQ);
     strcpy(s, alive);
diff --git a/lib/erl_interface/src/legacy/decode_term.c b/lib/erl_interface/src/legacy/decode_term.c
index ef29d6f57d..796cebdfef 100644
--- a/lib/erl_interface/src/legacy/decode_term.c
+++ b/lib/erl_interface/src/legacy/decode_term.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1998-2010. 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%
  */
 #include "eidef.h"
@@ -59,6 +59,7 @@ int ei_decode_term(const char *buf, int *index, void *t)
       return ei_decode_long(buf,index,NULL);
 
     case ERL_FLOAT_EXT:  
+    case NEW_FLOAT_EXT:
       return ei_decode_double(buf,index,NULL);
 
     case ERL_ATOM_EXT:
diff --git a/lib/erl_interface/src/legacy/erl_connect.c b/lib/erl_interface/src/legacy/erl_connect.c
index 3c8c946506..e77bd5db37 100644
--- a/lib/erl_interface/src/legacy/erl_connect.c
+++ b/lib/erl_interface/src/legacy/erl_connect.c
@@ -180,9 +180,7 @@ int erl_xconnect(Erl_IpAddr addr, char *alivename)
  *
  *  Close a connection. FIXME call ei_close_connection() later. 
  *
- *  Returns valid file descriptor on success and < 0 on failure.
- *  Set erl_errno to EHOSTUNREACH, ENOMEM, EIO or errno from socket(2)
- *  or connect(2).
+ *  Returns 0 on success and -1 on failure.
  *
  ***************************************************************************/
 
@@ -250,7 +248,8 @@ int erl_send(int fd, ETERM *to ,ETERM *msg)
 	return -1;
     }
     
-    strcpy(topid.node, (char *)ERL_PID_NODE(to));
+    strncpy(topid.node, (char *)ERL_PID_NODE(to), sizeof(topid.node));
+    topid.node[sizeof(topid.node)-1] = '\0';
     topid.num = ERL_PID_NUMBER(to);
     topid.serial = ERL_PID_SERIAL(to);
     topid.creation = ERL_PID_CREATION(to);
diff --git a/lib/erl_interface/src/legacy/erl_format.c b/lib/erl_interface/src/legacy/erl_format.c
index 9848e9296a..b17269213f 100644
--- a/lib/erl_interface/src/legacy/erl_format.c
+++ b/lib/erl_interface/src/legacy/erl_format.c
@@ -116,7 +116,7 @@ static lvar *lvar_alloc(void)
   lvar *tmp;
   
   if ((tmp = ef.idle) == NULL) {
-    tmp = (lvar *) malloc(sizeof(lvar)); /* FIXME check result */
+    tmp = (lvar *) erl_malloc(sizeof(lvar));
   }
   else {
     tmp = ef.idle;
diff --git a/lib/erl_interface/src/legacy/erl_marshal.c b/lib/erl_interface/src/legacy/erl_marshal.c
index 4b5f28178f..5cfb5e2124 100644
--- a/lib/erl_interface/src/legacy/erl_marshal.c
+++ b/lib/erl_interface/src/legacy/erl_marshal.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1996-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1996-2010. 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%
  */
 /*
@@ -26,6 +26,7 @@
 #include <ctype.h>
 #include <sys/types.h>
 #include <string.h>
+#include <limits.h>
 
 #include "erl_interface.h"
 #include "erl_marshal.h"
@@ -102,6 +103,7 @@ void erl_init_marshal(void)
     cmp_array[ERL_SMALL_INTEGER_EXT] = 1;
     cmp_array[ERL_INTEGER_EXT]       = 1;
     cmp_array[ERL_FLOAT_EXT]         = 1;
+    cmp_array[NEW_FLOAT_EXT]         = 1;
     cmp_array[ERL_SMALL_BIG_EXT]     = 1;
     cmp_array[ERL_LARGE_BIG_EXT]     = 1;
     cmp_array[ERL_ATOM_EXT]          = 2;
@@ -124,6 +126,7 @@ void erl_init_marshal(void)
     cmp_num_class[ERL_SMALL_INTEGER_EXT] = SMALL;
     cmp_num_class[ERL_INTEGER_EXT]       = SMALL;
     cmp_num_class[ERL_FLOAT_EXT]         = FLOAT;
+    cmp_num_class[NEW_FLOAT_EXT]         = FLOAT;
     cmp_num_class[ERL_SMALL_BIG_EXT]     = BIG;
     cmp_num_class[ERL_LARGE_BIG_EXT]     = BIG;
     init_cmp_num_class_p = 0;
@@ -176,26 +179,14 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
 	return 0;
 
     case ERL_INTEGER:
-	i = ep->uval.ival.i;
-	/* ERL_SMALL_BIG */
-	if ((i > ERL_MAX) || (i < ERL_MIN)) { 
-	    *(*ext)++ = ERL_SMALL_BIG_EXT;
-	    *(*ext)++ = 4;		/* four bytes */
-	    if ((*(*ext)++ = ((i>>31) & 0x01))) /* sign byte  */ 
-	      i = -i;
-	    *(*ext)++ = i  & 0xff;	/* LSB first  */
-	    *(*ext)++ = (i >> 8) & 0xff;
-	    *(*ext)++ = (i >> 16) & 0xff;
-	    *(*ext)++ = (i >> 24) & 0x7f; /* Don't include the sign bit */
-	    return 0;
-	} 
+	i = ep->uval.ival.i;	
 	/* SMALL_INTEGER */
 	if ((i < 256) && (i >= 0)) {
 	    *(*ext)++ = ERL_SMALL_INTEGER_EXT;
 	    *(*ext)++ = i & 0xff;
 	    return 0;
 	}
-	/* INTEGER */
+	/* R14B: Use all 32 bits of INTEGER_EXT */
 	*(*ext)++ = ERL_INTEGER_EXT;
 	*(*ext)++ = (i >> 24) & 0xff;
 	*(*ext)++ = (i >> 16) & 0xff;
@@ -206,23 +197,23 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
     case ERL_U_INTEGER:
 	u = ep->uval.uival.u;
 	/* ERL_U_SMALL_BIG */
-	if (u > ERL_MAX) {
-	*(*ext)++ = ERL_SMALL_BIG_EXT;
-	*(*ext)++ = 4;		/* four bytes */
-	*(*ext)++ = 0;		/* sign byte  */ 
-	*(*ext)++ = u  & 0xff;	/* LSB first  */
-	*(*ext)++ = (u >> 8) & 0xff;
-	*(*ext)++ = (u >> 16) & 0xff;
-	*(*ext)++ = (u >> 24) & 0xff; 
-	return 0;
+	if ((int)u < 0) {
+	    *(*ext)++ = ERL_SMALL_BIG_EXT;
+	    *(*ext)++ = 4;		/* four bytes */
+	    *(*ext)++ = 0;		/* sign byte  */ 
+	    *(*ext)++ = u  & 0xff;	/* LSB first  */
+	    *(*ext)++ = (u >> 8) & 0xff;
+	    *(*ext)++ = (u >> 16) & 0xff;
+	    *(*ext)++ = (u >> 24) & 0xff; 
+	    return 0;
 	}
 	/* SMALL_INTEGER */
-	if ((u < 256) && (u >= 0)) {
+	if (u < 256) {
 	    *(*ext)++ = ERL_SMALL_INTEGER_EXT;
 	    *(*ext)++ = u & 0xff;
 	    return 0;
 	}
-	/* INTEGER */
+	/* R14B: Use all 32 bits of INTEGER_EXT */
 	*(*ext)++ = ERL_INTEGER_EXT;
 	*(*ext)++ = (u >> 24) & 0xff;
 	*(*ext)++ = (u >> 16) & 0xff;
@@ -232,29 +223,28 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
     case ERL_LONGLONG:
 	l = ep->uval.llval.i;
 	/* ERL_SMALL_BIG */
-	if ((l > ((long long) ERL_MAX)) ||
-	    (l < ((long long) ERL_MIN))) { 
-	    *(*ext)++ = ERL_SMALL_BIG_EXT; 
-	    *(*ext)++ = 8;              /* eight bytes */ 
-	    if ((*(*ext)++ = ((l>>63) & 0x01))) /* sign byte  */ 
+	if (l > ((long long) INT_MAX) || l < ((long long) INT_MIN)) {
+	    *(*ext)++ = ERL_SMALL_BIG_EXT;
+	    *(*ext)++ = 8;
+	    if ((*(*ext)++ = (l<0))) /* sign byte  */ 
 	    	l = -l;
-	    *(*ext)++ = l  & 0xff;      /* LSB first  */
+	    *(*ext)++ =  l        & 0xff; /* LSB first  */
 	    *(*ext)++ = (l >>  8) & 0xff;
 	    *(*ext)++ = (l >> 16) & 0xff;
-	    *(*ext)++ = (l >> 24) & 0xff;
-	    *(*ext)++ = (l >> 32) & 0xff;
-	    *(*ext)++ = (l >> 40) & 0xff;
-	    *(*ext)++ = (l >> 48) & 0xff;
-	    *(*ext)++ = (l >> 56) & 0x7f; /* Don't include the sign bit */
+	    *(*ext)++ = (l >> 24) & 0xff; 
+	    *(*ext)++ = (l >> 32) & 0xff; 
+	    *(*ext)++ = (l >> 40) & 0xff; 
+	    *(*ext)++ = (l >> 48) & 0xff; 
+	    *(*ext)++ = (l >> 56) & 0xff; 
 	    return 0;
 	} 
 	/* SMALL_INTEGER */
 	if ((l < 256) && (l >= 0)) {
-	*(*ext)++ = ERL_SMALL_INTEGER_EXT;
-	*(*ext)++ = l & 0xff;
-	return 0;
+	    *(*ext)++ = ERL_SMALL_INTEGER_EXT;
+	    *(*ext)++ = l & 0xff;
+	    return 0;
 	}
-	/* INTEGER */
+	/* R14B: Use all 32 bits of INTEGER_EXT */
 	*(*ext)++ = ERL_INTEGER_EXT;
 	*(*ext)++ = (l >> 24) & 0xff;
 	*(*ext)++ = (l >> 16) & 0xff;
@@ -265,7 +255,7 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
     case ERL_U_LONGLONG:
 	ul = ep->uval.ullval.u;
 	/* ERL_U_SMALL_BIG */
-	if (ul > ((unsigned long long) ERL_MAX)) {
+	if (ul > ((unsigned long long) INT_MAX)) {
 	    *(*ext)++ = ERL_SMALL_BIG_EXT;
 	    *(*ext)++ = 8; /* eight bytes */
 	    *(*ext)++ = 0; /* sign byte  */ 
@@ -285,7 +275,7 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
 	    *(*ext)++ = ul & 0xff;
 	    return 0;
 	}
-	/* INTEGER */
+	/* R14B: Use all 32 bits of INTEGER_EXT */
 	*(*ext)++ = ERL_INTEGER_EXT;
 	*(*ext)++ = (ul >> 24) & 0xff;
 	*(*ext)++ = (ul >> 16) & 0xff;
@@ -521,29 +511,28 @@ static int erl_term_len_helper(ETERM *ep, int dist)
 
     case ERL_INTEGER:
       i = ep->uval.ival.i;
-      if ((i > ERL_MAX) || (i < ERL_MIN)) len = 7;
-      else if ((i < 256) && (i >= 0)) len = 2; 
+      if ((i < 256) && (i >= 0)) len = 2; 
       else len = 5;
       break;
 
     case ERL_U_INTEGER:
       u = ep->uval.uival.u;
-      if (u > ERL_MAX) len = 7;
+      if ((int)u < 0) len = 7;
       else if (u  < 256) len = 2;
       else len = 5;
       break;
 
     case ERL_LONGLONG:
       l = ep->uval.llval.i;
-      if ((l > ((long long) ERL_MAX)) || 
-         (l < ((long long) ERL_MIN))) len = 11;
+      if ((l > ((long long) INT_MAX)) || 
+         (l < ((long long) INT_MIN))) len = 11;
       else if ((l < 256) && (l >= 0)) len = 2; 
       else len = 5;
       break;
 
     case ERL_U_LONGLONG:
       ul = ep->uval.ullval.u;
-      if (ul > ((unsigned long long) ERL_MAX)) len = 11;
+      if (ul > ((unsigned long long) INT_MAX)) len = 11;
       else if (ul  < 256) len = 2;
       else len = 5;
       break;
@@ -556,12 +545,7 @@ static int erl_term_len_helper(ETERM *ep, int dist)
 
     case ERL_REF:
       i = strlen((char *)ERL_REF_NODE(ep));
-      if (dist >= 4 && ERL_REF_LEN(ep) > 1) {
-	  len = 1 + 2 + (i+3) + 1 + ERL_REF_LEN(ep) * 4;
-      } else {
-	  /* 1 + N + 4 + 1 where N = 3 + strlen */
-	  len = 9 + i;
-      }
+      len = 1 + 2 + (i+3) + 1 + ERL_REF_LEN(ep) * 4;
       break;
 
     case ERL_PORT:
@@ -678,7 +662,7 @@ len = i
 #define STATIC_NODE_BUF_SZ 30
 
 #define SET_NODE(node,node_buf,cp,len) \
-if (len >= STATIC_NODE_BUF_SZ) node = malloc(len+1); \
+if (len >= STATIC_NODE_BUF_SZ) node = erl_malloc(len+1); \
 else node = node_buf; \
 memcpy(node, cp, len); \
 node[len] = '\0'
@@ -730,11 +714,6 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	if (arity > 8)             
 	    goto big_truncate;
 
-	if (arity == 8 && ((*ext)[7] & 0x80) && sign) {
-	    /* MSB already occupied ! */
-	    goto big_truncate;
-	}
-
 	if (arity == 4 && ((*ext)[3] & 0x80) && !sign) {
 	    /* It will fit into an unsigned int !! */
 	    u = (((*ext)[3] << 24)|((*ext)[2])<< 16|((*ext)[1]) << 8 |(**ext));
@@ -745,14 +724,10 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	    return ep;
 	} else if (arity == 4 && !((*ext)[3] & 0x80)) {
 	    /* It will fit into an int !! 
-	     * Note: It comes in "one's-complement notation" 
 	     */
-	    if (sign)
-		i = (int) (~(((*ext)[3] << 24) | ((*ext)[2])<< 16 |
-			     ((*ext)[1]) << 8 | (**ext)) | (unsigned int) sign);
-	    else
-		i = (int) (((*ext)[3] << 24) | ((*ext)[2])<< 16 |
-			   ((*ext)[1]) << 8 | (**ext));
+	    i = (int) (((*ext)[3] << 24) | ((*ext)[2])<< 16 |
+		       ((*ext)[1]) << 8 | (**ext));
+	    if (sign) i = -i;
 	    ERL_TYPE(ep) = ERL_INTEGER;
 	    ep->uval.ival.i = i;
 	    *ext += arity;
@@ -778,8 +753,10 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	    for(x = 0 ; x < arity ; x++) {
 		l |= ((long long)(*ext)[x]) << ((long long)(8*x));
 	    }
-
-	    if (sign) l = (long long) (~l | (unsigned long long) sign);
+	    if (sign) {
+		l = -l;
+		if (l > 0) goto big_truncate;
+	    }
 
 	    ERL_TYPE(ep) = ERL_LONGLONG;
 	    ep->uval.llval.i = l;
@@ -1008,10 +985,13 @@ static ETERM *erl_decode_it(unsigned char **ext)
 	return ep;
 
     case ERL_FLOAT_EXT:
+    case NEW_FLOAT_EXT:
 	ERL_TYPE(ep) = ERL_FLOAT;
-	if (sscanf((char *) *ext, "%lf", &ff) != 1)
+	cp = (char *) *ext;
+	i = -1;
+	if (ei_decode_double(cp, &i, &ff) == -1)
 	    goto failure;
-	*ext += 31;
+	*ext += i;
 	ep->uval.fval.f = ff;
 	return ep;
 
@@ -1176,6 +1156,7 @@ unsigned char erl_ext_type(unsigned char *ext)
     case ERL_LARGE_TUPLE_EXT:
 	return ERL_TUPLE;
     case ERL_FLOAT_EXT:
+    case NEW_FLOAT_EXT:
 	return ERL_FLOAT;
     case ERL_BINARY_EXT:
 	return ERL_BINARY;
@@ -1218,6 +1199,7 @@ int erl_ext_size(unsigned char *t)
     case ERL_BINARY_EXT:
     case ERL_STRING_EXT:
     case ERL_FLOAT_EXT:
+    case NEW_FLOAT_EXT:
     case ERL_SMALL_BIG_EXT:
     case ERL_LARGE_BIG_EXT:
 	return 0;
@@ -1332,6 +1314,9 @@ static int jump(unsigned char **ext)
     case ERL_FLOAT_EXT:
 	*ext += 31;
 	break;
+    case NEW_FLOAT_EXT:
+	*ext += 8;
+	break;
     case ERL_BINARY_EXT:
 	i = (**ext << 24) | ((*ext)[1] << 16) |((*ext)[2] << 8) | (*ext)[3];
 	*ext += 4+i;
@@ -1549,7 +1534,7 @@ static int cmp_string_list(unsigned char **e1, unsigned char **e2) {
   if ( e1_len < 256 ) {
     bp = buf;
   } else {
-    bp = malloc(5+(2*e1_len)+1);
+    bp = erl_malloc(5+(2*e1_len)+1);
   }
 
   bp[0] = ERL_LIST_EXT;
@@ -1661,11 +1646,14 @@ static int cmp_exe2(unsigned char **e1, unsigned char **e2)
       min = (i < j) ? i : j;
       k = 0;
       while (1) {
-	if (k++ == min)
-	  return compare_top_ext(e1 , e2);
-	if ((ret = compare_top_ext(e1 , e2)) == 0) 
-	  continue;
-	return ret;
+	  if (k++ == min){
+	      if (i == j) return 0;
+	      if (i < j) return -1;
+	      return 1;
+	  }
+	  if ((ret = compare_top_ext(e1 , e2)) == 0)
+	      continue;
+	  return ret;
       }
     case ERL_STRING_EXT:
       i = (**e1 << 8) | ((*e1)[1]);
@@ -1696,12 +1684,15 @@ static int cmp_exe2(unsigned char **e1, unsigned char **e2)
       }
       return 0;
     case ERL_FLOAT_EXT:
-      if (sscanf((char *) *e1, "%lf", &ff1) != 1)
-	return -1;
-      *e1 += 31;
-      if (sscanf((char *) *e2, "%lf", &ff2) != 1)
-	return -1;
-      *e2 += 31;
+    case NEW_FLOAT_EXT:
+      i = -1;
+      if (ei_decode_double((char *) *e1, &i, &ff1) != 0)
+        return -1;
+      *e1 += i;
+      j = -1;
+      if (ei_decode_double((char *) *e2, &j, &ff2) != 0)
+        return -1;
+      *e2 += j;
       return cmp_floats(ff1,ff2);
 
     case ERL_BINARY_EXT:
@@ -1896,8 +1887,11 @@ static int cmp_big_big(unsigned char**e1, unsigned char **e2)
     ei_get_type((char *)*e1,&i1,&t1,&n1);
     ei_get_type((char *)*e2,&i2,&t2,&n2);
     
-    b1 = ei_alloc_big(n1);
-    b2 = ei_alloc_big(n2);
+    if ( (b1 = ei_alloc_big(n1)) == NULL) return -1;
+    if ( (b2 = ei_alloc_big(n2)) == NULL) {
+        ei_free_big(b1);
+        return 1;
+    }
     
     ei_decode_big((char *)*e1,&i1,b1);
     ei_decode_big((char *)*e2,&i2,b2);
diff --git a/lib/erl_interface/src/legacy/erl_timeout.c b/lib/erl_interface/src/legacy/erl_timeout.c
index af1a4a1f3a..6ef5d258ed 100644
--- a/lib/erl_interface/src/legacy/erl_timeout.c
+++ b/lib/erl_interface/src/legacy/erl_timeout.c
@@ -74,7 +74,7 @@ jmp_buf *timeout_setup(int ms)
   t.it_value.tv_usec = (ms % 1000) * 1000;
 
   /* get a jump buffer and save it */
-  j = malloc(sizeof(*j));	/* FIXME check result */
+  j = erl_malloc(sizeof(*j));
   j->siginfo = s;
   push(j);
 
diff --git a/lib/erl_interface/src/legacy/global_register.c b/lib/erl_interface/src/legacy/global_register.c
index 3a4de8b08e..f12eb6b448 100644
--- a/lib/erl_interface/src/legacy/global_register.c
+++ b/lib/erl_interface/src/legacy/global_register.c
@@ -31,7 +31,7 @@ int erl_global_register(int fd, const char *name, ETERM *pid)
   int index = 0;
   erlang_pid self;
   erlang_msg msg;
-  int needlink, needatom;
+  int needlink, needatom, needmonitor;
   int arity;
   int version;
   int msglen;
@@ -65,7 +65,7 @@ int erl_global_register(int fd, const char *name, ETERM *pid)
   if (ei_send_reg_encoded(fd,&self,"rex",buf,index)) return -1;
 
   /* get the reply: expect link and an atom, or just an atom */
-  needlink = needatom = 1;
+  needlink = needatom = needmonitor = 1;
   while (1) {
     /* get message */
     while (1) {
@@ -78,9 +78,15 @@ int erl_global_register(int fd, const char *name, ETERM *pid)
     case ERL_LINK:
       /* got link */
       if (!needlink) return -1;
-	needlink = 0;
+      needlink = 0;
       break;
       
+    case ERL_MONITOR_P-10:
+      /* got monitor */
+	if (!needmonitor) { return -1;}
+	needmonitor = 0;
+      break;
+
     case ERL_SEND:
       /* got message - does it contain our atom? */
       if (!needatom) return -1;
diff --git a/lib/erl_interface/src/legacy/global_unregister.c b/lib/erl_interface/src/legacy/global_unregister.c
index 514dbc3c68..97a1c2d03c 100644
--- a/lib/erl_interface/src/legacy/global_unregister.c
+++ b/lib/erl_interface/src/legacy/global_unregister.c
@@ -37,7 +37,7 @@ int erl_global_unregister(int fd, const char *name)
   erlang_msg msg;
   int i;
   int version,arity,msglen;
-  int needunlink, needatom;
+  int needunlink, needatom, needdemonitor;
 
   /* make a self pid */
   self->num = fd;
@@ -57,7 +57,7 @@ int erl_global_unregister(int fd, const char *name)
   if (ei_send_reg_encoded(fd,self,"rex",buf,index)) return -1;
 
   /* get the reply: expect unlink and an atom, or just an atom */
-  needunlink = needatom = 1;
+  needunlink = needatom = needdemonitor = 1;
   while (1) {
     /* get message */
     while (1) {
@@ -68,11 +68,17 @@ int erl_global_unregister(int fd, const char *name)
 
     switch (i) {
     case ERL_UNLINK:
-      /* got link */
+      /* got unlink */
       if (!needunlink) return -1;
       needunlink = 0;
       break;
 
+    case ERL_DEMONITOR_P-10:
+      /* got demonitor */
+      if (!needdemonitor) return -1;
+      needdemonitor = 0;
+      break;
+
     case ERL_SEND:
       /* got message - does it contain our atom? */
       if (!needatom) return -1;
diff --git a/lib/erl_interface/src/misc/ei_decode_term.c b/lib/erl_interface/src/misc/ei_decode_term.c
index 7b95ff232f..9b238c1e90 100644
--- a/lib/erl_interface/src/misc/ei_decode_term.c
+++ b/lib/erl_interface/src/misc/ei_decode_term.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2001-2010. 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%
  *
 
@@ -25,16 +25,15 @@
 #include "ei_decode_term.h"
 #include "putget.h"
 
-/* Returns 1 if term is decoded, 0 if term is OK, but not decoded here
-   and -1 if something is wrong.
-   ONLY changes index if term is decoded (return value 1)! */
+/* Returns 0 on successful encoding, -1 on error, and 1 if the term seems
+   alright, but does not fit in the term structure. If it returns 0, the
+   index will be incremented, and the term contains the decoded term. */
 
 int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 {
     const char* s = buf + *index, * s0 = s;
     int len, i, n, sign;
     char c;
-    double f;
 
     if (term == NULL) return -1;
     c = term->ei_type = get8(s);
@@ -46,13 +45,11 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 	term->value.i_val = get32be(s);
 	break;
     case ERL_FLOAT_EXT:
-    	if (s[30]) return -1;
-	if (sscanf(s, "%lf", &f) != 1) return -1;
-	s += 31;
-	term->value.d_val = f;
-	break;
+    case NEW_FLOAT_EXT:
+        return ei_decode_double(buf, index, &term->value.d_val);
     case ERL_ATOM_EXT:
 	len = get16be(s);
+	if (len > MAXATOMLEN) return -1;
 	memcpy(term->value.atom_name, s, len); 
 	term->value.atom_name[len] = '\0';
 	s += len;
@@ -61,6 +58,7 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 	/* first the nodename */
 	if (get8(s) != ERL_ATOM_EXT) return -1;
 	len = get16be(s);
+	if (len > MAXATOMLEN) return -1;
 	memcpy(term->value.ref.node, s, len);
 	term->value.ref.node[len] = '\0';
 	s += len;
@@ -75,6 +73,7 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 	/* then the nodename */
 	if (get8(s) != ERL_ATOM_EXT) return -1;
 	len = get16be(s);
+	if (len > MAXATOMLEN) return -1;
 	memcpy(term->value.ref.node, s, len);
 	term->value.ref.node[len] = '\0';
 	s += len;
@@ -91,6 +90,7 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
     case ERL_PORT_EXT:
 	if (get8(s) != ERL_ATOM_EXT) return -1;
 	len = get16be(s);
+	if (len > MAXATOMLEN) return -1;
 	memcpy(term->value.port.node, s, len);
 	term->value.port.node[len] = '\0';
 	term->value.port.id = get32be(s) & 0x0fffffff; /* 28 bits */;
@@ -100,6 +100,7 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
 	if (get8(s) != ERL_ATOM_EXT) return -1;
 	/* name first */
 	len = get16be(s); 
+	if (len > MAXATOMLEN) return -1;
 	memcpy(term->value.pid.node, s, len);
 	term->value.pid.node[len] = '\0';
 	s += len;
diff --git a/lib/erl_interface/src/misc/ei_format.c b/lib/erl_interface/src/misc/ei_format.c
index 08235d0ebe..dbd7a4479a 100644
--- a/lib/erl_interface/src/misc/ei_format.c
+++ b/lib/erl_interface/src/misc/ei_format.c
@@ -47,10 +47,12 @@
  * array of unions.
  */
 union arg {
+  char c;
   char* s;
   long l;
   unsigned long u;
   double d;
+  erlang_pid* pid;
 };
 
 static int eiformat(const char** s, union arg** args, ei_x_buff* x);
@@ -106,6 +108,8 @@ static int eiformat(const char** fmt, union arg** args, ei_x_buff* x)
     default:
 	if (isdigit((int)*p))
 	    res = pdigit(&p, x);
+	else if ((*p == '-' || *p == '+') && isdigit((int)*(p+1)))
+	    res = pdigit(&p, x);
 	else if (islower((int)*p))
 	    res = patom(&p, x);
 	else
@@ -149,6 +153,8 @@ static int pdigit(const char** fmt, ei_x_buff* x)
     double d;
     long l;
 
+    if (**fmt == '-' || **fmt == '+')
+	(*fmt)++;
     for (;;) {
 	c = *(*fmt)++;
 	if (isdigit((int)c))
@@ -220,12 +226,14 @@ static int pquotedatom(const char** fmt, ei_x_buff* x)
  /* 
   * The format letters are:
   *   a  -  An atom
+  *   c  -  A character
   *   s  -  A string
   *   i  -  An integer
   *   l  -  A long integer
   *   u  -  An unsigned long integer
   *   f  -  A float 
   *   d  -  A double float 
+  *   p  -  An Erlang PID
   */
 static int pformat(const char** fmt, union arg** args, ei_x_buff* x)
 {
@@ -236,6 +244,10 @@ static int pformat(const char** fmt, union arg** args, ei_x_buff* x)
 	res = ei_x_encode_atom(x, (*args)->s);
 	(*args)++;
 	break;
+    case 'c':
+	res = ei_x_encode_char(x, (*args)->c);
+	(*args)++;
+	break;
     case 's':
 	res = ei_x_encode_string(x, (*args)->s);
 	(*args)++;
@@ -257,6 +269,10 @@ static int pformat(const char** fmt, union arg** args, ei_x_buff* x)
 	res = ei_x_encode_double(x, (*args)->d);
 	(*args)++;
 	break;	
+    case 'p':
+	res = ei_x_encode_pid(x, (*args)->pid);
+	(*args)++;
+	break;
     default:
 	res = -1;
 	break;
@@ -392,6 +408,9 @@ static int read_args(const char* fmt, va_list ap, union arg **argp)
 	  return -1;	/* Error, string not complete */
 	}
 	switch (*p++) {
+	case 'c':
+	  args[i++].c = (char) va_arg(ap, int);
+	  break;
 	case 'a': 
 	case 's':
 	  args[i++].s = va_arg(ap, char*);
@@ -411,6 +430,9 @@ static int read_args(const char* fmt, va_list ap, union arg **argp)
 	case 'd':
 	  args[i++].d = va_arg(ap, double);
 	  break;	
+	case 'p':
+	  args[i++].pid = va_arg(ap, erlang_pid*);
+	  break;
 	default:
 	  ei_free(args);	/* Invalid specifier */
 	  return -1;
diff --git a/lib/erl_interface/src/misc/ei_portio.c b/lib/erl_interface/src/misc/ei_portio.c
index b73ebebbe1..a3f6f63fff 100644
--- a/lib/erl_interface/src/misc/ei_portio.c
+++ b/lib/erl_interface/src/misc/ei_portio.c
@@ -166,11 +166,16 @@ int ei_writev_fill_t(int fd,  const  struct  iovec  *iov,  int iovcnt, unsigned
 	if (done < sum) {
 	    if (iov_base == NULL) {
 		iov_base = malloc(sizeof(struct iovec) * iovcnt);
+		if (iov_base == NULL) {
+		return -1;
+		}
 		memcpy(iov_base, iov, sizeof(struct iovec) * iovcnt);
 		current_iov = iov_base;
 	    }
 	    while (i > 0) {
 		if (i < current_iov[0].iov_len) {
+		    char *p = (char*)current_iov[0].iov_base;
+		    current_iov[0].iov_base = p + i;
 		    current_iov[0].iov_len -= i;
 		    i = 0;
 		} else {
diff --git a/lib/erl_interface/src/misc/ei_printterm.c b/lib/erl_interface/src/misc/ei_printterm.c
index 8d0eef5e79..5fc6b3542c 100644
--- a/lib/erl_interface/src/misc/ei_printterm.c
+++ b/lib/erl_interface/src/misc/ei_printterm.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2001-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2001-2010. 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%
  *
 
@@ -253,7 +253,8 @@ static int print_term(FILE* fp, ei_x_buff* x,
             erlang_big *b;
             char *ds;
 
-            b = ei_alloc_big(n);
+            if ( (b = ei_alloc_big(n)) == NULL) goto err;
+
             if (ei_decode_big(buf, index, b) < 0) {
                 ei_free_big(b);
                 goto err;
@@ -272,6 +273,7 @@ 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;
diff --git a/lib/erl_interface/src/misc/get_type.c b/lib/erl_interface/src/misc/get_type.c
index d67a6a80d3..2a680d0f94 100644
--- a/lib/erl_interface/src/misc/get_type.c
+++ b/lib/erl_interface/src/misc/get_type.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1998-2010. 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%
  *
 
@@ -122,7 +122,12 @@ int ei_get_type_internal(const char *buf, const int *index,
   case ERL_STRING_EXT:
     *len = get16be(s);
     break;
-    
+
+  case ERL_FLOAT_EXT:
+  case NEW_FLOAT_EXT:
+    *type = ERL_FLOAT_EXT;
+    break;
+
   case ERL_LARGE_TUPLE_EXT:
   case ERL_LIST_EXT:
   case ERL_BINARY_EXT:
diff --git a/lib/erl_interface/src/misc/putget.h b/lib/erl_interface/src/misc/putget.h
index 98d9ebb64c..7a43de324b 100644
--- a/lib/erl_interface/src/misc/putget.h
+++ b/lib/erl_interface/src/misc/putget.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1998-2010. 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%
  *
 
@@ -54,6 +54,18 @@
   (s) += 4; \
 } while (0)
 
+#define put64be(s,n) do {  \
+  (s)[0] = ((n) >>  56) & 0xff; \
+  (s)[1] = ((n) >>  48) & 0xff; \
+  (s)[2] = ((n) >>  40) & 0xff; \
+  (s)[3] = ((n) >>  32) & 0xff; \
+  (s)[4] = ((n) >>  24) & 0xff; \
+  (s)[5] = ((n) >>  16) & 0xff; \
+  (s)[6] = ((n) >>  8)  & 0xff; \
+  (s)[7] = (n) & 0xff; \
+  (s) += 8; \
+} while (0)
+
 #define get8(s) \
      ((s) += 1, \
       ((unsigned char *)(s))[-1] & 0xff)
@@ -82,4 +94,20 @@
        (((unsigned char *)(s))[-2] << 8) | \
        ((unsigned char *)(s))[-1]))
      
+#define get64be(s) \
+     ((s) += 8, \
+      (((EI_ULONGLONG)((unsigned char *)(s))[-8] << 56) | \
+       ((EI_ULONGLONG)((unsigned char *)(s))[-7] << 48) | \
+       ((EI_ULONGLONG)((unsigned char *)(s))[-6] << 40) | \
+       ((EI_ULONGLONG)((unsigned char *)(s))[-5] << 32) | \
+       ((EI_ULONGLONG)((unsigned char *)(s))[-4] << 24) | \
+       ((EI_ULONGLONG)((unsigned char *)(s))[-3] << 16) | \
+       ((EI_ULONGLONG)((unsigned char *)(s))[-2] << 8)  | \
+        (EI_ULONGLONG)((unsigned char *)(s))[-1]))
+
+typedef union float_ext {
+    double d;
+    EI_ULONGLONG val;
+} FloatExt;
+
 #endif /* _PUTGET_H */
diff --git a/lib/erl_interface/src/misc/show_msg.c b/lib/erl_interface/src/misc/show_msg.c
index 25865d6f8e..194296798b 100644
--- a/lib/erl_interface/src/misc/show_msg.c
+++ b/lib/erl_interface/src/misc/show_msg.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1998-2010. 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%
  *
 
@@ -181,11 +181,6 @@ int ei_show_sendmsg(FILE *stream, const char *header, const char *msgbuf)
 	mbuf = header;
 	break;
     
-    case ERL_NODE_LINK:
-	/* nothing to do */
-	mbuf = header;
-	break;
-
     default:
 	break;
     }
@@ -241,10 +236,6 @@ static void show_msg(FILE *stream, int direction, const erlang_msg *msg,
 	show_pid(stream,&msg->to);
 	break;
       
-    case ERL_NODE_LINK:
-	fprintf(stream,"NODE_LINK");
-	break;
-      
     case ERL_REG_SEND:
 	fprintf(stream,"REG_SEND From: ");
 	show_pid(stream,&msg->from);
@@ -400,6 +391,7 @@ static void show_term(const char *termbuf, int *index, FILE *stream)
 	break;
 
     case ERL_FLOAT_EXT:
+    case NEW_FLOAT_EXT:
 	ei_decode_double(termbuf,index,&fnum);
 	fprintf(stream,"%f",fnum);
 	break;
diff --git a/lib/erl_interface/src/prog/erl_call.c b/lib/erl_interface/src/prog/erl_call.c
index f0d638324d..33ff6da7c9 100644
--- a/lib/erl_interface/src/prog/erl_call.c
+++ b/lib/erl_interface/src/prog/erl_call.c
@@ -118,11 +118,14 @@ static void usage_arg(const char *progname, const char *switchname);
 static void usage_error(const char *progname, const char *switchname);
 static void usage(const char *progname);
 static int get_module(char **mbuf, char **mname);
-static struct hostent* get_hostent(char *host);
 static int do_connect(ei_cnode *ec, char *nodename, struct call_flags *flags);
 static int read_stdin(char **buf);
 static void split_apply_string(char *str, char **mod, 
 			       char **fun, char **args);
+static void* ei_chk_malloc(size_t size);
+static void* ei_chk_calloc(size_t nmemb, size_t size);
+static void* ei_chk_realloc(void *old, size_t size);
+static char* ei_chk_strdup(char *s);
 
 
 /***************************************************************************
@@ -132,7 +135,6 @@ static void split_apply_string(char *str, char **mod,
  ***************************************************************************/
 
 /* FIXME isn't VxWorks to handle arguments differently? */
-/* FIXME check errors from malloc */
 
 #if !defined(VXWORKS)
 int main(int argc, char *argv[])
@@ -165,8 +167,7 @@ int erl_call(int argc, char **argv)
 		usage_arg(progname, "-sname ");
 	    }
 
-	    flags.node = (char *) malloc(strlen(argv[i+1]) + 1);
-	    strcpy(flags.node, argv[i+1]);
+	    flags.node = ei_chk_strdup(argv[i+1]);
 	    i++;
 	    flags.use_long_name = 0;
 	} else if (strcmp(argv[i], "-name") == 0) {  /* -name NAME */
@@ -174,8 +175,7 @@ int erl_call(int argc, char **argv)
 		usage_arg(progname, "-name ");
 	    }
 
-	    flags.node = (char *) malloc(strlen(argv[i+1]) + 1);
-	    strcpy(flags.node, argv[i+1]);
+	    flags.node = ei_chk_strdup(argv[i+1]);
 	    i++;
 	    flags.use_long_name = 1;
 	} else {
@@ -210,16 +210,14 @@ int erl_call(int argc, char **argv)
 		    usage_arg(progname, "-c ");
 		}
 		flags.cookiep = 1;
-		flags.cookie = (char *) malloc(strlen(argv[i+1]) + 1);
-		strcpy(flags.cookie, argv[i+1]);
+		flags.cookie = ei_chk_strdup(argv[i+1]);
 		i++;
 		break;
 	    case 'n':
 		if (i+1 >= argc) {
 		    usage_arg(progname, "-n ");
 		}
-		flags.node = (char *) malloc(strlen(argv[i+1]) + 1);
-		strcpy(flags.node, argv[i+1]);
+		flags.node = ei_chk_strdup(argv[i+1]);
 		flags.use_long_name = 1;
 		i++;
 		break;
@@ -227,24 +225,21 @@ int erl_call(int argc, char **argv)
 		if (i+1 >= argc) {
 		    usage_arg(progname, "-h ");
 		}
-		flags.hidden = (char *) malloc(strlen(argv[i+1]) + 1);
-		strcpy(flags.hidden, argv[i+1]);
+		flags.hidden = ei_chk_strdup(argv[i+1]);
 		i++;
 		break;
 	    case 'x':
 		if (i+1 >= argc) {
 		    usage_arg(progname, "-x ");
 		}
-		flags.script = (char *) malloc(strlen(argv[i+1]) + 1);
-		strcpy(flags.script, argv[i+1]);
+		flags.script = ei_chk_strdup(argv[i+1]);
 		i++;
 		break;
 	    case 'a':
 		if (i+1 >= argc) {
 		    usage_arg(progname, "-a ");
 		}
-		flags.apply = (char *) malloc(strlen(argv[i+1]) + 1);
-		strcpy(flags.apply, argv[i+1]);
+		flags.apply = ei_chk_strdup(argv[i+1]);
 		i++;
 		break;
 	    case '?':
@@ -304,8 +299,7 @@ int erl_call(int argc, char **argv)
     if (flags.hidden == NULL) {
       /* As default we are c17@gethostname */
       i = flags.randomp ? (time(NULL) % 997) : 17;
-      /* FIXME allocates to small !!! */
-      flags.hidden = (char *) malloc(3 + 2 ); /* c17 or cXYZ */
+      flags.hidden = (char *) ei_chk_malloc(10 + 2 ); /* c17 or cXYZ */
 #if defined(VXWORKS)
       sprintf(flags.hidden, "c%d",
 	  i < 0 ?  (int) taskIdSelf() : i);
@@ -330,17 +324,25 @@ int erl_call(int argc, char **argv)
       initWinSock();
 #endif
 
-      gethostname(h_hostname, EI_MAXHOSTNAMELEN);
+      if (gethostname(h_hostname, EI_MAXHOSTNAMELEN) < 0) {
+	  fprintf(stderr,"erl_call: failed to get host name: %d\n", errno);
+	  exit(1);
+      }
       if ((hp = ei_gethostbyname(h_hostname)) == 0) {
 	  fprintf(stderr,"erl_call: can't resolve hostname %s\n", h_hostname);
 	  exit(1);
       }
-      /* If shortnames cut of the name at first '.' */
+      /* If shortnames, cut off the name at first '.' */
       if (flags.use_long_name == 0 && (ct = strchr(hp->h_name, '.')) != NULL) {
 	  *ct = '\0';
       }
-      strcpy(h_hostname, hp->h_name);
+      strncpy(h_hostname, hp->h_name, EI_MAXHOSTNAMELEN);
+      h_hostname[EI_MAXHOSTNAMELEN] = '\0';
       memcpy(&h_ipadr.s_addr, *hp->h_addr_list, sizeof(struct in_addr));
+      if (strlen(h_alivename) + strlen(h_hostname) + 2 > sizeof(h_nodename)) {
+	  fprintf(stderr,"erl_call: hostname too long: %s\n", h_hostname);
+	  exit(1);
+      }
       sprintf(h_nodename, "%s@%s", h_alivename, h_hostname);
       
       if (ei_connect_xinit(&ec, h_hostname, h_alivename, h_nodename,
@@ -364,15 +366,20 @@ int erl_call(int argc, char **argv)
      * Expand name to a real name (may be ip-address) 
      */
     /* FIXME better error string */
-    if ((hp = get_hostent(host)) == 0) {
-	fprintf(stderr,"erl_call: can't get_hostent(%s)\n", host);
+    if ((hp = ei_gethostbyname(host)) == 0) {
+	fprintf(stderr,"erl_call: can't ei_gethostbyname(%s)\n", host);
 	exit(1);
     }
-    /* If shortnames cut of the name at first '.' */
+    /* If shortnames, cut off the name at first '.' */
     if (flags.use_long_name == 0 && (ct = strchr(hp->h_name, '.')) != NULL) {
 	*ct = '\0';
     }
-    strcpy(host_name, hp->h_name);
+    strncpy(host_name, hp->h_name, EI_MAXHOSTNAMELEN);
+    host_name[EI_MAXHOSTNAMELEN] = '\0';
+    if (strlen(flags.node) + strlen(host_name) + 2 > sizeof(nodename)) {
+	fprintf(stderr,"erl_call: nodename too long: %s\n", flags.node);
+	exit(1);
+    }
     sprintf(nodename, "%s@%s", flags.node, host_name);
 
     /* 
@@ -401,7 +408,7 @@ int erl_call(int argc, char **argv)
 
 	ei_encode_empty_list(NULL, &i);
 
-	p = (char *)malloc(i);
+	p = (char *)ei_chk_malloc(i);
 	i = 0;		/* Reset */
 	  
 	ei_encode_empty_list(p, &i);
@@ -426,6 +433,10 @@ int erl_call(int argc, char **argv)
     if (flags.modp && (modname != NULL)) {
       char fname[256];
 
+      if (strlen(modname) + 4 + 1 > sizeof(fname)) {
+      fprintf(stderr,"erl_call: module name too long: %s\n", modname);
+      exit(1);
+      }
       strcpy(fname, modname);
       strcat(fname, ".erl");
 
@@ -443,7 +454,7 @@ int erl_call(int argc, char **argv)
 	  ei_encode_binary(NULL, &i, module, modsize);
 	  ei_encode_empty_list(NULL, &i);
 
-	  p = (char *)malloc(i);
+	  p = (char *)ei_chk_malloc(i);
 	  i = 0;		/* Reset */
 	  
 	  ei_encode_list_header(p, &i, 2);
@@ -476,7 +487,7 @@ int erl_call(int argc, char **argv)
 	  ei_encode_empty_list(NULL, &i);
 	  ei_encode_empty_list(NULL, &i);
 
-	  p = (char *)malloc(i);
+	  p = (char *)ei_chk_malloc(i);
 	  i = 0;		/* Reset */
 	  
 	  ei_encode_list_header(p, &i, 2);
@@ -521,7 +532,7 @@ int erl_call(int argc, char **argv)
 	  ei_encode_binary(NULL, &i, evalbuf, len);
 	  ei_encode_empty_list(NULL, &i);
 
-	  p = (char *)malloc(i);
+	  p = (char *)ei_chk_malloc(i);
 	  i = 0;		/* Reset */
 	  
 	  ei_encode_list_header(p, &i, 1);
@@ -592,32 +603,6 @@ int erl_call(int argc, char **argv)
  *
  ***************************************************************************/
 
-/*
- * Get host entry (by address or name)
- */
-/* FIXME: will fail on names like '2fun4you'.  */
-static struct hostent* get_hostent(char *host)
-{
-  if (isdigit((int)*host)) {
-    struct in_addr ip_addr;
-    int b1, b2, b3, b4;
-    long addr;
-      
-    /* FIXME: Use inet_aton() (or inet_pton() and get v6 for free). */
-    if (sscanf(host, "%d.%d.%d.%d", &b1, &b2, &b3, &b4) != 4) {
-	return NULL;
-    }
-    addr = inet_addr(host);
-    ip_addr.s_addr = htonl(addr);
-      
-    return ei_gethostbyaddr((char *)&ip_addr,sizeof(struct in_addr), AF_INET);
-  }
-
-  return ei_gethostbyname(host);
-} /* get_hostent */
-
-
-
 
 /* 
  * This function does only return on success.
@@ -719,32 +704,28 @@ static void split_apply_string(char *str,
 
   EAT(str);
   len = str-begin;
-  *mod = (char *) calloc(len + 1, sizeof(char));
+  *mod = (char *) ei_chk_calloc(len + 1, sizeof(char));
   memcpy(*mod, begin, len);
 
   SKIP_SPACE(str);
   if (*str == '\0') {
-    *fun = (char *) calloc(strlen(start)+1, sizeof(char));
-    strcpy(*fun, start);
-    *args = (char *) calloc(strlen(empty_list)+1, sizeof(char));
-    strcpy(*args, empty_list);
+    *fun = ei_chk_strdup(start);
+    *args = ei_chk_strdup(empty_list);
     return;
   }
   begin = str;
   EAT(str);
   len = str-begin;
-  *fun = (char *) calloc(len + 1, sizeof(char));
+  *fun = (char *) ei_chk_calloc(len + 1, sizeof(char));
   memcpy(*fun, begin, len);
 
   SKIP_SPACE(str);
   if (*str == '\0') {
-    *args = (char *) calloc(strlen(empty_list)+1, sizeof(char));
-    strcpy(*args, empty_list);
+    *args = ei_chk_strdup(empty_list);
     return;
   }
 
-  *args = (char *) calloc(strlen(str) + 1, sizeof(char));
-  strcpy(*args, str);
+  *args = ei_chk_strdup(str);
   
   return;
 
@@ -760,7 +741,7 @@ static int read_stdin(char **buf)
     int bsize = BUFSIZ;
     int len = 0;
     int i;
-    char *tmp = (char *) malloc(bsize);
+    char *tmp = (char *) ei_chk_malloc(bsize);
 
     while (1) {
 	if ((i = read(0, &tmp[len], bsize-len)) < 0) {
@@ -772,7 +753,7 @@ static int read_stdin(char **buf)
 	    len += i;
 	    if ((len+50) > bsize) {
 		bsize = len * 2;
-		tmp = (char *) realloc(tmp, bsize);
+		tmp = (char *) ei_chk_realloc(tmp, bsize);
 	    } else {
 		continue;
 	    }
@@ -809,10 +790,11 @@ static int get_module(char **mbuf, char **mname)
       }
     } /* while */
     i = tmp - start;
-    *mname = (char *) calloc(i+1, sizeof(char));
+    *mname = (char *) ei_chk_calloc(i+1, sizeof(char));
     memcpy(*mname, start, i);
   }
-  free(mbuf);			/* Allocated in read_stdin() */
+  if (*mbuf)
+      free(*mbuf);			/* Allocated in read_stdin() */
 
   return len;
 
@@ -904,3 +886,51 @@ static void initWinSock(void)
     }
 }
 #endif
+
+
+/***************************************************************************
+ *
+ *  Utility functions
+ *
+ ***************************************************************************/
+
+static void* ei_chk_malloc(size_t size)
+{
+    void *p = malloc(size);
+    if (p == NULL) {
+        fprintf(stderr,"erl_call: insufficient memory\n");
+        exit(1);
+    }
+    return p;
+}
+
+static void* ei_chk_calloc(size_t nmemb, size_t size)
+{
+    void *p = calloc(nmemb, size);
+    if (p == NULL) {
+        fprintf(stderr,"erl_call: insufficient memory\n");
+        exit(1);
+    }
+    return p;
+}
+
+static void* ei_chk_realloc(void *old, size_t size)
+{
+    void *p = realloc(old, size);
+    if (!p) {
+        fprintf(stderr, "erl_call: cannot reallocate %u bytes of memory from %p\n",
+                (unsigned) size, old);
+        exit (1);
+    }
+    return p;
+}
+
+static char* ei_chk_strdup(char *s)
+{
+    char *p = strdup(s);
+    if (p == NULL) {
+        fprintf(stderr,"erl_call: insufficient memory\n");
+        exit(1);
+    }
+    return p;
+}
diff --git a/lib/erl_interface/src/registry/reg_dump.c b/lib/erl_interface/src/registry/reg_dump.c
index 50a6949177..dfec96b43c 100644
--- a/lib/erl_interface/src/registry/reg_dump.c
+++ b/lib/erl_interface/src/registry/reg_dump.c
@@ -157,7 +157,7 @@ static int mn_send_delete(int fd, erlang_pid *mnesia, const char *key)
   int len = strlen(key) + 32; /* 32 is a slight overestimate */
 
   if (len > EISMALLBUF)
-    if (!(dbuf = malloc(index)))
+    if (!(dbuf = malloc(len)))
       return -1;
   msgbuf = (dbuf ? dbuf : sbuf);
 
@@ -187,7 +187,7 @@ static int mn_send_write(int fd, erlang_pid *mnesia, const char *key, ei_reg_obj
   int len = 32 + keylen + obj->size;
 
   if (len > EISMALLBUF)
-    if (!(dbuf = malloc(index)))
+    if (!(dbuf = malloc(len)))
       return -1;
   msgbuf = (dbuf ? dbuf : sbuf);
 
diff --git a/lib/erl_interface/src/registry/reg_restore.c b/lib/erl_interface/src/registry/reg_restore.c
index 27918d2364..aeb33c784a 100644
--- a/lib/erl_interface/src/registry/reg_restore.c
+++ b/lib/erl_interface/src/registry/reg_restore.c
@@ -266,7 +266,7 @@ int ei_reg_restore(int fd, ei_reg *reg, const char *mntab)
   /* make sure receive buffer can handle largest expected message */
   len = maxkey + maxobj + 512; 
   if (len > EISMALLBUF)
-    if (!(dbuf = malloc(index))) {
+    if (!(dbuf = malloc(len))) {
       ei_send_exit(fd,&self,&mnesia,"cannot allocate space for incoming data");
       return -1;
     }
diff --git a/lib/erl_interface/test/Makefile b/lib/erl_interface/test/Makefile
index b7a1a4e4d8..c8aa6f5a6d 100644
--- a/lib/erl_interface/test/Makefile
+++ b/lib/erl_interface/test/Makefile
@@ -33,6 +33,7 @@ MODULES= \
 	ei_print_SUITE \
 	ei_tmo_SUITE \
 	erl_connect_SUITE \
+	erl_global_SUITE \
 	erl_eterm_SUITE \
 	erl_ext_SUITE \
 	erl_format_SUITE \
@@ -41,9 +42,9 @@ MODULES= \
 	runner
 
 SPEC_FILES = \
-	erl_interface.spec \
-	erl_interface.dynspec \
-	erl_interface.spec.vxworks
+	erl_interface.spec
+
+COVER_FILE = erl_interface.cover
 
 ERL_FILES = $(MODULES:%=%.erl)
 
@@ -71,7 +72,7 @@ release_spec:
 
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SPEC_FILES) $(ERL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl
index bc83d6a62e..d3d37fce6c 100644
--- a/lib/erl_interface/test/ei_accept_SUITE.erl
+++ b/lib/erl_interface/test/ei_accept_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -20,21 +20,42 @@
 %%
 -module(ei_accept_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ei_accept_SUITE_data/ei_accept_test_cases.hrl").
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2,
+-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,
 	 ei_accept/1, ei_threaded_accept/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
-all(suite) -> [ei_accept, ei_threaded_accept].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [ei_accept, ei_threaded_accept].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(0.25)),
+    Dog = ?t:timetrap(?t:seconds(30)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -43,8 +64,6 @@ ei_accept(Config) when is_list(Config) ->
     ?line P = runner:start(?interpret),
     ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
 
-%    ?line AMsg={a,[message, with], " strings in it!", [-12, -23], 1.001},
-    %% shouldn't this be a bif or function or something?
     ?line Myname= hd(tl(string:tokens(atom_to_list(node()), "@"))),
     ?line io:format("Myname ~p ~n",  [Myname]),
     ?line EINode= list_to_atom("c42@"++Myname),
@@ -52,9 +71,13 @@ ei_accept(Config) when is_list(Config) ->
     ?line Self= self(),
     ?line TermToSend= {call, Self, "Test"},
     ?line F= fun() ->
-		     timer:sleep(500),
-		     {any, EINode} ! TermToSend,
-		     Self ! sent_ok,
+		     case waitfornode("c42",20) of
+			 true ->
+			     {any, EINode} ! TermToSend,
+			     Self ! sent_ok;
+			 false ->
+			     Self ! never_published
+		     end,
 		     ok
 	     end,
 
@@ -72,7 +95,7 @@ ei_accept(Config) when is_list(Config) ->
 	  after 1000 ->
 		  io:format("timeout ~n")
 	  end,
-    ?line ok= ei_unpublish(P),
+    ?line runner:finish(P),
     ok.
 
 ei_threaded_accept(Config) when is_list(Config) ->
@@ -90,12 +113,29 @@ ei_threaded_accept(Config) when is_list(Config) ->
 	    || I <- lists:seq(0, N-1) ],
     ok.
 
+waitfornode(String,0) ->
+    io:format("~s never published itself.~n",[String]),
+    false;
+waitfornode(String,N) ->
+    Registered = [X || {X,_} <- element(2,erl_epmd:names())],
+    case lists:member(String,Registered) of
+	true ->
+	    true;
+	false ->
+	    timer:sleep(1000),
+	    waitfornode(String,N-1)
+    end.
+
 send_rec_einode(N, TestServerPid) ->
     ?line Myname= hd(tl(string:tokens(atom_to_list(node()), "@"))),
-    ?line EINode= list_to_atom("eiacc" ++ integer_to_list(N) ++ "@" ++ Myname),
+    ?line FirstPart = "eiacc" ++ integer_to_list(N),
+    ?line EINode= list_to_atom(FirstPart ++ "@" ++ Myname),
     ?line io:format("EINode ~p ~n",  [EINode]),
     ?line Self= self(),
-    ?line timer:sleep(10*1000),
+    ?line case waitfornode(FirstPart,20) of
+	      true -> ok;
+	      false -> test_server:fail({never_published,EINode})
+	  end,
     ?line {any, EINode} ! Self,
     ?line receive
 	      {N,_}=X ->
@@ -136,13 +176,6 @@ ei_receive(P, Fd) ->
     {term, T}= get_term(P),
     T.
 
-ei_unpublish(P) ->
-    send_command(P, ei_unpublish, []),
-    case get_term(P) of
-	{term,{0, _}} -> ok;
-	{term,{_X, Errno}} -> {error,Errno}
-    end.
-
 send_command(P, Name, Args) ->
     runner:send_term(P, {Name,list_to_tuple(Args)}).
 
diff --git a/lib/erl_interface/test/ei_connect_SUITE.erl b/lib/erl_interface/test/ei_connect_SUITE.erl
index 56f478edad..47247dd891 100644
--- a/lib/erl_interface/test/ei_connect_SUITE.erl
+++ b/lib/erl_interface/test/ei_connect_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -20,37 +20,53 @@
 %%
 -module(ei_connect_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ei_connect_SUITE_data/ei_connect_test_cases.hrl").
 
 -export([
-	all/1, 
-	init_per_testcase/2, 
-	fin_per_testcase/2,
-
-	ei_send/1, 
-	ei_reg_send/1, 
-	ei_rpc/1, 
-	rpc_test/1, 
-	ei_send_funs/1,
-	ei_threaded_send/1,
-	ei_set_get_tracelevel/1
+	 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,
+	 
+	 ei_send/1, 
+	 ei_reg_send/1, 
+	 ei_format_pid/1,
+	 ei_rpc/1, 
+	 rpc_test/1, 
+	 ei_send_funs/1,
+	 ei_threaded_send/1,
+	 ei_set_get_tracelevel/1
 	]).
 
 -import(runner, [get_term/1,send_term/2]).
 
-all(suite) -> [ ei_send, 
-		ei_reg_send, 
-		ei_rpc, 
-		ei_send_funs, 
-		ei_threaded_send,
-		ei_set_get_tracelevel].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [ei_send, ei_reg_send, ei_rpc, ei_format_pid, ei_send_funs,
+     ei_threaded_send, ei_set_get_tracelevel].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 init_per_testcase(_Case, Config) ->
     Dog = ?t:timetrap(?t:minutes(0.25)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -67,6 +83,19 @@ ei_send(Config) when is_list(Config) ->
     ?line runner:recv_eot(P),
     ok.
 
+ei_format_pid(Config) when is_list(Config) ->
+    ?line S = self(),
+    ?line P = runner:start(?interpret),
+    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    ?line {ok,Fd} = ei_connect(P, node()),
+
+    ?line ok = ei_format_pid(P, Fd, S),
+    ?line receive S -> ok end,
+
+    ?line runner:send_eot(P),
+    ?line runner:recv_eot(P),
+    ok.
+
 ei_send_funs(Config) when is_list(Config) ->
     ?line P = runner:start(?interpret),
     ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
@@ -103,10 +132,12 @@ ei_threaded_send(Config) when is_list(Config) ->
     ?line Einode = filename:join(?config(data_dir, Config), "einode"),
     ?line N = 15,
     ?line Host = atom_to_list(node()),
-    ?line spawn_link(fun() -> start_einode(Einode, N, Host) end),
     ?line TestServerPid = self(),
     ?line [ spawn_link(fun() -> rec_einode(I, TestServerPid) end)
 	    || I <- lists:seq(0, N-1) ],
+    ?line [ receive {I,registered} -> ok end
+	    || I <- lists:seq(0, N-1) ],
+    ?line spawn_link(fun() -> start_einode(Einode, N, Host) end),
     ?line [ receive I -> ok end
 	    || I <- lists:seq(0, N-1) ],
     ok.
@@ -114,6 +145,7 @@ ei_threaded_send(Config) when is_list(Config) ->
 rec_einode(N, TestServerPid) ->
     ?line Regname = list_to_atom("mth"++integer_to_list(N)),
     ?line register(Regname, self()),
+    ?line TestServerPid ! {N, registered},
     ?line io:format("~p waiting~n", [Regname]),
     ?line receive
 	      X ->
@@ -186,6 +218,10 @@ ei_send(P, Fd, To, Msg) ->
     send_command(P, ei_send, [Fd,To,Msg]),
     get_send_result(P).
 
+ei_format_pid(P, Fd, To) ->
+    send_command(P, ei_format_pid, [Fd, To]),
+    get_send_result(P).
+
 ei_send_funs(P, Fd, To, Msg) ->
     send_command(P, ei_send_funs, [Fd,To,Msg]),
     get_send_result(P).
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 debd3e789b..8183ac9dd8 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
@@ -35,6 +35,7 @@
 static void cmd_ei_connect_init(char* buf, int len);
 static void cmd_ei_connect(char* buf, int len);
 static void cmd_ei_send(char* buf, int len);
+static void cmd_ei_format_pid(char* buf, int len);
 static void cmd_ei_send_funs(char* buf, int len);
 static void cmd_ei_reg_send(char* buf, int len);
 static void cmd_ei_rpc(char* buf, int len);
@@ -57,6 +58,7 @@ static struct {
     "ei_reg_send", 	     3, cmd_ei_reg_send,
     "ei_rpc",  		     4, cmd_ei_rpc,
     "ei_set_get_tracelevel", 1, cmd_ei_set_get_tracelevel,
+    "ei_format_pid",         2, cmd_ei_format_pid,
 };
 
 
@@ -111,7 +113,7 @@ static void cmd_ei_connect_init(char* buf, int len)
     ei_x_buff res;
     if (ei_decode_long(buf, &index, &l) < 0)
 	fail("expected int");
-    sprintf(b, "c%d", l);
+    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)
@@ -183,6 +185,25 @@ static void cmd_ei_send(char* buf, int len)
     ei_x_free(&x);
 }
 
+static void cmd_ei_format_pid(char* buf, int len)
+{
+    int index = 0;
+    long fd;
+    erlang_pid pid;
+    ei_x_buff x;
+
+    if (ei_decode_long(buf, &index, &fd) < 0)
+	fail("expected long");
+    if (ei_decode_pid(buf, &index, &pid) < 0)
+	fail("expected pid (node)");
+    if (ei_x_new_with_version(&x) < 0)
+	fail("ei_x_new_with_version");
+    if (ei_x_format_wo_ver(&x, "~p", &pid) < 0)
+	fail("ei_x_format_wo_ver");
+    send_errno_result(ei_send(fd, &pid, x.buff, x.index));
+    ei_x_free(&x);
+}
+
 static void cmd_ei_send_funs(char* buf, int len)
 {
     int index = 0, n;
diff --git a/lib/erl_interface/test/ei_decode_SUITE.erl b/lib/erl_interface/test/ei_decode_SUITE.erl
index ea528728ab..8a653078a7 100644
--- a/lib/erl_interface/test/ei_decode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_SUITE.erl
@@ -1,31 +1,32 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2004-2010. 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(ei_decode_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ei_decode_SUITE_data/ei_decode_test_cases.hrl").
 
 -export(
    [
-    all/1,
+    all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+    init_per_group/2,end_per_group/2,
     test_ei_decode_long/1,
     test_ei_decode_ulong/1,
     test_ei_decode_longlong/1,
@@ -35,16 +36,29 @@
     test_ei_decode_misc/1
    ]).
 
-all(suite) ->
-    [
-     test_ei_decode_long,
-     test_ei_decode_ulong,
-     test_ei_decode_longlong,
-     test_ei_decode_ulonglong,
-     test_ei_decode_char,
-     test_ei_decode_nonoptimal,
-     test_ei_decode_misc
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [test_ei_decode_long, test_ei_decode_ulong,
+     test_ei_decode_longlong, test_ei_decode_ulonglong,
+     test_ei_decode_char, test_ei_decode_nonoptimal,
+     test_ei_decode_misc].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% ---------------------------------------------------------------------------
 
@@ -181,22 +195,9 @@ test_ei_decode_misc(suite) -> [];
 test_ei_decode_misc(Config) when is_list(Config) ->
     ?line P = runner:start(?test_ei_decode_misc),
 
-%    ?line <<131>>  = get_binaries(P),
-
-%    ?line {term,F} = get_term(P),
-%    ?line match_float(F, 0.0),
-%    ?line {term,F} = get_term(P),
-%    ?line match_float(F, 0.0),
-
-%    ?line {term,F} = get_term(P),
-%    ?line true = match_float(F, -1.0),
-%    ?line {term,F} = get_term(P),
-%    ?line true = match_float(F, -1.0),
-
-%    ?line {term,F} = get_term(P),
-%    ?line true = match_float(F, 1.0),
-%    ?line {term,F} = get_term(P),
-%    ?line true = match_float(F, 1.0),
+    ?line send_term_as_binary(P,0.0),
+    ?line send_term_as_binary(P,-1.0),
+    ?line send_term_as_binary(P,1.0),
 
     ?line send_term_as_binary(P,false),
     ?line send_term_as_binary(P,true),
@@ -235,15 +236,17 @@ send_integers(P) ->
     ?line send_term_as_binary(P,256),		% INTEGER_EXT smallest pos (*)
     ?line send_term_as_binary(P,-1),		% INTEGER_EXT largest  neg 
 
-    ?line send_term_as_binary(P, 16#07ffffff),	% INTEGER_EXT largest (28 bits)
-    ?line send_term_as_binary(P,-16#08000000),	% INTEGER_EXT smallest 
-    ?line send_term_as_binary(P, 16#08000000),  % SMALL_BIG_EXT smallest pos(*)
-    ?line send_term_as_binary(P,-16#08000001),	% SMALL_BIG_EXT largest neg (*)
+    ?line send_term_as_binary(P, 16#07ffffff),	% INTEGER_EXT old largest (28 bits)
+    ?line send_term_as_binary(P,-16#08000000),	% INTEGER_EXT old smallest
+    ?line send_term_as_binary(P, 16#08000000),  % SMALL_BIG_EXT old smallest pos(*)
+    ?line send_term_as_binary(P,-16#08000001),	% SMALL_BIG_EXT old largest neg (*)
 
-    ?line send_term_as_binary(P, 16#7fffffff),	% SMALL_BIG_EXT largest  i32
-    ?line send_term_as_binary(P,-16#80000000),	% SMALL_BIG_EXT smallest i32
-
-    case erlang:system_info(wordsize) of
+    ?line send_term_as_binary(P, 16#7fffffff),	% INTEGER_EXT new largest (32 bits)
+    ?line send_term_as_binary(P,-16#80000000),	% INTEGER_EXT new smallest (32 bis)
+    ?line send_term_as_binary(P, 16#80000000),  % SMALL_BIG_EXT new smallest pos(*)
+    ?line send_term_as_binary(P,-16#80000001),	% SMALL_BIG_EXT new largest neg (*)
+ 
+    case erlang:system_info({wordsize,external}) of
 	4 ->	 
           ?line send_term_as_binary(P, 16#80000000),% SMALL_BIG_EXT u32
           ?line send_term_as_binary(P, 16#ffffffff),% SMALL_BIG_EXT largest u32
@@ -279,15 +282,17 @@ send_integers2(P) ->
     ?line send_term_as_binary(P,255),		% SMALL_INTEGER_EXT largest
     ?line send_term_as_binary(P,256),		% INTEGER_EXT smallest pos (*)
     ?line send_term_as_binary(P,-1),		% INTEGER_EXT largest  neg 
+    
+    ?line send_term_as_binary(P, 16#07ffffff),	% INTEGER_EXT old largest (28 bits)
+    ?line send_term_as_binary(P,-16#08000000),	% INTEGER_EXT old smallest 
+    ?line send_term_as_binary(P, 16#08000000),  % SMALL_BIG_EXT old smallest pos(*)
+    ?line send_term_as_binary(P,-16#08000001),	% SMALL_BIG_EXT old largest neg (*)
 
-    ?line send_term_as_binary(P, 16#07ffffff),	% INTEGER_EXT largest (28 bits)
-    ?line send_term_as_binary(P,-16#08000000),	% INTEGER_EXT smallest 
-    ?line send_term_as_binary(P, 16#08000000),  % SMALL_BIG_EXT smallest pos(*)
-    ?line send_term_as_binary(P,-16#08000001),	% SMALL_BIG_EXT largest neg (*)
+    ?line send_term_as_binary(P, 16#7fffffff),	% INTEGER_EXT new largest (32 bits)
+    ?line send_term_as_binary(P,-16#80000000),	% INTEGER_EXT new smallest
+    ?line send_term_as_binary(P, 16#80000000),  % SMALL_BIG_EXT new smallest pos(*)
+    ?line send_term_as_binary(P,-16#80000001),	% SMALL_BIG_EXT new largest neg (*)
 
-    ?line send_term_as_binary(P, 16#7fffffff),	% SMALL_BIG_EXT largest  i32
-    ?line send_term_as_binary(P,-16#80000000),	% SMALL_BIG_EXT smallest i32
-    ?line send_term_as_binary(P, 16#80000000),% SMALL_BIG_EXT u32
     ?line send_term_as_binary(P, 16#ffffffff),% SMALL_BIG_EXT largest u32
 
     ?line send_term_as_binary(P, 16#7fffffffffff), % largest  i48
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 d81ea88437..b349138ae9 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
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2004-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
  */
 
@@ -246,13 +246,23 @@ TESTCASE(test_ei_decode_long)
     EI_DECODE_2     (decode_long,  5, long, 256);
     EI_DECODE_2     (decode_long,  5, long, -1);
 
+    /* Old 28 bit limits for INTEGER_EXT */
     EI_DECODE_2     (decode_long,  5, long,  0x07ffffff);
     EI_DECODE_2     (decode_long,  5, long, -0x08000000);
-    EI_DECODE_2     (decode_long,  7, long,  0x08000000);
-    EI_DECODE_2     (decode_long,  7, long, -0x08000001);
+    EI_DECODE_2     (decode_long,  5, long,  0x08000000);  
+    EI_DECODE_2     (decode_long,  5, long, -0x08000001);
 
-    EI_DECODE_2     (decode_long,  7, long,  0x7fffffff);
-    EI_DECODE_2     (decode_long,  7, long, -ll(0x80000000)); /* Strange :-( */
+    /* New 32 bit limits for INTEGER_EXT */
+    EI_DECODE_2     (decode_long,  5, long,     0x7fffffff);
+    EI_DECODE_2     (decode_long,  5, long, -ll(0x80000000)); /* Strange :-( */
+    if (sizeof(long) > 4) {
+	EI_DECODE_2(decode_long,  7, long,     0x80000000);
+	EI_DECODE_2(decode_long,  7, long, -ll(0x80000001));
+    }
+    else {
+	EI_DECODE_2_FAIL(decode_long,  7, long,     0x80000000);
+	EI_DECODE_2_FAIL(decode_long,  7, long, -ll(0x80000001));       
+    }
 
     EI_DECODE_2_FAIL(decode_long,  7, long,  0x80000000);
     EI_DECODE_2_FAIL(decode_long,  7, long,  0xffffffff);
@@ -280,11 +290,13 @@ TESTCASE(test_ei_decode_ulong)
 
     EI_DECODE_2     (decode_ulong,  5, unsigned long,  0x07ffffff);
     EI_DECODE_2_FAIL(decode_ulong,  5, unsigned long, -0x08000000);
-    EI_DECODE_2     (decode_ulong,  7, unsigned long,  0x08000000);
-    EI_DECODE_2_FAIL(decode_ulong,  7, unsigned long, -0x08000001);
+    EI_DECODE_2     (decode_ulong,  5, unsigned long,  0x08000000);
+    EI_DECODE_2_FAIL(decode_ulong,  5, unsigned long, -0x08000001);
 
-    EI_DECODE_2     (decode_ulong,  7, unsigned long,  0x7fffffff);
-    EI_DECODE_2_FAIL(decode_ulong,  7, unsigned long, -ll(0x80000000));
+    EI_DECODE_2     (decode_ulong,  5, unsigned long,     0x7fffffff);
+    EI_DECODE_2_FAIL(decode_ulong,  5, unsigned long, -ll(0x80000000));
+    EI_DECODE_2     (decode_ulong,  7, unsigned long,     0x80000000);
+    EI_DECODE_2_FAIL(decode_ulong,  7, unsigned long, -ll(0x80000001));
 
     if (sizeof(long) > 4) {
       EI_DECODE_2     (decode_ulong,  11, unsigned long,  ll(0x8000000000000000));
@@ -319,13 +331,14 @@ TESTCASE(test_ei_decode_longlong)
 
     EI_DECODE_2     (decode_longlong,  5, EI_LONGLONG,  0x07ffffff);
     EI_DECODE_2     (decode_longlong,  5, EI_LONGLONG, -0x08000000);
-    EI_DECODE_2     (decode_longlong,  7, EI_LONGLONG,  0x08000000);
-    EI_DECODE_2     (decode_longlong,  7, EI_LONGLONG, -0x08000001);
-
-    EI_DECODE_2     (decode_longlong,  7, EI_LONGLONG,  0x7fffffff);
-    EI_DECODE_2     (decode_longlong,  7, EI_LONGLONG, -ll(0x80000000));
+    EI_DECODE_2     (decode_longlong,  5, EI_LONGLONG,  0x08000000);
+    EI_DECODE_2     (decode_longlong,  5, EI_LONGLONG, -0x08000001);
 
+    EI_DECODE_2     (decode_longlong,  5, EI_LONGLONG,  0x7fffffff);
+    EI_DECODE_2     (decode_longlong,  5, EI_LONGLONG, -ll(0x80000000));
     EI_DECODE_2     (decode_longlong,  7, EI_LONGLONG,  0x80000000);
+    EI_DECODE_2     (decode_longlong,  7, EI_LONGLONG, -ll(0x80000001));
+
     EI_DECODE_2     (decode_longlong,  7, EI_LONGLONG,  0xffffffff);
 
     EI_DECODE_2     (decode_longlong,  9, EI_LONGLONG,  ll(0x7fffffffffff));
@@ -352,13 +365,14 @@ TESTCASE(test_ei_decode_ulonglong)
 
     EI_DECODE_2     (decode_ulonglong, 5, EI_ULONGLONG,  0x07ffffff);
     EI_DECODE_2_FAIL(decode_ulonglong, 5, EI_ULONGLONG, -0x08000000);
-    EI_DECODE_2     (decode_ulonglong, 7, EI_ULONGLONG,  0x08000000);
-    EI_DECODE_2_FAIL(decode_ulonglong, 7, EI_ULONGLONG, -0x08000001);
-
-    EI_DECODE_2     (decode_ulonglong, 7, EI_ULONGLONG,  0x7fffffff);
-    EI_DECODE_2_FAIL(decode_ulonglong, 7, EI_ULONGLONG, -ll(0x80000000));
+    EI_DECODE_2     (decode_ulonglong, 5, EI_ULONGLONG,  0x08000000);
+    EI_DECODE_2_FAIL(decode_ulonglong, 5, EI_ULONGLONG, -0x08000001);
 
+    EI_DECODE_2     (decode_ulonglong, 5, EI_ULONGLONG,  0x7fffffff);
+    EI_DECODE_2_FAIL(decode_ulonglong, 5, EI_ULONGLONG, -ll(0x80000000));
     EI_DECODE_2     (decode_ulonglong, 7, EI_ULONGLONG,  0x80000000);
+    EI_DECODE_2_FAIL(decode_ulonglong, 7, EI_ULONGLONG, -0x80000001);
+
     EI_DECODE_2     (decode_ulonglong, 7, EI_ULONGLONG,  0xffffffff);
 
     EI_DECODE_2     (decode_ulonglong, 9, EI_ULONGLONG,  ll(0x7fffffffffff));
@@ -515,11 +529,10 @@ TESTCASE(test_ei_decode_misc)
 /*
     EI_DECODE_0(decode_version);
 */
-/*
-    EI_DECODE_2(decode_double, 0.0);
-    EI_DECODE_2(decode_double, -1.0);
-    EI_DECODE_2(decode_double, 1.0);
-*/
+    EI_DECODE_2(decode_double, 32, double, 0.0);
+    EI_DECODE_2(decode_double, 32, double, -1.0);
+    EI_DECODE_2(decode_double, 32, double, 1.0);
+
     EI_DECODE_2(decode_boolean, 8, int, 0);
     EI_DECODE_2(decode_boolean, 7, int, 1);
 
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE.erl b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
index c19c1d0887..0a1eda41e1 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -20,19 +20,36 @@
 %%
 -module(ei_decode_encode_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ei_decode_encode_SUITE_data/ei_decode_encode_test_cases.hrl").
 
 -export(
    [
-    all/1,
+    all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+    init_per_group/2,end_per_group/2,
     test_ei_decode_encode/1
    ]).
 
-all(suite) ->
-    [
-     test_ei_decode_encode
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [test_ei_decode_encode].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% ---------------------------------------------------------------------------
 
diff --git a/lib/erl_interface/test/ei_encode_SUITE.erl b/lib/erl_interface/test/ei_encode_SUITE.erl
index fb790eb7c3..1674274bc9 100644
--- a/lib/erl_interface/test/ei_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_encode_SUITE.erl
@@ -1,31 +1,32 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2004-2010. 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(ei_encode_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ei_encode_SUITE_data/ei_encode_test_cases.hrl").
 
 -export(
    [
-    all/1,
+    all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+    init_per_group/2,end_per_group/2,
     test_ei_encode_long/1,
     test_ei_encode_ulong/1,
     test_ei_encode_longlong/1,
@@ -35,16 +36,29 @@
     test_ei_encode_fails/1
    ]).
 
-all(suite) ->
-    [
-     test_ei_encode_long,
-     test_ei_encode_ulong,
-     test_ei_encode_longlong,
-     test_ei_encode_ulonglong,
-     test_ei_encode_char,
-     test_ei_encode_misc,
-     test_ei_encode_fails
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [test_ei_encode_long, test_ei_encode_ulong,
+     test_ei_encode_longlong, test_ei_encode_ulonglong,
+     test_ei_encode_char, test_ei_encode_misc,
+     test_ei_encode_fails].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% ---------------------------------------------------------------------------
 
@@ -181,20 +195,14 @@ test_ei_encode_misc(Config) when is_list(Config) ->
 
     ?line <<131>>  = get_binaries(P),
 
-%    ?line {term,F} = get_term(P),
-%    ?line match_float(F, 0.0),
-%    ?line {term,F} = get_term(P),
-%    ?line match_float(F, 0.0),
+    ?line {<<70,_:8/binary>>,F0} = get_buf_and_term(P),
+    ?line true = match_float(F0, 0.0),
 
-%    ?line {term,F} = get_term(P),
-%    ?line true = match_float(F, -1.0),
-%    ?line {term,F} = get_term(P),
-%    ?line true = match_float(F, -1.0),
+    ?line {<<70,_:8/binary>>,Fn1} = get_buf_and_term(P),
+    ?line true = match_float(Fn1, -1.0),
 
-%    ?line {term,F} = get_term(P),
-%    ?line true = match_float(F, 1.0),
-%    ?line {term,F} = get_term(P),
-%    ?line true = match_float(F, 1.0),
+    ?line {<<70,_:8/binary>>,Fp1} = get_buf_and_term(P),
+    ?line true = match_float(Fp1, 1.0),
 
     ?line {<<100,0,5,"false">>,false}  = get_buf_and_term(P),
     ?line {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
@@ -310,6 +318,8 @@ get_term(P) ->
  
 %%
 
+match_float(F, Match) when is_float(F), is_float(Match), F == Match ->
+    true;
 match_float(F, Match) when is_float(F), F > Match*0.99, F < Match*1.01 ->
     true.
     
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 f8de0b7878..c373658152 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
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2004-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
  */
 
@@ -350,13 +350,13 @@ TESTCASE(test_ei_encode_char)
 TESTCASE(test_ei_encode_misc)
 {
     EI_ENCODE_0(encode_version);
-/*
+
     EI_ENCODE_1(encode_double, 0.0);
 
     EI_ENCODE_1(encode_double, -1.0);
 
     EI_ENCODE_1(encode_double, 1.0);
-*/
+
     EI_ENCODE_1(encode_boolean, 0) /* Only case it should be false */;
 
     EI_ENCODE_1(encode_boolean, 1);
diff --git a/lib/erl_interface/test/ei_format_SUITE.erl b/lib/erl_interface/test/ei_format_SUITE.erl
index 7871f07ae9..a6eafc79cf 100644
--- a/lib/erl_interface/test/ei_format_SUITE.erl
+++ b/lib/erl_interface/test/ei_format_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -20,15 +20,17 @@
 %%
 -module(ei_format_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ei_format_SUITE_data/ei_format_test_cases.hrl").
 
 -export([
-	format_wo_ver/1,
-	all/1, 
-	atoms/1, 
-	tuples/1, 
-	lists/1
+	 format_wo_ver/1,
+	 all/0, suite/0,groups/0,
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 atoms/1, 
+	 tuples/1, 
+	 lists/1
 	]).
 
 -import(runner, [get_term/1]).
@@ -36,12 +38,26 @@
 %% This test suite test the erl_format() function.
 %% It uses the port program "ei_format_test".
 
-all(suite) -> [
-	format_wo_ver,
-	atoms, 
-	tuples, 
-	lists
-	].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [format_wo_ver, atoms, tuples, lists].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% Tests formatting various atoms.
 
@@ -155,7 +171,7 @@ format_wo_ver(suite) -> [];
 format_wo_ver(Config) when is_list(Config) ->
     ?line P = runner:start(?format_wo_ver),
 
-    ?line {term, [{a, "b"}, {c, 10}]} = get_term(P),
+    ?line {term, [-1, 2, $c, {a, "b"}, {c, 10}]} = get_term(P),
 
     ?line runner:recv_eot(P),
     ok.
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 a969ded3dc..a6eeb25abc 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
@@ -176,7 +176,7 @@ TESTCASE(format_wo_ver) {
     ei_x_buff x;
     
     ei_x_new (&x);
-    ei_x_format(&x, "[{~a,~s},{~a,~i}]", "a", "b", "c", 10);
+    ei_x_format(&x, "[-1, +2, ~c, {~a,~s},{~a,~i}]", 'c', "a", "b", "c", 10);
     send_bin_term(&x);
 
     free(x.buff);
diff --git a/lib/erl_interface/test/ei_print_SUITE.erl b/lib/erl_interface/test/ei_print_SUITE.erl
index a0f15338c6..7e656650a8 100644
--- a/lib/erl_interface/test/ei_print_SUITE.erl
+++ b/lib/erl_interface/test/ei_print_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -20,17 +20,38 @@
 %%
 -module(ei_print_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ei_print_SUITE_data/ei_print_test_cases.hrl").
 
--export([all/1, atoms/1, tuples/1, lists/1, strings/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 atoms/1, tuples/1, lists/1, strings/1]).
 
 -import(runner, [get_term/1]).
 
 %% This test suite test the ei_print() function.
 %% It uses the port program "ei_format_test".
 
-all(suite) -> [atoms, tuples, lists, strings].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [atoms, tuples, lists, strings].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% Tests formatting various atoms.
 
diff --git a/lib/erl_interface/test/ei_tmo_SUITE.erl b/lib/erl_interface/test/ei_tmo_SUITE.erl
index 0c211aa148..52cf2b160d 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE.erl
+++ b/lib/erl_interface/test/ei_tmo_SUITE.erl
@@ -1,37 +1,58 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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(ei_tmo_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/inet.hrl").
 -include("ei_tmo_SUITE_data/ei_tmo_test_cases.hrl").
 
 -define(dummy_host,test01).
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2,
+-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,
 	 framework_check/1, ei_accept_tmo/1, ei_connect_tmo/1, ei_send_tmo/1,
 	 ei_recv_tmo/1]).
 
-all(suite) -> [framework_check,ei_accept_tmo,ei_connect_tmo,
-	       ei_send_tmo,ei_recv_tmo].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [framework_check, ei_accept_tmo, ei_connect_tmo,
+     ei_send_tmo, ei_recv_tmo].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     Dog = ?t:timetrap(?t:minutes(1)),
@@ -43,7 +64,7 @@ init_per_testcase(_Case, Config) ->
 	    end,
     [{vxsim,Bool},{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -349,10 +370,12 @@ make_and_check_dummy() ->
 -define(DFLAG_ATOM_CACHE,2).
 -define(DFLAG_EXTENDED_REFERENCES,4).
 -define(DFLAG_EXTENDED_PIDS_PORTS,16#100).
+-define(DFLAG_NEW_FLOATS,16#800).
 -define(DFLAG_DIST_MONITOR,8).
 
 %% From R9 and forward extended references is compulsory
--define(COMPULSORY_DFLAGS, (?DFLAG_EXTENDED_REFERENCES bor ?DFLAG_EXTENDED_PIDS_PORTS)).
+%% From 14 and forward new float is compulsory
+-define(COMPULSORY_DFLAGS, (?DFLAG_EXTENDED_REFERENCES bor ?DFLAG_EXTENDED_PIDS_PORTS bor ?DFLAG_NEW_FLOATS)).
 
 -define(shutdown(X), exit(X)).
 -define(int16(X), [((X) bsr 8) band 16#ff, (X) band 16#ff]).
diff --git a/lib/erl_interface/test/erl_connect_SUITE.erl b/lib/erl_interface/test/erl_connect_SUITE.erl
index 0d6539d98f..0483a393d4 100644
--- a/lib/erl_interface/test/erl_connect_SUITE.erl
+++ b/lib/erl_interface/test/erl_connect_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -20,22 +20,42 @@
 %%
 -module(erl_connect_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("erl_connect_SUITE_data/erl_connect_test_cases.hrl").
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 erl_send/1,erl_reg_send/1, erl_send_cookie_file/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
-all(suite) -> 
-    [erl_send,erl_reg_send,erl_send_cookie_file].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [erl_send, erl_reg_send, erl_send_cookie_file].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     Dog = ?t:timetrap(?t:minutes(0.25)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/erl_interface/test/erl_eterm_SUITE.erl b/lib/erl_interface/test/erl_eterm_SUITE.erl
index 634e2f9aa0..21de1efa2e 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE.erl
+++ b/lib/erl_interface/test/erl_eterm_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -20,7 +20,7 @@
 %%
 -module(erl_eterm_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("erl_eterm_SUITE_data/eterm_test_cases.hrl").
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -33,7 +33,9 @@
 %%% 5. Miscellanous functions.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--export([all/1, build_terms/1, round_trip_conversion/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 build_terms/1, round_trip_conversion/1,
 	 decode_terms/1, decode_float/1,
 	 t_erl_mk_int/1, t_erl_mk_list/1,
 	 basic_copy/1,
@@ -73,38 +75,38 @@
 %% This test suite controls the running of the C language functions
 %% in eterm_test.c and print_term.c.
 
-all(suite) -> [build_terms, round_trip_conversion,
-	       decode_terms, decode_float,
-	       t_erl_mk_int, t_erl_mk_list,
-	       basic_copy,
-	       t_erl_mk_atom,
-	       t_erl_mk_binary,
-	       t_erl_mk_empty_list,
-	       t_erl_mk_float,
-	       t_erl_mk_pid,
-	       t_erl_mk_xpid,
-	       t_erl_mk_port,
-	       t_erl_mk_xport,
-	       t_erl_mk_ref,
-	       t_erl_mk_long_ref,
-	       t_erl_mk_string,
-	       t_erl_mk_estring,
-	       t_erl_mk_tuple,
-	       t_erl_mk_uint,
-	       t_erl_mk_var,
-	       t_erl_size,
-	       t_erl_var_content,
-	       t_erl_element,
-	       t_erl_cons,
-	       t_erl_length, t_erl_hd, t_erl_tl,
-	       type_checks, extractor_macros,
-	       t_erl_iolist_length, t_erl_iolist_to_binary,
-	       t_erl_iolist_to_string,
-	       erl_print_term, print_string,
-	       t_erl_free_compound,
-	       high_chaparal,
-	       broken_data,
-	       cnode_1].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [build_terms, round_trip_conversion, decode_terms,
+     decode_float, t_erl_mk_int, t_erl_mk_list, basic_copy,
+     t_erl_mk_atom, t_erl_mk_binary, t_erl_mk_empty_list,
+     t_erl_mk_float, t_erl_mk_pid, t_erl_mk_xpid,
+     t_erl_mk_port, t_erl_mk_xport, t_erl_mk_ref,
+     t_erl_mk_long_ref, t_erl_mk_string, t_erl_mk_estring,
+     t_erl_mk_tuple, t_erl_mk_uint, t_erl_mk_var, t_erl_size,
+     t_erl_var_content, t_erl_element, t_erl_cons,
+     t_erl_length, t_erl_hd, t_erl_tl, type_checks,
+     extractor_macros, t_erl_iolist_length,
+     t_erl_iolist_to_binary, t_erl_iolist_to_string,
+     erl_print_term, print_string, t_erl_free_compound,
+     high_chaparal, broken_data, cnode_1].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c b/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
index 6b2ec8f766..80d7f69520 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
+++ b/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2010. 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
@@ -63,32 +63,124 @@ TESTCASE(build_terms)
     report(1);
 }
 
+static int abs_and_sign(ETERM* v, unsigned long long* av, int* sign)
+{
+    long long sv;
+    switch (ERL_TYPE(v)) {
+    case ERL_INTEGER: sv = ERL_INT_VALUE(v); break;
+    case ERL_U_INTEGER: *av = ERL_INT_UVALUE(v); *sign = 0; return 1;
+    case ERL_LONGLONG: sv = ERL_LL_VALUE(v); break;
+    case ERL_U_LONGLONG: *av = ERL_LL_UVALUE(v); *sign = 0; return 1;
+    default: return 0;
+    }
+    if (sv < 0) {
+	*av = -sv;
+	*sign = 1;
+    }
+    else {
+	*av = sv;
+	*sign = 0;
+    }
+    return 1;
+}
+
+/* Shouldn't erl_match() cope with this?
+*/
+static int eq_ints(ETERM* a, ETERM* b)
+{
+    unsigned long long a_abs, b_abs;
+    int a_sign, b_sign;
+    return abs_and_sign(a, &a_abs, &a_sign) && abs_and_sign(b, &b_abs, &b_sign)
+           && (a_abs == b_abs) && (a_sign == b_sign);
+}
+
+static void encode_decode(ETERM* original, const char* text)
+{
+    static unsigned char encoded[16*1024];
+    ETERM* new_terms;
+    ETERM* head;
+    int bytes;
+    int len;
+
+    /* If a list, check the elements one by one first */
+    head = erl_hd(original);
+    if (head != NULL) {
+	encode_decode(head, "CAR");
+	encode_decode(erl_tl(original), "CDR");
+    }
+
+    bytes = erl_encode(original, encoded);
+    if (bytes == 0) {
+	fail("failed to encode terms");
+    } 
+    else if (bytes > sizeof(encoded)) {
+	fail("encoded terms buffer overflow");
+    }
+    else if (bytes != (len=erl_term_len(original))) {
+	fprintf(stderr, "bytes(%d) != len(%d) for term ", bytes, len);
+	erl_print_term(stderr, original);
+	fprintf(stderr, " [%s]\r\n", text);
+	fail("erl_encode and erl_term_len do not agree");
+    }
+    else if ((new_terms = erl_decode(encoded)) == NULL) {
+	fail("failed to decode terms");
+    }
+    else if (!erl_match(original, new_terms) && !eq_ints(original, new_terms)) {
+	erl_print_term(stderr, original);
+	fprintf(stderr, "(%i) != (%i)", ERL_TYPE(original), ERL_TYPE(new_terms));
+	erl_print_term(stderr, new_terms);
+	fprintf(stderr, " [%s]\r\n", text);
+	fail("decoded terms didn't match original");
+    }
+    erl_free_term(original);
+    erl_free_term(new_terms);
+}
 /*
  * Converts an Erlang term to the external term format and back again.
  */
 
 TESTCASE(round_trip_conversion)
 {
-    ETERM* original;
-    ETERM* new_terms;
-    char encoded[16*1024];
-    int n;
+    int n, i;
 
     erl_init(NULL, 0);
-    original = all_types();
-    if (erl_encode(original, encoded) == 0) 
+    encode_decode(all_types(), "ALL");
+
     {
-	fail("failed to encode terms");
-    } else if ((new_terms = erl_decode(encoded)) == NULL)
+	int v;
+	for (v = 8; v; v <<= 1) {
+	    for (i=-4; i<4; i++) {
+		encode_decode(erl_mk_int(v+i), "INT");
+		encode_decode(erl_mk_int(-(v+i)), "NEG INT");
+	    }
+	}
+    }
     {
-	fail("failed to decode terms");
-    } else if (!erl_match(original, new_terms))
+	unsigned int v;
+	for (v = 8; v; v <<= 1) {
+	    for (i=-4; i<4; i++) {
+		encode_decode(erl_mk_uint(v+i), "UINT");
+	    }
+	}
+    }
     {
-	fail("decoded terms didn't match original");
+	long long v;
+	for (v = 8; v; v <<= 1) {
+	    for (i=-4; i<4; i++) {
+		encode_decode(erl_mk_longlong(v+i), "LONGLONG");
+		encode_decode(erl_mk_longlong(-(v+i)), "NEG LONGLONG");
+	    }
+	}
+    }
+    {
+	unsigned long long v;
+	for (v = 8; v; v <<= 1) {
+	    for (i=-4; i<4; i++) {
+		encode_decode(erl_mk_ulonglong(v+i), "ULONGLONG");
+	    }
+	}
     }
 
-    erl_free_term(original);
-    erl_free_term(new_terms);
     report(1);
 }
 
diff --git a/lib/erl_interface/test/erl_ext_SUITE.erl b/lib/erl_interface/test/erl_ext_SUITE.erl
index dbafea0e39..38b01e73cf 100644
--- a/lib/erl_interface/test/erl_ext_SUITE.erl
+++ b/lib/erl_interface/test/erl_ext_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
@@ -20,27 +20,42 @@
 %%
 -module(erl_ext_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("erl_ext_SUITE_data/ext_test_cases.hrl").
 
 -export([
-	all/1, 
-	compare_tuple/1,
-	compare_list/1,
-	compare_string/1,
-	compare_list_string/1,
-	compare_nc_ext/1
+	 all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 compare_tuple/1,
+	 compare_list/1,
+	 compare_string/1,
+	 compare_list_string/1,
+	 compare_nc_ext/1
 	]).
 
 -import(runner, [get_term/1]).
 
-all(suite) -> [
-	compare_tuple,
-	compare_list,
-	compare_string,
-	compare_list_string, 
-	compare_nc_ext
-	].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [compare_tuple, compare_list, compare_string,
+     compare_list_string, compare_nc_ext].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 compare_tuple(suite) -> [];
 compare_tuple(doc) -> [];
diff --git a/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c b/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c
index ba1a6c66da..59e0e0cce7 100644
--- a/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c
+++ b/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c
@@ -82,6 +82,11 @@ TESTCASE(compare_list) {
     // erlang:term_to_binary([34,{a,n},a,erlang])
     unsigned char term2[] = {131,108,0,0,0,4,97,34,104,2,100,0,1,97,100,0,1,110,100,0,1,97,100,0,6,101,114,108,97,110,103,106};
 
+    // erlang:term_to_binary([0])
+    unsigned char term3[] = {131,107,0,1,0};
+    // erlang:term_to_binary([0, 1000])
+    unsigned char term4[] = {131,108,0,0,0,2,97,0,98,0,0,3,232,106};
+
     erl_init(NULL, 0);
     start_a = term1;
     start_b = term2;
@@ -90,6 +95,13 @@ TESTCASE(compare_list) {
     
     test_compare_ext("lists", start_a, end_a, start_b, end_b, 1);
 
+    start_a = term3;
+    start_b = term4;
+    end_a   = term3 + sizeof(term3);
+    end_b   = term4 + sizeof(term4);
+
+    test_compare_ext("lists1", start_a, end_a, start_b, end_b, -1);
+
     report(1);
 }
 
diff --git a/lib/erl_interface/test/erl_format_SUITE.erl b/lib/erl_interface/test/erl_format_SUITE.erl
index 81a0bca80f..9905669ef9 100644
--- a/lib/erl_interface/test/erl_format_SUITE.erl
+++ b/lib/erl_interface/test/erl_format_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -20,17 +20,37 @@
 %%
 -module(erl_format_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("erl_format_SUITE_data/format_test_cases.hrl").
 
--export([all/1, atoms/1, tuples/1, lists/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, atoms/1, tuples/1, lists/1]).
 
 -import(runner, [get_term/1]).
 
 %% This test suite test the erl_format() function.
 %% It uses the port program "format_test".
 
-all(suite) -> [atoms, tuples, lists].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [atoms, tuples, lists].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% Tests formatting various atoms.
 
diff --git a/lib/erl_interface/test/erl_global_SUITE.erl b/lib/erl_interface/test/erl_global_SUITE.erl
new file mode 100644
index 0000000000..604d72dd24
--- /dev/null
+++ b/lib/erl_interface/test/erl_global_SUITE.erl
@@ -0,0 +1,142 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2000-2009. 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(erl_global_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+-include("erl_global_SUITE_data/erl_global_test_cases.hrl").
+
+-export([all/0,suite/0,init_per_suite/1,end_per_suite/1,
+	 init_per_testcase/2,end_per_testcase/2,
+	 erl_global_registration/1, erl_global_whereis/1, erl_global_names/1]).
+
+-import(runner, [get_term/1,send_term/2]).
+
+-define(GLOBAL_NAME, global_register_node_test).
+
+all() ->
+    [erl_global_registration, erl_global_whereis, erl_global_names].
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_Case, Config) ->
+    Dog = ?t:timetrap(?t:minutes(0.25)),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+erl_global_registration(Config) when is_list(Config) ->
+    ?line P = runner:start(?interpret),
+    ?line {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
+
+    ?line ok = erl_global_register(P, Fd, ?GLOBAL_NAME),
+    ?line ok = erl_global_unregister(P, Fd, ?GLOBAL_NAME),
+
+    ?line 0 = erl_close_connection(P,Fd),
+    ?line runner:send_eot(P),
+    ?line runner:recv_eot(P),
+    ok.
+
+erl_global_whereis(Config) when is_list(Config) ->
+    ?line P = runner:start(?interpret),
+    ?line {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
+
+    ?line Self = self(),
+    ?line yes = global:register_name(?GLOBAL_NAME, Self),
+    ?line Self = erl_global_whereis(P, Fd, ?GLOBAL_NAME),
+    ?line global:unregister_name(?GLOBAL_NAME),
+    ?line 0 = erl_close_connection(P, Fd),
+    ?line runner:send_eot(P),
+    ?line runner:recv_eot(P),
+    ok.
+
+erl_global_names(Config) when is_list(Config) ->
+    ?line P = runner:start(?interpret),
+    ?line {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
+
+    ?line Self = self(),
+    ?line global:register_name(?GLOBAL_NAME, Self),
+    ?line {Names1, _N1} = erl_global_names(P, Fd),
+    ?line true = lists:member(atom_to_list(?GLOBAL_NAME), Names1),
+    ?line global:unregister_name(?GLOBAL_NAME),
+    ?line {Names2, _N2} = erl_global_names(P, Fd),
+    ?line false = lists:member(atom_to_list(?GLOBAL_NAME), Names2),
+    ?line 0 = erl_close_connection(P, Fd),
+    ?line runner:send_eot(P),
+    ?line runner:recv_eot(P),
+    ok.
+
+%%% Interface functions for erl_interface functions.
+
+erl_connect(P, Node, Num, Cookie, Creation) ->
+    send_command(P, erl_connect, [Num, Node, Cookie, Creation]),
+    case get_term(P) of
+	{term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
+	{term,{-1,Errno}} -> {error,Errno}
+    end.
+
+erl_close_connection(P, FD) ->
+    send_command(P, erl_close_connection, [FD]),
+    case get_term(P) of
+	{term,Int} when is_integer(Int) -> Int
+    end.
+
+erl_global_register(P, Fd, Name) ->
+    send_command(P, erl_global_register, [Fd,Name]),
+    get_send_result(P).
+
+erl_global_whereis(P, Fd, Name) ->
+    send_command(P, erl_global_whereis, [Fd,Name]),
+    case get_term(P) of
+	{term, What} ->
+	    What
+    end.
+
+erl_global_names(P, Fd) ->
+    send_command(P, erl_global_names, [Fd]),
+    case get_term(P) of
+	{term, What} ->
+	    What
+    end.
+
+erl_global_unregister(P, Fd, Name) ->
+    send_command(P, erl_global_unregister, [Fd,Name]),
+    get_send_result(P).
+
+get_send_result(P) ->
+    case get_term(P) of
+	{term,{1,_}} -> ok;
+	{term,{0, 0}} -> ok;
+	{term,{-1, Errno}} -> {error,Errno};
+	{term,{_,_}}->
+	    ?t:fail(bad_return_value)
+    end.
+
+send_command(P, Name, Args) ->
+    runner:send_term(P, {Name,list_to_tuple(Args)}).
diff --git a/lib/erl_interface/test/erl_global_SUITE_data/Makefile.first b/lib/erl_interface/test/erl_global_SUITE_data/Makefile.first
new file mode 100644
index 0000000000..8e3fcb924e
--- /dev/null
+++ b/lib/erl_interface/test/erl_global_SUITE_data/Makefile.first
@@ -0,0 +1,21 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2001-2010. 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%
+#
+
+erl_global_test_decl.c: erl_global_test.c
+	erl -noinput -pa ../all_SUITE_data -s init_tc run erl_global_test -s erlang halt
diff --git a/lib/erl_interface/test/erl_global_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_global_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..ef846bc440
--- /dev/null
+++ b/lib/erl_interface/test/erl_global_SUITE_data/Makefile.src
@@ -0,0 +1,41 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2000-2010. 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%
+#
+
+include @erl_interface_mk_include@@[email protected]
+
+CC0 = @CC@
+CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
+LD = @LD@
+LIBPATH = @erl_interface_libpath@
+LIBERL = $(LIBPATH)/@erl_interface_lib@
+LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBFLAGS = ../all_SUITE_data/runner@obj@ \
+	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
+	@erl_interface_threadlib@
+CFLAGS = @EI_CFLAGS@ $(THR_DEFS) -I@erl_interface_include@ -I../all_SUITE_data
+OBJS = erl_global_test@obj@ erl_global_test_decl@obj@
+
+all: erl_global_test@exe@
+
+erl_global_test@exe@: $(OBJS) $(LIBERL) $(LIBEI)
+	$(LD) @CROSSLDFLAGS@ -o $@ $(OBJS) $(LIBFLAGS)
+
+clean:
+	$(RM) $(OBJS)
+	$(RM) erl_global_test@exe@
diff --git a/lib/erl_interface/test/erl_global_SUITE_data/erl_global_test.c b/lib/erl_interface/test/erl_global_SUITE_data/erl_global_test.c
new file mode 100644
index 0000000000..dc0d8a0091
--- /dev/null
+++ b/lib/erl_interface/test/erl_global_SUITE_data/erl_global_test.c
@@ -0,0 +1,263 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2000-2010. 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%
+ */
+
+/*
+ * Purpose: Tests the functions in erl_global.c.
+ *
+ * See the erl_global_SUITE.erl file for a "table of contents".
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "runner.h"
+
+static void cmd_erl_connect(ETERM* args);
+static void cmd_erl_global_register(ETERM *args);
+static void cmd_erl_global_whereis(ETERM *args);
+static void cmd_erl_global_names(ETERM *args);
+static void cmd_erl_global_unregister(ETERM *args);
+static void cmd_erl_close_connection(ETERM *args);
+
+static void send_errno_result(int value);
+
+static struct {
+    char* name;
+    int num_args;		/* Number of arguments. */
+    void (*func)(ETERM* args);
+} commands[] = {
+    "erl_connect", 	     4, cmd_erl_connect,
+    "erl_close_connection",  1, cmd_erl_close_connection,
+    "erl_global_register",   2, cmd_erl_global_register,
+    "erl_global_whereis",    2, cmd_erl_global_whereis,
+    "erl_global_names",      1, cmd_erl_global_names,
+    "erl_global_unregister", 2, cmd_erl_global_unregister,
+};
+
+
+/*
+ * Sends a list contaning all data types to the Erlang side.
+ */
+
+TESTCASE(interpret)
+{
+    ETERM* term;
+
+    erl_init(NULL, 0);
+
+    outer_loop:
+
+    term = get_term();
+
+    if (term == NULL) {
+	report(1);
+	return;
+    } else {
+	ETERM* Func;
+	ETERM* Args;
+	int i;
+
+	if (!ERL_IS_TUPLE(term) || ERL_TUPLE_SIZE(term) != 2) {
+	    fail("term should be a tuple of size 2");
+	}
+
+	Func = erl_element(1, term);
+	if (!ERL_IS_ATOM(Func)) {
+	    fail("function name should be an atom");
+	}
+	Args = erl_element(2, term);
+	if (!ERL_IS_TUPLE(Args)) {
+	    fail("function arguments should be a tuple");
+	}
+	erl_free_term(term);
+	for (i = 0; i < sizeof(commands)/sizeof(commands[0]); i++) {
+	    int n = strlen(commands[i].name);
+	    if (ERL_ATOM_SIZE(Func) != n) {
+		continue;
+	    }
+	    if (memcmp(ERL_ATOM_PTR(Func), commands[i].name, n) == 0) {
+		erl_free_term(Func);
+		if (ERL_TUPLE_SIZE(Args) != commands[i].num_args) {
+		    fail("wrong number of arguments");
+		}
+		commands[i].func(Args);
+		erl_free_term(Args);
+		goto outer_loop;
+	    }
+	}
+	fail("bad command");
+    }
+}
+
+#define VERIFY_TYPE(Test, Term)		        \
+if (!Test(Term)) { 				\
+    fail("wrong type for " #Term);		\
+} else {					\
+}
+
+static void
+cmd_erl_connect(ETERM* args)
+{
+    ETERM* number;
+    ETERM* node;
+    ETERM* cookie;
+
+    int res;
+    char buffer[256];
+
+    number = ERL_TUPLE_ELEMENT(args, 0);
+    VERIFY_TYPE(ERL_IS_INTEGER, number);
+    node = ERL_TUPLE_ELEMENT(args, 1);
+    VERIFY_TYPE(ERL_IS_ATOM, node);
+    cookie = ERL_TUPLE_ELEMENT(args, 2);
+    VERIFY_TYPE(ERL_IS_ATOM, cookie);
+
+    if (ERL_ATOM_SIZE(cookie) == 0) {
+	res = erl_connect_init(ERL_INT_VALUE(number), 0, 0);
+    } else {
+	memcpy(buffer, ERL_ATOM_PTR(cookie), ERL_ATOM_SIZE(cookie));
+	buffer[ERL_ATOM_SIZE(cookie)] = '\0';
+	res = erl_connect_init(ERL_INT_VALUE(number), buffer, 0);
+    }
+
+    if(!res) {
+	send_errno_result(res);
+	return;
+    }
+
+    memcpy(buffer, ERL_ATOM_PTR(node), ERL_ATOM_SIZE(node));
+    buffer[ERL_ATOM_SIZE(node)] = '\0';
+    send_errno_result(erl_connect(buffer));
+}
+
+static void
+cmd_erl_close_connection(ETERM* args)
+{
+    ETERM* number;
+    ETERM* res;
+
+    number = ERL_TUPLE_ELEMENT(args, 0);
+    VERIFY_TYPE(ERL_IS_INTEGER, number);
+    res = erl_mk_int(erl_close_connection(ERL_INT_VALUE(number)));
+    send_term(res);
+    erl_free_term(res);
+}
+
+static void
+cmd_erl_global_register(ETERM* args)
+{
+    ETERM* fd_term = ERL_TUPLE_ELEMENT(args, 0);
+    ETERM* name = ERL_TUPLE_ELEMENT(args, 1);
+    ETERM* pid = erl_mk_pid(erl_thisnodename(), 14, 0, 0);
+
+    char buffer[256];
+
+    VERIFY_TYPE(ERL_IS_INTEGER, fd_term);
+    VERIFY_TYPE(ERL_IS_ATOM, name);
+
+    memcpy(buffer, ERL_ATOM_PTR(name), ERL_ATOM_SIZE(name));
+    buffer[ERL_ATOM_SIZE(name)] = '\0';
+
+    send_errno_result(erl_global_register(ERL_INT_VALUE(fd_term), buffer, pid));
+    erl_free_term(pid);
+}
+
+static void
+cmd_erl_global_whereis(ETERM* args)
+{
+    ETERM* fd_term = ERL_TUPLE_ELEMENT(args, 0);
+    ETERM* name = ERL_TUPLE_ELEMENT(args, 1);
+    ETERM* pid = NULL;
+
+    char buffer[256];
+
+    VERIFY_TYPE(ERL_IS_INTEGER, fd_term);
+    VERIFY_TYPE(ERL_IS_ATOM, name);
+
+    memcpy(buffer, ERL_ATOM_PTR(name), ERL_ATOM_SIZE(name));
+    buffer[ERL_ATOM_SIZE(name)] = '\0';
+
+    pid = erl_global_whereis(ERL_INT_VALUE(fd_term), buffer, NULL);
+    send_term(pid);
+    erl_free_term(pid);
+}
+
+static void
+cmd_erl_global_names(ETERM* args)
+{
+    ETERM* fd_term = ERL_TUPLE_ELEMENT(args, 0);
+
+    ETERM* res_array[2], *res_tuple, *name;
+    char** names = NULL;
+    int count = 0, i;
+
+    VERIFY_TYPE(ERL_IS_INTEGER, fd_term);
+
+    names = erl_global_names(ERL_INT_VALUE(fd_term), &count);
+
+    res_array[0] = erl_mk_empty_list();
+    for(i=0; i<count; i++) {
+	name = erl_mk_string(names[i]);
+	res_array[0] = erl_cons(name, res_array[0]);
+    }
+
+    free(names);
+
+    res_array[1] = erl_mk_int(count);
+    res_tuple = erl_mk_tuple(res_array, 2);
+
+    send_term(res_tuple);
+
+    erl_free_compound(res_array[0]);
+    erl_free_term(res_array[1]);
+    erl_free_term(res_tuple);
+}
+
+static void
+cmd_erl_global_unregister(ETERM* args)
+{
+    ETERM* fd_term = ERL_TUPLE_ELEMENT(args, 0);
+    ETERM* name = ERL_TUPLE_ELEMENT(args, 1);
+
+    char buffer[256];
+
+    VERIFY_TYPE(ERL_IS_INTEGER, fd_term);
+    VERIFY_TYPE(ERL_IS_ATOM, name);
+
+    memcpy(buffer, ERL_ATOM_PTR(name), ERL_ATOM_SIZE(name));
+    buffer[ERL_ATOM_SIZE(name)] = '\0';
+
+    send_errno_result(erl_global_unregister(ERL_INT_VALUE(fd_term), buffer));
+}
+
+static void
+send_errno_result(int value)
+{
+    ETERM* res_array[2];
+    ETERM* res_tuple;
+
+    res_array[0] = erl_mk_int(value);
+    res_array[1] = erl_mk_int(erl_errno);
+    res_tuple = erl_mk_tuple(res_array, 2);
+    send_term(res_tuple);
+    erl_free_term(res_array[0]);
+    erl_free_term(res_array[1]);
+    erl_free_term(res_tuple);
+}
diff --git a/lib/erl_interface/test/erl_interface.cover b/lib/erl_interface/test/erl_interface.cover
new file mode 100644
index 0000000000..879201a3cd
--- /dev/null
+++ b/lib/erl_interface/test/erl_interface.cover
@@ -0,0 +1,2 @@
+{incl_app,erl_interface,details}.
+
diff --git a/lib/erl_interface/test/erl_interface.spec b/lib/erl_interface/test/erl_interface.spec
index 2789bd3e2c..a0a7acfa50 100644
--- a/lib/erl_interface/test/erl_interface.spec
+++ b/lib/erl_interface/test/erl_interface.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../erl_interface_test"}}.
-
+{suites,"../erl_interface_test",all}.
diff --git a/lib/erl_interface/test/erl_match_SUITE.erl b/lib/erl_interface/test/erl_match_SUITE.erl
index f506638544..da5788722c 100644
--- a/lib/erl_interface/test/erl_match_SUITE.erl
+++ b/lib/erl_interface/test/erl_match_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -20,10 +20,12 @@
 %%
 -module(erl_match_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("erl_match_SUITE_data/match_test_cases.hrl").
 
--export([all/1, atoms/1, lists/1, tuples/1, references/1, pids/1, ports/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 atoms/1, lists/1, tuples/1, references/1, pids/1, ports/1,
 	 bind/1, integers/1, floats/1, binaries/1, strings/1]).
 
 %% For interactive running of matcher.
@@ -31,8 +33,27 @@
 
 %% This test suite tests the erl_match() function.
 
-all(suite) -> [atoms, lists, tuples, references, pids, ports, bind, 
-	       integers, floats, binaries, strings].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [atoms, lists, tuples, references, pids, ports, bind,
+     integers, floats, binaries, strings].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
diff --git a/lib/erl_interface/test/port_call_SUITE.erl b/lib/erl_interface/test/port_call_SUITE.erl
index 895e29ad2e..33755c3431 100644
--- a/lib/erl_interface/test/port_call_SUITE.erl
+++ b/lib/erl_interface/test/port_call_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -31,17 +31,37 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
--export([all/1, basic/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, basic/1]).
 % Private exports
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 
-all(suite) -> 
-    [basic].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+[basic].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 basic(suite) -> [];
 basic(Config) when is_list(Config) ->
     case os:type() of
+	{unix, linux} ->
+	    do_basic(Config);
 	{unix, sunos} ->
 	    do_basic(Config);
 	{win32,_} ->
diff --git a/lib/erl_interface/test/runner.erl b/lib/erl_interface/test/runner.erl
index b72723c6a5..e41440708a 100644
--- a/lib/erl_interface/test/runner.erl
+++ b/lib/erl_interface/test/runner.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 589b9e2f9c..ffda886553 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1 +1 @@
-EI_VSN = 3.6.5
+EI_VSN = 3.7.2
diff --git a/lib/et/doc/src/et.xml b/lib/et/doc/src/et.xml
index 9b170dd7d9..5e3453c348 100644
--- a/lib/et/doc/src/et.xml
+++ b/lib/et/doc/src/et.xml
@@ -29,6 +29,7 @@
     <checked></checked>
     <date></date>
     <rev>%VSN%</rev>
+    <file>et</file>
   </header>
   <module>et</module>
   <modulesummary>Main API of the Event Trace (ET) application</modulesummary>
diff --git a/lib/et/doc/src/et_collector.xml b/lib/et/doc/src/et_collector.xml
index 88c478c89a..e9885dcbb3 100644
--- a/lib/et/doc/src/et_collector.xml
+++ b/lib/et/doc/src/et_collector.xml
@@ -29,6 +29,7 @@
     <checked></checked>
     <date></date>
     <rev>%VSN%</rev>
+    <file>et_collector.xml</file>
   </header>
   <module>et_collector</module>
   <modulesummary>Collect trace events and provide a backing storage appropriate for iteration </modulesummary>
diff --git a/lib/et/doc/src/et_selector.xml b/lib/et/doc/src/et_selector.xml
index dd12166d85..34203306bb 100644
--- a/lib/et/doc/src/et_selector.xml
+++ b/lib/et/doc/src/et_selector.xml
@@ -29,6 +29,7 @@
     <checked></checked>
     <date></date>
     <rev>%VSN%</rev>
+    <file>et_selector.xml</file>
   </header>
   <module>et_selector</module>
   <modulesummary>Define event transforms and trace patterns</modulesummary>
diff --git a/lib/et/doc/src/et_tutorial.xmlsrc b/lib/et/doc/src/et_tutorial.xmlsrc
index c72234a587..b0e2bf4af6 100644
--- a/lib/et/doc/src/et_tutorial.xmlsrc
+++ b/lib/et/doc/src/et_tutorial.xmlsrc
@@ -29,6 +29,7 @@
     <checked></checked>
     <date></date>
     <rev>%VSN%</rev>
+    <file>et_tutorial.xml</file>
   </header>
 
   <section>
diff --git a/lib/et/doc/src/et_viewer.xml b/lib/et/doc/src/et_viewer.xml
index c16e5b8869..d4cfbdfa31 100644
--- a/lib/et/doc/src/et_viewer.xml
+++ b/lib/et/doc/src/et_viewer.xml
@@ -29,6 +29,7 @@
     <checked></checked>
     <date></date>
     <rev>%VSN%</rev>
+    <file>et_viewer.xml</file>
   </header>
   <module>et_viewer</module>
   <modulesummary>Displays a sequence chart for trace events (messages/actions)</modulesummary>
diff --git a/lib/et/doc/src/notes.xml b/lib/et/doc/src/notes.xml
index 8611955d3d..cd4787c5e7 100644
--- a/lib/et/doc/src/notes.xml
+++ b/lib/et/doc/src/notes.xml
@@ -36,6 +36,47 @@
   one section in this document. The title of each section is the
   version number of <c>Event Tracer (ET)</c>.</p>
 
+<section><title>ET 1.4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix error when module et was used in et_selector
+	    trace patterns. </p>
+          <p>
+	    Own Id: OTP-8904</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ET 1.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fixed broken links in the documentation. </p>
+          <p>
+	    Own Id: OTP-8796</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fixed gui crash on windows.</p>
+          <p>
+	    Own Id: OTP-8830</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>ET 1.4</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/et/src/et_selector.erl b/lib/et/src/et_selector.erl
index f39f21aa70..c8e9c907b2 100644
--- a/lib/et/src/et_selector.erl
+++ b/lib/et/src/et_selector.erl
@@ -115,13 +115,13 @@ change_pattern({Mod, Pattern}) when is_atom(Mod) ->
 
 old_ctp({Mod, _Fun, Args}) ->
     case Mod of
-	et -> ignore;
+	et -> {ok, ignore};
 	_  -> dbg:ctp({Mod, report_event, Args})
     end.
 
 old_tp({Mod, _Fun, Args}, Pattern) ->
     case Mod of
-	et -> ignore;
+	et -> {ok, ignore};
 	_  -> dbg:tp({Mod, report_event, Args}, Pattern)
     end.
 
diff --git a/lib/et/src/et_wx_viewer.erl b/lib/et/src/et_wx_viewer.erl
index 5cd3563aed..d42f8c0c86 100644
--- a/lib/et/src/et_wx_viewer.erl
+++ b/lib/et/src/et_wx_viewer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -1233,7 +1233,7 @@ create_main_window(S) ->
 		[{flag, ?wxEXPAND}]),
 
     CanvasSizer = wxBoxSizer:new(?wxHORIZONTAL),
-    Canvas = wxPanel:new(Panel, []),
+    Canvas = wxPanel:new(Panel, [{style, ?wxFULL_REPAINT_ON_RESIZE}]),
     {CanvasW,CanvasH} = wxPanel:getSize(Canvas),
     ScrollBar = wxScrollBar:new(Panel, ?wxID_ANY, [{style, ?wxSB_VERTICAL}]),
 
@@ -1244,7 +1244,13 @@ create_main_window(S) ->
     wxPanel:connect(Canvas, left_up),
     wxPanel:connect(Canvas, right_up),
     wxPanel:connect(Canvas, size),
-    wxPanel:connect(Canvas, paint),
+    Self = self(),
+    wxPanel:connect(Canvas, paint, [{callback,  %% Needed on windows
+				     fun(Ev, _) -> 
+					     DC = wxPaintDC:new(Canvas),
+					     wxPaintDC:destroy(DC),
+					     Self ! Ev
+				     end}]),
     wxPanel:connect(Canvas, key_down),
     wxPanel:connect(Canvas, kill_focus),
     wxPanel:connect(Canvas, enter_window, [{skip, true}]), 
@@ -1437,6 +1443,7 @@ create_help_menu(Bar) ->
 
 clear_canvas(S) ->
     DC = wxClientDC:new(S#state.canvas),
+    wxDC:setBackground(DC, ?wxWHITE_BRUSH), %% Needed on mac
     wxDC:clear(DC),
     {CanvasW, CanvasH} = wxPanel:getSize(S#state.canvas),
     wxSizer:recalcSizes(S#state.canvas_sizer),
diff --git a/lib/et/test/Makefile b/lib/et/test/Makefile
index 9aedf96ce9..2125f9622a 100644
--- a/lib/et/test/Makefile
+++ b/lib/et/test/Makefile
@@ -71,8 +71,9 @@ release_spec: opt
 
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) et.spec $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
-	$(INSTALL_PROGRAM) ett $(INSTALL_PROGS) $(RELSYSDIR)
+	$(INSTALL_DATA) et.spec et.cover $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
+	$(INSTALL_SCRIPT) ett $(RELSYSDIR)
+	$(INSTALL_DATA) $(INSTALL_PROGS) $(RELSYSDIR)
 #	chmod -f -R u+w $(RELSYSDIR)
 #	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/et/test/et.cover b/lib/et/test/et.cover
new file mode 100644
index 0000000000..471e6d985d
--- /dev/null
+++ b/lib/et/test/et.cover
@@ -0,0 +1,2 @@
+{incl_app,et,details}.
+
diff --git a/lib/et/test/et.spec b/lib/et/test/et.spec
index 69cd8d7582..09993a217a 100644
--- a/lib/et/test/et.spec
+++ b/lib/et/test/et.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../et_test"}}.
-
+{suites,"../et_test",all}.
diff --git a/lib/et/test/et_test_lib.erl b/lib/et/test/et_test_lib.erl
index b91b63786c..c1bfeb9fc0 100644
--- a/lib/et/test/et_test_lib.erl
+++ b/lib/et/test/et_test_lib.erl
@@ -95,7 +95,7 @@ wx_init_per_suite(Config) ->
 					  exit({skipped, "Can not test on MacOSX"});
 				      {unix, _} ->
 					  io:format("DISPLAY ~s~n", [os:getenv("DISPLAY")]),
-					  case proplists:get_value(xserver, Config, none) of
+					  case ct:get_config(xserver, none) of
 					      none   -> ignore;
 					      Server -> os:putenv("DISPLAY", Server)
 					  end;
@@ -295,7 +295,7 @@ eval_test_case(Mod, Fun, Config) ->
 test_case_evaluator(Mod, Fun, [Config]) ->
     NewConfig = Mod:init_per_testcase(Fun, Config),
     R = apply(Mod, Fun, [NewConfig]),
-    Mod:fin_per_testcase(Fun, NewConfig),
+    Mod:end_per_testcase(Fun, NewConfig),
     exit({test_case_ok, R}).
 
 wait_for_evaluator(Pid, Mod, Fun, Config) ->
@@ -311,12 +311,12 @@ wait_for_evaluator(Pid, Mod, Fun, Config) ->
 	{'EXIT', Pid, {skipped, Reason}} ->
 	    log("<WARNING> Test case ~w skipped, because ~p~n",
 		[{Mod, Fun}, Reason]),
-	    Mod:fin_per_testcase(Fun, Config),
+	    Mod:end_per_testcase(Fun, Config),
 	    {skip, {Mod, Fun}, Reason};
 	{'EXIT', Pid, Reason} ->
 	    log("<ERROR> Eval process ~w exited, because\n\t~p~n",
 		[{Mod, Fun}, Reason]),
-	    Mod:fin_per_testcase(Fun, Config),
+	    Mod:end_per_testcase(Fun, Config),
 	    {crash, {Mod, Fun}, Reason}
     end.
 
diff --git a/lib/et/test/et_wx_SUITE.erl b/lib/et/test/et_wx_SUITE.erl
index 1a16ca69a3..6109ed4e04 100644
--- a/lib/et/test/et_wx_SUITE.erl
+++ b/lib/et/test/et_wx_SUITE.erl
@@ -18,8 +18,9 @@
 
 -module(et_wx_SUITE).
 
--export([all/0, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
 
@@ -36,16 +37,22 @@ init_per_testcase(Func,Config) ->
     et_test_lib:init_per_testcase(Func,Config).
 end_per_testcase(Func,Config) -> 
     et_test_lib:end_per_testcase(Func,Config).
-fin_per_testcase(Func,Config) -> %% For test_server
-    et_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
-all() ->
-    all(suite).
-all(suite) ->
-    [
-     start_all_windows
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [start_all_windows].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% The test cases
 
diff --git a/lib/et/vsn.mk b/lib/et/vsn.mk
index b7d65b12a2..d7cfd7bc84 100644
--- a/lib/et/vsn.mk
+++ b/lib/et/vsn.mk
@@ -1,24 +1 @@
-# This is an -*-makefile-*- file.
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2002-2010. 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%
-
-ET_VSN  = 1.4
-TICKETS = OTP-8058
-
-TICKETS_1_3_3 = OTP-8201
-TICKETS_1_3_2 = OTP-8078
-TICKETS_1_3_1 = OTP-7830
+ET_VSN  = 1.4.2
diff --git a/lib/eunit/doc/overview.edoc b/lib/eunit/doc/overview.edoc
index 2583f0be25..be05a13fba 100644
--- a/lib/eunit/doc/overview.edoc
+++ b/lib/eunit/doc/overview.edoc
@@ -913,7 +913,7 @@ To make the descriptions simpler, we first list some definitions:
 <td>`CleanupX'</td><td>`(X::any(), R::any()) -> any()'</td>
 </tr>
 <tr>
-<td>`Instantiator'</td><td>`((R::any()) -> Tests) | {with, [AbstractTestFun::((any()) -> any())]}'</td>
+<td>`Instantiator'</td><td>`((R::any()) -> Tests | {with, [AbstractTestFun::((any()) -> any())]}'</td>
 </tr>
 <tr>
 <td>`Where'</td><td>`local | spawn | {spawn, Node::atom()}'</td>
diff --git a/lib/eunit/doc/src/Makefile b/lib/eunit/doc/src/Makefile
index 19be96d763..2cdc579275 100644
--- a/lib/eunit/doc/src/Makefile
+++ b/lib/eunit/doc/src/Makefile
@@ -146,7 +146,7 @@ debug opt:
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
 	rm -f $(MAN3DIR)/*
-	rm -f $(XML_CHAPTER_FILES) *.html
+	rm -f $(XML_REF3_FILES) $(XML_CHAPTER_FILES) *.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml
index 974ba1db4e..1717dd7988 100644
--- a/lib/eunit/doc/src/notes.xml
+++ b/lib/eunit/doc/src/notes.xml
@@ -32,6 +32,21 @@
   </header>
   <p>This document describes the changes made to the EUnit application.</p>
 
+<section><title>Eunit 2.1.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix format_man_pages so it handles all man sections
+	    and remove warnings/errors in various man pages. </p>
+          <p>
+	    Own Id: OTP-8600</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eunit 2.1.5</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/eunit/src/eunit.erl b/lib/eunit/src/eunit.erl
index 59084a52fb..4a86a108cf 100644
--- a/lib/eunit/src/eunit.erl
+++ b/lib/eunit/src/eunit.erl
@@ -16,7 +16,7 @@
 %% $Id: eunit.erl 339 2009-04-05 14:10:47Z rcarlsson $
 %%
 %% @copyright 2004-2009 Micka�l R�mond, Richard Carlsson
-%% @author Micka�l R�mond <[email protected]>
+%% @author Micka&euml;l R&eacute;mond <[email protected]>
 %%   [http://www.process-one.net/]
 %% @author Richard Carlsson <[email protected]>
 %%   [http://user.it.uu.se/~richardc/]
diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl
index aeda31d251..eb994a990a 100644
--- a/lib/eunit/src/eunit_surefire.erl
+++ b/lib/eunit/src/eunit_surefire.erl
@@ -15,7 +15,7 @@
 %%
 %% $Id: $
 %%
-%% @author Micka�l R�mond <[email protected]>
+%% @author Micka&euml;l R&eacute;mond <[email protected]>
 %% @copyright 2009 Micka�l R�mond, Paul Guyot
 %% @see eunit
 %% @doc Surefire reports for EUnit (Format used by Maven and Atlassian
diff --git a/lib/eunit/test/Makefile b/lib/eunit/test/Makefile
index 74d485d1cc..a2d276f619 100644
--- a/lib/eunit/test/Makefile
+++ b/lib/eunit/test/Makefile
@@ -75,7 +75,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) eunit.dynspec $(EMAKEFILE) \
+	$(INSTALL_DATA) eunit.spec $(EMAKEFILE) \
 		$(COVERFILE) $(ERL_FILES) \
 		$(RELSYSDIR)
 
diff --git a/lib/eunit/test/eunit.cover b/lib/eunit/test/eunit.cover
index d1eaf770b6..00c09127a8 100644
--- a/lib/eunit/test/eunit.cover
+++ b/lib/eunit/test/eunit.cover
@@ -1,3 +1,5 @@
+{incl_app,eunit,details}.
+
 %% -*- erlang -*-
-{exclude,[eunit_test]}.
+{excl_mods,eunit,[eunit_test]}.
 
diff --git a/lib/eunit/test/eunit.dynspec b/lib/eunit/test/eunit.dynspec
deleted file mode 100644
index c1d345ac14..0000000000
--- a/lib/eunit/test/eunit.dynspec
+++ /dev/null
@@ -1,6 +0,0 @@
-%% -*- erlang -*-
-%% You can test this file using this command.
-%%    file:script("eunit.dynspec", [{'Os',"Unix"}]).
-
-[].
-
diff --git a/lib/eunit/test/eunit.spec b/lib/eunit/test/eunit.spec
new file mode 100644
index 0000000000..2db7731a7e
--- /dev/null
+++ b/lib/eunit/test/eunit.spec
@@ -0,0 +1,3 @@
+%% -*- erlang -*-
+{suites,"../eunit_test",all}.
+
diff --git a/lib/eunit/test/eunit_SUITE.erl b/lib/eunit/test/eunit_SUITE.erl
index 4ebcec6f5d..0f57905d17 100644
--- a/lib/eunit/test/eunit_SUITE.erl
+++ b/lib/eunit/test/eunit_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2010. 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
@@ -18,13 +18,32 @@
 %%
 -module(eunit_SUITE).
 
--export([all/1,eunit_test/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,eunit_test/1]).
 	 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [eunit_test].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 eunit_test(Config) when is_list(Config) ->
     ok = file:set_cwd(code:lib_dir(eunit)),
     ok = eunit:test(eunit).
diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk
index 3bfa9c8000..e1965630e3 100644
--- a/lib/eunit/vsn.mk
+++ b/lib/eunit/vsn.mk
@@ -1 +1 @@
-EUNIT_VSN = 2.1.5
+EUNIT_VSN = 2.1.6
diff --git a/lib/gs/contribs/bonk/bonk.erl b/lib/gs/contribs/bonk/bonk.erl
index 12d94f6c5e..79f01bf659 100644
--- a/lib/gs/contribs/bonk/bonk.erl
+++ b/lib/gs/contribs/bonk/bonk.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-2010. 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%
 %%
 
@@ -33,10 +33,10 @@ run() ->
 run([ColorMode]) ->   % This is for the start script...
     run(ColorMode);
 
-run(ColorMode) when atom(ColorMode) ->
+run(ColorMode) when is_atom(ColorMode) ->
     GS = gs:start(),
-    SoundPid=spawn_link(bonk_sound,start,[]),
-    {H,M,S}=time(),
+    SoundPid = spawn_link(bonk_sound,start,[]),
+    {H,M,S} = time(),
     random:seed(H*13,M*7,S*3),
     {SqrPids, Bmps, Colors} = create_board(GS, ColorMode),
     {ScoreL,_File} = get_highscore(),
@@ -96,7 +96,7 @@ init(SoundPid, SqrPids, Bmps, Colors) ->
 
 game(SoundPid, SqrPids, Bmps, Colors, Scores) ->
     receive
-  	{gs, _Square, buttonpress, SqrPid, [1 | _Rest]} when pid(SqrPid) ->
+	{gs, _Square, buttonpress, SqrPid, [1 | _Rest]} when is_pid(SqrPid) ->
 	    SqrPid ! bonk,
 	    game(SoundPid, SqrPids, Bmps, Colors, Scores);
 	{gs, _Id, buttonpress, _Data, [Butt | _Rest]} when Butt =/= 1 ->
@@ -224,11 +224,9 @@ update_score(SoundPid, SqrPids, Scores) ->
 
 send_to_all([], _Msg) ->
     true;
-
-send_to_all([Pid|Rest],Msg) when pid(Pid) ->
+send_to_all([Pid|Rest],Msg) when is_pid(Pid) ->
     Pid ! Msg,
     send_to_all(Rest,Msg);
-
 send_to_all([_Else|Rest],Msg) ->
     send_to_all(Rest,Msg).
 
@@ -460,7 +458,7 @@ update_scorelist(SoundPid, Scores) ->
 	    {ScoreL,FileName} = get_highscore(),
 	    New_scorelist=update_scorelist_2(ScoreL, Score, 0, SoundPid),
 	    display_highscore(New_scorelist),
-	    case file:open(FileName, write) of
+	    case file:open(FileName, [write]) of
 		{error,_} ->
 		    true;
 		{ok,FD} ->
@@ -559,7 +557,7 @@ display_about() ->
 					   {activebg, BGColor}]),
     gs:create(text, aboutText, aboutCan, [{width, Wid-30}, {coords, [{15, 0}]},
 					  {fg, TextColor}, {justify, center}]),
-    case file:open(lists:append(bonk_dir(),"bonk.txt"), read) of
+    case file:open(lists:append(bonk_dir(),"bonk.txt"), [read]) of
 	{ok, Fd} ->
 	    write_text(Fd, "", io:get_line(Fd, "")),
 	    file:close(Fd);
diff --git a/lib/gs/contribs/othello/othello_adt.erl b/lib/gs/contribs/othello/othello_adt.erl
index d1d3ec950b..fb60c30b89 100644
--- a/lib/gs/contribs/othello/othello_adt.erl
+++ b/lib/gs/contribs/othello/othello_adt.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-2010. 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%
 %%
 
@@ -375,29 +375,29 @@ is_good(Colour,H,Board) ->
     false.
 
 is_good_0(_,_,false,_) -> false;
-is_good_0(_,H,D,_) when integer(H), integer(D), H+D<0 -> false;
-is_good_0(_,H,D,_) when integer(H), integer(D), H+D>63 -> false;
-is_good_0(black,H,D,Board) when integer(H), integer(D) ->
+is_good_0(_,H,D,_) when is_integer(H), is_integer(D), H+D<0 -> false;
+is_good_0(_,H,D,_) when is_integer(H), is_integer(D), H+D>63 -> false;
+is_good_0(black,H,D,Board) when is_integer(H), is_integer(D) ->
     case element((H+D)+1,Board) of
 	white -> is_good_1(black,H+D,dir(H+D,D),Board);
 	_     -> false
     end;
-is_good_0(white,H,D,Board) when integer(H), integer(D) -> 
+is_good_0(white,H,D,Board) when is_integer(H), is_integer(D) ->
     case element((H+D)+1,Board) of
 	black -> is_good_1(white,H+D,dir(H+D,D),Board);
 	_     -> false
     end.
 
 is_good_1(_,_,false,_) -> false;
-is_good_1(_,H,D,_) when integer(H), integer(D), H+D<0 -> false;
-is_good_1(_,H,D,_) when integer(H), integer(D), H+D>63 -> false;
-is_good_1(black,H,D,Board) when integer(H), integer(D) -> 
+is_good_1(_,H,D,_) when is_integer(H), is_integer(D), H+D<0 -> false;
+is_good_1(_,H,D,_) when is_integer(H), is_integer(D), H+D>63 -> false;
+is_good_1(black,H,D,Board) when is_integer(H), is_integer(D) ->
     case element((H+D)+1,Board) of
 	white -> is_good_1(black,H+D,dir(H+D,D),Board);
 	black -> throw(true);
 	_     -> false
     end;
-is_good_1(white,H,D,Board) when integer(H), integer(D) -> 
+is_good_1(white,H,D,Board) when is_integer(H), is_integer(D) ->
     case element((H+D)+1,Board) of
 	black -> is_good_1(white,H+D,dir(H+D,D),Board);
 	white -> throw(true);
@@ -429,15 +429,15 @@ turn(Colour,H,D,Board) ->
 	    Board
     end.
 
-turn_0(_,H,D,B) when integer(H), integer(D), H+D<0 -> B;
-turn_0(_,H,D,B) when integer(H), integer(D), H+D>63 -> B;
-turn_0(black,H,D,Board) when integer(H), integer(D) ->
+turn_0(_,H,D,B) when is_integer(H), is_integer(D), H+D<0 -> B;
+turn_0(_,H,D,B) when is_integer(H), is_integer(D), H+D>63 -> B;
+turn_0(black,H,D,Board) when is_integer(H), is_integer(D) ->
     E = H+D,
     case element(E+1,Board) of
 	white -> turn_0(black,H+D,D,swap(black,E,Board));
 	_     -> Board
     end;
-turn_0(white,H,D,Board) when integer(H), integer(D) ->
+turn_0(white,H,D,Board) when is_integer(H), is_integer(D) ->
     E = H+D,
     case element(E+1,Board) of
 	black -> turn_0(white,H+D,D,swap(white,E,Board));
@@ -450,7 +450,7 @@ turn_0(white,H,D,Board) when integer(H), integer(D) ->
 %%                          Neighbours are not changed !!
 %%-------------------------------------------------------
 
-swap(Colour,Pos,Board) when integer(Pos) ->
+swap(Colour,Pos,Board) when is_integer(Pos) ->
     setelement(Pos+1,Board,Colour).
 
 score(Pos) -> score1({col(Pos),row(Pos)}).
diff --git a/lib/gs/doc/src/gs.xml b/lib/gs/doc/src/gs.xml
index b1c7e505dc..f2182fc673 100644
--- a/lib/gs/doc/src/gs.xml
+++ b/lib/gs/doc/src/gs.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2000</year>
-      <year>2007</year>
+      <year>2010</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,18 @@
   <module>gs</module>
   <modulesummary>The Graphics System for Erlang.</modulesummary>
   <description>
+    <warning>
+      <p>
+	GS is not recommended for use in new applications.
+	Instead we recommend WX for applications that need a
+	graphical user interface.
+      </p>
+      <p>
+	GS is not maintained and we plan to deprecate and remove it from
+	the distribution as soon as possible, maybe already in the next
+	major release (R15).
+      </p>
+    </warning>
     <p>The Graphics System, GS, is easy to learn and
       designed to be portable to many different platforms.</p>
     <p>In the description below, the type <c><![CDATA[gsobj()]]></c> denotes a
diff --git a/lib/gs/doc/src/gs_chapter1.xml b/lib/gs/doc/src/gs_chapter1.xml
index cfcae94f7c..912d6e1ef9 100644
--- a/lib/gs/doc/src/gs_chapter1.xml
+++ b/lib/gs/doc/src/gs_chapter1.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,18 @@
 
   <section>
     <title>Introduction</title>
+    <warning>
+      <p>
+	GS is not recommended for use in new applications.
+	Instead we recommend WX for applications that need a
+	graphical user interface.
+      </p>
+      <p>
+	GS is not maintained and we plan to deprecate and remove it from
+	the distribution as soon as possible, maybe already in the next
+	major release (R15).
+      </p>
+    </warning>
     <p>This section describes the general graphics interface to Erlang. This system was designed with the following requirements in mind:</p>
     <list type="bulleted">
       <item>a graphics system which is easy to learn</item>
diff --git a/lib/gs/doc/src/notes.xml b/lib/gs/doc/src/notes.xml
index 8e4032ccc1..744efbd4fc 100644
--- a/lib/gs/doc/src/notes.xml
+++ b/lib/gs/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>GS Release Notes</title>
@@ -30,7 +30,27 @@
   </header>
   <p>This document describes the changes made to the GS application.</p>
 
-  <section>
+  <section><title>GS 1.5.13</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The documentation for GS is updated with the warning that
+	    it should not be used in new applications. GS is planned
+	    to be deprecated soon and might be removed from the
+	    distribution already in the next major release (R15). For
+	    graphical applications we recommend the use of WX
+	    instead.</p>
+          <p>
+	    Own Id: OTP-8824</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section>
     <title>GS 1.5.10</title>
 
     <section>
@@ -47,7 +67,22 @@
     </section>
   </section>
 
-  <section><title>GS 1.5.11</title>
+  <section><title>GS 1.5.12</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Warnings due to new autoimported BIFs removed</p>
+          <p>
+	    Own Id: OTP-8674 Aux Id: OTP-8579 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>GS 1.5.11</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/gs/vsn.mk b/lib/gs/vsn.mk
index 701d0e178d..4c91857572 100644
--- a/lib/gs/vsn.mk
+++ b/lib/gs/vsn.mk
@@ -1,2 +1,2 @@
-GS_VSN = 1.5.11
+GS_VSN = 1.5.13
 
diff --git a/lib/hipe/cerl/cerl_closurean.erl b/lib/hipe/cerl/cerl_closurean.erl
index 12771668ac..021acd5b35 100644
--- a/lib/hipe/cerl/cerl_closurean.erl
+++ b/lib/hipe/cerl/cerl_closurean.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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%
 %%
 %% =====================================================================
@@ -808,7 +808,7 @@ take_work({Queue0, Set0}) ->
 is_escape_op(match_fail, 1) -> false; 
 is_escape_op(F, A) when is_atom(F), is_integer(A) -> true.
 
--spec is_escape_op(module(), atom(), arity()) -> boolean().
+-spec is_escape_op(atom(), atom(), arity()) -> boolean().
 
 is_escape_op(erlang, error, 1) -> false;
 is_escape_op(erlang, error, 2) -> false;
@@ -825,7 +825,7 @@ is_escape_op(M, F, A) when is_atom(M), is_atom(F), is_integer(A) -> true.
 is_literal_op(match_fail, 1) -> true;
 is_literal_op(F, A) when is_atom(F), is_integer(A) -> false.
 
--spec is_literal_op(module(), atom(), arity()) -> boolean().
+-spec is_literal_op(atom(), atom(), arity()) -> boolean().
 
 is_literal_op(erlang, '+', 2) -> true;
 is_literal_op(erlang, '-', 2) -> true;
diff --git a/lib/hipe/cerl/cerl_messagean.erl b/lib/hipe/cerl/cerl_messagean.erl
index 0753376e7d..6dd93adaa3 100644
--- a/lib/hipe/cerl/cerl_messagean.erl
+++ b/lib/hipe/cerl/cerl_messagean.erl
@@ -1,19 +1,19 @@
 %% =====================================================================
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2004-2010. 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%
 %%
 %% Message analysis of Core Erlang programs.
@@ -1043,7 +1043,7 @@ get_deps(L, Dep) ->
 
 %% is_escape_op(_F, _A) -> [].
 
--spec is_escape_op(module(), atom(), arity()) -> [arity()].
+-spec is_escape_op(atom(), atom(), arity()) -> [arity()].
 
 is_escape_op(erlang, '!', 2) -> [2];
 is_escape_op(erlang, send, 2) -> [2];
@@ -1064,7 +1064,7 @@ is_escape_op(_M, _F, _A) -> [].
 is_imm_op(match_fail, 1) -> true; 
 is_imm_op(_, _) -> false.
 
--spec is_imm_op(module(), atom(), arity()) -> boolean().
+-spec is_imm_op(atom(), atom(), arity()) -> boolean().
 
 is_imm_op(erlang, self, 0) -> true;
 is_imm_op(erlang, '=:=', 2) -> true;
@@ -1102,4 +1102,4 @@ is_imm_op(erlang, throw, 1) -> true;
 is_imm_op(erlang, exit, 1) -> true;
 is_imm_op(erlang, error, 1) -> true;
 is_imm_op(erlang, error, 2) -> true;
-is_imm_op(_, _, _) -> false.
+is_imm_op(_M, _F, _A) -> false.
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index be3073c0e6..30b911c41b 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -48,6 +48,7 @@
 		    t_boolean/0,
 		    t_byte/0,
 		    t_char/0,
+		    t_charlist/0,
 		    t_cons/0,
 		    t_cons/2,
 		    t_cons_hd/1,
@@ -124,7 +125,8 @@
 		    t_tuple/1,
 		    t_tuple_args/1,
 		    t_tuple_size/1,
-		    t_tuple_subtypes/1
+		    t_tuple_subtypes/1,
+		    t_unicode_string/0
 		   ]).
 
 -ifdef(DO_ERL_BIF_TYPES_TEST).
@@ -143,128 +145,65 @@ type(M, F, A) ->
 
 -spec type(atom(), atom(), arity(), [erl_types:erl_type()]) -> erl_types:erl_type().
 
-%%-- code ---------------------------------------------------------------------
-type(code, add_path, 1, Xs) ->
-  strict(arg_types(code, add_path, 1), Xs,
-	 fun (_) ->
-	     t_sup(t_boolean(),
-		   t_tuple([t_atom('error'), t_atom('bad_directory')]))
+%%-- binary -------------------------------------------------------------------
+type(binary, at, 2, Xs) ->
+  strict(arg_types(binary, at, 2), Xs, fun(_) -> t_integer() end);
+type(binary, bin_to_list, Arity, Xs) when 1 =< Arity, Arity =< 3 ->
+  strict(arg_types(binary, bin_to_list, Arity), Xs,
+	 fun(_) -> t_list(t_integer()) end);
+type(binary, compile_pattern, 1, Xs) ->
+  strict(arg_types(binary, compile_pattern, 1), Xs,
+	 fun(_) -> t_tuple([t_atom(bm),t_binary()]) end);
+type(binary, copy, Arity, Xs)  when Arity =:= 1; Arity =:= 2 ->
+  strict(arg_types(binary, copy, Arity), Xs,
+	 fun(_) -> t_binary() end);
+type(binary, decode_unsigned, Arity, Xs)  when Arity =:= 1; Arity =:= 2 ->
+  strict(arg_types(binary, decode_unsigned, Arity), Xs,
+	 fun(_) -> t_non_neg_integer() end);
+type(binary, encode_unsigned, Arity, Xs)  when Arity =:= 1; Arity =:= 2 ->
+  strict(arg_types(binary, encode_unsigned, Arity), Xs,
+	 fun(_) -> t_binary() end);
+type(binary, first, 1, Xs) ->
+  strict(arg_types(binary, first, 1), Xs, fun(_) -> t_non_neg_integer() end);
+type(binary, last, 1, Xs) ->
+  strict(arg_types(binary, last, 1), Xs, fun(_) -> t_non_neg_integer() end);
+type(binary, list_to_bin, 1, Xs) ->
+  type(erlang, list_to_binary, 1, Xs);
+type(binary, longest_common_prefix, 1, Xs) ->
+  strict(arg_types(binary, longest_common_prefix, 1), Xs,
+	 fun(_) -> t_integer() end);
+type(binary, longest_common_suffix, 1, Xs) ->
+  strict(arg_types(binary, longest_common_suffix, 1), Xs,
+	 fun(_) -> t_integer() end);
+type(binary, match, Arity, Xs) when Arity =:= 2; Arity =:= 3 ->
+  strict(arg_types(binary, match, Arity), Xs,
+	 fun(_) ->
+	     t_sup(t_atom('nomatch'), t_binary_canonical_part())
 	 end);
-type(code, add_patha, 1, Xs) ->
-  type(code, add_path, 1, Xs);
-type(code, add_paths, 1, Xs) ->
-  strict(arg_types(code, add_paths, 1), Xs, fun(_) -> t_atom('ok') end);
-type(code, add_pathsa, 1, Xs) ->
-  type(code, add_paths, 1, Xs);
-type(code, add_pathsz, 1, Xs) ->
-  type(code, add_paths, 1, Xs);
-type(code, add_pathz, 1, Xs) ->
-  type(code, add_path, 1, Xs);
-type(code, all_loaded, 0, _) ->
-  t_list(t_tuple([t_atom(), t_code_loaded_fname_or_status()]));
-type(code, compiler_dir, 0, _) ->
-  t_string();
-type(code, del_path, 1, Xs) ->
-  strict(arg_types(code, del_path, 1), Xs,
-	 fun (_) ->
-	     t_sup(t_boolean(),
-		   t_tuple([t_atom('error'), t_atom('bad_name')]))
-	 end);
-type(code, delete, 1, Xs) ->
-  strict(arg_types(code, delete, 1), Xs, fun (_) -> t_boolean() end);
-type(code, ensure_loaded, 1, Xs) ->
-  type(code, load_file, 1, Xs);
+type(binary, matches, Arity, Xs) when Arity =:= 2; Arity =:= 3 ->
+  strict(arg_types(binary, matches, Arity), Xs,
+	 fun(_) -> t_list(t_binary_canonical_part()) end);
+type(binary, part, 2, Xs) ->
+  type(erlang, binary_part, 2, Xs);
+type(binary, part, 3, Xs) ->
+  type(erlang, binary_part, 3, Xs);
+type(binary, referenced_byte_size, 1, Xs) ->
+  strict(arg_types(binary, referenced_byte_size, 1), Xs,
+	 fun(_) -> t_non_neg_integer() end);
+%%-- code ---------------------------------------------------------------------
 type(code, get_chunk, 2, Xs) ->
   strict(arg_types(code, get_chunk, 2), Xs,
 	 fun (_) -> t_sup(t_binary(), t_atom('undefined')) end);
-type(code, get_object_code, 1, Xs) ->
-  strict(arg_types(code, get_object_code, 1), Xs,
-	 fun (_) ->
-	     t_sup(t_tuple([t_atom(), t_binary(), t_string()]),
-		   t_atom('error'))
-	 end);
-type(code, get_path, 0, _) ->
-  t_list(t_string());
-type(code, is_loaded, 1, Xs) ->
-  strict(arg_types(code, is_loaded, 1), Xs,
-	 fun (_) ->
-	     t_sup([t_tuple([t_atom('file'), t_code_loaded_fname_or_status()]),
-		    t_atom('false')])
-	 end);
-type(code, is_sticky, 1, Xs) ->
-  strict(arg_types(code, is_sticky, 1), Xs, fun (_) -> t_boolean() end);
 type(code, is_module_native, 1, Xs) ->
   strict(arg_types(code, is_module_native, 1), Xs,
 	 fun (_) -> t_sup(t_boolean(), t_atom('undefined')) end);
-type(code, lib_dir, 0, _) ->
-  t_string();
-type(code, lib_dir, 1, Xs) ->
-  strict(arg_types(code, lib_dir, 1), Xs,
-	 fun (_) ->
-	     t_sup(t_string(),
- 		   t_tuple([t_atom('error'), t_atom('bad_name')]))
- 	 end);
-type(code, load_abs, 1, Xs) ->
-  strict(arg_types(code, load_abs, 1), Xs,
-	 fun ([_File]) -> t_code_load_return(t_atom()) end);	% XXX: cheating
-type(code, load_abs, 2, Xs) ->
-  strict(arg_types(code, load_abs, 2), Xs,
-	 fun ([_File,Mod]) -> t_code_load_return(Mod) end);
-type(code, load_binary, 3, Xs) ->
-  strict(arg_types(code, load_binary, 3), Xs,
-	 fun ([Mod,_File,_Bin]) -> t_code_load_return(Mod) end);
-type(code, load_file, 1, Xs) ->
-  strict(arg_types(code, load_file, 1), Xs,
-	 fun ([Mod]) -> t_code_load_return(Mod) end);
-type(code, load_native_partial, 2, Xs) ->
-  strict(arg_types(code, load_native_partial, 2), Xs,
-	 fun ([Mod,_Bin]) -> t_code_load_return(Mod) end);
-type(code, load_native_sticky, 3, Xs) ->
-  strict(arg_types(code, load_native_sticky, 3), Xs,
-        fun ([Mod,_Bin,_]) -> t_code_load_return(Mod) end);
 type(code, module_md5, 1, Xs) ->
   strict(arg_types(code, module_md5, 1), Xs,
 	 fun (_) -> t_sup(t_binary(), t_atom('undefined')) end);
 type(code, make_stub_module, 3, Xs) ->
   strict(arg_types(code, make_stub_module, 3), Xs, fun ([Mod,_,_]) -> Mod end);
-type(code, priv_dir, 1, Xs) ->
-  strict(arg_types(code, priv_dir, 1), Xs,
-	 fun (_) ->
-	     t_sup(t_string(), t_tuple([t_atom('error'), t_atom('bad_name')]))
-	 end);
-type(code, purge, 1, Xs) ->
-  type(code, delete, 1, Xs);
-type(code, rehash, 0, _) -> t_atom('ok');
-type(code, replace_path, 2, Xs) ->
-  strict(arg_types(code, replace_path, 2), Xs,
-	 fun (_) ->
-	     t_sup([t_atom('true'),
-		    t_tuple([t_atom('error'), t_atom('bad_name')]),
-		    t_tuple([t_atom('error'), t_atom('bad_directory')]),
-		    t_tuple([t_atom('error'),
-			     t_tuple([t_atom('badarg'), t_any()])])])
-	 end);
-type(code, root_dir, 0, _) ->
-  t_string();
-type(code, set_path, 1, Xs) ->
-  strict(arg_types(code, set_path, 1), Xs,
-	 fun (_) ->
-	     t_sup([t_atom('true'),
-		    t_tuple([t_atom('error'), t_atom('bad_path')]),
-		    t_tuple([t_atom('error'), t_atom('bad_directory')])])
-	 end);
-type(code, soft_purge, 1, Xs) ->
-  type(code, delete, 1, Xs);
-type(code, stick_mod, 1, Xs) ->
-  strict(arg_types(code, stick_mod, 1), Xs, fun (_) -> t_atom('true') end);
-type(code, unstick_mod, 1, Xs) ->
-  type(code, stick_mod, 1, Xs);
-type(code, which, 1, Xs) ->
-  strict(arg_types(code, which, 1), Xs,
-	 fun (_) ->
-	     t_sup([t_code_loaded_fname_or_status(),
-		    t_atom('non_existing')])
-	 end);
+type(code, rehash, 0, _) ->
+  t_atom('ok');
 %%-- erl_ddll -----------------------------------------------------------------
 type(erl_ddll, demonitor, 1, Xs) ->
   type(erlang, demonitor, 1, Xs);
@@ -665,6 +604,14 @@ type(erlang, 'bnot', 1, Xs) ->
 %%  strict(arg_types(erlang, 'bnot', 1), Xs, fun (_) -> t_integer() end);
 type(erlang, abs, 1, Xs) ->
   strict(arg_types(erlang, abs, 1), Xs, fun ([X]) -> X end);
+type(erlang, adler32, 1, Xs) ->
+  strict(arg_types(erlang, adler32, 1), Xs, fun (_) -> t_adler32() end);
+type(erlang, adler32, 2, Xs) ->
+  strict(arg_types(erlang, adler32, 2), Xs, fun (_) -> t_adler32() end);
+type(erlang, adler32_combine, 3, Xs) ->
+  strict(arg_types(erlang, adler32_combine, 3), Xs,
+	 fun (_) -> t_adler32() end);
+type(erlang, append, 2, Xs) -> type(erlang, '++', 2, Xs); % alias
 type(erlang, append_element, 2, Xs) ->
   strict(arg_types(erlang, append_element, 2), Xs, fun (_) -> t_tuple() end);
 type(erlang, apply, 2, Xs) ->
@@ -683,6 +630,10 @@ type(erlang, atom_to_binary, 2, Xs) ->
   strict(arg_types(erlang, atom_to_binary, 2), Xs, fun (_) -> t_binary() end);
 type(erlang, atom_to_list, 1, Xs) ->
   strict(arg_types(erlang, atom_to_list, 1), Xs, fun (_) -> t_string() end);
+type(erlang, binary_part, 2, Xs) ->
+  strict(arg_types(erlang, binary_part, 2), Xs, fun (_) -> t_binary() end);
+type(erlang, binary_part, 3, Xs) ->
+  strict(arg_types(erlang, binary_part, 3), Xs, fun (_) -> t_binary() end);
 type(erlang, binary_to_atom, 2, Xs) ->
   strict(arg_types(erlang, binary_to_atom, 2), Xs, fun (_) -> t_atom() end);
 type(erlang, binary_to_existing_atom, 2, Xs) ->
@@ -726,11 +677,11 @@ type(erlang, check_process_code, 2, Xs) ->
 type(erlang, concat_binary, 1, Xs) ->
   strict(arg_types(erlang, concat_binary, 1), Xs, fun (_) -> t_binary() end);
 type(erlang, crc32, 1, Xs) ->
-  strict(arg_types(erlang, crc32, 1), Xs, fun (_) -> t_integer() end);
+  strict(arg_types(erlang, crc32, 1), Xs, fun (_) -> t_crc32() end);
 type(erlang, crc32, 2, Xs) ->
-  strict(arg_types(erlang, crc32, 2), Xs, fun (_) -> t_integer() end);
+  strict(arg_types(erlang, crc32, 2), Xs, fun (_) -> t_crc32() end);
 type(erlang, crc32_combine, 3, Xs) ->
-  strict(arg_types(erlang, crc32_combine, 3), Xs, fun (_) -> t_integer() end);
+  strict(arg_types(erlang, crc32_combine, 3), Xs, fun (_) -> t_crc32() end);
 type(erlang, date, 0, _) ->
   t_date();
 type(erlang, decode_packet, 3, Xs) ->
@@ -752,6 +703,10 @@ type(erlang, demonitor, 2, Xs) ->
 type(erlang, disconnect_node, 1, Xs) ->
   strict(arg_types(erlang, disconnect_node, 1), Xs, fun (_) -> t_boolean() end);
 type(erlang, display, 1, _) -> t_atom('true');
+type(erlang, display_string, 1, Xs) ->
+  strict(arg_types(erlang, display_string, 1), Xs, fun(_) -> t_atom('true') end);
+type(erlang, display_nl, 0, _) ->
+  t_atom('true');
 type(erlang, dist_exit, 3, Xs) ->
   strict(arg_types(erlang, dist_exit, 3), Xs, fun (_) -> t_atom('true') end);
 type(erlang, element, 2, Xs) ->
@@ -802,6 +757,8 @@ type(erlang, fun_to_list, 1, Xs) ->
 type(erlang, garbage_collect, 0, _) -> t_atom('true');
 type(erlang, garbage_collect, 1, Xs) ->
   strict(arg_types(erlang, garbage_collect, 1), Xs, fun (_) -> t_boolean() end);
+type(erlang, garbage_collect_message_area, 0, _) ->
+  t_boolean();
 type(erlang, get, 0, _) -> t_list(t_tuple(2));
 type(erlang, get, 1, _) -> t_any();          % | t_atom('undefined')
 type(erlang, get_cookie, 0, _) -> t_atom();  % | t_atom('nocookie')
@@ -1155,6 +1112,10 @@ type(erlang, monitor_node, 2, Xs) ->
 type(erlang, monitor_node, 3, Xs) ->
   strict(arg_types(erlang, monitor_node, 3), Xs,
 	 fun (_) -> t_atom('true') end);
+type(erlang, nif_error, 1, _) ->
+  t_any();   % this BIF and the next one are stubs for NIFs and never return
+type(erlang, nif_error, 2, Xs) ->
+  strict(arg_types(erlang, nif_error, 2), Xs, fun (_) -> t_any() end);
 type(erlang, node, 0, _) -> t_node();
 type(erlang, node, 1, Xs) ->
   strict(arg_types(erlang, node, 1), Xs, fun (_) -> t_node() end);
@@ -1173,8 +1134,8 @@ type(erlang, phash2, 2, Xs) ->
   strict(arg_types(erlang, phash2, 2), Xs, fun (_) -> t_non_neg_integer() end);
 type(erlang, pid_to_list, 1, Xs) ->
   strict(arg_types(erlang, pid_to_list, 1), Xs, fun (_) -> t_string() end);
-type(erlang, port_call, 3, Xs) ->
-  strict(arg_types(erlang, port_call, 3), Xs, fun (_) -> t_any() end);
+type(erlang, port_call, Arity, Xs) when Arity =:= 2; Arity =:= 3 ->
+  strict(arg_types(erlang, port_call, Arity), Xs, fun (_) -> t_any() end);
 type(erlang, port_close, 1, Xs) ->
   strict(arg_types(erlang, port_close, 1), Xs,
 	 fun (_) -> t_atom('true') end);
@@ -1503,6 +1464,7 @@ type(erlang, statistics, 1, Xs) ->
 		 T_statistics_1
 	     end
 	 end);
+type(erlang, subtract, 2, Xs) -> type(erlang, '--', 2, Xs); % alias
 type(erlang, suspend_process, 1, Xs) ->
   strict(arg_types(erlang, suspend_process, 1), Xs,
 	 fun (_) -> t_atom('true') end);
@@ -1570,7 +1532,6 @@ type(erlang, system_info, 1, Xs) ->
 					    t_non_neg_integer()])]));
 		   ['allocator'] ->
 		     t_tuple([t_sup([t_atom('undefined'),
-				     t_atom('elib_malloc'),
 				     t_atom('glibc')]),
 			      t_list(t_integer()),
 			      t_list(t_atom()),
@@ -1591,11 +1552,10 @@ type(erlang, system_info, 1, Xs) ->
 		     t_binary();
 		   ['dist_ctrl'] ->
 		     t_list(t_tuple([t_atom(), t_sup([t_pid(), t_port])]));
-		   ['elib_malloc'] ->
-		     t_sup([t_atom('false'),
-			    t_list(t_tuple([t_atom(), t_any()]))]);
+		   %% elib_malloc is intentionally not included,
+		   %% because it scheduled for removal in R15.
 		   ['endian'] ->
-		     t_sup([t_atom('big'), t_atom('little')]);
+		     t_endian();
 		   ['fullsweep_after'] ->
 		     t_tuple([t_atom('fullsweep_after'), t_non_neg_integer()]);
 		   ['garbage_collection'] ->
@@ -1607,9 +1567,8 @@ type(erlang, system_info, 1, Xs) ->
 		   ['heap_type'] ->
 		     t_sup([t_atom('private'), t_atom('hybrid')]);
 		   ['hipe_architecture'] ->
-		     t_sup([t_atom('amd64'), t_atom('arm'),
-			    t_atom('powerpc'), t_atom('undefined'),
-			    t_atom('ultrasparc'), t_atom('x86')]);
+		     t_atoms(['amd64', 'arm', 'powerpc', 'ppc64',
+			      'undefined', 'ultrasparc', 'x86']);
 		   ['info'] ->
 		     t_binary();
 		   ['internal_cpu_topology'] -> %% Undocumented internal feature
@@ -1785,11 +1744,23 @@ type(erts_debug, disassemble, 1, Xs) ->
 	 fun (_) -> t_sup([t_atom('false'),
 			   t_atom('undef'),
 			   t_tuple([t_integer(), t_binary(), t_mfa()])]) end);
+type(erts_debug, display, 1, _) ->
+  t_string();
 type(erts_debug, dist_ext_to_term, 2, Xs) ->
   strict(arg_types(erts_debug, dist_ext_to_term, 2), Xs,
 	 fun (_) -> t_any() end);
+type(erts_debug, dump_monitors, 1, Xs) ->
+  strict(arg_types(erts_debug, dump_monitors, 1), Xs,
+	 fun(_) -> t_atom('true') end);
+type(erts_debug, dump_links, 1, Xs) ->
+  strict(arg_types(erts_debug, dump_links, 1), Xs,
+	 fun(_) -> t_atom('true') end);
 type(erts_debug, flat_size, 1, Xs) ->
   strict(arg_types(erts_debug, flat_size, 1), Xs, fun (_) -> t_integer() end);
+type(erts_debug, get_internal_state, 1, _) ->
+  t_any();
+type(erts_debug, instructions, 0, _) ->
+  t_list(t_list(t_byte()));
 type(erts_debug, lock_counters, 1, Xs) ->
   strict(arg_types(erts_debug, lock_counters, 1), Xs,
 	 fun ([Arg]) ->
@@ -1810,6 +1781,8 @@ type(erts_debug, lock_counters, 1, Xs) ->
 	 end);
 type(erts_debug, same, 2, Xs) ->
   strict(arg_types(erts_debug, same, 2), Xs, fun (_) -> t_boolean() end);
+type(erts_debug, set_internal_state, 2, _) ->
+  t_any();
 %%-- ets ----------------------------------------------------------------------
 type(ets, all, 0, _) ->
   t_list(t_tab());
@@ -1893,38 +1866,40 @@ type(ets, slot, 2, Xs) ->
   strict(arg_types(ets, slot, 2), Xs,
 	 fun (_) -> t_sup(t_list(t_tuple()), t_atom('$end_of_table')) end);
 type(ets, update_counter, 3, Xs) ->
-  strict(arg_types(ets, update_counter, 3), Xs, fun (_) -> t_integer() end);
+  strict(arg_types(ets, update_counter, 3), Xs,
+	 fun ([_, _, Op]) ->
+	     case t_is_integer(Op) of
+	       true -> t_integer();
+	       false ->
+		 case t_is_tuple(Op) of
+		   true -> t_integer();
+		   false ->
+		     case t_is_list(Op) of
+		       true -> t_list(t_integer());
+		       false ->
+			 case t_is_nil(Op) of
+			   true -> t_nil();
+			   false -> t_sup([t_integer(), t_list(t_integer())])
+			 end
+		     end
+		 end
+	     end
+	 end);
 type(ets, update_element, 3, Xs) ->
   strict(arg_types(ets, update_element, 3), Xs, fun (_) -> t_boolean() end);
 %%-- file ---------------------------------------------------------------------
-type(file, close, 1, Xs) ->
-  strict(arg_types(file, close, 1), Xs, fun (_) -> t_file_return() end);
-type(file, delete, 1, Xs) ->
-  strict(arg_types(file, delete, 1), Xs, fun (_) -> t_file_return() end);
-type(file, get_cwd, 0, _) ->
-  t_sup(t_tuple([t_atom('ok'), t_string()]),
-	t_tuple([t_atom('error'), t_file_posix_error()]));
-type(file, make_dir, 1, Xs) ->
-  strict(arg_types(file, make_dir, 1), Xs, fun (_) -> t_file_return() end);
-type(file, open, 2, Xs) ->
-  strict(arg_types(file, open, 2), Xs,
-	 fun (_) ->
-	     t_sup([t_tuple([t_atom('ok'), t_file_io_device()]),
-		    t_tuple([t_atom('error'), t_file_posix_error()])])
-	 end);
-type(file, read_file, 1, Xs) ->
-  strict(arg_types(file, read_file, 1), Xs,
-	 fun (_) ->
-	     t_sup([t_tuple([t_atom('ok'), t_binary()]),
-		    t_tuple([t_atom('error'), t_file_posix_error()])])
-	 end);
-type(file, set_cwd, 1, Xs) ->
-  strict(arg_types(file, set_cwd, 1), Xs, 
-	 fun (_) -> t_sup(t_atom('ok'),
-			  t_tuple([t_atom('error'), t_file_posix_error()]))
-	 end);
-type(file, write_file, 2, Xs) ->
-  strict(arg_types(file, write_file, 2), Xs, fun (_) -> t_file_return() end);
+type(file, native_name_encoding, 0, _) ->
+  t_file_encoding();
+%%-- prim_file ----------------------------------------------------------------
+type(prim_file, internal_name2native, 1, Xs) ->
+  strict(arg_types(prim_file, internal_name2native, 1), Xs,  
+	 fun (_) -> t_binary() end);
+type(prim_file, internal_native2name, 1, Xs) ->
+  strict(arg_types(prim_file, internal_native2name, 1), Xs,  
+	 fun (_) -> t_prim_file_name() end);
+type(prim_file, internal_normalize_utf8, 1, Xs) ->
+  strict(arg_types(prim_file, internal_normalize_utf8, 1), Xs,  
+	 fun (_) -> t_binary() end);
 %%-- gen_tcp ------------------------------------------------------------------
 %% NOTE: All type information for this module added to avoid loss of precision
 type(gen_tcp, accept, 1, Xs) ->
@@ -2099,7 +2074,7 @@ type(hipe_bifs, set_native_address, 3, Xs) ->
   strict(arg_types(hipe_bifs, set_native_address, 3), Xs,
 	 fun (_) -> t_nil() end);
 type(hipe_bifs, system_crc, 1, Xs) ->
-  strict(arg_types(hipe_bifs, system_crc, 1), Xs, fun (_) -> t_integer() end);
+  strict(arg_types(hipe_bifs, system_crc, 1), Xs, fun (_) -> t_crc32() end);
 type(hipe_bifs, term_to_word, 1, Xs) ->
   strict(arg_types(hipe_bifs, term_to_word, 1), Xs,
 	 fun (_) -> t_integer() end);
@@ -2258,8 +2233,7 @@ type(lists, flatten, 1, Xs) ->
 		     t_list();
 		   false ->
 		     X2 = type(lists, flatten, 1, [t_inf(X1, t_list())]),
-		     t_sup(t_list(t_subtract(X1, t_list())),
-			   X2)
+		     t_sup(t_list(t_subtract(X1, t_list())), X2)
 		 end
 	     end
 	 end);
@@ -2270,10 +2244,20 @@ type(lists, flatmap, 2, Xs) ->
 	       true -> t_nil();
 	       false ->
 		 case check_fun_application(F, [t_list_elements(List)]) of
-		   ok -> 
-		     case t_is_cons(List) of
-		       true -> t_nonempty_list(t_list_elements(t_fun_range(F)));
-		       false -> t_list(t_list_elements(t_fun_range(F)))
+		   ok ->
+		     R = t_fun_range(F),
+		     case t_is_nil(R) of
+		       true -> t_nil();
+		       false ->
+			 Elems = t_list_elements(R),
+			 case t_is_cons(List) of
+			   true ->
+			     case t_is_subtype(t_nil(), R) of
+			       true -> t_list(Elems);
+			       false -> t_nonempty_list(Elems)
+			     end;
+			   false -> t_list(Elems)
+			 end
 		     end;
 		   error ->
 		     case t_is_cons(List) of
@@ -3194,81 +3178,64 @@ arith(Op, X1, X2) ->
 
 -spec arg_types(atom(), atom(), arity()) -> [erl_types:erl_type()] | 'unknown'.
 
+%%------- binary --------------------------------------------------------------
+arg_types(binary, at, 2) ->
+  [t_binary(), t_non_neg_integer()];
+arg_types(binary, bin_to_list, 1) ->
+  [t_binary()];
+arg_types(binary, bin_to_list, 2) ->
+  [t_binary(), t_binary_part()];
+arg_types(binary, bin_to_list, 3) ->
+  [t_binary(), t_integer(), t_non_neg_integer()];
+arg_types(binary, compile_pattern, 1) ->
+  [t_sup(t_binary(), t_list(t_binary()))];
+arg_types(binary, copy, 1) ->
+  [t_binary()];
+arg_types(binary, copy, 2) ->
+  [t_binary(), t_non_neg_integer()];
+arg_types(binary, decode_unsigned, 1) ->
+  [t_binary()];
+arg_types(binary, decode_unsigned, 2) ->
+  [t_binary(), t_endian()];
+arg_types(binary, encode_unsigned, 1) ->
+  [t_non_neg_integer()];
+arg_types(binary, encode_unsigned, 2) ->
+  [t_non_neg_integer(), t_endian()];
+arg_types(binary, first, 1) ->
+  [t_binary()];
+arg_types(binary, last, 1) ->
+  [t_binary()];
+arg_types(binary, list_to_bin, 1) ->
+  arg_types(erlang, list_to_binary, 1);
+arg_types(binary, longest_common_prefix, 1) ->
+  [t_list(t_binary())];
+arg_types(binary, longest_common_suffix, 1) ->
+  [t_list(t_binary())];
+arg_types(binary, match, 2) ->
+  [t_binary(), t_binary_pattern()];
+arg_types(binary, match, 3) ->
+  [t_binary(), t_binary_pattern(), t_binary_options()];
+arg_types(binary, matches, 2) ->
+  [t_binary(), t_binary_pattern()];
+arg_types(binary, matches, 3) ->
+  [t_binary(), t_binary_pattern(), t_binary_options()];
+arg_types(binary, part, 2) ->
+  arg_types(erlang, binary_part, 2);
+arg_types(binary, part, 3) ->
+  arg_types(erlang, binary_part, 3);
+arg_types(binary, referenced_byte_size, 1) ->
+  [t_binary()];
 %%------- code ----------------------------------------------------------------
-arg_types(code, add_path, 1) ->
-  [t_string()];
-arg_types(code, add_patha, 1) ->
-  arg_types(code, add_path, 1);
-arg_types(code, add_paths, 1) ->
-  [t_list(t_string())];
-arg_types(code, add_pathsa, 1) ->
-  arg_types(code, add_paths, 1);
-arg_types(code, add_pathsz, 1) ->
-  arg_types(code, add_paths, 1);
-arg_types(code, add_pathz, 1) ->
-  arg_types(code, add_path, 1);
-arg_types(code, all_loaded, 0) ->
-  [];
-arg_types(code, compiler_dir, 0) ->
-  [];
-arg_types(code, del_path, 1) ->
-  [t_sup(t_string(), t_atom())];  % OBS: doc differs from add_path/1 - why?
-arg_types(code, delete, 1) ->
-  [t_atom()];
-arg_types(code, ensure_loaded, 1) ->
-  arg_types(code, load_file, 1);
 arg_types(code, get_chunk, 2) ->
   [t_binary(), t_string()];
-arg_types(code, get_object_code, 1) ->
-  [t_atom()];
-arg_types(code, get_path, 0) ->
-  [];
-arg_types(code, is_loaded, 1) ->
-  [t_atom()];
-arg_types(code, is_sticky, 1) ->
-  [t_atom()];
 arg_types(code, is_module_native, 1) ->
   [t_atom()];
-arg_types(code, lib_dir, 0) ->
-  [];
-arg_types(code, lib_dir, 1) ->
-  [t_atom()];
-arg_types(code, load_abs, 1) ->
-  [t_string()];
-arg_types(code, load_abs, 2) ->
-  [t_code_loaded_fname_or_status(), t_atom()];
-arg_types(code, load_binary, 3) ->
-  [t_atom(), t_code_loaded_fname_or_status(), t_binary()];
-arg_types(code, load_file, 1) ->
-  [t_atom()];
-arg_types(code, load_native_partial, 2) ->
-  [t_atom(), t_binary()];
-arg_types(code, load_native_sticky, 3) ->
-  [t_atom(), t_binary(), t_sup(t_binary(), t_atom('false'))];
 arg_types(code, module_md5, 1) ->
   [t_binary()];
 arg_types(code, make_stub_module, 3) ->
   [t_atom(), t_binary(), t_tuple([t_list(), t_list()])];
-arg_types(code, priv_dir, 1) ->
-  [t_atom()];
-arg_types(code, purge, 1) ->
-  arg_types(code, delete, 1);
 arg_types(code, rehash, 0) ->
   [];
-arg_types(code, replace_path, 2) ->
-  [t_atom(), t_string()];
-arg_types(code, root_dir, 0) ->
-  [];
-arg_types(code, set_path, 1) ->
-  [t_string()];
-arg_types(code, soft_purge, 1) ->
-  arg_types(code, delete, 1);
-arg_types(code, stick_mod, 1) ->
-  [t_atom()];
-arg_types(code, unstick_mod, 1) ->
-  arg_types(code, stick_mod, 1);
-arg_types(code, which, 1) ->
-  [t_atom()];
 %%------- erl_ddll ------------------------------------------------------------
 arg_types(erl_ddll, demonitor, 1) ->
   arg_types(erlang, demonitor, 1);
@@ -3375,6 +3342,14 @@ arg_types(erlang, 'bnot', 1) ->
   [t_integer()];
 arg_types(erlang, abs, 1) ->
   [t_number()];
+arg_types(erlang, adler32, 1) ->
+  [t_iodata()];
+arg_types(erlang, adler32, 2) ->
+  [t_adler32(), t_iodata()];
+arg_types(erlang, adler32_combine, 3) ->
+  [t_adler32(), t_adler32(), t_non_neg_integer()];
+arg_types(erlang, append, 2) ->
+  arg_types(erlang, '++', 2);
 arg_types(erlang, append_element, 2) ->
   [t_tuple(), t_any()];
 arg_types(erlang, apply, 2) ->
@@ -3388,6 +3363,10 @@ arg_types(erlang, atom_to_binary, 2) ->
   [t_atom(), t_encoding_a2b()];
 arg_types(erlang, atom_to_list, 1) ->
   [t_atom()];
+arg_types(erlang, binary_part, 2) ->
+  [t_binary(), t_tuple([t_non_neg_integer(), t_integer()])];
+arg_types(erlang, binary_part, 3) ->
+  [t_binary(), t_non_neg_integer(), t_integer()];
 arg_types(erlang, binary_to_atom, 2) ->
   [t_binary(), t_encoding_a2b()];
 arg_types(erlang, binary_to_existing_atom, 2) ->
@@ -3423,9 +3402,9 @@ arg_types(erlang, concat_binary, 1) ->
 arg_types(erlang, crc32, 1) ->
   [t_iodata()];
 arg_types(erlang, crc32, 2) ->
-  [t_integer(), t_iodata()];
+  [t_crc32(), t_iodata()];
 arg_types(erlang, crc32_combine, 3) ->
-  [t_integer(), t_integer(), t_integer()];
+  [t_crc32(), t_crc32(), t_non_neg_integer()];
 arg_types(erlang, date, 0) ->
   [];
 arg_types(erlang, decode_packet, 3) ->
@@ -3440,6 +3419,10 @@ arg_types(erlang, disconnect_node, 1) ->
   [t_node()];
 arg_types(erlang, display, 1) ->
   [t_any()];
+arg_types(erlang, display_nl, 0) ->
+  [];
+arg_types(erlang, display_string, 1) ->
+  [t_string()];
 arg_types(erlang, dist_exit, 3) ->
   [t_pid(), t_dist_exit(), t_sup(t_pid(), t_port())];
 arg_types(erlang, element, 2) ->
@@ -3476,6 +3459,8 @@ arg_types(erlang, garbage_collect, 0) ->
   [];
 arg_types(erlang, garbage_collect, 1) ->
   [t_pid()];
+arg_types(erlang, garbage_collect_message_area, 0) ->
+  [];
 arg_types(erlang, get, 0) ->
   [];
 arg_types(erlang, get, 1) ->
@@ -3628,6 +3613,10 @@ arg_types(erlang, monitor_node, 2) ->
   [t_node(), t_boolean()];
 arg_types(erlang, monitor_node, 3) ->
   [t_node(), t_boolean(), t_list(t_atom('allow_passive_connect'))];
+arg_types(erlang, nif_error, 1) ->
+  [t_any()];
+arg_types(erlang, nif_error, 2) ->
+  [t_any(), t_list()];
 arg_types(erlang, node, 0) ->
   [];
 arg_types(erlang, node, 1) ->
@@ -3640,9 +3629,10 @@ arg_types(erlang, nodes, 1) ->
 arg_types(erlang, now, 0) ->
   [];
 arg_types(erlang, open_port, 2) ->
+  ArgT = t_sup(t_unicode_string(), t_binary()),
   [t_sup(t_atom(), t_sup([t_tuple([t_atom('spawn'), t_string()]),
 			  t_tuple([t_atom('spawn_driver'), t_string()]),
-			  t_tuple([t_atom('spawn_executable'), t_string()]),
+			  t_tuple([t_atom('spawn_executable'), ArgT]),
 			  t_tuple([t_atom('fd'), t_integer(), t_integer()])])),
    t_list(t_sup(t_sup([t_atom('stream'),
 		       t_atom('exit_status'),
@@ -3658,8 +3648,8 @@ arg_types(erlang, open_port, 2) ->
 		       t_tuple([t_atom('line'), t_integer()]),
 		       t_tuple([t_atom('cd'), t_string()]),
 		       t_tuple([t_atom('env'), t_list(t_tuple(2))]), % XXX: More
-		       t_tuple([t_atom('args'), t_list(t_string())]),
-		       t_tuple([t_atom('arg0'), t_string()])])))];
+		       t_tuple([t_atom('args'), t_list(ArgT)]),
+		       t_tuple([t_atom('arg0'), ArgT])])))];
 arg_types(erlang, phash, 2) ->
   [t_any(), t_pos_integer()];
 arg_types(erlang, phash2, 1) ->
@@ -3668,6 +3658,8 @@ arg_types(erlang, phash2, 2) ->
   [t_any(), t_pos_integer()];
 arg_types(erlang, pid_to_list, 1) ->
   [t_pid()];
+arg_types(erlang, port_call, 2) ->
+  [t_sup(t_port(), t_atom()), t_any()];
 arg_types(erlang, port_call, 3) ->
   [t_sup(t_port(), t_atom()), t_integer(), t_any()];
 arg_types(erlang, port_close, 1) ->
@@ -3795,6 +3787,8 @@ arg_types(erlang, statistics, 1) ->
 	  t_atom('run_queue'),
 	  t_atom('runtime'),
 	  t_atom('wall_clock')])];
+arg_types(erlang, subtract, 2) ->
+  arg_types(erlang, '--', 2);
 arg_types(erlang, suspend_process, 1) ->
   [t_pid()];
 arg_types(erlang, suspend_process, 2) ->
@@ -3874,7 +3868,8 @@ arg_types(erlang, trace_info, 2) ->
 	  t_atom('flags'), t_atom('tracer'),
 	  %% while the following are items about a func
 	  t_atom('traced'), t_atom('match_spec'), t_atom('meta'),
-	  t_atom('meta_match_spec'), t_atom('call_count'), t_atom('all')])];
+	  t_atom('meta_match_spec'), t_atom('call_count'),
+	  t_atom('call_time'), t_atom('all')])];
 arg_types(erlang, trace_pattern, 2) ->
   [t_sup(t_tuple([t_atom(), t_atom(), t_sup(t_arity(), t_atom('_'))]),
 	 t_atom('on_load')),
@@ -3883,7 +3878,7 @@ arg_types(erlang, trace_pattern, 3) ->
   arg_types(erlang, trace_pattern, 2) ++
     [t_list(t_sup([t_atom('global'), t_atom('local'),
 		   t_atom('meta'), t_tuple([t_atom('meta'), t_pid()]),
-		   t_atom('call_count')]))];
+		   t_atom('call_count'), t_atom('call_time')]))];
 arg_types(erlang, trunc, 1) ->
   [t_number()];
 arg_types(erlang, tuple_size, 1) ->
@@ -3917,10 +3912,20 @@ arg_types(erts_debug, breakpoint, 2) ->
   [t_tuple([t_atom(), t_atom(), t_sup(t_integer(), t_atom('_'))]), t_boolean()];
 arg_types(erts_debug, disassemble, 1) ->
   [t_sup(t_mfa(), t_integer())];
+arg_types(erts_debug, display, 1) ->
+  [t_any()];
 arg_types(erts_debug, dist_ext_to_term, 2) ->
   [t_tuple(), t_binary()];
+arg_types(erts_debug, dump_monitors, 1) ->
+  [t_sup([t_pid(),t_atom()])];
+arg_types(erts_debug, dump_links, 1) ->
+  [t_sup([t_pid(),t_atom(),t_port()])];
 arg_types(erts_debug, flat_size, 1) ->
   [t_any()];
+arg_types(erts_debug, get_internal_state, 1) ->
+  [t_any()];
+arg_types(erts_debug, instructions, 0) ->
+  [];
 arg_types(erts_debug, lock_counters, 1) ->
   [t_sup([t_atom(enabled),
 	  t_atom(info),
@@ -3929,6 +3934,8 @@ arg_types(erts_debug, lock_counters, 1) ->
 	  t_tuple([t_atom(process_locks), t_boolean()])])];
 arg_types(erts_debug, same, 2) ->
   [t_any(), t_any()];
+arg_types(erts_debug, set_internal_state, 2) ->
+  [t_any(), t_any()];
 %%------- ets -----------------------------------------------------------------
 arg_types(ets, all, 0) ->
   [];
@@ -4011,32 +4018,22 @@ arg_types(ets, setopts, 2) ->
 	      t_tuple([t_atom('heir'), t_atom('none')])),
   [t_tab(), t_sup(Opt, t_list(Opt))];
 arg_types(ets, update_counter, 3) ->
-  [t_tab(), t_any(), t_sup(t_integer(),
-			   t_sup(t_tuple([t_integer(), t_integer()]),
-				 t_tuple([t_integer(), t_integer(),
-					  t_integer(), t_integer()])))];
+  Int = t_integer(),
+  UpdateOp = t_sup(t_tuple([Int, Int]), t_tuple([Int, Int, Int, Int])),
+  [t_tab(), t_any(), t_sup([UpdateOp, t_list(UpdateOp), Int])];
 arg_types(ets, update_element, 3) ->
   PosValue = t_tuple([t_integer(), t_any()]),
   [t_tab(), t_any(), t_sup(PosValue, t_list(PosValue))];
 %%------- file ----------------------------------------------------------------
-arg_types(file, close, 1) ->
-  [t_file_io_device()];
-arg_types(file, delete, 1) ->
-  [t_file_name()];
-arg_types(file, get_cwd, 0) ->
+arg_types(file, native_name_encoding, 0) ->
   [];
-arg_types(file, make_dir, 1) ->
-  [t_file_name()];
-arg_types(file, open, 2) ->
-  [t_file_name(), t_list(t_file_open_option())];
-arg_types(file, read_file, 1) ->
-  [t_file_name()];
-arg_types(file, set_cwd, 1) ->
-  [t_file_name()];
-arg_types(file, write, 2) ->
-  [t_file_io_device(), t_iodata()];
-arg_types(file, write_file, 2) ->
-  [t_file_name(), t_sup(t_binary(), t_list())];
+%%-- prim_file ----------------------------------------------------------------
+arg_types(prim_file, internal_name2native, 1) ->
+  [t_prim_file_name()];
+arg_types(prim_file, internal_native2name, 1) ->
+  [t_binary()];
+arg_types(prim_file, internal_normalize_utf8, 1) ->
+  [t_binary()];
 %%------- gen_tcp -------------------------------------------------------------
 arg_types(gen_tcp, accept, 1) ->
   [t_socket()];
@@ -4109,7 +4106,7 @@ arg_types(hipe_bifs, call_count_off, 1) ->
 arg_types(hipe_bifs, call_count_on, 1) ->
   [t_mfa()];
 arg_types(hipe_bifs, check_crc, 1) ->
-  [t_integer()];
+  [t_crc32()];
 arg_types(hipe_bifs, enter_code, 2) ->
   [t_binary(), t_sup(t_nil(), t_tuple())];
 arg_types(hipe_bifs, enter_sdesc, 1) ->
@@ -4153,7 +4150,7 @@ arg_types(hipe_bifs, set_funinfo_native_address, 3) ->
 arg_types(hipe_bifs, set_native_address, 3) ->
   [t_mfa(), t_integer(), t_boolean()];
 arg_types(hipe_bifs, system_crc, 1) ->
-  [t_integer()];
+  [t_crc32()];
 arg_types(hipe_bifs, term_to_word, 1) ->
   [t_any()];
 arg_types(hipe_bifs, update_code_size, 3) ->
@@ -4355,11 +4352,11 @@ arg_types(os, timestamp, 0) ->
 arg_types(re, compile, 1) ->
   [t_iodata()];
 arg_types(re, compile, 2) ->
-  [t_iodata(), t_list(t_re_compile_option())];
+  [t_sup(t_iodata(), t_charlist()), t_list(t_re_compile_option())];
 arg_types(re, run, 2) ->
-  [t_iodata(), t_re_RE()];
+  [t_sup(t_iodata(), t_charlist()), t_re_RE()];
 arg_types(re, run, 3) ->
-  [t_iodata(), t_re_RE(), t_list(t_re_run_option())];
+  [t_sup(t_iodata(), t_charlist()), t_re_RE(), t_list(t_re_run_option())];
 %%------- string --------------------------------------------------------------
 arg_types(string, chars, 2) ->
   [t_char(), t_non_neg_integer()];
@@ -4467,6 +4464,30 @@ t_httppacket() ->
   t_sup([t_HttpRequest(), t_HttpResponse(),
 	 t_HttpHeader(), t_atom('http_eoh'), t_HttpError()]).
 
+t_endian() ->
+  t_sup(t_atom('big'), t_atom('little')).
+
+%% =====================================================================
+%% Types for the binary module
+%% =====================================================================
+
+t_binary_part() ->
+  t_tuple([t_non_neg_integer(), t_integer()]).
+
+t_binary_canonical_part() ->
+  t_tuple([t_non_neg_integer(), t_non_neg_integer()]).
+
+t_binary_pattern() ->
+  t_sup([t_binary(),
+	 t_list(t_binary()),
+	 t_binary_compiled_pattern()]).
+
+t_binary_compiled_pattern() ->
+  t_tuple([t_atom('cp'), t_binary()]).
+
+t_binary_options() ->
+  t_list(t_tuple([t_atom('scope'), t_binary_part()])).
+
 %% =====================================================================
 %% HTTP types documented in R12B-4
 %% =====================================================================
@@ -4475,16 +4496,16 @@ t_HttpRequest() ->
   t_tuple([t_atom('http_request'), t_HttpMethod(), t_HttpUri(), t_HttpVersion()]).
 
 t_HttpResponse() ->
-   t_tuple([t_atom('http_response'), t_HttpVersion(), t_integer(), t_string()]).
+   t_tuple([t_atom('http_response'), t_HttpVersion(), t_integer(), t_HttpString()]).
 
 t_HttpHeader() ->
-  t_tuple([t_atom('http_header'), t_integer(), t_HttpField(), t_any(), t_string()]).
+  t_tuple([t_atom('http_header'), t_integer(), t_HttpField(), t_any(), t_HttpString()]).
 
 t_HttpError() ->
-  t_tuple([t_atom('http_error'), t_string()]).
+  t_tuple([t_atom('http_error'), t_HttpString()]).
 
 t_HttpMethod() ->
-  t_sup(t_HttpMethodAtom(), t_string()).
+  t_sup(t_HttpMethodAtom(), t_HttpString()).
 
 t_HttpMethodAtom() ->
   t_atoms(['OPTIONS', 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'TRACE']).
@@ -4493,18 +4514,18 @@ t_HttpUri() ->
   t_sup([t_atom('*'),
 	 t_tuple([t_atom('absoluteURI'),
 		  t_sup(t_atom('http'), t_atom('https')),
-		  t_string(),
+		  t_HttpString(),
 		  t_sup(t_non_neg_integer(), t_atom('undefined')),
-		  t_string()]),
-	 t_tuple([t_atom('scheme'), t_string(), t_string()]),
-	 t_tuple([t_atom('abs_path'), t_string()]),
-	 t_string()]).
+		  t_HttpString()]),
+	 t_tuple([t_atom('scheme'), t_HttpString(), t_HttpString()]),
+	 t_tuple([t_atom('abs_path'), t_HttpString()]),
+	 t_HttpString()]).
 
 t_HttpVersion() ->
   t_tuple([t_non_neg_integer(), t_non_neg_integer()]).
 
 t_HttpField() ->
-  t_sup(t_HttpFieldAtom(), t_string()).
+  t_sup(t_HttpFieldAtom(), t_HttpString()).
 
 t_HttpFieldAtom() ->
   t_atoms(['Cache-Control', 'Connection', 'Date', 'Pragma', 'Transfer-Encoding',
@@ -4521,6 +4542,9 @@ t_HttpFieldAtom() ->
 	   'Set-Cookie', 'Set-Cookie2', 'X-Forwarded-For', 'Cookie',
 	   'Keep-Alive', 'Proxy-Connection']).
 
+t_HttpString() ->
+  t_sup(t_string(),t_binary()).
+
 %% =====================================================================
 %% These are used for the built-in functions of 'code'
 %% =====================================================================
@@ -4549,6 +4573,12 @@ t_code_loaded_fname_or_status() ->
 %% These are used for the built-in functions of 'erlang'
 %% =====================================================================
 
+t_adler32() ->
+  t_non_neg_integer().
+
+t_crc32() ->
+  t_non_neg_integer().
+
 t_decode_packet_option() ->
   t_sup([t_tuple([t_atom('packet_size'), t_non_neg_integer()]),
 	 t_tuple([t_atom('line_length'), t_non_neg_integer()])]).
@@ -4606,7 +4636,8 @@ t_process_priority_level() ->
   t_sup([t_atom('max'), t_atom('high'), t_atom('normal'), t_atom('low')]).
 
 t_process_status() ->
-  t_sup([t_atom('runnable'), t_atom('running'),
+  t_sup([t_atom('exiting'), t_atom('garbage_collecting'),
+	 t_atom('runnable'), t_atom('running'),
 	 t_atom('suspended'), t_atom('waiting')]).
 
 t_raise_errorclass() ->
@@ -4745,10 +4776,11 @@ t_matchres() ->
 %% From the 'ets' documentation
 %%-----------------------------
 %%   Option = Type | Access | named_table | {keypos,Pos}
-%%          | {heir,pid(),HeirData} | {heir,none}
-%%          | {write_concurrency,boolean()}
+%%          | {heir,pid(),HeirData} | {heir,none} | Tweaks
 %%     Type = set | ordered_set | bag | duplicate_bag
 %%   Access = public | protected | private
+%%   Tweaks = {write_concurrency,boolean()}
+%%          | {read_concurrency,boolean()} | compressed
 %%      Pos = integer()
 %% HeirData = term()
 t_ets_new_options() ->
@@ -4760,10 +4792,12 @@ t_ets_new_options() ->
 		t_atom('protected'),
 		t_atom('private'),
 		t_atom('named_table'),
+		t_tuple([t_atom('keypos'), t_integer()]),
 		t_tuple([t_atom('heir'), t_pid(), t_any()]),
 		t_tuple([t_atom('heir'), t_atom('none')]),
-		t_tuple([t_atom('keypos'), t_integer()]),
-		t_tuple([t_atom('write_concurrency'), t_boolean()])])).
+		t_tuple([t_atom('write_concurrency'), t_boolean()]),
+		t_tuple([t_atom('read_concurrency'), t_boolean()]),
+		t_atom('compressed')])).
 
 t_ets_info_items() ->
   t_sup([t_atom('fixed'),
@@ -4779,68 +4813,11 @@ t_ets_info_items() ->
 	 t_atom('type')]).
 
 %% =====================================================================
-%% These are used for the built-in functions of 'file'
+%% These are used for the built-in functions of 'prim_file'
 %% =====================================================================
 
-t_file_io_device() ->
-  t_sup(t_pid(), t_tuple([t_atom('file_descriptor'), t_atom(), t_any()])).
-
-t_file_name() ->
-  t_sup([t_atom(),
-	 t_string(),
-	 %% DeepList = [char() | atom() | DeepList] -- approximation below
-	 t_list(t_sup([t_atom(), t_string(), t_list()]))]).
-
-t_file_open_option() ->
-  t_sup([t_atom('read'),
-	 t_atom('write'),
-	 t_atom('append'),
-	 t_atom('raw'),
-	 t_atom('binary'),
-	 t_atom('delayed_write'),
-	 t_atom('read_ahead'),
-	 t_atom('compressed'),
-	 t_tuple([t_atom('delayed_write'),
-		  t_pos_integer(), t_non_neg_integer()]),
-	 t_tuple([t_atom('read_ahead'), t_pos_integer()])]).
-
-%% This lists all Posix errors that can occur in file:*/* functions
-t_file_posix_error() ->
-  t_sup([t_atom('eacces'),
-	 t_atom('eagain'),
-	 t_atom('ebadf'),
-	 t_atom('ebusy'),
-	 t_atom('edquot'),
-	 t_atom('eexist'),
-	 t_atom('efault'),
-	 t_atom('efbig'),
-	 t_atom('eintr'),
-	 t_atom('einval'),
-	 t_atom('eio'),
-	 t_atom('eisdir'),
-	 t_atom('eloop'),
-	 t_atom('emfile'),
-	 t_atom('emlink'),
-	 t_atom('enametoolong'),
-	 t_atom('enfile'),
-	 t_atom('enodev'),
-	 t_atom('enoent'),
-	 t_atom('enomem'),
-	 t_atom('enospc'),
-	 t_atom('enotblk'),
-	 t_atom('enotdir'),
-	 t_atom('enotsup'),
-	 t_atom('enxio'),
-	 t_atom('eperm'),
-	 t_atom('epipe'),
-	 t_atom('erofs'),
-	 t_atom('espipe'),
-	 t_atom('esrch'),
-	 t_atom('estale'),
-	 t_atom('exdev')]).
-
-t_file_return() ->
-  t_sup(t_atom('ok'), t_tuple([t_atom('error'), t_file_posix_error()])).
+t_prim_file_name() ->
+   t_sup(t_unicode_string(), t_binary()).
 
 %% =====================================================================
 %% These are used for the built-in functions of 'gen_tcp'
@@ -4997,13 +4974,14 @@ t_re_MP() ->  %% it's supposed to be an opaque data type
   t_tuple([t_atom('re_pattern'), t_integer(), t_integer(), t_binary()]).
 
 t_re_RE() ->
-  t_sup(t_re_MP(), t_iodata()).
+  t_sup([t_re_MP(), t_iodata(), t_charlist()]).
 
 t_re_compile_option() ->
-  t_sup([t_atoms(['anchored', 'caseless', 'dollar_endonly', 'dotall',
-		  'extended', 'firstline', 'multiline', 'no_auto_capture',
-		  'dupnames', 'ungreedy']),
-	 t_tuple([t_atom('newline'), t_re_NLSpec()])]).
+  t_sup([t_atoms(['unicode', 'anchored', 'caseless', 'dollar_endonly',
+		  'dotall', 'extended', 'firstline', 'multiline',
+		  'no_auto_capture', 'dupnames', 'ungreedy']),
+	 t_tuple([t_atom('newline'), t_re_NLSpec()]),
+	 t_atoms(['bsr_anycrlf', 'bsr_unicode'])]).
 
 t_re_run_option() ->
   t_sup([t_atoms(['anchored', 'global', 'notbol', 'noteol', 'notempty']),
@@ -5020,7 +4998,7 @@ t_re_Type() ->
   t_atoms(['index', 'list', 'binary']).
 
 t_re_NLSpec() ->
-  t_atoms(['cr', 'crlf', 'lf', 'anycrlf']).
+  t_atoms(['cr', 'crlf', 'lf', 'anycrlf', 'any']).
 
 t_re_ValueSpec() ->
   t_sup(t_atoms(['all', 'all_but_first', 'first', 'none']), t_re_ValueList()).
@@ -5042,7 +5020,12 @@ t_ML() ->     % a binary or a possibly deep list of integers or binaries
   t_sup(t_list(t_sup([t_integer(), t_binary(), t_list()])), t_binary()).
 
 t_encoding() ->
-  t_atoms(['latin1', 'unicode', 'utf8', 'utf16', 'utf32']).
+  t_sup([t_atoms(['latin1', 'unicode', 'utf8', 'utf16', 'utf32']),
+	 t_tuple([t_atom('utf16'), t_endian()]),
+	 t_tuple([t_atom('utf32'), t_endian()])]).
+
+t_file_encoding() ->
+  t_atoms(['latin1', 'utf8']).
 
 t_encoding_a2b() -> % for the 2nd arg of atom_to_binary/2 and binary_to_atom/2
   t_atoms(['latin1', 'unicode', 'utf8']).
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 758914ff9e..080d6936b2 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -29,7 +29,7 @@
 %% In late 2008, Manouk Manoukian and Kostis Sagonas added support for
 %% opaque types to the structure-based representation of types.
 %% During February and March 2009, Kostis Sagonas significantly
-%% cleaned up the type representation added spec declarations.
+%% cleaned up the type representation and added spec declarations.
 %%
 %% Author contact: [email protected], [email protected], [email protected]
 %% ======================================================================
@@ -62,6 +62,7 @@
 	 t_boolean/0,
 	 t_byte/0,
 	 t_char/0,
+	 t_charlist/0,
 	 t_collect_vars/1,
 	 t_cons/0,
 	 t_cons/2,
@@ -195,6 +196,7 @@
 	 t_tuple_size/1,
 	 t_tuple_sizes/1,
 	 t_tuple_subtypes/1,
+	 t_unicode_string/0,
 	 t_unify/2,
 	 t_unify/3,
 	 t_unit/0,
@@ -205,8 +207,10 @@
 	 t_var_name/1,
 	 %% t_assign_variables_to_subtype/2,
 	 type_is_defined/3,
+	 record_field_diffs_to_string/2,
 	 subst_all_vars_to_any/1,
-	 lift_list_to_pos_empty/1
+	 lift_list_to_pos_empty/1,
+	 is_erl_type/1
 	]).
 
 %%-define(DO_ERL_TYPES_TEST, true).
@@ -302,7 +306,7 @@
 %% Auxiliary types and convenient macros
 %%
 
--type parse_form() :: {atom(), _, _} | {atom(), _, _, _}. %% XXX: Temporarily
+-type parse_form() :: {atom(), _, _} | {atom(), _, _, _} | {'op', _, _, _, _}. %% XXX: Temporarily
 -type rng_elem()   :: 'pos_inf' | 'neg_inf' | integer().
 
 -record(int_set, {set :: [integer()]}).
@@ -652,7 +656,7 @@ module_builtin_opaques(Module) ->
 %% Remote types: these types are used for preprocessing;
 %% they should never reach the analysis stage.
 
--spec t_remote(module(), atom(), [_]) -> erl_type().
+-spec t_remote(atom(), atom(), [erl_type()]) -> erl_type().
 
 t_remote(Mod, Name, Args) ->
   ?remote(set_singleton(#remote{mod = Mod, name = Name, args = Args})).
@@ -712,12 +716,13 @@ t_solve_remote_type(#remote{mod = RemMod, name = Name, args = Args} = RemType,
           case lookup_type(Name, RemDict) of
             {type, {_Mod, Type, ArgNames}} when ArgsLen =:= length(ArgNames) ->
               {NewType, NewCycle, NewRR} =
-                case unfold(RemType, C) of
+                case can_unfold_more(RemType, C) of
                   true ->
                     List = lists:zip(ArgNames, Args),
                     TmpVarDict = dict:from_list(List),
                     {t_from_form(Type, RemDict, TmpVarDict), [RemType|C], []};
-                  false -> {t_any(), C, [RemType]}
+                  false ->
+		    {t_any(), C, [RemType]}
                 end,
               {RT, RR} = t_solve_remote(NewType, ET, R, NewCycle),
               RetRR = NewRR ++ RR,
@@ -731,9 +736,11 @@ t_solve_remote_type(#remote{mod = RemMod, name = Name, args = Args} = RemType,
               List = lists:zip(ArgNames, Args),
               TmpVarDict = dict:from_list(List),
               {Rep, NewCycle, NewRR} =
-                case unfold(RemType, C) of
-                  true -> {t_from_form(Type, RemDict, TmpVarDict), [RemType|C], []};
-                  false -> {t_any(), C, [RemType]}
+                case can_unfold_more(RemType, C) of
+                  true ->
+		    {t_from_form(Type, RemDict, TmpVarDict), [RemType|C], []};
+                  false ->
+		    {t_any(), C, [RemType]}
                 end,
               {NewRep, RR} = t_solve_remote(Rep, ET, R, NewCycle),
               RetRR = NewRR ++ RR,
@@ -757,9 +764,8 @@ t_solve_remote_type(#remote{mod = RemMod, name = Name, args = Args} = RemType,
               throw({error, Msg})
           end;
         false ->
-          Msg = io_lib:format("Unable to find exported type ~w:~w/~w\n",
-                              [RemMod, Name, ArgsLen]),
-          throw({error, Msg})
+          self() ! {self(), ext_types, {RemMod, Name, ArgsLen}},
+          {t_any(), []}
       end
   end.
 
@@ -1451,6 +1457,26 @@ t_is_tuple(_) -> false.
 %% Non-primitive types, including some handy syntactic sugar types
 %%
 
+-spec t_unicode_string() -> erl_type().
+
+t_unicode_string() ->
+  t_list(t_unicode_char()).
+  
+-spec t_charlist() -> erl_type().
+
+t_charlist() ->
+  t_charlist(1).
+
+-spec t_charlist(non_neg_integer()) -> erl_type().
+
+t_charlist(N) when N > 0 ->
+  t_maybe_improper_list(t_sup([t_unicode_char(),
+			       t_unicode_binary(),
+			       t_charlist(N-1)]),
+		        t_sup(t_unicode_binary(), t_nil()));
+t_charlist(0) ->
+  t_maybe_improper_list(t_any(), t_sup(t_unicode_binary(), t_nil())).
+
 -spec t_constant() -> erl_type().
 
 t_constant() ->
@@ -1545,6 +1571,16 @@ t_parameterized_module() ->
 t_timeout() ->
   t_sup(t_non_neg_integer(), t_atom('infinity')).
 
+-spec t_unicode_binary() -> erl_type().
+
+t_unicode_binary() ->
+  t_binary().  % with characters encoded in UTF-8 coding standard
+
+-spec t_unicode_char() -> erl_type().
+
+t_unicode_char() ->
+  t_integer(). % representing a valid unicode codepoint
+
 %%-----------------------------------------------------------------------------
 %% Some built-in opaque types
 %%
@@ -1607,7 +1643,7 @@ t_set() ->
 t_tid() ->
   t_opaque(ets, tid, [], t_integer()).
 
--spec all_opaque_builtins() -> [erl_type()].
+-spec all_opaque_builtins() -> [erl_type(),...].
 
 all_opaque_builtins() ->
   [t_array(), t_dict(), t_digraph(), t_gb_set(),
@@ -2123,7 +2159,8 @@ t_elements(?identifier(IDs)) ->
 t_elements(?list(_, _, _) = T) -> [T];
 t_elements(?number(_, _) = T) ->
   case T of
-    ?number(?any, ?unknown_qual) -> [T]; 
+    ?number(?any, ?unknown_qual) ->
+      [?float, ?integer(?any)];
     ?float -> [T];
     ?integer(?any) -> [T];
     ?int_range(_, _) -> [T];
@@ -2170,10 +2207,10 @@ t_inf(?var(_), T, _Mode) -> subst_all_vars_to_any(T);
 t_inf(T, ?var(_), _Mode) -> subst_all_vars_to_any(T);
 t_inf(?any, T, _Mode) -> subst_all_vars_to_any(T);
 t_inf(T, ?any, _Mode) -> subst_all_vars_to_any(T);
-t_inf(?unit, _, _Mode) -> ?unit;
-t_inf(_, ?unit, _Mode) -> ?unit;
 t_inf(?none, _, _Mode) -> ?none;
 t_inf(_, ?none, _Mode) -> ?none;
+t_inf(?unit, _, _Mode) -> ?unit;	% ?unit cases should appear below ?none
+t_inf(_, ?unit, _Mode) -> ?unit;
 t_inf(T, T, _Mode) -> subst_all_vars_to_any(T);
 t_inf(?atom(Set1), ?atom(Set2), _) ->
   case set_intersection(Set1, Set2) of
@@ -2382,14 +2419,16 @@ inf_tuple_sets(L1, L2, Mode) ->
     List -> ?tuple_set(List)
   end.
 
-inf_tuple_sets([{Arity, Tuples1}|Left1], [{Arity, Tuples2}|Left2], Acc, Mode) ->
+inf_tuple_sets([{Arity, Tuples1}|Ts1], [{Arity, Tuples2}|Ts2], Acc, Mode) ->
   case inf_tuples_in_sets(Tuples1, Tuples2, Mode) of
-    [] -> inf_tuple_sets(Left1, Left2, Acc, Mode);
-    NewTuples -> inf_tuple_sets(Left1, Left2, [{Arity, NewTuples}|Acc], Mode)
+    [] -> inf_tuple_sets(Ts1, Ts2, Acc, Mode);
+    [?tuple_set([{Arity, NewTuples}])] ->
+      inf_tuple_sets(Ts1, Ts2, [{Arity, NewTuples}|Acc], Mode);
+    NewTuples -> inf_tuple_sets(Ts1, Ts2, [{Arity, NewTuples}|Acc], Mode)
   end;
-inf_tuple_sets(L1 = [{Arity1, _}|Left1], L2 = [{Arity2, _}|Left2], Acc, Mode) ->
-  if Arity1 < Arity2 -> inf_tuple_sets(Left1, L2, Acc, Mode);
-     Arity1 > Arity2 -> inf_tuple_sets(L1, Left2, Acc, Mode)
+inf_tuple_sets([{Arity1, _}|Ts1] = L1, [{Arity2, _}|Ts2] = L2, Acc, Mode) ->
+  if Arity1 < Arity2 -> inf_tuple_sets(Ts1, L2, Acc, Mode);
+     Arity1 > Arity2 -> inf_tuple_sets(L1, Ts2, Acc, Mode)
   end;
 inf_tuple_sets([], _, Acc, _Mode) -> lists:reverse(Acc);
 inf_tuple_sets(_, [], Acc, _Mode) -> lists:reverse(Acc).
@@ -2405,17 +2444,17 @@ inf_tuples_in_sets(L1, [?tuple(Elements2, _, ?any)], Mode) ->
 inf_tuples_in_sets(L1, L2, Mode) ->
   inf_tuples_in_sets(L1, L2, [], Mode).
 
-inf_tuples_in_sets([?tuple(Elements1, Arity, Tag)|Left1], 
-		   [?tuple(Elements2, Arity, Tag)|Left2], Acc, Mode) ->
+inf_tuples_in_sets([?tuple(Elements1, Arity, Tag)|Ts1],
+		   [?tuple(Elements2, Arity, Tag)|Ts2], Acc, Mode) ->
   case t_inf_lists_strict(Elements1, Elements2, Mode) of
-    bottom -> inf_tuples_in_sets(Left1, Left2, Acc, Mode);
-    NewElements -> 
-      inf_tuples_in_sets(Left1, Left2, [?tuple(NewElements, Arity, Tag)|Acc], Mode)
+    bottom -> inf_tuples_in_sets(Ts1, Ts2, Acc, Mode);
+    NewElements ->
+      inf_tuples_in_sets(Ts1, Ts2, [?tuple(NewElements, Arity, Tag)|Acc], Mode)
   end;
-inf_tuples_in_sets([?tuple(_, _, Tag1)|Left1] = L1, 
-		   [?tuple(_, _, Tag2)|Left2] = L2, Acc, Mode) ->
-  if Tag1 < Tag2 -> inf_tuples_in_sets(Left1, L2, Acc, Mode);
-     Tag1 > Tag2 -> inf_tuples_in_sets(L1, Left2, Acc, Mode)
+inf_tuples_in_sets([?tuple(_, _, Tag1)|Ts1] = L1,
+		   [?tuple(_, _, Tag2)|Ts2] = L2, Acc, Mode) ->
+  if Tag1 < Tag2 -> inf_tuples_in_sets(Ts1, L2, Acc, Mode);
+     Tag1 > Tag2 -> inf_tuples_in_sets(L1, Ts2, Acc, Mode)
   end;
 inf_tuples_in_sets([], _, Acc, _Mode) -> lists:reverse(Acc);
 inf_tuples_in_sets(_, [], Acc, _Mode) -> lists:reverse(Acc).
@@ -2762,7 +2801,9 @@ t_subtract_list(T, []) ->
 -spec t_subtract(erl_type(), erl_type()) -> erl_type().
 
 t_subtract(_, ?any) -> ?none;
+t_subtract(_, ?var(_)) -> ?none;
 t_subtract(?any, _) -> ?any;
+t_subtract(?var(_) = T, _) -> T;
 t_subtract(T, ?unit) -> T;
 t_subtract(?unit, _) -> ?unit;
 t_subtract(?none, _) -> ?none;
@@ -2790,13 +2831,13 @@ t_subtract(?opaque(Set1), ?opaque(Set2)) ->
     Set -> ?opaque(Set)
   end;
 t_subtract(?matchstate(Pres1, Slots1), ?matchstate(Pres2, _Slots2)) ->
-  Pres = t_subtract(Pres1,Pres2),
+  Pres = t_subtract(Pres1, Pres2),
   case t_is_none(Pres) of
     true -> ?none;
-    false -> ?matchstate(Pres,Slots1)
+    false -> ?matchstate(Pres, Slots1)
   end;
-t_subtract(?matchstate(Present,Slots),_) ->
-  ?matchstate(Present,Slots);
+t_subtract(?matchstate(Present, Slots), _) ->
+  ?matchstate(Present, Slots);
 t_subtract(?nil, ?nil) ->
   ?none;
 t_subtract(?nil, ?nonempty_list(_, _)) ->
@@ -2816,7 +2857,7 @@ t_subtract(?list(Contents1, Termination1, Size1) = T,
 	true ->
 	  case {Size1, Size2} of
 	    {?nonempty_qual, ?unknown_qual} -> ?none;
-	    {?unknown_qual, ?nonempty_qual} -> Termination1;
+	    {?unknown_qual, ?nonempty_qual} -> ?nil;
 	    {S, S} -> ?none
 	  end;
 	false ->
@@ -2918,7 +2959,7 @@ t_subtract(T, ?product(_)) ->
   T;
 t_subtract(?union(U1), ?union(U2)) ->
   subtract_union(U1, U2);
-t_subtract(T1, T2) ->  
+t_subtract(T1, T2) ->
   ?union(U1) = force_union(T1),
   ?union(U2) = force_union(T2),
   subtract_union(U1, U2).
@@ -3311,28 +3352,44 @@ record_to_string(Tag, [_|Fields], FieldNames, RecDict) ->
   FieldStrings = record_fields_to_string(Fields, FieldNames, RecDict, []),
   "#" ++ atom_to_list(Tag) ++ "{" ++ sequence(FieldStrings, [], ",") ++ "}".
 
-record_fields_to_string([Field|Left1], [{FieldName, DeclaredType}|Left2], 
-			RecDict, Acc) ->
-  PrintType =
-    case t_is_equal(Field, DeclaredType) of
-      true -> false;
+record_fields_to_string([F|Fs], [{FName, _DefType}|FDefs], RecDict, Acc) ->
+  NewAcc =
+    case t_is_any(F) orelse t_is_atom('undefined', F) of
+      true -> Acc;
       false ->
-	case t_is_any(DeclaredType) andalso t_is_atom(undefined, Field) of
-	  true -> false;
-	  false ->
-	    TmpType = t_subtract(DeclaredType, t_atom(undefined)),
-	    not t_is_equal(Field, TmpType)
-	end
+	StrFV = atom_to_list(FName) ++ "::" ++ t_to_string(F, RecDict),
+	%% ActualDefType = t_subtract(DefType, t_atom('undefined')),
+	%% Str = case t_is_any(ActualDefType) of
+	%% 	  true -> StrFV;
+	%% 	  false -> StrFV ++ "::" ++ t_to_string(ActualDefType, RecDict)
+	%%	end,
+	[StrFV|Acc]
     end,
-  case PrintType of
-    false -> record_fields_to_string(Left1, Left2, RecDict, Acc);
-    true ->
-      String = atom_to_list(FieldName) ++ "::" ++ t_to_string(Field, RecDict),
-      record_fields_to_string(Left1, Left2, RecDict, [String|Acc])
-  end;
+  record_fields_to_string(Fs, FDefs, RecDict, NewAcc);
 record_fields_to_string([], [], _RecDict, Acc) ->
   lists:reverse(Acc).
 
+-spec record_field_diffs_to_string(erl_type(), dict()) -> string().
+
+record_field_diffs_to_string(?tuple([_|Fs], Arity, Tag), RecDict) ->
+  [TagAtom] = t_atom_vals(Tag),
+  {ok, FieldNames} = lookup_record(TagAtom, Arity-1, RecDict),
+  %% io:format("RecCElems = ~p\nRecTypes = ~p\n", [Fs, FieldNames]),
+  FieldDiffs = field_diffs(Fs, FieldNames, RecDict, []),
+  sequence(FieldDiffs, [], " and ").
+
+field_diffs([F|Fs], [{FName, DefType}|FDefs], RecDict, Acc) ->
+  NewAcc =
+    case t_is_subtype(F, DefType) of
+      true -> Acc;
+      false ->
+	Str = atom_to_list(FName) ++ "::" ++ t_to_string(DefType, RecDict),
+	[Str|Acc]
+    end,
+  field_diffs(Fs, FDefs, RecDict, NewAcc);
+field_diffs([], [], _, Acc) ->
+  lists:reverse(Acc).
+
 comma_sequence(Types, RecDict) ->
   List = [case T =:= ?any of
 	    true -> "_";
@@ -3373,188 +3430,263 @@ t_from_form(Form, RecDict) ->
 -spec t_from_form(parse_form(), dict(), dict()) -> erl_type().
 
 t_from_form(Form, RecDict, VarDict) ->
-  {T, _R} = t_from_form(Form, [], RecDict, VarDict),
+  {T, _R} = t_from_form(Form, [], false, RecDict, VarDict),
   T.
 
 -type type_names() :: [{'type' | 'opaque' | 'record', atom()}].
--spec t_from_form(parse_form(), type_names(), dict(), dict()) ->
+-spec t_from_form(parse_form(), type_names(), boolean(), dict(), dict()) ->
                      {erl_type(), type_names()}.
 
-t_from_form({var, _L, '_'}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({var, _L, '_'}, _TypeNames, _InOpaque, _RecDict, _VarDict) ->
   {t_any(), []};
-t_from_form({var, _L, Name}, _TypeNames, _RecDict, VarDict) ->
+t_from_form({var, _L, Name}, _TypeNames, _InOpaque, _RecDict, VarDict) ->
   case dict:find(Name, VarDict) of
     error -> {t_var(Name), []};
     {ok, Val} -> {Val, []}
   end;
-t_from_form({ann_type, _L, [_Var, Type]}, TypeNames, RecDict, VarDict) ->
-  t_from_form(Type, TypeNames, RecDict, VarDict);
-t_from_form({paren_type, _L, [Type]}, TypeNames, RecDict, VarDict) ->
-  t_from_form(Type, TypeNames, RecDict, VarDict);
+t_from_form({ann_type, _L, [_Var, Type]}, TypeNames, InOpaque, RecDict,
+            VarDict) ->
+  t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict);
+t_from_form({paren_type, _L, [Type]}, TypeNames, InOpaque, RecDict,
+            VarDict) ->
+  t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict);
 t_from_form({remote_type, _L, [{atom, _, Module}, {atom, _, Type}, Args]},
-	    TypeNames, RecDict, VarDict) ->
-  {L, R} = list_from_form(Args, TypeNames, RecDict, VarDict),
+	    TypeNames, InOpaque, RecDict, VarDict) ->
+  {L, R} = list_from_form(Args, TypeNames, InOpaque, RecDict, VarDict),
   {t_remote(Module, Type, L), R};
-t_from_form({atom, _L, Atom}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({atom, _L, Atom}, _TypeNames, _InOpaque, _RecDict, _VarDict) ->
   {t_atom(Atom), []};
-t_from_form({integer, _L, Int}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({integer, _L, Int}, _TypeNames, _InOpaque, _RecDict, _VarDict) ->
   {t_integer(Int), []};
-t_from_form({type, _L, any, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({op, _L, _Op, _Arg} = Op, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
+  case erl_eval:partial_eval(Op) of
+    {integer, _, Val} ->
+      {t_integer(Val), []};
+    _ -> throw({error, io_lib:format("Unable to evaluate type ~w\n", [Op])})
+  end;
+t_from_form({op, _L, _Op, _Arg1, _Arg2} = Op, _TypeNames, _InOpaque,
+            _RecDict, _VarDict) ->
+  case erl_eval:partial_eval(Op) of
+    {integer, _, Val} ->
+      {t_integer(Val), []};
+    _ -> throw({error, io_lib:format("Unable to evaluate type ~w\n", [Op])})
+  end;
+t_from_form({type, _L, any, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_any(), []};
-t_from_form({type, _L, arity, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, arity, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_arity(), []};
-t_from_form({type, _L, array, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, array, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_array(), []};
-t_from_form({type, _L, atom, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, atom, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_atom(), []};
-t_from_form({type, _L, binary, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, binary, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_binary(), []};
-t_from_form({type, _L, binary, [{integer, _, Base}, {integer, _, Unit}]}, 
-	    _TypeNames, _RecDict, _VarDict) ->
-  {t_bitstr(Unit, Base), []};
-t_from_form({type, _L, bitstring, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, binary, [Base, Unit]} = Type,
+	    _TypeNames, _InOpaque, _RecDict, _VarDict) ->
+  case {erl_eval:partial_eval(Base), erl_eval:partial_eval(Unit)} of
+    {{integer, _, BaseVal},
+     {integer, _, UnitVal}}
+      when BaseVal >= 0, UnitVal >= 0 ->
+      {t_bitstr(UnitVal, BaseVal), []};
+    _ -> throw({error, io_lib:format("Unable to evaluate type ~w\n", [Type])})
+  end;
+t_from_form({type, _L, bitstring, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_bitstr(), []};
-t_from_form({type, _L, bool, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, bool, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_boolean(), []};	% XXX: Temporarily
-t_from_form({type, _L, boolean, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, boolean, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_boolean(), []};
-t_from_form({type, _L, byte, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, byte, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_byte(), []};
-t_from_form({type, _L, char, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, char, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_char(), []};
-t_from_form({type, _L, dict, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, dict, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_dict(), []};
-t_from_form({type, _L, digraph, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, digraph, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_digraph(), []};
-t_from_form({type, _L, float, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, float, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_float(), []};
-t_from_form({type, _L, function, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, function, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_fun(), []};
-t_from_form({type, _L, 'fun', []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, 'fun', []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_fun(), []};
 t_from_form({type, _L, 'fun', [{type, _, any, []}, Range]}, TypeNames,
-            RecDict, VarDict) ->
-  {T, R} = t_from_form(Range, TypeNames, RecDict, VarDict),
+            InOpaque, RecDict, VarDict) ->
+  {T, R} = t_from_form(Range, TypeNames, InOpaque, RecDict, VarDict),
   {t_fun(T), R};
 t_from_form({type, _L, 'fun', [{type, _, product, Domain}, Range]},
-            TypeNames, RecDict, VarDict) ->
-  {L, R1} = list_from_form(Domain, TypeNames, RecDict, VarDict),
-  {T, R2} = t_from_form(Range, TypeNames, RecDict, VarDict),
+            TypeNames, InOpaque, RecDict, VarDict) ->
+  {L, R1} = list_from_form(Domain, TypeNames, InOpaque, RecDict, VarDict),
+  {T, R2} = t_from_form(Range, TypeNames, InOpaque, RecDict, VarDict),
   {t_fun(L, T), R1 ++ R2};
-t_from_form({type, _L, gb_set, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, gb_set, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_gb_set(), []};
-t_from_form({type, _L, gb_tree, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, gb_tree, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_gb_tree(), []};
-t_from_form({type, _L, identifier, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, identifier, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_identifier(), []};
-t_from_form({type, _L, integer, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, integer, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_integer(), []};
-t_from_form({type, _L, iodata, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, iodata, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_iodata(), []};
-t_from_form({type, _L, iolist, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, iolist, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_iolist(), []};
-t_from_form({type, _L, list, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, list, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_list(), []};
-t_from_form({type, _L, list, [Type]}, TypeNames, RecDict, VarDict) ->
-  {T, R} = t_from_form(Type, TypeNames, RecDict, VarDict),
+t_from_form({type, _L, list, [Type]}, TypeNames, InOpaque, RecDict,
+            VarDict) ->
+  {T, R} = t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict),
   {t_list(T), R};
-t_from_form({type, _L, mfa, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, mfa, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_mfa(), []};
-t_from_form({type, _L, module, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, module, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_module(), []};
-t_from_form({type, _L, nil, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, nil, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_nil(), []};
-t_from_form({type, _L, neg_integer, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, neg_integer, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_neg_integer(), []};
-t_from_form({type, _L, non_neg_integer, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, non_neg_integer, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_non_neg_integer(), []};
-t_from_form({type, _L, no_return, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, no_return, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_unit(), []};
-t_from_form({type, _L, node, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, node, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_node(), []};
-t_from_form({type, _L, none, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, none, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_none(), []};
-t_from_form({type, _L, nonempty_list, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, nonempty_list, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_nonempty_list(), []};
-t_from_form({type, _L, nonempty_list, [Type]}, TypeNames, RecDict, VarDict) ->
-  {T, R} = t_from_form(Type, TypeNames, RecDict, VarDict),
+t_from_form({type, _L, nonempty_list, [Type]}, TypeNames, InOpaque, RecDict,
+            VarDict) ->
+  {T, R} = t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict),
   {t_nonempty_list(T), R};
 t_from_form({type, _L, nonempty_improper_list, [Cont, Term]}, TypeNames,
-            RecDict, VarDict) ->
-  {T1, R1} = t_from_form(Cont, TypeNames, RecDict, VarDict),
-  {T2, R2} = t_from_form(Term, TypeNames, RecDict, VarDict),
+            InOpaque, RecDict, VarDict) ->
+  {T1, R1} = t_from_form(Cont, TypeNames, InOpaque, RecDict, VarDict),
+  {T2, R2} = t_from_form(Term, TypeNames, InOpaque, RecDict, VarDict),
   {t_cons(T1, T2), R1 ++ R2};
 t_from_form({type, _L, nonempty_maybe_improper_list, []}, _TypeNames,
-            _RecDict, _VarDict) ->
+            _InOpaque, _RecDict, _VarDict) ->
   {t_cons(?any, ?any), []};
-t_from_form({type, _L, nonempty_maybe_improper_list, [Cont, Term]}, TypeNames,
-            RecDict, VarDict) ->
-  {T1, R1} = t_from_form(Cont, TypeNames, RecDict, VarDict),
-  {T2, R2} = t_from_form(Term, TypeNames, RecDict, VarDict),
+t_from_form({type, _L, nonempty_maybe_improper_list, [Cont, Term]},
+            TypeNames, InOpaque, RecDict, VarDict) ->
+  {T1, R1} = t_from_form(Cont, TypeNames, InOpaque, RecDict, VarDict),
+  {T2, R2} = t_from_form(Term, TypeNames, InOpaque, RecDict, VarDict),
   {t_cons(T1, T2), R1 ++ R2};
-t_from_form({type, _L, nonempty_string, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, nonempty_string, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_nonempty_string(), []};
-t_from_form({type, _L, number, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, number, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_number(), []};
-t_from_form({type, _L, pid, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, pid, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_pid(), []};
-t_from_form({type, _L, port, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, port, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_port(), []};
-t_from_form({type, _L, pos_integer, []}, _TypeNames, _RecDict, _VarDict) ->
-  {t_pos_integer(), []};
-t_from_form({type, _L, maybe_improper_list, []}, _TypeNames, _RecDict,
+t_from_form({type, _L, pos_integer, []}, _TypeNames, _InOpaque, _RecDict,
             _VarDict) ->
+  {t_pos_integer(), []};
+t_from_form({type, _L, maybe_improper_list, []}, _TypeNames, _InOpaque,
+            _RecDict, _VarDict) ->
   {t_maybe_improper_list(), []};
-t_from_form({type, _L, maybe_improper_list, [Content, Termination]}, TypeNames,
-            RecDict, VarDict) ->
-  {T1, R1} = t_from_form(Content, TypeNames, RecDict, VarDict),
-  {T2, R2} = t_from_form(Termination, TypeNames, RecDict, VarDict),
+t_from_form({type, _L, maybe_improper_list, [Content, Termination]},
+            TypeNames, InOpaque, RecDict, VarDict) ->
+  {T1, R1} = t_from_form(Content, TypeNames, InOpaque, RecDict, VarDict),
+  {T2, R2} = t_from_form(Termination, TypeNames, InOpaque, RecDict, VarDict),
   {t_maybe_improper_list(T1, T2), R1 ++ R2};
-t_from_form({type, _L, product, Elements}, TypeNames, RecDict, VarDict) ->
-  {L, R} = list_from_form(Elements, TypeNames, RecDict, VarDict),
+t_from_form({type, _L, product, Elements}, TypeNames, InOpaque, RecDict,
+            VarDict) ->
+  {L, R} = list_from_form(Elements, TypeNames, InOpaque, RecDict, VarDict),
   {t_product(L), R};
-t_from_form({type, _L, queue, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, queue, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_queue(), []};
-t_from_form({type, _L, range, [{integer, _, From}, {integer, _, To}]}, 
-	    _TypeNames, _RecDict, _VarDict) ->
-  {t_from_range(From, To), []};
-t_from_form({type, _L, record, [Name|Fields]}, TypeNames, RecDict, VarDict) ->
-  record_from_form(Name, Fields, TypeNames, RecDict, VarDict);
-t_from_form({type, _L, reference, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, range, [From, To]} = Type,
+	    _TypeNames, _InOpaque, _RecDict, _VarDict) ->
+  case {erl_eval:partial_eval(From), erl_eval:partial_eval(To)} of
+    {{integer, _, FromVal}, {integer, _, ToVal}} ->
+      {t_from_range(FromVal, ToVal), []};
+    _ -> throw({error, io_lib:format("Unable to evaluate type ~w\n", [Type])})
+  end;
+t_from_form({type, _L, record, [Name|Fields]}, TypeNames, InOpaque, RecDict,
+            VarDict) ->
+  record_from_form(Name, Fields, TypeNames, InOpaque, RecDict, VarDict);
+t_from_form({type, _L, reference, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_reference(), []};
-t_from_form({type, _L, set, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, set, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_set(), []};
-t_from_form({type, _L, string, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, string, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_string(), []};
-t_from_form({type, _L, term, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, term, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_any(), []};
-t_from_form({type, _L, tid, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, tid, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_tid(), []};
-t_from_form({type, _L, timeout, []}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, timeout, []}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_timeout(), []};
-t_from_form({type, _L, tuple, any}, _TypeNames, _RecDict, _VarDict) ->
+t_from_form({type, _L, tuple, any}, _TypeNames, _InOpaque, _RecDict,
+            _VarDict) ->
   {t_tuple(), []};
-t_from_form({type, _L, tuple, Args}, TypeNames, RecDict, VarDict) ->
-  {L, R} = list_from_form(Args, TypeNames, RecDict, VarDict),
+t_from_form({type, _L, tuple, Args}, TypeNames, InOpaque, RecDict, VarDict) ->
+  {L, R} = list_from_form(Args, TypeNames, InOpaque, RecDict, VarDict),
   {t_tuple(L), R};
-t_from_form({type, _L, union, Args}, TypeNames, RecDict, VarDict) ->
-  {L, R} = list_from_form(Args, TypeNames, RecDict, VarDict),
+t_from_form({type, _L, union, Args}, TypeNames, InOpaque, RecDict, VarDict) ->
+  {L, R} = list_from_form(Args, TypeNames, InOpaque, RecDict, VarDict),
   {t_sup(L), R};
-t_from_form({type, _L, Name, Args}, TypeNames, RecDict, VarDict) ->
+t_from_form({type, _L, Name, Args}, TypeNames, InOpaque, RecDict, VarDict) ->
   case lookup_type(Name, RecDict) of
     {type, {_Module, Type, ArgNames}} when length(Args) =:= length(ArgNames) ->
-      case unfold({type, Name}, TypeNames) of
+      case can_unfold_more({type, Name}, TypeNames) of
         true ->
           List = lists:zipwith(
                    fun(ArgName, ArgType) ->
                        {Ttemp, _R} = t_from_form(ArgType, TypeNames,
-                                                     RecDict, VarDict),
+                                                 InOpaque, RecDict,
+                                                 VarDict),
                        {ArgName, Ttemp}
                    end,
                    ArgNames, Args),
           TmpVarDict = dict:from_list(List),
-          {T, R} = t_from_form(Type, [{type, Name}|TypeNames], RecDict,
-                               TmpVarDict),
+          {T, R} = t_from_form(Type, [{type, Name}|TypeNames], InOpaque,
+                               RecDict, TmpVarDict),
           case lists:member({type, Name}, R) of
             true -> {t_limit(T, ?REC_TYPE_LIMIT), R};
             false -> {T, R}
@@ -3563,26 +3695,32 @@ t_from_form({type, _L, Name, Args}, TypeNames, RecDict, VarDict) ->
       end;
     {opaque, {Module, Type, ArgNames}} when length(Args) =:= length(ArgNames) ->
       {Rep, Rret} =
-        case unfold({opaque, Name}, TypeNames) of
+        case can_unfold_more({opaque, Name}, TypeNames) of
           true ->
             List = lists:zipwith(
                      fun(ArgName, ArgType) ->
-                         {Ttemp, _R} =  t_from_form(ArgType, TypeNames,
-                                                    RecDict, VarDict),
+                         {Ttemp, _R} = t_from_form(ArgType, TypeNames,
+                                                   InOpaque, RecDict,
+                                                   VarDict),
                          {ArgName, Ttemp}
                      end,
                      ArgNames, Args),
             TmpVarDict = dict:from_list(List),
-            {T, R} = t_from_form(Type, [{opaque, Name}|TypeNames], RecDict,
-                                 TmpVarDict),
+            {T, R} = t_from_form(Type, [{opaque, Name}|TypeNames], true,
+                                 RecDict, TmpVarDict),
             case lists:member({opaque, Name}, R) of
               true -> {t_limit(T, ?REC_TYPE_LIMIT), R};
               false -> {T, R}
             end;
           false -> {t_any(), [{opaque, Name}]}
         end,
-      Tret = t_from_form({opaque, -1, Name, {Module, Args, Rep}},
-                         RecDict, VarDict),
+      Tret =
+        case InOpaque of
+          true -> Rep;
+          false ->
+            t_from_form({opaque, -1, Name, {Module, Args, Rep}},
+                        RecDict, VarDict)
+          end,
       {Tret, Rret};
     {type, _} ->
       throw({error, io_lib:format("Unknown type ~w\n", [Name])});
@@ -3591,15 +3729,16 @@ t_from_form({type, _L, Name, Args}, TypeNames, RecDict, VarDict) ->
     error ->
       throw({error, io_lib:format("Unable to find type ~w\n", [Name])}) 
   end;
-t_from_form({opaque, _L, Name, {Mod, Args, Rep}}, _TypeNames, _RecDict,
-            _VarDict) ->
+t_from_form({opaque, _L, Name, {Mod, Args, Rep}}, _TypeNames, _InOpaque,
+            _RecDict, _VarDict) ->
   case Args of
     [] -> {t_opaque(Mod, Name, Args, Rep), []};
     _ -> throw({error, "Polymorphic opaque types not supported yet"})
   end.
 
-record_from_form({atom, _, Name}, ModFields, TypeNames, RecDict, VarDict) ->
-  case unfold({record, Name}, TypeNames) of
+record_from_form({atom, _, Name}, ModFields, TypeNames, InOpaque, RecDict,
+                 VarDict) ->
+  case can_unfold_more({record, Name}, TypeNames) of
     true ->
       case lookup_record(Name, RecDict) of
         {ok, DeclFields} ->
@@ -3609,14 +3748,15 @@ record_from_form({atom, _, Name}, ModFields, TypeNames, RecDict, VarDict) ->
           {DeclFields1, R1} =
             case lists:all(fun(Elem) -> Elem end, AreTyped) of
               true -> {DeclFields, []};
-              false -> fields_from_form(DeclFields, TypeNames1,
+              false -> fields_from_form(DeclFields, TypeNames1, InOpaque,
                                         RecDict, dict:new())
             end,
           {GetModRec, R2} = get_mod_record(ModFields, DeclFields1,
-                                           TypeNames1, RecDict, VarDict),
+                                           TypeNames1, InOpaque,
+                                           RecDict, VarDict),
           case GetModRec of
             {error, FieldName} ->
-              throw({error, io_lib:format("Illegal declaration of ~w#{~w}\n",
+              throw({error, io_lib:format("Illegal declaration of #~w{~w}\n",
                                           [Name, FieldName])});
             {ok, NewFields} ->
               {t_tuple(
@@ -3624,17 +3764,18 @@ record_from_form({atom, _, Name}, ModFields, TypeNames, RecDict, VarDict) ->
                R1 ++ R2}
           end;
         error ->
-          throw({error, erlang:error(io_lib:format("Unknown record #~w{}\n",
-                                                   [Name]))})
+          throw({error, io_lib:format("Unknown record #~w{}\n", [Name])})
       end;
     false -> {t_any(), []}
   end.
 
-get_mod_record([], DeclFields, _TypeNames, _RecDict, _VarDict) ->
+get_mod_record([], DeclFields, _TypeNames, _InOpaque, _RecDict,
+               _VarDict) ->
   {{ok, DeclFields}, []};
-get_mod_record(ModFields, DeclFields, TypeNames, RecDict, VarDict) ->
+get_mod_record(ModFields, DeclFields, TypeNames, InOpaque, RecDict,
+               VarDict) ->
   DeclFieldsDict = orddict:from_list(DeclFields),
-  {ModFieldsDict, R} = build_field_dict(ModFields, TypeNames,
+  {ModFieldsDict, R} = build_field_dict(ModFields, TypeNames, InOpaque,
                                         RecDict, VarDict),
   case get_mod_record(DeclFieldsDict, ModFieldsDict, []) of
     {error, _FieldName} = Error -> {Error, R};
@@ -3644,21 +3785,23 @@ get_mod_record(ModFields, DeclFields, TypeNames, RecDict, VarDict) ->
        R}
   end.
 
-build_field_dict(FieldTypes, TypeNames, RecDict, VarDict) ->
-  build_field_dict(FieldTypes, TypeNames, RecDict, VarDict, []).
+build_field_dict(FieldTypes, TypeNames, InOpaque, RecDict, VarDict) ->
+  build_field_dict(FieldTypes, TypeNames, InOpaque, RecDict, VarDict, []).
 
 build_field_dict([{type, _, field_type, [{atom, _, Name}, Type]}|Left], 
-		 TypeNames, RecDict, VarDict, Acc) ->
-  {T, R1} = t_from_form(Type, TypeNames, RecDict, VarDict),
+		 TypeNames, InOpaque, RecDict, VarDict, Acc) ->
+  {T, R1} = t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict),
   NewAcc = [{Name, T}|Acc],
-  {D, R2} = build_field_dict(Left, TypeNames, RecDict, VarDict, NewAcc),
+  {D, R2} = build_field_dict(Left, TypeNames, InOpaque, RecDict, VarDict,
+                             NewAcc),
   {D, R1 ++ R2};
-build_field_dict([], _TypeNames, _RecDict, _VarDict, Acc) ->
+build_field_dict([], _TypeNames, _InOpaque, _RecDict, _VarDict, Acc) ->
   {orddict:from_list(Acc), []}.
 
 get_mod_record([{FieldName, DeclType}|Left1], 
 	       [{FieldName, ModType}|Left2], Acc) ->
-  case t_is_var(ModType) orelse t_is_subtype(ModType, DeclType) of
+  case t_is_var(ModType) orelse t_is_remote(ModType) orelse
+    t_is_subtype(ModType, DeclType) of
     false -> {error, FieldName};
     true -> get_mod_record(Left1, Left2, [{FieldName, ModType}|Acc])
   end;
@@ -3671,18 +3814,19 @@ get_mod_record(DeclFields, [], Acc) ->
 get_mod_record(_, [{FieldName2, _ModType}|_], _Acc) ->
   {error, FieldName2}.
 
-fields_from_form([], _TypeNames, _RecDict, _VarDict) ->
+fields_from_form([], _TypeNames, _InOpaque, _RecDict, _VarDict) ->
   {[], []};
-fields_from_form([{Name, Type}|Tail], TypeNames, RecDict, VarDict) ->
-  {T, R1} = t_from_form(Type, TypeNames, RecDict, VarDict),
-  {F, R2} = fields_from_form(Tail, TypeNames, RecDict, VarDict),
+fields_from_form([{Name, Type}|Tail], TypeNames, InOpaque, RecDict,
+                 VarDict) ->
+  {T, R1} = t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict),
+  {F, R2} = fields_from_form(Tail, TypeNames, InOpaque, RecDict, VarDict),
   {[{Name, T}|F], R1 ++ R2}.
 
-list_from_form([], _TypeNames, _RecDict, _VarDict) ->
+list_from_form([], _TypeNames, _InOpaque, _RecDict, _VarDict) ->
   {[], []};
-list_from_form([H|Tail], TypeNames, RecDict, VarDict) ->
-  {T, R1} = t_from_form(H, TypeNames, RecDict, VarDict),
-  {L, R2} = list_from_form(Tail, TypeNames, RecDict, VarDict),
+list_from_form([H|Tail], TypeNames, InOpaque, RecDict, VarDict) ->
+  {T, R1} = t_from_form(H, TypeNames, InOpaque, RecDict, VarDict),
+  {L, R2} = list_from_form(Tail, TypeNames, InOpaque, RecDict, VarDict),
   {[T|L], R1 ++ R2}.
 
 -spec t_form_to_string(parse_form()) -> string().
@@ -3692,6 +3836,16 @@ t_form_to_string({var, _L, Name}) -> atom_to_list(Name);
 t_form_to_string({atom, _L, Atom}) -> 
   io_lib:write_string(atom_to_list(Atom), $'); % To quote or not to quote... '
 t_form_to_string({integer, _L, Int}) -> integer_to_list(Int);
+t_form_to_string({op, _L, _Op, _Arg} = Op) ->
+  case erl_eval:partial_eval(Op) of
+    {integer, _, _} = Int -> t_form_to_string(Int);
+    _ -> io_lib:format("Bad formed type ~w",[Op])
+  end;
+t_form_to_string({op, _L, _Op, _Arg1, _Arg2} = Op) ->
+  case erl_eval:partial_eval(Op) of
+    {integer, _, _} = Int -> t_form_to_string(Int);
+    _ -> io_lib:format("Bad formed type ~w",[Op])
+  end;
 t_form_to_string({ann_type, _L, [Var, Type]}) ->
   t_form_to_string(Var) ++ "::" ++ t_form_to_string(Type);
 t_form_to_string({paren_type, _L, [Type]}) ->
@@ -3718,8 +3872,12 @@ t_form_to_string({type, _L, nonempty_list, [Type]}) ->
 t_form_to_string({type, _L, nonempty_string, []}) -> "nonempty_string()";
 t_form_to_string({type, _L, product, Elements}) ->
   "<" ++ sequence(t_form_to_string_list(Elements), ",") ++ ">";
-t_form_to_string({type, _L, range, [{integer, _, From}, {integer, _, To}]}) ->
-  io_lib:format("~w..~w", [From, To]);
+t_form_to_string({type, _L, range, [From, To]} = Type) ->
+  case {erl_eval:partial_eval(From), erl_eval:partial_eval(To)} of
+    {{integer, _, FromVal}, {integer, _, ToVal}} ->
+      io_lib:format("~w..~w", [FromVal, ToVal]);
+    _ -> io_lib:format("Bad formed type ~w",[Type])
+  end;
 t_form_to_string({type, _L, record, [{atom, _, Name}]}) ->
   io_lib:format("#~w{}", [Name]);
 t_form_to_string({type, _L, record, [{atom, _, Name}|Fields]}) ->
@@ -3738,13 +3896,17 @@ t_form_to_string({type, _L, Name, []} = T) ->
   try t_to_string(t_from_form(T))
   catch throw:{error, _} -> atom_to_list(Name) ++ "()"
   end;
-t_form_to_string({type, _L, binary, [{integer, _, X}, {integer, _, Y}]}) ->
-  case Y of
-    0 ->
-      case X of
-	0 -> "<<>>";
-	_ -> io_lib:format("<<_:~w>>", [X])
-      end
+t_form_to_string({type, _L, binary, [X,Y]} = Type) ->
+  case {erl_eval:partial_eval(X), erl_eval:partial_eval(Y)} of
+    {{integer, _, XVal}, {integer, _, YVal}} ->
+      case YVal of
+	0 ->
+	  case XVal of
+	    0 -> "<<>>";
+	    _ -> io_lib:format("<<_:~w>>", [XVal])
+	  end
+      end;
+    _ -> io_lib:format("Bad formed type ~w",[Type])
   end;
 t_form_to_string({type, _L, Name, List}) -> 
   io_lib:format("~w(~s)", [Name, sequence(t_form_to_string_list(List), ",")]).
@@ -3776,6 +3938,8 @@ any_none_or_unit([?unit|_]) -> true;
 any_none_or_unit([_|Left]) -> any_none_or_unit(Left);
 any_none_or_unit([]) -> false.
 
+-spec is_erl_type(any()) -> boolean().
+
 is_erl_type(?any) -> true;
 is_erl_type(?none) -> true;
 is_erl_type(?unit) -> true;
@@ -3821,8 +3985,9 @@ lookup_type(Name, RecDict) ->
 type_is_defined(TypeOrOpaque, Name, RecDict) ->
   dict:is_key({TypeOrOpaque, Name}, RecDict).
 
-unfold(TypeName, TypeNames) ->
-  not lists:member(TypeName, TypeNames).
+can_unfold_more(TypeName, TypeNames) ->
+  Fun = fun(E, Acc) -> case E of TypeName -> Acc + 1; _ -> Acc end end,
+  lists:foldl(Fun, 0, TypeNames) < ?REC_TYPE_LIMIT.
 
 %% -----------------------------------
 %% Set
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index 2c78558190..8c9dbc0c18 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -30,6 +30,124 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
+<section><title>Hipe 3.7.8.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Several type specifications for standard libraries were
+	    wrong in the R14B01 release. This is now corrected. The
+	    corrections concern types in re,io,filename and the
+	    module erlang itself.</p>
+          <p>
+	    Own Id: OTP-9008</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Hipe 3.7.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Compiler warnings were eliminated.</p>
+          <p>
+	    Own Id: OTP-8855</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Hipe 3.7.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The HiPE compiler could crash when compiling certain
+	    modules (the bug has been latent, and been exposed by new
+	    optimizations introduced in the BEAM compiler in R14A).
+	    (Thanks to Mikael Pettersson.)</p>
+          <p>
+	    Own Id: OTP-8800</p>
+        </item>
+        <item>
+          <p>
+	    hipe:load/1 was broken. (Thanks to Paul Guyot.)</p>
+          <p>
+	    Own Id: OTP-8802</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Hipe 3.7.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p><c>receive</c> statements that can only read out a
+	    newly created reference are now specially optimized so
+	    that it will execute in constant time regardless of the
+	    number of messages in the receive queue for the process.
+	    That optimization will benefit calls to
+	    <c>gen_server:call()</c>. (See <c>gen:do_call/4</c> for
+	    an example of a receive statement that will be
+	    optimized.)</p>
+          <p>
+	    Own Id: OTP-8623</p>
+        </item>
+        <item>
+          <p>
+	    Various changes to dialyzer-related files for R14.</p>
+          <p>
+	    - Dialyzer properly supports the new attribute
+	    -export_type and checks that remote types only refer to
+	    exported types. A warning is produced if some
+	    files/applications refer to types defined in modules
+	    which are neither in the PLT nor in the analyzed
+	    applications.</p>
+          <p>
+	    - Support for detecting data races involving whereis/1
+	    and unregister/1.</p>
+          <p>
+	    - More precise identification of the reason(s) why a
+	    record construction violates the types declared for its
+	    fields.</p>
+          <p>
+	    - Fixed bug in the handling of the 'or' guard.</p>
+          <p>
+	    - Better handling of the erlang:element/2 BIF.</p>
+          <p>
+	    - Complete handling of Erlang BIFs.</p>
+          <p>
+	    Own Id: OTP-8699</p>
+        </item>
+        <item>
+	    <p><c>eprof</c> has been reimplemented with support in
+	    the Erlang virtual machine and is now both faster (i.e.
+	    slows down the code being measured less) and scales much
+	    better. In measurements we saw speed-ups compared to the
+	    old eprof ranging from 6 times (for sequential code that
+	    only uses one scheduler/core) up to 84 times (for
+	    parallel code that uses 8 cores).</p>
+	    <p>Note: The API for the <c>eprof</c> has been cleaned up
+	    and extended. See the documentation.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8706</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Hipe 3.7.5</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 1f8be4040e..d7eb035551 100644
--- a/lib/hipe/icode/hipe_beam_to_icode.erl
+++ b/lib/hipe/icode/hipe_beam_to_icode.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -369,6 +369,10 @@ trans_fun([{bif,BifName,{f,Lbl},[_] = Args,Reg}|Instructions], Env) ->
 trans_fun([{bif,BifName,{f,Lbl},[_,_] = Args,Reg}|Instructions], Env) ->
   {BifInsts,Env1} = trans_bif(2,BifName,Lbl,Args,Reg,Env),
   [hipe_icode:mk_comment({bif2,BifName})|BifInsts] ++ trans_fun(Instructions,Env1);
+%%--- bif3 ---
+trans_fun([{bif,BifName,{f,Lbl},[_,_,_] = Args,Reg}|Instructions], Env) ->
+  {BifInsts,Env1} = trans_bif(3,BifName,Lbl,Args,Reg,Env),
+  [hipe_icode:mk_comment({bif3,BifName})|BifInsts] ++ trans_fun(Instructions,Env1);
 %%--- allocate
 trans_fun([{allocate,StackSlots,_}|Instructions], Env) ->
   trans_allocate(StackSlots) ++ trans_fun(Instructions,Env);
@@ -914,7 +918,7 @@ trans_fun([{bs_add, {f,Lbl}, [Old,New,Unit], Res}|Instructions], Env) ->
 	    Succ = mk_label(new),
 	    [hipe_icode:mk_primop([Temp], '*', 
 				  [NewVar, hipe_icode:mk_const(Unit)],
-				  hipe_icode:label_name(Succ), Lbl),
+				  hipe_icode:label_name(Succ), map_label(Lbl)),
 	     Succ]
 	end
     end,
@@ -926,7 +930,7 @@ trans_fun([{bs_add, {f,Lbl}, [Old,New,Unit], Res}|Instructions], Env) ->
 	 [FailLbl,
 	  hipe_icode:mk_fail([hipe_icode:mk_const(badarg)], error)]};
        true ->
-	{Lbl, []}
+	{map_label(Lbl), []}
     end,
   IsPos = 
     [hipe_icode:mk_if('>=', [Temp, hipe_icode:mk_const(0)], 
diff --git a/lib/hipe/icode/hipe_icode_callgraph.erl b/lib/hipe/icode/hipe_icode_callgraph.erl
index 95182fc002..3dba8e1071 100644
--- a/lib/hipe/icode/hipe_icode_callgraph.erl
+++ b/lib/hipe/icode/hipe_icode_callgraph.erl
@@ -25,8 +25,6 @@
 %%           in hipe_icode_type.erl.
 %%
 %% Created :  7 Jun 2004 by Tobias Lindahl <[email protected]>
-%%
-%% $Id$
 %%-----------------------------------------------------------------------
 -module(hipe_icode_callgraph).
 
@@ -48,7 +46,7 @@
 
 -type mfa_icode() :: {mfa(), #icode{}}.
 
--record(icode_callgraph, {codedict :: dict(), ordered_sccs :: [[atom()]]}).
+-record(icode_callgraph, {codedict :: dict(), ordered_sccs :: [[mfa()]]}).
 
 %%------------------------------------------------------------------------
 %% Exported functions
@@ -78,7 +76,7 @@ construct_callgraph(List) ->
 
 to_list(#icode_callgraph{codedict = Dict, ordered_sccs = SCCs}) ->
   FlatList = lists:flatten(SCCs),
-  [{Mod, dict:fetch(Mod, Dict)} || Mod <- FlatList].
+  [{MFA, dict:fetch(MFA, Dict)} || MFA <- FlatList].
 
 %%------------------------------------------------------------------------
 
diff --git a/lib/hipe/icode/hipe_icode_exceptions.erl b/lib/hipe/icode/hipe_icode_exceptions.erl
index 787fb05415..3c8f7b5712 100644
--- a/lib/hipe/icode/hipe_icode_exceptions.erl
+++ b/lib/hipe/icode/hipe_icode_exceptions.erl
@@ -344,6 +344,16 @@ pop_catch(Cs) ->
 
 pop_catch_1([[_|C] | Cs]) ->
   [C | pop_catch_1(Cs)];
+pop_catch_1([[] | Cs]) ->
+  %% The elements in the list represent different possible incoming
+  %% stacks of catch handlers to this BB.  Before the fixpoint has
+  %% been found these elements are underapproximations of the true
+  %% stacks, therefore it's possible for these elements to be too
+  %% short for the number of pops implied by the code in the BB.
+  %% We must not fail in that case, so we set pop([]) = [].
+  %% This fixes find_catches_crash.erl and compiler_tests in the
+  %% HiPE test suite.
+  [[] | pop_catch_1(Cs)];
 pop_catch_1([]) ->
   [].
 
diff --git a/lib/hipe/icode/hipe_icode_primops.erl b/lib/hipe/icode/hipe_icode_primops.erl
index b0fe7eb708..a413531c07 100644
--- a/lib/hipe/icode/hipe_icode_primops.erl
+++ b/lib/hipe/icode/hipe_icode_primops.erl
@@ -2,19 +2,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%% Copyright Ericsson AB 2001-2011. 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%
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -26,9 +26,6 @@
 %%  Notes    : 
 %%  History  :	* 2001-06-13 Erik Johansson ([email protected]): 
 %%               Created.
-%%
-%% $Id$
-%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -module(hipe_icode_primops).
@@ -197,7 +194,7 @@ fails(#element{}) -> true;
 %% fails(#gc_test{}) -> ???
 fails({hipe_bs_primop, {bs_start_match, _}}) -> true;
 fails({hipe_bs_primop, {{bs_start_match, bitstr}, _}}) -> true;
-fails({hipe_bs_primop, {{bs_start_match, ok_matchstate}, _}}) -> false;
+fails({hipe_bs_primop, {{bs_start_match, ok_matchstate}, _}}) -> true;
 fails({hipe_bs_primop, {bs_get_binary, _, _}}) -> true;
 fails({hipe_bs_primop, {bs_get_binary_all, _, _}}) -> true;
 fails({hipe_bs_primop, {bs_get_binary_all_2, _, _}}) -> true;
diff --git a/lib/hipe/icode/hipe_icode_range.erl b/lib/hipe/icode/hipe_icode_range.erl
index bcc857acf4..c222e8a5d5 100644
--- a/lib/hipe/icode/hipe_icode_range.erl
+++ b/lib/hipe/icode/hipe_icode_range.erl
@@ -1,20 +1,20 @@
 %% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2007-2011. 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%
 %%
 %%%-------------------------------------------------------------------
@@ -59,15 +59,17 @@
 
 -record(range, {range :: range_rep(),
 		other :: boolean()}).
+-type range() :: #range{}.
 
--record(ann,   {range :: #range{},
+-record(ann,   {range :: range(),
                 type  :: erl_types:erl_type(),
 		count :: integer()}).
+-type ann() :: #ann{}.
 
--type range_anno() :: {range_anno, #ann{}, fun((#ann{}) -> string())}.
--type args_fun() :: fun((mfa(),cfg()) -> [#range{}]).
--type call_fun() :: fun((mfa(),[#range{}]) -> #range{}). 		      
--type final_fun() :: fun((mfa(),[#range{}]) -> ok).
+-type range_anno() :: {'range_anno', ann(), fun((ann()) -> string())}.
+-type args_fun() :: fun((mfa(), cfg()) -> [range()]).
+-type call_fun() :: fun((mfa(), [range()]) -> range()).
+-type final_fun() :: fun((mfa(), [range()]) -> 'ok').
 -type data() :: {mfa(), args_fun(), call_fun(), final_fun()}.
 -type label() :: non_neg_integer().
 -type info() :: gb_tree().
@@ -75,15 +77,15 @@
 -type variable() :: #icode_variable{}.
 -type annotated_variable() :: #icode_variable{}.
 -type argument() :: #icode_const{} | variable().
--type three_range_fun()   :: fun((#range{},#range{},#range{}) -> #range{}).
+-type three_range_fun()   :: fun((range(),range(),range()) -> range()).
 -type instr_split_info()  :: {icode_instr(), [{label(),info()}]}.
--type last_instr_return() :: {instr_split_info(), #range{}}.
+-type last_instr_return() :: {instr_split_info(), range()}.
 
 -record(state, {info_map = gb_trees:empty()	:: info(), 
 		counter  = dict:new()		:: dict(), 
 		cfg				:: cfg(), 
 		liveness = gb_trees:empty()	:: gb_tree(), 
-		ret_type			:: #range{}, 
+		ret_type			:: range(),
 		lookup_fun			:: call_fun(),
 		result_action			:: final_fun()}).
 
@@ -108,8 +110,8 @@ cfg(Cfg, MFA, Options, Servers) ->
 -spec concurrent_cfg(cfg(), mfa(), pid()) -> cfg().
 
 concurrent_cfg(Cfg, MFA, CompServer) ->
-  CompServer ! {ready, {MFA,self()}},
-  {ArgsFun,CallFun,FinalFun} = do_analysis(Cfg, MFA),
+  CompServer ! {ready, {MFA, self()}},
+  {ArgsFun, CallFun, FinalFun} = do_analysis(Cfg, MFA),
   Ans = do_rewrite(Cfg, MFA, ArgsFun, CallFun, FinalFun),
   CompServer ! {done_rewrite, MFA},
   Ans.
@@ -227,7 +229,7 @@ analyse_block(Label, Info, State, Rewrite) ->
   state__update_info(State2, InfoList, Rewrite).
 
 -spec analyse_BB([icode_instr()], info(), [icode_instr()], boolean(), call_fun()) ->
-	 {[icode_instr()], [{label(),info()}], #range{}}.
+	 {[icode_instr()], [{label(),info()}], range()}.
 
 analyse_BB([Last], Info, Code, Rewrite, LookupFun) ->
   {{NewI, LabelInfoList}, RetType} =
@@ -266,9 +268,9 @@ handle_args(I, Info, WidenFun) ->
   %% io:format("Uses: ~p~nRanges: ~p~n", [Uses, PresentRanges]),
   JoinFun = fun(Var, Range) -> update_info(Var, Range, WidenFun) end,
   NewUses = lists:zipwith(JoinFun, Uses, PresentRanges),
-  hipe_icode:subst_uses(lists:zip(Uses, NewUses),I).
+  hipe_icode:subst_uses(lists:zip(Uses, NewUses), I).
 
--spec join_info(#ann{}, #range{}, three_range_fun()) -> #ann{}.
+-spec join_info(ann(), range(), three_range_fun()) -> ann().
 
 join_info(Ann = #ann{range = R1, type = Type, count = ?WIDEN}, R2, Fun) ->
   Ann#ann{range = Fun(R1, R2, range_from_simple_type(Type))};
@@ -278,17 +280,17 @@ join_info(Ann = #ann{range = R1, type = Type, count = C}, R2, _Fun) when C < ?WI
     NewR -> Ann#ann{range = NewR, count = C+1}
   end.
 
--spec join_three(#range{}, #range{}, #range{}) -> #range{}.
+-spec join_three(range(), range(), range()) -> range().
 
 join_three(R1, R2, R3) ->
   inf(sup(R1, R2), R3).
 
--spec update_info(variable(), #range{}) -> annotated_variable().
+-spec update_info(variable(), range()) -> annotated_variable().
 
 update_info(Var, Range) ->
   update_info(Var, Range, fun update_three/3).
 
--spec update_info(variable(), #range{}, three_range_fun()) -> annotated_variable().
+-spec update_info(variable(), range(), three_range_fun()) -> annotated_variable().
 
 update_info(Arg, R, Fun) ->
   case hipe_icode:is_annotated_variable(Arg) of
@@ -299,7 +301,7 @@ update_info(Arg, R, Fun) ->
       Arg
   end.
 
--spec update_info1(any(), #range{}, three_range_fun()) -> range_anno().
+-spec update_info1(any(), range(), three_range_fun()) -> range_anno().
 
 update_info1({range_anno, Ann, _}, R2, Fun) ->
   make_range_anno(update_ann(Ann,R2,Fun));
@@ -314,71 +316,71 @@ update_ann(Ann = #ann{range = R1, type = Type, count = C}, R2, _Fun) ->
     NewR -> Ann#ann{range = NewR, count = C+1}
   end.
 
--spec type_to_ann(erl_types:erl_type()) -> #ann{}.
+-spec type_to_ann(erl_types:erl_type()) -> ann().
 
 type_to_ann(Type) ->
-  #ann{range = range_from_simple_type(Type), type = t_limit(Type,1), count=1}.
+  #ann{range = range_from_simple_type(Type), type = t_limit(Type,1), count = 1}.
 
--spec make_range_anno(#ann{}) -> range_anno().
+-spec make_range_anno(ann()) -> range_anno().
 
 make_range_anno(Ann) ->
   {range_anno, Ann, fun pp_ann/1}. 
 
--spec update_three(#range{}, #range{}, #range{}) -> #range{}.
+-spec update_three(range(), range(), range()) -> range().
 
 update_three(_R1, R2, R3) ->
   inf(R2, R3).
 
--spec safe_widen(#range{}, #range{}, #range{}) -> #range{}.
+-spec safe_widen(range(), range(), range()) -> range().
 
 safe_widen(#range{range=Old}, #range{range=New}, T = #range{range=Wide}) ->
   ResRange =
-    case {Old,New,Wide} of
-      {{Min,Max1},{Min,Max2},{_,Max}} ->
-	case inf_geq(OMax = next_up_limit(inf_max([Max1,Max2])),Max) of
+    case {Old, New, Wide} of
+      {{Min,Max1}, {Min,Max2}, {_,Max}} ->
+	case inf_geq(OMax = next_up_limit(inf_max([Max1, Max2])), Max) of
 	  true -> {Min,Max};
 	  false -> {Min,OMax}
 	end;
-      {{Min1,Max},{Min2,Max},{Min,_}} ->
-	case inf_geq(Min, OMin = next_down_limit(inf_min([Min1,Min2]))) of
+      {{Min1,Max}, {Min2,Max}, {Min,_}} ->
+	case inf_geq(Min, OMin = next_down_limit(inf_min([Min1, Min2]))) of
 	  true -> {Min,Max};
 	  false -> {OMin,Max}
 	end;
-      {{Min1,Max1},{Min2,Max2},{Min,Max}} -> 
+      {{Min1,Max1}, {Min2,Max2}, {Min,Max}} ->
 	RealMax =
-	  case inf_geq(OMax = next_up_limit(inf_max([Max1,Max2])),Max) of
+	  case inf_geq(OMax = next_up_limit(inf_max([Max1, Max2])), Max) of
 	    true -> Max;
 	    false -> OMax
 	  end,
 	RealMin = 
-	  case inf_geq(Min, OMin = next_down_limit(inf_min([Min1,Min2]))) of
+	  case inf_geq(Min, OMin = next_down_limit(inf_min([Min1, Min2]))) of
 	    true -> Min;
 	    false -> OMin
 	  end,
-	{RealMin,RealMax};
+	{RealMin, RealMax};
       _ ->
 	Wide
     end,
-  T#range{range=ResRange}.
+  T#range{range = ResRange}.
 
--spec widen(#range{}, #range{}, #range{}) -> #range{}.
+-spec widen(range(), range(), range()) -> range().
 
 widen(#range{range=Old}, #range{range=New}, T = #range{range=Wide}) ->
   ResRange =
-    case {Old,New,Wide} of
-      {{Min,_},{Min,Max2},{_,Max}} ->
-	case inf_geq(OMax = next_up_limit(Max2),Max) of
+    case {Old, New, Wide} of
+      {{Min,_}, {Min,Max2}, {_,Max}} ->
+	case inf_geq(OMax = next_up_limit(Max2), Max) of
 	  true -> {Min,Max};
 	  false -> {Min,OMax}
 	end;
-      {{_,Max},{Min2,Max},{Min,_}} ->
+      {{_,Max}, {Min2,Max}, {Min,_}} ->
 	case inf_geq(Min, OMin = next_down_limit(Min2)) of
 	  true -> {Min,Max};
 	  false -> {OMin,Max}
 	end;
-      {_,{Min2,Max2},{Min,Max}} -> 
+      {_, {Min2,Max2}, {Min,Max}} ->
 	RealMax =
-	  case inf_geq(OMax = next_up_limit(Max2),Max) of
+	  case inf_geq(OMax = next_up_limit(Max2), Max) of
 	    true -> Max;
 	    false -> OMax
 	  end,
@@ -387,11 +389,11 @@ widen(#range{range=Old}, #range{range=New}, T = #range{range=Wide}) ->
 	    true -> Min;
 	    false -> OMin
 	  end,
-	{RealMin,RealMax};
+	{RealMin, RealMax};
       _ ->
 	Wide
     end,
-  T#range{range=ResRange}.
+  T#range{range = ResRange}.
 
 -spec analyse_call(#icode_call{}, call_fun()) -> #icode_call{}.
 
@@ -421,7 +423,7 @@ analyse_move(Move) ->
 
 analyse_begin_handler(Handler) ->
   SubstList =
-    [{Dst,update_info(Dst,any_type())} || 
+    [{Dst, update_info(Dst, any_type())} ||
       Dst <- hipe_icode:begin_handler_dstlist(Handler)],
   hipe_icode:subst_defines(SubstList, Handler).
 
@@ -494,14 +496,14 @@ analyse_switch_val(Switch, Info, Rewrite) ->
       end
   end.
 
--spec update_infos(argument(), info(), [{#range{},label()}]) -> [{label(),info()}].
+-spec update_infos(argument(), info(), [{range(),label()}]) -> [{label(),info()}].
 
 update_infos(Arg, Info, [{Range, Label}|Rest]) ->
-  [{Label,enter_define({Arg,Range},Info)} | update_infos(Arg,Info,Rest)];
+  [{Label,enter_define({Arg,Range},Info)} | update_infos(Arg, Info, Rest)];
 update_infos(_, _, []) -> [].
 
--spec get_range_label_list([{argument(),label()}], #range{}, [{#range{},label()}]) ->
-	 {#range{},[{#range{},label()}]}.
+-spec get_range_label_list([{argument(),label()}], range(), [{range(),label()}]) ->
+	 {range(),[{range(),label()}]}.
 
 get_range_label_list([{Val,Label}|Cases], SRange, Acc) ->
   VRange = get_range_from_arg(Val),
@@ -516,7 +518,7 @@ get_range_label_list([], SRange, Acc) ->
   {PointTypes, _} = lists:unzip(Acc),
   {remove_point_types(SRange, PointTypes), Acc}.
 
--spec update_switch(#icode_switch_val{}, [{#range{},label()}], boolean()) ->
+-spec update_switch(#icode_switch_val{}, [{range(),label()}], boolean()) ->
 	 #icode_switch_val{}.
 
 update_switch(Switch, LabelRangeList, KeepFail) ->
@@ -524,14 +526,14 @@ update_switch(Switch, LabelRangeList, KeepFail) ->
     case label_range_list_to_cases(LabelRangeList, []) of
       no_update ->
 	Switch;
-      Cases -> 
+      Cases ->
 	hipe_icode:switch_val_cases_update(Switch, Cases)
     end,
   if KeepFail -> S2;
      true -> S2
   end.
 
--spec label_range_list_to_cases([{#range{},label()}], [{#icode_const{},label()}]) ->
+-spec label_range_list_to_cases([{range(),label()}], [{#icode_const{},label()}]) ->
 	 'no_update' | [{#icode_const{},label()}].
 
 label_range_list_to_cases([{#range{range={C,C},other=false},Label}|Rest],
@@ -586,9 +588,9 @@ analyse_last_call(Call, Info, LookupFun) ->
   NewInfo = enter_vals(NewI, Info),
   case hipe_icode:call_fail_label(Call) of
     [] -> 
-      {NewI, [{Continuation,NewInfo}]};
+      {NewI, [{Continuation, NewInfo}]};
     Fail ->
-      {NewI, [{Continuation,NewInfo}, {Fail,Info}]}
+      {NewI, [{Continuation, NewInfo}, {Fail, Info}]}
   end.
 
 -spec analyse_if(#icode_if{}, info(), boolean()) ->
@@ -596,16 +598,16 @@ analyse_last_call(Call, Info, LookupFun) ->
 
 analyse_if(If, Info, Rewrite) ->
   case hipe_icode:if_args(If) of
-    Args = [_,_] ->
+    [_, _] = Args ->
       analyse_sane_if(If, Info, Args, get_range_from_args(Args), Rewrite);
     _ ->
       TrueLabel = hipe_icode:if_true_label(If),
       FalseLabel = hipe_icode:if_false_label(If),
-      {If, [{TrueLabel,Info},{FalseLabel,Info}]}
+      {If, [{TrueLabel, Info}, {FalseLabel, Info}]}
   end.
 
 -spec analyse_sane_if(#icode_if{}, info(), [argument(),...],
-		      [#range{},...], boolean()) ->
+		      [range(),...], boolean()) ->
 	 {#icode_goto{} | #icode_if{}, [{label(), info()}]}.
 
 analyse_sane_if(If, Info, [Arg1, Arg2], [Range1, Range2], Rewrite) ->
@@ -613,59 +615,61 @@ analyse_sane_if(If, Info, [Arg1, Arg2], [Range1, Range2], Rewrite) ->
     '>' ->
       {TrueRange2, TrueRange1, FalseRange2, FalseRange1} = 
 	range_inequality_propagation(Range2, Range1);
-    '==' -> 
-      {TempTrueRange1, TempTrueRange2, FalseRange1, FalseRange2}=
-	range_equality_propagation(Range1, Range2),
-      TrueRange1 = set_other(TempTrueRange1,other(Range1)),
-      TrueRange2 = set_other(TempTrueRange2,other(Range2));
     '<' ->
-      {TrueRange1, TrueRange2, FalseRange1, FalseRange2} = 
+      {TrueRange1, TrueRange2, FalseRange1, FalseRange2} =
 	range_inequality_propagation(Range1, Range2);
     '>=' ->
       {FalseRange1, FalseRange2, TrueRange1, TrueRange2} =
 	range_inequality_propagation(Range1, Range2);
     '=<' ->
-      {FalseRange2, FalseRange1, TrueRange2, TrueRange1} = 
+      {FalseRange2, FalseRange1, TrueRange2, TrueRange1} =
 	range_inequality_propagation(Range2, Range1);
     '=:=' ->
-      {TrueRange1, TrueRange2, FalseRange1, FalseRange2}=
+      {TrueRange1, TrueRange2, FalseRange1, FalseRange2} =
 	range_equality_propagation(Range1, Range2);
     '=/=' ->
       {FalseRange1, FalseRange2, TrueRange1, TrueRange2} =
 	range_equality_propagation(Range1, Range2);
+    '==' ->
+      {TempTrueRange1, TempTrueRange2, FalseRange1, FalseRange2} =
+	range_equality_propagation(Range1, Range2),
+      TrueRange1 = set_other(TempTrueRange1, other(Range1)),
+      TrueRange2 = set_other(TempTrueRange2, other(Range2));
     '/=' -> 
-      {TempFalseRange1, TempFalseRange2, TrueRange1, TrueRange2}=
+      {TempFalseRange1, TempFalseRange2, TrueRange1, TrueRange2} =
 	range_equality_propagation(Range1, Range2),
-      FalseRange1 = set_other(TempFalseRange1,other(Range1)),
-      FalseRange2 = set_other(TempFalseRange2,other(Range2))
+      FalseRange1 = set_other(TempFalseRange1, other(Range1)),
+      FalseRange2 = set_other(TempFalseRange2, other(Range2))
   end,
-  TrueLabel = hipe_icode:if_true_label(If),
-  FalseLabel = hipe_icode:if_false_label(If),
-  TrueInfo = 
-    enter_defines([{Arg1,TrueRange1}, {Arg2,TrueRange2}],Info),
-  FalseInfo = 
-    enter_defines([{Arg1,FalseRange1}, {Arg2,FalseRange2}],Info),
-  True = 
-    case lists:any(fun range__is_none/1,[TrueRange1,TrueRange2]) of
+  %% io:format("TR1 = ~w\nTR2 = ~w\n", [TrueRange1, TrueRange2]),
+  True =
+    case lists:all(fun range__is_none/1, [TrueRange1, TrueRange2]) of
       true -> [];
-      false -> [{TrueLabel,TrueInfo}]
+      false ->
+	TrueLabel = hipe_icode:if_true_label(If),
+	TrueArgRanges = [{Arg1, TrueRange1}, {Arg2, TrueRange2}],
+	TrueInfo = enter_defines(TrueArgRanges, Info),
+	[{TrueLabel, TrueInfo}]
     end,
-  False = 
-    case lists:any(fun range__is_none/1, [FalseRange1,FalseRange2]) of
+  %% io:format("FR1 = ~w\nFR2 = ~w\n", [FalseRange1, FalseRange2]),
+  False =
+    case lists:all(fun range__is_none/1, [FalseRange1, FalseRange2]) of
       true -> [];
-      false -> [{FalseLabel,FalseInfo}]
+      false ->
+	FalseLabel = hipe_icode:if_false_label(If),
+	FalseArgRanges = [{Arg1, FalseRange1}, {Arg2, FalseRange2}],
+	FalseInfo = enter_defines(FalseArgRanges, Info),
+	[{FalseLabel, FalseInfo}]
     end,
-  UpdateInfo = True++False,
+  UpdateInfo = True ++ False,
   NewIF =
     if Rewrite ->
-	%%io:format("~w~n~w~n", [{Arg1,FalseRange1},{Arg2,FalseRange2}]),
-	%%io:format("Any none: ~w~n", [lists:any(fun range__is_none/1,[FalseRange1,FalseRange2])]),
 	case UpdateInfo of
-	  [] -> %%This is weird
+	  [] -> %% This is weird
 	    If;
-	  [{Label,_Info}] ->
+	  [{Label, _Info}] ->
 	    hipe_icode:mk_goto(Label);
-	  [_,_] ->
+	  [_, _] ->
 	    If
 	end;
        true ->
@@ -686,13 +690,13 @@ normalize_name(Name) ->
     Name -> Name
   end.
 
--spec range_equality_propagation(#range{}, #range{}) ->
-	  {#range{}, #range{}, #range{}, #range{}}.
+-spec range_equality_propagation(range(), range()) ->
+	  {range(), range(), range(), range()}.
 
 range_equality_propagation(Range_1, Range_2) ->  
   True_range = inf(Range_1, Range_2),
   case {range(Range_1), range(Range_2)} of
-    {{N,N},{ N,N}} ->
+    {{N,N}, {N,N}} ->
       False_range_1 = none_range(),
       False_range_2 = none_range();
     {{N1,N1}, {N2,N2}} ->
@@ -710,8 +714,8 @@ range_equality_propagation(Range_1, Range_2) ->
   end,
   {True_range, True_range, False_range_1, False_range_2}.
 
--spec range_inequality_propagation(#range{}, #range{}) ->
-	  {#range{}, #range{}, #range{}, #range{}}.
+-spec range_inequality_propagation(range(), range()) ->
+	  {range(), range(), range(), range()}.
 
 %% Range1 < Range2
 range_inequality_propagation(Range1, Range2) ->
@@ -781,26 +785,24 @@ analyse_type(Type, Info, Rewrite) ->
       TrueRange = inf(any_range(), OldVarRange),
       FalseRange = inf(none_range(), OldVarRange);
     _ ->
-      TrueRange = inf(none_range(),OldVarRange),
+      TrueRange = inf(none_range(), OldVarRange),
       FalseRange = OldVarRange
   end,
   TrueLabel = hipe_icode:type_true_label(Type),
   FalseLabel = hipe_icode:type_false_label(Type),
-  TrueInfo = 
-    enter_define({Arg,TrueRange},Info),
-  FalseInfo = 
-    enter_define({Arg,FalseRange},Info),
-  True = 
+  TrueInfo = enter_define({Arg, TrueRange}, Info),
+  FalseInfo = enter_define({Arg, FalseRange}, Info),
+  True =
     case range__is_none(TrueRange) of
       true -> [];
-      false -> [{TrueLabel,TrueInfo}]
+      false -> [{TrueLabel, TrueInfo}]
     end,
-  False = 
+  False =
     case range__is_none(FalseRange) of
       true -> [];
-      false -> [{FalseLabel,FalseInfo}]
+      false -> [{FalseLabel, FalseInfo}]
     end,
-  UpdateInfo = True++False,
+  UpdateInfo = True ++ False,
   NewType =
     if Rewrite ->
 	case UpdateInfo of
@@ -808,15 +810,15 @@ analyse_type(Type, Info, Rewrite) ->
 	    Type;
 	  [{Label,_Info}] ->
 	    hipe_icode:mk_goto(Label);
-	  [_,_] ->
+	  [_, _] ->
 	    Type
 	end;
        true ->
 	Type
     end,
-  {NewType,True ++ False}.
+  {NewType, True ++ False}.
 
--spec compare_with_integer(integer(), #range{}) -> {#range{}, #range{}}.
+-spec compare_with_integer(integer(), range()) -> {range(), range()}.
 
 compare_with_integer(N, OldVarRange) ->
   TestRange = range_init({N, N}, false),
@@ -843,13 +845,13 @@ compare_with_integer(N, OldVarRange) ->
 
 %%== Ranges ==================================================================
 
--spec pp_ann(#ann{} | erl_types:erl_type()) -> [string()].
+-spec pp_ann(ann() | erl_types:erl_type()) -> string().
 
-pp_ann(#ann{range=#range{range=R, other=false}}) ->
+pp_ann(#ann{range = #range{range = R, other = false}}) ->
   pp_range(R);
-pp_ann(#ann{range=#range{range=empty, other=true}, type=Type}) ->
+pp_ann(#ann{range = #range{range = empty, other = true}, type = Type}) ->
   t_to_string(Type);
-pp_ann(#ann{range=#range{range=R, other=true}, type=Type}) ->
+pp_ann(#ann{range = #range{range = R, other = true}, type = Type}) ->
   pp_range(R) ++ " | " ++ t_to_string(Type);
 pp_ann(Type) ->
   t_to_string(Type).
@@ -867,12 +869,12 @@ val_to_string(pos_inf) -> "inf";
 val_to_string(neg_inf) -> "-inf";
 val_to_string(X) when is_integer(X) -> integer_to_list(X).
 
--spec range_from_type(erl_types:erl_type()) -> [#range{}].
+-spec range_from_type(erl_types:erl_type()) -> [range()].
 
 range_from_type(Type) ->
   [range_from_simple_type(T) || T <- t_to_tlist(Type)].
   
--spec range_from_simple_type(erl_types:erl_type()) -> #range{}.
+-spec range_from_simple_type(erl_types:erl_type()) -> range().
 
 range_from_simple_type(Type) ->
   None = t_none(),
@@ -887,7 +889,7 @@ range_from_simple_type(Type) ->
       #range{range = Range, other = true}
   end.
 
--spec range_init(range_rep(), boolean()) -> #range{}.
+-spec range_init(range_rep(), boolean()) -> range().
 
 range_init({Min, Max} = Range, Other) ->
   case inf_geq(Max, Min) of
@@ -899,39 +901,39 @@ range_init({Min, Max} = Range, Other) ->
 range_init(empty, Other) ->
   #range{range = empty, other = Other}.
 
--spec range(#range{}) -> range_rep().
+-spec range(range()) -> range_rep().
 
 range(#range{range = R}) -> R.
 
--spec other(#range{}) -> boolean().
+-spec other(range()) -> boolean().
 
 other(#range{other = O}) -> O.
 
--spec set_other(#range{}, boolean()) -> #range{}.
+-spec set_other(range(), boolean()) -> range().
 
 set_other(R, O) -> R#range{other = O}.
 
--spec range__min(#range{}) -> 'empty' | 'neg_inf' | integer().
+-spec range__min(range()) -> 'empty' | 'neg_inf' | integer().
 
-range__min(#range{range=empty}) -> empty;
-range__min(#range{range={Min,_}}) -> Min.
+range__min(#range{range = empty}) -> empty;
+range__min(#range{range = {Min,_}}) -> Min.
 
--spec range__max(#range{}) -> 'empty' | 'pos_inf' | integer().
+-spec range__max(range()) -> 'empty' | 'pos_inf' | integer().
 
-range__max(#range{range=empty}) -> empty;
-range__max(#range{range={_,Max}}) -> Max.
+range__max(#range{range = empty}) -> empty;
+range__max(#range{range = {_,Max}}) -> Max.
 
--spec range__is_none(#range{}) -> boolean().
+-spec range__is_none(range()) -> boolean().
 
-range__is_none(#range{range=empty, other=false}) -> true;
+range__is_none(#range{range = empty, other = false}) -> true;
 range__is_none(#range{}) -> false.
 
--spec range__is_empty(#range{}) -> boolean().
+-spec range__is_empty(range()) -> boolean().
 
-range__is_empty(#range{range=empty}) -> true;
-range__is_empty(#range{range={_,_}}) -> false.
+range__is_empty(#range{range = empty}) -> true;
+range__is_empty(#range{range = {_,_}}) -> false.
 
--spec remove_point_types(#range{}, [#range{}]) -> #range{}.
+-spec remove_point_types(range(), [range()]) -> range().
 
 remove_point_types(Range, Ranges) ->
   Sorted = lists:sort(Ranges),
@@ -939,35 +941,35 @@ remove_point_types(Range, Ranges) ->
   Range1 = lists:foldl(FoldFun, Range, Sorted),
   lists:foldl(FoldFun, Range1, lists:reverse(Sorted)).
 
--spec range__remove_constant(#range{}, #range{}) -> #range{}.
+-spec range__remove_constant(range(), range()) -> range().
 
-range__remove_constant(R = #range{range={C,C}}, #range{range={C,C}}) ->
-  R#range{range=empty};
-range__remove_constant(R = #range{range={C,H}}, #range{range={C,C}}) ->
-  R#range{range={C+1,H}};
-range__remove_constant(R = #range{range={L,C}}, #range{range={C,C}}) ->
-  R#range{range={L,C-1}};
-range__remove_constant(R = #range{}, #range{range={C,C}}) ->
+range__remove_constant(#range{range = {C, C}} = R, #range{range = {C, C}}) ->
+  R#range{range = empty};
+range__remove_constant(#range{range = {C, H}} = R, #range{range = {C, C}}) ->
+  R#range{range = {C+1, H}};
+range__remove_constant(#range{range = {L, C}} = R, #range{range = {C, C}}) ->
+  R#range{range = {L, C-1}};
+range__remove_constant(#range{} = R, #range{range = {C,C}}) ->
   R;
-range__remove_constant(R = #range{}, _) ->
+range__remove_constant(#range{} = R, _) ->
   R.
 
--spec any_type() -> #range{}.
+-spec any_type() -> range().
 
 any_type() ->
-  #range{range=any_r(), other=true}.
+  #range{range = any_r(), other = true}.
 
--spec any_range() -> #range{}.
+-spec any_range() -> range().
 
 any_range() ->
-  #range{range=any_r(), other=false}.
+  #range{range = any_r(), other = false}.
 
--spec none_range() -> #range{}.
+-spec none_range() -> range().
 
 none_range() ->
-  #range{range=empty, other=true}.
+  #range{range = empty, other = true}.
 
--spec none_type() -> #range{}.
+-spec none_type() -> range().
 
 none_type() ->
   #range{range = empty, other = false}.
@@ -976,12 +978,12 @@ none_type() ->
 
 any_r() -> {neg_inf, pos_inf}.
 
--spec get_range_from_args([argument()]) -> [#range{}].
+-spec get_range_from_args([argument()]) -> [range()].
   
 get_range_from_args(Args) ->
   [get_range_from_arg(Arg) || Arg <- Args].
 
--spec get_range_from_arg(argument()) -> #range{}.
+-spec get_range_from_arg(argument()) -> range().
 
 get_range_from_arg(Arg) ->
   case hipe_icode:is_const(Arg) of
@@ -989,15 +991,15 @@ get_range_from_arg(Arg) ->
       Value = hipe_icode:const_value(Arg),
       case is_integer(Value) of
 	true ->
-	  #range{range={Value,Value}, other=false};
+	  #range{range = {Value, Value}, other = false};
 	false ->
-	  #range{range=empty, other=true}
+	  #range{range = empty, other = true}
       end;
     false ->
       case hipe_icode:is_annotated_variable(Arg) of
 	true ->
 	  case hipe_icode:variable_annotation(Arg) of
-	    {range_anno, #ann{range=Range}, _} ->
+	    {range_anno, #ann{range = Range}, _} ->
 	      Range;
 	    {type_anno, Type, _} ->
 	      range_from_simple_type(Type)
@@ -1012,7 +1014,7 @@ get_range_from_arg(Arg) ->
 %% inf([R1,R2|Rest]) ->
 %%   inf([inf(R1,R2)|Rest]).
 
--spec inf(#range{}, #range{}) -> #range{}.
+-spec inf(range(), range()) -> range().
 
 inf(#range{range=R1, other=O1}, #range{range=R2, other=O2}) -> 
   #range{range=range_inf(R1,R2), other=other_inf(O1,O2)}.
@@ -1022,8 +1024,8 @@ inf(#range{range=R1, other=O1}, #range{range=R2, other=O2}) ->
 range_inf(empty, _) -> empty;
 range_inf(_, empty) -> empty;
 range_inf({Min1,Max1}, {Min2,Max2}) ->
-  NewMin = inf_max([Min1,Min2]),
-  NewMax = inf_min([Max1,Max2]),
+  NewMin = inf_max([Min1, Min2]),
+  NewMax = inf_min([Max1, Max2]),
   case inf_geq(NewMax, NewMin) of
     true ->
       {NewMin, NewMax};
@@ -1035,14 +1037,14 @@ range_inf({Min1,Max1}, {Min2,Max2}) ->
 
 other_inf(O1, O2) -> O1 and O2.
 
--spec sup([#range{},...]) -> #range{}.
+-spec sup([range(),...]) -> range().
 
 sup([R]) ->
   R;
 sup([R1,R2|Rest]) ->
   sup([sup(R1, R2)|Rest]).
 
--spec sup(#range{}, #range{}) -> #range{}.
+-spec sup(range(), range()) -> range().
 
 sup(#range{range=R1,other=O1}, #range{range=R2,other=O2}) -> 
   #range{range=range_sup(R1,R2), other=other_sup(O1,O2)}.
@@ -1063,7 +1065,7 @@ other_sup(O1, O2) -> O1 or O2.
 %%== Call Support =============================================================
 
 -spec analyse_call_or_enter_fun(fun_name(), [argument()],
-				icode_call_type(), call_fun()) -> [#range{}].
+				icode_call_type(), call_fun()) -> [range()].
 
 analyse_call_or_enter_fun(Fun, Args, CallType, LookupFun) ->
   %%io:format("Fun: ~p~n Args: ~p~n CT: ~p~n LF: ~p~n", [Fun, Args, CallType, LookupFun]),
@@ -1105,19 +1107,19 @@ analyse_call_or_enter_fun(Fun, Args, CallType, LookupFun) ->
       [any_type()];
     {hipe_bs_primop, {bs_get_integer, Size, Flags}} ->
       {Min, Max} = analyse_bs_get_integer(Size, Flags, length(Args) =:= 1),
-      [#range{range={Min, Max}, other=false}, any_type()];
+      [#range{range = {Min, Max}, other = false}, any_type()];
     {hipe_bs_primop, _} = Primop ->
       Type = hipe_icode_primops:type(Primop),
       range_from_type(Type)
   end.
 
--type bin_operation() :: fun((#range{},#range{}) -> #range{}).
--type unary_operation() :: fun((#range{}) -> #range{}).
+-type bin_operation() :: fun((range(), range()) -> range()).
+-type unary_operation() :: fun((range()) -> range()).
 
 -spec basic_type(fun_name()) -> 'not_int' | 'not_analysed'
-			     | {bin, bin_operation()}
-			     | {unary, unary_operation()}
-			     | {fcall, mfa()} | {hipe_bs_primop, _}.
+			     | {'bin', bin_operation()}
+			     | {'unary', unary_operation()}
+			     | {'fcall', mfa()} | {'hipe_bs_primop', _}.
 
 %% Arithmetic operations
 basic_type('+') -> {bin, fun(R1, R2) -> range_add(R1, R2) end};
@@ -1214,7 +1216,7 @@ analyse_bs_get_integer(Size, Flags, false) when is_integer(Size),
 
 %% Arithmetic
 
--spec range_add(#range{}, #range{}) -> #range{}.
+-spec range_add(range(), range()) -> range().
 
 range_add(Range1, Range2) ->
   NewMin = inf_add(range__min(Range1), range__min(Range2)),
@@ -1222,7 +1224,7 @@ range_add(Range1, Range2) ->
   Other = other(Range1) orelse other(Range2),
   range_init({NewMin, NewMax}, Other).
 
--spec range_sub(#range{}, #range{}) -> #range{}.
+-spec range_sub(range(), range()) -> range().
 
 range_sub(Range1, Range2) ->
   Min_sub = inf_min([inf_inv(range__max(Range2)), 
@@ -1234,7 +1236,7 @@ range_sub(Range1, Range2) ->
   Other = other(Range1) orelse other(Range2),
   range_init({NewMin, NewMax}, Other).
 
--spec range_mult(#range{}, #range{}) -> #range{}.
+-spec range_mult(range(), range()) -> range().
 
 range_mult(#range{range=empty, other=true}, _Range2) ->
   range_init(empty, true);
@@ -1274,7 +1276,7 @@ range_mult(Range1, Range2) ->
   Other = other(Range1) orelse other(Range2),
   range_init(Range, Other).
 
--spec extreme_divisors(#range{}) -> range_tuple().
+-spec extreme_divisors(range()) -> range_tuple().
 
 extreme_divisors(#range{range={0,0}}) -> {0,0};
 extreme_divisors(#range{range={0,Max}}) -> {1,Max};
@@ -1289,7 +1291,7 @@ extreme_divisors(#range{range={Min,Max}}) ->
       end
   end.
 
--spec range_div(#range{}, #range{}) -> #range{}.
+-spec range_div(range(), range()) -> range().
 
 %% this is div, not /.
 range_div(_, #range{range={0,0}}) ->
@@ -1306,7 +1308,7 @@ range_div(Range1, Den) ->
 		  inf_div(Max1, Min2), inf_div(Max1, Max2)],
   range_init({inf_min(Min_max_list), inf_max(Min_max_list)}, false).
 
--spec range_rem(#range{}, #range{}) -> #range{}.
+-spec range_rem(range(), range()) -> range().
 
 range_rem(Range1, Range2) ->
   %% Range1 desides the sign of the answer.
@@ -1332,7 +1334,7 @@ range_rem(Range1, Range2) ->
 
 %%--- Bit operations ----------------------------
 
--spec range_bsr(#range{}, #range{}) -> #range{}.
+-spec range_bsr(range(), range()) -> range().
 
 range_bsr(Range1, Range2=#range{range={Min, Max}}) -> 
   New_Range2 = range_init({inf_inv(Max), inf_inv(Min)}, other(Range2)), 
@@ -1340,7 +1342,7 @@ range_bsr(Range1, Range2=#range{range={Min, Max}}) ->
   %% io:format("bsr res:~w~nInput:= ~w~n", [Ans, {Range1,Range2}]),
   Ans.
 
--spec range_bsl(#range{}, #range{}) -> #range{}.
+-spec range_bsl(range(), range()) -> range().
 
 range_bsl(Range1, Range2) ->
   Min1 = range__min(Range1),
@@ -1359,13 +1361,13 @@ range_bsl(Range1, Range2) ->
     end,
   range_init(MinMax, false).
 
--spec range_bnot(#range{}) -> #range{}.
+-spec range_bnot(range()) -> range().
 
 range_bnot(Range) ->
   Minus_one = range_init({-1,-1}, false),
   range_add(range_mult(Range, Minus_one), Minus_one).
 
--spec width(range_rep() | integer()) -> 'pos_inf' | non_neg_integer().
+-spec width(range_rep() | inf_integer()) -> 'pos_inf' | non_neg_integer().
 
 width({Min, Max}) -> inf_max([width(Min), width(Max)]);
 width(pos_inf) -> pos_inf;
@@ -1389,7 +1391,7 @@ negwidth(X, N) ->
     false -> negwidth(X, N+1)
   end.
 
--spec range_band(#range{}, #range{}) -> #range{}.
+-spec range_band(range(), range()) -> range().
 
 range_band(R1, R2) ->
   {_Min1, Max1} = MM1 = range(R1),
@@ -1423,7 +1425,7 @@ range_band(R1, R2) ->
     end,
   range_init(Range, false).  
 
--spec range_bor(#range{}, #range{}) -> #range{}.
+-spec range_bor(range(), range()) -> range().
 
 range_bor(R1, R2) ->
   {Min1, _Max1} = MM1 = range(R1),
@@ -1457,7 +1459,7 @@ range_bor(R1, R2) ->
     end,
   range_init(Range, false).  
 
--spec classify_range(#range{}) -> 'minus_minus' | 'minus_plus' | 'plus_plus'.
+-spec classify_range(range()) -> 'minus_minus' | 'minus_plus' | 'plus_plus'.
 
 classify_range(Range) ->
   case range(Range) of
@@ -1480,7 +1482,7 @@ classify_int_range(_Number1, Number2) when Number2 < 0 ->
 classify_int_range(_Number1, _Number2) ->
   minus_plus.
       
--spec range_bxor(#range{}, #range{}) -> #range{}.
+-spec range_bxor(range(), range()) -> range().
 
 range_bxor(R1, R2) ->
   {Min1, Max1} = MM1 = range(R1),
@@ -1895,7 +1897,7 @@ convert_ann_to_types(#ann{range=#range{other=true}, type=Type}) ->
 %% Icode Coordinator Callbacks
 %%=====================================================================
 
--spec replace_nones([#range{}]) -> [#range{}].
+-spec replace_nones([range()]) -> [range()].
 replace_nones(Args) ->
   [replace_none(Arg) || Arg <- Args].
 
@@ -1905,7 +1907,7 @@ replace_none(Arg) ->
     false -> Arg
   end.
 
--spec update__info([#range{}], [#range{}]) -> {boolean(), [#ann{}]}.
+-spec update__info([range()], [range()]) -> {boolean(), [ann()]}.
 update__info(NewRanges, OldRanges) ->
   SupFun = fun (Ann, Range) -> 
 	       join_info(Ann, Range, fun safe_widen/3)
@@ -1915,19 +1917,19 @@ update__info(NewRanges, OldRanges) ->
   Change = lists:zipwith(EqFun, ResRanges, OldRanges),
   {lists:all(fun (X) -> X end, Change), ResRanges}.
 
--spec new__info/1 :: ([#range{}]) -> [#ann{}].
+-spec new__info([range()]) -> [ann()].
 new__info(NewRanges) ->
   [#ann{range=Range,count=1,type=t_any()} || Range <- NewRanges].
 
--spec return__info/1 :: ([#ann{}]) -> [#range{}].
+-spec return__info([ann()]) -> [range()].
 return__info(Ranges) ->
   [Range || #ann{range=Range} <- Ranges].
 
--spec return_none/0 :: () -> [#range{},...].
+-spec return_none() -> [range(),...].
 return_none() ->
   [none_type()].
 
--spec return_none_args/2 :: (#cfg{}, mfa()) -> [#range{}].
+-spec return_none_args(cfg(), mfa()) -> [range()].
 return_none_args(Cfg, {_M,_F,A}) ->
   NoArgs =
     case hipe_icode_cfg:is_closure(Cfg) of
@@ -1936,7 +1938,7 @@ return_none_args(Cfg, {_M,_F,A}) ->
     end,
   lists:duplicate(NoArgs, none_type()).
 
--spec return_any_args/2 :: (#cfg{}, mfa()) -> [#range{}].
+-spec return_any_args(cfg(), mfa()) -> [range()].
 return_any_args(Cfg, {_M,_F,A}) ->
   NoArgs = 
     case hipe_icode_cfg:is_closure(Cfg) of
diff --git a/lib/hipe/icode/hipe_icode_type.erl b/lib/hipe/icode/hipe_icode_type.erl
index 28198467f7..3f9488d7c3 100644
--- a/lib/hipe/icode/hipe_icode_type.erl
+++ b/lib/hipe/icode/hipe_icode_type.erl
@@ -2,19 +2,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%% Copyright Ericsson AB 2003-2010. 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%
 %%
 %%%--------------------------------------------------------------------
@@ -23,8 +23,6 @@
 %%% Description : Propagate type information.
 %%%
 %%% Created : 25 Feb 2003 by Tobias Lindahl <[email protected]>
-%%%
-%%% $Id$
 %%%--------------------------------------------------------------------
 
 -module(hipe_icode_type).
@@ -78,7 +76,7 @@
 %-define(server_debug, fun(X, Y) -> io:format("~p server: ~s ~p~n", [self(), X, Y]) end).
 -define(server_debug, fun(_, _) -> ok end).
 
--import(erl_types, [min/2, max/2, number_min/1, number_max/1,
+-import(erl_types, [number_min/1, number_max/1,
 		    t_any/0, t_atom/1, t_atom/0, t_atom_vals/1,
 		    t_binary/0, t_bitstr/0, t_bitstr_base/1, t_bitstr_unit/1, 
 		    t_boolean/0, t_cons/0, t_constant/0,
@@ -494,10 +492,10 @@ integer_range_less_then_propagator(IntArg1, IntArg2) ->
   Min2 = number_min(IntArg2),
   Max2 = number_max(IntArg2),
   %% is this the same as erl_types:t_subtract?? no ... ??
-  TrueMax1 = min(Max1, erl_bif_types:infinity_add(Max2, -1)),
-  TrueMin2 = max(erl_bif_types:infinity_add(Min1, 1), Min2),
-  FalseMin1 = max(Min1, Min2),
-  FalseMax2 = min(Max1, Max2),
+  TrueMax1 = erl_types:min(Max1, erl_bif_types:infinity_add(Max2, -1)),
+  TrueMin2 = erl_types:max(erl_bif_types:infinity_add(Min1, 1), Min2),
+  FalseMin1 = erl_types:max(Min1, Min2),
+  FalseMax2 = erl_types:min(Max1, Max2),
   {t_from_range(Min1, TrueMax1),
    t_from_range(TrueMin2, Max2),
    t_from_range(FalseMin1, Max1),
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index ed722fecba..570e4d9d17 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -1,20 +1,20 @@
 %% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. 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%
 %%
 %% ====================================================================
@@ -25,7 +25,6 @@
 %%  Purpose  :  
 %%  Notes    : 
 %%  History  : * 1998-01-28 Erik Johansson ([email protected]): Created.
-%%  CVS      : $Id$
 %% ====================================================================
 %% @doc This is the direct interface to the HiPE compiler.
 %%
@@ -274,7 +273,7 @@ load(Mod, BeamFileName) when is_list(BeamFileName) ->
   Architecture = erlang:system_info(hipe_architecture),
   ChunkName = hipe_unified_loader:chunk_name(Architecture),
   case beam_lib:chunks(BeamFileName, [ChunkName]) of
-    {ok,{_,[{_,Bin}]}} when is_binary(Bin) -> do_load(Mod, Bin, Bin);
+    {ok,{_,[{_,Bin}]}} when is_binary(Bin) -> do_load(Mod, Bin, BeamFileName);
     Error -> {error, Error}
   end.
 
@@ -506,7 +505,7 @@ compile(Name, File, Opts0) ->
       run_compiler(Name, DisasmFun, IcodeFun, NewOpts)
   end.
 
--spec compile_core(mod(), _, compile_file(), comp_options()) ->
+-spec compile_core(mod(), cerl:c_module(), compile_file(), comp_options()) ->
 	 {'ok', compile_ret()} | {'error', term()}.
 
 compile_core(Name, Core0, File, Opts) ->
@@ -535,7 +534,7 @@ compile_core(Name, Core0, File, Opts) ->
 %%
 %% @see compile/3
 
--spec compile(mod(), _, compile_file(), comp_options()) ->
+-spec compile(mod(), cerl:c_module() | [], compile_file(), comp_options()) ->
 	 {'ok', compile_ret()} | {'error', term()}.
 
 compile(Name, [], File, Opts) ->
@@ -790,7 +789,7 @@ finalize_fun(MfaIcodeList, Exports, Opts) ->
     FalseVal when (FalseVal =:= undefined) orelse (FalseVal =:= false) ->
       [finalize_fun_sequential(MFAIcode, Opts, #comp_servers{})
        || {_MFA, _Icode} = MFAIcode <- MfaIcodeList];
-    TrueVal when (TrueVal =:= true) or (TrueVal =:= debug) ->
+    TrueVal when (TrueVal =:= true) orelse (TrueVal =:= debug) ->
       finalize_fun_concurrent(MfaIcodeList, Exports, Opts)
   end.
 
@@ -913,7 +912,7 @@ do_load(Mod, Bin, WholeModule) ->
       %% In this case, the emulated code for the module must be loaded.
       {module, Mod} = code:ensure_loaded(Mod),
       code:load_native_partial(Mod, Bin);
-    BinCode when is_binary(BinCode) ->
+    BeamBinOrPath when is_binary(BeamBinOrPath) orelse is_list(BeamBinOrPath) ->
       case code:is_sticky(Mod) of
 	true ->
 	  %% We unpack and repack the Beam binary as a workaround to
@@ -939,6 +938,8 @@ assemble(CompiledCode, Closures, Exports, Options) ->
       hipe_sparc_assemble:assemble(CompiledCode, Closures, Exports, Options);
     powerpc ->
       hipe_ppc_assemble:assemble(CompiledCode, Closures, Exports, Options);
+    ppc64 ->
+      hipe_ppc_assemble:assemble(CompiledCode, Closures, Exports, Options);
     arm ->
       hipe_arm_assemble:assemble(CompiledCode, Closures, Exports, Options);
     x86 ->
@@ -1048,7 +1049,7 @@ post(Res, Icode, Options) ->
 %% --------------------------------------------------------------------
 
 %% @doc Returns the current HiPE version as a string().
--spec version() -> string().
+-spec version() -> nonempty_string().
 
 version() ->
   ?VERSION_STRING().
@@ -1390,6 +1391,8 @@ o1_opts() ->
       Common;
     powerpc ->
       Common;
+    ppc64 ->
+      Common;
     arm ->
       Common -- [inline_fp]; % Pointless optimising for absent hardware
     x86 ->
@@ -1411,6 +1414,8 @@ o2_opts() ->
       Common;
     powerpc ->
       Common;
+    ppc64 ->
+      Common;
     arm ->
       Common;
     x86 ->
@@ -1429,6 +1434,8 @@ o3_opts() ->
       Common;
     powerpc ->
       Common;
+    ppc64 ->
+      Common;
     arm ->
       Common;
     x86 ->
diff --git a/lib/hipe/main/hipe_main.erl b/lib/hipe/main/hipe_main.erl
index fe9bc83fd2..e81642fb33 100644
--- a/lib/hipe/main/hipe_main.erl
+++ b/lib/hipe/main/hipe_main.erl
@@ -1,20 +1,20 @@
 %% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. 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%
 %%
 %% @doc	This is the HiPE compiler's main "loop".
@@ -102,7 +102,7 @@ compile_icode(MFA, LinearIcode0, Options, Servers, DebugState) ->
   ?opt_start_timer("Icode"),
   LinearIcode1 = icode_no_comment(LinearIcode0, Options),
   IcodeCfg0 = icode_linear_to_cfg(LinearIcode1, Options),
-  %%hipe_icode_cfg:pp(IcodeCfg1),
+  %% hipe_icode_cfg:pp(IcodeCfg0),
   IcodeCfg1 = icode_handle_exceptions(IcodeCfg0, MFA, Options),
   IcodeCfg3 = icode_inline_bifs(IcodeCfg1, Options),
   pp(IcodeCfg3, MFA, icode, pp_icode, Options, Servers),
diff --git a/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl b/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl
index ac555b933c..ce33af453a 100644
--- a/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl
+++ b/lib/hipe/regalloc/hipe_graph_coloring_regalloc.erl
@@ -389,23 +389,23 @@ decrement_each([N|Ns], OldLow, IG, Vis, K) ->
 %%  {Spilled_node, Low_degree_neighbors, New_interference_graph}
 
 spill(IG, Vis, Spill, K, SpillLimit, Target) ->
-   Ns = list_ig(IG),
-   Costs = spill_costs(Ns, IG, Vis, Spill, SpillLimit, Target),
-   ?report3("spill costs are ~p~n",[Costs]),
-   ActualCosts = lists:sort(Costs),
-   ?report3("actual costs are ~p~n",[ActualCosts]),
+  Ns = list_ig(IG),
+  Costs = spill_costs(Ns, IG, Vis, Spill, SpillLimit, Target),
+  ?report3("spill costs are ~p~n", [Costs]),
+  ActualCosts = lists:sort(Costs),
+  ?report3("actual costs are ~p~n", [ActualCosts]),
   case ActualCosts of
-     [] ->
-      ?error_msg("There is no node to spill",[]),
+    [] ->
+      ?error_msg("There is no node to spill", []),
       ?EXIT('no node to spill');
     [{_Cost,N}|_] ->
       {Low, NewIG} = decrement_neighbors(N, [], IG, Vis, K),
-      %?report("spilled node ~p at cost ~p (~p now ready)~n",[N,Cost,Low]),
+      %% ?report("spilled node ~p at cost ~p (~p now ready)~n", [N,Cost,Low]),
       {N, Low, NewIG}
   end.
 
 spill_costs([], _IG, _Vis, _Spill, _SpillLimit, _Target) ->
-   [];
+  [];
 spill_costs([{N,Info}|Ns], IG, Vis, Spill, SpillLimit, Target) ->
   case degree(Info) of
     0 -> spill_costs(Ns,IG,Vis,Spill, SpillLimit, Target);
@@ -451,28 +451,28 @@ select_colors([{X,colorable}|Xs], IG, Cols, PhysRegs, K) ->
   {Reg,NewCols} = select_color(X, IG, Cols, PhysRegs),
   ?report("~p~n",[Reg]),
   [{X,{reg,Reg}} | select_colors(Xs, IG, NewCols, PhysRegs, K)];
-%select_colors([{X,{spill,M}}|Xs], IG, Cols, PhysRegs, K) ->
-%  ?report('spilled: ~p~n',[X]),
-%  %% Check if optimistic coloring could have found a color 
-%  case catch select_color(X,IG,Cols,K) of
-%    {'EXIT',_} ->   % no color possible
-%	?report('(no optimistic color)~n',[]),
-%	[{X,{spill,M}}|select_colors(Xs, IG, Cols, PhysRegs, K)];
-%    {Reg,NewCols} ->
-%	?report('(optimistic color: ~p)~n',[Reg]),
-%	[{X,{reg,Reg}}|select_colors(Xs, IG, Cols, PhysRegs, K)]
-%  end.
+%%select_colors([{X,{spill,M}}|Xs], IG, Cols, PhysRegs, K) ->
+%%  ?report('spilled: ~p~n',[X]),
+%%  %% Check if optimistic coloring could have found a color 
+%%  case catch select_color(X,IG,Cols,K) of
+%%    {'EXIT',_} ->   % no color possible
+%%	?report('(no optimistic color)~n',[]),
+%%	[{X,{spill,M}}|select_colors(Xs, IG, Cols, PhysRegs, K)];
+%%    {Reg,NewCols} ->
+%%	?report('(optimistic color: ~p)~n',[Reg]),
+%%	[{X,{reg,Reg}}|select_colors(Xs, IG, Cols, PhysRegs, K)]
+%%  end.
 
 %% Old code / pessimistic coloring:
 select_colors([{X,{spill,M}}|Xs], IG, Cols, PhysRegs, K) ->
   ?report("spilled: ~p~n",[X]),
   %% Check if optimistic coloring could have found a color
-%    case catch select_color(X,IG,Cols,K) of
-%	{'EXIT',_} ->   % no color possible
-%	    ?report('(no optimistic color)~n',[]);
-%	{Reg,NewCols} ->
-%	    ?report('(optimistic color: ~p)~n',[Reg])
-%    end,
+%%    case catch select_color(X,IG,Cols,K) of
+%%	{'EXIT',_} ->   % no color possible
+%%	    ?report('(no optimistic color)~n',[]);
+%%	{Reg,NewCols} ->
+%%	    ?report('(optimistic color: ~p)~n',[Reg])
+%%    end,
   [{X,{spill,M}} | select_colors(Xs, IG, Cols, PhysRegs, K)].
 
 select_color(X, IG, Cols, PhysRegs) ->
diff --git a/lib/hipe/rtl/hipe_rtl.erl b/lib/hipe/rtl/hipe_rtl.erl
index ef06b2abf8..d93f423f0c 100644
--- a/lib/hipe/rtl/hipe_rtl.erl
+++ b/lib/hipe/rtl/hipe_rtl.erl
@@ -354,6 +354,8 @@
          phi_arglist_update/2,
          phi_redirect_pred/3]).
 
+-export_type([alub_cond/0]).
+
 %%
 %% RTL
 %%
@@ -590,6 +592,9 @@ branch_pred(#branch{p=P}) -> P.
 %% alub
 %%
 
+-type alub_cond() :: 'eq' | 'ne' | 'ge' | 'geu' | 'gt' | 'gtu' | 'le'
+                   | 'leu' | 'lt' | 'ltu' | 'overflow' | 'not_overflow'.
+
 mk_alub(Dst, Src1, Op, Src2, Cond, True, False) ->
   mk_alub(Dst, Src1, Op, Src2, Cond, True, False, 0.5).
 mk_alub(Dst, Src1, Op, Src2, Cond, True, False, P) ->
diff --git a/lib/hipe/rtl/hipe_rtl_arith.inc b/lib/hipe/rtl/hipe_rtl_arith.inc
index 31fedd927e..9e80fa5e13 100644
--- a/lib/hipe/rtl/hipe_rtl_arith.inc
+++ b/lib/hipe/rtl/hipe_rtl_arith.inc
@@ -119,7 +119,8 @@ eval_alu(Op, Arg1, Arg2) ->
 %% 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)
 %%
--spec eval_cond_bits(atom(), boolean(), boolean(), boolean(), boolean()) -> boolean().
+-spec eval_cond_bits(hipe_rtl:alub_cond(), boolean(),
+		     boolean(), boolean(), boolean()) -> boolean().
 
 eval_cond_bits(Cond, N, Z, V, C) ->
   case Cond of
@@ -146,9 +147,7 @@ eval_cond_bits(Cond, N, Z, V, C) ->
     'overflow' ->
       V;
     'not_overflow' ->
-      not V;
-    _ ->
-      ?EXIT({'condition code not handled',Cond})
+      not V
   end.
 
 eval_alub(Op, Cond, Arg1, Arg2) ->
diff --git a/lib/hipe/rtl/hipe_rtl_primops.erl b/lib/hipe/rtl/hipe_rtl_primops.erl
index 560e0259f8..0361053676 100644
--- a/lib/hipe/rtl/hipe_rtl_primops.erl
+++ b/lib/hipe/rtl/hipe_rtl_primops.erl
@@ -701,9 +701,9 @@ gen_cons(Dst, [Arg1, Arg2]) ->
 %%  Increase refcount
 %%    fe->refc++;
 %%
-%%  Link to the process off_heap.funs list
-%%    funp->next = p->off_heap.funs;
-%%    p->off_heap.funs = funp;
+%%  Link to the process off_heap list
+%%    funp->next = p->off_heap.first;
+%%    p->off_heap.first = funp;
 %%
 %%  Tag the thing
 %%    return make_fun(funp);
@@ -729,9 +729,9 @@ gen_mkfun([Dst], {_Mod, _FunId, _Arity} = MFidA, MagicNr, Index, FreeVars) ->
   %%    fe->refc++;
   SkeletonCode = gen_fun_thing_skeleton(HP, MFidA, NumFree, MagicNr, Index),
 
-  %%  Link to the process off_heap.funs list
-  %%    funp->next = p->off_heap.funs;
-  %%    p->off_heap.funs = funp;
+  %%  Link to the process off_heap list
+  %%    funp->next = p->off_heap.first;
+  %%    p->off_heap.first = funp;
   LinkCode = gen_link_closure(HP),
 
   %%  Tag the thing and increase the heap_pointer.
@@ -797,14 +797,14 @@ gen_link_closure(FUNP) ->
   end.
 
 gen_link_closure_private(FUNP) ->
-  %% Link to the process off_heap.funs list
-  %%   funp->next = p->off_heap.funs;
-  %%   p->off_heap.funs = funp;
+  %% Link fun to the process off_heap list
+  %%   funp->next = p->off_heap.first;
+  %%   p->off_heap.first = funp;
   FunsVar = hipe_rtl:mk_new_reg(),
 
-  [load_p_field(FunsVar,?P_OFF_HEAP_FUNS),
+  [load_p_field(FunsVar,?P_OFF_HEAP_FIRST),
    hipe_rtl:mk_store(FUNP, hipe_rtl:mk_imm(?EFT_NEXT), FunsVar),
-   store_p_field(FUNP,?P_OFF_HEAP_FUNS)].
+   store_p_field(FUNP,?P_OFF_HEAP_FIRST)].
 
 gen_link_closure_non_private(_FUNP) -> [].
 
diff --git a/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl b/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
index 76c0a88933..64d723d15d 100644
--- a/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
+++ b/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
@@ -93,8 +93,6 @@
 -include("../ssa/hipe_ssa_const_prop.inc").
 
 -type bool_lattice() :: 'true' | 'false' | 'top' | 'bottom'.
--type conditional()  :: 'eq' | 'ne' | 'ge' | 'geu' | 'gt' | 'gtu' | 'le'
-                      | 'leu' | 'lt' | 'ltu' | 'overflow' | 'not_overflow'.
 
 %%-----------------------------------------------------------------------------
 %% Procedure : visit_expression/2
@@ -400,7 +398,7 @@ maybe_top_or_bottom([top | Rest], _) -> maybe_top_or_bottom(Rest, top);
 maybe_top_or_bottom([bottom | _], _) -> bottom;
 maybe_top_or_bottom([_ | Rest],  TB) -> maybe_top_or_bottom(Rest, TB).
 
--spec partial_eval_branch(conditional(), bool_lattice(), bool_lattice(),
+-spec partial_eval_branch(hipe_rtl:alub_cond(), bool_lattice(), bool_lattice(),
 			  bool_lattice() | 0, bool_lattice() | 0) ->
 	 bool_lattice().
 partial_eval_branch(Cond, N0, Z0, V0, C0) ->
@@ -441,14 +439,14 @@ visit_alub(Inst, Env) ->
                  hipe_rtl:alub_false_label(Inst)];
       top    -> [];
       _      ->
-        %if the partial branch cannot be evaluated we must execute the 
-        % instruction at runtime.
+        %% if the partial branch cannot be evaluated we must execute the
+        %% instruction at runtime.
         case partial_eval_branch(hipe_rtl:alub_cond(Inst), N, Z, C, V) of
           bottom -> [hipe_rtl:alub_true_label(Inst), 
                      hipe_rtl:alub_false_label(Inst)];
           top    -> [];
-          true   -> [hipe_rtl:alub_true_label(Inst) ];
-          false  -> [hipe_rtl:alub_false_label(Inst) ]
+          true   -> [hipe_rtl:alub_true_label(Inst)];
+          false  -> [hipe_rtl:alub_false_label(Inst)]
         end
      end,
   {[], NewSSA, NewEnv} = set_to(hipe_rtl:alub_dst(Inst), NewVal,  Env),
@@ -944,8 +942,8 @@ update_branch(Inst, Env) ->
 
 %% some small helpers.
 alub_to_move(Inst, Res, Lab) ->
-  [ hipe_rtl:mk_move(hipe_rtl:alub_dst(Inst), Res),
-    hipe_rtl:mk_goto(Lab) ].
+  [hipe_rtl:mk_move(hipe_rtl:alub_dst(Inst), Res),
+   hipe_rtl:mk_goto(Lab)].
 
 make_alub_subst_list(bottom, _, Tail) ->  Tail;
 make_alub_subst_list(top, Src, _) ->
@@ -970,13 +968,13 @@ update_alub(Inst, Env) ->
       %% move and the branch. We can however replace variable with constants:
       S1 = make_alub_subst_list(Val1, Src1, []),
       S2 = make_alub_subst_list(Val2, Src2, S1),
-      [ hipe_rtl:subst_uses(S2, Inst) ];
-    _ -> % we know where we will be going, let's find out what Dst should be.
-         % knowing where we are going means that at most one of the values is
-         % bottom, hence we can replace the alu-instr with a move. 
-         % remember, a = b + 0 can give us enough info to know what jump to 
-         % do without knowing the value of a. (I wonder if this will ever 
-         % actualy happen ;) 
+      [hipe_rtl:subst_uses(S2, Inst)];
+    _ -> %% we know where we will be going, let's find out what Dst should be.
+         %% knowing where we are going means that at most one of the values is
+         %% bottom, hence we can replace the alu-instr with a move.
+         %% remember, a = b + 0 can give us enough info to know what jump to
+         %% do without knowing the value of a. (I wonder if this will ever
+         %% actualy happen ;)
       Res = case ResVal of 
               bottom ->  % something nonconstant.
                 if (Val1 =:= bottom) -> Src1;
@@ -985,11 +983,12 @@ update_alub(Inst, Env) ->
               _ -> hipe_rtl:mk_imm(ResVal)
             end,
       case CondRes of 
-        top -> io:format("oops. something VERY bad: ~w ~w V1 & 2 ~w ~w\n", 
-	                 [Inst, {ResVal, N, Z, C, V} , Val1, Val2]),
-           [Inst ];
-        true   -> alub_to_move(Inst, Res, hipe_rtl:alub_true_label(Inst));
-        false  -> alub_to_move(Inst, Res, hipe_rtl:alub_false_label(Inst))
+        top ->
+	  io:format("oops. something VERY bad: ~w ~w V1 & 2 ~w ~w\n",
+		    [Inst, {ResVal, N, Z, C, V} , Val1, Val2]),
+	  [Inst];
+        true  -> alub_to_move(Inst, Res, hipe_rtl:alub_true_label(Inst));
+        false -> alub_to_move(Inst, Res, hipe_rtl:alub_false_label(Inst))
       end
   end.
 
@@ -1050,7 +1049,7 @@ update_phi(Instruction, Environment) ->
 
 %%-----------------------------------------------------------------------------
 
-%% make sure that all precoloured rgisters are taken out of the equation.
+%% make sure that all precoloured registers are taken out of the equation.
 lookup_lattice_value(X, Environment) ->
   case hipe_rtl_arch:is_precoloured(X) or hipe_rtl:is_const_label(X) of 
     true ->
diff --git a/lib/hipe/rtl/hipe_tagscheme.erl b/lib/hipe/rtl/hipe_tagscheme.erl
index dc44b803a1..c0b6dfad8a 100644
--- a/lib/hipe/rtl/hipe_tagscheme.erl
+++ b/lib/hipe/rtl/hipe_tagscheme.erl
@@ -849,9 +849,9 @@ create_refc_binary(Base, Size, Flags, Dst) ->
 
 heap_arch_spec(HP) ->
   Tmp1 = hipe_rtl:mk_new_reg(), % MSO state
-  [hipe_rtl_arch:pcb_load(Tmp1, ?P_OFF_HEAP_MSO),
+  [hipe_rtl_arch:pcb_load(Tmp1, ?P_OFF_HEAP_FIRST),
    set_field_from_pointer({proc_bin, next}, HP, Tmp1),
-   hipe_rtl_arch:pcb_store(?P_OFF_HEAP_MSO, HP)].
+   hipe_rtl_arch:pcb_store(?P_OFF_HEAP_FIRST, HP)].
 
 test_heap_binary(Binary, TrueLblName, FalseLblName) ->
   Tmp1 = hipe_rtl:mk_new_reg_gcsafe(),
diff --git a/lib/hipe/tools/hipe_tool.erl b/lib/hipe/tools/hipe_tool.erl
index a1bd79895d..990805ceca 100644
--- a/lib/hipe/tools/hipe_tool.erl
+++ b/lib/hipe/tools/hipe_tool.erl
@@ -56,9 +56,9 @@
 
 -record(state, {win_created = false	:: boolean(),
 		mindex = 0		:: integer(),
-		mod			:: module(),
+		mod			:: atom(),
 		funs = []		:: [fa()],
-		mods = [] 		:: [module()],
+		mods = [] 		:: [atom()],
 		options = [o2]		:: comp_options(),
 		compiling = false	:: 'false' | pid()
 	       }).
@@ -291,8 +291,7 @@ update_code_listbox(State) ->
 		      integer_to_list(length(Mods))++")"),
 	  catch gs:config(code_listbox, [{data, Mods},
 					 {items, Mods},
-					 {selection, 0}
-					]),
+					 {selection, 0}]),
 	  update_module_box(State#state{mods = Mods}, 0, Mods, "")  
       end
   end.
@@ -367,7 +366,7 @@ update_text(Lab, Text) ->
 %% @doc Returns a list of all loaded modules. 
 %%---------------------------------------------------------------------
 
--spec mods() -> [module()].
+-spec mods() -> [atom()].
 
 mods() ->
   [Mod || {Mod,_File} <- code:all_loaded()].
@@ -382,25 +381,26 @@ funs(Mod) ->
 native_code(Mod) ->
   Mod:module_info(native_addresses).
 
--spec mfas(module(), [fa()]) -> [mfa()].
+-spec mfas(atom(), [fa()]) -> [mfa()].
 
 mfas(Mod, Funs) ->
   [{Mod,F,A} || {F,A} <- Funs].
 
--spec fun_names(module(), [fa()], [fa_address()], boolean()) -> string().
+-spec fun_names(atom(), [fa()], [fa_address()], boolean()) -> [string()].
 
 fun_names(M, Funs, NativeCode, Prof) ->
-  [list_to_atom(atom_to_list(F) ++ "/" ++ integer_to_list(A) ++
-		(case in_native(F, A, NativeCode) of
-		   true -> " [native] ";
-		   false -> ""
-		 end)
-		++
-		if Prof -> 
-		    (catch integer_to_list(hipe_bifs:call_count_get({M,F,A})));
-		   true -> ""
-		end) ||
-      {F,A} <- Funs].
+  [atom_to_list(F) ++ "/" ++ integer_to_list(A)
+   ++
+     (case in_native(F, A, NativeCode) of
+	true -> " [native] ";
+	false -> ""
+      end)
+   ++
+     if Prof ->
+	 (catch integer_to_list(hipe_bifs:call_count_get({M,F,A})));
+	true -> ""
+     end
+   || {F,A} <- Funs].
 
 -spec in_native(atom(), arity(), [fa_address()]) -> boolean().
 
@@ -461,7 +461,7 @@ get_compile(Info) ->
     false -> []
   end.
 
--spec is_profiled(module()) -> boolean().
+-spec is_profiled(atom()) -> boolean().
 
 is_profiled(Mod) ->
   case hipe_bifs:call_count_get({Mod,module_info,0}) of
@@ -478,7 +478,7 @@ compile(State) ->
   P = spawn(fun() -> c(Parent, State#state.mod, State#state.options) end),
   State#state{compiling = P}.
 
--spec c(pid(), module(), comp_options()) -> 'ok'.
+-spec c(pid(), atom(), comp_options()) -> 'ok'.
 
 c(Parent, Mod, Options) ->
   Res = hipe:c(Mod, Options),
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index 129718a305..513b1f4943 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.7.5
+HIPE_VSN = 3.7.8.1
diff --git a/lib/hipe/x86/hipe_x86_spill_restore.erl b/lib/hipe/x86/hipe_x86_spill_restore.erl
index e60c446e17..cd927669fb 100644
--- a/lib/hipe/x86/hipe_x86_spill_restore.erl
+++ b/lib/hipe/x86/hipe_x86_spill_restore.erl
@@ -1,20 +1,20 @@
 %% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2008-2010. 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%
 %%
 %% ====================================================================
@@ -71,9 +71,9 @@ firstPass(Defun) ->
   case hipe_x86_cfg:reverse_postorder(CFG0) of
     [Label1, Label2|_] ->
       SaveTreeElement = saveTreeLookup(Label2, SaveTree),
-      %% FilteredSaveTreeElement is the to be spilled temps around the function call. 
-      %% They are spilled just before move formals
-      FilteredSaveTreeElement = [Temp || Temp <- SaveTreeElement, temp_is_pseudo(Temp)],
+      %% FilteredSaveTreeElement is the to be spilled temps around the
+      %% function call. They are spilled just before move formals.
+      FilteredSaveTreeElement = [T || T <- SaveTreeElement, temp_is_pseudo(T)],
       Block = hipe_x86_cfg:bb(CFG1, Label1),
       Code = hipe_bb:code(Block),
       %% The following statements are tedious but work ok.
@@ -83,7 +83,7 @@ firstPass(Defun) ->
       %% Another solution may be to introduce another block.
       MoveCodes = lists:sublist(Code, length(Code)-1),
       JumpCode = lists:last(Code),
-      hipe_x86_cfg:bb_add(CFG1, Label1, hipe_bb:mk_bb(MoveCodes ++ [hipe_x86:mk_pseudo_spill(FilteredSaveTreeElement)] ++ [JumpCode]));
+      hipe_x86_cfg:bb_add(CFG1, Label1, hipe_bb:mk_bb(MoveCodes ++ [hipe_x86:mk_pseudo_spill(FilteredSaveTreeElement), JumpCode]));
     _ ->
       CFG1
   end.
@@ -110,13 +110,12 @@ firstPassHelper([Label|Labels], Liveness, CFG, SaveTree) ->
   NewBlock = hipe_bb:code_update(Block, NewCode),
   NewCFG = hipe_x86_cfg:bb_add(CFG, Label, NewBlock), 
   SizeOfSet = setSize(NewIntersectedList),
-  
   %% if the Intersected Save List is not empty, insert it in the save tree.
   if SizeOfSet =/= 0 ->
-      UpdatedSaveTree = gb_trees:insert(Label,NewIntersectedList,SaveTree),
-      firstPassHelper(Labels, Liveness, NewCFG,UpdatedSaveTree);
+      UpdatedSaveTree = gb_trees:insert(Label, NewIntersectedList, SaveTree),
+      firstPassHelper(Labels, Liveness, NewCFG, UpdatedSaveTree);
      true ->
-      firstPassHelper(Labels, Liveness, NewCFG,SaveTree)
+      firstPassHelper(Labels, Liveness, NewCFG, SaveTree)
   end;
 firstPassHelper([], _, CFG, SaveTree) ->
   {CFG, SaveTree}.
@@ -125,17 +124,15 @@ firstPassHelper([], _, CFG, SaveTree) ->
 firstPassDoBlock(Insts, LiveOut, IntersectedSaveList) -> 
   lists:foldr(fun firstPassDoInsn/2, {LiveOut,IntersectedSaveList,[]}, Insts).
 
-firstPassDoInsn(I, {LiveOut,IntersectedSaveList,PrevInsts} ) ->
+firstPassDoInsn(I, {LiveOut,IntersectedSaveList,PrevInsts}) ->
   case I of
     #pseudo_call{} ->
       do_pseudo_call(I, {LiveOut,IntersectedSaveList,PrevInsts});
     _ -> % other instructions
       DefinedList = from_list( ?HIPE_X86_LIVENESS:defines(I)),
       UsedList = from_list(?HIPE_X86_LIVENESS:uses(I)),
-      
       NewLiveOut = subtract(union(LiveOut, UsedList), DefinedList),
-      NewIntersectedSaveList = subtract(IntersectedSaveList, DefinedList), 
-      
+      NewIntersectedSaveList = subtract(IntersectedSaveList, DefinedList),
       {NewLiveOut, NewIntersectedSaveList, [I|PrevInsts]}
   end.
 
@@ -162,7 +159,7 @@ saveTreeLookup(Label, SaveTree) ->
       []
   end.
 
-%% Performs the second pass of the algoritm.
+%% Performs the second pass of the algorithm.
 %% It basically eliminates the unnecessary spills and introduces restores.
 %% Works top down
 secondPass(CFG0) ->
@@ -306,7 +303,8 @@ addRestoreBlockToEdge(PseudoCall, ContLabel, CFG, TempArgsList) ->
   NewCFG = hipe_x86_cfg:bb_add(CFG, NextLabel, NewBlock),
   {NewCFG, NewPseudoCall}.
 
-%% used instead of hipe_x86_cfg:redirect_jmp since it does not handle pseudo_call calls.
+%% used instead of hipe_x86_cfg:redirect_jmp since it does not handle
+%% pseudo_call calls.
 redirect_pseudo_call(I = #pseudo_call{contlab=ContLabel}, Old, New) ->
   case Old =:= ContLabel of
     true  -> I#pseudo_call{contlab=New};
@@ -323,8 +321,8 @@ temp_is_pseudo(Temp) ->
 %% Set operations where the module name is an easily changeable macro
 %%---------------------------------------------------------------------
 
-union(Set1,Set2) ->
-  ?SET_MODULE:union(Set1,Set2).
+union(Set1, Set2) ->
+  ?SET_MODULE:union(Set1, Set2).
 
 setSize(Set) ->
   ?SET_MODULE:size(Set).
diff --git a/lib/ic/doc/src/notes.xml b/lib/ic/doc/src/notes.xml
index 6684547572..5f6c31069c 100644
--- a/lib/ic/doc/src/notes.xml
+++ b/lib/ic/doc/src/notes.xml
@@ -31,6 +31,26 @@
   </header>
 
    <section>
+    <title>IC 4.2.26</title>
+
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Partial support for recursive structs and unions. Only available
+            for the erl_corba backend and requires that Light IFR is used.
+            I.e. the IC option {light_ifr, true} and that Orber is configured
+            in such a way that Light IFR is activated. Recursive TypeCode is
+            currently not supported.</p>
+          <p>
+            Own Id: OTP-8868 Aux Id: seq11633</p>
+        </item>
+      </list>
+    </section>
+   </section>
+
+   <section>
     <title>IC 4.2.25</title>
 
     <section>
diff --git a/lib/ic/src/ic_forms.erl b/lib/ic/src/ic_forms.erl
index 7409ddeb7b..fc46a2ed40 100644
--- a/lib/ic/src/ic_forms.erl
+++ b/lib/ic/src/ic_forms.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -65,6 +65,7 @@ get_line(X) when is_record(X, scoped_id) -> X#scoped_id.line;
 get_line(X) when is_record(X, module)      -> get_line(X#module.id);
 get_line(X) when is_record(X, interface)   -> get_line(X#interface.id);
 get_line(X) when is_record(X, forward)     -> get_line(X#forward.id);
+get_line(X) when is_record(X, constr_forward) -> get_line(X#constr_forward.id);
 get_line(X) when is_record(X, const)       -> get_line(X#const.id);
 get_line(X) when is_record(X, typedef)     -> get_line(X#typedef.id);
 get_line(X) when is_record(X, struct)      -> get_line(X#struct.id);
@@ -114,6 +115,7 @@ get_line(_)				-> -1.
 get_id2(X) when is_record(X, module)       -> get_id(X#module.id);
 get_id2(X) when is_record(X, interface)    -> get_id(X#interface.id);
 get_id2(X) when is_record(X, forward)      -> get_id(X#forward.id);
+get_id2(X) when is_record(X, constr_forward) -> get_id(X#constr_forward.id);
 get_id2(X) when is_record(X, const)        -> get_id(X#const.id);
 get_id2(X) when is_record(X, typedef)      -> get_id(hd(X#typedef.id));
 get_id2(X) when is_record(X, struct)       -> get_id(X#struct.id);
@@ -156,6 +158,7 @@ get_type(X) when is_record(X, param)       -> X#param.type.
 %% Temporary place
 get_tk(X) when is_record(X, interface)  -> X#interface.tk;
 get_tk(X) when is_record(X, forward)    -> X#forward.tk;
+get_tk(X) when is_record(X, constr_forward) -> X#constr_forward.tk;
 get_tk(X) when is_record(X, const)      -> X#const.tk;
 get_tk(X) when is_record(X, type_dcl)   -> X#type_dcl.tk;
 get_tk(X) when is_record(X, typedef)    -> X#typedef.tk;
@@ -228,6 +231,7 @@ clean_up_scope([N|Ns],Found) ->
 
 get_type_code2(_, _, X) when is_record(X, interface)  -> X#interface.tk;
 get_type_code2(_, _, X) when is_record(X, forward)    -> X#forward.tk;
+get_type_code2(_, _, X) when is_record(X, constr_forward) -> X#constr_forward.tk;
 get_type_code2(_, _, X) when is_record(X, const)      -> X#const.tk;
 get_type_code2(_, _, X) when is_record(X, type_dcl)   -> X#type_dcl.tk;
 get_type_code2(_, _, X) when is_record(X, typedef)    ->
diff --git a/lib/ic/src/ic_pragma.erl b/lib/ic/src/ic_pragma.erl
index 9165e3b03b..45cb64c9c8 100644
--- a/lib/ic/src/ic_pragma.erl
+++ b/lib/ic/src/ic_pragma.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -60,7 +60,7 @@ pragma_reg(G,X) ->
     init_pragma_status(S),
     registerOptions(G,S),
     pragma_reg_all(G, S, [], X),
-    denote_specific_code_opts(G), %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    denote_specific_code_opts(G),
     case get_pragma_compilation_status(S) of
 	true ->
 	    %% Remove ugly pragmas from form
@@ -132,6 +132,7 @@ applyCodeOpt(G) ->
 
 %% This removes all pragma records from the form.
 %% When debugged, it can be enbodied in pragma_reg_all.
+cleanup(undefined,C) -> C;
 cleanup([],C) -> C;
 cleanup([X|Xs],CSF) ->
     cleanup(Xs, CSF++cleanup(X)).
@@ -279,7 +280,12 @@ pragma_reg(G, S, N, X) when is_record(X, union) ->
 pragma_reg(G, S, N, X) when is_record(X, struct) -> 
     mk_ref(G,[get_id2(X) | N],struct_ref),
     mk_file_data(G,X,N,struct),
-    pragma_reg_all(G, S, N, X#struct.body);
+    case X#struct.body of
+	undefined ->
+	    ok;
+	_ ->
+	    pragma_reg_all(G, S, N, X#struct.body)
+    end;
 
 pragma_reg(G, _S, N, X) when is_record(X, attr) -> 
     XX = #id_of{type=X},
diff --git a/lib/ic/src/ic_symtab.erl b/lib/ic/src/ic_symtab.erl
index 889c75e3a2..d710154a5d 100644
--- a/lib/ic/src/ic_symtab.erl
+++ b/lib/ic/src/ic_symtab.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -69,6 +69,8 @@ store(G, N, X) ->
 	    ets:insert(G#genobj.symtab, {Name, X});
 	{ok, Y} when is_record(Y, forward) ->
 	    ets:insert(G#genobj.symtab, {Name, X});
+	{ok, Y} when is_record(Y, constr_forward) ->
+	    ets:insert(G#genobj.symtab, {Name, X});
 	{ok, _Y} ->
 	    ic_error:error(G, {multiply_defined, X})
     end.
diff --git a/lib/ic/src/icforms.hrl b/lib/ic/src/icforms.hrl
index d1869e6330..1b394a11b4 100644
--- a/lib/ic/src/icforms.hrl
+++ b/lib/ic/src/icforms.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -34,6 +34,7 @@
 -record(module,		{id, body}).
 -record(interface,	{id, inherit, body, inherit_body, tk}).
 -record(forward,	{id, tk}).
+-record(constr_forward,	{id, tk}).
 -record(const,		{type, id, val, tk}).
 -record(type_dcl,	{type, tk}).
 -record(typedef,	{type, id, tk}).
diff --git a/lib/ic/src/icparse.yrl b/lib/ic/src/icparse.yrl
index 25b0f452e7..d0dd6cde4c 100644
--- a/lib/ic/src/icparse.yrl
+++ b/lib/ic/src/icparse.yrl
@@ -1,21 +1,20 @@
-%%<copyright>
-%% <year>1997-2007</year>
-%% <holder>Ericsson AB, All Rights Reserved</holder>
-%%</copyright>
-%%<legalnotice>
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1997-2010. 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.
-%%
-%% The Initial Developer of the Original Code is Ericsson AB.
-%%</legalnotice>
+%% 
+%% %CopyrightEnd%
 %%
 %%------------------------------------------------------------
 %% Yecc spec for IDL
@@ -150,6 +149,7 @@ Nonterminals
 	'ZorM_<integer_literal>'
 	'<fixed_pt_type>'
 	'<fixed_pt_const_type>'
+	'<constr_forward_decl>'
 	.
 
 
@@ -473,6 +473,7 @@ OE_preproc -> '#' '<integer_literal>' '<string_literal>'
 '<type_dcl>' -> '<struct_type>' : '$1' .
 '<type_dcl>' -> '<union_type>' : '$1' .
 '<type_dcl>' -> '<enum_type>' : '$1' .
+'<type_dcl>' -> '<constr_forward_decl>' : '$1' .
 
 %% (28) NIY multiple declarators (FIXED)
 '<type_declarator>' -> '<type_spec>' '<declarators>'
@@ -832,6 +833,9 @@ OE_preproc -> '#' '<integer_literal>' '<string_literal>'
 '<fixed_pt_type>' -> 'fixed' '<' '<positive_int_const>' ',' '<positive_int_const>' '>'
   : #fixed{digits='$3',scale='$5'} .
 
+%% (99)
+'<constr_forward_decl>' -> 'struct' '<identifier>' : #constr_forward{id='$2', tk=tk_struct} .
+'<constr_forward_decl>' -> 'union'  '<identifier>' : #constr_forward{id='$2', tk=tk_union} .
 
 %% Added clause
 'ZorM_<string_literal>' -> '$empty' : [] .
diff --git a/lib/ic/src/ictype.erl b/lib/ic/src/ictype.erl
index 4704191bee..9e20801464 100644
--- a/lib/ic/src/ictype.erl
+++ b/lib/ic/src/ictype.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -407,6 +407,18 @@ check(G, S, N, X) when is_record(X, forward) ->
     tktab_add(G, S, N, X, {tk_objref, ictk:get_IR_ID(G, N, X), ic_forms:get_id2(X)}),
     X;
 
+check(G, S, N, #constr_forward{tk = tk_struct} = X) ->
+    ?STDDBG,
+    ID = ic_forms:get_id2(X),
+    Module = list_to_atom(string:join(lists:reverse([ID|N]), "_")),
+    tktab_add(G, S, N, X, {tk_struct, ictk:get_IR_ID(G, N, X), ID, Module}),
+    X;
+check(G, S, N, #constr_forward{tk = tk_union} = X) ->
+    ?STDDBG,
+    ID = ic_forms:get_id2(X),
+    Module = list_to_atom(string:join(lists:reverse([ID|N]), "_")),
+    tktab_add(G, S, N, X, {tk_union, ictk:get_IR_ID(G, N, X), ID, [], [], Module}),
+    X;
 
 check(G, S, N, X) when is_record(X, const) ->
     ?STDDBG,
@@ -427,21 +439,6 @@ check(G, S, N, X) when is_record(X, const) ->
 	    end
     end;
 
-check(G, S, N, X) when is_record(X, const) ->
-    ?STDDBG,
-    case tk_base(G, S, N, ic_forms:get_type(X)) of
-	Err when element(1, Err) == error -> X;
-	TK ->
-	    check_const_tk(G, S, N, X, TK),
-	    case iceval:eval_const(G, S, N, TK, X#const.val) of
-		Err when element(1, Err) == error -> X;
-		Val ->
-		    V = iceval:get_val(Val),
-		    tktab_add(G, S, N, X, TK, V),
-		    X#const{val=V, tk=TK}
-	    end
-    end;
-
 check(G, S, N, X) when is_record(X, except) ->
     ?STDDBG,
     TK = tk(G, S, N, X),
@@ -795,9 +792,15 @@ tktab_add_id(G, S, N, X, Id, TK, Aux) ->
     Name = [Id | N],
     UName = mk_uppercase(Name),
     case ets:lookup(S, Name) of
-	[{_, forward, _, _}] when is_record(X, interface) -> ok;
-	[XX] when is_record(X, forward) andalso element(2, XX)==interface -> ok;
-	[_] -> ic_error:error(G, {multiply_defined, X});
+	[{_, forward, _, _}] when is_record(X, interface) ->
+	    ok;
+	[{_, constr_forward, _, _}] when is_record(X, union) orelse 
+					 is_record(X, struct) -> 
+	    ok;
+	[XX] when is_record(X, forward) andalso element(2, XX)==interface -> 
+	    ok;
+	[_] -> 
+	    ic_error:error(G, {multiply_defined, X});
 	[] ->
 	    case ets:lookup(S, UName) of
 		[] -> ok;
diff --git a/lib/ic/test/Makefile b/lib/ic/test/Makefile
new file mode 100644
index 0000000000..988e7e7985
--- /dev/null
+++ b/lib/ic/test/Makefile
@@ -0,0 +1,277 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 1998-2010. 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%
+#
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+VSN=$(IC_VSN)
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/ic_test
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+TEST_SPEC_FILE = ic.spec
+
+
+IDL_FILES = 
+
+COMPILER_TEST_FILES = \
+	ic_SUITE_data/Corba.idl \
+	ic_SUITE_data/Coss.idl \
+	ic_SUITE_data/attr.idl \
+	ic_SUITE_data/c_err1.idl \
+	ic_SUITE_data/c_err2.idl \
+	ic_SUITE_data/c_err3.idl \
+	ic_SUITE_data/c_norm.idl \
+	ic_SUITE_data/enum.idl \
+	ic_SUITE_data/forward.idl \
+	ic_SUITE_data/include.idl \
+	ic_SUITE_data/include2.idl \
+	ic_SUITE_data/include3.idl \
+	ic_SUITE_data/inherit.idl \
+	ic_SUITE_data/inherit_err.idl \
+	ic_SUITE_data/inherit_warn.idl \
+	ic_SUITE_data/mult_ids.idl \
+	ic_SUITE_data/nasty.idl \
+	ic_SUITE_data/one.idl \
+	ic_SUITE_data/one_out.idl \
+	ic_SUITE_data/one_raises.idl \
+	ic_SUITE_data/one_followed.idl \
+	ic_SUITE_data/one_void.idl \
+        ic_SUITE_data/raises_reg.idl \
+	ic_SUITE_data/struct.idl \
+	ic_SUITE_data/syntax1.idl \
+	ic_SUITE_data/syntax2.idl \
+	ic_SUITE_data/syntax3.idl \
+	ic_SUITE_data/syntax4.idl \
+	ic_SUITE_data/syntax5.idl \
+	ic_SUITE_data/syntax6.idl \
+	ic_SUITE_data/type.idl \
+	ic_SUITE_data/typeid.idl \
+	ic_SUITE_data/u_case_mult.idl \
+	ic_SUITE_data/u_mult.idl \
+	ic_SUITE_data/u_norm.idl \
+	ic_SUITE_data/u_type.idl \
+	ic_SUITE_data/u_default.idl \
+	ic_SUITE_data/undef_id.idl
+
+
+COMPILER_TEST_FILES2 = \
+	ic_register_SUITE_data/reg_m8.idl \
+	ic_register_SUITE_data/reg_m9.idl \
+	ic_register_SUITE_data/reg_m10.idl \
+	ic_register_SUITE_data/reg_m11.idl \
+	ic_register_SUITE_data/reg_m12.idl
+
+
+COMPILER_TEST_FILES3 = \
+	ic_pragma_SUITE_data/reg_m0.idl \
+	ic_pragma_SUITE_data/reg_m1.idl \
+	ic_pragma_SUITE_data/reg_m2.idl \
+	ic_pragma_SUITE_data/reg_m3.idl \
+	ic_pragma_SUITE_data/reg_m4.idl \
+	ic_pragma_SUITE_data/reg_m5.idl \
+	ic_pragma_SUITE_data/reg_m6.idl \
+	ic_pragma_SUITE_data/reg_m7.idl \
+        ic_pragma_SUITE_data/uggly.idl	
+
+
+COMPILER_TEST_FILES4 = \
+	ic_be_SUITE_data/plain.idl
+
+
+PREPROCESSOR_TEST_FILES = \
+	ic_pp_SUITE_data/arg.idl \
+	ic_pp_SUITE_data/cascade.idl \
+	ic_pp_SUITE_data/comment.idl \
+	ic_pp_SUITE_data/concat.idl \
+	ic_pp_SUITE_data/define.idl \
+	ic_pp_SUITE_data/if.idl \
+	ic_pp_SUITE_data/if_zero.idl \
+	ic_pp_SUITE_data/improp_nest_constr.idl \
+	ic_pp_SUITE_data/inc.idl \
+	ic_pp_SUITE_data/line.idl \
+	ic_pp_SUITE_data/misc.idl \
+	ic_pp_SUITE_data/nopara.idl \
+	ic_pp_SUITE_data/predef.idl \
+	ic_pp_SUITE_data/predef_time.idl \
+	ic_pp_SUITE_data/self_ref.idl \
+	ic_pp_SUITE_data/separate.idl \
+	ic_pp_SUITE_data/swallow_sc.idl \
+	ic_pp_SUITE_data/unintended_grp.idl
+
+C_CLIENT_ERL_SERVER_TEST_FILES = \
+	c_client_erl_server_SUITE_data/Makefile.src \
+	c_client_erl_server_SUITE_data/c_erl_test.idl \
+	c_client_erl_server_SUITE_data/c_client.c \
+	c_client_erl_server_SUITE_data/m_i_impl.erl
+  
+C_CLIENT_ERL_SERVER_PROTO_TEST_FILES = \
+	c_client_erl_server_proto_SUITE_data/Makefile.src \
+	c_client_erl_server_proto_SUITE_data/c_erl_test.idl \
+	c_client_erl_server_proto_SUITE_data/c_client.c \
+	c_client_erl_server_proto_SUITE_data/my.c \
+	c_client_erl_server_proto_SUITE_data/m_i_impl.erl
+  
+C_CLIENT_ERL_SERVER_PROTO_TMO_TEST_FILES = \
+	c_client_erl_server_proto_tmo_SUITE_data/Makefile.src \
+	c_client_erl_server_proto_tmo_SUITE_data/c_erl_test.idl \
+	c_client_erl_server_proto_tmo_SUITE_data/c_client.c \
+	c_client_erl_server_proto_tmo_SUITE_data/my.c \
+	c_client_erl_server_proto_tmo_SUITE_data/m_i_impl.erl
+  
+ERL_CLIENT_C_SERVER_TEST_FILES = \
+	erl_client_c_server_SUITE_data/Makefile.src \
+	erl_client_c_server_SUITE_data/erl_c_test.idl \
+	erl_client_c_server_SUITE_data/erl_client.erl \
+	erl_client_c_server_SUITE_data/c_server.c \
+	erl_client_c_server_SUITE_data/callbacks.c
+
+ERL_CLIENT_C_SERVER_PROTO_TEST_FILES = \
+	erl_client_c_server_proto_SUITE_data/Makefile.src \
+	erl_client_c_server_proto_SUITE_data/erl_c_test.idl \
+	erl_client_c_server_proto_SUITE_data/erl_client.erl \
+	erl_client_c_server_proto_SUITE_data/c_server.c \
+	erl_client_c_server_proto_SUITE_data/callbacks.c
+
+JAVA_CLIENT_ERL_SERVER_TEST_FILES = \
+	java_client_erl_server_SUITE_data/Makefile.src \
+	java_client_erl_server_SUITE_data/java_erl_test.idl \
+	java_client_erl_server_SUITE_data/JavaClient.java \
+	java_client_erl_server_SUITE_data/m_i_impl.erl
+  
+MODULES = \
+	ic_SUITE  \
+	ic_register_SUITE \
+        ic_pragma_SUITE \
+	ic_pp_SUITE \
+	ic_be_SUITE \
+	c_client_erl_server_SUITE \
+	c_client_erl_server_proto_SUITE \
+	c_client_erl_server_proto_tmo_SUITE \
+	erl_client_c_server_SUITE \
+	erl_client_c_server_proto_SUITE \
+	java_client_erl_server_SUITE
+
+GEN_MODULES = 
+
+ERL_FILES = $(MODULES:%=%.erl)
+
+HRL_FILES = 
+
+GEN_HRL_FILES =  
+
+
+GEN_FILES = \
+	$(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
+	$(GEN_MODULES=:%=$(IDLOUTDIR)/%.erl) 
+
+GEN_TARGET_FILES = $(GEN_MODULES:%=$(IDLOUTDIR)/%.$(EMULATOR))
+
+SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
+
+TARGET_FILES = \
+	$(GEN_TARGET_FILES) \
+	$(SUITE_TARGET_FILES)
+
+# ----------------------------------------------------
+# PROGRAMS
+# ----------------------------------------------------
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+ERL_LOCAL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pa $(ERL_TOP)/lib/ic/ebin
+
+ERL_COMPILE_FLAGS += \
+	$(ERL_LOCAL_FLAGS) \
+	-pa $(ERL_TOP)/lib/test_server/ebin \
+	-pa $(ERL_TOP)/lib/orber/ebin \
+	-I$(ERL_TOP)/lib/orber \
+	-I$(ERL_TOP)/lib/test_server/include
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+tests debug opt: $(TARGET_FILES)
+
+clean:
+	rm -f $(TARGET_FILES) 
+	rm -f errs core *~
+
+docs:
+
+# ----------------------------------------------------
+# Special Targets
+# ----------------------------------------------------
+
+
+# ----------------------------------------------------
+# Release Targets
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: 
+
+release_docs_spec:
+
+release_tests_spec: tests
+	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DIR) $(RELSYSDIR)/ic_SUITE_data
+	$(INSTALL_DIR) $(RELSYSDIR)/ic_register_SUITE_data
+	$(INSTALL_DIR) $(RELSYSDIR)/ic_pragma_SUITE_data
+	$(INSTALL_DIR) $(RELSYSDIR)/ic_pp_SUITE_data
+	$(INSTALL_DIR) $(RELSYSDIR)/ic_be_SUITE_data
+	$(INSTALL_DIR) $(RELSYSDIR)/c_client_erl_server_SUITE_data
+	$(INSTALL_DIR) $(RELSYSDIR)/c_client_erl_server_proto_SUITE_data
+	$(INSTALL_DIR) $(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data
+	$(INSTALL_DIR) $(RELSYSDIR)/erl_client_c_server_SUITE_data
+	$(INSTALL_DIR) $(RELSYSDIR)/erl_client_c_server_proto_SUITE_data
+	$(INSTALL_DIR) $(RELSYSDIR)/java_client_erl_server_SUITE_data
+	$(INSTALL_DATA) $(IDL_FILES)  ic.cover $(TEST_SPEC_FILE) $(ERL_FILES) \
+		$(RELSYSDIR)
+	$(INSTALL_DATA) $(COMPILER_TEST_FILES) $(RELSYSDIR)/ic_SUITE_data
+	$(INSTALL_DATA) $(COMPILER_TEST_FILES2) \
+		$(RELSYSDIR)/ic_register_SUITE_data
+	$(INSTALL_DATA) $(COMPILER_TEST_FILES3) \
+		$(RELSYSDIR)/ic_pragma_SUITE_data
+	$(INSTALL_DATA) $(COMPILER_TEST_FILES4) \
+		$(RELSYSDIR)/ic_be_SUITE_data	
+	$(INSTALL_DATA) $(PREPROCESSOR_TEST_FILES) \
+		$(RELSYSDIR)/ic_pp_SUITE_data	
+	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_TEST_FILES) \
+		$(RELSYSDIR)/c_client_erl_server_SUITE_data	
+	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_PROTO_TEST_FILES) \
+		$(RELSYSDIR)/c_client_erl_server_proto_SUITE_data	
+	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_PROTO_TMO_TEST_FILES) \
+		$(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data	
+	$(INSTALL_DATA) $(ERL_CLIENT_C_SERVER_TEST_FILES) \
+		$(RELSYSDIR)/erl_client_c_server_SUITE_data	
+	$(INSTALL_DATA) $(ERL_CLIENT_C_SERVER_PROTO_TEST_FILES) \
+		$(RELSYSDIR)/erl_client_c_server_proto_SUITE_data	
+	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) $(JAVA_CLIENT_ERL_SERVER_TEST_FILES) \
+		$(RELSYSDIR)/java_client_erl_server_SUITE_data
diff --git a/lib/ic/test/c_client_erl_server_SUITE.erl b/lib/ic/test/c_client_erl_server_SUITE.erl
new file mode 100644
index 0000000000..038172c311
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_SUITE.erl
@@ -0,0 +1,332 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2001-2010. 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%
+%%
+%%
+
+%%----------------------------------------------------------------------
+%% Purpose : Test suite for c-client/erl-server
+%%----------------------------------------------------------------------
+
+
+-module(c_client_erl_server_SUITE).
+-include_lib("common_test/include/ct.hrl").
+
+-export([init_per_testcase/2, end_per_testcase/2,
+	 all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 void_test/1, long_test/1, long_long_test/1,
+	 unsigned_short_test/1, unsigned_long_test/1,
+	 unsigned_long_long_test/1, double_test/1, char_test/1,
+	 wchar_test/1, octet_test/1, bool_test/1, struct_test/1,
+	 struct2_test/1, seq1_test/1, seq2_test/1, seq3_test/1,
+	 seq4_test/1, seq5_test/1, array1_test/1, array2_test/1,
+	 enum_test/1, string1_test/1, string2_test/1, string3_test/1,
+	 string4_test/1, pid_test/1, port_test/1, ref_test/1, term_test/1,
+	 typedef_test/1, inline_sequence_test/1, term_sequence_test/1,
+	 term_struct_test/1, wstring1_test/1]).
+
+-define(DEFAULT_TIMEOUT, 20000).
+-define(PORT_TIMEOUT, 15000).
+-define(ERLANG_SERVER_NAME, idl_erlang_server).
+-define(C_CLIENT_NODE_NAME, c_client_idl_test).
+  
+%% Add/remove code path and watchdog before/after each test case.
+%%
+init_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:add_patha(DataDir),
+
+    %% Since other test suites use the module m_i, we have
+    %% to make sure we are using the right m_i module.
+    code:purge(m_i),
+    code:load_file(m_i),
+
+    WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
+    [{watchdog, WatchDog}| Config].
+
+end_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:del_path(DataDir),
+    WatchDog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(WatchDog).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [void_test, long_test, long_long_test,
+     unsigned_short_test, unsigned_long_test,
+     unsigned_long_long_test, double_test, char_test,
+     wchar_test, octet_test, bool_test, struct_test,
+     struct2_test, seq1_test, seq2_test, seq3_test,
+     seq4_test, seq5_test, array1_test, array2_test,
+     enum_test, string1_test, string2_test, string3_test,
+     string4_test, pid_test, port_test, ref_test, term_test,
+     typedef_test, inline_sequence_test, term_sequence_test,
+     term_struct_test, wstring1_test].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+array1_test(doc) -> "";
+array1_test(suite) -> [];
+array1_test(Config) ->
+    do_test(array1_test, Config). 
+
+array2_test(doc) -> "";
+array2_test(suite) -> [];
+array2_test(Config) ->
+    do_test(array2_test, Config).
+
+bool_test(doc) -> "";
+bool_test(suite) -> [];
+bool_test(Config) ->
+    do_test(bool_test, Config).
+
+char_test(doc) -> "";
+char_test(suite) -> [];
+char_test(Config) ->
+    do_test(char_test, Config).
+
+double_test(doc) -> "";
+double_test(suite) -> [];
+double_test(Config) ->
+    do_test(double_test, Config).
+
+enum_test(doc) -> "";
+enum_test(suite) -> [];
+enum_test(Config) ->
+    do_test(enum_test, Config).
+
+inline_sequence_test(doc) -> "";
+inline_sequence_test(suite) -> [];
+inline_sequence_test(Config) ->
+    do_test(inline_sequence_test, Config).
+
+long_long_test(doc) -> "";
+long_long_test(suite) -> [];
+long_long_test(Config) ->
+    do_test(long_long_test, Config).
+
+long_test(doc) -> "";
+long_test(suite) -> [];
+long_test(Config) ->
+    do_test(long_test, Config).
+
+octet_test(doc) -> "";
+octet_test(suite) -> [];
+octet_test(Config) ->
+    do_test(octet_test, Config).
+
+pid_test(doc) -> "";
+pid_test(suite) -> [];
+pid_test(Config) ->
+    do_test(pid_test, Config).
+
+port_test(doc) -> "";
+port_test(suite) -> [];
+port_test(Config) ->
+    do_test(port_test, Config).
+
+ref_test(doc) -> "";
+ref_test(suite) -> [];
+ref_test(Config) ->
+    do_test(ref_test, Config).
+
+seq1_test(doc) -> "";
+seq1_test(suite) -> [];
+seq1_test(Config) ->
+    do_test(seq1_test, Config).
+
+seq2_test(doc) -> "";
+seq2_test(suite) -> [];
+seq2_test(Config) ->
+    do_test(seq2_test, Config).
+
+seq3_test(doc) -> "";
+seq3_test(suite) -> [];
+seq3_test(Config) ->
+    do_test(seq3_test, Config).
+
+seq4_test(doc) -> "";
+seq4_test(suite) -> [];
+seq4_test(Config) ->
+    do_test(seq4_test, Config).
+
+seq5_test(doc) -> "";
+seq5_test(suite) -> [];
+seq5_test(Config) ->
+    do_test(seq5_test, Config).
+
+string1_test(doc) -> "";
+string1_test(suite) -> [];
+string1_test(Config) ->
+    do_test(string1_test, Config).
+
+string2_test(doc) -> "";
+string2_test(suite) -> [];
+string2_test(Config) ->
+    do_test(string2_test, Config).
+
+string3_test(doc) -> "";
+string3_test(suite) -> [];
+string3_test(Config) ->
+    do_test(string3_test, Config).
+
+string4_test(doc) -> "";
+string4_test(suite) -> [];
+string4_test(Config) ->
+    do_test(string4_test, Config).
+
+struct2_test(doc) -> "";
+struct2_test(suite) -> [];
+struct2_test(Config) ->
+    do_test(struct2_test, Config).
+
+struct_test(doc) -> "";
+struct_test(suite) -> [];
+struct_test(Config) ->
+    do_test(struct_test, Config).
+
+term_sequence_test(doc) -> "";
+term_sequence_test(suite) -> [];
+term_sequence_test(Config) ->
+    do_test(term_sequence_test, Config).
+
+term_struct_test(doc) -> "";
+term_struct_test(suite) -> [];
+term_struct_test(Config) ->
+    do_test(term_struct_test, Config).
+
+term_test(doc) -> "";
+term_test(suite) -> [];
+term_test(Config) ->
+    do_test(term_test, Config).
+
+typedef_test(doc) -> "";
+typedef_test(suite) -> [];
+typedef_test(Config) ->
+    do_test(typedef_test, Config).
+
+unsigned_long_long_test(doc) -> "";
+unsigned_long_long_test(suite) -> [];
+unsigned_long_long_test(Config) ->
+    do_test(unsigned_long_long_test, Config).
+
+unsigned_long_test(doc) -> "";
+unsigned_long_test(suite) -> [];
+unsigned_long_test(Config) ->
+    do_test(unsigned_long_test, Config).
+
+unsigned_short_test(doc) -> "";
+unsigned_short_test(suite) -> [];
+unsigned_short_test(Config) ->
+    do_test(unsigned_short_test, Config).
+
+void_test(doc) -> "";
+void_test(suite) -> [];
+void_test(Config) ->
+    do_test(void_test, Config).
+
+wchar_test(doc) -> "";
+wchar_test(suite) -> [];
+wchar_test(Config) ->
+    do_test(wchar_test, Config).
+
+wstring1_test(doc) -> "";
+wstring1_test(suite) -> [];
+wstring1_test(Config) ->
+    do_test(wstring1_test, Config).
+
+
+%% It is here that all tests really are done.
+%%
+     
+do_test(Case, Config) ->
+    %% Trap exits
+    process_flag(trap_exit, true),
+    %% Start the server
+    {ok, _Pid} = m_i:oe_create_link([], {local, ?ERLANG_SERVER_NAME}),
+    Node = atom_to_list(node()),
+    DataDir = ?config(data_dir, Config),
+    %% io:format("~p: data directory: ~p~n", [?MODULE, DataDir]),
+    Cookie = atom_to_list(erlang:get_cookie()),
+    %% Start C-client node as a port program.  
+    Cmd = filename:join([DataDir, "c_client"]) ++
+	" -this-node-name " ++ atom_to_list(?C_CLIENT_NODE_NAME) ++
+	" -peer-node " ++ Node ++
+	" -peer-process-name " ++ atom_to_list(?ERLANG_SERVER_NAME) ++
+	" -cookie " ++ Cookie ++ 
+	" -test-case " ++ atom_to_list(Case),
+    Port = open_port({spawn, Cmd}, [exit_status, eof, stderr_to_stdout]),
+    Res = wait_for_completion(Port),
+    %% Kill off node if there was timeout
+    case Res of
+	{error, timeout} ->
+	    catch rpc:cast(?C_CLIENT_NODE_NAME, erlang, halt, [1]);
+	_ ->
+	    ok
+    end, 
+    process_flag(trap_exit, false),
+    catch m_i:stop(?ERLANG_SERVER_NAME),
+    ok = Res.
+
+
+%% Wait for eof *and* exit status, but return if exit status indicates
+%% an error, or we have been waiting more than PORT_TIMEOUT seconds.
+%%
+wait_for_completion(Port) ->
+    wait_for_completion(Port, 0).
+
+wait_for_completion(Port, N) when N < 2 ->
+    receive
+	{Port, {data, Bytes}} ->
+	    %% Relay output
+	    io:format("~s", [Bytes]),
+	    wait_for_completion(Port, N);
+	{Port, {exit_status, 0}} ->
+	    wait_for_completion(Port, N + 1);
+	{Port, {exit_status, Status}} ->
+	    {error, Status};
+	{Port, eof} ->
+	    wait_for_completion(Port, N + 1);
+	{'EXIT', Port, Reason} ->
+	    io:format("Port exited with reason: ~w~n", [Reason]),
+	    wait_for_completion(Port, N);
+	{'EXIT', From, Reason} ->
+	    io:format("Got unexpected exit: ~p~n", [{'EXIT', From, Reason}]),
+	    wait_for_completion(Port, N)
+    after ?PORT_TIMEOUT ->
+	    {error, timeout}
+    end;
+wait_for_completion(_, _) ->
+    ok.
+
+	    
+    
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..6516e699bd
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
@@ -0,0 +1,145 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2001-2009. 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%
+#
+#
+# Makefile.src for c_client_erl_server test
+# Note: This file *must* work for both Unix and Windows
+#
+# We use both `rm' (Unix) and `del' (Windows) for removing files, but
+# with a `-' in front so that the error in not finding `rm' (`del') on
+# Windows (Unix) is ignored.
+#
+# VxWorks? XXX 
+#
+
+.SUFFIXES:
+.SUFFIXES: .c .h .erl .idl @obj@ .@EMULATOR@
+
+
+# Variables from ts: 
+#
+
+ERL_INCLUDE = @erl_include@
+
+IC_INCLUDE_PATH = @ic_include_path@
+IC_LIB = @ic_libpath@@DS@@ic_lib@
+
+ERL_INTERFACE_INCLUDE = @erl_interface_include@
+ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@
+ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@
+ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
+ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
+
+CC = @CC@
+## XXX Should set warning flag with a DEBUG_FLAG 
+CFLAGS = @CFLAGS@ @DEFS@ -I@erl_include@ \
+	-I@ic_include_path@ -I@erl_interface_include@
+
+LD = @LD@
+LDFLAGS = @CROSSLDFLAGS@
+LIBS =	$(IC_LIB) $(ERL_INTERFACE_LIB) $(ERL_INTERFACE_EILIB) \
+	$(ERL_INTERFACE_THREADLIB) @LIBS@ $(ERL_INTERFACE_SOCK_LIBS)
+ERLC = erlc
+
+# Generated C header files
+GEN_H_FILES = \
+	m.h \
+	m_i.h \
+	oe_c_erl_test.h
+
+# Generated C files 
+GEN_C_FILES = \
+	m.c \
+	m_i.c \
+	oe_c_erl_test.c \
+	oe_code_m_a.c \
+	oe_code_m_arr1.c \
+	oe_code_m_arr2.c \
+	oe_code_m_arr3.c \
+	oe_code_m_aseq.c \
+	oe_code_m_b.c \
+	oe_code_m_bseq.c \
+	oe_code_m_dd.c \
+	oe_code_m_dyn.c \
+	oe_code_m_dyn_sl.c \
+	oe_code_m_es.c \
+	oe_code_m_et.c \
+	oe_code_m_etseq.c \
+	oe_code_m_fruit.c \
+	oe_code_m_lseq.c \
+	oe_code_m_s.c \
+	oe_code_m_s_sl.c \
+	oe_code_m_sarr3.c \
+	oe_code_m_simple.c \
+	oe_code_m_ssarr3.c \
+	oe_code_m_sseq.c \
+	oe_code_m_ssstr3.c \
+	oe_code_m_sstr3.c \
+	oe_code_m_str1.c \
+	oe_code_m_str3.c \
+	oe_code_m_strRec.c \
+	oe_code_m_strRec_str5.c \
+	oe_code_m_strRec_str7.c
+
+GEN_HRL_FILES = \
+	m.hrl \
+	m_i.hrl \
+	oe_c_erl_test.hrl
+
+GEN_ERL_FILES = \
+	m.erl \
+	m_arr2.erl \
+	m_arr3.erl \
+	m_i.erl \
+	m_str3.erl \
+	oe_c_erl_test.erl
+
+C_FILES = $(GEN_C_FILES) c_client.c
+
+OBJS = $(C_FILES:.c=@obj@)
+
+PGMS = c_client@exe@
+
+ERL_FILES = $(GEN_ERL_FILES) m_i_impl.erl
+
+EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
+
+
+all: $(PGMS) $(EBINS)
+
+clean:	
+	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
+$(PGMS): $(OBJS)
+	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" c_erl_test.idl
+
+$(GEN_ERL_FILES) $(GEN_HRL_FILES): c_erl_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
+
+.c@obj@:
+	$(CC) -c -o $*@obj@ $(CFLAGS) $<
+
+.erl.@EMULATOR@:
+	$(ERLC) -I $(IC_INCLUDE_PATH) $<
+
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
new file mode 100644
index 0000000000..e4f9cfdece
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
@@ -0,0 +1,1760 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2001-2010. 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%
+ *
+ */
+/* C-client for test of IC.  
+ * 
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef __WIN32__
+#  include <unistd.h>
+#endif
+
+#include <string.h>
+
+#ifdef __WIN32__
+#  include <time.h>
+#  include <sys/timeb.h>
+#elif defined VXWORKS
+#include <time.h>
+#include <sys/times.h>
+#else
+#include <sys/time.h>
+#endif
+
+#include <ctype.h>
+
+#ifdef __WIN32__
+#  include <winsock2.h>
+#  include <windows.h>
+#else
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  include <netdb.h>
+#endif
+
+#include "ei.h"
+#include "erl_interface.h"
+#include "m_i.h"
+
+#define HOSTNAMESZ 256
+#define NODENAMESZ 512
+
+#define INBUFSZ 10
+#define OUTBUFSZ 0
+
+#define MAXTRIES 5
+
+#define CHECK_EXCEPTION(x) \
+    if ((x)->_major != CORBA_NO_EXCEPTION) { \
+	fprintf(stderr,"\n\nException: %s\n\n", \
+		(char *)CORBA_exception_value((x))); \
+        CORBA_exception_free((x)); \
+	return -1; \
+    } \
+
+/* XXX Should free things here too! */
+#define RETURN_IF_OK(x) \
+    if ((x)) {\
+	fprintf(stdout, "ok\n");\
+	return 0;\
+    }\
+
+#define cmp_str(x,y) (!strcmp((x),(y)))
+#define cmp_wstr(x,y) (!ic_wstrcmp((x),(y)))
+
+typedef CORBA_Environment IC_Env;
+
+typedef int (*TestFunc)(IC_Env *);
+typedef struct {
+    char *name; 
+    TestFunc func; 
+} TestCase;
+
+static char longtext[] = 
+"Introduction The IC application is an IDL compiler implemented in Erlang."
+" The IDL compiler generates client stubs and server skeletons."
+" Several back-ends are supported, and they fall into three main groups."
+" For more details on IC compiler options consult the ic(3) manual page."
+" Argument passing cases 1 Caller allocates all necessary storage,"
+" except that which may be encapsulated and managed within the parameter itself."
+" 2 The caller allocates a pointer and passes it by reference to the callee."
+" The callee sets the pointer to point to a valid instance of the parameter's type."
+" The caller is responsible for releasing the returned storage."
+" Following completion of a request, the caller is not allowed to modify any values"
+" in the returned storage. To do so the caller must first copy the returned instance"
+" into a new instance, then modify the new instance. 3 The caller allocates a"
+" pointer to an array slice which has all the same dimensions of the original"
+" array except the first, and passes it by reference to the callee. The callee sets"
+" the pointer to point to a valid instance of the array. The caller is responsible for"
+" releasing the returned storage. Following completion of a request, the caller is not"
+" allowed to modify any values in the returned storage. To do so the caller must first"
+" copy the returned instance into a new instance, then modify the new instance."
+" Generated Files Two files will be generated for each scope. One set of files will be"
+" generated for each module and each interface scope. An extra set is generated for"
+" those definitions at top level scope. One of the files is a header file(.h), and the"
+" other file is a C source code file (.c). In addition to these files a number of C"
+" source files will be generated for type encodings, they are named according to the "
+"following template: oe_code_<type>.c.";
+static char this_node[NODENAMESZ + 1];
+static char *progname;
+
+/* Test function prototypes */
+
+static int void_test(IC_Env *env);
+static int long_test(IC_Env *env);
+static int long_long_test(IC_Env *env);
+static int unsigned_short_test(IC_Env *env);
+static int unsigned_long_test(IC_Env *env);
+static int unsigned_long_long_test(IC_Env *env);
+static int double_test(IC_Env *env);
+static int char_test(IC_Env *env);
+static int wchar_test(IC_Env *env);
+static int octet_test(IC_Env *env);
+static int bool_test(IC_Env *env);
+static int struct_test(IC_Env *env);
+static int struct2_test(IC_Env *env);
+static int seq1_test(IC_Env *env);
+static int seq2_test(IC_Env *env);
+static int seq3_test(IC_Env *env);
+static int seq4_test(IC_Env *env);
+static int seq5_test(IC_Env *env);
+static int array1_test(IC_Env *env);
+static int array2_test(IC_Env *env);
+static int enum_test(IC_Env *env);
+static int string1_test(IC_Env *env);
+static int string2_test(IC_Env *env);
+static int string3_test(IC_Env *env);
+static int string4_test(IC_Env *env);
+static int pid_test(IC_Env *env);
+static int port_test(IC_Env *env);
+static int ref_test(IC_Env *env);
+static int term_test(IC_Env *env);
+static int typedef_test(IC_Env *env);
+static int inline_sequence_test(IC_Env *env);
+static int term_sequence_test(IC_Env *env);
+static int term_struct_test(IC_Env *env);
+static int wstring1_test(IC_Env *env);
+
+static TestCase test_cases[] = {
+    {"void_test", void_test},
+    {"long_test", long_test},
+    {"long_long_test", long_long_test},
+    {"unsigned_short_test", unsigned_short_test},
+    {"unsigned_long_test", unsigned_long_test},
+    {"unsigned_long_long_test", unsigned_long_long_test},
+    {"double_test", double_test},
+    {"char_test", char_test},
+    {"wchar_test", wchar_test},
+    {"octet_test", octet_test},
+    {"bool_test", bool_test},
+    {"struct_test", struct_test},
+    {"struct2_test", struct2_test},
+    {"seq1_test", seq1_test},
+    {"seq2_test", seq2_test},
+    {"seq3_test", seq3_test},
+    {"seq4_test", seq4_test},
+    {"seq5_test", seq5_test},
+    {"array1_test", array1_test},
+    {"array2_test", array2_test},
+    {"enum_test", enum_test},
+    {"string1_test", string1_test},
+    {"string2_test", string2_test},
+    {"string3_test", string3_test},
+    {"string4_test", string4_test},
+    {"pid_test", pid_test},
+    {"port_test", port_test},
+    {"ref_test", ref_test},
+    {"term_test", term_test},
+    {"typedef_test", typedef_test},
+    {"inline_sequence_test", inline_sequence_test},
+    {"term_sequence_test", term_sequence_test},
+    {"term_struct_test", term_struct_test},
+    {"wstring1_test", wstring1_test},
+    {"", NULL}
+};
+
+/* Other prototypes */
+static int cmp_aseq(m_aseq *a1, m_aseq *a2);
+static int cmp_a(m_a *a1, m_a *a2);
+static int cmp_bseq(m_bseq *b1, m_bseq *b2);
+static int cmp_b(m_b *b1, m_b *b2);
+static int cmp_lseq(m_lseq *b1, m_lseq *b2);
+static int cmp_etseq(m_etseq *b1, m_etseq *b2);
+static int cmp_et(m_et* b1, m_et *b2);
+static int cmp_es(m_es *b1, m_es *b2);
+static int cmp_arr1(m_arr1 b1, m_arr1 b2);
+static int cmp_dd(m_dd b1, m_dd b2);
+static int cmp_strRec(m_strRec *b1, m_strRec *b2);
+static int cmp_sseq(m_sseq *b1, m_sseq *b2);
+static int cmp_pid(erlang_pid *p1, erlang_pid *p2);
+static int cmp_port(erlang_port *p1, erlang_port *p2);
+static int cmp_ref(erlang_ref *p1, erlang_ref *p2);
+static int cmp_s(m_s *b1, m_s *b2);
+static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2);
+static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2);
+static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2);
+static int cmp_arr3(m_arr3 b1, m_arr3 b2);
+
+static void print_aseq(m_aseq *a);
+static void print_a(m_a *a);
+static void print_bseq(m_bseq *b);
+static void print_lseq(m_lseq *b);
+static void print_b(m_b *b);
+static void print_etseq(m_etseq *b);
+static void print_et(m_et* b);
+static void print_es(m_es *b);
+static void print_arr1(long a[500]);
+static void print_dd(long a[2][3]);
+static void print_strRec(m_strRec* sr);
+static void print_sseq(m_sseq *b);
+static void print_pid(erlang_pid *p);
+static void print_port(erlang_port *p);
+static void print_ref(erlang_ref *p);
+static void print_term(ETERM *t);
+static void print_s(m_s *p);
+static void print_ssstr3(m_ssstr3 *b1);
+static void print_ssarr3(m_ssarr3 *b1);
+static void print_sarr3(m_sarr3 *b1);
+static void print_arr3(m_arr3 b1);
+static void print_wstr(CORBA_wchar *ws);
+
+static void free_etseq_buf(m_etseq *b);
+static void free_et(m_et* b);
+
+#ifdef __WIN32__
+typedef struct {
+    long tv_sec;
+    long tv_usec;
+} MyTimeval;
+#else
+typedef struct timeval MyTimeval;
+#endif
+static void my_gettimeofday(MyTimeval *tv);
+static void showtime(MyTimeval *start, MyTimeval *stop);
+static void usage(void);
+static void done(int r);
+
+
+
+/* main */
+
+#ifdef VXWORKS
+int client(int argc, char **argv)
+#else
+int main(int argc, char **argv)
+#endif
+{
+    struct hostent *hp;
+    erlang_pid pid;
+    MyTimeval start, stop;
+    int i, fd, ires, tres;
+    IC_Env *env;
+    int tries = 0;
+    char *this_node_name = NULL;
+    char *peer_node = NULL;
+    char *peer_process_name = NULL;
+    char *cookie = NULL;
+    char host[HOSTNAMESZ + 1];
+    TestFunc test_func = NULL;
+    TestCase *test_case;
+    char *test_case_name = NULL;
+    
+#ifdef __WIN32__
+    WORD wVersionRequested;
+    WSADATA wsaData;
+    
+    wVersionRequested = MAKEWORD(2, 0);
+    
+    if (WSAStartup(wVersionRequested, &wsaData) != 0) {
+	fprintf(stderr, "Could not load winsock2 v2.0 compatible DLL");
+	exit(1);
+    }
+#endif
+    
+    progname = argv[0];
+    host[HOSTNAMESZ] = '\0';
+    if (gethostname(host, HOSTNAMESZ) < 0) {
+	fprintf(stderr, "Can't find own hostname\n");
+	done(1);
+    } 
+    if ((hp = gethostbyname(host)) == 0) {
+	fprintf(stderr, "Can't get ip address for host %s\n", host);
+	done(1);
+    }
+    for (i = 1; i < argc; i++) {
+	if (cmp_str(argv[i], "-help")) {
+	    usage();
+	    done(0);
+	} else if (cmp_str(argv[i], "-this-node-name")) {
+	    i++;
+	    this_node_name = argv[i];
+	} else if (cmp_str(argv[i], "-peer-node")) {
+	    i++;
+	    peer_node = argv[i];
+	} else if (cmp_str(argv[i], "-peer-process-name")) {
+	    i++;
+	    peer_process_name = argv[i];
+	} else if (cmp_str(argv[i], "-cookie")) {
+	    i++;
+	    cookie = argv[i];
+	} else if (cmp_str(argv[i], "-test-case")) {
+	    i++;
+	    test_case_name = argv[i];
+	} else {
+	    fprintf(stderr, "Error : invalid argument \"%s\"\n", argv[i]);
+	    usage();
+	    done(1);
+	}
+    }
+
+    if (this_node_name == NULL || peer_node == NULL || test_case_name == NULL 
+	|| peer_process_name == NULL || cookie == NULL) {
+	fprintf(stderr, "Error: missing option\n");
+	usage();
+	done(1);
+    }
+
+    test_case = test_cases;
+    while (test_case->func) {
+	if (cmp_str(test_case->name, test_case_name)) {
+	    test_func = test_case->func;
+	    break;
+	}
+	test_case++;
+    }
+    if (test_func == NULL) {
+	fprintf(stderr, "Error: illegal test case: \"%s\"\n", test_case_name);
+	done(1);
+    }
+    
+    /* Behead hostname at first dot */
+    for (i=0; host[i] != '\0'; i++) {
+	if (host[i] == '.') { host[i] = '\0'; break; }
+    }
+    sprintf(this_node, "%s@%s", this_node_name, host);
+    fprintf(stderr, "c_client: this node: \"%s\"\n", this_node);
+    fprintf(stderr, "c_client: peer node: \"%s\"\n", peer_node);
+    fprintf(stderr, "c_client: test case: \"%s\"\n", test_case_name);
+
+    fprintf(stderr, "c_client: starting\n");
+
+    /* initialize erl_interface */
+    erl_init(NULL, 0);
+
+    for (tries = 0; tries < MAXTRIES; tries++) {
+
+	/* connect to erlang node */ 
+
+    	ires = erl_connect_xinit(host, this_node_name, this_node, 
+				 (struct in_addr *)*hp->h_addr_list, 
+				 cookie, 0);
+
+	fprintf(stderr, "c_client: erl_connect_xinit(): %d\n", ires);
+    
+	fd = erl_connect(peer_node);
+	fprintf(stderr, "c_client: erl_connect(): %d\n", fd);
+    
+	if (fd >= 0) 
+	    break;
+	fprintf(stderr, "c_client: cannot connect, retrying\n");
+    }
+    if (fd < 0) {
+	fprintf(stderr, "c_client: cannot connect, exiting\n");
+	done(1);
+    }
+    env = CORBA_Environment_alloc(INBUFSZ, OUTBUFSZ);
+    env->_fd = fd; 
+    strcpy(env->_regname, peer_process_name);
+    env->_to_pid = NULL;
+    env->_from_pid = &pid;
+    
+    strcpy(pid.node, this_node);
+    pid.num = fd;
+    pid.serial = 0;
+    pid.creation = 0;
+
+    my_gettimeofday(&start);
+    tres = test_func(env);	/* Call test case */
+    my_gettimeofday(&stop);
+    showtime(&start, &stop);
+    erl_close_connection(fd);
+
+    printf("c_client: env->_inbuf before : %d\n", INBUFSZ);
+    printf("c_client: env->_outbuf before : %d\n", OUTBUFSZ);
+    printf("c_client: env->_inbuf after : %d\n", env->_inbufsz);
+    printf("c_client: env->_outbuf after : %d\n", env->_outbufsz);
+
+    CORBA_free(env->_inbuf);
+    CORBA_free(env->_outbuf);
+    CORBA_free(env);
+    done(tres);
+}
+
+static void usage() 
+{
+    fprintf(stderr, "Usage: %s [-help] -this-node-name <name> "
+	    "-peer-node <nodename> -peer-process-name <name> "
+	    "-cookie <cookie> -test-case <test case name>\n", progname);
+    fprintf(stderr, "Example:\n  %s  -this-node-name kalle "
+	    "-peer-node olle@home -peer-process-name idltest "
+	    "-cookie oa678er -test-case octet_test\n", progname);
+}
+
+static void done(int r) 
+{
+#ifdef __WIN32__
+    WSACleanup();
+#endif
+    exit(r);
+}
+
+
+/* TESTS */
+
+static int void_test(IC_Env *env)
+{
+    fprintf(stdout, "\n======== m_i_void test ======\n\n");
+    m_i_void_test(NULL,env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(1);
+}
+
+static int long_test(IC_Env *env)
+{
+    long l = 4711, lo, lr;
+
+    fprintf(stdout, "\n======== m_i_long test ======\n\n");
+    lr = m_i_long_test(NULL, l, &lo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(l == lo && l == lr);
+    if (l != lo)
+	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", l, lo);
+    if (l != lr)
+	fprintf(stdout, " result error, sent: %ld, got: %ld\n", l, lr);
+    return -1;
+}
+
+static int long_long_test(IC_Env *env)
+{
+    CORBA_long_long ll = 4711, llo, llr;
+
+    fprintf(stdout, "\n======== m_i_longlong test ======\n\n");
+    llr = m_i_longlong_test(NULL, ll, &llo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ll == llo && ll == llr);
+    if (ll != llo)
+	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", 
+		ll, llo);
+    if (ll != llr)
+	fprintf(stdout, " result error, sent: %ld, got: %ld\n", ll, llr);
+    return -1;
+}
+
+static int unsigned_short_test(IC_Env *env)
+{
+    unsigned short x, y = 2, z;
+
+    fprintf(stdout, "\n======== m_i_ushort test ======\n\n");
+    x = m_i_ushort_test(NULL, y, &z, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(y == z && y == x);
+    if (y != z) 
+	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", y, z);
+    if (y != x)
+	fprintf(stdout, " result error, sent: %d, got: %d\n", y, x);
+    return -1;
+}
+
+
+static int unsigned_long_test(IC_Env *env)
+{
+    unsigned long ul = 5050, ulo, ulr;
+
+    fprintf(stdout, "\n======== m_i_ulong test ======\n\n");
+    ulr = m_i_ulong_test(NULL, ul, &ulo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ul == ulo && ul == ulr);
+    if (ul != ulo) 
+	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
+		ul, ulo);
+    if (ul != ulr)
+	fprintf(stdout, " result error, sent: %lu, got: %lu\n", ul, ulr);
+    return -1;
+}
+
+/* 
+ * Note: CORBA_unsigned_long_long is in fact a plain long.
+ */
+static int unsigned_long_long_test(IC_Env *env)
+{
+    CORBA_unsigned_long_long ull = 5050, ullo, ullr;
+
+    fprintf(stdout, "\n======== m_i_ulonglong test ======\n\n");
+    ullr = m_i_ulonglong_test(NULL, ull, &ullo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ull == ullo && ull == ullr);
+    if (ull != ullo)
+	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
+		ull, ullo); 
+    if (ull != ullr)
+	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
+		ull, ullr);
+    return -1;
+}
+
+static int double_test(IC_Env *env)
+{
+    double d = 12.1212, db, dr;
+
+    fprintf(stdout, "\n======== m_i_double test ======\n\n");
+    dr = m_i_double_test(NULL, d, &db, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(d == db && d == dr);
+    if (d != db)
+	fprintf(stdout, " out parameter error, sent: %f, got: %f\n", d, db);
+    if (d != dr)
+	fprintf(stdout, " result error, sent: %f, got: %f\n", d, dr);
+    return -1;
+}    
+
+static int char_test(IC_Env *env)
+{
+    char c = 'g', co, cr;
+
+    /* char test */
+    fprintf(stdout, "\n======== m_i_char test ======\n\n");
+    cr = m_i_char_test(NULL, c, &co, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(c == co && c == cr);
+    if (c !=co) 
+	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", c, co);
+    if (c != cr)
+	fprintf(stdout, " result error, sent: %c, got: %c\n", c, cr);
+    return -1;
+}
+
+static int wchar_test(IC_Env *env)
+{
+    CORBA_wchar wc = 103, wco, wcr;
+
+    fprintf(stdout, "\n======== m_i_wchar test ======\n\n");
+    wcr = m_i_wchar_test(NULL, wc, &wco, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(wc == wco && wc == wcr);
+    if (wc != wco)
+	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
+		wc, wco);
+    if (wc != wcr)
+	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
+		wc, wcr);
+    return -1;
+}    
+
+static int octet_test(IC_Env *env)
+{
+    char o ='r', oo, or;
+ 
+    fprintf(stdout, "\n======== m_i_octet test ======\n\n");
+    or = m_i_octet_test(NULL, o, &oo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(o == oo && o == or);
+    if (o != oo)
+	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", o, oo);
+    if (o != or)
+	fprintf(stdout, " result error, sent: %c, got: %c\n", o, or);
+    return -1;
+}    
+
+static int bool_test(IC_Env *env)
+{
+    unsigned char i = 0, io, ir;	
+
+    fprintf(stdout, "\n======== m_i_bool test ======\n\n");
+    ir = m_i_bool_test(NULL, i, &io, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(i == io && i == ir);
+    if (i != io)
+	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", i, io);
+    if (i != ir)
+	fprintf(stdout, " result error, sent: %d, got: %d\n", i, ir);
+    return -1;
+}
+
+static int struct_test(IC_Env *env)
+{
+    m_b b = {4711, 'a'}, bo, br;
+
+    fprintf(stdout, "\n======== m_i_struct test ======\n\n");
+    br = m_i_struct_test(NULL, &b, &bo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_b(&b, &bo) && cmp_b(&b, &br));
+    if (!cmp_b(&b, &bo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_b(&b);
+	fprintf(stdout, " got:\n");
+	print_b(&bo);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_b(&b, &br)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_b(&b);
+	fprintf(stdout, " got:\n");
+	print_b(&br);
+	fprintf(stdout, "\n");
+    }
+    return -1;
+}
+
+static int struct2_test(IC_Env *env)
+{
+    m_es esi = {m_peach, 5050}, eso, esr;
+
+    fprintf(stdout, "\n======== m_i_struct2 test ======\n\n");
+    esr = m_i_struct2_test(NULL, &esi, &eso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_es(&esi, &eso) && cmp_es(&esi, &esr));
+    if (!cmp_es(&esi, &eso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_es(&esi);
+	fprintf(stdout, " got:\n");
+	print_es(&eso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_es(&esi, &esr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_es(&esi);
+	fprintf(stdout, " got:\n");
+	print_es(&esr);
+	fprintf(stdout, "\n");
+    }
+    return -1;
+}
+
+
+static int seq1_test(IC_Env *env)
+{
+    m_bseq bs, *bso, *bsr;
+
+    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
+    bs._length = 3;
+    bs._buffer = ba;
+
+    fprintf(stdout, "\n======== m_i_seq1 test ======\n\n");
+    bsr = m_i_seq1_test(NULL, &bs, &bso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_bseq(&bs, bso) && cmp_bseq(&bs, bsr));
+    if (!cmp_bseq(&bs, bso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_bseq(&bs);
+	fprintf(stdout, " got:\n");
+	print_bseq(bso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_bseq(&bs, bsr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_bseq(&bs);
+	fprintf(stdout, " got:\n");
+	print_bseq(bsr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(bso);
+    CORBA_free(bsr);
+    return -1;
+}
+
+static int seq2_test(IC_Env *env)
+{
+    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
+    m_a a;
+    m_a aa[2];
+    m_aseq as, *aso, *asr;
+
+    a.l = 9999;
+    a.y._length = 3;
+    a.y._buffer = ba;
+    a.d = 66.89898989;
+
+    aa[0] = a;
+    aa[1] = a;
+    as._length = 2;
+    as._buffer = aa;
+
+    fprintf(stdout, "\n======== m_i_seq2 test ======\n\n");
+    asr = m_i_seq2_test(NULL, &as, &aso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_aseq(&as, aso) && cmp_aseq(&as, asr));
+    if (!cmp_aseq(&as, aso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_aseq(&as);
+	fprintf(stdout, " got:\n");
+	print_aseq(aso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_aseq(&as, asr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_aseq(&as);
+	fprintf(stdout, " got:\n");
+	print_aseq(asr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(aso);
+    CORBA_free(asr);
+    return -1;
+}
+
+static int seq3_test(IC_Env *env)
+{
+    m_lseq lsi, *lso, *lsr;
+    long al[500];
+    int i=0;
+    
+    for (i = 0; i < 500; i++)
+	al[i]=i;
+    lsi._length = 500;
+    lsi._buffer = al;
+
+    fprintf(stdout, "\n======== m_i_seq3 test ======\n\n");
+    lsr = m_i_seq3_test(NULL, &lsi, &lso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_lseq(&lsi, lso) && cmp_lseq(&lsi, lsr));
+    if (!cmp_lseq(&lsi, lso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_lseq(&lsi);
+	fprintf(stdout, " got:\n");
+	print_lseq(lso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_lseq(&lsi, lsr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_lseq(&lsi);
+	fprintf(stdout, " got:\n");
+	print_lseq(lsr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(lso);
+    CORBA_free(lsr);
+    return -1;
+}
+
+static int seq4_test(IC_Env *env)
+{
+    char *stra0[3] = {"a", "long", "time"}; 
+    char *stra1[3] = {"ago", "there", "was"}; 
+    char *stra2[3] = {"a", "buggy", "compiler"}; 
+    m_sstr3 str3s[3] = {{3, 3, stra0}, {3, 3, stra1}, {3, 3, stra2}};
+    m_ssstr3 str3ssi = {3, 3, str3s}; 
+    m_ssstr3 *str3sso, *str3ssr;
+
+    fprintf(stdout, "\n======== m_i_seq4 test ======\n\n");
+    str3ssr = m_i_seq4_test(NULL, &str3ssi, &str3sso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_ssstr3(&str3ssi, str3sso) && 
+		 cmp_ssstr3(&str3ssi, str3ssr));
+    if (!cmp_ssstr3(&str3ssi, str3sso)){
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_ssstr3(&str3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssstr3(str3sso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_ssstr3(&str3ssi, str3ssr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_ssstr3(&str3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssstr3(str3ssr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(str3sso);
+    CORBA_free(str3ssr);
+    return -1;
+}
+
+static int seq5_test(IC_Env *env)
+{
+    m_arr3 arr3a[3] = {
+	{4711, 18931947, 3}, 
+	{4711, 18931947, 3},
+	{4711, 18931947, 3}};
+    m_sarr3 arr3sa[3] = {{3, 3, arr3a}, {3, 3, arr3a}, {3, 3, arr3a}};
+    m_ssarr3 arr3ssi = {3, 3, arr3sa};
+    m_ssarr3 *arr3sso;
+    m_ssarr3 *arr3ssr;
+
+    fprintf(stdout, "\n======== m_i_seq5 test ======\n\n");
+    arr3ssr = m_i_seq5_test(NULL, &arr3ssi, &arr3sso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_ssarr3(&arr3ssi, arr3sso) &&
+		 cmp_ssarr3(&arr3ssi, arr3ssr));
+    if (!cmp_ssarr3(&arr3ssi, arr3sso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_ssarr3(&arr3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssarr3(arr3sso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_ssarr3(&arr3ssi, arr3ssr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_ssarr3(&arr3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssarr3(arr3ssr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(arr3sso);
+    CORBA_free(arr3ssr);
+    return -1;
+}
+
+static int array1_test(IC_Env *env)
+{
+    int i;
+    long al[500];
+    m_arr1 alo;
+    m_arr1_slice* alr;
+    
+    for (i = 0; i < 500; i++)
+	al[i]=i;
+
+    fprintf(stdout, "\n======== m_i_array1 test ======\n\n");
+    alr = m_i_array1_test(NULL, al, alo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_arr1(al, alo) && cmp_arr1(al, alr));
+    if (!cmp_arr1(al, alo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_arr1(al);
+	fprintf(stdout, " got:\n");
+	print_arr1(alo);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_arr1(al,alr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_arr1(al);
+	fprintf(stdout, " got:\n");
+	print_arr1(alr);
+	fprintf(stdout, "\n");
+    }
+    free(alo);
+    free(alr);
+    return -1;
+}   
+
+static int array2_test(IC_Env *env)
+{
+    long dl[2][3] = {{11, 2, 7}, {22, 8 ,13}};
+    m_dd dlo;
+    m_dd_slice* dlr;
+
+    fprintf(stdout, "\n======== m_i_array2 test ======\n\n");
+    dlr = m_i_array2_test(NULL, dl, dlo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_dd(dl,dlo) && cmp_dd(dl,dlr));
+    if (!cmp_dd(dl,dlo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_dd(dl);
+	fprintf(stdout, " got:\n");
+	print_dd(dlo);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_dd(dl,dlr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_dd(dl);
+	fprintf(stdout, " got:\n");
+	print_dd(dlr);
+	fprintf(stdout, "\n");
+    }
+    free(*dlr);
+    return -1;
+}
+
+static int enum_test(IC_Env *env)
+{
+    m_fruit ei = m_banana, eo, er;
+
+    fprintf(stdout, "\n======== m_i_enum test ======\n\n");
+    er = m_i_enum_test(NULL, ei, &eo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ei == eo && ei == er);
+    if (ei != eo)
+	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", ei, eo);
+    if (ei != er)
+	fprintf(stdout, " result error, sent: %d, got: %d\n", ei, er);
+    return -1;
+}
+
+static int string1_test(IC_Env *env)
+{
+    char* si = longtext;
+    char* so;
+    char* sr;
+
+    fprintf(stdout, "\n======== m_i_string1 test ======\n\n");
+    sr = m_i_string1_test(NULL, si, &so, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, sr));
+    if (!cmp_str(si, so))
+	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
+    if (!cmp_str(si, sr))
+	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
+    CORBA_free(so);
+    CORBA_free(sr);
+    return -1;
+}
+  
+static int string2_test(IC_Env *env)
+{
+    char* sa[3] = {"hello", "foo", "bar"};
+    m_sseq ssi = {3, 3, sa};
+    m_sseq *sso, *ssr;
+
+    fprintf(stdout, "\n======== m_i_string2 test ======\n\n");
+    ssr = m_i_string2_test(NULL, &ssi, &sso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_sseq(&ssi, sso) && cmp_sseq(&ssi, sso));
+    if (!cmp_sseq(&ssi, sso)) {
+	fprintf(stdout, " out parameter error, sent:\n"); 
+	print_sseq(&ssi); 
+	fprintf(stdout, "got:\n");
+	print_sseq(sso); 
+    } 
+    if (!cmp_sseq(&ssi, ssr)) {
+	fprintf(stdout, " result error, sent:\n"); 
+	print_sseq(&ssi); 
+	fprintf(stdout, "got:\n"); 
+	print_sseq(ssr); 
+    }    
+    CORBA_free(sso);
+    CORBA_free(ssr);
+    return -1;
+}
+ 
+static int string3_test(IC_Env *env)
+{
+    char* si = longtext;
+    char* so;
+    char* sr;
+
+    fprintf(stdout, "\n======== m_i_string3 test ======\n\n");
+    sr = m_i_string3_test(NULL, si, &so, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, so));
+    if (!cmp_str(si, so))
+	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
+    if (!cmp_str(si, sr))
+	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
+    CORBA_free(so);
+    CORBA_free(sr);
+    return -1;
+}
+
+static int string4_test(IC_Env *env)
+{
+    char as1[100] = "a string", as2[200] = "help", as3[200] = "hello there";
+    m_strRec stri = { 1,	/* dd */
+		      as1,	/* str4 */
+		      {{'a', 'k'}, {'z', 'g'}, {'n', 'q'}}, /* str7 */
+		      {3, 3, "buf"}, /* str5 */
+		      as2,	/* str6 */
+		      {'m', 'f', 'o'}, /* str8 */
+		      as3,	/* str9 */
+		      {3, 3, "stu"} /* str10 */
+    };
+    m_strRec *stro, *strr;
+
+    fprintf(stdout, "\n======== m_i_string4 test ======\n\n");
+    strr = m_i_string4_test(NULL, &stri, &stro, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_strRec(&stri,stro) && cmp_strRec(&stri,strr));
+    if (!cmp_strRec(&stri,stro)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_strRec(&stri);
+	fprintf(stdout, " got:\n");
+	print_strRec(stro);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_strRec(&stri,strr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_strRec(&stri);
+	fprintf(stdout, " got:\n");
+	print_strRec(strr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(stro);
+    CORBA_free(strr);
+    return -1;
+}
+
+
+static int pid_test(IC_Env *env)
+{
+    erlang_pid pid = {"", 7, 0, 0}, pido, pidr;
+
+    strcpy(pid.node, this_node), /* this currently running node */
+    fprintf(stdout, "\n======== m_i_pid test ======\n\n");
+    pidr = m_i_pid_test(NULL, &pid, &pido, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_pid(&pid, &pido) && cmp_pid(&pid, &pidr));
+    if (!cmp_pid(&pid, &pido)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_pid(&pid);
+	fprintf(stdout, "got:\n");
+	print_pid(&pido);
+    }
+    if (!cmp_pid(&pid, &pidr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_pid(&pid);
+	fprintf(stdout, "got:\n");
+	print_pid(&pidr);
+    }
+    return -1;
+}
+
+static int port_test(IC_Env *env)
+{
+    erlang_port porti = {"node", 5, 1}, porto, portr;
+
+    fprintf(stdout, "\n======== m_i_port test ======\n\n");
+    portr = m_i_port_test(NULL, &porti, &porto, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_port(&porti, &porto) && cmp_port(&porti, &portr));
+    if (!cmp_port(&porti, &porto)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_port(&porti);
+	fprintf(stdout, "got:\n");
+	print_port(&porto);
+    }
+    if (!cmp_port(&porti, &portr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_port(&porti);
+	fprintf(stdout, "got:\n");
+	print_port(&portr);
+    }
+    return -1;
+}
+
+static int ref_test(IC_Env *env)
+{
+    erlang_ref refi = { "node1", 3, {1, 2, 3}, 1},  
+	refo, refr;
+
+    fprintf(stdout, "\n======== m_i_ref test ======\n\n");
+    refr = m_i_ref_test(NULL, &refi, &refo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_ref(&refi, &refo) && cmp_ref(&refi, &refr));
+    if (!cmp_ref(&refi, &refo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_ref(&refi);
+	fprintf(stdout, "got:\n");
+	print_ref(&refo);
+    }
+    if (!cmp_ref(&refi, &refr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_ref(&refi);
+	fprintf(stdout, "got:\n");
+	print_ref(&refr);
+    }
+    return -1;
+}
+
+static int term_test(IC_Env *env)
+{
+    ETERM *ti, *to, *tr;
+
+    ti = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
+
+    fprintf(stdout, "\n======== m_i_term test ======\n\n");
+    tr = m_i_term_test(NULL, ti, &to, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(erl_match(ti, to) && erl_match(ti, tr));
+    if (!erl_match(ti, to)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_term(ti);
+	fprintf(stdout, "got:\n");
+	print_term(to);
+    }
+    if (!erl_match(ti, tr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_term(ti);
+	fprintf(stdout, "got:\n");
+	print_term(tr);
+    }
+    erl_free_term(ti);
+    erl_free_term(to);
+    erl_free_term(tr);
+    return -1;
+}
+
+static int typedef_test(IC_Env *env)
+{
+    m_banan mbi, mbo;		/* erlang_port */
+    m_apa mai;			/* ETERM* */
+    m_apa mao = NULL;
+    long tl;
+
+    strcpy(mbi.node,"node");
+    mbi.id = 15;
+    mbi.creation = 1;
+
+    fprintf(stdout, "\n======== m_i_typedef test ======\n\n");
+    mai = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
+    tl = m_i_typedef_test(NULL, mai, &mbi, &mao, &mbo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(erl_match(mai, mao) && cmp_port(&mbi, &mbo) && tl == 4711);
+    if (!erl_match(mai, mao)) {
+	fprintf(stdout, " out parameter error (term), sent:\n");
+	print_term(mai);
+	fprintf(stdout, "got:\n");
+	print_term(mao);
+    }
+    if (!cmp_port(&mbi, &mbo)) {
+	fprintf(stdout, " out parameter error (port), sent:\n");
+	print_port(&mbi);
+	fprintf(stdout, "got:\n");
+	print_port(&mbo);
+    }
+    if (tl != 4711) {
+	fprintf(stdout, " result error, sent: 4711, got %ld\n", tl);
+    }
+    erl_free_term(mai);
+    erl_free_term(mao);
+    return -1;
+} 
+  
+static int inline_sequence_test(IC_Env *env)
+{
+    int i;
+    long al[500];
+    m_s isi = {4711, {500, 10, al}},  
+	*iso, *isr;
+
+    for (i = 0; i < 500; i++)
+	al[i]=i;
+    fprintf(stdout, "\n======== m_i_inline_sequence test ======\n\n");
+    isr = m_i_inline_sequence_test(NULL, &isi, &iso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_s(&isi, iso) && cmp_s(&isi, isr));
+    if (!cmp_s(&isi, iso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_s(&isi);
+	fprintf(stdout, "got:\n");
+	print_s(iso);
+    }
+    if (!cmp_s(&isi, isr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_s(&isi);
+	fprintf(stdout, "got:\n");
+	print_s(isr);
+    }
+    CORBA_free(iso);
+    CORBA_free(isr);
+    return -1;
+}
+
+static int term_sequence_test(IC_Env *env)
+{
+    ETERM* et_array[4] = {
+	erl_format("[{apa, 1, 23}, \"string\", {1.23, 45}]"),
+	erl_format("[{banan, 1, 23}, \"string\", {1.23, 45}]"),
+	erl_format("[{apelsin, 1, 23}, \"string\", {1.23, 45}]"),
+	erl_format("[{mango, 1, 23}, \"string\", {1.23, 45}]")};
+    m_etseq etsi = {4, 4, et_array}, *etso, *etsr;
+
+    fprintf(stdout, "\n======== m_i_term_sequence test ======\n\n");
+    etsr = m_i_term_sequence_test(NULL, &etsi, &etso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_etseq(&etsi, etso) && cmp_etseq(&etsi, etsr));
+    if (!cmp_etseq(&etsi, etso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_etseq(&etsi);
+	fprintf(stdout, "got:\n");
+	print_etseq(etso);
+    }
+    if (!cmp_etseq(&etsi, etsr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_etseq(&etsi);
+	fprintf(stdout, "got:\n");
+	print_etseq(etsr);
+    }
+    free_etseq_buf(&etsi);
+    free_etseq_buf(etso);
+    free_etseq_buf(etsr);
+    CORBA_free(etso);
+    CORBA_free(etsr);
+    return -1;
+}
+
+static int term_struct_test(IC_Env *env)
+{
+    m_et eti = { erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]"), 
+		 121212 };
+    m_et eto, etr;
+
+    fprintf(stdout, "\n======== m_i_term_struct test ======\n\n");
+    etr = m_i_term_struct_test(NULL, &eti, &eto, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_et(&eti, &eto) && cmp_et(&eti, &etr));
+    if (!cmp_et(&eti, &eto)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_et(&eti);
+	fprintf(stdout, "got:\n");
+	print_et(&eto);
+    }
+    if (!cmp_et(&eti, &etr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_et(&eti);
+	fprintf(stdout, "got:\n");
+	print_et(&etr);
+    }
+    free_et(&eti);
+    free_et(&eto);
+    free_et(&etr);
+    return -1;
+}
+
+static int wstring1_test(IC_Env *env)
+{
+    CORBA_wchar wsi[] = {100, 101, 102, 103, 104, 0}, *wso, *wsr;
+
+    fprintf(stdout, "\n======== m_i_wstring1 test ======\n\n");
+    wsr = m_i_wstring1_test(NULL, wsi, &wso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_wstr(wsi, wso) && cmp_wstr(wsi, wsr));
+    if (!cmp_wstr(wsi, wso)) {
+	fprintf(stdout, " out parameter error, sent: \n");
+	print_wstr(wsi);
+	fprintf(stdout, "got:\n");
+	print_wstr(wso);
+    }
+    if (!cmp_wstr(wsi, wsr)) {
+	fprintf(stdout, " result error, sent: \n");
+	print_wstr(wsi);
+	fprintf(stdout, "got:\n");
+	print_wstr(wsr);
+    }
+    CORBA_free(wso);
+    CORBA_free(wsr);
+    return -1;
+}
+
+/* Compare functions */
+static int cmp_aseq(m_aseq *a1, m_aseq *a2)
+{
+    int i;
+
+    if (a1->_length != a2->_length)
+	return 0;
+    for (i = 0; i < a1->_length; i++)
+	if (cmp_a(&(a1->_buffer[i]), &(a2->_buffer[i])) == 0)
+	    return 0;
+    return 1;
+}
+
+static int cmp_a(m_a *a1, m_a *a2)
+{
+    return a1->l == a2->l && 
+	a1->d == a2->d && 
+	cmp_bseq(&a1->y, &a2->y);
+}
+
+static int cmp_bseq(m_bseq *b1, m_bseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (cmp_b(&(b1->_buffer[i]), &(b2->_buffer[i])) == 0)
+	    return 0;
+    return 1;
+}
+
+static int cmp_b(m_b *b1, m_b *b2)
+{
+    return b1->l == b2->l && b1->c == b2->c;
+}
+
+static int cmp_lseq(m_lseq *b1, m_lseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (b1->_buffer[i] != b2->_buffer[i])
+	    return 0;
+    return 1;
+}
+
+static int cmp_etseq(m_etseq *b1, m_etseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (!erl_match(b1->_buffer[i], b2->_buffer[i]))
+	    return 0;
+    return 1;
+}
+
+static int cmp_et(m_et* b1, m_et *b2)
+{
+    return erl_match(b1->e, b2->e) && b1->l == b2->l;
+}
+
+static int cmp_es(m_es *b1, m_es *b2)
+{
+    return b1->f == b2->f && b1->l == b2->l;
+}
+
+static int cmp_arr1(m_arr1 b1, m_arr1 b2)
+{
+    int i;
+
+    for (i = 0; i < 500; i++)
+	if (b1[i] != b2[i])
+	    return 0;
+    return 1; 
+}
+
+static int cmp_dd(m_dd b1, m_dd b2)
+{
+
+    int i, j;
+
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    if (b1[i][j] != b2[i][j])
+		return 0;
+    return 1; 
+}
+
+
+
+static int cmp_strRec(m_strRec *b1, m_strRec *b2)
+{
+    int i, j;
+
+    if (b1->bb != b2->bb) 
+	return 0;
+    if (!cmp_str(b1->str4,b2->str4))
+	return 0;
+    if (b1->str5._length != b2->str5._length)
+	return 0;
+    for (j = 0; j < b1->str5._length; j++)
+	if (b1->str5._buffer[j] != b2->str5._buffer[j])
+	    return 0;
+    if (!cmp_str(b1->str6,b2->str6))
+	return 0;
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    if (b1->str7[i][j] != b2->str7[i][j])
+		return 0;
+    for (j = 0; j < 3; j++)
+	if (b1->str8[j] != b2->str8[j])
+	    return 0;
+    if (!cmp_str(b1->str9,b2->str9))
+	return 0;
+    if (b1->str10._length != b2->str10._length)
+	return 0;
+    for (j = 0; j < b1->str10._length; j++)
+	if (b1->str10._buffer[j] != b2->str10._buffer[j])
+	    return 0;
+    return 1; 
+}
+
+
+static int cmp_sseq(m_sseq *b1, m_sseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (!cmp_str(b1->_buffer[i], b2->_buffer[i]))
+	    return 0;
+    return 1;
+}
+
+
+static int cmp_pid(erlang_pid *p1, erlang_pid *p2)
+{
+    return cmp_str(p1->node,p2-> node) && 
+	p1->num == p2->num && 
+	p1->serial == p2->serial &&
+	p1->creation == p2->creation;
+}
+
+static int cmp_port(erlang_port *p1, erlang_port *p2)
+{
+    return cmp_str(p1->node,p2-> node) && p1->id == p2->id;
+}
+
+static int cmp_ref(erlang_ref *p1, erlang_ref *p2)
+{
+    return cmp_str(p1->node, p2->node) && 
+	p1->len == p2->len &&
+	(p1->len < 1 || p1->n[0] == p2->n[0]) &&
+	(p1->len < 2 || p1->n[1] == p2->n[1]) &&
+	(p1->len < 3 || p1->n[2] == p2->n[2]);
+}
+
+static int cmp_s(m_s *b1, m_s *b2)
+{
+    int i;
+
+    if (b1->l != b2->l)
+	return 0;
+    if (b1->sl._length != b2->sl._length)
+	return 0;
+    for (i = 0; i < b1->sl._length; i++)
+	if (b1->sl._buffer[i] != b2->sl._buffer[i])
+	    return 0;
+    return 1;
+}
+
+
+static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2)
+{
+    int i,j;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++) {
+	if (b1->_buffer[i]._length != b2->_buffer[i]._length)
+	    return 0;
+	for (j = 0; j < b1->_buffer[i]._length; j++)
+	    if (!cmp_str(b1->_buffer[i]._buffer[j], 
+		      b2->_buffer[i]._buffer[j]))
+		return 0;
+    }
+    return 1;
+}
+
+
+
+static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++) {
+	if (!cmp_sarr3(&b1->_buffer[i], &b2->_buffer[i]))
+	    return 0;
+    }
+    return 1;
+}
+
+static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++) {
+	if (!cmp_arr3(b1->_buffer[i], b2->_buffer[i]))
+	    return 0;
+    }
+    return 1;
+}
+
+static int cmp_arr3(m_arr3 b1, m_arr3 b2)
+{
+    int i;
+
+    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) {
+	if (b1[i] != b2[i])
+	    return 0;
+    }
+    return 1;
+}
+
+/* Print functions */
+static void print_aseq(m_aseq *a)
+{
+    int i;
+    fprintf(stdout, "\nm_aseq size: %ld  --------\n", a->_length);
+    for (i = 0; i < a->_length; i++)
+	print_a(&(a->_buffer[i]));
+}
+
+static void print_a(m_a *a)
+{
+    fprintf(stdout, "\nm_a --------\n l: %ld\n d:%f\n", a->l, a->d);
+    print_bseq(&a->y);
+}
+
+static void print_bseq(m_bseq *b)
+{
+    int i;
+
+    fprintf(stdout, "\nm_bseq size: %ld  --------\n",b->_length);
+    for (i = 0; i < b->_length; i++)
+	print_b(&(b->_buffer[i]));
+}
+
+static void print_lseq(m_lseq *b)
+{
+    int i;
+
+    fprintf(stdout, "\nm_lseq size: %ld  --------\n",b->_length);
+    for (i = 0; i < b->_length; i++)
+	fprintf(stdout, "[%d]: %ld\n", i, b->_buffer[i]);
+}
+
+static void print_b(m_b *b)
+{
+    fprintf(stdout, "\nm_b --------\n l: %ld\n c: %c\n", b->l, b->c);
+}
+
+
+static void print_etseq(m_etseq *b)
+{
+    int i;
+
+    for (i = 0; i < b->_length; i++) {
+	fprintf(stdout, "[%d]:\n", i);
+	erl_print_term(stdout, b->_buffer[i]);
+    }
+}
+
+
+static void print_et(m_et* b)
+{
+    fprintf(stdout, "\net struct --------\n");
+    erl_print_term(stdout, b->e);
+    fprintf(stdout, "long: %ld\n", b->l);
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_es(m_es *b)
+{
+    fprintf(stdout, "\nm_es --------\n f: %d\n l: %ld\n", b->f, b->l);
+}
+
+
+static void print_arr1(long a[10])
+{
+    int i;
+
+    for (i = 0; i < 10; i++)
+	fprintf(stdout, "\n[%d]: %ld\n", i, a[i]);
+}
+
+static void print_dd(long a[2][3])
+{
+    int i, j;
+
+    fprintf(stdout, "\nlong dd[2][3] --------\n");
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    fprintf(stdout, "\n[%d][%d]: %ld\n", i, j, a[i][j]);
+}
+
+
+static void print_strRec(m_strRec* sr)
+{
+    int i, j;
+
+    fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
+    fprintf(stdout, "string str4 : %s\n",sr->str4);
+    fprintf(stdout, "str7[2][3] :\n");
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
+    fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
+    for (j = 0; j < sr->str5._length; j++)
+	fprintf(stdout, "str5._buffer[%d]: %c\n", j, sr->str5._buffer[j]);
+    fprintf(stdout, "string str6 : %s\n",sr->str6);
+    fprintf(stdout, "str8 :\n");
+    for (j = 0; j < 3; j++)
+	fprintf(stdout, "str8[%d]: %c\n", j, sr->str8[j]);
+    fprintf(stdout, "string str9 : %s\n",sr->str9);
+    fprintf(stdout, "str10._length : %ld\n",sr->str10._length);
+    for (j = 0; j < sr->str10._length; j++)
+	fprintf(stdout, "str10._buffer[%d]: %c\n", j, sr->str10._buffer[j]);
+}
+
+static void print_sseq(m_sseq *b)
+{
+    int i;
+
+    fprintf(stdout, "\nm_sseq size: %ld  --------\n",b->_length);
+    for (i = 0; i < b->_length; i++)
+	fprintf(stdout, "%s\n", b->_buffer[i]);
+
+}
+
+
+static void print_pid(erlang_pid *p)
+{
+    fprintf(stdout, "\nerlang_pid --------\n node: %s\n num: %d\n "
+	    "serial: %d\n creation: %d\n", 
+	    p->node, p->num, p->serial, p->creation);
+}
+
+static void print_port(erlang_port *p)
+{
+    fprintf(stdout, "\nerlang_port --------\n node: %s\n id: %d\n "
+	    "creation: %d\n", p->node, p->id, p->creation);
+}
+
+static void print_ref(erlang_ref *p)
+{
+    fprintf(stdout, "\nerlang_ref --------\n node: %s\n len: %d\n "
+	    "n[0]: %d\n n[1]: %d\n n[2]: %d\n creation: %d\n", 
+	    p->node, p->len, p->n[0], p->n[1], p->n[2], p->creation);
+}
+
+static void print_term(ETERM *t)
+{
+    fprintf(stdout, "\nETERM --------\n");
+    erl_print_term(stdout, t);
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_s(m_s *p)
+{
+    int i;
+
+    fprintf(stdout, "\n%ld\n", p->l);
+    for (i = 0; i < p->sl._length; i++)
+	fprintf(stdout, "\n[%d]: %ld\n", i, p->sl._buffer[i]);
+}
+
+
+static void print_ssstr3(m_ssstr3 *b1)
+{
+    int i,j;
+
+    fprintf(stdout, "\nSSSTR3 --------\n");
+    fprintf(stdout,"b1->_length = %ld\n",b1->_length);
+    for (i = 0; i < b1->_length; i++) {
+	fprintf(stdout,"\nb1->_buffer[%d]._length %ld\n",
+		i, b1->_buffer[i]._length);
+	for (j = 0; j < b1->_buffer[i]._length; j++)
+	    fprintf(stdout,"b1->_buffer[%d]._buffer[%d] = %s\n",
+		    i, j, b1->_buffer[i]._buffer[j]);
+    }
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_wstr(CORBA_wchar *ws)
+{
+    int i = 0;
+
+    fprintf(stdout, "\nwstr --------\n");
+    while (ws[i]) {
+	fprintf(stdout, "[%d]: %ld\n", i, ws[i]);
+	i++;
+    }
+    fprintf(stdout, "\n--------\n");
+}
+
+
+static void print_ssarr3(m_ssarr3 *b1)
+{
+    int i;
+
+    fprintf(stdout, "\nssarr3 --------\n");
+    fprintf(stdout,"length: %ld\n",b1->_length);
+    fprintf(stdout, "buffer:\n");
+    for (i = 0; i < b1->_length; i++) 
+	print_sarr3(&b1->_buffer[i]); 
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_sarr3(m_sarr3 *b1)
+{
+    int i;
+
+    fprintf(stdout, "\nsarr3 --------\n");
+    fprintf(stdout,"length: %ld\n",b1->_length);
+    fprintf(stdout, "buffer:\n");
+    for (i = 0; i < b1->_length; i++) 
+	print_arr3(b1->_buffer[i]); 
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_arr3(m_arr3 b1)
+{
+    int i;
+
+    fprintf(stdout, "\narr3 --------\n");
+    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) 
+	fprintf(stdout, "%ld ", b1[i]); 
+    fprintf(stdout, "\n--------\n");
+}
+
+static void free_etseq_buf(m_etseq *b)
+{
+    int i;
+
+    for (i = 0; i < b->_length; i++)
+	erl_free_term(b->_buffer[i]);
+}
+
+static void free_et(m_et* b)
+{
+    erl_free_term(b->e);
+}
+
+static void showtime(MyTimeval *start, MyTimeval *stop)
+{
+    MyTimeval elapsed;
+
+    elapsed.tv_sec = stop->tv_sec - start->tv_sec;
+    elapsed.tv_usec = stop->tv_usec - start->tv_usec;
+    while (elapsed.tv_usec < 0) {
+	elapsed.tv_sec -= 1;
+	elapsed.tv_usec += 1000000;
+    }
+    fprintf(stderr,"%ld.%06ld seconds\n",elapsed.tv_sec, elapsed.tv_usec);
+}
+
+static void my_gettimeofday(MyTimeval *tv)
+#ifdef __WIN32__
+#define EPOCH_JULIAN_DIFF 11644473600i64
+{
+    SYSTEMTIME t;
+    FILETIME ft;
+    LONGLONG lft;
+
+    GetSystemTime(&t);
+    SystemTimeToFileTime(&t, &ft);
+    memcpy(&lft, &ft, sizeof(lft));
+    tv->tv_usec = (long) ((lft / 10i64) % 1000000i64);
+    tv->tv_sec = (long) ((lft / 10000000i64) - EPOCH_JULIAN_DIFF);
+}
+#elif defined VXWORKS
+{
+    int rate = sysClkRateGet(); /* Ticks per second */
+    unsigned long ctick = tickGet();
+    tv->tv_sec = ctick / rate; /* secs since reboot */
+    tv->tv_usec = ((ctick - (tv->tv_sec * rate))*1000000)/rate;
+}
+#else
+{
+    gettimeofday(tv, NULL);
+}
+#endif
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/c_erl_test.idl b/lib/ic/test/c_client_erl_server_SUITE_data/c_erl_test.idl
new file mode 100644
index 0000000000..ccb8f54508
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_SUITE_data/c_erl_test.idl
@@ -0,0 +1,174 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 2001-2010. 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%
+
+#include "erlang.idl"
+
+
+const short TestConst = 1;
+
+module m {
+
+  const short TestConst = 2;
+
+  struct b {
+    long l;
+    char c;
+  }; 
+
+  struct simple {
+    long l;
+    b    b_t;
+  };
+
+  enum fruit {orange, banana, apple, peach, pear};
+
+  typedef sequence<long> lseq;
+
+  typedef sequence<b> bseq;
+
+  struct a {
+    long l;
+    bseq y;
+    double d;
+  };
+
+  typedef sequence<a> aseq;
+
+  typedef sequence<string> sseq;
+  typedef string str;
+  typedef long myLong;
+
+  typedef long arr1[500], dd[2][3];
+
+  typedef erlang::term apa;
+  typedef erlang::port banan;
+
+  typedef sequence<erlang::term> etseq;
+
+  struct s {
+    long l;
+    sequence<long> sl;
+  };
+
+  struct es {
+    fruit f;
+    myLong l;
+  };
+
+  struct et {
+    erlang::term e;
+    long l;
+  };
+
+
+  typedef sequence<char> str1;
+  typedef string<12> str2;
+  typedef char str3[3];  	
+
+  typedef sequence<string> sstr3;  // sequence of string
+  typedef sequence<sstr3> ssstr3;  // sequence of sequences of strings
+
+  typedef long  arr3[3];           // array of long
+  typedef sequence<arr3> sarr3;    // sequence of array
+  typedef sequence<sarr3> ssarr3;  // sequence of sequnces of arrays of strings
+    
+ struct strRec{
+    boolean bb;
+    string str4;
+    long str7[3][2];
+    sequence<char> str5; 
+    string<12> str6;
+    str3 str8;
+    str2 str9;
+    str1 str10; 	
+  };
+
+
+  struct dyn {
+    long l;
+    sequence<long> sl;
+  };
+  typedef dyn arr2[1][2];
+
+
+  interface i {
+
+    const short TestConst = 3;	
+
+    //arr2 suck(in arr2 x, out arr2 y );
+
+    ///////////////////////////////// attribute long l;
+
+    // simple types
+    void void_test();
+    long long_test(in long a, out long a1);
+    long long longlong_test(in long long a, out long long a1);	
+    unsigned short ushort_test(in unsigned short a, out unsigned short a1);
+    unsigned long ulong_test(in unsigned long a, out unsigned long a1);
+    unsigned long long ulonglong_test(in unsigned long long a, out unsigned long long a1);
+    double double_test(in double a, out double a1);
+    char char_test(in char a, out char a1);
+    wchar wchar_test(in wchar a, out wchar a1);
+    octet octet_test(in octet a, out octet a1);
+    boolean bool_test(in boolean a, out boolean a1);
+
+    // Seq. and struct tests
+    b struct_test(in b a, out b a1);
+    es struct2_test(in es a, out es a1);
+    //simple struct3_test(in simple x, out simple y);	
+    bseq seq1_test(in bseq a, out bseq a1);
+    aseq seq2_test(in aseq a, out aseq a1);
+    lseq seq3_test(in lseq a, out lseq a1);
+    ssstr3 seq4_test(in ssstr3 a, out ssstr3 a1);
+    ssarr3 seq5_test(in ssarr3 a, out ssarr3 a1);
+
+    // Array tests
+    arr1 array1_test(in arr1 a, out arr1 a1);
+    dd array2_test(in dd a, out dd a1);
+
+    // enum test
+    fruit enum_test(in fruit a, out fruit a1);
+
+    // string tests
+    string string1_test(in string a, out string a1);
+    wstring wstring1_test(in wstring a, out wstring a1);
+    sseq string2_test(in sseq a, out sseq a1);
+    str string3_test(in str a, out str a1);
+    strRec string4_test(in strRec a, out strRec a1);
+
+    // Special erlang types
+    erlang::pid pid_test(in erlang::pid a, out erlang::pid a1);
+    erlang::port port_test(in erlang::port a, out erlang::port a1);
+    erlang::ref ref_test(in erlang::ref a, out erlang::ref a1);
+    erlang::term term_test(in erlang::term a, out erlang::term a1);
+    
+    // typedef test
+    long typedef_test(in apa a, in banan b, out apa a1, out banan b1);
+
+    // inlined seq. test
+    s inline_sequence_test(in s a, out s a1);
+
+    // term seq. test
+    etseq term_sequence_test(in etseq a, out etseq a1);
+    // term struct test
+    et term_struct_test(in et a, out et a1);
+   
+  };
+
+};
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/erl_server.erl b/lib/ic/test/c_client_erl_server_SUITE_data/erl_server.erl
new file mode 100644
index 0000000000..dffbbb059c
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_SUITE_data/erl_server.erl
@@ -0,0 +1,28 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2001-2009. 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(erl_server).
+
+-export([run/0, stop/0]).
+
+run() ->
+    m_i:oe_create().
+
+stop() ->
+   gen_server:cast(cidl_test, stop).
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/m_i_impl.erl b/lib/ic/test/c_client_erl_server_SUITE_data/m_i_impl.erl
new file mode 100644
index 0000000000..cfcaa793a5
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_SUITE_data/m_i_impl.erl
@@ -0,0 +1,161 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2001-2009. 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(m_i_impl).
+-include("m.hrl").
+
+-export([init/1, terminate/2, void_test/1, long_test/2, ushort_test/2,
+	 longlong_test/2, ulong_test/2, ulonglong_test/2,
+	 double_test/2, char_test/2, wchar_test/2, octet_test/2,
+	 bool_test/2, struct_test/2, struct2_test/2, seq1_test/2,
+	 seq2_test/2, seq3_test/2, seq4_test/2, seq5_test/2,
+	 array1_test/2, array2_test/2, enum_test/2, string1_test/2,
+	 string2_test/2, string3_test/2, string4_test/2, pid_test/2,
+	 port_test/2, ref_test/2, term_test/2, typedef_test/3,
+	 inline_sequence_test/2, '_set_l'/2, '_get_l'/1,
+	 term_struct_test/2, term_sequence_test/2, wstring1_test/2]).
+
+-define(PRINTDEBUG(Case),
+	io:format("erl_server: case: ~p~n"
+		  "erl_server: location: ~p~n", [Case, [?FILE, ?LINE]])).
+-define(PRINTDEBUG2(Case, Msg),
+	io:format("erl_server: case: ~p~n"
+		  "erl_server: Msg: ~p~n"
+		  "erl_server: location: ~p~n", [Case, Msg, [?FILE, ?LINE]])).
+
+init(Env) ->
+    {ok, []}.
+
+terminate(F, R) ->
+    ok.
+
+'_get_l'(State) ->
+    ?PRINTDEBUG("_get_l"),
+    {reply, State, State}.
+void_test(State) ->
+    ?PRINTDEBUG("void_test"),
+    {reply, ok, State}.
+
+'_set_l'(State, V) ->
+    ?PRINTDEBUG2("_set_l", V),
+    {reply, ok, V}.
+ushort_test(State, V) ->
+    ?PRINTDEBUG2("ushort_test", V),
+    {reply, {V, V}, State}.
+long_test(State, V) ->
+    ?PRINTDEBUG2("long_test", V),
+    {reply, {V, V}, State}.
+longlong_test(State, V) ->
+    ?PRINTDEBUG2("longlong_test", V),
+    {reply, {V, V}, State}.
+ulong_test(State, V) ->
+    ?PRINTDEBUG2("ulong_test", V),
+    {reply, {V, V}, State}.
+ulonglong_test(State, V) ->
+    ?PRINTDEBUG2("ulonglong_test", V),
+    {reply, {V, V}, State}.
+double_test(State, V) ->
+    ?PRINTDEBUG2("double_test", V),
+    {reply, {V, V}, State}.
+char_test(State, V) ->
+    ?PRINTDEBUG2("char_test", V),
+    {reply, {V, V}, State}.
+wchar_test(State, V) ->
+    ?PRINTDEBUG2("wchar_test", V),
+    {reply, {V, V}, State}.
+octet_test(State, V) ->
+    ?PRINTDEBUG2("octet_test", V),
+    {reply, {V, V}, State}.
+bool_test(State, V) ->
+    ?PRINTDEBUG2("bool_test", V),
+    {reply, {V, V}, State}.
+
+struct_test(State, V) ->
+    ?PRINTDEBUG2("struct_test", V),
+    {reply, {V, V}, State}.
+struct2_test(State, V) ->
+    ?PRINTDEBUG2("struct2_test", V),
+    {reply, {V, V}, State}.
+seq1_test(State, V) ->
+    ?PRINTDEBUG2("seq1_test", V),
+    {reply, {V, V}, State}.
+seq2_test(State, V) ->
+    ?PRINTDEBUG2("seq2_test", V),
+    {reply, {V, V}, State}.
+seq3_test(State, V) ->
+    ?PRINTDEBUG2("seq3_test", V),
+    {reply, {V, V}, State}.
+seq4_test(State, V) ->
+    ?PRINTDEBUG2("seq4_test", V),
+    {reply, {V, V}, State}.
+seq5_test(State, V) ->
+    ?PRINTDEBUG2("seq5_test", V),
+    {reply, {V, V}, State}.
+array1_test(State, V) ->
+    ?PRINTDEBUG2("array1_test", V),
+    {reply, {V, V}, State}.
+array2_test(State, V) ->
+    ?PRINTDEBUG2("array2_test", V),
+    {reply, {V, V}, State}.
+enum_test(State, V) ->
+    ?PRINTDEBUG2("enum_test", V),
+    {reply, {V, V}, State}.
+string1_test(State, V) ->
+    ?PRINTDEBUG2("string1_test", V),
+    {reply, {V, V}, State}.
+string2_test(State, V) ->
+    ?PRINTDEBUG2("string2_test", V),
+    {reply, {V, V}, State}.
+string3_test(State, V) ->
+    ?PRINTDEBUG2("string3_test", V),
+    {reply, {V, V}, State}.
+string4_test(State, V) ->
+    ?PRINTDEBUG2("string4_test", V),
+    {reply, {V, V}, State}.
+pid_test(State, V) ->
+    ?PRINTDEBUG2("pid_test", V),
+    {reply, {V, V}, State}.
+port_test(State, V) ->
+    ?PRINTDEBUG2("port_test", binary_to_list(term_to_binary(V))),
+    {reply, {V, V}, State}.
+ref_test(State, V) ->
+    ?PRINTDEBUG2("ref_test", binary_to_list(term_to_binary(V))),
+    {reply, {V, V}, State}.
+term_test(State, V) ->
+    ?PRINTDEBUG2("term_test", V),
+    {reply, {V, V}, State}.
+typedef_test(State, A, B) ->
+    ?PRINTDEBUG2("typedef_test", [A,B]),
+    {reply, {4711, A, B}, State}.
+inline_sequence_test(State, V) ->
+    ?PRINTDEBUG2("inline_sequence_test", V),
+    {reply, {V, V}, State}.
+term_sequence_test(State, V) ->
+    ?PRINTDEBUG2("term_sequence_test", V),
+    {reply, {V, V}, State}.
+term_struct_test(State, V) ->
+    ?PRINTDEBUG2("term_struct_test", V),
+    {reply, {V, V}, State}.
+wstring1_test(State, V) ->
+    ?PRINTDEBUG2("wstring1_test", V),
+    {reply, {V, V}, State}.
+
+
+
+
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE.erl b/lib/ic/test/c_client_erl_server_proto_SUITE.erl
new file mode 100644
index 0000000000..172e4de6d1
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE.erl
@@ -0,0 +1,332 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2004-2010. 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%
+%%
+%%
+
+%%----------------------------------------------------------------------
+%% Purpose : Test suite for c-client/erl-server
+%%----------------------------------------------------------------------
+
+-module(c_client_erl_server_proto_SUITE).
+-include_lib("common_test/include/ct.hrl").
+
+-export([init_per_testcase/2, end_per_testcase/2,
+	all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 void_test/1, long_test/1, long_long_test/1,
+	 unsigned_short_test/1, unsigned_long_test/1,
+	 unsigned_long_long_test/1, double_test/1, char_test/1,
+	 wchar_test/1, octet_test/1, bool_test/1, struct_test/1,
+	 struct2_test/1, seq1_test/1, seq2_test/1, seq3_test/1,
+	 seq4_test/1, seq5_test/1, array1_test/1, array2_test/1,
+	 enum_test/1, string1_test/1, string2_test/1, string3_test/1,
+	 string4_test/1, pid_test/1, port_test/1, ref_test/1, term_test/1,
+	 typedef_test/1, inline_sequence_test/1, term_sequence_test/1,
+	 term_struct_test/1, wstring1_test/1]).
+
+-define(DEFAULT_TIMEOUT, 20000).
+-define(PORT_TIMEOUT, 15000).
+-define(ERLANG_SERVER_NAME, idl_erlang_server).
+-define(C_CLIENT_NODE_NAME, c_client_idl_test).
+  
+%% Add/remove code path and watchdog before/after each test case.
+%%
+init_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:add_patha(DataDir),
+
+    %% Since other test suites use the module m_i, we have
+    %% to make sure we are using the right m_i module.
+    code:purge(m_i),
+    code:load_file(m_i),
+
+    WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
+    [{watchdog, WatchDog}| Config].
+
+end_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:del_path(DataDir),
+    WatchDog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(WatchDog).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [void_test, long_test, long_long_test,
+     unsigned_short_test, unsigned_long_test,
+     unsigned_long_long_test, double_test, char_test,
+     wchar_test, octet_test, bool_test, struct_test,
+     struct2_test, seq1_test, seq2_test, seq3_test,
+     seq4_test, seq5_test, array1_test, array2_test,
+     enum_test, string1_test, string2_test, string3_test,
+     string4_test, pid_test, port_test, ref_test, term_test,
+     typedef_test, inline_sequence_test, term_sequence_test,
+     term_struct_test, wstring1_test].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+array1_test(doc) -> "";
+array1_test(suite) -> [];
+array1_test(Config) ->
+    do_test(array1_test, Config). 
+
+array2_test(doc) -> "";
+array2_test(suite) -> [];
+array2_test(Config) ->
+    do_test(array2_test, Config).
+
+bool_test(doc) -> "";
+bool_test(suite) -> [];
+bool_test(Config) ->
+    do_test(bool_test, Config).
+
+char_test(doc) -> "";
+char_test(suite) -> [];
+char_test(Config) ->
+    do_test(char_test, Config).
+
+double_test(doc) -> "";
+double_test(suite) -> [];
+double_test(Config) ->
+    do_test(double_test, Config).
+
+enum_test(doc) -> "";
+enum_test(suite) -> [];
+enum_test(Config) ->
+    do_test(enum_test, Config).
+
+inline_sequence_test(doc) -> "";
+inline_sequence_test(suite) -> [];
+inline_sequence_test(Config) ->
+    do_test(inline_sequence_test, Config).
+
+long_long_test(doc) -> "";
+long_long_test(suite) -> [];
+long_long_test(Config) ->
+    do_test(long_long_test, Config).
+
+long_test(doc) -> "";
+long_test(suite) -> [];
+long_test(Config) ->
+    do_test(long_test, Config).
+
+octet_test(doc) -> "";
+octet_test(suite) -> [];
+octet_test(Config) ->
+    do_test(octet_test, Config).
+
+pid_test(doc) -> "";
+pid_test(suite) -> [];
+pid_test(Config) ->
+    do_test(pid_test, Config).
+
+port_test(doc) -> "";
+port_test(suite) -> [];
+port_test(Config) ->
+    do_test(port_test, Config).
+
+ref_test(doc) -> "";
+ref_test(suite) -> [];
+ref_test(Config) ->
+    do_test(ref_test, Config).
+
+seq1_test(doc) -> "";
+seq1_test(suite) -> [];
+seq1_test(Config) ->
+    do_test(seq1_test, Config).
+
+seq2_test(doc) -> "";
+seq2_test(suite) -> [];
+seq2_test(Config) ->
+    do_test(seq2_test, Config).
+
+seq3_test(doc) -> "";
+seq3_test(suite) -> [];
+seq3_test(Config) ->
+    do_test(seq3_test, Config).
+
+seq4_test(doc) -> "";
+seq4_test(suite) -> [];
+seq4_test(Config) ->
+    do_test(seq4_test, Config).
+
+seq5_test(doc) -> "";
+seq5_test(suite) -> [];
+seq5_test(Config) ->
+    do_test(seq5_test, Config).
+
+string1_test(doc) -> "";
+string1_test(suite) -> [];
+string1_test(Config) ->
+    do_test(string1_test, Config).
+
+string2_test(doc) -> "";
+string2_test(suite) -> [];
+string2_test(Config) ->
+    do_test(string2_test, Config).
+
+string3_test(doc) -> "";
+string3_test(suite) -> [];
+string3_test(Config) ->
+    do_test(string3_test, Config).
+
+string4_test(doc) -> "";
+string4_test(suite) -> [];
+string4_test(Config) ->
+    do_test(string4_test, Config).
+
+struct2_test(doc) -> "";
+struct2_test(suite) -> [];
+struct2_test(Config) ->
+    do_test(struct2_test, Config).
+
+struct_test(doc) -> "";
+struct_test(suite) -> [];
+struct_test(Config) ->
+    do_test(struct_test, Config).
+
+term_sequence_test(doc) -> "";
+term_sequence_test(suite) -> [];
+term_sequence_test(Config) ->
+    do_test(term_sequence_test, Config).
+
+term_struct_test(doc) -> "";
+term_struct_test(suite) -> [];
+term_struct_test(Config) ->
+    do_test(term_struct_test, Config).
+
+term_test(doc) -> "";
+term_test(suite) -> [];
+term_test(Config) ->
+    do_test(term_test, Config).
+
+typedef_test(doc) -> "";
+typedef_test(suite) -> [];
+typedef_test(Config) ->
+    do_test(typedef_test, Config).
+
+unsigned_long_long_test(doc) -> "";
+unsigned_long_long_test(suite) -> [];
+unsigned_long_long_test(Config) ->
+    do_test(unsigned_long_long_test, Config).
+
+unsigned_long_test(doc) -> "";
+unsigned_long_test(suite) -> [];
+unsigned_long_test(Config) ->
+    do_test(unsigned_long_test, Config).
+
+unsigned_short_test(doc) -> "";
+unsigned_short_test(suite) -> [];
+unsigned_short_test(Config) ->
+    do_test(unsigned_short_test, Config).
+
+void_test(doc) -> "";
+void_test(suite) -> [];
+void_test(Config) ->
+    do_test(void_test, Config).
+
+wchar_test(doc) -> "";
+wchar_test(suite) -> [];
+wchar_test(Config) ->
+    do_test(wchar_test, Config).
+
+wstring1_test(doc) -> "";
+wstring1_test(suite) -> [];
+wstring1_test(Config) ->
+    do_test(wstring1_test, Config).
+
+
+%% It is here that all tests really are done.
+%%
+     
+do_test(Case, Config) ->
+    %% Trap exits
+    process_flag(trap_exit, true),
+    %% Start the server
+    {ok, _Pid} = m_i:oe_create_link([], {local, ?ERLANG_SERVER_NAME}),
+    Node = atom_to_list(node()),
+    %% [NodeName, HostName] = string:tokens(Node, "@"),
+    DataDir = ?config(data_dir, Config),
+    %% io:format("~p: data directory: ~p~n", [?MODULE, DataDir]),
+    Cookie = atom_to_list(erlang:get_cookie()),
+    %% Start C-client node as a port program.  
+    Cmd = filename:join([DataDir, "c_client"]) ++
+	" -this-node-name " ++ atom_to_list(?C_CLIENT_NODE_NAME) ++
+	" -peer-node " ++ Node ++
+	" -peer-process-name " ++ atom_to_list(?ERLANG_SERVER_NAME) ++
+	" -cookie " ++ Cookie ++ 
+	" -test-case " ++ atom_to_list(Case),
+    Port = open_port({spawn, Cmd}, [exit_status, eof, stderr_to_stdout]),
+    Res = wait_for_completion(Port),
+    %% Kill off node if there was timeout
+    case Res of
+	{error, timeout} ->
+	    catch rpc:cast(?C_CLIENT_NODE_NAME, erlang, halt, [1]);
+	_ ->
+	    ok
+    end, 
+    process_flag(trap_exit, false),
+    catch m_i:stop(?ERLANG_SERVER_NAME),
+    ok = Res.
+
+
+%% Wait for eof *and* exit status, but return if exit status indicates
+%% an error, or we have been waiting more than PORT_TIMEOUT seconds.
+%%
+wait_for_completion(Port) ->
+    wait_for_completion(Port, 0).
+
+wait_for_completion(Port, N) when N < 2 ->
+    receive
+	{Port, {data, Bytes}} ->
+	    %% Relay output
+	    io:format("~s", [Bytes]),
+	    wait_for_completion(Port, N);
+	{Port, {exit_status, 0}} ->
+	    wait_for_completion(Port, N + 1);
+	{Port, {exit_status, Status}} ->
+	    {error, Status};
+	{Port, eof} ->
+	    wait_for_completion(Port, N + 1);
+	{'EXIT', Port, Reason} ->
+	    io:format("Port exited with reason: ~w~n", [Reason]),
+	    wait_for_completion(Port, N);
+	{'EXIT', From, Reason} ->
+	    io:format("Got unexpected exit: ~p~n", [{'EXIT', From, Reason}]),
+	    wait_for_completion(Port, N)
+    after ?PORT_TIMEOUT ->
+	    {error, timeout}
+    end;
+wait_for_completion(_, _) ->
+    ok.
+
+	    
+    
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..3dcd1d9387
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
@@ -0,0 +1,146 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2003-2009. 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%
+#
+#
+# Makefile.src for c_client_erl_server test
+# Note: This file *must* work for both Unix and Windows
+#
+# We use both `rm' (Unix) and `del' (Windows) for removing files, but
+# with a `-' in front so that the error in not finding `rm' (`del') on
+# Windows (Unix) is ignored.
+#
+# VxWorks? XXX 
+#
+
+.SUFFIXES:
+.SUFFIXES: .c .h .erl .idl @obj@ .@EMULATOR@
+
+
+# Variables from ts: 
+#
+
+ERL_INCLUDE = @erl_include@
+
+IC_INCLUDE_PATH = @ic_include_path@
+IC_LIB = @ic_libpath@@DS@@ic_lib@
+
+ERL_INTERFACE_INCLUDE = @erl_interface_include@
+ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@
+ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@
+ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
+ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
+
+CC = @CC@
+## XXX Should set warning flag with a DEBUG_FLAG 
+CFLAGS = @CFLAGS@ @DEFS@ -I@erl_include@ \
+	-I@ic_include_path@ -I@erl_interface_include@
+
+LD = @LD@
+LDFLAGS = @CROSSLDFLAGS@
+LIBS =	$(IC_LIB) $(ERL_INTERFACE_LIB) $(ERL_INTERFACE_EILIB) \
+	$(ERL_INTERFACE_THREADLIB) @LIBS@ $(ERL_INTERFACE_SOCK_LIBS)
+ERLC = erlc
+
+# Generated C header files
+GEN_H_FILES = \
+	m.h \
+	m_i.h \
+	oe_c_erl_test.h
+
+# Generated C files 
+GEN_C_FILES = \
+	m.c \
+	m_i.c \
+	oe_c_erl_test.c \
+	oe_code_m_a.c \
+	oe_code_m_arr1.c \
+	oe_code_m_arr2.c \
+	oe_code_m_arr3.c \
+	oe_code_m_aseq.c \
+	oe_code_m_b.c \
+	oe_code_m_bseq.c \
+	oe_code_m_dd.c \
+	oe_code_m_dyn.c \
+	oe_code_m_dyn_sl.c \
+	oe_code_m_es.c \
+	oe_code_m_et.c \
+	oe_code_m_etseq.c \
+	oe_code_m_fruit.c \
+	oe_code_m_lseq.c \
+	oe_code_m_s.c \
+	oe_code_m_s_sl.c \
+	oe_code_m_sarr3.c \
+	oe_code_m_simple.c \
+	oe_code_m_ssarr3.c \
+	oe_code_m_sseq.c \
+	oe_code_m_ssstr3.c \
+	oe_code_m_sstr3.c \
+	oe_code_m_str1.c \
+	oe_code_m_str3.c \
+	oe_code_m_strRec.c \
+	oe_code_m_strRec_str5.c \
+	oe_code_m_strRec_str7.c
+
+GEN_HRL_FILES = \
+	m.hrl \
+	m_i.hrl \
+	oe_c_erl_test.hrl
+
+GEN_ERL_FILES = \
+	m.erl \
+	m_arr2.erl \
+	m_arr3.erl \
+	m_i.erl \
+	m_str3.erl \
+	oe_c_erl_test.erl
+
+C_FILES = $(GEN_C_FILES) c_client.c my.c
+
+OBJS = $(C_FILES:.c=@obj@)
+
+PGMS = c_client@exe@
+
+ERL_FILES = $(GEN_ERL_FILES) m_i_impl.erl
+
+EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
+
+
+all: $(PGMS) $(EBINS)
+
+clean:	
+	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
+$(PGMS): $(OBJS)
+	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" \
+		"+{user_protocol,my}" c_erl_test.idl
+
+$(GEN_ERL_FILES) $(GEN_HRL_FILES): c_erl_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
+
+.c@obj@:
+	$(CC) -c -o $*@obj@ $(CFLAGS) $<
+
+.erl.@EMULATOR@:
+	$(ERLC) -I $(IC_INCLUDE_PATH) $<
+
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c
new file mode 100644
index 0000000000..f352b91fd5
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c
@@ -0,0 +1,1763 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2003-2010. 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%
+ *
+ */
+/* C-client for test of IC.  
+ * 
+ * TODO:
+ *
+ * 1. XXX #includes for VxWorks, Windows
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef __WIN32__
+#  include <unistd.h>
+#endif
+
+#include <string.h>
+
+#ifdef __WIN32__
+#  include <time.h>
+#  include <sys/timeb.h>
+#elif defined VXWORKS
+#include <time.h>
+#include <sys/times.h>
+#else
+#include <sys/time.h>
+#endif
+
+#include <ctype.h>
+
+#ifdef __WIN32__
+#  include <winsock2.h>
+#  include <windows.h>
+#else
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  include <netdb.h>
+#endif
+
+#include "ei.h"
+#include "erl_interface.h"
+#include "m_i.h"
+
+#define HOSTNAMESZ 256
+#define NODENAMESZ 512
+
+#define INBUFSZ 10
+#define OUTBUFSZ 0
+
+#define MAXTRIES 5
+
+#define CHECK_EXCEPTION(x) \
+    if ((x)->_major != CORBA_NO_EXCEPTION) { \
+	fprintf(stderr,"\n\nException: %s\n\n", \
+		(char *)CORBA_exception_value((x))); \
+        CORBA_exception_free((x)); \
+	return -1; \
+    } \
+
+/* XXX Should free things here too! */
+#define RETURN_IF_OK(x) \
+    if ((x)) {\
+	fprintf(stdout, "ok\n");\
+	return 0;\
+    }\
+
+#define cmp_str(x,y) (!strcmp((x),(y)))
+#define cmp_wstr(x,y) (!ic_wstrcmp((x),(y)))
+
+typedef CORBA_Environment IC_Env;
+
+typedef int (*TestFunc)(IC_Env *);
+typedef struct {
+    char *name; 
+    TestFunc func; 
+} TestCase;
+
+static char longtext[] = 
+"Introduction The IC application is an IDL compiler implemented in Erlang."
+" The IDL compiler generates client stubs and server skeletons."
+" Several back-ends are supported, and they fall into three main groups."
+" For more details on IC compiler options consult the ic(3) manual page."
+" Argument passing cases 1 Caller allocates all necessary storage,"
+" except that which may be encapsulated and managed within the parameter itself."
+" 2 The caller allocates a pointer and passes it by reference to the callee."
+" The callee sets the pointer to point to a valid instance of the parameter's type."
+" The caller is responsible for releasing the returned storage."
+" Following completion of a request, the caller is not allowed to modify any values"
+" in the returned storage. To do so the caller must first copy the returned instance"
+" into a new instance, then modify the new instance. 3 The caller allocates a"
+" pointer to an array slice which has all the same dimensions of the original"
+" array except the first, and passes it by reference to the callee. The callee sets"
+" the pointer to point to a valid instance of the array. The caller is responsible for"
+" releasing the returned storage. Following completion of a request, the caller is not"
+" allowed to modify any values in the returned storage. To do so the caller must first"
+" copy the returned instance into a new instance, then modify the new instance."
+" Generated Files Two files will be generated for each scope. One set of files will be"
+" generated for each module and each interface scope. An extra set is generated for"
+" those definitions at top level scope. One of the files is a header file(.h), and the"
+" other file is a C source code file (.c). In addition to these files a number of C"
+" source files will be generated for type encodings, they are named according to the "
+"following template: oe_code_<type>.c.";
+static char this_node[NODENAMESZ + 1];
+static char *progname;
+
+/* Test function prototypes */
+
+static int void_test(IC_Env *env);
+static int long_test(IC_Env *env);
+static int long_long_test(IC_Env *env);
+static int unsigned_short_test(IC_Env *env);
+static int unsigned_long_test(IC_Env *env);
+static int unsigned_long_long_test(IC_Env *env);
+static int double_test(IC_Env *env);
+static int char_test(IC_Env *env);
+static int wchar_test(IC_Env *env);
+static int octet_test(IC_Env *env);
+static int bool_test(IC_Env *env);
+static int struct_test(IC_Env *env);
+static int struct2_test(IC_Env *env);
+static int seq1_test(IC_Env *env);
+static int seq2_test(IC_Env *env);
+static int seq3_test(IC_Env *env);
+static int seq4_test(IC_Env *env);
+static int seq5_test(IC_Env *env);
+static int array1_test(IC_Env *env);
+static int array2_test(IC_Env *env);
+static int enum_test(IC_Env *env);
+static int string1_test(IC_Env *env);
+static int string2_test(IC_Env *env);
+static int string3_test(IC_Env *env);
+static int string4_test(IC_Env *env);
+static int pid_test(IC_Env *env);
+static int port_test(IC_Env *env);
+static int ref_test(IC_Env *env);
+static int term_test(IC_Env *env);
+static int typedef_test(IC_Env *env);
+static int inline_sequence_test(IC_Env *env);
+static int term_sequence_test(IC_Env *env);
+static int term_struct_test(IC_Env *env);
+static int wstring1_test(IC_Env *env);
+
+static TestCase test_cases[] = {
+    {"void_test", void_test},
+    {"long_test", long_test},
+    {"long_long_test", long_long_test},
+    {"unsigned_short_test", unsigned_short_test},
+    {"unsigned_long_test", unsigned_long_test},
+    {"unsigned_long_long_test", unsigned_long_long_test},
+    {"double_test", double_test},
+    {"char_test", char_test},
+    {"wchar_test", wchar_test},
+    {"octet_test", octet_test},
+    {"bool_test", bool_test},
+    {"struct_test", struct_test},
+    {"struct2_test", struct2_test},
+    {"seq1_test", seq1_test},
+    {"seq2_test", seq2_test},
+    {"seq3_test", seq3_test},
+    {"seq4_test", seq4_test},
+    {"seq5_test", seq5_test},
+    {"array1_test", array1_test},
+    {"array2_test", array2_test},
+    {"enum_test", enum_test},
+    {"string1_test", string1_test},
+    {"string2_test", string2_test},
+    {"string3_test", string3_test},
+    {"string4_test", string4_test},
+    {"pid_test", pid_test},
+    {"port_test", port_test},
+    {"ref_test", ref_test},
+    {"term_test", term_test},
+    {"typedef_test", typedef_test},
+    {"inline_sequence_test", inline_sequence_test},
+    {"term_sequence_test", term_sequence_test},
+    {"term_struct_test", term_struct_test},
+    {"wstring1_test", wstring1_test},
+    {"", NULL}
+};
+
+/* Other prototypes */
+static int cmp_aseq(m_aseq *a1, m_aseq *a2);
+static int cmp_a(m_a *a1, m_a *a2);
+static int cmp_bseq(m_bseq *b1, m_bseq *b2);
+static int cmp_b(m_b *b1, m_b *b2);
+static int cmp_lseq(m_lseq *b1, m_lseq *b2);
+static int cmp_etseq(m_etseq *b1, m_etseq *b2);
+static int cmp_et(m_et* b1, m_et *b2);
+static int cmp_es(m_es *b1, m_es *b2);
+static int cmp_arr1(m_arr1 b1, m_arr1 b2);
+static int cmp_dd(m_dd b1, m_dd b2);
+static int cmp_strRec(m_strRec *b1, m_strRec *b2);
+static int cmp_sseq(m_sseq *b1, m_sseq *b2);
+static int cmp_pid(erlang_pid *p1, erlang_pid *p2);
+static int cmp_port(erlang_port *p1, erlang_port *p2);
+static int cmp_ref(erlang_ref *p1, erlang_ref *p2);
+static int cmp_s(m_s *b1, m_s *b2);
+static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2);
+static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2);
+static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2);
+static int cmp_arr3(m_arr3 b1, m_arr3 b2);
+
+static void print_aseq(m_aseq *a);
+static void print_a(m_a *a);
+static void print_bseq(m_bseq *b);
+static void print_lseq(m_lseq *b);
+static void print_b(m_b *b);
+static void print_etseq(m_etseq *b);
+static void print_et(m_et* b);
+static void print_es(m_es *b);
+static void print_arr1(long a[500]);
+static void print_dd(long a[2][3]);
+static void print_strRec(m_strRec* sr);
+static void print_sseq(m_sseq *b);
+static void print_pid(erlang_pid *p);
+static void print_port(erlang_port *p);
+static void print_ref(erlang_ref *p);
+static void print_term(ETERM *t);
+static void print_s(m_s *p);
+static void print_ssstr3(m_ssstr3 *b1);
+static void print_ssarr3(m_ssarr3 *b1);
+static void print_sarr3(m_sarr3 *b1);
+static void print_arr3(m_arr3 b1);
+static void print_wstr(CORBA_wchar *ws);
+
+static void free_etseq_buf(m_etseq *b);
+static void free_et(m_et* b);
+
+#ifdef __WIN32__
+typedef struct {
+    long tv_sec;
+    long tv_usec;
+} MyTimeval;
+#else
+typedef struct timeval MyTimeval;
+#endif
+static void my_gettimeofday(MyTimeval *tv);
+static void showtime(MyTimeval *start, MyTimeval *stop);
+static void usage(void);
+static void done(int r);
+
+
+
+/* main */
+
+#ifdef VXWORKS
+int client(int argc, char **argv)
+#else
+int main(int argc, char **argv)
+#endif
+{
+    struct hostent *hp;
+    erlang_pid pid;
+    MyTimeval start, stop;
+    int i, fd, ires, tres;
+    IC_Env *env;
+    int tries = 0;
+    char *this_node_name = NULL;
+    char *peer_node = NULL;
+    char *peer_process_name = NULL;
+    char *cookie = NULL;
+    char host[HOSTNAMESZ + 1];
+    TestFunc test_func = NULL;
+    TestCase *test_case;
+    char *test_case_name = NULL;
+    
+#ifdef __WIN32__
+    WORD wVersionRequested;
+    WSADATA wsaData;
+    
+    wVersionRequested = MAKEWORD(2, 0);
+    
+    if (WSAStartup(wVersionRequested, &wsaData) != 0) {
+	fprintf(stderr, "Could not load winsock2 v2.0 compatible DLL");
+	exit(1);
+    }
+#endif
+    
+    progname = argv[0];
+    host[HOSTNAMESZ] = '\0';
+    if (gethostname(host, HOSTNAMESZ) < 0) {
+	fprintf(stderr, "Can't find own hostname\n");
+	done(1);
+    } 
+    if ((hp = gethostbyname(host)) == 0) {
+	fprintf(stderr, "Can't get ip address for host %s\n", host);
+	done(1);
+    }
+    for (i = 1; i < argc; i++) {
+	if (cmp_str(argv[i], "-help")) {
+	    usage();
+	    done(0);
+	} else if (cmp_str(argv[i], "-this-node-name")) {
+	    i++;
+	    this_node_name = argv[i];
+	} else if (cmp_str(argv[i], "-peer-node")) {
+	    i++;
+	    peer_node = argv[i];
+	} else if (cmp_str(argv[i], "-peer-process-name")) {
+	    i++;
+	    peer_process_name = argv[i];
+	} else if (cmp_str(argv[i], "-cookie")) {
+	    i++;
+	    cookie = argv[i];
+	} else if (cmp_str(argv[i], "-test-case")) {
+	    i++;
+	    test_case_name = argv[i];
+	} else {
+	    fprintf(stderr, "Error : invalid argument \"%s\"\n", argv[i]);
+	    usage();
+	    done(1);
+	}
+    }
+
+    if (this_node_name == NULL || peer_node == NULL || test_case_name == NULL 
+	|| peer_process_name == NULL || cookie == NULL) {
+	fprintf(stderr, "Error: missing option\n");
+	usage();
+	done(1);
+    }
+
+    test_case = test_cases;
+    while (test_case->func) {
+	if (cmp_str(test_case->name, test_case_name)) {
+	    test_func = test_case->func;
+	    break;
+	}
+	test_case++;
+    }
+    if (test_func == NULL) {
+	fprintf(stderr, "Error: illegal test case: \"%s\"\n", test_case_name);
+	done(1);
+    }
+    
+    /* Behead hostname at first dot */
+    for (i=0; host[i] != '\0'; i++) {
+	if (host[i] == '.') { host[i] = '\0'; break; }
+    }
+    sprintf(this_node, "%s@%s", this_node_name, host);
+    fprintf(stderr, "c_client: this node: \"%s\"\n", this_node);
+    fprintf(stderr, "c_client: peer node: \"%s\"\n", peer_node);
+    fprintf(stderr, "c_client: test case: \"%s\"\n", test_case_name);
+
+    fprintf(stderr, "c_client: starting\n");
+
+    /* initialize erl_interface */
+    erl_init(NULL, 0);
+
+    for (tries = 0; tries < MAXTRIES; tries++) {
+
+	/* connect to erlang node */ 
+
+    	ires = erl_connect_xinit(host, this_node_name, this_node, 
+				 (struct in_addr *)*hp->h_addr_list, 
+				 cookie, 0);
+
+	fprintf(stderr, "c_client: erl_connect_xinit(): %d\n", ires);
+    
+	fd = erl_connect(peer_node);
+	fprintf(stderr, "c_client: erl_connect(): %d\n", fd);
+    
+	if (fd >= 0) 
+	    break;
+	fprintf(stderr, "c_client: cannot connect, retrying\n");
+    }
+    if (fd < 0) {
+	fprintf(stderr, "c_client: cannot connect, exiting\n");
+	done(1);
+    }
+    env = CORBA_Environment_alloc(INBUFSZ, OUTBUFSZ);
+    env->_fd = fd; 
+    strcpy(env->_regname, peer_process_name);
+    env->_to_pid = NULL;
+    env->_from_pid = &pid;
+    
+    strcpy(pid.node, this_node);
+    pid.num = fd;
+    pid.serial = 0;
+    pid.creation = 0;
+
+    my_gettimeofday(&start);
+    tres = test_func(env);	/* Call test case */
+    my_gettimeofday(&stop);
+    showtime(&start, &stop);
+    erl_close_connection(fd);
+
+    printf("c_client: env->_inbuf before : %d\n", INBUFSZ);
+    printf("c_client: env->_outbuf before : %d\n", OUTBUFSZ);
+    printf("c_client: env->_inbuf after : %d\n", env->_inbufsz);
+    printf("c_client: env->_outbuf after : %d\n", env->_outbufsz);
+
+    CORBA_free(env->_inbuf);
+    CORBA_free(env->_outbuf);
+    CORBA_free(env);
+    done(tres);
+}
+
+static void usage() 
+{
+    fprintf(stderr, "Usage: %s [-help] -this-node-name <name> "
+	    "-peer-node <nodename> -peer-process-name <name> "
+	    "-cookie <cookie> -test-case <test case name>\n", progname);
+    fprintf(stderr, "Example:\n  %s  -this-node-name kalle "
+	    "-peer-node olle@home -peer-process-name idltest "
+	    "-cookie oa678er -test-case octet_test\n", progname);
+}
+
+static void done(int r) 
+{
+#ifdef __WIN32__
+    WSACleanup();
+#endif
+    exit(r);
+}
+
+
+/* TESTS */
+
+static int void_test(IC_Env *env)
+{
+    fprintf(stdout, "\n======== m_i_void test ======\n\n");
+    m_i_void_test(NULL,env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(1);
+}
+
+static int long_test(IC_Env *env)
+{
+    long l = 4711, lo, lr;
+
+    fprintf(stdout, "\n======== m_i_long test ======\n\n");
+    lr = m_i_long_test(NULL, l, &lo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(l == lo && l == lr);
+    if (l != lo)
+	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", l, lo);
+    if (l != lr)
+	fprintf(stdout, " result error, sent: %ld, got: %ld\n", l, lr);
+    return -1;
+}
+
+static int long_long_test(IC_Env *env)
+{
+    CORBA_long_long ll = 4711, llo, llr;
+
+    fprintf(stdout, "\n======== m_i_longlong test ======\n\n");
+    llr = m_i_longlong_test(NULL, ll, &llo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ll == llo && ll == llr);
+    if (ll != llo)
+	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", 
+		ll, llo);
+    if (ll != llr)
+	fprintf(stdout, " result error, sent: %ld, got: %ld\n", ll, llr);
+    return -1;
+}
+
+static int unsigned_short_test(IC_Env *env)
+{
+    unsigned short x, y = 2, z;
+
+    fprintf(stdout, "\n======== m_i_ushort test ======\n\n");
+    x = m_i_ushort_test(NULL, y, &z, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(y == z && y == x);
+    if (y != z) 
+	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", y, z);
+    if (y != x)
+	fprintf(stdout, " result error, sent: %d, got: %d\n", y, x);
+    return -1;
+}
+
+
+static int unsigned_long_test(IC_Env *env)
+{
+    unsigned long ul = 5050, ulo, ulr;
+
+    fprintf(stdout, "\n======== m_i_ulong test ======\n\n");
+    ulr = m_i_ulong_test(NULL, ul, &ulo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ul == ulo && ul == ulr);
+    if (ul != ulo) 
+	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
+		ul, ulo);
+    if (ul != ulr)
+	fprintf(stdout, " result error, sent: %lu, got: %lu\n", ul, ulr);
+    return -1;
+}
+
+/* 
+ * Note: CORBA_unsigned_long_long is in fact a plain long.
+ */
+static int unsigned_long_long_test(IC_Env *env)
+{
+    CORBA_unsigned_long_long ull = 5050, ullo, ullr;
+
+    fprintf(stdout, "\n======== m_i_ulonglong test ======\n\n");
+    ullr = m_i_ulonglong_test(NULL, ull, &ullo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ull == ullo && ull == ullr);
+    if (ull != ullo)
+	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
+		ull, ullo); 
+    if (ull != ullr)
+	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
+		ull, ullr);
+    return -1;
+}
+
+static int double_test(IC_Env *env)
+{
+    double d = 12.1212, db, dr;
+
+    fprintf(stdout, "\n======== m_i_double test ======\n\n");
+    dr = m_i_double_test(NULL, d, &db, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(d == db && d == dr);
+    if (d != db)
+	fprintf(stdout, " out parameter error, sent: %f, got: %f\n", d, db);
+    if (d != dr)
+	fprintf(stdout, " result error, sent: %f, got: %f\n", d, dr);
+    return -1;
+}    
+
+static int char_test(IC_Env *env)
+{
+    char c = 'g', co, cr;
+
+    /* char test */
+    fprintf(stdout, "\n======== m_i_char test ======\n\n");
+    cr = m_i_char_test(NULL, c, &co, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(c == co && c == cr);
+    if (c !=co) 
+	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", c, co);
+    if (c != cr)
+	fprintf(stdout, " result error, sent: %c, got: %c\n", c, cr);
+    return -1;
+}
+
+static int wchar_test(IC_Env *env)
+{
+    CORBA_wchar wc = 103, wco, wcr;
+
+    fprintf(stdout, "\n======== m_i_wchar test ======\n\n");
+    wcr = m_i_wchar_test(NULL, wc, &wco, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(wc == wco && wc == wcr);
+    if (wc != wco)
+	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
+		wc, wco);
+    if (wc != wcr)
+	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
+		wc, wcr);
+    return -1;
+}    
+
+static int octet_test(IC_Env *env)
+{
+    char o ='r', oo, or;
+ 
+    fprintf(stdout, "\n======== m_i_octet test ======\n\n");
+    or = m_i_octet_test(NULL, o, &oo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(o == oo && o == or);
+    if (o != oo)
+	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", o, oo);
+    if (o != or)
+	fprintf(stdout, " result error, sent: %c, got: %c\n", o, or);
+    return -1;
+}    
+
+static int bool_test(IC_Env *env)
+{
+    unsigned char i = 0, io, ir;	
+
+    fprintf(stdout, "\n======== m_i_bool test ======\n\n");
+    ir = m_i_bool_test(NULL, i, &io, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(i == io && i == ir);
+    if (i != io)
+	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", i, io);
+    if (i != ir)
+	fprintf(stdout, " result error, sent: %d, got: %d\n", i, ir);
+    return -1;
+}
+
+static int struct_test(IC_Env *env)
+{
+    m_b b = {4711, 'a'}, bo, br;
+
+    fprintf(stdout, "\n======== m_i_struct test ======\n\n");
+    br = m_i_struct_test(NULL, &b, &bo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_b(&b, &bo) && cmp_b(&b, &br));
+    if (!cmp_b(&b, &bo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_b(&b);
+	fprintf(stdout, " got:\n");
+	print_b(&bo);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_b(&b, &br)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_b(&b);
+	fprintf(stdout, " got:\n");
+	print_b(&br);
+	fprintf(stdout, "\n");
+    }
+    return -1;
+}
+
+static int struct2_test(IC_Env *env)
+{
+    m_es esi = {m_peach, 5050}, eso, esr;
+
+    fprintf(stdout, "\n======== m_i_struct2 test ======\n\n");
+    esr = m_i_struct2_test(NULL, &esi, &eso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_es(&esi, &eso) && cmp_es(&esi, &esr));
+    if (!cmp_es(&esi, &eso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_es(&esi);
+	fprintf(stdout, " got:\n");
+	print_es(&eso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_es(&esi, &esr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_es(&esi);
+	fprintf(stdout, " got:\n");
+	print_es(&esr);
+	fprintf(stdout, "\n");
+    }
+    return -1;
+}
+
+
+static int seq1_test(IC_Env *env)
+{
+    m_bseq bs, *bso, *bsr;
+
+    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
+    bs._length = 3;
+    bs._buffer = ba;
+
+    fprintf(stdout, "\n======== m_i_seq1 test ======\n\n");
+    bsr = m_i_seq1_test(NULL, &bs, &bso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_bseq(&bs, bso) && cmp_bseq(&bs, bsr));
+    if (!cmp_bseq(&bs, bso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_bseq(&bs);
+	fprintf(stdout, " got:\n");
+	print_bseq(bso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_bseq(&bs, bsr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_bseq(&bs);
+	fprintf(stdout, " got:\n");
+	print_bseq(bsr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(bso);
+    CORBA_free(bsr);
+    return -1;
+}
+
+static int seq2_test(IC_Env *env)
+{
+    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
+    m_a a;
+    m_a aa[2];
+    m_aseq as, *aso, *asr;
+
+    a.l = 9999;
+    a.y._length = 3;
+    a.y._buffer = ba;
+    a.d = 66.89898989;
+
+    aa[0] = a;
+    aa[1] = a;
+    as._length = 2;
+    as._buffer = aa;
+
+    fprintf(stdout, "\n======== m_i_seq2 test ======\n\n");
+    asr = m_i_seq2_test(NULL, &as, &aso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_aseq(&as, aso) && cmp_aseq(&as, asr));
+    if (!cmp_aseq(&as, aso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_aseq(&as);
+	fprintf(stdout, " got:\n");
+	print_aseq(aso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_aseq(&as, asr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_aseq(&as);
+	fprintf(stdout, " got:\n");
+	print_aseq(asr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(aso);
+    CORBA_free(asr);
+    return -1;
+}
+
+static int seq3_test(IC_Env *env)
+{
+    m_lseq lsi, *lso, *lsr;
+    long al[500];
+    int i=0;
+    
+    for (i = 0; i < 500; i++)
+	al[i]=i;
+    lsi._length = 500;
+    lsi._buffer = al;
+
+    fprintf(stdout, "\n======== m_i_seq3 test ======\n\n");
+    lsr = m_i_seq3_test(NULL, &lsi, &lso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_lseq(&lsi, lso) && cmp_lseq(&lsi, lsr));
+    if (!cmp_lseq(&lsi, lso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_lseq(&lsi);
+	fprintf(stdout, " got:\n");
+	print_lseq(lso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_lseq(&lsi, lsr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_lseq(&lsi);
+	fprintf(stdout, " got:\n");
+	print_lseq(lsr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(lso);
+    CORBA_free(lsr);
+    return -1;
+}
+
+static int seq4_test(IC_Env *env)
+{
+    char *stra0[3] = {"a", "long", "time"}; 
+    char *stra1[3] = {"ago", "there", "was"}; 
+    char *stra2[3] = {"a", "buggy", "compiler"}; 
+    m_sstr3 str3s[3] = {{3, 3, stra0}, {3, 3, stra1}, {3, 3, stra2}};
+    m_ssstr3 str3ssi = {3, 3, str3s}; 
+    m_ssstr3 *str3sso, *str3ssr;
+
+    fprintf(stdout, "\n======== m_i_seq4 test ======\n\n");
+    str3ssr = m_i_seq4_test(NULL, &str3ssi, &str3sso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_ssstr3(&str3ssi, str3sso) && 
+		 cmp_ssstr3(&str3ssi, str3ssr));
+    if (!cmp_ssstr3(&str3ssi, str3sso)){
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_ssstr3(&str3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssstr3(str3sso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_ssstr3(&str3ssi, str3ssr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_ssstr3(&str3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssstr3(str3ssr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(str3sso);
+    CORBA_free(str3ssr);
+    return -1;
+}
+
+static int seq5_test(IC_Env *env)
+{
+    m_arr3 arr3a[3] = {
+	{4711, 18931947, 3}, 
+	{4711, 18931947, 3},
+	{4711, 18931947, 3}};
+    m_sarr3 arr3sa[3] = {{3, 3, arr3a}, {3, 3, arr3a}, {3, 3, arr3a}};
+    m_ssarr3 arr3ssi = {3, 3, arr3sa};
+    m_ssarr3 *arr3sso;
+    m_ssarr3 *arr3ssr;
+
+    fprintf(stdout, "\n======== m_i_seq5 test ======\n\n");
+    arr3ssr = m_i_seq5_test(NULL, &arr3ssi, &arr3sso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_ssarr3(&arr3ssi, arr3sso) &&
+		 cmp_ssarr3(&arr3ssi, arr3ssr));
+    if (!cmp_ssarr3(&arr3ssi, arr3sso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_ssarr3(&arr3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssarr3(arr3sso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_ssarr3(&arr3ssi, arr3ssr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_ssarr3(&arr3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssarr3(arr3ssr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(arr3sso);
+    CORBA_free(arr3ssr);
+    return -1;
+}
+
+static int array1_test(IC_Env *env)
+{
+    int i;
+    long al[500];
+    m_arr1 alo;
+    m_arr1_slice* alr;
+    
+    for (i = 0; i < 500; i++)
+	al[i]=i;
+
+    fprintf(stdout, "\n======== m_i_array1 test ======\n\n");
+    alr = m_i_array1_test(NULL, al, alo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_arr1(al, alo) && cmp_arr1(al, alr));
+    if (!cmp_arr1(al, alo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_arr1(al);
+	fprintf(stdout, " got:\n");
+	print_arr1(alo);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_arr1(al,alr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_arr1(al);
+	fprintf(stdout, " got:\n");
+	print_arr1(alr);
+	fprintf(stdout, "\n");
+    }
+    free(alo);
+    free(alr);
+    return -1;
+}   
+
+static int array2_test(IC_Env *env)
+{
+    long dl[2][3] = {{11, 2, 7}, {22, 8 ,13}};
+    m_dd dlo;
+    m_dd_slice* dlr;
+
+    fprintf(stdout, "\n======== m_i_array2 test ======\n\n");
+    dlr = m_i_array2_test(NULL, dl, dlo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_dd(dl,dlo) && cmp_dd(dl,dlr));
+    if (!cmp_dd(dl,dlo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_dd(dl);
+	fprintf(stdout, " got:\n");
+	print_dd(dlo);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_dd(dl,dlr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_dd(dl);
+	fprintf(stdout, " got:\n");
+	print_dd(dlr);
+	fprintf(stdout, "\n");
+    }
+    free(*dlr);
+    return -1;
+}
+
+static int enum_test(IC_Env *env)
+{
+    m_fruit ei = m_banana, eo, er;
+
+    fprintf(stdout, "\n======== m_i_enum test ======\n\n");
+    er = m_i_enum_test(NULL, ei, &eo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ei == eo && ei == er);
+    if (ei != eo)
+	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", ei, eo);
+    if (ei != er)
+	fprintf(stdout, " result error, sent: %d, got: %d\n", ei, er);
+    return -1;
+}
+
+static int string1_test(IC_Env *env)
+{
+    char* si = longtext;
+    char* so;
+    char* sr;
+
+    fprintf(stdout, "\n======== m_i_string1 test ======\n\n");
+    sr = m_i_string1_test(NULL, si, &so, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, sr));
+    if (!cmp_str(si, so))
+	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
+    if (!cmp_str(si, sr))
+	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
+    CORBA_free(so);
+    CORBA_free(sr);
+    return -1;
+}
+  
+static int string2_test(IC_Env *env)
+{
+    char* sa[3] = {"hello", "foo", "bar"};
+    m_sseq ssi = {3, 3, sa};
+    m_sseq *sso, *ssr;
+
+    fprintf(stdout, "\n======== m_i_string2 test ======\n\n");
+    ssr = m_i_string2_test(NULL, &ssi, &sso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_sseq(&ssi, sso) && cmp_sseq(&ssi, sso));
+    if (!cmp_sseq(&ssi, sso)) {
+	fprintf(stdout, " out parameter error, sent:\n"); 
+	print_sseq(&ssi); 
+	fprintf(stdout, "got:\n");
+	print_sseq(sso); 
+    } 
+    if (!cmp_sseq(&ssi, ssr)) {
+	fprintf(stdout, " result error, sent:\n"); 
+	print_sseq(&ssi); 
+	fprintf(stdout, "got:\n"); 
+	print_sseq(ssr); 
+    }    
+    CORBA_free(sso);
+    CORBA_free(ssr);
+    return -1;
+}
+ 
+static int string3_test(IC_Env *env)
+{
+    char* si = longtext;
+    char* so;
+    char* sr;
+
+    fprintf(stdout, "\n======== m_i_string3 test ======\n\n");
+    sr = m_i_string3_test(NULL, si, &so, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, so));
+    if (!cmp_str(si, so))
+	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
+    if (!cmp_str(si, sr))
+	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
+    CORBA_free(so);
+    CORBA_free(sr);
+    return -1;
+}
+
+static int string4_test(IC_Env *env)
+{
+    char as1[100] = "a string", as2[200] = "help", as3[200] = "hello there";
+    m_strRec stri = { 1,	/* dd */
+		      as1,	/* str4 */
+		      {{'a', 'k'}, {'z', 'g'}, {'n', 'q'}}, /* str7 */
+		      {3, 3, "buf"}, /* str5 */
+		      as2,	/* str6 */
+		      {'m', 'f', 'o'}, /* str8 */
+		      as3,	/* str9 */
+		      {3, 3, "stu"} /* str10 */
+    };
+    m_strRec *stro, *strr;
+
+    fprintf(stdout, "\n======== m_i_string4 test ======\n\n");
+    strr = m_i_string4_test(NULL, &stri, &stro, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_strRec(&stri,stro) && cmp_strRec(&stri,strr));
+    if (!cmp_strRec(&stri,stro)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_strRec(&stri);
+	fprintf(stdout, " got:\n");
+	print_strRec(stro);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_strRec(&stri,strr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_strRec(&stri);
+	fprintf(stdout, " got:\n");
+	print_strRec(strr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(stro);
+    CORBA_free(strr);
+    return -1;
+}
+
+
+static int pid_test(IC_Env *env)
+{
+    erlang_pid pid = {"", 7, 0, 0}, pido, pidr;
+
+    strcpy(pid.node, this_node), /* this currently running node */
+    fprintf(stdout, "\n======== m_i_pid test ======\n\n");
+    pidr = m_i_pid_test(NULL, &pid, &pido, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_pid(&pid, &pido) && cmp_pid(&pid, &pidr));
+    if (!cmp_pid(&pid, &pido)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_pid(&pid);
+	fprintf(stdout, "got:\n");
+	print_pid(&pido);
+    }
+    if (!cmp_pid(&pid, &pidr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_pid(&pid);
+	fprintf(stdout, "got:\n");
+	print_pid(&pidr);
+    }
+    return -1;
+}
+
+static int port_test(IC_Env *env)
+{
+    erlang_port porti = {"node", 5, 1}, porto, portr;
+
+    fprintf(stdout, "\n======== m_i_port test ======\n\n");
+    portr = m_i_port_test(NULL, &porti, &porto, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_port(&porti, &porto) && cmp_port(&porti, &portr));
+    if (!cmp_port(&porti, &porto)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_port(&porti);
+	fprintf(stdout, "got:\n");
+	print_port(&porto);
+    }
+    if (!cmp_port(&porti, &portr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_port(&porti);
+	fprintf(stdout, "got:\n");
+	print_port(&portr);
+    }
+    return -1;
+}
+
+static int ref_test(IC_Env *env)
+{
+    erlang_ref refi = { "node1", 3, {1, 2, 3}, 1},  
+	refo, refr;
+
+    fprintf(stdout, "\n======== m_i_ref test ======\n\n");
+    refr = m_i_ref_test(NULL, &refi, &refo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_ref(&refi, &refo) && cmp_ref(&refi, &refr));
+    if (!cmp_ref(&refi, &refo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_ref(&refi);
+	fprintf(stdout, "got:\n");
+	print_ref(&refo);
+    }
+    if (!cmp_ref(&refi, &refr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_ref(&refi);
+	fprintf(stdout, "got:\n");
+	print_ref(&refr);
+    }
+    return -1;
+}
+
+static int term_test(IC_Env *env)
+{
+    ETERM *ti, *to, *tr;
+
+    ti = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
+
+    fprintf(stdout, "\n======== m_i_term test ======\n\n");
+    tr = m_i_term_test(NULL, ti, &to, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(erl_match(ti, to) && erl_match(ti, tr));
+    if (!erl_match(ti, to)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_term(ti);
+	fprintf(stdout, "got:\n");
+	print_term(to);
+    }
+    if (!erl_match(ti, tr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_term(ti);
+	fprintf(stdout, "got:\n");
+	print_term(tr);
+    }
+    erl_free_term(ti);
+    erl_free_term(to);
+    erl_free_term(tr);
+    return -1;
+}
+
+static int typedef_test(IC_Env *env)
+{
+    m_banan mbi, mbo;		/* erlang_port */
+    m_apa mai;			/* ETERM* */
+    m_apa mao = NULL;
+    long tl;
+
+    strcpy(mbi.node,"node");
+    mbi.id = 15;
+    mbi.creation = 1;
+
+    fprintf(stdout, "\n======== m_i_typedef test ======\n\n");
+    mai = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
+    tl = m_i_typedef_test(NULL, mai, &mbi, &mao, &mbo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(erl_match(mai, mao) && cmp_port(&mbi, &mbo) && tl == 4711);
+    if (!erl_match(mai, mao)) {
+	fprintf(stdout, " out parameter error (term), sent:\n");
+	print_term(mai);
+	fprintf(stdout, "got:\n");
+	print_term(mao);
+    }
+    if (!cmp_port(&mbi, &mbo)) {
+	fprintf(stdout, " out parameter error (port), sent:\n");
+	print_port(&mbi);
+	fprintf(stdout, "got:\n");
+	print_port(&mbo);
+    }
+    if (tl != 4711) {
+	fprintf(stdout, " result error, sent: 4711, got %ld\n", tl);
+    }
+    erl_free_term(mai);
+    erl_free_term(mao);
+    return -1;
+} 
+  
+static int inline_sequence_test(IC_Env *env)
+{
+    int i;
+    long al[500];
+    m_s isi = {4711, {500, 10, al}},  
+	*iso, *isr;
+
+    for (i = 0; i < 500; i++)
+	al[i]=i;
+    fprintf(stdout, "\n======== m_i_inline_sequence test ======\n\n");
+    isr = m_i_inline_sequence_test(NULL, &isi, &iso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_s(&isi, iso) && cmp_s(&isi, isr));
+    if (!cmp_s(&isi, iso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_s(&isi);
+	fprintf(stdout, "got:\n");
+	print_s(iso);
+    }
+    if (!cmp_s(&isi, isr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_s(&isi);
+	fprintf(stdout, "got:\n");
+	print_s(isr);
+    }
+    CORBA_free(iso);
+    CORBA_free(isr);
+    return -1;
+}
+
+static int term_sequence_test(IC_Env *env)
+{
+    ETERM* et_array[4] = {
+	erl_format("[{apa, 1, 23}, \"string\", {1.23, 45}]"),
+	erl_format("[{banan, 1, 23}, \"string\", {1.23, 45}]"),
+	erl_format("[{apelsin, 1, 23}, \"string\", {1.23, 45}]"),
+	erl_format("[{mango, 1, 23}, \"string\", {1.23, 45}]")};
+    m_etseq etsi = {4, 4, et_array}, *etso, *etsr;
+
+    fprintf(stdout, "\n======== m_i_term_sequence test ======\n\n");
+    etsr = m_i_term_sequence_test(NULL, &etsi, &etso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_etseq(&etsi, etso) && cmp_etseq(&etsi, etsr));
+    if (!cmp_etseq(&etsi, etso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_etseq(&etsi);
+	fprintf(stdout, "got:\n");
+	print_etseq(etso);
+    }
+    if (!cmp_etseq(&etsi, etsr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_etseq(&etsi);
+	fprintf(stdout, "got:\n");
+	print_etseq(etsr);
+    }
+    free_etseq_buf(&etsi);
+    free_etseq_buf(etso);
+    free_etseq_buf(etsr);
+    CORBA_free(etso);
+    CORBA_free(etsr);
+    return -1;
+}
+
+static int term_struct_test(IC_Env *env)
+{
+    m_et eti = { erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]"), 
+		 121212 };
+    m_et eto, etr;
+
+    fprintf(stdout, "\n======== m_i_term_struct test ======\n\n");
+    etr = m_i_term_struct_test(NULL, &eti, &eto, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_et(&eti, &eto) && cmp_et(&eti, &etr));
+    if (!cmp_et(&eti, &eto)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_et(&eti);
+	fprintf(stdout, "got:\n");
+	print_et(&eto);
+    }
+    if (!cmp_et(&eti, &etr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_et(&eti);
+	fprintf(stdout, "got:\n");
+	print_et(&etr);
+    }
+    free_et(&eti);
+    free_et(&eto);
+    free_et(&etr);
+    return -1;
+}
+
+static int wstring1_test(IC_Env *env)
+{
+    CORBA_wchar wsi[] = {100, 101, 102, 103, 104, 0}, *wso, *wsr;
+
+    fprintf(stdout, "\n======== m_i_wstring1 test ======\n\n");
+    wsr = m_i_wstring1_test(NULL, wsi, &wso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_wstr(wsi, wso) && cmp_wstr(wsi, wsr));
+    if (!cmp_wstr(wsi, wso)) {
+	fprintf(stdout, " out parameter error, sent: \n");
+	print_wstr(wsi);
+	fprintf(stdout, "got:\n");
+	print_wstr(wso);
+    }
+    if (!cmp_wstr(wsi, wsr)) {
+	fprintf(stdout, " result error, sent: \n");
+	print_wstr(wsi);
+	fprintf(stdout, "got:\n");
+	print_wstr(wsr);
+    }
+    CORBA_free(wso);
+    CORBA_free(wsr);
+    return -1;
+}
+
+/* Compare functions */
+static int cmp_aseq(m_aseq *a1, m_aseq *a2)
+{
+    int i;
+
+    if (a1->_length != a2->_length)
+	return 0;
+    for (i = 0; i < a1->_length; i++)
+	if (cmp_a(&(a1->_buffer[i]), &(a2->_buffer[i])) == 0)
+	    return 0;
+    return 1;
+}
+
+static int cmp_a(m_a *a1, m_a *a2)
+{
+    return a1->l == a2->l && 
+	a1->d == a2->d && 
+	cmp_bseq(&a1->y, &a2->y);
+}
+
+static int cmp_bseq(m_bseq *b1, m_bseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (cmp_b(&(b1->_buffer[i]), &(b2->_buffer[i])) == 0)
+	    return 0;
+    return 1;
+}
+
+static int cmp_b(m_b *b1, m_b *b2)
+{
+    return b1->l == b2->l && b1->c == b2->c;
+}
+
+static int cmp_lseq(m_lseq *b1, m_lseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (b1->_buffer[i] != b2->_buffer[i])
+	    return 0;
+    return 1;
+}
+
+static int cmp_etseq(m_etseq *b1, m_etseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (!erl_match(b1->_buffer[i], b2->_buffer[i]))
+	    return 0;
+    return 1;
+}
+
+static int cmp_et(m_et* b1, m_et *b2)
+{
+    return erl_match(b1->e, b2->e) && b1->l == b2->l;
+}
+
+static int cmp_es(m_es *b1, m_es *b2)
+{
+    return b1->f == b2->f && b1->l == b2->l;
+}
+
+static int cmp_arr1(m_arr1 b1, m_arr1 b2)
+{
+    int i;
+
+    for (i = 0; i < 500; i++)
+	if (b1[i] != b2[i])
+	    return 0;
+    return 1; 
+}
+
+static int cmp_dd(m_dd b1, m_dd b2)
+{
+
+    int i, j;
+
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    if (b1[i][j] != b2[i][j])
+		return 0;
+    return 1; 
+}
+
+
+
+static int cmp_strRec(m_strRec *b1, m_strRec *b2)
+{
+    int i, j;
+
+    if (b1->bb != b2->bb) 
+	return 0;
+    if (!cmp_str(b1->str4,b2->str4))
+	return 0;
+    if (b1->str5._length != b2->str5._length)
+	return 0;
+    for (j = 0; j < b1->str5._length; j++)
+	if (b1->str5._buffer[j] != b2->str5._buffer[j])
+	    return 0;
+    if (!cmp_str(b1->str6,b2->str6))
+	return 0;
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    if (b1->str7[i][j] != b2->str7[i][j])
+		return 0;
+    for (j = 0; j < 3; j++)
+	if (b1->str8[j] != b2->str8[j])
+	    return 0;
+    if (!cmp_str(b1->str9,b2->str9))
+	return 0;
+    if (b1->str10._length != b2->str10._length)
+	return 0;
+    for (j = 0; j < b1->str10._length; j++)
+	if (b1->str10._buffer[j] != b2->str10._buffer[j])
+	    return 0;
+    return 1; 
+}
+
+
+static int cmp_sseq(m_sseq *b1, m_sseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (!cmp_str(b1->_buffer[i], b2->_buffer[i]))
+	    return 0;
+    return 1;
+}
+
+
+static int cmp_pid(erlang_pid *p1, erlang_pid *p2)
+{
+    return cmp_str(p1->node,p2-> node) && 
+	p1->num == p2->num && 
+	p1->serial == p2->serial &&
+	p1->creation == p2->creation;
+}
+
+static int cmp_port(erlang_port *p1, erlang_port *p2)
+{
+    return cmp_str(p1->node,p2-> node) && p1->id == p2->id;
+}
+
+static int cmp_ref(erlang_ref *p1, erlang_ref *p2)
+{
+    return cmp_str(p1->node, p2->node) && 
+	p1->len == p2->len &&
+	(p1->len < 1 || p1->n[0] == p2->n[0]) &&
+	(p1->len < 2 || p1->n[1] == p2->n[1]) &&
+	(p1->len < 3 || p1->n[2] == p2->n[2]);
+}
+
+static int cmp_s(m_s *b1, m_s *b2)
+{
+    int i;
+
+    if (b1->l != b2->l)
+	return 0;
+    if (b1->sl._length != b2->sl._length)
+	return 0;
+    for (i = 0; i < b1->sl._length; i++)
+	if (b1->sl._buffer[i] != b2->sl._buffer[i])
+	    return 0;
+    return 1;
+}
+
+
+static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2)
+{
+    int i,j;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++) {
+	if (b1->_buffer[i]._length != b2->_buffer[i]._length)
+	    return 0;
+	for (j = 0; j < b1->_buffer[i]._length; j++)
+	    if (!cmp_str(b1->_buffer[i]._buffer[j], 
+		      b2->_buffer[i]._buffer[j]))
+		return 0;
+    }
+    return 1;
+}
+
+
+
+static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++) {
+	if (!cmp_sarr3(&b1->_buffer[i], &b2->_buffer[i]))
+	    return 0;
+    }
+    return 1;
+}
+
+static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++) {
+	if (!cmp_arr3(b1->_buffer[i], b2->_buffer[i]))
+	    return 0;
+    }
+    return 1;
+}
+
+static int cmp_arr3(m_arr3 b1, m_arr3 b2)
+{
+    int i;
+
+    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) {
+	if (b1[i] != b2[i])
+	    return 0;
+    }
+    return 1;
+}
+
+/* Print functions */
+static void print_aseq(m_aseq *a)
+{
+    int i;
+    fprintf(stdout, "\nm_aseq size: %ld  --------\n", a->_length);
+    for (i = 0; i < a->_length; i++)
+	print_a(&(a->_buffer[i]));
+}
+
+static void print_a(m_a *a)
+{
+    fprintf(stdout, "\nm_a --------\n l: %ld\n d:%f\n", a->l, a->d);
+    print_bseq(&a->y);
+}
+
+static void print_bseq(m_bseq *b)
+{
+    int i;
+
+    fprintf(stdout, "\nm_bseq size: %ld  --------\n",b->_length);
+    for (i = 0; i < b->_length; i++)
+	print_b(&(b->_buffer[i]));
+}
+
+static void print_lseq(m_lseq *b)
+{
+    int i;
+
+    fprintf(stdout, "\nm_lseq size: %ld  --------\n",b->_length);
+    for (i = 0; i < b->_length; i++)
+	fprintf(stdout, "[%d]: %ld\n", i, b->_buffer[i]);
+}
+
+static void print_b(m_b *b)
+{
+    fprintf(stdout, "\nm_b --------\n l: %ld\n c: %c\n", b->l, b->c);
+}
+
+
+static void print_etseq(m_etseq *b)
+{
+    int i;
+
+    for (i = 0; i < b->_length; i++) {
+	fprintf(stdout, "[%d]:\n", i);
+	erl_print_term(stdout, b->_buffer[i]);
+    }
+}
+
+
+static void print_et(m_et* b)
+{
+    fprintf(stdout, "\net struct --------\n");
+    erl_print_term(stdout, b->e);
+    fprintf(stdout, "long: %ld\n", b->l);
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_es(m_es *b)
+{
+    fprintf(stdout, "\nm_es --------\n f: %d\n l: %ld\n", b->f, b->l);
+}
+
+
+static void print_arr1(long a[10])
+{
+    int i;
+
+    for (i = 0; i < 10; i++)
+	fprintf(stdout, "\n[%d]: %ld\n", i, a[i]);
+}
+
+static void print_dd(long a[2][3])
+{
+    int i, j;
+
+    fprintf(stdout, "\nlong dd[2][3] --------\n");
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    fprintf(stdout, "\n[%d][%d]: %ld\n", i, j, a[i][j]);
+}
+
+
+static void print_strRec(m_strRec* sr)
+{
+    int i, j;
+
+    fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
+    fprintf(stdout, "string str4 : %s\n",sr->str4);
+    fprintf(stdout, "str7[2][3] :\n");
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
+    fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
+    for (j = 0; j < sr->str5._length; j++)
+	fprintf(stdout, "str5._buffer[%d]: %c\n", j, sr->str5._buffer[j]);
+    fprintf(stdout, "string str6 : %s\n",sr->str6);
+    fprintf(stdout, "str8 :\n");
+    for (j = 0; j < 3; j++)
+	fprintf(stdout, "str8[%d]: %c\n", j, sr->str8[j]);
+    fprintf(stdout, "string str9 : %s\n",sr->str9);
+    fprintf(stdout, "str10._length : %ld\n",sr->str10._length);
+    for (j = 0; j < sr->str10._length; j++)
+	fprintf(stdout, "str10._buffer[%d]: %c\n", j, sr->str10._buffer[j]);
+}
+
+static void print_sseq(m_sseq *b)
+{
+    int i;
+
+    fprintf(stdout, "\nm_sseq size: %ld  --------\n",b->_length);
+    for (i = 0; i < b->_length; i++)
+	fprintf(stdout, "%s\n", b->_buffer[i]);
+
+}
+
+
+static void print_pid(erlang_pid *p)
+{
+    fprintf(stdout, "\nerlang_pid --------\n node: %s\n num: %d\n "
+	    "serial: %d\n creation: %d\n", 
+	    p->node, p->num, p->serial, p->creation);
+}
+
+static void print_port(erlang_port *p)
+{
+    fprintf(stdout, "\nerlang_port --------\n node: %s\n id: %d\n "
+	    "creation: %d\n", p->node, p->id, p->creation);
+}
+
+static void print_ref(erlang_ref *p)
+{
+    fprintf(stdout, "\nerlang_ref --------\n node: %s\n len: %d\n "
+	    "n[0]: %d\n n[1]: %d\n n[2]: %d\n creation: %d\n", 
+	    p->node, p->len, p->n[0], p->n[1], p->n[2], p->creation);
+}
+
+static void print_term(ETERM *t)
+{
+    fprintf(stdout, "\nETERM --------\n");
+    erl_print_term(stdout, t);
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_s(m_s *p)
+{
+    int i;
+
+    fprintf(stdout, "\n%ld\n", p->l);
+    for (i = 0; i < p->sl._length; i++)
+	fprintf(stdout, "\n[%d]: %ld\n", i, p->sl._buffer[i]);
+}
+
+
+static void print_ssstr3(m_ssstr3 *b1)
+{
+    int i,j;
+
+    fprintf(stdout, "\nSSSTR3 --------\n");
+    fprintf(stdout,"b1->_length = %ld\n",b1->_length);
+    for (i = 0; i < b1->_length; i++) {
+	fprintf(stdout,"\nb1->_buffer[%d]._length %ld\n",
+		i, b1->_buffer[i]._length);
+	for (j = 0; j < b1->_buffer[i]._length; j++)
+	    fprintf(stdout,"b1->_buffer[%d]._buffer[%d] = %s\n",
+		    i, j, b1->_buffer[i]._buffer[j]);
+    }
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_wstr(CORBA_wchar *ws)
+{
+    int i = 0;
+
+    fprintf(stdout, "\nwstr --------\n");
+    while (ws[i]) {
+	fprintf(stdout, "[%d]: %ld\n", i, ws[i]);
+	i++;
+    }
+    fprintf(stdout, "\n--------\n");
+}
+
+
+static void print_ssarr3(m_ssarr3 *b1)
+{
+    int i;
+
+    fprintf(stdout, "\nssarr3 --------\n");
+    fprintf(stdout,"length: %ld\n",b1->_length);
+    fprintf(stdout, "buffer:\n");
+    for (i = 0; i < b1->_length; i++) 
+	print_sarr3(&b1->_buffer[i]); 
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_sarr3(m_sarr3 *b1)
+{
+    int i;
+
+    fprintf(stdout, "\nsarr3 --------\n");
+    fprintf(stdout,"length: %ld\n",b1->_length);
+    fprintf(stdout, "buffer:\n");
+    for (i = 0; i < b1->_length; i++) 
+	print_arr3(b1->_buffer[i]); 
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_arr3(m_arr3 b1)
+{
+    int i;
+
+    fprintf(stdout, "\narr3 --------\n");
+    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) 
+	fprintf(stdout, "%ld ", b1[i]); 
+    fprintf(stdout, "\n--------\n");
+}
+
+static void free_etseq_buf(m_etseq *b)
+{
+    int i;
+
+    for (i = 0; i < b->_length; i++)
+	erl_free_term(b->_buffer[i]);
+}
+
+static void free_et(m_et* b)
+{
+    erl_free_term(b->e);
+}
+
+static void showtime(MyTimeval *start, MyTimeval *stop)
+{
+    MyTimeval elapsed;
+
+    elapsed.tv_sec = stop->tv_sec - start->tv_sec;
+    elapsed.tv_usec = stop->tv_usec - start->tv_usec;
+    while (elapsed.tv_usec < 0) {
+	elapsed.tv_sec -= 1;
+	elapsed.tv_usec += 1000000;
+    }
+    fprintf(stderr,"%ld.%06ld seconds\n",elapsed.tv_sec, elapsed.tv_usec);
+}
+
+static void my_gettimeofday(MyTimeval *tv)
+#ifdef __WIN32__
+#define EPOCH_JULIAN_DIFF 11644473600i64
+{
+    SYSTEMTIME t;
+    FILETIME ft;
+    LONGLONG lft;
+
+    GetSystemTime(&t);
+    SystemTimeToFileTime(&t, &ft);
+    memcpy(&lft, &ft, sizeof(lft));
+    tv->tv_usec = (long) ((lft / 10i64) % 1000000i64);
+    tv->tv_sec = (long) ((lft / 10000000i64) - EPOCH_JULIAN_DIFF);
+}
+#elif defined VXWORKS
+{
+    int rate = sysClkRateGet(); /* Ticks per second */
+    unsigned long ctick = tickGet();
+    tv->tv_sec = ctick / rate; /* secs since reboot */
+    tv->tv_usec = ((ctick - (tv->tv_sec * rate))*1000000)/rate;
+}
+#else
+{
+    gettimeofday(tv, NULL);
+}
+#endif
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_erl_test.idl b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_erl_test.idl
new file mode 100644
index 0000000000..6d229c3ac1
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_erl_test.idl
@@ -0,0 +1,173 @@
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 2003-2010. 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%
+
+#include "erlang.idl"
+
+
+const short TestConst = 1;
+
+module m {
+
+  const short TestConst = 2;
+
+  struct b {
+    long l;
+    char c;
+  }; 
+
+  struct simple {
+    long l;
+    b    b_t;
+  };
+
+  enum fruit {orange, banana, apple, peach, pear};
+
+  typedef sequence<long> lseq;
+
+  typedef sequence<b> bseq;
+
+  struct a {
+    long l;
+    bseq y;
+    double d;
+  };
+
+  typedef sequence<a> aseq;
+
+  typedef sequence<string> sseq;
+  typedef string str;
+  typedef long myLong;
+
+  typedef long arr1[500], dd[2][3];
+
+  typedef erlang::term apa;
+  typedef erlang::port banan;
+
+  typedef sequence<erlang::term> etseq;
+
+  struct s {
+    long l;
+    sequence<long> sl;
+  };
+
+  struct es {
+    fruit f;
+    myLong l;
+  };
+
+  struct et {
+    erlang::term e;
+    long l;
+  };
+
+
+  typedef sequence<char> str1;
+  typedef string<12> str2;
+  typedef char str3[3];  	
+
+  typedef sequence<string> sstr3;  // sequence of string
+  typedef sequence<sstr3> ssstr3;  // sequence of sequences of strings
+
+  typedef long  arr3[3];           // array of long
+  typedef sequence<arr3> sarr3;    // sequence of array
+  typedef sequence<sarr3> ssarr3;  // sequence of sequnces of arrays of strings
+    
+ struct strRec{
+    boolean bb;
+    string str4;
+    long str7[3][2];
+    sequence<char> str5; 
+    string<12> str6;
+    str3 str8;
+    str2 str9;
+    str1 str10; 	
+  };
+
+
+  struct dyn {
+    long l;
+    sequence<long> sl;
+  };
+  typedef dyn arr2[1][2];
+
+
+  interface i {
+
+    const short TestConst = 3;	
+
+    //arr2 suck(in arr2 x, out arr2 y );
+
+    ///////////////////////////////// attribute long l;
+
+    // simple types
+    void void_test();
+    long long_test(in long a, out long a1);
+    long long longlong_test(in long long a, out long long a1);	
+    unsigned short ushort_test(in unsigned short a, out unsigned short a1);
+    unsigned long ulong_test(in unsigned long a, out unsigned long a1);
+    unsigned long long ulonglong_test(in unsigned long long a, out unsigned long long a1);
+    double double_test(in double a, out double a1);
+    char char_test(in char a, out char a1);
+    wchar wchar_test(in wchar a, out wchar a1);
+    octet octet_test(in octet a, out octet a1);
+    boolean bool_test(in boolean a, out boolean a1);
+
+    // Seq. and struct tests
+    b struct_test(in b a, out b a1);
+    es struct2_test(in es a, out es a1);
+    //simple struct3_test(in simple x, out simple y);	
+    bseq seq1_test(in bseq a, out bseq a1);
+    aseq seq2_test(in aseq a, out aseq a1);
+    lseq seq3_test(in lseq a, out lseq a1);
+    ssstr3 seq4_test(in ssstr3 a, out ssstr3 a1);
+    ssarr3 seq5_test(in ssarr3 a, out ssarr3 a1);
+
+    // Array tests
+    arr1 array1_test(in arr1 a, out arr1 a1);
+    dd array2_test(in dd a, out dd a1);
+
+    // enum test
+    fruit enum_test(in fruit a, out fruit a1);
+
+    // string tests
+    string string1_test(in string a, out string a1);
+    wstring wstring1_test(in wstring a, out wstring a1);
+    sseq string2_test(in sseq a, out sseq a1);
+    str string3_test(in str a, out str a1);
+    strRec string4_test(in strRec a, out strRec a1);
+
+    // Special erlang types
+    erlang::pid pid_test(in erlang::pid a, out erlang::pid a1);
+    erlang::port port_test(in erlang::port a, out erlang::port a1);
+    erlang::ref ref_test(in erlang::ref a, out erlang::ref a1);
+    erlang::term term_test(in erlang::term a, out erlang::term a1);
+    
+    // typedef test
+    long typedef_test(in apa a, in banan b, out apa a1, out banan b1);
+
+    // inlined seq. test
+    s inline_sequence_test(in s a, out s a1);
+
+    // term seq. test
+    etseq term_sequence_test(in etseq a, out etseq a1);
+    // term struct test
+    et term_struct_test(in et a, out et a1);
+   
+  };
+
+};
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/erl_server.erl b/lib/ic/test/c_client_erl_server_proto_SUITE_data/erl_server.erl
new file mode 100644
index 0000000000..09358b7cf9
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/erl_server.erl
@@ -0,0 +1,28 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2003-2009. 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(erl_server).
+
+-export([run/0, stop/0]).
+
+run() ->
+    m_i:oe_create().
+
+stop() ->
+   gen_server:cast(cidl_test, stop).
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/m_i_impl.erl b/lib/ic/test/c_client_erl_server_proto_SUITE_data/m_i_impl.erl
new file mode 100644
index 0000000000..9f231de856
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/m_i_impl.erl
@@ -0,0 +1,161 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2003-2009. 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(m_i_impl).
+-include("m.hrl").
+
+-export([init/1, terminate/2, void_test/1, long_test/2, ushort_test/2,
+	 longlong_test/2, ulong_test/2, ulonglong_test/2,
+	 double_test/2, char_test/2, wchar_test/2, octet_test/2,
+	 bool_test/2, struct_test/2, struct2_test/2, seq1_test/2,
+	 seq2_test/2, seq3_test/2, seq4_test/2, seq5_test/2,
+	 array1_test/2, array2_test/2, enum_test/2, string1_test/2,
+	 string2_test/2, string3_test/2, string4_test/2, pid_test/2,
+	 port_test/2, ref_test/2, term_test/2, typedef_test/3,
+	 inline_sequence_test/2, '_set_l'/2, '_get_l'/1,
+	 term_struct_test/2, term_sequence_test/2, wstring1_test/2]).
+
+-define(PRINTDEBUG(Case),
+	io:format("erl_server: case: ~p~n"
+		  "erl_server: location: ~p~n", [Case, [?FILE, ?LINE]])).
+-define(PRINTDEBUG2(Case, Msg),
+	io:format("erl_server: case: ~p~n"
+		  "erl_server: Msg: ~p~n"
+		  "erl_server: location: ~p~n", [Case, Msg, [?FILE, ?LINE]])).
+
+init(Env) ->
+    {ok, []}.
+
+terminate(F, R) ->
+    ok.
+
+'_get_l'(State) ->
+    ?PRINTDEBUG("_get_l"),
+    {reply, State, State}.
+void_test(State) ->
+    ?PRINTDEBUG("void_test"),
+    {reply, ok, State}.
+
+'_set_l'(State, V) ->
+    ?PRINTDEBUG2("_set_l", V),
+    {reply, ok, V}.
+ushort_test(State, V) ->
+    ?PRINTDEBUG2("ushort_test", V),
+    {reply, {V, V}, State}.
+long_test(State, V) ->
+    ?PRINTDEBUG2("long_test", V),
+    {reply, {V, V}, State}.
+longlong_test(State, V) ->
+    ?PRINTDEBUG2("longlong_test", V),
+    {reply, {V, V}, State}.
+ulong_test(State, V) ->
+    ?PRINTDEBUG2("ulong_test", V),
+    {reply, {V, V}, State}.
+ulonglong_test(State, V) ->
+    ?PRINTDEBUG2("ulonglong_test", V),
+    {reply, {V, V}, State}.
+double_test(State, V) ->
+    ?PRINTDEBUG2("double_test", V),
+    {reply, {V, V}, State}.
+char_test(State, V) ->
+    ?PRINTDEBUG2("char_test", V),
+    {reply, {V, V}, State}.
+wchar_test(State, V) ->
+    ?PRINTDEBUG2("wchar_test", V),
+    {reply, {V, V}, State}.
+octet_test(State, V) ->
+    ?PRINTDEBUG2("octet_test", V),
+    {reply, {V, V}, State}.
+bool_test(State, V) ->
+    ?PRINTDEBUG2("bool_test", V),
+    {reply, {V, V}, State}.
+
+struct_test(State, V) ->
+    ?PRINTDEBUG2("struct_test", V),
+    {reply, {V, V}, State}.
+struct2_test(State, V) ->
+    ?PRINTDEBUG2("struct2_test", V),
+    {reply, {V, V}, State}.
+seq1_test(State, V) ->
+    ?PRINTDEBUG2("seq1_test", V),
+    {reply, {V, V}, State}.
+seq2_test(State, V) ->
+    ?PRINTDEBUG2("seq2_test", V),
+    {reply, {V, V}, State}.
+seq3_test(State, V) ->
+    ?PRINTDEBUG2("seq3_test", V),
+    {reply, {V, V}, State}.
+seq4_test(State, V) ->
+    ?PRINTDEBUG2("seq4_test", V),
+    {reply, {V, V}, State}.
+seq5_test(State, V) ->
+    ?PRINTDEBUG2("seq5_test", V),
+    {reply, {V, V}, State}.
+array1_test(State, V) ->
+    ?PRINTDEBUG2("array1_test", V),
+    {reply, {V, V}, State}.
+array2_test(State, V) ->
+    ?PRINTDEBUG2("array2_test", V),
+    {reply, {V, V}, State}.
+enum_test(State, V) ->
+    ?PRINTDEBUG2("enum_test", V),
+    {reply, {V, V}, State}.
+string1_test(State, V) ->
+    ?PRINTDEBUG2("string1_test", V),
+    {reply, {V, V}, State}.
+string2_test(State, V) ->
+    ?PRINTDEBUG2("string2_test", V),
+    {reply, {V, V}, State}.
+string3_test(State, V) ->
+    ?PRINTDEBUG2("string3_test", V),
+    {reply, {V, V}, State}.
+string4_test(State, V) ->
+    ?PRINTDEBUG2("string4_test", V),
+    {reply, {V, V}, State}.
+pid_test(State, V) ->
+    ?PRINTDEBUG2("pid_test", V),
+    {reply, {V, V}, State}.
+port_test(State, V) ->
+    ?PRINTDEBUG2("port_test", binary_to_list(term_to_binary(V))),
+    {reply, {V, V}, State}.
+ref_test(State, V) ->
+    ?PRINTDEBUG2("ref_test", binary_to_list(term_to_binary(V))),
+    {reply, {V, V}, State}.
+term_test(State, V) ->
+    ?PRINTDEBUG2("term_test", V),
+    {reply, {V, V}, State}.
+typedef_test(State, A, B) ->
+    ?PRINTDEBUG2("typedef_test", [A,B]),
+    {reply, {4711, A, B}, State}.
+inline_sequence_test(State, V) ->
+    ?PRINTDEBUG2("inline_sequence_test", V),
+    {reply, {V, V}, State}.
+term_sequence_test(State, V) ->
+    ?PRINTDEBUG2("term_sequence_test", V),
+    {reply, {V, V}, State}.
+term_struct_test(State, V) ->
+    ?PRINTDEBUG2("term_struct_test", V),
+    {reply, {V, V}, State}.
+wstring1_test(State, V) ->
+    ?PRINTDEBUG2("wstring1_test", V),
+    {reply, {V, V}, State}.
+
+
+
+
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/my.c b/lib/ic/test/c_client_erl_server_proto_SUITE_data/my.c
new file mode 100644
index 0000000000..f8a3b28cc2
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/my.c
@@ -0,0 +1,50 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2004-2009. 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%
+ *
+ */
+
+#include "ic.h"
+#include "m_i.h"
+
+int my_prepare_notification_encoding(CORBA_Environment *env)
+{
+    return oe_prepare_notification_encoding(env);
+}
+
+int my_send_notification(CORBA_Environment *env)
+{
+    return oe_send_notification(env);
+}
+
+int my_prepare_request_encoding(CORBA_Environment *env) 
+{
+    return oe_prepare_request_encoding(env);
+}
+
+int my_send_request_and_receive_reply(CORBA_Environment *env)
+{
+    return oe_send_request_and_receive_reply(env);
+}
+
+int my_prepare_reply_decoding(CORBA_Environment *env)
+{
+    return oe_prepare_reply_decoding(env);
+}
+
+
+
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE.erl b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE.erl
new file mode 100644
index 0000000000..53bf99c917
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE.erl
@@ -0,0 +1,334 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2004-2010. 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%
+%%
+%%
+
+%%----------------------------------------------------------------------
+%% Purpose : Test suite for c-client/erl-server
+%%----------------------------------------------------------------------
+
+-module(c_client_erl_server_proto_tmo_SUITE).
+-include_lib("common_test/include/ct.hrl").
+
+-export([init_per_testcase/2, end_per_testcase/2,
+	all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 void_test/1, long_test/1, long_long_test/1,
+	 unsigned_short_test/1, unsigned_long_test/1,
+	 unsigned_long_long_test/1, double_test/1, char_test/1,
+	 wchar_test/1, octet_test/1, bool_test/1, struct_test/1,
+	 struct2_test/1, seq1_test/1, seq2_test/1, seq3_test/1,
+	 seq4_test/1, seq5_test/1, array1_test/1, array2_test/1,
+	 enum_test/1, string1_test/1, string2_test/1, string3_test/1,
+	 string4_test/1, pid_test/1, port_test/1, ref_test/1, term_test/1,
+	 typedef_test/1, inline_sequence_test/1, term_sequence_test/1,
+	 term_struct_test/1, wstring1_test/1]).
+
+-define(DEFAULT_TIMEOUT, 20000).
+-define(PORT_TIMEOUT, 15000).
+-define(ERLANG_SERVER_NAME, idl_erlang_server).
+-define(C_CLIENT_NODE_NAME, c_client_idl_test).
+  
+%% Add/remove code path and watchdog before/after each test case.
+%%
+init_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:add_patha(DataDir),
+
+    %% Since other test suites use the module m_i, we have
+    %% to make sure we are using the right m_i module.
+    code:purge(m_i),
+    code:load_file(m_i),
+
+    WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
+    [{watchdog, WatchDog}| Config].
+
+end_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:del_path(DataDir),
+    WatchDog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(WatchDog).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [void_test, long_test, long_long_test,
+     unsigned_short_test, unsigned_long_test,
+     unsigned_long_long_test, double_test, char_test,
+     wchar_test, octet_test, bool_test, struct_test,
+     struct2_test, seq1_test, seq2_test, seq3_test,
+     seq4_test, seq5_test, array1_test, array2_test,
+     enum_test, string1_test, string2_test, string3_test,
+     string4_test, pid_test, port_test, ref_test, term_test,
+     typedef_test, inline_sequence_test, term_sequence_test,
+     term_struct_test, wstring1_test].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+array1_test(doc) -> "";
+array1_test(suite) -> [];
+array1_test(Config) ->
+    do_test(array1_test, Config). 
+
+array2_test(doc) -> "";
+array2_test(suite) -> [];
+array2_test(Config) ->
+    do_test(array2_test, Config).
+
+bool_test(doc) -> "";
+bool_test(suite) -> [];
+bool_test(Config) ->
+    do_test(bool_test, Config).
+
+char_test(doc) -> "";
+char_test(suite) -> [];
+char_test(Config) ->
+    do_test(char_test, Config).
+
+double_test(doc) -> "";
+double_test(suite) -> [];
+double_test(Config) ->
+    do_test(double_test, Config).
+
+enum_test(doc) -> "";
+enum_test(suite) -> [];
+enum_test(Config) ->
+    do_test(enum_test, Config).
+
+inline_sequence_test(doc) -> "";
+inline_sequence_test(suite) -> [];
+inline_sequence_test(Config) ->
+    do_test(inline_sequence_test, Config).
+
+long_long_test(doc) -> "";
+long_long_test(suite) -> [];
+long_long_test(Config) ->
+    do_test(long_long_test, Config).
+
+long_test(doc) -> "";
+long_test(suite) -> [];
+long_test(Config) ->
+    do_test(long_test, Config).
+
+octet_test(doc) -> "";
+octet_test(suite) -> [];
+octet_test(Config) ->
+    do_test(octet_test, Config).
+
+pid_test(doc) -> "";
+pid_test(suite) -> [];
+pid_test(Config) ->
+    do_test(pid_test, Config).
+
+port_test(doc) -> "";
+port_test(suite) -> [];
+port_test(Config) ->
+    do_test(port_test, Config).
+
+ref_test(doc) -> "";
+ref_test(suite) -> [];
+ref_test(Config) ->
+    do_test(ref_test, Config).
+
+seq1_test(doc) -> "";
+seq1_test(suite) -> [];
+seq1_test(Config) ->
+    do_test(seq1_test, Config).
+
+seq2_test(doc) -> "";
+seq2_test(suite) -> [];
+seq2_test(Config) ->
+    do_test(seq2_test, Config).
+
+seq3_test(doc) -> "";
+seq3_test(suite) -> [];
+seq3_test(Config) ->
+    do_test(seq3_test, Config).
+
+seq4_test(doc) -> "";
+seq4_test(suite) -> [];
+seq4_test(Config) ->
+    do_test(seq4_test, Config).
+
+seq5_test(doc) -> "";
+seq5_test(suite) -> [];
+seq5_test(Config) ->
+    do_test(seq5_test, Config).
+
+string1_test(doc) -> "";
+string1_test(suite) -> [];
+string1_test(Config) ->
+    do_test(string1_test, Config).
+
+string2_test(doc) -> "";
+string2_test(suite) -> [];
+string2_test(Config) ->
+    do_test(string2_test, Config).
+
+string3_test(doc) -> "";
+string3_test(suite) -> [];
+string3_test(Config) ->
+    do_test(string3_test, Config).
+
+string4_test(doc) -> "";
+string4_test(suite) -> [];
+string4_test(Config) ->
+    do_test(string4_test, Config).
+
+struct2_test(doc) -> "";
+struct2_test(suite) -> [];
+struct2_test(Config) ->
+    do_test(struct2_test, Config).
+
+struct_test(doc) -> "";
+struct_test(suite) -> [];
+struct_test(Config) ->
+    do_test(struct_test, Config).
+
+term_sequence_test(doc) -> "";
+term_sequence_test(suite) -> [];
+term_sequence_test(Config) ->
+    do_test(term_sequence_test, Config).
+
+term_struct_test(doc) -> "";
+term_struct_test(suite) -> [];
+term_struct_test(Config) ->
+    do_test(term_struct_test, Config).
+
+term_test(doc) -> "";
+term_test(suite) -> [];
+term_test(Config) ->
+    do_test(term_test, Config).
+
+typedef_test(doc) -> "";
+typedef_test(suite) -> [];
+typedef_test(Config) ->
+    do_test(typedef_test, Config).
+
+unsigned_long_long_test(doc) -> "";
+unsigned_long_long_test(suite) -> [];
+unsigned_long_long_test(Config) ->
+    do_test(unsigned_long_long_test, Config).
+
+unsigned_long_test(doc) -> "";
+unsigned_long_test(suite) -> [];
+unsigned_long_test(Config) ->
+    do_test(unsigned_long_test, Config).
+
+unsigned_short_test(doc) -> "";
+unsigned_short_test(suite) -> [];
+unsigned_short_test(Config) ->
+    do_test(unsigned_short_test, Config).
+
+void_test(doc) -> "";
+void_test(suite) -> [];
+void_test(Config) ->
+    do_test(void_test, Config).
+
+wchar_test(doc) -> "";
+wchar_test(suite) -> [];
+wchar_test(Config) ->
+    do_test(wchar_test, Config).
+
+wstring1_test(doc) -> "";
+wstring1_test(suite) -> [];
+wstring1_test(Config) ->
+    do_test(wstring1_test, Config).
+
+
+%% It is here that all tests really are done.
+%%
+     
+do_test(Case, Config) ->
+    %% Trap exits
+    process_flag(trap_exit, true),
+    %% Start the server
+    {ok, _Pid} = m_i:oe_create_link([], {local, ?ERLANG_SERVER_NAME}),
+    Node = atom_to_list(node()),
+    %% [NodeName, HostName] = string:tokens(Node, "@"),
+    DataDir = ?config(data_dir, Config),
+    %% io:format("~p: data directory: ~p~n", [?MODULE, DataDir]),
+    Cookie = atom_to_list(erlang:get_cookie()),
+    %% Start C-client node as a port program.  
+    Cmd = filename:join([DataDir, "c_client"]) ++
+	" -this-node-name " ++ atom_to_list(?C_CLIENT_NODE_NAME) ++
+	" -peer-node " ++ Node ++
+	" -peer-process-name " ++ atom_to_list(?ERLANG_SERVER_NAME) ++
+	" -cookie " ++ Cookie ++ 
+	" -test-case " ++ atom_to_list(Case),
+    Port = open_port({spawn, Cmd}, [exit_status, eof, stderr_to_stdout]),
+    Res = wait_for_completion(Port),
+    %% Kill off node if there was timeout
+    case Res of
+	{error, timeout} ->
+	    catch rpc:cast(?C_CLIENT_NODE_NAME, erlang, halt, [1]);
+	_ ->
+	    ok
+    end, 
+    process_flag(trap_exit, false),
+    catch m_i:stop(?ERLANG_SERVER_NAME),
+    ok = Res.
+
+
+%% Wait for eof *and* exit status, but return if exit status indicates
+%% an error, or we have been waiting more than PORT_TIMEOUT seconds.
+%%
+wait_for_completion(Port) ->
+    wait_for_completion(Port, 0).
+
+wait_for_completion(Port, N) when N < 2 ->
+    receive
+	{Port, {data, Bytes}} ->
+	    %% Relay output
+	    io:format("~s", [Bytes]),
+	    wait_for_completion(Port, N);
+	{Port, {exit_status, 0}} ->
+	    wait_for_completion(Port, N + 1);
+	{Port, {exit_status, Status}} ->
+	    {error, Status};
+	{Port, eof} ->
+	    wait_for_completion(Port, N + 1);
+	{'EXIT', Port, Reason} ->
+	    io:format("Port exited with reason: ~w~n", [Reason]),
+	    wait_for_completion(Port, N);
+	{'EXIT', From, Reason} ->
+	    io:format("Got unexpected exit: ~p~n", [{'EXIT', From, Reason}]),
+	    wait_for_completion(Port, N)
+    after ?PORT_TIMEOUT ->
+	    {error, timeout}
+    end;
+wait_for_completion(_, _) ->
+    ok.
+
+	    
+    
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..62672e0b95
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
@@ -0,0 +1,146 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2004-2009. 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%
+#
+#
+# Makefile.src for c_client_erl_server test
+# Note: This file *must* work for both Unix and Windows
+#
+# We use both `rm' (Unix) and `del' (Windows) for removing files, but
+# with a `-' in front so that the error in not finding `rm' (`del') on
+# Windows (Unix) is ignored.
+#
+# VxWorks? XXX 
+#
+
+.SUFFIXES:
+.SUFFIXES: .c .h .erl .idl @obj@ .@EMULATOR@
+
+
+# Variables from ts: 
+#
+
+ERL_INCLUDE = @erl_include@
+
+IC_INCLUDE_PATH = @ic_include_path@
+IC_LIB = @ic_libpath@@DS@@ic_lib@
+
+ERL_INTERFACE_INCLUDE = @erl_interface_include@
+ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@
+ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@
+ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
+ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
+
+CC = @CC@
+## XXX Should set warning flag with a DEBUG_FLAG 
+CFLAGS = @CFLAGS@ @DEFS@ -I@erl_include@ \
+	-I@ic_include_path@ -I@erl_interface_include@
+
+LD = @LD@
+LDFLAGS = @CROSSLDFLAGS@
+LIBS =	$(IC_LIB) $(ERL_INTERFACE_LIB) $(ERL_INTERFACE_EILIB) \
+	$(ERL_INTERFACE_THREADLIB) @LIBS@ $(ERL_INTERFACE_SOCK_LIBS)
+ERLC = erlc
+
+# Generated C header files
+GEN_H_FILES = \
+	m.h \
+	m_i.h \
+	oe_c_erl_test.h
+
+# Generated C files 
+GEN_C_FILES = \
+	m.c \
+	m_i.c \
+	oe_c_erl_test.c \
+	oe_code_m_a.c \
+	oe_code_m_arr1.c \
+	oe_code_m_arr2.c \
+	oe_code_m_arr3.c \
+	oe_code_m_aseq.c \
+	oe_code_m_b.c \
+	oe_code_m_bseq.c \
+	oe_code_m_dd.c \
+	oe_code_m_dyn.c \
+	oe_code_m_dyn_sl.c \
+	oe_code_m_es.c \
+	oe_code_m_et.c \
+	oe_code_m_etseq.c \
+	oe_code_m_fruit.c \
+	oe_code_m_lseq.c \
+	oe_code_m_s.c \
+	oe_code_m_s_sl.c \
+	oe_code_m_sarr3.c \
+	oe_code_m_simple.c \
+	oe_code_m_ssarr3.c \
+	oe_code_m_sseq.c \
+	oe_code_m_ssstr3.c \
+	oe_code_m_sstr3.c \
+	oe_code_m_str1.c \
+	oe_code_m_str3.c \
+	oe_code_m_strRec.c \
+	oe_code_m_strRec_str5.c \
+	oe_code_m_strRec_str7.c
+
+GEN_HRL_FILES = \
+	m.hrl \
+	m_i.hrl \
+	oe_c_erl_test.hrl
+
+GEN_ERL_FILES = \
+	m.erl \
+	m_arr2.erl \
+	m_arr3.erl \
+	m_i.erl \
+	m_str3.erl \
+	oe_c_erl_test.erl
+
+C_FILES = $(GEN_C_FILES) c_client.c my.c
+
+OBJS = $(C_FILES:.c=@obj@)
+
+PGMS = c_client@exe@
+
+ERL_FILES = $(GEN_ERL_FILES) m_i_impl.erl
+
+EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
+
+
+all: $(PGMS) $(EBINS)
+
+clean:	
+	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
+$(PGMS): $(OBJS)
+	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" \
+		"+{user_protocol,my}" "+{c_timeout,{5000,5000}}" c_erl_test.idl
+
+$(GEN_ERL_FILES) $(GEN_HRL_FILES): c_erl_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
+
+.c@obj@:
+	$(CC) -c -o $*@obj@ $(CFLAGS) $<
+
+.erl.@EMULATOR@:
+	$(ERLC) -I $(IC_INCLUDE_PATH) $<
+
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
new file mode 100644
index 0000000000..b2c5b0c836
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
@@ -0,0 +1,1763 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2004-2010. 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%
+ *
+ */
+/* C-client for test of IC.  
+ * 
+ * TODO:
+ *
+ * 1. XXX #includes for VxWorks, Windows
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef __WIN32__
+#  include <unistd.h>
+#endif
+
+#include <string.h>
+
+#ifdef __WIN32__
+#  include <time.h>
+#  include <sys/timeb.h>
+#elif defined VXWORKS
+#include <time.h>
+#include <sys/times.h>
+#else
+#include <sys/time.h>
+#endif
+
+#include <ctype.h>
+
+#ifdef __WIN32__
+#  include <winsock2.h>
+#  include <windows.h>
+#else
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  include <netdb.h>
+#endif
+
+#include "ei.h"
+#include "erl_interface.h"
+#include "m_i.h"
+
+#define HOSTNAMESZ 256
+#define NODENAMESZ 512
+
+#define INBUFSZ 10
+#define OUTBUFSZ 0
+
+#define MAXTRIES 5
+
+#define CHECK_EXCEPTION(x) \
+    if ((x)->_major != CORBA_NO_EXCEPTION) { \
+	fprintf(stderr,"\n\nException: %s\n\n", \
+		(char *)CORBA_exception_value((x))); \
+        CORBA_exception_free((x)); \
+	return -1; \
+    } \
+
+/* XXX Should free things here too! */
+#define RETURN_IF_OK(x) \
+    if ((x)) {\
+	fprintf(stdout, "ok\n");\
+	return 0;\
+    }\
+
+#define cmp_str(x,y) (!strcmp((x),(y)))
+#define cmp_wstr(x,y) (!ic_wstrcmp((x),(y)))
+
+typedef CORBA_Environment IC_Env;
+
+typedef int (*TestFunc)(IC_Env *);
+typedef struct {
+    char *name; 
+    TestFunc func; 
+} TestCase;
+
+static char longtext[] = 
+"Introduction The IC application is an IDL compiler implemented in Erlang."
+" The IDL compiler generates client stubs and server skeletons."
+" Several back-ends are supported, and they fall into three main groups."
+" For more details on IC compiler options consult the ic(3) manual page."
+" Argument passing cases 1 Caller allocates all necessary storage,"
+" except that which may be encapsulated and managed within the parameter itself."
+" 2 The caller allocates a pointer and passes it by reference to the callee."
+" The callee sets the pointer to point to a valid instance of the parameter's type."
+" The caller is responsible for releasing the returned storage."
+" Following completion of a request, the caller is not allowed to modify any values"
+" in the returned storage. To do so the caller must first copy the returned instance"
+" into a new instance, then modify the new instance. 3 The caller allocates a"
+" pointer to an array slice which has all the same dimensions of the original"
+" array except the first, and passes it by reference to the callee. The callee sets"
+" the pointer to point to a valid instance of the array. The caller is responsible for"
+" releasing the returned storage. Following completion of a request, the caller is not"
+" allowed to modify any values in the returned storage. To do so the caller must first"
+" copy the returned instance into a new instance, then modify the new instance."
+" Generated Files Two files will be generated for each scope. One set of files will be"
+" generated for each module and each interface scope. An extra set is generated for"
+" those definitions at top level scope. One of the files is a header file(.h), and the"
+" other file is a C source code file (.c). In addition to these files a number of C"
+" source files will be generated for type encodings, they are named according to the "
+"following template: oe_code_<type>.c.";
+static char this_node[NODENAMESZ + 1];
+static char *progname;
+
+/* Test function prototypes */
+
+static int void_test(IC_Env *env);
+static int long_test(IC_Env *env);
+static int long_long_test(IC_Env *env);
+static int unsigned_short_test(IC_Env *env);
+static int unsigned_long_test(IC_Env *env);
+static int unsigned_long_long_test(IC_Env *env);
+static int double_test(IC_Env *env);
+static int char_test(IC_Env *env);
+static int wchar_test(IC_Env *env);
+static int octet_test(IC_Env *env);
+static int bool_test(IC_Env *env);
+static int struct_test(IC_Env *env);
+static int struct2_test(IC_Env *env);
+static int seq1_test(IC_Env *env);
+static int seq2_test(IC_Env *env);
+static int seq3_test(IC_Env *env);
+static int seq4_test(IC_Env *env);
+static int seq5_test(IC_Env *env);
+static int array1_test(IC_Env *env);
+static int array2_test(IC_Env *env);
+static int enum_test(IC_Env *env);
+static int string1_test(IC_Env *env);
+static int string2_test(IC_Env *env);
+static int string3_test(IC_Env *env);
+static int string4_test(IC_Env *env);
+static int pid_test(IC_Env *env);
+static int port_test(IC_Env *env);
+static int ref_test(IC_Env *env);
+static int term_test(IC_Env *env);
+static int typedef_test(IC_Env *env);
+static int inline_sequence_test(IC_Env *env);
+static int term_sequence_test(IC_Env *env);
+static int term_struct_test(IC_Env *env);
+static int wstring1_test(IC_Env *env);
+
+static TestCase test_cases[] = {
+    {"void_test", void_test},
+    {"long_test", long_test},
+    {"long_long_test", long_long_test},
+    {"unsigned_short_test", unsigned_short_test},
+    {"unsigned_long_test", unsigned_long_test},
+    {"unsigned_long_long_test", unsigned_long_long_test},
+    {"double_test", double_test},
+    {"char_test", char_test},
+    {"wchar_test", wchar_test},
+    {"octet_test", octet_test},
+    {"bool_test", bool_test},
+    {"struct_test", struct_test},
+    {"struct2_test", struct2_test},
+    {"seq1_test", seq1_test},
+    {"seq2_test", seq2_test},
+    {"seq3_test", seq3_test},
+    {"seq4_test", seq4_test},
+    {"seq5_test", seq5_test},
+    {"array1_test", array1_test},
+    {"array2_test", array2_test},
+    {"enum_test", enum_test},
+    {"string1_test", string1_test},
+    {"string2_test", string2_test},
+    {"string3_test", string3_test},
+    {"string4_test", string4_test},
+    {"pid_test", pid_test},
+    {"port_test", port_test},
+    {"ref_test", ref_test},
+    {"term_test", term_test},
+    {"typedef_test", typedef_test},
+    {"inline_sequence_test", inline_sequence_test},
+    {"term_sequence_test", term_sequence_test},
+    {"term_struct_test", term_struct_test},
+    {"wstring1_test", wstring1_test},
+    {"", NULL}
+};
+
+/* Other prototypes */
+static int cmp_aseq(m_aseq *a1, m_aseq *a2);
+static int cmp_a(m_a *a1, m_a *a2);
+static int cmp_bseq(m_bseq *b1, m_bseq *b2);
+static int cmp_b(m_b *b1, m_b *b2);
+static int cmp_lseq(m_lseq *b1, m_lseq *b2);
+static int cmp_etseq(m_etseq *b1, m_etseq *b2);
+static int cmp_et(m_et* b1, m_et *b2);
+static int cmp_es(m_es *b1, m_es *b2);
+static int cmp_arr1(m_arr1 b1, m_arr1 b2);
+static int cmp_dd(m_dd b1, m_dd b2);
+static int cmp_strRec(m_strRec *b1, m_strRec *b2);
+static int cmp_sseq(m_sseq *b1, m_sseq *b2);
+static int cmp_pid(erlang_pid *p1, erlang_pid *p2);
+static int cmp_port(erlang_port *p1, erlang_port *p2);
+static int cmp_ref(erlang_ref *p1, erlang_ref *p2);
+static int cmp_s(m_s *b1, m_s *b2);
+static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2);
+static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2);
+static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2);
+static int cmp_arr3(m_arr3 b1, m_arr3 b2);
+
+static void print_aseq(m_aseq *a);
+static void print_a(m_a *a);
+static void print_bseq(m_bseq *b);
+static void print_lseq(m_lseq *b);
+static void print_b(m_b *b);
+static void print_etseq(m_etseq *b);
+static void print_et(m_et* b);
+static void print_es(m_es *b);
+static void print_arr1(long a[500]);
+static void print_dd(long a[2][3]);
+static void print_strRec(m_strRec* sr);
+static void print_sseq(m_sseq *b);
+static void print_pid(erlang_pid *p);
+static void print_port(erlang_port *p);
+static void print_ref(erlang_ref *p);
+static void print_term(ETERM *t);
+static void print_s(m_s *p);
+static void print_ssstr3(m_ssstr3 *b1);
+static void print_ssarr3(m_ssarr3 *b1);
+static void print_sarr3(m_sarr3 *b1);
+static void print_arr3(m_arr3 b1);
+static void print_wstr(CORBA_wchar *ws);
+
+static void free_etseq_buf(m_etseq *b);
+static void free_et(m_et* b);
+
+#ifdef __WIN32__
+typedef struct {
+    long tv_sec;
+    long tv_usec;
+} MyTimeval;
+#else
+typedef struct timeval MyTimeval;
+#endif
+static void my_gettimeofday(MyTimeval *tv);
+static void showtime(MyTimeval *start, MyTimeval *stop);
+static void usage(void);
+static void done(int r);
+
+
+
+/* main */
+
+#ifdef VXWORKS
+int client(int argc, char **argv)
+#else
+int main(int argc, char **argv)
+#endif
+{
+    struct hostent *hp;
+    erlang_pid pid;
+    MyTimeval start, stop;
+    int i, fd, ires, tres;
+    IC_Env *env;
+    int tries = 0;
+    char *this_node_name = NULL;
+    char *peer_node = NULL;
+    char *peer_process_name = NULL;
+    char *cookie = NULL;
+    char host[HOSTNAMESZ + 1];
+    TestFunc test_func = NULL;
+    TestCase *test_case;
+    char *test_case_name = NULL;
+    
+#ifdef __WIN32__
+    WORD wVersionRequested;
+    WSADATA wsaData;
+    
+    wVersionRequested = MAKEWORD(2, 0);
+    
+    if (WSAStartup(wVersionRequested, &wsaData) != 0) {
+	fprintf(stderr, "Could not load winsock2 v2.0 compatible DLL");
+	exit(1);
+    }
+#endif
+    
+    progname = argv[0];
+    host[HOSTNAMESZ] = '\0';
+    if (gethostname(host, HOSTNAMESZ) < 0) {
+	fprintf(stderr, "Can't find own hostname\n");
+	done(1);
+    } 
+    if ((hp = gethostbyname(host)) == 0) {
+	fprintf(stderr, "Can't get ip address for host %s\n", host);
+	done(1);
+    }
+    for (i = 1; i < argc; i++) {
+	if (cmp_str(argv[i], "-help")) {
+	    usage();
+	    done(0);
+	} else if (cmp_str(argv[i], "-this-node-name")) {
+	    i++;
+	    this_node_name = argv[i];
+	} else if (cmp_str(argv[i], "-peer-node")) {
+	    i++;
+	    peer_node = argv[i];
+	} else if (cmp_str(argv[i], "-peer-process-name")) {
+	    i++;
+	    peer_process_name = argv[i];
+	} else if (cmp_str(argv[i], "-cookie")) {
+	    i++;
+	    cookie = argv[i];
+	} else if (cmp_str(argv[i], "-test-case")) {
+	    i++;
+	    test_case_name = argv[i];
+	} else {
+	    fprintf(stderr, "Error : invalid argument \"%s\"\n", argv[i]);
+	    usage();
+	    done(1);
+	}
+    }
+
+    if (this_node_name == NULL || peer_node == NULL || test_case_name == NULL 
+	|| peer_process_name == NULL || cookie == NULL) {
+	fprintf(stderr, "Error: missing option\n");
+	usage();
+	done(1);
+    }
+
+    test_case = test_cases;
+    while (test_case->func) {
+	if (cmp_str(test_case->name, test_case_name)) {
+	    test_func = test_case->func;
+	    break;
+	}
+	test_case++;
+    }
+    if (test_func == NULL) {
+	fprintf(stderr, "Error: illegal test case: \"%s\"\n", test_case_name);
+	done(1);
+    }
+    
+    /* Behead hostname at first dot */
+    for (i=0; host[i] != '\0'; i++) {
+	if (host[i] == '.') { host[i] = '\0'; break; }
+    }
+    sprintf(this_node, "%s@%s", this_node_name, host);
+    fprintf(stderr, "c_client: this node: \"%s\"\n", this_node);
+    fprintf(stderr, "c_client: peer node: \"%s\"\n", peer_node);
+    fprintf(stderr, "c_client: test case: \"%s\"\n", test_case_name);
+
+    fprintf(stderr, "c_client: starting\n");
+
+    /* initialize erl_interface */
+    erl_init(NULL, 0);
+
+    for (tries = 0; tries < MAXTRIES; tries++) {
+
+	/* connect to erlang node */ 
+
+    	ires = erl_connect_xinit(host, this_node_name, this_node, 
+				 (struct in_addr *)*hp->h_addr_list, 
+				 cookie, 0);
+
+	fprintf(stderr, "c_client: erl_connect_xinit(): %d\n", ires);
+    
+	fd = erl_connect(peer_node);
+	fprintf(stderr, "c_client: erl_connect(): %d\n", fd);
+    
+	if (fd >= 0) 
+	    break;
+	fprintf(stderr, "c_client: cannot connect, retrying\n");
+    }
+    if (fd < 0) {
+	fprintf(stderr, "c_client: cannot connect, exiting\n");
+	done(1);
+    }
+    env = CORBA_Environment_alloc(INBUFSZ, OUTBUFSZ);
+    env->_fd = fd; 
+    strcpy(env->_regname, peer_process_name);
+    env->_to_pid = NULL;
+    env->_from_pid = &pid;
+    
+    strcpy(pid.node, this_node);
+    pid.num = fd;
+    pid.serial = 0;
+    pid.creation = 0;
+
+    my_gettimeofday(&start);
+    tres = test_func(env);	/* Call test case */
+    my_gettimeofday(&stop);
+    showtime(&start, &stop);
+    erl_close_connection(fd);
+
+    printf("c_client: env->_inbuf before : %d\n", INBUFSZ);
+    printf("c_client: env->_outbuf before : %d\n", OUTBUFSZ);
+    printf("c_client: env->_inbuf after : %d\n", env->_inbufsz);
+    printf("c_client: env->_outbuf after : %d\n", env->_outbufsz);
+
+    CORBA_free(env->_inbuf);
+    CORBA_free(env->_outbuf);
+    CORBA_free(env);
+    done(tres);
+}
+
+static void usage() 
+{
+    fprintf(stderr, "Usage: %s [-help] -this-node-name <name> "
+	    "-peer-node <nodename> -peer-process-name <name> "
+	    "-cookie <cookie> -test-case <test case name>\n", progname);
+    fprintf(stderr, "Example:\n  %s  -this-node-name kalle "
+	    "-peer-node olle@home -peer-process-name idltest "
+	    "-cookie oa678er -test-case octet_test\n", progname);
+}
+
+static void done(int r) 
+{
+#ifdef __WIN32__
+    WSACleanup();
+#endif
+    exit(r);
+}
+
+
+/* TESTS */
+
+static int void_test(IC_Env *env)
+{
+    fprintf(stdout, "\n======== m_i_void test ======\n\n");
+    m_i_void_test(NULL,env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(1);
+}
+
+static int long_test(IC_Env *env)
+{
+    long l = 4711, lo, lr;
+
+    fprintf(stdout, "\n======== m_i_long test ======\n\n");
+    lr = m_i_long_test(NULL, l, &lo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(l == lo && l == lr);
+    if (l != lo)
+	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", l, lo);
+    if (l != lr)
+	fprintf(stdout, " result error, sent: %ld, got: %ld\n", l, lr);
+    return -1;
+}
+
+static int long_long_test(IC_Env *env)
+{
+    CORBA_long_long ll = 4711, llo, llr;
+
+    fprintf(stdout, "\n======== m_i_longlong test ======\n\n");
+    llr = m_i_longlong_test(NULL, ll, &llo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ll == llo && ll == llr);
+    if (ll != llo)
+	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", 
+		ll, llo);
+    if (ll != llr)
+	fprintf(stdout, " result error, sent: %ld, got: %ld\n", ll, llr);
+    return -1;
+}
+
+static int unsigned_short_test(IC_Env *env)
+{
+    unsigned short x, y = 2, z;
+
+    fprintf(stdout, "\n======== m_i_ushort test ======\n\n");
+    x = m_i_ushort_test(NULL, y, &z, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(y == z && y == x);
+    if (y != z) 
+	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", y, z);
+    if (y != x)
+	fprintf(stdout, " result error, sent: %d, got: %d\n", y, x);
+    return -1;
+}
+
+
+static int unsigned_long_test(IC_Env *env)
+{
+    unsigned long ul = 5050, ulo, ulr;
+
+    fprintf(stdout, "\n======== m_i_ulong test ======\n\n");
+    ulr = m_i_ulong_test(NULL, ul, &ulo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ul == ulo && ul == ulr);
+    if (ul != ulo) 
+	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
+		ul, ulo);
+    if (ul != ulr)
+	fprintf(stdout, " result error, sent: %lu, got: %lu\n", ul, ulr);
+    return -1;
+}
+
+/* 
+ * Note: CORBA_unsigned_long_long is in fact a plain long.
+ */
+static int unsigned_long_long_test(IC_Env *env)
+{
+    CORBA_unsigned_long_long ull = 5050, ullo, ullr;
+
+    fprintf(stdout, "\n======== m_i_ulonglong test ======\n\n");
+    ullr = m_i_ulonglong_test(NULL, ull, &ullo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ull == ullo && ull == ullr);
+    if (ull != ullo)
+	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
+		ull, ullo); 
+    if (ull != ullr)
+	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
+		ull, ullr);
+    return -1;
+}
+
+static int double_test(IC_Env *env)
+{
+    double d = 12.1212, db, dr;
+
+    fprintf(stdout, "\n======== m_i_double test ======\n\n");
+    dr = m_i_double_test(NULL, d, &db, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(d == db && d == dr);
+    if (d != db)
+	fprintf(stdout, " out parameter error, sent: %f, got: %f\n", d, db);
+    if (d != dr)
+	fprintf(stdout, " result error, sent: %f, got: %f\n", d, dr);
+    return -1;
+}    
+
+static int char_test(IC_Env *env)
+{
+    char c = 'g', co, cr;
+
+    /* char test */
+    fprintf(stdout, "\n======== m_i_char test ======\n\n");
+    cr = m_i_char_test(NULL, c, &co, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(c == co && c == cr);
+    if (c !=co) 
+	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", c, co);
+    if (c != cr)
+	fprintf(stdout, " result error, sent: %c, got: %c\n", c, cr);
+    return -1;
+}
+
+static int wchar_test(IC_Env *env)
+{
+    CORBA_wchar wc = 103, wco, wcr;
+
+    fprintf(stdout, "\n======== m_i_wchar test ======\n\n");
+    wcr = m_i_wchar_test(NULL, wc, &wco, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(wc == wco && wc == wcr);
+    if (wc != wco)
+	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
+		wc, wco);
+    if (wc != wcr)
+	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
+		wc, wcr);
+    return -1;
+}    
+
+static int octet_test(IC_Env *env)
+{
+    char o ='r', oo, or;
+ 
+    fprintf(stdout, "\n======== m_i_octet test ======\n\n");
+    or = m_i_octet_test(NULL, o, &oo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(o == oo && o == or);
+    if (o != oo)
+	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", o, oo);
+    if (o != or)
+	fprintf(stdout, " result error, sent: %c, got: %c\n", o, or);
+    return -1;
+}    
+
+static int bool_test(IC_Env *env)
+{
+    unsigned char i = 0, io, ir;	
+
+    fprintf(stdout, "\n======== m_i_bool test ======\n\n");
+    ir = m_i_bool_test(NULL, i, &io, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(i == io && i == ir);
+    if (i != io)
+	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", i, io);
+    if (i != ir)
+	fprintf(stdout, " result error, sent: %d, got: %d\n", i, ir);
+    return -1;
+}
+
+static int struct_test(IC_Env *env)
+{
+    m_b b = {4711, 'a'}, bo, br;
+
+    fprintf(stdout, "\n======== m_i_struct test ======\n\n");
+    br = m_i_struct_test(NULL, &b, &bo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_b(&b, &bo) && cmp_b(&b, &br));
+    if (!cmp_b(&b, &bo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_b(&b);
+	fprintf(stdout, " got:\n");
+	print_b(&bo);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_b(&b, &br)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_b(&b);
+	fprintf(stdout, " got:\n");
+	print_b(&br);
+	fprintf(stdout, "\n");
+    }
+    return -1;
+}
+
+static int struct2_test(IC_Env *env)
+{
+    m_es esi = {m_peach, 5050}, eso, esr;
+
+    fprintf(stdout, "\n======== m_i_struct2 test ======\n\n");
+    esr = m_i_struct2_test(NULL, &esi, &eso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_es(&esi, &eso) && cmp_es(&esi, &esr));
+    if (!cmp_es(&esi, &eso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_es(&esi);
+	fprintf(stdout, " got:\n");
+	print_es(&eso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_es(&esi, &esr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_es(&esi);
+	fprintf(stdout, " got:\n");
+	print_es(&esr);
+	fprintf(stdout, "\n");
+    }
+    return -1;
+}
+
+
+static int seq1_test(IC_Env *env)
+{
+    m_bseq bs, *bso, *bsr;
+
+    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
+    bs._length = 3;
+    bs._buffer = ba;
+
+    fprintf(stdout, "\n======== m_i_seq1 test ======\n\n");
+    bsr = m_i_seq1_test(NULL, &bs, &bso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_bseq(&bs, bso) && cmp_bseq(&bs, bsr));
+    if (!cmp_bseq(&bs, bso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_bseq(&bs);
+	fprintf(stdout, " got:\n");
+	print_bseq(bso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_bseq(&bs, bsr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_bseq(&bs);
+	fprintf(stdout, " got:\n");
+	print_bseq(bsr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(bso);
+    CORBA_free(bsr);
+    return -1;
+}
+
+static int seq2_test(IC_Env *env)
+{
+    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
+    m_a a;
+    m_a aa[2];
+    m_aseq as, *aso, *asr;
+
+    a.l = 9999;
+    a.y._length = 3;
+    a.y._buffer = ba;
+    a.d = 66.89898989;
+
+    aa[0] = a;
+    aa[1] = a;
+    as._length = 2;
+    as._buffer = aa;
+
+    fprintf(stdout, "\n======== m_i_seq2 test ======\n\n");
+    asr = m_i_seq2_test(NULL, &as, &aso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_aseq(&as, aso) && cmp_aseq(&as, asr));
+    if (!cmp_aseq(&as, aso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_aseq(&as);
+	fprintf(stdout, " got:\n");
+	print_aseq(aso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_aseq(&as, asr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_aseq(&as);
+	fprintf(stdout, " got:\n");
+	print_aseq(asr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(aso);
+    CORBA_free(asr);
+    return -1;
+}
+
+static int seq3_test(IC_Env *env)
+{
+    m_lseq lsi, *lso, *lsr;
+    long al[500];
+    int i=0;
+    
+    for (i = 0; i < 500; i++)
+	al[i]=i;
+    lsi._length = 500;
+    lsi._buffer = al;
+
+    fprintf(stdout, "\n======== m_i_seq3 test ======\n\n");
+    lsr = m_i_seq3_test(NULL, &lsi, &lso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_lseq(&lsi, lso) && cmp_lseq(&lsi, lsr));
+    if (!cmp_lseq(&lsi, lso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_lseq(&lsi);
+	fprintf(stdout, " got:\n");
+	print_lseq(lso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_lseq(&lsi, lsr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_lseq(&lsi);
+	fprintf(stdout, " got:\n");
+	print_lseq(lsr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(lso);
+    CORBA_free(lsr);
+    return -1;
+}
+
+static int seq4_test(IC_Env *env)
+{
+    char *stra0[3] = {"a", "long", "time"}; 
+    char *stra1[3] = {"ago", "there", "was"}; 
+    char *stra2[3] = {"a", "buggy", "compiler"}; 
+    m_sstr3 str3s[3] = {{3, 3, stra0}, {3, 3, stra1}, {3, 3, stra2}};
+    m_ssstr3 str3ssi = {3, 3, str3s}; 
+    m_ssstr3 *str3sso, *str3ssr;
+
+    fprintf(stdout, "\n======== m_i_seq4 test ======\n\n");
+    str3ssr = m_i_seq4_test(NULL, &str3ssi, &str3sso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_ssstr3(&str3ssi, str3sso) && 
+		 cmp_ssstr3(&str3ssi, str3ssr));
+    if (!cmp_ssstr3(&str3ssi, str3sso)){
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_ssstr3(&str3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssstr3(str3sso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_ssstr3(&str3ssi, str3ssr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_ssstr3(&str3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssstr3(str3ssr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(str3sso);
+    CORBA_free(str3ssr);
+    return -1;
+}
+
+static int seq5_test(IC_Env *env)
+{
+    m_arr3 arr3a[3] = {
+	{4711, 18931947, 3}, 
+	{4711, 18931947, 3},
+	{4711, 18931947, 3}};
+    m_sarr3 arr3sa[3] = {{3, 3, arr3a}, {3, 3, arr3a}, {3, 3, arr3a}};
+    m_ssarr3 arr3ssi = {3, 3, arr3sa};
+    m_ssarr3 *arr3sso;
+    m_ssarr3 *arr3ssr;
+
+    fprintf(stdout, "\n======== m_i_seq5 test ======\n\n");
+    arr3ssr = m_i_seq5_test(NULL, &arr3ssi, &arr3sso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_ssarr3(&arr3ssi, arr3sso) &&
+		 cmp_ssarr3(&arr3ssi, arr3ssr));
+    if (!cmp_ssarr3(&arr3ssi, arr3sso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_ssarr3(&arr3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssarr3(arr3sso);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_ssarr3(&arr3ssi, arr3ssr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_ssarr3(&arr3ssi);
+	fprintf(stdout, " got:\n");
+	print_ssarr3(arr3ssr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(arr3sso);
+    CORBA_free(arr3ssr);
+    return -1;
+}
+
+static int array1_test(IC_Env *env)
+{
+    int i;
+    long al[500];
+    m_arr1 alo;
+    m_arr1_slice* alr;
+    
+    for (i = 0; i < 500; i++)
+	al[i]=i;
+
+    fprintf(stdout, "\n======== m_i_array1 test ======\n\n");
+    alr = m_i_array1_test(NULL, al, alo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_arr1(al, alo) && cmp_arr1(al, alr));
+    if (!cmp_arr1(al, alo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_arr1(al);
+	fprintf(stdout, " got:\n");
+	print_arr1(alo);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_arr1(al,alr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_arr1(al);
+	fprintf(stdout, " got:\n");
+	print_arr1(alr);
+	fprintf(stdout, "\n");
+    }
+    free(alo);
+    free(alr);
+    return -1;
+}   
+
+static int array2_test(IC_Env *env)
+{
+    long dl[2][3] = {{11, 2, 7}, {22, 8 ,13}};
+    m_dd dlo;
+    m_dd_slice* dlr;
+
+    fprintf(stdout, "\n======== m_i_array2 test ======\n\n");
+    dlr = m_i_array2_test(NULL, dl, dlo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_dd(dl,dlo) && cmp_dd(dl,dlr));
+    if (!cmp_dd(dl,dlo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_dd(dl);
+	fprintf(stdout, " got:\n");
+	print_dd(dlo);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_dd(dl,dlr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_dd(dl);
+	fprintf(stdout, " got:\n");
+	print_dd(dlr);
+	fprintf(stdout, "\n");
+    }
+    free(*dlr);
+    return -1;
+}
+
+static int enum_test(IC_Env *env)
+{
+    m_fruit ei = m_banana, eo, er;
+
+    fprintf(stdout, "\n======== m_i_enum test ======\n\n");
+    er = m_i_enum_test(NULL, ei, &eo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(ei == eo && ei == er);
+    if (ei != eo)
+	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", ei, eo);
+    if (ei != er)
+	fprintf(stdout, " result error, sent: %d, got: %d\n", ei, er);
+    return -1;
+}
+
+static int string1_test(IC_Env *env)
+{
+    char* si = longtext;
+    char* so;
+    char* sr;
+
+    fprintf(stdout, "\n======== m_i_string1 test ======\n\n");
+    sr = m_i_string1_test(NULL, si, &so, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, sr));
+    if (!cmp_str(si, so))
+	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
+    if (!cmp_str(si, sr))
+	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
+    CORBA_free(so);
+    CORBA_free(sr);
+    return -1;
+}
+  
+static int string2_test(IC_Env *env)
+{
+    char* sa[3] = {"hello", "foo", "bar"};
+    m_sseq ssi = {3, 3, sa};
+    m_sseq *sso, *ssr;
+
+    fprintf(stdout, "\n======== m_i_string2 test ======\n\n");
+    ssr = m_i_string2_test(NULL, &ssi, &sso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_sseq(&ssi, sso) && cmp_sseq(&ssi, sso));
+    if (!cmp_sseq(&ssi, sso)) {
+	fprintf(stdout, " out parameter error, sent:\n"); 
+	print_sseq(&ssi); 
+	fprintf(stdout, "got:\n");
+	print_sseq(sso); 
+    } 
+    if (!cmp_sseq(&ssi, ssr)) {
+	fprintf(stdout, " result error, sent:\n"); 
+	print_sseq(&ssi); 
+	fprintf(stdout, "got:\n"); 
+	print_sseq(ssr); 
+    }    
+    CORBA_free(sso);
+    CORBA_free(ssr);
+    return -1;
+}
+ 
+static int string3_test(IC_Env *env)
+{
+    char* si = longtext;
+    char* so;
+    char* sr;
+
+    fprintf(stdout, "\n======== m_i_string3 test ======\n\n");
+    sr = m_i_string3_test(NULL, si, &so, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, so));
+    if (!cmp_str(si, so))
+	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
+    if (!cmp_str(si, sr))
+	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
+    CORBA_free(so);
+    CORBA_free(sr);
+    return -1;
+}
+
+static int string4_test(IC_Env *env)
+{
+    char as1[100] = "a string", as2[200] = "help", as3[200] = "hello there";
+    m_strRec stri = { 1,	/* dd */
+		      as1,	/* str4 */
+		      {{'a', 'k'}, {'z', 'g'}, {'n', 'q'}}, /* str7 */
+		      {3, 3, "buf"}, /* str5 */
+		      as2,	/* str6 */
+		      {'m', 'f', 'o'}, /* str8 */
+		      as3,	/* str9 */
+		      {3, 3, "stu"} /* str10 */
+    };
+    m_strRec *stro, *strr;
+
+    fprintf(stdout, "\n======== m_i_string4 test ======\n\n");
+    strr = m_i_string4_test(NULL, &stri, &stro, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_strRec(&stri,stro) && cmp_strRec(&stri,strr));
+    if (!cmp_strRec(&stri,stro)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_strRec(&stri);
+	fprintf(stdout, " got:\n");
+	print_strRec(stro);
+	fprintf(stdout, "\n");
+    }
+    if (!cmp_strRec(&stri,strr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_strRec(&stri);
+	fprintf(stdout, " got:\n");
+	print_strRec(strr);
+	fprintf(stdout, "\n");
+    }
+    CORBA_free(stro);
+    CORBA_free(strr);
+    return -1;
+}
+
+
+static int pid_test(IC_Env *env)
+{
+    erlang_pid pid = {"", 7, 0, 0}, pido, pidr;
+
+    strcpy(pid.node, this_node), /* this currently running node */
+    fprintf(stdout, "\n======== m_i_pid test ======\n\n");
+    pidr = m_i_pid_test(NULL, &pid, &pido, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_pid(&pid, &pido) && cmp_pid(&pid, &pidr));
+    if (!cmp_pid(&pid, &pido)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_pid(&pid);
+	fprintf(stdout, "got:\n");
+	print_pid(&pido);
+    }
+    if (!cmp_pid(&pid, &pidr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_pid(&pid);
+	fprintf(stdout, "got:\n");
+	print_pid(&pidr);
+    }
+    return -1;
+}
+
+static int port_test(IC_Env *env)
+{
+    erlang_port porti = {"node", 5, 1}, porto, portr;
+
+    fprintf(stdout, "\n======== m_i_port test ======\n\n");
+    portr = m_i_port_test(NULL, &porti, &porto, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_port(&porti, &porto) && cmp_port(&porti, &portr));
+    if (!cmp_port(&porti, &porto)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_port(&porti);
+	fprintf(stdout, "got:\n");
+	print_port(&porto);
+    }
+    if (!cmp_port(&porti, &portr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_port(&porti);
+	fprintf(stdout, "got:\n");
+	print_port(&portr);
+    }
+    return -1;
+}
+
+static int ref_test(IC_Env *env)
+{
+    erlang_ref refi = { "node1", 3, {1, 2, 3}, 1},  
+	refo, refr;
+
+    fprintf(stdout, "\n======== m_i_ref test ======\n\n");
+    refr = m_i_ref_test(NULL, &refi, &refo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_ref(&refi, &refo) && cmp_ref(&refi, &refr));
+    if (!cmp_ref(&refi, &refo)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_ref(&refi);
+	fprintf(stdout, "got:\n");
+	print_ref(&refo);
+    }
+    if (!cmp_ref(&refi, &refr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_ref(&refi);
+	fprintf(stdout, "got:\n");
+	print_ref(&refr);
+    }
+    return -1;
+}
+
+static int term_test(IC_Env *env)
+{
+    ETERM *ti, *to, *tr;
+
+    ti = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
+
+    fprintf(stdout, "\n======== m_i_term test ======\n\n");
+    tr = m_i_term_test(NULL, ti, &to, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(erl_match(ti, to) && erl_match(ti, tr));
+    if (!erl_match(ti, to)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_term(ti);
+	fprintf(stdout, "got:\n");
+	print_term(to);
+    }
+    if (!erl_match(ti, tr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_term(ti);
+	fprintf(stdout, "got:\n");
+	print_term(tr);
+    }
+    erl_free_term(ti);
+    erl_free_term(to);
+    erl_free_term(tr);
+    return -1;
+}
+
+static int typedef_test(IC_Env *env)
+{
+    m_banan mbi, mbo;		/* erlang_port */
+    m_apa mai;			/* ETERM* */
+    m_apa mao = NULL;
+    long tl;
+
+    strcpy(mbi.node,"node");
+    mbi.id = 15;
+    mbi.creation = 1;
+
+    fprintf(stdout, "\n======== m_i_typedef test ======\n\n");
+    mai = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
+    tl = m_i_typedef_test(NULL, mai, &mbi, &mao, &mbo, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(erl_match(mai, mao) && cmp_port(&mbi, &mbo) && tl == 4711);
+    if (!erl_match(mai, mao)) {
+	fprintf(stdout, " out parameter error (term), sent:\n");
+	print_term(mai);
+	fprintf(stdout, "got:\n");
+	print_term(mao);
+    }
+    if (!cmp_port(&mbi, &mbo)) {
+	fprintf(stdout, " out parameter error (port), sent:\n");
+	print_port(&mbi);
+	fprintf(stdout, "got:\n");
+	print_port(&mbo);
+    }
+    if (tl != 4711) {
+	fprintf(stdout, " result error, sent: 4711, got %ld\n", tl);
+    }
+    erl_free_term(mai);
+    erl_free_term(mao);
+    return -1;
+} 
+  
+static int inline_sequence_test(IC_Env *env)
+{
+    int i;
+    long al[500];
+    m_s isi = {4711, {500, 10, al}},  
+	*iso, *isr;
+
+    for (i = 0; i < 500; i++)
+	al[i]=i;
+    fprintf(stdout, "\n======== m_i_inline_sequence test ======\n\n");
+    isr = m_i_inline_sequence_test(NULL, &isi, &iso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_s(&isi, iso) && cmp_s(&isi, isr));
+    if (!cmp_s(&isi, iso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_s(&isi);
+	fprintf(stdout, "got:\n");
+	print_s(iso);
+    }
+    if (!cmp_s(&isi, isr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_s(&isi);
+	fprintf(stdout, "got:\n");
+	print_s(isr);
+    }
+    CORBA_free(iso);
+    CORBA_free(isr);
+    return -1;
+}
+
+static int term_sequence_test(IC_Env *env)
+{
+    ETERM* et_array[4] = {
+	erl_format("[{apa, 1, 23}, \"string\", {1.23, 45}]"),
+	erl_format("[{banan, 1, 23}, \"string\", {1.23, 45}]"),
+	erl_format("[{apelsin, 1, 23}, \"string\", {1.23, 45}]"),
+	erl_format("[{mango, 1, 23}, \"string\", {1.23, 45}]")};
+    m_etseq etsi = {4, 4, et_array}, *etso, *etsr;
+
+    fprintf(stdout, "\n======== m_i_term_sequence test ======\n\n");
+    etsr = m_i_term_sequence_test(NULL, &etsi, &etso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_etseq(&etsi, etso) && cmp_etseq(&etsi, etsr));
+    if (!cmp_etseq(&etsi, etso)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_etseq(&etsi);
+	fprintf(stdout, "got:\n");
+	print_etseq(etso);
+    }
+    if (!cmp_etseq(&etsi, etsr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_etseq(&etsi);
+	fprintf(stdout, "got:\n");
+	print_etseq(etsr);
+    }
+    free_etseq_buf(&etsi);
+    free_etseq_buf(etso);
+    free_etseq_buf(etsr);
+    CORBA_free(etso);
+    CORBA_free(etsr);
+    return -1;
+}
+
+static int term_struct_test(IC_Env *env)
+{
+    m_et eti = { erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]"), 
+		 121212 };
+    m_et eto, etr;
+
+    fprintf(stdout, "\n======== m_i_term_struct test ======\n\n");
+    etr = m_i_term_struct_test(NULL, &eti, &eto, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_et(&eti, &eto) && cmp_et(&eti, &etr));
+    if (!cmp_et(&eti, &eto)) {
+	fprintf(stdout, " out parameter error, sent:\n");
+	print_et(&eti);
+	fprintf(stdout, "got:\n");
+	print_et(&eto);
+    }
+    if (!cmp_et(&eti, &etr)) {
+	fprintf(stdout, " result error, sent:\n");
+	print_et(&eti);
+	fprintf(stdout, "got:\n");
+	print_et(&etr);
+    }
+    free_et(&eti);
+    free_et(&eto);
+    free_et(&etr);
+    return -1;
+}
+
+static int wstring1_test(IC_Env *env)
+{
+    CORBA_wchar wsi[] = {100, 101, 102, 103, 104, 0}, *wso, *wsr;
+
+    fprintf(stdout, "\n======== m_i_wstring1 test ======\n\n");
+    wsr = m_i_wstring1_test(NULL, wsi, &wso, env);
+    CHECK_EXCEPTION(env);
+    RETURN_IF_OK(cmp_wstr(wsi, wso) && cmp_wstr(wsi, wsr));
+    if (!cmp_wstr(wsi, wso)) {
+	fprintf(stdout, " out parameter error, sent: \n");
+	print_wstr(wsi);
+	fprintf(stdout, "got:\n");
+	print_wstr(wso);
+    }
+    if (!cmp_wstr(wsi, wsr)) {
+	fprintf(stdout, " result error, sent: \n");
+	print_wstr(wsi);
+	fprintf(stdout, "got:\n");
+	print_wstr(wsr);
+    }
+    CORBA_free(wso);
+    CORBA_free(wsr);
+    return -1;
+}
+
+/* Compare functions */
+static int cmp_aseq(m_aseq *a1, m_aseq *a2)
+{
+    int i;
+
+    if (a1->_length != a2->_length)
+	return 0;
+    for (i = 0; i < a1->_length; i++)
+	if (cmp_a(&(a1->_buffer[i]), &(a2->_buffer[i])) == 0)
+	    return 0;
+    return 1;
+}
+
+static int cmp_a(m_a *a1, m_a *a2)
+{
+    return a1->l == a2->l && 
+	a1->d == a2->d && 
+	cmp_bseq(&a1->y, &a2->y);
+}
+
+static int cmp_bseq(m_bseq *b1, m_bseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (cmp_b(&(b1->_buffer[i]), &(b2->_buffer[i])) == 0)
+	    return 0;
+    return 1;
+}
+
+static int cmp_b(m_b *b1, m_b *b2)
+{
+    return b1->l == b2->l && b1->c == b2->c;
+}
+
+static int cmp_lseq(m_lseq *b1, m_lseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (b1->_buffer[i] != b2->_buffer[i])
+	    return 0;
+    return 1;
+}
+
+static int cmp_etseq(m_etseq *b1, m_etseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (!erl_match(b1->_buffer[i], b2->_buffer[i]))
+	    return 0;
+    return 1;
+}
+
+static int cmp_et(m_et* b1, m_et *b2)
+{
+    return erl_match(b1->e, b2->e) && b1->l == b2->l;
+}
+
+static int cmp_es(m_es *b1, m_es *b2)
+{
+    return b1->f == b2->f && b1->l == b2->l;
+}
+
+static int cmp_arr1(m_arr1 b1, m_arr1 b2)
+{
+    int i;
+
+    for (i = 0; i < 500; i++)
+	if (b1[i] != b2[i])
+	    return 0;
+    return 1; 
+}
+
+static int cmp_dd(m_dd b1, m_dd b2)
+{
+
+    int i, j;
+
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    if (b1[i][j] != b2[i][j])
+		return 0;
+    return 1; 
+}
+
+
+
+static int cmp_strRec(m_strRec *b1, m_strRec *b2)
+{
+    int i, j;
+
+    if (b1->bb != b2->bb) 
+	return 0;
+    if (!cmp_str(b1->str4,b2->str4))
+	return 0;
+    if (b1->str5._length != b2->str5._length)
+	return 0;
+    for (j = 0; j < b1->str5._length; j++)
+	if (b1->str5._buffer[j] != b2->str5._buffer[j])
+	    return 0;
+    if (!cmp_str(b1->str6,b2->str6))
+	return 0;
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    if (b1->str7[i][j] != b2->str7[i][j])
+		return 0;
+    for (j = 0; j < 3; j++)
+	if (b1->str8[j] != b2->str8[j])
+	    return 0;
+    if (!cmp_str(b1->str9,b2->str9))
+	return 0;
+    if (b1->str10._length != b2->str10._length)
+	return 0;
+    for (j = 0; j < b1->str10._length; j++)
+	if (b1->str10._buffer[j] != b2->str10._buffer[j])
+	    return 0;
+    return 1; 
+}
+
+
+static int cmp_sseq(m_sseq *b1, m_sseq *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++)
+	if (!cmp_str(b1->_buffer[i], b2->_buffer[i]))
+	    return 0;
+    return 1;
+}
+
+
+static int cmp_pid(erlang_pid *p1, erlang_pid *p2)
+{
+    return cmp_str(p1->node,p2-> node) && 
+	p1->num == p2->num && 
+	p1->serial == p2->serial &&
+	p1->creation == p2->creation;
+}
+
+static int cmp_port(erlang_port *p1, erlang_port *p2)
+{
+    return cmp_str(p1->node,p2-> node) && p1->id == p2->id;
+}
+
+static int cmp_ref(erlang_ref *p1, erlang_ref *p2)
+{
+    return cmp_str(p1->node, p2->node) && 
+	p1->len == p2->len &&
+	(p1->len < 1 || p1->n[0] == p2->n[0]) &&
+	(p1->len < 2 || p1->n[1] == p2->n[1]) &&
+	(p1->len < 3 || p1->n[2] == p2->n[2]);
+}
+
+static int cmp_s(m_s *b1, m_s *b2)
+{
+    int i;
+
+    if (b1->l != b2->l)
+	return 0;
+    if (b1->sl._length != b2->sl._length)
+	return 0;
+    for (i = 0; i < b1->sl._length; i++)
+	if (b1->sl._buffer[i] != b2->sl._buffer[i])
+	    return 0;
+    return 1;
+}
+
+
+static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2)
+{
+    int i,j;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++) {
+	if (b1->_buffer[i]._length != b2->_buffer[i]._length)
+	    return 0;
+	for (j = 0; j < b1->_buffer[i]._length; j++)
+	    if (!cmp_str(b1->_buffer[i]._buffer[j], 
+		      b2->_buffer[i]._buffer[j]))
+		return 0;
+    }
+    return 1;
+}
+
+
+
+static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++) {
+	if (!cmp_sarr3(&b1->_buffer[i], &b2->_buffer[i]))
+	    return 0;
+    }
+    return 1;
+}
+
+static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2)
+{
+    int i;
+
+    if (b1->_length != b2->_length)
+	return 0;
+    for (i = 0; i < b1->_length; i++) {
+	if (!cmp_arr3(b1->_buffer[i], b2->_buffer[i]))
+	    return 0;
+    }
+    return 1;
+}
+
+static int cmp_arr3(m_arr3 b1, m_arr3 b2)
+{
+    int i;
+
+    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) {
+	if (b1[i] != b2[i])
+	    return 0;
+    }
+    return 1;
+}
+
+/* Print functions */
+static void print_aseq(m_aseq *a)
+{
+    int i;
+    fprintf(stdout, "\nm_aseq size: %ld  --------\n", a->_length);
+    for (i = 0; i < a->_length; i++)
+	print_a(&(a->_buffer[i]));
+}
+
+static void print_a(m_a *a)
+{
+    fprintf(stdout, "\nm_a --------\n l: %ld\n d:%f\n", a->l, a->d);
+    print_bseq(&a->y);
+}
+
+static void print_bseq(m_bseq *b)
+{
+    int i;
+
+    fprintf(stdout, "\nm_bseq size: %ld  --------\n",b->_length);
+    for (i = 0; i < b->_length; i++)
+	print_b(&(b->_buffer[i]));
+}
+
+static void print_lseq(m_lseq *b)
+{
+    int i;
+
+    fprintf(stdout, "\nm_lseq size: %ld  --------\n",b->_length);
+    for (i = 0; i < b->_length; i++)
+	fprintf(stdout, "[%d]: %ld\n", i, b->_buffer[i]);
+}
+
+static void print_b(m_b *b)
+{
+    fprintf(stdout, "\nm_b --------\n l: %ld\n c: %c\n", b->l, b->c);
+}
+
+
+static void print_etseq(m_etseq *b)
+{
+    int i;
+
+    for (i = 0; i < b->_length; i++) {
+	fprintf(stdout, "[%d]:\n", i);
+	erl_print_term(stdout, b->_buffer[i]);
+    }
+}
+
+
+static void print_et(m_et* b)
+{
+    fprintf(stdout, "\net struct --------\n");
+    erl_print_term(stdout, b->e);
+    fprintf(stdout, "long: %ld\n", b->l);
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_es(m_es *b)
+{
+    fprintf(stdout, "\nm_es --------\n f: %d\n l: %ld\n", b->f, b->l);
+}
+
+
+static void print_arr1(long a[10])
+{
+    int i;
+
+    for (i = 0; i < 10; i++)
+	fprintf(stdout, "\n[%d]: %ld\n", i, a[i]);
+}
+
+static void print_dd(long a[2][3])
+{
+    int i, j;
+
+    fprintf(stdout, "\nlong dd[2][3] --------\n");
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    fprintf(stdout, "\n[%d][%d]: %ld\n", i, j, a[i][j]);
+}
+
+
+static void print_strRec(m_strRec* sr)
+{
+    int i, j;
+
+    fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
+    fprintf(stdout, "string str4 : %s\n",sr->str4);
+    fprintf(stdout, "str7[2][3] :\n");
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++)
+	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
+    fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
+    for (j = 0; j < sr->str5._length; j++)
+	fprintf(stdout, "str5._buffer[%d]: %c\n", j, sr->str5._buffer[j]);
+    fprintf(stdout, "string str6 : %s\n",sr->str6);
+    fprintf(stdout, "str8 :\n");
+    for (j = 0; j < 3; j++)
+	fprintf(stdout, "str8[%d]: %c\n", j, sr->str8[j]);
+    fprintf(stdout, "string str9 : %s\n",sr->str9);
+    fprintf(stdout, "str10._length : %ld\n",sr->str10._length);
+    for (j = 0; j < sr->str10._length; j++)
+	fprintf(stdout, "str10._buffer[%d]: %c\n", j, sr->str10._buffer[j]);
+}
+
+static void print_sseq(m_sseq *b)
+{
+    int i;
+
+    fprintf(stdout, "\nm_sseq size: %ld  --------\n",b->_length);
+    for (i = 0; i < b->_length; i++)
+	fprintf(stdout, "%s\n", b->_buffer[i]);
+
+}
+
+
+static void print_pid(erlang_pid *p)
+{
+    fprintf(stdout, "\nerlang_pid --------\n node: %s\n num: %d\n "
+	    "serial: %d\n creation: %d\n", 
+	    p->node, p->num, p->serial, p->creation);
+}
+
+static void print_port(erlang_port *p)
+{
+    fprintf(stdout, "\nerlang_port --------\n node: %s\n id: %d\n "
+	    "creation: %d\n", p->node, p->id, p->creation);
+}
+
+static void print_ref(erlang_ref *p)
+{
+    fprintf(stdout, "\nerlang_ref --------\n node: %s\n len: %d\n "
+	    "n[0]: %d\n n[1]: %d\n n[2]: %d\n creation: %d\n", 
+	    p->node, p->len, p->n[0], p->n[1], p->n[2], p->creation);
+}
+
+static void print_term(ETERM *t)
+{
+    fprintf(stdout, "\nETERM --------\n");
+    erl_print_term(stdout, t);
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_s(m_s *p)
+{
+    int i;
+
+    fprintf(stdout, "\n%ld\n", p->l);
+    for (i = 0; i < p->sl._length; i++)
+	fprintf(stdout, "\n[%d]: %ld\n", i, p->sl._buffer[i]);
+}
+
+
+static void print_ssstr3(m_ssstr3 *b1)
+{
+    int i,j;
+
+    fprintf(stdout, "\nSSSTR3 --------\n");
+    fprintf(stdout,"b1->_length = %ld\n",b1->_length);
+    for (i = 0; i < b1->_length; i++) {
+	fprintf(stdout,"\nb1->_buffer[%d]._length %ld\n",
+		i, b1->_buffer[i]._length);
+	for (j = 0; j < b1->_buffer[i]._length; j++)
+	    fprintf(stdout,"b1->_buffer[%d]._buffer[%d] = %s\n",
+		    i, j, b1->_buffer[i]._buffer[j]);
+    }
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_wstr(CORBA_wchar *ws)
+{
+    int i = 0;
+
+    fprintf(stdout, "\nwstr --------\n");
+    while (ws[i]) {
+	fprintf(stdout, "[%d]: %ld\n", i, ws[i]);
+	i++;
+    }
+    fprintf(stdout, "\n--------\n");
+}
+
+
+static void print_ssarr3(m_ssarr3 *b1)
+{
+    int i;
+
+    fprintf(stdout, "\nssarr3 --------\n");
+    fprintf(stdout,"length: %ld\n",b1->_length);
+    fprintf(stdout, "buffer:\n");
+    for (i = 0; i < b1->_length; i++) 
+	print_sarr3(&b1->_buffer[i]); 
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_sarr3(m_sarr3 *b1)
+{
+    int i;
+
+    fprintf(stdout, "\nsarr3 --------\n");
+    fprintf(stdout,"length: %ld\n",b1->_length);
+    fprintf(stdout, "buffer:\n");
+    for (i = 0; i < b1->_length; i++) 
+	print_arr3(b1->_buffer[i]); 
+    fprintf(stdout, "\n--------\n");
+}
+
+static void print_arr3(m_arr3 b1)
+{
+    int i;
+
+    fprintf(stdout, "\narr3 --------\n");
+    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) 
+	fprintf(stdout, "%ld ", b1[i]); 
+    fprintf(stdout, "\n--------\n");
+}
+
+static void free_etseq_buf(m_etseq *b)
+{
+    int i;
+
+    for (i = 0; i < b->_length; i++)
+	erl_free_term(b->_buffer[i]);
+}
+
+static void free_et(m_et* b)
+{
+    erl_free_term(b->e);
+}
+
+static void showtime(MyTimeval *start, MyTimeval *stop)
+{
+    MyTimeval elapsed;
+
+    elapsed.tv_sec = stop->tv_sec - start->tv_sec;
+    elapsed.tv_usec = stop->tv_usec - start->tv_usec;
+    while (elapsed.tv_usec < 0) {
+	elapsed.tv_sec -= 1;
+	elapsed.tv_usec += 1000000;
+    }
+    fprintf(stderr,"%ld.%06ld seconds\n",elapsed.tv_sec, elapsed.tv_usec);
+}
+
+static void my_gettimeofday(MyTimeval *tv)
+#ifdef __WIN32__
+#define EPOCH_JULIAN_DIFF 11644473600i64
+{
+    SYSTEMTIME t;
+    FILETIME ft;
+    LONGLONG lft;
+
+    GetSystemTime(&t);
+    SystemTimeToFileTime(&t, &ft);
+    memcpy(&lft, &ft, sizeof(lft));
+    tv->tv_usec = (long) ((lft / 10i64) % 1000000i64);
+    tv->tv_sec = (long) ((lft / 10000000i64) - EPOCH_JULIAN_DIFF);
+}
+#elif defined VXWORKS
+{
+    int rate = sysClkRateGet(); /* Ticks per second */
+    unsigned long ctick = tickGet();
+    tv->tv_sec = ctick / rate; /* secs since reboot */
+    tv->tv_usec = ((ctick - (tv->tv_sec * rate))*1000000)/rate;
+}
+#else
+{
+    gettimeofday(tv, NULL);
+}
+#endif
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_erl_test.idl b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_erl_test.idl
new file mode 100644
index 0000000000..e687cec114
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_erl_test.idl
@@ -0,0 +1,173 @@
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 2004-2010. 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%
+
+#include "erlang.idl"
+
+
+const short TestConst = 1;
+
+module m {
+
+  const short TestConst = 2;
+
+  struct b {
+    long l;
+    char c;
+  }; 
+
+  struct simple {
+    long l;
+    b    b_t;
+  };
+
+  enum fruit {orange, banana, apple, peach, pear};
+
+  typedef sequence<long> lseq;
+
+  typedef sequence<b> bseq;
+
+  struct a {
+    long l;
+    bseq y;
+    double d;
+  };
+
+  typedef sequence<a> aseq;
+
+  typedef sequence<string> sseq;
+  typedef string str;
+  typedef long myLong;
+
+  typedef long arr1[500], dd[2][3];
+
+  typedef erlang::term apa;
+  typedef erlang::port banan;
+
+  typedef sequence<erlang::term> etseq;
+
+  struct s {
+    long l;
+    sequence<long> sl;
+  };
+
+  struct es {
+    fruit f;
+    myLong l;
+  };
+
+  struct et {
+    erlang::term e;
+    long l;
+  };
+
+
+  typedef sequence<char> str1;
+  typedef string<12> str2;
+  typedef char str3[3];  	
+
+  typedef sequence<string> sstr3;  // sequence of string
+  typedef sequence<sstr3> ssstr3;  // sequence of sequences of strings
+
+  typedef long  arr3[3];           // array of long
+  typedef sequence<arr3> sarr3;    // sequence of array
+  typedef sequence<sarr3> ssarr3;  // sequence of sequnces of arrays of strings
+    
+ struct strRec{
+    boolean bb;
+    string str4;
+    long str7[3][2];
+    sequence<char> str5; 
+    string<12> str6;
+    str3 str8;
+    str2 str9;
+    str1 str10; 	
+  };
+
+
+  struct dyn {
+    long l;
+    sequence<long> sl;
+  };
+  typedef dyn arr2[1][2];
+
+
+  interface i {
+
+    const short TestConst = 3;	
+
+    //arr2 suck(in arr2 x, out arr2 y );
+
+    ///////////////////////////////// attribute long l;
+
+    // simple types
+    void void_test();
+    long long_test(in long a, out long a1);
+    long long longlong_test(in long long a, out long long a1);	
+    unsigned short ushort_test(in unsigned short a, out unsigned short a1);
+    unsigned long ulong_test(in unsigned long a, out unsigned long a1);
+    unsigned long long ulonglong_test(in unsigned long long a, out unsigned long long a1);
+    double double_test(in double a, out double a1);
+    char char_test(in char a, out char a1);
+    wchar wchar_test(in wchar a, out wchar a1);
+    octet octet_test(in octet a, out octet a1);
+    boolean bool_test(in boolean a, out boolean a1);
+
+    // Seq. and struct tests
+    b struct_test(in b a, out b a1);
+    es struct2_test(in es a, out es a1);
+    //simple struct3_test(in simple x, out simple y);	
+    bseq seq1_test(in bseq a, out bseq a1);
+    aseq seq2_test(in aseq a, out aseq a1);
+    lseq seq3_test(in lseq a, out lseq a1);
+    ssstr3 seq4_test(in ssstr3 a, out ssstr3 a1);
+    ssarr3 seq5_test(in ssarr3 a, out ssarr3 a1);
+
+    // Array tests
+    arr1 array1_test(in arr1 a, out arr1 a1);
+    dd array2_test(in dd a, out dd a1);
+
+    // enum test
+    fruit enum_test(in fruit a, out fruit a1);
+
+    // string tests
+    string string1_test(in string a, out string a1);
+    wstring wstring1_test(in wstring a, out wstring a1);
+    sseq string2_test(in sseq a, out sseq a1);
+    str string3_test(in str a, out str a1);
+    strRec string4_test(in strRec a, out strRec a1);
+
+    // Special erlang types
+    erlang::pid pid_test(in erlang::pid a, out erlang::pid a1);
+    erlang::port port_test(in erlang::port a, out erlang::port a1);
+    erlang::ref ref_test(in erlang::ref a, out erlang::ref a1);
+    erlang::term term_test(in erlang::term a, out erlang::term a1);
+    
+    // typedef test
+    long typedef_test(in apa a, in banan b, out apa a1, out banan b1);
+
+    // inlined seq. test
+    s inline_sequence_test(in s a, out s a1);
+
+    // term seq. test
+    etseq term_sequence_test(in etseq a, out etseq a1);
+    // term struct test
+    et term_struct_test(in et a, out et a1);
+   
+  };
+
+};
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/erl_server.erl b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/erl_server.erl
new file mode 100644
index 0000000000..2e624ec5c0
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/erl_server.erl
@@ -0,0 +1,28 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2004-2009. 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(erl_server).
+
+-export([run/0, stop/0]).
+
+run() ->
+    m_i:oe_create().
+
+stop() ->
+   gen_server:cast(cidl_test, stop).
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/m_i_impl.erl b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/m_i_impl.erl
new file mode 100644
index 0000000000..0c96fb9edf
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/m_i_impl.erl
@@ -0,0 +1,161 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2004-2009. 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(m_i_impl).
+-include("m.hrl").
+
+-export([init/1, terminate/2, void_test/1, long_test/2, ushort_test/2,
+	 longlong_test/2, ulong_test/2, ulonglong_test/2,
+	 double_test/2, char_test/2, wchar_test/2, octet_test/2,
+	 bool_test/2, struct_test/2, struct2_test/2, seq1_test/2,
+	 seq2_test/2, seq3_test/2, seq4_test/2, seq5_test/2,
+	 array1_test/2, array2_test/2, enum_test/2, string1_test/2,
+	 string2_test/2, string3_test/2, string4_test/2, pid_test/2,
+	 port_test/2, ref_test/2, term_test/2, typedef_test/3,
+	 inline_sequence_test/2, '_set_l'/2, '_get_l'/1,
+	 term_struct_test/2, term_sequence_test/2, wstring1_test/2]).
+
+-define(PRINTDEBUG(Case),
+	io:format("erl_server: case: ~p~n"
+		  "erl_server: location: ~p~n", [Case, [?FILE, ?LINE]])).
+-define(PRINTDEBUG2(Case, Msg),
+	io:format("erl_server: case: ~p~n"
+		  "erl_server: Msg: ~p~n"
+		  "erl_server: location: ~p~n", [Case, Msg, [?FILE, ?LINE]])).
+
+init(Env) ->
+    {ok, []}.
+
+terminate(F, R) ->
+    ok.
+
+'_get_l'(State) ->
+    ?PRINTDEBUG("_get_l"),
+    {reply, State, State}.
+void_test(State) ->
+    ?PRINTDEBUG("void_test"),
+    {reply, ok, State}.
+
+'_set_l'(State, V) ->
+    ?PRINTDEBUG2("_set_l", V),
+    {reply, ok, V}.
+ushort_test(State, V) ->
+    ?PRINTDEBUG2("ushort_test", V),
+    {reply, {V, V}, State}.
+long_test(State, V) ->
+    ?PRINTDEBUG2("long_test", V),
+    {reply, {V, V}, State}.
+longlong_test(State, V) ->
+    ?PRINTDEBUG2("longlong_test", V),
+    {reply, {V, V}, State}.
+ulong_test(State, V) ->
+    ?PRINTDEBUG2("ulong_test", V),
+    {reply, {V, V}, State}.
+ulonglong_test(State, V) ->
+    ?PRINTDEBUG2("ulonglong_test", V),
+    {reply, {V, V}, State}.
+double_test(State, V) ->
+    ?PRINTDEBUG2("double_test", V),
+    {reply, {V, V}, State}.
+char_test(State, V) ->
+    ?PRINTDEBUG2("char_test", V),
+    {reply, {V, V}, State}.
+wchar_test(State, V) ->
+    ?PRINTDEBUG2("wchar_test", V),
+    {reply, {V, V}, State}.
+octet_test(State, V) ->
+    ?PRINTDEBUG2("octet_test", V),
+    {reply, {V, V}, State}.
+bool_test(State, V) ->
+    ?PRINTDEBUG2("bool_test", V),
+    {reply, {V, V}, State}.
+
+struct_test(State, V) ->
+    ?PRINTDEBUG2("struct_test", V),
+    {reply, {V, V}, State}.
+struct2_test(State, V) ->
+    ?PRINTDEBUG2("struct2_test", V),
+    {reply, {V, V}, State}.
+seq1_test(State, V) ->
+    ?PRINTDEBUG2("seq1_test", V),
+    {reply, {V, V}, State}.
+seq2_test(State, V) ->
+    ?PRINTDEBUG2("seq2_test", V),
+    {reply, {V, V}, State}.
+seq3_test(State, V) ->
+    ?PRINTDEBUG2("seq3_test", V),
+    {reply, {V, V}, State}.
+seq4_test(State, V) ->
+    ?PRINTDEBUG2("seq4_test", V),
+    {reply, {V, V}, State}.
+seq5_test(State, V) ->
+    ?PRINTDEBUG2("seq5_test", V),
+    {reply, {V, V}, State}.
+array1_test(State, V) ->
+    ?PRINTDEBUG2("array1_test", V),
+    {reply, {V, V}, State}.
+array2_test(State, V) ->
+    ?PRINTDEBUG2("array2_test", V),
+    {reply, {V, V}, State}.
+enum_test(State, V) ->
+    ?PRINTDEBUG2("enum_test", V),
+    {reply, {V, V}, State}.
+string1_test(State, V) ->
+    ?PRINTDEBUG2("string1_test", V),
+    {reply, {V, V}, State}.
+string2_test(State, V) ->
+    ?PRINTDEBUG2("string2_test", V),
+    {reply, {V, V}, State}.
+string3_test(State, V) ->
+    ?PRINTDEBUG2("string3_test", V),
+    {reply, {V, V}, State}.
+string4_test(State, V) ->
+    ?PRINTDEBUG2("string4_test", V),
+    {reply, {V, V}, State}.
+pid_test(State, V) ->
+    ?PRINTDEBUG2("pid_test", V),
+    {reply, {V, V}, State}.
+port_test(State, V) ->
+    ?PRINTDEBUG2("port_test", binary_to_list(term_to_binary(V))),
+    {reply, {V, V}, State}.
+ref_test(State, V) ->
+    ?PRINTDEBUG2("ref_test", binary_to_list(term_to_binary(V))),
+    {reply, {V, V}, State}.
+term_test(State, V) ->
+    ?PRINTDEBUG2("term_test", V),
+    {reply, {V, V}, State}.
+typedef_test(State, A, B) ->
+    ?PRINTDEBUG2("typedef_test", [A,B]),
+    {reply, {4711, A, B}, State}.
+inline_sequence_test(State, V) ->
+    ?PRINTDEBUG2("inline_sequence_test", V),
+    {reply, {V, V}, State}.
+term_sequence_test(State, V) ->
+    ?PRINTDEBUG2("term_sequence_test", V),
+    {reply, {V, V}, State}.
+term_struct_test(State, V) ->
+    ?PRINTDEBUG2("term_struct_test", V),
+    {reply, {V, V}, State}.
+wstring1_test(State, V) ->
+    ?PRINTDEBUG2("wstring1_test", V),
+    {reply, {V, V}, State}.
+
+
+
+
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/my.c b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/my.c
new file mode 100644
index 0000000000..4e0be3fec1
--- /dev/null
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/my.c
@@ -0,0 +1,51 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2004-2009. 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%
+ *
+ */
+#include "ic.h"
+#include "m_i.h"
+
+int my_prepare_notification_encoding(CORBA_Environment *env)
+{
+    return oe_prepare_notification_encoding(env);
+}
+
+int my_send_notification_tmo(CORBA_Environment *env, unsigned int send_ms)
+{
+    return oe_send_notification_tmo(env, send_ms);
+}
+
+int my_prepare_request_encoding(CORBA_Environment *env) 
+{
+    return oe_prepare_request_encoding(env);
+}
+
+int my_send_request_and_receive_reply_tmo(CORBA_Environment *env, 
+				      unsigned int send_ms, 
+				      unsigned int recv_ms)
+{
+    return oe_send_request_and_receive_reply_tmo(env, send_ms, recv_ms);
+}
+
+int my_prepare_reply_decoding(CORBA_Environment *env)
+{
+    return oe_prepare_reply_decoding(env);
+}
+
+
+
diff --git a/lib/ic/test/erl_client_c_server_SUITE.erl b/lib/ic/test/erl_client_c_server_SUITE.erl
new file mode 100644
index 0000000000..a42dbb9604
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_SUITE.erl
@@ -0,0 +1,366 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2002-2010. 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%
+%%
+%%
+
+%%----------------------------------------------------------------------
+%% Purpose : Test suite for erl-client/c-server
+%%----------------------------------------------------------------------
+
+
+-module(erl_client_c_server_SUITE).
+-include_lib("common_test/include/ct.hrl").
+
+-export([init_per_testcase/2, end_per_testcase/2,all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, void_test/1,
+	 long_test/1, longlong_test/1, ushort_test/1, ulong_test/1,
+	 ulonglong_test/1, double_test/1, char_test/1, wchar_test/1,
+	 octet_test/1, bool_test/1, struct_test/1, struct2_test/1,
+	 seq1_test/1, seq2_test/1, seq3_test/1, seq4_test/1,
+	 seq5_test/1, array1_test/1, array2_test/1, enum_test/1,
+	 string1_test/1, string2_test/1, string3_test/1,
+	 string4_test/1, pid_test/1, port_test/1, ref_test/1,
+	 term_test/1, typedef_test/1, inline_sequence_test/1,
+	 term_sequence_test/1, term_struct_test/1, wstring1_test/1]).
+
+-define(DEFAULT_TIMEOUT, 20000).
+-define(PORT_TIMEOUT, 15000).
+-define(CALL_TIMEOUT, 5000).
+
+-define(C_SERVER_NODE_NAME, idl_c_server_test).
+  
+%% Add/remove code path and watchdog before/after each test case.
+%%
+init_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:add_patha(DataDir),
+
+    %% Since other test suites use the module m_i, we have
+    %% to make sure we are using the right m_i module.
+    code:purge(m_i),
+    code:load_file(m_i),
+
+    WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
+    [{watchdog, WatchDog}| Config].
+
+end_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:del_path(DataDir),
+    WatchDog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(WatchDog).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+[void_test, long_test, longlong_test, ushort_test,
+ ulong_test, ulonglong_test, double_test, char_test,
+ wchar_test, octet_test, bool_test, struct_test,
+ struct2_test, seq1_test, seq2_test, seq3_test,
+ seq4_test, seq5_test, array1_test, array2_test,
+ enum_test, string1_test, string2_test, string3_test,
+ string4_test, pid_test, port_test, ref_test, term_test,
+ typedef_test, inline_sequence_test, term_sequence_test,
+ term_struct_test, wstring1_test].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+
+array1_test(doc) -> "";
+array1_test(suite) -> [];
+array1_test(Config) ->
+    do_test(array1_test, Config). 
+
+array2_test(doc) -> "";
+array2_test(suite) -> [];
+array2_test(Config) ->
+    do_test(array2_test, Config).
+
+bool_test(doc) -> "";
+bool_test(suite) -> [];
+bool_test(Config) ->
+    do_test(bool_test, Config).
+
+char_test(doc) -> "";
+char_test(suite) -> [];
+char_test(Config) ->
+    do_test(char_test, Config).
+
+double_test(doc) -> "";
+double_test(suite) -> [];
+double_test(Config) ->
+    do_test(double_test, Config).
+
+enum_test(doc) -> "";
+enum_test(suite) -> [];
+enum_test(Config) ->
+    do_test(enum_test, Config).
+
+inline_sequence_test(doc) -> "";
+inline_sequence_test(suite) -> [];
+inline_sequence_test(Config) ->
+    do_test(inline_sequence_test, Config).
+
+longlong_test(doc) -> "";
+longlong_test(suite) -> [];
+longlong_test(Config) ->
+    do_test(longlong_test, Config).
+
+long_test(doc) -> "";
+long_test(suite) -> [];
+long_test(Config) ->
+    do_test(long_test, Config).
+
+octet_test(doc) -> "";
+octet_test(suite) -> [];
+octet_test(Config) ->
+    do_test(octet_test, Config).
+
+pid_test(doc) -> "";
+pid_test(suite) -> [];
+pid_test(Config) ->
+    do_test(pid_test, Config).
+
+port_test(doc) -> "";
+port_test(suite) -> [];
+port_test(Config) ->
+    do_test(port_test, Config).
+
+ref_test(doc) -> "";
+ref_test(suite) -> [];
+ref_test(Config) ->
+    do_test(ref_test, Config).
+
+seq1_test(doc) -> "";
+seq1_test(suite) -> [];
+seq1_test(Config) ->
+    do_test(seq1_test, Config).
+
+seq2_test(doc) -> "";
+seq2_test(suite) -> [];
+seq2_test(Config) ->
+    do_test(seq2_test, Config).
+
+seq3_test(doc) -> "";
+seq3_test(suite) -> [];
+seq3_test(Config) ->
+    do_test(seq3_test, Config).
+
+seq4_test(doc) -> "";
+seq4_test(suite) -> [];
+seq4_test(Config) ->
+    do_test(seq4_test, Config).
+
+seq5_test(doc) -> "";
+seq5_test(suite) -> [];
+seq5_test(Config) ->
+    do_test(seq5_test, Config).
+
+string1_test(doc) -> "";
+string1_test(suite) -> [];
+string1_test(Config) ->
+    do_test(string1_test, Config).
+
+string2_test(doc) -> "";
+string2_test(suite) -> [];
+string2_test(Config) ->
+    do_test(string2_test, Config).
+
+string3_test(doc) -> "";
+string3_test(suite) -> [];
+string3_test(Config) ->
+    do_test(string3_test, Config).
+
+string4_test(doc) -> "";
+string4_test(suite) -> [];
+string4_test(Config) ->
+    do_test(string4_test, Config).
+
+struct2_test(doc) -> "";
+struct2_test(suite) -> [];
+struct2_test(Config) ->
+    do_test(struct2_test, Config).
+
+struct_test(doc) -> "";
+struct_test(suite) -> [];
+struct_test(Config) ->
+    do_test(struct_test, Config).
+
+term_sequence_test(doc) -> "";
+term_sequence_test(suite) -> [];
+term_sequence_test(Config) ->
+    do_test(term_sequence_test, Config).
+
+term_struct_test(doc) -> "";
+term_struct_test(suite) -> [];
+term_struct_test(Config) ->
+    do_test(term_struct_test, Config).
+
+term_test(doc) -> "";
+term_test(suite) -> [];
+term_test(Config) ->
+    do_test(term_test, Config).
+
+typedef_test(doc) -> "";
+typedef_test(suite) -> [];
+typedef_test(Config) ->
+    do_test(typedef_test, Config).
+
+ulonglong_test(doc) -> "";
+ulonglong_test(suite) -> [];
+ulonglong_test(Config) ->
+    do_test(ulonglong_test, Config).
+
+ulong_test(doc) -> "";
+ulong_test(suite) -> [];
+ulong_test(Config) ->
+    do_test(ulong_test, Config).
+
+ushort_test(doc) -> "";
+ushort_test(suite) -> [];
+ushort_test(Config) ->
+    do_test(ushort_test, Config).
+
+void_test(doc) -> "";
+void_test(suite) -> [];
+void_test(Config) ->
+    do_test(void_test, Config).
+
+wchar_test(doc) -> "";
+wchar_test(suite) -> [];
+wchar_test(Config) ->
+    do_test(wchar_test, Config).
+
+wstring1_test(doc) -> "";
+wstring1_test(suite) -> [];
+wstring1_test(Config) ->
+    do_test(wstring1_test, Config).
+
+
+do_test(Case, Config) ->
+    %% Trap exits
+    process_flag(trap_exit, true),
+    Node = atom_to_list(node()),
+    [_NodeName, HostName] = string:tokens(Node, "@"),
+    DataDir = ?config(data_dir, Config),
+    %% io:format("~p: data directory: ~p~n", [?MODULE, DataDir]),
+    Cookie = atom_to_list(erlang:get_cookie()),
+    ServerNodeName = atom_to_list(?C_SERVER_NODE_NAME), 
+    %% Start C-server node as a port program. We wait for the node
+    %% to connect to us.
+    Cmd = filename:join([DataDir, "c_server"]) ++
+	" -this-node-name " ++ ServerNodeName ++ 
+	" -peer-node " ++ Node ++
+	" -cookie " ++ Cookie, 
+    Port = open_port({spawn, Cmd}, [exit_status, eof, stderr_to_stdout]),
+    ServerNode = list_to_atom(ServerNodeName ++ "@" ++ HostName),
+    Res = case wait_for_hidden_node(ServerNode) of
+	      ok ->
+		  %% Need a port for port_test and typedef_test
+		  put(port_test_port, Port),
+		  R = (catch erl_client:Case(ServerNode, ?CALL_TIMEOUT)),
+		  case wait_for_completion(Port) of
+		      {error, timeout} ->
+			  kill_off_node(ServerNode);
+		      _ ->
+			  ok
+		  end,
+		  R;
+	      {error, timeout} ->
+		  case wait_for_completion(Port) of
+		      {error, timeout} ->
+			  kill_off_node(ServerNode);
+		      _ ->
+			  ok
+		  end,
+		  {error, timeout}
+	  end,
+    process_flag(trap_exit, false),
+    true = Res.
+
+
+%% Wait for eof *and* exit status, but return if exit status indicates
+%% an error, or we have been waiting more than PORT_TIMEOUT seconds.
+%%
+wait_for_completion(Port) ->
+    wait_for_completion(Port, 0).
+
+wait_for_completion(Port, N) when N < 2 ->
+    receive
+	{Port, {data, Bytes}} ->
+	    %% Relay output
+	    io:format("~s", [Bytes]),
+	    wait_for_completion(Port, N);
+	{Port, {exit_status, 0}} ->
+	    wait_for_completion(Port, N + 1);
+	{Port, {exit_status, Status}} ->
+	    {error, Status};
+	{Port, eof} ->
+	    wait_for_completion(Port, N + 1);
+	{'EXIT', Port, Reason} ->
+	    io:format("Port exited with reason: ~w~n", [Reason]),
+	    wait_for_completion(Port, N);
+	{'EXIT', From, Reason} ->
+	    io:format("Got unexpected exit: ~p~n", [{'EXIT', From, Reason}]),
+	    wait_for_completion(Port, N)
+    after ?PORT_TIMEOUT ->
+	    {error, timeout}
+    end;
+wait_for_completion(_, _) ->
+    ok.
+	    
+wait_for_hidden_node(Node) ->
+    Times = ?DEFAULT_TIMEOUT div 100,
+    wait_for_hidden_node(Node, Times, 100).
+
+wait_for_hidden_node(Node, Times, WaitTime) when Times > 0 ->
+    io:format("Waiting for hidden node: ~p~n", [Node]), 
+    case lists:member(Node, erlang:nodes(hidden)) of
+	true ->
+	    ok;
+	false ->
+	    delay(WaitTime),
+	    wait_for_hidden_node(Node, Times - 1, WaitTime)
+    end;
+wait_for_hidden_node(_Node, _, _WaitTime) ->
+    {error, timeout}.
+
+kill_off_node(Node) ->
+    catch rpc:cast(Node, erlang, halt, [1]).
+
+delay(Time) ->
+    receive
+	after Time ->
+		ok
+	end.
+    
+
+	    
+
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..cd34d2b247
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
@@ -0,0 +1,150 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2002-2009. 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%
+#
+#
+# Makefile.src for erl_client_c_server test
+# Note: This file *must* work for both Unix and Windows
+#
+# We use both `rm' (Unix) and `del' (Windows) for removing files, but
+# with a `-' in front so that the error in not finding `rm' (`del') on
+# Windows (Unix) is ignored.
+#
+# VxWorks? XXX 
+#
+
+.SUFFIXES:
+.SUFFIXES: .c .h .erl .idl @obj@ .@EMULATOR@
+
+
+# Variables from ts: 
+#
+
+ERL_INCLUDE = @erl_include@
+
+IC_INCLUDE_PATH = @ic_include_path@
+IC_LIB = @ic_libpath@@DS@@ic_lib@
+
+ERL_INTERFACE_INCLUDE = @erl_interface_include@
+ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@
+ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@
+ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
+ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
+
+CC = @CC@
+## XXX Should set warning flag with a DEBUG_FLAG 
+CFLAGS = @CFLAGS@ @DEFS@ -I$(ERL_INCLUDE) \
+	-I$(IC_INCLUDE_PATH) -I$(ERL_INTERFACE_INCLUDE)
+
+LD = @LD@
+LDFLAGS = @CROSSLDFLAGS@
+LIBS =	$(IC_LIB) $(ERL_INTERFACE_LIB) $(ERL_INTERFACE_EILIB) \
+	$(ERL_INTERFACE_THREADLIB) @LIBS@ $(ERL_INTERFACE_SOCK_LIBS)
+ERLC = erlc
+
+# Generated C header files
+GEN_H_FILES = \
+	m__s.h \
+	m_i__s.h \
+	oe_erl_c_test__s.h
+
+# Generated C files 
+GEN_C_FILES =  \
+	m__s.c \
+	m_i__s.c \
+	oe_code_m_a.c \
+	oe_code_m_arr1.c \
+	oe_code_m_arr2.c \
+	oe_code_m_arr3.c \
+	oe_code_m_aseq.c \
+	oe_code_m_b.c \
+	oe_code_m_bseq.c \
+	oe_code_m_dd.c \
+	oe_code_m_dyn.c \
+	oe_code_m_dyn_sl.c \
+	oe_code_m_es.c \
+	oe_code_m_et.c \
+	oe_code_m_etseq.c \
+	oe_code_m_fruit.c \
+	oe_code_m_lseq.c \
+	oe_code_m_s.c \
+	oe_code_m_s_sl.c \
+	oe_code_m_sarr3.c \
+	oe_code_m_simple.c \
+	oe_code_m_ssarr3.c \
+	oe_code_m_sseq.c \
+	oe_code_m_ssstr3.c \
+	oe_code_m_sstr3.c \
+	oe_code_m_str1.c \
+	oe_code_m_str3.c \
+	oe_code_m_strRec.c \
+	oe_code_m_strRec_str5.c \
+	oe_code_m_strRec_str7.c \
+	oe_erl_c_test__s.c
+
+GEN_HRL_FILES = \
+	m.hrl \
+	m_i.hrl \
+	oe_erl_c_test.hrl
+
+GEN_ERL_FILES = \
+	m.erl \
+	m_arr2.erl \
+	m_arr3.erl \
+	m_i.erl \
+	m_str3.erl \
+	oe_erl_c_test.erl
+
+C_FILES = $(GEN_C_FILES) c_server.c callbacks.c
+
+OBJS = $(C_FILES:.c=@obj@)
+
+PGMS = c_server@exe@
+
+ERL_FILES = $(GEN_ERL_FILES) erl_client.erl
+
+EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
+
+
+all: $(PGMS) $(EBINS)
+
+clean:	
+	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
+$(PGMS): $(OBJS)
+	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+$(GEN_C_FILES) $(GEN_H_FILES): erl_c_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_server}" \
+	"+{scoped_op_calls,true}" erl_c_test.idl
+
+# If we have scoped operation calls for C, we must have that for
+# Erlang as well, if we use the m_i.erl file for calling the server.
+
+$(GEN_ERL_FILES) $(GEN_HRL_FILES): erl_c_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" \
+	"+{scoped_op_calls,true}"  "+{timeout,true}" erl_c_test.idl
+
+.c@obj@:
+	$(CC) -c -o $*@obj@ $(CFLAGS) $<
+
+.erl.@EMULATOR@:
+	$(ERLC) -W -I $(IC_INCLUDE_PATH) $<
+
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/c_server.c b/lib/ic/test/erl_client_c_server_SUITE_data/c_server.c
new file mode 100644
index 0000000000..acdeff80fe
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_SUITE_data/c_server.c
@@ -0,0 +1,299 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2002-2009. 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%
+ *
+ */
+/* C-server for test of IC.
+ *
+ * The C-node implemented here connects to its peer node, waits for
+ * one message, evaluates the message, returns an result message, and 
+ * terminates.
+ * 
+ * TODO:
+ *
+ * 1. XXX #includes for VxWorks, Windows
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef __WIN32__
+#  include <unistd.h>
+#endif
+
+#include <string.h>
+
+#ifdef __WIN32__
+#  include <time.h>
+#  include <sys/timeb.h>
+#elif defined VXWORKS
+#  include <time.h>
+#  include <sys/times.h>
+#else
+#  include <sys/time.h>
+#endif
+
+#include <ctype.h>
+
+#ifdef __WIN32__
+#  include <winsock2.h>
+#  include <windows.h>
+#else
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  include <netdb.h>
+#endif
+
+#include "ic.h"
+#include "ei.h"
+#include "erl_interface.h"
+#include "eicode.h"
+#include "m_i__s.h"
+#include "m__s.h"
+
+#ifdef __WIN32__
+typedef struct {
+    long tv_sec;
+    long tv_usec;
+} MyTimeval;
+#else
+typedef struct timeval MyTimeval;
+#endif
+static void my_gettimeofday(MyTimeval *tv);
+static void showtime(MyTimeval *start, MyTimeval *stop);
+static void usage(void);
+static void done(int r);
+
+#define HOSTNAMESZ 	256
+#define NODENAMESZ 	512
+#define INBUFSZ 	 10
+#define OUTBUFSZ 	  0
+#define MAXTRIES 	  5
+
+static char *progname;
+
+/* main */
+#ifdef VXWORKS
+int c_server(int argc, char **argv)
+#else
+int main(int argc, char **argv)
+#endif
+{
+    struct hostent *hp;
+    MyTimeval start, stop;
+    int i, fd, ires, tries;
+    CORBA_Environment *env;
+    char *this_node_name = NULL;
+    char *peer_node = NULL;
+    char *cookie = NULL;
+    char host[HOSTNAMESZ + 1];
+    char this_node[NODENAMESZ + 1];
+    erlang_msg msg;
+    int status, loop; 
+    
+#ifdef __WIN32__
+    WORD wVersionRequested;
+    WSADATA wsaData;
+    
+    wVersionRequested = MAKEWORD(2, 0);
+    
+    if (WSAStartup(wVersionRequested, &wsaData) != 0) {
+	fprintf(stderr, "Could not load winsock2 v2.0 compatible DLL");
+	exit(1);
+    }
+#endif
+    
+    progname = argv[0];
+    host[HOSTNAMESZ] = '\0';
+    if (gethostname(host, HOSTNAMESZ) < 0) {
+	fprintf(stderr, "Can't find own hostname\n");
+	done(1);
+    } 
+    if ((hp = gethostbyname(host)) == 0) {
+	fprintf(stderr, "Can't get ip address for host %s\n", host);
+	done(1);
+    }
+    for (i = 1; i < argc; i++) {
+	if (strcmp(argv[i], "-help") == 0) {
+	    usage();
+	    done(0);
+	} else if (strcmp(argv[i], "-this-node-name") == 0) {
+	    i++;
+	    this_node_name = argv[i];
+	} else if (strcmp(argv[i], "-peer-node") == 0) {
+	    i++;
+	    peer_node = argv[i];
+	} else if (strcmp(argv[i], "-cookie") == 0) {
+	    i++;
+	    cookie = argv[i];
+	} else {
+	    fprintf(stderr, "Error : invalid argument \"%s\"\n", argv[i]);
+	    usage();
+	    done(1);
+	}
+    }
+
+    if (this_node_name == NULL || peer_node == NULL || cookie == NULL) {
+	fprintf(stderr, "Error: missing option\n");
+	usage();
+	done(1);
+    }
+
+    /* Behead hostname at first dot */
+    for (i=0; host[i] != '\0'; i++) {
+	if (host[i] == '.') { host[i] = '\0'; break; }
+    }
+    sprintf(this_node, "%s@%s", this_node_name, host);
+
+    fprintf(stderr, "c_server: this node: \"%s\"\n", this_node);
+    fprintf(stderr, "c_server: peer node: \"%s\"\n", peer_node);
+
+    /* initialize erl_interface */
+    erl_init(NULL, 0);
+
+    for (tries = 0; tries < MAXTRIES; tries++) {
+	/* connect to peer node */ 
+    	ires = erl_connect_xinit(host, this_node_name, this_node, 
+				 (struct in_addr *)*hp->h_addr_list, 
+				 cookie, 0);
+	fprintf(stderr, "c_server: erl_connect_xinit(): %d\n", ires);
+    
+	fd = erl_connect(peer_node);
+	fprintf(stderr, "c_server: erl_connect(): %d\n", fd);
+	if (fd >= 0) 
+	    break;
+	fprintf(stderr, "c_server: cannot connect, retrying\n");
+    }
+    if (fd < 0) {
+	fprintf(stderr, "c_server: cannot connect, exiting\n");
+	done(1);
+    }
+    env = CORBA_Environment_alloc(INBUFSZ, OUTBUFSZ);
+    env->_fd = fd; 
+
+    status = 1;
+    loop = 1;
+    my_gettimeofday(&start);
+    while (status >= 0 && loop > 0) {
+        status = ei_receive_encoded(env->_fd, &env->_inbuf, &env->_inbufsz, 
+				    &msg, &env->_iin); 
+	switch(status) {
+	case ERL_SEND:
+	case ERL_REG_SEND:
+	    /* get result */
+	    m_i__switch(NULL, env);
+	    switch(env->_major) {
+	    case CORBA_NO_EXCEPTION:
+		break;
+	    case CORBA_SYSTEM_EXCEPTION:
+		fprintf(stderr, "Request failure, reason : %s\n", 
+			(char *) CORBA_exception_value(env));
+		CORBA_exception_free(env);
+		break;
+	    default: /* Should not happen */
+		CORBA_exception_free(env);
+		break;
+	    }
+	    /* send back result data */
+	    if (env->_iout > 0) 
+		ei_send_encoded(env->_fd, &env->_caller, env->_outbuf, 
+				env->_iout);
+	    loop = 0;
+	    break;
+	case ERL_TICK:
+	    break;
+	default: 
+	    if (status < 0) {
+		fprintf(stderr, "Status negative: %d\n", status);
+		loop = 0;
+	    }
+	    break;
+	}
+    }	
+    my_gettimeofday(&stop);
+    showtime(&start, &stop);
+
+    erl_close_connection(fd);
+
+    CORBA_free(env->_inbuf);
+    CORBA_free(env->_outbuf);
+    CORBA_free(env);
+    if (status < 0) 
+	done(-status);
+    else 
+	done(0); 
+}
+
+static void usage() 
+{
+    fprintf(stderr, "Usage: %s [-help] -this-node-name <name> "
+	    "-peer-node <nodename> -cookie <cookie>\n", progname);
+    fprintf(stderr, "Example:\n  %s  -this-node-name kalle "
+	    "-peer-node olle@home -cookie oa678er\n", progname);
+}
+
+static void done(int r) 
+{
+#ifdef __WIN32__
+    WSACleanup();
+#endif
+    exit(r);
+}
+
+static void showtime(MyTimeval *start, MyTimeval *stop)
+{
+    MyTimeval elapsed;
+
+    elapsed.tv_sec = stop->tv_sec - start->tv_sec;
+    elapsed.tv_usec = stop->tv_usec - start->tv_usec;
+    while (elapsed.tv_usec < 0) {
+	elapsed.tv_sec -= 1;
+	elapsed.tv_usec += 1000000;
+    }
+    fprintf(stderr,"%ld.%06ld seconds\n",elapsed.tv_sec, elapsed.tv_usec);
+}
+
+
+
+static void my_gettimeofday(MyTimeval *tv)
+#ifdef __WIN32__
+#define EPOCH_JULIAN_DIFF 11644473600i64
+{
+    SYSTEMTIME t;
+    FILETIME ft;
+    LONGLONG lft;
+
+    GetSystemTime(&t);
+    SystemTimeToFileTime(&t, &ft);
+    memcpy(&lft, &ft, sizeof(lft));
+    tv->tv_usec = (long) ((lft / 10i64) % 1000000i64);
+    tv->tv_sec = (long) ((lft / 10000000i64) - EPOCH_JULIAN_DIFF);
+}
+#elif defined VXWORKS
+{
+    int rate = sysClkRateGet(); /* Ticks per second */
+    unsigned long ctick = tickGet();
+    tv->tv_sec = ctick / rate; /* secs since reboot */
+    tv->tv_usec = ((ctick - (tv->tv_sec * rate))*1000000)/rate;
+}
+#else
+{
+    gettimeofday(tv, NULL);
+}
+#endif
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/callbacks.c b/lib/ic/test/erl_client_c_server_SUITE_data/callbacks.c
new file mode 100644
index 0000000000..d6b28b619d
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_SUITE_data/callbacks.c
@@ -0,0 +1,610 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2002-2009. 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%
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#ifndef __WIN32__
+#  include <unistd.h>
+#endif
+#include <string.h>
+#include <ctype.h>
+#include <ic.h>
+#include <erl_interface.h>
+#include <ei.h>
+#include "m_i__s.h"
+
+
+
+/* OK */
+
+void my_void_test(CORBA_Object oe_obj, 
+		  CORBA_Environment *oe_env)
+{
+    /* printf("void test !\n"); */
+}
+ 
+m_i_void_test__rs* m_i_void_test__cb(CORBA_Object oe_obj, 
+				     CORBA_Environment *oe_env)
+{
+    return (m_i_void_test__rs*) (my_void_test);
+}
+
+
+
+/* OK */
+
+void my_long_test(CORBA_Object oe_obj, 
+		  long* a, 
+		  long* b, 
+		  long* c, 
+		  CORBA_Environment *oe_env)
+{
+    /* printf("long test !\n"); */
+}
+ 
+ 
+m_i_long_test__rs* m_i_long_test__cb(CORBA_Object oe_obj, 
+				     long* a, 
+				     long* b, 
+				     long* c, 
+				     CORBA_Environment *oe_env)
+{ 
+    *a = *b;
+    *c = *b;
+    return (m_i_long_test__rs*) (my_long_test);
+}
+
+/* OK */
+
+void my_longlong_test(CORBA_Object oe_obj, 
+		      CORBA_long_long* a, 
+		      CORBA_long_long* b, 
+		      CORBA_long_long* c, 
+		      CORBA_Environment *oe_env)
+{
+    /* printf("long test !\n"); */
+}
+ 
+m_i_longlong_test__rs* m_i_longlong_test__cb(CORBA_Object oe_obj, 
+					     CORBA_long_long* a, 
+					     CORBA_long_long* b, 
+					     CORBA_long_long* c, 
+					     CORBA_Environment *oe_env)
+{ 
+    *a = *b;
+    *c = *b;
+    return (m_i_longlong_test__rs*) (my_longlong_test);
+}
+
+/* OK */
+void my_ulong_test(CORBA_Object oe_obj, 
+		   unsigned long* a, 
+		   unsigned long* b, 
+		   unsigned long* c, 
+		   CORBA_Environment *oe_env)
+{
+    /* printf("ulong test !\n"); */
+}
+ 
+m_i_ulong_test__rs* m_i_ulong_test__cb(CORBA_Object oe_obj, 
+				       unsigned long* a, 
+				       unsigned long* b, 
+				       unsigned long* c, 
+				       CORBA_Environment *oe_env)
+{
+    *a = *b;
+    *c = *b;
+    return (m_i_ulong_test__rs*) (my_ulong_test);
+}
+
+/* OK */
+void my_ulonglong_test(CORBA_Object oe_obj,
+		       CORBA_unsigned_long_long* a,
+		       CORBA_unsigned_long_long* b,
+		       CORBA_unsigned_long_long* c,
+		       CORBA_Environment *oe_env)
+{
+    /* printf("ulong test !\n"); */
+}
+ 
+m_i_ulonglong_test__rs* m_i_ulonglong_test__cb(CORBA_Object oe_obj,
+					       CORBA_unsigned_long_long* a,
+					       CORBA_unsigned_long_long* b,
+					       CORBA_unsigned_long_long* c,
+					       CORBA_Environment *oe_env)
+{
+    *a = *b;
+    *c = *b;
+    return (m_i_ulonglong_test__rs*) (my_ulonglong_test);
+}
+
+m_i_ushort_test__rs* m_i_ushort_test__cb(CORBA_Object oe_obj,
+					 unsigned short* a,
+					 unsigned short* b,
+					 unsigned short* c,
+					 CORBA_Environment *oe_env)
+{
+    *a = *b;
+    *c = *b;
+    return (m_i_ushort_test__rs*) NULL;
+}
+
+
+/* OK */
+void my_double_test(CORBA_Object oe_obj,
+		    double* a,
+		    double* b,
+		    double* c,
+		    CORBA_Environment *oe_env)
+{
+    /* printf("double test !\n"); */
+}
+ 
+m_i_double_test__rs* m_i_double_test__cb(CORBA_Object oe_obj,
+					 double* a,
+					 double* b,
+					 double* c,
+					 CORBA_Environment *oe_env)
+{
+    *a = *b;
+    *c = *b;
+    return (m_i_double_test__rs*) (my_double_test);
+}
+
+/* OK */
+m_i_char_test__rs* m_i_char_test__cb(CORBA_Object oe_obj,
+				     char* a,
+				     char* b,
+				     char* c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_char_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+
+/* OK */
+m_i_wchar_test__rs* m_i_wchar_test__cb(CORBA_Object oe_obj,
+				       CORBA_wchar* a,
+				       CORBA_wchar* b,
+				       CORBA_wchar* c,
+				       CORBA_Environment *oe_env)
+{
+    m_i_wchar_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+m_i_octet_test__rs* m_i_octet_test__cb(CORBA_Object oe_obj,
+				       char* a,
+				       char* b,
+				       char* c,
+				       CORBA_Environment *oe_env)
+{
+    m_i_octet_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+m_i_bool_test__rs* m_i_bool_test__cb(CORBA_Object oe_obj,
+				     CORBA_boolean* a,
+				     CORBA_boolean* b,
+				     CORBA_boolean* c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_bool_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+void my_struct_test(CORBA_Object oe_obj,
+		    m_b* a,
+		    m_b* b,
+		    m_b* c,
+		    CORBA_Environment *oe_env)
+{
+    /* printf("struct test !\n"); */
+}
+ 
+m_i_struct_test__rs* m_i_struct_test__cb(CORBA_Object oe_obj,
+					 m_b* a,
+					 m_b* b,
+					 m_b* c,
+					 CORBA_Environment *oe_env)
+{
+    *a = *b;
+    *c = *b;
+    return (m_i_struct_test__rs*) (my_struct_test); 
+}
+
+/* OK */
+m_i_struct2_test__rs* m_i_struct2_test__cb(CORBA_Object oe_obj,
+					   m_es* a,
+					   m_es* b,
+					   m_es* c,
+					   CORBA_Environment *oe_env)
+{
+    m_i_struct2_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+/* XXX Commented out
+m_i_struct3_test__rs* m_i_struct3_test__cb(CORBA_Object oe_obj,
+					   m_simple* a,
+					   m_simple* b,
+					   m_simple* c,
+					   CORBA_Environment *oe_env)
+{
+  m_i_struct3_test__rs* rs = NULL; 
+  *a = *b;
+  *c = *b;
+  return rs;
+}
+*/
+
+/* OK */
+m_i_seq1_test__rs* m_i_seq1_test__cb(CORBA_Object oe_obj,
+				     m_bseq** a,
+				     m_bseq* b,
+				     m_bseq** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_seq1_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+
+/* OK */
+m_i_seq2_test__rs* m_i_seq2_test__cb(CORBA_Object oe_obj,
+				     m_aseq** a,
+				     m_aseq* b,
+				     m_aseq** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_seq2_test__rs* rs = NULL; 
+  
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_seq3_test__rs* m_i_seq3_test__cb(CORBA_Object oe_obj,
+				     m_lseq** a,
+				     m_lseq* b,
+				     m_lseq** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_seq3_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_seq4_test__rs* m_i_seq4_test__cb(CORBA_Object oe_obj,
+				     m_ssstr3** a,
+				     m_ssstr3* b,
+				     m_ssstr3** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_seq4_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_seq5_test__rs* m_i_seq5_test__cb(CORBA_Object oe_obj,
+				     m_ssarr3** a,
+				     m_ssarr3* b,
+				     m_ssarr3** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_seq5_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_array1_test__rs* m_i_array1_test__cb(CORBA_Object oe_obj,
+					 m_arr1 a,
+					 m_arr1 b,
+					 m_arr1 c,
+					 CORBA_Environment *oe_env)
+{
+    int i;
+    m_i_array1_test__rs* rs = NULL; 
+  
+    for (i = 0; i < 500; i++) {
+	a[i] = b[i]; 
+	c[i] = b[i];
+    }
+    return rs;
+}
+
+/* OK */
+m_i_array2_test__rs* m_i_array2_test__cb(CORBA_Object oe_obj,
+					 m_dd a,
+					 m_dd b,
+					 m_dd c,
+					 CORBA_Environment *oe_env)
+{
+    int i,j;
+    m_i_array2_test__rs* rs = NULL; 
+  
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++) {
+	    a[i][j] = b[i][j];
+	    c[i][j] = b[i][j];
+	}
+    return rs;
+}
+
+
+/* OK */
+m_i_enum_test__rs* m_i_enum_test__cb(CORBA_Object oe_obj,
+				     m_fruit* a,
+				     m_fruit* b,
+				     m_fruit* c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_enum_test__rs* rs = NULL; 
+  
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+m_i_string1_test__rs* m_i_string1_test__cb(CORBA_Object oe_obj,
+					   char ** a,
+					   char * b,
+					   char ** c,
+					   CORBA_Environment *oe_env)
+{
+    m_i_string1_test__rs* rs = NULL; 
+
+    /*printf("\nString in ------> %s\n\n",b);*/
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_string2_test__rs* m_i_string2_test__cb(CORBA_Object oe_obj,
+					   m_sseq** a,
+					   m_sseq* b,
+					   m_sseq** c,
+					   CORBA_Environment *oe_env)
+{
+    m_i_string2_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_string3_test__rs* m_i_string3_test__cb(CORBA_Object oe_obj,
+					   char ** a,
+					   char * b,
+					   char ** c,
+					   CORBA_Environment *oe_env)
+{
+    m_i_string3_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+m_i_string4_test__rs* m_i_string4_test__cb(CORBA_Object oe_obj,
+					   m_strRec** a,
+					   m_strRec* b,
+					   m_strRec** c,
+					   CORBA_Environment *oe_env)
+{
+    *a = b;
+    *c = b;
+ 
+    return (m_i_string4_test__rs*) NULL; 
+}
+
+/* OK */
+m_i_wstring1_test__rs* m_i_wstring1_test__cb(CORBA_Object oe_obj,
+					     CORBA_wchar ** a,
+					     CORBA_wchar * b,
+					     CORBA_wchar ** c,
+					     CORBA_Environment *oe_env)
+{
+    int tmp;
+    m_i_wstring1_test__rs* rs = NULL; 
+
+    /*printf("\nString in ------> %s\n\n",b);*/
+
+    for(tmp = 0; tmp < 5; tmp++) 
+	fprintf(stderr,"\np[%d] = %ld\n", tmp, b[tmp]);
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+
+/* OK */
+m_i_pid_test__rs* m_i_pid_test__cb(CORBA_Object oe_obj,
+				   erlang_pid* a,
+				   erlang_pid* b,
+				   erlang_pid* c,
+				   CORBA_Environment *oe_env)
+{
+    m_i_pid_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+m_i_port_test__rs* m_i_port_test__cb(CORBA_Object oe_obj,
+				     erlang_port* a,
+				     erlang_port* b,
+				     erlang_port* c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_port_test__rs* rs = NULL; 
+
+    strcpy((*a).node,(*b).node);
+    (*a).id = (*b).id;
+    (*a).creation = 0;
+
+    strcpy((*c).node,(*b).node);
+    (*c).id = (*b).id;
+    (*c).creation = 0;
+    return rs;
+}
+
+/* OK */
+m_i_ref_test__rs* m_i_ref_test__cb(CORBA_Object oe_obj,
+				   erlang_ref* a,
+				   erlang_ref* b,
+				   erlang_ref* c,
+				   CORBA_Environment *oe_env)
+{
+
+    m_i_ref_test__rs* rs = NULL; 
+
+    strcpy((*a).node,(*b).node);
+    /*(*a).id = (*b).id;*/
+    (*a).len = (*b).len;
+    (*a).n[0] = (*b).n[0];
+    (*a).n[1] = (*b).n[1];
+    (*a).n[2] = (*b).n[2];
+    (*a).creation = 0;
+
+    strcpy((*c).node,(*b).node);
+    /*(*c).id = (*b).id;*/
+    (*c).len = (*b).len;
+    (*c).n[0] = (*b).n[0];
+    (*c).n[1] = (*b).n[1];
+    (*c).n[2] = (*b).n[2];
+    (*c).creation = 0;
+    return rs;
+}
+
+/* OK */
+m_i_term_test__rs* m_i_term_test__cb(CORBA_Object oe_obj,
+				     ETERM** a,
+				     ETERM** b,
+				     ETERM** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_term_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+m_i_typedef_test__rs* m_i_typedef_test__cb(CORBA_Object oe_obj,
+					   long* a,
+					   ETERM** b,
+					   erlang_port* c,
+					   ETERM** d ,
+					   erlang_port* e,
+					   CORBA_Environment *oe_env)
+{
+    m_i_typedef_test__rs* rs = NULL; 
+  
+    *d = *b;
+    strcpy((*e).node,(*c).node);
+    (*e).id = (*c).id;
+    (*e).creation = 0;
+    *a = 4711;
+    return rs;
+}
+
+/* OK */
+m_i_inline_sequence_test__rs* m_i_inline_sequence_test__cb(
+    CORBA_Object oe_obj,
+    m_s** a,
+    m_s* b,
+    m_s** c,
+    CORBA_Environment *oe_env)
+{
+    m_i_inline_sequence_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_term_sequence_test__rs* m_i_term_sequence_test__cb(
+    CORBA_Object oe_obj,
+    m_etseq** a,
+    m_etseq* b,
+    m_etseq** c,
+    CORBA_Environment *oe_env)
+{
+    m_i_term_sequence_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b; 
+    return rs;
+}
+
+
+/* OK */
+m_i_term_struct_test__rs* m_i_term_struct_test__cb(CORBA_Object oe_obj,
+						   m_et* a,
+						   m_et* b,
+						   m_et* c,
+						   CORBA_Environment *oe_env)
+{
+    m_i_term_struct_test__rs* rs = NULL; 
+  
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/erl_c_test.idl b/lib/ic/test/erl_client_c_server_SUITE_data/erl_c_test.idl
new file mode 100644
index 0000000000..963bc69017
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_SUITE_data/erl_c_test.idl
@@ -0,0 +1,174 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 2002-2010. 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%
+
+#include "erlang.idl"
+
+
+const short TestConst = 1;
+
+module m {
+
+  const short TestConst = 2;
+
+  struct b {
+    long l;
+    char c;
+  }; 
+
+  struct simple {
+    long l;
+    b    b_t;
+  };
+
+  enum fruit {orange, banana, apple, peach, pear};
+
+  typedef sequence<long> lseq;
+
+  typedef sequence<b> bseq;
+
+  struct a {
+    long l;
+    bseq y;
+    double d;
+  };
+
+  typedef sequence<a> aseq;
+
+  typedef sequence<string> sseq;
+  typedef string str;
+  typedef long myLong;
+
+  typedef long arr1[500], dd[2][3];
+
+  typedef erlang::term apa;
+  typedef erlang::port banan;
+
+  typedef sequence<erlang::term> etseq;
+
+  struct s {
+    long l;
+    sequence<long> sl;
+  };
+
+  struct es {
+    fruit f;
+    myLong l;
+  };
+
+  struct et {
+    erlang::term e;
+    long l;
+  };
+
+
+  typedef sequence<char> str1;
+  typedef string<12> str2;
+  typedef char str3[3];  	
+
+  typedef sequence<string> sstr3;  // sequence of string
+  typedef sequence<sstr3> ssstr3;  // sequence of sequences of strings
+
+  typedef long  arr3[3];           // array of long
+  typedef sequence<arr3> sarr3;    // sequence of array
+  typedef sequence<sarr3> ssarr3;  // sequence of sequnces of arrays of strings
+    
+ struct strRec{
+    boolean bb;
+    string str4;
+    long str7[3][2];
+    sequence<char> str5; 
+    string<12> str6;
+    str3 str8;
+    str2 str9;
+    str1 str10; 	
+  };
+
+
+  struct dyn {
+    long l;
+    sequence<long> sl;
+  };
+  typedef dyn arr2[1][2];
+
+
+  interface i {
+
+    const short TestConst = 3;	
+
+    //arr2 suck(in arr2 x, out arr2 y );
+
+    ///////////////////////////////// attribute long l;
+
+    // simple types
+    void void_test();
+    long long_test(in long a, out long a1);
+    long long longlong_test(in long long a, out long long a1);	
+    unsigned short ushort_test(in unsigned short a, out unsigned short a1);
+    unsigned long ulong_test(in unsigned long a, out unsigned long a1);
+    unsigned long long ulonglong_test(in unsigned long long a, out unsigned long long a1);
+    double double_test(in double a, out double a1);
+    char char_test(in char a, out char a1);
+    wchar wchar_test(in wchar a, out wchar a1);
+    octet octet_test(in octet a, out octet a1);
+    boolean bool_test(in boolean a, out boolean a1);
+
+    // Seq. and struct tests
+    b struct_test(in b a, out b a1);
+    es struct2_test(in es a, out es a1);
+    //simple struct3_test(in simple x, out simple y);	
+    bseq seq1_test(in bseq a, out bseq a1);
+    aseq seq2_test(in aseq a, out aseq a1);
+    lseq seq3_test(in lseq a, out lseq a1);
+    ssstr3 seq4_test(in ssstr3 a, out ssstr3 a1);
+    ssarr3 seq5_test(in ssarr3 a, out ssarr3 a1);
+
+    // Array tests
+    arr1 array1_test(in arr1 a, out arr1 a1);
+    dd array2_test(in dd a, out dd a1);
+
+    // enum test
+    fruit enum_test(in fruit a, out fruit a1);
+
+    // string tests
+    string string1_test(in string a, out string a1);
+    wstring wstring1_test(in wstring a, out wstring a1);
+    sseq string2_test(in sseq a, out sseq a1);
+    str string3_test(in str a, out str a1);
+    strRec string4_test(in strRec a, out strRec a1);
+
+    // Special erlang types
+    erlang::pid pid_test(in erlang::pid a, out erlang::pid a1);
+    erlang::port port_test(in erlang::port a, out erlang::port a1);
+    erlang::ref ref_test(in erlang::ref a, out erlang::ref a1);
+    erlang::term term_test(in erlang::term a, out erlang::term a1);
+    
+    // typedef test
+    long typedef_test(in apa a, in banan b, out apa a1, out banan b1);
+
+    // inlined seq. test
+    s inline_sequence_test(in s a, out s a1);
+
+    // term seq. test
+    etseq term_sequence_test(in etseq a, out etseq a1);
+    // term struct test
+    et term_struct_test(in et a, out et a1);
+   
+  };
+
+};
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/erl_client.erl b/lib/ic/test/erl_client_c_server_SUITE_data/erl_client.erl
new file mode 100644
index 0000000000..79ec28a921
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_SUITE_data/erl_client.erl
@@ -0,0 +1,331 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2002-2010. 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(erl_client).
+
+-export([void_test/2, long_test/2, longlong_test/2, ushort_test/2,
+	 ulong_test/2, ulonglong_test/2, double_test/2, char_test/2,
+	 wchar_test/2, octet_test/2, bool_test/2, struct_test/2,
+	 struct2_test/2, seq1_test/2, seq2_test/2, seq3_test/2,
+	 seq4_test/2, seq5_test/2, array1_test/2, array2_test/2,
+	 enum_test/2, string1_test/2, wstring1_test/2, string2_test/2,
+	 string3_test/2, string4_test/2, pid_test/2, port_test/2,
+	 ref_test/2, term_test/2, typedef_test/2,
+	 inline_sequence_test/2, term_sequence_test/2,
+	 term_struct_test/2
+
+]).
+
+-include("m.hrl").
+-include("m_i.hrl").
+-include("oe_erl_c_test.hrl").
+
+%%b
+void_test(Node, Timeout) ->
+    Ret = m_i:void_test({olsson, Node}, Timeout),
+    Ret == void.				% XXX Not documented
+%%e
+
+%%b
+long_test(Node, Timeout) ->
+    In = max_long(),
+    {Ret, Out} = m_i:long_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+longlong_test(Node, Timeout) ->
+    In = 65537,
+    {Ret, Out} = m_i:longlong_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+ushort_test(Node, Timeout) ->
+    In = max_ushort(),
+    {Ret, Out} = m_i:ushort_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+ulong_test(Node, Timeout) ->
+    In = max_ulong(),
+    {Ret, Out} = m_i:ulong_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+ulonglong_test(Node, Timeout) ->
+    In = 65537,
+    {Ret, Out} = m_i:ulonglong_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+double_test(Node, Timeout) ->
+    In = 37768.93,
+    {Ret, Out} = m_i:double_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+char_test(Node, Timeout) ->
+    In = 80,
+    {Ret, Out} = m_i:char_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+wchar_test(Node, Timeout) ->
+    In = 4097,
+    {Ret, Out} = m_i:wchar_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+octet_test(Node, Timeout) ->
+    In = 255,
+    {Ret, Out} = m_i:octet_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+bool_test(Node, Timeout) ->
+    In = false,
+    {Ret, Out} = m_i:bool_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+struct_test(Node, Timeout) ->
+    In = #m_b{l = max_long(), c = $a},
+    {Ret, Out} = m_i:struct_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+struct2_test(Node, Timeout) ->
+    In = #m_es{ f = banana, l = max_long()},
+    {Ret, Out} = m_i:struct2_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+seq1_test(Node, Timeout) ->
+    B1 = #m_b{l = max_long(), c = $a},
+    B2 = #m_b{l = min_long(), c = $b},
+    In = [B1, B2],
+    {Ret, Out} = m_i:seq1_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+seq2_test(Node, Timeout) ->
+    B = #m_b{l = max_long(), c = $a},
+    A = #m_a{l = min_long(), y = [B, B], d = 4711.31},
+    In = [A, A, A],
+    {Ret, Out} = m_i:seq2_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+seq3_test(Node, Timeout) ->
+    In = [max_long(), min_long(), max_long()],
+    {Ret, Out} = m_i:seq3_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+seq4_test(Node, Timeout) ->
+    In = [["hello", "all"], ["Erlang", "users", "!"]],
+    {Ret, Out} = m_i:seq4_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+seq5_test(Node, Timeout) ->
+    Arr3 = mk_array(3, max_long()),
+    In = [[Arr3, Arr3], [Arr3, Arr3, Arr3]],
+    {Ret, Out} = m_i:seq5_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+array1_test(Node, Timeout) ->
+    In = mk_array(500, min_long()),
+    {Ret, Out} = m_i:array1_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+array2_test(Node, Timeout) ->
+    In = mk_array(2, mk_array(3, min_long())),
+    {Ret, Out} = m_i:array2_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+enum_test(Node, Timeout) ->
+    In = banana,
+    {Ret, Out} = m_i:enum_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+string1_test(Node, Timeout) ->
+    In = "Developing Erlang applications is fun!", 
+    {Ret, Out} = m_i:string1_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+wstring1_test(Node, Timeout) ->
+    In = [1047| "eveloping Erlang applications is fun!"], 
+    {Ret, Out} = m_i:wstring1_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+string2_test(Node, Timeout) ->
+    In = ["Developing Erlang applications ", "is fun!"],
+    {Ret, Out} = m_i:string2_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+string3_test(Node, Timeout) ->
+    In = "Developing Erlang applications is fun!", 
+    {Ret, Out} = m_i:string3_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+string4_test(Node, Timeout) ->
+    
+    In = #m_strRec{
+      bb = true, 
+      str4 = "Developing Erlang applications "
+      "is fun!",
+      str7 = mk_array(3, mk_array(2, max_long())),
+      str5 = [$a, $b, $c, $d, $e, $f],
+      str6 = "123456789012",
+      str8 = {$x, $y, $x},
+      str9 = "123456789012",
+      str10 = [$a, $b, $c, $d, $e, $f]
+      },
+    {Ret, Out} = m_i:string4_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+pid_test(Node, Timeout) ->
+    In = self(),
+    {Ret, Out} = m_i:pid_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+port_test(Node, Timeout) ->
+    In = get(port_test_port),
+    {Ret, Out} = m_i:port_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+ref_test(Node, Timeout) ->
+    In = make_ref(),
+    {Ret, Out} = m_i:ref_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+term_test(Node, Timeout) ->
+    In = {[a, b], 17, kalle},
+    {Ret, Out} = m_i:term_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+typedef_test(Node, Timeout) ->
+    In1 = {nisse, [1, 2], olsson},
+    In2 = get(port_test_port),
+    {Ret, Out1, Out2} = m_i:typedef_test({olsson, Node}, Timeout, In1, In2),
+    %% XXX Should check that Ret is an integer.
+    (Out1 == In1) and (Out2 == In2).
+%%e
+
+%%b
+inline_sequence_test(Node, Timeout) ->
+    In = #m_s{l = min_long(), sl = [max_long(), min_long()]}, 
+    {Ret, Out} = m_i:inline_sequence_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+term_sequence_test(Node, Timeout) ->
+    In = lists:duplicate(17, {nisse, [1, 2], {kalle, olsson}}),
+    {Ret, Out} = m_i:term_sequence_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+term_struct_test(Node, Timeout) ->
+    In = #m_et{e = {nisse, ["abcde"], {kalle, olsson}}, l = 4711},
+    {Ret, Out} = m_i:term_struct_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+
+%% Locals
+
+mk_array(Es) ->
+    list_to_tuple(Es).
+
+mk_array(N, E) ->
+    mk_array(lists:duplicate(N, E)). 
+
+%% max_short() ->
+%%     power_of_two(15) - 1.
+max_long() ->
+    power_of_two(31) - 1.
+max_longlong() ->
+    power_of_two(63) - 1.
+max_ushort() ->
+    power_of_two(16) - 1.
+max_ulong() ->
+    power_of_two(32) - 1.
+max_ulonglong() ->
+    power_of_two(64) - 1.
+
+%% min_short() ->
+%%     -power_of_two(15).
+min_long() ->
+    -power_of_two(31).
+%% min_longlong() ->
+%%     -power_of_two(63).
+%% min_ushort() ->
+%%     0.
+%% min_ulong() ->
+%%     0.
+%% min_ulonglong() ->
+%%     0.
+
+power_of_two(N) -> 
+    round(math:pow(2, N)).
+
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE.erl b/lib/ic/test/erl_client_c_server_proto_SUITE.erl
new file mode 100644
index 0000000000..c8ad4042e4
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_proto_SUITE.erl
@@ -0,0 +1,366 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2004-2010. 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%
+%%
+%%
+
+%%----------------------------------------------------------------------
+%% Purpose : Test suite for erl-client/c-server
+%%----------------------------------------------------------------------
+
+
+-module(erl_client_c_server_proto_SUITE).
+-include_lib("common_test/include/ct.hrl").
+
+-export([init_per_testcase/2, end_per_testcase/2,all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, void_test/1,
+	 long_test/1, longlong_test/1, ushort_test/1, ulong_test/1,
+	 ulonglong_test/1, double_test/1, char_test/1, wchar_test/1,
+	 octet_test/1, bool_test/1, struct_test/1, struct2_test/1,
+	 seq1_test/1, seq2_test/1, seq3_test/1, seq4_test/1,
+	 seq5_test/1, array1_test/1, array2_test/1, enum_test/1,
+	 string1_test/1, string2_test/1, string3_test/1,
+	 string4_test/1, pid_test/1, port_test/1, ref_test/1,
+	 term_test/1, typedef_test/1, inline_sequence_test/1,
+	 term_sequence_test/1, term_struct_test/1, wstring1_test/1]).
+
+-define(DEFAULT_TIMEOUT, 20000).
+-define(PORT_TIMEOUT, 15000).
+-define(CALL_TIMEOUT, 5000).
+
+-define(C_SERVER_NODE_NAME, idl_c_server_test).
+  
+%% Add/remove code path and watchdog before/after each test case.
+%%
+init_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:add_patha(DataDir),
+
+    %% Since other test suites use the module m_i, we have
+    %% to make sure we are using the right m_i module.
+    code:purge(m_i),
+    code:load_file(m_i),
+
+    WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
+    [{watchdog, WatchDog}| Config].
+
+end_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:del_path(DataDir),
+    WatchDog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(WatchDog).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+[void_test, long_test, longlong_test, ushort_test,
+ ulong_test, ulonglong_test, double_test, char_test,
+ wchar_test, octet_test, bool_test, struct_test,
+ struct2_test, seq1_test, seq2_test, seq3_test,
+ seq4_test, seq5_test, array1_test, array2_test,
+ enum_test, string1_test, string2_test, string3_test,
+ string4_test, pid_test, port_test, ref_test, term_test,
+ typedef_test, inline_sequence_test, term_sequence_test,
+ term_struct_test, wstring1_test].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+
+array1_test(doc) -> "";
+array1_test(suite) -> [];
+array1_test(Config) ->
+    do_test(array1_test, Config). 
+
+array2_test(doc) -> "";
+array2_test(suite) -> [];
+array2_test(Config) ->
+    do_test(array2_test, Config).
+
+bool_test(doc) -> "";
+bool_test(suite) -> [];
+bool_test(Config) ->
+    do_test(bool_test, Config).
+
+char_test(doc) -> "";
+char_test(suite) -> [];
+char_test(Config) ->
+    do_test(char_test, Config).
+
+double_test(doc) -> "";
+double_test(suite) -> [];
+double_test(Config) ->
+    do_test(double_test, Config).
+
+enum_test(doc) -> "";
+enum_test(suite) -> [];
+enum_test(Config) ->
+    do_test(enum_test, Config).
+
+inline_sequence_test(doc) -> "";
+inline_sequence_test(suite) -> [];
+inline_sequence_test(Config) ->
+    do_test(inline_sequence_test, Config).
+
+longlong_test(doc) -> "";
+longlong_test(suite) -> [];
+longlong_test(Config) ->
+    do_test(longlong_test, Config).
+
+long_test(doc) -> "";
+long_test(suite) -> [];
+long_test(Config) ->
+    do_test(long_test, Config).
+
+octet_test(doc) -> "";
+octet_test(suite) -> [];
+octet_test(Config) ->
+    do_test(octet_test, Config).
+
+pid_test(doc) -> "";
+pid_test(suite) -> [];
+pid_test(Config) ->
+    do_test(pid_test, Config).
+
+port_test(doc) -> "";
+port_test(suite) -> [];
+port_test(Config) ->
+    do_test(port_test, Config).
+
+ref_test(doc) -> "";
+ref_test(suite) -> [];
+ref_test(Config) ->
+    do_test(ref_test, Config).
+
+seq1_test(doc) -> "";
+seq1_test(suite) -> [];
+seq1_test(Config) ->
+    do_test(seq1_test, Config).
+
+seq2_test(doc) -> "";
+seq2_test(suite) -> [];
+seq2_test(Config) ->
+    do_test(seq2_test, Config).
+
+seq3_test(doc) -> "";
+seq3_test(suite) -> [];
+seq3_test(Config) ->
+    do_test(seq3_test, Config).
+
+seq4_test(doc) -> "";
+seq4_test(suite) -> [];
+seq4_test(Config) ->
+    do_test(seq4_test, Config).
+
+seq5_test(doc) -> "";
+seq5_test(suite) -> [];
+seq5_test(Config) ->
+    do_test(seq5_test, Config).
+
+string1_test(doc) -> "";
+string1_test(suite) -> [];
+string1_test(Config) ->
+    do_test(string1_test, Config).
+
+string2_test(doc) -> "";
+string2_test(suite) -> [];
+string2_test(Config) ->
+    do_test(string2_test, Config).
+
+string3_test(doc) -> "";
+string3_test(suite) -> [];
+string3_test(Config) ->
+    do_test(string3_test, Config).
+
+string4_test(doc) -> "";
+string4_test(suite) -> [];
+string4_test(Config) ->
+    do_test(string4_test, Config).
+
+struct2_test(doc) -> "";
+struct2_test(suite) -> [];
+struct2_test(Config) ->
+    do_test(struct2_test, Config).
+
+struct_test(doc) -> "";
+struct_test(suite) -> [];
+struct_test(Config) ->
+    do_test(struct_test, Config).
+
+term_sequence_test(doc) -> "";
+term_sequence_test(suite) -> [];
+term_sequence_test(Config) ->
+    do_test(term_sequence_test, Config).
+
+term_struct_test(doc) -> "";
+term_struct_test(suite) -> [];
+term_struct_test(Config) ->
+    do_test(term_struct_test, Config).
+
+term_test(doc) -> "";
+term_test(suite) -> [];
+term_test(Config) ->
+    do_test(term_test, Config).
+
+typedef_test(doc) -> "";
+typedef_test(suite) -> [];
+typedef_test(Config) ->
+    do_test(typedef_test, Config).
+
+ulonglong_test(doc) -> "";
+ulonglong_test(suite) -> [];
+ulonglong_test(Config) ->
+    do_test(ulonglong_test, Config).
+
+ulong_test(doc) -> "";
+ulong_test(suite) -> [];
+ulong_test(Config) ->
+    do_test(ulong_test, Config).
+
+ushort_test(doc) -> "";
+ushort_test(suite) -> [];
+ushort_test(Config) ->
+    do_test(ushort_test, Config).
+
+void_test(doc) -> "";
+void_test(suite) -> [];
+void_test(Config) ->
+    do_test(void_test, Config).
+
+wchar_test(doc) -> "";
+wchar_test(suite) -> [];
+wchar_test(Config) ->
+    do_test(wchar_test, Config).
+
+wstring1_test(doc) -> "";
+wstring1_test(suite) -> [];
+wstring1_test(Config) ->
+    do_test(wstring1_test, Config).
+
+
+do_test(Case, Config) ->
+    %% Trap exits
+    process_flag(trap_exit, true),
+    Node = atom_to_list(node()),
+    [_NodeName, HostName] = string:tokens(Node, "@"),
+    DataDir = ?config(data_dir, Config),
+    %% io:format("~p: data directory: ~p~n", [?MODULE, DataDir]),
+    Cookie = atom_to_list(erlang:get_cookie()),
+    ServerNodeName = atom_to_list(?C_SERVER_NODE_NAME), 
+    %% Start C-server node as a port program. We wait for the node
+    %% to connect to us.
+    Cmd = filename:join([DataDir, "c_server"]) ++
+	" -this-node-name " ++ ServerNodeName ++ 
+	" -peer-node " ++ Node ++
+	" -cookie " ++ Cookie, 
+    Port = open_port({spawn, Cmd}, [exit_status, eof, stderr_to_stdout]),
+    ServerNode = list_to_atom(ServerNodeName ++ "@" ++ HostName),
+    Res = case wait_for_hidden_node(ServerNode) of
+	      ok ->
+		  %% Need a port for port_test and typedef_test
+		  put(port_test_port, Port),
+		  R = (catch erl_client:Case(ServerNode, ?CALL_TIMEOUT)),
+		  case wait_for_completion(Port) of
+		      {error, timeout} ->
+			  kill_off_node(ServerNode);
+		      _ ->
+			  ok
+		  end,
+		  R;
+	      {error, timeout} ->
+		  case wait_for_completion(Port) of
+		      {error, timeout} ->
+			  kill_off_node(ServerNode);
+		      _ ->
+			  ok
+		  end,
+		  {error, timeout}
+	  end,
+    process_flag(trap_exit, false),
+    true = Res.
+
+
+%% Wait for eof *and* exit status, but return if exit status indicates
+%% an error, or we have been waiting more than PORT_TIMEOUT seconds.
+%%
+wait_for_completion(Port) ->
+    wait_for_completion(Port, 0).
+
+wait_for_completion(Port, N) when N < 2 ->
+    receive
+	{Port, {data, Bytes}} ->
+	    %% Relay output
+	    io:format("~s", [Bytes]),
+	    wait_for_completion(Port, N);
+	{Port, {exit_status, 0}} ->
+	    wait_for_completion(Port, N + 1);
+	{Port, {exit_status, Status}} ->
+	    {error, Status};
+	{Port, eof} ->
+	    wait_for_completion(Port, N + 1);
+	{'EXIT', Port, Reason} ->
+	    io:format("Port exited with reason: ~w~n", [Reason]),
+	    wait_for_completion(Port, N);
+	{'EXIT', From, Reason} ->
+	    io:format("Got unexpected exit: ~p~n", [{'EXIT', From, Reason}]),
+	    wait_for_completion(Port, N)
+    after ?PORT_TIMEOUT ->
+	    {error, timeout}
+    end;
+wait_for_completion(_, _) ->
+    ok.
+	    
+wait_for_hidden_node(Node) ->
+    Times = ?DEFAULT_TIMEOUT div 100,
+    wait_for_hidden_node(Node, Times, 100).
+
+wait_for_hidden_node(Node, Times, WaitTime) when Times > 0 ->
+    io:format("Waiting for hidden node: ~p~n", [Node]), 
+    case lists:member(Node, erlang:nodes(hidden)) of
+	true ->
+	    ok;
+	false ->
+	    delay(WaitTime),
+	    wait_for_hidden_node(Node, Times - 1, WaitTime)
+    end;
+wait_for_hidden_node(_Node, _, _WaitTime) ->
+    {error, timeout}.
+
+kill_off_node(Node) ->
+    catch rpc:cast(Node, erlang, halt, [1]).
+
+delay(Time) ->
+    receive
+	after Time ->
+		ok
+	end.
+    
+
+	    
+
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..b7e7ee77d0
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
@@ -0,0 +1,150 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2004-2009. 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%
+#
+#
+# Makefile.src for erl_client_c_server test
+# Note: This file *must* work for both Unix and Windows
+#
+# We use both `rm' (Unix) and `del' (Windows) for removing files, but
+# with a `-' in front so that the error in not finding `rm' (`del') on
+# Windows (Unix) is ignored.
+#
+# VxWorks? XXX 
+#
+
+.SUFFIXES:
+.SUFFIXES: .c .h .erl .idl @obj@ .@EMULATOR@
+
+
+# Variables from ts: 
+#
+
+ERL_INCLUDE = @erl_include@
+
+IC_INCLUDE_PATH = @ic_include_path@
+IC_LIB = @ic_libpath@@DS@@ic_lib@
+
+ERL_INTERFACE_INCLUDE = @erl_interface_include@
+ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@
+ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@
+ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
+ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
+
+CC = @CC@
+## XXX Should set warning flag with a DEBUG_FLAG 
+CFLAGS = @CFLAGS@ @DEFS@ -I$(ERL_INCLUDE) \
+	-I$(IC_INCLUDE_PATH) -I$(ERL_INTERFACE_INCLUDE)
+
+LD = @LD@
+LDFLAGS = @CROSSLDFLAGS@
+LIBS =	$(IC_LIB) $(ERL_INTERFACE_LIB) $(ERL_INTERFACE_EILIB) \
+	$(ERL_INTERFACE_THREADLIB) @LIBS@ $(ERL_INTERFACE_SOCK_LIBS)
+ERLC = erlc
+
+# Generated C header files
+GEN_H_FILES = \
+	m__s.h \
+	m_i__s.h \
+	oe_erl_c_test__s.h
+
+# Generated C files 
+GEN_C_FILES =  \
+	m__s.c \
+	m_i__s.c \
+	oe_code_m_a.c \
+	oe_code_m_arr1.c \
+	oe_code_m_arr2.c \
+	oe_code_m_arr3.c \
+	oe_code_m_aseq.c \
+	oe_code_m_b.c \
+	oe_code_m_bseq.c \
+	oe_code_m_dd.c \
+	oe_code_m_dyn.c \
+	oe_code_m_dyn_sl.c \
+	oe_code_m_es.c \
+	oe_code_m_et.c \
+	oe_code_m_etseq.c \
+	oe_code_m_fruit.c \
+	oe_code_m_lseq.c \
+	oe_code_m_s.c \
+	oe_code_m_s_sl.c \
+	oe_code_m_sarr3.c \
+	oe_code_m_simple.c \
+	oe_code_m_ssarr3.c \
+	oe_code_m_sseq.c \
+	oe_code_m_ssstr3.c \
+	oe_code_m_sstr3.c \
+	oe_code_m_str1.c \
+	oe_code_m_str3.c \
+	oe_code_m_strRec.c \
+	oe_code_m_strRec_str5.c \
+	oe_code_m_strRec_str7.c \
+	oe_erl_c_test__s.c
+
+GEN_HRL_FILES = \
+	m.hrl \
+	m_i.hrl \
+	oe_erl_c_test.hrl
+
+GEN_ERL_FILES = \
+	m.erl \
+	m_arr2.erl \
+	m_arr3.erl \
+	m_i.erl \
+	m_str3.erl \
+	oe_erl_c_test.erl
+
+C_FILES = $(GEN_C_FILES) c_server.c callbacks.c
+
+OBJS = $(C_FILES:.c=@obj@)
+
+PGMS = c_server@exe@
+
+ERL_FILES = $(GEN_ERL_FILES) erl_client.erl
+
+EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
+
+
+all: $(PGMS) $(EBINS)
+
+clean:	
+	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
+		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES)
+
+$(PGMS): $(OBJS)
+	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+
+$(GEN_C_FILES) $(GEN_H_FILES): erl_c_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_server}" \
+	"+{scoped_op_calls,true}" erl_c_test.idl
+
+# If we have scoped operation calls for C, we must have that for
+# Erlang as well, if we use the m_i.erl file for calling the server.
+
+$(GEN_ERL_FILES) $(GEN_HRL_FILES): erl_c_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" \
+	"+{scoped_op_calls,true}"  "+{timeout,true}" erl_c_test.idl
+
+.c@obj@:
+	$(CC) -c -o $*@obj@ $(CFLAGS) $<
+
+.erl.@EMULATOR@:
+	$(ERLC) -W -I $(IC_INCLUDE_PATH) $<
+
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/c_server.c b/lib/ic/test/erl_client_c_server_proto_SUITE_data/c_server.c
new file mode 100644
index 0000000000..329f444112
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_proto_SUITE_data/c_server.c
@@ -0,0 +1,299 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2004-2009. 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%
+ *
+ */
+/* C-server for test of IC.
+ *
+ * The C-node implemented here connects to its peer node, waits for
+ * one message, evaluates the message, returns an result message, and 
+ * terminates.
+ * 
+ * TODO:
+ *
+ * 1. XXX #includes for VxWorks, Windows
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef __WIN32__
+#  include <unistd.h>
+#endif
+
+#include <string.h>
+
+#ifdef __WIN32__
+#  include <time.h>
+#  include <sys/timeb.h>
+#elif defined VXWORKS
+#  include <time.h>
+#  include <sys/times.h>
+#else
+#  include <sys/time.h>
+#endif
+
+#include <ctype.h>
+
+#ifdef __WIN32__
+#  include <winsock2.h>
+#  include <windows.h>
+#else
+#  include <sys/types.h>
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  include <netdb.h>
+#endif
+
+#include "ic.h"
+#include "ei.h"
+#include "erl_interface.h"
+#include "eicode.h"
+#include "m_i__s.h"
+#include "m__s.h"
+
+#ifdef __WIN32__
+typedef struct {
+    long tv_sec;
+    long tv_usec;
+} MyTimeval;
+#else
+typedef struct timeval MyTimeval;
+#endif
+static void my_gettimeofday(MyTimeval *tv);
+static void showtime(MyTimeval *start, MyTimeval *stop);
+static void usage(void);
+static void done(int r);
+
+#define HOSTNAMESZ 	256
+#define NODENAMESZ 	512
+#define INBUFSZ 	 10
+#define OUTBUFSZ 	  0
+#define MAXTRIES 	  5
+
+static char *progname;
+
+/* main */
+#ifdef VXWORKS
+int c_server(int argc, char **argv)
+#else
+int main(int argc, char **argv)
+#endif
+{
+    struct hostent *hp;
+    MyTimeval start, stop;
+    int i, fd, ires, tries;
+    CORBA_Environment *env;
+    char *this_node_name = NULL;
+    char *peer_node = NULL;
+    char *cookie = NULL;
+    char host[HOSTNAMESZ + 1];
+    char this_node[NODENAMESZ + 1];
+    erlang_msg msg;
+    int status, loop; 
+    
+#ifdef __WIN32__
+    WORD wVersionRequested;
+    WSADATA wsaData;
+    
+    wVersionRequested = MAKEWORD(2, 0);
+    
+    if (WSAStartup(wVersionRequested, &wsaData) != 0) {
+	fprintf(stderr, "Could not load winsock2 v2.0 compatible DLL");
+	exit(1);
+    }
+#endif
+    
+    progname = argv[0];
+    host[HOSTNAMESZ] = '\0';
+    if (gethostname(host, HOSTNAMESZ) < 0) {
+	fprintf(stderr, "Can't find own hostname\n");
+	done(1);
+    } 
+    if ((hp = gethostbyname(host)) == 0) {
+	fprintf(stderr, "Can't get ip address for host %s\n", host);
+	done(1);
+    }
+    for (i = 1; i < argc; i++) {
+	if (strcmp(argv[i], "-help") == 0) {
+	    usage();
+	    done(0);
+	} else if (strcmp(argv[i], "-this-node-name") == 0) {
+	    i++;
+	    this_node_name = argv[i];
+	} else if (strcmp(argv[i], "-peer-node") == 0) {
+	    i++;
+	    peer_node = argv[i];
+	} else if (strcmp(argv[i], "-cookie") == 0) {
+	    i++;
+	    cookie = argv[i];
+	} else {
+	    fprintf(stderr, "Error : invalid argument \"%s\"\n", argv[i]);
+	    usage();
+	    done(1);
+	}
+    }
+
+    if (this_node_name == NULL || peer_node == NULL || cookie == NULL) {
+	fprintf(stderr, "Error: missing option\n");
+	usage();
+	done(1);
+    }
+
+    /* Behead hostname at first dot */
+    for (i=0; host[i] != '\0'; i++) {
+	if (host[i] == '.') { host[i] = '\0'; break; }
+    }
+    sprintf(this_node, "%s@%s", this_node_name, host);
+
+    fprintf(stderr, "c_server: this node: \"%s\"\n", this_node);
+    fprintf(stderr, "c_server: peer node: \"%s\"\n", peer_node);
+
+    /* initialize erl_interface */
+    erl_init(NULL, 0);
+
+    for (tries = 0; tries < MAXTRIES; tries++) {
+	/* connect to peer node */ 
+    	ires = erl_connect_xinit(host, this_node_name, this_node, 
+				 (struct in_addr *)*hp->h_addr_list, 
+				 cookie, 0);
+	fprintf(stderr, "c_server: erl_connect_xinit(): %d\n", ires);
+    
+	fd = erl_connect(peer_node);
+	fprintf(stderr, "c_server: erl_connect(): %d\n", fd);
+	if (fd >= 0) 
+	    break;
+	fprintf(stderr, "c_server: cannot connect, retrying\n");
+    }
+    if (fd < 0) {
+	fprintf(stderr, "c_server: cannot connect, exiting\n");
+	done(1);
+    }
+    env = CORBA_Environment_alloc(INBUFSZ, OUTBUFSZ);
+    env->_fd = fd; 
+
+    status = 1;
+    loop = 1;
+    my_gettimeofday(&start);
+    while (status >= 0 && loop > 0) {
+        status = ei_receive_encoded(env->_fd, &env->_inbuf, &env->_inbufsz, 
+				    &msg, &env->_iin); 
+	switch(status) {
+	case ERL_SEND:
+	case ERL_REG_SEND:
+	    /* get result */
+	    m_i__switch(NULL, env);
+	    switch(env->_major) {
+	    case CORBA_NO_EXCEPTION:
+		break;
+	    case CORBA_SYSTEM_EXCEPTION:
+		fprintf(stderr, "Request failure, reason : %s\n", 
+			(char *) CORBA_exception_value(env));
+		CORBA_exception_free(env);
+		break;
+	    default: /* Should not happen */
+		CORBA_exception_free(env);
+		break;
+	    }
+	    /* send back result data */
+	    if (env->_iout > 0) 
+		ei_send_encoded(env->_fd, &env->_caller, env->_outbuf, 
+				env->_iout);
+	    loop = 0;
+	    break;
+	case ERL_TICK:
+	    break;
+	default: 
+	    if (status < 0) {
+		fprintf(stderr, "Status negative: %d\n", status);
+		loop = 0;
+	    }
+	    break;
+	}
+    }	
+    my_gettimeofday(&stop);
+    showtime(&start, &stop);
+
+    erl_close_connection(fd);
+
+    CORBA_free(env->_inbuf);
+    CORBA_free(env->_outbuf);
+    CORBA_free(env);
+    if (status < 0) 
+	done(-status);
+    else 
+	done(0); 
+}
+
+static void usage() 
+{
+    fprintf(stderr, "Usage: %s [-help] -this-node-name <name> "
+	    "-peer-node <nodename> -cookie <cookie>\n", progname);
+    fprintf(stderr, "Example:\n  %s  -this-node-name kalle "
+	    "-peer-node olle@home -cookie oa678er\n", progname);
+}
+
+static void done(int r) 
+{
+#ifdef __WIN32__
+    WSACleanup();
+#endif
+    exit(r);
+}
+
+static void showtime(MyTimeval *start, MyTimeval *stop)
+{
+    MyTimeval elapsed;
+
+    elapsed.tv_sec = stop->tv_sec - start->tv_sec;
+    elapsed.tv_usec = stop->tv_usec - start->tv_usec;
+    while (elapsed.tv_usec < 0) {
+	elapsed.tv_sec -= 1;
+	elapsed.tv_usec += 1000000;
+    }
+    fprintf(stderr,"%ld.%06ld seconds\n",elapsed.tv_sec, elapsed.tv_usec);
+}
+
+
+
+static void my_gettimeofday(MyTimeval *tv)
+#ifdef __WIN32__
+#define EPOCH_JULIAN_DIFF 11644473600i64
+{
+    SYSTEMTIME t;
+    FILETIME ft;
+    LONGLONG lft;
+
+    GetSystemTime(&t);
+    SystemTimeToFileTime(&t, &ft);
+    memcpy(&lft, &ft, sizeof(lft));
+    tv->tv_usec = (long) ((lft / 10i64) % 1000000i64);
+    tv->tv_sec = (long) ((lft / 10000000i64) - EPOCH_JULIAN_DIFF);
+}
+#elif defined VXWORKS
+{
+    int rate = sysClkRateGet(); /* Ticks per second */
+    unsigned long ctick = tickGet();
+    tv->tv_sec = ctick / rate; /* secs since reboot */
+    tv->tv_usec = ((ctick - (tv->tv_sec * rate))*1000000)/rate;
+}
+#else
+{
+    gettimeofday(tv, NULL);
+}
+#endif
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c b/lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c
new file mode 100644
index 0000000000..b029bcc63c
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c
@@ -0,0 +1,610 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2004-2009. 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%
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#ifndef __WIN32__
+#  include <unistd.h>
+#endif
+#include <string.h>
+#include <ctype.h>
+#include <ic.h>
+#include <erl_interface.h>
+#include <ei.h>
+#include "m_i__s.h"
+
+
+
+/* OK */
+
+void my_void_test(CORBA_Object oe_obj, 
+		  CORBA_Environment *oe_env)
+{
+    /* printf("void test !\n"); */
+}
+ 
+m_i_void_test__rs* m_i_void_test__cb(CORBA_Object oe_obj, 
+				     CORBA_Environment *oe_env)
+{
+    return (m_i_void_test__rs*) (my_void_test);
+}
+
+
+
+/* OK */
+
+void my_long_test(CORBA_Object oe_obj, 
+		  long* a, 
+		  long* b, 
+		  long* c, 
+		  CORBA_Environment *oe_env)
+{
+    /* printf("long test !\n"); */
+}
+ 
+ 
+m_i_long_test__rs* m_i_long_test__cb(CORBA_Object oe_obj, 
+				     long* a, 
+				     long* b, 
+				     long* c, 
+				     CORBA_Environment *oe_env)
+{ 
+    *a = *b;
+    *c = *b;
+    return (m_i_long_test__rs*) (my_long_test);
+}
+
+/* OK */
+
+void my_longlong_test(CORBA_Object oe_obj, 
+		      CORBA_long_long* a, 
+		      CORBA_long_long* b, 
+		      CORBA_long_long* c, 
+		      CORBA_Environment *oe_env)
+{
+    /* printf("long test !\n"); */
+}
+ 
+m_i_longlong_test__rs* m_i_longlong_test__cb(CORBA_Object oe_obj, 
+					     CORBA_long_long* a, 
+					     CORBA_long_long* b, 
+					     CORBA_long_long* c, 
+					     CORBA_Environment *oe_env)
+{ 
+    *a = *b;
+    *c = *b;
+    return (m_i_longlong_test__rs*) (my_longlong_test);
+}
+
+/* OK */
+void my_ulong_test(CORBA_Object oe_obj, 
+		   unsigned long* a, 
+		   unsigned long* b, 
+		   unsigned long* c, 
+		   CORBA_Environment *oe_env)
+{
+    /* printf("ulong test !\n"); */
+}
+ 
+m_i_ulong_test__rs* m_i_ulong_test__cb(CORBA_Object oe_obj, 
+				       unsigned long* a, 
+				       unsigned long* b, 
+				       unsigned long* c, 
+				       CORBA_Environment *oe_env)
+{
+    *a = *b;
+    *c = *b;
+    return (m_i_ulong_test__rs*) (my_ulong_test);
+}
+
+/* OK */
+void my_ulonglong_test(CORBA_Object oe_obj,
+		       CORBA_unsigned_long_long* a,
+		       CORBA_unsigned_long_long* b,
+		       CORBA_unsigned_long_long* c,
+		       CORBA_Environment *oe_env)
+{
+    /* printf("ulong test !\n"); */
+}
+ 
+m_i_ulonglong_test__rs* m_i_ulonglong_test__cb(CORBA_Object oe_obj,
+					       CORBA_unsigned_long_long* a,
+					       CORBA_unsigned_long_long* b,
+					       CORBA_unsigned_long_long* c,
+					       CORBA_Environment *oe_env)
+{
+    *a = *b;
+    *c = *b;
+    return (m_i_ulonglong_test__rs*) (my_ulonglong_test);
+}
+
+m_i_ushort_test__rs* m_i_ushort_test__cb(CORBA_Object oe_obj,
+					 unsigned short* a,
+					 unsigned short* b,
+					 unsigned short* c,
+					 CORBA_Environment *oe_env)
+{
+    *a = *b;
+    *c = *b;
+    return (m_i_ushort_test__rs*) NULL;
+}
+
+
+/* OK */
+void my_double_test(CORBA_Object oe_obj,
+		    double* a,
+		    double* b,
+		    double* c,
+		    CORBA_Environment *oe_env)
+{
+    /* printf("double test !\n"); */
+}
+ 
+m_i_double_test__rs* m_i_double_test__cb(CORBA_Object oe_obj,
+					 double* a,
+					 double* b,
+					 double* c,
+					 CORBA_Environment *oe_env)
+{
+    *a = *b;
+    *c = *b;
+    return (m_i_double_test__rs*) (my_double_test);
+}
+
+/* OK */
+m_i_char_test__rs* m_i_char_test__cb(CORBA_Object oe_obj,
+				     char* a,
+				     char* b,
+				     char* c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_char_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+
+/* OK */
+m_i_wchar_test__rs* m_i_wchar_test__cb(CORBA_Object oe_obj,
+				       CORBA_wchar* a,
+				       CORBA_wchar* b,
+				       CORBA_wchar* c,
+				       CORBA_Environment *oe_env)
+{
+    m_i_wchar_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+m_i_octet_test__rs* m_i_octet_test__cb(CORBA_Object oe_obj,
+				       char* a,
+				       char* b,
+				       char* c,
+				       CORBA_Environment *oe_env)
+{
+    m_i_octet_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+m_i_bool_test__rs* m_i_bool_test__cb(CORBA_Object oe_obj,
+				     CORBA_boolean* a,
+				     CORBA_boolean* b,
+				     CORBA_boolean* c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_bool_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+void my_struct_test(CORBA_Object oe_obj,
+		    m_b* a,
+		    m_b* b,
+		    m_b* c,
+		    CORBA_Environment *oe_env)
+{
+    /* printf("struct test !\n"); */
+}
+ 
+m_i_struct_test__rs* m_i_struct_test__cb(CORBA_Object oe_obj,
+					 m_b* a,
+					 m_b* b,
+					 m_b* c,
+					 CORBA_Environment *oe_env)
+{
+    *a = *b;
+    *c = *b;
+    return (m_i_struct_test__rs*) (my_struct_test); 
+}
+
+/* OK */
+m_i_struct2_test__rs* m_i_struct2_test__cb(CORBA_Object oe_obj,
+					   m_es* a,
+					   m_es* b,
+					   m_es* c,
+					   CORBA_Environment *oe_env)
+{
+    m_i_struct2_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+/* XXX Commented out
+m_i_struct3_test__rs* m_i_struct3_test__cb(CORBA_Object oe_obj,
+					   m_simple* a,
+					   m_simple* b,
+					   m_simple* c,
+					   CORBA_Environment *oe_env)
+{
+  m_i_struct3_test__rs* rs = NULL; 
+  *a = *b;
+  *c = *b;
+  return rs;
+}
+*/
+
+/* OK */
+m_i_seq1_test__rs* m_i_seq1_test__cb(CORBA_Object oe_obj,
+				     m_bseq** a,
+				     m_bseq* b,
+				     m_bseq** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_seq1_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+
+/* OK */
+m_i_seq2_test__rs* m_i_seq2_test__cb(CORBA_Object oe_obj,
+				     m_aseq** a,
+				     m_aseq* b,
+				     m_aseq** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_seq2_test__rs* rs = NULL; 
+  
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_seq3_test__rs* m_i_seq3_test__cb(CORBA_Object oe_obj,
+				     m_lseq** a,
+				     m_lseq* b,
+				     m_lseq** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_seq3_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_seq4_test__rs* m_i_seq4_test__cb(CORBA_Object oe_obj,
+				     m_ssstr3** a,
+				     m_ssstr3* b,
+				     m_ssstr3** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_seq4_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_seq5_test__rs* m_i_seq5_test__cb(CORBA_Object oe_obj,
+				     m_ssarr3** a,
+				     m_ssarr3* b,
+				     m_ssarr3** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_seq5_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_array1_test__rs* m_i_array1_test__cb(CORBA_Object oe_obj,
+					 m_arr1 a,
+					 m_arr1 b,
+					 m_arr1 c,
+					 CORBA_Environment *oe_env)
+{
+    int i;
+    m_i_array1_test__rs* rs = NULL; 
+  
+    for (i = 0; i < 500; i++) {
+	a[i] = b[i]; 
+	c[i] = b[i];
+    }
+    return rs;
+}
+
+/* OK */
+m_i_array2_test__rs* m_i_array2_test__cb(CORBA_Object oe_obj,
+					 m_dd a,
+					 m_dd b,
+					 m_dd c,
+					 CORBA_Environment *oe_env)
+{
+    int i,j;
+    m_i_array2_test__rs* rs = NULL; 
+  
+    for (i = 0; i < 2; i++)
+	for (j = 0; j < 3; j++) {
+	    a[i][j] = b[i][j];
+	    c[i][j] = b[i][j];
+	}
+    return rs;
+}
+
+
+/* OK */
+m_i_enum_test__rs* m_i_enum_test__cb(CORBA_Object oe_obj,
+				     m_fruit* a,
+				     m_fruit* b,
+				     m_fruit* c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_enum_test__rs* rs = NULL; 
+  
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+m_i_string1_test__rs* m_i_string1_test__cb(CORBA_Object oe_obj,
+					   char ** a,
+					   char * b,
+					   char ** c,
+					   CORBA_Environment *oe_env)
+{
+    m_i_string1_test__rs* rs = NULL; 
+
+    /*printf("\nString in ------> %s\n\n",b);*/
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_string2_test__rs* m_i_string2_test__cb(CORBA_Object oe_obj,
+					   m_sseq** a,
+					   m_sseq* b,
+					   m_sseq** c,
+					   CORBA_Environment *oe_env)
+{
+    m_i_string2_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_string3_test__rs* m_i_string3_test__cb(CORBA_Object oe_obj,
+					   char ** a,
+					   char * b,
+					   char ** c,
+					   CORBA_Environment *oe_env)
+{
+    m_i_string3_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+m_i_string4_test__rs* m_i_string4_test__cb(CORBA_Object oe_obj,
+					   m_strRec** a,
+					   m_strRec* b,
+					   m_strRec** c,
+					   CORBA_Environment *oe_env)
+{
+    *a = b;
+    *c = b;
+ 
+    return (m_i_string4_test__rs*) NULL; 
+}
+
+/* OK */
+m_i_wstring1_test__rs* m_i_wstring1_test__cb(CORBA_Object oe_obj,
+					     CORBA_wchar ** a,
+					     CORBA_wchar * b,
+					     CORBA_wchar ** c,
+					     CORBA_Environment *oe_env)
+{
+    int tmp;
+    m_i_wstring1_test__rs* rs = NULL; 
+
+    /*printf("\nString in ------> %s\n\n",b);*/
+
+    for(tmp = 0; tmp < 5; tmp++) 
+	fprintf(stderr,"\np[%d] = %ld\n", tmp, b[tmp]);
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+
+/* OK */
+m_i_pid_test__rs* m_i_pid_test__cb(CORBA_Object oe_obj,
+				   erlang_pid* a,
+				   erlang_pid* b,
+				   erlang_pid* c,
+				   CORBA_Environment *oe_env)
+{
+    m_i_pid_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+/* OK */
+m_i_port_test__rs* m_i_port_test__cb(CORBA_Object oe_obj,
+				     erlang_port* a,
+				     erlang_port* b,
+				     erlang_port* c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_port_test__rs* rs = NULL; 
+
+    strcpy((*a).node,(*b).node);
+    (*a).id = (*b).id;
+    (*a).creation = 0;
+
+    strcpy((*c).node,(*b).node);
+    (*c).id = (*b).id;
+    (*c).creation = 0;
+    return rs;
+}
+
+/* OK */
+m_i_ref_test__rs* m_i_ref_test__cb(CORBA_Object oe_obj,
+				   erlang_ref* a,
+				   erlang_ref* b,
+				   erlang_ref* c,
+				   CORBA_Environment *oe_env)
+{
+
+    m_i_ref_test__rs* rs = NULL; 
+
+    strcpy((*a).node,(*b).node);
+    /*(*a).id = (*b).id;*/
+    (*a).len = (*b).len;
+    (*a).n[0] = (*b).n[0];
+    (*a).n[1] = (*b).n[1];
+    (*a).n[2] = (*b).n[2];
+    (*a).creation = 0;
+
+    strcpy((*c).node,(*b).node);
+    /*(*c).id = (*b).id;*/
+    (*c).len = (*b).len;
+    (*c).n[0] = (*b).n[0];
+    (*c).n[1] = (*b).n[1];
+    (*c).n[2] = (*b).n[2];
+    (*c).creation = 0;
+    return rs;
+}
+
+/* OK */
+m_i_term_test__rs* m_i_term_test__cb(CORBA_Object oe_obj,
+				     ETERM** a,
+				     ETERM** b,
+				     ETERM** c,
+				     CORBA_Environment *oe_env)
+{
+    m_i_term_test__rs* rs = NULL; 
+
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
+m_i_typedef_test__rs* m_i_typedef_test__cb(CORBA_Object oe_obj,
+					   long* a,
+					   ETERM** b,
+					   erlang_port* c,
+					   ETERM** d ,
+					   erlang_port* e,
+					   CORBA_Environment *oe_env)
+{
+    m_i_typedef_test__rs* rs = NULL; 
+  
+    *d = *b;
+    strcpy((*e).node,(*c).node);
+    (*e).id = (*c).id;
+    (*e).creation = 0;
+    *a = 4711;
+    return rs;
+}
+
+/* OK */
+m_i_inline_sequence_test__rs* m_i_inline_sequence_test__cb(
+    CORBA_Object oe_obj,
+    m_s** a,
+    m_s* b,
+    m_s** c,
+    CORBA_Environment *oe_env)
+{
+    m_i_inline_sequence_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b;
+    return rs;
+}
+
+/* OK */
+m_i_term_sequence_test__rs* m_i_term_sequence_test__cb(
+    CORBA_Object oe_obj,
+    m_etseq** a,
+    m_etseq* b,
+    m_etseq** c,
+    CORBA_Environment *oe_env)
+{
+    m_i_term_sequence_test__rs* rs = NULL; 
+
+    *a = b;
+    *c = b; 
+    return rs;
+}
+
+
+/* OK */
+m_i_term_struct_test__rs* m_i_term_struct_test__cb(CORBA_Object oe_obj,
+						   m_et* a,
+						   m_et* b,
+						   m_et* c,
+						   CORBA_Environment *oe_env)
+{
+    m_i_term_struct_test__rs* rs = NULL; 
+  
+    *a = *b;
+    *c = *b;
+    return rs;
+}
+
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_c_test.idl b/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_c_test.idl
new file mode 100644
index 0000000000..e90d0dd5f0
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_c_test.idl
@@ -0,0 +1,174 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 2004-2010. 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%
+
+#include "erlang.idl"
+
+
+const short TestConst = 1;
+
+module m {
+
+  const short TestConst = 2;
+
+  struct b {
+    long l;
+    char c;
+  }; 
+
+  struct simple {
+    long l;
+    b    b_t;
+  };
+
+  enum fruit {orange, banana, apple, peach, pear};
+
+  typedef sequence<long> lseq;
+
+  typedef sequence<b> bseq;
+
+  struct a {
+    long l;
+    bseq y;
+    double d;
+  };
+
+  typedef sequence<a> aseq;
+
+  typedef sequence<string> sseq;
+  typedef string str;
+  typedef long myLong;
+
+  typedef long arr1[500], dd[2][3];
+
+  typedef erlang::term apa;
+  typedef erlang::port banan;
+
+  typedef sequence<erlang::term> etseq;
+
+  struct s {
+    long l;
+    sequence<long> sl;
+  };
+
+  struct es {
+    fruit f;
+    myLong l;
+  };
+
+  struct et {
+    erlang::term e;
+    long l;
+  };
+
+
+  typedef sequence<char> str1;
+  typedef string<12> str2;
+  typedef char str3[3];  	
+
+  typedef sequence<string> sstr3;  // sequence of string
+  typedef sequence<sstr3> ssstr3;  // sequence of sequences of strings
+
+  typedef long  arr3[3];           // array of long
+  typedef sequence<arr3> sarr3;    // sequence of array
+  typedef sequence<sarr3> ssarr3;  // sequence of sequnces of arrays of strings
+    
+ struct strRec{
+    boolean bb;
+    string str4;
+    long str7[3][2];
+    sequence<char> str5; 
+    string<12> str6;
+    str3 str8;
+    str2 str9;
+    str1 str10; 	
+  };
+
+
+  struct dyn {
+    long l;
+    sequence<long> sl;
+  };
+  typedef dyn arr2[1][2];
+
+
+  interface i {
+
+    const short TestConst = 3;	
+
+    //arr2 suck(in arr2 x, out arr2 y );
+
+    ///////////////////////////////// attribute long l;
+
+    // simple types
+    void void_test();
+    long long_test(in long a, out long a1);
+    long long longlong_test(in long long a, out long long a1);	
+    unsigned short ushort_test(in unsigned short a, out unsigned short a1);
+    unsigned long ulong_test(in unsigned long a, out unsigned long a1);
+    unsigned long long ulonglong_test(in unsigned long long a, out unsigned long long a1);
+    double double_test(in double a, out double a1);
+    char char_test(in char a, out char a1);
+    wchar wchar_test(in wchar a, out wchar a1);
+    octet octet_test(in octet a, out octet a1);
+    boolean bool_test(in boolean a, out boolean a1);
+
+    // Seq. and struct tests
+    b struct_test(in b a, out b a1);
+    es struct2_test(in es a, out es a1);
+    //simple struct3_test(in simple x, out simple y);	
+    bseq seq1_test(in bseq a, out bseq a1);
+    aseq seq2_test(in aseq a, out aseq a1);
+    lseq seq3_test(in lseq a, out lseq a1);
+    ssstr3 seq4_test(in ssstr3 a, out ssstr3 a1);
+    ssarr3 seq5_test(in ssarr3 a, out ssarr3 a1);
+
+    // Array tests
+    arr1 array1_test(in arr1 a, out arr1 a1);
+    dd array2_test(in dd a, out dd a1);
+
+    // enum test
+    fruit enum_test(in fruit a, out fruit a1);
+
+    // string tests
+    string string1_test(in string a, out string a1);
+    wstring wstring1_test(in wstring a, out wstring a1);
+    sseq string2_test(in sseq a, out sseq a1);
+    str string3_test(in str a, out str a1);
+    strRec string4_test(in strRec a, out strRec a1);
+
+    // Special erlang types
+    erlang::pid pid_test(in erlang::pid a, out erlang::pid a1);
+    erlang::port port_test(in erlang::port a, out erlang::port a1);
+    erlang::ref ref_test(in erlang::ref a, out erlang::ref a1);
+    erlang::term term_test(in erlang::term a, out erlang::term a1);
+    
+    // typedef test
+    long typedef_test(in apa a, in banan b, out apa a1, out banan b1);
+
+    // inlined seq. test
+    s inline_sequence_test(in s a, out s a1);
+
+    // term seq. test
+    etseq term_sequence_test(in etseq a, out etseq a1);
+    // term struct test
+    et term_struct_test(in et a, out et a1);
+   
+  };
+
+};
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_client.erl b/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_client.erl
new file mode 100644
index 0000000000..b5ee7af199
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_client.erl
@@ -0,0 +1,331 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2004-2009. 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(erl_client).
+
+-export([void_test/2, long_test/2, longlong_test/2, ushort_test/2,
+	 ulong_test/2, ulonglong_test/2, double_test/2, char_test/2,
+	 wchar_test/2, octet_test/2, bool_test/2, struct_test/2,
+	 struct2_test/2, seq1_test/2, seq2_test/2, seq3_test/2,
+	 seq4_test/2, seq5_test/2, array1_test/2, array2_test/2,
+	 enum_test/2, string1_test/2, wstring1_test/2, string2_test/2,
+	 string3_test/2, string4_test/2, pid_test/2, port_test/2,
+	 ref_test/2, term_test/2, typedef_test/2,
+	 inline_sequence_test/2, term_sequence_test/2,
+	 term_struct_test/2
+
+]).
+
+-include("m.hrl").
+-include("m_i.hrl").
+-include("oe_erl_c_test.hrl").
+
+%%b
+void_test(Node, Timeout) ->
+    Ret = m_i:void_test({olsson, Node}, Timeout),
+    Ret == void.				% XXX Not documented
+%%e
+
+%%b
+long_test(Node, Timeout) ->
+    In = max_long(),
+    {Ret, Out} = m_i:long_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+longlong_test(Node, Timeout) ->
+    In = 65537,
+    {Ret, Out} = m_i:longlong_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+ushort_test(Node, Timeout) ->
+    In = max_ushort(),
+    {Ret, Out} = m_i:ushort_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+ulong_test(Node, Timeout) ->
+    In = max_ulong(),
+    {Ret, Out} = m_i:ulong_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+ulonglong_test(Node, Timeout) ->
+    In = 65537,
+    {Ret, Out} = m_i:ulonglong_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+double_test(Node, Timeout) ->
+    In = 37768.93,
+    {Ret, Out} = m_i:double_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+char_test(Node, Timeout) ->
+    In = 80,
+    {Ret, Out} = m_i:char_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+wchar_test(Node, Timeout) ->
+    In = 4097,
+    {Ret, Out} = m_i:wchar_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+octet_test(Node, Timeout) ->
+    In = 255,
+    {Ret, Out} = m_i:octet_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+bool_test(Node, Timeout) ->
+    In = false,
+    {Ret, Out} = m_i:bool_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+struct_test(Node, Timeout) ->
+    In = #m_b{l = max_long(), c = $a},
+    {Ret, Out} = m_i:struct_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+struct2_test(Node, Timeout) ->
+    In = #m_es{ f = banana, l = max_long()},
+    {Ret, Out} = m_i:struct2_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+seq1_test(Node, Timeout) ->
+    B1 = #m_b{l = max_long(), c = $a},
+    B2 = #m_b{l = min_long(), c = $b},
+    In = [B1, B2],
+    {Ret, Out} = m_i:seq1_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+seq2_test(Node, Timeout) ->
+    B = #m_b{l = max_long(), c = $a},
+    A = #m_a{l = min_long(), y = [B, B], d = 4711.31},
+    In = [A, A, A],
+    {Ret, Out} = m_i:seq2_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+seq3_test(Node, Timeout) ->
+    In = [max_long(), min_long(), max_long()],
+    {Ret, Out} = m_i:seq3_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+seq4_test(Node, Timeout) ->
+    In = [["hej", "hopp"], ["ditt", "feta", "nylle"]],
+    {Ret, Out} = m_i:seq4_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+seq5_test(Node, Timeout) ->
+    Arr3 = mk_array(3, max_long()),
+    In = [[Arr3, Arr3], [Arr3, Arr3, Arr3]],
+    {Ret, Out} = m_i:seq5_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+array1_test(Node, Timeout) ->
+    In = mk_array(500, min_long()),
+    {Ret, Out} = m_i:array1_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+array2_test(Node, Timeout) ->
+    In = mk_array(2, mk_array(3, min_long())),
+    {Ret, Out} = m_i:array2_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+enum_test(Node, Timeout) ->
+    In = banana,
+    {Ret, Out} = m_i:enum_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+string1_test(Node, Timeout) ->
+    In = "Die Paula muss beim Tango immer weinen", 
+    {Ret, Out} = m_i:string1_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+wstring1_test(Node, Timeout) ->
+    In = [1047| "ie Paula muss beim Tango immer weinen"], 
+    {Ret, Out} = m_i:wstring1_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+string2_test(Node, Timeout) ->
+    In = ["Lass doch die Blumen,", "Konrad!"],
+    {Ret, Out} = m_i:string2_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+string3_test(Node, Timeout) ->
+    In = "Seeman, lass uns freuden!", 
+    {Ret, Out} = m_i:string3_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+string4_test(Node, Timeout) ->
+    
+    In = #m_strRec{
+      bb = true, 
+      str4 = "Paula war zu Hause in ihrem Stadtchen als die beste Tanzerin"
+      "bekannt",
+      str7 = mk_array(3, mk_array(2, max_long())),
+      str5 = [$a, $b, $c, $d, $e, $f],
+      str6 = "123456789012",
+      str8 = {$x, $y, $x},
+      str9 = "123456789012",
+      str10 = [$a, $b, $c, $d, $e, $f]
+      },
+    {Ret, Out} = m_i:string4_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+pid_test(Node, Timeout) ->
+    In = self(),
+    {Ret, Out} = m_i:pid_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+port_test(Node, Timeout) ->
+    In = get(port_test_port),
+    {Ret, Out} = m_i:port_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+ref_test(Node, Timeout) ->
+    In = make_ref(),
+    {Ret, Out} = m_i:ref_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+term_test(Node, Timeout) ->
+    In = {[a, b], 17, kalle},
+    {Ret, Out} = m_i:term_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+typedef_test(Node, Timeout) ->
+    In1 = {nisse, [1, 2], olsson},
+    In2 = get(port_test_port),
+    {Ret, Out1, Out2} = m_i:typedef_test({olsson, Node}, Timeout, In1, In2),
+    %% XXX Should check that Ret is an integer.
+    (Out1 == In1) and (Out2 == In2).
+%%e
+
+%%b
+inline_sequence_test(Node, Timeout) ->
+    In = #m_s{l = min_long(), sl = [max_long(), min_long()]}, 
+    {Ret, Out} = m_i:inline_sequence_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+term_sequence_test(Node, Timeout) ->
+    In = lists:duplicate(17, {nisse, [1, 2], {kalle, olsson}}),
+    {Ret, Out} = m_i:term_sequence_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+%%b
+term_struct_test(Node, Timeout) ->
+    In = #m_et{e = {nisse, ["abcde"], {kalle, olsson}}, l = 4711},
+    {Ret, Out} = m_i:term_struct_test({olsson, Node}, Timeout, In),
+    (Ret == In) and (Out == In).
+%%e
+
+
+%% Locals
+
+mk_array(Es) ->
+    list_to_tuple(Es).
+
+mk_array(N, E) ->
+    mk_array(lists:duplicate(N, E)). 
+
+%% max_short() ->
+%%     power_of_two(15) - 1.
+max_long() ->
+    power_of_two(31) - 1.
+max_longlong() ->
+    power_of_two(63) - 1.
+max_ushort() ->
+    power_of_two(16) - 1.
+max_ulong() ->
+    power_of_two(32) - 1.
+max_ulonglong() ->
+    power_of_two(64) - 1.
+
+%% min_short() ->
+%%     -power_of_two(15).
+min_long() ->
+    -power_of_two(31).
+%% min_longlong() ->
+%%     -power_of_two(63).
+%% min_ushort() ->
+%%     0.
+%% min_ulong() ->
+%%     0.
+%% min_ulonglong() ->
+%%     0.
+
+power_of_two(N) -> 
+    round(math:pow(2, N)).
+
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/my.c b/lib/ic/test/erl_client_c_server_proto_SUITE_data/my.c
new file mode 100644
index 0000000000..c0401b2621
--- /dev/null
+++ b/lib/ic/test/erl_client_c_server_proto_SUITE_data/my.c
@@ -0,0 +1,34 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2004-2009. 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%
+ *
+ */
+#include "ic.h"
+#include "m_i.h"
+
+int my_prepare_request_decoding(CORBA_Environment *env) 
+{
+    return oe_prepare_request_decoding(env);
+}
+
+int my_prepare_reply_encoding(CORBA_Environment *env)
+{
+    return oe_prepare_reply_encoding(env);
+}
+
+
+
diff --git a/lib/ic/test/ic.cover b/lib/ic/test/ic.cover
new file mode 100644
index 0000000000..5a679c8b6f
--- /dev/null
+++ b/lib/ic/test/ic.cover
@@ -0,0 +1,2 @@
+{incl_app,ic,details}.
+
diff --git a/lib/ic/test/ic.spec b/lib/ic/test/ic.spec
new file mode 100644
index 0000000000..22905dcee4
--- /dev/null
+++ b/lib/ic/test/ic.spec
@@ -0,0 +1 @@
+{suites,"../ic_test",all}.
diff --git a/lib/ic/test/ic.spec.vxworks b/lib/ic/test/ic.spec.vxworks
new file mode 100644
index 0000000000..b15260ab70
--- /dev/null
+++ b/lib/ic/test/ic.spec.vxworks
@@ -0,0 +1,2 @@
+{topcase, {dir, "../ic_test"}}.
+{skip,{ic_pp_SUITE,"Uses gcc"}}.
diff --git a/lib/ic/test/ic_SUITE.erl b/lib/ic/test/ic_SUITE.erl
new file mode 100644
index 0000000000..6a9d1325e1
--- /dev/null
+++ b/lib/ic/test/ic_SUITE.erl
@@ -0,0 +1,980 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1997-2010. 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%
+%%
+%%
+%%%----------------------------------------------------------------------
+%%% Purpose : Test suite for the IDL compiler
+%%%----------------------------------------------------------------------
+
+-module(ic_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+
+
+-include_lib("orber/src/orber_ifr.hrl").
+-include_lib("orber/src/ifr_objects.hrl").
+-include_lib("orber/include/ifr_types.hrl").
+
+
+%% The type cases
+-export([ type_norm/1]).
+
+%% The syntax case
+-export([]).
+-export([syntax1/1, syntax2/1, syntax3/1, syntax4/1, syntax5/1, syntax6/1]).
+
+%% The constant cases
+-export([]).
+-export([const_norm/1, const_bad_tk/1, const_bad_type/1]).
+-export([const_bad_comb/1]).
+
+%% The union cases
+-export([]).
+-export([union_norm/1, union_type/1, union_mult_err/1, union_case_mult/1]).
+-export([union_default/1]).
+
+%% The enum cases
+-export([]).
+-export([enum_norm/1]).
+
+%% The struct cases
+-export([]).
+-export([struct_norm/1]).
+
+%% The oneway cases
+-export([]).                                                  
+-export([oneway_norm/1, oneway_raises/1, oneway_out/1, oneway_void/1, oneway_followed/1]).
+
+%% The attributes cases
+-export([]).
+-export([attr_norm/1]).
+
+%% The raises registration case
+-export([raises_reg/1]).     
+
+
+%% The typeID case
+
+%% general stuff
+-export([]).
+-export([typeid/1, undef_id/1, dir/1, nasty_names/1, coss/1, mult_ids/1]).
+-export([forward/1, include/1, app_test/1]).
+
+%% inheritance stuff
+-export([ inherit_norm/1, inherit_warn/1, inherit_err/1]).
+
+%% Standard options to the ic compiler, NOTE unholy use of OutDir
+
+-define(OUT(X), filename:join([?config(priv_dir, Config), gen, to_list(X)])).
+
+
+%% Top of cases
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [app_test, {group, const}, {group, union},
+     {group, enum}, {group, attr}, {group, type},
+     {group, struct}, {group, general}, {group, inherit},
+     {group, oneway}, {group, syntax}, raises_reg].
+
+groups() -> 
+    [{const, [],
+      [const_norm, const_bad_tk, const_bad_type,
+       const_bad_comb]},
+     {union, [],
+      [union_norm, union_type, union_mult_err,
+       union_case_mult, union_default]},
+     {enum, [], [enum_norm]}, {struct, [], [struct_norm]},
+     {general, [],
+      [typeid, undef_id, mult_ids, forward, include,
+       nasty_names]},
+     {inherit, [],
+      [inherit_norm, inherit_warn, inherit_err]},
+     {oneway, [],
+      [oneway_norm, oneway_out, oneway_raises, oneway_void,
+       oneway_followed]},
+     {attr, [], [attr_norm]}, {type, [], [type_norm]},
+     {syntax, [],
+      [syntax1, syntax2, syntax3, syntax4, syntax5, syntax6]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+
+app_test(doc) -> [];
+app_test(suite) -> [];
+app_test(_Config) ->
+    ok=test_server:app_test(ic),
+    ok.
+
+%%---------------------------------------------------------------------
+%%
+%% Test of constant expressions.
+%%
+
+
+
+const_norm(doc) ->
+    ["Checks normal constant types and values"];
+const_norm(suite) -> [];
+const_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(const_norm),
+    File = filename:join(DataDir, c_norm),
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, const_norm_files()),
+    ok.
+
+const_bad_tk(doc) ->
+    ["Checks when the constant value doesn't match the declared type"];
+const_bad_tk(suite) -> [];
+const_bad_tk(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, c_err1),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(18, bad_tk_match, R),
+    ok.    
+
+const_bad_type(doc) ->
+    ["Checks operands of ops are of correct type"];
+const_bad_type(suite) -> [];
+const_bad_type(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, c_err2),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(4, bad_type, R),
+    ok.    
+
+const_bad_comb(doc) ->
+    ["Checks operands of ops are of conflicting types"];
+const_bad_comb(suite) -> [];
+const_bad_comb(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, c_err3),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(3, bad_type_combination, R),
+    ok.    
+
+
+
+
+
+union_norm(doc) ->
+    ["Checks that normal union declarations works."];
+union_norm(suite) -> [];
+union_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(union_norm),
+    File = filename:join(DataDir, u_norm),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, union_norm_files()),
+    ok.
+
+
+%% Checks OTP-2007
+union_default(doc) ->
+    ["Checks that default cases are correct in type code."];
+union_default(suite) -> [];
+union_default(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(union_default),
+    File = filename:join(DataDir, u_default),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, union_default_files(), [load]),
+    TkList = i1:oe_get_interface(),
+    check_label("op0", 0, TkList),
+    check_label("op1", 1, TkList),
+    check_label("op2", 2, TkList),
+    check_label("op3", -1, TkList),
+    ok.
+
+check_label(Id, N, List) ->
+    case lists:keysearch(Id, 1, List) of
+	{value, {_, {{_, _, _, _, D, L}, _, _}}} ->
+	    if  D /= N ->
+		    test_server:fail({bad_default_num, D, N});
+		D /= -1 ->
+		    case lists:nth(D+1, L) of
+			T when element(1, T) == default ->
+			    ok;
+			_Que ->
+			    test_server:fail({bad_default_list, D, L})
+		    end;
+		true ->
+		    %% D = N = -1, just check that there is no default label
+		    case lists:keysearch(default, 1, L) of
+			false ->
+			    ok;
+			_ ->
+			    test_server:fail({bad_default_label, D, L})
+		    end
+	    end;
+	_ ->
+	    test_server:fail({'no_such_op!', Id, List})
+    end.
+
+union_type(doc) ->
+    ["Checks that errors are detected. Check that mismatch between case ",
+     "value and declared discriminator type is detected."];
+union_type(suite) -> [];
+union_type(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, u_type),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(28, bad_case_type, R),
+    ok.    
+
+
+union_mult_err(doc) ->
+    ["Check that multiple declared declarators are caught.",
+     "Also check that if the discriminator is an enum, then the enum name",
+     "must not be used as a declarator in the union switch (declarator",
+     "as opposed to label)."];
+union_mult_err(suite) -> [];
+union_mult_err(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, u_mult),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(8, multiply_defined, R),
+    ok.    
+
+%% Checking mult cases. Now check that other errors are found in the
+%% correct order XXXX
+
+
+union_case_mult(doc) ->
+    ["Check that multiply defined case labels are found and reported."];
+union_case_mult(suite) -> [];
+union_case_mult(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, u_case_mult),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(7, multiple_cases, R),
+    ok.    
+
+
+%%--------------------------------------------------------------------
+%%
+%% Enum cases
+%%
+
+
+enum_norm(doc) ->
+    ["Checks that normal enum declarations works."];
+enum_norm(suite) -> [];
+enum_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(enum_norm),
+    File = filename:join(DataDir, enum),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, enum_norm_files()),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%%
+%% Struct cases
+%%
+
+
+struct_norm(doc) ->
+    ["Checks that normal struct declarations works."];
+struct_norm(suite) -> [];
+struct_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(struct_norm),
+    File = filename:join(DataDir, struct),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, struct_norm_files()),
+    Mod = ridiculous_name_to_avoid_clash_svenne,
+    TestFile = filename:join(OutDir, Mod),
+    ?line ok = gen_struct_file(TestFile, Mod),
+    ?line ok = compile(OutDir, [Mod], [load]),
+%%    ?line {ok, Mod, []} = compile:file(TestFile, 
+%%				       [{i, OutDir}, {outdir, OutDir},
+%%					return, load]),
+    ?line ok = Mod:test(),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%%
+%% General cases
+%%
+
+%% coss (add sometimes, takes 440 seconds!)
+
+typeid(doc) ->
+    ["Check that type id's are generated correctly"];
+typeid(suite) -> [];
+typeid(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(typeid),
+    File = filename:join(DataDir, typeid),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, typeid_files(), [load]),
+    ?line "IDL:I1:1.0" = 'I1':'typeID'(),
+    ?line "IDL:M1/I1:1.0" = 'M1_I1':'typeID'(),
+    ?line "IDL:M2/M1/I1:1.0" = 'M2_M1_I1':'typeID'(),
+    ?line "IDL:M3/M2/M1/I1:1.0" = 'M3_M2_M1_I1':'typeID'(),
+    ok.
+
+
+%%% This test case is removed because there's no way to test this from
+%%% an automated test suite.
+dir(doc) ->
+    ["Check that relative directories work, absolute is used in",
+     "all other cases in the suite."];
+%%% xxxxxx
+dir(suite) -> [];
+dir(Config) when is_list(Config) ->
+ok;
+dir(Config) ->
+    DataDir = ?config(data_dir, Config),
+
+    %% Needs a unique directory (any better way?)
+    OutDir = mk_unique("oe_the_dir"),
+    
+    %% More unique names
+    File = filename:join(DataDir, mk_unique("oe_the_file")),
+    Const = mk_unique("oe_the_constant"),
+    Mod  = list_to_atom(File),
+    Func = list_to_atom(Const),
+    
+    %% Generate a unique IDL file with a single constant
+    gen_file(File, Const),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line ok = compile(OutDir, [load]),
+    ?line 19955 = Mod:Func(),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, [load]),
+    ?line 19955 = Mod:Func(),
+
+    ?line ok = ic:gen(File),
+%%%    ?line ok = compile(".", [load]),
+    ok.
+
+undef_id(doc) ->
+    ["Check that various undefied id's are detected correctly"];
+undef_id(suite) -> [];
+undef_id(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, undef_id),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(16, tk_not_found, R),
+    ok.
+
+mult_ids(doc) ->
+    ["Check that multiply defined ids are caught."];
+mult_ids(suite) -> [];
+mult_ids(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, mult_ids),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(22, multiply_defined, R),
+    ok.
+
+
+nasty_names(doc) ->
+    ["Check that various nasty names can be generated.",
+     "Try to provoke name clashes and name conflicts with",
+     "Erlang and IDL"];
+nasty_names(suite) -> [];
+nasty_names(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(nasty_names),
+    File = filename:join(DataDir, nasty),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, nasty_names_files(), [load]),
+    ok.
+
+coss(doc) ->
+    ["Check that the Coss standard specification works."];
+coss(suite) -> [];
+coss(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(coss),
+    File = filename:join(DataDir, 'Coss'),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, [_W1]} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, []),
+    ok.
+
+forward(doc) ->
+    ["Check that forward declaratios work."];
+forward(suite) -> [];
+forward(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(forward),
+    File = filename:join(DataDir, forward),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, forward_files(), [load]),
+    ok.
+
+include(doc) ->
+    ["Check that various undefied id's are detected correctly"];
+include(suite) -> [];
+include(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, include),
+    ?line error = ic:gen(File,  stdopts(OutDir)++[{preproc_flags,"-I" ++ DataDir}]),
+    ?line {error, [], R} = 
+	ic:gen(File, stdopts(OutDir)++[{preproc_flags,"-I" ++ DataDir},silent2]),
+    case lists:map(fun(D) ->
+			   filename:rootname(filename:basename(element(3, D)))
+		   end,
+		   lists:sort(R)) of
+	["include",
+	 "include2",
+	 "include2",
+	 "include3"] ->
+	    ok;
+	RRR ->
+	    test_server:fail({bad_include_file, RRR})
+    end,
+    ok.
+
+
+
+
+%%--------------------------------------------------------------------
+%%
+%% Inhertit cases
+%%
+
+
+inherit_norm(doc) ->
+    ["Checks that normal inheritance works."];
+inherit_norm(suite) -> [];
+inherit_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(inherit_norm),
+    File = filename:join(DataDir, inherit),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, _Ws} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, inherit_norm_files(), [load]),
+    
+    %% Now check constant values:
+    ?line 9 = m1_I1:c1(),
+
+    ?line 9 = m1_I2:c1(),
+    ?line 14 = m1_I2:c2(),
+    ?line 27 = m1_I2:c3(),
+
+    ?line 50 = m1_I3:c1(),
+    ?line 14 = m1_I3:c2(),
+    ?line 27 = m1_I3:c3(),
+    ?line 91 = m1_I3:c4(),
+    ?line 100 = m1_I3:c5(),
+    ok.
+
+inherit_warn(doc) ->
+    ["Check that various inheritance shadowing is detected"];
+inherit_warn(suite) -> [];
+inherit_warn(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, inherit_warn),
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(7, inherit_name_shadow, R),
+    ok.
+
+inherit_err(doc) ->
+    ["Check that various inheritance errors is detected"];
+inherit_err(suite) -> [];
+inherit_err(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, inherit_err),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, _Ws, R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(21, inherit_name_collision, R),
+    ok.
+
+
+
+oneway_norm(doc) ->
+    ["Checks that normal oneway operations works."];
+oneway_norm(suite) -> [];
+oneway_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(oneway_norm),
+    File = filename:join(DataDir, one),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line ok = compile(OutDir, oneway_norm_files(), [load]),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, oneway_norm_files(), [load]),
+    ok.
+
+oneway_void(doc) ->
+    ["Check that non-void oneways are detected."];
+oneway_void(suite) -> [];
+oneway_void(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, one_void),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(2, bad_oneway_type, R),
+    ok.
+
+oneway_raises(doc) ->
+    ["Check that oneways cannot raise exceptions."];
+oneway_raises(suite) -> [];
+oneway_raises(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, one_raises),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(3, oneway_raises, R),
+    ok.
+
+oneway_out(doc) ->
+    ["Check that illegal out parameters are detected"];
+oneway_out(suite) -> [];
+oneway_out(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, one_out),
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(2, oneway_outparams, R),
+    ok.
+
+oneway_followed(doc) ->
+    ["Checks that normal oneways, followed by other operations."];
+oneway_followed(suite) -> [];
+oneway_followed(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(oneway_followed),
+    File = filename:join(DataDir, one_followed),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line ok = compile(OutDir, oneway_followed_files(), [load]),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, oneway_followed_files(), [load]),
+    ok.
+
+
+attr_norm(doc) ->
+    ["Checks that normal attr operations works."];
+attr_norm(suite) -> [];
+attr_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(attr_norm),
+    File = filename:join(DataDir, attr),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line ok = compile(OutDir, attr_norm_files(), [load]),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, attr_norm_files(), [load]),
+    ok.
+
+
+type_norm(doc) ->
+    ["Checks all types are handled."];
+type_norm(suite) -> [];
+type_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(type_norm),
+    File = filename:join(DataDir, type),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line ok = compile(OutDir, type_norm_files(), [load]),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, type_norm_files(), [load]),
+    ok.
+
+
+
+syntax1(suite) -> [];
+syntax1(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, syntax1),
+
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(1, parse_error, R),
+    ok.
+
+syntax2(suite) -> [];
+syntax2(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, syntax2),
+
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(1, parse_error, R),
+    ok.
+
+syntax3(suite) -> [];
+syntax3(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, syntax3),
+
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(1, parse_error, R),
+    ok.
+
+syntax4(suite) -> [];
+syntax4(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, syntax4),
+
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(1, parse_error, R),
+    ok.
+
+syntax5(suite) -> [];
+syntax5(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, syntax5),
+
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(1, parse_error, R),
+    ok.
+
+syntax6(suite) -> [];
+syntax6(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, syntax6),
+    
+    ?line error = ic:gen(File, stdopts(OutDir)),
+    ?line {error, [], R} =
+	ic:gen(File, stdopts(OutDir)++[silent2]),
+    check_errors(1, parse_error, R),
+    ok.
+
+
+
+%%--------------------------------------------------------------------
+%%
+%%  Checks RAISES to be registered under IFR operation registration
+%% ( OTP-2102 )
+%%
+
+raises_reg(doc) ->
+    ["Check that exceptions are really registered to operations."];
+raises_reg(suite) -> [];
+raises_reg(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(raises_reg_check),
+    File = filename:join(DataDir, raises_reg),
+    
+    ?line ok = ic:gen(File, stdopts(OutDir)),
+    ?line {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
+    ?line ok = compile(OutDir, raises_reg_files(), [load]),
+
+    set_up('oe_raises_reg'),
+
+    io:format("~n##### Starting the test case #####~n"), 
+    io:format("Checking for existance of exception : ~s~n",["IDL:Raises_RegModule/Exception_1:1.0"]),
+    raises_register_check("IDL:Raises_RegModule/R_R/op:1.0","IDL:Raises_RegModule/Exception_1:1.0"),
+
+    io:format("Checking for existance of exception : ~s~n",["IDL:Raises_RegModule/Exception_2:1.0"]),
+    raises_register_check("IDL:Raises_RegModule/R_R/op:1.0","IDL:Raises_RegModule/Exception_2:1.0"),
+
+    io:format("Checking for existance of exception : ~s~n",["IDL:Raises_RegModule/XXXXXXXX:1.0"]),
+    raises_register_check("IDL:Raises_RegModule/R_R/op:1.0","IDL:RaisesModule/XXXXXXXX:1.0"),
+
+    set_down('oe_raises_reg'),
+
+    ok.
+
+set_up(Register) ->
+    io:format("Setting up.....~n"),
+    mnesia:stop(),
+    mnesia:delete_schema([node()]),
+    mnesia:create_schema([node()]),
+    mnesia:start(),
+    orber:install([node()]),
+    orber:start(),
+    io:format("Running OE_register()~n"),
+    Register:'oe_register'().
+
+set_down(Register) ->
+    io:format("Running OE_unregister()~n"),
+    Register:'oe_unregister'(),
+    io:format("Setting down.....~n"),
+    orber:stop(),
+    orber:uninstall(),
+    mnesia:stop(),
+    mnesia:delete_schema([node()]).
+
+
+raises_register_check(OpId,ExcId) ->
+    case is_valid_exc(OpId,ExcId) of
+	true ->
+	    ok;     %   Because right exception where found, 
+                    %   the test succeeds for normal cases.
+  	false ->
+	    ok;     %   Because the exception tested, is not 
+                    %   registered for that operation.
+        FailReason ->
+	    test_server:fail({FailReason, OpId, ExcId})
+		    % Because the test descovered errors in a previous 
+                    % stage, or no exceptions where registered att all. 
+                    % ( This testcase assumes that operations to be 
+                    %   checked allways raise excption(s) )
+    end.
+    
+is_valid_exc(OpId,ExcId) ->
+    OE_IFR = orber_ifr:find_repository(),
+    OpDef = orber_ifr:'Repository_lookup_id'(OE_IFR,OpId),
+    ExcDefList = orber_ifr:get_exceptions(OpDef),
+    case ExcDefList of
+	[] ->
+	    no_exceptions_registered;
+	_ ->
+	    ExcDef=orber_ifr:lookup_id(OE_IFR,ExcId),  
+	    lists:member(ExcDef,ExcDefList)
+    end.
+
+%%--------------------------------------------------------------------
+%%
+%% Utilities
+
+
+stdopts(OutDir) ->
+    [{outdir, OutDir},{maxerrs, infinity}].
+
+mk_unique(Prefix) ->
+    {A,B,C} = now(),
+    Prefix++"_"++integer_to_list(A)++"_"++integer_to_list(B)++"_"++
+	integer_to_list(C).
+
+gen_file(File, Const) ->
+    {ok, Fd} = file:open(File++".idl", [write]),
+    io:format(Fd, "interface ~s {~n", [File]),
+    io:format(Fd, "    const long ~s = 19955;~n", [Const]),
+    io:format(Fd, "};~n", []),
+    file:close(Fd).
+
+
+%% Compile all files in Dir. Used for checking that valid Erlang has
+%% been generated.
+%%compile(Dir) ->
+%%    compile(Dir, []).
+%%compile(Dir, Opts) ->
+%%    {ok, Cwd} = file:get_cwd(),
+%%    catch do_compile(Dir, Opts),
+%%    file:set_cwd(Cwd).
+
+%%do_compile(Dir, Opts) ->
+%%    ok = file:set_cwd(Dir),
+%%    up_to_date = ts_make_erl:all(Opts),
+%%    ok.
+
+compile(Dir, Files) ->
+    compile(Dir, Files, []).
+
+compile(Dir, Files, Opts) ->
+    {ok, Cwd} = file:get_cwd(),
+    file:set_cwd(Dir),
+    io:format("Changing to ~p~n", [Dir]),
+    case catch do_compile(Files, Opts) of
+	ok ->
+	    file:set_cwd(Cwd);
+	Err ->
+	    file:set_cwd(Cwd),
+	    test_server:fail(Err)
+    end.
+
+do_compile([], _Opts) -> ok;
+do_compile([F | Fs], Opts) ->
+    io:format("Compiling ~p", [F]),
+    case compile:file(F, Opts) of
+	ok ->
+	    io:format(" ok~n", []),
+	    do_load(F, Opts),
+	    do_compile(Fs, Opts);
+	{ok, _} ->
+	    io:format(" ok~n", []),
+	    do_load(F, Opts),
+	    do_compile(Fs, Opts);
+	{ok, _, _} ->
+	    io:format(" ok~n", []),
+	    do_load(F, Opts),
+	    do_compile(Fs, Opts);
+	Err -> 
+	    io:format(" error: ~p~n", [Err]),
+	    Err
+    end.
+
+do_load(File, Opts) ->
+    case lists:member(load, Opts) of
+	true ->
+	    io:format("Loading file ~p", [File]),
+	    code:purge(File),
+	    R = code:load_abs(File),
+	    io:format("Loaded: ~p", [R]);
+	false ->
+	    ok
+    end.
+
+
+%% Check that ErrList consists of exactly Num errors of type ErrType
+check_errors(Num, ErrType, ErrList) ->
+    Num = length(ErrList),
+    lists:foreach(fun(T) ->
+			  case catch element(1, element(4, T)) of
+			      ErrType -> ok;
+			      Else -> 
+				  test_server:fail({bad, ErrType, Else})
+			  end end, ErrList).
+
+to_list(X) when is_atom(X) -> atom_to_list(X);
+to_list(X) -> X.
+
+
+%% File must be an atom
+gen_struct_file(File, Mod) ->
+    
+    ?line {ok, Fd} = file:open(to_list(File)++".erl", [write]),
+    io:format(Fd, "~n", []),
+    io:format(Fd, "-module(~p).~n", [Mod]),
+    io:format(Fd, "-export([test/0]).~n", []),
+    io:format(Fd, "-include(\"oe_struct.hrl\").~n", []),
+    io:format(Fd, "test() ->~n", []),
+    io:format(Fd, "    A = #'S1'{a=99, b=$a, s=\"123456789\"},~n", []),
+    io:format(Fd, "    B = #'S2'{a=9, b=#'S2_S3'{a=1, b=9, b1=5, c=$2},~n", []),
+    io:format(Fd, "	      c=[#'S1'{a=1}, #'S1'{a=2}],~n", []),
+    io:format(Fd, 
+"	      c2=[#'S1'{a=2}, #'S1'{a=3}, #'S1'{a=2}, #'S1'{a=3}]},~n", []),
+    io:format(Fd, "    C = #'S2_S3'{a=11, b=999, b1=19},~n", []),
+    io:format(Fd, "    D = #s4{a=7},~n", []),
+    io:format(Fd, "    E = {1, #'U1_S5'{a=3}},~n", []),
+    io:format(Fd, "    F = {2, {$b, #'U1_U2_s6'{a=6, b=false}}},~n", []),
+    io:format(Fd, "    ok.~n", []),
+    file:close(Fd).
+
+
+union_norm_files() -> ['oe_u_norm'].
+union_default_files() -> ['oe_u_default', i1].
+
+typeid_files() -> ['oe_typeid', 'M3_M2_M1_I1', 'M2_M1_I1', 'M1_I1', 'I1'].
+
+struct_norm_files() -> ['oe_struct'].
+oneway_norm_files() -> ['oe_one', 'I1'].
+oneway_followed_files() -> ['oe_one_followed', 'I1'].
+nasty_names_files() -> ['oe_nasty', 'I2', 'I1'].
+
+inherit_norm_files() -> [m1_I3, m1_I2, m1_I1, 'oe_inherit', 'I4', 'I3',
+			  'I2', 'I1'].
+
+forward_files() -> [i1, 'oe_forward'].
+enum_norm_files() -> ['oe_enum'].
+const_norm_files() -> ['oe_c_norm'].
+attr_norm_files() -> ['oe_attr', 'I1', 'I2'].
+type_norm_files() -> ['oe_type'].
+
+raises_reg_files() -> ['oe_raises_reg'].
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/ic/test/ic_SUITE_data/Corba.idl b/lib/ic/test/ic_SUITE_data/Corba.idl
new file mode 100644
index 0000000000..6b81132500
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/Corba.idl
@@ -0,0 +1,1013 @@
+// This file contains OMG IDL from  CORBA V2.0, July 1995. 
+// Includes IDL for CORBA Core
+// (Interface Repository, ORB Interface, Basic Object Adapter Interface)
+// and CORBA Interoperability (IOP, GIOP, IIOP, and DCE CIOP modules)
+
+// Complete OMG IDL for Interface Repository starts on pg 6-42, CORBA V2.0 July 1995
+// IRObject interface described on pg 6-9 CORBA V2.0, July 1995
+// Contained interface: pg 6-11 CORBA V2, 7-95
+// Container interface: pg 6-12 thru 6-15 CORBA V2, 7-95
+// IDLType interface: pg 6-15 CORBA V2, 7-95
+// Repository interface: pg 6-16 CORBA V2, 7-95
+// ModuleDef interface: pg 6-17 CORBA V2, 7-95
+// ConstantDef interface: pg 6-18 CORBA V2, 7-95
+// TypeDef interface: pg 6-19 CORBA V2, 7-95
+// StructDef interface: pg 6-19 CORBA V2, 7-95
+// UnionDef interface: pg 6-19 CORBA V2, 7-95
+// EnumDef interface: pg 6-20 CORBA V2, 7-95
+// AliasDef interface: pg 6-21 CORBA V2, 7-95
+// PrimitiveDef interface: pg 6-21 CORBA V2, 7-95
+// StringDef interface: pg 6-22 CORBA V2, 7-95
+// SequenceDef interface: pg 6-22 CORBA V2, 7-95
+// ArrayDef interface: pg 6-23 CORBA V2, 7-95
+// ExceptionDef interface: pg 6-24 CORBA V2, 7-95
+// AttributeDef interface: pg 6-25 CORBA V2, 7-95
+// OperationDef interface: pg 6-26 CORBA V2, 7-95
+// InterfaceDef interface: pg 6-28 CORBA V2, 7-95
+// TypeCode interface (PIDL): pg 6-34 CORBA V2, 7-95
+// ORB interface: pg 6-40 CORBA V2, 7-95 
+
+#ifndef __CORBA_IDL
+#define __CORBA_IDL
+
+// #pragma prefix "omg.org"
+module CORBA {
+
+  interface TypeCode;
+  typedef string Identifier;
+  typedef string ScopedName;
+  typedef string RepositoryId;
+
+  /*
+   * start of section added by Christian Blum
+   */
+
+  typedef enum  new_type {NO,USER,SYSTEM_EXCEPTION} exception_type;
+
+  /** 
+   * no definition for this type 
+   */ 
+  interface ImplementationDef
+    { 
+    };
+
+  /** 
+   * no definition for this type 
+   */ 
+  //interface Principal	
+  struct Principal	
+  { 
+    string str;
+  };     
+
+  /** 
+   * no definition for this type 
+   */ 
+  interface Environment
+    { 
+
+    };
+
+  typedef unsigned long Flags;
+  typedef unsigned long Status;
+
+  struct NamedValue  // PIDL
+  {
+    Identifier name; // argument name
+    any argument;    // argument
+    long len;        // length/count of argument value
+    Flags arg_modes; // argument mode flags
+
+  };
+
+  typedef sequence<NamedValue> NVList; /* C */
+
+  interface Request  // PIDL
+    { 
+
+      Status add_arg ( 
+		      in Identifier name,   // argument name
+		      in TypeCode arg_type, // argument datatype
+		      //  in void *  value,     // argument value to be added
+		      in any  value_LOOK_AT_SOURCE,        // changed by blum
+		      in long len,          // length/count of argument value
+		      in Flags arg_flags    // argument flags
+		      );
+
+      Status invoke ( 
+		     in Flags invoke_flags // invocation flags
+		     );
+
+      Status delete ();
+      Status send (
+		   in Flags invoke_flags // invocation flags 
+		   );
+
+      Status get_response ( 
+			   in Flags response_flags // response flags
+			   );
+
+    };
+
+
+  interface Context // PIDL
+    { 
+
+      Status set_one_value (
+			    in Identifier prop_name, // property name to add
+			    in string value // property value to add
+			    );
+
+      Status set_values (
+			 in NVList values // property values to be changed
+			 );
+
+      Status get_values (
+			 in Identifier start_scope, // search scope
+			 in Flags op_flags, // operation flags
+			 in Identifier prop_name, // name of property(s) to retrieve
+			 out NVList values // requested property(s)
+			 );
+
+      Status delete_values (
+			    in Identifier prop_name // name of property(s) to delete
+			    );
+
+      Status create_child (
+			   in Identifier ctx_name, // name of context object
+			   out Context child_ctx // newly created context object
+			   );
+
+      Status delete (
+		     in Flags del_flags // flags controlling deletion
+		     );
+
+    };
+
+  /*
+   * end of section added by Christian Blum
+   */
+
+
+  enum DefinitionKind {
+    dk_none, dk_all,
+    dk_Attribute, dk_Constant, dk_Exception, dk_Interface,
+    dk_Module, dk_Operation, dk_Typedef,
+    dk_Alias, dk_Struct, dk_Union, dk_Enum,
+    dk_Primitive, dk_String, dk_Sequence, dk_Array,
+    dk_Repository
+  };
+
+
+  interface IRObject {
+    // read interface
+    readonly attribute DefinitionKind def_kind;
+
+    // write interface
+    void destroy ();
+  };
+
+
+
+  typedef string VersionSpec;
+
+  interface Contained;
+  interface Repository;
+  interface Container;
+
+  interface Contained : IRObject {
+    // read/write interface
+
+    attribute RepositoryId id;
+    attribute Identifier name;
+    attribute VersionSpec version;
+
+    // read interface
+
+    readonly attribute Container defined_in;
+    readonly attribute ScopedName absolute_name;
+    readonly attribute Repository containing_repository;
+
+    struct Description {
+      DefinitionKind kind;
+      any value; 
+    }; 
+
+    Description describe ();
+
+    // write interface
+
+    void move (
+	       in Container new_container,
+	       in Identifier new_name,
+	       in VersionSpec new_version
+	       );
+  };
+
+
+  interface ModuleDef;
+  interface ConstantDef;
+  interface IDLType;
+  interface StructDef;
+  interface UnionDef;
+  interface EnumDef;
+  interface AliasDef;
+  interface InterfaceDef;
+  typedef sequence <InterfaceDef> InterfaceDefSeq;
+
+  typedef sequence <Contained> ContainedSeq;
+
+  struct StructMember {
+    Identifier name;
+    TypeCode type;
+    IDLType type_def;
+  };
+  typedef sequence <StructMember> StructMemberSeq;
+
+  struct UnionMember {
+    Identifier name;
+    any label;
+    TypeCode type;
+    IDLType type_def;
+  };
+  typedef sequence <UnionMember> UnionMemberSeq;
+
+  typedef sequence <Identifier> EnumMemberSeq;
+
+  interface Container : IRObject {
+    // read interface
+
+    Contained lookup ( in ScopedName search_name);
+
+    ContainedSeq contents (
+			   in DefinitionKind limit_type,
+			   in boolean exclude_inherited
+			   );
+
+    ContainedSeq lookup_name (
+			      in Identifier search_name, 
+			      in long levels_to_search, 
+			      in DefinitionKind limit_type,
+			      in boolean exclude_inherited
+			      );
+
+    struct Description {
+      Contained contained_object; 
+      DefinitionKind kind;
+      any value; 
+    };
+
+    typedef sequence<Description> DescriptionSeq;
+
+    DescriptionSeq describe_contents (
+				      in DefinitionKind limit_type,
+				      in boolean exclude_inherited,
+				      in long max_returned_objs
+				      );
+
+    // write interface
+ 
+    ModuleDef create_module (
+			     in RepositoryId id,
+			     in Identifier name,
+			     in VersionSpec version
+			     );
+ 
+    ConstantDef create_constant (
+				 in RepositoryId id,
+				 in Identifier name,
+				 in VersionSpec version,
+				 in IDLType type,
+				 in any value
+				 );
+ 
+    StructDef create_struct (
+			     in RepositoryId id,
+			     in Identifier name,
+			     in VersionSpec version,
+			     in StructMemberSeq members
+			     );
+ 
+    UnionDef create_union (
+			   in RepositoryId id,
+			   in Identifier name,
+			   in VersionSpec version,
+			   in IDLType discriminator_type,
+			   in UnionMemberSeq members
+			   );
+ 
+    EnumDef create_enum (
+			 in RepositoryId id,
+			 in Identifier name,
+			 in VersionSpec version,
+			 in EnumMemberSeq members
+			 );
+ 
+    AliasDef create_alias (
+			   in RepositoryId id,
+			   in Identifier name,
+			   in VersionSpec version,
+			   in IDLType original_type
+			   );
+ 
+    InterfaceDef create_interface (
+				   in RepositoryId id,
+				   in Identifier name,
+				   in VersionSpec version,
+				   in InterfaceDefSeq base_interfaces
+				   );
+  };
+
+
+
+  interface IDLType : IRObject {
+    readonly attribute TypeCode type;
+  };
+
+
+
+  interface PrimitiveDef;
+  interface StringDef;
+  interface SequenceDef;
+  interface ArrayDef;
+
+  enum PrimitiveKind {
+    pk_null, pk_void, pk_short, pk_long, pk_ushort, pk_ulong,
+    pk_float, pk_double, pk_boolean, pk_char, pk_octet,
+    pk_any, pk_TypeCode, pk_Principal, pk_string, pk_objref
+  };
+
+  interface Repository : Container {
+    // read interface
+
+    Contained lookup_id (in RepositoryId search_id);
+
+    PrimitiveDef get_primitive (in PrimitiveKind kind);
+
+    // write interface
+
+    StringDef create_string (in unsigned long bound);
+
+    SequenceDef create_sequence (
+				 in unsigned long bound,
+				 in IDLType element_type
+				 );
+
+    ArrayDef create_array (
+			   in unsigned long length,
+			   in IDLType element_type
+			   );
+  };
+
+
+  interface ModuleDef : Container, Contained {
+  };
+
+  struct ModuleDescription {
+    Identifier name; 
+    RepositoryId id; 
+    RepositoryId defined_in;
+    VersionSpec version;
+  };
+
+
+  interface ConstantDef : Contained {
+    readonly attribute TypeCode type;
+    attribute IDLType type_def;
+    attribute any value;
+  };
+
+  struct ConstantDescription {
+    Identifier name; 
+    RepositoryId id; 
+    RepositoryId defined_in; 
+    VersionSpec version;
+    TypeCode type; 
+    any value; 
+  };
+
+
+  interface TypedefDef : Contained, IDLType {
+  };
+
+  struct TypeDescription {
+    Identifier name; 
+    RepositoryId id; 
+    RepositoryId defined_in; 
+    VersionSpec version;
+    TypeCode type; 
+  };
+
+
+  interface StructDef : TypedefDef {
+    attribute StructMemberSeq members;
+  };
+
+
+  interface UnionDef : TypedefDef {
+    readonly attribute TypeCode discriminator_type;
+    attribute IDLType discriminator_type_def;
+    attribute UnionMemberSeq members;
+  };
+
+
+  interface EnumDef : TypedefDef {
+    attribute EnumMemberSeq members;
+  };
+
+
+  interface AliasDef : TypedefDef {
+    attribute IDLType original_type_def;
+  };
+
+
+  interface PrimitiveDef: IDLType {
+    readonly attribute PrimitiveKind kind;
+  };
+
+
+  interface StringDef : IDLType {
+    attribute unsigned long bound;
+  };
+
+
+  interface SequenceDef : IDLType {
+    attribute unsigned long bound;
+    readonly attribute TypeCode element_type;
+    attribute IDLType element_type_def;
+  };
+
+  interface ArrayDef : IDLType {
+    attribute unsigned long length;
+    readonly attribute TypeCode element_type;
+    attribute IDLType element_type_def;
+  };
+
+
+  interface ExceptionDef : Contained {
+    readonly attribute TypeCode type;
+    attribute StructMemberSeq members;
+  };
+  struct ExceptionDescription {
+    Identifier name; 
+    RepositoryId id; 
+    RepositoryId defined_in; 
+    VersionSpec version;
+    TypeCode type; 
+  };
+
+
+
+  enum AttributeMode {ATTR_NORMAL, ATTR_READONLY};
+
+  interface AttributeDef : Contained {
+    readonly attribute TypeCode type;
+    attribute IDLType type_def;
+    attribute AttributeMode mode;
+  };
+
+  struct AttributeDescription {
+    Identifier name; 
+    RepositoryId id; 
+    RepositoryId defined_in; 
+    VersionSpec version;
+    TypeCode type;
+    AttributeMode mode; 
+  };
+
+
+
+  enum OperationMode {OP_NORMAL, OP_ONEWAY};
+
+  enum ParameterMode {PARAM_IN, PARAM_OUT, PARAM_INOUT};
+  struct ParameterDescription {
+    Identifier name; 
+    TypeCode type; 
+    IDLType type_def;
+    ParameterMode mode;
+  };
+  typedef sequence <ParameterDescription> ParDescriptionSeq;
+
+  typedef Identifier ContextIdentifier;
+  typedef sequence <ContextIdentifier> ContextIdSeq;
+
+  typedef sequence <ExceptionDef> ExceptionDefSeq;
+  typedef sequence <ExceptionDescription> ExcDescriptionSeq;
+
+  interface OperationDef : Contained { 
+    readonly attribute TypeCode result;
+    attribute IDLType result_def;
+    attribute ParDescriptionSeq params;
+    attribute OperationMode mode; 
+    attribute ContextIdSeq contexts;
+    attribute ExceptionDefSeq exceptions;
+  };
+
+  struct OperationDescription {
+    Identifier name; 
+    RepositoryId id; 
+    RepositoryId defined_in; 
+    VersionSpec version;
+    TypeCode result; 
+    OperationMode mode; 
+    ContextIdSeq contexts; 
+    ParDescriptionSeq parameters;
+    ExcDescriptionSeq exceptions;
+  };
+
+
+
+  typedef sequence <RepositoryId> RepositoryIdSeq;
+  typedef sequence <OperationDescription> OpDescriptionSeq;
+  typedef sequence <AttributeDescription> AttrDescriptionSeq;
+
+  interface InterfaceDef : Container, Contained, IDLType {
+    // read/write interface
+
+    attribute InterfaceDefSeq base_interfaces;
+
+    // read interface
+
+    boolean is_a (in RepositoryId interface_id);
+
+    struct FullInterfaceDescription {
+      Identifier name;
+      RepositoryId id;
+      RepositoryId defined_in;
+      VersionSpec version;
+      OpDescriptionSeq operations;
+      AttrDescriptionSeq attributes;
+      RepositoryIdSeq base_interfaces;
+      TypeCode type;
+    };
+
+    FullInterfaceDescription describe_interface();
+
+    // write interface
+
+    AttributeDef create_attribute (
+				   in RepositoryId id,
+				   in Identifier name,
+				   in VersionSpec version,
+				   in IDLType type,
+				   in AttributeMode mode
+				   );
+
+    OperationDef create_operation (
+				   in RepositoryId id,
+				   in Identifier name,
+				   in VersionSpec version,
+				   in IDLType result,
+				   in OperationMode mode, 
+				   in ParDescriptionSeq params,
+				   in ExceptionDefSeq exceptions,
+				   in ContextIdSeq contexts
+				   );
+  };
+
+  struct InterfaceDescription {
+    Identifier name; 
+    RepositoryId id; 
+    RepositoryId defined_in; 
+    VersionSpec version;
+    RepositoryIdSeq base_interfaces;
+  };
+
+
+
+  enum TCKind { 
+    tk_null, tk_void, 
+    tk_short, tk_long, tk_ushort, tk_ulong, 
+    tk_float, tk_double, tk_boolean, tk_char, 
+    tk_octet, tk_any, tk_TypeCode, tk_Principal, tk_objref, 
+    tk_struct, tk_union, tk_enum, tk_string, 
+    tk_sequence, tk_array, tk_alias, tk_except
+  };
+
+  interface TypeCode { // PIDL
+    exception Bounds {};
+    exception BadKind {};
+
+    // for all TypeCode kinds
+    boolean equal (in TypeCode tc);
+    TCKind kind ();
+
+    // for tk_objref, tk_struct, tk_union, tk_enum, tk_alias, and tk_except
+    RepositoryId id () raises (BadKind);
+
+    // for tk_objref, tk_struct, tk_union, tk_enum, tk_alias, and tk_except
+    Identifier name () raises (BadKind);
+
+    // for tk_struct, tk_union, tk_enum, and tk_except
+    unsigned long member_count () raises (BadKind);
+    Identifier member_name (in unsigned long index) raises (BadKind, Bounds);
+
+    // for tk_struct, tk_union, and tk_except
+    TypeCode member_type (in unsigned long index) raises (BadKind, Bounds);
+
+    // for tk_union
+    any member_label (in unsigned long index) raises (BadKind, Bounds);
+    TypeCode discriminator_type () raises (BadKind);
+    long default_index () raises (BadKind); 
+
+    // for tk_string, tk_sequence, and tk_array
+    unsigned long length () raises (BadKind);
+
+    // for tk_sequence, tk_array, and tk_alias
+    TypeCode content_type () raises (BadKind);
+
+    // deprecated interface
+    long param_count (); 
+    any parameter (in long index) raises (Bounds); 
+  };
+
+
+  /*
+   * following line added by Christian Blum
+   */
+  interface BOA;
+
+  interface ORB {
+    // other operations ...
+
+    TypeCode create_struct_tc (
+			       in RepositoryId id,
+			       in Identifier name,
+			       in StructMemberSeq members
+			       );
+
+    TypeCode create_union_tc (
+			      in RepositoryId id,
+			      in Identifier name,
+			      in TypeCode discriminator_type,
+			      in UnionMemberSeq members
+			      );
+
+    TypeCode create_enum_tc (
+			     in RepositoryId id,
+			     in Identifier name,
+			     in EnumMemberSeq members
+			     );
+
+    TypeCode create_alias_tc (
+			      in RepositoryId id,
+			      in Identifier name,
+			      in TypeCode original_type
+			      );
+
+    TypeCode create_exception_tc (
+				  in RepositoryId id,
+				  in Identifier name,
+				  in StructMemberSeq members
+				  );
+
+    TypeCode create_interface_tc (
+				  in RepositoryId id,
+				  in Identifier name
+				  );
+
+    TypeCode create_string_tc (
+			       in unsigned long bound
+			       );
+
+    TypeCode create_sequence_tc (
+				 in unsigned long bound,
+				 in TypeCode element_type
+				 );
+
+    TypeCode create_recursive_sequence_tc (
+					   in unsigned long bound,
+					   in unsigned long offset
+					   );
+
+    TypeCode create_array_tc (
+			      in unsigned long length,
+			      in TypeCode element_type
+			      );
+
+    /*
+     * following line commented out by Christian Blum
+     */
+    //    };
+
+    // The ORB interface (PIDL) is described in Chapter 7, CORBA V2.0 July 1995
+    // Object interface (object reference operations): pg 7-3 CORBA V2, 7-95
+    // ORB initialization: pg 7-7 CORBA V2, 7-95
+    // Object Adapter and Basic Object Adapter initialization: pg 7-8 CORBA V2 7-95
+    // Getting initial references: pg 7-10 CORBA V2 7-95
+    //PIDL	
+
+    /*
+     * following line commented out by Christian Blum
+     */
+    //interface		 ORB {	
+
+
+    string object_to_string (in Object obj);
+    Object	 	string_to_object (in string str);
+	
+    Status 		create_list (
+				     in long	count,	 
+				     out NVList new_list
+				     );
+    Status		 create_operation_list (	
+						in OperationDef oper, 
+						out NVList new_list
+						);
+    Status get_default_context (out	 Context ctx);
+
+    // Initializing the ORB
+    typedef string ORBid;
+    typedef sequence <string> arg_list;
+    ORB ORB_init (inout arg_list argv, in ORBid orb_identifier);
+
+    // Initializing an object adapter and the Basic Object Adapter 
+    typedef string OAid;
+
+    // Template for OA initialization operations
+    // <OA> <OA>_init (inout arg_list argv, 
+    // in OAid oa_identifier);
+
+
+
+    BOA BOA_init (inout arg_list argv,
+		  in OAid boa_identifier); 
+
+
+
+    // Getting initial object references 
+    typedef string ObjectId;
+    typedef sequence <ObjectId> ObjectIdList; 
+
+    exception InvalidName {}; 
+
+    ObjectIdList list_initial_services (); 
+
+    Object resolve_initial_references (in ObjectId identifier)
+      raises (InvalidName); 
+  }; 
+
+  // had to be changed..., Gerald Brose 1996
+  interface ORBject {				
+
+    ImplementationDef get_implementation ();
+    InterfaceDef get_interface ();
+    boolean is_nil();
+    Object duplicate ();
+    void release ();
+    boolean is_a (in string logical_type_id);
+    boolean non_existent();
+    boolean is_equivalent (in Object other_object);
+    unsigned long hash(in unsigned long maximum);
+
+
+    Status create_request (			
+			   in Context ctx,
+			   in Identifier  operation,
+			   in NVList arg_list,
+			   inout NamedValue result,
+			   out Request request,
+			   in Flags req_flags
+			   );
+  };
+
+
+  // Basic Object Adapter interface described in Chapter 8, CORBA V2.0, July 1995
+  //  interface InterfaceDef;			// from Interface Repository // PIDL
+  //  interface ImplementationDef;  		// from Implementation Repository
+  // interface Object;  			// an object reference
+  //  interface Principal;			// for the authentication service
+  typedef sequence <octet, 1024> ReferenceData;
+
+  interface BOA {
+    Object create (
+		   in ReferenceData  id, 
+		   in InterfaceDef intf,
+		   in ImplementationDef impl
+		   );
+    void dispose (in Object obj);
+    ReferenceData get_id (in Object obj);
+
+    void change_implementation (in Object obj,
+				in ImplementationDef impl
+				);
+
+    Principal get_principal (in Object  obj, 
+			     in Environment ev
+			     );
+
+    void set_exception (in exception_type  major, 	// NO, USER, 
+			//or SYSTEM_EXCEPTION
+			in string  userid,			// exception type id
+			in any param_LOOK_AT_SOURCE
+			// in void  *param		    // pointer to associated data
+			);
+
+    void impl_is_ready (in ImplementationDef impl);
+    void deactivate_impl (in ImplementationDef impl);
+    void obj_is_ready (in Object obj, in ImplementationDef impl);
+    void deactivate_obj (in Object obj);
+  };
+};
+
+// IOP module described in chap 10 CORBA V2, 7-95 
+module IOP{  // IDL
+  //
+  // Standard Protocol Profile tag values 
+  // 
+  typedef unsigned long  ProfileId;
+  const ProfileId	 TAG_INTERNET_IOP = 0;
+  const ProfileId	 TAG_MULTIPLE_COMPONENTS = 1;
+
+  struct TaggedProfile {
+    ProfileId  tag;
+    sequence <octet> profile_data;
+  };
+
+  //
+  // an Interoperable Object Reference is a sequence of
+  // object-specific protocol profiles, plus a type ID.
+  //
+  struct IOR {
+    string	type_id;
+    sequence <TaggedProfile> profiles;
+  };
+
+  //
+  // Standard way of representing multicomponent profiles.
+  // This would be encapsulated in a TaggedProfile.
+  //
+  typedef unsigned long ComponentId;
+  struct TaggedComponent {
+    ComponentId  tag;
+    sequence <octet> component_data;
+  };
+  typedef sequence <TaggedComponent> MultipleComponentProfile;
+
+
+  typedef unsigned long ServiceID;
+
+  struct ServiceContext {
+    ServiceID context_id;
+    sequence <octet> context_data;
+  };
+  typedef sequence <ServiceContext> ServiceContextList;
+
+  const ServiceID	TransactionService = 0;
+
+
+
+};
+// GIOP module described in CORBA V2, 7-95 chap 12
+// Complete IDL for GIOP module in CORBA
+// V2.0, 7-95 p 10-29
+// GIOP message header: CORBA V2, 7-95 p 12-16
+// GIOP request header:  CORBA V2, 7-95 p 12-17
+// GIOP reply header: CORBA V2, 7-95 p 12-19
+// GIOP cancel request and locate request: CORBA V2, 7-95 pp 12-20 -- 12-21
+// GIOP locate reply: CORBA V2, 7-95 p 12-22
+module GIOP {					    // IDL
+  enum MsgType {
+    Request, Reply, CancelRequest,
+    LocateRequest, LocateReply,
+    CloseConnection, MessageError
+  };
+
+  struct Version {
+    char			major;
+    char			minor;
+  };
+
+  struct MessageHeader {
+    char			magic [4];
+    Version			GIOP_version;
+    boolean			byte_order;
+    octet			message_type;
+    unsigned long			message_size;
+  };
+
+  struct RequestHeader {
+    ::IOP::ServiceContextList	service_context;
+    unsigned long  request_id;
+    boolean	response_expected;
+    sequence <octet>  object_key;
+    string operation;
+
+    /*
+     * ::CORBA:: added for correct scope
+     */
+    ::CORBA::Principal requesting_principal;
+  };
+
+  enum ReplyStatusType {
+    NO_EXCEPTION,
+    USER_EXCEPTION,
+    SYSTEM_EXCEPTION,
+    LOCATION_FORWARD
+  };
+
+  struct ReplyHeader {
+    ::IOP::ServiceContextList	 service_context;
+    unsigned long request_id;
+    ReplyStatusType	reply_status;
+  };
+
+  struct CancelRequestHeader {
+    unsigned long request_id;
+  };
+
+  struct LocateRequestHeader {
+    unsigned long request_id;
+    sequence <octet> object_key;
+  };
+
+  enum LocateStatusType {
+    UNKNOWN_OBJECT,
+    OBJECT_HERE,
+    OBJECT_FORWARD
+  };
+
+  struct LocateReplyHeader {
+    unsigned long request_id;
+    LocateStatusType  locate_status;
+  };
+};
+//  IIOP module described in CORBA V2, 7-95 chap 12
+// Complete IDL for IIOP module: CORBA V2, 7-95 p 12-31
+module IIOP {			// IDL
+  struct Version {
+    char			major;
+    char			minor;
+  };
+
+  struct ProfileBody {
+    Version				iiop_version;
+    string				host;
+    unsigned short			port;
+    sequence <octet>		object_key;
+  };
+};
+// DCE CIOP module described in CORBA V2, 7-95 chap 13
+// IDL for DCE CIOP module: CORBA V2, 7-95  p 13-2
+module DCE_CIOP {
+  struct InvokeRequestHeader {
+    boolean byte_order;
+    ::IOP::ServiceContextList service_context;
+    sequence <octet> object_key;
+    string endpoint_id;
+    string operation;
+    ::CORBA::Principal principal;
+    sequence <string> client_context;
+
+    // in and inout parameters follow
+  };
+  enum InvokeResponseStatus {
+    INVOKE_NO_EXCEPTION,
+    INVOKE_USER_EXCEPTION,
+    INVOKE_SYSTEM_EXCEPTION,
+    INVOKE_LOCATION_FORWARD,
+    INVOKE_TRY_AGAIN
+  };
+
+  struct InvokeResponseHeader {
+    boolean byte_order;
+    ::IOP::ServiceContextList service_context;
+    InvokeResponseStatus status;
+
+    // if status = INVOKE_NO_EXCEPTION,
+    // result then inouts and outs follow
+
+    // if status = INVOKE_USER_EXCEPTION or
+    // INVOKE_SYSTEM_EXCEPTION, an exception follows
+
+    // if status = INVOKE_LOCATION_FORWARD, an 
+    // ::IOP::MultipleComponentsProfile follows
+  };
+
+  struct LocateRequestHeader {
+    boolean byte_order;
+    sequence <octet> object_key;
+    string endpoint_id;
+    string operation;
+
+    // no body follows
+  };
+
+  module IOP {
+
+    /*
+     * ::IOP:: added to get the right scope
+     */
+    const ::IOP::ComponentId TAG_OBJECT_KEY = 10;
+    const ::IOP::ComponentId TAG_ENDPOINT_ID = 11;
+    const ::IOP::ComponentId TAG_LOCATION_POLICY = 12;
+    // illegal IDL
+    /*	const octet LOCATE_NEVER = 0;
+	const octet LOCATE_OBJECT = 1;
+	const octet LOCATE_OPERATION = 2;
+	const octet LOCATE_ALWAYS = 3;
+	*/
+  };
+};
+
+#endif
diff --git a/lib/ic/test/ic_SUITE_data/Coss.idl b/lib/ic/test/ic_SUITE_data/Coss.idl
new file mode 100644
index 0000000000..c84d4a8247
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/Coss.idl
@@ -0,0 +1,1537 @@
+// This file contains OMG IDL and PIDL for the Common Object Services.
+// CosNaming Module, p 3-6 CORBAservices, Naming Service V1.0, 3/94
+
+// A few minor changes for the JacORB distribution:
+//
+// added am enclosing COSS module and changed scoped names accordingly
+//
+// corrected a few syntax errors
+//
+// commented out:
+//	#includes
+//	forward declaration of Object
+
+#include "Corba.idl"
+
+module COSS {
+
+module CosNaming {
+
+        typedef string Istring;
+        struct NameComponent {
+                Istring id;
+                Istring kind;
+        };
+
+        typedef sequence <NameComponent> Name;
+
+        enum BindingType {nobject, ncontext};
+
+        struct Binding {
+                Name    binding_name;
+                BindingType binding_type;                                  
+        };
+
+        typedef sequence <Binding> BindingList;                                       
+        interface BindingIterator;
+
+        interface NamingContext {
+
+                enum NotFoundReason { missing_node, not_context, not_object};
+        
+                exception NotFound { 
+                                NotFoundReason why;
+                                Name rest_of_name;
+                };
+
+                exception CannotProceed {
+                                NamingContext cxt;
+                                Name rest_of_name;
+                };
+                                                                                                        
+                exception InvalidName{};                                                                        
+                exception AlreadyBound {};
+                exception NotEmpty{};
+
+                void bind(in Name n, in Object obj)             
+                         raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
+                void rebind(in Name n, in Object obj)   
+                         raises(NotFound, CannotProceed, InvalidName);
+                void bind_context(in Name n, in NamingContext nc)               
+                         raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
+                void rebind_context(in Name n, in NamingContext nc)     
+                         raises(NotFound, CannotProceed, InvalidName);
+                Object resolve (in Name n)
+                         raises(NotFound, CannotProceed, InvalidName);
+                void unbind(in Name n)
+                         raises(NotFound, CannotProceed, InvalidName);
+                NamingContext new_context();
+                NamingContext bind_new_context(in Name n)
+                         raises(NotFound, AlreadyBound, CannotProceed, InvalidName);
+                void destroy( )
+                         raises(NotEmpty);
+                void list (in unsigned long how_many, 
+                                        out BindingList bl, out BindingIterator bi);
+        };
+
+        interface BindingIterator {
+                boolean next_one(out Binding b);
+                boolean next_n(in unsigned long how_many, 
+                                        out BindingList bl);
+                void destroy();
+        };
+};
+
+// Names Library interface in PIDL,   CORBAservices p 3- 14, Naming Service V1.0 3/94 
+/*
+interface LNameComponent {                                                              // PIDL
+        exception NotSet{};
+        string get_id() 
+                raises(NotSet);
+        void set_id(in string i);
+        string get_kind() 
+                raises(NotSet);
+        void set_kind(in string k);
+        void destroy();
+};
+
+interface LName {                                                                                               // PIDL
+        exception NoComponent{};
+        exception OverFlow{};
+        exception InvalidName{};                                
+        LName insert_component(in unsigned long i, 
+                                        in LNameComponent n) 
+                        raises(NoComponent, OverFlow);
+        LNameComponent get_component(in unsigned long i)
+                 raises(NoComponent);                           
+        LNameComponent delete_component(in unsigned long i)
+                 raises(NoComponent);                           
+        unsigned long num_components();
+        boolean equal(in LName ln);
+        boolean less_than(in LName ln);
+        Name to_idl_form()
+                        raises(InvalidName);                             
+        void from_idl_form(in Name n);
+        void destroy();
+};
+
+LName create_lname();                      // C/C++
+LNameComponent create_lname_component();   // C/C++
+*/
+
+// CosEventComm Module, CORBAservices p 4-8, Event Service V1.0 3/94
+
+module CosEventComm {
+
+        exception Disconnected{};
+
+        interface PushConsumer {
+                void push (in any data) raises(Disconnected);
+                void disconnect_push_consumer(); 
+        };
+
+    interface PushSupplier {
+                void disconnect_push_supplier();
+        };
+
+        interface PullSupplier {
+                any pull () raises(Disconnected);
+                any try_pull (out boolean has_event) 
+                        raises(Disconnected);
+                void     disconnect_pull_supplier(); 
+        };
+
+        interface PullConsumer {
+                void disconnect_pull_consumer();
+        };
+
+};
+
+// CosEventChannelAdmin Module, p 4-15 CORBAservices, Event
+// Service V1.0, 3/94
+
+// #include "CosEventComm.idl"
+
+module CosEventChannelAdmin {
+
+        exception AlreadyConnected {};
+        exception TypeError {};
+
+        interface ProxyPushConsumer: ::COSS::CosEventComm::PushConsumer {
+                void connect_push_supplier(
+                                in ::COSS::CosEventComm::PushSupplier push_supplier)
+                        raises(AlreadyConnected);
+        };
+
+        interface ProxyPullSupplier: ::COSS::CosEventComm::PullSupplier {
+                void connect_pull_consumer(
+                                in ::COSS::CosEventComm::PullConsumer pull_consumer)
+                        raises(AlreadyConnected);
+        };
+
+        interface ProxyPullConsumer: ::COSS::CosEventComm::PullConsumer {
+                void connect_pull_supplier(
+                                in ::COSS::CosEventComm::PullSupplier pull_supplier)
+                        raises(AlreadyConnected,TypeError);
+        };
+
+        interface ProxyPushSupplier: ::COSS::CosEventComm::PushSupplier {
+	  void connect_push_consumer(
+				     in ::COSS::CosEventComm::PushConsumer 
+				     push_consumer)
+	    raises(AlreadyConnected, TypeError);
+        };
+
+	
+        interface ConsumerAdmin {
+	  ProxyPushSupplier obtain_push_supplier();
+	  ProxyPullSupplier obtain_pull_supplier();
+        };
+
+        interface SupplierAdmin {
+                ProxyPushConsumer obtain_push_consumer();
+                ProxyPullConsumer obtain_pull_consumer();
+        };
+
+        interface EventChannel {
+                ConsumerAdmin for_consumers();
+                SupplierAdmin for_suppliers();
+                void destroy();
+        };
+
+};
+
+
+// CosTyped Event Module, p 4-22 CORBAservices, Event Service
+// V1.0, 3/94
+
+// // #include "CosEventComm.idl" 
+
+module CosTypedEventComm {
+
+        interface TypedPushConsumer : ::COSS::CosEventComm::PushConsumer {
+                Object get_typed_consumer(); 
+        };
+
+        interface TypedPullSupplier : ::COSS::CosEventComm::PullSupplier {               
+                Object get_typed_supplier();
+        };
+
+}; 
+
+// CosTypedEventChannelAdmin Module, p 4- 25 CORBAservices,
+// Event Service V1.0, 3/94
+
+// // #include "CosEventChannel.idl" 
+// // #include "CosTypedEventComm.idl"
+module CosTypedEventChannelAdmin {       
+        exception InterfaceNotSupported {}; 
+        exception NoSuchImplementation {}; 
+        typedef string Key; 
+
+        interface TypedProxyPushConsumer :      
+                        ::COSS::CosEventChannelAdmin::ProxyPushConsumer,        
+                        ::COSS::CosTypedEventComm::TypedPushConsumer  { }; 
+
+        interface TypedProxyPullSupplier :
+                        ::COSS::CosEventChannelAdmin::ProxyPullSupplier,        
+                        ::COSS::CosTypedEventComm::TypedPullSupplier { }; 
+
+        interface TypedSupplierAdmin :                  
+                        ::COSS::CosEventChannelAdmin::SupplierAdmin { 
+                TypedProxyPushConsumer obtain_typed_push_consumer(
+                                in Key supported_interface)                 
+                        raises(InterfaceNotSupported); 
+                ::COSS::CosEventChannelAdmin::ProxyPullConsumer obtain_typed_pull_consumer ( 
+                                in Key uses_interface)             
+                         raises(NoSuchImplementation); 
+        }; 
+
+        interface TypedConsumerAdmin : 
+                        ::COSS::CosEventChannelAdmin::ConsumerAdmin { 
+                TypedProxyPullSupplier obtain_typed_pull_supplier( 
+                                in Key supported_interface)                 
+                        raises (InterfaceNotSupported); 
+                ::COSS::CosEventChannelAdmin::ProxyPushSupplier obtain_typed_push_supplier(                   
+                                in Key uses_interface)              
+                        raises(NoSuchImplementation); 
+        }; 
+
+        interface TypedEventChannel { 
+                TypedConsumerAdmin for_consumers();             
+                TypedSupplierAdmin for_suppliers();                
+                void destroy (); 
+        }; 
+};
+
+
+// CosPersistencePID Module, p 5-20 CORBAservices, 
+// Persistent Object Service V1.0, 3/94
+
+//#ifndef __COSPERSISTENCE
+//#define __COSPERSISTENCE
+
+module CosPersistencePID {
+
+        interface PID {
+                attribute string datastore_type;
+                string get_PIDString();
+        };
+};
+
+
+// CosPersistencePDS Module, p 5-20 CORBAservices, 
+// Persistent Object Service V1.0, 3/94
+
+// #include "CosPersistencePID.idl"
+
+module CosPersistencePDS {
+
+// interface Object;
+        interface PDS {
+                PDS     connect (in Object obj, 
+                        in ::COSS::CosPersistencePID::PID p);
+                void disconnect (in Object obj, 
+                        in ::COSS::CosPersistencePID::PID p);
+                void store (in Object obj, 
+                        in ::COSS::CosPersistencePID::PID p);
+                void restore (in Object obj, 
+                        in ::COSS::CosPersistencePID::PID p);
+                void delete (in Object obj, 
+                        in ::COSS::CosPersistencePID::PID p);
+        };
+};
+
+
+// CosPersistencePO Module, p 5-12 CORBAservices,
+// Persistent Object Service V1.0, 3/94
+
+// // #include "CosPersistencePDS.idl"
+// CosPersistencePDS.idl 
+// // #includes CosPersistencePID.idl
+
+module CosPersistencePO {
+
+        interface PO {
+                attribute ::COSS::CosPersistencePID::PID p;
+                ::COSS::CosPersistencePDS::PDS connect (
+                        in ::COSS::CosPersistencePID::PID p);
+                void disconnect (in ::COSS::CosPersistencePID::PID p);
+                void store (in ::COSS::CosPersistencePID::PID p);
+                void restore (in ::COSS::CosPersistencePID::PID p);
+                void delete (in ::COSS::CosPersistencePID::PID p);
+        };
+
+        interface SD {
+                void pre_store();
+                void post_restore();
+        };
+};
+
+
+// CosPersistencePOM Module, p 5-15 CORBAservices,
+// Persistent Object Service V1.0, 3/94
+
+// #include "CosPersistencePDS.idl"
+
+// CosPersistencePDS.idl // #includes CosPersistencePID.idl
+
+module CosPersistencePOM {
+
+// interface Object;        
+
+	interface POM {
+                ::COSS::CosPersistencePDS::PDS connect (
+                        in Object obj, 
+                        in ::COSS::CosPersistencePID::PID p);
+                void disconnect (
+                        in Object obj, 
+                        in ::COSS::CosPersistencePID::PID p);
+                void store (
+                        in Object obj, 
+                        in ::COSS::CosPersistencePID::PID p);
+                void restore (
+                        in Object obj, 
+                        in ::COSS::CosPersistencePID::PID p);
+                void delete (
+                        in Object obj, 
+                        in ::COSS::CosPersistencePID::PID p);
+ 	       };
+	};
+
+// CosPersistencePDS_DA Module, p 5-22 CORBAservices,
+// Persistent Object Service, V1.0, 3/94
+
+// #include "CosPersistencePDS.idl"
+// CosPersistencePDS.idl // #includes CosPersistencePID.idl
+
+module CosPersistencePDS_DA {
+
+        typedef string DAObjectID;
+
+        interface PID_DA : ::COSS::CosPersistencePID::PID {
+                attribute DAObjectID oid;
+        };
+        
+        interface DAObject {
+                boolean dado_same(in DAObject d);
+                DAObjectID dado_oid();
+                PID_DA dado_pid();
+                void dado_remove();
+                void dado_free();
+        };
+
+        interface DAObjectFactory {
+                DAObject create();
+        };
+
+        interface DAObjectFactoryFinder {
+                DAObjectFactory find_factory(in string key);
+        };
+
+        interface PDS_DA : ::COSS::CosPersistencePDS::PDS {
+                DAObject get_data();
+                void set_data(in DAObject new_data);
+                DAObject lookup(in DAObjectID id);
+                PID_DA get_pid();
+                PID_DA get_object_pid(in DAObject dao);
+                DAObjectFactoryFinder data_factories();
+        };
+
+        typedef sequence<string> AttributeNames;
+        interface DynamicAttributeAccess {
+                AttributeNames attribute_names();
+                any attribute_get(in string name);
+                void attribute_set(in string name, in any value);
+        };
+
+        typedef string ClusterID;
+        typedef sequence<ClusterID> ClusterIDs;
+        interface PDS_ClusteredDA : PDS_DA{
+                ClusterID cluster_id();
+                string cluster_kind();
+                ClusterIDs clusters_of();
+                PDS_ClusteredDA create_cluster(in string kind);
+                PDS_ClusteredDA open_cluster(in ClusterID cluster);
+                PDS_ClusteredDA copy_cluster(
+                        in PDS_DA source);
+        };
+};
+
+// CosPersistenceDDO Module, p 5-32 CORBAservices, Persistent Object Service V1.0, 3/94
+
+// #include "CosPersistencePID.idl"
+module CosPersistenceDDO {
+
+        interface DDO {
+                attribute string object_type;
+                attribute ::COSS::CosPersistencePID::PID p;
+                short add_data();
+                short add_data_property (in short data_id);
+                short get_data_count();
+                short get_data_property_count (in short data_id);
+                void get_data_property (in short data_id,
+                        in short property_id,
+                        out string property_name,
+                        out any property_value);
+                void set_data_property (in short data_id,
+                        in short property_id,
+                        in string property_name,
+                        in any property_value);
+                void get_data (in short data_id,
+                        out string data_name,
+                        out any data_value);
+                void set_data (in short data_id,
+                        in string data_name,
+                        in any data_value);
+        };
+};
+
+// CosPersistenceDS_CLI module, p 5-34 CORBAservices,
+// Persistent Object Service V1.0, 3/94
+
+// #include "CosPersistenceDDO.idl"
+// CosPersistenceDDO.idl // #includes CosPersistencePID.idl
+
+module CosPersistenceDS_CLI {
+        interface UserEnvironment {
+                void set_option (in long option,in any value);
+                void get_option (in long option,out any value);
+                void release();
+        };
+
+        interface Connection {
+                void set_option (in long option,in any value);
+                void get_option (in long option,out any value);
+        };
+
+        interface ConnectionFactory {
+                Connection create_object (
+                        in UserEnvironment user_envir);
+        };
+
+        interface Cursor { 
+                void set_position (in long position,in any value);
+                ::COSS::CosPersistenceDDO::DDO fetch_object();
+        };
+
+        interface CursorFactory {
+                Cursor create_object (
+                        in Connection connection);
+        };
+
+        interface PID_CLI : ::COSS::CosPersistencePID::PID {
+                attribute string datastore_id;
+                attribute string id;
+        };
+
+
+
+        interface Datastore_CLI {
+                void connect (in Connection connection,
+                        in string datastore_id,
+                        in string user_name,
+                        in string authentication);
+                void disconnect (in Connection connection);
+                Connection get_connection (
+                        in string datastore_id,
+                        in string user_name);
+                void add_object (in Connection connection,
+                        in ::COSS::CosPersistenceDDO::DDO data_obj);
+                void delete_object (
+                        in Connection connection,
+                        in ::COSS::CosPersistenceDDO::DDO data_obj);
+                void update_object (
+                        in Connection connection,
+                        in ::COSS::CosPersistenceDDO::DDO data_obj);
+                void retrieve_object(
+                        in Connection connection,
+                        in ::COSS::CosPersistenceDDO::DDO data_obj);
+                Cursor select_object(
+                        in Connection connection,
+                        in string key);
+                void transact (in UserEnvironment user_envir,
+                        in short completion_type);
+                void assign_PID (in PID_CLI p);
+                void assign_PID_relative (
+                        in PID_CLI source_pid,
+                        in PID_CLI target_pid);
+                boolean is_identical_PID (
+                        in PID_CLI pid_1,
+                        in PID_CLI pid_2);
+                string get_object_type (in PID_CLI p);
+                void register_mapping_schema (in string schema_file); 
+                Cursor execute (in Connection connection,
+                        in string command); 
+        };
+
+};
+
+
+// CosLifeCycle Module, p 6-10 CORBAservices, LifeCycle Service V1.0, 3/94
+
+// #include "Naming.idl"
+
+module CosLifeCycle 
+{
+        typedef ::COSS::CosNaming::Name Key; 
+        typedef Object Factory;
+        typedef sequence <Factory> Factories;
+        typedef struct NVP {     
+                ::COSS::CosNaming::Istring  name; 
+                any     value; 
+        } NameValuePair;
+        typedef sequence <NameValuePair> Criteria;
+
+        exception NoFactory {
+                Key search_key;
+        };
+        exception NotCopyable { string reason; };
+        exception NotMovable { string reason; };
+        exception NotRemovable { string reason; };
+        exception InvalidCriteria{ 
+                Criteria invalid_criteria;
+        };
+        exception CannotMeetCriteria {
+                Criteria unmet_criteria;
+        };
+
+
+        interface FactoryFinder {
+                Factories find_factories(in Key factory_key)
+                        raises(NoFactory);
+        };
+
+        interface LifeCycleObject {
+                LifeCycleObject copy(in FactoryFinder there, 
+                                in Criteria the_criteria)
+                        raises(NoFactory, NotCopyable, InvalidCriteria,
+                                 CannotMeetCriteria);
+                void move(in FactoryFinder there, 
+                                in Criteria the_criteria)
+                        raises(NoFactory, NotMovable, InvalidCriteria,
+                                 CannotMeetCriteria);
+                void remove()
+                        raises(NotRemovable);
+        };
+
+        interface GenericFactory {              
+                boolean supports(in Key k);
+                Object create_object(                   
+                                in Key k, 
+                                in Criteria the_criteria)                          
+                        raises (NoFactory, InvalidCriteria,                                                                             
+                                CannotMeetCriteria);
+        };
+};
+
+
+
+// LifeCycleService Module, p 6- 55 CORBAservices, Life Cycle
+// Service V1.0, 3/94
+
+// #include "LifeCycle.idl" 
+
+module LifeCycleService {
+
+        typedef sequence <::COSS::CosLifeCycle::NameValuePair> PolicyList;
+        typedef sequence <::COSS::CosLifeCycle::Key> Keys;
+        typedef sequence <::COSS::CosLifeCycle::NameValuePair> PropertyList; 
+        typedef sequence <::COSS::CosNaming::NameComponent> NameComponents;
+
+        interface LifeCycleServiceAdmin {
+
+                attribute PolicyList policies;
+
+                void bind_generic_factory(
+                                in ::COSS::CosLifeCycle::GenericFactory gf,
+                                in ::COSS::CosNaming::NameComponent name,
+                                in Keys key_set,
+                                in PropertyList other_properties)
+                        raises (::COSS::CosNaming::NamingContext::AlreadyBound, ::COSS::CosNaming::NamingContext::InvalidName);
+
+                void unbind_generic_factory(
+                                in ::COSS::CosNaming::NameComponent name)
+                        raises (::COSS::CosNaming::NamingContext::NotFound, ::COSS::CosNaming::NamingContext::InvalidName);
+
+               ::COSS::CosLifeCycle::GenericFactory resolve_generic_factory(
+                                in ::COSS::CosNaming::NameComponent name)
+                        raises (::COSS::CosNaming::NamingContext::NotFound, ::COSS::CosNaming::NamingContext::InvalidName);
+
+                NameComponents list_generic_factories();
+
+                boolean match_service (in ::COSS::CosLifeCycle::GenericFactory f);
+
+                string get_hint();
+
+                void get_link_properties(
+                                in ::COSS::CosNaming::NameComponent name,
+                                out Keys key_set,
+                                out PropertyList other_properties)
+                        raises (::COSS::CosNaming::NamingContext::NotFound, ::COSS::CosNaming::NamingContext::InvalidName);
+        };
+};
+
+// CosTransactions Module, p 10-66
+// CORBAservices, Transaction Service V1.0, 3/94
+
+module CosTransactions {
+// DATATYPES
+enum Status {
+        StatusActive,
+        StatusMarkedRollback,
+        StatusPrepared,
+        StatusCommitted,
+        StatusRolledBack,
+        StatusUnknown,
+        StatusNoTransaction
+};
+
+enum Vote {
+        VoteCommit,
+        VoteRollback,
+        VoteReadOnly
+};
+
+// Standard exceptions
+exception TransactionRequired {};
+exception TransactionRolledBack {};
+exception InvalidTransaction {};
+
+// Heuristic exceptions
+exception HeuristicRollback {};
+exception HeuristicCommit {};
+exception HeuristicMixed {};
+exception HeuristicHazard {};
+
+// Exception from Orb operations
+exception WrongTransaction {};
+
+// Other transaction-specific exceptions
+exception SubtransactionsUnavailable {};
+exception NotSubtransaction {};
+exception Inactive {};
+exception NotPrepared {};
+exception NoTransaction {};
+exception InvalidControl {};
+exception Unavailable {};
+
+// Forward references for interfaces defined later in module
+interface Control;
+interface Terminator;
+interface Coordinator;
+interface Resource;
+interface RecoveryCoordinator;
+interface SubtransactionAwareResource;
+interface TransactionFactory; 
+interface TransactionalObject; 
+interface Current;
+
+// Current transaction pseudo object (PIDL)
+	interface Current {
+        void begin()
+                raises(SubtransactionsUnavailable);
+        void commit(in boolean report_heuristics)
+                raises(
+                        NoTransaction,
+                        HeuristicMixed,
+                        HeuristicHazard
+                );
+        void rollback()
+                raises(NoTransaction);
+        void rollback_only()
+                raises(NoTransaction);
+
+        Status get_status();
+        string get_transaction_name();
+        void set_timeout(in unsigned long seconds);
+
+        Control get_control();
+        Control suspend();
+        void resume(in Control which)
+                raises(InvalidControl);
+	};
+
+	interface TransactionFactory {
+	        Control create(in unsigned long time_out);
+	};
+
+	interface Control {
+ 	       Terminator get_terminator()
+  	              raises(Unavailable);
+   	     Coordinator get_coordinator()
+    	            raises(Unavailable);
+	};
+
+	interface Terminator {
+	        void commit(in boolean report_heuristics)
+                raises(
+                        HeuristicMixed,
+                        HeuristicHazard
+                );
+     	   void rollback();
+	};
+
+
+	interface Coordinator {
+
+        Status get_status();
+        Status get_parent_status();
+        Status get_top_level_status();
+
+        boolean is_same_transaction(in Coordinator tc);
+        boolean is_related_transaction(in Coordinator tc);
+        boolean is_ancestor_transaction(in Coordinator tc);
+        boolean is_descendant_transaction(in Coordinator tc);
+        boolean is_top_level_transaction();
+
+        unsigned long hash_transaction();
+        unsigned long hash_top_level_tran();
+
+        RecoveryCoordinator register_resource(in Resource r)
+                raises(Inactive);
+
+        void register_subtran_aware(in SubtransactionAwareResource r)
+                raises(Inactive, NotSubtransaction);
+
+        void rollback_only()
+                raises(Inactive);
+
+        string get_transaction_name();
+
+        Control create_subtransaction()
+                raises(SubtransactionsUnavailable, Inactive);
+	};
+
+	interface RecoveryCoordinator {
+     	   Status replay_completion(in Resource r)
+                raises(NotPrepared);
+	};
+
+}; // end module CosTransactions
+
+
+// CosConcurrency Control Module, p 7-8 CORBAservices, 
+// Concurrency Control Service V1.0, 3/94
+
+// #include <CosTransactions.idl>
+module CosConcurrencyControl {
+
+    enum lock_mode {
+        read,
+        write,
+        upgrade,
+        intention_read,
+        intention_write
+    };
+
+    exception LockNotHeld{};
+
+    interface LockCoordinator
+    {
+                void drop_locks();
+    };
+
+    interface LockSet
+    {
+        void lock(in lock_mode mode);
+        boolean try_lock(in lock_mode mode);
+
+        void unlock(in lock_mode mode)
+            raises(LockNotHeld);
+        void change_mode(in lock_mode held_mode,
+                         in lock_mode new_mode)
+           raises(LockNotHeld);
+        LockCoordinator get_coordinator(
+            in ::COSS::CosTransactions::Coordinator which);
+    };
+
+    interface TransactionalLockSet
+    {
+        void lock(in ::COSS::CosTransactions::Coordinator current,
+                  in lock_mode mode);
+        boolean try_lock(in ::COSS::CosTransactions::Coordinator current,
+                         in lock_mode mode);
+        void unlock(in ::COSS::CosTransactions::Coordinator current,
+                    in lock_mode mode)
+           raises(LockNotHeld);
+        void change_mode(in ::COSS::CosTransactions::Coordinator current,
+                         in lock_mode held_mode,
+                         in lock_mode new_mode)
+           raises(LockNotHeld);
+        LockCoordinator get_coordinator(
+            in ::COSS::CosTransactions::Coordinator which);
+    };
+
+    interface LockSetFactory
+    {
+        LockSet create();
+        LockSet create_related(in LockSet which);
+        TransactionalLockSet create_transactional();
+        TransactionalLockSet create_transactional_related(in
+            TransactionalLockSet which);
+    };
+};
+
+// CosObjectIdentity Module, p 9-19 CORBAservices, Relationship
+// Service V1.0, 3/94
+
+
+module CosObjectIdentity {
+
+        typedef unsigned long ObjectIdentifier;
+
+        interface IdentifiableObject {
+                        readonly attribute ObjectIdentifier constant_random_id;
+                        boolean is_identical (
+                                in IdentifiableObject other_object);
+        };
+
+};
+
+
+// CosRelationships Module, p 9-21 CORBAservices, Relationship
+// Service V1.0, 3/94
+
+// #include <ObjectIdentity.idl>
+
+module CosRelationships {
+
+        interface RoleFactory; 
+        interface RelationshipFactory; 
+        interface Relationship; 
+        interface Role;
+        interface RelationshipIterator;
+
+        typedef Object RelatedObject;
+        typedef sequence<Role> Roles;
+        typedef string RoleName;
+        typedef sequence<RoleName> RoleNames;
+
+        struct NamedRole {RoleName name; Role aRole;};
+        typedef sequence<NamedRole> NamedRoles;
+
+        struct RelationshipHandle {
+                        Relationship the_relationship;
+                        ::COSS::CosObjectIdentity::ObjectIdentifier constant_random_id;
+        };
+        typedef sequence<RelationshipHandle> RelationshipHandles;
+
+        interface RelationshipFactory {
+                        struct NamedRoleType {
+                                RoleName name;
+                                        ::CORBA::InterfaceDef named_role_type;
+                        };
+                        typedef sequence<NamedRoleType> NamedRoleTypes;
+                        readonly attribute ::CORBA::InterfaceDef relationship_type;
+                        readonly attribute unsigned short degree;
+                        readonly attribute NamedRoleTypes named_role_types;
+                        exception RoleTypeError {NamedRoles culprits;};
+                        exception MaxCardinalityExceeded {
+                                NamedRoles culprits;};
+                        exception DegreeError {unsigned short required_degree;};
+                        exception DuplicateRoleName {NamedRoles culprits;};
+                        exception UnknownRoleName {NamedRoles culprits;};
+
+                        Relationship create (in NamedRoles named_roles)
+                                        raises (RoleTypeError,
+                                                MaxCardinalityExceeded,
+                                                DegreeError,
+                                                DuplicateRoleName,
+                                                UnknownRoleName);
+        };
+
+        interface Relationship :                                                
+                                ::COSS::CosObjectIdentity::IdentifiableObject {
+                        exception CannotUnlink {
+                                Roles offending_roles;
+                        };
+                        readonly attribute NamedRoles named_roles;
+                        void destroy () raises(CannotUnlink);
+        };
+
+        interface Role {
+                        exception UnknownRoleName {};
+                        exception UnknownRelationship {};
+                        exception RelationshipTypeError {};
+                        exception CannotDestroyRelationship {
+                                RelationshipHandles offenders;
+                        };
+                        exception ParticipatingInRelationship {
+                                RelationshipHandles the_relationships;
+                        };
+                        readonly attribute RelatedObject related_object;
+                        RelatedObject get_other_related_object (
+                                                in RelationshipHandle rel,
+                                                in RoleName target_name)
+                                raises (UnknownRoleName,
+                                                UnknownRelationship);
+                        Role get_other_role (in RelationshipHandle rel, 
+                                                in RoleName target_name)
+                                raises (UnknownRoleName, UnknownRelationship);
+                        void get_relationships (
+                                                in unsigned long how_many,
+                                                out RelationshipHandles rels,
+                                                out RelationshipIterator iterator);
+                        void destroy_relationships()
+                                raises(CannotDestroyRelationship);
+                        void destroy() raises(ParticipatingInRelationship);
+                        boolean check_minimum_cardinality ();
+                        void link (in RelationshipHandle rel,
+                                                in NamedRoles named_roles)
+                                        raises(RelationshipFactory::MaxCardinalityExceeded,
+                                                RelationshipTypeError);
+                        void unlink (in RelationshipHandle rel)
+                                raises (UnknownRelationship);
+        };
+
+        interface RoleFactory {
+                        exception NilRelatedObject {};
+                        exception RelatedObjectTypeError {};
+                        readonly attribute ::CORBA::InterfaceDef role_type;
+                        readonly attribute unsigned long max_cardinality;
+                        readonly attribute unsigned long min_cardinality;
+// the following isn't allowed in IDL,
+//  readonly attribute sequence <::CORBA::InterfaceDef> related_object_types;
+			typedef sequence <::CORBA::InterfaceDef> InterfaceDefSeq;
+			readonly attribute InterfaceDefSeq related_object_types;
+                        Role create_role (in RelatedObject related_object)
+                                raises (NilRelatedObject, RelatedObjectTypeError);
+        };
+
+        interface RelationshipIterator {
+                        boolean next_one (out RelationshipHandle rel);
+                        boolean next_n (in unsigned long how_many,
+                                                out RelationshipHandles rels);
+                        void destroy ();
+        };
+
+};
+
+// CosCompoundExternalization Module, p 8-20 CORBAservices,
+// Externalization Service V1.0, 3/94
+
+// #include <Graphs.idl>
+// #include <Stream.idl>
+
+// CosGraphs Module, p 9-39 CORBAservices, Relationship Service
+// V1.0, 3/94
+
+// #include <Relationships.idl>
+// #include <ObjectIdentity.idl>
+
+module CosGraphs {
+
+                interface TraversalFactory; 
+                interface Traversal;
+                interface TraversalCriteria;
+                interface Node;
+                interface NodeFactory;
+                interface Role; 
+                interface EdgeIterator; 
+                                
+                struct NodeHandle {
+                        Node the_node;
+                        ::COSS::CosObjectIdentity::ObjectIdentifier constant_random_id;
+                };
+                typedef sequence<NodeHandle> NodeHandles;
+                                
+                struct NamedRole {
+                        Role the_role;  
+		  ::COSS::CosRelationships::RoleName the_name;
+                };
+                typedef sequence<NamedRole> NamedRoles;
+
+                struct EndPoint {
+                        NodeHandle the_node;
+                        NamedRole the_role;
+                };
+                typedef sequence<EndPoint> EndPoints;
+
+                struct Edge {
+                        EndPoint from;
+                        ::COSS::CosRelationships::RelationshipHandle the_relationship;
+                        EndPoints relatives;
+                };
+                typedef sequence<Edge> Edges;
+
+                enum PropagationValue {deep, shallow, none, inhibit};
+                enum Mode {depthFirst, breadthFirst, bestFirst};
+
+                interface TraversalFactory {
+                        Traversal create_traversal_on (
+                                        in NodeHandle root_node,
+                                        in TraversalCriteria the_criteria,
+                                        in Mode how);
+                };
+
+                interface Traversal {
+                        typedef unsigned long TraversalScopedId;
+                        struct ScopedEndPoint {
+                                EndPoint point;
+                                TraversalScopedId id;
+                        };
+                        typedef sequence<ScopedEndPoint> ScopedEndPoints;
+                        struct ScopedRelationship {
+                                ::COSS::CosRelationships::RelationshipHandle
+                                        scoped_relationship;
+                                TraversalScopedId id;
+                        };
+                        struct ScopedEdge {
+                                ScopedEndPoint from;
+                                ScopedRelationship the_relationship;
+                                ScopedEndPoints relatives;
+                        };
+                        typedef sequence<ScopedEdge> ScopedEdges;
+                        boolean next_one (out ScopedEdge the_edge);
+                        boolean next_n (in short how_many,
+                                        out ScopedEdges the_edges);
+                        void destroy ();
+                };
+                                
+                interface TraversalCriteria {
+                        struct WeightedEdge {
+                                Edge the_edge;
+                                unsigned long weight;
+                                sequence<NodeHandle> next_nodes;
+                        };
+                        typedef sequence<WeightedEdge> WeightedEdges;
+                        void visit_node(in NodeHandle a_node,
+                                        in Mode search_mode);
+                        boolean next_one (out WeightedEdge the_edge);
+                        boolean next_n (in short how_many, 
+                                        out WeightedEdges the_edges);
+                        void destroy();
+                };
+                                
+                interface Node: ::COSS::CosObjectIdentity::IdentifiableObject {
+                        typedef sequence<Role> Roles;
+                        exception NoSuchRole {};
+                        exception DuplicateRoleType {};
+                                
+                        readonly attribute ::COSS::CosRelationships::RelatedObject
+                                 related_object;
+                        readonly attribute Roles roles_of_node;
+                        Roles roles_of_type ( 
+                                        in ::CORBA::InterfaceDef role_type);
+                        void add_role (in Role a_role)
+                                        raises (DuplicateRoleType);
+                        void remove_role (in ::CORBA::InterfaceDef of_type)
+                                raises (NoSuchRole);
+                };
+                                
+                interface NodeFactory {
+                        Node create_node (in Object related_object);
+                };
+                                
+                interface Role : ::COSS::CosRelationships::Role {
+                        void get_edges ( in long how_many,
+                                        out Edges the_edges,
+                                        out EdgeIterator the_rest);
+                };
+                                
+                interface EdgeIterator {
+                        boolean next_one (out Edge the_edge);
+                        boolean next_n ( in unsigned long how_many,
+                                        out Edges the_edges);
+                        void destroy ();
+                };
+                                
+};
+
+
+
+// CosStream Module, 8-15 CORBAservices, 
+// Externalization Service V1.0, 3/94
+
+// #include <LifeCycle.idl>
+// #include <ObjectIdentity.idl>
+// #include <CompoundExternalization.idl>
+module CosStream {
+                exception ObjectCreationError{};
+                exception StreamDataFormatError{};
+                interface StreamIO;
+
+                interface Streamable: ::COSS::CosObjectIdentity::IdentifiableObject
+		{
+                        readonly attribute ::COSS::CosLifeCycle::Key external_form_id;
+                        void externalize_to_stream(
+                                        in StreamIO targetStreamIO);
+                        void internalize_from_stream(
+                                        in StreamIO sourceStreamIO,
+                                        in ::COSS::CosLifeCycle::FactoryFinder there)
+				raises( ::COSS::CosLifeCycle::NoFactory,
+                                        ObjectCreationError,
+                                        StreamDataFormatError );
+                };
+
+                interface StreamableFactory {
+                        Streamable create_uninitialized();
+                };
+
+
+                interface StreamIO {
+                        void write_string(in string aString);
+                        void write_char(in char aChar);
+                        void write_octet(in octet anOctet);
+                        void write_unsigned_long(
+                                        in unsigned long anUnsignedLong);
+                        void write_unsigned_short(
+                                        in unsigned short anUnsignedShort);
+                        void write_long(in long aLong);
+                        void write_short(in short aShort);
+                        void write_float(in float aFloat);
+                        void write_double(in double aDouble);
+                        void write_boolean(in boolean aBoolean);
+                        void write_object(in Streamable aStreamable);
+			//                        void write_graph(in ::COSS::CosCompoundExternalization::Node aNode);
+                        string read_string() 
+                                raises(StreamDataFormatError);
+                        char read_char()                        
+                                raises(StreamDataFormatError );
+                        octet read_octet()
+                                raises(StreamDataFormatError );
+                        unsigned long read_unsigned_long() 
+                                        raises(StreamDataFormatError );
+                        unsigned short read_unsigned_short()
+                                raises(         StreamDataFormatError );
+                        long read_long()                
+                                raises(StreamDataFormatError );
+                        short read_short()
+                                raises(StreamDataFormatError );
+                        float read_float()
+                                raises(StreamDataFormatError );
+                        double read_double()
+                                raises(StreamDataFormatError );
+                        boolean read_boolean()
+                                raises(StreamDataFormatError );
+                        Streamable read_object(
+                                        in ::COSS::CosLifeCycle::FactoryFinder there,
+                                        in Streamable aStreamable)
+                                raises(StreamDataFormatError );
+//                         void read_graph(
+//                                         in ::COSS::CosCompoundExternalization::Node starting_node,
+//                                         in ::COSS::CosLifeCycle::FactoryFinder there)
+//                                 raises(StreamDataFormatError );
+                };
+};
+
+module CosCompoundExternalization {
+        interface Node;
+        interface Role;
+        interface Relationship;
+        interface PropagationCriteriaFactory;
+        
+        struct RelationshipHandle {
+                        Relationship theRelationship;
+                        ::COSS::CosObjectIdentity::ObjectIdentifier constantRandomId;
+        };
+
+        interface Node : ::COSS::CosGraphs::Node, ::COSS::CosStream::Streamable{
+                        void externalize_node (in ::COSS::CosStream::StreamIO sio);
+                        void internalize_node (in ::COSS::CosStream::StreamIO sio,
+                                                in ::COSS::CosLifeCycle::FactoryFinder there,
+                                                out ::COSS::CosGraphs::Node::Roles rolesOfNode)
+                                raises (::COSS::CosLifeCycle::NoFactory);
+                };
+
+        interface Role : ::COSS::CosGraphs::Role {
+                        void externalize_role (in ::COSS::CosStream::StreamIO sio); 
+                        void internalize_role (in ::COSS::CosStream::StreamIO sio); 
+                        ::COSS::CosGraphs::PropagationValue externalize_propagation (
+                                                in RelationshipHandle rel,
+                                                in ::COSS::CosRelationships::RoleName toRoleName,
+                                                out boolean sameForAll);
+                };
+
+        interface Relationship : 
+                                ::COSS::CosRelationships::Relationship {
+                  void externalize_relationship (
+			in ::COSS::CosStream::StreamIO sio);
+			void internalize_relationship(
+				in ::COSS::CosStream::StreamIO sio,
+				in ::COSS::CosGraphs::NamedRoles newRoles);
+                        ::COSS::CosGraphs::PropagationValue externalize_propagation (
+				in ::COSS::CosRelationships::RoleName fromRoleName,
+				in ::COSS::CosRelationships::RoleName toRoleName,
+				out boolean sameForAll);
+        };
+
+        interface PropagationCriteriaFactory {
+                        ::COSS::CosGraphs::TraversalCriteria create_for_externalize( );
+        };
+
+};
+
+// CosExternalization Module, 8-12 CORBAservices,
+// Externalization Service V1.0, 3/94
+
+
+// #include <LifeCycle.idl>
+// #include <Stream.idl>
+module CosExternalization {
+                exception InvalidFileNameError{};
+                exception ContextAlreadyRegistered{};
+                interface Stream: ::COSS::CosLifeCycle::LifeCycleObject{
+                        void externalize(
+                                        in ::COSS::CosStream::Streamable theObject);
+                        ::COSS::CosStream::Streamable internalize( 
+                                        in ::COSS::CosLifeCycle::FactoryFinder there)
+                                raises( ::COSS::CosLifeCycle::NoFactory,
+                                        ::COSS::CosStream::StreamDataFormatError );
+                        void begin_context()
+                                raises( ContextAlreadyRegistered);
+                        void end_context(); 
+                        void flush();
+                };
+                interface StreamFactory {
+                        Stream create();
+                };
+                interface FileStreamFactory {
+                        Stream create(
+                                        in string theFileName) 
+                                raises( InvalidFileNameError );
+                };
+};
+
+// CosContainment Module, p 9- 48 CORBAservices, Relationship
+// Service V1.0, 3/94
+
+// #include <Graphs.idl>
+
+module CosContainment {
+
+        interface Relationship :
+                        ::COSS::CosRelationships::Relationship {};
+
+        interface ContainsRole : ::COSS::CosGraphs::Role {};
+
+        interface ContainedInRole : ::COSS::CosGraphs::Role {};
+
+};
+
+//  CosExternalizationContainment Module, p 8-26 CORBAservices,
+// Externalization Service V1.0, 3/94
+
+// #include <Containment.idl>
+// #include <CompoundExternalization.idl>
+
+module CosExternalizationContainment {
+
+        interface Relationship : 
+                        ::COSS::CosCompoundExternalization::Relationship,
+                        ::COSS::CosContainment::Relationship {};
+
+        interface ContainsRole : 
+                        ::COSS::CosCompoundExternalization::Role,
+                        ::COSS::CosContainment::ContainsRole {};
+
+        interface ContainedInRole : 
+                        ::COSS::CosCompoundExternalization::Role,
+                        ::COSS::CosContainment::ContainedInRole {};
+};
+
+// CosReference Module, p 9-50 CORBAservices,
+//  Relationship Service V1.0, 3/94
+
+// #include <Graphs.idl>
+
+module CosReference {
+
+        interface Relationship : 
+                        ::COSS::CosRelationships::Relationship {};
+
+        interface ReferencesRole : ::COSS::CosGraphs::Role {};
+
+        interface ReferencedByRole : ::COSS::CosGraphs::Role {};
+
+};
+
+// CosExternalizationReference Module, p 8-28 CORBAservices, 
+// Externalization Service V1.0, 3/94
+
+// #include <Reference.idl>
+// #include <CompoundExternalization.idl>
+
+module CosExternalizationReference {
+
+        interface Relationship : 
+                        ::COSS::CosCompoundExternalization::Relationship,
+                        ::COSS::CosReference::Relationship {};
+
+        interface ReferencesRole : 
+                        ::COSS::CosCompoundExternalization::Role,
+                        ::COSS::CosReference::ReferencesRole {};
+
+        interface ReferencedByRole : 
+                        ::COSS::CosCompoundExternalization::Role,
+                        ::COSS::CosReference::ReferencedByRole {};
+};
+
+// PIDL for CosTSInteroperation Module, p 10-59 
+// CORBAservices, Transaction Service V1.0, 3/94
+module CosTSInteroperation { // PIDL
+        struct otid_t {
+                long formatID; /*format identifier. 0 is OSI TP */
+                long bequal_length;
+                sequence <octet> tid;
+	};
+        struct TransIdentity {
+                ::COSS::CosTransactions::Coordinator coordinator;
+                ::COSS::CosTransactions::Terminator terminator;
+                otid_t otid;
+	};
+        struct PropagationContext {
+                unsigned long timeout;
+                TransIdentity current;
+                sequence <TransIdentity> parents;
+                any implementation_specific_data;
+        };
+};
+
+// PIDL for CosTSPortability Module, p 10-63 
+// CORBAservices, Transaction Service V1.0, 3/94
+
+module CosTSPortability { // PIDL
+        typedef long ReqId;
+
+        interface Sender {
+                void sending_request(in ReqId id,
+                        out ::COSS::CosTSInteroperation::PropagationContext ctx);
+                void received_reply(in ReqId id,
+                        in ::COSS::CosTSInteroperation::PropagationContext ctx, 
+                        in ::CORBA::Environment env);
+        };
+
+        interface Receiver {
+                void received_request(in ReqId id,
+                        in ::COSS::CosTSInteroperation::PropagationContext ctx);
+                void sending_reply(in ReqId id,
+                        out::COSS::CosTSInteroperation::PropagationContext ctx);
+        };
+};
+
+// CosCompoundLifeCycle Module, p 6-30 CORBAservices,
+// Life Cycle Service V1.0, 3/94
+
+// #include <LifeCycle.idl>
+// #include <Relationships.idl>
+// #include <Graphs.idl>
+
+module CosCompoundLifeCycle {
+        interface OperationsFactory; 
+        interface Operations;
+        interface Node;
+        interface Role;
+        interface Relationship;
+        interface PropagationCriteriaFactory;
+        
+        enum Operation {copy, move, remove};
+
+        struct RelationshipHandle {
+                        Relationship the_relationship;
+                        ::COSS::CosObjectIdentity::ObjectIdentifier constant_random_id;
+        };
+
+        interface OperationsFactory {
+                        Operations create_compound_operations();
+        };
+
+        interface Operations {
+                        Node copy (
+                                                in Node starting_node,
+                                                in ::COSS::CosLifeCycle::FactoryFinder there,
+                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
+                                raises (::COSS::CosLifeCycle::NoFactory,
+                                                ::COSS::CosLifeCycle::NotCopyable,
+                                                ::COSS::CosLifeCycle::InvalidCriteria,
+                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
+                        void move (
+                                                in Node starting_node,
+                                                in ::COSS::CosLifeCycle::FactoryFinder there,
+                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
+                                raises (::COSS::CosLifeCycle::NoFactory,
+                                                ::COSS::CosLifeCycle::NotMovable,
+                                                ::COSS::CosLifeCycle::InvalidCriteria,
+                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
+                        void remove (in Node starting_node)
+                                raises (::COSS::CosLifeCycle::NotRemovable);
+                        void destroy();
+                };
+
+        interface Node : ::COSS::CosGraphs::Node {
+                        exception NotLifeCycleObject {};
+                        void copy_node ( in ::COSS::CosLifeCycle::FactoryFinder there,
+                                                in ::COSS::CosLifeCycle::Criteria the_criteria,
+                                                out Node new_node,
+                                                out ::COSS::CosGraphs::Node::Roles roles_of_new_node)
+                                raises (::COSS::CosLifeCycle::NoFactory,
+                                                ::COSS::CosLifeCycle::NotCopyable,
+                                                ::COSS::CosLifeCycle::InvalidCriteria,
+                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
+                        void move_node (in ::COSS::CosLifeCycle::FactoryFinder there, 
+                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
+                                raises (::COSS::CosLifeCycle::NoFactory,
+                                                ::COSS::CosLifeCycle::NotMovable,
+                                                ::COSS::CosLifeCycle::InvalidCriteria,
+                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
+                        void remove_node ()
+                                raises (::COSS::CosLifeCycle::NotRemovable);
+                        ::COSS::CosLifeCycle::LifeCycleObject get_life_cycle_object()
+                                raises (NotLifeCycleObject);
+                };
+
+        interface Role : ::COSS::CosGraphs::Role {
+                        Role copy_role (in ::COSS::CosLifeCycle::FactoryFinder there, 
+                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
+                                raises (::COSS::CosLifeCycle::NoFactory,
+                                                ::COSS::CosLifeCycle::NotCopyable,
+                                                ::COSS::CosLifeCycle::InvalidCriteria,
+                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
+                        void move_role (in ::COSS::CosLifeCycle::FactoryFinder there, 
+                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
+                                raises (::COSS::CosLifeCycle::NoFactory,
+                                                ::COSS::CosLifeCycle::NotMovable,
+                                                ::COSS::CosLifeCycle::InvalidCriteria,
+                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
+                        ::COSS::CosGraphs::PropagationValue life_cycle_propagation (
+                                                in Operation op,
+                                                in RelationshipHandle rel,
+                                                in ::COSS::CosRelationships::RoleName to_role_name,
+                                                out boolean same_for_all);
+                };
+
+        interface Relationship : 
+                                ::COSS::CosRelationships::Relationship {
+                        Relationship copy_relationship (
+                                                in ::COSS::CosLifeCycle::FactoryFinder there,
+                                                in ::COSS::CosLifeCycle::Criteria the_criteria,
+                                                in ::COSS::CosGraphs::NamedRoles new_roles)
+                                raises (::COSS::CosLifeCycle::NoFactory,
+                                                ::COSS::CosLifeCycle::NotCopyable,
+                                                ::COSS::CosLifeCycle::InvalidCriteria,
+                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
+                        void move_relationship (
+                                                in ::COSS::CosLifeCycle::FactoryFinder there,
+                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
+                                raises (::COSS::CosLifeCycle::NoFactory,
+                                                ::COSS::CosLifeCycle::NotMovable,
+                                                ::COSS::CosLifeCycle::InvalidCriteria,
+                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
+                        ::COSS::CosGraphs::PropagationValue life_cycle_propagation (
+                                                in Operation op,
+                                                in ::COSS::CosRelationships::RoleName from_role_name,
+                                                in ::COSS::CosRelationships::RoleName to_role_name,
+                                                out boolean same_for_all);
+        };
+
+        interface PropagationCriteriaFactory {
+                        ::COSS::CosGraphs::TraversalCriteria create(in Operation op);
+        };
+
+};
+
+//  CosLifeCycleContainment Module, p 6-42 CORBAservices,
+//  Life Cycle Service V1.0, 3/94
+
+// #include <Containment.idl>
+// #include <CompoundLifeCycle.idl>
+
+module CosLifeCycleContainment {
+
+        interface Relationship : 
+                        ::COSS::CosCompoundLifeCycle::Relationship,
+                        ::COSS::CosContainment::Relationship {};
+
+        interface ContainsRole : 
+                        ::COSS::CosCompoundLifeCycle::Role,
+                        ::COSS::CosContainment::ContainsRole {};
+
+        interface ContainedInRole : 
+                        ::COSS::CosCompoundLifeCycle::Role,
+                        ::COSS::CosContainment::ContainedInRole {};
+};
+
+// CosLifeCycleReference Module, p 6-44 CORBAservices,
+// Life Cycle Service V1.0, 3/94
+
+// #include <Reference.idl>
+// #include <CompoundLifeCycle.idl>
+
+module CosLifeCycleReference {
+
+        interface Relationship : 
+                        ::COSS::CosCompoundLifeCycle::Relationship,
+                        ::COSS::CosReference::Relationship {};
+
+        interface ReferencesRole : 
+                        ::COSS::CosCompoundLifeCycle::Role,
+                        ::COSS::CosReference::ReferencesRole {};
+
+        interface ReferencedByRole : 
+                        ::COSS::CosCompoundLifeCycle::Role,
+                        ::COSS::CosReference::ReferencedByRole {};
+};
+
+
+}; // end module COSS
diff --git a/lib/ic/test/ic_SUITE_data/attr.idl b/lib/ic/test/ic_SUITE_data/attr.idl
new file mode 100644
index 0000000000..c74223eca6
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/attr.idl
@@ -0,0 +1,29 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+interface I1 {
+  attribute long a1, a2;
+  attribute char a3;
+};
+
+interface I2 : I1 {
+  attribute short a4;
+  readonly attribute char a5;
+};
+
diff --git a/lib/ic/test/ic_SUITE_data/c_err1.idl b/lib/ic/test/ic_SUITE_data/c_err1.idl
new file mode 100644
index 0000000000..e1bc93dae8
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/c_err1.idl
@@ -0,0 +1,63 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// This file forces the bad_tk_match. This triggers when the type of
+// the expression does not match the declared type of the constant
+//
+
+const long c1		= TRUE;
+const unsigned short c1b= TRUE;
+const boolean c2	= +5;
+const long c3		= 'c';
+const float c5		= 3;
+const unsigned long c6	= -2;	// Maybe not checked in compiler or suite
+
+const boolean c4	= 1 | 2;
+
+
+// Now define some correct constants for use in reference checking
+
+const long		longC = -9;
+const short		shortC = -9;
+const unsigned long	ulongC = 1;
+const unsigned short	ushortC = 0;
+
+const float		floatC = 5.1;
+const double		doubleC = -2.111;
+
+const boolean		boolC = TRUE;
+
+const char		charC = 'f';
+const string		stringC = "hej";
+const string<9>		stringCb = "hejdu";
+
+// Check the reference errors
+
+const long		c19 = floatC;
+const short		c20 = doubleC;
+const unsigned long	c21 = charC;
+const unsigned short	c22 = stringC;
+const float		c23 = stringCb;
+const double		c24 = boolC;
+const boolean		c25 = longC;
+const char		c26 = shortC;
+const string		c27 = ushortC;
+const string<9>		c28 = ulongC;
+const long		c29 = 3+floatC;
diff --git a/lib/ic/test/ic_SUITE_data/c_err2.idl b/lib/ic/test/ic_SUITE_data/c_err2.idl
new file mode 100644
index 0000000000..8dac241c7f
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/c_err2.idl
@@ -0,0 +1,30 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// Checks bad type of operands
+//
+
+
+const long c1		= 1 + TRUE;
+const boolean c3	= TRUE | FALSE | 19.8;
+const long c4		= 1 << TRUE;
+const long c5		= TRUE >> TRUE;
+
+
diff --git a/lib/ic/test/ic_SUITE_data/c_err3.idl b/lib/ic/test/ic_SUITE_data/c_err3.idl
new file mode 100644
index 0000000000..dde9539f6f
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/c_err3.idl
@@ -0,0 +1,28 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// Checks ill-formed expressions (type conflict in operands)
+//
+
+
+const long c1		= 5|TRUE;
+const long c2		= 5&TRUE;
+const long c3		= 5^TRUE;
+
diff --git a/lib/ic/test/ic_SUITE_data/c_norm.idl b/lib/ic/test/ic_SUITE_data/c_norm.idl
new file mode 100644
index 0000000000..6f6ef8ff79
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/c_norm.idl
@@ -0,0 +1,163 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// Check normal values and expressions for constants
+//
+
+// Integer types
+const long		co1 = 077;
+const long		ch1 = 0xf1;
+const long		ch2 = 0XAB;
+const long		c1 = 1;
+const short		c2 = 3;
+const unsigned long	c3 = 1;
+const unsigned short	c4 = 3;
+
+// Unary ops
+const long		c1hb = -0x1;
+const long		c1b = -1;
+const short		c2b = -3;
+const long		c1c = +1;
+const short		c2c = +3;
+// ~ not supported
+
+// Check binary ops
+const long		c1d = 9+1-3;
+const long		c1hd = 9+1-0xf3;
+const short		c2d = 7+3;
+const short		c2e = 7*3;
+const long		c1e = 1 | 7;
+const long		c1f = 7 & 9;
+const long		c1g = (1 | 7) & 9;
+const long		c1h = 1^7;
+
+//floats
+const float		c5 = 1.9;
+const double		c6 = 1.9;
+const float		c5b = -1.9;
+const double		c6b = -1.9;
+
+// Check type operand casting
+const float		c5c = 1/(9+2) * 2;
+const double		c6c = 1.9-1;
+//const double		c6d = 1; // Does not work yet
+
+// Booleans and expressions
+const boolean		c7 = TRUE;
+const boolean		c7b = FALSE;
+const boolean		c7c = TRUE | FALSE;
+const boolean		c7d = TRUE & FALSE;
+const boolean		c7e = TRUE&TRUE | FALSE&TRUE;
+const boolean		c7f = TRUE&TRUE ^ FALSE&TRUE;
+
+// Character and string
+const char		c8 = 'c';
+const char		c8b = '\n';
+const string		c9 = "hej";
+const string<9>		c9b = "hejdu";
+
+
+//
+// Check that value references work
+//
+
+const long		rc1 = c1g;
+const long		rc1h = c1h + 9;
+const short		rc2 = c2;
+const unsigned long	rc3 = c3;
+const unsigned short	rc4 = c4;
+
+
+const float		rc5c = c5c;
+const double		rc6c = c6c;
+const double		rc6d = c6c+1.3;
+
+const boolean		rc7 = c7;
+const boolean		rc7c = c7c | TRUE;
+
+const char		rc8 = c8;
+const char		rc8b = c8b;
+const string		rc9 = c9;
+const string<9>		rc9b = c9b;
+
+
+
+
+//
+// Now check that all typerefs work
+//
+
+typedef long longT;
+typedef short shortT;
+typedef unsigned long ulongT;
+typedef unsigned short ushortT;
+
+typedef float floatT;
+typedef double doubleT;
+
+typedef char charT;
+typedef string stringT;
+
+typedef boolean booleanT;
+
+const longT		cc1 = 1;
+const shortT		cc2 = 3;
+const ::longT		cc1b = -1;
+const ::shortT		cc2b = -3;
+
+const floatT		cc5 = 1.9;
+const doubleT		cc6 = 1.9;
+const floatT		cc5b = -1.9;
+const doubleT		cc6b = -1.9;
+const floatT		cc5c = 1/(9+2) * 2;
+const doubleT		cc6c = 1.9-1;
+
+const booleanT		cc7 = TRUE;
+const booleanT		cc7b = TRUE;
+const booleanT		cc7c = TRUE | FALSE;
+const booleanT		cc7d = TRUE & FALSE;
+const booleanT		cc7e = TRUE&TRUE | FALSE&TRUE;
+
+
+const charT		cc8 = 'c';
+const charT		cc8b = '\n';
+const stringT		cc9 = "hej";
+const stringT		cc9b = "hejdu";
+
+
+//
+// Check value casting
+//
+const long		longC = -9;
+const short		shortC = -9;
+const unsigned long	ulongC = 1;
+const unsigned short	ushortC = 0;
+
+const float		floatC = 5.1;
+const double		doubleC = -2.111;
+
+const long		c20 = shortC;
+const long		c21 = ulongC;
+const long		c22 = ushortC;
+const short		c23 = ushortC;
+const double		c34 = floatC;
+
+
+
diff --git a/lib/ic/test/ic_SUITE_data/enum.idl b/lib/ic/test/ic_SUITE_data/enum.idl
new file mode 100644
index 0000000000..c164e4bf74
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/enum.idl
@@ -0,0 +1,32 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+
+enum E1 {kalle, sune};
+
+enum E2 { el0, el1, el2, el3, el4, el5, el6, el7, el8, el9, el10, el11, el12, el13,
+el14, el15, el16, el17, el18, el19, el20, el21, el22, el23, el24, el25, el26, el27,
+el28, el29, el30, el31, el32, el33, el34, el35, el36, el37, el38, el39, el40, el41,
+el42, el43, el44, el45, el46, el47, el48, el49, el50, el51, el52, el53, el54, el55,
+el56, el57, el58, el59};
+
+
+
+
+
diff --git a/lib/ic/test/ic_SUITE_data/forward.idl b/lib/ic/test/ic_SUITE_data/forward.idl
new file mode 100644
index 0000000000..1e16265af5
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/forward.idl
@@ -0,0 +1,34 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// Check that forward declarations are handled correctly
+//
+
+
+interface i1;
+
+
+interface i1 {
+  typedef long T;
+};
+
+
+interface i1;
+
diff --git a/lib/ic/test/ic_SUITE_data/include.idl b/lib/ic/test/ic_SUITE_data/include.idl
new file mode 100644
index 0000000000..24022bfa1e
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/include.idl
@@ -0,0 +1,30 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+// Check that errors are given with the correct file name reference
+
+#include "include2.idl"
+
+
+typedef T1 T7;
+typedef long T7;
+typedef long T111;
+
+
+
diff --git a/lib/ic/test/ic_SUITE_data/include2.idl b/lib/ic/test/ic_SUITE_data/include2.idl
new file mode 100644
index 0000000000..2f8f7fd62c
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/include2.idl
@@ -0,0 +1,26 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+// Check that errors are given with the correct file name reference
+
+#include "include3.idl"
+
+
+typedef T7 T1;
+
diff --git a/lib/ic/test/ic_SUITE_data/include3.idl b/lib/ic/test/ic_SUITE_data/include3.idl
new file mode 100644
index 0000000000..c5f89c6c63
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/include3.idl
@@ -0,0 +1,25 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+// Check that errors are given with the correct file name reference
+
+typedef T7 T1;
+
+
+
diff --git a/lib/ic/test/ic_SUITE_data/inherit.idl b/lib/ic/test/ic_SUITE_data/inherit.idl
new file mode 100644
index 0000000000..71b79c8748
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/inherit.idl
@@ -0,0 +1,68 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+
+interface I1 {
+  typedef long T1;
+  typedef struct S1 {long a; boolean b;} T2;
+  typedef string StringT, StringT_arr[10];
+
+  T1 op1( in StringT a, inout char b, out StringT_arr c );
+  T2 op2( in char a, inout char b, out StringT_arr c );
+
+  const T1 LongC = 10;
+  const StringT StringC = "Hola bambino";
+
+};
+
+
+interface I2 : I1 {
+  T1 op3( in long a);
+  
+  const long c1 = LongC;
+  const string c2 = StringC;
+};
+
+interface I3 : I1 {};
+
+interface I4 : I3, I2 {};	// Check that branced inherit works
+
+
+
+// Now use cnstants to check that inheritance works as expected
+
+module m1 {
+  interface I1 {
+    typedef long T1;
+    
+    const T1 c1 = 9;
+  };
+
+  interface I2 : I1 {
+    const T1 c2 = c1+5;		// c2 = 14
+    const long c3 = c2+c1+4;	// c3 = 27
+  };
+
+  interface I3 : I2, I1 {
+    const long c1 = 50;		// Overrides I1::c1
+    const T1 c4 = c1+c2+c3;	// c4=91
+    const T1 c5 = I1::c1+c1+c2+c3; // 100
+  };
+};
+
diff --git a/lib/ic/test/ic_SUITE_data/inherit_err.idl b/lib/ic/test/ic_SUITE_data/inherit_err.idl
new file mode 100644
index 0000000000..4cfc3ffbff
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/inherit_err.idl
@@ -0,0 +1,71 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// Ops and attributes must not be redefined (shadowed)
+
+interface I1 {
+  long op1( in long a, inout char b, out boolean c );
+  long op2( in char a, inout char b, out boolean c );
+  attribute long a1, a2;
+  readonly attribute char a3;
+};
+
+interface I2 : I1 {
+  long op1( in float a, inout char b, out boolean c );
+  long op2( in char a, inout char b, out boolean c );
+  attribute long a1, a2;
+  readonly attribute char a3;
+};
+
+interface I3 : I1 {
+  long op3 (in string<19> b);
+};
+
+
+interface I4 : I3 {
+  long op1( in float a, inout char b, out boolean c );
+  long op2( in char a, inout char b, out boolean c );
+  attribute long a1, a2;
+  readonly attribute char a3;
+  
+  long op3 (in string<19> b);
+};
+
+
+interface I11 {
+  long op1( in float a, inout char b, out boolean c );
+  long op2( in char a, inout char b, out boolean c );
+  attribute long a1, a2;
+  readonly attribute char a3;
+};
+
+
+
+interface I5 : I1, I11 {};
+
+interface I6 : I1 {
+  const long op1=0;
+  const long op2=0;
+  const long a1=0;
+  const long a2=0;
+  const long a3=0;
+};
+
+
diff --git a/lib/ic/test/ic_SUITE_data/inherit_warn.idl b/lib/ic/test/ic_SUITE_data/inherit_warn.idl
new file mode 100644
index 0000000000..502bfac8d4
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/inherit_warn.idl
@@ -0,0 +1,64 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// Checks that shadow warnings comes out as expected
+//
+
+
+interface I1 {
+  typedef long T1;
+  typedef struct S1 {long a; boolean b;} T2;
+  typedef string StringT, StringT_arr[10];
+
+  T1 op1( in StringT a, inout char b, out StringT_arr c );
+  T2 op2( in char a, inout char b, out StringT_arr c );
+  
+  const T1 LongC = 10;
+  const StringT StringC = "Hola bambino";
+
+};
+
+
+interface I2 : I1 {
+  typedef char T1;		// Shadows I1::T1
+  const boolean StringC = FALSE; // shadows I1::StringC
+
+  T1 op3( in long a);
+  
+  const long c1 = LongC;
+  const boolean c2 = StringC;
+};
+
+interface I3 : I2 {};		// More shadows
+
+interface I4 : I1 {
+  T1 op4();
+  const T1 c2 = 66;
+};
+
+interface I5 : I4 {
+  typedef string T1;		// Shadows I1::T1
+  const char LongC = 'a';	// Shadows I1::LongC
+};
+
+
+interface I6 : I4, I3 {
+};
+
diff --git a/lib/ic/test/ic_SUITE_data/mult_ids.idl b/lib/ic/test/ic_SUITE_data/mult_ids.idl
new file mode 100644
index 0000000000..46deaa9f55
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/mult_ids.idl
@@ -0,0 +1,92 @@
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+//
+// Check that multiply defined identifiers are detected
+//
+
+typedef long T1;
+typedef long T1;
+typedef long T2;
+exception T2 {};
+
+
+//Exceptions
+exception Exc1 {};
+exception Exc1 {};
+
+
+// Enums
+enum E1 {kalle};
+enum E1 {kalle};
+enum E2 {kalle, sune, kalle};
+
+
+// Structs
+struct S1 {long a;};
+struct S1 {long a;};
+struct S2 {long a; short a;};
+struct S3 {long a,b; short a;};
+struct S4 {long a,a; short a;};
+
+
+// Constants
+const long c1 = 0;
+const long c1 = 0;
+
+
+// Interfaces
+
+interface i1 {};
+interface i1 {};
+
+interface i2 {
+  attribute long a1;
+  attribute long a1;
+};
+
+interface i3 {
+  attribute long a1, a2;
+  attribute long a2;
+};
+
+interface i4 {
+  attribute long a1, a1;
+};
+
+interface i5 {
+  long op1();
+  long op1();
+
+  long op2(in long a, inout char a);
+};
+
+
+// Unions 
+
+union U1 switch (long) {case 1: long a;};
+union U1 switch (long) {case 1: long a;};
+
+union U2 switch (long) {
+case 1: long a;
+default: char a;
+};
+
+
+
+
+
diff --git a/lib/ic/test/ic_SUITE_data/nasty.idl b/lib/ic/test/ic_SUITE_data/nasty.idl
new file mode 100644
index 0000000000..15fd523c0f
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/nasty.idl
@@ -0,0 +1,60 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// Checks nasty name collisions
+//
+
+typedef string T;
+
+
+#define nasty01 version
+#define nasty02 preproc
+#define nasty03 pragma
+#define nasty04 compile
+#define nasty05 if
+#define nasty06 receive
+#define nasty07 foldr
+#define nasty08 length
+#define nasty09 ID
+
+interface I1 {
+  attribute T nasty01;
+  attribute T nasty02;
+  attribute T nasty03;
+  attribute T nasty04;
+  attribute T nasty05;
+  attribute T nasty06;
+  attribute T nasty07;
+  attribute T nasty08;
+  attribute T nasty09;
+};
+
+interface I2 {
+  T nasty01();
+  T nasty02();
+  T nasty03();
+  T nasty04();
+  T nasty05();
+  T nasty06();
+  T nasty07();
+  T nasty08();
+  T nasty09();
+};
+
diff --git a/lib/ic/test/ic_SUITE_data/one.idl b/lib/ic/test/ic_SUITE_data/one.idl
new file mode 100644
index 0000000000..99281d6079
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/one.idl
@@ -0,0 +1,29 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+// Test oneway operations
+
+interface I1 {
+  long op1(in char a, inout boolean b, out string c);
+  oneway void op2(in char a, in boolean b, in string c);
+  oneway void op3();
+};
+
+
+  
diff --git a/lib/ic/test/ic_SUITE_data/one_followed.idl b/lib/ic/test/ic_SUITE_data/one_followed.idl
new file mode 100644
index 0000000000..da8ee74e25
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/one_followed.idl
@@ -0,0 +1,54 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+
+// Test oneway operations followed by other operations
+
+interface I1 {
+  oneway void op1();
+  oneway void op2(in char a, in boolean b, in string c);
+  long op3(in char a, inout boolean b, out string c);
+};
+
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/ic/test/ic_SUITE_data/one_out.idl b/lib/ic/test/ic_SUITE_data/one_out.idl
new file mode 100644
index 0000000000..65f177ff22
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/one_out.idl
@@ -0,0 +1,28 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+// Test oneway operations not using in out params
+
+interface I1 {
+  oneway void op1(in char a, inout boolean b, in string c);
+  oneway void op2(in char a, out boolean b, in string c);
+};
+
+
+  
diff --git a/lib/ic/test/ic_SUITE_data/one_raises.idl b/lib/ic/test/ic_SUITE_data/one_raises.idl
new file mode 100644
index 0000000000..8290877363
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/one_raises.idl
@@ -0,0 +1,32 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+// Test oneway operations not using in out params
+
+exception hell {boolean burn; unsigned long for_how_long;};
+exception high_water {long mark;};
+
+interface I1 {
+  oneway void op1(in char a) raises (hell);
+  oneway void op2(in char a) raises (hell);
+  oneway void op3() raises (hell, high_water);
+};
+
+
+  
diff --git a/lib/ic/test/ic_SUITE_data/one_void.idl b/lib/ic/test/ic_SUITE_data/one_void.idl
new file mode 100644
index 0000000000..e1d51c7abb
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/one_void.idl
@@ -0,0 +1,30 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+// Test oneway operations not using in out params
+
+typedef long T;
+
+interface I1 {
+  oneway char op1(in char a);
+  oneway T op2(in char a);
+};
+
+
+  
diff --git a/lib/ic/test/ic_SUITE_data/raises_reg.idl b/lib/ic/test/ic_SUITE_data/raises_reg.idl
new file mode 100644
index 0000000000..d4458811dc
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/raises_reg.idl
@@ -0,0 +1,52 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#ifndef _RAISES_REG_IDL
+#define _RAISES_REG_IDL
+ 
+module Raises_RegModule {
+  
+  exception Exception_1 {};
+
+  exception Exception_2 {};
+ 
+  interface R_R {
+ 
+    void op()
+      raises(Raises_RegModule::Exception_1,Raises_RegModule::Exception_2);
+ 
+  };
+ 
+};
+ 
+#endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/ic/test/ic_SUITE_data/struct.idl b/lib/ic/test/ic_SUITE_data/struct.idl
new file mode 100644
index 0000000000..337ee170e3
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/struct.idl
@@ -0,0 +1,53 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+
+struct S1 {
+  long a;
+  char b;
+  string<9> s;
+};
+
+struct S2 {
+  long a;
+  struct S3 {
+    long a;
+    short b, b1;
+    char c;
+  } b;
+  sequence <S1> c, c2, c3, c4, c5, c6, c7;
+};
+
+
+// Check that structs are detected down in other types
+
+
+typedef struct s4 {long a;} T1;
+union U1 switch (long) {
+case 1: 
+  struct S5 {unsigned short a;} a;
+case 2: 
+  union U2 switch (char) {
+  case 'a': 
+    boolean a;
+  case 'b':
+    struct s6 {long a; boolean b;} c;
+  } b;
+};
+
diff --git a/lib/ic/test/ic_SUITE_data/syntax1.idl b/lib/ic/test/ic_SUITE_data/syntax1.idl
new file mode 100644
index 0000000000..83c7de7943
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/syntax1.idl
@@ -0,0 +1,28 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// Check syntax errors
+//
+
+
+typedef long T1 _;
+
+
+
diff --git a/lib/ic/test/ic_SUITE_data/syntax2.idl b/lib/ic/test/ic_SUITE_data/syntax2.idl
new file mode 100644
index 0000000000..10498206c1
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/syntax2.idl
@@ -0,0 +1,27 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+struct S2 {
+  long a_arr[99];
+  struct S3 {
+    long a;_arr[99]
+    boolean b_arr[99];
+  } b;
+};
+
+
diff --git a/lib/ic/test/ic_SUITE_data/syntax3.idl b/lib/ic/test/ic_SUITE_data/syntax3.idl
new file mode 100644
index 0000000000..69ab6b9783
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/syntax3.idl
@@ -0,0 +1,20 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+typdef long T1;
+
diff --git a/lib/ic/test/ic_SUITE_data/syntax4.idl b/lib/ic/test/ic_SUITE_data/syntax4.idl
new file mode 100644
index 0000000000..077a251729
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/syntax4.idl
@@ -0,0 +1,23 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+union U1 switch (long) {
+case 1: long a;
+2: short b;
+};
+
diff --git a/lib/ic/test/ic_SUITE_data/syntax5.idl b/lib/ic/test/ic_SUITE_data/syntax5.idl
new file mode 100644
index 0000000000..10af9fc18c
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/syntax5.idl
@@ -0,0 +1,22 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+union U1 switch (enum E1 {kalle, sune}) {
+case kalle: long a;
+sune: short b;
+};
diff --git a/lib/ic/test/ic_SUITE_data/syntax6.idl b/lib/ic/test/ic_SUITE_data/syntax6.idl
new file mode 100644
index 0000000000..dc15704d94
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/syntax6.idl
@@ -0,0 +1,20 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+constant long c1 = 0;
diff --git a/lib/ic/test/ic_SUITE_data/type.idl b/lib/ic/test/ic_SUITE_data/type.idl
new file mode 100644
index 0000000000..67e1d502bd
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/type.idl
@@ -0,0 +1,190 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// Check all types in IDL
+//
+
+typedef long T01;
+typedef unsigned long T02;
+typedef short T03;
+typedef unsigned short T04;
+typedef float T05;
+typedef double T06;
+typedef char T07;
+typedef boolean T08;
+typedef octet T09;
+typedef any T10;
+typedef Object T11;
+typedef T01 T12;
+
+// Template types
+typedef sequence <long> T21;
+typedef sequence <unsigned long> T22;
+typedef sequence <short, 2> T23;
+typedef sequence <unsigned short, 6> T24;
+typedef sequence <float, 12> T25;
+typedef sequence <double> T26;
+typedef sequence <char, 1> T27;
+typedef sequence <boolean> T28;
+typedef sequence <octet, 9> T29;
+typedef sequence <any> T30;
+typedef sequence <Object,2 > T31;
+typedef sequence <T01> T32;
+typedef sequence <sequence <sequence <T32> > > T33;
+
+struct S1 {
+  long a;
+  boolean b;
+};
+
+struct S2 {
+  long a;
+  struct S3 {
+    long a;
+    boolean b;
+  } b;
+};
+
+union U1 switch (enum E1 {kalle1, sune1}) {
+case kalle1: long a;
+default: boolean b;
+case sune1: octet c;
+};
+
+union U2 switch (enum E2 {kalle2, sune2}) {
+case kalle2: long a;
+default: struct S4 { long a; short  b;} b;
+case sune2: octet c;
+};
+
+// Typedefs of above types
+
+typedef struct S11 {
+  long a;
+  boolean b;
+} T41;
+
+typedef struct S21 {
+  long a;
+  struct S3 {
+    long a;
+    boolean b;
+  } b;
+} T42;
+
+typedef union U11 switch (enum E3 {kalle3, sune3}) {
+case kalle3: long a;
+default: boolean b;
+case sune3: octet c;
+} T43;
+
+typedef union U21 switch (enum E4 {kalle4, sune4}) {
+case kalle4: long a;
+default: struct S4 { long a; short  b;} b;
+case sune4: octet c;
+} T44;
+
+
+
+
+// Array versions
+
+typedef long T01_arr[99];
+typedef unsigned long T02_arr[99];
+typedef short T03_arr[99];
+typedef unsigned short T04_arr[99];
+typedef float T05_arr[99];
+typedef double T06_arr[99];
+typedef char T07_arr[99];
+typedef boolean T08_arr[99];
+typedef octet T09_arr[99];
+typedef any T10_arr[99];
+typedef Object T11_arr[99];
+typedef T01 T12_arr[99];
+
+typedef sequence <long> T21_arr[99];
+typedef sequence <unsigned long> T22_arr[99];
+typedef sequence <short, 2> T23_arr[99];
+typedef sequence <unsigned short, 6> T24_arr[99];
+typedef sequence <float, 12> T25_arr[99];
+typedef sequence <double> T26_arr[99];
+typedef sequence <char, 1> T27_arr[99];
+typedef sequence <boolean> T28_arr[99];
+typedef sequence <octet, 9> T29_arr[99];
+typedef sequence <any> T30_arr[99];
+typedef sequence <Object,2 > T31_arr[99];
+typedef sequence <T01> T32_arr[99];
+typedef sequence <sequence <sequence <T32> > > T33_arr[99];
+
+struct S12 {
+  long a;
+  boolean b_arr[99];
+};
+
+struct S22 {
+  long a_arr[99];
+  struct S3 {
+    long a_arr[99];
+    boolean b_arr[99];
+  } b;
+};
+
+union U12 switch (enum E12 {kalle12, sune12}) {
+case kalle12: long a_arr[99];
+default: boolean b;
+case sune12: octet c;
+};
+
+union U22 switch (enum E22 {kalle22, sune22}) {
+case kalle22: long a;
+default: struct S4 { long a; short  b;} b_arr[99];
+case sune22: octet c;
+};
+
+// Typedefs of above types
+
+typedef struct S13 {
+  long a_arr[99];
+  boolean b;
+} T41_arr[99];
+
+typedef struct S23 {
+  long a;
+  struct S3 {
+    long a;
+    boolean b_arr[99];
+    char c;
+  } b;
+} T42_arr[99];
+
+typedef union U13 switch (enum E13 {kalle13, sune13}) {
+case kalle13: long a;
+default: boolean b_arr[99];
+case sune13: octet c;
+} T43_arr[99];
+
+typedef union U23 switch (enum E23 {kalle23, sune23}) {
+case kalle23: long a_arr[99];
+default: struct S4 { long a; short  b;} b_arr[99];
+case sune23: octet c_arr[99];
+} T44_arr[99];
+
+
+
diff --git a/lib/ic/test/ic_SUITE_data/typeid.idl b/lib/ic/test/ic_SUITE_data/typeid.idl
new file mode 100644
index 0000000000..6e99f4a50d
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/typeid.idl
@@ -0,0 +1,28 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+interface I1 {};
+
+module M1 { interface I1 {};};
+
+module M2 { module M1 { interface I1 {};};};
+
+module M3 { module M2 { module M1 { interface I1 {};};};};
+
+
diff --git a/lib/ic/test/ic_SUITE_data/u_case_mult.idl b/lib/ic/test/ic_SUITE_data/u_case_mult.idl
new file mode 100644
index 0000000000..3c30e144d8
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/u_case_mult.idl
@@ -0,0 +1,54 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+// Check that case labels are not duplicated
+
+union U1 switch (long) {
+case 1 : long a;
+case 1 : short b;
+};
+
+union U2 switch (char) {
+case 'c' : long a;
+case 'c' : short b;
+};
+
+union U2b switch (char) {
+case 'c' : 
+case 'c' : long a;
+case 'e': long b;
+case 'c': long c;
+};
+
+union U3 switch (enum E1 {kalle, kula}) {
+case kula : long a;
+case kula : short b;
+};
+
+union U4 switch (boolean) {
+case TRUE : long a;
+case TRUE : short b;
+};
+
+union U5 switch (boolean) {
+case TRUE : long a;
+default: short p;
+default: short pp;
+};
+
diff --git a/lib/ic/test/ic_SUITE_data/u_default.idl b/lib/ic/test/ic_SUITE_data/u_default.idl
new file mode 100644
index 0000000000..e5d94a5e54
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/u_default.idl
@@ -0,0 +1,51 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// Checking that default labels are correct in TK
+//
+
+interface i1 {
+  union U1 switch (long) {
+  default: long a;
+  case 1: case 2: long b;
+  };
+
+  union U2 switch (long) {
+  case 0: default: long a;
+  case 1: case 2: long b;
+  };
+
+  union U3 switch (long) {
+  case -1: long aa;
+  case 0: default: long a;
+  case 1: case 2: long b;
+  };
+  
+  union U4 switch (long) {
+  case -1: long aa;
+  case 0: long a;
+  case 1: case 2: long b;
+  };
+  
+  U1 op0();
+  U2 op1();
+  U3 op2();
+  U4 op3();
+};
diff --git a/lib/ic/test/ic_SUITE_data/u_mult.idl b/lib/ic/test/ic_SUITE_data/u_mult.idl
new file mode 100644
index 0000000000..b916861eec
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/u_mult.idl
@@ -0,0 +1,61 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+
+// Check multiply defined declarators
+
+enum E2 {kal, kula, E1};	// legal, but used below
+
+// Now check that declarator a is multiply defined in all unions below
+union U0 switch (long) {
+case 0: long a;
+case 1: short a;
+};
+union U00 switch (char) {
+case 'c' : long a;
+case 'f' : char c;
+case 'b' : short a;
+};
+union U000 switch (boolean) {
+case TRUE: long a;
+case FALSE: short a;
+};
+union U0000 switch (E2) {
+case kal: long a;
+case kula: short a;
+};
+
+
+
+
+// Check that enum name duplication is found.
+
+union U1 switch (enum E1 {kalle, kula, E1}) {
+case E1	: long a;	// legal
+case kalle	: short E1;	// illegal
+};
+
+
+// This is legal, but ended up here anyway
+
+union U2 switch(::E2) {
+case kal	: long a;
+case kula	: short b;
+default		: boolean E1;
+};
diff --git a/lib/ic/test/ic_SUITE_data/u_norm.idl b/lib/ic/test/ic_SUITE_data/u_norm.idl
new file mode 100644
index 0000000000..e23796b8ca
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/u_norm.idl
@@ -0,0 +1,63 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+
+union U1 switch (long) {
+case 1: long a;
+case 2: case 3: short b;
+};
+
+
+union U2 switch (unsigned short) {
+case 10: boolean a;
+case 188: char b;
+default: string c;
+};
+
+
+union U3 switch (enum E1 {kalle, kula, boll}) {
+case kalle: long a;
+case kula: U2 b;
+};
+
+enum E2 {Cissi, Anders};
+
+union U4 switch (::E2) {
+case Cissi: U1 a;
+default: case Anders: unsigned long b;
+};
+
+union U5 switch(char) {
+case 'e': long a;
+case 'b': case 'f': char b;
+default: struct S {long a; boolean b;} c;
+};
+
+
+// Now check that references can be used as case values
+
+const long c1 = 9;
+const long c2 = 10;
+
+union U6 switch (long) {
+case c1: boolean a;
+case ::c2: boolean b;
+};
+
+
diff --git a/lib/ic/test/ic_SUITE_data/u_type.idl b/lib/ic/test/ic_SUITE_data/u_type.idl
new file mode 100644
index 0000000000..44e3326305
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/u_type.idl
@@ -0,0 +1,82 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+
+//
+// Check that case values match declared discriminator type
+//
+
+
+const long	longC	= 0;
+const short	shortC	= 0;
+const char	charC	= 'c';
+const string	stringC	= "Yacht";
+
+enum E1 {kalle, kula};
+
+union U1 switch (long) {
+case 'c'	: long a;
+case TRUE	: long b;
+case stringC	: long d;
+case kalle	: long f;
+};
+
+union U2 switch (unsigned long) {
+case 'c'	: long a;
+case TRUE	: long b;
+case stringC	: long d;
+case kalle	: long f;
+};
+
+union U3 switch (short) {
+case 'c'	: long a;
+case TRUE	: long b;
+case stringC	: long d;
+case kalle	: long f;
+};
+
+union U4 switch (unsigned short) {
+case 'c'	: long a;
+case TRUE	: long b;
+case stringC	: long d;
+case kalle	: long f;
+};
+
+union U5 switch (char) {
+case TRUE	: long b;
+case stringC	: long d;
+case shortC	: long e;
+case kalle	: long f;
+};
+
+
+union U6 switch (E1) {
+case 'c'	: long a;
+case TRUE	: long b;
+case stringC	: long d;
+case shortC	: long e;
+};
+
+union U7 switch (enum E2 {ja, nej, kanske}) {
+case 'c'	: long a;
+case TRUE	: long b;
+case stringC	: long d;
+case shortC	: long e;
+};
+
diff --git a/lib/ic/test/ic_SUITE_data/undef_id.idl b/lib/ic/test/ic_SUITE_data/undef_id.idl
new file mode 100644
index 0000000000..01a35c4ef8
--- /dev/null
+++ b/lib/ic/test/ic_SUITE_data/undef_id.idl
@@ -0,0 +1,63 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1997-2010. 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%
+
+//
+// Check that undefined ids are detected
+//
+
+typedef T7 T1;
+
+const char c1 = ::c0;
+const T01 c2 = 'h';
+const T7 c3 = 9;
+
+interface i1 {
+  T17 op();
+  long op2( in T7 a);
+  attribute T7 a1, a2;
+  readonly attribute T17 a3;
+};
+
+union U1 switch (long) {
+case 1: long a;
+case ::g : short b;
+};
+
+union U2 switch (enum E1 {kalle, kula}) {
+case kula1: long a;
+case kalle : short b;
+};
+
+union U3 switch (long) {
+case kula2: long a;
+case ::E3::kalle : short b;
+case ::E4::kalle : short c;
+};
+
+enum E2 {kalle2, kula2};
+
+union U4 switch (E2) {
+case kula1: long a;
+case kula1: long b;
+case c3: short c;
+};
+
+
+
+
diff --git a/lib/ic/test/ic_be_SUITE.erl b/lib/ic/test/ic_be_SUITE.erl
new file mode 100644
index 0000000000..3693d22cd2
--- /dev/null
+++ b/lib/ic/test/ic_be_SUITE.erl
@@ -0,0 +1,89 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+%%
+%%%----------------------------------------------------------------------
+%%% Purpose : Test suite for the backends of the IDL compiler
+%%%----------------------------------------------------------------------
+
+-module(ic_be_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,plain/1]).     
+
+
+-define(OUT(X), filename:join([?config(priv_dir, Config), gen, to_list(X)])).
+
+
+%% Top of cases
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [plain].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+
+plain(doc) ->
+    ["Checking code for the plain backend."];
+plain(suite) -> [];
+plain(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(slask),
+    File = filename:join(DataDir, plain),
+    
+    ?line ok = ic:gen(File,stdopts(OutDir)++[{be,erl_plain}]),
+    
+    ok.
+
+
+
+
+%%--------------------------------------------------------------------
+%%
+%% Utilities
+
+
+stdopts(OutDir) ->
+    [{outdir, OutDir}, {maxerrs, infinity}].
+
+
+
+
+
+to_list(X) when is_atom(X) -> atom_to_list(X);
+to_list(X) -> X.
+
diff --git a/lib/ic/test/ic_be_SUITE_data/plain.idl b/lib/ic/test/ic_be_SUITE_data/plain.idl
new file mode 100644
index 0000000000..ee0a995807
--- /dev/null
+++ b/lib/ic/test/ic_be_SUITE_data/plain.idl
@@ -0,0 +1,33 @@
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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 m {
+
+  struct s {
+    long x;
+    long y;
+  };
+
+  interface i {
+
+    void foo( in s a, out short b );
+ 
+ };
+
+};
+
diff --git a/lib/ic/test/ic_pp_SUITE.erl b/lib/ic/test/ic_pp_SUITE.erl
new file mode 100644
index 0000000000..27d404239f
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE.erl
@@ -0,0 +1,622 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+%%
+%%----------------------------------------------------------------------
+%% Purpose : Test suite for the IDL preprocessor
+%%----------------------------------------------------------------------
+
+-module(ic_pp_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+
+
+%% Standard options to the ic compiler, NOTE unholy use of OutDir
+
+-define(OUT(X), filename:join([?config(priv_dir, Config), gen, to_list(X)])).
+-define(GCC, "g++").
+-define(GCC_VER, "2.95.3").
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([arg_norm/1]).
+-export([cascade_norm/1]).
+-export([comment_norm/1]).
+-export([concat_norm/1]).
+-export([define_norm/1]).
+-export([if_norm/1]).
+-export([if_zero/1]).
+-export([misc_norm/1]).
+-export([improp_nest_constr_norm/1]).
+-export([inc_norm/1]).
+-export([line_norm/1]).
+-export([nopara_norm/1]).
+-export([predef_norm/1]).
+-export([predef_time_norm/1]).
+-export([self_ref_norm/1]).
+-export([separate_norm/1]).
+-export([swallow_sc_norm/1]).
+-export([unintended_grp_norm/1]).
+-export([cases/0, init_per_suite/1, end_per_suite/1]).
+
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [{arg, [], [arg_norm]}, {cascade, [], [cascade_norm]},
+     {comment, [], [comment_norm]},
+     {concat, [], [concat_norm]},
+     {define, [], [define_norm]}, {inc, [], [inc_norm]},
+     {improp_nest_constr, [], [improp_nest_constr_norm]},
+     {misc, [], [misc_norm]}, {line, [], [line_norm]},
+     {nopara, [], [nopara_norm]},
+     {predef, [], [predef_norm]},
+     {predef_time, [], [predef_time_norm]},
+     {self_ref, [], [self_ref_norm]},
+     {separate, [], [separate_norm]},
+     {swallow_sc, [], [swallow_sc_norm]},
+     {unintended_grp, [], [unintended_grp_norm]},
+     {'if', [],[if_norm, if_zero]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+init_per_suite(Config) ->
+    if
+	is_list(Config) ->
+	    case os:type() of
+		{win32, _} ->
+		    {skipped, "Very unplesent to run on windows"};
+		_ ->
+		    check_gcc(Config)
+	    end;
+	true ->
+	    exit("Config not a list")
+    end.
+
+check_gcc(Config) ->
+    case os:find_executable(?GCC) of
+	false ->
+	    {skipped, 
+	     lists:flatten(io_lib:format("Can not run without ~s in path", 
+					 [?GCC]))};
+	_ ->
+	    case trim(os:cmd(?GCC++" --version")) of
+		?GCC_VER++[] -> 
+		    Config;
+		?GCC_VER++[D|_] when is_integer(D), D>=$0, D=<$9 -> 
+		    fail_gcc(?GCC_VER++[D]);
+		?GCC_VER++_ ->
+		    Config;
+		Ver ->
+		    fail_gcc(Ver)
+	    end
+    end.
+
+fail_gcc(Ver) ->
+    {skipped, lists:flatten(io_lib:format("Need ~s v~s, not ~s", 
+					  [?GCC, ?GCC_VER, Ver]))}.
+
+trim(S) -> lists:reverse(skip_white(lists:reverse(skip_white(S)))).
+
+skip_white([$\s|T]) -> skip_white(T);
+skip_white([$\n|T]) -> skip_white(T);
+skip_white([$\r|T]) -> skip_white(T);
+skip_white([$\t|T]) -> skip_white(T);
+skip_white(L) -> L.
+    
+
+end_per_suite(Config) ->
+    Config.
+
+
+cases() -> 
+    [{group, arg}, {group, cascade}, {group, comment},
+     {group, concat}, {group, define}, {group, misc}, {group, 'if'},
+     {group, improp_nest_constr}, {group, inc},
+     {group, line}, {group, nopara}, {group, predef},
+     {group, predef_time}, {group, self_ref},
+     {group, separate}, {group, swallow_sc},
+     {group, unintended_grp}].
+    
+
+
+%%--------------------------------------------------------------------
+%% arg
+%%--------------------------------------------------------------------
+
+
+arg_norm(doc) -> ["Checks arguments for #define."];
+arg_norm(suite) -> [];
+arg_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(arg_norm),
+    File = filename:join(DataDir, arg),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% cascade
+%%--------------------------------------------------------------------
+
+
+cascade_norm(doc) -> ["Check cascade #define."];
+cascade_norm(suite) -> [];
+cascade_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(cascade_norm),
+    File = filename:join(DataDir, cascade),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% comment
+%%--------------------------------------------------------------------
+
+
+comment_norm(doc) -> ["Check comments."];
+comment_norm(suite) -> [];
+comment_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(comment_norm),
+    File = filename:join(DataDir, comment),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% concat
+%%--------------------------------------------------------------------
+
+
+concat_norm(doc) -> ["Check concatinations, i.e ## ."];
+concat_norm(suite) -> [];
+concat_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(concat_norm),
+    File = filename:join(DataDir, concat),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% define
+%%--------------------------------------------------------------------
+
+
+define_norm(doc) -> ["Check misceleaneous #define."];
+define_norm(suite) -> [];
+define_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(define_norm),
+    File = filename:join(DataDir, define),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% if
+%%--------------------------------------------------------------------
+
+if_norm(doc) -> ["Check #if, #elif, and #endif. ."];
+if_norm(suite) -> [];
+if_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(if_norm),
+    File = filename:join(DataDir, 'if'),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+if_zero(doc) -> ["Check #if 0"];
+if_zero(suite) -> [];
+if_zero(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(if_zero),
+    File = filename:join(DataDir, if_zero),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% inc
+%%--------------------------------------------------------------------
+
+
+inc_norm(doc) -> ["Check #include."];
+inc_norm(suite) -> [];
+inc_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(inc_norm),
+    File = filename:join(DataDir, inc),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+
+%%--------------------------------------------------------------------
+%% improp_nest_constr
+%%--------------------------------------------------------------------
+
+
+improp_nest_constr_norm(doc) -> ["Check improperly nested constructs."];
+improp_nest_constr_norm(suite) -> [];
+improp_nest_constr_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(improp_nest_constr_norm),
+    File = filename:join(DataDir, improp_nest_constr),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% misc
+%%--------------------------------------------------------------------
+
+
+misc_norm(doc) -> ["Misceleaneous checks."];
+misc_norm(suite) -> [];
+misc_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(misc_norm),
+    File = filename:join(DataDir, misc),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% line
+%%--------------------------------------------------------------------
+
+
+line_norm(doc) -> ["Checks #line."];
+line_norm(suite) -> [];
+line_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(line_norm),
+    File = filename:join(DataDir, line),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% nopara
+%%--------------------------------------------------------------------
+
+
+nopara_norm(doc) -> ["Checks #define with no parameters."];
+nopara_norm(suite) -> [];
+nopara_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(nopara_norm),
+    File = filename:join(DataDir, nopara),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% predef
+%%--------------------------------------------------------------------
+
+
+predef_norm(doc) -> ["Checks predefined macros. Note: not __TIME__ and __DATE__."];
+predef_norm(suite) -> [];
+predef_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(predef_norm),
+    File = filename:join(DataDir, predef),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% predef_time
+%%--------------------------------------------------------------------
+
+
+predef_time_norm(doc) -> ["Checks the predefined macros __TIME__ and __DATE__."];
+predef_time_norm(suite) -> [];
+predef_time_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(predef_time_norm),
+    File = filename:join(DataDir, predef_time),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% self_ref
+%%--------------------------------------------------------------------
+
+
+self_ref_norm(doc) -> ["Checks self referring macros."];
+self_ref_norm(suite) -> [];
+self_ref_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(self_ref_norm),
+    File = filename:join(DataDir, self_ref),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% separate
+%%--------------------------------------------------------------------
+
+
+separate_norm(doc) -> ["Checks separete expansion of macro arguments."];
+separate_norm(suite) -> [];
+separate_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(separate_norm),
+    File = filename:join(DataDir, separate),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% swallow_sc
+%%--------------------------------------------------------------------
+
+
+swallow_sc_norm(doc) -> ["Checks swallowing an undesirable semicolon."];
+swallow_sc_norm(suite) -> [];
+swallow_sc_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(swallow_sc_norm),
+    File = filename:join(DataDir, swallow_sc),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% unintended_grp
+%%--------------------------------------------------------------------
+
+
+unintended_grp_norm(doc) -> ["Checks unintended grouping of arithmetic."];
+unintended_grp_norm(suite) -> [];
+unintended_grp_norm(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    _OutDir = ?OUT(unintended_grp_norm),
+    File = filename:join(DataDir, unintended_grp),
+    
+    ?line ok = test_file(File, DataDir),
+    ok.
+
+
+
+
+
+test_file(FileT, DataDir) ->
+    case test_file_1(FileT, DataDir) of
+	ok -> ok;
+	Chars ->
+	    io:put_chars(Chars),
+	    {error,{FileT,DataDir}}
+    end.
+
+test_file_1(FileT, DataDir) ->
+    Tok = string:tokens(FileT, "/"),
+    FileName = lists:last(Tok),
+    File = FileT++".idl",
+
+    ?line test_server:format("File  ~p~n",[File]),
+    ?line test_server:format("FileName  ~p~n",[FileName]),
+
+    Flags = "-I"++DataDir,
+
+    ?line test_server:format("Flags  ~p~n",[Flags]),
+
+    ?line Erl = pp_erl(File, Flags),
+    ?line Gcc = pp_gcc(File, Flags),
+
+    ?line case Erl of
+	{error,_ErlError} ->
+	    ?line test_server:format("Internal_pp Result ~n==================~n~p~n~n",[Erl]);
+	{warning, _ErlWar} ->
+	    ?line test_server:format("Internal_pp Result ~n==================~n~p~n~n",[Erl]);
+	_ ->
+	    ?line test_server:format("Internal_pp Result ~n==================~n~s~n~n",[Erl])
+    end,
+    
+    ?line case Gcc of
+	{error,GccError} ->
+	    Error = string:tokens(GccError, "\n"),
+	    ?line test_server:format(?GCC" Result ~n==========~n~p~n~n",
+				     [Error]);
+	_ ->
+	    ?line test_server:format(?GCC" Result ~n==========~n~s~n~n",[Gcc])
+    end,
+
+
+
+    ?line case {Erl,Gcc} of
+	{{warning,W}, {error,X}} ->
+	    ?line case is_ok(W,X) of
+		yes ->
+		    ok;
+		no ->
+		    io_lib:format("Internal_pp found Warning = ~p ~n"
+				  ?GCC" found Error = ~p~n",[W,X])
+	    end;
+	   
+
+	{{warning,W}, _} ->
+	    io_lib:format(?GCC" did not find warnings while ~n"
+			  "Internal_pp found the following Warning = ~p~n",[W]);
+
+	{{error,E}, {error,X}} ->
+	    ?line case is_ok(E,X) of
+		yes ->
+		    ok;
+		no ->
+		    io_lib:format("Internal_pp found Error = ~p ~n"
+				  ?GCC" found Error = ~p~n",[E,X])
+	    end;
+
+	{{error,E}, _} ->
+	    ?line case FileName of
+		"if" ->
+		    ?line case if_res(E) of
+			ok ->
+			    ok;
+			_ ->
+			    io_lib:format(?GCC" did not find errors while ~n"
+					  "Internal_pp found the following Error = ~p~n",[E])
+		    end;
+		_ ->
+		    io_lib:format(?GCC" did not find errors while ~n"
+				  "Internal_pp found the following Error = ~p~n",[lists:flatten(E)])
+	    end;
+
+	{_, {error,X}} ->
+	    io_lib:format("Internal_pp did not find errors while ~n"
+			  ?GCC" found the following Error = ~p~n",[X]);
+
+	_ ->
+
+	    ?line file:write_file("/tmp/Erl.pp",list_to_binary(Erl)),
+	    ?line file:write_file("/tmp/Gcc.pp",list_to_binary(Gcc)),
+	    
+	    ?line Res = os:cmd("diff -b -w /tmp/Erl.pp /tmp/Gcc.pp"),
+	    ?line test_server:format("///////////{error,E} E ~p  FileName~p~n",[Res,FileName]),
+	    ?line case {Res, FileName} of
+		{[], _} ->
+		    ?line test_server:format("Diff = []   OK!!!!!!~n"),
+		    ok;
+		{_, "predef_time"} ->
+		    Tokens = string:tokens(Res,"\n"),
+		    ?line test_server:format("///////////{error,E} Tokens~p~n",[Tokens]),
+		    case Tokens of
+			["3c3",_,"---",_,"5c5",_,"---",_,"9c9",_,"---",_] ->
+			    ok;
+			_ ->
+			    io_lib:format("Diff Result = ~p~n",[Res])
+		    end;
+		_ ->
+		    io_lib:format("Diff Result = ~p~n",[Res])
+	    end
+    end.
+
+
+
+
+
+pp_erl(File, Flags) ->
+    case ic_pp:run(File,Flags) of
+	{ok, [$#, $ , $1 | Rest], []} ->
+	    [$#, $ , $1 | Rest];
+	{ok, [$#, $ , $1 | _Rest], Warning} ->
+	    {warning,Warning};
+	{error,Error} ->
+	    {error,Error}
+    end.
+
+pp_gcc(File, Flags) ->
+    Cmd = ?GCC" -x c++ -E",
+    Line	= Cmd++" "++Flags++" "++File,
+
+    case os:cmd(Line) of
+	[$#, $ , $1 | Rest] ->			
+	    [$#, $ , $1 | Rest];
+	Res ->
+
+	    case string:str(Res,"# 1 \"") of
+		0 ->
+		    {error,Res};
+		X ->
+		    {error, string:sub_string(Res, 1, X-1)}
+	    end
+    end.
+
+
+is_ok([],_Gcc) ->
+    yes;
+is_ok([{FileName,Line,Text}|T],Gcc) ->
+    Str = FileName++":"++integer_to_list(Line)++": "++Text,
+    case string:str(Gcc,Str) of
+	0 ->
+	    io:format("~n is_ok Internal_pp missed Error = ~s~n",[Str]),
+	    no;
+	_X ->
+	    is_ok(T,Gcc)
+    end;
+is_ok([Str|T],Gcc) ->
+    case string:str(Gcc,Str) of
+	0 ->
+	    io:format("~n is_ok Internal_pp missed Error = ~s~n",[Str]),
+	    no;
+	_X ->
+	    is_ok(T,Gcc)
+    end.
+
+
+to_list(X) when is_atom(X) -> atom_to_list(X);
+to_list(X) -> X.
+
+
+
+if_res(E) ->
+    if_res(E,1).
+
+if_res([H|T],Nr) ->
+    %% Dir = "/clearcase/otp/libraries/ic/test/ic_pp_SUITE_data/if.idl",
+    case {Nr, H} of
+	{1, {_Dir, 2, "only '#if 0' is implemented at present"}} ->
+	    if_res(T,Nr+1);
+	{2, {_Dir, 3, "only '#if 0' is implemented at present"}} ->
+	    if_res(T,Nr+1);
+	{3, {_Dir, 5, "`else' command is not implemented at present"}} ->
+	    if_res(T,Nr+1);
+	{4, {_Dir, 9, "`elif' command is not implemented at present"}} ->
+	    if_res(T,Nr+1);
+	{5, {_Dir, 11, "`else' command is not implemented at present"}} ->
+	    ok;
+	_ ->
+	    error
+    end;
+if_res(_, _) ->
+    error.
+
+
+
diff --git a/lib/ic/test/ic_pp_SUITE_data/arg.idl b/lib/ic/test/ic_pp_SUITE_data/arg.idl
new file mode 100644
index 0000000000..b4d266121d
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/arg.idl
@@ -0,0 +1,38 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define xstr	(s) str(s)
+#define str(s) #s
+#define foo 4
+
+xstr(foo);
+
+#define x(kalle)stina
+x(kurt)
+x
+
+#define y(kalle)      stina
+y(kurt)
+y
+
+#define a(kalle) stina
+a(kurt)
+a
+
+#define b (kalle) stina
+b(kurt)
diff --git a/lib/ic/test/ic_pp_SUITE_data/cascade.idl b/lib/ic/test/ic_pp_SUITE_data/cascade.idl
new file mode 100644
index 0000000000..8dff1ee99f
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/cascade.idl
@@ -0,0 +1,29 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define BUFS 1020
+#define TABS BUFS
+#undef BUFS
+#define BUFS 37
+
+
+main()
+{
+  TABS;
+
+}
diff --git a/lib/ic/test/ic_pp_SUITE_data/comment.idl b/lib/ic/test/ic_pp_SUITE_data/comment.idl
new file mode 100644
index 0000000000..d2ca3e7872
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/comment.idl
@@ -0,0 +1,72 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define T 12
+#define F T
+
+//comment
+/*exception except {};*/
+
+// comment
+  // comment
+/* another */
+   /* another */
+/* still
+another */
+  /* still
+  another */
+__LINE__
+/* yet \
+  another */
+// yet \
+  another
+__LINE__
+
+#include "all.c"
+#include <all.c>
+#include /* comment */ "all.c"
+#include /* comment */ <all.c>
+#include  "all.c" /* comment */
+#include  <all.c> /* comment */
+#include // "all.c"
+#include // <all.c>
+#include  "all.c" // comment
+#include  <all.c> // comment
+#include "all/*cc*/.c"
+#include <all/*cc*/.c>
+
+main()
+{
+  printf(" %d \n",F);
+  a();
+
+}
+//comment
+/*exception hell {};*/
+#undef T 
+#define T "3/*com\
+ment*/4"
+a()
+{
+  printf(" %d \n",F);
+  printf(" %d \n",T);
+}
+
+b()
+{}
+
diff --git a/lib/ic/test/ic_pp_SUITE_data/concat.idl b/lib/ic/test/ic_pp_SUITE_data/concat.idl
new file mode 100644
index 0000000000..b8527fadfc
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/concat.idl
@@ -0,0 +1,60 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define sune kurt
+#define a(name)  a #name  name##_command
+#define b(name)  b #name  name##   _command
+#define c(name)  c #name  name  ##_command
+#define d(name)  d #name  name  ##  _command
+#define e(name)  e #name  command  ##  _command
+#define f(name)  f #name  command  ##   %_command
+#define g(name)  g #name  name  ##   %_command
+#define h(name)  h #name  %_command  ##   name
+#define i(name)  i #name  name ## _ ## name
+#define j(name)  j #name  name ## name
+#define k(name)  k #name  name ## name
+#define l(name)  l #name  !name ## name
+#define m(name)  m #name  name ## !name
+#define n(name)  n #name  !name ## !name
+#define o(name)  stina
+#define p(name)  name
+#define q1(name)  q1 #name  j(name) ## j(name)
+#define q2(name)  q2 #name  j(name) 
+#define q3(name)  q3 #name  !! ## j(name)
+#define q4(name)  q4 #name   ## j(name)
+
+a(quit)
+b(quit)
+c(quit)
+d(quit)
+e(quit)
+f(quit)
+g(sune)
+h(sune)
+i(sune)
+j(sune)
+l(sune)
+m(sune)
+n(sune)
+k(j(sune))
+k(o(sune))
+k(p(sune))
+q1(sune)
+q2(sune)
+q3(sune)
+q4(sune)
diff --git a/lib/ic/test/ic_pp_SUITE_data/define.idl b/lib/ic/test/ic_pp_SUITE_data/define.idl
new file mode 100644
index 0000000000..6aac63dd1e
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/define.idl
@@ -0,0 +1,41 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define 8
+#define 
+#define a
+#define _a
+#define b dfs
+#define 9 fdas
+#define a8
+#define A
+#define (c) fadfas
+#define )c) fadfas
+#define % c) fadfas
+#define d(p) kfdsa
+#define e(p) sinus(p)
+#warning warning line
+#define w%er percent
+#define q() no_para
+#warning warning line
+#undef
+#undef 8
+#undef a
+#undef b
+#undef _a d(kk)
+
diff --git a/lib/ic/test/ic_pp_SUITE_data/if.idl b/lib/ic/test/ic_pp_SUITE_data/if.idl
new file mode 100644
index 0000000000..c381fa73ee
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/if.idl
@@ -0,0 +1,32 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define kurt 12
+#if !true
+#if X == 1
+ett
+#else
+else
+#endif
+true
+#elif kurt
+trueelif
+#else
+trueelse
+#endif
+end
diff --git a/lib/ic/test/ic_pp_SUITE_data/if_zero.idl b/lib/ic/test/ic_pp_SUITE_data/if_zero.idl
new file mode 100644
index 0000000000..d715f9d61e
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/if_zero.idl
@@ -0,0 +1,31 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#if 0
+pelle = mallan
+#endif
+pelle = stina
+#if  0
+kalle = stina
+#endif
+kalle = mallan
+#if  0  
+kurt = fia
+#endif
+fia = kurt
+
diff --git a/lib/ic/test/ic_pp_SUITE_data/improp_nest_constr.idl b/lib/ic/test/ic_pp_SUITE_data/improp_nest_constr.idl
new file mode 100644
index 0000000000..463ee3c695
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/improp_nest_constr.idl
@@ -0,0 +1,30 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define double(x) (2*(x))
+#define call_with_1(x) x(1)
+
+#define strange(file) fprintf (file, "%s %d",
+
+main()
+{
+  call_with_1(double);
+  strange(stderr) p, 35)
+
+}
+
diff --git a/lib/ic/test/ic_pp_SUITE_data/inc.idl b/lib/ic/test/ic_pp_SUITE_data/inc.idl
new file mode 100644
index 0000000000..0dcd637082
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/inc.idl
@@ -0,0 +1,68 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+
+int x;
+
+#include "head.h"
+#warning line nr
+main()
+{
+  printf(test());
+}
+
+
+
+
+ 
+
+
+
+#define C false
+#define Z on
+#include "inc2.h"
+#undef Z
+"Ca" C
+"Za" Z
+#include "inc2.h"
+"Cb" C
+"Zb" Z
+
+main()
+{
+#define Q(a,b) sinus(a,b kurt   ##  b) 
+  if (Q(34,56)=='NULL') printf(" T AAA%sEEEE \n",Q);
+  printf(" %d \n",F);
+  a();
+}
+//comment
+/*exception 
+hell {};*/ 
+#undef T 
+#define T "3/*com\ment*/4"
+#define T 33
+#define F again
+a  ()
+{
+  printf(" %d \n",F); 
+  printf(" %d \n",T);
+}
+
+b()
+{}
+
diff --git a/lib/ic/test/ic_pp_SUITE_data/included1.idl b/lib/ic/test/ic_pp_SUITE_data/included1.idl
new file mode 100644
index 0000000000..4cd26c4543
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/included1.idl
@@ -0,0 +1,35 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 2000-2010. 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%
+#ifndef INCLUDED1_IDL
+#define INCLUDED1_IDL
+
+
+#ifndef SOMETHING
+#endif
+
+
+struct s {
+
+ long l;
+
+};
+
+
+
+#endif
diff --git a/lib/ic/test/ic_pp_SUITE_data/included2.idl b/lib/ic/test/ic_pp_SUITE_data/included2.idl
new file mode 100644
index 0000000000..7cc44eef3e
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/included2.idl
@@ -0,0 +1,41 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 2000-2010. 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%
+#ifndef INCLUDED2_IDL
+#define INCLUDED2_IDL
+
+#include "included1.idl"
+
+
+#ifdef SOMETHING
+#endif
+
+
+module m {
+
+ struct t {
+
+   s st;
+
+ };
+
+
+};
+
+
+#endif
diff --git a/lib/ic/test/ic_pp_SUITE_data/includer.idl b/lib/ic/test/ic_pp_SUITE_data/includer.idl
new file mode 100644
index 0000000000..c6ebc234e8
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/includer.idl
@@ -0,0 +1,45 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 2000-2010. 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%
+#ifndef INCLUDER_IDL
+#define INCLUDER_IDL
+
+#include "included1.idl"
+#include "included2.idl"
+
+#ifdef SOMETHING
+#endif
+
+
+
+module n {
+
+  interface j {
+
+    s op(in m::t inpar);
+
+  };
+
+};
+
+
+
+
+#endif
+
+
diff --git a/lib/ic/test/ic_pp_SUITE_data/line.idl b/lib/ic/test/ic_pp_SUITE_data/line.idl
new file mode 100644
index 0000000000..5bd9c9446d
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/line.idl
@@ -0,0 +1,45 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#line
+#line 8
+#line 8a
+#line 12 abc.c
+#line 12 "kurt.c"
+#warning fdafdsaf 
+
+
+#define T 12
+#define F T
+#define Q(a) sinus(a)
+#undef Q
+#
+#line 12
+#warning test of warning
+#warning second of warning
+#warning third of warning
+#pragma kurt
+#ident kurt
+#kurt      fdsafd
+#line 20
+main()
+{
+  if (Q(34,56)=='NULL') printf(" T AAA%sEEEE \n",Q);
+  printf(" %d \n",F);
+}
+sune
diff --git a/lib/ic/test/ic_pp_SUITE_data/misc.idl b/lib/ic/test/ic_pp_SUITE_data/misc.idl
new file mode 100644
index 0000000000..9c18610fcf
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/misc.idl
@@ -0,0 +1,44 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define str(s) #s
+str(fool);
+str(foo);
+str(kurt);
+#define xstr(s) str(s)
+#define foo 4
+#define kurt sune
+#define sune 17
+
+xstr(fool);
+xstr(foo);
+xstr(kurt);
+
+#define a(b) b #8b
+#define r(b) b #
+#define t(b) b ## a
+a(sinus)
+
+#define ww #www
+ww
+
+#define x  14 + y
+#define y  12 + #x
+x
+
+#define e(a) cosinus(a)
diff --git a/lib/ic/test/ic_pp_SUITE_data/nopara.idl b/lib/ic/test/ic_pp_SUITE_data/nopara.idl
new file mode 100644
index 0000000000..1bb137da11
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/nopara.idl
@@ -0,0 +1,35 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#11a
+#define xstr str(s) + kurt*2;
+#define asdf pragma
+#asdf
+#define asd #pragma asd
+
+#10
+#12 8kurt
+
+#define sss "stringing in the rain"
+#define ddd "string
+ing in the rain" asd
+#line 20
+#include "head.h" qqqq
+#include %!#
+#include <sys.h>
+
diff --git a/lib/ic/test/ic_pp_SUITE_data/predef.idl b/lib/ic/test/ic_pp_SUITE_data/predef.idl
new file mode 100644
index 0000000000..d8abcb25d5
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/predef.idl
@@ -0,0 +1,33 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define b(q,w) kurt q w
+
+
+b(__LINE__, __FILE__)
+__LINE__
+__FILE__
+
+
+
+b(__INCLUDE_LEVEL__, __BASE_FILE__)
+__INCLUDE_LEVEL__
+__BASE_FILE__
+
+Line __LINE__
+#include "predef.h"
diff --git a/lib/ic/test/ic_pp_SUITE_data/predef_time.idl b/lib/ic/test/ic_pp_SUITE_data/predef_time.idl
new file mode 100644
index 0000000000..05e3ba9175
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/predef_time.idl
@@ -0,0 +1,24 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define b(q,w) kurt q w
+b(__DATE__, __TIME__)
+__DATE__
+__TIME__
+
+#include "predef_time.h"
diff --git a/lib/ic/test/ic_pp_SUITE_data/self_ref.idl b/lib/ic/test/ic_pp_SUITE_data/self_ref.idl
new file mode 100644
index 0000000000..a44666272e
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/self_ref.idl
@@ -0,0 +1,26 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define foo (4 + foo)
+
+
+main()
+{
+  foo;
+
+}
diff --git a/lib/ic/test/ic_pp_SUITE_data/separate.idl b/lib/ic/test/ic_pp_SUITE_data/separate.idl
new file mode 100644
index 0000000000..a3faf9b986
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/separate.idl
@@ -0,0 +1,37 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define xstr(s) str(s)
+#define str(s) #s
+#define foo 4
+#define str1(s) #s lose(s)
+#define foo1 4
+
+main()
+{
+  str(foo);
+  str1(foo1);
+  xstr(foo);
+
+#define qxstr(s) qstr(s)
+  qxstr(qfoo);
+#define qstr(s) #s
+  qstr( 4  ) ;
+#define qfoo 4
+  qstr(qfoo);
+}
diff --git a/lib/ic/test/ic_pp_SUITE_data/swallow_sc.idl b/lib/ic/test/ic_pp_SUITE_data/swallow_sc.idl
new file mode 100644
index 0000000000..71ed329ca6
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/swallow_sc.idl
@@ -0,0 +1,37 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+/* comment \
+  ends */
+// comment\
+ends
+Line __LINE__
+#define SKIP_SPACES(p, limit) \
+{register char *lim = (limit); \
+ while (p != lim) {            \
+   if (*p++ != ' ') {          \
+      p--; break; }}}
+
+
+main()
+{
+  if (*p != 0)
+    SKIP_SPACES (ppp, lim);
+  else
+    a = 17;
+}
diff --git a/lib/ic/test/ic_pp_SUITE_data/unintended_grp.idl b/lib/ic/test/ic_pp_SUITE_data/unintended_grp.idl
new file mode 100644
index 0000000000..3618bab1bc
--- /dev/null
+++ b/lib/ic/test/ic_pp_SUITE_data/unintended_grp.idl
@@ -0,0 +1,29 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+#define ceil_div( xz, yz) (xz + yz - 1) / yz
+#define ceil_div2(xz, yz) ((xz) + (yz) - 1) / (yz)
+
+#define b kurt
+
+main()
+{
+  ceil_div(b & c, sizeof(int));
+  ceil_div2(b & c, sizeof(int));
+
+}
diff --git a/lib/ic/test/ic_pragma_SUITE.erl b/lib/ic/test/ic_pragma_SUITE.erl
new file mode 100644
index 0000000000..65fda2e3b9
--- /dev/null
+++ b/lib/ic/test/ic_pragma_SUITE.erl
@@ -0,0 +1,306 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+%%
+%%-----------------------------------------------------------------
+%% File: ic_pragma_SUITE.erl
+%% 
+%% Description:
+%% Test suite for the IFR object registration when
+%% pragmas are engaged
+%%
+%%-----------------------------------------------------------------
+-module(ic_pragma_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("orber/include/corba.hrl").
+%%-----------------------------------------------------------------
+%% External exports
+%%-----------------------------------------------------------------
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1]).
+-export([ifr_pragma_reg/1, pragma_error/1, uggly_pragmas/1]).
+
+
+%%-----------------------------------------------------------------
+%% Macros
+%%-----------------------------------------------------------------
+-define(REMAP_EXCEPT(F), case catch F of
+			     {'EXCEPTION', E} -> exit(E);
+			     R -> R
+			 end).
+%% Standard options to the ic compiler, NOTE unholy use of OutDir
+
+-define(OUT(X), filename:join([?config(priv_dir, Config), gen, to_list(X)])).
+
+
+%%-----------------------------------------------------------------
+%% Func: all/1
+%% Args: 
+%% Returns: 
+%%-----------------------------------------------------------------
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [ifr_pragma_reg, pragma_error, uggly_pragmas].
+
+%%-----------------------------------------------------------------
+%% Init and cleanup functions.
+%%-----------------------------------------------------------------
+init_per_suite(Config) ->
+    io:format("Setting up.....~n"),
+    mnesia:stop(),
+    mnesia:delete_schema([node()]),
+    mnesia:create_schema([node()]),
+    mnesia:start(),
+    orber:install([node()]),
+    orber:start(),
+    if
+	is_list(Config) ->
+	    Config;
+	true ->
+	    exit("Config not a list")
+    end.
+
+end_per_suite(Config) ->
+    io:format("Setting down.....~n"),
+    orber:stop(),
+    orber:uninstall(),
+    mnesia:stop(),
+    mnesia:delete_schema([node()]),
+    Config.
+
+
+
+
+%%-----------------------------------------------------------------
+%% Test Case: IFR registration with pragmas
+%%-----------------------------------------------------------------
+ifr_pragma_reg(doc) ->
+    ["Checks that IFR object is correctly registered under pragma engagement."];
+ifr_pragma_reg(suite) -> [];
+ifr_pragma_reg(Config) when is_list(Config) ->
+    ?REMAP_EXCEPT(ifr_pragma_reg_run(Config)).
+
+ifr_pragma_reg_run(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(ifr_pragma_reg),
+    File0 = filename:join(DataDir, reg_m0),
+    ?line ok = ic:gen(File0, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}]),
+    ?line ok = compile(OutDir, ifr_pragma_files()),
+    code:add_pathz(OutDir),
+
+    %% OE_register for all files
+    ?line ok = 'oe_reg_m0':'oe_register'(),
+    
+    %% Pragma registration test
+    OE_IFR = orber_ifr:find_repository(),
+    io:format("~n##### Starting the test case #####~n"), 
+    check_pragma_effect(OE_IFR,"IDL:M1/T1:1.0"),
+    check_pragma_effect(OE_IFR,"DCE:d62207a2-011e-11ce-88b4-0800090b5d3e:3"),
+    check_pragma_effect(OE_IFR,"IDL:P2/T3:1.0"),
+    check_pragma_effect(OE_IFR,"IDL:P1/M2/T4:2.4"),
+    
+    %% OE_unregister for all files
+    ?line ok = 'oe_reg_m0':'oe_unregister'(),
+    code:del_path(OutDir),
+    ok.
+
+
+ifr_pragma_files() -> ['oe_reg_m0'].
+
+
+check_pragma_effect(OE_IFR,ID) ->
+    io:format("Checking for existance of : ~s~n",[ID]),
+    case orber_ifr:lookup_id(OE_IFR,ID) of
+        [] ->
+	    test_server:fail(ID ++ " does not exist"),
+	    false;
+	{Def,_} ->
+	    io:format("Id refers to = {~p,#Bin}~n",[Def]),
+	    true
+    end.
+
+
+
+
+%%-----------------------------------------------------------------
+%% Test Case: Syntactical / Semantical error pragma definitions 
+%%-----------------------------------------------------------------
+pragma_error(doc) ->
+    ["Finds errornous pragma definitions under compilation."];
+pragma_error(suite) -> [];
+pragma_error(Config) when is_list(Config) ->
+    ?REMAP_EXCEPT(pragma_error_run(Config)).
+
+pragma_error_run(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(pragma_error),
+    File1 = filename:join(DataDir, reg_m1),
+    File2 = filename:join(DataDir, reg_m2),
+    File3 = filename:join(DataDir, reg_m3),
+    File4 = filename:join(DataDir, reg_m4),
+    File5 = filename:join(DataDir, reg_m5),
+    File6 = filename:join(DataDir, reg_m6),
+
+    ?line error = ic:gen(File1, stdopts(OutDir)++[{preproc_flags,
+						   "-I" ++ DataDir}] ),
+    
+    ?line error = ic:gen(File2, stdopts(OutDir)++[{preproc_flags,
+						   "-I" ++ DataDir}] ),
+    
+    ?line error = ic:gen(File3, stdopts(OutDir)++[{preproc_flags,
+						   "-I" ++ DataDir}] ),
+    
+    ?line ok = ic:gen(File4, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    
+    ?line error = ic:gen(File5, stdopts(OutDir)++[{preproc_flags,
+						   "-I" ++ DataDir}] ),
+    
+    ?line error = ic:gen(File6, stdopts(OutDir)++[{preproc_flags,
+						   "-I" ++ DataDir}] ),
+    ok.
+
+
+
+
+%%-----------------------------------------------------------------
+%% Test Case: IFR registration with realy uggly placed pragmas
+%%-----------------------------------------------------------------
+uggly_pragmas(doc) ->
+    ["Checks that IFR object is correctly registered under really uggly pragma engagement."];
+uggly_pragmas(suite) -> [];
+uggly_pragmas(Config) when is_list(Config) ->
+    ?REMAP_EXCEPT(uggly_pragmas_run(Config)).
+
+uggly_pragmas_run(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(ifr_pragma_reg),
+    File0 = filename:join(DataDir, uggly),
+
+    ?line ok = ic:gen(File0, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}]),
+
+    ?line ok = compile(OutDir, uggly_pragma_files()),
+    code:add_pathz(OutDir),
+
+    %% OE_register for all files
+    ?line ok = 'oe_uggly':'oe_register'(),
+    
+    %% Pragma registration test
+    OE_IFR = orber_ifr:find_repository(),
+    io:format("~n##### Starting the test case #####~n"),
+ 
+    check_pragma_effect(OE_IFR, "IDL:M:1.0"),
+    check_pragma_effect(OE_IFR, "LOCAL:SomeLocalId:10"),
+    check_pragma_effect(OE_IFR, "LOCAL:SomeLocalId:11"),
+    check_pragma_effect(OE_IFR, "LOCAL:SomeLocalId:17"),
+    check_pragma_effect(OE_IFR, "LOCAL:SomeLocalId:34"),
+    check_pragma_effect(OE_IFR, "IDL:Exc1:2.2"),
+    check_pragma_effect(OE_IFR, "IDL:Exc2:2.2"),
+    check_pragma_effect(OE_IFR, "IDL:S:1.0"),
+    check_pragma_effect(OE_IFR, "IDL:U:1.0"),
+    check_pragma_effect(OE_IFR, "LOCAL:SomeLocalId:23"),
+    
+    %% OE_unregister for all files
+    ?line ok = 'oe_uggly':'oe_unregister'(),
+
+    code:del_path(OutDir),
+    ok.
+
+
+uggly_pragma_files() -> ['oe_uggly'].
+
+
+
+
+%%----------------------------
+
+
+stdopts(OutDir) ->
+    [{outdir, OutDir}, {maxerrs, infinity}].
+
+
+compile(Dir, Files) ->
+    compile(Dir, Files, []).
+
+compile(Dir, Files, Opts) ->
+    {ok, Cwd} = file:get_cwd(),
+    file:set_cwd(Dir),
+    io:format("Changing to ~p~n", [Dir]),
+    case catch do_compile(Files, Opts) of
+	ok ->
+	    file:set_cwd(Cwd);
+	Err ->
+	    file:set_cwd(Cwd),
+	    test_server:fail(Err)
+    end.
+
+do_compile([], _Opts) -> ok;
+do_compile([F | Fs], Opts) ->
+    io:format("Compiling ~p", [F]),
+    case compile:file(F, Opts) of
+	ok ->
+	    io:format(" ok~n", []),
+	    do_load(F, Opts),
+	    do_compile(Fs, Opts);
+	{ok, _} ->
+	    io:format(" ok~n", []),
+	    do_load(F, Opts),
+	    do_compile(Fs, Opts);
+	{ok, _, _} ->
+	    io:format(" ok~n", []),
+	    do_load(F, Opts),
+	    do_compile(Fs, Opts);
+	Err -> 
+	    io:format(" error: ~p~n", [Err]),
+	    Err
+    end.
+
+do_load(File, Opts) ->
+    case lists:member(load, Opts) of
+	true ->
+	    io:format("Loading file ~p", [File]),
+	    code:purge(File),
+	    R = code:load_abs(File),
+	    io:format("Loaded: ~p", [R]);
+	false ->
+	    ok
+    end.
+
+
+to_list(X) when is_atom(X) -> atom_to_list(X);
+to_list(X) -> X.
+
+
+
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m0.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m0.idl
new file mode 100644
index 0000000000..80f0f2cdd1
--- /dev/null
+++ b/lib/ic/test/ic_pragma_SUITE_data/reg_m0.idl
@@ -0,0 +1,77 @@
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+
+// Normal pragmas
+ 
+module M1 {
+  
+  typedef long T1;
+ 
+  typedef long T2;
+ 
+#pragma ID T2 "DCE:d62207a2-011e-11ce-88b4-0800090b5d3e:3"
+ 
+};
+ 
+ 
+#pragma prefix "P1"
+ 
+module M2 {
+ 
+  module M3 {
+
+#pragma prefix "P2"
+ 
+    interface I1 {
+      void Op( in short b,
+                out short c);
+    };
+    typedef long T3;
+  };
+  
+  
+  typedef long T4;
+  
+#pragma version T4 2.4
+ 
+};
+ 
+ 
+ 
+/*
+ 
+  Specified types with the following scoped names 
+  and RepositoryIds
+ 
+  ::M1::T1     IDL:M1/T1:1.0
+  
+  ::M1::T2     DCE:d62207a2-011e-11ce-88b4-0800090b5d3e:3   
+  
+  ::M2::M3::T3 IDL:P2/T3:1.0
+  
+  ::M2::T4     IDL:P1/M2/T4:2.4
+
+*/
+ 
+
+
+
+
+
+
+
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m1.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m1.idl
new file mode 100644
index 0000000000..6c22788290
--- /dev/null
+++ b/lib/ic/test/ic_pragma_SUITE_data/reg_m1.idl
@@ -0,0 +1,75 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+// Bad pragma IDs
+ 
+// Completelly bad id
+module M1 {
+  
+  typedef long T1;
+ 
+  typedef long T2;
+ 
+#pragma ID T2 "CompletelyBadId"
+ 
+};
+
+
+// Bad id, should start with DCE
+module M2 {
+  
+  typedef long T1;
+ 
+  typedef long T2;
+ 
+#pragma ID T2 "BAD:d62207a2-011e-11ce-88b4-0800090b5d3e:3"
+ 
+};
+ 
+
+// Bad version in ID : not a short number
+module M3 {
+  
+  typedef long T1;
+ 
+  typedef long T2;
+ 
+#pragma ID T2 "DCE:d62207a2-011e-11ce-88b4-0800090b5d3e:ABCD"
+ 
+};
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m2.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m2.idl
new file mode 100644
index 0000000000..1751751295
--- /dev/null
+++ b/lib/ic/test/ic_pragma_SUITE_data/reg_m2.idl
@@ -0,0 +1,40 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+// Bad pragma versions
+
+
+// Bad major version : not a short number
+module M1 {
+   
+  typedef long T4;
+  
+#pragma version T4 2000000000.4
+ 
+};
+ 
+// Bad minor version : not a short number
+module M2 {
+   
+  typedef long T4;
+  
+#pragma version T4 2.4000000000000
+ 
+};
+
+
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m3.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m3.idl
new file mode 100644
index 0000000000..b7c9da249f
--- /dev/null
+++ b/lib/ic/test/ic_pragma_SUITE_data/reg_m3.idl
@@ -0,0 +1,38 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+// Bad pragma prefixs
+ 
+module M2 {
+ 
+  module M3 {
+
+#pragma prefix P2  // Should be "P2"
+ 
+    interface I1 {
+      void foo( in short b,
+                out short c);
+    };
+    typedef long T3;
+  };
+  
+  
+  typedef long T4; 
+};
+ 
+ 
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m4.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m4.idl
new file mode 100644
index 0000000000..0c7079e3dd
--- /dev/null
+++ b/lib/ic/test/ic_pragma_SUITE_data/reg_m4.idl
@@ -0,0 +1,64 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+// Unrecognmizable pragmas
+ 
+module M1 {
+  
+  typedef long T1;
+ 
+  typedef long T2;
+
+
+  // Should be ID directive 
+ 
+#pragma ShouldBeId T2 "DCE:d62207a2-011e-11ce-88b4-0800090b5d3e:3"
+ 
+};
+
+ // Should be prefix directive
+ 
+#pragma ShouldBePrefix "P1"
+ 
+module M2 {
+ 
+  module M3 {
+
+    // Should be prefix directive
+    
+#pragma ShouldBePrefix "P2"
+ 
+    interface I1 {
+      void foo( in short b,
+                out short c);
+    };
+    typedef long T3;
+  };
+  
+  
+  typedef long T4;
+
+
+  // Should be version
+  
+#pragma ShouldBeVersion T4 2.4
+ 
+};
+ 
+ 
+ 
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m5.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m5.idl
new file mode 100644
index 0000000000..cbf053fac4
--- /dev/null
+++ b/lib/ic/test/ic_pragma_SUITE_data/reg_m5.idl
@@ -0,0 +1,28 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+
+// Version not in valid form : major.ninor
+
+module M1 {
+   
+  typedef long T4;
+  
+  #pragma version T4 2 
+ 
+};
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m6.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m6.idl
new file mode 100644
index 0000000000..b7c9da249f
--- /dev/null
+++ b/lib/ic/test/ic_pragma_SUITE_data/reg_m6.idl
@@ -0,0 +1,38 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+// Bad pragma prefixs
+ 
+module M2 {
+ 
+  module M3 {
+
+#pragma prefix P2  // Should be "P2"
+ 
+    interface I1 {
+      void foo( in short b,
+                out short c);
+    };
+    typedef long T3;
+  };
+  
+  
+  typedef long T4; 
+};
+ 
+ 
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m7.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m7.idl
new file mode 100644
index 0000000000..349c13b244
--- /dev/null
+++ b/lib/ic/test/ic_pragma_SUITE_data/reg_m7.idl
@@ -0,0 +1,62 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+
+// Very uggly pragmas
+ 
+ 
+#pragma prefix "P1" // Normal pragma
+ 
+module M4 {
+ 
+  module M5 {
+
+#pragma prefix "P2" // Inside a parameter list
+ 
+    interface I1 {
+      void Op( 
+	      #pragma prefix "P2" // Inside a parameter list
+	      in short b,
+	      #pragma prefix "P2" // Inside a parameter list
+	      out short c
+	      #pragma prefix "P2" // Inside a parameter list
+	      );
+    };
+    typedef long T3;
+  };
+  
+};
+ 
+ 
+ 
+/*
+  
+  Specified types with the following scoped names 
+  and RepositoryIds   
+  
+  ::M4::M5::T3 IDL:P2/T3:1.0
+
+*/
+ 
+
+
+
+
+
+
+
diff --git a/lib/ic/test/ic_pragma_SUITE_data/uggly.idl b/lib/ic/test/ic_pragma_SUITE_data/uggly.idl
new file mode 100644
index 0000000000..8ed3ac57ec
--- /dev/null
+++ b/lib/ic/test/ic_pragma_SUITE_data/uggly.idl
@@ -0,0 +1,204 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+// Really uggly pragmas
+
+
+struct S {
+
+#pragma ID TDL1 "LOCAL:SomeLocalId:1"
+#pragma ID TDL1 "LOCAL:SomeLocalId:2"
+
+long a
+
+#pragma ID TDL1 "LOCAL:SomeLocalId:3"
+#pragma ID TDL1 "LOCAL:SomeLocalId:4"
+
+;
+
+#pragma ID TDL1 "LOCAL:SomeLocalId:5"
+#pragma ID TDL1 "LOCAL:SomeLocalId:6"
+
+long b
+
+#pragma ID TDL1 "LOCAL:SomeLocalId:7"
+#pragma ID TDL1 "LOCAL:SomeLocalId:8"
+
+;
+
+
+#pragma ID TDL1 "LOCAL:SomeLocalId:9"
+#pragma ID TDL1 "LOCAL:SomeLocalId:10"
+
+};
+
+
+typedef long TDL1;
+
+
+exception Exc1{
+
+#pragma version Exc1 2.2
+#pragma ID TDL2 "LOCAL:SomeLocalId:11"
+
+};
+
+
+typedef long TDL2;
+
+
+exception Exc2 {
+
+#pragma version Exc2 2.2
+#pragma ID TDL3 "LOCAL:SomeLocalId:11"
+  
+  long a
+    
+#pragma ID TDL3 "LOCAL:SomeLocalId:12"
+#pragma ID TDL3 "LOCAL:SomeLocalId:13"
+    
+    ;
+  
+#pragma ID TDL3 "LOCAL:SomeLocalId:14"
+#pragma ID TDL3 "LOCAL:SomeLocalId:15"
+  
+  long b 
+
+#pragma ID TDL3 "LOCAL:SomeLocalId:16"
+
+    ;
+  
+#pragma ID TDL3 "LOCAL:SomeLocalId:17"
+  
+  
+};
+
+typedef long TDL3;
+
+enum E { 
+#pragma ID E "LOCAL:SomeLocalId:18"
+  a
+#pragma ID E "LOCAL:SomeLocalId:19"
+  , 
+#pragma ID E "LOCAL:SomeLocalId:20"
+  b
+#pragma ID E "LOCAL:SomeLocalId:21"
+, 
+#pragma ID E "LOCAL:SomeLocalId:22"
+  c 
+#pragma ID E "LOCAL:SomeLocalId:23"
+};
+
+
+
+union U switch (long) {
+
+#pragma ID TDL4 "LOCAL:SomeLocalId:24"
+
+ case 1:
+
+#pragma ID TDL4 "LOCAL:SomeLocalId:25"
+
+   long a
+
+#pragma ID TDL4 "LOCAL:SomeLocalId:26"
+
+;
+
+#pragma ID TDL4 "LOCAL:SomeLocalId:27"
+
+ case 2: 
+   
+#pragma ID TDL4 "LOCAL:SomeLocalId:28"
+
+ case 3:
+
+#pragma ID TDL4 "LOCAL:SomeLocalId:29"
+
+long b
+
+#pragma ID TDL4 "LOCAL:SomeLocalId:30"
+
+;
+
+#pragma ID TDL4 "LOCAL:SomeLocalId:31"
+
+ default : 
+
+#pragma ID TDL4 "LOCAL:SomeLocalId:32"
+
+long c
+
+#pragma ID TDL4 "LOCAL:SomeLocalId:33"
+
+;
+
+#pragma ID TDL4 "LOCAL:SomeLocalId:34"
+
+};
+ 
+
+typedef long TDL4;
+
+
+
+module M {
+
+  interface I {
+
+    void fun1(
+	     
+#pragma version fun1 3.0
+#pragma ID TDL5 "LOCAL:SomeLocalId:35" 
+	     
+	     in short b
+
+#pragma ID TDL5 "LOCAL:SomeLocalId:36"
+#pragma ID TDL5 "LOCAL:SomeLocalId:37" 
+
+	     ,
+
+#pragma ID TDL5 "LOCAL:SomeLocalId:38"
+#pragma ID TDL5 "LOCAL:SomeLocalId:39" 
+
+	     out short c
+
+#pragma ID TDL5 "LOCAL:SomeLocalId:40" 
+#pragma ID TDL5 "LOCAL:SomeLocalId:41" 
+
+	      );
+
+
+    typedef long TDL5;
+
+
+    void fun2(
+
+#pragma ID TDL6 "LOCAL:SomeLocalId:42"
+#pragma ID TDL6 "LOCAL:SomeLocalId:43" 
+
+	      );
+
+    typedef long TDL6;
+ 
+ };
+
+  
+  
+};
+  
diff --git a/lib/ic/test/ic_register_SUITE.erl b/lib/ic/test/ic_register_SUITE.erl
new file mode 100644
index 0000000000..6a9dea5a3d
--- /dev/null
+++ b/lib/ic/test/ic_register_SUITE.erl
@@ -0,0 +1,437 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+%%
+%%-----------------------------------------------------------------
+%% File: ic_register_SUITE.erl
+%% 
+%% Description:
+%% Test suite for the IFR object registration
+%%
+%%-----------------------------------------------------------------
+-module(ic_register_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("orber/include/corba.hrl").
+%%-----------------------------------------------------------------
+%% External exports
+%%-----------------------------------------------------------------
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1, ifr_reg_unreg/1]).
+-export([ifr_inheritence_reg/1,ifr_reg_unreg_with_inheritence/1]).
+-export([ifr_reg_unreg_with_inheritence_bad_order/1]).
+
+%%-----------------------------------------------------------------
+%% Internal exports
+%%-----------------------------------------------------------------
+-export([]).
+
+%%-----------------------------------------------------------------
+%% Macros
+%%-----------------------------------------------------------------
+-define(REMAP_EXCEPT(F), case catch F of
+			     {'EXCEPTION', E} -> exit(E);
+			     R -> R
+			 end).
+%% Standard options to the ic compiler, NOTE unholy use of OutDir
+
+-define(OUT(X), filename:join([?config(priv_dir, Config), gen, to_list(X)])).
+
+
+%%-----------------------------------------------------------------
+%% Func: all/1
+%% Args: 
+%% Returns: 
+%%-----------------------------------------------------------------
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [ifr_reg_unreg, ifr_reg_unreg_with_inheritence,
+     ifr_reg_unreg_with_inheritence_bad_order,
+     ifr_inheritence_reg].
+
+%%-----------------------------------------------------------------
+%% Init and cleanup functions.
+%%-----------------------------------------------------------------
+
+init_per_suite(Config) ->
+    io:format("Setting up.....~n"),
+    mnesia:stop(),
+    mnesia:delete_schema([node()]),
+    mnesia:create_schema([node()]),
+    mnesia:start(),
+    orber:install([node()]),
+    orber:start(),
+    if
+	is_list(Config) ->
+	    Config;
+	true ->
+	    exit("Config not a list")
+    end.
+
+end_per_suite(Config) ->
+    io:format("Setting down.....~n"),
+    orber:stop(),
+    orber:uninstall(),
+    mnesia:stop(),
+    mnesia:delete_schema([node()]),
+    Config.
+
+
+
+%%-----------------------------------------------------------------
+%% Test Case: IFR type registration
+%%-----------------------------------------------------------------
+ifr_reg_unreg(doc) ->
+    ["Checks that the generated register/unregister "
+     "code for the IFR is correct."];
+ifr_reg_unreg(suite) -> [];
+ifr_reg_unreg(Config) when is_list(Config) ->
+    ?REMAP_EXCEPT(ifr_reg_unregt_run(Config)).
+
+ifr_reg_unregt_run(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(ifr_reg_unreg),
+    File0 = filename:join(DataDir, reg_m8),
+    File1 = filename:join(DataDir, reg_m9),
+    File2 = filename:join(DataDir, reg_m10),
+    ?line ok = ic:gen(File0, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File0, stdopts(OutDir)++[silent2, {preproc_flags,
+					       "-I" ++ DataDir}]),
+    ?line ok = ic:gen(File1, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File1, stdopts(OutDir)++[silent2, {preproc_flags,
+					       "-I" ++ DataDir}]),
+    ?line ok = ic:gen(File2, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File2, stdopts(OutDir)++[silent2, {preproc_flags,
+					       "-I" ++ DataDir}]),
+    ?line ok = compile(OutDir, ifr_reg_unreg_files()),
+    code:add_pathz(OutDir),
+    ?line ok = 'oe_reg_m8':'oe_register'(),
+    ?line ok = 'oe_reg_m9':'oe_register'(),
+    ?line ok = 'oe_reg_m10':'oe_register'(),
+    ?line ok = 'oe_reg_m10':'oe_unregister'(),
+    ?line ok = 'oe_reg_m9':'oe_unregister'(),
+    ?line ok = 'oe_reg_m8':'oe_unregister'(),
+    code:del_path(OutDir),
+    ok.
+
+ifr_reg_unreg_files() -> ['oe_reg_m8', 'oe_reg_m9', 'oe_reg_m10'].
+
+
+
+%%-----------------------------------------------------------------
+%% Test Case: IFR registration when object inheritence 
+%%            is applied and registered.
+%%-----------------------------------------------------------------
+ifr_reg_unreg_with_inheritence(doc) ->
+    ["Checks that the generated register/unregister "
+     "code for the IFR is correct, and works even when"
+     "the object inheritence is registered. This fixes"
+     "two bugs in ifr that caused crash when trying to"
+     "use OE_register/OE_unregister in a sequence of"
+     "compiled files that contained interfaces who"
+     "inherited others in sequence."];
+ifr_reg_unreg_with_inheritence(suite) -> [];
+ifr_reg_unreg_with_inheritence(Config) when is_list(Config) ->
+    ?REMAP_EXCEPT(ifr_reg_unreg_with_inheritence_run(Config)).
+
+ifr_reg_unreg_with_inheritence_run(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(ifr_reg_unreg),
+    File0 = filename:join(DataDir, reg_m8),
+    File1 = filename:join(DataDir, reg_m9),
+    File2 = filename:join(DataDir, reg_m10),
+    File3 = filename:join(DataDir, reg_m11),
+    File4 = filename:join(DataDir, reg_m12),
+    ?line ok = ic:gen(File0, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File0, stdopts(OutDir)++[silent2, {preproc_flags,
+					       "-I" ++ DataDir}]),
+    ?line ok = ic:gen(File1, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File1, stdopts(OutDir)++[silent2, {preproc_flags,
+					       "-I" ++ DataDir}]),
+    ?line ok = ic:gen(File2, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File2, stdopts(OutDir)++[silent2, {preproc_flags,
+					       "-I" ++ DataDir}]),
+    ?line ok = ic:gen(File3, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File3, stdopts(OutDir)++[silent2, {preproc_flags,
+						"-I" ++ DataDir}]),
+    ?line ok = ic:gen(File4, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File4, stdopts(OutDir)++[silent2, {preproc_flags,
+						"-I" ++ DataDir}]),
+    ?line ok = compile(OutDir, ifr_reg_unreg_with_inheritence_files()),
+    code:add_pathz(OutDir),
+    ?line ok = 'oe_reg_m8':'oe_register'(),
+    ?line ok = 'oe_reg_m9':'oe_register'(),
+    ?line ok = 'oe_reg_m10':'oe_register'(),
+    ?line ok = 'oe_reg_m11':'oe_register'(),
+    ?line ok = 'oe_reg_m12':'oe_register'(),
+    ?line ok = 'oe_reg_m8':'oe_unregister'(),
+    ?line ok = 'oe_reg_m9':'oe_unregister'(),
+    ?line ok = 'oe_reg_m10':'oe_unregister'(),
+    ?line ok = 'oe_reg_m11':'oe_unregister'(),
+    ?line ok = 'oe_reg_m12':'oe_unregister'(),
+    code:del_path(OutDir),
+    ok.
+
+ifr_reg_unreg_with_inheritence_files() -> 
+    ['oe_reg_m8', 'oe_reg_m9', 'oe_reg_m10', 'oe_reg_m11', 'oe_reg_m12'].
+
+
+
+
+
+%%-----------------------------------------------------------------
+%% Test Case: IFR registration when object inheritence 
+%%            is applied and registered in a bad order.
+%%            Modules included and used from an ifr object
+%%            are not allready registered when the current 
+%%            object is getting registered.
+%%-----------------------------------------------------------------
+ifr_reg_unreg_with_inheritence_bad_order(doc) ->
+    ["This tests that ifr registration is done with
+      the right write order."
+     "Modules included and used from an ifr object"
+     "are tested if allready registered when the "
+     "current object is getting registered."];
+ifr_reg_unreg_with_inheritence_bad_order(suite) -> [];
+ifr_reg_unreg_with_inheritence_bad_order(Config) when is_list(Config) ->
+    ?REMAP_EXCEPT(ifr_reg_unreg_with_inheritence_bad_order_run(Config)).
+
+ifr_reg_unreg_with_inheritence_bad_order_run(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(ifr_reg_unreg),
+    File1 = filename:join(DataDir, reg_m9),
+    File2 = filename:join(DataDir, reg_m10),
+    File4 = filename:join(DataDir, reg_m12),
+    ?line ok = ic:gen(File1, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File1, stdopts(OutDir)++[silent2, {preproc_flags,
+					       "-I" ++ DataDir}]),
+    ?line ok = ic:gen(File2, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File2, stdopts(OutDir)++[silent2, {preproc_flags,
+					       "-I" ++ DataDir}]),
+    ?line ok = ic:gen(File4, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File4, stdopts(OutDir)++[silent2, {preproc_flags,
+						"-I" ++ DataDir}]),
+    ?line ok = compile(OutDir, ifr_reg_unreg_with_inheritence_files()),
+    code:add_pathz(OutDir),
+    case catch 'oe_reg_m12':'oe_register'() of
+	{'EXIT',Reason1} ->
+	    io:format("IFR object missing detected : ~p~n",[Reason1]),
+	    true;
+	_ ->
+	    test_server:fail("Failed to detect object missing : IDL:M1:1.0~n")
+    end,
+    ?line ok = 'oe_reg_m9':'oe_register'(),
+    case catch 'oe_reg_m10':'oe_register'() of
+	{'EXIT',Reason2} ->
+	    io:format("IFR object missing detected : ~p~n",[Reason2]),
+	    true;
+	_ ->
+	    test_server:fail("Failed to detect object missing : IDL:M0:1.0~n")
+    end,
+    ?line ok = 'oe_reg_m9':'oe_unregister'(),
+    code:del_path(OutDir),
+    ok.
+
+
+
+%%-----------------------------------------------------------------
+%% Test Case: IFR registration with inheritence
+%%-----------------------------------------------------------------
+ifr_inheritence_reg(doc) ->
+    ["Checks that IFR object inheritence is correctly registered."];
+ifr_inheritence_reg(suite) -> [];
+ifr_inheritence_reg(Config) when is_list(Config) ->
+    ?REMAP_EXCEPT(ifr_inh_reg_run(Config)).
+
+ifr_inh_reg_run(Config) ->
+    DataDir = ?config(data_dir, Config),
+    OutDir = ?OUT(ifr_reg_unreg),
+    File0 = filename:join(DataDir, reg_m8),
+    File1 = filename:join(DataDir, reg_m9),
+    File2 = filename:join(DataDir, reg_m10),
+    File3 = filename:join(DataDir, reg_m11),
+    File4 = filename:join(DataDir, reg_m12),
+    ?line ok = ic:gen(File0, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File0, stdopts(OutDir)++[silent2, {preproc_flags,
+					       "-I" ++ DataDir}]),
+    ?line ok = ic:gen(File1, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File1, stdopts(OutDir)++[silent2, {preproc_flags,
+					       "-I" ++ DataDir}]),
+    ?line ok = ic:gen(File2, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File2, stdopts(OutDir)++[silent2, {preproc_flags,
+					       "-I" ++ DataDir}]),
+    ?line ok = ic:gen(File3, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File3, stdopts(OutDir)++[silent2, {preproc_flags,
+						"-I" ++ DataDir}]),
+    ?line ok = ic:gen(File4, stdopts(OutDir)++[{preproc_flags,
+						"-I" ++ DataDir}] ),
+    ?line {ok, []} = ic:gen(File4, stdopts(OutDir)++[silent2, {preproc_flags,
+						"-I" ++ DataDir}]),
+    ?line ok = compile(OutDir, ifr_reg_unreg_with_inheritence_files()),
+    code:add_pathz(OutDir),
+    %% OE_register for all files
+    ?line ok = 'oe_reg_m8':'oe_register'(),
+    ?line ok = 'oe_reg_m9':'oe_register'(),
+    ?line ok = 'oe_reg_m10':'oe_register'(),
+    ?line ok = 'oe_reg_m11':'oe_register'(),
+    ?line ok = 'oe_reg_m12':'oe_register'(),
+    
+    %% Inheritence registration test
+    OE_IFR = orber_ifr:find_repository(),
+    %% Interfaces that not inherit from other interfaces
+    ?line [] = get_inh(OE_IFR, "IDL:m0/i0:1.0"),
+    ?line [] = get_inh(OE_IFR, "IDL:m1/i1:1.0"),
+    ?line [] = get_inh(OE_IFR, "IDL:m3/i3:1.0"),
+    %% Interfaces that inherit from other interfaces
+    ?line ["IDL:m1/i1:1.0"] = get_inh(OE_IFR, "IDL:m2/i2:1.0"),
+    ?line ["IDL:m1/i1:1.0","IDL:m2/i2:1.0"] = get_inh(OE_IFR, "IDL:m4/i4:1.0"),
+    ?line ["IDL:m3/i3:1.0"] = get_inh(OE_IFR, "IDL:m4/i5:1.0"),
+    
+    %% OE_unregister for all files
+    ?line ok = 'oe_reg_m8':'oe_unregister'(),
+    ?line ok = 'oe_reg_m9':'oe_unregister'(),
+    ?line ok = 'oe_reg_m10':'oe_unregister'(),
+    ?line ok = 'oe_reg_m11':'oe_unregister'(),
+    ?line ok = 'oe_reg_m12':'oe_unregister'(),
+    code:del_path(OutDir),
+    ok.
+
+
+get_inh(OE_IFR,ID) ->
+    OE_CURRENT = orber_ifr:lookup_id(OE_IFR,ID),
+    INH_LIST = orber_ifr:get_base_interfaces(OE_CURRENT),
+    case INH_LIST of
+	[] ->
+	    io:format("~nInterface ~p inherits from nobody.~n",[ID]),
+	    [];
+	_ ->
+	    print_inh_list_ids(ID, INH_LIST, [])
+    end.
+
+print_inh_list_ids(_ID, [], Acc) ->
+    lists:reverse(Acc);
+print_inh_list_ids(ID, [H|T], Acc) ->
+    io:format("~n"),
+    Parent = orber_ifr:get_id(H),
+    io:format("Interface ~p inherits from ~p.~n", [ID, Parent]),
+    print_inh_list_ids(ID, T, [Parent|Acc]).
+
+
+
+
+stdopts(OutDir) ->
+    [{outdir, OutDir}, {maxerrs, infinity}].
+
+
+compile(Dir, Files) ->
+    compile(Dir, Files, []).
+
+compile(Dir, Files, Opts) ->
+    {ok, Cwd} = file:get_cwd(),
+    file:set_cwd(Dir),
+    io:format("Changing to ~p~n", [Dir]),
+    case catch do_compile(Files, Opts) of
+	ok ->
+	    file:set_cwd(Cwd);
+	Err ->
+	    file:set_cwd(Cwd),
+	    test_server:fail(Err)
+    end.
+
+do_compile([], _Opts) -> ok;
+do_compile([F | Fs], Opts) ->
+    io:format("Compiling ~p", [F]),
+    case compile:file(F, Opts) of
+	ok ->
+	    io:format(" ok~n", []),
+	    do_load(F, Opts),
+	    do_compile(Fs, Opts);
+	{ok, _} ->
+	    io:format(" ok~n", []),
+	    do_load(F, Opts),
+	    do_compile(Fs, Opts);
+	{ok, _, _} ->
+	    io:format(" ok~n", []),
+	    do_load(F, Opts),
+	    do_compile(Fs, Opts);
+	Err -> 
+	    io:format(" error: ~p~n", [Err]),
+	    Err
+    end.
+
+do_load(File, Opts) ->
+    case lists:member(load, Opts) of
+	true ->
+	    io:format("Loading file ~p", [File]),
+	    code:purge(File),
+	    R = code:load_abs(File),
+	    io:format("Loaded: ~p", [R]);
+	false ->
+	    ok
+    end.
+
+
+to_list(X) when is_atom(X) -> atom_to_list(X);
+to_list(X) -> X.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/ic/test/ic_register_SUITE_data/reg_m10.idl b/lib/ic/test/ic_register_SUITE_data/reg_m10.idl
new file mode 100644
index 0000000000..9c1f126b64
--- /dev/null
+++ b/lib/ic/test/ic_register_SUITE_data/reg_m10.idl
@@ -0,0 +1,37 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+//
+// IDL for testing register/unregister in the IFR when using included specs
+//
+#include "reg_m9.idl"
+
+typedef sequence<long> Sequence1;
+
+#include "reg_m8.idl"
+
+module m2 {
+  
+  interface i2 : m1::i1
+    {
+      short op3( in long a, inout char b, out long c );
+    };
+
+
+};
+
diff --git a/lib/ic/test/ic_register_SUITE_data/reg_m11.idl b/lib/ic/test/ic_register_SUITE_data/reg_m11.idl
new file mode 100644
index 0000000000..607d695357
--- /dev/null
+++ b/lib/ic/test/ic_register_SUITE_data/reg_m11.idl
@@ -0,0 +1,32 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+//
+// IDL for testing register/unregister in the IFR when using included specs
+//
+
+module m3 {
+  
+  interface i3 
+    {
+      short op4( in long a, inout char b, out long c );
+    };
+
+
+};
+
diff --git a/lib/ic/test/ic_register_SUITE_data/reg_m12.idl b/lib/ic/test/ic_register_SUITE_data/reg_m12.idl
new file mode 100644
index 0000000000..3dd9267655
--- /dev/null
+++ b/lib/ic/test/ic_register_SUITE_data/reg_m12.idl
@@ -0,0 +1,40 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+//
+// IDL for testing register/unregister in the IFR when using included specs
+// Special case with multiple inheritence.
+//
+#include "reg_m10.idl"
+#include "reg_m11.idl"
+
+module m4 {
+
+  interface i4 : m2::i2
+    {
+      short op5( in long a, inout char b, out long c );
+    };
+
+  interface i5 : m3::i3
+    {
+      short op6( in long a, inout char b, out long c );
+    };
+
+
+};
+
diff --git a/lib/ic/test/ic_register_SUITE_data/reg_m8.idl b/lib/ic/test/ic_register_SUITE_data/reg_m8.idl
new file mode 100644
index 0000000000..dc7432c05d
--- /dev/null
+++ b/lib/ic/test/ic_register_SUITE_data/reg_m8.idl
@@ -0,0 +1,32 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+//
+// IDL for testing register/unregister in the IFR when using included specs
+//
+module m0 {
+  
+  interface i0 {
+    void op1( in short c );
+    float op2( in char a);
+
+  };
+
+
+};
+
diff --git a/lib/ic/test/ic_register_SUITE_data/reg_m9.idl b/lib/ic/test/ic_register_SUITE_data/reg_m9.idl
new file mode 100644
index 0000000000..e937c41608
--- /dev/null
+++ b/lib/ic/test/ic_register_SUITE_data/reg_m9.idl
@@ -0,0 +1,32 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 1998-2010. 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%
+//
+// IDL for testing register/unregister in the IFR when using included specs
+//
+module m1 {
+  
+  interface i1 {
+    void op1( in short c );
+    float op2( in char a);
+
+  };
+
+
+};
+
diff --git a/lib/ic/test/java_client_erl_server_SUITE.erl b/lib/ic/test/java_client_erl_server_SUITE.erl
new file mode 100644
index 0000000000..bd87ce24d9
--- /dev/null
+++ b/lib/ic/test/java_client_erl_server_SUITE.erl
@@ -0,0 +1,340 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2003-2010. 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%
+%%
+%%
+%%%----------------------------------------------------------------------
+%%% Purpose : Test suite for the backends of the IDL compiler
+%%%----------------------------------------------------------------------
+
+-module(java_client_erl_server_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+
+-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]).
+-export([marshal_ll/1,marshal_ull/1,
+	 marshal_l/1,marshal_ul/1,
+	 marshal_s/1,marshal_us/1,
+	 marshal_c/1,marshal_wc/1,
+	 marshal_str/1,
+	 marshal_any_3/1,marshal_any_2/1]).
+
+
+%% Top of cases
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [marshal_ll, marshal_ull, marshal_l, marshal_ul,
+     marshal_s, marshal_us, marshal_c, marshal_wc,
+     marshal_str, marshal_any_3, marshal_any_2].
+
+init_per_suite(Config) when is_list(Config) ->
+    case case code:priv_dir(jinterface) of
+	     {error,bad_name} -> 
+		 false;
+	     P -> 
+		 filelib:is_dir(P) 
+	 end 
+	of
+	true -> 
+	    case find_executable(["java"]) of
+		false -> 
+		    {skip,"Found no Java VM"};
+		Path -> 
+		    [{java,Path}|Config]
+	    end;
+	false ->
+	    {skip,"No jinterface application"}
+    end.
+
+    
+find_executable([]) ->
+    false;
+find_executable([E|T]) ->
+    case os:find_executable(E) of
+	false -> find_executable(T);
+	Path -> Path
+    end.
+
+end_per_suite(Config) -> Config.
+
+
+
+%% Add/remove code path and watchdog before/after each test case.
+%%
+init_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:add_patha(DataDir),
+
+    %% Since other test suites use the module m_i et,al, we have
+    %% to make sure we are using the right modules.
+    code:purge(m_i),
+    code:purge(m_i_impl),
+    code:purge(oe_java_erl_test),
+    code:load_file(m_i),
+    code:load_file(m_i_impl),
+    code:load_file(oe_java_erl_test),
+
+    WatchDog = test_server:timetrap(test_server:seconds(20)),
+    [{watchdog, WatchDog}| Config].
+
+end_per_testcase(_Case, Config) ->
+    DataDir = ?config(data_dir, Config),
+    code:del_path(DataDir),
+    WatchDog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(WatchDog).
+
+
+
+%%--------------------------------------------------------------------
+%%
+%% Test cases
+
+marshal_ll(doc) ->
+    ["Testing marshalling of IDL long long"];
+marshal_ll(suite) -> [];
+marshal_ll(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {ok,Server} = m_i:oe_create_link([], {local,marshal_ll}),
+    ?line ok = java(?config(java, Config), DataDir, "JavaClient",
+		    ["JavaClient",node(),erlang:get_cookie(),marshal_ll]),
+    ?line ok = m_i:stop(Server),
+    ok.
+
+marshal_ull(doc) ->
+    ["Testing marshalling of IDL unsigned long long"];
+marshal_ull(suite) -> [];
+marshal_ull(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {ok,Server} = m_i:oe_create_link([], {local,marshal_ull}),
+    ?line ok = java(?config(java, Config), DataDir, "JavaClient",
+		    ["JavaClient",node(),erlang:get_cookie(),marshal_ull]),
+    ?line ok = m_i:stop(Server),
+    ok.
+
+marshal_l(doc) ->
+    ["Testing marshalling of IDL long"];
+marshal_l(suite) -> [];
+marshal_l(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {ok,Server} = m_i:oe_create_link([], {local,marshal_l}),
+    ?line ok = java(?config(java, Config), DataDir, "JavaClient",
+		    ["JavaClient",node(),erlang:get_cookie(),marshal_l]),
+    ?line ok = m_i:stop(Server),
+    ok.
+
+marshal_ul(doc) ->
+    ["Testing marshalling of IDL unsigned long"];
+marshal_ul(suite) -> [];
+marshal_ul(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {ok,Server} = m_i:oe_create_link([], {local,marshal_ul}),
+    ?line ok = java(?config(java, Config), DataDir, "JavaClient",
+		    ["JavaClient",node(),erlang:get_cookie(),marshal_ul]),
+    ?line ok = m_i:stop(Server),
+    ok.
+
+marshal_s(doc) ->
+    ["Testing marshalling of IDL short"];
+marshal_s(suite) -> [];
+marshal_s(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {ok,Server} = m_i:oe_create_link([], {local,marshal_s}),
+    ?line ok = java(?config(java, Config), DataDir, "JavaClient",
+		    ["JavaClient",node(),erlang:get_cookie(),marshal_s]),
+    ?line ok = m_i:stop(Server),
+    ok.
+
+marshal_us(doc) ->
+    ["Testing marshalling of IDL unsigned short"];
+marshal_us(suite) -> [];
+marshal_us(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {ok,Server} = m_i:oe_create_link([], {local,marshal_us}),
+    ?line ok = java(?config(java, Config), DataDir, "JavaClient",
+		    ["JavaClient",node(),erlang:get_cookie(),marshal_us]),
+    ?line ok = m_i:stop(Server),
+    ok.
+
+marshal_c(doc) ->
+    ["Testing marshalling of IDL char"];
+marshal_c(suite) -> [];
+marshal_c(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {ok,Server} = m_i:oe_create_link([], {local,marshal_c}),
+    ?line ok = java(?config(java, Config), DataDir, "JavaClient",
+		    ["JavaClient",node(),erlang:get_cookie(),marshal_c]),
+    ?line ok = m_i:stop(Server),
+    ok.
+
+marshal_wc(doc) ->
+    ["Testing marshalling of IDL char"];
+marshal_wc(suite) -> [];
+marshal_wc(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {ok,Server} = m_i:oe_create_link([], {local,marshal_wc}),
+    ?line ok = java(?config(java, Config), DataDir, "JavaClient",
+		    ["JavaClient",node(),erlang:get_cookie(),marshal_wc]),
+    ?line ok = m_i:stop(Server),
+    ok.
+
+marshal_str(doc) ->
+    ["Testing marshalling of IDL string"];
+marshal_str(suite) -> [];
+marshal_str(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {ok,Server} = m_i:oe_create_link([], {local,marshal_str}),
+    ?line ok = java(?config(java, Config), DataDir, 
+%%% 		    "-DOtpConnection.trace=4 "
+		    "JavaClient",
+		    ["JavaClient",node(),erlang:get_cookie(),marshal_str]),
+    ?line ok = m_i:stop(Server),
+    ok.
+
+marshal_any_3(doc) ->
+    ["Testing marshalling of IDL any"];
+marshal_any_3(suite) -> [];
+marshal_any_3(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {ok,Server} = m_i:oe_create_link([], {local,marshal_any_3}),
+    ?line ok = java(?config(java, Config), DataDir, "JavaClient",
+		    ["JavaClient",node(),erlang:get_cookie(),marshal_any_3]),
+    ?line ok = m_i:stop(Server),
+    ok.
+
+marshal_any_2(doc) ->
+    ["Testing marshalling of IDL any"];
+marshal_any_2(suite) -> [];
+marshal_any_2(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line {ok,Server} = m_i:oe_create_link([], {local,marshal_any_2}),
+    ?line ok = java(?config(java, Config), DataDir, "JavaClient",
+		    ["JavaClient",node(),erlang:get_cookie(),marshal_any_2]),
+    ?line ok = m_i:stop(Server),
+    ok.
+
+%%--------------------------------------------------------------------
+%%
+%% Utilities
+
+
+java(Java, Dir, ClassAndArgs) ->
+    cmd(Java++" -classpath "++classpath(Dir)++" "++ClassAndArgs).
+
+java(Java, Dir, Class, Args) ->
+    java(Java, Dir, Class++" "++to_string(Args)).
+
+to_string([H|T]) when is_integer(H) ->
+    integer_to_list(H)++" "++to_string(T);
+to_string([H|T]) when is_atom(H) ->
+    atom_to_list(H)++" "++to_string(T);
+to_string([H|T]) when is_list(H) ->
+    lists:flatten(H)++" "++to_string(T);
+to_string([]) -> [].
+
+% javac(Dir, File) ->
+%     cmd("javac -d "++Dir++" -classpath "++classpath(Dir)++" "++
+% 	filename:join(Dir, File)).
+
+classpath(Dir) ->
+    PS = 
+	case os:type() of
+	    {win32, _} -> ";";
+	    _          -> ":"
+	end,
+    Dir++PS++
+	filename:join([code:lib_dir(ic),"priv","ic.jar"])++PS++
+	filename:join([code:lib_dir(jinterface),"priv","OtpErlang.jar"])++PS++
+	case os:getenv("CLASSPATH") of
+	    false -> "";
+	    Classpath -> Classpath
+	end.
+
+
+cmd(Cmd) ->
+    PortOpts = [{line,80},eof,exit_status,stderr_to_stdout],
+    io:format("<cmd> ~s~n", [Cmd]),
+    case catch open_port({spawn,Cmd}, PortOpts) of
+	Port when is_port(Port) ->
+	    Result = cmd_loop(Port, []),
+	    io:format("<cmd=~w>~n", [Result]),
+	    case Result of
+		0 -> ok;
+		ExitCode when is_integer(ExitCode) -> {error,ExitCode};
+		Error -> Error
+	    end;
+	{'EXIT',Reason} ->
+	    {error,Reason}
+    end.
+
+cmd_loop(Port, Line) ->
+    receive
+	{Port,eof} ->
+	    receive 
+		{Port,{exit_status,ExitStatus}} ->
+		    ExitStatus
+	    after 1 -> 
+		    undefined 
+	    end;
+	{Port,{exit_status,ExitStatus}} ->
+	    receive 
+		{Port,eof} -> 
+		    ok after 1 -> ok end,
+	    ExitStatus;
+	{Port,{data,{Tag,Data}}} ->
+	    case Tag of
+		eol ->
+		    io:put_chars([Line|cr_to_nl(Data)]),
+		    io:nl(),
+		    cmd_loop(Port, []);
+		noeol ->
+		    cmd_loop(Port, [Line|cr_to_nl(Data)])
+	    end;
+	{'EXIT',Port,Reason} ->
+	    {error,Reason};
+	Other ->
+	    io:format("WARNING: Unexpected at ~s:~p: ~p~n", 
+		      [?MODULE_STRING,?LINE,Other]),
+	    cmd_loop(Port, Line)
+    end.
+
+%% Convert lonely CR to NL, and CRLF to NL
+%%
+cr_to_nl([$\r,$\n|T]) ->
+    [$\n|cr_to_nl(T)];
+cr_to_nl([$\r|T]) ->
+    [$\n|cr_to_nl(T)];
+cr_to_nl([C|T]) ->
+    [C|cr_to_nl(T)];
+cr_to_nl([]) ->
+    [].
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/JavaClient.java b/lib/ic/test/java_client_erl_server_SUITE_data/JavaClient.java
new file mode 100644
index 0000000000..1881279ac8
--- /dev/null
+++ b/lib/ic/test/java_client_erl_server_SUITE_data/JavaClient.java
@@ -0,0 +1,759 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2003-2009. 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%
+ *
+ */
+public class JavaClient {
+
+    public static void main(String[] argv) 
+    {
+	System.out.println("Hello World!");
+	if (argv.length < 4) {
+	    System.out.println("Too few arguments!");
+	    System.exit(1);
+	}
+	//      for (int j = 0; j < argv.length; j++)
+	//        System.out.println(argv[j]);
+	try {
+	    if (argv[3].equals("marshal_ll")) {
+		System.out.println("marshal_ll");
+		marshal_ll(argv[0], argv[1], argv[2], argv[3]);
+	    } 
+	    else if (argv[3].equals("marshal_ull")) {
+		marshal_ull(argv[0], argv[1], argv[2], argv[3]);
+	    } 
+	    else if (argv[3].equals("marshal_l")) {
+		marshal_l(argv[0], argv[1], argv[2], argv[3]);
+	    } 
+	    else if (argv[3].equals("marshal_ul")) {
+		marshal_ul(argv[0], argv[1], argv[2], argv[3]);
+	    } 
+	    else if (argv[3].equals("marshal_s")) {
+		marshal_s(argv[0], argv[1], argv[2], argv[3]);
+	    } 
+	    else if (argv[3].equals("marshal_us")) {
+		marshal_us(argv[0], argv[1], argv[2], argv[3]);
+	    } 
+	    else if (argv[3].equals("marshal_c")) {
+		marshal_c(argv[0], argv[1], argv[2], argv[3]);
+	    } 
+	    else if (argv[3].equals("marshal_wc")) {
+		marshal_wc(argv[0], argv[1], argv[2], argv[3]);
+	    } 
+	    else if (argv[3].equals("marshal_str")) {
+		marshal_str(argv[0], argv[1], argv[2], argv[3]);
+	    } 
+	    else if (argv[3].equals("marshal_any_3")) {
+		marshal_any_3(argv[0], argv[1], argv[2], argv[3]);
+	    } 
+	    else if (argv[3].equals("marshal_any_2")) {
+		marshal_any_2(argv[0], argv[1], argv[2], argv[3]);
+	    } 
+	    else {
+		System.out.println("Unknown test: "+argv[3]);
+		System.exit(2);
+	    }
+	} catch (java.lang.Exception e) {
+	    System.out.println("Exception!: "+e);
+	    System.exit(3);
+	}
+	System.exit(0);
+    }
+
+
+
+    static void marshal_ll(String selfNode, String peerNode,
+			   String cookie, String serverName)
+	throws java.lang.Exception
+    {
+	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
+	// Just warming up..
+	System.out.println("Just warming up.."+i);
+	verify_ll(i, 3, 2, 1);
+	verify_ll(i, 5, 4, 3);
+	verify_ll(i, -128, 0, 1);
+	// The small integer border
+	verify_ll(i, 255, 0, 1);
+	verify_ll(i, 256, 0, 1);
+	// The integer border
+	verify_ll(i, (1L<<26)-1L, 0L, 1);
+	verify_ll(i, 1L<<26, 0L, 1);
+	verify_ll(i, -(1L<<26), 0L, 1);
+	verify_ll(i, (1L<<27)-1L, 0L, 1);
+	verify_ll(i, 1L<<27, 0L, 1);
+	verify_ll(i, -(1L<<27), 0L, 1);
+	// Bignum byte borders
+	verify_ll(i, (1L<<32)-1L, 0L, 1);
+	verify_ll(i, 1L<<32, 0L, 1);
+	verify_ll(i, -(1L<<32)+1L, 0L, 1);
+	verify_ll(i, -(1L<<32), 0L, 1);
+	verify_ll(i, (1L<<40)-1L, 0L, 1);
+	verify_ll(i, 1L<<40, 0L, 1);
+	verify_ll(i, -(1L<<40)+1L, 0L, 1);
+	verify_ll(i, -(1L<<40), 0L, 1);
+	verify_ll(i, (1L<<48)-1L, 0L, 1);
+	verify_ll(i, 1L<<48, 0L, 1);
+	verify_ll(i, -(1L<<48)+1L, 0L, 1);
+	verify_ll(i, -(1L<<48), 0L, 1);
+	// Java long border
+	verify_ll(i, java.lang.Long.MAX_VALUE, 0L, 1);
+	verify_ll(i, java.lang.Long.MIN_VALUE, 0L, 1);
+	verify_ll(i, -1L, 0L, 1);
+	// Impossible decodes
+	verify_ll_bad(i, java.lang.Long.MAX_VALUE, -1L, 1);
+	verify_ll_bad(i, java.lang.Long.MIN_VALUE, 1L, 1);
+	verify_ll_bad(i, java.lang.Long.MIN_VALUE, 0L, -1);
+	verify_ll_bad(i, java.lang.Long.MAX_VALUE, -1L, 2);
+	verify_ll_bad(i, java.lang.Long.MIN_VALUE, 0L, 2);
+    }
+
+    static void marshal_ull(String selfNode, String peerNode,
+			    String cookie, String serverName)
+	throws java.lang.Exception
+    {
+	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
+	// Just warming up..
+	verify_ull(i, 3, 2, 1);
+	verify_ull(i, 5, 4, 3);
+	// The small integer border
+	verify_ull(i, 255, 0, 1);
+	verify_ull(i, 256, 0, 1);
+	// The integer border
+	verify_ull(i, (1L<<26)-1L, 0L, 1);
+	verify_ull(i, 1L<<26, 0L, 1);
+	verify_ull(i, (1L<<27)-1L, 0L, 1);
+	verify_ull(i, 1L<<27, 0L, 1);
+	// Bignum byte borders
+	verify_ull(i, (1L<<32)-1L, 0L, 1);
+	verify_ull(i, 1L<<32, 0L, 1);
+	verify_ull(i, (1L<<40)-1L, 0L, 1);
+	verify_ull(i, 1L<<40, 0L, 1);
+	verify_ull(i, (1L<<48)-1L, 0L, 1);
+	verify_ull(i, 1L<<48, 0L, 1);
+	// Java long border
+	verify_ull(i, java.lang.Long.MAX_VALUE, 0L, 1);
+	verify_ull(i, java.lang.Long.MIN_VALUE, 0L, 1);
+	verify_ull(i, -1L, 0L, 1);
+	verify_ull(i, java.lang.Long.MAX_VALUE, 
+		   java.lang.Long.MIN_VALUE, 1);
+	// Impossible decodes
+	verify_ull_bad(i, -1L, -1L, 1);
+	verify_ull_bad(i, java.lang.Long.MAX_VALUE, -1L, 2);
+    }
+
+    static void marshal_l(String selfNode, String peerNode,
+			  String cookie, String serverName)
+	throws java.lang.Exception
+    {
+	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
+	// Just warming up..
+	verify_l(i, 3, 2, 1);
+	verify_l(i, 5, 4, 3);
+	verify_l(i, -128, 0, 1);
+	// The small integer border
+	verify_l(i, 255, 0, 1);
+	verify_l(i, 256, 0, 1);
+	// The integer border
+	verify_l(i, (1<<26)-1, 0, 1);
+	verify_l(i, 1<<26, 0, 1);
+	verify_l(i, -(1<<26), 0, 1);
+	verify_l(i, (1<<27)-1, 0, 1);
+	verify_l(i, 1<<27, 0, 1);
+	verify_l(i, -(1<<27), 0, 1);
+	// Java int border
+	verify_l(i, java.lang.Integer.MAX_VALUE, 0, 1);
+	verify_l(i, java.lang.Integer.MIN_VALUE, 0, 1);
+	// Impossible decodes
+	verify_l_bad(i, java.lang.Integer.MAX_VALUE, -1, 1);
+	verify_l_bad(i, java.lang.Integer.MIN_VALUE, 1, 1);
+	verify_l_bad(i, java.lang.Integer.MIN_VALUE, 0, -1);
+    }
+
+    static void marshal_ul(String selfNode, String peerNode,
+			   String cookie, String serverName)
+	throws java.lang.Exception
+    {
+	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
+	// Just warming up..
+	verify_ul(i, 3, 2, 1);
+	verify_ul(i, 5, 4, 3);
+	// The small integer border
+	verify_ul(i, 255, 0, 1);
+	verify_ul(i, 256, 0, 1);
+	// The integer border
+	verify_ul(i, (1<<26)-1, 0, 1);
+	verify_ul(i, 1<<26, 0, 1);
+	verify_ul(i, (1<<27)-1, 0, 1);
+	verify_ul(i, 1<<27, 0, 1);
+	// Java int border
+	verify_ul(i, java.lang.Integer.MAX_VALUE, 0, 1);
+	verify_ul(i, java.lang.Integer.MIN_VALUE, 0, 1);
+	verify_ul(i, -1, 0, 1);
+	verify_ul(i, java.lang.Integer.MAX_VALUE, 
+		  java.lang.Integer.MIN_VALUE, 1);
+	// Impossible decodes
+	verify_ul_bad(i, -1, -1, 1);
+    }
+
+    static void marshal_s(String selfNode, String peerNode,
+			  String cookie, String serverName)
+	throws java.lang.Exception
+    {
+	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
+	// Just warming up..
+	verify_s(i, 3, 2, 1);
+	verify_s(i, 5, 4, 3);
+	verify_s(i, -128, 0, 1);
+	// The small integer border
+	verify_s(i, 255, 0, 1);
+	verify_s(i, 256, 0, 1);
+	// Java short border
+	verify_s(i, java.lang.Short.MAX_VALUE, 0, 1);
+	verify_s(i, java.lang.Short.MIN_VALUE, 0, 1);
+	// Impossible decodes
+	verify_s_bad(i, java.lang.Short.MAX_VALUE, -1, 1);
+	verify_s_bad(i, java.lang.Short.MIN_VALUE, 1, 1);
+	verify_s_bad(i, java.lang.Short.MIN_VALUE, 0, -1);
+    }
+
+    static void marshal_us(String selfNode, String peerNode,
+			   String cookie, String serverName)
+	throws java.lang.Exception
+    {
+	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
+	// Just warming up..
+	verify_us(i, 3, 2, 1);
+	verify_us(i, 5, 4, 3);
+	// The small integer border
+	verify_us(i, 255, 0, 1);
+	verify_us(i, 256, 0, 1);
+	// Java short border
+	verify_us(i, java.lang.Short.MAX_VALUE, 0, 1);
+	verify_us(i, java.lang.Short.MIN_VALUE, 0, 1);
+	verify_us(i, -1, 0, 1);
+	verify_us(i, java.lang.Short.MAX_VALUE, 
+		  java.lang.Short.MIN_VALUE, 1);
+	// Impossible decodes
+	verify_us_bad(i, -1, -1, 1);
+    }
+
+    static void marshal_c(String selfNode, String peerNode,
+			   String cookie, String serverName)
+	throws java.lang.Exception
+    {
+	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
+	// Just warming up..
+	verify_c(i, '\3', '\2', 1);
+	verify_c(i, '\5', '\4', 3);
+	// The small integer border
+	verify_c(i, '\u00FF', '\0', 1);
+	verify_c(i, '\u0100', '\0', 1);
+	// Java char border
+	verify_c(i, java.lang.Character.MAX_VALUE, '\0', 1);
+	verify_c(i, java.lang.Character.MIN_VALUE, '\0', 1);
+	verify_c(i, java.lang.Character.MAX_VALUE, 
+		  java.lang.Character.MIN_VALUE, 1);
+	// Impossible decodes
+	verify_c_bad(i, '\u8000', '\0', 2);
+    }
+
+    static void marshal_wc(String selfNode, String peerNode,
+			   String cookie, String serverName)
+	throws java.lang.Exception
+    {
+	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
+	// Just warming up..
+	verify_wc(i, '\3', '\2', 1);
+	verify_wc(i, '\5', '\4', 3);
+	// The small integer border
+	verify_wc(i, '\u00FF', '\0', 1);
+	verify_wc(i, '\u0100', '\0', 1);
+	// Java char border
+	verify_wc(i, java.lang.Character.MAX_VALUE, '\0', 1);
+	verify_wc(i, java.lang.Character.MIN_VALUE, '\0', 1);
+	verify_wc(i, java.lang.Character.MAX_VALUE, 
+		  java.lang.Character.MIN_VALUE, 1);
+	// Impossible decodes
+	verify_c_bad(i, '\u8000', '\0', 2);
+    }
+
+    static void marshal_str(String selfNode, String peerNode,
+			    String cookie, String serverName)
+	throws java.lang.Exception
+    {
+	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
+	// Just warming up..
+	verify_str(i, 100, 100);
+	verify_str(i, 100, 1);
+	// Erlang string border
+	verify_str(i, 65535, 1);
+	verify_str(i, 2, 65535);
+	// Erlang string border out
+	verify_str(i, 65536, 1);
+	verify_str(i, 65536, 65536);
+    }
+
+    static void marshal_any_3(String selfNode, String peerNode,
+			      String cookie, String serverName)
+	throws java.lang.Exception
+    {
+	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
+	com.ericsson.otp.ic.Any x = new com.ericsson.otp.ic.Any();
+	com.ericsson.otp.ic.Any y = new com.ericsson.otp.ic.Any();
+	com.ericsson.otp.ic.Any z = new com.ericsson.otp.ic.Any();
+	
+	x.insert_longlong(java.lang.Long.MAX_VALUE);
+	y.insert_longlong(1L);
+	z.insert_longlong(java.lang.Long.MAX_VALUE-1L);
+	System.out.println("verify_any_3 longlong max");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_longlong(java.lang.Long.MIN_VALUE);
+	y.insert_longlong(-1L);
+	z.insert_longlong(java.lang.Long.MIN_VALUE+1L);
+	System.out.println("verify_any_3 longlong min");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_ulonglong(-1L);
+	y.insert_longlong(1L);
+	z.insert_ulonglong(-2L);
+	System.out.println("verify_any_3 ulonglong max");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_ulonglong(0L);
+	y.insert_longlong(-1L);
+	z.insert_ulonglong(1L);
+	System.out.println("verify_any_3 ulonglong min");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_long(java.lang.Integer.MAX_VALUE);
+	y.insert_long(1);
+	z.insert_long(java.lang.Integer.MAX_VALUE-1);
+	System.out.println("verify_any_3 long max");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_long(java.lang.Integer.MIN_VALUE);
+	y.insert_long(-1);
+	z.insert_long(java.lang.Integer.MIN_VALUE+1);
+	System.out.println("verify_any_3 long min");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_ulong(-1);
+	y.insert_long(1);
+	z.insert_ulong(-2);
+	System.out.println("verify_any_3 ulong max");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_ulong(0);
+	y.insert_long(-1);
+	z.insert_ulong(1);
+	System.out.println("verify_any_3 ulong min");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_short(java.lang.Short.MAX_VALUE);
+	y.insert_short((short)1);
+	z.insert_short((short)(java.lang.Short.MAX_VALUE-1));
+	System.out.println("verify_any_3 short max");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_short(java.lang.Short.MIN_VALUE);
+	y.insert_short((short)-1);
+	z.insert_short((short)(java.lang.Short.MIN_VALUE+1));
+	System.out.println("verify_any_3 short min");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_ushort((short)-1);
+	y.insert_short((short)1);
+	z.insert_ushort((short)-2);
+	System.out.println("verify_any_3 ushort max");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_ushort((short)0);
+	y.insert_short((short)-1);
+	z.insert_ushort((short)1);
+	System.out.println("verify_any_3 ushort min");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_char('\377');
+	y.insert_char('\1');
+	z.insert_char('\376');
+	System.out.println("verify_any_3 char max");
+	verify_any_3(i, x, y, 1, z);
+	
+	x.insert_wchar('\uFFFF');
+	y.insert_wchar('\u0001');
+	z.insert_wchar('\uFFFE');
+	System.out.println("verify_any_3 char max");
+	verify_any_3(i, x, y, 1, z);
+    }
+
+    static void marshal_any_2(String selfNode, String peerNode,
+			      String cookie, String serverName)
+	throws java.lang.Exception
+    {
+	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
+	m.s s = new m.s();
+	com.ericsson.otp.ic.Any a = new com.ericsson.otp.ic.Any();
+	//
+	s.ull_x = -1L;
+	s.ll_x = java.lang.Long.MAX_VALUE;
+	s.ll_y = 1L;
+	s.ull_z = -2L;
+	s.ll_z = java.lang.Long.MAX_VALUE-1L;
+	//
+	s.ul_x = -1;
+	s.l_x = java.lang.Integer.MAX_VALUE;
+	s.l_y = 1;
+	s.ul_z = -2;
+	s.l_z = java.lang.Integer.MAX_VALUE-1;
+	//
+	s.us_x = (short)-1;
+	s.s_x = java.lang.Short.MAX_VALUE;
+	s.s_y = (short)1;
+	s.us_z = (short)-2;
+	s.s_z = (short)(java.lang.Short.MAX_VALUE-1);
+	//
+	s.c_x = '\377';
+	s.c_y = '\1';
+	s.c_z = '\376';
+	s.wc_x = '\uFFFF';
+	s.wc_y = '\u0001';
+	s.wc_z = '\uFFFE';
+	m.sHelper.insert(a, s);
+	verify_any_2(i, a, 1);
+	
+	s.ull_x = 0L;
+	s.ll_x = java.lang.Long.MIN_VALUE;
+	s.ll_y = -1L;
+	s.ull_z = 1L;
+	s.ll_z = java.lang.Long.MIN_VALUE+1L;
+	//
+	s.ul_x = 0;
+	s.l_x = java.lang.Integer.MIN_VALUE;
+	s.l_y = -1;
+	s.ul_z = 1;
+	s.l_z = java.lang.Integer.MIN_VALUE+1;
+	//
+	s.us_x = (short)0;
+	s.s_x = java.lang.Short.MIN_VALUE;
+	s.s_y = (short)-1;
+	s.us_z = (short)1;
+	s.s_z = (short)(java.lang.Short.MIN_VALUE+1);
+	//
+	s.c_x = '\0';
+	s.c_y = '\0';
+	s.c_z = '\0';
+	s.wc_x = '\u0000';
+	s.wc_y = '\u0000';
+	s.wc_z = '\u0000';
+	m.sHelper.insert(a, s);
+	verify_any_2(i, a, 1);
+    }
+
+
+    static void verify_ll(m._iStub i, long x, long y, int b) 
+	throws java.lang.Exception 
+    {
+	m.s a = new m.s();
+	System.out.println("verify_ll "+a);
+	a.ll_x = x;
+	a.ll_y = y;
+	long expected = (x - y)*(short)b;
+	long result = i.marshal_ll(a, (short)b);
+	if (result == expected) {
+	    System.out.println("verify_ll("+x+", "+y+", "+b+") => "
+			       +result);
+	} else {
+	    System.out.println("verify_ll("+x+", "+y+", "+b+") => "
+			       +result+" != "+expected);
+	    System.exit(4);
+	}
+    }
+
+    static void verify_ull(m._iStub i, long x, long y, int b) 
+	throws java.lang.Exception 
+    {
+	m.s a = new m.s();
+	a.ull_x = x;
+	a.ll_y = y;
+	long expected = (x - y)*(short)b;
+	long result = i.marshal_ull(a, (short)b);
+	if (result == expected) {
+	    System.out.println("verify_ull("+x+", "+y+", "+b+") => "
+			       +result);
+	} else {
+	    System.out.println("verify_ull("+x+", "+y+", "+b+") => "
+			       +result+" != "+expected);
+	    System.exit(4);
+	}
+    }
+
+    static void verify_l(m._iStub i, int x, int y, int b) 
+	throws java.lang.Exception 
+    {
+	m.s a = new m.s();
+	a.l_x = x;
+	a.l_y = y;
+	int expected = (x - y)*(short)b;
+	int result = i.marshal_l(a, (short)b);
+	if (result == expected) {
+	    System.out.println("verify_l("+x+", "+y+", "+b+") => "
+			       +result);
+	} else {
+	    System.out.println("verify_l("+x+", "+y+", "+b+") => "
+			       +result+" != "+expected);
+	    System.exit(4);
+	}
+    }
+
+    static void verify_ul(m._iStub i, int x, int y, int b) 
+	throws java.lang.Exception 
+    {
+	m.s a = new m.s();
+	a.ul_x = x;
+	a.l_y = y;
+	int expected = (x - y)*(short)b;
+	int result = i.marshal_ul(a, (short)b);
+	if (result == expected) {
+	    System.out.println("verify_ul("+x+", "+y+", "+b+") => "
+			       +result);
+	} else {
+	    System.out.println("verify_ul("+x+", "+y+", "+b+") => "
+			       +result+" != "+expected);
+	    System.exit(4);
+	}
+    }
+
+    static void verify_s(m._iStub i, int x, int y, int b) 
+	throws java.lang.Exception 
+    {
+	m.s a = new m.s();
+	a.s_x = (short)x;
+	a.s_y = (short)y;
+	short expected = (short)((x - y)*(short)b);
+	short result = i.marshal_s(a, (short)b);
+	if (result == expected) {
+	    System.out.println("verify_s("+x+", "+y+", "+b+") => "
+			       +result);
+	} else {
+	    System.out.println("verify_s("+x+", "+y+", "+b+") => "
+			       +result+" != "+expected);
+	    System.exit(4);
+	}
+    }
+
+    static void verify_us(m._iStub i, int x, int y, int b) 
+	throws java.lang.Exception 
+    {
+	m.s a = new m.s();
+	a.us_x = (short)x;
+	a.s_y = (short)y;
+	short expected = (short)((x - y)*(short)b);
+	short result = i.marshal_us(a, (short)b);
+	if (result == expected) {
+	    System.out.println("verify_us("+x+", "+y+", "+b+") => "
+			       +result);
+	} else {
+	    System.out.println("verify_us("+x+", "+y+", "+b+") => "
+			       +result+" != "+expected);
+	    System.exit(4);
+	}
+    }
+
+    static void verify_c(m._iStub i, char x, char y, int b) 
+	throws java.lang.Exception 
+    {
+	m.s a = new m.s();
+	a.c_x = x;
+	a.c_y = y;
+	char expected = (char)(((int)x - (int)y)*(short)b);
+	char result = i.marshal_c(a, (short)b);
+	if (result == expected) {
+	    System.out.println("verify_c("+x+", "+y+", "+b+") => "
+			       +result);
+	} else {
+	    System.out.println("verify_c("+x+", "+y+", "+b+") => "
+			       +result+" != "+expected);
+	    System.exit(4);
+	}
+    }
+
+    static void verify_wc(m._iStub i, char x, char y, int b) 
+	throws java.lang.Exception 
+    {
+	m.s a = new m.s();
+	a.wc_x = x;
+	a.wc_y = y;
+	char expected = (char)(((int)x - (int)y)*(short)b);
+	char result = i.marshal_wc(a, (short)b);
+	if (result == expected) {
+	    System.out.println("verify_wc("+x+", "+y+", "+b+") => "
+			       +result);
+	} else {
+	    System.out.println("verify_wc("+x+", "+y+", "+b+") => "
+			       +result+" != "+expected);
+	    System.exit(4);
+	}
+    }
+
+    static void verify_str(m._iStub i, int a_len, int b_len) 
+	throws java.lang.Exception 
+    {
+	String a = mk_str(a_len);
+	String b = mk_str(b_len);
+	String expected = a + b;
+	String result = i.strcat(a, b);
+	if (result.equals(expected)) {
+	    System.out.println("verify_str(\""+a+"\", \""+b+"\") => \""
+			       +result+"\"");
+	} else {
+	    System.out.println("verify_str(\""+a+"\", \""+b+"\") => \""
+			       +result+"\" != \""+expected.length()+"\"");
+	    System.exit(4);
+	}
+    }
+
+    static String mk_str(int len) 
+	throws StringIndexOutOfBoundsException
+    {
+	StringBuffer s = new StringBuffer();
+	// 17 characters is prime relative all bases of two - on purpose
+	do s.append("qwertyuiopasdfghj"); while (s.length() < len);
+	return s.substring(0, len);
+    }
+
+    static void verify_any_3(m._iStub i, 
+			   com.ericsson.otp.ic.Any x, 
+			   com.ericsson.otp.ic.Any y, 
+			   int b, 
+			   com.ericsson.otp.ic.Any expected) 
+	throws java.lang.Exception 
+    {
+	com.ericsson.otp.ic.Any result = i.marshal_any_3(x, y, (short)b);
+	if (! expected.equal(result)) {
+	    System.exit(4);
+	}
+    }
+
+    static void verify_any_2(m._iStub i, com.ericsson.otp.ic.Any a, int b)
+	throws java.lang.Exception 
+    {
+	com.ericsson.otp.ic.Any result = i.marshal_any_2(a, (short)b);
+	if (! a.equal(result)) {
+	    System.exit(4);
+	}
+    }
+
+
+
+    static void verify_ll_bad(m._iStub i, long x, long y, int b)
+	throws java.lang.Exception
+    {
+	try {
+	    verify_ll(i, x, y, b);
+	    System.out.println("Expected exception missing!");
+	    System.exit(5);
+	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
+	    System.out.println("Expected exception: "+e);
+	}
+    }
+
+    static void verify_ull_bad(m._iStub i, long x, long y, int b)
+	throws java.lang.Exception
+    {
+	try {
+	    verify_ull(i, x, y, b);
+	    System.out.println("Expected exception missing!");
+	    System.exit(5);
+	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
+	    System.out.println("Expected exception: "+e);
+	}
+    }
+
+    static void verify_l_bad(m._iStub i, int x, int y, int b)
+	throws java.lang.Exception
+    {
+	try {
+	    verify_l(i, x, y, b);
+	    System.out.println("Expected exception missing!");
+	    System.exit(5);
+	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
+	    System.out.println("Expected exception: "+e);
+	}
+    }
+
+    static void verify_ul_bad(m._iStub i, int x, int y, int b)
+	throws java.lang.Exception
+    {
+	try {
+	    verify_ul(i, x, y, b);
+	    System.out.println("Expected exception missing!");
+	    System.exit(5);
+	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
+	    System.out.println("Expected exception: "+e);
+	}
+    }
+
+    static void verify_s_bad(m._iStub i, int x, int y, int b)
+	throws java.lang.Exception
+    {
+	try {
+	    verify_s(i, x, y, b);
+	    System.out.println("Expected exception missing!");
+	    System.exit(5);
+	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
+	    System.out.println("Expected exception: "+e);
+	}
+    }
+
+    static void verify_us_bad(m._iStub i, int x, int y, int b)
+	throws java.lang.Exception
+    {
+	try {
+	    verify_us(i, x, y, b);
+	    System.out.println("Expected exception missing!");
+	    System.exit(5);
+	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
+	    System.out.println("Expected exception: "+e);
+	}
+    }
+
+    static void verify_c_bad(m._iStub i, char x, char y, int b)
+	throws java.lang.Exception
+    {
+	try {
+	    verify_c(i, x, y, b);
+	    System.out.println("Expected exception missing!");
+	    System.exit(5);
+	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
+	    System.out.println("Expected exception: "+e);
+	}
+    }
+
+    static void verify_wc_bad(m._iStub i, char x, char y, int b)
+	throws java.lang.Exception
+    {
+	try {
+	    verify_wc(i, x, y, b);
+	    System.out.println("Expected exception missing!");
+	    System.exit(5);
+	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
+	    System.out.println("Expected exception: "+e);
+	}
+    }
+
+}
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..de1503401c
--- /dev/null
+++ b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
@@ -0,0 +1,88 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2003-2009. 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%
+#
+#
+# Makefile.src for java_client_erl_server test
+# Note: This file *must* work for both Unix and Windows
+#
+# We use both `rm' (Unix) and `del' (Windows) for removing files, but
+# with a `-' in front so that the error in not finding `rm' (`del') on
+# Windows (Unix) is ignored.
+#
+# VxWorks? XXX 
+#
+
+.SUFFIXES:
+.SUFFIXES: .erl .idl .@EMULATOR@ .java
+
+
+JAVAC = @JAVAC@
+ERLC = erlc
+
+# ic variables available from ts: 
+#
+# ic_libpath: @ic_libpath@
+# ic_include_path: @ic_include_path@
+
+IC_INCLUDE_PATH = @ic_include_path@
+IC_CLASSPATH = @ic_classpath@
+
+JINTERFACE_CLASSPATH = @jinterface_classpath@
+
+CLASSPATH = .@PS@$(IC_CLASSPATH)@PS@$(JINTERFACE_CLASSPATH)@PS@
+
+GEN_JAVA_FILES = \
+	m@DS@_iImplBase.java \
+	m@DS@_iStub.java \
+	m@[email protected] m@[email protected] m@[email protected] \
+	m@[email protected] m@[email protected] m@[email protected]
+
+GEN_HRL_FILES = \
+	m.hrl \
+	m_i.hrl \
+	oe_java_erl_test.hrl
+
+GEN_ERL_FILES = \
+	m_i.erl \
+	oe_java_erl_test.erl
+
+JAVA_FILES = $(GEN_JAVA_FILES) JavaClient.java
+CLASS_FILES = $(JAVA_FILES:.java=.class)
+ERL_FILES = $(GEN_ERL_FILES) m_i_impl.erl
+EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
+
+
+all: $(CLASS_FILES) $(EBINS)
+
+clean:	
+	-rm -f $(GEN_JAVA_FILES) $(CLASS_FILES) \
+		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) 
+	-del /F /Q $(GEN_JAVA_FILES) $(CLASS_FILES) \
+		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) 
+
+$(GEN_JAVA_FILES) : java_erl_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,java}" java_erl_test.idl
+
+$(CLASS_FILES) : $(JAVA_FILES)
+	$(JAVAC) -classpath $(CLASSPATH) $(JAVA_FILES)
+
+$(GEN_ERL_FILES) $(GEN_HRL_FILES): java_erl_test.idl
+	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" java_erl_test.idl
+
+.erl.@EMULATOR@:
+	$(ERLC) -I $(IC_INCLUDE_PATH) $<
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/java_erl_test.idl b/lib/ic/test/java_client_erl_server_SUITE_data/java_erl_test.idl
new file mode 100644
index 0000000000..b72c972d3b
--- /dev/null
+++ b/lib/ic/test/java_client_erl_server_SUITE_data/java_erl_test.idl
@@ -0,0 +1,68 @@
+
+
+// %CopyrightBegin%
+// 
+// Copyright Ericsson AB 2003-2010. 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 m {
+    
+    struct s {
+	long long ll_x;
+	unsigned long long ull_x;
+	long long ll_y;
+	long long ll_z;
+	unsigned long long ull_z;
+
+	long l_x;
+	unsigned long ul_x;
+	long l_y;
+	long l_z;
+	unsigned long ul_z;
+	
+	short s_x;
+	unsigned short us_x;
+	short s_y;
+	short s_z;
+	unsigned short us_z;
+	
+	char c_x;
+	char c_y;
+	char c_z;
+        
+	wchar wc_x;
+	wchar wc_y;
+	wchar wc_z;
+    };
+    
+    interface i {
+	long long marshal_ll( in s a, in short b );
+	unsigned long long marshal_ull( in s a, in short b );
+	
+	long marshal_l( in s a, in short b );
+	unsigned long marshal_ul( in s a, in short b );
+	
+	short marshal_s( in s a, in short b );
+	unsigned short marshal_us( in s a, in short b );
+	
+	char marshal_c( in s a, in short b );
+	wchar marshal_wc( in s a, in short b );
+        
+        string strcat( in string a, in string b );
+        
+	any marshal_any_3( in any x, in any y, in short b );
+	any marshal_any_2( in any a, in short b );
+    };
+
+};
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/m_i_impl.erl b/lib/ic/test/java_client_erl_server_SUITE_data/m_i_impl.erl
new file mode 100644
index 0000000000..77e532288f
--- /dev/null
+++ b/lib/ic/test/java_client_erl_server_SUITE_data/m_i_impl.erl
@@ -0,0 +1,169 @@
+%%--------------------------------------------------------------------
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2003-2009. 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(m_i_impl).
+
+-export([marshal_ll/3,marshal_ull/3,
+	 marshal_l/3,marshal_ul/3,
+	 marshal_s/3,marshal_us/3,
+	 marshal_c/3,marshal_wc/3,
+	 strcat/3,
+	 marshal_any_3/4,marshal_any_2/3]).
+-export([init/1,terminate/2,code_change/3]).
+
+-include("m.hrl").
+
+-define(TK_M_S, {tk_struct,
+		 "IDL:m/s:1.0",
+		 "s",
+		 [{"ll_x",tk_longlong},
+		  {"ull_x",tk_ulonglong},
+		  {"ll_y",tk_longlong},
+		  {"ll_z",tk_longlong},
+		  {"ull_z",tk_ulonglong},
+		  {"l_x",tk_long},
+		  {"ul_x",tk_ulong},
+		  {"l_y",tk_long},
+		  {"l_z",tk_long},
+		  {"ul_z",tk_ulong},
+		  {"s_x",tk_short},
+		  {"us_x",tk_ushort},
+		  {"s_y",tk_short},
+		  {"s_z",tk_short},
+		  {"us_z",tk_ushort},
+		  {"c_x",tk_char},
+		  {"c_y",tk_char},
+		  {"c_z",tk_char},
+		  {"wc_x",tk_wchar},
+		  {"wc_y",tk_wchar},
+		  {"wc_z",tk_wchar}|_]}).
+
+
+
+marshal_ll(State, #m_s{ll_x = X, ll_y = Y}=_A, B) when integer(B) ->
+    R = (X - Y)*B,
+    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
+    {reply, R, State}.
+
+marshal_ull(State, #m_s{ull_x = X, ll_y = Y}=_A, B) when integer(B) ->
+    R = (X - Y)*B,
+    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
+    {reply, R, State}.
+
+
+marshal_l(State, #m_s{l_x = X, l_y = Y}=_A, B) when integer(B) ->
+    R = (X - Y)*B,
+    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
+    {reply, R, State}.
+
+marshal_ul(State, #m_s{ul_x = X, l_y = Y}=_A, B) when integer(B) ->
+    R = (X - Y)*B,
+    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
+    {reply, R, State}.
+
+
+marshal_s(State, #m_s{s_x = X, s_y = Y}=_A, B) when integer(B) ->
+    R = (X - Y)*B,
+    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
+    {reply, R, State}.
+
+marshal_us(State, #m_s{us_x = X, s_y = Y}=_A, B) when integer(B) ->
+    R = (X - Y)*B,
+    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
+    {reply, R, State}.
+
+
+marshal_c(State, #m_s{c_x = X, c_y = Y}=_A, B) when integer(B) ->
+    R = (X - Y)*B,
+    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
+    {reply, R, State}.
+
+marshal_wc(State, #m_s{wc_x = X, wc_y = Y}=_A, B) when integer(B) ->
+    R = (X - Y)*B,
+    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
+    {reply, R, State}.
+
+strcat(State, A, B) when list(A), list(B) ->
+    R = A++B,
+    io:format("~p", [{?MODULE,?LINE,[length(A),length(B),A,B,R]}]),
+    {reply, R, State};
+strcat(State, A, B) ->
+    io:format("~p", [{?MODULE,?LINE,[A,B]}]),
+    {reply, [], State}.
+
+marshal_any_3(State, {any,TkX,_}=X, {any,_,_}=Y, B) when integer(B) ->
+    R = any(mul(sub(any(X), any(Y)), B), TkX),
+    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
+    {reply, R, State}.
+
+marshal_any_2(State, 
+	      {any,TkA,#m_s{ll_x=LL_X, ull_x=ULL_X, ll_y=LL_Y,
+			    l_x=L_X, ul_x=UL_X, l_y=L_Y,
+			    s_x=S_X, us_x=US_X, s_y=S_Y,
+			    c_x=C_X, c_y=C_Y,
+			    wc_x=WC_X, wc_y=WC_Y} = A},
+	      B) when integer(B) ->
+    {check_type_code,?TK_M_S} = {check_type_code,TkA},
+    ULL_Z = (ULL_X - LL_Y) * B,
+    LL_Z = (LL_X - LL_Y) * B,
+    UL_Z = (UL_X - L_Y) * B,
+    L_Z = (L_X - L_Y) * B,
+    US_Z = (US_X - S_Y) * B,
+    S_Z = (S_X - S_Y) * B,
+    C_Z = (C_X - C_Y) * B,
+    WC_Z = (WC_X - WC_Y) * B,
+    R = A#m_s{ll_z=LL_Z, ull_z=ULL_Z,
+	      l_z=L_Z, ul_z=UL_Z,
+	      s_z=S_Z, us_z=US_Z,
+	      c_z=C_Z, wc_z=WC_Z},
+    io:format("~p", [{?MODULE,?LINE,[A,B,R]}]),
+    {reply, {any,TkA,R}, State}.
+
+
+
+init(_Env) ->
+    {ok, []}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+
+any({any,tk_longlong,X}) -> X;
+any({any,tk_long,X}) -> X;
+any({any,tk_short,X}) -> X;
+any({any,tk_ulonglong,X}) -> X;
+any({any,tk_ulong,X}) -> X;
+any({any,tk_ushort,X}) -> X;
+any({any,tk_char,X}) -> X;
+any({any,tk_wchar,X}) -> X.
+
+any(X, Tk) when integer(X) -> {any,Tk,X}.
+
+sub(X, Y) when integer(X), integer(Y) ->
+    X - Y.
+
+mul(X, Y) when integer(X), integer(Y) ->
+    X * Y.
+
+napp(0, L) -> L;
+napp(N, L) when integer(N), N >= 1 -> napp(N-1, L)++L.
diff --git a/lib/ic/vsn.mk b/lib/ic/vsn.mk
index 4aa2a04b60..6d6c7fa625 100644
--- a/lib/ic/vsn.mk
+++ b/lib/ic/vsn.mk
@@ -1,20 +1 @@
-IC_VSN = 4.2.25
-
-TICKETS = OTP-8639
-
-TICKETS_4.2.24 = OTP-8307 \
-	OTP-8353 \
-	OTP-8354 \
-	OTP-8355
-
-TICKETS_4.2.23 = OTP-8201
-
-TICKETS_4.2.22 = OTP-8088
-
-TICKETS_4.2.21 = OTP-7982
-
-TICKETS_4.2.20 = OTP-7837
-
-TICKETS_4.2.19 = OTP-7595
-
-TICKETS_4.2.18 = OTP-7313
+IC_VSN = 4.2.26
diff --git a/lib/inets/doc/src/ftp.xml b/lib/inets/doc/src/ftp.xml
index 25dfe716fc..ca902d8d9d 100644
--- a/lib/inets/doc/src/ftp.xml
+++ b/lib/inets/doc/src/ftp.xml
@@ -107,7 +107,7 @@
       <tag>{mode, Mode}</tag>
       <item>
         <marker id="mode"></marker>
-	<p>Mode = <c>active | passive</c> </p>>
+	<p>Mode = <c>active | passive</c> </p>
 	<p>Default is <c>passive</c>. </p> 
       </item>
 
diff --git a/lib/inets/doc/src/http_client.xml b/lib/inets/doc/src/http_client.xml
index 510c30eb35..4542211d71 100644
--- a/lib/inets/doc/src/http_client.xml
+++ b/lib/inets/doc/src/http_client.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -42,10 +42,10 @@
     dynamically in runtime. Each client profile will spawn a new
     process to handle each request unless there is a possibility to use
     a persistent connection with or without pipelining.
-    The client will add a host header and an empty
-    te header if there are no such headers present in the request.</p>
+    The client will add a <c>host</c> header and an empty
+    <c>te</c> header if there are no such headers present in the request.</p>
 
-    <p>The clients supports ipv6 as long as the underlying mechanisms also do
+    <p>The client supports ipv6 as long as the underlying mechanisms also do
       so.</p>
   </section>
 
@@ -56,8 +56,8 @@
     <pre>
       [{inets, [{services, [{httpc, PropertyList}]}]}]
     </pre>
-    <p>For valid properties see <seealso
-			       marker="http">http(3)</seealso></p>
+    <p>For valid properties see 
+    <seealso marker="httpc">httpc(3)</seealso>. </p>
   </section>
 
   <section>
@@ -71,67 +71,66 @@
       but not for requests to localhost. This will apply to all subsequent
       requests</p>
     <code type="erl">
-      2 > http:set_options([{proxy, {{"www-proxy.mycompany.com", 8000},
+      2 > httpc:set_options([{proxy, {{"www-proxy.mycompany.com", 8000},
       ["localhost"]}}]).
       ok
     </code>
     <p>An ordinary synchronous request. </p>
     <code type="erl">
       3 > {ok, {{Version, 200, ReasonPhrase}, Headers, Body}} =
-      http:request(get, {"http://www.erlang.org", []}, [], []).
+      httpc:request(get, {"http://www.erlang.org", []}, [], []).
     </code>
     <p>With all default values, as above, a get request can also be written
       like this.</p>
     <code type="erl">
       4 > {ok, {{Version, 200, ReasonPhrase}, Headers, Body}} =
-      http:request("http://www.erlang.org").
+      httpc:request("http://www.erlang.org").
     </code>
     <p>An ordinary asynchronous request. The result will be sent
-      to the calling process on the form {http, {ReqestId, Result}}</p>
+      to the calling process in the form <c>{http, {ReqestId, Result}}</c></p>
     <code type="erl">
       5 > {ok, RequestId} =
-      http:request(get, {"http://www.erlang.org", []}, [], [{sync, false}]).
+      httpc:request(get, {"http://www.erlang.org", []}, [], [{sync, false}]).
     </code>
     <p>In this case the calling process is the shell, so we receive the
       result.</p>
     <code type="erl">
-      6 >  receive {http, {RequestId, Result}} -> ok after 500 -> error end.
+      6 > receive {http, {RequestId, Result}} -> ok after 500 -> error end.
       ok
     </code>
     <p>Send a request with a specified connection header. </p>
     <code type="erl">
       7 > {ok, {{NewVersion, 200, NewReasonPhrase}, NewHeaders, NewBody}} =
-      http:request(get, {"http://www.erlang.org", [{"connection", "close"}]},
+      httpc:request(get, {"http://www.erlang.org", [{"connection", "close"}]},
       [], []).
     </code>
 
     <p>Start a HTTP client profile. </p>
    
     <code><![CDATA[
-      8 >  {ok, Pid} = inets:start(httpc, [{profile, foo}]).
+      8 > {ok, Pid} = inets:start(httpc, [{profile, foo}]).
       {ok, <0.45.0>}       
       ]]></code>
     
     <p>The new profile has no proxy settings so the connection will
       be refused</p>
       <code type="erl">
-      9 > http:request("http://www.erlang.org", foo).              
-      {error,econnrefused}
+      9 > httpc:request("http://www.erlang.org", foo). 
+      {error, econnrefused}
     </code>
 
     <p>Stop a HTTP client profile. </p>
     <code type="erl">
-      10 >  inets:stop(httpc, foo).
+      10 > inets:stop(httpc, foo).
       ok
     </code>
     
     <p>Alternatively:</p>
     <code type="erl">
-      10 >  inets:stop(httpc, Pid).
+      10 > inets:stop(httpc, Pid).
       ok
     </code>
     
-    
   </section>
 </chapter>
 
diff --git a/lib/inets/doc/src/http_server.xml b/lib/inets/doc/src/http_server.xml
index 68dfd1add0..47ed9cd229 100644
--- a/lib/inets/doc/src/http_server.xml
+++ b/lib/inets/doc/src/http_server.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -766,7 +766,7 @@ http://your.server.org/eval?httpd_example:print(atom_to_list(apply(erlang,halt,[
 	<code>
 -module(mnesia_test).
 -export([start/0,load_data/0]).
--include("mod_auth.hrl").   
+-include_lib("mod_auth.hrl").
 
 first_start() ->
     mnesia:create_schema([node()]),
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index 7430a62b1b..bcdd2913e0 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -36,7 +36,7 @@
     <note>
       <p>When starting the Inets application a manager process for the
 	default profile will be started. The functions in this API
-	that does not explicitly use a profile will accesses the
+	that do not explicitly use a profile will access the
 	default profile. A profile keeps track of proxy options,
 	cookies and other options that can be applied to more than one
 	request. </p>
@@ -117,7 +117,7 @@ ssl_options() = {verify,     code()}   |
       application or started dynamically in runtime by calling the
       inets application API <c>inets:start(httpc, ServiceConfig)</c>, or
       <c>inets:start(httpc,  ServiceConfig, How)</c>
-      see <seealso marker="inets">inets(3)</seealso> Below follows a
+      see <seealso marker="inets">inets(3)</seealso>. Below follows a
       description of the available configuration options.</p>
     <taglist>
       <tag>{profile, profile()}</tag>
@@ -129,8 +129,8 @@ ssl_options() = {verify,     code()}   |
 	as session cookies.</item>
     </taglist>
 
-    <p>The client can be stopped using inets:stop(httpc, Pid) or
-    inets:stop(httpc, Profile).</p>
+    <p>The client can be stopped using <c>inets:stop(httpc, Pid)</c> or
+    <c>inets:stop(httpc, Profile)</c>.</p>
     
     <marker id="request1"></marker>
   </section>
@@ -148,7 +148,7 @@ ssl_options() = {verify,     code()}   |
 	<v>Reason = term() </v>
       </type>
       <desc>
-        <p>Equivalent to httpc:request(get, {Url, []}, [], []).</p>
+        <p>Equivalent to <c>httpc:request(get, {Url, []}, [], [])</c>.</p>
 
         <marker id="request2"></marker>
       </desc>
@@ -167,10 +167,13 @@ ssl_options() = {verify,     code()}   |
         <v>http_option() = {timeout,         timeout()} | 
                            {connect_timeout, timeout()} | 
                            {ssl,             ssl_options()} | 
+                           {ossl,            ssl_options()} | 
+                           {essl,            ssl_options()} | 
                            {autoredirect,    boolean()} | 
                            {proxy_auth, {userstring(), passwordstring()}} | 
                            {version,         http_version()} | 
-                           {relaxed,         boolean()}</v>
+                           {relaxed,         boolean()} |
+	                   {url_encode,      boolean()}</v>
         <v>timeout() = integer() >= 0 | infinity</v>
         <v>Options = options()</v>
         <v>options() = [option()]</v>
@@ -198,7 +201,7 @@ ssl_options() = {verify,     code()}   |
       <desc>
         <p>Sends a HTTP-request. The function can be both synchronous
           and asynchronous. In the later case the function will return
-          {ok, RequestId} and later on the information will be delivered
+          <c>{ok, RequestId}</c> and later on the information will be delivered
           to the <c>receiver</c> depending on that value. </p>
 
         <p>Http option (<c>http_option()</c>) details: </p>
@@ -206,7 +209,7 @@ ssl_options() = {verify,     code()}   |
           <tag><c><![CDATA[timeout]]></c></tag>
           <item>
             <p>Timeout time for the request. </p>
-            <p>The clock start ticking as soon as the request has been 
+            <p>The clock starts ticking as soon as the request has been
               sent. </p>
             <p>Time is in milliseconds. </p>
             <p>Defaults to <c>infinity</c>. </p>
@@ -222,17 +225,32 @@ ssl_options() = {verify,     code()}   |
 
           <tag><c><![CDATA[ssl]]></c></tag>
           <item>
-            <p>If using SSL, these SSL-specific options are used. </p>
+            <p>This is the default ssl config option, currently defaults to 
+              <c>ossl</c>, see below. </p>
+            <p>Defaults to <c>[]</c>. </p>
+	  </item>
+
+          <tag><c><![CDATA[ossl]]></c></tag>
+          <item>
+            <p>If using the OpenSSL based (old) implementation of SSL, 
+              these SSL-specific options are used. </p>
+            <p>Defaults to <c>[]</c>. </p>
+	  </item>
+
+          <tag><c><![CDATA[essl]]></c></tag>
+          <item>
+            <p>If using the Erlang based (new) implementation of SSL, 
+              these SSL-specific options are used. </p>
             <p>Defaults to <c>[]</c>. </p>
 	  </item>
 
           <tag><c><![CDATA[autoredirect]]></c></tag>
           <item>
-            <p>Should the client automatically retreive the information 
+            <p>Should the client automatically retrieve the information
               from the new URI and return that as the result instead 
               of a 30X-result code. </p>
             <p>Note that for some 30X-result codes automatic redirect 
-              is not allowed in these cases the 30X-result will always 
+              is not allowed. In these cases the 30X-result will always
               be returned. </p>
             <p>Defaults to <c>true</c>. </p>
 	  </item>
@@ -249,16 +267,21 @@ ssl_options() = {verify,     code()}   |
 	      <c>HTTP/0.9</c> client. By default this is an <c>HTTP/1.1</c> 
               client. When using <c>HTTP/1.0</c> persistent connections will 
               not be used. </p>
-            <p>Defaults to the trsing <c>"HTTP/1.1"</c>. </p>
+            <p>Defaults to the string <c>"HTTP/1.1"</c>. </p>
 	  </item>
 
           <tag><c><![CDATA[relaxed]]></c></tag>
           <item>
-            <p>If set to true workarounds for known server deviations from
+            <p>If set to <c>true</c> workarounds for known server deviations from
 	      the HTTP-standard are enabled. </p>
             <p>Defaults to <c>false</c>. </p>
 	  </item>
 
+	  <tag><c><![CDATA[url_encode]]></c></tag>
+          <item>
+            <p>Will apply Percent-encoding, also known as URL encoding on the URL.</p>
+	    <p>Defaults to <c>false</c>. </p>
+	  </item>
         </taglist>
 
         <p>Option (<c>option()</c>) details: </p>
@@ -273,21 +296,21 @@ ssl_options() = {verify,     code()}   |
           <item>
             <p>Streams the body of a 200 or 206 response to the calling 
 	      process or to a file. When streaming to the calling process 
-	      using the option <c>self</c> the the following stream messages
-	      will be sent to that process: {http, {RequestId,
+	      using the option <c>self</c> the following stream messages
+	      will be sent to that process: <c>{http, {RequestId,
 	      stream_start, Headers}, {http, {RequestId, stream,
-	      BinBodyPart}, {http, {RequestId, stream_end, Headers}. When
+	      BinBodyPart}, {http, {RequestId, stream_end, Headers}</c>. When
 	      streaming to to the calling processes using the option
 	      <c>{self, once}</c> the first message will have an additional
-	      element e.i. {http, {RequestId, stream_start, Headers, Pid},
+	      element e.i. <c>{http, {RequestId, stream_start, Headers, Pid}</c>,
 	      this is the process id that should be used as an argument to
-	      http:stream_next/1 to trigger the next message to be sent to
+	      <c>http:stream_next/1</c> to trigger the next message to be sent to
 	      the calling process. </p>
 	    <p>Note that it is possible that chunked encoding will add
-	      headers so that there are more headers in the stream_end
-	      message than in the stream_start.
+	      headers so that there are more headers in the <c>stream_end</c>
+	      message than in the <c>stream_start</c>.
 	      When streaming to a file and the request is asynchronous the
-	      message {http, {RequestId, saved_to_file}} will be sent. </p>
+	      message <c>{http, {RequestId, saved_to_file}}</c> will be sent. </p>
             <p>Defaults to <c>none</c>. </p>
 	  </item>
 
@@ -315,7 +338,7 @@ ssl_options() = {verify,     code()}   |
               case insenstive. This feature should only be used if there is 
               no other way to communicate with the server or for testing 
               purpose. Also note that when this option is used no headers 
-              will be automatically added, all necessary headers has to be 
+              will be automatically added, all necessary headers have to be
               provided by the user. </p>
             <p>Defaults to <c>false</c>. </p>
 	  </item>
@@ -325,22 +348,22 @@ ssl_options() = {verify,     code()}   |
             <p>Socket options to be used for this and subsequent 
               request(s). </p>
             <p>Overrides any value set by the 
-              <seealso marker="set_options">set_options</seealso> 
+              <seealso marker="#set_options">set_options</seealso>
               function. </p>
             <p>Note that the validity of the options are <em>not</em>
               checked in any way. </p>
             <p>Note that this may change the socket behaviour 
               (see <seealso marker="kernel:inet#setopts">inet:setopts/2</seealso>) 
-              for an already existing, and therefor already connected 
+              for an already existing one, and therefore an already connected
               request handler. </p>
-            <p>By defaults the socket options set by the 
+            <p>By default the socket options set by the
               <seealso marker="#set_options">set_options/1,2</seealso> 
-              function is used when establishing connection. </p>
+              function are used when establishing a connection. </p>
 	  </item>
 
           <tag><c><![CDATA[receiver]]></c></tag>
           <item>
-            <p>Defines how the client will deliver the result for a 
+            <p>Defines how the client will deliver the result of an
               asynchroneous request (<c>sync</c> has the value 
               <c>false</c>). </p>
 
@@ -372,7 +395,7 @@ apply(Module, Function, [ReplyInfo | Args])
 	      </item>
 
             </taglist>
-            <p>In all cases above, <c>ReplyInfo</c> has the following 
+            <p>In all of the above cases, <c>ReplyInfo</c> has the following
               structure: </p>
 
 <pre>
@@ -447,46 +470,46 @@ apply(Module, Function, [ReplyInfo | Args])
         <v>IpDesc = string()</v>
         <d>ex: "134.138" or "[FEDC:BA98" (all IP-addresses starting with 134.138 or FEDC:BA98), "66.35.250.150" or "[2010:836B:4179::836B:4179]" (a complete IP-address).</d>
         <v>MaxSessions = integer() </v>
-        <d>Default is <em>2</em>. 
+        <d>Default is <c>2</c>.
           Maximum number of persistent connections to a host.</d>
 	<v>MaxKeepAlive = integer() </v>
-        <d>Default is <em>5</em>. 
+        <d>Default is <c>5</c>.
           Maximum number of outstanding requests on the same connection to 
           a host.</d>
         <v>KeepAliveTimeout = integer() </v>
-        <d>Default is <em>120000</em> (= 2 min). 
+        <d>Default is <c>120000</c> (= 2 min).
           If a persistent connection is idle longer than the 
-          keep_alive_timeout the client will close the connection. 
-          The server may also have a such a time out but you should 
+          <c>keep_alive_timeout</c> the client will close the connection.
+          The server may also have such a time out but you should
           not count on it!</d>
 	<v>MaxPipeline = integer() </v>
-        <d>Default is <em>2</em>. 
+        <d>Default is <c>2</c>.
           Maximum number of outstanding requests on a pipelined connection to a host.</d>
         <v>PipelineTimeout = integer() </v>
-        <d>Default is <em>0</em>, 
+        <d>Default is <c>0</c>,
           which will result in pipelining not being used. 
           If a persistent connection is idle longer than the 
-          pipeline_timeout the client will close the connection. </d>
+          <c>pipeline_timeout</c> the client will close the connection. </d>
         <v>CookieMode = enabled | disabled | verify </v>
-        <d>Default is <em>disabled</em>. 
+        <d>Default is <c>disabled</c>.
           If Cookies are enabled all valid cookies will automatically be 
           saved in the client manager's cookie database. 
-          If the option verify is used the function http:verify_cookie/2 
-          has to be called for the cookie to be saved.</d>
+          If the option <c>verify</c> is used the function <c>store_cookies/2</c>
+          has to be called for the cookies to be saved.</d>
         <v>IpFamily = inet | inet6 | inet6fb4 </v>
-        <d>By default <em>inet</em>. 
+        <d>By default <c>inet</c>.
           When it is set to <c>inet6fb4</c> you can use both ipv4 and ipv6. 
           It first tries <c>inet6</c> and if that does not works falls back to <c>inet</c>. 
           The option is here to provide a workaround for buggy ipv6 stacks to ensure that 
           ipv4 will always work.</d>
 	<v>IpAddress = ip_address() </v>
         <d>If the host has several network interfaces, this option specifies which one to use. 
-          See gen_tcp:connect/3,4 for more info. </d>
+          See <seealso marker="kernel:gen_tcp#connect">gen_tcp:connect/3,4</seealso> for more info. </d>
 	<v>Port = integer() </v>
         <d>Specify which local port number to use. 
-          See gen_tcp:connect/3,4 for more info. </d>
+          See <seealso marker="kernel:gen_tcp#connect">gen_tcp:connect/3,4</seealso> for more info. </d>
         <v>VerboseMode = false | verbose | debug | trace </v>
-        <d>Default is <em>false</em>. 
+        <d>Default is <c>false</c>.
           This option is used to switch on (or off) 
           different levels of erlang trace on the client. 
           It is a debug feature.</d>
@@ -500,14 +523,14 @@ apply(Module, Function, [ReplyInfo | Args])
             alive and use persistent connections
 	    with  or without pipeline depending on configuration
 	    and current circumstances. The HTTP/1.1 specification does not
-            provide a guideline for how many requests that would be
+            provide a guideline for how many requests would be
             ideal to be sent on a persistent connection,
 	    this very much depends on the
             application. Note that a very long queue of requests may cause a
-            user perceived delays as earlier request may take a long time
+            user perceived delay as earlier requests may take a long time
             to complete. The HTTP/1.1 specification does suggest a
             limit of 2 persistent connections per server, which is the
-            default value of the max_sessions option. </p>
+            default value of the <c>max_sessions</c> option. </p>
         </note>
 
         <marker id="stream_next"></marker>
@@ -526,14 +549,14 @@ apply(Module, Function, [ReplyInfo | Args])
         <p>Triggers the next message to be streamed, e.i.
 	  same behavior as active once for sockets.</p>
 
-        <marker id="verify_cookie"></marker>
-        <marker id="store_cookie"></marker>
+        <marker id="verify_cookies"></marker>
+        <marker id="store_cookies"></marker>
       </desc>
     </func>
     
     <func>
-      <name>store_cookie(SetCookieHeaders, Url) -> </name>
-      <name>store_cookie(SetCookieHeaders, Url, Profile) -> ok | {error, Reason}</name>
+      <name>store_cookies(SetCookieHeaders, Url) -> </name>
+      <name>store_cookies(SetCookieHeaders, Url, Profile) -> ok | {error, Reason}</name>
       <fsummary>Saves the cookies defined in SetCookieHeaders in the client profile's cookie database.</fsummary>
       <type>
         <v>SetCookieHeaders = headers() - where field = "set-cookie"</v>
@@ -543,7 +566,7 @@ apply(Module, Function, [ReplyInfo | Args])
       <desc>
         <p>Saves the cookies defined in SetCookieHeaders
           in the client profile's cookie database. You need to
-          call this function if you set the option cookies to <c>verify</c>.
+          call this function if you have set the option <c>cookies</c> to <c>verify</c>.
 	  If no profile is specified the default profile will be used.
 	</p>
 
@@ -553,16 +576,16 @@ apply(Module, Function, [ReplyInfo | Args])
 
     <func>
       <name>cookie_header(Url) -> </name>
-      <name>cookie_header(Url, Profile) -> header() | {error, Rason}</name>
+      <name>cookie_header(Url, Profile) -> header() | {error, Reason}</name>
       <fsummary>Returns the cookie header that would be sent when
-      making a request to Url using the profile Profile.</fsummary>
+      making a request to Url using the profile <c>Profile</c>.</fsummary>
       <type>
         <v>Url = url()</v>
 	<v>Profile = profile()</v>
       </type>
       <desc>
         <p>Returns the cookie header that would be sent
-          when making a request to Url using the profile Profile.
+          when making a request to <c>Url</c> using the profile <c>Profile</c>.
 	  If no profile is specified the default profile will be used.
 	</p>
 
@@ -579,7 +602,7 @@ apply(Module, Function, [ReplyInfo | Args])
 	<v>Profile = profile()</v>
       </type>
       <desc>
-        <p>Resets (clears) the cookie database for the specified Profile.
+        <p>Resets (clears) the cookie database for the specified <c>Profile</c>.
 	  If no profile is specified the default profile will be used.
 	</p>
       </desc>
@@ -615,4 +638,3 @@ apply(Module, Function, [ReplyInfo | Args])
   </section>
   
 </erlref>
-
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index 7dabeb33e9..62f4e18f82 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -148,8 +148,13 @@
 	in the apache like configuration file.
       </item>
 
-      <tag>{socket_type, ip_comm | ssl}</tag>
+      <tag>{socket_type, ip_comm | ssl | ossl | essl}</tag>
       <item>
+	<p>When using ssl, there are several alternatives. 
+          <c>ossl</c> specifically uses the OpenSSL based (old) SSL. 
+          <c>essl</c> specifically uses the Erlang based (new) SSL. 
+          When using <c>ssl</c> it <em>currently</em> defaults to 
+          <c>ossl</c>. </p>
 	<p>Defaults to <c>ip_comm</c>. </p> 
       </item>
 
@@ -267,18 +272,22 @@ text/plain	asc txt
 	The <c>common</c> format is one line that looks like this:
         <c>remotehost rfc931 authuser [date] "request" status bytes</c></p> 
 
-	<pre>remotehost
+	<pre>
+remotehost
 	Remote
 rfc931
 	The client's remote username (RFC 931). 
 authuser
-	The username with which the user authenticated himself. 
+	The username with which the user authenticated 
+        himself. 
 [date]
 	Date and time of the request (RFC 1123). 
 "request"
-	The request line exactly as it came from the client(RFC 1945). 
+	The request line exactly as it came from the client
+        (RFC 1945). 
 status
-	The HTTP status code returned to the client (RFC 1945). 
+	The HTTP status code returned to the client 
+        (RFC 1945). 
 bytes
 	The content-length of the document transferred. 
         </pre>
@@ -286,10 +295,11 @@ bytes
 	<p>The <c>combined</c> format is on line that look like this:
 	<c>remotehost rfc931 authuser [date] "request" status bytes "referer" "user_agent" </c></p>
 	
-	<pre>"referer"
+	<pre>
+"referer"
 	The url the client was on before
-	requesting your url. (If it could not be determined a minus
-	sign will be placed in this field)
+	requesting your url. (If it could not be determined 
+	a minus sign will be placed in this field)
 "user_agent"
 	The software the client claims to be using. (If it
 	could not be determined a minus sign will be placed in
@@ -389,6 +399,31 @@ bytes
 	and an access to http://your.server.org/image/foo.gif would refer to
 	the file /ftp/pub/image/foo.gif.</item>
 
+      <tag>{re_write, {Re, Replacement}}</tag>
+      
+      <item> Where Re = string() and Replacement = string(). 
+	The ReWrite property allows documents to be stored in the local file
+	system instead of the document_root location. URLs are rewritten
+        by re:replace/3 to produce a path in the local filesystem.
+        For example:
+	
+	<code>{re_write, {"^/[~]([^/]+)(.*)$", "/home/\\1/public\\2"}</code>
+	
+	and an access to http://your.server.org/~bob/foo.gif would refer to
+	the file /home/bob/public/foo.gif.
+
+        In an Apache like configuration file the Re is separated
+        from Replacement with one single space, and as expected
+        backslashes do not need to be backslash escaped so the
+        same example would become:
+
+        <code>ReWrite ^/[~]([^/]+)(.*)$ /home/\1/public\2</code>
+
+        Beware of trailing space in Replacement that will be used.
+        If you must have a space in Re use e.g the character encoding
+        <code>\040</code> see <seealso marker="stdlib:re">re(3)</seealso>.
+      </item>
+
       <tag>{directory_index, [string()]}</tag>
       
       <item> 
@@ -408,7 +443,7 @@ bytes
     </taglist>
 
     <marker id="cgi_prop"></marker>
-    <p><em>CGI  properties - requires mod_cgi</em></p>
+    <p><em>CGI properties - requires mod_cgi</em></p>
     <taglist> 
       <tag>{script_alias, {Alias, RealName}}</tag>
       <item> Where Alias = string() and RealName = string().
@@ -423,6 +458,19 @@ bytes
 	the server to run the script /web/cgi-bin/foo.
       </item>
       
+      <tag>{script_re_write, {Re, Replacement}}</tag>
+      <item> Where Re = string() and Replacement = string().
+	Has the same behavior as the ReWrite property, except that
+	it also marks the target directory as containing CGI
+	scripts. URLs with a path beginning with url-path are mapped to
+	scripts beginning with directory-filename, for example:
+	
+	<code> {script_re_write, {"^/cgi-bin/(\\d+)/", "/web/\\1/cgi-bin/"}</code>
+	
+	and an access to http://your.server.org/cgi-bin/17/foo would cause
+	the server to run the script /web/17/cgi-bin/foo.
+      </item>
+      
       <tag>{script_nocache, boolean()}</tag>
       
       <item> 
@@ -883,6 +931,10 @@ bytes
 		connection
 	}).
     </code>
+
+    <p>To acess the record in your callback-module use </p>
+    <code> -include_lib("inets/include/httpd.hrl"). </code>
+
     <p>The fields of the <c>mod</c> record has the following meaning:
       </p>
     <taglist>
@@ -930,10 +982,10 @@ bytes
       <c>parsed_header</c> contains all HTTP header fields from the
       HTTP-request stored in a list as key-value tuples. See RFC 2616
       for a listing of all header fields. For example the date field
-      would be stored as: <c>{"date","Wed, 15 Oct 1997 14:35:17 GMT"}.
+      would be stored as: <c>{"date","Wed, 15 Oct 1997 14:35:17 GMT"} </c>.
       RFC 2616 defines that HTTP is a case insensitive protocol and
       the header fields may be in lower case or upper case. Httpd will
-      ensure that all header field names are in lower case.  </c>.
+      ensure that all header field names are in lower case.
       </item>
       <tag><c>entity_body</c></tag>
       <item>The <c>Entity-Body</c> as defined
diff --git a/lib/inets/doc/src/inets.xml b/lib/inets/doc/src/inets.xml
index 81dfe7e944..c367d7fa77 100644
--- a/lib/inets/doc/src/inets.xml
+++ b/lib/inets/doc/src/inets.xml
@@ -13,12 +13,12 @@
       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>inets</title>
@@ -40,13 +40,13 @@
     <title>COMMON DATA TYPES </title>
     <p>Type definitions that are used more than once in
       this module: </p>
-    <p><c> service() = ftpc | tfptd | httpc | httpd</c></p>
+    <p><c> service() = ftpc | tftp | httpc | httpd</c></p>
     <p><c> property() = atom() </c></p>
   </section>
   <funcs>
     <func>
       <name>services() -> [{Service, Pid}]</name>
-      <fsummary>Returns a list of currently running services.  </fsummary>
+      <fsummary>Returns a list of currently running services. </fsummary>
       <type>
         <v>Service = service()</v>
         <v>Pid = pid()</v>
@@ -97,7 +97,7 @@
       <name>start(Type) -> ok | {error, Reason}</name>
       <fsummary>Starts the Inets application. </fsummary>
       <type>
-        <v>Type =  permanent | transient | temporary</v>
+        <v>Type = permanent | transient | temporary</v>
       </type>
       <desc>
         <p>Starts the Inets application. Default type
@@ -115,11 +115,9 @@
     </func>
     <func>
       <name>start(Service, ServiceConfig) -> {ok, Pid} | {error, Reason}</name>
-      <name>start(Service, ServiceConfig, How) -> {ok, Pid} |
-	{error, Reason}</name>
+      <name>start(Service, ServiceConfig, How) -> {ok, Pid} | {error, Reason}</name>
       <fsummary>Dynamically starts an inets
-	service after the inets application has been
-	started. </fsummary>
+      service after the inets application has been started. </fsummary>
       <type>
         <v>Service = service()</v>
         <v>ServiceConfig = [{Option, Value}]</v>
@@ -153,9 +151,9 @@
       <fsummary>Stops a started service of the inets application or takes
           down a "stand_alone-service" gracefully.</fsummary>
       <type>
-        <v>Service = service() | stand_alone</v>
+	<v>Service = service() | stand_alone</v>
 	<v>Reference = pid() | term() - service specified reference</v>
-        <v>Reason = term()</v>	
+	<v>Reason = term()</v>
       </type>
       <desc>
         <p>Stops a started service of the inets application or takes
@@ -169,7 +167,7 @@
   <section>
     <title>SEE ALSO</title>
     <p><seealso marker="ftp">ftp(3)</seealso>,
-      <seealso marker="http">http(3)</seealso>,
+      <seealso marker="httpc">httpc(3)</seealso>,
       <seealso marker="httpd">httpd(3)</seealso>,
       <seealso marker="tftp">tftp(3)</seealso></p>
   </section>
diff --git a/lib/inets/doc/src/mod_auth.xml b/lib/inets/doc/src/mod_auth.xml
index f3628c8297..9503add2e0 100644
--- a/lib/inets/doc/src/mod_auth.xml
+++ b/lib/inets/doc/src/mod_auth.xml
@@ -111,7 +111,8 @@
       </desc>
     </func>
     <func>
-      <name>list_users(Options) -> {ok, Users} | {error, Reason} &lt;name>list_users(Port, Dir) -> {ok, Users} | {error, Reason}</name>
+      <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>
       <fsummary>List users in the user database.</fsummary>
       <type>
diff --git a/lib/inets/doc/src/mod_esi.xml b/lib/inets/doc/src/mod_esi.xml
index 6bad77dc0a..3c473d3f94 100644
--- a/lib/inets/doc/src/mod_esi.xml
+++ b/lib/inets/doc/src/mod_esi.xml
@@ -73,7 +73,8 @@
         <v>SessionID = term()</v>
         <v>Env  = [EnvironmentDirectives] ++ ParsedHeader</v>
         <v>EnvironmentDirectives = {Key,Value}</v>
-        <v>Key = query_string | content_length | server_software | gateway_interface | server_protocol | server_port | request_method | remote_addr | script_name. &lt;v>Input = string()</v>
+        <v>Key = query_string | content_length | server_software | gateway_interface | server_protocol | server_port | request_method | remote_addr | script_name</v>
+        <v>Input = string()</v>
       </type>
       <desc>
         <p>The <c>Module</c> must be found in the code path and export
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index fed42291ab..11b0af4310 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,6 +32,157 @@
     <file>notes.xml</file>
   </header>
   
+  <section><title>Inets 5.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix format_man_pages so it handles all man sections
+	    and remove warnings/errors in various man pages. </p>
+          <p>
+	    Own Id: OTP-8600</p>
+        </item>
+        <item>
+          <p>
+	    [httpc] Pipelined and queued requests not processed when
+	    connection closed remotelly.</p>
+          <p>
+	    Own Id: OTP-8906</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Miscellaneous inet6 related problems.</p>
+          <p>
+	    Own Id: OTP-8927</p>
+        </item>
+        <item>
+          <p>
+	    Updated http-server to make sure URLs in error-messages
+	    are URL-encoded. Added support in http-client to use
+	    URL-encoding. Also added the missing include directory
+	    for the inets application.</p>
+          <p>
+	    Own Id: OTP-8940 Aux Id: seq11735 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 5.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    [httpc] If a request times out (not connect timeout), the
+	    handler process exited (normal) but neglected to inform
+	    the manager process. For this reason, the manager did not
+	    clean up the request table., resulting in a memory leak.
+	    Also the manager did not create a monitor for the
+	    handler, so in an unforseen handler crash, this could
+	    also create a memory leak.</p>
+          <p>
+	    Own Id: OTP-8739</p>
+        </item>
+        <item>
+          <p>
+	    The service tftp was spelled wrong in documentation and
+	    in some parts of the code. It should be tftp.</p>
+          <p>
+	    Own Id: OTP-8741 Aux Id: seq11635 </p>
+        </item>
+        <item>
+          <p>
+	    [httpc] Replaced the old http client api module (http)
+	    with the new, httpc in the users guide.</p>
+          <p>
+	    Own Id: OTP-8742</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Eliminated warnings for auto-imported BIF clashes.</p>
+          <p>
+	    Own Id: OTP-8840</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 5.4</title>
+
+    <section><title>Improvements and New Features</title>
+<!--
+      <p>-</p>
+-->
+
+      <list>
+        <item>
+	  <p>[httpc|httpd] - Now allow the use of the "new" ssl, by using
+            the <c>essl</c> tag instead. </p> 
+          <p>See the <c>http_option</c> option in the 
+            <seealso marker="httpc#request2">request/4,5</seealso> or 
+            the <seealso marker="httpd#comm_prop">socket-type</seealso>
+            section of the Communication properties chapter for more info, </p>
+	  <p>Own Id: OTP-7907</p>
+        </item>
+
+        <item>
+	  <p>Deprecated functions designated to be removed in R14 has been
+            removed. Also, some new functions has been marked as deprecated
+            (the old http client api module). </p>
+	  <p>Own Id: OTP-8564</p>
+	  <p>*** POTENTIAL INCOMPATIBILITY ***</p>
+        </item>
+
+        <item>
+	  <p>[httpd] - Improved mod_alias. 
+            Now able to do better URL rewrites. </p> 
+          <p>See 
+            <seealso marker="httpd#alias_prop">URL aliasing properties</seealso> 
+            and the 
+            <seealso marker="httpd#cgi_prop">CGI properties</seealso>
+            section(s) for more info, </p>
+	  <p>Own Id: OTP-8573</p>
+        </item>
+
+      </list>
+    </section>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+
+      <p>-</p>
+
+<!--
+      <list>
+        <item>
+	  <p>[httpd] The server did not fully support the documented module
+            callback api. Specifically, the load function should be able to
+            return the atom <c>ok</c>, but this was not accepted. </p>
+	  <p>Own Id: OTP-8359</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+  </section> <!-- 5.4 -->
+
+
   <section><title>Inets 5.3.3</title>
 
     <section><title>Improvements and New Features</title>
@@ -304,6 +455,7 @@
           <p>Own Id: OTP-8016</p>
 	  <p>*** POTENTIAL INCOMPATIBILITY ***</p>
         </item>
+
       </list>
     </section>
 
diff --git a/lib/inets/examples/Makefile b/lib/inets/examples/Makefile
index a42b0e38b6..775c449062 100644
--- a/lib/inets/examples/Makefile
+++ b/lib/inets/examples/Makefile
@@ -1,19 +1,19 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2010. 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%
 #
 #
@@ -21,189 +21,15 @@ include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 # ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(INETS_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/inets-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
+# Common Macros
 # ----------------------------------------------------
-MODULE= 
 
-AUTH_FILES = server_root/auth/group \
-	server_root/auth/passwd 
-CGI_FILES = server_root/cgi-bin/printenv.sh 
-CONF_FILES = server_root/conf/8080.conf \
-	server_root/conf/8888.conf \
-	server_root/conf/httpd.conf \
-	server_root/conf/ssl.conf \
-	server_root/conf/mime.types 
-OPEN_FILES = server_root/htdocs/open/dummy.html 
-MNESIA_OPEN_FILES = server_root/htdocs/mnesia_open/dummy.html 
-MISC_FILES = server_root/htdocs/misc/friedrich.html \
-	server_root/htdocs/misc/oech.html
-SECRET_FILES = server_root/htdocs/secret/dummy.html 
-MNESIA_SECRET_FILES = server_root/htdocs/mnesia_secret/dummy.html 
-HTDOCS_FILES = server_root/htdocs/index.html \
-	server_root/htdocs/config.shtml \
-	server_root/htdocs/echo.shtml \
-	server_root/htdocs/exec.shtml \
-	server_root/htdocs/flastmod.shtml \
-	server_root/htdocs/fsize.shtml \
-	server_root/htdocs/include.shtml
-ICON_FILES = server_root/icons/README \
-	server_root/icons/a.gif \
-	server_root/icons/alert.black.gif \
-	server_root/icons/alert.red.gif \
-	server_root/icons/apache_pb.gif \
-	server_root/icons/back.gif \
-	server_root/icons/ball.gray.gif \
-	server_root/icons/ball.red.gif \
-	server_root/icons/binary.gif \
-	server_root/icons/binhex.gif \
-	server_root/icons/blank.gif \
-	server_root/icons/bomb.gif \
-	server_root/icons/box1.gif \
-	server_root/icons/box2.gif \
-	server_root/icons/broken.gif \
-	server_root/icons/burst.gif \
-	server_root/icons/button1.gif \
-	server_root/icons/button10.gif \
-	server_root/icons/button2.gif \
-	server_root/icons/button3.gif \
-	server_root/icons/button4.gif \
-	server_root/icons/button5.gif \
-	server_root/icons/button6.gif \
-	server_root/icons/button7.gif \
-	server_root/icons/button8.gif \
-	server_root/icons/button9.gif \
-	server_root/icons/buttonl.gif \
-	server_root/icons/buttonr.gif \
-	server_root/icons/c.gif \
-	server_root/icons/comp.blue.gif \
-	server_root/icons/comp.gray.gif \
-	server_root/icons/compressed.gif \
-	server_root/icons/continued.gif \
-	server_root/icons/dir.gif \
-	server_root/icons/down.gif \
-	server_root/icons/dvi.gif \
-	server_root/icons/f.gif \
-	server_root/icons/folder.gif \
-	server_root/icons/folder.open.gif \
-	server_root/icons/folder.sec.gif \
-	server_root/icons/forward.gif \
-	server_root/icons/generic.gif \
-	server_root/icons/generic.red.gif \
-	server_root/icons/generic.sec.gif \
-	server_root/icons/hand.right.gif \
-	server_root/icons/hand.up.gif \
-	server_root/icons/htdig.gif \
-	server_root/icons/icon.sheet.gif \
-	server_root/icons/image1.gif \
-	server_root/icons/image2.gif \
-	server_root/icons/image3.gif \
-	server_root/icons/index.gif \
-	server_root/icons/layout.gif \
-	server_root/icons/left.gif \
-	server_root/icons/link.gif \
-	server_root/icons/movie.gif \
-	server_root/icons/p.gif \
-	server_root/icons/patch.gif \
-	server_root/icons/pdf.gif \
-	server_root/icons/pie0.gif \
-	server_root/icons/pie1.gif \
-	server_root/icons/pie2.gif \
-	server_root/icons/pie3.gif \
-	server_root/icons/pie4.gif \
-	server_root/icons/pie5.gif \
-	server_root/icons/pie6.gif \
-	server_root/icons/pie7.gif \
-	server_root/icons/pie8.gif \
-	server_root/icons/portal.gif \
-	server_root/icons/poweredby.gif \
-	server_root/icons/ps.gif \
-	server_root/icons/quill.gif \
-	server_root/icons/right.gif \
-	server_root/icons/screw1.gif \
-	server_root/icons/screw2.gif \
-	server_root/icons/script.gif \
-	server_root/icons/sound1.gif \
-	server_root/icons/sound2.gif \
-	server_root/icons/sphere1.gif \
-	server_root/icons/sphere2.gif \
-	server_root/icons/star.gif \
-	server_root/icons/star_blank.gif \
-	server_root/icons/tar.gif \
-	server_root/icons/tex.gif \
-	server_root/icons/text.gif \
-	server_root/icons/transfer.gif \
-	server_root/icons/unknown.gif \
-	server_root/icons/up.gif \
-	server_root/icons/uu.gif \
-	server_root/icons/uuencoded.gif \
-	server_root/icons/world1.gif \
-	server_root/icons/world2.gif
+include subdirs.mk
 
-SSL_FILES = server_root/ssl/ssl_client.pem \
-	server_root/ssl/ssl_server.pem
+SPECIAL_TARGETS = 
 
 # ----------------------------------------------------
-# FLAGS
+# Default Subdir Targets
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: 
-
-clean:
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/auth
-	$(INSTALL_DATA) $(AUTH_FILES) $(RELSYSDIR)/examples/server_root/auth
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/cgi-bin
-	$(INSTALL_SCRIPT) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/conf
-	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/examples/server_root/conf
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/open
-	$(INSTALL_DATA) $(OPEN_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/open
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
-	$(INSTALL_DATA) $(MNESIA_OPEN_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/misc
-	$(INSTALL_DATA) $(MISC_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/misc
-	$(INSTALL_DIR)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/secret/top_secret
-	$(INSTALL_DIR)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret/top_secret
-	$(INSTALL_DATA) $(SECRET_FILES)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/secret
-	$(INSTALL_DATA) $(MNESIA_SECRET_FILES)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs
-	$(INSTALL_DATA) $(HTDOCS_FILES) $(RELSYSDIR)/examples/server_root/htdocs
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/icons
-	$(INSTALL_DATA) $(ICON_FILES) $(RELSYSDIR)/examples/server_root/icons
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/ssl
-	$(INSTALL_DATA) $(SSL_FILES) $(RELSYSDIR)/examples/server_root/ssl
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/logs
-
-release_docs_spec:
+include $(ERL_TOP)/make/otp_subdir.mk
 
diff --git a/lib/inets/examples/httpd_load_test/Makefile b/lib/inets/examples/httpd_load_test/Makefile
new file mode 100644
index 0000000000..1cc61ad8ae
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/Makefile
@@ -0,0 +1,123 @@
+# 
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2010. 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%
+
+include $(ERL_TOP)/make/target.mk
+
+EBIN = .
+
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../../vsn.mk
+
+VSN=$(INETS_VSN)
+
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR         = $(RELEASE_PATH)/lib/inets-$(VSN)
+EXAMPLE_RELSYSDIR = $(RELSYSDIR)/examples
+HDLT_RELSYSDIR    = $(EXAMPLE_RELSYSDIR)/httpd_load_test
+
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+include modules.mk
+
+ERL_FILES = $(MODULES:%=%.erl)
+
+SOURCE = $(ERL_FILES) $(INTERNAL_HRL_FILES)
+
+TARGET_FILES =  \
+	$(ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR))
+
+ifeq ($(TYPE),debug)
+ERL_COMPILE_FLAGS += -Ddebug -W
+endif
+
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+
+include ../../src/inets_app/inets.mk
+
+ERL_COMPILE_FLAGS += \
+	$(INETS_FLAGS) \
+	$(INETS_ERL_COMPILE_FLAGS) \
+	-I../../include
+
+
+# ----------------------------------------------------
+# Special Build Targets
+# ----------------------------------------------------
+
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+debug:
+	@${MAKE} TYPE=debug opt
+
+opt: $(TARGET_FILES) 
+
+clean:
+	rm -f $(TARGET_FILES) 
+	rm -f errs core *~
+
+docs:
+
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+
+release_spec: opt
+	$(INSTALL_DIR)  $(EXAMPLE_RELSYSDIR)
+	$(INSTALL_DIR)  $(HDLT_RELSYSDIR)
+	$(INSTALL_DATA) $(SCRIPT_SKELETONS) $(HDLT_RELSYSDIR)
+	$(INSTALL_DATA) $(CONF_SKELETONS)   $(HDLT_RELSYSDIR)
+	$(INSTALL_DATA) $(CERT_FILES)       $(HDLT_RELSYSDIR)
+	$(INSTALL_DATA) $(TARGET_FILES)     $(HDLT_RELSYSDIR)
+	$(INSTALL_DATA) $(ERL_FILES)        $(HDLT_RELSYSDIR)
+
+
+release_docs_spec:
+
+
+# ----------------------------------------------------
+# Include dependencies
+# ----------------------------------------------------
+
+megaco_codec_transform.$(EMULATOR): megaco_codec_transform.erl
+
+megaco_codec_meas.$(EMULATOR): megaco_codec_meas.erl
+
+megaco_codec_mstone1.$(EMULATOR): megaco_codec_mstone1.erl
+
+megaco_codec_mstone2.$(EMULATOR): megaco_codec_mstone2.erl
+
+megaco_codec_mstone_lib.$(EMULATOR): megaco_codec_mstone_lib.erl
+
diff --git a/lib/inets/examples/httpd_load_test/hdlt.config.skel b/lib/inets/examples/httpd_load_test/hdlt.config.skel
new file mode 100644
index 0000000000..640867ebac
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt.config.skel
@@ -0,0 +1,20 @@
+%% Debug: silence | info | log | debug
+{debug,  [{ctrl, info}, {proxy, silence}, {slave, silence}, {client, silence}]}.
+{server, {"/usr/local/bin", "fooserver"}}.
+%% {port,   8888}.             % integer() > 0
+{server_dir, "/tmp/hdlt"}. % Absolute path
+{work_dir,   "/tmp/hdlt"}. % Absolute path
+{clients, 
+ [
+  {"/opt/local/bin", "foo"}, 
+  {"/usr/local/bin", "bar"}
+ ]
+}.
+%% {send_rate, 80}.     % Max number of outstanding requests, integer() > 0
+%% {test_time, 120}.    % Number of seconds, 
+%% {max_nof_schedulers, 8}. % integer() >= 0
+%% {work_simulator, 10000}.  % integer() > 0
+%% {data_size, {100, 500, 2}}. % {integer() > 0, integer() > 0, integer() > 0}
+%% {socket_type, ip_comm}. % ip_comm | ssl | essl | ossl
+%% {server_cert_file, "hdlt_ssl_server_cert.pem"}.
+%% {client_cert_file, "hdlt_ssl_client_cert.pem"}.
\ No newline at end of file
diff --git a/lib/inets/examples/httpd_load_test/hdlt.erl b/lib/inets/examples/httpd_load_test/hdlt.erl
new file mode 100644
index 0000000000..18d8c34ccf
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt.erl
@@ -0,0 +1,74 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+%%
+%%----------------------------------------------------------------------
+%% Purpose: Main API module for the httpd load test utility
+%%----------------------------------------------------------------------
+
+-module(hdlt).
+
+
+%%-----------------------------------------------------------------
+%% Public interface
+%%-----------------------------------------------------------------
+
+-export([start/0, start/1, stop/0, help/0]).
+
+
+%%-----------------------------------------------------------------
+%% Start the HDLT utility
+%%-----------------------------------------------------------------
+
+start() ->
+    ConfigFile = "hdlt.config",
+    case file:consult(ConfigFile) of
+	{ok, Config} when is_list(Config) ->
+	    start(Config);
+	Error ->
+	    Error
+    end.
+
+start(Config) ->
+    Flag = process_flag(trap_exit, true),
+    Result = 
+	case hdlt_ctrl:start(Config) of
+	    {ok, Pid} ->
+		receive
+		    {'EXIT', Pid, normal} ->
+			ok;
+		    {'EXIT', Pid, Reason} ->
+			io:format("HDLT failed: "
+				  "~n   ~p"
+				  "~n", [Reason]),
+			{error, Reason}
+		end;
+	    Error ->
+		Error
+	end,
+    process_flag(trap_exit, Flag),
+    Result.
+
+
+
+stop() ->
+    hdlt_ctrl:stop().
+
+    
+help() ->
+    hdlt_ctrl:help().
diff --git a/lib/inets/examples/httpd_load_test/hdlt.sh.skel b/lib/inets/examples/httpd_load_test/hdlt.sh.skel
new file mode 100644
index 0000000000..a250bad9c5
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt.sh.skel
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2010. 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%
+
+# Skeleton for a script intended to run the hdlt(N) 
+# performance test.
+# 
+# This test can be used for several things depending on the 
+# configuration: SMP or SocketType performance tests
+#
+
+ERL_HOME=<path to otp top dir>
+INETS_HOME=$ERL_HOME/lib/erlang/lib/<inets dir>
+HDLT_HOME=$INETS_HOME/examples/httpd_load_test
+PATH=$ERL_HOME/bin:$PATH
+
+HDLT="-s hdlt start"
+STOP="-s init stop"
+
+ERL="erl \
+     -noshell \
+     -pa $HDLT_HOME \
+     $HDLT \
+     $STOP"
+
+echo $ERL
+$ERL | tee hdlt.log
+
diff --git a/lib/inets/examples/httpd_load_test/hdlt_client.erl b/lib/inets/examples/httpd_load_test/hdlt_client.erl
new file mode 100644
index 0000000000..d65ac5a885
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt_client.erl
@@ -0,0 +1,370 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+%%
+%%----------------------------------------------------------------------
+%% Purpose: The HDLT client module.
+%%          This is the traffic generator
+%%----------------------------------------------------------------------
+
+-module(hdlt_client).
+
+-export([
+	 start/1, 
+	 stop/0, 
+	 start_inets/0, 
+	 start_service/1, 
+	 release/0, 
+	 node_info/0
+	]).
+
+-export([
+	 proxy/1
+	]).
+
+-include("hdlt_logger.hrl").
+
+-define(CTRL,   hdlt_ctrl).
+-define(PROXY,  hdlt_proxy).
+
+-record(state, 
+	{
+	 mode = initial,
+	 send_rate,
+	 time, 
+	 stop_time, 
+	 url,
+	 nof_reqs = 0,
+	 nof_reps = 0,
+	 last_req,
+	 sizes,
+	 socket_type, 
+	 cert_file
+	}).
+
+
+
+start(Debug) ->
+    proc_lib:start_link(?MODULE, proxy, [Debug]).
+
+stop() ->
+    (catch erlang:send(?PROXY, stop)),
+    ok.
+
+start_inets() ->
+    ?PROXY ! start_inets.
+
+start_service(Args) ->
+    ?PROXY ! {start_client, Args, self()},
+    receive
+	client_started ->
+	    %% ?LOG("client service started"),
+	    ok
+    end.
+
+release() ->
+    ?PROXY ! release.
+
+node_info() ->
+    ?PROXY ! {node_info, self()},
+    receive 
+	{node_info, NodeInfo} ->
+	    NodeInfo
+    end.
+
+
+%% ---------------------------------------------------------------------
+%% 
+%% The proxy process
+%% 
+
+proxy(Debug) ->
+    process_flag(trap_exit, true),
+    erlang:register(?PROXY, self()),
+    SName = lists:flatten(
+	      io_lib:format("HDLT PROXY[~p,~p]", [self(), node()])), 
+    ?SET_NAME(SName),
+    ?SET_LEVEL(Debug), 
+    ?LOG("starting", []),
+    Ref = await_for_controller(10), 
+    CtrlNode = node(Ref), 
+    erlang:monitor_node(CtrlNode, true),
+    proc_lib:init_ack({ok, self()}),
+    ?DEBUG("started", []),
+    proxy_loop(Ref, CtrlNode, undefined).
+
+await_for_controller(N) when N > 0 ->
+    case global:whereis_name(hdlt_ctrl) of
+	Pid when is_pid(Pid) ->
+	    erlang:monitor(process, Pid);
+	_ ->
+	    timer:sleep(1000),
+	    await_for_controller(N-1)
+    end;
+await_for_controller(_) ->
+    proc_lib:init_ack({error, controller_not_found, nodes()}),
+    timer:sleep(500),
+    init:stop().
+
+
+proxy_loop(Ref, CtrlNode, Client) ->
+    ?DEBUG("await command", []),
+    receive
+	stop ->
+	    ?LOG("stop", []),
+	    timer:sleep(1000),
+	    halt();
+
+	start_inets ->
+	    ?LOG("start the inets service framework", []),
+	    %% inets:enable_trace(max, "/tmp/inets-httpc-trace.log", all),
+	    case (catch inets:start()) of
+		ok ->
+		    ?LOG("framework started", []),
+		    proxy_loop(Ref, CtrlNode, Client);
+		Error ->
+		    ?LOG("failed starting inets service framework: "
+			"~n   Error: ~p", [Error]),
+		    timer:sleep(1000),
+		    halt()
+	    end;
+
+	{start_client, Args, From} ->
+	    ?LOG("start client with"
+		"~n   Args: ~p", [Args]),
+	    Client2 = spawn_link(fun() -> client(Args) end),
+	    From ! client_started,
+	    proxy_loop(Ref, CtrlNode, Client2);
+
+	release ->
+	    ?LOG("release", []),
+	    Client ! go,
+	    proxy_loop(Ref, CtrlNode, Client);
+
+	{node_info, Pid} ->
+	    ?LOG("received requets for node info", []),
+	    NodeInfo = get_node_info(),
+	    Pid ! {node_info, NodeInfo}, 
+	    proxy_loop(Ref, CtrlNode, Client);
+
+	{'EXIT', Client, normal} ->
+	    ?LOG("received normal exit message from client (~p)", 
+		 [Client]),
+	    exit(normal);
+	
+	{'EXIT', Client, Reason} ->
+	    ?INFO("received exit message from client (~p)"
+		 "~n   Reason: ~p", [Client, Reason]),
+	    %% Unexpected client termination, inform the controller and die
+	    global:send(hdlt_ctrl, {client_exit, Client, node(), Reason}),
+	    exit({client_exit, Reason});
+
+	{nodedown, CtrlNode} ->
+	    ?LOG("received nodedown for controller node - terminate", []), 
+	    halt();
+
+	{'DOWN', Ref, process, _, _} ->
+	    ?INFO("received DOWN message for controller - terminate", []),
+	    %% The controller has terminated, dont care why, time to die
+	    halt()
+
+    end.
+
+
+
+%% ---------------------------------------------------------------------
+%% 
+%% The client process
+%% 
+
+client([SocketType, CertFile, URLBase, Sizes, Time, SendRate, Debug]) ->
+    SName = lists:flatten(
+	      io_lib:format("HDLT CLIENT[~p,~p]", [self(), node()])), 
+    ?SET_NAME(SName),
+    ?SET_LEVEL(Debug), 
+    ?LOG("starting with"
+	 "~n   SocketType: ~p"
+	 "~n   Time:       ~p"
+	 "~n   SendRate:   ~p", [SocketType, Time, SendRate]),
+    httpc:set_options([{max_pipeline_length, 0}]),
+    if
+	(SocketType =:= ssl) orelse
+	(SocketType =:= ossl) orelse
+	(SocketType =:= essl) ->
+	    %% Ensure crypto and ssl started:
+	    crypto:start(),
+	    ssl:start();
+	true ->
+	    ok
+    end,
+    State = #state{mode        = idle, 
+		   url         = URLBase, 
+		   time        = Time, 
+		   send_rate   = SendRate,
+		   sizes       = Sizes,
+		   socket_type = SocketType,
+		   cert_file   = CertFile},
+    ?DEBUG("started", []),
+    client_loop(State).
+
+%% The point is to first start all client nodes and then this
+%% process. Then, when they are all started, the go-ahead, go, 
+%% message is sent to let them lose at the same time.
+client_loop(#state{mode      = idle, 
+		   time      = Time, 
+		   send_rate = SendRate} = State) ->
+    ?DEBUG("[idle] awaiting the go command", []),
+    receive 
+	go ->
+	    ?LOG("[idle] received go", []),
+	    erlang:send_after(Time, self(), stop),
+	    NewState = send_requests(State, SendRate),	    
+	    client_loop(NewState#state{mode     = generating, 
+				       nof_reqs = SendRate})
+    end;
+
+%% In this mode the client is generating traffic.
+%% It will continue to do so until the stop message
+%% is received. 
+client_loop(#state{mode = generating} = State) -> 
+    receive 
+	stop ->
+	    ?LOG("[generating] received stop", []),
+	    StopTime = timestamp(), 
+	    req_reply(State),
+	    client_loop(State#state{mode = stopping, stop_time = StopTime});
+
+	{http, {_, {{_, 200, _}, _, _}}} ->
+	    %% ?DEBUG("[generating] received reply - send another request", []),
+	    NewState = send_requests(State, 1),
+	    client_loop(NewState#state{nof_reps = NewState#state.nof_reps + 1,
+				       nof_reqs = NewState#state.nof_reqs + 1});
+
+	{http, {ReqId, {error, Reason}}} ->
+	    ?INFO("[generating] request ~p failed: "
+		  "~n   Reason:  ~p"
+		  "~n   NofReqs: ~p"
+		  "~n   NofReps: ~p", 
+		  [ReqId, Reason, State#state.nof_reqs, State#state.nof_reps]),
+	    exit({Reason, generating, State#state.nof_reqs, State#state.nof_reps});
+
+	Else ->
+	    ?LOG("[generating] received unexpected message: "
+		 "~n~p", [Else]),
+	    unexpected_data(Else), 
+	    client_loop(State)
+    end;
+
+%% The client no longer issues any new requests, instead it 
+%% waits for replies for all the oustanding requests to 
+%% arrive.
+client_loop(#state{mode     = stopping, 
+		   time     = Time, 
+		   last_req = LastReqId} = State) ->
+    receive 
+	{http, {LastReqId, {{_, 200, _}, _, _}}} ->
+	    ?DEBUG("[stopping] received reply for last request (~p)", [LastReqId]),
+	    time_to_complete(State),
+	    ok;
+
+	{http, {ReqId, {{_, 200, _}, _, _}}} ->
+	    ?DEBUG("[stopping] received reply ~p", [ReqId]),
+	    client_loop(State);
+
+	{http, {ReqId, {error, Reason}}} ->
+	    ?INFO("[stopping] request ~p failed: "
+		  "~n   Reason:  ~p"
+		  "~n   NofReqs: ~p"
+		  "~n   NofReps: ~p", 
+		  [ReqId, Reason, State#state.nof_reqs, State#state.nof_reps]),
+	    exit({Reason, stopping, State#state.nof_reqs, State#state.nof_reps});
+
+	Else ->
+	    ?LOG("[stopping] received unexpected message: "
+		 "~n~p", [Else]),
+	    unexpected_data(Else), 
+	    client_loop(State)
+
+    after Time ->
+	    ?INFO("timeout when"
+		  "~n   Number of requests: ~p"
+		  "~n   Number of replies:  ~p", 
+		  [State#state.nof_reqs, State#state.nof_reps]),
+	    exit({timeout, State#state.nof_reqs, State#state.nof_reps})
+    end.
+
+req_reply(#state{nof_reqs = NofReqs, nof_reps = NofReps}) ->
+    load_data({req_reply, node(), NofReqs, NofReps}).
+
+time_to_complete(#state{stop_time = StopTime}) ->
+    StoppedTime = os:timestamp(),
+    load_data({time_to_complete, node(), StopTime, StoppedTime}).
+
+load_data(Data) ->
+    global:send(?CTRL, {load_data, Data}).
+
+unexpected_data(Else) ->
+    global:send(?CTRL, {unexpected_data, Else}).
+
+
+send_requests(#state{sizes = Sizes} = State, N) ->
+    send_requests(State, N, Sizes).
+
+send_requests(State, 0, Sizes) ->
+    State#state{sizes = Sizes};
+send_requests(#state{socket_type = SocketType, 
+		     cert_file   = CertFile} = State, N, [Sz | Sizes]) ->
+    URL = lists:flatten(io_lib:format("~s~w", [State#state.url, Sz])),
+    Method      = get,
+    Request     = {URL, []},
+    HTTPOptions = 
+	case SocketType of
+	    ip_comm ->
+		[];
+	    _ ->
+		SslOpts = [{verify, 0},
+			   {certfile, CertFile},
+			   {keyfile,  CertFile}],
+		case SocketType of
+		    ssl ->
+			[{ssl, SslOpts}];
+		    ossl ->
+			[{ssl, {ossl, SslOpts}}];
+		    essl ->
+			[{ssl, {essl, SslOpts}}]
+		end
+	end,
+    Options = [{sync, false}], 
+    {ok, Ref} = httpc:request(Method, Request, HTTPOptions, Options), 
+    send_requests(State#state{last_req = Ref}, N-1, lists:append(Sizes, [Sz])).
+
+
+timestamp() ->
+   os:timestamp().
+ 
+
+get_node_info() ->
+    [{cpu_topology,        erlang:system_info(cpu_topology)},
+     {heap_type,           erlang:system_info(heap_type)},
+     {nof_schedulers,      erlang:system_info(schedulers)},
+     {otp_release,         erlang:system_info(otp_release)}, 
+     {version,             erlang:system_info(version)}, 
+     {system_version,      erlang:system_info(system_version)},
+     {system_architecture, erlang:system_info(system_architecture)}].
+
+
diff --git a/lib/inets/examples/httpd_load_test/hdlt_ctrl.erl b/lib/inets/examples/httpd_load_test/hdlt_ctrl.erl
new file mode 100644
index 0000000000..950d2632f7
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt_ctrl.erl
@@ -0,0 +1,1530 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+%%
+%%----------------------------------------------------------------------
+%% Purpose: The httpd load test (hdlt) controller/collector module, 
+%%          This module contains all the code of the httpd load test 
+%%          controller/collector. It sets up the test, starts all
+%%          server and client nodes and applications and finally 
+%%          collects test data.
+%%----------------------------------------------------------------------
+
+-module(hdlt_ctrl).
+
+-export([start/1, stop/0, help/0]).
+
+-export([init/1, proxy/7]).
+
+-include_lib("kernel/include/file.hrl").
+-include("hdlt_logger.hrl").
+
+-define(DEFAULT_SENDRATE,           89).
+-define(DEFAULT_TEST_TIME,          120). % 2 minutes
+-define(DEFAULT_PORT,               8889).
+-define(TIMEOUT,                    60000).
+-define(DEFAULT_MAX_NOF_SCHEDULERS, 8).
+-define(DEFAULT_SERVER_DIR,         "/tmp/hdlt").
+-define(DEFAULT_WORK_DIR,           "/tmp/hdlt").
+-define(SSH_PORT,                   22).
+-define(DEFAULT_SOCKET_TYPE,        ip_comm).
+-define(DEFAULT_SERVER_CERT,        "hdlt_ssl_server_cert.pem").
+-define(DEFAULT_CLIENT_CERT,        "hdlt_ssl_client_cert.pem").
+-define(SSH_CONNECT_TIMEOUT,        5000).
+-define(NODE_START_TIMEOUT,         5000).
+-define(LOCAL_PROXY_START_TIMEOUT,  ?NODE_START_TIMEOUT * 4).
+-define(DEFAULT_DEBUGS, 
+	[{ctrl, info}, {slave, silence}, {proxy, silence}, {client, silence}]).
+-define(DEFAULT_WORK_SIM,           10000).
+-define(DEFAULT_DATA_SIZE_START,    500).
+-define(DEFAULT_DATA_SIZE_END,      1500).
+-define(DEFAULT_DATA_SIZE_INCR,     1).
+-define(DEFAULT_DATA_SIZE,          {?DEFAULT_DATA_SIZE_START,
+				     ?DEFAULT_DATA_SIZE_END,
+				     ?DEFAULT_DATA_SIZE_INCR}).
+
+
+%% hdlt = httpd load test
+
+-define(COLLECTOR,   hdlt_ctrl).
+-define(RESULTS_TAB, hdlt_results).
+
+-define(CLIENT_MOD,       hdlt_client).
+-define(CLIENT_NODE_NAME, ?CLIENT_MOD).
+
+-define(SERVER_MOD,       hdlt_server).
+-define(SERVER_NODE_NAME, ?SERVER_MOD).
+
+-define(LOGGER, hdlt_logger).
+
+
+-record(state, 
+	{
+	 url,
+	 test_time,
+	 send_rate,
+	 http_server, 
+	 http_port,
+	 results = ?RESULTS_TAB, 
+	 nodes,
+	 server_root,
+	 doc_root,
+	 server_dir,
+	 work_dir,
+	 server_conn,
+	 client_conns = [],
+	 client_mod   = ?CLIENT_MOD, 
+	 clients,
+	 nof_schedulers = 0,
+	 max_nof_schedulers,
+	 socket_type,
+	 server_cert_file,
+	 client_cert_file,
+	 debugs,
+	 client_sz_from, 
+	 client_sz_to, 
+	 client_sz_incr 
+	}
+       ).
+
+-record(proxy, 
+	{
+	 mode,
+	 mod, 
+	 connection, 
+	 channel, 
+	 host, 
+	 cmd, 
+	 node_name, 
+	 node,
+	 ref,
+	 erl_path, 
+	 paths, 
+	 args
+	}).
+
+-record(connection, 
+	{
+	 proxy,
+	 node, 
+	 node_name,
+	 host
+	}).
+
+
+-record(client, {host, path, version}).
+-record(server, {host, path, version}).
+
+
+start(Config) when is_list(Config) ->
+    proc_lib:start_link(?MODULE, init, [Config]).
+
+stop() ->
+    global:send(?COLLECTOR, stop).
+
+init(Config) ->
+    %% io:format("Config: ~n~p~n", [Config]),
+    case (catch do_init(Config)) of
+	{ok, State} ->
+	    proc_lib:init_ack({ok, self()}),
+	    loop(State);
+	{error, _Reason} = Error ->
+	    proc_lib:init_ack(Error),
+	    ok;
+	{'EXIT', Reason} ->
+	    proc_lib:init_ack({error, Reason}),
+	    ok
+    end.
+
+do_init(Config) ->
+    %% Do not trap exit, but register ourself
+    global:register_name(?COLLECTOR, self()), 
+
+    State = #state{},
+    ets:new(State#state.results, [bag, named_table]),
+    
+    hdlt_logger:start(),
+    global:sync(),
+    
+    %% Maybe enable debug
+    Debugs = get_debugs(Config),
+    ?SET_NAME("HDLT CTRL"),
+    set_debug_level(Debugs), 
+
+    ?DEBUG("network info: "
+	   "~n   Global names: ~p"
+	   "~n   Nodes:        ~p", [global:registered_names(), nodes()]),
+
+    %% Read config
+    ?LOG("read config", []),
+    SendRate         = get_send_rate(Config),
+    Clients          = get_clients(Config), 
+    TestTime         = get_test_time(Config), 
+    Server           = get_server(Config),
+    Port             = get_port(Config),
+    ServerDir        = get_server_dir(Config),
+    WorkingDir       = get_work_dir(Config),
+    MaxNofSchedulers = get_max_nof_schedulers(Config),
+    SocketType       = get_socket_type(Config),
+    ServerCertFile   = get_server_cert_file(Config),
+    ClientCertFile   = get_client_cert_file(Config),
+    WorkSim          = get_work_sim(Config),
+    {From, To, Incr} = get_data_size(Config),
+
+    URL        = url(Server, Port, SocketType, WorkSim), 
+    ServerRoot = filename:join(ServerDir, "server_root"),  
+    DocRoot    = ServerRoot, %% Not really used in this test
+
+    ?DEBUG("randomize setup", []), 
+    randomized_sizes_init(), 
+
+    %% Start used applications
+    ?DEBUG("ensure crypto started", []), 
+    crypto:start(),
+    ?DEBUG("ensure ssh started", []), 
+    ssh:start(),
+
+    State2 = State#state{server_root        = ServerRoot, 
+			 doc_root           = DocRoot,
+			 server_dir         = ServerDir, 
+			 work_dir           = WorkingDir,
+			 max_nof_schedulers = MaxNofSchedulers, 
+			 socket_type        = SocketType,
+			 server_cert_file   = ServerCertFile,
+			 client_cert_file   = ClientCertFile,
+			 http_server        = Server, 
+			 http_port          = Port, 
+			 url                = URL,
+			 test_time          = TestTime, 
+			 send_rate          = SendRate,
+			 clients            = Clients,
+			 debugs             = Debugs, 
+			 client_sz_from     = From, 
+			 client_sz_to       = To, 
+			 client_sz_incr     = Incr},
+    
+    ?LOG("prepare server host", []),
+    prepare_server_host(State2),
+
+    ?LOG("prepare client hosts", []),
+    State3 = prepare_client_hosts(State2),
+
+    ?LOG("basic init done", []),
+    {ok, State3}.
+
+
+loop(#state{nof_schedulers = N, max_nof_schedulers = M} = State) when N > M -> 
+    
+    ?INFO("Starting to analyse data", []),
+    
+    AnalysedTab = analyse_data(State),
+    
+    Files = save_results_to_file(AnalysedTab, State),
+    io:format("~n******************************************************"
+	      "~n~nResult(s) saved to: ~n~p~n", [Files]),
+    clean_up(State);
+
+loop(#state{url            = URL, 
+	    test_time      = TestTime, 
+	    send_rate      = SendRate,
+	    nof_schedulers = NofSchedulers} = State) ->
+    
+    {StartH, StartM, StartS} = erlang:time(),
+	
+    ?INFO("Performing test with ~p smp-scheduler(s): ~n"
+	  "  It will take a minimum of: ~p seconds. ~n"
+	  "  Start time:                ~.2.0w:~.2.0w:~.2.0w", 
+	  [NofSchedulers, round(TestTime/1000), StartH, StartM, StartS]),
+
+    %% Start the server node 
+    %% (The local proxy, the node, the remote proxy, and the inets framework)
+    State1 = start_server_node(State),
+    ?DEBUG("nodes after server start: ~p", [nodes() -- [node()]]),
+    
+    %% Start the client node(s)
+    %% (The local proxy, the node, the remote proxy, and the inets framework)
+    ?LOG("start client node(s)", []),
+    State2 = start_client_nodes(State1),
+    ?DEBUG("nodes after client(s) start: ~p", [nodes() -- [node()]]),
+
+    ?LOG("start server", []),
+    start_server(State2), 
+
+    ?LOG("start clients", []),
+    start_clients(State2, URL, TestTime, SendRate),
+
+    ?LOG("release clients", []),
+    release_clients(State2),
+
+    ?LOG("collect data", []),
+    collect_data(State2),
+
+    ?LOG("stop all nodes", []),
+    State3 = stop_nodes(State2),
+
+    ?INFO("Test with ~p smp-scheduler(s) complete"
+	  "~n~n"
+	  "****************************************************************"
+	  "~n", 
+	  [NofSchedulers]),
+    loop(State3#state{nof_schedulers = NofSchedulers + 1}).
+    
+
+prepare_server_host(#state{server_root      = ServerRoot, 
+			   http_server      = #server{host = Host},
+			   socket_type      = SocketType,
+			   server_cert_file = CertFile}) ->
+    ?INFO("prepare server host ~s", [Host]),
+    Opts = [{user_interaction,      false},
+	    {silently_accept_hosts, true},
+	    {timeout,               2*?SSH_CONNECT_TIMEOUT}, 
+	    {connect_timeout,       ?SSH_CONNECT_TIMEOUT}], 
+    case ssh_sftp:start_channel(Host, Opts) of
+	{ok, Sftp, ConnectionRef} ->
+	    ?DEBUG("sftp connection established - now transer server content",
+		   []),
+	    create_server_content(Sftp, ServerRoot, SocketType, CertFile),
+	    ?DEBUG("server content transfered - now close ssh connection ", 
+		   []),
+	    ssh:close(ConnectionRef),
+	    ?DEBUG("server preparation complete ", []),
+	    ok;
+	Error ->
+	    ?INFO("FAILED creating sftp channel to server host ~s: "
+		  "~n   ~p", [Host, Error]),
+	    exit({failed_establishing_sftp_connection, Error})
+    end.
+
+create_server_content(Sftp, ServerRoot, SocketType, CertFile) -> 
+    %% Create server root
+    ?DEBUG("ensure existence of ~p", [ServerRoot]),
+    ensure_remote_dir_exist(Sftp, ServerRoot),
+
+    %% Create the server ebin dir (for the starter module)
+    EBIN = filename:join(ServerRoot, "ebin"), 
+    ?DEBUG("make ebin dir: ~p", [EBIN]),
+    maybe_create_remote_dir(Sftp, EBIN),
+
+    %% Create the server ebin dir (for the starter module)
+    LOG = filename:join(ServerRoot, "log"), 
+    ?DEBUG("make log dir: ~p", [LOG]),
+    maybe_create_remote_dir(Sftp, LOG),
+
+    LocalServerMod = local_server_module(), 
+    ?DEBUG("copy server stub/proxy module ~s", [LocalServerMod]), 
+    RemoteServerMod = remote_server_module(EBIN), 
+    {ok, ServerModBin} = file:read_file(LocalServerMod),
+    ok = ssh_sftp:write_file(Sftp, RemoteServerMod, ServerModBin),
+
+    LocalSlaveMod = local_slave_module(), 
+    ?DEBUG("copy slave module ~s", [LocalSlaveMod]), 
+    RemoteSlaveMod = remote_slave_module(EBIN), 
+    {ok, SlaveModBin} = file:read_file(LocalSlaveMod),
+    ok = ssh_sftp:write_file(Sftp, RemoteSlaveMod, SlaveModBin),
+
+    LocalLoggerMod = local_logger_module(), 
+    ?DEBUG("copy logger module ~s", [LocalLoggerMod]), 
+    RemoteLoggerMod = remote_logger_module(EBIN), 
+    {ok, LoggerModBin} = file:read_file(LocalLoggerMod),
+    ok = ssh_sftp:write_file(Sftp, RemoteLoggerMod, LoggerModBin),
+
+    %% Create the inets server data dir
+    CGI = filename:join(ServerRoot, "cgi-bin"), 
+    ?DEBUG("make cgi dir: ~p", [CGI]),
+    maybe_create_remote_dir(Sftp, CGI),
+    
+    LocalRandomMod = local_random_html_module(), 
+    ?DEBUG("copy random-html module ~s", [LocalRandomMod]), 
+    RemoteRandomMod = remote_random_html_module(EBIN), 
+    {ok, RandomModBin} = file:read_file(LocalRandomMod),
+    ok = ssh_sftp:write_file(Sftp, RemoteRandomMod, RandomModBin),
+
+    case SocketType of
+	ip_comm ->
+	    ok;
+	_ ->
+	    SSLDir = filename:join(ServerRoot, "ssl"), 
+	    ?DEBUG("make conf dir: ~p", [SSLDir]),
+	    maybe_create_remote_dir(Sftp, SSLDir),
+	    ?DEBUG("copy ssl cert file ~s", [CertFile]),
+	    {ok, CertBin} = file:read_file(CertFile),
+	    RemoteCertFile = filename:join(SSLDir, 
+					   filename:basename(CertFile)),
+	    ok = ssh_sftp:write_file(Sftp, RemoteCertFile, CertBin),
+	    ok
+    end,
+
+    ?DEBUG("done", []),
+    ok.
+
+remote_server_module(Path) ->
+    Mod = server_module(), 
+    filename:join(Path, Mod).
+
+local_server_module() ->
+    Mod = server_module(), 
+    case code:where_is_file(Mod) of
+	Path when is_list(Path) ->
+	    Path;
+	_ ->
+	    exit({server_module_not_found, Mod})
+    end.
+
+server_module() ->
+    module(?SERVER_MOD).
+
+
+prepare_client_hosts(#state{work_dir         = WorkDir, 
+			    clients          = Clients,
+			    socket_type      = SocketType,
+			    client_cert_file = CertFile} = State) ->
+    Clients2 = 
+	prepare_client_hosts(WorkDir, SocketType, CertFile, Clients, []),
+    State#state{clients = Clients2}.
+
+prepare_client_hosts(_WorkDir, _SocketType, _CertFile, [], Acc) ->
+    lists:reverse(Acc);
+prepare_client_hosts(WorkDir, SocketType, CertFile, [Client|Clients], Acc) ->
+    case prepare_client_host(WorkDir, SocketType, CertFile, Client) of
+	ok ->
+	    prepare_client_hosts(WorkDir, SocketType, CertFile, Clients, 
+				 [Client|Acc]);
+	_ ->
+	    prepare_client_hosts(WorkDir, SocketType, CertFile, Clients, Acc)
+    end.
+
+prepare_client_host(WorkDir, SocketType, CertFile, #client{host = Host}) ->
+    ?INFO("prepare client host ~s", [Host]),
+    Opts = [{user_interaction,      false},
+	    {silently_accept_hosts, true},
+	    {timeout,               2*?SSH_CONNECT_TIMEOUT}, 
+	    {connect_timeout,       ?SSH_CONNECT_TIMEOUT}], 
+    case ssh_sftp:start_channel(Host, Opts) of
+	{ok, Sftp, ConnectionRef} ->
+	    ?DEBUG("sftp connection established - now transer client content",
+		   []),
+	    create_client_content(Sftp, WorkDir, SocketType, CertFile),
+	    ?DEBUG("client content transered - now close ssh connection ", []),
+	    ssh:close(ConnectionRef),
+	    ?DEBUG("client preparation complete ", []),
+	    ok;
+	Error ->
+	    ?INFO("FAILED creating sftp channel to client host ~s: skipping"
+		  "~n   ~p", [Host, Error]),
+	    Error
+    end.
+
+create_client_content(Sftp, WorkDir, SocketType, CertFile) -> 
+    %% Create work dir
+    ?DEBUG("ensure existence of ~p", [WorkDir]),
+    ensure_remote_dir_exist(Sftp, WorkDir),
+
+    %% Create the client ebin dir
+    EBIN = filename:join(WorkDir, "ebin"), 
+    RemoteClientMod = remote_client_module(EBIN), 
+    ?DEBUG("make ebin dir: ~p", [EBIN]),
+    maybe_create_remote_dir(Sftp, EBIN),
+
+    LocalClientMod = local_client_module(), 
+    ?DEBUG("copy client stub/proxy module ~s", [LocalClientMod]), 
+    {ok, ClientModBin} = file:read_file(LocalClientMod),
+    ok = ssh_sftp:write_file(Sftp, RemoteClientMod, ClientModBin),
+
+    LocalSlaveMod = local_slave_module(), 
+    ?DEBUG("copy slave module ~s", [LocalSlaveMod]), 
+    RemoteSlaveMod = remote_slave_module(EBIN), 
+    {ok, SlaveModBin} = file:read_file(LocalSlaveMod),
+    ok = ssh_sftp:write_file(Sftp, RemoteSlaveMod, SlaveModBin),
+
+    LocalLoggerMod = local_logger_module(), 
+    ?DEBUG("copy logger module ~s", [LocalLoggerMod]), 
+    RemoteLoggerMod = remote_logger_module(EBIN), 
+    {ok, LoggerModBin} = file:read_file(LocalLoggerMod),
+    ok = ssh_sftp:write_file(Sftp, RemoteLoggerMod, LoggerModBin),
+
+    case SocketType of
+	ip_comm ->
+	    ok;
+	_ ->
+	    %% We should really store the remote path somewhere as
+	    %% we use it when starting the client service...
+	    SSLDir = filename:join(WorkDir, "ssl"), 
+	    ?DEBUG("make ssl dir: ~p", [SSLDir]),
+	    maybe_create_remote_dir(Sftp, SSLDir),
+	    ?DEBUG("copy ssl cert file ~s", [CertFile]),
+	    {ok, CertBin} = file:read_file(CertFile),
+	    RemoteCertFile = filename:join(SSLDir, 
+					   filename:basename(CertFile)),
+	    ok = ssh_sftp:write_file(Sftp, RemoteCertFile, CertBin),
+	    ok
+    end,
+
+    ?DEBUG("done", []),
+    ok.
+
+remote_client_module(Path) ->
+    Mod = client_module(), 
+    filename:join(Path, Mod).
+
+local_client_module() ->
+    Mod = client_module(), 
+    case code:where_is_file(Mod) of
+	Path when is_list(Path) ->
+	    Path;
+	_ ->
+	    exit({client_module_not_found, Mod})
+    end.
+
+client_module() ->
+    module(?CLIENT_MOD).
+
+
+remote_slave_module(Path) ->
+    Mod = slave_module(), 
+    filename:join(Path, Mod).
+
+local_slave_module() ->
+    Mod = slave_module(), 
+    case code:where_is_file(Mod) of
+	Path when is_list(Path) ->
+	    Path;
+	_ ->
+	    exit({slave_module_not_found, Mod})
+    end.
+
+slave_module() ->
+    module(hdlt_slave).
+
+
+remote_logger_module(Path) ->
+    Mod = logger_module(), 
+    filename:join(Path, Mod).
+
+local_logger_module() ->
+    Mod = logger_module(), 
+    case code:where_is_file(Mod) of
+	Path when is_list(Path) ->
+	    Path;
+	_ ->
+	    exit({logger_module_not_found, Mod})
+    end.
+
+logger_module() ->
+    module(hdlt_logger).
+
+
+remote_random_html_module(Path) ->
+    Mod = random_html_module(), 
+    filename:join(Path, Mod).
+
+local_random_html_module() ->
+    Mod = random_html_module(), 
+    case code:where_is_file(Mod) of
+	Path when is_list(Path) ->
+	    Path;
+	_ ->
+	    exit({random_module_not_found, Mod})
+    end.
+
+random_html_module() ->
+    module(hdlt_random_html).
+
+
+module(Mod) ->
+    Ext = string:to_lower(erlang:system_info(machine)), 
+    lists:flatten(io_lib:format("~w.~s", [Mod, Ext])).
+
+
+%% -----------------------------------------------------------------------
+%% - For every node created (server and client both) there is both 
+%%   a local and remote proxy. 
+%% - The local proxy is running on the local (controller/collector) node.
+%% - The remote proxy is running on the client or server node(s).
+%% - The local (ctrl) proxy monitor the remote (server/client) proxy.
+%% - The remote (server/client) proxy monitor the local (ctrl) proxy.
+%% 
+
+start_client_nodes(#state{clients = Clients, 
+			  work_dir = WorkDir,
+			  debugs   = Debugs} = State) ->
+    Connections = 
+	[start_client_node(Client, WorkDir, Debugs) || Client <- Clients],
+    State#state{client_conns = Connections}.
+
+start_client_node(#client{path = ErlPath, host = Host}, WorkDir, Debugs) ->
+    ?INFO("start client on host ~p", [Host]),
+    EbinDir = filename:join(WorkDir, "ebin"), 
+    start_client_node(Host, ErlPath, [EbinDir], Debugs).
+
+start_client_node(Host, ErlPath, Paths, Debugs) ->
+    start_node(Host, ?CLIENT_NODE_NAME, 
+	       ErlPath, Paths, [], ?CLIENT_MOD, Debugs).
+
+
+start_server_node(#state{http_server    = #server{path = ErlPath, host = Host},
+			 server_root    = ServerRoot,
+			 nof_schedulers = NofScheds,
+			 debugs         = Debugs} = State) ->
+    ?INFO("start server on host ~p", [Host]),
+    CgiBinDir  = filename:join(ServerRoot, "cgi-bin"),
+    EbinDir    = filename:join(ServerRoot, "ebin"), 
+    Connection = 
+	start_server_node(Host, ErlPath, [CgiBinDir, EbinDir], 
+			  Debugs, NofScheds),
+    State#state{server_conn = Connection}.
+
+start_server_node(Host, ErlPath, Paths, Debugs, NofScheds) ->
+    Args = 
+	if
+	    NofScheds =:= 0 ->
+		"-smp disable";
+	    true ->
+		lists:flatten(io_lib:format("-smp +S ~w", [NofScheds]))
+	end,
+    start_node(Host, ?SERVER_NODE_NAME, 
+	       ErlPath, Paths, Args, ?SERVER_MOD, Debugs).
+
+
+%% -----------------------------------------------------------------------
+%% - For every node created (server and client both) there is both 
+%%   a local and remote proxy. 
+%% - The local proxy is running on the local (controller/collector) node.
+%% - The remote proxy is running on the client or server node(s).
+%% - The local (ctrl) proxy monitor the remote (server/client) proxy.
+%% - The remote (server/client) proxy monitor the local (ctrl) proxy.
+%% 
+
+start_node(Host, NodeName, ErlPath, Paths, Args, Module, Debugs) ->
+    %% Start the (local) proxy
+    ?DEBUG("start_node -> start local proxy and remote node", []),
+    ProxyDebug = proplists:get_value(proxy, Debugs, silence), 
+    Proxy = proxy_start(Host, NodeName, ErlPath, Paths, Args, Module, 
+			ProxyDebug),
+
+    ?DEBUG("start_node -> local proxy started - now start node", []),
+    SlaveDebug = proplists:get_value(slave, Debugs, silence), 
+    Node = proxy_start_node(Proxy, SlaveDebug),
+
+    ?DEBUG("start_node -> sync global", []),
+    global:sync(),
+
+    ?DEBUG("start_node -> start remote proxy", []),
+    proxy_start_remote(Proxy),
+
+    ?DEBUG("start_node -> start (remote) inets framework", []),
+    proxy_start_inets(Proxy), 
+
+    ?DEBUG("start_node -> done", []),
+    #connection{proxy = Proxy, node = Node, node_name = NodeName, host = Host}.
+
+    
+proxy_start(Host, NodeName, ErlPath, Paths, Args, Module, Debug) ->
+    ?LOG("try starting local proxy for ~p@~s", [NodeName, Host]), 
+    ProxyArgs = [Host, NodeName, ErlPath, Paths, Args, Module, Debug], 
+    case proc_lib:start_link(?MODULE, proxy, 
+			     ProxyArgs, ?LOCAL_PROXY_START_TIMEOUT) of
+	{ok, Proxy} ->
+	    Proxy;
+	Error ->
+	    exit({failed_starting_proxy, Error})
+    end.
+
+proxy_start_node(Proxy, Debug) ->
+    {ok, Node} = proxy_request(Proxy, {start_node, Debug}),
+    Node.
+
+proxy_start_remote(Proxy) ->
+    proxy_request(Proxy, start_remote_proxy).
+
+proxy_start_inets(Proxy) ->
+    proxy_request(Proxy, start_inets).
+
+proxy_start_service(Proxy, Args) ->
+    proxy_request(Proxy, {start_service, Args}).
+
+proxy_release(Proxy) ->
+    proxy_request(Proxy, release).
+
+proxy_stop(Proxy) ->
+    StopResult = proxy_request(Proxy, stop),
+    ?DEBUG("proxy stop result: ~p", [StopResult]),
+    StopResult.
+
+proxy_request(Proxy, Req) ->
+    Ref = make_ref(),
+    Proxy ! {proxy_request, Ref, self(), Req},
+    receive
+	{proxy_reply, Ref, Proxy, Rep} ->
+	    Rep
+    end.
+
+proxy_reply(From, Ref, Rep) ->
+    From ! {proxy_reply, Ref, self(), Rep}.
+
+proxy(Host, NodeName, ErlPath, Paths, Args, Module, Debug) ->
+    process_flag(trap_exit, true),
+    SName = lists:flatten(
+	      io_lib:format("HDLT CTRL PROXY[~p,~s,~w]", 
+			    [self(), Host, NodeName])), 
+    ?SET_NAME(SName),
+    ?SET_LEVEL(Debug), 
+    ?LOG("starting with"
+	"~n   Host:     ~p"
+	"~n   NodeName: ~p"
+	"~n   ErlPath:  ~p"
+	"~n   Paths:    ~p"
+	"~n   Args:     ~p"
+	"~n   Module:   ~p", [Host, NodeName, ErlPath, Paths, Args, Module]), 
+    State = #proxy{mode      = started,
+		   mod       = Module, 
+		   host      = Host,
+		   node_name = NodeName,
+		   erl_path  = ErlPath,
+		   paths     = Paths,
+		   args      = Args},
+    proc_lib:init_ack({ok, self()}),
+    ?DEBUG("started", []), 
+    proxy_loop(State).
+
+
+proxy_loop(#proxy{mode = stopping}) ->
+    receive
+	{proxy_request, Ref, From, stop} ->
+	    ?LOG("[stopping] received stop order", []),
+	    proxy_reply(From, Ref, ok),
+	    exit(normal);
+
+	{'EXIT', Pid, Reason} ->
+	    ?INFO("[stopping] received exit message from ~p: "
+		  "~n   Reason: ~p", [Pid, Reason]),
+	    exit(Reason)
+    
+    end;
+
+proxy_loop(#proxy{mode      = started,
+		  host      = Host,
+		  node_name = NodeName,
+		  erl_path  = ErlPath,
+		  paths     = Paths,
+		  args      = Args} = State) ->
+    receive
+	{proxy_request, Ref, From, {start_node, Debug}} ->
+	    ?LOG("[starting] received start_node order", []),
+	    case hdlt_slave:start_link(Host, NodeName, 
+				       ErlPath, Paths, Args, 
+				       Debug) of
+		{ok, Node} ->
+		    ?DEBUG("[starting] node ~p started - now monitor", [Node]),
+		    erlang:monitor_node(Node, true),
+		    State2 = State#proxy{mode = operational,
+					node = Node},
+		    proxy_reply(From, Ref, {ok, Node}),
+		    proxy_loop(State2);
+		{error, Reason} ->
+		    ?INFO("[starting] failed starting node: "
+			  "~n   Reason: ~p", [Reason]),
+		    exit({failed_starting_node, {Host, NodeName, Reason}})
+	    end;
+
+	{'EXIT', Pid, Reason} ->
+	    ?INFO("[stopping] received exit message from ~p: "
+		  "~n   Reason: ~p", [Pid, Reason]),
+	    exit(Reason)
+    
+    end;
+
+proxy_loop(#proxy{mode = operational,
+		  mod  = Mod,
+		  node = Node} = State) ->
+    ?DEBUG("[operational] await command", []),
+    receive 
+	{proxy_request, Ref, From, start_remote_proxy} ->
+	    ?LOG("[operational] start remote proxy", []),
+	    case rpc:call(Node, Mod, start, [?GET_LEVEL()]) of
+		{ok, Pid} ->
+		    ?DEBUG("[operational] remote proxy started (~p) - "
+			   "create monitor", [Pid]),
+		    ProxyRef = erlang:monitor(process, Pid),
+		    ?DEBUG("[operational] monitor: ~p", [Ref]),
+		    proxy_reply(From, Ref, ok),
+		    proxy_loop(State#proxy{ref = ProxyRef});
+		Error ->
+		    ?INFO("[operational] failed starting remote proxy"
+			 "~n   Error: ~p", [Error]),
+		    ReplyReason = {failed_starting_remote_proxy, 
+				   {Node, Error}},
+		    Reply = {error, ReplyReason}, 
+		    proxy_reply(From, Ref, Reply),
+		    exit({failed_starting_remote_proxy, {Node, Error}})
+	    end;
+
+	{proxy_request, Ref, From, start_inets} ->
+	    ?INFO("[operational] start inets framework", []),
+	    rpc:cast(Node, Mod, start_inets, []),
+	    proxy_reply(From, Ref, ok),
+	    proxy_loop(State);
+
+	{proxy_request, Ref, From, {start_service, Args}} ->
+	    ?INFO("[operational] start service with"
+		  "~n   ~p", [Args]),
+	    case rpc:call(Node, Mod, start_service, Args) of
+		ok ->
+		    ?DEBUG("[operational] service started", []),
+		    proxy_reply(From, Ref, ok), 
+		    proxy_loop(State);
+		Error ->
+		    ?INFO("[operational] failed starting service: "
+			  "~n   Args.  ~p"
+			  "~n   Error: ~p", [Args, Error]),
+		    erlang:demonitor(State#proxy.ref, [flush]),
+		    Reply = {error, {failed_starting_service, Node, Error}}, 
+		    proxy_reply(From, Ref, Reply),
+		    exit({failed_starting_service, Node, Error})
+	    end;
+
+	{proxy_request, Ref, From, release} ->
+	    ?INFO("[operational] release", []),
+	    rpc:call(Node, Mod, release, []),
+	    proxy_reply(From, Ref, ok), 
+	    proxy_loop(State);
+
+	{proxy_request, Ref, From, stop} ->
+	    ?INFO("[operational] received stop order", []),
+	    erlang:demonitor(State#proxy.ref, [flush]),
+	    ?DEBUG("[operational] rpc cast stop order", []),
+	    rpc:cast(Node, Mod, stop, []), 
+	    %% And wait for the node death to be reported
+	    Reason = 
+		receive 
+		    {nodedown, Node} when State#proxy.node =:= Node ->
+			ok
+		after 10000 ->
+			?INFO("Node did not die within expected time frame", 
+			      []),
+			{node_death_timeout, Node}
+		end,
+	    ?DEBUG("[operational] ack stop", []),
+	    proxy_reply(From, Ref, Reason),
+	    exit(normal);
+
+	{nodedown, Node} when State#proxy.node =:= Node ->
+	    ?INFO("[operational] received unexpected nodedoen message", []),
+	    exit({node_died, Node});
+
+	{'DOWN', Ref, process, _, normal} when State#proxy.ref =:= Ref ->
+	    ?INFO("[operational] remote proxy terminated normally", []),
+	    proxy_loop(State#proxy{ref        = undefined,
+				   connection = undefined,
+				   mode       = stopping});
+
+	{'DOWN', Ref, process, _, noconnection} when State#proxy.ref =:= Ref ->
+	    ?INFO("[operational] remote proxy terminated - no node", []),
+	    proxy_loop(State#proxy{ref        = undefined,
+				   connection = undefined,
+				   mode       = stopping});
+
+	{'DOWN', Ref, process, _, Reason} when State#proxy.ref =:= Ref ->
+	    ?INFO("[operational] remote proxy terminated: "
+		  "~n   Reason: ~p", [Reason]),
+	    exit({remote_proxy_crash, Reason});
+
+	{'EXIT', Pid, Reason} ->
+	    ?INFO("[operational] received unexpected exit message from ~p: "
+		  "~n   Reason: ~p", [Pid, Reason]),
+	    proxy_loop(State)
+    
+    end.
+
+
+stop_nodes(#state{server_conn  = ServerConn, 
+		  client_conns = ClientConns} = State) ->
+    lists:foreach(
+      fun(#connection{proxy = Proxy, node_name = NodeName, host = Host}) -> 
+	      ?DEBUG("stop_erlang_nodes -> send stop order to local proxy ~p"
+		  "~n   for node ~p on ~s", [Proxy, NodeName, Host]),
+	      proxy_stop(Proxy)
+      end, 
+      ClientConns ++ [ServerConn]),
+    ?DEBUG("stop_erlang_nodes -> sleep some to give the nodes time to die", 
+	   []),
+    timer:sleep(1000),
+    ?DEBUG("stop_erlang_nodes -> and a final cleanup round", []),
+    lists:foreach(fun(Node) ->
+			  ?INFO("try brutal stop node ~p", [Node]),
+			  rpc:cast(Node, erlang, halt, [])
+		  end, 
+		  nodes() -- [node()]),
+    ?DEBUG("stop_erlang_nodes -> done", []),
+    State#state{server_conn = undefined, client_conns = []}.
+
+
+%% The nodes on which the HDLT clients run have been started previously
+start_clients(#state{client_conns     = Connections, 
+		     debugs           = Debugs,
+		     work_dir         = WorkDir,
+		     socket_type      = SocketType,
+		     client_cert_file = CertFile, 
+		     client_sz_from   = From,
+		     client_sz_to     = To,
+		     client_sz_incr   = Incr}, 
+	      URL, TestTime, SendRate) ->
+    Debug = proplists:get_value(client, Debugs, silence), 
+    StartClient = 
+	fun(#connection{host = Host} = Connection) ->
+		?DEBUG("start client on ~p", [Host]),
+		start_client(Connection, 
+			     WorkDir, SocketType, CertFile, 
+			     URL, From, To, Incr, 
+			     TestTime, SendRate, Debug);
+	   (_) ->
+		ok
+	end,
+    lists:foreach(StartClient, Connections).
+
+start_client(#connection{proxy = Proxy}, 
+	     WorkDir, SocketType, LocalCertFile, 
+	     URL, From, To, Incr, 
+	     TestTime, SendRate, Debug) ->
+    SSLDir  = filename:join(WorkDir, "ssl"), 
+    CertFile = filename:join(SSLDir, filename:basename(LocalCertFile)),
+    Sizes    = randomized_sizes(From, To, Incr),
+    Args = [SocketType, CertFile, URL, Sizes, TestTime, SendRate, Debug],
+    proxy_start_service(Proxy, [Args]).
+    
+release_clients(#state{client_conns = Connections}) ->
+    ReleaseClient = 
+	fun(#connection{proxy = Proxy,
+			host  = Host}) ->
+		?DEBUG("release client on ~p", [Host]),
+		proxy_release(Proxy);
+	   (_) ->
+		ok
+	end,
+    lists:foreach(ReleaseClient, Connections).
+
+    
+start_server(#state{server_conn      = #connection{proxy = Proxy}, 
+		    http_port        = Port,
+		    server_root      = ServerRoot,
+		    doc_root         = DocRoot,
+		    socket_type      = SocketType,
+		    server_cert_file = CertFile}) ->
+
+    HttpdConfig = 
+	httpd_config(Port, "hdlt", ServerRoot, DocRoot, SocketType, CertFile),
+    ?LOG("start the httpd inets service with config: "
+	 "~n   ~p", [HttpdConfig]),
+    proxy_start_service(Proxy, [HttpdConfig]), 
+    ?DEBUG("start_server -> done", []),
+    ok.
+ 
+
+httpd_config(Port, ServerName, ServerRoot, DocRoot, 
+	     SocketType, LocalCertFile) ->  
+    LogDir = filename:join(ServerRoot, "log"),
+    ErrorLog = filename:join(LogDir, "error_log"),
+    TransferLog = filename:join(LogDir, "access_log"),
+    
+    SSL = 
+	case SocketType of
+	    ip_comm ->
+		[];
+	    _ -> % ssl
+		SSLDir = filename:join(ServerRoot, "ssl"), 
+		CertFile = 
+		    filename:join(SSLDir, filename:basename(LocalCertFile)),
+		[
+		 {ssl_certificate_file,     CertFile},
+		 {ssl_certificate_key_file, CertFile},
+		 {ssl_verify_client,        0}
+		]
+	end,
+    [{port,          Port},
+     {server_name,   ServerName}, 
+     {server_root,   ServerRoot},
+     {document_root, DocRoot}, 
+     {error_log,     ErrorLog}, 
+     {error_log_format, pretty}, 
+     {transfer_log,  TransferLog}, 
+     {socket_type,   SocketType},
+     {max_clients,   10000},
+     {modules,       [mod_alias, mod_auth, mod_esi, mod_actions, mod_cgi, 
+		      mod_dir, mod_get, mod_head, mod_log, mod_disk_log]}, 
+     {script_alias,       {"/cgi-bin", filename:join(ServerRoot, "cgi-bin")}},
+     {erl_script_alias,   {"/cgi-bin", [hdlt_random_html]}}, 
+     {erl_script_timeout, 120000} | SSL].
+
+
+clean_up(#state{server_root = ServerRoot, 
+		work_dir    = WorkDir, 
+		http_server = #server{host = Host},
+		clients     = Clients}) ->
+    ?DEBUG("begin server cleanup", []),
+    server_clean_up(ServerRoot, WorkDir, Host),
+    ?DEBUG("begin lient cleanup", []),
+    clients_clean_up(WorkDir, Clients),
+    ?DEBUG("cleanup done", []),
+    ok.
+
+server_clean_up(ServerRoot, WorkDir, Host) ->
+    ?DEBUG("server cleanup - create sftp channel", []),
+    {ok, Sftp, ConnectionRef} = 
+	ssh_sftp:start_channel(Host, [{user_interaction, false},
+				      {silently_accept_hosts, true}]),
+    ?DEBUG("server cleanup - delete ~p dirs", [ServerRoot]),
+    del_dirs(Sftp, ServerRoot),
+    ?DEBUG("server cleanup - delete ~p dirs", [WorkDir]),
+    del_dirs(Sftp, WorkDir),
+    ?DEBUG("server cleanup - close sftp channel", []),
+    ssh:close(ConnectionRef).
+
+clients_clean_up(_WorkDir, []) ->
+    ok;
+clients_clean_up(WorkDir, [Client|Clients]) ->
+    client_clean_up(WorkDir, Client),
+    clients_clean_up(WorkDir, Clients).
+
+client_clean_up(WorkDir, #client{host = Host}) ->
+    ?DEBUG("client cleanup - create sftp channel to ~p", [Host]),
+    {ok, Sftp, ConnectionRef} = 
+	ssh_sftp:start_channel(Host, [{user_interaction, false},
+				      {silently_accept_hosts, true}]),
+    ?DEBUG("client cleanup - delete ~p dirs", [WorkDir]),
+    del_dirs(Sftp, WorkDir),
+    ?DEBUG("client cleanup - close sftp channel", []),
+    ssh:close(ConnectionRef).
+    
+
+del_dirs(Sftp, Dir) ->
+    case ssh_sftp:list_dir(Sftp, Dir) of
+	{ok, []} ->
+	    ssh_sftp:del_dir(Sftp, Dir);
+	{ok, Files} ->
+	    Files2 = [F || F <- Files, (F =/= "..") andalso (F =/= ".")], 
+	    lists:foreach(fun(File) when ((File =/= "..") andalso 
+					  (File =/= ".")) ->
+				  FullPath = filename:join(Dir, File),
+				  case ssh_sftp:read_file_info(Sftp, 
+							       FullPath) of
+				      {ok, #file_info{type = directory}} ->
+					  del_dirs(Sftp, FullPath),
+					  ssh_sftp:del_dir(Sftp, FullPath);
+				      {ok, _} ->
+					  ssh_sftp:delete(Sftp, FullPath)
+				  end 
+			  end, Files2);
+	_ ->
+	    ok
+    end.
+
+collect_data(#state{clients = Clients} = State) ->
+    N = length(Clients),
+    collect_req_reply(N, State),
+    collect_time(N, State).
+     
+collect_req_reply(0, _State) ->
+    ?DEBUG("all reply data collected", []), 
+    ok;
+collect_req_reply(N, #state{nof_schedulers = NofScheduler, 
+			    results        = Db,
+			    client_conns   = Conns} = State) ->
+    ?DEBUG("await reply data from ~p client(s)", [N]),
+    receive 
+	{load_data, 
+	 {req_reply, Client, NoRequests, NoReplys}} ->
+	    ?DEBUG("received req_reply load-data from client ~p: "
+		 "~n   Number of requests: ~p"
+		 "~n   Number of replies:  ~p", 
+		 [Client, NoRequests, NoReplys]),
+	    ets:insert(Db, {{NofScheduler, Client}, 
+			    {req_reply, NoRequests, NoReplys}});
+	stop ->
+	    ?INFO("received stop", []),
+	    exit(self(), stop);
+
+	{client_exit, Client, Node, Reason} ->
+	    ?INFO("Received unexpected client exit from ~p on node ~p "
+		  "while collecting replies: "
+		  "~n   ~p", [Client, Node, Reason]),
+	    case lists:keysearch(Node, #connection.node, Conns) of
+		{value, Conn} ->
+		    ?LOG("Found problem connection: "
+			 "~n   ~p", [Conn]),
+		    exit({unexpected_client_exit, Reason});
+		false ->
+		    collect_req_reply(N, State)
+	    end
+    end,
+    collect_req_reply(N-1, State).		 
+	 
+collect_time(0, _State) -> 
+    ?DEBUG("all time data collected", []), 
+    ok;
+collect_time(N, #state{nof_schedulers = NofScheduler, 
+		       results        = Db,
+		       client_conns   = Conns} = State) ->
+    ?DEBUG("await time data from ~p clients", [N]),
+    receive 
+	{load_data, 
+	 {time_to_complete, Client, StopTime, LastResponseTime}} ->
+	    ?LOG("received time load-data from client ~p: "
+		 "~n   Time of stop:           ~p"
+		 "~n   Time of last response:  ~p", 
+		 [Client, StopTime, LastResponseTime]),
+	    ets:insert(Db, {{NofScheduler, Client}, 
+			    {time, StopTime, LastResponseTime}});
+	stop ->
+	    ?INFO("received stop while collecting data, when N = ~p", [N]),
+	    exit(self(), stop);
+
+	{client_exit, Client, Node, Reason} ->
+	    ?INFO("Received unexpected exit from client ~p on node ~p "
+		  "while collecting time data: "
+		  "~n   ~p", [Client, Node, Reason]),
+	    case lists:keysearch(Node, #connection.node, Conns) of
+		{value, Conn} ->
+		    ?LOG("Found problem connection: "
+			 "~n   ~p", [Conn]),
+		    exit({unexpected_client_exit, Reason});
+		false ->
+		    collect_req_reply(N, State)
+	    end;
+	    
+	Else -> %%% Something is wrong!
+	    ?INFO("RECEIVED UNEXPECTED MESSAGE WHILE COLLECTING TIME DATA: "
+		  "~n   ~p", [Else]),
+	    collect_time(N, State)	     
+    end,
+    collect_time(N-1, State).
+
+analyse_data(#state{results            = Db, 
+		    max_nof_schedulers = MaxNofSchedulers,
+		    test_time          = MicroSec}) ->
+    Tab = ets:new(analysed_results, [set]),
+    lists:foreach(fun(NofSchedulers) ->
+			  Result = analyse(NofSchedulers, Db, MicroSec),
+			  ets:insert(Tab, Result)
+		  end, [N || N <- lists:seq(0, MaxNofSchedulers)]),
+    Tab.
+
+    
+no_requests_replys(NoSchedulers, Tab) ->
+    NoRequests = 
+	ets:select(Tab, [{{{NoSchedulers,'_'},{req_reply, '$1', '_'}},
+			  [],['$$']}]),
+    NoReplys = 
+	ets:select(Tab, [{{{NoSchedulers, '_'}, {req_reply, '_', '$1'}}, 
+			  [], ['$$']}]),
+    
+    {lists:sum(lists:append(NoRequests)), 
+     lists:sum(lists:append(NoReplys))}. 
+
+max_time_to_final_response(NofSchedulers, Tab) ->
+    Candidates = 
+	ets:select(Tab, [{{{NofSchedulers, '_'}, {time, '$1', '$2'}},
+			  [], ['$$']}]),
+    
+    NewCandidates = lists:map(
+		      fun([StopTime, LastTime]) ->
+			      round(
+				timer:now_diff(LastTime, StopTime) / 100000)/10
+			      end, Candidates),
+    
+    lists:max(NewCandidates).
+
+
+analyse(NofSchedulers, Db, TestTime) ->
+    Sec = TestTime / 1000,
+    {NoRequests, NoReplys} = no_requests_replys(NofSchedulers, Db),
+    {NofSchedulers, round(NoReplys / Sec), NoRequests,
+     max_time_to_final_response(NofSchedulers, Db)}.
+
+
+save_results_to_file(AnalysedTab, 
+		     #state{socket_type        = SocketType, 
+			    http_server        = #server{host = Server},
+			    max_nof_schedulers = MaxNofSchedulers}) ->
+    FileName = fun(Post) -> 
+		       File = 
+			   lists:flatten(
+			     io_lib:format("~s_~w_~s", 
+					   [Server, SocketType, Post])),
+		       filename:join("./", File) 
+	       end,
+    Reps     = FileName("replys_per_sec.txt"),
+    Reqs     = FileName("total_requests.txt"),
+    Decay    = FileName("decay_time.txt"),
+    
+    [FdReps, FdReqs, FdDecay] = 
+	lists:map(fun(File) ->
+			  {ok, Fd} = file:open(File, [write]),
+			  Fd
+		  end, [Reps, Reqs, Decay]),
+    lists:foreach(fun(NofSchedulers) ->
+			  save_result_to_file(NofSchedulers,
+					       FdReps, FdReqs, 
+					       FdDecay, AnalysedTab)
+		  end, [N || N <- lists:seq(0, MaxNofSchedulers)]),
+    [Reps, Reqs, Decay].
+    
+save_result_to_file(NofSchedulers,
+		    FdReps, FdReqs, FdDecay, AnalysedTab) ->
+
+    [{NofSchedulers, NofRepsPerSec, NofReqs, MaxFinalResponseTime}] = 
+	ets:lookup(AnalysedTab, NofSchedulers),
+    
+    file:write(FdReps, io_lib:format("~p,~p~n", 
+				       [NofRepsPerSec, NofSchedulers])),
+    file:write(FdReqs,  io_lib:format("~p,~p~n", 
+					  [NofReqs, NofSchedulers])),
+    file:write(FdDecay, io_lib:format("~p,~p~n", [MaxFinalResponseTime,
+						  NofSchedulers])).
+
+
+help() ->
+    io:format("hdlt:start(Options). Where options:~n "
+	      " ~n~p~n~n hdlt:start([]). -> hdlt:start(~p)~n~n",
+	      [[{send_rate, "integer()", 
+		 "Numer of outstanding requests that a client "
+		 "should have during the test to create a load situation."},
+		{clients, "[{path(), host()}]", "Paths to erlang and names of hosts to run clients on."},
+		{test_time, "{hours(), mins(), sec()}", 
+		 "How long the test should be run."},
+		{server, "{path(), host()}", "Path to erl and name of host to run the HTTP-server on."},
+		{port, "port()", "The port that the HTTP-server should use."},
+		{server_dir, "dir()", "The directory where the HTTP server "
+		 " stores its contents and configuration."},
+		{work_dir, "dir()", "Path on the computer, where the test "
+		 "is run, to a directory where the results can be saved."},
+ 		{max_no_schedulers, "integer()", 
+		 "Max number of schedulers to run."},
+	       {socket_type, "Httpd configuration option socket_type"}],
+	       defaults()]).
+
+
+defaults() ->
+    [{send_rate,          ?DEFAULT_SENDRATE},
+     %% {clients,           []},
+     {test_time,          ?DEFAULT_TEST_TIME}, 
+     %% {server,            ?DEFAULT_SERVER},
+     {port,               ?DEFAULT_PORT},
+     {server_dir,         ?DEFAULT_SERVER_DIR},
+     {work_dir,           ?DEFAULT_WORK_DIR},
+     {max_nof_schedulers, ?DEFAULT_MAX_NOF_SCHEDULERS},
+     {socket_type,        ?DEFAULT_SOCKET_TYPE}].
+
+
+get_debugs(Config) ->
+    ?DEBUG("get debugs", []),
+    Debugs = proplists:get_value(debug, Config, ?DEFAULT_DEBUGS),
+    verify_debugs(Debugs),
+    Debugs.
+
+verify_debugs([]) ->
+    ok;
+verify_debugs([{Tag, Debug}|Debugs]) ->
+    verify_debug(Tag, Debug),
+    verify_debugs(Debugs).
+
+verify_debug(Tag, Debug) ->
+    case lists:member(Tag, [ctrl, proxy, slave, client]) of
+	true ->
+	    ok;
+	false ->
+	    exit({bad_debug_tag, Tag})
+    end,
+    case lists:member(Debug, [silence, info, log, debug]) of
+	true ->
+	    ok;
+	false ->
+	    exit({bad_debug_level, Debug})
+    end.
+
+get_send_rate(Config) ->
+    ?DEBUG("get send_rate", []),
+    case proplists:get_value(send_rate, Config, ?DEFAULT_SENDRATE) of
+	SendRate when is_integer(SendRate) andalso (SendRate > 0) ->
+	    SendRate;
+	BadSendRate ->
+	    exit({bad_sendrate, BadSendRate})
+    end.
+    
+
+get_clients(Config) ->
+    ?DEBUG("get clients", []),
+    case proplists:get_value(clients, Config, undefined) of
+	undefined ->
+	    missing_mandatory_config(clients);
+	Clients when is_list(Clients) andalso (length(Clients) > 0) ->
+	    case [#client{path = Path, host = Host} || 
+		     {Path, Host} <- Clients] of
+		Clients2 when (length(Clients2) > 0) ->
+		    Clients2;
+		_ ->
+		    exit({bad_clients, Clients})
+	    end;
+	
+	BadClients ->
+	    exit({bad_clients, BadClients})
+
+    end.
+    
+get_server(Config) ->	     
+    ?DEBUG("get server", []),
+    case proplists:get_value(server, Config) of
+	{Path, Host} when is_list(Path) andalso is_list(Host) ->
+	    #server{path = Path, host = Host};
+	undefined ->
+	    missing_mandatory_config(server)
+    end.
+
+get_server_dir(Config) ->
+    ?DEBUG("get server_dir", []),
+    get_dir(server_dir, Config, ?DEFAULT_SERVER_DIR).
+
+get_work_dir(Config) ->
+    ?DEBUG("get work_dir", []),
+    get_dir(work_dir, Config, ?DEFAULT_WORK_DIR).
+
+get_dir(Key, Config, Default) ->
+    Dir = proplists:get_value(Key, Config, Default),
+    ensure_absolute(Dir),
+    Dir.
+    
+ensure_absolute(Path) ->
+    case filename:pathtype(Path) of
+	absolute ->
+	    ok;
+	PathType ->
+	    exit({bad_pathtype, Path, PathType})
+    end.
+
+get_port(Config) ->
+    ?DEBUG("get port", []),
+    case proplists:get_value(port, Config, ?DEFAULT_PORT) of
+	Port when is_integer(Port) andalso (Port > 0) ->
+	    Port;
+	BadPort ->
+	    exit({bad_port, BadPort})
+    end.
+
+get_socket_type(Config) ->
+    ?DEBUG("get socket_type", []),
+    case proplists:get_value(socket_type, Config, ?DEFAULT_SOCKET_TYPE) of
+	SocketType when ((SocketType =:= ip_comm) orelse
+			 (SocketType =:= ssl) orelse
+			 (SocketType =:= essl) orelse
+			 (SocketType =:= ossl)) ->
+	    SocketType;
+	BadSocketType ->
+	    exit({bad_socket_type, BadSocketType})
+    end.
+
+get_test_time(Config) ->
+    ?DEBUG("get test_time", []),
+    case proplists:get_value(test_time, Config, ?DEFAULT_TEST_TIME) of
+	Seconds when is_integer(Seconds) andalso (Seconds > 0) -> 
+	    timer:seconds(Seconds);
+	BadTestTime ->
+	    exit({bad_test_time, BadTestTime})
+    end.
+
+get_max_nof_schedulers(Config) ->
+    ?DEBUG("get max_nof_schedulers", []),
+    case proplists:get_value(max_nof_schedulers, 
+			     Config, 
+			     ?DEFAULT_MAX_NOF_SCHEDULERS) of
+	MaxNofScheds when (is_integer(MaxNofScheds) andalso 
+			   (MaxNofScheds >= 0)) ->
+	    MaxNofScheds;
+	BadMaxNofScheds ->
+	    exit({bad_max_nof_schedulers, BadMaxNofScheds})
+    end.
+	    
+
+get_server_cert_file(Config) ->
+    ?DEBUG("get server cert file", []),
+    get_cert_file(server_cert_file, ?DEFAULT_SERVER_CERT, Config).
+
+get_client_cert_file(Config) ->
+    ?DEBUG("get client cert file", []),
+    get_cert_file(client_cert_file, ?DEFAULT_CLIENT_CERT, Config).
+
+get_cert_file(Tag, DefaultCertFileName, Config) -> 
+    LibDir  = code:lib_dir(inets),
+    HdltDir = filename:join(LibDir, "examples/httpd_load_test"),
+    DefaultCertFile = filename:join(HdltDir, DefaultCertFileName),
+    case proplists:get_value(Tag, Config, DefaultCertFile) of
+	F when is_list(F) ->
+	    case file:read_file_info(F) of
+		{ok, #file_info{type = regular}} ->
+		    F;
+		{ok, #file_info{type = Type}} ->
+		    exit({wrong_file_type, Tag, F, Type});
+		{error, Reason} ->
+		    exit({failed_readin_file_info, Tag, F, Reason})
+	    end;
+	BadFile ->
+	    exit({bad_cert_file, Tag, BadFile})
+    end.
+
+	    
+get_work_sim(Config) ->
+    ?DEBUG("get work_sim", []),
+    case proplists:get_value(work_simulator, Config, ?DEFAULT_WORK_SIM) of
+	WS when is_integer(WS) andalso (WS > 0) ->
+	    WS;
+	BadWS ->
+	    exit({bad_work_simulator, BadWS})
+    end.
+
+	    
+get_data_size(Config) ->
+    ?DEBUG("get data_size", []),
+    case proplists:get_value(data_size, Config, ?DEFAULT_DATA_SIZE) of
+	{From, To, Incr} = DS when (is_integer(From) andalso 
+				    is_integer(To)   andalso 
+				    is_integer(Incr) andalso 
+				    (To > From)      andalso 
+				    (From > 0)       andalso 
+				    (Incr > 0)) ->
+	    DS;
+	{From, To} when (is_integer(From) andalso 
+			 is_integer(To)   andalso 
+			 (To > From)      andalso 
+			 (From > 0)) ->
+	    {From, To, ?DEFAULT_DATA_SIZE_INCR};
+	BadDS ->
+	    exit({bad_data_size, BadDS})
+    end.
+
+	    
+url(#server{host = Host}, Port, SocketType, WorkSim) ->
+    Scheme = 
+	case SocketType of
+	    ip_comm ->
+		"http";
+	    _ -> %% SSL
+		"https"
+	end,
+    lists:flatten(
+      io_lib:format("~s://~s:~w/cgi-bin/hdlt_random_html:page?~w:", 
+		    [Scheme, Host, Port, WorkSim])).
+
+
+missing_mandatory_config(Missing) ->
+    exit({missing_mandatory_config, Missing}).
+
+
+ensure_remote_dir_exist(Sftp, Path0) ->
+    case filename:split(Path0) of
+	[Root, Dir | Rest] ->
+	    %% We never accept creating the root directory, 
+	    %% or the next level, so these *must* exist:
+	    Path = filename:join(Root, Dir),
+	    case ssh_sftp:read_file_info(Sftp, Path) of
+		{ok, #file_info{type = directory}} ->
+		    ensure_remote_dir_exist(Sftp, Path, Rest);
+		{ok, #file_info{type = Type}} ->
+		    ?INFO("Not a dir: ~p (~p)", [Path, Type]),
+		    exit({not_a_dir, Path, Type});
+		{error, Reason} ->
+		    ?INFO("Failed reading file info for ~p: ~p", 
+			  [Path, Reason]),
+		    exit({failed_reading_file_info, Path, Reason})
+	    end;
+	BadSplit ->
+	    ?INFO("Bad remote dir path: ~p -> ~p", [Path0, BadSplit]),
+	    exit({bad_dir, Path0})
+    end.
+
+ensure_remote_dir_exist(_Sftp, _Dir, []) ->
+    ok;
+ensure_remote_dir_exist(Sftp, Path, [Dir|Rest]) ->
+    NewPath = filename:join(Path, Dir),
+    case ssh_sftp:read_file_info(Sftp, NewPath) of
+	{ok, #file_info{type = directory}} ->
+	    ensure_remote_dir_exist(Sftp, NewPath, Rest);
+	{ok, #file_info{type = Type}} ->
+	    %% Exist, but is not a dir
+	    ?INFO("Not a dir: ~p (~p)", [NewPath, Type]),
+	    exit({not_a_dir, NewPath, Type});
+	{error, Reason} ->
+	    %% This *could* be because the dir does not exist,
+	    %% but it could also be some other error.
+	    %% As usual, the error reason of the sftp is
+	    %% a pease of crap, so we cannot use the 
+	    %% error reason. 
+	    %% The simplest way to test this is to simply
+	    %% try to create the directory, since we should
+	    %% ensure its existence anyway..
+	    case ssh_sftp:make_dir(Sftp, NewPath) of
+		ok ->
+		    ensure_remote_dir_exist(Sftp, NewPath, Rest);
+		_ ->
+		    ?INFO("Failed reading file info for ~p: ~p", 
+			  [Dir, Reason]),
+		    exit({failed_reading_file_info, NewPath, Reason})
+	    end
+    end.
+    
+maybe_create_remote_dir(Sftp, Dir) ->
+    case ssh_sftp:read_file_info(Sftp, Dir) of
+	{ok, #file_info{type = directory}} ->
+	    ok;
+	{ok, #file_info{type = Type}} ->
+	    %% Exist, but is not a dir
+	    ?INFO("Not a dir: ~p (~p)", [Dir, Type]),
+	    exit({not_a_dir, Dir, Type});
+	{error, Reason} ->
+	    %% Assume dir noes not exist...
+	    case ssh_sftp:make_dir(Sftp, Dir) of
+		ok ->
+		    ok;
+		_ ->
+		    ?INFO("Failed reading file info for ~p: ~p", 
+			  [Dir, Reason]),
+		    exit({failed_reading_file_info, Dir, Reason})
+	    end
+    end.
+    
+
+set_debug_level(Debugs) ->
+    Debug = proplists:get_value(ctrl, Debugs, silence), 
+    ?SET_LEVEL(Debug).
+
+
+%% Generates a list of numbers between A and B, such that 
+%% there is exact one number between A and B and then 
+%% randomizes that list.
+
+randomized_sizes_init() ->
+    {A, B, C} = os:timestamp(),
+    random:seed(A, B, C).
+
+randomized_sizes(From, To, Incr) ->
+    L   = lists:seq(From, To, Incr),
+    Len = length(L),
+    randomized_sizes2(L, 0, Len-1).
+
+randomized_sizes2(L, N, Len) when N >= Len ->
+    L;
+randomized_sizes2(L, N, Len) ->
+    SplitWhere = random:uniform(Len),
+    {A, B} = lists:split(SplitWhere, L),
+    randomized_sizes2(B ++ A, N+1, Len).
diff --git a/lib/inets/examples/httpd_load_test/hdlt_logger.erl b/lib/inets/examples/httpd_load_test/hdlt_logger.erl
new file mode 100644
index 0000000000..b0c7eab2d1
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt_logger.erl
@@ -0,0 +1,138 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+%%----------------------------------------------------------------------
+%% Purpose: This is a simple logger utility for the HDLT toolkit.
+%%          It assumesd that the debug level and the "name" of the 
+%%          logging entity has been put in process environment
+%%          (using the set_level and set_name functions respectively).
+%%----------------------------------------------------------------------
+
+%%
+
+-module(hdlt_logger).
+
+-export([
+	 start/0,
+	 set_level/1, get_level/0, set_name/1,
+	 info/2, log/2, debug/2
+	]).
+
+-export([logger/1]).
+
+-define(LOGGER,    ?MODULE).
+-define(MSG,       hdlt_logger_msg).
+-define(LEVEL,     hdlt_logger_level).
+-define(NAME,      hdlt_logger_name).
+-define(INFO_STR,  "INFO").
+-define(LOG_STR,   "LOG ").
+-define(DEBUG_STR, "DBG ").
+
+
+start() ->
+    Self = self(), 
+    proc_lib:start(?MODULE, logger, [Self]).
+
+set_name(Name) when is_list(Name) ->
+    put(?NAME, Name),
+    ok.
+
+get_level() ->
+    get(?LEVEL).
+
+set_level(Level) ->
+    case lists:member(Level, [silence, info, log, debug]) of
+	true ->
+	    put(?LEVEL, Level),
+	    ok;
+	false ->
+	    erlang:error({bad_debug_level, Level})
+    end.
+
+
+info(F, A) ->
+%%     io:format("info -> " ++ F ++ "~n", A),
+    do_log(info, get(?LEVEL), F, A).
+
+log(F, A) ->
+%%     io:format("log -> " ++ F ++ "~n", A),
+    do_log(log, get(?LEVEL), F, A).
+
+debug(F, A) ->
+%%     io:format("debug -> " ++ F ++ "~n", A),
+    do_log(debug, get(?LEVEL), F, A).
+
+
+logger(Parent) ->
+    global:register_name(?LOGGER, self()),
+    Ref = erlang:monitor(process, Parent),
+    proc_lib:init_ack(self()),
+    logger_loop(Ref).
+
+logger_loop(Ref) ->
+    receive
+	{?MSG, F, A} ->
+	    io:format(F, A),
+	    logger_loop(Ref);
+	{'DOWN', Ref, process, _Object, _Info} ->
+	    %% start the stop timer
+	    erlang:send_after(timer:seconds(5), self(), stop),
+	    logger_loop(undefined);
+	stop ->
+	    global:unregister_name(?LOGGER),
+	    ok
+    end.
+
+
+formated_timestamp() ->
+    {Date, Time}   = erlang:localtime(),
+    {YYYY,MM,DD}   = Date,
+    {Hour,Min,Sec} = Time,
+    FormatDate =
+        io_lib:format("~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w",
+                      [YYYY,MM,DD,Hour,Min,Sec]),
+    lists:flatten(FormatDate).
+
+do_log(_, silence, _, _) ->
+    ok;
+do_log(info, info, F, A) ->
+    do_log(?INFO_STR, F, A);
+do_log(info, log, F, A) ->
+    do_log(?INFO_STR, F, A);
+do_log(log, log, F, A) ->
+    do_log(?LOG_STR, F, A);
+do_log(info, debug, F, A) ->
+    do_log(?INFO_STR, F, A);
+do_log(log, debug, F, A) ->
+    do_log(?LOG_STR, F, A);
+do_log(debug, debug, F, A) ->
+    do_log(?DEBUG_STR, F, A);
+do_log(_, _, _F, _A) ->
+    ok.
+
+do_log(SEV, F, A) ->
+    Name = 
+	case get(?NAME) of
+	    L when is_list(L) ->
+		L;
+	    _ ->
+		"UNDEFINED"
+	end,
+    Msg = {?MSG, "~s ~s [~s] " ++ F ++ "~n", 
+	   [SEV, Name, formated_timestamp() | A]}, 
+    (catch global:send(?LOGGER, Msg)).
diff --git a/lib/inets/examples/httpd_load_test/hdlt_logger.hrl b/lib/inets/examples/httpd_load_test/hdlt_logger.hrl
new file mode 100644
index 0000000000..aa94babc48
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt_logger.hrl
@@ -0,0 +1,33 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+%%
+
+-ifndef(hdlt_logger_hrl).
+-define(hdlt_logger_hrl, true).
+
+%% Various log macros
+-define(SET_LEVEL(N), hdlt_logger:set_level(N)).
+-define(GET_LEVEL(),  hdlt_logger:get_level()).
+-define(SET_NAME(N),  hdlt_logger:set_name(N)).
+
+-define(INFO(F, A),   hdlt_logger:info(F, A)).
+-define(LOG(F, A),    hdlt_logger:log(F, A)).
+-define(DEBUG(F, A),  hdlt_logger:debug(F, A)).
+
+-endif. % -ifdef(hdlt_logger_hrl).
diff --git a/lib/inets/examples/httpd_load_test/hdlt_random_html.erl b/lib/inets/examples/httpd_load_test/hdlt_random_html.erl
new file mode 100644
index 0000000000..e3a572c61f
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt_random_html.erl
@@ -0,0 +1,59 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(hdlt_random_html). 
+-export([page/3]). 
+
+page(SessionID, _Env, Input) -> 
+%%     log("page(~p) -> deliver content-type when"
+%% 	"~n   SessionID: ~p"
+%% 	"~n   Env:       ~p"
+%% 	"~n   Input:     ~p", [self(), SessionID, Env, Input]),
+    [WorkSimStr, SzSimStr] = string:tokens(Input, [$:]),
+    WorkSim = list_to_integer(WorkSimStr),
+    SzSim   = list_to_integer(SzSimStr),
+    mod_esi:deliver(SessionID,  "Content-Type:text/html\r\n\r\n"),  
+    mod_esi:deliver(SessionID, start("Random test page")),  
+    mod_esi:deliver(SessionID, content(WorkSim, SzSim)),  
+    mod_esi:deliver(SessionID, stop()),
+    ok.
+
+start(Title) ->  
+    "<HTML>  
+<HEAD>  
+<TITLE>" ++ Title ++ "</TITLE> 
+ </HEAD>  
+<BODY>\n".  
+
+stop() ->  
+    "</BODY>  
+</HTML>
+". 
+ 
+content(WorkSim, SzSim) ->  
+    {A, B, C} = now(),  
+    random:seed(A, B, C),  
+    lists:sort([random:uniform(X) || X <- lists:seq(1, WorkSim)]),  
+    lists:flatten(lists:duplicate(SzSim, "Dummy data ")). 
+
+%% log(F, A) ->
+%%     hdlt_logger:set_name("HDLT RANDOM-HTML"),
+%%     hdlt_logger:set_level(debug),
+%%     hdlt_logger:log(F, A).
diff --git a/lib/inets/examples/httpd_load_test/hdlt_server.erl b/lib/inets/examples/httpd_load_test/hdlt_server.erl
new file mode 100644
index 0000000000..3e5a849d5b
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt_server.erl
@@ -0,0 +1,163 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+%%
+%%----------------------------------------------------------------------
+%% Purpose: The HDLT server module.
+%%          This is just a stub, making future expansion easy.
+%%          All code in this module is executed in the local node!
+%%----------------------------------------------------------------------
+
+-module(hdlt_server).
+
+-export([start/1, stop/0, start_inets/0, start_service/1]).
+
+-export([proxy/1]).
+
+-include_lib("kernel/include/file.hrl").
+-include("hdlt_logger.hrl").
+
+
+-define(PROXY, hdlt_proxy).
+
+
+%% This function is used to start the proxy process
+%% This function is called *after* the nodes has been 
+%% "connected" with the controller/collector node.
+
+start(Debug) ->
+    proc_lib:start(?MODULE, proxy, [Debug]).
+
+stop() ->
+    ?PROXY ! stop.
+
+start_inets() ->
+    ?PROXY ! start_inets.
+
+start_service(Config) ->
+    ?PROXY ! {server_start, Config, self()},
+    receive
+	{server_start_result, Result} ->
+	    Result
+    after 15000 ->
+	    {error, timeout}
+    end.
+
+
+proxy(Debug) ->
+    process_flag(trap_exit, true),
+    erlang:register(?PROXY, self()),
+    ?SET_NAME("HDLT PROXY"),
+    ?SET_LEVEL(Debug), 
+    ?LOG("starting", []),
+    Ref = await_for_controller(10), 
+    CtrlNode = node(Ref), 
+    erlang:monitor_node(CtrlNode, true),
+    proc_lib:init_ack({ok, self()}),
+    ?DEBUG("started", []),
+    proxy_loop(Ref, CtrlNode).
+
+await_for_controller(N) when N > 0 ->
+    case global:whereis_name(hdlt_ctrl) of
+	Pid when is_pid(Pid) ->
+	    erlang:monitor(process, Pid);
+	_ ->
+	    timer:sleep(1000),
+	    await_for_controller(N-1)
+    end;
+await_for_controller(_) ->
+    proc_lib:init_ack({error, controller_not_found, nodes()}),
+    timer:sleep(500),
+    halt().
+
+    
+proxy_loop(Ref, CtrlNode) ->
+    ?DEBUG("await command", []),
+    receive
+	stop ->
+	    ?LOG("received stop", []),
+	    halt();
+
+	start_inets ->
+	    ?LOG("start the inets service framework", []),
+	    case (catch inets:start()) of
+		ok ->
+		    ?LOG("framework started", []),
+		    proxy_loop(Ref, CtrlNode);
+		Error ->
+		    ?LOG("failed starting inets service framework: "
+			 "~n   Error: ~p", [Error]),
+		    halt()
+	    end;
+
+	{server_start, Config, From} ->
+	    ?LOG("start-server", []),
+	    maybe_start_crypto_and_ssl(Config),
+	    %% inets:enable_trace(max, "/tmp/inets-httpd-trace.log", httpd),
+	    %% inets:enable_trace(max, "/tmp/inets-httpd-trace.log", all),
+	    case (catch inets:start(httpd, Config)) of
+		{ok, _} ->
+		    ?LOG("server started when"
+			 "~n   which(inets): ~p"
+			 "~n   RootDir:      ~p"
+			 "~n   System info:  ~p", [code:which(inets), 
+						   code:root_dir(), 
+						   get_node_info()]),
+		    From ! {server_start_result, ok},
+		    proxy_loop(Ref, CtrlNode);
+		Error ->
+		    ?INFO("server start failed"
+			  "~n   Error: ~p", [Error]),
+		    From ! {server_start_result, Error},
+		    halt()
+	    end;
+
+	{nodedown, CtrlNode} ->
+	    ?LOG("received nodedown for controller node - terminate", []), 
+	    halt();
+
+	{'DOWN', Ref, process, _, _} ->
+	    ?LOG("received DOWN message for controller - terminate", []),
+	    %% The controller has terminated, time to die
+	    halt()
+
+    end.
+
+
+maybe_start_crypto_and_ssl(Config) ->
+    case lists:keysearch(socket_type, 1, Config) of
+	{value, {socket_type, SocketType}} when ((SocketType =:= ssl) orelse
+						 (SocketType =:= ossl) orelse
+						 (SocketType =:= essl)) ->
+	    ?LOG("maybe start crypto and ssl", []),
+	    (catch crypto:start()), 
+	    ssl:start();
+	_ ->
+	    ok
+    end.
+
+
+get_node_info() ->
+    [{cpu_topology,        erlang:system_info(cpu_topology)},
+     {heap_type,           erlang:system_info(heap_type)},
+     {nof_schedulers,      erlang:system_info(schedulers)},
+     {otp_release,         erlang:system_info(otp_release)}, 
+     {version,             erlang:system_info(version)}, 
+     {system_version,      erlang:system_info(system_version)},
+     {system_architecture, erlang:system_info(system_architecture)}].
+
diff --git a/lib/inets/examples/httpd_load_test/hdlt_slave.erl b/lib/inets/examples/httpd_load_test/hdlt_slave.erl
new file mode 100644
index 0000000000..52af9b5b90
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt_slave.erl
@@ -0,0 +1,291 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(hdlt_slave).
+
+
+-export([start_link/4, start_link/5, start_link/6, stop/1]).
+
+%% Internal exports 
+-export([wait_for_slave/9, slave_start/1, wait_for_master_to_die/3]).
+
+-include("hdlt_logger.hrl").
+
+-define(SSH_PORT, 22).
+-define(TIMEOUT,  60000).
+-define(LOGGER,   hdlt_logger).
+
+
+%% ***********************************************************************
+%% start_link/4,5 --
+%%
+%% The start/4,5 functions are used to start a slave Erlang node.
+%% The node on which the start/N functions are used is called the
+%% master in the description below.
+%%
+%% If hostname is the same for the master and the slave,
+%% the Erlang node will simply be spawned.  The only requirment for
+%% 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.
+%% 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').
+%%
+%% For this to work, the following conditions must be fulfilled:
+%%
+%% 1. There must be an Rsh program on computer; if not an error
+%%    is returned.
+%%
+%% 2. The hosts must be configured to allowed 'rsh' access without
+%%    prompts for password.
+%%
+%% The slave node will have its filer and user server redirected
+%% to the master.  When the master node dies, the slave node will
+%% terminate.  For the start_link functions, the slave node will
+%% terminate also if the process which called start_link terminates.
+%%
+%% Returns: {ok, Name@Host} |
+%%	    {error, timeout} |
+%%          {error, no_rsh} |
+%%	    {error, {already_running, Name@Host}}
+
+start_link(Host, Name, ErlPath, Paths) ->
+    start_link(Host, Name, ErlPath, Paths, [], silence).
+
+start_link(Host, Name, ErlPath, Paths, DebugLevel) when is_atom(DebugLevel) ->
+    start_link(Host, Name, ErlPath, Paths, [], DebugLevel);
+start_link(Host, Name, ErlPath, Paths, Args) when is_list(Args) ->
+    start_link(Host, Name, ErlPath, Paths, Args, silence).
+
+start_link(Host, Name, ErlPath, Paths, Args, DebugLevel) ->
+    Node = list_to_atom(lists:concat([Name, "@", Host])),
+    case net_adm:ping(Node) of
+	pang ->
+	    start_it(Host, Name, Node, ErlPath, Paths, Args, DebugLevel);
+	pong -> 
+	    {error, {already_running, Node}}
+    end.
+
+%% Stops a running node.
+
+stop(Node) ->
+    rpc:call(Node, erlang, halt, []),
+    ok.
+
+
+%% Starts a new slave node.
+
+start_it(Host, Name, Node, ErlPath, Paths, Args, DebugLevel) ->
+    Prog = filename:join([ErlPath, "erl"]), 
+    spawn(?MODULE, wait_for_slave, [self(), Host, Name, Node, Paths, Args, self(), Prog, DebugLevel]),
+    receive
+	{result, Result} -> Result
+    end.
+
+%% Waits for the slave to start.
+
+wait_for_slave(Parent, Host, Name, Node, Paths, Args, 
+	       LinkTo, Prog, DebugLevel) ->
+    ?SET_NAME("HDLT SLAVE STARTER"), 
+    ?SET_LEVEL(DebugLevel),
+    ?DEBUG("begin", []),
+    Waiter = register_unique_name(0),
+    case mk_cmd(Host, Name, Paths, Args, Waiter, Prog) of
+	{ok, Cmd} ->
+  	    ?DEBUG("command generated: ~n~s", [Cmd]),
+	    case (catch ssh_slave_start(Host, Cmd)) of
+		{ok, Conn, _Chan} ->
+ 		    ?DEBUG("ssh channel created", []),
+		    receive
+			{SlavePid, slave_started} ->
+ 			    ?DEBUG("slave started: ~p", [SlavePid]),
+			    unregister(Waiter),
+			    slave_started(Parent, LinkTo, SlavePid, Conn, 
+					  DebugLevel)
+		    after 32000 ->
+			    ?INFO("slave node failed to report in on time", 
+				  []),
+			    %% If it seems that the node was partially started,
+			    %% try to kill it.
+			    case net_adm:ping(Node) of
+				pong ->
+				    spawn(Node, erlang, halt, []),
+				    ok;
+				_ ->
+				    ok
+			    end,
+			    Parent ! {result, {error, timeout}}
+		    end;
+		{error, Reason} = Error ->
+		    ?INFO("FAILED starting node: "
+			  "~n   ~p"
+			  "~n   ~p", [Reason, Cmd]),
+		    Parent ! {result, Error}
+	    end;
+	Other ->
+	    ?INFO("FAILED creating node command string: "
+		  "~n   ~p", [Other]),
+	    Parent ! {result, Other}
+    end.
+
+
+ssh_slave_start(Host, ErlCmd) ->
+    ?DEBUG("ssh_slave_start -> try connect to ~p", [Host]),
+    Connection = 
+	case (catch ssh:connect(Host, ?SSH_PORT, 
+				[{silently_accept_hosts, true}])) of
+	    {ok, Conn} ->
+ 		?DEBUG("ssh_exec_erl -> connected: ~p", [Conn]),
+		Conn;
+	    Error1 ->
+ 		?LOG("failed connecting to ~p: ~p", [Host, Error1]),
+		throw({error, {ssh_connect_failed, Error1}})
+	end,
+
+    ?DEBUG("ssh_exec_erl -> connected - now create channel", []), 
+    Channel = 
+	case (catch ssh_connection:session_channel(Connection, ?TIMEOUT)) of
+	    {ok, Chan} ->
+ 		?DEBUG("ssh_exec_erl -> channel ~p created", [Chan]),
+		Chan;
+	    Error2 ->
+ 		?LOG("failed creating channel: ~p", [Error2]),
+		throw({error, {ssh_channel_create_failed, Error2}})
+	end,
+
+    ?DEBUG("ssh_exec_erl -> channel created - now exec command: "
+ 	"~n   ~p", [ErlCmd]), 
+    case (catch ssh_connection:exec(Connection, Channel, ErlCmd, infinity)) of
+	success ->
+	    ?DEBUG("ssh_exec_erl -> command exec'ed - clean ssh msg", []), 
+	    clean_ssh_msg(),
+ 	    ?DEBUG("ssh_exec_erl -> done", []), 
+	    {ok, Connection, Channel};
+	Error3 ->
+ 	    ?LOG("failed exec comand: ~p", [Error3]),
+	    throw({error, {ssh_exec_failed, Error3}})
+    end.
+
+clean_ssh_msg() ->
+    receive
+	{ssh_cm, _X, _Y} ->
+	    clean_ssh_msg()
+    after 1000 ->
+	    ok
+    end.
+    
+
+slave_started(ReplyTo, Master, Slave, Conn, Level) 
+  when is_pid(Master) andalso is_pid(Slave) ->
+    process_flag(trap_exit, true),
+    SName = lists:flatten(
+	      io_lib:format("HDLT SLAVE CTRL[~p,~p]", 
+			    [self(), node(Slave)])), 
+    ?SET_NAME(SName),
+    ?SET_LEVEL(Level), 
+    ?LOG("initiating", []),
+    MasterRef = erlang:monitor(process, Master),
+    SlaveRef  = erlang:monitor(process, Slave),
+    ReplyTo ! {result, {ok, node(Slave)}},
+    slave_running(Master, MasterRef, Slave, SlaveRef, Conn).
+
+
+%% The slave node will be killed if the master process terminates, 
+%% The master process will not be killed if the slave node terminates.
+
+slave_running(Master, MasterRef, Slave, SlaveRef, Conn) ->
+    ?DEBUG("await message", []),
+    receive
+	{'DOWN', MasterRef, process, _Object, _Info} ->
+	    ?LOG("received DOWN from master", []),
+	    erlang:demonitor(SlaveRef, [flush]),
+	    Slave ! {nodedown, node()},
+	    ssh:close(Conn);
+
+	{'DOWN', SlaveRef, process, Object, _Info} ->
+	    ?LOG("received DOWN from slave (~p)", [Object]),
+	    erlang:demonitor(MasterRef, [flush]),
+	    ssh:close(Conn);
+
+	Other ->
+	    ?DEBUG("received unknown: ~n~p", [Other]),
+	    slave_running(Master, MasterRef, Slave, SlaveRef, Conn)
+
+    end.
+
+register_unique_name(Number) ->
+    Name = list_to_atom(lists:concat([?MODULE, "_waiter_", Number])),
+    case catch register(Name, self()) of
+	true ->
+	    Name;
+	{'EXIT', {badarg, _}} ->
+	    register_unique_name(Number+1)
+    end.
+
+
+%% Makes up the command to start the nodes.
+%% If the node should run on the local host, there is
+%% no need to use rsh.
+
+mk_cmd(Host, Name, Paths, Args, Waiter, Prog) ->
+    PaPaths = [[" -pa ", Path] || Path <- Paths], 
+    {ok, lists:flatten(
+	   lists:concat([Prog,
+			 " -detached -nopinput ", 
+			 Args, " ", 
+			 " -sname ", Name, "@", Host,
+			 " -s ", ?MODULE, " slave_start ", node(),
+			 " ", Waiter,
+			 " ", PaPaths]))}.
+
+
+%% This function will be invoked on the slave, using the -s option of erl.
+%% It will wait for the master node to terminate.
+
+slave_start([Master, Waiter]) ->
+    spawn(?MODULE, wait_for_master_to_die, [Master, Waiter, silence]);
+slave_start([Master, Waiter, Level]) ->
+    spawn(?MODULE, wait_for_master_to_die, [Master, Waiter, Level]).
+	
+
+wait_for_master_to_die(Master, Waiter, Level) ->
+    process_flag(trap_exit, true),
+    SName = lists:flatten(
+	      io_lib:format("HDLT-SLAVE MASTER MONITOR[~p,~p,~p]", 
+			    [self(), node(), Master])), 
+    ?SET_NAME(SName),
+    ?SET_LEVEL(Level), 
+    erlang:monitor_node(Master, true),
+    {Waiter, Master} ! {self(), slave_started},
+    wloop(Master).
+
+wloop(Master) ->
+    ?DEBUG("await message", []),
+    receive
+	{nodedown, Master} ->
+	    ?INFO("received master nodedown", []),
+	    halt();
+	_Other ->
+	    wloop(Master)
+    end.
+
+
+
diff --git a/lib/inets/examples/httpd_load_test/hdlt_ssl_client_cert.pem b/lib/inets/examples/httpd_load_test/hdlt_ssl_client_cert.pem
new file mode 120000
index 0000000000..41644a1098
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt_ssl_client_cert.pem
@@ -0,0 +1 @@
+../../test/httpc_SUITE_data/ssl_client_cert.pem
\ No newline at end of file
diff --git a/lib/inets/examples/httpd_load_test/hdlt_ssl_server_cert.pem b/lib/inets/examples/httpd_load_test/hdlt_ssl_server_cert.pem
new file mode 120000
index 0000000000..41644a1098
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/hdlt_ssl_server_cert.pem
@@ -0,0 +1 @@
+../../test/httpc_SUITE_data/ssl_client_cert.pem
\ No newline at end of file
diff --git a/lib/inets/examples/httpd_load_test/modules.mk b/lib/inets/examples/httpd_load_test/modules.mk
new file mode 100644
index 0000000000..9d0d7103d5
--- /dev/null
+++ b/lib/inets/examples/httpd_load_test/modules.mk
@@ -0,0 +1,44 @@
+#-*-makefile-*-   ; force emacs to enter makefile-mode
+
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2010. 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%
+
+SCRIPT_SKELETONS = \
+	hdlt.sh.skel
+
+CONF_SKELETONS = \
+	hdlt.config.skel
+
+CERT_FILES = \
+	hdlt_ssl_client_cert.pem \
+	hdlt_ssl_server_cert.pem
+
+README = HDLT_README
+
+MODULES = \
+        hdlt \
+        hdlt_ctrl \
+        hdlt_client \
+	hdlt_logger \
+	hdlt_random_html \
+	hdlt_server \
+	hdlt_slave
+
+INTERNAL_HRL_FILES = \
+        hdlt_logger.hrl
+
+
diff --git a/lib/inets/examples/server_root/Makefile b/lib/inets/examples/server_root/Makefile
new file mode 100644
index 0000000000..d7a3231068
--- /dev/null
+++ b/lib/inets/examples/server_root/Makefile
@@ -0,0 +1,209 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2010. 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%
+#
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../../vsn.mk
+VSN=$(INETS_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/inets-$(VSN)
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+MODULE= 
+
+AUTH_FILES = auth/group \
+	auth/passwd 
+CGI_FILES = cgi-bin/printenv.sh 
+CONF_FILES = conf/8080.conf \
+	conf/8888.conf \
+	conf/httpd.conf \
+	conf/ssl.conf \
+	conf/mime.types 
+OPEN_FILES = htdocs/open/dummy.html 
+MNESIA_OPEN_FILES = htdocs/mnesia_open/dummy.html 
+MISC_FILES = htdocs/misc/friedrich.html \
+	htdocs/misc/oech.html
+SECRET_FILES = htdocs/secret/dummy.html 
+MNESIA_SECRET_FILES = htdocs/mnesia_secret/dummy.html 
+HTDOCS_FILES = htdocs/index.html \
+	htdocs/config.shtml \
+	htdocs/echo.shtml \
+	htdocs/exec.shtml \
+	htdocs/flastmod.shtml \
+	htdocs/fsize.shtml \
+	htdocs/include.shtml
+ICON_FILES = icons/README \
+	icons/a.gif \
+	icons/alert.black.gif \
+	icons/alert.red.gif \
+	icons/apache_pb.gif \
+	icons/back.gif \
+	icons/ball.gray.gif \
+	icons/ball.red.gif \
+	icons/binary.gif \
+	icons/binhex.gif \
+	icons/blank.gif \
+	icons/bomb.gif \
+	icons/box1.gif \
+	icons/box2.gif \
+	icons/broken.gif \
+	icons/burst.gif \
+	icons/button1.gif \
+	icons/button10.gif \
+	icons/button2.gif \
+	icons/button3.gif \
+	icons/button4.gif \
+	icons/button5.gif \
+	icons/button6.gif \
+	icons/button7.gif \
+	icons/button8.gif \
+	icons/button9.gif \
+	icons/buttonl.gif \
+	icons/buttonr.gif \
+	icons/c.gif \
+	icons/comp.blue.gif \
+	icons/comp.gray.gif \
+	icons/compressed.gif \
+	icons/continued.gif \
+	icons/dir.gif \
+	icons/down.gif \
+	icons/dvi.gif \
+	icons/f.gif \
+	icons/folder.gif \
+	icons/folder.open.gif \
+	icons/folder.sec.gif \
+	icons/forward.gif \
+	icons/generic.gif \
+	icons/generic.red.gif \
+	icons/generic.sec.gif \
+	icons/hand.right.gif \
+	icons/hand.up.gif \
+	icons/htdig.gif \
+	icons/icon.sheet.gif \
+	icons/image1.gif \
+	icons/image2.gif \
+	icons/image3.gif \
+	icons/index.gif \
+	icons/layout.gif \
+	icons/left.gif \
+	icons/link.gif \
+	icons/movie.gif \
+	icons/p.gif \
+	icons/patch.gif \
+	icons/pdf.gif \
+	icons/pie0.gif \
+	icons/pie1.gif \
+	icons/pie2.gif \
+	icons/pie3.gif \
+	icons/pie4.gif \
+	icons/pie5.gif \
+	icons/pie6.gif \
+	icons/pie7.gif \
+	icons/pie8.gif \
+	icons/portal.gif \
+	icons/poweredby.gif \
+	icons/ps.gif \
+	icons/quill.gif \
+	icons/right.gif \
+	icons/screw1.gif \
+	icons/screw2.gif \
+	icons/script.gif \
+	icons/sound1.gif \
+	icons/sound2.gif \
+	icons/sphere1.gif \
+	icons/sphere2.gif \
+	icons/star.gif \
+	icons/star_blank.gif \
+	icons/tar.gif \
+	icons/tex.gif \
+	icons/text.gif \
+	icons/transfer.gif \
+	icons/unknown.gif \
+	icons/up.gif \
+	icons/uu.gif \
+	icons/uuencoded.gif \
+	icons/world1.gif \
+	icons/world2.gif
+
+SSL_FILES = ssl/ssl_client.pem \
+	ssl/ssl_server.pem
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+ERL_COMPILE_FLAGS +=
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+debug opt: 
+
+clean:
+
+docs:
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/auth
+	$(INSTALL_DATA) $(AUTH_FILES) $(RELSYSDIR)/examples/server_root/auth
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/cgi-bin
+	$(INSTALL_SCRIPT) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/conf
+	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/examples/server_root/conf
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/open
+	$(INSTALL_DATA) $(OPEN_FILES) \
+		$(RELSYSDIR)/examples/server_root/htdocs/open
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
+	$(INSTALL_DATA) $(MNESIA_OPEN_FILES) \
+		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/misc
+	$(INSTALL_DATA) $(MISC_FILES) \
+		$(RELSYSDIR)/examples/server_root/htdocs/misc
+	$(INSTALL_DIR)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/secret/top_secret
+	$(INSTALL_DIR)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret/top_secret
+	$(INSTALL_DATA) $(SECRET_FILES)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/secret
+	$(INSTALL_DATA) $(MNESIA_SECRET_FILES)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs
+	$(INSTALL_DATA) $(HTDOCS_FILES) $(RELSYSDIR)/examples/server_root/htdocs
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/icons
+	$(INSTALL_DATA) $(ICON_FILES) $(RELSYSDIR)/examples/server_root/icons
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/ssl
+	$(INSTALL_DATA) $(SSL_FILES) $(RELSYSDIR)/examples/server_root/ssl
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/logs
+
+release_docs_spec:
+
diff --git a/lib/inets/examples/subdirs.mk b/lib/inets/examples/subdirs.mk
new file mode 100644
index 0000000000..10a331fc26
--- /dev/null
+++ b/lib/inets/examples/subdirs.mk
@@ -0,0 +1,3 @@
+#-*-makefile-*-   ; force emacs to enter makefile-mode
+
+SUB_DIRECTORIES = server_root httpd_load_test
\ No newline at end of file
diff --git a/lib/inets/include/httpd.hrl b/lib/inets/include/httpd.hrl
new file mode 100644
index 0000000000..a7e63ca670
--- /dev/null
+++ b/lib/inets/include/httpd.hrl
@@ -0,0 +1,41 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
+%%
+%%
+
+-ifndef(httpd_hrl).
+-define(httpd_hrl, true).
+
+-include_lib("kernel/include/file.hrl").
+
+-record(init_data,{peername,resolve}).
+
+-record(mod,{init_data,
+	     data=[],
+	     socket_type=ip_comm,
+	     socket,
+	     config_db,
+	     method,
+	     absolute_uri=[],
+	     request_uri,
+	     http_version,
+	     request_line,
+	     parsed_header=[],
+	     entity_body,
+	     connection}).
+-endif. % -ifdef(httpd_hrl).
diff --git a/lib/inets/include/mod_auth.hrl b/lib/inets/include/mod_auth.hrl
new file mode 100644
index 0000000000..cf931e681a
--- /dev/null
+++ b/lib/inets/include/mod_auth.hrl
@@ -0,0 +1,33 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+%%
+
+-ifndef(mod_auth_hrl).
+-define(mod_auth_hrl, true).
+
+-record(httpd_user,
+	{username,
+	 password,
+	 user_data}).
+
+-record(httpd_group,
+	{name,
+	 userlist}).
+
+-endif. % -ifdef(mod_auth_hrl).
diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile
index 0c15277a18..19b93870df 100644
--- a/lib/inets/src/ftp/Makefile
+++ b/lib/inets/src/ftp/Makefile
@@ -22,6 +22,7 @@ include $(ERL_TOP)/make/target.mk
 EBIN = ../../ebin
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
+
 # ----------------------------------------------------
 # Application version
 # ----------------------------------------------------
@@ -29,6 +30,7 @@ include ../../vsn.mk
 
 VSN = $(INETS_VSN)
 
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -52,24 +54,21 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 
 # ----------------------------------------------------
-# INETS FLAGS
+# FLAGS
 # ----------------------------------------------------
-INETS_FLAGS = -D'SERVER_SOFTWARE="$(APPLICATION)/$(VSN)"'
+
+include ../inets_app/inets.mk
 
 ifeq ($(FTP_DEBUG),true)
   INETS_FLAGS += -Dftp_debug
 endif
 
+ERL_COMPILE_FLAGS += \
+	$(INETS_FLAGS) \
+        $(INETS_ERL_COMPILE_FLAGS) \
+	-I../../include \
+	-I../inets_app
 
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-INETS_ERL_FLAGS += -I ../inets_app -pa ../../ebin
-
-ERL_COMPILE_FLAGS += $(INETS_ERL_FLAGS) \
-		     $(INETS_FLAGS) \
-                     +'{parse_transform,sys_pre_attributes}' \
-                     +'{attribute,insert,app_vsn,$(APP_VSN)}'
 
 # ----------------------------------------------------
 # Targets
@@ -89,9 +88,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  $(RELSYSDIR)/src
+	$(INSTALL_DIR)  $(RELSYSDIR)/src/ftp
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/ftp
+	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
 release_docs_spec:
diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl
index 534fcae675..5ad74851c8 100644
--- a/lib/inets/src/ftp/ftp.erl
+++ b/lib/inets/src/ftp/ftp.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
 %%
 %%
@@ -25,14 +25,12 @@
 -behaviour(gen_server).
 -behaviour(inets_service).
 
--deprecated({open, 3, next_major_release}).
--deprecated({force_active, 1, next_major_release}).
 
 %%  API - Client interface
 -export([cd/2, close/1, delete/2, formaterror/1, 
 	 lcd/2, lpwd/1, ls/1, ls/2, 
 	 mkdir/2, nlist/1, nlist/2, 
-	 open/1, open/2, open/3, force_active/1,
+	 open/1, open/2, 
 	 pwd/1, quote/2,
 	 recv/2, recv/3, recv_bin/2, 
 	 recv_chunk_start/2, recv_chunk/1, 
@@ -133,11 +131,6 @@ open(Host, Port) when is_integer(Port) ->
     open(Host, [{port, Port}]);
 %% </BACKWARD-COMPATIBILLITY>
 
-%% <BACKWARD-COMPATIBILLITY>
-open(Host, [H|_] = Flags) when is_atom(H) ->
-    open(Host, ?FTP_PORT, Flags);
-%% </BACKWARD-COMPATIBILLITY>
-
 open(Host, Opts) when is_list(Opts) ->
     ?fcrt("open", [{host, Host}, {opts, Opts}]), 
     try
@@ -160,32 +153,6 @@ open(Host, Opts) when is_list(Opts) ->
     end.
 
 
-%% <BACKWARD-COMPATIBILLITY>
-open(Host, Port, Flags) when is_integer(Port) andalso is_list(Flags) ->
-    ?fcrt("open", [{host, Host}, {port, Port}, {flags, Flags}]), 
-    try
-	{ok, StartOptions} = start_options([{flags, Flags}]), 
-	?fcrt("open", [{start_options, StartOptions}]), 
-	{ok, OpenOptions}  = open_options([{host, Host}, {port, Port}|Flags]), 
-	?fcrt("open", [{open_options, OpenOptions}]), 
-	case ftp_sup:start_child([[{client, self()} | StartOptions], []]) of
-	    {ok, Pid} ->
-		?fcrt("open - ok", [{pid, Pid}]), 
-		call(Pid, {open, ip_comm, OpenOptions}, plain);
-	    Error1 ->
-		?fcrt("open - error", [{error1, Error1}]), 
-		Error1
-	end
-    catch
-	throw:Error2 ->
-	    Error2
-    end.
-%% </BACKWARD-COMPATIBILLITY>
-
-
-
-
-
 %%--------------------------------------------------------------------------
 %% user(Pid, User, Pass, <Acc>) -> ok | {error, euser} | {error, econn} 
 %%                                    | {error, eacct}
@@ -528,16 +495,6 @@ close(Pid) ->
     cast(Pid, close),
     ok.
 
-%%--------------------------------------------------------------------------
-%% force_active(Pid) -> ok
-%%	Pid = pid()
-%%
-%% Description: Force connection to use active mode. 
-%%--------------------------------------------------------------------------
-force_active(Pid) ->
-    error_logger:info_report("This function is deprecated use the mode flag "
-			     "instead"),
-    call(Pid, force_active, atom).
 
 %%--------------------------------------------------------------------------
 %% formaterror(Tag) -> string()
@@ -886,9 +843,6 @@ handle_call({_, {open, ip_comm, Host, Opts}}, From, State) ->
 	    {stop, normal, State2#state{client = undefined}}
     end;	
 
-handle_call({_, force_active}, _, State) ->
-    {reply, ok, State#state{mode = active}};
-
 handle_call({_, {user, User, Password}}, From, 
 	    #state{csock = CSock} = State) when (CSock =/= undefined) ->
     handle_user(User, Password, "", State#state{client = From});
diff --git a/lib/inets/src/ftp/ftp_internal.hrl b/lib/inets/src/ftp/ftp_internal.hrl
index c3fa1e611d..148f8217ba 100644
--- a/lib/inets/src/ftp/ftp_internal.hrl
+++ b/lib/inets/src/ftp/ftp_internal.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-2010. 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%
 %%
 %%
@@ -21,7 +21,8 @@
 -ifndef(ftp_internal_hrl).
 -define(ftp_internal_hrl, true).
 
--include("inets_internal.hrl").
+-include_lib("inets/src/inets_app/inets_internal.hrl").
+
 -define(SERVICE, ftpc).
 -define(fcri(Label, Content), ?report_important(Label, ?SERVICE, Content)).
 -define(fcrv(Label, Content), ?report_verbose(Label,   ?SERVICE, Content)).
diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
index 628c91421f..0397b48ab2 100644
--- a/lib/inets/src/http_client/Makefile
+++ b/lib/inets/src/http_client/Makefile
@@ -51,7 +51,6 @@ MODULES = \
 	httpc_profile_sup \
 	httpc_response \
 	httpc_request \
-	http_uri \
 
 HRL_FILES = httpc_internal.hrl
 
@@ -61,20 +60,17 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 
 # ----------------------------------------------------
-# INETS FLAGS
-# ----------------------------------------------------
-INETS_FLAGS = -D'SERVER_SOFTWARE="$(APPLICATION)/$(VSN)"'
-
-
-# ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-INETS_ERL_FLAGS += -I ../http_lib -I ../inets_app -pa ../../ebin
 
-ERL_COMPILE_FLAGS += $(INETS_ERL_FLAGS) \
-		     $(INETS_FLAGS) \
-                     +'{parse_transform,sys_pre_attributes}' \
-                     +'{attribute,insert,app_vsn,$(APP_VSN)}'
+include ../inets_app/inets.mk
+
+ERL_COMPILE_FLAGS += \
+	$(INETS_FLAGS) \
+	$(INETS_ERL_COMPILE_FLAGS) \
+	-I../../include \
+	-I../inets_app \
+	-I../http_lib
 
 
 # ----------------------------------------------------
@@ -94,9 +90,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  $(RELSYSDIR)/src
+	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_client
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_client
+	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
 release_docs_spec:
diff --git a/lib/inets/src/http_client/http.erl b/lib/inets/src/http_client/http.erl
index 7e1e90b50e..bbe2fec267 100644
--- a/lib/inets/src/http_client/http.erl
+++ b/lib/inets/src/http_client/http.erl
@@ -18,21 +18,38 @@
 %%
 %%
 
-%% Description:
-%%% This version of the HTTP/1.1 client supports:
-%%%      - RFC 2616 HTTP 1.1 client part
-%%%      - RFC 2818 HTTP Over TLS
+%%% Description: OLD API MODULE - USE httpc INSTEAD
 
 -module(http).
 
-%% API
--export([request/1, request/2, request/4, request/5,
+-deprecated({request,         1, next_major_release}).
+-deprecated({request,         2, next_major_release}).
+-deprecated({request,         4, next_major_release}).
+-deprecated({request,         5, next_major_release}).
+-deprecated({cancel_request,  1, next_major_release}).
+-deprecated({cancel_request,  2, next_major_release}).
+-deprecated({set_option,      2, next_major_release}).
+-deprecated({set_option,      3, next_major_release}).
+-deprecated({set_options,     1, next_major_release}).
+-deprecated({set_options,     2, next_major_release}).
+-deprecated({verify_cookies,  2, next_major_release}).
+-deprecated({verify_cookies,  3, next_major_release}).
+-deprecated({cookie_header,   1, next_major_release}).
+-deprecated({cookie_header,   2, next_major_release}).
+-deprecated({stream_next,     1, next_major_release}).
+-deprecated({default_profile, 0, next_major_release}).
+
+%% Deprecated
+-export([
+	 request/1, request/2, request/4, request/5,
 	 cancel_request/1, cancel_request/2,
 	 set_option/2, set_option/3,
 	 set_options/1, set_options/2,
-	 verify_cookies/2, verify_cookies/3, cookie_header/1, 
-	 cookie_header/2, stream_next/1,
-	 default_profile/0]).
+	 verify_cookies/2, verify_cookies/3, 
+	 cookie_header/1, cookie_header/2, 
+	 stream_next/1,
+	 default_profile/0
+	]).
 
 
 %%%=========================================================================
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index 6deeab6948..04fae13b20 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -48,7 +48,7 @@
 	 stop_service/1, 
 	 services/0, service_info/1]).
 
--include("http_internal.hrl").
+-include_lib("inets/src/http_lib/http_internal.hrl").
 -include("httpc_internal.hrl").
 
 -define(DEFAULT_PROFILE, default).
@@ -104,8 +104,14 @@ request(Url, Profile) ->
 %%	HTTPOptions - [HttpOption]
 %%	HTTPOption - {timeout, Time} | {connect_timeout, Time} | 
 %%                   {ssl, SSLOptions} | {proxy_auth, {User, Password}}
-%%	Ssloptions = [SSLOption]
-%%	SSLOption =  {verify, code()} | {depth, depth()} | {certfile, path()} |
+%%	Ssloptions = ssl_options() | 
+%%                   {ssl,  ssl_options()} | 
+%%                   {ossl, ssl_options()} | 
+%%                   {essl, ssl_options()}
+%%      ssl_options() = [ssl_option()]
+%%	ssl_option() =  {verify, code()} | 
+%%                      {depth, depth()} | 
+%%                      {certfile, path()} |
 %%	{keyfile, path()} | {password, string()} | {cacertfile, path()} |
 %%	{ciphers, string()} 
 %%	Options - [Option]
@@ -246,7 +252,7 @@ set_option(Key, Value, Profile) ->
 %% Description: Store the cookies from <SetCookieHeaders> 
 %%              in the cookie database
 %% for the profile <Profile>. This function shall be used when the option
-%% cookie is set to verify. 
+%% cookies is set to verify.
 %%-------------------------------------------------------------------------
 store_cookies(SetCookieHeaders, Url) ->
     store_cookies(SetCookieHeaders, Url, default_profile()).
@@ -436,18 +442,23 @@ handle_request(Method, Url,
 	    HeadersRecord = header_record(NewHeaders, Host2, HTTPOptions),
 	    Receiver   = proplists:get_value(receiver, Options),
 	    SocketOpts = proplists:get_value(socket_opts, Options),
+	    UrlEncodeBool =  HTTPOptions#http_options.url_encode,
+	    MaybeEscPath = url_encode(Path, UrlEncodeBool),
+	    MaybeEscQuery = url_encode(Query, UrlEncodeBool),
+	    AbsUri  = url_encode(Url, UrlEncodeBool),
+
 	    Request = #request{from          = Receiver,
 			       scheme        = Scheme, 
 			       address       = {Host, Port},
-			       path          = Path, 
-			       pquery        = Query, 
+			       path          = MaybeEscPath,
+			       pquery        = MaybeEscQuery,
 			       method        = Method,
 			       headers       = HeadersRecord, 
 			       content       = {ContentType, Body},
 			       settings      = HTTPOptions, 
-			       abs_uri       = Url, 
+			       abs_uri       = AbsUri,
 			       userinfo      = UserInfo, 
-			       stream        = Stream, 
+			       stream        = Stream,
 			       headers_as_is = headers_as_is(Headers, Options),
 			       socket_opts   = SocketOpts, 
 			       started       = Started},
@@ -465,6 +476,10 @@ handle_request(Method, Url,
 	    Error
     end.
 
+url_encode(URI, true) ->
+    http_uri:encode(URI);
+url_encode(URI, false) ->
+    URI.
 
 handle_answer(RequestId, false, _) ->
     {ok, RequestId};
@@ -572,14 +587,16 @@ http_options_default() ->
 		     (_) ->
 			  error
 		  end,
-    AutoRedirectPost = fun(Value) when (Value =:= true) orelse 
-				       (Value =:= false) ->
-			       {ok, Value};
-			  (_) ->
-			       error
-		       end,
+    AutoRedirectPost =  boolfun(),
+
     SslPost = fun(Value) when is_list(Value) ->
-		      {ok, Value};
+		      {ok, {?HTTP_DEFAULT_SSL_KIND, Value}};
+		 ({ssl, SslOptions}) when is_list(SslOptions) ->
+		      {ok, {?HTTP_DEFAULT_SSL_KIND, SslOptions}};
+		 ({ossl, SslOptions}) when is_list(SslOptions) ->
+		      {ok, {ossl, SslOptions}};
+		 ({essl, SslOptions}) when is_list(SslOptions) ->
+		      {ok, {essl, SslOptions}};
 		 (_) ->
 		      error
 	      end,
@@ -589,12 +606,8 @@ http_options_default() ->
 		       (_) ->
 			    error
 		    end,
-    RelaxedPost = fun(Value) when (Value =:= true) orelse 
-				  (Value =:= false) ->
-			  {ok, Value};
-		     (_) ->
-			  error
-		  end,
+    RelaxedPost =  boolfun(),
+
     ConnTimeoutPost = 
 	fun(Value) when is_integer(Value) andalso (Value >= 0) ->
 		{ok, Value};
@@ -603,25 +616,30 @@ http_options_default() ->
 	   (_) ->
 		error
 	end,
+
+    UrlDecodePost =  boolfun(),
     [
-     {version,         {value, "HTTP/1.1"},              #http_options.version,         VersionPost}, 
-     {timeout,         {value, ?HTTP_REQUEST_TIMEOUT},   #http_options.timeout,         TimeoutPost},
-     {autoredirect,    {value, true},                    #http_options.autoredirect,    AutoRedirectPost},
-     {ssl,             {value, []},                      #http_options.ssl,             SslPost},
-     {proxy_auth,      {value, undefined},               #http_options.proxy_auth,      ProxyAuthPost},
-     {relaxed,         {value, false},                   #http_options.relaxed,         RelaxedPost},
-     %% this field has to be *after* the timeout field (as that field is used for the default value)
-     {connect_timeout, {field,   #http_options.timeout}, #http_options.connect_timeout, ConnTimeoutPost}
+     {version,         {value, "HTTP/1.1"},            #http_options.version,         VersionPost}, 
+     {timeout,         {value, ?HTTP_REQUEST_TIMEOUT}, #http_options.timeout,         TimeoutPost},
+     {autoredirect,    {value, true},                  #http_options.autoredirect,    AutoRedirectPost},
+     {ssl,             {value, {?HTTP_DEFAULT_SSL_KIND, []}}, #http_options.ssl,             SslPost},
+     {proxy_auth,      {value, undefined},             #http_options.proxy_auth,      ProxyAuthPost},
+     {relaxed,         {value, false},                 #http_options.relaxed,         RelaxedPost},
+     {url_encode,      {value, false},                 #http_options.url_encode,      UrlDecodePost},
+     %% this field has to be *after* the timeout option (as that field is used for the default value)
+     {connect_timeout, {field, #http_options.timeout}, #http_options.connect_timeout, ConnTimeoutPost}
     ].
 
+boolfun() ->
+    fun(Value) when (Value =:= true) orelse
+		    (Value =:= false) ->
+	    {ok, Value};
+       (_) ->
+	    error
+    end.
 
 request_options_defaults() ->
-    VerifyBoolean = 
-	fun(Value) when ((Value =:= true) orelse (Value =:= false)) ->
-		ok;
-	   (_) ->
-		error
-	end,
+    VerifyBoolean = boolfun(),
 
     VerifySync = VerifyBoolean,
 
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 5e79d874fb..cb6f3e2841 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2002-2010. 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%
 %%
 %%
@@ -22,8 +22,8 @@
 
 -behaviour(gen_server).
 
+-include_lib("inets/src/http_lib/http_internal.hrl").
 -include("httpc_internal.hrl").
--include("http_internal.hrl").
 
 
 %%--------------------------------------------------------------------
@@ -177,8 +177,8 @@ stream(BodyPart, Request = #request{stream = Self}, Code)
 stream(BodyPart, Request = #request{stream = Self}, 404) 
   when (Self =:= self) orelse (Self =:= {self, once}) ->
     ?hcrt("stream - self with 404", [{stream, Self}]),
-    httpc_response:send(Request#request.from,
-                       {Request#request.id, stream, BodyPart}),
+    httpc_response:send(Request#request.from, 
+			{Request#request.id, stream, BodyPart}),
     {<<>>, Request};
 
 %% Stream to file
@@ -286,8 +286,7 @@ handle_call({connect_and_send, #request{address = Address0,
 	
 handle_call(#request{address = Addr} = Request, _, 
 	    #state{status  = Status,
-		   session = #tcp_session{socket = Socket,
-					  type   = pipeline} = Session,
+		   session = #session{type = pipeline} = Session,
 		   timers  = Timers,
 		   options = #options{proxy = Proxy} = _Options, 
 		   profile_name = ProfileName} = State) 
@@ -301,7 +300,7 @@ handle_call(#request{address = Addr} = Request, _,
 
     Address = handle_proxy(Addr, Proxy),
 
-    case httpc_request:send(Address, Request, Socket) of
+    case httpc_request:send(Address, Session, Request) of
         ok ->
 
 	    ?hcrd("request sent", []),
@@ -320,10 +319,10 @@ handle_call(#request{address = Addr} = Request, _,
 		    NewTimers   = NewState#state.timers,
                     NewPipeline = queue:in(Request, State#state.pipeline),
 		    NewSession  = 
-			Session#tcp_session{queue_length = 
-					    %% Queue + current
-					    queue:len(NewPipeline) + 1,
-					    client_close = ClientClose},
+			Session#session{queue_length = 
+					%% Queue + current
+					queue:len(NewPipeline) + 1,
+					client_close = ClientClose},
 		    httpc_manager:insert_session(NewSession, ProfileName),
 		    ?hcrd("session updated", []),
                     {reply, ok, State#state{pipeline = NewPipeline,
@@ -336,8 +335,8 @@ handle_call(#request{address = Addr} = Request, _,
 		    cancel_timer(Timers#timers.queue_timer, 
 				 timeout_queue),
 		    NewSession = 
-			Session#tcp_session{queue_length = 1,
-					    client_close = ClientClose},
+			Session#session{queue_length = 1,
+					client_close = ClientClose},
 		    httpc_manager:insert_session(NewSession, ProfileName),
 		    Relaxed = 
 			(Request#request.settings)#http_options.relaxed, 
@@ -357,8 +356,7 @@ handle_call(#request{address = Addr} = Request, _,
 
 handle_call(#request{address = Addr} = Request, _, 
 	    #state{status  = Status,
-		   session = #tcp_session{socket = Socket,
-					  type   = keep_alive} = Session,
+		   session = #session{type = keep_alive} = Session,
 		   timers  = Timers,
 		   options = #options{proxy = Proxy} = _Options,
 		   profile_name = ProfileName} = State) 
@@ -370,7 +368,7 @@ handle_call(#request{address = Addr} = Request, _,
 	   {status,  Status}]),
 
     Address = handle_proxy(Addr, Proxy),
-    case httpc_request:send(Address, Request, Socket) of
+    case httpc_request:send(Address, Session, Request) of
 	ok ->
 
 	    ?hcrd("request sent", []),
@@ -389,10 +387,10 @@ handle_call(#request{address = Addr} = Request, _,
 		    NewTimers    = NewState#state.timers,
                     NewKeepAlive = queue:in(Request, State#state.keep_alive),
 		    NewSession   = 
-			Session#tcp_session{queue_length = 
-					    %% Queue + current
-					    queue:len(NewKeepAlive) + 1,
-					    client_close = ClientClose},
+			Session#session{queue_length = 
+					%% Queue + current
+					queue:len(NewKeepAlive) + 1,
+					client_close = ClientClose},
 		    httpc_manager:insert_session(NewSession, ProfileName),
 		    ?hcrd("session updated", []),
                     {reply, ok, State#state{keep_alive = NewKeepAlive,
@@ -405,8 +403,8 @@ handle_call(#request{address = Addr} = Request, _,
 		    cancel_timer(Timers#timers.queue_timer, 
 				 timeout_queue),
 		    NewSession = 
-			Session#tcp_session{queue_length = 1,
-					    client_close = ClientClose},
+			Session#session{queue_length = 1,
+					client_close = ClientClose},
 		    httpc_manager:insert_session(NewSession, ProfileName),
 		    Relaxed = 
 			(Request#request.settings)#http_options.relaxed,
@@ -589,13 +587,13 @@ handle_info({ssl_closed, _}, State = #state{request = undefined}) ->
 
 %%% Error cases
 handle_info({tcp_closed, _}, #state{session = Session0} = State) ->
-    Socket  = Session0#tcp_session.socket,
-    Session = Session0#tcp_session{socket = {remote_close, Socket}},
+    Socket  = Session0#session.socket,
+    Session = Session0#session{socket = {remote_close, Socket}},
     %% {stop, session_remotly_closed, State};
     {stop, normal, State#state{session = Session}};
 handle_info({ssl_closed, _}, #state{session = Session0} = State) ->
-    Socket  = Session0#tcp_session.socket,
-    Session = Session0#tcp_session{socket = {remote_close, Socket}},
+    Socket  = Session0#session.socket,
+    Session = Session0#session{socket = {remote_close, Socket}},
     %% {stop, session_remotly_closed, State};
     {stop, normal, State#state{session = Session}};
 handle_info({tcp_error, _, _} = Reason, State) ->
@@ -607,24 +605,29 @@ handle_info({ssl_error, _, _} = Reason, State) ->
 %% Internally, to a request handling process, a request timeout is
 %% seen as a canceled request.
 handle_info({timeout, RequestId}, 
-	    #state{request  = #request{id = RequestId} = Request,
-		   canceled = Canceled} = State) ->
+	    #state{request      = #request{id = RequestId} = Request,
+		   canceled     = Canceled,
+		   profile_name = ProfileName} = State) ->
     ?hcri("timeout of current request", [{id, RequestId}]),
     httpc_response:send(Request#request.from, 
 			httpc_response:error(Request, timeout)),
+    httpc_manager:request_done(RequestId, ProfileName),
     ?hcrv("response (timeout) sent - now terminate", []),
     {stop, normal, 
      State#state{request  = Request#request{from = answer_sent},
 		 canceled = [RequestId | Canceled]}};
 
-handle_info({timeout, RequestId}, #state{canceled = Canceled} = State) ->
+handle_info({timeout, RequestId}, 
+	    #state{canceled     = Canceled,
+		   profile_name = ProfileName} = State) ->
     ?hcri("timeout", [{id, RequestId}]),
     Filter = 
 	fun(#request{id = Id, from = From} = Request) when Id =:= RequestId ->
 		?hcrv("found request", [{id, Id}, {from, From}]),
 		%% Notify the owner
-		Response = httpc_response:error(Request, timeout), 
-		httpc_response:send(From, Response),
+		httpc_response:send(From, 
+				    httpc_response:error(Request, timeout)),
+		httpc_manager:request_done(RequestId, ProfileName),
 		?hcrv("response (timeout) sent", []),
 		[Request#request{from = answer_sent}];
 	   (_) ->
@@ -699,52 +702,56 @@ terminate(normal, #state{session = undefined}) ->
 %% Init error sending, no session information has been setup but
 %% there is a socket that needs closing.
 terminate(normal, 
-	  #state{request = Request,
-		 session = #tcp_session{id     = undefined,
-					socket = Socket}}) ->  
-    http_transport:close(socket_type(Request), Socket);
+	  #state{session = #session{id = undefined} = Session}) ->  
+    close_socket(Session);
 
 %% Socket closed remotely
 terminate(normal, 
-	  #state{session = #tcp_session{socket = {remote_close, Socket},
-					id     = Id}, 
+	  #state{session = #session{socket      = {remote_close, Socket},
+				    socket_type = SocketType, 
+				    id          = Id}, 
 		 profile_name = ProfileName,
-		 request = Request,
-		 timers  = Timers,
-		 pipeline = Pipeline}) ->  
+		 request      = Request,
+		 timers       = Timers,
+		 pipeline     = Pipeline,
+		 keep_alive   = KeepAlive} = State) ->  
     ?hcrt("terminate(normal) - remote close", 
 	  [{id, Id}, {profile, ProfileName}]),
 
     %% Clobber session
     (catch httpc_manager:delete_session(Id, ProfileName)),
 
+    maybe_retry_queue(Pipeline, State),
+    maybe_retry_queue(KeepAlive, State),
+
     %% Cancel timers
-    #timers{request_timers = ReqTmrs, queue_timer = QTmr} = Timers, 
-    cancel_timer(QTmr, timeout_queue),
-    lists:foreach(fun({_, Timer}) -> cancel_timer(Timer, timeout) end, 
-		  ReqTmrs),
+    cancel_timers(Timers),
 
     %% Maybe deliver answers to requests
-    deliver_answers([Request | queue:to_list(Pipeline)]),
+    deliver_answer(Request),
 
     %% And, just in case, close our side (**really** overkill)
-    http_transport:close(socket_type(Request), Socket);
+    http_transport:close(SocketType, Socket);
 
-terminate(_, #state{session      = #tcp_session{id     = Id,
-						socket = Socket, 
-						scheme = Scheme},
+terminate(Reason, #state{session      = #session{id          = Id,
+						 socket      = Socket, 
+						 socket_type = SocketType},
 		    request      = undefined,
 		    profile_name = ProfileName,
 		    timers       = Timers,
 		    pipeline     = Pipeline,
 		    keep_alive   = KeepAlive} = State) -> 
+    ?hcrt("terminate", 
+	  [{id, Id}, {profile, ProfileName}, {reason, Reason}]),
+
+    %% Clobber session
     (catch httpc_manager:delete_session(Id, ProfileName)),
 
     maybe_retry_queue(Pipeline, State),
     maybe_retry_queue(KeepAlive, State),
 
     cancel_timer(Timers#timers.queue_timer, timeout_queue),
-    http_transport:close(socket_type(Scheme), Socket);
+    http_transport:close(SocketType, Socket);
 
 terminate(Reason, #state{request = undefined}) -> 
     ?hcrt("terminate", [{reason, Reason}]),
@@ -770,59 +777,55 @@ maybe_send_answer(#request{from = answer_sent}, _Reason, State) ->
 maybe_send_answer(Request, Answer, State) ->
     answer_request(Request, Answer, State).
 
-deliver_answers([]) ->
-    ?hcrd("deliver answer done", []),
-    ok;
-deliver_answers([#request{id = Id, from = From} = Request | Requests]) 
+deliver_answer(#request{id = Id, from = From} = Request) 
   when is_pid(From) ->
     Response = httpc_response:error(Request, socket_closed_remotely),
     ?hcrd("deliver answer", [{id, Id}, {from, From}, {response, Response}]),
-    httpc_response:send(From, Response),
-    deliver_answers(Requests);
-deliver_answers([Request|Requests]) ->
+    httpc_response:send(From, Response);
+deliver_answer(Request) ->
     ?hcrd("skip deliver answer", [{request, Request}]),
-    deliver_answers(Requests).
+    ok.
 
 
 %%--------------------------------------------------------------------
 %% Func: code_change(_OldVsn, State, Extra) -> {ok, NewState}
 %% Purpose: Convert process state when code is changed
 %%--------------------------------------------------------------------
-code_change(_, #state{request = Request, pipeline = Queue} = State, 
-	    [{from, '5.0.1'}, {to, '5.0.2'}]) ->
-    Settings = new_http_options(Request#request.settings),
-    NewRequest = Request#request{settings = Settings},
-    NewQueue = new_queue(Queue, fun new_http_options/1),
-    {ok, State#state{request = NewRequest, pipeline = NewQueue}};
-
-code_change(_, #state{request = Request, pipeline = Queue} = State, 
-	    [{from, '5.0.2'}, {to, '5.0.1'}]) ->
-    Settings = old_http_options(Request#request.settings),
-    NewRequest = Request#request{settings = Settings},
-    NewQueue = new_queue(Queue, fun old_http_options/1),
-    {ok, State#state{request = NewRequest, pipeline = NewQueue}};
+%% code_change(_, #state{request = Request, pipeline = Queue} = State, 
+%% 	    [{from, '5.0.1'}, {to, '5.0.2'}]) ->
+%%     Settings = new_http_options(Request#request.settings),
+%%     NewRequest = Request#request{settings = Settings},
+%%     NewQueue = new_queue(Queue, fun new_http_options/1),
+%%     {ok, State#state{request = NewRequest, pipeline = NewQueue}};
+
+%% code_change(_, #state{request = Request, pipeline = Queue} = State, 
+%% 	    [{from, '5.0.2'}, {to, '5.0.1'}]) ->
+%%     Settings = old_http_options(Request#request.settings),
+%%     NewRequest = Request#request{settings = Settings},
+%%     NewQueue = new_queue(Queue, fun old_http_options/1),
+%%     {ok, State#state{request = NewRequest, pipeline = NewQueue}};
 
 code_change(_, State, _) ->
     {ok, State}.
 
-new_http_options({http_options, TimeOut, AutoRedirect, SslOpts,
-		  Auth, Relaxed}) ->
-    {http_options, "HTTP/1.1", TimeOut, AutoRedirect, SslOpts,
-     Auth, Relaxed}.
-
-old_http_options({http_options, _, TimeOut, AutoRedirect,
-		  SslOpts, Auth, Relaxed}) ->
-    {http_options, TimeOut, AutoRedirect, SslOpts, Auth, Relaxed}.
-
-new_queue(Queue, Fun) ->
-    List = queue:to_list(Queue),
-    NewList = 
-	lists:map(fun(Request) ->
-			  Settings = 
-			      Fun(Request#request.settings),
-			  Request#request{settings = Settings}
-		  end, List),
-    queue:from_list(NewList).
+%% new_http_options({http_options, TimeOut, AutoRedirect, SslOpts,
+%% 		  Auth, Relaxed}) ->
+%%     {http_options, "HTTP/1.1", TimeOut, AutoRedirect, SslOpts,
+%%      Auth, Relaxed}.
+
+%% old_http_options({http_options, _, TimeOut, AutoRedirect,
+%% 		  SslOpts, Auth, Relaxed}) ->
+%%     {http_options, TimeOut, AutoRedirect, SslOpts, Auth, Relaxed}.
+
+%% new_queue(Queue, Fun) ->
+%%     List = queue:to_list(Queue),
+%%     NewList = 
+%% 	lists:map(fun(Request) ->
+%% 			  Settings = 
+%% 			      Fun(Request#request.settings),
+%% 			  Request#request{settings = Settings}
+%% 		  end, List),
+%%     queue:from_list(NewList).
     
 
 %%%--------------------------------------------------------------------
@@ -852,12 +855,18 @@ connect(SocketType, ToAddress,
 	inet6fb4 ->
 	    Opts3 = [inet6 | Opts2],
 	    case http_transport:connect(SocketType, ToAddress, Opts3, Timeout) of
-		{error, Reason} when ((Reason =:= nxdomain) orelse 
-				      (Reason =:= eafnosupport)) -> 
+		{error, _Reason} = Error ->
 		    Opts4 = [inet | Opts2], 
-		    http_transport:connect(SocketType, ToAddress, Opts4, Timeout);
-		Other ->
-		    Other
+		    case http_transport:connect(SocketType, 
+						ToAddress, Opts4, Timeout) of
+			{error, _} ->
+			    %% Reply with the "original" error
+			    Error;
+			OK ->
+			    OK
+		    end;
+		OK ->
+		    OK
 	    end;
 	_ ->
 	    Opts3 = [IpFamily | Opts2], 
@@ -878,22 +887,23 @@ connect_and_send_first_request(Address,
     ConnTimeout = Settings#http_options.connect_timeout,
     case connect(SocketType, Address, Options, ConnTimeout) of
 	{ok, Socket} ->
+	    Session = #session{id          = {OrigAddress, self()},
+			       scheme      = Scheme,
+			       socket      = Socket,
+			       socket_type = SocketType}, 
 	    ?hcrd("connected - now send first request", [{socket, Socket}]),
-	    case httpc_request:send(Address, Request, Socket) of
+	    case httpc_request:send(Address, Session, Request) of
 		ok ->
 		    ?hcrd("first request sent", []),
 		    ClientClose = 
 			httpc_request:is_client_closing(Headers),
 		    SessionType = httpc_manager:session_type(Options),
-		    Session =
-			#tcp_session{id           = {OrigAddress, self()},
-				     scheme       = Scheme,
-				     socket       = Socket,
-				     client_close = ClientClose,
-				     type         = SessionType},
+		    Session2 =
+			Session#session{client_close = ClientClose,
+					type         = SessionType},
 		    TmpState = 
 			State#state{request     = Request, 
-				    session     = Session, 
+				    session     = Session2, 
 				    mfa         = init_mfa(Request, State),
 				    status_line = init_status_line(Request),
 				    headers     = undefined,
@@ -947,21 +957,20 @@ handler_info(#state{request     = Request,
     ?hcrt("handler info", [{request_info, RequestInfo}]),
 
     %% Info about the current session/socket
-    SessionType = Session#tcp_session.type, 
-    QueueLen    = case Session#tcp_session.type of
+    SessionType = Session#session.type, 
+    QueueLen    = case SessionType of
 		      pipeline ->
 			  queue:len(Pipeline);
 		      keep_alive ->
 			  queue:len(KeepAlive)
 		  end,
-    Socket      = Session#tcp_session.socket, 
-    Scheme      = Session#tcp_session.scheme, 
-    SocketType  = socket_type(Scheme),
+    Scheme     = Session#session.scheme, 
+    Socket     = Session#session.socket, 
+    SocketType = Session#session.socket_type, 
 
     ?hcrt("handler info", [{session_type, SessionType}, 
 			   {queue_length, QueueLen}, 
 			   {scheme,       Scheme}, 
-			   {socket_type,  SocketType}, 
 			   {socket,       Socket}]),
 
     SocketOpts  = http_transport:getopts(SocketType, Socket), 
@@ -1118,9 +1127,7 @@ handle_response(#state{request      = Request,
 	    ?hcrd("handle response - continue", []),
 	    %% Send request body
 	    {_, RequestBody} = Request#request.content,
-	    http_transport:send(socket_type(Session#tcp_session.scheme), 
-					    Session#tcp_session.socket, 
-				RequestBody),
+	    send_raw(Session, RequestBody),
 	    %% Wait for next response
 	    activate_once(Session),
 	    Relaxed = (Request#request.settings)#http_options.relaxed,
@@ -1217,7 +1224,7 @@ handle_pipeline(#state{status       = pipeline,
 	    %% If a pipeline that has been idle for some time is not
 	    %% closed by the server, the client may want to close it.
 	    NewState   = activate_queue_timeout(TimeOut, State),
-	    NewSession = Session#tcp_session{queue_length = 0},
+	    NewSession = Session#session{queue_length = 0},
 	    httpc_manager:insert_session(NewSession, ProfileName),
 	    %% Note mfa will be initilized when a new request 
 	    %% arrives.
@@ -1239,9 +1246,9 @@ handle_pipeline(#state{status       = pipeline,
 		false ->
 		    ?hcrv("next request", [{request, NextRequest}]),
 		    NewSession = 
-			Session#tcp_session{queue_length =
-					    %% Queue + current
-					    queue:len(Pipeline) + 1},
+			Session#session{queue_length =
+					%% Queue + current
+					queue:len(Pipeline) + 1},
 		    httpc_manager:insert_session(NewSession, ProfileName),
 		    Relaxed = 
 			(NextRequest#request.settings)#http_options.relaxed,
@@ -1290,16 +1297,16 @@ handle_keep_alive_queue(
 	    %% If a keep_alive session has been idle for some time is not
 	    %% closed by the server, the client may want to close it.
 	    NewState = activate_queue_timeout(TimeOut, State),
-	    NewSession = Session#tcp_session{queue_length = 0},
+	    NewSession = Session#session{queue_length = 0},
 	    httpc_manager:insert_session(NewSession, ProfileName),
 	    %% Note mfa will be initilized when a new request 
 	    %% arrives.
 	    {noreply, 
-	     NewState#state{request = undefined, 
-			    mfa = undefined,
+	     NewState#state{request     = undefined, 
+			    mfa         = undefined,
 			    status_line = undefined,
-			    headers = undefined,
-			    body = undefined
+			    headers     = undefined,
+			    body        = undefined
 			   } 
 	    };
 	{{value, NextRequest}, KeepAlive} ->    
@@ -1342,10 +1349,12 @@ case_insensitive_header(Str) when is_list(Str) ->
 case_insensitive_header(Str) ->
     Str.
 
-activate_once(#tcp_session{scheme = Scheme, socket = Socket}) ->
-    SocketType = socket_type(Scheme),
+activate_once(#session{socket = Socket, socket_type = SocketType}) ->
     http_transport:setopts(SocketType, Socket, [{active, once}]).
 
+close_socket(#session{socket = Socket, socket_type = SocketType}) ->
+    http_transport:close(SocketType, Socket).
+
 activate_request_timeout(
   #state{request = #request{timer = undefined} = Request} = State) ->
     Timeout = (Request#request.settings)#http_options.timeout,
@@ -1378,7 +1387,7 @@ activate_queue_timeout(Time, State) ->
     State#state{timers = #timers{queue_timer = Ref}}.
 
 
-is_pipeline_enabled_client(#tcp_session{type = pipeline}) ->
+is_pipeline_enabled_client(#session{type = pipeline}) ->
     true;
 is_pipeline_enabled_client(_) ->
     false.
@@ -1391,7 +1400,7 @@ is_keep_alive_enabled_server("HTTP/1.0",
 is_keep_alive_enabled_server(_,_) ->
     false.
 
-is_keep_alive_connection(Headers, #tcp_session{client_close = ClientClose}) ->
+is_keep_alive_connection(Headers, #session{client_close = ClientClose}) ->
     (not ((ClientClose) orelse httpc_response:is_server_closing(Headers))).
 
 try_to_enable_pipeline_or_keep_alive(
@@ -1416,7 +1425,7 @@ try_to_enable_pipeline_or_keep_alive(
 		    httpc_manager:insert_session(Session, ProfileName),
 		    %% Make sure type is keep_alive in session
 		    %% as it in this case might be pipeline
-		    NewSession = Session#tcp_session{type = keep_alive}, 
+		    NewSession = Session#session{type = keep_alive}, 
 		    State#state{status  = keep_alive,
 				session = NewSession}
 	    end;
@@ -1438,6 +1447,12 @@ answer_request(#request{id = RequestId, from = From} = Request, Msg,
 		timers = 
 		Timers#timers{request_timers =
 			      lists:delete(Timer, RequestTimers)}}.
+
+cancel_timers(#timers{request_timers = ReqTmrs, queue_timer = QTmr}) ->
+    cancel_timer(QTmr, timeout_queue),
+    CancelTimer = fun({_, Timer}) -> cancel_timer(Timer, timeout) end, 
+    lists:foreach(CancelTimer, ReqTmrs).
+
 cancel_timer(undefined, _) ->
     ok;
 cancel_timer(Timer, TimeoutMsg) ->
@@ -1551,11 +1566,11 @@ init_status_line(#request{settings = Settings}) ->
 socket_type(#request{scheme = http}) ->
     ip_comm;
 socket_type(#request{scheme = https, settings = Settings}) ->
-    {ssl, Settings#http_options.ssl};
-socket_type(http) ->
-    ip_comm;
-socket_type(https) ->
-    {ssl, []}. %% Dummy value ok for ex setopts that does not use this value
+    Settings#http_options.ssl.
+%% socket_type(http) ->
+%%     ip_comm;
+%% socket_type(https) ->
+%%     {ssl1, []}. %% Dummy value ok for ex setopts that does not use this value
 
 start_stream({_Version, _Code, _ReasonPhrase}, _Headers, 
 	     #request{stream = none} = Request) ->
@@ -1624,18 +1639,15 @@ end_stream(SL, R) ->
 
 
 next_body_chunk(#state{request = #request{stream = {self, once}}, 
-		       once = once, session = Session} = State) ->
-    http_transport:setopts(socket_type(Session#tcp_session.scheme), 
-			   Session#tcp_session.socket, 
-			   [{active, once}]),
+		       once    = once, 
+		       session = Session} = State) ->
+    activate_once(Session), 
     State#state{once = inactive};
 next_body_chunk(#state{request = #request{stream = {self, once}}, 
 		       once = inactive} = State) ->
     State; %% Wait for user to call stream_next
 next_body_chunk(#state{session = Session} = State) ->
-    http_transport:setopts(socket_type(Session#tcp_session.scheme), 
-			   Session#tcp_session.socket, 
-			   [{active, once}]),
+    activate_once(Session), 
     State.
 
 handle_verbose(verbose) ->
@@ -1712,6 +1724,11 @@ handle_verbose(_) ->
 %%     ok.
 
 
+send_raw(#session{socket = Socket, socket_type = SocketType}, Body) ->
+    http_transport:send(SocketType, Socket, Body).
+
+
+
 call(Msg, Pid) ->
     Timeout = infinity,
     call(Msg, Pid, Timeout).
diff --git a/lib/inets/src/http_client/httpc_internal.hrl b/lib/inets/src/http_client/httpc_internal.hrl
index 4d76c4beb3..1d8a5b6a92 100644
--- a/lib/inets/src/http_client/httpc_internal.hrl
+++ b/lib/inets/src/http_client/httpc_internal.hrl
@@ -18,7 +18,11 @@
 %%
 %%
 
--include("inets_internal.hrl").
+-ifndef(httpc_internal_hrl).
+-define(httpc_internal_hrl, true).
+
+-include_lib("inets/src/inets_app/inets_internal.hrl").
+
 -define(SERVICE, httpc).
 -define(hcri(Label, Data), ?report_important(Label, ?SERVICE, Data)).
 -define(hcrv(Label, Data), ?report_verbose(Label,   ?SERVICE, Data)).
@@ -56,7 +60,11 @@
 	  relaxed = false, 
 
 	  %% integer() - ms before a connect times out
-	  connect_timeout = ?HTTP_REQUEST_CTIMEOUT  
+	  connect_timeout = ?HTTP_REQUEST_CTIMEOUT,
+
+	  %% bool() - Use %-encoding rfc 2396
+	  url_encode
+
 	 }
        ).
 
@@ -104,13 +112,14 @@
 	}
        ).               
 
--record(tcp_session,
+-record(session,
 	{
 	  id,           % {{Host, Port}, HandlerPid}
 	  client_close, % true | false
 	  scheme,       % http (HTTP/TCP) | https (HTTP/SSL/TCP)
 	  socket,       % Open socket, used by connection
-	  queue_length = 1, % Current length of pipeline or keep alive queue  
+	  socket_type,  % socket-type, used by connection
+	  queue_length = 1, % Current length of pipeline or keep-alive queue  
 	  type          % pipeline | keep_alive (wait for response before sending new request) 
 	 }).
 
@@ -138,3 +147,6 @@
 %% 	  path,   % string()
 %% 	  q       % query: string()
 %% 	 }).
+
+
+-endif. % -ifdef(httpc_internal_hrl).
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl
index b278077a66..591cb78c29 100644
--- a/lib/inets/src/http_client/httpc_manager.erl
+++ b/lib/inets/src/http_client/httpc_manager.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2002-2010. 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%
 %%
 %%
@@ -21,8 +21,8 @@
 
 -behaviour(gen_server).
 
+-include_lib("inets/src/http_lib/http_internal.hrl").
 -include("httpc_internal.hrl").
--include("http_internal.hrl").
 
 %% Internal Application API
 -export([
@@ -66,15 +66,6 @@
 	  state    % State of the handler: initiating | started | operational | canceled
 	 }).
 
-%% Entries in the handler / request cross-ref table
-%% -record(request_info, 
-%% 	{
-%% 	  id,      % Id of the request
-%% 	  handler, % Pid of the handler process
-%% 	  from,    % The From value for the caller
-%% 	  mref     % Monitor ref for the caller
-%% 	 }).
-
 
 %%====================================================================
 %% Internal Application API
@@ -333,7 +324,7 @@ do_init(ProfileName, CookiesDir) ->
     ?hcrt("create session db", []),
     SessionDbName = session_db_name(ProfileName), 
     ets:new(SessionDbName, 
-	    [public, set, named_table, {keypos, #tcp_session.id}]),
+	    [public, set, named_table, {keypos, #session.id}]),
 
     %% Create handler db
     ?hcrt("create handler/request db", []),
@@ -577,7 +568,9 @@ handle_info({'EXIT', Pid, Reason}, #state{handler_db = HandlerDb} = State) ->
 handle_info({'DOWN', _, _, Pid, _}, State) ->
     
     %% 
-    %% Check what happens to waiting requests! Chall we not send a reply?
+    %% Normally this should have been cleaned up already
+    %% (when receiving {request_done, PequestId}), but
+    %% just in case there is a glitch, cleanup anyway.
     %% 
 
     Pattern = #handler_info{handler = Pid, _ = '_'}, 
@@ -649,7 +642,16 @@ get_handler_info(Tab) ->
 		Acc
 	end,
     Handlers2 = lists:foldl(F, [], Handlers1),
-    Handlers3 = [{Pid, State, httpc_handler:info(Pid)} || 
+    Handlers3 = [{Pid, State, 
+		  case (catch httpc_handler:info(Pid)) of
+		      {'EXIT', _} -> 
+			  %% Why would this crash? 
+			  %% Only if the process has died, but we don't 
+			  %% know about it?
+			  [];
+		      Else ->
+			  Else
+		  end} || 
 		    {Pid, State} <- Handlers2],
     Handlers3.
 
@@ -666,6 +668,10 @@ handle_started(StarterPid, ReqId, HandlerPid,
     case ets:lookup(HandlerDb, ReqId) of
 	[#handler_info{state = initiating} = HandlerInfo] ->
 	    ?hcri("received started ack for initiating handler", []),
+	    %% As a last resort, make sure we know when it exits,
+	    %% in case it forgets to notify us.
+	    %% We dont need to know the ref id?
+	    erlang:monitor(process, HandlerPid),
 	    HandlerInfo2 = HandlerInfo#handler_info{handler = HandlerPid,
 						    state   = started}, 
 	    ets:insert(HandlerDb, HandlerInfo2),
@@ -728,10 +734,11 @@ handle_connect_and_send(_StarterPid, ReqId, HandlerPid, Result,
 	    ok;
 
 	[] ->
-	    error_report(Profile, 
-			 "handler (~p) successfully started "
-			 "for unknown request ~p => canceling",
-			 [HandlerPid, ReqId]),
+	    ?hcri("handler successfully started "
+		  "for unknown request => canceling",
+		  [{profile, Profile}, 
+		   {handler, HandlerPid}, 
+		   {request, ReqId}]),
 	    httpc_handler:cancel(ReqId, HandlerPid)
     end.
 
@@ -876,12 +883,12 @@ select_session(Method, HostPort, Scheme, SessionType,
 	    %% client_close, scheme and type specified. 
 	    %% The fields id (part of: HandlerPid) and queue_length
 	    %% specified.
-	    Pattern = #tcp_session{id           = {HostPort, '$1'},
-				   client_close = false,
-				   scheme       = Scheme,
-				   socket       = '_',
-				   queue_length = '$2',
-				   type         = SessionType},
+	    Pattern = #session{id           = {HostPort, '$1'},
+			       client_close = false,
+			       scheme       = Scheme,
+			       queue_length = '$2',
+			       type         = SessionType,
+			       _            = '_'},
 	    %% {'_', {HostPort, '$1'}, false, Scheme, '_', '$2', SessionTyp}, 
 	    Candidates = ets:match(SessionDb, Pattern), 
 	    ?hcrd("select session", [{host_port,  HostPort}, 
diff --git a/lib/inets/src/http_client/httpc_request.erl b/lib/inets/src/http_client/httpc_request.erl
index 55e0af4b42..d4df97ad40 100644
--- a/lib/inets/src/http_client/httpc_request.erl
+++ b/lib/inets/src/http_client/httpc_request.erl
@@ -19,12 +19,13 @@
 
 -module(httpc_request).
 
--include("http_internal.hrl").
+-include_lib("inets/src/http_lib/http_internal.hrl").
 -include("httpc_internal.hrl").
 
 %%% Internal API
 -export([send/3, is_idempotent/1, is_client_closing/1]).
 
+
 %%%=========================================================================
 %%%  Internal application API
 %%%=========================================================================
@@ -39,10 +40,9 @@
 %%                                   
 %% Description: Composes and sends a HTTP-request. 
 %%-------------------------------------------------------------------------
-send(SendAddr, #request{scheme = Scheme, socket_opts = SocketOpts} = Request, 
-     Socket) 
+send(SendAddr, #session{socket = Socket, socket_type = SocketType}, 
+     #request{socket_opts = SocketOpts} = Request) 
   when is_list(SocketOpts) -> 
-    SocketType = socket_type(Scheme), 
     case http_transport:setopts(SocketType, Socket, SocketOpts) of
 	ok ->
 	    send(SendAddr, Socket, SocketType, 
@@ -50,8 +50,7 @@ send(SendAddr, #request{scheme = Scheme, socket_opts = SocketOpts} = Request,
 	{error, Reason} ->
 	    {error, {setopts_failed, Reason}}
     end;
-send(SendAddr, #request{scheme = Scheme} = Request, Socket) ->
-    SocketType = socket_type(Scheme), 
+send(SendAddr, #session{socket = Socket, socket_type = SocketType}, Request) ->
     send(SendAddr, Socket, SocketType, Request).
     
 send(SendAddr, Socket, SocketType, 
@@ -209,10 +208,6 @@ headers(_, "HTTP/0.9") ->
 headers(Headers, _) ->
     Headers.
 
-socket_type(http) ->
-    ip_comm;
-socket_type(https) ->
-    {ssl, []}.
 
 http_headers([], Headers) ->
     lists:flatten(Headers);
diff --git a/lib/inets/src/http_client/httpc_response.erl b/lib/inets/src/http_client/httpc_response.erl
index df7d40a33e..207b96271c 100644
--- a/lib/inets/src/http_client/httpc_response.erl
+++ b/lib/inets/src/http_client/httpc_response.erl
@@ -19,10 +19,12 @@
 
 -module(httpc_response).
 
--include("http_internal.hrl").
+-include_lib("inets/src/http_lib/http_internal.hrl").
 -include("httpc_internal.hrl").
 
 %% API
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([parse/1, result/2, send/2, error/2, is_server_closing/1, 
 	 stream_start/3]).
 
diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile
index 7f4c92861c..aaf3cfb995 100644
--- a/lib/inets/src/http_lib/Makefile
+++ b/lib/inets/src/http_lib/Makefile
@@ -45,7 +45,8 @@ MODULES = \
 	http_transport\
 	http_util \
 	http_request \
-	http_response
+	http_response \
+	http_uri
 
 HRL_FILES = http_internal.hrl
 
@@ -55,24 +56,16 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 
 # ----------------------------------------------------
-# INETS FLAGS
-# ----------------------------------------------------
-INETS_FLAGS = -D'SERVER_SOFTWARE="$(APPLICATION)/$(VSN)"'
-
-
-# ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-INETS_ERL_FLAGS +=  -I ../inets_app
 
-ifeq ($(WARN_UNUSED_WARS),true)
-ERL_COMPILE_FLAGS += +warn_unused_vars
-endif
+include ../inets_app/inets.mk
 
-ERL_COMPILE_FLAGS += $(INETS_ERL_FLAGS) \
-		     $(INETS_FLAGS) \
-                     +'{parse_transform,sys_pre_attributes}' \
-                     +'{attribute,insert,app_vsn,$(APP_VSN)}'
+ERL_COMPILE_FLAGS += \
+	$(INETS_FLAGS) \
+	$(INETS_ERL_COMPILE_FLAGS) \
+	-I../../include \
+	-I../inets_app
 
 
 # ----------------------------------------------------
@@ -94,9 +87,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  $(RELSYSDIR)/src
+	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_lib
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_lib
+	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
 release_docs_spec:
diff --git a/lib/inets/src/http_lib/http_internal.hrl b/lib/inets/src/http_lib/http_internal.hrl
index bb2e831727..5440f214b5 100644
--- a/lib/inets/src/http_lib/http_internal.hrl
+++ b/lib/inets/src/http_lib/http_internal.hrl
@@ -1,28 +1,37 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2002-2010. 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%
 %%
 %%
 
--include("inets_internal.hrl").
+-ifndef(http_internal_hrl).
+-define(http_internal_hrl, true).
 
--define(HTTP_MAX_BODY_SIZE, nolimit).
+-include_lib("inets/src/inets_app/inets_internal.hrl").
+
+-define(HTTP_MAX_BODY_SIZE,   nolimit).
 -define(HTTP_MAX_HEADER_SIZE, 10240).
--define(HTTP_MAX_URI_SIZE, nolimit).
+-define(HTTP_MAX_URI_SIZE,    nolimit).
+
+-ifndef(HTTP_DEFAULT_SSL_KIND).
+-define(HTTP_DEFAULT_SSL_KIND, ossl).
+%% -define(HTTP_DEFAULT_SSL_KIND, essl).
+-endif. % -ifdef(HTTP_DEFAULT_SSL_KIND).
+
 
 %%% Response headers
 -record(http_response_h,{
@@ -106,3 +115,5 @@
  	  'last-modified',
 	  other=[]        % list() - Key/Value list with other headers
 	 }).
+
+-endif. % -ifdef(http_internal_hrl).
diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl
index 7c2ac626e6..0024d19fc1 100644
--- a/lib/inets/src/http_lib/http_transport.erl
+++ b/lib/inets/src/http_lib/http_transport.erl
@@ -36,7 +36,9 @@
 
 -export([negotiate/3]).
 
--include("inets_internal.hrl").
+-include_lib("inets/src/inets_app/inets_internal.hrl").
+-include("http_internal.hrl").
+
 -define(SERVICE, httpl).
 -define(hlri(Label, Content), ?report_important(Label, ?SERVICE, Content)).
 -define(hlrv(Label, Content), ?report_verbose(Label,   ?SERVICE, Content)).
@@ -55,6 +57,18 @@
 %% Description: Makes sure inet_db or ssl is started. 
 %%-------------------------------------------------------------------------
 start(ip_comm) ->
+    do_start_ip_comm();
+
+%% This is just for backward compatibillity
+start({ssl, _}) ->
+    do_start_ssl();
+start({ossl, _}) ->
+    do_start_ssl();
+start({essl, _}) ->
+    do_start_ssl().
+
+
+do_start_ip_comm() ->
     case inet_db:start() of
 	{ok, _} ->
 	    ok;
@@ -62,8 +76,9 @@ start(ip_comm) ->
 	    ok;
 	Error ->
 	    Error
-    end;
-start({ssl, _}) ->
+    end.
+
+do_start_ssl() ->
     case ssl:start() of
 	ok ->
 	    ok;
@@ -97,18 +112,26 @@ connect(ip_comm = _SocketType, {Host, Port}, Opts0, Timeout)
 	  [{host, Host}, {port, Port}, {opts, Opts}, {timeout, Timeout}]),
     gen_tcp:connect(Host, Port, Opts, Timeout);
 
-connect({ssl, SslConfig}, {Host, Port}, _, Timeout) ->
-    Opts = [binary, {active, false}] ++ SslConfig,
-    ?hlrt("connect using ssl", 
-	  [{host, Host}, {port, Port}, {ssl_config, SslConfig}, 
-	   {timeout, Timeout}]),
+%% Wrapper for backaward compatibillity
+connect({ssl, SslConfig}, Address, Opts, Timeout) ->
+    connect({?HTTP_DEFAULT_SSL_KIND, SslConfig}, Address, Opts, Timeout);
+
+connect({ossl, SslConfig}, {Host, Port}, _, Timeout) ->
+    Opts = [binary, {active, false}, {ssl_imp, old}] ++ SslConfig,
+    ?hlrt("connect using ossl", 
+	  [{host,       Host}, 
+	   {port,       Port}, 
+	   {ssl_config, SslConfig}, 
+	   {timeout,    Timeout}]),
     ssl:connect(Host, Port, Opts, Timeout);
 
-connect({erl_ssl, SslConfig}, {Host, Port}, _, Timeout) ->
+connect({essl, SslConfig}, {Host, Port}, _, Timeout) ->
     Opts = [binary, {active, false}, {ssl_imp, new}] ++ SslConfig,
-    ?hlrt("connect using erl_ssl", 
-	  [{host, Host}, {port, Port}, {ssl_config, SslConfig}, 
-	   {timeout, Timeout}]),
+    ?hlrt("connect using essl", 
+	  [{host,       Host}, 
+	   {port,       Port}, 
+	   {ssl_config, SslConfig}, 
+	   {timeout,    Timeout}]),
     ssl:connect(Host, Port, Opts, Timeout).
 
 
@@ -136,13 +159,32 @@ listen(ip_comm, Addr, Port) ->
 	    Else
     end;
 
-listen({ssl, SSLConfig} = Ssl, Addr, Port) ->
+%% Wrapper for backaward compatibillity
+listen({ssl, SSLConfig}, Addr, Port) ->
+    ?hlrt("listen (wrapper)", 
+	  [{addr,       Addr}, 
+	   {port,       Port}, 
+	   {ssl_config, SSLConfig}]),
+    listen({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Addr, Port);
+
+listen({ossl, SSLConfig} = Ssl, Addr, Port) ->
+    ?hlrt("listen (ossl)", 
+	  [{addr,       Addr}, 
+	   {port,       Port}, 
+	   {ssl_config, SSLConfig}]),
     Opt = sock_opt(Ssl, Addr, SSLConfig),
-    ssl:listen(Port, Opt);
-
-listen({erl_ssl, SSLConfig} = Ssl, Addr, Port) ->
+    ?hlrt("listen options", [{opt, Opt}]),
+    ssl:listen(Port, [{ssl_imp, old} | Opt]);
+
+listen({essl, SSLConfig} = Ssl, Addr, Port) ->
+    ?hlrt("listen (essl)", 
+	  [{addr,       Addr}, 
+	   {port,       Port}, 
+	   {ssl_config, SSLConfig}]),
     Opt = sock_opt(Ssl, Addr, SSLConfig),
-    ssl:listen(Port, [{ssl_imp, new} | Opt]).
+    ?hlrt("listen options", [{opt, Opt}]),
+    Opt2 = [{ssl_imp, new}, {reuseaddr, true} | Opt], 
+    ssl:listen(Port, Opt2).
 
 
 listen_ip_comm(Addr, Port) ->
@@ -150,24 +192,31 @@ listen_ip_comm(Addr, Port) ->
     case IpFamily of
 	inet6fb4 -> 
 	    Opts2 = [inet6 | Opts], 
+	    ?hlrt("try ipv6 listen", [{port, NewPort}, {opts, Opts2}]),
 	    case (catch gen_tcp:listen(NewPort, Opts2)) of
 		{error, Reason} when ((Reason =:= nxdomain) orelse 
 				      (Reason =:= eafnosupport)) ->
 		    Opts3 = [inet | Opts], 
+		    ?hlrt("ipv6 listen failed - try ipv4 instead", 
+			  [{reason, Reason}, {port, NewPort}, {opts, Opts3}]),
 		    gen_tcp:listen(NewPort, Opts3);
 
 		%% This is when a given hostname has resolved to a 
 		%% IPv4-address. The inet6-option together with a 
 		%% {ip, IPv4} option results in badarg
-		{'EXIT', _} -> 
+		{'EXIT', Reason} -> 
 		    Opts3 = [inet | Opts], 
+		    ?hlrt("ipv6 listen exit - try ipv4 instead", 
+			  [{reason, Reason}, {port, NewPort}, {opts, Opts3}]),
 		    gen_tcp:listen(NewPort, Opts3); 
 
 		Other ->
+		    ?hlrt("ipv6 listen done", [{other, Other}]),
 		    Other
 	    end;
 	_ ->
 	    Opts2 = [IpFamily | Opts],
+	    ?hlrt("listen", [{port, NewPort}, {opts, Opts2}]),
 	    gen_tcp:listen(NewPort, Opts2)
     end.
 
@@ -228,9 +277,17 @@ ip_family_of(IpFamilyStr) ->
 %%-------------------------------------------------------------------------
 accept(SocketType, ListenSocket) ->
     accept(SocketType, ListenSocket, infinity).
+
 accept(ip_comm, ListenSocket, Timeout) ->
     gen_tcp:accept(ListenSocket, Timeout);
-accept({ssl,_SSLConfig}, ListenSocket, Timeout) ->
+
+%% Wrapper for backaward compatibillity
+accept({ssl, SSLConfig}, ListenSocket, Timeout) ->
+    accept({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, ListenSocket, Timeout);
+
+accept({ossl, _SSLConfig}, ListenSocket, Timeout) ->
+    ssl:transport_accept(ListenSocket, Timeout);
+accept({essl, _SSLConfig}, ListenSocket, Timeout) ->
     ssl:transport_accept(ListenSocket, Timeout).
 
 
@@ -244,7 +301,15 @@ accept({ssl,_SSLConfig}, ListenSocket, Timeout) ->
 %%-------------------------------------------------------------------------
 controlling_process(ip_comm, Socket, NewOwner) ->
     gen_tcp:controlling_process(Socket, NewOwner);
-controlling_process({ssl, _}, Socket, NewOwner) ->
+
+%% Wrapper for backaward compatibillity
+controlling_process({ssl, SSLConfig}, Socket, NewOwner) ->
+    controlling_process({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, NewOwner);
+
+controlling_process({ossl, _}, Socket, NewOwner) ->
+    ssl:controlling_process(Socket, NewOwner);
+
+controlling_process({essl, _}, Socket, NewOwner) ->
     ssl:controlling_process(Socket, NewOwner).
 
 
@@ -259,9 +324,23 @@ controlling_process({ssl, _}, Socket, NewOwner) ->
 setopts(ip_comm, Socket, Options) ->
     ?hlrt("ip_comm setopts", [{socket, Socket}, {options, Options}]),
     inet:setopts(Socket, Options);
-setopts({ssl, _}, Socket, Options) ->
-    ?hlrt("ssl setopts", [{socket, Socket}, {options, Options}]),
-    ssl:setopts(Socket, Options).
+
+%% Wrapper for backaward compatibillity
+setopts({ssl, SSLConfig}, Socket, Options) ->
+    setopts({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, Options);
+
+setopts({ossl, _}, Socket, Options) ->
+    ?hlrt("[o]ssl setopts", [{socket, Socket}, {options, Options}]),
+    Reason = (catch ssl:setopts(Socket, Options)),
+    ?hlrt("[o]ssl setopts result", [{reason, Reason}]),
+    Reason;
+	
+
+setopts({essl, _}, Socket, Options) ->
+    ?hlrt("[e]ssl setopts", [{socket, Socket}, {options, Options}]),
+    Reason = (catch ssl:setopts(Socket, Options)),
+    ?hlrt("[e]ssl setopts result", [{reason, Reason}]),
+    Reason.
 
 
 %%-------------------------------------------------------------------------
@@ -283,15 +362,27 @@ getopts(ip_comm, Socket, Options) ->
 	{error, _} -> 
 	    []
     end;
-getopts({ssl, _}, Socket, Options) ->
+
+%% Wrapper for backaward compatibillity
+getopts({ssl, SSLConfig}, Socket, Options) ->
+    getopts({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, Options);
+
+getopts({ossl, _}, Socket, Options) ->
     ?hlrt("ssl getopts", [{socket, Socket}, {options, Options}]),
+    getopts_ssl(Socket, Options);
+
+getopts({essl, _}, Socket, Options) ->
+    ?hlrt("essl getopts", [{socket, Socket}, {options, Options}]),
+    getopts_ssl(Socket, Options).
+
+getopts_ssl(Socket, Options) ->
     case ssl:getopts(Socket, Options) of
 	{ok, SocketOpts} ->
 	    SocketOpts;
 	{error, _} -> 
 	    []
     end.
-
+    
 
 %%-------------------------------------------------------------------------
 %% getstat(SocketType, Socket) -> socket_stats()
@@ -308,8 +399,15 @@ getstat(ip_comm = _SocketType, Socket) ->
 	{error, _} ->
 	    []
     end;
-getstat({ssl, _} = _SocketType, _Socket) ->
-    %% ?hlrt("ssl getstat", [{socket, Socket}]),
+
+%% Wrapper for backaward compatibillity
+getstat({ssl, SSLConfig}, Socket) ->
+    getstat({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket);
+
+getstat({ossl, _} = _SocketType, _Socket) ->
+    [];
+
+getstat({essl, _} = _SocketType, _Socket) ->
     [].
 
 
@@ -322,7 +420,15 @@ getstat({ssl, _} = _SocketType, _Socket) ->
 %%-------------------------------------------------------------------------
 send(ip_comm, Socket, Message) ->
     gen_tcp:send(Socket, Message);
-send({ssl, _}, Socket, Message) ->
+
+%% Wrapper for backaward compatibillity
+send({ssl, SSLConfig}, Socket, Message) ->
+    send({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, Message);
+
+send({ossl, _}, Socket, Message) ->
+    ssl:send(Socket, Message);
+
+send({essl, _}, Socket, Message) ->
     ssl:send(Socket, Message).
 
 
@@ -335,9 +441,18 @@ send({ssl, _}, Socket, Message) ->
 %%-------------------------------------------------------------------------
 close(ip_comm, Socket) ->
     gen_tcp:close(Socket);
-close({ssl, _}, Socket) ->
+
+%% Wrapper for backaward compatibillity
+close({ssl, SSLConfig}, Socket) ->
+    close({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket);
+
+close({ossl, _}, Socket) ->
+    ssl:close(Socket);
+
+close({essl, _}, Socket) ->
     ssl:close(Socket).
 
+
 %%-------------------------------------------------------------------------
 %% peername(SocketType, Socket) -> {Port, SockName}
 %%     SocketType = ip_comm | {ssl, _}
@@ -368,7 +483,17 @@ peername(ip_comm, Socket) ->
 	    {-1, "unknown"}
     end;
 
-peername({ssl, _}, Socket) ->
+%% Wrapper for backaward compatibillity
+peername({ssl, SSLConfig}, Socket) ->
+    peername({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket);
+
+peername({ossl, _}, Socket) ->
+    peername_ssl(Socket);
+
+peername({essl, _}, Socket) ->
+    peername_ssl(Socket).
+
+peername_ssl(Socket) ->
     case ssl:peername(Socket) of
 	{ok,{{A, B, C, D}, Port}} ->
 	    PeerName = integer_to_list(A)++"."++integer_to_list(B)++"."++
@@ -409,7 +534,17 @@ sockname(ip_comm, Socket) ->
 	    {-1, "unknown"}
     end;
 
-sockname({ssl, _}, Socket) ->
+%% Wrapper for backaward compatibillity
+sockname({ssl, SSLConfig}, Socket) ->
+    sockname({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket);
+
+sockname({ossl, _}, Socket) ->
+    sockname_ssl(Socket);
+
+sockname({essl, _}, Socket) ->
+    sockname_ssl(Socket).
+
+sockname_ssl(Socket) ->
     case ssl:sockname(Socket) of
 	{ok,{{A, B, C, D}, Port}} ->
 	    SockName = integer_to_list(A)++"."++integer_to_list(B)++"."++
@@ -455,22 +590,31 @@ sock_opt2(Opts) ->
     [{packet, 0}, {active, false} | Opts].
 
 negotiate(ip_comm,_,_) ->
+    ?hlrt("negotiate(ip_comm)", []),
     ok;
-negotiate({ssl,_},Socket,Timeout) ->
-    negotiate(Socket, Timeout);
-negotiate({erl_ssl, _}, Socket, Timeout) ->
-    negotiate(Socket, Timeout).
-
-negotiate(Socket, Timeout) ->
+negotiate({ssl, SSLConfig}, Socket, Timeout) ->
+    ?hlrt("negotiate(ssl)", []),
+    negotiate({?HTTP_DEFAULT_SSL_KIND, SSLConfig}, Socket, Timeout);
+negotiate({ossl, _}, Socket, Timeout) ->
+    ?hlrt("negotiate(ossl)", []),
+    negotiate_ssl(Socket, Timeout);
+negotiate({essl, _}, Socket, Timeout) ->
+    ?hlrt("negotiate(essl)", []),
+    negotiate_ssl(Socket, Timeout).
+
+negotiate_ssl(Socket, Timeout) ->
+    ?hlrt("negotiate_ssl", [{socket, Socket}, {timeout, Timeout}]),
     case ssl:ssl_accept(Socket, Timeout) of
 	ok ->
 	    ok;
-	{error, Error} ->
-	    case lists:member(Error,
-			      [timeout,econnreset,esslaccept,esslerrssl]) of
+	{error, Reason} ->
+	    ?hlrd("negotiate_ssl - accept failed", [{reason, Reason}]),
+	    %% Look for "valid" error reasons
+	    ValidReasons = [timeout, econnreset, esslaccept, esslerrssl], 
+	    case lists:member(Reason, ValidReasons) of
 		true ->
-		    {error,normal};
+		    {error, normal};
 		false ->
-		    {error, Error}
+		    {error, Reason}
            end
     end.
diff --git a/lib/inets/src/http_client/http_uri.erl b/lib/inets/src/http_lib/http_uri.erl
index 615a0d8ec4..44b9face0b 100644
--- a/lib/inets/src/http_client/http_uri.erl
+++ b/lib/inets/src/http_lib/http_uri.erl
@@ -1,26 +1,26 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2006-2010. 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(http_uri).
 
--export([parse/1]).
+-export([parse/1, encode/1, decode/1]).
 
 %%%=========================================================================
 %%%  API
@@ -34,10 +34,25 @@ parse(AbsURI) ->
 		{UserInfo, Host, Port, Path, Query} ->
 		    {Scheme, UserInfo, Host, Port, Path, Query};
 		_  ->
-		    {error, {malformed_url, AbsURI}}    
+		    {error, {malformed_url, AbsURI}}
 	    end
     end.
 
+encode(URI) ->
+    Reserved = sets:from_list([$;, $:, $@, $&, $=, $+, $,, $/, $?,
+			       $#, $[, $], $<, $>, $\", ${, $}, $|,
+			       $\\, $', $^, $%, $ ]),
+    lists:append(lists:map(fun(Char) ->
+				   uri_encode(Char, Reserved)
+			   end, URI)).
+
+decode([$%,Hex1,Hex2|Rest]) ->
+    [hex2dec(Hex1)*16+hex2dec(Hex2)|decode(Rest)];
+decode([First|Rest]) ->
+    [First|decode(Rest)];
+decode([]) ->
+    [].
+
 %%%========================================================================
 %%% Internal functions
 %%%========================================================================
@@ -56,7 +71,7 @@ parse_scheme(AbsURI) ->
 
 parse_uri_rest(Scheme, "//" ++ URIPart) ->
 
-    {Authority, PathQuery} = 
+    {Authority, PathQuery} =
 	case split_uri(URIPart, "/", URIPart, 1, 0) of
 	    Split = {_, _} ->
 		Split;
@@ -68,7 +83,7 @@ parse_uri_rest(Scheme, "//" ++ URIPart) ->
 			{URIPart,""}
 		end
 	end,
-    
+
     {UserInfo, HostPort} = split_uri(Authority, "@", {"", Authority}, 1, 1),
     {Host, Port} = parse_host_port(Scheme, HostPort),
     {Path, Query} = parse_path_query(PathQuery),
@@ -78,7 +93,6 @@ parse_uri_rest(Scheme, "//" ++ URIPart) ->
 parse_path_query(PathQuery) ->
     {Path, Query} =  split_uri(PathQuery, "\\?", {PathQuery, ""}, 1, 0),
     {path(Path), Query}.
-    
 
 parse_host_port(Scheme,"[" ++ HostPort) -> %ipv6
     DefaultPort = default_port(Scheme),
@@ -90,12 +104,12 @@ parse_host_port(Scheme, HostPort) ->
     DefaultPort = default_port(Scheme),
     {Host, Port} = split_uri(HostPort, ":", {HostPort, DefaultPort}, 1, 1),
     {Host, int_port(Port)}.
-    
+
 split_uri(UriPart, SplitChar, NoMatchResult, SkipLeft, SkipRight) ->
     case inets_regexp:first_match(UriPart, SplitChar) of
 	{match, Match, _} ->
 	    {string:substr(UriPart, 1, Match - SkipLeft),
-	     string:substr(UriPart, Match + SkipRight, length(UriPart))}; 
+	     string:substr(UriPart, Match + SkipRight, length(UriPart))};
 	nomatch ->
 	    NoMatchResult
     end.
@@ -114,3 +128,15 @@ path("") ->
     "/";
 path(Path) ->
     Path.
+
+uri_encode(Char, Reserved) ->
+    case sets:is_element(Char, Reserved) of
+	true ->
+	    [ $% | http_util:integer_to_hexlist(Char)];
+	false ->
+	    [Char]
+    end.
+
+hex2dec(X) when (X>=$0) andalso (X=<$9) -> X-$0;
+hex2dec(X) when (X>=$A) andalso (X=<$F) -> X-$A+10;
+hex2dec(X) when (X>=$a) andalso (X=<$f) -> X-$a+10.
diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
index ce1405011e..55cc68dede 100644
--- a/lib/inets/src/http_server/Makefile
+++ b/lib/inets/src/http_server/Makefile
@@ -82,7 +82,7 @@ MODULES = \
 	mod_security \
 	mod_security_server
 
-HRL_FILES = httpd.hrl httpd_internal.hrl mod_auth.hrl 
+HRL_FILES = httpd.hrl httpd_internal.hrl mod_auth.hrl
 
 ERL_FILES = $(MODULES:%=%.erl)
 
@@ -90,20 +90,16 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 
 # ----------------------------------------------------
-# INETS FLAGS
-# ----------------------------------------------------
-INETS_FLAGS = -D'SERVER_SOFTWARE="$(APPLICATION)/$(VSN)"' 
-
-
-# ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-INETS_ERL_FLAGS += -I ../http_lib -I ../inets_app -pa ../../ebin
 
-ERL_COMPILE_FLAGS += $(INETS_ERL_FLAGS) \
-		     $(INETS_FLAGS) \
-                     +'{parse_transform,sys_pre_attributes}' \
-                     +'{attribute,insert,app_vsn,$(APP_VSN)}'
+include ../inets_app/inets.mk
+
+ERL_COMPILE_FLAGS += \
+	$(INETS_FLAGS) \
+	$(INETS_ERL_COMPILE_FLAGS) \
+	-I../inets_app \
+	-I../http_lib  \
 
 
 # ----------------------------------------------------
@@ -125,9 +121,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  $(RELSYSDIR)/src
+	$(INSTALL_DIR)  $(RELSYSDIR)/src/http_server
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/http_server
+	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
 release_docs_spec:
diff --git a/lib/inets/src/http_server/httpd.erl b/lib/inets/src/http_server/httpd.erl
index 8fe54ccef6..93608dbf96 100644
--- a/lib/inets/src/http_server/httpd.erl
+++ b/lib/inets/src/http_server/httpd.erl
@@ -24,54 +24,24 @@
 
 -include("httpd.hrl").
 
--deprecated({start, 0, next_major_release}).
--deprecated({start, 1, next_major_release}).
--deprecated({start_link, 1, next_major_release}).
--deprecated({start_child, 0, next_major_release}).
--deprecated({start_child, 1, next_major_release}).
--deprecated({stop, 0, next_major_release}).
--deprecated({stop, 1, next_major_release}).
--deprecated({stop, 2, next_major_release}).
--deprecated({stop_child, 0, next_major_release}).
--deprecated({stop_child, 1, next_major_release}).
--deprecated({stop_child, 2, next_major_release}).
--deprecated({restart, 0, next_major_release}).
--deprecated({restart, 1, next_major_release}).
--deprecated({restart, 2, next_major_release}).
--deprecated({block, 0, next_major_release}).
--deprecated({block, 1, next_major_release}).
--deprecated({block, 2, next_major_release}).
--deprecated({block, 3, next_major_release}).
--deprecated({block, 4, next_major_release}).
--deprecated({unblock, 0, next_major_release}).
--deprecated({unblock, 1, next_major_release}).
--deprecated({unblock, 2, next_major_release}).
-
 %% Behavior callbacks
--export([start_standalone/1, start_service/1, stop_service/1, services/0, 
-	 service_info/1]).
+-export([
+	 start_standalone/1, 
+	 start_service/1, 
+	 stop_service/1, 
+	 services/0, 
+	 service_info/1
+	]).
 
 %% API
 -export([parse_query/1, reload_config/2, info/1, info/2, info/3]).
 
-%% Deprecated
--export([start/0, start/1, 
-	 start_link/0, start_link/1, 
-	 start_child/0,start_child/1,
-	 stop/0,stop/1,stop/2,
-	 stop_child/0,stop_child/1,stop_child/2,
-	 restart/0,restart/1,restart/2]).
-
-%% Management stuff should be internal functions 
-%% Will be from r13
--export([block/0,block/1,block/2,block/3,block/4,
-	 unblock/0,unblock/1,unblock/2]).
-
-%% Internal Debugging and status info stuff...
-%% Keep for now should probably be moved to test catalog
--export([get_status/1,get_status/2,get_status/3,
-	 get_admin_state/0,get_admin_state/1,get_admin_state/2,
-	 get_usage_state/0,get_usage_state/1,get_usage_state/2]).
+%% Internal debugging and status info stuff...
+-export([
+	 get_status/1, get_status/2, get_status/3,
+	 get_admin_state/0, get_admin_state/1, get_admin_state/2,
+	 get_usage_state/0, get_usage_state/1, get_usage_state/2
+	]).
 
 %%%========================================================================
 %%% API
@@ -111,6 +81,7 @@ info(Address, Port, Properties) when is_integer(Port) andalso
 				     is_list(Properties) ->    
     httpd_conf:get_config(Address, Port, Properties).
 
+
 %%%========================================================================
 %%% Behavior callbacks
 %%%========================================================================
@@ -149,6 +120,8 @@ service_info(Pid) ->
 	exit:{noproc, _} ->
 	    {error, service_not_available} 
     end.
+
+
 %%%--------------------------------------------------------------
 %%% Internal functions
 %%%--------------------------------------------------------------------
@@ -176,6 +149,7 @@ child_name2info({httpd_instance_sup, Address, Port}) ->
 	    {ok, [{bind_address, Address}, {port, Port} | Info]}
     end.
 
+
 reload(Config, Address, Port) ->
     Name = make_name(Address,Port),
     case whereis(Name) of
@@ -185,26 +159,12 @@ reload(Config, Address, Port) ->
 	    {error,not_started}
     end.
 
-reload(Addr, Port) when is_integer(Port) ->
-    Name = make_name(Addr,Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:reload(Pid, undefined);
-	_ ->
-	    {error,not_started}
-    end.
     
 %%% =========================================================
-%%% Function:    block/0, block/1, block/2, block/3, block/4
-%%%              block()
-%%%              block(Port)
-%%%              block(ConfigFile)
-%%%              block(Addr,Port)
-%%%              block(Port,Mode)
-%%%              block(ConfigFile,Mode)
-%%%              block(Addr,Port,Mode)
-%%%              block(ConfigFile,Mode,Timeout)
-%%%              block(Addr,Port,Mode,Timeout)
+%%% Function:    block/3, block/4
+%%%              block(Addr, Port, Mode)
+%%%              block(ConfigFile, Mode, Timeout)
+%%%              block(Addr, Port, Mode, Timeout)
 %%% 
 %%% Returns:     ok | {error,Reason}
 %%%              
@@ -237,58 +197,32 @@ reload(Addr, Port) when is_integer(Port) ->
 %%%              Mode       -> disturbing | non_disturbing
 %%%              Timeout    -> integer()
 %%%
-block() -> block(undefined,8888,disturbing).
 
-block(Port) when is_integer(Port) -> 
-    block(undefined,Port,disturbing);
+block(Addr, Port, disturbing) when is_integer(Port) ->
+    do_block(Addr, Port, disturbing);
+block(Addr, Port, non_disturbing) when is_integer(Port) ->
+    do_block(Addr, Port, non_disturbing);
 
-block(ConfigFile) when is_list(ConfigFile) ->
+block(ConfigFile, Mode, Timeout) 
+  when is_list(ConfigFile) andalso 
+       is_atom(Mode) andalso 
+       is_integer(Timeout) ->
     case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    block(Addr,Port,disturbing);
-	Error ->
-	    Error
-    end.
-
-block(Addr,Port) when is_integer(Port) -> 
-    block(Addr,Port,disturbing);
-
-block(Port,Mode) when is_integer(Port) andalso is_atom(Mode) ->
-    block(undefined,Port,Mode);
-
-block(ConfigFile,Mode) when is_list(ConfigFile) andalso is_atom(Mode) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    block(Addr,Port,Mode);
-	Error ->
-	    Error
-    end.
-
-
-block(Addr,Port,disturbing) when is_integer(Port) ->
-    do_block(Addr,Port,disturbing);
-block(Addr,Port,non_disturbing) when is_integer(Port) ->
-    do_block(Addr,Port,non_disturbing);
-
-block(ConfigFile,Mode,Timeout) when is_list(ConfigFile) andalso 
-				    is_atom(Mode) andalso 
-				    is_integer(Timeout) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    block(Addr,Port,Mode,Timeout);
+	{ok, Addr, Port} ->
+	    block(Addr, Port, Mode, Timeout);
 	Error ->
 	    Error
     end.
 
 
-block(Addr,Port,non_disturbing,Timeout) 
+block(Addr, Port, non_disturbing, Timeout) 
+  when is_integer(Port) andalso is_integer(Timeout) ->
+    do_block(Addr, Port, non_disturbing, Timeout);
+block(Addr,Port,disturbing,Timeout) 
   when is_integer(Port) andalso is_integer(Timeout) ->
-    do_block(Addr,Port,non_disturbing,Timeout);
-block(Addr,Port,disturbing,Timeout) when is_integer(Port) andalso 
-					 is_integer(Timeout) ->
-    do_block(Addr,Port,disturbing,Timeout).
+    do_block(Addr, Port, disturbing, Timeout).
 
-do_block(Addr,Port,Mode) when is_integer(Port) andalso is_atom(Mode) -> 
+do_block(Addr, Port, Mode) when is_integer(Port) andalso is_atom(Mode) -> 
     Name = make_name(Addr,Port),
     case whereis(Name) of
 	Pid when is_pid(Pid) ->
@@ -298,7 +232,7 @@ do_block(Addr,Port,Mode) when is_integer(Port) andalso is_atom(Mode) ->
     end.
     
 
-do_block(Addr,Port,Mode,Timeout) 
+do_block(Addr, Port, Mode, Timeout) 
   when is_integer(Port) andalso is_atom(Mode) -> 
     Name = make_name(Addr,Port),
     case whereis(Name) of
@@ -310,11 +244,8 @@ do_block(Addr,Port,Mode,Timeout)
     
 
 %%% =========================================================
-%%% Function:    unblock/0, unblock/1, unblock/2
-%%%              unblock()
-%%%              unblock(Port)
-%%%              unblock(ConfigFile)
-%%%              unblock(Addr,Port)
+%%% Function:    unblock/2
+%%%              unblock(Addr, Port)
 %%%              
 %%% Description: This function is used to reverse a previous block 
 %%%              operation on the HTTP server.
@@ -323,16 +254,6 @@ do_block(Addr,Port,Mode,Timeout)
 %%%              Addr       -> {A,B,C,D} | string() | undefined
 %%%              ConfigFile -> string()
 %%%
-unblock()                           -> unblock(undefined,8888).
-unblock(Port) when is_integer(Port) -> unblock(undefined,Port);
-
-unblock(ConfigFile) when is_list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    unblock(Addr,Port);
-	Error ->
-	    Error
-    end.
 
 unblock(Addr, Port) when is_integer(Port) -> 
     Name = make_name(Addr,Port),
@@ -349,8 +270,8 @@ foreach([KeyValue|Rest]) ->
   {ok, Plus2Space, _} = inets_regexp:gsub(KeyValue,"[\+]"," "),
   case inets_regexp:split(Plus2Space,"=") of
     {ok,[Key|Value]} ->
-      [{httpd_util:decode_hex(Key),
-	httpd_util:decode_hex(lists:flatten(Value))}|foreach(Rest)];
+      [{http_uri:decode(Key),
+	http_uri:decode(lists:flatten(Value))}|foreach(Rest)];
     {ok,_} ->
       foreach(Rest)
   end.
@@ -521,80 +442,81 @@ do_reload_config(ConfigList, Mode) ->
 %%%--------------------------------------------------------------
 %%% Deprecated 
 %%%--------------------------------------------------------------
-start() ->
-    start("/var/tmp/server_root/conf/8888.conf").
 
-start(ConfigFile) ->
-    {ok, Pid} = inets:start(httpd, ConfigFile, stand_alone), 
-    unlink(Pid),
-    {ok, Pid}.
+%% start() ->
+%%     start("/var/tmp/server_root/conf/8888.conf").
 
-start_link() ->
-    start("/var/tmp/server_root/conf/8888.conf").
+%% start(ConfigFile) ->
+%%     {ok, Pid} = inets:start(httpd, ConfigFile, stand_alone), 
+%%     unlink(Pid),
+%%     {ok, Pid}.
 
-start_link(ConfigFile) when is_list(ConfigFile) ->
-    inets:start(httpd, ConfigFile, stand_alone). 
+%% start_link() ->
+%%     start("/var/tmp/server_root/conf/8888.conf").
 
-stop() ->
-  stop(8888).
+%% start_link(ConfigFile) when is_list(ConfigFile) ->
+%%     inets:start(httpd, ConfigFile, stand_alone). 
 
-stop(Port) when is_integer(Port) ->
-    stop(undefined, Port);
-stop(Pid) when is_pid(Pid) ->
-    old_stop(Pid);
-stop(ConfigFile) when is_list(ConfigFile) ->
-    old_stop(ConfigFile).
+%% stop() ->
+%%   stop(8888).
 
-stop(Addr, Port) when is_integer(Port) ->
-    old_stop(Addr, Port).
+%% stop(Port) when is_integer(Port) ->
+%%     stop(undefined, Port);
+%% stop(Pid) when is_pid(Pid) ->
+%%     old_stop(Pid);
+%% stop(ConfigFile) when is_list(ConfigFile) ->
+%%     old_stop(ConfigFile).
 
-start_child() ->
-    start_child("/var/tmp/server_root/conf/8888.conf").
+%% stop(Addr, Port) when is_integer(Port) ->
+%%     old_stop(Addr, Port).
 
-start_child(ConfigFile) ->
-    httpd_sup:start_child(ConfigFile).
+%% start_child() ->
+%%     start_child("/var/tmp/server_root/conf/8888.conf").
 
-stop_child() ->
-  stop_child(8888).
+%% start_child(ConfigFile) ->
+%%     httpd_sup:start_child(ConfigFile).
 
-stop_child(Port) ->
-    stop_child(undefined, Port).
+%% stop_child() ->
+%%   stop_child(8888).
 
-stop_child(Addr, Port) when is_integer(Port) ->
-    httpd_sup:stop_child(Addr, Port).
+%% stop_child(Port) ->
+%%     stop_child(undefined, Port).
 
-restart() -> reload(undefined, 8888).
+%% stop_child(Addr, Port) when is_integer(Port) ->
+%%     httpd_sup:stop_child(Addr, Port).
 
-restart(Port) when is_integer(Port) ->
-    reload(undefined,  Port).
-restart(Addr, Port) ->
-    reload(Addr, Port).
+%% restart() -> reload(undefined, 8888).
 
-old_stop(Pid) when is_pid(Pid) ->
-    do_stop(Pid);
-old_stop(ConfigFile) when is_list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok, Addr, Port} ->
-	    old_stop(Addr, Port);
-	    
-	Error ->
-	    Error
-    end;
-old_stop(_StartArgs) ->
-    ok.
+%% restart(Port) when is_integer(Port) ->
+%%     reload(undefined,  Port).
+%% restart(Addr, Port) ->
+%%     reload(Addr, Port).
 
-old_stop(Addr, Port) when is_integer(Port) ->
-    Name = old_make_name(Addr, Port), 
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    do_stop(Pid),
-	    ok;
-	_ ->
-	    not_started
-    end.
+%% old_stop(Pid) when is_pid(Pid) ->
+%%     do_stop(Pid);
+%% old_stop(ConfigFile) when is_list(ConfigFile) ->
+%%     case get_addr_and_port(ConfigFile) of
+%% 	{ok, Addr, Port} ->
+%% 	    old_stop(Addr, Port);
+	    
+%% 	Error ->
+%% 	    Error
+%%     end;
+%% old_stop(_StartArgs) ->
+%%     ok.
+
+%% old_stop(Addr, Port) when is_integer(Port) ->
+%%     Name = old_make_name(Addr, Port), 
+%%     case whereis(Name) of
+%% 	Pid when is_pid(Pid) ->
+%% 	    do_stop(Pid),
+%% 	    ok;
+%% 	_ ->
+%% 	    not_started
+%%     end.
     
-do_stop(Pid) ->
-    exit(Pid, shutdown).
+%% do_stop(Pid) ->
+%%     exit(Pid, shutdown).
 
-old_make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_instance_sup",Addr,Port).
+%% old_make_name(Addr,Port) ->
+%%     httpd_util:make_name("httpd_instance_sup",Addr,Port).
diff --git a/lib/inets/src/http_server/httpd.hrl b/lib/inets/src/http_server/httpd.hrl
index 0db8a029bb..4eba833e2c 100644
--- a/lib/inets/src/http_server/httpd.hrl
+++ b/lib/inets/src/http_server/httpd.hrl
@@ -1,82 +1,27 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
 %%
+%% %CopyrightEnd%
 %%
+%% This is a simple wrapper for code that has not been updated to 
+%% handle the move of this file to the include dir.
 
--include_lib("kernel/include/file.hrl").
-
--ifndef(SERVER_SOFTWARE).
--define(SERVER_SOFTWARE,"inets/develop").	% Define in Makefile!
--endif.
--define(SERVER_PROTOCOL,"HTTP/1.1").
--define(DEFAULT_MODS, [mod_alias, mod_auth, mod_esi, mod_actions, mod_cgi,
-		       mod_dir, mod_get, mod_head, mod_log, mod_disk_log]).
--define(SOCKET_CHUNK_SIZE,8192).
--define(SOCKET_MAX_POLL,25).
--define(FILE_CHUNK_SIZE,64*1024).
--define(GATEWAY_INTERFACE,"CGI/1.1").
--define(NICE(Reason),lists:flatten(atom_to_list(?MODULE)++": "++Reason)).
--define(DEFAULT_CONTEXT,
-	[{errmsg,"[an error occurred while processing this directive]"},
-	 {timefmt,"%A, %d-%b-%y %T %Z"},
-	 {sizefmt,"abbrev"}]).
-
-
--ifdef(inets_error).
--define(ERROR(Format, Args), io:format("E(~p:~p:~p) : "++Format++"~n",
-				       [self(),?MODULE,?LINE]++Args)).
--else.
--define(ERROR(F,A),[]).
--endif.
-
--ifdef(inets_log).
--define(LOG(Format, Args), io:format("L(~p:~p:~p) : "++Format++"~n",
-				     [self(),?MODULE,?LINE]++Args)).
--else.
--define(LOG(F,A),[]).
--endif.
-
--ifdef(inets_debug).
--define(DEBUG(Format, Args), io:format("D(~p:~p:~p) : "++Format++"~n",
-				       [self(),?MODULE,?LINE]++Args)).
--else.
--define(DEBUG(F,A),[]).
--endif.
-
--ifdef(inets_cdebug).
--define(CDEBUG(Format, Args), io:format("C(~p:~p:~p) : "++Format++"~n",
-				       [self(),?MODULE,?LINE]++Args)).
--else.
--define(CDEBUG(F,A),[]).
--endif.
+-ifndef(src_httpd_hrl).
+-define(src_httpd_hrl, true).
 
+-include_lib("inets/include/httpd.hrl").
 
--record(init_data,{peername,resolve}).
--record(mod,{init_data,
-	     data=[],
-	     socket_type=ip_comm,
-	     socket,
-	     config_db,
-	     method,
-	     absolute_uri=[],
-	     request_uri,
-	     http_version,
-	     request_line,
-	     parsed_header=[],
-	     entity_body,
-	     connection}).
+-endif. % -ifdef(src_httpd_hrl).
diff --git a/lib/inets/src/http_server/httpd_acceptor.erl b/lib/inets/src/http_server/httpd_acceptor.erl
index 568fd3c610..bcebb6a9e3 100644
--- a/lib/inets/src/http_server/httpd_acceptor.erl
+++ b/lib/inets/src/http_server/httpd_acceptor.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. 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%
 %%
 %%
@@ -21,6 +21,7 @@
 
 -include("httpd.hrl").
 -include("httpd_internal.hrl").
+-include("inets_internal.hrl").
 
 %% Internal application API
 -export([start_link/5, start_link/6]).
@@ -138,9 +139,9 @@ acceptor_loop(Manager, SocketType, ListenSocket, ConfigDb, AcceptTimeout) ->
 	    handle_error(Reason, ConfigDb),
 	    ?MODULE:acceptor_loop(Manager, SocketType, ListenSocket, 
 				  ConfigDb, AcceptTimeout);
-	{'EXIT', Reason} ->
-	    ?hdri("accept exited", [{reason, Reason}]),
-	    handle_error({'EXIT', Reason}, ConfigDb),
+	{'EXIT', _Reason} = EXIT ->
+	    ?hdri("accept exited", [{reason, _Reason}]),
+	    handle_error(EXIT, ConfigDb),
 	    ?MODULE:acceptor_loop(Manager, SocketType, ListenSocket, 
 				  ConfigDb, AcceptTimeout)
     end.
diff --git a/lib/inets/src/http_server/httpd_cgi.erl b/lib/inets/src/http_server/httpd_cgi.erl
index 0532d7d100..c06a06aad3 100644
--- a/lib/inets/src/http_server/httpd_cgi.erl
+++ b/lib/inets/src/http_server/httpd_cgi.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-2010. 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%
 %%
 %%
@@ -21,7 +21,8 @@
 
 -export([parse_headers/1, handle_headers/1]).
 
--include("inets_internal.hrl").
+-include_lib("inets/src/inets_app/inets_internal.hrl").
+
 
 %%%=========================================================================
 %%%  Internal application API 
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index 5ca2e47eb5..f4d8a6c09f 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -25,13 +25,15 @@
 
 %% Application internal API
 -export([load/1, load/2, load_mime_types/1, store/1, store/2,
-	remove/1, remove_all/1, config/1, get_config/2, get_config/3,
-	lookup/2, lookup/3, lookup/4,
-	validate_properties/1]).
+	 remove/1, remove_all/1, get_config/2, get_config/3,
+	 lookup_socket_type/1, 
+	 lookup/2, lookup/3, lookup/4, 
+	 validate_properties/1]).
 
 -define(VMODULE,"CONF").
--include("httpd.hrl").
 -include("httpd_internal.hrl").
+-include("httpd.hrl").
+-include_lib("inets/src/http_lib/http_internal.hrl").
 
 
 %%%=========================================================================
@@ -216,9 +218,12 @@ load("ServerName " ++ ServerName, []) ->
     {ok,[],{server_name,clean(ServerName)}};
 
 load("SocketType " ++ SocketType, []) ->
-    case check_enum(clean(SocketType),["ssl","ip_comm"]) of
+    %% ssl is the same as HTTP_DEFAULT_SSL_KIND
+    %% ossl is ssl based on OpenSSL (the "old" ssl)
+    %% essl is the pure Erlang-based ssl (the "new" ssl)
+    case check_enum(clean(SocketType), ["ssl", "ossl", "essl", "ip_comm"]) of
 	{ok, ValidSocketType} ->
-	    {ok, [], {socket_type,ValidSocketType}};
+	    {ok, [], {socket_type, ValidSocketType}};
 	{error,_} ->
 	    {error, ?NICE(clean(SocketType) ++ " is an invalid SocketType")}
     end;
@@ -226,7 +231,7 @@ load("SocketType " ++ SocketType, []) ->
 load("Port " ++ Port, []) ->
     case make_integer(Port) of
 	{ok, Integer} ->
-	    {ok, [], {port,Integer}};
+	    {ok, [], {port, Integer}};
 	{error, _} ->
 	    {error, ?NICE(clean(Port)++" is an invalid Port")}
     end;
@@ -534,7 +539,10 @@ validate_config_params([{server_name, Value} | _]) ->
     throw({server_name, Value});
 
 validate_config_params([{socket_type, Value} | Rest]) 
-  when (Value =:= ip_comm) orelse (Value =:= ssl) ->
+  when (Value =:= ip_comm) orelse 
+       (Value =:= ssl) orelse 
+       (Value =:= ossl) orelse 
+       (Value =:= essl) ->
     validate_config_params(Rest);
 validate_config_params([{socket_type, Value} | _]) ->
     throw({socket_type, Value});
@@ -695,6 +703,8 @@ store(ConfigList0) ->
 		  ConfigList)
     catch
 	throw:Error ->
+	    ?hdri("store - config parameter validation failed", 
+		  [{error, Error}]),
 	    {error, {invalid_option, Error}}
     end.
 
@@ -741,27 +751,27 @@ remove(ConfigDB) ->
     ets:delete(ConfigDB),
     ok.
 
-config(ConfigDB) ->
-    case httpd_util:lookup(ConfigDB, socket_type,ip_comm) of
-	ssl ->
-	    case ssl_certificate_file(ConfigDB) of
-		undefined ->
-		    {error,
-		     "Directive SSLCertificateFile "
-		     "not found in the config file"};
-		SSLCertificateFile ->
-		    {ssl,
-		     SSLCertificateFile++
-		     ssl_certificate_key_file(ConfigDB)++
-		     ssl_verify_client(ConfigDB)++
-		     ssl_ciphers(ConfigDB)++
-		     ssl_password(ConfigDB)++
-		     ssl_verify_depth(ConfigDB)++
-		     ssl_ca_certificate_file(ConfigDB)}
-	    end;
-	ip_comm ->
-	    ip_comm
-    end.
+%% config(ConfigDB) ->
+%%     case httpd_util:lookup(ConfigDB, socket_type, ip_comm) of
+%% 	ssl ->
+%% 	    case ssl_certificate_file(ConfigDB) of
+%% 		undefined ->
+%% 		    {error,
+%% 		     "Directive SSLCertificateFile "
+%% 		     "not found in the config file"};
+%% 		SSLCertificateFile ->
+%% 		    {ssl,
+%% 		     SSLCertificateFile++
+%% 		     ssl_certificate_key_file(ConfigDB)++
+%% 		     ssl_verify_client(ConfigDB)++
+%% 		     ssl_ciphers(ConfigDB)++
+%% 		     ssl_password(ConfigDB)++
+%% 		     ssl_verify_depth(ConfigDB)++
+%% 		     ssl_ca_certificate_file(ConfigDB)}
+%% 	    end;
+%% 	ip_comm ->
+%% 	    ip_comm
+%%     end.
 
 
 get_config(Address, Port) ->    
@@ -797,6 +807,38 @@ table(Address, Port) ->
     httpd_util:make_name("httpd_conf", Address, Port).
 
 
+lookup_socket_type(ConfigDB) ->
+    case httpd_util:lookup(ConfigDB, socket_type, ip_comm) of
+	ip_comm ->
+	    ip_comm;
+	SSL when (SSL =:= ssl) orelse (SSL =:= ossl) orelse (SSL =:= essl) ->
+	    SSLTag = 
+		if
+		    (SSL =:= ssl) ->
+			?HTTP_DEFAULT_SSL_KIND;
+		    true ->
+			SSL
+		end,
+	    case ssl_certificate_file(ConfigDB) of
+		undefined ->
+		    Reason = "Directive SSLCertificateFile "
+			"not found in the config file", 
+		    throw({error, Reason}); 
+		SSLCertificateFile ->
+		    {SSLTag, SSLCertificateFile ++ ssl_config(ConfigDB)}
+	    end
+    end.
+
+ssl_config(ConfigDB) ->
+    ssl_certificate_key_file(ConfigDB) ++
+	ssl_verify_client(ConfigDB) ++
+	ssl_ciphers(ConfigDB) ++
+	ssl_password(ConfigDB) ++
+	ssl_verify_depth(ConfigDB) ++
+	ssl_ca_certificate_file(ConfigDB).
+	    
+    
+
 %%%========================================================================
 %%% Internal functions
 %%%========================================================================
diff --git a/lib/inets/src/http_server/httpd_esi.erl b/lib/inets/src/http_server/httpd_esi.erl
index b1a75fda52..026ec9a5fe 100644
--- a/lib/inets/src/http_server/httpd_esi.erl
+++ b/lib/inets/src/http_server/httpd_esi.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-2010. 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%
 %%
 %%
@@ -21,7 +21,8 @@
 
 -export([parse_headers/1, handle_headers/1]).
 
--include("inets_internal.hrl").
+-include_lib("inets/src/inets_app/inets_internal.hrl").
+
 
 %%%=========================================================================
 %%%  Internal application API 
diff --git a/lib/inets/src/http_server/httpd_file.erl b/lib/inets/src/http_server/httpd_file.erl
index 5fd529100e..7e21d9e158 100644
--- a/lib/inets/src/http_server/httpd_file.erl
+++ b/lib/inets/src/http_server/httpd_file.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -22,11 +22,13 @@
 -export([handle_error/4]).
 
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
+
 
 handle_error(eacces, Op, ModData, Path) ->
-    handle_error(403, Op, ModData, Path,"");
+    handle_error(403, Op, ModData, Path,"Forbidden");
 handle_error(enoent, Op, ModData, Path) ->
-    handle_error(404, Op, ModData, Path,"");
+    handle_error(404, Op, ModData, Path,"File not found");
 handle_error(enotdir, Op, ModData, Path) ->
     handle_error(404, Op, ModData, Path,
 	       ": A component of the file name is not a directory");
@@ -34,8 +36,8 @@ handle_error(emfile, Op, _ModData, Path) ->
     handle_error(500, Op, none, Path, ": To many open files");
 handle_error({enfile,_}, Op, _ModData, Path) ->
     handle_error(500, Op, none, Path, ": File table overflow");
-handle_error(_Reason, Op, _ModData, Path) ->
-    handle_error(500, Op, none, Path, "").
+handle_error(_Reason, Op, ModData, Path) ->
+    handle_error(404, Op, ModData, Path, "File not found").
 	    
 handle_error(StatusCode, Op, none, Path, Reason) ->
     {StatusCode, none, ?NICE("Can't " ++ Op ++ Path ++ Reason)};
diff --git a/lib/inets/src/http_server/httpd_internal.hrl b/lib/inets/src/http_server/httpd_internal.hrl
index 7795ab6c18..108469ea0a 100644
--- a/lib/inets/src/http_server/httpd_internal.hrl
+++ b/lib/inets/src/http_server/httpd_internal.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2009-2010. 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%
 %%
 %%
@@ -21,7 +21,51 @@
 -ifndef(httpd_internal_hrl).
 -define(httpd_internal_hrl, true).
 
--include("inets_internal.hrl").
+-ifndef(SERVER_SOFTWARE).
+-define(SERVER_SOFTWARE,"inets/develop").	% Define in Makefile!
+-endif.
+-define(SERVER_PROTOCOL,"HTTP/1.1").
+-define(DEFAULT_MODS, [mod_alias, mod_auth, mod_esi, mod_actions, mod_cgi,
+		       mod_dir, mod_get, mod_head, mod_log, mod_disk_log]).
+-define(SOCKET_CHUNK_SIZE,8192).
+-define(SOCKET_MAX_POLL,25).
+-define(FILE_CHUNK_SIZE,64*1024).
+-define(GATEWAY_INTERFACE,"CGI/1.1").
+-define(NICE(Reason),lists:flatten(atom_to_list(?MODULE)++": "++Reason)).
+-define(DEFAULT_CONTEXT,
+	[{errmsg,"[an error occurred while processing this directive]"},
+	 {timefmt,"%A, %d-%b-%y %T %Z"},
+	 {sizefmt,"abbrev"}]).
+
+
+-ifdef(inets_error).
+-define(ERROR(Format, Args), io:format("E(~p:~p:~p) : "++Format++"~n",
+				       [self(),?MODULE,?LINE]++Args)).
+-else.
+-define(ERROR(F,A),[]).
+-endif.
+
+-ifdef(inets_log).
+-define(LOG(Format, Args), io:format("L(~p:~p:~p) : "++Format++"~n",
+				     [self(),?MODULE,?LINE]++Args)).
+-else.
+-define(LOG(F,A),[]).
+-endif.
+
+-ifdef(inets_debug).
+-define(DEBUG(Format, Args), io:format("D(~p:~p:~p) : "++Format++"~n",
+				       [self(),?MODULE,?LINE]++Args)).
+-else.
+-define(DEBUG(F,A),[]).
+-endif.
+
+-ifdef(inets_cdebug).
+-define(CDEBUG(Format, Args), io:format("C(~p:~p:~p) : "++Format++"~n",
+				       [self(),?MODULE,?LINE]++Args)).
+-else.
+-define(CDEBUG(F,A),[]).
+-endif.
+
 -define(SERVICE, httpd).
 -define(hdri(Label, Content), ?report_important(Label, ?SERVICE, Content)).
 -define(hdrv(Label, Content), ?report_verbose(Label,   ?SERVICE, Content)).
diff --git a/lib/inets/src/http_server/httpd_manager.erl b/lib/inets/src/http_server/httpd_manager.erl
index f2e8763907..b44bc77c41 100644
--- a/lib/inets/src/http_server/httpd_manager.erl
+++ b/lib/inets/src/http_server/httpd_manager.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2000-2010. 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%
 %%
 %%
@@ -238,24 +238,25 @@ init([ConfigFile, ConfigList, AcceptTimeout, Addr, Port]) ->
     case (catch do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port)) of
 	{error, Reason} ->
 	    String = lists:flatten(
-		       io_lib:format("Failed initiating "
-				     "web server: ~n~p~n~p~n",
-				     [ConfigFile,Reason])),
+		       io_lib:format("Failed initiating web server: "
+				     "~n~p"
+				     "~n~p"
+				     "~n", [ConfigFile, Reason])),
 	    error_logger:error_report(String),
 	    {stop, {error, Reason}};
 	{ok, State} ->
 	    {ok, State}
     end;
-init([ConfigFile, ConfigList, AcceptTimeout, Addr, Port, 
-      ListenInfo]) ->
+init([ConfigFile, ConfigList, AcceptTimeout, Addr, Port, ListenInfo]) ->
     process_flag(trap_exit, true),
     case (catch do_init(ConfigFile, ConfigList, AcceptTimeout, 
 			Addr, Port, ListenInfo)) of
 	{error, Reason} ->
 	    String = lists:flatten(
-		       io_lib:format("Failed initiating "
-				     "web server: ~n~p~n~p~n",
-				     [ConfigFile,Reason])),
+		       io_lib:format("Failed initiating web server: "
+				     "~n~p"
+				     "~n~p"
+				     "~n", [ConfigFile, Reason])),
 	    error_logger:error_report(String),
 	    {stop, {error, Reason}};
 	{ok, State} ->
@@ -264,13 +265,14 @@ init([ConfigFile, ConfigList, AcceptTimeout, Addr, Port,
 
 do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port) ->
     NewConfigFile = proplists:get_value(file, ConfigList, ConfigFile),
-    ConfigDB   = do_initial_store(ConfigList),
-    SocketType = httpd_conf:config(ConfigDB),
+    ConfigDB      = do_initial_store(ConfigList),
+    SocketType    = httpd_conf:lookup_socket_type(ConfigDB),
     case httpd_acceptor_sup:start_acceptor(SocketType, Addr,
 					   Port, ConfigDB, AcceptTimeout) of
 	{ok, _Pid} ->
-	    Status = [{max_conn,0}, {last_heavy_load,never}, 
-		      {last_connection,never}],
+	    Status = [{max_conn,        0}, 
+		      {last_heavy_load, never}, 
+		      {last_connection, never}],
 	    State  = #state{socket_type = SocketType,
 			    config_file = NewConfigFile,
 			    config_db   = ConfigDB,
@@ -284,7 +286,7 @@ do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port) ->
 do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port, ListenInfo) ->
     NewConfigFile = proplists:get_value(file, ConfigList, ConfigFile),
     ConfigDB   = do_initial_store(ConfigList),
-    SocketType = httpd_conf:config(ConfigDB),
+    SocketType = httpd_conf:lookup_socket_type(ConfigDB),
     case httpd_acceptor_sup:start_acceptor(SocketType, Addr,
 					   Port, ConfigDB, 
 					   AcceptTimeout, ListenInfo) of
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index 8eee08e766..7084d9824a 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -19,22 +19,35 @@
 
 -module(httpd_request).
 
--include("http_internal.hrl").
+-include_lib("inets/src/http_lib/http_internal.hrl").
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
 
--export([parse/1, whole_body/2, validate/3, update_mod_data/5,
-	 body_data/2]).
+-export([
+	 parse/1, 
+	 whole_body/2, 
+	 validate/3, 
+	 update_mod_data/5,
+	 body_data/2
+	]).
 
 %% Callback API - used for example if the header/body is received a
 %% little at a time on a socket. 
--export([parse_method/1, parse_uri/1, parse_version/1, parse_headers/1,
-	 whole_body/1]).
+-export([
+	 parse_method/1, parse_uri/1, parse_version/1, parse_headers/1,
+	 whole_body/1
+	]).
+
 
 %%%=========================================================================
 %%%  Internal application API
 %%%=========================================================================
 parse([Bin, MaxSizes]) ->
-         parse_method(Bin, [], MaxSizes, []).
+    ?hdrt("parse", [{bin, Bin}, {max_sizes, MaxSizes}]),    
+    parse_method(Bin, [], MaxSizes, []);
+parse(Unknown) ->
+    ?hdrt("parse", [{unknown, Unknown}]),
+    exit({bad_args, Unknown}).
 
 %% Functions that may be returned during the decoding process
 %% if the input data is incompleate. 
@@ -119,30 +132,65 @@ update_mod_data(ModData, Method, RequestURI, HTTPVersion, Headers)->
 %%% Internal functions
 %%%========================================================================
 parse_method(<<>>, Method, MaxSizes, Result) ->
+    ?hdrt("parse_method - empty bin", 
+	  [{method, Method}, {max_sizes, MaxSizes}, {result, Result}]),    
     {?MODULE, parse_method, [Method, MaxSizes, Result]};
 parse_method(<<?SP, Rest/binary>>, Method, MaxSizes, Result) ->
+    ?hdrt("parse_method - SP begin", 
+	  [{rest,      Rest}, 
+	   {method,    Method}, 
+	   {max_sizes, MaxSizes}, 
+	   {result,    Result}]),    
     parse_uri(Rest, [], 0, MaxSizes,
 	      [string:strip(lists:reverse(Method)) | Result]);
 parse_method(<<Octet, Rest/binary>>, Method, MaxSizes, Result) ->
+    ?hdrt("parse_method", 
+	  [{octet,     Octet}, 
+	   {rest,      Rest}, 
+	   {method,    Method}, 
+	   {max_sizes, MaxSizes}, 
+	   {result,    Result}]),    
     parse_method(Rest, [Octet | Method], MaxSizes, Result).
 
-parse_uri(_, _, CurrSize, {MaxURI, _}, _) when CurrSize > MaxURI,
- MaxURI =/= nolimit -> 
+parse_uri(_, _, CurrSize, {MaxURI, _}, _) 
+  when (CurrSize > MaxURI) andalso (MaxURI =/= nolimit) -> 
+    ?hdrt("parse_uri", 
+	  [{current_size, CurrSize}, 
+	   {max_uri,      MaxURI}]),    
     %% We do not know the version of the client as it comes after the
     %% uri send the lowest version in the response so that the client
     %% will be able to handle it.
     HttpVersion = "HTTP/0.9", 
     {error, {uri_too_long, MaxURI}, HttpVersion};
 parse_uri(<<>>, URI, CurrSize, MaxSizes, Result) ->
+    ?hdrt("parse_uri - empty bin", 
+	  [{uri,          URI},
+	   {current_size, CurrSize}, 
+	   {max_sz,       MaxSizes}, 
+	   {result,       Result}]),    
     {?MODULE, parse_uri, [URI, CurrSize, MaxSizes, Result]};
 parse_uri(<<?SP, Rest/binary>>, URI, _, MaxSizes, Result) -> 
+    ?hdrt("parse_uri - SP begin", 
+	  [{uri,          URI},
+	   {max_sz,       MaxSizes}, 
+	   {result,       Result}]),    
     parse_version(Rest, [], MaxSizes, 
 		  [string:strip(lists:reverse(URI)) | Result]);
 %% Can happen if it is a simple HTTP/0.9 request e.i "GET /\r\n\r\n"
-parse_uri(<<?CR, _Rest/binary>> = Data, URI, _,MaxSizes, Result) ->
+parse_uri(<<?CR, _Rest/binary>> = Data, URI, _, MaxSizes, Result) ->
+    ?hdrt("parse_uri - CR begin", 
+	  [{uri,          URI},
+	   {max_sz,       MaxSizes}, 
+	   {result,       Result}]),    
     parse_version(Data, [], MaxSizes, 
 		  [string:strip(lists:reverse(URI)) | Result]);
 parse_uri(<<Octet, Rest/binary>>, URI, CurrSize, MaxSizes, Result) ->
+    ?hdrt("parse_uri", 
+	  [{octet,        Octet}, 
+	   {uri,          URI},
+	   {curr_sz,      CurrSize}, 
+	   {max_sz,       MaxSizes}, 
+	   {result,       Result}]),    
     parse_uri(Rest, [Octet | URI], CurrSize + 1, MaxSizes, Result).
 
 parse_version(<<>>, Version, MaxSizes, Result) ->
@@ -256,9 +304,9 @@ validate_uri(RequestURI) ->
     UriNoQueryNoHex = 
 	case string:str(RequestURI, "?") of
 	    0 ->
-		(catch httpd_util:decode_hex(RequestURI));
+		(catch http_uri:decode(RequestURI));
 	    Ndx ->
-		(catch httpd_util:decode_hex(string:left(RequestURI, Ndx)))	
+		(catch http_uri:decode(string:left(RequestURI, Ndx)))
 	end,
     case UriNoQueryNoHex of
 	{'EXIT',_Reason} ->
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl
index fa832cba3f..a9db6e2058 100644
--- a/lib/inets/src/http_server/httpd_request_handler.erl
+++ b/lib/inets/src/http_server/httpd_request_handler.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
 %%
 %%
@@ -101,11 +101,13 @@ init([Manager, ConfigDB, AcceptTimeout]) ->
 
     Then = erlang:now(),
     
+    ?hdrd("negotiate", []),
     case http_transport:negotiate(SocketType, Socket, TimeOut) of
 	{error, Error} ->
+	    ?hdrd("negotiation failed", [{error, Error}]),
 	    exit(Error); %% Can be 'normal'.
 	ok ->
-	    ?hdrt("negotiated", []),
+	    ?hdrt("negotiation successfull", []),
 	    NewTimeout = TimeOut - timer:now_diff(now(),Then) div 1000,
 	    continue_init(Manager, ConfigDB, SocketType, Socket, NewTimeout)
     end.
@@ -121,12 +123,9 @@ continue_init(Manager, ConfigDB, SocketType, Socket, TimeOut) ->
                socket = Socket,
                init_data = InitData},
     
-    MaxHeaderSize = httpd_util:lookup(ConfigDB, max_header_size,
-				      ?HTTP_MAX_HEADER_SIZE),
-    MaxURISize = httpd_util:lookup(ConfigDB, max_uri_size,
-				   ?HTTP_MAX_URI_SIZE),
-    NrOfRequest = httpd_util:lookup(ConfigDB,
-				    max_keep_alive_request, infinity),
+    MaxHeaderSize = max_header_size(ConfigDB), 
+    MaxURISize    = max_uri_size(ConfigDB), 
+    NrOfRequest   = max_keep_alive_request(ConfigDB), 
     
     {_, Status} = httpd_manager:new_connection(Manager),
     
@@ -142,9 +141,10 @@ continue_init(Manager, ConfigDB, SocketType, Socket, TimeOut) ->
     ?hdrt("activate request timeout", []),
     NewState = activate_request_timeout(State),
     
-    ?hdrt("update socket options", []),
-    http_transport:setopts(SocketType, Socket, [binary,{packet, 0},
-						{active, once}]),
+    ?hdrt("set socket options (binary, packet & active)", []),
+    http_transport:setopts(SocketType, Socket, 
+			   [binary, {packet, 0}, {active, once}]),
+
     ?hdrt("init done", []),
     gen_server:enter_loop(?MODULE, [], NewState).
 
@@ -180,21 +180,29 @@ handle_cast(Msg, State) ->
 %%                                       {stop, Reason, State}
 %% Description: Handling all non call/cast messages
 %%--------------------------------------------------------------------
-handle_info({Proto, Socket, Data}, State = 
+handle_info({Proto, Socket, Data}, 
 	    #state{mfa = {Module, Function, Args} = MFA,
 		   mod = #mod{socket_type = SockType, 
 			      socket = Socket} = ModData} = State) 
   when (((Proto =:= tcp) orelse 
 	 (Proto =:= ssl) orelse 
 	 (Proto =:= dummy)) andalso is_binary(Data)) ->
+
     ?hdrd("received data", 
 	  [{data, Data}, {proto, Proto}, 
 	   {socket, Socket}, {socket_type, SockType}, {mfa, MFA}]),
-    case Module:Function([Data | Args]) of
+
+%%     case (catch Module:Function([Data | Args])) of
+    PROCESSED = (catch Module:Function([Data | Args])),
+    
+    ?hdrt("data processed", [{processing_result, PROCESSED}]),
+
+    case PROCESSED of
         {ok, Result} ->
 	    ?hdrd("data processed", [{result, Result}]),
 	    NewState = cancel_request_timeout(State),
             handle_http_msg(Result, NewState); 
+
 	{error, {uri_too_long, MaxSize}, Version} ->
 	    ?hdrv("uri too long", [{max_size, MaxSize}, {version, Version}]),
 	    NewModData =  ModData#mod{http_version = Version},
@@ -205,7 +213,8 @@ handle_info({Proto, Socket, Data}, State =
 	    {stop, normal, State#state{response_sent = true, 
 				       mod = NewModData}};
 	{error, {header_too_long, MaxSize}, Version} ->
-	    ?hdrv("header too long", [{max_size, MaxSize}, {version, Version}]),
+	    ?hdrv("header too long", 
+		  [{max_size, MaxSize}, {version, Version}]),
 	    NewModData =  ModData#mod{http_version = Version},
 	    httpd_response:send_status(NewModData, 413, "Header too long"),
 	    Reason = io_lib:format("Header too long, max size is ~p~n", 
@@ -263,14 +272,16 @@ terminate(Reason, #state{response_sent = false, mod = ModData} = State) ->
     httpd_response:send_status(ModData, 500, none),
     error_log(httpd_util:reason_phrase(500), ModData),
     terminate(Reason, State#state{response_sent = true, mod = ModData});
-terminate(_, State) ->
+terminate(_Reason, State) ->
     do_terminate(State).
 
 do_terminate(#state{mod = ModData, manager = Manager} = State) ->
     catch httpd_manager:done_connection(Manager),
     cancel_request_timeout(State),
+    %% receive after 5000 -> ok end, 
     httpd_socket:close(ModData#mod.socket_type, ModData#mod.socket).
 
+
 %%--------------------------------------------------------------------
 %% code_change(OldVsn, State, Extra) -> {ok, NewState}
 %%
@@ -279,6 +290,7 @@ do_terminate(#state{mod = ModData, manager = Manager} = State) ->
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
@@ -383,9 +395,8 @@ is_host_specified_if_required(_, _, _) ->
 
 handle_body(#state{mod = #mod{config_db = ConfigDB}} = State) ->
     ?hdrt("handle body", []),    
-    MaxHeaderSize =
-	httpd_util:lookup(ConfigDB, max_header_size, ?HTTP_MAX_HEADER_SIZE),
-    MaxBodySize = httpd_util:lookup(ConfigDB, max_body_size, nolimit),
+    MaxHeaderSize = max_header_size(ConfigDB), 
+    MaxBodySize   = max_body_size(ConfigDB), 
    
     case handle_expect(State, MaxBodySize) of 
 	ok ->
@@ -538,24 +549,23 @@ handle_response(#state{body    = Body,
     {stop, normal, State#state{response_sent = true}}.
 
 handle_next_request(#state{mod = #mod{connection = true} = ModData,
-			  max_keep_alive_request = Max} = State, Data) ->
+			   max_keep_alive_request = Max} = State, Data) ->
     ?hdrt("handle next request", [{max, Max}]),    
+
     NewModData = #mod{socket_type = ModData#mod.socket_type, 
- 		      socket = ModData#mod.socket, 
- 		      config_db = ModData#mod.config_db, 
- 		      init_data = ModData#mod.init_data},
-    MaxHeaderSize =
-	httpd_util:lookup(ModData#mod.config_db, 
-			  max_header_size, ?HTTP_MAX_HEADER_SIZE),
-    MaxURISize = httpd_util:lookup(ModData#mod.config_db, max_uri_size, 
-				   ?HTTP_MAX_URI_SIZE),
-    TmpState = State#state{mod = NewModData,
-			   mfa = {httpd_request, parse, [{MaxURISize, 
-							  MaxHeaderSize}]},
+ 		      socket      = ModData#mod.socket, 
+ 		      config_db   = ModData#mod.config_db, 
+ 		      init_data   = ModData#mod.init_data},
+    MaxHeaderSize = max_header_size(ModData#mod.config_db), 
+    MaxURISize    = max_uri_size(ModData#mod.config_db), 
+
+    MFA = {httpd_request, parse, [{MaxURISize, MaxHeaderSize}]}, 
+    TmpState = State#state{mod                    = NewModData,
+			   mfa                    = MFA,
 			   max_keep_alive_request = decrease(Max),
-			   headers = undefined, 
-			   body = undefined,
-			   response_sent = false},
+			   headers                = undefined, 
+			   body                   = undefined,
+			   response_sent          = false},
     
     NewState = activate_request_timeout(TmpState),
 
@@ -596,7 +606,7 @@ decrease(N) ->
 
 error_log(ReasonString, Info) ->
     Error = lists:flatten(
-	      io_lib:format("Error reading request:~s",[ReasonString])),
+	      io_lib:format("Error reading request: ~s", [ReasonString])),
     error_log(mod_log, Info, Error),
     error_log(mod_disk_log, Info, Error).
 
@@ -609,3 +619,21 @@ error_log(Mod, #mod{config_db = ConfigDB} = Info, String) ->
 	_ ->
 	    ok
     end.
+
+
+%%--------------------------------------------------------------------
+%% Config access wrapper functions
+%%--------------------------------------------------------------------
+
+max_header_size(ConfigDB) ->
+    httpd_util:lookup(ConfigDB, max_header_size, ?HTTP_MAX_HEADER_SIZE).
+
+max_uri_size(ConfigDB) ->
+    httpd_util:lookup(ConfigDB, max_uri_size, ?HTTP_MAX_URI_SIZE).
+
+max_body_size(ConfigDB) ->
+    httpd_util:lookup(ConfigDB, max_body_size, nolimit).
+
+max_keep_alive_request(ConfigDB) ->
+    httpd_util:lookup(ConfigDB, max_keep_alive_request, infinity).
+
diff --git a/lib/inets/src/http_server/httpd_script_env.erl b/lib/inets/src/http_server/httpd_script_env.erl
index a742cbef76..d3115150b0 100644
--- a/lib/inets/src/http_server/httpd_script_env.erl
+++ b/lib/inets/src/http_server/httpd_script_env.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -23,6 +23,7 @@
 -export([create_env/3]).
 
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
 
 %%%=========================================================================
 %%%  Internal application API 
diff --git a/lib/inets/src/http_server/httpd_sup.erl b/lib/inets/src/http_server/httpd_sup.erl
index 1507c6852a..f94e5459c1 100644
--- a/lib/inets/src/http_server/httpd_sup.erl
+++ b/lib/inets/src/http_server/httpd_sup.erl
@@ -37,7 +37,7 @@
 
 -define(TIMEOUT, 15000).
 -include("httpd_internal.hrl").
-
+-include("inets_internal.hrl").
 
 %%%=========================================================================
 %%%  API
diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl
index cfad79638f..789f12652b 100644
--- a/lib/inets/src/http_server/httpd_util.erl
+++ b/lib/inets/src/http_server/httpd_util.erl
@@ -21,7 +21,7 @@
 -export([ip_address/2, lookup/2, lookup/3, multi_lookup/2,
 	 lookup_mime/2, lookup_mime/3, lookup_mime_default/2,
 	 lookup_mime_default/3, reason_phrase/1, message/3, rfc1123_date/0,
-	 rfc1123_date/1, day/1, month/1, decode_hex/1,
+	 rfc1123_date/1, day/1, month/1,
 	 flatlength/1, split_path/1, split_script_path/1, 
 	 suffix/1, split/3, uniq/1,
 	 make_name/2,make_name/3,make_name/4,strip/1,
@@ -32,7 +32,7 @@
 	 dir_validate/2, file_validate/2, mime_type_validate/1, 
 	 mime_types_validate/1, custom_date/0]).
 
--export([encode_hex/1]).
+-export([encode_hex/1, decode_hex/1]).
 -include_lib("kernel/include/file.hrl").
 
 ip_address({_,_,_,_} = Address, _IpFamily) ->
@@ -175,13 +175,13 @@ reason_phrase(_) -> "Internal Server Error".
 %% message
 
 message(301,URL,_) ->
-    "The document has moved <A HREF=\""++URL++"\">here</A>.";
+    "The document has moved <A HREF=\""++ maybe_encode(URL) ++"\">here</A>.";
 message(304, _URL,_) ->
     "The document has not been changed.";
 message(400,none,_) ->
     "Your browser sent a query that this server could not understand.";
 message(400,Msg,_) ->
-    "Your browser sent a query that this server could not understand. "++Msg;
+    "Your browser sent a query that this server could not understand. "++ maybe_encode(Msg);
 message(401,none,_) ->
     "This server could not verify that you
 are authorized to access the document you
@@ -190,9 +190,9 @@ credentials (e.g., bad password), or your
 browser doesn't understand how to supply
 the credentials required.";
 message(403,RequestURI,_) ->
-    "You don't have permission to access "++RequestURI++" on this server.";
+    "You don't have permission to access "++ maybe_encode(RequestURI) ++" on this server.";
 message(404,RequestURI,_) ->
-    "The requested URL "++RequestURI++" was not found on this server.";
+    "The requested URL " ++ maybe_encode(RequestURI) ++ " was not found on this server.";
 message(408, Timeout, _) ->
     Timeout;
 message(412,none,_) ->
@@ -200,7 +200,7 @@ message(412,none,_) ->
 message(413, Reason,_) ->
     "Entity: " ++ Reason;
 message(414,ReasonPhrase,_) ->
-    "Message "++ReasonPhrase++".";
+    "Message "++ ReasonPhrase ++".";
 message(416,ReasonPhrase,_) ->
     ReasonPhrase;
 
@@ -216,15 +216,23 @@ message(501,{Method, RequestURI, HTTPVersion}, _ConfigDB) ->
     if
 	is_atom(Method) ->
 	    atom_to_list(Method)++
-		" to "++RequestURI++" ("++HTTPVersion++") not supported.";
+		" to "++ maybe_encode(RequestURI)++" ("++HTTPVersion++") not supported.";
 	is_list(Method) ->
 	    Method++
-		" to "++RequestURI++" ("++HTTPVersion++") not supported."
+		" to "++ maybe_encode(RequestURI)++" ("++HTTPVersion++") not supported."
     end;
 
 message(503, String, _ConfigDB) ->
     "This service in unavailable due to: "++String.
 
+maybe_encode(URI) ->
+    case lists:member($%, URI) of
+	true ->
+	    URI;
+	false ->
+	    http_uri:encode(URI)
+    end.
+
 %%convert_rfc_date(Date)->{{YYYY,MM,DD},{HH,MIN,SEC}}
 
 convert_request_date([D,A,Y,DateType| Rest])->
@@ -381,16 +389,11 @@ month(12) -> "Dec".
 
 %% decode_hex
 
-decode_hex([$%,Hex1,Hex2|Rest]) ->
-    [hex2dec(Hex1)*16+hex2dec(Hex2)|decode_hex(Rest)];
-decode_hex([First|Rest]) ->
-    [First|decode_hex(Rest)];
-decode_hex([]) ->
-    [].
+decode_hex(URI) ->
+    http_uri:decode(URI).
 
-hex2dec(X) when (X>=$0) andalso (X=<$9) -> X-$0;
-hex2dec(X) when (X>=$A) andalso (X=<$F) -> X-$A+10;
-hex2dec(X) when (X>=$a) andalso (X=<$f) -> X-$a+10.
+encode_hex(URI) ->
+    http_uri:encode(URI).
 
 %% flatlength
 flatlength(List) ->
@@ -411,7 +414,7 @@ split_path(Path) ->
     case inets_regexp:match(Path,"[\?].*\$") of
 	%% A QUERY_STRING exists!
 	{match,Start,Length} ->
-	    {httpd_util:decode_hex(string:substr(Path,1,Start-1)),
+	    {http_uri:decode(string:substr(Path,1,Start-1)),
 	     string:substr(Path,Start,Length)};
 	%% A possible PATH_INFO exists!
 	nomatch ->
@@ -419,9 +422,9 @@ split_path(Path) ->
     end.
 
 split_path([],SoFar) ->
-    {httpd_util:decode_hex(lists:reverse(SoFar)),[]};
+    {http_uri:decode(lists:reverse(SoFar)),[]};
 split_path([$/|Rest],SoFar) ->
-    Path=httpd_util:decode_hex(lists:reverse(SoFar)),
+    Path=http_uri:decode(lists:reverse(SoFar)),
     case file:read_file_info(Path) of
 	{ok,FileInfo} when FileInfo#file_info.type =:= regular ->
 	    {Path,[$/|Rest]};
@@ -454,7 +457,7 @@ pathinfo_querystring([C|Rest], SoFar) ->
     pathinfo_querystring(Rest, [C|SoFar]).
 
 split_script_path([$?|QueryString], SoFar) ->
-    Path = httpd_util:decode_hex(lists:reverse(SoFar)),
+    Path = http_uri:decode(lists:reverse(SoFar)),
     case file:read_file_info(Path) of
 	{ok,FileInfo} when FileInfo#file_info.type =:= regular ->
 	    {Path, [$?|QueryString]};
@@ -464,7 +467,7 @@ split_script_path([$?|QueryString], SoFar) ->
 	    not_a_script
     end;
 split_script_path([], SoFar) ->
-    Path = httpd_util:decode_hex(lists:reverse(SoFar)),
+    Path = http_uri:decode(lists:reverse(SoFar)),
     case file:read_file_info(Path) of
 	{ok,FileInfo} when FileInfo#file_info.type =:= regular ->
 	    {Path, []};
@@ -474,7 +477,7 @@ split_script_path([], SoFar) ->
 	    not_a_script
     end;
 split_script_path([$/|Rest], SoFar) ->
-    Path = httpd_util:decode_hex(lists:reverse(SoFar)),
+    Path = http_uri:decode(lists:reverse(SoFar)),
     case file:read_file_info(Path) of
 	{ok, FileInfo} when FileInfo#file_info.type =:= regular ->
 	    {Path, [$/|Rest]};
@@ -608,9 +611,6 @@ hexlist_to_integer(List)->
 %%----------------------------------------------------------------------
 %%Converts an integer to an hexlist
 %%----------------------------------------------------------------------
-encode_hex(Num)->
-    integer_to_hexlist(Num).
-
 integer_to_hexlist(Num) when is_integer(Num) ->
     http_util:integer_to_hexlist(Num).
 	    	      
@@ -735,7 +735,6 @@ valid_accept_timeout(A) ->
 valid_config(_) ->
     ok.
 
-
 %%----------------------------------------------------------------------
 %% Enable debugging, 
 %%----------------------------------------------------------------------
diff --git a/lib/inets/src/http_server/mod_actions.erl b/lib/inets/src/http_server/mod_actions.erl
index d50ed4b16c..c3946ff9b4 100644
--- a/lib/inets/src/http_server/mod_actions.erl
+++ b/lib/inets/src/http_server/mod_actions.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -21,6 +21,7 @@
 -export([do/1,load/2, store/2]).
 
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
 
 %% do
 
diff --git a/lib/inets/src/http_server/mod_alias.erl b/lib/inets/src/http_server/mod_alias.erl
index ec0a12242f..0b9fe4cfe0 100644
--- a/lib/inets/src/http_server/mod_alias.erl
+++ b/lib/inets/src/http_server/mod_alias.erl
@@ -29,6 +29,7 @@
 
 -include("httpd.hrl").
 -include("httpd_internal.hrl").
+-include("inets_internal.hrl").
 
 -define(VMODULE,"ALIAS").
 
@@ -103,6 +104,19 @@ real_name(ConfigDB, RequestURI, []) ->
 	httpd_util:split_path(default_index(ConfigDB, RealName)),
     {ShortPath, Path, AfterPath};
 
+real_name(ConfigDB, RequestURI, [{MP,Replacement}|Rest])
+  when element(1, MP) =:= re_pattern ->
+    case re:run(RequestURI, MP, [{capture,[]}]) of
+	match ->
+	    NewURI = re:replace(RequestURI, MP, Replacement, [{return,list}]),
+	    {ShortPath,_} = httpd_util:split_path(NewURI),
+	    {Path,AfterPath} =
+		httpd_util:split_path(default_index(ConfigDB, NewURI)),
+	    {ShortPath, Path, AfterPath};
+	nomatch ->
+	    real_name(ConfigDB, RequestURI, Rest)
+    end;
+
 real_name(ConfigDB, RequestURI, [{FakeName,RealName}|Rest]) ->
      case inets_regexp:match(RequestURI, "^" ++ FakeName) of
 	{match, _, _} ->
@@ -120,6 +134,18 @@ real_name(ConfigDB, RequestURI, [{FakeName,RealName}|Rest]) ->
 
 real_script_name(_ConfigDB, _RequestURI, []) ->
     not_a_script;
+
+real_script_name(ConfigDB, RequestURI, [{MP,Replacement} | Rest])
+  when element(1, MP) =:= re_pattern ->
+    case re:run(RequestURI, MP, [{capture,[]}]) of
+	match ->
+	    ActualName =
+		re:replace(RequestURI, MP, Replacement, [{return,list}]),
+	    httpd_util:split_script_path(default_index(ConfigDB, ActualName));
+	nomatch ->
+	    real_script_name(ConfigDB, RequestURI, Rest)
+    end;
+
 real_script_name(ConfigDB, RequestURI, [{FakeName,RealName} | Rest]) ->
     case inets_regexp:match(RequestURI, "^" ++ FakeName) of
 	{match,_,_} ->
@@ -180,6 +206,8 @@ load("Alias " ++ Alias, []) ->
 	{ok, _} ->
 	    {error,?NICE(httpd_conf:clean(Alias)++" is an invalid Alias")}
     end;
+load("ReWrite " ++ Rule, Acc) ->
+    load_re_write(Rule, Acc, "ReWrite", re_write);
 load("ScriptAlias " ++ ScriptAlias, []) ->
     case inets_regexp:split(ScriptAlias, " ") of
 	{ok, [FakeName, RealName]} ->
@@ -189,6 +217,24 @@ load("ScriptAlias " ++ ScriptAlias, []) ->
 	{ok, _} ->
 	    {error, ?NICE(httpd_conf:clean(ScriptAlias)++
 			  " is an invalid ScriptAlias")}
+    end;
+load("ScriptReWrite " ++ Rule, Acc) ->
+    load_re_write(Rule, Acc, "ScriptReWrite", script_re_write).
+
+load_re_write(Rule0, Acc, Type, Tag) ->
+    case lists:dropwhile(
+	   fun ($\s) -> true; ($\t) -> true; (_) -> false end,
+	   Rule0) of
+	"" ->
+	    {error, ?NICE(httpd_conf:clean(Rule0)++" is an invalid "++Type)};
+	Rule ->
+	    case string:chr(Rule, $\s) of
+		0 ->
+		    {ok, Acc, {Tag, {Rule, ""}}};
+		N ->
+		    {Re, [_|Replacement]} = lists:split(N-1, Rule),
+		    {ok, Acc, {Tag, {Re, Replacement}}}
+	    end
     end.
 
 store({directory_index, Value} = Conf, _) when is_list(Value) ->
@@ -200,16 +246,36 @@ store({directory_index, Value} = Conf, _) when is_list(Value) ->
     end;
 store({directory_index, Value}, _) ->
     {error, {wrong_type, {directory_index, Value}}};
-store({alias, {Fake, Real}} = Conf, _) 
-  when is_list(Fake) andalso is_list(Real) ->
+store({alias, {Fake, Real}} = Conf, _)
+  when is_list(Fake), is_list(Real) ->
     {ok, Conf};
 store({alias, Value}, _) ->
     {error, {wrong_type, {alias, Value}}};
+store({re_write, {Re, Replacement}} = Conf, _)
+  when is_list(Re), is_list(Replacement) ->
+    case re:compile(Re) of
+	{ok, MP} ->
+	    {ok, {alias, {MP, Replacement}}};
+	{error,_} ->
+	    {error, {re_compile, Conf}}
+    end;
+store({re_write, _} = Conf, _) ->
+    {error, {wrong_type, Conf}};
 store({script_alias, {Fake, Real}} = Conf, _) 
-  when is_list(Fake) andalso is_list(Real) ->
+  when is_list(Fake), is_list(Real) ->
     {ok, Conf};
 store({script_alias, Value}, _) ->
-    {error, {wrong_type, {script_alias, Value}}}.
+    {error, {wrong_type, {script_alias, Value}}};
+store({script_re_write, {Re, Replacement}} = Conf, _)
+  when is_list(Re), is_list(Replacement) ->
+    case re:compile(Re) of
+	{ok, MP} ->
+	    {ok, {script_alias, {MP, Replacement}}};
+	{error,_} ->
+	    {error, {re_compile, Conf}}
+    end;
+store({script_re_write, _} = Conf, _) ->
+    {error, {wrong_type, Conf}}.
 
 is_directory_index_list([]) ->
     true;
diff --git a/lib/inets/src/http_server/mod_auth.erl b/lib/inets/src/http_server/mod_auth.erl
index 07cafb4726..85a87ab884 100644
--- a/lib/inets/src/http_server/mod_auth.erl
+++ b/lib/inets/src/http_server/mod_auth.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -38,6 +38,7 @@
 -include("httpd.hrl").
 -include("mod_auth.hrl").
 -include("httpd_internal.hrl").
+-include("inets_internal.hrl").
 
 -define(VMODULE,"AUTH").
 
diff --git a/lib/inets/src/http_server/mod_auth.hrl b/lib/inets/src/http_server/mod_auth.hrl
index 9b316cecc4..674e6d1652 100644
--- a/lib/inets/src/http_server/mod_auth.hrl
+++ b/lib/inets/src/http_server/mod_auth.hrl
@@ -1,29 +1,27 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
 %%
+%% %CopyrightEnd%
 %%
+%% This is a simple wrapper for code that has not been updated to
+%% handle the move of this file to the include dir.
+
+-ifndef(src_mod_auth_hrl).
+-define(src_mod_auth_hrl, true).
 
--record(httpd_user,
-	{username,
-	 password,
-	 user_data}).
+-include_lib("inets/include/mod_auth.hrl").
 
--record(httpd_group,
-	{name,
-	 userlist}).
-	  
+-endif. % -ifdef(src_mod_auth_hrl).
diff --git a/lib/inets/src/http_server/mod_auth_dets.erl b/lib/inets/src/http_server/mod_auth_dets.erl
index bc6c2b70a0..a48725d5d9 100644
--- a/lib/inets/src/http_server/mod_auth_dets.erl
+++ b/lib/inets/src/http_server/mod_auth_dets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -35,6 +35,7 @@
 -export([store_directory_data/3]).
 
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
 -include("mod_auth.hrl").
 
 store_directory_data(_Directory, DirData, Server_root) ->
diff --git a/lib/inets/src/http_server/mod_auth_plain.erl b/lib/inets/src/http_server/mod_auth_plain.erl
index d88859d28a..c0a83711ba 100644
--- a/lib/inets/src/http_server/mod_auth_plain.erl
+++ b/lib/inets/src/http_server/mod_auth_plain.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -22,6 +22,8 @@
 -include("httpd.hrl").
 -include("mod_auth.hrl").
 -include("httpd_internal.hrl").
+-include("inets_internal.hrl").
+
 
 -define(VMODULE,"AUTH_PLAIN").
 
diff --git a/lib/inets/src/http_server/mod_auth_server.erl b/lib/inets/src/http_server/mod_auth_server.erl
index 5f9e59be9d..947273bd9e 100644
--- a/lib/inets/src/http_server/mod_auth_server.erl
+++ b/lib/inets/src/http_server/mod_auth_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -22,6 +22,7 @@
 
 -include("httpd.hrl").
 -include("httpd_internal.hrl").
+-include("inets_internal.hrl").
 
 -behaviour(gen_server).
 
diff --git a/lib/inets/src/http_server/mod_cgi.erl b/lib/inets/src/http_server/mod_cgi.erl
index 33605b9698..c854166c29 100644
--- a/lib/inets/src/http_server/mod_cgi.erl
+++ b/lib/inets/src/http_server/mod_cgi.erl
@@ -27,6 +27,7 @@
 -export([do/1, load/2, store/2]).
 
 -include("http_internal.hrl").
+-include("httpd_internal.hrl").
 -include("httpd.hrl").
 
 -define(VMODULE,"CGI").
diff --git a/lib/inets/src/http_server/mod_dir.erl b/lib/inets/src/http_server/mod_dir.erl
index cdc7cc01e4..d791ee28e9 100644
--- a/lib/inets/src/http_server/mod_dir.erl
+++ b/lib/inets/src/http_server/mod_dir.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -18,9 +18,11 @@
 %%
 %%
 -module(mod_dir).
--export([do/1]).
 
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
+
+-export([do/1]).
 
 %% do
 
@@ -57,7 +59,7 @@ do_dir(Info) ->
     case file:read_file_info(DefaultPath) of
 	{ok,FileInfo} when FileInfo#file_info.type == directory ->
 	    DecodedRequestURI =
-		httpd_util:decode_hex(Info#mod.request_uri),
+		http_uri:decode(Info#mod.request_uri),
 	    ?DEBUG("do_dir -> ~n"
 		   "      Path:              ~p~n"
 		   "      DefaultPath:       ~p~n"
diff --git a/lib/inets/src/http_server/mod_disk_log.erl b/lib/inets/src/http_server/mod_disk_log.erl
index 95e0d00c70..5a3766de66 100644
--- a/lib/inets/src/http_server/mod_disk_log.erl
+++ b/lib/inets/src/http_server/mod_disk_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -28,7 +28,7 @@
 -define(VMODULE,"DISK_LOG").
 
 -include("httpd.hrl").
-
+-include("httpd_internal.hrl").
 
 %%%=========================================================================
 %%%  API 
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl
index cb33544540..929185a67a 100644
--- a/lib/inets/src/http_server/mod_esi.erl
+++ b/lib/inets/src/http_server/mod_esi.erl
@@ -29,6 +29,8 @@
 -export([do/1, load/2, store/2]).
 
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
+-include("inets_internal.hrl").
 
 -define(VMODULE,"ESI").
 -define(DEFAULT_ERL_TIMEOUT,15000).
@@ -37,6 +39,7 @@
 %%%=========================================================================
 %%%  API 
 %%%=========================================================================
+
 %%--------------------------------------------------------------------------
 %% deliver(SessionID, Data) -> ok | {error, bad_sessionID}
 %%	SessionID = pid()
@@ -48,7 +51,7 @@
 %% request handling process so it can forward it to the client.
 %%-------------------------------------------------------------------------
 deliver(SessionID, Data) when is_pid(SessionID) ->
-    SessionID ! {ok, Data},
+    SessionID ! {esi_data, Data},
     ok;
 deliver(_SessionID, _Data) ->
     {error, bad_sessionID}.
@@ -65,6 +68,7 @@ deliver(_SessionID, _Data) ->
 %% Description:  See httpd(3) ESWAPI CALLBACK FUNCTIONS
 %%-------------------------------------------------------------------------
 do(ModData) ->
+    ?hdrt("do", []),
     case proplists:get_value(status, ModData#mod.data) of
 	{_StatusCode, _PhraseArgs, _Reason} ->
 	    {proceed, ModData#mod.data};
@@ -184,6 +188,7 @@ store({erl_script_nocache, Value}, _) ->
 %%% Internal functions
 %%%========================================================================   
 generate_response(ModData) ->
+    ?hdrt("generate response", []),
     case scheme(ModData#mod.request_uri, ModData#mod.config_db) of
 	{eval, ESIBody, Modules} ->
 	    eval(ModData, ESIBody, Modules);
@@ -235,6 +240,7 @@ alias_match_str(Alias, eval_script_alias) ->
 
 erl(#mod{method = Method} = ModData, ESIBody, Modules) 
   when (Method =:= "GET") orelse (Method =:= "HEAD") ->
+    ?hdrt("erl", [{method, Method}]),
     case httpd_util:split(ESIBody,":|%3A|/",2) of
 	{ok, [ModuleName, FuncAndInput]} ->
 	    case httpd_util:split(FuncAndInput,"[\?/]",2) of
@@ -260,6 +266,7 @@ erl(#mod{request_uri  = ReqUri,
 	 method       = "PUT",
          http_version = Version, 
 	 data         = Data}, _ESIBody, _Modules) ->
+    ?hdrt("erl", [{method, put}]),
     {proceed, [{status,{501,{"PUT", ReqUri, Version},
 			?NICE("Erl mechanism doesn't support method PUT")}}|
 	       Data]};
@@ -268,12 +275,14 @@ erl(#mod{request_uri  = ReqUri,
 	 method       = "DELETE",
          http_version = Version, 
 	 data         = Data}, _ESIBody, _Modules) ->
+    ?hdrt("erl", [{method, delete}]),
     {proceed,[{status,{501,{"DELETE", ReqUri, Version},
 		       ?NICE("Erl mechanism doesn't support method DELETE")}}|
 	      Data]};
 
 erl(#mod{method      = "POST", 
 	 entity_body = Body} = ModData, ESIBody, Modules) ->
+    ?hdrt("erl", [{method, post}]),
     case httpd_util:split(ESIBody,":|%3A|/",2) of
 	{ok,[ModuleName, Function]} ->
 	    generate_webpage(ModData, ESIBody, Modules, 
@@ -289,6 +298,7 @@ generate_webpage(ModData, ESIBody, [all], Module, FunctionName,
 		     FunctionName, Input, ScriptElements);
 generate_webpage(ModData, ESIBody, Modules, Module, FunctionName,
 		 Input, ScriptElements) ->
+    ?hdrt("generate webpage", []),
     Function = list_to_atom(FunctionName),
     case lists:member(Module, Modules) of
 	true ->
@@ -309,8 +319,9 @@ generate_webpage(ModData, ESIBody, Modules, Module, FunctionName,
 
 %% Old API that waits for the dymnamic webpage to be totally generated
 %% before anythig is sent back to the client.
-erl_scheme_webpage_whole(Module, Function, Env, Input, ModData) ->
-    case (catch Module:Function(Env, Input)) of
+erl_scheme_webpage_whole(Mod, Func, Env, Input, ModData) ->
+    ?hdrt("erl_scheme_webpage_whole", [{module, Mod}, {function, Func}]),
+    case (catch Mod:Func(Env, Input)) of
 	{'EXIT',{undef, _}} ->
 	    {proceed, [{status, {404, ModData#mod.request_uri, "Not found"}}
 		       | ModData#mod.data]};
@@ -347,6 +358,7 @@ erl_scheme_webpage_whole(Module, Function, Env, Input, ModData) ->
 %% in small chunks at the time during generation.
 erl_scheme_webpage_chunk(Mod, Func, Env, Input, ModData) -> 
     process_flag(trap_exit, true),
+    ?hdrt("erl_scheme_webpage_chunk", [{module, Mod}, {function, Func}]),
     Self = self(),
     %% Spawn worker that generates the webpage.
     %% It would be nicer to use erlang:function_exported/3 but if the 
@@ -372,9 +384,12 @@ deliver_webpage_chunk(#mod{config_db = Db} = ModData, Pid) ->
     deliver_webpage_chunk(ModData, Pid, Timeout).
 
 deliver_webpage_chunk(#mod{config_db = Db} = ModData, Pid, Timeout) ->
+    ?hdrt("deliver_webpage_chunk", [{timeout, Timeout}]),
     case receive_headers(Timeout) of
 	{error, Reason} ->
 	    %% Happens when webpage generator callback/3 is undefined
+	    ?hdrv("deliver_webpage_chunk - failed receiving headers", 
+		  [{reason, Reason}]),
 	    {error, Reason}; 
 	{Headers, Body} ->
 	    case httpd_esi:handle_headers(Headers) of
@@ -399,6 +414,7 @@ deliver_webpage_chunk(#mod{config_db = Db} = ModData, Pid, Timeout) ->
 				IsDisableChunkedSend)
 	    end;
 	timeout ->
+	    ?hdrv("deliver_webpage_chunk - timeout", []),
 	    send_headers(ModData, {504, "Timeout"},[{"connection", "close"}]),
 	    httpd_socket:close(ModData#mod.socket_type, ModData#mod.socket),
 	    process_flag(trap_exit,false),
@@ -407,11 +423,17 @@ deliver_webpage_chunk(#mod{config_db = Db} = ModData, Pid, Timeout) ->
 
 receive_headers(Timeout) ->
     receive
+	{esi_data, Chunk} ->
+	    ?hdrt("receive_headers - received esi data (esi)", []),
+	    httpd_esi:parse_headers(lists:flatten(Chunk));		
 	{ok, Chunk} ->
+	    ?hdrt("receive_headers - received esi data (ok)", []),
 	    httpd_esi:parse_headers(lists:flatten(Chunk));		
 	{'EXIT', Pid, erl_scheme_webpage_chunk_undefined} when is_pid(Pid) ->
+	    ?hdrd("receive_headers - exit:chunk-undef", []),
 	    {error, erl_scheme_webpage_chunk_undefined};
 	{'EXIT', Pid, Reason} when is_pid(Pid) ->
+	    ?hdrv("receive_headers - exit", [{reason, Reason}]),
 	    exit({mod_esi_linked_process_died, Pid, Reason})
     after Timeout ->
 	    timeout
@@ -427,19 +449,29 @@ handle_body(_, #mod{method = "HEAD"} = ModData, _, _, Size, _) ->
     {proceed, [{response, {already_sent, 200, Size}} | ModData#mod.data]};
 
 handle_body(Pid, ModData, Body, Timeout, Size, IsDisableChunkedSend) ->
+    ?hdrt("handle_body - send chunk", [{timeout, Timeout}, {size, Size}]),
     httpd_response:send_chunk(ModData, Body, IsDisableChunkedSend),
     receive 
+	{esi_data, Data} ->
+	    ?hdrt("handle_body - received data (esi)", []),
+	    handle_body(Pid, ModData, Data, Timeout, Size + length(Data),
+			IsDisableChunkedSend);
 	{ok, Data} ->
+	    ?hdrt("handle_body - received data (ok)", []),
 	    handle_body(Pid, ModData, Data, Timeout, Size + length(Data),
 			IsDisableChunkedSend);
 	{'EXIT', Pid, normal} when is_pid(Pid) ->
+	    ?hdrt("handle_body - exit:normal", []),
 	    httpd_response:send_final_chunk(ModData, IsDisableChunkedSend),
 	    {proceed, [{response, {already_sent, 200, Size}} | 
 		       ModData#mod.data]};
 	{'EXIT', Pid, Reason} when is_pid(Pid) ->
+	    ?hdrv("handle_body - exit", [{reason, Reason}]),
 	    httpd_response:send_final_chunk(ModData, IsDisableChunkedSend),
 	    exit({mod_esi_linked_process_died, Pid, Reason})
+
     after Timeout ->
+	    ?hdrv("handle_body - timeout", []),
 	    process_flag(trap_exit,false),
 	    httpd_response:send_final_chunk(ModData, IsDisableChunkedSend),
 	    exit({mod_esi_linked_process_timeout, Pid})
@@ -473,6 +505,7 @@ eval(#mod{request_uri  = ReqUri,
 	  method       = "PUT",
 	  http_version = Version, 
 	  data         = Data}, _ESIBody, _Modules) ->
+    ?hdrt("eval", [{method, put}]),
     {proceed,[{status,{501,{"PUT", ReqUri, Version},
 		       ?NICE("Eval mechanism doesn't support method PUT")}}|
 	      Data]};
@@ -481,6 +514,7 @@ eval(#mod{request_uri  = ReqUri,
 	  method       = "DELETE",
 	  http_version = Version, 
 	  data         = Data}, _ESIBody, _Modules) ->
+    ?hdrt("eval", [{method, delete}]),
     {proceed,[{status,{501,{"DELETE", ReqUri, Version},
 		       ?NICE("Eval mechanism doesn't support method DELETE")}}|
 	      Data]};
@@ -489,12 +523,14 @@ eval(#mod{request_uri  = ReqUri,
 	  method       = "POST",
 	  http_version = Version, 
 	  data         = Data}, _ESIBody, _Modules) ->
+    ?hdrt("eval", [{method, post}]),
     {proceed,[{status,{501,{"POST", ReqUri, Version},
 		       ?NICE("Eval mechanism doesn't support method POST")}}|
 	      Data]};
 
 eval(#mod{method = Method} = ModData, ESIBody, Modules) 
-  when Method == "GET"; Method == "HEAD" ->
+  when (Method =:= "GET") orelse (Method =:= "HEAD") ->
+    ?hdrt("eval", [{method, Method}]),
     case is_authorized(ESIBody, Modules) of
 	true ->
 	    case generate_webpage(ESIBody) of
diff --git a/lib/inets/src/http_server/mod_get.erl b/lib/inets/src/http_server/mod_get.erl
index 9fd1fcec47..5cb30e3d97 100644
--- a/lib/inets/src/http_server/mod_get.erl
+++ b/lib/inets/src/http_server/mod_get.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -20,7 +20,7 @@
 -module(mod_get).
 -export([do/1]).
 -include("httpd.hrl").
-
+-include("httpd_internal.hrl").
 %% do
 
 do(Info) ->
diff --git a/lib/inets/src/http_server/mod_head.erl b/lib/inets/src/http_server/mod_head.erl
index 8b08d61651..c346fd4d23 100644
--- a/lib/inets/src/http_server/mod_head.erl
+++ b/lib/inets/src/http_server/mod_head.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
diff --git a/lib/inets/src/http_server/mod_htaccess.erl b/lib/inets/src/http_server/mod_htaccess.erl
index d8835198f5..e1f66d01c8 100644
--- a/lib/inets/src/http_server/mod_htaccess.erl
+++ b/lib/inets/src/http_server/mod_htaccess.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -23,6 +23,7 @@
 -export([do/1, load/2, store/2]).
 
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Public methods that interface the eswapi                         %%
diff --git a/lib/inets/src/http_server/mod_include.erl b/lib/inets/src/http_server/mod_include.erl
index 534eba8a36..35f45bdd33 100644
--- a/lib/inets/src/http_server/mod_include.erl
+++ b/lib/inets/src/http_server/mod_include.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -21,6 +21,7 @@
 -export([do/1,parse/2,config/6,include/6,echo/6,fsize/6,flastmod/6,exec/6]).
 
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
 
 -define(VMODULE,"INCLUDE").
 
@@ -186,9 +187,9 @@ document_uri(ConfigDB, RequestURI) ->
     FileName = string:substr(Path,Start,Length),
     case inets_regexp:match(VirtualPath, FileName++"\$") of
 	{match, _, _} ->
-	    httpd_util:decode_hex(VirtualPath)++AfterPath;
+	    http_uri:decode(VirtualPath)++AfterPath;
 	nomatch ->
-	    string:strip(httpd_util:decode_hex(VirtualPath),right,$/)++
+	    string:strip(http_uri:decode(VirtualPath),right,$/)++
 		"/"++FileName++AfterPath
     end.
 
diff --git a/lib/inets/src/http_server/mod_log.erl b/lib/inets/src/http_server/mod_log.erl
index de24d5a569..c8a2ec0dc4 100644
--- a/lib/inets/src/http_server/mod_log.erl
+++ b/lib/inets/src/http_server/mod_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -26,6 +26,7 @@
 -export([do/1, load/2, store/2, remove/1]).
 
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
 -define(VMODULE,"LOG").
 
 %%%=========================================================================
diff --git a/lib/inets/src/http_server/mod_range.erl b/lib/inets/src/http_server/mod_range.erl
index 0698fb9099..a0408cba79 100644
--- a/lib/inets/src/http_server/mod_range.erl
+++ b/lib/inets/src/http_server/mod_range.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -20,7 +20,7 @@
 -module(mod_range).
 -export([do/1]).
 -include("httpd.hrl").
-
+-include("httpd_internal.hrl").
 %% do
 
 do(Info) ->
diff --git a/lib/inets/src/http_server/mod_responsecontrol.erl b/lib/inets/src/http_server/mod_responsecontrol.erl
index 79e2e1bdba..5d5b60cdbd 100644
--- a/lib/inets/src/http_server/mod_responsecontrol.erl
+++ b/lib/inets/src/http_server/mod_responsecontrol.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -22,6 +22,7 @@
 -export([do/1]).
 
 -include("httpd.hrl").
+-include("httpd_internal.hrl").
 
 do(Info) ->
     ?DEBUG("do -> response_control",[]),
diff --git a/lib/inets/src/http_server/mod_security.erl b/lib/inets/src/http_server/mod_security.erl
index 95793e1cfb..41988732ad 100644
--- a/lib/inets/src/http_server/mod_security.erl
+++ b/lib/inets/src/http_server/mod_security.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -32,6 +32,7 @@
 
 -include("httpd.hrl").
 -include("httpd_internal.hrl").
+-include("inets_internal.hrl").
 
 -define(VMODULE,"SEC").
 
diff --git a/lib/inets/src/http_server/mod_security_server.erl b/lib/inets/src/http_server/mod_security_server.erl
index 58060686b3..784b3eba70 100644
--- a/lib/inets/src/http_server/mod_security_server.erl
+++ b/lib/inets/src/http_server/mod_security_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -45,6 +45,7 @@
 
 -include("httpd.hrl").
 -include("httpd_internal.hrl").
+-include("inets_internal.hrl").
 
 -behaviour(gen_server).
 
diff --git a/lib/inets/src/http_server/mod_trace.erl b/lib/inets/src/http_server/mod_trace.erl
index df482228d8..7233925783 100644
--- a/lib/inets/src/http_server/mod_trace.erl
+++ b/lib/inets/src/http_server/mod_trace.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
index 33c9e34a3a..20e22917e2 100644
--- a/lib/inets/src/inets_app/Makefile
+++ b/lib/inets/src/inets_app/Makefile
@@ -47,7 +47,9 @@ MODULES = \
 	inets_sup \
 	inets_regexp
 
-HRL_FILES = inets_internal.hrl
+INTERNAL_HRL_FILES = inets_internal.hrl
+EXTERNAL_HRL_FILES = ../../include/httpd.hrl \
+	../../include/mod_auth.hrl
 
 ERL_FILES = $(MODULES:%=%.erl)
 
@@ -67,18 +69,14 @@ APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
 
 
 # ----------------------------------------------------
-# INETS FLAGS
-# ----------------------------------------------------
-INETS_FLAGS = -D'SERVER_SOFTWARE="$(APPLICATION)/$(VSN)"'
-
-
-# ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
 
-ERL_COMPILE_FLAGS += $(INETS_FLAGS) \
-                     +'{parse_transform,sys_pre_attributes}' \
-                     +'{attribute,insert,app_vsn,$(APP_VSN)}'
+include inets.mk
+
+ERL_COMPILE_FLAGS += \
+	$(INETS_FLAGS) \
+	$(INETS_ERL_COMPILE_FLAGS)
 
 
 # ----------------------------------------------------
@@ -112,7 +110,10 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR)  $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
+	$(INSTALL_DIR)  $(RELSYSDIR)/src/inets_app
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/inets_app
+	$(INSTALL_DIR)  $(RELSYSDIR)/include
+	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(RELSYSDIR)/include
 	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index 04f6365b98..cb036157a5 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -107,5 +107,6 @@
             tftp_sup
         ]},
   {registered,[inets_sup, httpc_manager]},
+  %% If the "new" ssl is used then 'crypto' must be started before inets.
   {applications,[kernel,stdlib]},
   {mod,{inets_app,[]}}]}.
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 718f37b09e..0194c65db9 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,84 +18,24 @@
 
 {"%VSN%",
  [
-  {"5.3.2",
-   [
-    {load_module, http_util, soft_purge, soft_purge, []}, 
-    {load_module, httpc_cookie, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"5.3.1",
-   [
-    {load_module, http_util, soft_purge, soft_purge, []}, 
-    {load_module, httpc, soft_purge, soft_purge, []}, 
-    {load_module, httpc_cookie, soft_purge, soft_purge, []}, 
-    {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
-    {update, httpc_manager, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"5.3",
-   [
-    {load_module, http_util, soft_purge, soft_purge, []}, 
-    {load_module, httpc, soft_purge, soft_purge, []}, 
-    {load_module, httpc_cookie, soft_purge, soft_purge, []}, 
-    {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
-    {update, httpc_manager, soft, soft_purge, soft_purge, []},
-    {load_module, mod_esi, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"5.2",
+  {"5.5",
    [
     {restart_application, inets}
    ]
   }, 
-  {"5.1.3",
+  {"5.4",
    [
     {restart_application, inets}
    ]
-  }, 
-  {"5.1.2",
-   [
-    {restart_application, inets}
-   ]
-  }     
+  } 
  ],
  [	
-  {"5.3.2",
-   [
-    {load_module, http_util, soft_purge, soft_purge, []}, 
-    {load_module, httpc_cookie, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"5.3.1",
-   [
-    {load_module, http_util, soft_purge, soft_purge, []}, 
-    {load_module, httpc, soft_purge, soft_purge, []}, 
-    {load_module, httpc_cookie, soft_purge, soft_purge, []}, 
-    {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
-    {update, httpc_manager, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"5.3",
-   [
-    {load_module, http_util, soft_purge, soft_purge, []}, 
-    {load_module, httpc, soft_purge, soft_purge, []}, 
-    {load_module, httpc_cookie, soft_purge, soft_purge, []}, 
-    {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]},
-    {update, httpc_manager, soft, soft_purge, soft_purge, []},
-    {load_module, mod_esi, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"5.2",
+  {"5.4",
    [
     {restart_application, inets}
    ]
-  }, 
-  {"5.1.3",
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.1.2",
+  },     
+  {"5.4",
    [
     {restart_application, inets}
    ]
diff --git a/lib/inets/src/inets_app/inets.erl b/lib/inets/src/inets_app/inets.erl
index f1fa5fd997..054468e445 100644
--- a/lib/inets/src/inets_app/inets.erl
+++ b/lib/inets/src/inets_app/inets.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2006-2010. 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%
 %%
 %%
@@ -57,7 +57,7 @@ start(Type) ->
 %% Function: start(Service, ServiceConfig [, How]) -> {ok, Pid} | 
 %%                                                {error, Reason}
 %%
-%% Service = - ftpc | tftpd | httpc | httpd
+%% Service = - ftpc | tftpd | tftpc | tftp | httpc | httpd
 %% ServiceConfig = ConfPropList | ConfFile
 %% ConfPropList = [{Property, Value}] according to service 
 %% ConfFile = Path - when service is httpd
@@ -100,7 +100,7 @@ stop() ->
 %%--------------------------------------------------------------------
 %% Function: stop(Service, Pid) -> ok
 %%
-%% Service - ftp | tftpd | http | httpd | stand_alone
+%% Service - ftpc | ftp | tftpd | tftpc | tftp | httpc | httpd | stand_alone
 %%
 %% Description: Stops a started service of the inets application or takes
 %% down a stand alone "service" gracefully.
@@ -382,7 +382,7 @@ key1search(Key, Vals, Def) ->
 %% Description: Returns a list of supported services
 %%-------------------------------------------------------------------
 service_names() ->
-    [ftpc, tftpd, httpc, httpd].
+    [ftpc, tftp, httpc, httpd].
 
 
 %%-----------------------------------------------------------------
@@ -725,8 +725,8 @@ call_service(Service, Call, Args) ->
 	
 service_module(tftpd) ->
     tftp;
-service_module(httpc) ->
-    httpc;
+service_module(tftpc) ->
+    tftp;
 service_module(ftpc) ->
     ftp;
 service_module(Service) ->
diff --git a/lib/inets/src/inets_app/inets.mk b/lib/inets/src/inets_app/inets.mk
new file mode 100644
index 0000000000..b6e9fe1d96
--- /dev/null
+++ b/lib/inets/src/inets_app/inets.mk
@@ -0,0 +1,45 @@
+#-*-makefile-*-   ; force emacs to enter makefile-mode
+
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2010. 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%
+
+ifeq ($(INETS_TRACE), io)
+ERL_COMPILE_FLAGS += -Dinets_trace_io
+endif
+
+ifeq ($(INETS_DEBUG), true)
+ERL_COMPILE_FLAGS += -Dinets_debug
+endif
+
+ifeq ($(USE_INETS_HIPE), true)
+ERL_COMPILE_FLAGS += +native
+endif
+
+ifeq ($(WARN_UNUSED_WARS), true)
+ERL_COMPILE_FLAGS += +warn_unused_vars
+endif
+
+INETS_APP_VSN_COMPILE_FLAGS = \
+	+'{parse_transform,sys_pre_attributes}' \
+	+'{attribute,insert,app_vsn,$(APP_VSN)}'
+
+INETS_FLAGS = -D'SERVER_SOFTWARE="$(APPLICATION)/$(VSN)"'
+
+INETS_ERL_COMPILE_FLAGS += \
+	-pa $(ERL_TOP)/lib/inets/ebin  \
+	$(INETS_APP_VSN_COMPILE_FLAGS) 
+
diff --git a/lib/inets/src/inets_app/inets_service.erl b/lib/inets/src/inets_app/inets_service.erl
index 3499314d54..e9eb9892f2 100644
--- a/lib/inets/src/inets_app/inets_service.erl
+++ b/lib/inets/src/inets_app/inets_service.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2007-2010. 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%
 %%
 %%
@@ -61,5 +61,5 @@ behaviour_info(_) ->
 
 
 %% service_info() -> [{Property, Value}] | {error, Reason}
-%% ex: http:service_info() -> [{profile, ProfileName}] 
+%% ex: httpc:service_info() -> [{profile, ProfileName}] 
 %%     httpd:service_info() -> [{host, Host}, {port, Port}]
diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile
index b4339da1e2..759b70c8e4 100644
--- a/lib/inets/src/tftp/Makefile
+++ b/lib/inets/src/tftp/Makefile
@@ -56,17 +56,16 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 
 # ----------------------------------------------------
-# INETS FLAGS
+# FLAGS
 # ----------------------------------------------------
-INETS_FLAGS = -D'SERVER_SOFTWARE="$(APPLICATION)/$(VSN)"'
 
+include ../inets_app/inets.mk
 
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS += $(INETS_FLAGS) \
-                     +'{parse_transform,sys_pre_attributes}' \
-                     +'{attribute,insert,app_vsn,$(APP_VSN)}'
+ERL_COMPILE_FLAGS += \
+	$(INETS_FLAGS) \
+        $(INETS_ERL_COMPILE_FLAGS) \
+	-I../../include \
+	-I../inets_app
 
 
 # ----------------------------------------------------
@@ -87,9 +86,10 @@ docs:
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR)  $(RELSYSDIR)/src
+	$(INSTALL_DIR)  $(RELSYSDIR)/src/tftp
+	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) $(RELSYSDIR)/src/tftp
+	$(INSTALL_DIR)  $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
 
 release_docs_spec:
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile
index 668752da9e..4b803cfbe2 100644
--- a/lib/inets/test/Makefile
+++ b/lib/inets/test/Makefile
@@ -143,6 +143,8 @@ else
   INETS_FLAGS += -Dhttpd_security_verbosity=log
 endif
 
+INETS_FLAGS += -pa ../../inets/ebin
+
 INETS_ROOT = ../../inets
 
 MODULES =                 		\
@@ -198,7 +200,8 @@ SOURCE = $(ERL_FILES) $(HRL_FILES)
 
 TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
-INETS_SPECS = inets.spec inets.spec.vxworks
+INETS_SPECS = inets.spec
+COVER_FILE = inets.cover
 INETS_FILES = inets.config $(INETS_SPECS)
 
 # SUB_SUITES = \
@@ -220,10 +223,10 @@ MAKE_EMAKE = $(wildcard $(ERL_TOP)/make/make_emakefile)
 
 ifeq ($(MAKE_EMAKE),)
 BUILDTARGET   = $(TARGET_FILES)
-RELTEST_FILES = $(INETS_SPECS) $(SOURCE)
+RELTEST_FILES = $(COVER_FILE) $(INETS_SPECS) $(SOURCE)
 else
 BUILDTARGET   = emakebuild
-RELTEST_FILES = $(EMAKEFILE) $(INETS_SPECS) $(SOURCE)
+RELTEST_FILES = $(EMAKEFILE) $(COVER_FILE) $(INETS_SPECS) $(SOURCE)
 endif
 
 
@@ -241,8 +244,11 @@ RELTESTSYSBINDIR     = $(RELTESTSYSALLDATADIR)/bin
 # The path to the test_server ebin dir is needed when 
 # running the target "targets".
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += -pa ../../../internal_tools/test_server/ebin \
-                     $(INCLUDES) $(FTP_FLAGS) $(INETS_FLAGS)
+ERL_COMPILE_FLAGS += \
+	-pa ../../../internal_tools/test_server/ebin \
+	$(INCLUDES) \
+	$(FTP_FLAGS) \
+	$(INETS_FLAGS)
 
 # ----------------------------------------------------
 # Targets
@@ -283,16 +289,20 @@ release_spec: opt
 	$(INSTALL_DATA) $(INETS_FILES) $(RELSYSDIR)/test
 	@for d in $(DATADIRS); do \
             echo "installing data dir $$d"; \
-            echo $$d/TAR.exclude2 > $$d/TAR.exclude2; \
-            cat $$d/TAR.exclude >> $$d/TAR.exclude2; \
-            find $$d -name '*.contrib*'     >> $$d/TAR.exclude2; \
-            find $$d -name '*.keep*'        >> $$d/TAR.exclude2; \
-            find $$d -name '*.mkelem*'      >> $$d/TAR.exclude2; \
-            find $$d -name '*~'             >> $$d/TAR.exclude2; \
-            find $$d -name 'erl_crash.dump' >> $$d/TAR.exclude2; \
-            find $$d -name 'core'           >> $$d/TAR.exclude2; \
-            find $$d -name '.cmake.state'   >> $$d/TAR.exclude2; \
-            tar cfX - $$d/TAR.exclude2 $$d | (cd $(RELSYSDIR)/test; tar xf -); \
+            if test -f $$d/TAR.exclude; then \
+                echo $$d/TAR.exclude2 > $$d/TAR.exclude2; \
+                cat $$d/TAR.exclude >> $$d/TAR.exclude2; \
+                find $$d -name '*.contrib*'     >> $$d/TAR.exclude2; \
+                find $$d -name '*.keep*'        >> $$d/TAR.exclude2; \
+                find $$d -name '*.mkelem*'      >> $$d/TAR.exclude2; \
+                find $$d -name '*~'             >> $$d/TAR.exclude2; \
+                find $$d -name 'erl_crash.dump' >> $$d/TAR.exclude2; \
+                find $$d -name 'core'           >> $$d/TAR.exclude2; \
+                find $$d -name '.cmake.state'   >> $$d/TAR.exclude2; \
+                tar cfX - $$d/TAR.exclude2 $$d | (cd $(RELSYSDIR)/test; tar xf -); \
+            else \
+                tar cf - $$d | (cd $(RELSYSDIR)/test; tar xf -); \
+            fi; \
         done
 
 release_tests_spec: opt
diff --git a/lib/inets/test/ftp_SUITE.erl b/lib/inets/test/ftp_SUITE.erl
index e7404f945b..7059bb12cf 100644
--- a/lib/inets/test/ftp_SUITE.erl
+++ b/lib/inets/test/ftp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -20,29 +20,14 @@
 
 -module(ftp_SUITE).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 % -export([init_per_testcase/2, end_per_testcase/2]).
 -export([init_per_suite/1, end_per_suite/1]).
 
-%% Test cases must be exported.
--export([solaris8_test/1,
-	 solaris9_test/1,
-	 solaris10_test/1,
-	 linux_x86_test/1,
-	 linux_ppc_test/1,
-	 macosx_x86_test/1,
-	 macosx_ppc_test/1,
-	 openbsd_test/1,
-	 freebsd_test/1,
-	 netbsd_test/1,
-	 windows_xp_test/1,
-	 windows_2003_server_test/1,
-	 ticket_tests/1]).
-
 -define(FTP_USER, "anonymous").
 -define(FTP_PASS, passwd()).
 -define(FTP_PORT, 21).
@@ -72,52 +57,44 @@
 %% Description: Returns documentation/test cases in this test suite
 %%		or a skip tuple if the platform is not supported.  
 %%--------------------------------------------------------------------
-all(doc) ->
-    ["Test the ftp client in the inets application."];
-all(suite) ->
-    [
-     solaris8_test,
-     solaris9_test,
-     solaris10_test,
-     linux_x86_test,
-     linux_ppc_test,
-     macosx_x86_test,
-     macosx_ppc_test,
-     openbsd_test,
-     freebsd_test,
-     netbsd_test,
-     windows_xp_test,
-     windows_2003_server_test,
-     ticket_tests
-    ].
-
-solaris8_test(suite) ->
-    [{ftp_solaris8_sparc_test,all}].
-solaris9_test(suite) ->
-    [{ftp_solaris9_sparc_test,all}].
-solaris10_test(suite) ->
-    [{ftp_solaris10_sparc_test,all}, {ftp_solaris10_x86_test,all}].
-linux_x86_test(suite) ->
-    [{ftp_linux_x86_test,all}].
-linux_ppc_test(suite) ->
-    [{ftp_linux_ppc_test,all}].
-macosx_x86_test(suite) ->
-    [{ftp_macosx_x86_test,all}].
-macosx_ppc_test(suite) ->
-    [{ftp_macosx_ppc_test,all}].
-openbsd_test(suite) ->
-    [{ftp_openbsd_x86_test,all}].
-freebsd_test(suite) ->
-    [{ftp_freebsd_x86_test,all}].
-netbsd_test(suite) ->
-    [{ftp_netbsd_x86_test,all}].
-windows_xp_test(suite) ->
-    [{ftp_windows_xp_test,all}].
-windows_2003_server_test(suite) ->
-    [{ftp_windows_2003_server_test,all}].
-
-ticket_tests(suite) ->
-    [{ftp_ticket_test, all}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, solaris8_test}, {group, solaris9_test},
+     {group, solaris10_test}, {group, linux_x86_test},
+     {group, linux_ppc_test}, {group, macosx_x86_test},
+     {group, macosx_ppc_test}, {group, openbsd_test},
+     {group, freebsd_test}, {group, netbsd_test},
+     {group, windows_xp_test},
+     {group, windows_2003_server_test},
+     {group, ticket_tests}].
+
+groups() -> 
+    [{solaris8_test, [], [{ftp_solaris8_sparc_test, all}]},
+     {solaris9_test, [], [{ftp_solaris9_sparc_test, all}]},
+     {solaris10_test, [],
+      [{ftp_solaris10_sparc_test, all},
+       {ftp_solaris10_x86_test, all}]},
+     {linux_x86_test, [], [{ftp_linux_x86_test, all}]},
+     {linux_ppc_test, [], [{ftp_linux_ppc_test, all}]},
+     {macosx_x86_test, [], [{ftp_macosx_x86_test, all}]},
+     {macosx_ppc_test, [], [{ftp_macosx_ppc_test, all}]},
+     {openbsd_test, [], [{ftp_openbsd_x86_test, all}]},
+     {freebsd_test, [], [{ftp_freebsd_x86_test, all}]},
+     {netbsd_test, [], [{ftp_netbsd_x86_test, all}]},
+     {windows_xp_test, [], [{ftp_windows_xp_test, all}]},
+     {windows_2003_server_test, [],
+      [{ftp_windows_2003_server_test, all}]},
+     {ticket_tests, [], [{ftp_ticket_test, all}]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+
 
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
diff --git a/lib/inets/test/ftp_format_SUITE.erl b/lib/inets/test/ftp_format_SUITE.erl
index 9ca6575b2d..3a8cb9a3d0 100644
--- a/lib/inets/test/ftp_format_SUITE.erl
+++ b/lib/inets/test/ftp_format_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -20,23 +20,44 @@
 -module(ftp_format_SUITE).
 -author('[email protected]').
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 -include("ftp_internal.hrl").
 
 %% Test server specific exports
--export([all/1, init_per_testcase/2, end_per_testcase/2]).
+-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]).
 
 %% Test cases must be exported.
--export([ftp_response/1, ftp_150/1, 
-	 ftp_200/1,  ftp_220/1, ftp_226/1, ftp_257/1, ftp_331/1, ftp_425/1, 
-	 ftp_other_status_codes/1, ftp_multiple_lines/1, 
-	 ftp_multipel_ctrl_messages/1, format_error/1]).
+-export([ ftp_150/1, 
+	  ftp_200/1,  ftp_220/1, ftp_226/1, ftp_257/1, ftp_331/1, ftp_425/1, 
+	  ftp_other_status_codes/1, ftp_multiple_lines/1, 
+	  ftp_multipel_ctrl_messages/1, format_error/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, ftp_response}, format_error].
+
+groups() -> 
+    [{ftp_response, [],
+      [ftp_150, ftp_200, ftp_220, ftp_226, ftp_257, ftp_331,
+       ftp_425, ftp_other_status_codes, ftp_multiple_lines,
+       ftp_multipel_ctrl_messages]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(doc) ->
-    ["Test library functions for the ftp client."];
-all(suite) ->
-    [ftp_response, format_error].
 
 init_per_testcase(_, Config) ->
     Dog = test_server:timetrap(?t:minutes(1)),
@@ -51,14 +72,6 @@ end_per_testcase(_, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-ftp_response(doc) ->
-    ["Test ftp_response:parse_lines/3 and ftp_response:interpret/1."
-     " This test case will simulate that the "
-     "message will be recived a little at the time on a socket and the "
-     "package may be broken up into smaller parts at arbitrary point."];
-ftp_response(suite) ->
-    [ftp_150, ftp_200,  ftp_220, ftp_226, ftp_257, ftp_331, ftp_425, 
-     ftp_other_status_codes, ftp_multiple_lines, ftp_multipel_ctrl_messages].
 
 ftp_150(doc) ->
     ["Especially check that respons can be devided in a random place."];
diff --git a/lib/inets/test/ftp_freebsd_x86_test.erl b/lib/inets/test/ftp_freebsd_x86_test.erl
index 457e18ffbe..1d66779882 100644
--- a/lib/inets/test/ftp_freebsd_x86_test.erl
+++ b/lib/inets/test/ftp_freebsd_x86_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -22,7 +22,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -86,23 +86,30 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+    [open, open_port, {group, passive}, {group, active},
+     api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/ftp_linux_ppc_test.erl b/lib/inets/test/ftp_linux_ppc_test.erl
index ad38137678..bba97237f1 100644
--- a/lib/inets/test/ftp_linux_ppc_test.erl
+++ b/lib/inets/test/ftp_linux_ppc_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -23,7 +23,7 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -87,23 +87,30 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+    [open, open_port, {group, passive}, {group, active},
+     api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/ftp_linux_x86_test.erl b/lib/inets/test/ftp_linux_x86_test.erl
index b9c88d121a..bbefd8231e 100644
--- a/lib/inets/test/ftp_linux_x86_test.erl
+++ b/lib/inets/test/ftp_linux_x86_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -22,7 +22,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -86,30 +86,30 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
-
-all(suite) -> 
-    [
-     open, 
-     open_port, 
-     passive, 
-     active, 
-     api_missuse,
-     not_owner, 
-     progress_report
-    ].
+all() -> 
+    [open, open_port, {group, passive}, {group, active},
+     api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/ftp_macosx_ppc_test.erl b/lib/inets/test/ftp_macosx_ppc_test.erl
index cf548a73c0..c9f33b8beb 100644
--- a/lib/inets/test/ftp_macosx_ppc_test.erl
+++ b/lib/inets/test/ftp_macosx_ppc_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -22,7 +22,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -87,21 +87,28 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+[open, open_port, {group, passive}, {group, active},
+ api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+ {active, [], ftp_suite_lib:active(suite)},
+ {progress_report, [],
+  ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/ftp_macosx_x86_test.erl b/lib/inets/test/ftp_macosx_x86_test.erl
index c59a992421..17b7160b95 100644
--- a/lib/inets/test/ftp_macosx_x86_test.erl
+++ b/lib/inets/test/ftp_macosx_x86_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -22,7 +22,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -86,29 +86,36 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+[open, open_port, {group, passive}, {group, active},
+ api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+ {active, [], ftp_suite_lib:active(suite)},
+ {progress_report, [],
+  ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
 passive_cd(X) -> ?LIB_MOD:passive_cd(X).
 passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
 passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
+passive_nlist(X) -> ?LIB_MOD:passive_nlist([{wildcard_support, false} | X]).
 passive_rename(X) -> ?LIB_MOD:passive_rename(X).
 passive_delete(X) -> ?LIB_MOD:passive_delete(X).
 passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
@@ -129,7 +136,7 @@ active_pwd(X) -> ?LIB_MOD:active_pwd(X).
 active_cd(X) -> ?LIB_MOD:active_cd(X).
 active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
 active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
+active_nlist(X) -> ?LIB_MOD:active_nlist([{wildcard_support, false} | X]). 
 active_rename(X) -> ?LIB_MOD:active_rename(X). 
 active_delete(X) -> ?LIB_MOD:active_delete(X). 
 active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
diff --git a/lib/inets/test/ftp_netbsd_x86_test.erl b/lib/inets/test/ftp_netbsd_x86_test.erl
index a5711b7bde..bb474852c5 100644
--- a/lib/inets/test/ftp_netbsd_x86_test.erl
+++ b/lib/inets/test/ftp_netbsd_x86_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -22,7 +22,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -86,22 +86,29 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+    [open, open_port, {group, passive}, {group, active},
+     api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/ftp_openbsd_x86_test.erl b/lib/inets/test/ftp_openbsd_x86_test.erl
index 4833b6332b..54fce702a0 100644
--- a/lib/inets/test/ftp_openbsd_x86_test.erl
+++ b/lib/inets/test/ftp_openbsd_x86_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -23,7 +23,7 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -87,23 +87,30 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+    [open, open_port, {group, passive}, {group, active},
+     api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/ftp_solaris10_sparc_test.erl b/lib/inets/test/ftp_solaris10_sparc_test.erl
index 6066195f9b..0da50dc91b 100644
--- a/lib/inets/test/ftp_solaris10_sparc_test.erl
+++ b/lib/inets/test/ftp_solaris10_sparc_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -22,7 +22,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -87,23 +87,30 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+    [open, open_port, {group, passive}, {group, active},
+     api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/ftp_solaris10_x86_test.erl b/lib/inets/test/ftp_solaris10_x86_test.erl
index 3bd99fc3f2..3e7045bb4d 100644
--- a/lib/inets/test/ftp_solaris10_x86_test.erl
+++ b/lib/inets/test/ftp_solaris10_x86_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2010. 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
@@ -22,7 +22,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD, ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_), ?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -88,23 +88,30 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+    [open, open_port, {group, passive}, {group, active},
+     api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/ftp_solaris8_sparc_test.erl b/lib/inets/test/ftp_solaris8_sparc_test.erl
index 9764071cd9..23dbfc8fe3 100644
--- a/lib/inets/test/ftp_solaris8_sparc_test.erl
+++ b/lib/inets/test/ftp_solaris8_sparc_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -22,7 +22,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -86,22 +86,29 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+    [open, open_port, {group, passive}, {group, active},
+     api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 %% Test cases starts here.
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X). 
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/ftp_solaris9_sparc_test.erl b/lib/inets/test/ftp_solaris9_sparc_test.erl
index a9f77bbdac..896e2f497f 100644
--- a/lib/inets/test/ftp_solaris9_sparc_test.erl
+++ b/lib/inets/test/ftp_solaris9_sparc_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -22,7 +22,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -85,22 +85,29 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+    [open, open_port, {group, passive}, {group, active},
+     api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 %% Test cases starts here.
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/ftp_suite_lib.erl b/lib/inets/test/ftp_suite_lib.erl
index 75e1a5a7f9..5ae0298b29 100644
--- a/lib/inets/test/ftp_suite_lib.erl
+++ b/lib/inets/test/ftp_suite_lib.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2005-2010. 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%
 %%
 %%
@@ -21,8 +21,8 @@
 -module(ftp_suite_lib).
 
 
--include("test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("test_server/include/test_server_line.hrl").
 -include("inets_test_lib.hrl").
 
 %% Test server specific exports
@@ -48,14 +48,17 @@
 
 -ifdef(ftp_debug_client).
 -define(ftp_open(Host, Flags), 
-	do_ftp_open(Host, [debug, {timeout, timer:seconds(15)}] ++ Flags)).
+	do_ftp_open(Host, [{debug, debug}, 
+			   {timeout, timer:seconds(15)} | Flags])).
 -else.
 -ifdef(ftp_trace_client).
 -define(ftp_open(Host, Flags), 
-	do_ftp_open(Host, [trace, {timeout, timer:seconds(15)}] ++ Flags)).
+	do_ftp_open(Host, [{debug, trace}, 
+			   {timeout, timer:seconds(15)} | Flags])).
 -else.
 -define(ftp_open(Host, Flags), 
-	do_ftp_open(Host, [verbose, {timeout, timer:seconds(15)}] ++ Flags)).
+	do_ftp_open(Host, [{verbose, true}, 
+			   {timeout, timer:seconds(15)} | Flags])).
 -endif.
 -endif.
 
@@ -71,7 +74,7 @@ tickets(suite) ->
 ftpd_init(FtpdTag, Config) ->
     %% Get the host name(s) of FTP server
     Hosts = 
-	case ?config(ftpd_hosts, Config) of
+	case ct:get_config(ftpd_hosts) of
 	    undefined ->
 		ftpd_hosts(data_dir(Config));
 	    H ->
@@ -113,9 +116,7 @@ get_ftpd_host([Host|Hosts]) ->
     p("get_ftpd_host -> entry with"
       "~n   Host: ~p"
       "~n", [Host]),
-    case (catch ftp:open({option_list, 
-			  [{host, Host}, {port, ?FTP_PORT}, 
-			   {timeout, 20000}]})) of
+    case (catch ftp:open(Host, [{port, ?FTP_PORT}, {timeout, 20000}])) of
 	{ok, Pid} ->
 	    (catch ftp:close(Pid)),
 	    {ok, Host};
@@ -128,7 +129,7 @@ get_ftpd_host([Host|Hosts]) ->
 
 dirty_select_ftpd_host(Config) ->
     Hosts = 
-	case ?config(ftpd_hosts, Config) of
+	case ct:get_config(ftpd_hosts) of
 	    undefined ->
 		ftpd_hosts(data_dir(Config));
 	    H ->
@@ -212,7 +213,7 @@ do_init_per_testcase(Case, Config)
     inets:start(),
     NewConfig = close_connection(watch_dog(Config)),
     Host = ftp_host(Config), 
-    case (catch ?ftp_open(Host, [])) of
+    case (catch ?ftp_open(Host, [{mode, passive}])) of
 	{ok, Pid} ->
 	    [{ftp, Pid} | data_dir(NewConfig)];
 	{skip, _} = SKIP ->
@@ -225,9 +226,8 @@ do_init_per_testcase(Case, Config)
     inets:start(),
     NewConfig = close_connection(watch_dog(Config)),
     Host = ftp_host(Config), 
-    case (catch ?ftp_open(Host, [])) of
+    case (catch ?ftp_open(Host, [{mode, active}])) of
 	{ok, Pid} ->
-	    ok = ftp:force_active(Pid),
 	    [{ftp, Pid} | data_dir(NewConfig)];
 	{skip, _} = SKIP ->
 	    SKIP
@@ -240,11 +240,10 @@ do_init_per_testcase(Case, Config)
     io:format(user, "~n~n*** INIT ~w:~w ***~n~n", [?MODULE, Case]),
     NewConfig = close_connection(watch_dog(Config)),
     Host = ftp_host(Config), 
-    Opts = [{host, Host}, 
-	    {port, ?FTP_PORT},
-	    {flags, [verbose]},
+    Opts = [{port,     ?FTP_PORT},
+	    {verbose,  true},
 	    {progress, {?MODULE, progress, #progress{}}}], 
-    case ftp:open({option_list, Opts}) of
+    case ftp:open(Host, Opts) of
 	{ok, Pid} ->
 	    ok = ftp:user(Pid, ?FTP_USER, ?FTP_PASS),
 	    [{ftp, Pid} | data_dir(NewConfig)];
@@ -257,22 +256,23 @@ do_init_per_testcase(Case, Config) ->
     inets:start(),
     NewConfig = close_connection(watch_dog(Config)),
     Host = ftp_host(Config), 
-    Flags = 
+    Opts1 = 
 	if 
 	    ((Case =:= passive_ip_v6_disabled) orelse
 	     (Case =:= active_ip_v6_disabled)) ->
- 		[ip_v6_disabled];
+ 		[{ipfamily, inet}];
  	    true ->
  		[]
  	end,
-    case (catch ?ftp_open(Host, Flags)) of
+    Opts2 = 
+	case string:tokens(atom_to_list(Case), [$_]) of
+	    [_, "active" | _] ->
+		[{mode, active}  | Opts1];
+	    _ ->
+		[{mode, passive} | Opts1]
+	end,
+    case (catch ?ftp_open(Host, Opts2)) of
 	{ok, Pid} ->
-	    case string:tokens(atom_to_list(Case), [$_]) of
-		[_, "active"|_] ->
-		    ok = ftp:force_active(Pid);
-		_ ->
-		    ok
-	    end,
 	    ok = ftp:user(Pid, ?FTP_USER, ?FTP_PASS),
 	    [{ftp, Pid} | data_dir(NewConfig)];
 	{skip, _} = SKIP ->
@@ -365,6 +365,7 @@ open(Config) when is_list(Config) ->
     Host = ftp_host(Config), 
     (catch tc_open(Host)).
 
+
 tc_open(Host) ->
     {ok, Pid} = ?ftp_open(Host, []),
     ok = ftp:close(Pid),
@@ -374,8 +375,9 @@ tc_open(Host) ->
 				{flags, [verbose]}, 
 				{timeout, 30000}]}),
     ok = ftp:close(Pid1),
-    {error, ehost} = ftp:open({option_list, [{port, ?FTP_PORT}, 
-					     {flags, [verbose]}]}),
+    
+    {error, ehost} = 
+	ftp:open({option_list, [{port, ?FTP_PORT}, {flags, [verbose]}]}),
     {ok, Pid2} = ftp:open(Host),
     ok = ftp:close(Pid2),
     
@@ -408,6 +410,15 @@ tc_open(Host) ->
 				{mode, cool}]}),
     test_server:sleep(100),
     ok = ftp:close(Pid6),
+
+    {ok, Pid7} = 
+	ftp:open(Host, [{port, ?FTP_PORT}, {verbose, true}, {timeout, 30000}]),
+    ok = ftp:close(Pid7),
+
+    {ok, Pid8} = 
+	ftp:open(Host, ?FTP_PORT),
+    ok = ftp:close(Pid8),
+
     ok.
 
     
@@ -420,7 +431,7 @@ open_port(suite) ->
     [];
 open_port(Config) when is_list(Config) ->
     Host = ftp_host(Config), 
-    {ok, Pid} = ftp:open(Host, ?FTP_PORT),
+    {ok, Pid} = ftp:open(Host, [{port, ?FTP_PORT}]),
     ok = ftp:close(Pid),
     {error, ehost} = ftp:open(?BAD_HOST, []),
     ok.
@@ -497,7 +508,8 @@ passive_nlist(suite) ->
     [];
 passive_nlist(Config) when is_list(Config) ->
     Pid = ?config(ftp, Config),
-    do_nlist(Pid).
+    WildcardSupport = ?config(wildcard_support, Config),
+    do_nlist(Pid, WildcardSupport).
 
 
 %%-------------------------------------------------------------------------
@@ -757,7 +769,8 @@ active_nlist(suite) ->
     [];
 active_nlist(Config) when is_list(Config) ->
     Pid = ?config(ftp, Config),
-    do_nlist(Pid).
+    WildcardSupport = ?config(wildcard_support, Config),
+    do_nlist(Pid, WildcardSupport).
 
 
 %%-------------------------------------------------------------------------
@@ -954,26 +967,39 @@ api_missuse(doc)->
     ["Test that behaviour of the ftp process if the api is abused"];
 api_missuse(suite) -> [];
 api_missuse(Config) when is_list(Config) ->
+    io:format("api_missuse -> entry~n", []),
+    Flag =  process_flag(trap_exit, true),
     Pid = ?config(ftp, Config),
     Host = ftp_host(Config), 
-
+    
     %% Serious programming fault, connetion will be shut down 
-    {error, {connection_terminated, 'API_violation'}} =
-	gen_server:call(Pid, {self(), foobar, 10}, infinity),
+    io:format("api_missuse -> verify bad call termination (~p)~n", [Pid]),
+    case (catch gen_server:call(Pid, {self(), foobar, 10}, infinity)) of
+	{error, {connection_terminated, 'API_violation'}} ->
+	    ok;
+	Unexpected1 ->
+	    exit({unexpected_result, Unexpected1})
+    end,
     test_server:sleep(500),
     undefined = process_info(Pid, status),
 
+    io:format("api_missuse -> start new client~n", []),
     {ok, Pid2} =  ?ftp_open(Host, []),
     %% Serious programming fault, connetion will be shut down 
+    io:format("api_missuse -> verify bad cast termination~n", []),
     gen_server:cast(Pid2, {self(), foobar, 10}),
     test_server:sleep(500),
     undefined = process_info(Pid2, status),
 
+    io:format("api_missuse -> start new client~n", []),
     {ok, Pid3} =  ?ftp_open(Host, []),
     %% Could be an innocent misstake the connection lives. 
+    io:format("api_missuse -> verify bad bang~n", []),
     Pid3 ! foobar, 
     test_server:sleep(500),
     {status, _} = process_info(Pid3, status),
+    process_flag(trap_exit, Flag),
+    io:format("api_missuse -> done~n", []),
     ok.
 
 
@@ -1218,16 +1244,20 @@ do_ls(Pid) ->
     {ok, _} = ftp:ls(Pid, "incom*"),
     ok.
 
-do_nlist(Pid) ->
+do_nlist(Pid, WildcardSupport) ->
     {ok, _} = ftp:nlist(Pid),
     {ok, _} = ftp:nlist(Pid, "incoming"),
     %% neither nlist nor ls operates on a directory
     %% they operate on a pathname, which *can* be a 
     %% directory, but can also be a filename or a group 
     %% of files (including wildcards).
-    {ok, _} = ftp:nlist(Pid, "incom*"),
-%%     {error, epath} = ftp:nlist(Pid, ?BAD_DIR),
-    ok.
+    case WildcardSupport of
+	true ->
+	    {ok, _} = ftp:nlist(Pid, "incom*"),
+	    ok;
+	_ ->
+	    ok
+    end.
 
 do_rename(Pid, Config) ->
     PrivDir = ?config(priv_dir, Config),
@@ -1525,11 +1555,11 @@ split([C| Cs], I, Is) ->
 split([], I, Is) ->
     lists:reverse([lists:reverse(I)| Is]).
 
-do_ftp_open(Host, Flags) ->
+do_ftp_open(Host, Opts) ->
     io:format("do_ftp_open -> entry with"
-	      "~n   Host:  ~p"
-	      "~n   Flags: ~p", [Host, Flags]), 
-    case ftp:open(Host, Flags) of
+	      "~n   Host: ~p"
+	      "~n   Opts: ~p", [Host, Opts]), 
+    case ftp:open(Host, Opts) of
 	{ok, _} = OK ->
 	    OK;
 	{error, Reason} ->
diff --git a/lib/inets/test/ftp_ticket_test.erl b/lib/inets/test/ftp_ticket_test.erl
index 6748df03bb..fe4ab35728 100644
--- a/lib/inets/test/ftp_ticket_test.erl
+++ b/lib/inets/test/ftp_ticket_test.erl
@@ -35,17 +35,27 @@ end_per_testcase(Case, Config) ->
     ftp_suite_lib:end_per_testcase(Case, Config).
 
 
-all(suite) ->
-    {conf,init,tickets(),fin}.
+all() -> 
+    tickets().
 
-init(Config) ->
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(Config) ->
     ?LIB_MOD:ftpd_init(ticket_test, Config).
 
-tickets() ->
+tickets() -> 
     [ticket_6035].
 
 
-fin(Config) ->
+end_per_suite(Config) ->
     ?LIB_MOD:ftpd_fin(Config).
 
 ticket_6035(X) -> ?LIB_MOD:ticket_6035(X).
diff --git a/lib/inets/test/ftp_windows_2003_server_test.erl b/lib/inets/test/ftp_windows_2003_server_test.erl
index d24318d04f..57f1ae8358 100644
--- a/lib/inets/test/ftp_windows_2003_server_test.erl
+++ b/lib/inets/test/ftp_windows_2003_server_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -22,7 +22,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -86,22 +86,29 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+    [open, open_port, {group, passive}, {group, active},
+     api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 %% Test cases starts here.
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/ftp_windows_xp_test.erl b/lib/inets/test/ftp_windows_xp_test.erl
index bc161e4f6a..06d919ba00 100644
--- a/lib/inets/test/ftp_windows_xp_test.erl
+++ b/lib/inets/test/ftp_windows_xp_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -22,7 +22,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(LIB_MOD,ftp_suite_lib).
 -define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
@@ -86,20 +86,27 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test ftp client"];
+all() -> 
+    [open, open_port, {group, passive}, {group, active},
+     api_missuse, not_owner, {group, progress_report}].
+
+groups() -> 
+    [{passive, [], ftp_suite_lib:passive(suite)},
+     {active, [], ftp_suite_lib:active(suite)},
+     {progress_report, [],
+      ftp_suite_lib:progress_report(suite)}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> 
-    [open, open_port, passive, active, api_missuse,
-     not_owner, progress_report].
 
 open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
 open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-passive(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:passive/1).
-active(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:active/1).
 api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
 not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-progress_report(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:progress_report/1).
 
 passive_user(X) -> ?LIB_MOD:passive_user(X).
 passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index 79945f0f4d..f05dfd78bc 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -21,28 +21,49 @@
 -module(http_format_SUITE).
 -author('[email protected]').
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 -include("http_internal.hrl").
 
 %% Test server specific exports
--export([all/1, init_per_testcase/2, end_per_testcase/2]).
+-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]).
 
 %% Test cases must be exported.
--export([chunk/1, chunk_decode/1, chunk_encode/1,
-	 chunk_extensions_otp_6005/1, chunk_decode_otp_6264/1,
-	 chunk_decode_empty_chunk_otp_6511/1,
-	 chunk_decode_trailer/1,
-	 http_response/1, http_request/1, validate_request_line/1, script/1,
-	 esi_parse_headers/1, cgi_parse_headers/1,
-	 is_absolut_uri/1, convert_netscapecookie_date/1]).
-
-all(doc) ->
-    ["Test library functions to the http client and server."];
-all(suite) ->
-    [chunk,
-     http_response, http_request, validate_request_line,
-     script, is_absolut_uri, convert_netscapecookie_date].
+-export([ chunk_decode/1, chunk_encode/1,
+	  chunk_extensions_otp_6005/1, chunk_decode_otp_6264/1,
+	  chunk_decode_empty_chunk_otp_6511/1,
+	  chunk_decode_trailer/1,
+	  http_response/1, http_request/1, validate_request_line/1,
+	  esi_parse_headers/1, cgi_parse_headers/1,
+	  is_absolut_uri/1, convert_netscapecookie_date/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, chunk}, http_response, http_request,
+     validate_request_line, {group, script}, is_absolut_uri,
+     convert_netscapecookie_date].
+
+groups() -> 
+    [{script, [], [esi_parse_headers, cgi_parse_headers]},
+     {chunk, [],
+      [chunk_decode, chunk_encode, chunk_extensions_otp_6005,
+       chunk_decode_otp_6264,
+       chunk_decode_empty_chunk_otp_6511,
+       chunk_decode_trailer]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_, Config) ->
     Dog = test_server:timetrap(?t:minutes(1)),
@@ -57,17 +78,7 @@ end_per_testcase(_, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-script(doc) ->
-    ["Test header parsing in esi/cgi functionality."];
-script(suite) ->
-    [esi_parse_headers, cgi_parse_headers].
-
-chunk(doc) ->
-    ["Test chunk encoding"];
-chunk(suite) ->
-    [chunk_decode, chunk_encode, chunk_extensions_otp_6005,
-     chunk_decode_otp_6264, chunk_decode_empty_chunk_otp_6511,
-     chunk_decode_trailer].
+
 
 %%-------------------------------------------------------------------------
 chunk_decode(doc) ->
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index aa65fb1197..7aa11ebc27 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2004-2010. 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%
 %%
 %%
@@ -24,7 +24,7 @@
 
 -module(httpc_SUITE).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 
 -include_lib("kernel/include/file.hrl").
@@ -59,58 +59,47 @@
 %%		or a skip tuple if the platform is not supported.  
 %%--------------------------------------------------------------------
 
-all(doc) ->
-    ["Test the http client in the intes application."];
-all(suite) ->
-    [
-     proxy_options, 
-     proxy_head, 
-     proxy_get, 
-     proxy_trace, 
-     proxy_post,
-     proxy_put, 
-     proxy_delete,
-     proxy_auth,
-     proxy_headers,
-     proxy_emulate_lower_versions,
-     http_options, 
-     http_head, 
-     http_get, 
-     http_post,
-     http_dummy_pipe,
-     http_inets_pipe,
-     http_trace,
-     http_async,
-     http_save_to_file,
-     http_save_to_file_async,
-     http_headers,
-     http_headers_dummy,
-     http_bad_response,
-     ssl_head, 
-     ssl_get, 
-     ssl_trace, 
-     http_redirect, 
-     http_redirect_loop,
-     http_internal_server_error,
-     http_userinfo,
-     http_cookie,
-     http_server_does_not_exist,
-     http_invalid_http,
-     http_emulate_lower_versions,
-     http_relaxed, 
-     page_does_not_exist, 
-     proxy_page_does_not_exist, 
-     proxy_https_not_supported,
-     http_stream,
-     http_stream_once,
-     proxy_stream,
-     parse_url,
-     options,
-     ipv6,
-     headers_as_is,
-     tickets
-    ].
- 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [proxy_options, proxy_head, proxy_get, proxy_trace,
+     proxy_post, proxy_put, proxy_delete, proxy_auth,
+     proxy_headers, proxy_emulate_lower_versions,
+     http_options, http_head, http_get, http_post,
+     http_dummy_pipe, http_inets_pipe, http_trace,
+     http_async, http_save_to_file, http_save_to_file_async,
+     http_headers, http_headers_dummy, http_bad_response,
+     ssl_head, ossl_head, essl_head, ssl_get, ossl_get,
+     essl_get, ssl_trace, ossl_trace, essl_trace,
+     http_redirect, http_redirect_loop,
+     http_internal_server_error, http_userinfo, http_cookie,
+     http_server_does_not_exist, http_invalid_http,
+     http_emulate_lower_versions, http_relaxed,
+     page_does_not_exist, proxy_page_does_not_exist,
+     proxy_https_not_supported, http_stream,
+     http_stream_once, proxy_stream, parse_url, options,
+     ipv6, headers_as_is, {group, tickets}].
+
+groups() -> 
+    [{tickets, [],
+      [hexed_query_otp_6191, empty_body_otp_6243,
+       empty_response_header_otp_6830,
+       transfer_encoding_otp_6807, proxy_not_modified_otp_6821,
+       no_content_204_otp_6982, missing_CR_otp_7304,
+       {group, otp_7883}, {group, otp_8154}, {group, otp_8106},
+       otp_8056, otp_8352, otp_8371, otp_8739]},
+     {otp_7883, [], [otp_7883_1, otp_7883_2]},
+     {otp_8154, [], [otp_8154_1]},
+     {otp_8106, [],
+      [otp_8106_pid, otp_8106_fun, otp_8106_mfa]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
 %% Config - [tuple()]
@@ -179,49 +168,68 @@ init_per_testcase(otp_8154_1 = Case, Config) ->
 init_per_testcase(Case, Config) ->
     init_per_testcase(Case, 2, Config).
 
+init_per_testcase_ssl(Tag, PrivDir, SslConfFile, Config) ->
+    tsp("init_per_testcase_ssl -> stop ssl"),
+    application:stop(ssl),
+    Config2 = lists:keydelete(local_ssl_server, 1, Config),
+    %% Will start inets 
+    tsp("init_per_testcase_ssl -> try start http server (including inets)"),
+    Server = inets_test_lib:start_http_server(
+	       filename:join(PrivDir, SslConfFile), Tag),
+    tsp("init_per_testcase -> Server: ~p", [Server]),
+    [{local_ssl_server, Server} | Config2].
+
 init_per_testcase(Case, Timeout, Config) ->
-    io:format(user, "~n~n*** INIT ~w:~w[~w] ***~n~n", 
+    io:format(user, "~n~n*** INIT ~w:[~w][~w] ***~n~n", 
 	      [?MODULE, Timeout, Case]),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir     = ?config(priv_dir, Config),
+    tsp("init_per_testcase -> stop inets"),
     application:stop(inets),
-    Dog = test_server:timetrap(inets_test_lib:minutes(Timeout)),
-    TmpConfig = lists:keydelete(watchdog, 1, Config),
-    IpConfFile = integer_to_list(?IP_PORT) ++ ".conf",
+    Dog         = test_server:timetrap(inets_test_lib:minutes(Timeout)),
+    TmpConfig   = lists:keydelete(watchdog, 1, Config),
+    IpConfFile  = integer_to_list(?IP_PORT) ++ ".conf",
     SslConfFile = integer_to_list(?SSL_PORT) ++ ".conf",
 
+    %% inets:enable_trace(max, io, httpd),
+    %% inets:enable_trace(max, io, httpc),
+    inets:enable_trace(max, io, all),
+
     NewConfig = 
 	case atom_to_list(Case) of
-	    "ssl" ++ _ ->
-		application:stop(ssl),
-		TmpConfig2 = 
-		    lists:keydelete(local_ssl_server, 1, TmpConfig),
-		%% Will start inets 
-		Server = 
-		    inets_test_lib:start_http_server(
-		      filename:join(PrivDir, SslConfFile)),
-		[{watchdog, Dog}, {local_ssl_server, Server} | TmpConfig2];
+	    [$s, $s, $l | _] ->
+		init_per_testcase_ssl(ssl, PrivDir, SslConfFile, [{watchdog, Dog} | TmpConfig]);
+
+	    [$o, $s, $s, $l | _] ->
+		init_per_testcase_ssl(ossl, PrivDir, SslConfFile, [{watchdog, Dog} | TmpConfig]);
+
+	    [$e, $s, $s, $l | _] ->
+		init_per_testcase_ssl(essl, PrivDir, SslConfFile, [{watchdog, Dog} | TmpConfig]);
+
 	    "proxy" ++ Rest ->
-		   case Rest of			       
-		       "_https_not_supported" ->	
-			   inets:start(),
-			   case (catch application:start(ssl)) of
-			       ok ->
-				   [{watchdog, Dog} | TmpConfig];
-			       _ ->
-				  [{skip, 
-				    "SSL does not seem to be supported"} 
-				   | TmpConfig]
-			   end;
-		       _ ->
-			   case is_proxy_available(?PROXY, ?PROXY_PORT) of
-			       true ->
-				   inets:start(),
-				   [{watchdog, Dog} | TmpConfig];
-			       false ->
-				   [{skip, "Failed to contact proxy"} | 
-				    TmpConfig]
-			   end
-		   end;
+		case Rest of			       
+		    "_https_not_supported" ->	
+			tsp("init_per_testcase -> [proxy case] start inets"),
+			inets:start(),
+			tsp("init_per_testcase -> [proxy case] start ssl"),
+			application:start(crypto),
+			application:start(public_key),
+			case (catch application:start(ssl)) of
+			    ok ->
+				[{watchdog, Dog} | TmpConfig];
+			    _ ->
+				[{skip, "SSL does not seem to be supported"} 
+				 | TmpConfig]
+			end;
+		    _ ->
+			case is_proxy_available(?PROXY, ?PROXY_PORT) of
+			    true ->
+				inets:start(),
+				[{watchdog, Dog} | TmpConfig];
+			    false ->
+				[{skip, "Failed to contact proxy"} | 
+				 TmpConfig]
+			end
+		end;
 	    _ -> 
 		TmpConfig2 = lists:keydelete(local_server, 1, TmpConfig),
 		Server = 
@@ -231,13 +239,17 @@ init_per_testcase(Case, Timeout, Config) ->
 		[{watchdog, Dog}, {local_server, Server} | TmpConfig2]
 	end,
     
-    http:set_options([{proxy, {{?PROXY, ?PROXY_PORT}, 
-			       ["localhost", ?IPV6_LOCAL_HOST]}}]),
-    inets:enable_trace(max, io, httpc),
-    %% inets:enable_trace(max, io, all),
-    %% snmp:set_trace([gen_tcp, inet_tcp, prim_inet]),
+    %% httpc:set_options([{proxy, {{?PROXY, ?PROXY_PORT}, 
+    %% 				["localhost", ?IPV6_LOCAL_HOST]}}]),
+
+    httpc:set_options([{proxy, {{?PROXY, ?PROXY_PORT}, 
+     				["localhost", ?IPV6_LOCAL_HOST]}},
+		       {ipfamily, inet6fb4}]),
+
+    %% snmp:set_trace([gen_tcp]),
     NewConfig.
 
+
 %%--------------------------------------------------------------------
 %% Function: end_per_testcase(Case, Config) -> _
 %% Case - atom()
@@ -268,24 +280,6 @@ finish(Config) ->
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
 
-tickets(doc) ->
-    ["."];
-tickets(suite) ->
-    [
-     hexed_query_otp_6191, 
-     empty_body_otp_6243, 
-     empty_response_header_otp_6830, 
-     transfer_encoding_otp_6807,
-     proxy_not_modified_otp_6821, 
-     no_content_204_otp_6982,
-     missing_CR_otp_7304,
-     otp_7883,
-     otp_8154,
-     otp_8106,
-     otp_8056,
-     otp_8352, 
-     otp_8371
-    ].
 
 
 %%-------------------------------------------------------------------------
@@ -306,7 +300,7 @@ http_head(Config) when is_list(Config) ->
 	ok ->
 	    Port = ?config(local_port, Config),
 	    URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
-	    case http:request(head, {URL, []}, [], []) of
+	    case httpc:request(head, {URL, []}, [], []) of
 		{ok, {{_,200,_}, [_ | _], []}} ->
 		    ok;
 		{ok, WrongReply} ->
@@ -337,7 +331,7 @@ http_get(Config) when is_list(Config) ->
 	    HttpOptions1 = [{timeout, Timeout}, {connect_timeout, ConnTimeout}], 
 	    Options1     = [], 
 	    Body = 
-		case http:request(Method, Request, HttpOptions1, Options1) of
+		case httpc:request(Method, Request, HttpOptions1, Options1) of
 		    {ok, {{_,200,_}, [_ | _], ReplyBody = [_ | _]}} ->
 			ReplyBody;
 		    {ok, UnexpectedReply1} ->
@@ -346,12 +340,12 @@ http_get(Config) when is_list(Config) ->
 			tsf({bad_reply, Error1})
 		end,
 
-	    %% eqvivivalent to http:request(get, {URL, []}, [], []),
+	    %% eqvivivalent to httpc:request(get, {URL, []}, [], []),
 	    inets_test_lib:check_body(Body),
 
 	    HttpOptions2 = [], 
 	    Options2     = [{body_format, binary}], 
-	    case http:request(Method, Request, HttpOptions2, Options2) of
+	    case httpc:request(Method, Request, HttpOptions2, Options2) of
 		{ok, {{_,200,_}, [_ | _], Bin}} when is_binary(Bin) ->
 		    ok;
 		{ok, {{_,200,_}, [_ | _], BadBin}} ->
@@ -390,11 +384,11 @@ http_post(Config) when is_list(Config) ->
 	  Body = lists:duplicate(100, "1"),
 	  
 	  {ok, {{_,200,_}, [_ | _], [_ | _]}} =
-	      http:request(post, {URL, [{"expect","100-continue"}],
+	      httpc:request(post, {URL, [{"expect","100-continue"}],
 				  "text/plain", Body}, [], []),
       
 	  {ok, {{_,504,_}, [_ | _], []}} =
-	      http:request(post, {URL, [{"expect","100-continue"}],
+	      httpc:request(post, {URL, [{"expect","100-continue"}],
 				  "text/plain", "foobar"}, [], []);
       _ ->
 	  {skip, "Failed to start local http-server"}
@@ -411,13 +405,13 @@ http_emulate_lower_versions(Config) when is_list(Config) ->
 	    Port = ?config(local_port, Config),
 	    URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
 	    {ok, Body0} =
-  		http:request(get, {URL, []}, [{version, "HTTP/0.9"}], []),
+  		httpc:request(get, {URL, []}, [{version, "HTTP/0.9"}], []),
 	    inets_test_lib:check_body(Body0),
  	    {ok, {{"HTTP/1.0", 200, _}, [_ | _], Body1 = [_ | _]}} =
-		http:request(get, {URL, []}, [{version, "HTTP/1.0"}], []),
+		httpc:request(get, {URL, []}, [{version, "HTTP/1.0"}], []),
 	    inets_test_lib:check_body(Body1),
 	    {ok, {{"HTTP/1.1", 200, _}, [_ | _], Body2 = [_ | _]}} =
-		http:request(get, {URL, []}, [{version, "HTTP/1.1"}], []),
+		httpc:request(get, {URL, []}, [{version, "HTTP/1.1"}], []),
 	    inets_test_lib:check_body(Body2);
         _->
 	    {skip, "Failed to start local http-server"}
@@ -431,24 +425,24 @@ http_relaxed(doc) ->
 http_relaxed(suite) ->
     [];
 http_relaxed(Config) when is_list(Config) ->
-    ok = http:set_options([{ipv6, disabled}]), % also test the old option 
-    %% ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipv6, disabled}]), % also test the old option 
+    %% ok = httpc:set_options([{ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ 
 	"/missing_reason_phrase.html",
         
     {error, Reason} =
-	http:request(get, {URL, []}, [{relaxed, false}], []),
+	httpc:request(get, {URL, []}, [{relaxed, false}], []),
 
     test_server:format("Not relaxed: ~p~n", [Reason]),
     
     {ok, {{_, 200, _}, [_ | _], [_ | _]}} =
-	http:request(get, {URL, []}, [{relaxed, true}], []),
+	httpc:request(get, {URL, []}, [{relaxed, true}], []),
 
     DummyServerPid ! stop,
-    ok = http:set_options([{ipv6, enabled}]),   
-    %% ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipv6, enabled}]),   
+    %% ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 
@@ -458,7 +452,7 @@ http_dummy_pipe(doc) ->
 http_dummy_pipe(suite) ->
     [];
 http_dummy_pipe(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ "/foobar.html",
@@ -466,7 +460,7 @@ http_dummy_pipe(Config) when is_list(Config) ->
     test_pipeline(URL),
 
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 http_inets_pipe(doc) ->
@@ -488,11 +482,11 @@ test_pipeline(URL) ->
     p("test_pipeline -> entry with"
       "~n   URL: ~p", [URL]),
 
-    http:set_options([{pipeline_timeout, 50000}]),
+    httpc:set_options([{pipeline_timeout, 50000}]),
     
     p("test_pipeline -> issue (async) request 1"), 
     {ok, RequestId1} = 
-	http:request(get, {URL, []}, [], [{sync, false}]),
+	httpc:request(get, {URL, []}, [], [{sync, false}]),
     test_server:format("RequestId1: ~p~n", [RequestId1]),
     p("test_pipeline -> RequestId1: ~p", [RequestId1]),
 
@@ -502,13 +496,13 @@ test_pipeline(URL) ->
 
     p("test_pipeline -> issue (async) request 2"),
     {ok, RequestId2} = 
-	http:request(get, {URL, []}, [], [{sync, false}]),
+	httpc:request(get, {URL, []}, [], [{sync, false}]),
     tsp("RequestId2: ~p", [RequestId2]),
     p("test_pipeline -> RequestId2: ~p", [RequestId2]),
 
     p("test_pipeline -> issue (sync) request 3"),
     {ok, {{_,200,_}, [_ | _], [_ | _]}} = 
-	http:request(get, {URL, []}, [], []),
+	httpc:request(get, {URL, []}, [], []),
 
     p("test_pipeline -> expect reply for (async) request 1 or 2"),
     receive 
@@ -544,18 +538,18 @@ test_pipeline(URL) ->
 
     p("test_pipeline -> issue (async) request 4"),
     {ok, RequestId3} = 
-	http:request(get, {URL, []}, [], [{sync, false}]),
+	httpc:request(get, {URL, []}, [], [{sync, false}]),
     tsp("RequestId3: ~p", [RequestId3]),
     p("test_pipeline -> RequestId3: ~p", [RequestId3]),
 
     p("test_pipeline -> issue (async) request 5"),
     {ok, RequestId4} = 
-	http:request(get, {URL, []}, [], [{sync, false}]),
+	httpc:request(get, {URL, []}, [], [{sync, false}]),
     tsp("RequestId4: ~p~n", [RequestId4]),
     p("test_pipeline -> RequestId4: ~p", [RequestId4]),
 
     p("test_pipeline -> cancel (async) request 4"),
-    ok = http:cancel_request(RequestId3),
+    ok = httpc:cancel_request(RequestId3),
 
     p("test_pipeline -> expect *no* reply for cancelled (async) request 4 (for 3 secs)"),
     receive 
@@ -607,7 +601,7 @@ http_trace(Config) when is_list(Config) ->
 	ok ->
 	    Port = ?config(local_port, Config),
 	    URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
-	    case http:request(trace, {URL, []}, [], []) of
+	    case httpc:request(trace, {URL, []}, [], []) of
 		{ok, {{_,200,_}, [_ | _], "TRACE /dummy.html" ++ _}} ->
 		    ok;
 		{ok, {{_,200,_}, [_ | _], WrongBody}} ->
@@ -631,7 +625,7 @@ http_async(Config) when is_list(Config) ->
 	    Port = ?config(local_port, Config),
 	    URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
 	    {ok, RequestId} = 
-		http:request(get, {URL, []}, [], [{sync, false}]),
+		httpc:request(get, {URL, []}, [], [{sync, false}]),
 	    
 	    Body = 
 		receive 
@@ -644,8 +638,8 @@ http_async(Config) when is_list(Config) ->
 	    inets_test_lib:check_body(binary_to_list(Body)),
 	    
 	    {ok, NewRequestId} = 
-		http:request(get, {URL, []}, [], [{sync, false}]),
-	    ok = http:cancel_request(NewRequestId),
+		httpc:request(get, {URL, []}, [], [{sync, false}]),
+	    ok = httpc:cancel_request(NewRequestId),
 	    receive 
 		{http, {NewRequestId, _NewResult}} ->
 		    test_server:fail(http_cancel_request_failed)
@@ -669,9 +663,9 @@ http_save_to_file(Config) when is_list(Config) ->
 	    Port = ?config(local_port, Config),
 	    URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
 	    {ok, saved_to_file} 
-		= http:request(get, {URL, []}, [], [{stream, FilePath}]),
+		= httpc:request(get, {URL, []}, [], [{stream, FilePath}]),
 	    {ok, Bin} = file:read_file(FilePath), 
-	    {ok, {{_,200,_}, [_ | _], Body}} = http:request(URL),
+	    {ok, {{_,200,_}, [_ | _], Body}} = httpc:request(URL),
 	    Bin == Body;
 	_ ->
 	    {skip, "Failed to start local http-server"}
@@ -690,7 +684,7 @@ http_save_to_file_async(Config) when is_list(Config) ->
 	    FilePath = filename:join(PrivDir, "dummy.html"),
 	    Port = ?config(local_port, Config),
 	    URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
-	    {ok, RequestId} = http:request(get, {URL, []}, [], 
+	    {ok, RequestId} = httpc:request(get, {URL, []}, [], 
 					   [{stream, FilePath}, 
 					    {sync, false}]),
 	    receive
@@ -701,7 +695,7 @@ http_save_to_file_async(Config) when is_list(Config) ->
 	    end,
 
 	    {ok, Bin} = file:read_file(FilePath), 
-	    {ok, {{_,200,_}, [_ | _], Body}} = http:request(URL),
+	    {ok, {{_,200,_}, [_ | _], Body}} = httpc:request(URL),
 	    Bin == Body;
 	_ ->
 	    {skip, "Failed to start local http-server"}
@@ -731,7 +725,7 @@ http_headers(Config) when is_list(Config) ->
 	    Date = httpd_util:rfc1123_date({date(), time()}),
 	    
 	    {ok, {{_,200,_}, [_ | _], [_ | _]}} =
-		http:request(get, {URL, [{"If-Modified-Since",
+		httpc:request(get, {URL, [{"If-Modified-Since",
 					  Mod}, 
 					 {"From","[email protected]"},
 					 {"Date", Date}
@@ -742,7 +736,7 @@ http_headers(Config) when is_list(Config) ->
 			CreatedSec+1)),
 	    
 	    {ok, {{_,200,_}, [_ | _], [_ | _]}} =
-		http:request(get, {URL, [{"If-UnModified-Since",
+		httpc:request(get, {URL, [{"If-UnModified-Since",
 					  Mod1}
 					]}, [], []),
 	    
@@ -750,12 +744,12 @@ http_headers(Config) when is_list(Config) ->
 	    
 	    
 	    {ok, {{_,200,_}, [_ | _], [_ | _]}} =
-		http:request(get, {URL, [{"If-Match",
+		httpc:request(get, {URL, [{"If-Match",
 					  Tag}
 					]}, [], []),
 
 	    {ok, {{_,200,_}, [_ | _], _}} =
-		     http:request(get, {URL, [{"If-None-Match",
+		     httpc:request(get, {URL, [{"If-None-Match",
 					       "NotEtag,NeihterEtag"},
 					      {"Connection", "Close"}
 					     ]}, [], []),
@@ -773,7 +767,7 @@ http_headers_dummy(doc) ->
 http_headers_dummy(suite) ->
     [];
 http_headers_dummy(Config) when is_list(Config) -> 
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy_headers.html",
@@ -789,7 +783,7 @@ http_headers_dummy(Config) when is_list(Config) ->
     %% that the client header-handling code. This would not
     %% be a vaild http-request!
     {ok, {{_,200,_}, [_ | _], [_|_]}} = 
-	http:request(post, 
+	httpc:request(post, 
 		     {URL, 
 		      [{"Via",
 			"1.0 fred, 1.1 nowhere.com (Apache/1.1)"}, 
@@ -828,7 +822,7 @@ http_headers_dummy(Config) when is_list(Config) ->
 		      ], "text/plain", FooBar}, 
 		     [], []),
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
     
 
@@ -838,21 +832,21 @@ http_bad_response(doc) ->
 http_bad_response(suite) ->
     [];
 http_bad_response(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ "/missing_crlf.html",
     
     URL1 = ?URL_START ++ integer_to_list(Port) ++ "/wrong_statusline.html",
     
-    {error, timeout} = http:request(get, {URL, []}, [{timeout, 400}], []),
+    {error, timeout} = httpc:request(get, {URL, []}, [{timeout, 400}], []),
       
-    {error, Reason} = http:request(URL1),
+    {error, Reason} = httpc:request(URL1),
     
     test_server:format("Wrong Statusline: ~p~n", [Reason]),
 
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 
@@ -862,69 +856,168 @@ ssl_head(doc) ->
 ssl_head(suite) ->
     [];
 ssl_head(Config) when is_list(Config) ->   
+    ssl_head(ssl, Config).
+
+ossl_head(doc) ->
+    ["Same as http_head/1 but over ssl sockets."];
+ossl_head(suite) ->
+    [];
+ossl_head(Config) when is_list(Config) ->   
+    ssl_head(ossl, Config).
+
+essl_head(doc) ->
+    ["Same as http_head/1 but over ssl sockets."];
+essl_head(suite) ->
+    [];
+essl_head(Config) when is_list(Config) ->   
+    ssl_head(essl, Config).
+
+ssl_head(SslTag, Config) ->
+    tsp("ssl_head -> entry with"
+	"~n   SslTag: ~p"
+	"~n   Config: ~p", [SslTag, Config]), 
     case ?config(local_ssl_server, Config) of 
  	ok ->
-	    DataDir = ?config(data_dir, Config),
-	    Port = ?config(local_ssl_port, Config),
-	    URL = ?SSL_URL_START ++ integer_to_list(Port) ++ "/dummy.html",
-	    CertFile = filename:join(DataDir, "ssl_client_cert.pem"),
+	    DataDir    = ?config(data_dir, Config),
+	    Port       = ?config(local_ssl_port, Config),
+	    URL        = ?SSL_URL_START ++ integer_to_list(Port) ++ "/dummy.html",
+	    CertFile   = filename:join(DataDir, "ssl_client_cert.pem"),
 	    SSLOptions = [{certfile, CertFile}, {keyfile, CertFile}],
+	    SSLConfig     = 
+		case SslTag of
+		    ssl ->
+			SSLOptions;
+		    ossl ->
+			{ossl, SSLOptions};
+		    essl ->
+			{essl, SSLOptions}
+		end,
+	    tsp("ssl_head -> make request using: "
+		"~n   URL:        ~p"
+		"~n   SslTag:     ~p"
+		"~n   SSLOptions: ~p", [URL, SslTag, SSLOptions]),
 	    {ok, {{_,200, _}, [_ | _], []}} =
-		http:request(head, {URL, []}, [{ssl, SSLOptions}], []);
+		httpc:request(head, {URL, []}, [{ssl, SSLConfig}], []);
  	{ok, _} ->
- 	    {skip, "Failed to start local http-server"};
+ 	    {skip, "local http-server not started"};
  	_ ->
- 	    {skip, "Failed to start SSL"}
+ 	    {skip, "SSL not started"}
     end.  
+
+    
 %%-------------------------------------------------------------------------
 ssl_get(doc) ->
     ["Same as http_get/1 but over ssl sockets."];
 ssl_get(suite) ->
     [];
 ssl_get(Config) when is_list(Config) ->
+    ssl_get(ssl, Config).
+
+ossl_get(doc) ->
+    ["Same as http_get/1 but over ssl sockets."];
+ossl_get(suite) ->
+    [];
+ossl_get(Config) when is_list(Config) ->
+    ssl_get(ossl, Config).
+
+essl_get(doc) ->
+    ["Same as http_get/1 but over ssl sockets."];
+essl_get(suite) ->
+    [];
+essl_get(Config) when is_list(Config) ->
+    ssl_get(essl, Config).
+
+ssl_get(SslTag, Config) when is_list(Config) ->
     case ?config(local_ssl_server, Config) of 
 	ok ->
-	    DataDir = ?config(data_dir, Config),
- 	    Port = ?config(local_ssl_port, Config),
-	    URL = ?SSL_URL_START ++ integer_to_list(Port) ++ "/dummy.html",
-	    CertFile = filename:join(DataDir, "ssl_client_cert.pem"),
+	    DataDir    = ?config(data_dir, Config),
+ 	    Port       = ?config(local_ssl_port, Config),
+	    URL        = ?SSL_URL_START ++ integer_to_list(Port) ++ "/dummy.html",
+	    CertFile   = filename:join(DataDir, "ssl_client_cert.pem"),
 	    SSLOptions = [{certfile, CertFile}, {keyfile, CertFile}],
-	     {ok, {{_,200, _}, [_ | _], Body = [_ | _]}} =
-		 http:request(get, {URL, []}, [{ssl, SSLOptions}], []),
-	     inets_test_lib:check_body(Body);
+	    SSLConfig  = 
+		case SslTag of
+		    ssl ->
+			SSLOptions;
+		    ossl ->
+			{ossl, SSLOptions};
+		    essl ->
+			{essl, SSLOptions}
+		end,
+	    tsp("ssl_get -> make request using: "
+		"~n   URL:        ~p"
+		"~n   SslTag:     ~p"
+		"~n   SSLOptions: ~p", [URL, SslTag, SSLOptions]),
+	    {ok, {{_,200, _}, [_ | _], Body = [_ | _]}} =
+		httpc:request(get, {URL, []}, [{ssl, SSLConfig}], []),
+	    inets_test_lib:check_body(Body);
 	 {ok, _} ->
 	     {skip, "Failed to start local http-server"}; 
 	 _ ->
 	     {skip, "Failed to start SSL"}
      end.
+
+
 %%-------------------------------------------------------------------------
 ssl_trace(doc) ->
     ["Same as http_trace/1 but over ssl sockets."];
 ssl_trace(suite) ->
     [];
 ssl_trace(Config) when is_list(Config) ->
+    ssl_trace(ssl, Config).
+
+ossl_trace(doc) ->
+    ["Same as http_trace/1 but over ssl sockets."];
+ossl_trace(suite) ->
+    [];
+ossl_trace(Config) when is_list(Config) ->
+    ssl_trace(ossl, Config).
+
+essl_trace(doc) ->
+    ["Same as http_trace/1 but over ssl sockets."];
+essl_trace(suite) ->
+    [];
+essl_trace(Config) when is_list(Config) ->
+    ssl_trace(essl, Config).
+
+ssl_trace(SslTag, Config) when is_list(Config) ->
     case ?config(local_ssl_server, Config) of 
 	ok ->
-	    DataDir = ?config(data_dir, Config),
- 	    Port = ?config(local_ssl_port, Config),
-	    URL = ?SSL_URL_START ++ integer_to_list(Port) ++ "/dummy.html",
-	    CertFile = filename:join(DataDir, "ssl_client_cert.pem"),
+	    DataDir    = ?config(data_dir, Config),
+ 	    Port       = ?config(local_ssl_port, Config),
+	    URL        = ?SSL_URL_START ++ integer_to_list(Port) ++ "/dummy.html",
+	    CertFile   = filename:join(DataDir, "ssl_client_cert.pem"),
 	    SSLOptions = [{certfile, CertFile}, {keyfile, CertFile}],
-	    case http:request(trace, {URL, []}, [{ssl, SSLOptions}], []) of
+	    SSLConfig  = 
+		case SslTag of
+		    ssl ->
+			SSLOptions;
+		    ossl ->
+			{ossl, SSLOptions};
+		    essl ->
+			{essl, SSLOptions}
+		end,
+	    tsp("ssl_trace -> make request using: "
+		"~n   URL:        ~p"
+		"~n   SslTag:     ~p"
+		"~n   SSLOptions: ~p", [URL, SslTag, SSLOptions]),
+	    case httpc:request(trace, {URL, []}, [{ssl, SSLConfig}], []) of
 		{ok, {{_,200, _}, [_ | _], "TRACE /dummy.html" ++ _}} ->
 		    ok;
 		{ok, {{_,200,_}, [_ | _], WrongBody}} ->
-		    test_server:fail({wrong_body, WrongBody});
+		    tsf({wrong_body,  WrongBody});
 		{ok, WrongReply} ->
-		    test_server:fail({wrong_reply, WrongReply});
+		    tsf({wrong_reply, WrongReply});
 		Error ->
-		    test_server:fail({failed, Error})
+		    tsf({failed, Error})
 	    end;
 	{ok, _} ->
 	    {skip, "Failed to start local http-server"}; 
 	_ ->
 	    {skip, "Failed to start SSL"}
     end.
+
+
 %%-------------------------------------------------------------------------
 http_redirect(doc) ->
     ["Test redirect with dummy server as httpd does not implement"
@@ -937,7 +1030,7 @@ http_redirect(Config) when is_list(Config) ->
     case ?config(local_server, Config) of 
 	ok ->
 	    tsp("http_redirect -> set ipfamily option to inet"),
-	    ok = http:set_options([{ipfamily, inet}]),
+	    ok = httpc:set_options([{ipfamily, inet}]),
 
 	    tsp("http_redirect -> start dummy server inet"),
 	    {DummyServerPid, Port} = dummy_server(self(), ipv4),
@@ -948,29 +1041,29 @@ http_redirect(Config) when is_list(Config) ->
 	    tsp("http_redirect -> issue request 1: "
 		"~n   ~p", [URL300]),
 	    {ok, {{_,200,_}, [_ | _], [_|_]}} 
- 		= http:request(get, {URL300, []}, [], []),
+ 		= httpc:request(get, {URL300, []}, [], []),
 	    
 	    tsp("http_redirect -> issue request 2: "
 		"~n   ~p", [URL300]),
 	    {ok, {{_,300,_}, [_ | _], _}} = 
-		http:request(get, {URL300, []}, [{autoredirect, false}], []),
+		httpc:request(get, {URL300, []}, [{autoredirect, false}], []),
 
 	    URL301 = ?URL_START ++ integer_to_list(Port) ++ "/301.html",
 
 	    tsp("http_redirect -> issue request 3: "
 		"~n   ~p", [URL301]),
 	    {ok, {{_,200,_}, [_ | _], [_|_]}} 
- 		= http:request(get, {URL301, []}, [], []),
+ 		= httpc:request(get, {URL301, []}, [], []),
 	    
 	    tsp("http_redirect -> issue request 4: "
 		"~n   ~p", [URL301]),
 	    {ok, {{_,200,_}, [_ | _], []}} 
- 		= http:request(head, {URL301, []}, [], []),
+ 		= httpc:request(head, {URL301, []}, [], []),
 	    
 	    tsp("http_redirect -> issue request 5: "
 		"~n   ~p", [URL301]),
 	    {ok, {{_,301,_}, [_ | _], [_|_]}} 
- 		= http:request(post, {URL301, [],"text/plain", "foobar"},
+ 		= httpc:request(post, {URL301, [],"text/plain", "foobar"},
 			       [], []),
 
 	    URL302 = ?URL_START ++ integer_to_list(Port) ++ "/302.html",
@@ -978,8 +1071,8 @@ http_redirect(Config) when is_list(Config) ->
 	    tsp("http_redirect -> issue request 6: "
 		"~n   ~p", [URL302]),
 	    {ok, {{_,200,_}, [_ | _], [_|_]}} 
- 		= http:request(get, {URL302, []}, [], []),	 
-	    case http:request(get, {URL302, []}, [], []) of
+ 		= httpc:request(get, {URL302, []}, [], []),	 
+	    case httpc:request(get, {URL302, []}, [], []) of
 		{ok, Reply7} ->
 		    case Reply7 of
 			{{_,200,_}, [_ | _], [_|_]} ->
@@ -1006,12 +1099,12 @@ http_redirect(Config) when is_list(Config) ->
 	    tsp("http_redirect -> issue request 7: "
 		"~n   ~p", [URL302]),
 	    {ok, {{_,200,_}, [_ | _], []}} 
- 		= http:request(head, {URL302, []}, [], []),	 
+ 		= httpc:request(head, {URL302, []}, [], []),	 
 	    
 	    tsp("http_redirect -> issue request 8: "
 		"~n   ~p", [URL302]),
 	    {ok, {{_,302,_}, [_ | _], [_|_]}} 
- 		= http:request(post, {URL302, [],"text/plain", "foobar"},
+ 		= httpc:request(post, {URL302, [],"text/plain", "foobar"},
 			       [], []),
    
 	    URL307 = ?URL_START ++ integer_to_list(Port) ++ "/307.html",
@@ -1019,23 +1112,23 @@ http_redirect(Config) when is_list(Config) ->
 	    tsp("http_redirect -> issue request 9: "
 		"~n   ~p", [URL307]),
 	    {ok, {{_,200,_}, [_ | _], [_|_]}} 
- 		= http:request(get, {URL307, []}, [], []),
+ 		= httpc:request(get, {URL307, []}, [], []),
 	
 	    tsp("http_redirect -> issue request 10: "
 		"~n   ~p", [URL307]),
 	    {ok, {{_,200,_}, [_ | _], []}} 
- 		= http:request(head, {URL307, []}, [], []),
+ 		= httpc:request(head, {URL307, []}, [], []),
 	    
 	    tsp("http_redirect -> issue request 11: "
 		"~n   ~p", [URL307]),
 	    {ok, {{_,307,_}, [_ | _], [_|_]}} 
- 		= http:request(post, {URL307, [],"text/plain", "foobar"},
+ 		= httpc:request(post, {URL307, [],"text/plain", "foobar"},
 			       [], []),
 	    
 	    tsp("http_redirect -> stop dummy server"),
 	    DummyServerPid ! stop,
 	    tsp("http_redirect -> reset ipfamily option (to inet6fb4)"),
-	    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+	    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
 	    tsp("http_redirect -> done"),
 	    ok;
 
@@ -1051,15 +1144,15 @@ http_redirect_loop(doc) ->
 http_redirect_loop(suite) ->
     [];
 http_redirect_loop(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ "/redirectloop.html",
     
     {ok, {{_,300,_}, [_ | _], _}} 
- 	= http:request(get, {URL, []}, [], []),
+ 	= httpc:request(get, {URL, []}, [], []),
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 %%-------------------------------------------------------------------------
@@ -1068,13 +1161,13 @@ http_internal_server_error(doc) ->
 http_internal_server_error(suite) ->
     [];
 http_internal_server_error(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL500 = ?URL_START ++ integer_to_list(Port) ++ "/500.html",
     
     {ok, {{_,500,_}, [_ | _], _}} 
- 	= http:request(get, {URL500, []}, [], []),
+ 	= httpc:request(get, {URL500, []}, [], []),
 
 
     URL503 = ?URL_START ++ integer_to_list(Port) ++ "/503.html",
@@ -1084,16 +1177,16 @@ http_internal_server_error(Config) when is_list(Config) ->
     ets:insert(unavailable, {503, unavailable}),
     
     {ok, {{_,200, _}, [_ | _], [_|_]}} =
-	http:request(get, {URL503, []}, [], []),
+	httpc:request(get, {URL503, []}, [], []),
     
     ets:insert(unavailable, {503, long_unavailable}),
 
     {ok, {{_,503, _}, [_ | _], [_|_]}} =
-	http:request(get, {URL503, []}, [], []),
+	httpc:request(get, {URL503, []}, [], []),
 
     ets:delete(unavailable),
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 
@@ -1103,7 +1196,7 @@ http_userinfo(doc) ->
 http_userinfo(suite) ->
     [];
 http_userinfo(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
 
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
@@ -1111,16 +1204,16 @@ http_userinfo(Config) when is_list(Config) ->
 	++ integer_to_list(Port) ++ "/userinfo.html",
     
     {ok, {{_,200,_}, [_ | _], _}} 
- 	= http:request(get, {URLAuth, []}, [], []),
+ 	= httpc:request(get, {URLAuth, []}, [], []),
 
     URLUnAuth = "http://alladin:foobar@localhost:" 
 	++ integer_to_list(Port) ++ "/userinfo.html",
     
     {ok, {{_,401, _}, [_ | _], _}} =
-	http:request(get, {URLUnAuth, []}, [], []),
+	httpc:request(get, {URLUnAuth, []}, [], []),
     
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 
@@ -1130,7 +1223,7 @@ http_cookie(doc) ->
 http_cookie(suite) ->
     [];
 http_cookie(Config) when is_list(Config) ->
-    ok = http:set_options([{cookies, enabled}, {ipfamily, inet}]),
+    ok = httpc:set_options([{cookies, enabled}, {ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URLStart = ?URL_START  
@@ -1139,19 +1232,19 @@ http_cookie(Config) when is_list(Config) ->
     URLCookie = URLStart ++ "/cookie.html",
    
     {ok, {{_,200,_}, [_ | _], [_|_]}} 
- 	= http:request(get, {URLCookie, []}, [], []),
+ 	= httpc:request(get, {URLCookie, []}, [], []),
 
     ets:new(cookie, [named_table, public, set]),
     ets:insert(cookie, {cookies, true}),
 
     {ok, {{_,200,_}, [_ | _], [_|_]}} 
- 	= http:request(get, {URLStart ++ "/", []}, [], []),
+ 	= httpc:request(get, {URLStart ++ "/", []}, [], []),
     
     ets:delete(cookie),
 
-    ok = http:set_options([{cookies, disabled}, {ipfamily, inet6fb4}]), % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{cookies, disabled}]), 
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),                      % ********** ipfamily = inet6************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 %%-------------------------------------------------------------------------
@@ -1162,7 +1255,7 @@ proxy_options(suite) ->
 proxy_options(Config) when is_list(Config) ->
     case ?config(skip, Config) of 
         undefined ->
-	    case http:request(options, {?PROXY_URL, []}, [], []) of
+	    case httpc:request(options, {?PROXY_URL, []}, [], []) of
 		{ok, {{_,200,_}, Headers, _}} ->
 		    case lists:keysearch("allow", 1, Headers) of
 			{value, {"allow", _}} ->
@@ -1186,7 +1279,7 @@ proxy_head(suite) ->
 proxy_head(Config) when is_list(Config) ->
     case ?config(skip, Config) of 
 	undefined ->
-	    case http:request(head, {?PROXY_URL, []}, [], []) of
+	    case httpc:request(head, {?PROXY_URL, []}, [], []) of
 		{ok, {{_,200, _}, [_ | _], []}} ->
 		    ok;
 		Unexpected ->
@@ -1205,7 +1298,7 @@ proxy_get(suite) ->
 proxy_get(Config) when is_list(Config) ->
     case ?config(skip, Config) of 
 	undefined ->
-	    case http:request(get, {?PROXY_URL, []}, [], []) of
+	    case httpc:request(get, {?PROXY_URL, []}, [], []) of
 		{ok, {{_,200,_}, [_ | _], Body = [_ | _]}} ->
 		    inets_test_lib:check_body(Body);
 		Unexpected ->
@@ -1257,7 +1350,7 @@ proxy_emulate_lower_versions(Config) when is_list(Config) ->
     end.
 
 pelv_get(Version) ->
-    http:request(get, {?PROXY_URL, []}, [{version, Version}], []).
+    httpc:request(get, {?PROXY_URL, []}, [{version, Version}], []).
 
 %%-------------------------------------------------------------------------
 proxy_trace(doc) ->
@@ -1266,7 +1359,7 @@ proxy_trace(suite) ->
     [];
 proxy_trace(Config) when is_list(Config) ->
     %%{ok, {{_,200,_}, [_ | _], "TRACE " ++ _}} =
-    %%	http:request(trace, {?PROXY_URL, []}, [], []),
+    %%	httpc:request(trace, {?PROXY_URL, []}, [], []),
     {skip, "HTTP TRACE is no longer allowed on the ?PROXY_URL server due "
      "to security reasons"}.
 
@@ -1281,7 +1374,7 @@ proxy_post(suite) ->
 proxy_post(Config) when is_list(Config) ->
     case ?config(skip, Config) of 
 	undefined ->
-	    case http:request(post, {?PROXY_URL, [], 
+	    case httpc:request(post, {?PROXY_URL, [], 
 				     "text/plain", "foobar"}, [],[]) of
 		{ok, {{_,405,_}, [_ | _], [_ | _]}} ->
 		    ok;
@@ -1303,7 +1396,7 @@ proxy_put(suite) ->
 proxy_put(Config) when is_list(Config) ->
     case ?config(skip, Config) of 
 	undefined -> 
-	    case http:request(put, {"http://www.erlang.org/foobar.html", [], 
+	    case httpc:request(put, {"http://www.erlang.org/foobar.html", [], 
 				    "html", "<html> <body><h1> foo </h1>" 
 				    "<p>bar</p> </body></html>"}, [], []) of
 		{ok, {{_,405,_}, [_ | _], [_ | _]}} ->
@@ -1328,7 +1421,7 @@ proxy_delete(Config) when is_list(Config) ->
     case ?config(skip, Config) of 
 	undefined -> 
 	    URL = ?PROXY_URL ++ "/foobar.html",
-	    case http:request(delete, {URL, []}, [], []) of
+	    case httpc:request(delete, {URL, []}, [], []) of
 		{ok, {{_,404,_}, [_ | _], [_ | _]}} ->
 		    ok;
 		Unexpected ->
@@ -1348,7 +1441,7 @@ proxy_headers(Config) when is_list(Config) ->
     case ?config(skip, Config) of 
 	undefined ->
 	    {ok, {{_,200,_}, [_ | _], [_ | _]}} 
-		= http:request(get, {?PROXY_URL,
+		= httpc:request(get, {?PROXY_URL,
 				     [
 				      {"Accept",
 				       "text/*, text/html,"
@@ -1383,7 +1476,7 @@ proxy_auth(Config) when is_list(Config) ->
     %% atleast the code for sending the header does not crash!
     case ?config(skip, Config) of 
 	undefined ->	    
-	    case http:request(get, {?PROXY_URL, []}, 
+	    case httpc:request(get, {?PROXY_URL, []}, 
 			      [{proxy_auth, {"foo", "bar"}}], []) of
 		{ok, {{_,200, _}, [_ | _], [_|_]}} ->
 		    ok;
@@ -1403,7 +1496,7 @@ http_server_does_not_exist(suite) ->
     [];
 http_server_does_not_exist(Config) when is_list(Config) ->
     {error, _} = 
-	http:request(get, {"http://localhost:" ++ 
+	httpc:request(get, {"http://localhost:" ++ 
 			   integer_to_list(?NOT_IN_USE_PORT) 
 			   ++ "/", []},[], []),
     ok.
@@ -1418,7 +1511,7 @@ page_does_not_exist(Config) when is_list(Config) ->
     Port = ?config(local_port, Config),
     URL = ?URL_START ++ integer_to_list(Port) ++ "/doesnotexist.html",
     {ok, {{_,404,_}, [_ | _], [_ | _]}} 
-	= http:request(get, {URL, []}, [], []),
+	= httpc:request(get, {URL, []}, [], []),
     ok.
 
 
@@ -1432,7 +1525,7 @@ proxy_page_does_not_exist(Config) when is_list(Config) ->
 	undefined ->
 	    URL = ?PROXY_URL ++ "/doesnotexist.html",
 	    {ok, {{_,404,_}, [_ | _], [_ | _]}} = 
-		http:request(get, {URL, []}, [], []),
+		httpc:request(get, {URL, []}, [], []),
 	    ok;
 	Reason ->
 	    {skip, Reason}
@@ -1446,7 +1539,7 @@ proxy_https_not_supported(doc) ->
 proxy_https_not_supported(suite) ->
     [];
 proxy_https_not_supported(Config) when is_list(Config) ->
-    Result = http:request(get, {"https://login.yahoo.com", []}, [], []),
+    Result = httpc:request(get, {"https://login.yahoo.com", []}, [], []),
     case Result of
 	{error, Reason} ->
 	    %% ok so far
@@ -1478,10 +1571,10 @@ http_stream(Config) when is_list(Config) ->
     Port = ?config(local_port, Config),
     URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
     {ok, {{_,200,_}, [_ | _], Body}} = 
-	http:request(get, {URL, []}, [], []),
+	httpc:request(get, {URL, []}, [], []),
     
     {ok, RequestId} =
-	http:request(get, {URL, []}, [], [{sync, false}, 
+	httpc:request(get, {URL, []}, [], [{sync, false}, 
 					  {stream, self}]),
     
     receive 
@@ -1506,7 +1599,7 @@ http_stream_once(Config) when is_list(Config) ->
       "~n   Config: ~p", [Config]),
       
     p("http_stream_once -> set ipfamily to inet", []),
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
     p("http_stream_once -> start dummy server", []),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),    
     
@@ -1521,18 +1614,18 @@ http_stream_once(Config) when is_list(Config) ->
     p("http_stream_once -> stop dummy server", []),
     DummyServerPid ! stop,
     p("http_stream_once -> set ipfamily to inet6fb4", []),
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     p("http_stream_once -> done", []),
     ok.
   
 once(URL) ->
     p("once -> issue sync request for ~p", [URL]),
     {ok, {{_,200,_}, [_ | _], Body}} = 
-	http:request(get, {URL, []}, [], []),
+	httpc:request(get, {URL, []}, [], []),
     
     p("once -> issue async (self stream) request for ~p", [URL]),
     {ok, RequestId} =
-	http:request(get, {URL, []}, [], [{sync, false}, 
+	httpc:request(get, {URL, []}, [], [{sync, false}, 
 					  {stream, {self, once}}]),
     
     p("once -> await stream_start reply for (async) request ~p", [RequestId]),
@@ -1576,10 +1669,10 @@ proxy_stream(Config) when is_list(Config) ->
     case ?config(skip, Config) of 
 	undefined ->
 	    {ok, {{_,200,_}, [_ | _], Body}} = 
-		http:request(get, {?PROXY_URL, []}, [], []),
+		httpc:request(get, {?PROXY_URL, []}, [], []),
 	    
 	    {ok, RequestId} =
-		http:request(get, {?PROXY_URL, []}, [], 
+		httpc:request(get, {?PROXY_URL, []}, [], 
 			     [{sync, false}, {stream, self}]),
 	    
 	    receive 
@@ -1644,6 +1737,8 @@ parse_url(Config) when is_list(Config) ->
 
 
 %%-------------------------------------------------------------------------
+ipv6() ->
+    [{require,ipv6_hosts}].
 ipv6(doc) ->
     ["Test ipv6."];
 ipv6(suite) ->
@@ -1652,14 +1747,14 @@ ipv6(Config) when is_list(Config) ->
     {ok, Hostname} = inet:gethostname(),
     
     case lists:member(list_to_atom(Hostname), 
-		      ?config(ipv6_hosts, Config)) of
+		      ct:get_config(ipv6_hosts)) of
 	true ->
 	    {DummyServerPid, Port} = dummy_server(self(), ipv6),
 	    
 	    URL = "http://[" ++ ?IPV6_LOCAL_HOST ++ "]:" ++ 
 		integer_to_list(Port) ++ "/foobar.html",
 	    {ok, {{_,200,_}, [_ | _], [_|_]}} =
-		http:request(get, {URL, []}, [], []),
+		httpc:request(get, {URL, []}, [], []),
 	    
 	    DummyServerPid ! stop,
 	    ok;
@@ -1677,11 +1772,11 @@ headers_as_is(Config) when is_list(Config) ->
     Port = ?config(local_port, Config),
     URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
     {ok, {{_,200,_}, [_|_], [_|_]}} =
-	http:request(get, {URL, [{"Host", "localhost"},{"Te", ""}]}, 
+	httpc:request(get, {URL, [{"Host", "localhost"},{"Te", ""}]}, 
 		     [], [{headers_as_is, true}]),
      
     {ok, {{_,400,_}, [_|_], [_|_]}} = 
-	http:request(get, {URL, [{"Te", ""}]},[], [{headers_as_is, true}]),
+	httpc:request(get, {URL, [{"Te", ""}]},[], [{headers_as_is, true}]),
     ok.
 
 
@@ -1696,13 +1791,13 @@ options(Config) when is_list(Config) ->
 	    Port = ?config(local_port, Config),
 	    URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
 	    {ok, {{_,200,_}, [_ | _], Bin}} 
-		= http:request(get, {URL, []}, [{foo, bar}], 
+		= httpc:request(get, {URL, []}, [{foo, bar}], 
 			       %% Ignore unknown options
 			       [{body_format, binary}, {foo, bar}]),
 
 	    true = is_binary(Bin),
 	    {ok, {200, [_|_]}} 
-		= http:request(get, {URL, []}, [{timeout, infinity}],
+		= httpc:request(get, {URL, []}, [{timeout, infinity}],
 			       [{full_result, false}]);
 	_ ->
 	    {skip, "Failed to start local http-server"}
@@ -1715,17 +1810,17 @@ http_invalid_http(doc) ->
 http_invalid_http(suite) ->
     [];
 http_invalid_http(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ "/invalid_http.html",
     
     {error, {could_not_parse_as_http, _} = Reason} =
-	http:request(get, {URL, []}, [], []),
+	httpc:request(get, {URL, []}, [], []),
     
     test_server:format("Parse error: ~p ~n", [Reason]),
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 
@@ -1762,7 +1857,7 @@ empty_body_otp_6243(Config) when is_list(Config) ->
     Port = ?config(local_port, Config),
     URL = ?URL_START ++ integer_to_list(Port) ++ "/empty.html",
     {ok, {{_,200,_}, [_ | _], []}} =
-	http:request(get, {URL, []}, [{timeout, 500}], []).
+	httpc:request(get, {URL, []}, [{timeout, 500}], []).
 
 
 %%-------------------------------------------------------------------------
@@ -1772,14 +1867,14 @@ transfer_encoding_otp_6807(doc) ->
 transfer_encoding_otp_6807(suite) ->
     [];
 transfer_encoding_otp_6807(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ 
 	"/capital_transfer_encoding.html",
-    {ok, {{_,200,_}, [_|_], [_ | _]}} = http:request(URL),
+    {ok, {{_,200,_}, [_|_], [_ | _]}} = httpc:request(URL),
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 
@@ -1805,13 +1900,13 @@ empty_response_header_otp_6830(doc) ->
 empty_response_header_otp_6830(suite) ->
     [];
 empty_response_header_otp_6830(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ "/no_headers.html",
-    {ok, {{_,200,_}, [], [_ | _]}} = http:request(URL),
+    {ok, {{_,200,_}, [], [_ | _]}} = httpc:request(URL),
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 
@@ -1822,13 +1917,13 @@ no_content_204_otp_6982(doc) ->
 no_content_204_otp_6982(suite) ->
     [];
 no_content_204_otp_6982(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ "/no_content.html",
-    {ok, {{_,204,_}, [], []}} = http:request(URL),
+    {ok, {{_,204,_}, [], []}} = httpc:request(URL),
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 
@@ -1840,35 +1935,33 @@ missing_CR_otp_7304(doc) ->
 missing_CR_otp_7304(suite) ->
     [];
 missing_CR_otp_7304(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ "/missing_CR.html",
-    {ok, {{_,200,_}, _, [_ | _]}} = http:request(URL),
+    {ok, {{_,200,_}, _, [_ | _]}} = httpc:request(URL),
     DummyServerPid ! stop,
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 
 %%-------------------------------------------------------------------------
 
-otp_7883(suite) ->
-    [otp_7883_1, otp_7883_2].
 
 otp_7883_1(doc) ->
     ["OTP-7883-sync"];
 otp_7883_1(suite) ->
     [];
 otp_7883_1(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
 
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ "/just_close.html",
-    {error, socket_closed_remotely} = http:request(URL),
+    {error, socket_closed_remotely} = httpc:request(URL),
     DummyServerPid ! stop,
 
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 otp_7883_2(doc) ->
@@ -1876,7 +1969,7 @@ otp_7883_2(doc) ->
 otp_7883_2(suite) ->
     [];
 otp_7883_2(Config) when is_list(Config) ->
-    ok = http:set_options([{ipfamily, inet}]),
+    ok = httpc:set_options([{ipfamily, inet}]),
 
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
@@ -1885,9 +1978,9 @@ otp_7883_2(Config) when is_list(Config) ->
     Request     = {URL, []}, 
     HttpOptions = [], 
     Options     = [{sync, false}], 
-    Profile     = http:default_profile(), 
+    Profile     = httpc:default_profile(), 
     {ok, RequestId} = 
-	http:request(Method, Request, HttpOptions, Options, Profile),
+	httpc:request(Method, Request, HttpOptions, Options, Profile),
     ok = 
 	receive
 	    {http, {RequestId, {error, socket_closed_remotely}}} ->
@@ -1895,14 +1988,12 @@ otp_7883_2(Config) when is_list(Config) ->
     end,
     DummyServerPid ! stop,
 
-    ok = http:set_options([{ipfamily, inet6fb4}]),   % ********** ipfamily = inet6 *************
+    ok = httpc:set_options([{ipfamily, inet6fb4}]), 
     ok.
 
 
 %%-------------------------------------------------------------------------
 
-otp_8154(suite) ->
-    [otp_8154_1].
 
 otp_8154_1(doc) ->
     ["OTP-8154"];
@@ -1966,7 +2057,7 @@ run_clients(NumClients, ServerPort, SeqNumServer) ->
 		      fun() ->
 			      io:format("[~w] client started - "
 					"issue request~n", [Id]),
-			      case http:request(Url) of
+			      case httpc:request(Url) of
 				  {ok, {{_,200,_}, _, Resp}} ->
 				      io:format("[~w] 200 response: "
 						"~p~n", [Id, Resp]),
@@ -2182,12 +2273,6 @@ f(F, A) -> lists:flatten(io_lib:format(F,A)).
 
 %%-------------------------------------------------------------------------
 
-otp_8106(suite) ->
-    [
-     otp_8106_pid, 
-     otp_8106_fun, 
-     otp_8106_mfa
-    ].
 
 
 otp_8106_pid(doc) ->
@@ -2354,7 +2439,7 @@ otp_8352(Config) when is_list(Config) ->
 	    ConnOptions = [{max_sessions,          MaxSessions}, 
 			   {max_keep_alive_length, MaxKeepAlive}, 
 			   {keep_alive_timeout,    KeepAliveTimeout}], 
-	    http:set_options(ConnOptions), 
+	    httpc:set_options(ConnOptions), 
 
 	    Method       = get, 
 	    Port         = ?config(local_port, Config),
@@ -2366,9 +2451,9 @@ otp_8352(Config) when is_list(Config) ->
 	    Options1     = [{socket_opts, [{tos,    87}, 
 					   {recbuf, 16#FFFF}, 
 					   {sndbuf, 16#FFFF}]}], 
-	    case http:request(Method, Request, HttpOptions1, Options1) of
+	    case httpc:request(Method, Request, HttpOptions1, Options1) of
 		{ok, {{_,200,_}, [_ | _], ReplyBody1 = [_ | _]}} ->
-		    %% equivaliant to http:request(get, {URL, []}, [], []),
+		    %% equivaliant to httpc:request(get, {URL, []}, [], []),
 		    inets_test_lib:check_body(ReplyBody1);
 		{ok, UnexpectedReply1} ->
 		    tsf({unexpected_reply, UnexpectedReply1});
@@ -2382,9 +2467,9 @@ otp_8352(Config) when is_list(Config) ->
 	    Options2     = [{socket_opts, [{tos,    84}, 
 					   {recbuf, 32#1FFFF}, 
 					   {sndbuf, 32#1FFFF}]}], 
-	    case http:request(Method, Request, HttpOptions2, Options2) of
+	    case httpc:request(Method, Request, HttpOptions2, Options2) of
 		{ok, {{_,200,_}, [_ | _], ReplyBody2 = [_ | _]}} ->
-		    %% equivaliant to http:request(get, {URL, []}, [], []),
+		    %% equivaliant to httpc:request(get, {URL, []}, [], []),
 		    inets_test_lib:check_body(ReplyBody2);
 		{ok,  UnexpectedReply2} ->
 		    tsf({unexpected_reply, UnexpectedReply2});
@@ -2406,13 +2491,13 @@ otp_8371(doc) ->
 otp_8371(suite) ->
     [];
 otp_8371(Config) when is_list(Config) ->
-    ok = http:set_options([{ipv6, disabled}]), % also test the old option 
+    ok = httpc:set_options([{ipv6, disabled}]), % also test the old option 
     {DummyServerPid, Port} = dummy_server(self(), ipv4),
     
     URL = ?URL_START ++ integer_to_list(Port) ++ 
 	"/ensure_host_header_with_port.html",
         
-    case http:request(get, {URL, []}, [], []) of
+    case httpc:request(get, {URL, []}, [], []) of
 	{ok, Result} ->
 	    case Result of
 		{{_, 200, _}, _Headers, Body} ->
@@ -2436,11 +2521,82 @@ otp_8371(Config) when is_list(Config) ->
     end,
 
     DummyServerPid ! stop,
-    ok = http:set_options([{ipv6, enabled}]),   
+    ok = httpc:set_options([{ipv6, enabled}]),   
     ok.
 
 
+%%-------------------------------------------------------------------------
 
+otp_8739(doc) ->
+    ["OTP-8739"];
+otp_8739(suite) ->
+    [];
+otp_8739(Config) when is_list(Config) ->
+    {_DummyServerPid, Port} = otp_8739_dummy_server(),
+    URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
+    Method      = get,
+    Request     = {URL, []}, 
+    HttpOptions = [{connect_timeout, 500}, {timeout, 1}], 
+    Options     = [{sync, true}], 
+    case http:request(Method, Request, HttpOptions, Options) of
+	{error, timeout} ->
+	    %% And now we check the size of the handler db
+	    Info = httpc:info(),
+	    tsp("Info: ~p", [Info]),
+	    {value, {handlers, Handlers}} = 
+		lists:keysearch(handlers, 1, Info),
+	    case Handlers of
+		[] ->
+		    ok;
+		_ ->
+		    tsf({unexpected_handlers, Handlers})
+	    end;
+	Unexpected ->
+	    tsf({unexpected, Unexpected})
+    end.
+
+
+otp_8739_dummy_server() ->
+    Parent = self(), 
+    Pid = spawn_link(fun() -> otp_8739_dummy_server_init(Parent) end),
+    receive
+	{port, Port} ->
+	    {Pid, Port}
+    end.
+
+otp_8739_dummy_server_init(Parent) ->
+    {ok, ListenSocket} = 
+	gen_tcp:listen(0, [binary, inet, {packet, 0},
+			   {reuseaddr,true},
+			   {active, false}]),
+    {ok, Port} = inet:port(ListenSocket),
+    Parent ! {port, Port},
+    otp_8739_dummy_server_main(Parent, ListenSocket).
+
+otp_8739_dummy_server_main(Parent, ListenSocket) ->
+    case gen_tcp:accept(ListenSocket) of
+	{ok, Sock} ->
+	    %% Ignore the request, and simply wait for the socket to close
+	    receive
+		{tcp_closed, Sock} ->
+		    (catch gen_tcp:close(ListenSocket)),
+		    exit(normal);
+		{tcp_error, Sock, Reason} ->
+		    tsp("socket error: ~p", [Reason]),
+		    (catch gen_tcp:close(ListenSocket)),
+		    exit(normal)
+	    after 10000 ->
+		    %% Just in case
+		    (catch gen_tcp:close(Sock)),
+		    (catch gen_tcp:close(ListenSocket)),
+		    exit(timeout)
+	    end;
+	Error ->
+	    exit(Error)
+    end.
+
+		       
+    
 %%--------------------------------------------------------------------
 %% Internal functions
 %%--------------------------------------------------------------------
@@ -2537,7 +2693,7 @@ receive_streamed_body(RequestId, Body) ->
     end.
 
 receive_streamed_body(RequestId, Body, Pid) ->
-    http:stream_next(Pid),
+    httpc:stream_next(Pid),
     test_server:format("~p:receive_streamed_body -> requested next stream ~n", [?MODULE]),
     receive 
 	{http, {RequestId, stream, BinBodyPart}} ->
@@ -2921,11 +3077,11 @@ provocate_not_modified_bug(Url) ->
     Timeout = 15000, %% 15s should be plenty
 
     {ok, {{_, 200, _}, ReplyHeaders, _Body}} =
-	http:request(get, {Url, []}, [{timeout, Timeout}], []),
+	httpc:request(get, {Url, []}, [{timeout, Timeout}], []),
     Etag = pick_header(ReplyHeaders, "ETag"),
     Last = pick_header(ReplyHeaders, "last-modified"),
     
-    case http:request(get, {Url, [{"If-None-Match", Etag},
+    case httpc:request(get, {Url, [{"If-None-Match", Etag},
 				  {"If-Modified-Since", Last}]},
 		      [{timeout, 15000}],
 		      []) of
diff --git a/lib/inets/test/httpc_cookie_SUITE.erl b/lib/inets/test/httpc_cookie_SUITE.erl
index ad5df656c6..a9eddac6eb 100644
--- a/lib/inets/test/httpc_cookie_SUITE.erl
+++ b/lib/inets/test/httpc_cookie_SUITE.erl
@@ -19,11 +19,11 @@
 %%
 -module(httpc_cookie_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 
 %% Test server specific exports
--export([all/1, init_per_testcase/2, end_per_testcase/2]).
+-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]).
 
 %% Test cases must be exported.
 -export([session_cookies_only/1, netscape_cookies/1, 
@@ -116,22 +116,29 @@ end_per_testcase(Case, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Describe the main purpose of this suite"];
-
-all(suite) -> 
-    [
-     session_cookies_only, 
-     netscape_cookies, 
-     cookie_cancel,
-     cookie_expires, 
-     persistent_cookie, 
-     domain_cookie, 
-     secure_cookie,
-     update_cookie, 
-     update_cookie_session, 
-     cookie_attributes
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [session_cookies_only, netscape_cookies, cookie_cancel,
+     cookie_expires, persistent_cookie, domain_cookie,
+     secure_cookie, update_cookie, update_cookie_session,
+     cookie_attributes].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
diff --git a/lib/inets/test/httpd_1_1.erl b/lib/inets/test/httpd_1_1.erl
index 055d034bec..2a6110e3ea 100644
--- a/lib/inets/test/httpd_1_1.erl
+++ b/lib/inets/test/httpd_1_1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 7403d4a643..95ee15d08f 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -20,56 +20,177 @@
 
 -module(httpd_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("test_server_line.hrl").
 -include("inets_test_lib.hrl").
 
 -include_lib("kernel/include/file.hrl").
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2,
 	 init_per_suite/1, end_per_suite/1]).
 
-%% Test cases must be exported.
--export([ip/1, ssl/1, http_1_1_ip/1, http_1_0_ip/1, http_0_9_ip/1,
-	 ipv6/1, tickets/1]).
-
 %% Core Server tests
--export([ip_mod_alias/1, ip_mod_actions/1, ip_mod_security/1, ip_mod_auth/1,
-	 ip_mod_auth_api/1, ip_mod_auth_mnesia_api/1, 
-	 ip_mod_htaccess/1, ip_mod_cgi/1, ip_mod_esi/1,
-	 ip_mod_get/1, ip_mod_head/1, ip_mod_all/1, ip_load_light/1,
-	 ip_load_medium/1, ip_load_heavy/1, ip_dos_hostname/1, 
-	 ip_time_test/1, ip_block_disturbing_idle/1, 
-	 ip_block_non_disturbing_idle/1, ip_block_503/1, 
-	 ip_block_disturbing_active/1, ip_block_non_disturbing_active/1, 
+-export([
+	 ip_mod_alias/1, 
+	 ip_mod_actions/1, 
+	 ip_mod_security/1, 
+	 ip_mod_auth/1,
+	 ip_mod_auth_api/1, 
+	 ip_mod_auth_mnesia_api/1, 
+	 ip_mod_htaccess/1, 
+	 ip_mod_cgi/1, 
+	 ip_mod_esi/1,
+	 ip_mod_get/1, 
+	 ip_mod_head/1, 
+	 ip_mod_all/1, 
+	 ip_load_light/1,
+	 ip_load_medium/1, 
+	 ip_load_heavy/1, 
+	 ip_dos_hostname/1, 
+	 ip_time_test/1, 
+	 ip_block_disturbing_idle/1, 
+	 ip_block_non_disturbing_idle/1, 
+	 ip_block_503/1, 
+	 ip_block_disturbing_active/1, 
+	 ip_block_non_disturbing_active/1, 
 	 ip_block_disturbing_active_timeout_not_released/1, 
 	 ip_block_disturbing_active_timeout_released/1, 
 	 ip_block_non_disturbing_active_timeout_not_released/1, 
 	 ip_block_non_disturbing_active_timeout_released/1, 
 	 ip_block_disturbing_blocker_dies/1, 
 	 ip_block_non_disturbing_blocker_dies/1, 
-	 ip_restart_no_block/1, ip_restart_disturbing_block/1, 
+	 ip_restart_no_block/1, 
+	 ip_restart_disturbing_block/1, 
 	 ip_restart_non_disturbing_block/1
 	]).
 
--export([ssl_mod_alias/1, ssl_mod_actions/1, ssl_mod_security/1, 
-	 ssl_mod_auth/1, ssl_mod_auth_api/1,  
-	 ssl_mod_auth_mnesia_api/1, ssl_mod_htaccess/1, 
-	 ssl_mod_cgi/1, ssl_mod_esi/1, ssl_mod_get/1, ssl_mod_head/1, 
-	 ssl_mod_all/1, ssl_load_light/1, ssl_load_medium/1, 
-	 ssl_load_heavy/1, ssl_dos_hostname/1, ssl_time_test/1,
-	 ssl_restart_no_block/1, ssl_restart_disturbing_block/1,
-	 ssl_restart_non_disturbing_block/1, ssl_block_disturbing_idle/1, 
-	 ssl_block_non_disturbing_idle/1, ssl_block_503/1, 
-	 ssl_block_disturbing_active/1, ssl_block_non_disturbing_active/1, 
-	 ssl_block_disturbing_active_timeout_not_released/1, 
-	 ssl_block_disturbing_active_timeout_released/1, 
-	 ssl_block_non_disturbing_active_timeout_not_released/1, 
-	 ssl_block_non_disturbing_active_timeout_released/1, 
-	 ssl_block_disturbing_blocker_dies/1, 
-	 ssl_block_non_disturbing_blocker_dies/1]).
+-export([
+	 pssl_mod_alias/1, 
+	 ossl_mod_alias/1, 
+	 essl_mod_alias/1, 
+	 
+	 pssl_mod_actions/1, 
+	 ossl_mod_actions/1, 
+	 essl_mod_actions/1, 
+	 
+	 pssl_mod_security/1, 
+	 ossl_mod_security/1, 
+	 essl_mod_security/1, 
+	 
+	 pssl_mod_auth/1, 
+	 ossl_mod_auth/1, 
+	 essl_mod_auth/1, 
+
+	 pssl_mod_auth_api/1,  
+	 ossl_mod_auth_api/1,  
+	 essl_mod_auth_api/1,  
+	 
+	 pssl_mod_auth_mnesia_api/1, 
+	 ossl_mod_auth_mnesia_api/1, 
+	 essl_mod_auth_mnesia_api/1, 
+	 
+	 pssl_mod_htaccess/1, 
+	 ossl_mod_htaccess/1, 
+	 essl_mod_htaccess/1, 
+	 
+	 pssl_mod_cgi/1, 
+	 ossl_mod_cgi/1, 
+	 essl_mod_cgi/1,
+ 
+	 pssl_mod_esi/1, 
+	 ossl_mod_esi/1, 
+	 essl_mod_esi/1, 
+
+	 pssl_mod_get/1, 
+	 ossl_mod_get/1, 
+	 essl_mod_get/1, 
+
+	 pssl_mod_head/1, 
+	 ossl_mod_head/1, 
+	 essl_mod_head/1, 
+	 
+	 pssl_mod_all/1, 
+	 ossl_mod_all/1, 
+	 essl_mod_all/1, 
+	 
+	 pssl_load_light/1, 
+	 ossl_load_light/1, 
+	 essl_load_light/1, 
+	 
+	 pssl_load_medium/1, 
+	 ossl_load_medium/1, 
+	 essl_load_medium/1, 
+
+	 pssl_load_heavy/1, 
+	 ossl_load_heavy/1, 
+	 essl_load_heavy/1, 
+
+	 pssl_dos_hostname/1, 
+	 ossl_dos_hostname/1, 
+	 essl_dos_hostname/1, 
+
+	 pssl_time_test/1, 
+	 ossl_time_test/1, 
+	 essl_time_test/1,
+	 
+	 pssl_restart_no_block/1, 
+	 ossl_restart_no_block/1, 
+	 essl_restart_no_block/1, 
+	 
+	 pssl_restart_disturbing_block/1, 
+	 ossl_restart_disturbing_block/1, 
+	 essl_restart_disturbing_block/1,
+	 
+	 pssl_restart_non_disturbing_block/1, 
+	 ossl_restart_non_disturbing_block/1, 
+	 essl_restart_non_disturbing_block/1, 
+	 
+	 pssl_block_disturbing_idle/1, 
+	 ossl_block_disturbing_idle/1, 
+	 essl_block_disturbing_idle/1, 
+
+	 pssl_block_non_disturbing_idle/1, 
+	 ossl_block_non_disturbing_idle/1, 
+	 essl_block_non_disturbing_idle/1, 
+	 
+	 pssl_block_503/1, 
+	 ossl_block_503/1, 
+	 essl_block_503/1, 
+
+	 pssl_block_disturbing_active/1, 
+	 ossl_block_disturbing_active/1, 
+	 essl_block_disturbing_active/1, 
+
+	 pssl_block_non_disturbing_active/1, 
+	 ossl_block_non_disturbing_active/1, 
+	 essl_block_non_disturbing_active/1, 
+
+	 pssl_block_disturbing_active_timeout_not_released/1, 
+	 ossl_block_disturbing_active_timeout_not_released/1, 
+	 essl_block_disturbing_active_timeout_not_released/1, 
+
+	 pssl_block_disturbing_active_timeout_released/1, 
+	 ossl_block_disturbing_active_timeout_released/1, 
+	 essl_block_disturbing_active_timeout_released/1, 
+
+	 pssl_block_non_disturbing_active_timeout_not_released/1, 
+	 ossl_block_non_disturbing_active_timeout_not_released/1, 
+	 essl_block_non_disturbing_active_timeout_not_released/1, 
+	 
+	 pssl_block_non_disturbing_active_timeout_released/1, 
+	 ossl_block_non_disturbing_active_timeout_released/1, 
+	 essl_block_non_disturbing_active_timeout_released/1, 
+
+	 pssl_block_disturbing_blocker_dies/1, 
+	 ossl_block_disturbing_blocker_dies/1, 
+	 essl_block_disturbing_blocker_dies/1, 
+
+	 pssl_block_non_disturbing_blocker_dies/1, 
+	 ossl_block_non_disturbing_blocker_dies/1, 
+	 essl_block_non_disturbing_blocker_dies/1
+	]).
 
 %%% HTTP 1.1 tests
 -export([ip_host/1, ip_chunked/1, ip_expect/1, ip_range/1,
@@ -103,8 +224,8 @@
 %% Seconds before successful auths timeout.
 -define(AUTH_TIMEOUT,5).
 
--record(httpd_user, {user_name, password, user_data}).
--record(httpd_group,{group_name, userlist}).
+-record(httpd_user,  {user_name, password, user_data}).
+-record(httpd_group, {group_name, userlist}).
 
 
 %%--------------------------------------------------------------------
@@ -117,19 +238,109 @@
 %% Description: Returns documentation/test cases in this test suite
 %%		or a skip tuple if the platform is not supported.  
 %%--------------------------------------------------------------------
-all(doc) ->
-    ["Test the http server in the intes application."];
-all(suite) ->
-    [
-     ip, 
-     ssl, 
-     http_1_1_ip, 
-     http_1_0_ip, 
-     http_0_9_ip, 
-     %% ipv6, 
-     tickets
-    ].
- 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, ip}, {group, ssl}, {group, http_1_1_ip},
+     {group, http_1_0_ip}, {group, http_0_9_ip},
+     {group, tickets}].
+
+groups() -> 
+    [{ip, [],
+      [ip_mod_alias, ip_mod_actions, ip_mod_security,
+       ip_mod_auth, ip_mod_auth_api, ip_mod_auth_mnesia_api,
+       ip_mod_htaccess, ip_mod_cgi, ip_mod_esi, ip_mod_get,
+       ip_mod_head, ip_mod_all, ip_load_light, ip_load_medium,
+       ip_load_heavy, ip_dos_hostname, ip_time_test,
+       ip_restart_no_block, ip_restart_disturbing_block,
+       ip_restart_non_disturbing_block,
+       ip_block_disturbing_idle, ip_block_non_disturbing_idle,
+       ip_block_503, ip_block_disturbing_active,
+       ip_block_non_disturbing_active,
+       ip_block_disturbing_active_timeout_not_released,
+       ip_block_disturbing_active_timeout_released,
+       ip_block_non_disturbing_active_timeout_not_released,
+       ip_block_non_disturbing_active_timeout_released,
+       ip_block_disturbing_blocker_dies,
+       ip_block_non_disturbing_blocker_dies]},
+     {ssl, [],
+      [{group, pssl}, {group, ossl}, {group, essl}]},
+     {pssl, [],
+      [pssl_mod_alias, pssl_mod_actions, pssl_mod_security,
+       pssl_mod_auth, pssl_mod_auth_api,
+       pssl_mod_auth_mnesia_api, pssl_mod_htaccess,
+       pssl_mod_cgi, pssl_mod_esi, pssl_mod_get, pssl_mod_head,
+       pssl_mod_all, pssl_load_light, pssl_load_medium,
+       pssl_load_heavy, pssl_dos_hostname, pssl_time_test,
+       pssl_restart_no_block, pssl_restart_disturbing_block,
+       pssl_restart_non_disturbing_block,
+       pssl_block_disturbing_idle,
+       pssl_block_non_disturbing_idle, pssl_block_503,
+       pssl_block_disturbing_active,
+       pssl_block_non_disturbing_active,
+       pssl_block_disturbing_active_timeout_not_released,
+       pssl_block_disturbing_active_timeout_released,
+       pssl_block_non_disturbing_active_timeout_not_released,
+       pssl_block_non_disturbing_active_timeout_released,
+       pssl_block_disturbing_blocker_dies,
+       pssl_block_non_disturbing_blocker_dies]},
+     {ossl, [],
+      [ossl_mod_alias, ossl_mod_actions, ossl_mod_security,
+       ossl_mod_auth, ossl_mod_auth_api,
+       ossl_mod_auth_mnesia_api, ossl_mod_htaccess,
+       ossl_mod_cgi, ossl_mod_esi, ossl_mod_get, ossl_mod_head,
+       ossl_mod_all, ossl_load_light, ossl_load_medium,
+       ossl_load_heavy, ossl_dos_hostname, ossl_time_test,
+       ossl_restart_no_block, ossl_restart_disturbing_block,
+       ossl_restart_non_disturbing_block,
+       ossl_block_disturbing_idle,
+       ossl_block_non_disturbing_idle, ossl_block_503,
+       ossl_block_disturbing_active,
+       ossl_block_non_disturbing_active,
+       ossl_block_disturbing_active_timeout_not_released,
+       ossl_block_disturbing_active_timeout_released,
+       ossl_block_non_disturbing_active_timeout_not_released,
+       ossl_block_non_disturbing_active_timeout_released,
+       ossl_block_disturbing_blocker_dies,
+       ossl_block_non_disturbing_blocker_dies]},
+     {essl, [],
+      [essl_mod_alias, essl_mod_actions, essl_mod_security,
+       essl_mod_auth, essl_mod_auth_api,
+       essl_mod_auth_mnesia_api, essl_mod_htaccess,
+       essl_mod_cgi, essl_mod_esi, essl_mod_get, essl_mod_head,
+       essl_mod_all, essl_load_light, essl_load_medium,
+       essl_load_heavy, essl_dos_hostname, essl_time_test,
+       essl_restart_no_block, essl_restart_disturbing_block,
+       essl_restart_non_disturbing_block,
+       essl_block_disturbing_idle,
+       essl_block_non_disturbing_idle, essl_block_503,
+       essl_block_disturbing_active,
+       essl_block_non_disturbing_active,
+       essl_block_disturbing_active_timeout_not_released,
+       essl_block_disturbing_active_timeout_released,
+       essl_block_non_disturbing_active_timeout_not_released,
+       essl_block_non_disturbing_active_timeout_released,
+       essl_block_disturbing_blocker_dies,
+       essl_block_non_disturbing_blocker_dies]},
+     {http_1_1_ip, [],
+      [ip_host, ip_chunked, ip_expect, ip_range, ip_if_test,
+       ip_http_trace, ip_http1_1_head,
+       ip_mod_cgi_chunked_encoding_test]},
+     {http_1_0_ip, [],
+      [ip_head_1_0, ip_get_1_0, ip_post_1_0]},
+     {http_0_9_ip, [], [ip_get_0_9]},
+     {ipv6, [], [ipv6_hostname, ipv6_address]},
+     {tickets, [],
+      [ticket_5775, ticket_5865, ticket_5913, ticket_6003,
+       ticket_7304]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
 %% Config - [tuple()]
@@ -197,9 +408,9 @@ init_per_testcase2(Case, Config) ->
 	      "~n   Config: ~p"
 	      "~n", [?MODULE, Case, Config]),
 
-    IpNormal = integer_to_list(?IP_PORT)    ++ ".conf",
-    IpHtacess = integer_to_list(?IP_PORT)   ++ "htacess.conf",
-    SslNormal = integer_to_list(?SSL_PORT)  ++ ".conf",
+    IpNormal   = integer_to_list(?IP_PORT)    ++ ".conf",
+    IpHtacess  = integer_to_list(?IP_PORT)   ++ "htacess.conf",
+    SslNormal  = integer_to_list(?SSL_PORT)  ++ ".conf",
     SslHtacess = integer_to_list(?SSL_PORT) ++ "htacess.conf",
 
     DataDir     = ?config(data_dir, Config),
@@ -210,8 +421,8 @@ init_per_testcase2(Case, Config) ->
 	      "~n   DataDir: ~p"
 	      "~n", [?MODULE, Case, SuiteTopDir, DataDir]),
     
-    TcTopDir  = filename:join(SuiteTopDir, Case),
-    ?line ok  = file:make_dir(TcTopDir),
+    TcTopDir = filename:join(SuiteTopDir, Case),
+    ?line ok = file:make_dir(TcTopDir),
 
     io:format(user, "~w:init_per_testcase2(~w) -> "
 	      "~n   TcTopDir: ~p"
@@ -267,9 +478,21 @@ init_per_testcase2(Case, Config) ->
     %% To be used by SSL test cases
     io:format(user, "~w:init_per_testcase2(~w) -> ssl testcase setups~n", 
 	      [?MODULE, Case]),
-    create_config([{port, ?SSL_PORT}, {sock_type, ssl} | NewConfig], 
+    SocketType = 
+	case atom_to_list(Case) of
+	    [X, $s, $s, $l | _] ->
+		case X of
+		    $p -> ssl;
+		    $o -> ossl;
+		    $e -> essl
+		end;
+	    _ ->
+		ssl
+	end,
+
+    create_config([{port, ?SSL_PORT}, {sock_type, SocketType} | NewConfig], 
 		  normal_acess, SslNormal),
-    create_config([{port, ?SSL_PORT}, {sock_type, ssl} | NewConfig],
+    create_config([{port, ?SSL_PORT}, {sock_type, SocketType} | NewConfig],
     		  mod_htaccess, SslHtacess),  
   
     %% To be used by IPv6 test cases. Case-clause is so that
@@ -300,8 +523,14 @@ init_per_testcase3(Case, Config) ->
     io:format(user, "~w:init_per_testcase3(~w) -> entry with"
 	      "~n   Config: ~p", [?MODULE, Case, Config]),
 
+    
+%%     %% Create a new fresh node to be used by the server in this test-case
+    
+%%     NodeName = list_to_atom(atom_to_list(Case) ++ "_httpd"), 
+%%     Node     = inets_test_lib:start_node(NodeName),
+    
     %% Clean up (we do not want this clean up in end_per_testcase
-    %% if init_per_testcase crases for some testcase it will
+    %% if init_per_testcase crashes for some testcase it will
     %% have contaminated the environment and there will be no clean up.)
     %% This init can take a few different paths so that one crashes
     %% does not mean that all invocations will.
@@ -310,15 +539,26 @@ init_per_testcase3(Case, Config) ->
     application:stop(inets),
     application:stop(ssl),
     cleanup_mnesia(),
-    
-    %% TraceLevel = max, 
-    TraceLevel = 70, 
-    TraceDest  = io, 
-    inets:enable_trace(TraceLevel, TraceDest),
 
+    %% Set trace
+    case lists:reverse(atom_to_list(Case)) of
+	"tset_emit" ++ _Rest -> % test-cases ending with time_test
+	    io:format(user, "~w:init_per_testcase3(~w) -> disabling trace", 
+		      [?MODULE, Case]),
+	    inets:disable_trace();
+	_ ->
+	    %% TraceLevel = max, 
+	    io:format(user, "~w:init_per_testcase3(~w) -> enabling trace", 
+		      [?MODULE, Case]),
+	    TraceLevel = 70, 
+	    TraceDest  = io, 
+	    inets:enable_trace(TraceLevel, TraceDest, httpd)
+    end,
+	    
     %% Start initialization
     io:format(user, "~w:init_per_testcase3(~w) -> start init", 
 	      [?MODULE, Case]),
+    
 
     Dog = test_server:timetrap(inets_test_lib:minutes(10)),
     NewConfig = lists:keydelete(watchdog, 1, Config),
@@ -351,22 +591,35 @@ init_per_testcase3(Case, Config) ->
 		  filename:join(TcTopDir,
 				integer_to_list(?IP_PORT) ++ ".conf")}]),
 		Rest;
-	    "ssl_mod_htaccess" ->
+
+	    [X, $s, $s, $l, $_, $m, $o, $d, $_, $h, $t, $a, $c, $c, $e, $s, $s] ->
+		SslTag = 
+		    case X of
+			$p -> ssl;  % plain
+			$o -> ossl; % OpenSSL based ssl
+			$e -> essl  % Erlang based ssl
+		    end,
 		case inets_test_lib:start_http_server_ssl(
 		       filename:join(TcTopDir,
 				     integer_to_list(?SSL_PORT) ++ 
-				     "htacess.conf")) of
+				     "htacess.conf"), SslTag) of
 		    ok ->
 			"mod_htaccess";
 		    Other ->
 			error_logger:info_report("Other: ~p~n", [Other]),
 			{skip, "SSL does not seem to be supported"}
 		end;
-	    "ssl_" ++ Rest ->
+	    [X, $s, $s, $l, $_ | Rest] ->
+		SslTag = 
+		    case X of
+			$p -> ssl;
+			$o -> ossl;
+			$e -> essl
+		    end,
 		case inets_test_lib:start_http_server_ssl(
 		       filename:join(TcTopDir,
 				     integer_to_list(?SSL_PORT) ++ 
-				     ".conf")) of
+				     ".conf"), SslTag) of
 		    ok ->
 			Rest;
 		    Other ->
@@ -431,6 +684,7 @@ end_per_testcase2(Case, Config) ->
     application:unset_env(inets, services),
     application:stop(inets),
     application:stop(ssl),     
+    application:stop(crypto), % used by the new ssl (essl test cases)  
     cleanup_mnesia(),
     io:format(user, "~w:end_per_testcase2(~w) -> done~n", 
 	      [?MODULE, Case]),
@@ -440,134 +694,23 @@ end_per_testcase2(Case, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-ip(doc) ->
-    ["HTTP tests using TCP/IP"];
-ip(suite) ->
-    [
-     ip_mod_alias, 
-     ip_mod_actions, 
-     ip_mod_security, 
-     ip_mod_auth,
-     ip_mod_auth_api, 
-     ip_mod_auth_mnesia_api,
-     ip_mod_htaccess, 
-     ip_mod_cgi, 
-     ip_mod_esi, 
-     ip_mod_get,
-     ip_mod_head, 
-     ip_mod_all, 
-     ip_load_light, 
-     ip_load_medium, 
-     ip_load_heavy,
-     ip_dos_hostname, 
-     ip_time_test, 
-     ip_block_disturbing_idle, 
-     ip_block_non_disturbing_idle, 
-     ip_block_503, 
-     ip_block_disturbing_active, 
-     ip_block_non_disturbing_active, 
-     ip_block_disturbing_active_timeout_not_released, 
-     ip_block_disturbing_active_timeout_released, 
-     ip_block_non_disturbing_active_timeout_not_released, 
-     ip_block_non_disturbing_active_timeout_released, 
-     ip_block_disturbing_blocker_dies, 
-     ip_block_non_disturbing_blocker_dies, 
-     ip_restart_no_block, 
-     ip_restart_disturbing_block, 
-     ip_restart_non_disturbing_block
-    ].
 
 %%-------------------------------------------------------------------------
-ssl(doc) ->
-    ["HTTP test using SSL"];
-ssl(suite) ->
-    [
-     ssl_mod_alias, 
-     ssl_mod_actions, 
-     ssl_mod_security, 
-     ssl_mod_auth,
-     ssl_mod_auth_api, 
-     ssl_mod_auth_mnesia_api,
-     ssl_mod_htaccess, 
-     ssl_mod_cgi, 
-     ssl_mod_esi,
-     ssl_mod_get, 
-     ssl_mod_head, 
-     ssl_mod_all, 
-     ssl_load_light, 
-     ssl_load_medium,
-     ssl_load_heavy, 
-     ssl_dos_hostname, 
-     ssl_time_test,
-     ssl_restart_no_block, 
-     ssl_restart_disturbing_block,
-     ssl_restart_non_disturbing_block, 
-     ssl_block_disturbing_idle, 
-     ssl_block_non_disturbing_idle, 
-     ssl_block_503,
-     ssl_block_disturbing_active, 
-     ssl_block_non_disturbing_active, 
-     ssl_block_disturbing_active_timeout_not_released, 
-     ssl_block_disturbing_active_timeout_released, 
-     ssl_block_non_disturbing_active_timeout_not_released, 
-     ssl_block_non_disturbing_active_timeout_released, 
-     ssl_block_disturbing_blocker_dies,
-     ssl_block_non_disturbing_blocker_dies
-    ].
+
+
+
+
+
 
 %%-------------------------------------------------------------------------
-http_1_1_ip(doc) ->
-    ["HTTP/1.1"];
-http_1_1_ip(suite) ->
-    [
-     ip_host, 
-     ip_chunked, 
-     ip_expect, 
-     ip_range, 
-     ip_if_test, 
-     ip_http_trace,
-     ip_http1_1_head, 
-     ip_mod_cgi_chunked_encoding_test
-    ].
 
 %%-------------------------------------------------------------------------
-http_1_0_ip(doc) ->
-    ["HTTP/1.0"];
-http_1_0_ip(suite) ->
-    [
-     ip_head_1_0, 
-     ip_get_1_0, 
-     ip_post_1_0
-    ].
 
 %%-------------------------------------------------------------------------
-http_0_9_ip(doc) ->
-    ["HTTP/0.9"];
-http_0_9_ip(suite) ->
-    [
-     ip_get_0_9
-    ].
 
 %%-------------------------------------------------------------------------
-ipv6(doc) ->
-    ["Tests ipv6 functionality."];
-ipv6(suite) ->
-    [
-     ipv6_hostname, 
-     ipv6_address
-    ].
 
 %%-------------------------------------------------------------------------
-tickets(doc) ->
-    ["Test cases for reported bugs."];
-tickets(suite) ->
-    [
-     ticket_5775, 
-     ticket_5865, 
-     ticket_5913, 
-     ticket_6003, 
-     ticket_7304
-    ].
 
 %%-------------------------------------------------------------------------
 ip_mod_alias(doc) -> 
@@ -721,6 +864,8 @@ ip_load_heavy(Config) when is_list(Config) ->
 			  ?config(node, Config),
 			  get_nof_clients(ip_comm, heavy)),
     ok.
+
+
 %%-------------------------------------------------------------------------
 ip_dos_hostname(doc) ->
     ["Denial Of Service (DOS) attack test case"];
@@ -730,6 +875,8 @@ ip_dos_hostname(Config) when is_list(Config) ->
     dos_hostname(ip_comm, ?IP_PORT, ?config(host, Config), 
 		 ?config(node, Config), ?MAX_HEADER_SIZE),
     ok.
+
+
 %%-------------------------------------------------------------------------
 ip_time_test(doc) ->
     [""];
@@ -966,363 +1113,1072 @@ ip_restart_non_disturbing_block(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-ssl_mod_alias(doc) -> 
-    ["Module test: mod_alias"];
-ssl_mod_alias(suite) -> 
+
+pssl_mod_alias(doc) -> 
+    ["Module test: mod_alias - old SSL config"];
+pssl_mod_alias(suite) -> 
+    [];
+pssl_mod_alias(Config) when is_list(Config) ->
+    ssl_mod_alias(ssl, Config).
+
+ossl_mod_alias(doc) -> 
+    ["Module test: mod_alias - using new of configure old SSL"];
+ossl_mod_alias(suite) -> 
     [];
-ssl_mod_alias(Config) when is_list(Config) ->
-    httpd_mod:alias(ssl, ?SSL_PORT, 
+ossl_mod_alias(Config) when is_list(Config) ->
+    ssl_mod_alias(ossl, Config).
+
+essl_mod_alias(doc) -> 
+    ["Module test: mod_alias - using new of configure new SSL"];
+essl_mod_alias(suite) -> 
+    [];
+essl_mod_alias(Config) when is_list(Config) ->
+    ssl_mod_alias(essl, Config).
+
+
+ssl_mod_alias(Tag, Config) ->
+    httpd_mod:alias(Tag, ?SSL_PORT, 
 		    ?config(host, Config), ?config(node, Config)),
     ok. 
+
+
 %%-------------------------------------------------------------------------
-ssl_mod_actions(doc) -> 
-    ["Module test: mod_actions"];
-ssl_mod_actions(suite) -> 
+
+pssl_mod_actions(doc) -> 
+    ["Module test: mod_actions - old SSL config"];
+pssl_mod_actions(suite) -> 
     [];
-ssl_mod_actions(Config) when is_list(Config) ->
-    httpd_mod:actions(ssl, ?SSL_PORT, 
-		      ?config(host, Config), ?config(node, Config)),
+pssl_mod_actions(Config) when is_list(Config) ->
+    ssl_mod_actions(ssl, Config).
+
+ossl_mod_actions(doc) -> 
+    ["Module test: mod_actions - using new of configure old SSL"];
+ossl_mod_actions(suite) -> 
+    [];
+ossl_mod_actions(Config) when is_list(Config) ->
+    ssl_mod_actions(ossl, Config).
+
+essl_mod_actions(doc) -> 
+    ["Module test: mod_actions - using new of configure new SSL"];
+essl_mod_actions(suite) -> 
+    [];
+essl_mod_actions(Config) when is_list(Config) ->
+    ssl_mod_actions(essl, Config).
+
+
+ssl_mod_actions(Tag, Config) ->
+    httpd_mod:actions(Tag, 
+		      ?SSL_PORT, 
+		      ?config(host, Config), 
+		      ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_mod_security(doc) -> 
-    ["Module test: mod_security"];
-ssl_mod_security(suite) -> 
+
+pssl_mod_security(doc) -> 
+    ["Module test: mod_security - old SSL config"];
+pssl_mod_security(suite) -> 
+    [];
+pssl_mod_security(Config) when is_list(Config) ->
+    ssl_mod_security(ssl, Config).
+
+ossl_mod_security(doc) -> 
+    ["Module test: mod_security - using new of configure old SSL"];
+ossl_mod_security(suite) -> 
     [];
-ssl_mod_security(Config) when is_list(Config) ->
+ossl_mod_security(Config) when is_list(Config) ->
+    ssl_mod_security(ossl, Config).
+
+essl_mod_security(doc) -> 
+    ["Module test: mod_security - using new of configure new SSL"];
+essl_mod_security(suite) -> 
+    [];
+essl_mod_security(Config) when is_list(Config) ->
+    ssl_mod_security(essl, Config).
+
+ssl_mod_security(Tag, Config) ->
     ServerRoot = ?config(server_root, Config), 
-    httpd_mod:security(ServerRoot, ssl, ?SSL_PORT, 
-		       ?config(host, Config), ?config(node, Config)),
+    httpd_mod:security(ServerRoot, 
+		       Tag, 
+		       ?SSL_PORT, 
+		       ?config(host, Config), 
+		       ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_mod_auth(doc) -> 
-    ["Module test: mod_auth"];
-ssl_mod_auth(suite) -> 
+
+pssl_mod_auth(doc) -> 
+    ["Module test: mod_auth - old SSL config"];
+pssl_mod_auth(suite) -> 
     [];
-ssl_mod_auth(Config) when is_list(Config) ->
-    httpd_mod:auth(ssl, ?SSL_PORT, 
-		   ?config(host, Config), ?config(node, Config)),
+pssl_mod_auth(Config) when is_list(Config) ->
+    ssl_mod_auth(ssl, Config).
+
+ossl_mod_auth(doc) -> 
+    ["Module test: mod_auth - using new of configure old SSL"];
+ossl_mod_auth(suite) -> 
+    [];
+ossl_mod_auth(Config) when is_list(Config) ->
+    ssl_mod_auth(ossl, Config).
+
+essl_mod_auth(doc) -> 
+    ["Module test: mod_auth - using new of configure new SSL"];
+essl_mod_auth(suite) -> 
+    [];
+essl_mod_auth(Config) when is_list(Config) ->
+    ssl_mod_auth(essl, Config).
+
+ssl_mod_auth(Tag, Config) ->
+    httpd_mod:auth(Tag, 
+		   ?SSL_PORT, 
+		   ?config(host, Config), 
+		   ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_mod_auth_api(doc) -> 
-    ["Module test: mod_auth"];
-ssl_mod_auth_api(suite) -> 
+
+pssl_mod_auth_api(doc) -> 
+    ["Module test: mod_auth - old SSL config"];
+pssl_mod_auth_api(suite) -> 
+    [];
+pssl_mod_auth_api(Config) when is_list(Config) ->
+    ssl_mod_auth_api(ssl, Config).
+
+ossl_mod_auth_api(doc) -> 
+    ["Module test: mod_auth - using new of configure old SSL"];
+ossl_mod_auth_api(suite) -> 
+    [];
+ossl_mod_auth_api(Config) when is_list(Config) ->
+    ssl_mod_auth_api(ossl, Config).
+
+essl_mod_auth_api(doc) -> 
+    ["Module test: mod_auth - using new of configure new SSL"];
+essl_mod_auth_api(suite) -> 
     [];
-ssl_mod_auth_api(Config) when is_list(Config) ->
+essl_mod_auth_api(Config) when is_list(Config) ->
+    ssl_mod_auth_api(essl, Config).
+
+ssl_mod_auth_api(Tag, Config) ->
     ServerRoot = ?config(server_root, Config), 
-    Host =  ?config(host, Config),
-    Node = ?config(node, Config),
-    httpd_mod:auth_api(ServerRoot, "", ssl, ?SSL_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "dets_", ssl, ?SSL_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "mnesia_", ssl, ?SSL_PORT, Host, Node),
+    Host       =  ?config(host, Config),
+    Node       = ?config(node, Config),
+    httpd_mod:auth_api(ServerRoot, "",        Tag, ?SSL_PORT, Host, Node),
+    httpd_mod:auth_api(ServerRoot, "dets_",   Tag, ?SSL_PORT, Host, Node),
+    httpd_mod:auth_api(ServerRoot, "mnesia_", Tag, ?SSL_PORT, Host, Node),
     ok. 
 
+
 %%-------------------------------------------------------------------------
-ssl_mod_auth_mnesia_api(doc) -> 
-    ["Module test: mod_auth_mnesia_api"];
-ssl_mod_auth_mnesia_api(suite) -> 
+
+pssl_mod_auth_mnesia_api(doc) -> 
+    ["Module test: mod_auth_mnesia_api - old SSL config"];
+pssl_mod_auth_mnesia_api(suite) -> 
     [];
-ssl_mod_auth_mnesia_api(Config) when is_list(Config) ->
-    httpd_mod:auth_mnesia_api(ssl, ?SSL_PORT, 
-		   ?config(host, Config), ?config(node, Config)),
+pssl_mod_auth_mnesia_api(Config) when is_list(Config) ->
+    ssl_mod_auth_mnesia_api(ssl, Config).
+
+ossl_mod_auth_mnesia_api(doc) -> 
+    ["Module test: mod_auth_mnesia_api - using new of configure old SSL"];
+ossl_mod_auth_mnesia_api(suite) -> 
+    [];
+ossl_mod_auth_mnesia_api(Config) when is_list(Config) ->
+    ssl_mod_auth_mnesia_api(ossl, Config).
+
+essl_mod_auth_mnesia_api(doc) -> 
+    ["Module test: mod_auth_mnesia_api - using new of configure new SSL"];
+essl_mod_auth_mnesia_api(suite) -> 
+    [];
+essl_mod_auth_mnesia_api(Config) when is_list(Config) ->
+    ssl_mod_auth_mnesia_api(essl, Config).
+
+ssl_mod_auth_mnesia_api(Tag, Config) ->
+    httpd_mod:auth_mnesia_api(Tag, 
+			      ?SSL_PORT, 
+			      ?config(host, Config), 
+			      ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_mod_htaccess(doc) -> 
-    ["Module test: mod_htaccess"];
-ssl_mod_htaccess(suite) -> 
+
+pssl_mod_htaccess(doc) -> 
+    ["Module test: mod_htaccess - old SSL config"];
+pssl_mod_htaccess(suite) -> 
     [];
-ssl_mod_htaccess(Config) when is_list(Config) ->
-    httpd_mod:htaccess(ssl, ?SSL_PORT, 
-		       ?config(host, Config), ?config(node, Config)),
+pssl_mod_htaccess(Config) when is_list(Config) ->
+    ssl_mod_htaccess(ssl, Config).
+
+ossl_mod_htaccess(doc) -> 
+    ["Module test: mod_htaccess - using new of configure old SSL"];
+ossl_mod_htaccess(suite) -> 
+    [];
+ossl_mod_htaccess(Config) when is_list(Config) ->
+    ssl_mod_htaccess(ossl, Config).
+
+essl_mod_htaccess(doc) -> 
+    ["Module test: mod_htaccess - using new of configure new SSL"];
+essl_mod_htaccess(suite) -> 
+    [];
+essl_mod_htaccess(Config) when is_list(Config) ->
+    ssl_mod_htaccess(essl, Config).
+
+ssl_mod_htaccess(Tag, Config) ->
+    httpd_mod:htaccess(Tag, 
+		       ?SSL_PORT, 
+		       ?config(host, Config), 
+		       ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_mod_cgi(doc) ->
-    ["Module test: mod_cgi"];
-ssl_mod_cgi(suite) ->
+
+pssl_mod_cgi(doc) ->
+    ["Module test: mod_cgi - old SSL config"];
+pssl_mod_cgi(suite) ->
+    [];
+pssl_mod_cgi(Config) when is_list(Config) ->
+    ssl_mod_cgi(ssl, Config).
+
+ossl_mod_cgi(doc) ->
+    ["Module test: mod_cgi - using new of configure old SSL"];
+ossl_mod_cgi(suite) ->
+    [];
+ossl_mod_cgi(Config) when is_list(Config) ->
+    ssl_mod_cgi(ossl, Config).
+
+essl_mod_cgi(doc) ->
+    ["Module test: mod_cgi - using new of configure new SSL"];
+essl_mod_cgi(suite) ->
     [];
-ssl_mod_cgi(Config) when is_list(Config) ->
+essl_mod_cgi(Config) when is_list(Config) ->
+    ssl_mod_cgi(essl, Config).
+
+ssl_mod_cgi(Tag, Config) ->
     case test_server:os_type() of
 	vxworks ->
 	    {skip, cgi_not_supported_on_vxwoks};
 	_ ->
-	    httpd_mod:cgi(ssl, ?SSL_PORT, 
-			  ?config(host, Config), ?config(node, Config)),
+	    httpd_mod:cgi(Tag, 
+			  ?SSL_PORT, 
+			  ?config(host, Config), 
+			  ?config(node, Config)),
 	    ok
     end.
+
+
 %%-------------------------------------------------------------------------
-ssl_mod_esi(doc) ->
-    ["Module test: mod_esi"];
-ssl_mod_esi(suite) ->
+
+pssl_mod_esi(doc) ->
+    ["Module test: mod_esi - old SSL config"];
+pssl_mod_esi(suite) ->
     [];
-ssl_mod_esi(Config) when is_list(Config) ->
-    httpd_mod:esi(ssl, ?SSL_PORT, 
-		  ?config(host, Config), ?config(node, Config)),
+pssl_mod_esi(Config) when is_list(Config) ->
+    ssl_mod_esi(ssl, Config).
+
+ossl_mod_esi(doc) ->
+    ["Module test: mod_esi - using new of configure old SSL"];
+ossl_mod_esi(suite) ->
+    [];
+ossl_mod_esi(Config) when is_list(Config) ->
+    ssl_mod_esi(ossl, Config).
+
+essl_mod_esi(doc) ->
+    ["Module test: mod_esi - using new of configure new SSL"];
+essl_mod_esi(suite) ->
+    [];
+essl_mod_esi(Config) when is_list(Config) ->
+    ssl_mod_esi(essl, Config).
+
+ssl_mod_esi(Tag, Config) ->
+    httpd_mod:esi(Tag, 
+		  ?SSL_PORT, 
+		  ?config(host, Config), 
+		  ?config(node, Config)),
     ok.
 
+
 %%-------------------------------------------------------------------------
-ssl_mod_get(doc) ->
-    ["Module test: mod_get"];
-ssl_mod_get(suite) ->
+
+pssl_mod_get(doc) ->
+    ["Module test: mod_get - old SSL config"];
+pssl_mod_get(suite) ->
     [];
-ssl_mod_get(Config) when is_list(Config) ->
-    httpd_mod:get(ssl, ?SSL_PORT, 
-		  ?config(host, Config), ?config(node, Config)),
+pssl_mod_get(Config) when is_list(Config) ->
+    ssl_mod_get(ssl, Config).
+
+ossl_mod_get(doc) ->
+    ["Module test: mod_get - using new of configure old SSL"];
+ossl_mod_get(suite) ->
+    [];
+ossl_mod_get(Config) when is_list(Config) ->
+    ssl_mod_get(ossl, Config).
+
+essl_mod_get(doc) ->
+    ["Module test: mod_get - using new of configure new SSL"];
+essl_mod_get(suite) ->
+    [];
+essl_mod_get(Config) when is_list(Config) ->
+    ssl_mod_get(essl, Config).
+
+ssl_mod_get(Tag, Config) ->
+    httpd_mod:get(Tag, 
+		  ?SSL_PORT, 
+		  ?config(host, Config), 
+		  ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_mod_head(doc) ->
-    ["Module test: mod_head"];
-ssl_mod_head(suite) ->
+
+pssl_mod_head(doc) ->
+    ["Module test: mod_head - old SSL config"];
+pssl_mod_head(suite) ->
     [];
-ssl_mod_head(Config) when is_list(Config) ->
-    httpd_mod:head(ssl, ?SSL_PORT, 
-		   ?config(host, Config), ?config(node, Config)),
+pssl_mod_head(Config) when is_list(Config) ->
+    ssl_mod_head(ssl, Config).
+
+ossl_mod_head(doc) ->
+    ["Module test: mod_head - using new of configure old SSL"];
+ossl_mod_head(suite) ->
+    [];
+ossl_mod_head(Config) when is_list(Config) ->
+    ssl_mod_head(ossl, Config).
+
+essl_mod_head(doc) ->
+    ["Module test: mod_head - using new of configure new SSL"];
+essl_mod_head(suite) ->
+    [];
+essl_mod_head(Config) when is_list(Config) ->
+    ssl_mod_head(essl, Config).
+
+ssl_mod_head(Tag, Config) ->
+    httpd_mod:head(Tag, 
+		   ?SSL_PORT, 
+		   ?config(host, Config), 
+		   ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_mod_all(doc) ->
-    ["All modules test"];
-ssl_mod_all(suite) ->
+
+pssl_mod_all(doc) ->
+    ["All modules test - old SSL config"];
+pssl_mod_all(suite) ->
     [];
-ssl_mod_all(Config) when is_list(Config) ->
-    httpd_mod:all(ssl, ?SSL_PORT, 
-		  ?config(host, Config), ?config(node, Config)),
+pssl_mod_all(Config) when is_list(Config) ->
+    ssl_mod_all(ssl, Config).
+
+ossl_mod_all(doc) ->
+    ["All modules test - using new of configure old SSL"];
+ossl_mod_all(suite) ->
+    [];
+ossl_mod_all(Config) when is_list(Config) ->
+    ssl_mod_all(ossl, Config).
+
+essl_mod_all(doc) ->
+    ["All modules test - using new of configure new SSL"];
+essl_mod_all(suite) ->
+    [];
+essl_mod_all(Config) when is_list(Config) ->
+    ssl_mod_all(essl, Config).
+
+ssl_mod_all(Tag, Config) ->
+    httpd_mod:all(Tag, 
+		  ?SSL_PORT, 
+		  ?config(host, Config), 
+		  ?config(node, Config)),
     ok.
 
+
 %%-------------------------------------------------------------------------
-ssl_load_light(doc) ->
-    ["Test light load"];
-ssl_load_light(suite) ->
+
+pssl_load_light(doc) ->
+    ["Test light load - old SSL config"];
+pssl_load_light(suite) ->
+    [];
+pssl_load_light(Config) when is_list(Config) ->
+    ssl_load_light(ssl, Config).
+
+ossl_load_light(doc) ->
+    ["Test light load - using new of configure old SSL"];
+ossl_load_light(suite) ->
+    [];
+ossl_load_light(Config) when is_list(Config) ->
+    ssl_load_light(ossl, Config).
+
+essl_load_light(doc) ->
+    ["Test light load - using new of configure new SSL"];
+essl_load_light(suite) ->
     [];
-ssl_load_light(Config) when is_list(Config) ->
-    httpd_load:load_test(ssl, ?SSL_PORT, ?config(host, Config), 
+essl_load_light(Config) when is_list(Config) ->
+    ssl_load_light(essl, Config).
+
+ssl_load_light(Tag, Config) ->
+    httpd_load:load_test(Tag, 
+			 ?SSL_PORT, 
+			 ?config(host, Config), 
 			 ?config(node, Config),
 			 get_nof_clients(ssl, light)),
     ok.
 
+
 %%-------------------------------------------------------------------------
-ssl_load_medium(doc) ->
-    ["Test medium load"];
-ssl_load_medium(suite) ->
+
+pssl_load_medium(doc) ->
+    ["Test medium load - old SSL config"];
+pssl_load_medium(suite) ->
+    [];
+pssl_load_medium(Config) when is_list(Config) ->
+    ssl_load_medium(ssl, Config).
+
+ossl_load_medium(doc) ->
+    ["Test medium load - using new of configure old SSL"];
+ossl_load_medium(suite) ->
+    [];
+ossl_load_medium(Config) when is_list(Config) ->
+    ssl_load_medium(ossl, Config).
+
+essl_load_medium(doc) ->
+    ["Test medium load - using new of configure new SSL"];
+essl_load_medium(suite) ->
     [];
-ssl_load_medium(Config) when is_list(Config) ->
+essl_load_medium(Config) when is_list(Config) ->
+    ssl_load_medium(essl, Config).
+
+ssl_load_medium(Tag, Config) ->
     %% <CONDITIONAL-SKIP>
     Skippable = [win32],
     Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
     ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
     %% </CONDITIONAL-SKIP>
 
-    httpd_load:load_test(ssl, ?SSL_PORT, ?config(host, Config), 
+    httpd_load:load_test(Tag, 
+			 ?SSL_PORT, 
+			 ?config(host, Config), 
 			 ?config(node, Config),
 			 get_nof_clients(ssl, medium)),
     ok.
 
+
 %%-------------------------------------------------------------------------
-ssl_load_heavy(doc) ->
-    ["Test heavy load"];
-ssl_load_heavy(suite) ->
+
+pssl_load_heavy(doc) ->
+    ["Test heavy load - old SSL config"];
+pssl_load_heavy(suite) ->
+    [];
+pssl_load_heavy(Config) when is_list(Config) ->
+    ssl_load_heavy(ssl, Config).
+
+ossl_load_heavy(doc) ->
+    ["Test heavy load - using new of configure old SSL"];
+ossl_load_heavy(suite) ->
     [];
-ssl_load_heavy(Config) when is_list(Config) ->
+ossl_load_heavy(Config) when is_list(Config) ->
+    ssl_load_heavy(ossl, Config).
+
+essl_load_heavy(doc) ->
+    ["Test heavy load - using new of configure new SSL"];
+essl_load_heavy(suite) ->
+    [];
+essl_load_heavy(Config) when is_list(Config) ->
+    ssl_load_heavy(essl, Config).
+
+ssl_load_heavy(Tag, Config) ->
     %% <CONDITIONAL-SKIP>
     Skippable = [win32],
     Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
     ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
     %% </CONDITIONAL-SKIP>
 
-    httpd_load:load_test(ssl, ?SSL_PORT, ?config(host, Config), 
+    httpd_load:load_test(Tag, 
+			 ?SSL_PORT, 
+			 ?config(host, Config), 
 			 ?config(node, Config),
 			 get_nof_clients(ssl, heavy)),
     ok.
 
+
 %%-------------------------------------------------------------------------
-ssl_dos_hostname(doc) ->
-    ["Denial Of Service (DOS) attack test case"];
-ssl_dos_hostname(suite) ->
+
+pssl_dos_hostname(doc) ->
+    ["Denial Of Service (DOS) attack test case - old SSL config"];
+pssl_dos_hostname(suite) ->
     [];
-ssl_dos_hostname(Config) when is_list(Config) ->
-    dos_hostname(ssl, ?SSL_PORT, ?config(host, Config), 
-		 ?config(node, Config), ?MAX_HEADER_SIZE),
+pssl_dos_hostname(Config) when is_list(Config) ->
+    ssl_dos_hostname(ssl, Config).
+
+ossl_dos_hostname(doc) ->
+    ["Denial Of Service (DOS) attack test case - using new of configure old SSL"];
+ossl_dos_hostname(suite) ->
+    [];
+ossl_dos_hostname(Config) when is_list(Config) ->
+    ssl_dos_hostname(ossl, Config).
+
+essl_dos_hostname(doc) ->
+    ["Denial Of Service (DOS) attack test case - using new of configure new SSL"];
+essl_dos_hostname(suite) ->
+    [];
+essl_dos_hostname(Config) when is_list(Config) ->
+    ssl_dos_hostname(essl, Config).
+
+ssl_dos_hostname(Tag, Config) ->
+    dos_hostname(Tag, 
+		 ?SSL_PORT, 
+		 ?config(host, Config), 
+		 ?config(node, Config), 
+		 ?MAX_HEADER_SIZE),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_time_test(doc) ->
-    [""];
-ssl_time_test(suite) ->
+
+pssl_time_test(doc) ->
+    ["old SSL config"];
+pssl_time_test(suite) ->
     [];
-ssl_time_test(Config) when is_list(Config) ->
+pssl_time_test(Config) when is_list(Config) ->
+    ssl_time_test(ssl, Config).
+
+ossl_time_test(doc) ->
+    ["using new of configure old SSL"];
+ossl_time_test(suite) ->
+    [];
+ossl_time_test(Config) when is_list(Config) ->
+    ssl_time_test(ossl, Config).
+
+essl_time_test(doc) ->
+    ["using new of configure new SSL"];
+essl_time_test(suite) ->
+    [];
+essl_time_test(Config) when is_list(Config) ->
+    ssl_time_test(essl, Config).
+
+ssl_time_test(Tag, Config) when is_list(Config) ->
     %% <CONDITIONAL-SKIP>
-    Condition = fun() -> true end,
+    FreeBSDVersionVerify = 
+	fun() ->
+		case os:version() of
+		    {7, 1, _} -> % We only have one such machine, so...
+			true;
+		    _ ->
+			false
+		end
+	end,
+    Skippable = [win32, {unix, [{freebsd, FreeBSDVersionVerify}]}],
+    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
     ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
     %% </CONDITIONAL-SKIP>
     
-    httpd_time_test:t(ssl, ?config(host, Config), ?SSL_PORT),
+    httpd_time_test:t(Tag, 
+		      ?config(host, Config), 
+		      ?SSL_PORT),
     ok.
 
+
 %%-------------------------------------------------------------------------
-ssl_block_503(doc) ->
+
+pssl_block_503(doc) ->
     ["Check that you will receive status code 503 when the server"
-     " is blocked and 200 when its not blocked."];
-ssl_block_503(suite) ->
+     " is blocked and 200 when its not blocked - old SSL config."];
+pssl_block_503(suite) ->
+    [];
+pssl_block_503(Config) when is_list(Config) ->
+    ssl_block_503(ssl, Config).
+
+ossl_block_503(doc) ->
+    ["Check that you will receive status code 503 when the server"
+     " is blocked and 200 when its not blocked - using new of configure old SSL."];
+ossl_block_503(suite) ->
+    [];
+ossl_block_503(Config) when is_list(Config) ->
+    ssl_block_503(ossl, Config).
+
+essl_block_503(doc) ->
+    ["Check that you will receive status code 503 when the server"
+     " is blocked and 200 when its not blocked - using new of configure new SSL."];
+essl_block_503(suite) ->
     [];
-ssl_block_503(Config) when is_list(Config) ->
-    httpd_block:block_503(ssl, ?SSL_PORT, ?config(host, Config), 
+essl_block_503(Config) when is_list(Config) ->
+    ssl_block_503(essl, Config).
+
+ssl_block_503(Tag, Config) ->
+    httpd_block:block_503(Tag, 
+			  ?SSL_PORT, 
+			  ?config(host, Config), 
 			  ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_block_disturbing_idle(doc) ->
+
+pssl_block_disturbing_idle(doc) ->
     ["Check that you can block/unblock an idle server. The strategy " 
-     "distribing does not really make a difference in this case."];
-ssl_block_disturbing_idle(suite) ->
+     "distribing does not really make a difference in this case." 
+     "Old SSL config"];
+pssl_block_disturbing_idle(suite) ->
     [];
-ssl_block_disturbing_idle(Config) when is_list(Config) ->
-    httpd_block:block_disturbing_idle(ssl, ?SSL_PORT, 
+pssl_block_disturbing_idle(Config) when is_list(Config) ->
+    ssl_block_disturbing_idle(ssl, Config).
+
+ossl_block_disturbing_idle(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "distribing does not really make a difference in this case." 
+     "Using new of configure old SSL"];
+ossl_block_disturbing_idle(suite) ->
+    [];
+ossl_block_disturbing_idle(Config) when is_list(Config) ->
+    ssl_block_disturbing_idle(ossl, Config).
+
+essl_block_disturbing_idle(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "distribing does not really make a difference in this case." 
+     "Using new of configure new SSL"];
+essl_block_disturbing_idle(suite) ->
+    [];
+essl_block_disturbing_idle(Config) when is_list(Config) ->
+    ssl_block_disturbing_idle(essl, Config).
+
+ssl_block_disturbing_idle(Tag, Config) ->
+    httpd_block:block_disturbing_idle(Tag, 
+				      ?SSL_PORT, 
 				      ?config(host, Config), 
 				      ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_block_non_disturbing_idle(doc) ->
+
+pssl_block_non_disturbing_idle(doc) ->
     ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing does not really make a difference in this case."];
-ssl_block_non_disturbing_idle(suite) ->
+     "non distribing does not really make a difference in this case." 
+     "Old SSL config"];
+pssl_block_non_disturbing_idle(suite) ->
+    [];
+pssl_block_non_disturbing_idle(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_idle(ssl, Config).
+
+ossl_block_non_disturbing_idle(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "non distribing does not really make a difference in this case." 
+     "Using new of configure old SSL"];
+ossl_block_non_disturbing_idle(suite) ->
+    [];
+ossl_block_non_disturbing_idle(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_idle(ossl, Config).
+
+essl_block_non_disturbing_idle(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "non distribing does not really make a difference in this case." 
+     "Using new of configure new SSL"];
+essl_block_non_disturbing_idle(suite) ->
     [];
-ssl_block_non_disturbing_idle(Config) when is_list(Config) ->
-    httpd_block:block_non_disturbing_idle(ssl, ?SSL_PORT, 
+essl_block_non_disturbing_idle(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_idle(essl, Config).
+
+ssl_block_non_disturbing_idle(Tag, Config) ->
+    httpd_block:block_non_disturbing_idle(Tag, 
+					  ?SSL_PORT, 
 					  ?config(host, Config), 
 					  ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_block_disturbing_active(doc) ->
+
+pssl_block_disturbing_active(doc) ->
     ["Check that you can block/unblock an active server. The strategy " 
-     "distribing means ongoing requests should be terminated."];
-ssl_block_disturbing_active(suite) ->
+     "distribing means ongoing requests should be terminated." 
+     "Old SSL config"];
+pssl_block_disturbing_active(suite) ->
     [];
-ssl_block_disturbing_active(Config) when is_list(Config) ->
-    httpd_block:block_disturbing_active(ssl, ?SSL_PORT, 
+pssl_block_disturbing_active(Config) when is_list(Config) ->
+    ssl_block_disturbing_active(ssl, Config).
+
+ossl_block_disturbing_active(doc) ->
+    ["Check that you can block/unblock an active server. The strategy " 
+     "distribing means ongoing requests should be terminated." 
+     "Using new of configure old SSL"];
+ossl_block_disturbing_active(suite) ->
+    [];
+ossl_block_disturbing_active(Config) when is_list(Config) ->
+    ssl_block_disturbing_active(ossl, Config).
+
+essl_block_disturbing_active(doc) ->
+    ["Check that you can block/unblock an active server. The strategy " 
+     "distribing means ongoing requests should be terminated." 
+     "Using new of configure new SSL"];
+essl_block_disturbing_active(suite) ->
+    [];
+essl_block_disturbing_active(Config) when is_list(Config) ->
+    ssl_block_disturbing_active(essl, Config).
+
+ssl_block_disturbing_active(Tag, Config) ->
+    httpd_block:block_disturbing_active(Tag, 
+					?SSL_PORT, 
 					?config(host, Config), 
 					?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_block_non_disturbing_active(doc) ->
+
+pssl_block_non_disturbing_active(doc) ->
     ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing means the ongoing requests should be compleated."];
-ssl_block_non_disturbing_active(suite) ->
+     "non distribing means the ongoing requests should be compleated." 
+     "Old SSL config"];
+pssl_block_non_disturbing_active(suite) ->
     [];
-ssl_block_non_disturbing_active(Config) when is_list(Config) ->
-    httpd_block:block_non_disturbing_idle(ssl, ?SSL_PORT, 
+pssl_block_non_disturbing_active(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_active(ssl, Config).
+
+ossl_block_non_disturbing_active(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "non distribing means the ongoing requests should be compleated." 
+     "Using new of configure old SSL"];
+ossl_block_non_disturbing_active(suite) ->
+    [];
+ossl_block_non_disturbing_active(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_active(ossl, Config).
+
+essl_block_non_disturbing_active(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "non distribing means the ongoing requests should be compleated." 
+     "Using new of configure new SSL"];
+essl_block_non_disturbing_active(suite) ->
+    [];
+essl_block_non_disturbing_active(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_active(essl, Config).
+
+ssl_block_non_disturbing_active(Tag, Config) ->
+    httpd_block:block_non_disturbing_idle(Tag, 
+					  ?SSL_PORT, 
 					  ?config(host, Config), 
 					  ?config(node, Config)),
     ok.
 
+
 %%-------------------------------------------------------------------------
-ssl_block_disturbing_active_timeout_not_released(doc) ->
+
+pssl_block_disturbing_active_timeout_not_released(doc) ->
     ["Check that you can block an active server. The strategy " 
      "distribing means ongoing requests should be compleated"
-     "if the timeout does not occur."];
-ssl_block_disturbing_active_timeout_not_released(suite) ->
+     "if the timeout does not occur." 
+     "Old SSL config"];
+pssl_block_disturbing_active_timeout_not_released(suite) ->
     [];
-ssl_block_disturbing_active_timeout_not_released(Config) 
+pssl_block_disturbing_active_timeout_not_released(Config) 
   when is_list(Config) ->
-    httpd_block:
-	block_disturbing_active_timeout_not_released(ssl, 
-						     ?SSL_PORT, 
-						     ?config(host,
-							     Config), 
-						     ?config(node, 
-							     Config)),
+    ssl_block_disturbing_active_timeout_not_released(ssl, Config).
+
+ossl_block_disturbing_active_timeout_not_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "distribing means ongoing requests should be compleated"
+     "if the timeout does not occur." 
+    "Using new of configure old SSL"];
+ossl_block_disturbing_active_timeout_not_released(suite) ->
+    [];
+ossl_block_disturbing_active_timeout_not_released(Config) 
+  when is_list(Config) ->
+    ssl_block_disturbing_active_timeout_not_released(ossl, Config).
+
+essl_block_disturbing_active_timeout_not_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "distribing means ongoing requests should be compleated"
+     "if the timeout does not occur." 
+    "Using new of configure new SSL"];
+essl_block_disturbing_active_timeout_not_released(suite) ->
+    [];
+essl_block_disturbing_active_timeout_not_released(Config) 
+  when is_list(Config) ->
+    ssl_block_disturbing_active_timeout_not_released(essl, Config).
+
+ssl_block_disturbing_active_timeout_not_released(Tag, Config) ->
+    Port = ?SSL_PORT, 
+    Host = ?config(host, Config), 
+    Node = ?config(node, Config), 
+    httpd_block:block_disturbing_active_timeout_not_released(Tag, 
+							     Port, Host, Node),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_block_disturbing_active_timeout_released(doc) ->
+
+pssl_block_disturbing_active_timeout_released(doc) ->
     ["Check that you can block an active server. The strategy " 
      "distribing means ongoing requests should be terminated when"
-     "the timeout occurs."];
-ssl_block_disturbing_active_timeout_released(suite) ->
+     "the timeout occurs." 
+     "Old SSL config"];
+pssl_block_disturbing_active_timeout_released(suite) ->
     [];
-ssl_block_disturbing_active_timeout_released(Config) 
+pssl_block_disturbing_active_timeout_released(Config) 
   when is_list(Config) ->
-    httpd_block:block_disturbing_active_timeout_released(ssl, 
-							 ?SSL_PORT, 
-							 ?config(host,
-								 Config), 
-							 ?config(node, 
-								 Config)),
+    ssl_block_disturbing_active_timeout_released(ssl, Config).
+
+ossl_block_disturbing_active_timeout_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "distribing means ongoing requests should be terminated when"
+     "the timeout occurs." 
+    "Using new of configure old SSL"];
+ossl_block_disturbing_active_timeout_released(suite) ->
+    [];
+ossl_block_disturbing_active_timeout_released(Config) 
+  when is_list(Config) ->
+    ssl_block_disturbing_active_timeout_released(ossl, Config).
+
+essl_block_disturbing_active_timeout_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "distribing means ongoing requests should be terminated when"
+     "the timeout occurs." 
+    "Using new of configure new SSL"];
+essl_block_disturbing_active_timeout_released(suite) ->
+    [];
+essl_block_disturbing_active_timeout_released(Config) 
+  when is_list(Config) ->
+    ssl_block_disturbing_active_timeout_released(essl, Config).
+
+ssl_block_disturbing_active_timeout_released(Tag, Config) ->
+    Port = ?SSL_PORT, 
+    Host = ?config(host, Config), 
+    Node = ?config(node, Config),     
+    httpd_block:block_disturbing_active_timeout_released(Tag, 
+							 Port, 
+							 Host, 
+							 Node), 
     ok.
 
+
 %%-------------------------------------------------------------------------
-ssl_block_non_disturbing_active_timeout_not_released(doc) ->
+
+pssl_block_non_disturbing_active_timeout_not_released(doc) ->
     ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed."];
-ssl_block_non_disturbing_active_timeout_not_released(suite) ->
+     "non non distribing means ongoing requests should be completed." 
+     "Old SSL config"];
+pssl_block_non_disturbing_active_timeout_not_released(suite) ->
     [];
-ssl_block_non_disturbing_active_timeout_not_released(Config)
+pssl_block_non_disturbing_active_timeout_not_released(Config)
   when is_list(Config) ->
-    httpd_block:
-	block_non_disturbing_active_timeout_not_released(ssl,
-							 ?SSL_PORT, 
-							 ?config(host, 
-								 Config), 
-							 ?config(node, 
-								 Config)),
+    ssl_block_non_disturbing_active_timeout_not_released(ssl, Config).
+
+ossl_block_non_disturbing_active_timeout_not_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "non non distribing means ongoing requests should be completed." 
+    "Using new of configure old SSL"];
+ossl_block_non_disturbing_active_timeout_not_released(suite) ->
+    [];
+ossl_block_non_disturbing_active_timeout_not_released(Config)
+  when is_list(Config) ->
+    ssl_block_non_disturbing_active_timeout_not_released(ossl, Config).
+
+essl_block_non_disturbing_active_timeout_not_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "non non distribing means ongoing requests should be completed." 
+    "Using new of configure new SSL"];
+essl_block_non_disturbing_active_timeout_not_released(suite) ->
+    [];
+essl_block_non_disturbing_active_timeout_not_released(Config)
+  when is_list(Config) ->
+    ssl_block_non_disturbing_active_timeout_not_released(essl, Config).
+
+ssl_block_non_disturbing_active_timeout_not_released(Tag, Config) ->
+    Port = ?SSL_PORT, 
+    Host = ?config(host, Config), 
+    Node = ?config(node, Config), 
+    httpd_block:block_non_disturbing_active_timeout_not_released(Tag,
+								 Port, 
+								 Host, 
+								 Node),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_block_non_disturbing_active_timeout_released(doc) ->
+
+pssl_block_non_disturbing_active_timeout_released(doc) ->
     ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed. "
-     "When the timeout occurs the block operation sohould be canceled." ];
-ssl_block_non_disturbing_active_timeout_released(suite) ->
+     "non distribing means ongoing requests should be completed. "
+     "When the timeout occurs the block operation sohould be canceled." 
+     "Old SSL config"];
+pssl_block_non_disturbing_active_timeout_released(suite) ->
     [];
-ssl_block_non_disturbing_active_timeout_released(Config)
+pssl_block_non_disturbing_active_timeout_released(Config)
   when is_list(Config) ->
-    httpd_block:
-	block_non_disturbing_active_timeout_released(ssl,
-						     ?SSL_PORT, 
-						     ?config(host, 
-							     Config), 
-						     ?config(node, 
-							     Config)),
+    ssl_block_non_disturbing_active_timeout_released(ssl, Config).
+
+ossl_block_non_disturbing_active_timeout_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "non distribing means ongoing requests should be completed. "
+     "When the timeout occurs the block operation sohould be canceled." 
+     "Using new of configure old SSL"];
+ossl_block_non_disturbing_active_timeout_released(suite) ->
+    [];
+ossl_block_non_disturbing_active_timeout_released(Config)
+  when is_list(Config) ->
+    ssl_block_non_disturbing_active_timeout_released(ossl, Config).
+
+essl_block_non_disturbing_active_timeout_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "non distribing means ongoing requests should be completed. "
+     "When the timeout occurs the block operation sohould be canceled." 
+     "Using new of configure new SSL"];
+essl_block_non_disturbing_active_timeout_released(suite) ->
+    [];
+essl_block_non_disturbing_active_timeout_released(Config)
+  when is_list(Config) ->
+    ssl_block_non_disturbing_active_timeout_released(essl, Config).
+
+ssl_block_non_disturbing_active_timeout_released(Tag, Config)
+  when is_list(Config) ->
+    Port = ?SSL_PORT, 
+    Host = ?config(host, Config), 
+    Node = ?config(node, Config), 
+    httpd_block:block_non_disturbing_active_timeout_released(Tag, 
+							     Port, 
+							     Host, 
+							     Node), 
+
     ok.
 
+
 %%-------------------------------------------------------------------------
-ssl_block_disturbing_blocker_dies(doc) ->
+
+pssl_block_disturbing_blocker_dies(doc) ->
+    ["old SSL config"];
+pssl_block_disturbing_blocker_dies(suite) ->
+    [];
+pssl_block_disturbing_blocker_dies(Config) when is_list(Config) ->
+    ssl_block_disturbing_blocker_dies(ssl, Config).
+
+ossl_block_disturbing_blocker_dies(doc) ->
+    ["using new of configure old SSL"];
+ossl_block_disturbing_blocker_dies(suite) ->
     [];
-ssl_block_disturbing_blocker_dies(suite) ->
+ossl_block_disturbing_blocker_dies(Config) when is_list(Config) ->
+    ssl_block_disturbing_blocker_dies(ossl, Config).
+
+essl_block_disturbing_blocker_dies(doc) ->
+    ["using new of configure new SSL"];
+essl_block_disturbing_blocker_dies(suite) ->
     [];
-ssl_block_disturbing_blocker_dies(Config) when is_list(Config) ->
-    httpd_block:disturbing_blocker_dies(ssl, ?SSL_PORT, 
+essl_block_disturbing_blocker_dies(Config) when is_list(Config) ->
+    ssl_block_disturbing_blocker_dies(essl, Config).
+
+ssl_block_disturbing_blocker_dies(Tag, Config) ->
+    httpd_block:disturbing_blocker_dies(Tag, 
+					?SSL_PORT, 
 					?config(host, Config), 
 					?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_block_non_disturbing_blocker_dies(doc) ->
+
+pssl_block_non_disturbing_blocker_dies(doc) ->
+    ["old SSL config"];
+pssl_block_non_disturbing_blocker_dies(suite) ->
     [];
-ssl_block_non_disturbing_blocker_dies(suite) ->
+pssl_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_blocker_dies(ssl, Config).
+
+ossl_block_non_disturbing_blocker_dies(doc) ->
+    ["using new of configure old SSL"];
+ossl_block_non_disturbing_blocker_dies(suite) ->
     [];
-ssl_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
-    httpd_block:non_disturbing_blocker_dies(ssl, ?SSL_PORT, 
+ossl_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_blocker_dies(ossl, Config).
+
+essl_block_non_disturbing_blocker_dies(doc) ->
+    ["using new of configure new SSL"];
+essl_block_non_disturbing_blocker_dies(suite) ->
+    [];
+essl_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_blocker_dies(essl, Config).
+
+ssl_block_non_disturbing_blocker_dies(Tag, Config) ->
+    httpd_block:non_disturbing_blocker_dies(Tag, 
+					    ?SSL_PORT, 
 					    ?config(host, Config), 
 					    ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_restart_no_block(doc) ->
-    [""];
-ssl_restart_no_block(suite) ->
+
+pssl_restart_no_block(doc) ->
+    ["old SSL config"];
+pssl_restart_no_block(suite) ->
     [];
-ssl_restart_no_block(Config) when is_list(Config) ->
-    httpd_block:restart_no_block(ssl, ?SSL_PORT, ?config(host, Config), 
+pssl_restart_no_block(Config) when is_list(Config) ->
+    ssl_restart_no_block(ssl, Config).
+
+ossl_restart_no_block(doc) ->
+    ["using new of configure old SSL"];
+ossl_restart_no_block(suite) ->
+    [];
+ossl_restart_no_block(Config) when is_list(Config) ->
+    ssl_restart_no_block(ossl, Config).
+
+essl_restart_no_block(doc) ->
+    ["using new of configure new SSL"];
+essl_restart_no_block(suite) ->
+    [];
+essl_restart_no_block(Config) when is_list(Config) ->
+    ssl_restart_no_block(essl, Config).
+
+ssl_restart_no_block(Tag, Config) ->
+    httpd_block:restart_no_block(Tag, 
+				 ?SSL_PORT, 
+				 ?config(host, Config), 
 				 ?config(node, Config)),
     ok.
+
+
 %%-------------------------------------------------------------------------
-ssl_restart_disturbing_block(doc) ->
-    [""];
-ssl_restart_disturbing_block(suite) ->
+
+pssl_restart_disturbing_block(doc) ->
+    ["old SSL config"];
+pssl_restart_disturbing_block(suite) ->
     [];
-ssl_restart_disturbing_block(Config) when is_list(Config) ->
+pssl_restart_disturbing_block(Config) when is_list(Config) ->
+    ssl_restart_disturbing_block(ssl, Config).
+
+ossl_restart_disturbing_block(doc) ->
+    ["using new of configure old SSL"];
+ossl_restart_disturbing_block(suite) ->
+    [];
+ossl_restart_disturbing_block(Config) when is_list(Config) ->
+    ssl_restart_disturbing_block(ossl, Config).
+
+essl_restart_disturbing_block(doc) ->
+    ["using new of configure new SSL"];
+essl_restart_disturbing_block(suite) ->
+    [];
+essl_restart_disturbing_block(Config) when is_list(Config) ->
+    ssl_restart_disturbing_block(essl, Config).
+
+ssl_restart_disturbing_block(Tag, Config) ->
     %% <CONDITIONAL-SKIP>
     Condition = 
 	fun() -> 
 		case os:type() of
 		    {unix, linux} ->
-			HW = string:strip(os:cmd("uname -m"), right, $\n),
-			case HW of
+			case ?OSCMD("uname -m") of
 			    "ppc" ->
-				case inet:gethostname() of
-				    {ok, "peach"} ->
-					true;
+				case file:read_file_info("/etc/fedora-release") of
+				    {ok, _} ->
+					case ?OSCMD("awk '{print $2}' /etc/fedora-release") of
+					    "release" ->
+						%% Fedora 7 and later
+						case ?OSCMD("awk '{print $3}' /etc/fedora-release") of
+						    "7" ->
+							true;
+						    _ ->
+							false
+						end;
+					    _ ->
+						false
+					end;
 				    _ ->
 					false
 				end;
@@ -1336,17 +2192,36 @@ ssl_restart_disturbing_block(Config) when is_list(Config) ->
     ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
     %% </CONDITIONAL-SKIP>
 
-    httpd_block:restart_disturbing_block(ssl, ?SSL_PORT, 
+    httpd_block:restart_disturbing_block(Tag, ?SSL_PORT, 
 					 ?config(host, Config), 
 					 ?config(node, Config)),
     ok.
 
+
 %%-------------------------------------------------------------------------
-ssl_restart_non_disturbing_block(doc) ->
-    [""];
-ssl_restart_non_disturbing_block(suite) ->
+
+pssl_restart_non_disturbing_block(doc) ->
+    ["old SSL config"];
+pssl_restart_non_disturbing_block(suite) ->
     [];
-ssl_restart_non_disturbing_block(Config) when is_list(Config) ->
+pssl_restart_non_disturbing_block(Config) when is_list(Config) ->
+    ssl_restart_non_disturbing_block(ssl, Config).
+
+ossl_restart_non_disturbing_block(doc) ->
+    ["using new of configure old SSL"];
+ossl_restart_non_disturbing_block(suite) ->
+    [];
+ossl_restart_non_disturbing_block(Config) when is_list(Config) ->
+    ssl_restart_non_disturbing_block(ossl, Config).
+
+essl_restart_non_disturbing_block(doc) ->
+    ["using new of configure new SSL"];
+essl_restart_non_disturbing_block(suite) ->
+    [];
+essl_restart_non_disturbing_block(Config) when is_list(Config) ->
+    ssl_restart_non_disturbing_block(essl, Config).
+
+ssl_restart_non_disturbing_block(Tag, Config) ->
     %% <CONDITIONAL-SKIP>
     Condition = 
 	fun() -> 
@@ -1371,11 +2246,13 @@ ssl_restart_non_disturbing_block(Config) when is_list(Config) ->
     ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
     %% </CONDITIONAL-SKIP>
 
-    httpd_block:restart_non_disturbing_block(ssl, ?SSL_PORT, 
-					    ?config(host, Config), 
-					    ?config(node, Config)),
+    httpd_block:restart_non_disturbing_block(Tag, 
+					     ?SSL_PORT, 
+					     ?config(host, Config), 
+					     ?config(node, Config)),
     ok.
 
+
 %%-------------------------------------------------------------------------
 ip_host(doc) ->   
     ["Control that the server accepts/rejects requests with/ without host"];
@@ -1665,17 +2542,29 @@ dos_hostname(Type, Port, Host, Node, Max) ->
 %% Other help functions
 create_config(Config, Access, FileName) ->
     ServerRoot = ?config(server_root, Config),
-    TcTopDir = ?config(tc_top_dir, Config),
-    Port =  ?config(port, Config),
-    Type = ?config(sock_type, Config),
-    Host =  ?config(host, Config),
-    Mods         = io_lib:format("~p", [httpd_mod]),
-    Funcs        = io_lib:format("~p", [ssl_password_cb]),
-    MaxHdrSz     = io_lib:format("~p", [256]),
-    MaxHdrAct    = io_lib:format("~p", [close]),
+    TcTopDir   = ?config(tc_top_dir,  Config),
+    Port       = ?config(port,        Config),
+    Type       = ?config(sock_type,   Config),
+    Host       = ?config(host,        Config),
+    Mods       = io_lib:format("~p", [httpd_mod]),
+    Funcs      = io_lib:format("~p", [ssl_password_cb]),
+    MaxHdrSz   = io_lib:format("~p", [256]),
+    MaxHdrAct  = io_lib:format("~p", [close]),
+
+    io:format(user, 
+	      "create_config -> "
+	      "~n   ServerRoot: ~p"
+	      "~n   TcTopDir:   ~p"
+	      "~n   Type:       ~p"
+	      "~n   Port:       ~p"
+	      "~n   Host:       ~p"
+	      "~n", [ServerRoot, TcTopDir, Port, Type, Host]),
+
     SSL =
-	case Type of
-	    ssl ->
+	if
+	    (Type =:= ssl)  orelse 
+	    (Type =:= ossl) orelse 
+	    (Type =:= essl) ->
 		[cline(["SSLCertificateFile ", 
 			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
 		 cline(["SSLCertificateKeyFile ",
@@ -1686,25 +2575,25 @@ create_config(Config, Access, FileName) ->
 		 cline(["SSLPasswordCallbackFunction ", Funcs]),
 		 cline(["SSLVerifyClient 0"]),
 		 cline(["SSLVerifyDepth 1"])];
-	    _ ->
+	    true ->
 		[]
 	end,
-    Mod_order = case Access of
-		    mod_htaccess ->
-			"Modules mod_alias mod_htaccess mod_auth "
-			    "mod_security "
-			    "mod_responsecontrol mod_trace mod_esi "
-			    "mod_actions mod_cgi mod_include mod_dir "
-			    "mod_range mod_get "
-			    "mod_head mod_log mod_disk_log";
-		    _ ->
-			"Modules mod_alias mod_auth mod_security "
-			    "mod_responsecontrol mod_trace mod_esi "
-			    "mod_actions mod_cgi mod_include mod_dir "
-			    "mod_range mod_get "
-			    "mod_head mod_log mod_disk_log"
-		    end,
-	    
+    ModOrder = case Access of
+		   mod_htaccess ->
+		       "Modules mod_alias mod_htaccess mod_auth "
+			   "mod_security "
+			   "mod_responsecontrol mod_trace mod_esi "
+			   "mod_actions mod_cgi mod_include mod_dir "
+			   "mod_range mod_get "
+			   "mod_head mod_log mod_disk_log";
+		   _ ->
+		       "Modules mod_alias mod_auth mod_security "
+			   "mod_responsecontrol mod_trace mod_esi "
+			   "mod_actions mod_cgi mod_include mod_dir "
+			   "mod_range mod_get "
+			   "mod_head mod_log mod_disk_log"
+	       end,
+    
 %% The test suite currently does not handle an explicit BindAddress.
 %% They assume any has been used, that is Addr is always set to undefined!
 
@@ -1720,7 +2609,7 @@ create_config(Config, Access, FileName) ->
 		  cline(["Port ", integer_to_list(Port)]),
 		  cline(["ServerName ", Host]),
 		  cline(["SocketType ", atom_to_list(Type)]),
-		  cline([Mod_order]),
+		  cline([ModOrder]),
 		  %% cline(["LogFormat ", "erlang"]),
 		  cline(["ServerAdmin [email protected]"]),
 		  cline(["BindAddress ", BindAddress]),
@@ -1882,18 +2771,18 @@ start_mnesia(Node) ->
 	ok ->
 	    ok;
 	Other ->
-	    test_server:fail({failed_to_cleanup_mnesia, Other})
+	    tsf({failed_to_cleanup_mnesia, Other})
     end,
-       case rpc:call(Node, ?MODULE, setup_mnesia, []) of
+    case rpc:call(Node, ?MODULE, setup_mnesia, []) of
 	{atomic, ok} ->
 	    ok;
 	Other2 ->
-	   test_server:fail({failed_to_setup_mnesia, Other2})
+	    tsf({failed_to_setup_mnesia, Other2})
     end,
     ok.
 
 setup_mnesia() ->
-  setup_mnesia([node()]).
+    setup_mnesia([node()]).
 
 setup_mnesia(Nodes) ->
     ok = mnesia:create_schema(Nodes),
@@ -2029,20 +2918,20 @@ dos_hostname_request(Host) ->
 get_nof_clients(Mode, Load) ->
     get_nof_clients(test_server:os_type(), Mode, Load).
 
-get_nof_clients(vxworks, _, light)        -> 1;
+get_nof_clients(vxworks, _,       light)  -> 1;
 get_nof_clients(vxworks, ip_comm, medium) -> 3;
-get_nof_clients(vxworks, ssl, medium)     -> 3;
+get_nof_clients(vxworks, ssl,     medium) -> 3;
 get_nof_clients(vxworks, ip_comm, heavy)  -> 5;
-get_nof_clients(vxworks, ssl, heavy)      -> 5;
-get_nof_clients(_, ip_comm, light)        -> 5;
-get_nof_clients(_, ssl, light)            -> 2;
-get_nof_clients(_, ip_comm, medium)       -> 10;
-get_nof_clients(_, ssl, medium)           -> 4;
-get_nof_clients(_, ip_comm, heavy)        -> 20;
-get_nof_clients(_, ssl, heavy)            -> 6.
+get_nof_clients(vxworks, ssl,     heavy)  -> 5;
+get_nof_clients(_,       ip_comm, light)  -> 5;
+get_nof_clients(_,       ssl,     light)  -> 2;
+get_nof_clients(_,       ip_comm, medium) -> 10;
+get_nof_clients(_,       ssl,     medium) -> 4;
+get_nof_clients(_,       ip_comm, heavy)  -> 20;
+get_nof_clients(_,       ssl,     heavy)  -> 6.
 
 %% Make a file 100 bytes long containing 012...9*10
-create_range_data(Path)->
+create_range_data(Path) ->
     PathAndFileName=filename:join([Path,"range.txt"]),
     file:write_file(PathAndFileName,list_to_binary(["12345678901234567890",
 						   "12345678901234567890",
@@ -2079,3 +2968,6 @@ create_range_data(Path)->
 %%     {ok, Fd} = file:open(ConfigFile, [write]),
 %%     ok = file:write(Fd, lists:flatten(HttpConfig)),
 %%     ok = file:close(Fd).
+
+tsf(Reason) ->
+    test_server:fail(Reason).
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/Makefile b/lib/inets/test/httpd_SUITE_data/server_root/Makefile
new file mode 100644
index 0000000000..d7a3231068
--- /dev/null
+++ b/lib/inets/test/httpd_SUITE_data/server_root/Makefile
@@ -0,0 +1,209 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2010. 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%
+#
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../../vsn.mk
+VSN=$(INETS_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/inets-$(VSN)
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+MODULE= 
+
+AUTH_FILES = auth/group \
+	auth/passwd 
+CGI_FILES = cgi-bin/printenv.sh 
+CONF_FILES = conf/8080.conf \
+	conf/8888.conf \
+	conf/httpd.conf \
+	conf/ssl.conf \
+	conf/mime.types 
+OPEN_FILES = htdocs/open/dummy.html 
+MNESIA_OPEN_FILES = htdocs/mnesia_open/dummy.html 
+MISC_FILES = htdocs/misc/friedrich.html \
+	htdocs/misc/oech.html
+SECRET_FILES = htdocs/secret/dummy.html 
+MNESIA_SECRET_FILES = htdocs/mnesia_secret/dummy.html 
+HTDOCS_FILES = htdocs/index.html \
+	htdocs/config.shtml \
+	htdocs/echo.shtml \
+	htdocs/exec.shtml \
+	htdocs/flastmod.shtml \
+	htdocs/fsize.shtml \
+	htdocs/include.shtml
+ICON_FILES = icons/README \
+	icons/a.gif \
+	icons/alert.black.gif \
+	icons/alert.red.gif \
+	icons/apache_pb.gif \
+	icons/back.gif \
+	icons/ball.gray.gif \
+	icons/ball.red.gif \
+	icons/binary.gif \
+	icons/binhex.gif \
+	icons/blank.gif \
+	icons/bomb.gif \
+	icons/box1.gif \
+	icons/box2.gif \
+	icons/broken.gif \
+	icons/burst.gif \
+	icons/button1.gif \
+	icons/button10.gif \
+	icons/button2.gif \
+	icons/button3.gif \
+	icons/button4.gif \
+	icons/button5.gif \
+	icons/button6.gif \
+	icons/button7.gif \
+	icons/button8.gif \
+	icons/button9.gif \
+	icons/buttonl.gif \
+	icons/buttonr.gif \
+	icons/c.gif \
+	icons/comp.blue.gif \
+	icons/comp.gray.gif \
+	icons/compressed.gif \
+	icons/continued.gif \
+	icons/dir.gif \
+	icons/down.gif \
+	icons/dvi.gif \
+	icons/f.gif \
+	icons/folder.gif \
+	icons/folder.open.gif \
+	icons/folder.sec.gif \
+	icons/forward.gif \
+	icons/generic.gif \
+	icons/generic.red.gif \
+	icons/generic.sec.gif \
+	icons/hand.right.gif \
+	icons/hand.up.gif \
+	icons/htdig.gif \
+	icons/icon.sheet.gif \
+	icons/image1.gif \
+	icons/image2.gif \
+	icons/image3.gif \
+	icons/index.gif \
+	icons/layout.gif \
+	icons/left.gif \
+	icons/link.gif \
+	icons/movie.gif \
+	icons/p.gif \
+	icons/patch.gif \
+	icons/pdf.gif \
+	icons/pie0.gif \
+	icons/pie1.gif \
+	icons/pie2.gif \
+	icons/pie3.gif \
+	icons/pie4.gif \
+	icons/pie5.gif \
+	icons/pie6.gif \
+	icons/pie7.gif \
+	icons/pie8.gif \
+	icons/portal.gif \
+	icons/poweredby.gif \
+	icons/ps.gif \
+	icons/quill.gif \
+	icons/right.gif \
+	icons/screw1.gif \
+	icons/screw2.gif \
+	icons/script.gif \
+	icons/sound1.gif \
+	icons/sound2.gif \
+	icons/sphere1.gif \
+	icons/sphere2.gif \
+	icons/star.gif \
+	icons/star_blank.gif \
+	icons/tar.gif \
+	icons/tex.gif \
+	icons/text.gif \
+	icons/transfer.gif \
+	icons/unknown.gif \
+	icons/up.gif \
+	icons/uu.gif \
+	icons/uuencoded.gif \
+	icons/world1.gif \
+	icons/world2.gif
+
+SSL_FILES = ssl/ssl_client.pem \
+	ssl/ssl_server.pem
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+ERL_COMPILE_FLAGS +=
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+debug opt: 
+
+clean:
+
+docs:
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/auth
+	$(INSTALL_DATA) $(AUTH_FILES) $(RELSYSDIR)/examples/server_root/auth
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/cgi-bin
+	$(INSTALL_SCRIPT) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/conf
+	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/examples/server_root/conf
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/open
+	$(INSTALL_DATA) $(OPEN_FILES) \
+		$(RELSYSDIR)/examples/server_root/htdocs/open
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
+	$(INSTALL_DATA) $(MNESIA_OPEN_FILES) \
+		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/misc
+	$(INSTALL_DATA) $(MISC_FILES) \
+		$(RELSYSDIR)/examples/server_root/htdocs/misc
+	$(INSTALL_DIR)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/secret/top_secret
+	$(INSTALL_DIR)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret/top_secret
+	$(INSTALL_DATA) $(SECRET_FILES)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/secret
+	$(INSTALL_DATA) $(MNESIA_SECRET_FILES)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs
+	$(INSTALL_DATA) $(HTDOCS_FILES) $(RELSYSDIR)/examples/server_root/htdocs
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/icons
+	$(INSTALL_DATA) $(ICON_FILES) $(RELSYSDIR)/examples/server_root/icons
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/ssl
+	$(INSTALL_DATA) $(SSL_FILES) $(RELSYSDIR)/examples/server_root/ssl
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/logs
+
+release_docs_spec:
+
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index f86c1fcb49..dcea200a1a 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -19,20 +19,26 @@
 %%
 -module(httpd_basic_SUITE).
 
--include("test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
-all(doc) ->
-    ["Basic test of httpd."];
+-define(URL_START, "http://localhost:").
 
-all(suite) ->
-    [
-     uri_too_long_414,
-     header_too_long_413
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [uri_too_long_414, header_too_long_413, escaped_url_in_error_body].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
@@ -131,6 +137,31 @@ header_too_long_413(Config) when is_list(Config) ->
  				        {version, "HTTP/1.1"}]),
     inets:stop(httpd, Pid).
    
+escaped_url_in_error_body(doc) ->
+    ["Test Url-encoding see OTP-8940"];
+escaped_url_in_error_body(suite) ->
+    [];
+escaped_url_in_error_body(Config) when is_list(Config) ->
+    HttpdConf =   ?config(httpd_conf, Config),
+    {ok, Pid} = inets:start(httpd, [{port, 0} | HttpdConf]),
+    Info = httpd:info(Pid),
+    Port = proplists:get_value(port, Info),
+    Address = proplists:get_value(bind_address, Info),
+    Path = "/<b>this_is_bold<b>",
+    URL = ?URL_START ++ integer_to_list(Port) ++ Path,
+    EscapedPath = http_uri:encode(Path),
+    {ok, {404, Body}} = httpc:request(get, {URL, []},
+				      [{url_encode, true}],
+				      [{version, "HTTP/1.0"}, {full_result, false}]),
+    EscapedPath = find_URL_path(string:tokens(Body, " ")),
+    {ok, {404, Body1}} = httpc:request(get, {URL, []}, [],
+				       [{version, "HTTP/1.0"}, {full_result, false}]),
+    EscapedPath = find_URL_path(string:tokens(Body1, " ")),
+    inets:stop(httpd, Pid).
 
-
-
+find_URL_path([]) ->
+    "";
+find_URL_path(["URL", URL | _]) ->
+    URL;
+find_URL_path([_ | Rest]) ->
+    find_URL_path(Rest).
diff --git a/lib/inets/test/httpd_block.erl b/lib/inets/test/httpd_block.erl
index f967d8172a..ac1bf43ff5 100644
--- a/lib/inets/test/httpd_block.erl
+++ b/lib/inets/test/httpd_block.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-2010. 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%
 %%
 %%
@@ -36,6 +36,7 @@
 	]).
 
 %% Help functions 
+-export([httpd_block/3, httpd_block/4, httpd_unblock/2, httpd_restart/2]).
 -export([do_block_server/4, do_block_nd_server/5, do_long_poll/6]).
 
 -define(report(Label, Content), 
@@ -47,18 +48,24 @@
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
 block_disturbing_idle(_Type, Port, Host, Node) ->
-    unblocked = get_admin_state(Node, Host, Port),
+    io:format("block_disturbing_idle -> entry~n", []),
+    validate_admin_state(Node, Host, Port, unblocked),
     block_server(Node, Host, Port),
-    blocked = get_admin_state(Node, Host, Port),
+    validate_admin_state(Node, Host, Port, blocked),
     unblock_server(Node, Host, Port),
-    unblocked = get_admin_state(Node, Host, Port).
+    validate_admin_state(Node, Host, Port, unblocked),
+    io:format("block_disturbing_idle -> done~n", []),
+    ok.
+
 %%--------------------------------------------------------------------
 block_non_disturbing_idle(_Type, Port, Host, Node) ->
     unblocked = get_admin_state(Node, Host, Port),
     block_nd_server(Node, Host, Port),
     blocked = get_admin_state(Node, Host, Port),
     unblock_server(Node, Host, Port),
-    unblocked = get_admin_state(Node, Host, Port).
+    unblocked = get_admin_state(Node, Host, Port),
+    ok.
+
 %%--------------------------------------------------------------------
 block_503(Type, Port, Host, Node) ->
     Req = "GET / HTTP/1.0\r\ndummy-host.ericsson.se:\r\n\r\n",
@@ -76,6 +83,7 @@ block_503(Type, Port, Host, Node) ->
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, Req, 
 				  [{statuscode, 200},
 				   {version, "HTTP/1.0"}]).
+
 %%--------------------------------------------------------------------
 block_disturbing_active(Type, Port, Host, Node) ->
     process_flag(trap_exit, true),
@@ -87,6 +95,7 @@ block_disturbing_active(Type, Port, Host, Node) ->
     blocked = get_admin_state(Node, Host, Port),
     process_flag(trap_exit, false),
     ok.
+
 %%--------------------------------------------------------------------
 block_non_disturbing_active(Type, Port, Host, Node) ->
     process_flag(trap_exit, true),
@@ -219,32 +228,91 @@ do_block_nd_server(Node, Host, Port, Timeout, Reply) ->
 
 restart_server(Node, _Host, Port) ->
     Addr = undefined, 
-    rpc:call(Node, httpd, restart, [Addr, Port]).
+    rpc:call(Node, ?MODULE, httpd_restart, [Addr, Port]).
+
 
 block_server(Node, _Host,  Port) ->
+    io:format("block_server -> entry~n", []),    
     Addr = undefined, 
-    rpc:call(Node, httpd, block, [Addr, Port]).
+    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, disturbing]).
+
 
 block_server(Node, _Host, Port, Timeout) ->
     Addr = undefined, 
-    rpc:call(Node, httpd, block, [Addr, Port, disturbing, Timeout]).
+    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, disturbing, Timeout]).
+
 
 block_nd_server(Node, _Host, Port) ->
     Addr = undefined, 
-    rpc:call(Node, httpd, block, [Addr, Port, non_disturbing]).
+    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, non_disturbing]).
 
 block_nd_server(Node, _Host, Port, Timeout) ->
     Addr = undefined, 
-    rpc:call(Node, httpd, block, [Addr, Port, non_disturbing, Timeout]).
+    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, non_disturbing, Timeout]).
 
 unblock_server(Node, _Host, Port) ->
+    io:format("~p:~p:block_server -> entry~n", [node(),self()]),    
     Addr = undefined, 
-    rpc:call(Node, httpd, unblock, [Addr, Port]).
+    rpc:call(Node, ?MODULE, httpd_unblock, [Addr, Port]).
+
+
+httpd_block(Addr, Port, Mode) ->
+    io:format("~p:~p:httpd_block -> entry~n", [node(),self()]), 
+    Name = make_name(Addr, Port),
+    case whereis(Name) of
+	Pid when is_pid(Pid) ->
+	    httpd_manager:block(Pid, Mode);
+	_ ->
+	    {error, not_started}
+    end.
+    
+httpd_block(Addr, Port, Mode, Timeout) ->
+    Name = make_name(Addr, Port),
+    case whereis(Name) of
+	Pid when is_pid(Pid) ->
+	    httpd_manager:block(Pid, Mode, Timeout);
+	_ ->
+	    {error, not_started}
+    end.
+    
+httpd_unblock(Addr, Port) ->
+    io:format("~p:~p:httpd_unblock -> entry~n", [node(),self()]), 
+    Name = make_name(Addr, Port),
+    case whereis(Name) of
+	Pid when is_pid(Pid) ->
+	    httpd_manager:unblock(Pid);
+	_ ->
+	    {error, not_started}
+    end.
+    
+httpd_restart(Addr, Port) ->
+    Name = make_name(Addr, Port),
+    case whereis(Name) of
+	Pid when is_pid(Pid) ->
+	    httpd_manager:reload(Pid, undefined);
+	_ ->
+	    {error, not_started}
+    end.
+    
+make_name(Addr, Port) ->
+    httpd_util:make_name("httpd", Addr, Port).
 
-get_admin_state(Node,_Host,Port) ->
+get_admin_state(Node, _Host, Port) ->
     Addr = undefined, 
     rpc:call(Node, httpd, get_admin_state, [Addr, Port]).
 
+validate_admin_state(Node, Host, Port, Expect) ->
+    io:format("try validating server admin state: ~p~n", [Expect]),
+    case get_admin_state(Node, Host, Port) of
+	Expect ->
+	    ok;
+	Unexpected ->
+	    io:format("failed validating server admin state: ~p~n", 
+		      [Unexpected]),
+	    exit({unexpected_admin_state, Unexpected, Expect})
+    end.
+
+
 await_normal_process_exit(Pid, Name, Timeout) ->
     receive
 	{'EXIT', Pid, normal} ->
@@ -260,6 +328,7 @@ await_normal_process_exit(Pid, Name, Timeout) ->
 	   test_server:fail("timeout while waiting for " ++ Name)
     end.
 
+
 await_suite_failed_process_exit(Pid, Name, Timeout, Why) ->
     receive 
 	{'EXIT', Pid, {suite_failed, Why}} ->
diff --git a/lib/inets/test/httpd_load.erl b/lib/inets/test/httpd_load.erl
index 9bb9f9f94e..83520033dc 100644
--- a/lib/inets/test/httpd_load.erl
+++ b/lib/inets/test/httpd_load.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl
index b03f842e7c..f2c1fd6a65 100644
--- a/lib/inets/test/httpd_mod.erl
+++ b/lib/inets/test/httpd_mod.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-2010. 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%
 %%
 %%
@@ -40,6 +40,13 @@
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
 alias(Type, Port, Host, Node) ->
+%%     io:format(user, "~w:alias -> entry with"
+%% 	      "~n   Type:       ~p"
+%% 	      "~n   Port:       ~p"
+%% 	      "~n   Host:       ~p"
+%% 	      "~n   Node:       ~p"
+%% 	      "~n", [?MODULE, Type, Port, Host, Node]),    
+    
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
  				       "GET /pics/icon.sheet.gif "
  				       "HTTP/1.0\r\n\r\n",
@@ -82,14 +89,15 @@ actions(Type, Port, Host, Node) ->
 
 %%-------------------------------------------------------------------------
 security(ServerRoot, Type, Port, Host, Node) ->
-    io:format(user, "~w:security -> entry with"
-	      "~n   ServerRoot: ~p"
-	      "~n   Type:       ~p"
-	      "~n   Port:       ~p"
-	      "~n   Host:       ~p"
-	      "~n   Node:       ~p"
-	      "~n", [?MODULE, ServerRoot, Type, Port, Host, Node]),
+%%     io:format(user, "~w:security -> entry with"
+%% 	      "~n   ServerRoot: ~p"
+%% 	      "~n   Type:       ~p"
+%% 	      "~n   Port:       ~p"
+%% 	      "~n   Host:       ~p"
+%% 	      "~n   Node:       ~p"
+%% 	      "~n", [?MODULE, ServerRoot, Type, Port, Host, Node]),
     
+%%     io:format(user, "~w:security -> register~n", [?MODULE]), 
     global:register_name(mod_security_test, self()),   % Receive events
 
     test_server:sleep(5000),
@@ -99,54 +107,71 @@ security(ServerRoot, Type, Port, Host, Node) ->
     %% Test blocking / unblocking of users.
 
     %% /open, require user one Aladdin
+%%     io:format(user, "~w:security -> remove user~n", [?MODULE]), 
     remove_users(Node, ServerRoot, Host, Port, "open"),
 
+%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
     auth_request(Type, Host, Port, Node, "/open/", "one", "onePassword", 
 		 [{statuscode, 401}]),
+%%     io:format(user, "~w:security -> await fail security event~n", [?MODULE]), 
     receive_security_event({event, auth_fail, Port, OpenDir,
 			    [{user, "one"}, {password, "onePassword"}]},
 			   Node, Port),
     
+%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
     auth_request(Type,Host,Port,Node,"/open/", "two", "twoPassword",
 		 [{statuscode, 401}]),
+%%     io:format(user, "~w:security -> await fail security event~n", [?MODULE]), 
     receive_security_event({event, auth_fail, Port, OpenDir,
 			    [{user, "two"}, {password, "twoPassword"}]},
 			   Node, Port),
 
+%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
     auth_request(Type, Host, Port, Node,"/open/", "Aladdin", 
 		 "AladdinPassword", [{statuscode, 401}]),
+%%     io:format(user, "~w:security -> await fail security event~n", [?MODULE]), 
     receive_security_event({event, auth_fail, Port, OpenDir,
 			    [{user, "Aladdin"},
 			     {password, "AladdinPassword"}]},
 			   Node, Port),
 
+%%     io:format(user, "~w:security -> add users~n", [?MODULE]), 
     add_user(Node, ServerRoot, Port, "open", "one", "onePassword", []),
     add_user(Node, ServerRoot, Port, "open", "two", "twoPassword", []),
 
+%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
     auth_request(Type, Host, Port, Node,"/open/", "one", "WrongPassword", 
 		 [{statuscode, 401}]),
+%%     io:format(user, "~w:security -> await fail security event~n", [?MODULE]), 
     receive_security_event({event, auth_fail, Port, OpenDir,
 			    [{user, "one"}, {password, "WrongPassword"}]},
 			   Node, Port),
  
+%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
     auth_request(Type, Host, Port, Node,"/open/", "one", "WrongPassword", 
 		 [{statuscode, 401}]),
+%%     io:format(user, "~w:security -> await fail security event~n", [?MODULE]), 
     receive_security_event({event, auth_fail, Port, OpenDir,
 			    [{user, "one"}, {password, "WrongPassword"}]},
 			   Node, Port),
     
+%%     io:format(user, "~w:security -> await block security event~n", [?MODULE]), 
     receive_security_event({event, user_block, Port, OpenDir,
 			    [{user, "one"}]}, Node, Port),
     
+%%     io:format(user, "~w:security -> unregister~n", [?MODULE]), 
     global:unregister_name(mod_security_test),   % No more events.
 
+%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
     auth_request(Type, Host, Port, Node,"/open/", "one", "WrongPassword", 
 		 [{statuscode, 401}]),
+%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
     auth_request(Type, Host, Port, Node,"/open/", "one", "onePassword",
 		 [{statuscode, 403}]),
 
     %% User "one" should be blocked now..
     %% [{"one",_, Port, OpenDir,_}] = list_blocked_users(Node,Port),
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     case list_blocked_users(Node, Port) of
 	[{"one",_, Port, OpenDir,_}] ->
 	    ok;
@@ -156,35 +181,54 @@ security(ServerRoot, Type, Port, Host, Node) ->
 	    exit({unexpected_blocked, Blocked})
     end,
 	    
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     [{"one",_, Port, OpenDir,_}] = list_blocked_users(Node,Port,OpenDir),
 
+%%     io:format(user, "~w:security -> unblock user~n", [?MODULE]), 
     true = unblock_user(Node, "one", Port, OpenDir),
     %% User "one" should not be blocked any more..
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     [] = list_blocked_users(Node, Port),
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     [] = list_blocked_users(Node, Port, OpenDir),
+%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
     auth_request(Type, Host, Port, Node,"/open/", "one", "onePassword", 
 		 [{statuscode, 200}]),
 
     %% Test list_auth_users & auth_timeout
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     ["one"] = list_auth_users(Node, Port),
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     ["one"] = list_auth_users(Node, Port, OpenDir),
+%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
     auth_request(Type, Host, Port, Node,"/open/", "two", "onePassword", 
 		 [{statuscode, 401}]),
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     ["one"] = list_auth_users(Node, Port),
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     ["one"] = list_auth_users(Node, Port, OpenDir),
+%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
     auth_request(Type, Host, Port, Node,"/open/", "two", "twoPassword", 
 		 [{statuscode, 401}]),
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     ["one"] = list_auth_users(Node, Port),
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     ["one"] = list_auth_users(Node, Port, OpenDir),
     %% Wait for successful auth to timeout.
     test_server:sleep(?AUTH_TIMEOUT*1001),  
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     [] = list_auth_users(Node, Port),
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     [] = list_auth_users(Node, Port, OpenDir),
     %% "two" is blocked.
+%%     io:format(user, "~w:security -> unblock user~n", [?MODULE]), 
     true = unblock_user(Node, "two", Port, OpenDir),
     %% Test explicit blocking. Block user 'two'.
+%%     io:format(user, "~w:security -> list blocked users~n", [?MODULE]), 
     [] = list_blocked_users(Node,Port,OpenDir),
+%%     io:format(user, "~w:security -> block user~n", [?MODULE]), 
     true = block_user(Node, "two", Port, OpenDir, 10),
+%%     io:format(user, "~w:security -> auth request~n", [?MODULE]), 
     auth_request(Type, Host, Port, Node,"/open/", "two", "twoPassword", 
 		 [{statuscode, 401}]).
 
@@ -600,6 +644,11 @@ htaccess(Type, Port, Host, Node) ->
 					{header, "WWW-Authenticate"}]).
 %%--------------------------------------------------------------------
 cgi(Type, Port, Host, Node) ->
+%%     tsp("cgi -> entry with"
+%% 	"~n   Type: ~p"
+%% 	"~n   Port: ~p"
+%% 	"~n   Host: ~p"
+%% 	"~n   Node: ~p", []),
     {Script, Script2, Script3} =
 	case test_server:os_type() of
 	    {win32, _} ->
@@ -609,6 +658,7 @@ cgi(Type, Port, Host, Node) ->
 	end,
 
     %% The length (> 100) is intentional
+%%     tsp("cgi -> request 01 with length > 100"),
     ok = httpd_test_lib:
 	verify_request(Type, Host, Port, Node, 
 		       "POST /cgi-bin/" ++ Script3 ++
@@ -636,46 +686,55 @@ cgi(Type, Port, Host, Node) ->
 			{version, "HTTP/1.0"},
 			{header, "content-type", "text/plain"}]),
     
+%%     tsp("cgi -> request 02"),
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "GET /cgi-bin/"++ Script ++
 				       " HTTP/1.0\r\n\r\n", 
 				       [{statuscode, 200},
 				       {version, "HTTP/1.0"}]),
+%%     tsp("cgi -> request 03"),
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "GET /cgi-bin/not_there "
 				       "HTTP/1.0\r\n\r\n", 
 				       [{statuscode, 404},{statuscode, 500},
 				       {version, "HTTP/1.0"}]),
+%%     tsp("cgi -> request 04"),
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "GET /cgi-bin/"++ Script ++
 				       "?Nisse:kkk?sss/lll HTTP/1.0\r\n\r\n", 
 				       [{statuscode, 200}, 
 					{version, "HTTP/1.0"}]),
+%%     tsp("cgi -> request 04"),
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "POST /cgi-bin/"++ Script ++
 				       " HTTP/1.0\r\n\r\n", 
 				       [{statuscode, 200},
 					{version, "HTTP/1.0"}]),
+%%     tsp("cgi -> request 05"),
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "GET /htbin/"++ Script ++
 				       " HTTP/1.0\r\n\r\n",
 				       [{statuscode, 200},
 				       {version, "HTTP/1.0"}]),
+%%     tsp("cgi -> request 06"),
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "GET /htbin/not_there "
 				       "HTTP/1.0\r\n\r\n", 
 				       [{statuscode, 404},{statuscode, 500},
 				        {version, "HTTP/1.0"}]),
+%%     tsp("cgi -> request 07"),
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "GET /htbin/"++ Script ++
 				       "?Nisse:kkk?sss/lll HTTP/1.0\r\n\r\n", 
 				       [{statuscode, 200},
 					{version, "HTTP/1.0"}]),
+%%     tsp("cgi -> request 08"),
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "POST /htbin/"++ Script ++
 				       " HTTP/1.0\r\n\r\n",
 				       [{statuscode, 200},
 				       {version, "HTTP/1.0"}]),
+%%     tsp("cgi -> request 09"),
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "POST /htbin/"++ Script ++
 				       " HTTP/1.0\r\n\r\n",
@@ -683,19 +742,24 @@ cgi(Type, Port, Host, Node) ->
 				       {version, "HTTP/1.0"}]),
     
     %% Execute an existing, but bad CGI script..
+%%     tsp("cgi -> request 10 - bad script"),
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "POST /htbin/"++ Script2 ++
 				       " HTTP/1.0\r\n\r\n",
 				       [{statuscode, 404},
 					{version, "HTTP/1.0"}]),
     
+%%     tsp("cgi -> request 11 - bad script"),
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "POST /cgi-bin/"++ Script2 ++
 				       " HTTP/1.0\r\n\r\n",
 				       [{statuscode, 404},
 				       {version, "HTTP/1.0"}]),
+
+%%     tsp("cgi -> done"),
     ok.
 
+
 %%--------------------------------------------------------------------
 esi(Type, Port, Host, Node) ->
     %% Check "ErlScriptAlias" and "EvalScriptAlias" directives
@@ -850,25 +914,44 @@ list_users(Node, Root, _Host, Port, Dir) ->
     Directory = filename:join([Root, "htdocs", Dir]),
     rpc:call(Node, mod_auth, list_users, [Addr, Port, Directory]).
 
+
 receive_security_event(Event, Node, Port) ->
-    io:format(user, "~w:receive_security_event -> entry with"
-	      "~n   Event: ~p"
-	      "~n   Node:  ~p"
-	      "~n   Port:  ~p"
-	      "~n", [?MODULE, Event, Node, Port]),
+%%     io:format(user, "~w:receive_security_event -> entry with"
+%% 	      "~n   Event: ~p"
+%% 	      "~n   Node:  ~p"
+%% 	      "~n   Port:  ~p"
+%% 	      "~n", [?MODULE, Event, Node, Port]),
     receive 
 	Event ->
 	    ok;
 	{'EXIT', _, _} ->
-	    receive_security_event(Event, Node, Port);	
-	Other ->
-	    test_server:fail({unexpected_event, 
-			      {expected, Event}, {received, Other}})
+	    receive_security_event(Event, Node, Port)
     after 5000 ->
-	    test_server:fail(no_event_recived)
+	    %% Flush the message queue, to see if we got something...
+	    Msgs = inets_test_lib:flush(),
+	    tsf({expected_event_not_received, Msgs})
 				     
     end.
 
+%% receive_security_event(Event, Node, Port) ->
+%%     io:format(user, "~w:receive_security_event -> entry with"
+%% 	      "~n   Event: ~p"
+%% 	      "~n   Node:  ~p"
+%% 	      "~n   Port:  ~p"
+%% 	      "~n", [?MODULE, Event, Node, Port]),
+%%     receive 
+%% 	Event ->
+%% 	    ok;
+%% 	{'EXIT', _, _} ->
+%% 	    receive_security_event(Event, Node, Port);	
+%% 	Other ->
+%% 	    test_server:fail({unexpected_event, 
+%% 			      {expected, Event}, {received, Other}})
+%%     after 5000 ->
+%% 	    test_server:fail(no_event_recived)
+				     
+%%     end.
+
 list_blocked_users(Node,Port) ->
     Addr = undefined, % Assumed to be on the same host
     rpc:call(Node, mod_security, list_blocked_users, [Addr,Port]).
@@ -945,3 +1028,12 @@ check_lists_members1(L,L) ->
     ok;
 check_lists_members1(L1,L2) ->
     {error,{lists_not_equal,L1,L2}}.
+
+
+%% tsp(F) ->
+%%     tsp(F, []).
+%% tsp(F, A) ->
+%%     test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
+
+tsf(Reason) ->
+    test_server:fail(Reason).
diff --git a/lib/inets/test/httpd_poll.erl b/lib/inets/test/httpd_poll.erl
index 1cc10365a7..32335cabcf 100644
--- a/lib/inets/test/httpd_poll.erl
+++ b/lib/inets/test/httpd_poll.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2000-2010. 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%
 %%
 %%
@@ -27,7 +27,8 @@
 
 %% gen_server exports
 -export([init/1, 
-	 handle_call/3, handle_cast/2, handle_info/2, terminate/2]).
+	 handle_call/3, handle_cast/2, handle_info/2, terminate/2,
+	 code_change/3]).
 
 
 -define(default_verbosity,error).
@@ -86,8 +87,8 @@ options(Options) ->
 
 options([], Defaults, Options) ->
     Options ++ Defaults;
-options([{Key,Val} = Opt|Opts], Defaults, Options) ->
-    options(Opts, lists:keydelete(Key, 1, Defaults), [Opt|Options]).
+options([{Key, _Val} = Opt|Opts], Defaults, Options) ->
+    options(Opts, lists:keydelete(Key, 1, Defaults), [Opt | Options]).
 
 
 verbosity(silence) ->
@@ -134,10 +135,9 @@ uris(otp) ->
      uri_top_index(),
      uri_internal_product1(),
      uri_internal_product2(),
-     uri_p7a_test_results(),
+     uri_r13b03_test_results(),
      uri_bjorn1(),
-     uri_bjorn2(),
-     uri_top_ronja()
+     uri_bjorn2()
     ].
 
 uri_top_index() -> 
@@ -149,9 +149,9 @@ uri_internal_product1() ->
 uri_internal_product2() -> 
     {"product internal page (2)","/product/internal"}.
 
-uri_p7a_test_results() ->
-    {"test summery index page",
-     "/product/internal/test/test_results/progress_P7A/index.html"}.
+uri_r13b03_test_results() ->
+    {"daily build index page",
+     "/product/internal/test/daily/logs.html"}.
 
 uri_bjorn1() ->
     {"bjorns home page (1)","/~bjorn/"}.
@@ -159,9 +159,6 @@ uri_bjorn1() ->
 uri_bjorn2() ->
     {"bjorns home page (2)","/~bjorn"}.
 
-uri_top_ronja() ->
-    {"ronja top page","/ronja/"}.
-
 
 handle_call(stop, _From, State) ->
     vlog("stop request"),
@@ -199,7 +196,11 @@ handle_info(Info, State) ->
     {noreply, State}.
 
 
-terminate(Reason,State) ->
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+
+terminate(_Reason, State) ->
     tcancel(State#state.tref),
     log_close(get(log_file)),
     ok.
@@ -287,16 +288,16 @@ trash_the_rest(Socket,N) ->
     end.
 
 
-add(N1,N2) when integer(N1),integer(N2) ->
+add(N1, N2) when is_integer(N1) andalso is_integer(N2) ->
     N1 + N2;
-add(N1,N2) when integer(N1) ->
+add(N1, _N2) when is_integer(N1) ->
     N1;
-add(N1,N2) when integer(N2) ->
+add(_N1, N2) when is_integer(N2) ->
     N2.
 
-sz(L) when list(L) ->
+sz(L) when is_list(L) ->
     length(lists:flatten(L));
-sz(B) when binary(B) ->
+sz(B) when is_binary(B) ->
     size(B);
 sz(O) ->
     {unknown_size,O}.
@@ -307,9 +308,9 @@ sz(O) ->
 %% Status code to printable string
 %%
 
-status_to_message(L) when list(L) ->
+status_to_message(L) when is_list(L) ->
     case (catch list_to_integer(L)) of
-	I when integer(I) ->
+	I when is_integer(I) ->
 	    status_to_message(I);
 	_ ->
 	    io_lib:format("UNKNOWN STATUS CODE: '~p'",[L])
@@ -470,12 +471,12 @@ vlog(F,A)   -> vprint(get(verbosity),log,F,A).
 verror(F)   -> vprint(get(verbosity),error,F,[]).
 verror(F,A) -> vprint(get(verbosity),error,F,A).
 
-vprint(trace,Severity,F,A)         -> vprint(Severity,F,A);
-vprint(debug,trace,F,A)            -> ok;
-vprint(debug,Severity,F,A)         -> vprint(Severity,F,A);
-vprint(log,log,F,A)                -> vprint(log,F,A);
-vprint(log,error,F,A)              -> vprint(log,F,A);
-vprint(error,error,F,A)            -> vprint(error,F,A);
+vprint(trace, Severity,  F,  A)    -> vprint(Severity,F,A);
+vprint(debug, trace,    _F, _A)    -> ok;
+vprint(debug, Severity,  F,  A)    -> vprint(Severity,F,A);
+vprint(log,   log,       F,  A)    -> vprint(log,F,A);
+vprint(log,   error,     F,  A)    -> vprint(log,F,A);
+vprint(error, error,     F,  A)    -> vprint(error,F,A);
 vprint(_Verbosity,_Severity,_F,_A) -> ok.
 
 vprint(Severity,F,A) -> 
@@ -491,6 +492,3 @@ image_of(trace) -> "TRC: ".
 local_time() -> calendar:local_time().
 
 
-    
-
-
diff --git a/lib/inets/test/httpd_test_data/server_root/Makefile b/lib/inets/test/httpd_test_data/server_root/Makefile
new file mode 100644
index 0000000000..d7a3231068
--- /dev/null
+++ b/lib/inets/test/httpd_test_data/server_root/Makefile
@@ -0,0 +1,209 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2010. 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%
+#
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../../vsn.mk
+VSN=$(INETS_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/inets-$(VSN)
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+MODULE= 
+
+AUTH_FILES = auth/group \
+	auth/passwd 
+CGI_FILES = cgi-bin/printenv.sh 
+CONF_FILES = conf/8080.conf \
+	conf/8888.conf \
+	conf/httpd.conf \
+	conf/ssl.conf \
+	conf/mime.types 
+OPEN_FILES = htdocs/open/dummy.html 
+MNESIA_OPEN_FILES = htdocs/mnesia_open/dummy.html 
+MISC_FILES = htdocs/misc/friedrich.html \
+	htdocs/misc/oech.html
+SECRET_FILES = htdocs/secret/dummy.html 
+MNESIA_SECRET_FILES = htdocs/mnesia_secret/dummy.html 
+HTDOCS_FILES = htdocs/index.html \
+	htdocs/config.shtml \
+	htdocs/echo.shtml \
+	htdocs/exec.shtml \
+	htdocs/flastmod.shtml \
+	htdocs/fsize.shtml \
+	htdocs/include.shtml
+ICON_FILES = icons/README \
+	icons/a.gif \
+	icons/alert.black.gif \
+	icons/alert.red.gif \
+	icons/apache_pb.gif \
+	icons/back.gif \
+	icons/ball.gray.gif \
+	icons/ball.red.gif \
+	icons/binary.gif \
+	icons/binhex.gif \
+	icons/blank.gif \
+	icons/bomb.gif \
+	icons/box1.gif \
+	icons/box2.gif \
+	icons/broken.gif \
+	icons/burst.gif \
+	icons/button1.gif \
+	icons/button10.gif \
+	icons/button2.gif \
+	icons/button3.gif \
+	icons/button4.gif \
+	icons/button5.gif \
+	icons/button6.gif \
+	icons/button7.gif \
+	icons/button8.gif \
+	icons/button9.gif \
+	icons/buttonl.gif \
+	icons/buttonr.gif \
+	icons/c.gif \
+	icons/comp.blue.gif \
+	icons/comp.gray.gif \
+	icons/compressed.gif \
+	icons/continued.gif \
+	icons/dir.gif \
+	icons/down.gif \
+	icons/dvi.gif \
+	icons/f.gif \
+	icons/folder.gif \
+	icons/folder.open.gif \
+	icons/folder.sec.gif \
+	icons/forward.gif \
+	icons/generic.gif \
+	icons/generic.red.gif \
+	icons/generic.sec.gif \
+	icons/hand.right.gif \
+	icons/hand.up.gif \
+	icons/htdig.gif \
+	icons/icon.sheet.gif \
+	icons/image1.gif \
+	icons/image2.gif \
+	icons/image3.gif \
+	icons/index.gif \
+	icons/layout.gif \
+	icons/left.gif \
+	icons/link.gif \
+	icons/movie.gif \
+	icons/p.gif \
+	icons/patch.gif \
+	icons/pdf.gif \
+	icons/pie0.gif \
+	icons/pie1.gif \
+	icons/pie2.gif \
+	icons/pie3.gif \
+	icons/pie4.gif \
+	icons/pie5.gif \
+	icons/pie6.gif \
+	icons/pie7.gif \
+	icons/pie8.gif \
+	icons/portal.gif \
+	icons/poweredby.gif \
+	icons/ps.gif \
+	icons/quill.gif \
+	icons/right.gif \
+	icons/screw1.gif \
+	icons/screw2.gif \
+	icons/script.gif \
+	icons/sound1.gif \
+	icons/sound2.gif \
+	icons/sphere1.gif \
+	icons/sphere2.gif \
+	icons/star.gif \
+	icons/star_blank.gif \
+	icons/tar.gif \
+	icons/tex.gif \
+	icons/text.gif \
+	icons/transfer.gif \
+	icons/unknown.gif \
+	icons/up.gif \
+	icons/uu.gif \
+	icons/uuencoded.gif \
+	icons/world1.gif \
+	icons/world2.gif
+
+SSL_FILES = ssl/ssl_client.pem \
+	ssl/ssl_server.pem
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+ERL_COMPILE_FLAGS +=
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+debug opt: 
+
+clean:
+
+docs:
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/auth
+	$(INSTALL_DATA) $(AUTH_FILES) $(RELSYSDIR)/examples/server_root/auth
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/cgi-bin
+	$(INSTALL_SCRIPT) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/conf
+	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/examples/server_root/conf
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/open
+	$(INSTALL_DATA) $(OPEN_FILES) \
+		$(RELSYSDIR)/examples/server_root/htdocs/open
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
+	$(INSTALL_DATA) $(MNESIA_OPEN_FILES) \
+		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/misc
+	$(INSTALL_DATA) $(MISC_FILES) \
+		$(RELSYSDIR)/examples/server_root/htdocs/misc
+	$(INSTALL_DIR)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/secret/top_secret
+	$(INSTALL_DIR)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret/top_secret
+	$(INSTALL_DATA) $(SECRET_FILES)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/secret
+	$(INSTALL_DATA) $(MNESIA_SECRET_FILES)  \
+		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs
+	$(INSTALL_DATA) $(HTDOCS_FILES) $(RELSYSDIR)/examples/server_root/htdocs
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/icons
+	$(INSTALL_DATA) $(ICON_FILES) $(RELSYSDIR)/examples/server_root/icons
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/ssl
+	$(INSTALL_DATA) $(SSL_FILES) $(RELSYSDIR)/examples/server_root/ssl
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/logs
+
+release_docs_spec:
+
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index 6abee5be2c..3189a758a5 100644
--- a/lib/inets/test/httpd_test_lib.erl
+++ b/lib/inets/test/httpd_test_lib.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. 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%
 %%
 %%
@@ -72,6 +72,8 @@
  	  'last-modified',
 	  other=[]        % list() - Key/Value list with other headers
 	 }).
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%--------------------------------------------------------------------
@@ -81,7 +83,8 @@ verify_request(SocketType, Host, Port, Node, RequestStr, Options) ->
     verify_request(SocketType, Host, Port, Node, RequestStr, Options, 30000).
 verify_request(SocketType, Host, Port, Node, RequestStr, Options, TimeOut) ->
     {ok, Socket} = inets_test_lib:connect_bin(SocketType, Host, Port),
-    inets_test_lib:send(SocketType, Socket, RequestStr),
+
+    _SendRes = inets_test_lib:send(SocketType, Socket, RequestStr),
     
     State = case inets_regexp:match(RequestStr, "printenv") of
 		nomatch ->
@@ -90,18 +93,26 @@ verify_request(SocketType, Host, Port, Node, RequestStr, Options, TimeOut) ->
 		    #state{print = true}
 	    end,
 		
-    case request(State#state{request = RequestStr, socket = Socket}, TimeOut) of
-	{error, Reson} ->
-	    {error, Reson};
+    case request(State#state{request = RequestStr, 
+			     socket  = Socket}, TimeOut) of
+	{error, Reason} ->
+	    tsp("request failed: "
+		"~n   Reason: ~p", [Reason]),
+	    {error, Reason};
 	NewState ->
+	    tsp("validate reply: "
+		"~n   NewState: ~p", [NewState]),
 	    ValidateResult = validate(RequestStr, NewState, Options,
 				      Node, Port),
+	    tsp("validation result: "
+		"~n   ~p", [ValidateResult]),
 	    inets_test_lib:close(SocketType, Socket),
 	    ValidateResult
     end.
 
 request(#state{mfa = {Module, Function, Args}, 
 	       request = RequestStr, socket = Socket} = State, TimeOut) ->
+            
     HeadRequest = lists:sublist(RequestStr, 1, 4),
     receive 
 	{tcp, Socket, Data} ->
@@ -109,12 +120,12 @@ request(#state{mfa = {Module, Function, Args},
 	    case Module:Function([Data | Args]) of
 		{ok, Parsed} ->
 		    handle_http_msg(Parsed, State); 
-		{_, whole_body, _} when HeadRequest == "HEAD" ->
+		{_, whole_body, _} when HeadRequest =:= "HEAD" ->
 		    State#state{body = <<>>}; 
 		NewMFA ->
 		    request(State#state{mfa = NewMFA}, TimeOut)
 	    end;
-	{tcp_closed, Socket} when Function == whole_body ->
+	{tcp_closed, Socket} when Function =:= whole_body ->
 	    print(tcp, "closed", State),
 	    State#state{body = hd(Args)}; 
 	{tcp_closed, Socket} ->
@@ -126,12 +137,12 @@ request(#state{mfa = {Module, Function, Args},
 	    case Module:Function([Data | Args]) of
 		{ok, Parsed} ->
 		    handle_http_msg(Parsed, State); 
-		{_, whole_body, _} when HeadRequest == "HEAD" ->
+		{_, whole_body, _} when HeadRequest =:= "HEAD" ->
 		    State#state{body = <<>>}; 
 		NewMFA ->
 		    request(State#state{mfa = NewMFA}, TimeOut)
 	    end;
-	{ssl_closed, Socket}  when Function == whole_body ->
+	{ssl_closed, Socket}  when Function =:= whole_body ->
 	    print(ssl, "closed", State),
 	    State#state{body = hd(Args)};
 	{ssl_closed, Socket} ->
@@ -330,3 +341,9 @@ print(Proto, Data, #state{print = true}) ->
 print(_, _,  #state{print = false}) ->
     ok.
 
+
+%% tsp(F) ->
+%%     tsp(F, []).
+tsp(F, A) ->
+    test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
+
diff --git a/lib/inets/test/httpd_time_test.erl b/lib/inets/test/httpd_time_test.erl
index 7d6aa08542..f39f9faff0 100644
--- a/lib/inets/test/httpd_time_test.erl
+++ b/lib/inets/test/httpd_time_test.erl
@@ -1,25 +1,25 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. 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(httpd_time_test).
 
--export([t/3, t1/2, t2/2]).
+-export([t/3, t1/2, t2/2, t3/2, t4/2]).
 
 -export([do/1, do/2, do/3, do/4, do/5]).
 
@@ -29,6 +29,9 @@
 
 -record(stat, {pid, time = undefined, count = undefined, res}).
 
+%% -define(NUM_POLLERS, 10).
+-define(NUM_POLLERS, 1).
+
 
 %%% -----------------------------------------------------------------
 %%% Test suite interface
@@ -42,9 +45,17 @@ t2(Host, Port) ->
     t(ssl, Host, Port).
 
 
+t3(Host, Port) ->
+    t(ossl, Host, Port).
+
+
+t4(Host, Port) ->
+    t(essl, Host, Port).
+
+
 t(SocketType, Host, Port) ->
     %% put(dbg,true),
-    main(1, SocketType, Host, Port, 60000).
+    main(?NUM_POLLERS, SocketType, Host, Port, 60000).
 	    
 
 
@@ -111,28 +122,40 @@ loop(Pollers, Timeout) ->
       "~n   Timeout: ~p", [Timeout]),
     Start = t(), 
     receive 
-	{'EXIT', Pid, {poller_stat_failure, Time, Reason}} ->
+	{'EXIT', Pid, {poller_stat_failure, SocketType, Host, Port, Time, Reason}} ->
 	    case is_poller(Pid, Pollers) of
 		true ->
 		    error_msg("received unexpected exit from poller ~p~n"
 			      "befor completion of test "
-			      "(after ~p micro sec):~n"
-			      "~p~n", [Pid,Time,Reason]),
-		    exit({fail, {poller_exit, Pid, Reason}});
+			      "after ~p micro sec"
+			      "~n   SocketType: ~p"
+			      "~n   Host:       ~p"
+			      "~n   Port:       ~p"
+			      "~n~p~n", 
+			      [Pid, SocketType, Host, Port, Time, Reason]),
+		    exit({fail, {poller_exit, Pid, Time, Reason}});
 		false ->
 		    error_msg("received unexpected ~p from ~p"
 			      "befor completion of test", [Reason, Pid]),
 		    loop(Pollers, to(Timeout, Start))
 	    end;
 
-	{poller_stat_failure, Pid, {Time, Reason}} ->
+	{poller_stat_failure, Pid, {SocketType, Host, Port, Time, Reason}} ->
 	    error_msg("received stat failure ~p from poller ~p after ~p "
-		      "befor completion of test", [Reason, Pid, Time]),
-	    exit({fail, {poller_failure, Pid, Reason}});
-
-	{poller_stat_failure, Pid, Reason} ->
+		      "befor completion of test" 
+		      "~n   SocketType: ~p"
+		      "~n   Host:       ~p"
+		      "~n   Port:       ~p", 
+		      [Reason, Pid, Time, SocketType, Host, Port]),
+	    exit({fail, {poller_failure, Pid, Time, Reason}});
+
+	{poller_stat_failure, Pid, SocketType, Host, Port, Reason} ->
 	    error_msg("received stat failure ~p from poller ~p "
-		      "befor completion of test", [Reason, Pid]),
+		      "befor completion of test" 
+		      "~n   SocketType: ~p"
+		      "~n   Host:       ~p"
+		      "~n   Port:       ~p", 
+		      [Reason, Pid, SocketType, Host, Port]),
 	    exit({fail, {poller_failure, Pid, Reason}});
 
 	Any ->
@@ -250,16 +273,16 @@ is_poller(Pid, [_|Rest]) ->
 
 poller_main(Parent, SocketType, Host, Port) ->
     process_flag(trap_exit,true),
-    put(sname,poller),
+    put(sname, poller),
     case timer:tc(?MODULE, poller_loop, [SocketType, Host, Port, uris()]) of
 	{Time, Count} when is_integer(Time) andalso is_integer(Count) ->
 	    Parent ! {poller_statistics, self(), {Time, Count}};
 	{Time, {'EXIT', Reason}} when is_integer(Time) ->
-	    exit({poller_stat_failure, Time, Reason});
+	    exit({poller_stat_failure, SocketType, Host, Port, Time, Reason});
 	{Time, Other} when is_integer(Time) ->
-	    Parent ! {poller_stat_failure, self(), {Time, Other}};
+	    Parent ! {poller_stat_failure, self(), {SocketType, Host, Port, Time, Other}};
 	Else ->
-	    Parent ! {poller_stat_failure, self(), Else}
+	    Parent ! {poller_stat_failure, self(), SocketType, Host, Port, Else}
     end.
 
 	    
diff --git a/lib/inets/test/inets.cover b/lib/inets/test/inets.cover
new file mode 100644
index 0000000000..fd0ca41db3
--- /dev/null
+++ b/lib/inets/test/inets.cover
@@ -0,0 +1,2 @@
+{incl_app,inets,details}.
+
diff --git a/lib/inets/test/inets.spec b/lib/inets/test/inets.spec
index a9b4524295..ed102f8219 100644
--- a/lib/inets/test/inets.spec
+++ b/lib/inets/test/inets.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../inets_test"}}.
-{hosts, ["tuor"]}.
+{suites,"../inets_test",all}.
diff --git a/lib/inets/test/inets_SUITE.erl b/lib/inets/test/inets_SUITE.erl
index 56983caace..8e3ba226b9 100644
--- a/lib/inets/test/inets_SUITE.erl
+++ b/lib/inets/test/inets_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(inets_SUITE).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 -include("inets_test_lib.hrl").
 
@@ -28,25 +28,26 @@
 
 -define(NUM_DEFAULT_SERVICES, 1).
 
-all(doc) ->
-    ["Test suites for the inets application."];
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, app_test}, {group, appup_test},
+     {group, services_test}, httpd_reload].
+
+groups() -> 
+    [{services_test, [],
+      [start_inets, start_httpc, start_httpd, start_ftpc,
+       start_tftpd]},
+     {app_test, [], [{inets_app_test, all}]},
+     {appup_test, [], [{inets_appup_test, all}]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [
-     app_test,
-     appup_test,
-     services_test,
-     httpd_reload
-    ].
 
-services_test(suite) ->
-    [
-     start_inets,
-     start_httpc,
-     start_httpd,
-     start_ftpc,
-     start_tftpd
-    ].
 
 
 %%--------------------------------------------------------------------
@@ -100,11 +101,7 @@ end_per_testcase(_, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-app_test(suite) ->
-    [{inets_app_test, all}].
 
-appup_test(suite) ->
-    [{inets_appup_test, all}].
 
 
 %%-------------------------------------------------------------------------
diff --git a/lib/inets/test/inets_app_test.erl b/lib/inets/test/inets_app_test.erl
index 6bdb9bb308..11b507fa26 100644
--- a/lib/inets/test/inets_app_test.erl
+++ b/lib/inets/test/inets_app_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
@@ -39,28 +39,31 @@ init_per_testcase(undef_funcs, Config) ->
 init_per_testcase(_, Config) ->
     Config.
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Config.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 fields,
-	 modules,
-	 exportall,
-	 app_depend,
-	 undef_funcs
-	],
-    {req, [], {conf, app_init, Cases, app_fin}}.
+all() -> 
+    [fields, modules, exportall, app_depend,
+     undef_funcs].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-app_init(suite) -> [];
-app_init(doc) -> [];
-app_init(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
     case is_app(inets) of
 	{ok, AppFile} ->
 	    io:format("AppFile: ~n~p~n", [AppFile]),
@@ -81,9 +84,9 @@ is_app(App) ->
     end.
 
 
-app_fin(suite) -> [];
-app_fin(doc) -> [];
-app_fin(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
diff --git a/lib/inets/test/inets_appup_test.erl b/lib/inets/test/inets_appup_test.erl
index d580c6c4c5..7ed237243e 100644
--- a/lib/inets/test/inets_appup_test.erl
+++ b/lib/inets/test/inets_appup_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
@@ -18,40 +18,47 @@
 %%
 %%
 %%----------------------------------------------------------------------
-%% Purpose: Verify the application specifics of the Megaco application
+%% Purpose: Verify the application specifics of the Inets application
 %%----------------------------------------------------------------------
 -module(inets_appup_test).
 
 -compile(export_all).
+-compile({no_auto_import,[error/1]}).
 
 -include("inets_test_lib.hrl").
 
 
-% t()     -> megaco_test_lib:t(?MODULE).
-% t(Case) -> megaco_test_lib:t({?MODULE, Case}).
+						% t()     -> megaco_test_lib:t(?MODULE).
+						% t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 
 
 %% Test server callbacks
 init_per_testcase(_Case, Config) ->
     Config.
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Config.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 appup
-	],
-    {req, [], {conf, appup_init, Cases, appup_fin}}.
+all() -> 
+    [appup].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-appup_init(suite) -> [];
-appup_init(doc) -> [];
-appup_init(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
     AppFile   = file_name(inets, ".app"),
     AppupFile = file_name(inets, ".appup"),
     [{app_file, AppFile}, {appup_file, AppupFile}|Config].
@@ -62,9 +69,9 @@ file_name(App, Ext) ->
     filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
 
 
-appup_fin(suite) -> [];
-appup_fin(doc) -> [];
-appup_fin(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
diff --git a/lib/inets/test/inets_sup_SUITE.erl b/lib/inets/test/inets_sup_SUITE.erl
index ba41e0960c..fb29ab279f 100644
--- a/lib/inets/test/inets_sup_SUITE.erl
+++ b/lib/inets/test/inets_sup_SUITE.erl
@@ -20,22 +20,27 @@
 
 -module(inets_sup_SUITE).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
-all(doc) ->
-    ["Test that the inets supervisorstructur is the expected one."];
-all(suite) ->
-    [
-     default_tree, 
-     ftpc_worker, 
-     tftpd_worker,
-     httpd_subtree, 
-     httpc_subtree
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [default_tree, ftpc_worker, tftpd_worker, httpd_subtree,
+     httpc_subtree].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
@@ -372,11 +377,11 @@ httpc_subtree(Config) when is_list(Config) ->
 	"~n   Config: ~p", [Config]),
 
     tsp("httpc_subtree -> start inets service httpc with profile foo"),
-    {ok, Foo} = inets:start(httpc, [{profile, foo}]),
+    {ok, _Foo} = inets:start(httpc, [{profile, foo}]),
 
     tsp("httpc_subtree -> "
 	"start stand-alone inets service httpc with profile bar"),
-    {ok, Bar} = inets:start(httpc, [{profile, bar}], stand_alone),
+    {ok, _Bar} = inets:start(httpc, [{profile, bar}], stand_alone),
 
     tsp("httpc_subtree -> retreive list of httpc instances"),
     HttpcChildren = supervisor:which_children(httpc_profile_sup),
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index 6af2ad32f7..c56a714f5a 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -1,44 +1,136 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. 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(inets_test_lib).
 
 -include("inets_test_lib.hrl").
+-include_lib("inets/src/http_lib/http_internal.hrl").
 
 %% Various small utility functions
--export([start_http_server/1, start_http_server_ssl/1]).
+-export([start_http_server/1, start_http_server/2]).
+-export([start_http_server_ssl/1, start_http_server_ssl/2]).
 -export([hostname/0]).
 -export([connect_bin/3, connect_byte/3, send/3, close/2]).
 -export([copy_file/3, copy_files/2, copy_dirs/2, del_dirs/1]).
 -export([info/4, log/4, debug/4, print/4]).
 -export([check_body/1]).
 -export([millis/0, millis_diff/2, hours/1, minutes/1, seconds/1, sleep/1]).
+-export([oscmd/1]).
 -export([non_pc_tc_maybe_skip/4, os_based_skip/1]).
+-export([flush/0]).
+-export([start_node/1, stop_node/1]).
+
+%% -- Misc os command and stuff
+
+oscmd(Cmd) ->
+  string:strip(os:cmd(Cmd), right, $\n).
+
+%% -- Misc node operation wrapper functions --
+
+start_node(Name) ->
+    Pa   = filename:dirname(code:which(?MODULE)),
+    Args = case init:get_argument('CC_TEST') of
+               {ok, [[]]} ->
+                   " -pa /clearcase/otp/libraries/snmp/ebin ";
+               {ok, [[Path]]} ->
+                   " -pa " ++ Path;
+               error ->
+                      ""
+              end,
+    A = Args ++ " -pa " ++ Pa,
+    Opts = [{cleanup,false}, {args, A}],
+    case (catch test_server:start_node(Name, slave, Opts)) of
+        {ok, Node} ->
+            Node;
+        Else ->
+            exit({failed_starting_node, Name, Else})
+    end.
+
+stop_node(Node) ->
+    rpc:cast(Node, erlang, halt, []),
+    await_stopped(Node, 5).
+
+await_stopped(_, 0) ->
+    ok;
+await_stopped(Node, N) ->
+    Nodes = erlang:nodes(),
+    case lists:member(Node, Nodes) of
+        true ->
+            sleep(1000),
+            await_stopped(Node, N-1);
+        false ->
+            ok
+    end.
+
+
+%% ----------------------------------------------------------------
+%% HTTPD starter functions
+%%
 
 start_http_server(Conf) ->
+    start_http_server(Conf, ?HTTP_DEFAULT_SSL_KIND).
+
+start_http_server(Conf, essl = _SslTag) ->
+    application:start(crypto), 
+    do_start_http_server(Conf);
+start_http_server(Conf, _SslTag) ->
+    do_start_http_server(Conf).
+
+do_start_http_server(Conf) ->
+    tsp("start http server with "
+	"~n   Conf: ~p"
+	"~n", [Conf]),
     application:load(inets), 
-    ok = application:set_env(inets, services, [{httpd, Conf}]),
-    ok = application:start(inets).
-
+    case application:set_env(inets, services, [{httpd, Conf}]) of
+	ok ->
+	    case application:start(inets) of
+		ok ->
+		    ok;
+		Error1 ->
+		    test_server:format("<ERROR> Failed starting application: "
+				       "~n   Error: ~p"
+				       "~n", [Error1]),
+		    Error1
+	    end;
+	Error2 ->
+	    test_server:format("<ERROR> Failed set application env: "
+			       "~n   Error: ~p"
+			       "~n", [Error2]),
+	    Error2
+    end.
+	    
 start_http_server_ssl(FileName) ->
+    start_http_server_ssl(FileName, ?HTTP_DEFAULT_SSL_KIND).
+
+start_http_server_ssl(FileName, essl = _SslTag) ->
+    application:start(crypto), 
+    do_start_http_server_ssl(FileName);
+start_http_server_ssl(FileName, _SslTag) ->
+    do_start_http_server_ssl(FileName).
+
+do_start_http_server_ssl(FileName) ->
+    tsp("start (ssl) http server with "
+	"~n   FileName: ~p"
+	"~n", [FileName]),
     application:start(ssl),	       
-    catch start_http_server(FileName).
+    catch do_start_http_server(FileName).
+
 
 %% ----------------------------------------------------------------------
 %% print functions
@@ -84,27 +176,17 @@ copy_files(FromDir, ToDir) ->
 
 
 copy_dirs(FromDirRoot, ToDirRoot) ->
-%%     io:format("~w:copy_dirs -> entry with"
-%% 	      "~n   FromDirRoot: ~p"
-%% 	      "~n   ToDirRoot:   ~p"
-%% 	      "~n", [?MODULE, FromDirRoot, ToDirRoot]), 
     {ok, Files} = file:list_dir(FromDirRoot),
     lists:foreach(
       fun(FileOrDir) -> 
 	      %% Check if it's a directory or a file
-%% 	      io:format("~w:copy_dirs -> check ~p"
-%% 			"~n", [?MODULE, FileOrDir]), 
 	      case filelib:is_dir(filename:join(FromDirRoot, FileOrDir)) of
 		  true ->
-%% 		      io:format("~w:copy_dirs -> ~p is a directory"
-%% 				"~n", [?MODULE, FileOrDir]), 
 		      FromDir = filename:join([FromDirRoot, FileOrDir]),
 		      ToDir   = filename:join([ToDirRoot, FileOrDir]),
 		      ok      = file:make_dir(ToDir),
 		      copy_dirs(FromDir, ToDir);
 		  false ->
-%% 		      io:format("~w:copy_dirs -> ~p is a file"
-%% 				"~n", [?MODULE, FileOrDir]), 
 		      copy_file(FileOrDir, FromDirRoot, ToDirRoot)
 	      end
       end, Files).
@@ -133,8 +215,8 @@ check_body(Body) ->
 	0 ->
 	    case string:rstr(Body, "</HTML>") of
 		0 ->
-		    test_server:format("Body ~p~n", [Body]),
-		    test_server:fail(did_not_receive_whole_body);
+		    tsp("Body ~p", [Body]),
+		    tsf(did_not_receive_whole_body);
 		_ ->
 		    ok
 	    end;
@@ -204,9 +286,31 @@ os_based_skip(_) ->
 %% Port       -> integer()
 
 connect_bin(ssl, Host, Port) ->
+    connect(ssl, Host, Port, [binary, {packet,0}]);
+connect_bin(ossl, Host, Port) ->
+    connect(ssl, Host, Port, [{ssl_imp, old}, binary, {packet,0}]);
+connect_bin(essl, Host, Port) ->
+    connect(ssl, Host, Port, [{ssl_imp, new}, binary, {packet,0}, {reuseaddr, true}]);
+connect_bin(ip_comm, Host, Port) ->
+    Opts = [inet6, binary, {packet,0}],
+    connect(ip_comm, Host, Port, Opts).
+
+    
+connect_byte(ssl, Host, Port) ->
+    connect(ssl, Host, Port, [{packet,0}]);
+connect_byte(ossl, Host, Port) ->
+    connect(ssl, Host, Port, [{ssl_imp, old}, {packet,0}]);
+connect_byte(essl, Host, Port) ->
+    connect(ssl, Host, Port, [{ssl_imp, new}, {packet,0}]);
+connect_byte(ip_comm, Host, Port) ->
+    Opts = [inet6, {packet,0}],
+    connect(ip_comm, Host, Port, Opts).
+
+
+connect(ssl, Host, Port, Opts) ->
     ssl:start(),
     %% Does not support ipv6 in old ssl 
-    case ssl:connect(Host, Port, [binary, {packet,0}]) of
+    case ssl:connect(Host, Port, Opts) of
 	{ok, Socket} ->
 	    {ok, Socket};
 	{error, Reason} ->
@@ -214,61 +318,51 @@ connect_bin(ssl, Host, Port) ->
 	Error ->
 	    Error
     end;
-connect_bin(ip_comm, Host, Port) ->
-    Opts = [inet6, binary, {packet,0}],
-    connect(ip_comm, Host, Port, Opts).
-    
-
 connect(ip_comm, Host, Port, Opts) ->
-    test_server:format("gen_tcp:connect(~p, ~p, ~p) ~n", [Host, Port, Opts]),
     case gen_tcp:connect(Host,Port, Opts) of
 	{ok, Socket} ->
-	    test_server:format("connect success~n", []),
+	    %% tsp("connect success"),
 	    {ok, Socket};
 	{error, nxdomain} ->
-	    test_server:format("nxdomain opts: ~p~n", [Opts]),
+	    tsp("nxdomain opts: ~p", [Opts]),
 	    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
 	{error, eafnosupport}  ->
-	    test_server:format("eafnosupport opts: ~p~n", [Opts]),
+	    tsp("eafnosupport opts: ~p", [Opts]),
+	    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
+	{error, enetunreach}  ->
+	    tsp("eafnosupport opts: ~p", [Opts]),
 	    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
 	{error, {enfile,_}} ->
-	    test_server:format("Error enfile~n", []),
+	    tsp("Error enfile"),
 	    {error, enfile};
 	Error ->
-	    test_server:format("Unexpected error: "
-			       "~n   Error: ~p"
-			       "~nwhen"
-			       "~n   Host:  ~p"
-			       "~n   Port:  ~p"
-			       "~n   Opts:  ~p"
-			       "~n", [Error, Host, Port, Opts]),
+	    tsp("Unexpected error: "
+		"~n   Error: ~p"
+		"~nwhen"
+		"~n   Host:  ~p"
+		"~n   Port:  ~p"
+		"~n   Opts:  ~p"
+		"~n", [Error, Host, Port, Opts]),
 	    Error
     end.
 
-connect_byte(ip_comm, Host, Port) ->
-    Opts = [inet6, {packet,0}],
-    connect(ip_comm, Host, Port, Opts);
-
-connect_byte(ssl, Host, Port) ->
-    ssl:start(),
-    %% Does not support ipv6 in old ssl 
-    case ssl:connect(Host,Port,[{packet,0}]) of
-	{ok,Socket} ->
-	    {ok,Socket};
-	{error,{enfile,_}} ->
-	    {error, enfile};
-	Error ->
-	    Error
-    end.   
 
 send(ssl, Socket, Data) ->
     ssl:send(Socket, Data);
+send(ossl, Socket, Data) ->
+    ssl:send(Socket, Data);
+send(essl, Socket, Data) ->
+    ssl:send(Socket, Data);
 send(ip_comm,Socket,Data) ->
     gen_tcp:send(Socket,Data).
 
 
 close(ssl,Socket) ->
     catch ssl:close(Socket);
+close(ossl,Socket) ->
+    catch ssl:close(Socket);
+close(essl,Socket) ->
+    catch ssl:close(Socket);
 close(ip_comm,Socket) ->
     catch gen_tcp:close(Socket).
 
@@ -300,3 +394,20 @@ sleep(MSecs) ->
 
 skip(Reason, File, Line) ->
     exit({skipped, {Reason, File, Line}}).
+
+flush() ->
+    receive
+        Msg ->
+            [Msg | flush()]
+    after 1000 ->
+            []
+    end.
+
+
+tsp(F) ->
+    tsp(F, []).
+tsp(F, A) ->
+    test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
+
+tsf(Reason) ->
+    test_server:fail(Reason).
diff --git a/lib/inets/test/inets_test_lib.hrl b/lib/inets/test/inets_test_lib.hrl
index 12a43fa136..0cdb04139c 100644
--- a/lib/inets/test/inets_test_lib.hrl
+++ b/lib/inets/test/inets_test_lib.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. 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%
 %%
 %%
@@ -46,6 +46,11 @@
 -endif.
 
 
+%% - OS Command and stuff
+
+-define(OSCMD(Cmd), inets_test_lib:oscmd(Cmd)).
+
+
 %% - Test case macros -
 
 -define(EXPANDABLE(I, C, F), inets_test_lib:expandable(I, C, F)).
diff --git a/lib/inets/test/tftp_SUITE.erl b/lib/inets/test/tftp_SUITE.erl
index 5768fff88b..79e9682ca4 100644
--- a/lib/inets/test/tftp_SUITE.erl
+++ b/lib/inets/test/tftp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -64,24 +64,34 @@ default_config() ->
 init_per_testcase(Case, Config) ->
     tftp_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) when is_list(Config) ->
-    tftp_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) when is_list(Config) ->
+    tftp_test_lib:end_per_testcase(Case, Config).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(doc) ->
-    ["Test suites for TFTP."];
-
-all(suite) ->
-    [
-     simple,
-     extra,
-     reuse_connection,
-     resend_client,
-     resend_server
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [simple, extra, reuse_connection, resend_client,
+     resend_server].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Simple
diff --git a/lib/inets/test/tftp_test_lib.erl b/lib/inets/test/tftp_test_lib.erl
index 3729309b0e..e9b691828f 100644
--- a/lib/inets/test/tftp_test_lib.erl
+++ b/lib/inets/test/tftp_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -32,7 +32,7 @@ init_per_testcase(_Case, Config) when is_list(Config) ->
     ?IGNORE(application:stop(inets)),   
     Config.
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     ?IGNORE(application:stop(inets)),   
     Config.
 
@@ -143,7 +143,7 @@ eval(Mod, Fun, Config) ->
     Config2 = Mod:init_per_testcase(Fun, Config),
     Pid = spawn_link(?MODULE, do_eval, [self(), Mod, Fun, Config2]),
     R = wait_for_evaluator(Pid, Mod, Fun, Config2, []),
-    Mod:fin_per_testcase(Fun, Config2),
+    Mod:end_per_testcase(Fun, Config2),
     global:unregister_name(tftp_test_case_sup),
     process_flag(trap_exit, Flag),
     R.
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index ac20fa7bb7..67737ee552 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -1,113 +1,24 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
 # %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2010. All Rights Reserved.
-#
+# 
+# Copyright Ericsson AB 2001-2010. 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%
 
 APPLICATION = inets
-INETS_VSN   = 5.3.3
+INETS_VSN   = 5.5.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
 
-TICKETS = OTP-8609 OTP-8610 OTP-8624
-
-TICKETS_5_3_2 = \
-	OTP-8542 \
-	OTP-8607
-
-TICKETS_5_3_1 = \
-	OTP-8508 \
-	OTP-8509
-
-TICKETS_5_3 = \
-	OTP-8016 \
-	OTP-8056 \
-	OTP-8103 \
-	OTP-8106 \
-	OTP-8312 \
-	OTP-8315 \
-	OTP-8327 \
-	OTP-8349 \
-	OTP-8351 \
-	OTP-8352 \
-	OTP-8359 \
-	OTP-8371
-
-TICKETS_5_2 = \
-	OTP-8204 \
-	OTP-8206 \
-	OTP-8247 \
-	OTP-8248 \
-	OTP-8249 \
-	OTP-8258 \
-	OTP-8280
-
-TICKETS_5_1_3 = OTP-8154
-
-TICKETS_5_1_2 = OTP-7298 OTP-8101 OTP-8118
-
-TICKETS_5_1_1 = OTP-8052 OTP-8069 
-
-TICKETS_5_1 = OTP-7994 OTP-7998 OTP-8001 OTP-8004 OTP-8005 
-
-TICKETS_5_0_14 = OTP-7882 OTP-7883 OTP-7888 OTP-7950 OTP-7976
-
-TICKETS_5.0.13 = \
-	OTP-7723 \
-	OTP-7724 \
-	OTP-7726 \
-	OTP-7463 \
-	OTP-7815 \
-	OTP-7857 
-
-# TICKETS_5.0.12 = \
-# 	OTP-7636
-# 
-# TICKETS_5.0.11 = \
-# 	OTP-7574 \
-# 	OTP-7597 \
-# 	OTP-7598 \
-# 	OTP-7605 
-# 
-# TICKETS_5.0.10 = \
-# 	OTP-7450 \
-# 	OTP-7454 \
-# 	OTP-7490 \
-# 	OTP-7512 
-# 
-# TICKETS_5.0.9 = \
-# 	OTP-7257 \
-# 	OTP-7323 \
-# 	OTP-7341 
-# 
-# TICKETS_5.0.8 = \
-# 	OTP-7315 \
-#         OTP-7321
-# 
-# TICKETS_5.0.7 = \
-# 	OTP-7304	
-# 
-# TICKETS_5.0.6 = \
-# 	OTP-7266
-# 
-# TICKETS_5.0.5 = \
-# 	OTP-7220 \
-#         OTP-7221
-# 
-# TICKETS_5.0.4 = \
-#         OTP-7173
-# 
-
diff --git a/lib/inviso/doc/src/notes.xml b/lib/inviso/doc/src/notes.xml
index 443aaf523b..48a71e314c 100644
--- a/lib/inviso/doc/src/notes.xml
+++ b/lib/inviso/doc/src/notes.xml
@@ -31,7 +31,23 @@
   <p>This document describes the changes made to the Inviso application.</p>
 
 

-  <section><title>Inviso 0.6.1</title>
+  <section><title>Inviso 0.6.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The obsolete guards has now been changed to the new guard
+	    interface.</p>
+          <p>
+	    Own Id: OTP-8747</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inviso 0.6.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/inviso/src/inviso.erl b/lib/inviso/src/inviso.erl
index de42926ffe..0eda06a5c2 100644
--- a/lib/inviso/src/inviso.erl
+++ b/lib/inviso/src/inviso.erl
@@ -129,7 +129,7 @@ start(Options) ->
 add_node(Reference) ->

     gen_server:call(?CONTROLLER,{add_nodes,[node()],[],Reference,any_ref},?CALL_TIMEOUT).

 

-add_node(Reference,Options) when list(Options) ->

+add_node(Reference,Options) when is_list(Options) ->
     gen_server:call(?CONTROLLER,{add_nodes,[node()],Options,Reference,any_ref},?CALL_TIMEOUT).

 %% -----------------------------------------------------------------------------

 

@@ -142,7 +142,7 @@ add_node(Reference,Options) when list(Options) ->
 add_node_if_ref(Reference) ->

     gen_server:call(?CONTROLLER,{add_nodes,[node()],[],Reference,if_ref},?CALL_TIMEOUT).

 

-add_node_if_ref(Reference,Options) when list(Options) ->

+add_node_if_ref(Reference,Options) when is_list(Options) ->
     gen_server:call(?CONTROLLER,{add_nodes,[node()],Options,Reference,if_ref},?CALL_TIMEOUT).

 %% -----------------------------------------------------------------------------

 

@@ -156,10 +156,10 @@ add_node_if_ref(Reference,Options) when list(Options) ->
 %% system. By speicifying node() as the node where the runtime component shall

 %% be started. The return value will then follow the rules of non distributed

 %% returnvalues and not have a node indicator.

-add_nodes(Nodes,Reference) when list(Nodes) ->

+add_nodes(Nodes,Reference) when is_list(Nodes) ->
     gen_server:call(?CONTROLLER,{add_nodes,Nodes,[],Reference,any_ref},?CALL_TIMEOUT).

 

-add_nodes(Nodes,Reference,Options) when list(Nodes),list(Options) ->

+add_nodes(Nodes,Reference,Options) when is_list(Nodes),is_list(Options) ->
     gen_server:call(?CONTROLLER,{add_nodes,Nodes,Options,Reference,any_ref},?CALL_TIMEOUT).

 %% -----------------------------------------------------------------------------

 

@@ -168,10 +168,10 @@ add_nodes(Nodes,Reference,Options) when list(Nodes),list(Options) ->
 %%

 %% As add_nodes/2,/3 but will only connect to an already existing runtime component

 %% if its reference is the same as the one given as argument.

-add_nodes_if_ref(Nodes,Reference) when list(Nodes) ->

+add_nodes_if_ref(Nodes,Reference) when is_list(Nodes) ->
     gen_server:call(?CONTROLLER,{add_nodes,Nodes,[],Reference,if_ref},?CALL_TIMEOUT).

 

-add_nodes_if_ref(Nodes,Reference,Options) when list(Nodes),list(Options) ->

+add_nodes_if_ref(Nodes,Reference,Options) when is_list(Nodes),is_list(Options) ->
     gen_server:call(?CONTROLLER,{add_nodes,Nodes,Options,Reference,if_ref},?CALL_TIMEOUT).

 %% -----------------------------------------------------------------------------

 

@@ -182,9 +182,9 @@ add_nodes_if_ref(Nodes,Reference,Options) when list(Nodes),list(Options) ->
 %%

 %% Change options on all or specified Nodes. This may result in for instance

 %% reinitialization of overloadcheck.

-change_options(Options) when list(Options) ->

+change_options(Options) when is_list(Options) ->
     gen_server:call(?CONTROLLER,{change_options,all,Options},?CALL_TIMEOUT).

-change_options(Nodes,Options) when list(Nodes),list(Options)  ->

+change_options(Nodes,Options) when is_list(Nodes),is_list(Options)  ->
     gen_server:call(?CONTROLLER,{change_options,Nodes,Options},?CALL_TIMEOUT).

 %% -----------------------------------------------------------------------------

 

@@ -234,7 +234,7 @@ change_options(Nodes,Options) when list(Nodes),list(Options)  ->
 init_tracing(TracerDataList) ->

     gen_server:call(?CONTROLLER,{init_tracing,TracerDataList},?CALL_TIMEOUT).

 

-init_tracing(Nodes,TracerData) when list(Nodes) ->

+init_tracing(Nodes,TracerData) when is_list(Nodes) ->
     gen_server:call(?CONTROLLER,{init_tracing,Nodes,TracerData},?CALL_TIMEOUT).

 %% -----------------------------------------------------------------------------

 

@@ -270,10 +270,10 @@ stop_tracing(Nodes) when is_list(Nodes) ->
 clear() ->

     gen_server:call(?CONTROLLER,{clear,all,[]},?CALL_TIMEOUT).

 

-clear(Nodes) when list(Nodes) ->

+clear(Nodes) when is_list(Nodes) ->
     gen_server:call(?CONTROLLER,{clear,Nodes,[]},?CALL_TIMEOUT).

 

-clear(Nodes,Options) when list(Nodes),list(Options) ->

+clear(Nodes,Options) when is_list(Nodes),is_list(Options) ->
     gen_server:call(?CONTROLLER,{clear,Nodes,Options},?CALL_TIMEOUT).

 %% -----------------------------------------------------------------------------

 

@@ -355,9 +355,9 @@ stop_all() ->
 tp(Nodes,Module,Function,Arity,MatchSpec,Opts) ->

     trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,Opts}],[global]).

 

-tp(Nodes,Module,Function,Arity,MatchSpec) when list(Nodes) -> 

+tp(Nodes,Module,Function,Arity,MatchSpec) when is_list(Nodes) ->
     trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,[]}],[global]);

-tp(Module,Function,Arity,MatchSpec,Opts) when atom(Module) ->

+tp(Module,Function,Arity,MatchSpec,Opts) when is_atom(Module) ->
     trace_pattern(all,[{Module,Function,Arity,MatchSpec,Opts}],[global]).

 

 tp(Module,Function,Arity,MatchSpec) ->

@@ -384,9 +384,9 @@ tp(PatternList) ->
 tpl(Nodes,Module,Function,Arity,MatchSpec,Opts) ->

     trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,Opts}],[local]).

 

-tpl(Nodes,Module,Function,Arity,MatchSpec) when list(Nodes) ->

+tpl(Nodes,Module,Function,Arity,MatchSpec) when is_list(Nodes) ->
     trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,[]}],[local]);

-tpl(Module,Function,Arity,MatchSpec,Opts) when atom(Module) ->

+tpl(Module,Function,Arity,MatchSpec,Opts) when is_atom(Module) ->
     trace_pattern(all,[{Module,Function,Arity,MatchSpec,Opts}],[local]).

 

 tpl(Module,Function,Arity,MatchSpec) ->

@@ -417,12 +417,12 @@ ctp(Nodes,Module,Function,Arity) ->
 ctp(Module,Function,Arity) ->

     trace_pattern(all,[{Module,Function,Arity,false,[only_loaded]}],[global]).

 

-ctp(Nodes,PatternList) when list(PatternList) ->

+ctp(Nodes,PatternList) when is_list(PatternList) ->
     trace_pattern(Nodes,

 		  lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList),

 		  [global]).

 

-ctp(PatternList) when list(PatternList) ->

+ctp(PatternList) when is_list(PatternList) ->
     trace_pattern(all,

 		  lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList),

 		  [global]).

@@ -445,12 +445,12 @@ ctpl(Nodes,Module,Function,Arity) ->
 ctpl(Module,Function,Arity) ->

     trace_pattern(all,[{Module,Function,Arity,false,[only_loaded]}],[local]).

 

-ctpl(Nodes,PatternList) when list(PatternList) ->

+ctpl(Nodes,PatternList) when is_list(PatternList) ->
     trace_pattern(Nodes,

 		  lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList),

 		  [local]).

 

-ctpl(PatternList) when list(PatternList) ->

+ctpl(PatternList) when is_list(PatternList) ->
     trace_pattern(all,

 		  lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList),

 		  [local]).

@@ -485,19 +485,19 @@ trace_pattern(Nodes,Patterns,FlagList)  ->
 %% specifying a certain pid at all nodes. Or an empty TraceConfList for all

 %% nodes.

 %% When calling several nodes, the nodes are called in parallel.

-tf(Nodes,PidSpec,FlagList) when list(Nodes),list(FlagList) ->

+tf(Nodes,PidSpec,FlagList) when is_list(Nodes),is_list(FlagList) ->
     trace_flags(Nodes,[{PidSpec, FlagList}],true).

 

-tf(Nodes,TraceConfList) when list(Nodes),list(TraceConfList) -> 

+tf(Nodes,TraceConfList) when is_list(Nodes),is_list(TraceConfList) ->
     trace_flags(Nodes,TraceConfList,true);

-tf(PidSpec,FlagList) when list(FlagList) -> 

+tf(PidSpec,FlagList) when is_list(FlagList) ->
     trace_flags(all,[{PidSpec,FlagList}],true).

 

-tf(ArgList) when list(ArgList) ->            % This one has triple functionality!

+tf(ArgList) when is_list(ArgList) ->            % This one has triple functionality!
     case ArgList of

-	[{_Process,Flags}|_] when list(Flags),atom(hd(Flags))-> % A call to all nodes.

+	[{_Process,Flags}|_] when is_list(Flags),is_atom(hd(Flags))-> % A call to all nodes.
 	    trace_flags(all,ArgList,true);

-	[{_Node,TraceConfList}|_] when list(TraceConfList),tuple(hd(TraceConfList)) ->

+	[{_Node,TraceConfList}|_] when is_list(TraceConfList),is_tuple(hd(TraceConfList)) ->
 	    trace_flags(ArgList,true);

 	[{_Node,_TraceConfList,_How}|_] ->

 	    trace_flags(ArgList);

@@ -517,15 +517,15 @@ tf(ArgList) when list(ArgList) ->            % This one has triple functionality
 %% The functions without a Nodes argument means all nodes, in a non-distributed

 %% environment it means the local node.

 %% When calling several nodes, the nodes are called in parallel.

-ctf(Nodes,PidSpec,FlagList) when list(Nodes),list(FlagList) ->

+ctf(Nodes,PidSpec,FlagList) when is_list(Nodes),is_list(FlagList) ->
     trace_flags(Nodes,[{PidSpec,FlagList}],false).

 

-ctf(Nodes,TraceConfList) when list(Nodes),list(TraceConfList) -> 

+ctf(Nodes,TraceConfList) when is_list(Nodes),is_list(TraceConfList) ->
     trace_flags(Nodes,TraceConfList,false);

-ctf(PidSpec,FlagList) when list(FlagList) -> 

+ctf(PidSpec,FlagList) when is_list(FlagList) ->
     trace_flags(all,[{PidSpec,FlagList}],false).

 

-ctf(TraceConfList) when list(TraceConfList) -> 

+ctf(TraceConfList) when is_list(TraceConfList) ->
     trace_flags(all,TraceConfList,false).

 %% -----------------------------------------------------------------------------

 

@@ -668,10 +668,10 @@ init_tpm(Nodes,Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->
 tpm(Mod,Func,Arity,MS) ->

     tpm(all,Mod,Func,Arity,MS).

 

-tpm(Nodes,Mod,Func,Arity,MS) when integer(Arity) ->

+tpm(Nodes,Mod,Func,Arity,MS) when is_integer(Arity) ->
     gen_server:call(?CONTROLLER,

 		    {meta_pattern,Nodes,{tpm,[Mod,Func,Arity,MS]}});

-tpm(Mod,Func,Arity,MS,CallFunc) when integer(Arity) ->

+tpm(Mod,Func,Arity,MS,CallFunc) when is_integer(Arity) ->
     tpm(all,Mod,Func,Arity,MS,CallFunc).

 

 tpm(Nodes,Mod,Func,Arity,MS,CallFunc) ->

@@ -695,11 +695,11 @@ tpm(Nodes,Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) ->
 tpm_tracer(Mod,Func,Arity,MS) ->

     tpm_tracer(all,Mod,Func,Arity,MS).

 

-tpm_tracer(Nodes,Mod,Func,Arity,MS) when integer(Arity) ->

+tpm_tracer(Nodes,Mod,Func,Arity,MS) when is_integer(Arity) ->
     gen_server:call(?CONTROLLER,

 		    {meta_pattern,Nodes,{tpm_tracer,[Mod,Func,Arity,MS]}},

 		    ?CALL_TIMEOUT);

-tpm_tracer(Mod,Func,Arity,MS,CallFunc) when integer(Arity) ->

+tpm_tracer(Mod,Func,Arity,MS,CallFunc) when is_integer(Arity) ->
     tpm_tracer(all,Mod,Func,Arity,MS,CallFunc).

 

 tpm_tracer(Nodes,Mod,Func,Arity,MS,CallFunc) ->

@@ -878,7 +878,7 @@ cancel_suspension() ->
 %%   Status=running|{suspended,SReason}

 %%

 %% Get Status form all or specified runtime components.

-get_status(Nodes) when list(Nodes) ->

+get_status(Nodes) when is_list(Nodes) ->
     gen_server:call(?CONTROLLER,{get_status,Nodes},?CALL_TIMEOUT).

 

 get_status() ->

@@ -918,7 +918,7 @@ get_tracerdata(Nodes) when is_list(Nodes) ->
 list_logs() ->

     gen_server:call(?CONTROLLER,list_logs,?CALL_TIMEOUT).

 

-list_logs(TracerDataOrNodesList) when list(TracerDataOrNodesList) ->

+list_logs(TracerDataOrNodesList) when is_list(TracerDataOrNodesList) ->
     gen_server:call(?CONTROLLER,{list_logs,TracerDataOrNodesList},?CALL_TIMEOUT).

 %% ------------------------------------------------------------------------------

 

@@ -960,17 +960,17 @@ list_logs(TracerDataOrNodesList) when list(TracerDataOrNodesList) ->
 %% Note that the client process using this function will wait until all files

 %% are moved. The job can be cancelled, causing any already copied files to be

 %% removed, by simply terminating the waiting client process.

-fetch_log(DestDir,Prefix) when list(DestDir),list(Prefix) ->

+fetch_log(DestDir,Prefix) when is_list(DestDir),is_list(Prefix) ->
     gen_server:call(?CONTROLLER,{fetch_log,node(),all,DestDir,Prefix},infinity).

 

-fetch_log(ToNode,DestDir,Prefix) when atom(ToNode),list(DestDir),list(Prefix) ->

+fetch_log(ToNode,DestDir,Prefix) when is_atom(ToNode),is_list(DestDir),is_list(Prefix) ->
     gen_server:call(?CONTROLLER,{fetch_log,ToNode,all,DestDir,Prefix},infinity);

 

-fetch_log(LogSpecList,DestDir,Prefix) when list(LogSpecList),list(DestDir),list(Prefix) ->

+fetch_log(LogSpecList,DestDir,Prefix) when is_list(LogSpecList),is_list(DestDir),is_list(Prefix) ->
     gen_server:call(?CONTROLLER,{fetch_log,node(),LogSpecList,DestDir,Prefix},infinity).

 

 fetch_log(ToNode,LogSpecList,DestDir,Prefix)

-  when atom(ToNode),list(LogSpecList),list(DestDir),list(Prefix) ->

+  when is_atom(ToNode),is_list(LogSpecList),is_list(DestDir),is_list(Prefix) ->
     gen_server:call(?CONTROLLER,{fetch_log,ToNode,LogSpecList,DestDir,Prefix},infinity).

 %% ------------------------------------------------------------------------------

 

diff --git a/lib/inviso/src/inviso_c.erl b/lib/inviso/src/inviso_c.erl
index ecbd5b0778..b1597a7f35 100644
--- a/lib/inviso/src/inviso_c.erl
+++ b/lib/inviso/src/inviso_c.erl
@@ -100,7 +100,7 @@ init({_Parent,Options}) ->
     end.
 %% ------------------------------------------------------------------------------
 
-handle_call({subscribe,Pid},_From,LD) when pid(Pid) ->
+handle_call({subscribe,Pid},_From,LD) when is_pid(Pid) ->
     MRef=erlang:monitor(process,Pid),
     {reply,ok,LD#state{subscribers=[{Pid,MRef}|LD#state.subscribers]}};
 handle_call({subscribe,Faulty},_From,LD) ->
@@ -131,7 +131,7 @@ handle_call({change_options,Nodes,Opts},_From,LD) ->
     end;
 handle_call({init_tracing,TracerDataList},_From,LD) ->
     {reply,adapt_reply(LD,do_init_tracing(TracerDataList,LD)),LD};
-handle_call({init_tracing,Nodes,TracerData},_From,LD) when list(Nodes) ->
+handle_call({init_tracing,Nodes,TracerData},_From,LD) when is_list(Nodes) ->
     TracerDataList=
 	lists:map(fun(N)->{N,TracerData} end,started_trace_nodes(Nodes,LD)),
     {reply,adapt_reply(LD,do_init_tracing(TracerDataList,LD)),LD};
@@ -173,7 +173,7 @@ handle_call({fetch_log,ToNode,Spec,Dest,Prefix},From,LD) ->
     end;
 handle_call({delete_log,NodesOrNodeSpecs},_From,LD) ->
     {reply,adapt_reply(LD,do_delete_log(NodesOrNodeSpecs,LD)),LD};
-handle_call({delete_log,Nodes,Specs},_From,LD) when list(Nodes) ->
+handle_call({delete_log,Nodes,Specs},_From,LD) when is_list(Nodes) ->
     Reply=do_delete_log(lists:map(fun(N)->{N,Specs} end,Nodes),LD),
     {reply,adapt_reply(LD,Reply),LD};
 handle_call({delete_log,FaultyNodes,_Specs},_From,LD) ->
@@ -283,7 +283,7 @@ do_change_option(Nodes,Options,LD) ->
 
 do_change_option_2([Node|Tail],Options,LD,Replies) ->
     case get_node_rec(Node,LD) of
-	Rec when record(Rec,node) ->
+	Rec when is_record(Rec,node) ->
 	    Answer=?RUNTIME:change_options(Rec#node.pid,Options),
 	    do_change_option_2(Tail,Options,LD,[{Node,Answer}|Replies]);
 	Error ->
@@ -333,7 +333,7 @@ do_init_tracing_2(What,_LD,_) ->
 %% Returns {ok,Reply} or {error,Reason}.
 distribute_tp(all,Patterns,FlagList,LD) ->
     distribute_tp(started_trace_nodes(all,LD),Patterns,FlagList,LD);
-distribute_tp(Nodes,Patterns,FlagList,LD) when list(Nodes) ->
+distribute_tp(Nodes,Patterns,FlagList,LD) when is_list(Nodes) ->
     RTpids=lists:map(fun(N)->case get_node_rec(N,LD) of
 				 #node{pid=Pid} ->
 				     {Pid,N};
@@ -354,7 +354,7 @@ distribute_tp(Faulty,_,_,_) ->
 %% Returns {ok,Reply} or {error,Reason}.
 distribute_tf(all,Args,How,LD) ->
     distribute_tf(started_trace_nodes(all,LD),Args,How,LD);
-distribute_tf(Nodes,Args,How,LD) when list(Nodes) ->
+distribute_tf(Nodes,Args,How,LD) when is_list(Nodes) ->
     RTpids=lists:map(fun(Node)->
 			     case get_node_rec(Node,LD) of
 				 #node{pid=Pid} ->
@@ -369,7 +369,7 @@ distribute_tf(Faulty,_,_,_) ->
     {error,{badarg,Faulty}}.
 
 %% As above but specific args for each node.
-distribute_tf(NodeArgs,How,LD) when list(NodeArgs) ->
+distribute_tf(NodeArgs,How,LD) when is_list(NodeArgs) ->
     RTpidArgs=lists:map(fun({Node,Args})->
 				case get_node_rec(Node,LD) of
 				    #node{pid=Pid} ->
@@ -384,7 +384,7 @@ distribute_tf(Faulty,_,_) ->
     {error,{badarg,Faulty}}.
 
 %% As above but both specific args for each node and How (set or remove flag).
-distribute_tf(NodeArgHows,LD) when list(NodeArgHows) ->
+distribute_tf(NodeArgHows,LD) when is_list(NodeArgHows) ->
     RTpidArgHows=
 	lists:map(fun({Node,Args,How}) ->
 			  case get_node_rec(Node,LD) of
@@ -405,7 +405,7 @@ distribute_tf(Faulty,_) ->
 %% Returns {ok,Reply} or {error,Reason}.
 distribute_metapattern(all,Args,LD) ->
     distribute_metapattern(started_trace_nodes(all,LD),Args,LD);
-distribute_metapattern(Nodes,Args,LD) when list(Nodes) ->
+distribute_metapattern(Nodes,Args,LD) when is_list(Nodes) ->
     RTpids=lists:map(fun(N)->case get_node_rec(N,LD) of
 				 #node{pid=Pid} ->
 				     {Pid,N};
@@ -480,7 +480,7 @@ do_cancel_suspension_2(Faulty,_,_) ->
 %% Return {ok,Reply} or {error,Reason}.
 do_stop_tracing(all,LD) ->
     do_stop_tracing(started_trace_nodes(all,LD),LD);
-do_stop_tracing(Nodes,LD) when list(Nodes) ->
+do_stop_tracing(Nodes,LD) when is_list(Nodes) ->
     RTpids=lists:map(fun(N)->case get_node_rec(N,LD) of
 				 #node{pid=Pid} ->
 				     {Pid,N};
@@ -580,7 +580,7 @@ do_list_logs_2(Other,_LD,_Replies) ->
 %% proper strings.
 do_fetch_log(ToNode,all,Dest,Prefix,From,LD) ->
     do_fetch_log(ToNode,started_trace_nodes(all,LD),Dest,Prefix,From,LD);
-do_fetch_log(ToNode,Specs,Dest,Prefix,From,LD) when list(Dest),list(Prefix) ->
+do_fetch_log(ToNode,Specs,Dest,Prefix,From,LD) when is_list(Dest),is_list(Prefix) ->
     CollectPid=spawn_link(ToNode,?MODULE,log_rec_init,[self(),Dest,Prefix,From]),
     do_fetch_log_2(Specs,LD,CollectPid,[],[]);
 do_fetch_log(_ToNode,_Specs,Dest,Prefix,From,_LD) ->
@@ -639,7 +639,7 @@ do_delete_log(NodeSpecs,LD) ->
 			    LD,[]);
 	false ->
 	    if
-		list(NodeSpecs),list(hd(NodeSpecs)) -> % A list of files.
+		is_list(NodeSpecs),is_list(hd(NodeSpecs)) -> % A list of files.
 		    do_delete_log_2(lists:map(fun(N)->{N,NodeSpecs} end,
 					      started_trace_nodes(all,LD)),
 				    LD,[]);
@@ -785,9 +785,9 @@ check_options(Options, Context) ->
 
 check_options_2([],_Context,Result) ->
     {ok,Result};
-check_options_2([{subscribe,Pid}|OptionsTail],start,Result) when pid(Pid) ->
+check_options_2([{subscribe,Pid}|OptionsTail],start,Result) when is_pid(Pid) ->
     check_options_2(OptionsTail,start,[{subscribe,Pid}|Result]);
-check_options_2([{unsubscribe,Pid}|OptionsTail],start,Result) when pid(Pid) ->
+check_options_2([{unsubscribe,Pid}|OptionsTail],start,Result) when is_pid(Pid) ->
     check_options_2(OptionsTail,start,[{unsubscribe,Pid}|Result]);
 check_options_2([{dependency,How}|OptionsTail],Context,Result) ->
     check_options_2(OptionsTail,Context,[{dependency,How}|Result]);
@@ -819,12 +819,12 @@ initiate_state(Options) ->
 	    LD1#state{distributed=true}
     end.
 
-initiate_state_2([{subscribe,Proc}|Tail],LD) when pid(Proc);atom(Proc)->
+initiate_state_2([{subscribe,Proc}|Tail],LD) when is_pid(Proc);is_atom(Proc)->
     MRef=erlang:monitor(process,Proc),
     initiate_state_2(Tail,LD#state{subscribers=[{Proc,MRef}|LD#state.subscribers]});
-initiate_state_2([Opt|Tail],LD) when tuple(Opt),size(Opt)>=1 ->
+initiate_state_2([Opt|Tail],LD) when is_tuple(Opt),size(Opt)>=1 ->
     initiate_state_2(Tail,initiate_state_3(element(1,Opt),Opt,LD));
-initiate_state_2([Opt|Tail],LD) when atom(Opt) ->
+initiate_state_2([Opt|Tail],LD) when is_atom(Opt) ->
     initiate_state_2(Tail,initiate_state_3(Opt,Opt,LD));
 initiate_state_2([_|Tail],LD) ->
     initiate_state_2(Tail,LD);
@@ -853,9 +853,9 @@ initiate_state_is_rt_option(_) -> false.
 %% or more values associated with the Parameter, or just an atom.
 merge_options([], Options) ->
     Options;
-merge_options([T|DefaultTail],Options) when tuple(T),size(T)>=1 ->
+merge_options([T|DefaultTail],Options) when is_tuple(T),size(T)>=1 ->
     merge_options(DefaultTail,merge_options_2(element(1,T),T,Options));
-merge_options([Param|DefaultTail],Options) when atom(Param) ->
+merge_options([Param|DefaultTail],Options) when is_atom(Param) ->
     merge_options(DefaultTail,merge_options_2(Param,Param,Options));
 merge_options([_|DefaultTail],Options) ->    % Strange, bad default option!
     merge_options(DefaultTail,Options).
@@ -868,7 +868,7 @@ merge_options_2(Param,Opt,Options) ->
 	    [Opt|Options]
     end.
 
-merge_options_find(Param,[T|_]) when tuple(T),element(1,T)==Param ->
+merge_options_find(Param,[T|_]) when is_tuple(T),element(1,T)==Param ->
     true;
 merge_options_find(Param,[Param|_]) ->
     true;
@@ -883,7 +883,7 @@ merge_options_find(_,[]) ->
 %% It also checks the formatting of the tracerdata since runtime components
 %% does not accept too badly formatted tracerdata.
 %% Returns {ok,NewTraceData} or {error,Reason}.
-check_modify_tracerdata(TracerData,LoopData) when list(TracerData) ->
+check_modify_tracerdata(TracerData,LoopData) when is_list(TracerData) ->
     case lists:keysearch(trace,1,TracerData) of
 	{value,{_,TraceTD}} ->               % Examine the trace part.
 	    case check_modify_tracerdata(TraceTD,LoopData) of
@@ -908,7 +908,7 @@ check_modify_tracerdata({relayer,Collector},LoopData) when is_atom(Collector) ->
     end;
 check_modify_tracerdata({Type,Data},_LoopData) when Type==ip;Type==file ->
     {ok,{Type,Data}};
-check_modify_tracerdata({Handler,Data},_LoopData) when function(Handler) ->
+check_modify_tracerdata({Handler,Data},_LoopData) when is_function(Handler) ->
     {ok,{Handler,Data}};
 check_modify_tracerdata(Data,_LoopData) ->
     {error,{bad_tracerdata,Data}}.
@@ -999,7 +999,7 @@ set_node_rec_2(Rec,[NodeRec|Tail]) ->
 
 %% Help function finding a node record for Node in a list of #node or in loopdata.
 %% Returns the #node in question or {error,not_an_added_node}.
-get_node_rec(Node,NodeList) when list(NodeList) ->
+get_node_rec(Node,NodeList) when is_list(NodeList) ->
     get_node_rec_2(Node,NodeList);
 get_node_rec(Node,#state{nodes=NodeList}) ->
     get_node_rec_2(Node,NodeList).
@@ -1016,7 +1016,7 @@ get_node_rec_2(Node,[_NodeRec|Tail]) ->
 %% structure. Returns a new list of #node or a new loopdata structure.
 delete_node_rec(Node,LD=#state{nodes=NodeList}) ->
     LD#state{nodes=delete_node_rec_2(Node,NodeList)};
-delete_node_rec(Node,NodeList) when list(NodeList) ->
+delete_node_rec(Node,NodeList) when is_list(NodeList) ->
     delete_node_rec_2(Node,NodeList).
 
 delete_node_rec_2(_,[]) ->
@@ -1059,7 +1059,7 @@ log_rec_init(Parent,Dest,Prefix,From={ClientPid,_}) ->
 			  Fetchers),
 	    CMRef=erlang:monitor(process,ClientPid), % Monitor the client.
 	    case log_rec_loop(Dest,Prefix,RTs,InitialReplies,CMRef) of
-		Reply when list(Reply) ->   % It is an ok value.
+		Reply when is_list(Reply) ->   % It is an ok value.
 		    gen_server:reply(From,{ok,Reply});
 		{error,Reason} ->
 		    gen_server:reply(From,{error,Reason});
diff --git a/lib/inviso/src/inviso_lfm.erl b/lib/inviso/src/inviso_lfm.erl
index 362176c776..085048518c 100644
--- a/lib/inviso/src/inviso_lfm.erl
+++ b/lib/inviso/src/inviso_lfm.erl
@@ -87,13 +87,13 @@
 %%   close the outfile.

 %%

 %% Using merge/2 assumes you want to use default handlers writing to a file.

-merge(Files,OutputFile) when list(OutputFile) ->

+merge(Files,OutputFile) when is_list(OutputFile) ->
     merge(Files,fun outfile_opener/1,fun outfile_writer/4,fun outfile_closer/1,OutputFile,off).

-merge(Files,WorkHandlerFun,HandlerData) when function(WorkHandlerFun) ->

+merge(Files,WorkHandlerFun,HandlerData) when is_function(WorkHandlerFun) ->
     merge(Files,void,WorkHandlerFun,void,HandlerData,off);

-merge(Files,OutputFile,Dbg) when list(OutputFile) ->

+merge(Files,OutputFile,Dbg) when is_list(OutputFile) ->
     merge(Files,fun outfile_opener/1,fun outfile_writer/4,fun outfile_closer/1,OutputFile,Dbg).

-merge(Files,WorkHandlerFun,HandlerData,Dbg) when function(WorkHandlerFun) ->

+merge(Files,WorkHandlerFun,HandlerData,Dbg) when is_function(WorkHandlerFun) ->
     merge(Files,void,WorkHandlerFun,void,HandlerData,Dbg).

 merge(Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerData) ->

     merge(Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerData,off).

@@ -123,7 +123,7 @@ init_receiver(From,Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerDat
 	{ok,Readers} ->

 	    process_flag(trap_exit,true),

 	    if

-		function(BeginHandlerFun) ->

+		is_function(BeginHandlerFun) ->
 		    case catch BeginHandlerFun(HandlerData) of

 			{ok,NewHandlerData} ->

 			    init_receiver_2(From,WorkHandlerFun,EndHandlerFun,

@@ -145,7 +145,7 @@ init_receiver_2(From,WorkHandlerFun,EndHandlerFun,HandlerData,Dbg,Readers) ->
     {Reply,NewHandlerData}=

 	loop(From,WorkHandlerFun,HandlerData,NewReaders,EntryStruct,Dbg,0),

     if

-	function(EndHandlerFun) ->

+	is_function(EndHandlerFun) ->
 	    case EndHandlerFun(NewHandlerData) of

 		ok ->

 		    From ! {reply,self(),Reply};

@@ -207,7 +207,7 @@ find_oldest_entry(EntryStruct) ->
     case list_all_entries(EntryStruct) of

 	[] ->                               % The we are done!

 	    done;

-	EntryList when list(EntryList) ->   % Find smallest timestamp in here then.

+	EntryList when is_list(EntryList) ->   % Find smallest timestamp in here then.
 	    {Pid,Node,PidMappings,_TS,Term}=

 		lists:foldl(fun({P,N,PMap,TS1,T},{_P,_N,_PMap,TS0,_T}) when TS1<TS0 ->

 				    {P,N,PMap,TS1,T};

diff --git a/lib/inviso/src/inviso_lfm_tpfreader.erl b/lib/inviso/src/inviso_lfm_tpfreader.erl
index d0db4b6d02..6de4d11fe0 100644
--- a/lib/inviso/src/inviso_lfm_tpfreader.erl
+++ b/lib/inviso/src/inviso_lfm_tpfreader.erl
@@ -60,9 +60,9 @@
 %%       File=string()

 %% Spawn on this function to start a reader process for trace-port generated

 %% logfiles, possibly with inviso-generated ti-files.

-init(RecPid,LogFiles=[Tuple|_]) when tuple(Tuple) -> % Only one LogFiles.

+init(RecPid,LogFiles=[Tuple|_]) when is_tuple(Tuple) -> % Only one LogFiles.
     init(RecPid,[LogFiles]);

-init(RecPid,FileStruct) when list(FileStruct) ->

+init(RecPid,FileStruct) when is_list(FileStruct) ->
     logfiles_loop(RecPid,FileStruct).

 %% -----------------------------------------------------------------------------

 

@@ -135,7 +135,7 @@ read_traceport_file(FileName,FD) ->
     case file:read(FD,5) of                 % Trace-port file entries start with 5 bytes.

 	{ok,<<0,Size:32>>} ->               % Each entry in a traceport file begins.

 	    case file:read(FD,Size) of

-		{ok,Bin} when binary(Bin),size(Bin)=:=Size ->

+		{ok,Bin} when is_binary(Bin),size(Bin)=:=Size ->
 		    try binary_to_term(Bin) of

 			Term ->             % Bin was a properly formatted term!

 			    {ok,Term}

@@ -244,7 +244,7 @@ find_timestamp_in_term(_) ->                % Don't know if there is a timestamp
 %%   (1) plain straight raw binary files.

 handle_ti_file(FileStruct) ->

     case lists:keysearch(ti_log,1,FileStruct) of

-	{value,{_,[FileName]}} when list(FileName) -> % There is one ti-file in this set.

+	{value,{_,[FileName]}} when is_list(FileName) -> % There is one ti-file in this set.
 	    case file:open(FileName,[read,raw,binary]) of

 		{ok,FD} ->

 		    TIdAlias=ets:new(list_to_atom("inviso_ti_atab_"++pid_to_list(self())),

@@ -308,9 +308,9 @@ handle_ti_file_2(FD,TIdAlias,TIdUnalias) ->
 handle_logfiles(FileStruct) ->

     handle_logfiles_2(lists:keysearch(trace_log,1,FileStruct)).

 

-handle_logfiles_2({value,{_,[FileName]}}) when list(FileName)-> % One single plain file.

+handle_logfiles_2({value,{_,[FileName]}}) when is_list(FileName)-> % One single plain file.
     [FileName];

-handle_logfiles_2({value,{_,Files}}) when list(Files) -> % A wrap-set.

+handle_logfiles_2({value,{_,Files}}) when is_list(Files) -> % A wrap-set.
     handle_logfile_sort_wrapset(Files);

 handle_logfiles_2(_) ->

     [].                                      % Pretend there were no files otherwise.

diff --git a/lib/inviso/src/inviso_tool.erl b/lib/inviso/src/inviso_tool.erl
index 7126ba4387..05158f58fe 100644
--- a/lib/inviso/src/inviso_tool.erl
+++ b/lib/inviso/src/inviso_tool.erl
@@ -267,9 +267,9 @@ stop(UntouchedNodes) ->
 %% tracing.

 reconnect_nodes() ->

     gen_server:call(?MODULE,{reconnect_nodes,local_runtime},?CALL_TIMEOUT).

-reconnect_nodes(Node) when atom(Node) ->

+reconnect_nodes(Node) when is_atom(Node) ->
     reconnect_nodes([Node]);

-reconnect_nodes(Nodes) when list(Nodes) ->

+reconnect_nodes(Nodes) when is_list(Nodes) ->
     gen_server:call(?MODULE,{reconnect_nodes,Nodes},?CALL_TIMEOUT).

 %% -----------------------------------------------------------------------------

 

@@ -572,7 +572,7 @@ reactivator_reply(TPid,Counter) ->
 

 init(Config) ->

     case fetch_configuration(Config) of     % From conf-file and Config.

-	{ok,LD} when record(LD,ld) ->

+	{ok,LD} when is_record(LD,ld) ->
 	    case start_inviso_at_c_node(LD) of

 		{ok,CPid} ->

 		    LD2=start_runtime_components(LD),

@@ -650,7 +650,7 @@ start_runtime_components_2([],_,LD) ->
 

 start_runtime_components_mk_opts(Node,{M,F,Args}) ->

     case catch apply(M,F,[Node|Args]) of

-	{ok,Opts} when list(Opts) ->

+	{ok,Opts} when is_list(Opts) ->
 	    start_runtime_component_mk_opts_add_dependency(Opts);

 	_ ->

 	    [?DEFAULT_DEPENDENCY]

@@ -698,7 +698,7 @@ handle_call({reconnect_nodes,Nodes},_From,LD) ->
 		    {reply,

 		     build_reconnect_nodes_reply(Nodes,Nodes2,NodesErr,NewLD#ld.nodes),

 		     NewLD};

-		list(Nodes) ->

+		is_list(Nodes) ->
 		    {reply,

 		     {ok,build_reconnect_nodes_reply(Nodes,Nodes2,NodesErr,NewLD#ld.nodes)},

 		     NewLD}

@@ -711,7 +711,7 @@ handle_call({start_session,MoreTDGargs},_From,LD=#ld{session_state=SState}) ->
     case is_tracing(SState) of

 	false ->                               % No session running.

 	    if

-		list(MoreTDGargs) ->

+		is_list(MoreTDGargs) ->
 		    DateTime=calendar:universal_time(),

 		    {M,F,Args}=LD#ld.tdg,

 		    TDGargs=inviso_tool_lib:mk_tdg_args(DateTime,MoreTDGargs++Args),

@@ -757,15 +757,15 @@ handle_call({reinitiate_session,Nodes},_From,LD=#ld{session_state=SState}) ->
     end;

 

 handle_call({restore_session,{FileName,MoreTDGargs}},_From,LD=#ld{chl=OldCHL})

-  when list(MoreTDGargs) ->

+  when is_list(MoreTDGargs) ->
     case is_tracing(LD#ld.session_state) of

 	false ->

 	    case catch make_absolute_path(FileName,LD#ld.dir) of

-		AbsFileName when list(AbsFileName) ->

+		AbsFileName when is_list(AbsFileName) ->
 		    case file:read_file(AbsFileName) of

 			{ok,Bin} ->

 			    if

-				list(MoreTDGargs) ->

+				is_list(MoreTDGargs) ->
 				    case catch replace_history_chl(OldCHL,

 								   binary_to_term(Bin)) of

 					{ok,CHL} -> % The file was well formatted.

@@ -803,7 +803,7 @@ handle_call({restore_session,MoreTDGargs},_From,LD=#ld{chl=CHL}) ->
 	    case history_exists_chl(CHL) of

 		true ->                        % There is a history to redo.

 		    if

-			list(MoreTDGargs) ->

+			is_list(MoreTDGargs) ->
 			    case h_restore_session(MoreTDGargs,LD) of

 				{ok,{SessionNr,ReturnVal,NewLD}} ->

 				    {reply,

@@ -879,7 +879,7 @@ handle_call({sync_atc,{TC,Id,Vars,TimeOut}},_From,LD=#ld{session_state=SState})
     case is_tracing(SState) of

 	true ->

 	    if

-		integer(TimeOut);TimeOut==infinity ->

+		is_integer(TimeOut);TimeOut==infinity ->
 		    case h_sync_atc(TC,Id,Vars,TimeOut,LD) of

 			{ok,NewLD,Result} ->

 			    {reply,Result,NewLD};

@@ -897,7 +897,7 @@ handle_call({sync_rtc,{TC,Vars,TimeOut}},_From,LD=#ld{session_state=SState}) ->
     case is_tracing(SState) of

 	true ->

 	    if

-		integer(TimeOut);TimeOut==infinity ->

+		is_integer(TimeOut);TimeOut==infinity ->
 		    case h_sync_rtc(TC,Vars,TimeOut,LD) of

 			{ok,NewLD,Result} ->

 			    {reply,Result,NewLD};

@@ -929,7 +929,7 @@ handle_call({sync_dtc,{TC,Id,TimeOut}},_From,LD=#ld{session_state=SState}) ->
     case is_tracing(SState) of              % Check that we are tracing now.

 	true ->

 	    if

-		integer(TimeOut);TimeOut==infinity ->

+		is_integer(TimeOut);TimeOut==infinity ->
 		    case h_sync_dtc(TC,Id,TimeOut,LD) of

 			{ok,NewLD,Result} ->

 			    {reply,Result,NewLD};

@@ -947,7 +947,7 @@ handle_call({inviso,{Cmd,Args}},_From,LD=#ld{session_state=SState}) ->
     case is_tracing(SState) of

 	true ->

 	    if

-		list(Args) ->

+		is_list(Args) ->
 		    case h_inviso(Cmd,Args,LD) of

 			{ok,{Reply,NewLD}} ->

 			    {reply,Reply,NewLD};

@@ -1156,7 +1156,7 @@ h_reconnect_nodes(local_runtime,LD=#ld{nodes=NodesD}) -> % Non-distributed.
 	_ ->                                   % Allready connected!

 	    {ok,{[],{error,already_connected},LD}}

     end;

-h_reconnect_nodes(Nodes,LD=#ld{nodes=NodesD}) when list(Nodes) ->

+h_reconnect_nodes(Nodes,LD=#ld{nodes=NodesD}) when is_list(Nodes) ->
     {Nodes2,NodesErr}=

 	lists:foldl(fun(N,{Nodes2,NodesErr})->

 			    case get_state_nodes(N,NodesD) of

@@ -1246,7 +1246,7 @@ h_start_session_ctp_all_2([],Errors,Nodes) ->
 %% Help function doing the actual init_tracing.

 h_start_session_2(undefined,TracerData,_Errors) -> % Non distributed case.

     case inviso:init_tracing(TracerData) of

-	{ok,LogResult} when list(LogResult) ->

+	{ok,LogResult} when is_list(LogResult) ->
 	    {ok,{ok,LogResult}};

 	{error,already_initated} ->         % Perhaps adopted!?

 	    {ok,{error,already_initiated}}; % Not necessarily wrong.

@@ -1360,7 +1360,7 @@ h_reinitiate_session_2(local_runtime,NodesD,undefined) -> % Non distributed case
 	_ ->

 	    {ok,{[],{error,already_in_session}}}

     end;

-h_reinitiate_session_2(Nodes,NodesD,CNode) when list(Nodes) ->

+h_reinitiate_session_2(Nodes,NodesD,CNode) when is_list(Nodes) ->
     {ok,lists:foldl(fun(N,{Nodes2,NodesErr})->

 			    case get_state_nodes(N,NodesD) of

 				{inactive,running} -> % Only ok case.

@@ -1515,7 +1515,7 @@ h_atc(TC,Id,Vars,LD=#ld{c_node=CNode,tc_dict=TCdict,chl=CHL},Nodes) ->
 		    case check_bindings(Vars,TraceCase) of

 			{ok,Bindings} ->    % Necessary vars exists in Vars.

 			    if

-				list(Nodes) -> % Nodes predefined.

+				is_list(Nodes) -> % Nodes predefined.
 				    h_atc_2(TC,Id,CNode,CHL,LD,TraceCase,Bindings,Nodes);

 				true ->     % Use all tracing and running nodes.

 				    Nodes1=get_nodenames_running_nodes(LD#ld.nodes),

@@ -1769,13 +1769,13 @@ h_reactivate(Node,CNode) ->
 h_save_history(HDir,Dir,FileName,SortedLog) ->

     Dir0=

 	if

-	    list(HDir) ->                   % There is a history dir specified.

+	    is_list(HDir) ->                   % There is a history dir specified.
 		HDir;                       % Use it then.

 	    true ->

 		Dir                         % Else use the tool dir.

 	end,

     case catch make_absolute_path(FileName,Dir0) of

-	AbsFileName when list(AbsFileName) ->

+	AbsFileName when is_list(AbsFileName) ->
 	    Log2=build_saved_history_data(SortedLog), % Remove stopped tracecases.

 	    case file:write_file(AbsFileName,term_to_binary(Log2)) of

 		ok ->

@@ -1801,7 +1801,7 @@ h_get_autostart_data(local_runtime,_,Dependency,ASD,M,F,TDGargs,OptsG) ->
     Opts=[Dependency|lists:keydelete(dependency,1,Opts0)],

     {ok,{ASD,{ok,{Opts,{tdg,{M,F,CompleteTDGargs}}}}}};

 

-h_get_autostart_data(Nodes,CNode,Dependency,ASD,M,F,TDGargs,OptsG) when list(Nodes) ->

+h_get_autostart_data(Nodes,CNode,Dependency,ASD,M,F,TDGargs,OptsG) when is_list(Nodes) ->
     {ok,{ASD,h_get_autostart_data_2(Nodes,CNode,Dependency,M,F,TDGargs,OptsG)}};

 h_get_autostart_data(Nodes,_CNode,_Dependency,_ASD,_M,_F,_TDGargs,_OptsG) ->

     {error,{badarg,Nodes}}.

@@ -2144,14 +2144,14 @@ expand_module_regexps(Args,_RegExpNode,_Nodes,false) ->
     {ok,Args};

 expand_module_regexps([PatternList],RegExpNode,Nodes,{tp,1,1}) ->

     case catch expand_module_regexps_tp(PatternList,RegExpNode,Nodes) of

-	NewPatternList when list(NewPatternList) ->

+	NewPatternList when is_list(NewPatternList) ->
 	    {ok,[NewPatternList]};

 	{error,Reason} ->

 	    {error,Reason}

     end;

 expand_module_regexps([PatternList],RegExpNode,Nodes,{ctp,1,1}) ->

     case catch expand_module_regexps_ctp(PatternList,RegExpNode,Nodes) of

-	NewPatternList when list(NewPatternList) ->

+	NewPatternList when is_list(NewPatternList) ->
 	    {ok,[NewPatternList]};

 	{error,Reason} ->

 	    {error,Reason}

@@ -2164,9 +2164,9 @@ expand_module_regexps([M,F,Arity],RegExpNode,Nodes,{ctp,3,1}) ->
     expand_module_regexps([[{M,F,Arity}]],RegExpNode,Nodes,{ctp,1,1}).

 

 

-expand_module_regexps_tp([E={M,_,_,_,_}|Rest],RegExpNode,Nodes) when atom(M) ->

+expand_module_regexps_tp([E={M,_,_,_,_}|Rest],RegExpNode,Nodes) when is_atom(M) ->
     [E|expand_module_regexps_tp(Rest,RegExpNode,Nodes)];

-expand_module_regexps_tp([{M,F,Arity,MS,Opts}|Rest],RegExpNode,Nodes) when list(M);tuple(M) ->

+expand_module_regexps_tp([{M,F,Arity,MS,Opts}|Rest],RegExpNode,Nodes) when is_list(M);is_tuple(M) ->
     case inviso_tool_lib:expand_module_names([RegExpNode],

 					     M,

 					     [{expand_only_at,RegExpNode}]) of

@@ -2193,9 +2193,9 @@ expand_module_regexps_tp_2([M|MRest],F,Arity,MS,Opts,Rest,RegExpNode,Nodes) ->
 expand_module_regexps_tp_2([],_,_,_,_,Rest,RegExpNode,Nodes) ->

     expand_module_regexps_tp(Rest,RegExpNode,Nodes).

 

-expand_module_regexps_ctp([E={M,_,_}|Rest],RegExpNode,Nodes) when atom(M) ->

+expand_module_regexps_ctp([E={M,_,_}|Rest],RegExpNode,Nodes) when is_atom(M) ->
     [E|expand_module_regexps_ctp(Rest,RegExpNode,Nodes)];

-expand_module_regexps_ctp([{M,F,Arity}|Rest],RegExpNode,Nodes) when list(M);tuple(M) ->

+expand_module_regexps_ctp([{M,F,Arity}|Rest],RegExpNode,Nodes) when is_list(M);is_tuple(M) ->
     case inviso_tool_lib:expand_module_names([RegExpNode],

 					     M,

 					     [{expand_only_at,RegExpNode}]) of

@@ -2450,7 +2450,7 @@ fetch_configuration(Config) ->
 %% Returns {ok,FileName} or 'false'. The latter if no name could be determined.

 fetch_config_filename(Config) ->

     case catch lists:keysearch(config_file,1,Config) of

-	{value,{_,FName}} when list(FName) ->

+	{value,{_,FName}} when is_list(FName) ->
 	    {ok,FName};

 	_ ->                                % No filename in the start argument.

 	    fetch_config_filename_2()

@@ -2458,7 +2458,7 @@ fetch_config_filename(Config) ->
 

 fetch_config_filename_2() ->

     case application:get_env(inviso_tool_config_file) of

-	{ok,FName} when list(FName) ->

+	{ok,FName} when is_list(FName) ->
 	    {ok,FName};

 	_ ->                                % Application parameter not specified.

 	    false                           % Means no config file will be used.

@@ -2499,14 +2499,14 @@ read_config_list_2(LD,Terms,Tag) ->
 %% Function updating a named field in a record. Returns a new record. Note that

 %% this function must be maintained due the fact that field names are removed

 %% at compile time.

-update_ld_record(LD,nodes,Value) when record(LD,ld) ->

+update_ld_record(LD,nodes,Value) when is_record(LD,ld) ->
     case mk_nodes(Value) of

 	{ok,NodesD} ->

 	    LD#ld{nodes=NodesD};

 	error ->

 	    LD

     end;

-update_ld_record(LD,Tag,Value) when record(LD,ld) ->

+update_ld_record(LD,Tag,Value) when is_record(LD,ld) ->
     Index=

 	case Tag of

 	    c_node ->                       % atom()

@@ -2546,7 +2546,7 @@ update_ld_record(LD,Tag,Value) when record(LD,ld) ->
 %%   ActivationFileName=DeactivationFileName=string()

 read_trace_case_definitions(LD) ->

     case LD#ld.tc_def_file of

-	TCfileName when list(TCfileName) ->

+	TCfileName when is_list(TCfileName) ->
 	    case catch file:consult(TCfileName) of

 		{ok,Terms} ->

 		    Dir=LD#ld.dir,          % The working directory of the tool.

@@ -2636,8 +2636,8 @@ get_status(CNode,Nodes) ->
 %%     We can end up here if a session is stopped with this node suspended.

 

 %% Returns a nodes database structure filled with the nodes Nodes.

-mk_nodes(Nodes) when list(Nodes) ->

-    {ok,lists:map(fun(N) when atom(N)->{N,down} end,Nodes)};

+mk_nodes(Nodes) when is_list(Nodes) ->
+    {ok,lists:map(fun(N) when is_atom(N)->{N,down} end,Nodes)};
 mk_nodes(local_runtime) ->                  % The non-distributed case.

     down;

 mk_nodes(_Nodes) ->

@@ -2783,7 +2783,7 @@ set_suspended_nodes(_,{up,{State,_}}) ->
 %% This function is called when reactivation is completed. Hence it moves the

 %% node to no longer suspended. Note this can mean that the node is either

 %% tracing or inactive. Reactivation is not allowed for a node have trace_failure.

-set_running_nodes(Node,NodesD) when list(NodesD) ->

+set_running_nodes(Node,NodesD) when is_list(NodesD) ->
     case lists:keysearch(Node,1,NodesD) of

 	{value,{_,AvailableStatus}} ->

 	    lists:keyreplace(Node,1,NodesD,{Node,set_running_nodes_2(AvailableStatus)});

@@ -2902,7 +2902,7 @@ get_available_nodes([]) ->
 %% suspended or not.

 %% Returns {State,Status} | reactivating | down

 %% where 

-get_state_nodes(Node,NodesD) when list(NodesD) ->

+get_state_nodes(Node,NodesD) when is_list(NodesD) ->
     case lists:keysearch(Node,1,NodesD) of

 	{value,{_,AvailableStatus}} ->

 	    get_state_nodes_2(AvailableStatus);

diff --git a/lib/inviso/src/inviso_tool_lib.erl b/lib/inviso/src/inviso_tool_lib.erl
index 20a8b509ae..7953acedd6 100644
--- a/lib/inviso/src/inviso_tool_lib.erl
+++ b/lib/inviso/src/inviso_tool_lib.erl
@@ -83,7 +83,7 @@ inviso_cmd(NodeName,Func,Args) ->
 %% In the non-distributed case the singlenode_expansion will be returned.

 expand_module_names(_Nodes,Mod={_,'_'},_) ->

     {error,{faulty_regexp_combination,Mod}};

-expand_module_names(Nodes,{DirStr,ModStr},Opts) when list(DirStr), list(ModStr) ->

+expand_module_names(Nodes,{DirStr,ModStr},Opts) when is_list(DirStr), is_list(ModStr) ->
     case expand_module_names_special_regexp(DirStr) of

 	{ok,NewDirStr} ->

 	    case expand_module_names_special_regexp(ModStr) of

@@ -97,11 +97,11 @@ expand_module_names(Nodes,{DirStr,ModStr},Opts) when list(DirStr), list(ModStr)
     end;

 expand_module_names(_,'_',_Opts) ->          % If we want to trace all modules

     wildcard;                                % we shall not expand it.

-expand_module_names(_Nodes,Mod,_Opts) when atom(Mod) ->

+expand_module_names(_Nodes,Mod,_Opts) when is_atom(Mod) ->
     module;                                  % If it is an atom, no expansion.

 expand_module_names(Nodes,"*",Opts) ->       % Treat this as a reg.exp.

     expand_module_names(Nodes,".*",Opts);

-expand_module_names(Nodes,ModStr,Opts) when list(ModStr) ->

+expand_module_names(Nodes,ModStr,Opts) when is_list(ModStr) ->
     case expand_module_names_special_regexp(ModStr) of

 	{ok,NewModStr} ->

 	    expand_module_names_2(Nodes,NewModStr,Opts);

@@ -115,7 +115,7 @@ expand_module_names_2(Nodes,ModStr,Opts) ->
     case get_expand_regexp_at_opts(Opts) of

 	{ok,Node} ->                         % Expansion only at this node.

 	    case inviso_rt_lib:expand_regexp([Node],ModStr,Opts) of

-		[{Node,Modules}] when list(Modules) ->

+		[{Node,Modules}] when is_list(Modules) ->
 		    {singlenode_expansion,Modules};

 		[{Node,_}] ->                % Most likely badrpc.

 		    {error,{faulty_node,Node}}

@@ -130,7 +130,7 @@ expand_module_names_2(Nodes,DirStr,ModStr,Opts) ->
     case get_expand_regexp_at_opts(Opts) of

 	{ok,Node} ->                         % Expansion only at this node.

 	    case inviso_rt_lib:expand_regexp([Node],DirStr,ModStr,Opts) of

-		[{Node,Modules}] when list(Modules) ->

+		[{Node,Modules}] when is_list(Modules) ->
 		    {singlenode_expansion,Modules};

 		[{Node,_}] ->                % Most likely badrpc.

 		    {error,{faulty_node,Node}}

@@ -186,12 +186,12 @@ make_patterns(Catches,Opts,Dbg,NodeModsOrMods,F,A,MS) ->
 	    make_patterns_2(Catches,OwnArg,Dbg,NodeModsOrMods,F,A,MS)

     end.

 	    

-make_patterns_2(Catches,OwnArg,Dbg,[{Node,Mods}|Rest],F,A,MS) when list(Mods) ->

+make_patterns_2(Catches,OwnArg,Dbg,[{Node,Mods}|Rest],F,A,MS) when is_list(Mods) ->
     TPs=make_patterns_3(Catches,OwnArg,Dbg,Mods,F,A,MS,[]),

     [{Node,join_patterns(TPs)}|make_patterns_2(Catches,OwnArg,Dbg,Rest,F,A,MS)];

 make_patterns_2(Catches,OwnArg,Dbg,[{_Node,_}|Rest],F,A,MS) -> % badrpc!?

     make_patterns_2(Catches,OwnArg,Dbg,Rest,F,A,MS);

-make_patterns_2(Catches,OwnArg,Dbg,Modules,F,A,MS) when list(Modules) ->

+make_patterns_2(Catches,OwnArg,Dbg,Modules,F,A,MS) when is_list(Modules) ->
     TPs=make_patterns_3(Catches,OwnArg,Dbg,Modules,F,A,MS,[]),

     join_patterns(TPs);

 make_patterns_2(_,_,_,[],_,_,_) ->

@@ -330,7 +330,7 @@ get_datetime_from_tdg_args([DateTime|_]) ->
 %% Returns a list.

 get_ownarg_opts(Opts) ->

     case lists:keysearch(arg,1,Opts) of

-	{value,{_,OwnArg}} when list(OwnArg) ->

+	{value,{_,OwnArg}} when is_list(OwnArg) ->
 	    OwnArg;

 	{value,{_,OwnArg}} ->

 	    [OwnArg];

@@ -350,7 +350,7 @@ get_disable_safety_opts(Opts) ->
 

 get_expand_regexp_at_opts(Opts) ->

     case lists:keysearch(expand_only_at,1,Opts) of

-	{value,{_,Node}} when atom(Node) ->

+	{value,{_,Node}} when is_atom(Node) ->
 	    {ok,Node};

 	_ ->

 	    false

diff --git a/lib/inviso/test/Makefile b/lib/inviso/test/Makefile
index 27fe99703a..cd372624b5 100644
--- a/lib/inviso/test/Makefile
+++ b/lib/inviso/test/Makefile
@@ -52,7 +52,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) inviso.spec $(ERL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) inviso.spec inviso.cover $(ERL_FILES) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/inviso/test/inviso.cover b/lib/inviso/test/inviso.cover
new file mode 100644
index 0000000000..e23b9fa59b
--- /dev/null
+++ b/lib/inviso/test/inviso.cover
@@ -0,0 +1,2 @@
+{incl_app,inviso,details}.
+
diff --git a/lib/inviso/test/inviso.spec b/lib/inviso/test/inviso.spec
index d655771d64..49f9b0b460 100644
--- a/lib/inviso/test/inviso.spec
+++ b/lib/inviso/test/inviso.spec
@@ -1 +1 @@
-{topcase, {dir, "../inviso_test"}}.
+{suites,"../inviso_test",all}.
diff --git a/lib/inviso/test/inviso_tool_SUITE.erl b/lib/inviso/test/inviso_tool_SUITE.erl
index 206e117c86..d59e3b5fa8 100644
--- a/lib/inviso/test/inviso_tool_SUITE.erl
+++ b/lib/inviso/test/inviso_tool_SUITE.erl
@@ -1,19 +1,21 @@
-% ``The contents of this file are subject to the Erlang Public License,

+%%

+%% %CopyrightBegin%

+%%

+%% Copyright Ericsson AB 1997-2010. 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 via the world wide web at http://www.erlang.org/.

-%% 

+%% 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.

-%% 

-%% 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$

+%%

+%% %CopyrightEnd%

+%%

 %%

 %% Description:

 %% Test suite for the inviso_tool. It is here assumed that inviso works

@@ -26,20 +28,27 @@
 -module(inviso_tool_SUITE).

 -compile(export_all).

 

--include("test_server.hrl").

+-include_lib("common_test/include/ct.hrl").

 -include_lib("kernel/include/file.hrl").

 

 -define(l,?line).

 

-all(suite) ->

-    [

-     dist_basic_1,

-     dist_rtc,

-     dist_reconnect,

-     dist_adopt,

-     dist_history,

-     dist_start_session_special

-    ].

+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [dist_basic_1, dist_rtc, dist_reconnect, dist_adopt,
+     dist_history, dist_start_session_special].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %% -----------------------------------------------------------------------------

 

 init_per_suite(Config) ->

@@ -89,7 +98,7 @@ init_per_testcase(_Case,Config) ->
     insert_timetraphandle_config(TH,NewConfig2).

 %% -----------------------------------------------------------------------------

 

-fin_per_testcase(_Case,Config) ->

+end_per_testcase(_Case,Config) ->

     ?l test_server:stop_node(get_remotenode_config(inviso1,Config)),

     ?l test_server:stop_node(get_remotenode_config(inviso2,Config)),

     ?l test_server:timetrap_cancel(get_timetraphandle_config(Config)),

@@ -220,6 +229,10 @@ dist_basic_1(Config) when list(Config) ->
 		     Nodes),

     %% Start a test process at every node with a runtime component.

     ?l lists:foreach(fun(N)->spawn(N,?MODULE,test_proc_init,[]) end,Nodes),

+
+    %% Let the processes start
+    timer:sleep(100),
+
     %% Find the pids of the test processes.

     ?l TestProcs=lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_tool_test_proc]) end,

 			   Nodes),

@@ -500,6 +513,10 @@ dist_rtc(Config) when is_list(Config) ->
 		     Nodes),

     %% Start a test process at every node with a runtime component.

     ?l lists:foreach(fun(N)->spawn(N,?MODULE,test_proc_init,[]) end,Nodes),

+
+    %% Let the processes start
+    timer:sleep(100),
+
     %% Find the pids of the test processes.

     ?l TestProcs=lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_tool_test_proc]) end,

 			   Nodes),

@@ -553,6 +570,10 @@ dist_reconnect(Config) when list(Config) ->
     ?l start_inviso_tool_session(CNode,[],1,Nodes),

     %% Start a test process at every node with a runtime component.

     ?l lists:foreach(fun(N)->spawn(N,?MODULE,test_proc_init,[]) end,Nodes),

+
+    %% Let the processes start
+    timer:sleep(100),
+    
     %% Find the pids of the test processes.

     ?l TestProcs=lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_tool_test_proc]) end,

 			   Nodes),

diff --git a/lib/inviso/vsn.mk b/lib/inviso/vsn.mk
index cab3bc0ff3..79093597fe 100644
--- a/lib/inviso/vsn.mk
+++ b/lib/inviso/vsn.mk
@@ -1 +1 @@
-INVISO_VSN = 0.6.1
+INVISO_VSN = 0.6.2
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index 977a7a7f98..879634561b 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -30,6 +30,38 @@
   </header>
   <p>This document describes the changes made to the Jinterface application.</p>
 
+<section><title>Jinterface 1.5.3.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The OtpMbox class did not have a hash() method, which it
+	    should have because it overrides equals().</p>
+          <p>
+	    Own Id: OTP-8854</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Jinterface 1.5.3.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    An pom.xml file is now generated. (Thanks to Gabor
+	    Liptak.)</p>
+          <p>
+	    Own Id: OTP-8841</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Jinterface 1.5.3</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/jinterface/java_src/Makefile b/lib/jinterface/java_src/Makefile
index 37a57352ad..22c55328b8 100644
--- a/lib/jinterface/java_src/Makefile
+++ b/lib/jinterface/java_src/Makefile
@@ -35,7 +35,21 @@ VSN=$(JINTERFACE_VSN)
 
 SPECIAL_TARGETS = 
 
+TARGET_FILES= $(POM_TARGET)
 
+SPECIAL_TARGETS =
+
+POM_FILE= pom.xml
+
+POM_TARGET= ../$(POM_FILE)
+POM_SRC= $(POM_FILE).src
+
+# ----------------------------------------------------
+# Special Build Targets
+# ----------------------------------------------------
+
+$(POM_TARGET): $(POM_SRC) ../vsn.mk
+	sed -e 's;%VSN%;$(VSN);' $< > $@
 
 # ----------------------------------------------------
 # Default Subdir Targets
@@ -43,7 +57,7 @@ SPECIAL_TARGETS =
 
 .PHONY: debug opt instr release docs release_docs tests release_tests clean depend
 
-debug opt instr release docs release_docs tests release_tests clean depend:
+debug opt instr release docs release_docs tests release_tests clean depend: $(TARGET_FILES)
 	set -e; set -x; \
 	case "$(MAKE)" in *clearmake*) tflag="-T";; *) tflag="";; esac; \
 	if test -f com/ericsson/otp/erlang/ignore_config_record.inf; then xflag=$$tflag; fi; \
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
index ab0b299bf9..9ba6a4a0ab 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2000-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2000-2010. 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
@@ -68,7 +68,6 @@ public abstract class AbstractConnection extends Thread {
     protected static final int sendTag = 2;
     protected static final int exitTag = 3;
     protected static final int unlinkTag = 4;
-    protected static final int nodeLinkTag = 5;
     protected static final int regSendTag = 6;
     protected static final int groupLeaderTag = 7;
     protected static final int exit2Tag = 8;
@@ -697,7 +696,6 @@ public abstract class AbstractConnection extends Thread {
 		// absolutely no idea what to do with these, so we ignore
 		// them...
 		case groupLeaderTag: // { GROUPLEADER, FromPid, ToPid}
-		case nodeLinkTag: // { NODELINK }
 		    // (just show trace)
 		    if (traceLevel >= ctrlThreshold) {
 			System.out.println("<- " + headerType(head) + " "
@@ -880,9 +878,6 @@ public abstract class AbstractConnection extends Thread {
 	case unlinkTag:
 	    return "UNLINK";
 
-	case nodeLinkTag:
-	    return "NODELINK";
-
 	case regSendTag:
 	    return "REG_SEND";
 
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 3bb678c2cc..deac528133 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2000-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2000-2010. 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
@@ -71,11 +71,6 @@ public class OtpEpmd {
     // common values
     private static final byte stopReq = (byte) 115;
 
-    // version specific value
-    private static final byte port3req = (byte) 112;
-    private static final byte publish3req = (byte) 97;
-    private static final byte publish3ok = (byte) 89;
-
     private static final byte port4req = (byte) 122;
     private static final byte port4resp = (byte) 119;
     private static final byte publish4req = (byte) 120;
@@ -123,11 +118,7 @@ public class OtpEpmd {
      *                if there was no response from the name server.
      */
     public static int lookupPort(final AbstractNode node) throws IOException {
-	try {
 	    return r4_lookupPort(node);
-	} catch (final IOException e) {
-	    return r3_lookupPort(node);
-	}
     }
 
     /**
@@ -147,11 +138,7 @@ public class OtpEpmd {
 	    throws IOException {
 	Socket s = null;
 
-	try {
-	    s = r4_publish(node);
-	} catch (final IOException e) {
-	    s = r3_publish(node);
-	}
+	s = r4_publish(node);
 
 	node.setEpmd(s);
 
@@ -196,67 +183,6 @@ public class OtpEpmd {
 	}
     }
 
-    private static int r3_lookupPort(final AbstractNode node)
-	    throws IOException {
-	int port = 0;
-	Socket s = null;
-
-	try {
-	    final OtpOutputStream obuf = new OtpOutputStream();
-	    s = new Socket(node.host(), EpmdPort.get());
-
-	    // build and send epmd request
-	    // length[2], tag[1], alivename[n] (length = n+1)
-	    obuf.write2BE(node.alive().length() + 1);
-	    obuf.write1(port3req);
-	    obuf.writeN(node.alive().getBytes());
-
-	    // send request
-	    obuf.writeTo(s.getOutputStream());
-
-	    if (traceLevel >= traceThreshold) {
-		System.out.println("-> LOOKUP (r3) " + node);
-	    }
-
-	    // receive and decode reply
-	    final byte[] tmpbuf = new byte[100];
-
-	    s.getInputStream().read(tmpbuf);
-	    final OtpInputStream ibuf = new OtpInputStream(tmpbuf, 0);
-
-	    port = ibuf.read2BE();
-	} catch (final IOException e) {
-	    if (traceLevel >= traceThreshold) {
-		System.out.println("<- (no response)");
-	    }
-	    throw new IOException("Nameserver not responding on " + node.host()
-		    + " when looking up " + node.alive());
-	} catch (final OtpErlangDecodeException e) {
-	    if (traceLevel >= traceThreshold) {
-		System.out.println("<- (invalid response)");
-	    }
-	    throw new IOException("Nameserver not responding on " + node.host()
-		    + " when looking up " + node.alive());
-	} finally {
-	    try {
-		if (s != null) {
-		    s.close();
-		}
-	    } catch (final IOException e) { /* ignore close errors */
-	    }
-	    s = null;
-	}
-
-	if (traceLevel >= traceThreshold) {
-	    if (port == 0) {
-		System.out.println("<- NOT FOUND");
-	    } else {
-		System.out.println("<- PORT " + port);
-	    }
-	}
-	return port;
-    }
-
     private static int r4_lookupPort(final AbstractNode node)
 	    throws IOException {
 	int port = 0;
@@ -288,8 +214,6 @@ public class OtpEpmd {
 	    final int n = s.getInputStream().read(tmpbuf);
 
 	    if (n < 0) {
-		// this was an r3 node => not a failure (yet)
-
 		s.close();
 		throw new IOException("Nameserver not responding on "
 			+ node.host() + " when looking up " + node.alive());
@@ -342,81 +266,13 @@ public class OtpEpmd {
 	return port;
     }
 
-    private static Socket r3_publish(final OtpLocalNode node)
-	    throws IOException {
-	Socket s = null;
-
-	try {
-	    final OtpOutputStream obuf = new OtpOutputStream();
-	    s = new Socket((String) null, EpmdPort.get());
-
-	    obuf.write2BE(node.alive().length() + 3);
-
-	    obuf.write1(publish3req);
-	    obuf.write2BE(node.port());
-	    obuf.writeN(node.alive().getBytes());
-
-	    // send request
-	    obuf.writeTo(s.getOutputStream());
-	    if (traceLevel >= traceThreshold) {
-		System.out.println("-> PUBLISH (r3) " + node + " port="
-			+ node.port());
-	    }
-
-	    final byte[] tmpbuf = new byte[100];
-
-	    final int n = s.getInputStream().read(tmpbuf);
-
-	    if (n < 0) {
-		s.close();
-		if (traceLevel >= traceThreshold) {
-		    System.out.println("<- (no response)");
-		}
-		return null;
-	    }
-
-	    final OtpInputStream ibuf = new OtpInputStream(tmpbuf, 0);
-
-	    if (ibuf.read1() == publish3ok) {
-		node.creation = ibuf.read2BE();
-		if (traceLevel >= traceThreshold) {
-		    System.out.println("<- OK");
-		}
-		return s; // success - don't close socket
-	    }
-	} catch (final IOException e) {
-	    // epmd closed the connection = fail
-	    if (s != null) {
-		s.close();
-	    }
-	    if (traceLevel >= traceThreshold) {
-		System.out.println("<- (no response)");
-	    }
-	    throw new IOException("Nameserver not responding on " + node.host()
-		    + " when publishing " + node.alive());
-	} catch (final OtpErlangDecodeException e) {
-	    if (s != null) {
-		s.close();
-	    }
-	    if (traceLevel >= traceThreshold) {
-		System.out.println("<- (invalid response)");
-	    }
-	    throw new IOException("Nameserver not responding on " + node.host()
-		    + " when publishing " + node.alive());
-	}
-
-	if (s != null) {
-	    s.close();
-	}
-	return null; // failure
-    }
-
     /*
-     * this function will get an exception if it tries to talk to an r3 epmd, or
-     * if something else happens that it cannot forsee. In both cases we return
-     * an exception (and the caller should try again, using the r3 protocol). If
-     * we manage to successfully communicate with an r4 epmd, we return either
-     * the socket, or null, depending on the result.
+     * this function will get an exception if it tries to talk to a
+     * very old epmd, or if something else happens that it cannot
+     * forsee. In both cases we return an exception. We no longer
+     * support r3, so the exception is fatal. If we manage to
+     * successfully communicate with an r4 epmd, we return either the
+     * socket, or null, depending on the result.
      */
     private static Socket r4_publish(final OtpLocalNode node)
 	    throws IOException {
@@ -454,7 +310,6 @@ public class OtpEpmd {
 	    final int n = s.getInputStream().read(tmpbuf);
 
 	    if (n < 0) {
-		// this was an r3 node => not a failure (yet)
 		if (s != null) {
 		    s.close();
 		}
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 4146bd3ced..a9712aa2ba 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
@@ -678,6 +678,11 @@ public class OtpMbox {
 	return m.self.equals(self);
     }
 
+    @Override
+    public int hashCode() {
+        return self.hashCode();
+    }
+
     /*
      * called by OtpNode to deliver message to this mailbox.
      * 
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMsg.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMsg.java
index 80d8a5ccae..6f507bf4bb 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMsg.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMsg.java
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2000-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2000-2010. 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
@@ -54,7 +54,6 @@ public class OtpMsg {
     public static final int sendTag = 2;
     public static final int exitTag = 3;
     public static final int unlinkTag = 4;
-    /* public static final int nodeLinkTag = 5; */
     public static final int regSendTag = 6;
     /* public static final int groupLeaderTag = 7; */
     public static final int exit2Tag = 8;
diff --git a/lib/jinterface/java_src/pom.xml.src b/lib/jinterface/java_src/pom.xml.src
new file mode 100644
index 0000000000..cef49b735a
--- /dev/null
+++ b/lib/jinterface/java_src/pom.xml.src
@@ -0,0 +1,106 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.erlang.otp</groupId>
+	<artifactId>jinterface</artifactId>
+	<packaging>jar</packaging>
+	<version>%VSN%</version>
+	<name>jinterface</name>
+	<description>
+  Jinterface Java package contains java classes, which help you integrate programs written in Java with Erlang.
+  Erlang is a programming language designed at the Ericsson Computer Science Laboratory.
+  </description>
+	<url>http://erlang.org/</url>
+	<licenses>
+		<license>
+			<name>ERLANG PUBLIC LICENSE 1.1</name>
+			<url>http://www.erlang.org/EPLICENSE</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>git://github.com/erlang/otp.git</connection>
+		<developerConnection>git://github.com/erlang/otp.git</developerConnection>
+		<url>http://github.com/erlang/otp</url>
+	</scm>
+	<developers>
+	    <developer>
+	        <email>[email protected]</email>
+	    </developer>
+	</developers>
+	<organization>
+		<name>Open Source Erlang</name>
+		<url>http://www.erlang.org/</url>
+	</organization>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>java_src</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<distributionManagement>
+		<repository>
+			<id>ossrh</id>
+			<url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+		</repository>
+		<snapshotRepository>
+			<id>ossrh</id>
+			<url>http://oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
+	<profiles>
+		<profile>
+			<id>release-sign-artifacts</id>
+			<activation>
+				<property>
+					<name>performRelease</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.0-alpha-4</version>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+</project>
diff --git a/lib/jinterface/test/Makefile b/lib/jinterface/test/Makefile
new file mode 100644
index 0000000000..ac9556c2f7
--- /dev/null
+++ b/lib/jinterface/test/Makefile
@@ -0,0 +1,85 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2004-2010. 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%
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/jinterface_test
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+TEST_SPEC_FILE = jinterface.spec
+COVER_FILE = jinterface.cover
+
+MODULES = nc_SUITE \
+	  jinterface_SUITE
+
+GEN_MODULES = jitu
+
+ERL_FILES = $(MODULES:%=%.erl) $(GEN_MODULES:%=%.erl)
+
+GEN_TARGET_FILES = $(GEN_MODULES:%=%.$(EMULATOR))
+
+SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
+
+TARGET_FILES = \
+	$(GEN_TARGET_FILES) \
+	$(SUITE_TARGET_FILES)
+
+# ----------------------------------------------------
+# PROGRAMS
+# ----------------------------------------------------
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+tests debug opt:
+
+clean:
+	rm -f $(TARGET_FILES)
+	rm -f errs core *~
+
+docs:
+
+# ----------------------------------------------------
+# Special Targets
+# ----------------------------------------------------
+
+
+# ----------------------------------------------------
+# Release Targets
+# ----------------------------------------------------
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec:
+
+release_docs_spec:
+
+release_tests_spec: tests
+	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DATA) $(TEST_SPEC_FILE) $(COVER_FILE) $(ERL_FILES) $(RELSYSDIR)
+	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
diff --git a/lib/jinterface/test/jinterface.cover b/lib/jinterface/test/jinterface.cover
new file mode 100644
index 0000000000..d4edcd99d2
--- /dev/null
+++ b/lib/jinterface/test/jinterface.cover
@@ -0,0 +1,2 @@
+{incl_app,jinterface,details}.
+
diff --git a/lib/jinterface/test/jinterface.spec b/lib/jinterface/test/jinterface.spec
new file mode 100644
index 0000000000..99bc0f4005
--- /dev/null
+++ b/lib/jinterface/test/jinterface.spec
@@ -0,0 +1,20 @@
+%% -*- erlang -*-
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2010. 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%
+%%
+{suites,"../jinterface_test",all}.
diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl
new file mode 100644
index 0000000000..e608bcb093
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE.erl
@@ -0,0 +1,781 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2010. 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(jinterface_SUITE).
+
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1,
+	 init_per_testcase/2, end_per_testcase/2]).
+
+-export([nodename/1, register_and_whereis/1, get_names/1, boolean_atom/1,
+	 node_ping/1, mbox_ping/1,
+	 java_erlang_send_receive/1,
+	 java_internal_send_receive_same_node/1,
+	 java_internal_send_receive_different_nodes/1,
+	 java_internal_send_receive_self/1,
+	 java_link_and_exit/1, erl_link_and_exit/1,
+	 erl_link_java_exit/1, java_link_erl_exit/1,
+	 internal_link_linking_exits/1, internal_link_linked_exits/1,
+	 internal_unlink_linking_exits/1, internal_unlink_linked_exits/1,
+	 normal_exit/1, kill_mbox/1,kill_erl_proc_from_java/1,
+	 kill_mbox_from_erlang/1,
+	 erl_exit_with_reason_any_term/1,
+	 java_exit_with_reason_any_term/1,
+	 status_handler_localStatus/1, status_handler_remoteStatus/1,
+	 status_handler_connAttempt/1]).
+
+-include_lib("common_test/include/ct.hrl").
+-include("test_server_line.hrl").
+
+-define(debug,true).
+-ifdef(debug).
+-define(dbg(Str,Args), io:format(Str,Args)).
+-else.
+-define(dbg(Str,Args), ok).
+-endif.
+
+-define(link_test_reason,link_test_reason).
+
+%% Test cases in MboxSendReceive.java
+-define(java_erlang_send_receive,1).
+-define(java_internal_send_receive_same_node,2).
+-define(java_internal_send_receive_different_nodes,3).
+-define(java_internal_send_receive_self,4).
+
+%% Test cases in MboxLinkUnlink.java
+-define(java_link_and_exit, 1).
+-define(erl_link_and_exit, 2).
+-define(erl_link_java_exit, 3).
+-define(java_link_erl_exit, 4).
+-define(internal_link_linking_exits, 5).
+-define(internal_link_linked_exits, 6).
+-define(internal_unlink_linking_exits,7).
+-define(internal_unlink_linked_exits,8).
+-define(normal_exit,9).
+-define(kill_mbox,10).
+-define(kill_erl_proc_from_java,11).
+-define(kill_mbox_from_erlang,12).
+-define(erl_exit_with_reason_any_term,13).
+-define(java_exit_with_reason_any_term,14).
+
+
+%% Test cases in NodeStatusHandler.java
+-define(status_handler_localStatus,1).
+-define(status_handler_remoteStatus,2).
+-define(status_handler_connAttempt,3).
+
+%%%-----------------------------------------------------------------
+%%% INIT/END
+%%%-----------------------------------------------------------------
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    lists:append([fundamental(), ping(), send_receive(),
+		  link_unlink(), status_handler()]).
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+fundamental() ->
+    [
+     nodename,             % Nodename.java
+     register_and_whereis, % RegisterAndWhereis.java
+     get_names,            % GetNames.java
+     boolean_atom          % BooleanAtom.java
+    ].
+
+ping() ->
+    [
+     %% Implemented in NodePing.java
+     node_ping,
+
+     %% Implemented in MboxPing.java
+     mbox_ping
+     ].
+
+
+send_receive() ->
+    [
+     %% Implemented in MboxSendReceive.java
+     java_erlang_send_receive,
+     java_internal_send_receive_same_node,
+     java_internal_send_receive_different_nodes,
+     java_internal_send_receive_self
+    ].
+
+%% Note:
+%%
+%% The test cases in MboxLinkUnlink.java and in
+%% NodePing.java, all uses default cookie, and if there
+%% is a problem with having the same default cookie in
+%% erlang vs jinterface, e.g because the home directory
+%% does not get the same in some cases on Windows
+%% - they will all fail.
+
+link_unlink() ->
+    [
+     %% Implemented in MboxLinkUnlink.java
+     java_link_and_exit,
+     erl_link_and_exit,
+     erl_link_java_exit,
+     java_link_erl_exit,
+     internal_link_linking_exits,
+     internal_link_linked_exits,
+     internal_unlink_linking_exits,
+     internal_unlink_linked_exits,
+     normal_exit,
+     kill_mbox,
+     kill_erl_proc_from_java,
+     kill_mbox_from_erlang,
+     erl_exit_with_reason_any_term,
+     java_exit_with_reason_any_term
+    ].
+
+status_handler() ->
+    [
+     %% Implemented in NodeStatusHandler.java
+     status_handler_localStatus,
+     status_handler_remoteStatus,
+     status_handler_connAttempt
+    ].
+
+
+init_per_suite(Config) when is_list(Config) ->
+    case case code:priv_dir(jinterface) of
+	     {error,bad_name} -> false;
+	     P -> filelib:is_dir(P) end of
+	true ->
+	    jitu:init_all(Config);
+	false ->
+	    {skip,"No jinterface application"}
+    end.
+
+end_per_suite(Config) when is_list(Config) ->
+    jitu:finish_all(Config).
+
+init_per_testcase(Case, _Config) 
+  when Case =:= kill_mbox;
+       Case =:= kill_mbox_from_erlang ->
+    {skip, "Not yet implemented"};
+init_per_testcase(_Case,Config) ->
+    Dog = ?t:timetrap({seconds,10}),
+    [{watch_dog,Dog}|Config].
+
+end_per_testcase(_Case,Config) ->
+    ?t:timetrap_cancel(?config(watch_dog,Config)),
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% TEST CASES
+%%%-----------------------------------------------------------------
+nodename(doc) ->
+    ["Nodename.java: "
+     "Test OtpNode.node(), OtpNode.alive() and OtpNode.host()"];
+nodename(suite) ->
+    [];
+nodename(Config) when is_list(Config) ->
+    [_,Host] = string:tokens(atom_to_list(node()),"@"),
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "Nodename",
+		   [list_to_atom(Host)]).
+
+%%%-----------------------------------------------------------------
+register_and_whereis(doc) ->
+    ["RegisterAndWhereis.java: "
+     "Test OtpNode.registerName(...), OtpMbox.registerName(...) and "
+     "OtpNode.whereis(...)"];
+register_and_whereis(suite) ->
+    [];
+register_and_whereis(Config) when is_list(Config) ->
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "RegisterAndWhereis",
+		   []).
+
+%%%-----------------------------------------------------------------
+get_names(doc) ->
+    ["GetNames.java: "
+     "Test OtpNode.getNames()"];
+get_names(suite) ->
+    [];
+get_names(Config) when is_list(Config) ->
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "GetNames",
+		   []).
+
+%%%-----------------------------------------------------------------
+boolean_atom(doc) ->
+    ["BooleanAtom.java: "
+     "Test OtpErlangAtom.booleanValue()"];
+boolean_atom(suite) ->
+    [];
+boolean_atom(Config) when is_list(Config) ->
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "BooleanAtom",
+		   []).
+
+%%%-----------------------------------------------------------------
+node_ping(doc) ->
+    ["NodePing.java: "
+     "Test OtpNode.ping(java.lang.String node, long timeout)"];
+node_ping(suite) ->
+    [];
+node_ping(Config) when is_list(Config) ->
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "NodePing",
+		   [erlang:get_cookie(),node()]).
+
+%%%-----------------------------------------------------------------
+mbox_ping(doc) ->
+    ["MboxPing.java: "
+     "Test OtpNode.createMbox(...) and OtpMbox.ping(...)"];
+mbox_ping(suite) ->
+    [];
+mbox_ping(Config) when is_list(Config) ->
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "MboxPing",
+		   [erlang:get_cookie(),node()]).
+
+%%%-----------------------------------------------------------------
+java_erlang_send_receive(doc) ->
+    ["Test sending/receiving of erlang messages between erlang and java"];
+java_erlang_send_receive(suite) ->
+    [];
+java_erlang_send_receive(Config) when is_list(Config) ->
+    send_receive(?java_erlang_send_receive, fun echo_loop/0, Config).
+
+echo_loop() ->
+    receive
+	{From,Msg} ->
+	    ?dbg("erl_send_receive_server received ~p",[{From,Msg}]),
+	    ?dbg("erl_send_receive_server sending ~p",[Msg]),
+	    From ! Msg,
+	    echo_loop();
+	done ->
+	    ok
+    end.
+
+
+%%%-----------------------------------------------------------------
+java_internal_send_receive_same_node(doc) ->
+    ["MboxSendReceive.java: "
+     "Test sending/receiving of erlang messages between mboxes "
+     "on the same java node."];
+java_internal_send_receive_same_node(suite) ->
+    [];
+java_internal_send_receive_same_node(Config) when is_list(Config) ->
+    send_receive(?java_internal_send_receive_same_node,
+		 fun() -> receive done -> ok end end,
+		 Config).
+
+%%%-----------------------------------------------------------------
+java_internal_send_receive_different_nodes(doc) ->
+    ["MboxSendReceive.java: "
+     "Test sending/receiving of erlang messages between mboxes "
+     "on different java nodes."];
+java_internal_send_receive_different_nodes(suite) ->
+    [];
+java_internal_send_receive_different_nodes(Config) when is_list(Config) ->
+    send_receive(?java_internal_send_receive_different_nodes,
+		 fun() -> receive done -> ok end end,
+		 Config).
+
+%%%-----------------------------------------------------------------
+java_internal_send_receive_self(doc) ->
+    ["MboxSendReceive.java: "
+     "Test sending/receiving of erlang messages from an mbox to itself"];
+java_internal_send_receive_self(suite) ->
+    [];
+java_internal_send_receive_self(Config) when is_list(Config) ->
+    send_receive(?java_internal_send_receive_self,
+		 fun() -> receive done -> ok end end,
+		 Config).
+
+%%%-----------------------------------------------------------------
+java_link_and_exit(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test link between erlang process and java mailbox."
+     "Java mailbox links and exits"];
+java_link_and_exit(suite) ->
+    [];
+java_link_and_exit(Config) when is_list(Config) ->
+    LinkFun =
+	fun(Mbox) ->
+		Mbox ! {?java_link_and_exit,self(),?link_test_reason},
+		receive after infinity -> ok end
+	end,
+    erl_java_link(LinkFun,java_link_and_exit,Config).
+
+
+%%%-----------------------------------------------------------------
+erl_link_and_exit(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test link between erlang process and java mailbox."
+     "Erlang process links and exits"];
+erl_link_and_exit(suite) ->
+    [];
+erl_link_and_exit(Config) when is_list(Config) ->
+    LinkFun = fun(Mbox) ->
+		      link(Mbox),
+		      Mbox ! {?erl_link_and_exit,self(),?link_test_reason},
+		      receive ok -> ok end,
+		      exit(?link_test_reason)
+	      end,
+    erl_java_link(LinkFun,erl_link_and_exit,Config).
+
+%%%-----------------------------------------------------------------
+erl_link_java_exit(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test link between erlang process and java mailbox."
+     "Erlang process links and java mailbox exits"];
+erl_link_java_exit(suite) ->
+    [];
+erl_link_java_exit(Config) when is_list(Config) ->
+    LinkFun = fun(Mbox) ->
+		      link(Mbox),
+		      Mbox ! {?erl_link_java_exit,self(),?link_test_reason},
+		      receive after infinity -> ok end
+	      end,
+    erl_java_link(LinkFun,erl_link_java_exit,Config).
+
+
+%%%-----------------------------------------------------------------
+java_link_erl_exit(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test link between erlang process and java mailbox."
+     "Java mailbox links and erlang process exits"];
+java_link_erl_exit(suite) ->
+    [];
+java_link_erl_exit(Config) when is_list(Config) ->
+    LinkFun =
+	fun(Mbox) ->
+		Mbox ! {?java_link_erl_exit,self(),?link_test_reason},
+		receive ok -> ok end,
+		exit(?link_test_reason)
+	end,
+    erl_java_link(LinkFun,java_link_erl_exit,Config).
+
+%%%-----------------------------------------------------------------
+internal_link_linking_exits(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test link between two java mailboxes."
+     "The mailbox which creates the link is the one exiting"];
+internal_link_linking_exits(suite) ->
+    [];
+internal_link_linking_exits(Config) when is_list(Config) ->
+     internal_link_unlink(?internal_link_linking_exits,
+			  internal_link_linking_exits,
+			  Config).
+
+%%%-----------------------------------------------------------------
+internal_link_linked_exits(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test link between two java mailboxes."
+     "The mailbox which dies not create the link is the one exiting"];
+internal_link_linked_exits(suite) ->
+    [];
+internal_link_linked_exits(Config) when is_list(Config) ->
+    internal_link_unlink(?internal_link_linked_exits,
+			 internal_link_linked_exits,
+			 Config).
+
+%%%-----------------------------------------------------------------
+internal_unlink_linking_exits(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test link and unlink between two java mailboxes. "
+     "Mailbox1 creates a link to mailbox2 and removes it. "
+     "Then it creates another link and mailbox2 removes is. "
+     "Finally mailbox1 exits - mailbox2 must survive"];
+internal_unlink_linking_exits(suite) ->
+    [];
+internal_unlink_linking_exits(Config) when is_list(Config) ->
+     internal_link_unlink(?internal_unlink_linking_exits,
+			  internal_unlink_linking_exits,
+			  Config).
+
+%%%-----------------------------------------------------------------
+internal_unlink_linked_exits(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test link and unlink between two java mailboxes. "
+     "Mailbox1 creates a link to mailbox2 and removes it. "
+     "Then it creates another link and mailbox2 removes is. "
+     "Finally mailbox2 exits - mailbox1 must survive"];
+internal_unlink_linked_exits(suite) ->
+    [];
+internal_unlink_linked_exits(Config) when is_list(Config) ->
+    internal_link_unlink(?internal_unlink_linked_exits,
+			 internal_unlink_linked_exits,
+			 Config).
+
+%%%-----------------------------------------------------------------
+normal_exit(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test that mbox.close() uses exit reason 'normal', i.e. "
+     "that linked processes are not terminated."];
+normal_exit(suite) ->
+    [];
+normal_exit(Config) when is_list(Config) ->
+    Fun =
+	fun() ->
+		register(erl_link_server,self()),
+		process_flag(trap_exit,true),
+		receive
+		    {Main,Mbox} when is_pid(Main), is_pid(Mbox) ->
+			?dbg("Erlang sending \"~p\"",[normal_exit]),
+			link(Mbox),
+			Pid = spawn_link(fun() ->
+						 link(Mbox),
+						 Mbox ! {?normal_exit},
+						 receive after infinity -> ok end
+					 end),
+			receive
+			    {'EXIT',Mbox,normal} ->
+				%% Make sure that we don't get the
+				%% exit signal from Pid, and Pid
+				%% should still be alive.
+				receive
+				    {'EXIT',Pid,Reason} ->
+					?dbg("Got unexpected exit signal: ~p",
+					     [{'EXIT',Pid,Reason}]),
+					exit({unexpected,{'EXIT',Pid,Reason}})
+				after 500 ->
+					true = erlang:is_process_alive(Pid),
+					exit(Pid,kill)
+				end,
+				receive done -> Main ! done end
+			after 1000 ->
+				receive
+				    Other ->
+					?dbg("Got garbage when waiting for exit:"
+					     " ~p", [Other]),
+					Main ! done,
+					exit({got_unexpected,Other})
+				after 0 ->
+					ok
+				end
+			end;
+		    Other ->
+			?dbg("Got garbage: ~p",[Other]),
+			exit(Other)
+		end
+	end,
+
+    spawn_link(Fun),
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "MboxLinkUnlink",
+		   [erlang:get_cookie(),node()]).
+
+
+%%%-----------------------------------------------------------------
+kill_mbox(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test that mbox.exit(new OtpErlangAtom(\"kill\") causes linked "
+     "processes to exit with reason 'killed', which can be trapped."];
+kill_mbox(suite) ->
+    {skip, "Not yet implemented"};
+kill_mbox(Config) when is_list(Config) ->
+    Fun =
+	fun() ->
+		register(erl_link_server,self()),
+		process_flag(trap_exit,true),
+		receive
+		    {Main,Mbox} when is_pid(Main), is_pid(Mbox) ->
+			?dbg("Erlang sending \"~p\"",[kill_mbox]),
+			Pid = spawn_link(fun() ->
+						 process_flag(trap_exit,true),
+						 link(Mbox),
+						 Mbox ! {?kill_mbox},
+						 receive
+						     {'EXIT',Mbox,killed} ->
+							 exit(correct_reason);
+						     {'EXIT',Mbox,R} ->
+							 exit({faulty_reason,R})
+						 end
+					 end),
+			receive
+			    {'EXIT',Pid,{faulty_reason,Reason}} ->
+				receive done -> Main ! done end,
+				exit({faulty_reason,Reason});
+			    {'EXIT',Pid,im_killed} ->
+				receive done -> Main ! done end
+			after 1000 ->
+				receive
+				    Other ->
+					?dbg("Got garbage when waiting for exit:"
+					     " ~p", [Other]),
+					Main ! done,
+					exit({got_unexpected,Other})
+				after 0 ->
+					ok
+				end
+			end;
+		    Other ->
+			?dbg("Got garbage: ~p",[Other]),
+			exit(Other)
+		end
+	end,
+
+    spawn_link(Fun),
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "MboxLinkUnlink",
+		   [erlang:get_cookie(),node()]).
+
+%%%-----------------------------------------------------------------
+kill_erl_proc_from_java(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test that mbox.exit(pid, new OtpErlangAtom(\"kill\") causes erlang "
+     "processes <pid> to be killed, even if trapping exits"];
+kill_erl_proc_from_java(suite) ->
+    [];
+kill_erl_proc_from_java(Config) when is_list(Config) ->
+    LinkFun = fun(Mbox) ->
+		      process_flag(trap_exit,true),
+		      link(Mbox),
+		      Mbox ! {?kill_erl_proc_from_java, self()},
+		      receive after infinity -> ok end
+	      end,
+    erl_java_link(LinkFun,kill_erl_proc_from_java,killed,Config).
+
+%%%-----------------------------------------------------------------
+kill_mbox_from_erlang(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test that exit(Mbox,kill) causes linked the Mbox to be killed, and"
+     "linked processes to exit with reason 'killed', even if trapping exits"];
+kill_mbox_from_erlang(suite) ->
+    {skip, "Not yet implemented"};
+kill_mbox_from_erlang(Config) when is_list(Config) ->
+    LinkFun = fun(Mbox) ->
+		      link(Mbox),
+		      Mbox ! {?kill_mbox_from_erlang},
+		      exit(Mbox,kill),
+		      receive after infinity -> ok end
+	      end,
+    erl_java_link(LinkFun,kill_mbox_from_erlang,killed,Config).
+
+%%%-----------------------------------------------------------------
+erl_exit_with_reason_any_term(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test that any erlang term can be used as exit reason when erlang "
+     "process exits and is linked to an mbox."];
+erl_exit_with_reason_any_term(suite) ->
+    [];
+erl_exit_with_reason_any_term(Config) when is_list(Config) ->
+    Reason = [hei,self(),{this,is,"a",[different,"reason"]}],
+    LinkFun = fun(Mbox) ->
+		      link(Mbox),
+		      Mbox ! {?erl_exit_with_reason_any_term,self(),Reason},
+		      receive ok -> ok end,
+		      exit(Reason)
+	      end,
+    erl_java_link(LinkFun,erl_exit_with_reason_any_term,Reason,Config).
+
+%%%-----------------------------------------------------------------
+java_exit_with_reason_any_term(doc) ->
+    ["MboxLinkUnlink.java: "
+     "Test that any erlang term can be used as exit reason when mbox "
+     "exits and is linked to an erlang process."];
+java_exit_with_reason_any_term(suite) ->
+    [];
+java_exit_with_reason_any_term(Config) when is_list(Config) ->
+    Reason = [hei,self(),{this,is,"a",[different,"reason"]}],
+    LinkFun =
+	fun(Mbox) ->
+		Mbox ! {?java_exit_with_reason_any_term,self(),Reason},
+		receive after infinity -> ok end
+	end,
+    erl_java_link(LinkFun,java_exit_with_reason_any_term,Reason,Config).
+
+
+%%%-----------------------------------------------------------------
+status_handler_localStatus(doc) ->
+    ["NodeStatusHandler.java: "
+     "Test OtpNode.registerStatusHandler(...) and the callback "
+     "OtpNodeStatus.localStatus(...)"];
+status_handler_localStatus(suite) ->
+    [];
+status_handler_localStatus(Config) when is_list(Config) ->
+    spawn_link(fun() ->
+		       erl_status_server([{opt,{localStatus,"javanode1",true}},
+					  {localStatus,"javanode1",false}])
+	       end),
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "NodeStatusHandler",
+		   [erlang:get_cookie(),node(),?status_handler_localStatus]).
+
+%%%-----------------------------------------------------------------
+status_handler_remoteStatus(doc) ->
+    ["NodeStatusHandler.java: "
+     "Test OtpNode.registerStatusHandler(...) and the callback "
+     "OtpNodeStatus.remoteStatus(...)"];
+status_handler_remoteStatus(suite) ->
+    [];
+status_handler_remoteStatus(Config) when is_list(Config) ->
+    spawn_link(fun() ->
+		       erl_status_server([{opt,{localStatus,"javanode1",true}},
+					  {remoteStatus,"javanode2",true},
+					  {remoteStatus,"javanode2",false}])
+	       end),
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "NodeStatusHandler",
+		   [erlang:get_cookie(),node(),?status_handler_remoteStatus]).
+
+
+%%%-----------------------------------------------------------------
+status_handler_connAttempt(doc) ->
+    ["NodeStatusHandler.java: "
+     "Test OtpNode.registerStatusHandler(...) and the callback "
+     "OtpNodeStatus.connAttempt(...)"];
+status_handler_connAttempt(suite) ->
+    [];
+status_handler_connAttempt(Config) when is_list(Config) ->
+    spawn_link(fun() ->
+		       erl_status_server([{opt,{localStatus,"javanode1",true}},
+					  {connAttempt,"unknown",true},
+					  {connAttempt,"javanode3",false}])
+	       end),
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "NodeStatusHandler",
+		   [erlang:get_cookie(),node(),?status_handler_connAttempt]).
+
+
+%%%-----------------------------------------------------------------
+%%% INTERNAL FUNCTIONS
+%%%-----------------------------------------------------------------
+send_receive(TestCaseTag,Fun,Config) ->
+    spawn(fun() ->
+		  register(erl_send_receive_server,self()),
+		  receive
+		      From when is_pid(From) ->
+			  JavaNode = node(From),
+			  [JavaNode] = nodes(hidden),
+			  From ! {TestCaseTag,self()},
+			  Fun(),
+			  unregister(erl_send_receive_server)
+		  end
+	  end),
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "MboxSendReceive",
+		   [erlang:get_cookie(),node()]).
+
+
+internal_link_unlink(Tag,Msg,Config) ->
+    Fun =
+	fun() ->
+		register(erl_link_server,self()),
+		process_flag(trap_exit,true),
+		receive
+		    {Main,Mbox} when is_pid(Main), is_pid(Mbox) ->
+			?dbg("Erlang sending \"~p\"",[Msg]),
+			Mbox ! {Tag,self(),?link_test_reason},
+			receive done -> Main ! done end;
+		    Other ->
+			?dbg("Got garbage: ~p",[Other]),
+			exit(Other)
+		end
+	end,
+
+    spawn_link(Fun),
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "MboxLinkUnlink",
+		   [erlang:get_cookie(),node()]).
+
+
+erl_java_link(LinkFun,Msg,Config) ->
+    erl_java_link(LinkFun,Msg,?link_test_reason,Config).
+
+erl_java_link(LinkFun,Msg,Reason,Config) ->
+    Fun =
+	fun() ->
+		register(erl_link_server,self()),
+		process_flag(trap_exit,true),
+		receive
+		    {Main,Mbox} when is_pid(Mbox), is_pid(Mbox) ->
+			?dbg("Erlang sending \"~p\"",[Msg]),
+			Pid = spawn_link(fun() -> LinkFun(Mbox) end),
+			receive
+			    {'EXIT',Pid,Reason} ->
+				receive done -> Main ! done end
+			after 1000 ->
+				receive
+				    Other ->
+					?dbg("Got garbage when waiting for exit:"
+					     " ~p", [Other]),
+					Main ! done,
+					exit({got_unexpected,Other})
+				after 0 ->
+					ok
+				end
+			end;
+		    Other ->
+			?dbg("Got garbage: ~p",[Other]),
+			exit(Other)
+		end
+	end,
+
+    spawn_link(Fun),
+    ok = jitu:java(?config(java, Config),
+		   ?config(data_dir, Config),
+		   "MboxLinkUnlink",
+		   [erlang:get_cookie(),node()]).
+
+erl_status_server(List) ->
+    register(erl_status_server,self()),
+    erl_status_server(List,undefined).
+erl_status_server([{opt,{Tag,NodeName,Up}},{Tag2,NodeName2,Up2}|Rest],_) ->
+    receive
+	{Tag,Node,Up,From} = M ->
+	    ?dbg("erl_status_server got: ~p",[M]),
+	    true = lists:prefix(NodeName,Node),
+	    erl_status_server([{Tag2,NodeName2,Up2}|Rest],From);
+	{Tag2,Node2,Up2,From2} = M2 ->
+	    ?dbg("erl_status_server got: ~p",[M2]),
+	    true = lists:prefix(NodeName2,Node2),
+	    erl_status_server(Rest,From2)
+    end;
+erl_status_server([{Tag,NodeName,Up}|Rest],_) ->
+    receive
+	{Tag,Node,Up,From} = M ->
+	    ?dbg("erl_status_server got: ~p",[M]),
+	    true = lists:prefix(NodeName,Node),
+	    erl_status_server(Rest,From);
+	Other ->
+	    ?dbg("erl_status_server got garbage: ~p",[Other]),
+	    exit(Other)
+    end;
+erl_status_server([],From) ->
+    From ! done.
diff --git a/lib/jinterface/test/jinterface_SUITE_data/BooleanAtom.java b/lib/jinterface/test/jinterface_SUITE_data/BooleanAtom.java
new file mode 100644
index 0000000000..9554d50c9f
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/BooleanAtom.java
@@ -0,0 +1,46 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class BooleanAtom {
+
+    /*
+      Implements test case jinterface_SUITE:boolean_atom/1
+
+      Test the function OtpErlangAtom.booleanValue()
+    */
+
+    public static void main(String argv[]) {
+
+	OtpErlangAtom atom = new OtpErlangAtom("true");
+	if (!atom.booleanValue()) fail(1);
+
+	atom = new OtpErlangAtom("false");
+	if (atom.booleanValue()) fail(2);
+
+	atom = new OtpErlangAtom("somethingelse");
+	if (atom.booleanValue()) fail(3);
+
+    }
+
+    private static void fail(int reason) {
+	System.exit(reason);
+    }
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/GetNames.java b/lib/jinterface/test/jinterface_SUITE_data/GetNames.java
new file mode 100644
index 0000000000..3d2bc4ac84
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/GetNames.java
@@ -0,0 +1,68 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
+ */
+
+import java.util.ArrayList;
+import com.ericsson.otp.erlang.*;
+
+class GetNames {
+
+    /*
+      Implements test case jinterface_SUITE:get_names/1
+
+    */
+
+    public static void main(String argv[]) {
+
+	try {
+	    OtpNode node = new OtpNode("javanode");
+	    OtpMbox mbox1 = node.createMbox();
+	    mbox1.registerName("mbox1");
+	    node.createMbox("mbox2");
+	    OtpMbox mbox3 = node.createMbox();
+	    node.registerName("mbox3",mbox3);
+
+	    ArrayList existing_names = new ArrayList();
+	    existing_names.add("mbox3");
+	    existing_names.add("mbox2");
+	    existing_names.add("mbox1");
+
+	    String[] names = node.getNames();
+	    if (names.length != existing_names.size()) fail(1);
+
+	    for(int i=0; i<names.length; i++) {
+		System.out.println("" + names[i]);
+		existing_names.remove(names[i]);
+	    }
+
+	    if (!existing_names.isEmpty()) fail(2);
+	}
+	catch (Exception e) {
+	    fail("" + e, 3);
+	}
+    }
+
+    private static void fail(int reason) {
+	System.exit(reason);
+    }
+
+    private static void fail(String str, int reason) {
+	System.out.println(str);
+	System.exit(reason);
+    }
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/Makefile.src b/lib/jinterface/test/jinterface_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..2a3dca463b
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/Makefile.src
@@ -0,0 +1,62 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2004-2010. 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%
+#
+
+# Note: This file *must* work for both Unix and Windows
+#
+# We use both `rm' (Unix) and `del' (Windows) for removing files, but
+# with a `-' in front so that the error in not finding `rm' (`del') on
+# Windows (Unix) is ignored.
+#
+# VxWorks? XXX
+#
+
+.SUFFIXES:
+.SUFFIXES: .java
+
+
+JAVAC = @JAVAC@
+ERLC = erlc
+
+JINTERFACE_CLASSPATH = @jinterface_classpath@
+
+CLASSPATH = .@PS@$(JINTERFACE_CLASSPATH)@PS@
+
+JAVA_FILES = \
+	Nodename.java \
+	RegisterAndWhereis.java \
+	GetNames.java \
+	BooleanAtom.java \
+	NodePing.java \
+	MboxPing.java \
+	MboxSendReceive.java \
+	MboxLinkUnlink.java \
+	NodeStatusHandler.java
+
+CLASS_FILES = $(JAVA_FILES:.java=.class)
+
+all: $(CLASS_FILES)
+
+clean:
+	-rm -f $(CLASS_FILES)
+	-del /F /Q $(CLASS_FILES)
+
+$(CLASS_FILES) : $(JAVA_FILES)
+	$(JAVAC) -classpath $(CLASSPATH) $(JAVA_FILES)
+
+#
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java b/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java
new file mode 100644
index 0000000000..5d1d097cc8
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java
@@ -0,0 +1,201 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class MboxLinkUnlink {
+
+    /*
+      Implements test case jinterface_SUITE:mbox_link_unlink/1
+
+
+
+    */
+
+    private static final int java_link_and_exit = 1;
+    private static final int erl_link_and_exit = 2;
+    private static final int erl_link_java_exit = 3;
+    private static final int java_link_erl_exit = 4;
+    private static final int internal_link_linking_exits = 5;
+    private static final int internal_link_linked_exits = 6;
+    private static final int internal_unlink_linking_exits = 7;
+    private static final int internal_unlink_linked_exits = 8;
+    private static final int normal_exit = 9;
+    private static final int kill_mbox = 10;
+    private static final int kill_erl_proc_from_java = 11;
+    private static final int kill_mbox_from_erlang = 12;
+    private static final int erl_exit_with_reason_any_term = 13;
+    private static final int java_exit_with_reason_any_term = 14;
+
+    private static boolean dbg = true;
+
+
+    public static void main(String argv[]) {
+
+
+	//String cookie = argv[0];
+	String erlNode = argv[1];
+	OtpErlangObject expected = null;
+	boolean waiting = false;
+
+	try { //
+	    OtpNode node = new OtpNode("javanode");
+	    OtpMbox mainMbox = node.createMbox();
+
+	    try {
+		// Initiate and set up connection to erlang process
+		OtpMbox mbox = node.createMbox();
+		OtpMbox mbox2;
+
+		OtpErlangObject[] msg = {mainMbox.self(),mbox.self()};
+		mbox.send("erl_link_server", erlNode, new OtpErlangTuple(msg));
+		OtpErlangObject o = mbox.receive(1000);
+		if (o == null) System.exit(1);
+		OtpErlangTuple tuple = (OtpErlangTuple)o;
+		int tag = (int)((OtpErlangLong)tuple.elementAt(0)).longValue();
+
+		switch (tag) {
+
+		case java_exit_with_reason_any_term:
+		case java_link_and_exit:
+		    dbg("Java got \"java_link_and_exit\" or " +
+			"\"java_exit_with_reason_any_term\"");
+		    mbox.link((OtpErlangPid)tuple.elementAt(1));
+		    mbox.send((OtpErlangPid)tuple.elementAt(1),
+			      new OtpErlangAtom("ok"));
+		    mbox.exit(tuple.elementAt(2));
+		    break;
+		case erl_exit_with_reason_any_term:
+		case erl_link_and_exit:
+		    dbg("Java got \"erl_link_and_exit\" or " +
+			"\"erl_exit_with_reason_any_term\"");
+		    mbox.send((OtpErlangPid)tuple.elementAt(1),
+			      new OtpErlangAtom("ok"));
+		    waiting = true;
+		    expected = tuple.elementAt(2);
+		    mbox.receive(1000);
+		    System.exit(2);
+		case erl_link_java_exit:
+		    dbg("Java got \"erl_link_java_exit\"");
+		    mbox.exit(tuple.elementAt(2));
+		    break;
+		case java_link_erl_exit:
+		    dbg("Java got \"java_link_erl_exit\"");
+		    mbox.link((OtpErlangPid)tuple.elementAt(1));
+		    mbox.send((OtpErlangPid)tuple.elementAt(1),
+			      new OtpErlangAtom("ok"));
+		    waiting = true;
+		    expected = tuple.elementAt(2);
+		    mbox.receive(1000);
+		    System.exit(3);
+		case internal_link_linking_exits:
+		    dbg("Java got \"internal_link_linking_exits\"");
+		    mbox2 = node.createMbox();
+		    mbox.link(mbox2.self());
+		    mbox.exit(tuple.elementAt(2));
+		    waiting = true;
+		    expected = tuple.elementAt(2);
+		    mbox2.receive(1000); // hanging waiting for exit
+		    System.exit(4);  // got someting other than exit
+		case internal_link_linked_exits:
+		    dbg("Java got \"internal_link_linked_exits\"");
+		    mbox2 = node.createMbox();
+		    mbox.link(mbox2.self());
+		    mbox2.exit(tuple.elementAt(2));
+		    waiting = true;
+		    expected = tuple.elementAt(2);
+		    mbox.receive(1000); // hanging waiting for exit
+		    System.exit(5);  // got someting other than exit
+		case internal_unlink_linking_exits:
+		    dbg("Java got \"internal_unlink_linking_exits\"");
+		    mbox2 = node.createMbox();
+		    mbox.link(mbox2.self());
+		    mbox.unlink(mbox2.self());
+		    mbox.link(mbox2.self());
+		    mbox2.unlink(mbox.self());
+		    mbox2.exit(tuple.elementAt(2));
+		    if (mbox.receive(500)!=null) System.exit(6);
+		    break;
+		case internal_unlink_linked_exits:
+		    dbg("Java got \"internal_unlink_linked_exits\"");
+		    mbox2 = node.createMbox();
+		    mbox.link(mbox2.self());
+		    mbox.unlink(mbox2.self());
+		    mbox.link(mbox2.self());
+		    mbox2.unlink(mbox.self());
+		    mbox.exit(tuple.elementAt(2));
+		    if (mbox2.receive(500)!=null) System.exit(7);
+		    break;
+		case normal_exit:
+		    dbg("Java got \"normal_exit\"");
+		    mbox.close();
+		    break;
+		case kill_mbox:
+		    dbg("Java got \"kill_mbox\"");
+		    mbox.exit("kill");
+		    break;
+		case kill_erl_proc_from_java:
+		    dbg("Java got \"kill_erl_proc_from_java\"");
+		    mbox.exit((OtpErlangPid)tuple.elementAt(1),"kill");
+		    break;
+		case kill_mbox_from_erlang:
+		    dbg("Java got \"kill_mbox_from_erlang\"");
+		    /* This will make the testcase successful, but it is
+		       not the correct way to do it...
+		       Mbox should probably just die when the kill signal is
+		       received from erlang (or other mbox).
+
+		    try {
+			mbox.receive(1000);
+			System.exit(8);
+		    }
+		    catch (OtpErlangExit exit) {
+			if(!(exit.reason().equals(new OtpErlangAtom("kill"))))
+			    System.exit(9);
+			mbox.exit("killed");
+		    }
+		    */
+		    break;
+		}
+	    }
+	    catch (OtpErlangExit exit) {
+		dbg("Java got exit: " + exit.reason());
+		if(!(waiting && exit.reason().equals(expected)))
+		    System.exit(10);
+	    }
+
+	    OtpErlangAtom done = new OtpErlangAtom("done");
+	    mainMbox.send("erl_link_server", erlNode, done);
+	    OtpErlangObject o = mainMbox.receive(1000);
+	    if (o == null) System.exit(11);
+	    else if (!((OtpErlangAtom)o).equals(done))
+		System.exit(12);
+
+	}
+	catch (Exception e) {
+	    System.out.println("EXCEPTION: " + e);
+	    System.exit(13);
+	}
+    }
+
+    private static void dbg(String str) {
+	if (dbg) System.out.println(str);
+    }
+
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxPing.java b/lib/jinterface/test/jinterface_SUITE_data/MboxPing.java
new file mode 100644
index 0000000000..3a8497028e
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/MboxPing.java
@@ -0,0 +1,50 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class MboxPing {
+
+    /*
+      Implements test case jinterface_SUITE:mbox_ping/1
+
+      Creates an OtpNode object with an OtpMbox object. The test_server
+      node is pinged from the OtpMbox.
+    */
+
+    public static void main(String argv[]) {
+
+	try {
+	    OtpNode node = new OtpNode("javanode",argv[0]);
+	    OtpMbox mbox = node.createMbox();
+	    if (mbox.ping(argv[1],2000)) {
+		System.out.println("OtpMbox.ping(" + argv[1] + ") -> true");
+	    }
+	    else {
+		System.out.println("ERROR: OtpMbox.ping(" + argv[1] +
+				   ") -> false");
+		System.exit(1);
+	    }
+	}
+	catch (Exception e) {
+	    System.out.println("" + e);
+	    System.exit(2);
+	}
+    }
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java b/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java
new file mode 100644
index 0000000000..2db71bb5cd
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java
@@ -0,0 +1,229 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class MboxSendReceive {
+
+    /*
+      Implements test case jinterface_SUITE:mbox_send_receive/1
+
+      Test OtpMbox.send(...) and OtpMbox.receive(...)
+     */
+
+    private static final boolean dbg = true;
+    private static final int recTime = 2000;
+
+    private static final int java_erlang_send_receive = 1;
+    private static final int java_internal_send_receive_same_node = 2;
+    private static final int java_internal_send_receive_different_nodes = 3;
+    private static final int java_internal_send_receive_self = 4;
+
+    public static void main(String argv[]) {
+
+	String cookie = argv[0];
+	String erlNode = argv[1];
+
+	OtpErlangObject[] msgArray = new OtpErlangObject[2];
+	msgArray[1] = new OtpErlangAtom("hello world");
+	OtpErlangTuple msg = null;
+
+	try {
+	    // Initiate: create javanode and mboxes
+	    OtpNode node = new OtpNode("javanode",cookie);
+	    OtpMbox mbox = node.createMbox();
+	    OtpMbox mbox2 = node.createMbox("java_echo_server2");
+
+	    // Send the pid of mbox to erlang and wait for test case
+	    // instruction: {TestCaseTag, Pid}
+	    mbox.send("erl_send_receive_server", erlNode, mbox.self());
+	    OtpErlangObject o = mbox.receive(recTime);
+	    if (o == null) System.exit(1);
+	    OtpErlangTuple testCase = (OtpErlangTuple)o;
+	    dbg("mbox received " + testCase);
+	    int tag = (int)((OtpErlangLong)testCase.elementAt(0)).longValue();
+	    OtpErlangPid erlangPid = (OtpErlangPid)testCase.elementAt(1);
+
+	    switch (tag) {
+
+	    case java_erlang_send_receive:
+
+		// Test1 (happened during initiation):
+		// Send mbox pid to erlang process with registered name.
+		// Erlang process sent back its pid to the mbox pid.
+
+		// Test2: Register name and sent it to the erlang pid. Erlang
+		// process shall send message back to my registered name.
+
+		mbox.registerName("java_echo_server");
+		msgArray[0] = getNameNode("java_echo_server",node);
+		msg = new OtpErlangTuple(msgArray);
+
+		dbg("java_echo_server sending " + msg);
+		mbox.send(erlangPid,msg);
+
+		o = mbox.receive(recTime);
+		dbg("java_echo_server received " + o);
+		if (o == null) System.exit(2);
+		if (!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(3);
+
+		// Test3: Same as Test2, but using a new mbox2 which
+		// got its name already when it is created - i.e. not
+		// using mbox.registerName
+		msgArray[0] = getNameNode("java_echo_server2",node);
+		msg = new OtpErlangTuple(msgArray);
+
+		dbg("java_echo_server2 sending " + msg);
+		mbox2.send(erlangPid,msg);
+
+		o = mbox2.receive(recTime);
+		dbg("java_echo_server received " + o);
+		if (o == null) System.exit(4);
+		if (!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(5);
+
+		break;
+
+	    case java_internal_send_receive_same_node:
+
+		// Test1: Sending message between mboxes on same node
+		// given registered name and node without host.
+		mbox.send("java_echo_server2","javanode",msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(6);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(7);
+
+		// Test2: Sending message between mboxes on same node
+		// given registered name and node with host.
+		mbox.send("java_echo_server2",mbox2.self().node(),msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(8);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(9);
+
+		// Test3: Sending message between mboxes on same node
+		// given registered name but not node.
+		mbox.send("java_echo_server2",msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(10);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(11);
+
+		// Test4: Sending message between mboxes on same node
+		// given pid.
+		mbox.send(mbox2.self(),msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(12);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(13);
+
+		break;
+
+	    case java_internal_send_receive_different_nodes:
+
+		OtpNode node2 = new OtpNode("javanode2", cookie);
+		OtpMbox mboxOtherNode = node2.createMbox("mboxOtherNode");
+
+		// Test1: Sending message between mboxes on different
+		// nodes given registered name and node without host.
+		mbox.send("mboxOtherNode","javanode2",msgArray[1]);
+		o = mboxOtherNode.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(14);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(15);
+
+		// Test2: Sending message between mboxes on different
+		// nodes given registered name and node with host.
+		mbox.send("mboxOtherNode",mboxOtherNode.self().node(),
+			  msgArray[1]);
+		o = mboxOtherNode.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(16);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(17);
+
+		// Test3: Sending message between mboxes on different
+		// nodes given pid.
+		mbox.send(mboxOtherNode.self(),msgArray[1]);
+		o = mboxOtherNode.receive(recTime);
+		dbg("Mbox at same node: " + o);
+		if (o == null) System.exit(18);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(19);
+
+		break;
+
+
+	    case java_internal_send_receive_self:
+
+		// Test1: Sending message to myself given registered
+		// name and node without host.
+		mbox2.send("java_echo_server2","javanode",msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Self: " + o);
+		if (o == null) System.exit(18);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(19);
+
+		// Test2: Sending message to myself given registered
+		// name and node with host.
+		mbox2.send("java_echo_server2",mbox2.self().node(),msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Self: " + o);
+		if (o == null) System.exit(20);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(21);
+
+		// Test3: Sending message to myself given registered
+		// name but not host.
+		mbox2.send("java_echo_server2",msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Self: " + o);
+		if (o == null) System.exit(22);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(23);
+
+		// Test4: Sending message to myself given pid.
+		mbox2.send(mbox2.self(),msgArray[1]);
+		o = mbox2.receive(recTime);
+		dbg("Self: " + o);
+		if (o == null) System.exit(24);
+		if(!((OtpErlangAtom)o).equals(msgArray[1])) System.exit(25);
+
+		break;
+
+	    }
+
+	    // Closing erl_send_receive_server by sending the atom 'done' to it.
+	    mbox.send(erlangPid,new OtpErlangAtom("done"));
+	}
+	catch (Exception e) {
+	    System.out.println("" + e);
+	    System.exit(26);
+	}
+    }
+
+    private static OtpErlangTuple getNameNode(String mboxName,OtpNode node) {
+	OtpErlangObject[] array = {new OtpErlangAtom(mboxName),
+				   new OtpErlangAtom(node.node())};
+	return new OtpErlangTuple(array);
+
+    }
+
+    private static void dbg(String str) {
+	if (dbg) System.out.println(str);
+    }
+
+
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/NodePing.java b/lib/jinterface/test/jinterface_SUITE_data/NodePing.java
new file mode 100644
index 0000000000..d0df5c46b5
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/NodePing.java
@@ -0,0 +1,83 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class NodePing {
+
+    /*
+      Implements test case jinterface_SUITE:node_ping/1
+
+      Creates three OtpNode objects. One with default cookie, one with
+      specified same cookie as the node running the test case and one
+      with a faulty cookie. From each OtpNode object the test_server
+      node is pinged.
+
+      Also the default cookie node pings itself, and the node with the
+      specified cookie pings the node with default cookie.
+    */
+
+    public static void main(String argv[]) {
+
+	String cookie = argv[0];
+	String erlNode = argv[1];
+
+	try {
+	    OtpNode node1 = new OtpNode("javanode1");
+	    ping(node1,erlNode,"Default cookie:",true,1);
+	    ping(node1,node1.node(),"Self:",true,2);
+	    ping(node1,"javanode1","Self:",true,3);
+
+	    OtpNode node2 = new OtpNode("javanode2",cookie);
+	    ping(node2,erlNode,"Specified cookie:",true,4);
+	    ping(node2,"javanode1","Javanode (no host):",true,5);
+	    ping(node2,node1.node(),"Javanode:",true,6);
+
+	    OtpNode node3 = new OtpNode("javanode3","faultycookie");
+	    ping(node3,erlNode,"Faulty cookie:",false,7);
+
+	    // Test OtpNode.cookie() and OtpNode.setCookie(cookie) as well
+	    if (!node3.cookie().equals("faultycookie"))
+		fail("Testing OtpNode.cookie()",8);
+	    String old = node3.setCookie(cookie);
+	    if (!old.equals("faultycookie"))
+		fail("Checking return of OtpNode.setCookie(cookie)",9);
+	    ping(node3,erlNode,"setCookie:",true,10);
+	}
+	catch (Exception e) {
+	    fail("" + e, 11);
+	}
+    }
+
+    private static void ping(OtpNode node, String remote, String descr,
+			     boolean expected, int reason) {
+	if ( node.ping(remote,2000) == expected ) {
+	    System.out.println(descr + " ping(" + remote + ") -> " + expected);
+	}
+	else {
+	    fail("ERROR: " + descr + " ping(" + remote +") -> " + !expected,
+		 reason);
+	}
+    }
+
+    private static void fail(String str, int reason) {
+	System.out.println(str);
+	System.exit(reason);
+    }
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java b/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java
new file mode 100644
index 0000000000..51ea15b5ef
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java
@@ -0,0 +1,168 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+public class NodeStatusHandler extends OtpNodeStatus {
+    /*
+      Implements java side of test cases in jinterface_SUITE.erl
+
+      Test OtpNode.registerStatusHandler(...) and class OtpNodeStatus.
+     */
+
+    private static final boolean dbg = true;
+    private static final int recTime = 2000;
+
+    private static String erlNode = null;
+    private static String cookie = null;
+    private static OtpMbox mbox = null;
+
+    private static final int status_handler_localStatus = 1;
+    private static final int status_handler_remoteStatus = 2;
+    private static final int status_handler_connAttempt = 3;
+
+    public static void main(String argv[]) {
+
+	cookie = argv[0];
+	erlNode = argv[1];
+
+	try {
+	  OtpNode javaNode = new OtpNode("javanode", cookie);
+	  mbox = javaNode.createMbox();
+	}
+	catch (Exception e) {
+	    dbg("EXCEPTION when creating javanode: " + e);
+	    System.exit(1);
+	}
+
+	try {
+	    OtpNode node1 = new OtpNode("javanode1", cookie);
+	    node1.registerStatusHandler(new NodeStatusHandler());
+
+	    switch (Integer.parseInt(argv[2])) {
+
+	    case status_handler_localStatus:
+		dbg("java running test case \"status_handler_localStatus\"");
+
+		Thread.sleep(200); // Give 'nodeup' message a chance
+		                   // before closing
+		node1.close();
+		Thread.sleep(500);
+		break;
+
+	    case status_handler_remoteStatus:
+		dbg("java running test case \"status_handler_remoteStatus\"");
+
+		OtpNode node2 = new OtpNode("javanode2", cookie);
+		node2.ping(node1.node(),2000);
+		node2.close();
+		Thread.sleep(500);
+		break;
+
+	    case status_handler_connAttempt:
+		dbg("java running test case \"status_handler_connAttempt\"");
+
+		OtpNode node3 = new OtpNode("javanode3","othercookie");
+		node3.ping(node1.node(),2000);
+		node1.ping(node3.node(),2000);
+		break;
+
+	    }
+
+	    OtpErlangObject o = mbox.receive(recTime);
+	    if (o == null) System.exit(2);
+	    if (! ((OtpErlangAtom)o).atomValue().equals("done"))
+		System.exit(3);
+
+	}
+	catch (Exception e) {
+	    dbg("EXCEPTION: " + e);
+	    System.exit(4);
+	}
+
+    }
+
+
+
+  public void remoteStatus(String node, boolean up, Object info) {
+      try {
+	  dbg("Got remoteStatus: " + node + " " + up + " "  + info);
+	  OtpErlangObject[] msgArray = new OtpErlangObject[4];
+	  msgArray[0] = new OtpErlangAtom("remoteStatus");
+	  msgArray[1] = new OtpErlangString(node);
+	  msgArray[2] = new OtpErlangBoolean(up);
+	  msgArray[3] = mbox.self();
+	  OtpErlangTuple msg = new OtpErlangTuple(msgArray);
+	  mbox.send("erl_status_server", erlNode, msg);
+
+      }
+      catch (Exception e) {
+	  dbg("EXCEPTION in remoteStatus: " + e + "\nArgs:  " +
+			     node + " " + up + " "  + info);
+	  System.exit(5);
+      }
+  }
+
+
+  public void localStatus(String node, boolean up, Object info) {
+      try {
+	  dbg("Got localStatus: " + node + " " + up + " "  + info);
+	  OtpErlangObject[] msgArray = new OtpErlangObject[4];
+	  msgArray[0] = new OtpErlangAtom("localStatus");
+	  msgArray[1] = new OtpErlangString(node);
+	  msgArray[2] = new OtpErlangBoolean(up);
+	  msgArray[3] = mbox.self();
+	  OtpErlangTuple msg = new OtpErlangTuple(msgArray);
+	  mbox.send("erl_status_server", erlNode, msg);
+
+      }
+      catch (Exception e) {
+	  dbg("EXCEPTION in localStatus: " + e + "\nArgs:  " +
+			     node + " " + up + " "  + info);
+	  System.exit(6);
+      }
+  }
+
+
+
+  public void connAttempt(String node, boolean incoming, Object info) {
+      try {
+	  dbg("Got connAttempt: " + node + " " + incoming + " "  + info);
+	  OtpErlangObject[] msgArray = new OtpErlangObject[4];
+	  msgArray[0] = new OtpErlangAtom("connAttempt");
+	  msgArray[1] = new OtpErlangString(node);
+	  msgArray[2] = new OtpErlangBoolean(incoming);
+	  msgArray[3] = mbox.self();
+	  OtpErlangTuple msg = new OtpErlangTuple(msgArray);
+	  mbox.send("erl_status_server", erlNode, msg);
+
+      }
+      catch (Exception e) {
+	  dbg("EXCEPTION in connAttempt: " + e + "\nArgs:  " +
+			     node + " " + incoming + " "  + info);
+	  System.exit(7);
+      }
+  }
+
+
+    private static void dbg(String str) {
+	if (dbg) System.out.println(str);
+    }
+
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/Nodename.java b/lib/jinterface/test/jinterface_SUITE_data/Nodename.java
new file mode 100644
index 0000000000..dc8cb9c49f
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/Nodename.java
@@ -0,0 +1,54 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class Nodename {
+
+    /*
+      Implements test case jinterface_SUITE:nodename/1
+
+    */
+
+    public static void main(String argv[]) {
+
+	String host = argv[0];
+
+	try {
+	    OtpNode node = new OtpNode("javanode");
+	    System.out.println("Given host: " + host +
+			       " Host: " + node.host() +
+			       " Alive: " + node.alive() +
+			       " Node: " + node.node());
+
+	    if (!node.host().equals(host)) fail(1);
+	    if (!node.alive().equals("javanode")) fail(2);
+	    if (!node.node().equals("javanode@" + host)) fail(3);
+	}
+	catch (Exception e) {
+	    System.out.println("" + e);
+	    fail(4);
+	}
+    }
+
+    private static void fail(int reason) {
+	System.exit(reason);
+    }
+
+}
diff --git a/lib/jinterface/test/jinterface_SUITE_data/RegisterAndWhereis.java b/lib/jinterface/test/jinterface_SUITE_data/RegisterAndWhereis.java
new file mode 100644
index 0000000000..9df01981b2
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/RegisterAndWhereis.java
@@ -0,0 +1,79 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+class RegisterAndWhereis {
+
+    /*
+      Implements test case jinterface_SUITE:register_and_whereis/1
+
+    */
+
+    public static void main(String argv[]) {
+
+	try {
+	    OtpNode node = new OtpNode("javanode");
+	    OtpMbox mbox1 = node.createMbox();
+	    mbox1.registerName("mbox1");
+	    OtpMbox mbox2 = node.createMbox("mbox2");
+	    OtpMbox mbox3 = node.createMbox();
+	    node.registerName("mbox3",mbox3);
+
+	    OtpErlangPid pid1 = mbox1.self();
+	    OtpErlangPid pid2 = mbox2.self();
+	    OtpErlangPid pid3 = mbox3.self();
+
+	    if (!pid1.equals(node.whereis("mbox1"))) fail(1);
+	    if (!pid1.equals(mbox1.whereis("mbox1"))) fail(2);
+	    if (!pid1.equals(mbox2.whereis("mbox1"))) fail(3);
+	    if (!pid1.equals(mbox3.whereis("mbox1"))) fail(4);
+	    if (!pid2.equals(node.whereis("mbox2"))) fail(5);
+	    if (!pid2.equals(mbox2.whereis("mbox2"))) fail(6);
+	    if (!pid3.equals(node.whereis("mbox3"))) fail(7);
+	    if (!pid3.equals(mbox3.whereis("mbox3"))) fail(8);
+
+	    node.closeMbox(mbox1);
+	    mbox2.close();
+
+	    if (node.whereis("mbox1") != null) fail(9);
+	    if (node.whereis("mbox2") != null) fail(10);
+	    if (mbox3.whereis("mbox1") != null) fail(11);
+	    if (mbox3.whereis("mbox2") != null) fail(12);
+
+	    mbox3.close();
+	    if (mbox2.whereis("mbox3") != null) fail(13);
+
+
+
+	}
+	catch (Exception e) {
+	    fail("" + e, 14);
+	}
+    }
+
+    private static void fail(int reason) {
+	System.exit(reason);
+    }
+
+    private static void fail(String str, int reason) {
+	System.out.println(str);
+	System.exit(reason);
+    }
+}
diff --git a/lib/jinterface/test/jitu.erl b/lib/jinterface/test/jitu.erl
new file mode 100644
index 0000000000..c57fb9bfad
--- /dev/null
+++ b/lib/jinterface/test/jitu.erl
@@ -0,0 +1,156 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2010. 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%
+%%
+
+%%----------------------------------------------------------------------
+%% JInterface Test Utils
+%%----------------------------------------------------------------------
+-module(jitu).
+
+
+-export([java/3,
+	 java/4,
+	 java/5,
+	 init_all/1,
+	 finish_all/1]).
+
+%%
+%% Lots of stuff here are originating from java_client_erl_server_SUITE.erl
+%% (ic) ...
+%%
+
+
+
+java(Java, Dir, ClassAndArgs) ->
+    cmd(Java++" -classpath "++classpath(Dir)++" "++ClassAndArgs).
+
+java(Java, Dir, Class, Args) ->
+    java(Java, Dir, Class++" "++to_string(Args)).
+
+java(Java, Dir, Class, Args, Props) ->
+    java(Java, Dir, Props++" "++Class, Args).
+
+
+
+
+init_all(Config) when list(Config) ->
+    case find_executable(["java"]) of
+	false -> {skip,"Found no Java VM"};
+	Path -> [{java,Path}|Config]
+    end.
+
+finish_all(Config) -> Config.
+
+%%
+%% Internal stuff...
+%%
+
+
+find_executable([]) ->
+    false;
+find_executable([E|T]) ->
+    case os:find_executable(E) of
+	false -> find_executable(T);
+	Path -> Path
+    end.
+
+to_string([H|T]) when integer(H) ->
+    integer_to_list(H)++" "++to_string(T);
+to_string([H|T]) when atom(H) ->
+    atom_to_list(H)++" "++to_string(T);
+to_string([H|T]) when pid(H) ->
+    pid_to_list(H)++" "++to_string(T);
+to_string([H|T]) when list(H) ->
+    lists:flatten(H)++" "++to_string(T);
+to_string([]) -> [].
+
+% javac(Dir, File) ->
+%     cmd("javac -d "++Dir++" -classpath "++classpath(Dir)++" "++
+% 	filename:join(Dir, File)).
+
+classpath(Dir) ->
+    PS =
+	case os:type() of
+	    {win32, _} -> ";";
+	    _          -> ":"
+	end,
+    Dir++PS++
+	filename:join([code:lib_dir(jinterface),"priv","OtpErlang.jar"])++PS++
+	case os:getenv("CLASSPATH") of
+	    false -> "";
+	    Classpath -> Classpath
+	end.
+
+
+cmd(Cmd) ->
+    PortOpts = [{line,80},eof,exit_status,stderr_to_stdout],
+    io:format("cmd: ~s~n", [Cmd]),
+    case catch open_port({spawn,Cmd}, PortOpts) of
+	Port when port(Port) ->
+	    Result = cmd_loop(Port, []),
+	    io:format("cmd res: ~w~n", [Result]),
+	    case Result of
+		0 -> ok;
+		ExitCode when integer(ExitCode) -> {error,ExitCode};
+		Error -> Error
+	    end;
+	{'EXIT',Reason} ->
+	    {error,Reason}
+    end.
+
+cmd_loop(Port, Line) ->
+    receive
+	{Port,eof} ->
+	    receive
+		{Port,{exit_status,ExitStatus}} ->
+		    ExitStatus
+	    after 1 ->
+		    undefined
+	    end;
+	{Port,{exit_status,ExitStatus}} ->
+	    receive
+		{Port,eof} ->
+		    ok after 1 -> ok end,
+	    ExitStatus;
+	{Port,{data,{Tag,Data}}} ->
+	    case Tag of
+		eol ->
+		    io:put_chars([Line|cr_to_nl(Data)]),
+		    io:nl(),
+		    cmd_loop(Port, []);
+		noeol ->
+		    cmd_loop(Port, [Line|cr_to_nl(Data)])
+	    end;
+	{'EXIT',Port,Reason} ->
+	    {error,Reason};
+	Other ->
+	    io:format("WARNING: Unexpected at ~s:~p: ~p~n",
+		      [?MODULE_STRING,?LINE,Other]),
+	    cmd_loop(Port, Line)
+    end.
+
+%% Convert lonely CR to NL, and CRLF to NL
+%%
+cr_to_nl([$\r,$\n|T]) ->
+    [$\n|cr_to_nl(T)];
+cr_to_nl([$\r|T]) ->
+    [$\n|cr_to_nl(T)];
+cr_to_nl([C|T]) ->
+    [C|cr_to_nl(T)];
+cr_to_nl([]) ->
+    [].
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl
new file mode 100644
index 0000000000..03f6f2036c
--- /dev/null
+++ b/lib/jinterface/test/nc_SUITE.erl
@@ -0,0 +1,740 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2010. 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(nc_SUITE).
+
+
+-include_lib("common_test/include/ct.hrl").
+-include("test_server_line.hrl").
+
+
+-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]).
+
+-export([pid_roundtrip/1,
+	 port_roundtrip/1,
+	 ref_roundtrip/1,
+	 new_float/1,
+	 old_stuff/1,
+	 binary_roundtrip/1,
+	 decompress_roundtrip/1,
+	 compress_roundtrip/1,
+	 integer_roundtrip/1,
+	 fun_roundtrip/1,
+	 lists_roundtrip/1,
+	 lists_roundtrip_2/1,
+	 lists_iterator/1,
+	 unicode/1,
+	 unicode_list_to_string/1,
+	 unicode_string_to_list/1,
+	 connect/1]).
+
+
+%% Top of cases
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [pid_roundtrip, port_roundtrip, ref_roundtrip,
+     new_float, old_stuff, binary_roundtrip,
+     decompress_roundtrip, compress_roundtrip,
+     integer_roundtrip, fun_roundtrip, lists_roundtrip,
+     lists_roundtrip_2, lists_iterator, unicode,
+     unicode_list_to_string, unicode_string_to_list, connect].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+init_per_suite(Config) when is_list(Config) ->
+    case case code:priv_dir(jinterface) of
+	     {error,bad_name} -> false;
+	     P -> filelib:is_dir(P) end of
+	true ->
+	    jitu:init_all(Config);
+	false ->
+	    {skip,"No jinterface application"}
+    end.
+
+end_per_suite(Config) ->
+    jitu:finish_all(Config).
+
+
+
+%% Add/remove watchdog before/after each test case.
+%%
+init_per_testcase(Case, Config) ->
+    T = case atom_to_list(Case) of
+	    "unicode"++_ -> 240;
+	    _ -> 20
+	end,
+    WatchDog = test_server:timetrap(test_server:seconds(T)),
+    [{watchdog, WatchDog}| Config].
+
+end_per_testcase(_Case, Config) ->
+    WatchDog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(WatchDog).
+
+
+%%
+%% Test cases
+%%
+
+pid_roundtrip(doc) -> [];
+pid_roundtrip(suite) -> [];
+pid_roundtrip(Config) when is_list(Config)->
+    ThisNode = {node(), erlang:system_info(creation)},
+    RemNode = {gurka@sallad, 2},
+    do_echo([self(),
+	     mk_pid(ThisNode, 4711, 4711),
+	     mk_pid(ThisNode, 32767, 8191),
+	     mk_pid(RemNode, 4711, 4711),
+	     mk_pid(RemNode, 32767, 8191)],
+	    Config).
+
+fun_roundtrip(doc) -> [];
+fun_roundtrip(suite) -> [];
+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],
+	    Config).
+
+port_roundtrip(doc) -> [];
+port_roundtrip(suite) -> [];
+port_roundtrip(Config) when is_list(Config)->
+    ThisNode = {node(), erlang:system_info(creation)},
+    RemNode = {gurka@sallad, 2},
+    do_echo([hd(erlang:ports()),
+	     mk_port(ThisNode, 4711),
+	     mk_port(ThisNode, 268435455),
+	     mk_port(RemNode, 4711),
+	     mk_port(RemNode, 268435455)],
+	    Config).
+
+ref_roundtrip(doc) -> [];
+ref_roundtrip(suite) -> [];
+ref_roundtrip(Config) when is_list(Config)->
+    ThisNode = {node(), erlang:system_info(creation)},
+    RemNode = {gurka@sallad, 2},
+    do_echo([make_ref(),
+	     mk_ref(ThisNode, [4711]),
+	     mk_ref(ThisNode, [4711, 4711, 4711]),
+	     mk_ref(ThisNode, [262143, 4294967295, 4294967295]),
+	     mk_ref(RemNode, [4711]),
+	     mk_ref(RemNode, [4711, 4711, 4711]),
+	     mk_ref(RemNode, [262143, 4294967295, 4294967295])],
+	    Config).
+
+new_float(doc) -> [];
+new_float(suite) -> [];
+new_float(Config) when is_list(Config)->
+    Two16 = float(1 bsl 16),
+    X = math:sqrt(2),
+    Floats = lists:reverse(seq(1/X, 63, fun(Y) -> Y / Two16 end),
+			   [0.0|seq(X, 63, fun(Y) -> Y * Two16 end)]),
+    io:format("~w", [Floats]),
+    do_echo(Floats, Config).
+
+old_stuff(doc) -> [];
+old_stuff(suite) -> [];
+old_stuff(Config) when is_list(Config)->
+    Terms = [0.0,math:sqrt(2)],
+    OutTrans =
+	fun (D) ->
+		{self(),term_to_binary(D, [{minor_version,0}]),binary}
+	end,
+    InTrans =
+	fun (Echoer, D, {Echoer,D,binary}) ->
+		ok
+	end,
+    do_echo(Terms, Config, OutTrans, InTrans).
+
+binary_roundtrip(doc) -> [];
+binary_roundtrip(suite) -> [];
+binary_roundtrip(Config) when is_list(Config) ->
+    do_echo([<<17>>,
+	     <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17>>,
+	     <<3:2>>,
+	     <<3,7:3>>,
+	     <<>>],
+	    Config).
+
+decompress_roundtrip(doc) -> [];
+decompress_roundtrip(suite) -> [];
+decompress_roundtrip(Config) when is_list(Config) ->
+    Terms =
+	[0.0,
+	 math:sqrt(2),
+	 <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,31:5>>,
+	 make_ref()],
+    OutTrans =
+	fun (D) ->
+		{self(),term_to_binary(D, [compressed]),binary}
+	end,
+    InTrans =
+	fun (Echoer, D, {Echoer,D,binary}) ->
+		ok
+	end,
+    do_echo(Terms, Config, OutTrans, InTrans).
+
+compress_roundtrip(doc) -> [];
+compress_roundtrip(suite) -> [];
+compress_roundtrip(Config) when is_list(Config) ->
+    Terms =
+	[0.0,
+	 math:sqrt(2),
+	 <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,31:5>>,
+	 make_ref()],
+    OutTrans =
+	fun (D) ->
+		{self(),D,compress}
+	end,
+    InTrans =
+	fun (Echoer, D, {Echoer,B,compress}) ->
+		D = binary_to_term(B)
+	end,
+    do_echo(Terms, Config, OutTrans, InTrans).
+
+
+
+integer_roundtrip(doc) -> [];
+integer_roundtrip(suite) -> [];
+integer_roundtrip(Config) when is_list(Config) ->
+    Xs = [1 bsl X || X <- [26,27,28,29,30,31,32,33,
+			   62,63,64,65,
+			   126,127,128,129]],
+    Terms = [0,1,-1,-2]
+	++lists:flatmap(fun (X) -> [X-2,X-1,X,-X+1,-X,-X-1] end,
+			Xs),
+    io:format("~w", [Terms]),
+    OutTrans =
+	fun (V) ->
+		{self(),V,bigint}
+	end,
+    InTrans =
+	fun (Echoer, V, {Echoer,{V,W,X,L,U},bigint}) ->
+		Bitlength = bitlength(V),
+		{w,W} = {w,signum(V) * Bitlength},
+		Y = V band 16#FFFFffffFFFFffff,
+		{y,Y} = {y,X band 16#FFFFffffFFFFffff},
+		{l,L} = {l,if  V =:= X, Bitlength < 64 -> 1;
+			       true                    -> 0  end},
+		{u,U} = {u,if  V =:= Y, V >= 0, Bitlength =< 64 -> 1;
+			       true                             -> 0  end}
+	end,
+    do_echo(Terms, Config, OutTrans, InTrans).
+
+signum(V) when is_integer(V), V > 0 ->  1;
+signum(V) when is_integer(V), V < 0 -> -1;
+signum(0) ->                            0.
+
+bitlength(0) ->
+    0;
+bitlength(-1) ->
+    0;
+bitlength(V) when is_integer(V) ->
+    1 + bitlength(V bsr 1).
+
+
+
+lists_roundtrip(doc) -> [];
+lists_roundtrip(suite) -> [];
+lists_roundtrip(Config) when is_list(Config) ->
+    Ls = [lists:seq(1,10),
+	  lists:seq(11,17)++last_tail,
+	  [{default}],
+	  [car|cdr],
+	  [[]],
+	  []],
+    do_echo(Ls, Config).
+
+
+
+lists_roundtrip_2(doc) -> [];
+lists_roundtrip_2(suite) -> [];
+lists_roundtrip_2(Config) when is_list(Config) ->
+    Ls = [{[a,b],tail},
+	  {[c,d,e],tail},
+	  {[],tail},
+	  {[f],tail},
+	  {[g,h|i],tail},
+	  {[j,k,l|m],tail},
+	  {[n|o],tail},
+	  {[z,1,2,3,4],tail3},
+	  {[z,5,6,7],tail3},
+	  {[z,8,9],tail3},
+	  {[z,10],tail3},
+	  {[],tail3},
+	  {[z,11,12,13,14|15],tail3},
+	  {[z,16,17,18|19],tail3},
+	  {[z,20,21|22],tail3},
+	  {[z,23|24],tail3},
+	  {[z|25],tail3},
+	  {"abc123",sub3atom},
+	  {"abc",sub3atom}
+	 ],
+    Trans =
+	fun ([_|T], tail) ->
+		T;
+	    (L, tail) when is_list(L) ->
+		null;
+	    ([_,_,_|T], tail3) ->
+		T;
+	    (L, tail3) when is_list(L) ->
+		null;
+	    ([_,_,_|L], sub3atom) ->
+		list_to_atom(L)
+	end,
+    OutTrans =
+	fun ({L,Twist}) ->
+		{self(),L,Twist}
+	end,
+    InTrans =
+	fun (Echoer, {L,Twist}, {Echoer,X,Twist}) ->
+		Y = Trans(L, Twist),
+		io:format("## ~w ~w ~w ~w~n", [L,Twist,X,Y]),
+		X = Y
+	end,
+    do_echo(Ls, Config, OutTrans, InTrans).
+
+
+
+
+lists_iterator(doc) -> [];
+lists_iterator(suite) -> [];
+lists_iterator(Config) when is_list(Config) ->
+    Ls = [["able ","was ","I ","ere ","I ","saw ","elba"]],
+    do_echo(Ls, Config,
+	    fun (L) -> {self(),L,strcat} end,
+	    fun (Echoer, L, {Echoer,X,strcat}) ->
+		    io:format("## ~p ~p~n", [L,X]),
+		    X = lists:flatten(L)
+	    end).
+
+
+
+unicode(doc) -> [];
+unicode(suite) -> [];
+unicode(Config) when is_list(Config) ->
+    S1 = "plain ascii",
+    S2 = "iso-latin ��� �",
+    S3 = "Codepoints... ��� \x{1000}",
+    S4 = [0,1,31,32,63,64,127,128,255],
+    S5 = [0,1,127,128,255,256,16#d7ff,
+	  16#e000,16#fffd,16#10000,16#10ffff],
+    Ss = [S1,S2,S3,S4,S5],
+    do_echo(unicode_cp_gen([{S,valid} || S <- Ss] ++ cp_gen(71)), Config,
+	    fun ({L,invalid}) -> {self(),L,utf8};
+		({L,Tag}) -> {self(),L,Tag};
+		({L})     -> {self(),L}
+	    end,
+	    fun (Echoer, {L,invalid}=Out, {Echoer,X,utf8}=In) ->
+		    case L of
+			X -> ok;
+			_ ->
+			    ?t:fail({mismatch,Out,In})
+		    end;
+		(Echoer, {L,Tag}=Out, {Echoer,X,Tag}=In) ->
+		    case unicode:characters_to_binary(L, utf8) of
+			X -> ok;
+			_ ->
+			    ?t:fail({mismatch,Out,In})
+		    end;
+		(Echoer, {L}=Out, {Echoer,X}=In) ->
+		    case L of
+			X -> ok;
+			_ ->
+			    ?t:fail({mismatch,Out,In})
+		    end
+	    end, ["unicode"]).
+
+%% Lazy wrapper to lazy list
+unicode_cp_gen([{S,valid}|Ss]) ->
+    [{S,utf8},{S}|unicode_cp_gen(Ss)];
+unicode_cp_gen([{S,invalid}=St|Ss]) ->
+    [St,{S}|unicode_cp_gen(Ss)];
+unicode_cp_gen([]) ->
+    [];
+unicode_cp_gen(Cont) when is_function(Cont, 0) ->
+    fun () ->
+	    unicode_cp_gen(Cont())
+    end.
+
+
+
+unicode_list_to_string(doc) -> [];
+unicode_list_to_string(suite) -> [];
+unicode_list_to_string(Config) when is_list(Config) ->
+    do_echo(cp_gen(73), Config,
+	    fun ({L,_}) -> {self(),L,to_string_neg_int_list} end,
+	    fun (Echoer, {L,invalid}=Out, {Echoer,X,_}=In) ->
+		    case L of
+			X -> ok;
+			_ ->
+			    ?t:fail({mismatch,Out,In})
+		    end;
+		(Echoer, {L,valid}=Out, {Echoer,X,_}=In) ->
+		    B = unicode:characters_to_binary(L, unicode, {utf16,big}),
+		    case [-D || <<D:16/big>> <= B] of
+			X -> ok;
+			_ ->
+			    ?t:fail({mismatch,Out,In})
+		    end
+	    end).
+
+
+
+unicode_string_to_list(doc) -> [];
+unicode_string_to_list(suite) -> [];
+unicode_string_to_list(Config) when is_list(Config) ->
+    do_echo(cp_gen(79), Config,
+	    fun ({L,_}) -> {self(),L,to_neg_int_list} end,
+	    fun (Echoer, {L,invalid}=Out, {Echoer,X,_}=In) ->
+		    case L of
+			X -> ok;
+			_ ->
+			    ?t:fail({mismatch,Out,In})
+		    end;
+		(Echoer, {L,valid}=Out, {Echoer,X,_}=In) ->
+		    case [-C || C <- L] of
+			X -> ok;
+			_ ->
+			    ?t:fail({mismatch,Out,In})
+		    end
+	    end, ["unicode"]).
+
+
+%% Lazy list
+cp_gen(N) ->
+    cp_gen(N, -1, 16#110000).
+
+cp_gen(N, Start, End) ->
+    cp_gen(N, Start, End, cp_validity(Start), [], 0, [], 0).
+
+cp_gen(N, U, End, PrevValidity, Acc, Len, Ss, Ls) when Len >= N ->
+    cp_gen(N, U, End, PrevValidity, [], 0, [{Acc,PrevValidity}|Ss], Ls+1);
+cp_gen(N, U, End, PrevValidity, Acc, Len, Ss, Ls) when Ls >= N ->
+    Ss ++ fun () ->
+		  cp_gen(N, U, End, PrevValidity, Acc, Len, [], 0)
+	  end;
+cp_gen(_, U, End, _, Acc, _, Ss, _) when U > End ->
+    [{Acc,valid}|Ss];
+cp_gen(N, U, End, PrevValidity, Acc, Len, Ss, Ls) ->
+    Validity = cp_validity(U),
+    NextU = U+1,
+    {NextAcc,NextLen} =	case Validity of
+			    valid -> {[U|Acc],Len+1};
+			    invalid -> {Acc,Len}
+			end,
+    {NextSs,NextLs} = case Validity of
+			  PrevValidity -> {Ss,Ls};
+			  valid -> {[{[U-1],PrevValidity}|Ss],Ls+1};
+			  invalid -> {[{[U],Validity}|Ss],Ls+1}
+		      end,
+    cp_gen(N, NextU, End, Validity, NextAcc, NextLen, NextSs, NextLs).
+
+cp_validity(UnicodeCP) ->
+    try <<UnicodeCP/big-utf32>> of
+	_ -> valid
+    catch
+	error:_ -> invalid
+    end.
+
+
+
+connect(doc) -> [];
+connect(suite) -> [];
+connect(Config) when is_list(Config) ->
+    WD = filename:dirname(code:which(?MODULE)),
+    {ok,Other} = ?t:start_node(make_name(), slave, [{args,"-pa "++WD}]),
+    Action =
+	fun (Pid) ->
+		JName = node(Pid),
+		Hidden = [JName],
+		Pid ! {self(),Other},
+		receive
+		    {Pid,Other,true} ->
+			ok;
+		    Unexpected1 ->
+			?t:fail({result,Unexpected1})
+		end,
+		Hidden = erlang:nodes(hidden),
+		Hidden = rpc:call(Other, erlang, nodes, [hidden]),
+		true =
+		    rpc:call(Other, erlang, disconnect_node, [JName]),
+		[] =
+		    rpc:call(Other, erlang, nodes, [hidden]),
+		Hidden = erlang:nodes(hidden),
+		%% Again
+		receive after 2000 -> ok end,
+		%% We have no way of knowing when the Java node
+		%% detects the nodedown.
+		Pid ! {self(),Other},
+		receive
+		    {Pid,Other,true} ->
+			ok;
+		    Unexpected2->
+			?t:fail({result,Unexpected2})
+		end,
+		Hidden = rpc:call(Other, erlang, nodes, [hidden])
+	end,
+    run_server(connection_server, Config, Action, []).
+
+
+
+seq(_, 0, _) ->
+    [];
+seq(X, N, Fun) ->
+    [X|seq(Fun(X), N-1, Fun)].
+
+do_echo(DataList, Config) ->
+    do_echo(DataList, Config,
+	    fun (D) -> % OutTrans
+		    {self(),D}
+	    end,
+	    fun (Echoer, D, {Echoer,D}) -> % InTrans
+		    ok
+	    end, []).
+
+do_echo(DataList, Config, OutTrans, InTrans) ->
+    do_echo(DataList, Config, OutTrans, InTrans, []).
+
+do_echo(DataList, Config, OutTrans, InTrans, ExtraArgs)
+  when is_list(DataList), is_list(Config) ->
+    run_server(echo_server, Config,
+	       fun (Echoer) ->
+		       echo_loop(DataList, Echoer, OutTrans, InTrans, [])
+	       end,
+	       ExtraArgs).
+
+echo_loop([D|Ds], Echoer, OutTrans, InTrans, TermAcc) ->
+    OutMsg = OutTrans(D),
+    Echoer ! OutMsg,
+    io:format("echo_server ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
+    receive
+	Reply ->
+	    io:format("echo_server ~p: receive ~P~n",
+		      [self(),Reply,10]),
+	    InTrans(Echoer, D, Reply)
+    end,
+    Term = case OutMsg of
+	       {_, T, _} -> T;
+	       {_, T} -> T
+	   end,
+    echo_loop(Ds, Echoer, OutTrans, InTrans, [Term | TermAcc]);
+echo_loop([], Echoer, _, _, TermAcc) ->
+    check_terms(Echoer, TermAcc);
+%% Lazy list
+echo_loop(Cont, Echoer, OutTrans, InTrans, TermAcc)
+  when is_function(Cont, 0) ->
+    check_terms(Echoer, TermAcc),
+    OutMsg = Echoer ! {self(),undefined,hash_clear},
+    io:format("echo_server ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
+    receive
+	{Echoer,hash_cleared,hash_clear}=Reply ->
+	    io:format("echo_server ~p: receive ~P~n",
+		      [self(),Reply,10]),
+	    ok;
+	Other ->
+	    io:format("echo_server_terms unexpected ~p: receive ~P~n",
+		      [self(),Other,10]),
+	    ?t:fail({unexpected, Other})
+    end,
+    echo_loop(Cont(), Echoer, OutTrans, InTrans, []).
+
+check_terms(Echoer, [Term | Rest]) ->
+    OutMsg = {self(),Term,hash_lookup},
+    Echoer ! OutMsg,
+    io:format("check_terms ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
+    receive
+	{Echoer,true,hash_lookup} = ReplyMsg ->
+	    io:format("check_terms ~p: receive ~P~n",
+		      [self(),ReplyMsg,10]),
+	    check_terms(Echoer, Rest);
+	Other ->
+	    io:format("check_terms unexpected ~p: receive ~P~n",
+		      [self(),Other,10]),
+	    ?t:fail({unexpected, Other})
+    end;
+check_terms(_, []) ->
+    ok.
+
+run_server(Server, Config, Action, ExtraArgs) ->
+    Name = make_name(),
+    true = register(Name, self()),
+    JName = make_name(),
+    spawn_link(fun () ->
+		       ok = jitu:java(?config(java, Config),
+				      ?config(data_dir, Config),
+				      atom_to_list(Server),
+				      [JName,
+				       erlang:get_cookie(),
+				       node(),
+				       Name]++ExtraArgs
+				     ),
+						%,"-DOtpConnection.trace=3"),
+		       Name ! {done, JName}
+	       end),
+    receive
+	{Server, JName, Pid} ->
+	    ?t:format("~w: ~p (~p)~n",
+		      [Server, Pid, node(Pid)]),
+	    ?t:format("nodes(hidden): ~p~n",
+		      [nodes(hidden)]),
+	    Action(Pid),
+	    Pid ! bye,
+	    receive
+		{done, JName} ->
+		    ok
+	    end;
+	Other ->
+	    ?t:fail({unexpected,Other})
+    end.
+
+%%
+%% Utils...
+%%
+
+make_name() ->
+    {A, B, C} = now(),
+    list_to_atom(atom_to_list(?MODULE)
+		 ++ "-" ++ integer_to_list(A)
+		 ++ "-" ++ integer_to_list(B)
+		 ++ "-" ++ integer_to_list(C)).
+
+
+
+-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).
+
+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]}).
+
+
+
+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_EXT,
+					      ?ATOM_EXT,
+					      uint16_be(length(NodeName)),
+					      NodeName,
+					      uint32_be(Number),
+					      uint32_be(Serial),
+					      uint8(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.
+
+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_EXT,
+					      ?ATOM_EXT,
+					      uint16_be(length(NodeName)),
+					      NodeName,
+					      uint32_be(Number),
+					      uint8(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.
+
+mk_ref({NodeName, Creation}, Numbers) when is_atom(NodeName),
+					   is_integer(Creation),
+					   is_list(Numbers) ->
+    mk_ref({atom_to_list(NodeName), Creation}, Numbers);
+mk_ref({NodeName, Creation}, [Number]) when is_list(NodeName),
+					    is_integer(Creation),
+					    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_integer(Creation),
+					   is_list(Numbers) ->
+    case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
+					      ?NEW_REFERENCE_EXT,
+					      uint16_be(length(Numbers)),
+					      ?ATOM_EXT,
+					      uint16_be(length(NodeName)),
+					      NodeName,
+					      uint8(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.
diff --git a/lib/jinterface/test/nc_SUITE_data/Makefile.src b/lib/jinterface/test/nc_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..3d131250be
--- /dev/null
+++ b/lib/jinterface/test/nc_SUITE_data/Makefile.src
@@ -0,0 +1,53 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2004-2010. 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%
+#
+
+# Makefile.src for java_client_erl_server test
+# Note: This file *must* work for both Unix and Windows
+#
+# We use both `rm' (Unix) and `del' (Windows) for removing files, but
+# with a `-' in front so that the error in not finding `rm' (`del') on
+# Windows (Unix) is ignored.
+#
+# VxWorks? XXX
+#
+
+.SUFFIXES:
+.SUFFIXES: .java
+
+
+JAVAC = @JAVAC@
+ERLC = erlc
+
+JINTERFACE_CLASSPATH = @jinterface_classpath@
+
+CLASSPATH = .@PS@$(JINTERFACE_CLASSPATH)@PS@
+
+JAVA_FILES = echo_server.java connection_server.java
+CLASS_FILES = $(JAVA_FILES:.java=.class)
+
+all: $(CLASS_FILES)
+
+clean:
+	-rm -f $(CLASS_FILES)
+	-del /F /Q $(CLASS_FILES)
+
+$(CLASS_FILES) : $(JAVA_FILES)
+	$(JAVAC) -classpath $(CLASSPATH) $(JAVA_FILES)
+
+#
diff --git a/lib/jinterface/test/nc_SUITE_data/connection_server.java b/lib/jinterface/test/nc_SUITE_data/connection_server.java
new file mode 100644
index 0000000000..19ed1c7d5c
--- /dev/null
+++ b/lib/jinterface/test/nc_SUITE_data/connection_server.java
@@ -0,0 +1,96 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
+ */
+
+import com.ericsson.otp.erlang.*;
+
+public class connection_server {
+    static java.lang.String Name = "connection_server";
+
+    public static void main(String[] argv) {
+	try {
+	    System.out.println("connection_server booting...");
+
+	    for (int j = 0; j < argv.length; j++)
+		System.out.println("argv[" + j + "] = \"" + argv[j] + "\"");
+
+	    if (argv.length != 4) {
+		System.out.println("Wrong number of arguments!");
+		System.exit(1);
+	    }
+
+	    // Start node and mbox
+	    OtpNode node = new OtpNode(argv[0], argv[1]);
+	    OtpMbox mbox = node.createMbox();
+	    if (! mbox.registerName(Name)) {
+		System.out.println("Could not register name " + Name);
+		System.exit(3);
+	    }
+
+	    // Announce our presence
+	    OtpErlangObject[] amsg = new OtpErlangObject[3];
+	    amsg[0] = new OtpErlangAtom(Name);
+	    amsg[1] = new OtpErlangAtom(argv[0]);
+	    amsg[2] = mbox.self();
+	    OtpErlangTuple atuple = new OtpErlangTuple(amsg);
+	    mbox.send(argv[3], argv[2], atuple);
+
+	    // Do connects ...
+	    while (true) {
+		OtpErlangObject o = mbox.receive();
+		if (o == null)
+		    continue;
+		if (o instanceof OtpErlangTuple) {
+		    OtpErlangTuple msg = (OtpErlangTuple) o;
+		    OtpErlangPid from = (OtpErlangPid)(msg.elementAt(0));
+		    OtpErlangAtom conn_node = (OtpErlangAtom) msg.elementAt(1);
+
+		    System.out.println("Got request to connect to: "
+				       + conn_node);
+		    OtpErlangObject[] rmsg = new OtpErlangObject[3];
+		    rmsg[0] = mbox.self();
+		    rmsg[1] = conn_node;
+		    if (node.ping(conn_node.atomValue(), 1000)) {
+			System.out.println("Successfully connected to "
+					   + conn_node.toString());
+			rmsg[2] = new OtpErlangAtom("true");
+		    }
+		    else {
+			System.out.println("Failed to connect to "
+					   + conn_node.toString());
+			rmsg[2] = new OtpErlangAtom("false");
+		    }
+
+		    OtpErlangTuple rtuple = new OtpErlangTuple(rmsg);
+
+		    mbox.send(from, rtuple);
+		}
+		else { // probably 'bye'
+		    System.out.println("connection_server halting...");
+		    System.exit(0);
+		}
+	    }
+	}
+	catch (Exception e) {
+	    System.out.println("" + e);
+	    System.exit(2);
+	}
+
+    }
+
+}
diff --git a/lib/jinterface/test/nc_SUITE_data/echo_server.java b/lib/jinterface/test/nc_SUITE_data/echo_server.java
new file mode 100644
index 0000000000..0550e4beb1
--- /dev/null
+++ b/lib/jinterface/test/nc_SUITE_data/echo_server.java
@@ -0,0 +1,261 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-2010. 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%
+ */
+
+import java.io.UnsupportedEncodingException;
+import java.util.HashSet;
+
+import com.ericsson.otp.erlang.OtpErlangAtom;
+import com.ericsson.otp.erlang.OtpErlangBinary;
+import com.ericsson.otp.erlang.OtpErlangBoolean;
+import com.ericsson.otp.erlang.OtpErlangException;
+import com.ericsson.otp.erlang.OtpErlangInt;
+import com.ericsson.otp.erlang.OtpErlangList;
+import com.ericsson.otp.erlang.OtpErlangLong;
+import com.ericsson.otp.erlang.OtpErlangObject;
+import com.ericsson.otp.erlang.OtpErlangPid;
+import com.ericsson.otp.erlang.OtpErlangString;
+import com.ericsson.otp.erlang.OtpErlangTuple;
+import com.ericsson.otp.erlang.OtpExternal;
+import com.ericsson.otp.erlang.OtpInputStream;
+import com.ericsson.otp.erlang.OtpMbox;
+import com.ericsson.otp.erlang.OtpNode;
+import com.ericsson.otp.erlang.OtpOutputStream;
+
+public class echo_server {
+    private static boolean debug = false;
+
+    public static void main(final String[] argv) {
+	try {
+	    System.out.println("echo_server booting...");
+
+	    for (int j = 0; j < argv.length; j++) {
+		System.out.println("argv[" + j + "] = \"" + argv[j] + "\"");
+	    }
+
+	    if (argv.length != 4 && argv.length != 5) {
+		System.out.println("Wrong number of arguments!");
+		System.exit(1);
+	    }
+
+	    // Start node and mbox
+	    final OtpNode node = new OtpNode(argv[0], argv[1]);
+	    if (argv.length == 5 && argv[4].equals("unicode")) {
+		System.out.println("Setting unicode string mode.");
+		node.setFlags(OtpInputStream.DECODE_INT_LISTS_AS_STRINGS);
+	    }
+	    final OtpMbox mbox = node.createMbox();
+
+	    // Announce our presence
+	    final OtpErlangObject[] amsg = new OtpErlangObject[3];
+	    amsg[0] = new OtpErlangAtom("echo_server");
+	    amsg[1] = new OtpErlangAtom(argv[0]);
+	    amsg[2] = mbox.self();
+	    final OtpErlangTuple atuple = new OtpErlangTuple(amsg);
+	    mbox.send(argv[3], argv[2], atuple);
+
+	    // Do echoing...
+	    while (true) {
+		final OtpErlangObject o = mbox.receive();
+		if (o == null) {
+		    continue;
+		}
+		if (o instanceof OtpErlangTuple) {
+		    final OtpErlangTuple msg = (OtpErlangTuple) o;
+		    final int arity = msg.arity();
+		    if (arity < 2) {
+			System.out
+				.println("Arity < 2; echo_server aborting...");
+			System.exit(2);
+		    } else if (arity == 2) {
+			final OtpErlangPid from = (OtpErlangPid) msg
+				.elementAt(0);
+			if (debug) System.out.println("Echoing: "
+						      + msg.elementAt(1));
+
+			final OtpErlangObject[] rmsg = new OtpErlangObject[2];
+			rmsg[0] = mbox.self();
+			rmsg[1] = msg.elementAt(1);
+			final OtpErlangTuple rtuple = new OtpErlangTuple(rmsg);
+
+			mbox.send(from, rtuple);
+			continue;
+		    } else if (arity == 3) {
+			echoTwisted(mbox, msg);
+			continue;
+		    } else {
+			System.out
+				.println("Arity > 3; echo_server aborting...");
+			System.exit(2);
+		    }
+		} else if (o instanceof OtpErlangAtom) {
+		    OtpErlangAtom a = (OtpErlangAtom) o;
+		    if (a.atomValue().equals("debug")) {
+			debug = true;
+		    } else if (a.atomValue().equals("bye")) {
+			System.out.println("echo_server halting...");
+			System.exit(0);
+		    }
+		} else { // probably 'bye'
+		}
+		System.out.println("Unexpected: " + o +
+				   " echo_server aborting...");
+		System.exit(2);
+	    }
+	} catch (final Exception e) {
+	    System.out.println("" + e);
+	    System.exit(2);
+	}
+    }
+
+    private static void echoTwisted(final OtpMbox mbox,
+				    final OtpErlangTuple msg)
+	    throws OtpErlangException {
+	final OtpErlangPid from = (OtpErlangPid) msg.elementAt(0);
+
+	final OtpErlangObject[] rmsg = new OtpErlangObject[3];
+	if (debug) System.out.println("Echo in: " + msg);
+	rmsg[0] = mbox.self();
+	rmsg[1] = twist(msg.elementAt(1), rmsg[2] = msg.elementAt(2));
+	final OtpErlangTuple rtuple = new OtpErlangTuple(rmsg);
+	if (debug) System.out.println("Echo out: " + rtuple);
+
+	mbox.send(from, rtuple);
+    }
+
+    private static HashSet<OtpErlangObject> hash_set =
+	new HashSet<OtpErlangObject>();
+
+    private static OtpErlangObject twist(final OtpErlangObject i,
+	    final OtpErlangObject t) throws OtpErlangException {
+	hash_set.add(i);
+	if (t instanceof OtpErlangAtom) {
+	    final String atomValue = ((OtpErlangAtom) t).atomValue();
+	    if (atomValue.equals("binary") && i instanceof OtpErlangBinary) {
+		final OtpErlangBinary b = (OtpErlangBinary) i;
+		final OtpInputStream bis = new OtpInputStream(b.binaryValue(),
+			0);
+		final OtpErlangObject o = bis.read_any();
+		return o;
+	    } else if (atomValue.equals("compress")) {
+		final OtpOutputStream oos = new OtpOutputStream();
+		oos.write1(OtpExternal.versionTag);
+		oos.write_compressed(i);
+		final OtpErlangBinary o =
+		    new OtpErlangBinary(oos.toByteArray());
+		return o;
+	    } else if (atomValue.equals("bigint")
+		       && i instanceof OtpErlangLong) {
+		final OtpErlangLong l = (OtpErlangLong) i;
+		final int w = l.signum() * l.bitLength();
+		final OtpErlangLong x = new OtpErlangLong(l.longValue());
+		final java.math.BigInteger b = l.bigIntegerValue();
+		System.out.println("long: " + l + ": " + w + ": " + b.signum()
+			* b.bitLength() + ": " + x + ": " + l.isLong() + ": "
+			+ l.isULong());
+		return new OtpErlangTuple(new OtpErlangObject[] { l,
+			new OtpErlangInt(w), x,
+			new OtpErlangInt(l.isLong() ? 1 : 0),
+			new OtpErlangInt(l.isULong() ? 1 : 0) });
+	    } else if (atomValue.equals("tail")
+		       && i instanceof OtpErlangList) {
+		final OtpErlangObject o = ((OtpErlangList) i).getTail();
+		if (o == null) {
+		    return new OtpErlangAtom("null");
+		}
+		return o;
+	    } else if (atomValue.equals("tail3")
+		       && i instanceof OtpErlangList) {
+		final OtpErlangObject o = ((OtpErlangList) i).getNthTail(3);
+		if (o == null) {
+		    return new OtpErlangAtom("null");
+		}
+		return o;
+	    } else if (atomValue.equals("strcat")
+		       && i instanceof OtpErlangList) {
+		final java.lang.StringBuffer b = new java.lang.StringBuffer();
+		final OtpErlangList l = (OtpErlangList) i;
+		for (final OtpErlangObject j : l) {
+		    final OtpErlangString k = (OtpErlangString) j;
+		    b.append(k.stringValue());
+		}
+		final OtpErlangObject o = new OtpErlangString(b.toString());
+		return o;
+	    } else if (atomValue.equals("sub3atom")
+		    && i instanceof OtpErlangString) {
+		final OtpErlangString s = (OtpErlangString) i;
+		final OtpErlangAtom o = new OtpErlangAtom(s.stringValue()
+			.substring(3));
+		return o;
+	    } else if (atomValue.equals("utf8")) {
+		if (i instanceof OtpErlangString) {
+		    final OtpErlangString s = (OtpErlangString) i;
+		    byte[] bytes;
+		    try {
+			bytes = s.stringValue().getBytes("UTF-8");
+		    } catch (final UnsupportedEncodingException e) {
+			bytes = new byte[] { 'e', 'r', 'r', 'o', 'r' };
+		    }
+		    final OtpErlangBinary b = new OtpErlangBinary(bytes);
+		    return b;
+		}
+	    } else if(atomValue.equals("to_string_neg_int_list")) {
+		OtpErlangString oes = null;
+		if (i instanceof OtpErlangString) {
+		    oes = (OtpErlangString) i;
+		} else if (i instanceof OtpErlangList) {
+		    OtpErlangList oel = (OtpErlangList) i;
+		    try {
+			oes = new OtpErlangString(oel);
+		    } catch (final Exception e) {
+		    }
+		}
+		if (oes != null) {
+		    String s = oes.stringValue();
+		    int n = s.length();
+		    OtpErlangObject l[] = new OtpErlangObject[n];
+		    for (int j = 0;  j < n;  j++) {
+			int c = s.charAt(j);
+			l[j] = new OtpErlangInt(-c);
+		    }
+		    return new OtpErlangList(l);
+		}
+	    } else if(atomValue.equals("to_neg_int_list")) {
+		if (i instanceof OtpErlangString) {
+		    OtpErlangString oes = (OtpErlangString) i;
+		    OtpErlangList oel = new OtpErlangList(oes.stringValue());
+		    int n = oel.arity();
+		    OtpErlangObject l[] = new OtpErlangObject[n];
+		    for (int j = 0;  j < n;  j++) {
+			OtpErlangLong c = (OtpErlangLong) oel.elementAt(j);
+			l[j] = new OtpErlangInt(-c.intValue());
+		    }
+		    return new OtpErlangList(l);
+		}
+	    } else if (atomValue.equals("hash_lookup")) {
+		final boolean exists = hash_set.contains(i);
+		final OtpErlangBoolean b = new OtpErlangBoolean(exists);
+		return b;
+	    } else if (atomValue.equals("hash_clear")) {
+		hash_set.clear();
+		return new OtpErlangAtom("hash_cleared");
+	    }
+	}
+	return i;
+    }
+}
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index 6b5719d7c5..24ffe7c5e6 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1,19 +1 @@
-##
-## %CopyrightBegin%
-##
-## Copyright Ericsson AB 2000-2010. 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%
-
-JINTERFACE_VSN = 1.5.3
+JINTERFACE_VSN = 1.5.3.2
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index 19e1d3221c..b8db509fa8 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -54,7 +54,7 @@
           for and tries to load the module.</p>
       </item>
     </list>
-    <p>To prevent accidentaly reloading modules affecting the Erlang
+    <p>To prevent accidentally reloading modules affecting the Erlang
       runtime system itself, the <c>kernel</c>, <c>stdlib</c> and
       <c>compiler</c> directories are considered <em>sticky</em>. This
       means that the system issues a warning and rejects the request if
diff --git a/lib/kernel/doc/src/erl_ddll.xml b/lib/kernel/doc/src/erl_ddll.xml
index 4e65bf46f8..9a62b45d63 100644
--- a/lib/kernel/doc/src/erl_ddll.xml
+++ b/lib/kernel/doc/src/erl_ddll.xml
@@ -177,7 +177,7 @@
       <name>demonitor(MonitorRef) -> ok</name>
       <fsummary>Remove a monitor for a driver</fsummary>
       <type>
-        <v>MonitorRef = ref()</v>
+        <v>MonitorRef = reference()</v>
       </type>
       <desc>
         <p>Removes a driver monitor in much the same way as 
@@ -185,7 +185,7 @@
           monitors. See <seealso marker="#monitor/2">monitor/2</seealso>, <seealso marker="#try_load/3">try_load/3</seealso> and <seealso marker="#try_unload/2">try_unload/2</seealso> for details
           about how to create driver monitors.</p>
         <p>The function throws a <c>badarg</c> exception if the
-          parameter is not a ref().  </p>
+          parameter is not a reference().  </p>
       </desc>
     </func>
     <func>
@@ -400,7 +400,7 @@
         <v>Item = {Name, When}</v>
         <v>Name = atom() | string()</v>
         <v>When = loaded | unloaded | unloaded_only</v>
-        <v>MonitorRef = ref()</v>
+        <v>MonitorRef = reference()</v>
       </type>
       <desc>
         <p>This function creates a driver monitor and works in many
@@ -449,7 +449,7 @@
                   eventually lead to one of the following messages
                   being sent:</p>
                 <taglist>
-                  <tag><em>{'UP', ref(), driver, Name, loaded}</em></tag>
+                  <tag><em>{'UP', reference(), driver, Name, loaded}</em></tag>
                   <item>
                     <p>This message is sent, either immediately if the
                       driver is already loaded and no reloading is
@@ -459,7 +459,7 @@
                       expected to know if reloading is demanded prior
                       to creating a monitor for loading.</p>
                   </item>
-                  <tag><em>{'UP', ref(), driver, Name, permanent}</em></tag>
+                  <tag><em>{'UP', reference(), driver, Name, permanent}</em></tag>
                   <item>
                     <p>This message will be sent if reloading was
                       expected, but the (old) driver made itself
@@ -467,7 +467,7 @@
                       sent if the driver was permanent or statically
                       linked in when trying to create the monitor.</p>
                   </item>
-                  <tag><em>{'DOWN', ref(), driver, Name, load_cancelled}</em></tag>
+                  <tag><em>{'DOWN', reference(), driver, Name, load_cancelled}</em></tag>
                   <item>
                     <p>This message will arrive if reloading was
                       underway, but the <seealso marker="#users">user</seealso> having requested
@@ -476,7 +476,7 @@
                       (or <c>unload/1</c>/<c>unload_driver/1</c>)
                       again before it was reloaded.</p>
                   </item>
-                  <tag><em>{'DOWN', ref(), driver, Name, {load_failure, Failure}}</em></tag>
+                  <tag><em>{'DOWN', reference(), driver, Name, {load_failure, Failure}}</em></tag>
                   <item>
                     <p>This message will arrive if reloading was
                       underway but the loading for some reason
@@ -500,7 +500,7 @@
                 <p>A driver monitor for unload will eventually result
                   in one of the following messages being sent:</p>
                 <taglist>
-                  <tag><em>{'DOWN', ref(), driver, Name, unloaded}</em></tag>
+                  <tag><em>{'DOWN', reference(), driver, Name, unloaded}</em></tag>
                   <item>
                     <p>The driver instance monitored is now
                       unloaded. As the unload might have been due to a
@@ -508,7 +508,7 @@
                       again have been loaded when this message
                       arrives.</p>
                   </item>
-                  <tag><em>{'UP', ref(), driver, Name, unload_cancelled}</em></tag>
+                  <tag><em>{'UP', reference(), driver, Name, unload_cancelled}</em></tag>
                   <item>
                     <p>This message will be sent if unloading was
                       expected, but while the driver was waiting for
@@ -525,7 +525,7 @@
                       similar to an <c>unloaded</c> monitor, but does
                       never result in this message.</p>
                   </item>
-                  <tag><em>{'UP', ref(), driver, Name, permanent}</em></tag>
+                  <tag><em>{'UP', reference(), driver, Name, permanent}</em></tag>
                   <item>
                     <p>This message will be sent if unloading was
                       expected, but the driver made itself
@@ -539,7 +539,7 @@
               <item>
                 <p>A monitor created as <c>unloaded_only</c> behaves
                   exactly as one created as <c>unloaded</c> with the
-                  exception that the <c>{'UP', ref(), driver, Name, unload_cancelled}</c> message will never be
+                  exception that the <c>{'UP', reference(), driver, Name, unload_cancelled}</c> message will never be
                   sent, but the monitor instead persists until the
                   driver <em>really</em> gets unloaded.</p>
               </item>
@@ -626,7 +626,7 @@
         <v>ReloadOption = pending_driver | pending</v>
         <v>Status = loaded | already_loaded | PendingStatus </v>
         <v>PendingStatus = pending_driver | pending_process</v>
-        <v>Ref = ref()</v>
+        <v>Ref = reference()</v>
         <v>ErrorDesc = ErrorAtom | OpaqueError</v>
         <v>ErrorAtom = linked_in_driver | inconsistent | permanent | not_loaded_by_this_process | not_loaded |  pending_reload | pending_process</v>
       </type>
@@ -650,7 +650,7 @@
               registered and a corresponding <c>try_unload</c> is
               expected sometime in the future.</p>
           </item>
-          <tag><em>{ok, pending_driver}</em>or <em>{ok, pending_driver, ref()}</em></tag>
+          <tag><em>{ok, pending_driver}</em>or <em>{ok, pending_driver, reference()}</em></tag>
           <item>
             <p>The load request is registered, but the loading is
               delayed due to the fact that an earlier instance of the
@@ -665,7 +665,7 @@
               set. In other words, this return value will always need
               to be handled!</p>
           </item>
-          <tag><em>{ok, pending_process}</em>or <em>{ok, pending_process, ref()}</em></tag>
+          <tag><em>{ok, pending_process}</em>or <em>{ok, pending_process, reference()}</em></tag>
           <item>
             <p>The load request is registered, but the loading is
               delayed due to the fact that an earlier instance of the
@@ -683,7 +683,7 @@
           about when the driver is <em>actually</em> loaded. This can
           be achieved by using the <c>{monitor, PendingOption}</c> option.</p>
         <p>When monitoring is requested, and a corresponding <c>{ok, pending_driver}</c> or <c>{ok, pending_process}</c> would be
-          returned, the function will instead return a tuple <c>{ok, PendingStatus, ref()}</c> and the process will, at a later
+          returned, the function will instead return a tuple <c>{ok, PendingStatus, reference()}</c> and the process will, at a later
           time when the driver actually gets loaded, get a monitor
           message. The monitor message one can expect is described in
           the <seealso marker="#monitor/2">monitor/2</seealso>
@@ -760,7 +760,7 @@
                 <p>A <c>MonitorOption</c> tells <c>try_load/3</c> to
                   trigger a driver monitor under certain
                   conditions. When the monitor is triggered, the
-                  function will return a three-tuple <c>{ok, PendingStatus, ref()}</c>, where the <c>ref()</c> is
+                  function will return a three-tuple <c>{ok, PendingStatus, reference()}</c>, where the <c>reference()</c> is
                   the monitor ref for the driver monitor.</p>
                 <p>Only one <c>MonitorOption</c> can be specified and
                   it is either the atom <c>pending</c>, which means
@@ -891,7 +891,7 @@
         <v>MonitorOption = pending_driver | pending</v>
         <v>Status = unloaded | PendingStatus </v>
         <v>PendingStatus = pending_driver | pending_process</v>
-        <v>Ref = ref()</v>
+        <v>Ref = reference()</v>
         <v>ErrorAtom = linked_in_driver | not_loaded |  not_loaded_by_this_process | permanent</v>
       </type>
       <desc>
@@ -943,7 +943,7 @@
               ports using it and there are no more <seealso marker="#users">users</seealso> requiring it to be
               loaded.</p>
           </item>
-          <tag><em>{ok, pending_driver}</em>or <em>{ok, pending_driver, ref()}</em></tag>
+          <tag><em>{ok, pending_driver}</em>or <em>{ok, pending_driver, reference()}</em></tag>
           <item>
             <p>This return value indicates that this call removed the
               last <seealso marker="#users">user</seealso> from the
@@ -957,7 +957,7 @@
               in that case, however transient. Monitors are as always
               useful to detect when the driver is really unloaded.</p>
           </item>
-          <tag><em>{ok, pending_process}</em>or <em>{ok, pending_process, ref()}</em></tag>
+          <tag><em>{ok, pending_process}</em>or <em>{ok, pending_process, reference()}</em></tag>
           <item>
             <p>The unload request is registered, but there are still
               other <seealso marker="#users">users</seealso> holding
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 382262d1ee..36fce464c5 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -36,6 +36,61 @@
       other Erlang processes to continue executing in parallel with
       the file operations. See the command line flag
       <c>+A</c> in <seealso marker="erts:erl">erl(1)</seealso>.</p>
+
+    <p>The Erlang VM supports file names in Unicode to a limited
+    extent.  Depending on how the VM is started (with the parameter
+    <c>+fnu</c> or <c>+fnl</c>), file names given can contain
+    characters > 255 and the VM system will convert file names
+    back and forth to the native file name encoding.</p>
+
+    <p>The default behavior for Unicode character translation depends
+    on to what extent the underlying OS/filesystem enforces consistent
+    naming. On OSes where all file names are ensured to be in one or
+    another encoding, Unicode is the default (currently this holds for
+    Windows and MacOSX). On OSes with completely transparent file
+    naming (i.e. all Unixes except MacOSX), ISO-latin-1 file naming is
+    the default. The reason for the ISO-latin-1 default is that
+    file names are not guaranteed to be possible to interpret according to
+    the Unicode encoding expected (i.e. UTF-8), and file names that
+    cannot be decoded will only be accessible by using &quot;raw
+    file names&quot;, in other word file names given as binaries.</p>
+ 
+    <p>As file names are traditionally not binaries in Erlang,
+    applications that need to handle raw file names need to be
+    converted, why the Unicode mode for file names is not default on
+    systems having completely transparent file naming.</p>
+
+    <note>As of R14B01, the most basic file handling modules
+    (<c>file</c>, <c>prim_file</c>, <c>filelib</c> and
+    <c>filename</c>) accept raw file names, but the rest of OTP is not
+    guaranteed to handle them, why Unicode file naming on systems
+    where it is not default is still considered experimental.</note>
+
+    <p>Raw file names is a new feature in OTP R14B01, which allows the
+    user to supply completely uninterpreted file names to the
+    underlying OS/filesystem. They are supplied as binaries, where it
+    is up to the user to supply a correct encoding for the
+    environment. The function <c>file:native_name_encoding()</c> can
+    be used to check what encoding the VM is working in. If the
+    function returns <c>latin1</c> file names are not in any way
+    converted to Unicode, if it is <c>utf8</c>, raw file names should
+    be encoded as UTF-8 if they are to follow the convention of the VM
+    (and usually the convention of the OS as well). Using raw
+    file names is useful if you have a filesystem with inconsistent
+    file naming, where some files are named in UTF-8 encoding while
+    others are not. A file:list_dir on such mixed file name systems
+    when the VM is in Unicode file name mode might return file names as
+    raw binaries as they cannot be interpreted as Unicode
+    file names. Raw file names can also be used to give UTF-8 encoded
+    file names even though the VM is not started in Unicode file name
+    translation mode.</p>
+
+    <p>Note that on Windows, <c>file:native_name_encoding()</c>
+    returns <c>utf8</c> per default, which is the format for raw
+    file names even on Windows, although the underlying OS specific
+    code works in a limited version of little endian UTF16. As far as
+    the Erlang programmer is concerned, Windows native Unicode format
+    is UTF-8...</p>
   </description>
 
   <section>
@@ -47,8 +102,14 @@ iodata() = iolist() | binary()
 io_device()
   as returned by file:open/2, a process handling IO protocols
 
-name() = string() | atom() | DeepList
+name() = string() | atom() | DeepList | RawFilename
   DeepList = [char() | atom() | DeepList]
+  RawFilename = binary()
+  If VM is in unicode filename mode, string() and char() are allowed to be > 255.
+  RawFilename is a filename not subject to Unicode translation, meaning that it 
+  can contain characters not conforming to the Unicode encoding expected from the 
+  filesystem (i.e. non-UTF-8 characters although the VM is started in Unicode 
+  filename mode).
 
 posix()
   an atom which is named from the POSIX error codes used in
@@ -598,13 +659,24 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
+      <name>native_name_encoding() -> latin1 | utf8</name>
+      <fsummary>Return the VM's configured filename encoding.</fsummary>
+      <desc>
+        <p>This function returns the configured default file name encoding to use for raw file names. Generally an application supplying file names raw (as binaries), should obey the character encoding returned by this function.</p>
+	<p>By default, the VM uses ISO-latin-1 file name encoding on filesystems and/or OSes that use completely transparent file naming. This includes all Unix versions except MacOSX, where the vfs layer enforces UTF-8 file naming. By giving the experimental option <c>+fnu</c> when starting Erlang, UTF-8 translation of file names can be turned on even for those systems. If Unicode file name translation is in effect, the system behaves as usual as long as file names conform to the encoding, but will return file names that are not properly encoded in UTF-8 as raw file names (i.e. binaries).</p> 
+	<p>On Windows, this function also returns <c>utf8</c> by default. The OS uses a pure Unicode naming scheme and file names are always possible to interpret as valid Unicode. The fact that the underlying Windows OS actually encodes file names using little endian UTF-16 can be ignored by the Erlang programmer. Windows and MacOSX are the only operating systems where the VM operates in Unicode file name mode by default.</p>
+      </desc>
+    </func>
+    <func>
       <name>open(Filename, Modes) -> {ok, IoDevice} | {error, Reason}</name>
       <fsummary>Open a file</fsummary>
       <type>
         <v>Filename = name()</v>
         <v>Modes = [Mode]</v>
-        <v>&nbsp;Mode = read | write | append | raw | binary | {delayed_write, Size, Delay} | delayed_write | {read_ahead, Size} | read_ahead | compressed</v>
+        <v>&nbsp;Mode = read | write | append | exclusive | raw | binary | {delayed_write, Size, Delay} | delayed_write | {read_ahead, Size} | read_ahead | compressed | {encoding, Encoding}</v>
         <v>&nbsp;&nbsp;Size = Delay = int()</v>
+	<v>&nbsp;&nbsp;Encoding = latin1 | unicode | utf8 | utf16 | {utf16, Endian} | utf32 | {utf32, Endian}</v>
+        <v>&nbsp;&nbsp;&nbsp;&nbsp;Endian = big | little</v>
         <v>IoDevice = io_device()</v>
         <v>Reason = ext_posix() | system_limit</v>
       </type>
@@ -630,6 +702,17 @@ f.txt:  {person, "kalle", 25}.
               file opened with <c>append</c> will take place at
               the end of the file.</p>
           </item>
+          <tag><c>exclusive</c></tag>
+          <item>
+            <p>The file, when opened for writing, is created if it
+              does not exist. If the file exists, open will return
+              <c>{error, eexist}</c>.</p>
+	    <warning><p>This option does not guarantee exclusiveness on
+	    file systems that do not support O_EXCL properly,
+	    such as NFS. Do not depend on this option unless you
+	    know that the file system supports it (in general, local
+	    file systems should be safe).</p></warning>
+          </item>
           <tag><c>raw</c></tag>
           <item>
             <p>The <c>raw</c> option allows faster access to a file,
@@ -1218,7 +1301,7 @@ f.txt:  {person, "kalle", 25}.
           </item>
           <tag><c>{no_translation, unicode, latin1}</c></tag>
           <item>
-            <p>The file is was opened with another <c>encoding</c> than <c>latin1</c> and the data on the file can not be translated to the byte-oriented data that this function returns.</p>
+            <p>The file was opened with another <c>encoding</c> than <c>latin1</c> and the data in the file can not be translated to the byte-oriented data that this function returns.</p>
           </item>
         </taglist>
       </desc>
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index 3a8011e28b..fb09092f1c 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -1173,7 +1173,7 @@ client_loop(S, Peer1, Port1, AssocId1, Peer2, Port2, AssocId2) -&gt;
     <title>SEE ALSO</title>
     <p><seealso marker="inet">inet(3)</seealso>,
       <seealso marker="gen_tcp">gen_tcp(3)</seealso>,
-      <seealso marker="gen_udp">gen_upd(3)</seealso>,
+      <seealso marker="gen_udp">gen_udp(3)</seealso>,
       <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC2960</url> (Stream Control Transmission Protocol),
       <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions for SCTP.</url></p>
     <marker id="authors"></marker>
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 032dcc5251..aa171c77c2 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -74,6 +74,7 @@ posix()
 
 socket()
   as returned by accept/1,2 and connect/3,4</code>
+    <marker id="connect"></marker>
   </section>
   <funcs>
     <func>
@@ -284,9 +285,10 @@ socket()
       <type>
         <v>Socket = socket()</v>
         <v>Length  = int()</v>
-        <v>Packet = [char()] | binary()</v>
+        <v>Packet = [char()] | binary() | HttpPacket</v>
         <v>Timeout = int() | infinity</v>
         <v>Reason = closed | posix()</v>
+        <v>HttpPacket = see the description of <c>HttpPacket</c> in <seealso marker="erts:erlang#decode_packet/3">erlang:decode_packet/3</seealso></v>
       </type>
       <desc>
         <p>This function receives a packet from a socket in passive
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 2ae230152c..a22c0a8346 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -220,6 +220,69 @@ fe80::204:acff:fe17:bf38
         <p>Returns the local hostname. Will never fail.</p>
       </desc>
     </func>
+
+    <func>
+      <name>getifaddrs() -> {ok,Iflist} | {error,posix}</name>
+      <fsummary>Return a list of interfaces and their addresses</fsummary>
+      <type>
+	<v>Iflist = {Ifname,[Ifopt]}</v>
+	<v>Ifname = string()</v>
+	<v>Ifopt = {flag,[Flag]} | {addr,Addr} | {netmask,Netmask}
+	           | {broadaddr,Broadaddr} | {dstaddr,Dstaddr}
+	           | {hwaddr,Hwaddr}</v>
+	<v>Flag = up | broadcast | loopback | pointtopoint
+	          | running | multicast</v>
+	<v>Addr = Netmask = Broadadddr = Dstaddr = ip_address()</v>
+	<v>Hwaddr = [byte()]</v>
+      </type>
+    </func>
+    <desc>
+      <p>
+	Returns a list of 2-tuples containing interface names and the
+	interface's addresses. <c>Ifname</c> is a Unicode string.
+	<c>Hwaddr</c> is hardware dependent, e.g on Ethernet interfaces
+	it is the 6-byte Ethernet address (MAC address (EUI-48 address)).
+      </p>
+      <p>
+	The <c>{addr,Addr}</c>, <c>{netmask,_}</c> and <c>{broadaddr,_}</c>
+	tuples are repeated in the result list iff the interface has multiple
+	addresses. If you come across an interface that has
+	multiple <c>{flag,_}</c> or <c>{hwaddr,_}</c> tuples you have
+	a really strange interface or possibly a bug in this function.
+	The <c>{flag,_}</c> tuple is mandatory, all other optional.
+      </p>
+      <p>
+	Do not rely too much on the order of <c>Flag</c> atoms or
+	<c>Ifopt</c> tuples. There are some rules, though:
+	<list>
+	  <item>
+	    Immediately after <c>{addr,_}</c> follows <c>{netmask,_}</c>
+	  </item>
+	  <item>
+	    Immediately thereafter follows <c>{broadaddr,_}</c> if
+	    the <c>broadcast</c> flag is <em>not</em> set and the
+	    <c>pointtopoint</c>flag <em>is</em> set.
+	  </item>
+	  <item>
+	    Any <c>{netmask,_}</c>, <c>{broadaddr,_}</c> or
+	    <c>{dstaddr,_}</c> tuples that follow an <c>{addr,_}</c>
+	    tuple concerns that address.
+	  </item>
+	</list>
+      </p>
+      <p>
+	The <c>{hwaddr,_}</c> tuple is not returned on Solaris since the
+	hardware address historically belongs to the link layer and only
+	the superuser can read such addresses.
+      </p>
+      <p>
+	On Windows, the data is fetched from quite different OS API
+	functions, so the <c>Netmask</c> and <c>Broadaddr</c>
+	values may be calculated, just as some <c>Flag</c> values.
+	You have been warned. Report flagrant bugs.
+      </p>
+    </desc>
+
     <func>
       <name>getopts(Socket, Options) -> {ok, OptionValues} | {error, posix()}</name>
       <fsummary>Get one or more options for a socket</fsummary>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 9c3f6524ae..29580a4cd1 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -30,6 +30,281 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 2.14.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The Erlang VM now supports Unicode filenames. The feature
+	    is turned on by default on systems where Unicode
+	    filenames are mandatory (Windows and MacOSX), but can be
+	    enabled on other systems with the '+fnu' emulator option.
+	    Enabling the Unicode filename feature on systems where it
+	    is not default is however considered experimental and not
+	    to be used for production. Together with the Unicode file
+	    name support, the concept of "raw filenames" is
+	    introduced, which means filenames provided without
+	    implicit unicode encoding translation. Raw filenames are
+	    provided as binaries, not lists. For further information,
+	    see stdlib users guide and the chapter about using
+	    Unicode in Erlang. Also see the file module manual page.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8887</p>
+        </item>
+        <item>
+          <p>
+	    There is now a new function inet:getifaddrs/0 modeled
+	    after C library function getifaddrs() on BSD and LInux
+	    that reports existing interfaces and their addresses on
+	    the host. This replaces the undocumented and unsupported
+	    inet:getiflist/0 and inet:ifget/2.</p>
+          <p>
+	    Own Id: OTP-8926</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 2.14.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>In embedded mode, on_load handlers that called
+	    <c>code:priv_dir/1</c> or other functions in <c>code</c>
+	    would hang the system. Since the <c>crypto</c>
+	    application now contains an on_loader handler that calls
+	    <c>code:priv_dir/1</c>, including the <c>crypto</c>
+	    application in the boot file would prevent the system
+	    from starting.</p>
+	    <p>Also extended the <c>-init_debug</c> option to print
+	    information about on_load handlers being run to
+	    facilitate debugging.</p>
+          <p>
+	    Own Id: OTP-8902 Aux Id: seq11703 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 2.14.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed: inet:setopts(S, [{linger,{true,2}}]) returned
+	    {error,einval} for SCTP sockets. The inet_drv had a bug
+	    when checking the option size.</p>
+          <p>
+	    Own Id: OTP-8726 Aux Id: seq11617 </p>
+        </item>
+        <item>
+          <p>
+	    gen_udp:connect/3 was broken for SCTP enabled builds. It
+	    did not detect remote end errors as it should.</p>
+          <p>
+	    Own Id: OTP-8729</p>
+        </item>
+        <item>
+	    <p>reference() has been substituted for ref() in the
+	    documentation.</p>
+          <p>
+	    Own Id: OTP-8733</p>
+        </item>
+        <item>
+	    <p>A bug introduced in kernel-2.13.5.3 has been fixed. If
+	    running <c>net_kernel:set_net_ticktime/1</c> twice within
+	    the <c>TransitionPerod</c> the second call caused the
+	    net_kernel process to crash with a <c>badmatch</c>.</p>
+          <p>
+	    Own Id: OTP-8787 Aux Id: seq11657, OTP-8643 </p>
+        </item>
+        <item>
+          <p>
+	    inet:getsockopt for SCTP sctp_default_send_param had a
+	    bug to not initialize required feilds causing random
+	    answers. It is now corrected.</p>
+          <p>
+	    Own Id: OTP-8795 Aux Id: seq11655 </p>
+        </item>
+        <item>
+	    <p>For a socket in the HTTP packet mode, the return value
+	    from <c>gen_tcp:recv/2,3</c> if there is an error in the
+	    header will be <c>{ok,{http_error,String}}</c> instead of
+	    <c>{error,{http_error,String}}</c> to be consistent with
+	    <c>ssl:recv/2,3</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8831</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Even when configuring erlang with --enable-native-libs,
+	    the native code for modules loaded very early (such as
+	    lists) would not get loaded. This has been corrected.
+	    (Thanks to Paul Guyot.)</p>
+          <p>
+	    Own Id: OTP-8750</p>
+        </item>
+        <item>
+          <p>
+	    The undocumented function inet:ifget/2 has been improved
+	    to return interface hardware address (MAC) on platforms
+	    supporting getaddrinfo() (such as BSD unixes). Note it
+	    still does not work on all platforms for example not
+	    Windows nor Solaris, so the function is still
+	    undocumented.</p>
+          <p>
+	    Buffer overflow and field init bugs for inet:ifget/2 and
+	    inet:getservbyname/2 has also been fixed.</p>
+          <p>
+	    Thanks to Michael Santos.</p>
+          <p>
+	    Own Id: OTP-8816</p>
+        </item>
+        <item>
+          <p>
+	    As a usability improvement the 'inet6' option to
+	    functions gen_tcp:listen/2, gen_tcp:connect/3-4,
+	    gen_udp:open/2 and gen_sctp:open/1-2 is now implicit if
+	    the address argument or the 'ip' option contain an IPv6
+	    address (8-tuple).</p>
+          <p>
+	    Own Id: OTP-8822</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 2.14</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    os:find_executable can now be fed with the complete name
+	    of the executable on Windows and still find it. I.e
+	    os:find_executable("werl.exe") will work as
+	    os:find_executable("werl").</p>
+          <p>
+	    Own Id: OTP-3626</p>
+        </item>
+        <item>
+          <p>
+	    The shell's line editing has been improved to more
+	    resemble the behaviour of readline and other shells.
+	    (Thanks to Dave Peticolas)</p>
+          <p>
+	    Own Id: OTP-8635</p>
+        </item>
+        <item>
+	    <p>Under certain circumstances the net kernel could hang.
+	    (Thanks to Scott Lystig Fritchie.)</p>
+          <p>
+	    Own Id: OTP-8643 Aux Id: seq11584 </p>
+        </item>
+        <item>
+          <p>
+	    The kernel DNS resolver was leaking one or two ports if
+	    the DNS reply could not be parsed or if the resolver(s)
+	    caused noconnection type errors. Bug now fixed. A DNS
+	    specification borderline truncated reply triggering the
+	    port leakage bug has also been fixed.</p>
+          <p>
+	    Own Id: OTP-8652</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>As of this version, the global name server no longer
+	    supports nodes running Erlang/OTP R11B.</p>
+          <p>
+	    Own Id: OTP-8527</p>
+        </item>
+        <item>
+          <p>
+	    The file module's functions write,read and read_line now
+	    handles named io_servers like 'standard_io' and
+	    'standard_error' correctly.</p>
+          <p>
+	    Own Id: OTP-8611</p>
+        </item>
+        <item>
+          <p>
+	    The functions file:advise/4 and file:datasync/1 have been
+	    added. (Thanks to Filipe David Manana.)</p>
+          <p>
+	    Own Id: OTP-8637</p>
+        </item>
+        <item>
+	    <p>When exchanging groups between nodes <c>pg2</c> did
+	    not remove duplicated members. This bug was introduced in
+	    R13B03 (kernel-2.13.4).</p>
+          <p>
+	    Own Id: OTP-8653</p>
+        </item>
+        <item>
+          <p>
+	    There is a new option 'exclusive' to file:open/2 that
+	    uses the OS O_EXCL flag where supported to open the file
+	    in exclusive mode.</p>
+          <p>
+	    Own Id: OTP-8670</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 2.13.5.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            A bug introduced in Kernel 2.13.5.2 has been fixed.</p>
+          <p>
+	    Own Id: OTP-8686 Aux Id: OTP-8643</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 2.13.5.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            Under certain circumstances the net kernel could hang.
+            (Thanks to Scott Lystig Fritchie.)</p>
+          <p>
+	    Own Id: OTP-8643 Aux Id: seq11584</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 2.13.5.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/internal_doc/distribution_handshake.txt b/lib/kernel/internal_doc/distribution_handshake.txt
index f64ebe0302..6a3ee22ed3 100644
--- a/lib/kernel/internal_doc/distribution_handshake.txt
+++ b/lib/kernel/internal_doc/distribution_handshake.txt
@@ -11,7 +11,7 @@ The TCP/IP distribution uses a handshake which expects a
 connection based protocol, i.e. the protocol does not include
 any authentication after the handshake procedure.
 
-This is not entirelly safe, as it is vulnerable against takeover
+This is not entirely safe, as it is vulnerable against takeover
 attacks, but it is a tradeoff between fair safety and performance.
 
 The cookies are never sent in cleartext and the handshake procedure
@@ -23,7 +23,7 @@ random numbers.
 DEFINITIONS
 -----------
 
-A challenge is a 32 bit integer number in big endian. Below the function
+A challenge is a 32 bit integer number in big endian order. Below the function
 gen_challenge() returns a random 32 bit integer used as a challenge.
 
 A digest is a (16 bytes) MD5 hash of [the Challenge (as text) concatenated
@@ -46,19 +46,19 @@ The cookies are text strings that can be viewed as passwords.
 Every message in the handshake starts with a 16 bit big endian integer 
 which contains the length of the message (not counting the two initial bytes).
 In erlang this corresponds to the gen_tcp option {packet, 2}. Note that after 
-the handshake, the distribution switches to 4 byte backet headers.
+the handshake, the distribution switches to 4 byte packet headers.
 
 THE HANDSHAKE IN DETAIL
 -----------------------
  
-Imagine two nodes, node A, which initiates the handshake and node B, whitch
+Imagine two nodes, node A, which initiates the handshake and node B, which
 accepts the connection.
 
 1) connect/accept: A connects to B via TCP/IP and B accepts the connection.
 
 2) send_name/receive_name: A sends an initial identification to B. 
 B receives the message. The message looks
-like this (every "square" beeing one byte and the packet header removed):
+like this (every "square" being one byte and the packet header removed):
 
 +---+--------+--------+-----+-----+-----+-----+-----+-----+-...-+-----+
 |'n'|Version0|Version1|Flag0|Flag1|Flag2|Flag3|Name0|Name1| ... |NameN|
@@ -67,7 +67,7 @@ like this (every "square" beeing one byte and the packet header removed):
 The 'n' is just a message tag,
 Version0 & Version1 is the distribution version selected by node A,
                     based on information from EPMD. (16 bit big endian)
-Flag0 ... Flag3 is capability flags, the capabilities defined in dist.hrl.
+Flag0 ... Flag3 are capability flags, the capabilities defined in dist.hrl.
                 (32 bit big endian)
 Name0 ... NameN is the full nodename of A, as a string of bytes (the
                 packet length denotes how long it is).
@@ -91,9 +91,9 @@ alive: A connection to the node is already active, which either means
 
 This is the format of the status message:
 
-+---+-------+-------+ ... +-------+
++---+-------+-------+-...-+-------+
 |'s'|Status0|Status1| ... |StatusN|
-+---+-------+-------+ ... +-------+
++---+-------+-------+-...-+-------+
 
 's' is the message tag
 Status0 ... StatusN is the status as a string (not terminated)
@@ -111,35 +111,35 @@ initially sent from A to B, with the addition of a 32 bit challenge:
 
 +---+--------+--------+-----+-----+-----+-----+-----+-----+-----+-----+---
 |'n'|Version0|Version1|Flag0|Flag1|Flag2|Flag3|Chal0|Chal1|Chal2|Chal3|
-+---+--------+--------+-----+-----+-----+-----+-----+-----+---- +-----+---
++---+--------+--------+-----+-----+-----+-----+-----+-----+-----+-----+---
    ------+-----+-...-+-----+
     Name0|Name1| ... |NameN|
    ------+-----+-... +-----+
 
-Where Chal0 ... Chal3 is the challenge as a 32 bit biog endian integer
+Where Chal0 ... Chal3 is the challenge as a 32 bit big endian integer
 and the other fields are B's version, flags and full nodename.
 
 5) send_challenge_reply/recv_challenge_reply: Now A has generated
-a digest and it's own challenge. Those are sent together in a package
+a digest and its own challenge. Those are sent together in a package
 to B:
 
-+---+-----+-----+-----+-----+-----+-----+-----+-----+
-|'r'|Chal0|Chal1|Chal2|Chal3|Dige0|Dige1|Dige2|Dige3|
-+---+-----+-----+-----+-----+-----+-----+---- +-----+
++---+-----+-----+-----+-----+-----+-----+-----+-----+-...-+------+
+|'r'|Chal0|Chal1|Chal2|Chal3|Dige0|Dige1|Dige2|Dige3| ... |Dige15|
++---+-----+-----+-----+-----+-----+-----+-----+-----+-...-+------+
 
 Where 'r' is the tag, Chal0 ... Chal3 is A's challenge for B to handle and
-Dige0 ... Dige3 is the digest that A constructed from the challenge B sent
+Dige0 ... Dige15 is the digest that A constructed from the challenge B sent
 in the previous step.
 
 6) recv_challenge_ack/send_challenge_ack: B checks that the digest received
 from A is correct and generates a digest from the challenge received from 
 A. The digest is then sent to A. The message looks like this:
 
-+---+-----+-----+-----+-----+
-|'a'|Dige0|Dige1|Dige2|Dige3|
-+---+-----+-----+---- +-----+
++---+-----+-----+-----+-----+-...-+------+
+|'a'|Dige0|Dige1|Dige2|Dige3| ... |Dige15|
++---+-----+-----+-----+-----+-...-+------+
 
-Where 'a' is the tag and Dige0 ... Dige3 is the digest calculated by B
+Where 'a' is the tag and Dige0 ... Dige15 is the digest calculated by B
 for A's challenge.
 
 7) A checks the digest from B and the connection is up.
@@ -206,7 +206,7 @@ Currently the following capability flags are defined:
 %% The node implements distributed process monitoring.
 -define(DFLAG_DIST_MONITOR,8).
  
-%% The node uses separate tag for fun's (labmdas) in the distribution protocol.
+%% The node uses separate tag for fun's (lambdas) in the distribution protocol.
 -define(DFLAG_FUN_TAGS,16).
  
 An R6 erlang node implements all of the above, while a C or Java node only
diff --git a/lib/kernel/src/auth.erl b/lib/kernel/src/auth.erl
index 7fe30ae828..5c7fe2421d 100644
--- a/lib/kernel/src/auth.erl
+++ b/lib/kernel/src/auth.erl
@@ -50,6 +50,8 @@
 %% Exported functions
 %%----------------------------------------------------------------------
 
+-spec start_link() -> {'ok',pid()} | {'error', term()} | 'ignore'.
+
 start_link() ->
     gen_server:start_link({local, auth}, auth, [], []).
 
@@ -134,7 +136,9 @@ init([]) ->
 %% The net kernel will let all message to the auth server 
 %% through as is
 
--type calls() :: 'echo' | 'sync_cookie' | {'set_cookie', node(), term()}.
+-type calls() :: 'echo' | 'sync_cookie'
+               | {'get_cookie', node()}
+               | {'set_cookie', node(), term()}.
 
 -spec handle_call(calls(), {pid(), term()}, state()) ->
         {'reply', 'hello' | 'true' | 'nocookie' | cookie(), state()}.
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index 42d4818f08..b0f99305f2 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -72,39 +72,42 @@
 
 %% User interface.
 %%
-%% objfile_extension()		-> ".beam"
-%% set_path(Dir*)		-> true
-%% get_path()			-> Dir*
-%% add_path(Dir)		-> true | {error, What}
-%% add_patha(Dir)		-> true | {error, What}
-%% add_pathz(Dir)		-> true | {error, What}
-%% add_paths(DirList)           -> true | {error, What}
-%% add_pathsa(DirList)          -> true | {error, What}
-%% add_pathsz(DirList)          -> true | {error, What}
-%% del_path(Dir)		-> true | {error, What}
-%% replace_path(Name,Dir)       -> true | {error, What}
-%% load_file(File)		-> {error,What} | {module, Mod}
-%% load_abs(File)		-> {error,What} | {module, Mod}
-%% load_abs(File,Mod)		-> {error,What} | {module, Mod}
-%% load_binary(Mod,File,Bin)    -> {error,What} | {module,Mod}
-%% ensure_loaded(Module)	-> {error,What} | {module, Mod}
-%% delete(Module)
-%% purge(Module)  kills all procs running old code
-%% soft_purge(Module)           -> true | false
-%% is_loaded(Module)		-> {file, File} | false
-%% all_loaded()			-> {Module, File}*
-%% get_object_code(Mod)         -> error | {Mod, Bin, Filename}
-%% stop()			-> true
-%% root_dir()                   
-%% compiler_dir()
-%% lib_dir()
-%% priv_dir(Name)
-%% stick_dir(Dir)               -> ok | error
-%% unstick_dir(Dir)             -> ok | error
-%% is_sticky(Module)            -> true | false
-%% which(Module)                -> Filename
-%% set_primary_archive((FileName, Bin, FileInfo)  -> ok | {error, Reason}
-%% clash() ->                   -> print out
+%% objfile_extension()		 -> ".beam"
+%% get_path()			 -> [Dir]
+%% set_path([Dir])		 -> true | {error, bad_directory | bad_path}
+%% add_path(Dir)		 -> true | {error, bad_directory}
+%% add_patha(Dir)		 -> true | {error, bad_directory}
+%% add_pathz(Dir)		 -> true | {error, bad_directory}
+%% add_paths([Dir])              -> ok
+%% add_pathsa([Dir])             -> ok
+%% add_pathsz([Dir])             -> ok
+%% del_path(Dir)		 -> boolean() | {error, bad_name}
+%% replace_path(Name, Dir)       -> true | replace_path_error()
+%% load_file(Module)		 -> {module, Module} | {error, What :: atom()}
+%% load_abs(File)		 -> {module, Module} | {error, What :: atom()}
+%% load_abs(File, Module)	 -> {module, Module} | {error, What :: atom()}
+%% load_binary(Module, File, Bin)-> {module, Module} | {error, What :: atom()}
+%% ensure_loaded(Module)         -> {module, Module} | {error, What :: atom()}
+%% delete(Module)                -> boolean()
+%% purge(Module)                 -> boolean()  kills all procs running old code
+%% soft_purge(Module)            -> boolean()
+%% is_loaded(Module)	         -> {file, loaded_filename()} | false
+%% all_loaded()		         -> [{Module, loaded_filename()}]
+%% get_object_code(Module)       -> {Module, Bin, Filename} | error
+%% stop()                        -> no_return()
+%% root_dir()                    -> Dir
+%% compiler_dir()                -> Dir
+%% lib_dir()                     -> Dir
+%% lib_dir(Application)          -> Dir | {error, bad_name}
+%% priv_dir(Application)         -> Dir | {error, bad_name}
+%% stick_dir(Dir)                -> ok | error
+%% unstick_dir(Dir)              -> ok | error
+%% stick_mod(Module)             -> true
+%% unstick_mod(Module)           -> true
+%% is_sticky(Module)             -> boolean()
+%% which(Module)                 -> Filename | loaded_ret_atoms() | non_existing
+%% set_primary_archive((FileName, Bin, FileInfo) -> ok | {error, Reason}
+%% clash()                       -> ok         prints out number of clashes
 
 %%----------------------------------------------------------------------------
 %% Some types for basic exported functions of this module
@@ -120,7 +123,7 @@
 %% User interface
 %%----------------------------------------------------------------------------
 
--spec objfile_extension() -> file:filename().
+-spec objfile_extension() -> nonempty_string().
 objfile_extension() ->
     init:objfile_extension().
 
@@ -138,21 +141,21 @@ load_abs(File) when is_list(File); is_atom(File) -> call({load_abs,File,[]}).
 
 %% XXX Filename is also an atom(), e.g. 'cover_compiled'
 -spec load_abs(Filename :: loaded_filename(), Module :: atom()) -> load_ret().
-load_abs(File,M) when (is_list(File) orelse is_atom(File)), is_atom(M) ->
+load_abs(File, M) when (is_list(File) orelse is_atom(File)), is_atom(M) ->
     call({load_abs,File,M}).
 
 %% XXX Filename is also an atom(), e.g. 'cover_compiled'
 -spec load_binary(Module :: atom(), Filename :: loaded_filename(), Binary :: binary()) -> load_ret().
-load_binary(Mod,File,Bin)
+load_binary(Mod, File, Bin)
   when is_atom(Mod), (is_list(File) orelse is_atom(File)), is_binary(Bin) ->
     call({load_binary,Mod,File,Bin}).
 
 -spec load_native_partial(Module :: atom(), Binary :: binary()) -> load_ret().
-load_native_partial(Mod,Bin) when is_atom(Mod), is_binary(Bin) ->
+load_native_partial(Mod, Bin) when is_atom(Mod), is_binary(Bin) ->
     call({load_native_partial,Mod,Bin}).
 
 -spec load_native_sticky(Module :: atom(), Binary :: binary(), WholeModule :: 'false' | binary()) -> load_ret().
-load_native_sticky(Mod,Bin,WholeModule)
+load_native_sticky(Mod, Bin, WholeModule)
   when is_atom(Mod), is_binary(Bin),
        (is_binary(WholeModule) orelse WholeModule =:= false) ->
     call({load_native_sticky,Mod,Bin,WholeModule}).
@@ -160,7 +163,7 @@ load_native_sticky(Mod,Bin,WholeModule)
 -spec delete(Module :: atom()) -> boolean().
 delete(Mod) when is_atom(Mod) -> call({delete,Mod}).
 
--spec purge/1 :: (Module :: atom()) -> boolean().
+-spec purge(Module :: atom()) -> boolean().
 purge(Mod) when is_atom(Mod) -> call({purge,Mod}).
 
 -spec soft_purge(Module :: atom()) -> boolean().
@@ -195,7 +198,7 @@ lib_dir(App, SubDir) when is_atom(App), is_atom(SubDir) -> call({dir,{lib_dir,Ap
 compiler_dir() -> call({dir,compiler_dir}).
 
 %% XXX is_list() is for backwards compatibility -- take out in future version
--spec priv_dir(Appl :: atom()) -> file:filename() | {'error', 'bad_name'}.
+-spec priv_dir(App :: atom()) -> file:filename() | {'error', 'bad_name'}.
 priv_dir(App) when is_atom(App) ; is_list(App) -> call({dir,{priv_dir,App}}).
 
 -spec stick_dir(Directory :: file:filename()) -> 'ok' | 'error'.
@@ -213,19 +216,21 @@ unstick_mod(Mod) when is_atom(Mod) -> call({unstick_mod,Mod}).
 -spec is_sticky(Module :: atom()) -> boolean().
 is_sticky(Mod) when is_atom(Mod) -> call({is_sticky,Mod}).
 
--spec set_path(Directories :: [file:filename()]) -> 'true' | {'error', term()}.
+-spec set_path(Directories :: [file:filename()]) ->
+	'true' | {'error', 'bad_directory' | 'bad_path'}.
 set_path(PathList) when is_list(PathList) -> call({set_path,PathList}).
 
 -spec get_path() -> [file:filename()].
 get_path() -> call(get_path).
 
--spec add_path(Directory :: file:filename()) -> 'true' | {'error', term()}.
+-type add_path_ret() :: 'true' | {'error', 'bad_directory'}.
+-spec add_path(Directory :: file:filename()) -> add_path_ret().
 add_path(Dir) when is_list(Dir) -> call({add_path,last,Dir}).
 
--spec add_pathz(Directory :: file:filename()) -> 'true' | {'error', term()}.
+-spec add_pathz(Directory :: file:filename()) -> add_path_ret().
 add_pathz(Dir) when is_list(Dir) -> call({add_path,last,Dir}).
 
--spec add_patha(Directory :: file:filename()) -> 'true' | {'error', term()}.
+-spec add_patha(Directory :: file:filename()) -> add_path_ret().
 add_patha(Dir) when is_list(Dir) -> call({add_path,first,Dir}).
 
 -spec add_paths(Directories :: [file:filename()]) -> 'ok'.
@@ -237,14 +242,13 @@ add_pathsz(Dirs) when is_list(Dirs) -> call({add_paths,last,Dirs}).
 -spec add_pathsa(Directories :: [file:filename()]) -> 'ok'.
 add_pathsa(Dirs) when is_list(Dirs) -> call({add_paths,first,Dirs}).
 
-%% XXX Contract's input argument differs from add_path/1 -- why?
 -spec del_path(Name :: file:filename() | atom()) -> boolean() | {'error', 'bad_name'}.
 del_path(Name) when is_list(Name) ; is_atom(Name) -> call({del_path,Name}).
 
 -type replace_path_error() :: {'error', 'bad_directory' | 'bad_name' | {'badarg',_}}.
 -spec replace_path(Name:: atom(), Dir :: file:filename()) -> 'true' | replace_path_error().
-replace_path(Name, Dir) when (is_atom(Name) or is_list(Name)) and
-			     (is_atom(Dir) or is_list(Dir)) ->
+replace_path(Name, Dir) when (is_atom(Name) orelse is_list(Name)),
+			     (is_atom(Dir) orelse is_list(Dir)) ->
     call({replace_path,Name,Dir}).
 
 -spec rehash() -> 'ok'.
@@ -275,19 +279,14 @@ start_link(Flags) ->
 
 do_start(Flags) ->
     %% The following module_info/1 calls are here to ensure
-    %% that the modules are loaded prior to their use elsewhere in 
+    %% that these modules are loaded prior to their use elsewhere in
     %% the code_server.
     %% Otherwise a deadlock may occur when the code_server is starting.
-    code_server:module_info(module),
-    packages:module_info(module),
+    code_server = code_server:module_info(module),
+    packages = packages:module_info(module),
     catch hipe_unified_loader:load_hipe_modules(),
-    gb_sets:module_info(module),
-    gb_trees:module_info(module),
-
-    ets:module_info(module),
-    os:module_info(module),
-    filename:module_info(module),
-    lists:module_info(module),
+    Modules2 = [gb_sets, gb_trees, ets, os, binary, unicode, filename, lists],
+    lists:foreach(fun (M) -> M = M:module_info(module) end, Modules2),
 
     Mode = get_mode(Flags),
     case init:get_argument(root) of 
@@ -295,7 +294,7 @@ do_start(Flags) ->
 	    Root = filename:join([Root0]), % Normalize.  Use filename
 	    case code_server:start_link([Root,Mode]) of
 		{ok,_Pid} = Ok2 ->
-		    if 
+		    if
 			Mode =:= interactive ->
 			    case lists:member(stick, Flags) of
 				true -> do_stick_dirs();
@@ -304,12 +303,14 @@ do_start(Flags) ->
 			true ->
 			    ok
 		    end,
+		    %% Quietly load native code for all modules loaded so far
+		    catch load_native_code_for_all_loaded(),
 		    Ok2;
 		Other ->
 		    Other
 	    end;
 	Other ->
-	    error_logger:error_msg("Can not start code server ~w ~n",[Other]),
+	    error_logger:error_msg("Can not start code server ~w ~n", [Other]),
 	    {error, crash}
     end.
 
@@ -326,7 +327,7 @@ do_s(Lib) ->
 	    %% The return value is intentionally ignored. Missing
 	    %% directories is not a fatal error. (In embedded systems,
 	    %% there is usually no compiler directory.)
-	    stick_dir(filename:append(Dir, "ebin")),
+	    _ = stick_dir(filename:append(Dir, "ebin")),
 	    ok
     end.
 
@@ -424,7 +425,7 @@ where_is_file(Path, File) when is_list(Path), is_list(File) ->
 
 -spec set_primary_archive(ArchiveFile :: file:filename(),
 			  ArchiveBin :: binary(),
-			  FileInfo :: #file_info{})
+			  FileInfo :: file:file_info())
 			 -> 'ok' | {'error', atom()}.
 
 set_primary_archive(ArchiveFile0, ArchiveBin, #file_info{} = FileInfo)
@@ -481,13 +482,13 @@ filter(Ext, _, {ok,Files}) ->
     filter2(Ext, length(Ext), Files).
 
 filter2(_Ext, _Extlen, []) -> [];
-filter2(Ext, Extlen,[File|Tail]) ->
-    case has_ext(Ext,Extlen, File) of 
+filter2(Ext, Extlen, [File|Tail]) ->
+    case has_ext(Ext, Extlen, File) of
 	true -> [File | filter2(Ext, Extlen, Tail)];
 	false -> filter2(Ext, Extlen, Tail)
     end.
 
-has_ext(Ext, Extlen,File) ->
+has_ext(Ext, Extlen, File) ->
     L = length(File),
     case catch lists:nthtail(L - Extlen, File) of
 	Ext -> true;
@@ -496,3 +497,19 @@ has_ext(Ext, Extlen,File) ->
 
 to_path(X) ->
     filename:join(packages:split(X)).
+
+-spec load_native_code_for_all_loaded() -> ok.
+load_native_code_for_all_loaded() ->
+    Architecture = erlang:system_info(hipe_architecture),
+    ChunkName = hipe_unified_loader:chunk_name(Architecture),
+    lists:foreach(fun({Module, BeamFilename}) ->
+        case code:is_module_native(Module) of
+            false ->
+                case beam_lib:chunks(BeamFilename, [ChunkName]) of
+                    {ok,{_,[{_,Bin}]}} when is_binary(Bin) ->
+                        load_native_partial(Module, Bin);
+                    {error, beam_lib, _} -> ok
+                end;
+            true -> ok
+        end
+    end, all_loaded()).
diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
index 4a22637304..91af49f303 100644
--- a/lib/kernel/src/erl_epmd.erl
+++ b/lib/kernel/src/erl_epmd.erl
@@ -210,19 +210,6 @@ open({A,B,C,D,E,F,G,H}=EpmdAddr, Timeout) when ?ip6(A,B,C,D,E,F,G,H) ->
 close(Socket) ->
     gen_tcp:close(Socket).
 
-
-do_register_node_v0(NodeName, TcpPort) ->
-    case open() of
-	{ok, Socket} ->
-	    Name = cstring(NodeName),
-	    Len = 1+2+length(Name),
-	    gen_tcp:send(Socket, [?int16(Len), ?EPMD_ALIVE,
-				  ?int16(TcpPort), Name]),
-	    wait_for_reg_reply_v0(Socket, []);
-	Error ->
-	    Error
-    end.
-
 do_register_node(NodeName, TcpPort) ->
     case open() of
 	{ok, Socket} ->
@@ -240,14 +227,7 @@ do_register_node(NodeName, TcpPort) ->
 				   Name,
 				   ?int16(Elen),
 				   Extra]),
-	    case wait_for_reg_reply(Socket, []) of
-		{error, epmd_close} ->
-		    %% could be old epmd; try old protocol
-%		    erlang:display('trying old'),
-		    do_register_node_v0(NodeName, TcpPort);
-		Other ->
-		    Other
-	    end;
+	    wait_for_reg_reply(Socket, []);
 	Error ->
 	    Error
     end.
@@ -305,41 +285,9 @@ wait_for_reg_reply(Socket, SoFar) ->
 	    {error, no_reg_reply_from_epmd}
     end.
     
-wait_for_reg_reply_v0(Socket, SoFar) ->
-    receive
-	{tcp, Socket, Data0} ->
-	    case SoFar ++ Data0 of
-		[$Y, A, B] ->
-		    {alive, Socket, ?u16(A, B)};
-		Data when length(Data) < 3 ->
-		    wait_for_reg_reply(Socket, Data);
-		Garbage ->
-		    {error, {garbage_from_epmd, Garbage}}
-	    end;
-	{tcp_closed, Socket} ->
-	    {error, duplicate_name}		% A guess -- the most likely reason.
-    after 10000 ->
-	    gen_tcp:close(Socket),
-	    {error, no_reg_reply_from_epmd}
-    end.
 %%
 %% Lookup a node "Name" at Host
 %%
-get_port_v0(Node, EpmdAddress) ->
-    case open(EpmdAddress) of
-	{ok, Socket} ->
-	    Name = cstring(Node),
-	    Len = 1+length(Name),
-	    gen_tcp:send(Socket, [?int16(Len),?EPMD_PORT_PLEASE, Name]),
-	    wait_for_port_reply_v0(Socket, []);
-	_Error -> 
-	    ?port_please_failure(),
-	    noport
-    end.
-
-%%% Not used anymore
-%%% get_port(Node, EpmdAddress) ->
-%%%     get_port(Node, EpmdAddress, infinity).
 
 get_port(Node, EpmdAddress, Timeout) ->
     case open(EpmdAddress, Timeout) of
@@ -347,40 +295,12 @@ get_port(Node, EpmdAddress, Timeout) ->
 	    Name = to_string(Node),
 	    Len = 1+length(Name),
 	    gen_tcp:send(Socket, [?int16(Len),?EPMD_PORT_PLEASE2_REQ, Name]),
-	    Reply = wait_for_port_reply(Socket, []),
-	    case Reply of
-		closed ->
-		    get_port_v0(Node, EpmdAddress);
-		Other ->
-		    Other
-	    end;
+	    wait_for_port_reply(Socket, []);
 	_Error -> 
 	    ?port_please_failure2(_Error),
 	    noport
     end.
 
-wait_for_port_reply_v0(Socket, SoFar) ->
-    receive
-	{tcp, Socket, Data0} ->
-%	    io:format("got ~p~n", [Data0]),
-	    case SoFar ++ Data0 of
-		[A, B] ->
-		    wait_for_close(Socket, {port, ?u16(A, B), 0});
-%		    wait_for_close(Socket, {port, ?u16(A, B)});
-		Data when length(Data) < 2 ->
-		    wait_for_port_reply_v0(Socket, Data);
-		Garbage ->
-		    ?port_please_failure(),
-		    {error, {garbage_from_epmd, Garbage}}
-	    end;
-	{tcp_closed, Socket} ->
-	    ?port_please_failure(),
-	    noport
-    after 10000 ->
-	    ?port_please_failure(),
-	    gen_tcp:close(Socket),
-	    noport
-    end.
 
 wait_for_port_reply(Socket, SoFar) ->
     receive
@@ -487,8 +407,6 @@ wait_for_close(Socket, Reply) ->
 %%
 %% Creates a (flat) null terminated string from atom or list.
 %%
-cstring(S) when is_atom(S) -> cstring(atom_to_list(S));
-cstring(S) when is_list(S) -> S ++ [0].
 
 to_string(S) when is_atom(S) -> atom_to_list(S);
 to_string(S) when is_list(S) -> S.
diff --git a/lib/kernel/src/erl_epmd.hrl b/lib/kernel/src/erl_epmd.hrl
index 47ab6195d8..5a50fda508 100644
--- a/lib/kernel/src/erl_epmd.hrl
+++ b/lib/kernel/src/erl_epmd.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -17,16 +17,13 @@
 %% %CopyrightEnd%
 %%
 
--define(EPMD_ALIVE, $a).
--define(EPMD_PORT_PLEASE, $p).
--define(EPMD_NAMES, $n).
--define(EPMD_DUMP, $d).
--define(EPMD_KILL, $k).
--define(EPMD_STOP, $s).
-
--define(EPMD_ALIVE_OK, $Y).
-
 -define(EPMD_ALIVE2_REQ, $x).
 -define(EPMD_PORT_PLEASE2_REQ, $z).
 -define(EPMD_ALIVE2_RESP, $y).
 -define(EPMD_PORT2_RESP, $w).
+-define(EPMD_NAMES, $n).
+
+%% Commands used only by interactive client
+-define(EPMD_DUMP, $d).
+-define(EPMD_KILL, $k).
+-define(EPMD_STOP, $s).
diff --git a/lib/kernel/src/error_handler.erl b/lib/kernel/src/error_handler.erl
index 17dd02acd4..885eeb2b0f 100644
--- a/lib/kernel/src/error_handler.erl
+++ b/lib/kernel/src/error_handler.erl
@@ -17,6 +17,11 @@
 %% %CopyrightEnd%
 %%
 -module(error_handler).
+%% FIXME: remove no_native directive after HiPE has been changed to make
+%% remote calls link to the target's Export* like BEAM does.
+%% For a detailed explanation see the commit titled
+%% "error_handler: add no_native compiler directive"
+-compile(no_native).
 
 %% A simple error handler.
 
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 4f49371970..3aca9b4b0d 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -75,25 +75,34 @@
 -define(RAM_FILE, ram_file).           % Module
 
 %% data types
--type filename()  :: string().
+-type filename()  :: string() | binary().
 -type file_info() :: #file_info{}.
 -type fd()        :: #file_descriptor{}.
 -type io_device() :: pid() | fd().
 -type location()  :: integer() | {'bof', integer()} | {'cur', integer()}
 		   | {'eof', integer()} | 'bof' | 'cur' | 'eof'.
--type mode()      :: 'read' | 'write' | 'append' | 'raw' | 'binary' | 
-		     {'delayed_write', non_neg_integer(), non_neg_integer()} | 
-		     'delayed_write' | {'read_ahead', pos_integer()} | 
-		     'read_ahead' | 'compressed'.
--type name()      :: string() | atom() | [name()].
--type posix()     :: atom().
+-type mode()      :: 'read' | 'write' | 'append'
+                   | 'exclusive' | 'raw' | 'binary'
+		   | {'delayed_write', non_neg_integer(), non_neg_integer()}
+		   | 'delayed_write' | {'read_ahead', pos_integer()}
+		   | 'read_ahead' | 'compressed'
+		   | {'encoding', unicode:encoding()}.
+-type name()      :: string() | atom() | [name()] | binary().
+-type posix()     :: 'eacces'  | 'eagain'  | 'ebadf'   | 'ebusy'  | 'edquot'
+		   | 'eexist'  | 'efault'  | 'efbig'   | 'eintr'  | 'einval'
+		   | 'eio'     | 'eisdir'  | 'eloop'   | 'emfile' | 'emlink'
+		   | 'enametoolong'
+		   | 'enfile'  | 'enodev'  | 'enoent'  | 'enomem' | 'enospc'
+		   | 'enotblk' | 'enotdir' | 'enotsup' | 'enxio'  | 'eperm'
+		   | 'epipe'   | 'erofs'   | 'espipe'  | 'esrch'  | 'estale'
+		   | 'exdev'.
 -type bindings()  :: any().
 
 -type date()      :: {pos_integer(), pos_integer(), pos_integer()}.
 -type time()      :: {non_neg_integer(), non_neg_integer(), non_neg_integer()}.
 -type date_time() :: {date(), time()}.
--type posix_file_advise() :: 'normal' | 'sequential' | 'random' | 'no_reuse' |
-                            'will_need' | 'dont_need'.
+-type posix_file_advise() :: 'normal' | 'sequential' | 'random'
+                           | 'no_reuse' | 'will_need' | 'dont_need'.
 
 %%%-----------------------------------------------------------------
 %%% General functions
@@ -174,7 +183,7 @@ make_dir(Name) ->
 del_dir(Name) ->
     check_and_call(del_dir, [file_name(Name)]).
 
--spec read_file_info(Name :: name()) -> {'ok', #file_info{}} | {'error', posix()}.
+-spec read_file_info(Name :: name()) -> {'ok', file_info()} | {'error', posix()}.
 
 read_file_info(Name) ->
     check_and_call(read_file_info, [file_name(Name)]).
@@ -184,7 +193,7 @@ read_file_info(Name) ->
 altname(Name) ->
     check_and_call(altname, [file_name(Name)]).
 
--spec read_link_info(Name :: name()) -> {'ok', #file_info{}} | {'error', posix()}.
+-spec read_link_info(Name :: name()) -> {'ok', file_info()} | {'error', posix()}.
 
 read_link_info(Name) ->
     check_and_call(read_link_info, [file_name(Name)]).
@@ -194,7 +203,7 @@ read_link_info(Name) ->
 read_link(Name) ->
     check_and_call(read_link, [file_name(Name)]).
 
--spec write_file_info(Name :: name(), Info :: #file_info{}) ->
+-spec write_file_info(Name :: name(), Info :: file_info()) ->
 	'ok' | {'error', posix()}.
 
 write_file_info(Name, Info = #file_info{}) ->
@@ -205,7 +214,8 @@ write_file_info(Name, Info = #file_info{}) ->
 list_dir(Name) ->
     check_and_call(list_dir, [file_name(Name)]).
 
--spec read_file(Name :: name()) -> {'ok', binary()} | {'error', posix()}.
+-spec read_file(Name :: name()) ->
+	{'ok', binary()} | {'error', posix() | 'terminated' | 'system_limit'}.
 
 read_file(Name) ->
     check_and_call(read_file, [file_name(Name)]).
@@ -220,17 +230,17 @@ make_link(Old, New) ->
 make_symlink(Old, New) ->
     check_and_call(make_symlink, [file_name(Old), file_name(New)]).
 
--spec write_file(Name :: name(), Bin :: binary()) -> 'ok' | {'error', posix()}.
+-spec write_file(Name :: name(), Bin :: iodata()) ->
+	'ok' | {'error', posix() | 'terminated' | 'system_limit'}.
 
 write_file(Name, Bin) ->
     check_and_call(write_file, [file_name(Name), make_binary(Bin)]).
 
 %% This whole operation should be moved to the file_server and prim_file
 %% when it is time to change file server protocol again.
-%% Meanwhile, it is implemented here, slihtly less efficient.
-%%
+%% Meanwhile, it is implemented here, slightly less efficient.
 
--spec write_file(Name :: name(), Bin :: binary(), Modes :: [mode()]) -> 
+-spec write_file(Name :: name(), Bin :: iodata(), Modes :: [mode()]) ->
 	'ok' | {'error', posix()}.
 
 write_file(Name, Bin, ModeList) when is_list(ModeList) ->
@@ -286,7 +296,7 @@ raw_write_file_info(Name, #file_info{} = Info) ->
 %% Contemporary mode specification - list of options
 
 -spec open(Name :: name(), Modes :: [mode()]) ->
-	{'ok', io_device()} | {'error', posix()}.
+	{'ok', io_device()} | {'error', posix() | 'system_limit'}.
 
 open(Item, ModeList) when is_list(ModeList) ->
     case lists:member(raw, ModeList) of
@@ -339,7 +349,7 @@ open(Item, Mode) ->
 %%% The File argument must be either a Pid or a handle 
 %%% returned from ?PRIM_FILE:open.
 
--spec close(File :: io_device()) -> 'ok' | {'error', posix()}.
+-spec close(File :: io_device()) -> 'ok' | {'error', posix() | 'terminated'}.
 
 close(File) when is_pid(File) ->
     R = file_request(File, close),
@@ -358,7 +368,7 @@ close(_) ->
     {error, badarg}.
 
 -spec advise(File :: io_device(), Offset :: integer(),
-        Length :: integer(), Advise :: posix_file_advise()) ->
+	     Length :: integer(), Advise :: posix_file_advise()) ->
 	'ok' | {'error', posix()}.
 
 advise(File, Offset, Length, Advise) when is_pid(File) ->
@@ -369,7 +379,7 @@ advise(#file_descriptor{module = Module} = Handle, Offset, Length, Advise) ->
 advise(_, _, _, _) ->
     {error, badarg}.
 
--spec read(File :: io_device(), Size :: non_neg_integer()) ->
+-spec read(File :: io_device() | atom(), Size :: non_neg_integer()) ->
 	'eof' | {'ok', [char()] | binary()} | {'error', posix()}.
 
 read(File, Sz) when (is_pid(File) orelse is_atom(File)), is_integer(Sz), Sz >= 0 ->
@@ -385,7 +395,7 @@ read(#file_descriptor{module = Module} = Handle, Sz)
 read(_, _) ->
     {error, badarg}.
 
--spec read_line(File :: io_device()) ->
+-spec read_line(File :: io_device() | atom()) ->
 	'eof' | {'ok', [char()] | binary()} | {'error', posix()}.
 
 read_line(File) when (is_pid(File) orelse is_atom(File)) ->
@@ -439,8 +449,8 @@ pread(#file_descriptor{module = Module} = Handle, Offs, Sz)
 pread(_, _, _) ->
     {error, badarg}.
 
--spec write(File :: io_device(), Byte :: iodata()) ->
-	'ok' | {'error', posix()}.
+-spec write(File :: io_device() | atom(), Byte :: iodata()) ->
+	'ok' | {'error', posix() | 'terminated'}.
 
 write(File, Bytes) when (is_pid(File) orelse is_atom(File)) ->
     case make_binary(Bytes) of
@@ -1024,22 +1034,26 @@ path_open_first([], _Name, _Mode, LastError) ->
 %% 	Generates a flat file name from a deep list of atoms and 
 %% 	characters (integers).
 
+file_name(N) when is_binary(N) ->
+    N;
 file_name(N) ->
     try 
-        file_name_1(N)
+        file_name_1(N,file:native_name_encoding())
     catch Reason ->
         {error, Reason}
     end.
 
-file_name_1([C|T]) when is_integer(C), C > 0, C =< 255 ->
-    [C|file_name_1(T)];
-file_name_1([H|T]) ->
-    file_name_1(H) ++ file_name_1(T);
-file_name_1([]) ->
+file_name_1([C|T],latin1) when is_integer(C), C < 256->
+    [C|file_name_1(T,latin1)];
+file_name_1([C|T],utf8) when is_integer(C) ->
+    [C|file_name_1(T,utf8)];
+file_name_1([H|T],E) ->
+    file_name_1(H,E) ++ file_name_1(T,E);
+file_name_1([],_) ->
     [];
-file_name_1(N) when is_atom(N) ->
+file_name_1(N,_) when is_atom(N) ->
     atom_to_list(N);
-file_name_1(_) ->
+file_name_1(_,_) ->
     throw(badarg).
 
 make_binary(Bin) when is_binary(Bin) ->
diff --git a/lib/kernel/src/file_io_server.erl b/lib/kernel/src/file_io_server.erl
index 39dc32bb79..14da9c1a55 100644
--- a/lib/kernel/src/file_io_server.erl
+++ b/lib/kernel/src/file_io_server.erl
@@ -44,11 +44,11 @@ format_error(ErrorId) ->
     erl_posix_msg:message(ErrorId).
 
 start(Owner, FileName, ModeList) 
-  when is_pid(Owner), is_list(FileName), is_list(ModeList) ->
+  when is_pid(Owner), (is_list(FileName) orelse is_binary(FileName)), is_list(ModeList) ->
     do_start(spawn, Owner, FileName, ModeList).
 
 start_link(Owner, FileName, ModeList) 
-  when is_pid(Owner), is_list(FileName), is_list(ModeList) ->
+  when is_pid(Owner), (is_list(FileName) orelse is_binary(FileName)), is_list(ModeList) ->
     do_start(spawn_link, Owner, FileName, ModeList).
 
 %%%-----------------------------------------------------------------
diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl
index 5a31e3976f..cccfa75005 100644
--- a/lib/kernel/src/gen_sctp.erl
+++ b/lib/kernel/src/gen_sctp.erl
@@ -39,7 +39,7 @@ open() ->
     open([]).
 
 open(Opts) when is_list(Opts) ->
-    Mod = mod(Opts),
+    Mod = mod(Opts, undefined),
     case Mod:open(Opts) of
 	{error,badarg} ->
 	    erlang:error(badarg, [Opts]);
@@ -166,18 +166,14 @@ send(S, #sctp_assoc_change{assoc_id=AssocId}, Stream, Data)
   when is_port(S), is_integer(Stream) ->
     case inet_db:lookup_socket(S) of
 	{ok,Mod} ->
-	    Mod:sendmsg(S, #sctp_sndrcvinfo{
-			  stream   = Stream,
-			  assoc_id = AssocId}, Data);
+	    Mod:send(S, AssocId, Stream, Data);
 	Error -> Error
     end;
 send(S, AssocId, Stream, Data)
   when is_port(S), is_integer(AssocId), is_integer(Stream) ->
     case inet_db:lookup_socket(S) of
 	{ok,Mod} ->
-	    Mod:sendmsg(S, #sctp_sndrcvinfo{
-			  stream   = Stream,
-			  assoc_id = AssocId}, Data);
+	    Mod:send(S, AssocId, Stream, Data);
 	Error -> Error
     end;
 send(S, AssocChange, Stream, Data) ->
@@ -238,17 +234,27 @@ controlling_process(S, Pid) ->
 %% Utilites
 %%
 
-%% Get the SCTP moudule
-mod() -> inet_db:sctp_module().
+%% Get the SCTP module, but IPv6 address overrides default IPv4
+mod(Address) ->
+    case inet_db:sctp_module() of
+	inet_sctp when tuple_size(Address) =:= 8 ->
+	    inet6_sctp;
+	Mod ->
+	    Mod
+    end.
 
 %% Get the SCTP module, but option sctp_module|inet|inet6 overrides
-mod([{sctp_module,Mod}|_]) ->
+mod([{sctp_module,Mod}|_], _Address) ->
     Mod;
-mod([inet|_]) ->
+mod([inet|_], _Address) ->
     inet_sctp;
-mod([inet6|_]) ->
+mod([inet6|_], _Address) ->
     inet6_sctp;
-mod([_|Opts]) ->
-    mod(Opts);
-mod([]) ->
-    mod().
+mod([{ip, Address}|Opts], _) ->
+    mod(Opts, Address);
+mod([{ifaddr, Address}|Opts], _) ->
+    mod(Opts, Address);
+mod([_|Opts], Address) ->
+    mod(Opts, Address);
+mod([], Address) ->
+    mod(Address).
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index 7401b06a64..16a87d71b6 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -46,7 +46,7 @@ connect(Address, Port, Opts, Time) ->
     end.
 
 connect1(Address,Port,Opts,Timer) ->
-    Mod = mod(Opts),
+    Mod = mod(Opts, Address),
     case Mod:getaddrs(Address,Timer) of
 	{ok,IPs} ->
 	    case Mod:getserv(Port) of
@@ -73,7 +73,7 @@ try_connect([], _Port, _Opts, _Timer, _Mod, Err) ->
 %% Listen on a tcp port
 %%
 listen(Port, Opts) ->
-    Mod = mod(Opts),
+    Mod = mod(Opts, undefined),
     case Mod:getserv(Port) of
 	{ok,TP} ->
 	    Mod:listen(TP, Opts);
@@ -173,20 +173,30 @@ controlling_process(S, NewOwner) ->
 %% Create a port/socket from a file descriptor 
 %%
 fdopen(Fd, Opts) ->
-    Mod = mod(Opts),
+    Mod = mod(Opts, undefined),
     Mod:fdopen(Fd, Opts).
 
-%% Get the tcp_module
-mod() -> inet_db:tcp_module().
+%% Get the tcp_module, but IPv6 address overrides default IPv4
+mod(Address) ->
+    case inet_db:tcp_module() of
+	inet_tcp when tuple_size(Address) =:= 8 ->
+	    inet6_tcp;
+	Mod ->
+	    Mod
+    end.
 
 %% Get the tcp_module, but option tcp_module|inet|inet6 overrides
-mod([{tcp_module,Mod}|_]) ->
+mod([{tcp_module,Mod}|_], _Address) ->
     Mod;
-mod([inet|_]) ->
+mod([inet|_], _Address) ->
     inet_tcp;
-mod([inet6|_]) ->
+mod([inet6|_], _Address) ->
     inet6_tcp;
-mod([_|Opts]) ->
-    mod(Opts);
-mod([]) ->
-    mod().
+mod([{ip, Address}|Opts], _) ->
+    mod(Opts, Address);
+mod([{ifaddr, Address}|Opts], _) ->
+    mod(Opts, Address);
+mod([_|Opts], Address) ->
+    mod(Opts, Address);
+mod([], Address) ->
+    mod(Address).
diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl
index 6bded4bda6..99020c7b6c 100644
--- a/lib/kernel/src/gen_udp.erl
+++ b/lib/kernel/src/gen_udp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -29,7 +29,7 @@ open(Port) ->
     open(Port, []).
 
 open(Port, Opts) ->
-    Mod = mod(Opts),
+    Mod = mod(Opts, undefined),
     {ok,UP} = Mod:getserv(Port),
     Mod:open(UP, Opts).
 
@@ -97,21 +97,31 @@ controlling_process(S, NewOwner) ->
 %% Create a port/socket from a file descriptor 
 %%
 fdopen(Fd, Opts) ->
-    Mod = mod(),
+    Mod = mod(Opts, undefined),
     Mod:fdopen(Fd, Opts).
 
 
-%% Get the udp_module
-mod() -> inet_db:udp_module().
+%% Get the udp_module, but IPv6 address overrides default IPv4
+mod(Address) ->
+    case inet_db:udp_module() of
+	inet_udp when tuple_size(Address) =:= 8 ->
+	    inet6_udp;
+	Mod ->
+	    Mod
+    end.
 
 %% Get the udp_module, but option udp_module|inet|inet6 overrides
-mod([{udp_module,Mod}|_]) ->
+mod([{udp_module,Mod}|_], _Address) ->
     Mod;
-mod([inet|_]) ->
+mod([inet|_], _Address) ->
     inet_udp;
-mod([inet6|_]) ->
+mod([inet6|_], _Address) ->
     inet6_udp;
-mod([_|Opts]) ->
-    mod(Opts);
-mod([]) ->
-    mod().
+mod([{ip, Address}|Opts], _) ->
+    mod(Opts, Address);
+mod([{ifaddr, Address}|Opts], _) ->
+    mod(Opts, Address);
+mod([_|Opts], Address) ->
+    mod(Opts, Address);
+mod([], Address) ->
+    mod(Address).
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 93d75321ba..327e0f93f1 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -25,6 +25,7 @@
 %% socket
 -export([peername/1, sockname/1, port/1, send/2,
 	 setopts/2, getopts/2, 
+	 getifaddrs/0, getifaddrs/1,
 	 getif/1, getif/0, getiflist/0, getiflist/1,
 	 ifget/3, ifget/2, ifset/3, ifset/2,
 	 getstat/1, getstat/2,
@@ -265,6 +266,17 @@ setopts(Socket, Opts) ->
 getopts(Socket, Opts) ->
     prim_inet:getopts(Socket, Opts).
 
+-spec getifaddrs(Socket :: socket()) ->
+	{'ok', [string()]} | {'error', posix()}.
+
+getifaddrs(Socket) ->
+    prim_inet:getifaddrs(Socket).
+
+-spec getifaddrs() -> {'ok', [string()]} | {'error', posix()}.
+
+getifaddrs() ->
+    withsocket(fun(S) -> prim_inet:getifaddrs(S) end).
+
 -spec getiflist(Socket :: socket()) ->
 	{'ok', [string()]} | {'error', posix()}.
 
diff --git a/lib/kernel/src/inet6_sctp.erl b/lib/kernel/src/inet6_sctp.erl
index 5c49c4fec3..5bf3fca647 100644
--- a/lib/kernel/src/inet6_sctp.erl
+++ b/lib/kernel/src/inet6_sctp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -32,7 +32,7 @@
 
 -define(FAMILY, inet6).
 -export([getserv/1,getaddr/1,getaddr/2,translate_ip/1]).
--export([open/1,close/1,listen/2,connect/5,sendmsg/3,recv/2]).
+-export([open/1,close/1,listen/2,connect/5,sendmsg/3,send/4,recv/2]).
 
 
 
@@ -71,5 +71,24 @@ connect(S, Addr, Port, Opts, Timer) ->
 sendmsg(S, SRI, Data) ->
     prim_inet:sendmsg(S, SRI, Data).
 
+send(S, AssocId, Stream, Data) ->
+    case prim_inet:getopts(
+	   S,
+	   [{sctp_default_send_param,#sctp_sndrcvinfo{assoc_id=AssocId}}]) of
+	{ok,
+	 [{sctp_default_send_param,
+	   #sctp_sndrcvinfo{
+	     flags=Flags, context=Context, ppid=PPID, timetolive=TTL}}]} ->
+	    prim_inet:sendmsg(
+	      S,
+	      #sctp_sndrcvinfo{
+		flags=Flags, context=Context, ppid=PPID, timetolive=TTL,
+		assoc_id=AssocId, stream=Stream},
+	      Data);
+	_ ->
+	    prim_inet:sendmsg(
+	      S, #sctp_sndrcvinfo{assoc_id=AssocId, stream=Stream}, Data)
+    end.
+
 recv(S, Timeout) ->
     prim_inet:recvfrom(S, 0, Timeout).
diff --git a/lib/kernel/src/inet6_tcp_dist.erl b/lib/kernel/src/inet6_tcp_dist.erl
index fab00bbb9f..b9c4fa607c 100644
--- a/lib/kernel/src/inet6_tcp_dist.erl
+++ b/lib/kernel/src/inet6_tcp_dist.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -162,8 +162,8 @@ do_accept(Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
                                         inet:getll(S)
                                 end,
                       f_address = fun get_remote_id/2,
-                      mf_tick = {?MODULE, tick},
-                      mf_getstat = {?MODULE,getstat}
+                      mf_tick = fun ?MODULE:tick/1,
+                      mf_getstat = fun ?MODULE:getstat/1
                      },
                     dist_util:handshake_other_started(HSData);
                 {false,IP} ->
diff --git a/lib/kernel/src/inet_config.erl b/lib/kernel/src/inet_config.erl
index 311e6bc9f9..2458876326 100644
--- a/lib/kernel/src/inet_config.erl
+++ b/lib/kernel/src/inet_config.erl
@@ -23,6 +23,8 @@
 
 -import(lists, [foreach/2, member/2, reverse/1]).
 
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([init/0]).
 
 -export([do_load_resolv/2]).
diff --git a/lib/kernel/src/inet_int.hrl b/lib/kernel/src/inet_int.hrl
index cf357b7fba..6f1688c6a2 100644
--- a/lib/kernel/src/inet_int.hrl
+++ b/lib/kernel/src/inet_int.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -82,6 +82,7 @@
 -define(INET_REQ_IFGET,         22).
 -define(INET_REQ_IFSET,         23).
 -define(INET_REQ_SUBSCRIBE,     24).
+-define(INET_REQ_GETIFADDRS,    25).
 %% TCP requests
 -define(TCP_REQ_ACCEPT,         40).
 -define(TCP_REQ_LISTEN,         41).
diff --git a/lib/kernel/src/inet_parse.erl b/lib/kernel/src/inet_parse.erl
index 3bd5fa0958..65edddcb46 100644
--- a/lib/kernel/src/inet_parse.erl
+++ b/lib/kernel/src/inet_parse.erl
@@ -20,6 +20,8 @@
 
 %% Parser for all kinds of ineternet configuration files
 
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([hosts/1, hosts/2]).
 -export([hosts_vxworks/1]).
 -export([protocols/1, protocols/2]).
diff --git a/lib/kernel/src/inet_sctp.erl b/lib/kernel/src/inet_sctp.erl
index 795bf83807..de74b573bd 100644
--- a/lib/kernel/src/inet_sctp.erl
+++ b/lib/kernel/src/inet_sctp.erl
@@ -31,7 +31,7 @@
 
 -define(FAMILY, inet).
 -export([getserv/1,getaddr/1,getaddr/2,translate_ip/1]).
--export([open/1,close/1,listen/2,connect/5,sendmsg/3,recv/2]).
+-export([open/1,close/1,listen/2,connect/5,sendmsg/3,send/4,recv/2]).
 
 
 
@@ -141,5 +141,24 @@ connect_get_assoc(S, Addr, Port, Active, Timer) ->
 sendmsg(S, SRI, Data) ->
     prim_inet:sendmsg(S, SRI, Data).
 
+send(S, AssocId, Stream, Data) ->
+    case prim_inet:getopts(
+	   S,
+	   [{sctp_default_send_param,#sctp_sndrcvinfo{assoc_id=AssocId}}]) of
+	{ok,
+	 [{sctp_default_send_param,
+	   #sctp_sndrcvinfo{
+	     flags=Flags, context=Context, ppid=PPID, timetolive=TTL}}]} ->
+	    prim_inet:sendmsg(
+	      S,
+	      #sctp_sndrcvinfo{
+		flags=Flags, context=Context, ppid=PPID, timetolive=TTL,
+		assoc_id=AssocId, stream=Stream},
+	      Data);
+	_ ->
+	    prim_inet:sendmsg(
+	      S, #sctp_sndrcvinfo{assoc_id=AssocId, stream=Stream}, Data)
+    end.
+
 recv(S, Timeout) ->
     prim_inet:recvfrom(S, 0, Timeout).
diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl
index 92ee7b441a..1e07620a3e 100644
--- a/lib/kernel/src/kernel.erl
+++ b/lib/kernel/src/kernel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -143,6 +143,13 @@ init(safe) ->
     Boot = start_boot_server(),
     DiskLog = start_disk_log(),
     Pg2 = start_pg2(),
+
+    %% Run the on_load handlers for all modules that have been
+    %% loaded so far. Running them at this point means that
+    %% on_load handlers can safely call kernel processes
+    %% (and in particular call code:priv_dir/1 or code:lib_dir/1).
+    init:run_on_load_handlers(),
+
     {ok, {SupFlags, Boot ++ DiskLog ++ Pg2}}.
 
 get_code_args() ->
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index 0e17c059e5..23db85e1f4 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -322,24 +322,19 @@ init({Name, LongOrShortNames, TickT}) ->
 	    process_flag(priority, max),
 	    Ticktime = to_integer(TickT),
 	    Ticker = spawn_link(net_kernel, ticker, [self(), Ticktime]),
-	    case auth:get_cookie(Node) of
-		Cookie when is_atom(Cookie) ->
-		    {ok, #state{name = Name,
-				node = Node,
-				type = LongOrShortNames,
-				tick = #tick{ticker = Ticker, time = Ticktime},
-				connecttime = connecttime(),
-				connections =
-				    ets:new(sys_dist,[named_table,
-						      protected,
-						      {keypos, 2}]),
-				listen = Listeners,
-				allowed = [],
-				verbose = 0
-			       }};
-		_ELSE ->
-		    {stop, {error,{bad_cookie, Node}}}
-	    end;
+	    {ok, #state{name = Name,
+			node = Node,
+			type = LongOrShortNames,
+			tick = #tick{ticker = Ticker, time = Ticktime},
+			connecttime = connecttime(),
+			connections =
+			ets:new(sys_dist,[named_table,
+					  protected,
+					  {keypos, 2}]),
+			listen = Listeners,
+			allowed = [],
+			verbose = 0
+		       }};
 	Error ->
 	    {stop, Error}
     end.
@@ -500,8 +495,8 @@ handle_call({new_ticktime,T,TP}, From, #state{tick = #tick{ticker = Tckr,
                                                  time = T,
                                                  how = How}}}, From);
 
-handle_call({new_ticktime,From,_},
-	    _,
+handle_call({new_ticktime,_T,_TP},
+	    From,
 	    #state{tick = #tick_change{time = T}} = State) ->
     async_reply({reply, {ongoing_change_to, T}, State}, From);
 
@@ -1086,11 +1081,11 @@ do_spawn(SpawnFuncArgs, SpawnOpts, State) ->
 
 spawn_func(link,{From,Tag},M,F,A,Gleader) ->
     link(From),
-    async_gen_server_reply({From,Tag},self()),  %% ahhh
+    gen_server:reply({From,Tag},self()),  %% ahhh
     group_leader(Gleader,self()),
     apply(M,F,A);
 spawn_func(_,{From,Tag},M,F,A,Gleader) ->
-    async_gen_server_reply({From,Tag},self()),  %% ahhh
+    gen_server:reply({From,Tag},self()),  %% ahhh
     group_leader(Gleader,self()),
     apply(M,F,A).
 
@@ -1527,10 +1522,12 @@ async_gen_server_reply(From, Msg) ->
     {Pid, Tag} = From,
     M = {Tag, Msg},
     case catch erlang:send(Pid, M, [nosuspend, noconnect]) of
-        true ->
-            M;
-        false ->
-            spawn(fun() -> gen_server:reply(From, Msg) end);
-        EXIT ->
+        ok ->
+            ok;
+        nosuspend ->
+            spawn(fun() -> catch erlang:send(Pid, M, [noconnect]) end);
+        noconnect ->
+            ok; % The gen module takes care of this case.
+        {'EXIT', _}=EXIT ->
             EXIT
     end.
diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index 75a11a8afd..95a2f71ec0 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -82,8 +82,9 @@ verify_executable(Name0, [Ext|Rest], OrigExtensions) ->
 	    end;
 	_ ->
 	    case file:read_file_info(Name1) of
-		{ok, #file_info{mode=Mode}} when Mode band 8#111 =/= 0 ->
-		    %% XXX This test for execution permission is not full-proof
+		{ok, #file_info{type=regular,mode=Mode}}
+		when Mode band 8#111 =/= 0 ->
+		    %% XXX This test for execution permission is not fool-proof
 		    %% on Unix, since we test if any execution bit is set.
 		    {ok, Name1};
 		_ ->
@@ -230,9 +231,13 @@ start_port_srv(Request) ->
 		catch
 		    error:_ -> false
 		end,
-    start_port_srv_loop(Request, StayAlive).
+    start_port_srv_handle(Request),
+    case StayAlive of
+	true -> start_port_srv_loop();
+	false -> exiting
+    end.
 
-start_port_srv_loop({Ref,Client}, StayAlive) ->
+start_port_srv_handle({Ref,Client}) ->
     Reply = try open_port({spawn, ?SHELL},[stream]) of
 		Port when is_port(Port) ->
 		    (catch port_connect(Port, Client)),
@@ -242,20 +247,18 @@ start_port_srv_loop({Ref,Client}, StayAlive) ->
 		error:Reason ->
 		    {Reason,erlang:get_stacktrace()}	    
 	    end,
-    Client ! {Ref,Reply},
-    case StayAlive of
-	true -> start_port_srv_loop(get_open_port_request(), true);
-	false -> exiting
-    end.
+    Client ! {Ref,Reply}.
 
-get_open_port_request() ->
+
+start_port_srv_loop() ->
     receive
 	{Ref, Client} = Request when is_reference(Ref),
 				     is_pid(Client) ->
-	    Request;
+	    start_port_srv_handle(Request);
 	_Junk ->
-	    get_open_port_request()
-    end.
+	    ignore
+    end,
+    start_port_srv_loop().
 
 %%
 %%  unix_get_data(Port) -> Result
diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index 293c368e2a..5f8f3a6bf6 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -51,6 +51,7 @@ MODULES= \
 	error_logger_SUITE \
 	error_logger_warn_SUITE \
 	file_SUITE \
+	file_name_SUITE \
 	prim_file_SUITE \
 	ram_file_SUITE \
 	gen_tcp_api_SUITE \
@@ -141,7 +142,7 @@ release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)
 	$(INSTALL_DATA) $(APP_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) kernel.dynspec  $(EMAKEFILE)\
+	$(INSTALL_DATA) kernel.spec  $(EMAKEFILE)\
 		$(COVERFILE) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
diff --git a/lib/kernel/test/appinc1.erl b/lib/kernel/test/appinc1.erl
index 8456b0eac2..343fefb25c 100644
--- a/lib/kernel/test/appinc1.erl
+++ b/lib/kernel/test/appinc1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/kernel/test/appinc1x.erl b/lib/kernel/test/appinc1x.erl
index 2e177727f2..8c144676ac 100644
--- a/lib/kernel/test/appinc1x.erl
+++ b/lib/kernel/test/appinc1x.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/kernel/test/appinc2.erl b/lib/kernel/test/appinc2.erl
index e41d58bb71..d2e0305109 100644
--- a/lib/kernel/test/appinc2.erl
+++ b/lib/kernel/test/appinc2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/kernel/test/appinc2A.erl b/lib/kernel/test/appinc2A.erl
index b51a1f5035..604e31e3d3 100644
--- a/lib/kernel/test/appinc2A.erl
+++ b/lib/kernel/test/appinc2A.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/kernel/test/appinc2B.erl b/lib/kernel/test/appinc2B.erl
index cafb061ae3..abb60010aa 100644
--- a/lib/kernel/test/appinc2B.erl
+++ b/lib/kernel/test/appinc2B.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/kernel/test/appinc2top.erl b/lib/kernel/test/appinc2top.erl
index 5bd19a59e7..5a8d0d6687 100644
--- a/lib/kernel/test/appinc2top.erl
+++ b/lib/kernel/test/appinc2top.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index 313b50f976..2912735368 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -18,9 +18,11 @@
 %%
 -module(application_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, failover/1, failover_comp/1, permissions/1, load/1, reported_bugs/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 failover/1, failover_comp/1, permissions/1, load/1,
 	 load_use_cache/1,
 	 otp_1586/1, otp_2078/1, otp_2012/1, otp_2718/1, otp_2973/1,
 	 otp_3002/1, otp_3184/1, otp_4066/1, otp_4227/1, otp_5363/1,
@@ -30,23 +32,46 @@
 	 nodedown_start/1, init2973/0, loop2973/0, loop5606/1]).
 
 -export([config_change/1,
-	 distr_changed/1, distr_changed_tc1/1, distr_changed_tc2/1,
+	 distr_changed_tc1/1, distr_changed_tc2/1,
 	 shutdown_func/1, do_shutdown/1]).
 
 -define(TESTCASE, testcase_name).
 -define(testcase, ?config(?TESTCASE, Config)).
 
--export([init_per_testcase/2, fin_per_testcase/2, start_type/0, 
+-export([init_per_testcase/2, end_per_testcase/2, start_type/0, 
 	 start_phase/0, conf_change/0]).
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(2)).
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [failover, failover_comp, permissions, load,
-     load_use_cache, reported_bugs, 
-     start_phases, script_start, nodedown_start, 
-     permit_false_start_local, permit_false_start_dist,
-     get_key, distr_changed, config_change, shutdown_func].
+     load_use_cache, {group, reported_bugs}, start_phases,
+     script_start, nodedown_start, permit_false_start_local,
+     permit_false_start_dist, get_key,
+     {group, distr_changed}, config_change, shutdown_func].
+
+groups() -> 
+    [{reported_bugs, [],
+      [otp_1586, otp_2078, otp_2012, otp_2718, otp_2973,
+       otp_3002, otp_3184, otp_4066, otp_4227, otp_5363,
+       otp_5606]},
+     {distr_changed, [],
+      [distr_changed_tc1, distr_changed_tc2]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 init_per_testcase(otp_2973=Case, Config) ->
@@ -57,12 +82,12 @@ init_per_testcase(Case, Config) ->
     ?line Dog = test_server:timetrap(?default_timeout),
     [{?TESTCASE, Case}, {watchdog, Dog}|Config].
 
-fin_per_testcase(otp_2973, Config) ->
+end_per_testcase(otp_2973, Config) ->
     code:del_path(?config(data_dir,Config)),
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok;
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -932,9 +957,6 @@ nodedown_start(Conf) when is_list(Conf) ->
 %%%-----------------------------------------------------------------
 %%% Testing of reported bugs and other tickets.
 %%%-----------------------------------------------------------------
-reported_bugs(suite) -> [otp_1586, otp_2078, otp_2012, otp_2718,
-			 otp_2973, otp_3002, otp_3184, otp_4066,
-			 otp_4227, otp_5363, otp_5606].
 
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1586
@@ -1589,7 +1611,6 @@ get_key(Conf) when is_list(Conf) ->
 %%%-----------------------------------------------------------------
 %%% Testing of change of distributed parameter.
 %%%-----------------------------------------------------------------
-distr_changed(suite) -> [distr_changed_tc1, distr_changed_tc2].
 
 distr_changed_tc1(suite) -> [];
 distr_changed_tc1(doc) -> ["Test change of distributed parameter."];
diff --git a/lib/kernel/test/bif_SUITE.erl b/lib/kernel/test/bif_SUITE.erl
index ae2a3a08ff..173051b693 100644
--- a/lib/kernel/test/bif_SUITE.erl
+++ b/lib/kernel/test/bif_SUITE.erl
@@ -17,15 +17,16 @@
 %% %CopyrightEnd%
 %%
 -module(bif_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
--export([spawn_tests/1, 
+-export([ 
 	 spawn1/1, spawn2/1, spawn3/1, spawn4/1,
 
-	 spawn_link_tests/1,
+	
 	 spawn_link1/1, spawn_link2/1, spawn_link3/1, spawn_link4/1,
 
-	 spawn_opt_tests/1,
+	
 	 spawn_opt2/1, spawn_opt3/1, spawn_opt4/1, spawn_opt5/1,
 
 	 spawn_failures/1,
@@ -33,9 +34,9 @@
 	 run_fun/1,
 	 wilderness/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -43,25 +44,36 @@
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    [spawn_tests, spawn_link_tests, spawn_opt_tests, spawn_failures, wilderness].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-spawn_tests(doc) -> ["Test spawn"];
-spawn_tests(suite) ->
-    [spawn1, spawn2, spawn3, spawn4].
+all() -> 
+    [{group, spawn_tests}, {group, spawn_link_tests},
+     {group, spawn_opt_tests}, spawn_failures, wilderness].
 
-spawn_link_tests(doc) -> ["Test spawn_link"];
-spawn_link_tests(suite) ->
-    [spawn_link1, spawn_link2, spawn_link3, spawn_link4].
+groups() -> 
+    [{spawn_tests, [], [spawn1, spawn2, spawn3, spawn4]},
+     {spawn_link_tests, [],
+      [spawn_link1, spawn_link2, spawn_link3, spawn_link4]},
+     {spawn_opt_tests, [],
+      [spawn_opt2, spawn_opt3, spawn_opt4, spawn_opt5]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-spawn_opt_tests(doc) -> ["Test spawn_opt"];
-spawn_opt_tests(suite) ->
-    [spawn_opt2, spawn_opt3, spawn_opt4, spawn_opt5].
 
 spawn1(doc) -> ["Test spawn/1"];
 spawn1(suite) ->
diff --git a/lib/kernel/test/ch.erl b/lib/kernel/test/ch.erl
index 25d1b4354c..25d6f6d200 100644
--- a/lib/kernel/test/ch.erl
+++ b/lib/kernel/test/ch.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
diff --git a/lib/kernel/test/ch_sup.erl b/lib/kernel/test/ch_sup.erl
index 9d03628839..4c923b2909 100644
--- a/lib/kernel/test/ch_sup.erl
+++ b/lib/kernel/test/ch_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
diff --git a/lib/kernel/test/cleanup.erl b/lib/kernel/test/cleanup.erl
index 831ceba8f5..01db1e9124 100644
--- a/lib/kernel/test/cleanup.erl
+++ b/lib/kernel/test/cleanup.erl
@@ -18,11 +18,22 @@
 %%
 -module(cleanup).
 
--export([all/1, cleanup/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, cleanup/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+all() -> 
+    [cleanup].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> {req, [kernel], [cleanup]}.
 
 cleanup(suite) -> [];
 cleanup(_) ->
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 08b6477c9d..7b1e4fc522 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -18,9 +18,9 @@
 %%
 -module(code_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
+-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, soft_purge/1, is_loaded/1, all_loaded/1,
@@ -31,9 +31,10 @@
 	 where_is_file_cached/1, where_is_file_no_cache/1,
 	 purge_stacktrace/1, mult_lib_roots/1, bad_erl_libs/1,
 	 code_archive/1, code_archive2/1, on_load/1,
-	 on_load_embedded/1, on_load_errors/1]).
+	 big_boot_embedded/1,
+	 on_load_embedded/1, on_load_errors/1, native_early_modules/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2, 
+-export([init_per_testcase/2, end_per_testcase/2, 
 	 init_per_suite/1, end_per_suite/1,
 	 sticky_compiler/1]).
 
@@ -42,18 +43,29 @@
 	 handle_event/2, handle_call/2, handle_info/2,
 	 terminate/2]).
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [set_path, get_path, add_path, add_paths, del_path,
      replace_path, load_file, load_abs, ensure_loaded,
      delete, purge, soft_purge, is_loaded, all_loaded,
      load_binary, dir_req, object_code, set_path_file,
-     pa_pz_option, add_del_path,
-     dir_disappeared, ext_mod_dep, clash,
-     load_cached, start_node_with_cache, add_and_rehash,
-     where_is_file_no_cache, where_is_file_cached,
-     purge_stacktrace, mult_lib_roots, bad_erl_libs,
-     code_archive, code_archive2, on_load, on_load_embedded,
-     on_load_errors].
+     pa_pz_option, add_del_path, dir_disappeared,
+     ext_mod_dep, clash, load_cached, start_node_with_cache,
+     add_and_rehash, where_is_file_no_cache,
+     where_is_file_cached, purge_stacktrace, mult_lib_roots,
+     bad_erl_libs, code_archive, code_archive2, on_load,
+     on_load_embedded, big_boot_embedded, on_load_errors, 
+     native_early_modules].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
 
 init_per_suite(Config) ->
     %% The compiler will no longer create a Beam file if
@@ -74,7 +86,18 @@ init_per_testcase(_Func, Config) ->
     P=code:get_path(),
     P=code:get_path(),
     [{watchdog, Dog}, {code_path, P}|Config].
-fin_per_testcase(_Func, Config) ->
+
+end_per_testcase(TC, Config) when TC == mult_lib_roots; 
+				  TC == big_boot_embedded ->
+    {ok, HostName} = inet:gethostname(),
+    NodeName = list_to_atom(atom_to_list(TC)++"@"++HostName),
+    ?t:stop_node(NodeName),
+    end_per_testcase(Config);
+end_per_testcase(_Func, Config) ->
+    end_per_testcase(Config).
+
+end_per_testcase(Config) ->
+    code:purge(code_b_test),
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     P=?config(code_path, Config),
@@ -584,13 +607,21 @@ clash(Config) when is_list(Config) ->
     TmpEzFile = Priv++"foobar-0.tmp.ez",
     ?line {ok, _} = file:copy(DDir++"foobar-0.1.ez", TmpEzFile),
     ?line true = code:add_path(TmpEzFile++"/foobar-0.1/ebin"),
-    ?line ok = file:delete(TmpEzFile),
+    case os:type() of
+        {win32,_} ->
+	    %% The file wont be deleted on windows until it's closed, why we 
+	    %% need to rename instead.
+	    ?line ok = file:rename(TmpEzFile,TmpEzFile++".moved");
+	 _ ->
+    	    ?line ok = file:delete(TmpEzFile)
+    end,
     test_server:capture_start(),
     ?line ok = code:clash(),
     test_server:capture_stop(),
     ?line [BadPathMsg|_] = test_server:capture_get(),
     ?line true = lists:prefix("** Bad path can't read", BadPathMsg),
     ?line true = code:set_path(P),
+    file:delete(TmpEzFile++".moved"), %% Only effect on windows
     ok.
 
 ext_mod_dep(suite) ->
@@ -635,7 +666,7 @@ analyse([], [This={M,F,A}|Path], Visited, ErrCnt0) ->
     %% These modules should be loaded by code.erl before 
     %% the code_server is started.
     OK = [erlang, os, prim_file, erl_prim_loader, init, ets,
-	  code_server, lists, lists_sort, filename, packages, 
+	  code_server, lists, lists_sort, unicode, binary, filename, packages, 
 	  gb_sets, gb_trees, hipe_unified_loader, hipe_bifs,
 	  prim_zip, zlib],
     ErrCnt1 = 
@@ -664,6 +695,22 @@ analyse2(MFA={_,_,_}, Path, Visited0) ->
 %%%% We need to check these manually...
 % fun's are ok as long as they are defined locally.
 check_funs({'$M_EXPR','$F_EXPR',_},
+	   [{unicode,characters_to_binary_int,3},
+	    {unicode,characters_to_binary,3},
+	    {filename,filename_string_to_binary,1}|_]) -> 0;
+check_funs({'$M_EXPR','$F_EXPR',_},
+	   [{unicode,ml_map,3},
+	    {unicode,characters_to_binary_int,3},
+	    {unicode,characters_to_binary,3},
+	    {filename,filename_string_to_binary,1}|_]) -> 0;
+check_funs({'$M_EXPR','$F_EXPR',_},
+	   [{unicode,do_o_binary2,2},
+	    {unicode,do_o_binary,2},
+	    {unicode,o_trans,1},
+	    {unicode,characters_to_binary_int,3},
+	    {unicode,characters_to_binary,3},
+	    {filename,filename_string_to_binary,1}|_]) -> 0;
+check_funs({'$M_EXPR','$F_EXPR',_},
 	   [{code_server,load_native_code,4},
 	    {code_server,load_native_code_1,2},
 	    {code_server,load_native_code,2},
@@ -880,6 +927,8 @@ add_and_rehash(Config) when is_list(Config) ->
     ?line true = rpc:call(Node, code, add_path, [OkDir]),
     ?line {error,_} = rpc:call(Node, code, add_path, [BadDir]),
     ?line ok = rpc:call(Node, code, rehash, []),
+
+    ?t:stop_node(Node),
     ok.
     
 where_is_file_no_cache(suite) ->
@@ -981,9 +1030,9 @@ mult_lib_roots(Config) when is_list(Config) ->
 	?t:start_node(mult_lib_roots, slave,
 		      [{args,"-env ERL_LIBS "++ErlLibs}]),
 
-    ?line {ok,Cwd} = file:get_cwd(),
+    ?line TSPath = filename:dirname(code:which(test_server)),
     ?line Path0 = rpc:call(Node, code, get_path, []),
-    ?line [Cwd,"."|Path1] = Path0,
+    ?line [TSPath,"."|Path1] = Path0,
     ?line [Kernel|Path2] = Path1,
     ?line [Stdlib|Path3] = Path2,
     ?line mult_lib_verify_lib(Kernel, "kernel"),
@@ -1002,7 +1051,6 @@ mult_lib_roots(Config) when is_list(Config) ->
 
     ?line true = rpc:call(Node, code_SUITE_mult_root_module, works_fine, []),
 
-    ?line ?t:stop_node(Node),
     ok.
 
 mult_lib_compile(Root, Last) ->
@@ -1145,6 +1193,22 @@ compile_files([File | Files], SrcDir, OutDir) ->
 compile_files([], _, _) ->
     ok.
 
+big_boot_embedded(suite) ->
+    [];
+big_boot_embedded(doc) ->
+    ["Test that a boot file with (almost) all of OTP can be used to start an"
+     " embeddedd system."];
+big_boot_embedded(Config) when is_list(Config) ->
+    ?line {BootArg,AppsInBoot} = create_big_boot(Config),
+    ?line {ok, Node} = 
+	?t:start_node(big_boot_embedded, slave,
+		      [{args,"-boot "++BootArg++" -mode embedded"}]),
+    ?line RemoteNodeApps = 
+	[ {X,Y} || {X,_,Y} <- 
+		       rpc:call(Node,application,loaded_applications,[]) ],
+    ?line true = lists:sort(AppsInBoot) =:=  lists:sort(RemoteNodeApps),
+    ok.
+
 on_load(Config) when is_list(Config) ->
     Master = on_load_test_case_process,
 
@@ -1226,7 +1290,8 @@ on_load_embedded_1(Config) ->
     ?line LibRoot = code:lib_dir(),
     ?line LinkName = filename:join(LibRoot, "on_load_app-1.0"),
     ?line OnLoadApp = filename:join(DataDir, "on_load_app-1.0"),
-    ?line file:delete(LinkName),
+    ?line del_link(LinkName),
+    io:format("LinkName :~p, OnLoadApp: ~p~n",[LinkName,OnLoadApp]),
     case file:make_symlink(OnLoadApp, LinkName) of
 	{error,enotsup} ->
 	    throw({skip,"Support for symlinks required"});
@@ -1255,7 +1320,15 @@ on_load_embedded_1(Config) ->
 
     %% Clean up.
     ?line stop_node(Node),
-    ?line ok = file:delete(LinkName).
+    ?line ok = del_link(LinkName).
+
+del_link(LinkName) ->
+   case file:delete(LinkName) of
+       {error,eperm} ->
+             file:del_dir(LinkName);
+       Other ->
+       	     Other
+   end.			   
 
 create_boot(Config, Options) ->
     ?line {ok, OldDir} = file:get_cwd(),
@@ -1281,6 +1354,73 @@ create_script(Config) ->
     ?line file:close(Fd),
     {filename:dirname(Name),filename:basename(Name)}.
 
+create_big_boot(Config) ->
+    ?line {ok, OldDir} = file:get_cwd(),
+    ?line {Options,Local} = case is_source_dir() of 
+				true -> {[no_module_tests,local],true}; 
+				_ -> {[no_module_tests],false} 
+			    end,
+    ?line {LatestDir,LatestName,Apps} = create_big_script(Config,Local),
+    ?line ok = file:set_cwd(LatestDir),
+    ?line ok = systools:make_script(LatestName, Options),
+    ?line ok = file:set_cwd(OldDir),
+    {filename:join(LatestDir, LatestName),Apps}.
+
+% The following apps cannot be loaded 
+% hipe .app references (or can reference) files that have no
+% corresponding beam file (if hipe is not enabled)
+filter_app("hipe",_) ->
+    false;
+% Dialyzer and typer depends on hipe
+filter_app("dialyzer",_) ->
+    false;
+filter_app("typer",_) ->
+    false;
+% Orber requires explicit configuration
+filter_app("orber",_) ->
+    false;
+% cos* depends on orber
+filter_app("cos"++_,_) ->
+    false;
+% ic has a mod instruction in the app file but no corresponding start function
+filter_app("ic",_) ->
+    false;
+% Netconf has some dependency that I really do not understand (maybe like orber)
+filter_app("netconf",_) ->
+    false;
+% Safe has the same kind of error in the .app file as ic
+filter_app("safe",_) ->
+    false;
+% OS_mon does not find it's port program when running cerl
+filter_app("os_mon",true) ->
+    false;
+% Other apps should be OK.
+filter_app(_,_) ->
+    true.
+create_big_script(Config,Local) ->
+    ?line PrivDir = ?config(priv_dir, Config),
+    ?line Name = filename:join(PrivDir,"full_script_test"),
+    ?line InitialApplications=application:loaded_applications(),
+    %% Applications left loaded by the application suite, unload them!
+    ?line UnloadFix=[app0,app1,app2,group_leader,app_start_error],
+    ?line [application:unload(Leftover) || 
+	      Leftover <- UnloadFix,
+	      lists:keymember(Leftover,1,InitialApplications) ],
+    %% Now we should have only "real" applications...
+    ?line [application:load(list_to_atom(Y)) || {match,[Y]} <- [ re:run(X,code:lib_dir()++"/"++"([^/-]*).*/ebin",[{capture,[1],list}]) || X <- code:get_path()],filter_app(Y,Local)],
+    ?line Apps = [ {N,V} || {N,_,V} <- application:loaded_applications()],
+    ?line {ok,Fd} = file:open(Name ++ ".rel", write),
+    ?line io:format(Fd,
+		    "{release, {\"Test release 3\", \"P2A\"}, \n"
+		    " {erts, \"9.42\"}, \n"
+		    " ~p}.\n",
+		    [Apps]),
+    ?line file:close(Fd),
+    ?line NewlyLoaded = 
+	application:loaded_applications() -- InitialApplications,
+    ?line [ application:unload(N) || {N,_,_} <- NewlyLoaded],
+    {filename:dirname(Name),filename:basename(Name),Apps}.
+
 is_source_dir() ->
     filename:basename(code:lib_dir(kernel)) =:= "kernel" andalso
 	filename:basename(code:lib_dir(stdlib)) =:= "stdlib".
@@ -1333,6 +1473,34 @@ do_on_load_error(ReturnValue) ->
 	    ?line {undef,[{on_load_error,main,[]}|_]} = Exit
     end.
 
+native_early_modules(suite) -> [];
+native_early_modules(doc) -> ["Test that the native code of early loaded modules is loaded"];
+native_early_modules(Config) when is_list(Config) ->
+    case erlang:system_info(hipe_architecture) of
+	undefined ->
+	    {skip,"Native code support is not enabled"};
+	Architecture ->
+	    native_early_modules_1(Architecture)
+    end.
+
+native_early_modules_1(Architecture) ->
+    ?line {lists, ListsBinary, _ListsFilename} = code:get_object_code(lists),
+    ?line ChunkName = hipe_unified_loader:chunk_name(Architecture),
+    ?line NativeChunk = beam_lib:chunks(ListsBinary, [ChunkName]),
+    ?line IsHipeCompiled = case NativeChunk of
+        {ok,{_,[{_,Bin}]}} when is_binary(Bin) -> true;
+        {error, beam_lib, _} -> false
+    end,
+    case IsHipeCompiled of
+        false ->
+	    {skip,"OTP apparently not configured with --enable-native-libs"};
+        true ->
+            ?line true = lists:all(fun code:is_module_native/1,
+				   [ets,file,filename,gb_sets,gb_trees,
+				    hipe_unified_loader,lists,os,packages]),
+            ok
+    end.
+
 %%-----------------------------------------------------------------
 %% error_logger handler.
 %% (Copied from stdlib/test/proc_lib_SUITE.erl.)
diff --git a/lib/kernel/test/code_SUITE_data/on_load_app-1.0/src/on_load_embedded.erl b/lib/kernel/test/code_SUITE_data/on_load_app-1.0/src/on_load_embedded.erl
index a39332f81d..646921026d 100644
--- a/lib/kernel/test/code_SUITE_data/on_load_app-1.0/src/on_load_embedded.erl
+++ b/lib/kernel/test/code_SUITE_data/on_load_app-1.0/src/on_load_embedded.erl
@@ -3,6 +3,15 @@
 -on_load(run_me/0).
 
 run_me() ->
+    %% An onload handler typically calls code:priv_dir/1
+    %% or code:lib_dir/1, so make sure that it works.
+    LibDir = code:lib_dir(on_load_app),
+    PrivDir = code:priv_dir(on_load_app),
+    LibDir = filename:dirname(PrivDir),
+    ModPath = filename:join(filename:split(code:which(?MODULE))),
+    LibDir = filename:dirname(filename:dirname(ModPath)),
+
+    %% Start a process to remember that the on_load was called.
     spawn(fun() ->
 		  register(everything_is_fine, self()),
 		  receive Any ->
diff --git a/lib/kernel/test/code_a_test.erl b/lib/kernel/test/code_a_test.erl
index 745bbf032c..22830fff53 100644
--- a/lib/kernel/test/code_a_test.erl
+++ b/lib/kernel/test/code_a_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
diff --git a/lib/kernel/test/code_b_test.erl b/lib/kernel/test/code_b_test.erl
index 0f0107a2b4..a8ff570e2e 100644
--- a/lib/kernel/test/code_b_test.erl
+++ b/lib/kernel/test/code_b_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index 1bfe76f5ea..389a911d0b 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -28,46 +28,47 @@
 -define(config(X,Y), foo).
 -define(t,test_server).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(format(S, A), ok).
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -define(datadir(Conf), ?config(data_dir, Conf)).
 -endif.
 
--export([all/1, 
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
 
-	 halt_int/1, halt_int_inf/1, halt_int_sz/1, 
+	 halt_int_inf/1, 
 	 halt_int_sz_1/1, halt_int_sz_2/1,
 
-	 read_mode/1, halt_int_ro/1, halt_ext_ro/1, wrap_int_ro/1, 
+	 halt_int_ro/1, halt_ext_ro/1, wrap_int_ro/1, 
 	 wrap_ext_ro/1, halt_trunc/1, halt_misc/1, halt_ro_alog/1, 
 	 halt_ro_balog/1, halt_ro_crash/1,
 
-	 wrap_int/1, wrap_int_1/1, wrap_int_2/1, inc_wrap_file/1,
+	 wrap_int_1/1, wrap_int_2/1, inc_wrap_file/1,
 
-	 halt_ext/1, halt_ext_inf/1,
+	 halt_ext_inf/1,
 
-	 halt_ext_sz/1, halt_ext_sz_1/1, halt_ext_sz_2/1,
+	 halt_ext_sz_1/1, halt_ext_sz_2/1,
 
-	 wrap_ext/1, wrap_ext_1/1, wrap_ext_2/1,
+	 wrap_ext_1/1, wrap_ext_2/1,
 
-	 head/1, head_func/1, plain_head/1, one_header/1,
+	 head_func/1, plain_head/1, one_header/1,
 
-	 notif/1, wrap_notif/1, full_notif/1, trunc_notif/1, blocked_notif/1,
+	 wrap_notif/1, full_notif/1, trunc_notif/1, blocked_notif/1,
 
 	 new_idx_vsn/1, 
 
 	 reopen/1, 
 
-	 block/1, block_blocked/1, block_queue/1, block_queue2/1,
+	 block_blocked/1, block_queue/1, block_queue2/1,
 
 	 unblock/1,
 
-	 open/1, open_overwrite/1, open_size/1, open_truncate/1, open_error/1,
+	 open_overwrite/1, open_size/1, open_truncate/1, open_error/1,
 
-	 close/1, close_race/1, close_block/1, close_deadlock/1,
+	 close_race/1, close_block/1, close_deadlock/1,
 
-	 error/1, error_repair/1, error_log/1, error_index/1,
+	 error_repair/1, error_log/1, error_index/1,
 
 	 chunk/1, 
 
@@ -75,15 +76,15 @@
 
 	 many_users/1,
 
-	 info/1, info_current/1, 
+	 info_current/1, 
 
-	 change_size/1, change_size_before/1, change_size_during/1, 
+	 change_size_before/1, change_size_during/1, 
 	 change_size_after/1, default_size/1, change_size2/1,
 	 change_size_truncate/1,
 
 	 change_attribute/1,
 
-	 distribution/1, dist_open/1, dist_error_open/1, dist_notify/1, 
+	 dist_open/1, dist_error_open/1, dist_notify/1, 
 	 dist_terminate/1, dist_accessible/1, dist_deadlock/1,
          dist_open2/1, other_groups/1,
 
@@ -94,7 +95,7 @@
 -export([head_fun/1, hf/0, lserv/1, 
 	 measure/0, init_m/1, xx/0, head_exit/0, slow_header/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([try_unblock/1]).
 
@@ -142,8 +143,59 @@
 			  change_size_after, default_size]).
 
 
-all(suite) ->
-    ?ALL_TESTS.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, halt_int}, {group, wrap_int},
+     {group, halt_ext}, {group, wrap_ext},
+     {group, read_mode}, {group, head}, {group, notif},
+     new_idx_vsn, reopen, {group, block}, unblock,
+     {group, open}, {group, close}, {group, error}, chunk,
+     truncate, many_users, {group, info},
+     {group, change_size}, change_attribute,
+     {group, distribution}, evil, otp_6278].
+
+groups() -> 
+    [{halt_int, [], [halt_int_inf, {group, halt_int_sz}]},
+     {halt_int_sz, [], [halt_int_sz_1, halt_int_sz_2]},
+     {read_mode, [],
+      [halt_int_ro, halt_ext_ro, wrap_int_ro, wrap_ext_ro,
+       halt_trunc, halt_misc, halt_ro_alog, halt_ro_balog,
+       halt_ro_crash]},
+     {wrap_int, [], [wrap_int_1, wrap_int_2, inc_wrap_file]},
+     {halt_ext, [], [halt_ext_inf, {group, halt_ext_sz}]},
+     {halt_ext_sz, [], [halt_ext_sz_1, halt_ext_sz_2]},
+     {wrap_ext, [], [wrap_ext_1, wrap_ext_2]},
+     {head, [], [head_func, plain_head, one_header]},
+     {notif, [],
+      [wrap_notif, full_notif, trunc_notif, blocked_notif]},
+     {block, [], [block_blocked, block_queue, block_queue2]},
+     {open, [],
+      [open_overwrite, open_size, open_truncate, open_error]},
+     {close, [], [close_race, close_block, close_deadlock]},
+     {error, [], [error_repair, error_log, error_index]},
+     {info, [], [info_current]},
+     {change_size, [],
+      [change_size_before, change_size_during,
+       change_size_after, default_size, change_size2,
+       change_size_truncate]},
+     {distribution, [],
+      [dist_open, dist_error_open, dist_notify,
+       dist_terminate, dist_accessible, dist_deadlock,
+       dist_open2, other_groups]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 init_per_testcase(Case, Config) ->
@@ -167,12 +219,11 @@ init_per_testcase(Case, Config) ->
 	    [{watchdog, Dog}|Config]
     end.
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-halt_int(suite) -> [halt_int_inf, halt_int_sz].
 
 halt_int_inf(suite) -> [];
 halt_int_inf(doc) -> ["Test simple halt disk log, size infinity"];
@@ -187,7 +238,6 @@ halt_int_inf(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     ?line ok = file:delete(File).
 
-halt_int_sz(suite) -> [halt_int_sz_1, halt_int_sz_2].
 
 halt_int_sz_1(suite) -> [];
 halt_int_sz_1(doc) -> ["Test simple halt disk log, size defined"];
@@ -275,10 +325,6 @@ halt_int_sz_2(Conf) when is_list(Conf) ->
     ?line ok = file:delete(File3),
     ok.
 
-read_mode(suite) -> [halt_int_ro, halt_ext_ro, 
-		     wrap_int_ro, wrap_ext_ro,
-		     halt_trunc, halt_misc, halt_ro_alog, halt_ro_balog,
-		     halt_ro_crash].
 
 halt_int_ro(suite) -> [];
 halt_int_ro(doc) -> ["Test simple halt disk log, read only, internal"];
@@ -480,7 +526,6 @@ halt_ro_crash(Conf) when is_list(Conf) ->
 
 
 
-wrap_int(suite) -> [wrap_int_1, wrap_int_2, inc_wrap_file].
 
 wrap_int_1(suite) -> [];
 wrap_int_1(doc) -> ["Test wrap disk log, internal"];
@@ -628,7 +673,6 @@ inc_wrap_file(Conf) when is_list(Conf) ->
 
 
 
-halt_ext(suite) -> [halt_ext_inf, halt_ext_sz].
 
 halt_ext_inf(suite) -> [];
 halt_ext_inf(doc) -> ["Test halt disk log, external, infinity"];
@@ -642,7 +686,6 @@ halt_ext_inf(Conf) when is_list(Conf) ->
     ?line ok = disk_log:close(a),
     ?line ok = file:delete(File).
 
-halt_ext_sz(suite) -> [halt_ext_sz_1, halt_ext_sz_2].
 
 halt_ext_sz_1(suite) -> [];
 halt_ext_sz_1(doc) -> ["Test halt disk log, external, size defined"];
@@ -734,7 +777,6 @@ halt_ext_sz_2(Conf) when is_list(Conf) ->
     ?line ok = file:delete(File3),
     ok.
 
-wrap_ext(suite) -> [wrap_ext_1, wrap_ext_2].
 
 wrap_ext_1(suite) -> [];
 wrap_ext_1(doc) -> ["Test wrap disk log, external, size defined"];
@@ -1147,7 +1189,6 @@ end_times({T1,W1}) ->
     {W2, _} = statistics(wall_clock),
     {T2-T1, W2-W1}.
 
-head(suite) -> [head_func, plain_head, one_header].
 
 head_func(suite) -> [];
 head_func(doc) -> ["Test head parameter"];
@@ -1327,8 +1368,6 @@ one_header(Conf) when is_list(Conf) ->
     ok.
 
 
-notif(suite) -> [wrap_notif, full_notif, trunc_notif, 
-		 blocked_notif].
 
 wrap_notif(suite) -> [];
 wrap_notif(doc) -> ["Test notify parameter, wrap"];
@@ -1553,7 +1592,6 @@ reopen(Conf) when is_list(Conf) ->
     ?line Q = qlen(),
     ok.
 
-block(suite) -> [block_blocked, block_queue, block_queue2].
 
 block_blocked(suite) -> [];
 block_blocked(doc) -> 
@@ -1826,8 +1864,6 @@ try_unblock(Log) ->
     ?line Error = {error, {not_blocked_by_pid, n}} = disk_log:unblock(Log),
     ?line "The disk log" ++ _ = format_error(Error).
 
-open(suite) -> [open_overwrite, open_size, 
-		open_truncate, open_error].
 
 open_overwrite(suite) -> [];
 open_overwrite(doc) -> 
@@ -2075,7 +2111,6 @@ open_error(Conf) when is_list(Conf) ->
 
     ?line del(File, No).    
 
-close(suite) -> [close_race, close_block, close_deadlock].
 
 close_race(suite) -> [];
 close_race(doc) -> 
@@ -2497,7 +2532,6 @@ lserv(Log) ->
     end,
     lserv(Log).
 
-error(suite) -> [error_repair, error_log, error_index].
 
 error_repair(suite) -> [];
 error_repair(doc) -> 
@@ -3215,7 +3249,6 @@ del_files(_Size, File) ->
 
 
 
-info(suite) -> [info_current].
 
 info_current(suite) -> [];
 info_current(doc) -> 
@@ -3420,11 +3453,6 @@ info_current(Conf) when is_list(Conf) ->
     ok.
 
 
-change_size(suite) -> [change_size_before, 
-		       change_size_during, 
-		       change_size_after, 
-		       default_size, change_size2,
-		       change_size_truncate].
 
 change_size_before(suite) -> [];
 change_size_before(doc) -> 
@@ -4094,13 +4122,6 @@ change_attribute(Conf) when is_list(Conf) ->
     ?line Q = qlen(),
     ?line del(File, No).
     
-distribution(suite) -> [dist_open, dist_error_open, 
-			dist_notify, 
-			dist_terminate, 
-			dist_accessible,
-			dist_deadlock,
-                        dist_open2, 
-                        other_groups].
 
 dist_open(suite) -> [];
 dist_open(doc) -> 
diff --git a/lib/kernel/test/erl_boot_server_SUITE.erl b/lib/kernel/test/erl_boot_server_SUITE.erl
index 241d68fef4..8399e8072f 100644
--- a/lib/kernel/test/erl_boot_server_SUITE.erl
+++ b/lib/kernel/test/erl_boot_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -18,9 +18,9 @@
 %%
 -module(erl_boot_server_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
 
 -export([start/1, start_link/1, stop/1, add/1, delete/1, responses/1]).
 
@@ -33,9 +33,27 @@
 %% Changed for the new erl_boot_server for R3A by Bjorn Gustavsson.
 %%-----------------------------------------------------------------
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [start, start_link, stop, add, delete, responses].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 -define(all_ones, {255, 255, 255, 255}).
 
 start(doc) -> "Tests the erl_boot_server:start/1 function.";
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index d15f6aa0d5..9cccdab76b 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -19,13 +19,14 @@
 -module(erl_distribution_SUITE).
 
 %-define(line_trace, 1).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([tick/1, tick_change/1, illegal_nodenames/1, hidden_node/1,
 	 table_waste/1, net_setuptime/1,
-	 monitor_nodes/1,
+	
 	 monitor_nodes_nodedown_reason/1,
 	 monitor_nodes_complex_nodedown_reason/1,
 	 monitor_nodes_node_type/1,
@@ -41,7 +42,7 @@
 	 tick_serv_test/2, tick_serv_test1/1,
 	 keep_conn/1, time_ping/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([start_node/2]).
 
@@ -57,16 +58,39 @@
 %% erl -sname master -rsh ctrsh
 %%-----------------------------------------------------------------
 
-all(suite) -> 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [tick, tick_change, illegal_nodenames, hidden_node,
-     table_waste, net_setuptime,
-     monitor_nodes].
+     table_waste, net_setuptime, {group, monitor_nodes}].
+
+groups() -> 
+    [{monitor_nodes, [],
+      [monitor_nodes_nodedown_reason,
+       monitor_nodes_complex_nodedown_reason,
+       monitor_nodes_node_type, monitor_nodes_misc,
+       monitor_nodes_otp_6481, monitor_nodes_errors,
+       monitor_nodes_combinations, monitor_nodes_cleanup,
+       monitor_nodes_many]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(4)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
@@ -273,6 +297,7 @@ tick_change(Config) when is_list(Config) ->
     ?line PaDir = filename:dirname(code:which(?MODULE)),
     ?line [BN, CN] = get_nodenames(2, tick_change),
     ?line DefaultTT = net_kernel:get_net_ticktime(),
+    ?line unchanged = net_kernel:set_net_ticktime(DefaultTT, 60),
     ?line case DefaultTT of
 	      I when is_integer(I) -> ?line ok;
 	      _                 -> ?line ?t:fail(DefaultTT)
@@ -377,6 +402,7 @@ run_tick_change_test(B, C, PrevTT, TT, PaDir) ->
     end,
 
     ?line change_initiated = net_kernel:set_net_ticktime(TT,20),
+    ?line {ongoing_change_to,_} = net_kernel:set_net_ticktime(TT,20),
     ?line sleep(3),
     ?line change_initiated = rpc:call(B,net_kernel,set_net_ticktime,[TT,15]),
     ?line sleep(7),
@@ -528,18 +554,6 @@ check_monitor_nodes_res(Pid, Node) ->
     end.
 
 
-monitor_nodes(doc) ->
-    [];
-monitor_nodes(suite) ->
-    [monitor_nodes_nodedown_reason,
-     monitor_nodes_complex_nodedown_reason,
-     monitor_nodes_node_type,
-     monitor_nodes_misc,
-     monitor_nodes_otp_6481,
-     monitor_nodes_errors,
-     monitor_nodes_combinations,
-     monitor_nodes_cleanup,
-     monitor_nodes_many].
 	    
 %%
 %% Testcase:
@@ -843,13 +857,16 @@ monitor_nodes_otp_6481_test(Config, TestType) when is_list(Config) ->
     ?line {ok, Node} = start_node(Name, "", this),
     ?line receive {nodeup, Node} -> ok end,
 
-    ?line spawn(Node,
+    ?line RemotePid = spawn(Node,
 		fun () ->
-			receive after 1000 -> ok end,
-			lists:foreach(fun (No) ->
-					      Me ! {NodeMsg, No}
-				      end,
-				      Seq),
+			receive after 1500 -> ok end,
+			% infinit loop of msgs
+			% we want an endless stream of messages and the kill
+			% the node mercilessly.
+			% We then want to ensure that the nodedown message arrives
+			% last ... without garbage after it.
+			_ = spawn(fun() -> node_loop_send(Me, NodeMsg, 1) end),
+			receive {Me, kill_it} -> ok end, 
 			halt()
 		end),
 
@@ -858,9 +875,11 @@ monitor_nodes_otp_6481_test(Config, TestType) when is_list(Config) ->
 
     %% Verify that '{nodeup, Node}' comes before '{NodeMsg, 1}' (the message
     %% bringing up the connection).
-    %%?line no_msgs(500), % Why wait? It fails test sometimes  /sverker
+    ?line no_msgs(500),
     ?line {nodeup, Node} = receive Msg1 -> Msg1 end,
-    ?line {NodeMsg, 1} = receive Msg2 -> Msg2 end,
+    ?line {NodeMsg, 1}   = receive Msg2 -> Msg2 end,
+    % msg stream has begun, kill the node
+    ?line RemotePid ! {self(), kill_it},
 
     %% Verify that '{nodedown, Node}' comes after the last '{NodeMsg, N}'
     %% message.
@@ -881,6 +900,10 @@ flush_node_msgs(NodeMsg, No) ->
 	OtherMsg -> OtherMsg
     end.
 
+node_loop_send(Pid, Msg, No) ->
+    Pid ! {Msg, No},
+    node_loop_send(Pid, Msg, No + 1).
+
 monitor_nodes_errors(doc) ->
     [];
 monitor_nodes_errors(suite) ->
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index 627fed1fdd..f712cdea46 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -18,12 +18,13 @@
 %%
 -module(erl_distribution_wb_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/inet.hrl").
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
--export([init_per_testcase/2, fin_per_testcase/2, whitebox/1, 
+-export([init_per_testcase/2, end_per_testcase/2, whitebox/1, 
 	 switch_options/1, missing_compulsory_dflags/1]).
 
 %% 1)
@@ -77,14 +78,32 @@
 -define(u32(X3,X2,X1,X0),
         (((X3) bsl 24) bor ((X2) bsl 16) bor ((X1) bsl 8) bor (X0))).
 
-all(suite) -> 
-    [whitebox,switch_options,missing_compulsory_dflags].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [whitebox, switch_options, missing_compulsory_dflags].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(1)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index 19c84ab34c..b990e76064 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -19,9 +19,10 @@
 -module(erl_prim_loader_SUITE).
 
 -include_lib("kernel/include/file.hrl").
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([get_path/1, set_path/1, get_file/1,
 	 inet_existing/1, inet_coming_up/1, inet_disconnects/1,
@@ -29,27 +30,41 @@
 	 local_archive/1, remote_archive/1,
 	 primary_archive/1, virtual_dir_in_archive/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 %%-----------------------------------------------------------------
 %% Test suite for erl_prim_loader. (Most code is run during system start/stop.)
 %%-----------------------------------------------------------------
 
-all(suite) ->
-    [
-     get_path, set_path, get_file,
-     inet_existing, inet_coming_up,
-     inet_disconnects, multiple_slaves,
-     file_requests, local_archive, 
-     remote_archive, primary_archive,
-     virtual_dir_in_archive
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [get_path, set_path, get_file, inet_existing,
+     inet_coming_up, inet_disconnects, multiple_slaves,
+     file_requests, local_archive, remote_archive,
+     primary_archive, virtual_dir_in_archive].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(3)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
@@ -291,7 +306,6 @@ wait_and_shutdown([], _) ->
     ok.
 
 
-file_requests(suite) -> {req, [{local_slave_nodes, 1}, {time, 10}]};
 file_requests(doc) -> ["Start a node using the 'inet' loading method, ",
 		       "verify that the boot server responds to file requests."];
 file_requests(Config) when is_list(Config) ->
@@ -300,9 +314,11 @@ file_requests(Config) when is_list(Config) ->
     %% compare with results from file server calls (the
     %% boot server uses the same file sys and cwd)
     {ok,Files} = file:list_dir("."),
+    io:format("Files: ~p~n",[Files]),
     ?line {ok,Files} = rpc:call(Node, erl_prim_loader, list_dir, ["."]),
-    {ok,Info} = file:read_file_info("test_server.beam"),
-    ?line {ok,Info} = rpc:call(Node, erl_prim_loader, read_file_info, ["test_server.beam"]),
+    {ok,Info} = file:read_file_info(code:which(test_server)),
+    ?line {ok,Info} = rpc:call(Node, erl_prim_loader, read_file_info,
+			       [code:which(test_server)]),
     {ok,Cwd} = file:get_cwd(),
     ?line {ok,Cwd} = rpc:call(Node, erl_prim_loader, get_cwd, []),
     case file:get_cwd("C:") of
diff --git a/lib/kernel/test/error_logger_SUITE.erl b/lib/kernel/test/error_logger_SUITE.erl
index eda86861d5..dca073cea0 100644
--- a/lib/kernel/test/error_logger_SUITE.erl
+++ b/lib/kernel/test/error_logger_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(error_logger_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %%-----------------------------------------------------------------
 %% We don't have to test the normal behaviour here, i.e. the tty
@@ -27,7 +27,9 @@
 %% error_logger deliver the expected events.
 %%-----------------------------------------------------------------
 
--export([all/1, error_report/1, info_report/1, error/1, info/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 error_report/1, info_report/1, error/1, info/1,
 	 emulator/1, tty/1, logfile/1, add/1, delete/1]).
 
 -export([generate_error/0]).
@@ -37,9 +39,27 @@
 	 terminate/2]).
 
 
-all(suite) ->
-    [error_report, info_report, error, info,
-     emulator, tty, logfile, add, delete].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [error_report, info_report, error, info, emulator, tty,
+     logfile, add, delete].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%-----------------------------------------------------------------
 
diff --git a/lib/kernel/test/error_logger_warn_SUITE.erl b/lib/kernel/test/error_logger_warn_SUITE.erl
index 6629eca1ad..5b8f0eb049 100644
--- a/lib/kernel/test/error_logger_warn_SUITE.erl
+++ b/lib/kernel/test/error_logger_warn_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -18,7 +18,9 @@
 %%
 -module(error_logger_warn_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,warnings_info/1,warnings_warnings/1,
 	 rb_basic/1,rb_warnings_info/1,rb_warnings_warnings/1,
 	 rb_trunc/1,rb_utc/1,file_utc/1]).
@@ -26,7 +28,7 @@
 %% Internal exports.
 -export([init/1,handle_event/2,handle_info/2,handle_call/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(EXPECT(Pattern),
 	(fun() ->
@@ -43,15 +45,33 @@
 -define(default_timeout, ?t:minutes(1)).
 
 
-all(suite) ->
-    [basic, warnings_info, warnings_warnings, 
-     rb_basic, rb_warnings_info, rb_warnings_warnings,
-     rb_trunc,rb_utc, file_utc].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic, warnings_info, warnings_warnings, rb_basic,
+     rb_warnings_info, rb_warnings_warnings, rb_trunc,
+     rb_utc, file_utc].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 15bab0dccd..d218589028 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -40,29 +40,29 @@
 
 -module(?FILE_SUITE).
 
--export([all/1,
-	 init/1, fini/1,
-	 init_per_testcase/2, fin_per_testcase/2,
-	 read_write_file/1, dirs/1, files/1, names/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 init_per_testcase/2, end_per_testcase/2,
+	 read_write_file/1, names/1]).
 -export([cur_dir_0/1, cur_dir_1/1, make_del_dir/1,
-	 pos/1, pos1/1, pos2/1]).
--export([close/1, consult/1, consult1/1, path_consult/1, delete/1]).
--export([eval/1, eval1/1, path_eval/1, script/1, script1/1, path_script/1,
-	 open/1, open1/1,
+	 pos1/1, pos2/1]).
+-export([close/1, consult1/1, path_consult/1, delete/1]).
+-export([ eval1/1, path_eval/1, script1/1, path_script/1,
+	 open1/1,
 	 old_modes/1, new_modes/1, path_open/1, open_errors/1]).
--export([file_info/1, file_info_basic_file/1, file_info_basic_directory/1,
+-export([ file_info_basic_file/1, file_info_basic_directory/1,
 	 file_info_bad/1, file_info_times/1, file_write_file_info/1]).
 -export([rename/1, access/1, truncate/1, datasync/1, sync/1,
-	 read_write/1, pread_write/1, append/1]).
--export([errors/1, e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
+	 read_write/1, pread_write/1, append/1, exclusive/1]).
+-export([ e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
 -export([otp_5814/1]).
 
--export([compression/1, read_not_really_compressed/1,
+-export([ read_not_really_compressed/1,
 	 read_compressed_cooked/1, read_compressed_cooked_binary/1,
 	 read_cooked_tar_problem/1,
 	 write_compressed/1, compress_errors/1, catenated_gzips/1]).
 
--export([links/1, make_link/1, read_link_info_for_non_link/1, symlinks/1]).
+-export([ make_link/1, read_link_info_for_non_link/1, symlinks/1]).
 
 -export([copy/1]).
 
@@ -93,23 +93,56 @@
 
 
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
 
 
-all(suite) ->
-    {conf, init,
-     [altname, read_write_file, dirs, files, 
-      delete, rename, names, errors,
-      compression, links, copy,
-      delayed_write, read_ahead, segment_read, segment_write,
-      ipread, pid2name, interleaved_read_write, 
-      otp_5814, large_file, read_line_1, read_line_2, read_line_3, read_line_4,
-      standard_io],
-     fini}.
-
-init(Config) when is_list(Config) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [altname, read_write_file, {group, dirs},
+     {group, files}, delete, rename, names, {group, errors},
+     {group, compression}, {group, links}, copy,
+     delayed_write, read_ahead, segment_read, segment_write,
+     ipread, pid2name, interleaved_read_write, otp_5814,
+     large_file, read_line_1, read_line_2, read_line_3,
+     read_line_4, standard_io].
+
+groups() -> 
+    [{dirs, [], [make_del_dir, cur_dir_0, cur_dir_1]},
+     {files, [],
+      [{group, open}, {group, pos}, {group, file_info},
+       {group, consult}, {group, eval}, {group, script},
+       truncate, sync, datasync, advise]},
+     {open, [],
+      [open1, old_modes, new_modes, path_open, close, access,
+       read_write, pread_write, append, open_errors,
+       exclusive]},
+     {pos, [], [pos1, pos2]},
+     {file_info, [],
+      [file_info_basic_file, file_info_basic_directory,
+       file_info_bad, file_info_times, file_write_file_info]},
+     {consult, [], [consult1, path_consult]},
+     {eval, [], [eval1, path_eval]},
+     {script, [], [script1, path_script]},
+     {errors, [],
+      [e_delete, e_rename, e_make_dir, e_del_dir]},
+     {compression, [],
+      [read_compressed_cooked, read_compressed_cooked_binary,
+       read_cooked_tar_problem, read_not_really_compressed,
+       write_compressed, compress_errors, catenated_gzips]},
+     {links, [],
+      [make_link, read_link_info_for_non_link, symlinks]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
 	    Priv = ?config(priv_dir, Config),
@@ -126,7 +159,7 @@ init(Config) when is_list(Config) ->
 	    ?FILE_INIT(Config)
     end.
 
-fini(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
 	    os:cmd("subst z: /d");
@@ -139,7 +172,7 @@ init_per_testcase(_Func, Config) ->
     %%error_logger:info_msg("~p:~p *****~n", [?MODULE, _Func]),
     ?FILE_INIT_PER_TESTCASE(Config).
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     %% error_logger:info_msg("~p:~p END *****~n", [?MODULE, _Func]),
     ?FILE_FIN_PER_TESTCASE(Config).
 
@@ -314,7 +347,6 @@ read_write_file(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-dirs(suite) -> [make_del_dir, cur_dir_0, cur_dir_1].
 
 make_del_dir(suite) -> [];
 make_del_dir(doc) -> [];
@@ -461,12 +493,7 @@ win_cur_dir_1(_Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-files(suite) ->
-    [open,pos,file_info,consult,eval,script,truncate,
-     sync,datasync,advise].
 
-open(suite) -> [open1,old_modes,new_modes,path_open,close,access,read_write,
-	       pread_write,append,open_errors].
 
 open1(suite) -> [];
 open1(doc) -> [];
@@ -840,9 +867,24 @@ open_errors(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
+exclusive(suite) -> [];
+exclusive(doc) -> "Test exclusive access to a file.";
+exclusive(Config) when is_list(Config) ->
+    ?line Dog = test_server:timetrap(test_server:seconds(5)),
+    ?line RootDir = ?config(priv_dir,Config),
+    ?line NewDir = filename:join(RootDir,
+				 atom_to_list(?MODULE)
+				 ++"_exclusive"),
+    ?line ok = ?FILE_MODULE:make_dir(NewDir),
+    ?line Name = filename:join(NewDir, "ex_file.txt"),
+    ?line {ok, Fd} = ?FILE_MODULE:open(Name, [write, exclusive]),
+    ?line {error, eexist} = ?FILE_MODULE:open(Name, [write, exclusive]),
+    ?line ok = ?FILE_MODULE:close(Fd),
+    ?line test_server:timetrap_cancel(Dog),
+    ok.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-pos(suite) -> [pos1,pos2].
 
 pos1(suite) -> [];
 pos1(doc) -> [];
@@ -934,8 +976,6 @@ pos2(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
-file_info(suite) -> [file_info_basic_file, file_info_basic_directory,
-		     file_info_bad, file_info_times, file_write_file_info].
 
 file_info_basic_file(suite) -> [];
 file_info_basic_file(doc) -> [];
@@ -1201,7 +1241,6 @@ file_write_file_info(Config) when is_list(Config) ->
 get_good_directory(Config) ->
     ?line ?config(priv_dir, Config).
 
-consult(suite) -> [consult1, path_consult].
 
 consult1(suite) -> [];
 consult1(doc) -> [];
@@ -1262,7 +1301,6 @@ path_consult(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
-eval(suite) -> [eval1,path_eval].
 
 eval1(suite) -> [];
 eval1(doc) -> [];
@@ -1335,7 +1373,6 @@ path_eval(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
-script(suite) -> [script1,path_script].
 
 script1(suite) -> [];
 script1(doc) -> "";
@@ -1686,7 +1723,6 @@ names(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-errors(suite) -> [e_delete, e_rename, e_make_dir, e_del_dir].
 
 e_delete(suite) -> [];
 e_delete(doc) -> [];
@@ -1943,12 +1979,6 @@ e_del_dir(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-compression(suite) ->
-    [read_compressed_cooked, read_compressed_cooked_binary,
-     read_cooked_tar_problem,
-     read_not_really_compressed,
-     write_compressed, compress_errors,
-     catenated_gzips].
 
 %% Trying reading and positioning from a compressed file.
 
@@ -2242,8 +2272,6 @@ altname(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     Result.
 
-links(doc) -> "Test the link functions.";
-links(suite) -> [make_link, read_link_info_for_non_link, symlinks].
 
 make_link(doc) -> "Test creating a hard link.";
 make_link(suite) -> [];
@@ -3252,7 +3280,7 @@ large_file(Config) when is_list(Config) ->
 	{{unix,sunos},{A,B,C}}
 	when A == 5, B == 5, C >= 1;   A == 5, B >= 6;   A >= 6 ->
 	    do_large_file(Config);
-	{{unix,Unix},_} when Unix =:= linux; Unix =:= darwin ->
+	{{unix,Unix},_} when Unix =/= sunos ->
 	    N = unix_free(Config),
 	    io:format("Free: ~w KByte~n", [N]),
 	    if N < 5 * (1 bsl 20) ->
@@ -3262,7 +3290,7 @@ large_file(Config) when is_list(Config) ->
 		    do_large_file(Config)
 	    end;
 	_ -> 
-	    {skipped,"Only supported on Win32, Linux, or SunOS >= 5.5.1"}
+	    {skipped,"Only supported on Win32, Unix or SunOS >= 5.5.1"}
     end.
 
 unix_free(Config) ->
@@ -3274,7 +3302,7 @@ unix_free(Config) ->
     N.
 
 do_large_file(Config) ->
-    ?line Watchdog = ?t:timetrap(?t:minutes(4)),
+    ?line Watchdog = ?t:timetrap(?t:minutes(5)),
     %%
     ?line Name = filename:join(?config(priv_dir, Config),
 			       ?MODULE_STRING ++ "_large_file"),
@@ -3313,6 +3341,17 @@ do_large_file(Config) ->
     ?line {ok,P}  = ?FILE_MODULE:position(F, {eof,-L}),
     ?line {ok,Rs} = ?FILE_MODULE:read(F, L+1),
     ?line ok      = ?FILE_MODULE:close(F),
+    %% Reopen the file with 'append'; used to fail on Windows causing
+    %% writes to go to the beginning of the file for files > 4GB.
+    ?line PL = P + L,
+    ?line PLL = PL + L,
+    ?line {ok,F1}  = ?FILE_MODULE:open(Name, [raw,read,write,append]),
+    ?line ok       = ?FILE_MODULE:write(F1, R),
+    ?line {ok,PLL} = ?FILE_MODULE:position(F1, {cur,0}),
+    ?line {ok,Rs}  = ?FILE_MODULE:pread(F1, P, L),
+    ?line {ok,PL}  = ?FILE_MODULE:position(F1, {eof,-L}),
+    ?line {ok,R}   = ?FILE_MODULE:read(F1, L+1),
+    ?line ok       = ?FILE_MODULE:close(F1),
     %%
     ?line Mref = erlang:monitor(process, Deleter),
     ?line Deleter ! {Tester,done},
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
new file mode 100644
index 0000000000..33c8e5bbe4
--- /dev/null
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -0,0 +1,1756 @@
+-module(file_name_SUITE).
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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%
+%%
+
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("kernel/include/file.hrl").
+
+%%
+%% File operations that take filenames as parameters (* not prim_file operation) (** a drive):
+%% altname
+%% copy (*)
+%% del_dir
+%% delete
+%% get_cwd (**)
+%% list_dir
+%% make_dir
+%% make_link
+%% make_symlink
+%% open
+%% read_file
+%% read_file_info
+%% read_link
+%% read_link_info
+%% rename
+%% set_cwd
+%% write_file
+%% write_file_info
+%%
+%% File operations that opens/uses separate driver port (not connected to file)
+%% altname
+%% del_dir
+%% delete
+%% get_cwd
+%% list_dir
+%% make_dir
+%% make_link
+%% make_symlink
+%% read_file_info
+%% read_link
+%% read_link_info
+%% rename
+%% set_cwd
+%% write_file_info
+%% 
+%% Operations that use ?FD_DRV in prim_file
+%% open
+%% read_file
+%% write_file
+%%
+%%
+%% Operations that return a filename/path
+%% altname
+%% get_cwd
+%% list_dir
+%% read_link
+
+-export([all/0,groups/0,suite/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([normal/1,icky/1,very_icky/1,normalize/1]).
+
+
+init_per_testcase(_Func, Config) ->
+    Dog = test_server:timetrap(test_server:seconds(60)),
+    [{watchdog,Dog}|Config].
+
+end_per_testcase(_Func, Config) ->
+    Dog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [normal, icky, very_icky, normalize].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+normalize(suite) ->
+    [];
+normalize(doc) ->
+    ["Check that filename normalization works"];
+normalize(Config) when is_list(Config) ->
+    random:seed({1290,431421,830412}),
+    try
+	?line UniMode = file:native_name_encoding() =/= latin1,
+	if 
+	    not UniMode ->
+		throw(need_unicode_mode);
+	    true ->
+		ok
+	end,
+	?line Pairs = [rand_comp_decomp(200) || _ <- lists:seq(1,1000)],
+	case os:type() of
+	    {unix,darwin} ->
+		?line [ true = (A =:= prim_file:internal_native2name(B)) ||
+		    {A,B} <- Pairs ];
+	    _ ->
+		ok
+	end,
+	?line [ true = (A =:= prim_file:internal_normalize_utf8(B)) ||
+		  {A,B} <- Pairs ]
+	
+    catch
+	throw:need_unicode_mode ->
+	    io:format("Sorry, can only run in unicode mode.~n"),
+	    {skipped,"VM needs to be started in Unicode filename mode"}
+    end.
+    
+normal(suite) ->
+    [];
+normal(doc) ->
+    "Check file operations on normal file names regardless of unicode mode";
+normal(Config) when is_list(Config) ->
+    {ok,Dir} = file:get_cwd(),
+    try
+	Priv = ?config(priv_dir, Config),
+	file:set_cwd(Priv),
+	put(file_module,prim_file),
+	ok = check_normal(prim_file),
+	put(file_module,file),
+	ok = check_normal(file)
+    after
+	file:set_cwd(Dir)
+    end.
+    
+
+icky(suite) ->
+    [];
+icky(doc) ->
+    "Check file operations on normal file names regardless of unicode mode";
+icky(Config) when is_list(Config) ->
+    case hopeless_darwin() of
+	true ->
+	    {skipped,"This version of darwin does not support icky names at all."};
+	false ->
+	    {ok,Dir} = file:get_cwd(),
+	    try
+		Priv = ?config(priv_dir, Config),
+		file:set_cwd(Priv),
+		put(file_module,prim_file),
+		ok = check_icky(prim_file),
+		put(file_module,file),
+		ok = check_icky(file)
+	    after
+		file:set_cwd(Dir)
+	    end
+    end.
+very_icky(suite) ->
+    [];
+very_icky(doc) ->
+    "Check file operations on normal file names regardless of unicode mode";
+very_icky(Config) when is_list(Config) ->
+    case hopeless_darwin() of
+	true ->
+	    {skipped,"This version of darwin does not support icky names at all."};
+	false ->
+	    {ok,Dir} = file:get_cwd(),
+	    try
+		Priv = ?config(priv_dir, Config),
+		file:set_cwd(Priv),
+		put(file_module,prim_file),
+		case check_very_icky(prim_file) of
+		    need_unicode_mode ->
+			{skipped,"VM needs to be started in Unicode filename mode"};
+		    ok ->
+			put(file_module,file),
+			ok = check_very_icky(file)
+		end
+	    after
+		file:set_cwd(Dir)
+	    end
+    end.
+    
+
+check_normal(Mod) -> 
+    {ok,Dir} = Mod:get_cwd(),
+    try
+	?line make_normal_dir(Mod),
+	?line {ok, L0} = Mod:list_dir("."),
+	?line L1 = lists:sort(L0),
+	%erlang:display(L1),
+	?line L1 = lists:sort(list(normal_dir())),
+	?line {ok,D2} = Mod:get_cwd(),
+	?line true = is_list(D2),
+	?line case Mod:altname("fil1") of
+	    {error,enotsup} ->
+		ok;
+	    {ok,LLL} when is_list(LLL) ->
+		ok
+	end,
+	?line [ true = is_list(El) || El <- L1],
+	?line Syms = [ {S,Targ,list_to_binary(get_data(Targ,normal_dir()))} 
+		 || {T,S,Targ} <- normal_dir(), T =:= symlink ],
+	?line [ {ok, Cont} = Mod:read_file(SymL) || {SymL,_,Cont} <- Syms ],
+	?line [ {ok, Targ} = fixlink(Mod:read_link(SymL)) || {SymL,Targ,_} <- Syms ],
+	?line chk_cre_dir(Mod,[{directory,"temp_dir",normal_dir()}]),
+	?line {ok,BeginAt} = Mod:get_cwd(),
+	?line true = is_list(BeginAt),
+	?line {error,enoent} = Mod:set_cwd("tmp_dir"),
+	?line ok = Mod:set_cwd("temp_dir"),
+	?line {ok, NowAt} = Mod:get_cwd(),
+	?line true = BeginAt =/= NowAt,
+	?line ok = Mod:set_cwd(".."),
+	?line {ok,BeginAt} = Mod:get_cwd(),
+	?line rm_r(Mod,"temp_dir"),
+	?line true = is_list(Dir),
+	?line [ true = is_list(FN) || FN <- L0 ],
+	case has_links() of
+	    true ->
+		?line ok = Mod:make_link("fil1","nisse"),
+		?line {ok, <<"fil1">>} = Mod:read_file("nisse"),
+		?line {ok, #file_info{type = regular}} = Mod:read_link_info("nisse"),
+		?line ok = Mod:delete("nisse"),
+		?line {ok, <<"fil1">>} = Mod:read_file("fil1"),
+		?line {error,enoent} = Mod:read_file("nisse"),
+		?line {error,enoent} = Mod:read_link_info("nisse");
+	    false ->
+		ok
+	end,
+	?line [ begin
+	      ?line {ok, FD} = Mod:open(Name,[read]),
+	      ?line {ok, Content} = Mod:read(FD,1024),
+	      ?line ok = file:close(FD)
+	  end || {regular,Name,Content} <- normal_dir() ],
+	?line [ begin
+	      ?line {ok, FD} = Mod:open(Name,[read,binary]),
+	      ?line BC = list_to_binary(Content),
+	      ?line {ok, BC} = Mod:read(FD,1024),
+	      ?line ok = file:close(FD)
+	  end || {regular,Name,Content} <- normal_dir() ],
+	?line Mod:rename("fil1","tmp_fil1"),
+	?line {ok, <<"fil1">>} = Mod:read_file("tmp_fil1"),
+	?line {error,enoent} = Mod:read_file("fil1"),
+	?line Mod:rename("tmp_fil1","fil1"),
+	?line {ok, <<"fil1">>} = Mod:read_file("fil1"),
+	?line {error,enoent} = Mod:read_file("tmp_fil1"),
+	?line {ok,FI} = Mod:read_file_info("fil1"),
+	?line NewMode = FI#file_info.mode band (bnot 8#333),
+	?line NewMode2 = NewMode bor 8#222,
+	?line true = NewMode2 =/= NewMode,
+	?line ok = Mod:write_file_info("fil1",FI#file_info{mode = NewMode}),
+	?line {ok,#file_info{mode = NewMode}} = Mod:read_file_info("fil1"),
+	?line ok = Mod:write_file_info("fil1",FI#file_info{mode = NewMode2}),
+	?line {ok,#file_info{mode = NewMode2}} = Mod:read_file_info("fil1"),
+	ok
+    after
+        case Mod:read_file_info("fil1") of
+	    {ok,FII} ->
+		NewModeI = FII#file_info.mode bor 8#777,
+		Mod:write_file_info("fil1",FII#file_info{mode = NewModeI});
+	    _ ->
+		ok
+	end,
+	Mod:set_cwd(Dir),
+        io:format("Wd now: ~s~n",[Dir])
+    end.
+
+check_icky(Mod) -> 
+    {ok,Dir} = Mod:get_cwd(),
+    try
+	?line true=(length("���") =:= 3),
+	?line UniMode = file:native_name_encoding() =/= latin1,
+	?line make_icky_dir(Mod),
+ 	?line {ok, L0} = Mod:list_dir("."),
+ 	?line L1 = lists:sort(L0),
+	io:format("~p ~p~n",[L1,list(icky_dir())]),
+ 	?line L1 = lists:sort(convlist(list(icky_dir()))),
+ 	?line {ok,D2} = Mod:get_cwd(),
+ 	?line true = is_list(D2),
+%% Altname only on windows, and there are no non native filenames there
+%% 	?line case Mod:altname("fil1") of
+%% 	    {error,enotsup} ->
+%% 		ok;
+%% 	    {ok,LLL} when is_list(LLL) ->
+%% 		ok
+%% 	end,
+ 	?line [ true = ((is_list(El) or (UniMode and is_binary(El))))  || El <- L1],
+ 	?line Syms = [ {S,conv(Targ),list_to_binary(get_data(Targ,icky_dir()))} 
+ 		 || {T,S,Targ} <- icky_dir(), T =:= symlink ],
+ 	?line [ {ok, Cont} = Mod:read_file(SymL) || {SymL,_,Cont} <- Syms ],
+ 	?line [ {ok, Targ} = fixlink(Mod:read_link(SymL)) || {SymL,Targ,_} <- Syms ],
+ 	?line chk_cre_dir(Mod,[{directory,"���_dir",icky_dir()}]),
+ 	?line {ok,BeginAt} = Mod:get_cwd(),
+ 	?line true = is_list(BeginAt),
+ 	?line {error,enoent} = Mod:set_cwd("��_dir"),
+	?line ok = Mod:set_cwd("���_dir"),
+ 	?line {ok, NowAt} = Mod:get_cwd(),
+ 	?line true = is_list(NowAt),
+ 	?line true = BeginAt =/= NowAt,
+ 	?line ok = Mod:set_cwd(".."),
+ 	?line {ok,BeginAt} = Mod:get_cwd(),
+ 	?line rm_r2(Mod,"���_dir"),
+	{OS,TYPE} = os:type(),
+	% Check that treat_icky really converts to the same as the OS
+	case UniMode of
+	    true ->
+		?line chk_cre_dir(Mod,[{directory,"���_dir",[]}]),
+		?line ok = Mod:set_cwd("���_dir"),
+		?line ok = Mod:write_file(<<"���">>,<<"hello">>),
+		?line Treated = treat_icky(<<"���">>),
+		?line {ok,[Treated]} = Mod:list_dir("."),
+		?line ok = Mod:delete(<<"���">>),
+		?line {ok,[]} = Mod:list_dir("."),
+		?line ok = Mod:set_cwd(".."),
+		?line rm_r2(Mod,"���_dir");
+	    false ->
+		ok
+	end,
+
+ 	?line chk_cre_dir(Mod,[{directory,treat_icky(<<"���_dir">>),icky_dir()}]),
+	if 
+	    UniMode and (OS =/= win32) ->
+		?line {error,enoent} = Mod:set_cwd("���_dir");
+	    true ->
+		ok
+	end,
+	?line ok = Mod:set_cwd(treat_icky(<<"���_dir">>)),
+ 	?line {ok, NowAt2} = Mod:get_cwd(),
+	io:format("~p~n",[NowAt2]),
+	% Cannot create raw unicode-breaking filenames on windows or macos
+ 	?line true = ((((not UniMode) or (OS =:= win32) or (TYPE=:=darwin)) and is_list(NowAt2)) orelse ((UniMode) and is_binary(NowAt2))),
+ 	?line true = BeginAt =/= NowAt2,
+ 	?line ok = Mod:set_cwd(".."),
+ 	?line {ok,BeginAt} = Mod:get_cwd(),
+ 	?line rm_r2(Mod,conv(treat_icky(<<"���_dir">>))),
+	case has_links() of
+	    true ->
+		?line ok = Mod:make_link("fil1","nisse�"),
+		?line {ok, <<"fil1">>} = Mod:read_file("nisse�"),
+		?line {ok, #file_info{type = regular}} = Mod:read_link_info("nisse�"),
+		?line ok = Mod:delete("nisse�"),
+		?line ok = Mod:make_link("fil1",treat_icky(<<"nisse�">>)),
+		?line {ok, <<"fil1">>} = Mod:read_file(treat_icky(<<"nisse�">>)),
+		?line {ok, #file_info{type = regular}} = Mod:read_link_info(treat_icky(<<"nisse�">>)),
+		?line ok = Mod:delete(treat_icky(<<"nisse�">>)),
+		?line {ok, <<"fil1">>} = Mod:read_file("fil1"),
+		?line {error,enoent} = Mod:read_file("nisse�"),
+		?line {error,enoent} = Mod:read_link_info("nisse�"),
+		?line {error,enoent} = Mod:read_file(treat_icky(<<"nisse�">>)),
+		?line {error,enoent} = Mod:read_link_info(treat_icky(<<"nisse�">>));
+	    false ->
+		ok
+	end,
+ 	?line [ begin
+ 	      ?line {ok, FD} = Mod:open(Name,[read]),
+ 	      ?line {ok, Content} = Mod:read(FD,1024),
+ 	      ?line ok = file:close(FD)
+ 	  end || {regular,Name,Content} <- icky_dir() ],
+ 	?line [ begin
+ 	      ?line {ok, FD} = Mod:open(Name,[read,binary]),
+ 	      ?line BC = list_to_binary([Content]),
+ 	      ?line {ok, BC} = Mod:read(FD,1024),
+ 	      ?line ok = file:close(FD)
+ 	  end || {regular,Name,Content} <- icky_dir() ],
+ 	?line Mod:rename("���2","���_fil1"),
+ 	?line {ok, <<"���2">>} = Mod:read_file("���_fil1"),
+ 	?line {error,enoent} = Mod:read_file("���2"),
+ 	?line Mod:rename("���_fil1","���2"),
+ 	?line {ok, <<"���2">>} = Mod:read_file("���2"),
+ 	?line {error,enoent} = Mod:read_file("���_fil1"),
+
+ 	?line Mod:rename("���2",treat_icky(<<"���_fil1">>)),
+ 	?line {ok, <<"���2">>} = Mod:read_file(treat_icky(<<"���_fil1">>)),
+	if
+	    UniMode and (OS =/= win32) ->
+		{error,enoent} = Mod:read_file("���_fil1");
+	    true ->
+		ok
+	end,
+ 	?line {error,enoent} = Mod:read_file("���2"),
+ 	?line Mod:rename(treat_icky(<<"���_fil1">>),"���2"),
+ 	?line {ok, <<"���2">>} = Mod:read_file("���2"),
+ 	?line {error,enoent} = Mod:read_file("���_fil1"),
+ 	?line {error,enoent} = Mod:read_file(treat_icky(<<"���_fil1">>)),
+
+ 	?line {ok,FI} = Mod:read_file_info("���2"),
+	?line NewMode = FI#file_info.mode band (bnot 8#333),
+	?line NewMode2 = NewMode bor 8#222,
+ 	?line true = NewMode2 =/= NewMode,
+ 	?line ok = Mod:write_file_info("���2",FI#file_info{mode = NewMode}),
+ 	?line {ok,#file_info{mode = NewMode}} = Mod:read_file_info("���2"),
+ 	?line ok = Mod:write_file_info("���2",FI#file_info{mode = NewMode2}),
+ 	?line {ok,#file_info{mode = NewMode2}} = Mod:read_file_info("���2"),
+
+ 	?line {ok,FII} = Mod:read_file_info(treat_icky(<<"���5">>)),
+ 	?line true = NewMode2 =/= NewMode,
+ 	?line ok = Mod:write_file_info(treat_icky(<<"���5">>),FII#file_info{mode = NewMode}),
+ 	?line {ok,#file_info{mode = NewMode}} = Mod:read_file_info(treat_icky(<<"���5">>)),
+ 	?line ok = Mod:write_file_info(<<"���5">>,FII#file_info{mode = NewMode2}),
+ 	?line {ok,#file_info{mode = NewMode2}} = Mod:read_file_info(treat_icky(<<"���5">>)),
+	ok
+    after
+	Mod:set_cwd(Dir),
+        io:format("Wd now: ~s~n",[Dir])
+    end.
+
+check_very_icky(Mod) -> 
+    {ok,Dir} = Mod:get_cwd(),
+    try
+	?line true=(length("���") =:= 3),
+	?line UniMode = file:native_name_encoding() =/= latin1,
+	if
+	    not UniMode ->
+		throw(need_unicode_mode);
+	    true ->
+		ok
+	end,
+	?line make_very_icky_dir(Mod),
+ 	?line {ok, L0} = Mod:list_dir("."),
+ 	?line L1 = lists:sort(L0),
+ 	?line L1 = lists:sort(convlist(list(very_icky_dir()))),
+ 	?line {ok,D2} = Mod:get_cwd(),
+ 	?line true = is_list(D2),
+ 	?line [ true = ((is_list(El) or is_binary(El)))  || El <- L1],
+ 	?line Syms = [ {S,conv(Targ),list_to_binary(get_data(Targ,very_icky_dir()))} 
+ 		 || {T,S,Targ} <- very_icky_dir(), T =:= symlink ],
+ 	?line [ {ok, Cont} = Mod:read_file(SymL) || {SymL,_,Cont} <- Syms ],
+ 	?line [ {ok, Targ} = fixlink(Mod:read_link(SymL)) || {SymL,Targ,_} <- Syms ],
+ 	?line chk_cre_dir(Mod,[{directory,[1088,1079,1091]++"_dir",very_icky_dir()}]),
+ 	?line {ok,BeginAt} = Mod:get_cwd(),
+ 	?line true = is_list(BeginAt),
+ 	?line {error,enoent} = Mod:set_cwd("��_dir"),
+	?line ok = Mod:set_cwd([1088,1079,1091]++"_dir"),
+ 	?line {ok, NowAt} = Mod:get_cwd(),
+ 	?line true = is_list(NowAt),
+ 	?line true = BeginAt =/= NowAt,
+ 	?line ok = Mod:set_cwd(".."),
+ 	?line {ok,BeginAt} = Mod:get_cwd(),
+ 	?line rm_r2(Mod,[1088,1079,1091]++"_dir"),
+
+	case has_links() of
+	    true ->
+		?line ok = Mod:make_link("fil1","nisse"++[1088,1079,1091]),
+		?line {ok, <<"fil1">>} = 
+		    Mod:read_file("nisse"++[1088,1079,1091]),
+		?line {ok, #file_info{type = regular}} = 
+		    Mod:read_link_info("nisse"++[1088,1079,1091]),
+		?line ok = Mod:delete("nisse"++[1088,1079,1091]),
+		?line ok = Mod:make_link("fil1",<<"nisse�">>),
+		?line {ok, <<"fil1">>} = Mod:read_file(<<"nisse�">>),
+		?line {ok, #file_info{type = regular}} = 
+		    Mod:read_link_info(<<"nisse�">>),
+		?line ok = Mod:delete(<<"nisse�">>),
+		?line {ok, <<"fil1">>} = Mod:read_file("fil1"),
+		?line {error,enoent} = Mod:read_file("nisse"++[1088,1079,1091]),
+		?line {error,enoent} = Mod:read_link_info("nisse"++[1088,1079,1091]),
+		?line {error,enoent} = Mod:read_file(<<"nisse�">>),
+		?line {error,enoent} = Mod:read_link_info(<<"nisse�">>);
+	    false ->
+		ok
+	end,
+ 	?line [ begin
+ 	      ?line {ok, FD} = Mod:open(Name,[read]),
+ 	      ?line {ok, Content} = Mod:read(FD,1024),
+ 	      ?line ok = file:close(FD)
+ 	  end || {regular,Name,Content} <- very_icky_dir() ],
+ 	?line [ begin
+ 	      ?line {ok, FD} = Mod:open(Name,[read,binary]),
+ 	      ?line BC = list_to_binary([Content]),
+ 	      ?line {ok, BC} = Mod:read(FD,1024),
+ 	      ?line ok = file:close(FD)
+ 	  end || {regular,Name,Content} <- very_icky_dir() ],
+ 	?line Mod:rename([956,965,963,954,959,49],
+			 [956,965,963,954,959]++"_fil1"),
+ 	?line {ok, <<"���2">>} = Mod:read_file([956,965,963,954,959]++"_fil1"),
+ 	?line {error,enoent} = Mod:read_file([956,965,963,954,959,49]),
+ 	?line Mod:rename([956,965,963,954,959]++"_fil1",[956,965,963,954,959,49]),
+ 	?line {ok, <<"���2">>} = Mod:read_file([956,965,963,954,959,49]),
+ 	?line {error,enoent} = Mod:read_file([956,965,963,954,959]++"_fil1"),
+
+ 	?line {ok,FI} = Mod:read_file_info([956,965,963,954,959,49]),
+	?line NewMode = FI#file_info.mode band (bnot 8#333),
+	?line NewMode2 = NewMode bor 8#222,
+ 	?line true = NewMode2 =/= NewMode,
+ 	?line ok = Mod:write_file_info([956,965,963,954,959,49],
+				       FI#file_info{mode = NewMode}),
+ 	?line {ok,#file_info{mode = NewMode}} = 
+	           Mod:read_file_info([956,965,963,954,959,49]),
+ 	?line ok = Mod:write_file_info([956,965,963,954,959,49],
+				       FI#file_info{mode = NewMode2}),
+ 	?line {ok,#file_info{mode = NewMode2}} = 
+	          Mod:read_file_info([956,965,963,954,959,49]),
+	?line NumOK0 = case has_links() of
+			  true -> 5;
+			  false -> 3
+		      end,
+	?line NumNOK0 = case has_links() of
+			   true -> 4;
+			   false -> 3
+		       end,
+	?line {NumOK,NumNOK} = case is_binary(treat_icky(<<"foo">>)) of
+				   false ->
+				       {NumOK0+NumNOK0,0};
+				   true ->
+				       {NumOK0,NumNOK0}
+			       end,
+	?line {NumOK,NumNOK} = filelib:fold_files(".",".*",true,fun(_F,{N,M}) when is_list(_F) ->  io:format("~ts~n",[_F]),{N+1,M}; (_F,{N,M}) ->  io:format("~p~n",[_F]),{N,M+1} end,{0,0}),
+	?line ok = filelib:fold_files(".",[1076,1089,1072,124,46,42],true,fun(_F,_) -> ok end,false),
+	?line SF3 = unicode:characters_to_binary("���subfil3",
+                                                 file:native_name_encoding()),
+	?line SF2 = case treat_icky(<<"���subfil2">>) of
+	                LF2 when is_list(LF2) ->
+			    unicode:characters_to_binary(LF2,
+			                      file:native_name_encoding());
+			BF2 ->
+			    BF2
+	            end,		      
+	?line Sorted = lists:sort([SF3,SF2]),
+	?line Sorted = lists:sort(filelib:wildcard("*",<<"���subdir2">>)),
+	ok
+    catch
+	throw:need_unicode_mode ->
+	    io:format("Sorry, can only run in unicode mode.~n"),
+	    need_unicode_mode
+    after
+	Mod:set_cwd(Dir),
+        io:format("Wd now: ~s~n",[Dir])
+    end.
+
+%%
+%% Utilities
+%%
+
+
+rm_rf(Mod,Dir) ->
+    case  Mod:read_link_info(Dir) of
+	{ok, #file_info{type = directory}} ->
+	    {ok, Content} = Mod:list_dir(Dir),
+	    [ rm_rf(Mod,filename:join(Dir,C)) || C <- Content ],
+	    Mod:del_dir(Dir),
+	    ok;
+	{ok, #file_info{}} ->
+	    Mod:delete(Dir);
+	_ ->
+	    ok
+    end.
+
+rm_r(Mod,Dir) ->
+    %erlang:display({rm_r,Dir}),
+    case  Mod:read_link_info(Dir) of
+	{ok, #file_info{type = directory}} ->
+	    {ok,#file_info{type = directory}} =  Mod:read_file_info(Dir),
+	    {ok, Content} = Mod:list_dir(Dir),
+	    [ true = is_list(Part) || Part <- Content ],
+	    [ true = is_list(filename:join(Dir,Part)) || Part <- Content ],
+	    [ rm_r(Mod,filename:join(Dir,C)) || C <- Content ],
+	    ok = Mod:del_dir(Dir),
+	    ok;
+	{ok, #file_info{type = regular}} ->
+	    {ok,#file_info{type = regular}} =  Mod:read_file_info(Dir),
+	    ok = Mod:delete(Dir);
+	{ok, #file_info{type = symlink}} ->
+	    ok = Mod:delete(Dir)
+    end.
+%% For icky test, allow binaries sometimes
+rm_r2(Mod,Dir) ->
+    %erlang:display({rm_r2,Dir}),
+    case  Mod:read_link_info(Dir) of
+	{ok, #file_info{type = directory}} ->
+	    {ok,#file_info{type = directory}} =  Mod:read_file_info(Dir),
+	    {ok, Content} = Mod:list_dir(Dir),
+	    UniMode = file:native_name_encoding() =/= latin1,
+	    [ true = (is_list(Part) orelse UniMode) || Part <- Content ],
+	    [ true = (is_list(filename:join(Dir,Part)) orelse UniMode) || Part <- Content ],
+	    [ rm_r2(Mod,filename:join(Dir,C)) || C <- Content ],
+	    ok = Mod:del_dir(Dir),
+	    ok;
+	{ok, #file_info{type = regular}} ->
+	    {ok,#file_info{type = regular}} =  Mod:read_file_info(Dir),
+	    ok = Mod:delete(Dir);
+	{ok, #file_info{type = symlink}} ->
+	    ok = Mod:delete(Dir)
+    end.
+chk_cre_dir(_,[]) ->
+    ok;
+chk_cre_dir(Mod,[{regular,Name,Content}|T]) ->
+    %io:format("~p~n",[Name]),
+    ok = Mod:write_file(Name,Content),
+    chk_cre_dir(Mod,T);
+chk_cre_dir(Mod,[{link,Name,Target}|T]) ->
+    ok = Mod:make_link(Target,Name),
+    chk_cre_dir(Mod,T);
+chk_cre_dir(Mod,[{symlink,Name,Target}|T]) ->
+    ok = Mod:make_symlink(Target,Name),
+    chk_cre_dir(Mod,T);
+chk_cre_dir(Mod,[{directory,Name,Content}|T]) ->
+    ok = Mod:make_dir(Name),
+    %io:format("Content = ~p~n",[Content]),
+    Content2 = [{Ty,filename:join(Name,N),case Ty of link -> filename:join(Name,C); _ -> C end} || {Ty,N,C} <- Content ],
+    %io:format("Content2 = ~p~n",[Content2]),
+    chk_cre_dir(Mod,Content2),
+    chk_cre_dir(Mod,T).
+ 
+has_links() ->   
+    case os:type() of
+	{win32,_} ->
+	    case os:version() of
+		{N,NN,_} when (N > 5) andalso (NN >= 1) ->
+		    true;
+		_ ->
+		    false
+	    end;
+	_ ->
+	    true
+    end.
+
+make_normal_dir(Mod) ->
+    rm_rf(Mod,"normal_dir"),
+    Mod:make_dir("normal_dir"),
+    Mod:set_cwd("normal_dir"),
+    Mod:write_file("fil1","fil1"),
+    Mod:write_file("fil2","fil2"),
+    case has_links() of
+	true ->
+	    Mod:make_link("fil2","fil3"),
+	    Mod:make_symlink("fil2","fil4");
+	_ ->
+	    ok
+    end,
+    Mod:make_dir("subdir"),
+    Mod:write_file(filename:join("subdir","subfil1"),"subfil1"),
+    ok.
+    
+normal_dir() ->
+    [{regular,"fil1","fil1"},
+     {regular,"fil2","fil2"}] ++
+	case has_links() of
+	    true ->
+		[{regular,"fil3","fil2"},
+		 {symlink,"fil4","fil2"}];
+	    false ->
+		[]
+	end ++
+	[{directory,"subdir",
+	  [{regular,"subfil1","subfil1"}]}].
+
+make_icky_dir(Mod) ->
+    rm_rf(Mod,"icky_dir"),
+    Icky=icky_dir(),
+    chk_cre_dir(Mod,[{directory,"icky_dir",linkify([],Icky)}]),
+    Mod:set_cwd("icky_dir"),
+    ok.
+
+linkify(_Passed,[]) ->
+    [];
+linkify(Passed,[{regular,Name,Content}|T]) ->
+    Regulars = [ {N,C} || {regular,N,C} <- Passed, N =/= Name ],
+    case lists:keysearch(Content,2,Regulars) of
+	{value, {Linkto, Content}} ->
+	    [{link,Name,Linkto} | linkify(Passed,T)];
+	_ ->
+	    [{regular,Name,Content} | linkify([{regular,Name,Content}|Passed],T)]
+    end;
+linkify(Passed,[{directory, Name, Content}|T]) ->
+    [{directory,Name, linkify(Content,Content)}|linkify(Passed,T)];
+linkify(Passed,[H|T]) ->
+    [H|linkify([H|Passed],T)].
+
+hopeless_darwin() ->
+    case {os:type(),os:version()} of
+	{{unix,darwin},{Major,_,_}} when Major < 9 ->
+	    true;
+	_ ->
+	    false
+    end.
+
+icky_dir() ->
+    [{regular,"fil1","fil1"},
+     {regular,"���2","���2"}] ++
+	case has_links() of
+	    true ->
+		[{regular,"���3","���2"},
+		 {symlink,"���4","���2"}];
+	    false ->
+		[]
+	end ++
+	[{regular,treat_icky(<<"���5">>),"���5"}] ++
+	 case has_links() of
+	     true -> 
+		 [{symlink,treat_icky(<<"���6">>),treat_icky(<<"���5">>)}];
+	     false -> 
+		 []
+	 end ++
+	[{directory,treat_icky(<<"���subdir2">>),
+	  [{regular,treat_icky(<<"���subfil2">>),"���subfil12"},
+	   {regular,"���subfil3","���subfil13"}]},
+	 {directory,"���subdir",
+	  [{regular,"���subfil1","���subfil1"}]}].
+
+make_very_icky_dir(Mod) ->
+    rm_rf(Mod,"very_icky_dir"),
+    Icky=very_icky_dir(),
+    chk_cre_dir(Mod,[{directory,"very_icky_dir",linkify([],Icky)}]),
+    Mod:set_cwd("very_icky_dir"),
+    ok.
+
+very_icky_dir() ->
+    [{regular,"fil1","fil1"},
+     {regular,[956,965,963,954,959,49],"���2"}] ++
+	case has_links() of
+	    true ->
+		[{regular,[956,965,963,954,959,50],"���2"},
+		 {symlink,[956,965,963,954,959,51],[956,965,963,954,959,49]}];
+	    false ->
+		[]
+	end ++
+     [{regular,treat_icky(<<"���5">>),"���5"}] ++
+	case has_links() of
+	    true ->
+		[{symlink,treat_icky(<<"���6">>),treat_icky(<<"���5">>)}];
+	    false -> 
+		[]
+	end ++
+      [{directory,treat_icky(<<"���subdir2">>),
+      [{regular,treat_icky(<<"���subfil2">>),"���subfil12"},
+       {regular,"���subfil3","���subfil13"}]},
+      {directory,[956,965,963,954,959]++"subdir1",
+       [{regular,[956,965,963,954,959]++"subfil1","���subfil1"}]}].
+
+%% Some OS'es simply do not allow non UTF8 filenames
+treat_icky(Bin) ->
+    case os:type() of
+	{unix,darwin} ->
+	    binary_to_list(procentify(Bin));
+	{win32,_} ->
+	    binary_to_list(Bin);
+	_ ->
+	    Bin
+    end.
+
+% Handle windows having absolute soft link targets.
+fixlink({ok,Link}) ->
+    case os:type() of
+	{win32,_} ->
+	    {ok,filename:basename(Link)};
+	_ ->
+	    {ok,Link}
+    end;
+fixlink(X) ->
+    X.
+
+procentify(<<>>) ->
+    <<>>;
+procentify(<<X:8,Rst/binary>>) when X > 127 ->
+    T=procentify(Rst),
+    Y = list_to_binary([$% 
+			| io_lib:format("~2.16B",[X])]),
+    <<Y/binary,T/binary>>;
+procentify(<<X:8,Rst/binary>>) ->
+    T=procentify(Rst),
+    <<X:8,T/binary>>.
+
+
+list([]) ->
+    [];
+list([{_,Name,_} | T]) ->
+    [Name | list(T)].
+    
+
+get_data(FN,List) ->
+    case lists:keysearch(FN,2,List) of
+	{value,{regular,FN,C}} ->
+	    C;
+	{value,{symlink,FN,NewFN}} ->
+	    get_data(NewFN,List);
+	_->
+	    []
+    end.
+
+
+convlist(L) ->
+    convlist(file:native_name_encoding(),L).
+convlist(latin1,[Bin|T]) when is_binary(Bin) ->
+    %erlang:display('Convert...'),
+    [binary_to_list(Bin)| convlist(latin1,T)];
+convlist(Any,[H|T]) ->
+    [H|convlist(Any,T)];
+convlist(_,[]) ->
+    [].
+
+conv(L) ->
+    NoUniMode = file:native_name_encoding() =:= latin1,
+    if 
+	NoUniMode, is_binary(L) ->
+	    binary_to_list(L);
+	true ->
+	    L
+    end.
+
+
+rand_comp_decomp(Max) ->
+    N = random:uniform(Max),
+    L = [ rand_decomp() || _ <- lists:seq(1,N) ],
+    LC = [ A || {A,_} <- L],
+    LD = lists:flatten([B || {_,B} <- L]),
+    LB = unicode:characters_to_binary(LD,unicode,utf8),
+    {LC,LB}.
+    
+rand_decomp() ->
+    BT = bigtup(),
+    SZ = tuple_size(BT),
+    element(random:uniform(SZ),BT).
+bigtup() ->
+    {{192,[65,768]},
+     {200,[69,768]},
+     {204,[73,768]},
+     {210,[79,768]},
+     {217,[85,768]},
+     {7808,[87,768]},
+     {7922,[89,768]},
+     {224,[97,768]},
+     {232,[101,768]},
+     {236,[105,768]},
+     {242,[111,768]},
+     {249,[117,768]},
+     {7809,[119,768]},
+     {7923,[121,768]},
+     {8173,[168,768]},
+     {7846,[65,770,768]},
+     {7872,[69,770,768]},
+     {7890,[79,770,768]},
+     {7847,[97,770,768]},
+     {7873,[101,770,768]},
+     {7891,[111,770,768]},
+     {7700,[69,772,768]},
+     {7760,[79,772,768]},
+     {7701,[101,772,768]},
+     {7761,[111,772,768]},
+     {7856,[65,774,768]},
+     {7857,[97,774,768]},
+     {475,[85,776,768]},
+     {476,[117,776,768]},
+     {8146,[953,776,768]},
+     {8162,[965,776,768]},
+     {8074,[913,837,787,768]},
+     {8090,[919,837,787,768]},
+     {8106,[937,837,787,768]},
+     {8066,[945,837,787,768]},
+     {8082,[951,837,787,768]},
+     {8098,[969,837,787,768]},
+     {7946,[913,787,768]},
+     {7962,[917,787,768]},
+     {7978,[919,787,768]},
+     {7994,[921,787,768]},
+     {8010,[927,787,768]},
+     {8042,[937,787,768]},
+     {7938,[945,787,768]},
+     {7954,[949,787,768]},
+     {7970,[951,787,768]},
+     {7986,[953,787,768]},
+     {8002,[959,787,768]},
+     {8018,[965,787,768]},
+     {8034,[969,787,768]},
+     {8075,[913,837,788,768]},
+     {8091,[919,837,788,768]},
+     {8107,[937,837,788,768]},
+     {8067,[945,837,788,768]},
+     {8083,[951,837,788,768]},
+     {8099,[969,837,788,768]},
+     {7947,[913,788,768]},
+     {7963,[917,788,768]},
+     {7979,[919,788,768]},
+     {7995,[921,788,768]},
+     {8011,[927,788,768]},
+     {8027,[933,788,768]},
+     {8043,[937,788,768]},
+     {7939,[945,788,768]},
+     {7955,[949,788,768]},
+     {7971,[951,788,768]},
+     {7987,[953,788,768]},
+     {8003,[959,788,768]},
+     {8019,[965,788,768]},
+     {8035,[969,788,768]},
+     {7900,[79,795,768]},
+     {7914,[85,795,768]},
+     {7901,[111,795,768]},
+     {7915,[117,795,768]},
+     {8114,[945,837,768]},
+     {8130,[951,837,768]},
+     {8178,[969,837,768]},
+     {8122,[913,768]},
+     {8136,[917,768]},
+     {8138,[919,768]},
+     {8154,[921,768]},
+     {8184,[927,768]},
+     {8170,[933,768]},
+     {8186,[937,768]},
+     {8048,[945,768]},
+     {8050,[949,768]},
+     {8052,[951,768]},
+     {8054,[953,768]},
+     {8056,[959,768]},
+     {8058,[965,768]},
+     {8060,[969,768]},
+     {8141,[8127,768]},
+     {8157,[8190,768]},
+     {193,[65,769]},
+     {262,[67,769]},
+     {201,[69,769]},
+     {500,[71,769]},
+     {205,[73,769]},
+     {7728,[75,769]},
+     {313,[76,769]},
+     {7742,[77,769]},
+     {323,[78,769]},
+     {211,[79,769]},
+     {7764,[80,769]},
+     {340,[82,769]},
+     {346,[83,769]},
+     {218,[85,769]},
+     {7810,[87,769]},
+     {221,[89,769]},
+     {377,[90,769]},
+     {225,[97,769]},
+     {263,[99,769]},
+     {233,[101,769]},
+     {501,[103,769]},
+     {237,[105,769]},
+     {7729,[107,769]},
+     {314,[108,769]},
+     {7743,[109,769]},
+     {324,[110,769]},
+     {243,[111,769]},
+     {7765,[112,769]},
+     {341,[114,769]},
+     {347,[115,769]},
+     {250,[117,769]},
+     {7811,[119,769]},
+     {253,[121,769]},
+     {378,[122,769]},
+     {8174,[168,769]},
+     {508,[198,769]},
+     {510,[216,769]},
+     {509,[230,769]},
+     {511,[248,769]},
+     {7844,[65,770,769]},
+     {7870,[69,770,769]},
+     {7888,[79,770,769]},
+     {7845,[97,770,769]},
+     {7871,[101,770,769]},
+     {7889,[111,770,769]},
+     {7756,[79,771,769]},
+     {7800,[85,771,769]},
+     {7757,[111,771,769]},
+     {7801,[117,771,769]},
+     {7702,[69,772,769]},
+     {7762,[79,772,769]},
+     {7703,[101,772,769]},
+     {7763,[111,772,769]},
+     {7854,[65,774,769]},
+     {7855,[97,774,769]},
+     {7726,[73,776,769]},
+     {471,[85,776,769]},
+     {7727,[105,776,769]},
+     {472,[117,776,769]},
+     {8147,[953,776,769]},
+     {8163,[965,776,769]},
+     {506,[65,778,769]},
+     {507,[97,778,769]},
+     {8076,[913,837,787,769]},
+     {8092,[919,837,787,769]},
+     {8108,[937,837,787,769]},
+     {8068,[945,837,787,769]},
+     {8084,[951,837,787,769]},
+     {8100,[969,837,787,769]},
+     {7948,[913,787,769]},
+     {7964,[917,787,769]},
+     {7980,[919,787,769]},
+     {7996,[921,787,769]},
+     {8012,[927,787,769]},
+     {8044,[937,787,769]},
+     {7940,[945,787,769]},
+     {7956,[949,787,769]},
+     {7972,[951,787,769]},
+     {7988,[953,787,769]},
+     {8004,[959,787,769]},
+     {8020,[965,787,769]},
+     {8036,[969,787,769]},
+     {8077,[913,837,788,769]},
+     {8093,[919,837,788,769]},
+     {8109,[937,837,788,769]},
+     {8069,[945,837,788,769]},
+     {8085,[951,837,788,769]},
+     {8101,[969,837,788,769]},
+     {7949,[913,788,769]},
+     {7965,[917,788,769]},
+     {7981,[919,788,769]},
+     {7997,[921,788,769]},
+     {8013,[927,788,769]},
+     {8029,[933,788,769]},
+     {8045,[937,788,769]},
+     {7941,[945,788,769]},
+     {7957,[949,788,769]},
+     {7973,[951,788,769]},
+     {7989,[953,788,769]},
+     {8005,[959,788,769]},
+     {8021,[965,788,769]},
+     {8037,[969,788,769]},
+     {7898,[79,795,769]},
+     {7912,[85,795,769]},
+     {7899,[111,795,769]},
+     {7913,[117,795,769]},
+     {7688,[67,807,769]},
+     {7689,[99,807,769]},
+     {8116,[945,837,769]},
+     {8132,[951,837,769]},
+     {8180,[959,837,769]},
+     {8123,[913,769]},
+     {8137,[917,769]},
+     {8139,[919,769]},
+     {8155,[921,769]},
+     {8185,[927,769]},
+     {8171,[933,769]},
+     {8187,[937,769]},
+     {8049,[945,769]},
+     {8051,[949,769]},
+     {8053,[951,769]},
+     {8055,[953,769]},
+     {8057,[959,769]},
+     {8059,[965,769]},
+     {8061,[969,769]},
+     {1027,[1043,769]},
+     {1036,[1050,769]},
+     {1107,[1075,769]},
+     {1116,[1082,769]},
+     {8142,[8127,769]},
+     {8158,[8190,769]},
+     {194,[65,770]},
+     {264,[67,770]},
+     {202,[69,770]},
+     {284,[71,770]},
+     {292,[72,770]},
+     {206,[73,770]},
+     {308,[74,770]},
+     {212,[79,770]},
+     {348,[83,770]},
+     {219,[85,770]},
+     {372,[87,770]},
+     {374,[89,770]},
+     {7824,[90,770]},
+     {226,[97,770]},
+     {265,[99,770]},
+     {234,[101,770]},
+     {285,[103,770]},
+     {293,[104,770]},
+     {238,[105,770]},
+     {309,[106,770]},
+     {244,[111,770]},
+     {349,[115,770]},
+     {251,[117,770]},
+     {373,[119,770]},
+     {375,[121,770]},
+     {7825,[122,770]},
+     {7852,[65,803,770]},
+     {7878,[69,803,770]},
+     {7896,[79,803,770]},
+     {7853,[97,803,770]},
+     {7879,[101,803,770]},
+     {7897,[111,803,770]},
+     {195,[65,771]},
+     {7868,[69,771]},
+     {296,[73,771]},
+     {209,[78,771]},
+     {213,[79,771]},
+     {360,[85,771]},
+     {7804,[86,771]},
+     {7928,[89,771]},
+     {227,[97,771]},
+     {7869,[101,771]},
+     {297,[105,771]},
+     {241,[110,771]},
+     {245,[111,771]},
+     {361,[117,771]},
+     {7805,[118,771]},
+     {7929,[121,771]},
+     {7850,[65,770,771]},
+     {7876,[69,770,771]},
+     {7894,[79,770,771]},
+     {7851,[97,770,771]},
+     {7877,[101,770,771]},
+     {7895,[111,770,771]},
+     {7860,[65,774,771]},
+     {7861,[97,774,771]},
+     {7904,[79,795,771]},
+     {7918,[85,795,771]},
+     {7905,[111,795,771]},
+     {7919,[117,795,771]},
+     {256,[65,772]},
+     {274,[69,772]},
+     {7712,[71,772]},
+     {298,[73,772]},
+     {332,[79,772]},
+     {362,[85,772]},
+     {257,[97,772]},
+     {275,[101,772]},
+     {7713,[103,772]},
+     {299,[105,772]},
+     {333,[111,772]},
+     {363,[117,772]},
+     {482,[198,772]},
+     {483,[230,772]},
+     {480,[65,775,772]},
+     {481,[97,775,772]},
+     {478,[65,776,772]},
+     {469,[85,776,772]},
+     {479,[97,776,772]},
+     {470,[117,776,772]},
+     {7736,[76,803,772]},
+     {7772,[82,803,772]},
+     {7737,[108,803,772]},
+     {7773,[114,803,772]},
+     {492,[79,808,772]},
+     {493,[111,808,772]},
+     {8121,[913,772]},
+     {8153,[921,772]},
+     {8169,[933,772]},
+     {8113,[945,772]},
+     {8145,[953,772]},
+     {8161,[965,772]},
+     {1250,[1048,772]},
+     {1262,[1059,772]},
+     {1251,[1080,772]},
+     {1263,[1091,772]},
+     {258,[65,774]},
+     {276,[69,774]},
+     {286,[71,774]},
+     {300,[73,774]},
+     {334,[79,774]},
+     {364,[85,774]},
+     {259,[97,774]},
+     {277,[101,774]},
+     {287,[103,774]},
+     {301,[105,774]},
+     {335,[111,774]},
+     {365,[117,774]},
+     {7862,[65,803,774]},
+     {7863,[97,803,774]},
+     {7708,[69,807,774]},
+     {7709,[101,807,774]},
+     {8120,[913,774]},
+     {8152,[921,774]},
+     {8168,[933,774]},
+     {8112,[945,774]},
+     {8144,[953,774]},
+     {8160,[965,774]},
+     {1232,[1040,774]},
+     {1238,[1045,774]},
+     {1217,[1046,774]},
+     {1049,[1048,774]},
+     {1038,[1059,774]},
+     {1233,[1072,774]},
+     {1239,[1077,774]},
+     {1218,[1078,774]},
+     {1081,[1080,774]},
+     {1118,[1091,774]},
+     {7682,[66,775]},
+     {266,[67,775]},
+     {7690,[68,775]},
+     {278,[69,775]},
+     {7710,[70,775]},
+     {288,[71,775]},
+     {7714,[72,775]},
+     {304,[73,775]},
+     {7744,[77,775]},
+     {7748,[78,775]},
+     {7766,[80,775]},
+     {7768,[82,775]},
+     {7776,[83,775]},
+     {7786,[84,775]},
+     {7814,[87,775]},
+     {7818,[88,775]},
+     {7822,[89,775]},
+     {379,[90,775]},
+     {7683,[98,775]},
+     {267,[99,775]},
+     {7691,[100,775]},
+     {279,[101,775]},
+     {7711,[102,775]},
+     {289,[103,775]},
+     {7715,[104,775]},
+     {7745,[109,775]},
+     {7749,[110,775]},
+     {7767,[112,775]},
+     {7769,[114,775]},
+     {7777,[115,775]},
+     {7787,[116,775]},
+     {7815,[119,775]},
+     {7819,[120,775]},
+     {7823,[121,775]},
+     {380,[122,775]},
+     {7835,[383,775]},
+     {7780,[83,769,775]},
+     {7781,[115,769,775]},
+     {784,[774,775]},
+     {7782,[83,780,775]},
+     {7783,[115,780,775]},
+     {7784,[83,803,775]},
+     {7785,[115,803,775]},
+     {196,[65,776]},
+     {203,[69,776]},
+     {7718,[72,776]},
+     {207,[73,776]},
+     {214,[79,776]},
+     {220,[85,776]},
+     {7812,[87,776]},
+     {7820,[88,776]},
+     {376,[89,776]},
+     {228,[97,776]},
+     {235,[101,776]},
+     {7719,[104,776]},
+     {239,[105,776]},
+     {246,[111,776]},
+     {7831,[116,776]},
+     {252,[117,776]},
+     {7813,[119,776]},
+     {7821,[120,776]},
+     {255,[121,776]},
+     {1242,[399,776]},
+     {1258,[415,776]},
+     {1243,[601,776]},
+     {1259,[629,776]},
+     {7758,[79,771,776]},
+     {7759,[111,771,776]},
+     {7802,[85,772,776]},
+     {7803,[117,772,776]},
+     {938,[921,776]},
+     {939,[933,776]},
+     {970,[953,776]},
+     {971,[965,776]},
+     {980,[978,776]},
+     {1031,[1030,776]},
+     {1234,[1040,776]},
+     {1025,[1045,776]},
+     {1244,[1046,776]},
+     {1246,[1047,776]},
+     {1252,[1048,776]},
+     {1254,[1054,776]},
+     {1264,[1059,776]},
+     {1268,[1063,776]},
+     {1272,[1067,776]},
+     {1235,[1072,776]},
+     {1105,[1077,776]},
+     {1245,[1078,776]},
+     {1247,[1079,776]},
+     {1253,[1080,776]},
+     {1255,[1086,776]},
+     {1265,[1091,776]},
+     {1269,[1095,776]},
+     {1273,[1099,776]},
+     {1111,[1110,776]},
+     {7842,[65,777]},
+     {7866,[69,777]},
+     {7880,[73,777]},
+     {7886,[79,777]},
+     {7910,[85,777]},
+     {7926,[89,777]},
+     {7843,[97,777]},
+     {7867,[101,777]},
+     {7881,[105,777]},
+     {7887,[111,777]},
+     {7911,[117,777]},
+     {7927,[121,777]},
+     {7848,[65,770,777]},
+     {7874,[69,770,777]},
+     {7892,[79,770,777]},
+     {7849,[97,770,777]},
+     {7875,[101,770,777]},
+     {7893,[111,770,777]},
+     {7858,[65,774,777]},
+     {7859,[97,774,777]},
+     {7902,[79,795,777]},
+     {7916,[85,795,777]},
+     {7903,[111,795,777]},
+     {7917,[117,795,777]},
+     {197,[65,778]},
+     {366,[85,778]},
+     {229,[97,778]},
+     {367,[117,778]},
+     {7832,[119,778]},
+     {7833,[121,778]},
+     {336,[79,779]},
+     {368,[85,779]},
+     {337,[111,779]},
+     {369,[117,779]},
+     {1266,[1059,779]},
+     {1267,[1091,779]},
+     {461,[65,780]},
+     {268,[67,780]},
+     {270,[68,780]},
+     {282,[69,780]},
+     {486,[71,780]},
+     {463,[73,780]},
+     {488,[75,780]},
+     {317,[76,780]},
+     {327,[78,780]},
+     {465,[79,780]},
+     {344,[82,780]},
+     {352,[83,780]},
+     {356,[84,780]},
+     {467,[85,780]},
+     {381,[90,780]},
+     {462,[97,780]},
+     {269,[99,780]},
+     {271,[100,780]},
+     {283,[101,780]},
+     {487,[103,780]},
+     {464,[105,780]},
+     {496,[106,780]},
+     {489,[107,780]},
+     {318,[108,780]},
+     {328,[110,780]},
+     {466,[111,780]},
+     {345,[114,780]},
+     {353,[115,780]},
+     {357,[116,780]},
+     {468,[117,780]},
+     {382,[122,780]},
+     {494,[439,780]},
+     {495,[658,780]},
+     {473,[85,776,780]},
+     {474,[117,776,780]},
+     {901,[168,781]},
+     {912,[953,776,781]},
+     {944,[965,776,781]},
+     {902,[913,781]},
+     {904,[917,781]},
+     {905,[919,781]},
+     {906,[921,781]},
+     {908,[927,781]},
+     {910,[933,781]},
+     {911,[937,781]},
+     {940,[945,781]},
+     {941,[949,781]},
+     {942,[951,781]},
+     {943,[953,781]},
+     {972,[959,781]},
+     {973,[965,781]},
+     {974,[969,781]},
+     {979,[978,781]},
+     {512,[65,783]},
+     {516,[69,783]},
+     {520,[73,783]},
+     {524,[79,783]},
+     {528,[82,783]},
+     {532,[85,783]},
+     {513,[97,783]},
+     {517,[101,783]},
+     {521,[105,783]},
+     {525,[111,783]},
+     {529,[114,783]},
+     {533,[117,783]},
+     {1142,[1140,783]},
+     {1143,[1141,783]},
+     {514,[65,785]},
+     {518,[69,785]},
+     {522,[73,785]},
+     {526,[79,785]},
+     {530,[82,785]},
+     {534,[85,785]},
+     {515,[97,785]},
+     {519,[101,785]},
+     {523,[105,785]},
+     {527,[111,785]},
+     {531,[114,785]},
+     {535,[117,785]},
+     {8072,[913,837,787]},
+     {8088,[919,837,787]},
+     {8104,[937,837,787]},
+     {8064,[945,837,787]},
+     {8080,[951,837,787]},
+     {8096,[969,837,787]},
+     {7944,[913,787]},
+     {7960,[917,787]},
+     {7976,[919,787]},
+     {7992,[921,787]},
+     {8008,[927,787]},
+     {8040,[937,787]},
+     {7936,[945,787]},
+     {7952,[949,787]},
+     {7968,[951,787]},
+     {7984,[953,787]},
+     {8000,[959,787]},
+     {8164,[961,787]},
+     {8016,[965,787]},
+     {8032,[969,787]},
+     {8073,[913,837,788]},
+     {8089,[919,837,788]},
+     {8105,[937,837,788]},
+     {8065,[945,837,788]},
+     {8081,[951,837,788]},
+     {8097,[969,837,788]},
+     {7945,[913,788]},
+     {7961,[917,788]},
+     {7977,[919,788]},
+     {7993,[921,788]},
+     {8009,[927,788]},
+     {8172,[929,788]},
+     {8025,[933,788]},
+     {8041,[937,788]},
+     {7937,[945,788]},
+     {7953,[949,788]},
+     {7969,[951,788]},
+     {7985,[953,788]},
+     {8001,[959,788]},
+     {8165,[961,788]},
+     {8017,[965,788]},
+     {8033,[969,788]},
+     {416,[79,795]},
+     {431,[85,795]},
+     {417,[111,795]},
+     {432,[117,795]},
+     {7840,[65,803]},
+     {7684,[66,803]},
+     {7692,[68,803]},
+     {7864,[69,803]},
+     {7716,[72,803]},
+     {7882,[73,803]},
+     {7730,[75,803]},
+     {7734,[76,803]},
+     {7746,[77,803]},
+     {7750,[78,803]},
+     {7884,[79,803]},
+     {7770,[82,803]},
+     {7778,[83,803]},
+     {7788,[84,803]},
+     {7908,[85,803]},
+     {7806,[86,803]},
+     {7816,[87,803]},
+     {7924,[89,803]},
+     {7826,[90,803]},
+     {7841,[97,803]},
+     {7685,[98,803]},
+     {7693,[100,803]},
+     {7865,[101,803]},
+     {7717,[104,803]},
+     {7883,[105,803]},
+     {7731,[107,803]},
+     {7735,[108,803]},
+     {7747,[109,803]},
+     {7751,[110,803]},
+     {7885,[111,803]},
+     {7771,[114,803]},
+     {7779,[115,803]},
+     {7789,[116,803]},
+     {7909,[117,803]},
+     {7807,[118,803]},
+     {7817,[119,803]},
+     {7925,[121,803]},
+     {7827,[122,803]},
+     {7906,[79,795,803]},
+     {7920,[85,795,803]},
+     {7907,[111,795,803]},
+     {7921,[117,795,803]},
+     {7794,[85,804]},
+     {7795,[117,804]},
+     {7680,[65,805]},
+     {7681,[97,805]},
+     {199,[67,807]},
+     {7696,[68,807]},
+     {290,[71,807]},
+     {7720,[72,807]},
+     {310,[75,807]},
+     {315,[76,807]},
+     {325,[78,807]},
+     {342,[82,807]},
+     {350,[83,807]},
+     {354,[84,807]},
+     {231,[99,807]},
+     {7697,[100,807]},
+     {291,[103,807]},
+     {7721,[104,807]},
+     {311,[107,807]},
+     {316,[108,807]},
+     {326,[110,807]},
+     {343,[114,807]},
+     {351,[115,807]},
+     {355,[116,807]},
+     {260,[65,808]},
+     {280,[69,808]},
+     {302,[73,808]},
+     {490,[79,808]},
+     {370,[85,808]},
+     {261,[97,808]},
+     {281,[101,808]},
+     {303,[105,808]},
+     {491,[111,808]},
+     {371,[117,808]},
+     {7698,[68,813]},
+     {7704,[69,813]},
+     {7740,[76,813]},
+     {7754,[78,813]},
+     {7792,[84,813]},
+     {7798,[85,813]},
+     {7699,[100,813]},
+     {7705,[101,813]},
+     {7741,[108,813]},
+     {7755,[110,813]},
+     {7793,[116,813]},
+     {7799,[117,813]},
+     {7722,[72,814]},
+     {7723,[104,814]},
+     {7706,[69,816]},
+     {7724,[73,816]},
+     {7796,[85,816]},
+     {7707,[101,816]},
+     {7725,[105,816]},
+     {7797,[117,816]},
+     {7686,[66,817]},
+     {7694,[68,817]},
+     {7732,[75,817]},
+     {7738,[76,817]},
+     {7752,[78,817]},
+     {7774,[82,817]},
+     {7790,[84,817]},
+     {7828,[90,817]},
+     {7687,[98,817]},
+     {7695,[100,817]},
+     {7830,[104,817]},
+     {7733,[107,817]},
+     {7739,[108,817]},
+     {7753,[110,817]},
+     {7775,[114,817]},
+     {7791,[116,817]},
+     {7829,[122,817]},
+     {8129,[168,834]},
+     {8151,[953,776,834]},
+     {8167,[965,776,834]},
+     {8078,[913,837,787,834]},
+     {8094,[919,837,787,834]},
+     {8110,[937,837,787,834]},
+     {8070,[945,837,787,834]},
+     {8086,[951,837,787,834]},
+     {8102,[969,837,787,834]},
+     {7950,[913,787,834]},
+     {7982,[919,787,834]},
+     {7998,[921,787,834]},
+     {8046,[937,787,834]},
+     {7942,[945,787,834]},
+     {7974,[951,787,834]},
+     {7990,[953,787,834]},
+     {8022,[965,787,834]},
+     {8038,[969,787,834]},
+     {8079,[913,837,788,834]},
+     {8095,[919,837,788,834]},
+     {8111,[937,837,788,834]},
+     {8071,[945,837,788,834]},
+     {8087,[951,837,788,834]},
+     {8103,[969,837,788,834]},
+     {7951,[913,788,834]},
+     {7983,[919,788,834]},
+     {7999,[921,788,834]},
+     {8031,[933,788,834]},
+     {8047,[937,788,834]},
+     {7943,[945,788,834]},
+     {7975,[951,788,834]},
+     {7991,[953,788,834]},
+     {8023,[965,788,834]},
+     {8039,[969,788,834]},
+     {8119,[945,837,834]},
+     {8135,[951,837,834]},
+     {8183,[969,837,834]},
+     {8118,[945,834]},
+     {8134,[951,834]},
+     {8150,[953,834]},
+     {8166,[965,834]},
+     {8182,[969,834]},
+     {8143,[8127,834]},
+     {8159,[8190,834]},
+     {8124,[913,837]},
+     {8140,[919,837]},
+     {8188,[937,837]},
+     {8115,[945,837]},
+     {8131,[951,837]},
+     {8179,[969,837]},
+     {64302,[1488,1463]},
+     {64287,[1522,1463]},
+     {64303,[1488,1464]},
+     {64331,[1493,1465]},
+     {64304,[1488,1468]},
+     {64305,[1489,1468]},
+     {64306,[1490,1468]},
+     {64307,[1491,1468]},
+     {64308,[1492,1468]},
+     {64309,[1493,1468]},
+     {64310,[1494,1468]},
+     {64312,[1496,1468]},
+     {64313,[1497,1468]},
+     {64314,[1498,1468]},
+     {64315,[1499,1468]},
+     {64316,[1500,1468]},
+     {64318,[1502,1468]},
+     {64320,[1504,1468]},
+     {64321,[1505,1468]},
+     {64323,[1507,1468]},
+     {64324,[1508,1468]},
+     {64326,[1510,1468]},
+     {64327,[1511,1468]},
+     {64328,[1512,1468]},
+     {64329,[1513,1468]},
+     {64330,[1514,1468]},
+     {64332,[1489,1471]},
+     {64333,[1499,1471]},
+     {64334,[1508,1471]},
+     {64300,[1513,1468,1473]},
+     {64298,[1513,1473]},
+     {64301,[1513,1468,1474]},
+     {64299,[1513,1474]},
+     {2392,[2325,2364]},
+     {2393,[2326,2364]},
+     {2394,[2327,2364]},
+     {2395,[2332,2364]},
+     {2396,[2337,2364]},
+     {2397,[2338,2364]},
+     {2345,[2344,2364]},
+     {2398,[2347,2364]},
+     {2399,[2351,2364]},
+     {2353,[2352,2364]},
+     {2356,[2355,2364]},
+     {2524,[2465,2492]},
+     {2525,[2466,2492]},
+     {2480,[2476,2492]},
+     {2527,[2479,2492]},
+     {2507,[2503,2494]},
+     {2508,[2503,2519]},
+     {2649,[2582,2620]},
+     {2650,[2583,2620]},
+     {2651,[2588,2620]},
+     {2652,[2593,2620]},
+     {2654,[2603,2620]},
+     {2908,[2849,2876]},
+     {2909,[2850,2876]},
+     {2911,[2863,2876]},
+     {2891,[2887,2878]},
+     {2888,[2887,2902]},
+     {2892,[2887,2903]},
+     {3018,[3014,3006]},
+     {3019,[3015,3006]},
+     {2964,[2962,3031]},
+     {3020,[3014,3031]},
+     {3144,[3142,3158]},
+     {3274,[3270,3266]},
+     {3264,[3263,3285]},
+     {3275,[3270,3266,3285]},
+     {3271,[3270,3285]},
+     {3272,[3270,3286]},
+     {3402,[3398,3390]},
+     {3403,[3399,3390]},
+     {3404,[3398,3415]},
+     {3635,[3661,3634]},
+     {3763,[3789,3762]},
+     {3955,[3954,3953]},
+     {3957,[3956,3953]},
+     {3959,[4018,3968,3953]},
+     {3961,[4019,3968,3953]},
+     {3958,[4018,3968]},
+     {3960,[4019,3968]},
+     {3945,[3904,4021]},
+     {4025,[3984,4021]},
+     {3907,[3906,4023]},
+     {3917,[3916,4023]},
+     {3922,[3921,4023]},
+     {3927,[3926,4023]},
+     {3932,[3931,4023]},
+     {3987,[3986,4023]},
+     {3997,[3996,4023]},
+     {4002,[4001,4023]},
+     {4007,[4006,4023]},
+     {4012,[4011,4023]},
+     {12436,[12358,12441]},
+     {12364,[12363,12441]},
+     {12366,[12365,12441]},
+     {12368,[12367,12441]},
+     {12370,[12369,12441]},
+     {12372,[12371,12441]},
+     {12374,[12373,12441]},
+     {12376,[12375,12441]},
+     {12378,[12377,12441]},
+     {12380,[12379,12441]},
+     {12382,[12381,12441]},
+     {12384,[12383,12441]},
+     {12386,[12385,12441]},
+     {12389,[12388,12441]},
+     {12391,[12390,12441]},
+     {12393,[12392,12441]},
+     {12400,[12399,12441]},
+     {12403,[12402,12441]},
+     {12406,[12405,12441]},
+     {12409,[12408,12441]},
+     {12412,[12411,12441]},
+     {12446,[12445,12441]},
+     {12532,[12454,12441]},
+     {12460,[12459,12441]},
+     {12462,[12461,12441]},
+     {12464,[12463,12441]},
+     {12466,[12465,12441]},
+     {12468,[12467,12441]},
+     {12470,[12469,12441]},
+     {12472,[12471,12441]},
+     {12474,[12473,12441]},
+     {12476,[12475,12441]},
+     {12478,[12477,12441]},
+     {12480,[12479,12441]},
+     {12482,[12481,12441]},
+     {12485,[12484,12441]},
+     {12487,[12486,12441]},
+     {12489,[12488,12441]},
+     {12496,[12495,12441]},
+     {12499,[12498,12441]},
+     {12502,[12501,12441]},
+     {12505,[12504,12441]},
+     {12508,[12507,12441]},
+     {12535,[12527,12441]},
+     {12536,[12528,12441]},
+     {12537,[12529,12441]},
+     {12538,[12530,12441]},
+     {12542,[12541,12441]},
+     {12401,[12399,12442]},
+     {12404,[12402,12442]},
+     {12407,[12405,12442]},
+     {12410,[12408,12442]},
+     {12413,[12411,12442]},
+     {12497,[12495,12442]},
+     {12500,[12498,12442]},
+     {12503,[12501,12442]},
+     {12506,[12504,12442]},
+     {12509,[12507,12442]}}.
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index fad8c7398b..d3aa62d7ec 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -18,27 +18,67 @@
 %% 
 -module(gen_sctp_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/inet_sctp.hrl").
 
 %%-compile(export_all).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
-	 basic/1,api_open_close/1,api_listen/1,api_connect_init/1,
-	 xfer_min/1,xfer_active/1]).
+-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(
+   [basic/1,
+    api_open_close/1,api_listen/1,api_connect_init/1,api_opts/1,
+    xfer_min/1,xfer_active/1,def_sndrcvinfo/1,implicit_inet6/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic, api_open_close, api_listen, api_connect_init,
+     api_opts, xfer_min, xfer_active, def_sndrcvinfo,
+     implicit_inet6].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    try gen_sctp:open() of
+	{ok,Socket} ->
+	    gen_sctp:close(Socket),
+	    [];
+	_ ->
+	    []
+    catch
+	error:badarg ->
+	    {skip,"SCTP not supported on this machine"};
+	_:_ ->
+	    Config
+    end.
+
+end_per_suite(_Conifig) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [basic,api_open_close,api_listen,api_connect_init,xfer_min,xfer_active].
 
 init_per_testcase(_Func, Config) ->
     Dog = test_server:timetrap(test_server:seconds(15)),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
 
 
+-define(LOGVAR(Var), begin io:format(??Var" = ~p~n", [Var]) end).
+
+
+
 basic(doc) ->
     "Hello world";
 basic(suite) ->
@@ -214,12 +254,17 @@ xfer_active(Config) when is_list(Config) ->
 	  end,
     ?line ok = gen_sctp:close(Sb),
     ?line receive
-	      {sctp,Sa,Loopback,Pb,
-	       {[],
-		#sctp_assoc_change{state=comm_lost,
-				   assoc_id=SaAssocId}}} -> ok
-	  after 17 -> ok %% On Solaris this does not arrive
-	  end,
+              {sctp,Sa,Loopback,Pb,
+               {[],
+                #sctp_assoc_change{state=comm_lost,
+                                   assoc_id=SaAssocId}}} -> ok
+          after Timeout ->
+                  ?line test_server:fail({unexpected,flush()})
+          end,
+    ?line receive
+              {sctp_error,Sa,enotconn} -> ok % Solaris
+          after 17 -> ok %% Only happens on Solaris
+          end,
     ?line ok = gen_sctp:close(Sa),
     %%
     ?line receive
@@ -228,6 +273,148 @@ xfer_active(Config) when is_list(Config) ->
 	  end,
     ok.
 
+def_sndrcvinfo(doc) ->
+    "Test that #sctp_sndrcvinfo{} parameters set on a socket "
+	"are used by gen_sctp:send/4";
+def_sndrcvinfo(suite) ->
+    [];
+def_sndrcvinfo(Config) when is_list(Config) ->
+    ?line Loopback = {127,0,0,1},
+    ?line Data = <<"What goes up, must come down.">>,
+    %%
+    ?line S1 =
+	ok(gen_sctp:open(
+	     0, [{sctp_default_send_param,#sctp_sndrcvinfo{ppid=17}}])),
+    ?LOGVAR(S1),
+    ?line P1 =
+	ok(inet:port(S1)),
+    ?LOGVAR(P1),
+    ?line #sctp_sndrcvinfo{ppid=17, context=0, timetolive=0, assoc_id=0} =
+	getopt(S1, sctp_default_send_param),
+    ?line ok =
+	gen_sctp:listen(S1, true),
+    %%
+    ?line S2 =
+	ok(gen_sctp:open()),
+    ?LOGVAR(S2),
+    ?line P2 =
+	ok(inet:port(S2)),
+    ?LOGVAR(P2),
+    ?line #sctp_sndrcvinfo{ppid=0, context=0, timetolive=0, assoc_id=0} =
+	getopt(S2, sctp_default_send_param),
+    %%
+    ?line #sctp_assoc_change{
+       state=comm_up,
+       error=0,
+       assoc_id=S2AssocId} = S2AssocChange =
+	ok(gen_sctp:connect(S2, Loopback, P1, [])),
+    ?LOGVAR(S2AssocChange),
+    ?line case ok(gen_sctp:recv(S1)) of
+	      {Loopback, P2,[],
+	       #sctp_assoc_change{
+			      state=comm_up,
+			      error=0,
+			      assoc_id=S1AssocId}} ->
+		  ?LOGVAR(S1AssocId)
+	  end,
+    ?line #sctp_sndrcvinfo{
+       ppid=17, context=0, timetolive=0, assoc_id=S1AssocId} =
+	getopt(
+	  S1, sctp_default_send_param, #sctp_sndrcvinfo{assoc_id=S1AssocId}),
+    ?line #sctp_sndrcvinfo{
+       ppid=0, context=0, timetolive=0, assoc_id=S2AssocId} =
+	getopt(
+	  S2, sctp_default_send_param, #sctp_sndrcvinfo{assoc_id=S2AssocId}),
+    %%
+    ?line ok =
+	gen_sctp:send(S1, S1AssocId, 1, <<"1: ",Data/binary>>),
+    ?line case ok(gen_sctp:recv(S2)) of
+	      {Loopback,P1,
+	       [#sctp_sndrcvinfo{
+		   stream=1, ppid=17, context=0, assoc_id=S2AssocId}],
+	       <<"1: ",Data/binary>>} -> ok
+	  end,
+    %%
+    ?line ok =
+	setopt(
+	  S1, sctp_default_send_param, #sctp_sndrcvinfo{ppid=18}),
+    ?line ok =
+	setopt(
+	  S1, sctp_default_send_param,
+	  #sctp_sndrcvinfo{ppid=19, assoc_id=S1AssocId}),
+    ?line #sctp_sndrcvinfo{
+       ppid=18, context=0, timetolive=0, assoc_id=0} =
+	getopt(S1, sctp_default_send_param),
+    ?line #sctp_sndrcvinfo{
+       ppid=19, context=0, timetolive=0, assoc_id=S1AssocId} =
+	getopt(
+	  S1, sctp_default_send_param, #sctp_sndrcvinfo{assoc_id=S1AssocId}),
+    %%
+    ?line ok =
+	gen_sctp:send(S1, S1AssocId, 0, <<"2: ",Data/binary>>),
+    ?line case ok(gen_sctp:recv(S2)) of
+	      {Loopback,P1,
+	       [#sctp_sndrcvinfo{
+		   stream=0, ppid=19, context=0, assoc_id=S2AssocId}],
+	       <<"2: ",Data/binary>>} -> ok
+	  end,
+    ?line ok =
+	gen_sctp:send(S2, S2AssocChange, 1, <<"3: ",Data/binary>>),
+    ?line case ok(gen_sctp:recv(S1)) of
+	      {Loopback,P2,
+	       [#sctp_sndrcvinfo{
+		   stream=1, ppid=0, context=0, assoc_id=S1AssocId}],
+	       <<"3: ",Data/binary>>} -> ok;
+	      {Loopback,P2,[],
+	       #sctp_paddr_change{
+			  addr={Loopback,_}, state=addr_available,
+			  error=0, assoc_id=S1AssocId}} ->
+		  ?line case ok(gen_sctp:recv(S1)) of
+			    {Loopback,P2,
+			     [#sctp_sndrcvinfo{
+				 stream=1, ppid=0, context=0,
+				 assoc_id=S1AssocId}],
+			     <<"3: ",Data/binary>>} -> ok
+			end
+	  end,
+    ?line ok =
+	gen_sctp:send(
+	  S2,
+	  #sctp_sndrcvinfo{stream=0, ppid=20, assoc_id=S2AssocId},
+	  <<"4: ",Data/binary>>),
+    ?line case ok(gen_sctp:recv(S1)) of
+	      {Loopback,P2,
+	       [#sctp_sndrcvinfo{
+		   stream=0, ppid=20, context=0, assoc_id=S1AssocId}],
+	       <<"4: ",Data/binary>>} -> ok
+	  end,
+    %%
+    ?line ok =
+	gen_sctp:close(S1),
+    ?line ok =
+	gen_sctp:close(S2),
+    ?line receive
+	      Msg ->
+		  test_server:fail({received,Msg})
+	  after 17 -> ok
+	  end,
+    ok.
+
+getopt(S, Opt) ->
+    {ok,[{Opt,Val}]} = inet:getopts(S, [Opt]),
+    Val.
+
+getopt(S, Opt, Param) ->
+    {ok,[{Opt,Val}]} = inet:getopts(S, [{Opt,Param}]),
+    Val.
+
+setopt(S, Opt, Val) ->
+    inet:setopts(S, [{Opt,Val}]).
+
+ok({ok,X}) ->
+    io:format("OK: ~p~n", [X]),
+    X.
+
 flush() ->
     receive
 	Msg ->
@@ -382,3 +569,72 @@ api_connect_init(Config) when is_list(Config) ->
     ?line ok = gen_sctp:close(Sa),
     ?line ok = gen_sctp:close(Sb),
     ok.
+
+api_opts(doc) ->
+    "Test socket options";
+api_opts(suite) ->
+    [];
+api_opts(Config) when is_list(Config) ->
+    ?line {ok,S} = gen_sctp:open(0),
+    ?line OSType = os:type(),
+    ?line case {inet:setopts(S, [{linger,{true,2}}]),OSType} of
+              {ok,_} ->
+                  ok;
+              {{error,einval},{unix,sunos}} ->
+                  ok
+          end.
+
+implicit_inet6(Config) when is_list(Config) ->
+    ?line Hostname = ok(inet:gethostname()),
+    ?line
+	case gen_sctp:open(0, [inet6]) of
+	    {ok,S1} ->
+		?line
+		    case inet:getaddr(Hostname, inet6) of
+			{ok,Host} ->
+			    ?line Loopback = {0,0,0,0,0,0,0,1},
+			    ?line io:format("~s ~p~n", ["Loopback",Loopback]),
+			    ?line implicit_inet6(S1, Loopback),
+			    ?line ok = gen_sctp:close(S1),
+			    %%
+			    ?line Localhost =
+				ok(inet:getaddr("localhost", inet6)),
+			    ?line io:format("~s ~p~n", ["localhost",Localhost]),
+			    ?line S2 =
+				ok(gen_sctp:open(0, [{ip,Localhost}])),
+			    ?line implicit_inet6(S2, Localhost),
+			    ?line ok = gen_sctp:close(S2),
+			    %%
+			    ?line io:format("~s ~p~n", [Hostname,Host]),
+			    ?line S3 =
+				ok(gen_sctp:open(0, [{ifaddr,Host}])),
+			    ?line implicit_inet6(S3, Host),
+			    ?line ok = gen_sctp:close(S1);
+			{error,eafnosupport} ->
+			    ?line ok = gen_sctp:close(S1),
+			    {skip,"Can not look up IPv6 address"}
+		    end;
+	    _ ->
+		{skip,"IPv6 not supported"}
+	end.
+
+implicit_inet6(S1, Addr) ->
+    ?line ok = gen_sctp:listen(S1, true),
+    ?line P1 = ok(inet:port(S1)),
+    ?line S2 = ok(gen_sctp:open(0, [inet6])),
+    ?line P2 = ok(inet:port(S2)),
+    ?line #sctp_assoc_change{state=comm_up} =
+	ok(gen_sctp:connect(S2, Addr, P1, [])),
+    ?line case ok(gen_sctp:recv(S1)) of
+	      {Addr,P2,[],#sctp_assoc_change{state=comm_up}} ->
+		  ok
+	  end,
+    ?line case ok(inet:sockname(S1)) of
+	      {Addr,P1} -> ok;
+	      {{0,0,0,0,0,0,0,0},P1} -> ok
+	  end,
+    ?line case ok(inet:sockname(S2)) of
+	      {Addr,P2} -> ok;
+	      {{0,0,0,0,0,0,0,0},P2} -> ok
+	  end,
+    ?line ok = gen_sctp:close(S2).
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index 11d19aaa82..c8fe602ac2 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -22,29 +22,52 @@
 %% are not tested here, because they are tested indirectly in this and
 %% and other test suites.
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/inet.hrl").
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2,
-	 t_accept/1, t_connect_timeout/1, t_accept_timeout/1,
-	 t_connect/1, t_connect_bad/1,
-	 t_recv/1, t_recv_timeout/1, t_recv_eof/1,
+-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,
+	 t_connect_timeout/1, t_accept_timeout/1,
+	 t_connect_bad/1,
+	 t_recv_timeout/1, t_recv_eof/1,
 	 t_shutdown_write/1, t_shutdown_both/1, t_shutdown_error/1,
-	 t_fdopen/1]).
+	 t_fdopen/1, t_implicit_inet6/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, t_accept}, {group, t_connect}, {group, t_recv},
+     t_shutdown_write, t_shutdown_both, t_shutdown_error,
+     t_fdopen, t_implicit_inet6].
+
+groups() -> 
+    [{t_accept, [], [t_accept_timeout]},
+     {t_connect, [], [t_connect_timeout, t_connect_bad]},
+     {t_recv, [], [t_recv_timeout, t_recv_eof]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> [t_accept, t_connect, t_recv, t_shutdown_write,
-	      t_shutdown_both, t_shutdown_error, t_fdopen].
 
 init_per_testcase(_Func, Config) ->
     Dog = test_server:timetrap(test_server:seconds(60)),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
 %%% gen_tcp:accept/1,2
 
-t_accept(suite) -> [t_accept_timeout].
 
 t_accept_timeout(doc) -> "Test that gen_tcp:accept/2 (with timeout) works.";
 t_accept_timeout(suite) -> [];
@@ -54,7 +77,6 @@ t_accept_timeout(Config) when is_list(Config) ->
 
 %%% gen_tcp:connect/X
 
-t_connect(suite) -> [t_connect_timeout, t_connect_bad].
 
 t_connect_timeout(doc) -> "Test that gen_tcp:connect/4 (with timeout) works.";
 t_connect_timeout(Config) when is_list(Config) ->
@@ -83,7 +105,6 @@ t_connect_bad(Config) when is_list(Config) ->
 
 %%% gen_tcp:recv/X
 
-t_recv(suite) -> [t_recv_timeout, t_recv_eof].
 
 t_recv_timeout(doc) -> "Test that gen_tcp:recv/3 (with timeout works).";
 t_recv_timeout(suite) -> [];
@@ -156,6 +177,54 @@ t_fdopen(Config) when is_list(Config) ->
     ok.
 
 
+%%% implicit inet6 option to api functions
+
+t_implicit_inet6(Config) when is_list(Config) ->
+    ?line Hostname = ok(inet:gethostname()),
+    ?line
+	case gen_tcp:listen(0, [inet6]) of
+	    {ok,S1} ->
+		?line
+		    case inet:getaddr(Hostname, inet6) of
+			{ok,Host} ->
+			    ?line Loopback = {0,0,0,0,0,0,0,1},
+			    ?line io:format("~s ~p~n", ["Loopback",Loopback]),
+			    ?line implicit_inet6(S1, Loopback),
+			    ?line ok = gen_tcp:close(S1),
+			    %%
+			    ?line Localhost =
+				ok(inet:getaddr("localhost", inet6)),
+			    ?line io:format("~s ~p~n", ["localhost",Localhost]),
+			    ?line S2 = ok(gen_tcp:listen(0, [{ip,Localhost}])),
+			    ?line implicit_inet6(S2, Localhost),
+			    ?line ok = gen_tcp:close(S2),
+			    %%
+			    ?line io:format("~s ~p~n", [Hostname,Host]),
+			    ?line S3 = ok(gen_tcp:listen(0, [{ifaddr,Host}])),
+			    ?line implicit_inet6(S3, Host),
+			    ?line ok = gen_tcp:close(S1);
+			{error,eafnosupport} ->
+			    ?line ok = gen_tcp:close(S1),
+			    {skip,"Can not look up IPv6 address"}
+		    end;
+	    _ ->
+		{skip,"IPv6 not supported"}
+	end.
+
+implicit_inet6(S, Addr) ->
+    ?line P = ok(inet:port(S)),
+    ?line S2 = ok(gen_tcp:connect(Addr, P, [])),
+    ?line P2 = ok(inet:port(S2)),
+    ?line S1 = ok(gen_tcp:accept(S)),
+    ?line P1 = P = ok(inet:port(S1)),
+    ?line {Addr,P2} = ok(inet:peername(S1)),
+    ?line {Addr,P1} = ok(inet:peername(S2)),
+    ?line {Addr,P1} = ok(inet:sockname(S1)),
+    ?line {Addr,P2} = ok(inet:sockname(S2)),
+    ?line ok = gen_tcp:close(S2),
+    ?line ok = gen_tcp:close(S1).
+
+
 
 %%% Utilities
 
@@ -217,3 +286,5 @@ unused_ip(A, B, C, D) ->
 	{ok, _} -> unused_ip(A, B, C, D+1);
 	{error, _} -> {ok, {A, B, C, D}}
     end.
+
+ok({ok,V}) -> V.
diff --git a/lib/kernel/test/gen_tcp_echo_SUITE.erl b/lib/kernel/test/gen_tcp_echo_SUITE.erl
index a2e09877af..830e2d9c39 100644
--- a/lib/kernel/test/gen_tcp_echo_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_echo_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -18,11 +18,13 @@
 %%
 -module(gen_tcp_echo_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %%-compile(export_all).
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2,
+-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,
 	 active_echo/1, passive_echo/1, active_once_echo/1,
 	 slow_active_echo/1, slow_passive_echo/1,
 	 limit_active_echo/1, limit_passive_echo/1,
@@ -31,16 +33,34 @@
 -define(TPKT_VRSN, 3).
 -define(LINE_LENGTH, 1023). % (default value of gen_tcp option 'recbuf') - 1
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [active_echo, passive_echo, active_once_echo,
-     slow_active_echo, slow_passive_echo,
-     limit_active_echo, limit_passive_echo,
-     large_limit_active_echo, large_limit_passive_echo].
+     slow_active_echo, slow_passive_echo, limit_active_echo,
+     limit_passive_echo, large_limit_active_echo,
+     large_limit_passive_echo].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Func, Config) ->
     Dog = test_server:timetrap(test_server:minutes(5)),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 5d726a3b1b..c3ce6497bb 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -1,31 +1,33 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1998-2010. 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(gen_tcp_misc_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %-compile(export_all).
 
--export([all/1, controlling_process/1, no_accept/1, close_with_pending_output/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 controlling_process/1, no_accept/1, close_with_pending_output/1,
 	 data_before_close/1, iter_max_socks/1, get_status/1,
 	 passive_sockets/1, accept_closed_by_other_process/1,
-	 init_per_testcase/2, fin_per_testcase/2,
+	 init_per_testcase/2, end_per_testcase/2,
 	 otp_3924/1, otp_3924_sender/4, closed_socket/1,
 	 shutdown_active/1, shutdown_passive/1, shutdown_pending/1,
 	 default_options/1, http_bad_packet/1, 
@@ -34,39 +36,60 @@
 	 partial_recv_and_close_2/1,partial_recv_and_close_3/1,so_priority/1,
 	 % Accept tests
 	 primitive_accept/1,multi_accept_close_listen/1,accept_timeout/1,
-	 accept_timeouts_in_order/1,accept_timeouts_in_order2/1,accept_timeouts_in_order3/1,
-	 accept_timeouts_mixed/1, 
+	 accept_timeouts_in_order/1,accept_timeouts_in_order2/1,
+	 accept_timeouts_in_order3/1,accept_timeouts_mixed/1, 
 	 killing_acceptor/1,killing_multi_acceptors/1,killing_multi_acceptors2/1,
-	 several_accepts_in_one_go/1,active_once_closed/1, send_timeout/1, otp_7731/1,
-	 zombie_sockets/1, otp_7816/1, otp_8102/1]).
+	 several_accepts_in_one_go/1,active_once_closed/1, send_timeout/1, 
+	 otp_7731/1, zombie_sockets/1, otp_7816/1, otp_8102/1]).
 
 %% Internal exports.
--export([sender/3, not_owner/1, passive_sockets_server/2, priority_server/1, otp_7731_server/1, zombie_server/2]).
+-export([sender/3, not_owner/1, passive_sockets_server/2, priority_server/1, 
+	 otp_7731_server/1, zombie_server/2]).
 
 init_per_testcase(_Func, Config) when is_list(Config) ->
     Dog = test_server:timetrap(test_server:seconds(240)),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [controlling_process, no_accept,
-     close_with_pending_output,
-     data_before_close, iter_max_socks, passive_sockets,
+     close_with_pending_output, data_before_close,
+     iter_max_socks, passive_sockets,
      accept_closed_by_other_process, otp_3924, closed_socket,
      shutdown_active, shutdown_passive, shutdown_pending,
-     default_options, http_bad_packet, 
-     busy_send, busy_disconnect_passive, busy_disconnect_active,
-     fill_sendq, partial_recv_and_close, 
-     partial_recv_and_close_2, partial_recv_and_close_3, so_priority,
-     primitive_accept,multi_accept_close_listen,accept_timeout,
-     accept_timeouts_in_order,accept_timeouts_in_order2,accept_timeouts_in_order3,
-     accept_timeouts_mixed, 
-     killing_acceptor,killing_multi_acceptors,killing_multi_acceptors2,
-     several_accepts_in_one_go, active_once_closed, send_timeout, otp_7731,
+     default_options, http_bad_packet, busy_send,
+     busy_disconnect_passive, busy_disconnect_active,
+     fill_sendq, partial_recv_and_close,
+     partial_recv_and_close_2, partial_recv_and_close_3,
+     so_priority, primitive_accept,
+     multi_accept_close_listen, accept_timeout,
+     accept_timeouts_in_order, accept_timeouts_in_order2,
+     accept_timeouts_in_order3, accept_timeouts_mixed,
+     killing_acceptor, killing_multi_acceptors,
+     killing_multi_acceptors2, several_accepts_in_one_go,
+     active_once_closed, send_timeout, otp_7731,
      zombie_sockets, otp_7816, otp_8102].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 
 default_options(doc) ->
     ["Tests kernel application variables inet_default_listen_options and "
@@ -957,12 +980,11 @@ http_bad_packet(Config) when is_list(Config) ->
 
 http_worker(S) ->
     case gen_tcp:recv(S, 0, 30000) of
+	{ok,{http_error,Error}} ->
+	     io:format("Http error: ~s\n", [Error]);
 	{ok,Data} ->
 	    io:format("Data: ~p\n", [Data]),
-	    http_worker(S);
-	{error,Rsn} ->
-	    io:format("Error: ~p\n", [Rsn]),
-	    ok
+	    http_worker(S)
     end.
 
 http_bad_client(Port) ->
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index bd5685952e..ee9288bc75 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -21,7 +21,7 @@
 % because udp is not deterministic.
 %
 -module(gen_udp_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 
 -define(default_timeout, ?t:minutes(1)).
@@ -29,23 +29,42 @@
 % XXX - we should pick a port that we _know_ is closed. That's pretty hard.
 -define(CLOSED_PORT, 6666).
 
--export([all/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([send_to_closed/1, 
 	 buffer_size/1, binary_passive_recv/1, bad_address/1,
-	 read_packets/1, open_fd/1]).
+	 read_packets/1, open_fd/1, connect/1, implicit_inet6/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [send_to_closed, buffer_size, binary_passive_recv,
+     bad_address, read_packets, open_fd, connect,
+     implicit_inet6].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [send_to_closed, 
-     buffer_size, binary_passive_recv, bad_address, read_packets,
-     open_fd].
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -408,3 +427,78 @@ start_node(Name) ->
 
 stop_node(Node) ->
     ?t:stop_node(Node).
+
+
+connect(suite) ->
+    [];
+connect(doc) ->
+    ["Test that connect/3 has effect"];
+connect(Config) when is_list(Config) ->
+    ?line Addr = {127,0,0,1},
+    ?line {ok,S1} = gen_udp:open(0),
+    ?line {ok,P1} = inet:port(S1),
+    ?line {ok,S2} = gen_udp:open(0),
+    ?line ok = inet:setopts(S2, [{active,false}]),
+    ?line ok = gen_udp:close(S1),
+    ?line ok = gen_udp:connect(S2, Addr, P1),
+    ?line ok = gen_udp:send(S2, <<16#deadbeef:32>>),
+    ?line ok = case gen_udp:recv(S2, 0, 5) of
+        {error,econnrefused} -> ok;
+	{error,econnreset} -> ok;
+	Other -> Other
+    end,
+    ok.
+
+implicit_inet6(Config) when is_list(Config) ->
+    ?line Hostname = ok(inet:gethostname()),
+    ?line Active = {active,false},
+    ?line
+	case gen_udp:open(0, [inet6,Active]) of
+	    {ok,S1} ->
+		?line
+		    case inet:getaddr(Hostname, inet6) of
+			{ok,Host} ->
+			    ?line Loopback = {0,0,0,0,0,0,0,1},
+			    ?line io:format("~s ~p~n", ["Loopback",Loopback]),
+			    ?line implicit_inet6(S1, Active, Loopback),
+			    ?line ok = gen_udp:close(S1),
+			    %%
+			    ?line Localhost =
+				ok(inet:getaddr("localhost", inet6)),
+			    ?line io:format("~s ~p~n", ["localhost",Localhost]),
+			    ?line S2 =
+				ok(gen_udp:open(0, [{ip,Localhost},Active])),
+			    ?line implicit_inet6(S2, Active, Localhost),
+			    ?line ok = gen_udp:close(S2),
+			    %%
+			    ?line io:format("~s ~p~n", [Hostname,Host]),
+			    ?line S3 =
+				ok(gen_udp:open(0, [{ifaddr,Host},Active])),
+			    ?line implicit_inet6(S3, Active, Host),
+			    ?line ok = gen_udp:close(S1);
+			{error,eafnosupport} ->
+			    ?line ok = gen_udp:close(S1),
+			    {skip,"Can not look up IPv6 address"}
+		    end;
+	    _ ->
+		{skip,"IPv6 not supported"}
+	end.
+
+implicit_inet6(S1, Active, Addr) ->
+    ?line P1 = ok(inet:port(S1)),
+    ?line S2 = ok(gen_udp:open(0, [inet6,Active])),
+    ?line P2 = ok(inet:port(S2)),
+    ?line ok = gen_udp:connect(S2, Addr, P1),
+    ?line ok = gen_udp:connect(S1, Addr, P2),
+    ?line {Addr,P2} = ok(inet:peername(S1)),
+    ?line {Addr,P1} = ok(inet:peername(S2)),
+    ?line {Addr,P1} = ok(inet:sockname(S1)),
+    ?line {Addr,P2} = ok(inet:sockname(S2)),
+    ?line ok = gen_udp:send(S1, Addr, P2, "ping"),
+    ?line {Addr,P1,"ping"} = ok(gen_udp:recv(S2, 1024, 1000)),
+    ?line ok = gen_udp:send(S2, Addr, P1, "pong"),
+    ?line {Addr,P2,"pong"} = ok(gen_udp:recv(S1, 1024)),
+    ?line ok = gen_udp:close(S2).
+
+
+ok({ok,V}) -> V.
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index 7a84ad5e75..c88e0f60bb 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -20,7 +20,8 @@
 
 %-define(line_trace, 1).
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_suite/1, end_per_suite/1,
 	 names/1, names_hidden/1, locks/1, locks_hidden/1,
 	 bad_input/1, names_and_locks/1, lock_die/1, name_die/1,
 	 basic_partition/1, basic_name_partition/1,
@@ -42,14 +43,14 @@
 
 -export([global_load/3, lock_global/2, lock_global2/2]).
 
--export([ttt/1]).
+-export([]).
 -export([mass_spawn/1]).
 
 -export([start_tracer/0, stop_tracer/0, get_trace/0]).
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(NODES, [node()|nodes()]).
 
@@ -58,41 +59,62 @@
 %% The resource used by the global module.
 -define(GLOBAL_LOCK, global).
 
-ttt(suite) ->
-    [
-%% 5&6: succeeds
-%% 4&5&6: succeeds
-%% 3&4&5&6: succeeds
-%% 1&2&3&6: fails
-%% 1&2&6: succeeds
-%% 3&6: succeeds
-     names, names_hidden, locks, locks_hidden,
-     bad_input,
-     names_and_locks, lock_die, name_die, basic_partition,
-%     advanced_partition, basic_name_partition,
-%     stress_partition, simple_ring, simple_line,
-     ring].
-
-all(suite) -> 
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     case init:get_argument(ring_line) of
-	{ok, _} ->
-	    [ring_line];
+	{ok, _} -> [ring_line];
 	_ ->
-	    [names, names_hidden, locks, locks_hidden,
-	     bad_input,
+	    [names, names_hidden, locks, locks_hidden, bad_input,
 	     names_and_locks, lock_die, name_die, basic_partition,
 	     advanced_partition, basic_name_partition,
-	     stress_partition, simple_ring, simple_line,
-	     ring, line, global_lost_nodes, otp_1849,
-	     otp_3162, otp_5640, otp_5737, otp_6931,
-             simple_disconnect, simple_resolve, simple_resolve2, 
-             simple_resolve3,
-             leftover_name, re_register_name, name_exit, 
-             external_nodes, many_nodes, sync_0, global_groups_change,
-	     register_1, both_known_1, lost_unregister, 
-             mass_death, garbage_messages]
+	     stress_partition, simple_ring, simple_line, ring, line,
+	     global_lost_nodes, otp_1849, otp_3162, otp_5640,
+	     otp_5737, otp_6931, simple_disconnect, simple_resolve,
+	     simple_resolve2, simple_resolve3, leftover_name,
+	     re_register_name, name_exit, external_nodes, many_nodes,
+	     sync_0, global_groups_change, register_1, both_known_1,
+	     lost_unregister, mass_death, garbage_messages]
     end.
 
+groups() -> 
+    [{ttt, [],
+      [names, names_hidden, locks, locks_hidden, bad_input,
+       names_and_locks, lock_die, name_die, basic_partition,
+       ring]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+init_per_suite(Config) ->
+
+    %% Copied from test_server_ctrl ln 647, we have to do this here as
+    %% the test_server only does this when run without common_test
+    global:sync(),
+    case global:whereis_name(test_server) of
+	undefined ->
+	    io:format(user, "Registering test_server globally!~n",[]),
+	    global:register_name(test_server, whereis(test_server_ctrl));
+	Pid ->
+	    case node() of
+		N when N == node(Pid) ->
+		    io:format(user, "Warning: test_server already running!\n", []),
+		    global:re_register_name(test_server,self());
+		_ ->
+		    ok
+	    end
+    end,
+    Config.
+
+end_per_suite(_Config) ->
+    global:unregister_name(test_server),
+    ok.
+
+
 -define(TESTCASE, testcase_name).
 -define(testcase, ?config(?TESTCASE, Config)).
 -define(nodes_tag, '$global_nodes').
@@ -100,9 +122,16 @@ all(suite) ->
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     ok = gen_server:call(global_name_server, high_level_trace_start,infinity),
+
+    %% Make sure that everything is dead and done. Otherwise there are problems
+    %% on platforms on which it takes a long time to shut down a node.
+    stop_nodes(nodes()),
+    timer:sleep(1000),
+
     [{?TESTCASE, Case}, {registered, registered()} | Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
+    ct:log("Calling end_per_testcase!",[]),
     ?line write_high_level_trace(Config),
     ?line _ = 
         gen_server:call(global_name_server, high_level_trace_stop, infinity),
@@ -114,6 +143,7 @@ fin_per_testcase(_Case, Config) ->
               {What, N} <- [{"Added", Registered -- InitRegistered},
                             {"Removed", InitRegistered -- Registered}],
               N =/= []],
+
     ok.
 
 %%% General comments:
diff --git a/lib/kernel/test/global_group_SUITE.erl b/lib/kernel/test/global_group_SUITE.erl
index 430cc61267..c113bbc0cb 100644
--- a/lib/kernel/test/global_group_SUITE.erl
+++ b/lib/kernel/test/global_group_SUITE.erl
@@ -19,25 +19,61 @@
 
 -module(global_group_SUITE).
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_suite/1, end_per_suite/1]).
 -export([start_gg_proc/1, no_gg_proc/1, no_gg_proc_sync/1, compatible/1, 
 	 one_grp/1, one_grp_x/1, two_grp/1, hidden_groups/1, test_exit/1]).
 -export([init/1, init/2, init2/2, start_proc/1, start_proc_rereg/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 %-compile(export_all).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(NODES, [node()|nodes()]).
 
 -define(UNTIL(Seq), loop_until_true(fun() -> Seq end)).
 
-all(suite) -> 
-    [start_gg_proc, no_gg_proc, no_gg_proc_sync, 
-     compatible, one_grp, one_grp_x, two_grp, test_exit,
-     hidden_groups].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [start_gg_proc, no_gg_proc, no_gg_proc_sync, compatible,
+     one_grp, one_grp_x, two_grp, test_exit, hidden_groups].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+init_per_suite(Config) ->
+
+    %% Copied from test_server_ctrl ln 647, we have to do this here as
+    %% the test_server only does this when run without common_test
+    global:sync(),
+    case global:whereis_name(test_server) of
+	undefined ->
+	    io:format(user, "Registering test_server globally!~n",[]),
+	    global:register_name(test_server, whereis(test_server_ctrl));
+	Pid ->
+	    case node() of
+		N when N == node(Pid) ->
+		    io:format(user, "Warning: test_server already running!\n", []),
+		    global:re_register_name(test_server,self());
+		_ ->
+		    ok
+	    end
+    end,
+    Config.
+
+end_per_suite(_Config) ->
+    global:unregister_name(test_server),
+    ok.
 
 -define(TESTCASE, testcase_name).
 -define(testcase, ?config(?TESTCASE, Config)).
@@ -46,7 +82,7 @@ init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(5)),
     [{?TESTCASE, Case}, {watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
@@ -164,8 +200,8 @@ no_gg_proc(Config) when is_list(Config) ->
     ?line Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn, 
 			      Cpxnn, Cpynn, Cpznn],
     ?line Own_nodes = rpc:call(Cp3, global_group, own_nodes, []), 
-    ?line true = (Own_nodes -- Own_nodes_should) =:= [],
-    ?line true = (Own_nodes_should -- Own_nodes) =:= [],
+    ?line [] = (Own_nodes -- Own_nodes_should),
+    ?line [] = (Own_nodes_should -- Own_nodes),
     
     ?line Pid2 = rpc:call(Cp1, global_group, send, [test2, {ping, self()}]),
     ?line receive
@@ -339,8 +375,8 @@ no_gg_proc_sync(Config) when is_list(Config) ->
     ?line Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn, 
 			      Cpxnn, Cpynn, Cpznn],
     ?line Own_nodes = rpc:call(Cp3, global_group, own_nodes, []), 
-    ?line true = (Own_nodes -- Own_nodes_should) =:= [],
-    ?line true = (Own_nodes_should -- Own_nodes) =:= [],
+    ?line [] = (Own_nodes -- Own_nodes_should),
+    ?line [] = (Own_nodes_should -- Own_nodes),
     
     ?line Pid2 = rpc:call(Cp1, global_group, send, [test2, {ping, self()}]),
     ?line receive
@@ -513,8 +549,8 @@ compatible(Config) when is_list(Config) ->
     ?line Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn, 
 			      Cpxnn, Cpynn, Cpznn],
     ?line Own_nodes = rpc:call(Cp3, global_group, own_nodes, []), 
-    ?line true = (Own_nodes -- Own_nodes_should) =:= [],
-    ?line true = (Own_nodes_should -- Own_nodes) =:= [],
+    ?line [] = (Own_nodes -- Own_nodes_should),
+    ?line [] = (Own_nodes_should -- Own_nodes),
     
     ?line Pid2 = rpc:call(Cp1, global_group, send, [test2, {ping, self()}]),
     ?line receive
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 0d0296238b..e82eabe530 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -18,12 +18,14 @@
 %%
 -module(heart_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, ostype/1, start/1, restart/1, reboot/1, set_cmd/1, clear_cmd/1,
-	dont_drop/1, kill_pid/1, fini/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, start/1, restart/1, 
+	 reboot/1, set_cmd/1, clear_cmd/1,
+	 dont_drop/1, kill_pid/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([start_heart_stress/1, mangle/1, suicide_by_heart/0]).
 
@@ -33,7 +35,7 @@ init_per_testcase(_Func, Config) ->
     Dog=test_server:timetrap(test_server:seconds(?DEFAULT_TIMEOUT_SECS)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Nodes = nodes(),
     lists:foreach(fun(X) ->
 			  NNam = list_to_atom(hd(string:tokens(atom_to_list(X),"@"))),
@@ -53,18 +55,29 @@ fin_per_testcase(_Func, Config) ->
 %% Should be started in a CC view with:
 %% erl -sname master -rsh ctrsh
 %%-----------------------------------------------------------------
-all(suite) ->
-    [{conf, ostype, [start, restart, reboot, 
-		     set_cmd, clear_cmd, kill_pid], fini}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-ostype(Config) when is_list(Config) ->
+all() -> 
+    [start, restart, reboot, set_cmd, clear_cmd, kill_pid].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, windows} ->
 	    {skipped, "No use to run on Windows 95/98"};
 	_ ->
 	    Config
     end.
-fini(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 start_check(Type, Name) ->
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index eb8f918491..523e5c63ce 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -18,28 +18,72 @@
 %%
 -module(inet_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/inet.hrl").
 -include_lib("kernel/src/inet_dns.hrl").
 
--export([all/1, t_gethostbyaddr/1, t_getaddr/1, t_gethostbyname/1,
-	 t_gethostbyaddr_v6/1, t_getaddr_v6/1, t_gethostbyname_v6/1,
-	 ipv4_to_ipv6/1, host_and_addr/1, parse/1, t_gethostnative/1, 
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 t_gethostbyaddr/0, t_gethostbyaddr/1,
+	 t_getaddr/0, t_getaddr/1,
+	 t_gethostbyname/0, t_gethostbyname/1,
+	 t_gethostbyaddr_v6/0, t_gethostbyaddr_v6/1,
+	 t_getaddr_v6/0, t_getaddr_v6/1,
+	 t_gethostbyname_v6/0, t_gethostbyname_v6/1,
+	 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_soft_restart/1,gethostnative_debug_level/1,getif/1]).
+         gethostnative_soft_restart/0, gethostnative_soft_restart/1,
+	 gethostnative_debug_level/0, gethostnative_debug_level/1,
+	 getif/1,
+	 getif_ifr_name_overflow/1,getservbyname_overflow/1, getifaddrs/1]).
 
 -export([get_hosts/1, get_ipv6_hosts/1, parse_hosts/1, parse_address/1,
 	 kill_gethost/0, parallell_gethost/0]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+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,
+     gethostnative_debug_level, gethostnative_soft_restart,
+     getif, getif_ifr_name_overflow, getservbyname_overflow,
+     getifaddrs].
+
+groups() -> 
+    [{parse, [], [parse_hosts, parse_address]}].
+
+%% Required configuaration
+required(v4) ->
+    [{require, test_host_ipv4_only},
+     {require, test_dummy_host}];
+required(v6) ->
+    [{require, test_host_ipv6_only},
+     {require, test_dummy_ipv6_host}];
+required(hosts) ->
+    case os:type() of
+	{OS, _} when OS =:= win32; OS =:= vxworks ->
+	    [{require, hardcoded_hosts},
+	     {require, hardcoded_ipv6_hosts}];
+	_Else ->
+	    [{require, test_hosts}]
+    end.     
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
 
-all(suite) ->
-    [t_gethostbyaddr, t_gethostbyname, t_getaddr, 
-     t_gethostbyaddr_v6, t_gethostbyname_v6, t_getaddr_v6, 
-     ipv4_to_ipv6, host_and_addr, parse,t_gethostnative, 
-     gethostnative_parallell, cname_loop,
-     gethostnative_debug_level,gethostnative_soft_restart,
-     getif].
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 init_per_testcase(_Func, Config) ->
     Dog = test_server:timetrap(test_server:seconds(60)),
@@ -49,10 +93,12 @@ end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
-
+t_gethostbyaddr() ->
+    required(v4).
 t_gethostbyaddr(doc) -> "Test the inet:gethostbyaddr/1 function.";
 t_gethostbyaddr(Config) when is_list(Config) ->
-    ?line {Name,FullName,IPStr,IP,Aliases,_,_} = ?config(test_host_ipv4_only, Config),
+    ?line {Name,FullName,IPStr,IP,Aliases,_,_} =
+	ct:get_config(test_host_ipv4_only),
     ?line {ok,HEnt} = inet:gethostbyaddr(IPStr),
     ?line {ok,HEnt} = inet:gethostbyaddr(IP),
     ?line {error,Error} = inet:gethostbyaddr(Name),
@@ -74,15 +120,16 @@ t_gethostbyaddr(Config) when is_list(Config) ->
     end,
 
     ?line {_DName, _DFullName, DIPStr, DIP, _, _, _} =
-	?config(test_dummy_host, Config),
+	ct:get_config(test_dummy_host),
     ?line {error,nxdomain} = inet:gethostbyaddr(DIPStr),
     ?line {error,nxdomain} = inet:gethostbyaddr(DIP),
     ok.
 
+t_gethostbyaddr_v6() -> required(v6).
 t_gethostbyaddr_v6(doc) -> "Test the inet:gethostbyaddr/1 inet6 function.";
 t_gethostbyaddr_v6(Config) when is_list(Config) ->
     ?line {Name6, FullName6, IPStr6, IP6, Aliases6} =
-	?config(test_host_ipv6_only, Config),
+	ct:get_config(test_host_ipv6_only),
 
     ?line case inet:gethostbyaddr(IPStr6) of
         %% Even if IPv6 is not supported, the native resolver may succeed
@@ -102,27 +149,28 @@ t_gethostbyaddr_v6(Config) when is_list(Config) ->
 			       {HEnt6#hostent.h_aliases,[[],Aliases6]}]),
 
 	    ?line {_DName6, _DFullName6, DIPStr6, DIP6, _} =
-		      ?config(test_dummy_ipv6_host, Config),
+		      ct:get_config(test_dummy_ipv6_host),
 	    ?line {error,nxdomain} = inet:gethostbyaddr(DIPStr6),
 	    ?line {error,nxdomain} = inet:gethostbyaddr(DIP6),    
 	    ok
     end.
 
+t_gethostbyname() -> required(v4).
 t_gethostbyname(doc) -> "Test the inet:gethostbyname/1 function.";
 t_gethostbyname(suite) -> [];
 t_gethostbyname(Config) when is_list(Config) ->
     ?line {Name,FullName,IPStr,IP,Aliases,IP_46_Str,_} =
-	?config(test_host_ipv4_only, Config),
+	ct:get_config(test_host_ipv4_only),
     ?line {ok,_} = inet:gethostbyname(IPStr),
     ?line {ok,HEnt} = inet:gethostbyname(Name),
     ?line {ok,HEnt} = inet:gethostbyname(list_to_atom(Name)),
     ?line HEnt_ = HEnt#hostent{h_addrtype = inet,
 			       h_length = 4,
 			       h_addr_list = [IP]},
+
     ?line HEnt_ = HEnt,
     ?line check_elems([{HEnt#hostent.h_name,[Name,FullName]},
 		       {HEnt#hostent.h_aliases,[[],Aliases]}]),
-
     ?line {ok,HEntF} = inet:gethostbyname(FullName),
     ?line HEntF_ = HEntF#hostent{h_name = FullName,
 				 h_addrtype = inet,
@@ -132,15 +180,16 @@ t_gethostbyname(Config) when is_list(Config) ->
     ?line check_elems([{HEnt#hostent.h_aliases,[[],Aliases]}]),
 
     ?line {DName, _DFullName, _DIPStr, _DIP, _, _, _} =
-	?config(test_dummy_host, Config),
+	ct:get_config(test_dummy_host),
     ?line {error,nxdomain} = inet:gethostbyname(DName),
     ?line {error,nxdomain} = inet:gethostbyname(IP_46_Str).
 
+t_gethostbyname_v6() -> required(v6).
 t_gethostbyname_v6(doc) -> "Test the inet:gethostbyname/1 inet6 function.";
 t_gethostbyname_v6(suite) -> [];
 t_gethostbyname_v6(Config) when is_list(Config) ->
     ?line {Name, _, _, _,Aliases,IP_46_Str,IP_46} =
-	?config(test_host_ipv4_only, Config),
+	ct:get_config(test_host_ipv4_only),
 
     case {inet:gethostbyname(IP_46_Str, inet6),
 	  inet:gethostbyname(Name, inet6)} of
@@ -153,7 +202,7 @@ t_gethostbyname_v6(Config) when is_list(Config) ->
 	    ?line check_elems([{HEnt46#hostent.h_aliases,[[],Aliases]}]),		  
 
 	    ?line {Name6, FullName6, IPStr6, IP6, Aliases6} =
-		      	?config(test_host_ipv6_only, Config),
+		      	ct:get_config(test_host_ipv6_only),
 	    ?line {ok,_} = inet:gethostbyname(IPStr6, inet6),
 	    ?line {ok,HEnt6} = inet:gethostbyname(Name6, inet6),
 	    ?line {ok,HEnt6} = inet:gethostbyname(list_to_atom(Name6), inet6),
@@ -199,7 +248,7 @@ t_gethostbyname_v6(Config) when is_list(Config) ->
 		  end,
 	    
 	    ?line {DName6, _DFullName6, _DIPStr6, _DIP6, _} =
-		      ?config(test_dummy_ipv6_host, Config),
+		      ct:get_config(test_dummy_ipv6_host),
 	    ?line {error,nxdomain} = inet:gethostbyname(DName6, inet6),
 	    ok;
 	{_,_} ->
@@ -218,11 +267,12 @@ check_elem(Val, [], Tests0) ->
     ?t:fail({no_match,Val,Tests0}).
 
 
+t_getaddr() -> required(v4).
 t_getaddr(doc) -> "Test the inet:getaddr/2 function.";
 t_getaddr(suite) -> [];
 t_getaddr(Config) when is_list(Config) ->
     ?line {Name,FullName,IPStr,IP,_,IP_46_Str,IP46} =
-	?config(test_host_ipv4_only, Config),
+	ct:get_config(test_host_ipv4_only),
     ?line {ok,IP} = inet:getaddr(list_to_atom(Name), inet),
     ?line {ok,IP} = inet:getaddr(Name, inet),
     ?line {ok,IP} = inet:getaddr(FullName, inet),
@@ -231,17 +281,18 @@ t_getaddr(Config) when is_list(Config) ->
     ?line {error,nxdomain} = inet:getaddr(IP_46_Str, inet),
     ?line {error,eafnosupport} = inet:getaddr(IP46, inet),
 
-    ?line {DName, DFullName, DIPStr, DIP, _, _, _} = ?config(test_dummy_host, Config),
+    ?line {DName, DFullName, DIPStr, DIP, _, _, _} = ct:get_config(test_dummy_host),
     ?line {error,nxdomain} = inet:getaddr(DName, inet),
     ?line {error,nxdomain} = inet:getaddr(DFullName, inet),
     ?line {ok,DIP} = inet:getaddr(DIPStr, inet),
     ?line {ok,DIP} = inet:getaddr(DIP, inet).
 
+t_getaddr_v6() -> required(v4) ++ required(v6).
 t_getaddr_v6(doc) -> "Test the inet:getaddr/2 function.";
 t_getaddr_v6(suite) -> [];
 t_getaddr_v6(Config) when is_list(Config) ->
     ?line {Name,FullName,IPStr,_IP,_,IP_46_Str,IP46} =
-	?config(test_host_ipv4_only, Config),
+	ct:get_config(test_host_ipv4_only),
     case {inet:getaddr(IP_46_Str, inet6),inet:getaddr(Name, inet6)} of
 	{{ok,IP46},{ok,_}} -> 
 	    %% Since we suceeded in parsing an IPv6 address string and
@@ -260,7 +311,7 @@ t_getaddr_v6(Config) when is_list(Config) ->
 %% 					   inet_db:res_option(lookup))
 %% 		  end,
 	    ?line {Name6, FullName6, IPStr6, IP6, _} =
-				      	?config(test_host_ipv6_only, Config),
+				      	ct:get_config(test_host_ipv6_only),
 	    ?line {ok,_} = inet:getaddr(list_to_atom(Name6), inet6),
 	    ?line {ok,_} = inet:getaddr(Name6, inet6),
 	    ?line {ok,_} = inet:getaddr(FullName6, inet6),
@@ -268,7 +319,7 @@ t_getaddr_v6(Config) when is_list(Config) ->
 	    ?line {ok,IP6} = inet:getaddr(IPStr6, inet6),
 
 	    ?line {DName6, DFullName6, DIPStr6, DIP6, _} =
-		?config(test_dummy_ipv6_host, Config),
+		ct:get_config(test_dummy_ipv6_host),
 	    ?line {error,nxdomain} = inet:getaddr(DName6, inet6),
 	    ?line {error,nxdomain} = inet:getaddr(DFullName6, inet6),
 	    ?line {ok,DIP6} = inet:getaddr(DIPStr6, inet6),
@@ -278,6 +329,7 @@ t_getaddr_v6(Config) when is_list(Config) ->
  	    {skip, "IPv6 is not supported on this host"}
     end.
 
+ipv4_to_ipv6() -> required(v4).
 ipv4_to_ipv6(doc) -> "Test if IPv4 address is converted to IPv6 address.";
 ipv4_to_ipv6(suite) -> [];
 ipv4_to_ipv6(Config) when is_list(Config) ->
@@ -286,7 +338,7 @@ ipv4_to_ipv6(Config) when is_list(Config) ->
     %% address should be returned. If no IPv6 support on this host, an
     %% error should beturned.
     ?line {_Name,_FullName,IPStr,_IP,Aliases,IP_46_Str,IP_46} =
-	?config(test_host_ipv4_only, Config),
+	ct:get_config(test_host_ipv4_only),
     ?line IP4to6Res =
 	case inet:getaddr(IPStr, inet6) of
 	    {ok,IP_46} ->
@@ -313,6 +365,7 @@ ipv4_to_ipv6(Config) when is_list(Config) ->
 	  end,
     ok.
 
+host_and_addr() -> required(hosts).
 host_and_addr(doc) -> ["Test looking up hosts and addresses. Use 'ypcat hosts' ",
 		       "or the local eqivalent to find all hosts."];
 host_and_addr(suite) -> [];
@@ -333,30 +386,30 @@ try_host({Ip0, Host}) ->
 %% Get all hosts from the system using 'ypcat hosts' or the local
 %% equvivalent.
 
-get_hosts(Config) -> 
+get_hosts(_Config) -> 
     case os:type() of
 	{unix, _} ->
 	    List = lists:map(fun(X) ->
 				     atom_to_list(X)++" "
-			     end, ?config(test_hosts, Config)),
+			     end, ct:get_config(test_hosts)),
 	    Cmd = "ypmatch "++List++" hosts.byname", 
 	    HostFile = os:cmd(Cmd),
 	    get_hosts(HostFile, [], [], []);
 	_ -> 
-	    ?config(hardcoded_hosts, Config)
+	    ct:get_config(hardcoded_hosts)
     end.
 
-get_ipv6_hosts(Config) -> 
+get_ipv6_hosts(_Config) -> 
     case os:type() of
 	{unix, _} ->
 	    List = lists:map(fun(X) ->
 				     atom_to_list(X)++" "
-			     end, ?config(test_hosts, Config)),
+			     end, ct:get_config(ipv6_hosts)),
 	    Cmd = "ypmatch "++List++" ipnodes.byname", 
 	    HostFile = os:cmd(Cmd),
 	    get_hosts(HostFile, [], [], []);
 	_ -> 
-	    ?config(hardcoded_ipv6_hosts, Config)
+	    ct:get_config(hardcoded_ipv6_hosts)
     end.
 
 get_hosts([$\t|Rest], Cur, Ip, Result) when Ip /= [] ->
@@ -375,9 +428,6 @@ get_hosts([C|Rest], Cur, Ip, Result) ->
 get_hosts([], _, _, Result) ->
     Result.
     
-parse(suite) -> [parse_hosts, parse_address];
-parse(doc) -> ["Test that parsing of the hosts file or equivalent works,",
-	       "and that erroneous lines are skipped"].
 
 parse_hosts(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir,Config),
@@ -729,6 +779,7 @@ cname_loop(Config) when is_list(Config) ->
 				lookup_count=300,
 				lookup_processes=20}).
 
+gethostnative_soft_restart() -> required(hosts).
 gethostnative_soft_restart(suite) ->    
     [];
 gethostnative_soft_restart(doc) ->
@@ -739,6 +790,8 @@ gethostnative_soft_restart(Config) when is_list(Config) ->
 				#gethostnative_control{
 				  control_seq=[soft_restart]}).
 
+
+gethostnative_debug_level() -> required(hosts).
 gethostnative_debug_level(suite) ->    
     [];
 gethostnative_debug_level(doc) ->
@@ -872,10 +925,30 @@ getif(suite) ->
 getif(doc) ->
     ["Tests basic functionality of getiflist, getif, and ifget"];
 getif(Config) when is_list(Config) ->
+    ?line case os:type() of
+	      {unix,Osname} ->
+		  ?line do_getif(Osname);
+	      {_,_} ->
+		  {skip,"inet:getif/0 probably not supported"}
+	  end.
+
+do_getif(Osname) ->
     ?line {ok,Hostname} = inet:gethostname(),
     ?line {ok,Address} = inet:getaddr(Hostname, inet),
     ?line {ok,Loopback} = inet:getaddr("localhost", inet),
     ?line {ok,Interfaces} = inet:getiflist(),
+    ?line HWAs =
+	lists:sort(
+	  lists:foldl(
+	    fun (I, Acc) ->
+		    case inet:ifget(I, [hwaddr]) of
+			{ok,[{hwaddr,A}]} -> [A|Acc];
+			{ok,[]} -> Acc
+		    end
+	    end, [], Interfaces)),
+    ?line io:format("HWAs = ~p~n", [HWAs]),
+    ?line (Osname =/= sunos)
+	andalso ((length(HWAs) > 0) orelse (?t:fail(no_HWAs))),
     ?line Addresses = 
 	lists:sort(
 	  lists:foldl(
@@ -891,6 +964,134 @@ getif(Config) when is_list(Config) ->
     ?line true = ip_member(Loopback, Addresses),
     ?line ok.
 
+getif_ifr_name_overflow(doc) ->
+    "Test long interface names do not overrun buffer";
+getif_ifr_name_overflow(Config) when is_list(Config) ->
+    ?line case os:type() of
+	      {unix,Osname} ->
+		  ?line do_getif_ifr_name_overflow(Osname);
+	      {_,_} ->
+		  {skip,"inet:ifget/2 probably not supported"}
+	  end.
+
+do_getif_ifr_name_overflow(_) ->
+    %% emulator should not crash
+    ?line {ok,[]} = inet:ifget(lists:duplicate(128, "x"), [addr]),
+    ok.
+
+getservbyname_overflow(doc) ->
+    "Test long service names do not overrun buffer";
+getservbyname_overflow(Config) when is_list(Config) ->
+    %% emulator should not crash
+    ?line {error,einval} = inet:getservbyname(list_to_atom(lists:flatten(lists:duplicate(128, "x"))), tcp),
+    ok.
+
+getifaddrs(doc) ->
+    "Test inet:gifaddrs/0";
+getifaddrs(Config) when is_list (Config) ->
+    ?line {ok,IfAddrs} = inet:getifaddrs(),
+    ?line ?t:format("IfAddrs = ~p.~n", [IfAddrs]),
+    ?line
+	case
+	    {os:type(),
+	     [If ||
+		 {If,Opts} <- IfAddrs,
+		 lists:keymember(hwaddr, 1, Opts)]} of
+	    {{unix,sunos},[]} -> ok;
+	    {OT,[]} ->
+		?t:fail({should_have_hwaddr,OT});
+	    _ -> ok
+	end,
+    ?line Addrs =
+	[element(1, A) || A <- ifaddrs(IfAddrs)],
+    ?line ?t:format("Addrs = ~p.~n", [Addrs]),
+    ?line [check_addr(Addr) || Addr <- Addrs],
+    ok.
+
+check_addr(Addr)
+  when tuple_size(Addr) =:= 8,
+       element(1, Addr) band 16#FFC0 =:= 16#FE80 ->
+    ?line ?t:format("Addr: ~p link local; SKIPPED!~n", [Addr]),
+    ok;
+check_addr(Addr) ->
+    ?line ?t:format("Addr: ~p.~n", [Addr]),
+    ?line Ping = "ping",
+    ?line Pong = "pong",
+    ?line {ok,L} = gen_tcp:listen(0, [{ip,Addr},{active,false}]),
+    ?line {ok,P} = inet:port(L),
+    ?line {ok,S1} = gen_tcp:connect(Addr, P, [{active,false}]),
+    ?line {ok,S2} = gen_tcp:accept(L),
+    ?line ok = gen_tcp:send(S2, Ping),
+    ?line {ok,Ping} = gen_tcp:recv(S1, length(Ping)),
+    ?line ok = gen_tcp:send(S1, Pong),
+    ?line ok = gen_tcp:close(S1),
+    ?line {ok,Pong} = gen_tcp:recv(S2, length(Pong)),
+    ?line ok = gen_tcp:close(S2),
+    ?line ok = gen_tcp:close(L),
+    ok.
+
+-record(ifopts, {name,flags,addrs=[],hwaddr}).
+
+ifaddrs([]) -> [];
+ifaddrs([{If,Opts}|IOs]) ->
+    ?line #ifopts{flags=Flags} = Ifopts =
+	check_ifopts(Opts, #ifopts{name=If}),
+    ?line case Flags =/= undefined andalso lists:member(up, Flags) of
+	      true  ->
+		  Ifopts#ifopts.addrs;
+	      false ->
+		  []
+	  end++ifaddrs(IOs).
+
+check_ifopts([], #ifopts{name=If,flags=Flags,addrs=Raddrs}=Ifopts) ->
+    Addrs = lists:reverse(Raddrs),
+    R = Ifopts#ifopts{addrs=Addrs},
+    ?t:format("~p.~n", [R]),
+    %% See how we did...
+    if  is_list(Flags) -> ok;
+	true ->
+	    ?t:fail({flags_undefined,If})
+    end,
+    case lists:member(broadcast, Flags) of
+	true ->
+	    [case A of
+		 {_,_,_} -> A;
+		 {T,_} when tuple_size(T) =:= 8 -> A;
+		 _ ->
+		     ?t:fail({broaddr_missing,If,A})
+	     end || A <- Addrs];
+	false ->
+	    [case A of {_,_} -> A;
+		 _ ->
+		     ?t:fail({should_have_netmask,If,A})
+	     end || A <- Addrs]
+    end,
+    R;
+check_ifopts([{flags,Flags}|Opts], #ifopts{flags=undefined}=Ifopts) ->
+    check_ifopts(Opts, Ifopts#ifopts{flags=Flags});
+check_ifopts([{flags,Fs}|Opts], #ifopts{flags=Flags}=Ifopts) ->
+    case Fs of
+	Flags ->
+	    check_ifopts(Opts, Ifopts#ifopts{});
+	_ ->
+	    ?t:fail({multiple_flags,Fs,Ifopts})
+    end;
+check_ifopts(
+  [{addr,Addr},{netmask,Netmask},{broadaddr,Broadaddr}|Opts],
+  #ifopts{addrs=Addrs}=Ifopts) ->
+    check_ifopts(Opts, Ifopts#ifopts{addrs=[{Addr,Netmask,Broadaddr}|Addrs]});
+check_ifopts(
+  [{addr,Addr},{netmask,Netmask}|Opts],
+  #ifopts{addrs=Addrs}=Ifopts) ->
+    check_ifopts(Opts, Ifopts#ifopts{addrs=[{Addr,Netmask}|Addrs]});
+check_ifopts([{addr,Addr}|Opts], #ifopts{addrs=Addrs}=Ifopts) ->
+    check_ifopts(Opts, Ifopts#ifopts{addrs=[{Addr}|Addrs]});
+check_ifopts([{hwaddr,Hwaddr}|Opts], #ifopts{hwaddr=undefined}=Ifopts)
+  when is_list(Hwaddr) ->
+    check_ifopts(Opts, Ifopts#ifopts{hwaddr=Hwaddr});
+check_ifopts([{hwaddr,HwAddr}|_], #ifopts{}=Ifopts) ->
+    ?t:fail({multiple_hwaddrs,HwAddr,Ifopts}).
+
 %% Works just like lists:member/2, except that any {127,_,_,_} tuple
 %% matches any other {127,_,_,_}. We do this to handle Linux systems
 %% that use (for instance) 127.0.1.1 as the IP address for the hostname.
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl
index cc32d1f8f9..0c3c7c950c 100644
--- a/lib/kernel/test/inet_res_SUITE.erl
+++ b/lib/kernel/test/inet_res_SUITE.erl
@@ -18,24 +18,51 @@
 %%
 -module(inet_res_SUITE).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 
 -include_lib("kernel/include/inet.hrl").
 -include_lib("kernel/src/inet_dns.hrl").
 
--export([all/1, init_per_testcase/2, end_per_testcase/2]).
+-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([basic/1, resolve/1, edns0/1, txt_record/1, files_monitor/1]).
--export([gethostbyaddr/1, gethostbyaddr_v6/1,
-	 gethostbyname/1, gethostbyname_v6/1,
-	 getaddr/1, getaddr_v6/1, ipv4_to_ipv6/1, host_and_addr/1]).
+-export([
+	 gethostbyaddr/0, gethostbyaddr/1,
+	 gethostbyaddr_v6/0, gethostbyaddr_v6/1,
+	 gethostbyname/0, gethostbyname/1,
+	 gethostbyname_v6/0, gethostbyname_v6/1,
+	 getaddr/0, getaddr/1,
+	 getaddr_v6/0, getaddr_v6/1,
+	 ipv4_to_ipv6/0, ipv4_to_ipv6/1,
+	 host_and_addr/0, host_and_addr/1
+	]).
 
 -define(RUN_NAMED, "run-named").
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [basic, resolve, edns0, txt_record, files_monitor,
-     gethostbyaddr, gethostbyaddr_v6, gethostbyname, gethostbyname_v6,
-     getaddr, getaddr_v6, ipv4_to_ipv6, host_and_addr].
+     gethostbyaddr, gethostbyaddr_v6, gethostbyname,
+     gethostbyname_v6, getaddr, getaddr_v6, ipv4_to_ipv6,
+     host_and_addr].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 zone_dir(basic) ->
     otptest;
@@ -450,11 +477,19 @@ do_files_monitor(Config) ->
 %% Compatibility tests. Call the inet_SUITE tests, but with
 %% lookup = [file,dns] instead of [native]
 
+gethostbyaddr() -> inet_SUITE:t_gethostbyaddr().
 gethostbyaddr(Config) -> inet_SUITE:t_gethostbyaddr(Config).
+gethostbyaddr_v6() -> inet_SUITE:t_gethostbyaddr_v6().
 gethostbyaddr_v6(Config) -> inet_SUITE:t_gethostbyaddr_v6(Config).
+gethostbyname() -> inet_SUITE:t_gethostbyname().
 gethostbyname(Config) -> inet_SUITE:t_gethostbyname(Config).
+gethostbyname_v6() -> inet_SUITE:t_gethostbyname_v6().
 gethostbyname_v6(Config) -> inet_SUITE:t_gethostbyname_v6(Config).
+getaddr() -> inet_SUITE:t_getaddr().
 getaddr(Config) -> inet_SUITE:t_getaddr(Config).
+getaddr_v6() -> inet_SUITE:t_getaddr_v6().
 getaddr_v6(Config) -> inet_SUITE:t_getaddr_v6(Config).
+ipv4_to_ipv6() -> inet_SUITE:ipv4_to_ipv6().
 ipv4_to_ipv6(Config) -> inet_SUITE:ipv4_to_ipv6(Config).
+host_and_addr() -> inet_SUITE:host_and_addr().
 host_and_addr(Config) -> inet_SUITE:host_and_addr(Config).
diff --git a/lib/kernel/test/inet_sockopt_SUITE.erl b/lib/kernel/test/inet_sockopt_SUITE.erl
index 0fa0226ccf..1ef182ca18 100644
--- a/lib/kernel/test/inet_sockopt_SUITE.erl
+++ b/lib/kernel/test/inet_sockopt_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -18,7 +18,7 @@
 %%
 -module(inet_sockopt_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 
 -define(C_GET_IPPROTO_TCP,1).
@@ -48,7 +48,9 @@
 
 -define(C_QUIT,99).
 
--export([all/1, simple/1, loop_all/1, simple_raw/1, simple_raw_getbin/1, 
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 simple/1, loop_all/1, simple_raw/1, simple_raw_getbin/1, 
 	 doc_examples_raw/1,doc_examples_raw_getbin/1,
 	 large_raw/1,large_raw_getbin/1,combined/1,combined_getbin/1,
 	 type_errors/1]).
@@ -56,10 +58,29 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 
-all(suite) ->
-    [simple,loop_all,simple_raw,simple_raw_getbin,
-     doc_examples_raw, doc_examples_raw_getbin,
-     large_raw,large_raw_getbin,combined,combined_getbin,type_errors].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [simple, loop_all, simple_raw, simple_raw_getbin,
+     doc_examples_raw, doc_examples_raw_getbin, large_raw,
+     large_raw_getbin, combined, combined_getbin,
+     type_errors].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Func, Config) ->
     Dog = test_server:timetrap(test_server:seconds(60)),
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index bbd8261197..18bb5c7087 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -18,16 +18,17 @@
 %%
 -module(init_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([get_arguments/1, get_argument/1, boot_var/1, restart/1,
 	 get_plain_arguments/1,
-	 reboot/1, stop/1, get_status/1, script_id/1, boot/1]).
+	 reboot/1, stop/1, get_status/1, script_id/1]).
 -export([boot1/1, boot2/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([init/1, fini/1]).
 
@@ -38,17 +39,34 @@
 %% Should be started in a CC view with:
 %% erl -sname master -rsh ctrsh
 %%-----------------------------------------------------------------
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [get_arguments, get_argument, boot_var,
-     get_plain_arguments,
-     restart,
-     get_status, script_id, boot].
+     get_plain_arguments, restart, get_status, script_id,
+     {group, boot}].
+
+groups() -> 
+    [{boot, [], [boot1, boot2]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:seconds(?DEFAULT_TIMEOUT_SEC)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
@@ -488,7 +506,6 @@ script_id(Config) when is_list(Config) ->
 %% ------------------------------------------------
 %% Start the slave system with -boot flag.
 %% ------------------------------------------------
-boot(suite) -> [boot1, boot2].
 
 boot1(doc) -> [];
 boot1(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index c0db292ba5..66a01b1849 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -17,8 +17,10 @@
 %% %CopyrightEnd%
 %%
 -module(interactive_shell_SUITE).
--include("test_server.hrl").
--export([all/1, get_columns_and_rows/1, exit_initial/1, job_control_local/1, 
+-include_lib("test_server/include/test_server.hrl").
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 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]).
 
@@ -44,10 +46,28 @@ end_per_testcase(_Func, Config) ->
     test_server:timetrap_cancel(Dog).
 
 
-all(suite) ->
-    [get_columns_and_rows, exit_initial, job_control_local, 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [get_columns_and_rows, exit_initial, job_control_local,
      job_control_remote, job_control_remote_noshell].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %-define(DEBUG,1).
 -ifdef(DEBUG).
 -define(dbg(Data),erlang:display(Data)).
diff --git a/lib/kernel/test/kernel.cover b/lib/kernel/test/kernel.cover
index 228dafc565..f6967ca651 100644
--- a/lib/kernel/test/kernel.cover
+++ b/lib/kernel/test/kernel.cover
@@ -1,4 +1,3 @@
 %% -*- erlang -*-
-{exclude,all}.
-{include,[gen_udp,inet6_udp,inet_res,inet_dns]}.
+{incl_mods,[gen_udp,inet6_udp,inet_res,inet_dns]}.
 
diff --git a/lib/kernel/test/kernel.dynspec b/lib/kernel/test/kernel.dynspec
deleted file mode 100644
index 297a7c71ea..0000000000
--- a/lib/kernel/test/kernel.dynspec
+++ /dev/null
@@ -1,57 +0,0 @@
-%% -*- erlang -*-
-%% You can test this file using this command.
-%%    file:script("kernel.dynspec", [{'Os',"Unix"}]).
-
-case Os of
-    "VxWorks" ->
-	FsCantHandle     = "VxWorks filesystem can't handle this",
-	FsOverload       = "VxWorks filesystem would overload",
-	CantHandle       = "VxWorks can't handle this",
-	SlaveMisadaption = "Test not adopted to slaves on different machine",
-	[{skip,{application_SUITE,
-	        "VxWorks: requires manual testing "++
-	        "(requires multiple nodes (OTP-1774))"}},
-	 {skip,{bif_SUITE, spawn_link_race1, "Known bug."}},
-	 {skip,{erl_distribution_SUITE, "VxWorks: More vx nodes needed"}},
-	 {skip,{file_SUITE,read_write_file,FsCantHandle}},
-	 {skip,{file_SUITE,cur_dir_0,FsCantHandle}},
-	 {skip,{file_SUITE,open1,FsCantHandle}},
-	 {skip,{file_SUITE,file_info_times,FsCantHandle}},
-	 {skip,{file_SUITE,file_write_file_info,FsCantHandle}},
-	 {skip,{file_SUITE,truncate,FsCantHandle}},
-	 {skip,{file_SUITE,rename,FsCantHandle}},
-	 {skip,{file_SUITE,e_delete,FsCantHandle}},
-	 {skip,{file_SUITE,e_rename,FsCantHandle}},
-	 {skip,{file_SUITE,delayed_write,FsCantHandle}},
-	 {skip,{file_SUITE,read_ahead,FsCantHandle}},
-	 {skip,{file_SUITE,segment_write,FsOverload}},
-	 {skip,{file_SUITE,segment_read,FsOverload}},
-	 {skip,{file_SUITE,compress_errors,FsCantHandle}},
-	 {skip,{global_SUITE,
-		"To heavy on slavenodes for VxWorks (and more)."}},
-	 {skip,{global_group_SUITE, "To heavy on slavenodes for VxWorks."}},
-	 {skip,{heart_SUITE, "Not for VxWorks heart, it's special"}},
-	 {skip,{init_SUITE,restart,"Uses peer nodes"}},
-	 {skip,{kernel_config_SUITE, "VxWorks does not support slave nodes"}},
-	 {skip,{os_SUITE,space_in_cwd,CantHandle}},
-	 {skip,{os_SUITE,space_in_name,CantHandle}},
-	 {skip,{os_SUITE,quoting,CantHandle}},
-	 {skip,{prim_file_SUITE,open1,FsCantHandle}},
-	 {skip,{prim_file_SUITE,compress_errors,FsCantHandle}},
-	 {skip,{seq_trace_SUITE,distributed_recv,SlaveMisadaption}},
-	 {skip,{seq_trace_SUITE,distributed_exit,SlaveMisadaption}}];
-    _ ->
-	[]
-end ++
-try gen_sctp:open() of
-    {ok,Socket} ->
-	gen_sctp:close(Socket),
-	[];
-    _ ->
-	[]
-catch
-    error:badarg ->
-	[{skip,{gen_sctp_SUITE,"SCTP not supported on this machine"}}];
-    _:_ ->
-	[]
-end.
diff --git a/lib/kernel/test/kernel.spec b/lib/kernel/test/kernel.spec
new file mode 100644
index 0000000000..62afc9f97b
--- /dev/null
+++ b/lib/kernel/test/kernel.spec
@@ -0,0 +1,4 @@
+{config, "../test_server/ts.config"}.
+{config, "../test_server/ts.unix.config"}.
+
+{suites,"../kernel_test", all}.
diff --git a/lib/kernel/test/kernel.spec.wxworks b/lib/kernel/test/kernel.spec.wxworks
new file mode 100644
index 0000000000..370e474e64
--- /dev/null
+++ b/lib/kernel/test/kernel.spec.wxworks
@@ -0,0 +1,63 @@
+%% -*- erlang -*-
+{suites,"kernel_test",all}.
+{skip_cases,"kernel_test",bif_SUITE,[spawn_link_race1],"Known bug."}.
+{skip_cases,"kernel_test",file_SUITE,
+            [read_write_file],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [cur_dir_0],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [open1],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [file_info_times],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [file_write_file_info],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [truncate],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [rename],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [e_delete],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [e_rename],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [delayed_write],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [read_ahead],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [segment_write],
+            "VxWorks filesystem would overload"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [segment_read],
+            "VxWorks filesystem would overload"}.
+{skip_cases,"kernel_test",file_SUITE,
+            [compress_errors],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",init_SUITE,[restart],"Uses peer nodes"}.
+{skip_cases,"kernel_test",os_SUITE,[space_in_cwd],"VxWorks can't handle this"}.
+{skip_cases,"kernel_test",os_SUITE,
+            [space_in_name],
+            "VxWorks can't handle this"}.
+{skip_cases,"kernel_test",os_SUITE,[quoting],"VxWorks can't handle this"}.
+{skip_cases,"kernel_test",prim_file_SUITE,
+            [open1],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",prim_file_SUITE,
+            [compress_errors],
+            "VxWorks filesystem can't handle this"}.
+{skip_cases,"kernel_test",seq_trace_SUITE,
+            [distributed_recv],
+            "Test not adopted to slaves on different machine"}.
+{skip_cases,"kernel_test",seq_trace_SUITE,
+            [distributed_exit],
+            "Test not adopted to slaves on different machine"}.
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index bb1d905de3..02b6edf0bd 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -20,15 +20,16 @@
 %%% Kernel application test suite.
 %%%-----------------------------------------------------------------
 -module(kernel_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
 
 % Test server specific exports
--export([all/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 % Test cases must be exported.
 -export([app_test/1]).
@@ -36,15 +37,31 @@
 %%
 %% all/1
 %%
-all(doc) ->
-    [];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [app_test].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/kernel/test/kernel_config_SUITE.erl b/lib/kernel/test/kernel_config_SUITE.erl
index c72fc3f02d..deef248956 100644
--- a/lib/kernel/test/kernel_config_SUITE.erl
+++ b/lib/kernel/test/kernel_config_SUITE.erl
@@ -18,23 +18,35 @@
 %%
 -module(kernel_config_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, sync/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, sync/1]).
 
--export([init/1, fini/1]).
+-export([init_per_suite/1, end_per_suite/1]).
 
-all(suite) ->
-    [{conf, init, [sync], fini}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-init(doc) -> [];
-init(suite) -> [];
-init(Config) when is_list(Config) ->
+all() -> 
+    [sync].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(doc) -> [];
+init_per_suite(suite) -> [];
+init_per_suite(Config) when is_list(Config) ->
     Config.
 
-fini(doc) -> [];
-fini(suite) -> [];
-fini(Config) when is_list(Config) ->
+end_per_suite(doc) -> [];
+end_per_suite(suite) -> [];
+end_per_suite(Config) when is_list(Config) ->
     stop_node(init_test),
     Config.
 
diff --git a/lib/kernel/test/myApp.erl b/lib/kernel/test/myApp.erl
index 2b92046141..26dc74f91b 100644
--- a/lib/kernel/test/myApp.erl
+++ b/lib/kernel/test/myApp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index ace9501d18..b08b12c978 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -18,15 +18,34 @@
 %%
 -module(os_SUITE).
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([space_in_cwd/1, quoting/1, space_in_name/1, bad_command/1,
 	 find_executable/1, unix_comment_in_command/1, evil/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [space_in_cwd, quoting, space_in_name, bad_command,
+     find_executable, unix_comment_in_command, evil].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [space_in_cwd, quoting, space_in_name, bad_command, find_executable,
-     unix_comment_in_command, evil].
 
 space_in_cwd(doc) ->
     "Test that executing a command in a current working directory "
@@ -156,6 +175,21 @@ find_executable(Config) when is_list(Config) ->
 	    ?line find_exe(Current, "my_batch", ".bat", Path),
 	    ok;
 	{unix, _}  -> 
+	    DataDir = ?config(data_dir, Config),
+
+	    %% Smoke test.
+	    case lib:progname() of
+		erl ->
+		    ?line ErlPath = os:find_executable("erl"),
+		    ?line true = is_list(ErlPath),
+		    ?line true = filelib:is_regular(ErlPath);
+		_ ->
+		    %% Don't bother -- the progname could include options.
+		    ok
+	    end,
+
+	    %% Never return a directory name.
+	    ?line false = os:find_executable("unix", [DataDir]),
 	    ok;
 	vxworks -> 
 	    ok
@@ -204,8 +238,9 @@ evil(Config) when is_list(Config) ->
 					      evil_loop(Parent, ?EVIL_LOOPS,N)
 				      end)
 		   end, lists:seq(1, ?EVIL_PROCS)),
-    Devil = spawn(fun () -> devil(hd(Ps), hd(lists:reverse(Ps))) end),
+    Devil = spawn_link(fun () -> devil(hd(Ps), hd(lists:reverse(Ps))) end),
     lists:foreach(fun (P) -> receive {P, done} -> ok end end, Ps),
+    unlink(Devil),
     exit(Devil, kill),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/kernel/test/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index 87ee951a0c..d41ad41350 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -20,7 +20,7 @@
 %% NB: The ?line macro cannot be used when testing the dictionary.
 
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(M(A,B),m(A,B,?MODULE,?LINE)).
 -ifdef(DEBUG).
@@ -29,22 +29,41 @@
 -define(DEBUGF(A,B), noop).
 -endif.
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 simple/1, complicated/1, heavy/1, info/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 -export([other_process/2]).
 
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(test_server:minutes(10)),
     [{watchdog, Dog} | Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [simple, complicated, heavy, info].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 simple(doc) ->
     ["Tests simple functionality in process dictionary."];
 simple(suite) ->
diff --git a/lib/kernel/test/pg2_SUITE.erl b/lib/kernel/test/pg2_SUITE.erl
index df28dcf447..5dc32440a0 100644
--- a/lib/kernel/test/pg2_SUITE.erl
+++ b/lib/kernel/test/pg2_SUITE.erl
@@ -20,14 +20,16 @@
 %%-----------------------------------------------------------------
 -module(pg2_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(datadir, ?config(data_dir, Config)).
 -define(privdir, ?config(priv_dir, Config)).
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([tickets/1,
-             otp_7277/1, otp_8259/1, otp_8653/1,
+-export([
+	 otp_7277/1, otp_8259/1, otp_8653/1,
          compat/1, basic/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
@@ -44,16 +46,33 @@ init_per_testcase(Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{?TESTCASE, Case}, {watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, _Config) ->
+end_per_testcase(_Case, _Config) ->
     Dog = ?config(watchdog, _Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    [tickets].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, tickets}].
+
+groups() -> 
+    [{tickets, [],
+      [otp_7277, otp_8259, otp_8653, compat, basic]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-tickets(suite) ->
-    [otp_7277, otp_8259, otp_8653, compat, basic].
 
 otp_7277(doc) ->
     "OTP-7277. Bugfix leave().";
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 21bdc06fdc..3013af70f6 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -17,40 +17,40 @@
 %% %CopyrightEnd%
 %%
 -module(prim_file_SUITE).
--export([all/1,
-	init/1, fini/1,
-	read_write_file/1, dirs/1, files/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 read_write_file/1]).
 -export([cur_dir_0a/1, cur_dir_0b/1, 
 	 cur_dir_1a/1, cur_dir_1b/1, 
 	 make_del_dir_a/1, make_del_dir_b/1,
-	 pos/1, pos1/1, pos2/1]).
+	 pos1/1, pos2/1]).
 -export([close/1, 
 	 delete_a/1, delete_b/1]).
--export([open/1, open1/1, modes/1]).
--export([file_info/1, 
-	 file_info_basic_file_a/1, file_info_basic_file_b/1,
-	 file_info_basic_directory_a/1, file_info_basic_directory_b/1,
-	 file_info_bad_a/1, file_info_bad_b/1, 
-	 file_info_times_a/1, file_info_times_b/1, 
-	 file_write_file_info_a/1, file_write_file_info_b/1]).
+-export([ open1/1, modes/1]).
+-export([ 
+	  file_info_basic_file_a/1, file_info_basic_file_b/1,
+	  file_info_basic_directory_a/1, file_info_basic_directory_b/1,
+	  file_info_bad_a/1, file_info_bad_b/1, 
+	  file_info_times_a/1, file_info_times_b/1, 
+	  file_write_file_info_a/1, file_write_file_info_b/1]).
 -export([rename_a/1, rename_b/1, 
 	 access/1, truncate/1, datasync/1, sync/1,
-	 read_write/1, pread_write/1, append/1]).
--export([errors/1, e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
+	 read_write/1, pread_write/1, append/1, exclusive/1]).
+-export([ e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
 
--export([compression/1, read_not_really_compressed/1,
-	 read_compressed/1, write_compressed/1,
-	 compress_errors/1]).
+-export([ read_not_really_compressed/1,
+	  read_compressed/1, write_compressed/1,
+	  compress_errors/1]).
 
--export([links/1, 
-	 make_link_a/1, make_link_b/1,
-	 read_link_info_for_non_link/1, 
-	 symlinks_a/1, symlinks_b/1,
-	 list_dir_limit/1]).
+-export([ 
+	  make_link_a/1, make_link_b/1,
+	  read_link_info_for_non_link/1, 
+	  symlinks_a/1, symlinks_b/1,
+	  list_dir_limit/1]).
 
 -export([advise/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -define(PRIM_FILE, prim_file).
@@ -67,14 +67,47 @@
 	    _ ->  apply(?PRIM_FILE, F, [H | A])
 	end).
 
-all(suite) -> {req, [kernel],
-	       {conf, init,
-		[read_write_file, dirs, files, 
-		 delete_a, delete_b, rename_a, rename_b, errors,
-		 compression, links, list_dir_limit],
-		fini}}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [read_write_file, {group, dirs}, {group, files},
+     delete_a, delete_b, rename_a, rename_b, {group, errors},
+     {group, compression}, {group, links}, list_dir_limit].
+
+groups() -> 
+    [{dirs, [],
+      [make_del_dir_a, make_del_dir_b, cur_dir_0a, cur_dir_0b,
+       cur_dir_1a, cur_dir_1b]},
+     {files, [],
+      [{group, open}, {group, pos}, {group, file_info},
+       truncate, sync, datasync, advise]},
+     {open, [],
+      [open1, modes, close, access, read_write, pread_write,
+       append, exclusive]},
+     {pos, [], [pos1, pos2]},
+     {file_info, [],
+      [file_info_basic_file_a, file_info_basic_file_b,
+       file_info_basic_directory_a,
+       file_info_basic_directory_b, file_info_bad_a,
+       file_info_bad_b, file_info_times_a, file_info_times_b,
+       file_write_file_info_a, file_write_file_info_b]},
+     {errors, [],
+      [e_delete, e_rename, e_make_dir, e_del_dir]},
+     {compression, [],
+      [read_compressed, read_not_really_compressed,
+       write_compressed, compress_errors]},
+     {links, [],
+      [make_link_a, make_link_b, read_link_info_for_non_link,
+       symlinks_a, symlinks_b]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-init(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
 	    Priv = ?config(priv_dir, Config),
@@ -91,7 +124,7 @@ init(Config) when is_list(Config) ->
 	    Config
     end.
 
-fini(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
 	    os:cmd("subst z: /d");
@@ -190,9 +223,6 @@ read_write_file(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-dirs(suite) -> [make_del_dir_a, make_del_dir_b, 
-		cur_dir_0a, cur_dir_0b, 
-		cur_dir_1a, cur_dir_1b].
 
 make_del_dir_a(suite) -> [];
 make_del_dir_a(doc) -> [];
@@ -382,10 +412,7 @@ win_cur_dir_1(_Config, Handle) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-files(suite) -> [open,pos,file_info,truncate,sync,datasync,advise].
 
-open(suite) -> [open1,modes,close,access,read_write,
-	       pread_write,append].
 
 open1(suite) -> [];
 open1(doc) -> [];
@@ -610,9 +637,24 @@ append(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
+exclusive(suite) -> [];
+exclusive(doc) -> "Test exclusive access to a file.";
+exclusive(Config) when is_list(Config) ->
+    ?line Dog = test_server:timetrap(test_server:seconds(5)),
+    ?line RootDir = ?config(priv_dir,Config),
+    ?line NewDir = filename:join(RootDir,
+				 atom_to_list(?MODULE)
+				 ++"_exclusive"),
+    ?line ok = ?PRIM_FILE:make_dir(NewDir),
+    ?line Name = filename:join(NewDir, "ex_file.txt"),
+    ?line {ok,Fd} = ?PRIM_FILE:open(Name, [write, exclusive]),
+    ?line {error, eexist} = ?PRIM_FILE:open(Name, [write, exclusive]),
+    ?line ok = ?PRIM_FILE:close(Fd),
+    ?line test_server:timetrap_cancel(Dog),
+    ok.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-pos(suite) -> [pos1,pos2].
 
 pos1(suite) -> [];
 pos1(doc) -> [];
@@ -700,12 +742,6 @@ pos2(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
-file_info(suite) -> [file_info_basic_file_a, file_info_basic_file_b,
-		     file_info_basic_directory_a, 
-		     file_info_basic_directory_b,
-		     file_info_bad_a, file_info_bad_b, 
-		     file_info_times_a, file_info_times_b, 
-		     file_write_file_info_a, file_write_file_info_b].
 
 file_info_basic_file_a(suite) -> [];
 file_info_basic_file_a(doc) -> [];
@@ -1282,7 +1318,6 @@ rename(Config, Handle, Suffix) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-errors(suite) -> [e_delete, e_rename, e_make_dir, e_del_dir].
 
 e_delete(suite) -> [];
 e_delete(doc) -> [];
@@ -1534,8 +1569,6 @@ e_del_dir(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
-compression(suite) -> [read_compressed, read_not_really_compressed,
-		       write_compressed, compress_errors].
 
 %% Trying reading and positioning from a compressed file.
 
@@ -1688,11 +1721,6 @@ compress_errors(Config) when is_list(Config) ->
     ?line test_server:timetrap_cancel(Dog),
     ok.
 
-links(doc) -> "Test the link functions.";
-links(suite) -> 
-    [make_link_a, make_link_b, 
-     read_link_info_for_non_link, 
-     symlinks_a, symlinks_b].
 
 make_link_a(doc) -> "Test creating a hard link.";
 make_link_a(suite) -> [];
diff --git a/lib/kernel/test/ram_file_SUITE.erl b/lib/kernel/test/ram_file_SUITE.erl
index 798a37d3dc..5f9ccaa34f 100644
--- a/lib/kernel/test/ram_file_SUITE.erl
+++ b/lib/kernel/test/ram_file_SUITE.erl
@@ -19,14 +19,15 @@
 
 -module(ram_file_SUITE).
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 %% init/1, fini/1,
-	 init_per_testcase/2, fin_per_testcase/2]).
+	 init_per_testcase/2, end_per_testcase/2]).
 -export([open_modes/1, open_old_modes/1, pread_pwrite/1, position/1,
 	 truncate/1, sync/1, get_set_file/1, compress/1, uuencode/1,
 	 large_file_errors/1, large_file_light/1, large_file_heavy/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -define(FILE_MODULE, file).         % Name of module to test
@@ -34,11 +35,29 @@
 
 %%--------------------------------------------------------------------------
 
-all(suite) ->
-    [open_modes, open_old_modes, pread_pwrite, position, 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [open_modes, open_old_modes, pread_pwrite, position,
      truncate, sync, get_set_file, compress, uuencode,
      large_file_errors, large_file_light, large_file_heavy].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Time = 
 	case Func of
@@ -51,7 +70,7 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     %% error_logger:info_msg("~p:~p *****~n", [?MODULE, Func]),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     %% error_logger:info_msg("~p:~p END *****~n", [?MODULE, Func]),
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
diff --git a/lib/kernel/test/rpc_SUITE.erl b/lib/kernel/test/rpc_SUITE.erl
index 2b7de40797..895441251a 100644
--- a/lib/kernel/test/rpc_SUITE.erl
+++ b/lib/kernel/test/rpc_SUITE.erl
@@ -18,7 +18,8 @@
 %%
 -module(rpc_SUITE).
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([call/1, block_call/1, multicall/1, multicall_timeout/1, 
 	 multicall_dies/1, multicall_node_dies/1,
 	 called_dies/1, called_node_dies/1, 
@@ -26,13 +27,31 @@
 
 -export([suicide/2, suicide/3, f/0, f2/0]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [call, block_call, multicall, multicall_timeout,
+     multicall_dies, multicall_node_dies, called_dies,
+     called_node_dies, called_throws, call_benchmark,
+     async_call].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [call, block_call, multicall, multicall_timeout, 
-     multicall_dies, multicall_node_dies,
-     called_dies, called_node_dies, 
-     called_throws, call_benchmark, async_call].
 
 
 call(doc) -> "Test different rpc calls";
diff --git a/lib/kernel/test/seq_trace_SUITE.erl b/lib/kernel/test/seq_trace_SUITE.erl
index b557c7fb1e..9637e18959 100644
--- a/lib/kernel/test/seq_trace_SUITE.erl
+++ b/lib/kernel/test/seq_trace_SUITE.erl
@@ -18,7 +18,9 @@
 %%
 -module(seq_trace_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2]).
+-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,
 	 send/1, distributed_send/1, recv/1, distributed_recv/1,
 	 trace_exit/1, distributed_exit/1, call/1, port/1,
@@ -29,21 +31,40 @@
 	 start_tracer/0, stop_tracer/1, 
 	 do_match_set_seq_token/1, do_gc_seq_token/1, countdown_start/2]).
 
-%-define(line_trace, 1).
--include("test_server.hrl").
+						%-define(line_trace, 1).
+-include_lib("test_server/include/test_server.hrl").
 
 -define(default_timeout, ?t:minutes(1)).
 
-all(suite) -> [token_set_get, tracer_set_get, print, 
-	       send, distributed_send, recv, distributed_recv, 
-	       trace_exit, distributed_exit, call, port,
-	       match_set_seq_token, gc_seq_token].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [token_set_get, tracer_set_get, print, send,
+     distributed_send, recv, distributed_recv, trace_exit,
+     distributed_exit, call, port, match_set_seq_token,
+     gc_seq_token].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog = test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/kernel/test/topApp.erl b/lib/kernel/test/topApp.erl
index acf98e6da0..f44e99f738 100644
--- a/lib/kernel/test/topApp.erl
+++ b/lib/kernel/test/topApp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/kernel/test/topApp2.erl b/lib/kernel/test/topApp2.erl
index 4587910ff3..b791d4a914 100644
--- a/lib/kernel/test/topApp2.erl
+++ b/lib/kernel/test/topApp2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/kernel/test/topApp3.erl b/lib/kernel/test/topApp3.erl
index 1bb6f2f31a..456ef5b2fb 100644
--- a/lib/kernel/test/topApp3.erl
+++ b/lib/kernel/test/topApp3.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/kernel/test/wrap_log_reader_SUITE.erl b/lib/kernel/test/wrap_log_reader_SUITE.erl
index ceac593e44..b4a9b578eb 100644
--- a/lib/kernel/test/wrap_log_reader_SUITE.erl
+++ b/lib/kernel/test/wrap_log_reader_SUITE.erl
@@ -28,31 +28,53 @@
 -define(config(X,Y), foo).
 -define(t,test_server).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(format(S, A), ok).
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -endif.
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 no_file/1,
-	 one/1, one_empty/1, one_filled/1,
-	 two/1, two_filled/1,
-	 four/1, four_filled/1,
-	 wrap/1, wrap_filled/1,
+	 one_empty/1, one_filled/1,
+	 two_filled/1,
+	 four_filled/1,
+	 wrap_filled/1,
 	 wrapping/1,
 	 external/1,
 	 error/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [no_file, {group, one}, {group, two}, {group, four},
+     {group, wrap}, wrapping, external, error].
+
+groups() -> 
+    [{one, [], [one_empty, one_filled]},
+     {two, [], [two_filled]}, {four, [], [four_filled]},
+     {wrap, [], [wrap_filled]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [no_file, one, two, four, wrap, wrapping, external, error].
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Dog=?t:timetrap(?t:seconds(60)),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Func, _Config) ->
+end_per_testcase(_Func, _Config) ->
     Dog=?config(watchdog, _Config),
     ?t:timetrap_cancel(Dog).
 
@@ -76,8 +98,6 @@ no_file(Conf) when is_list(Conf) ->
     delete_files(File),
     ok.
 
-one(suite) -> [one_empty, one_filled];
-one(doc) -> ["One index file"].
 
 one_empty(suite) -> [];
 one_empty(doc) -> ["One empty index file"];
@@ -139,8 +159,6 @@ test_one(File) ->
 		    {chunk, 1, ["first round, two"]}, eof], wlt, ?LINE),
     ok.
 
-two(suite) -> [two_filled];
-two(doc) -> ["Two index files"].
 
 two_filled(suite) -> [];
 two_filled(doc) -> ["Two filled index files"];
@@ -181,8 +199,6 @@ test_two(File) ->
 		    {chunk, 2, ["first round, 12"]}, eof], wlt, ?LINE),
     ok.
 
-four(suite) -> [four_filled];
-four(doc) -> ["Four index files"].
 
 four_filled(suite) -> [];
 four_filled(doc) -> ["Four filled index files"];
@@ -226,8 +242,6 @@ test_four(File) ->
 		    {chunk, 2, ["first round, 42"]}, eof], wlt, ?LINE),
     ok.
 
-wrap(suite) -> [wrap_filled];
-wrap(doc) -> ["Wrap index file, first wrapping"].
 
 wrap_filled(suite) -> [];
 wrap_filled(doc) -> ["First wrap, open, filled index file"];
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index f20c9a176b..170f685390 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -19,7 +19,7 @@
 
 -module(zlib_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -compile(export_all).
 
@@ -48,7 +48,7 @@
 init_per_testcase(_Func, Config) ->
     Dog = test_server:timetrap(test_server:seconds(60)),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
@@ -69,33 +69,40 @@ error(Format, Args, File, Line) ->
 %%     end,
 %%     log("<>ERROR<>~n" ++ Format, Args, File, Line).
 
-all(suite) -> 
-    [api, examples, func, smp, otp_7359].
-
-api(doc) -> "Basic the api tests";
-api(suite) ->
-    [api_open_close,
-     api_deflateInit,
-     api_deflateSetDictionary,
-     api_deflateReset,
-     api_deflateParams,
-     api_deflate,
-     api_deflateEnd,
-     api_inflateInit,
-     api_inflateSetDictionary,
-     api_inflateSync,
-     api_inflateReset,
-     api_inflate,
-     api_inflateEnd,
-     api_setBufsz,
-     api_getBufsz,
-     api_crc32,
-     api_adler32,
-     api_getQSize,
-     api_un_compress,
-     api_un_zip,
-%     api_g_un_zip_file,
-     api_g_un_zip].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, api}, {group, examples}, {group, func}, smp,
+     otp_7359].
+
+groups() -> 
+    [{api, [],
+      [api_open_close, api_deflateInit,
+       api_deflateSetDictionary, api_deflateReset,
+       api_deflateParams, api_deflate, api_deflateEnd,
+       api_inflateInit, api_inflateSetDictionary,
+       api_inflateSync, api_inflateReset, api_inflate,
+       api_inflateEnd, api_setBufsz, api_getBufsz, api_crc32,
+       api_adler32, api_getQSize, api_un_compress, api_un_zip,
+       api_g_un_zip]},
+     {examples, [], [intro]},
+     {func, [],
+      [zip_usage, gz_usage, gz_usage2, compress_usage,
+       dictionary_usage, large_deflate, crc, adler]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 
 api_open_close(doc) -> "Test open/0 and close/1";
 api_open_close(suite) -> [];
@@ -517,11 +524,6 @@ bad_len_data() ->
     %% zlib:zip(<<42>>), one byte changed.
     <<31,139,8,0,0,0,0,0,0,3,211,2,0,91,38,185,9,2,0,0,0>>.
 
-examples(doc) ->  "Test the doc examples";
-examples(suite) -> 
-    [
-     intro
-    ].
 
 intro(suite) -> [];
 intro(doc) -> "";
@@ -551,15 +553,6 @@ intro(Config) when is_list(Config) ->
     Orig = list_to_binary(lists:duplicate(5, D)),
     ?m(Orig, zlib:uncompress(Res)).
 
-func(doc) ->  "Test the functionality";
-func(suite) -> 
-    [zip_usage, gz_usage, gz_usage2, compress_usage,
-     dictionary_usage, 
-     large_deflate, 
-     %%     inflateSync,
-     crc,
-     adler
-    ].
 
 large_deflate(doc) -> "Test deflate large file, which had a bug reported on erlang-bugs";
 large_deflate(suite) -> [];
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 64a358f114..e33b90a274 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1,20 +1 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2010. 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%
-# 
-
-KERNEL_VSN = 2.14
+KERNEL_VSN = 2.14.3
diff --git a/lib/megaco/Makefile b/lib/megaco/Makefile
index d4698eb558..10efaf667f 100644
--- a/lib/megaco/Makefile
+++ b/lib/megaco/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2009. All Rights Reserved.
+# Copyright Ericsson AB 1999-2011. 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
@@ -97,12 +97,19 @@ endif
 CONFIGURE_OPTS = $(FLEX_SCANNER_LINENO_ENABLER) $(FLEX_SCANNER_REENTRANT_ENABLER)
 
 
+MEGACO_DIA_PLT     = ./priv/megaco.plt
+MEGACO_DIA_PLT_LOG = $(basename $(MEGACO_DIA_PLT)).dialyzer_plt_log
+MEGACO_DIA_LOG     = $(basename $(MEGACO_DIA_PLT)).dialyzer_log
+
 
 # ----------------------------------------------------
 # Default Subdir Targets
 # ----------------------------------------------------
 include $(ERL_TOP)/make/otp_subdir.mk
 
+.PHONY: reconf conf dconf econf configure setup info version \
+	app_install dialyzer
+
 reconf:
 	(cd $(ERL_TOP) && \
 		./otp_build autoconf && \
@@ -132,6 +139,10 @@ info:
 	@echo "APP_TAR_FILE:    $(APP_TAR_FILE)"
 	@echo "OTP_INSTALL_DIR: $(OTP_INSTALL_DIR)"
 	@echo "APP_INSTALL_DIR: $(APP_INSTALL_DIR)"
+	@echo ""
+	@echo "MEGACO_PLT     = $(MEGACO_PLT)"
+	@echo "MEGACO_DIA_LOG = $(MEGACO_DIA_LOG)"
+	@echo ""
 
 version:
 	@echo "$(VSN)"
@@ -190,9 +201,18 @@ tar: $(APP_TAR_FILE)
 $(APP_TAR_FILE): $(APP_DIR)
 	(cd $(APP_RELEASE_DIR); gtar zcf $(APP_TAR_FILE) $(DIR_NAME))
 
-dialyzer: 
-	(cd ./ebin; \
-         dialyzer --build_plt \
-                  --output_plt ../priv/megaco.plt \
-                  -r ../../megaco/ebin \
-                  --verbose)
+dialyzer_plt: $(MEGACO_DIA_PLT)
+
+$(MEGACO_DIA_PLT): 
+	@echo "Building megaco plt file"
+	@dialyzer --build_plt \
+                  --output_plt $@ \
+                  -r ../megaco/ebin \
+                  -o $(MEGACO_DIA_PLT_LOG) \
+                  --verbose
+
+dialyzer: $(MEGACO_DIA_PLT)
+	(dialyzer --plt $< \
+                  -o $(MEGACO_DIA_LOG) \
+                  ../megaco/ebin \
+                  && (shell cat $(MEGACO_DIA_LOG)))
diff --git a/lib/megaco/doc/src/Makefile b/lib/megaco/doc/src/Makefile
index 2355a1b8b9..4b3c117b20 100644
--- a/lib/megaco/doc/src/Makefile
+++ b/lib/megaco/doc/src/Makefile
@@ -125,6 +125,12 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
+$(HTMLDIR)/%.jpg: %.jpg
+	$(INSTALL_DATA) $< $@
+
+$(HTMLDIR)/%.png: %.png
+	$(INSTALL_DATA) $< $@
+
 ifdef DOCSUPPORT
 
 docs: pdf html man
@@ -135,7 +141,7 @@ $(TOP_PDF_FILE): $(XML_FILES)
 
 pdf: $(TOP_PDF_FILE)
 
-html: gifs $(HTML_REF_MAN_FILE)
+html: imgs $(HTML_REF_MAN_FILE)
 
 clean clean_docs: clean_html clean_man
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
@@ -149,7 +155,7 @@ else
 ifeq ($(DOCTYPE),ps)
 docs: ps
 else
-docs: html gifs man
+docs: html imgs man
 endif
 endif
 
@@ -157,7 +163,7 @@ pdf: $(TOP_PDF_FILE)
 
 ps: $(TOP_PS_FILE)
 
-html: gifs $(HTML_FILES) $(TOP_HTML_FILES)
+html: imgs $(HTML_FILES) $(TOP_HTML_FILES)
 
 mhtml: html $(HTML_REF3_FILES) $(HTML_CHAPTER_FILES)
 
@@ -182,7 +188,7 @@ clean_man:
 clean_html:
 	rm -rf $(HTMLDIR)/*
 
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
+imgs: $(IMG_FILES:%=$(HTMLDIR)/%)
 
 man: $(MAN3_FILES) 
 
@@ -208,7 +214,7 @@ info:
 	@echo "XML_REF3_FILES        = $(XML_REF3_FILES)"
 	@echo "XML_CHAPTER_FILES     = $(XML_CHAPTER_FILES)"
 	@echo ""
-	@echo "GIF_FILES             = $(GIF_FILES)"
+	@echo "IMG_FILES             = $(IMG_FILES)"
 	@echo ""
 	@echo "TEX_FILES_USERS_GUIDE = $(TEX_FILES_USERS_GUIDE)"
 	@echo "TEX_FILES_REF_MAN     = $(TEX_FILES_REF_MAN)"
@@ -258,7 +264,7 @@ release_docs_spec: ps
 else
 release_docs_spec: docs
 	$(INSTALL_DIR)  $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
+	$(INSTALL_DATA) $(IMG_FILES) $(EXTRA_FILES) $(HTML_FILES) \
 		$(RELSYSDIR)/doc/html
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
 	$(INSTALL_DIR)  $(RELEASE_PATH)/man/man3
diff --git a/lib/megaco/doc/src/files.mk b/lib/megaco/doc/src/files.mk
index debc5d278d..efacb7e422 100644
--- a/lib/megaco/doc/src/files.mk
+++ b/lib/megaco/doc/src/files.mk
@@ -1,20 +1,20 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2001-2010. 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%
 
 XML_APPLICATION_FILES = \
@@ -56,7 +56,7 @@ XML_CHAPTER_FILES = \
 
 BOOK_FILES = book.xml
 
-GIF_FILES = \
+IMG_FILES = \
 	single_node_config.gif \
 	distr_node_config.gif \
 	megaco_sys_arch.gif \
@@ -70,4 +70,4 @@ GIF_FILES = \
 	MG_startup_call_flow.gif \
 	call_flow.gif \
 	call_flow_cont.gif \
-        mstone1.gif
+        mstone1.jpg
diff --git a/lib/megaco/doc/src/megaco.xml b/lib/megaco/doc/src/megaco.xml
index ae9e250965..b9bf414299 100644
--- a/lib/megaco/doc/src/megaco.xml
+++ b/lib/megaco/doc/src/megaco.xml
@@ -662,7 +662,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
             <taglist>
               <tag><c><![CDATA[none]]></c></tag>
               <item>
-                <p>Do not segment outgoing reply messages. This is usefull when
+                <p>Do not segment outgoing reply messages. This is useful when
                   either it is known that messages are never to large or
                   that the transport protocol can handle such things
                   on its own (e.g. TCP or SCTP).</p>
@@ -1182,7 +1182,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
             <taglist>
               <tag><c><![CDATA[none]]></c></tag>
               <item>
-                <p>Do not segment outgoing reply messages. This is usefull when
+                <p>Do not segment outgoing reply messages. This is useful when
                   either it is known that messages are never to large or
                   that the transport protocol can handle such things
                   on its own (e.g. TCP or SCTP).</p>
diff --git a/lib/megaco/doc/src/megaco_flex_scanner.xml b/lib/megaco/doc/src/megaco_flex_scanner.xml
index eb206e5d13..18c40bb71a 100644
--- a/lib/megaco/doc/src/megaco_flex_scanner.xml
+++ b/lib/megaco/doc/src/megaco_flex_scanner.xml
@@ -128,7 +128,7 @@ megaco_version() = integer() >= 1
         <v>Boolean = boolean()</v>
       </type>
       <desc>
-        <p>Checks if a port is a flex scanner port or not (usefull when 
+        <p>Checks if a port is a flex scanner port or not (useful when
           if a port exits). </p>
 
         <marker id="scan"></marker>
diff --git a/lib/megaco/doc/src/megaco_performance.xml b/lib/megaco/doc/src/megaco_performance.xml
index 72b5c156ba..eb3d852a19 100644
--- a/lib/megaco/doc/src/megaco_performance.xml
+++ b/lib/megaco/doc/src/megaco_performance.xml
@@ -50,9 +50,15 @@
       of these configurations for each codec. The figures presented are 
       the average of all used messages.</p>
 
-    <p>For comparison, also included are performance figures 
-      where the flex driver was built as <c>non-reentrant</c> flex
-      (figures within parenthesis). </p>
+    <p>For comparison, also included are first, performance figures with
+      megaco (including the measurement software) and asn1 applications 
+      hipe-compiled (second figure in the time columns, note that per bin 
+      decode had some issues so those figures are not included), and second, 
+      performance figures where the flex driver was built as 
+      <c>non-reentrant</c> flex
+      (third figure in the time columns, 
+      only valid for text codecs using the flex-scanner, 
+      figures within parenthesis). </p>
 
     <table>
       <row>
@@ -67,122 +73,122 @@
       <row>
         <cell align="left" valign="middle">pretty</cell>
         <cell align="right" valign="middle">336</cell>
-        <cell align="right" valign="middle">22</cell>
-        <cell align="right" valign="middle">76</cell>
-        <cell align="right" valign="middle">98</cell>
+        <cell align="right" valign="middle">20 / 13</cell>
+        <cell align="right" valign="middle">75 / 40</cell>
+        <cell align="right" valign="middle">95 / 53</cell>
       </row>
       <row>
         <cell align="left" valign="middle">pretty [flex]</cell>
         <cell align="right" valign="middle">336</cell>
-        <cell align="right" valign="middle">22 (22)</cell>
-        <cell align="right" valign="middle">41 (40)</cell>
-        <cell align="right" valign="middle">63 (62)</cell>
+        <cell align="right" valign="middle">20 / 13 / 20</cell>
+        <cell align="right" valign="middle">39 / 33 / 38</cell>
+        <cell align="right" valign="middle">59 / 46 / 58</cell>
       </row>
 
       <!-- COMPACT -->
       <row>
         <cell align="left" valign="middle">compact</cell>
         <cell align="right" valign="middle">181</cell>
-        <cell align="right" valign="middle">19</cell>
-        <cell align="right" valign="middle">63</cell>
-        <cell align="right" valign="middle">82</cell>
+        <cell align="right" valign="middle">17 / 10</cell>
+        <cell align="right" valign="middle">62 / 35</cell>
+        <cell align="right" valign="middle">79 / 45</cell>
       </row>
       <row>
         <cell align="left" valign="middle">compact [flex]</cell>
         <cell align="right" valign="middle">181</cell>
-        <cell align="right" valign="middle">19 (19)</cell>
-        <cell align="right" valign="middle">38 (36)</cell>
-        <cell align="right" valign="middle">57 (55)</cell>
+        <cell align="right" valign="middle">17 / 10 / 17</cell>
+        <cell align="right" valign="middle">37 / 31 / 36</cell>
+	<cell align="right" valign="middle">54 / 41 / 53</cell>
       </row>
 
       <!-- PER -->
       <row>
         <cell align="left" valign="middle">per bin</cell>
         <cell align="right" valign="middle">91</cell>
-        <cell align="right" valign="middle">63</cell>
-        <cell align="right" valign="middle">69</cell>
-        <cell align="right" valign="middle">132</cell>
+        <cell align="right" valign="middle">60 / 29</cell>
+        <cell align="right" valign="middle">64 / -</cell>
+        <cell align="right" valign="middle">124 / -</cell>
       </row>
       <row>
         <cell align="left" valign="middle">per bin [driver]</cell>
         <cell align="right" valign="middle">91</cell>
-        <cell align="right" valign="middle">43</cell>
-        <cell align="right" valign="middle">45</cell>
-        <cell align="right" valign="middle">88</cell>
+        <cell align="right" valign="middle">39 / 24</cell>
+        <cell align="right" valign="middle">42 / 26</cell>
+        <cell align="right" valign="middle">81 / 50</cell>
       </row>
       <row>
         <cell align="left" valign="middle">per bin [native]</cell>
         <cell align="right" valign="middle">91</cell>
-        <cell align="right" valign="middle">47</cell>
-        <cell align="right" valign="middle">51</cell>
-        <cell align="right" valign="middle">99</cell>
+        <cell align="right" valign="middle">45 / 21</cell>
+        <cell align="right" valign="middle">48 / -</cell>
+        <cell align="right" valign="middle">93 / -</cell>
       </row>
       <row>
         <cell align="left" valign="middle">per bin [driver,native]</cell>
         <cell align="right" valign="middle">91</cell>
-        <cell align="right" valign="middle">26</cell>
-        <cell align="right" valign="middle">29</cell>
-        <cell align="right" valign="middle">55</cell>
+        <cell align="right" valign="middle">25 / 15</cell>
+        <cell align="right" valign="middle">27 / 18</cell>
+        <cell align="right" valign="middle">52 / 33</cell>
       </row>
 
       <!-- BER -->
       <row>
         <cell align="left" valign="middle">ber bin</cell>
         <cell align="right" valign="middle">165</cell>
-        <cell align="right" valign="middle">35</cell>
-        <cell align="right" valign="middle">42</cell>
-        <cell align="right" valign="middle">77</cell>
+        <cell align="right" valign="middle">32 / 19</cell>
+        <cell align="right" valign="middle">38 / 21</cell>
+        <cell align="right" valign="middle">70 / 40</cell>
       </row>
       <row>
         <cell align="left" valign="middle">ber bin [driver]</cell>
         <cell align="right" valign="middle">165</cell>
-        <cell align="right" valign="middle">35</cell>
-        <cell align="right" valign="middle">37</cell>
-        <cell align="right" valign="middle">72</cell>
+        <cell align="right" valign="middle">32 / 19</cell>
+        <cell align="right" valign="middle">33 / 20</cell>
+        <cell align="right" valign="middle">65 / 39</cell>
       </row>
       <row>
         <cell align="left" valign="middle">ber bin [native]</cell>
         <cell align="right" valign="middle">165</cell>
-        <cell align="right" valign="middle">19</cell>
-        <cell align="right" valign="middle">26</cell>
-        <cell align="right" valign="middle">45</cell>
+        <cell align="right" valign="middle">17 / 11</cell>
+        <cell align="right" valign="middle">25 / 13</cell>
+        <cell align="right" valign="middle">42 / 24</cell>
       </row>
       <row>
         <cell align="left" valign="middle">ber bin [driver,native]</cell>
         <cell align="right" valign="middle">165</cell>
-        <cell align="right" valign="middle">19</cell>
-        <cell align="right" valign="middle">20</cell>
-        <cell align="right" valign="middle">39</cell>
+        <cell align="right" valign="middle">17 / 11</cell>
+        <cell align="right" valign="middle">17 / 12</cell>
+        <cell align="right" valign="middle">34 / 23</cell>
       </row>
 
       <!-- ERLANG -->
       <row>
         <cell align="left" valign="middle">erl_dist</cell>
         <cell align="right" valign="middle">875</cell>
-        <cell align="right" valign="middle">5</cell>
-        <cell align="right" valign="middle">10</cell>
-        <cell align="right" valign="middle">15</cell>
+        <cell align="right" valign="middle">5  /  5</cell>
+        <cell align="right" valign="middle">10 / 10</cell>
+        <cell align="right" valign="middle">15 / 15</cell>
       </row>
       <row>
         <cell align="left" valign="middle">erl_dist [megaco_compressed]</cell>
         <cell align="right" valign="middle">405</cell>
-        <cell align="right" valign="middle">6</cell>
-        <cell align="right" valign="middle">7</cell>
-        <cell align="right" valign="middle">13</cell>
+        <cell align="right" valign="middle">6  / 4</cell>
+        <cell align="right" valign="middle">7  / 4</cell>
+        <cell align="right" valign="middle">13 / 8</cell>
       </row>
       <row>
         <cell align="left" valign="middle">erl_dist [compressed]</cell>
         <cell align="right" valign="middle">345</cell>
-        <cell align="right" valign="middle">86</cell>
-        <cell align="right" valign="middle">21</cell>
-        <cell align="right" valign="middle">107</cell>
+        <cell align="right" valign="middle">47 / 47</cell>
+        <cell align="right" valign="middle">20 / 20</cell>
+        <cell align="right" valign="middle">67 / 67</cell>
       </row>
       <row>
         <cell align="left" valign="middle">erl_dist [megaco_compressed,compressed]</cell>
         <cell align="right" valign="middle">200</cell>
-        <cell align="right" valign="middle">71</cell>
-        <cell align="right" valign="middle">12</cell>
-        <cell align="right" valign="middle">83</cell>
+        <cell align="right" valign="middle">34 / 33</cell>
+        <cell align="right" valign="middle">11 /  9</cell>
+        <cell align="right" valign="middle">45 / 42</cell>
       </row>
 
       <tcaption>Codec performance</tcaption>
@@ -201,8 +207,8 @@
     <p>When running SMP erlang on a multi-core machine the "throughput"
       is significantly higher. The mstone1 test is an extreme test,
       but it shows what is gained by using the reentrant flex-scanner. </p>
-    <image file="mstone1.gif">
-        <icaption>MStone1 with mstone1.sh -d flex -s 8</icaption>
+    <image file="mstone1.jpg">
+        <icaption>MStone1 with mstone1.sh -d flex -s 4</icaption>
     </image>
   </section>
 
@@ -276,10 +282,10 @@ MEGACO/1 [124.124.124.222]
   <section>
     <title>Setup</title>
     <p>The measurements has been performed on a 
-      Dell PowerEdge 1950iii with 
-      2* Intel Xeon L5430 @ 2.66 GHz, with 8 GB memory and 
-      running SLES 10 SP2 x86_64, kernel 2.6.16.60-0.34-smp. 
-      Software versions was open source OTP R13B and megaco-3.11.</p>
+      HP xw4600 Workstation with 
+      a Intel(R) Core(TM)2 Quad CPU Q9550 @ 2.83GHz, with 4 GB memory and 
+      running Ubuntu 10.04 x86_64, kernel 2.6.32-22-generic. 
+      Software versions was open source OTP R13B04 (megaco-3.14).</p>
   </section>
 
   <section>
@@ -302,7 +308,7 @@ MEGACO/1 [124.124.124.222]
           to our fastest text encoder (compact). </p>
       </item>
       <item>
-        <p>our fastest binary decoder (ber) is about 47% (44%) faster than our 
+        <p>our fastest binary decoder (ber) is about 54% (61%) faster than our 
           fastest text decoder (compact). </p>
       </item>
     </list> 
diff --git a/lib/megaco/doc/src/megaco_user.xml b/lib/megaco/doc/src/megaco_user.xml
index 7332fa684d..7987ed3392 100644
--- a/lib/megaco/doc/src/megaco_user.xml
+++ b/lib/megaco/doc/src/megaco_user.xml
@@ -504,7 +504,7 @@ protocol_version() = integer()    ]]></code>
           not, is also included in the <c><![CDATA[UserReply]]></c>. </p>
         <p>The <c><![CDATA[ReplyData]]></c> defaults to 
           <c><![CDATA[megaco:lookup(ConnHandle, reply_data)]]></c>, 
-          but may be explicitely overridden by a
+          but may be explicitly overridden by a
           <c><![CDATA[megaco:cast/3]]></c> option in order to forward info about the
           calling context of the originating process.</p>
         <p>At <c><![CDATA[success()]]></c>, the <c><![CDATA[UserReply]]></c> either contains:</p>
diff --git a/lib/megaco/doc/src/mstone1-s8flex.log b/lib/megaco/doc/src/mstone1-s8flex.log
deleted file mode 100644
index d9d28399f3..0000000000
--- a/lib/megaco/doc/src/mstone1-s8flex.log
+++ /dev/null
@@ -1,234 +0,0 @@
-
----------------------------------------------
-Factor 01
-
-erl -noshell -smp +S 8 -pa /ldisk/bmk/pgm/otp-r13b-m311p08-re/lib/erlang/lib/megaco-3.11/examples/meas -s megaco_codec_mstone1 start_flex time_test 01 -s init stop
-
-OS:                  unix-linux: 2.6.16
-System architecture: x86_64-unknown-linux-gnu
-OTP release:         R13B
-System version:      Erlang R13B (erts-5.7.1) [source] [64-bit] [smp:8:8] [rq:8] [async-threads:0] [hipe] [kernel-poll:false]
-Heap type:           private
-Global heap size:    0
-Thread support:      true
-Thread pool size:    0
-Process limit:       32768
-SMP support:         true
-Num schedulers:      8
-Scheduler bindings:  {0,1,4,5,2,3,6,7}
-Scheduler bind type: thread_no_node_processor_spread
-Cpu topology:        [{processor,[{core,{logical,0}},{core,{logical,4}},{core,{logical,2}},{core,{logical,6}}]},{processor,[{core,{logical,1}},{core,{logical,5}},{core,{logical,3}},{core,{logical,7}}]}]
-Megaco version:      megaco-3.11-p08
-ASN.1 version:       1.6.10
-
- * starting runners [16] ................ done
- * await runners ready ................ done
- * now snooze
- * release them
-
-16 runners
-Runner heap size data:
-   Min: 75025
-   Max: 1682835
-   Avg: 582577
-Runner reductions data:
-   Min: 927126711
-   Max: 5292487523
-   Avg: 1929935038
-
-MStone: 63283727
-
----------------------------------------------
-Factor 02
-
-erl -noshell -smp +S 8 -pa /ldisk/bmk/pgm/otp-r13b-m311p08-re/lib/erlang/lib/megaco-3.11/examples/meas -s megaco_codec_mstone1 start_flex time_test 02 -s init stop
-
-OS:                  unix-linux: 2.6.16
-System architecture: x86_64-unknown-linux-gnu
-OTP release:         R13B
-System version:      Erlang R13B (erts-5.7.1) [source] [64-bit] [smp:8:8] [rq:8] [async-threads:0] [hipe] [kernel-poll:false]
-Heap type:           private
-Global heap size:    0
-Thread support:      true
-Thread pool size:    0
-Process limit:       32768
-SMP support:         true
-Num schedulers:      8
-Scheduler bindings:  {0,1,4,5,2,3,6,7}
-Scheduler bind type: thread_no_node_processor_spread
-Cpu topology:        [{processor,[{core,{logical,0}},{core,{logical,4}},{core,{logical,2}},{core,{logical,6}}]},{processor,[{core,{logical,1}},{core,{logical,5}},{core,{logical,3}},{core,{logical,7}}]}]
-Megaco version:      megaco-3.11-p08
-ASN.1 version:       1.6.10
-
- * starting runners [32] ................................ done
- * await runners ready ................................ done
- * now snooze
- * release them
-
-32 runners
-Runner heap size data:
-   Min: 75025
-   Max: 1346269
-   Avg: 388569
-Runner reductions data:
-   Min: 645498054
-   Max: 2774469009
-   Avg: 943407719
-
-MStone: 61441342
-
----------------------------------------------
-Factor 04
-
-erl -noshell -smp +S 8 -pa /ldisk/bmk/pgm/otp-r13b-m311p08-re/lib/erlang/lib/megaco-3.11/examples/meas -s megaco_codec_mstone1 start_flex time_test 04 -s init stop
-
-OS:                  unix-linux: 2.6.16
-System architecture: x86_64-unknown-linux-gnu
-OTP release:         R13B
-System version:      Erlang R13B (erts-5.7.1) [source] [64-bit] [smp:8:8] [rq:8] [async-threads:0] [hipe] [kernel-poll:false]
-Heap type:           private
-Global heap size:    0
-Thread support:      true
-Thread pool size:    0
-Process limit:       32768
-SMP support:         true
-Num schedulers:      8
-Scheduler bindings:  {0,1,4,5,2,3,6,7}
-Scheduler bind type: thread_no_node_processor_spread
-Cpu topology:        [{processor,[{core,{logical,0}},{core,{logical,4}},{core,{logical,2}},{core,{logical,6}}]},{processor,[{core,{logical,1}},{core,{logical,5}},{core,{logical,3}},{core,{logical,7}}]}]
-Megaco version:      megaco-3.11-p08
-ASN.1 version:       1.6.10
-
- * starting runners [64] ................................................................ done
- * await runners ready ................................................................ done
- * now snooze
- * release them
-
-64 runners
-Runner heap size data:
-   Min: 75025
-   Max: 1682835
-   Avg: 462690
-Runner reductions data:
-   Min: 395464832
-   Max: 916378232
-   Avg: 507760636
-
-MStone: 66958216
-
----------------------------------------------
-Factor 08
-
-erl -noshell -smp +S 8 -pa /ldisk/bmk/pgm/otp-r13b-m311p08-re/lib/erlang/lib/megaco-3.11/examples/meas -s megaco_codec_mstone1 start_flex time_test 08 -s init stop
-
-OS:                  unix-linux: 2.6.16
-System architecture: x86_64-unknown-linux-gnu
-OTP release:         R13B
-System version:      Erlang R13B (erts-5.7.1) [source] [64-bit] [smp:8:8] [rq:8] [async-threads:0] [hipe] [kernel-poll:false]
-Heap type:           private
-Global heap size:    0
-Thread support:      true
-Thread pool size:    0
-Process limit:       32768
-SMP support:         true
-Num schedulers:      8
-Scheduler bindings:  {0,1,4,5,2,3,6,7}
-Scheduler bind type: thread_no_node_processor_spread
-Cpu topology:        [{processor,[{core,{logical,0}},{core,{logical,4}},{core,{logical,2}},{core,{logical,6}}]},{processor,[{core,{logical,1}},{core,{logical,5}},{core,{logical,3}},{core,{logical,7}}]}]
-Megaco version:      megaco-3.11-p08
-ASN.1 version:       1.6.10
-
- * starting runners [128] ................................................................................................................................ done
- * await runners ready ................................................................................................................................ done
- * now snooze
- * release them
-
-128 runners
-Runner heap size data:
-   Min: 75025
-   Max: 832040
-   Avg: 173900
-Runner reductions data:
-   Min: 236710819
-   Max: 457961244
-   Avg: 269562568
-
-MStone: 72098418
-
----------------------------------------------
-Factor 16
-
-erl -noshell -smp +S 8 -pa /ldisk/bmk/pgm/otp-r13b-m311p08-re/lib/erlang/lib/megaco-3.11/examples/meas -s megaco_codec_mstone1 start_flex time_test 16 -s init stop
-
-OS:                  unix-linux: 2.6.16
-System architecture: x86_64-unknown-linux-gnu
-OTP release:         R13B
-System version:      Erlang R13B (erts-5.7.1) [source] [64-bit] [smp:8:8] [rq:8] [async-threads:0] [hipe] [kernel-poll:false]
-Heap type:           private
-Global heap size:    0
-Thread support:      true
-Thread pool size:    0
-Process limit:       32768
-SMP support:         true
-Num schedulers:      8
-Scheduler bindings:  {0,1,4,5,2,3,6,7}
-Scheduler bind type: thread_no_node_processor_spread
-Cpu topology:        [{processor,[{core,{logical,0}},{core,{logical,4}},{core,{logical,2}},{core,{logical,6}}]},{processor,[{core,{logical,1}},{core,{logical,5}},{core,{logical,3}},{core,{logical,7}}]}]
-Megaco version:      megaco-3.11-p08
-ASN.1 version:       1.6.10
-
- * starting runners [256] ................................................................................................................................................................................................................................................................ done
- * await runners ready ................................................................................................................................................................................................................................................................ done
- * now snooze
- * release them
-
-256 runners
-Runner heap size data:
-   Min: 75025
-   Max: 317811
-   Avg: 131652
-Runner reductions data:
-   Min: 134104991
-   Max: 163429204
-   Avg: 142654707
-
-MStone: 77139535
-
----------------------------------------------
-Factor 32
-
-erl -noshell -smp +S 8 -pa /ldisk/bmk/pgm/otp-r13b-m311p08-re/lib/erlang/lib/megaco-3.11/examples/meas -s megaco_codec_mstone1 start_flex time_test 32 -s init stop
-
-OS:                  unix-linux: 2.6.16
-System architecture: x86_64-unknown-linux-gnu
-OTP release:         R13B
-System version:      Erlang R13B (erts-5.7.1) [source] [64-bit] [smp:8:8] [rq:8] [async-threads:0] [hipe] [kernel-poll:false]
-Heap type:           private
-Global heap size:    0
-Thread support:      true
-Thread pool size:    0
-Process limit:       32768
-SMP support:         true
-Num schedulers:      8
-Scheduler bindings:  {0,1,4,5,2,3,6,7}
-Scheduler bind type: thread_no_node_processor_spread
-Cpu topology:        [{processor,[{core,{logical,0}},{core,{logical,4}},{core,{logical,2}},{core,{logical,6}}]},{processor,[{core,{logical,1}},{core,{logical,5}},{core,{logical,3}},{core,{logical,7}}]}]
-Megaco version:      megaco-3.11-p08
-ASN.1 version:       1.6.10
-
- * starting runners [512] ................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................ done
- * await runners ready ................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................ done
- * now snooze
- * release them
-
-512 runners
-Runner heap size data:
-   Min: 75025
-   Max: 196418
-   Avg: 107328
-Runner reductions data:
-   Min: 71186547
-   Max: 74170110
-   Avg: 72380653
-
-MStone: 78820851
diff --git a/lib/megaco/doc/src/mstone1.gif b/lib/megaco/doc/src/mstone1.gif
deleted file mode 100644
index 54c9c5514c..0000000000
--- a/lib/megaco/doc/src/mstone1.gif
+++ /dev/null
diff --git a/lib/megaco/doc/src/mstone1.jpg b/lib/megaco/doc/src/mstone1.jpg
index b417429a08..3edc65faf1 100644
--- a/lib/megaco/doc/src/mstone1.jpg
+++ b/lib/megaco/doc/src/mstone1.jpg
diff --git a/lib/megaco/doc/src/mstone1.png b/lib/megaco/doc/src/mstone1.png
deleted file mode 100644
index 19af210abc..0000000000
--- a/lib/megaco/doc/src/mstone1.png
+++ /dev/null
diff --git a/lib/megaco/doc/src/mstone1.ps b/lib/megaco/doc/src/mstone1.ps
deleted file mode 100644
index 6436a4eb43..0000000000
--- a/lib/megaco/doc/src/mstone1.ps
+++ /dev/null
@@ -1,1959 +0,0 @@
-%!PS-Adobe-3.0
-%%Creator: GIMP PostScript file plugin V 1.17 by Peter Kirchgessner
-%%Title: mstone1_html_m5496b992.ps
-%%CreationDate: Fri May 29 19:07:25 2009
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 2
-%%Pages: 1
-%%BoundingBox: 14 14 476 247
-%%EndComments
-%%BeginProlog
-% Use own dictionary to avoid conflicts
-10 dict begin
-%%EndProlog
-%%Page: 1 1
-% Translate for offset
-14.173228346456694 14.173228346456694 translate
-% Translate to begin of first scanline
-0 231.99920747433686 translate
-460.99842519685041 -231.99920747433686 scale
-% Image geometry
-461 232 8
-% Transformation matrix
-[ 461 0 0 232 0 0 ]
-% Strings to hold RGB-samples per scanline
-/rstr 461 string def
-/gstr 461 string def
-/bstr 461 string def
-{currentfile /ASCII85Decode filter /RunLengthDecode filter rstr readstring pop}
-{currentfile /ASCII85Decode filter /RunLengthDecode filter gstr readstring pop}
-{currentfile /ASCII85Decode filter /RunLengthDecode filter bstr readstring pop}
-true 3
-%%BeginData:       120502 ASCII Bytes
-colorimage
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-i;[-^"<[I>jo>>[s!S-Pn#nhl!"q57bl%G=s7lKks8;orq>UEis7ZKkpAapfqu?Nmr:^0\rj;e)
-s8Dutrr<#nq!DD]s0Gl?!Ao]1s8;oe!<;Hd"Sr)ls7>sarVlfr/b/l@q#CBds82ck([qD(r;Z+-
-8G3#_q>X&-q#CBlrVZ]fs7lWkrV6<jq"ssfrrVrprVcaFr<)rsrr)lpo`#!n$31)/s8VZin5BJi
-oDZ*k&-j;?o`+scYV-/(\,61)<Vugjs8VP@2$sI+9X"<ms7ZKmo_\Zn>9<i*IeWm8s8W#ss6a>7
-!'%(Ss5mc1$9F^WqXX[`s7QE7?l9"V-$I''!:^$grVccn!WW2js8VWhoDeR_rsA5qr;V'f!%3Qh
-rVnG1s8W&:BG^ja+`,[)rrEc4s7u]mq>Wh_s8Vrqr;ZWnp](3as8)ckq>^KXrr35rs8Vlns8W)t
-ruq.6s7?$[s8VurqZ$9hs7--bmf3=ap\k-lp1<7`r;Zfpir=N~>
-i;[-^"<[I>jo>>[s!S-Pn#nhl!"q57bl%G=s7lKks8;orq>UEis7ZKkpAapfqu?Nmr:^0\rj;e)
-s8Dutrr<#nq!DD]s0Gl?!Ao]1s8;oe!<;Hd"Sr)ls7>sarVlfr/b/l@q#CBds82ck([qD(r;Z+-
-8G3#_q>X&-q#CBlrVZ]fs7lWkrV6<jq"ssfrrVrprVcaFr<)rsrr)lpo`#!n$31)/s8VZin5BJi
-oDZ*k&-j;?o`+scYV-/(\,61)<Vugjs8VP@2$sI+9X"<ms7ZKmo_\Zn>9<i*IeWm8s8W#ss6a>7
-!'%(Ss5mc1$9F^WqXX[`s7QE7?l9"V-$I''!:^$grVccn!WW2js8VWhoDeR_rsA5qr;V'f!%3Qh
-rVnG1s8W&:BG^ja+`,[)rrEc4s7u]mq>Wh_s8Vrqr;ZWnp](3as8)ckq>^KXrr35rs8Vlns8W)t
-ruq.6s7?$[s8VurqZ$9hs7--bmf3=ap\k-lp1<7`r;Zfpir=N~>
-i;[-^"<[I>jo>>[s!S-Pn#nhl!"q57bl%G=s7lKks8;orq>UEis7ZKkpAapfqu?Nmr:^0\rj;e)
-s8Dutrr<#nq!DD]s0Gl?!Ao]1s8;oe!<;Hd"Sr)ls7>sarVlfr/b/l@q#CBds82ck([qD(r;Z+-
-8G3#_q>X&-q#CBlrVZ]fs7lWkrV6<jq"ssfrrVrprVcaFr<)rsrr)lpo`#!n$31)/s8VZin5BJi
-oDZ*k&-j;?o`+scYV-/(\,61)<Vugjs8VP@2$sI+9X"<ms7ZKmo_\Zn>9<i*IeWm8s8W#ss6a>7
-!'%(Ss5mc1$9F^WqXX[`s7QE7?l9"V-$I''!:^$grVccn!WW2js8VWhoDeR_rsA5qr;V'f!%3Qh
-rVnG1s8W&:BG^ja+`,[)rrEc4s7u]mq>Wh_s8Vrqr;ZWnp](3as8)ckq>^KXrr35rs8Vlns8W)t
-ruq.6s7?$[s8VurqZ$9hs7--bmf3=ap\k-lp1<7`r;Zfpir=N~>
-iVtA&rr<bBqu6Wds4%SZs+<S^q"W^NJ3s8@meQb[r9s[crVuors69R`q#::FqZ$Qjrr<#ks/l_1
-r;Z`qs8N&ns8Pa:s7KNEj7gnuGk1l7O91hXnc8^Ws6ose')2G)!<<)is8VZas8VrqrrE)krVmPV
-&W6Sfs*kU(s7G^Ys8;ors8V]hrsAN$rqZTir;ZforVm9("8i,tnGE7bp'gKjs%rUhq>]s9#70bt
-s'(TAs2e'#me,NGYlD]_]Dqa-s8)]oRic.Ls6/p>1H44gs7ZKls7'<Ae,7KeMuWhJs7>OU'qaXY
-Q!44a2h^2\T3:=UruCM-s-G.0iqhZ[?qLA7s8VoprVuI#kl(P[k5Y)Prr`3!o'ZMW0P!u3s56>%
-pAY*cs7lVu-^WlnhTC"&s7lX)XnMbos8C%?!<<)ts8N&js8VQes8)]o"nMKhs7,aYrs/&nq"+Oc
-qY^?m%efr!rr;lqo()MSr;ZHQrr3?"s8C2KpAP$krq5=OJ,~>
-iVtA&rr<bBqu6Wds4%SZs+<S^q"W^NJ3s8@meQb[r9s[crVuors69R`q#::FqZ$Qjrr<#ks/l_1
-r;Z`qs8N&ns8Pa:s7KNEj7gnuGk1l7O91hXnc8^Ws6ose')2G)!<<)is8VZas8VrqrrE)krVmPV
-&W6Sfs*kU(s7G^Ys8;ors8V]hrsAN$rqZTir;ZforVm9("8i,tnGE7bp'gKjs%rUhq>]s9#70bt
-s'(TAs2e'#me,NGYlD]_]Dqa-s8)]oRic.Ls6/p>1H44gs7ZKls7'<Ae,7KeMuWhJs7>OU'qaXY
-Q!44a2h^2\T3:=UruCM-s-G.0iqhZ[?qLA7s8VoprVuI#kl(P[k5Y)Prr`3!o'ZMW0P!u3s56>%
-pAY*cs7lVu-^WlnhTC"&s7lX)XnMbos8C%?!<<)ts8N&js8VQes8)]o"nMKhs7,aYrs/&nq"+Oc
-qY^?m%efr!rr;lqo()MSr;ZHQrr3?"s8C2KpAP$krq5=OJ,~>
-iVtA&rr<bBqu6Wds4%SZs+<S^q"W^NJ3s8@meQb[r9s[crVuors69R`q#::FqZ$Qjrr<#ks/l_1
-r;Z`qs8N&ns8Pa:s7KNEj7gnuGk1l7O91hXnc8^Ws6ose')2G)!<<)is8VZas8VrqrrE)krVmPV
-&W6Sfs*kU(s7G^Ys8;ors8V]hrsAN$rqZTir;ZforVm9("8i,tnGE7bp'gKjs%rUhq>]s9#70bt
-s'(TAs2e'#me,NGYlD]_]Dqa-s8)]oRic.Ls6/p>1H44gs7ZKls7'<Ae,7KeMuWhJs7>OU'qaXY
-Q!44a2h^2\T3:=UruCM-s-G.0iqhZ[?qLA7s8VoprVuI#kl(P[k5Y)Prr`3!o'ZMW0P!u3s56>%
-pAY*cs7lVu-^WlnhTC"&s7lX)XnMbos8C%?!<<)ts8N&js8VQes8)]o"nMKhs7,aYrs/&nq"+Oc
-qY^?m%efr!rr;lqo()MSr;ZHQrr3?"s8C2KpAP$krq5=OJ,~>
-iVsMdrr>bfrr;ors%6/hq@)lhn,E=ko(;q^s8)9bru_14rVuWlqZ$Tcs7cE_s7lWorV?Kn!&)Lr
-r;Z`qs8N#t.'ZYLmeleYs82cG/-#GF7K>jVr"Sl)p@SC]pAb'j)>O7*s8;osp%\Od(]aO7s8DZk
-s)AFjq8OP?nGiIerU]p`s5<nV%JTntp\jaaoDejOs7Q9grs&E(qu?Zqqu6UQ!<;cmo`+C[rV/$r
-$Ma5lo)J[grSmnXnR7@Ts8Rmls8W)unGfm(c27P*s8;QiK1>k?q"Odf!:]se$J-*hkPtP]s-Irp
-rr4S:s+4_[rVuTks7u]ap]&\`dIcf*s7?9jli@"`l2UY\rrE)lrVuoos8Dull2:Q%q#:`hrr;HX
-!WVlnnGi%.&^(.JoDeF^rVua+<^-N_)#aJ;:`9!,nG`I\s8V`hs8VZimf2kXs7QBk(ARe,qu?Hk
-s7lWks8V9^lhUDWs8)ZfqYq*#s8Duis8V]j>.4G(r;ZHMs*t~>
-iVsMdrr>bfrr;ors%6/hq@)lhn,E=ko(;q^s8)9bru_14rVuWlqZ$Tcs7cE_s7lWorV?Kn!&)Lr
-r;Z`qs8N#t.'ZYLmeleYs82cG/-#GF7K>jVr"Sl)p@SC]pAb'j)>O7*s8;osp%\Od(]aO7s8DZk
-s)AFjq8OP?nGiIerU]p`s5<nV%JTntp\jaaoDejOs7Q9grs&E(qu?Zqqu6UQ!<;cmo`+C[rV/$r
-$Ma5lo)J[grSmnXnR7@Ts8Rmls8W)unGfm(c27P*s8;QiK1>k?q"Odf!:]se$J-*hkPtP]s-Irp
-rr4S:s+4_[rVuTks7u]ap]&\`dIcf*s7?9jli@"`l2UY\rrE)lrVuoos8Dull2:Q%q#:`hrr;HX
-!WVlnnGi%.&^(.JoDeF^rVua+<^-N_)#aJ;:`9!,nG`I\s8V`hs8VZimf2kXs7QBk(ARe,qu?Hk
-s7lWks8V9^lhUDWs8)ZfqYq*#s8Duis8V]j>.4G(r;ZHMs*t~>
-iVsMdrr>bfrr;ors%6/hq@)lhn,E=ko(;q^s8)9bru_14rVuWlqZ$Tcs7cE_s7lWorV?Kn!&)Lr
-r;Z`qs8N#t.'ZYLmeleYs82cG/-#GF7K>jVr"Sl)p@SC]pAb'j)>O7*s8;osp%\Od(]aO7s8DZk
-s)AFjq8OP?nGiIerU]p`s5<nV%JTntp\jaaoDejOs7Q9grs&E(qu?Zqqu6UQ!<;cmo`+C[rV/$r
-$Ma5lo)J[grSmnXnR7@Ts8Rmls8W)unGfm(c27P*s8;QiK1>k?q"Odf!:]se$J-*hkPtP]s-Irp
-rr4S:s+4_[rVuTks7u]ap]&\`dIcf*s7?9jli@"`l2UY\rrE)lrVuoos8Dull2:Q%q#:`hrr;HX
-!WVlnnGi%.&^(.JoDeF^rVua+<^-N_)#aJ;:`9!,nG`I\s8V`hs8VZimf2kXs7QBk(ARe,qu?Hk
-s7lWks8V9^lhUDWs8)ZfqYq*#s8Duis8V]j>.4G(r;ZHMs*t~>
-hu>A1^]NWns8UpUgAq7!D=RZ+n,!(^!XA]1qu=Z&&kLmDs7cu%,760Ys8Mqh.K^9HrVmB&!W;ur
-s8W)uqu8sss8)`p./i`:k5bP^F=I8:JGoQKrrBGN!B&+$!!!$$s7QDa0-1[tp&>$ls6ose+nu"/
-/bh7Ss8VWhSfo'pRf<?bb<$_4_Z0Z5!j*[M9Z?]'s#p;_qu?Zqs6T4S!;$6im/Qq^potP)!<<&j
-s7H?hs61U)ru9Php&!_is76-gs6(<As6+D9(1oI>r(2A7rr4,.p&FgUs7bF]s8W#ss6)5Xs7uTm
-rr5gAlMpMVrr;]_rr3@+L]@DRs8Mrjmf*:brsIui$2sc%!!WE/kl(Miq=4LTs8NAjs8VcZ)?'S!
-k5SDNs8)cqpAb*knc&U.$0_Efp?`1<!;ZQmndM'D"XDHk*"4[RqY'shXY^#%PlLafMEq4nc^?0]
-1u/'/ruAa=*'MXCrs[:"2Xh6@s6fle']f;88cSDXs8DoWs*t~>
-hu>A1^]NWns8UpUgAq7!D=RZ+n,!(^!XA]1qu=Z&&kLmDs7cu%,760Ys8Mqh.K^9HrVmB&!W;ur
-s8W)uqu8sss8)`p./i`:k5bP^F=I8:JGoQKrrBGN!B&+$!!!$$s7QDa0-1[tp&>$ls6ose+nu"/
-/bh7Ss8VWhSfo'pRf<?bb<$_4_Z0Z5!j*[M9Z?]'s#p;_qu?Zqs6T4S!;$6im/Qq^potP)!<<&j
-s7H?hs61U)ru9Php&!_is76-gs6(<As6+D9(1oI>r(2A7rr4,.p&FgUs7bF]s8W#ss6)5Xs7uTm
-rr5gAlMpMVrr;]_rr3@+L]@DRs8Mrjmf*:brsIui$2sc%!!WE/kl(Miq=4LTs8NAjs8VcZ)?'S!
-k5SDNs8)cqpAb*knc&U.$0_Efp?`1<!;ZQmndM'D"XDHk*"4[RqY'shXY^#%PlLafMEq4nc^?0]
-1u/'/ruAa=*'MXCrs[:"2Xh6@s6fle']f;88cSDXs8DoWs*t~>
-hu>A1^]NWns8UpUgAq7!D=RZ+n,!(^!XA]1qu=Z&&kLmDs7cu%,760Ys8Mqh.K^9HrVmB&!W;ur
-s8W)uqu8sss8)`p./i`:k5bP^F=I8:JGoQKrrBGN!B&+$!!!$$s7QDa0-1[tp&>$ls6ose+nu"/
-/bh7Ss8VWhSfo'pRf<?bb<$_4_Z0Z5!j*[M9Z?]'s#p;_qu?Zqs6T4S!;$6im/Qq^potP)!<<&j
-s7H?hs61U)ru9Php&!_is76-gs6(<As6+D9(1oI>r(2A7rr4,.p&FgUs7bF]s8W#ss6)5Xs7uTm
-rr5gAlMpMVrr;]_rr3@+L]@DRs8Mrjmf*:brsIui$2sc%!!WE/kl(Miq=4LTs8NAjs8VcZ)?'S!
-k5SDNs8)cqpAb*knc&U.$0_Efp?`1<!;ZQmndM'D"XDHk*"4[RqY'shXY^#%PlLafMEq4nc^?0]
-1u/'/ruAa=*'MXCrs[:"2Xh6@s6fle']f;88cSDXs8DoWs*t~>
-hu=Gls!)ggr:-(+q$-Q.*rnZciW&rUr<<3#HEe%,rPo\lq=jqll18LAq"DES`;\%HNq`SHrrN&t
-rVuoss8MF/q#C?nh=psLqi"MGs(0mabZ+TBs764eh"6%KrVmE&q>^,f0WtH)25fU?s82Wls7ZKm
-g(jo5kPtDYXuF;bc8V'gY9D$HaYCQorr?WSr*M;YrVm'""8i,to`"k0r"U.P+0tq?s5tW#rrM9X
-s8V3\r6eJYq>V#urr3)e$M45qs%7iJs6<$gp=)Y:U&N7op@eO`s8V9^s7?8R6N@)]s8)a6Shg?n
-N;qlVV)86&S*L%Rr;Zff)WLPbs8V3\s8)Quq#C<is8W#tmJd+jqGDJ:s8Duarr3c/s8R::cMu?[
-J,''*n,ND(g&M*Ms7#sd!s/<QFT2;3KeMlps8V`f"BX+<M?$H#s)'jms8&H8^])G=M>mQ_f_'Cq
-8)j2O62:KF^+I@_as>1!!,:ots'SRus8Q(cqZ$@$pAb!hrr(pXJ,~>
-hu=Gls!)ggr:-(+q$-Q.*rnZciW&rUr<<3#HEe%,rPo\lq=jqll18LAq"DES`;\%HNq`SHrrN&t
-rVuoss8MF/q#C?nh=psLqi"MGs(0mabZ+TBs764eh"6%KrVmE&q>^,f0WtH)25fU?s82Wls7ZKm
-g(jo5kPtDYXuF;bc8V'gY9D$HaYCQorr?WSr*M;YrVm'""8i,to`"k0r"U.P+0tq?s5tW#rrM9X
-s8V3\r6eJYq>V#urr3)e$M45qs%7iJs6<$gp=)Y:U&N7op@eO`s8V9^s7?8R6N@)]s8)a6Shg?n
-N;qlVV)86&S*L%Rr;Zff)WLPbs8V3\s8)Quq#C<is8W#tmJd+jqGDJ:s8Duarr3c/s8R::cMu?[
-J,''*n,ND(g&M*Ms7#sd!s/<QFT2;3KeMlps8V`f"BX+<M?$H#s)'jms8&H8^])G=M>mQ_f_'Cq
-8)j2O62:KF^+I@_as>1!!,:ots'SRus8Q(cqZ$@$pAb!hrr(pXJ,~>
-hu=Gls!)ggr:-(+q$-Q.*rnZciW&rUr<<3#HEe%,rPo\lq=jqll18LAq"DES`;\%HNq`SHrrN&t
-rVuoss8MF/q#C?nh=psLqi"MGs(0mabZ+TBs764eh"6%KrVmE&q>^,f0WtH)25fU?s82Wls7ZKm
-g(jo5kPtDYXuF;bc8V'gY9D$HaYCQorr?WSr*M;YrVm'""8i,to`"k0r"U.P+0tq?s5tW#rrM9X
-s8V3\r6eJYq>V#urr3)e$M45qs%7iJs6<$gp=)Y:U&N7op@eO`s8V9^s7?8R6N@)]s8)a6Shg?n
-N;qlVV)86&S*L%Rr;Zff)WLPbs8V3\s8)Quq#C<is8W#tmJd+jqGDJ:s8Duarr3c/s8R::cMu?[
-J,''*n,ND(g&M*Ms7#sd!s/<QFT2;3KeMlps8V`f"BX+<M?$H#s)'jms8&H8^])G=M>mQ_f_'Cq
-8)j2O62:KF^+I@_as>1!!,:ots'SRus8Q(cqZ$@$pAb!hrr(pXJ,~>
-i;ZpV!<8Drq>9\2SG36as8TND%g5M.s8N)mrr5.-s8)bi70!8hq"t*c#l4KZ`;fi:gFN=$s8N,t
-s8Dutrr<#=.KBDCq#CBdq8EQds8Vid#64So&b,f+rr3>[%fcM.s7l3c-Ii%p"P4Ii$2+8s*:Npm
-s*k`&s7u]p6.>E)s3!1t6+Hspp8p1ErrE&u"8*3)o)AZ'r<)rsrr;lkqu?]pr7;p=s8R?rs6g^&
-s7Q0err<$rs8VNoqZ$![rt=f#s7H=ZWrK@ps8Du7!8?u:$NL#%oD\CPr9aO!$.f%Js7H0f!%,\^
-dO::Y"X1b_`$(]@q>]j^rrE)hs7cNm'CGer!<<*%!WWu9!<;9WrM:1ui;N[.m.^P[rr<!\!!!Er
-qZ$?js7Gmgs6]jUp](9^nc/@cs-aGes7RD(rrE)os8N)us#ol^gA(^=!<;Wi38aE/p?a[3!WVfl
-mg&CQs8E3"s7&%Vs8W&%2ZEi^lMpGI!8mbC!hKAas"VUpr;?TnjSs`~>
-i;ZpV!<8Drq>9\2SG36as8TND%g5M.s8N)mrr5.-s8)bi70!8hq"t*c#l4KZ`;fi:gFN=$s8N,t
-s8Dutrr<#=.KBDCq#CBdq8EQds8Vid#64So&b,f+rr3>[%fcM.s7l3c-Ii%p"P4Ii$2+8s*:Npm
-s*k`&s7u]p6.>E)s3!1t6+Hspp8p1ErrE&u"8*3)o)AZ'r<)rsrr;lkqu?]pr7;p=s8R?rs6g^&
-s7Q0err<$rs8VNoqZ$![rt=f#s7H=ZWrK@ps8Du7!8?u:$NL#%oD\CPr9aO!$.f%Js7H0f!%,\^
-dO::Y"X1b_`$(]@q>]j^rrE)hs7cNm'CGer!<<*%!WWu9!<;9WrM:1ui;N[.m.^P[rr<!\!!!Er
-qZ$?js7Gmgs6]jUp](9^nc/@cs-aGes7RD(rrE)os8N)us#ol^gA(^=!<;Wi38aE/p?a[3!WVfl
-mg&CQs8E3"s7&%Vs8W&%2ZEi^lMpGI!8mbC!hKAas"VUpr;?TnjSs`~>
-i;ZpV!<8Drq>9\2SG36as8TND%g5M.s8N)mrr5.-s8)bi70!8hq"t*c#l4KZ`;fi:gFN=$s8N,t
-s8Dutrr<#=.KBDCq#CBdq8EQds8Vid#64So&b,f+rr3>[%fcM.s7l3c-Ii%p"P4Ii$2+8s*:Npm
-s*k`&s7u]p6.>E)s3!1t6+Hspp8p1ErrE&u"8*3)o)AZ'r<)rsrr;lkqu?]pr7;p=s8R?rs6g^&
-s7Q0err<$rs8VNoqZ$![rt=f#s7H=ZWrK@ps8Du7!8?u:$NL#%oD\CPr9aO!$.f%Js7H0f!%,\^
-dO::Y"X1b_`$(]@q>]j^rrE)hs7cNm'CGer!<<*%!WWu9!<;9WrM:1ui;N[.m.^P[rr<!\!!!Er
-qZ$?js7Gmgs6]jUp](9^nc/@cs-aGes7RD(rrE)os8N)us#ol^gA(^=!<;Wi38aE/p?a[3!WVfl
-mg&CQs8E3"s7&%Vs8W&%2ZEi^lMpGI!8mbC!hKAas"VUpr;?TnjSs`~>
-i;ZRO!rha,VZ*Y'q#:?oq>1$WrNT!/K`2#Prq?EUpAb0Z'`[_(s8DQf"98B(!!!*$!#,/'s7??i
-s8Dutrr;l;1]$nHnFuq^^&YY=s7?3h')2D+s6]meqtC$iqYgNkr;Z@0r;['9"oeT&s8MlnruTZ)
-'bKO-s76?n&-r7F!:^KhqXjgf&H;A3jo>5T!;uk'r<)rsrp]U\s6Tdbs6]:rrn7A3s8N*!s6K^b
-q>]DNE:j/>mJ$YXmKijjpAaabs6q>Op%n]W!<<#k$iBl"s8VZinGgT1](Q*qs8VWc&`EKbqU6\Z
-!:]RUs4J1drtY2*(ubMpo`"mk$3:)/s8V?`rVultrr38t,anQ0r:p<jrVo=_l&%7PpVo^Equ?<^
-s8N`"qXFOb!!!N=oDK$rm38#!TH`n#$2"8lknEpgq>UHps8;j)nFHSZ!"&]3!!*$!s8VQa#lai)
-nc8[h)%HEAnbr=frW)uur;YkTDZ>J/s8;fp9=k!!rrDuXs*t~>
-i;ZRO!rha,VZ*Y'q#:?oq>1$WrNT!/K`2#Prq?EUpAb0Z'`[_(s8DQf"98B(!!!*$!#,/'s7??i
-s8Dutrr;l;1]$nHnFuq^^&YY=s7?3h')2D+s6]meqtC$iqYgNkr;Z@0r;['9"oeT&s8MlnruTZ)
-'bKO-s76?n&-r7F!:^KhqXjgf&H;A3jo>5T!;uk'r<)rsrp]U\s6Tdbs6]:rrn7A3s8N*!s6K^b
-q>]DNE:j/>mJ$YXmKijjpAaabs6q>Op%n]W!<<#k$iBl"s8VZinGgT1](Q*qs8VWc&`EKbqU6\Z
-!:]RUs4J1drtY2*(ubMpo`"mk$3:)/s8V?`rVultrr38t,anQ0r:p<jrVo=_l&%7PpVo^Equ?<^
-s8N`"qXFOb!!!N=oDK$rm38#!TH`n#$2"8lknEpgq>UHps8;j)nFHSZ!"&]3!!*$!s8VQa#lai)
-nc8[h)%HEAnbr=frW)uur;YkTDZ>J/s8;fp9=k!!rrDuXs*t~>
-i;ZRO!rha,VZ*Y'q#:?oq>1$WrNT!/K`2#Prq?EUpAb0Z'`[_(s8DQf"98B(!!!*$!#,/'s7??i
-s8Dutrr;l;1]$nHnFuq^^&YY=s7?3h')2D+s6]meqtC$iqYgNkr;Z@0r;['9"oeT&s8MlnruTZ)
-'bKO-s76?n&-r7F!:^KhqXjgf&H;A3jo>5T!;uk'r<)rsrp]U\s6Tdbs6]:rrn7A3s8N*!s6K^b
-q>]DNE:j/>mJ$YXmKijjpAaabs6q>Op%n]W!<<#k$iBl"s8VZinGgT1](Q*qs8VWc&`EKbqU6\Z
-!:]RUs4J1drtY2*(ubMpo`"mk$3:)/s8V?`rVultrr38t,anQ0r:p<jrVo=_l&%7PpVo^Equ?<^
-s8N`"qXFOb!!!N=oDK$rm38#!TH`n#$2"8lknEpgq>UHps8;j)nFHSZ!"&]3!!*$!s8VQa#lai)
-nc8[h)%HEAnbr=frW)uur;YkTDZ>J/s8;fp9=k!!rrDuXs*t~>
-hu@6fqYsn^r],f2pC$Qlr;ZZoo`)`;r;ccirt=o&s8)a"r;Qcsrr;fps8)frnG`Idp%JF^rW2rs
-rVuoss8C)%s8;QirV=&7VZ-Vis82WjqZ$<or;Qcls76$qs82lspAb-mpAY'qq>L*lq"k!i,P;$$
-<AiSg48AjU#Q"/es8Vrq"nqurr9=[irrE)os8N*!rr2pHr<)rsrr<#oqZ$Tfs8V<cs$L;rp\4si
-rVuors7Q9[#QO?Iec5@Bk8aL$)uKX8o`#-hs8W"65kb,l2ZN[Sp](!_s0)d1q#::5qt:!h+m]1*
-s8N*[email protected]"BoEY0ls7u]gs8;j*q"4NE-3*K7rVccqs7cQbs8NYkq>^KR
-(]471s8VmuR/[+$p&F[a!;lcrs8?dlr]Y<$rrDrqs8N)urtG)5oD&@c!VcWo#4MQgs8;Wi!;ZWo
-$3B\ss8!'"s8NPrrr3c)&afl"s7,ma`ZXe%I/X*FqC:.ps8:mVJ,~>
-hu@6fqYsn^r],f2pC$Qlr;ZZoo`)`;r;ccirt=o&s8)a"r;Qcsrr;fps8)frnG`Idp%JF^rW2rs
-rVuoss8C)%s8;QirV=&7VZ-Vis82WjqZ$<or;Qcls76$qs82lspAb-mpAY'qq>L*lq"k!i,P;$$
-<AiSg48AjU#Q"/es8Vrq"nqurr9=[irrE)os8N*!rr2pHr<)rsrr<#oqZ$Tfs8V<cs$L;rp\4si
-rVuors7Q9[#QO?Iec5@Bk8aL$)uKX8o`#-hs8W"65kb,l2ZN[Sp](!_s0)d1q#::5qt:!h+m]1*
-s8N*[email protected]"BoEY0ls7u]gs8;j*q"4NE-3*K7rVccqs7cQbs8NYkq>^KR
-(]471s8VmuR/[+$p&F[a!;lcrs8?dlr]Y<$rrDrqs8N)urtG)5oD&@c!VcWo#4MQgs8;Wi!;ZWo
-$3B\ss8!'"s8NPrrr3c)&afl"s7,ma`ZXe%I/X*FqC:.ps8:mVJ,~>
-hu@6fqYsn^r],f2pC$Qlr;ZZoo`)`;r;ccirt=o&s8)a"r;Qcsrr;fps8)frnG`Idp%JF^rW2rs
-rVuoss8C)%s8;QirV=&7VZ-Vis82WjqZ$<or;Qcls76$qs82lspAb-mpAY'qq>L*lq"k!i,P;$$
-<AiSg48AjU#Q"/es8Vrq"nqurr9=[irrE)os8N*!rr2pHr<)rsrr<#oqZ$Tfs8V<cs$L;rp\4si
-rVuors7Q9[#QO?Iec5@Bk8aL$)uKX8o`#-hs8W"65kb,l2ZN[Sp](!_s0)d1q#::5qt:!h+m]1*
-s8N*[email protected]"BoEY0ls7u]gs8;j*q"4NE-3*K7rVccqs7cQbs8NYkq>^KR
-(]471s8VmuR/[+$p&F[a!;lcrs8?dlr]Y<$rrDrqs8N)urtG)5oD&@c!VcWo#4MQgs8;Wi!;ZWo
-$3B\ss8!'"s8NPrrr3c)&afl"s7,ma`ZXe%I/X*FqC:.ps8:mVJ,~>
-iVuRLrrE*!c4-6IhZ*3Js8Dutp](9kiY;Csmf3;>]Dqa,Z7GtT!;lfrrW)uu/@,<Uq>^*ep&Fgf
-s7cQno_SUfjVRgop\Fif$G?05s"aTPs8VZhquH`r!rr2rrrW5s!<<)op/@des7u]frrMros8W#f
-s+gd-o%O@us8P$^rr2pPo`$SRn,NBj5PP0Xs763i!WW,mrr;uupAb$es8;fpqu?]nat*Jo!"o84
-!"')5s7cNm?J6(ms'UW]rVrNjs82irrX.T`#6"2okSn.3s"pbPs8W)unc,-\YlF_&s8N&urr6/k
-q>('@1\+qDq=Xd80DYPGpAap8%I<]as8;co!<3>us7H?kr;Qrjs7cT(rr30!s8Vfirr)it']T,l
-$gIusp]'a_oY_[/q#::<qYpQqo`tNsaoJaJhZ!NVs8;fp!rr;trW)ZlnG`Lgqu8@Pr;S>F$MON!
-rrW5ur;Qius8+jcq#BZi49#EVs8;iqs"]65cg^u/r=Ar$s8DunjSs`~>
-iVuRLrrE*!c4-6IhZ*3Js8Dutp](9kiY;Csmf3;>]Dqa,Z7GtT!;lfrrW)uu/@,<Uq>^*ep&Fgf
-s7cQno_SUfjVRgop\Fif$G?05s"aTPs8VZhquH`r!rr2rrrW5s!<<)op/@des7u]frrMros8W#f
-s+gd-o%O@us8P$^rr2pPo`$SRn,NBj5PP0Xs763i!WW,mrr;uupAb$es8;fpqu?]nat*Jo!"o84
-!"')5s7cNm?J6(ms'UW]rVrNjs82irrX.T`#6"2okSn.3s"pbPs8W)unc,-\YlF_&s8N&urr6/k
-q>('@1\+qDq=Xd80DYPGpAap8%I<]as8;co!<3>us7H?kr;Qrjs7cT(rr30!s8Vfirr)it']T,l
-$gIusp]'a_oY_[/q#::<qYpQqo`tNsaoJaJhZ!NVs8;fp!rr;trW)ZlnG`Lgqu8@Pr;S>F$MON!
-rrW5ur;Qius8+jcq#BZi49#EVs8;iqs"]65cg^u/r=Ar$s8DunjSs`~>
-iVuRLrrE*!c4-6IhZ*3Js8Dutp](9kiY;Csmf3;>]Dqa,Z7GtT!;lfrrW)uu/@,<Uq>^*ep&Fgf
-s7cQno_SUfjVRgop\Fif$G?05s"aTPs8VZhquH`r!rr2rrrW5s!<<)op/@des7u]frrMros8W#f
-s+gd-o%O@us8P$^rr2pPo`$SRn,NBj5PP0Xs763i!WW,mrr;uupAb$es8;fpqu?]nat*Jo!"o84
-!"')5s7cNm?J6(ms'UW]rVrNjs82irrX.T`#6"2okSn.3s"pbPs8W)unc,-\YlF_&s8N&urr6/k
-q>('@1\+qDq=Xd80DYPGpAap8%I<]as8;co!<3>us7H?kr;Qrjs7cT(rr30!s8Vfirr)it']T,l
-$gIusp]'a_oY_[/q#::<qYpQqo`tNsaoJaJhZ!NVs8;fp!rr;trW)ZlnG`Lgqu8@Pr;S>F$MON!
-rrW5ur;Qius8+jcq#BZi49#EVs8;iqs"]65cg^u/r=Ar$s8DunjSs`~>
-i;Yn5#Q4Q#*tUm@jSo\OD2u@1qr,"6UAl%`o)Hi4ci(g)b5_A?s7lKd!rr;B*jb_$L2$\fmJd[r
-s7>s^rrGR1rr3@j)795>s7ZKks7QBjs$-SancAUes7uceruJoTrVrlC\Gt3F;Y'ngs6BUZs3h7G
-s7cAY!87.V(qo_+N`l+s'AEK&-+j3W!:0[\quufnrrhE_)#4(/s*XYB?@_><^a#H>s8VBarrV]a
-s$`OBm`S"Lr:SMI^A#;IcN!_?oD`*\s'Jk-`^Kl^dUl2Hs7bp[qYuBfaT)59s8P"Us7--F(V'.f
-1kYhf'tO@m4,rq2q>1-kn[KQqf_G0uR0!*`s6Td`o`+pks6sYsrr;imqZ$Bis(h*'qK><Wq8,F=
-s8VZip\k-##*Rp8qUgcKlMgq[rVoLj:]L@`!W)irq>p0Zs8NH+s8MWjrVuo4(rGb2L/IsNs763\
-!W)irq>p0es1BSnrn8$orrr2ps8Dip[fA)]s7--5:[e8^rqtgVJ,~>
-i;Yn5#Q4Q#*tUm@jSo\OD2u@1qr,"6UAl%`o)Hi4ci(g)b5_A?s7lKd!rr;B*jb_$L2$\fmJd[r
-s7>s^rrGR1rr3@j)795>s7ZKks7QBjs$-SancAUes7uceruJoTrVrlC\Gt3F;Y'ngs6BUZs3h7G
-s7cAY!87.V(qo_+N`l+s'AEK&-+j3W!:0[\quufnrrhE_)#4(/s*XYB?@_><^a#H>s8VBarrV]a
-s$`OBm`S"Lr:SMI^A#;IcN!_?oD`*\s'Jk-`^Kl^dUl2Hs7bp[qYuBfaT)59s8P"Us7--F(V'.f
-1kYhf'tO@m4,rq2q>1-kn[KQqf_G0uR0!*`s6Td`o`+pks6sYsrr;imqZ$Bis(h*'qK><Wq8,F=
-s8VZip\k-##*Rp8qUgcKlMgq[rVoLj:]L@`!W)irq>p0Zs8NH+s8MWjrVuo4(rGb2L/IsNs763\
-!W)irq>p0es1BSnrn8$orrr2ps8Dip[fA)]s7--5:[e8^rqtgVJ,~>
-i;Yn5#Q4Q#*tUm@jSo\OD2u@1qr,"6UAl%`o)Hi4ci(g)b5_A?s7lKd!rr;B*jb_$L2$\fmJd[r
-s7>s^rrGR1rr3@j)795>s7ZKks7QBjs$-SancAUes7uceruJoTrVrlC\Gt3F;Y'ngs6BUZs3h7G
-s7cAY!87.V(qo_+N`l+s'AEK&-+j3W!:0[\quufnrrhE_)#4(/s*XYB?@_><^a#H>s8VBarrV]a
-s$`OBm`S"Lr:SMI^A#;IcN!_?oD`*\s'Jk-`^Kl^dUl2Hs7bp[qYuBfaT)59s8P"Us7--F(V'.f
-1kYhf'tO@m4,rq2q>1-kn[KQqf_G0uR0!*`s6Td`o`+pks6sYsrr;imqZ$Bis(h*'qK><Wq8,F=
-s8VZip\k-##*Rp8qUgcKlMgq[rVoLj:]L@`!W)irq>p0Zs8NH+s8MWjrVuo4(rGb2L/IsNs763\
-!W)irq>p0es1BSnrn8$orrr2ps8Dip[fA)]s7--5:[e8^rqtgVJ,~>
-iW!firrVHbrNuX@s8VEcs8SNf$kESHV#UI_"[rC]b=3"4d-L0##PA&rr;urpm_([r$!!kqs8VZj
-gAh3Os8;Wgs0P_rs7-Nt!!j#6!<<&up&F:OrrDTh!<<#rrrE)mQkqs[s6d<?)&#W\rt#&-CAS]8
-s6fp`s&1*3s/n^'!(aa!p!bT#3kt^jp^@,js6p$gqY:*jo`,F$!<E06n[2F:"Y$2Gs8;oslMh%f
-p]%j$%gXtTs7?9j_C>O3`;]f5q>^2]./_t&$nf,N!#pR`s7H$br;Zd,qu@E4p+?=BrVuo=/-7/T
-s7c!"0*E>KrVlosr;Q^iY&59h!&@X2rW)Wkq#(*iq#L9k!!a#7!<<)n,l.B<r;HZqqM61+15c,(
-p&G'drUo^;9cO3J/7-Etnc8^gs.0D#rVults8Dor!<3!&ncSOFs8N3#s"O2E;ZmM4Yl=t$qssae
-s8Dor!<;ogs0t>r1Xc'u!<<)pm/QeZ"JYYbs6sBqs8VuTs*t~>
-iW!firrVHbrNuX@s8VEcs8SNf$kESHV#UI_"[rC]b=3"4d-L0##PA&rr;urpm_([r$!!kqs8VZj
-gAh3Os8;Wgs0P_rs7-Nt!!j#6!<<&up&F:OrrDTh!<<#rrrE)mQkqs[s6d<?)&#W\rt#&-CAS]8
-s6fp`s&1*3s/n^'!(aa!p!bT#3kt^jp^@,js6p$gqY:*jo`,F$!<E06n[2F:"Y$2Gs8;oslMh%f
-p]%j$%gXtTs7?9j_C>O3`;]f5q>^2]./_t&$nf,N!#pR`s7H$br;Zd,qu@E4p+?=BrVuo=/-7/T
-s7c!"0*E>KrVlosr;Q^iY&59h!&@X2rW)Wkq#(*iq#L9k!!a#7!<<)n,l.B<r;HZqqM61+15c,(
-p&G'drUo^;9cO3J/7-Etnc8^gs.0D#rVults8Dor!<3!&ncSOFs8N3#s"O2E;ZmM4Yl=t$qssae
-s8Dor!<;ogs0t>r1Xc'u!<<)pm/QeZ"JYYbs6sBqs8VuTs*t~>
-iW!firrVHbrNuX@s8VEcs8SNf$kESHV#UI_"[rC]b=3"4d-L0##PA&rr;urpm_([r$!!kqs8VZj
-gAh3Os8;Wgs0P_rs7-Nt!!j#6!<<&up&F:OrrDTh!<<#rrrE)mQkqs[s6d<?)&#W\rt#&-CAS]8
-s6fp`s&1*3s/n^'!(aa!p!bT#3kt^jp^@,js6p$gqY:*jo`,F$!<E06n[2F:"Y$2Gs8;oslMh%f
-p]%j$%gXtTs7?9j_C>O3`;]f5q>^2]./_t&$nf,N!#pR`s7H$br;Zd,qu@E4p+?=BrVuo=/-7/T
-s7c!"0*E>KrVlosr;Q^iY&59h!&@X2rW)Wkq#(*iq#L9k!!a#7!<<)n,l.B<r;HZqqM61+15c,(
-p&G'drUo^;9cO3J/7-Etnc8^gs.0D#rVults8Dor!<3!&ncSOFs8N3#s"O2E;ZmM4Yl=t$qssae
-s8Dor!<;ogs0t>r1Xc'u!<<)pm/QeZ"JYYbs6sBqs8VuTs*t~>
-i;X>_s8V`gp]('^s8Vrqp&Fdcrs\o,s82-^s7cQjs7Z9frs.uks6ojbrq69j!qH9]rr3T*s8Vur
-s7lNlqu?<gqGZ/Kp&=tMrVuogs8DriqZ$Tos8VQes8N#trpTmdn,<1Rs8N&ls6fpeo`"^erqufk
-s8;oqs7H'bq>^<err3f1s8Voms7u]ks8)3\s8Duos8)chpAb$hru1D,oDARbqt^9lo_/=Qq#C9j
-s7H?kp\+UUr;Q^#q=OUbmJlhXrsnkos("jhs7,^\m.LDYrr)j"q>9d`qtg=(med%ali6\Yl1Y/W
-rVuWlqYpL$o)Jafrr;Wjqu$Hn!r;Wjqu7Ass7H?es75sOs8VN&)?9U6rVu`jrr3;rm/QPJs7cQn
-r;Q^&mf3:dnFu_Js8;iq+Su-8q!\4^rr2rsn,N:bs8)cqnc/X^pAb0Ps8VKds6Tab-h%'7rr2rs
-n,*.as8N&uq#C*ds7?9jqu;`uiW&oWiEbsQs7QEjr8dm.~>
-i;X>_s8V`gp]('^s8Vrqp&Fdcrs\o,s82-^s7cQjs7Z9frs.uks6ojbrq69j!qH9]rr3T*s8Vur
-s7lNlqu?<gqGZ/Kp&=tMrVuogs8DriqZ$Tos8VQes8N#trpTmdn,<1Rs8N&ls6fpeo`"^erqufk
-s8;oqs7H'bq>^<err3f1s8Voms7u]ks8)3\s8Duos8)chpAb$hru1D,oDARbqt^9lo_/=Qq#C9j
-s7H?kp\+UUr;Q^#q=OUbmJlhXrsnkos("jhs7,^\m.LDYrr)j"q>9d`qtg=(med%ali6\Yl1Y/W
-rVuWlqYpL$o)Jafrr;Wjqu$Hn!r;Wjqu7Ass7H?es75sOs8VN&)?9U6rVu`jrr3;rm/QPJs7cQn
-r;Q^&mf3:dnFu_Js8;iq+Su-8q!\4^rr2rsn,N:bs8)cqnc/X^pAb0Ps8VKds6Tab-h%'7rr2rs
-n,*.as8N&uq#C*ds7?9jqu;`uiW&oWiEbsQs7QEjr8dm.~>
-i;X>_s8V`gp]('^s8Vrqp&Fdcrs\o,s82-^s7cQjs7Z9frs.uks6ojbrq69j!qH9]rr3T*s8Vur
-s7lNlqu?<gqGZ/Kp&=tMrVuogs8DriqZ$Tos8VQes8N#trpTmdn,<1Rs8N&ls6fpeo`"^erqufk
-s8;oqs7H'bq>^<err3f1s8Voms7u]ks8)3\s8Duos8)chpAb$hru1D,oDARbqt^9lo_/=Qq#C9j
-s7H?kp\+UUr;Q^#q=OUbmJlhXrsnkos("jhs7,^\m.LDYrr)j"q>9d`qtg=(med%ali6\Yl1Y/W
-rVuWlqYpL$o)Jafrr;Wjqu$Hn!r;Wjqu7Ass7H?es75sOs8VN&)?9U6rVu`jrr3;rm/QPJs7cQn
-r;Q^&mf3:dnFu_Js8;iq+Su-8q!\4^rr2rsn,N:bs8)cqnc/X^pAb0Ps8VKds6Tab-h%'7rr2rs
-n,*.as8N&uq#C*ds7?9jqu;`uiW&oWiEbsQs7QEjr8dm.~>
-i;WrSs7H?^rr3]+s8Vlns8DutqssdTr:p<dmJlnWrr4#2s8V`hpAb'jr9F=^mJm.bs6BXaoDeLZ
-qu?WkoDS[shbO4Hs8VlomJm4WrVm5is7cNfs8VQfs6ose!;QNm$iL&&s69R`p](-jmJ[&$kPX`I
-o)JRds7lWon+QeMs8)9co)JF\r;R-'q#:6is8W#ms6Tab"RuHjs82fq%I=&js8Voprr<#ks8W&s
-rsSi+s6p!bs7lWfs7cKl)u9)A+Fhr3s68@=90rUUq>]XXrU0^cqXjgfnGW@eo)AY)q#CBdr;ZQl
-nGiOUs6fdas8)Hho)8Lcq$[6%rr<#mr:Bs`qtL$g&H2Y(s$X6kq#C9jo`+Uas8;lr$i9o'nc/Ld
-s6BXYoD\b(r;ZTms7lNYs7$'`s8VQfs6p!frVc`umI^GSrr3?)nc/@Qs8VQfs6]gc"7Q9in,<8+
-p\Og]s763hs7Z0dnFkWSI/j$Bnkn9Do`"mjp>c1'~>
-i;WrSs7H?^rr3]+s8Vlns8DutqssdTr:p<dmJlnWrr4#2s8V`hpAb'jr9F=^mJm.bs6BXaoDeLZ
-qu?WkoDS[shbO4Hs8VlomJm4WrVm5is7cNfs8VQfs6ose!;QNm$iL&&s69R`p](-jmJ[&$kPX`I
-o)JRds7lWon+QeMs8)9co)JF\r;R-'q#:6is8W#ms6Tab"RuHjs82fq%I=&js8Voprr<#ks8W&s
-rsSi+s6p!bs7lWfs7cKl)u9)A+Fhr3s68@=90rUUq>]XXrU0^cqXjgfnGW@eo)AY)q#CBdr;ZQl
-nGiOUs6fdas8)Hho)8Lcq$[6%rr<#mr:Bs`qtL$g&H2Y(s$X6kq#C9jo`+Uas8;lr$i9o'nc/Ld
-s6BXYoD\b(r;ZTms7lNYs7$'`s8VQfs6p!frVc`umI^GSrr3?)nc/@Qs8VQfs6]gc"7Q9in,<8+
-p\Og]s763hs7Z0dnFkWSI/j$Bnkn9Do`"mjp>c1'~>
-i;WrSs7H?^rr3]+s8Vlns8DutqssdTr:p<dmJlnWrr4#2s8V`hpAb'jr9F=^mJm.bs6BXaoDeLZ
-qu?WkoDS[shbO4Hs8VlomJm4WrVm5is7cNfs8VQfs6ose!;QNm$iL&&s69R`p](-jmJ[&$kPX`I
-o)JRds7lWon+QeMs8)9co)JF\r;R-'q#:6is8W#ms6Tab"RuHjs82fq%I=&js8Voprr<#ks8W&s
-rsSi+s6p!bs7lWfs7cKl)u9)A+Fhr3s68@=90rUUq>]XXrU0^cqXjgfnGW@eo)AY)q#CBdr;ZQl
-nGiOUs6fdas8)Hho)8Lcq$[6%rr<#mr:Bs`qtL$g&H2Y(s$X6kq#C9jo`+Uas8;lr$i9o'nc/Ld
-s6BXYoD\b(r;ZTms7lNYs7$'`s8VQfs6p!frVc`umI^GSrr3?)nc/@Qs8VQfs6]gc"7Q9in,<8+
-p\Og]s763hs7Z0dnFkWSI/j$Bnkn9Do`"mjp>c1'~>
-hu=5brVuosp%J+TrVu`ds8V?\s8Vt's8Muss7QB^s7cQiqu?]ds8VQfqtg3^s8VWas7cQjoD/Fd
-rqZT]s82ior:^0\s8N&^mJlt]mJm4[s7u]ds8N#toDeXdq>'^`s7u]nqu>mQs8)ZnqXOUUs7u]f
-rr3,hq>^EjrVmT+rr;ilqu?]ls8Vfmq>^3hrqcZkrr5afo`+:Xs6Ta_nc/XYs7$'gn,*.Ts8V]j
-irArVq"+O\s7uTipAb0[rVHKmmf1RE0,FTt+@_mPq#B[Vs7Q-dn+m"`o`+dfoDS%Us82fn#lj]"
-o(rCbm/?n_&,Gu"q>L?ir;ZEhs82fgrVlg,li6taq"OgHs8Vlgs7--grW)Kert4r#s8Vcls7lEi
-meZtRs7QElrquuas7cQer;RN-s8V]jrr2rhs8)ccs7QEfs8;o`rr2p8rVuoos7lWds8V]jrr2rh
-s8W&ps7H?bs7lQm&b5]]%TrQ*pAb0ks8Vrks8W)Ys*t~>
-hu=5brVuosp%J+TrVu`ds8V?\s8Vt's8Muss7QB^s7cQiqu?]ds8VQfqtg3^s8VWas7cQjoD/Fd
-rqZT]s82ior:^0\s8N&^mJlt]mJm4[s7u]ds8N#toDeXdq>'^`s7u]nqu>mQs8)ZnqXOUUs7u]f
-rr3,hq>^EjrVmT+rr;ilqu?]ls8Vfmq>^3hrqcZkrr5afo`+:Xs6Ta_nc/XYs7$'gn,*.Ts8V]j
-irArVq"+O\s7uTipAb0[rVHKmmf1RE0,FTt+@_mPq#B[Vs7Q-dn+m"`o`+dfoDS%Us82fn#lj]"
-o(rCbm/?n_&,Gu"q>L?ir;ZEhs82fgrVlg,li6taq"OgHs8Vlgs7--grW)Kert4r#s8Vcls7lEi
-meZtRs7QElrquuas7cQer;RN-s8V]jrr2rhs8)ccs7QEfs8;o`rr2p8rVuoos7lWds8V]jrr2rh
-s8W&ps7H?bs7lQm&b5]]%TrQ*pAb0ks8Vrks8W)Ys*t~>
-hu=5brVuosp%J+TrVu`ds8V?\s8Vt's8Muss7QB^s7cQiqu?]ds8VQfqtg3^s8VWas7cQjoD/Fd
-rqZT]s82ior:^0\s8N&^mJlt]mJm4[s7u]ds8N#toDeXdq>'^`s7u]nqu>mQs8)ZnqXOUUs7u]f
-rr3,hq>^EjrVmT+rr;ilqu?]ls8Vfmq>^3hrqcZkrr5afo`+:Xs6Ta_nc/XYs7$'gn,*.Ts8V]j
-irArVq"+O\s7uTipAb0[rVHKmmf1RE0,FTt+@_mPq#B[Vs7Q-dn+m"`o`+dfoDS%Us82fn#lj]"
-o(rCbm/?n_&,Gu"q>L?ir;ZEhs82fgrVlg,li6taq"OgHs8Vlgs7--grW)Kert4r#s8Vcls7lEi
-meZtRs7QElrquuas7cQer;RN-s8V]jrr2rhs8)ccs7QEfs8;o`rr2p8rVuoos7lWds8V]jrr2rh
-s8W&ps7H?bs7lQm&b5]]%TrQ*pAb0ks8Vrks8W)Ys*t~>
-iVs,Srr<#ms8Mus..mQ;qu?Wpp]'m]s8Dutqt^9lkl:JYq"FUbs82Efs7uWfs82inp&4mi!Vl?e
-rt+u$s8VZir;ZNks8)<dp&FFYs$cb`s7?9jhZ*KJs82]nq"t'js7u]ns8;Qfs7QElkl:VRq#Bsc
-p&F[\s6TIZq>^-fnc/OSs8Dusr;ZEhq>^Kbs7cQmrVlrnqtU*h!qPsWrr4&<o`+OSs8W)up](9_
-s7$'Zs7Q0es7cBiq>^6ip%\Od!9jF^#Pe?!q#CBnq#::&p&G'cs5j:\kPkMAs5s=\(]+1&s7u]b
-s8)cms8)cps6BXap%SLdq#::@o)J"Lo`+shs7u3bo`"Xcs60LLs8VEbs8;`nq==Rcl2UJWqu$K^
-rr3)us8W)trr`#qr:g'f+o1]qs6'FZq#C6gs7lKcs8UsUs7cQfr;Z0as7Pp^s82cort"Ppq#C6g
-s7lKkq>^0grVc`q(%M>!s7QElq>^9jrqufcs8W)rs8VuWs*t~>
-iVs,Srr<#ms8Mus..mQ;qu?Wpp]'m]s8Dutqt^9lkl:JYq"FUbs82Efs7uWfs82inp&4mi!Vl?e
-rt+u$s8VZir;ZNks8)<dp&FFYs$cb`s7?9jhZ*KJs82]nq"t'js7u]ns8;Qfs7QElkl:VRq#Bsc
-p&F[\s6TIZq>^-fnc/OSs8Dusr;ZEhq>^Kbs7cQmrVlrnqtU*h!qPsWrr4&<o`+OSs8W)up](9_
-s7$'Zs7Q0es7cBiq>^6ip%\Od!9jF^#Pe?!q#CBnq#::&p&G'cs5j:\kPkMAs5s=\(]+1&s7u]b
-s8)cms8)cps6BXap%SLdq#::@o)J"Lo`+shs7u3bo`"Xcs60LLs8VEbs8;`nq==Rcl2UJWqu$K^
-rr3)us8W)trr`#qr:g'f+o1]qs6'FZq#C6gs7lKcs8UsUs7cQfr;Z0as7Pp^s82cort"Ppq#C6g
-s7lKkq>^0grVc`q(%M>!s7QElq>^9jrqufcs8W)rs8VuWs*t~>
-iVs,Srr<#ms8Mus..mQ;qu?Wpp]'m]s8Dutqt^9lkl:JYq"FUbs82Efs7uWfs82inp&4mi!Vl?e
-rt+u$s8VZir;ZNks8)<dp&FFYs$cb`s7?9jhZ*KJs82]nq"t'js7u]ns8;Qfs7QElkl:VRq#Bsc
-p&F[\s6TIZq>^-fnc/OSs8Dusr;ZEhq>^Kbs7cQmrVlrnqtU*h!qPsWrr4&<o`+OSs8W)up](9_
-s7$'Zs7Q0es7cBiq>^6ip%\Od!9jF^#Pe?!q#CBnq#::&p&G'cs5j:\kPkMAs5s=\(]+1&s7u]b
-s8)cms8)cps6BXap%SLdq#::@o)J"Lo`+shs7u3bo`"Xcs60LLs8VEbs8;`nq==Rcl2UJWqu$K^
-rr3)us8W)trr`#qr:g'f+o1]qs6'FZq#C6gs7lKcs8UsUs7cQfr;Z0as7Pp^s82cort"Ppq#C6g
-s7lKkq>^0grVc`q(%M>!s7QElq>^9jrqufcs8W)rs8VuWs*t~>
-i;X\as8Duqs8DrsoDe1Ws7uTms7H?kq#C-hq#14/pAagcs7cQkrr;orpAb0is8Vrps8Vijrr3#q
-rVlg%q>^Hhr;ZHgrVmN%s8W)ss7?9is7H?bs8Vrqs8)`p$hsYss8)ZnrVuonp&4mmq#C!arVllp
-rr3>ss8)c`s8M`lqYU3j!q?6frVpj2s8;osoDeOar;Z`hs8N&uoDJLcq>U<lqu-Ejrr;cks82Tk
-p&Fjdrr<#os8Duas8V]gp]'d\p&Fdas7?9eq#C-es8)cqq#CBhs8Vfmp](3js8)<dq"asirr;fe
-s8N&umJm4_s8Vinqu?Whqu9"Ns7ZKmrr<#ss8Vigs82]nr;Zfrqu?]mqu?9fqu?]hs82imrVuHg
-s8)Egnc/7]p[\@`s763ir;$Bcs8Vrqs8)`p&,Q>+p](9ks763irqHHmqYgEon,<7oqZ$Tls8W)u
-p&>!fqYpm$s8)Whs7QEjr;Q^"p](9kr;PdWJ,~>
-i;X\as8Duqs8DrsoDe1Ws7uTms7H?kq#C-hq#14/pAagcs7cQkrr;orpAb0is8Vrps8Vijrr3#q
-rVlg%q>^Hhr;ZHgrVmN%s8W)ss7?9is7H?bs8Vrqs8)`p$hsYss8)ZnrVuonp&4mmq#C!arVllp
-rr3>ss8)c`s8M`lqYU3j!q?6frVpj2s8;osoDeOar;Z`hs8N&uoDJLcq>U<lqu-Ejrr;cks82Tk
-p&Fjdrr<#os8Duas8V]gp]'d\p&Fdas7?9eq#C-es8)cqq#CBhs8Vfmp](3js8)<dq"asirr;fe
-s8N&umJm4_s8Vinqu?Whqu9"Ns7ZKmrr<#ss8Vigs82]nr;Zfrqu?]mqu?9fqu?]hs82imrVuHg
-s8)Egnc/7]p[\@`s763ir;$Bcs8Vrqs8)`p&,Q>+p](9ks763irqHHmqYgEon,<7oqZ$Tls8W)u
-p&>!fqYpm$s8)Whs7QEjr;Q^"p](9kr;PdWJ,~>
-i;X\as8Duqs8DrsoDe1Ws7uTms7H?kq#C-hq#14/pAagcs7cQkrr;orpAb0is8Vrps8Vijrr3#q
-rVlg%q>^Hhr;ZHgrVmN%s8W)ss7?9is7H?bs8Vrqs8)`p$hsYss8)ZnrVuonp&4mmq#C!arVllp
-rr3>ss8)c`s8M`lqYU3j!q?6frVpj2s8;osoDeOar;Z`hs8N&uoDJLcq>U<lqu-Ejrr;cks82Tk
-p&Fjdrr<#os8Duas8V]gp]'d\p&Fdas7?9eq#C-es8)cqq#CBhs8Vfmp](3js8)<dq"asirr;fe
-s8N&umJm4_s8Vinqu?Whqu9"Ns7ZKmrr<#ss8Vigs82]nr;Zfrqu?]mqu?9fqu?]hs82imrVuHg
-s8)Egnc/7]p[\@`s763ir;$Bcs8Vrqs8)`p&,Q>+p](9ks763irqHHmqYgEon,<7oqZ$Tls8W)u
-p&>!fqYpm$s8)Whs7QEjr;Q^"p](9kr;PdWJ,~>
-JcF^/#QFZ$rVuoqp\b$qp\Y!grVuWkrs&?"s82Wlq#:9pqY:$grs\c%q#:<cs8W#ss8)]nrrMrl
-qu6lrrr;Qhs8DZk'DVUss8VZis7cQnirB&Ls8;corVca!pAb!hp@nReqYU:(q>C9mkl:\Os8VWf
-s7$'grdk+1s*t~>
-JcF^/#QFZ$rVuoqp\b$qp\Y!grVuWkrs&?"s82Wlq#:9pqY:$grs\c%q#:<cs8W#ss8)]nrrMrl
-qu6lrrr;Qhs8DZk'DVUss8VZis7cQnirB&Ls8;corVca!pAb!hp@nReqYU:(q>C9mkl:\Os8VWf
-s7$'grdk+1s*t~>
-JcF^/#QFZ$rVuoqp\b$qp\Y!grVuWkrs&?"s82Wlq#:9pqY:$grs\c%q#:<cs8W#ss8)]nrrMrl
-qu6lrrr;Qhs8DZk'DVUss8VZis7cQnirB&Ls8;corVca!pAb!hp@nReqYU:(q>C9mkl:\Os8VWf
-s7$'grdk+1s*t~>
-JcF[.$1Iomo(MnZqYU6jruM"/s8Vrqs7uEhrVH6fr;HWoqtg?mr9X%Tqu?9drr3#up&=slq"ajf
-!r)9Zrr32as8VEbs7Z3e%eB&fo`+FUrq$0in+-MQrr3B"s8N#ns8Vccs8MW`rrVrcpAY'po`+s`
-m/6kcq>:3bJcFd1J,~>
-JcF[.$1Iomo(MnZqYU6jruM"/s8Vrqs7uEhrVH6fr;HWoqtg?mr9X%Tqu?9drr3#up&=slq"ajf
-!r)9Zrr32as8VEbs7Z3e%eB&fo`+FUrq$0in+-MQrr3B"s8N#ns8Vccs8MW`rrVrcpAY'po`+s`
-m/6kcq>:3bJcFd1J,~>
-JcF[.$1Iomo(MnZqYU6jruM"/s8Vrqs7uEhrVH6fr;HWoqtg?mr9X%Tqu?9drr3#up&=slq"ajf
-!r)9Zrr32as8VEbs7Z3e%eB&fo`+FUrq$0in+-MQrr3B"s8N#ns8Vccs8MW`rrVrcpAY'po`+s`
-m/6kcq>:3bJcFd1J,~>
-JcF^/%/p4rnc/Oequ?]pq=ssh'Dhb*s8;oqq>^?ls8)Wms7u]pq>UC,rVlisqu?]fs8Vufq>^Ko
-q>:'es8Vs"s7?6irUfmb!WDckrrMchr;RE/s7QElo)JUep](9bs8Vris8;]ms82`o&,Z2&pA=mi
-p&+L_s7QEjoR[&&s*t~>
-JcF^/%/p4rnc/Oequ?]pq=ssh'Dhb*s8;oqq>^?ls8)Wms7u]pq>UC,rVlisqu?]fs8Vufq>^Ko
-q>:'es8Vs"s7?6irUfmb!WDckrrMchr;RE/s7QElo)JUep](9bs8Vris8;]ms82`o&,Z2&pA=mi
-p&+L_s7QEjoR[&&s*t~>
-JcF^/%/p4rnc/Oequ?]pq=ssh'Dhb*s8;oqq>^?ls8)Wms7u]pq>UC,rVlisqu?]fs8Vufq>^Ko
-q>:'es8Vs"s7?6irUfmb!WDckrrMchr;RE/s7QElo)JUep](9bs8Vris8;]ms82`o&,Z2&pA=mi
-p&+L_s7QEjoR[&&s*t~>
-JcF^/(%VD)qZ$Qpp\Xges8Dfmp[eFbli6e[rrV]hn,E>7o_8Ccqu-Hgs8VQfs7uKes7Q3bs8Dfc
-s8W)oqu$<gs7H9cs7cQmq#:Eps7-*g%.sT!oDe4Wrr<#ps7-*g"7H0fr;Q]trr;rlrseu'qu$<g
-s8W)us6K^^rr3/us8W#srdk+1s*t~>
-JcF^/(%VD)qZ$Qpp\Xges8Dfmp[eFbli6e[rrV]hn,E>7o_8Ccqu-Hgs8VQfs7uKes7Q3bs8Dfc
-s8W)oqu$<gs7H9cs7cQmq#:Eps7-*g%.sT!oDe4Wrr<#ps7-*g"7H0fr;Q]trr;rlrseu'qu$<g
-s8W)us6K^^rr3/us8W#srdk+1s*t~>
-JcF^/(%VD)qZ$Qpp\Xges8Dfmp[eFbli6e[rrV]hn,E>7o_8Ccqu-Hgs8VQfs7uKes7Q3bs8Dfc
-s8W)oqu$<gs7H9cs7cQmq#:Eps7-*g%.sT!oDe4Wrr<#ps7-*g"7H0fr;Q]trr;rlrseu'qu$<g
-s8W)us6K^^rr3/us8W#srdk+1s*t~>
-JcF[.#k@rpk5Y>Qs8N#t(&7\+s7--hp](9boDej^s8;`ns7c-art>>2s7$'_q>^Enqu?]kr;ZZo
-rr)itp\Fgg"nqTfmJleQrrq`gpAaa]rr2uirVlokrVlfsp&+gnmeHh^l2LMY!<2rs%eof!s82Hg
-s7lKgl2USXrr2ukJcFg2J,~>
-JcF[.#k@rpk5Y>Qs8N#t(&7\+s7--hp](9boDej^s8;`ns7c-art>>2s7$'_q>^Enqu?]kr;ZZo
-rr)itp\Fgg"nqTfmJleQrrq`gpAaa]rr2uirVlokrVlfsp&+gnmeHh^l2LMY!<2rs%eof!s82Hg
-s7lKgl2USXrr2ukJcFg2J,~>
-JcF[.#k@rpk5Y>Qs8N#t(&7\+s7--hp](9boDej^s8;`ns7c-art>>2s7$'_q>^Enqu?]kr;ZZo
-rr)itp\Fgg"nqTfmJleQrrq`gpAaa]rr2uirVlokrVlfsp&+gnmeHh^l2LMY!<2rs%eof!s82Hg
-s7lKgl2USXrr2ukJcFg2J,~>
-JcF^/48/^Js8Vuls82]er;Zfrs8V?RrrDBbs8;ojs8;ons8W)urU]j`o)&ISs8McXFo^7rs8Duq
-p\k'fqu-Ntp]1?or:U(%r;HZ\&c_Fts8Vhn*]"3&mIpMY!r)`crr2ujp](9ls82cp%eTens4'Rf
-"`;Naq#C?dJcFd1J,~>
-JcF^/48/^Js8Vuls82]er;Zfrs8V?RrrDBbs8;ojs8;ons8W)urU]j`o)&ISs8McXFo^7rs8Duq
-p\k'fqu-Ntp]1?or:U(%r;HZ\&c_Fts8Vhn*]"3&mIpMY!r)`crr2ujp](9ls82cp%eTens4'Rf
-"`;Naq#C?dJcFd1J,~>
-JcF^/48/^Js8Vuls82]er;Zfrs8V?RrrDBbs8;ojs8;ons8W)urU]j`o)&ISs8McXFo^7rs8Duq
-p\k'fqu-Ntp]1?or:U(%r;HZ\&c_Fts8Vhn*]"3&mIpMY!r)`crr2ujp](9ls82cp%eTens4'Rf
-"`;Naq#C?dJcFd1J,~>
-JcF^/-2dN;li-GSr:g6kn,E@Zs82`opCRAopAFsds8VTgmelPRs7uZnrsSi+irB#\7h5S!oCi1`
-!;ZWo"oSE!o`"pjrrW&mq=t!irVum9!;HEbqu?[9l2C\_p](9clMpn^s8)?Zs8VihrrDlorseo+
-rUg-hs8P0/lg\Larr3#moR[&&s*t~>
-JcF^/-2dN;li-GSr:g6kn,E@Zs82`opCRAopAFsds8VTgmelPRs7uZnrsSi+irB#\7h5S!oCi1`
-!;ZWo"oSE!o`"pjrrW&mq=t!irVum9!;HEbqu?[9l2C\_p](9clMpn^s8)?Zs8VihrrDlorseo+
-rUg-hs8P0/lg\Larr3#moR[&&s*t~>
-JcF^/-2dN;li-GSr:g6kn,E@Zs82`opCRAopAFsds8VTgmelPRs7uZnrsSi+irB#\7h5S!oCi1`
-!;ZWo"oSE!o`"pjrrW&mq=t!irVum9!;HEbqu?[9l2C\_p](9clMpn^s8)?Zs8VihrrDlorseo+
-rUg-hs8P0/lg\Larr3#moR[&&s*t~>
-JcF[.70Shd+M3OG(8Um.riJ-[/>)nA!WWc1nO!I@pA+RkQkUF6p](9Z5mogQpAb*e!<;fns7H0f
-s7`BG!%k)JrrAE$%^k^!rrrAh1CKlXrr<#s'EJ16!<N)tm7IOWlhUPL0]i8m.eNN9"o"lL!%k)G
-rsJr/p](.$nGiOds7_*EjSs`~>
-JcF[.70Shd+M3OG(8Um.riJ-[/>)nA!WWc1nO!I@pA+RkQkUF6p](9Z5mogQpAb*e!<;fns7H0f
-s7`BG!%k)JrrAE$%^k^!rrrAh1CKlXrr<#s'EJ16!<N)tm7IOWlhUPL0]i8m.eNN9"o"lL!%k)G
-rsJr/p](.$nGiOds7_*EjSs`~>
-JcF[.70Shd+M3OG(8Um.riJ-[/>)nA!WWc1nO!I@pA+RkQkUF6p](9Z5mogQpAb*e!<;fns7H0f
-s7`BG!%k)JrrAE$%^k^!rrrAh1CKlXrr<#s'EJ16!<N)tm7IOWlhUPL0]i8m.eNN9"o"lL!%k)G
-rsJr/p](.$nGiOds7_*EjSs`~>
-JcF[..fjAaQ4IQjSJV>+r#*$@ZY&_,!VucoBlsB/Du]M9EU];5rVu\0POZ/#rVlg4!<;rro_ngb
-oD]r@p:4Q/r;_W1Te#U2rrD]js$?PYqdcSnI/s6Gr;ZNk!<;s#qYsojrO?nJs80N!rD:6%r;Z]p
-s8N&poD]r@p:4Q/s8Vur;N:_9CgR/<s8W)kJcFg2J,~>
-JcF[..fjAaQ4IQjSJV>+r#*$@ZY&_,!VucoBlsB/Du]M9EU];5rVu\0POZ/#rVlg4!<;rro_ngb
-oD]r@p:4Q/r;_W1Te#U2rrD]js$?PYqdcSnI/s6Gr;ZNk!<;s#qYsojrO?nJs80N!rD:6%r;Z]p
-s8N&poD]r@p:4Q/s8Vur;N:_9CgR/<s8W)kJcFg2J,~>
-JcF[..fjAaQ4IQjSJV>+r#*$@ZY&_,!VucoBlsB/Du]M9EU];5rVu\0POZ/#rVlg4!<;rro_ngb
-oD]r@p:4Q/r;_W1Te#U2rrD]js$?PYqdcSnI/s6Gr;ZNk!<;s#qYsojrO?nJs80N!rD:6%r;Z]p
-s8N&poD]r@p:4Q/s8Vur;N:_9CgR/<s8W)kJcFg2J,~>
-JcF[.0`_7Pm/["_rrDuqq\P"Ks7lWf!<;cm)#4'e"98B$s7?6js7cNrp]'8"r:Kpe"T.lks&]-q
-s8*=Xl14lQrrMurncSplqYpNop%/.^q\o#)lkB<ks8)cj!qH9js6ps$o(!^or;-Fi=C^=is7cQa
-pAb-ls8*=Xl14lQoDe^fi#Mdt+m](%rqV-Fir=N~>
-JcF[.0`_7Pm/["_rrDuqq\P"Ks7lWf!<;cm)#4'e"98B$s7?6js7cNrp]'8"r:Kpe"T.lks&]-q
-s8*=Xl14lQrrMurncSplqYpNop%/.^q\o#)lkB<ks8)cj!qH9js6ps$o(!^or;-Fi=C^=is7cQa
-pAb-ls8*=Xl14lQoDe^fi#Mdt+m](%rqV-Fir=N~>
-JcF[.0`_7Pm/["_rrDuqq\P"Ks7lWf!<;cm)#4'e"98B$s7?6js7cNrp]'8"r:Kpe"T.lks&]-q
-s8*=Xl14lQrrMurncSplqYpNop%/.^q\o#)lkB<ks8)cj!qH9js6ps$o(!^or;-Fi=C^=is7cQa
-pAb-ls8*=Xl14lQoDe^fi#Mdt+m](%rqV-Fir=N~>
-JcF^/$2+o.s8Nhls82lrrt=44'K<T$rrDfnoF9p^rsJf&%0$89!<<)b"onW-!<<)nqZQou1AUY?
-s8VfTC*kdZr:L'ipAY-mr:Bsg!"9S/p\t9hmJd1ds8)WdrrE*!#QOf-!"&f.rr4;CciM>is8;ob
-rsf#/rVuTRC*kdZr;ZfdmV%I@pP)lEs8Vopqgne.s*t~>
-JcF^/$2+o.s8Nhls82lrrt=44'K<T$rrDfnoF9p^rsJf&%0$89!<<)b"onW-!<<)nqZQou1AUY?
-s8VfTC*kdZr:L'ipAY-mr:Bsg!"9S/p\t9hmJd1ds8)WdrrE*!#QOf-!"&f.rr4;CciM>is8;ob
-rsf#/rVuTRC*kdZr;ZfdmV%I@pP)lEs8Vopqgne.s*t~>
-JcF^/$2+o.s8Nhls82lrrt=44'K<T$rrDfnoF9p^rsJf&%0$89!<<)b"onW-!<<)nqZQou1AUY?
-s8VfTC*kdZr:L'ipAY-mr:Bsg!"9S/p\t9hmJd1ds8)WdrrE*!#QOf-!"&f.rr4;CciM>is8;ob
-rsf#/rVuTRC*kdZr;ZfdmV%I@pP)lEs8Vopqgne.s*t~>
-JcF[.9*#"cp':Wir!EB$me$MYYS6d2!<;lp)<h+^+Sl$;s7l?jq<e2+q#C$ds6KRX!rW)or;Zfr
-qZ$<ipUCP0rrDofrrDrqs8;Hbqu6U#pFPJ,li@(arr4eM!;uisq=G*qq"k$_m/-fe<Fc'rrq?B`
-rVuirqZ$<ipUCP0qtpEk$1e#orrE)js8VP=s5X-0~>
-JcF[.9*#"cp':Wir!EB$me$MYYS6d2!<;lp)<h+^+Sl$;s7l?jq<e2+q#C$ds6KRX!rW)or;Zfr
-qZ$<ipUCP0rrDofrrDrqs8;Hbqu6U#pFPJ,li@(arr4eM!;uisq=G*qq"k$_m/-fe<Fc'rrq?B`
-rVuirqZ$<ipUCP0qtpEk$1e#orrE)js8VP=s5X-0~>
-JcF[.9*#"cp':Wir!EB$me$MYYS6d2!<;lp)<h+^+Sl$;s7l?jq<e2+q#C$ds6KRX!rW)or;Zfr
-qZ$<ipUCP0rrDofrrDrqs8;Hbqu6U#pFPJ,li@(arr4eM!;uisq=G*qq"k$_m/-fe<Fc'rrq?B`
-rVuirqZ$<ipUCP0qtpEk$1e#orrE)js8VP=s5X-0~>
-JcF[.!!*#u0`_4QrX/5rs'j%=]aXr@1=c$n?B+`3AGu65m/QSYqZ$S"N:4]/o)8Ug"RQ0goDe7X
-rsiM>m'7u<nIts&q?m#trr)j?rr;ZT@C>fB&+9Jtqtp:#rV['&s)En[c=ZqQs0b8o8YQ.`"Si#l
-r:p9k"CeJ!Z6oSN%J'N_C&.Oa70!;Nqu?PEs5a31~>
-JcF[.!!*#u0`_4QrX/5rs'j%=]aXr@1=c$n?B+`3AGu65m/QSYqZ$S"N:4]/o)8Ug"RQ0goDe7X
-rsiM>m'7u<nIts&q?m#trr)j?rr;ZT@C>fB&+9Jtqtp:#rV['&s)En[c=ZqQs0b8o8YQ.`"Si#l
-r:p9k"CeJ!Z6oSN%J'N_C&.Oa70!;Nqu?PEs5a31~>
-JcF[.!!*#u0`_4QrX/5rs'j%=]aXr@1=c$n?B+`3AGu65m/QSYqZ$S"N:4]/o)8Ug"RQ0goDe7X
-rsiM>m'7u<nIts&q?m#trr)j?rr;ZT@C>fB&+9Jtqtp:#rV['&s)En[c=ZqQs0b8o8YQ.`"Si#l
-r:p9k"CeJ!Z6oSN%J'N_C&.Oa70!;Nqu?PEs5a31~>
-JcF^/9`,:rq>(Ttn*UP_j8Z/$%48ggrQHBWs62]U-2[]A!;ulq!<;ZgqHa.WK)blHoF:j#p\uiF
-p\jib0-DUPs8N)ls8N*!qt^-cs8Dor#Nn&HW<rV!r;Q^3!<2uus81be"W!X.naRmpjPMT[q#C$c
-rtkJ/pS]_f-Fs0LnGhn@D#a]1jn\QKpA':>j8XW~>
-JcF^/9`,:rq>(Ttn*UP_j8Z/$%48ggrQHBWs62]U-2[]A!;ulq!<;ZgqHa.WK)blHoF:j#p\uiF
-p\jib0-DUPs8N)ls8N*!qt^-cs8Dor#Nn&HW<rV!r;Q^3!<2uus81be"W!X.naRmpjPMT[q#C$c
-rtkJ/pS]_f-Fs0LnGhn@D#a]1jn\QKpA':>j8XW~>
-JcF^/9`,:rq>(Ttn*UP_j8Z/$%48ggrQHBWs62]U-2[]A!;ulq!<;ZgqHa.WK)blHoF:j#p\uiF
-p\jib0-DUPs8N)ls8N*!qt^-cs8Dor#Nn&HW<rV!r;Q^3!<2uus81be"W!X.naRmpjPMT[q#C$c
-rtkJ/pS]_f-Fs0LnGhn@D#a]1jn\QKpA':>j8XW~>
-JcF^/!:p-h!W)corrD9^rt"f&s8DuknGiO]q>^<gs8)`p%/BJpnc/XZs8VQfs7QBk)"djoq>^Kg
-s82iroCN"\p\4^fq#:0^s8Drs)>sL2s8VKds82Bes8Ducqu?]bs7c3dp](*hrtbA/nc/Rds7lTn
-s8;`ms82iroCN"\p\t1#o(N"]s8;osrVuBbJcFd1J,~>
-JcF^/!:p-h!W)corrD9^rt"f&s8DuknGiO]q>^<gs8)`p%/BJpnc/XZs8VQfs7QBk)"djoq>^Kg
-s82iroCN"\p\4^fq#:0^s8Drs)>sL2s8VKds82Bes8Ducqu?]bs7c3dp](*hrtbA/nc/Rds7lTn
-s8;`ms82iroCN"\p\t1#o(N"]s8;osrVuBbJcFd1J,~>
-JcF^/!:p-h!W)corrD9^rt"f&s8DuknGiO]q>^<gs8)`p%/BJpnc/XZs8VQfs7QBk)"djoq>^Kg
-s82iroCN"\p\4^fq#:0^s8Drs)>sL2s8VKds82Bes8Ducqu?]bs7c3dp](*hrtbA/nc/Rds7lTn
-s8;`ms82iroCN"\p\t1#o(N"]s8;osrVuBbJcFd1J,~>
-JcFX-!V?<hrtbJ2s82`os8N#ms8VHbs8V`ks8Dipo`"k/oDejbs82irq>^Kas7ZKhs7ZEkp&G'[
-s8VZgrrMWbrVlllrr<#rs8NE(s8W)ps7uZorVlg>p&>!jrVuTkq#CBjp&G'hrr)los6]jYs8Vck
-s6fpeo)AY!p]'a_s7ZKgs7uWnnGi66s5X-0~>
-JcFX-!V?<hrtbJ2s82`os8N#ms8VHbs8V`ks8Dipo`"k/oDejbs82irq>^Kas7ZKhs7ZEkp&G'[
-s8VZgrrMWbrVlllrr<#rs8NE(s8W)ps7uZorVlg>p&>!jrVuTkq#CBjp&G'hrr)los6]jYs8Vck
-s6fpeo)AY!p]'a_s7ZKgs7uWnnGi66s5X-0~>
-JcFX-!V?<hrtbJ2s82`os8N#ms8VHbs8V`ks8Dipo`"k/oDejbs82irq>^Kas7ZKhs7ZEkp&G'[
-s8VZgrrMWbrVlllrr<#rs8NE(s8W)ps7uZorVlg>p&>!jrVuTkq#CBjp&G'hrr)los6]jYs8Vck
-s6fpeo)AY!p]'a_s7ZKgs7uWnnGi66s5X-0~>
-l2LbZrr33!r;Zfks8Dor!rDrkrr33%s7lQmq>1'i%fZM$s8W)uoDeF^q"FadJcC<$JcGWIJ,~>
-l2LbZrr33!r;Zfks8Dor!rDrkrr33%s7lQmq>1'i%fZM$s8W)uoDeF^q"FadJcC<$JcGWIJ,~>
-l2LbZrr33!r;Zfks8Dor!rDrkrr33%s7lQmq>1'i%fZM$s8W)uoDeF^q"FadJcC<$JcGWIJ,~>
-kl1_]oD8@a+8l07nb`@^s8Vccr;Zfqs8Dutp\=dcs8Micp&G'jq#13noCdb8JcC<$r;V9~>
-kl1_]oD8@a+8l07nb`@^s8Vccr;Zfqs8Dutp\=dcs8Micp&G'jq#13noCdb8JcC<$r;V9~>
-kl1_]oD8@a+8l07nb`@^s8Vccr;Zfqs8Dutp\=dcs8Micp&G'jq#13noCdb8JcC<$r;V9~>
-l2Le]rVc`uq"+ObrVlosr;-EnpAY'srr<#trVuWXrr3#tqu6Ttr;-BfJcC<$JcGWIJ,~>
-l2Le]rVc`uq"+ObrVlosr;-EnpAY'srr<#trVuWXrr3#tqu6Ttr;-BfJcC<$JcGWIJ,~>
-l2Le]rVc`uq"+ObrVlosr;-EnpAY'srr<#trVuWXrr3#tqu6Ttr;-BfJcC<$JcGWIJ,~>
-l2Lnbs8Vokrr3]'rr;ohs8DlqmJ[(Sn,NF_rr;c^rr3N*s8Vuks8W#ss7Z'as7u>=s+13$s8;nI~>
-l2Lnbs8Vokrr3]'rr;ohs8DlqmJ[(Sn,NF_rr;c^rr3N*s8Vuks8W#ss7Z'as7u>=s+13$s8;nI~>
-l2Lnbs8Vokrr3]'rr;ohs8DlqmJ[(Sn,NF_rr;c^rr3N*s8Vuks8W#ss7Z'as7u>=s+13$s8;nI~>
-kPl+kq#(0kp&G'goDS^hqu??^rVm#ss7uWlrr3&lrVlcq!rW)trr<#sJcC<$JcGTHJ,~>
-kPl+kq#(0kp&G'goDS^hqu??^rVm#ss7uWlrr3&lrVlcq!rW)trr<#sJcC<$JcGTHJ,~>
-kPl+kq#(0kp&G'goDS^hqu??^rVm#ss7uWlrr3&lrVlcq!rW)trr<#sJcC<$JcGTHJ,~>
-l2Le^qu6Trp\b$j&,lP.o)8U\s8Vfms7?6hq#:9rnc/OepAY(!r:g6`qYL6er;ZVEs+13$s8;nI~>
-l2Le^qu6Trp\b$j&,lP.o)8U\s8Vfms7?6hq#:9rnc/OepAY(!r:g6`qYL6er;ZVEs+13$s8;nI~>
-l2Le^qu6Trp\b$j&,lP.o)8U\s8Vfms7?6hq#:9rnc/OepAY(!r:g6`qYL6er;ZVEs+13$s8;nI~>
-k5Q_)rr<#lp&FX`s7cQhs7Z<hs8DutqZ$0ep%&.[s8Dunr;ZNbrVlumqZ#u7s+13$s8;nI~>
-k5Q_)rr<#lp&FX`s7cQhs7Z<hs8DutqZ$0ep%&.[s8Dunr;ZNbrVlumqZ#u7s+13$s8;nI~>
-k5Q_)rr<#lp&FX`s7cQhs7Z<hs8DutqZ$0ep%&.[s8Dunr;ZNbrVlumqZ#u7s+13$s8;nI~>
-l2NC0s8VZis-XfMeGlm-(Uj@a(F-Njs1fWp`W*e''u0d[+<@ojZmug4oDc6F+LZk$JcD,;qYog\
-J,~>
-l2NC0s8VZis-XfMeGlm-(Uj@a(F-Njs1fWp`W*e''u0d[+<@ojZmug4oDc6F+LZk$JcC<$qu;0~>
-l2NC0s8VZis-XfMeGlm-(Uj@a(F-Njs1fWp`W*e''u0d[+<@ojZmug4oDc6F+LZk$JcC<$qu;0~>
-kl1\ZoD\bA%ahRUp-P1O7/o??WB1(V1pE]9s!snQ1B0J7[5.VFUS]gHpH,d[2uipUq>L6k"o82u
-rr2kIs+13LrrE&rquQEerr2?cJ,~>
-kl1\ZoD\bA%ahRUp-P1O7/o??WB1(V1pE]9s!snQ1B0J7[5.VFUS]gHpH,d[2uipUq>L6k"o82u
-rr2kIs+13FrrDfYs*t~>
-kl1\ZoD\bA%ahRUp-P1O7/o??WB1(V1pE]9s!snQ1B0J7[5.VFUS]gHpH,d[2uipUq>L6k"o82u
-rr2kIs+13FrrDo\s*t~>
-l2NL9s8;]mlP[^`$iD+2k8!J#q">Ens!$P(%e(55mhPj5n(nl\"97^,li.:Trs/Jtrr)j'q=O[Z
-qu6Nms8RZJJc)PG"T.iaq"t'g!r2comf.e~>
-l2NL9s8;]mlP[^`$iD+2k8!J#q">Ens!$P(%e(55mhPj5n(nl\"97^,li.:Trs/Jtrr)j'q=O[Z
-qu6Nms8RZJJc)MF!r2WhrVllqm/MS~>
-l2NL9s8;]mlP[^`$iD+2k8!J#q">Ens!$P(%e(55mhPj5n(nl\"97^,li.:Trs/Jtrr)j'q=O[Z
-qu6Nms8RZJJc)PG!ri)qk5Tr~>
-l2NU)s8Drps.0Bb$LA6%rrE'!p[8CfrW)ue"9/B$m0<7es8NGs%J0T$s8N-"q?luns8Vrkp\t6l
-JcC<$WW*;(r;QTerr2KfrpKf:~>
-l2NU)s8Drps.0Bb$LA6%rrE'!p[8CfrW)ue"9/B$m0<7es8NGs%J0T$s8N-"q?luns8Vrkp\t6l
-JcC<$V>gYls8V]Ws*t~>
-l2NU)s8Drps.0Bb$LA6%rrE'!p[8CfrW)ue"9/B$m0<7es8NGs%J0T$s8N-"q?luns8Vrkp\t6l
-JcC<$V>gYps8VcYs*t~>
-kl37.q>^?ln,Mndrr_WI%f[:DknNde&aoK(r"Abl)u:6+lk9<uqtL?frt"Df$i^/8lc--3ZEBq2
-\$`TIZ`\kdJ[DD`$)t/6\[:u.r;Q]`s*t~>
-kl37.q>^?ln,Mndrr_WI%f[:DknNde&aoK(r"Abl)u:6+lk9<uqtL?frt"Df$i^/8lc--3ZEBq2
-\$`TIZ`\kdJ[DD`#H=r4\[;&0rTsQ7~>
-kl37.q>^?ln,Mndrr_WI%f[:DknNde&aoK(r"Abl)u:6+lk9<uqtL?frt"Df$i^/8lc--3ZEBq2
-\$`TIZ`\kdJ[DD`"f\`2\[;"os*t~>
-l2LhPs7ZEk/aB<BqF%]f9E.#MO];AW6Ck#<s%/0S8,[email protected]]nkcH]1AgtKs8D`lrrpF:
-rr<#rJcC<$V>gVpnA4o"s8MZjJ,~>
-l2LhPs7ZEk/aB<BqF%]f9E.#MO];AW6Ck#<s%/0S8,[email protected]]nkcH]1AgtKs8D`lrrpF:
-rr<#rJcC<$V>g\qn%eu&li2J~>
-l2LhPs7ZEk/aB<BqF%]f9E.#MO];AW6Ck#<s%/0S8,[email protected]]nkcH]1AgtKs8D`lrrpF:
-rr<#rJcC<$VuQeq"8V>urTaE5~>
-kl3XAp[S:Q0Esl%s3(fr[f=G^/[k3L_^-&Grjt9(\c8o_*P_Wt"<tV[rPK-YbQ%,1s8W&ts891u
-rr2uoJcC<$V#LSq[f?(#qu?]qo`'F~>
-kl3XAp[S:Q0Esl%s3(fr[f=G^/[k3L_^-&Grjt9(\c8o_*P_Wt"<tV[rPK-YbQ%,1s8W&ts891u
-rr2uoJcC<$VuI&"rr2\urq66hmJh\~>
-kl3XAp[S:Q0Esl%s3(fr[f=G^/[k3L_^-&Grjt9(\c8o_*P_Wt"<tV[rPK-YbQ%,1s8W&ts891u
-rr2uoJcC<$W;d/%q"ss]Z2F4jm/MS~>
-kl2"Xs8V?\s7Z?is8;]m#l"B!nGi:Ws7?0g"76'dnc&Omp](0ks7#XZrs\i&r;Q`%s8W)up&Fi=
-s+13LrrDurrrTY/qYL6lrq-5@~>
-kl2"Xs8V?\s7Z?is8;]m#l"B!nGi:Ws7?0g"76'dnc&Omp](0ks7#XZrs\i&r;Q`%s8W)up&Fi=
-s+13Lrs&8rrr9;'p?Va/~>
-kl2"Xs8V?\s7Z?is8;]m#l"B!nGi:Ws7?0g"76'dnc&Omp](0ks7#XZrs\i&r;Q`%s8W)up&Fi=
-s+13MrsJ_tq"jijqt'^`rU0]9~>
-kl344s7ZKmoDedgs7lWor;ZTmrr;ims8W)urVuoprqlWnrVucps7QEhs8;omrr<#srr3<(s0;V(
-qu?TorIP!"s/#_sYQ+:ls8W)js*t~>
-kl344s7ZKmoDedgs7lWor;ZTmrr;ims8W)urVuoprqlWnrVucps7QEhs8;omrr<#srr3<(s0;V(
-qu?TorIP!"s/H#&rr)]mX8_YTs*t~>
-kl344s7ZKmoDedgs7lWor;ZTmrr;ims8W)urVuoprqlWnrVucps7QEhs8;omrr<#srr3<(s0;V(
-qu?TorIP!"s/Q)+rVQBaql'D[qu-K]s*t~>
-kl1bPs8VcjrttV4rr;TipAb0jp]('hrVuWhs6]jbp&G$irsAZ$s7lWoq=t!eq>UN&s8.BIJcDPG
-$N9u(pU1%rs8N&lrVllro`'F~>
-kl1bPs8VcjrttV4rr;TipAb0jp]('hrVuWhs6]jbp&G$irsAZ$s7lWoq=t!eq>UN&s8.BIJcDPG
-$N0l%p9akos8;ojrVllro`'F~>
-kl1bPs8VcjrttV4rr;TipAb0jp]('hrVuWhs6]jbp&G$irsAZ$s7lWoq=t!eq>UN&s8.BIJcDPG
-$MsSsoWnGgrVccirVllro`'F~>
-kPkYPs8VZhs8Va"rVuohs760hnbiFYrr3,mq#C3frVm;ss8V<_q#9jas7cQeq>UN&s8.BIJcDPG
-$N9u(s0Mb$s6fpbrr2uroDa=~>
-kPkYPs8VZhs8Va"rVuohs760hnbiFYrr3,mq#C3frVm;ss8V<_q#9jas7cQeq>UN&s8.BIJcDPG
-$N9u(s0Mb$s6fpbrr2uroDa=~>
-kPkYPs8VZhs8Va"rVuohs760hnbiFYrr3,mq#C3frVm;ss8V<_q#9jas7cQeq>UN&s8.BIJcDPG
-$N9u(s0Mb$s6fpbrr2uroDa=~>
-l2LkRs8;?brsSPns8Vlorr;ZkoDJUf%/Khks82iro`+Uas5j7[$2FDtrr<#os8VulrrTP,qgncu
-s/#bqrWW2sr361urr*&tmf3=_oDa=~>
-l2LkRs8;?brsSPns8Vlorr;ZkoDJUf%/Khks82iro`+Uas5j7[$2FDtrr<#os8VulrrTP,qgncu
-s.KAnZ2ae%rri5es8Vlcs*t~>
-l2LkRs8;?brsSPns8Vlorr;ZkoDJUf%/Khks82iro`+Uas5j7[$2FDtrr<#os8VulrrTP,qgncu
-s.KAlZi'h,qsOLapAOX`J,~>
-kl1YUrr2ugrr3Dqs8Vfbs8VQfpAap[rr<#d'*%D"s7u]cs8Vc`s7Pj\q"jm_p\t<$s8.BIJcDSH
-$NBqsnG0$[qu#sPrr3#pp%/36~>
-kl1YUrr2ugrr3Dqs8Vfbs8VQfpAap[rr<#d'*%D"s7u]cs8Vc`s7Pj\q"jm_p\t<$s8.BIJcDMF
-"9/&pXoA>$o^Mk[!VuBZs*t~>
-kl1YUrr2ugrr3Dqs8Vfbs8VQfpAap[rr<#d'*%D"s7u]cs8Vc`s7Pj\q"jm_p\t<$s8.BIJcDJE
-!r`/(rr3#no)AXjp[\:Ts*t~>
-kl:\]/H5JFRL9Y(s1KZs_#D:j*5V[TV]62ks/d[j_Yq7g'Y"+^*$`N(s1g$'`q]B0!jhq(JcC<$
-V>h#&q"<qHWq,o\r;6HmrUKo<~>
-kl:\]/H5JFRL9Y(s1KZs_#D:j*5V[TV]62ks/d[j_Yq7g'Y"+^*$`N(s1g$'`q]B0!jhq(JcC<$
-UAk\ss0MV%s8W#qs8;orrq-5@~>
-kl:\]/H5JFRL9Y(s1KZs_#D:j*5V[TV]62ks/d[j_Yq7g'Y"+^*$`N(s1g$'`q]B0!jhq(JcC<$
-T`5#'rVm*$rVu`mrVZ<fJ,~>
-kl1Y\rr4G=+j7n>n5#UR6N9H@VFKqP:SXONpcYFE4o\<LX@E4JT;"sIqbWcO9_eVhZiBoRs+13H
-rt,,$o'Z.anFcP9r:U*bs8Vugs*t~>
-kl1Y\rr4G=+j7n>n5#UR6N9H@VFKqP:SXONpcYFE4o\<LX@E4JT;"sIqbWcO9_eVhZiBoRs+13E
-rso&.bPM5;kl:AVp](6hrq6;A~>
-kl1Y\rr4G=+j7n>n5#UR6N9H@VFKqP:SXONpcYFE4o\<LX@E4JT;"sIqbWcO9_eVhZiBoRs+13C
-rrCRJrs.ojq#C$cqtB[^J,~>
-l2NC/s8V?`ruf+h0)l"HpBpU.l1,/TrsJ;b%0$P)q#L3lrT=@a!<;@!nG`d[r;cWm!jhq(JcC<$
-V>gPmq#CU2k5PDWq=F4XJ,~>
-l2NC/s8V?`ruf+h0)l"HpBpU.l1,/TrsJ;b%0$P)q#L3lrT=@a!<;@!nG`d[r;cWm!jhq(JcC<$
-V#LN!$3^_7!so#ElMpn[q!\7^p&BO~>
-l2NC/s8V?`ruf+h0)l"HpBpU.l1,/TrsJ;b%0$P)q#L3lrT=@a!<;@!nG`d[r;cWm!jhq(JcC<$
-V#Lr8)&!bs%L`X^mJm4\p?_\Ks*t~>
-kPm..s8VSc$4`*r&+KT#rrE)s!<;iqs8E&u$Le!#rsJ,m!:pisrW)un!<;[+q>($lZiBoRs7?9d
-rpg$cro*k[rqu]nrr)lsrr)cprlP0KrquZhq"OIUq>C0irl>$Lq#D6N+;uIN-33i9p&G'^oDa=~>
-kPm..s8VSc$4`*r&+KT#rrE)s!<;iqs8E&u$Le!#rsJ,m!:pisrW)un!<;[+q>($lZiBoRs8;om
-rnm_arr;utrr;utrr;utrm(NJrr;utrr;u`s8DrbrrE&srrE&CrsfPt3^5_o5<AuIr:U*io(2m3~>
-kPm..s8VSc$4`*r&+KT#rrE)s!<;iqs8E&u$Le!#rsJ,m!:pisrW)un!<;[+q>($lZiBoRs7u]m
-rS[\arVuirrVuirrVuirrR1`FrV6EYrTX@\rQP9P,#D<E=Bnm#%fcM!qtodZo`'F~>
-l2O!Hp&G'Zs!,1n/,fqFo*t^4k4T;br"A8_$iV(,pC$m0o&gD\$M3d#s8NE#r<WB"s7+16Za[38
-b-JC`\?<;tZMh'.ZN%6:[CEcY]"G\dZh^g(Z2_-0Zhq'-Z2:^:Z*UdEZaI-IZaI-IZaI-IZa02-
-&[/4DXKAt8Zb<`DVmNG5WMd#lZN%6S[Bm9I[Bm?O]WecLYe@BY]!f/WYIq<TYJIQU^9tAU[C-"B
-!O\s,!!!&t!"G@3Yd1jK]!o/W]<eEFiNick\ZiNGTs_B+Z4X&9'a"sH!"feCo(r:apA=adp&BO~>
-l2O!Hp&G'Zs!,1n/,fqFo*t^4k4T;br"A8_$iV(,pC$m0o&gD\$M3d#s8NE#r<WB"s7+16Za[38
-b-JC`\?<;pZ2q59riuL,rN61)Z2(`rZMV!-Z4+"DZ*LX?Z*LX?Z*LY)Z4XFN_R-SWY-PaNY->UF
-_Qg2JrNZ1(rj2I+(p^KV\?E0CXh([I[B[*CWjf7@Wk>LA\Zu.?rj;^5&?Z-C"WRaQ$3UF*a0W([
-Z*jS:"1bb:\`'n#Y.CmIYbJS9qQg[?#!k4A5Wq\'#64`#s7c*aJ,~>
-l2O!Hp&G'Zs!,1n/,fqFo*t^4k4T;br"A8_$iV(,pC$m0o&gD\$M3d#s8NE#r<WB"s7+16Za[38
-b-JC`\?<;tZN%95[^<LB[/[E3Yl:d,Xfeu*[f3Z6ZN%0+ZMq6.[LomNY->(5Y->(5Y->(5Y->.9
-o!Aq:`3unXXK]CM[(!u_`3ZZF[f3Z6ZMq*-XoYi8rNcI-s0=MiX/rG%[Ap^@Xg"n(Z`UL0\>ld@
-ZG+/j]XbGVZ`OBC&1nkG+VbKhca^?iY-P77Z+@?E^#?C)Ye7<QZD>"AqR$jK-#RIKH?4=@*<6'4
-q!\+Os*t~>
-kPm[Dli6JUfY7df;3naMs$EN[3;WGJWNSJT9V&.Ps$E$a5kI[>X#U.J8?.bGs7QElq"4Obs1eC%
-r;ZfmJcGKEs82rqr;6Hjs8Mcms8N#q"T/,or;?'a*rc3=s8N&ts8N&ts8N&rpYkT=s8VuorqZ9_
-q!7bRl2Lh_rVQQn"nquqqZ$KlrsA,nrr;cnmJZq\rVd?)p])<Y#7Vab/-,8$lMgMUrrr#nrq?-[
-iq!6@p$)JK!VGjWoaC0f'ESXB!!EZ0i:6gH!r)<cp&BO~>
-kPm[Dli6JUfY7df;3naMs$EN[3;WGJWNSJT9V&.Ps$E$a5kI[>X#U.J8?.bGs7QElq"4Obs1eC%
-r;ZfmL&_)Ms8Duq"T/&mr;OP4!Uog_rr`#ms8N#t!qlTnr;Hfurr;ugrr`/rqYpKo&G?&!pAXjd
-rquc\rqcWdrp0L\s8N&u'a-H^0KiB!7g&e[nc/7\q>1!YrVucQrrW0!pAP!kr;$@"#=^mR91DK=
-#P.WfrrDuhs*t~>
-kPm[Dli6JUfY7df;3naMs$EN[3;WGJWNSJT9V&.Ps$E$a5kI[>X#U.J8?.bGs7QElq"4Obs1eC%
-r;ZfmJcG]KrqulprU^'hrUBjXrUBgkn+ZeXqXjU]rrDcds8W&sqZ6Qjq>CEkqY:!fr=JMrp[e:T
-qtp3dkPP#Nnb_\Ns8W)urt5`0=\r[[AmuMTqt^9drV?3ao$.1F/9uQ(O,/C),Q@B2pA"O\o`'F~>
-l2NI:qu?]fs0MnKWW0RV(!?*f&Mq#us0`ONf)NBG!6"oF3!IM*`sX*Co`)`G+3"$Pqu6s"Y5/+t
-rr;ioM>R;MqYU9is8E6#qtg0aqY9sap\Xmb!r2Werqc-]')_Y)qu$?hqu$?hqu$<fq#:6_rr3f.
-s8MrppAa^]r;QWnr;QWnr;QWnr;QWiqu6U/qZ$'brq$-gmJcVMrq$-[rqZQmqYUs$pZVZ0)?L9H
-![%L4o(VtXnc&OlrqZBbo'52r#2J>b%LFF&qB$:h!#PeC!<<-2!:p'eo)JU]rq6;A~>
-l2NI:qu?]fs0MnKWW0RV(!?*f&Mq#us0`ONf)NBG!6"oF3!IM*`sX*Co`)`G+3"$Pqu6s"Y5/+t
-rr;ioM>R;KrqlQgs7lZkrqccpqu#gX!rVrnmJ@[qqtg3dqtg3dqtg3dr;Zcrr9aL_qt9pf!r2fc
-qYCBmqYU-dqYpBhr;ZZort>>,rpTjdo`+sZs7,pbo`+O_qY'pqqZT_a2F]qm63R5d"n;Qlrr;uR
-rs&E$67s]U55@DR#=LXE845^.'`\41n,NFdo`'F~>
-l2NI:qu?]fs0MnKWW0RV(!?*f&Mq#us0`ONf)NBG!6"oF3!IM*`sX*Co`)`G+3"$Pqu6s"Y5/+t
-rr;ioLAUuKp](3j!rr6!r;HBequ$ZtrVuipnbX-uqt^-bqt^-bqt^-bqtpEiqtK:Iq"XI[rrrDp
-qsF:Zr;6NirV-<brq-6a!r)Ndr;R<%s8Vlos7$'[qu?Bip&Fs_rs0KZD.nHOF(H6errD`CrrcOr
-6=*ai=:e[fEGgA_J9>QXs8V`Rq#10`s*t~>
-l2Lq`s8W&trVlg*k5,,Ks7u]prTjI_rVlg=p\k*[s8W)up&G$krVuK`s7Q9ds8N&uqtg9krVcc*
-rr3&qs8ITLs8N#qrVQWo#64]&rr;utrr2ZlrVl`pnc&%X!VQBdrrVoooBuVYrqcO0o^)MQr:^'^
-q=O@ToD&.Op\=IFq=O+Mq>U7Vq=sXQlMq8)$31&2'`d[kh=pR=q"s(Hq!mu#,Tn9R+s8'P+s8'P
-+s8'P+s8'P+s8'P+s8'P+s8'P*%i/fl2KiYkiV*kkiV*k!$2IS#71YT!:p-grrW,krq6;A~>
-l2Lq`s8W&trVlg*k5,,Ks7u]prTjI_rVlg=p\k*[s8W)up&G$krVuK`s7Q9ds8N&uqtg9krVcc*
-rr3&qs8IlTqu-WrrlG-1rXJo$rVuosrr)`nrq6<\rr;Qgq#;-)nGiLfq>^9jrVZ]ls8Vrps8DHe
-rUopb3<qB17mo^73s>T`lMpb]qu>jZs8N$S4[2+p5!M4q5!M4q5!M4q5!M4q5!M4q5!M4q5!M4q
-3))='rs/it4$lD-5Xu%Xs8W'!s82HgJ,~>
-l2Lq`s8W&trVlg*k5,,Ks7u]prTjI_rVlg=p\k*[s8W)up&G$krVuK`s7Q9ds8N&uqtg9krVcc*
-rr3&qs8IiSrr'e8!;l?`&FfGhq"FFVq"t$]qs4%NpA=^bq>:0ir;QfpoD\airq-3mp&G'jp\tUF
->'5@LMM5FXs8VrnrrDHbs!'m0<)ut!<)ut!<)ut!<)ut!<)ut!<)ut!<)ut!<)usp@SZRq%jl"&
-F*rCSC)m9Rq"OUaqt0o=~>
-kl21ms8)cqoD7tVs7-'fli6\Xrt4\hs8;oso)Jacs7c9ap&F[[qu6lms82irrqlWn#Hn%(p%&.\
-r/1LNs8W'1rVH<ap\+7NpA=jhrr;utrr;usqu-?ir;QfsrU]mdrpTjln,NF_qu?]irVllmnc&Xh
-qtg/6qt9j\qtp*So^hbEp$;;Cp##H7n+?;Eq"aa\p\"+E,60.m"Tn`.+93]A-n7J,1FPd6/1i@D
-p\Ogar;-?fr;-?fr;-?fr;-?fr;-?fr;-?fr;-?frquchq#($crqucnrqucj!#lO^$P<dc!;Gp]
-s7H6erq6;A~>
-kl21ms8)cqoD7tVs7-'fli6\Xrt4\hs8;oso)Jacs7c9ap&F[[qu6lms82irrqlWn#Hn%(p%&.\
-r/1ISrVZWm!ri/tq#:TurVlcprVlcbrW)oorq$-jrr)Ecs8NMorr2N\rr2Hdrqucbnc&Ibrr2rt
-#5eH!s8W&krr3&us7uZo"7?-gqu-QprqudT64I-P92\AW9*RRK3B0\a4>BYZ3'B>&rr2lqrVlcp
-rVlcprVlcprVlcprVlcprVlcprVlcprr3,tq>^Blq>Up-4#oPk7QE[>s6fmcoD\@]J,~>
-kl21ms8)cqoD7tVs7-'fli6\Xrt4\hs8;oso)Jacs7c9ap&F[[qu6lms82irrqlWn#Hn%(p%&.\
-r/(CUr;-9frq69qr;QWnr;QWmrql`lrW2rrr;?-c!WMiao+:WjjnSW>nGE+Nq=sUSjn/BHqY:!_
-rs&B#q>:'^oD&=cp@J;"="8Z'IZ'#7DB;bZ8OZ`?764X,6qU)-rrN#qpAYU;<*EmMEaW,is6fa[
-n,;kXJ,~>
-kPkYOs8VQdrs8B!s7cBis7l-`rrr2tp&G'brr2umrr3<!s8W#jp&Fddq>C6srr<#qp\)"Gs82g&
-rquTfp\"1Lp\smdqu63e%fZD*r;QWnr;QWnr;QWnnG`mls8W&tqu6Whnc/UVruqC=q"a^\q"a^Q
-p%e1Nq!RnKm.'Z3n+,]5l13p+nes;<r\4X3/Li++!!O#6!"TG;lf[g/hY$X7nFQ;Clh0'5!;lNj%
-g4(&,SM7;*WZ$9r;ZNkrq-5@~>
-kPkYOs8VQdrs8B!s7cBis7l-`rrr2tp&G'brr2umrr3<!s8W#jp&Fddq>C6srr<#qp\)"Is8W)u
-rVlfdrrE&trrE&fs8N#es8W';rVlcprVlcprVlcprVlTls8Duqs8Vf]rqZTjnc&Ugq#;3(s8W#q
-s7cQnr;Zfns8Vloq>^*es!g;pr\tZR4$,V*&iWKN1/U+k%KHA+s6BXarVHNn!rW)uir'&VpAOaa
-o(`.nrt.7Y8Noa13X#K^p\sdTs*t~>
-kPkYOs8VQdrs8B!s7cBis7l-`rrr2tp&G'brr2umrr3<!s8W#jp&Fddq>C6srr<#qp\)"Hs8;ig
-s8Dlrqu-Kcs8DopqZ-Tbruh46qY9p^qY9p^qY9p^qY9[YqtpEms8Vl`qt9[PoCVnWrU9ajqu?]n
-r;ZE[rrY2T8kT%Q$VO:q0jK$KCm&jA,lR`CpA"XfrSmMSo'c;Ap?VMI%fI8:>@_,X>>Pn2r:BdU
-o)F4~>
-kl2:\s8)?ep](3lmJm4Js8D9`s7QBk!r;lgrr3,pnGhqIrr3#uqu6U#o_\Udrr;]hqu6o,rVuon
-rUfl9rs/Q$r;$-^p%\4[s8N&rs8MTh0E2"Ns8N&ts8N&ts8N&rq=j[Yq"ORXq"ORXq"ORYqr7GG
-m.Bo;q"a=WrV6Ebrq$%2qtTp\p\=LXp[Iq@p\=CPp[mq>ng$+K.4[1k1+"I@n+ZhV)u'$rnE9iY%
-hf-P&etE6mdfi;p\=LWp%7G<pYc&On,<7dn+cqY!!`Sfs8Vurs7c0cJ,~>
-kl2:\s8)?ep](3lmJm4Js8D9`s7QBk!r;lgrr3,pnGhqIrr3#uqu6U#o_\Udrr;]hqu6o,rVuon
-rUflAs8;iss8McmrVcfsrr2Kgq>T=P%d*fkq#CBjs8VNer:p<al2Lt_s6p!fr;$?l%Jp)]7RB*s
-6RY8Z3WK*Rrs0/k5"\.59K<IZrrN)tqu6Zjrr:sV!9jC\!9j7X&H;e7%1<CH#m:e(rqlEgrq?!a
-J,~>
-kl2:\s8)?ep](3lmJm4Js8D9`s7QBk!r;lgrr3,pnGhqIrr3#uqu6U#o_\Udrr;]hqu6o,rVuon
-rUfl>s8Mujs8DfpqYg9krV$9jrVcWnq>gENrrD6Xrs&&oq!e"DrUKmfrU9am5uUQK85M0>6Uq(T
-s8)fpr;R$W??D'^Q],2lo)I\D!93tP!93hL&GlV>)BKk?*YfOZrV?'bs82HgJ,~>
-l2NC7s8W#sqZ$<hs8Vrds8Vfms8Dorq#C<mrqcZns8W#ss6BX]qZ$?jl2Ue[s7ZEk$iB_ss8B>'
-s8Vrqrdk+JrrN,srql?f"TJ>srr2!Y!WMlco`FmR"Sr*6!s%ifqtg3cq"a^\q"a^\q"a^\q"a^[
-pDEEU0/G+;.O[5/./!6!o^_YIo^VSEp%S4[p`&u$oBQB%&el>n&M4"Jo'lDKoCr(Uq!n%Mo).MI
-#Pe>ir:g6kp%n\!rqlK_jLa@>o]lGUs82ieoDa=~>
-l2NC7s8W#sqZ$<hs8Vrds8Vfms8Dorq#C<mrqcZns8W#ss6BX]qZ$?jl2Ue[s7ZEk$iB_ss8B>'
-s8VrqreUULrqHHhrq$0frW<-!ro*kbp(7B6"Vq:Q";:k2jSobf4#f;X5;G&a4#[-=q#C?mrrW0!
-rqQL)r!#GE4A%Xq8-Jkjr;Zfprr2p"qu?]piVs/Xs76*^s8Vccrs\VKpAb0_s82cfrp]pZs*t~>
-l2NC7s8W#sqZ$<hs8Vrds8Vfms8Dorq#C<mrqcZns8W#ss6BX]qZ$?jl2Ue[s7ZEk$iB_ss8B>'
-s8Vrqre1=OrVQKlr;clrrVucoqZ$HmrV-?krVcTpqYU0\rUBgsr#$%d*&&K`)']Rgs8VuYrs;:h
-:.A2O6;U0<p&>0oq>'mdrVm-H@pa/,G]%"(e,K[Js76*^s8VcbrrCpTrs&5tqYTscp%/36~>
-kPkVVs82cp#Oh]mq>^*eq>UBpr;HKl"8)Wgr;Q^&rVuors8)clrqQKm$iU#%rr2lqZ2FOqq>UDO
-rr;ouqu-NkrrDrqrrW3"r;Q]rrql`qrWE,rqu-Bj$NL,*r;Zfjs8W)tr;QcqrVllorVlues8VK]
-ruh42!%8]k*$#V',QRB+o^)5Co(DSHo_%hKo_%kLo_%nQ0a96gp%S+QnG`.iq"ORXq"ORXq"ORX
-rV-BhrqcfrqsOgd!!Vuhq=XXYrql`ls7cWhp=&X?p\XXTm]cBYpAF=XJ,~>
-kPkVVs82cp#Oh]mq>^*eq>UBpr;HKl"8)Wgr;Q^&rVuors8)clrqQKm$iU#%rr2lqZ2FOqq>UDJ
-rr)fqrW`#prr;utr;Q]rqYpKorVc`qs7uX*s8Dups8VZhrqcKjrqlZnq>L9upAP!js6]jdmIpPd
-"@[email protected]'$57.>h!;Z-arAjm=s#U6@62gf`r:'acrY5>1rr)if&H`@D('Y<Q#lal(qZ$E5rr`,q
-q7Z_+!ri/srr2QiJ,~>
-kPkVVs82cp#Oh]mq>^*eq>UBpr;HKl"8)Wgr;Q^&rVuors8)clrqQKm$iU#%rr2lqZ2FOqq>UDO
-rqud4rqcHbp@RYBo(;SLqZ$Top\Xg`q>1$er;ZZn&cDV)rV?Ehnb`4Xp\Xj_qYU!bqZufiqu?]`
-s8VK[rs9EF>$5lf@oQVOm/R)\s%Ebm8Ol388,rVgs7kgX$2b\M()%u3*tAk]rrW3"rQ,!@pA=a)
-r;ZfqnGe"~>
-l2Me&r;Q`rli6bEs76!`rr;Tirr<#ns8VQfp&"X]rVc`ujT#8Trr3<#s8Dutnb)bUrqucr[f$.+
-q=ojI"9/2pr;?Qpqu$KnrWE)qs7lEirqlcqq>UZsrV$'es8;iq#6+Z&q#CB[r;Quus8Vros7Z6f
-(@hGG+pJ&S%2ffZmG7-jnEoB/kOS*`q(*+1p@e7Sp\+@Tpt#63oCr%Nqss[bqZ6Wor;R2es8DNa
[email protected]'^^qu?]q1&UqDp\=LXp\=LXp\=LXp\=LXp\=LXp\=LXp\=LXp\=LXp\=LXp\=LXp\=LX
-p\=R`rWN/$nF?GCs*t~>
-l2Me&r;Q`rli6bEs76!`rr;Tirr<#ns8VQfp&"X]rVc`ujT#8Trr3<#s8Dutnb)bUrqucr[f$.+
-q=o^ErVdK/nb2t]s8Vrps8W#sp\t-irr;uhruM%9pA+agqu6Wos7u]mp&=sQs8Dusrq??joCi1P
-q>UEo('['#4$?#$7QLbRoDeXdrqHHfs8O`8qE+a>rr)rurr)j$iW&rVs8W&ds8N#trVuj*jT#8R
-s8VrqhuEHKr58O=Zh=%ls8N#rr;cihs*t~>
-l2Me&r;Q`rli6bEs76!`rr;Tirr<#ns8VQfp&"X]rVc`ujT#8Trr3<#s8Dutnb)bUrqucr[f$.+
-q=oXC"T.ufkj89>%Ia#js8N&kqtg-bqYgBbrs/K#pA+agq>:0f#57ohnGE%ArqZotqXXFVmI9o8
-q=t!i#p*N"D/joGE*FC\rrE&srrb>P8P)SR9E7i_rs%TbrVZ]oq<7hiirB#Ns8VurirAfQrr<#s
-rQG3FrVHKmZhX@^s*t~>
-l2NC8s7c-brs8Z1!<:7_'Z'gh%kG'Xs2$#sci:I>%D;_D.NcD)aors)s8BhG'$U=S$2aPoqYRSs
-rqlNjs,-dYrVH<drV$6prqZ?br;?Hls8N#p!WN,trr;rqrXAMqr9s[WqYC0\s8VimrrW&pr;Q^!
-r:p<lrV6C/h>eDn":>,2"!7Nt+[Ik+.lSD0-n"TSqXP6jp\=RZq=sd\q=sUWq=XROrU^!krVQKj
-rr)isrqQKnrVlisrQ5'Br:p6d\EX$D~>
-l2NC8s7c-brs8Z1!<:7_'Z'gh%kG'Xs2$#sci:I>%D;_D.NcD)aors)s8BhG'$U=S$2aPoqYRSs
-rqlNjs,$aTs8W)tr<W?"r:g!cs8W)srsSf*qu6QnrVlfrrr;fnrVmi5r;Z9do(MkWn,E@Ys8N&l
-qtU*crU]LVrUfs_r>,G$*()8G:d.9-9,.(Z=%YA681[Iq3:6_LqZ$Tns75a[r;R9+rVcWbqu$3c
-pAFmhs8Drss8;]ls8=_NrVZWlrVZWlrVZWlrVZWlrVZWlrVZWlrVZWlrVZWlrVZWlrVZWlrVZWl
-rVQEiqRHP)rr2lp!<2WjJ,~>
-l2NC8s7c-brs8Z1!<:7_'Z'gh%kG'Xs2$#sci:I>%D;_D.NcD)aors)s8BhG'$U=S$2aPoqYRSs
-rqlNjs,-gRrsSi&p\"1MmdKlCq#($h"o.ujq>C0hrrN,srVl]o)u]g:o)8"Lo_e%RqssX_qt9^X
-q=OCIkk=`;oD8.rs8Ful>^qc]IV<[Ss$gHs5t=a0=$o=<rrN-!oDSdgq>9mjq=4@\qu?Zprs&H!
-rVcWgq"snHr;-6`q=j^Zq=j^Zq=j^Zq=j^Zq=j^Zq=j^Zq=j^Zq=j^Zq=j^Zq=j^Zq=j^Zq>'aU
-q=V2plMlA~>
-l2NR5s8Vons6fp#8Gt65WD*%EV2nRTqa6pO4T@p2YtG$cVR8kS:TU0Xs6rdaSh^-<r;QZnrs-"4
-s8;Qdp&'^I"9/2pr;?Qpqu6U&o(;ePo'GW2qu6Tls8MrnrsJc'pA"7Vq=4:Xr;HU#rVl3`pAXaa
-p\t.FnG`@VpAY!gqu-Ejqu-<W!"]qQ!!!60-3,pkg#__eo]P`:n`oc=oCVYHoCVbNqY:B^qsjRU
-oDAIUs8W)orsST$s8DrskPtAXs8Kt:"T5t5rqc!]J,~>
-l2NR5s8Vons6fp#8Gt65WD*%EV2nRTqa6pO4T@p2YtG$cVR8kS:TU0Xs6rdaSh^-<r;QZnrs-"4
-s8;Qdp&'ODs8ET.rq-0gs75j]rVu`cq#CBmrr2`n!<2or"oA2ms8Vljrs8W(mf3%]pAapes!@=;
-s7?*es8N&ts8N&ts8E3`:JF5J90cD\:]Kh[s7u]err<#mnc&monGi1]p\+Ucli.Opr;6BUqYKaQ
-r8[hMrr;lpqZ$TpdJa(E"T,e0qYC'g!<)orp&BO~>
-l2NR5s8Vons6fp#8Gt65WD*%EV2nRTqa6pO4T@p2YtG$cVR8kS:TU0Xs6rdaSh^-<r;QZnrs-"4
-s8;Qdp&'LC#lFJnmeZeWo(W+_"8r/us8DiprVZZqrVQTurVufqs8Mfn#4VZgs7lWjrr3,os8Vij
-pAYOF@Y0JmMhlG#,%1HErVllro`#3qq"aa_rVuokq>^'b!rM]`rV$9d%f6(erVc?]rS[SDqtg$^
-qYC9jqY&D1#kn,lqY%>op\4%SJ,~>
-kl3=(rVuo[s8P-ts!R+($N1\=kna!j'CY](q%NJk*;gN0kR.=krpBs^rse2a$NKu#rr`&dYPeA!
-!W2kRrVl]qrVlcq%fH@lq"=4JmdKZ9kkX];rr3'!rVc`lrVliq%/fu!q=!SBp%%kPpZ;>J2tHb6
-q!e(Qo]t\pkMk[h'dY(N,:+Q\-:Rt\!!WE'!tu:ImI^)>lhBcAq!7_Nq"a^\q"a^\q=jdkp&+CY
-nc&OZrrE&tr;ciqrrE&mrs&>qqu?]qrVZZArs&5os8TM(rp0T7~>
-kl3=(rVuo[s8P-ts!R+($N1\=kna!j'CY](q%NJk*;gN0kR.=krpBs^rse2a$NKu#rr`&dYPeA!
-!W2kNrVl]tqu$<imJ6bdp&FXRs8;for;uusrqcQrrr<#no)&Femem(fqu?Nmq>C70p](6ms"m#.
-5sdk(5s\TU8hrq,3CQM##6+W,rVHQes8VZVrs&<!pAajdrU]perVcZoqu?Kqo_\Ucrql^"p\=Ub
-s8Drpr;lipdej@Er;Z`"pA+^errN-!rVlKiJ,~>
-kl3=(rVuo[s8P-ts!R+($N1\=kna!j'CY](q%NJk*;gN0kR.=krpBs^rse2a$NKu#rr`&dYPeA!
-!W2kRrVc`rrVZNns7H-e#laktnbr:Zqtp?l"oJ,mqu-KkrrDllrrD`Zrt@t,='8U-='8R?*,f;?
-MLC)$?6&kB"8r3!q!A"aq#C$co)8.T!;lZn&cMUuq=s[UoC;GIqYKdTpA=a_q9o$Eq=XR\poO&Z
-qu-Hms8DTiJ,~>
-l2NsBr;Zcrs7*<[s7QHjquZluq!e^krrE)e"TJK%nHARhs8N>o&G5i&s8N-"q@!,rs8Vicr;Zf*
-q"=@SrV;$E"98;R"o/-##i>CVqu6`sr;?Km&H;V)lM1,@oCD#0nE9B/o&0N<%ajk9m5$+8-6FQB
-,ShQcqW&LWiW'Z($j7%B)\E)EkPP)Nr9XFUrql]^q>:!f!VcKirrDTPrs8Q&qWn1\q>]dYrrDuq
-rltKCr;Zcs]D_d.rpg#=~>
-l2NsBr;Zcrs7*<[s7QHjquZluq!e^krrE)e"TJK%nHARhs8N>o&G5i&s8N-"q@!,rs8Vicr;Zf*
-q"=@SrV;3JrVd<*rr:pg!sAf9"pkG9)!Lqu!<2ip!<2lq%IsJuqZ$Tgr;ZNkr;Z9crsdres8>;D
-2aT_u.mu9]q#:ck#VnV:92e,L1^j?PrVm)hs7ZKjs6fmarVZ`oqu6Wq!VcKirrDWhrseu-rr;ut
-rr;utrr;usq#(KnrqYs]s82i]r;Qcpp\ufDs8N&ts8N&ts8N&ts8N&ts8N&ts8N&ts8N&ts8N&t
-s8N&ts8N&ts8N&trVm#t[f61'r;Zcqo`'F~>
-l2NsBr;Zcrs7*<[s7QHjquZluq!e^krrE)e"TJK%nHARhs8N>o&G5i&s8N-"q@!,rs8Vicr;Zf*
-q"=@SrV;0Irr)ir$gf,U+=8]e+r:n=nc&OjrVQQlrVluuqu-KlrrDfdrrE#srrDKdrs;Li7T`c"
-6sWSlp\tU?<,I>KQ@*sW*<5R-rrVckqYpKpnG`FcquH`lrtbA)qtg0alM18RrVQQjrVQQjrVQQj
-rV-=%q>9gDo^hMGjnelOrVcTer@@pHs8Durs8Durs8Durs8Durs8Durs8Durs8Durs8Durs8Dur
-s8Durs8Dor#6">&q"O[ar;Qisqu-3fJ,~>
-kl3jEs7lW`s"_XprtYCr(\&79p_EE#+lWG6lPolq&cW7.jW4@$s7@?!rsIui#lal(m)ulG\@8'X
-^U:8PYe#[ss0_j76FF/'U:(%C*Yf>&(F^R/Z_FJ(ZaI-FZE^U<ZaI-GZE^U9_iLt&TWt8tWMu=:
-,oJcc'gEZd.&*]9Wgp9(Xfeh#qQ1U=V?SRa$ig86$R>_U_6:/LXi[QQYeR<]q7$F5qQq!H[^`]C
-Z`h'KZEpjCZEpjCZEpjCZMLp-Z4O:MU8tc7[\p72WkPa@Xg5G7YPYR[ZE^^?ZE^^?ZE^^?ZE^^?
-ZE^^?ZE^^?ZE^^?ZE^^?ZE^^?ZE^^?ZE^^?ZE^[5Zc8m@rr`8ur;Q6dJ,~>
-kl3jEs7lW`s"_XprtYCr(\&79p_EE#+lWG6lPolq&cW7.jW4@$s7@?!rsIui#lal(m)ulG\@8'X
-^U:8PYe#[srNR*AZ*CU7_ZMtd5X@Uo6okRhX0/\4Z2Ls1Za-mArNcI0+3^.c]s>Pa`P0'i5WUMo
-1Fc?Y4[$9g[^`<La1AmpY55^I\Y]d'4@M:r68^t4Z,!HJZDkg>[B.!>`3fBK!4)I-'t1NZZ_t+3
-]X"iJZE^^?ZE^^?ZE^_4YlM$-Yn+FBYJ.oj[C<EA]s4fF[_):?1:"6lZa-pCZa-pCZa-pCZa-pC
-Za-pCZa-pCZa-pCZa-pCZa-pCZa-pCZa-mFXgQ-Arr2fps8MZjJ,~>
-kl3jEs7lW`s"_XprtYCr(\&79p_EE#+lWG6lPolq&cW7.jW4@$s7@?!rsIui#lal(m)ulG\@8'X
-^U:8PYe#[s!3lI*6a3l)]=6?4?"n.sC0+P3(<j(hYct:7YdCdG['6^;Yd1XE\'q(lb.uEDeBcIV
-;+j,^6p"sH:/8mV`P]"#d)3f?\,*u[_QFebApefOH!OSeYe-[0XJj.9[]R->_6O!Ds/lF)Y-7],
-'st<TZ)+\+]!/EEYd1L=Yd1L=Yd1M4ZN%9G[^WfX]>Le]`5oj)\?;^>YH=t8](`Kf['I'E['I'E
-['I'E['I'E['I'E['I'E['I'E['I'E['I'E['I'E['I'E['[EK[)8I0qYU0is8)fpp&BO~>
-l2O!HqYU<mrO#K%s7nsOX>p5BT;jsPpb8bD5lWU1\h3qMUouWT6_UD6s7JCXUc/8Gs8W#lrVZN'
-p\"I`s7lNErtGD3rr;utrr;utrr;utrqlWns8Moq"oeQ%r;6KPs7?6crtYG#n,OIE#R1_N*u=qH
-nG)nYrquZhrqQKirqZTh+7_9=2^1"".4?K%i:6<enF?#3nE]N-o_&4Up\t!frqcNnrVuTlrVllr
-rr3)ss8W#cs8W&rrrDo]rt58.p\XXSp[.MFqu?QmrquNfqu"e>"T8,qqn2n-"9/5rrpg#=~>
-l2O!HqYU<mrO#K%s7nsOX>p5BT;jsPpb8bD5lWU1\h3qMUouWT6_UD4rq/:XVE"VLs8W&ns8W)4
-qtL*is7lNUrXJo,s8N&ts8N&ts8N&tlMph^nc/Lco)A^hnc/Ufs8Dus%fcA)"[GC;5t4(.3=#T`
-n,Emq69%Lk68CV`3(``As5s=\%Jg&%s82ims7Q0eqZ$Tjr=o;6"Uk\K#R:\;s82irqYpBjo_na_
-qu6Hl#6+Z%s8Mrlrr)rsq!\7\rWiK#s8;coqYpKo"T/2us80k:"oePu\GlI's8W)js*t~>
-l2O!HqYU<mrO#K%s7nsOX>p5BT;jsPpb8bD5lWU1\h3qMUouWT6_UD5s7\U_V)SACqtp0\r;Z`/
-qY'mfs7lHSrser,rVuirrVuirrVuirnbrFd$2so(qtU$bs8W&rrs8T'rVuirrVuins76-Ws8Doo
-rs9o^EH->RBkLEfm/IAb6W--E5Y4L9=oSF$pA"Xkrr;`hs8;Tj(^Cd"2)dWM,9-scp%7tLqtp?a
-rVH0`qYL3drq6?erqcWks8DuorVllpnc/XfoD]$orV?Bks89k9"SfD$qYU0i!r`#pp&BO~>
-l2Le`p&=tNqDQUus7=eL+3OT)%OAj`s25osa8`h!'Z0je+;D`n^Dn<>oDciH&&J8Cs8VHbqXF6W
-q"+CSrr2otr9F:arVuoqpAYj+r;QWnr;QWnr;QWnr;QN`o^i+Tqu6lms7>mSqu6-c!rW)oqu6Zo
-rVm)sr:p*br8dYNs8)fqrr3l8qtKR[&J,6N!!*B@!9`J7o(D84nE00+.K(Y7.P!&$0^SJrp[7hN
-q>'p`qt^-bqt^-bqt^-drpg!prqlK_o()GIqu4S7rVl`m!<2rsq#8V>#6+T$qmc\*rr<#tnGe"~>
-l2Le`p&=tMqDQUus7=eL+3OT)%OAj`s25osa8`h!'Z0je+;D`n^Dn66mJb0F'?:(Ms8VKds82i%
-s8;olrr3*"pA=deqZ-E^r!*-!r;Q`ks8N!$s8N&ts8MHd$haPps7uTiq>^6ip%JFbrr)cuqu6?h
-o_najr;QHirWiDts82`ns6'1Ws8Mrp%fZM.#!#(@845a37gT.lrr3/qq>^<ks8>(f5!;%k4?iT@
-p&FgErrE&gs8Drbrs&K&rr;utrh'2orr;l)s8Dfo!<2TiJ,~>
-l2Le`p&=tTqDQUus7=eL+3OT)%OAj`s25osa8`h!'Z0je+;D`n^Dn9;nc-fR'Z0_;o^gu6q=Xcj
-s7u]erVcWlpAFmgrrDuerso#&rVQ?drVHKirVQQjrUKdarsSJrq>KdKmI1#Lqt0mf#lFStrVQQj
-rVQKj"ShibqXFI[!r2W`rqZZnrVZZqme$PZrr)j',$f8;K7\Q"GVJjk#$"Jp:/">Sr^m.i!<(@G
-s8Dups8Dorq>L<iqYc]Z"T,V*qu-Bk!<)QiJ,~>
-kPkh^q"=[[s8)ckrr2uirr3?&s8W#gs82irrpTjd#6"Q$s7QE[rr3r1q=j[^pAapfs6B@Ll`K^G
-p$hkPs8N&urr;l`rs&H!p&G'kqWe(br:Tgas7Q'`s8VclrrVrfr;-HhrVZZspAa^[s8W'2k5P8W
-nG`%Yr;QWnr;QTgp\F^cr$_C.m/S(2#64`+#m11Z0IJ7t/MI5M+<g(9lKdd'md]l.p\=L[o_e<3
-s3UcLrr;l)s8D9`J,~>
-kPkh^q"=[[s8)ckrr2uirr3?&s8W#gs82irrpTjd)#aI6s7QE[rr)feqYL-iq>^0gs7--hrk\U6%
-/U#!s8)]loDA%Kqtfm\#QO_uo`+siq<%\`r;-6gp\4[_qY^'es8;ckr;I,qrpKdbrVl]nr;HZ\r
-r3&ls7c'`(Ae%<84#p984lN9#k^VF2)RK^(HOK7q#:Tgs8W)uq>^2?s3UcLrr;l)s8D9`J,~>
-kPkh^q"=[[s8)ckrr2uirr3?&s8W#gs82irrpTjd#6"Q$s7QE[rr3?#rr;rqo(M>>p?MYW!5ea8
-$iBtus82irq>^6fs76'nqYg9co)8Oap\FdYqu6U'qXsg`oB>E0qYg*`rr;oms82ims8;or!rr8u
-rVI#lqs4.VqYU'bq>:3Zrr3&os8)3a'I[m?JV&f=Li>6O@STHe;d2"X<`f(r!;ZTn!r`/oJcF*s
-"oeQ!\,ZEms*t~>
-l2Lk_rVucnrr`5ks8Dor$3'\ts7lWop]'j`rt+_us8M`fr;Zfrr;Zfqr;??grrDT`!"/Mcrr)Qj
-o`+sdqt'Rfq>C9mpAb$gkl21hp](9hn,E@erpT[_s7c?arr`8uqtpBg(%hM)nc&OSrq69ip&=ab
-rqHHes8MNertGA2rVuirq=<tDo(;VJo'PQ>!"Su.*<cQh!%[=.p%.qMo'u50n*]W4n*oo>p%\.F
-r;?5=s3CWJrr;l)s8D9`J,~>
-l2Lk_rVucnrr`5ks8Dor$3'\ts7lWop]'j`rt+_us8M`fr;ZfppAP!is8Vrorrhur#6bP8#Rh4P
-"97fhqXaXQr;?9Yrs&K&s7ZKirV?Horr)Hd#6"AkrVccmrVm0"s8DoiqZ$Qoo`$$-s8VZis6]j[
-s8Vfmq>UEfs7H?gnGiOdrVZWlrVZWgrsf;j9fbj?7m0]Y6hp]YqY^?noCr7fqXOUaon!.grrrE%
-qmZV(li2J~>
-l2Lk_rVucnrr`5ks8Dor$3'\ts7lWop]'j`rsJ;os8M`fr;Zfqq#(.-p\Xg`qt:C5)Bfn1',_Gk
-s763iqZ$Ejs7-'frr_upqu,aY"8VKWo`"mjqYpL&o^VJEp@S"NpA"O`q>V9/s8V`ks6p!_s8Vlo
-qu?]dp?VGCk4\NFo)S^_rsC8_Jp!!4KQM]!?gRdpp&G'bJcF$q"oeQ!\,ZEms*t~>
-kl1h]s7H?dpAP"+nGiO_s7lWorr;rms8;okqu?Wps82cp3;NURs7u]oqYpHnp[e@Z!$!+*(D%K$
-(]a-qnGN:Xr:KRUo^_YFo^_YFo^_YFo^_YIpA4^_r;-3d!<2He$i^2"o(2bUoCDVTrqZTorr2`m
-q#C$sq=s[Uq=j[Oq=s^Vq=ss]!:Kd_!;63d0_d">,pt)i.46AG!$MCH!!*HA(BEmrr;Q*\jnJK)
-p\":Rp\4IXq>9aOs8Vurs8ITLd/O:Ks80;*rTjK6~>
-kl1h]s7H?dpAP"+nGiO_s7lWorr;rms8;okqu?Wps82cp+o209rq6<kqu?WpoC;h[!\ll-5rq1i
-1)']^o`+sas7c6Vrrr?"s8Dusp\t6loDB-ts8VZhs8W&ts8Dutrpp'`rsSf'r;HQkrVccrrVc`q
-$MON"rr)lsqu$<]r;Qcmq>UOX4$#G%3>OY=-5'9A8PDZF6pCnUrVulds6K^bl1b2_p@/+^qYU9j
-JcF*s"oeQ!\,ZEms*t~>
-kl1h]s7H?dpAP"+nGiO_s7lWorr;rms8;okqu?Wps82cp,PhB<rUg-irVucnnFHVZ(JnXZBjb=K
-9.']=rVuoos8N&urpfpGrr`5nk4\WN!qt^MrVHQk!<)Ee!;lTl!W)?arrDiirtA%&:J48M8P;uK
-21KRsMM?P"@j:mO"o&&ks8Vifrs/Ajs8VlhqtksEd/O:Ks80;*rTjK6~>
-kPlUqs8DWjlKnQGs8W&mq=t!irr;rms8;okqu?Wps82cp$2OW"s7ZKlqYpKns!.11!$`6`#nA'm
-'EHeXq"aLVo_%kKq"ag_qt^-bqt^-bqt^3f"o.ueqtoaEq\eSrs7bpNp%J+Pna6)NroWkDo(;VL
-q"agdqu7K(b4YDkkOnK:me-5;nFcAAmd93!lQdtU-3*?5nF?MM)Y3=Z!"L%M"9K>_*WZ!7rqcZp
-p@nL_n,3"WrVQWmJcEgk"oeQ!\,ZEms*t~>
-kPlUqs8DWjlKnQGs8W&mq=t!irr;rms8;okqu?Wps82cp$2OW"s7ZKmr;Z`prXAN#"[>((4$QD%
-1_]6TrrDr]rrrB$q>^Kbl2M:_s8MZfs8Mlkrr;lfrr;H\s8N!.rVufJs8Vcbs8W#ps8Vflr;Qos
-q>WE<q)S3L(D/Z)3CQ2'83@1Xs8)Bes7cBis7$'erVQNmrrrE"rr2clJcF*s"oeQ!\,ZEms*t~>
-kPlUqs8DWjlKnQGs8W&mq=t!irr;rms8;okqu?Wps82cp$Mj`#rUg-iqu?QlrVm0QDK9fOMj&I"
-48o0_q#0s`qu#j]"9&9"p$)JYo)JFPrr<#srr3)hpAadXs8MusrrD$WrrE&grrH&$qG[Gmp\tdX
->^U74F)l)!)uos8o`+shrr2ukrVulrs8;oq#5e5mqY'a`JcF-t"oeQ!\,ZEms*t~>
-l2Le_rr2rtrVZ[)oD/FcrqHBkq#CBgs7?3h.e3H:rq?0cs8W&mrr2lqs8;ons82?e)&<tl!"',N
-!:B@Eq"=+KnEKK7oCWUena6,HoD&.Vq=sd\q=ssbo(rOes6g*d!%A'>s82K[o(;SIp\=LYqY^9i
-rVH3XiUZI.kOS3/l1,`K1+!e_)CR'Yq!0'imdK`=pA"FVoBcMu'-.Z'(CDntr;Z*_s7?9jlMpn^
-q#:Nrq"OggrIP!prrrE%qmZV(li2J~>
-l2Le_rr2rtrVZ[)oD/FcrqHBkq#CBgs7?3h$M"&orq?0cs8W&mr;RN,rq?<ir<GAM8jG6u3BIBD
-s7cQnqtpC+rr;utrr;utrr;utrr2cfs8VrVrsS)r"U>YK$k`dK#3ts_s8Moos8N)hrr3N's8Vrk
-s!gB&2_@-I5XIL(s8W)qr=oGs2b65)4t9,+s8M'WqX=F`lMgh\rVuiq#Q+>go)AX]rdk*rrrrE%
-qmZV(li2J~>
-l2Le_rr2rtrVZ[)oD/FcrqHBkq#CBgs7?3h'(Po"rq?0cs8W&krVulsrV-9brr39ZDh4+:MiE.-
-0`:qQp](3gn,ECbir9Jdj968>-6+'R*Yek>rU0[crqQL"2c*:?6rm&d?;p7k'cC"QCM@Zn6X('#
-rS[JFm/R+Ps8Dcmr;lforqcurp@%GGq"":[JcF-t"oeQ!\,ZEms*t~>
-kl2"gs763ilMpeOs7Q9h$N'l'r:Bscs8W)err4>Drr<#ks6fpdr:0UYqu?Qns7l!^)A)rP$j@7b
-!$NjE3'/S]l0@g+&FfAepuD/=o(2YNq"ORXq"aI[&+oo%!Ytq@!!!'(('=O9o`"mjrY#/)q"=:M
-naZ,:nF?&d.P2i",Q9:r+nGX##5%?Vp$256q=Og`qu6EkpAbEqo`+mis7ZHl!<)Nh!W2hHs3L]K
-rr;l)s8D9`J,~>
-kl2"gs763ilMpeOs7Q9h$N'l'r:Bscs8W)err33$rr<#ks6fmd!;6?g(]X4-rqlTu6:3b':dIN@
-$9("(5!q.+qX"4bmf31]rosFolhgVe5<_:l3Bo\l$2sbdrp]pk-osLH68SU)$Sh\\rr<#rs8Vlo
-p@S@brr2j4rr3!(&-N:D"rIRLr9sUUrr2Kgs8;Zirqc]nrVHTmrVlil!<.QLd/O:Ks80;*rTjK6~>
-kl2"gs763ilMpeOs7Q9h$N'l'r:Bscs8W)err33$rr<#ks6fmd#57oiq>0[\rr3K]Fb"muOaVOr
-.o/l.8kqV9rrD]arrDc`mh4FEoFG5ACh@?sBjD8An)4'@rUTsl2+L8':I+nP!'^>\"oSE#q>^3^
-rrN)qrq[W5rs',X'd"D8//&Kjlh9W;q!\1Yq=OIVq"XUYrq?EgrVH]gp&"]=s3^iMrr;l)s8D9`
-J,~>
-kPnc_s8Vo\4:*)*bo7P9s2b`r_"RfH*?3'!]d4B0rkfim_uIIk*Q[UF`>B6.s8W&nnGjCA!<<-)
-&/P?6p%e+Ppa@UI+=JWf-n6Vp-n6Vp-n6Vp.jlf&2"C/3pC?urrr;utrr;utrr;utrr)j)q#Cj6
-!"'&5%LiF6rVuos/,];>pFe-M.k3"s.Om"Bme-5@o^MJFo^hYHp[n@Rq#($[qYU-dqYU-drUp0s
-p@J%GmG7F)s8Moq!;6'c#QFc&s8)]oo7?qgrrrE%qmZV(li2J~>
-kPmX?s8Vo\4:*)*bo7P9s2b`r_"RfH*?3'!]d4B0rkfim_uIIk*QdgNaVki2rr)`orrtb\4[;J'
-6Tt\QruC\1s"cZ'1d!l^4?GYe4?GYe4?GYe4>SfW55Y9@s8W'-p]Nl_4'#BD<C$c_rr2`nr]L*A
-s#LAar;Zfos8;`n!r`/nrr2ump](9ms8Doo)#+".qYL6hs7$'as7cKhr;Q`ro_e^drr;lp#Q=]$
-s7uTmnq$hfrrrE%qmZV(li2J~>
-kPmX?s8Vo\4:*)*bo7P9s2b`r_"RfH*?3'!]d4B0rkfim_uIIk+3jEWar(]&q"ajfs!;N4H$t6g
-Eb-Kmrte+!>YS3t<E)st<E)st<E)st<DYnC7S!.O%fQ2!q"jd^q"jd^q"jd^rqHus&8@&EOH=RB
-BG1%6q#1'h#t7?U92&)U9LhPCrs&>snbE"YnbDq`qtg*]o`"Fbo^M\VrVQU)r;6$Vo(;bTqsa@T
-pA4X^qZd#rrV-0en:CVdrrrE%qmZV(li2J~>
-l2NC4s8)9cs&Qi5s8G<VXu?;ASuFdNq_YOO49$h,[5.bEVmS;W6)1;3rq&1WVE4_V/bnf8&f(uh
-!"T_e!:om^rquZgp%7qSrr;utrr;utrr;utrr;okp[R`01+FaL00q0=-7C2h-7C2e1Fja?mca00
-j7**P!WrK4!!!K/mk5b0-7C8k.P*1Gq"t!grr;upq"a^\q"a^\q"a^\q"agdjSoD_q==(KqtpEn
-rq$0irr2fqrdk*srs&H$s8B;#qWn03~>
-l2NC4s8)9cs&Qi5s8G<VXu?;ASuFdNq_YOO49$h,[5.bEVmS;W6)1;4rqAO_V`4PR#n&ge8PCm*
-4@954rrr;r5!1YXq)SI9*B?/@3]T5Z7m&d2s7u]ppAYml8Ou9G6TRdDs$AL=48q;*s8W',rVlcp
-rVlcprVlcprVc`qrVZQprVlfls8N#ps8Muus8ITL`;^&?rr;r'qYKOXJ,~>
-l2NpCs8)9cs&Qi5s8G<VXu?;ASuFdNq_YOO49$h,[5.bEVmS;W6)1A;s8G6lU+l62q#::6=)iSF
-GCFRM,PV3KrV66aqY9p^qY9p^qY9pcrVlsi76Nd064?:X;H$Il;H$Ii?WL#"rtI&$It)ctGB.gK
-s%u-Y9MA&M7n#eurrr;pq"F@Orp^-_pA"O`qu6ZprqHfrrVuorqtTs`qu-JEs2Y-DrVliqZhjOa
-s*t~>
-kl40Ms7c3b'(,_lrs%rW*W?cJp([,u,38b6n.kul(&ng5hA?1os6L]irW_Qb#ljr$o(2o'*<Hf_
-+rha+n+QYVr;69_o_/4Srt52&o()P;p\=LXp\=LXp\=FNq<]Qmj6[j>.N]]f,6.iH"onW9$3gJK
-lg*s+nF?&>o_%nNq>:'erVZQaq#L<^r;Z`hrsSf'q!mhFq#(0lrVZZj"T/,ss8DoorVQWjrV-Eh
-qgn[nqum#qs80@ks*t~>
-kl3jDs7c3b'(,_lrs%rW*W?cJp([,u,38b6n.kul(&ng5hA?1os6LZhrX%fg#lXc#q>Ugi9fGI(
-90G<=q"jses8;rtn,<Ffqu?-PrtPD*s"Ql)2E"5h#=:sU6oA+I6jGF?rri?"rVZW^quHWcqZ$Eo
-r;6Ekqu?Nkqu?QorVlfsrVZTlrUp*brIOmoqum#qs80@ks*t~>
-kl3dBs7c3b'(,_lrs%rW*W?cJp([,u,38b6n.kul(&ng5hA?1os6_*'rsn>m!:fOGnc'2"A6Etl
-H"L2!rr<#r!<2rs!;#gK!;$0h!;PjZ&Q3(F<D[.",BJHjHu>(-FX'?Irri?!qYL-Krrr>qq"OIS
-rUU0bp\=U_r;R3%p\4IZr;ZcoqY0a\rVZWnqYpQpJc*so"TJ8tqmktkJ,~>
-kl3F6nc/Ld###Msrs\r)!<3&nmg/sm!<;KirrE)d#5/3"rsJ<+oD\pmrW)ll$MaZ$r878L!X.N^
-rVlotr:'U`q%*8pn+lVAme6>Ip%J(Pp%A1R%/9>ep[RqNn+ZAE!"o21(]aU:#QXMSo_JF_qtp3a
-pA"CTo^q_Fp&+F]!WN#gqZQ`iq"aabqu$BlqZZfjo_&"WrVllqrqQTmrr2rrrr)cnqu?Hmqu20H
-dJjFLqt@Q"qY0@VJ,~>
-kl3sEnc/Ld###Msrs\r)!<3&nmg/sm!<;KirrE)d#5/3"rsJ<+oD\ghrW3&r$i'`$s6L+"%hB$V
-$3peKlMpk^rVcWorU9b<rqQNlo(W+^rVlcprVlcprVlcprVlips8Vrqs7u]nrt/'u7R^3I6UqI_
-li$_Ys8@NKJcGNF#6"Gm\GuF"m/MS~>
-kl3gAnc/Ld###Msrs\r)!<3&nmg/sm!<;KirrE)d#5/3"rsJ<+oD]'qrs&N""mk^Jo\p,b(`O2)
-'+PHdm,e6MrVuoor9""i.t`V5LQmaLH6`Ias8W)t^]4?2!<)fps8.BI_#FW;qt@Q"qY0@VJ,~>
-l2O!Ds82`opBT3n!<3&\r"B#Es616iq[r8m%/^b4mMl!9i9V*V!;lQtq#:iend>Eis80jCR@9nB
-Xe)/qV8\u&[0*eBZ*El(#G86-Vmre2_"b5hZ*U^AZ*U^<Y.UdEVR3_0Yakb'!!E?'!<E0#Y,oON
-]=PS`\$iWGXfSP%Vl-W&o!S%p!jJc*rMojuqlTk!!O/p0[0a1DY-"h1ZaI3Ir367.r3?7*!O8t^
-[*c5`Z+\>RrTaE5~>
-l2O<Ms82`opBT3n!<3&\r"B#Es616iq[r8m%/^b4mMl!9i9V*V!;lKmoDT9cp'guos8C9ZXgZ'U
-`3Z\fY0*9@Za-j?Yd(L?o!J^u[CNBPYdDCE\0/>l\[]2[\[/`\ZG!EO]WelB"@GOK83oa:2$UOr
-aL8MU[f<f>\@&cS\,Nl;\+-g*[IUd'[fX"I\,3T9\$i`QrNuR3s0hs8rj;U2!4;O/J[Ee2"L5Y`
-T`+0UJ,~>
-l2P,ds82`opBT3n!<3&\r"B#Es616iq[r8m%/^b4mMl!9i9V*V!;lU!q>V/tpBgWZoC'Q,X1?-U
-^9"?LWQ(C8\@o\ra2uB:\\#Da\\#Da\\#Da\\#DN\\55`[(+6R]_T/V[^a8_^p(Jd[_K!`EI3Cl
-I"HlW*Pf;4\,NcD\%0,`]=knm^VIXu[e$g)Yk,%"[(F-Q^B;0a]tOEWrOr6G!P,Z<Z3dnJ]=khe
-['6dCrO;j9qmcX9!P#Rh[*c5`Z+\>RrTaE5~>
-l2NF7s8Mfnn5ZX7*</=(Y!DeCViasYqEgaN56"35Yt+ahU9$iO<3)Wcs79$cS1aU9rs[TYp%7pW
-o_\O`o)AXQrs/Q$q>C$cq=a[\,5Cj%o^_YFo^_bDn+H)@pZhDDo*HKT*#^+/*$t[]mc4!6rqQKg
-s8LdQ!VuEeo`"O_p\ssfq#UBlr;Qosq=sd`rVufp!<;inJcF*s#5S2k[f?:)m/MS~>
-l2NF7s8Mfnn5ZX7*</=(Y!DeCViasYqEgaN56"35Yt+ahU9$iO<3)QXr:*UdTeu`Irs%3Wrr<#*
-r;Q]rpAFpnrr<#trposmrVuors8;oqqYL-jrqQL7r;6Nis8Vlos8!Kt6UO%/01\Y@s8)9arVZTl
-r;?Nhs7-'grU]perpKgcrqZQordk*ars&;spU:,"rp9Z8~>
-l2NdAs8Mfnn5ZX7*</=(Y!DeCViasYqEgaN56"35Yt+ahU9$iO<3)TZrUa'pUbqi@p@Zl2rVuo+
-rr2otp\Y!jrTO7]rVHNorqZHss7c9fp&G'err3BR@VB:YBi&Y\)?9a9p\t<nqtpBhnb_nP!;l0`
-s8)fpqYpTnqLS[^rs&;spU:,"rp9Z8~>
-kPm1,s8)cD*u:1Bb8))/s2bm*[djC8,o+l-]0$Y8s03sm^]2I[--#ub_@$dkqu-Nos82iq$G$36
-r;Zcjlhp\[li.1cq#C!ds8)Tl!WMokp^6Teq!@eEp\=LJs7cR%!U':Mq"aa_qu$Hmg&D-Qq>'p_
-s7llrr;?Qnr;QTn"T8)kqu20H])MiAs8;3_J,~>
-kPm^;s8)cD*u:1Bb8))/s2bm*[djC8,o+l-]0$Y8s03sm^]2I[+hdgO_[mO,s8W)us7c?hs0qq#
-qZ$Tjn+m"Sr!<9#qY:*_s8VrcrrrB$s7cQirr3JurW!'*!s\o7$NpUos8DTirr2rt*WH*<s8N&t
-s8N&ts8N#qr;6Ehr;6Ehr;6Ehr;6H]s8W'"rVlfms8W&rrrE%Ls2+d;\GuKms*t~>
-kPn$Ds8)cD*u:1Bb8))/s2bm*[djC8,o+l-]0$Y8s03sm^]2I[+Lq1C`=j'7s8;]hqY'jes181(
-rVuoonGiIaqY9^TpAOO]#5\,po`+sfq#C3h(&.\*nbr+Xs8Vur#8nNq'G)-+)%5[&rtkY2qY'XT
-o_/.YrVQQjrVQQjrVQQjrVQ0^!;l3a"8hrkrVQTsrVHBhrVuTiJcF!p!kA:.li2J~>
-l2Ltarr<#ns8)`p"nqQfqZ$*ars8B!s7$'`pAaa^rr_WfrUKgcs8)upl0\KBq#13no=Ou$#6"Js
-q>'pcl2Lb[mJdFfpAasgs8DcmrsJPnq>0j]nG*%`q;;2\rr;utrr;utrr;utroa:`rqlTjJcEF`
-#5e5qppC"sli2J~>
-l2Ltarr<#ns8)`p"nqQfqZ$*ars8B!s7$'`pAaa^ru:>)rUKperUp3hs8VZ^s75aYo_SFKYl4P"
-rr)$[!<2ut!;Z?gq#1Woo)A=]rqZ6bnGN:c$2s`#rr;fkn,E:`rq6:"rr;utrr;utrr;utroO1Z
-rW)oqrWN2trVlforr`8ur;Q]qp&9OBdJjFJq>U/rrVPp\J,~>
-l2Ltarr<#ns8)`p"nqQfqZ$*ars8B!s7$'`pAaa^ru:>)rUKpbo]u;Ks8Voks7Q$aqZ$TcXRu5]
-qu-Hm"oJ/ko_/.PqZ-Qnr;cTcrV6C"p[eFYs8VrfqWR_MrrVlbmJ?k_rVl]lqZ$L%s8Durs8Dur
-s8DurnGa='qY9p`[email protected]"Xa`rrr;pq"t$gr;6Njr:g<hrIP!srs&ArrqNl!
-qs494~>
-l2M1fs6fpequ?Ths8N&srr3f1s8N&pr;Zfrs8Dutqu6Kjs8Dups8Vflrrr>toD/:\qYpQ,rVm,r
-r;6<equ$HmrtbV3rqucnrqucnrqucnrr2lrs7lWorTaC_rVZ[#q!n1[s7c-an,NFeo)Aair:Bdc
-rosFbrqucpJcE=]"8o_0rp0T7~>
-l2M1fs6fpequ?Ths8N&srr4SGs8N&pr;Zfrs8Dutqu6Kjs8Dups8Vcjq>^Bmqu?]orr)Whp%nQh
-rV?Hlp?2Ger;Z]hrr;forr;utrr;usrVHElq>L4)qt0g^r9jLYq"k!hq"k$gn,2qXrr)iqf`1mK
-rVulrrVc`prquirr;Zfrs8;uts7?5@s3CWHr42k,li2J~>
-l2M1fs6fpequ?Ths8N&srr4#7s8N&pr;Zfrs8Dutqu6Kjs8Dups8VW]nG)k[rqucrrVca"X7PiU
-qt0gd"o\>pq"X^Vq[`K!qt'd`q"t$erVQQjrVcQl!;ufq')qY(p\*\?rVlfrs8)cqo]>f>r;@!"
-rVQQjrVQQjrVb^T!r2K_rqQNirqHoqo^qbIqu-Egq"jmdr;Qrtq"Xa`rVZQmqY^*hqYc!Fci4+F
-\c;Zps*t~>
-q>Uj"r;ZEhq#1-jqu?$^rsAT$s8Drqs7lBbrr3&os8Drs&,c2%q>^Enp\Y!Xs8DWjrr)j'rVQWl
-s8VlgrqcHj!k/..rr;lpr;R3)s8N&ts8N&ts8N&tgA_0PrVllsh#HsEkPkP]JcE=]"oeQ!\,ZEm
-s*t~>
-q>Uj"r;ZEhq#1-jqu?$^rsAT$s8Drqs7lBbrr3&os8Drs&,c2%q>^Enp\Y!Xs8DWjrr)j+rVQTg
-s8Vois82irrr2oq"9,V*qVqM_rr;utrr;utrr;utli-_[q#1<orlkE@rWN9#s8W)ns8W)urrE%L
-s24j?rr;l)s8D9`J,~>
-q>Uj"r;ZEhq#1-jqu?$^rsAT$s8Drqs7lBbrr3&os8Drs&,c2%q>^Enp\Y!Xs8DWjrr)j'rV??_
-rVucks8Dcn"L7jurVcTmlhq4krVuirrVuirrVuibrr`5sqYU*g"8hrlrVZ[$rVuirrVuirrSRVV
-rVQKfrVZNnrVufoqu?Tm!<;]iJcF*s"oeQ!\,ZEms*t~>
-p\tj!s7H-es6p!Xs7#a^r:^-iqY^?or:g-h#4hcnnbiFYrr3,mq#C3frVm;ss8V<_q#9jas7cQe
-q>UN&s8.BIJcDMF"oeQ!\,ZEms*t~>
-p\tj!s7H-es6p!Xs7#a^r:^-iqY^?or:g-h#4hcnnbiFYrr3,mq#C3frVm;ss8V<_q#9jas7cQe
-q>UN&s8.BIJcDMF"oeQ!\,ZEms*t~>
-p\tj!s7H-es6p!Xs7#a^r:^-iqY^?or:g-h#4hcnnbiFYrr3,mq#C3frVm;ss8V<_q#9jas7cQe
-q>UN&s8.BIJcDMF"oeQ!\,ZEms*t~>
-q>Ud!oDeRbs8MEcp&+h'o)JO]s8DQhp%eC\s82<cq>^'arr3E&r:0gas8V`kp&G'Rrr3<"qu?Zq
-s7u]pqt^6nZiBoRs+13FrrrE%qmZV(li2J~>
-q>Ud!oDeRbs8MEcp&+h'o)JO]s8DQhp%eC\s82<cq>^'arr3E&r:0gas8V`kp&G'Rrr3<"qu?Zq
-s7u]pqt^6nZiBoRs+13FrrrE%qmZV(li2J~>
-q>Ud!oDeRbs8MEcp&+h'o)JO]s8DQhp%eC\s82<cq>^'arr3E&r:0gas8V`kp&G'Rrr3<"qu?Zq
-s7u]pqt^6nZiBoRs+13FrrrE%qmZV(li2J~>
-pAZ!*s80]#%KAEas8MBbqZ$Hmo`+seq#CBgrr32pn,N+]q"4Rcs6^O"mf3=_s763ip%/4Vn,N1Z
-qtTpc!jhq(JcC<$U]1Mss80;*rTjK6~>
-pAZ!*s80]#%KAEas8MBbqZ$Hmo`+seq#CBgrr32pn,N+]q"4Rcs6^O"mf3=_s763ip%/4Vn,N1Z
-qtTpc!jhq(JcC<$U]1Mss80;*rTjK6~>
-pAZ!*s80]#%KAEas8MBbqZ$Hmo`+seq#CBgrr32pn,N+]q"4Rcs6^O"mf3=_s763ip%/4Vn,N1Z
-qtTpc!jhq(JcC<$U]1Mss80;*rTjK6~>
-q#;'+s8Vrq-)ptB!<;lks8Dutnb2eTrW"8Jm^`ZEbl>X"*5V[TV]62ks/d[j_Yq7g'Y"+^*$`N(
-s1g$'`q]B0!jhq(JcC<$U]1Mss80;*rTjK6~>
-q#;'+s8Vrq-)ptB!<;lks8Dutnb2eTrW"8Jm^`ZEbl>X"*5V[TV]62ks/d[j_Yq7g'Y"+^*$`N(
-s1g$'`q]B0!jhq(JcC<$U]1Mss80;*rTjK6~>
-q#;'+s8Vrq-)ptB!<;lks8Dutnb2eTrW"8Jm^`ZEbl>X"*5V[TV]62ks/d[j_Yq7g'Y"+^*$`N(
-s1g$'`q]B0!jhq(JcC<$U]1Mss80;*rTjK6~>
-q>UftoDe4XrtEc[h\Q4k#lO8cr;ZZorrE&u,[email protected](0R&3@>s%fD^7JK$ASj!*LSubE]2P6^9
-nG?%ORnWVW!jhq(JcC<$U]1Mss80;*rTjK6~>
-q>UftoDe4XrtEc[h\Q4k#lO8cr;ZZorrE&u,[email protected](0R&3@>s%fD^7JK$ASj!*LSubE]2P6^9
-nG?%ORnWVW!jhq(JcC<$U]1Mss80;*rTjK6~>
-q>UftoDe4XrtEc[h\Q4k#lO8cr;ZZorrE&u,[email protected](0R&3@>s%fD^7JK$ASj!*LSubE]2P6^9
-nG?%ORnWVW!jhq(JcC<$U]1Mss80;*rTjK6~>
-p\tX"s8)E0*WRLunGN+]s"4!Fs8Morqu?0_*o?E;n.b-X$2=H,na?nd#5.clq#^NX"oeT&lP/jg
-#j_Ehq#:E%s8.BIJcDMF"oeQ!\,ZEms*t~>
-p\tX"s8)E0*WRLunGN+]s"4!Fs8Morqu?0_*o?E;n.b-X$2=H,na?nd#5.clq#^NX"oeT&lP/jg
-#j_Ehq#:E%s8.BIJcDMF"oeQ!\,ZEms*t~>
-p\tX"s8)E0*WRLunGN+]s"4!Fs8Morqu?0_*o?E;n.b-X$2=H,na?nd#5.clq#^NX"oeT&lP/jg
-#j_Ehq#:E%s8.BIJcDMF"oeQ!\,ZEms*t~>
-q>W\Yr:U*es8VinoDejgrr;cns7--_rtYnZWrE(nrrE'!s82lsq#UNp!WEGprs8W3m/I(W'));)
-s7cTooG.2trrTP,qgncus.fStrr;l)s8D9`J,~>
-q>W\Yr:U*es8VinoDejgrr;cns7--_rtYnZWrE(nrrE'!s82lsq#UNp!WEGprs8W3m/I(W'));)
-s7cTooG.2trrTP,qgncus.fStrr;l)s8D9`J,~>
-q>W\Yr:U*es8VinoDejgrr;cns7--_rtYnZWrE(nrrE'!s82lsq#UNp!WEGprs8W3m/I(W'));)
-s7cTooG.2trrTP,qgncus.fStrr;l)s8D9`J,~>
-q#:Kqs7--Zrr5I^s82irq#C<hs7lWor;X5>rZ1Cl&-!:)p(%-#''\imrYjqn$iCP+k6q:soC3In
-rsAK!#lX]$n]7o?\$;aOZF%*NY.&tfJ[4gO#Ip\<X1#I?[DB-QUrTd=]Dqiqs*t~>
-q#:Kqs7--Zrr5I^s82irq#C<hs7lWor;X5>rZ1Cl&-!:)p(%-#''\imrYjqn$iCP+k6q:soC3In
-rsAK!#lX]$n]7o?\$;aOZF%*NY.&tfJ[4gO#Ip\<X1#I?[DB-QUrTd=]Dqiqs*t~>
-q#:Kqs7--Zrr5I^s82irq#C<hs7lWor;X5>rZ1Cl&-!:)p(%-#''\imrYjqn$iCP+k6q:soC3In
-rsAK!#lX]$n]7o?\$;aOZF%*NY.&tfJ[4gO#Ip\<X1#I?[DB-QUrTd=]Dqiqs*t~>
-q#:Baq#::aloYFO!<<&ns7u]hs7lEili47%q+Qs]3r_OBW&XYL;5p`^nP#LQ7fPf@]Kl*]SZ=aM
-mmsI?:&jnds7l6bs8Tk0o_eahq18Qss7$'grVum!p&FQrrrqE^]CYpnm/MS~>
-q#:Baq#::aloYFO!<<&ns7u]hs7lEili47%q+Qs]3r_OBW&XYL;5p`^nP#LQ7fPf@]Kl*]SZ=aM
-mmsI?:&jnds7l6bs8Tk0o_eahq18Qss7$'grVum!p&FQrrrqE^]CYpnm/MS~>
-q#:Baq#::aloYFO!<<&ns7u]hs7lEili47%q+Qs]3r_OBW&XYL;5p`^nP#LQ7fPf@]Kl*]SZ=aM
-mmsI?:&jnds7l6bs8Tk0o_eahq18Qss7$'grVum!p&FQrrrqE^]CYpnm/MS~>
-q#:d#rqufr!6bE:s8W#rrr4Y<qZ$T[3WKf0s0+!fbOige1V3Vd[Ls,%s1CJp`;d5)"j?qd$R43p
-s1oTq`VB?-rs8P*q>^Kos8)_GqgnY7qZlQhs6TdWs6%5q#6+Z&qR?J$li2J~>
-q#:d#rqufr!6bE:s8W#rrr4Y<qZ$T[3WKf0s0+!fbOige1V3Vd[Ls,%s1CJp`;d5)"j?qd$R43p
-s1oTq`VB?-rs8P*q>^Kos8)_GqgnY7qZlQhs6TdWs6%5q#6+Z&qR?J$li2J~>
-q#:d#rqufr!6bE:s8W#rrr4Y<qZ$T[3WKf0s0+!fbOige1V3Vd[Ls,%s1CJp`;d5)"j?qd$R43p
-s1oTq`VB?-rs8P*q>^Kos8)_GqgnY7qZlQhs6TdWs6%5q#6+Z&qR?J$li2J~>
-q>Vc1s8VZirJ.0Hs6]jdrV$3_q#CBms6K^bo'QJWq=jphrTjI_rVlg=p\k*[s8W)up&G$krVuK`
-s7Q9ds8N&uqtg9krVcc*rr3&qs8ITLJcG3=!;lcq!Ufp$rs&5tqOd`dq<\-3~>
-q>Vc1s8VZirJ.0Hs6]jdrV$3_q#CBms6K^bo'QJWq=jphrTjI_rVlg=p\k*[s8W)up&G$krVuK`
-s7Q9ds8N&uqtg9krVcc*rr3&qs8ITLJcG3=!;lcq!Ufp$rs&5tqOd`dq<\-3~>
-q>Vc1s8VZirJ.0Hs6]jdrV$3_q#CBms6K^bo'QJWq=jphrTjI_rVlg=p\k*[s8W)up&G$krVuK`
-s7Q9ds8N&uqtg9krVcc*rr3&qs8ITLJcG3=!;lcq!Ufp$rs&5tqOd`dq<\-3~>
-q#;H6o)JLT#QOi-#Pn5ks82irq!\7Ys8Vins8N&uo`+Xart4\hs8;oso)Jacs7c9ap&F[[qu6lm
-s82irrqlWn#Hn%(p%&.\r.4iurpfsms7$'Ys8Vlf_#=Q<mf10"p%dtSJ,~>
-q#;H6o)JLT#QOi-#Pn5ks82irq!\7Ys8Vins8N&uo`+Xart4\hs8;oso)Jacs7c9ap&F[[qu6lm
-s82irrqlWn#Hn%(p%&.\r.4iurpfsms7$'Ys8Vlf_#=Q<mf10"p%dtSJ,~>
-q#;H6o)JLT#QOi-#Pn5ks82irq!\7Ys8Vins8N&uo`+Xart4\hs8;oso)Jacs7c9ap&F[[qu6lm
-s82irrqlWn#Hn%(p%&.\r.4iurpfsms7$'Ys8Vlf_#=Q<mf10"p%dtSJ,~>
-q#:Ees7cHk!:'L^s7?9j&,lOus8)coq>^Hks8N&nnc&Olq#C$es7QBk!;HKm$2=K"r:]g`p]('e
-rs&K&s82Qa[=S@/s6'C`r;ZW.rs&>is6m#gq<S'2~>
-q#:Ees7cHk!:'L^s7?9j&,lOus8)coq>^Hks8N&nnc&Olq#C$es7QBk!;HKm$2=K"r:]g`p]('e
-rs&K&s82Qa[=S@/s6'C`r;ZW.rs&>is6m#gq<S'2~>
-q#:Ees7cHk!:'L^s7?9j&,lOus8)coq>^Hks8N&nnc&Olq#C$es7QBk!;HKm$2=K"r:]g`p]('e
-rs&K&s82Qa[=S@/s6'C`r;ZW.rs&>is6m#gq<S'2~>
-q>V3(s7--bo`+FYs8VTgs8)cos8;coqYpL%r:p<bo)JaUs8VckrrW#ro`"jnp@/+Mo)AXirql]p
-#P@olrr2rkqtpBuZMjh'q>Ks\JcC<$nc&g^s7ZKm!;+#*"SD]os7bjZJ,~>
-q>V3(s7--bo`+FYs8VTgs8)cos8;coqYpL%r:p<bo)JaUs8VckrrW#ro`"jnp@/+Mo)AXirql]p
-#P@olrr2rkqtpBuZMjh'q>Ks\JcC<$nc&g^s7ZKm!;+#*"SD]os7bjZJ,~>
-q>V3(s7--bo`+FYs8VTgs8)cos8;coqYpL%r:p<bo)JaUs8VckrrW#ro`"jnp@/+Mo)AXirql]p
-#P@olrr2rkqtpBuZMjh'q>Ks\JcC<$nc&g^s7ZKm!;+#*"SD]os7bjZJ,~>
-q>Up&s8Vlis2-8h-b]Q[qYgF&qYg9jo`+sbs7ZEkj8T)Yr>P_2s8DusqZ$Nos8;oslMpbXs7lW\
-s8Vrqp&=q#s82Wjs8TS-s8MciqY^?2rr`8urr14C!<2lq"8r&nr9XFcrqu]ndJj:Iqu$Bls8;lr
-!WN#crW3&uj8T2[qu6Tp#6+8pru%7F_#FT9s8O10+TDBCqt^-gnc++~>
-q>Up&s8Vlis2-8h-b]Q[qYgF&qYg9jo`+sbs7ZEkj8T)Yr>P_2s8DusqZ$Nos8;oslMpbXs7lTW
-rr2cop\k*uqtU*hr3Q>$s82cprVl0`!<2rsrVlZn%K?D,s8N&ts8N&ts8N#rr;ciorrE&srSdbG
-rrW,qrVQTprr)ffrmh&Crr2p"rquZkrr3'!rVb+C!r`#orVm6'rr;Zimf7>-oDHN+#laVspAeq.
-p@S7^s8MZjJ,~>
-q>Up&s8Vlis2-8h-b]Q[qYgF&qYg9jo`+sbs7ZEkj8T)Yr>P_2s8DusqZ$Nos8;oslMpbXs7lWY
-s8VrqpAOprq=a[`rNuP's8)Qk!<)ln$iTu$qu-Ejqu-EjqtU-Lrr`/pqYT%I!<)Nd!<)0^r;HTo
-ir/9ErVaS4#lX8fl2YZ$m/+["%JBA[!*fNoo)8UcqYL0]s*t~>
-q>UNos5EtW0,_.lW#bp<nGi:`rV-?lr;ZQhs8Vopq>C6lqt^6krp]sfpAa^\s8VfmrVuKho_ndq
-rr<#smelkXrqud%_>jQ4o^qPFr;?Tprlb<DqtU!WdJs4F!W;rqrrrDro(;\UrVlrss8Dor!;?9h
-"oe>jp&"aarrrAss8Vurp\k?drr)imr;HWert4\knc/V4s8V?Yrr<#onb2eTrVQZkp\P!iqu-Hr
-s8)cqqs==sq<.JOr;ZT_s"hs<eNEm$rqZQbpA"X5rsV6Hf%!:js75XAq>TsVs*t~>
-q>UNos5EtW3#T*uW#bp<nGi:`rV-?lr;ZQhs8Vopq>C6lqt^6krp]sfpAa^\s8VfmrVuKho`+mc
-qt9pfs7?0g"oSAuqmHA#rs&H%s8DimrU0^cr;ccpr<3,urr2lqrYPV6rVcZmr;HQlr;HQlr;HQj
-qY9g[qu6Tp#PnArp@n@Qr8[bUrq$-lrq?![qu7<+oBlACr:p3dqtoj[q>:'erVlEg"TJ8ts8;Tj
-!;-9j!WE&srr2irr;HR0r;6EirUU!cq"=^Yrq-6ho(i=brr)iprrE#js8Dp"s7uZnqX=D"qt0IZ
-qYpH`r;ZB`!+JB,!;H$`qZ$3^q#Ab@&H2>'>t7Wim.gV\rVuoerVlKiJ,~>
-q>UNos5EtW3Z5="W#bp<nGi:`rV-?lr;ZQhs8Vopq>C6lqt^6krp]sfpAa^\s8VfmrVuKho`+pi
-s7lTlr9sOXrqcioqtp<#rquors8;co')VCpp@e:Tq"FLVq"FLVq"FLXrVHNj!<(sX"8)'NlMUY^
-r8R_WrV6!X!;l]os8Dor"T/5qs8;iq!;HKm#lFJnq"jshs8Droqt^Kko_SFXqY0ahlhL5Lo_AFU
-rs8W(qY'[ap]($brrE&rrrE&os8DrprrE&`rtYG2q#CBis8(jB!*D6S!;,sarr;cjao;nMo\fd,
-+#!]Yp&4LEnbW.Ss*t~>
-q>V$$oDeCUr>)[4aTVY>rr2`lrr5+Sp[/"-!rp(X*Q.ok+Y:A)s3(lm])Tl"$GHJN)AU^#_B0rJ
-r;X>?)U@sOq>'scqu?]&s8Vf\o_&"Wqu6ZqbPqeDq"=Oar;5"Ds8N#qrVm'!o^MDCkl1SgpAajd
-rVulss82]n"TJ2eo_eRc(]474qu?]qs8MurrVlcprVHQor;Z6`s8Drqrri2ts8W)trt+o'o`"kC
-R5"[8q"t*kqt0dbrW2omq#19krqQTlr8[eWqtpBt.C\('hVKWsrt"]Og>N#2aYj+gnauhWs7Z*b
-J,~>
-q>V$$oDeCUr>)[4aTVY>rr2`lrr4tOp[/"-!rp(X*Q.ok+Y:A)s3(lm])Tl"$GHJN)AU^#_B0f;
-n,0O()UnQ_s8MunpA"N\pAOmcrVm#uqYL-hmf3(]rVccqnbiXgqY9m`rr)j#rq,XJqYT:NrVcit
-rqHEprqH*^r;RGtr;$-Oqt0m^q=jgcp&"O]r;HWfrtbJ2s8)`prVuiqrVlcprVlWms8Dueqtg?m
-rY>5(qtg*`rVZ0as8Vcm9*"nis7u?^qu6]pqsj[nrr)clqXO@TlhC2Gq$$HPmJm4crq6<k"oqOc
-5s&TWrqZWcrqcHcde=(ChZ.4M8Q8=_qYgErp\XCWp&BO~>
-q>V$$oDeCUr>)[4aTVY>rr2`lrr5"Pp[/"-!rp(X*Q.ok+Y:A)s3(lm])Tl"$GHJN)AU^#_B0iB
-pA_Q2(sV[Lq"XUWoCi$Yq"j[SrVHNrqXjFTmeZq[!<(sX"7tmCo@s9Tqtg3dqtg3dqtg3dqtg3f
-rri;tqu?0brrr)qp](-iqu6ftqY9j_rVulqrVHinqu-6drVQQhq$6TiqtU'Sp\jpf&c;P,rqu`p
-s8N&soB60E!;-3`rrN,tpAb'hs82fl"S2?_mIp,C&bG5RoCVbIo^D&%!&c5Q&jHBqoDn7WoZH_7
-n^IP"#o5*T!;cQ`m-X<5s*t~>
-p\tNsq>^9"0)up+rr4kSs8Vfjs8;osoKrWQ9T-)NoKT4>7K<3NWiA>Z4.<9KqFmTh4mPS;RlCBI
-6F!.Dqu$6frr)is^&J$6p&+^^q>Us&q>0p`q>0p`q>0p`q>1*ds8)`ms8;rsqu7<.rVlcprVlcp
-rVlcprVlcnr;HWo$N0bjrq6<kr;?Qmir8rWs8Muqr;7c8r;[email protected]:Rq#:9jpuD2;
-rr2rtrqc?[p&=Xa!WMohrrDWerrDroq#C-kr;QQkrtG,+s6K\MfuV5Rs7H9is7Q0es8;Qi"oe/a
-o_8=FrtU]@S!:=ORO>\\s8VlX_Cq.>WKX3Nq4uH9%%f5Ian,2gd]F5^rnHrBJ,~>
-p\tNsq>^9"0)up+rr4eQs8Vfjs8;osoKrWQ9T-)NoKT4>7K<3NWiA>Z4.<9KqFmTh4mPS;R4eF7
-4KtG?s8W&rrt58/Z2=M!q#C<fqtg*_qYL-go)ARerr2rr!;ufm,5V38rr)iprr)iprr)iprr)ir
-s8Dilr;Zfjs7?3fr;Zfrir&iQ!r;]hrVH]pqu$?jquZ`mrql^!p&4@Zs82`o"7-!Wrr2frrVlfr
-!;lWg#Pe5or;??]p\=UflLk&Irqc]nr;Q`ps8N)rrVmT%o_n@Y!+nW+!<;ujoBH&Ms7c-Zrqlcj
-qYL9lr;R0(qtTmKmdB,tl/h=(mhkERh.g/4>]F%h!+\8o8jZQl!*<<><bZ"<B@:B(BF8?L<'EEF
-@0$9+h>R3Eq#0mcJ,~>
-p\tNsq>^9"0)up+rr4kSs8Vfjs8;osoKrWQ9T-)NoKT4>7K<3NWiA>Z4.<9KqFmTh4mPS;RPFjA
-5-CG:r;HBfqu-HuZi0dsnb`1ZrVm#tq"4:Yo)A^erqZQjs8Dip!WDoeq#^9\o`"jurUT@8o^r1`
-rq,jYj8JEG%K6+rpA"Obr;ZWns7Q?hrs/8tr;Zfqqtoj^!<)Zl!;63gqYpNp!<)lr'_V7pdEqqa
-/P6$.mI9c+gZ\G/pA4dg!;cQks83E(q=jXTnEfMsiT&SFh::*Je/6Z^`()^`6X2oG!&4p5)$:gF
-!'<>?3_`&c9+Fl#=>23=*_^&DrU\+tp@A66~>
-p\tBks8V]brr3;sl2U2<s8V`ks8MpNJT;(p#5Rfortaep$1.[!lg>#X!<;3^rrr&S&,uq#q]GY2
-$hO9'rqcKhrquK]pTX5g!<2Tf"T/#iq>'scs8;orn,ERjq=sjbrqufrq?6]fp%eU@s8Dp"s8N#q
-qu-?gq[W/lm.gAHrUf%Cp%A(Pr;HWsrqlWfrrDucrs&>so`+pjrr)j#o)&Ieq"O^d"ZX]]s4]Tm
-rs#*`Y`QMjV=UJaWk,k=rru-=p%mV!6G`[.-EH#!iP.#Fs7Yp]J,~>
-p\tBks8V]brr3;sl2U2<s8V`ks8MpOJT;(p#5Rfortaep$1.[!lg>#X!<;3^rrr&S&,uq#q&Aqu
-#OhNss8;fos8MfdpT45jrr<!%rVlcorr)iqc2[hCrVluqqZ$QQrs/Q%rVZWlrVZTl!rW#qpAYEl
-s7QElr;ZHOrVlrss8W&s"98B!r;6?nqY^'arVQZjqY1!c"nqTWnEg/Nrtk8's8Vferr2cjnGuKK
-<_*5gr:0=Ms8W&l!V#RQpC[6!rr)clq=jUSnn)'B8TRsBo4.f.*,P<Dn*f*"p%8;Z9L1X7!:]IH
-lgXB1n*of8n*n]m&b52f6W@8a;ulXio`+mXq=jj\s*t~>
-p\tBks8V]brr3;sl2U2<s8V`ks8MpGJT;(p#5Rfortaep$1.[!lg>#X!<;3^rrr&S&,uq#qAf2&
-#k%KorVQEir<i5ior\)fq>'mar;HWtrVQHgiVsPfq"jd^q"jd^q"jd^q"jXLn,*+a$MsDeqYpNp
-p?V,BdJj7BpAX[mq#16mr;ZEfq!n4Tl2(D[rSRW"rVuWlrVuirrVuieq>^Efp&FpalGrrH%5K:2
-h!!e\hp^$3rp9aKjnJ0Amg\[NlKIBjiDiHS2e#0Go1'B]85[gbdFcOhc,BZ)+VFbj!<1FLcdU@i
-b0pjUjo?e_2DIl*s8V<MmHX9BJ,~>
-q#:?\r;QfmqYpLgrr<#bq#CB^q#@ZVp&t'rs6'mX!<<'+s8N*!rW)s'qu6]s!rr9#o*,*m!WW06
-s69X_qu?ZhpA=a_\ao1`rVuWjq"OFQp%\C\r:Bmhr;-3fpC$ZdoC;>>mdBK0nbVkV%K#nlo_%tT
-qu$HhrqksYpu)#CqZm&rqtTdSp\Xph&c;M#q>C9ks8N&uiq2s3q>1*grrN,qqY:*i"nM<_o`"jc
-rs&E$s5a4[r9jRi38<]ts7OMnq>UW=VQ-r"QMREbVlQkuVkg#WR>Qk"rrDo_rrDlkrrta&i8$d#
-oYLP5;7<p\2#mLNrr2p!q>1*`s*t~>
-q#:?\r;QfmqYpLSrr<#bq#CB^q#@ZVp&t'rs6'mX!<<'+s8N*!rW)s'qu6]s!rr9#o*,*m!<<'1
-r8n"Uq>^KkqYpL+_u96(r;ZKirVlisrr)clq=F@^q>:-gs8Mfn!;uHb!;uir$2sbtqtp?frr;Nf
-rrE&Vr:g'jqYU0grr3#uqu6BmqZ$Qos8W!0pAY*Urr;cnr;-6ap\4CVqu$?hr;Zd$oC`%Ss8N#o
-r=&H!rSRSPp\jp`q"a^aq>C./rVZQckQ#6V7lNS.!:]aMmHF65b_9S@E+N#F@hE0W?=%#J@Us(X
-AG5fdqrmqQoCsI$h=:"'q"!eAm.p,N6!.[uo\TE?p$);?p\=LXp\=LWde4"Aqt17n6>-AjoD\di
-rW2imo`'F~>
-q#:?\r;QfmqYpLSrr<#bq#CB^q#@ZVp&t'rs6'mX!<<'+s8N*!rW)s'qu6]s!rr9#o*,*m!<)j,
-rT=1Xr;Zfmqu6U%_YN]op\OFTp@nL\!;l-_!<)lrqu%0)q>:!bq>:!bq>:!bq>9gJkk>#U$N9et
-qu?]gqX!P?i;4#_qu-Ejqu-Ejqu-Ejp[J1J"7>UMq>L=)qt01?lhLA>s8Vrqq=jUWqt0pgpAt9f
-p\uoGs8V3\s8N&np%S.Rp%S.Uq"ja]q"j[OfDmf5'+5U3!9*.qcagp8Wae@b:.$f55n?=R9MS>Z
-;,^Ij<9NQ)m+Usr(Y\6:j7Dg0n_W?]!&$T(!9)>mmHNEniQCHrnb_eU/fdOaoD&@Zn*]l>s*t~>
-q#<MSs6fpY!<<)_6hgQZq>^Kbp](9`7*kK;rrD3O+9)fCgB7?Q$1I-rjUgtB)Y4F-jWX=@g[bdP
-o+LHg-3!o[m)6-6Yb7/nZ+%?VYe%-CX/W2(ZF.15\c9/=[f<`CZa-g>YHG%0XK/M3o=$B][Bd$@
-ZF.6S^8J3?Wj&S'[C*HN[^EQO[^EQO[^EQO[^EQO[^EQO[^EQO[^ERB[K!]5\,<cj[B-I9]Yh_+
-^7r0>SAW1]*R)$qb,r.HZ*h-T^;.S$]sY)MZF.-M\uWibbKRQ=`VI@V^Vmq?Xi8,tbl#ccbT=mM
-dF5dtI#0Pac27P@qp;o)D47&oX-U*?j5]+[lh][ekje97mc`]de]cL[ZbX#E[^ETS\%&oW\%&oW
-\%&oW][OR+\?*<b\\5_n0#+Hh.DEC"Z+mZR^p^YZ[C3KO[^`iX\@K,[\@K,[\@K,[\@K,[\@K,[
-\@K,[\@K,[\@K,[\@K,[\@K,[\@K,[[^r`S5-R0Lrs8Pcqu?<fp\"IWs*t~>
-q#=Fms6fpY!<<)_6hgQZq>^Kbp](9`7*kK;rrD3O+9)fCgB7?Q$1I-rjUgtB)Y4F-jWX=@g[bjR
-o+C6^+T;6;lc?NI]!%sX]=YP[Xh20W]tM%h\$i^7[/[Q6[f<i:\,s4P])K<+]!o,U[^EQO[^EQO
-[^EQO\%92^\$i]O[()j7[B[9LXgkjK\$icS\$icS\$icS\$icS\$icS\$icS\$icSqmZL3r3[]X
-]tM"bZ*1@9TY7\)^9aa<[\oqCZb`cT\$`TKZ*:F:[JmZ7[L'@9]WeuYVm<M+qPaatX/E^sXJi8$
-r2K[q*iZ6IZ_)VQFUMhW68qJ%:i$,+F`M\L>&ob"U7e<^qP/J3S!f_8StVpVVRNh0]XXrOYHG"1
-Xfee/Xfee/Xfee,[ALUPV5C;b['ZP-B1uV3WOAq2\Zi9MYd(F;Yd(F:YHP+4Y-5"3Y-5"3Y-5"3
-Y-5"3Y-5"3Y-5"3Y-5"3Y-5"3Y-5"3Y-5"3Y-5"4\u(MgA,u8ms7?9jp$r'4~>
-q#<MSs6fpY!<<)_6hgQZq>^Kbp](9`7*kK;rrD3O+9)fCgB7?Q$1I-rjUgtB)Y4F-jWX=@g[baM
-nIOp\,l[fWnB&,N\ZDRN]"5>UW3`\2Z*LaFrONBK]">Pc]">Pc]">QM]D]>>\0JGl[^NQO['m?M
-['m?M['m?MYGA&&]u%Us[^rEM_7-eDQa,PY!4;@'*jMcGWiN8-\@\lb];)s9RK0=ZS].kLX1>UC
-Z*LgLrkJKH%D0-Y['?1.Vm*7iUnOIXU'RBeTX]uXTqnCXTH9\uW2Pr#<Ghe.,ngG&)`(Lp6=X.o
-8iBXiKS4r3N;A6WLPh+ROcu&tS=?UXT<kYlZE^[@Z*U^AZ*U^AZ*U^AZ+[<S_QC5ZXgbU.!+n\p
-!2d61Y._*H]sP)PZF$pEZF$pEZF$pEZF$pEZF$pEZF$pEZF$pEZF$pEZF$pEZF$pEZF$pEZF$pE
-ZF$pE[)/Va!($\LnGi+Tn`BK8s*t~>
-q>Uirr;Zff%1iL>$E3aus"F3Js7lWj!W`H1!(a0)0DJ#0XBG,o8"m"Gs$``h2ZH:AY<;hDX0"\[
-r_Su\9)/Dc#kRHXp%5NWn+ck]#lFAenauVSrquBb!<2Ng!<2Tc!;uirs8;lr"o\K#r;?*2s8Vch
-rrW2cq>UC$2PM;ns8Duhm.gMSrrE&]rrf7%WMc]oWW/psV?NluV3I:[rVm3I]]e\]gpnO,s8:jU
-!<)Bd&GH._nb`+]s82Bes!FE^s8Drss89q;&GGo!s![pIrq5UPrqH'Tkkk&QJ,~>
-q>Uirr;Zff%1iL>$E3aus"sQOs7lWj!W`H1!(a0)0DJ#0XBG,o8"m"Gs$``h2ZH:AY<;hDX05"g
-s%o#V6h1*QrqH*brs$IBp\4CXp\Fghrpg!jrVQKiqtgBirqc`mr:'abrWrH!qsXFYrr2KfrZ2%<
-s8N&ts8N&ts8N&ts8N&ts8N&ts8N&ts8N&trVufps8Duqrqc]prr3Z-p%.kOqsj[apZ;Hc!;H'S
-s7l<ertYM0q=s^Zqu-KkqYBmZoCLu/nEB<-p[/7QmUU'E@:B.Cs'bq:(hIDl<`O[ooCMJPAlL]Y
-6"0imroNqJp\Fg`"7u'Xq"j^cp$r%N!qGmSrq6Kir:]g_rq^L-qYC!`qYC!`qYC!`q;qPCs8MN^
-q>L!_l2Y>pp[7qOqsj=Tq>1!bqtg3dqYC!`qYC!`qYC!`qYC!`qYC!`qYC!`qYC!`qYC!`qYC!`
-qYC!`qYC!`qYC!`r;Q]nl2gGLs8Vurs82fqr:L#>~>
-q>Uirr;Zff%1iL>$E3aus"F3Js7lWj!W`H1!(a0)0DJ#0XBG,o8"m"Gs$``h2ZH:AY<;hDX0+e\
-rD&]W9)/Dc!W)QirsQdFqY^6ipA4RZqYU3j%f6)!qtg3dqtg3dqtg3go`#X(s8DfhqY9p^qY9p^
-qY9p^qY9^Xr;Qfpn,<7gp\OU^`r?DEk5\`enaH#JqtL*i!<)Zl$iBYdjPS,+c,7Q@chPrndaLc`
-91MYO9c-Z):-UsW[GgK9!(/FQ-RD4^n+PZ+h;Ii&p]L-Xq"X^[!;6<^rUgEhp%\CUo(r4QrrVln
-q"t'rr;Z9eB`Rbt_>b#Em*5U]l2CYZp[mhDs8DTiJ,~>
-pAY?ks7u`qs6ose4n8RGs8;ojs8VZirrE)B((eIb_BBZ4s8'eS+M%Nl&KJsn_]Kc5p<=Nk]DMN;
-,TOl)qYpNoqtTmVU@nN_rtbG'p%\Fas8Monqu$?hqu$?hqu$?hrp]sZqZ-WprrE&srs'kMs82fb
-s8C(>!<)os"Y)ae^p5QVrs$$1XerV*WVNIoUopcbrt>>2.88OIc7Aq]q>^Kos8W&nr;Q]rrn.5d
-nabu6s8;omq=t!i)?9U6p\Opiq>^H9rt+htq>\50s7tpRoDS^\o()\Ns*t~>
-pAY?ks7u`qs6ose2=^_?s8;ojs8VZirrE)B((eIb_BBZ4s8'eS+M%Nl&KJsn_]Kc5p<=Nm_#OGI
-+rA&loD/C`rs,k0rqlHbo(W%]s8;Ee!;uck!;ZWj!;ZTi!;l<d!WDrqr@7^>pB9dYq#0XYoDS[e
-rr)iprr)iprr)iprr)iprr)iprr)iprr)iprr)lsrWW9"r;HQkrqdi9s8D]_mdBQ8n,)hN!!$G%
-?NBW]q"spdrVZNep@\(Mrq?Bb$M<o[n^r1uBO>[`pgOJ7BP$GkmHj0;m/?;OmelMsnbrLd!!#tg
-?3'oqs82Wbrr)]dq>C3hqu$EjrVZWlqtg<es7uZj#Q+5lr;6Egr:0Y"o`+p`r:'R_s7Q3[!;Z-^
-o_8=_pAOmbr;ccDq[WT(s76)irr<#ms7H0fq==Q9~>
-pAY?ks7u`qs6ose1\(M=s8;ojs8VZirrE)B((eIb_BBZ4s8'eS+M%Nl&KJsn_]Kc5p<=Nj])2H:
-,oao)qtg<mZMa_'q"F^^!;l`p&,l4spA"@VpA"@VpA"@VqtC'irU0O_qY^?qoBcP>rr3&qs75+J%
-f?5%rVQQjrVQQjrVQQjrqHNjrVZ[/qsj^e;EIYSjP]Lunal;>n+$&DrVI*$p@Ib>k2F6h8P;9C4
-\#6<#=M<[ccsqih"0>5jno#C!!#2=8c\#8rVuicqrdt\r;Q`qrp]pfrV?Hsr;ZWoo^'?ms6'cSk
-k>&Qs6oLMn+-L/~>
-q>UH_rr3#rr;?R,p\Y!_s8VurrVuKhs82Tfs7-'f)Z'C3p%n^_s7c6do_SU`s7cQnqZ$EkoDA@\
-rr2ulrr33#o(`%N]D;:&s8;*\!;l]o!<2uq!<2ut!rN#op&>'hr;Q]t/"IsbrrV`jqY:'orVuTj
-s7baW!;ufq!<2Wj#<Blgs7b3p9)S\kSY)UNrh^%$X0&G&Vkg#WOfmI=$hsGks8P'h0)th@p&=sk
-r:'acrr<#nrr;ofqZ[!!s7l?frVllsqu6Zoo(gZ0"TJH$`;fi9r;Qitqu69gJ,~>
-q>UH_rr3#rr;?R,p\Y!_s8VurrVuKhs82Tfs7-'f0DbVHp%n^_s7c6do_SU`s7cQnqZ$ElqZ$Qn
-rr)c`qY^?ipAY*g^\7Nto^VSLrVlg:rqlKcqu?WprVlfrrr;utrr;usq>'maqssX^rqcX"r;$6]
-qssXYqYMuErVlcmr:oj`@K?6%rq-3_rVcZmr;HQlr;-?_qYg$ar;HQlr;HQlr;HQlr;HQmq>Vf:
-s8)copAOm]na,K#jlu4)mdC-W:eX/M@K>ETjn&%YCM@HoAnCpOs(24B#\[Y!i:Z^8m.^&D"SMEZ
-p%A:Ws7cQgs7luur;Z`mjT&fkr;Q]tr;-?jrX8](rVlcprVlcprVlfprr2rrr;Q'_!<2rs$2jYs
-s8W)qq"am's8W!(ppC"us8MunqYU3]s*t~>
-q>UH_rr3#rr;?R,p\Y!_s8VurrVuKhs82Tfs7-'f)Z'C3p%n^_s7c6do_SU`s7cQnqZ$EjoDAC\
-rr2umrVm&qr;ZN.rVQTsqtTs`rVmE-q"a^\p\O[]q"jd^q"jmcrsJN#rVuipqtp6drU'UmqWlo:
-6icTMs7u]jpAY-lmJeU2oCVYHoCVYAoC2ADlh'T&g"G-8i8WeWf$FCK,97CC493.@`m`=+r^ISo
-92SDQ6UXI<:K1FrHJA&`qXOFUoCN(WqsaUkp@6u>>la*WptYlLrUTjcrV?HtrVH6ZnalOnqu6Tu
-qsUHSq>UBrrV6*_o)F4~>
-pAYumlZDFF(]_bZs8;ols8)]gs82ijp](!Urr3&ls7Q?j"oJ>orVucort>>*s7uZns7c']qu$?i
-r:p<lpAY*lrWDu,s7H0fs8M`l!;?0e''0)js8N&rqYBs]p\+I`s7H?gp&>$frr3-U=No1#0`M(P
-psT0[VLb87Xg5@>Vk93F/&Td%r;Ys!b=8,/M5K\?"8r2lroO1[rr;ltq<S%ZrrjDBs8;]imf*Ii
-qtTs^q>L3jr;HTqr;6*]"oSE"q"XjerrDuprrN&no(^Z/!W2forr^"8rVl0`J,~>
-pAYumlZDFF(]_bZs8;ols8)]gs82ijp](!Urr3&ls7Q?j"oJ>orVucors8Vus7uZns7c-as8W$%
-qXa[anbrIdrsAP0qrdbKn+lk[rr3B*qt^'br:g-eqYKRTr!E8uqVM2Gs8N&tqYq]9qW@YAqY'dZ
-p\+@Tp\+@Xl1t/>!!$A:<rgkJqrmnPqY1*Zo)ACco(_nJp]:6hrVQWk2Yle9q=s94>\[k[?X7#L
-BkqbiE)]:Z9MeGj!)@?*Dt<JhnF,i6md9H1n*ol<o_.VHqt0jZnGW:^s8;fns8N#t#4VZfp[eI[
-rVmN.q>'mcs8N&ts8N&ts8N&ts8M]krVl-_!ri)prr3'!r;FD1%fZA'ppL,"s8Dikq>'pdoDa=~>
-pAYumlZDFF(]_bZs8;ols8)]gs82ijp](!Urr3&ls7Q?j"oJ>orVucort>>*s7uZns7c$[qYg9j
-rVHQop\t0rrVQ8ps7-$e"9&#gqY^?trV6?iqtodWrVum)rSmkQrVZQgq=saap'(9ls7cQmpAY[%
-lML;4!!"o=2#tnprTX1Sp]9gRrqHQcq"=4Q47qq(lKINslKINhlKINfHV.429i"P^;c-7c!'VG7
-!#R"[email protected]\air2dhW=4kqqM,WoDeX_p&ORMnbCo>%K6(uq"jd^q"jd^q"jdb
-qZ$HmrVlisrC$PZq"41Mq"X^\qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^
-qY9p^qY9p^qY9p^qY9p^qY9pcrr_u!qYgEn"9&)kqXXZ:~>
-q>V3+s5j8W_#IB#]cR4Mrr<#nrVuosp&4mpmf3:\s8Voort"`!s5X.Equ?9[pAb0Ns8;iq)tj-s
-rr2corqH-ds8N&ds/c8#pA"1Qn+c\Rq>U6prr;uts8DWjs8E0!rpg$`q#:?nn,EVZf]i/&o?p>(
-rro6_Xe)tpn>-,\rMBOk"d-*aX/NQ&rsJZ's!k\Hs5_D)3pZeMq#C!YqtU!Xp]13bs8Dp$s8Dut
-rr;rjrtbV6rr;utrr;utrr;utrqlNeqtp<jrosFor:osXq>C6kq=sa\r;69ar5/I>r;6Nk[f#su
-r9aN7~>
-q>V3+s5j8W_#IB#]cR4Mrr<#nrVuosp&4mpmf3:\s8Voort"`!s5X.Equ?9[pAb0Ns8;iq(\dt!
-s8VrprUo^[rqZHVrhKJlp%nF_q>1*srV?$\qXOFRqYL!gqYpHn!qcNgq>VT8p%S4XqYL!ar;6Eh
-r;6<]naGiF>!b>39N2#Ylga!'qX+UWj^_8*?$0QGA--7MA,Tm:@3J<]=^tiYcL1;to'u8Aq#'jc
-quBu1;E@`S!:94Ho(MkSrV-Hgq"jsd#Q4Q!rqHHfp[/"Zrq??sq=sdNq==L_r;-TkoCVqErtYP2
-qtg-aqu-Qos8N&ts8N&ts8N&ti;Y_7s8N&ts8N&ts8N&ts8N&ts8N&ts8N&ts8N&ts8N&ts8N&t
-s8N&ts8N&ts8N&urr2f)s8N#t"o\AsrVlfgs*t~>
-q>V3+s5j8W_#IB#]cR4Mrr<#nrVuosp&4mpmf3:\s8Voort"`!s5X.Equ?9[pAb0Ns8;lr'`IV!
-mJ[(_s8Vris8DZaiUiT6s8Drs"oJ8loCVnXrr`9#s8DZk#lOPrq"j=OnbE"T#l+AnrVHQms82Zm
-&c;4jn)sa=*YT)54TO[2n_)Ojcj.t=7Pmk)=$lII&P5bq;Gg=h;GfS_92net^u=SUm3V,Wj4XJg
-2('/'6icB:naH&=n*TT6oChhDm-O-0oCVhSp&Fjcmf*:co(rggp]'jbq"j^Sn+6>Brs8Mnn+$#A
-pA4a_rs\l+rVuirrVuirrVuifs8W#tqu6OUs8Durs8Durs8Durs8Durs8Durs8Durs8Durs8Dur
-s8Durs8Durs8Durs8Durs8Durs8Durs8Durr;Qfp[J^%,rVQHgo)F4~>
-q#;Q2s8N)hl3R1K$N'l$s7u]os7lWop\4^Us8VBas8)cqnbN%]!VuBarrqWdq>0sfrr*,pr:9mf
-rq66i&(LXZq=O1<mI^2OrquZgq>UBorUp0lqt]gCrstKh/\C!,s8V`G[k3`/T;DC`!N33PrsJ\s
-p\+VB_T(HF/+`f:rWr8dr;?Hiq"X[Vp]^Kkrr;utqu.$%rqucqqZ$0erqQ*_q#Bm`ir98]q=sa\
-qu$Biq>^3iq8*(=q=j^XYkRhbp\=X`nGe"~>
-q#;Q2s8N)hl3R1K$N'l$s7u]os7lWop\4^Us8VBas8)cqnbN%]!VuBarrhQcq>1!ert5),oD\aa
-mJZt\qn`4+rVuorq#;!*qY9d[r;-<fr;6Ehr;6HjrV$6js83/rp%.bEnF,l;rqHTcq"OR[pC[)[
-BlF&W><#5J6WI4g@VBOjqI^%EDsZrVn)*O'mfDkCqWn.G$g-a>kjS9Cq=j^^rr2p-o_&8f4'5ql
-n+,T.qYU3fr;cimrrN#frVloqrSdbYnb_DErVm0%qtg0dqY'[^lMpn`s8Don!<)Kfn,Ejrs8N&t
-s8N&ts8N&ts3goFrrN)0q#:?noDa=~>
-q#;Q2s8N)hl3R1K$N'l$s7u]os7lWop\4^Us8VBas8)cqnbN%]!VuBartjo!q=s[[rVccms7cQn
-q!.YHna3RJnbi@c"o@iXmIU,NrrE&krr_u`kk+iFqX4IPlMg/Qk3_O&q<S[L@ql!94q\nY)EL=f
->[h#5qF(WV:!1`#c+V<kblQ;KpYcD6iSi\XpA=a`rV-iqnCuXs3>t+b!;$'WqX=Fbrq5XX!WDfa
-p&aOSkPkM]qZQWaoCi.OrsJYpn+#r>o_/(WrVHO&rVuirrVuirrVuirrU0\JrVuirrVuirrVuir
-rVuirrVuirrVuirrVuirrVuirrVuirrVuirrVuirrVuirrVuirrVuirrVuirrVQTp]DV[2rVQQl
-o)F4~>
-q>V6-s8DF;\oV`gdnTlBqu?]prr;lqs82fq-Mld&p\44Qp&Fmfs6BFRs7Q!`mJleFs7ZKmq=ssh
-jo>>>qt^-drVm9)s8O2@s82BKlL+EErsAW#m/HGPrp0RKqYom^"KA;i^6JJm%%s6\s8OCMaQVg!
-^*Lc!$iB\ghYdER1runm+TDE@rWr2rrr;uqqt^-^rrE#crr`2pqt^'b%K-,$s8VienaYo:p\4L^
-rrW)mr.G"[r:fgTn>u9Qo'u5=nb)_UoDa=~>
-q>V6-s8DF;\oV`gdnTlBqu?]prr;lqs82fq,5U@"p\44Qp&Fmfs6BFRs7Q!`mJleFs7ZKmq=ssg
-jT#8Br;R*%r;,^Pm/ZSPrUp0qnc/+Ys6]jQp\u!-rU9OSna5W(j5AhNiT'@cBP(Lt;u1,=C4kCB
-qZ'nm;GfMj!;QQanb;nR"7#XNmeunMo)[email protected]&Dp?q_Ss8Dlorr2p.n,N@Y!,,AB!:]d[
-qYg0err2lr!<)cl#Q+Apqt9g]r:9gUrrN)hq#:Epr;Q3c!WMuqq?-WmrVi)^!5%LqJ,~>
-q>V6-s8DF;\oV`gdnTlBqu?]prr;lqs82fq,5U@"p\44Qp&Fmfs6BFRs7Q!`mJleFs7ZKmq=smb
-hu3N:r;R*"q"!>+gAogko)8S/p?h#'kjA$;lhg)HrTO4CrVQQjrVQQioC),9jR)j5rp^9Xe'c60
-8jHfDqF_ArDU.Y3!'(u@*tCa?j6bjcq<S4AmH<R/mIKKBlgXcC#P%9Xq"FLPqYpL*rVQKjrVkpN
-m,7q@6<aH_eGfOGnb<OZq#16frr)`jq"X^_lMh_"qtg$YoC;;:mI0cDqY9p^qY9p^qY9p^qtg<e
-rq??drVAnVqY9p^qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^qY9p^
-qY9p^qY9p^qYL*gs8Th3s8Muds*t~>
-q#:]ls7s;3-g1M6g@kOG$1RupqXOL`li-e\rrW&rrr2p)o`+p\s7lW[s8V!TrrqWdqsXR]rr35j
-rql0ZjSAZMrs1-T9E5%iht6@#rrDlorsbNXVkKrdXg5:AZEL+3o)B*fs8O<I]tDH9s7#s[rs&H%
-s7lQmpuhYunc/Xas8DfjrVuosqY0XTiqi]T4dI&es763fpA=jgrr`8uqtp0gs8;ormf*=cq>L3h
-r;?Qnrsnedg[ah-p\Fggs8MT[qr[qYrW2rri;X5bs8N&ts8N&ts8N&td/OUTq=aRTZ2++fo'l):
-o_J(XJ,~>
-q#:]ls7s;3-g1M6g@kOG$1RupqXOL`li-e\rrW&rrr2p)o`+p\s7lW[s8V!Ts%_eXqsXR]s8N#a
-s8Vopmf34]oD87V!+Q0#qu6'ap\t'apA"L^rVQ?cnau_Tqtg3dqtg3dqtf4Fp[*!*D.-dW>$+j,
-=_D;flKdoin+uG_o(`7Zs7--k;GhE6rU^'gp\Y6fr;?$Ur9s.QrVQTl%JfthrVcHhr;ZfrrVlfp
-rs\5dp[J;i!;cQVrVlWjrr)j*rVZTlqu$?hqss=Mo_n[YquH]crs&2rs8VWhrr)lsrr)lgrWrK!
-q"aa^qu$EWs8W)urV-?lrkAC5rj_b'!ri/tp&BO~>
-q#:]ls7s;3-g1M6g@kOG$1RupqXOL`li-e\rrW&rrr2p)o`+p\s7lW[s8V!Ts"!=5qsXR]rVQKW
-rVuZmmJZkQlgO3(!(R%EmJ62Mo'tl"gu%/Um-X--jluO.#jq!*lK[AC<,)>?raH1E?!'^%cd:1R
-eG@W+gZS+kn_!mB-mqXfjPoh%oDA@`#5A/to(W1TkPkYTs8VuorrW2trr)j'kje0(!)N[cqX!SK
-s8)iqr9aOTr<E#nqsrkIq>C6qqtTgWqs47grVH6ZnaGl3n+cAKs8)cjrq?Bes8'P."oA#is8Th4
-s8Mucs*t~>
-q>UNhs7H9i48o3Zr;ZT_o)JX^qu?]R49,Ynp;8<i]CWlL(XN-Taql/>rP9I!`9tAU'ZC$g(E1<n
-s1&sW^%_@%q>UBt,F$?a74n!.%_8(0WiN/#WiN.g^S$gejSoVeq=t!i3OL=9rV6?js8)Ttm/HAN
-rq69inbi@arqm-"r:Bg[nbMJFq>:'h!qcEirVm-=s8VWhrp9X`lMgk[nG`Lfnc&dgs8MK_rr)j!
-q=XCSl2USYm/I@hq>($is8Mrq]DhlFrr3-#q"47Wnc++~>
-q>UNhs7H9i2uWdVr;ZT_o)JX^qu?]R49,Ynp;8<i]CWlL(XN-Taql/>rP9I!`9tAU'ZC$g(E'sb
-rjs3hbPqM^p&+[K!)Zic!!)]goCqb?kN;!on*fYjlfm]oE)ZRA'39Kg<GU^emIp>Oqu$ElrUK^Y
-nc&=anG;qmp[RnTs7uBV!,V`3rr;rkm.pMU#OVQYs8Vfms6BOfrr;fos8)cfrVllsrqmT2o`"jg
-qY'R^r;#UWs7$'crVZQjr;Q]crrDiarr<#rrr;osr;6@!pA=@Ys7u]pq=jX\r;Z<cqYp<jnbiRh
-rVZWgs8Ms*rr)iprr)iprr)iprm1NJs8MukZMF=qr;Qlsq"Xg\s*t~>
-q>UNhs7H9i=T/:"r;ZT_o)JX^qu?]R49,Ynp;8<i]CWlL(XN-Taql/>rP9I!`9tAU'ZC$g(Dja\
-rO<mcbQ%V>m.'Go!'WY!!!)`kq>0I9f@/4#gtpl'gtLN3@79rj#ZON?=%m)Wki)O+rp0gUn*9Q:
-m/HVWlh^5cp@S+Zs7>I.!*90dq#CBkn,3%]"n2K[s8VlVrrr5us7u]drVuorq>U`ro)S"7h"Ld>
-rr3-"qtg0dr;?`prVQQkqu6Nop@A1Mrr_liqXF@]"8;-LqTAj<rO`(4q"=Uc_#FB6qZ-T`s*t~>
-q#:]ps8W)hs7cNks7Q?j4T5<[p\b'Os1o-C7%0oCs$3QY55P:,Y*i&]33B#?s";*_2?,h:UJ1Rb
-6'S`3nb2t^rVn4@_;F#"XtBYQ%A0T(['-F$TUNQdX/`_srs&Apo^VSNq#:9onFuVU!U0F[rrjGC
-s82Whrr;fl"nMTco)/+IquH`qr;ZX#p%e1Rq!n+Oq>Bja"oJ?"r;Q]arrDrqrrW&krnIGRrVHHl
-"8MQaqsj[drqcNnrqu]nm/ICkqt^'crr2imr4Dt/_YsK9rqZH\s*t~>
-q#:]ps8W)hs7cNks7Q?j:]:=np\b'Os1o-C7%0oCs$3QY55P:,Y*i&]33B#?s";*_2?,h:U.G"V
-6'\uCqu?]ql1P*iA5P^";?61Nnmu6:?!h&QAl`tQ@:4$'lM9ZMlK@O!nFH;Hr;$?mp\t-mn+QSV
-&cD:qrU9dcmIUDQqu?]kp\+R]rrr,rqtC'akl1hcs82irqu$I*rqu]kr;?HjrVH0_r:L$hr;Q]r
-rqu]orV6Bmr;Q]sqtTX[!<2los8;lnrq['#q>9[Ys8W)sp\":Xr;ZBe!<2`mqu6Wo&cDV*rVZWl
-rVZWlrVZWmrr)firrE&drAOTPr;HQlr;HQlr;HQlr;HQlr;HQlr;HQlr;HQlr;HQlr;HQlr;HQl
-r;HQlrVZQcYk\"krr)j!qtKmap&BO~>
-q#:]ps8W)hs7cNks7Q?j:]:=np\b'Os1o-C7%0oCs$3QY55P:,Y*i&]33B#?s";*_2?,h:TLJGL
-6'o5Jr;QTehWOrA;E67#70)cAo4)!(;cHe%>=iEt<)[8Hh>5n8i8s(ck3VF#lL"!-n,DhYo`+jg
-rrMchq#:^"s8Vclqrd;GnbD_U"o&&pq>^<Trs/N&qZ$Tls8N#ts8Dcn#Q"Dmip?4+qu6U!rVH<_
-q"XU[!;?Eg!VZ-SqZ-T`rri)nqYL0frr`&bn,%_:$MsMqs1\O5rVQKjn,In~>
-q>V--rVud&!!*-$!s&8srr;rso`+jgs#BGS(&nd3oaUj8jn0>^rtOtp#lPb*miDB;l1Y5Y&Fnro
-rq[N%lPTNrlMpl8Y,g1Gj4)>O315TZrrN,srqc]pn,NFequ?]qrVtgT!<;lor;?ToXoAD#r;Zco
-!<2KfqYgNqroX7Zrr<#trk&11]);U.rp]r<~>
-q>V--rVud&!!*-$!s&8srr;rso`+jgs#BGS(&nd3oaUj8jn0>^rtOtp#lPb*miDB;l1Y5Y&Fo$"
-s7mDojV\!slMU2Q?qFO%6V1T^!,cEJp&t'^p\FXSq#:'lqYU3hrp0Rcrqu]mrr`2rqu$Ems82lr
-ci<Y:qZ$EkgAh$Krr)corVluur;HTls7?6\rtPJ4rr;utrr;utrr;utrr;utrr;ugs#^5[rr;ut
-rr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;us#5nJs
-[/Kt&r;Qlur;HWfs*t~>
-q>V--rVud&!!*-$!s&8srr;rso`+jgs$?(\(&nd3oaUj8jn0>^rtOtp#lPb*miDB;l1Y5Y&Fnoj
-q"5Emmiqf3kk=0>;`mT3,:l2F!+&jrn+$#Aq"jdZo(2qUqtU!`!;l-_"o\;mq"js&rrr;rq"jmd
-rVuor!;kXOmJm1aqYpZrqYL/BrsAW#s8KP.rr;rqmf.e~>
-q#="Xs7Xl<A]=TIrr2rtq>^?lrTsRVrs8\-nc8^i!<3'!rs&2s!;QQoqZ-Zr!;d!#q@*B(s8E)e
-rri<#!WMckoDehRf[A[;gr)U3s+13Hrs&E#q7-J'rp9Z8~>
-q#=.\s7Xl<A]=TIrr2rtq>^?lrTsRVrs8\-nc8^i!<3'!rs&2s!;QQoqZ-Zr!;d!#q@*B(s8NH!
-rrDTc!<2ipm.o`CE)TD)=]YUmnG2t\r;uuurdk*#s0)G,r;QN%s8Dr`s*t~>
-q#=4^s7Xl<A]=TIrr2rtq>^?lrTsRVrs8\-nc8^i!<3'!rs&2s!;QQoqZ-Zr!;d!#q@*B(s8;r_
-qZ?Zp$ig5)jQtIu@mVn(4$!Amh!4G'qgncus/Z/(r;QN%s8Dr`s*t~>
-q>XOqs82iqs0jm1LuA='oDeC]s7lWjp&FEX+9*5Riu72%lf&rbrtb.e*rcN:o+:p0n)"oM&,PT%
-r:qN2q%rbnoDYo?k;g)qa@SVE`RD-*\[f2Y[^EMo[Xkll[KX%B]?$WBlMlA~>
-q>XOqs82iqs0jm1LuA='oDeC]s7lWjp&FEX+9*5Riu72%lf&rbrtb.e*rcN:o+:p0n)"oM&,PZ.
-s7dGtmhGTnrr8^pXoMI%;ZHfbS@PH'[^EQO[^W_s[Xkll[KX%B]?$WBlMlA~>
-q>XOqs82iqs0jm1LuA='oDeC]s7lWjp&FEX+9*5Riu72%lf&rbrtb.e*rcN:o+:p0n)"oM&,PQ#
-qXts'qAoV4q"BlASH),H56(\:MQ3)HZ*LaF[^<Dm[Xkll[KX%B]?$WBlMlA~>
-q>Uius8VZip](%s"r->$s"jZSr;6Nor;Zf5*q2@^\OZZP\Z%aarD9K&0CrG3XZHJSOhXKc8"ueF
-qtig\Ud+bLnFHPX!]-rAqu6ZorVH]nq"X]:qgnXMqZm/rp[u)srVGm\J,~>
-q>Uius8VZip](%s"r->$s"FBOr;6Nor;Zf5*q2@^\OZZP\Z%aarD9K&0CrG3XZHJSOhXKc8"ukM
-rV&FDRQUNJ%K,qi!+#Z\nb2hRs82`nqZHcprVV6DJbubM#QOSnost,$qX"64~>
-q>Uius8VZip](%s"r->$s$H_br;6Nor;Zf5*q2@^\OZZP\Z%aarD9K&0CrG3XZHJSOhXKc8"uhH
-qY3@PUI5(]q=4"Ak2QG=!7'Win*]uFp\ssjp\+@WJbt#qZMOn,q"OHls8Df\s*t~>
-p&@;Is0XU6MYHl9s7lWks8Vi^rriQ?ZM;im#K$Mc&Ke[cs.gD=ci:F%)8kjO/c`H^cl3nFr;X\`
-(s_O;naZAErr39Fs8W)ts7l-]r;HWpquH_Is+13Trr`6"r4;.mJ,~>
-p&@,Ds0XU6MYHl9s7lWks8Vi^rriQ?ZM;im#K$Mc&Ke[cs.gD=ci:F%)8kjO/c`H^cl3tLrVa>I%
-F"GBrsSMuq!8"QpZqSRr;)!EJcD\K"9&8t]'96F~>
-p&@\Ts0XU6MYHl9s7lWks8Vi^rriQ?ZM;im#K$Mc&Ke[cs.gD=ci:F%)8kjO/c`H^cl3qLs8Tk[
-'@64DqtTgEmHrp6n+#N0qtp3grrrAuq"FL]JcC<$Z2Xq)s89Ims*t~>
-q#;Vss8Tl*ABFlOoDe^fp%A@Grr<#ls7QEis6fperVlinp]'pTrVm!!p](-fs8Vd:s7ZBPs8W#s
-s82KZl.bt3qZ"Y:rU9ORp%S4Vr;HQkq>1#?rIOpQrVlg"rNuFrrp9Z8~>
-q#;Vss8Tl*ABFlOoDe^fp%A@Grr<#ls7QEis6fperVlinp]'pTrVm!!p](-fs8Vcus7cQUrVQ'\
-rr)j&o)Ja]r4;RsoDJUirr)forrE%LrIOpQrVlg"rNuFrrp9Z8~>
-q#;Vss8Tl*ABFlOoDe^fp%A@Grr<#ls7QEis6fperVlinp]'pTrVm!!p](-fs8Vd-s7u]\s8Vfm
-s8DikoA]K;lh7m]q"":]"oJ)go_/05rIOpQrVlg"rNuFrrp9Z8~>
-pAY0b"TAB,!WW<#qtg?mpAY(:mJZtZo`+g_s8VfmpAb-ls7u]ds7ZK_s8VNerp]a`s7ZKkrql`q
-s8!B+p@RnDnG*"KYke%co%E[$qu6Tp"9/2prdk*#s0D\)qZ?fr\*<pC~>
-pAY0b"TAB,!WW<#qtg?mpAY(BmJZtZo`+g_s8VfmpAb-ls7u]ds7ZK_s8VNerp]a`s7ZKls8Vrl
-qsjCZqYpT`[/L".mJln[s8ITLJcDhOs8)ltrO;%kJ,~>
-pAY0b"TAB,!WW<#qtg?mpAY(8mJZtZo`+g_s8VfmpAb-ls7u]ds7ZK_s8VNerp]a`s7Z<h$hEob
-q"jj_q>L9Y[Jg+,mf3._rrrAuq"FL]JcC<$ZN't%!rr5.l2Q8~>
-q#:s*s82ios8V`kp&G!es7cQnnG`G)qZ$Tns8Vrqs8D`ms8;osrVuons8W&sq#16mpBLZlrpKUV
-rr)j.r:0FOp$hkUVtJs7nac5Grr)j!rqlTlJcC<$YQ"b&[J]gtm/MS~>
-q#:s*s82ios8V`kp&G!es7cQnnG`G)qZ$Tns8Vrqs8D`ms8;osrVuons8W&sq#16mpC.)rs7QEd
-r;HTks8W&srrr9!s0;Upqu?ZoJcC<$WrE5![J]gtm/MS~>
-q#:s*s82ios8V`kp&G!es7cQnnG`G)qZ$Tns8Vrqs8D`ms8;osrVuons8W&sq#16mpB1His82cp%
-K#qsqXaR^s82irZN'FhrrDrqq>gJFs+13Rrri5,r:p3Vs*t~>
-kl3.%s7--hp]'gaq#Bpbp&Fdds82fqr;Zfls8W)up](6ms7Q*cpAFIUpAY!i%K?8!o_JLaYkRqe
-o(`+Ys8Vusrdk*#s0D\)rWN9!ZhjOas*t~>
-kl3:)s7--hp]'gaq#Bpbp&Fdds82fqr;Zfls8W)up](6ms7Q*cpAb!hqu?ZprVQTo"o\8prqs5(
-rrE&trri;tqYU5Bs+13Qs8W'$s895"qWn03~>
-kl2sus7--hp]'gaq#Bpbp&Fdds82fqr;Zfls8W)up](6ms7Q*cpA=miqZZ`jqu-Eirr3,.q>L9g
-q>^HmJcC<$Z2ak'"TSD+qYKOXJ,~>
-l2LbQrVllnrr2uYrr482s8DWjrVlfks763`s763imf3:Uq>^Kgs82TcpAFsarr;ioqu6o-rVl`g
-r:U!brrW2trdk*#s/uA'\c;Wos*t~>
-l2LbQrVllnrr2uYrr3i&s8DWjrVlfks763`s763imf3:Uq>^KgrVmB,s8MTbqt9gbrr)fnrNcG&
-$2a_opA=[]qY^>Ds+13NrrTb2rTjK6~>
-l2LbQrVllnrr2uYrr3i&s8DWjrVlfks763`s763imf3:Uq>^KgqYp]gpA"4Qqu6o(o_A4Sq==<3
-s+13HrrTb2rTjK6~>
-kl1hcs6B.SlMgekq>9jbs7$'apAadQrVluupAb$ers8Aos7c?Jq>9m\s8W#t^%D=+rqubHs+13U
-rri2lqtIP`s*t~>
-kl1hcs6B.SlMgekq>9jbs7$'apAadQrVluupAb$ertbA(s7lW[s8Vlorr)cmqu$?co('*crr2p&
-rquWgq"jmdJcC<$YQ"b%pA=Tml2Q8~>
-kl1hcs6B.SlMgekq>9jbs7$'apAadQrVluupAb$ers8Aos8)c_s8Vilr;lrtrVm3#Y4M;Xq"X^_
-rIP!"s/Q)%qY'g\[d!gB~>
-kl1YErr4JG1]S,[qpuYr\Gsba*kVIPUD46bs0O*i`9t/h!4i-W*#lopqm@X\aS5N1"M+R4qt9aa
-!WN%Krdk'Rrr2p#rjVn(rp9Z8~>
-kl1YErr4YL1]S,[qpuYr\Gsba*kVIPUD46bs0O*i`9t/h!4i-W*$*3%s19Wl`q00+p\Xjeq@9P$
-qt0IZqtg-aq"adarIOs!rilD$rri>1rql]]s*t~>
-kl1YErr4SJ1]S,[qpuYr\Gsba*kVIPUD46bs0O*i`9t/h!4i-W*$!6's19Tja7TE3rVZ[&Vt0EF
-l1k#Jr;?Qks+10#rj)P&rri>1rql]]s*t~>
-kPm.-s8;`Zs0F$O2P@W<s"1aZ4S/JHW4=VQ>EGpIs%/<e8c(uNV*Y.T2kc]urqZQo_>aH9q>^GF
-s+13Ks8Vs!s805'rp0T7~>
-kPmU:s8;`Zs0F$O2P@W<s"1aZ4S/JHW4=VQ>EGpIs%/<e8c(uNV*Y.V4/\c4s8MfeqY^3er3Q:u
-s8)`ps8;oo"8r,srdk*#s0;V(qZQrr[Jp0ks*t~>
-kPm+,s8;`Zs0F$O2P@W<s"1aZ4S/JHW4=VQ>EGpIs%/<e8c(uNV*Y.U3iAZ6rr2utrVlosZi9e&
-o_\LarIP!"s/Z2"qZQrr[Jp0ks*t~>
-kl1\\qY^@AlllBAm-keX)X?9$s8Ni'k9'^0o(!@l$LZabmg]'Y'`[tGn*UYZqYL3l[Jp10qYBj^
-qu6Tp!WN"JqgnXKqZd*!s80;*rTjK6~>
-kl1\\qY^@KlllBAm-keX)X?9$s8Ni'k9'^0o(!@l$LZabmg]'W%fQ/@p%B-uqYpHlrr<#qWqHAj
-rs8Q&qtg*_q>'l<qgnXKqZd*!s80;*rTjK6~>
-kl1\\qY^@?lllBAm-keX)X?9$s8Ni'k9'^0o(!@l$LZabmg]'X%fQ)=p%TC$rsJ`%poaGms8N&p
-rquZmrIOisqm$#&s8Dup\,ZEms*t~>
-kl3p<s8VZis7^YtrrDTh!<3'!rrr)q!;HKnqZ-Zr!;cs"q@!<'s8NT&rrMWa!;Q$[rqH$\qu">/
-oChkJme?PVJcC<$WrE;&r:d]#q"="RJ,~>
-kl3I/s8VZis7^YtrrDTh!<3'!rrr)q!;HKnqZ-Zr!;cs"q@!<'s8E/er;lTk"98)ps7l9drs$11
-oDS^hrr2rprdk*#s02M-rquN"s7l9Rs*t~>
-kl3[5s8VZis7^YtrrDTh!<3'!rrr)q!;HKnqZ-Zr!;cs"q@!<'s8<&ar;l]n#QOf's8)<]q"r#0
-qu6TqrIP!"s/5l$rquN"s7l9Rs*t~>
-kPmO8s8VclQWsIb&,G`'r>"Dc'DDG>n+-e`*pE&4r"&)f!ril'm2Z0+)rolpo_/1M`N68LY,'4D
-riH<uYH4q5r3Ls[J[2Pd"LP8;`hVeuJ,~>
-kPmjAs8VclQWsIb&,G`'r>"Dc'DDG>n+-e`*pE&4r"&)f!ril'kn<^c)s?H1rVcceag&:dZ_PUI
-[_'5Z]="uNZ%933ZE:D8[&gXSUZqf/~>
-kPm+,s8VclQWsIb&,G`'r>"Dc'DDG>n+-e`*pE&4r"&)f!ril'kRmL`)sZc9rr3T'b,qhNXf9j_
-]=bh_\[8`LZMh"YZ@T<dZ37P9[)Sm*s*t~>
-l2NF7s7ZKfs+Y.cqYrsWSk&`HX/%oTs!b4D:\clIUHec9[APt`5b"cIqYrjG[l3pTrX#q2qY^9g
-qu$HmJcC<$WrE8%s80;*rTjK6~>
-l2NF7s7ZKfs+Y.cqYrsWSk&`HX/%oTs!b4D:\clIUHec9[APt`5b"]CpAI:B\2sH]rrTP+qgncu
-s.fStrr;l)s8D9`J,~>
-l2NF7s7ZKfs+Y.cqYrsWSk&`HX/%oTs!b4D:\clIUHec9[APt`5b"`Cp&77D\i]cds8Mrs[=S@/
-s.TGrrr;l)s8D9`J,~>
-kl37(s8W)n+92cLpWF-s_XtbW(s`-TbS_;9s2Q<1_<8KG*khTt'c4[bs100ca8#Z9ZiBoRs+13F
-rrrE%qmZV(li2J~>
-kl37(s8W)n+92cLpWF-s_XtbW(s`-TbS_;9s2Q<1_<8KG*khTt'c4[bs100ca8#Z9ZiBoRs+13F
-rrrE%qmZV(li2J~>
-kl37(s8W)n+92cLpWF-s_XtbW(s`-TbS_;9s2Q<1_<8KG*khTt'c4[bs100ca8#Z9ZiBoRs+13F
-rrrE%qmZV(li2J~>
-l2M4js8Dffs7cQfp](6fmJ[%lo`+p\s8)c^s8UpRrrqZep$)MQrr3/gs8VfmlhUP^ZiBoRs+13F
-rrrE%qmZV(li2J~>
-l2M4js8Dffs7cQfp](6fmJ[%lo`+p\s8)c^s8UpRrrqZep$)MQrr3/gs8VfmlhUP^ZiBoRs+13F
-rrrE%qmZV(li2J~>
-l2M4js8Dffs7cQfp](6fmJ[%lo`+p\s8)c^s8UpRrrqZep$)MQrr3/gs8VfmlhUP^ZiBoRs+13F
-rrrE%qmZV(li2J~>
-l2N=)s7lWomf3%Xs7?'dqZ$TkpAasfs6BIYs7>XXli6bNs7?9jp@J=ajT#8ApAY3#s8.BIJcDMF
-"oeQ!\,ZEms*t~>
-l2N=)s7lWomf3%Xs7?'dqZ$TkpAasfs6BIYs7>XXli6bNs7?9jp@J=ajT#8ApAY3#s8.BIJcDMF
-"oeQ!\,ZEms*t~>
-l2N=)s7lWomf3%Xs7?'dqZ$TkpAasfs6BIYs7>XXli6bNs7?9jp@J=ajT#8ApAY3#s8.BIJcDMF
-"oeQ!\,ZEms*t~>
-kl2:hrqHHmoD/.\p&G'jq=jphnbN+_&,lP-q>^Kls8DipmJlnZqYgEqq#Bs]rrTP,qgncus.fSt
-rr;l)s8D9`J,~>
-kl2:hrqHHmoD/.\p&G'jq=jphnbN+_&,lP-q>^Kls8DipmJlnZqYgEqq#Bs]rrTP,qgncus.fSt
-rr;l)s8D9`J,~>
-kl2:hrqHHmoD/.\p&G'jq=jphnbN+_&,lP-q>^Kls8DipmJlnZqYgEqq#Bs]rrTP,qgncus.fSt
-rr;l)s8D9`J,~>
-l2Lq_rr<#sq#:9qp&G']rr2umrr3N#qu>XTlMU\Sp%JFckl:JWrs/8tn,NFas8Mio!jhq(JcC<$
-U]1Mss80;*rTjK6~>
-l2Lq_rr<#sq#:9qp&G']rr2umrr3N#qu>XTlMU\Sp%JFckl:JWrs/8tn,NFas8Mio!jhq(JcC<$
-U]1Mss80;*rTjK6~>
-l2Lq_rr<#sq#:9qp&G']rr2umrr3N#qu>XTlMU\Sp%JFckl:JWrs/8tn,NFas8Mio!jhq(JcC<$
-U]1Mss80;*rTjK6~>
-kPl(^s8Vfmme?SXrVuiaq#C!brrr5urr<#jrVm,ms7lNis8VEarr`2tqt9aa!jhq(JcC<$U]1Ms
-s80;*rTjK6~>
-kPl(^s8Vfmme?SXrVuiaq#C!brrr5urr<#jrVm,ms7lNis8VEarr`2tqt9aa!jhq(JcC<$U]1Ms
-s80;*rTjK6~>
-kPl(^s8Vfmme?SXrVuiaq#C!brrr5urr<#jrVm,ms7lNis8VEarr`2tqt9aa!jhq(JcC<$U]1Ms
-s80;*rTjK6~>
-kl1hYs8MQgq>L=9nc/Xfs8Vlls7Q3fo`+UYs7lNlp&Fm^s8Vros7cQkr;Q]ro(i:eZiBoRs+13F
-rrrE%qmZV(li2J~>
-kl1hYs8MQgq>L=9nc/Xfs8Vlls7Q3fo`+UYs7lNlp&Fm^s8Vros7cQkr;Q]ro(i:eZiBoRs+13F
-rrrE%qmZV(li2J~>
-kl1hYs8MQgq>L=9nc/Xfs8Vlls7Q3fo`+UYs7lNlp&Fm^s8Vros7cQkr;Q]ro(i:eZiBoRs+13F
-rrrE%qmZV(li2J~>
-kPm78qu?WfI/s<Daqbl3rPB]m`;f\T)'H<d^)%O/s25fr])9Ph'>OSI]HeE6s8W&rrr3<(s0D\)
-qtg?mrIP!"s/,eur42k,li2J~>
-kPm78qu?WfI/s<Daqbl3rPB]m`;f\T)'H<d^)%O/s25fr])9Ph'>OSI]HeE6s8W&rrr3<(s0D\)
-qtg?mrIP!"s/,eur42k,li2J~>
-kPm78qu?WfI/s<Daqbl3rPB]m`;f\T)'H<d^)%O/s25fr])9Ph'>OSI]HeE6s8W&rrr3<(s0D\)
-qtg?mrIP!"s/,eur42k,li2J~>
-l2NF.s7lWkrr@TSs6rU[Z9&"TTWD;es$rca2uc+BXZ6;NT!L?T0s7TGpARmTV+(%UrsSc%r;Q`-
-s8W&ns8@NKJcD\K#5e5qppC"sli2J~>
-l2NF.s7lWkrr@TSs6rU[Z9&"TTWD;es$rca2uc+BXZ6;NT!L?T0s7TGpARmTV+(%UrsSc%r;Q`-
-s8W&ns8@NKJcD\K#5e5qppC"sli2J~>
-l2NF.s7lWkrr@TSs6rU[Z9&"TTWD;es$rca2uc+BXZ6;NT!L?T0s7TGpARmTV+(%UrsSc%r;Q`-
-s8W&ns8@NKJcD\K#5e5qppC"sli2J~>
-kl3j6oDedds8N)mrsmcK(B4j:gB7?Q$1I0qkmd=D*V0d/koT^Ch=D!Rndk![+oh*1s8W&ts88qi
-qZ$Kmp&0IAJcDSH!kA:.li2J~>
-kl3j6oDedds8N)mrsmcK(B4j:gB7?Q$1I0qkmd=D*V0d/koT^Ch=D!Rndk![+oh*1s8W&ts88qi
-qZ$Kmp&0IAJcDSH!kA:.li2J~>
-kl3j6oDedds8N)mrsmcK(B4j:gB7?Q$1I0qkmd=D*V0d/koT^Ch=D!Rndk![+oh*1s8W&ts88qi
-qZ$Kmp&0IAJcDSH!kA:.li2J~>
-l2LbQrVnPCs6TgdrrE*!"8i0!rsJf+!<<'!rs/N&"9/N(rrD]qs8N*!rt,.l!;cTms8D`lrrBt7
-rrDtJs+13Jrs&;spU:,"rp9Z8~>
-l2LbQrVnPCs6TgdrrE*!"8i0!rsJf+!<<'!rs/N&"9/N(rrD]qs8N*!rt,.l!;cTms8D`lrrBt7
-rrDtJs+13Jrs&;spU:,"rp9Z8~>
-l2LbQrVnPCs6TgdrrE*!"8i0!rsJf+!<<'!rs/N&"9/N(rrD]qs8N*!rt,.l!;cTms8D`lrrBt7
-rrDtJs+13Jrs&;spU:,"rp9Z8~>
-kl37/rVu*]p&>B_s!$Xp$2bS%q[)Wh$L@-drrW5b!<38siY)8!lMDUppBgBf$i^/8lc--3ZEBJ4
-ZEC=9Ye>UpJ[DA_"L5Y`T`+0UJ,~>
-kl37/rVu*]p&>B_s!$Xp$2bS%q[)Wh$L@-drrW5b!<38siY)8!lMDUppBgBf$i^/8lc--3ZEBJ4
-ZEC=9Ye>UpJ[DA_"L5Y`T`+0UJ,~>
-kl37/rVu*]p&>B_s!$Xp$2bS%q[)Wh$L@-drrW5b!<38siY)8!lMDUppBgBf$i^/8lc--3ZEBJ4
-ZEC=9Ye>UpJ[DA_"L5Y`T`+0UJ,~>
-l2NU9s82cprUp0js78RJSk8rHVO'aOqEh3^6hN^1Yu(<kUTd)J8uS79s8P<hTfiAOs8Vrkrr35C
-s8)Wks7lMCs+13Krs&H!p:1/!p[%p1~>
-l2NU9s82cprUp0js78RJSk8rHVO'aOqEh3^6hN^1Yu(<kUTd)J8uS79s8P<hTfiAOs8Vrkrr35C
-s8)Wks7lMCs+13Krs&H!p:1/!p[%p1~>
-l2NU9s82cprUp0js78RJSk8rHVO'aOqEh3^6hN^1Yu(<kUTd)J8uS79s8P<hTfiAOs8Vrkrr35C
-s8)Wks7lMCs+13Krs&H!p:1/!p[%p1~>
-l2NL;s8Vuds7lQno`)<K-aWie+Y:A)s3(lk]`$+u%_D\N*=pg"`u?,Co`)?2)U\<Trr)j!q=LZ^
-rVlosqLSQqr2KSsrqcZl\`s-E~>
-l2NL;s8Vuds7lQno`)<K-aWie+Y:A)s3(lk]`$+u%_D\N*=pg"`u?,Co`)?2)U\<Trr)j!q=LZ^
-rVlosqLSQqr2KSsrqcZl\`s-E~>
-l2NL;s8Vuds7lQno`)<K-aWie+Y:A)s3(lk]`$+u%_D\N*=pg"`u?,Co`)?2)U\<Trr)j!q=LZ^
-rVlosqLSQqr2KSsrqcZl\`s-E~>
-kl2_#qu?]as7H?hqu?$_s7H?gq>UEnnGiI_s7c-bs7ZHl&GcA%rr2fpp\k-jnGiOdq>L9l#.+@0
-qss^_JcC<$W;d)#rr;r'qYKOXJ,~>
-kl2_#qu?]as7H?hqu?$_s7H?gq>UEnnGiI_s7c-bs7ZHl&GcA%rr2fpp\k-jnGiOdq>L9l#.+@0
-qss^_JcC<$W;d)#rr;r'qYKOXJ,~>
-kl2_#qu?]as7H?hqu?$_s7H?gq>UEnnGiI_s7c-bs7ZHl&GcA%rr2fpp\k-jnGiOdq>L9l#.+@0
-qss^_JcC<$W;d)#rr;r'qYKOXJ,~>
-^Ae<5s8VukrrTP,qgncus.fStrr;l)s8D9`J,~>
-^Ae<5s8VukrrTP,qgncus.fStrr;l)s8D9`J,~>
-^Ae<5s8VukrrTP,qgncus.fStrr;l)s8D9`J,~>
-_>ac5s8MrrnGiL`rrTP,qgncus.fStrr;l)s8D9`J,~>
-_>ac5s8MrrnGiL`rrTP,qgncus.fStrr;l)s8D9`J,~>
-_>ac5s8MrrnGiL`rrTP,qgncus.fStrr;l)s8D9`J,~>
-_#FW2s8N&os7Z9g!jhq(JcC<$U]1Mss80;*rTjK6~>
-_#FW2s8N&os7Z9g!jhq(JcC<$U]1Mss80;*rTjK6~>
-_#FW2s8N&os7Z9g!jhq(JcC<$U]1Mss80;*rTjK6~>
-_#FW7s8Vurs7Z9g!jhq(JcC<$U]1Mss80;*rTjK6~>
-_#FW7s8Vurs7Z9g!jhq(JcC<$U]1Mss80;*rTjK6~>
-_#FW7s8Vurs7Z9g!jhq(JcC<$U]1Mss80;*rTjK6~>
-_>a`(s7?9jr;HEj!jhq(JcC<$U]1Mss80;*rTjK6~>
-_>a`(s7?9jr;HEj!jhq(JcC<$U]1Mss80;*rTjK6~>
-_>a`(s7?9jr;HEj!jhq(JcC<$U]1Mss80;*rTjK6~>
-^Ae>R*$)ilq>UN&s8.BIJcDMF"oeQ!\,ZEms*t~>
-^Ae>R*$)ilq>UN&s8.BIJcDMF"oeQ!\,ZEms*t~>
-^Ae>R*$)ilq>UN&s8.BIJcDMF"oeQ!\,ZEms*t~>
-_>a`1s5uVCRRd/Q!jhq(JcC<$U]1Mss80;*rTjK6~>
-_>a`1s5uVCRRd/Q!jhq(JcC<$U]1Mss80;*rTjK6~>
-_>a`1s5uVCRRd/Q!jhq(JcC<$U]1Mss80;*rTjK6~>
-_#FT-rsA2p!;QQqZiBoRs+13FrrrE%qmZV(li2J~>
-_#FT-rsA2p!;QQqZiBoRs+13FrrrE%qmZV(li2J~>
-_#FT-rsA2p!;QQqZiBoRs+13FrrrE%qmZV(li2J~>
-_>b>Hs7uitp]^]js8W#lrr;r+rVuiis8Vr1rr`&rs7jS5"8MorpqHb4rr;rns8W&6rs/N%s8W)q
-s80Y4#58)rrPAC*li2J~>
-_>b>Hs7uitp]^]js8W#lrr;r+rVuiis8Vr1rr`&rs7jS5"8MorpqHb4rr;rns8W&6rs/N%s8W)q
-s80Y4#58)rrPAC*li2J~>
-_>b>Hs7uitp]^]js8W#lrr;r+rVuiis8Vr1rr`&rs7jS5"8MorpqHb4rr;rns8W&6rs/N%s8W)q
-s80Y4#58)rrPAC*li2J~>
-_#FT8rsJ#j!<3!-m)ulG\@8KOW4BOJXgl3Q#H5;AZF-jC\&ko\\$`BHZEq3B_6O<QYd_'G\>QgP
-Z3S"FYcb[<^oY>Ws02X=Vu#]YJ,~>
-_#FT8rsJ#j!<3!-m)ulG\@8KOW4BOJXgl3Q#H5;AZF-jC\&ko\\$`BHZEq3B_6O<QYd_'G\>QgP
-Z3S"FYcb[<^oY>Ws02X=Vu#]YJ,~>
-_#FT8rsJ#j!<3!-m)ulG\@8KOW4BOJXgl3Q#H5;AZF-jC\&ko\\$`BHZEq3B_6O<QYd_'G\>QgP
-Z3S"FYcb[<^oY>Ws02X=Vu#]YJ,~>
-_>b>LnbYhCY<i3cs8Vicr;Zf;r;$BfrV?H/rs-11rqZTlqYA85#Pn5os7uZg]>4FNq>C9cp;H^A
-rs/Q"rVHH,q=hW'"SK>'s7bm[J,~>
-_>b>LnbYhCY<i3cs8Vicr;Zf;r;$BfrV?H/rs-11rqZTlqYA85#Pn5os7uZg]>4FNq>C9cp;H^A
-rs/Q"rVHH,q=hW'"SK>'s7bm[J,~>
-_>b>LnbYhCY<i3cs8Vicr;Zf;r;$BfrV?H/rs-11rqZTlqYA85#Pn5os7uZg]>4FNq>C9cp;H^A
-rs/Q"rVHH,q=hW'"SK>'s7bm[J,~>
-^]+N1`[qeMoD8Cb#5I_aqu?]jrr9h5"0DP&rr)l=rVc`urr<#"_>X<3!rfS,_>X<3!j)D$_>OW2
-r;Zeur;ZTZs*t~>
-^]+N1`[qeMoD8Cb#5I_aqu?]jrr9h5"0DP&rr)l=rVc`urr<#"_>X<3!rfS,_>X<3!j)D$_>OW2
-r;Zeur;ZTZs*t~>
-^]+N1`[qeMoD8Cb#5I_aqu?]jrr9h5"0DP&rr)l=rVc`urr<#"_>X<3!rfS,_>X<3!j)D$_>OW2
-r;Zeur;ZTZs*t~>
-_>ao5rVu]fs763cr;QZnrs-74q>U-dp@c?&#.+@0n+Z\Wa8ZABqY0IYs0KQA#5\,js8Vu"^]4?+
-!rDr'^&J91s/Q,!o'HC,~>
-_>ao5rVu]fs763cr;QZnrs-74q>U-dp@c?&#.+@0n+Z\Wa8ZABqY0IYs0KQA#5\,js8Vu"^]4?+
-!rDr'^&J91s/Q,!o'HC,~>
-_>ao5rVu]fs763cr;QZnrs-74q>U-dp@c?&#.+@0n+Z\Wa8ZABqY0IYs0KQA#5\,js8Vu"^]4?+
-!rDr'^&J91s/Q,!o'HC,~>
-^]+K0s8Vrqp\t0rqt^'aqmHG'"8r3!rPAI8\,?:*rVt"=rVm!!s89@Brquctqn<$GrW3&urr3&7
-r;XV4"S_l_s/G8_J,~>
-^]+K0s8Vrqp\t0rqt^'aqmHG'"8r3!rPAI8\,?:*rVt"=rVm!!s89@Brquctqn<$GrW3&urr3&7
-r;XV4"S_l_s/G8_J,~>
-^]+K0s8Vrqp\t0rqt^'aqmHG'"8r3!rPAI8\,?:*rVt"=rVm!!s89@Brquctqn<$GrW3&urr3&7
-r;XV4"S_l_s/G8_J,~>
-_>al@s76-gs8;cjqu6Nn#H@S"rU^'hqSE15_!V!srrD`6rrD`jrrW&a^qp$Ur;ZZfs7+>(_>ac:
-qu?]b`pio>rrU%/q!7s1~>
-_>al@s76-gs8;cjqu6Nn#H@S"rU^'hqSE15_!V!srrD`6rrD`jrrW&a^qp$Ur;ZZfs7+>(_>ac:
-qu?]b`pio>rrU%/q!7s1~>
-_>al@s76-gs8;cjqu6Nn#H@S"rU^'hqSE15_!V!srrD`6rrD`jrrW&a^qp$Ur;ZZfs7+>(_>ac:
-qu?]b`pio>rrU%/q!7s1~>
-_#FQ8s8Vchrr3<'r;HWorVlfrn,E=fp]&)/!;ZWo"8qups2k9?rrMrnrr2uo_>X]8s8Mios763+
-rW3&prr3&ms8Tq7#QOPurp]sfqX"64~>
-_#FQ8s8Vchrr3<'r;HWorVlfrn,E=fp]&)/!;ZWo"8qups2k9?rrMrnrr2uo_>X]8s8Mios763+
-rW3&prr3&ms8Tq7#QOPurp]sfqX"64~>
-_#FQ8s8Vchrr3<'r;HWorVlfrn,E=fp]&)/!;ZWo"8qups2k9?rrMrnrr2uo_>X]8s8Mios763+
-rW3&prr3&ms8Tq7#QOPurp]sfqX"64~>
-\,QO+q>:-j#5/#joDejfaSuM;s82`fs8Voorr`/us8L%<"8ViooY1>/r;Zfgs7X;/"TJ2rq"t$i
-"oA9!q#Bj.rsSi#rqucgs8W#sq>0FWJ,~>
-\,QO+q>:-j#5/#joDejfaSuM;s82`fs8Voorr`/us8L%<"8ViooY1>/r;Zfgs7X;/"TJ2rq"t$i
-"oA9!q#Bj.rsSi#rqucgs8W#sq>0FWJ,~>
-\,QO+q>:-j#5/#joDejfaSuM;s82`fs8Voorr`/us8L%<"8ViooY1>/r;Zfgs7X;/"TJ2rq"t$i
-"oA9!q#Bj.rsSi#rqucgs8W#sq>0FWJ,~>
-\c2^!r;HWtp&FXRrVlolrQ5'@nGiCbrs%rls8;fpqo8X@q>^Hos8)cl_>a]7qu?*am_8]-qZ$Tk
-m/Q_Rr:0dd!V?-7rs&E$qYgHjq#:9sirB&Us7bm[J,~>
-\c2^!r;HWtp&FXRrVlolrQ5'@nGiCbrs%rls8;fpqo8X@q>^Hos8)cl_>a]7qu?*am_8]-qZ$Tk
-m/Q_Rr:0dd!V?-7rs&E$qYgHjq#:9sirB&Us7bm[J,~>
-\c2^!r;HWtp&FXRrVlolrQ5'@nGiCbrs%rls8;fpqo8X@q>^Hos8)cl_>a]7qu?*am_8]-qZ$Tk
-m/Q_Rr:0dd!V?-7rs&E$qYgHjq#:9sirB&Us7bm[J,~>
-\,QU(qt'jWrr3)so`+j0rrr<"p[/"Qr;Qous8W&qaSuJ9s8VlmrqjJ1!;QQn!W23!rt"i!s6p!f
-nG`Ifo`+RYs8:4C%.X5prr;rfs8Vrgs7kp[J,~>
-\,QU(qt'jWrr3)so`+j0rrr<"p[/"Qr;Qous8W&qaSuJ9s8VlmrqjJ1!;QQn!W23!rt"i!s6p!f
-nG`Ifo`+RYs8:4C%.X5prr;rfs8Vrgs7kp[J,~>
-\,QU(qt'jWrr3)so`+j0rrr<"p[/"Qr;Qous8W&qaSuJ9s8VlmrqjJ1!;QQn!W23!rt"i!s6p!f
-nG`Ifo`+RYs8:4C%.X5prr;rfs8Vrgs7kp[J,~>
-\c2[%rVm#fs)SCsrr3&ls8L.?!<2ut"Ss&;&XrXt!W2f9rs&2so_ngJ#JpEErUg,o!#)NNrsngQ
-$NKkS4UE5-s69R`o[*U<q>UC%mJles"p2(#.Kgcpm/MS~>
-\c2[%rVm#fs)SCsrr3&ls8L.?!<2ut"Ss&;&XrXt!W2f9rs&2so_ngJ#JpEErUg,o!#)NNrsngQ
-$NKkS4UE5-s69R`o[*U<q>UC%mJles"p2(#.Kgcpm/MS~>
-\c2[%rVm#fs)SCsrr3&ls8L.?!<2ut"Ss&;&XrXt!W2f9rs&2so_ngJ#JpEErUg,o!#)NNrsngQ
-$NKkS4UE5-s69R`o[*U<q>UC%mJles"p2(#.Kgcpm/MS~>
-\,Qd&s7u[#K+%_ZpAY'lm`>D;p$r(Zs8TDDs7H?gs8L+>#O29Ws8Upu#J^9BrX@)l%J@R;$3Yt]
-s8-'Ho)8FRrr2uid/OXPs6fmdm.UJX_\<(Gq614ms*t~>
-\,Qd&s7u[#K+%_ZpAY'lm`>D;p$r(Zs8TDDs7H?gs8L+>#O29Ws8Upu#J^9BrX@)l%J@R;$3Yt]
-s8-'Ho)8FRrr2uid/OXPs6fmdm.UJX_\<(Gq614ms*t~>
-\,Qd&s7u[#K+%_ZpAY'lm`>D;p$r(Zs8TDDs7H?gs8L+>#O29Ws8Upu#J^9BrX@)l%J@R;$3Yt]
-s8-'Ho)8FRrr2uid/OXPs6fmdm.UJX_\<(Gq614ms*t~>
-\c2s5s8Mlos5a(Xrr3#uo>gk2rr)j&p&F(fs7ZKkrPnjAr;$'XRt1^Yrs&?"q@VQ0*l%^aq#gQp%
-K#qqs8W#es8:4C%f5htoD\dcr3@F?s7uR9m/MS~>
-\c2s5s8Mlos5a(Xrr3#uo>gk2rr)j&p&F(fs7ZKkrPnjAr;$'XRt1^Yrs&?"q@VQ0*l%^aq#gQp%
-K#qqs8W#es8:4C%f5htoD\dcr3@F?s7uR9m/MS~>
-\c2s5s8Mlos5a(Xrr3#uo>gk2rr)j&p&F(fs7ZKkrPnjAr;$'XRt1^Yrs&?"q@VQ0*l%^aq#gQp%
-K#qqs8W#es8:4C%f5htoD\dcr3@F?s7uR9m/MS~>
-\,Qp:s8MlprsSYpq>^KnrlG*En,N+]q=0?)rVlrqs80q<#Pn5rp#m+d!5\[?r:Bra!W]+i_>b&/
-rrE)k&j6i#l2:SUs8VT9rt#)#s8W)dp%8:uU\XrhFFifYJ,~>
-\,Qp:s8MlprsSYpq>^KnrlG*En,N+]q=0?)rVlrqs80q<#Pn5rp#m+d!5\[?r:Bra!W]+i_>b&/
-rrE)k&j6i#l2:SUs8VT9rt#)#s8W)dp%8:uU\XrhFFifYJ,~>
-\,Qp:s8MlprsSYpq>^KnrlG*En,N+]q=0?)rVlrqs80q<#Pn5rp#m+d!5\[?r:Bra!W]+i_>b&/
-rrE)k&j6i#l2:SUs8VT9rt#)#s8W)dp%8:uU\XrhFFifYJ,~>
-\GuU+s8NE!s7-0ds8W#rqT/[Ir;ZHis8JBds7?9cs8)cmao;VCs8MmObl7d[rri0<^r[M/rsT#(
-rrU?i'*&"*s7l?8rso#-rq-6jp](8b*<5i(>jME?~>
-\GuU+s8NE!s7-0ds8W#rqT/[Ir;ZHis8JBds7?9cs8)cmao;VCs8MmObl7d[rri0<^r[M/rsT#(
-rrU?i'*&"*s7l?8rso#-rq-6jp](8b*<5i(>jME?~>
-\GuU+s8NE!s7-0ds8W#rqT/[Ir;ZHis8JBds7?9cs8)cmao;VCs8MmObl7d[rri0<^r[M/rsT#(
-rrU?i'*&"*s7l?8rso#-rq-6jp](8b*<5i(>jME?~>
-Z2Y".s82Khs7+21&,cD's88Eds82ils8Vrqp<!=Fp](3l!!!]5%IsJps7$'^a8Z>A&^\K3r5&C@
-q>UHps#dX8*;9F/c2S=Os7?9jp](!b_%cg6@/g)js*t~>
-Z2Y".s82Khs7+21&,cD's88Eds82ils8Vrqp<!=Fp](3l!!!]5%IsJps7$'^a8Z>A&^\K3r5&C@
-q>UHps#dX8*;9F/c2S=Os7?9jp](!b_%cg6@/g)js*t~>
-Z2Y".s82Khs7+21&,cD's88Eds82ils8Vrqp<!=Fp](3l!!!]5%IsJps7$'^a8Z>A&^\K3r5&C@
-q>UHps#dX8*;9F/c2S=Os7?9jp](!b_%cg6@/g)js*t~>
-Z2Y"Cl2UeZq!cB)%fQG-k5PGb!!MTel2UVRa8ZSErTjL`lNQhYqu?]ba8ZA=r;Vm#$(\j2%fHJ/
-jP)9eUAt)is82ipdJjaSs8W&hs5"Xp$H2`?!!E;gs*t~>
-Z2Y"Cl2UeZq!cB)%fQG-k5PGb!!MTel2UVRa8ZSErTjL`lNQhYqu?]ba8ZA=r;Vm#$(\j2%fHJ/
-jP)9eUAt)is82ipdJjaSs8W&hs5"Xp$H2`?!!E;gs*t~>
-Z2Y"Cl2UeZq!cB)%fQG-k5PGb!!MTel2UVRa8ZSErTjL`lNQhYqu?]ba8ZA=r;Vm#$(\j2%fHJ/
-jP)9eUAt)is82ipdJjaSs8W&hs5"Xp$H2`?!!E;gs*t~>
-Z2Y'ls7ZKes8Vr;s8W!!p&G']rVm&ts8Dipn]Ce;rVuops6Td`s7?3h!WMl9rs/N&q#:<noCB`t
-&,cJ-qu?]cs8N&js8;`nrmC`Qqu?Tos7cQnrr;inrrD]Xs*t~>
-Z2Y'ls7ZKes8Vr;s8W!!p&G']rVm&ts8Dipn]Ce;rVuops6Td`s7?3h!WMl9rs/N&q#:<noCB`t
-&,cJ-qu?]cs8N&js8;`nrmC`Qqu?Tos7cQnrr;inrrD]Xs*t~>
-Z2Y'ls7ZKes8Vr;s8W!!p&G']rVm&ts8Dipn]Ce;rVuops6Td`s7?3h!WMl9rs/N&q#:<noCB`t
-&,cJ-qu?]cs8N&js8;`nrmC`Qqu?Tos7cQnrr;inrrD]Xs*t~>
-Yl=q*rVufqs8L+>%.F5pnc.qRp%n@]s7FA3&,?1is8VuerqZ6eqs4:^qoJd>jo>AF^Ae`?rVQNk
-s7uQlqu?]gs8W)Ers\/is7c*Us8Vrjs7?!Ns*t~>
-Yl=q*rVufqs8L+>%.F5pnc.qRp%n@]s7FA3&,?1is8VuerqZ6eqs4:^qoJd>jo>AF^Ae`?rVQNk
-s7uQlqu?]gs8W)Ers\/is7c*Us8Vrjs7?!Ns*t~>
-Yl=q*rVufqs8L+>%.F5pnc.qRp%n@]s7FA3&,?1is8VuerqZ6eqs4:^qoJd>jo>AF^Ae`?rVQNk
-s7uQlqu?]gs8W)Ers\/is7c*Us8Vrjs7?!Ns*t~>
-Z2XjrnG`Fgq=MZ+$gRcds8Vlor9"%Zou6q=nc&Ofr;ZforVufnaSuMCs8DornGN*rrsSW%li7"\
-s8Vrqs7Xh>s8;os#jM!]s8D'Zs6o4PJ,~>
-Z2XjrnG`Fgq=MZ+$gRcds8Vlor9"%Zou6q=nc&Ofr;ZforVufnaSuMCs8DornGN*rrsSW%li7"\
-s8Vrqs7Xh>s8;os#jM!]s8D'Zs6o4PJ,~>
-Z2XjrnG`Fgq=MZ+$gRcds8Vlor9"%Zou6q=nc&Ofr;ZforVufnaSuMCs8DornGN*rrsSW%li7"\
-s8Vrqs7Xh>s8;os#jM!]s8D'Zs6o4PJ,~>
-YQ"b&mf3=^aSue?s7cQnnbi4^m/R+^pAas0rrDHcrsA>tp[J4Rs8VrmaSuMAs8;iqqu?Z3rs/)n
-s8W&pq=O[d"8;cpnB_+Ep\k-lqt^*\s8Mcms5s:Hs*t~>
-YQ"b&mf3=^aSue?s7cQnnbi4^m/R+^pAas0rrDHcrsA>tp[J4Rs8VrmaSuMAs8;iqqu?Z3rs/)n
-s8W&pq=O[d"8;cpnB_+Ep\k-lqt^*\s8Mcms5s:Hs*t~>
-YQ"b&mf3=^aSue?s7cQnnbi4^m/R+^pAas0rrDHcrsA>tp[J4Rs8VrmaSuMAs8;iqqu?Z3rs/)n
-s8W&pq=O[d"8;cpnB_+Ep\k-lqt^*\s8Mcms5s:Hs*t~>
-Z2Xmns8;lr!;sn;"T&/ks82cp"o[ras8Vo7rsJ\is8Vlms8Vrhq8WF<pAa^^s7O,+!W)HdrrrAr
-p&Fjcd/OUMs8V?`s763im/6\Zs7kp[J,~>
-Z2Xmns8;lr!;sn;"T&/ks82cp"o[ras8Vo7rsJ\is8Vlms8Vrhq8WF<pAa^^s7O,+!W)HdrrrAr
-p&Fjcd/OUMs8V?`s763im/6\Zs7kp[J,~>
-Z2Xmns8;lr!;sn;"T&/ks82cp"o[ras8Vo7rsJ\is8Vlms8Vrhq8WF<pAa^^s7O,+!W)HdrrrAr
-p&Fjcd/OUMs8V?`s763im/6\Zs7kp[J,~>
-Z2Xn(s7ZEk!<("=%JTc"o`+s`s8;osrV$!+rsnZ#rr;lps8V]js82iroZ7%9r;Zfls8Kh6&,?2!
-s8VZ_s8N&urVuHgq9]-Bo)8Rf!<)lr"T&/hs7>UWJ,~>
-Z2Xn(s7ZEk!<("=%JTc"o`+s`s8;osrV$!+rsnZ#rr;lps8V]js82iroZ7%9r;Zfls8Kh6&,?2!
-s8VZ_s8N&urVuHgq9]-Bo)8Rf!<)lr"T&/hs7>UWJ,~>
-Z2Xn(s7ZEk!<("=%JTc"o`+s`s8;osrV$!+rsnZ#rr;lps8V]js82iroZ7%9r;Zfls8Kh6&,?2!
-s8VZ_s8N&urVuHgq9]-Bo)8Rf!<)lr"T&/hs7>UWJ,~>
-JcD\K$i^,(rqQ?is7cQfqYpL&rqufbs8Vclq>^9frVm*#s8;Qis6kO=Zi>O~>
-JcD\K$i^,(rqQ?is7cQfqYpL&rqufbs8Vclq>^9frVm*#s8;Qis6kO=Zi>O~>
-JcD\K$i^,(rqQ?is7cQfqYpL&rqufbs8Vclq>^9frVm*#s8;Qis6kO=Zi>O~>
-JcD_L"8)Nkqu6U'nG*"ZqZ$<io)JadrVmB'qX=IMs7bs]s763irUtgBZN#F~>
-JcD_L"8)Nkqu6U'nG*"ZqZ$<io)JadrVmB'qX=IMs7bs]s763irUtgBZN#F~>
-JcD_L"8)Nkqu6U'nG*"ZqZ$<io)JadrVmB'qX=IMs7bs]s763irUtgBZN#F~>
-JcD\K#PJ,skP5&Vq#::#o_.tXp[nL^q>]j]rr`,to'u_Z#6"T$s7$'eJcE+WJ,~>
-JcD\K#PJ,skP5&Vq#::#o_.tXp[nL^q>]j]rr`,to'u_Z#6"T$s7$'eJcE+WJ,~>
-JcD\K#PJ,skP5&Vq#::#o_.tXp[nL^q>]j]rr`,to'u_Z#6"T$s7$'eJcE+WJ,~>
-JcD_L%IF,nrq731!!W#pnc/:\rt4`"s7lWbq=FXPs8VfhpAb$UJcDtSJ,~>
-JcD_L%IF,nrq731!!W#pnc/:\rt4`"s7lWbq=FXPs8VfhpAb$UJcDtSJ,~>
-JcD_L%IF,nrq731!!W#pnc/:\rt4`"s7lWbq=FXPs8VfhpAb$UJcDtSJ,~>
-JcDYJ(B"(0!<)ros7`Y[qZ$!UqYL6Xs8VZnrr3B#s6BX_o`+pbs8DYBs0VfV~>
-JcDYJ(B"(0!<)ros7`Y[qZ$!UqYL6Xs8VZnrr3B#s6BX_o`+pbs8DYBs0VfV~>
-JcDYJ(B"(0!<)ros7`Y[qZ$!UqYL6Xs8VZnrr3B#s6BX_o`+pbs8DYBs0VfV~>
-JcD\K%IX/op'^Tks8W#X+WmHXrtN=!%3G$N!W_f!)%smerr?X.s8VM<s0M`U~>
-JcD\K%IX/op'^Tks8W#X+WmHXrtN=!%3G$N!W_f!)%smerr?X.s8VM<s0M`U~>
-JcD\K%IX/op'^Tks8W#X+WmHXrtN=!%3G$N!W_f!)%smerr?X.s8VM<s0M`U~>
-JcDYJ,Q.-4$NL2-q>^3hj8f&KruR9cs7cNns8OOQW&XD@!TX4FpOW@Ms*t~>
-JcDYJ,Q.-4$NL2-q>^3hj8f&KruR9cs7cNns8OOQW&XD@!TX4FpOW@Ms*t~>
-JcDYJ,Q.-4$NL2-q>^3hj8f&KruR9cs7cNns8OOQW&XD@!TX4FpOW@Ms*t~>
-JcD_Ls8)ouqYL9kruD$,-OBeQs7H]rs7lWg"8_usqu-TqrrE)qs8VkFs0M`U~>
-JcD_Ls8)ouqYL9kruD$,-OBeQs7H]rs7lWg"8_usqu-TqrrE)qs8VkFs0M`U~>
-JcD_Ls8)ouqYL9kruD$,-OBeQs7H]rs7lWg"8_usqu-TqrrE)qs8VkFs0M`U~>
-JcDYJ"8)We!<3!=p&>01rrDikrud@%s7-*ro`$&DYVGtR!<;cmqtksEZi>O~>
-JcDYJ"8)We!<3!=p&>01rrDikrud@%s7-*ro`$&DYVGtR!<;cmqtksEZi>O~>
-JcDYJ"8)We!<3!=p&>01rrDikrud@%s7-*ro`$&DYVGtR!<;cmqtksEZi>O~>
-JcD_L!:^!f,P)ZLnGi7\Sdtl&q!J+-,6\YYs.2mR[1!_Rs8EQ/s4mYSq18RQs*t~>
-JcD_L!:^!f,P)ZLnGi7\Sdtl&q!J+-,6\YYs.2mR[1!_Rs8EQ/s4mYSq18RQs*t~>
-JcD_L!:^!f,P)ZLnGi7\Sdtl&q!J+-,6\YYs.2mR[1!_Rs8EQ/s4mYSq18RQs*t~>
-JcD\K-1g[,p\"LbrVulsp%n^]s8Dorq#16Wq>^Kis8VinqXaR_s7Z&8s0M`U~>
-JcD\K-1g[,p\"LbrVulsp%n^]s8Dorq#16Wq>^Kis8VinqXaR_s7Z&8s0M`U~>
-JcD\K-1g[,p\"LbrVulsp%n^]s8Dorq#16Wq>^Kis8VinqXaR_s7Z&8s0M`U~>
-JcDYJ!W)WkrsSc"s8V-Zp&FjVs7H<j&F9Arq>('cq#C-gs8Vops6tU>Zi>O~>
-JcDYJ!W)WkrsSc"s8V-Zp&FjVs7H<j&F9Arq>('cq#C-gs8Vops6tU>Zi>O~>
-JcDYJ!W)WkrsSc"s8V-Zp&FjVs7H<j&F9Arq>('cq#C-gs8Vops6tU>Zi>O~>
-JcD_L$M+5sqYfmXqZ$6crr2ulrVlrmqYC-j!V?9hrsAT#s6]gbmf3=^JcE+WJ,~>
-JcD_L$M+5sqYfmXqZ$6crr2ulrVlrmqYC-j!V?9hrsAT#s6]gbmf3=^JcE+WJ,~>
-JcD_L$M+5sqYfmXqZ$6crr2ulrVlrmqYC-j!V?9hrsAT#s6]gbmf3=^JcE+WJ,~>
-JcD\K"o/#qq>^!aruLn7m/R(bq=s1Rs8Dorp&G'Ym/R%arr;`fs763eJcE+WJ,~>
-JcD\K"o/#qq>^!aruLn7m/R(bq=s1Rs8Dorp&G'Ym/R%arr;`fs763eJcE+WJ,~>
-JcD\K"o/#qq>^!aruLn7m/R(bq=s1Rs8Dorp&G'Ym/R%arr;`fs763eJcE+WJ,~>
-JcD_L%fZM.qu>XTqY1$gs8V`irVm,js8;oos6fmbrs/,plMpVYs87HJZi>O~>
-JcD_L%fZM.qu>XTqY1$gs8V`irVm,js8;oos6fmbrs/,plMpVYs87HJZi>O~>
-JcD_L%fZM.qu>XTqY1$gs8V`irVm,js8;oos6fmbrs/,plMpVYs87HJZi>O~>
-JcF^/s8Miorr1RMrr*T%rr;Kfp&G'is8MThs8)ces8;iprt"o)s7H?`s8VrqqZ$T_s8%<H[/YX~>
-JcE"Ts8Mlp'D2>)nGi1\rV-<hmJ["Yrq$-cqu6U+q#CBds7H?kqZ$Els6]j_JcE+WJ,~>
-JcFR+r;HTorr(LL'D)8(o)JIas82irnc/Xds7?9fr;Q^,q#CBds7H?kqZ$Els6]j_JcE+WJ,~>
-JcFa0"9.ujrql^8qY]s_oD\des8Vros82ioq>^?bs8Dipp%\Odp\t0mpAP!kpAY'pqXjgemJZt^
-rqQKtqt:!es8V]irt4l&qtL-crVuops8Vloqu?Wnrr3N*rVQWiq>^Kfs7ZK_s8VflrsJc*q#:<n
-rVufqq>UBonq$hrs*t~>
-JcF^/-2RZArquTks8W#sq>^-frql`qqYgHks8;]mqt:!fqu??arr;`lrrDckrrDclrWN#gs8VWc
-s!7UBpA+I[p%eISnG`.[rpg$fs7?9fp]($es8Vurs7lWks8Doqrt"u)qu?Hes8VclpAa[_s7ZHl
-$NC)#rr<#ss8;omrr2uhJcFO*J,~>
-JcFR++o([(qYU*gp\jUUq>('jqYgHks8;]mqt:!fqu??arr;`lrrDckrs8>urVcQas8VZ[ru:e-
-s8)cqo)8LdoDe^^s7lQms82irq#C6krVc`q&,Q8%s7lEis7QEcs7--hpAY(!rr;cms8W&tr;ZTl
-rrDV@s4mX)~>
-JcFa0"TJ;qq"t'j#5J&mo(2YUrr4)-s8Vops8;osp&G'equ?]ns7ZHlpAap[q>L!ds7,j_rs8Q%
-l21AUr;Q]prs\Z%s5X.Zqu?]fqu?TlrrN&mr;S>2s7lHis8Vcks75d]rVuZ`s8VNdqYL6dqt]g_
-mf3%Us8W#sr;Z]pr;ZQcJcFI(J,~>
-JcFX-$MjGqrVlKes82`nrVn22s8Vops8;osp&G'equ?]ns7ZHlpAap[q>L!ds6oRYrr;ormJ6br
-rp]jai;EECrVl?\rV6?krr<#rq#(.CkPt>Rrr<#krr;Q\s8Dumo)JaXrqcKkp\XdWs6fp]p](9k
-s8;ops8;olp4<7ts*t~>
-JcFX-2#I"ApA".Ns8)QfqY'^_mJm4^s8W#ss7QElq"t*kqu?Bhs7ZKfo_JIYs8VTZrVuoqs6f[^
-'DVV-kPtSZs8V`fs7uZmr;Zfpq#(.CkPt>Rrr<#krr;Q\s8Dumo)JaXrqcKkp\XdWs6fp]p](9k
-s8;ops8;olp4<7ts*t~>
-JcF^/!VlWms!%:=s8;]^q"t'br;ZZos8;ihs8D-\s7?9gmf2eVs7?-frr2p.n,MqVs8W)hq=ikG
-o_eXdrVm<*o]Yc=kj\96r:U!brr3u7s60L_p](-Ys8Vopp&Fpfs8VWgs8Drns8W&krVluqs8Vfl
-rsSDtnc/4Us6p!fmJd+b!W)M@s4mX)~>
-JcF^/#5S8urqQ'\rr2uprr3l1q>^?ls8;ihs8D-\s7?9gmf2eVs7?-frr2p+n,MqVrr2c`q=iqL
-q#(0lrr<!(rVQWjs8Vrqp\t3mrZ(_5kl:\Ws826as7u]fs82cps7-*grVlZns8DZirr`)ss7ZHl
-$hF>fs7?$cn,NFTrr2ouqY#L?h#Dm~>
-JcF^/-i<rBqXX"Hqu?]os8Vubo)8Ics8;ihs8D-\s7?9gmf2eVs7?-frr2p+n,MqVs8Vudq=inK
-p\=aqp@nUYrVuTkpAb-kruCk7kl:\Ws826as7u]fs82cps7-*grVlZns8DZirr`)ss7ZHl$hF>f
-s7?$cn,NFTrr2ouqY#L?h#Dm~>
-JcF[.!VZNlrs/Dkq""+Oq=FRb$iL&)qu?]ks7Gj]rr2p(qt'ddq>^KaqtpBm"7cEgr;Q`rrW<#s
-rqud,r9`56qsNb7p$i"Np\+Xdrr4#,p]($fs8DEdmJm4Js7#^]p%n^Qs7c9\s7H3foDS\#nFZ,J
-li6eQs7u]bs7QEjrIP"%s*t~>
-JcF[.#kIfhrqcHas8;lr!;6<j$iL&)qu?]ks7Gj]rr2p(qt'ddq>^KaqtpBm"S)NfqYp9is8E-!
-s8Vols!RC;qu?Nmr;Q`rme?bVrr;rcs6]jdjo=iCs7Q6gl2UMPp&F[]rq$*g&Ff>Zs6K^\o`+ae
-nc/:^rV_<Ig&HR~>
-JcF^/#Q=,apA"@Up\b%&o_SF_s8;osqu?]ks7Gj]rr2p(qt'ddq>^KaqtpBm"7cEfqtg?mrVZNn
-qW\"U$2aJon,<"\q>^EmruLP%s7lTnrU9dRs8V3\nFchSqZ#g[p\4@\o_\XZrVmGuo^2\Es7u<e
-q>^!bp&G!hJcFF'J,~>
-JcFR+/,]GFo^;/;mHsiOnc/OTrqcZpnbi1[s8V`[s7--hrVuoppAa^`q#16moD\amlMpkMq"aq%
-jRW?Jn*095s8V]kMYmAQpAP!j!Vu?drrW3"nGE4do_SIb"7-!equ6U1r:p<lqu6Wgs8W)dq#BOW
-nc/O^s71a@h#Dm~>
-JcF^/0E1hIqtL-jrVZ]qqtC'hm/R"OrqcZpnbi1[s8V`[s7--hrVuoppAa^`q#16moD\^llMpnP
-qYpKsrr)fnrr3#smf!.lr;HX+Q2gjapAP!j!Vu?drrW3"nGE4do_SIb"7-!equ6U1r:p<lqu6Wg
-s8W)dq#BOWnc/O^s71a@h#Dm~>
-JcFa0#6"Dhq"=7Wq>VW:l2CPJrqcZpnbi1[s8V`[s7--hrVuoppAa^`q#16moD\aolMpnMp\k!f
-q@iYtl1+B,o(MkOqYU*qOoPF_pAP!j!Vu?drrW3"nGE4do_SIb"7-!equ6U1r:p<lqu6Wgs8W)d
-q#BOWnc/O^s71a@h#Dm~>
-JcF^/!<)lr!WLRF!!)3]rrDurrrM]`rr4#<s8Dutmf34ZlNHGOs6]j\q#BUYs7lWis7u`pp\Fh:
-q#C@Fro2i8s8;Ef,i\_%s8W&rqu?]`q>^Ejr;Zfhp&":Zs8)chrVmf)s7QElr<Duqo(2nZs7Yj[
-s8;osq!nFbq>,[Bg])d~>
-JcF^/%JKYtr;ZfP!t,\D!se/krW)lqrrM]`rr48Cs8Dutmf34ZlNHGOs6]j\q#BUYs7ZHfs7u`q
-q#CBnrr)cmrr4;0!<;uds7b[S$o%#I!WW2urVQWpmJ6e\qu$Koo_&+Os8VrqpAP"0n,N(\s8</q
-s75d]r;ZKXs8W#ss7l-bs7uMBs4dR(~>
-JcFa0%f>bcp@eIbjUr[b*#TRdrr2urrr3#ip&=t6rr;rss6fpbpZhtGs8VKdp\=dQs8Vopq>^9k
-rU]p_q#0n7oBbi)!:St(pA!kE!\EX:"98E"rVQWpmJ6e\qu$Koo_&+Os8VrqpAP"0n,N(\s8</q
-s75d]r;ZKXs8W#ss7l-bs7uMBs4dR(~>
-JcFU,0_b/5nc0@A)Bf+Tr9a@cDZ@!m+M@Hb&2:6coEBRJi"l@nquD0F4octcq#GsYf`1pNpAY1]
-W>PR54o>:eK_YWI\-+Rmp[8T=!9F1Zr:g8On\HRa[/[?N$cW/?!/D$K!!!K.#^?;2!@ln'!.G1*
-rr<Q0s8VqHs4mX)~>
-JcF^/rr+VFoDeh(1,q3S$ig.jqZ^s<Z7@'1pV@CpXo@qrHO8UH!!)osIK)J2-f"LtIh:94rW)rt
-:&b+hr;6Bho)MJbs8Mi`li.3-NW0%Z\-+Rmp[8T=!9F1Zr:g8On\HRa[/[?N$cW/?!/D$K!!!K.
-#^?;2!@ln'!.G1*rr<Q0s8VqHs4mX)~>
-JcFa02#I(Aq""+Xs!^]E=&pLEs7#skDZ@!m+M@Hb&2:6coEBRJi"l@nquD0F4octcq#H![gAh-P
-;#C+ap@S"KoC(o*!)`gamdp/BqZ(>hrrW51">[:Wmga[EjT#5Wp]-<D_']f$s0*LO`W,Z4LCNMK
-!"Jr6GQ0c+.bst&IL"O*!"T)0s8%<Hh#Dm~>
-JcF[.2ZECKq<[JK.L[aH!:0I[r<;BU0s\bNs!GUg3rf-ZT>a@o"98$!iq39N_(,HbT#O%lrrrH"
-q#:FNb/tt+rt#2#*9R>",e^!,s8N(qcoh4)s!S!#ruo+n3:8Z;djG+p!2mk'rs\kr!oEtUs4Jao
-$(K:1p%o!ns8;bFs4mX)~>
-JcF^/>Q4Hjs8Vrq##$dG3s>E[rqlr_o.dPi0)m98Z9&$a!M@>%o`P6e#NGCUs1p2b!1^tmqYpa!
-r;ZfrrVZTjq=Xe^;?6Xln`TB@#Q,n7!WF@XUbDcJ!2\%)qu6UD"4mJq^;;kt28.Hcs8N(sa$K_6
-rUBsGs8DuN-MRn:cpdX)#QFc$qgne&s*t~>
-JcFa0"9&)fnGW@j,&^P'>p0+G8d4DL0s\bNs!GUg3rf-ZT>a@o"98$!iq39N_(,HbT>s:prr`/l
-qY'XToCMM>joALi!:9+@nG)h[pa#;0r?T(P0E;%PV9h@%rr4AKf)Ho-_Dps@^!e>.rrAt;62qAl
-nH.SIrVtOtp^*G:7J6N_rr;onJcFO*J,~>
-JcF[.s8FeI2Bi\4*tSl'!$3pLqZHll"98E-q[NT+#l+6"s7-Bf!rW''s8S?*'F=C6s7cTorrE&u
-:@eGbqi?2_*N[!.S.UX>YQ+V'mu;r"oaLK^)#rk,s7??l!!*$!s8N'!$j-G6"oo5(rsA_u!<3W!
-rr_upRj&+Ao+(g#!<;rsrVuZiJcFO*J,~>
-JcF[.2#dOP6T$>*7QNIq$SO\"qucum"98E-q[NT+#l+6"s7-Bf!rW''s8S?*'F=C6rq6?lrrE&u
-:@A,[mX]1l!+@fjAH6XYC#eq!ooF_*oaLK^)#rk,s7??l!!*$!s8N'!$j-G6"oo5(rsA_u!<3W!
-rr_upRj&+Ao+(g#!<;rsrVuZiJcFO*J,~>
-JcF^/J,T<Fs%GgJ0l:B,B.6DM5Q:icp&k?q#l>)3!!rAr"on,tp&b0l#QOgh*Y\nR!rr&ts8N)r
-qYK=Io]:=,@fT_&BjLdM@WUo.$1j12!qcuon/22j#ljMtrr<'!!<<'!!"8r/#6k/>nG`gpo`5"'
-n,EL`s-k2<"nN6(rs&Q(quH]qq"oXBh#Dm~>
-JcFa0s8G"LqtTIEjo>c2%3PZ6o_ACcs8Oghs6ot:](5n$quHQl!<3E%rrE)h(<PnCrr`<$&G#K)
-p@S:Zrr2urrr3'UdD@%'s#L/ZlQ-60*P8Bip\t6nrrE#os6g9on1)iYp\u8Ns8W#s!:g'jo`4@Y
-!<<!&eF3bD!<;cooCidipjrJ!s*t~>
-JcF[.%/9f%q#C@"1.sPq"o\H#F9)@@0u3hXs!bPMs8Vusq>LBo$Mj]%s7$lHli@%frr*K"oagch
-qtL*br9jFWp]+T!!;cB\jR2aKs61C$rZ/VP)#+%1s8N)tqZ$!js6qMcp%SJ,_Z0Z6rrDTh!qcQ[
-rrE)t#Lr5KrrE)n!V?$rp\9=>gAc[~>
-JcF[.!;QKl"XmMo?Y^nbs)\8@s"V=hn,FiJo)Jaf!;ZTorsJT%!<;R)am9$-"98B6o(<IanFlAF
-n+>`4mcXXa>la0Tna6&B!WD:("TKLSX;L^3!<<'!rVHQ_$30KEdIm86*Q%jVr;QcerrVinm/I(c
-r<LjA#lao)pAsm[&,5jMs4[L'~>
-JcFa0%K?5!q=jC<lMr4O$n;8VmO%o5s5q6=);P#=*Z!,hrrE)s%KE(ZnIYa#9)o8-e-,gO!;-;\
-7fE>erql]s15d%Is#^;]s.Bkp_uq1.s7u`frrDoqmf*:en%fhOjnlt9'A`We!<<'!s/\TW%dO'i
-!"/ej&HDb1s8ScZs7,o9s4mX)~>
-JcFR+2uW@J#"_6=9a1RopAY-mk/82Vh"]JB(=;FJ!<;s+s.D:?&HDc'!!s+a"TJB#o`(COs8N&t
-p\k"[q"Xn[#QOhpmHXZRs8A8fo>CbRci<hAo`"pfs6fmes6mc@&*<],*#%0,rrE*!!<9,fn.+a`
-:B1b&kRddo!<<(m6N?TOJcFO*J,~>
-JcFI("X7_q<c'&Zs)nDBk/82Vh"]JB(=;FJ!<;s+s.D:?&HDc'!!s+a"TSK%o`(=Jqtg0an+HDJ
-oB#6;7KDoIlgX<<!<)kb#kZ%<+4'u`!;-9kqZ$!`!<;N((_>a*`#KHHrVlltrrE)#6gtTNs%`V&
-!9b!orrE*!TgJeLq18S$s*t~>
-JcFa0#QFAjo^q\GmeZtdnb)_Drr4#6s5CEdk5Y1pr;Zfrs8W&ns8Vfiqu?]qp]'a_pAY'qrqu<d
-s8Drs#lXSrq>WSFp[.t[!qZ<arVlurs5WhOrt5),s763ir;Q`rqt-f`s8Vtprr35ls8ViZs8W)s
-rsJ>sqY'ses7H'cnq$hos*t~>
-JcF^/%/g/&rVHQo%0d"L$jHY1!:9^b*r,co[f>LipVm(1s8N&urV?KnpA=aes8McmnG`(Zrr4&=
-oDejerr)fdp&Fg[)=RUsrqH3Ys7c?cpAXpgj7`HO&c)J,o)Jafrr<#qoV_Tds8/bors/#ms7bjZ
-s8Mus$M+5npAb'jo_8CVJcFF'J,~>
-JcFI("X+p2/g_P:rrDKdruLn7iO8dKs7aM1s8W)us8Dcns7Z?es8W)ms7$'_rVm#tnGW7Wrq[Du
-m.'6,'ArECo_/(IqXaO[q>^<kj7`HO&c)J,o)Jafrr<#qoV_Tds8/bors/#ms7bjZs8Mus$M+5n
-pAb'jo_8CVJcFF'J,~>
-JcFa0*<,j2kPY2Iq![b4mdBW<k4elEo`+m`s8Vins6K[a"8DiqpAY(!fDkgArVu]cr;ZKhrs/E"
-r;QZcs8N#t$hO2lp%e7Tqu?]qo)/Lpp%\Ods7Q<ep\*bKrr`8ss8)`p)#F%)o`+XRs8VQ^s8W&r
-s8V?Vs8V?`qtKse!;;!Dg])d~>
-JcFX-#OMKip](0kq#14%med%Ro`+m`s8Vins6K[a"8DiqpAY(&fDkgArVu]cr;ZEgrr<#rrVm#k
-s8)`mrr3#jm/I"hrr)Wlq>^KorX/>nrr<#kr;66^k5PA_rqcZkrr3i3q"s^`p@&%]n+Zk^rVccr
-l1P)Vl2UYTqYpQhJcFL)J,~>
-JcFX-"7Z?jqYC.#nbiFVo`+m`s8Vins6K[a"8DiqpAY(!fDkgArVu]cr;ZHgrrDrqrt>8!qtL!a
-qXX:DjnAKEp%\7Wnc&CorVuQcrr<#kr;66^k5PA_rqcZkrr3i3q"s^`p@&%]n+Zk^rVccrl1P)V
-l2UYTqYpQhJcFL)J,~>
-JcFa0"TIKZrqHEl+S5*sp##99rr;lqnc/X]s7ZHls8Mues8W&os7--ds82cp!rN#mrr4>9lMpkT
-q>C0is7--dr;69hs82H]r;-Ejnbhn?s8W&rs7cQls8;lr#lF>qp@81_pZ_YV!;$3i!VH9grs88s
-r:p<lrr;Tgrs8MqrV?<is7uJAs4mX)~>
-JcF^/%-dflp\t3mp\=dgm/$_](]47&s8V`kpAY*lrr)Bes8Dfonc/Ldqu-O&qu?Hirqu9Ns8Vil
-rVluirqH?frt>80qu?]ks75ITs8Dorp](3lr;Q^%qtC'`nc/X`l2CV^oD\ajo_\Xf#k\/pq#CBn
-s7?3h#lF>oq>1-kq>#UAh#Dm~>
-JcF^/-ggs6p&"XbpA=mio)/Obqt^9^s8V`kpAY*lrr)Bes8Dfonc/Ldqu-O&qu?Hjs8DKQs8Vfj
-rVmQ$s7lHfp\Oa`p\"FVq>0UXmH+6Er<<5qs8Duqrr39$pAajVs8ViXrVllhrr3#kqu6U$o`+ja
-s8W)uoDS[pqtC!aqZ$Tkq18S$s*t~>
-JcFa0!ri,srr3r9s8W#qp\b$cq#CBXs8VEbs7uB_s8VZis7H6grsA5ls7c6emJm4Zrr2ugrr4PK
-n,)_Sr;Q]qs8)Qjs8V?`rr;umo_\IZq"FRas8)0`q#C0iq"jgdqu?]jrr3Don,NCenF6>Tnc/UW
-rVmK!s7cQgmJm(^s8W&ts6p!frIP"(s*t~>
-JcFU,*W5m-pAXmer;Zflo`"mSs8VEbs7uB_s8VZis7H6grsnSqs7c6emJm4Zs8N#brr2p!oDeX`
-rsSMfoDJRFr;-HnrV?Bk&cD\/qX4CYs7u]iqYC0gs8Vimrs\;`s8N&fnGE7Us8MKcrt4c#p]($U
-s82cps8Dutn,NFdJcFO*J,~>
-JcFX-*rYm+l0\38q=spbmca9>kl:\Ks8Vogp](9as8V`hrr3GtqZ$<`s6]jdp&G'jm/?qco`+aa
-rsSYpp](9Rs7uWjp[\:Z')25%s8)0`q#C0iq"jgdqu?]jrr3Don,NCenF6>Tnc/UWrVmK!s7cQg
-mJm(^s8W&ts6p!frIP"(s*t~>
-JcF^/"Sr&ns8Dor"8`&mr;Q^;qZ$Tjs8Vurs8;lgs8V`ks82cks8VNes7u]pqu?<frsAW%q#:3_
-r;-6frr2os!;HKm%/U#'oDJLMq!n+XrVZWo'Dqgus8W#ps7ZKis7cNmrqlQlqu6U4qu?WprqZEj
-s8;ogs8VTgpAb0ks7?9]pOWA!s*t~>
-JcF^/;YpFhrq-0fp](!fq>C9mrV?Knq#CBks8W#ro`+s`s8VupqZ$T`s8Vops82igrql]krV6Em
-p](6krr<#srV?<XrVHB\rr;ips7?9is8W&qrVmQ.s6p!fr;?Tgs82ijrr;upqZ$HlrttY5rVulm
-qZ$Tns7?9jnGi4^s8Duhs75o8s4dR(~>
-JcF^/3r]0RqWmbEme6/HoCVbJo(E%_q#CBks8W#ro`+s`s8VupqZ$T`s8Vops82igs8)]krV6Em
-q#CBnqYpQerr3E!s8DQdqWn%NqYgBjrVmQ.s6p!fr;?Tgs82ijrr;upqZ$HlrttY5rVulmqZ$Tn
-s7?9jnGi4^s8Duhs75o8s4dR(~>
-JcDeNr;Q<frVlfoJcDPGJ,~>
-JcFR+rVkLMs8MZj!WN&prdk*=s*t~>
-JcFU,!<)imrVc`m!<(%>qYc!FV#Pr~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-JcC<$JcE+WJ,~>
-%%EndData
-showpage
-%%Trailer
-end
-%%EOF
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 99a3784402..4f678a2a1b 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -35,6 +35,153 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Megaco.</p>
 
+
+  <section><title>Megaco 3.15.1</title>
+
+    <p>Version 3.15.1 supports code replacement in runtime from/to
+      version 3.15, 3.14.1.1, 3.14.1 and 3.14.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>Updated the 
+            <seealso marker="megaco_performance">performance</seealso> 
+            chapter. </p>
+          <p>Own Id: OTP-8696</p>
+        </item>
+
+     </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>Fixing miscellaneous things detected by dialyzer. </p>
+          <p>Own Id: OTP-9075</p>
+	  <!-- <p>Aux Id: Seq 11579</p> -->
+        </item>
+
+      </list>
+
+    </section>
+
+  </section> <!-- 3.15.1 -->
+
+
+  <section><title>Megaco 3.15</title>
+
+    <section><title>Improvements and New Features</title>
+
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>Fixing auto-import issues.</p>
+          <p>Own Id: OTP-8842</p>
+        </item>
+      </list>
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>Eliminated a possible race condition while creating 
+            pending counters. </p>
+          <p>Own Id: OTP-8634</p>
+	  <p>Aux Id: Seq 11579</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+  </section> <!-- 3.15 -->
+
+
+  <section>
+    <title>Megaco 3.14.1.1</title>
+
+    <p>Version 3.14.1.1 supports code replacement in runtime from/to
+      version 3.14.1, 3.14, 3.13, 3.12 and 3.11.3.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>Updated the 
+            <seealso marker="megaco_performance">performance</seealso> 
+            chapter. </p>
+          <p>Own Id: OTP-8696</p>
+        </item>
+
+     </list>
+
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>A race condition when, during high load, processing
+            both the original and a resent message and delivering
+            this as two separate messages to the user. </p>
+          <p>Note that this solution only protects against multiple
+            reply deliveries! </p>
+          <p>Own Id: OTP-8529</p>
+          <p>Aux Id: Seq 10915</p>
+        </item>
+
+        <item>
+          <p>Fix shared libraries installation. </p>
+          <p>The flex shared lib(s) were incorrectly installed as data 
+            files. </p>
+          <p>Peter Lemenkov</p>
+          <p>Own Id: OTP-8627</p>
+        </item>
+
+        <item>
+          <p>Eliminated a possible race condition while creating 
+            pending counters. </p>
+          <p>Own Id: OTP-8634</p>
+	  <p>Aux Id: Seq 11579</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+  </section> <!-- 3.14.1.1 -->
+
+
   <section>
     <title>Megaco 3.14.1</title>
 
@@ -66,7 +213,7 @@
 
       <list type="bulleted">
         <item>
-          <p>A raise condition when, during high load, processing
+          <p>A race condition when, during high load, processing
             both the original and a resent message and delivering
             this as two separate messages to the user. </p>
           <p>Note that this solution only protects against multiple
@@ -84,7 +231,7 @@
         </item>
 
         <item>
-          <p>Eliminated a possible raise condition while creating 
+          <p>Eliminated a possible race condition while creating 
             pending counters. </p>
           <p>Own Id: OTP-8634</p>
 	  <p>Aux Id: Seq 11579</p>
@@ -142,7 +289,7 @@
         <item>
           <p>Callbacks, when the callback module is unknown (undefined), 
             results in warning messages. </p>
-          <p>A raise condition scenario. As part of a cancelation operation,
+          <p>A race condition scenario. As part of a cancelation operation,
             replies with waiting acknowledgements is cancelled. This includes
             informing the user (via a call to the handle_trans_ack callback 
             function). It is possible that at this point the connection data 
@@ -674,13 +821,16 @@
 
       <list type="bulleted">
         <item>
-          <p>Unexpected <seealso marker="megaco_user#unexpected_trans">handle_unexpected_reply</seealso> callbacks. </p>
-          <p>The <seealso marker="megaco_user">megaco_user</seealso> callback function 
+          <p>Unexpected 
+            <seealso marker="megaco_user#unexpected_trans">handle_unexpected_reply</seealso> 
+            callbacks. </p>
+          <p>The <seealso marker="megaco_user">megaco_user</seealso> callback 
+            function 
             <seealso marker="megaco_user#unexpected_trans">handle_unexpected_reply</seealso> 
             could during high load be called with unexpected values for the Trans
-            argument, such as an <c>TransactionReply</c> where <c>transactionResult</c> 
-            had the value <c>{error, timeout}</c>. This was a result of a raise condition 
-            and has now been fixed. </p>
+            argument, such as an <c>TransactionReply</c> where 
+            <c>transactionResult</c> had the value <c>{error, timeout}</c>. 
+            This was a result of a race condition and has now been fixed. </p>
           <p>Own Id: OTP-7926</p>
 	  <p>Aux Id: Seq 11255</p>
         </item>
@@ -875,416 +1025,6 @@
     </section>
   </section> <!-- 3.10 -->
 
-
-  <section>
-    <title>Megaco 3.9.4</title>
-
-    <p>Version 3.9.4 supports code replacement in runtime from/to
-      version 3.9.3, 3.9.2, 3.9.1.1, 3.9.1, 3.9, 3.8.2, 3.8.1 and 3.8 except 
-      when using any of the drivers (flex for text or asn1 for binary).</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>Miscellaneous dialyzer related and test case cleanup. </p>
-          <p>Own Id: OTP-7614</p>
-        </item>
-
-      </list>
--->
-    </section>
-
-    <section>
-      <title>Fixed bugs and malfunctions</title>
-<!--
-      <p>-</p>
--->
-
-      <list type="bulleted">
-        <item>
-          <p>Segmenting a reply failed (with a badmatch) if the message 
-            did not actually need to be segmented (e.g. was within the
-            size limit, 
-            <seealso marker="megaco#ui_max_pdu_size">max_pdu_size</seealso>). </p>
-          <p>Own Id: OTP-7733</p>
-	  <p>Aux Id: Seq 11168</p>
-        </item>
-
-        <item>
-          <p>Improve the error handling of megaco_tcp for received 
-            messages. </p>
-          <p>Own Id: OTP-7728</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>For those implementing their own codec's, the new megaco_encoder
-            behaviour will require three more functions. See above for more
-            info. </p>
-          <p>Own Id: OTP-7168</p>
-	  <p>Aux Id: Seq 10867</p>
-        </item>
-
-      </list>
--->
-
-    </section>
-  </section> <!-- 3.9.3.1 -->
-
-
-  <section>
-    <title>Megaco 3.9.3</title>
-
-    <p>Version 3.9.3 supports code replacement in runtime from/to
-      version 3.9.2, 3.9.1.1, 3.9.1, 3.9, 3.8.2, 3.8.1 and 3.8 except 
-      when using any of the drivers (flex for text or asn1 for binary).</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>Miscellaneous dialyzer related and test case cleanup. </p>
-          <p>Own Id: OTP-7614</p>
-        </item>
-
-      </list>
--->
-    </section>
-
-    <section>
-      <title>Fixed bugs and malfunctions</title>
-<!--
-      <p>-</p>
--->
-
-      <list type="bulleted">
-        <item>
-          <p>Memory leak in the flex scanner. There was a memory
-            leak in the flex scanner function handling 
-            Property Parameters. </p>
-          <p>Own Id: OTP-7700</p>
-	  <p>Aux Id: Seq 11126</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>For those implementing their own codec's, the new megaco_encoder
-            behaviour will require three more functions. See above for more
-            info. </p>
-          <p>Own Id: OTP-7168</p>
-	  <p>Aux Id: Seq 10867</p>
-        </item>
-
-      </list>
--->
-
-    </section>
-  </section> <!-- 3.9.3 -->
-
-
-  <section>
-    <title>Megaco 3.9.2</title>
-
-    <p>Version 3.9.2 supports code replacement in runtime from/to
-      version 3.9.1.1, 3.9.1, 3.9, 3.8.2, 3.8.1 and 3.8 except 
-      when using any of the drivers (flex for text or asn1 for binary).</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>Miscellaneous dialyzer related and test case cleanup. </p>
-          <p>Own Id: OTP-7614</p>
-        </item>
-
-      </list>
--->
-    </section>
-
-    <section>
-      <title>Fixed bugs and malfunctions</title>
-<!--
-      <p>-</p>
--->
-
-      <list type="bulleted">
-        <item>
-          <p>The text encoders (v1, v2, v3, ...) all failed to 
-            properly encode the DigitMapDescriptor. </p>
-          <p>Own Id: OTP-7671</p>
-	  <p>Aux Id: Seq 11113</p>
-        </item>
-
-        <item>
-          <p>The mini decoder some time incorrectly identifies 
-            plain text as tokens. </p>
-          <p>Own Id: OTP-7672</p>
-	  <p>Aux Id: Seq 11103</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>For those implementing their own codec's, the new megaco_encoder
-            behaviour will require three more functions. See above for more
-            info. </p>
-          <p>Own Id: OTP-7168</p>
-	  <p>Aux Id: Seq 10867</p>
-        </item>
-
-      </list>
--->
-
-    </section>
-  </section> <!-- 3.9.2 -->
-
-
-  <section>
-    <title>Megaco 3.9.1.1</title>
-
-    <p>Version 3.9.1.1 supports code replacement in runtime from/to
-      version 3.9.1, 3.9, 3.8.2, 3.8.1 and 3.8 except 
-      when using any of the drivers (flex for text or asn1 for binary).</p>
-
-    <section>
-      <title>Improvements and new features</title>
-<!--
-      <p>-</p>
--->
-
-      <list type="bulleted">
-        <item>
-          <p>Miscellaneous dialyzer related and test case cleanup. </p>
-          <p>Own Id: OTP-7614</p>
-        </item>
-
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed bugs and malfunctions</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>[text] The flex scanner did not allow an empty quotedString
-            in propertyParm. </p>
-          <p>Own Id: OTP-7573</p>
-	  <p>Aux Id: Seq 11062</p>
-        </item>
-
-        <item>
-          <p>[text] Unable to decode a version 2 message with a
-            topologyTriple containing an (optional) eventStream. </p>
-          <p>Own Id: OTP-7576</p>
-	  <p>Aux Id: Seq 11066</p>
-        </item>
-
-      </list>
--->
-
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>For those implementing their own codec's, the new megaco_encoder
-            behaviour will require three more functions. See above for more
-            info. </p>
-          <p>Own Id: OTP-7168</p>
-	  <p>Aux Id: Seq 10867</p>
-        </item>
-
-      </list>
--->
-
-    </section>
-  </section> <!-- 3.9.1.1 -->
-
-
-  <section>
-    <title>Megaco 3.9.1</title>
-
-    <p>Version 3.9.1 supports code replacement in runtime from/to
-      version 3.9, 3.8.2, 3.8.1 and 3.8 except 
-      when using any of the drivers (flex for text or asn1 for binary).</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>[text] The text codec(s) has been optimized. The parsing of 
-            "property parameters" has been moved to the scanner(s). Which means 
-            that when decoding messages containing property parameters, using 
-            the flex scanner, decode time(s) will be reduced. The reduction 
-            depends on the message, but can be as large as 25%. </p>
-          <p>Own Id: OTP-7431</p>
-        </item>
-
-      </list>
--->
-    </section>
-
-    <section>
-      <title>Fixed bugs and malfunctions</title>
-<!--
-      <p>-</p>
--->
-
-      <list type="bulleted">
-        <item>
-          <p>[text] The flex scanner did not allow an empty quotedString
-            in propertyParm. </p>
-          <p>Own Id: OTP-7573</p>
-	  <p>Aux Id: Seq 11062</p>
-        </item>
-
-        <item>
-          <p>[text] Unable to decode a version 2 message with a
-            topologyTriple containing an (optional) eventStream. </p>
-          <p>Own Id: OTP-7576</p>
-	  <p>Aux Id: Seq 11066</p>
-        </item>
-
-      </list>
-
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>For those implementing their own codec's, the new megaco_encoder
-            behaviour will require three more functions. See above for more
-            info. </p>
-          <p>Own Id: OTP-7168</p>
-	  <p>Aux Id: Seq 10867</p>
-        </item>
-
-      </list>
--->
-
-    </section>
-  </section> <!-- 3.9.1 -->
-
-
-  <section>
-    <title>Megaco 3.9</title>
-
-    <p>Version 3.9 supports code replacement in runtime from/to
-      version 3.8.2, 3.8.1 and 3.8 except 
-      when using any of the drivers (flex for text or asn1 for binary).</p>
-
-    <section>
-      <title>Improvements and new features</title>
-<!--
-      <p>-</p>
--->
-
-      <list type="bulleted">
-        <item>
-          <p>[text] The text codec(s) has been optimized. The parsing of 
-            "property parameters" has been moved to the scanner(s). Which means 
-            that when decoding messages containing property parameters, using 
-            the flex scanner, decode time(s) will be reduced. The reduction 
-            depends on the message, but can be as large as 25%. </p>
-          <p>Own Id: OTP-7431</p>
-        </item>
-
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed bugs and malfunctions</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>If a TransactionRequest arrives while a user is
-            connecting (is in the callback function
-            handle_connect as a result of a megaco:connect call),
-            megaco responds with a pending message and then drops
-            the request.</p>
-          <p>These messages will now be silently dropped, forcing the 
-            other side to resend. </p>
-          <p>Own Id: OTP-7192</p>
-	  <p>Aux Id: Seq 10884</p>
-        </item>
-
-      </list>
--->
-
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-
-<!--
-      <list type="bulleted">
-        <item>
-          <p>For those implementing their own codec's, the new megaco_encoder
-            behaviour will require three more functions. See above for more
-            info. </p>
-          <p>Own Id: OTP-7168</p>
-	  <p>Aux Id: Seq 10867</p>
-        </item>
-
-      </list>
--->
-
-    </section>
-  </section> <!-- 3.9 -->
-
-
   <!-- section>
     <title>Release notes history</title>
     <p>For information about older versions see
diff --git a/lib/megaco/doc/src/notes_history.xml b/lib/megaco/doc/src/notes_history.xml
index 640b62230f..220ed4bbb1 100644
--- a/lib/megaco/doc/src/notes_history.xml
+++ b/lib/megaco/doc/src/notes_history.xml
@@ -33,6 +33,415 @@
   </header>
 
   <section>
+    <title>Megaco 3.9.4</title>
+
+    <p>Version 3.9.4 supports code replacement in runtime from/to
+      version 3.9.3, 3.9.2, 3.9.1.1, 3.9.1, 3.9, 3.8.2, 3.8.1 and 3.8 except 
+      when using any of the drivers (flex for text or asn1 for binary).</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>Miscellaneous dialyzer related and test case cleanup. </p>
+          <p>Own Id: OTP-7614</p>
+        </item>
+
+      </list>
+-->
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>Segmenting a reply failed (with a badmatch) if the message 
+            did not actually need to be segmented (e.g. was within the
+            size limit, 
+            <seealso marker="megaco#ui_max_pdu_size">max_pdu_size</seealso>). </p>
+          <p>Own Id: OTP-7733</p>
+	  <p>Aux Id: Seq 11168</p>
+        </item>
+
+        <item>
+          <p>Improve the error handling of megaco_tcp for received 
+            messages. </p>
+          <p>Own Id: OTP-7728</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>For those implementing their own codec's, the new megaco_encoder
+            behaviour will require three more functions. See above for more
+            info. </p>
+          <p>Own Id: OTP-7168</p>
+	  <p>Aux Id: Seq 10867</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+  </section> <!-- 3.9.3.1 -->
+
+
+  <section>
+    <title>Megaco 3.9.3</title>
+
+    <p>Version 3.9.3 supports code replacement in runtime from/to
+      version 3.9.2, 3.9.1.1, 3.9.1, 3.9, 3.8.2, 3.8.1 and 3.8 except 
+      when using any of the drivers (flex for text or asn1 for binary).</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>Miscellaneous dialyzer related and test case cleanup. </p>
+          <p>Own Id: OTP-7614</p>
+        </item>
+
+      </list>
+-->
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>Memory leak in the flex scanner. There was a memory
+            leak in the flex scanner function handling 
+            Property Parameters. </p>
+          <p>Own Id: OTP-7700</p>
+	  <p>Aux Id: Seq 11126</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>For those implementing their own codec's, the new megaco_encoder
+            behaviour will require three more functions. See above for more
+            info. </p>
+          <p>Own Id: OTP-7168</p>
+	  <p>Aux Id: Seq 10867</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+  </section> <!-- 3.9.3 -->
+
+
+  <section>
+    <title>Megaco 3.9.2</title>
+
+    <p>Version 3.9.2 supports code replacement in runtime from/to
+      version 3.9.1.1, 3.9.1, 3.9, 3.8.2, 3.8.1 and 3.8 except 
+      when using any of the drivers (flex for text or asn1 for binary).</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>Miscellaneous dialyzer related and test case cleanup. </p>
+          <p>Own Id: OTP-7614</p>
+        </item>
+
+      </list>
+-->
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>The text encoders (v1, v2, v3, ...) all failed to 
+            properly encode the DigitMapDescriptor. </p>
+          <p>Own Id: OTP-7671</p>
+	  <p>Aux Id: Seq 11113</p>
+        </item>
+
+        <item>
+          <p>The mini decoder some time incorrectly identifies 
+            plain text as tokens. </p>
+          <p>Own Id: OTP-7672</p>
+	  <p>Aux Id: Seq 11103</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>For those implementing their own codec's, the new megaco_encoder
+            behaviour will require three more functions. See above for more
+            info. </p>
+          <p>Own Id: OTP-7168</p>
+	  <p>Aux Id: Seq 10867</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+  </section> <!-- 3.9.2 -->
+
+
+  <section>
+    <title>Megaco 3.9.1.1</title>
+
+    <p>Version 3.9.1.1 supports code replacement in runtime from/to
+      version 3.9.1, 3.9, 3.8.2, 3.8.1 and 3.8 except 
+      when using any of the drivers (flex for text or asn1 for binary).</p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>Miscellaneous dialyzer related and test case cleanup. </p>
+          <p>Own Id: OTP-7614</p>
+        </item>
+
+      </list>
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[text] The flex scanner did not allow an empty quotedString
+            in propertyParm. </p>
+          <p>Own Id: OTP-7573</p>
+	  <p>Aux Id: Seq 11062</p>
+        </item>
+
+        <item>
+          <p>[text] Unable to decode a version 2 message with a
+            topologyTriple containing an (optional) eventStream. </p>
+          <p>Own Id: OTP-7576</p>
+	  <p>Aux Id: Seq 11066</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>For those implementing their own codec's, the new megaco_encoder
+            behaviour will require three more functions. See above for more
+            info. </p>
+          <p>Own Id: OTP-7168</p>
+	  <p>Aux Id: Seq 10867</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+  </section> <!-- 3.9.1.1 -->
+
+
+  <section>
+    <title>Megaco 3.9.1</title>
+
+    <p>Version 3.9.1 supports code replacement in runtime from/to
+      version 3.9, 3.8.2, 3.8.1 and 3.8 except 
+      when using any of the drivers (flex for text or asn1 for binary).</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[text] The text codec(s) has been optimized. The parsing of 
+            "property parameters" has been moved to the scanner(s). Which means 
+            that when decoding messages containing property parameters, using 
+            the flex scanner, decode time(s) will be reduced. The reduction 
+            depends on the message, but can be as large as 25%. </p>
+          <p>Own Id: OTP-7431</p>
+        </item>
+
+      </list>
+-->
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[text] The flex scanner did not allow an empty quotedString
+            in propertyParm. </p>
+          <p>Own Id: OTP-7573</p>
+	  <p>Aux Id: Seq 11062</p>
+        </item>
+
+        <item>
+          <p>[text] Unable to decode a version 2 message with a
+            topologyTriple containing an (optional) eventStream. </p>
+          <p>Own Id: OTP-7576</p>
+	  <p>Aux Id: Seq 11066</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>For those implementing their own codec's, the new megaco_encoder
+            behaviour will require three more functions. See above for more
+            info. </p>
+          <p>Own Id: OTP-7168</p>
+	  <p>Aux Id: Seq 10867</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+  </section> <!-- 3.9.1 -->
+
+
+  <section>
+    <title>Megaco 3.9</title>
+
+    <p>Version 3.9 supports code replacement in runtime from/to
+      version 3.8.2, 3.8.1 and 3.8 except 
+      when using any of the drivers (flex for text or asn1 for binary).</p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[text] The text codec(s) has been optimized. The parsing of 
+            "property parameters" has been moved to the scanner(s). Which means 
+            that when decoding messages containing property parameters, using 
+            the flex scanner, decode time(s) will be reduced. The reduction 
+            depends on the message, but can be as large as 25%. </p>
+          <p>Own Id: OTP-7431</p>
+        </item>
+
+      </list>
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>If a TransactionRequest arrives while a user is
+            connecting (is in the callback function
+            handle_connect as a result of a megaco:connect call),
+            megaco responds with a pending message and then drops
+            the request.</p>
+          <p>These messages will now be silently dropped, forcing the 
+            other side to resend. </p>
+          <p>Own Id: OTP-7192</p>
+	  <p>Aux Id: Seq 10884</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>For those implementing their own codec's, the new megaco_encoder
+            behaviour will require three more functions. See above for more
+            info. </p>
+          <p>Own Id: OTP-7168</p>
+	  <p>Aux Id: Seq 10867</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+  </section> <!-- 3.9 -->
+
+
+  <section>
     <title>Megaco 3.8.2</title>
 
     <p>Version 3.8.2 supports code replacement in runtime from/to
@@ -901,7 +1310,7 @@
       <list>
         <item>
           <p>When timers expire while a connection cancel
-            (megaco:cancel) is in progress, there is a raise
+            (megaco:cancel) is in progress, there is a race
             condition possibility. This has been eliminated. </p>
           <p>Own Id: OTP-6921</p>
 	  <p>Aux Id: Seq 10450</p>
@@ -1166,7 +1575,7 @@
       <list type="bulleted">
         <item>
           <p>When replies arrive during a call to megaco:cancel
-            there is a raise condition possibility. This has been
+            there is a race condition possibility. This has been
             eliminated. </p>
           <p>Own Id: OTP-6276</p>
           <p>Aux Id: Seq 10450</p>
diff --git a/lib/megaco/examples/meas/megaco_codec_meas.erl b/lib/megaco/examples/meas/megaco_codec_meas.erl
index 88b34105ac..51ee396338 100644
--- a/lib/megaco/examples/meas/megaco_codec_meas.erl
+++ b/lib/megaco/examples/meas/megaco_codec_meas.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
@@ -43,6 +43,8 @@
 
 
 %% API
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([start/0, start/1]).
 -export([start1/0]).
 
diff --git a/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl b/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
index 31df945777..040af9826b 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -26,6 +26,8 @@
 
 
 %% API
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([start_flex_scanner/0, stop_flex_scanner/1,
 	 expanded_messages/2, expanded_messages/3, 
 	 set_default_sched_bind/0,
diff --git a/lib/megaco/src/app/megaco.app.src b/lib/megaco/src/app/megaco.app.src
index 503fcd7176..c0d8218ac8 100644
--- a/lib/megaco/src/app/megaco.app.src
+++ b/lib/megaco/src/app/megaco.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -67,6 +67,7 @@
 	megaco_compact_text_encoder_prev3c,
 	megaco_compact_text_encoder_v3,
 	megaco_config,
+	megaco_config_misc,
 	megaco_digit_map,
 	megaco_encoder,
 	megaco_edist_compress,
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index f939f5e6cf..01b070d79f 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -127,92 +127,40 @@
 %%      |
 %%      v
 %%    3.14.1
+%%      |
+%%      v
+%%   3.14.1.1
+%%      |
+%%      v
+%%    3.15
+%%      |
+%%      v
+%%    3.15.1
 %%
 %%
 {"%VSN%",
  [
-  {"3.14", 
-   [
-    {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]},
-    {update,      megaco_monitor, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_config, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"3.13", 
-   [
-    {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]}, 
-    {load_module, megaco_filter, soft_purge, soft_purge, []}, 
-    {update, megaco_monitor, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_config, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_13_1}, 
-     soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"3.12", 
-   [
-    {load_module, megaco_filter, soft_purge, soft_purge, []}, 
-    {load_module, megaco_udp, soft_purge, soft_purge, []},
-    {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]},
-    {update, megaco_config, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_monitor, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_13_1}, 
-     soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"3.11.3", 
+  {"3.15", 
    [
-    {load_module, megaco_filter, soft_purge, soft_purge, []}, 
-    {load_module, megaco_udp, soft_purge, soft_purge, []}, 
-    {load_module, megaco_messenger, soft_purge, soft_purge, 
-     [megaco_config, megaco_monitor]},
-    {update, megaco_monitor, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_config, {advanced, upgrade_from_pre_3_12}, 
-     soft_purge, soft_purge, []}, 
-    {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_13_1}, 
-     soft_purge, soft_purge, []}
+    {load_module, megaco_flex_scanner, soft_purge, soft_purge, []},
+    {load_module, megaco_sdp, soft_purge, soft_purge, []},
+    {load_module, megaco_filter, soft_purge, soft_purge, []},
+    {load_module, megaco_timer, soft_purge, soft_purge, [megaco_config_misc]},
+    {update, megaco_config, soft, soft_purge, soft_purge, 
+     [megaco_timer, megaco_config_misc]},
+    {add_module,  megaco_config_misc}
    ]
   }
  ],
  [
-  {"3.14", 
-   [
-    {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]},
-    {update,      megaco_monitor, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_config, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"3.13", 
-   [
-    {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]}, 
-    {load_module, megaco_filter, soft_purge, soft_purge, []}, 
-    {update,      megaco_monitor, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_config, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_13_1}, 
-     soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"3.12", 
-   [
-    {load_module, megaco_filter, soft_purge, soft_purge, []}, 
-    {load_module, megaco_udp, soft_purge, soft_purge, []},
-    {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]},
-    {update, megaco_config, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_monitor, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_13_1}, 
-     soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"3.11.3", 
+  {"3.15", 
    [
-    {load_module, megaco_filter, soft_purge, soft_purge, []}, 
-    {load_module, megaco_udp, soft_purge, soft_purge, []}, 
-    {load_module, megaco_messenger, soft_purge, soft_purge, 
-     [megaco_config, megaco_monitor]},
-    {update, megaco_monitor, soft, soft_purge, soft_purge, []}, 
-    {update, megaco_config, {advanced, downgrade_to_pre_3_12}, 
-     soft_purge, soft_purge, []}, 
-    {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_13_1}, 
-     soft_purge, soft_purge, []}
+    {load_module, megaco_flex_scanner, soft_purge, soft_purge, []},
+    {load_module, megaco_sdp, soft_purge, soft_purge, []},
+    {load_module, megaco_filter, soft_purge, soft_purge, []},
+    {load_module, megaco_timer, soft_purge, soft_purge, [megaco_config]},
+    {update, megaco_config, soft, soft_purge, soft_purge, []},
+    {remove, {megaco_config_misc, soft_purge, brutal_purge}}
    ]
   }
  ]
diff --git a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
index 842d6b70d1..967ee93935 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -134,6 +134,12 @@ encode_transaction(EC, {Tag, _} = Trans, AsnMod, TransMod, Type)
 encode_transaction(_EC, T, _AsnMod, _TransMod, _Type) ->
     {error, {no_megaco_transaction, T}}.
 
+-spec do_encode_transaction(EC :: list(), 
+			    Trans :: tuple(), 
+			    AnsMod :: atom(),
+			    TransMod :: atom(),
+			    Type :: atom()) ->
+    {'ok', binary()} | {'error', any()}.
 do_encode_transaction([native], _Trans, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
@@ -160,6 +166,12 @@ do_encode_transaction(EC, _Trans, _AsnMod, _TransMod, _Type) ->
 %% Convert a list of ActionRequest record's into a binary
 %% Return {ok, DeepIoList} | {error, Reason}
 %%----------------------------------------------------------------------
+-spec encode_action_requests(EC :: list(), 
+			     ARs :: list(), 
+			     AnsMod :: atom(),
+			     TransMod :: atom(),
+			     Type :: atom()) ->
+    {'ok', binary()} | {'error', any()}.
 encode_action_requests([native], _ARs, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
@@ -183,13 +195,20 @@ encode_action_requests(EC, _ARs, _AsnMod, _TransMod, _Type) ->
 %% Convert a ActionRequest record into a binary
 %% Return {ok, DeepIoList} | {error, Reason}
 %%----------------------------------------------------------------------
-encode_action_request([native], _ARs, _AsnMod, _TransMod, binary) ->
+
+-spec encode_action_request(EC :: list(), 
+			    AR :: tuple(), 
+			    AnsMod :: atom(),
+			    TransMod :: atom(),
+			    Type :: atom()) ->
+    {'ok', binary()} | {'error', any()}.
+encode_action_request([native], _AR, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
-encode_action_request(_EC, _ARs0, _AsnMod, _TransMod, binary) ->
+encode_action_request(_EC, _AR, _AsnMod, _TransMod, binary) ->
     {error, not_implemented};
-encode_action_request(EC, ARs, AsnMod, TransMod, io_list) ->
-    case encode_action_request(EC, ARs, AsnMod, TransMod, binary) of
+encode_action_request(EC, AR, AsnMod, TransMod, io_list) ->
+    case encode_action_request(EC, AR, AsnMod, TransMod, binary) of
 	{ok, Bin} when is_binary(Bin) ->
 	    {ok, Bin};
 	{ok, DeepIoList} ->
@@ -198,7 +217,7 @@ encode_action_request(EC, ARs, AsnMod, TransMod, io_list) ->
 	{error, Reason} ->
 	    {error, Reason} 
     end;
-encode_action_request(EC, _ARs, _AsnMod, _TransMod, _Type) ->
+encode_action_request(EC, _AR, _AsnMod, _TransMod, _Type) ->
     {error, {bad_encoding_config, EC}}.
 
 
diff --git a/lib/megaco/src/binary/megaco_binary_transformer_prev3a.erl b/lib/megaco/src/binary/megaco_binary_transformer_prev3a.erl
index 609947c933..ba4324f4f2 100644
--- a/lib/megaco/src/binary/megaco_binary_transformer_prev3a.erl
+++ b/lib/megaco/src/binary/megaco_binary_transformer_prev3a.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -1619,11 +1619,3 @@ verify_count(Count, Min, Max) ->
         true ->
             error({count_not_an_integer, Count})
     end.
-
-
-%% -------------------------------------------------------------------
-
-error(Reason) ->
-    erlang:error(Reason).
-
-
diff --git a/lib/megaco/src/binary/megaco_binary_transformer_prev3b.erl b/lib/megaco/src/binary/megaco_binary_transformer_prev3b.erl
index baca84bbfe..8e42353b9b 100644
--- a/lib/megaco/src/binary/megaco_binary_transformer_prev3b.erl
+++ b/lib/megaco/src/binary/megaco_binary_transformer_prev3b.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -1619,11 +1619,3 @@ verify_count(Count, Min, Max) ->
         true ->
             error({count_not_an_integer, Count})
     end.
-
-
-%% -------------------------------------------------------------------
-
-error(Reason) ->
-    erlang:error(Reason).
-
-
diff --git a/lib/megaco/src/binary/megaco_binary_transformer_prev3c.erl b/lib/megaco/src/binary/megaco_binary_transformer_prev3c.erl
index 8d2f9eea38..c26d1fa99d 100644
--- a/lib/megaco/src/binary/megaco_binary_transformer_prev3c.erl
+++ b/lib/megaco/src/binary/megaco_binary_transformer_prev3c.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -1746,11 +1746,3 @@ verify_count(Count, Min, Max) ->
         true ->
             error({count_not_an_integer, Count})
     end.
-
-
-%% -------------------------------------------------------------------
-
-error(Reason) ->
-    erlang:error(Reason).
-
-
diff --git a/lib/megaco/src/binary/megaco_binary_transformer_v3.erl b/lib/megaco/src/binary/megaco_binary_transformer_v3.erl
index cef49b03fd..1ff7c86e82 100644
--- a/lib/megaco/src/binary/megaco_binary_transformer_v3.erl
+++ b/lib/megaco/src/binary/megaco_binary_transformer_v3.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -1753,11 +1753,3 @@ verify_count(Count, Min, Max) ->
         true ->
             error({count_not_an_integer, Count})
     end.
-
-
-%% -------------------------------------------------------------------
-
-error(Reason) ->
-    erlang:error(Reason).
-
-
diff --git a/lib/megaco/src/engine/depend.mk b/lib/megaco/src/engine/depend.mk
index 8d8c83e923..935eb813e5 100644
--- a/lib/megaco/src/engine/depend.mk
+++ b/lib/megaco/src/engine/depend.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
+# Copyright Ericsson AB 2003-2011. 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
@@ -17,6 +17,8 @@
 # 
 # %CopyrightEnd%
 
+$(EBIN)/megaco_config_misc.$(EMULATOR): megaco_config_misc.erl
+
 $(EBIN)/megaco_config.$(EMULATOR): megaco_config.erl \
 	../../include/megaco.hrl \
 	../app/megaco_internal.hrl
diff --git a/lib/megaco/src/engine/megaco_config.erl b/lib/megaco/src/engine/megaco_config.erl
index 6805db790d..b65ddbe232 100644
--- a/lib/megaco/src/engine/megaco_config.erl
+++ b/lib/megaco/src/engine/megaco_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -46,10 +46,10 @@
 
 	 %% Verification functions
          verify_val/2,
-	 verify_strict_uint/1,
-	 verify_strict_int/1, verify_strict_int/2, 
-	 verify_uint/1,
-	 verify_int/1, verify_int/2,
+%% 	 verify_strict_uint/1,
+%% 	 verify_strict_int/1, verify_strict_int/2, 
+%% 	 verify_uint/1,
+%% 	 verify_int/1, verify_int/2,
          
 
 	 %% Reply limit counter
@@ -1501,28 +1501,37 @@ verify_val(Item, Val) ->
         mid                    -> true;
         local_mid              -> true;
         remote_mid             -> true;
-        min_trans_id           -> verify_strict_uint(Val, 4294967295); % uint32
-        max_trans_id           -> verify_uint(Val, 4294967295);        % uint32
+        min_trans_id           -> 
+	    megaco_config_misc:verify_strict_uint(Val, 4294967295); % uint32
+        max_trans_id           -> 
+	    megaco_config_misc:verify_uint(Val, 4294967295);        % uint32
         request_timer          -> verify_timer(Val);
         long_request_timer     -> verify_timer(Val);
 
-        auto_ack               -> verify_bool(Val);
+        auto_ack               -> 
+	    megaco_config_misc:verify_bool(Val);
 
-	trans_ack              -> verify_bool(Val);
-        trans_ack_maxcount     -> verify_uint(Val);
+	trans_ack              -> 
+	    megaco_config_misc:verify_bool(Val);
+        trans_ack_maxcount     -> 
+	    megaco_config_misc:verify_uint(Val);
 
-	trans_req              -> verify_bool(Val);
-        trans_req_maxcount     -> verify_uint(Val);
-        trans_req_maxsize      -> verify_uint(Val);
+	trans_req              -> 
+	    megaco_config_misc:verify_bool(Val);
+        trans_req_maxcount     -> 
+	    megaco_config_misc:verify_uint(Val);
+        trans_req_maxsize      -> 
+	    megaco_config_misc:verify_uint(Val);
 
-        trans_timer            -> verify_timer(Val) and (Val >= 0);
-	trans_sender when Val == undefined -> true;
+        trans_timer            -> 
+	    verify_timer(Val) and (Val >= 0);
+	trans_sender when Val =:= undefined -> true;
 
         pending_timer                      -> verify_timer(Val);
-        sent_pending_limit                 -> verify_uint(Val) andalso 
-								 (Val > 0);
-        recv_pending_limit                 -> verify_uint(Val) andalso 
-								 (Val > 0);
+        sent_pending_limit                 -> 
+	    megaco_config_misc:verify_uint(Val) andalso (Val > 0);
+        recv_pending_limit                 -> 
+	    megaco_config_misc:verify_uint(Val) andalso (Val > 0);
         reply_timer                        -> verify_timer(Val);
         control_pid      when is_pid(Val)  -> true;
         monitor_ref                        -> true; % Internal usage only
@@ -1530,110 +1539,43 @@ verify_val(Item, Val) ->
         send_handle                        -> true;
         encoding_mod     when is_atom(Val) -> true;
         encoding_config  when is_list(Val) -> true;
-        protocol_version                   -> verify_strict_uint(Val);
+        protocol_version                   -> 
+	    megaco_config_misc:verify_strict_uint(Val);
         auth_data                          -> true;
         user_mod         when is_atom(Val) -> true;
         user_args        when is_list(Val) -> true;
         reply_data                         -> true;
-        threaded                           -> verify_bool(Val);
-        strict_version                     -> verify_bool(Val);
-	long_request_resend                -> verify_bool(Val);
-	call_proxy_gc_timeout              -> verify_strict_uint(Val);
-	cancel                             -> verify_bool(Val);
+        threaded                           -> 
+	    megaco_config_misc:verify_bool(Val);
+        strict_version                     -> 
+	    megaco_config_misc:verify_bool(Val);
+	long_request_resend                -> 
+	    megaco_config_misc:verify_bool(Val);
+	call_proxy_gc_timeout              -> 
+	    megaco_config_misc:verify_strict_uint(Val);
+	cancel                             -> 
+	    megaco_config_misc:verify_bool(Val);
 	resend_indication                  -> verify_resend_indication(Val);
 
-	segment_reply_ind               -> verify_bool(Val);
-	segment_recv_acc                -> verify_bool(Val);
+	segment_reply_ind               -> 
+	    megaco_config_misc:verify_bool(Val);
+	segment_recv_acc                -> 
+	    megaco_config_misc:verify_bool(Val);
 	segment_recv_timer              -> verify_timer(Val);
 	segment_send                    -> verify_segmentation_window(Val);
 	segment_send_timer              -> verify_timer(Val);
-	max_pdu_size                    -> verify_int(Val) andalso (Val > 0);
+	max_pdu_size                    -> 
+	    megaco_config_misc:verify_int(Val) andalso (Val > 0);
 	request_keep_alive_timeout      -> 
-	    (verify_uint(Val) orelse (Val =:= plain));
+	    (megaco_config_misc:verify_uint(Val) orelse (Val =:= plain));
 
         _                               -> false
     end.
 
 
 
-verify_bool(true)  -> true;
-verify_bool(false) -> true;
-verify_bool(_)     -> false.
-
 verify_resend_indication(flag) -> true;
-verify_resend_indication(Val)  -> verify_bool(Val).
-
--spec verify_strict_int(Int :: integer()) -> boolean().
-verify_strict_int(Int) when is_integer(Int) -> true;
-verify_strict_int(_)                        -> false.
-
--spec verify_strict_int(Int :: integer(), 
-			Max :: integer() | 'infinity') -> boolean().
-verify_strict_int(Int, infinity) ->
-    verify_strict_int(Int);
-verify_strict_int(Int, Max) ->
-    verify_strict_int(Int) andalso verify_strict_int(Max) andalso (Int =< Max).
-
--spec verify_strict_uint(Int :: non_neg_integer()) -> boolean().
-verify_strict_uint(Int) when is_integer(Int) andalso (Int >= 0) -> true;
-verify_strict_uint(_)                                           -> false.
-
--spec verify_strict_uint(Int :: non_neg_integer(), 
-			 Max :: non_neg_integer() | 'infinity') -> boolean().
-verify_strict_uint(Int, infinity) ->
-    verify_strict_uint(Int);
-verify_strict_uint(Int, Max) ->
-    verify_strict_int(Int, 0, Max).
-
--spec verify_uint(Val :: non_neg_integer() | 'infinity') -> boolean().
-verify_uint(infinity) -> true;
-verify_uint(Val)      -> verify_strict_uint(Val).
-
--spec verify_int(Val :: integer() | 'infinity') -> boolean().
-verify_int(infinity) -> true;
-verify_int(Val)      -> verify_strict_int(Val).
-
--spec verify_int(Int :: integer() | 'infinity', 
-		 Max :: integer() | 'infinity') -> boolean().
-verify_int(Int, infinity) ->
-    verify_int(Int);
-verify_int(infinity, _Max) ->
-    true;
-verify_int(Int, Max) ->
-    verify_strict_int(Int) andalso verify_strict_int(Max) andalso (Int =< Max).
-
--spec verify_uint(Int :: non_neg_integer() | 'infinity', 
-		  Max :: non_neg_integer() | 'infinity') -> boolean().
-verify_uint(Int, infinity) ->
-    verify_uint(Int);
-verify_uint(infinity, _Max) ->
-    true;
-verify_uint(Int, Max) ->
-    verify_strict_int(Int, 0, Max).
-
--spec verify_strict_int(Int :: integer(), 
-			Min :: integer(), 
-			Max :: integer()) -> boolean().
-verify_strict_int(Val, Min, Max) 
-  when (is_integer(Val) andalso 
-	is_integer(Min) andalso 
-	is_integer(Max) andalso 
-	(Val >= Min)    andalso 
-	(Val =< Max)) ->
-    true;
-verify_strict_int(_Val, _Min, _Max) ->
-    false.
-    
--spec verify_int(Val :: integer() | 'infinity', 
-		 Min :: integer(), 
-		 Max :: integer() | 'infinity') -> boolean(). 
-verify_int(infinity, Min, infinity) ->
-    verify_strict_int(Min);
-verify_int(Val, Min, infinity) ->
-    verify_strict_int(Val) andalso 
-	verify_strict_int(Min) andalso (Val >= Min);
-verify_int(Int, Min, Max) ->
-    verify_strict_int(Int, Min, Max).
+verify_resend_indication(Val)  -> megaco_config_misc:verify_bool(Val).
 
 verify_timer(Timer) ->
     megaco_timer:verify(Timer).
@@ -1641,7 +1583,7 @@ verify_timer(Timer) ->
 verify_segmentation_window(none) ->
     true;
 verify_segmentation_window(K) ->
-    verify_int(K, 1, infinity).
+    megaco_config_misc:verify_int(K, 1, infinity).
 
 handle_stop_user(UserMid) ->
     case catch user_info(UserMid, mid) of
diff --git a/lib/megaco/src/engine/megaco_config_misc.erl b/lib/megaco/src/engine/megaco_config_misc.erl
new file mode 100644
index 0000000000..0a1601c766
--- /dev/null
+++ b/lib/megaco/src/engine/megaco_config_misc.erl
@@ -0,0 +1,113 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2011. 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%
+%%
+
+%%
+%%----------------------------------------------------------------------
+%% Purpose: Utility module for megaco_config 
+%%----------------------------------------------------------------------
+%% 
+
+-module(megaco_config_misc).
+
+%% Application internal exports
+-export([
+         verify_bool/1, 
+
+	 verify_int/1, verify_int/2, verify_int/3, 
+	 verify_strict_int/1, verify_strict_int/2, verify_strict_int/3, 
+
+	 verify_uint/1, verify_uint/2, 
+	 verify_strict_uint/1, verify_strict_uint/2
+        ]).
+
+
+%%%----------------------------------------------------------------------
+%%% API
+%%%----------------------------------------------------------------------
+
+verify_bool(true)  -> true;
+verify_bool(false) -> true;
+verify_bool(_)     -> false.
+
+
+%% verify_int(Val) -> boolean()
+verify_int(infinity) -> true;
+verify_int(Val)      -> verify_strict_int(Val).
+
+%% verify_int(Val, Max) -> boolean()
+verify_int(Int, infinity) ->
+    verify_int(Int);
+verify_int(infinity, _Max) ->
+    true;
+verify_int(Int, Max) ->
+    verify_strict_int(Int) andalso verify_strict_int(Max) andalso (Int =< Max).
+
+%% verify_int(Val, Min, Max) -> boolean()
+verify_int(infinity, Min, infinity) ->
+    verify_strict_int(Min);
+verify_int(Val, Min, infinity) ->
+    verify_strict_int(Val) andalso 
+	verify_strict_int(Min) andalso (Val >= Min);
+verify_int(Int, Min, Max) ->
+    verify_strict_int(Int, Min, Max).
+
+%% verify_strict_int(Val) -> boolean()
+verify_strict_int(Int) when is_integer(Int) -> true;
+verify_strict_int(_)                        -> false.
+
+%% verify_strict_int(Val, Max) -> boolean()
+verify_strict_int(Int, infinity) ->
+    verify_strict_int(Int);
+verify_strict_int(Int, Max) ->
+    verify_strict_int(Int) andalso verify_strict_int(Max) andalso (Int =< Max).
+
+%% verify_strict_int(Val, Min, Max) -> boolean()
+verify_strict_int(Val, Min, Max) 
+  when (is_integer(Val) andalso 
+	is_integer(Min) andalso 
+	is_integer(Max) andalso 
+	(Val >= Min)    andalso 
+	(Val =< Max)) ->
+    true;
+verify_strict_int(_Val, _Min, _Max) ->
+    false.
+    
+
+%% verify_uint(Val) -> boolean()
+verify_uint(infinity) -> true;
+verify_uint(Val)      -> verify_strict_uint(Val).
+
+%% verify_uint(Val, Max) -> boolean()
+verify_uint(Int, infinity) ->
+    verify_uint(Int);
+verify_uint(infinity, _Max) ->
+    true;
+verify_uint(Int, Max) ->
+    verify_strict_int(Int, 0, Max).
+
+%% verify_strict_uint(Val) -> boolean()
+verify_strict_uint(Int) when is_integer(Int) andalso (Int >= 0) -> true;
+verify_strict_uint(_)                                           -> false.
+
+%% verify_strict_uint(Val, Max) -> boolean()
+verify_strict_uint(Int, infinity) ->
+    verify_strict_uint(Int);
+verify_strict_uint(Int, Max) ->
+    verify_strict_int(Int, 0, Max).
+
diff --git a/lib/megaco/src/engine/megaco_filter.erl b/lib/megaco/src/engine/megaco_filter.erl
index 9df752789c..fb0c700a82 100644
--- a/lib/megaco/src/engine/megaco_filter.erl
+++ b/lib/megaco/src/engine/megaco_filter.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -21,6 +21,7 @@
 %%----------------------------------------------------------------------
 %% Purpose : Megaco/H.248 customization of the Event Tracer tool
 %%----------------------------------------------------------------------
+%%
 
 -module(megaco_filter).
 
@@ -33,6 +34,7 @@
 -include_lib("megaco/src/app/megaco_internal.hrl").
 -include_lib("et/include/et.hrl").
 
+
 %%----------------------------------------------------------------------
 %% BUGBUG: There are some opportunities for improvements:
 %%
@@ -43,7 +45,8 @@
 %%   records that already are defined in megaco_message_{v1,v2,v3}.hrl.
 %% * The records megaco_udp and megaco_tcp are copied from the files
 %%   megaco_udp.hrl and megaco_tcp.hrl respectively, as we cannot include
-%%   both header files. They both defines the macros HEAP_SIZE and GC_MSG_LIMIT.
+%%   both header files. 
+%%   They both defines the macros HEAP_SIZE and GC_MSG_LIMIT.
 
 %%-include("megaco_message_internal.hrl").
 -record('megaco_transaction_reply',
@@ -76,6 +79,8 @@
 	 module    = megaco,
 	 serialize = false  % false: Spawn a new process for each message
 	}).
+
+
 %%----------------------------------------------------------------------
 
 start() ->
@@ -360,28 +365,24 @@ pretty(_ConnData, MegaMsg) when is_record(MegaMsg, 'MegacoMessage') ->
     {ok, Bin} = megaco_pretty_text_encoder:encode_message([], MegaMsg),
     term_to_string(Bin);
 pretty(_ConnData, CmdReq) when is_record(CmdReq, 'CommandRequest') ->
-    {ok, IoList} = megaco_pretty_text_encoder:encode_command_request(CmdReq),
-    term_to_string(lists:flatten(IoList));
+    {ok, Bin} = megaco_pretty_text_encoder:encode_command_request(CmdReq),
+    term_to_string(Bin);
 pretty(_ConnData, {complete_success, ContextId, RepList}) ->
     ActRep = #'ActionReply'{contextId    = ContextId, 
 			    commandReply = RepList},
-    {ok, IoList} = megaco_pretty_text_encoder:encode_action_reply(ActRep),
-    term_to_string(lists:flatten(IoList));
+    {ok, Bin} = megaco_pretty_text_encoder:encode_action_reply(ActRep),
+    term_to_string(Bin);
 pretty(_ConnData, AR) when is_record(AR, 'ActionReply') ->
-    {ok, IoList} = megaco_pretty_text_encoder:encode_action_reply(AR),
-    term_to_string(lists:flatten(IoList));
+    {ok, Bin} = megaco_pretty_text_encoder:encode_action_reply(AR),
+    term_to_string(Bin);
 pretty(_ConnData, {partial_failure, ContextId, RepList}) ->
     ActRep = #'ActionReply'{contextId    = ContextId, 
 			    commandReply = RepList},
-    {ok, IoList} = megaco_pretty_text_encoder:encode_action_reply(ActRep),
-    term_to_string(lists:flatten(IoList));
+    {ok, Bin} = megaco_pretty_text_encoder:encode_action_reply(ActRep),
+    term_to_string(Bin);
 pretty(_ConnData, {trans, Trans}) ->
-    case megaco_pretty_text_encoder:encode_transaction(Trans) of
-	{ok, Bin} when is_binary(Bin) ->
-	    term_to_string(binary_to_list(Bin));
-	{ok, IoList} ->
-	    term_to_string(lists:flatten(IoList))
-    end;
+    {ok, Bin} = megaco_pretty_text_encoder:encode_transaction(Trans),
+    term_to_string(Bin);
 pretty(__ConnData, Other) ->
     term_to_string(Other).
 
diff --git a/lib/megaco/src/engine/megaco_sdp.erl b/lib/megaco/src/engine/megaco_sdp.erl
index 90911fe24a..96732584fb 100644
--- a/lib/megaco/src/engine/megaco_sdp.erl
+++ b/lib/megaco/src/engine/megaco_sdp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -38,6 +38,8 @@
 %% External exports
 %%----------------------------------------------------------------------
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([
 	 decode/1, encode/1, 
 	 get_sdp_record_from_PropertyGroup/2
@@ -875,9 +877,7 @@ decode_bandwidth_bwt("CT") ->
 decode_bandwidth_bwt("AS") ->
     as;
 decode_bandwidth_bwt(BwType) when is_list(BwType) ->
-    BwType;
-decode_bandwidth_bwt(BadBwType) ->
-    error({invalid_bandwidth_bwtype, BadBwType}).
+    BwType.
 
 encode_bandwidth_bwt(ct) ->
     "CT";
diff --git a/lib/megaco/src/engine/megaco_timer.erl b/lib/megaco/src/engine/megaco_timer.erl
index 9f524523a8..1336be0b5b 100644
--- a/lib/megaco/src/engine/megaco_timer.erl
+++ b/lib/megaco/src/engine/megaco_timer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -42,7 +42,7 @@
 %% NewTimer    = megaco_timer() 
 %% TimeoutTime = infinity | integer()
 %% 
-init(SingleWaitFor) when SingleWaitFor == infinity ->
+init(SingleWaitFor) when SingleWaitFor =:= infinity ->
     {SingleWaitFor, timeout};
 init(SingleWaitFor) when is_integer(SingleWaitFor) and (SingleWaitFor >= 0) ->
     {SingleWaitFor, timeout};
@@ -76,17 +76,17 @@ verify(#megaco_incr_timer{wait_for    = WaitFor,
 			  factor      = Factor,
 			  incr        = Incr,
 			  max_retries = MaxRetries}) ->
-    (megaco_config:verify_strict_uint(WaitFor) and
-     megaco_config:verify_strict_uint(Factor)  and
-     megaco_config:verify_strict_int(Incr)     and
+    (megaco_config_misc:verify_strict_uint(WaitFor) and
+     megaco_config_misc:verify_strict_uint(Factor)  and
+     megaco_config_misc:verify_strict_int(Incr)     and
      verify_max_retries(MaxRetries));
 verify(Timer) ->
-    megaco_config:verify_uint(Timer).
+    megaco_config_misc:verify_uint(Timer).
 
 verify_max_retries(infinity_restartable) ->
     true;
 verify_max_retries(Val) ->
-    megaco_config:verify_uint(Val).
+    megaco_config_misc:verify_uint(Val).
 
 
 %%-----------------------------------------------------------------
diff --git a/lib/megaco/src/engine/modules.mk b/lib/megaco/src/engine/modules.mk
index 44bcadc37b..4bc57cd63e 100644
--- a/lib/megaco/src/engine/modules.mk
+++ b/lib/megaco/src/engine/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2011. 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
@@ -24,6 +24,7 @@ BEHAVIOUR_MODULES = \
 
 MODULES = \
 	$(BEHAVIOUR_MODULES) \
+	megaco_config_misc \
 	megaco_config \
 	megaco_digit_map \
 	megaco_erl_dist_encoder \
diff --git a/lib/megaco/src/flex/megaco_flex_scanner.erl b/lib/megaco/src/flex/megaco_flex_scanner.erl
index e471412c13..508f8905e7 100644
--- a/lib/megaco/src/flex/megaco_flex_scanner.erl
+++ b/lib/megaco/src/flex/megaco_flex_scanner.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. 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
@@ -30,21 +30,11 @@
 -define(SCHED_ID(),            erlang:system_info(scheduler_id)).
 -define(SMP_SUPPORT_DEFAULT(), erlang:system_info(smp_support)).
 
-is_enabled() ->
-    case ?ENABLE_MEGACO_FLEX_SCANNER of
-	true ->
-	    true;
-	_ ->
-	    false
-    end.
+is_enabled() -> 
+    (true =:= ?ENABLE_MEGACO_FLEX_SCANNER).
     
 is_reentrant_enabled() ->
-    case ?MEGACO_REENTRANT_FLEX_SCANNER of
-	true ->
-	    true;
-	_ ->
-	    false
-    end.
+    (true =:= ?MEGACO_REENTRANT_FLEX_SCANNER).
 
 is_scanner_port(Port, Port) when is_port(Port) ->
     true;
diff --git a/lib/megaco/src/text/megaco_text_gen_prev3a.hrl b/lib/megaco/src/text/megaco_text_gen_prev3a.hrl
index b1ddb10a4e..81916cb9ec 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -2924,10 +2924,6 @@ verify_count(Count, Min, Max) ->
     end.
 
 
-%% -------------------------------------------------------------------
-
-error(Reason) ->
-    erlang:error(Reason).
 
 
 %% -------------------------------------------------------------------
diff --git a/lib/megaco/src/text/megaco_text_gen_prev3b.hrl b/lib/megaco/src/text/megaco_text_gen_prev3b.hrl
index 8a4af877dc..83d25c83c9 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -2945,10 +2945,6 @@ verify_count(Count, Min, Max) ->
     end.
 
 
-%% -------------------------------------------------------------------
-
-error(Reason) ->
-    erlang:error(Reason).
 
 
 %% -------------------------------------------------------------------
diff --git a/lib/megaco/src/text/megaco_text_gen_prev3c.hrl b/lib/megaco/src/text/megaco_text_gen_prev3c.hrl
index 11db906846..458809ca75 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -3421,10 +3421,6 @@ verify_count(Count, Min, Max) ->
     end.
 
 
-%% -------------------------------------------------------------------
-
-error(Reason) ->
-    erlang:error(Reason).
 
 
 %% -------------------------------------------------------------------
diff --git a/lib/megaco/src/text/megaco_text_gen_v1.hrl b/lib/megaco/src/text/megaco_text_gen_v1.hrl
index b150c9ba58..0726d68941 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -2386,10 +2386,6 @@ verify_count(Count, Min, Max) ->
     end.
 
 
-%% -------------------------------------------------------------------
-
-error(Reason) ->
-    erlang:error(Reason).
 
 % d(F) ->
 %     d(F, []).
diff --git a/lib/megaco/src/text/megaco_text_gen_v2.hrl b/lib/megaco/src/text/megaco_text_gen_v2.hrl
index 6cfcac8664..8e12efe65a 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -2772,10 +2772,6 @@ verify_count(Count, Min, Max) ->
     end.
 
 
-%% -------------------------------------------------------------------
-
-error(Reason) ->
-    erlang:error(Reason).
 
 
 %% -------------------------------------------------------------------
diff --git a/lib/megaco/src/text/megaco_text_gen_v3.hrl b/lib/megaco/src/text/megaco_text_gen_v3.hrl
index 1c19a4aa8b..ce2e5e508d 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -3436,10 +3436,6 @@ verify_count(Count, Min, Max) ->
     end.
 
 
-%% -------------------------------------------------------------------
-
-error(Reason) ->
-    erlang:error(Reason).
 
 
 %% -------------------------------------------------------------------
diff --git a/lib/megaco/test/megaco.cover b/lib/megaco/test/megaco.cover
index e7764017d4..be21216c24 100644
--- a/lib/megaco/test/megaco.cover
+++ b/lib/megaco/test/megaco.cover
@@ -1,5 +1,7 @@
+{incl_app,megaco,details}.
+
 %% -*- erlang -*-
-{exclude,
+{excl_mods, megaco,
  [megaco_encoder,
   megaco_edist_compress,
   megaco_filter,
diff --git a/lib/megaco/test/megaco.spec b/lib/megaco/test/megaco.spec
index 7493bd5df8..cab8499835 100644
--- a/lib/megaco/test/megaco.spec
+++ b/lib/megaco/test/megaco.spec
@@ -1,5 +1,2 @@
-{topcase, {dir, "../megaco_test"}}.
-{require_nodenames, 1}.
-%{skip, {megaco_digit_map_test, all, "Not yet implemented"}}.
-{skip, {megaco_measure_test, all, "Not yet implemented"}}.
-%{skip, {M, F, "Not yet implemented"}}.
+{suites,"../megaco_test",all}.
+{skip_cases,"../megaco_test",megaco_measure_test,[all],"Not yet implemented"}.
diff --git a/lib/megaco/test/megaco_SUITE.erl b/lib/megaco/test/megaco_SUITE.erl
index 1bb3a570a4..007677ba4d 100644
--- a/lib/megaco/test/megaco_SUITE.erl
+++ b/lib/megaco/test/megaco_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. 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
@@ -36,8 +36,8 @@ t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 init_per_testcase(Case, Config) ->
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 init() ->
     process_flag(trap_exit, true),
@@ -46,97 +46,86 @@ init() ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     app_test,
-     appup_test,
-     config,
-     flex,
-     udp,
-     tcp,
-     examples,
-     %% call_flow,
-     digit_map,
-     mess,
-     measure,
-     binary_term_id,
-     codec,
-     sdp,
-     mib,
-     trans,
-     actions,
-     load,
-     pending_limit,
-     segmented,
-     timer
-    ].
+suite() -> [{ct_hooks, [{ts_install_cth, [{nodenames,1}]}]}].
+
+all() -> 
+    [{group, app_test}, 
+     {group, appup_test},
+     {group, config}, 
+     {group, flex}, 
+     {group, udp},
+     {group, tcp}, 
+     {group, examples}, 
+     {group, digit_map},
+     {group, mess}, 
+     {group, measure},
+     {group, binary_term_id}, 
+     {group, codec}, 
+     {group, sdp},
+     {group, mib}, 
+     {group, trans}, 
+     {group, actions},
+     {group, load}, 
+     {group, pending_limit},
+     {group, segmented}, 
+     {group, timer}].
+
+groups() -> 
+    [{tickets,        [], [{group, mess}, {group, codec}]},
+     {app_test,       [], [{megaco_app_test,            all}]},
+     {appup_test,     [], [{megaco_appup_test,          all}]},
+     {config,         [], [{megaco_config_test,         all}]},
+     {call_flow,      [], [{megaco_call_flow_test,      all}]},
+     {digit_map,      [], [{megaco_digit_map_test,      all}]},
+     {mess,           [], [{megaco_mess_test,           all}]},
+     {udp,            [], [{megaco_udp_test,            all}]},
+     {tcp,            [], [{megaco_tcp_test,            all}]},
+     {examples,       [], [{megaco_examples_test,       all}]},
+     {measure,        [], [{megaco_measure_test,        all}]},
+     {binary_term_id, [], [{megaco_binary_term_id_test, all}]},
+     {codec,          [], [{megaco_codec_test,          all}]},
+     {sdp,            [], [{megaco_sdp_test,            all}]},
+     {mib,            [], [{megaco_mib_test,            all}]},
+     {trans,          [], [{megaco_trans_test,          all}]},
+     {actions,        [], [{megaco_actions_test,        all}]},
+     {load,           [], [{megaco_load_test,           all}]},
+     {pending_limit,  [], [{megaco_pending_limit_test,  all}]},
+     {segmented,      [], [{megaco_segment_test,        all}]},
+     {timer,          [], [{megaco_timer_test,          all}]},
+     {flex,           [], [{megaco_flex_test,           all}]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-tickets(suite) ->
-    [
-     mess,
-     codec
-     ].
 
-app_test(suite) ->
-    [{megaco_app_test, all}].
 
-appup_test(suite) ->
-    [{megaco_appup_test, all}].
 
-config(suite) ->
-    [{megaco_config_test, all}].
 
-call_flow(suite) ->
-    [{megaco_call_flow_test, all}].
 
-digit_map(suite) ->
-    [{megaco_digit_map_test, all}].
 
-mess(suite) ->
-    [{megaco_mess_test, all}].
 
-udp(suite) ->
-    [{megaco_udp_test, all}].
 
-tcp(suite) ->
-    [{megaco_tcp_test, all}].
 
-examples(suite) ->
-    [{megaco_examples_test, all}].
 
-measure(suite) ->
-    [{megaco_measure_test, all}].
 
-binary_term_id(suite) ->
-    [{megaco_binary_term_id_test, all}].
 
-codec(suite) ->
-    [{megaco_codec_test, all}].
 
-sdp(suite) ->
-    [{megaco_sdp_test, all}].
 
-mib(suite) ->
-    [{megaco_mib_test, all}].
 
-trans(suite) ->
-    [{megaco_trans_test, all}].
 
-actions(suite) ->
-    [{megaco_actions_test, all}].
 
-load(suite) ->
-    [{megaco_load_test, all}].
 
-pending_limit(suite) ->
-    [{megaco_pending_limit_test, all}].
 
-segmented(suite) ->
-    [{megaco_segment_test, all}].
 
-timer(suite) ->
-    [{megaco_timer_test, all}].
 
-flex(suite) ->
-    [{megaco_flex_test, all}].
 
diff --git a/lib/megaco/test/megaco_actions_test.erl b/lib/megaco/test/megaco_actions_test.erl
index d493022ca1..2efb6e834a 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -72,28 +72,25 @@ init_per_testcase(Case, Config) ->
     process_flag(trap_exit, true),
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     process_flag(trap_exit, false),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 pretty_text,
-	 flex_pretty_text,
-	 compact_text,
-	 flex_compact_text,
-	 erl_dist,
-	 erl_dist_mc,
-	 ber_bin,
-	 ber_bin_drv,
-	 ber_bin_native,
-	 ber_bin_drv_native
-	],
-    Cases.
+all() -> 
+    [pretty_text, flex_pretty_text, compact_text,
+     flex_compact_text, erl_dist, erl_dist_mc, ber_bin,
+     ber_bin_drv, ber_bin_native, ber_bin_drv_native].
 
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/megaco/test/megaco_app_test.erl b/lib/megaco/test/megaco_app_test.erl
index 597ec26338..00f7b7fb68 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-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. 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
@@ -39,28 +39,36 @@ init_per_testcase(undef_funcs = Case, Config) ->
 init_per_testcase(Case, Config) ->
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 fields,
-	 modules,
-	 exportall,
-	 app_depend,
-         undef_funcs
-	],
-    {req, [], {conf, app_init, Cases, app_fin}}.
+all() -> 
+    [
+     fields, 
+     modules, 
+     exportall, 
+     app_depend,
+     undef_funcs
+    ].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-app_init(suite) -> [];
-app_init(doc) -> [];
-app_init(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
     case is_app(megaco) of
 	{ok, AppFile} ->
 	    io:format("AppFile: ~n~p~n", [AppFile]),
@@ -96,9 +104,9 @@ is_app(App) ->
     end.
 
 
-app_fin(suite) -> [];
-app_fin(doc) -> [];
-app_fin(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
@@ -110,7 +118,7 @@ fields(doc) ->
     [];
 fields(Config) when is_list(Config) ->
     AppFile = key1search(app_file, Config),
-    Fields = [vsn, description, modules, registered, applications],
+    Fields  = [vsn, description, modules, registered, applications],
     case check_fields(Fields, AppFile, []) of
 	[] ->
 	    ok;
diff --git a/lib/megaco/test/megaco_appup_mg.erl b/lib/megaco/test/megaco_appup_mg.erl
index f6060e406b..bb8b098f5d 100644
--- a/lib/megaco/test/megaco_appup_mg.erl
+++ b/lib/megaco/test/megaco_appup_mg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
diff --git a/lib/megaco/test/megaco_appup_mgc.erl b/lib/megaco/test/megaco_appup_mgc.erl
index b6e53655f8..49c5f24852 100644
--- a/lib/megaco/test/megaco_appup_mgc.erl
+++ b/lib/megaco/test/megaco_appup_mgc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
diff --git a/lib/megaco/test/megaco_appup_test.erl b/lib/megaco/test/megaco_appup_test.erl
index 09732c6a4d..40eebcae86 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. 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
@@ -24,6 +24,7 @@
 -module(megaco_appup_test).
 
 -compile(export_all).
+-compile({no_auto_import,[error/1]}).
 
 -include("megaco_test_lib.hrl").
 
@@ -37,25 +38,31 @@ t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 init_per_testcase(Case, Config) ->
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 appup
-	],
-    {req, [], {conf, appup_init, Cases, appup_fin}}.
+all() -> 
+    [appup].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-appup_init(suite) -> [];
-appup_init(doc) -> [];
-appup_init(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
     AppFile   = file_name(?APPLICATION, ".app"),
     AppupFile = file_name(?APPLICATION, ".appup"),
     [{app_file, AppFile}, {appup_file, AppupFile}|Config].
@@ -66,9 +73,9 @@ file_name(App, Ext) ->
     filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
 
 
-appup_fin(suite) -> [];
-appup_fin(doc) -> [];
-appup_fin(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
diff --git a/lib/megaco/test/megaco_binary_term_id_test.erl b/lib/megaco/test/megaco_binary_term_id_test.erl
index da4e69c617..47a7a76c1c 100644
--- a/lib/megaco/test/megaco_binary_term_id_test.erl
+++ b/lib/megaco/test/megaco_binary_term_id_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -37,8 +37,8 @@
 -export([t/0]).
 
 %% Test suite exports
--export([all/1, encode_first/1, decode_first/1,
-	init_per_testcase/2, fin_per_testcase/2]).  
+-export([all/0,groups/0,init_per_group/2,end_per_group/2,
+	init_per_testcase/2, end_per_testcase/2]).  
 
 
 %%----------------------------------------------------------------------
@@ -57,25 +57,25 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     encode_first,
-     decode_first
-    ].
+all() -> 
+    [{group, encode_first}, {group, decode_first}].
 
-encode_first(suite) ->
-    encode_first_cases().
+groups() -> 
+    [{encode_first, [], encode_first_cases()},
+     {decode_first, [], decode_first_cases()}].
 
-decode_first(suite) ->
-    decode_first_cases().
+init_per_group(_GroupName, Config) ->
+    Config.
 
+end_per_group(_GroupName, Config) ->
+    Config.
 
 %% Test server callbacks
 init_per_testcase(Case, Config) ->
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%======================================================================
@@ -89,11 +89,12 @@ t() ->
 
 cases() -> encode_first_cases() ++ decode_first_cases().
 
-encode_first_cases() -> [te01,te02,te03,te04,te05,
-			 te06,te07,te08,te09,te10,
-			 te11,te12,te13,te14,te15,
-			 te16,te17,te18,te19].
-decode_first_cases() -> [td01,td02,td03,td04,td05,td06].
+encode_first_cases() -> 
+[te01, te02, te03, te04, te05, te06, te07, te08, te09,
+ te10, te11, te12, te13, te14, te15, te16, te17, te18,
+ te19].
+decode_first_cases() -> 
+[td01, td02, td03, td04, td05, td06].
 
 do(Case) ->
     case doc(Case) of
diff --git a/lib/megaco/test/megaco_call_flow_test.erl b/lib/megaco/test/megaco_call_flow_test.erl
index a25a7924e8..b9d64ca8b2 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -50,37 +50,25 @@ t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 init_per_testcase(Case, Config) ->
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     text,
-     binary
-    ].
+all() -> 
+    [{group, text}, {group, binary}].
 
-text(suite) ->
-    [
-     pretty,
-     compact
-    ].
+groups() -> 
+    [{text, [], [pretty, compact]},
+     {flex, [], [pretty_flex, compact_flex]},
+     {binary, [], [bin, ber, ber_bin, per]}].
 
-flex(suite) ->
-    [
-     pretty_flex,
-     compact_flex
-    ].
+init_per_group(_GroupName, Config) ->
+    Config.
 
-binary(suite) ->
-    [
-     bin,
-     ber,
-     ber_bin,
-     per
-    ].
+end_per_group(_GroupName, Config) ->
+    Config.
 
 pretty(suite) ->
     [];
diff --git a/lib/megaco/test/megaco_codec_flex_lib.erl b/lib/megaco/test/megaco_codec_flex_lib.erl
index de76956711..93bc5d4bbc 100644
--- a/lib/megaco/test/megaco_codec_flex_lib.erl
+++ b/lib/megaco/test/megaco_codec_flex_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
diff --git a/lib/megaco/test/megaco_codec_mini_test.erl b/lib/megaco/test/megaco_codec_mini_test.erl
index e509739bb1..ff0c154c7c 100644
--- a/lib/megaco/test/megaco_codec_mini_test.erl
+++ b/lib/megaco/test/megaco_codec_mini_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -34,14 +34,14 @@
 
 -export([t/0, t/1]).
 
--export([all/1, 
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, 
 
 	 tickets/0, 
-	 tickets/1, 
+	 
 	 otp7672_msg01/1,
  	 otp7672_msg02/1,
  
-	 init_per_testcase/2, fin_per_testcase/2]).  
+	 init_per_testcase/2, end_per_testcase/2]).  
 
 
 %% ----
@@ -49,31 +49,6 @@
 -define(SET_DBG(S,D), begin put(severity, S), put(dbg, D) end).
 -define(RESET_DBG(),  begin erase(severity),  erase(dbg)  end).
 
-
-%% ----
-
-tickets() ->
-    Flag  = process_flag(trap_exit, true),    
-    Cases = expand(tickets),
-    Fun   = fun(Case) ->
-		    C = init_per_testcase(Case, [{tc_timeout, 
-						  timer:minutes(10)}]),
-		    io:format("Eval ~w~n", [Case]),
-		    Result = 
-			case (catch apply(?MODULE, Case, [C])) of
-			    {'EXIT', Reason} ->
- 				io:format("~n~p exited:~n   ~p~n", 
- 					  [Case, Reason]),
-				{error, {Case, Reason}};
-			    Res ->
-				Res
-			end,
-		    fin_per_testcase(Case, C),
-		    Result
-	    end,
-    process_flag(trap_exit, Flag),
-    lists:map(Fun, Cases).
-
 expand(RootCase) ->
     expand([RootCase], []).
 
@@ -106,24 +81,51 @@ init_per_testcase(Case, Config) ->
 	end,
     megaco_test_lib:init_per_testcase(Case, C).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     erase(verbosity),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     tickets
-    ].
+all() -> 
+    [{group, tickets}].
+
+groups() -> 
+    [{tickets, [], [otp7672_msg01, otp7672_msg02]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
 
-tickets(suite) ->
-    [
-     otp7672_msg01, 
-     otp7672_msg02
-    ].
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+%% ----
+
+tickets() ->
+    Flag  = process_flag(trap_exit, true),    
+    Cases = expand(tickets),
+    Fun   = fun(Case) ->
+		    C = init_per_testcase(Case, [{tc_timeout, 
+						  timer:minutes(10)}]),
+		    io:format("Eval ~w~n", [Case]),
+		    Result = 
+			case (catch apply(?MODULE, Case, [C])) of
+			    {'EXIT', Reason} ->
+ 				io:format("~n~p exited:~n   ~p~n", 
+ 					  [Case, Reason]),
+				{error, {Case, Reason}};
+			    Res ->
+				Res
+			end,
+		    end_per_testcase(Case, C),
+		    Result
+	    end,
+    process_flag(trap_exit, Flag),
+    lists:map(Fun, Cases).
 
 		
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_codec_prev3a_test.erl b/lib/megaco/test/megaco_codec_prev3a_test.erl
index 696a72343c..d50e72aef1 100644
--- a/lib/megaco/test/megaco_codec_prev3a_test.erl
+++ b/lib/megaco/test/megaco_codec_prev3a_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -36,22 +36,16 @@
 
 -export([t/0, t/1]).
 
--export([all/1, 
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, 
 
-	 text/1, 
-
-	 pretty/1, 
 	 pretty_test_msgs/1, 
-
-	 compact/1, 
+	 
 	 compact_test_msgs/1, 
-
-	 flex_pretty/1, 
+	 
 	 flex_pretty_init/1, 
 	 flex_pretty_finish/1, 
 	 flex_pretty_test_msgs/1,
-
-	 flex_compact/1, 
+	 
 	 flex_compact_init/1, 
 	 flex_compact_finish/1, 
 	 flex_compact_test_msgs/1,
@@ -64,32 +58,21 @@
 	 flex_compact_dm_timers6/1, 
 	 flex_compact_dm_timers7/1, 
 	 flex_compact_dm_timers8/1, 
-
-	 binary/1, 
 	 
-	 bin/1, 
 	 bin_test_msgs/1,
-
-	 ber/1, 
+	 
 	 ber_test_msgs/1, 
-
-	 ber_bin/1, 
+	 
 	 ber_bin_test_msgs/1, 
-
-	 per/1,
+	
 	 per_test_msgs/1,
-
-	 per_bin/1,
+	
 	 per_bin_test_msgs/1,
-
-	 erl_dist/1,
-	 erl_dist_m/1,
+	
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
-	 tickets/1, 
-
-	 compact_tickets/1, 
+	 
 	 compact_otp4011_msg1/1, 
 	 compact_otp4011_msg2/1,
 	 compact_otp4011_msg3/1,
@@ -132,8 +115,7 @@
          compact_otp6017_msg01/1,
          compact_otp6017_msg02/1,
          compact_otp6017_msg03/1,
-
-	 flex_compact_tickets/1, 
+	 
          flex_compact_otp7431_msg01/1,
          flex_compact_otp7431_msg02/1,
          flex_compact_otp7431_msg03/1,
@@ -141,8 +123,7 @@
          flex_compact_otp7431_msg05/1,
          flex_compact_otp7431_msg06/1,
          flex_compact_otp7431_msg07/1,
-
-	 pretty_tickets/1, 
+	 
 	 pretty_otp4632_msg1/1, 
 	 pretty_otp4632_msg2/1, 
 	 pretty_otp4632_msg3/1, 
@@ -185,8 +166,7 @@
          pretty_otp7671_msg04/1,
          pretty_otp7671_msg05/1,
          pretty_otp8114_msg01/1,	 
-
-	 flex_pretty_tickets/1, 
+	 
 	 flex_pretty_otp5042_msg1/1, 
 	 flex_pretty_otp5085_msg1/1, 
 	 flex_pretty_otp5085_msg2/1, 
@@ -208,7 +188,7 @@
          flex_pretty_otp7431_msg06/1,
          flex_pretty_otp7431_msg07/1,
 
-	 init_per_testcase/2, fin_per_testcase/2]).  
+	 init_per_testcase/2, end_per_testcase/2]).  
 
 -export([display_text_messages/0]).
 
@@ -263,30 +243,7 @@ expand([Case|Cases], Acc) ->
 	    expand(Cases, [Case|Acc])
     end.
 
-	    
-%% ----
-
-tickets() ->
-    Flag  = process_flag(trap_exit, true),    
-    Cases = expand(tickets),
-    Fun   = fun(Case) ->
-		    C = init_per_testcase(Case, [{tc_timeout, 
-						  timer:minutes(10)}]),
-		    io:format("Eval ~w~n", [Case]),
-		    Result = 
-			case (catch apply(?MODULE, Case, [C])) of
-			    {'EXIT', Reason} ->
- 				io:format("~n~p exited:~n   ~p~n", 
- 					  [Case, Reason]),
-				{error, {Case, Reason}};
-			    Res ->
-				Res
-			end,
-		    fin_per_testcase(Case, C),
-		    Result
-	    end,
-    process_flag(trap_exit, Flag),
-    lists:map(Fun, Cases).
+	  
 
 
 %% ----
@@ -306,268 +263,166 @@ init_per_testcase(Case, Config) ->
 	end,
     megaco_test_lib:init_per_testcase(Case, C).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     erase(verbosity),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     text,
-     binary,
-     erl_dist,
-     tickets
-    ].
-
-text(suite) ->
-    [
-     pretty,
-     flex_pretty,
-     compact,
-     flex_compact
-    ].
-
-binary(suite) ->
-    [
-     bin,
-     ber,
-     ber_bin,
-     per,
-     per_bin
-    ].
-
-erl_dist(suite) ->
-    [
-     erl_dist_m
-    ].
-
-pretty(suite) ->
-    [
-     pretty_test_msgs
-    ].
-
-
-compact(suite) ->
-    [
-     compact_test_msgs
-    ].
-
-
-flex_pretty(suite) ->
-    {req, [], 
-     {conf, flex_pretty_init, flex_pretty_cases(), flex_pretty_finish}}.
-
-flex_pretty_cases() ->
-    [
-     flex_pretty_test_msgs
-    ].
-
-flex_compact(suite) ->
-    {req, [], 
-     {conf, flex_compact_init, flex_compact_cases(), flex_compact_finish}}.
-
-flex_compact_cases() ->
-    [
-     flex_compact_test_msgs,
-     flex_compact_dm_timers1,
-     flex_compact_dm_timers2,
-     flex_compact_dm_timers3,
-     flex_compact_dm_timers4,
-     flex_compact_dm_timers5,
-     flex_compact_dm_timers6,
-     flex_compact_dm_timers7,
-     flex_compact_dm_timers8
-    ].
-
-
-bin(suite) ->
-    [
-     bin_test_msgs
-    ].
-
-
-ber(suite) ->
-    [
-     ber_test_msgs
-    ].
-
-
-ber_bin(suite) ->
-    [
-     ber_bin_test_msgs
-    ].
-
-
-per(suite) ->
-    [
-     per_test_msgs
-    ].
-
+all() -> 
+    [{group, text}, {group, binary}, {group, erl_dist},
+     {group, tickets}].
+
+groups() -> 
+    [{text, [],
+      [{group, pretty}, {group, flex_pretty},
+       {group, compact}, {group, flex_compact}]},
+     {binary, [],
+      [{group, bin}, {group, ber}, {group, ber_bin},
+       {group, per}, {group, per_bin}]},
+     {erl_dist, [], [{group, erl_dist_m}]},
+     {pretty, [], [pretty_test_msgs]},
+     {compact, [], [compact_test_msgs]},
+     {flex_pretty, [], flex_pretty_cases()},
+     {flex_compact, [], flex_compact_cases()},
+     {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
+     {ber_bin, [], [ber_bin_test_msgs]},
+     {per, [], [per_test_msgs]},
+     {per_bin, [], [per_bin_test_msgs]},
+     {erl_dist_m, [], [erl_dist_m_test_msgs]},
+     {tickets, [],
+      [{group, compact_tickets},
+       {group, flex_compact_tickets}, {group, pretty_tickets},
+       {group, flex_pretty_tickets}]},
+     {compact_tickets, [],
+      [compact_otp4011_msg1, compact_otp4011_msg2,
+       compact_otp4011_msg3, compact_otp4013_msg1,
+       compact_otp4085_msg1, compact_otp4085_msg2,
+       compact_otp4280_msg1, compact_otp4299_msg1,
+       compact_otp4299_msg2, compact_otp4359_msg1,
+       compact_otp4920_msg0, compact_otp4920_msg1,
+       compact_otp4920_msg2, compact_otp4920_msg3,
+       compact_otp4920_msg4, compact_otp4920_msg5,
+       compact_otp4920_msg6, compact_otp4920_msg7,
+       compact_otp4920_msg8, compact_otp4920_msg9,
+       compact_otp4920_msg10, compact_otp4920_msg11,
+       compact_otp4920_msg12, compact_otp4920_msg20,
+       compact_otp4920_msg21, compact_otp4920_msg22,
+       compact_otp4920_msg23, compact_otp4920_msg24,
+       compact_otp4920_msg25, compact_otp5186_msg01,
+       compact_otp5186_msg02, compact_otp5186_msg03,
+       compact_otp5186_msg04, compact_otp5186_msg05,
+       compact_otp5186_msg06, compact_otp5793_msg01,
+       compact_otp5993_msg01, compact_otp5993_msg02,
+       compact_otp5993_msg03, compact_otp6017_msg01,
+       compact_otp6017_msg02, compact_otp6017_msg03]},
+     {flex_compact_tickets, [],
+      flex_compact_tickets_cases()},
+     {pretty_tickets, [],
+      [pretty_otp4632_msg1, pretty_otp4632_msg2,
+       pretty_otp4632_msg3, pretty_otp4632_msg4,
+       pretty_otp4710_msg1, pretty_otp4710_msg2,
+       pretty_otp4945_msg1, pretty_otp4945_msg2,
+       pretty_otp4945_msg3, pretty_otp4945_msg4,
+       pretty_otp4945_msg5, pretty_otp4945_msg6,
+       pretty_otp4949_msg1, pretty_otp4949_msg2,
+       pretty_otp4949_msg3, pretty_otp5042_msg1,
+       pretty_otp5068_msg1, pretty_otp5085_msg1,
+       pretty_otp5085_msg2, pretty_otp5085_msg3,
+       pretty_otp5085_msg4, pretty_otp5085_msg5,
+       pretty_otp5085_msg6, pretty_otp5085_msg7,
+       pretty_otp5085_msg8, pretty_otp5600_msg1,
+       pretty_otp5600_msg2, pretty_otp5601_msg1,
+       pretty_otp5793_msg01, pretty_otp5882_msg01,
+       pretty_otp6490_msg01, pretty_otp6490_msg02,
+       pretty_otp6490_msg03, pretty_otp6490_msg04,
+       pretty_otp6490_msg05, pretty_otp6490_msg06,
+       pretty_otp7671_msg01, pretty_otp7671_msg02,
+       pretty_otp7671_msg03, pretty_otp7671_msg04,
+       pretty_otp7671_msg05, pretty_otp8114_msg01]},
+     {flex_pretty_tickets, [], flex_pretty_tickets_cases()}].
+
+init_per_group(flex_pretty_tickets, Config) -> 
+    flex_pretty_init(Config);
+init_per_group(flex_compact_tickets, Config) -> 
+    flex_compact_init(Config);
+init_per_group(flex_compact, Config) -> 
+    flex_compact_init(Config);
+init_per_group(flex_pretty, Config) -> 
+    flex_pretty_init(Config);
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(flex_pretty_tickets, Config) -> 
+    flex_pretty_finish(Config);
+end_per_group(flex_compact_tickets, Config) -> 
+    flex_compact_finish(Config);
+end_per_group(flex_compact, Config) -> 
+    flex_compact_finish(Config);
+end_per_group(flex_pretty, Config) -> 
+    flex_pretty_finish(Config);
+end_per_group(_GroupName, Config) ->
+    Config.
+
+flex_pretty_cases() -> 
+    [flex_pretty_test_msgs].
+
+
+flex_compact_cases() -> 
+    [flex_compact_test_msgs, flex_compact_dm_timers1,
+     flex_compact_dm_timers2, flex_compact_dm_timers3,
+     flex_compact_dm_timers4, flex_compact_dm_timers5,
+     flex_compact_dm_timers6, flex_compact_dm_timers7,
+     flex_compact_dm_timers8].
 
 %% Support for per_bin was added to ASN.1 as of version
 %% 1.3.2 (R8). And later merged into 1.3.1.3 (R7). These
 %% releases are identical (as far as I know).
 %% 
-per_bin(suite) ->
-    [
-     per_bin_test_msgs
-    ].
-
-
-erl_dist_m(suite) ->
-    [
-     erl_dist_m_test_msgs
-    ].
-
-tickets(suite) ->
-    [
-     compact_tickets,
-     flex_compact_tickets,
-     pretty_tickets,
-     flex_pretty_tickets
-    ].
-
 
-compact_tickets(suite) ->
-    [
-     compact_otp4011_msg1,
-     compact_otp4011_msg2,
-     compact_otp4011_msg3,
-     compact_otp4013_msg1,
-     compact_otp4085_msg1,
-     compact_otp4085_msg2,
-     compact_otp4280_msg1,
-     compact_otp4299_msg1,
-     compact_otp4299_msg2,
-     compact_otp4359_msg1,
-     compact_otp4920_msg0,
-     compact_otp4920_msg1,
-     compact_otp4920_msg2,
-     compact_otp4920_msg3,
-     compact_otp4920_msg4,
-     compact_otp4920_msg5,
-     compact_otp4920_msg6,
-     compact_otp4920_msg7,
-     compact_otp4920_msg8,
-     compact_otp4920_msg9,
-     compact_otp4920_msg10,
-     compact_otp4920_msg11,
-     compact_otp4920_msg12,
-     compact_otp4920_msg20,
-     compact_otp4920_msg21,
-     compact_otp4920_msg22,
-     compact_otp4920_msg23,
-     compact_otp4920_msg24,
-     compact_otp4920_msg25,
-     compact_otp5186_msg01,
-     compact_otp5186_msg02,
-     compact_otp5186_msg03,
-     compact_otp5186_msg04,
-     compact_otp5186_msg05,
-     compact_otp5186_msg06,
-     compact_otp5793_msg01,
-     compact_otp5993_msg01,
-     compact_otp5993_msg02,
-     compact_otp5993_msg03,
-     compact_otp6017_msg01,
-     compact_otp6017_msg02,
-     compact_otp6017_msg03
-    ].
-
-flex_compact_tickets(suite) ->
-    {req, [],
-     {conf, flex_compact_init, flex_compact_tickets_cases(),
-      flex_compact_finish}}.
+flex_compact_tickets_cases() -> 
+    [flex_compact_otp7431_msg01, flex_compact_otp7431_msg02,
+     flex_compact_otp7431_msg03, flex_compact_otp7431_msg04,
+     flex_compact_otp7431_msg05, flex_compact_otp7431_msg06,
+     flex_compact_otp7431_msg07].
+
+flex_pretty_tickets_cases() -> 
+    [flex_pretty_otp5042_msg1, flex_pretty_otp5085_msg1,
+     flex_pretty_otp5085_msg2, flex_pretty_otp5085_msg3,
+     flex_pretty_otp5085_msg4, flex_pretty_otp5085_msg5,
+     flex_pretty_otp5085_msg6, flex_pretty_otp5085_msg7,
+     flex_pretty_otp5085_msg8, flex_pretty_otp5600_msg1,
+     flex_pretty_otp5600_msg2, flex_pretty_otp5601_msg1,
+     flex_pretty_otp5793_msg01, flex_pretty_otp7431_msg01,
+     flex_pretty_otp7431_msg02, flex_pretty_otp7431_msg03,
+     flex_pretty_otp7431_msg04, flex_pretty_otp7431_msg05,
+     flex_pretty_otp7431_msg06, flex_pretty_otp7431_msg07].
 
-flex_compact_tickets_cases() ->
-    [
-     flex_compact_otp7431_msg01,
-     flex_compact_otp7431_msg02,
-     flex_compact_otp7431_msg03, 
-     flex_compact_otp7431_msg04,
-     flex_compact_otp7431_msg05,
-     flex_compact_otp7431_msg06,
-     flex_compact_otp7431_msg07
-    ].
-
-
-pretty_tickets(suite) ->
-    [
-     pretty_otp4632_msg1,
-     pretty_otp4632_msg2,
-     pretty_otp4632_msg3,
-     pretty_otp4632_msg4,
-     pretty_otp4710_msg1,
-     pretty_otp4710_msg2,
-     pretty_otp4945_msg1,
-     pretty_otp4945_msg2,
-     pretty_otp4945_msg3,
-     pretty_otp4945_msg4,
-     pretty_otp4945_msg5,
-     pretty_otp4945_msg6,
-     pretty_otp4949_msg1,
-     pretty_otp4949_msg2,
-     pretty_otp4949_msg3,
-     pretty_otp5042_msg1,
-     pretty_otp5068_msg1,
-     pretty_otp5085_msg1,
-     pretty_otp5085_msg2,
-     pretty_otp5085_msg3,
-     pretty_otp5085_msg4,
-     pretty_otp5085_msg5,
-     pretty_otp5085_msg6,
-     pretty_otp5085_msg7,
-     pretty_otp5085_msg8,
-     pretty_otp5600_msg1,
-     pretty_otp5600_msg2,
-     pretty_otp5601_msg1,
-     pretty_otp5793_msg01,
-     pretty_otp5882_msg01,
-     pretty_otp6490_msg01,
-     pretty_otp6490_msg02,
-     pretty_otp6490_msg03,
-     pretty_otp6490_msg04,
-     pretty_otp6490_msg05,
-     pretty_otp6490_msg06,
-     pretty_otp7671_msg01,
-     pretty_otp7671_msg02,
-     pretty_otp7671_msg03,
-     pretty_otp7671_msg04,
-     pretty_otp7671_msg05,
-     pretty_otp8114_msg01
-    ].
+%% ----
 
-flex_pretty_tickets(suite) ->
-    {req, [],
-     {conf, flex_pretty_init, flex_pretty_tickets_cases(),
-      flex_pretty_finish}}.
- 
-flex_pretty_tickets_cases() ->
-    [
-     flex_pretty_otp5042_msg1,
-     flex_pretty_otp5085_msg1,
-     flex_pretty_otp5085_msg2,
-     flex_pretty_otp5085_msg3,
-     flex_pretty_otp5085_msg4,
-     flex_pretty_otp5085_msg5,
-     flex_pretty_otp5085_msg6,
-     flex_pretty_otp5085_msg7,
-     flex_pretty_otp5085_msg8,
-     flex_pretty_otp5600_msg1,
-     flex_pretty_otp5600_msg2,
-     flex_pretty_otp5601_msg1,
-     flex_pretty_otp5793_msg01,
-     flex_pretty_otp7431_msg01,
-     flex_pretty_otp7431_msg02,
-     flex_pretty_otp7431_msg03, 
-     flex_pretty_otp7431_msg04,
-     flex_pretty_otp7431_msg05,
-     flex_pretty_otp7431_msg06,
-     flex_pretty_otp7431_msg07
-    ].
+tickets() ->
+    Flag  = process_flag(trap_exit, true),    
+    Cases = expand(tickets),
+    Fun   = fun(Case) ->
+		    C = init_per_testcase(Case, [{tc_timeout, 
+						  timer:minutes(10)}]),
+		    io:format("Eval ~w~n", [Case]),
+		    Result = 
+			case (catch apply(?MODULE, Case, [C])) of
+			    {'EXIT', Reason} ->
+ 				io:format("~n~p exited:~n   ~p~n", 
+ 					  [Case, Reason]),
+				{error, {Case, Reason}};
+			    Res ->
+				Res
+			end,
+		    end_per_testcase(Case, C),
+		    Result
+	    end,
+    process_flag(trap_exit, Flag),
+    lists:map(Fun, Cases).
 
 		
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_codec_prev3b_test.erl b/lib/megaco/test/megaco_codec_prev3b_test.erl
index b5fe4d2038..eaab8f37c1 100644
--- a/lib/megaco/test/megaco_codec_prev3b_test.erl
+++ b/lib/megaco/test/megaco_codec_prev3b_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -36,22 +36,16 @@
 
 -export([t/0, t/1]).
 
--export([all/1, 
-
-	 text/1, 
-
-	 pretty/1, 
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, 
+	 
 	 pretty_test_msgs/1, 
-
-	 compact/1, 
+	 
 	 compact_test_msgs/1, 
 
-	 flex_pretty/1, 
 	 flex_pretty_init/1, 
 	 flex_pretty_finish/1, 
 	 flex_pretty_test_msgs/1,
-
-	 flex_compact/1, 
+	 
 	 flex_compact_init/1, 
 	 flex_compact_finish/1, 
 	 flex_compact_test_msgs/1,
@@ -64,32 +58,21 @@
 	 flex_compact_dm_timers6/1, 
 	 flex_compact_dm_timers7/1, 
 	 flex_compact_dm_timers8/1, 
-
-	 binary/1, 
 	 
-	 bin/1, 
 	 bin_test_msgs/1,
-
-	 ber/1, 
+	 
 	 ber_test_msgs/1, 
-
-	 ber_bin/1, 
+	 
 	 ber_bin_test_msgs/1, 
-
-	 per/1,
+	
 	 per_test_msgs/1,
-
-	 per_bin/1,
+	
 	 per_bin_test_msgs/1,
-
-	 erl_dist/1,
-	 erl_dist_m/1,
+	
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
-	 tickets/1, 
-
-	 compact_tickets/1, 
+	 
 	 compact_otp4011_msg1/1, 
 	 compact_otp4011_msg2/1,
 	 compact_otp4011_msg3/1,
@@ -133,8 +116,7 @@
          compact_otp6017_msg01/1,
          compact_otp6017_msg02/1,
          compact_otp6017_msg03/1,
-
-	 flex_compact_tickets/1, 
+	 
          flex_compact_otp7431_msg01/1,
          flex_compact_otp7431_msg02/1,
          flex_compact_otp7431_msg03/1,
@@ -142,8 +124,7 @@
          flex_compact_otp7431_msg05/1,
          flex_compact_otp7431_msg06/1,
          flex_compact_otp7431_msg07/1,
-
-	 pretty_tickets/1, 
+	 
 	 pretty_otp4632_msg1/1, 
 	 pretty_otp4632_msg2/1, 
 	 pretty_otp4632_msg3/1, 
@@ -190,8 +171,7 @@
          pretty_otp7671_msg04/1,
          pretty_otp7671_msg05/1,
          pretty_otp8114_msg01/1,
-
-	 flex_pretty_tickets/1, 
+	 
 	 flex_pretty_otp5042_msg1/1, 
 	 flex_pretty_otp5085_msg1/1, 
 	 flex_pretty_otp5085_msg2/1, 
@@ -217,7 +197,7 @@
          flex_pretty_otp7431_msg06/1,
          flex_pretty_otp7431_msg07/1,
 
-	 init_per_testcase/2, fin_per_testcase/2]).  
+	 init_per_testcase/2, end_per_testcase/2]).  
 
 -export([display_text_messages/0, generate_text_messages/0]).
 
@@ -281,31 +261,6 @@ expand([Case|Cases], Acc) ->
 	    expand(Cases, [Case|Acc])
     end.
 
-	    
-%% ----
-
-tickets() ->
-    Flag  = process_flag(trap_exit, true),    
-    Cases = expand(tickets),
-    Fun   = fun(Case) ->
-		    C = init_per_testcase(Case, [{tc_timeout, 
-						  timer:minutes(10)}]),
-		    io:format("Eval ~w~n", [Case]),
-		    Result = 
-			case (catch apply(?MODULE, Case, [C])) of
-			    {'EXIT', Reason} ->
- 				io:format("~n~p exited:~n   ~p~n", 
- 					  [Case, Reason]),
-				{error, {Case, Reason}};
-			    Res ->
-				Res
-			end,
-		    fin_per_testcase(Case, C),
-		    Result
-	    end,
-    process_flag(trap_exit, Flag),
-    lists:map(Fun, Cases).
-
 
 %% ----
 
@@ -324,276 +279,170 @@ init_per_testcase(Case, Config) ->
 	end,
     megaco_test_lib:init_per_testcase(Case, C).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     erase(verbosity),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     text,
-     binary,
-     erl_dist,
-     tickets
-    ].
-
-text(suite) ->
-    [
-     pretty,
-     flex_pretty,
-     compact,
-     flex_compact
-    ].
-
-binary(suite) ->
-    [
-     bin,
-     ber,
-     ber_bin,
-     per,
-     per_bin
-    ].
-
-erl_dist(suite) ->
-    [
-     erl_dist_m
-    ].
-
-pretty(suite) ->
-    [
-     pretty_test_msgs
-    ].
-
-
-compact(suite) ->
-    [
-     compact_test_msgs
-    ].
-
-
-flex_pretty(suite) ->
-    {req, [], 
-     {conf, flex_pretty_init, flex_pretty_cases(), flex_pretty_finish}}.
-
-flex_pretty_cases() ->
-    [
-     flex_pretty_test_msgs
-    ].
-
-flex_compact(suite) ->
-    {req, [], 
-     {conf, flex_compact_init, flex_compact_cases(), flex_compact_finish}}.
-
-flex_compact_cases() ->
-    [
-     flex_compact_test_msgs,
-     flex_compact_dm_timers1,
-     flex_compact_dm_timers2,
-     flex_compact_dm_timers3,
-     flex_compact_dm_timers4,
-     flex_compact_dm_timers5,
-     flex_compact_dm_timers6,
-     flex_compact_dm_timers7,
-     flex_compact_dm_timers8
-    ].
-
-
-bin(suite) ->
-    [
-     bin_test_msgs
-    ].
-
-
-ber(suite) ->
-    [
-     ber_test_msgs
-    ].
-
-
-ber_bin(suite) ->
-    [
-     ber_bin_test_msgs
-    ].
-
-
-per(suite) ->
-    [
-     per_test_msgs
-    ].
-
+all() -> 
+    [{group, text}, {group, binary}, {group, erl_dist},
+     {group, tickets}].
+
+groups() -> 
+    [{text, [],
+      [{group, pretty}, {group, flex_pretty},
+       {group, compact}, {group, flex_compact}]},
+     {binary, [],
+      [{group, bin}, {group, ber}, {group, ber_bin},
+       {group, per}, {group, per_bin}]},
+     {erl_dist, [], [{group, erl_dist_m}]},
+     {pretty, [], [pretty_test_msgs]},
+     {compact, [], [compact_test_msgs]},
+     {flex_pretty, [], flex_pretty_cases()},
+     {flex_compact, [], flex_compact_cases()},
+     {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
+     {ber_bin, [], [ber_bin_test_msgs]},
+     {per, [], [per_test_msgs]},
+     {per_bin, [], [per_bin_test_msgs]},
+     {erl_dist_m, [], [erl_dist_m_test_msgs]},
+     {tickets, [],
+      [{group, compact_tickets},
+       {group, flex_compact_tickets}, {group, pretty_tickets},
+       {group, flex_pretty_tickets}]},
+     {compact_tickets, [],
+      [compact_otp4011_msg1, compact_otp4011_msg2,
+       compact_otp4011_msg3, compact_otp4013_msg1,
+       compact_otp4085_msg1, compact_otp4085_msg2,
+       compact_otp4280_msg1, compact_otp4299_msg1,
+       compact_otp4299_msg2, compact_otp4359_msg1,
+       compact_otp4920_msg0, compact_otp4920_msg1,
+       compact_otp4920_msg2, compact_otp4920_msg3,
+       compact_otp4920_msg4, compact_otp4920_msg5,
+       compact_otp4920_msg6, compact_otp4920_msg7,
+       compact_otp4920_msg8, compact_otp4920_msg9,
+       compact_otp4920_msg10, compact_otp4920_msg11,
+       compact_otp4920_msg12, compact_otp4920_msg20,
+       compact_otp4920_msg21, compact_otp4920_msg22,
+       compact_otp4920_msg23, compact_otp4920_msg24,
+       compact_otp4920_msg25, compact_otp5186_msg01,
+       compact_otp5186_msg02, compact_otp5186_msg03,
+       compact_otp5186_msg04, compact_otp5186_msg05,
+       compact_otp5186_msg06, compact_otp5793_msg01,
+       compact_otp5836_msg01, compact_otp5993_msg01,
+       compact_otp5993_msg02, compact_otp5993_msg03,
+       compact_otp6017_msg01, compact_otp6017_msg02,
+       compact_otp6017_msg03]},
+     {flex_compact_tickets, [],
+      flex_compact_tickets_cases()},
+     {pretty_tickets, [],
+      [pretty_otp4632_msg1, pretty_otp4632_msg2,
+       pretty_otp4632_msg3, pretty_otp4632_msg4,
+       pretty_otp4710_msg1, pretty_otp4710_msg2,
+       pretty_otp4945_msg1, pretty_otp4945_msg2,
+       pretty_otp4945_msg3, pretty_otp4945_msg4,
+       pretty_otp4945_msg5, pretty_otp4945_msg6,
+       pretty_otp4949_msg1, pretty_otp4949_msg2,
+       pretty_otp4949_msg3, pretty_otp5042_msg1,
+       pretty_otp5068_msg1, pretty_otp5085_msg1,
+       pretty_otp5085_msg2, pretty_otp5085_msg3,
+       pretty_otp5085_msg4, pretty_otp5085_msg5,
+       pretty_otp5085_msg6, pretty_otp5085_msg7,
+       pretty_otp5085_msg8, pretty_otp5600_msg1,
+       pretty_otp5600_msg2, pretty_otp5601_msg1,
+       pretty_otp5793_msg01, pretty_otp5803_msg01,
+       pretty_otp5803_msg02, pretty_otp5805_msg01,
+       pretty_otp5836_msg01, pretty_otp5882_msg01,
+       pretty_otp6490_msg01, pretty_otp6490_msg02,
+       pretty_otp6490_msg03, pretty_otp6490_msg04,
+       pretty_otp6490_msg05, pretty_otp6490_msg06,
+       pretty_otp7671_msg01, pretty_otp7671_msg02,
+       pretty_otp7671_msg03, pretty_otp7671_msg04,
+       pretty_otp7671_msg05, pretty_otp8114_msg01]},
+     {flex_pretty_tickets, [], flex_pretty_tickets_cases()}].
+
+init_per_group(flex_pretty_tickets, Config) -> 
+    flex_pretty_init(Config);
+init_per_group(flex_compact_tickets, Config) -> 
+    flex_compact_init(Config);
+init_per_group(flex_compact, Config) -> 
+    flex_compact_init(Config);
+init_per_group(flex_pretty, Config) -> 
+    flex_pretty_init(Config);
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(flex_pretty_tickets, Config) -> 
+    flex_pretty_finish(Config);
+end_per_group(flex_compact_tickets, Config) -> 
+    flex_compact_finish(Config);
+end_per_group(flex_compact, Config) -> 
+    flex_compact_finish(Config);
+end_per_group(flex_pretty, Config) -> 
+    flex_pretty_finish(Config);
+end_per_group(_GroupName, Config) ->
+    Config.
+
+flex_pretty_cases() -> 
+    [flex_pretty_test_msgs].
+
+flex_compact_cases() -> 
+    [flex_compact_test_msgs, flex_compact_dm_timers1,
+     flex_compact_dm_timers2, flex_compact_dm_timers3,
+     flex_compact_dm_timers4, flex_compact_dm_timers5,
+     flex_compact_dm_timers6, flex_compact_dm_timers7,
+     flex_compact_dm_timers8].
 
 %% Support for per_bin was added to ASN.1 as of version
 %% 1.3.2 (R8). And later merged into 1.3.1.3 (R7). These
 %% releases are identical (as far as I know).
 %% 
-per_bin(suite) ->
-    [
-     per_bin_test_msgs
-    ].
-
-
-erl_dist_m(suite) ->
-    [
-     erl_dist_m_test_msgs
-    ].
-
-tickets(suite) ->
-    [
-     compact_tickets,
-     flex_compact_tickets,
-     pretty_tickets,
-     flex_pretty_tickets
-    ].
 
+flex_compact_tickets_cases() -> 
+    [flex_compact_otp7431_msg01, flex_compact_otp7431_msg02,
+     flex_compact_otp7431_msg03, flex_compact_otp7431_msg04,
+     flex_compact_otp7431_msg05, flex_compact_otp7431_msg06,
+     flex_compact_otp7431_msg07].
+
+flex_pretty_tickets_cases() -> 
+    [flex_pretty_otp5042_msg1, flex_pretty_otp5085_msg1,
+     flex_pretty_otp5085_msg2, flex_pretty_otp5085_msg3,
+     flex_pretty_otp5085_msg4, flex_pretty_otp5085_msg5,
+     flex_pretty_otp5085_msg6, flex_pretty_otp5085_msg7,
+     flex_pretty_otp5085_msg8, flex_pretty_otp5600_msg1,
+     flex_pretty_otp5600_msg2, flex_pretty_otp5601_msg1,
+     flex_pretty_otp5793_msg01, flex_pretty_otp5803_msg01,
+     flex_pretty_otp5803_msg02, flex_pretty_otp5805_msg01,
+     flex_pretty_otp5836_msg01, flex_pretty_otp7431_msg01,
+     flex_pretty_otp7431_msg02, flex_pretty_otp7431_msg03,
+     flex_pretty_otp7431_msg04, flex_pretty_otp7431_msg05,
+     flex_pretty_otp7431_msg06, flex_pretty_otp7431_msg07].
 
-compact_tickets(suite) ->
-    [
-     compact_otp4011_msg1,
-     compact_otp4011_msg2,
-     compact_otp4011_msg3,
-     compact_otp4013_msg1,
-     compact_otp4085_msg1,
-     compact_otp4085_msg2,
-     compact_otp4280_msg1,
-     compact_otp4299_msg1,
-     compact_otp4299_msg2,
-     compact_otp4359_msg1,
-     compact_otp4920_msg0,
-     compact_otp4920_msg1,
-     compact_otp4920_msg2,
-     compact_otp4920_msg3,
-     compact_otp4920_msg4,
-     compact_otp4920_msg5,
-     compact_otp4920_msg6,
-     compact_otp4920_msg7,
-     compact_otp4920_msg8,
-     compact_otp4920_msg9,
-     compact_otp4920_msg10,
-     compact_otp4920_msg11,
-     compact_otp4920_msg12,
-     compact_otp4920_msg20,
-     compact_otp4920_msg21,
-     compact_otp4920_msg22,
-     compact_otp4920_msg23,
-     compact_otp4920_msg24,
-     compact_otp4920_msg25,
-     compact_otp5186_msg01,
-     compact_otp5186_msg02,
-     compact_otp5186_msg03,
-     compact_otp5186_msg04,
-     compact_otp5186_msg05,
-     compact_otp5186_msg06,
-     compact_otp5793_msg01,
-     compact_otp5836_msg01,
-     compact_otp5993_msg01,
-     compact_otp5993_msg02,
-     compact_otp5993_msg03,
-     compact_otp6017_msg01,
-     compact_otp6017_msg02,
-     compact_otp6017_msg03
-    ].
-
-flex_compact_tickets(suite) ->
-    {req, [],
-     {conf, flex_compact_init, flex_compact_tickets_cases(),
-      flex_compact_finish}}.
-
-flex_compact_tickets_cases() ->
-    [
-     flex_compact_otp7431_msg01,
-     flex_compact_otp7431_msg02,
-     flex_compact_otp7431_msg03, 
-     flex_compact_otp7431_msg04,
-     flex_compact_otp7431_msg05,
-     flex_compact_otp7431_msg06,
-     flex_compact_otp7431_msg07
-    ].
-
-pretty_tickets(suite) ->
-    [
-     pretty_otp4632_msg1,
-     pretty_otp4632_msg2,
-     pretty_otp4632_msg3,
-     pretty_otp4632_msg4,
-     pretty_otp4710_msg1,
-     pretty_otp4710_msg2,
-     pretty_otp4945_msg1,
-     pretty_otp4945_msg2,
-     pretty_otp4945_msg3,
-     pretty_otp4945_msg4,
-     pretty_otp4945_msg5,
-     pretty_otp4945_msg6,
-     pretty_otp4949_msg1,
-     pretty_otp4949_msg2,
-     pretty_otp4949_msg3,
-     pretty_otp5042_msg1,
-     pretty_otp5068_msg1,
-     pretty_otp5085_msg1,
-     pretty_otp5085_msg2,
-     pretty_otp5085_msg3,
-     pretty_otp5085_msg4,
-     pretty_otp5085_msg5,
-     pretty_otp5085_msg6,
-     pretty_otp5085_msg7,
-     pretty_otp5085_msg8,
-     pretty_otp5600_msg1,
-     pretty_otp5600_msg2,
-     pretty_otp5601_msg1,
-     pretty_otp5793_msg01,
-     pretty_otp5803_msg01,
-     pretty_otp5803_msg02,
-     pretty_otp5805_msg01,
-     pretty_otp5836_msg01,
-     pretty_otp5882_msg01,
-     pretty_otp6490_msg01,
-     pretty_otp6490_msg02,
-     pretty_otp6490_msg03,
-     pretty_otp6490_msg04,
-     pretty_otp6490_msg05,
-     pretty_otp6490_msg06,
-     pretty_otp7671_msg01,
-     pretty_otp7671_msg02,
-     pretty_otp7671_msg03,
-     pretty_otp7671_msg04,
-     pretty_otp7671_msg05,
-     pretty_otp8114_msg01
-    ].
+%% ----
 
-flex_pretty_tickets(suite) ->
-    {req, [],
-     {conf, flex_pretty_init, flex_pretty_tickets_cases(),
-      flex_pretty_finish}}.
- 
-flex_pretty_tickets_cases() ->
-    [
-     flex_pretty_otp5042_msg1,
-     flex_pretty_otp5085_msg1,
-     flex_pretty_otp5085_msg2,
-     flex_pretty_otp5085_msg3,
-     flex_pretty_otp5085_msg4,
-     flex_pretty_otp5085_msg5,
-     flex_pretty_otp5085_msg6,
-     flex_pretty_otp5085_msg7,
-     flex_pretty_otp5085_msg8,
-     flex_pretty_otp5600_msg1,
-     flex_pretty_otp5600_msg2,
-     flex_pretty_otp5601_msg1,
-     flex_pretty_otp5793_msg01,
-     flex_pretty_otp5803_msg01,
-     flex_pretty_otp5803_msg02,
-     flex_pretty_otp5805_msg01,
-     flex_pretty_otp5836_msg01,
-     flex_pretty_otp7431_msg01,
-     flex_pretty_otp7431_msg02,
-     flex_pretty_otp7431_msg03, 
-     flex_pretty_otp7431_msg04,
-     flex_pretty_otp7431_msg05,
-     flex_pretty_otp7431_msg06,
-     flex_pretty_otp7431_msg07
-    ].
+tickets() ->
+    Flag  = process_flag(trap_exit, true),    
+    Cases = expand(tickets),
+    Fun   = fun(Case) ->
+		    C = init_per_testcase(Case, [{tc_timeout, 
+						  timer:minutes(10)}]),
+		    io:format("Eval ~w~n", [Case]),
+		    Result = 
+			case (catch apply(?MODULE, Case, [C])) of
+			    {'EXIT', Reason} ->
+ 				io:format("~n~p exited:~n   ~p~n", 
+ 					  [Case, Reason]),
+				{error, {Case, Reason}};
+			    Res ->
+				Res
+			end,
+		    end_per_testcase(Case, C),
+		    Result
+	    end,
+    process_flag(trap_exit, Flag),
+    lists:map(Fun, Cases).
 
 		
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_codec_prev3c_test.erl b/lib/megaco/test/megaco_codec_prev3c_test.erl
index 813d0cf57d..7f9c0fe4e7 100644
--- a/lib/megaco/test/megaco_codec_prev3c_test.erl
+++ b/lib/megaco/test/megaco_codec_prev3c_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -37,22 +37,17 @@
 
 -export([t/0, t/1]).
 
--export([all/1, 
-
-	 text/1, 
-
-	 pretty/1, 
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, 
+	 
 	 pretty_test_msgs/1, 
-
-	 compact/1, 
+	 
 	 compact_test_msgs/1, 
-
-	 flex_pretty/1, 
+	 
 	 flex_pretty_init/1, 
 	 flex_pretty_finish/1, 
 	 flex_pretty_test_msgs/1,
 
-	 flex_compact/1, 
+	 
 	 flex_compact_init/1, 
 	 flex_compact_finish/1, 
 	 flex_compact_test_msgs/1,
@@ -65,32 +60,21 @@
 	 flex_compact_dm_timers6/1, 
 	 flex_compact_dm_timers7/1, 
 	 flex_compact_dm_timers8/1, 
-
-	 binary/1, 
 	 
-	 bin/1, 
 	 bin_test_msgs/1,
-
-	 ber/1, 
+	 
 	 ber_test_msgs/1, 
-
-	 ber_bin/1, 
+	 
 	 ber_bin_test_msgs/1, 
-
-	 per/1,
+	
 	 per_test_msgs/1,
-
-	 per_bin/1,
+	
 	 per_bin_test_msgs/1,
-
-	 erl_dist/1,
-	 erl_dist_m/1,
+	
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
-	 tickets/1,
-
-	 compact_tickets/1, 
+	 
 	 compact_otp4011_msg1/1, 
 	 compact_otp4011_msg2/1,
 	 compact_otp4011_msg3/1,
@@ -133,8 +117,7 @@
          compact_otp6017_msg01/1,
          compact_otp6017_msg02/1,
          compact_otp6017_msg03/1,
-
-	 flex_compact_tickets/1, 
+	 
 	 flex_compact_otp4299_msg1/1, 
          flex_compact_otp7431_msg01/1,
          flex_compact_otp7431_msg02/1,
@@ -143,8 +126,7 @@
          flex_compact_otp7431_msg05/1,
          flex_compact_otp7431_msg06/1,
          flex_compact_otp7431_msg07/1,
-
-	 pretty_tickets/1, 
+	 
 	 pretty_otp4632_msg1/1, 
 	 pretty_otp4632_msg2/1, 
 	 pretty_otp4632_msg3/1, 
@@ -191,8 +173,7 @@
          pretty_otp7671_msg04/1,
          pretty_otp7671_msg05/1,
          pretty_otp8114_msg01/1,
-
-	 flex_pretty_tickets/1, 
+	 
 	 flex_pretty_otp5042_msg1/1, 
 	 flex_pretty_otp5085_msg1/1, 
 	 flex_pretty_otp5085_msg2/1, 
@@ -218,7 +199,7 @@
          flex_pretty_otp7431_msg06/1,
          flex_pretty_otp7431_msg07/1,
 
-	 init_per_testcase/2, fin_per_testcase/2]).  
+	 init_per_testcase/2, end_per_testcase/2]).  
 
 -export([display_text_messages/0, generate_text_messages/0]).
 
@@ -286,32 +267,6 @@ expand([Case|Cases], Acc) ->
 	    expand(Cases, [Case|Acc])
     end.
 
-	    
-%% ----
-
-tickets() ->
-    Flag  = process_flag(trap_exit, true),    
-    Cases = expand(tickets),
-    Fun   = fun(Case) ->
-		    C = init_per_testcase(Case, [{tc_timeout, 
-						  timer:minutes(10)}]),
-		    io:format("Eval ~w~n", [Case]),
-		    Result = 
-			case (catch apply(?MODULE, Case, [C])) of
-			    {'EXIT', Reason} ->
- 				io:format("~n~p exited:~n   ~p~n", 
- 					  [Case, Reason]),
-				{error, {Case, Reason}};
-			    Res ->
-				Res
-			end,
-		    fin_per_testcase(Case, C),
-		    Result
-	    end,
-    process_flag(trap_exit, Flag),
-    lists:map(Fun, Cases).
-
-
 %% ----
 
 t()     -> megaco_test_lib:t(?MODULE).
@@ -329,279 +284,169 @@ init_per_testcase(Case, Config) ->
 	end,
     megaco_test_lib:init_per_testcase(Case, C).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     erase(verbosity),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     text,
-     binary,
-     erl_dist,
-     tickets
-    ].
-
-text(suite) ->
-    [
-     pretty,
-     flex_pretty,
-     compact,
-     flex_compact
-    ].
-
-binary(suite) ->
-    [
-     bin,
-     ber,
-     ber_bin,
-     per,
-     per_bin
-    ].
-
-erl_dist(suite) ->
-    [
-     erl_dist_m
-    ].
-
-pretty(suite) ->
-    [
-     pretty_test_msgs
-    ].
-
-
-compact(suite) ->
-    [
-     compact_test_msgs
-    ].
-
-
-flex_pretty(suite) ->
-    {req, [], 
-     {conf, flex_pretty_init, flex_pretty_cases(), flex_pretty_finish}}.
-
-flex_pretty_cases() ->
-    [
-     flex_pretty_test_msgs
-    ].
-
-flex_compact(suite) ->
-    {req, [], 
-     {conf, flex_compact_init, flex_compact_cases(), flex_compact_finish}}.
-
-flex_compact_cases() ->
-    [
-     flex_compact_test_msgs,
-     flex_compact_dm_timers1,
-     flex_compact_dm_timers2,
-     flex_compact_dm_timers3,
-     flex_compact_dm_timers4,
-     flex_compact_dm_timers5,
-     flex_compact_dm_timers6,
-     flex_compact_dm_timers7,
-     flex_compact_dm_timers8
-    ].
-
-
-bin(suite) ->
-    [
-     bin_test_msgs
-    ].
-
-
-ber(suite) ->
-    [
-     ber_test_msgs
-    ].
-
-
-ber_bin(suite) ->
-    [
-     ber_bin_test_msgs
-    ].
-
-
-per(suite) ->
-    [
-     per_test_msgs
-    ].
-
+all() -> 
+    [{group, text}, {group, binary}, {group, erl_dist},
+     {group, tickets}].
+
+groups() -> 
+    [{text, [],
+      [{group, pretty}, {group, flex_pretty},
+       {group, compact}, {group, flex_compact}]},
+     {binary, [],
+      [{group, bin}, {group, ber}, {group, ber_bin},
+       {group, per}, {group, per_bin}]},
+     {erl_dist, [], [{group, erl_dist_m}]},
+     {pretty, [], [pretty_test_msgs]},
+     {compact, [], [compact_test_msgs]},
+     {flex_pretty, [], flex_pretty_cases()},
+     {flex_compact, [], flex_compact_cases()},
+     {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
+     {ber_bin, [], [ber_bin_test_msgs]},
+     {per, [], [per_test_msgs]},
+     {per_bin, [], [per_bin_test_msgs]},
+     {erl_dist_m, [], [erl_dist_m_test_msgs]},
+     {tickets, [],
+      [{group, compact_tickets},
+       {group, flex_compact_tickets}, {group, pretty_tickets},
+       {group, flex_pretty_tickets}]},
+     {compact_tickets, [],
+      [compact_otp4011_msg1, compact_otp4011_msg2,
+       compact_otp4011_msg3, compact_otp4013_msg1,
+       compact_otp4085_msg1, compact_otp4085_msg2,
+       compact_otp4280_msg1, compact_otp4299_msg1,
+       compact_otp4359_msg1, compact_otp4920_msg0,
+       compact_otp4920_msg1, compact_otp4920_msg2,
+       compact_otp4920_msg3, compact_otp4920_msg4,
+       compact_otp4920_msg5, compact_otp4920_msg6,
+       compact_otp4920_msg7, compact_otp4920_msg8,
+       compact_otp4920_msg9, compact_otp4920_msg10,
+       compact_otp4920_msg11, compact_otp4920_msg12,
+       compact_otp4920_msg20, compact_otp4920_msg21,
+       compact_otp4920_msg22, compact_otp4920_msg23,
+       compact_otp4920_msg24, compact_otp4920_msg25,
+       compact_otp5186_msg01, compact_otp5186_msg02,
+       compact_otp5186_msg03, compact_otp5186_msg04,
+       compact_otp5186_msg05, compact_otp5186_msg06,
+       compact_otp5793_msg01, compact_otp5836_msg01,
+       compact_otp5993_msg01, compact_otp5993_msg02,
+       compact_otp5993_msg03, compact_otp6017_msg01,
+       compact_otp6017_msg02, compact_otp6017_msg03]},
+     {flex_compact_tickets, [],
+      flex_compact_tickets_cases()},
+     {pretty_tickets, [],
+      [pretty_otp4632_msg1, pretty_otp4632_msg2,
+       pretty_otp4632_msg3, pretty_otp4632_msg4,
+       pretty_otp4710_msg1, pretty_otp4710_msg2,
+       pretty_otp4945_msg1, pretty_otp4945_msg2,
+       pretty_otp4945_msg3, pretty_otp4945_msg4,
+       pretty_otp4945_msg5, pretty_otp4945_msg6,
+       pretty_otp4949_msg1, pretty_otp4949_msg2,
+       pretty_otp4949_msg3, pretty_otp5042_msg1,
+       pretty_otp5068_msg1, pretty_otp5085_msg1,
+       pretty_otp5085_msg2, pretty_otp5085_msg3,
+       pretty_otp5085_msg4, pretty_otp5085_msg5,
+       pretty_otp5085_msg6, pretty_otp5085_msg7,
+       pretty_otp5085_msg8, pretty_otp5600_msg1,
+       pretty_otp5600_msg2, pretty_otp5601_msg1,
+       pretty_otp5793_msg01, pretty_otp5803_msg01,
+       pretty_otp5803_msg02, pretty_otp5805_msg01,
+       pretty_otp5836_msg01, pretty_otp5882_msg01,
+       pretty_otp6490_msg01, pretty_otp6490_msg02,
+       pretty_otp6490_msg03, pretty_otp6490_msg04,
+       pretty_otp6490_msg05, pretty_otp6490_msg06,
+       pretty_otp7671_msg01, pretty_otp7671_msg02,
+       pretty_otp7671_msg03, pretty_otp7671_msg04,
+       pretty_otp7671_msg05, pretty_otp8114_msg01]},
+     {flex_pretty_tickets, [], flex_pretty_tickets_cases()}].
+
+init_per_group(flex_pretty_tickets, Config) -> 
+    flex_pretty_init(Config);
+init_per_group(flex_compact_tickets, Config) -> 
+    flex_compact_init(Config);
+init_per_group(flex_compact, Config) -> 
+    flex_compact_init(Config);
+init_per_group(flex_pretty, Config) -> 
+    flex_pretty_init(Config);
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(flex_pretty_tickets, Config) -> 
+    flex_pretty_finish(Config);
+end_per_group(flex_compact_tickets, Config) -> 
+    flex_compact_finish(Config);
+end_per_group(flex_compact, Config) -> 
+    flex_compact_finish(Config);
+end_per_group(flex_pretty, Config) -> 
+    flex_pretty_finish(Config);
+end_per_group(_GroupName, Config) ->
+    Config.
+
+flex_pretty_cases() -> 
+    [flex_pretty_test_msgs].
+
+flex_compact_cases() -> 
+    [flex_compact_test_msgs, flex_compact_dm_timers1,
+     flex_compact_dm_timers2, flex_compact_dm_timers3,
+     flex_compact_dm_timers4, flex_compact_dm_timers5,
+     flex_compact_dm_timers6, flex_compact_dm_timers7,
+     flex_compact_dm_timers8].
 
 %% Support for per_bin was added to ASN.1 as of version
 %% 1.3.2 (R8). And later merged into 1.3.1.3 (R7). These
 %% releases are identical (as far as I know).
 %% 
-per_bin(suite) ->
-    [
-     per_bin_test_msgs
-    ].
-
-
-erl_dist_m(suite) ->
-    [
-     erl_dist_m_test_msgs
-    ].
-
-tickets(suite) ->
-    [
-     compact_tickets,
-     flex_compact_tickets,
-     pretty_tickets,
-     flex_pretty_tickets
-    ].
-
-
-compact_tickets(suite) ->
-    [
-     compact_otp4011_msg1,
-     compact_otp4011_msg2,
-     compact_otp4011_msg3,
-     compact_otp4013_msg1,
-     compact_otp4085_msg1,
-     compact_otp4085_msg2,
-     compact_otp4280_msg1,
-     compact_otp4299_msg1,
-     compact_otp4359_msg1,
-     compact_otp4920_msg0,
-     compact_otp4920_msg1,
-     compact_otp4920_msg2,
-     compact_otp4920_msg3,
-     compact_otp4920_msg4,
-     compact_otp4920_msg5,
-     compact_otp4920_msg6,
-     compact_otp4920_msg7,
-     compact_otp4920_msg8,
-     compact_otp4920_msg9,
-     compact_otp4920_msg10,
-     compact_otp4920_msg11,
-     compact_otp4920_msg12,
-     compact_otp4920_msg20,
-     compact_otp4920_msg21,
-     compact_otp4920_msg22,
-     compact_otp4920_msg23,
-     compact_otp4920_msg24,
-     compact_otp4920_msg25,
-     compact_otp5186_msg01,
-     compact_otp5186_msg02,
-     compact_otp5186_msg03,
-     compact_otp5186_msg04,
-     compact_otp5186_msg05,
-     compact_otp5186_msg06,
-     compact_otp5793_msg01,
-     compact_otp5836_msg01,
-     compact_otp5993_msg01,
-     compact_otp5993_msg02,
-     compact_otp5993_msg03,
-     compact_otp6017_msg01,
-     compact_otp6017_msg02,
-     compact_otp6017_msg03
-    ].
-
-
-flex_compact_tickets(suite) ->
-    {req, [],
-     {conf, flex_compact_init, flex_compact_tickets_cases(),
-      flex_compact_finish}}.
  
-flex_compact_tickets_cases() ->
-    [
-     flex_compact_otp4299_msg1,
-     flex_compact_otp7431_msg01,
-     flex_compact_otp7431_msg02,
-     flex_compact_otp7431_msg03, 
-     flex_compact_otp7431_msg04,
-     flex_compact_otp7431_msg05,
-     flex_compact_otp7431_msg06,
-     flex_compact_otp7431_msg07
-    ].
-
-		
-pretty_tickets(suite) ->
-    [
-     pretty_otp4632_msg1,
-     pretty_otp4632_msg2,
-     pretty_otp4632_msg3,
-     pretty_otp4632_msg4,
-     pretty_otp4710_msg1,
-     pretty_otp4710_msg2,
-     pretty_otp4945_msg1,
-     pretty_otp4945_msg2,
-     pretty_otp4945_msg3,
-     pretty_otp4945_msg4,
-     pretty_otp4945_msg5,
-     pretty_otp4945_msg6,
-     pretty_otp4949_msg1,
-     pretty_otp4949_msg2,
-     pretty_otp4949_msg3,
-     pretty_otp5042_msg1,
-     pretty_otp5068_msg1,
-     pretty_otp5085_msg1,
-     pretty_otp5085_msg2,
-     pretty_otp5085_msg3,
-     pretty_otp5085_msg4,
-     pretty_otp5085_msg5,
-     pretty_otp5085_msg6,
-     pretty_otp5085_msg7,
-     pretty_otp5085_msg8,
-     pretty_otp5600_msg1,
-     pretty_otp5600_msg2,
-     pretty_otp5601_msg1,
-     pretty_otp5793_msg01,
-     pretty_otp5803_msg01,
-     pretty_otp5803_msg02,
-     pretty_otp5805_msg01,
-     pretty_otp5836_msg01,
-     pretty_otp5882_msg01,
-     pretty_otp6490_msg01,
-     pretty_otp6490_msg02,
-     pretty_otp6490_msg03,
-     pretty_otp6490_msg04,
-     pretty_otp6490_msg05,
-     pretty_otp6490_msg06,
-     pretty_otp7671_msg01,
-     pretty_otp7671_msg02,
-     pretty_otp7671_msg03,
-     pretty_otp7671_msg04,
-     pretty_otp7671_msg05,
-     pretty_otp8114_msg01
-    ].
+flex_compact_tickets_cases() -> 
+    [flex_compact_otp4299_msg1, flex_compact_otp7431_msg01,
+     flex_compact_otp7431_msg02, flex_compact_otp7431_msg03,
+     flex_compact_otp7431_msg04, flex_compact_otp7431_msg05,
+     flex_compact_otp7431_msg06, flex_compact_otp7431_msg07].
+
+flex_pretty_tickets_cases() -> 
+    [flex_pretty_otp5042_msg1, flex_pretty_otp5085_msg1,
+     flex_pretty_otp5085_msg2, flex_pretty_otp5085_msg3,
+     flex_pretty_otp5085_msg4, flex_pretty_otp5085_msg5,
+     flex_pretty_otp5085_msg6, flex_pretty_otp5085_msg7,
+     flex_pretty_otp5085_msg8, flex_pretty_otp5600_msg1,
+     flex_pretty_otp5600_msg2, flex_pretty_otp5601_msg1,
+     flex_pretty_otp5793_msg01, flex_pretty_otp5803_msg01,
+     flex_pretty_otp5803_msg02, flex_pretty_otp5805_msg01,
+     flex_pretty_otp5836_msg01, flex_pretty_otp7431_msg01,
+     flex_pretty_otp7431_msg02, flex_pretty_otp7431_msg03,
+     flex_pretty_otp7431_msg04, flex_pretty_otp7431_msg05,
+     flex_pretty_otp7431_msg06, flex_pretty_otp7431_msg07].
 
+%% ----
 
-flex_pretty_tickets(suite) ->
-    {req, [],
-     {conf, flex_pretty_init, flex_pretty_tickets_cases(),
-      flex_pretty_finish}}.
- 
-flex_pretty_tickets_cases() ->
-    [
-     flex_pretty_otp5042_msg1,
-     flex_pretty_otp5085_msg1,
-     flex_pretty_otp5085_msg2,
-     flex_pretty_otp5085_msg3,
-     flex_pretty_otp5085_msg4,
-     flex_pretty_otp5085_msg5,
-     flex_pretty_otp5085_msg6,
-     flex_pretty_otp5085_msg7,
-     flex_pretty_otp5085_msg8,
-     flex_pretty_otp5600_msg1,
-     flex_pretty_otp5600_msg2,
-     flex_pretty_otp5601_msg1,
-     flex_pretty_otp5793_msg01,
-     flex_pretty_otp5803_msg01,
-     flex_pretty_otp5803_msg02,
-     flex_pretty_otp5805_msg01,
-     flex_pretty_otp5836_msg01,
-     flex_pretty_otp7431_msg01,
-     flex_pretty_otp7431_msg02,
-     flex_pretty_otp7431_msg03, 
-     flex_pretty_otp7431_msg04,
-     flex_pretty_otp7431_msg05,
-     flex_pretty_otp7431_msg06,
-     flex_pretty_otp7431_msg07
-    ].
+tickets() ->
+    Flag  = process_flag(trap_exit, true),    
+    Cases = expand(tickets),
+    Fun   = fun(Case) ->
+		    C = init_per_testcase(Case, [{tc_timeout, 
+						  timer:minutes(10)}]),
+		    io:format("Eval ~w~n", [Case]),
+		    Result = 
+			case (catch apply(?MODULE, Case, [C])) of
+			    {'EXIT', Reason} ->
+ 				io:format("~n~p exited:~n   ~p~n", 
+ 					  [Case, Reason]),
+				{error, {Case, Reason}};
+			    Res ->
+				Res
+			end,
+		    end_per_testcase(Case, C),
+		    Result
+	    end,
+    process_flag(trap_exit, Flag),
+    lists:map(Fun, Cases).
 
 		
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_codec_test.erl b/lib/megaco/test/megaco_codec_test.erl
index d247959cc5..8391024c3f 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -36,8 +36,8 @@ t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 init_per_testcase(Case, Config) ->
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 init() ->
     process_flag(trap_exit, true),
@@ -47,17 +47,24 @@ init() ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     codec
-    ].
-
-codec(suite) ->
-    [{megaco_codec_mini_test,   all}, 
-     {megaco_codec_v1_test,     all}, 
-     {megaco_codec_v2_test,     all}, 
-     {megaco_codec_prev3a_test, all}, 
-     {megaco_codec_prev3b_test, all}, 
-     {megaco_codec_prev3c_test, all}, 
-     {megaco_codec_v3_test,     all}].
+all() -> 
+    [{group, codec}].
+
+groups() -> 
+    [{codec, [],
+      [{megaco_codec_mini_test, all},
+       {megaco_codec_v1_test, all},
+       {megaco_codec_v2_test, all},
+       {megaco_codec_prev3a_test, all},
+       {megaco_codec_prev3b_test, all},
+       {megaco_codec_prev3c_test, all},
+       {megaco_codec_v3_test, all}]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 
diff --git a/lib/megaco/test/megaco_codec_test_lib.erl b/lib/megaco/test/megaco_codec_test_lib.erl
index 66e8a52a24..0a903f5617 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
diff --git a/lib/megaco/test/megaco_codec_v1_test.erl b/lib/megaco/test/megaco_codec_v1_test.erl
index 7f2af37282..3a548c4d9e 100644
--- a/lib/megaco/test/megaco_codec_v1_test.erl
+++ b/lib/megaco/test/megaco_codec_v1_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -26,6 +26,10 @@
 
 %% ----
 
+-compile({no_auto_import,[error/1]}).
+
+%% ----
+
 -include_lib("megaco/include/megaco.hrl").
 -include_lib("megaco/include/megaco_message_v1.hrl").
 -include("megaco_test_lib.hrl").
@@ -38,22 +42,16 @@
 
 -export([t/0, t/1]).
 
--export([all/1, 
-
-	 text/1, 
-
-	 pretty/1, 
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, 
+	 
 	 pretty_test_msgs/1, 
-
-	 compact/1, 
+	 
 	 compact_test_msgs/1,
-
-	 flex_pretty/1, 
+	 
 	 flex_pretty_init/1, 
 	 flex_pretty_finish/1, 
 	 flex_pretty_test_msgs/1,
-
-	 flex_compact/1, 
+	 
 	 flex_compact_init/1, 
 	 flex_compact_finish/1, 
 	 flex_compact_test_msgs/1,
@@ -63,32 +61,21 @@
 	 flex_compact_dm_timers4/1, 
 	 flex_compact_dm_timers5/1, 
 	 flex_compact_dm_timers6/1, 
-
-	 binary/1, 
 	 
-	 bin/1, 
 	 bin_test_msgs/1,
-
-	 ber/1, 
+	 
 	 ber_test_msgs/1, 
-
-	 ber_bin/1, 
+	 
 	 ber_bin_test_msgs/1, 
-
-	 per/1,
+	
 	 per_test_msgs/1,
-
-	 per_bin/1,
+	
 	 per_bin_test_msgs/1,
-
-	 erl_dist/1,
-	 erl_dist_m/1,
+	
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
-	 tickets/1, 
-
-	 compact_tickets/1, 
+	 
 	 compact_otp4011_msg1/1, 
 	 compact_otp4011_msg2/1,
 	 compact_otp4011_msg3/1,
@@ -131,8 +118,7 @@
 	 compact_otp6017_msg01/1, 
 	 compact_otp6017_msg02/1, 
 	 compact_otp6017_msg03/1, 
-
-	 flex_compact_tickets/1, 
+	 
          flex_compact_otp7431_msg01a/1,
          flex_compact_otp7431_msg01b/1,
          flex_compact_otp7431_msg02/1,
@@ -141,8 +127,7 @@
          flex_compact_otp7431_msg05/1,
          flex_compact_otp7431_msg06/1,
          flex_compact_otp7431_msg07/1,
-
-	 pretty_tickets/1, 
+	 
 	 pretty_otp4632_msg1/1, 
 	 pretty_otp4632_msg2/1, 
 	 pretty_otp4632_msg3/1, 
@@ -184,7 +169,6 @@
          pretty_otp7671_msg04/1,
          pretty_otp7671_msg05/1,
 	 
-	 flex_pretty_tickets/1, 
 	 flex_pretty_otp5042_msg1/1, 
 	 flex_pretty_otp5085_msg1/1, 
 	 flex_pretty_otp5085_msg2/1, 
@@ -205,7 +189,7 @@
          flex_pretty_otp7431_msg06/1,
          flex_pretty_otp7431_msg07/1,
 
-	 init_per_testcase/2, fin_per_testcase/2]).  
+	 init_per_testcase/2, end_per_testcase/2]).  
 
 -export([display_text_messages/0, generate_text_messages/0]).
 
@@ -451,31 +435,6 @@ expand([Case|Cases], Acc) ->
 	    expand(Cases, [Case|Acc])
     end.
 
-	    
-%% ----
-
-tickets() ->
-    Flag  = process_flag(trap_exit, true),    
-    Cases = expand(tickets),
-    Fun   = fun(Case) ->
-		    C = init_per_testcase(Case, [{tc_timeout, 
-						  timer:minutes(10)}]),
-		    io:format("Eval ~w~n", [Case]),
-		    Result = 
-			case (catch apply(?MODULE, Case, [C])) of
-			    {'EXIT', Reason} ->
- 				io:format("~n~p exited:~n   ~p~n", 
- 					  [Case, Reason]),
-				{error, {Case, Reason}};
-			    Res ->
-				Res
-			end,
-		    fin_per_testcase(Case, C),
-		    Result
-	    end,
-    process_flag(trap_exit, Flag),
-    lists:map(Fun, Cases).
-
 
 %% ----
 
@@ -494,265 +453,210 @@ init_per_testcase(Case, Config) ->
 	end,
     megaco_test_lib:init_per_testcase(Case, C).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     erase(verbosity),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     text,
-     binary,
-     erl_dist,
-     tickets
-    ].
-
-text(suite) ->
-    [
-     pretty,
-     flex_pretty,
-     compact,
-     flex_compact
-    ].
-
-binary(suite) ->
-    [
-     bin,
-     ber,
-     ber_bin,
-     per,
-     per_bin
-    ].
-
-erl_dist(suite) ->
-    [
-     erl_dist_m
-    ].
-
-pretty(suite) ->
-    [
-     pretty_test_msgs
-    ].
-
-
-compact(suite) ->
-    [
-     compact_test_msgs
-    ].
-
-
-flex_pretty(suite) ->
-    {req, [], 
-     {conf, flex_pretty_init, flex_pretty_cases(), flex_pretty_finish}}.
-
-flex_pretty_cases() ->
-    [
-     flex_pretty_test_msgs
-    ].
-
-
-flex_compact(suite) ->
-    {req, [], 
-     {conf, flex_compact_init, flex_compact_cases(), flex_compact_finish}}.
-
-flex_compact_cases() ->
-    [
-     flex_compact_test_msgs,
-
-     flex_compact_dm_timers1,
-     flex_compact_dm_timers2,
-     flex_compact_dm_timers3,
-     flex_compact_dm_timers4,
-     flex_compact_dm_timers5,
-     flex_compact_dm_timers6
-    ].
-
-
-bin(suite) ->
-    [
-     bin_test_msgs
-    ].
-
-
-ber(suite) ->
+all() -> 
     [
-     ber_test_msgs
-    ].
-
-
-ber_bin(suite) ->
-    [
-     ber_bin_test_msgs
-    ].
-
-
-per(suite) ->
-    [
-     per_test_msgs
+     {group, text}, 
+     {group, binary}, 
+     {group, erl_dist},
+     {group, tickets}
     ].
 
+groups() -> 
+    [{text,            [], [{group, pretty}, 
+			    {group, flex_pretty},
+			    {group, compact}, 
+			    {group, flex_compact}]},
+     {binary,          [], [{group, bin}, 
+			    {group, ber}, 
+			    {group, ber_bin},
+			    {group, per}, 
+			    {group, per_bin}]},
+     {erl_dist,        [], [{group, erl_dist_m}]},
+     {pretty,          [], [pretty_test_msgs]},
+     {compact,         [], [compact_test_msgs]},
+     {flex_pretty,     [], flex_pretty_cases()},
+     {flex_compact,    [], flex_compact_cases()},
+     {bin,             [], [bin_test_msgs]}, 
+     {ber,             [], [ber_test_msgs]},
+     {ber_bin,         [], [ber_bin_test_msgs]},
+     {per,             [], [per_test_msgs]},
+     {per_bin,         [], [per_bin_test_msgs]},
+     {erl_dist_m,      [], [erl_dist_m_test_msgs]},
+     {tickets,         [], [{group, compact_tickets}, 
+			    {group, pretty_tickets},
+			    {group, flex_compact_tickets},
+			    {group, flex_pretty_tickets}]},
+     {compact_tickets, [], [compact_otp4011_msg1, 
+			    compact_otp4011_msg2,
+			    compact_otp4011_msg3, 
+			    compact_otp4013_msg1,
+			    compact_otp4085_msg1, 
+			    compact_otp4085_msg2,
+			    compact_otp4280_msg1, 
+			    compact_otp4299_msg1,
+			    compact_otp4299_msg2, 
+			    compact_otp4359_msg1,
+			    compact_otp4920_msg0, 
+			    compact_otp4920_msg1,
+			    compact_otp4920_msg2, 
+			    compact_otp4920_msg3,
+			    compact_otp4920_msg4, 
+			    compact_otp4920_msg5,
+			    compact_otp4920_msg6, 
+			    compact_otp4920_msg7,
+			    compact_otp4920_msg8, 
+			    compact_otp4920_msg9,
+			    compact_otp4920_msg10, 
+			    compact_otp4920_msg11,
+			    compact_otp4920_msg12, 
+			    compact_otp4920_msg20,
+			    compact_otp4920_msg21, 
+			    compact_otp4920_msg22,
+			    compact_otp4920_msg23, 
+			    compact_otp4920_msg24,
+			    compact_otp4920_msg25, 
+			    compact_otp5186_msg01,
+			    compact_otp5186_msg02, 
+			    compact_otp5186_msg03,
+			    compact_otp5186_msg04, 
+			    compact_otp5186_msg05,
+			    compact_otp5186_msg06, 
+			    compact_otp5793_msg01,
+			    compact_otp5993_msg01, 
+			    compact_otp5993_msg02,
+			    compact_otp5993_msg03, 
+			    compact_otp6017_msg01,
+			    compact_otp6017_msg02, 
+			    compact_otp6017_msg03]},
+     {flex_compact_tickets, [], flex_compact_tickets_cases()},
+     {pretty_tickets,       [], [pretty_otp4632_msg1, 
+				 pretty_otp4632_msg2,
+				 pretty_otp4632_msg3, 
+				 pretty_otp4632_msg4,
+				 pretty_otp4710_msg1, 
+				 pretty_otp4710_msg2,
+				 pretty_otp4945_msg1, 
+				 pretty_otp4945_msg2,
+				 pretty_otp4945_msg3, 
+				 pretty_otp4945_msg4,
+				 pretty_otp4945_msg5, 
+				 pretty_otp4945_msg6,
+				 pretty_otp4949_msg1, 
+				 pretty_otp4949_msg2,
+				 pretty_otp4949_msg3, 
+				 pretty_otp5042_msg1,
+				 pretty_otp5068_msg1, 
+				 pretty_otp5085_msg1,
+				 pretty_otp5085_msg2, 
+				 pretty_otp5085_msg3,
+				 pretty_otp5085_msg4, 
+				 pretty_otp5085_msg5,
+				 pretty_otp5085_msg6, 
+				 pretty_otp5085_msg7,
+				 pretty_otp5600_msg1, 
+				 pretty_otp5600_msg2,
+				 pretty_otp5601_msg1, 
+				 pretty_otp5793_msg01,
+				 pretty_otp5882_msg01, 
+				 pretty_otp6490_msg01,
+				 pretty_otp6490_msg02, 
+				 pretty_otp6490_msg03,
+				 pretty_otp6490_msg04, 
+				 pretty_otp6490_msg05,
+				 pretty_otp6490_msg06, 
+				 pretty_otp7671_msg01,
+				 pretty_otp7671_msg02, 
+				 pretty_otp7671_msg03,
+				 pretty_otp7671_msg04, 
+				 pretty_otp7671_msg05]},
+     {flex_pretty_tickets,  [], flex_pretty_tickets_cases()}].
+
+init_per_group(flex_pretty_tickets, Config) -> 
+    flex_pretty_init(Config);
+init_per_group(flex_compact_tickets, Config) -> 
+    flex_compact_init(Config);
+init_per_group(flex_compact, Config) -> 
+    flex_compact_init(Config);
+init_per_group(flex_pretty, Config) -> 
+    flex_pretty_init(Config);
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(flex_pretty_tickets, Config) -> 
+    flex_pretty_finish(Config);
+end_per_group(flex_compact_tickets, Config) -> 
+    flex_compact_finish(Config);
+end_per_group(flex_compact, Config) -> 
+    flex_compact_finish(Config);
+end_per_group(flex_pretty, Config) -> 
+    flex_pretty_finish(Config);
+end_per_group(_GroupName, Config) ->
+    Config.
+
+flex_pretty_cases() -> 
+    [flex_pretty_test_msgs].
+
+flex_compact_cases() -> 
+    [flex_compact_test_msgs, flex_compact_dm_timers1,
+     flex_compact_dm_timers2, flex_compact_dm_timers3,
+     flex_compact_dm_timers4, flex_compact_dm_timers5,
+     flex_compact_dm_timers6].
 
 %% Support for per_bin was added to ASN.1 as of version
 %% 1.3.2 (R8). And later merged into 1.3.1.3 (R7). These
 %% releases are identical (as far as I know).
 %% 
-per_bin(suite) ->
-    [
-     per_bin_test_msgs
-    ].
-
-erl_dist_m(suite) ->
-    [
-     erl_dist_m_test_msgs
-    ].
 
-tickets(suite) ->
-    [
-     compact_tickets,
-     pretty_tickets,
-     flex_compact_tickets,
-     flex_pretty_tickets
-    ].
+flex_compact_tickets_cases() -> 
+    [flex_compact_otp7431_msg01a,
+     flex_compact_otp7431_msg01b, flex_compact_otp7431_msg02,
+     flex_compact_otp7431_msg03, flex_compact_otp7431_msg04,
+     flex_compact_otp7431_msg05, flex_compact_otp7431_msg06,
+     flex_compact_otp7431_msg07].
+
+flex_pretty_tickets_cases() -> 
+    [flex_pretty_otp5042_msg1, flex_pretty_otp5085_msg1,
+     flex_pretty_otp5085_msg2, flex_pretty_otp5085_msg3,
+     flex_pretty_otp5085_msg4, flex_pretty_otp5085_msg5,
+     flex_pretty_otp5085_msg6, flex_pretty_otp5085_msg7,
+     flex_pretty_otp5600_msg1, flex_pretty_otp5600_msg2,
+     flex_pretty_otp5601_msg1, flex_pretty_otp5793_msg01,
+     flex_pretty_otp7431_msg01, flex_pretty_otp7431_msg02,
+     flex_pretty_otp7431_msg03, flex_pretty_otp7431_msg04,
+     flex_pretty_otp7431_msg05, flex_pretty_otp7431_msg06,
+     flex_pretty_otp7431_msg07].
 
+%% ----
 
-compact_tickets(suite) ->
-    [
-     compact_otp4011_msg1,
-     compact_otp4011_msg2,
-     compact_otp4011_msg3,
-     compact_otp4013_msg1,
-     compact_otp4085_msg1,
-     compact_otp4085_msg2,
-     compact_otp4280_msg1,
-     compact_otp4299_msg1,
-     compact_otp4299_msg2,
-     compact_otp4359_msg1,
-     compact_otp4920_msg0,
-     compact_otp4920_msg1,
-     compact_otp4920_msg2,
-     compact_otp4920_msg3,
-     compact_otp4920_msg4,
-     compact_otp4920_msg5,
-     compact_otp4920_msg6,
-     compact_otp4920_msg7,
-     compact_otp4920_msg8,
-     compact_otp4920_msg9,
-     compact_otp4920_msg10,
-     compact_otp4920_msg11,
-     compact_otp4920_msg12,
-     compact_otp4920_msg20,
-     compact_otp4920_msg21,
-     compact_otp4920_msg22,
-     compact_otp4920_msg23,
-     compact_otp4920_msg24,
-     compact_otp4920_msg25,
-     compact_otp5186_msg01,
-     compact_otp5186_msg02,
-     compact_otp5186_msg03,
-     compact_otp5186_msg04,
-     compact_otp5186_msg05,
-     compact_otp5186_msg06,
-     compact_otp5793_msg01,
-     compact_otp5993_msg01,
-     compact_otp5993_msg02,
-     compact_otp5993_msg03,
-     compact_otp6017_msg01,
-     compact_otp6017_msg02,
-     compact_otp6017_msg03
-    ].
-
-flex_compact_tickets(suite) ->
-    {req, [], 
-     {conf, flex_compact_init, flex_compact_tickets_cases(), 
-      flex_compact_finish}}.
-
-flex_compact_tickets_cases() ->
-    [
-     flex_compact_otp7431_msg01a,
-     flex_compact_otp7431_msg01b,
-     flex_compact_otp7431_msg02,
-     flex_compact_otp7431_msg03, 
-     flex_compact_otp7431_msg04,
-     flex_compact_otp7431_msg05,
-     flex_compact_otp7431_msg06,
-     flex_compact_otp7431_msg07
-    ].
-
-
-pretty_tickets(suite) ->
-    [
-     pretty_otp4632_msg1,
-     pretty_otp4632_msg2,
-     pretty_otp4632_msg3,
-     pretty_otp4632_msg4,
-     pretty_otp4710_msg1,
-     pretty_otp4710_msg2,
-     pretty_otp4945_msg1,
-     pretty_otp4945_msg2,
-     pretty_otp4945_msg3,
-     pretty_otp4945_msg4,
-     pretty_otp4945_msg5,
-     pretty_otp4945_msg6,
-     pretty_otp4949_msg1,
-     pretty_otp4949_msg2,
-     pretty_otp4949_msg3,
-     pretty_otp5042_msg1,
-     pretty_otp5068_msg1,
-     pretty_otp5085_msg1,
-     pretty_otp5085_msg2,
-     pretty_otp5085_msg3,
-     pretty_otp5085_msg4,
-     pretty_otp5085_msg5,
-     pretty_otp5085_msg6,
-     pretty_otp5085_msg7,
-     pretty_otp5600_msg1,
-     pretty_otp5600_msg2,
-     pretty_otp5601_msg1,
-     pretty_otp5793_msg01,
-     pretty_otp5882_msg01,
-     pretty_otp6490_msg01,
-     pretty_otp6490_msg02,
-     pretty_otp6490_msg03,
-     pretty_otp6490_msg04,
-     pretty_otp6490_msg05,
-     pretty_otp6490_msg06,
-     pretty_otp7671_msg01,
-     pretty_otp7671_msg02,
-     pretty_otp7671_msg03,
-     pretty_otp7671_msg04,
-     pretty_otp7671_msg05
-    ].
-
-flex_pretty_tickets(suite) ->
-    {req, [], 
-     {conf, flex_pretty_init, flex_pretty_tickets_cases(), 
-      flex_pretty_finish}}.
-
-flex_pretty_tickets_cases() ->
-    [
-     flex_pretty_otp5042_msg1,
-     flex_pretty_otp5085_msg1,
-     flex_pretty_otp5085_msg2,
-     flex_pretty_otp5085_msg3,
-     flex_pretty_otp5085_msg4,
-     flex_pretty_otp5085_msg5,
-     flex_pretty_otp5085_msg6,
-     flex_pretty_otp5085_msg7,
-     flex_pretty_otp5600_msg1,
-     flex_pretty_otp5600_msg2,
-     flex_pretty_otp5601_msg1,
-     flex_pretty_otp5793_msg01,
-     flex_pretty_otp7431_msg01,
-     flex_pretty_otp7431_msg02,
-     flex_pretty_otp7431_msg03, 
-     flex_pretty_otp7431_msg04,
-     flex_pretty_otp7431_msg05,
-     flex_pretty_otp7431_msg06,
-     flex_pretty_otp7431_msg07
-    ].
+tickets() ->
+    Flag  = process_flag(trap_exit, true),    
+    Cases = expand(tickets),
+    Fun   = fun(Case) ->
+		    C = init_per_testcase(Case, [{tc_timeout, 
+						  timer:minutes(10)}]),
+		    io:format("Eval ~w~n", [Case]),
+		    Result = 
+			case (catch apply(?MODULE, Case, [C])) of
+			    {'EXIT', Reason} ->
+ 				io:format("~n~p exited:~n   ~p~n", 
+ 					  [Case, Reason]),
+				{error, {Case, Reason}};
+			    Res ->
+				Res
+			end,
+		    end_per_testcase(Case, C),
+		    Result
+	    end,
+    process_flag(trap_exit, Flag),
+    lists:map(Fun, Cases).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_codec_v2_test.erl b/lib/megaco/test/megaco_codec_v2_test.erl
index 1df1c6c93b..c3a80febba 100644
--- a/lib/megaco/test/megaco_codec_v2_test.erl
+++ b/lib/megaco/test/megaco_codec_v2_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -37,22 +37,16 @@
 
 -export([t/0, t/1]).
 
--export([all/1, 
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, 
 
-	 text/1, 
-
-	 pretty/1, 
 	 pretty_test_msgs/1, 
 
-	 compact/1, 
 	 compact_test_msgs/1, 
-
-	 flex_pretty/1, 
+	 
 	 flex_pretty_init/1, 
 	 flex_pretty_finish/1, 
 	 flex_pretty_test_msgs/1,
-
-	 flex_compact/1, 
+	 
 	 flex_compact_init/1, 
 	 flex_compact_finish/1, 
 	 flex_compact_test_msgs/1,
@@ -65,32 +59,21 @@
 	 flex_compact_dm_timers6/1, 
 	 flex_compact_dm_timers7/1, 
 	 flex_compact_dm_timers8/1, 
-
-	 binary/1, 
 	 
-	 bin/1, 
 	 bin_test_msgs/1,
 
-	 ber/1, 
 	 ber_test_msgs/1, 
-
-	 ber_bin/1, 
+	 
 	 ber_bin_test_msgs/1, 
-
-	 per/1,
+	
 	 per_test_msgs/1,
-
-	 per_bin/1,
+	
 	 per_bin_test_msgs/1,
-
-	 erl_dist/1,
-	 erl_dist_m/1,
+	
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
-	 tickets/1, 
-
-	 compact_tickets/1, 
+	 
 	 compact_otp4011_msg1/1, 
 	 compact_otp4011_msg2/1,
 	 compact_otp4011_msg3/1,
@@ -143,8 +126,7 @@
 	 compact_otp7534_msg01/1,
 	 compact_otp7576_msg01/1,
          compact_otp7671_msg01/1,
-
-	 flex_compact_tickets/1, 
+	 
 	 flex_compact_otp7138_msg01/1, 
 	 flex_compact_otp7138_msg02/1, 
          flex_compact_otp7431_msg01/1,
@@ -160,8 +142,7 @@
          flex_compact_otp7534_msg01/1,
          flex_compact_otp7573_msg01/1,
 	 flex_compact_otp7576_msg01/1, 
-
-	 pretty_tickets/1, 
+	 
 	 pretty_otp4632_msg1/1, 
 	 pretty_otp4632_msg2/1, 
 	 pretty_otp4632_msg3/1, 
@@ -204,7 +185,6 @@
          pretty_otp7671_msg04/1,
          pretty_otp7671_msg05/1,
 	 
-	 flex_pretty_tickets/1, 
 	 flex_pretty_otp5042_msg1/1, 
 	 flex_pretty_otp5085_msg1/1, 
 	 flex_pretty_otp5085_msg2/1, 
@@ -225,7 +205,7 @@
          flex_pretty_otp7431_msg06/1,
          flex_pretty_otp7431_msg07/1,
 
-	 init_per_testcase/2, fin_per_testcase/2]).  
+	 init_per_testcase/2, end_per_testcase/2]).  
 
 -export([display_text_messages/0, generate_text_messages/0]).
 
@@ -431,31 +411,7 @@ expand([Case|Cases], Acc) ->
 	    expand(Cases, [Case|Acc])
     end.
 
-	    
-%% ----
-
-tickets() ->
-    Flag  = process_flag(trap_exit, true),    
-    Cases = expand(tickets),
-    Fun   = fun(Case) ->
-		    C = init_per_testcase(Case, [{tc_timeout, 
-						  timer:minutes(10)}]),
-		    io:format("Eval ~w~n", [Case]),
-		    Result = 
-			case (catch apply(?MODULE, Case, [C])) of
-			    {'EXIT', Reason} ->
- 				io:format("~n~p exited:~n   ~p~n", 
- 					  [Case, Reason]),
-				{error, {Case, Reason}};
-			    Res ->
-				Res
-			end,
-		    fin_per_testcase(Case, C),
-		    Result
-	    end,
-    process_flag(trap_exit, Flag),
-    lists:map(Fun, Cases).
-
+	   
 
 %% ----
 
@@ -474,284 +430,202 @@ init_per_testcase(Case, Config) ->
 	end,
     megaco_test_lib:init_per_testcase(Case, C).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     erase(verbosity),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     text,
-     binary,
-     erl_dist,
-     tickets
-    ].
-
-text(suite) ->
-    [
-     pretty,
-     flex_pretty,
-     compact,
-     flex_compact
-    ].
-
-binary(suite) ->
-    [
-     bin,
-     ber,
-     ber_bin,
-     per,
-     per_bin
-    ].
-
-erl_dist(suite) ->
-    [
-     erl_dist_m
-    ].
-
-pretty(suite) ->
-    [
-     pretty_test_msgs
-    ].
-
-
-compact(suite) ->
-    [
-     compact_test_msgs
-    ].
+all() -> 
+[{group, text}, {group, binary}, {group, erl_dist},
+ {group, tickets}].
+
+groups() -> 
+    [{text, [],
+  [{group, pretty}, {group, flex_pretty},
+   {group, compact}, {group, flex_compact}]},
+ {binary, [],
+  [{group, bin}, {group, ber}, {group, ber_bin},
+   {group, per}, {group, per_bin}]},
+ {erl_dist, [], [{group, erl_dist_m}]},
+ {pretty, [], [pretty_test_msgs]},
+ {compact, [], [compact_test_msgs]},
+ {flex_pretty, [], flex_pretty_cases()},
+ {flex_compact, [], flex_compact_cases()},
+ {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
+ {ber_bin, [], [ber_bin_test_msgs]},
+ {per, [], [per_test_msgs]},
+ {per_bin, [], [per_bin_test_msgs]},
+ {erl_dist_m, [], [erl_dist_m_test_msgs]},
+ {tickets, [],
+  [{group, compact_tickets}, {group, pretty_tickets},
+   {group, flex_compact_tickets},
+   {group, flex_pretty_tickets}]},
+ {compact_tickets, [],
+  [compact_otp4011_msg1, compact_otp4011_msg2,
+   compact_otp4011_msg3, compact_otp4013_msg1,
+   compact_otp4085_msg1, compact_otp4085_msg2,
+   compact_otp4280_msg1, compact_otp4299_msg1,
+   compact_otp4299_msg2, compact_otp4359_msg1,
+   compact_otp4920_msg0, compact_otp4920_msg1,
+   compact_otp4920_msg2, compact_otp4920_msg3,
+   compact_otp4920_msg4, compact_otp4920_msg5,
+   compact_otp4920_msg6, compact_otp4920_msg7,
+   compact_otp4920_msg8, compact_otp4920_msg9,
+   compact_otp4920_msg10, compact_otp4920_msg11,
+   compact_otp4920_msg12, compact_otp4920_msg20,
+   compact_otp4920_msg21, compact_otp4920_msg22,
+   compact_otp4920_msg23, compact_otp4920_msg24,
+   compact_otp4920_msg25, compact_otp5186_msg01,
+   compact_otp5186_msg02, compact_otp5186_msg03,
+   compact_otp5186_msg04, compact_otp5186_msg05,
+   compact_otp5186_msg06, compact_otp5290_msg01,
+   compact_otp5290_msg02, compact_otp5793_msg01,
+   compact_otp5993_msg01, compact_otp5993_msg02,
+   compact_otp5993_msg03, compact_otp6017_msg01,
+   compact_otp6017_msg02, compact_otp6017_msg03,
+   compact_otp7138_msg01, compact_otp7138_msg02,
+   compact_otp7457_msg01, compact_otp7457_msg02,
+   compact_otp7457_msg03, compact_otp7534_msg01,
+   compact_otp7576_msg01, compact_otp7671_msg01]},
+ {flex_compact_tickets, [],
+  flex_compact_tickets_cases()},
+ {pretty_tickets, [],
+  [pretty_otp4632_msg1, pretty_otp4632_msg2,
+   pretty_otp4632_msg3, pretty_otp4632_msg4,
+   pretty_otp4710_msg1, pretty_otp4710_msg2,
+   pretty_otp4945_msg1, pretty_otp4945_msg2,
+   pretty_otp4945_msg3, pretty_otp4945_msg4,
+   pretty_otp4945_msg5, pretty_otp4945_msg6,
+   pretty_otp4949_msg1, pretty_otp4949_msg2,
+   pretty_otp4949_msg3, pretty_otp5042_msg1,
+   pretty_otp5068_msg1, pretty_otp5085_msg1,
+   pretty_otp5085_msg2, pretty_otp5085_msg3,
+   pretty_otp5085_msg4, pretty_otp5085_msg5,
+   pretty_otp5085_msg6, pretty_otp5085_msg7,
+   pretty_otp5600_msg1, pretty_otp5600_msg2,
+   pretty_otp5601_msg1, pretty_otp5793_msg01,
+   pretty_otp5882_msg01, pretty_otp6490_msg01,
+   pretty_otp6490_msg02, pretty_otp6490_msg03,
+   pretty_otp6490_msg04, pretty_otp6490_msg05,
+   pretty_otp6490_msg06, pretty_otp7249_msg01,
+   pretty_otp7671_msg01, pretty_otp7671_msg02,
+   pretty_otp7671_msg03, pretty_otp7671_msg04,
+   pretty_otp7671_msg05]},
+ {flex_pretty_tickets, [], flex_pretty_tickets_cases()}].
+
+init_per_group(flex_pretty_tickets, Config) -> 
+	flex_pretty_init(Config);
+init_per_group(flex_compact_tickets, Config) -> 
+	flex_compact_init(Config);
+init_per_group(flex_compact, Config) -> 
+	flex_compact_init(Config);
+init_per_group(flex_pretty, Config) -> 
+	flex_pretty_init(Config);
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(flex_pretty_tickets, Config) -> 
+	flex_pretty_finish(Config);
+end_per_group(flex_compact_tickets, Config) -> 
+	flex_compact_finish(Config);
+end_per_group(flex_compact, Config) -> 
+	flex_compact_finish(Config);
+end_per_group(flex_pretty, Config) -> 
+	flex_pretty_finish(Config);
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+
+
+
+
+
+
+
+
+flex_pretty_cases() -> 
+[flex_pretty_test_msgs].
+
+
+flex_compact_cases() -> 
+[flex_compact_test_msgs, flex_compact_dm_timers1,
+ flex_compact_dm_timers2, flex_compact_dm_timers3,
+ flex_compact_dm_timers4, flex_compact_dm_timers5,
+ flex_compact_dm_timers6, flex_compact_dm_timers7,
+ flex_compact_dm_timers8].
 
 
-flex_pretty(suite) ->
-    {req, [], 
-     {conf, flex_pretty_init, flex_pretty_cases(), flex_pretty_finish}}.
 
-flex_pretty_cases() ->
-    [
-     flex_pretty_test_msgs
-    ].
 
-flex_compact(suite) ->
-    {req, [], 
-     {conf, flex_compact_init, flex_compact_cases(), flex_compact_finish}}.
 
-flex_compact_cases() ->
-    [
-     flex_compact_test_msgs,
-     flex_compact_dm_timers1,
-     flex_compact_dm_timers2,
-     flex_compact_dm_timers3,
-     flex_compact_dm_timers4,
-     flex_compact_dm_timers5,
-     flex_compact_dm_timers6,
-     flex_compact_dm_timers7,
-     flex_compact_dm_timers8
-    ].
 
 
-bin(suite) ->
-    [
-     bin_test_msgs
-    ].
 
 
-ber(suite) ->
-    [
-     ber_test_msgs
-    ].
-
-
-ber_bin(suite) ->
-    [
-     ber_bin_test_msgs
-    ].
-
-
-per(suite) ->
-    [
-     per_test_msgs
-    ].
-
 
 %% Support for per_bin was added to ASN.1 as of version
 %% 1.3.2 (R8). And later merged into 1.3.1.3 (R7). These
 %% releases are identical (as far as I know).
 %% 
-per_bin(suite) ->
-    [
-     per_bin_test_msgs
-    ].
 
 
-erl_dist_m(suite) ->
-    [
-     erl_dist_m_test_msgs
-    ].
 
-tickets(suite) ->
-    [
-     compact_tickets, 
-     pretty_tickets,
-     flex_compact_tickets,
-     flex_pretty_tickets
-    ].
 
 
-compact_tickets(suite) ->
-    [
-     compact_otp4011_msg1,
-     compact_otp4011_msg2,
-     compact_otp4011_msg3,
-     compact_otp4013_msg1,
-     compact_otp4085_msg1,
-     compact_otp4085_msg2,
-     compact_otp4280_msg1,
-     compact_otp4299_msg1,
-     compact_otp4299_msg2,
-     compact_otp4359_msg1,
-     compact_otp4920_msg0,
-     compact_otp4920_msg1,
-     compact_otp4920_msg2,
-     compact_otp4920_msg3,
-     compact_otp4920_msg4,
-     compact_otp4920_msg5,
-     compact_otp4920_msg6,
-     compact_otp4920_msg7,
-     compact_otp4920_msg8,
-     compact_otp4920_msg9,
-     compact_otp4920_msg10,
-     compact_otp4920_msg11,
-     compact_otp4920_msg12,
-     compact_otp4920_msg20,
-     compact_otp4920_msg21,
-     compact_otp4920_msg22,
-     compact_otp4920_msg23,
-     compact_otp4920_msg24,
-     compact_otp4920_msg25,
-     compact_otp5186_msg01,
-     compact_otp5186_msg02,
-     compact_otp5186_msg03,
-     compact_otp5186_msg04,
-     compact_otp5186_msg05,
-     compact_otp5186_msg06,
-     compact_otp5290_msg01,
-     compact_otp5290_msg02,
-     compact_otp5793_msg01,
-     compact_otp5993_msg01,
-     compact_otp5993_msg02,
-     compact_otp5993_msg03,
-     compact_otp6017_msg01,
-     compact_otp6017_msg02,
-     compact_otp6017_msg03,
-     compact_otp7138_msg01,
-     compact_otp7138_msg02,
-     compact_otp7457_msg01,
-     compact_otp7457_msg02,
-     compact_otp7457_msg03,
-     compact_otp7534_msg01,
-     compact_otp7576_msg01,
-     compact_otp7671_msg01
-    ].
 
-flex_compact_tickets(suite) ->
-    {req, [], 
-     {conf, flex_compact_init, flex_compact_tickets_cases(), 
-      flex_compact_finish}}.
 
-flex_compact_tickets_cases() ->
-    [
-     flex_compact_otp7138_msg01,
-     flex_compact_otp7138_msg02,
-     flex_compact_otp7431_msg01,
-     flex_compact_otp7431_msg02,
-     flex_compact_otp7431_msg03, 
-     flex_compact_otp7431_msg04,
-     flex_compact_otp7431_msg05,
-     flex_compact_otp7431_msg06,
-     flex_compact_otp7431_msg07,
-     flex_compact_otp7138_msg02,
-     flex_compact_otp7457_msg01,
-     flex_compact_otp7457_msg02,
-     flex_compact_otp7457_msg03,
-     flex_compact_otp7534_msg01,
-     flex_compact_otp7573_msg01,
-     flex_compact_otp7576_msg01
-    ].
+flex_compact_tickets_cases() -> 
+[flex_compact_otp7138_msg01, flex_compact_otp7138_msg02,
+ flex_compact_otp7431_msg01, flex_compact_otp7431_msg02,
+ flex_compact_otp7431_msg03, flex_compact_otp7431_msg04,
+ flex_compact_otp7431_msg05, flex_compact_otp7431_msg06,
+ flex_compact_otp7431_msg07, flex_compact_otp7138_msg02,
+ flex_compact_otp7457_msg01, flex_compact_otp7457_msg02,
+ flex_compact_otp7457_msg03, flex_compact_otp7534_msg01,
+ flex_compact_otp7573_msg01, flex_compact_otp7576_msg01].
 
-pretty_tickets(suite) ->
-    [
-     pretty_otp4632_msg1,
-     pretty_otp4632_msg2,
-     pretty_otp4632_msg3,
-     pretty_otp4632_msg4,
-     pretty_otp4710_msg1,
-     pretty_otp4710_msg2,
-     pretty_otp4945_msg1,
-     pretty_otp4945_msg2,
-     pretty_otp4945_msg3,
-     pretty_otp4945_msg4,
-     pretty_otp4945_msg5,
-     pretty_otp4945_msg6,
-     pretty_otp4949_msg1,
-     pretty_otp4949_msg2,
-     pretty_otp4949_msg3,
-     pretty_otp5042_msg1,
-     pretty_otp5068_msg1,
-     pretty_otp5085_msg1,
-     pretty_otp5085_msg2,
-     pretty_otp5085_msg3,
-     pretty_otp5085_msg4,
-     pretty_otp5085_msg5,
-     pretty_otp5085_msg6,
-     pretty_otp5085_msg7,
-     pretty_otp5600_msg1,
-     pretty_otp5600_msg2,
-     pretty_otp5601_msg1,
-     pretty_otp5793_msg01,
-     pretty_otp5882_msg01,
-     pretty_otp6490_msg01,
-     pretty_otp6490_msg02,
-     pretty_otp6490_msg03,
-     pretty_otp6490_msg04,
-     pretty_otp6490_msg05,
-     pretty_otp6490_msg06,
-     pretty_otp7249_msg01,
-     pretty_otp7671_msg01,
-     pretty_otp7671_msg02,
-     pretty_otp7671_msg03,
-     pretty_otp7671_msg04,
-     pretty_otp7671_msg05
-    ].
 
-flex_pretty_tickets(suite) ->
-    {req, [], 
-     {conf, flex_pretty_init, flex_pretty_tickets_cases(), 
-      flex_pretty_finish}}.
 
-flex_pretty_tickets_cases() ->
-    [
-     flex_pretty_otp5042_msg1,
-     flex_pretty_otp5085_msg1,
-     flex_pretty_otp5085_msg2,
-     flex_pretty_otp5085_msg3,
-     flex_pretty_otp5085_msg4,
-     flex_pretty_otp5085_msg5,
-     flex_pretty_otp5085_msg6,
-     flex_pretty_otp5085_msg7,
-     flex_pretty_otp5600_msg1,
-     flex_pretty_otp5600_msg2,
-     flex_pretty_otp5601_msg1,
-     flex_pretty_otp5793_msg01,
-     flex_pretty_otp7431_msg01,
-     flex_pretty_otp7431_msg02,
-     flex_pretty_otp7431_msg03, 
-     flex_pretty_otp7431_msg04,
-     flex_pretty_otp7431_msg05,
-     flex_pretty_otp7431_msg06,
-     flex_pretty_otp7431_msg07
-    ].
+flex_pretty_tickets_cases() -> 
+[flex_pretty_otp5042_msg1, flex_pretty_otp5085_msg1,
+ flex_pretty_otp5085_msg2, flex_pretty_otp5085_msg3,
+ flex_pretty_otp5085_msg4, flex_pretty_otp5085_msg5,
+ flex_pretty_otp5085_msg6, flex_pretty_otp5085_msg7,
+ flex_pretty_otp5600_msg1, flex_pretty_otp5600_msg2,
+ flex_pretty_otp5601_msg1, flex_pretty_otp5793_msg01,
+ flex_pretty_otp7431_msg01, flex_pretty_otp7431_msg02,
+ flex_pretty_otp7431_msg03, flex_pretty_otp7431_msg04,
+ flex_pretty_otp7431_msg05, flex_pretty_otp7431_msg06,
+ flex_pretty_otp7431_msg07].
+
+%% ----
+
+tickets() ->
+    Flag  = process_flag(trap_exit, true),    
+    Cases = expand(tickets),
+    Fun   = fun(Case) ->
+		    C = init_per_testcase(Case, [{tc_timeout, 
+						  timer:minutes(10)}]),
+		    io:format("Eval ~w~n", [Case]),
+		    Result = 
+			case (catch apply(?MODULE, Case, [C])) of
+			    {'EXIT', Reason} ->
+ 				io:format("~n~p exited:~n   ~p~n", 
+ 					  [Case, Reason]),
+				{error, {Case, Reason}};
+			    Res ->
+				Res
+			end,
+		    end_per_testcase(Case, C),
+		    Result
+	    end,
+    process_flag(trap_exit, Flag),
+    lists:map(Fun, Cases).
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_codec_v3_test.erl b/lib/megaco/test/megaco_codec_v3_test.erl
index f49c3a677a..2c35ce13b3 100644
--- a/lib/megaco/test/megaco_codec_v3_test.erl
+++ b/lib/megaco/test/megaco_codec_v3_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -37,26 +37,15 @@
 
 -export([t/0, t/1]).
 
--export([all/1, 
-
-	 text/1, 
-
-	 pretty/1, 
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, 
 	 pretty_test_msgs/1, 
-
-	 compact/1, 
 	 compact_test_msgs/1, 
-
-	 flex_pretty/1, 
 	 flex_pretty_init/1, 
 	 flex_pretty_finish/1, 
 	 flex_pretty_test_msgs/1,
-
-	 flex_compact/1, 
 	 flex_compact_init/1, 
 	 flex_compact_finish/1, 
 	 flex_compact_test_msgs/1,
-
 	 flex_compact_dm_timers1/1, 
 	 flex_compact_dm_timers2/1, 
 	 flex_compact_dm_timers3/1, 
@@ -65,32 +54,15 @@
 	 flex_compact_dm_timers6/1, 
 	 flex_compact_dm_timers7/1, 
 	 flex_compact_dm_timers8/1, 
-
-	 binary/1, 
-	 
-	 bin/1, 
 	 bin_test_msgs/1,
-
-	 ber/1, 
 	 ber_test_msgs/1, 
-
-	 ber_bin/1, 
 	 ber_bin_test_msgs/1, 
-
-	 per/1,
 	 per_test_msgs/1,
-
-	 per_bin/1,
 	 per_bin_test_msgs/1,
-
-	 erl_dist/1,
-	 erl_dist_m/1,
 	 erl_dist_m_test_msgs/1,
 
 	 tickets/0, 
-	 tickets/1, 
-
-	 compact_tickets/1, 
+	 
 	 compact_otp4011_msg1/1, 
 	 compact_otp4011_msg2/1,
 	 compact_otp4011_msg3/1,
@@ -133,8 +105,7 @@
          compact_otp6017_msg01/1,
          compact_otp6017_msg02/1,
          compact_otp6017_msg03/1,
-
-	 flex_compact_tickets/1, 
+	 
 	 flex_compact_otp4299_msg1/1, 
          flex_compact_otp7431_msg01/1,
          flex_compact_otp7431_msg02/1,
@@ -143,9 +114,7 @@
          flex_compact_otp7431_msg05/1,
          flex_compact_otp7431_msg06/1,
          flex_compact_otp7431_msg07/1,
-
-
-	 pretty_tickets/1, 
+	 
 	 pretty_otp4632_msg1/1, 
 	 pretty_otp4632_msg2/1, 
 	 pretty_otp4632_msg3/1, 
@@ -192,8 +161,7 @@
          pretty_otp7671_msg04/1,
          pretty_otp7671_msg05/1,
          pretty_otp8114_msg01/1,
-
-	 flex_pretty_tickets/1, 
+	 
 	 flex_pretty_otp5042_msg1/1, 
 	 flex_pretty_otp5085_msg1/1, 
 	 flex_pretty_otp5085_msg2/1, 
@@ -219,7 +187,7 @@
          flex_pretty_otp7431_msg06/1,
          flex_pretty_otp7431_msg07/1,
 
-	 init_per_testcase/2, fin_per_testcase/2]).  
+	 init_per_testcase/2, end_per_testcase/2]).  
 
 -export([display_text_messages/0, generate_text_messages/0]).
 
@@ -285,31 +253,6 @@ expand([Case|Cases], Acc) ->
 	    expand(Cases, [Case|Acc])
     end.
 
-	    
-%% ----
-
-tickets() ->
-    Flag  = process_flag(trap_exit, true),    
-    Cases = expand(tickets),
-    Fun   = fun(Case) ->
-		    C = init_per_testcase(Case, [{tc_timeout, 
-						  timer:minutes(10)}]),
-		    io:format("Eval ~w~n", [Case]),
-		    Result = 
-			case (catch apply(?MODULE, Case, [C])) of
-			    {'EXIT', Reason} ->
- 				io:format("~n~p exited:~n   ~p~n", 
- 					  [Case, Reason]),
-				{error, {Case, Reason}};
-			    Res ->
-				Res
-			end,
-		    fin_per_testcase(Case, C),
-		    Result
-	    end,
-    process_flag(trap_exit, Flag),
-    lists:map(Fun, Cases).
-
 
 %% ----
 
@@ -328,279 +271,174 @@ init_per_testcase(Case, Config) ->
 	end,
     megaco_test_lib:init_per_testcase(Case, C).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     erase(verbosity),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     text,
-     binary,
-     erl_dist,
-     tickets
-    ].
-
-text(suite) ->
-    [
-     pretty,
-     flex_pretty,
-     compact,
-     flex_compact
-    ].
-
-binary(suite) ->
-    [
-     bin,
-     ber,
-     ber_bin,
-     per,
-     per_bin
-    ].
-
-erl_dist(suite) ->
-    [
-     erl_dist_m
-    ].
-
-pretty(suite) ->
-    [
-     pretty_test_msgs
-    ].
-
-
-compact(suite) ->
-    [
-     compact_test_msgs
-    ].
-
-
-flex_pretty(suite) ->
-    {req, [], 
-     {conf, flex_pretty_init, flex_pretty_cases(), flex_pretty_finish}}.
+all() -> 
+    [{group, text}, {group, binary}, {group, erl_dist},
+     {group, tickets}].
+
+groups() -> 
+    [{text, [],
+      [{group, pretty}, {group, flex_pretty},
+       {group, compact}, {group, flex_compact}]},
+     {binary, [],
+      [{group, bin}, {group, ber}, {group, ber_bin},
+       {group, per}, {group, per_bin}]},
+     {erl_dist, [], [{group, erl_dist_m}]},
+     {pretty, [], [pretty_test_msgs]},
+     {compact, [], [compact_test_msgs]},
+     {flex_pretty, [], flex_pretty_cases()},
+     {flex_compact, [], flex_compact_cases()},
+     {bin, [], [bin_test_msgs]}, {ber, [], [ber_test_msgs]},
+     {ber_bin, [], [ber_bin_test_msgs]},
+     {per, [], [per_test_msgs]},
+     {per_bin, [], [per_bin_test_msgs]},
+     {erl_dist_m, [], [erl_dist_m_test_msgs]},
+     {tickets, [],
+      [{group, compact_tickets},
+       {group, flex_compact_tickets}, {group, pretty_tickets},
+       {group, flex_pretty_tickets}]},
+     {compact_tickets, [],
+      [compact_otp4011_msg1, compact_otp4011_msg2,
+       compact_otp4011_msg3, compact_otp4013_msg1,
+       compact_otp4085_msg1, compact_otp4085_msg2,
+       compact_otp4280_msg1, compact_otp4299_msg1,
+       compact_otp4359_msg1, compact_otp4920_msg0,
+       compact_otp4920_msg1, compact_otp4920_msg2,
+       compact_otp4920_msg3, compact_otp4920_msg4,
+       compact_otp4920_msg5, compact_otp4920_msg6,
+       compact_otp4920_msg7, compact_otp4920_msg8,
+       compact_otp4920_msg9, compact_otp4920_msg10,
+       compact_otp4920_msg11, compact_otp4920_msg12,
+       compact_otp4920_msg20, compact_otp4920_msg21,
+       compact_otp4920_msg22, compact_otp4920_msg23,
+       compact_otp4920_msg24, compact_otp4920_msg25,
+       compact_otp5186_msg01, compact_otp5186_msg02,
+       compact_otp5186_msg03, compact_otp5186_msg04,
+       compact_otp5186_msg05, compact_otp5186_msg06,
+       compact_otp5793_msg01, compact_otp5836_msg01,
+       compact_otp5993_msg01, compact_otp5993_msg02,
+       compact_otp5993_msg03, compact_otp6017_msg01,
+       compact_otp6017_msg02, compact_otp6017_msg03]},
+     {flex_compact_tickets, [],
+      flex_compact_tickets_cases()},
+     {pretty_tickets, [],
+      [pretty_otp4632_msg1, pretty_otp4632_msg2,
+       pretty_otp4632_msg3, pretty_otp4632_msg4,
+       pretty_otp4710_msg1, pretty_otp4710_msg2,
+       pretty_otp4945_msg1, pretty_otp4945_msg2,
+       pretty_otp4945_msg3, pretty_otp4945_msg4,
+       pretty_otp4945_msg5, pretty_otp4945_msg6,
+       pretty_otp4949_msg1, pretty_otp4949_msg2,
+       pretty_otp4949_msg3, pretty_otp5042_msg1,
+       pretty_otp5068_msg1, pretty_otp5085_msg1,
+       pretty_otp5085_msg2, pretty_otp5085_msg3,
+       pretty_otp5085_msg4, pretty_otp5085_msg5,
+       pretty_otp5085_msg6, pretty_otp5085_msg7,
+       pretty_otp5085_msg8, pretty_otp5600_msg1,
+       pretty_otp5600_msg2, pretty_otp5601_msg1,
+       pretty_otp5793_msg01, pretty_otp5803_msg01,
+       pretty_otp5803_msg02, pretty_otp5805_msg01,
+       pretty_otp5836_msg01, pretty_otp5882_msg01,
+       pretty_otp6490_msg01, pretty_otp6490_msg02,
+       pretty_otp6490_msg03, pretty_otp6490_msg04,
+       pretty_otp6490_msg05, pretty_otp6490_msg06,
+       pretty_otp7671_msg01, pretty_otp7671_msg02,
+       pretty_otp7671_msg03, pretty_otp7671_msg04,
+       pretty_otp7671_msg05, pretty_otp8114_msg01]},
+     {flex_pretty_tickets, [], flex_pretty_tickets_cases()}].
+
+init_per_group(flex_pretty_tickets, Config) -> 
+    flex_pretty_init(Config);
+init_per_group(flex_compact_tickets, Config) -> 
+    flex_compact_init(Config);
+init_per_group(flex_compact, Config) -> 
+    flex_compact_init(Config);
+init_per_group(flex_pretty, Config) -> 
+    flex_pretty_init(Config);
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(flex_pretty_tickets, Config) -> 
+    flex_pretty_finish(Config);
+end_per_group(flex_compact_tickets, Config) -> 
+    flex_compact_finish(Config);
+end_per_group(flex_compact, Config) -> 
+    flex_compact_finish(Config);
+end_per_group(flex_pretty, Config) -> 
+    flex_pretty_finish(Config);
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+flex_pretty_cases() -> 
+    [flex_pretty_test_msgs].
+
+
+flex_compact_cases() -> 
+    [flex_compact_test_msgs, flex_compact_dm_timers1,
+     flex_compact_dm_timers2, flex_compact_dm_timers3,
+     flex_compact_dm_timers4, flex_compact_dm_timers5,
+     flex_compact_dm_timers6, flex_compact_dm_timers7,
+     flex_compact_dm_timers8].
 
-flex_pretty_cases() ->
-    [
-     flex_pretty_test_msgs
-    ].
-
-flex_compact(suite) ->
-    {req, [], 
-     {conf, flex_compact_init, flex_compact_cases(), flex_compact_finish}}.
-
-flex_compact_cases() ->
-    [
-     flex_compact_test_msgs,
-     flex_compact_dm_timers1,
-     flex_compact_dm_timers2,
-     flex_compact_dm_timers3,
-     flex_compact_dm_timers4,
-     flex_compact_dm_timers5,
-     flex_compact_dm_timers6,
-     flex_compact_dm_timers7,
-     flex_compact_dm_timers8
-    ].
-
-
-bin(suite) ->
-    [
-     bin_test_msgs
-    ].
-
-
-ber(suite) ->
-    [
-     ber_test_msgs
-    ].
-
-
-ber_bin(suite) ->
-    [
-     ber_bin_test_msgs
-    ].
-
-
-per(suite) ->
-    [
-     per_test_msgs
-    ].
 
 
 %% Support for per_bin was added to ASN.1 as of version
 %% 1.3.2 (R8). And later merged into 1.3.1.3 (R7). These
 %% releases are identical (as far as I know).
 %% 
-per_bin(suite) ->
-    [
-     per_bin_test_msgs
-    ].
-
-
-erl_dist_m(suite) ->
-    [
-     erl_dist_m_test_msgs
-    ].
-
-tickets(suite) ->
-    [
-     compact_tickets,
-     flex_compact_tickets,
-     pretty_tickets,
-     flex_pretty_tickets
-    ].
-
-
-compact_tickets(suite) ->
-    [
-     compact_otp4011_msg1,
-     compact_otp4011_msg2,
-     compact_otp4011_msg3,
-     compact_otp4013_msg1,
-     compact_otp4085_msg1,
-     compact_otp4085_msg2,
-     compact_otp4280_msg1,
-     compact_otp4299_msg1,
-     compact_otp4359_msg1,
-     compact_otp4920_msg0,
-     compact_otp4920_msg1,
-     compact_otp4920_msg2,
-     compact_otp4920_msg3,
-     compact_otp4920_msg4,
-     compact_otp4920_msg5,
-     compact_otp4920_msg6,
-     compact_otp4920_msg7,
-     compact_otp4920_msg8,
-     compact_otp4920_msg9,
-     compact_otp4920_msg10,
-     compact_otp4920_msg11,
-     compact_otp4920_msg12,
-     compact_otp4920_msg20,
-     compact_otp4920_msg21,
-     compact_otp4920_msg22,
-     compact_otp4920_msg23,
-     compact_otp4920_msg24,
-     compact_otp4920_msg25,
-     compact_otp5186_msg01,
-     compact_otp5186_msg02,
-     compact_otp5186_msg03,
-     compact_otp5186_msg04,
-     compact_otp5186_msg05,
-     compact_otp5186_msg06,
-     compact_otp5793_msg01,
-     compact_otp5836_msg01,
-     compact_otp5993_msg01,
-     compact_otp5993_msg02,
-     compact_otp5993_msg03,
-     compact_otp6017_msg01,
-     compact_otp6017_msg02,
-     compact_otp6017_msg03
-    ].
 
 
-flex_compact_tickets(suite) ->
-    {req, [],
-     {conf, flex_compact_init, flex_compact_tickets_cases(),
-      flex_compact_finish}}.
- 
-flex_compact_tickets_cases() ->
-    [
-     flex_compact_otp4299_msg1,
-     flex_compact_otp7431_msg01,
-     flex_compact_otp7431_msg02,
-     flex_compact_otp7431_msg03, 
-     flex_compact_otp7431_msg04,
-     flex_compact_otp7431_msg05,
-     flex_compact_otp7431_msg06,
-     flex_compact_otp7431_msg07
-    ].
-
-		
-pretty_tickets(suite) ->
-    [
-     pretty_otp4632_msg1,
-     pretty_otp4632_msg2,
-     pretty_otp4632_msg3,
-     pretty_otp4632_msg4,
-     pretty_otp4710_msg1,
-     pretty_otp4710_msg2,
-     pretty_otp4945_msg1,
-     pretty_otp4945_msg2,
-     pretty_otp4945_msg3,
-     pretty_otp4945_msg4,
-     pretty_otp4945_msg5,
-     pretty_otp4945_msg6,
-     pretty_otp4949_msg1,
-     pretty_otp4949_msg2,
-     pretty_otp4949_msg3,
-     pretty_otp5042_msg1,
-     pretty_otp5068_msg1,
-     pretty_otp5085_msg1,
-     pretty_otp5085_msg2,
-     pretty_otp5085_msg3,
-     pretty_otp5085_msg4,
-     pretty_otp5085_msg5,
-     pretty_otp5085_msg6,
-     pretty_otp5085_msg7,
-     pretty_otp5085_msg8,
-     pretty_otp5600_msg1,
-     pretty_otp5600_msg2,
-     pretty_otp5601_msg1,
-     pretty_otp5793_msg01,
-     pretty_otp5803_msg01,
-     pretty_otp5803_msg02,
-     pretty_otp5805_msg01,
-     pretty_otp5836_msg01,
-     pretty_otp5882_msg01,
-     pretty_otp6490_msg01,
-     pretty_otp6490_msg02,
-     pretty_otp6490_msg03,
-     pretty_otp6490_msg04,
-     pretty_otp6490_msg05,
-     pretty_otp6490_msg06,
-     pretty_otp7671_msg01,
-     pretty_otp7671_msg02,
-     pretty_otp7671_msg03,
-     pretty_otp7671_msg04,
-     pretty_otp7671_msg05,
-     pretty_otp8114_msg01
-    ].
+flex_compact_tickets_cases() -> 
+    [flex_compact_otp4299_msg1, flex_compact_otp7431_msg01,
+     flex_compact_otp7431_msg02, flex_compact_otp7431_msg03,
+     flex_compact_otp7431_msg04, flex_compact_otp7431_msg05,
+     flex_compact_otp7431_msg06, flex_compact_otp7431_msg07].
+
+flex_pretty_tickets_cases() -> 
+    [flex_pretty_otp5042_msg1, flex_pretty_otp5085_msg1,
+     flex_pretty_otp5085_msg2, flex_pretty_otp5085_msg3,
+     flex_pretty_otp5085_msg4, flex_pretty_otp5085_msg5,
+     flex_pretty_otp5085_msg6, flex_pretty_otp5085_msg7,
+     flex_pretty_otp5085_msg8, flex_pretty_otp5600_msg1,
+     flex_pretty_otp5600_msg2, flex_pretty_otp5601_msg1,
+     flex_pretty_otp5793_msg01, flex_pretty_otp5803_msg01,
+     flex_pretty_otp5803_msg02, flex_pretty_otp5805_msg01,
+     flex_pretty_otp5836_msg01, flex_pretty_otp7431_msg01,
+     flex_pretty_otp7431_msg02, flex_pretty_otp7431_msg03,
+     flex_pretty_otp7431_msg04, flex_pretty_otp7431_msg05,
+     flex_pretty_otp7431_msg06, flex_pretty_otp7431_msg07].
 
+%% ----
 
-flex_pretty_tickets(suite) ->
-    {req, [],
-     {conf, flex_pretty_init, flex_pretty_tickets_cases(),
-      flex_pretty_finish}}.
- 
-flex_pretty_tickets_cases() ->
-    [
-     flex_pretty_otp5042_msg1,
-     flex_pretty_otp5085_msg1,
-     flex_pretty_otp5085_msg2,
-     flex_pretty_otp5085_msg3,
-     flex_pretty_otp5085_msg4,
-     flex_pretty_otp5085_msg5,
-     flex_pretty_otp5085_msg6,
-     flex_pretty_otp5085_msg7,
-     flex_pretty_otp5085_msg8,
-     flex_pretty_otp5600_msg1,
-     flex_pretty_otp5600_msg2,
-     flex_pretty_otp5601_msg1,
-     flex_pretty_otp5793_msg01,
-     flex_pretty_otp5803_msg01,
-     flex_pretty_otp5803_msg02,
-     flex_pretty_otp5805_msg01,
-     flex_pretty_otp5836_msg01,
-     flex_pretty_otp7431_msg01,
-     flex_pretty_otp7431_msg02,
-     flex_pretty_otp7431_msg03, 
-     flex_pretty_otp7431_msg04,
-     flex_pretty_otp7431_msg05,
-     flex_pretty_otp7431_msg06,
-     flex_pretty_otp7431_msg07
-    ].
+tickets() ->
+    Flag  = process_flag(trap_exit, true),    
+    Cases = expand(tickets),
+    Fun   = fun(Case) ->
+		    C = init_per_testcase(Case, [{tc_timeout, 
+						  timer:minutes(10)}]),
+		    io:format("Eval ~w~n", [Case]),
+		    Result = 
+			case (catch apply(?MODULE, Case, [C])) of
+			    {'EXIT', Reason} ->
+ 				io:format("~n~p exited:~n   ~p~n", 
+ 					  [Case, Reason]),
+				{error, {Case, Reason}};
+			    Res ->
+				Res
+			end,
+		    end_per_testcase(Case, C),
+		    Result
+	    end,
+    process_flag(trap_exit, Flag),
+    lists:map(Fun, Cases).
 
 		
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_config_test.erl b/lib/megaco/test/megaco_config_test.erl
index 9ab1a7d90d..1fc4d09d3b 100644
--- a/lib/megaco/test/megaco_config_test.erl
+++ b/lib/megaco/test/megaco_config_test.erl
@@ -44,9 +44,9 @@ do_init_per_testcase(Case, Config) ->
     process_flag(trap_exit, true),
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     process_flag(trap_exit, false),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 -record(command, {id, desc, cmd, verify}).
@@ -58,25 +58,21 @@ fin_per_testcase(Case, Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(suite) ->
-    [
-     config,
-     transaction_id_counter,
-     tickets
-    ].
-
-transaction_id_counter(suite) ->
-    [
-     transaction_id_counter_mg, 
-     transaction_id_counter_mgc
-    ].
-
-tickets(suite) ->
-    [
-     otp_7216,
-     otp_8167,
-     otp_8183
-    ].
+all() -> 
+    [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]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_digit_map_test.erl b/lib/megaco/test/megaco_digit_map_test.erl
index 22e115278f..d16fb679ae 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -36,54 +36,39 @@ t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 init_per_testcase(Case, Config) ->
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 tickets
-	],
-    Cases.
+all() -> 
+    [{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]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-tickets(suite) ->
-    [
-     otp_5750,
-     otp_5799,
-     otp_5826,
-     otp_7449
-    ].
-
-
-otp_5750(suite) ->
-    [
-     otp_5750_01,
-     otp_5750_02
-    ].
-
-otp_5799(suite) ->
-    [
-     otp_5799_01
-    ].
-
-otp_5826(suite) ->
-    [
-     otp_5826_01,
-     otp_5826_02,
-     otp_5826_03
-    ].
-
-otp_7449(suite) ->
-    [
-     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 ef15cb1bde..528b61c2af 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -41,11 +41,11 @@ init_per_testcase(Case, Config) ->
     megaco:enable_trace(max, io),
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     purge_examples(),
     erase(dbg),
     megaco:disable_trace(),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 example_modules() ->
     [megaco_simple_mg, megaco_simple_mgc].
@@ -70,13 +70,18 @@ purge_examples() ->
 %% Top test case
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-all(doc) ->
-    ["Run all examples mentioned in the documentation",
-     "Are really all examples covered?"];
-all(suite) ->
-    [
-     simple
-    ].
+all() -> 
+    [simple].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 simple(suite) ->
     [];
diff --git a/lib/megaco/test/megaco_flex_test.erl b/lib/megaco/test/megaco_flex_test.erl
index 3dbcf53e7a..d7fc8eacb5 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -32,10 +32,10 @@
 -export([
 	 t/0, t/1, 
 
-	 init_per_testcase/2, fin_per_testcase/2,
+	 init_per_testcase/2, end_per_testcase/2,
 
-	 all/1,
-	 flex_init/1, flex_fin/1, 
+	all/0,groups/0,init_per_group/2,end_per_group/2,
+	 init_per_suite/1, end_per_suite/1, 
 
 	 plain/1,
 	 port_exit/1,
@@ -55,26 +55,31 @@ t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 init_per_testcase(Case, Config) ->
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 plain,
-	 port_exit,
-	 garbage_in
-	],
-    {req, [], {conf, flex_init, Cases, flex_fin}}.
+all() -> 
+    [plain, port_exit, garbage_in].
 
-flex_init(suite) ->
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(suite) ->
     [];
-flex_init(doc) ->
+init_per_suite(doc) ->
     [];
-flex_init(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
     case megaco_flex_scanner:is_enabled() of
 	true ->
 	    Config;
@@ -82,9 +87,9 @@ flex_init(Config) when is_list(Config) ->
 	    ?SKIP(flex_scanner_not_enabled)
     end.
 
-flex_fin(suite) -> [];
-flex_fin(doc) -> [];
-flex_fin(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
diff --git a/lib/megaco/test/megaco_load_test.erl b/lib/megaco/test/megaco_load_test.erl
index 5a22b7b4ee..5519ca15c6 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -99,26 +99,29 @@ do_init_per_testcase(Case, Config) ->
     process_flag(trap_exit, true),
     megaco_test_lib:init_per_testcase(Case, Config).
     
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     process_flag(trap_exit, false),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
- 	 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
-	],
-    Cases.
+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].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_mess_otp8212_test.erl b/lib/megaco/test/megaco_mess_otp8212_test.erl
index 109886ebc4..e074e2f0b3 100644
--- a/lib/megaco/test/megaco_mess_otp8212_test.erl
+++ b/lib/megaco/test/megaco_mess_otp8212_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2010. 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
diff --git a/lib/megaco/test/megaco_mess_test.erl b/lib/megaco/test/megaco_mess_test.erl
index 368800fa54..ded1506271 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -34,13 +34,13 @@
 
 %% -compile(export_all).
 -export([
-	 all/1, 
+	 all/0,groups/0,init_per_group/2,end_per_group/2, 
 	 init_per_testcase/2, 
-	 fin_per_testcase/2,
+	 end_per_testcase/2,
 
 	 connect/1,
 
-	 request_and_reply/1,
+	
 	 request_and_reply_plain/1,
 	 request_and_no_reply/1,
 	 request_and_reply_pending_ack_no_pending/1,
@@ -52,13 +52,13 @@
 	 request_and_reply_and_late_ack/1,
 	 trans_req_and_reply_and_req/1, 
 	 
-	 pending_ack/1,
+	
 	 pending_ack_plain/1,
 	 request_and_pending_and_late_reply/1, 
 	 
 	 dist/1,
 	 
-	 tickets/1,
+	
 	 otp_4359/1,
 	 otp_4836/1,
 	 otp_5805/1,
@@ -67,18 +67,18 @@
 	 otp_6253/1,
 	 otp_6275/1,
 	 otp_6276/1,
-	 otp_6442/1,
+	
 	 otp_6442_resend_request1/1,
 	 otp_6442_resend_request2/1,
 	 otp_6442_resend_reply1/1,
 	 otp_6442_resend_reply2/1,
-	 otp_6865/1, 
+	 
 	 otp_6865_request_and_reply_plain_extra1/1,
 	 otp_6865_request_and_reply_plain_extra2/1, 
 	 otp_7189/1, 
 	 otp_7259/1, 
 	 otp_7713/1,
-	 otp_8183/1, 
+	 
 	 otp_8183_request1/1, 
 	 otp_8212/1
 	]).
@@ -337,83 +337,50 @@ init_per_testcase(Case, Config) ->
     C = lists:keydelete(tc_timeout, 1, Config),
     megaco_test_lib:init_per_testcase(Case, [{tc_timeout, min(1)} |C]).
 
-% fin_per_testcase(pending_ack = Case, Config) ->
+% end_per_testcase(pending_ack = Case, Config) ->
 %     erase(dbg),
-%     megaco_test_lib:fin_per_testcase(Case, Config);
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+%     megaco_test_lib:end_per_testcase(Case, Config);
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    [
-     connect,
-     request_and_reply,
-     pending_ack,
-     dist,
-
-     %% Tickets last
-     tickets
-    ].
-
-request_and_reply(suite) ->
-    [
-     request_and_reply_plain,
-     request_and_no_reply,
-     request_and_reply_pending_ack_no_pending,
-     request_and_reply_pending_ack_one_pending,
-     single_trans_req_and_reply,
-     single_trans_req_and_reply_sendopts,
-     request_and_reply_and_ack,
-     request_and_reply_and_no_ack,
-     request_and_reply_and_late_ack,
-     trans_req_and_reply_and_req
-    ].
-
-pending_ack(suite) ->
-    [
-     pending_ack_plain,
-     request_and_pending_and_late_reply
-    ].
-
-tickets(suite) ->
-    [
-     otp_4359,
-     otp_4836,
-     otp_5805,
-     otp_5881,
-     otp_5887,
-     otp_6253,
-     otp_6275,
-     otp_6276,
-     otp_6442,
-     otp_6865,
-     otp_7189,
-     otp_7259,
-     otp_7713,
-     otp_8183,
-     otp_8212
-    ].
-
-otp_6442(suite) ->
-    [
-     otp_6442_resend_request1, 
-     otp_6442_resend_request2, 
-     otp_6442_resend_reply1, 
-     otp_6442_resend_reply2
-    ].
-
-otp_6865(suite) ->
-    [
-     otp_6865_request_and_reply_plain_extra1,
-     otp_6865_request_and_reply_plain_extra2
-    ].
-
-otp_8183(suite) ->
-    [
-     otp_8183_request1
-    ].
+all() -> 
+    [connect, {group, request_and_reply},
+     {group, pending_ack}, dist, {group, tickets}].
+
+groups() -> 
+    [{request_and_reply, [],
+      [request_and_reply_plain, request_and_no_reply,
+       request_and_reply_pending_ack_no_pending,
+       request_and_reply_pending_ack_one_pending,
+       single_trans_req_and_reply,
+       single_trans_req_and_reply_sendopts,
+       request_and_reply_and_ack, request_and_reply_and_no_ack,
+       request_and_reply_and_late_ack,
+       trans_req_and_reply_and_req]},
+     {pending_ack, [],
+      [pending_ack_plain,
+       request_and_pending_and_late_reply]},
+     {tickets, [],
+      [otp_4359, otp_4836, otp_5805, otp_5881, otp_5887,
+       otp_6253, otp_6275, otp_6276, {group, otp_6442},
+       {group, otp_6865}, otp_7189, otp_7259, otp_7713,
+       {group, otp_8183}, otp_8212]},
+     {otp_6442, [],
+      [otp_6442_resend_request1, otp_6442_resend_request2,
+       otp_6442_resend_reply1, otp_6442_resend_reply2]},
+     {otp_6865, [],
+      [otp_6865_request_and_reply_plain_extra1,
+       otp_6865_request_and_reply_plain_extra2]},
+     {otp_8183, [], [otp_8183_request1]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_mess_user_test.erl b/lib/megaco/test/megaco_mess_user_test.erl
index 50284be549..ce682c167b 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
diff --git a/lib/megaco/test/megaco_mib_test.erl b/lib/megaco/test/megaco_mib_test.erl
index 2da6aa3bf3..52d99d1442 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
@@ -63,21 +63,25 @@ init_per_testcase(Case, Config) ->
 	    megaco_test_lib:init_per_testcase(Case, Config)
     end.
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     process_flag(trap_exit, false),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 plain,
-	 connect,
-	 traffic
-	],
-    Cases.
+all() -> 
+    [plain, connect, traffic].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_mreq_test.erl b/lib/megaco/test/megaco_mreq_test.erl
index 676acd8a12..1d3f38d50d 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -69,20 +69,24 @@ init_per_testcase(Case, Config) ->
     process_flag(trap_exit, true),
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     process_flag(trap_exit, false),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 req_and_rep,
-	 req_and_pending,
-	 req_and_cancel
-	],
-    Cases.
+all() -> 
+    [req_and_rep, req_and_pending, req_and_cancel].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_pending_limit_test.erl b/lib/megaco/test/megaco_pending_limit_test.erl
index 1ca29c195c..233c22f4d2 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -26,22 +26,16 @@
 -module(megaco_pending_limit_test).
 
 -export([t/0, t/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
--export([all/1,
-
-	 sent/1,
+-export([init_per_testcase/2, end_per_testcase/2]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2,
 	 sent_timer_late_reply/1,
 	 sent_timer_exceeded/1,
 	 sent_timer_exceeded_long/1,
 	 sent_resend_late_reply/1,
 	 sent_resend_exceeded/1,
 	 sent_resend_exceeded_long/1,
-
-	 recv/1,
 	 recv_limit_exceeded1/1,
 	 recv_limit_exceeded2/1,
-
-	 tickets/1,
 	 otp_4956/1,
 	 otp_5310/1,
 	 otp_5619/1
@@ -139,45 +133,29 @@ init_per_testcase(Case, Config) ->
     process_flag(trap_exit, true),
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     process_flag(trap_exit, false),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    [
-     sent,
-     recv,
-     
-     %% Tickets last 
-     tickets
-    ].
-
-sent(suite) ->
-    [
-     sent_timer_late_reply,
-     sent_timer_exceeded,
-     sent_timer_exceeded_long,
-     sent_resend_late_reply,
-     sent_resend_exceeded,
-     sent_resend_exceeded_long
-     
-    ].
+all() -> 
+    [{group, sent}, {group, recv}, {group, tickets}].
 
-recv(suite) ->
-    [
-     recv_limit_exceeded1,
-     recv_limit_exceeded2
-    ].
+groups() -> 
+    [{sent, [],
+      [sent_timer_late_reply, sent_timer_exceeded,
+       sent_timer_exceeded_long, sent_resend_late_reply,
+       sent_resend_exceeded, sent_resend_exceeded_long]},
+     {recv, [],
+      [recv_limit_exceeded1, recv_limit_exceeded2]},
+     {tickets, [], [otp_4956, otp_5310, otp_5619]}].
 
-tickets(suite) ->
-    [
-     otp_4956,
-     otp_5310,
-     otp_5619
-    ].
+init_per_group(_GroupName, Config) ->
+    Config.
 
+end_per_group(_GroupName, Config) ->
+    Config.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%                                                                   %%%
diff --git a/lib/megaco/test/megaco_profile.erl b/lib/megaco/test/megaco_profile.erl
index 01fa0b5a14..d0b62610e1 100644
--- a/lib/megaco/test/megaco_profile.erl
+++ b/lib/megaco/test/megaco_profile.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
diff --git a/lib/megaco/test/megaco_sdp_test.erl b/lib/megaco/test/megaco_sdp_test.erl
index e9bd550518..796a956f23 100644
--- a/lib/megaco/test/megaco_sdp_test.erl
+++ b/lib/megaco/test/megaco_sdp_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -24,13 +24,12 @@
 
 -module(megaco_sdp_test).
 
--export([all/1,
+-export([all/0,groups/0,init_per_group/2,end_per_group/2,
 	 decode_encode/1,
 
-	 tickets/1, 
 	 otp8123/1, 
 
-	 init_per_testcase/2, fin_per_testcase/2, 
+	 init_per_testcase/2, end_per_testcase/2, 
 
 	 t/0, t/1]).
 
@@ -46,8 +45,8 @@ t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 init_per_testcase(Case, Config) ->
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -55,16 +54,19 @@ fin_per_testcase(Case, Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-all(suite) ->
-    [
-     decode_encode,
-     tickets
-    ].
+all() -> 
+    [decode_encode, {group, tickets}].
+
+groups() -> 
+    [{tickets, [], [otp8123]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-tickets(suite) ->
-    [
-     otp8123
-    ].
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_segment_test.erl b/lib/megaco/test/megaco_segment_test.erl
index ef07ee54b1..e4b568119d 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -24,10 +24,10 @@
 -module(megaco_segment_test).
 
 -export([t/0, t/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
--export([all/1,
+-export([init_per_testcase/2, end_per_testcase/2]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2,
 
-	 send/1,
+	
 	 send_segmented_msg_plain1/1, 
 	 send_segmented_msg_plain2/1, 
 	 send_segmented_msg_plain3/1, 
@@ -36,13 +36,11 @@
 	 send_segmented_msg_missing_seg_reply1/1, 
 	 send_segmented_msg_missing_seg_reply2/1, 
 
-	 recv/1,
+	
 	 recv_segmented_msg_plain/1, 
 	 recv_segmented_msg_ooo_seg/1, 
 	 recv_segmented_msg_missing_seg1/1, 
-	 recv_segmented_msg_missing_seg2/1, 
-
-	 tickets/1
+	 recv_segmented_msg_missing_seg2/1
 	
 	]).
 
@@ -66,45 +64,33 @@ init_per_testcase(Case, Config) ->
     process_flag(trap_exit, true),
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     process_flag(trap_exit, false),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    [
-     send,
-     recv
-     
-     %% Tickets last 
-     %% tickets
-    ].
-
-send(suite) ->
-    [
-     send_segmented_msg_plain1,
-     send_segmented_msg_plain2,
-     send_segmented_msg_plain3,
-     send_segmented_msg_plain4,
-     send_segmented_msg_ooo1,
-     send_segmented_msg_missing_seg_reply1,
-     send_segmented_msg_missing_seg_reply2
-    ].
-
-recv(suite) ->
-    [
-     recv_segmented_msg_plain,
-     recv_segmented_msg_ooo_seg,
-     recv_segmented_msg_missing_seg1,
-     recv_segmented_msg_missing_seg2
-    ].
-
-tickets(suite) ->
-    [
-    ].
-
+all() -> 
+    [{group, send}, {group, recv}].
+
+groups() -> 
+    [{send, [],
+      [send_segmented_msg_plain1, send_segmented_msg_plain2,
+       send_segmented_msg_plain3, send_segmented_msg_plain4,
+       send_segmented_msg_ooo1,
+       send_segmented_msg_missing_seg_reply1,
+       send_segmented_msg_missing_seg_reply2]},
+     {recv, [],
+      [recv_segmented_msg_plain, recv_segmented_msg_ooo_seg,
+       recv_segmented_msg_missing_seg1,
+       recv_segmented_msg_missing_seg2]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_tc_controller.erl b/lib/megaco/test/megaco_tc_controller.erl
index dedf45e321..458bff55e8 100644
--- a/lib/megaco/test/megaco_tc_controller.erl
+++ b/lib/megaco/test/megaco_tc_controller.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
diff --git a/lib/megaco/test/megaco_tcp_test.erl b/lib/megaco/test/megaco_tcp_test.erl
index 31c88489fe..013096c385 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -36,25 +36,19 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-	 all/1,
-
-	 start/1,
+	 all/0,groups/0,init_per_group/2,end_per_group/2,
 	 start_normal/1,
 	 start_invalid_opt/1,
 	 start_and_stop/1,
-
-	 sending/1,
 	 sendreceive/1, 
 	 block_unblock/1, 
-
-	 errors/1,
 	 socket_failure/1,
 	 accept_process/1,
 	 accept_supervisor/1,
 	 connection_supervisor/1,
 	 tcp_server/1, 
 	 
-	 init_per_testcase/2, fin_per_testcase/2, 
+	 init_per_testcase/2, end_per_testcase/2, 
 
 	 t/0, t/1
         ]).
@@ -111,44 +105,32 @@ init_per_testcase(Case, Config) ->
 
 
 %%----------------------------------------------------------------------
-%% Function: fin_per_testcase/2
+%% Function: end_per_testcase/2
 %% Description: 
 %%----------------------------------------------------------------------
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%======================================================================
 %% Test case definitions
 %%======================================================================
-all(suite) ->
-    [
-     start,
-     sending,
-     errors
-    ].
-
-start(suite) ->
-    [
-     start_normal,
-     start_invalid_opt,
-     start_and_stop
-    ].
-
-sending(suite) ->
-    [
-     sendreceive,
-     block_unblock
-    ].
-
-errors(suite) ->
-    [
-     socket_failure,
-     accept_process,
-     accept_supervisor,
-     connection_supervisor,
-     tcp_server
-    ].
+all() -> 
+    [{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]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 
 %% ------------------ start ------------------------
diff --git a/lib/megaco/test/megaco_test_deliver.erl b/lib/megaco/test/megaco_test_deliver.erl
index 2d0f0c1cbe..ece0a48015 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
diff --git a/lib/megaco/test/megaco_test_generator.erl b/lib/megaco/test/megaco_test_generator.erl
index 8bbc60e6cd..4fbc86262e 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -26,6 +26,10 @@
 
 -behaviour(gen_server).
 
+-compile({no_auto_import,[error/2]}).
+
+%% ----
+
 -export([
 	 start_link/3, 
 	 start_link/4, 
diff --git a/lib/megaco/test/megaco_test_generator_lib.erl b/lib/megaco/test/megaco_test_generator_lib.erl
index cf0dcaf722..1584605913 100644
--- a/lib/megaco/test/megaco_test_generator_lib.erl
+++ b/lib/megaco/test/megaco_test_generator_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
diff --git a/lib/megaco/test/megaco_test_generic_transport.erl b/lib/megaco/test/megaco_test_generic_transport.erl
index 10afa45baa..7a3dbc5317 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
diff --git a/lib/megaco/test/megaco_test_lib.erl b/lib/megaco/test/megaco_test_lib.erl
index 03c04831e8..41f6c2c4cb 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -146,28 +146,28 @@ tickets(Mod, Func, Config) ->
 		  end,
 	    lists:map(Map, Cases);
 
-        {req, _, {conf, Init, Cases, Finish}} ->
-	    case (catch Mod:Init(Config)) of
-		Conf when is_list(Conf) ->
-		    io:format("Expand: ~p:~p ...~n", [Mod, Func]),
-		    Map = fun({M,_}) when is_atom(M) -> 
-				  tickets(M, tickets, Config);
-			     (F)     when is_atom(F) -> 
-				  tickets(Mod, F, Config);
-			     (Case) -> Case
-			  end,
-		    Res = lists:map(Map, Cases),
-		    (catch Mod:Finish(Conf)),
-		    Res;
+%%         {req, _, {conf, Init, Cases, Finish}} ->
+%% 	    case (catch Mod:Init(Config)) of
+%% 		Conf when is_list(Conf) ->
+%% 		    io:format("Expand: ~p:~p ...~n", [Mod, Func]),
+%% 		    Map = fun({M,_}) when is_atom(M) -> 
+%% 				  tickets(M, tickets, Config);
+%% 			     (F)     when is_atom(F) -> 
+%% 				  tickets(Mod, F, Config);
+%% 			     (Case) -> Case
+%% 			  end,
+%% 		    Res = lists:map(Map, Cases),
+%% 		    (catch Mod:Finish(Conf)),
+%% 		    Res;
 		    
-		{'EXIT', {skipped, Reason}} ->
-		    io:format(" => skipping: ~p~n", [Reason]),
-		    [{skipped, {Mod, Func}, Reason}];
+%% 		{'EXIT', {skipped, Reason}} ->
+%% 		    io:format(" => skipping: ~p~n", [Reason]),
+%% 		    [{skipped, {Mod, Func}, Reason}];
 		    
-		Error ->
-		    io:format(" => init failed: ~p~n", [Error]),
-		    [{failed, {Mod, Func}, Error}]
-	    end;
+%% 		Error ->
+%% 		    io:format(" => init failed: ~p~n", [Error]),
+%% 		    [{failed, {Mod, Func}, Error}]
+%% 	    end;
 		    
         {'EXIT', {undef, _}} ->
 	    io:format("Undefined:   ~p~n", [{Mod, Func}]),
@@ -252,6 +252,8 @@ alloc_instance_mem_info(Key, InstanceInfo) ->
     end.
 		      
     
+t([Case]) when is_atom(Case) ->
+    t(Case);
 t(Case) ->
     process_flag(trap_exit, true),
     MEM = fun() -> case (catch erlang:memory()) of
@@ -266,11 +268,65 @@ t(Case) ->
     Res  = lists:flatten(t(Case, default_config())),
     Alloc2 = alloc_info(),
     Mem2 = MEM(),
-    %% io:format("Res: ~p~n", [Res]),
     display_result(Res, Alloc1, Mem1, Alloc2, Mem2),
     Res.
 
-t({Mod, Fun}, Config) when is_atom(Mod) andalso is_atom(Fun) ->
+
+groups(Mod) when is_atom(Mod) ->
+    try Mod:groups() of
+	Groups when is_list(Groups) ->
+	    Groups;
+	BadGroups ->
+	    exit({bad_groups, Mod, BadGroups})
+    catch 
+	_:_ ->
+	    []
+    end.
+
+init_suite(Mod, Config) ->
+    Mod:init_per_suite(Config).
+
+end_suite(Mod, Config) ->
+    Mod:end_per_suite(Config).
+
+init_group(Mod, Group, Config) ->
+    Mod:init_per_group(Group, Config).
+
+end_group(Mod, Group, Config) ->
+    Mod:init_per_group(Group, Config).
+
+%% This is for sub-SUITEs
+t({_Mod, {NewMod, all}, _Groups}, _Config) when is_atom(NewMod) ->
+    t(NewMod);
+t({Mod, {group, Name} = Group, Groups}, Config) 
+  when is_atom(Mod) andalso is_atom(Name) andalso is_list(Groups) ->
+    case lists:keysearch(Name, 1, Groups) of
+	{value, {Name, _Props, GroupsAndCases}} ->
+	    try init_group(Mod, Name, Config) of
+		Config2 when is_list(Config2) ->
+		    Res = [t({Mod, Case, Groups}, Config2) || 
+			      Case <- GroupsAndCases],
+		    (catch end_group(Mod, Name, Config2)), 
+		    Res;
+		Error ->
+		    io:format(" => group (~w) init failed: ~p~n", 
+			      [Name, Error]),
+		    [{failed, {Mod, Group}, Error}]
+	    catch
+		exit:{skipped, SkipReason} ->
+		    io:format(" => skipping group: ~p~n", [SkipReason]),
+		    [{skipped, {Mod, Group}, SkipReason, 0}];
+		exit:{undef, _} ->
+		    [t({Mod, Case, Groups}, Config) || 
+			      Case <- GroupsAndCases];
+		T:E ->
+		    [{failed, {Mod, Group}, {T,E}, 0}]
+	    end;
+	false ->
+	    exit({unknown_group, Mod, Name, Groups})
+    end;
+t({Mod, Fun, _}, Config) 
+  when is_atom(Mod) andalso is_atom(Fun) ->
     case catch apply(Mod, Fun, [suite]) of
 	[] ->
 	    io:format("Eval:   ~p:", [{Mod, Fun}]),
@@ -286,26 +342,6 @@ t({Mod, Fun}, Config) when is_atom(Mod) andalso is_atom(Fun) ->
 		  end,
 	    t(lists:map(Map, Cases), Config);
 
-        {req, _, {conf, Init, Cases, Finish}} ->
-	    case (catch apply(Mod, Init, [Config])) of
-		Conf when is_list(Conf) ->
-		    io:format("Expand: ~p ...~n", [{Mod, Fun}]),
-		    Map = fun(Case) when is_atom(Case) -> {Mod, Case};
-			     (Case) -> Case
-			  end,
-		    Res = t(lists:map(Map, Cases), Conf),
-		    (catch apply(Mod, Finish, [Conf])),
-		    Res;
-		    
-		{'EXIT', {skipped, Reason}} ->
-		    io:format(" => skipping: ~p~n", [Reason]),
-		    [{skipped, {Mod, Fun}, Reason, 0}];
-		    
-		Error ->
-		    io:format(" => failed: ~p~n", [Error]),
-		    [{failed, {Mod, Fun}, Error, 0}]
-	    end;
-		    
         {'EXIT', {undef, _}} ->
 	    io:format("Undefined:   ~p~n", [{Mod, Fun}]),
 	    [{nyi, {Mod, Fun}, ok, 0}];
@@ -315,10 +351,38 @@ t({Mod, Fun}, Config) when is_atom(Mod) andalso is_atom(Fun) ->
 	    [{failed, {Mod, Fun}, Error, 0}]
     end;
 t(Mod, Config) when is_atom(Mod) ->
-    Res = t({Mod, all}, Config),
-    Res;
-t(Cases, Config) when is_list(Cases) ->
-    [t(Case, Config) || Case <- Cases];
+    %% This is assumed to be a test suite, so we start by calling 
+    %% the top test suite function(s) (all/0 and groups/0).
+    case (catch Mod:all()) of
+	Cases when is_list(Cases) -> 
+	    %% The list may contain atoms (actual test cases) and
+	    %% group-tuples (a tuple naming a group of test cases).
+	    %% A group is defined by the (optional) groups/0 function.
+	    Groups = groups(Mod),
+	    try init_suite(Mod, Config) of
+		Config2 when is_list(Config2) ->
+		    Res = [t({Mod, Case, Groups}, Config2) || Case <- Cases],
+		    (catch end_suite(Mod, Config2)),
+		    Res;
+		Error ->
+		    io:format(" => suite init failed: ~p~n", [Error]),
+		    [{failed, {Mod, init_per_suite}, Error}]
+	    catch 
+		exit:{skipped, SkipReason} ->
+		    io:format(" => skipping suite: ~p~n", [SkipReason]),
+		    [{skipped, {Mod, init_per_suite}, SkipReason, 0}];
+		exit:{undef, _} ->
+		    [t({Mod, Case, Groups}, Config) || Case <- Cases];
+		T:E ->
+		    [{failed, {Mod, init_per_suite}, {T,E}, 0}]
+	    end;
+        {'EXIT', {undef, _}} ->
+	    io:format("Undefined:   ~p~n", [{Mod, all}]),
+	    [{nyi, {Mod, all}, ok, 0}];
+		    
+	Crap ->
+	    Crap
+    end;
 t(Bad, _Config) ->
     [{badarg, Bad, ok, 0}].
 
@@ -333,7 +397,7 @@ eval(Mod, Fun, Config) ->
     Config2 = Mod:init_per_testcase(Fun, Config),
     Pid = spawn_link(?MODULE, do_eval, [self(), Mod, Fun, Config2]),
     R = wait_for_evaluator(Pid, Mod, Fun, Config2, []),
-    Mod:fin_per_testcase(Fun, Config2),
+    Mod:end_per_testcase(Fun, Config2),
     erase(megaco_test_server),    
     global:unregister_name(megaco_test_case_sup),
     process_flag(trap_exit, Flag),
@@ -495,28 +559,56 @@ do_display_memory([{Key, Mem1}|MemInfo1], MemInfo2) ->
 display_result([]) ->    
     io:format("OK~n", []);
 display_result(Res) when is_list(Res) ->
-    Ok      = [{MF, Time} || {ok,  MF, _, Time}  <- Res],
-    Nyi     = [MF || {nyi, MF, _, _Time} <- Res],
-    Skipped = [{MF, Reason} || {skipped, MF, Reason, _Time} <- Res],
-    Failed  = [{MF, Reason} || {failed,  MF, Reason, _Time} <- Res],
-    Crashed = [{MF, Reason} || {crashed, MF, Reason, _Time} <- Res],
-    display_summery(Ok, Nyi, Skipped, Failed, Crashed),
+    Ok           = [{MF, Time} || {ok,  MF, _, Time}  <- Res],
+    Nyi          = [MF || {nyi, MF, _, _Time} <- Res],
+    SkippedGrps  = [{{M,G}, Reason} || 
+		       {skipped, {M, {group, G}}, Reason, _Time} <- Res],
+    SkippedCases = [{MF, Reason} || 
+		       {skipped, {_M, F} = MF, Reason, _Time} <- Res, 
+		       is_atom(F)],
+    FailedGrps   = [{{M,G}, Reason} || 
+		       {failed,  {M, {group, G}}, Reason, _Time} <- Res],
+    FailedCases  = [{MF, Reason} || 
+		       {failed,  {_M, F} = MF, Reason, _Time} <- Res, 
+		       is_atom(F)],
+    Crashed      = [{MF, Reason} || {crashed, MF, Reason, _Time} <- Res],
+    display_summery(Ok, Nyi, 
+		    SkippedGrps, SkippedCases, 
+		    FailedGrps,  FailedCases, 
+		    Crashed),
     display_ok(Ok),
-    display_skipped(Skipped),
-    display_failed(Failed),
+    display_skipped("groups",     SkippedGrps),
+    display_skipped("test cases", SkippedCases),
+    display_failed("groups",      FailedGrps),
+    display_failed("test cases",  FailedCases),
     display_crashed(Crashed).
 
-display_summery(Ok, Nyi, Skipped, Failed, Crashed) ->
+display_summery(Ok, Nyi, 
+		SkippedGrps, SkippedCases, 
+		FailedGrps, FailedCases, 
+		Crashed) ->
     io:format("~nTest case summery:~n", []),
-    display_summery(Ok,      "successfull"),
-    display_summery(Nyi,     "not yet implemented"),
-    display_summery(Skipped, "skipped"),
-    display_summery(Failed,  "failed"),
-    display_summery(Crashed, "crashed"),
+    display_summery(Ok,           "test case",  "successfull"),
+    display_summery(Nyi,          "test case",  "not yet implemented"),
+    display_summery(SkippedGrps,  "group",      "skipped"),
+    display_summery(SkippedCases, "test case",  "skipped"),
+    display_summery(FailedGrps,   "group",      "failed"),
+    display_summery(FailedCases,  "test case",  "failed"),
+    display_summery(Crashed,      "test case",  "crashed"),
     io:format("~n", []).
    
-display_summery(Res, Info) ->
-    io:format("  ~w test cases ~s~n", [length(Res), Info]).
+
+display_summery(Res, Kind, Info) ->
+    Len = length(Res),
+    if 
+	Len =:= 1 ->
+	    display_summery(Len, Kind ++ " " ++ Info);
+	true ->
+	    display_summery(Len, Kind ++ "s " ++ Info)
+    end.
+    
+display_summery(Len, Info) ->
+    io:format("  ~w ~s~n", [Len, Info]).
     
 display_ok([]) ->
     ok;
@@ -528,20 +620,20 @@ display_ok(Ok) ->
     lists:foreach(F, Ok),
     io:format("~n", []).
 
-display_skipped([]) ->
+display_skipped(_, []) ->
     ok;
-display_skipped(Skipped) ->
-    io:format("Skipped test cases:~n", []),
-    F = fun({MF, Reason}) -> io:format("  ~p => ~p~n", [MF, Reason]) end,
+display_skipped(Pre, Skipped) ->
+    io:format("Skipped ~s:~n", [Pre]),
+    F = fun({X, Reason}) -> io:format("  ~p => ~p~n", [X, Reason]) end,
     lists:foreach(F, Skipped),
     io:format("~n", []).
 
 
-display_failed([]) ->
+display_failed(_, []) ->
     ok;
-display_failed(Failed) ->
-    io:format("Failed test cases:~n", []),
-    F = fun({MF, Reason}) -> io:format("  ~p => ~p~n", [MF, Reason]) end,
+display_failed(Pre, Failed) ->
+    io:format("Failed ~s:~n", [Pre]),
+    F = fun({X, Reason}) -> io:format("  ~p => ~p~n", [X, Reason]) end,
     lists:foreach(F, Failed),
     io:format("~n", []).
 
@@ -677,11 +769,11 @@ init_per_testcase(_Case, Config) ->
     end,
     set_kill_timer(Config).
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Name = megaco_global_logger,
     case global:whereis_name(Name) of
 	undefined ->
-	    io:format("~w:fin_per_testcase -> already un-registered~n", 
+	    io:format("~w:end_per_testcase -> already un-registered~n", 
 		      [?MODULE]),
 	    ok;
 	Pid when is_pid(Pid) ->
@@ -837,5 +929,5 @@ start_nodes([Node | Nodes], File, Line) ->
 start_nodes([], _File, _Line) ->
     ok.
 
-p(F,A) ->
-    io:format("~p" ++ F ++ "~n", [self()|A]).
+p(F, A) ->
+    io:format("~p~w:" ++ F ++ "~n", [self(), ?MODULE |A]).
diff --git a/lib/megaco/test/megaco_test_megaco_generator.erl b/lib/megaco/test/megaco_test_megaco_generator.erl
index 5ff7162223..f0c723d2cf 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -26,6 +26,8 @@
 
 -behaviour(megaco_test_generator).
 
+-compile({no_auto_import,[error/1]}).
+
 %% API
 -export([
          start_link/1, start_link/2,
diff --git a/lib/megaco/test/megaco_test_mg.erl b/lib/megaco/test/megaco_test_mg.erl
index 22b65a1ac6..ecb3cedc83 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
diff --git a/lib/megaco/test/megaco_test_mgc.erl b/lib/megaco/test/megaco_test_mgc.erl
index 05c482f1af..13c1cebe56 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
diff --git a/lib/megaco/test/megaco_test_msg_prev3a_lib.erl b/lib/megaco/test/megaco_test_msg_prev3a_lib.erl
index 5ce2ec302b..fad7f29831 100644
--- a/lib/megaco/test/megaco_test_msg_prev3a_lib.erl
+++ b/lib/megaco/test/megaco_test_msg_prev3a_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -26,6 +26,10 @@
 
 %% ----
 
+-compile({no_auto_import,[error/1]}).
+
+%% ----
+
 -include_lib("megaco/include/megaco_message_prev3a.hrl").
 -include_lib("megaco/include/megaco.hrl").
 
diff --git a/lib/megaco/test/megaco_test_msg_prev3b_lib.erl b/lib/megaco/test/megaco_test_msg_prev3b_lib.erl
index be87dc9a41..2f1a093728 100644
--- a/lib/megaco/test/megaco_test_msg_prev3b_lib.erl
+++ b/lib/megaco/test/megaco_test_msg_prev3b_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -26,6 +26,10 @@
 
 %% ----
 
+-compile({no_auto_import,[error/1]}).
+
+%% ----
+
 -include_lib("megaco/include/megaco_message_prev3b.hrl").
 -include_lib("megaco/include/megaco.hrl").
 
diff --git a/lib/megaco/test/megaco_test_msg_prev3c_lib.erl b/lib/megaco/test/megaco_test_msg_prev3c_lib.erl
index 74a05060d0..884e2f2bad 100644
--- a/lib/megaco/test/megaco_test_msg_prev3c_lib.erl
+++ b/lib/megaco/test/megaco_test_msg_prev3c_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. 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
@@ -26,6 +26,10 @@
 
 %% ----
 
+-compile({no_auto_import,[error/1]}).
+
+%% ----
+
 -include_lib("megaco/include/megaco_message_prev3c.hrl").
 -include_lib("megaco/include/megaco.hrl").
 
diff --git a/lib/megaco/test/megaco_test_msg_v1_lib.erl b/lib/megaco/test/megaco_test_msg_v1_lib.erl
index 638215e8c1..76665cb575 100644
--- a/lib/megaco/test/megaco_test_msg_v1_lib.erl
+++ b/lib/megaco/test/megaco_test_msg_v1_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -28,6 +28,10 @@
 
 %% ----
 
+-compile({no_auto_import,[error/1]}).
+
+%% ----
+
 -include_lib("megaco/include/megaco_message_v1.hrl").
 -include_lib("megaco/include/megaco.hrl").
 
diff --git a/lib/megaco/test/megaco_test_msg_v2_lib.erl b/lib/megaco/test/megaco_test_msg_v2_lib.erl
index b680bc869a..66e423284a 100644
--- a/lib/megaco/test/megaco_test_msg_v2_lib.erl
+++ b/lib/megaco/test/megaco_test_msg_v2_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -26,6 +26,10 @@
 
 %% ----
 
+-compile({no_auto_import,[error/1]}).
+
+%% ----
+
 -include_lib("megaco/include/megaco_message_v2.hrl").
 -include_lib("megaco/include/megaco.hrl").
 
diff --git a/lib/megaco/test/megaco_test_msg_v3_lib.erl b/lib/megaco/test/megaco_test_msg_v3_lib.erl
index 7b0d4f7d37..24492167ff 100644
--- a/lib/megaco/test/megaco_test_msg_v3_lib.erl
+++ b/lib/megaco/test/megaco_test_msg_v3_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. 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
@@ -26,6 +26,10 @@
 
 %% ----
 
+-compile({no_auto_import,[error/1]}).
+
+%% ----
+
 -include_lib("megaco/include/megaco_message_v3.hrl").
 -include_lib("megaco/include/megaco.hrl").
 
diff --git a/lib/megaco/test/megaco_test_tcp_generator.erl b/lib/megaco/test/megaco_test_tcp_generator.erl
index e4f27f32f5..3ed4c49bab 100644
--- a/lib/megaco/test/megaco_test_tcp_generator.erl
+++ b/lib/megaco/test/megaco_test_tcp_generator.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -26,6 +26,8 @@
 
 -behaviour(megaco_test_generator).
 
+-compile({no_auto_import,[error/1]}).
+
 %% API
 -export([
 	 start_link/1, start_link/2, 
diff --git a/lib/megaco/test/megaco_timer_test.erl b/lib/megaco/test/megaco_timer_test.erl
index 8bcfc5a907..9b9103c40b 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -23,22 +23,17 @@
 %%----------------------------------------------------------------------
 -module(megaco_timer_test).
 
+-compile({no_auto_import,[error/1]}).
+
 -export([
 	 t/0, t/1,
-	 init_per_testcase/2, fin_per_testcase/2,
-	 
-	 all/1,
-
-	 simple/1,
+	 init_per_testcase/2, end_per_testcase/2,
+	 all/0,groups/0,init_per_group/2,end_per_group/2,
 	 simple_init/1,
 	 simple_usage/1,
-
-	 integer_timer/1,
 	 integer_timer_start_and_expire/1, 
 	 integer_timer_start_and_stop/1%% ,
-
 %%	 incr_timer/1
-	 
 	]).
 
 -export([
@@ -71,49 +66,39 @@ do_init_per_testcase(Case, Config) ->
     {ok, _Pid} = megaco_monitor:start_link(),
     megaco_test_lib:init_per_testcase(Case, [{monitor_running, true}|Config]).
     
-fin_per_testcase(Case, Config) ->
-    io:format("fin_per_testcase -> entry with"
+end_per_testcase(Case, Config) ->
+    io:format("end_per_testcase -> entry with"
 	       "~n   Case:   ~p"
 	       "~n   Config: ~p"
 	       "~n", [Case, Config]),
     process_flag(trap_exit, false),
     case lists:keydelete(monitor_running, 1, Config) of
 	Config ->
-	    megaco_test_lib:fin_per_testcase(Case, Config);
+	    megaco_test_lib:end_per_testcase(Case, Config);
 	Config2 ->
 	    megaco_monitor:stop(),
-	    megaco_test_lib:fin_per_testcase(Case, Config2)
+	    megaco_test_lib:end_per_testcase(Case, Config2)
     end.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 simple,
- 	 integer_timer%% ,
-%% 	 incr_timer
-	],
-    Cases.
-
-
-simple(suite) ->
-    Cases = 
-	[
-	 simple_init,
-	 simple_usage
-	],
-    Cases.
-
-
-integer_timer(suite) ->
-    Cases = 
-	[
-	 integer_timer_start_and_expire,
-	 integer_timer_start_and_stop
-	],
-    Cases.
+all() -> 
+    [{group, simple}, {group, integer_timer}].
+
+groups() -> 
+    [{simple, [],
+      [simple_init, simple_usage]},
+%, incr_timer
+     {integer_timer, [],
+      [integer_timer_start_and_expire,
+       integer_timer_start_and_stop]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 
 %% incr_timer(suite) ->
diff --git a/lib/megaco/test/megaco_trans_test.erl b/lib/megaco/test/megaco_trans_test.erl
index 44d4b3fff7..5f564e3bf6 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -95,78 +95,49 @@ init_per_testcase(Case, Config) ->
     process_flag(trap_exit, true),
     megaco_test_lib:init_per_testcase(Case, Config).
 
-fin_per_testcase(Case, Config) ->
+end_per_testcase(Case, Config) ->
     process_flag(trap_exit, false),
-    megaco_test_lib:fin_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    [
-     ack,
-     trans_req,
-     trans_req_and_ack,
-     pending,
-     reply,
-
-     tickets
-    ].
-
-ack(suite) ->
-    [
-     single_ack,
-     multi_ack_timeout,
-     multi_ack_maxcount
-    ].
-
-trans_req(suite) ->
-    [
-     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(suite) ->
-    [
-     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(suite) ->
-    [
-     single_trans_req_and_pending,
-     multi_trans_req_and_pending,
-     multi_trans_req_and_ack_and_pending,
-     multi_ack_and_pending
-    ].
-
-reply(suite) ->
-    [
-     multi_trans_req_and_reply,
-     multi_trans_req_and_ack_and_reply,
-     multi_ack_and_reply
-    ].
-
-tickets(suite) ->
-    [
-     otp_7192
-    ].
-
-otp_7192(suite) ->
-    [
-     otp_7192_1,
-     otp_7192_2,
-     otp_7192_3
-    ].
-
+all() -> 
+    [{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]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_udp_test.erl b/lib/megaco/test/megaco_udp_test.erl
index 2e2f5465dd..ffbff9b762 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -34,22 +34,14 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-	 all/1,
-	 
-	 start/1,
+	 all/0,groups/0,init_per_group/2,end_per_group/2,
 	 start_normal/1,
 	 start_invalid_opt/1,
          start_and_stop/1,
-
-	 sending/1,
 	 sendreceive/1,
          block_unblock/1,
-
-	 errors/1,
 	 socket_failure/1,
-
-         init_per_testcase/2, fin_per_testcase/2,
- 
+         init_per_testcase/2, end_per_testcase/2,
          t/0, t/1
          ]).
 
@@ -104,42 +96,31 @@ init_per_testcase(Case, Config) ->
 
 
 %%----------------------------------------------------------------------
-%% Function: fin_per_testcase/2
+%% Function: end_per_testcase/2
 %% Description: 
 %%----------------------------------------------------------------------
-fin_per_testcase(Case, Config) ->
-    megaco_test_lib:fin_per_testcase(Case, Config).
+end_per_testcase(Case, Config) ->
+    megaco_test_lib:end_per_testcase(Case, Config).
 
 
 %%======================================================================
 %% Test case definitions
 %%======================================================================
 
-all(suite) ->
-    [
-     start,
-     sending,
-     errors
-    ].
-
-start(suite) ->
-    [
-     start_normal,
-     start_invalid_opt,
-     start_and_stop
-    ].
+all() -> 
+    [{group, start}, {group, sending}, {group, errors}].
 
-sending(suite) ->
-    [
-     sendreceive,
-     block_unblock
+groups() -> 
+    [{start, [],
+      [start_normal, start_invalid_opt, start_and_stop]},
+     {sending, [], [sendreceive, block_unblock]},
+     {errors, [], [socket_failure]}].
 
-    ].
+init_per_group(_GroupName, Config) ->
+    Config.
 
-errors(suite) ->
-    [
-     socket_failure
-    ].
+end_per_group(_GroupName, Config) ->
+    Config.
 
 
 %% =================================================
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 4ef0ed8f18..5f71712360 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2001-2010. All Rights Reserved.
+# Copyright Ericsson AB 1997-2011. 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
@@ -18,132 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN = 3.14.1
-PRE_VSN    =
-APP_VSN    = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
-
-TICKETS = OTP-8529 OTP-8561 OTP-8627 OTP-8634
-
-TICKETS_3_14 = OTP-8317 OTP-8323 OTP-8328 OTP-8362 OTP-8403
-
-TICKETS_3_13 = OTP-8205 OTP-8239 OTP-8249
-
-TICKETS_3_12 = OTP-8183 OTP-8212
-
-TICKETS_3_11_3 = OTP-8164 OTP-8167 OTP-8191
-
-TICKETS_3_11_2 = OTP-8123
-
-TICKETS_3_11_1 = OTP-8081 OTP-8114
-
-TICKETS_3_11 = OTP-7302 OTP-7995
-
-TICKETS_3_10_1 = OTP-7926 OTP-7936
-
-TICKETS_3_10_0_1 = OTP-7851
-
-TICKETS_3_10 = OTP-7713 OTP-7743
-
-TICKETS_3_9_4 = OTP-7728 OTP-7733
-
-TICKETS_3_9_3 = OTP-7700
-
-TICKETS_3_9_2 = OTP-7671 OTP-7672
-
-TICKETS_3_9_1_1 = OTP-7614
-
-TICKETS_3_9_1 = OTP-7572 OTP-7573 OTP-7576
-
-TICKETS_3_9 = OTP-7431
-
-TICKETS_3_8_2 = OTP-7534
-
-TICKETS_3_8_1 = OTP-7398 OTP-7417 OTP-7444 OTP-7449 OTP-7455 OTP-7457 OTP-7459
-
-TICKETS_3_8 = OTP-7192 OTP-7228 OTP-7259 
-
-TICKETS_3_7_5 = OTP-7286 OTP-7303
-
-TICKETS_3_7_4 = OTP-7249 OTP-7251
-
-TICKETS_3_7_3 = OTP-7168 OTP-7180 OTP-7189 OTP-7216
-
-TICKETS_3_7_2 = OTP-6972 OTP-7138
-
-TICKETS_3_7_1 = OTP-6919 OTP-6971 OTP-6992 OTP-6999 OTP-7000 OTP-7005 OTP-7124
-
-TICKETS_3_7 = OTP-5979 OTP-6753 OTP-6804 OTP-6865 OTP-6919 OTP-6976
-
-TICKETS_3_6_2 = OTP-6921
-
-TICKETS_3_6_1 = OTP-6803
-
-TICKETS_3_6_0_1 = OTP-6704
-
-TICKETS_3_6 = OTP-6185 OTP-6578 OTP-6441 OTP-6442 OTP-6544 OTP-6605 OTP-6609
-
-TICKETS_3_5_3 = OTP-6520 OTP-6549
-
-TICKETS_3_5_2 = OTP-6404 OTP-6422 OTP-6490 OTP-6503
-
-TICKETS_3_5_1 = OTP-6275 OTP-6276
-
-TICKETS_3_5 = OTP-6223 OTP-6253 OTP-6256
-
-TICKETS_3_4_4 = OTP-6181 OTP-6182 OTP-6217 OTP-6219
-
-TICKETS_3_4_3 = OTP-6170 OTP-6171 OTP-6172 
-
-TICKETS_3_4_2 = OTP-6148
-
-TICKETS_3_4_1 = OTP-6113
-
-TICKETS_3_4 = \
-	OTP-5769 \
-	OTP-5980 \
-	OTP-6009 \
-	OTP-6025 \
-	OTP-6028 \
-	OTP-6030 \
-	OTP-6048 \
-	OTP-6051 \
-	OTP-6052 \
-	OTP-6055 \
-	OTP-6089 \
-	OTP-6090
-
-TICKETS_3_3_5 = OTP-6108
-
-TICKETS_3_3_4 = OTP-6076
-
-TICKETS_3_3_3 = OTP-6046
-
-TICKETS_3_3_2 = OTP-6017 OTP-6022
-
-TICKETS_3_3_1 = OTP-5993
-
-TICKETS_3_3 = OTP-5965 OTP-5973
-
-TICKETS_3_2_7 = OTP-5948 OTP-5952 OTP-5953
-
-TICKETS_3_2_6 = OTP-5918 OTP-5919 OTP-5920
-
-TICKETS_3_2_5 = OTP-5887
-
-TICKETS_3_2_4 = OTP-5867 OTP-5879 OTP-5880 OTP-5881 OTP-5882 OTP-5885 OTP-5886
-
-TICKETS_3_2_3 = OTP-5826 OTP-5830 OTP-5833 OTP-5836 OTP-5839
-
-TICKETS_3_2_2 = OTP-5799 OTP-5803 OTP-5804 OTP-5805 OTP-5816
-
-TICKETS_3_2_1 = OTP-5725 OTP-5793
-
-TICKETS_3_2 = OTP-5717 OTP-5750
-
-TICKETS_3_1 = OTP-5542 OTP-5597 OTP-5600 OTP-5601 OTP-5619 OTP-5664
-
-TICKETS_3_0_1 = \
-	OTP-5401 \
-	OTP-5446 \
-	OTP-5447
-
+MEGACO_VSN  = 3.15.1
+PRE_VSN     =
+APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc
index 0714c7b645..2e2cc386b7 100644
--- a/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc
@@ -235,9 +235,7 @@
         <seealso marker="Mnesia_chap3#start_mnesia">Starting Mnesia</seealso>.
         </item>
       </list>
-      <p>Continuing the dialogue with the Erlang shell will produce the following
-        the following:
-        </p>
+      <p>Continuing the dialogue with the Erlang shell will produce the following:</p>
       <pre><![CDATA[
         3> company:init().
         {atomic,ok}
@@ -418,7 +416,7 @@ In_proj</tcaption>
         interchangeably throughout this book. 
         </p>
       <p>A Mnesia table is populated by Mnesia records. For example,
-        the tuple <c>{boss, klacke, bjarne}</c> is an record.  The
+        the tuple <c>{boss, klacke, bjarne}</c> is a record.  The
         second element in this tuple is the key. In order to uniquely
         identify a table row both the key and the table name is
         needed. The term <em>object identifier</em>, 
@@ -553,7 +551,7 @@ In_proj</tcaption>
           stored in the database: 
           </p>
         <pre>
-\011  mnesia:select(employee, [{#employee{sex = female, name = '$1', _ = '_'},[], ['$1']}]).
+mnesia:select(employee, [{#employee{sex = female, name = '$1', _ = '_'},[], ['$1']}]).
         </pre>
         <p>Select must always run within an activity such as a
           transaction. To be able to call from the shell we might
@@ -587,8 +585,8 @@ In_proj</tcaption>
           </p>
         <pre>
           Q = qlc:q([E#employee.name || E <![CDATA[<-]]> mnesia:table(employee),
-\011                                E#employee.sex == female]),
-\011  qlc:e(Q),
+                                E#employee.sex == female]),
+          qlc:e(Q),
         </pre>
         <p>Accessing mnesia tables from a QLC list comprehension must
           always be done within a transaction. Consider the following
diff --git a/lib/mnesia/doc/src/Mnesia_chap3.xml b/lib/mnesia/doc/src/Mnesia_chap3.xml
index 9a382bcb5a..2db9af9cf7 100644
--- a/lib/mnesia/doc/src/Mnesia_chap3.xml
+++ b/lib/mnesia/doc/src/Mnesia_chap3.xml
@@ -132,7 +132,7 @@
             function changes the format on all records in table
             <c>Tab</c>. It applies the argument <c>Fun</c> to all
             records in the table. <c>Fun</c> shall be a function which
-            takes an record of the old type, and returns the record of the new
+            takes a record of the old type, and returns the record of the new
             type. The table key may not be changed.</p>
           <code type="none">
 -record(old, {key, val}).
@@ -418,8 +418,8 @@ skeppet %<input>erl -sname b -mnesia dir '"/ldisc/scratch/Mnesia.company"'</inpu
               type <c>set</c> and <c>bag</c>: </p>
             <pre>
  f() -> F =  fun() ->
-\011      mnesia:write({foo, 1, 2}), mnesia:write({foo, 1, 3}),
-\011      mnesia:read({foo, 1}) end, mnesia:transaction(F).             </pre>
+     mnesia:write({foo, 1, 2}), mnesia:write({foo, 1, 3}),
+     mnesia:read({foo, 1}) end, mnesia:transaction(F).             </pre>
             <p>This transaction will return the list <c>[{foo,1,3}]</c> if
               the <c>foo</c> table is of type <c>set</c>.  However, list
               <c>[{foo,1,2}, {foo,1,3}]</c> will return if the table is
diff --git a/lib/mnesia/doc/src/Mnesia_chap4.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap4.xmlsrc
index 7d89c1b0dd..6e8055326b 100644
--- a/lib/mnesia/doc/src/Mnesia_chap4.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_chap4.xmlsrc
@@ -514,13 +514,13 @@ The behavior is undefined if any process perform a write
        of the table itself. This is an implementation detail, but remember
        the dirty functions are low level functions. 
       </item>
-      <item><c>mnesia:dirty_last(Tab)</c> This function works exactly as
+      <item><c>mnesia:dirty_last(Tab)</c> This function works exactly like
       <c>mnesia:dirty_first/1</c> but returns the last object in
        Erlang  term  order for the <c>ordered_set</c> table type. For
        all other table types, <c>mnesia:dirty_first/1</c> and 
       <c>mnesia:dirty_last/1</c> are synonyms.
       </item>
-      <item><c>mnesia:dirty_prev(Tab, Key)</c> This function works exactly as
+      <item><c>mnesia:dirty_prev(Tab, Key)</c> This function works exactly like
       <c>mnesia:dirty_next/2</c> but returns the previous object in
        Erlang term  order for the ordered_set table type. For
        all other table types, <c>mnesia:dirty_next/2</c> and 
diff --git a/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc
index 1c7e3662e1..30a8991465 100644
--- a/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc
@@ -335,7 +335,7 @@ ok
             explicitly be set at table creation. The default is
             <c>0</c>, but if <c>n_disc_copies</c> and
             <c>n_disc_only_copies</c> also are <c>0</c>,
-            <c>n_ram_copies</c>\011will default be set to <c>1</c>. 
+            <c>n_ram_copies</c> will default be set to <c>1</c>.
             </p>
         </item>
         <tag><c>{n_disc_copies, Int}</c></tag>
@@ -408,7 +408,7 @@ ok
 (a@sam)4> SecProps = [{foreign_key, {prim_dict, sec_val}}].
 [{foreign_key,{prim_dict,sec_val}}]
 (a@sam)5> mnesia:create_table(sec_dict, 
-\011                      [{frag_properties, SecProps},
+                              [{frag_properties, SecProps},
 (a@sam)5>                      {attributes, [sec_key, sec_val]}]).
 {atomic,ok}
 (a@sam)6> Write = fun(Rec) -> mnesia:write(Rec) end.
@@ -418,23 +418,23 @@ ok
 (a@sam)8> SecKey = 42.
 42
 (a@sam)9> mnesia:activity(sync_dirty, Write,
-\011\011          [{prim_dict, PrimKey, -11}], mnesia_frag).
+                          [{prim_dict, PrimKey, -11}], mnesia_frag).
 ok
 (a@sam)10> mnesia:activity(sync_dirty, Write,
-\011\011           [{sec_dict, SecKey, PrimKey}], mnesia_frag).
+                           [{sec_dict, SecKey, PrimKey}], mnesia_frag).
 ok
 (a@sam)11> mnesia:change_table_frag(prim_dict, {add_frag, [node()]}).
 {atomic,ok}
 (a@sam)12> SecRead = fun(PrimKey, SecKey) ->
-\011\011       mnesia:read({sec_dict, PrimKey}, SecKey, read) end.
+               mnesia:read({sec_dict, PrimKey}, SecKey, read) end.
 #Fun<erl_eval>
 (a@sam)13> mnesia:activity(transaction, SecRead,
-\011\011           [PrimKey, SecKey], mnesia_frag).
+                           [PrimKey, SecKey], mnesia_frag).
 [{sec_dict,42,11}]
 (a@sam)14> Info = fun(Tab, Item) -> mnesia:table_info(Tab, Item) end.
 #Fun<erl_eval>
 (a@sam)15> mnesia:activity(sync_dirty, Info,
-\011\011           [prim_dict, frag_size], mnesia_frag).
+                           [prim_dict, frag_size], mnesia_frag).
 [{prim_dict,0},
  {prim_dict_frag2,0},
  {prim_dict_frag3,0},
@@ -444,7 +444,7 @@ ok
  {prim_dict_frag7,0},
  {prim_dict_frag8,0}]
 (a@sam)16> mnesia:activity(sync_dirty, Info,
-\011\011           [sec_dict, frag_size], mnesia_frag).
+                           [sec_dict, frag_size], mnesia_frag).
 [{sec_dict,0},
  {sec_dict_frag2,0},
  {sec_dict_frag3,0},
@@ -1051,7 +1051,7 @@ ok
            ActivityID will be received.  Note that this event may still be received even
            if no table events with a corresponding ActivityID were received, depending on
            the tables to which the receiving process is subscribed.</p>
-	 <p>Dirty operations always only contain one update and thus no activity event is sent.</p>
+         <p>Dirty operations always only contain one update and thus no activity event is sent.</p>
        </item>
      </taglist>
     </section>
diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml
index 5d3bcf830e..16e78ea0af 100644
--- a/lib/mnesia/doc/src/mnesia.xml
+++ b/lib/mnesia/doc/src/mnesia.xml
@@ -799,7 +799,7 @@ mnesia:change_table_copy_type(person, node(), disc_copies)
           </item>
           <item>
             <p><c>{local_content, Bool}</c>, where <c>Bool</c> must be
-              either <c>true</c> or <c>false</c>. The default value is <c>false</c>.\011      </p>
+              either <c>true</c> or <c>false</c>. The default value is <c>false</c>.</p>
           </item>
         </list>
         <p>For example, the following call creates the <c>person</c> table
@@ -1022,7 +1022,7 @@ mnesia:create_table(person,
       <name>dirty_last(Tab) ->  Key | exit({aborted, Reason}) </name>
       <fsummary>Return the key for the last record in a table.</fsummary>
       <desc>
-        <p>This function works exactly 
+        <p>This function works exactly like
           <c>mnesia:dirty_first/1</c> but returns the last object in
           Erlang  term  order for the <c>ordered_set</c> table type. For
           all other table types, <c>mnesia:dirty_first/1</c> and 
@@ -1063,11 +1063,11 @@ mnesia:create_table(person,
       <name>dirty_prev(Tab, Key) -> Key | exit({aborted, Reason}) </name>
       <fsummary>Return the previous key in a table. </fsummary>
       <desc>
-        <p>This function works exactly 
+        <p>This function works exactly like
           <c>mnesia:dirty_next/2</c> but returns the previous object in
           Erlang term  order for the ordered_set table type. For
           all other table types, <c>mnesia:dirty_next/2</c> and 
-          <c>mnesia:dirty_prev/2</c> are synonyms.\011  </p>
+          <c>mnesia:dirty_prev/2</c> are synonyms.</p>
       </desc>
     </func>
     <func>
@@ -1334,7 +1334,7 @@ mnesia:create_table(person,
       <name>foldr(Function, Acc, Table) -> NewAcc | transaction abort </name>
       <fsummary>Call Function for each record in Table  </fsummary>
       <desc>
-        <p>This function works exactly as 
+        <p>This function works exactly like
           <c>foldl/3</c> but iterates the table in the opposite order 
           for the <c>ordered_set</c> table type. For
           all other table types, <c>foldr/3</c> and 
@@ -1512,14 +1512,14 @@ mnesia:create_table(person,
       <fsummary>Check if code is running in a transaction.</fsummary>
       <desc>
         <p>When this function is executed inside a transaction context
-	  it returns <c>true</c>, otherwise <c>false</c>.</p>
+          it returns <c>true</c>, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
       <name>last(Tab) ->  Key | transaction abort </name>
       <fsummary>Return the key for the last record in a table.</fsummary>
       <desc>
-        <p>This function works exactly 
+        <p>This function works exactly like
           <c>mnesia:first/1</c> but returns the last object in
           Erlang  term  order for the <c>ordered_set</c> table type. For
           all other table types, <c>mnesia:first/1</c> and 
@@ -1698,11 +1698,11 @@ mnesia:create_table(person,
       <name>prev(Tab, Key) -> Key | transaction abort </name>
       <fsummary>Return the previous key in a table. </fsummary>
       <desc>
-        <p>This function works exactly 
+        <p>This function works exactly like
           <c>mnesia:next/2</c> but returns the previous object in
           Erlang term  order for the ordered_set table type. For
           all other table types, <c>mnesia:next/2</c> and 
-          <c>mnesia:prev/2</c> are synonyms.\011  </p>
+          <c>mnesia:prev/2</c> are synonyms.</p>
       </desc>
     </func>
     <func>
@@ -1891,10 +1891,10 @@ mnesia:create_table(person,
         <p>For example to find the names of all male persons with an age over 30 in table
           Tab do:</p>
         <code type="none">
-\011  MatchHead = #person{name='$1', sex=male, age='$2', _='_'},
-\011  Guard = {'>', '$2', 30},
-\011  Result = '$1',
-\011  mnesia:select(Tab,[{MatchHead, [Guard], [Result]}]),
+MatchHead = #person{name='$1', sex=male, age='$2', _='_'},
+Guard = {'>', '$2', 30},
+Result = '$1',
+mnesia:select(Tab,[{MatchHead, [Guard], [Result]}]),
         </code>
       </desc>
     </func>
@@ -2835,7 +2835,7 @@ raise(Name, Amount) ->
     </func>
     <func>
       <name>write(Tab, Record, LockKind) -> transaction abort | ok </name>
-      <fsummary>Write an record into the database.</fsummary>
+      <fsummary>Write a record into the database.</fsummary>
       <desc>
         <p>Writes the record <c>Record</c> to the table <c>Tab</c>.
           </p>
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 66242398d9..5a6de05c8b 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -37,6 +37,66 @@
     bugfixes for every release of Mnesia. Each release of Mnesia
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
+
+  <section><title>Mnesia 4.4.16</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Sometimes a 'log_header' record was added to tables when
+	    invoking mnesia:restore/2 with the option
+	    'recreate_tables'. Thanks Vance Shipley.</p>
+          <p>
+	    Own Id: OTP-8960</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Compiler warnings were eliminated.</p>
+          <p>
+	    Own Id: OTP-8855</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.4.15</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Eliminated warnings for auto-imported BIF clashes.</p>
+          <p>
+	    Own Id: OTP-8840</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.4.14</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+            Added mnesia:subscribe(activity) contributed by Bernard
+            Duggan.</p>
+          <p>
+            Own Id: OTP-8519</p>
+        </item>
+      </list>
+    </section>
+    
+  </section>  
   
   <section><title>Mnesia 4.4.13</title>
 
diff --git a/lib/mnesia/examples/mnesia_meter.erl b/lib/mnesia/examples/mnesia_meter.erl
index ea74d8691b..68094c4431 100644
--- a/lib/mnesia/examples/mnesia_meter.erl
+++ b/lib/mnesia/examples/mnesia_meter.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
 %%
 
@@ -407,7 +407,7 @@ run(Nodes, Config, FunOverhead) ->
     stop(Nodes),
     Res.
 
-run_meter(M, Nodes, FunOverhead) when record(M, meter) ->
+run_meter(M, Nodes, FunOverhead) when is_record(M, meter) ->
     io:format(".", []),
     case catch init_records(M#meter.init, ?TIMES) of
         {atomic, ok} ->
diff --git a/lib/mnesia/src/mnesia.appup.src b/lib/mnesia/src/mnesia.appup.src
index b3b9297db2..22ef5178a7 100644
--- a/lib/mnesia/src/mnesia.appup.src
+++ b/lib/mnesia/src/mnesia.appup.src
@@ -1,69 +1,13 @@
 %% -*- erlang -*-
 {"%VSN%",  
- [
-  {"4.4.12",
-   [
-    {update, mnesia, soft, soft_purge, soft_purge, []},
-    {update, mnesia_loader, soft, soft_purge, soft_purge, []},
-    {update, mnesia_monitor, soft, soft_purge, soft_purge, []},    
-    {update, mnesia_tm, soft, soft_purge, soft_purge, []}
-   ]
-  },
-  {"4.4.11",
-   [
-    {update, mnesia, soft, soft_purge, soft_purge, []},
-    {update, mnesia_loader, soft, soft_purge, soft_purge, []},
-    {update, mnesia_monitor, soft, soft_purge, soft_purge, []},    
-    {update, mnesia_tm, soft, soft_purge, soft_purge, []},
-    {update, mnesia_locker, soft, soft_purge, soft_purge, []},
-    {update, mnesia_controller, soft, soft_purge, soft_purge, []}
-   ]
-  },
-  {"4.4.10",
-   [
-    {update, mnesia, soft, soft_purge, soft_purge, []},
-    {update, mnesia_loader, soft, soft_purge, soft_purge, []},
-    {update, mnesia_monitor, soft, soft_purge, soft_purge, []},    
-    {update, mnesia_tm, soft, soft_purge, soft_purge, []},
-    {update, mnesia_locker, soft, soft_purge, soft_purge, []},
-    {update, mnesia_controller, soft, soft_purge, soft_purge, []}
-   ]
-  },
-  {"4.4.9", [{restart_application, mnesia}]},
-  {"4.4.8", [{restart_application, mnesia}]},
-  {"4.4.7", [{restart_application, mnesia}]}
+ [  
+    {"4.4.15",[
+	       {update, mnesia_dumper, soft, soft_purge, soft_purge, []}
+	      ]}
  ],
  [
-  {"4.4.12",
-   [
-    {update, mnesia, soft, soft_purge, soft_purge, []},
-    {update, mnesia_loader, soft, soft_purge, soft_purge, []},
-    {update, mnesia_monitor, soft, soft_purge, soft_purge, []},    
-    {update, mnesia_tm, soft, soft_purge, soft_purge, []}
-   ]
-  },
-  {"4.4.11",
-   [
-    {update, mnesia, soft, soft_purge, soft_purge, []},
-    {update, mnesia_loader, soft, soft_purge, soft_purge, []},
-    {update, mnesia_monitor, soft, soft_purge, soft_purge, []},    
-    {update, mnesia_tm, soft, soft_purge, soft_purge, []},
-    {update, mnesia_locker, soft, soft_purge, soft_purge, []},
-    {update, mnesia_controller, soft, soft_purge, soft_purge, []}
-   ]
-  },
-  {"4.4.10",
-   [
-    {update, mnesia, soft, soft_purge, soft_purge, []},
-    {update, mnesia_loader, soft, soft_purge, soft_purge, []},
-    {update, mnesia_monitor, soft, soft_purge, soft_purge, []},    
-    {update, mnesia_tm, soft, soft_purge, soft_purge, []},
-    {update, mnesia_locker, soft, soft_purge, soft_purge, []},
-    {update, mnesia_controller, soft, soft_purge, soft_purge, []}
-   ]
-  },
-  {"4.4.9", [{restart_application, mnesia}]},
-  {"4.4.8", [{restart_application, mnesia}]},
-  {"4.4.7", [{restart_application, mnesia}]}
+  {"4.4.15",[
+	     {update, mnesia_dumper, soft, soft_purge, soft_purge, []}
+	    ]}
  ]
 }.
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index 0298b382a6..021be8af2a 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -98,6 +98,8 @@
 	 connect_nodes2/3
 	]).
 
+-compile({no_auto_import,[error/2]}).
+
 -import(mnesia_lib, [set/2, add/2]).
 -import(mnesia_lib, [fatal/2, error/2, verbose/2, dbg_out/2]).
 
diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl
index f669d009c6..644133cf5d 100644
--- a/lib/mnesia/src/mnesia_dumper.erl
+++ b/lib/mnesia/src/mnesia_dumper.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -643,7 +643,7 @@ insert_op(Tid, _, {op, create_table, TabDef}, InPlace, InitBy) ->
 			true -> ignore;
 			false ->
 			    mnesia_log:open_log(temp, 
-						mnesia_log:dcl_log_header(),
+						mnesia_log:dcd_log_header(),
 						Dcd, 
 						false, 
 						false,
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl
index cfa3f171b2..6b5770d91e 100644
--- a/lib/mnesia/src/mnesia_locker.erl
+++ b/lib/mnesia/src/mnesia_locker.erl
@@ -49,6 +49,8 @@
 	 system_code_change/4
 	]).
 
+-compile({no_auto_import,[error/2]}).
+
 -include("mnesia.hrl").
 -import(mnesia_lib, [dbg_out/2, error/2, verbose/2]).
 
diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl
index 00ec4740ee..11b792026e 100644
--- a/lib/mnesia/src/mnesia_log.erl
+++ b/lib/mnesia/src/mnesia_log.erl
@@ -182,6 +182,8 @@
 	]).
 	
 	
+-compile({no_auto_import,[error/2]}).
+
 -include("mnesia.hrl").
 -import(mnesia_lib, [val/1, dir/1]).
 -import(mnesia_lib, [exists/1, fatal/2, error/2, dbg_out/2]).
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl
index 5bd93d6b9b..b6eda9ad3a 100644
--- a/lib/mnesia/src/mnesia_monitor.erl
+++ b/lib/mnesia/src/mnesia_monitor.erl
@@ -70,6 +70,8 @@
 	 negotiate_protocol_impl/2
 	]).
 
+-compile({no_auto_import,[error/2]}).
+
 -import(mnesia_lib, [dbg_out/2, verbose/2, error/2, fatal/2, set/2]).
 
 -include("mnesia.hrl").
diff --git a/lib/mnesia/src/mnesia_recover.erl b/lib/mnesia/src/mnesia_recover.erl
index 0ca7bf3f7f..7435b6896a 100644
--- a/lib/mnesia/src/mnesia_recover.erl
+++ b/lib/mnesia/src/mnesia_recover.erl
@@ -62,6 +62,7 @@
 	 code_change/3
 	]).
 
+-compile({no_auto_import,[error/2]}).
 
 -include("mnesia.hrl").
 -import(mnesia_lib, [set/2, verbose/2, error/2, fatal/2]).
diff --git a/lib/mnesia/src/mnesia_registry.erl b/lib/mnesia/src/mnesia_registry.erl
index 9805d48697..202689ae5e 100644
--- a/lib/mnesia/src/mnesia_registry.erl
+++ b/lib/mnesia/src/mnesia_registry.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -65,6 +65,8 @@
 %%%----------------------------------------------------------------------
 
 %% External exports
+%% Avoid warning for local function max/2 clashing with autoimported BIF.
+-compile({no_auto_import,[max/2]}).
 -export([start_dump/2, start_restore/2]).
 -export([create_table/1, create_table/2]).
 
diff --git a/lib/mnesia/src/mnesia_subscr.erl b/lib/mnesia/src/mnesia_subscr.erl
index 93d4a86f7f..415c69d508 100644
--- a/lib/mnesia/src/mnesia_subscr.erl
+++ b/lib/mnesia/src/mnesia_subscr.erl
@@ -43,6 +43,8 @@
 	 code_change/3
 	]).
 
+-compile({no_auto_import,[error/2]}).
+
 -include("mnesia.hrl").
 
 -import(mnesia_lib, [error/2]).
diff --git a/lib/mnesia/src/mnesia_text.erl b/lib/mnesia/src/mnesia_text.erl
index f1a28bf43d..ab1362f6b6 100644
--- a/lib/mnesia/src/mnesia_text.erl
+++ b/lib/mnesia/src/mnesia_text.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -20,6 +20,8 @@
 %%
 -module(mnesia_text).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([parse/1, file/1, load_textfile/1, dump_to_textfile/1]).
 
 load_textfile(File) ->
diff --git a/lib/mnesia/test/Makefile b/lib/mnesia/test/Makefile
new file mode 100644
index 0000000000..bce2467a5f
--- /dev/null
+++ b/lib/mnesia/test/Makefile
@@ -0,0 +1,118 @@
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 1996-2009. 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%
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+MODULES= \
+	mt \
+	mnesia_SUITE \
+	mnesia_test_lib \
+	mnesia_install_test \
+	mnesia_registry_test \
+	mnesia_config_test \
+	mnesia_frag_test \
+	mnesia_inconsistent_database_test \
+	mnesia_config_backup \
+	mnesia_config_event \
+	mnesia_examples_test \
+	mnesia_nice_coverage_test \
+	mnesia_evil_coverage_test \
+	mnesia_evil_backup \
+	mnesia_trans_access_test \
+	mnesia_dirty_access_test \
+	mnesia_atomicity_test \
+	mnesia_consistency_test \
+	mnesia_isolation_test \
+	mnesia_durability_test \
+	mnesia_recovery_test \
+	mnesia_qlc_test \
+	mnesia_schema_recovery_test \
+	mnesia_measure_test \
+	mnesia_cost \
+	mnesia_dbn_meters 
+
+MnesiaExamplesDir := ../examples
+
+ExampleModules =  \
+	company \
+	company_o \
+	bup \
+	mnesia_meter \
+	mnesia_tpcb       
+ExamplesHrl = \
+	company.hrl \
+	company_o.hrl
+
+ERL_FILES= $(MODULES:%=%.erl) $(ExampleModules:%=$(MnesiaExamplesDir)/%.erl)
+
+HRL_FILES= mnesia_test_lib.hrl $(ExamplesHrl:%=$(MnesiaExamplesDir)/%)
+
+TARGET_FILES= \
+	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(ExampleModules:%=$(EBIN)/%.$(EMULATOR)) 
+
+INSTALL_PROGS= $(TARGET_FILES)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/mnesia_test
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+#ERL_COMPILE_FLAGS +=
+
+EBIN = .
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+tests debug opt: $(TARGET_FILES)
+
+$(EBIN)/%.beam: $(MnesiaExamplesDir)/%.erl
+	$(ERLC) -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+
+clean:
+	rm -f $(TARGET_FILES)
+	rm -f core
+
+docs:
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+
+release_tests_spec: opt
+	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DATA) mnesia.spec mnesia.cover $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
+	$(INSTALL_SCRIPT) mt $(INSTALL_PROGS) $(RELSYSDIR)
+#	chmod -f -R u+w $(RELSYSDIR)
+#	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+
+release_docs_spec:
+
+
diff --git a/lib/mnesia/test/README b/lib/mnesia/test/README
new file mode 100644
index 0000000000..e0ced7399d
--- /dev/null
+++ b/lib/mnesia/test/README
@@ -0,0 +1,107 @@
+This directory contains the test suite of Mnesia.
+Compile it with "erl -make".
+
+Test cases are identified with a {Mod, Fun} tuple that maps
+to a function Mod:Fun(Config), where the test case hopefully
+is implemented. The test suite is organized in a hierarchy
+with {mnesia_SUITE, all} as the top.
+
+The module called mt, implements various convenience functions
+to ease up the execution of test cases. It does also provide
+aliases for some test cases. For example the atom Mod is an
+alias for {Mod, all}, the atom all for {mnesia_SUITE, all},
+evil for mnesia_evil_coverage_test etc.
+
+   mt:struct(TestCase)
+
+      Displays the test case structure from TestCase
+      and downwards the hierarchy. E.g. mt:struct(all)
+      will display the entire test suite.
+
+   mt:t(TestCase), mt:t(TestCase, Config)
+
+      Runs a single test case or a hierarchy of test cases.
+      mt:t(silly) is be a good starter, but you may also
+      try mt:t(all) directly if you feel lucky.
+
+      The identity of the last run test case and the outcome of
+      it is stored on file. mt:t() will re-run the last test case.
+
+      The Config argument contains various configuration
+      parameters for the test cases, such as which nodes that
+      are available for running the test suite. The default
+      settings should be enough for the most. Use mt:read_config()
+      to get the current default setting and change it with
+      mt:write_config(Config).
+
+   mt:doc(TestCase)
+
+      Generates html documentation for the test suite.
+
+In order to be able to run the test suite, the Erlang node must
+be started with the distribution enabled and the code path must
+be set to the mnesia/ebin, mnesia/examples, and mnesia/test
+directories. E.g. the following would do:
+
+    erl -sname a -pa $top/examples -pa $top/src -pa $top/ebin
+
+where $top is the path to the Mnesia installation. Many test
+cases needs 2 or 3 nodes. The node names may explicitly be
+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.
+
+The attached UNIX shell script mt, does not work on all
+platforms, but it may be used as a source for inspiration. It
+starts three Erlang nodes in one xterm's each. The main xterm
+(a@localhost) logs all output in the Erlang shell to a
+file. The file is piped thru grep to easily find successful
+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).
+    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.
+
+  - Ensure that the nodes are connected. The easiest way to do
+    this is by invoking mt:ping().
+
+  - 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
+    loaded on all CONNECTED nodes.
+
+The test case execution is supervised in order to ensure that no test
+case exceeds its maximum time limit, which by default is 5 minutes.
+When the limit is reached, the running test case gets aborted and the
+test server runs the next test case in line. This behaviour is useful
+when running the entire test suite during the night, but it is really
+annoying during debugging.
+
+   Use the "erl -mnesia_test_timeout" flag to disable the test case
+   time limit mechanism.
+
+Some mechanisms in Mnesia are almost impossible to test with a
+white box technique. In order to be able to write predictable
+test cases which tests the same thing every time it is run,
+Mnesia has been instrumented with debug functions. These may be
+controlled from a test program. For example to verify that the
+commit protocols work it is essential that it is possible to
+ensure that we are able to kill Mnesia in the most critical
+situations. Normally Mnesia is compiled with the debug
+functions disabled and this means that test cases which
+requires this functionality will be skipped. The mnesia:ni(),
+mentioned above, functions ensures that the interpreted code is
+instrumented with Mnesia's debug functionality. The mnesia:nc()
+functions compiles Mnesia with the debug setting enabled.
+
+Happy bug hunting!
+
+        Hakan Mattsson <[email protected]>
+
+
diff --git a/lib/mnesia/test/mnesia.cover b/lib/mnesia/test/mnesia.cover
new file mode 100644
index 0000000000..66ffc06e89
--- /dev/null
+++ b/lib/mnesia/test/mnesia.cover
@@ -0,0 +1,2 @@
+{incl_app,mnesia,details}.
+
diff --git a/lib/mnesia/test/mnesia.spec b/lib/mnesia/test/mnesia.spec
new file mode 100644
index 0000000000..204d1519cb
--- /dev/null
+++ b/lib/mnesia/test/mnesia.spec
@@ -0,0 +1,76 @@
+{suites,"../mnesia_test",all}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
+            [ram_meter],
+            "Takes to long time"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
+            [disc_meter],
+            "Takes to long time"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
+            [disc_only_meter],
+            "Takes to long time"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,[cost],"Takes to long time"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
+            [dbn_meters],
+            "Takes to long time"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
+            [ram_tpcb,disc_tpcb,disc_only_tpcb],
+            "Takes to long time"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
+            [reader_disturbed_by_node_down,writer_disturbed_by_node_down,
+             reader_disturbed_by_node_up,writer_disturbed_by_node_up,
+             reader_disturbed_by_schema_ops,writer_disturbed_by_schema_ops,
+             reader_disturbed_by_checkpoint,writer_disturbed_by_checkpoint,
+             reader_disturbed_by_dump_log,writer_disturbed_by_dump_log,
+             reader_disturbed_by_backup,writer_disturbed_by_backup,
+             reader_disturbed_by_restore,writer_disturbed_by_restore,
+             reader_competing_with_reader,reader_competing_with_writer,
+             writer_competing_with_reader,writer_competing_with_writer],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
+            [measure_resource_consumption,determine_resource_leakage],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
+            [determine_system_limits,performance_at_min_config,
+             performance_at_max_config,performance_at_full_load,
+             resource_consumption_at_min_config,
+             resource_consumption_at_max_config,
+             resource_consumption_at_full_load],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
+            [ram_tpcb,disc_tpcb,disc_only_tpcb],
+            "Takes too much time and memory"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
+            [measure_all_api_functions],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_measure_test,
+            [mnemosyne_vs_mnesia_kernel],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_examples_test,
+            [company],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_config_test,
+            [ignore_fallback_at_startup],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_evil_backup,
+            [local_backup_checkpoint],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_config_test,
+            [max_wait_for_decision],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_recovery_test,
+            [after_full_disc_partition],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_recovery_test,
+            [system_upgrade],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_consistency_test,
+            [consistency_after_change_table_copy_type],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_consistency_test,
+            [consistency_after_transform_table_ram,
+             consistency_after_transform_table_disc,
+             consistency_after_transform_table_disc_only],
+            "Not yet implemented"}.
+{skip_cases,"../mnesia_test",mnesia_consistency_test,
+            [consistency_after_rename_of_node],
+            "Not yet implemented"}.
diff --git a/lib/mnesia/test/mnesia.spec.vxworks b/lib/mnesia/test/mnesia.spec.vxworks
new file mode 100644
index 0000000000..11c01ea3fe
--- /dev/null
+++ b/lib/mnesia/test/mnesia.spec.vxworks
@@ -0,0 +1,362 @@
+{topcase, {dir, "../mnesia_test"}}.
+{require_nodenames, 3}.
+{diskless, true}.
+{skip, {mnesia_measure_test, all, "Too heavy"}}.
+%{mnesia_install_test, silly_durability} 'IMPL'
+%{mnesia_install_test, silly_move} 'IMPL'
+{skip, {mnesia_install_test, silly_upgrade, "Uses disk"}}.
+%{mnesia_install_test, conflict} 'IMPL'
+%{mnesia_install_test, dist} 'IMPL'
+{skip, {mnesia_examples_test, all, "Uses disk"}}.
+{skip, {mnesia_nice_coverage_test, all, "Uses disk"}}.
+
+%{mnesia_evil_coverage_test, system_info} 'IMPL'
+%{mnesia_evil_coverage_test, table_info} 'IMPL'
+%{mnesia_evil_coverage_test, error_description} 'IMPL'
+{skip, {mnesia_evil_coverage_test, db_node_lifecycle, "Uses disk"}}.
+{skip, {mnesia_evil_coverage_test, local_content, "Uses disk"}}.
+%{mnesia_evil_coverage_test, start_and_stop} 'IMPL'
+%{mnesia_evil_coverage_test, transaction} 'IMPL'
+{skip, {mnesia_evil_coverage_test, checkpoint, "Uses disk"}}.
+{skip, {mnesia_evil_backup, backup, "Uses disk"}}.
+{skip, {mnesia_evil_backup, global_backup_checkpoint, "Uses disk"}}.
+{skip, {mnesia_evil_backup, incremental_backup_checkpoint, "Uses disk"}}.
+{skip, {mnesia_evil_backup, local_backup_checkpoint, "Uses disk"}}.
+{skip, {mnesia_evil_backup, selective_backup_checkpoint, "Uses disk"}}.
+{skip, {mnesia_evil_backup, restore_errors, "Uses disk"}}.
+{skip, {mnesia_evil_backup, restore_clear, "Uses disk"}}.
+{skip, {mnesia_evil_backup, restore_keep, "Uses disk"}}.
+{skip, {mnesia_evil_backup, restore_recreate, "Uses disk"}}.
+{skip, {mnesia_evil_backup, traverse_backup, "Uses disk"}}.
+{skip, {mnesia_evil_backup, install_fallback, "Uses disk"}}.
+{skip, {mnesia_evil_backup, uninstall_fallback, "Uses disk"}}.
+{skip, {mnesia_evil_backup, local_fallback, "Uses disk"}}.
+%{mnesia_evil_coverage_test, table_lifecycle} 'IMPL'
+{skip, {mnesia_evil_coverage_test, replica_management, "Uses disk"}}.
+%{mnesia_evil_coverage_test, change_table_access_mode} 'IMPL'
+%{mnesia_evil_coverage_test, change_table_load_order} 'IMPL'
+{skip, {mnesia_evil_coverage_test, set_master_nodes, "Uses disk"}}.
+{skip, {mnesia_evil_coverage_test, offline_set_master_nodes, "Uses disk"}}.
+{skip, {mnesia_evil_coverage_test, replica_location, "Uses disk"}}.
+%{mnesia_evil_coverage_test, add_table_index_ram} 'IMPL'
+{skip, {mnesia_trans_access_test, add_table_index_disc, "Uses disc"}}.
+{skip, {mnesia_trans_access_test, add_table_index_disc_only, "Uses disc"}}.
+%{mnesia_evil_coverage_test, create_live_table_index_ram} 'IMPL'
+{skip, {mnesia_trans_access_test, create_live_table_index_disc, "Uses disc"}}.
+{skip, {mnesia_trans_access_test, create_live_table_index_disc_only, "Uses disc"}}.
+%{mnesia_evil_coverage_test, del_table_index_ram} 'IMPL'
+{skip, {mnesia_trans_access_test, del_table_index_disc, "Uses disc"}}.
+{skip, {mnesia_trans_access_test, del_table_index_disc_only, "Uses disc"}}.
+{skip, {mnesia_trans_access_test, idx_schema_changes_ram, "Uses disk"}}.
+{skip, {mnesia_trans_access_test, idx_schema_changes_disc, "Uses disc"}}.
+{skip, {mnesia_trans_access_test, idx_schema_changes_disc_only, "Uses disc"}}.
+%{mnesia_dirty_access_test, dirty_write_ram} 'IMPL'
+
+{skip, {mnesia_dirty_access_test, dirty_write_disc, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, dirty_write_disc_only, "Uses disc"}}.
+%{mnesia_dirty_access_test, dirty_read_ram} 'IMPL'
+{skip, {mnesia_dirty_access_test, dirty_read_disc, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, dirty_read_disc_only, "Uses disc"}}.
+%{mnesia_dirty_access_test, dirty_update_counter_ram} 'IMPL'
+{skip, {mnesia_dirty_access_test, dirty_update_counter_disc, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, dirty_update_counter_disc_only, "Uses disc"}}.
+%{mnesia_dirty_access_test, dirty_delete_ram} 'IMPL'
+{skip, {mnesia_dirty_access_test, dirty_delete_disc, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, dirty_delete_disc_only, "Uses disc"}}.
+%{mnesia_dirty_access_test, dirty_delete_object_ram} 'IMPL'
+{skip, {mnesia_dirty_access_test, dirty_delete_object_disc, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, dirty_delete_object_disc_only, "Uses disc"}}.
+%{mnesia_dirty_access_test, dirty_match_object_ram} 'IMPL'
+{skip, {mnesia_dirty_access_test, dirty_match_object_disc, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, dirty_match_object_disc_only, "Uses disc"}}.
+%{mnesia_dirty_access_test, dirty_index_match_object_ram} 'IMPL'
+{skip, {mnesia_dirty_access_test, dirty_index_match_object_disc, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, dirty_index_match_object_disc_only, "Uses disc"}}.
+%{mnesia_dirty_access_test, dirty_index_read_ram} 'IMPL'
+{skip, {mnesia_dirty_access_test, dirty_index_read_disc, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, dirty_index_read_disc_only, "Uses disc"}}.
+%{mnesia_dirty_access_test, dirty_index_update_set_ram} 'IMPL'
+{skip, {mnesia_dirty_access_test, dirty_index_update_set_disc, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, dirty_index_update_set_disc_only, "Uses disc"}}.
+%{mnesia_dirty_access_test, dirty_index_update_bag_ram} 'IMPL'
+{skip, {mnesia_dirty_access_test, dirty_index_update_bag_disc, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, dirty_index_update_bag_disc_only, "Uses disc"}}.
+%{mnesia_dirty_access_test, dirty_iter_ram} 'IMPL'
+{skip, {mnesia_dirty_access_test, dirty_iter_disc, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, dirty_iter_disc_only, "Uses disc"}}.
+{skip, {mnesia_dirty_access_test, admin_tests, "Uses disk"}}.
+
+%{mnesia_trans_access_test, write} 'IMPL'
+%{mnesia_trans_access_test, read} 'IMPL'
+%{mnesia_trans_access_test, wread} 'IMPL'
+%{mnesia_trans_access_test, delete} 'IMPL'
+%{mnesia_trans_access_test, delete_object} 'IMPL'
+%{mnesia_trans_access_test, match_object} 'IMPL'
+%{mnesia_trans_access_test, all_keys} 'IMPL'
+%{mnesia_trans_access_test, index_match_object} 'IMPL'
+%{mnesia_trans_access_test, index_read} 'IMPL'
+%{mnesia_trans_access_test, index_update_set} 'IMPL'
+%{mnesia_trans_access_test, index_update_bag} 'IMPL'
+{skip, {mnesia_evil_coverage_test, dump_tables, "Uses disk"}}.
+{skip, {mnesia_evil_coverage_test, dump_log, "Uses disk"}}.
+%{mnesia_evil_coverage_test, wait_for_tables} 'IMPL'
+{skip, {mnesia_evil_coverage_test, force_load_table, "Uses disk"}}.
+%{mnesia_evil_coverage_test, user_properties} 'IMPL'
+%{mnesia_evil_coverage_test, record_name_dirty_access_ram} 'IMPL'
+{skip, {mnesia_evil_coverage_test, record_name_dirty_access_disc, "Uses disc"}}.
+{skip, {mnesia_evil_coverage_test, record_name_dirty_access_disc_only, "Uses disc"}}.
+%{mnesia_evil_coverage_test, snmp_open_table} 'IMPL'
+%{mnesia_evil_coverage_test, snmp_close_table} 'IMPL'
+%{mnesia_evil_coverage_test, snmp_get_next_index} 'IMPL'
+%{mnesia_evil_coverage_test, snmp_get_row} 'IMPL'
+%{mnesia_evil_coverage_test, snmp_get_mnesia_key} 'IMPL'
+%{mnesia_evil_coverage_test, snmp_update_counter} 'IMPL'
+%{mnesia_evil_coverage_test, info} 'IMPL'
+%{mnesia_evil_coverage_test, schema_0} 'IMPL'
+%{mnesia_evil_coverage_test, schema_1} 'IMPL'
+%{mnesia_evil_coverage_test, view_0} 'IMPL'
+{skip, {mnesia_evil_coverage_test, view_1, "Uses disk"}}.
+{skip, {mnesia_evil_coverage_test, view_2, "Uses disk"}}.
+%{mnesia_evil_coverage_test, lkill} 'IMPL'
+%{mnesia_evil_coverage_test, kill} 'IMPL'
+
+%{mnesia_config_test, access_module} 'IMPL'
+%{mnesia_config_test, auto_repair} 'IMPL'
+{skip, {mnesia_config_test, backup_module, "Uses disk"}}.
+{skip, {mnesia_config_test, dynamic_connect, "Uses disk"}}.
+%{mnesia_config_test, debug} 'IMPL'
+%{mnesia_config_test, dir} 'IMPL'
+{skip, {mnesia_config_test, dump_log_load_regulation, "Uses disk"}}.
+{skip, {mnesia_config_test, dump_log_time_threshold, "Uses disk"}}.
+{skip, {mnesia_config_test, dump_log_write_threshold, "Uses disk"}}.
+{skip, {mnesia_config_test, dump_log_update_in_place, "Uses disk"}}.
+{skip, {mnesia_config_test, embedded_mnemosyne, "Uses Mnemosyne"}}.
+%{mnesia_config_test, event_module} 'IMPL'
+{skip, {mnesia_config_test, ignore_fallback_at_startup, "Not Yet impl"}}.
+%{mnesia_config_test, inconsistent_database} 'IMPL'
+{skip, {mnesia_config_test, max_wait_for_decision, "Not Yet impl"}}.
+{skip, {mnesia_config_test, start_one_disc_full_then_one_disc_less, "Uses disc"}}.
+{skip, {mnesia_config_test, start_first_one_disc_less_then_one_disc_full, "Uses disc"}}.
+%%{skip, {mnesia_config_test, start_first_one_disc_less_then_two_more_disc_less, "Uses disc"}}.
+{skip, {mnesia_config_test, schema_location_and_extra_db_nodes_combinations, "Uses disk"}}.
+{skip, {mnesia_config_test, table_load_to_disc_less_nodes, "Uses disc"}}.
+{skip, {mnesia_config_test, schema_merge, "Uses Disc"}}.
+%{mnesia_config_test, unknown_config} 'IMPL'
+%{mnesia_registry_test, good_dump} 'IMPL'
+%{mnesia_registry_test, bad_dump} 'IMPL'
+
+%{mnesia_atomicity_test, explicit_abort_in_middle_of_trans} 'IMPL'
+%{mnesia_atomicity_test, runtime_error_in_middle_of_trans} 'IMPL'
+%{mnesia_atomicity_test, kill_self_in_middle_of_trans} 'IMPL'
+%{mnesia_atomicity_test, throw_in_middle_of_trans} 'IMPL'
+%{mnesia_atomicity_test, mnesia_down_during_infinite_trans} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_sw_rt} 'IMPL' 
+%{mnesia_atomicity_test, lock_waiter_sw_wt} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_wr_r} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_sw_sw} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_sw_w} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_sw_wr} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_wr_wt} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_wr_sw} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_wr_w} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_r_sw} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_r_w} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_r_wt} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_rt_sw} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_rt_w} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_rt_wt} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_wt_r} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_wt_w} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_wt_rt} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_wt_wt} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_wt_wr} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_wt_sw} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_w_wr} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_w_sw} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_w_r} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_w_w} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_w_rt} 'IMPL'
+%{mnesia_atomicity_test, lock_waiter_w_wt} 'IMPL'
+%{mnesia_atomicity_test, restart_r_one} 'IMPL'
+%{mnesia_atomicity_test, restart_w_one} 'IMPL'
+%{mnesia_atomicity_test, restart_rt_one} 'IMPL'
+%{mnesia_atomicity_test, restart_wt_one} 'IMPL'
+%{mnesia_atomicity_test, restart_wr_one} 'IMPL'
+%{mnesia_atomicity_test, restart_sw_one} 'IMPL'
+%{mnesia_atomicity_test, restart_r_two} 'IMPL'
+%{mnesia_atomicity_test, restart_w_two} 'IMPL'
+%{mnesia_atomicity_test, restart_rt_two} 'IMPL'
+%{mnesia_atomicity_test, restart_wt_two} 'IMPL'
+%{mnesia_atomicity_test, restart_wr_two} 'IMPL'
+%{mnesia_atomicity_test, restart_sw_two} 'IMPL'
+
+%{mnesia_isolation_test, no_conflict} 'IMPL'
+%{mnesia_isolation_test, simple_queue_conflict} 'IMPL'
+%{mnesia_isolation_test, advanced_queue_conflict} 'IMPL'
+%{mnesia_isolation_test, simple_deadlock_conflict} 'IMPL'
+%{mnesia_isolation_test, advanced_deadlock_conflict} 'IMPL'
+%{mnesia_isolation_test, lock_burst} 'IMPL'
+%{mnesia_isolation_test, basic_sticky_functionality} 'IMPL'
+%{mnesia_isolation_test, create_table} 'IMPL'
+%{mnesia_isolation_test, delete_table} 'IMPL'
+%{mnesia_isolation_test, move_table_copy} 'IMPL'
+%{mnesia_isolation_test, add_table_index} 'IMPL'
+%{mnesia_isolation_test, del_table_index} 'IMPL'
+%{mnesia_isolation_test, transform_table} 'IMPL'
+%{mnesia_isolation_test, snmp_open_table} 'IMPL'
+%{mnesia_isolation_test, snmp_close_table} 'IMPL'
+{skip, {mnesia_isolation_test, change_table_copy_type, "Uses disk"}}.
+%{mnesia_isolation_test, change_table_access} 'IMPL'
+%{mnesia_isolation_test, add_table_copy} 'IMPL'
+%{mnesia_isolation_test, del_table_copy} 'IMPL'
+{skip, {mnesia_isolation_test, dump_tables, "Uses disk"}}.
+{skip, {mnesia_isolation_test, extra_admin_tests, "Uses disk"}}.
+%{mnesia_isolation_test, del_table_copy_1} 'IMPL'
+%{mnesia_isolation_test, del_table_copy_2} 'IMPL'
+%{mnesia_isolation_test, del_table_copy_3} 'IMPL'
+%{mnesia_isolation_test, add_table_copy_1} 'IMPL'
+%{mnesia_isolation_test, add_table_copy_2} 'IMPL'
+%{mnesia_isolation_test, add_table_copy_3} 'IMPL'
+%{mnesia_isolation_test, add_table_copy_4} 'IMPL'
+%{mnesia_isolation_test, move_table_copy_1} 'IMPL'
+%{mnesia_isolation_test, move_table_copy_2} 'IMPL'
+%{mnesia_isolation_test, move_table_copy_3} 'IMPL'
+%{mnesia_isolation_test, move_table_copy_4} 'IMPL'
+%{mnesia_isolation_test, dirty_updates_visible_direct} 'IMPL'
+%{mnesia_isolation_test, dirty_reads_regardless_of_trans} 'IMPL'
+%{mnesia_isolation_test, trans_update_invisibible_outside_trans} 'IMPL'
+%{mnesia_isolation_test, trans_update_visible_inside_trans} 'IMPL'
+%{mnesia_isolation_test, write_shadows} 'IMPL'
+%{mnesia_isolation_test, delete_shadows} 'IMPL'
+%{mnesia_isolation_test, write_delete_shadows_bag} 'IMPL'
+
+{skip, {mnesia_durability_test, all, "Uses disk "}}.
+%{mnesia_durability_test, load_local_contents_directly} 'IMPL'
+%{mnesia_durability_test, load_directly_when_all_are_ram_copiesA} 'IMPL'
+%{mnesia_durability_test, load_directly_when_all_are_ram_copiesB} 'IMPL'
+%{skip, {mnesia_durability_test, late_load_when_all_are_ram_copies_on_ram_nodes1, "Uses disk schema"}}.
+%{skip, {mnesia_durability_test, late_load_when_all_are_ram_copies_on_ram_nodes2, "Uses disk schema"}}.
+%{skip, {mnesia_durability_test, load_when_last_replica_becomes_available, "Uses disk"}}.
+%{skip, {mnesia_durability_test, load_when_we_have_down_from_all_other_replica_nodes, "Uses disk"}}.
+%{skip, {mnesia_durability_test, late_load_transforms_into_disc_load, "Uses disc"}}.
+%{mnesia_durability_test, late_load_leads_to_hanging} 'IMPL'
+%{mnesia_durability_test, force_load_when_nobody_intents_to_load} 'IMPL'
+%{mnesia_durability_test, force_load_when_someone_has_decided_to_load} 'IMPL'
+%{mnesia_durability_test, force_load_when_someone_else_already_has_loaded} 'IMPL'
+%{mnesia_durability_test, force_load_when_we_has_loaded} 'IMPL'
+%{mnesia_durability_test, force_load_on_a_non_local_table} 'IMPL'
+%{mnesia_durability_test, force_load_when_the_table_does_not_exist} 'IMPL'
+%{mnesia_durability_test, master_nodes} 'IMPL'
+%{mnesia_durability_test, master_on_non_local_tables} 'IMPL'
+%{mnesia_durability_test, remote_force_load_with_local_master_node} 'IMPL'
+%{mnesia_durability_test, dump_ram_copies} 'IMPL'
+%{skip, {mnesia_durability_test, dump_disc_copies, "Uses disc"}}.
+%{skip, {mnesia_durability_test, dump_disc_only, "Uses disc"}}.
+%{skip, {mnesia_durability_test, durability_of_disc_copies, "Uses disc"}}.
+%{skip, {mnesia_durability_test, durability_of_disc_only_copies, "Uses disc"}}.
+
+{skip, {mnesia_recovery_test, mnesia_down, "Uses Disk"}}.
+%{mnesia_recovery_test, no_master_2} 'IMPL'
+%{mnesia_recovery_test, no_master_3} 'IMPL'
+%{mnesia_recovery_test, one_master_2} 'IMPL'
+%{mnesia_recovery_test, one_master_3} 'IMPL'
+%{mnesia_recovery_test, two_master_2} 'IMPL'
+%{mnesia_recovery_test, two_master_3} 'IMPL'
+%{mnesia_recovery_test, all_master_2} 'IMPL'
+%{mnesia_recovery_test, all_master_3} 'IMPL'
+{skip, {mnesia_recovery_test, mnesia_down_during_startup_disk_ram, "Uses disk"}}.
+%{mnesia_recovery_test, mnesia_down_during_startup_init_ram} 'IMPL'
+{skip, {mnesia_recovery_test, mnesia_down_during_startup_init_disc, "Uses disc"}}.
+{skip, {mnesia_recovery_test, mnesia_down_during_startup_init_disc_only, "Uses disc"}}.
+%{mnesia_recovery_test, mnesia_down_during_startup_tm_ram} 'IMPL'
+{skip, {mnesia_recovery_test, mnesia_down_during_startup_tm_disc, "Uses disc"}}.
+{skip, {mnesia_recovery_test, mnesia_down_during_startup_tm_disc_only, "Uses disc"}}.
+%{mnesia_recovery_test, explicit_stop_during_snmp} 'IMPL'
+
+{skip, {mnesia_recovery_test, schema_trans, "Uses Disk, needs disk log"}}.
+{skip, {mnesia_recovery_test, async_dirty, "Uses disc"}}.
+{skip, {mnesia_recovery_test, sync_dirty, "Uses disc"}}.
+{skip, {mnesia_recovery_test, sym_trans, "Uses disc"}}.
+{skip, {mnesia_recovery_test, asym_trans, "Uses disc"}}.
+
+{skip, {mnesia_recovery_test, after_full_disc_partition, "Not Yet impl"}}.
+{skip, {mnesia_recovery_test, after_corrupt_files, "Uses disk"}}.
+
+%{mnesia_evil_coverage_test, subscriptions} 'IMPL'
+%{mnesia_evil_coverage_test, nested_trans_both_ok} 'IMPL'
+%{mnesia_evil_coverage_test, nested_trans_child_dies} 'IMPL'
+%{mnesia_evil_coverage_test, nested_trans_parent_dies} 'IMPL'
+%{mnesia_evil_coverage_test, nested_trans_both_dies} 'IMPL'
+%{mnesia_evil_coverage_test, mix_of_trans_sync_dirty} 'IMPL'
+%{mnesia_evil_coverage_test, mix_of_trans_async_dirty} 'IMPL'
+%{mnesia_evil_coverage_test, mix_of_trans_ets} 'IMPL'
+
+{skip, {mnesia_recovery_test, disc_less, "Uses disc (on the other nodes)"}}.
+{skip, {mnesia_recovery_test, system_upgrade, "Not Yet impl"}}.
+%{mnesia_consistency_test, consistency_after_restart_1_ram} 'IMPL'
+{skip, {mnesia_consistency_test, consistency_after_restart_1_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_restart_1_disc_only, "Uses disc"}}.
+%{mnesia_consistency_test, consistency_after_restart_2_ram} 'IMPL'
+{skip, {mnesia_consistency_test, consistency_after_restart_2_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_restart_2_disc_only, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_dump_tables_1_ram, "Uses disk"}}.
+{skip, {mnesia_consistency_test, consistency_after_dump_tables_2_ram, "Uses disk"}}.
+%{mnesia_consistency_test, consistency_after_add_replica_2_ram} 'IMPL'
+{skip, {mnesia_consistency_test, consistency_after_add_replica_2_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_add_replica_2_disc_only, "Uses disc"}}.
+%{mnesia_consistency_test, consistency_after_add_replica_3_ram} 'IMPL'
+{skip, {mnesia_consistency_test, consistency_after_add_replica_3_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_add_replica_3_disc_only, "Uses disc"}}.
+%{mnesia_consistency_test, consistency_after_del_replica_2_ram} 'IMPL'
+{skip, {mnesia_consistency_test, consistency_after_del_replica_2_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_del_replica_2_disc_only, "Uses disc"}}.
+%{mnesia_consistency_test, consistency_after_del_replica_3_ram} 'IMPL'
+{skip, {mnesia_consistency_test, consistency_after_del_replica_3_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_del_replica_3_disc_only, "Uses disc"}}.
+%{mnesia_consistency_test, consistency_after_move_replica_2_ram} 'IMPL'
+{skip, {mnesia_consistency_test, consistency_after_move_replica_2_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_move_replica_2_disc_only, "Uses disc"}}.
+%{mnesia_consistency_test, consistency_after_move_replica_3_ram} 'IMPL'
+{skip, {mnesia_consistency_test, consistency_after_move_replica_3_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_move_replica_3_disc_only, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_transform_table, "Not yet implemented"}}.
+{skip, {mnesia_consistency_test, consistency_after_change_table_copy_type, "Not yet implemented"}}.
+{skip, {mnesia_consistency_test, consistency_after_fallback_2_ram, "Uses disk"}}.
+{skip, {mnesia_consistency_test, consistency_after_fallback_2_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_fallback_2_disc_only, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_fallback_3_ram, "Uses disk"}}.
+{skip, {mnesia_consistency_test, consistency_after_fallback_3_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_fallback_3_disc_only, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_restore_clear_ram, "Uses disk"}}.
+{skip, {mnesia_consistency_test, consistency_after_restore_clear_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_restore_clear_disc_only, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_restore_recreate_ram, "Uses disk"}}.
+{skip, {mnesia_consistency_test, consistency_after_restore_recreate_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_restore_recreate_disc_only, "Uses disc"}}.
+{skip, {mnesia_consistency_test, consistency_after_rename_of_node, "Not yet implemented"}}.
+{skip, {mnesia_consistency_test, updates_during_checkpoint_activation, "Uses disk"}}.
+%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_2_disc, "Uses disc"}}.
+%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_2_disc_only, "Uses disc"}}.
+%%{mnesia_consistency_test, updates_during_checkpoint_activation_3_ram} 'IMPL'
+%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_3_disc, "Uses disc"}}.
+%{skip, {mnesia_consistency_test, updates_during_checkpoint_activation_3_disc_only, "Uses disc"}}.
+{skip, {mnesia_consistency_test, updates_during_checkpoint_iteration, "Uses disk"}}.
+%{skip, {mnesia_consistency_test, updates_during_checkpoint_iteration_2_disc, "Uses disc"}}.
+%{skip, {mnesia_consistency_test, updates_during_checkpoint_iteration_2_disc_only, "Uses disc"}}.
+{skip, {mnesia_consistency_test, load_table_with_activated_checkpoint_ram, "Uses disk"}}.
+{skip, {mnesia_consistency_test, load_table_with_activated_checkpoint_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, load_table_with_activated_checkpoint_disc_only, "Uses disc"}}.
+{skip, {mnesia_consistency_test, add_table_copy_to_table_with_activated_checkpoint_ram, "Uses disk"}}.
+{skip, {mnesia_consistency_test, add_table_copy_to_table_with_activated_checkpoint_disc, "Uses disc"}}.
+{skip, {mnesia_consistency_test, add_table_copy_to_table_with_activated_checkpoint_disc_only, "Uses disc"}}.
+{skip, {mnesia_consistency_test, inst_fallback_process_dies, "Uses disk"}}.
+{skip, {mnesia_consistency_test, fatal_when_inconsistency, "Uses disk"}}.
+{skip, {mnesia_consistency_test, after_delete, "Uses disk"}}.
+{skip, {mnesia_consistency_test, mnesia_down_during_backup_causes_switch, "Uses disk"}}.
+{skip, {mnesia_consistency_test, mnesia_down_during_backup_causes_abort, "Uses disk"}}.
+%{mnesia_consistency_test, cause_switch_after} 'IMPL'
+%{mnesia_consistency_test, cause_abort_before} 'IMPL'
+%{mnesia_consistency_test, cause_abort_after} 'IMPL'
+%{mnesia_consistency_test, change_schema_before} 'IMPL'
+%{mnesia_consistency_test, change_schema_after} 'IMPL'
+
diff --git a/lib/mnesia/test/mnesia_SUITE.erl b/lib/mnesia/test/mnesia_SUITE.erl
new file mode 100644
index 0000000000..fe7d366eb3
--- /dev/null
+++ b/lib/mnesia/test/mnesia_SUITE.erl
@@ -0,0 +1,162 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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(mnesia_SUITE).
+-author('[email protected]').
+-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+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).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+suite() -> [{ct_hooks,[{ts_install_cth,[{nodenames,1}]}]}].
+
+
+%% Verify that Mnesia really is a distributed real-time DBMS.
+%% This is the test suite of the Mnesia DBMS. The test suite
+%% covers many aspects of usage and is indended to be developed
+%% incrementally. The test suite is divided into a hierarchy of test
+%% suites where the leafs actually implements the test cases.
+%% The intention of each test case and sub test suite can be
+%% read in comments where they are implemented or in worst cases
+%% from their long mnemonic names. 
+%% 
+%% The most simple test case of them all is called 'silly'
+%% and is useful to run now and then, e.g. when some new fatal
+%% bug has been introduced. It may be run even if Mnesia is in
+%% such a bad shape that the test machinery cannot be used.
+%% NB! Invoke the function directly with mnesia_SUITE:silly()
+%% and do not involve the normal test machinery.
+
+all() -> 
+    [{group, light}, {group, medium}, {group, heavy},
+     clean_up_suite].
+
+groups() -> 
+    %% The 'light' test suite runs a selected set of test suites and is
+    %% intended to be the smallest test suite that is meaningful
+    %% to run. It starts with an installation test (which in essence is the
+    %% 'silly' test case) and then it covers all functions in the API in
+    %% various depths. All configuration parameters and examples are also
+    %% covered.
+    [{light, [],
+      [{group, install}, {group, nice}, {group, evil},
+       {group, mnesia_frag_test, light}, {group, qlc},
+       {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}]},
+     {registry, [], [{mnesia_registry_test, all}]},
+     {config, [], [{mnesia_config_test, all}]},
+     {examples, [], [{mnesia_examples_test, all}]},
+     %% The 'medium' test suite verfies the ACID (atomicity, consistency
+     %% isolation and durability) properties and various recovery scenarios
+     %% These tests may take quite while to run.
+     {medium, [],
+      [{group, install}, {group, atomicity},
+       {group, isolation}, {group, durability},
+       {group, recovery}, {group, consistency},
+       {group, mnesia_frag_test, medium}]},
+     {atomicity, [], [{mnesia_atomicity_test, all}]},
+     {isolation, [], [{mnesia_isolation_test, all}]},
+     {durability, [], [{mnesia_durability_test, all}]},
+     {recovery, [], [{mnesia_recovery_test, all}]},
+     {consistency, [], [{mnesia_consistency_test, all}]},
+     %% The 'heavy' test suite runs some resource consuming tests and
+     %% benchmarks
+     {heavy, [], [{group, measure}]},
+     {measure, [], [{mnesia_measure_test, all}]},
+     {prediction, [],
+      [{group, mnesia_measure_test, prediction}]},
+     {fairness, [],
+      [{group, mnesia_measure_test, fairness}]},
+     {benchmarks, [],
+      [{group, mnesia_measure_test, benchmarks}]},
+     {consumption, [],
+      [{group, mnesia_measure_test, consumption}]},
+     {scalability, [],
+      [{group, mnesia_measure_test, scalability}]},
+     %% This test suite is an extract of the grand Mnesia suite
+     %% it contains OTP R4B specific test cases
+     {otp_r4b, [],
+      [{mnesia_config_test, access_module},
+       {mnesia_config_test, dump_log_load_regulation},
+       {mnesia_config_test, embedded_mnemosyne},
+       {mnesia_config_test, ignore_fallback_at_startup},
+       {mnesia_config_test, max_wait_for_decision},
+       {mnesia_consistency_test, consistency_after_restore},
+       {mnesia_evil_backup, restore},
+       {mnesia_evil_coverage_test, offline_set_master_nodes},
+       {mnesia_evil_coverage_test, record_name},
+       {mnesia_evil_coverage_test, user_properties},
+       {mnesia_registry_test, all}, {group, otp_2363}]},
+     %% Index on disc only tables
+     {otp_2363, [],
+      [{mnesia_dirty_access_test,
+	dirty_index_match_object_disc_only},
+       {mnesia_dirty_access_test, dirty_index_read_disc_only},
+       {mnesia_dirty_access_test,
+	dirty_index_update_bag_disc_only},
+       {mnesia_dirty_access_test,
+	dirty_index_update_set_disc_only},
+       {mnesia_evil_coverage_test,
+	create_live_table_index_disc_only}]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+silly() ->
+    mnesia_install_test:silly().
+    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+clean_up_suite(doc) -> ["Not a test case only kills mnesia and nodes, that where" 
+			"started during the tests"];
+clean_up_suite(suite) ->
+    [];
+clean_up_suite(Config) when is_list(Config)->
+    mnesia:kill(),
+    Slaves = mnesia_test_lib:lookup_config(nodenames, Config),
+    Nodes = lists:delete(node(), Slaves),
+    rpc:multicall(Nodes, erlang, halt, []),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+    
+
+
diff --git a/lib/mnesia/test/mnesia_atomicity_test.erl b/lib/mnesia/test/mnesia_atomicity_test.erl
new file mode 100644
index 0000000000..cf878fc820
--- /dev/null
+++ b/lib/mnesia/test/mnesia_atomicity_test.erl
@@ -0,0 +1,782 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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(mnesia_atomicity_test).
+-author('[email protected]').
+-author('[email protected]').
+-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+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() -> 
+    [explicit_abort_in_middle_of_trans,
+     runtime_error_in_middle_of_trans,
+     kill_self_in_middle_of_trans, throw_in_middle_of_trans,
+     {group, mnesia_down_in_middle_of_trans}].
+
+groups() -> 
+    [{mnesia_down_in_middle_of_trans, [],
+      [mnesia_down_during_infinite_trans,
+       {group, lock_waiter}, {group, restart_check}]},
+     {lock_waiter, [],
+      [lock_waiter_sw_r, lock_waiter_sw_rt, lock_waiter_sw_wt,
+       lock_waiter_wr_r, lock_waiter_srw_r, lock_waiter_sw_sw,
+       lock_waiter_sw_w, lock_waiter_sw_wr, lock_waiter_sw_srw,
+       lock_waiter_wr_wt, lock_waiter_srw_wt,
+       lock_waiter_wr_sw, lock_waiter_srw_sw, lock_waiter_wr_w,
+       lock_waiter_srw_w, lock_waiter_r_sw, lock_waiter_r_w,
+       lock_waiter_r_wt, lock_waiter_rt_sw, lock_waiter_rt_w,
+       lock_waiter_rt_wt, lock_waiter_wr_wr,
+       lock_waiter_srw_srw, lock_waiter_wt_r, lock_waiter_wt_w,
+       lock_waiter_wt_rt, lock_waiter_wt_wt, lock_waiter_wt_wr,
+       lock_waiter_wt_srw, lock_waiter_wt_sw, lock_waiter_w_wr,
+       lock_waiter_w_srw, lock_waiter_w_sw, lock_waiter_w_r,
+       lock_waiter_w_w, lock_waiter_w_rt, lock_waiter_w_wt]},
+     {restart_check, [],
+      [restart_r_one, restart_w_one, restart_rt_one,
+       restart_wt_one, restart_wr_one, restart_sw_one,
+       restart_r_two, restart_w_two, restart_rt_two,
+       restart_wt_two, restart_wr_two, restart_sw_two]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+explicit_abort_in_middle_of_trans(suite) -> [];
+explicit_abort_in_middle_of_trans(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    Tab = explicit_abort_in_middle_of_trans,
+
+    Rec1A = {Tab, 1, a},
+    Rec1B = {Tab, 1, b},
+
+    ?match({atomic, ok}, mnesia:create_table([{name, Tab},
+					     {ram_copies, [Node1]}])),
+    %% Start a transaction on one node
+    {success, [A]} = ?start_activities([Node1]),
+
+    %% store an object in the Tab - first tranaction
+    ?start_transactions([A]),
+    A ! fun() ->
+		mnesia:write(Rec1A)	% returns ok when successful
+	 end,
+    ?match_receive({A, ok}),
+    A ! end_trans,
+    ?match_receive({A, {atomic, end_trans}}),
+
+    %% second transaction: store some new objects and abort before the
+    %% transaction is finished -> the new changes should be invisable
+    ?start_transactions([A]),
+    A ! fun() ->
+		mnesia:write(Rec1B),
+		exit(abort_by_purpose) %does that stop the process A ???
+	 end,
+    ?match_receive({A, {aborted, abort_by_purpose}}),
+
+
+    %?match_receive({A, {'EXIT', Pid, normal}}), % A died and sends EXIT
+
+
+    %% Start a second  transactionprocess, after the first failed
+    {success, [B]} = ?start_activities([Node1]),
+
+    %% check, whether the interupted transaction had no influence on the db
+    ?start_transactions([B]),
+    B ! fun() ->
+		?match([Rec1A], mnesia:read({Tab, 1})),
+		ok
+	 end,
+    ?match_receive({B, ok}),
+    B ! end_trans,
+    ?match_receive({B, {atomic, end_trans}}),
+
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+runtime_error_in_middle_of_trans(suite) -> [];
+runtime_error_in_middle_of_trans(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    Tab = runtime_error_in_middle_of_trans,
+
+    Rec1A = {Tab, 1, a},
+    Rec1B = {Tab, 1, b},
+    Rec1C = {Tab, 1, c},
+
+    ?match({atomic, ok}, mnesia:create_table([{name, Tab},
+					     {ram_copies, [Node1]}])),
+    %% Start a transaction on one node
+    {success, [A]} = ?start_activities([Node1]),
+
+    %% store an object in the Tab - first tranaction
+    ?start_transactions([A]),
+    A ! fun() ->
+		mnesia:write(Rec1A)	% returns ok when successful
+	 end,
+    ?match_receive({A, ok}),
+    A ! end_trans,
+    ?match_receive({A, {atomic, end_trans}}),
+
+    %% second transaction: store some new objects and abort before the
+    %% transaction is finished -> the new changes should be invisable
+    ?start_transactions([A]),
+    A ! fun() ->
+		mnesia:write(Rec1B),
+                erlang:error(foo), % that should provoke a runtime error
+		mnesia:write(Rec1C)
+	 end,
+    ?match_receive({A, {aborted, _Reason}}),
+
+    %?match_receive({A, {'EXIT', Msg1}), % A died and sends EXIT
+
+
+    %% Start a second  transactionprocess, after the first failed
+    {success, [B]} = ?start_activities([Node1]),
+
+    %% check, whether the interupted transaction had no influence on the db
+    ?start_transactions([B]),
+    B ! fun() ->
+		?match([Rec1A], mnesia:read({Tab, 1})),
+		ok
+	 end,
+    ?match_receive({B, ok}),
+    B ! end_trans,
+    ?match_receive({B, {atomic, end_trans}}),
+
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+kill_self_in_middle_of_trans(suite) -> [];
+kill_self_in_middle_of_trans(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    Tab = kill_self_in_middle_of_trans,
+
+    Rec1A = {Tab, 1, a},
+    Rec1B = {Tab, 1, b},
+    Rec1C = {Tab, 1, c},
+
+    ?match({atomic, ok}, mnesia:create_table([{name, Tab},
+					     {ram_copies, [Node1]}])),
+    %% Start a transaction on one node
+    {success, [A]} = ?start_activities([Node1]),
+
+    %% store an object in the Tab - first tranaction
+    ?start_transactions([A]),
+    A ! fun() ->
+		mnesia:write(Rec1A)	% returns ok when successful
+	 end,
+    ?match_receive({A, ok}),
+    A ! end_trans,
+    ?match_receive({A, {atomic, end_trans}}),
+
+    %% second transaction: store some new objects and abort before the
+    %% transaction is finished -> the new changes should be invisable
+    ?start_transactions([A]),
+    A ! fun() ->
+		mnesia:write(Rec1B),
+                exit(self(), kill), % that should kill the process himself
+		                        %   - poor guy !
+		mnesia:write(Rec1C)
+	 end,
+    %%
+    %% exit(.., kill) : the transaction can't trap this error - thus no
+    %%                 proper result can be send by the test server
+
+    % ?match_receive({A, {aborted, Reason}}),
+
+    ?match_receive({'EXIT', _Pid, killed}), % A is killed and sends EXIT
+
+    %% Start a second  transactionprocess, after the first failed
+    {success, [B]} = ?start_activities([Node1]),
+
+    %% check, whether the interupted transaction had no influence on the db
+    ?start_transactions([B]),
+    B ! fun() ->
+		?match([Rec1A], mnesia:read({Tab, 1})),
+		ok
+	 end,
+    ?match_receive({B, ok}),
+    B ! end_trans,
+    ?match_receive({B, {atomic, end_trans}}),
+
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+throw_in_middle_of_trans(suite) -> [];
+throw_in_middle_of_trans(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    Tab = throw_in_middle_of_trans,
+
+    Rec1A = {Tab, 1, a},
+    Rec1B = {Tab, 1, b},
+    Rec1C = {Tab, 1, c},
+
+    ?match({atomic, ok}, mnesia:create_table([{name, Tab},
+					     {ram_copies, [Node1]}])),
+    %% Start a transaction on one node
+    {success, [A]} = ?start_activities([Node1]),
+
+    %% store an object in the Tab - first tranaction
+    ?start_transactions([A]),
+    A ! fun() ->
+		mnesia:write(Rec1A)	% returns ok when successful
+	 end,
+    ?match_receive({A, ok}),
+    A ! end_trans,
+    ?match_receive({A, {atomic, end_trans}}),
+
+    %% second transaction: store some new objects and abort before the
+    %% transaction is finished -> the new changes should be invisable
+    ?start_transactions([A]),
+    A ! fun() ->
+		mnesia:write(Rec1B),
+                throw(exit_transactian_by_a_throw),
+		mnesia:write(Rec1C)
+	 end,
+    ?match_receive({A, {aborted, {throw, exit_transactian_by_a_throw}}}),
+    % A ! end_trans, % is A still alive ?
+    % ?match_receive({A, {atomic, end_trans}}), % {'EXIT', Pid, normal}
+
+    %?match_receive({A, {'EXIT', Pid, normal}}), % A died and sends EXIT
+
+    %% Start a second  transactionprocess, after the first failed
+    {success, [B]} = ?start_activities([Node1]),
+
+    %% check, whether the interupted transaction had no influence on the db
+    ?start_transactions([B]),
+    B ! fun() ->
+		?match([Rec1A], mnesia:read({Tab, 1})),
+		ok
+	 end,
+    ?match_receive({B, ok}),
+    B ! end_trans,
+    ?match_receive({B, {atomic, end_trans}}),
+
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+mnesia_down_during_infinite_trans(suite) -> [];
+mnesia_down_during_infinite_trans(Config) when is_list(Config) ->
+    [Node1, Node2]  = ?acquire_nodes(2, Config),
+    Tab = mnesia_down_during_infinite_trans,
+
+    ?match({atomic, ok},
+	   mnesia:create_table([{name, Tab}, {ram_copies, [Node1, Node2]}])),
+    %% Start a transaction on one node
+    {success, [A2, A1]} = ?start_activities([Node2, Node1]),
+    %% Start order of the transactions are important
+    %% We also needs to sync the tid counter
+    ?match({atomic, ok},
+	   mnesia:transaction(fun() -> mnesia:write({Tab, 1, test_ok}) end)),
+    mnesia_test_lib:start_sync_transactions([A2, A1]),
+    
+    %% Obtain a write lock and wait forever
+    RecA = {Tab, 1, test_not_ok},
+    A1 ! fun() -> mnesia:write(RecA) end,
+    ?match_receive({A1, ok}),
+
+    A1 ! fun() -> process_flag(trap_exit, true), timer:sleep(infinity) end,
+    ?match_receive(timeout),
+
+    %% Try to get read lock, but gets queued
+    A2 ! fun() -> mnesia:read({Tab, 1}) end,
+    ?match_receive(timeout),
+
+    %% Kill Mnesia on other node
+    mnesia_test_lib:kill_mnesia([Node1]),
+
+    %% Second transaction gets the read lock
+    ?match_receive({A2, [{Tab, 1, test_ok}]}),
+    exit(A1, kill), % Needed since we trap exit
+
+    ?verify_mnesia([Node2], [Node1]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+lock_waiter_sw_r(suite) -> [];
+lock_waiter_sw_r(Config) when is_list(Config) ->
+    start_lock_waiter(sw, r, Config).
+
+lock_waiter_sw_rt(suite) -> [];
+lock_waiter_sw_rt(Config) when is_list(Config) ->
+    start_lock_waiter(sw, rt, Config).
+
+lock_waiter_sw_wt(suite) -> [];
+lock_waiter_sw_wt(Config) when is_list(Config) ->
+    start_lock_waiter(sw, wt,Config).
+
+lock_waiter_wr_r(suite) -> [];
+lock_waiter_wr_r(Config) when is_list(Config) ->
+    start_lock_waiter(wr, r, Config).
+
+lock_waiter_srw_r(suite) -> [];
+lock_waiter_srw_r(Config) when is_list(Config) ->
+    start_lock_waiter(srw, r, Config).
+
+lock_waiter_sw_sw(suite) -> [];
+lock_waiter_sw_sw(Config) when is_list(Config) ->
+    start_lock_waiter(sw, sw,Config).
+
+lock_waiter_srw_srw(suite) -> [];
+lock_waiter_srw_srw(Config) when is_list(Config) ->
+    start_lock_waiter(srw, srw,Config).
+
+lock_waiter_wr_wr(suite) -> [];
+lock_waiter_wr_wr(Config) when is_list(Config) ->
+    start_lock_waiter(wr, wr,Config).
+
+lock_waiter_sw_w(suite) -> [];
+lock_waiter_sw_w(Config) when is_list(Config) ->
+    start_lock_waiter(sw, w,Config).
+
+lock_waiter_sw_wr(suite) -> [];
+lock_waiter_sw_wr(Config) when is_list(Config) ->
+    start_lock_waiter(sw, wr,Config).
+
+lock_waiter_sw_srw(suite) -> [];
+lock_waiter_sw_srw(Config) when is_list(Config) ->
+    start_lock_waiter(sw, srw,Config).
+
+lock_waiter_wr_wt(suite) -> [];
+lock_waiter_wr_wt(Config) when is_list(Config) ->
+    start_lock_waiter(wr, wt,Config).
+
+lock_waiter_srw_wt(suite) -> [];
+lock_waiter_srw_wt(Config) when is_list(Config) ->
+    start_lock_waiter(srw, wt,Config).
+
+lock_waiter_wr_sw(suite) -> [];
+lock_waiter_wr_sw(Config) when is_list(Config) ->
+    start_lock_waiter(wr, sw,Config).
+
+lock_waiter_srw_sw(suite) -> [];
+lock_waiter_srw_sw(Config) when is_list(Config) ->
+    start_lock_waiter(srw, sw,Config).
+
+lock_waiter_wr_w(suite) -> [];
+lock_waiter_wr_w(Config) when is_list(Config) ->
+    start_lock_waiter(wr, w,Config).
+
+lock_waiter_srw_w(suite) -> [];
+lock_waiter_srw_w(Config) when is_list(Config) ->
+    start_lock_waiter(srw, w,Config).
+
+lock_waiter_r_sw(suite) -> [];
+lock_waiter_r_sw(Config) when is_list(Config) ->
+    start_lock_waiter(r, sw,Config).
+
+lock_waiter_r_w(suite) -> [];
+lock_waiter_r_w(Config) when is_list(Config) ->
+    start_lock_waiter(r, w,Config).
+
+lock_waiter_r_wt(suite) -> [];
+lock_waiter_r_wt(Config) when is_list(Config) ->
+    start_lock_waiter(r, wt,Config).
+
+lock_waiter_rt_sw(suite) -> [];
+lock_waiter_rt_sw(Config) when is_list(Config) ->
+    start_lock_waiter(rt, sw,Config).
+
+lock_waiter_rt_w(suite) -> [];
+lock_waiter_rt_w(Config) when is_list(Config) ->
+     start_lock_waiter(rt, w,Config).
+
+lock_waiter_rt_wt(suite) -> [];
+lock_waiter_rt_wt(Config) when is_list(Config) ->
+    start_lock_waiter(rt, wt,Config).
+
+lock_waiter_wt_r(suite) -> [];
+lock_waiter_wt_r(Config) when is_list(Config) ->
+    start_lock_waiter(wt, r,Config).
+
+lock_waiter_wt_w(suite) -> [];
+lock_waiter_wt_w(Config) when is_list(Config) ->
+    start_lock_waiter(wt, w,Config).
+
+lock_waiter_wt_rt(suite) -> [];
+lock_waiter_wt_rt(Config) when is_list(Config) ->
+    start_lock_waiter(wt, rt,Config).
+
+lock_waiter_wt_wt(suite) -> [];
+lock_waiter_wt_wt(Config) when is_list(Config) ->
+    start_lock_waiter(wt, wt,Config).
+
+lock_waiter_wt_wr(suite) -> [];
+lock_waiter_wt_wr(Config) when is_list(Config) ->
+    start_lock_waiter(wt, wr,Config).
+
+lock_waiter_wt_srw(suite) -> [];
+lock_waiter_wt_srw(Config) when is_list(Config) ->
+    start_lock_waiter(wt, srw,Config).
+
+lock_waiter_wt_sw(suite) -> [];
+lock_waiter_wt_sw(Config) when is_list(Config) ->
+    start_lock_waiter(wt, sw,Config).
+
+lock_waiter_w_wr(suite) -> [];
+lock_waiter_w_wr(Config) when is_list(Config) ->
+    start_lock_waiter(w, wr, Config).
+
+lock_waiter_w_srw(suite) -> [];
+lock_waiter_w_srw(Config) when is_list(Config) ->
+    start_lock_waiter(w, srw, Config).
+
+lock_waiter_w_sw(suite) -> [];
+lock_waiter_w_sw(Config) when is_list(Config) ->
+    start_lock_waiter(w, sw, Config).
+
+lock_waiter_w_r(suite) -> [];
+lock_waiter_w_r(Config) when is_list(Config) ->
+    start_lock_waiter(w, r, Config).
+
+lock_waiter_w_w(suite) -> [];
+lock_waiter_w_w(Config) when is_list(Config) ->
+    start_lock_waiter(w, w, Config).
+
+lock_waiter_w_rt(suite) -> [];
+lock_waiter_w_rt(Config) when is_list(Config) ->
+    start_lock_waiter(w, rt, Config).
+
+lock_waiter_w_wt(suite) -> [];
+lock_waiter_w_wt(Config) when is_list(Config) ->
+    start_lock_waiter(w, wt, Config).
+
+start_lock_waiter(BlockOpA, BlockOpB, Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    
+    TabName = mk_tab_name(lock_waiter_),
+    ?match({atomic, ok}, mnesia:create_table(TabName,
+					     [{ram_copies, [N1, N2]}])),
+    
+    %% initialize the table with object {1, c} - when there 	
+    %% is a read transaction, the read will find that  value
+    ?match({atomic, ok}, mnesia:sync_transaction(fun() -> mnesia:write({TabName, 1, c}) end)),
+    rpc:call(N2, ?MODULE, sync_tid_release, []),
+
+    Tester = self(),
+    Fun_A =fun() ->
+		   NewCounter = incr_restart_counter(),
+		   if 
+		       NewCounter == 1 ->
+			   Tester ! go_ahead_test,
+			   receive go_ahead -> ok end;
+		      true -> ok
+		   end,
+		   lock_waiter_fun(BlockOpA, TabName, a),
+		   NewCounter
+	   end,
+        
+    %% it's not possible to just spawn the transaction, because
+    %% the result shall be evaluated
+    A = spawn_link(N1, ?MODULE, perform_restarted_transaction, [Fun_A]),
+    
+    ?match(ok, receive go_ahead_test -> ok after 10000 -> timeout end),
+    
+    mnesia_test_lib:sync_trans_tid_serial([N1, N2]),
+
+    Fun_B = fun() ->
+		    lock_waiter_fun(BlockOpB, TabName, b),
+		    A ! go_ahead,
+		    wait(infinity)
+	    end,
+    
+    B = spawn_link(N2, mnesia, transaction, [Fun_B, 100]),
+    
+    io:format("waiting for A (~p on ~p) to be in the queue ~n", [A, [N1, N2]]),
+    wait_for_a(A, [N1, N2]),
+    
+    io:format("Queus ~p~n", 
+	      [[{N,rpc:call(N, mnesia, system_info, [lock_queue])} || N <- Nodes]]),
+    
+    KillNode = node(B),
+    io:format("A was in the queue, time to kill Mnesia on B's node (~p on ~p)~n",
+	      [B, KillNode]),
+    
+    mnesia_test_lib:kill_mnesia([KillNode]), % kill mnesia of fun B
+    
+    %% Read Ops does not need to be restarted
+    ExpectedCounter =
+	if
+	    BlockOpA == sw, BlockOpB == w -> 1;
+	    BlockOpA == sw, BlockOpB == wt -> 1;
+	    BlockOpA == sw, BlockOpB == wr -> 1;
+	    BlockOpA == srw, BlockOpB == w -> 1;
+	    BlockOpA == srw, BlockOpB == wt -> 1;
+	    BlockOpA == srw, BlockOpB == wr -> 1;
+	    BlockOpA == r,  BlockOpB /= sw -> 1;
+	    BlockOpA == rt, BlockOpB /= sw -> 1;
+	    true -> 2
+	end,
+    ?match_multi_receive([{'EXIT', A, {atomic, ExpectedCounter}}, 
+			  {'EXIT', B, killed}]),
+    
+    %% the expected result depends on the transaction of
+    %% fun A - when that doesn't change the object in the
+    %% table (e.g. it is a read) then the predefined
+    %% value {Tabname, 1, c} is expected to be the result here
+    ExpectedResult = 
+	case BlockOpA of
+	    w -> {TabName, 1, a};
+	    sw ->{TabName, 1, a};
+	    _all_other -> {TabName, 1, c}
+	end,
+    
+    ?match({atomic, [ExpectedResult]},
+	   mnesia:transaction(fun() -> mnesia:read({TabName, 1}) end, 100)),
+    ?verify_mnesia([N1], [N2]).
+
+mk_tab_name(Prefix) ->
+    {Mega, Sec, Micro} = erlang:now(),
+    list_to_atom(lists:concat([Prefix , Mega, '_', Sec, '_', Micro])).
+
+lock_waiter_fun(Op, TabName, Val) ->
+    case Op of
+	rt ->  mnesia:read_lock_table(TabName);
+	wt ->  mnesia:write_lock_table(TabName);
+	r  ->  mnesia:read({TabName, 1});
+	w ->   mnesia:write({TabName, 1, Val});
+	wr ->  mnesia:wread({TabName, 1});
+	srw -> mnesia:read(TabName, 1, sticky_write);
+	sw ->  mnesia:s_write({TabName, 1, Val})
+    end.
+    
+wait_for_a(Pid, Nodes) ->
+    wait_for_a(Pid, Nodes, 5).
+
+wait_for_a(_P, _N, 0) ->
+    ?error("Timeout while waiting for lock on a~n", []);
+
+wait_for_a(Pid, Nodes, Count) ->
+    %%    io:format("WAIT_FOR_A ~p ON ~w ~n", [Pid, Nodes]),
+    List = [rpc:call(N, mnesia, system_info, [lock_queue]) || N <- Nodes],
+    Q = lists:append(List),
+    check_q(Pid, Q, Nodes, Count).
+
+check_q(Pid, [{{_Oid,_Tid}, _Op, Pid, _WFT} | _Tail], _N, _Count) ->
+    ok;
+check_q(Pid, [{_Oid, _Op, Pid, _Tid, _WFT} | _Tail], _N, _Count) ->
+    ok;
+check_q(Pid, [_ | Tail], N, Count) ->
+    check_q(Pid, Tail, N, Count);
+check_q(Pid, [], N, Count) ->
+    timer:sleep(500),
+    wait_for_a(Pid, N, Count - 1).
+    
+perform_restarted_transaction (Fun_Trans) ->
+    %% the result of the transaction shall be:
+    %%  - undefined (if the transaction was never executed)
+    %%  - Times ( number of times that the transaction has been executed)
+    
+    Result = mnesia:transaction(Fun_Trans, 100),
+    exit(Result).
+
+%% Returns new val
+incr_restart_counter() ->
+    NewCount =
+	case get(count_restart_of_transaction) of
+	    undefined -> 1;
+	    OldCount -> OldCount + 1
+	end,
+    put(count_restart_of_transaction, NewCount),
+    NewCount.
+
+wait(Mseconds) ->
+    receive
+    after Mseconds -> ok
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+restart_r_one(suite) -> [];
+restart_r_one(Config) when is_list(Config) ->
+    start_restart_check(r, one, Config).
+
+restart_w_one(suite) -> [];
+restart_w_one(Config) when is_list(Config) ->
+    start_restart_check(w, one, Config).
+
+restart_rt_one(suite) -> [];
+restart_rt_one(Config) when is_list(Config) ->
+    start_restart_check(rt, one, Config).
+
+restart_wt_one(suite) -> [];
+restart_wt_one(Config) when is_list(Config) ->
+    start_restart_check(wt, one, Config).
+
+restart_wr_one(suite) -> [];
+restart_wr_one(Config) when is_list(Config) ->
+    start_restart_check(wr, one, Config).
+
+restart_sw_one(suite) -> [];
+restart_sw_one(Config) when is_list(Config) ->
+    start_restart_check(sw, one, Config).
+
+restart_r_two(suite) -> [];
+restart_r_two(Config) when is_list(Config) ->
+    start_restart_check(r, two, Config).
+
+restart_w_two(suite) -> [];
+restart_w_two(Config) when is_list(Config) ->
+    start_restart_check(w, two, Config).
+
+restart_rt_two(suite) -> [];
+restart_rt_two(Config) when is_list(Config) ->
+    start_restart_check(rt, two, Config).
+
+restart_wt_two(suite) -> [];
+restart_wt_two(Config) when is_list(Config) ->
+    start_restart_check(wt, two, Config).
+
+restart_wr_two(suite) -> [];
+restart_wr_two(Config) when is_list(Config) ->
+    start_restart_check(wr, two, Config).
+
+restart_sw_two(suite) -> [];
+restart_sw_two(Config) when is_list(Config) ->
+    start_restart_check(sw, two, Config).
+
+start_restart_check(RestartOp, ReplicaNeed, Config) ->
+    [N1, N2, N3] = Nodes = ?acquire_nodes(3, Config),
+    
+    {TabName, _TabNodes} = create_restart_table(ReplicaNeed, Nodes),
+    
+    %% initialize the table with object {1, c} - when there 	
+    %% is a read transaction, the read will find that  value
+    ?match({atomic, ok}, mnesia:sync_transaction(fun() -> mnesia:write({TabName, 1, c}) end)),
+
+    %% Really sync tid_release
+    rpc:multicall([N2,N3], ?MODULE, sync_tid_release, []),
+    Coord = self(),
+
+    Fun_A = fun() ->
+		    NewCounter = incr_restart_counter(),
+		    case NewCounter of
+			1 ->
+			    mnesia:write({TabName, 1, d}),			    
+			    %% send a message to the test proc
+			    Coord ! {self(),fun_a_is_blocked}, 			    
+			    receive go_ahead -> ok end;
+			_ ->
+			    %% the fun will NOT be blocked here
+			    restart_fun_A(RestartOp, TabName)
+		    end,
+		    NewCounter
+	    end,
+    
+    A = spawn_link(N1, ?MODULE, perform_restarted_transaction, [Fun_A]),
+    ?match_receive({A,fun_a_is_blocked}),    		
+    
+    %% mnesia shall be killed at that node, where A is reading
+    %% the information from
+    kill_where_to_read(TabName, N1, [N2, N3]),
+    
+    %% wait some time to let mnesia go down and spread those news around
+    %% fun A shall be able to finish its job before being restarted
+    wait(500), 
+    A ! go_ahead,
+    
+    %% the sticky write doesnt work on remote nodes !!!
+    ExpectedMsg =
+	case RestartOp of
+	    sw when ReplicaNeed == two ->
+		{'EXIT',A,{aborted,  {not_local, TabName}}};
+	    _all_other ->
+		case ReplicaNeed of
+		    one ->
+			{'EXIT',A,{aborted,  {no_exists, TabName}}};
+		    two ->
+			{'EXIT',A,{atomic, 2}}
+		end
+	end,
+    
+    ?match_receive(ExpectedMsg),    		
+    
+    %% now mnesia has to be started again on the node KillNode
+    %% because the next test suite will need it
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, [TabName])),
+    
+    
+    %%  the expected result depends on the transaction of
+    %%  fun A - when that doesnt change the object in the
+    %%  table (e.g. it is a read) then the predefined
+    %%  value {Tabname, 1, c} is expected to be the result here
+    
+    ExpectedResult =
+	case ReplicaNeed of
+	    one ->
+		[];
+	    two ->
+		case RestartOp of
+		    w -> [{TabName, 1, a}];
+		    _ ->[ {TabName, 1, c}]
+		end
+	end,
+
+    ?match({atomic, ExpectedResult},
+	   mnesia:transaction(fun() -> mnesia:read({TabName, 1}) end,100)),
+    ?verify_mnesia(Nodes, []).
+
+create_restart_table(ReplicaNeed, [_N1, N2, N3]) ->
+    TabNodes = 
+	case ReplicaNeed of
+	    one ->  [N2];
+	    two ->  [N2, N3]
+	end,
+    TabName = mk_tab_name(restart_check_),
+    ?match({atomic, ok}, mnesia:create_table(TabName, [{ram_copies, TabNodes}])),
+    {TabName, TabNodes}.
+    
+restart_fun_A(Op, TabName) ->
+    case Op of
+	rt -> mnesia:read_lock_table(TabName);
+	wt -> mnesia:write_lock_table(TabName);
+	r ->  mnesia:read( {TabName, 1});
+	w ->  mnesia:write({TabName, 1, a});
+	wr -> mnesia:wread({TabName, 1});
+	sw -> mnesia:s_write({TabName, 1, a})
+    end.
+
+kill_where_to_read(TabName, N1, Nodes) ->
+    Read = rpc:call(N1,mnesia,table_info, [TabName, where_to_read]),
+    case lists:member(Read, Nodes) of
+	true ->
+	    mnesia_test_lib:kill_mnesia([Read]);
+	false ->
+	    ?error("Fault while killing Mnesia: ~p~n", [Read]),
+	    mnesia_test_lib:kill_mnesia(Nodes)
+    end.
+    
+sync_tid_release() ->    
+    sys:get_status(whereis(mnesia_tm)),
+    sys:get_status(whereis(mnesia_locker)),
+    ok.
+
diff --git a/lib/mnesia/test/mnesia_config_backup.erl b/lib/mnesia/test/mnesia_config_backup.erl
new file mode 100644
index 0000000000..0916e255e2
--- /dev/null
+++ b/lib/mnesia/test/mnesia_config_backup.erl
@@ -0,0 +1,105 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1997-2010. 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(mnesia_config_backup).
+-author('[email protected]').
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% This module is used for testing the backup module config parameter.
+%%
+%% This module is an impostor for the mnesia_backup module.
+%%
+%%
+%% Original doc below:
+%%
+%% This module contains one implementation of callback functions
+%% used by Mnesia at backup and restore. The user may however
+%% write an own module the same interface as mnesia_backup and
+%% configure Mnesia so the alternate module performs the actual
+%% accesses to the backup media. This means that the user may put
+%% the backup on medias that Mnesia does not know about, possibly
+%% on hosts where Erlang is not running.
+%%
+%% The OpaqueData argument is never interpreted by other parts of
+%% Mnesia. It is the property of this module. Alternate implementations
+%% of this module may have different interpretations of OpaqueData.
+%% The OpaqueData argument given to open_write/1 and open_read/1
+%% are forwarded directly from the user.
+%%
+%% All functions must return {ok, NewOpaqueData} or {error, Reason}.
+%%
+%% The NewOpaqueData arguments returned by backup callback functions will
+%% be given as input when the next backup callback function is invoked.
+%% If any return value does not match {ok, _} the backup will be aborted.
+%%
+%% The NewOpaqueData arguments returned by restore callback functions will
+%% be given as input when the next restore callback function is invoked
+%% If any return value does not match {ok, _} the restore will be aborted.
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-export([
+         open_write/1, write/2, commit_write/1, abort_write/1,
+         open_read/1, read/1, close_read/1
+        ]).
+
+-record(backup, {name, mode, items}).
+
+open_write(Name) -> 
+    file:delete(Name),
+    {ok, #backup{name = Name, mode = write, items = []}}.
+
+write(Opaque, Item) when Opaque#backup.mode == write ->
+    %% Build the list in reverse order
+    {ok, Opaque#backup{items = [Item | Opaque#backup.items]}}.
+
+commit_write(Opaque) when Opaque#backup.mode == write ->
+    Bin = term_to_binary(Opaque#backup.items),
+    case file:write_file(Opaque#backup.name, Bin) of
+	ok ->
+	    {ok, Opaque#backup{mode = closed, items = []}};
+	{error, Reason} ->
+	    {error, {commit_write, Reason}}
+    end.
+
+abort_write(Opaque) ->  
+    {ok, Opaque#backup{mode = closed, items = []}}.
+
+open_read(Name) ->
+    case file:read_file(Name) of
+	{ok, Bin} ->
+	    ReverseList = binary_to_term(Bin),
+	    List = lists:reverse(ReverseList),
+	    {ok, #backup{name = Name, mode = read, items = List}};
+	{error, Reason} ->
+	    {error, {open_read, Reason}}
+    end.
+
+read(Opaque) when Opaque#backup.mode == read ->
+    case Opaque#backup.items of
+	[Head | Tail] ->
+	    {ok, Opaque#backup{items = Tail}, Head};
+	[] ->
+	    {ok, Opaque#backup{mode = closed}, []}
+    end.
+
+close_read(Opaque) ->
+    {ok, Opaque#backup{mode = closed, items = []}}.
diff --git a/lib/mnesia/test/mnesia_config_event.erl b/lib/mnesia/test/mnesia_config_event.erl
new file mode 100644
index 0000000000..832bf94eb9
--- /dev/null
+++ b/lib/mnesia/test/mnesia_config_event.erl
@@ -0,0 +1,74 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1997-2010. 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(mnesia_config_event).
+-author('[email protected]').
+
+-behaviour(gen_event).
+
+%% 
+%% This module was stolen from Mnesia
+%%
+
+
+%% gen_event callback interface
+-export([init/1, handle_event/2, handle_call/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+
+init(_Args) ->
+    {ok, []}.
+
+handle_event(Msg, State) ->
+    handle_any_event(Msg, State).
+
+handle_info(Msg, State) ->
+    handle_any_event(Msg, State).
+
+
+handle_call(Msg, State) ->
+    handle_any_event(Msg, State).
+
+
+%% The main...
+
+handle_any_event({get_log, Pid}, State) ->
+    Pid ! {log, State},
+    {ok, State};
+handle_any_event(Msg, State) ->
+    io:format("Got event: ~p~n", [Msg]),
+    {ok, [Msg | State]}.
+
+%%-----------------------------------------------------------------
+%% terminate(Reason, State) ->
+%%     AnyVal
+%%-----------------------------------------------------------------
+
+terminate(_Reason, _State) ->
+    ok.
+
+%%----------------------------------------------------------------------
+%% Func: code_change/3
+%% Purpose: Upgrade process when its code is to be changed
+%% Returns: {ok, NewState}
+%%----------------------------------------------------------------------
+code_change(_OldVsn, _State, _Extra) ->
+    exit(not_supported).
+
diff --git a/lib/mnesia/test/mnesia_config_test.erl b/lib/mnesia/test/mnesia_config_test.erl
new file mode 100644
index 0000000000..93510d539c
--- /dev/null
+++ b/lib/mnesia/test/mnesia_config_test.erl
@@ -0,0 +1,1420 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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(mnesia_config_test).
+-author('[email protected]').
+
+-include("mnesia_test_lib.hrl").
+ 
+-record(test_table,{i,a1,a2,a3}).
+-record(test_table2,{i, b}).
+
+-export([
+	all/0,groups/0,init_per_group/2,end_per_group/2,
+	 access_module/1,
+	 auto_repair/1,
+	 backup_module/1,
+	 debug/1,
+	 dir/1,
+	 dump_log_load_regulation/1,
+	
+	 dump_log_update_in_place/1,
+	 embedded_mnemosyne/1,
+	 event_module/1,
+	 ignore_fallback_at_startup/1,
+	 inconsistent_database/1,
+	 max_wait_for_decision/1,
+	 send_compressed/1,
+
+	 app_test/1,
+	
+	 schema_merge/1,
+	 unknown_config/1,
+
+	 dump_log_time_threshold/1,
+	 dump_log_write_threshold/1,
+	 
+	 start_one_disc_full_then_one_disc_less/1,
+	 start_first_one_disc_less_then_one_disc_full/1,
+	 start_first_one_disc_less_then_two_more_disc_less/1,
+	 schema_location_and_extra_db_nodes_combinations/1,
+	 table_load_to_disc_less_nodes/1,
+	
+	 dynamic_basic/1,
+	 dynamic_ext/1,
+	 dynamic_bad/1,
+
+	 init_per_testcase/2,
+	 end_per_testcase/2,
+	 c_nodes/0
+	]).
+
+-export([check_logs/1]).
+
+-define(init(N, Config),
+	mnesia_test_lib:prepare_test_case([{init_test_case, [mnesia]},
+					   delete_schema,
+					   {reload_appls, [mnesia]}],
+					  N, Config, ?FILE, ?LINE)).
+-define(acquire(N, Config),
+	mnesia_test_lib:prepare_test_case([{init_test_case, [mnesia]},
+					   delete_schema,
+					   {reload_appls, [mnesia]},
+					   create_schema,
+					   {start_appls, [mnesia]}],
+					  N, Config, ?FILE, ?LINE)).
+-define(acquire_schema(N, Config),
+	mnesia_test_lib:prepare_test_case([{init_test_case, [mnesia]},
+					    delete_schema,
+					    {reload_appls, [mnesia]},
+					    create_schema],
+					  N, Config, ?FILE, ?LINE)).
+-define(cleanup(N, Config),
+	mnesia_test_lib:prepare_test_case([{reload_appls, [mnesia]}],
+					  N, Config, ?FILE, ?LINE)).
+-define(trans(Fun),
+	?match({atomic, ok}, mnesia:transaction(Fun))).
+
+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() -> 
+    [access_module, auto_repair, backup_module, debug, dir,
+     dump_log_load_regulation, {group, dump_log_thresholds},
+     dump_log_update_in_place, embedded_mnemosyne,
+     event_module, ignore_fallback_at_startup,
+     inconsistent_database, max_wait_for_decision,
+     send_compressed, app_test, {group, schema_config},
+     unknown_config].
+
+groups() -> 
+    [{dump_log_thresholds, [],
+      [dump_log_time_threshold, dump_log_write_threshold]},
+     {schema_config, [],
+      [start_one_disc_full_then_one_disc_less,
+       start_first_one_disc_less_then_one_disc_full,
+       start_first_one_disc_less_then_two_more_disc_less,
+       schema_location_and_extra_db_nodes_combinations,
+       table_load_to_disc_less_nodes, schema_merge,
+       {group, dynamic_connect}]},
+     {dynamic_connect, [],
+      [dynamic_basic, dynamic_ext, dynamic_bad]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+access_module(doc) ->
+    ["Replace the activity access module with another module and ",
+     "use it to read and write to some alternate table storage"];
+access_module(suite) -> [];
+access_module(Config) when is_list(Config) ->
+    Nodes = ?acquire_schema(1, Config),
+    ?match(ok, mnesia:start([{access_module, mnesia_frag}])),
+
+    ?match(mnesia_frag, mnesia:system_info(access_module)),
+
+    access_tab(ram_copies, Nodes),
+    case mnesia_test_lib:diskless(Config) of
+	true -> skip;
+	false -> 
+	    access_tab(disc_copies, Nodes)
+		,  access_tab(disc_only_copies, Nodes)
+    end,
+
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(1, Config).
+
+access_tab(Storage, Nodes) ->
+    Tab = list_to_atom(lists:concat([access_tab_, Storage])),
+    RecName = some_access,
+    Attr = val,
+    TabDef = [{Storage, Nodes},
+	      {type, bag},
+	      {index, [Attr]},
+	      {record_name, RecName}],
+    ?match({atomic,ok}, mnesia:create_table(Tab, TabDef)),
+
+    Activity = fun(Kind) ->
+		       A = [Kind, Tab, RecName, Attr, Nodes],
+		       io:format("kind: ~w, storage: ~w~n", [Kind, Storage]),
+		       mnesia:activity(Kind, fun do_access/5, A)
+	       end,
+    ModActivity = fun(Kind, M) ->
+			  io:format("kind: ~w, storage: ~w. module: ~w~n",
+				    [Kind, Storage, M]),
+			  A = [Kind, Tab, RecName, Attr, Nodes],
+			  mnesia:activity(Kind, fun do_access/5, A, M)
+	       end,
+    ?match(ok, Activity(transaction)),
+    ?match(ok, Activity({transaction, 47})),
+    ?match(ok, ModActivity(transaction, mnesia)),
+    ?match(ok, ModActivity(transaction, mnesia_frag)),
+    
+    ?match(ok, Activity(async_dirty)),
+    ?match(ok, Activity(sync_dirty)),
+    case Storage of
+	ram_copies ->
+	    ?match(ok, Activity(ets));
+	_ ->
+	    ignore
+    end.
+
+do_access(Kind, Tab, RecName, Attr, Nodes) ->
+    Tens = lists:sort([{RecName, 1, 10}, {RecName, 3, 10}]),
+    {OptNodes, OptTens} = 
+	case Kind of
+	    transaction -> {Nodes, Tens};
+	    {transaction, _} -> {Nodes, Tens};
+	    async_dirty -> {[], Tens};
+	    sync_dirty -> {[], Tens};
+	    ets -> {[], []}
+	end,
+    ?match(RecName, mnesia:table_info(Tab, record_name)),
+    
+    ?match(ok, mnesia:write(Tab, {RecName, 1, 10}, write)),
+    ?match(ok, mnesia:write(Tab, {RecName, 2, 20}, sticky_write)),
+    ?match(ok, mnesia:write(Tab, {RecName, 2, 21}, sticky_write)),
+    ?match(ok, mnesia:write(Tab, {RecName, 2, 22}, write)),
+    ?match(ok, mnesia:write(Tab, {RecName, 3, 10}, write)),
+
+    Twos = [{RecName, 2, 20}, {RecName, 2, 21}, {RecName, 2, 22}],
+    ?match(Twos, lists:sort(mnesia:read(Tab, 2, read))),
+    
+    ?match(ok, mnesia:delete_object(Tab, {RecName, 2, 21}, sticky_write)),
+
+    TenPat = {RecName, '_', 10},
+    ?match(Tens, lists:sort(mnesia:match_object(Tab, TenPat, read))),
+    ?match(OptTens, lists:sort(mnesia:index_match_object(Tab, TenPat, Attr, read) )),
+    ?match(OptTens, lists:sort(mnesia:index_read(Tab, 10, Attr))),
+    Keys = [1, 2, 3],
+    ?match(Keys, lists:sort(mnesia:all_keys(Tab))),
+
+    First = mnesia:first(Tab),
+    Mid   = mnesia:next(Tab, First),
+    Last  = mnesia:next(Tab, Mid),
+    ?match('$end_of_table', mnesia:next(Tab, Last)),
+    ?match(Keys, lists:sort([First,Mid,Last])),
+
+    %% For set and bag these last, prev works as first and next
+    First2 = mnesia:last(Tab),
+    Mid2   = mnesia:prev(Tab, First2),
+    Last2  = mnesia:prev(Tab, Mid2),
+    ?match('$end_of_table', mnesia:prev(Tab, Last2)),
+    ?match(Keys, lists:sort([First2,Mid2,Last2])),
+
+    ?match([ok, ok, ok], [mnesia:delete(Tab, K, write) || K <- Keys]),
+    W = wild_pattern,
+    ?match([], mnesia:match_object(Tab, mnesia:table_info(Tab, W), read)),
+    ?log("Safe fixed ~p~n", [catch ets:info(Tab, safe_fixed)]),
+    ?log("Fixed ~p ~n", [catch ets:info(Tab, fixed)]),
+    
+    ?match(OptNodes, mnesia:lock({global, some_lock_item, Nodes}, write)),
+    ?match(OptNodes, mnesia:lock({global, some_lock_item, Nodes}, read)),
+    ?match(OptNodes, mnesia:lock({table, Tab}, read)),
+    ?match(OptNodes, mnesia:lock({table, Tab}, write)),
+    
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+auto_repair(doc) ->
+    ["Try the auto_repair mechanism on the various disk_logs and dets files.",
+     "",
+     "The case tests both normal values of the parameter, and also",
+     "one crazy value.",
+     "The test of the real auto_repair functionality is made in the",
+     "dets suite"
+    ];
+auto_repair(suite) -> [];
+auto_repair(Config) when is_list(Config) ->
+    ?init(1, Config),
+    ?match(ok, mnesia:start()),			% Check default true
+    ?match(true, mnesia:system_info(auto_repair)),
+    ?match(stopped, mnesia:stop()),
+    ?match(ok, mnesia:start([{auto_repair, true}])),
+    ?match(true, mnesia:system_info(auto_repair)),
+    ?match(stopped, mnesia:stop()),
+    ?match(ok, mnesia:start([{auto_repair, false}])),
+    ?match(false, mnesia:system_info(auto_repair)),
+    ?match(stopped, mnesia:stop()),
+    ?match({error, {bad_type, auto_repair, your_mama}},
+	   mnesia:start([{auto_repair, your_mama}])),
+     ?match(stopped, mnesia:stop()),
+    ?cleanup(1, Config),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+backup_module(doc) ->
+    ["Replace the backup module with another module and use it to",
+     "read and write to an alternate backup media, e.g stored in",
+     "the internal state of a simple process."];
+backup_module(suite) -> [];
+backup_module(Config) when is_list(Config) ->
+    Nodes = ?acquire_schema(1, Config),
+    ?match(ok, mnesia:start([{backup_module, mnesia_config_backup}])),
+    ?match({atomic,ok},
+	   mnesia:create_table(test_table,
+			       [{disc_copies, Nodes},
+				{attributes,
+				 record_info(fields,test_table)}])),
+    
+    ?match({atomic,ok},
+	   mnesia:create_table(test_table2,
+			       [{disc_copies, Nodes},
+				{attributes,
+				 record_info(fields,test_table2)}])),
+    %% Write in test table 
+    ?trans(fun() -> mnesia:write(#test_table{i=1}) end),
+    ?trans(fun() -> mnesia:write(#test_table{i=2}) end),
+    
+    %% Write in test table 2
+    ?trans(fun() -> mnesia:write(#test_table2{i=3}) end),
+    ?trans(fun() -> mnesia:write(#test_table2{i=4}) end),
+    mnesia_test_lib:sync_tables(Nodes, [test_table, test_table2]),
+    
+    File = whow,
+    %% Now make a backup
+    ?match(ok, mnesia:backup(File)),
+
+    ?match(ok, mnesia:install_fallback(File)),
+    
+    %% Now add things
+    ?trans(fun() -> mnesia:write(#test_table{i=2.5}) end),
+    ?trans(fun() -> mnesia:write(#test_table2{i=3.5}) end),
+
+    mnesia_test_lib:kill_mnesia(Nodes),
+    receive after 2000 -> ok end,
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, [test_table, test_table2])),
+
+    %% Now check newly started tables
+    ?match({atomic, [1,2]}, 
+	   mnesia:transaction(fun() -> lists:sort(mnesia:all_keys(test_table)) end)),
+    ?match({atomic, [3,4]}, 
+	   mnesia:transaction(fun() -> lists:sort(mnesia:all_keys(test_table2)) end)),
+    
+    file:delete(File),
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(1, Config),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+debug(doc) ->
+    ["Try out the four debug levels and ensure that the",
+    "expected events are generated."];
+debug(suite) -> [];
+debug(Config) when is_list(Config) ->
+    Nodes = ?init(1, Config),
+    case application:get_env(mnesia,debug) of
+	undefined ->
+	    ?match(none, mnesia:system_info(debug));
+	{ok, false} ->
+	    ?match(none, mnesia:system_info(debug));
+	{ok, true} ->
+	    ?match(debug, mnesia:system_info(debug));
+	{ok, Env} ->
+	    ?match(Env, mnesia:system_info(debug))
+    end,
+
+    ?match(ok, mnesia:start([{debug, verbose}])),
+    ?match(verbose, mnesia:system_info(debug)),
+    mnesia_test_lib:kill_mnesia(Nodes),
+    receive after 2000 -> ok end,
+
+    ?match(ok, mnesia:start([{debug, debug}])),
+    ?match(debug, mnesia:system_info(debug)),
+    mnesia_test_lib:kill_mnesia(Nodes),
+    receive after 2000 -> ok end,
+
+    ?match(ok, mnesia:start([{debug, trace}])),
+    ?match(trace, mnesia:system_info(debug)),
+    mnesia_test_lib:kill_mnesia(Nodes),
+    receive after 2000 -> ok end,
+
+    ?match(ok, mnesia:start([{debug, true}])),
+    ?match(debug, mnesia:system_info(debug)),
+    mnesia_test_lib:kill_mnesia(Nodes),
+    receive after 2000 -> ok end,
+
+    ?match(ok, mnesia:start([{debug, false}])),
+    ?match(none, mnesia:system_info(debug)),
+
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(1, Config),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dir(doc) ->
+    ["Try to use alternate Mnesia directories"];
+dir(suite) -> [];
+dir(Config) when is_list(Config) ->
+    Nodes = ?init(1, Config),
+
+    ?match(ok, mnesia:start([{dir, tuff}])),
+    Dir = filename:join([element(2, file:get_cwd()), "tuff"]),
+    ?match(Dir, mnesia:system_info(directory)),
+    mnesia_test_lib:kill_mnesia(Nodes),
+ 
+    ?cleanup(1, Config),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dump_log_update_in_place(doc) ->
+    ["Change the update in place policy for the transaction log dumper."];
+dump_log_update_in_place(suite) -> [];
+dump_log_update_in_place(Config) when is_list(Config) ->
+    Nodes = ?acquire(1, Config),
+    ?match(true, mnesia:system_info(dump_log_update_in_place)),
+    ?match({atomic,ok},
+	   mnesia:create_table(test_table,
+			       [{disc_copies, Nodes},
+				{attributes,
+				 record_info(fields,test_table)}])),
+    
+    mnesia_test_lib:kill_mnesia(Nodes),
+    receive after 2000 -> ok end,
+    
+    ?match(ok, mnesia:start([{dump_log_update_in_place, false}])),
+    ?match(false, mnesia:system_info(dump_log_update_in_place)),
+
+    mnesia_test_lib:sync_tables(Nodes, [schema, test_table]),
+
+    %% Now provoke some log dumps
+
+    L = lists:map(
+	  fun(Num) ->
+		  %% Write something on one end ...
+		  mnesia:transaction(
+		    fun() ->
+			    mnesia:write(#test_table{i=Num}) end
+		   ) end,
+	  lists:seq(1, 110)),
+    
+    L2 = lists:duplicate(110, {atomic, ok}),
+
+    %% If this fails then some of the 110 writes above failed
+    ?match(true, L==L2),
+    if  L==L2 -> ok;
+	true -> 
+	    ?verbose("***** List1 len: ~p, List2 len: ~p~n",
+		      [length(L), length(L2)]),
+	    ?verbose("L: ~p~nL2:~p~n", [L, L2])
+    end,
+    
+    %% If we still can write, then Mnesia is probably alive
+    ?trans(fun() -> mnesia:write(#test_table{i=115}) end),
+    
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(1, Config),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dump_log_write_threshold(doc)->
+    ["This test case must be rewritten.",
+     "Dump logs are tested by doing transactions, then killing Mnesia and ",
+     "then examining the table data files and see if they are correct.",
+     "The test_table is used as a counter, test_table. is stepped once ",
+     "for each transaction."];
+dump_log_write_threshold(suite)->[];
+dump_log_write_threshold(Config) when is_list(Config) ->
+    [N1] = ?acquire_schema(1, Config),
+
+    Threshold = 3,
+    ?match(ok,mnesia:start([{dump_log_write_threshold, Threshold}])),
+
+    ?match({atomic,ok},
+	   mnesia:create_table(test_table,
+			       [{disc_copies, [N1]},
+				{attributes,
+				 record_info(fields,test_table)}])),
+    ?match(dumped, mnesia:dump_log()),
+    
+    ?match(ok, do_trans(2)),				% Shall not have dumped
+    check_logs(0),
+    
+    ?match(ok, do_trans(Threshold - 2)),			% Trigger a dump
+    receive after 1000 -> ok end,
+    check_logs(Threshold),
+
+    
+    ?match(ok, do_trans(Threshold - 1)),   
+    ?match(dumped, mnesia:dump_log()),   %% This should trigger ets2dcd dump
+    check_logs(0),                       %% and leave no dcl file
+    
+    ?match(stopped, mnesia:stop()),
+
+    %% Check bad threshold value
+    ?match({error,{bad_type,dump_log_write_threshold,0}},
+	   mnesia:start([{dump_log_write_threshold,0}])),
+
+    ?verify_mnesia([], [N1]),
+    ?cleanup(1, Config),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dump_log_time_threshold(doc)->
+    ["See doc on above."];
+dump_log_time_threshold(suite)->[];
+dump_log_time_threshold(Config) when is_list(Config) ->
+    Nodes = ?acquire_schema(1, Config),
+    Time = 4000,
+
+    %% Check bad threshold value
+    ?match({error,{bad_type,dump_log_time_threshold,0}},
+	   mnesia:start([{dump_log_time_threshold,0}])),
+    
+    
+    ?match(ok,mnesia:start([{dump_log_write_threshold,100},
+			    {dump_log_time_threshold, Time}])),
+    
+    ?match({atomic,ok},mnesia:create_table(test_table,
+					   [{disc_copies, Nodes},
+					    {attributes,
+					     record_info(fields,
+							 test_table)}])),
+    
+    %% Check that nothing is dumped when within time threshold
+    ?match(ok, do_trans(1)),
+    check_logs(0),
+    
+    ?match(Time, mnesia:system_info(dump_log_time_threshold)),
+
+    %% Check that things get dumped when time threshold exceeded
+    ?match(ok, do_trans(5)),
+    receive after Time+2000 -> ok end,
+    check_logs(6),
+    
+    ?verify_mnesia([node()], []),
+    ?cleanup(1, Config),
+    ok.
+
+%%%%%%%%
+%% 
+%% Help functions for dump log
+
+%% Do a transaction N times
+do_trans(0) -> ok;
+do_trans(N) ->
+    Fun = fun() ->
+		  XX=incr(),
+		  mnesia:write(#test_table{i=XX})
+	  end,
+    {atomic, ok} = mnesia:transaction(Fun),
+    do_trans(N-1).
+
+%% An increasing number
+incr() ->
+    case get(bloody_counter) of
+	undefined -> put(bloody_counter, 2), 1;
+	Num -> put(bloody_counter, Num+1)
+    end.
+
+%%
+%% Check that the correct number of transactions have been recorded.
+%%-record(test_table,{i,a1,a2,a3}).
+check_logs(N) ->    
+    File = mnesia_lib:tab2dcl(test_table),    
+    Args = [{file, File}, {name, testing}, {repair, true}, {mode, read_only}],
+
+    if N == 0 ->
+	    ?match(false, mnesia_lib:exists(File));
+       true ->
+	    ?match(true, mnesia_lib:exists(File)),
+	    ?match({ok, _Log}, disk_log:open(Args)),
+	    
+	    {Cont, Terms} = disk_log:chunk(testing, start),
+	    ?match(eof, disk_log:chunk(testing, Cont)),
+	    %%?verbose("N: ~p, L: ~p~n", [N, L]),
+	    disk_log:close(testing),
+	    
+	    %% Correct number of records in file
+	    ?match({N, N}, {N, length(Terms) -1 })  %% Ignore Header
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+dump_log_load_regulation(doc) ->
+    ["Test the load regulation of the dumper"];
+dump_log_load_regulation(suite) ->
+    [];
+dump_log_load_regulation(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(1, Config),
+    Param = dump_log_load_regulation,
+
+    %% Normal 
+    NoReg = false,
+    ?match(NoReg, mnesia:system_info(Param)),
+    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
+
+    %% Bad
+    Bad = arne_anka,
+    ?match({error, {bad_type, Param, Bad}},
+	   mnesia:start([{Param, Bad}])),
+
+    %% Regulation activated
+    Reg = true,
+    ?match(ok,mnesia:start([{Param, Reg}])),
+    ?match(Reg, mnesia:system_info(Param)),
+
+    Args =
+	[{db_nodes, Nodes},
+	 {driver_nodes, Nodes},
+	 {replica_nodes, Nodes},
+	 {n_drivers_per_node, 5},
+	 {n_branches, length(Nodes) * 10},
+	 {n_accounts_per_branch, 5},
+	 {replica_type, disc_copies},
+	 {stop_after, timer:seconds(30)},
+	 {report_interval, timer:seconds(10)},
+	 {use_running_mnesia, true},
+	 {reuse_history_id, true}],
+    
+    ?match({ok, _}, mnesia_tpcb:start(Args)),
+    
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(1, Config),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+embedded_mnemosyne(doc) ->
+    ["Start Mnemosyne as an embedded part of Mnesia",
+     "on some of the nodes"];
+embedded_mnemosyne(suite) ->
+    [];
+embedded_mnemosyne(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(1, Config),
+    Param = embedded_mnemosyne,
+
+    %% Normal 
+    NoMnem = false,
+    ?match(NoMnem, mnesia:system_info(Param)),
+    ?match(undefined, whereis(mnemosyne_catalog)),
+    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
+
+    %% Bad
+    Bad = arne_anka,
+    ?match({error, {bad_type, Param, Bad}},
+	   mnesia:start([{Param, Bad}])),
+
+    case code:priv_dir(mnemosyne) of
+	{error, _} -> %% No mnemosyne on later systems
+	    ok;
+	_ ->
+	    %% Mnemosyne as embedded application
+	    Mnem = true,
+	    ?match(undefined, whereis(mnemosyne_catalog)),
+	    ?match(ok,mnesia:start([{Param, Mnem}])),
+	    ?match(Mnem, mnesia:system_info(Param)),
+	    ?match(Pid when is_pid(Pid), whereis(mnemosyne_catalog)),
+	    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
+	    ?match(undefined, whereis(mnemosyne_catalog))
+    end,
+    ?verify_mnesia([], Nodes),
+    ?cleanup(1, Config),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+ignore_fallback_at_startup(doc) ->
+    ["Start Mnesia without rollback of the database to the fallback. ",
+     "Once Mnesia has been (re)started the installed fallback should",
+     "be handled as a normal active fallback.",
+     "Install a customized event module which disables the termination",
+     "of Mnesia when mnesia_down occurrs with an active fallback."].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+max_wait_for_decision(doc) ->
+    ["Provoke Mnesia to make a forced decision of the outome",
+     "of a heavy weight transaction."].
+     
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+send_compressed(doc) -> [];
+send_compressed(suite) -> [];
+send_compressed(Config) ->
+    [N1,N2] = Nodes = ?acquire_nodes(2, Config),
+    ?match({atomic,ok}, mnesia:create_table(t0, [{ram_copies,[N1,N2]}])),
+    ?match({atomic,ok}, mnesia:create_table(t1, [{disc_copies,[N1,N2]}])),
+    ?match({atomic,ok}, mnesia:create_table(t2, [{disc_only_copies,[N1,N2]}])),
+
+    Max = 1000,
+    Create = fun(Tab) -> [mnesia:write({Tab, N, {N, "FILLER-123490878345asdasd"}})
+			  || N <- lists:seq(1, Max)],
+			 ok
+	     end,
+    
+    ?match([], mnesia_test_lib:kill_mnesia([N2])),
+    
+    ?match([], mnesia_test_lib:kill_mnesia([N1])),
+    ?match(ok, mnesia:start([{send_compressed, 9}])),
+    ?match(ok, mnesia:wait_for_tables([t0,t1,t2], 5000)),
+
+    ?match({atomic, ok}, mnesia:transaction(Create, [t0])),
+    ?match({atomic, ok}, mnesia:transaction(Create, [t1])),
+    ?match({atomic, ok}, mnesia:transaction(Create, [t2])),
+    
+    ?match([], mnesia_test_lib:start_mnesia([N2], [t0,t1,t2])),
+    
+    Verify = fun(Tab) ->		     
+		     [ [{Tab,N,{N,_}}] = mnesia:read(Tab, N) || N <- lists:seq(1, Max)],
+		     ok
+	     end,
+    ?match({atomic, ok}, rpc:call(N1, mnesia, transaction, [Verify, [t0]])),
+    ?match({atomic, ok}, rpc:call(N1, mnesia, transaction, [Verify, [t1]])),
+    ?match({atomic, ok}, rpc:call(N1, mnesia, transaction, [Verify, [t2]])),
+    
+    ?match({atomic, ok}, rpc:call(N2, mnesia, transaction, [Verify, [t0]])),
+    ?match({atomic, ok}, rpc:call(N2, mnesia, transaction, [Verify, [t1]])),
+    ?match({atomic, ok}, rpc:call(N2, mnesia, transaction, [Verify, [t2]])),
+    
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(1, Config),
+    ok.
+
+app_test(doc) -> [];
+app_test(suite) -> [];
+app_test(_Config) ->
+    ?match(ok,test_server:app_test(mnesia)),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+event_module(doc) ->
+    ["Replace the event module with another module and use it as",
+     "receiver of the various system and table events. Provoke",
+     "coverage of all kinds of events."];
+event_module(suite) -> [];
+event_module(Config) when is_list(Config) ->
+    Filter = fun({mnesia_system_event,{mnesia_info, _, _}}) -> false;
+		(_) -> true
+	     end,
+    
+    [_N1, N2]=Nodes=?acquire_schema(2, Config),
+
+    Def = case mnesia_test_lib:diskless(Config) of 
+	      true -> [{event_module, mnesia_config_event},
+		       {extra_db_nodes, Nodes}];
+	      false  ->
+		  [{event_module, mnesia_config_event}]
+	  end,
+
+    ?match({[ok, ok], []}, rpc:multicall(Nodes, mnesia, start, [Def])),
+    receive after 1000 -> ok end,
+    mnesia_event ! {get_log, self()},
+    DebugLog1 = receive 
+		    {log, L1} -> L1
+		after 10000 -> [timeout]
+		end,
+    ?match([{mnesia_system_event,{mnesia_up,N2}}],
+	   lists:filter(Filter, DebugLog1)),
+    mnesia_test_lib:kill_mnesia([N2]),
+    receive after 2000 -> ok end,
+
+    ?match({[ok], []}, rpc:multicall([N2], mnesia, start, [])),
+
+    receive after 1000 -> ok end,
+    mnesia_event ! {get_log, self()},
+    DebugLog = receive 
+		   {log, L} -> L
+	       after 10000 -> [timeout]
+	       end,
+    ?match([{mnesia_system_event,{mnesia_up,N2}},
+	    {mnesia_system_event,{mnesia_down,N2}},
+	    {mnesia_system_event,{mnesia_up, N2}}],
+	   lists:filter(Filter, DebugLog)),
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(1, Config),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+start_one_disc_full_then_one_disc_less(doc)->
+    ["Start a disk node and then a disk less one. Distribute some",
+     "tables between them."];
+start_one_disc_full_then_one_disc_less(suite) -> [];
+start_one_disc_full_then_one_disc_less(Config) when is_list(Config) ->
+    [N1, N2] = ?init(2, Config),
+    ?match(ok, mnesia:create_schema([N1])),
+    ?match([], mnesia_test_lib:start_mnesia([N1])),
+
+    ?match({atomic, ok}, mnesia:add_table_copy(schema, N2, ram_copies)),
+
+    ?match(ok, rpc:call(N2, mnesia, start, [[{schema_location, ram},
+					     {extra_db_nodes, [N1]}]])),
+    mnesia_test_lib:sync_tables([N1, N2], [schema]),
+
+    %% Now create some tables
+    ?match({atomic,ok},
+	   mnesia:create_table(test_table,
+			       [{ram_copies, [N1, N2]},
+				{attributes,
+				 record_info(fields,test_table)}])),
+    
+    ?match({atomic,ok},
+	   rpc:call(
+	     N2, mnesia,create_table, [test_table2,
+				      [{ram_copies, [N1, N2]},
+				       {attributes,
+					record_info(fields,test_table2)}]])),
+
+    %% Write something on one end ...
+    Rec = #test_table{i=55},
+    ?match({atomic, ok},
+	   mnesia:transaction(fun() -> mnesia:write(Rec) end)),
+    
+    %% ... and read it in the other
+    ?match({atomic, [Rec]},
+	   rpc:call(N2, mnesia, transaction, 
+		    [fun() -> mnesia:read({test_table, 55}) end])),
+    
+    
+    %% Then do the same but start at the other end
+    Rec2 = #test_table2{i=155},
+    ?match({atomic, ok},
+	   rpc:call(N2, mnesia, transaction, 
+		    [fun() ->
+			     mnesia:write(Rec2) end
+		    ])),
+    
+    ?match({atomic, [Rec2]},
+	   mnesia:transaction(fun() -> mnesia:read({test_table2, 155}) end)),
+    
+    ?verify_mnesia([N1, N2], []),
+    ?cleanup(2, Config),
+    ok.
+    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+start_first_one_disc_less_then_one_disc_full(doc)->
+    ["no_doc"];
+start_first_one_disc_less_then_one_disc_full(suite) -> [];
+start_first_one_disc_less_then_one_disc_full(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?init(2, Config),
+    ?match(ok, mnesia:create_schema([N1])),
+    ?match([], mnesia_test_lib:start_mnesia([N1])),
+
+    ?match({atomic, ok}, mnesia:add_table_copy(schema, N2, ram_copies)),
+    
+    ?match(ok, rpc:call(N2, mnesia, start, [[{schema_location, ram},
+					     {extra_db_nodes, Nodes}]])),
+
+    mnesia_test_lib:sync_tables([N1, N2], [schema]),
+    
+    mnesia_test_lib:kill_mnesia(Nodes),
+    receive after 2000 -> ok end,
+    ?match([], mnesia_test_lib:start_mnesia(Nodes)),
+
+    mnesia_test_lib:sync_tables([N1, N2], [schema]),
+    
+    %% Now create some tables
+    ?match({atomic,ok},
+	   rpc:call(
+	     N1, mnesia,create_table, [test_table,
+				       [%%{disc_copies, [node()]},
+					{ram_copies, [N1, N2]},
+					{attributes,
+					 record_info(fields,test_table)}]])),
+    mnesia_test_lib:sync_tables([N1, N2], [test_table]),
+
+    ?match({atomic,ok},
+	   rpc:call(
+	     N2, mnesia,create_table, [test_table2,
+				       [%%{disc_copies, [node()]},
+					{ram_copies, [N1, N2]},
+					{attributes,
+					 record_info(fields,test_table2)}]])),
+    
+    mnesia_test_lib:sync_tables([N1, N2], [test_table, test_table2]),
+
+    %% Assure tables loaded
+    ?match({[ok, ok], []},
+	   rpc:multicall([N1, N2], mnesia, wait_for_tables,
+			 [[schema, test_table, test_table2], 10000])),
+    
+    %% Write something on one end ...
+    Rec = #test_table{i=55},
+    ?match({atomic, ok},
+	   rpc:call(N1, mnesia, transaction, 
+		    [fun() -> mnesia:write(Rec) end])),
+    
+    %% ... and read it in the other
+    ?match({atomic, [Rec]},
+	   rpc:call(N2, mnesia, transaction, 
+		    [fun() -> mnesia:read({test_table, 55}) end])),
+    
+    %% Then do the same but start at the other end
+    Rec2 = #test_table2{i=155},
+    ?match({atomic, ok},
+	   rpc:call(N2, mnesia, transaction, 
+		    [fun() ->
+			     mnesia:write(Rec2) end
+		    ])),
+    
+    ?match({atomic, [Rec2]},
+	   rpc:call(N1, mnesia, transaction, 
+		    [fun() -> mnesia:read({test_table2, 155}) end])),
+    
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(1, Config),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+start_first_one_disc_less_then_two_more_disc_less(doc)->
+    ["no doc"];
+start_first_one_disc_less_then_two_more_disc_less(suite) -> [];
+start_first_one_disc_less_then_two_more_disc_less(Config) when is_list(Config) ->
+    Nodes = [N1, N2, N3] = ?init(3, Config),
+
+    ?match(ok, rpc:call(N1, mnesia, start, [[{schema_location, ram}]])),
+
+    %% Really should use test_lib:mnesia_start for these ones but ...
+    ?match({atomic, ok}, 
+	   rpc:call(N1, mnesia,add_table_copy, [schema, N2, ram_copies])),
+    ?match({atomic, ok}, 
+	   rpc:call(N1, mnesia,add_table_copy, [schema, N3, ram_copies])),
+    
+    ?match(ok, rpc:call(N2, mnesia, start, [[{schema_location, ram},
+					     {extra_db_nodes, [N1]}]])),
+    ?match(ok, rpc:call(N3, mnesia, start, [[{schema_location, ram},
+					     {extra_db_nodes, [N1, N2]}]])),
+
+    %% Now create some tables
+    ?match({atomic,ok},
+	   rpc:call(
+	     N1, mnesia,create_table, [test_table,
+				      [%%{disc_copies, [node()]},
+				       {ram_copies, [N1, N2, N3]},
+				       {attributes,
+					record_info(fields,test_table)}]])),
+
+    %% Assure tables loaded
+    ?match({[ok, ok, ok], []},
+	   rpc:multicall([N1, N2, N3], mnesia, wait_for_tables,
+			 [[test_table], 1000])),
+
+    %% Write something on one end ...
+    ?match({atomic, ok},
+	   rpc:call(N1, mnesia, transaction, 
+		    [fun() -> mnesia:write(#test_table{i=44}) end])),
+
+    %% Force synchronicity
+    ?match({atomic, ok},
+	   rpc:call(N1, mnesia, transaction, 
+		    [fun() -> mnesia:write_lock_table(test_table) end])),
+    
+    %% ... and read it in the others
+    ?match({[{atomic, [{test_table, 44, _, _, _}]},
+	     {atomic, [{test_table, 44, _, _, _}]}], []},
+	   rpc:multicall([N2, N3], mnesia, transaction, 
+			 [fun() -> mnesia:read({test_table, 44}) end])),
+    
+    %% Then do the other way around
+    ?match({atomic, ok},
+	   rpc:call(N3, mnesia, transaction, 
+		    [fun() -> mnesia:write(#test_table{i=33}) end])),
+    %% Force synchronicity
+    ?match({atomic, ok},
+	   rpc:call(N3, mnesia, transaction, 
+		    [fun() -> mnesia:write_lock_table(test_table) end])),
+    
+    ?match({[{atomic, [{test_table, 44, _, _, _}]},
+	     {atomic, [{test_table, 44, _, _, _}]}], []},
+	   rpc:multicall([N1, N2], mnesia, transaction, 
+			 [fun() -> mnesia:read({test_table, 44}) end])),
+
+    mnesia_test_lib:reload_appls([mnesia], Nodes),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+schema_location_and_extra_db_nodes_combinations(doc)->
+    ["Test schema loaction and extra_db_nodes combinations."];
+schema_location_and_extra_db_nodes_combinations(suite) -> [];
+schema_location_and_extra_db_nodes_combinations(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?init(2, Config),
+    ?match(ok, mnesia:create_schema([N1])),
+    ?match([], mnesia_test_lib:start_mnesia([N1])),
+    
+    %% Really should use test_lib:mnesia_start for these ones but ...
+    ?match({atomic, ok}, 
+	   rpc:call(N1, mnesia,add_table_copy, [schema, N2, ram_copies])),
+    
+    ?match(ok, rpc:call(N2, mnesia, start, [[{schema_location, ram},
+					     {extra_db_nodes, [N1]}]])),
+    
+    %% Assure tables loaded
+    ?match({[ok, ok], []},
+	   rpc:multicall([N1, N2], mnesia, wait_for_tables,
+			 [[schema], 10000])),
+    
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(2, Config),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+table_load_to_disc_less_nodes(doc)->
+    ["Load tables to disc less nodes"];
+table_load_to_disc_less_nodes(suite) -> [];
+table_load_to_disc_less_nodes(Config) when is_list(Config) ->
+    [N1, N2] = ?init(2, Config),
+
+    ?match(ok, rpc:call(N1, mnesia, start, [[{schema_location, ram}]])),
+
+    %% Really should use test_lib:mnesia_start for these ones but ...
+    ?match({atomic, ok}, 
+	   rpc:call(N1, mnesia,add_table_copy, [schema, N2, ram_copies])),
+    
+    ?match(ok, rpc:call(N2, mnesia, start, [[{schema_location, ram},
+					     {extra_db_nodes, [N1]}]])),
+
+    %% Now create some tables
+    ?match({atomic,ok},
+	   rpc:call(
+	     N1, mnesia,create_table, [test_table,
+				      [%%{disc_copies, [node()]},
+				       {ram_copies, [N1, N2]},
+				       {attributes,
+					record_info(fields,test_table)}]])),
+
+    %% Assure tables loaded
+    ?match({[ok, ok], []},
+	   rpc:multicall([N1, N2], mnesia, wait_for_tables,
+			 [[test_table], 1000])),
+
+    %% Write something on one end ...
+    ?match({atomic, ok},
+	   rpc:call(N1, mnesia, transaction, 
+		    [fun() -> mnesia:write(#test_table{i=44}) end])),
+
+    %% Force synchronicity
+    ?match({atomic, ok},
+	   rpc:call(N1, mnesia, transaction, 
+		    [fun() -> mnesia:write_lock_table(test_table) end])),
+    
+    %% ... and read it in the others
+    ?match({atomic, [{test_table, 44, _, _, _}]},
+	   rpc:call(N2, mnesia, transaction, 
+		    [fun() -> mnesia:read({test_table, 44}) end])),
+
+    ?cleanup(2, Config),
+    ok.
+    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+schema_merge(doc) ->
+    ["Provoke various schema merge situations.",
+     "Perform various schema updates while some nodes are down,",
+     "stop the started nodes, start the stopped nodes and perform",
+     "schema updates. Now we have a situation were some of the table",
+     "definitions have been changed on two or more nodes independently",
+     "of each other and when Mnesia on the nodes tries to connect",
+     "to each other at restart the schema will be merged.",
+     "Do also try to provoke schema merge situations were the",
+     "schema cannot be merged."];
+
+schema_merge(suite) -> [];
+
+schema_merge(Config) when is_list(Config) ->
+    [N1, N2]=Nodes=?acquire(2,Config),
+    
+    mnesia_test_lib:kill_mnesia([N2]),    
+    receive after 1000 -> ok end,
+
+    Storage = mnesia_test_lib:storage_type(disc_copies, Config),    
+    ?match({atomic,ok},
+	   rpc:call(
+	     N1, mnesia,create_table, 
+	     [test_table,
+	      [{Storage, [N1]},
+	       {attributes,
+		record_info(fields,test_table)}]])),
+    
+    ?match({atomic, ok},
+	   rpc:call(N1, mnesia, transaction, 
+		    [fun() -> mnesia:write(#test_table{i=44}) end])),
+
+    mnesia_test_lib:kill_mnesia([N1]),
+    receive after 2000 -> ok end,
+    %% Can't use std start because it waits for schema
+    ?match(ok, rpc:call(N2, mnesia, start, [])),
+
+    ?match({atomic,ok},
+	   rpc:call(
+	     N2, mnesia,create_table, 
+	     [test_table2,
+	      [{Storage, [N2]},
+	       {attributes,
+		record_info(fields,test_table2)}]])),
+    
+    receive after 5000 -> ok end,
+
+    ?match({atomic, ok},
+	   rpc:call(N2, mnesia, transaction, 
+		    [fun() -> mnesia:write(#test_table2{i=33}) end])),
+    
+    %% Can't use std start because it waits for schema
+    ?match(ok, rpc:call(N1, mnesia, start, [])),
+
+    %% Assure tables loaded
+    ?match({[ok, ok], []},
+	   rpc:multicall([N1, N2], mnesia, wait_for_tables,
+			 [[schema, test_table, test_table2], 10000])),
+    
+    %% ... and read it in the others
+    ?match({[{atomic, [{test_table, 44, _, _, _}]},
+	     {atomic, [{test_table, 44, _, _, _}]}], []},
+	   rpc:multicall([N1, N2], mnesia, transaction, 
+			 [fun() -> mnesia:read({test_table, 44}) end])),
+    
+    ?match({[{atomic, [{test_table2, 33, _}]},
+	     {atomic, [{test_table2, 33, _}]}], []},
+	   rpc:multicall([N1, N2], mnesia, transaction, 
+			 [fun() -> mnesia:read({test_table2, 33}) end])),
+    
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(2, Config),
+    ok.
+
+
+-define(connect(Nodes), mnesia:change_config(extra_db_nodes, Nodes)).
+-define(rpc_connect(From, Nodes), 
+	rpc:call(From, mnesia, change_config, [extra_db_nodes, Nodes])).
+
+
+sort({ok, NS}) ->
+    {ok, lists:sort(NS)};
+sort(Ns) when is_tuple(Ns) ->
+    Ns;
+sort(NS) when is_list(NS) -> 
+    lists:sort(NS).
+
+
+
+
+dynamic_basic(suite) -> [];
+dynamic_basic(Config) when is_list(Config) ->
+    Nodes = [N1, N2, N3] = ?acquire_nodes(3, Config),
+    SNs = lists:sort(Nodes),    
+
+    ?match({atomic, ok}, mnesia:create_table(tab1, [{ram_copies, Nodes--[N1]}, {disc_copies, [N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab2, [{disc_copies, Nodes}])),
+
+    ?match({ok, SNs}, sort(?rpc_connect(N1, Nodes))),     %% What shall happen?
+    ?match({ok, []}, sort(?rpc_connect(N1, [nonode@nothosted]))),  %% What shall happen?
+    
+    ?match([], mnesia_test_lib:kill_mnesia([N2])),
+    ?match(ok, mnesia:delete_schema([N2])),
+
+    ?match(ok, mnesia:dirty_write({tab1, 1, 1})),
+    ?match(ok, mnesia:dirty_write({tab2, 1, 1})),
+   
+    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes, [N1]}]])),
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[tab1,tab2],5000])),
+    io:format("Here ~p ~n",[?LINE]), 
+    check_storage(N2, N1, [N3]),
+    ?match(SNs, sort(rpc:call(N1, mnesia, system_info, [running_db_nodes]))),
+    ?match(SNs, sort(rpc:call(N2, mnesia, system_info, [running_db_nodes]))),
+
+    ?match([], mnesia_test_lib:kill_mnesia([N3])),
+    ?match(ok, mnesia:delete_schema([N3])),
+    
+    io:format("T1 ~p ~n",[rpc:call(N3,?MODULE,c_nodes,[])]),
+    ?match(ok, rpc:call(N3, mnesia, start, [])),
+    io:format("T2 ~p ~n",[rpc:call(N3,?MODULE,c_nodes,[])]),
+    timer:sleep(2000),
+    io:format("T3 ~p ~n",[rpc:call(N3,?MODULE,c_nodes,[])]),
+    ?match({ok, [N1]}, sort(?rpc_connect(N3, [N1]))),
+    io:format("T4 ~p ~n",[rpc:call(N3,?MODULE,c_nodes,[])]),
+    ?match(ok, rpc:call(N3, mnesia, wait_for_tables, [[tab1,tab2],5000])),
+    io:format("Here ~p ~n",[?LINE]), 
+    check_storage(N3, N1, [N2]),
+    ?match(SNs, sort(rpc:call(N1, mnesia, system_info, [running_db_nodes]))),
+    ?match(SNs, sort(rpc:call(N2, mnesia, system_info, [running_db_nodes]))),
+    
+    ?match([], mnesia_test_lib:kill_mnesia([N3])),
+    ?match(ok, mnesia:delete_schema([N3])),
+    
+    ?match(ok, rpc:call(N3, mnesia, start, [])),
+    ?match({ok, [N3]}, sort(?rpc_connect(N1, [N3]))),
+    ?match(ok, rpc:call(N3, mnesia, wait_for_tables, [[tab1,tab2],5000])),
+    io:format("Here ~p ~n",[?LINE]), 
+    check_storage(N3, N1, [N2]),
+    ?match(SNs, sort(rpc:call(N1, mnesia, system_info, [running_db_nodes]))),
+    ?match(SNs, sort(rpc:call(N2, mnesia, system_info, [running_db_nodes]))),
+
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match(ok, mnesia:delete_schema([N2])),
+    ?match({atomic, ok}, mnesia:del_table_copy(schema, N2)),
+
+    % Ok, we have now removed references to node N2 from the other nodes
+    % mnesia should come up now.
+    ?match({atomic, ok}, mnesia:add_table_copy(tab1, N2, ram_copies)),
+
+    ?match(ok, rpc:call(N2, mnesia, start, [])),
+    ?match({ok, _}, sort(?rpc_connect(N2, [N3]))),
+    
+    ?match(SNs, sort(rpc:call(N1, mnesia, system_info, [running_db_nodes]))),
+    ?match(SNs, sort(rpc:call(N2, mnesia, system_info, [running_db_nodes]))),
+    ?match(SNs, sort(rpc:call(N3, mnesia, system_info, [running_db_nodes]))),
+
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[tab1], 1000])),
+    ?match([{tab1, 1, 1}], rpc:call(N2, mnesia, dirty_read, [tab1, 1])),
+       
+    mnesia_test_lib:kill_mnesia([N2]),
+
+    %%% SYNC!!!
+    timer:sleep(1000),
+
+    ?match([N3,N1], sort(rpc:call(N1, mnesia, system_info, [running_db_nodes]))),
+    ?match([N3,N1], sort(rpc:call(N3, mnesia, system_info, [running_db_nodes]))),
+    
+    ?match(ok, rpc:call(N2, mnesia, start, [])),
+    ?match({ok, _}, sort(?rpc_connect(N3, [N2]))),
+    
+    ?match(SNs, sort(rpc:call(N1, mnesia, system_info, [running_db_nodes]))),
+    ?match(SNs, sort(rpc:call(N2, mnesia, system_info, [running_db_nodes]))),
+    ?match(SNs, sort(rpc:call(N3, mnesia, system_info, [running_db_nodes]))),
+
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[tab1], 1000])),
+    ?match([{tab1, 1, 1}], rpc:call(N2, mnesia, dirty_read, [tab1, 1])),
+
+    ?verify_mnesia(Nodes, []),
+%%    ?cleanup(3, Config).
+    ok.
+
+c_nodes() -> 		  						
+    {mnesia_lib:val({current, db_nodes}),mnesia_lib:val(recover_nodes)}.
+
+
+dynamic_ext(suite) ->    [];
+dynamic_ext(Config) when is_list(Config) ->
+    Ns = [N1,N2] = ?acquire_nodes(2, Config),
+    SNs = lists:sort([N1,N2]),
+    
+    ?match({atomic, ok}, mnesia:create_table(tab0, [{disc_copies, [N1,N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab1, [{ram_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab2, [{disc_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab3, [{disc_only_copies, [N2]}])),
+    
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match(ok, mnesia:delete_schema([N2])),
+    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes, [N1]}]])),
+    
+    ?match(SNs, sort(rpc:call(N1, mnesia, system_info, [running_db_nodes]))),
+    ?match(SNs, sort(rpc:call(N2, mnesia, system_info, [running_db_nodes]))),
+    
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[tab0,tab1,tab2,tab3], 2000])),
+
+    Check = fun({Tab,Storage}) ->
+		    ?match(Storage, rpc:call(N2, mnesia, table_info, [Tab, storage_type])),
+		    ?match([{N2,Storage}], 
+			   lists:sort(rpc:call(N2, mnesia, table_info, [Tab, where_to_commit])))
+	    end,
+    [Check(Test) || Test <- [{tab1, ram_copies},{tab2, disc_copies},{tab3, disc_only_copies}]],
+    
+    T = now(),
+    ?match(ok, mnesia:dirty_write({tab0, 42, T})),
+    ?match(ok, mnesia:dirty_write({tab1, 42, T})),
+    ?match(ok, mnesia:dirty_write({tab2, 42, T})),
+    ?match(ok, mnesia:dirty_write({tab3, 42, T})),
+    
+    ?match(stopped, rpc:call(N2, mnesia, stop, [])),
+    ?match(ok, rpc:call(N2, mnesia, start, [])),
+    ?match(SNs, sort(rpc:call(N2, mnesia, system_info, [running_db_nodes]))),
+    ?match(ok, mnesia:wait_for_tables([tab0,tab1,tab2,tab3], 10000)),
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[tab1,tab2,tab3], 100])),
+    ?match([], mnesia:dirty_read({tab1, 41})),
+    ?match([{tab2,42,T}], mnesia:dirty_read({tab2, 42})),
+    ?match([{tab3,42,T}], mnesia:dirty_read({tab3, 42})),
+
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match(ok, mnesia:delete_schema([N2])),
+
+    ?match(stopped, rpc:call(N1, mnesia, stop, [])),
+
+    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes,[N1,N2]}]])),
+    ?match({timeout,[tab0]}, rpc:call(N2, mnesia, wait_for_tables, [[tab0], 500])),
+
+    ?match(ok, rpc:call(N1, mnesia, start, [[{extra_db_nodes, [N1,N2]}]])),
+    ?match(ok, rpc:call(N1, mnesia, wait_for_tables, [[tab0], 1500])),
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[tab0], 1500])),
+    ?match([{tab0,42,T}], mnesia:dirty_read({tab0, 42})),
+    ?match([{tab0,42,T}], rpc:call(N2, mnesia,dirty_read,[{tab0,42}])),
+
+    ?match(stopped, rpc:call(N1, mnesia, stop, [])),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match(ok, mnesia:delete_schema([N2])),
+    ?match(ok, rpc:call(N1, mnesia, start, [[{extra_db_nodes, [N1,N2]}]])),   
+    ?match({timeout,[tab0]}, rpc:call(N1, mnesia, wait_for_tables, [[tab0], 500])),
+
+    ?match(ok, rpc:call(N2, mnesia, start, [[{extra_db_nodes,[N1,N2]}]])),
+    ?match(ok, rpc:call(N1, mnesia, wait_for_tables, [[tab0], 1500])),
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[tab0], 1500])),
+    ?match([{tab0,42,T}], mnesia:dirty_read({tab0, 42})),
+    ?match([{tab0,42,T}], rpc:call(N2,mnesia,dirty_read,[{tab0,42}])),
+
+    ?verify_mnesia(Ns, []),
+    ok.
+
+check_storage(Me, Orig, Other) ->
+    io:format("Nodes ~p ~p ~p~n",[Me,Orig,Other]),
+    rpc:multicall(Other, sys, status, [mnesia_locker]),
+    rpc:call(Me, sys, status, [mnesia_locker]),
+    rpc:call(Orig, sys, status, [mnesia_locker]),
+    rpc:multicall(Other, sys, status, [mnesia_controller]),
+    rpc:call(Me, sys, status, [mnesia_controller]),
+    rpc:call(Orig, sys, status, [mnesia_controller]),
+    %% Verify disc_copies
+    W2C = lists:sort([{Node,disc_copies} || Node <- [Me,Orig|Other]]),
+    W2W = lists:sort([Me,Orig|Other]),
+    ?match(disc_copies, rpc:call(Orig, mnesia, table_info, [schema, storage_type])),
+    ?match(disc_copies, rpc:call(Me, mnesia, table_info, [schema, storage_type])),
+    ?match(W2C, lists:sort(rpc:call(Orig, mnesia, table_info, [schema, where_to_commit]))),
+    ?match(W2C, lists:sort(rpc:call(Me, mnesia, table_info, [schema, where_to_commit]))),
+    
+    ?match(disc_copies, rpc:call(Orig, mnesia, table_info, [tab2, storage_type])),
+    ?match(disc_copies, rpc:call(Me, mnesia, table_info, [tab2, storage_type])),    
+    ?match(W2W, lists:sort(rpc:call(Me, mnesia, table_info, [tab2, where_to_write]))),    
+    ?match(Me, rpc:call(Me, mnesia, table_info, [tab2, where_to_read])),    
+    
+    ?match(W2C, lists:sort(rpc:call(Orig, mnesia, table_info, [tab2, where_to_commit]))),
+    ?match(W2C, lists:sort(rpc:call(Me, mnesia, table_info, [tab2, where_to_commit]))),
+    
+    ?match([{tab1,1,1}], mnesia:dirty_read(tab1,1)),
+    ?match([{tab2,1,1}], mnesia:dirty_read(tab2,1)),
+    ?match([{tab1,1,1}], rpc:call(Me, mnesia, dirty_read, [tab1,1])),
+    ?match([{tab2,1,1}], rpc:call(Me, mnesia, dirty_read, [tab2,1])),
+
+    ?match(true, rpc:call(Me, mnesia_monitor, use_dir, [])),
+    ?match(disc_copies, rpc:call(Me, mnesia_lib, val, [{schema, storage_type}])),
+    
+    mnesia_test_lib:kill_mnesia([Orig]),
+    mnesia_test_lib:kill_mnesia(Other),
+    T = now(),
+    ?match(ok, rpc:call(Me, mnesia, dirty_write, [{tab2, 42, T}])),
+    ?match(stopped, rpc:call(Me, mnesia, stop, [])),
+    ?match(ok, rpc:call(Me, mnesia, start, [])),   
+    ?match([], mnesia_test_lib:start_mnesia([Orig|Other], [tab1,tab2])),
+    ?match([{tab2,42,T}], rpc:call(Me, mnesia, dirty_read, [{tab2, 42}])),
+    ?match([{tab2,42,T}], rpc:call(Orig, mnesia, dirty_read, [{tab2, 42}])),
+    
+    ?match([{tab1,1,1}], mnesia:dirty_read(tab1,1)),
+    ?match([{tab2,1,1}], mnesia:dirty_read(tab2,1)),
+    ?match([{tab1,1,1}], rpc:call(Me, mnesia, dirty_read, [tab1,1])),
+    ?match([{tab2,1,1}], rpc:call(Me, mnesia, dirty_read, [tab2,1])),    
+    ok.
+    
+
+dynamic_bad(suite) ->    [];
+dynamic_bad(Config) when is_list(Config) ->
+    Ns = [N1, N2, N3] = ?acquire_nodes(3, Config),
+    SNs = lists:sort([N2,N3]), 
+
+    ?match({atomic, ok}, mnesia:change_table_copy_type(schema, N2, ram_copies)),
+    ?match({atomic, ok}, mnesia:change_table_copy_type(schema, N3, ram_copies)),
+    ?match({atomic, ok}, mnesia:create_table(tab1, [{ram_copies, Ns -- [N1]},
+						    {disc_copies, [N1]}])),
+    ?match(ok, mnesia:dirty_write({tab1, 1, 1})),
+    
+    mnesia_test_lib:kill_mnesia(Ns),
+    ?match({[ok, ok], []}, rpc:multicall(Ns -- [N1], mnesia, start, [])),
+    ?match({ok, [N2]}, ?rpc_connect(N3, [N2])),
+    ?match(SNs, sort(rpc:call(N2, mnesia, system_info, [running_db_nodes]))),
+    ?match(SNs, sort(rpc:call(N3, mnesia, system_info, [running_db_nodes]))),
+    ?match({badrpc, {'EXIT', {aborted, {no_exists, _, _}}}},
+	   rpc:call(N2, mnesia, table_info, [tab1, where_to_read])),
+    
+    ?match(ok, mnesia:start()),
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[tab1], 1000])),
+    ?match(N2, rpc:call(N2, mnesia, table_info, [tab1, where_to_read])), 
+    ?match([{tab1, 1, 1}], rpc:call(N2, mnesia, dirty_read, [tab1, 1])),
+    
+    mnesia_test_lib:kill_mnesia(Ns),
+    ?match({[ok, ok], []}, rpc:multicall(Ns -- [N1], mnesia, start, [])),
+    ?match({ok, [N2]}, ?rpc_connect(N3, [N2])),
+    % Make a merge conflict
+    ?match({atomic, ok}, rpc:call(N3, mnesia, create_table, [tab1, []])),
+    
+    io:format("We expect a mnesia crash here~n", []),
+    ?match({error,{_, _}}, mnesia:start()),
+
+    ?verify_mnesia(Ns -- [N1], []),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+unknown_config(doc) ->
+    ["Try some unknown configuration parameters and see that expected",
+     "things happens."];
+unknown_config(suite)-> [];
+unknown_config(Config) when is_list(Config) ->
+    ?init(1, Config),
+    %% NOTE: case 1 & 2 below do not respond the same
+    ?match({error, Res} when element(1, Res) == bad_type,
+	   mnesia:start([{undefined_config,[]}])),
+    %% Below does not work, but the "correct" behaviour would be to have
+    %% case 1 above to behave as the one below.
+
+    %% in mnesia-1.3 {error,{bad_type,{[],undefined_config}}}
+    ?match({error, Res} when element(1, Res) == bad_type,
+	   mnesia:start([{[],undefined_config}])),
+    ?cleanup(1, Config),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+inconsistent_database(doc) ->
+    ["Replace the event module with another module and use it as",
+     "receiver of the various system and table events. Provoke",
+     "coverage of all kinds of events."];
+inconsistent_database(suite) -> [];
+inconsistent_database(Config) when is_list(Config) ->
+    Nodes = mnesia_test_lib:prepare_test_case([{init_test_case, [mnesia]}], 
+					      2, Config, ?FILE, ?LINE),
+    KillAfter = length(Nodes) * timer:minutes(5),
+    ?acquire_schema(2, Config ++ [{tc_timeout, KillAfter}]),
+
+    Ok = [ok || _N <- Nodes],
+    StartArgs = [{event_module, mnesia_inconsistent_database_test}],
+    ?match({Ok, []}, rpc:multicall(Nodes, mnesia, start, [StartArgs])),
+    ?match([], mnesia_test_lib:kill_mnesia(Nodes)),
+    
+    ?match(ok, mnesia_meter:go(ram_copies, Nodes)),
+
+    mnesia_test_lib:reload_appls([mnesia], Nodes),
+    ok.
+
diff --git a/lib/mnesia/test/mnesia_consistency_test.erl b/lib/mnesia/test/mnesia_consistency_test.erl
new file mode 100644
index 0000000000..f38e13f3a2
--- /dev/null
+++ b/lib/mnesia/test/mnesia_consistency_test.erl
@@ -0,0 +1,1512 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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(mnesia_consistency_test).
+-author('[email protected]').
+-compile([export_all]).
+
+-include("mnesia_test_lib.hrl").
+
+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() -> 
+    [{group, consistency_after_restart},
+     {group, consistency_after_dump_tables},
+     {group, consistency_after_add_replica},
+     {group, consistency_after_del_replica},
+     {group, consistency_after_move_replica},
+     {group, consistency_after_transform_table},
+     consistency_after_change_table_copy_type,
+     {group, consistency_after_fallback},
+     {group, consistency_after_restore},
+     consistency_after_rename_of_node,
+     {group, checkpoint_retainer_consistency},
+     {group, backup_consistency}].
+
+groups() -> 
+    [{consistency_after_restart, [],
+      [consistency_after_restart_1_ram,
+       consistency_after_restart_1_disc,
+       consistency_after_restart_1_disc_only,
+       consistency_after_restart_2_ram,
+       consistency_after_restart_2_disc,
+       consistency_after_restart_2_disc_only]},
+     {consistency_after_dump_tables, [],
+      [consistency_after_dump_tables_1_ram,
+       consistency_after_dump_tables_2_ram]},
+     {consistency_after_add_replica, [],
+      [consistency_after_add_replica_2_ram,
+       consistency_after_add_replica_2_disc,
+       consistency_after_add_replica_2_disc_only,
+       consistency_after_add_replica_3_ram,
+       consistency_after_add_replica_3_disc,
+       consistency_after_add_replica_3_disc_only]},
+     {consistency_after_del_replica, [],
+      [consistency_after_del_replica_2_ram,
+       consistency_after_del_replica_2_disc,
+       consistency_after_del_replica_2_disc_only,
+       consistency_after_del_replica_3_ram,
+       consistency_after_del_replica_3_disc,
+       consistency_after_del_replica_3_disc_only]},
+     {consistency_after_move_replica, [],
+      [consistency_after_move_replica_2_ram,
+       consistency_after_move_replica_2_disc,
+       consistency_after_move_replica_2_disc_only,
+       consistency_after_move_replica_3_ram,
+       consistency_after_move_replica_3_disc,
+       consistency_after_move_replica_3_disc_only]},
+     {consistency_after_transform_table, [],
+      [consistency_after_transform_table_ram,
+       consistency_after_transform_table_disc,
+       consistency_after_transform_table_disc_only]},
+     {consistency_after_fallback, [],
+      [consistency_after_fallback_2_ram,
+       consistency_after_fallback_2_disc,
+       consistency_after_fallback_2_disc_only,
+       consistency_after_fallback_3_ram,
+       consistency_after_fallback_3_disc,
+       consistency_after_fallback_3_disc_only]},
+     {consistency_after_restore, [],
+      [consistency_after_restore_clear_ram,
+       consistency_after_restore_clear_disc,
+       consistency_after_restore_clear_disc_only,
+       consistency_after_restore_recreate_ram,
+       consistency_after_restore_recreate_disc,
+       consistency_after_restore_recreate_disc_only]},
+     {checkpoint_retainer_consistency, [],
+      [{group, updates_during_checkpoint_activation},
+       {group, updates_during_checkpoint_iteration},
+       {group, load_table_with_activated_checkpoint},
+       {group,
+	add_table_copy_to_table_with_activated_checkpoint}]},
+     {updates_during_checkpoint_activation, [],
+      [updates_during_checkpoint_activation_2_ram,
+       updates_during_checkpoint_activation_2_disc,
+       updates_during_checkpoint_activation_2_disc_only,
+       updates_during_checkpoint_activation_3_ram,
+       updates_during_checkpoint_activation_3_disc,
+       updates_during_checkpoint_activation_3_disc_only]},
+     {updates_during_checkpoint_iteration, [],
+      [updates_during_checkpoint_iteration_2_ram,
+       updates_during_checkpoint_iteration_2_disc,
+       updates_during_checkpoint_iteration_2_disc_only]},
+     {load_table_with_activated_checkpoint, [],
+      [load_table_with_activated_checkpoint_ram,
+       load_table_with_activated_checkpoint_disc,
+       load_table_with_activated_checkpoint_disc_only]},
+     {add_table_copy_to_table_with_activated_checkpoint, [],
+      [add_table_copy_to_table_with_activated_checkpoint_ram,
+       add_table_copy_to_table_with_activated_checkpoint_disc,
+       add_table_copy_to_table_with_activated_checkpoint_disc_only]},
+     {backup_consistency, [],
+      [{group, interupted_install_fallback},
+       {group, interupted_uninstall_fallback},
+       {group, mnesia_down_during_backup_causes_switch},
+       {group, mnesia_down_during_backup_causes_abort},
+       {group, schema_transactions_during_backup}]},
+     {interupted_install_fallback, [],
+      [inst_fallback_process_dies, fatal_when_inconsistency]},
+     {interupted_uninstall_fallback, [], [after_delete]},
+     {mnesia_down_during_backup_causes_switch, [],
+      [cause_switch_before, cause_switch_after]},
+     {mnesia_down_during_backup_causes_abort, [],
+      [cause_abort_before, cause_abort_after]},
+     {schema_transactions_during_backup, [],
+      [change_schema_before, change_schema_after]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  stolen from mnesia_tpcb.erl:
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Account record, total size must be at least 100 bytes
+
+-define(ACCOUNT_FILLER,
+        {123456789012345678901234567890123456789012345678901234567890,
+         123456789012345678901234567890123456789012345678901234567890,
+         123456789012345678901234567890123456789012345678901234}).
+
+-record(account,
+       {
+        id           = 0, %% Unique account id
+        branch_id    = 0, %% Branch where the account is held
+        balance      = 0, %% Account balance
+        filler       = ?ACCOUNT_FILLER  %% Gap filler to ensure size >= 100 bytes
+       }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Branch record, total size must be at least 100 bytes
+
+-define(BRANCH_FILLER,
+        {123456789012345678901234567890123456789012345678901234567890,
+         123456789012345678901234567890123456789012345678901234567890,
+         123456789012345678901234567890123456789012345678901234567890}).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Teller record, total size must be at least 100 bytes
+
+-define(TELLER_FILLER,
+        {123456789012345678901234567890123456789012345678901234567890,
+         123456789012345678901234567890123456789012345678901234567890,
+         1234567890123456789012345678901234567890123456789012345678}).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% History record, total size must be at least 50 bytes
+
+-define(HISTORY_FILLER, 1234567890).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-record(tab_config,
+        {
+         db_nodes = [node()],
+         replica_nodes = [node()],
+         replica_type = ram_copies,
+         use_running_mnesia = false,
+         n_branches = 1,
+         n_tellers_per_branch = 10, %% Must be 10
+         n_accounts_per_branch = 100000, %% Must be 100000
+         branch_filler = ?BRANCH_FILLER,
+         account_filler = ?ACCOUNT_FILLER,
+         teller_filler = ?TELLER_FILLER
+        }).
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  stolen from mnesia_tpcb.erl:
+
+list2rec(List, Fields, DefaultTuple) ->
+    [Name|Defaults] = tuple_to_list(DefaultTuple),
+    List2 = list2rec(List, Fields, Defaults, []),
+    list_to_tuple([Name] ++ List2).
+
+list2rec(_List, [], [], Acc) ->
+    Acc;
+list2rec(List, [F|Fields], [D|Defaults], Acc) ->
+    {Val, List2} =
+        case lists:keysearch(F, 1, List) of
+            false ->
+                {D, List};
+            {value, {F, NewVal}} ->
+                {NewVal, lists:keydelete(F, 1, List)}
+        end,
+    list2rec(List2, Fields, Defaults, Acc ++ [Val]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+tpcb_config(ReplicaType, _NodeConfig, Nodes, NoDriverNodes) ->
+    [{n_branches, 10},
+     {n_drivers_per_node, 10},
+     {replica_nodes, Nodes},
+     {driver_nodes, Nodes -- NoDriverNodes},
+     {use_running_mnesia, true},
+     {report_interval, infinity},
+     {n_accounts_per_branch, 100},
+     {replica_type, ReplicaType},
+     {reuse_history_id, true}].
+
+%% Stolen from mnesia_tpcb:dist
+tpcb_config_dist(ReplicaType, _NodeConfig, Nodes, _Config) ->
+    [{db_nodes, Nodes},
+     {driver_nodes, Nodes},
+     {replica_nodes, Nodes},
+     {n_drivers_per_node, 10},
+     {n_branches, 1},
+     {use_running_mnesia, true},
+     {n_accounts_per_branch, 10},
+     {replica_type, ReplicaType},
+     {stop_after, timer:minutes(15)},
+     {report_interval, timer:seconds(10)},
+     {reuse_history_id, true}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  stolen from mnesia_recovery_test.erl:
+
+receive_messages([]) -> [];
+receive_messages(ListOfMsgs) ->
+    receive 
+        {Pid, Msg} ->     
+            case lists:member(Msg, ListOfMsgs) of
+                false -> 
+                    ?warning("I (~p) have received unexpected msg~n ~p ~n",
+                        [self(),{Pid, Msg}]),
+                    receive_messages(ListOfMsgs);
+                true -> 
+                    ?verbose("I (~p) got msg ~p from ~p ~n", [self(),Msg, Pid]),
+                    [{Pid, Msg} | receive_messages(ListOfMsgs -- [Msg])]
+            end;
+        Else -> ?warning("Recevied unexpected Msg~n ~p ~n", [Else])
+    after timer:minutes(3) -> 
+            ?error("Timeout in receive msgs while waiting for ~p~n", 
+                   [ListOfMsgs])
+    end.  
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+consistency_after_restart_1_ram(suite) -> [];
+consistency_after_restart_1_ram(Config) when is_list(Config) ->
+    consistency_after_restart(ram_copies, 2, Config).
+
+consistency_after_restart_1_disc(suite) -> [];
+consistency_after_restart_1_disc(Config) when is_list(Config) ->
+    consistency_after_restart(disc_copies, 2, Config).
+
+consistency_after_restart_1_disc_only(suite) -> [];
+consistency_after_restart_1_disc_only(Config) when is_list(Config) ->
+    consistency_after_restart(disc_only_copies, 2, Config).
+
+consistency_after_restart_2_ram(suite) -> [];
+consistency_after_restart_2_ram(Config) when is_list(Config) ->
+    consistency_after_restart(ram_copies, 3, Config).
+
+consistency_after_restart_2_disc(suite) -> [];
+consistency_after_restart_2_disc(Config) when is_list(Config) ->
+    consistency_after_restart(disc_copies, 3, Config).
+
+consistency_after_restart_2_disc_only(suite) -> [];
+consistency_after_restart_2_disc_only(Config) when is_list(Config) ->
+    consistency_after_restart(disc_only_copies, 3, Config).
+
+consistency_after_restart(ReplicaType, NodeConfig, Config) ->
+    [Node1 | _] = Nodes = ?acquire_nodes(NodeConfig, Config),
+    {success, [A]} = ?start_activities([Node1]),
+    ?log("consistency_after_restart with ~p on ~p~n",
+         [ReplicaType, Nodes]),
+    TpcbConfig = tpcb_config(ReplicaType, NodeConfig, Nodes, [Node1]),
+    mnesia_tpcb:init(TpcbConfig),
+    A ! fun () -> mnesia_tpcb:run(TpcbConfig) end,
+    timer:sleep(timer:seconds(10)),
+    mnesia_test_lib:kill_mnesia([Node1]),
+    %% Start and wait for tables to be loaded on all nodes
+    timer:sleep(timer:seconds(3)),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes,[account,branch,teller, history])), 
+    mnesia_tpcb:stop(),
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+consistency_after_dump_tables_1_ram(suite) -> [];
+consistency_after_dump_tables_1_ram(Config) when is_list(Config) ->
+     consistency_after_dump_tables(ram_copies, 1, Config).
+
+consistency_after_dump_tables_2_ram(suite) -> [];
+consistency_after_dump_tables_2_ram(Config) when is_list(Config) ->
+    consistency_after_dump_tables(ram_copies, 2, Config).
+
+consistency_after_dump_tables(ReplicaType, NodeConfig, Config) ->
+    [Node1 | _] = Nodes = ?acquire_nodes(NodeConfig, Config),
+    {success, [A]} = ?start_activities([Node1]),
+    ?log("consistency_after_dump_tables with ~p on ~p~n",
+         [ReplicaType, Nodes]),
+    TpcbConfig = tpcb_config(ReplicaType, NodeConfig, Nodes, []),
+    mnesia_tpcb:init(TpcbConfig),
+    A ! fun() -> mnesia_tpcb:run(TpcbConfig) end,
+    timer:sleep(timer:seconds(10)),
+    ?match({atomic, ok}, rpc:call(Node1, mnesia, dump_tables,
+                        [[branch, teller, account, history]])),
+    mnesia_tpcb:stop(),
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+
+    mnesia_test_lib:kill_mnesia(Nodes),
+    timer:sleep(timer:seconds(1)),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes,[account, branch,
+						   teller, history])),
+    mnesia_tpcb:stop(),
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+consistency_after_add_replica_2_ram(suite) -> [];
+consistency_after_add_replica_2_ram(Config) when is_list(Config) ->
+    consistency_after_add_replica(ram_copies, 2, Config).
+
+consistency_after_add_replica_2_disc(suite) -> [];
+consistency_after_add_replica_2_disc(Config) when is_list(Config) ->
+    consistency_after_add_replica(disc_copies, 2, Config).
+
+consistency_after_add_replica_2_disc_only(suite) -> [];
+consistency_after_add_replica_2_disc_only(Config) when is_list(Config) ->
+    consistency_after_add_replica(disc_only_copies, 2, Config).
+
+consistency_after_add_replica_3_ram(suite) -> [];
+consistency_after_add_replica_3_ram(Config) when is_list(Config) ->
+    consistency_after_add_replica(ram_copies, 3, Config).
+
+consistency_after_add_replica_3_disc(suite) -> [];
+consistency_after_add_replica_3_disc(Config) when is_list(Config) ->
+    consistency_after_add_replica(disc_copies, 3, Config).
+
+consistency_after_add_replica_3_disc_only(suite) -> [];
+consistency_after_add_replica_3_disc_only(Config) when is_list(Config) ->
+    consistency_after_add_replica(disc_only_copies, 3, Config).
+
+consistency_after_add_replica(ReplicaType, NodeConfig, Config) ->
+    Nodes0 = ?acquire_nodes(NodeConfig, Config),
+    AddNode = lists:last(Nodes0),
+    Nodes = Nodes0 -- [AddNode],
+    Node1 = hd(Nodes),
+    {success, [A]} = ?start_activities([Node1]),
+    ?log("consistency_after_add_replica with ~p on ~p~n",
+         [ReplicaType, Nodes0]),
+    TpcbConfig = tpcb_config(ReplicaType, NodeConfig, Nodes, []),
+    mnesia_tpcb:init(TpcbConfig),
+    A ! fun () -> mnesia_tpcb:run(TpcbConfig) end,
+    timer:sleep(timer:seconds(10)),
+    ?match({atomic, ok}, mnesia:add_table_copy(account, AddNode, ReplicaType)),
+    mnesia_tpcb:stop(),
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+    ?verify_mnesia(Nodes0, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+consistency_after_del_replica_2_ram(suite) -> [];
+consistency_after_del_replica_2_ram(Config) when is_list(Config) ->
+    consistency_after_del_replica(ram_copies, 2, Config).
+
+consistency_after_del_replica_2_disc(suite) -> [];
+consistency_after_del_replica_2_disc(Config) when is_list(Config) ->
+    consistency_after_del_replica(disc_copies, 2, Config).
+
+consistency_after_del_replica_2_disc_only(suite) -> [];
+consistency_after_del_replica_2_disc_only(Config) when is_list(Config) ->
+    consistency_after_del_replica(disc_only_copies, 2, Config).
+
+consistency_after_del_replica_3_ram(suite) -> [];
+consistency_after_del_replica_3_ram(Config) when is_list(Config) ->
+    consistency_after_del_replica(ram_copies, 3, Config).
+
+consistency_after_del_replica_3_disc(suite) -> [];
+consistency_after_del_replica_3_disc(Config) when is_list(Config) ->
+    consistency_after_del_replica(disc_copies, 3, Config).
+
+consistency_after_del_replica_3_disc_only(suite) -> [];
+consistency_after_del_replica_3_disc_only(Config) when is_list(Config) ->
+    consistency_after_del_replica(disc_only_copies, 3, Config).
+
+consistency_after_del_replica(ReplicaType, NodeConfig, Config) ->
+    Nodes = ?acquire_nodes(NodeConfig, Config),
+    Node1 = hd(Nodes),
+    Node2 = lists:last(Nodes),
+    {success, [A]} = ?start_activities([Node1]),
+    ?log("consistency_after_del_replica with ~p on ~p~n",
+         [ReplicaType, Nodes]),
+    TpcbConfig = tpcb_config(ReplicaType, NodeConfig, Nodes, []),
+    mnesia_tpcb:init(TpcbConfig),
+    A ! fun () -> mnesia_tpcb:run(TpcbConfig) end,
+    timer:sleep(timer:seconds(10)),
+    ?match({atomic, ok}, mnesia:del_table_copy(account, Node2)),
+    mnesia_tpcb:stop(),
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+consistency_after_move_replica_2_ram(suite) -> [];
+consistency_after_move_replica_2_ram(Config) when is_list(Config) ->
+    consistency_after_move_replica(ram_copies, 2, Config).
+
+consistency_after_move_replica_2_disc(suite) -> [];
+consistency_after_move_replica_2_disc(Config) when is_list(Config) ->
+    consistency_after_move_replica(disc_copies, 2, Config).
+
+consistency_after_move_replica_2_disc_only(suite) -> [];
+consistency_after_move_replica_2_disc_only(Config) when is_list(Config) ->
+    consistency_after_move_replica(disc_only_copies, 2, Config).
+
+consistency_after_move_replica_3_ram(suite) -> [];
+consistency_after_move_replica_3_ram(Config) when is_list(Config) ->
+    consistency_after_move_replica(ram_copies, 3, Config).
+
+consistency_after_move_replica_3_disc(suite) -> [];
+consistency_after_move_replica_3_disc(Config) when is_list(Config) ->
+    consistency_after_move_replica(disc_copies, 3, Config).
+
+consistency_after_move_replica_3_disc_only(suite) -> [];
+consistency_after_move_replica_3_disc_only(Config) when is_list(Config) ->
+    consistency_after_move_replica(disc_only_copies, 3, Config).
+
+consistency_after_move_replica(ReplicaType, NodeConfig, Config) ->
+    Nodes = ?acquire_nodes(NodeConfig, Config ++ [{tc_timeout, timer:minutes(10)}]),
+    Node1 = hd(Nodes),
+    Node2 = lists:last(Nodes),
+    {success, [A]} = ?start_activities([Node1]),
+    ?log("consistency_after_move_replica with ~p on ~p~n",
+         [ReplicaType, Nodes]),
+    TpcbConfig = tpcb_config(ReplicaType, NodeConfig, Nodes -- [Node2], []),
+    mnesia_tpcb:init(TpcbConfig),
+    A ! fun () -> mnesia_tpcb:run(TpcbConfig) end,
+    timer:sleep(timer:seconds(10)),
+    ?match({atomic, ok}, mnesia:move_table_copy(account, Node1, Node2)),    
+    ?log("First move completed from node ~p to ~p ~n", [Node1, Node2]),
+    ?match({atomic, ok}, mnesia:move_table_copy(account, Node2, Node1)),
+    mnesia_tpcb:stop(),
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+consistency_after_transform_table_ram(suite) -> [];
+consistency_after_transform_table_ram(Config) when is_list(Config) ->
+    consistency_after_transform_table(ram_copies, Config).
+
+consistency_after_transform_table_disc(suite) -> [];
+consistency_after_transform_table_disc(Config) when is_list(Config) ->
+    consistency_after_transform_table(disc_copies, Config).
+
+consistency_after_transform_table_disc_only(suite) -> [];
+consistency_after_transform_table_disc_only(Config) when is_list(Config) ->
+    consistency_after_transform_table(disc_only_copies, Config).
+
+consistency_after_transform_table(Type, Config) ->
+    Nodes = [N1, N2,_N3] = ?acquire_nodes(3, Config),
+
+    ?match({atomic, ok}, mnesia:create_table(tab1, [{index, [3]}, {Type, [N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab2, [{index, [3]}, {Type, [N1,N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab3, [{index, [3]}, {Type, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(empty, [{index, [3]},{Type, Nodes}])),
+    
+    Tabs = lists:sort([tab1, tab2, tab3, empty]),
+    
+    [[mnesia:dirty_write({Tab, N, N}) || N <- lists:seq(1,10)] || 
+	Tab <- Tabs -- [empty, tab4]],
+    mnesia:dump_log(),
+    
+    Ok = lists:duplicate(4, {atomic, ok}),
+    ?match(Ok, [mnesia:transform_table(Tab, fun({T, N, N}) ->  {T, N, N, ok} end,
+	[k,a,n]) || Tab <- Tabs]),
+    [?match([k,a,n], mnesia:table_info(Tab, attributes)) || Tab <- Tabs],
+
+    Filter = fun(Tab) -> mnesia:foldl(fun(A, Acc) when size(A) == 3 -> [A|Acc];
+					 (A, Acc) when size(A) == 4 -> Acc
+				      end, [], Tab)
+	     end,    
+	
+    ?match([[],[],[],[]], [element(2,mnesia:transaction(Filter, [Tab])) || Tab <- Tabs]),
+    
+    mnesia_test_lib:kill_mnesia(Nodes),
+    mnesia_test_lib:start_mnesia(Nodes, Tabs),
+    
+    ?match([Tabs, Tabs, Tabs], 
+	[lists:sort(rpc:call(Node, mnesia,system_info, [tables]) -- [schema]) || Node <- Nodes]),
+    
+    ?match([[],[],[],[]], [element(2,mnesia:transaction(Filter, [Tab])) || Tab <- Tabs]),
+    [?match([k,a,n], mnesia:table_info(Tab, attributes)) || Tab <- Tabs],
+
+    ?verify_mnesia(Nodes, []).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+consistency_after_change_table_copy_type(doc) ->
+    ["Check that the database is consistent after change of copy type.",
+     " While applications are updating the involved tables. "].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+consistency_after_fallback_2_ram(suite) -> [];
+consistency_after_fallback_2_ram(Config) when is_list(Config) ->
+    consistency_after_fallback(ram_copies, 2, Config).
+
+consistency_after_fallback_2_disc(suite) -> [];
+consistency_after_fallback_2_disc(Config) when is_list(Config) ->
+    consistency_after_fallback(disc_copies, 2, Config).
+
+consistency_after_fallback_2_disc_only(suite) -> [];
+consistency_after_fallback_2_disc_only(Config) when is_list(Config) ->
+    consistency_after_fallback(disc_only_copies, 2, Config).
+
+consistency_after_fallback_3_ram(suite) -> [];
+consistency_after_fallback_3_ram(Config) when is_list(Config) ->
+    consistency_after_fallback(ram_copies, 3, Config).
+
+consistency_after_fallback_3_disc(suite) -> [];
+consistency_after_fallback_3_disc(Config) when is_list(Config) ->
+    consistency_after_fallback(disc_copies, 3, Config).
+
+consistency_after_fallback_3_disc_only(suite) -> [];
+consistency_after_fallback_3_disc_only(Config) when is_list(Config) ->
+    consistency_after_fallback(disc_only_copies, 3, Config).
+
+consistency_after_fallback(ReplicaType, NodeConfig, Config) ->
+    %%?verbose("Starting consistency_after_fallback2 at ~p~n", [self()]),
+    Delay = 5,
+    Nodes = ?acquire_nodes(NodeConfig, [{tc_timeout, timer:minutes(10)} | Config]),
+    Node1 = hd(Nodes),
+    %%?verbose("Mnesia info: ~p~n", [mnesia:info()]),
+
+    {success, [A]} = ?start_activities([Node1]),
+    ?log("consistency_after_fallback with ~p on ~p~n",
+         [ReplicaType, Nodes]),
+    TpcbConfig = tpcb_config(ReplicaType, NodeConfig, Nodes, []),
+    mnesia_tpcb:init(TpcbConfig),
+    A ! fun () -> mnesia_tpcb:run(TpcbConfig) end,
+    timer:sleep(timer:seconds(Delay)),
+    
+    %% Make a backup
+    ?verbose("Doing backup~n", []),
+    ?match(ok, mnesia:backup(consistency_after_fallback2)),
+    
+    %% Install the backup as a fallback
+    ?verbose("Doing fallback~n", []),
+    ?match(ok, mnesia:install_fallback(consistency_after_fallback2)),
+    timer:sleep(timer:seconds(Delay)),
+
+    %% Stop tpcb
+    ?verbose("Stopping TPC-B~n", []),
+    mnesia_tpcb:stop(),    
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+    
+    %% Stop and then start mnesia and check table consistency
+    %%?verbose("Restarting Mnesia~n", []),
+    mnesia_test_lib:kill_mnesia(Nodes),
+    mnesia_test_lib:start_mnesia(Nodes,[account,branch,teller,history]),
+    
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+    if 
+	ReplicaType == ram_copies ->
+	    %% Test that change_table_copy work i.e. no account.dcd file exists.
+	    ?match({atomic, ok}, mnesia:change_table_copy_type(account, node(), disc_copies));
+	true -> 
+	    ignore
+    end,
+    file:delete(consistency_after_fallback2),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+consistency_after_restore_clear_ram(suite) -> [];
+consistency_after_restore_clear_ram(Config) when is_list(Config) ->
+    consistency_after_restore(ram_copies, clear_tables, Config).
+
+consistency_after_restore_clear_disc(suite) -> [];
+consistency_after_restore_clear_disc(Config) when is_list(Config) ->
+    consistency_after_restore(disc_copies, clear_tables, Config).
+
+consistency_after_restore_clear_disc_only(suite) -> [];
+consistency_after_restore_clear_disc_only(Config) when is_list(Config) ->
+    consistency_after_restore(disc_only_copies, clear_tables, Config).
+
+consistency_after_restore_recreate_ram(suite) -> [];
+consistency_after_restore_recreate_ram(Config) when is_list(Config) ->
+    consistency_after_restore(ram_copies, recreate_tables, Config).
+
+consistency_after_restore_recreate_disc(suite) -> [];
+consistency_after_restore_recreate_disc(Config) when is_list(Config) ->
+    consistency_after_restore(disc_copies, recreate_tables, Config).
+
+consistency_after_restore_recreate_disc_only(suite) -> [];
+consistency_after_restore_recreate_disc_only(Config) when is_list(Config) ->
+    consistency_after_restore(disc_only_copies, recreate_tables, Config).
+
+consistency_after_restore(ReplicaType, Op, Config) ->
+    Delay = 1,
+    Nodes = ?acquire_nodes(3, [{tc_timeout, timer:minutes(10)} | Config]),
+    [Node1, Node2, _Node3] = Nodes,
+    File = "cons_backup_restore",
+    
+    ?log("consistency_after_restore with ~p on ~p~n",
+         [ReplicaType, Nodes]),
+    Tabs = [carA, carB, carC, carD],
+    
+    ?match({atomic, ok}, mnesia:create_table(carA, [{ReplicaType, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(carB, [{ReplicaType, Nodes -- [Node1]}])),
+    ?match({atomic, ok}, mnesia:create_table(carC, [{ReplicaType, Nodes -- [Node2]}])),
+    ?match({atomic, ok}, mnesia:create_table(carD, [{ReplicaType, [Node2]}])),
+
+    NList = lists:seq(0, 20),
+    [lists:foreach(fun(E) -> ok = mnesia:dirty_write({Tab, E, 1}) end, NList) ||
+	Tab <- Tabs],
+    
+    {ok, Name, _} = mnesia:activate_checkpoint([{max, [schema | Tabs]}, 
+						{ram_overrides_dump, true}]),
+    ?verbose("Doing backup~n", []),
+    ?match(ok, mnesia:backup_checkpoint(Name, File)),
+    ?match(ok, mnesia:deactivate_checkpoint(Name)),
+    
+    [lists:foreach(fun(E) -> ok = mnesia:dirty_write({Tab, E, 2}) end, NList) ||
+	Tab <- Tabs],
+    
+    Pids1 = [{'EXIT', spawn_link(?MODULE, change_tab, [self(), carA, Op]), ok} || _ <- lists:seq(1, 5)],
+    Pids2 = [{'EXIT', spawn_link(?MODULE, change_tab, [self(), carB, Op]), ok} || _ <- lists:seq(1, 5)],
+    Pids3 = [{'EXIT', spawn_link(?MODULE, change_tab, [self(), carC, Op]), ok} || _ <- lists:seq(1, 5)],
+    Pids4 = [{'EXIT', spawn_link(?MODULE, change_tab, [self(), carD, Op]), ok} || _ <- lists:seq(1, 5)],
+    
+    AllPids = Pids1 ++ Pids2 ++ Pids3 ++ Pids4,
+    
+    Restore = fun(F, Args) ->
+		      case mnesia:restore(F, Args) of
+			  {atomic, List} -> lists:sort(List);
+			  Else -> Else
+		      end
+	      end,
+    
+    timer:sleep(timer:seconds(Delay)),  %% Let changers grab locks
+    ?verbose("Doing restore~n", []),
+    ?match(Tabs, Restore(File, [{default_op, Op}])),
+
+    timer:sleep(timer:seconds(Delay)),  %% Let em die
+
+    ?match_multi_receive(AllPids),
+
+    case ?match(ok, restore_verify_tabs(Tabs)) of 
+	{success, ok} -> 
+	    file:delete(File);
+	_ -> 
+	    {T, M, S} = time(),
+	    File2 = ?flat_format("consistency_error~w~w~w.BUP", [T, M, S]),
+	    file:rename(File, File2)
+    end,
+    ?verify_mnesia(Nodes, []).
+
+change_tab(Father, Tab, Test) ->
+    Key = random:uniform(20),
+    Update = fun() ->
+		     case mnesia:read({Tab, Key}) of
+			 [{Tab, Key, 1}] -> 
+			     quit;
+			 [{Tab, Key, _N}] ->				       
+			     mnesia:write({Tab, Key, 3})
+		     end
+	     end,
+    case mnesia:transaction(Update) of
+	{atomic, quit} ->
+	    exit(ok);
+	{aborted, {no_exists, Tab}} when Test == recreate_tables ->%% I'll allow this 
+	    change_tab(Father, Tab, Test);
+	{atomic, ok} ->
+	    change_tab(Father, Tab, Test)
+    end.
+
+restore_verify_tabs([Tab | R]) ->
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:foldl(fun({_, _, 1}, ok) -> 
+							    ok;
+						       (Else, Acc) ->
+							    [Else|Acc]
+						    end, ok, Tab) 
+			      end)),
+    restore_verify_tabs(R);
+restore_verify_tabs([]) ->
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+consistency_after_rename_of_node(doc) ->
+    ["Skipped because it is an unimportant case."].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+updates_during_checkpoint_activation_2_ram(suite) -> [];
+updates_during_checkpoint_activation_2_ram(Config) when is_list(Config) ->
+    updates_during_checkpoint_activation(ram_copies, 2, Config).
+
+updates_during_checkpoint_activation_2_disc(suite) -> [];
+updates_during_checkpoint_activation_2_disc(Config) when is_list(Config) ->
+    updates_during_checkpoint_activation(disc_copies, 2, Config).
+
+updates_during_checkpoint_activation_2_disc_only(suite) -> [];
+updates_during_checkpoint_activation_2_disc_only(Config) when is_list(Config) ->
+    updates_during_checkpoint_activation(disc_only_copies, 2, Config).
+
+updates_during_checkpoint_activation_3_ram(suite) -> [];
+updates_during_checkpoint_activation_3_ram(Config) when is_list(Config) ->
+    updates_during_checkpoint_activation(ram_copies, 3, Config).
+
+updates_during_checkpoint_activation_3_disc(suite) -> [];
+updates_during_checkpoint_activation_3_disc(Config) when is_list(Config) ->
+    updates_during_checkpoint_activation(disc_copies, 3, Config).
+
+updates_during_checkpoint_activation_3_disc_only(suite) -> [];
+updates_during_checkpoint_activation_3_disc_only(Config) when is_list(Config) ->
+    updates_during_checkpoint_activation(disc_only_copies, 3, Config).
+
+updates_during_checkpoint_activation(ReplicaType,NodeConfig,Config) ->
+    %%?verbose("updates_during_checkpoint_activation2 at ~p~n", [self()]),
+    Delay = 5,
+    Nodes = ?acquire_nodes(NodeConfig, Config),
+    Node1 = hd(Nodes),
+    %%?verbose("Mnesia info: ~p~n", [mnesia:info()]),
+
+    {success, [A]} = ?start_activities([Node1]),
+    ?log("consistency_after_fallback with ~p on ~p~n",
+         [ReplicaType, Nodes]),
+    TpcbConfig = tpcb_config_dist(ReplicaType, NodeConfig, Nodes, Config),
+    %%TpcbConfig = tpcb_config(ReplicaType, NodeConfig, Nodes),
+    mnesia_tpcb:init(TpcbConfig),
+    A ! fun () -> mnesia_tpcb:run(TpcbConfig) end,
+    timer:sleep(timer:seconds(Delay)),
+
+    {ok, CPName, _NodeList} =
+        mnesia:activate_checkpoint([{max, mnesia:system_info(tables)}]),
+    timer:sleep(timer:seconds(Delay)),
+
+    %% Stop tpcb
+    ?verbose("Stopping TPC-B~n", []),
+    mnesia_tpcb:stop(),
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+    
+    ?match(ok, mnesia:backup_checkpoint(CPName, 
+					updates_during_checkpoint_activation2)),
+    timer:sleep(timer:seconds(Delay)),
+
+    ?match(ok, mnesia:install_fallback(updates_during_checkpoint_activation2)),
+
+    %% Stop and then start mnesia and check table consistency
+    %%?verbose("Restarting Mnesia~n", []),
+    mnesia_test_lib:kill_mnesia(Nodes),
+    file:delete(updates_during_checkpoint_activation2),
+    mnesia_test_lib:start_mnesia(Nodes,[account,branch,teller, history]),
+
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+updates_during_checkpoint_iteration_2_ram(suite) -> [];
+updates_during_checkpoint_iteration_2_ram(Config) when is_list(Config) ->
+    updates_during_checkpoint_iteration(ram_copies, 2, Config).
+
+updates_during_checkpoint_iteration_2_disc(suite) -> [];
+updates_during_checkpoint_iteration_2_disc(Config) when is_list(Config) ->
+    updates_during_checkpoint_iteration(disc_copies, 2, Config).
+
+updates_during_checkpoint_iteration_2_disc_only(suite) -> [];
+updates_during_checkpoint_iteration_2_disc_only(Config) when is_list(Config) ->
+    updates_during_checkpoint_iteration(disc_only_copies, 2, Config).
+
+updates_during_checkpoint_iteration(ReplicaType,NodeConfig,Config) ->
+   %?verbose("updates_during_checkpoint_iteration2 at ~p~n", [self()]),
+    Delay = 5,
+    Nodes = ?acquire_nodes(NodeConfig, Config),
+    Node1 = hd(Nodes),
+   %?verbose("Mnesia info: ~p~n", [mnesia:info()]),
+    File = updates_during_checkpoint_iteration2,
+    {success, [A]} = ?start_activities([Node1]),
+    ?log("updates_during_checkpoint_iteration with ~p on ~p~n",
+         [ReplicaType, Nodes]),
+    TpcbConfig = tpcb_config_dist(ReplicaType, NodeConfig, Nodes, Config),
+    %%TpcbConfig = tpcb_config(ReplicaType, NodeConfig, Nodes),
+    TpcbConfigRec = list2rec(TpcbConfig, 
+                                         record_info(fields,tab_config),
+                                         #tab_config{}),
+    mnesia_tpcb:init(TpcbConfig),
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+
+    {ok, CPName, _NodeList} =
+        mnesia:activate_checkpoint([{max, mnesia:system_info(tables)},
+                                    {ram_overrides_dump,true}]),  
+    A ! fun () -> mnesia:backup_checkpoint(CPName, File) end,
+
+    do_changes_during_backup(TpcbConfigRec),
+
+    ?match_receive({A,ok}),
+
+    timer:sleep(timer:seconds(Delay)), 
+    ?match(ok, mnesia:install_fallback(File)),
+    timer:sleep(timer:seconds(Delay)),
+
+    ?match({error,{"Bad balance",_,_}}, mnesia_tpcb:verify_tabs()),
+ 
+    mnesia_test_lib:kill_mnesia(Nodes),
+    mnesia_test_lib:start_mnesia(Nodes,[account,branch,teller, history]),
+
+    ?match(ok, mnesia_tpcb:verify_tabs()),
+
+    ?match(ok, file:delete(File)),
+    ?verify_mnesia(Nodes, []).
+
+do_changes_during_backup(TpcbConfig) ->
+    loop_branches(TpcbConfig#tab_config.n_branches,
+                  TpcbConfig#tab_config.n_accounts_per_branch).
+
+loop_branches(N_br,N_acc) when N_br >= 1 ->
+   loop_accounts(N_br,N_acc),
+   loop_branches(N_br-1,N_acc);
+loop_branches(_,_) -> done.
+
+loop_accounts(N_br, N_acc) when N_acc >= 1 ->
+    A = #account{id=N_acc, branch_id=N_br, balance = 4711},
+    ok = mnesia:dirty_write(A),
+    loop_accounts(N_br, N_acc-1);
+
+loop_accounts(_,_) -> done.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+load_table_with_activated_checkpoint_ram(suite) -> [];
+load_table_with_activated_checkpoint_ram(Config) when is_list(Config) ->
+    load_table_with_activated_checkpoint(ram_copies, Config).
+
+load_table_with_activated_checkpoint_disc(suite) -> [];
+load_table_with_activated_checkpoint_disc(Config) when is_list(Config) ->
+    load_table_with_activated_checkpoint(disc_copies, Config).
+
+load_table_with_activated_checkpoint_disc_only(suite) -> [];
+load_table_with_activated_checkpoint_disc_only(Config) when is_list(Config) ->
+    load_table_with_activated_checkpoint(disc_only_copies, Config).
+
+load_table_with_activated_checkpoint(Type, Config) ->
+    Nodes = ?acquire_nodes(2, Config),
+    Node1 = hd(Nodes),
+    Tab = load_test,
+    Def = [{attributes, [key, value]},
+           {Type, Nodes}],            %%  ??? important that RAM  ???
+    
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    ?match(ok, mnesia:dirty_write({Tab, 1, 4711})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 42})),
+    ?match(ok, mnesia:dirty_write({Tab, 3, 256})),
+    
+    timer:sleep(timer:seconds(1)), 
+    
+    {ok, CPName, _NodeList} =
+        mnesia:activate_checkpoint([{max, mnesia:system_info(tables)},
+                                    {ram_overrides_dump,true}]),
+    
+    mnesia_test_lib:stop_mnesia([Node1]),    
+    mnesia_test_lib:start_mnesia([Node1],[Tab]),      
+    %%--- check, whether the checkpiont is attached to both replicas
+    {success, [A,B]} = ?start_activities(Nodes),
+    
+    A ! fun () ->
+		mnesia:table_info(Tab,checkpoints)
+	end,
+    ?match_receive({A,[CPName]}),
+    
+    B ! fun () ->
+		mnesia:table_info(Tab,checkpoints)
+	end,
+    ?match_receive({B,[CPName]}),    
+    
+    %%--- check, whether both retainers are consistent    
+    ?match(ok, mnesia:dirty_write({Tab, 1, 815})),       
+    A ! fun () ->
+		mnesia:backup_checkpoint(CPName, load_table_a)
+	end,
+    ?match_receive({A,ok}),
+    B ! fun () ->
+		mnesia:backup_checkpoint(CPName, load_table_b)
+	end,
+    ?match_receive({B,ok}),
+    
+    Mod = mnesia_backup, %% Assume local files
+    List_a =  view(load_table_a, Mod),
+    List_b =  view(load_table_b, Mod),
+    
+    ?match(List_a, List_b),
+    
+    ?match(ok,file:delete(load_table_a)),
+    ?match(ok,file:delete(load_table_b)),
+    ?verify_mnesia(Nodes, []).
+
+view(Source, Mod) ->
+    View = fun(Item, Acc) ->
+                   ?verbose("tab - item : ~p ~n",[Item]),
+		   case Item of
+		       {schema, Tab, Cs} ->  %% Remove cookie information
+			   NewCs = lists:keyreplace(cookie, 1, Cs,
+						    {cookie, skip_cookie}),
+			   Item2 = {schema, Tab, NewCs},
+			   {[Item], [Item2|Acc]};
+		       _ ->   
+			   {[Item], [Item|Acc]}
+		   end
+           end,
+    {ok,TabList} =  
+	mnesia:traverse_backup(Source, Mod, dummy, read_only, View, []),
+    lists:sort(TabList).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+add_table_copy_to_table_with_activated_checkpoint_ram(suite) -> [];
+add_table_copy_to_table_with_activated_checkpoint_ram(Config) when is_list(Config) ->
+    add_table_copy_to_table_with_activated_checkpoint(ram_copies, Config).
+
+add_table_copy_to_table_with_activated_checkpoint_disc(suite) -> [];
+add_table_copy_to_table_with_activated_checkpoint_disc(Config) when is_list(Config) ->
+    add_table_copy_to_table_with_activated_checkpoint(disc_copies, Config).
+
+add_table_copy_to_table_with_activated_checkpoint_disc_only(suite) -> [];
+add_table_copy_to_table_with_activated_checkpoint_disc_only(Config) when is_list(Config) ->
+    add_table_copy_to_table_with_activated_checkpoint(disc_only_copies, Config).
+
+add_table_copy_to_table_with_activated_checkpoint(Type,Config) -> 
+    Nodes = ?acquire_nodes(2, Config),
+						%?verbose("NODES = ~p ~n",[Nodes]),
+    [Node1,Node2] = Nodes,
+
+    Tab = add_test,
+    Def = [{attributes, [key, value]},
+           {Type, [Node1]}],            %%  ??? important that RAM  ???
+
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    ?match(ok, mnesia:dirty_write({Tab, 1, 4711})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 42})),
+    ?match(ok, mnesia:dirty_write({Tab, 3, 256})),
+
+    {ok, CPName, _NodeList} =
+        mnesia:activate_checkpoint([{max, mnesia:system_info(tables)},
+                                    {ram_overrides_dump,true}]),
+
+    ?match({atomic,ok},mnesia:add_table_copy(Tab,Node2,ram_copies)),
+
+    %%--- check, whether the checkpiont is attached to both replicas
+    {success, [A,B]} = ?start_activities(Nodes),
+
+    A ! fun () ->
+		mnesia:table_info(Tab,checkpoints)
+	end,
+    ?match_receive({A,[CPName]}),
+
+    B ! fun () ->
+		mnesia:table_info(Tab,checkpoints)
+	end,
+    ?match_receive({B,[CPName]}),
+
+    %%--- check, whether both retainers are consistent
+
+    ?match(ok, mnesia:dirty_write({Tab, 1, 815})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 815})),
+
+    A ! fun () ->
+		mnesia:backup_checkpoint(CPName, add_table_a)
+	end,
+    ?match_receive({A,ok}),
+    B ! fun () ->
+		mnesia:backup_checkpoint(CPName, add_table_b)
+	end,
+    ?match_receive({B,ok}),
+
+    Mod = mnesia_backup, %% Assume local files
+
+    List_a = view(add_table_a, Mod),
+    List_b = view(add_table_b, Mod),
+
+    ?match(List_a, List_b),
+
+    ?match(ok,file:delete(add_table_a)),
+    ?match(ok, file:delete(add_table_b)),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+inst_fallback_process_dies(suite) -> 
+    [];
+inst_fallback_process_dies(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    {success, [A,_B,_C]} = ?start_activities(Nodes),
+    
+    TestPid = self(),
+    DebugId = {mnesia_bup, fallback_receiver_loop, pre_swap},
+    DebugFun =
+        fun(PrevContext, _EvalContext) ->
+                ?verbose("fallback_receiver_loop -  pre_swap pid ~p  #~p~n",
+                     [self(),PrevContext]),
+                TestPid ! {self(),fallback_preswap},
+		case receive_messages([fallback_continue]) of
+		    [{TestPid,fallback_continue}] ->
+			?deactivate_debug_fun(DebugId),
+			PrevContext+1
+		end
+        end,
+    ?activate_debug_fun(DebugId, DebugFun, 1),
+        
+    Tab = install_table,
+    Def = [{attributes, [key, value]}, {disc_copies, Nodes}], 
+    
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    
+    ?match(ok, mnesia:dirty_write({Tab, 1, 4711})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 42})),
+    ?match(ok, mnesia:dirty_write({Tab, 3, 256})),
+    
+    {ok, CPName, _NodeList} =
+        mnesia:activate_checkpoint([{max, mnesia:system_info(tables)},
+                                    {ram_overrides_dump,true}]),
+    
+    ?match(ok, mnesia:backup_checkpoint(CPName, install_backup)),
+    
+    A ! fun() -> mnesia:install_fallback(install_backup) end,    
+    [{AnsPid,fallback_preswap}] = receive_messages([fallback_preswap]),
+    exit(A, kill),
+    AnsPid ! {self(), fallback_continue},
+    ?match_receive({'EXIT', A, killed}), 
+    timer:sleep(2000),  %% Wait till fallback is installed everywhere
+
+    mnesia_test_lib:kill_mnesia(Nodes),    
+    ?verbose("~n---->Mnesia is stopped everywhere<-----~n", []),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes,[Tab])),
+    
+    check_data(Nodes, Tab),
+    ?match(ok, file:delete(install_backup)),
+    ?verify_mnesia(Nodes, []).
+
+check_data([N1 | R], Tab) ->
+    ?match([{Tab, 1, 4711}], rpc:call(N1, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 2, 42}],   rpc:call(N1, mnesia, dirty_read, [{Tab, 2}])),
+    ?match([{Tab, 3, 256}],  rpc:call(N1, mnesia, dirty_read, [{Tab, 3}])),
+    check_data(R, Tab);
+check_data([], _Tab) -> 
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+fatal_when_inconsistency(suite) -> 
+    [];
+fatal_when_inconsistency(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    
+    [Node1, Node2, Node3] = Nodes = 
+	?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    {success, [A,_B,_C]} = ?start_activities(Nodes),
+    
+    TestPid = self(),
+    DebugId = {mnesia_bup, fallback_receiver_loop, pre_swap},
+    DebugFun =
+        fun(PrevContext, _EvalContext) ->
+                ?verbose("fallback_receiver_loop -  pre_swap pid ~p  #~p~n",
+                     [self(),PrevContext]),
+                TestPid ! {self(),fallback_preswap},
+		case receive_messages([fallback_continue])  of
+		    [{TestPid,fallback_continue}] ->
+			?deactivate_debug_fun(DebugId),
+			PrevContext+1
+		end
+        end,
+    ?activate_debug_fun(DebugId, DebugFun, 1),
+        
+    Tab = install_table,
+    Def = [{attributes, [key, value]}, {disc_copies, Nodes}], 
+    
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    
+    ?match(ok, mnesia:dirty_write({Tab, 1, 4711})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 42})),
+    ?match(ok, mnesia:dirty_write({Tab, 3, 256})),
+    
+    {ok, CPName, _NodeList} =
+        mnesia:activate_checkpoint([{max, mnesia:system_info(tables)},
+                                    {ram_overrides_dump,true}]),
+    
+    ?match(ok, mnesia:backup_checkpoint(CPName, install_backup)),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 42424242})),
+    
+    A ! fun() ->
+                mnesia:install_fallback(install_backup)
+        end,    
+
+    [{AnsPid,fallback_preswap}] = receive_messages([fallback_preswap]),
+    exit(AnsPid, kill),  %% Kill install-fallback on local node will 
+    AnsPid ! {self(), fallback_continue},
+    ?deactivate_debug_fun(DebugId),
+        
+    ?match_receive({A,{error,{"Cannot install fallback",
+			      {'EXIT',AnsPid,killed}}}}),
+    mnesia_test_lib:kill_mnesia(Nodes),
+    ?verbose("EXPECTING FATAL from 2 nodes WITH CORE DUMP~n", []),
+    
+    ?match([], mnesia_test_lib:start_mnesia([Node1],[])),
+    is_running(Node1, yes),
+    ?match([{Node2, mnesia, _}], mnesia_test_lib:start_mnesia([Node2],[])),
+    is_running(Node2, no),
+    ?match([{Node3, mnesia, _}], mnesia_test_lib:start_mnesia([Node3],[])),
+    is_running(Node3, no),
+    mnesia_test_lib:kill_mnesia(Nodes),
+    
+    ?match(ok, mnesia:install_fallback(install_backup)),    
+    mnesia_test_lib:start_mnesia(Nodes,[Tab]),
+    
+    check_data(Nodes, Tab),
+    
+    ?match(ok,file:delete(install_backup)),
+    ?verify_mnesia(Nodes, []).
+
+is_running(Node, Shouldbe) ->
+    timer:sleep(1000),
+    Running = rpc:call(Node, mnesia, system_info, [is_running]),
+    case Running of
+	Shouldbe -> ok;
+	_  -> is_running(Node, Shouldbe)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+after_delete(doc) ->
+    ["interrupt the uninstall after deletion of ",
+     "fallback files - there shall be no fallback"];
+after_delete(suite) -> [];
+after_delete(Config) when is_list(Config) ->
+        do_uninstall(Config, post_delete).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%
+
+do_uninstall(Config,DebugPoint) ->
+    ?is_debug_compiled,
+    
+    Nodes = ?acquire_nodes(3, Config),
+    %%?verbose("NODES = ~p ~n",[Nodes]),
+    
+    {success, [P1,P2,P3]} = ?start_activities(Nodes),
+    
+    NP1 = node(P1),
+    NP2 = node(P2),
+    
+    {A,B,C} = case node() of
+		  NP1 ->
+		      %%?verbose("first case ~n"),
+		      {P3,P2,P1};
+		  NP2 ->
+		      %%?verbose("second case ~n"),
+		      {P3, P1, P2};
+		  _  ->
+		      { P1, P2, P3}
+	      end,
+    
+    Node1 = node(A),
+    Node2 = node(B),
+    Node3 = node(C),
+    
+    ?verbose(" A   pid:~p  node:~p ~n",[A,Node1]),
+    ?verbose(" B   pid:~p  node:~p ~n",[B,Node2]),
+    ?verbose(" C   pid:~p  node:~p ~n",[C,Node3]),
+    
+    
+    TestPid = self(),
+    %%?verbose("TestPid : ~p~n",[TestPid]),
+    DebugId = {mnesia_bup, uninstall_fallback2, DebugPoint},
+    DebugFun = fun(PrevContext, _EvalContext) ->
+		       ?verbose("uninstall_fallback pid ~p  #~p~n"
+				,[self(),PrevContext]),
+		       TestPid ! {self(),uninstall_predelete},
+		       case receive_messages([uninstall_continue]) of
+			   [{TestPid,uninstall_continue}] ->
+			       ?deactivate_debug_fun(DebugId),
+			       %%?verbose("uninstall_fallback continues~n"),
+			       PrevContext+1
+		       end
+	       end,
+    ?remote_activate_debug_fun(Node1,DebugId, DebugFun, 1),
+    
+    Tab = install_table,
+    Def = [{attributes, [key, value]},
+           {ram_copies, Nodes}],     %% necessary to test different types ???  
+    
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    
+    ?match(ok, mnesia:dirty_write({Tab, 1, 4711})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 42})),
+    ?match(ok, mnesia:dirty_write({Tab, 3, 256})),
+    
+    {ok, CPName, _NodeList} =
+        mnesia:activate_checkpoint([{max, mnesia:system_info(tables)},
+                                    {ram_overrides_dump,true}]),
+    
+    ?match(ok, mnesia:backup_checkpoint(CPName,install_backup)),
+    timer:sleep(timer:seconds(1)), 
+    
+    A ! fun () ->
+		mnesia:install_fallback(install_backup)
+	end,
+    ?match_receive({A,ok}),
+    
+    A ! fun () ->
+		mnesia:uninstall_fallback()
+	end,
+    %%
+    %%  catch the debug entry in mnesia and kill one Mnesia node
+    %%
+    
+    
+    [{AnsPid,uninstall_predelete}] = receive_messages([uninstall_predelete]),
+    
+    ?verbose("AnsPid : ~p~n",[AnsPid]),
+    
+    mnesia_test_lib:kill_mnesia([Node2]),
+    timer:sleep(timer:seconds(1)), 
+    
+    AnsPid ! {self(),uninstall_continue},
+    
+    ?match_receive({A,ok}),
+    
+    mnesia_test_lib:kill_mnesia(Nodes) ,
+    mnesia_test_lib:start_mnesia(Nodes,[Tab]),
+    
+    A ! fun () ->
+		R1 = mnesia:dirty_read({Tab,1}),
+		R2 = mnesia:dirty_read({Tab,2}),
+		R3 = mnesia:dirty_read({Tab,3}),
+		{R1,R2,R3}
+	end,    
+    ?match_receive({ A, {[],[],[]} }),
+    
+    B ! fun () ->
+		R1 = mnesia:dirty_read({Tab,1}),
+		R2 = mnesia:dirty_read({Tab,2}),
+		R3 = mnesia:dirty_read({Tab,3}),
+		{R1,R2,R3}
+	end,
+    ?match_receive({ B, {[],[],[]} }),
+    
+    C ! fun () ->
+		R1 = mnesia:dirty_read({Tab,1}),
+		R2 = mnesia:dirty_read({Tab,2}),
+		R3 = mnesia:dirty_read({Tab,3}),
+		{R1,R2,R3}
+	end,
+    ?match_receive({ C, {[],[],[]} }),
+    
+    ?match(ok,file:delete(install_backup)),
+    ?verify_mnesia(Nodes, []).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%
+
+cause_switch_before(doc)  ->
+      ["interrupt the backup before iterating the retainer"];
+cause_switch_before(suite)  ->  [];
+cause_switch_before(Config) when is_list(Config) ->
+   do_something_during_backup(cause_switch,pre,Config).
+
+%%%%%%%%%%%%%%%
+
+cause_switch_after(doc)  ->
+      ["interrupt the backup after iterating the retainer"];
+cause_switch_after(suite)  ->  [];
+cause_switch_after(Config) when is_list(Config) ->
+   do_something_during_backup(cause_switch,post,Config).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%
+
+cause_abort_before(doc) ->
+      ["interrupt the backup before iterating the retainer"];
+
+cause_abort_before(suite) ->  [];
+cause_abort_before(Config) when is_list(Config) ->
+   do_something_during_backup(cause_abort,pre,Config).
+
+%%%%%%%%%%%%%%%%%%
+
+cause_abort_after(doc) ->
+      ["interrupt the backup after iterating the retainer"];
+
+cause_abort_after(suite) ->  [];
+cause_abort_after(Config) when is_list(Config) ->
+   do_something_during_backup(cause_abort,post,Config).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%
+
+change_schema_before(doc) ->
+      ["interrupt the backup before iterating the retainer"];
+change_schema_before(suite) -> [];
+change_schema_before(Config) when is_list(Config) ->
+   do_something_during_backup(change_schema,pre,Config).
+
+%%%%%%%%%%%%%%%%
+
+change_schema_after(doc) ->
+      ["interrupt the backup after iterating the retainer"];
+change_schema_after(suite) -> [];
+change_schema_after(Config) when is_list(Config) ->
+   do_something_during_backup(change_schema,post,Config).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+do_something_during_backup(Action,DebugPoint,Config) ->
+    ?is_debug_compiled,
+    
+    Nodes = ?acquire_nodes(3, Config),
+    
+    {success, [A,B,C]} = ?start_activities(Nodes),
+    
+    Node1 = node(A),
+    Node2 = node(B),
+    Node3 = node(C),
+    
+    TestPid = self(),
+    %%?verbose("TestPid : ~p~n",[TestPid]),
+    
+    Tab = interrupt_table,
+    Bak = interrupt_backup,
+    Def = [{attributes, [key, value]},
+           {ram_copies, [Node2,Node3]}],  
+    %% necessary to test different types ???  
+    
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    
+    
+    
+    DebugId = {mnesia_log, tab_copier, DebugPoint},
+    DebugFun = fun(PrevContext, EvalContext) ->
+		       ?verbose("interrupt backup  pid ~p  #~p ~n context ~p ~n"
+			    ,[self(),PrevContext,EvalContext]),
+		       TestPid ! {self(),interrupt_backup_pre},
+		       global:set_lock({{lock_for_backup, Tab}, self()},
+				       Nodes,
+				       infinity),
+		       		       
+		       %%?verbose("interrupt backup - continues ~n"),
+		       ?deactivate_debug_fun(DebugId),
+		       PrevContext+1
+	       end,
+    ?remote_activate_debug_fun(Node1,DebugId, DebugFun, 1),
+    
+    ?match(ok, mnesia:dirty_write({Tab, 1, 4711})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 42})),
+    ?match(ok, mnesia:dirty_write({Tab, 3, 256})),
+    
+    {ok, CPName, _NodeList} =
+        mnesia:activate_checkpoint([{max, mnesia:system_info(tables)},
+                                    {ram_overrides_dump,true}]),
+    
+    A ! fun () ->
+		%%?verbose("node: ~p pid: ~p ~n",[node(),self()]),
+		mnesia:table_info(Tab,where_to_read)
+	end,
+
+    ReadNode_a = receive { A, ReadNode_a_tmp } -> ReadNode_a_tmp end,
+    ?verbose("ReadNode ~p ~n",[ReadNode_a]),
+    
+    global:set_lock({{lock_for_backup, Tab}, self()}, Nodes, infinity),
+    
+    A ! fun () ->    %% A shall perform the backup, so the test proc is
+		%% able to do further actions in between
+		mnesia:backup_checkpoint(CPName, Bak)
+	end,
+    
+    %% catch the debug function of mnesia, stop the backup process 
+    %% kill the node ReadNode_a and continue the backup process
+    %% As there is a second replica of the table, the backup shall continue
+
+    case receive_messages([interrupt_backup_pre]) of
+	[{_AnsPid,interrupt_backup_pre}] -> ok
+    end,
+    
+    case Action of
+        cause_switch ->
+	    mnesia_test_lib:kill_mnesia([ReadNode_a]),
+	    timer:sleep(timer:seconds(1));
+        cause_abort ->
+	    mnesia_test_lib:kill_mnesia([Node2,Node3]),
+	    timer:sleep(timer:seconds(1));
+        change_schema ->
+	    Tab2 = second_interrupt_table,
+	    Def2 = [{attributes, [key, value]},
+		    {ram_copies, Nodes}],  
+	    
+	    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2))
+    end,
+    
+    %%    AnsPid ! {self(),interrupt_backup_continue},
+    global:del_lock({{lock_for_backup, Tab}, self()}, Nodes),
+    
+    case Action of
+        cause_abort -> 
+	    
+            %% answer of A when finishing the backup
+            ?match_receive({A,{error, _}}), 
+	    
+            ?match({error,{"Cannot install fallback",_}},
+                   mnesia:install_fallback(Bak)); 
+        _ ->      %% cause_switch, change_schema
+	    
+            ?match_receive({A,ok}), %% answer of A when finishing the backup
+	    
+            %% send a fun to that node where mnesia is still running
+            WritePid = case ReadNode_a of
+			   Node2 -> C; %%   node(C) == Node3
+			   Node3 -> B
+                       end,
+            WritePid ! fun () ->
+			       ?match(ok, mnesia:dirty_write({Tab, 1, 815})),
+			       ?match(ok, mnesia:dirty_write({Tab, 2, 816})),
+			       ok
+                       end,
+            ?match_receive({ WritePid, ok }),  
+            ?match(ok, mnesia:install_fallback(Bak))
+    end,        
+    
+    %% Stop and then start mnesia and check table consistency
+    %%?verbose("Restarting Mnesia~n", []),
+    mnesia_test_lib:kill_mnesia(Nodes),
+    mnesia_test_lib:start_mnesia(Nodes,[Tab]),
+    
+    case Action of
+        cause_switch ->
+	    %% the backup should exist
+	    cross_check_tables([A,B,C],Tab,{[{Tab,1,4711}],
+					    [{Tab,2,42}],
+					    [{Tab,3,256}] }),
+	    ?match(ok,file:delete(Bak));
+        cause_abort ->
+	    %% the backup should  NOT exist
+	    cross_check_tables([A,B,C],Tab,{[],[],[]}),
+	    %% file does not exist 
+	    ?match({error, _},file:delete(Bak)); 
+        change_schema ->
+	    %% the backup should exist
+	    cross_check_tables([A,B,C],Tab,{[{Tab,1,4711}],
+					    [{Tab,2,42}],
+					    [{Tab,3,256}] }),
+	    ?match(ok,file:delete(Bak))
+    end,
+    ?verify_mnesia(Nodes, []).
+
+%% check the contents of the table
+cross_check_tables([],_tab,_elements) -> ok;
+cross_check_tables([Pid|Rest],Tab,{Val1,Val2,Val3}) ->
+    Pid ! fun () ->
+              R1 = mnesia:dirty_read({Tab,1}),
+              R2 = mnesia:dirty_read({Tab,2}),
+              R3 = mnesia:dirty_read({Tab,3}),
+              {R1,R2,R3}
+            end,
+    ?match_receive({ Pid, {Val1, Val2, Val3 } }),
+    cross_check_tables(Rest,Tab,{Val1,Val2,Val3} ).   
diff --git a/lib/mnesia/test/mnesia_cost.erl b/lib/mnesia/test/mnesia_cost.erl
new file mode 100644
index 0000000000..3221f46f61
--- /dev/null
+++ b/lib/mnesia/test/mnesia_cost.erl
@@ -0,0 +1,222 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1996-2010. 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(mnesia_cost).
+-compile(export_all).
+
+%% This code exercises the mnesia system and produces a bunch
+%% of measurements on what various things cost
+
+-define(TIMES, 1000).  %% set to at least 1000 when running for real !!
+
+%% This is the record we perform all ops on in this test
+
+-record(item, {a = 1234,
+	       b = foobar,
+	       c = "1.2.3.4",
+	       d = {'Lennart', 'Hyland'},
+	       e = true 
+	      }).
+
+go() ->
+    go([node() | nodes()]).
+    
+go(Nodes) when hd(Nodes) == node() ->
+    {ok, Out} = file:open("MNESIA_COST", write),
+    put(out, Out),
+    
+    rpc:multicall(Nodes, mnesia, lkill, []),
+    ok = mnesia:delete_schema(Nodes),
+    ok = mnesia:create_schema(Nodes),
+    rpc:multicall(Nodes, mnesia, start, []),
+    TabDef = [{attributes, record_info(fields, item)}],
+    {atomic, ok} = mnesia:create_table(item, TabDef),
+
+    round("single ram copy", "no index"),
+    {atomic, ok} = mnesia:add_table_index(item, #item.e),
+    round("single ram copy", "One index"),
+
+    {atomic, ok} = mnesia:add_table_index(item, #item.c),
+    round("single ram copy", "Two indexes"),
+
+    {atomic, ok} = mnesia:del_table_index(item, #item.e),
+    {atomic, ok} = mnesia:del_table_index(item, #item.c),
+
+    {atomic, ok} = mnesia:change_table_copy_type(item, node(), disc_copies),
+    round("single disc copy", "no index"),
+
+    {atomic, ok} = mnesia:change_table_copy_type(item, node(), ram_copies),
+
+    case length(Nodes) of
+	Len when Len < 2 ->
+	    format("<WARNING> replication skipped. Too few nodes.", []);
+	_Len ->
+	    N2 = lists:nth(2, Nodes),
+	    {atomic, ok} = mnesia:add_table_copy(item, N2, ram_copies),
+	    round("2 replicated ram copy", "no index")
+    end,
+    file:close(Out),
+    erase(out),
+    ok.
+
+round(Replication, Index) ->
+    run(Replication, Index, [write],
+	fun() -> mnesia:write(#item{}) end),
+
+
+    run(Replication, Index, [read],
+	fun() -> mnesia:read({item, 1234}) end),
+
+    run(Replication, Index, [read, write],
+	fun() -> mnesia:read({item, 1234}),
+		 mnesia:write(#item{}) end),
+
+    run(Replication, Index, [wread, write],
+	fun() -> mnesia:wread({item, 1234}),
+		 mnesia:write(#item{}) end),
+
+
+    run(Replication, Index, [match, write, write, write],
+	fun() -> mnesia:match_object({item, 1, '_', '_', '_', true}),
+		 mnesia:write(#item{a =1}),
+		 mnesia:write(#item{a =2}),
+		 mnesia:write(#item{a =3}) end).
+
+
+format(F, As) ->
+    io:format(get(out), F, As).
+
+run(What, OtherInfo, Ops, F) ->
+    run(t, What, OtherInfo, Ops, F).
+
+run(How, What, OtherInfo, Ops, F) ->
+    T1 = erlang:now(),
+    statistics(runtime),
+    do_times(How, ?TIMES, F),
+    {_, RunTime} = statistics(runtime),
+    T2 = erlang:now(),
+    RealTime = subtr(T1, T2),
+    report(How, What, OtherInfo, Ops, RunTime, RealTime).
+
+report(t, What, OtherInfo, Ops, RunTime, RealTime) ->
+    format("~s, ~s,  transaction call ", [What, OtherInfo]),
+    format("Ops is ", []),
+    lists:foreach(fun(Op) -> format("~w-", [Op]) end, Ops),
+
+    format("~n   ~w/~w Millisecs/Trans ~w/~w MilliSecs/Operation ~n~n",
+	      [RunTime/?TIMES, 
+	       RealTime/?TIMES,
+	       RunTime/(?TIMES*length(Ops)),
+	       RealTime/(?TIMES*length(Ops))]);
+
+report(dirty, What, OtherInfo, Ops, RunTime, RealTime) ->
+    format("~s, ~s, dirty calls ", [What, OtherInfo]),
+    format("Ops is ", []),
+    lists:foreach(fun(Op) -> format("~w-", [Op]) end, Ops),
+
+    format("~n   ~w/~w Millisecs/Bunch ~w/~w MilliSecs/Operation ~n~n",
+	      [RunTime/?TIMES, 
+	       RealTime/?TIMES,
+	       RunTime/(?TIMES*length(Ops)),
+	       RealTime/(?TIMES*length(Ops))]).
+
+
+subtr(Before, After) ->
+    E =(element(1,After)*1000000000000
+	+element(2,After)*1000000+element(3,After)) -
+        (element(1,Before)*1000000000000
+         +element(2,Before)*1000000+element(3,Before)),
+    E div 1000.
+
+do_times(t, I, F) ->
+    do_trans_times(I, F);
+do_times(dirty, I, F) ->
+    do_dirty(I, F).
+
+do_trans_times(I, F) when I /= 0 ->
+    {atomic, _} = mnesia:transaction(F),
+    do_trans_times(I-1, F);
+do_trans_times(_,_) -> ok.
+
+do_dirty(I, F) when I /= 0 ->
+    F(),
+    do_dirty(I-1, F);
+do_dirty(_,_) -> ok.
+
+    
+    
+table_load([N1,N2| _ ] = Ns) ->    
+    Nodes = [N1,N2],
+    rpc:multicall(Ns, mnesia, lkill, []),
+    ok = mnesia:delete_schema(Ns),
+    ok = mnesia:create_schema(Nodes),
+    rpc:multicall(Nodes, mnesia, start, []),
+    TabDef = [{disc_copies,[N1]},{ram_copies,[N2]},
+	      {attributes,record_info(fields,item)},{record_name,item}],
+    Tabs   = [list_to_atom("tab" ++ integer_to_list(I)) || I <- lists:seq(1,400)],
+    
+    [mnesia:create_table(Tab,TabDef) || Tab <- Tabs],
+
+%%     InitTab = fun(Tab) ->
+%% 		      mnesia:write_lock_table(Tab),
+%% 		      InitRec = fun(Key) -> mnesia:write(Tab,#item{a=Key},write) end,
+%% 		      lists:foreach(InitRec, lists:seq(1,100))
+%% 	      end,
+%%     
+%%    {Time,{atomic,ok}} = timer:tc(mnesia,transaction, [fun() ->lists:foreach(InitTab, Tabs) end]),
+    mnesia:dump_log(),
+%%    io:format("Init took ~p msec ~n", [Time/1000]),
+    rpc:call(N2, mnesia, stop, []),    timer:sleep(1000),
+    mnesia:stop(), timer:sleep(500),
+    %% Warmup
+    ok = mnesia:start([{no_table_loaders, 1}]),    
+    timer:tc(mnesia, wait_for_tables, [Tabs, infinity]),
+    mnesia:dump_log(),
+    rpc:call(N2, mnesia, dump_log, []),
+    io:format("Initialized ~n",[]),
+
+    mnesia:stop(), timer:sleep(1000),
+    ok = mnesia:start([{no_table_loaders, 1}]),
+    {T1, ok} = timer:tc(mnesia, wait_for_tables, [Tabs, infinity]),
+    io:format("Loading from disc with 1 loader ~p msec~n",[T1/1000]),
+    mnesia:stop(), timer:sleep(1000),
+    ok = mnesia:start([{no_table_loaders, 4}]),
+    {T2, ok} = timer:tc(mnesia, wait_for_tables, [Tabs, infinity]),
+    io:format("Loading from disc with 4 loader ~p msec~n",[T2/1000]),
+
+    %% Warmup
+    rpc:call(N2, ?MODULE, remote_load, [Tabs,4]),
+    io:format("Initialized ~n",[]),
+
+    
+    T3 = rpc:call(N2, ?MODULE, remote_load, [Tabs,1]),
+    io:format("Loading from net with 1 loader ~p msec~n",[T3/1000]),
+    
+    T4 = rpc:call(N2, ?MODULE, remote_load, [Tabs,4]),
+    io:format("Loading from net with 4 loader ~p msec~n",[T4/1000]),
+
+    ok.
+
+remote_load(Tabs,Loaders) ->
+    ok = mnesia:start([{no_table_loaders, Loaders}]),
+%%    io:format("~p ~n", [mnesia_controller:get_info(500)]),
+    {Time, ok} = timer:tc(mnesia, wait_for_tables, [Tabs, infinity]),
+    timer:sleep(1000), mnesia:stop(), timer:sleep(1000),
+    Time.
diff --git a/lib/mnesia/test/mnesia_dbn_meters.erl b/lib/mnesia/test/mnesia_dbn_meters.erl
new file mode 100644
index 0000000000..feaf90ee75
--- /dev/null
+++ b/lib/mnesia/test/mnesia_dbn_meters.erl
@@ -0,0 +1,242 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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(mnesia_dbn_meters).
+-export([
+	 start/0,
+	 local_start/0,
+	 distr_start/1,
+	 start/3
+	]).
+
+-record(simple,{key,val=0}).
+-define(key,1).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Configuration and start
+
+start() ->
+    local_start(),
+    distr_start(nodes()).
+
+local_start() ->
+    start(one_ram_only,[node()],some_meters()),
+    start(one_disc_only,[node()],some_meters()).
+    
+distr_start([]) ->
+    local_only;
+distr_start(OtherNodes) when is_list(OtherNodes) ->
+    start(ram_and_ram,[node()|OtherNodes],some_meters()),
+    start(disc_and_disc,[node()|OtherNodes],some_meters()).
+
+start(Config,Nodes,Meters) ->
+    Attrs = record_info(fields,simple),
+    Schema = [{name,simple},{type,set},{attributes,Attrs}] ++ config(Config,Nodes),
+    L = '====================',
+    io:format("~n~p dbn_meters: ~p ~p~nSchema = ~p.~n~n",[L,Config,L,Schema]),
+    ok = mnesia:delete_schema(Nodes),
+    ok = mnesia:create_schema(Nodes),
+    rpc:multicall(Nodes, mnesia, start, []),
+    {atomic,_} = mnesia:create_table(Schema),
+    lists:foreach(fun report_meter/1,Meters),
+    {atomic, ok} = mnesia:delete_table(simple),
+    rpc:multicall(Nodes, mnesia, stop, []),
+    ok.
+
+config(one_ram_only,[Single|_]) ->
+    [{ram_copies,[Single]}];
+config(ram_and_ram,[Master|[Slave|_]]) ->
+    [{ram_copies,[Master,Slave]}];
+config(one_disc_only,[Single|_]) ->
+    [{disc_copies,[Single]}];
+config(disc_and_disc,[Master|[Slave|_]]) ->
+    [{disc_copies,[Master,Slave]}];
+config(Config,Nodes) ->
+    io:format("<ERROR> Config ~p not supported or too few nodes ~p given~n",[Config,Nodes]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% The various DBN meters
+some_meters() ->
+    [create,
+     open_safe_read,
+     open_dirty_read,
+     get_int,
+     open_update,
+     put_int,
+     put_int_and_copy,
+     dirty_put_int_and_copy,
+     start_trans,
+     commit_one_update,
+     delete,
+     dirty_delete
+    ].
+
+report_meter(Meter) ->
+    Times = 100,
+    Micros = repeat_meter(Meter,{atomic,{0,ignore}},Times) div Times,
+    io:format("\t~-30w ~-10w micro seconds (mean of ~p repetitions)~n",[Meter,Micros,Times]).
+
+repeat_meter(_Meter,{atomic,{Micros,_Result}},0) ->
+    Micros;
+repeat_meter(Meter,{atomic,{Micros,_Result}},Times) when Times > 0 ->
+    repeat_meter(Meter,catch meter(Meter),Times-1) + Micros;
+repeat_meter(Meter,{aborted,Reason},Times) when Times > 0 ->
+    io:format("<ERROR>\t~-20w\t,aborted, because ~p~n",[Meter,Reason]),
+    0;
+repeat_meter(Meter,{'EXIT',Reason},Times) when Times > 0 ->
+    io:format("<ERROR>\t~-20w\tcrashed, because ~p~n",[Meter,Reason]),
+    0.
+
+meter(create) ->
+    Key = 1,
+    mnesia:transaction(fun() -> mnesia:delete({simple,Key}) end),
+    Fun = fun() ->
+		  BeforeT = erlang:now(),
+		  R = mnesia:write(#simple{key=Key}),
+		  AfterT = erlang:now(),
+		  elapsed_time(BeforeT,AfterT,R)
+	  end,
+    mnesia:transaction(Fun);
+
+meter(open_safe_read) ->
+    Key = 2,
+    mnesia:transaction(fun() -> mnesia:write(#simple{key=Key}) end),
+    Fun = fun() ->
+		  BeforeT = erlang:now(),
+		  R = mnesia:read({simple,Key}),
+		  AfterT = erlang:now(),
+		  elapsed_time(BeforeT,AfterT,R)
+	  end,
+    mnesia:transaction(Fun);
+
+meter(open_dirty_read) ->
+    Key = 21,
+    mnesia:transaction(fun() -> mnesia:write(#simple{key=Key}) end),
+    Fun = fun() ->
+		  BeforeT = erlang:now(),
+		  R = mnesia:dirty_read({simple,Key}),
+		  AfterT = erlang:now(),
+		  elapsed_time(BeforeT,AfterT,R)
+	  end,
+    mnesia:transaction(Fun);
+
+meter(get_int) ->
+    Key = 3,
+    mnesia:transaction(fun() -> mnesia:write(#simple{key=Key}) end),
+    Fun = fun() ->
+		  [Simple] = mnesia:read({simple,Key}),
+		  BeforeT = erlang:now(),
+		  Int = Simple#simple.val,
+		  AfterT = erlang:now(),
+		  elapsed_time(BeforeT,AfterT,Int)
+	  end,
+    mnesia:transaction(Fun);
+
+meter(open_update) ->
+    Key = 3,
+    mnesia:transaction(fun() -> mnesia:write(#simple{key=Key}) end),
+    Fun = fun() ->
+		  BeforeT = erlang:now(),
+		  R = mnesia:wread({simple,Key}),
+		  AfterT = erlang:now(),
+		  elapsed_time(BeforeT,AfterT,R)
+	  end,
+    mnesia:transaction(Fun);
+
+meter(put_int) ->
+    Key = 4,
+    mnesia:transaction(fun() -> mnesia:write(#simple{key=Key}) end),
+    Fun = fun() ->
+		  [Simple] = mnesia:wread({simple,Key}),
+		  BeforeT = erlang:now(),
+		  R = Simple#simple{val=7},
+		  AfterT = erlang:now(),
+		  elapsed_time(BeforeT,AfterT,R)
+	  end,
+    mnesia:transaction(Fun);
+
+meter(put_int_and_copy) ->
+    Key = 5,
+    mnesia:transaction(fun() -> mnesia:write(#simple{key=Key}) end),
+    Fun = fun() ->
+		  [Simple] = mnesia:wread({simple,Key}),
+		  BeforeT = erlang:now(),
+		  Simple2 = Simple#simple{val=17},
+		  R = mnesia:write(Simple2),
+		  AfterT = erlang:now(),
+		  elapsed_time(BeforeT,AfterT,R)
+	  end,
+    mnesia:transaction(Fun);
+
+meter(dirty_put_int_and_copy) ->
+    Key = 55,
+    mnesia:dirty_write(#simple{key=Key}),
+    [Simple] = mnesia:dirty_read({simple,Key}),
+    BeforeT = erlang:now(),
+    Simple2 = Simple#simple{val=17},
+    R = mnesia:dirty_write(Simple2),
+    AfterT = erlang:now(),
+    {atomic,elapsed_time(BeforeT,AfterT,R)};
+
+meter(start_trans) ->
+    BeforeT = erlang:now(),
+    {atomic,AfterT} = mnesia:transaction(fun() -> erlang:now() end),
+    {atomic,elapsed_time(BeforeT,AfterT,ok)};
+
+meter(commit_one_update) ->
+    Key = 6,
+    mnesia:transaction(fun() -> mnesia:write(#simple{key=Key}) end),
+    Fun = fun() ->
+		  [Simple] = mnesia:wread({simple,Key}),
+		  Simple2 = Simple#simple{val=27},
+		  _R = mnesia:write(Simple2),
+		  erlang:now()
+	  end,
+    {atomic,BeforeT} = mnesia:transaction(Fun),
+    AfterT = erlang:now(),
+    {atomic,elapsed_time(BeforeT,AfterT,ok)};
+
+meter(delete) ->
+    Key = 7,
+    mnesia:transaction(fun() -> mnesia:write(#simple{key=Key}) end),
+    Fun = fun() ->
+		  BeforeT = erlang:now(),
+		  R = mnesia:delete({simple,Key}),
+		  AfterT = erlang:now(),
+		  elapsed_time(BeforeT,AfterT,R)
+	  end,
+    mnesia:transaction(Fun);
+
+meter(dirty_delete) ->
+    Key = 75,
+    mnesia:dirty_write(#simple{key=Key}),
+    BeforeT = erlang:now(),
+    R = mnesia:dirty_delete({simple,Key}),
+    AfterT = erlang:now(),
+    {atomic, elapsed_time(BeforeT,AfterT,R)}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Calculate the elapsed time
+elapsed_time(BeforeT,AfterT,Result) ->
+    {(element(1,AfterT)*1000000000000
+     +element(2,AfterT)*1000000+element(3,AfterT)) -
+	(element(1,BeforeT)*1000000000000
+	 +element(2,BeforeT)*1000000+element(3,BeforeT)),Result}.
diff --git a/lib/mnesia/test/mnesia_dirty_access_test.erl b/lib/mnesia/test/mnesia_dirty_access_test.erl
new file mode 100644
index 0000000000..abbdab48c0
--- /dev/null
+++ b/lib/mnesia/test/mnesia_dirty_access_test.erl
@@ -0,0 +1,880 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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(mnesia_dirty_access_test).
+-author('[email protected]').
+-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+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() -> 
+    [{group, dirty_write}, {group, dirty_read},
+     {group, dirty_update_counter}, {group, dirty_delete},
+     {group, dirty_delete_object},
+     {group, dirty_match_object}, {group, dirty_index},
+     {group, dirty_iter}, {group, admin_tests}].
+
+groups() -> 
+    [{dirty_write, [],
+      [dirty_write_ram, dirty_write_disc,
+       dirty_write_disc_only]},
+     {dirty_read, [],
+      [dirty_read_ram, dirty_read_disc,
+       dirty_read_disc_only]},
+     {dirty_update_counter, [],
+      [dirty_update_counter_ram, dirty_update_counter_disc,
+       dirty_update_counter_disc_only]},
+     {dirty_delete, [],
+      [dirty_delete_ram, dirty_delete_disc,
+       dirty_delete_disc_only]},
+     {dirty_delete_object, [],
+      [dirty_delete_object_ram, dirty_delete_object_disc,
+       dirty_delete_object_disc_only]},
+     {dirty_match_object, [],
+      [dirty_match_object_ram, dirty_match_object_disc,
+       dirty_match_object_disc_only]},
+     {dirty_index, [],
+      [{group, dirty_index_match_object},
+       {group, dirty_index_read},
+       {group, dirty_index_update}]},
+     {dirty_index_match_object, [],
+      [dirty_index_match_object_ram,
+       dirty_index_match_object_disc,
+       dirty_index_match_object_disc_only]},
+     {dirty_index_read, [],
+      [dirty_index_read_ram, dirty_index_read_disc,
+       dirty_index_read_disc_only]},
+     {dirty_index_update, [],
+      [dirty_index_update_set_ram,
+       dirty_index_update_set_disc,
+       dirty_index_update_set_disc_only,
+       dirty_index_update_bag_ram, dirty_index_update_bag_disc,
+       dirty_index_update_bag_disc_only]},
+     {dirty_iter, [],
+      [dirty_iter_ram, dirty_iter_disc,
+       dirty_iter_disc_only]},
+     {admin_tests, [],
+      [del_table_copy_1, del_table_copy_2, del_table_copy_3,
+       add_table_copy_1, add_table_copy_2, add_table_copy_3,
+       add_table_copy_4, move_table_copy_1, move_table_copy_2,
+       move_table_copy_3, move_table_copy_4]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Write records dirty
+
+
+dirty_write_ram(suite) -> [];
+dirty_write_ram(Config) when is_list(Config) ->
+    dirty_write(Config, ram_copies).
+
+dirty_write_disc(suite) -> [];
+dirty_write_disc(Config) when is_list(Config) ->
+    dirty_write(Config, disc_copies).
+
+dirty_write_disc_only(suite) -> [];
+dirty_write_disc_only(Config) when is_list(Config) ->
+    dirty_write(Config, disc_only_copies).
+
+dirty_write(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = dirty_write, 
+    Def = [{attributes, [k, v]}, {Storage, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Tab, Def)), 
+    
+    ?match({'EXIT', _},  mnesia:dirty_write([])), 
+    ?match({'EXIT', _},  mnesia:dirty_write({Tab, 2})), 
+    ?match({'EXIT', _},  mnesia:dirty_write({foo, 2})), 
+    ?match(ok,  mnesia:dirty_write({Tab, 1, 2})), 
+
+    ?match({atomic, ok},   mnesia:transaction(fun() -> 
+	    mnesia:dirty_write({Tab, 1, 2}) end)), 
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Read records dirty
+
+
+dirty_read_ram(suite) -> [];
+dirty_read_ram(Config) when is_list(Config) ->
+    dirty_read(Config, ram_copies).
+
+dirty_read_disc(suite) -> [];
+dirty_read_disc(Config) when is_list(Config) ->
+    dirty_read(Config, disc_copies).
+
+dirty_read_disc_only(suite) -> [];
+dirty_read_disc_only(Config) when is_list(Config) ->
+    dirty_read(Config, disc_only_copies).
+
+dirty_read(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = dirty_read, 
+    Def = [{type, bag}, {attributes, [k, v]}, {Storage, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Tab, Def)), 
+    
+    ?match({'EXIT', _},  mnesia:dirty_read([])), 
+    ?match({'EXIT', _},  mnesia:dirty_read({Tab})), 
+    ?match({'EXIT', _},   mnesia:dirty_read({Tab, 1, 2})), 
+    ?match([],  mnesia:dirty_read({Tab, 1})), 
+    ?match(ok,  mnesia:dirty_write({Tab, 1, 2})), 
+    ?match([{Tab, 1, 2}],  mnesia:dirty_read({Tab, 1})), 
+    ?match(ok,  mnesia:dirty_write({Tab, 1, 3})), 
+    ?match([{Tab, 1, 2}, {Tab, 1, 3}],  mnesia:dirty_read({Tab, 1})), 
+
+    ?match({atomic, [{Tab, 1, 2}, {Tab, 1, 3}]},  
+	   mnesia:transaction(fun() -> mnesia:dirty_read({Tab, 1}) end)), 
+
+    ?match(false, mnesia:async_dirty(fun() -> mnesia:is_transaction() end)),
+    ?match(false, mnesia:sync_dirty(fun() -> mnesia:is_transaction() end)),
+    ?match(false, mnesia:ets(fun() -> mnesia:is_transaction() end)),
+    ?match(false, mnesia:activity(async_dirty, fun() -> mnesia:is_transaction() end)),
+    ?match(false, mnesia:activity(sync_dirty,  fun() -> mnesia:is_transaction() end)),
+    ?match(false, mnesia:activity(ets,         fun() -> mnesia:is_transaction() end)),
+
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Update counter record dirty
+
+
+dirty_update_counter_ram(suite) -> [];
+dirty_update_counter_ram(Config) when is_list(Config) ->
+    dirty_update_counter(Config, ram_copies).
+
+dirty_update_counter_disc(suite) -> [];
+dirty_update_counter_disc(Config) when is_list(Config) ->
+    dirty_update_counter(Config, disc_copies).
+
+dirty_update_counter_disc_only(suite) -> [];
+dirty_update_counter_disc_only(Config) when is_list(Config) ->
+    dirty_update_counter(Config, disc_only_copies).
+
+dirty_update_counter(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = dirty_update_counter, 
+    Def = [{attributes, [k, v]}, {Storage, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Tab, Def)), 
+    ?match(ok,  mnesia:dirty_write({Tab, 1, 2})), 
+        
+    ?match({'EXIT', _},  mnesia:dirty_update_counter({Tab, 1}, [])), 
+    ?match({'EXIT', _},  mnesia:dirty_update_counter({Tab}, 3)), 
+    ?match({'EXIT', _},  mnesia:dirty_update_counter({foo, 1}, 3)), 
+    ?match(5,  mnesia:dirty_update_counter({Tab, 1}, 3)), 
+    ?match([{Tab, 1, 5}],  mnesia:dirty_read({Tab, 1})), 
+
+    ?match({atomic, 8},  mnesia:transaction(fun() ->
+	   mnesia:dirty_update_counter({Tab, 1}, 3) end)), 
+ 
+    ?match(1,  mnesia:dirty_update_counter({Tab, foo}, 1)),
+    ?match([{Tab, foo,1}], mnesia:dirty_read({Tab,foo})),
+
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Delete record dirty
+
+
+dirty_delete_ram(suite) -> [];
+dirty_delete_ram(Config) when is_list(Config) ->
+    dirty_delete(Config, ram_copies).
+
+dirty_delete_disc(suite) -> [];
+dirty_delete_disc(Config) when is_list(Config) ->
+    dirty_delete(Config, disc_copies).
+
+dirty_delete_disc_only(suite) -> [];
+dirty_delete_disc_only(Config) when is_list(Config) ->
+    dirty_delete(Config, disc_only_copies).
+
+dirty_delete(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = dirty_delete, 
+    Def = [{type, bag}, {attributes, [k, v]}, {Storage, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Tab, Def)), 
+    
+    ?match({'EXIT', _},  mnesia:dirty_delete([])), 
+    ?match({'EXIT', _},  mnesia:dirty_delete({Tab})), 
+    ?match({'EXIT', _},  mnesia:dirty_delete({Tab, 1, 2})), 
+    ?match(ok,  mnesia:dirty_delete({Tab, 1})), 
+    ?match(ok,  mnesia:dirty_write({Tab, 1, 2})), 
+    ?match(ok,  mnesia:dirty_delete({Tab, 1})), 
+    ?match(ok,  mnesia:dirty_write({Tab, 1, 2})), 
+    ?match(ok,  mnesia:dirty_write({Tab, 1, 2})), 
+    ?match(ok,  mnesia:dirty_delete({Tab, 1})), 
+
+    ?match(ok,  mnesia:dirty_write({Tab, 1, 2})), 
+    ?match({atomic, ok},  mnesia:transaction(fun() ->
+	   mnesia:dirty_delete({Tab, 1}) end)), 
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Delete matching record dirty
+
+
+dirty_delete_object_ram(suite) -> [];
+dirty_delete_object_ram(Config) when is_list(Config) ->
+    dirty_delete_object(Config, ram_copies).
+
+dirty_delete_object_disc(suite) -> [];
+dirty_delete_object_disc(Config) when is_list(Config) ->
+    dirty_delete_object(Config, disc_copies).
+
+dirty_delete_object_disc_only(suite) -> [];
+dirty_delete_object_disc_only(Config) when is_list(Config) ->
+    dirty_delete_object(Config, disc_only_copies).
+
+dirty_delete_object(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = dirty_delete_object, 
+    Def = [{type, bag}, {attributes, [k, v]}, {Storage, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Tab, Def)), 
+
+    OneRec = {Tab, 1, 2}, 
+    ?match({'EXIT', _},  mnesia:dirty_delete_object([])), 
+    ?match({'EXIT', _},  mnesia:dirty_delete_object({Tab})), 
+    ?match({'EXIT', _},  mnesia:dirty_delete_object({Tab, 1})), 
+    ?match(ok,  mnesia:dirty_delete_object(OneRec)), 
+    ?match(ok,  mnesia:dirty_write(OneRec)), 
+    ?match(ok,  mnesia:dirty_delete_object(OneRec)), 
+    ?match(ok,  mnesia:dirty_write(OneRec)), 
+    ?match(ok,  mnesia:dirty_write(OneRec)), 
+    ?match(ok,  mnesia:dirty_delete_object(OneRec)), 
+
+    ?match(ok,  mnesia:dirty_write(OneRec)), 
+    ?match({atomic, ok},  mnesia:transaction(fun() ->
+	   mnesia:dirty_delete_object(OneRec) end)), 
+
+    ?match({'EXIT', {aborted, {bad_type, Tab, _}}}, mnesia:dirty_delete_object(Tab, {Tab, {['_']}, 21})),
+    ?match({'EXIT', {aborted, {bad_type, Tab, _}}}, mnesia:dirty_delete_object(Tab, {Tab, {['$5']}, 21})),
+
+    ?verify_mnesia(Nodes, []).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Read matching records dirty
+
+
+dirty_match_object_ram(suite) -> [];
+dirty_match_object_ram(Config) when is_list(Config) ->
+    dirty_match_object(Config, ram_copies).
+
+dirty_match_object_disc(suite) -> [];
+dirty_match_object_disc(Config) when is_list(Config) ->
+    dirty_match_object(Config, disc_copies).
+
+dirty_match_object_disc_only(suite) -> [];
+dirty_match_object_disc_only(Config) when is_list(Config) ->
+    dirty_match_object(Config, disc_only_copies).
+
+dirty_match_object(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = dirty_match, 
+    Def = [{attributes, [k, v]}, {Storage, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Tab, Def)), 
+
+    OneRec = {Tab, 1, 2}, 
+    OnePat = {Tab, '$1', 2}, 
+    ?match([], mnesia:dirty_match_object(OnePat)), 
+    ?match(ok,  mnesia:dirty_write(OneRec)), 
+    ?match([OneRec],  mnesia:dirty_match_object(OnePat)), 
+    ?match({atomic, [OneRec]},  mnesia:transaction(fun() ->
+	 mnesia:dirty_match_object(OnePat) end)), 
+    
+    ?match({'EXIT', _},  mnesia:dirty_match_object({foo, '$1', 2})), 
+    ?match({'EXIT', _},  mnesia:dirty_match_object({[], '$1', 2})), 
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Dirty read matching records by using an index
+
+
+dirty_index_match_object_ram(suite) -> [];
+dirty_index_match_object_ram(Config) when is_list(Config) ->
+    dirty_index_match_object(Config, ram_copies).
+
+dirty_index_match_object_disc(suite) -> [];
+dirty_index_match_object_disc(Config) when is_list(Config) ->
+    dirty_index_match_object(Config, disc_copies).
+
+dirty_index_match_object_disc_only(suite) -> [];
+dirty_index_match_object_disc_only(Config) when is_list(Config) ->
+    dirty_index_match_object(Config, disc_only_copies).
+
+dirty_index_match_object(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = dirty_index_match_object, 
+    ValPos = 3, 
+    BadValPos = ValPos + 1, 
+    Def = [{attributes, [k, v]}, {Storage, [Node1]}, {index, [ValPos]}], 
+    ?match({atomic, ok},  mnesia:create_table(Tab, Def)), 
+    
+    ?match([],  mnesia:dirty_index_match_object({Tab, '$1', 2}, ValPos)), 
+    OneRec = {Tab, 1, 2}, 
+    ?match(ok,  mnesia:dirty_write(OneRec)), 
+    
+    ?match([OneRec],  mnesia:dirty_index_match_object({Tab, '$1', 2}, ValPos)), 
+    ?match({'EXIT', _},  mnesia:dirty_index_match_object({Tab, '$1', 2}, BadValPos)), 
+    ?match({'EXIT', _},  mnesia:dirty_index_match_object({foo, '$1', 2}, ValPos)), 
+    ?match({'EXIT', _},  mnesia:dirty_index_match_object({[], '$1', 2}, ValPos)), 
+    ?match({atomic, [OneRec]},  mnesia:transaction(fun() ->
+           mnesia:dirty_index_match_object({Tab, '$1', 2}, ValPos) end)),     
+    
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Read records by using an index
+
+
+dirty_index_read_ram(suite) -> [];
+dirty_index_read_ram(Config) when is_list(Config) ->
+    dirty_index_read(Config, ram_copies).
+
+dirty_index_read_disc(suite) -> [];
+dirty_index_read_disc(Config) when is_list(Config) ->
+    dirty_index_read(Config, disc_copies).
+
+dirty_index_read_disc_only(suite) -> [];
+dirty_index_read_disc_only(Config) when is_list(Config) ->
+    dirty_index_read(Config, disc_only_copies).
+
+dirty_index_read(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = dirty_index_read, 
+    ValPos = 3, 
+    BadValPos = ValPos + 1, 
+    Def = [{type, set},
+	   {attributes, [k, v]},
+	   {Storage, [Node1]},
+	   {index, [ValPos]}], 
+    ?match({atomic, ok},  mnesia:create_table(Tab, Def)), 
+
+    OneRec = {Tab, 1, 2}, 
+    ?match([],  mnesia:dirty_index_read(Tab, 2, ValPos)), 
+    ?match(ok,  mnesia:dirty_write(OneRec)), 
+    ?match([OneRec],  mnesia:dirty_index_read(Tab, 2, ValPos)), 
+    ?match({atomic, [OneRec]},  
+	   mnesia:transaction(fun() -> mnesia:dirty_index_read(Tab, 2, ValPos) end)),
+    ?match(42, mnesia:dirty_update_counter({Tab, 1}, 40)),
+    ?match([{Tab,1,42}], mnesia:dirty_read({Tab, 1})), 
+    ?match([],  mnesia:dirty_index_read(Tab, 2, ValPos)), 
+    ?match([{Tab, 1, 42}],  mnesia:dirty_index_read(Tab, 42, ValPos)),
+
+    ?match({'EXIT', _},  mnesia:dirty_index_read(Tab, 2, BadValPos)), 
+    ?match({'EXIT', _},  mnesia:dirty_index_read(foo, 2, ValPos)), 
+    ?match({'EXIT', _},  mnesia:dirty_index_read([], 2, ValPos)), 
+    
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dirty_index_update_set_ram(suite) -> [];
+dirty_index_update_set_ram(Config) when is_list(Config) ->
+    dirty_index_update_set(Config, ram_copies).
+
+dirty_index_update_set_disc(suite) -> [];
+dirty_index_update_set_disc(Config) when is_list(Config) ->
+    dirty_index_update_set(Config, disc_copies).
+
+dirty_index_update_set_disc_only(suite) -> [];
+dirty_index_update_set_disc_only(Config) when is_list(Config) ->
+    dirty_index_update_set(Config, disc_only_copies).
+
+dirty_index_update_set(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = index_test, 
+    ValPos = v1, 
+    ValPos2 = v3,
+    Def = [{attributes, [k, v1, v2, v3]},
+	   {Storage, [Node1]},
+	   {index, [ValPos]}], 
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)), 
+    
+    Pat1 = {Tab, '$1',  2,   '$2', '$3'},
+    Pat2 = {Tab, '$1', '$2', '$3', '$4'}, 
+    
+    Rec1 = {Tab, 1, 2, 3, 4}, 
+    Rec2 = {Tab, 2, 2, 13, 14},
+    Rec3 = {Tab, 1, 12, 13, 14}, 
+    Rec4 = {Tab, 4, 2, 13, 14}, 
+    
+    ?match([], mnesia:dirty_index_read(Tab, 2, ValPos)),
+    ?match(ok, mnesia:dirty_write(Rec1)),
+    ?match([Rec1], mnesia:dirty_index_read(Tab, 2, ValPos)),
+    
+    ?match(ok, mnesia:dirty_write(Rec2)),
+    R1 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec1, Rec2], lists:sort(R1)),
+    
+    ?match(ok, mnesia:dirty_write(Rec3)),
+    R2 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec2], lists:sort(R2)),
+    ?match([Rec2], mnesia:dirty_index_match_object(Pat1, ValPos)),
+    
+    {atomic, R3} = mnesia:transaction(fun() -> mnesia:match_object(Pat2) end), 
+    ?match([Rec3, Rec2], lists:sort(R3)),
+    
+    ?match(ok, mnesia:dirty_write(Rec4)),
+    R4 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec2, Rec4], lists:sort(R4)),
+    
+    ?match(ok, mnesia:dirty_delete({Tab, 4})),
+    ?match([Rec2], mnesia:dirty_index_read(Tab, 2, ValPos)),
+    
+    ?match({atomic, ok}, mnesia:del_table_index(Tab, ValPos)),
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec4) end)),
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos2)),
+    
+    R5 = mnesia:dirty_match_object(Pat2),
+    ?match([Rec3, Rec2, Rec4], lists:sort(R5)),
+    
+    R6 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec2, Rec4], lists:sort(R6)),    
+    ?match([], mnesia:dirty_index_read(Tab, 4, ValPos2)),
+    R7 = mnesia:dirty_index_read(Tab, 14, ValPos2),
+    ?match([Rec3, Rec2, Rec4], lists:sort(R7)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec1) end)),
+    R8 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec1, Rec2, Rec4], lists:sort(R8)),
+    ?match([Rec1], mnesia:dirty_index_read(Tab, 4, ValPos2)),
+    R9 = mnesia:dirty_index_read(Tab, 14, ValPos2),
+    ?match([Rec2, Rec4], lists:sort(R9)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete_object(Rec2) end)),
+    R10 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec1, Rec4], lists:sort(R10)),
+    ?match([Rec1], mnesia:dirty_index_read(Tab, 4, ValPos2)),
+    ?match([Rec4], mnesia:dirty_index_read(Tab, 14, ValPos2)),
+
+    ?match(ok, mnesia:dirty_delete({Tab, 4})),
+    R11 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec1], lists:sort(R11)),
+    ?match([Rec1], mnesia:dirty_index_read(Tab, 4, ValPos2)),
+    ?match([], mnesia:dirty_index_read(Tab, 14, ValPos2)),
+    
+    ?verify_mnesia(Nodes, []).
+
+dirty_index_update_bag_ram(suite) -> [];
+dirty_index_update_bag_ram(Config)when is_list(Config) ->
+    dirty_index_update_bag(Config, ram_copies).
+
+dirty_index_update_bag_disc(suite) -> [];
+dirty_index_update_bag_disc(Config)when is_list(Config) ->
+    dirty_index_update_bag(Config, disc_copies).
+
+dirty_index_update_bag_disc_only(suite) -> [];
+dirty_index_update_bag_disc_only(Config)when is_list(Config) ->
+    dirty_index_update_bag(Config, disc_only_copies).
+
+dirty_index_update_bag(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = index_test, 
+    ValPos = v1, 
+    ValPos2 = v3,
+    Def = [{type, bag},
+	   {attributes, [k, v1, v2, v3]}, 
+	   {Storage, [Node1]},
+	   {index, [ValPos]}], 
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)), 
+
+    Pat1 = {Tab, '$1',  2,   '$2', '$3'},
+    Pat2 = {Tab, '$1', '$2', '$3', '$4'}, 
+
+    Rec1 = {Tab, 1, 2, 3, 4},    
+    Rec2 = {Tab, 2, 2, 13, 14},  
+    Rec3 = {Tab, 1, 12, 13, 14}, 
+    Rec4 = {Tab, 4, 2, 13, 4}, 
+    Rec5 = {Tab, 1, 2, 234, 14},
+
+    %% Simple Index
+    ?match([], mnesia:dirty_index_read(Tab, 2, ValPos)),
+    ?match(ok, mnesia:dirty_write(Rec1)),
+    ?match([Rec1], mnesia:dirty_index_read(Tab, 2, ValPos)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec2) end)), 
+    R1 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec1, Rec2], lists:sort(R1)),
+
+    ?match(ok, mnesia:dirty_write(Rec3)),
+    R2 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec1, Rec2], lists:sort(R2)),
+
+    R3 = mnesia:dirty_index_match_object(Pat1, ValPos),
+    ?match([Rec1, Rec2], lists:sort(R3)),
+ 
+    R4 = mnesia:dirty_match_object(Pat2),
+    ?match([Rec1, Rec3, Rec2], lists:sort(R4)),
+ 
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec4) end)), 
+    R5 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec1, Rec2, Rec4], lists:sort(R5)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete({Tab, 4}) end)), 
+    R6 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec1, Rec2], lists:sort(R6)),
+
+    ?match(ok, mnesia:dirty_delete_object(Rec1)),
+    ?match([Rec2], mnesia:dirty_index_read(Tab, 2, ValPos)),
+    R7 = mnesia:dirty_match_object(Pat2),
+    ?match([Rec3, Rec2], lists:sort(R7)),
+    
+    %% Two indexies
+    ?match({atomic, ok}, mnesia:del_table_index(Tab, ValPos)),
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec1) end)),
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec4) end)),
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos2)),
+    
+    R8 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec1, Rec2, Rec4], lists:sort(R8)),
+
+    R9 = mnesia:dirty_index_read(Tab, 4, ValPos2),
+    ?match([Rec1, Rec4], lists:sort(R9)),
+    R10 = mnesia:dirty_index_read(Tab, 14, ValPos2),
+    ?match([Rec3, Rec2], lists:sort(R10)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec5) end)),
+    R11 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec1, Rec5, Rec2, Rec4], lists:sort(R11)),
+    R12 = mnesia:dirty_index_read(Tab, 4, ValPos2),
+    ?match([Rec1, Rec4], lists:sort(R12)),
+    R13 = mnesia:dirty_index_read(Tab, 14, ValPos2),
+    ?match([Rec5, Rec3, Rec2], lists:sort(R13)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete_object(Rec1) end)),
+    R14 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec5, Rec2, Rec4], lists:sort(R14)),
+    ?match([Rec4], mnesia:dirty_index_read(Tab, 4, ValPos2)),
+    R15 = mnesia:dirty_index_read(Tab, 14, ValPos2),
+    ?match([Rec5, Rec3, Rec2], lists:sort(R15)),
+
+    ?match(ok, mnesia:dirty_delete_object(Rec5)),
+    R16 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec2, Rec4], lists:sort(R16)),
+    ?match([Rec4], mnesia:dirty_index_read(Tab, 4, ValPos2)),
+    R17 = mnesia:dirty_index_read(Tab, 14, ValPos2),
+    ?match([Rec3, Rec2], lists:sort(R17)),
+
+    ?match(ok, mnesia:dirty_write(Rec1)),
+    ?match(ok, mnesia:dirty_delete({Tab, 1})),
+    R18 = mnesia:dirty_index_read(Tab, 2, ValPos),
+    ?match([Rec2, Rec4], lists:sort(R18)),
+    ?match([Rec4], mnesia:dirty_index_read(Tab, 4, ValPos2)),
+    R19 = mnesia:dirty_index_read(Tab, 14, ValPos2),
+    ?match([Rec2], lists:sort(R19)),
+
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Dirty iteration
+%% dirty_slot,  dirty_first,  dirty_next
+
+
+dirty_iter_ram(suite) -> [];
+dirty_iter_ram(Config) when is_list(Config) ->
+    dirty_iter(Config, ram_copies).
+
+dirty_iter_disc(suite) -> [];
+dirty_iter_disc(Config) when is_list(Config) ->
+    dirty_iter(Config, disc_copies).
+
+dirty_iter_disc_only(suite) -> [];
+dirty_iter_disc_only(Config) when is_list(Config) ->
+    dirty_iter(Config, disc_only_copies).
+
+dirty_iter(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = dirty_iter, 
+    Def = [{type, bag}, {attributes, [k, v]}, {Storage, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Tab, Def)), 
+
+    ?match([], all_slots(Tab)), 
+    ?match([], all_nexts(Tab)), 
+
+    Keys = lists:seq(1, 5), 
+    Records = [{Tab, A, B} || A <- Keys,  B <- lists:seq(1, 2)], 
+    lists:foreach(fun(Rec) -> ?match(ok, mnesia:dirty_write(Rec)) end, Records), 
+
+    SortedRecords = lists:sort(Records), 
+    ?match(SortedRecords, lists:sort(all_slots(Tab))), 
+    ?match(Keys, lists:sort(all_nexts(Tab))), 
+
+    ?match({'EXIT', _}, mnesia:dirty_first(foo)), 
+    ?match({'EXIT', _}, mnesia:dirty_next(foo, foo)), 
+    ?match({'EXIT', _}, mnesia:dirty_slot(foo, 0)), 
+    ?match({'EXIT', _}, mnesia:dirty_slot(foo, [])), 
+    ?match({atomic, Keys},
+	   mnesia:transaction(fun() -> lists:sort(all_nexts(Tab)) end)),     
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Returns a list of all keys in table
+all_slots(Tab) ->
+    all_slots(Tab, [], 0).
+
+all_slots(_Tab, '$end_of_table', _) ->
+    [];
+all_slots(Tab, PrevRecords, PrevSlot) ->
+    Records = mnesia:dirty_slot(Tab, PrevSlot), 
+    PrevRecords ++ all_slots(Tab, Records, PrevSlot + 1).
+
+%% Returns a list of all keys in table
+
+all_nexts(Tab) ->
+    FirstKey = mnesia:dirty_first(Tab), 
+    all_nexts(Tab, FirstKey).
+
+all_nexts(_Tab, '$end_of_table') ->
+    [];
+all_nexts(Tab, PrevKey) ->
+    Key = mnesia:dirty_next(Tab, PrevKey), 
+    [PrevKey] ++ all_nexts(Tab, Key).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+update_trans(Tab, Key, Acc) ->
+    Update = 
+	fun() -> 
+		Res = (catch mnesia:read({Tab, Key})),
+		case Res of 
+		    [{Tab, Key, Extra, Acc}] ->
+			mnesia:write({Tab,Key,Extra, Acc+1});
+		    Val ->
+			{read, Val, {acc, Acc}}
+		end
+	end,
+    receive 
+	{Pid, quit} -> Pid ! {self(), Acc}
+    after
+	3 -> 
+	    case catch mnesia:sync_dirty(Update) of
+		ok -> 	    
+		    update_trans(Tab, Key, Acc+1);
+		Else -> 
+		    ?error("Dirty Operation failed on ~p (update no ~p) with ~p~n"
+			   "Info w2read ~p w2write ~p w2commit ~p storage ~p ~n", 
+			   [node(), 
+			    Acc,
+			    Else,
+			    mnesia:table_info(Tab, where_to_read),
+			    mnesia:table_info(Tab, where_to_write),
+			    mnesia:table_info(Tab, where_to_commit),
+			    mnesia:table_info(Tab, storage_type)])
+	    end
+    end.
+
+del_table_copy_1(suite) -> [];
+del_table_copy_1(Config) when is_list(Config) ->
+    [_Node1, Node2, _Node3] = Nodes = ?acquire_nodes(3, Config),
+    del_table(Node2, Node2, Nodes). %Called on same Node as deleted
+del_table_copy_2(suite) -> [];
+del_table_copy_2(Config) when is_list(Config) ->
+    [Node1, Node2, _Node3] = Nodes = ?acquire_nodes(3, Config),
+    del_table(Node1, Node2, Nodes). %Called from other Node 
+del_table_copy_3(suite) -> [];
+del_table_copy_3(Config) when is_list(Config) ->
+    [_Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    del_table(Node3, Node2, Nodes). %Called from Node w.o. table
+
+del_table(CallFrom, DelNode, [Node1, Node2, Node3]) ->
+    Tab = schema_ops,
+    Def = [{disc_only_copies, [Node1]}, {ram_copies, [Node2]}, 
+	   {attributes, [key, attr1, attr2]}],
+    ?log("Test case removing table from ~w, with ~w~n", [DelNode, Def]),
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 1000),
+    
+    Pid1 = spawn_link(Node1, ?MODULE, update_trans, [Tab, 1, 0]),
+    Pid2 = spawn_link(Node2, ?MODULE, update_trans, [Tab, 2, 0]),
+    Pid3 = spawn_link(Node3, ?MODULE, update_trans, [Tab, 3, 0]),
+
+
+    dbg:tracer(process, {fun(Msg,_) -> tracer(Msg) end, void}),          
+    %%    dbg:n(Node2),
+    %%    dbg:n(Node3),
+    %% dbg:tp('_', []),     
+    %% dbg:tpl(dets, [timestamp]), 
+    dbg:p(Pid1, [m,c,timestamp]),  
+    
+    ?match({atomic, ok}, 
+	   rpc:call(CallFrom, mnesia, del_table_copy, [Tab, DelNode])),
+
+    Pid1 ! {self(), quit}, R1 = 
+	receive {Pid1, Res1} -> Res1
+	after 
+	    5000 -> io:format("~p~n",[process_info(Pid1)]),error 
+	end,
+    Pid2 ! {self(), quit}, R2 = 
+	receive {Pid2, Res2} -> Res2 
+	after 
+	    5000 -> error 
+	end,
+    Pid3 ! {self(), quit}, R3 = 
+	receive {Pid3, Res3} -> Res3 
+	after 
+	    5000 -> error 
+	end,
+    verify_oids(Tab, Node1, Node2, Node3, R1, R2, R3),
+    ?verify_mnesia([Node1, Node2, Node3], []).
+    
+tracer({trace_ts, _, send, Msg, Pid, {_,S,Ms}}) ->
+    io:format("~p:~p ~p >> ~w ~n",[S,Ms,Pid,Msg]);
+tracer({trace_ts, _, 'receive', Msg, {_,S,Ms}}) ->
+    io:format("~p:~p << ~w ~n",[S,Ms,Msg]);
+
+
+tracer(Msg) ->
+    io:format("UMsg ~p ~n",[Msg]),
+    ok.
+
+
+
+add_table_copy_1(suite) -> [];
+add_table_copy_1(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{ram_copies, [Node1, Node2]}, 
+	   {attributes, [key, attr1, attr2]}], 
+    add_table(Node1, Node3, Nodes, Def).
+%% Not so much diff from 1 but I got a feeling of a bug
+%% should behave exactly the same but just checking the internal ordering 
+add_table_copy_2(suite) -> [];
+add_table_copy_2(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{ram_copies, [Node1, Node2]}, 
+	   {attributes, [key, attr1, attr2]}], 
+    add_table(Node2, Node3, Nodes, Def).
+add_table_copy_3(suite) -> [];
+add_table_copy_3(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{ram_copies, [Node1, Node2]},
+	   {attributes, [key, attr1, attr2]}], 
+    add_table(Node3, Node3, Nodes, Def).
+add_table_copy_4(suite) -> [];
+add_table_copy_4(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{disc_only_copies, [Node1]}, 
+	   {attributes, [key, attr1, attr2]}], 
+    add_table(Node2, Node3, Nodes, Def).
+
+add_table(CallFrom, AddNode, [Node1, Node2, Node3], Def) ->
+    ?log("Test case adding table at ~w, with ~w~n", [AddNode, Def]),
+    Tab = schema_ops,
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 1002),
+    
+    Pid1 = spawn_link(Node1, ?MODULE, update_trans, [Tab, 1, 0]),
+    Pid2 = spawn_link(Node2, ?MODULE, update_trans, [Tab, 2, 0]),
+    Pid3 = spawn_link(Node3, ?MODULE, update_trans, [Tab, 3, 0]),
+    
+    ?match({atomic, ok}, rpc:call(CallFrom, mnesia, add_table_copy, 
+				  [Tab, AddNode, ram_copies])),
+    Pid1 ! {self(), quit}, R1 = receive {Pid1, Res1} -> Res1 after 5000 -> error end,
+    Pid2 ! {self(), quit}, R2 = receive {Pid2, Res2} -> Res2 after 5000 -> error end,
+    Pid3 ! {self(), quit}, R3 = receive {Pid3, Res3} -> Res3 after 5000 -> error end,
+    verify_oids(Tab, Node1, Node2, Node3, R1, R2, R3),
+    ?verify_mnesia([Node1, Node2, Node3], []).
+
+move_table_copy_1(suite) -> [];
+move_table_copy_1(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{ram_copies, [Node1, Node2]},
+	   {attributes, [key, attr1, attr2]}], 
+    move_table(Node1, Node1, Node3, Nodes, Def).
+move_table_copy_2(suite) -> [];
+move_table_copy_2(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{ram_copies, [Node1, Node2]},
+	   {attributes, [key, attr1, attr2]}], 
+    move_table(Node2, Node1, Node3, Nodes, Def).
+move_table_copy_3(suite) -> [];
+move_table_copy_3(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{ram_copies, [Node1, Node2]},
+	   {attributes, [key, attr1, attr2]}], 
+    move_table(Node3, Node1, Node3, Nodes, Def).
+move_table_copy_4(suite) -> [];
+move_table_copy_4(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{ram_copies, [Node1]},
+	   {attributes, [key, attr1, attr2]}], 
+    move_table(Node2, Node1, Node3, Nodes, Def).
+
+move_table(CallFrom, FromNode, ToNode, [Node1, Node2, Node3], Def) ->
+    ?log("Test case move table from ~w to ~w, with ~w~n", [FromNode, ToNode, Def]),
+    Tab = schema_ops,
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 1002),
+    
+    Pid1 = spawn_link(Node1, ?MODULE, update_trans, [Tab, 1, 0]),
+    Pid2 = spawn_link(Node2, ?MODULE, update_trans, [Tab, 2, 0]),
+    Pid3 = spawn_link(Node3, ?MODULE, update_trans, [Tab, 3, 0]),
+    
+    ?match({atomic, ok}, rpc:call(CallFrom, mnesia, move_table_copy, 
+				  [Tab, FromNode, ToNode])),
+    Pid1 ! {self(), quit}, 
+    R1 = receive {Pid1, Res1} -> Res1 after 5000 -> ?error("timeout pid1~n", []) end,
+    Pid2 ! {self(), quit}, 
+    R2 = receive {Pid2, Res2} -> Res2 after 5000 -> ?error("timeout pid2~n", []) end,
+    Pid3 ! {self(), quit}, 
+    R3 = receive {Pid3, Res3} -> Res3 after 5000 -> ?error("timeout pid3~n", []) end,
+    verify_oids(Tab, Node1, Node2, Node3, R1, R2, R3),
+    ?verify_mnesia([Node1, Node2, Node3], []).
+
+% Verify consistency between different nodes
+% Due to limitations in the current dirty_ops this can wrong from time to time!
+verify_oids(Tab, N1, N2, N3, R1, R2, R3) ->
+    io:format("DEBUG 1=>~p 2=>~p 3=>~p~n", [R1,R2,R3]),
+    ?match([{_, _, _, R1}], rpc:call(N1, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{_, _, _, R1}], rpc:call(N2, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{_, _, _, R1}], rpc:call(N3, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{_, _, _, R2}], rpc:call(N1, mnesia, dirty_read, [{Tab, 2}])),
+    ?match([{_, _, _, R2}], rpc:call(N2, mnesia, dirty_read, [{Tab, 2}])),
+    ?match([{_, _, _, R2}], rpc:call(N3, mnesia, dirty_read, [{Tab, 2}])),
+    ?match([{_, _, _, R3}], rpc:call(N1, mnesia, dirty_read, [{Tab, 3}])),
+    ?match([{_, _, _, R3}], rpc:call(N2, mnesia, dirty_read, [{Tab, 3}])),
+    ?match([{_, _, _, R3}], rpc:call(N3, mnesia, dirty_read, [{Tab, 3}])).
+
+insert(_Tab, 0) -> ok;
+insert(Tab, N) when N > 0 ->
+    ok = mnesia:sync_dirty(fun() -> false = mnesia:is_transaction(), mnesia:write({Tab, N, N, 0}) end),
+    insert(Tab, N-1).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/mnesia/test/mnesia_durability_test.erl b/lib/mnesia/test/mnesia_durability_test.erl
new file mode 100644
index 0000000000..55205d1222
--- /dev/null
+++ b/lib/mnesia/test/mnesia_durability_test.erl
@@ -0,0 +1,1447 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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(mnesia_durability_test).
+-author('[email protected]').
+-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+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).
+
+-record(test_rec,{key,val}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+all() -> 
+    [{group, load_tables},
+     {group, durability_of_dump_tables},
+     durability_of_disc_copies,
+     durability_of_disc_only_copies].
+
+groups() -> 
+    [{load_tables, [],
+      [load_latest_data, load_local_contents_directly,
+       load_directly_when_all_are_ram_copiesA,
+       load_directly_when_all_are_ram_copiesB,
+       {group, late_load_when_all_are_ram_copies_on_ram_nodes},
+       load_when_last_replica_becomes_available,
+       load_when_we_have_down_from_all_other_replica_nodes,
+       late_load_transforms_into_disc_load,
+       late_load_leads_to_hanging,
+       force_load_when_nobody_intents_to_load,
+       force_load_when_someone_has_decided_to_load,
+       force_load_when_someone_else_already_has_loaded,
+       force_load_when_we_has_loaded,
+       force_load_on_a_non_local_table,
+       force_load_when_the_table_does_not_exist,
+       {group, load_tables_with_master_tables}]},
+     {late_load_when_all_are_ram_copies_on_ram_nodes, [],
+      [late_load_when_all_are_ram_copies_on_ram_nodes1,
+       late_load_when_all_are_ram_copies_on_ram_nodes2]},
+     {load_tables_with_master_tables, [],
+      [master_nodes, starting_master_nodes,
+       master_on_non_local_tables,
+       remote_force_load_with_local_master_node]},
+     {durability_of_dump_tables, [],
+      [dump_ram_copies, dump_disc_copies, dump_disc_only]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+load_latest_data(doc) ->
+    ["Base functionality, verify that the latest data is loaded"];
+load_latest_data(suite) -> [];
+load_latest_data(Config) when is_list(Config) ->
+    [N1,N2,N3] = Nodes = ?acquire_nodes(3, Config),
+    %%Create a replicated local table
+    ?match({atomic,ok}, mnesia:create_table(t0, [{disc_copies,[N1,N2]}])),
+    ?match({atomic,ok}, mnesia:create_table(t1, [{disc_copies,[N1,N2]}])),
+    ?match({atomic,ok}, mnesia:create_table(t2, [{disc_copies,[N1,N2]}])),
+    ?match({atomic,ok}, mnesia:create_table(t3, [{disc_copies,[N1,N2]}])),
+    ?match({atomic,ok}, mnesia:create_table(t4, [{disc_copies,[N1,N2]}])),
+    ?match({atomic,ok}, mnesia:create_table(t5, [{disc_copies,[N1,N2]}])),
+    Rec1 = {t1, test, ok},
+    Rec2 = {t1, test, 2},
+
+    ?match([], mnesia_test_lib:kill_mnesia([N1])),
+    ?match(ok, rpc:call(N2, mnesia, dirty_write, [Rec2])),
+    ?match([], mnesia_test_lib:kill_mnesia([N2])),
+    ?match([], mnesia_test_lib:kill_mnesia([N3])),
+   
+    ?match([], mnesia_test_lib:start_mnesia([N1], [])),   
+    %% Should wait for N2
+    ?match({timeout, [t1]}, rpc:call(N1, mnesia, wait_for_tables, [[t1], 3000])),
+    ?match([], mnesia_test_lib:start_mnesia([N3], [])),   
+    ?match({timeout, [t1]}, rpc:call(N1, mnesia, wait_for_tables, [[t1], 3000])),
+
+
+    ?match([], mnesia_test_lib:start_mnesia([N2], [])),   
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[t1], 3000])),
+    ?match(ok, rpc:call(N1, mnesia, wait_for_tables, [[t1], 3000])),
+    %% We should find the record
+    ?match([Rec2], rpc:call(N1, mnesia, dirty_read, [t1, test])),
+    ?match([Rec2], rpc:call(N2, mnesia, dirty_read, [t1, test])),
+    
+    %% ok, lets switch order    
+    ?match(ok, mnesia:dirty_delete_object(Rec1)),
+    ?match(ok, mnesia:dirty_delete_object(Rec2)),
+    %% redo
+
+    ?match([], mnesia_test_lib:kill_mnesia([N2])),
+    ?match(ok, mnesia:dirty_write(Rec1)),
+    ?match([], mnesia_test_lib:kill_mnesia([N1])),
+    ?match([], mnesia_test_lib:kill_mnesia([N3])),
+
+    ?match([], mnesia_test_lib:start_mnesia([N2], [])),   
+    %% Should wait for N1
+    ?match({timeout, [t1]}, rpc:call(N2, mnesia, wait_for_tables, [[t1], 2000])),
+    ?match([], mnesia_test_lib:start_mnesia([N3], [])),   
+    ?match({timeout, [t1]}, rpc:call(N2, mnesia, wait_for_tables, [[t1], 2000])),
+    ?match([], mnesia_test_lib:start_mnesia([N1], [])),
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[t1], 1000])),
+    ?match(ok, rpc:call(N1, mnesia, wait_for_tables, [[t1], 1000])),
+    %% We should find the record
+    ?match([Rec1], rpc:call(N1, mnesia, dirty_read, [t1, test])),
+    ?match([Rec1], rpc:call(N2, mnesia, dirty_read, [t1, test])),
+    
+    ?verify_mnesia(Nodes, []).
+
+
+load_local_contents_directly(doc) ->
+    ["Local contents shall always be loaded. Check this by having a local ",
+     "table on two nodes N1, N2, stopping N1 before N2, an then verifying ",
+     "that N1 can start without N2 being started."];
+load_local_contents_directly(suite) -> [];
+load_local_contents_directly(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    %%Create a replicated local table
+    ?match({atomic,ok},
+           mnesia:create_table(test_rec,
+                               [{local_content,true},
+                                {disc_copies,Nodes},
+                                {attributes,record_info(fields,test_rec)}]
+                              ) ),
+    %%Verify that it has local contents.
+    ?match( true, mnesia:table_info(test_rec,local_content) ),
+    %%Helper Funs
+    Write_one = fun(Value) -> mnesia:write(#test_rec{key=1,val=Value}) end,
+    Read_one  = fun(Key)   -> mnesia:read( {test_rec, Key}) end,
+    %%Write a value one N1 that we may test against later
+    ?match({atomic,ok},
+           rpc:call( N1, mnesia, transaction, [Write_one,[11]] ) ),
+    %%Stop Mnesia on N1
+    %?match([], mnesia_test_lib:stop_mnesia([N1])),
+    ?match([], mnesia_test_lib:kill_mnesia([N1])),
+
+    %%Write a value on N2, same key but a different value
+    ?match({atomic,ok},
+           rpc:call( N2, mnesia, transaction, [Write_one,[22]] ) ),
+    %%Stop Mnesia on N2
+    %?match([], mnesia_test_lib:stop_mnesia([N2])),
+    ?match([], mnesia_test_lib:kill_mnesia([N2])),
+
+    %%Restart Mnesia on N1 verify that we can read from it without
+    %%starting Mnesia on N2.
+    ?match(ok, rpc:call(N1, mnesia, start, [])),
+    ?match(ok, rpc:call(N1, mnesia, wait_for_tables, [[test_rec], 30000])),
+    %%Read back the value
+    ?match( {atomic,[#test_rec{key=1,val=11}]},
+           rpc:call(N1, mnesia, transaction, [Read_one,[1]] ) ),
+    %%Restart Mnesia on N2 and verify the contents there.
+    ?match(ok, rpc:call(N2, mnesia, start, [])),
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[test_rec], 30000])),
+    ?match( {atomic,[#test_rec{key=1,val=22}]},
+           rpc:call(N2, mnesia, transaction, [Read_one,[1]] ) ),
+    %%Check that the start of Mnesai on N2 did not affect the contents on N1
+    ?match( {atomic,[#test_rec{key=1,val=11}]},
+           rpc:call(N1, mnesia, transaction, [Read_one,[1]] ) ),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+load_directly_when_all_are_ram_copiesA(doc) ->
+    ["Tables that are RAM copies only shall also be loaded directly. ",
+     "1. N1 and N2 has RAM copies of a table, stop N1 before N2. ",
+     "2. When N1 starts he shall have access to the table ",
+     "   without having to start N2" ];
+load_directly_when_all_are_ram_copiesA(suite) -> [];
+load_directly_when_all_are_ram_copiesA(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    
+    ?match({atomic,ok},
+           mnesia:create_table(test_rec,
+                               [{ram_copies,Nodes},
+                                {attributes,record_info(fields,test_rec)}]
+                              ) ),
+    ?match( Nodes, mnesia:table_info(test_rec,ram_copies) ),
+    ?match( [], mnesia:table_info(test_rec,disc_copies) ),
+    ?match( [], mnesia:table_info(test_rec,disc_only_copies) ),
+    Write_one = fun(Value) -> mnesia:write(#test_rec{key=2,val=Value}) end,
+    Read_one  = fun()      -> mnesia:read({test_rec,2}) end,
+    %%Write a value one N1 that we may test against later
+    ?match({atomic,ok},
+           rpc:call( N1, mnesia, transaction, [Write_one,[11]] ) ),
+    %%Stop Mnesia on N1
+    ?match([], mnesia_test_lib:kill_mnesia([N1])),
+    %%Write a value and check result (on N2; not possible on N1
+    %%since Mnesia is stopped there).
+    ?match({atomic,ok}, rpc:call(N2,mnesia,transaction,[Write_one,[22]]) ),
+    ?match({atomic,[#test_rec{key=2,val=22}]},
+           rpc:call(N2,mnesia,transaction,[Read_one]) ),
+    %%Stop Mnesia on N2
+    ?match([], mnesia_test_lib:kill_mnesia([N2])),
+    %%Restart Mnesia on N1 verify that we can access test_rec from
+    %%N1 without starting Mnesia on N2.
+    ?match(ok, rpc:call(N1, mnesia, start, [])),
+    ?match(ok, rpc:call(N1, mnesia, wait_for_tables, [[test_rec], 30000])),
+    ?match({atomic,[]}, rpc:call(N1,mnesia,transaction,[Read_one])),
+    ?match({atomic,ok}, rpc:call(N1,mnesia,transaction,[Write_one,[33]])),
+    ?match({atomic,[#test_rec{key=2,val=33}]},
+           rpc:call(N1,mnesia,transaction,[Read_one])),
+    %%Restart Mnesia on N2 and verify the contents there.
+    ?match([], mnesia_test_lib:start_mnesia([N2], [test_rec])),
+    ?match( {atomic,[#test_rec{key=2,val=33}]},
+           rpc:call(N2, mnesia, transaction, [Read_one] ) ),
+    %%Check that the start of Mnesai on N2 did not affect the contents on N1
+    ?match( {atomic,[#test_rec{key=2,val=33}]},
+           rpc:call(N1, mnesia, transaction, [Read_one] ) ),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+load_directly_when_all_are_ram_copiesB(doc) ->
+    ["Tables that are RAM copies only shall be loaded from a replicat ",
+     "when possible. ",
+     "1. N1 and N2 has RAM copies of a table, stop N1 before N2.",
+     "2. Now start N2 first and then N1, N1 shall then load the table ",
+     "   from N2."];
+load_directly_when_all_are_ram_copiesB(suite) -> [];
+load_directly_when_all_are_ram_copiesB(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    ?match({atomic,ok},
+           mnesia:create_table(test_rec,
+                               [{ram_copies,Nodes},
+                                {attributes,record_info(fields,test_rec)}]
+                              ) ),
+    ?match( Nodes, mnesia:table_info(test_rec,ram_copies) ),
+    ?match( [], mnesia:table_info(test_rec,disc_copies) ),
+    ?match( [], mnesia:table_info(test_rec,disc_only_copies) ),
+    Write_one = fun(Value) -> mnesia:write(#test_rec{key=3,val=Value}) end,
+    Read_one  = fun()      -> mnesia:read( {test_rec, 3}) end,
+    %%Write a value one N1 that we may test against later
+    ?match({atomic,ok},
+           rpc:call( N1, mnesia, transaction, [Write_one,[11]] ) ),
+    ?match({atomic,[#test_rec{key=3,val=11}]},
+           rpc:call(N2,mnesia,transaction,[Read_one]) ),
+    %%Stop Mnesia on N1
+    ?match([], mnesia_test_lib:kill_mnesia([N1])),
+    %%Write a value and check result (on N2; not possible on N1
+    %%since Mnesia is stopped there).
+    ?match({atomic,ok}, rpc:call(N2,mnesia,transaction,[Write_one,[22]]) ),
+    ?match({atomic,[#test_rec{key=3,val=22}]},
+           rpc:call(N2,mnesia,transaction,[Read_one]) ),
+    %%Stop Mnesia on N2
+    ?match([], mnesia_test_lib:kill_mnesia([N2])),
+    %%Restart Mnesia on N2 verify that we can access test_rec from
+    %%N2 without starting Mnesia on N1.
+    ?match(ok, rpc:call(N2, mnesia, start, [])),
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[test_rec], 30000])),
+    ?match({atomic,[]}, rpc:call(N2,mnesia,transaction,[Read_one])),
+    ?match({atomic,ok}, rpc:call(N2,mnesia,transaction,[Write_one,[33]])),
+    ?match({atomic,[#test_rec{key=3,val=33}]},
+           rpc:call(N2,mnesia,transaction,[Read_one])),
+    %%Restart Mnesia on N1 and verify the contents there.
+    ?match([], mnesia_test_lib:start_mnesia([N1], [test_rec])),
+    ?match( {atomic,[#test_rec{key=3,val=33}]},
+           rpc:call(N1,mnesia,transaction,[Read_one])),
+    %%Check that the start of Mnesai on N1 did not affect the contents on N2
+    ?match( {atomic,[#test_rec{key=3,val=33}]},
+           rpc:call(N2,mnesia,transaction,[Read_one])),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+late_load_when_all_are_ram_copies_on_ram_nodes1(suite) -> [];
+late_load_when_all_are_ram_copies_on_ram_nodes1(Config) when is_list(Config) ->
+    [N1, N2] = mnesia_test_lib:prepare_test_case([{init_test_case, [mnesia]},
+						  delete_schema,
+						  {reload_appls, [mnesia]}],
+						 2, Config, ?FILE, ?LINE),
+    Res = late_load_when_all_are_ram_copies_on_ram_nodes(N1, [N2], Config),
+    mnesia_test_lib:prepare_test_case([{reload_appls, [mnesia]}],
+				      2, Config, ?FILE, ?LINE),
+    Res.
+
+late_load_when_all_are_ram_copies_on_ram_nodes2(suite) -> [];
+late_load_when_all_are_ram_copies_on_ram_nodes2(Config) when is_list(Config) ->
+    [N1, N2, N3] = mnesia_test_lib:prepare_test_case([{init_test_case, [mnesia]},
+						      delete_schema,
+						      {reload_appls, [mnesia]}],
+						     3, Config, ?FILE, ?LINE),
+    Res = late_load_when_all_are_ram_copies_on_ram_nodes(N1, [N2, N3], Config),
+    mnesia_test_lib:prepare_test_case([{reload_appls, [mnesia]}],
+				      3, Config, ?FILE, ?LINE),
+    Res.
+
+late_load_when_all_are_ram_copies_on_ram_nodes(DiscNode, RamNs, _Config)
+        when DiscNode == node() ->
+    ?match(ok, mnesia:create_schema([DiscNode])),
+    ?match(ok, mnesia:start()),
+    Nodes = [DiscNode | RamNs],
+    Extra = [{extra_db_nodes, Nodes}],
+    Ok = [ok || _ <- RamNs],
+    ?match({Ok, []}, rpc:multicall(RamNs, mnesia, start, [Extra])),
+    ?match([], wait_until_running(Nodes)),
+
+    LastRam = lists:last(RamNs),
+    %% ?match({atomic, ok},
+    %%	   mnesia:add_table_copy(schema, LastRam, ram_copies)),
+    Def = [{ram_copies, RamNs}, {attributes, record_info(fields, test_rec)}],
+    ?match({atomic,ok}, mnesia:create_table(test_rec, Def)),
+    ?verify_mnesia(Nodes, []),
+    ?match([], mnesia_test_lib:stop_mnesia(RamNs)),
+    ?match(stopped, mnesia:stop()),
+    ?match(ok, mnesia:start()),
+
+    Rec1 = #test_rec{key=3, val=33},
+    Rec2 = #test_rec{key=4, val=44},
+    
+    FirstRam = hd(RamNs),
+    ?match(ok, rpc:call(FirstRam, mnesia, start, [Extra])),
+    ?match(ok, rpc:call(FirstRam, mnesia, wait_for_tables,
+			[[test_rec], 30000])),
+    ?match(ok, rpc:call(FirstRam, mnesia, dirty_write,[Rec1])),
+    ?match(ok, mnesia:wait_for_tables([test_rec], 30000)),
+    mnesia:dirty_write(Rec2),
+
+    if
+	FirstRam /= LastRam ->
+	    ?match(ok, rpc:call(LastRam, mnesia, start, [Extra])),
+	    ?match(ok, rpc:call(LastRam, mnesia, wait_for_tables,
+				[[test_rec], 30000]));
+	true ->
+	    ignore
+    end,
+    ?match([Rec1], rpc:call(LastRam, mnesia, dirty_read, [{test_rec, 3}])),
+    ?match([Rec2], rpc:call(LastRam, mnesia, dirty_read, [{test_rec, 4}])),
+    ?verify_mnesia(Nodes, []).
+
+wait_until_running(Nodes) ->
+    wait_until_running(Nodes, 30).
+
+wait_until_running(Nodes, Times) when Times > 0->
+    Alive = mnesia:system_info(running_db_nodes),
+    case Nodes -- Alive of
+	[] ->
+	    [];
+	Remaining ->
+	    timer:sleep(timer:seconds(1)),
+	    wait_until_running(Remaining, Times - 1)
+    end;
+wait_until_running(Nodes, _) ->
+    Nodes.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+load_when_last_replica_becomes_available(doc) ->
+    ["Check that when all Mnesia nodes die at the same instant, then the ",
+     "replicated table shall be accessible when the last node is started ",
+     "again.",
+     "Checked by cheating. Start Mnesia on N1, N2, N3. Have a table ",
+     "replicated on disc on all three nodes, fill in some transactions, ",
+     "install a fallback. Restart mnesia on all nodes"
+     "This is the cheat and it simulates that all nodes died at the same ",
+     "time. Check that the table is only accessible after the last node ",
+     "has come up."];
+load_when_last_replica_becomes_available(suite) -> [];
+load_when_last_replica_becomes_available(Config) when is_list(Config) ->
+    [N1, N2, N3] = Nodes = ?acquire_nodes(3, Config),
+    ?match({atomic,ok},
+           mnesia:create_table(test_rec,
+                               [{disc_copies,Nodes},
+                                {attributes,record_info(fields,test_rec)}]
+                              ) ),
+    ?match( [], mnesia:table_info(test_rec,ram_copies) ),
+    ?match( Nodes, mnesia:table_info(test_rec,disc_copies) ),
+    ?match( [], mnesia:table_info(test_rec,disc_only_copies) ),
+    Write_one = fun(Key,Val)->mnesia:write(#test_rec{key=Key,val=Val}) end,
+    Read_one  = fun(Key)    ->mnesia:read( {test_rec, Key}) end,
+    %%Write one value from each node.
+    ?match({atomic,ok},rpc:call(N1,mnesia,transaction,[Write_one,[1,11]])),
+    ?match({atomic,ok},rpc:call(N2,mnesia,transaction,[Write_one,[2,22]])),
+    ?match({atomic,ok},rpc:call(N3,mnesia,transaction,[Write_one,[3,33]])),
+    %%Check the values
+    ?match({atomic,[#test_rec{key=1,val=11}]},
+           rpc:call(N2,mnesia,transaction,[Read_one,[1]]) ),
+    ?match({atomic,[#test_rec{key=2,val=22}]},
+           rpc:call(N3,mnesia,transaction,[Read_one,[2]]) ),
+    ?match({atomic,[#test_rec{key=3,val=33}]},
+           rpc:call(N1,mnesia,transaction,[Read_one,[3]]) ),
+    
+    ?match(ok, mnesia:backup("test_last_replica")),
+    ?match(ok, mnesia:install_fallback("test_last_replica")),
+    file:delete("test_last_replica"),
+    %%Stop Mnesia on all three nodes   
+    ?match([], mnesia_test_lib:kill_mnesia(Nodes)),
+
+    %%Start Mnesia on one node, make sure that test_rec is not available
+    ?match(ok, rpc:call(N2, mnesia, start, [])),
+    ?match({timeout,[test_rec]},
+           rpc:call(N2, mnesia, wait_for_tables, [[test_rec], 10000])),
+    ?match(ok, rpc:call(N1, mnesia, start, [])),
+    ?match({timeout,[test_rec]},
+           rpc:call(N1, mnesia, wait_for_tables, [[test_rec], 10000])),
+    %%Start the third node
+    ?match(ok, rpc:call(N3, mnesia, start, [])),
+    %%Make sure that the table is loaded everywhere
+    ?match(ok, rpc:call(N3, mnesia, wait_for_tables, [[test_rec], 30000])),
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[test_rec], 30000])),
+    ?match(ok, rpc:call(N1, mnesia, wait_for_tables, [[test_rec], 30000])),
+
+    %%Check the values
+    ?match({atomic,[#test_rec{key=1,val=11}]},
+           rpc:call(N2,mnesia,transaction,[Read_one,[1]]) ),
+    ?match({atomic,[#test_rec{key=2,val=22}]},
+           rpc:call(N3,mnesia,transaction,[Read_one,[2]]) ),
+    ?match({atomic,[#test_rec{key=3,val=33}]},
+           rpc:call(N1,mnesia,transaction,[Read_one,[3]]) ),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+load_when_we_have_down_from_all_other_replica_nodes(doc) ->
+    ["The table can be loaded if this node was the last one surviving. ",
+     "Check this by having N1, N2, N3 and a table replicated on all those ",
+     "nodes. Then kill them in the N1, N2, N3 order. Then start N3 and ",
+     "verify that the table is available with correct contents."];
+load_when_we_have_down_from_all_other_replica_nodes(suite) -> [];
+load_when_we_have_down_from_all_other_replica_nodes(Config) when is_list(Config) ->
+    [N1, N2, N3] = Nodes = ?acquire_nodes(3, Config),
+    ?match({atomic,ok},
+           mnesia:create_table(test_rec,
+                               [{disc_copies,Nodes},
+                                {attributes,record_info(fields,test_rec)}]
+                              ) ),
+    ?match( [], mnesia:table_info(test_rec,ram_copies) ),
+    ?match( Nodes, mnesia:table_info(test_rec,disc_copies) ),
+    ?match( [], mnesia:table_info(test_rec,disc_only_copies) ),
+    Write_one = fun(Key,Val)->mnesia:write(#test_rec{key=Key,val=Val}) end,
+    Read_one  = fun(Key)    ->mnesia:read( {test_rec, Key}) end,
+    %%Write one value from each node.
+    ?match({atomic,ok},rpc:call(N1,mnesia,transaction,[Write_one,[1,111]])),
+    ?match({atomic,ok},rpc:call(N2,mnesia,transaction,[Write_one,[2,222]])),
+    ?match({atomic,ok},rpc:call(N3,mnesia,transaction,[Write_one,[3,333]])),
+    %%Check the values
+    ?match({atomic,[#test_rec{key=1,val=111}]},
+           rpc:call(N2,mnesia,transaction,[Read_one,[1]]) ),
+    ?match({atomic,[#test_rec{key=2,val=222}]},
+           rpc:call(N3,mnesia,transaction,[Read_one,[2]]) ),
+    ?match({atomic,[#test_rec{key=3,val=333}]},
+           rpc:call(N1,mnesia,transaction,[Read_one,[3]]) ),
+    %%Stop Mnesia on all three nodes
+    ?match([], mnesia_test_lib:kill_mnesia([N1])),
+    ?match({atomic,ok},rpc:call(N2,mnesia,transaction,[Write_one,[22,22]])),
+    ?match([], mnesia_test_lib:kill_mnesia([N2])),
+    ?match({atomic,ok},rpc:call(N3,mnesia,transaction,[Write_one,[33,33]])),
+    ?match([], mnesia_test_lib:kill_mnesia([N3])),
+    ?verbose("Mnesia stoped on all three nodes.~n",[]),
+
+    %%Start Mnesia on N3; wait for 'test_rec' table to load
+    ?match(ok, rpc:call(N3, mnesia, start, [])),
+    ?match(ok, rpc:call(N3, mnesia, wait_for_tables, [[test_rec], 30000])),
+
+    %%Check the values
+    ?match({atomic,[#test_rec{key=1,val=111}]},
+           rpc:call(N3,mnesia,transaction,[Read_one,[1]]) ),
+    ?match({atomic,[#test_rec{key=2,val=222}]},
+           rpc:call(N3,mnesia,transaction,[Read_one,[2]]) ),
+    ?match({atomic,[#test_rec{key=3,val=333}]},
+           rpc:call(N3,mnesia,transaction,[Read_one,[3]]) ),
+    ?match({atomic,[#test_rec{key=22,val=22}]},
+           rpc:call(N3,mnesia,transaction,[Read_one,[22]]) ),
+    ?match({atomic,[#test_rec{key=33,val=33}]},
+           rpc:call(N3,mnesia,transaction,[Read_one,[33]]) ),
+    ?verify_mnesia([N3], [N1, N2]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+late_load_transforms_into_disc_load(doc) ->
+    ["Difficult case that needs instrumentation of Mnesia.",
+     "A table is force loaded, and Mnesia decides to load it from another ",
+     "Mnesia node because it is avaliable there. The other Mnesia node then ",
+     "dies in mid copy which shall make the first Mnesia node to really ",
+     "force load from disc.",
+     "Check this by starting N1 and N2 and replicating a table between ",
+     "them. Then kill N1 before N2. The idea is to start N2 first, then ",
+     "N1 and then do a force load on N1. This force load will load from ",
+     "N2 BUT N2 must be killed after the decision to load from it has ",
+     "been made. tricky."];
+
+late_load_transforms_into_disc_load(suite) ->  [];
+late_load_transforms_into_disc_load(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    
+    {success, [A, B]} = ?start_activities(Nodes),
+    
+    ?match(Node1, node(A)),
+    ?match(Node2, node(B)),
+
+    Tab = late_load_table,
+    Def = [{attributes, [key, value]},
+           {disc_copies, Nodes}],  
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    ?match(ok, mnesia:dirty_write({Tab, 111, 4711})),
+    ?match(ok, mnesia:dirty_write({Tab, 222, 42})),
+
+    TestPid = self(),
+    DebugId = {mnesia_loader, do_get_network_copy},
+    DebugFun = fun(PrevContext, EvalContext) ->
+		       ?verbose("interrupt late load,  pid ~p  #~p ~n context ~p ~n",
+			    [self(),PrevContext,EvalContext]),
+		       
+		       mnesia_test_lib:kill_mnesia([Node2]),
+		       TestPid ! {self(),debug_fun_was_called},
+
+		       ?verbose("interrupt late_log - continues ~n",[]),
+		       ?deactivate_debug_fun(DebugId),
+		       PrevContext+1
+	       end,
+    ?remote_activate_debug_fun(Node1,DebugId, DebugFun, 1),
+    
+    %% kill mnesia on node1
+    mnesia_test_lib:kill_mnesia([Node1]),    
+    %% wait a while, so  that mnesia is really down 
+    timer:sleep(timer:seconds(1)), 
+
+    ?match(ok, rpc:call(Node2, mnesia, dirty_write, [{Tab, 222, 815}])),
+
+    %% start Mnesia on node1
+    ?match(ok,mnesia:start()),
+    ?match(yes, mnesia:force_load_table(Tab)),
+    ?match(ok, mnesia:wait_for_tables([Tab],timer:seconds(30))),
+    
+    receive_messages([debug_fun_was_called]),
+    
+    check_tables([A],[{Tab,111},{Tab,222}],[[{Tab,111,4711}],[{Tab,222,42}]]),
+    ?verify_mnesia([Node1], [Node2]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+late_load_leads_to_hanging(doc) ->
+    ["Difficult case that needs instrumentation of Mnesia.",
+     "A table is loaded, and Mnesia decides to load it from another ",
+     "Mnesia node because it has the latest copy there. ",
+     "The other Mnesia node then ",
+     "dies in mid copy which shall make the first Mnesia node not to ",
+     "force load from disc but to wait for the other node to come up again",
+     "Check this by starting N1 and N2 and replicating a table between ",
+     "them. Then kill N1 before N2. The idea is to start N2 first, then ",
+     "N1. This load will load from ",
+     "N2 BUT N2 must be killed after the decision to load from it has ",
+     "been made. tricky."];
+
+late_load_leads_to_hanging(suite) ->  [];
+late_load_leads_to_hanging(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    
+    Tab = late_load_table,
+    Def = [{attributes, [key, value]},
+           {disc_copies, Nodes}],  
+
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    ?match(ok, mnesia:dirty_write({Tab, 111, 4711})),
+    ?match(ok, mnesia:dirty_write({Tab, 222, 42})),
+
+    DebugId = {mnesia_loader, do_get_network_copy},
+    DebugFun = fun(PrevContext, EvalContext) ->
+		       ?verbose("interrupt late load,  pid ~p  #~p ~n context ~p ~n",
+			    [self(), PrevContext, EvalContext]),
+		       mnesia_test_lib:kill_mnesia([Node2]),
+		       ?verbose("interrupt late load - continues ~n",[]),
+		       ?deactivate_debug_fun(DebugId),
+		       PrevContext+1
+	       end,
+
+    ?remote_activate_debug_fun(Node1,DebugId, DebugFun, 1),
+    mnesia_test_lib:kill_mnesia([Node1]),
+    %% wait a while, so  that mnesia is really down 
+    timer:sleep(timer:seconds(1)), 
+    
+    ?match(ok, rpc:call(Node2, mnesia, dirty_write, [{Tab, 333, 666}])),
+    
+    %% start Mnesia on node1
+    ?match(ok, mnesia:start()),
+
+    ?match({timeout, [Tab]}, mnesia:wait_for_tables([Tab], timer:seconds(2))),
+
+    ?match({'EXIT', {aborted, _}}, mnesia:dirty_read({Tab, 222})),    
+    %% mnesia on node1 is waiting for node2 coming up 
+    
+    ?match(ok, rpc:call(Node2, mnesia, start, [])),
+    ?match(ok, mnesia:wait_for_tables([Tab], timer:seconds(30))),
+    ?match([{Tab, 333, 666}], mnesia:dirty_read({Tab, 333})),   
+    ?verify_mnesia([Node2, Node1], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+force_load_when_nobody_intents_to_load(doc) ->
+    ["Normal force load. Start N1 N2, kill in N1, N2 order. Start N1 do ",
+     "force load. Did it work?"];
+force_load_when_nobody_intents_to_load(suite) -> [];
+force_load_when_nobody_intents_to_load(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    Table = test_rec,
+    Trec1a = #test_rec{key=1,val=111},
+    Trec1b = #test_rec{key=1,val=333},
+    Trec2a = #test_rec{key=2,val=222},
+    Trec3a = #test_rec{key=3,val=333},
+    Trec3b = #test_rec{key=3,val=666},
+
+    ?match({atomic,ok}, rpc:call(N1, mnesia,create_table,
+                                 [Table,
+                                  [{disc_copies,Nodes},
+                                   {attributes,record_info(fields,test_rec)}
+                                  ] ] ) ),
+    ?match( [], mnesia:table_info(Table,ram_copies) ),
+    ?match( Nodes, mnesia:table_info(Table,disc_copies) ),
+    ?match( [], mnesia:table_info(Table,disc_only_copies) ),
+    Write_one = fun(Rec) -> mnesia:write(Rec) end,
+    Read_one  = fun(Key) -> mnesia:read({Table, Key}) end,
+    %%Write one value
+    ?match({atomic,ok},rpc:call(N1,mnesia,transaction,[Write_one,[Trec1a]])),
+    %%Check it
+    ?match({atomic,[Trec1a]},rpc:call(N2,mnesia,transaction,[Read_one,[1]]) ),
+    %%Shut down mnesia on N1
+    ?match([], mnesia_test_lib:stop_mnesia([N1])),
+    %%Write and check value while N1 is down
+    ?match({atomic,ok},rpc:call(N2,mnesia,transaction,[Write_one,[Trec1b]])),
+    ?match({atomic,ok},rpc:call(N2,mnesia,transaction,[Write_one,[Trec2a]])),
+    ?match({atomic,ok},rpc:call(N2,mnesia,transaction,[Write_one,[Trec3a]])),
+    ?match({aborted,{node_not_running,N1}},
+           rpc:call(N1,mnesia,transaction,[Read_one,[2]]) ),
+    ?match({atomic,[Trec1b]},rpc:call(N2,mnesia,transaction,[Read_one,[1]]) ),
+    ?match({atomic,[Trec2a]},rpc:call(N2,mnesia,transaction,[Read_one,[2]]) ),
+    ?match({atomic,[Trec3a]},rpc:call(N2,mnesia,transaction,[Read_one,[3]]) ),
+    %%Shut down Mnesia on N2
+    ?match([], mnesia_test_lib:stop_mnesia([N2])),
+
+    %%Restart Mnesia on N1
+    ?match(ok, rpc:call(N1, mnesia, start, [])),
+    %%Check that table is not available (waiting for N2)
+    ?match({timeout,[Table]},
+           rpc:call(N1, mnesia, wait_for_tables, [[Table], 3000])),
+
+    %%Force load on N1
+    ?match(yes,rpc:call(N1,mnesia,force_load_table,[Table])),
+    %%Check values
+    ?match({atomic,[Trec1a]},rpc:call(N1,mnesia,transaction,[Read_one,[1]]) ),
+    ?match({atomic,[]},     rpc:call(N1,mnesia,transaction,[Read_one,[2]]) ),
+    ?match({atomic,[]},     rpc:call(N1,mnesia,transaction,[Read_one,[3]]) ),
+    %%Write a value for key=3
+    ?match({atomic,ok},rpc:call(N1,mnesia,transaction,[Write_one,[Trec3b]])),
+
+    %%Restart N2 and check values
+    ?match(ok, rpc:call(N2, mnesia, start, [])),
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[Table], 30000])),
+
+    ?match({atomic,[Trec1a]},rpc:call(N1,mnesia,transaction,[Read_one,[1]]) ),
+    ?match({atomic,[Trec1a]},rpc:call(N2,mnesia,transaction,[Read_one,[1]]) ),
+
+    ?match({atomic,[]},rpc:call(N1,mnesia,transaction,[Read_one,[2]]) ),
+    ?match({atomic,[]},rpc:call(N2,mnesia,transaction,[Read_one,[2]]) ),
+
+    ?match({atomic,[Trec3b]},rpc:call(N1,mnesia,transaction,[Read_one,[3]]) ),
+    ?match({atomic,[Trec3b]},rpc:call(N2,mnesia,transaction,[Read_one,[3]]) ),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+force_load_when_someone_has_decided_to_load(doc) ->
+    ["Difficult case that needs instrumentation of Mnesia.",
+     "Start N1 and N2, replicate table, kill in N1, N2 order. Start N2 ",
+     "and start N1 before N2 has really loaded the table but after N2 has ",
+     "decided to load it."];
+
+force_load_when_someone_has_decided_to_load(suite) -> [];
+force_load_when_someone_has_decided_to_load(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),   
+    {success, [A, B]} = ?start_activities(Nodes),        
+    ?match(Node1, node(A)), %% Just to check :)
+    ?match(Node2, node(B)),
+
+    Tab = late_load_table,
+    Def = [{attributes, [key, value]}, {disc_copies, Nodes}],  
+
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    ?match(ok, mnesia:dirty_write({Tab, 111, 4711})),
+    ?match(ok, mnesia:dirty_write({Tab, 222, 42})),
+
+    Self = self(),
+    DebugId = {mnesia_controller, late_disc_load},
+    DebugFun = fun(PrevContext, EvalContext) ->
+		       ?verbose("interrupt late disc load,
+                             pid ~p  #~p ~n context ~p ~n",
+			    [self(),PrevContext,EvalContext]),
+		       Self ! {self(), fun_in_postion},
+		       wait_for_signal(),
+		       ?verbose("interrupt late disc load - continues ~n",[]),
+		       ?deactivate_debug_fun(DebugId),
+		       PrevContext+1
+	       end,
+ 
+    %% kill mnesia on node1
+    mnesia_test_lib:kill_mnesia([Node1]),
+    %% wait a while, so  that mnesia is really down 
+    timer:sleep(timer:seconds(1)), 
+
+    ?match(ok, rpc:call(Node2, mnesia, dirty_write, [{Tab, 222, 815}])),
+    %% kill mnesia on node2
+    mnesia_test_lib:kill_mnesia([Node2]),
+    %% wait a while, so that mnesia is really down 
+    timer:sleep(timer:seconds(1)), 
+
+    ?remote_activate_debug_fun(Node2,DebugId, DebugFun, 1),
+
+    B ! fun() -> mnesia:start() end,    
+    [{Mnesia_Pid, fun_in_postion}] = receive_messages([fun_in_postion]),    
+    
+    %% start Mnesia on node1
+    A ! fun() -> mnesia:start() end, 
+    ?match_receive(timeout),
+% Got some problem with this testcase when we modified mnesia init 
+% These test cases are very implementation dependent!
+%    A ! fun() -> mnesia:wait_for_tables([Tab], 3000) end,
+%    ?match_receive({A, {timeout, [Tab]}}),
+    A ! fun() -> mnesia:force_load_table(Tab) end,
+    ?match_receive(timeout),
+
+    Mnesia_Pid ! continue,
+    ?match_receive({B, ok}),
+    ?match_receive({A, ok}),
+    ?match_receive({A, yes}),
+
+    B ! fun() -> mnesia:wait_for_tables([Tab], 10000) end,
+    ?match_receive({B, ok}),
+    ?match(ok, mnesia:wait_for_tables([Tab], timer:seconds(30))),
+    ?match([{Tab, 222, 815}], mnesia:dirty_read({Tab, 222})),
+    ?verify_mnesia(Nodes, []).
+
+wait_for_signal() ->
+    receive 
+	continue -> ok
+    %% Don't eat any other mnesia internal msg's
+    after 
+	timer:minutes(2) -> ?error("Timedout in wait_for_signal~n", [])
+    end.
+	
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+force_load_when_someone_else_already_has_loaded(doc) ->
+    ["Normal case. Do a force load when somebody else has loaded the table. ",
+     "Start N1, N2, kill in N1, N2 order. Start N2 load the table, start N1 ",
+     "force load. Did it work? (i.e: did N1 load the table from N2 as that",
+     "one is the latest version and it is available on N2)"];
+
+force_load_when_someone_else_already_has_loaded(suite) -> [];
+force_load_when_someone_else_already_has_loaded(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    Table = test_rec,
+    Trec1 = #test_rec{key=1,val=111},
+    Trec2 = #test_rec{key=1,val=222},
+
+    ?match({atomic,ok}, rpc:call(N1, mnesia,create_table,
+                                 [Table,
+                                  [{disc_copies,Nodes},
+                                   {attributes,record_info(fields,test_rec)}
+                                  ] ] ) ),
+    ?match( [], mnesia:table_info(Table,ram_copies) ),
+    ?match( Nodes, mnesia:table_info(Table,disc_copies) ),
+    ?match( [], mnesia:table_info(Table,disc_only_copies) ),
+    Write_one = fun(Rec) -> mnesia:write(Rec) end,
+    Read_one  = fun(Key) -> mnesia:read({Table, Key}) end,
+    %%Write one value
+    ?match({atomic,ok},rpc:call(N1,mnesia,transaction,[Write_one,[Trec1]])),
+    %%Check it
+    ?match({atomic,[Trec1]},rpc:call(N2,mnesia,transaction,[Read_one,[1]]) ),
+    %%Shut down mnesia
+    ?match([], mnesia_test_lib:stop_mnesia([N1])),
+    timer:sleep(500),
+    ?match([], mnesia_test_lib:stop_mnesia([N2])),
+    %%Restart Mnesia on N2;wait for tables to load
+    ?match(ok, rpc:call(N2, mnesia, start, [])),
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [[test_rec], 30000])),
+    %%Write one value
+    ?match({atomic,ok},rpc:call(N2,mnesia,transaction,[Write_one,[Trec2]])),
+    %%Start on N1; force load
+    ?match(ok, rpc:call(N1, mnesia, start, [])),
+    %%Force load from file
+    ?match(yes, rpc:call(N1,mnesia,force_load_table,[Table])),
+    %%Check the value
+    ?match({atomic,[Trec2]},rpc:call(N1,mnesia,transaction,[Read_one,[1]]) ),
+       %%               === there must be a Trec2 here !!!!
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+force_load_when_we_has_loaded(doc) ->
+    ["Force load a table we already have loaded"];
+force_load_when_we_has_loaded(suite) -> [];
+force_load_when_we_has_loaded(Config) when is_list(Config) ->
+    [N1] = Nodes = ?acquire_nodes(1, Config),
+    Table = test_rec,
+    Trec1 = #test_rec{key=1,val=111},
+    Trec2 = #test_rec{key=1,val=222},
+
+    ?match({atomic,ok}, rpc:call(N1, mnesia,create_table,
+                                 [Table,
+                                  [{disc_copies,Nodes},
+                                   {attributes,record_info(fields,test_rec)}
+                                  ] ] ) ),
+    ?match( [], mnesia:table_info(Table,ram_copies) ),
+    ?match( Nodes, mnesia:table_info(Table,disc_copies) ),
+    ?match( [], mnesia:table_info(Table,disc_only_copies) ),
+    Write_one = fun(Rec) -> mnesia:write(Rec) end,
+    Read_one  = fun(Key) -> mnesia:read({Table, Key}) end,
+    %%Write one value
+    ?match({atomic,ok},rpc:call(N1,mnesia,transaction,[Write_one,[Trec1]])),
+    %%Check it
+    ?match({atomic,[Trec1]},rpc:call(N1,mnesia,transaction,[Read_one,[1]]) ),
+    %%Shut down mnesia
+    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
+    %%Restart Mnesia;wait for tables to load
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, [Table])),
+    %%Write one value
+    ?match({atomic,ok},rpc:call(N1,mnesia,transaction,[Write_one,[Trec2]])),
+    %%Force load from file
+    ?match(yes, rpc:call(N1,mnesia,force_load_table,[Table])),
+    %%Check the value
+    ?match({atomic,[Trec2]},rpc:call(N1,mnesia,transaction,[Read_one,[1]]) ),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+force_load_on_a_non_local_table(doc) ->
+    ["This is NOT allowed, the test case is a negative test",
+     "Force load on a table that isn't replicated on this node."];
+force_load_on_a_non_local_table(suite) -> [];
+force_load_on_a_non_local_table(Config) when is_list(Config) ->
+    [N1, N2, N3] = Nodes = ?acquire_nodes( 3, Config),
+    TableNodes = lists:sublist(Nodes,2),
+    Table = test_rec,
+    Trec1 = #test_rec{key=1,val=11},
+
+    ?match({atomic,ok}, rpc:call(N1, mnesia,create_table,
+                                 [Table,
+                                  [{disc_copies,TableNodes},
+                                   {attributes,record_info(fields,test_rec)}
+                                  ] ] ) ),
+    ?match( [], mnesia:table_info(Table,ram_copies) ),
+    ?match( TableNodes, mnesia:table_info(Table,disc_copies) ),
+    ?match( [], mnesia:table_info(Table,disc_only_copies) ),
+    Write_one = fun(Rec) -> mnesia:write(Rec) end,
+    Read_one  = fun(Key) -> mnesia:read({Table, Key}) end,
+    %%Write one value
+    ?match({atomic,ok},rpc:call(N1,mnesia,transaction,[Write_one,[Trec1]])),
+    %%Check it from the other nodes
+    ?match({atomic,[Trec1]},rpc:call(N2,mnesia,transaction,[Read_one,[1]]) ),
+    ?match({atomic,[Trec1]},rpc:call(N3,mnesia,transaction,[Read_one,[1]]) ),
+
+    %%Make sure that Table is non-local
+    ?match_inverse(N3, rpc:call(N3,mnesia,table_info,[Table,where_to_read])),
+    %%Try to force load it
+    ?match(yes, rpc:call(N3,mnesia,force_load_table,[Table])),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+force_load_when_the_table_does_not_exist(doc) ->
+    ["This is NOT allowed, the test case is a negative test",
+     "Force load on a table that doesn't exist."];
+force_load_when_the_table_does_not_exist(suite) -> [];
+force_load_when_the_table_does_not_exist(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes( 2, Config),
+    
+    %%Dummy table
+    ?match({atomic,ok},
+           mnesia:create_table(test_rec,
+                               [{disc_copies,Nodes},
+                                {attributes,record_info(fields,test_rec)}]
+                              ) ),
+    ?match( [], mnesia:table_info(test_rec,ram_copies) ),
+    ?match( Nodes, mnesia:table_info(test_rec,disc_copies) ),
+    ?match( [], mnesia:table_info(test_rec,disc_only_copies) ),
+    Tab = dummy,
+    %%Make sure that Tab is an unknown table
+    ?match( false, lists:member(Tab,mnesia:system_info(tables)) ),
+    ?match( {error, {no_exists, Tab}}, mnesia:force_load_table(Tab) ),
+    ?verify_mnesia(Nodes, []).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+-define(SDwrite(Tup), fun() -> mnesia:write(Tup) end).			            
+
+master_nodes(suite) -> [];
+master_nodes(Config) when is_list(Config) ->
+    [A, B, C] = Nodes = ?acquire_nodes(3, Config),
+    Tab = test_table_master_nodes,    
+    ?match({atomic,ok}, mnesia:create_table(Tab, [{disc_copies, Nodes}])),
+
+    %% Test one: Master A and the table should be loaded from A
+
+    ?match(ok, rpc:call(A, mnesia, set_master_nodes, [Tab, [A]])),
+    ?match({atomic, ok}, mnesia:sync_transaction(?SDwrite({Tab, 1, init}))),
+    
+    mnesia_test_lib:stop_mnesia([A]),
+    ?match({atomic, ok}, rpc:call(B, mnesia, sync_transaction, [?SDwrite({Tab, 1, updated})])),
+    ?match(ok, rpc:call(A, mnesia, start, [])),
+    ?match(ok, rpc:call(A, mnesia, wait_for_tables, [[Tab], 3000])),
+    
+    ?match([{Tab, 1, init}], rpc:call(A, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, updated}], rpc:call(B, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, updated}], rpc:call(C, mnesia, dirty_read, [{Tab, 1}])),
+    
+    %% Test 2: Master [A,B] and B is Up the table should be loaded from B
+
+    ?match(ok, rpc:call(A, mnesia, set_master_nodes, [Tab, [A, B]])),
+    ?match({atomic, ok}, mnesia:sync_transaction(?SDwrite({Tab, 1, init}))),
+    
+    mnesia_test_lib:stop_mnesia([A]),
+    ?match({atomic, ok}, rpc:call(B, mnesia, sync_transaction, [?SDwrite({Tab, 1, updated})])),
+    ?match(ok, rpc:call(A, mnesia, start, [])),
+    ?match(ok, rpc:call(A, mnesia, wait_for_tables, [[Tab], 3000])),
+    
+    ?match([{Tab, 1, updated}], rpc:call(A, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, updated}], rpc:call(B, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, updated}], rpc:call(C, mnesia, dirty_read, [{Tab, 1}])),
+
+    %% Test 3: Master [A,B] and B is down the table should be loaded from A
+
+    ?match(ok, rpc:call(A, mnesia, set_master_nodes, [Tab, [A, B]])),
+    ?match({atomic, ok}, mnesia:sync_transaction(?SDwrite({Tab, 1, init}))),
+    
+    mnesia_test_lib:stop_mnesia([A]),
+    ?match({atomic, ok}, rpc:call(B, mnesia, sync_transaction, [?SDwrite({Tab, 1, updated})])),
+    mnesia_test_lib:stop_mnesia([B]),
+    ?match(ok, rpc:call(A, mnesia, start, [])),
+    ?match(ok, rpc:call(A, mnesia, wait_for_tables, [[Tab], 3000])),
+    
+    ?match(ok, rpc:call(B, mnesia, start, [])),
+    ?match(ok, rpc:call(B, mnesia, wait_for_tables, [[Tab], 3000])),
+    
+    ?match([{Tab, 1, init}], rpc:call(A, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, _Unknown}], rpc:call(B, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, updated}], rpc:call(C, mnesia, dirty_read, [{Tab, 1}])),
+    
+    %% Test 4: Master [B] and B is Up the table should be loaded from B
+
+    ?match(ok, rpc:call(A, mnesia, set_master_nodes, [Tab, [B]])),
+    ?match({atomic, ok}, mnesia:sync_transaction(?SDwrite({Tab, 1, init}))),
+    
+    mnesia_test_lib:stop_mnesia([A]),
+    ?match({atomic, ok}, rpc:call(B, mnesia, sync_transaction, [?SDwrite({Tab, 1, updated})])),
+    ?match(ok, rpc:call(A, mnesia, start, [])),
+    ?match(ok, rpc:call(A, mnesia, wait_for_tables, [[Tab], 3000])),
+    
+    ?match([{Tab, 1, updated}], rpc:call(A, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, updated}], rpc:call(B, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, updated}], rpc:call(C, mnesia, dirty_read, [{Tab, 1}])),
+    
+    %% Test 5: Master [B] and B is down the table should not be loaded
+
+    ?match(ok, rpc:call(A, mnesia, set_master_nodes, [Tab, [B]])),
+    ?match({atomic, ok}, mnesia:sync_transaction(?SDwrite({Tab, 1, init}))),
+    
+    mnesia_test_lib:stop_mnesia([A]),
+    ?match({atomic, ok}, rpc:call(B, mnesia, sync_transaction, [?SDwrite({Tab, 1, updated})])),
+    mnesia_test_lib:stop_mnesia([B]),
+    ?match({atomic, ok}, rpc:call(C, mnesia, sync_transaction, [?SDwrite({Tab, 1, update_2})])),
+    ?match(ok, rpc:call(A, mnesia, start, [])),
+    ?match({timeout, [Tab]}, rpc:call(A, mnesia, wait_for_tables, [[Tab], 2000])),
+
+    %% Test 6: Force load on table that couldn't be loaded due to master 
+    %%         table setttings, loads other active replicas i.e. from C
+
+    ?match(yes, rpc:call(A, mnesia, force_load_table, [Tab])),
+    ?match(ok, rpc:call(A, mnesia, wait_for_tables, [[Tab], 3000])),
+    
+    ?match(ok, rpc:call(B, mnesia, start, [])),
+    ?match(ok, rpc:call(B, mnesia, wait_for_tables, [[Tab], 3000])),
+    
+    ?match([{Tab, 1, update_2}], rpc:call(A, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, update_2}], rpc:call(B, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, update_2}], rpc:call(C, mnesia, dirty_read, [{Tab, 1}])),
+
+    %% Test 7: Master [B] and B is down the table should not be loaded, 
+    %%         force_load when there are no active replicas availible 
+    %%         should generate a load of a local table
+
+    ?match(ok, rpc:call(A, mnesia, set_master_nodes, [Tab, [B]])),
+    ?match({atomic, ok}, mnesia:sync_transaction(?SDwrite({Tab, 1, init}))),
+    
+    mnesia_test_lib:stop_mnesia([A]),
+    ?match({atomic, ok}, rpc:call(B, mnesia, sync_transaction, [?SDwrite({Tab, 1, updated})])),
+    mnesia_test_lib:stop_mnesia([B, C]),
+    ?match(ok, rpc:call(A, mnesia, start, [])),
+    ?match({timeout, [Tab]}, rpc:call(A, mnesia, wait_for_tables, [[Tab], 2000])),
+
+    ?match(yes, rpc:call(A, mnesia, force_load_table, [Tab])),
+    ?match([{Tab, 1, init}], rpc:call(A, mnesia, dirty_read, [{Tab, 1}])),
+
+    ?verify_mnesia([A], [B,C]).
+
+starting_master_nodes(suite) -> [];
+starting_master_nodes(doc) -> 
+    ["Complementory to TEST 5 and 6 above, if the master node (B) starts"
+     " and loads the table it should be loaded on the waiting node (A) "];
+starting_master_nodes(Config) when is_list(Config) ->
+    [A, B, C] = Nodes = ?acquire_nodes(3, Config),
+    Tab = starting_master_nodes,    
+    ?match({atomic,ok}, mnesia:create_table(Tab, [{disc_copies, Nodes}])),
+    %% Start by checking TEST 5 above.
+    
+    ?match(ok, rpc:call(A, mnesia, set_master_nodes, [Tab, [B]])),
+    ?match({atomic, ok}, mnesia:sync_transaction(?SDwrite({Tab, 1, init}))),
+    mnesia_test_lib:stop_mnesia([A]),
+    ?match({atomic, ok}, rpc:call(B, mnesia, sync_transaction, [?SDwrite({Tab, 1, updated})])),
+    mnesia_test_lib:stop_mnesia([B]),
+    ?match({atomic, ok}, rpc:call(C, mnesia, sync_transaction, [?SDwrite({Tab, 1, update_2})])),
+    
+    ?match(ok, rpc:call(A, mnesia, start, [])),
+    ?match({timeout, [Tab]}, rpc:call(A, mnesia, wait_for_tables, [[Tab], 2000])),
+    %% Start the B node and the table should be loaded on A!
+    ?match(ok, rpc:call(B, mnesia, start, [])),
+    ?match(ok, rpc:call(B, mnesia, wait_for_tables, [[Tab], 3000])),
+    ?match(ok, rpc:call(A, mnesia, wait_for_tables, [[Tab], 3000])),
+    
+    ?verify_mnesia([A,B,C], []).
+
+
+master_on_non_local_tables(suite) -> [];
+master_on_non_local_tables(Config) when is_list(Config) ->
+    [A, B, C] = Nodes = ?acquire_nodes(3, Config),
+    Tab = test_table_non_local,    
+    ?match({atomic,ok}, mnesia:create_table(Tab, [{disc_copies, [B, C]}])),
+
+    ?match(ok, rpc:call(A, mnesia, set_master_nodes, [Tab, [B]])),
+    ?match({atomic, ok}, mnesia:sync_transaction(?SDwrite({Tab, 1, init}))),
+
+    %% Test 1: Test that table info are updated when master node comes up
+    
+    mnesia_test_lib:stop_mnesia([A, B]),
+    ?match({atomic, ok}, rpc:call(C, mnesia, sync_transaction, [?SDwrite({Tab, 1, updated})])),   
+    ?match(ok, rpc:call(A, mnesia, start, [])),
+    
+    ?match({timeout, [Tab]}, rpc:call(A, mnesia, wait_for_tables, [[Tab], 2000])),
+    ErrorRead = {badrpc,{'EXIT', {aborted,{no_exists,[test_table_non_local,1]}}}},
+    ErrorWrite = {badrpc,{'EXIT', {aborted,{no_exists,test_table_non_local}}}},
+    ?match(ErrorRead, rpc:call(A, mnesia, dirty_read, [{Tab, 1}])),
+    ?match(ErrorWrite, rpc:call(A, mnesia, dirty_write, [{Tab, 1, updated_twice}])),
+    
+    ?match(ok, rpc:call(B, mnesia, start, [])),
+    ?match(ok, rpc:call(A, mnesia, wait_for_tables, [[Tab], 2000])),
+    
+    ?match([{Tab, 1, updated}], rpc:call(A, mnesia, dirty_read, [{Tab, 1}])),
+    ?match(B, rpc:call(A, mnesia, table_info, [Tab, where_to_read])),
+    ?match({atomic, ok}, rpc:call(A, mnesia, sync_transaction, [?SDwrite({Tab, 1, init})])),
+
+    %% Test 2: Test that table info are updated after force_load
+
+    mnesia_test_lib:stop_mnesia([A, B]),
+    ?match({atomic, ok}, rpc:call(C, mnesia, sync_transaction, [?SDwrite({Tab, 1, updated})])),   
+    ?match(ok, rpc:call(A, mnesia, start, [])),
+    
+    ?match({timeout, [Tab]}, rpc:call(A, mnesia, wait_for_tables, [[Tab], 2000])),
+    ?match(yes, rpc:call(A, mnesia, force_load_table, [Tab])),
+    ?match(C, rpc:call(A, mnesia, table_info, [Tab, where_to_read])),
+
+    ?match([{Tab, 1, updated}], rpc:call(A, mnesia, dirty_read, [{Tab, 1}])),
+    ?match({atomic, ok}, rpc:call(A, mnesia, sync_transaction, [?SDwrite({Tab, 1, updated_twice})])),
+    
+    ?match(ok, rpc:call(B, mnesia, start, [])),
+    ?match(ok, rpc:call(B, mnesia, wait_for_tables, [[Tab], 10000])),
+
+    ?match([{Tab, 1, updated_twice}], rpc:call(A, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, updated_twice}], rpc:call(B, mnesia, dirty_read, [{Tab, 1}])),
+    ?match([{Tab, 1, updated_twice}], rpc:call(C, mnesia, dirty_read, [{Tab, 1}])),
+    
+    ?verify_mnesia(Nodes, []).
+
+remote_force_load_with_local_master_node(doc) ->
+    ["Force load a table on a remote node while the ",
+     "local node is down. Start the local node and ",
+     "verfify that the tables is loaded from disc locally "
+     "if the local node has itself as master node and ",
+     "the remote node has both the local and remote node ",
+     "as master nodes"];
+remote_force_load_with_local_master_node(suite) -> [];
+remote_force_load_with_local_master_node(Config) when is_list(Config) ->
+    [A, B] = Nodes = ?acquire_nodes(2, Config),
+
+    Tab = remote_force_load_with_local_master_node,
+    ?match({atomic,ok}, mnesia:create_table(Tab, [{disc_copies, Nodes}])),
+    ?match(ok, rpc:call(A, mnesia, set_master_nodes, [Tab, [A, B]])),
+    ?match(ok, rpc:call(B, mnesia, set_master_nodes, [Tab, [B]])),
+    
+    W = fun(Who) -> mnesia:write({Tab, who, Who}) end,
+    ?match({atomic, ok}, rpc:call(A,mnesia, sync_transaction, [W, [a]])),
+    ?match(stopped, rpc:call(A, mnesia, stop, [])),
+    ?match({atomic, ok}, rpc:call(B, mnesia, sync_transaction, [W, [b]])),
+    ?match(stopped, rpc:call(B, mnesia, stop, [])),
+
+    ?match(ok, rpc:call(A, mnesia, start, [])),
+    ?match(ok, rpc:call(A, mnesia, wait_for_tables, [[Tab], 3000])),
+    ?match([{Tab, who, a}], rpc:call(A, mnesia, dirty_read, [{Tab, who}])),
+    
+    ?match(ok, rpc:call(B, mnesia, start, [])),
+    ?match(ok, rpc:call(B, mnesia, wait_for_tables, [[Tab], 3000])),
+    ?match([{Tab, who, b}], rpc:call(B, mnesia, dirty_read, [{Tab, who}])),
+
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+dump_ram_copies(doc) -> 
+    ["Check that ram_copies tables are loaded with the"
+     "contents that had been dumped before Mnesia",
+     "was restarted. " ];
+dump_ram_copies(suite)  -> [];
+dump_ram_copies(Config) when is_list(Config)  ->
+    Nodes = ?acquire_nodes(3, Config),
+    {success, [P1,P2,P3]} = ?start_activities(Nodes),
+    
+    NP1 = node(P1),
+    NP2 = node(P2),
+    
+    {A,B,C} = case node() of
+		  NP1 ->
+						%?verbose("first case ~n"),
+		      {P3,P2,P1};
+		  NP2 ->
+						%?verbose("second case ~n"),
+		      {P3,P1,P2};
+		  _  ->
+		      {P1,P2,P3}
+	      end,
+    
+    Node1 = node(A),
+    Node2 = node(B),
+    Node3 = node(C),
+    
+    ?verbose(" A   pid:~p  node:~p ~n",[A,Node1]),
+    ?verbose(" B   pid:~p  node:~p ~n",[B,Node2]),
+    ?verbose(" C   pid:~p  node:~p ~n",[C,Node3]),
+    
+    
+    %%  ram copies table on 2 nodes
+    
+    Tab = dump_table,
+    Def = [{attributes, [key, value]},
+           {ram_copies, [Node1,Node2]}],      
+    
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    
+    ?match(ok, mnesia:dirty_write({Tab, 1, 4711})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 42})),
+    ?match(ok, mnesia:dirty_write({Tab, 3, 256})),
+    
+    %%  dump the table
+    
+    ?match( {atomic,ok}, mnesia:dump_tables([Tab])),
+    
+    %% perform updates (they shall be lost after kill Mnesia )
+    
+    ?match(ok, mnesia:dirty_write({Tab, 1, 815})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 915})),
+    
+    %% add another replica on node3
+    mnesia:add_table_copy(Tab,Node3,ram_copies),
+    
+    %% all 3 replicas shall have the new contents
+    cross_check_tables([A,B,C],Tab,
+                       {[{Tab,1,815}],[{Tab,2,915}],[{Tab,3,256}]}),
+    
+    %% kill mnesia on node 3
+    mnesia_test_lib:kill_mnesia([Node3]),
+    
+    %% wait a while, so  that mnesia is really down 
+    timer:sleep(timer:seconds(2)), 
+    
+    mnesia_test_lib:kill_mnesia([Node1,Node2]),  %% kill them as well
+    timer:sleep(timer:seconds(2)), 
+    
+    %% start Mnesia only on node 3
+    ?verbose("starting mnesia on Node3~n",[]),
+    
+    %% test_lib:mnesia_start doesnt work, because it waits
+    %% for the schema on all nodes ... ???
+    ?match(ok,rpc:call(Node3,mnesia,start,[]) ),
+    ?match(ok,rpc:call(Node3,mnesia,wait_for_tables,
+		       [[Tab],timer:seconds(30)]   ) ),
+    
+    %% node3  shall have the conents of the dump
+    cross_check_tables([C],Tab,{[{Tab,1,4711}],[{Tab,2,42}],[{Tab,3,256}]}),
+    
+    %% start Mnesia on the other 2 nodes, too
+    mnesia_test_lib:start_mnesia([Node1,Node2],[Tab]),
+    
+    cross_check_tables([A,B,C],Tab,
+		       {[{Tab,1,4711}],[{Tab,2,42}],[{Tab,3,256}]}),
+    ?verify_mnesia(Nodes, []).
+
+%% check the contents of the table
+
+cross_check_tables([],_tab,_elements) -> ok;
+cross_check_tables([Pid|Rest],Tab,{Val1,Val2,Val3}) ->
+    Pid ! fun () ->
+              R1 = mnesia:dirty_read({Tab,1}),
+              R2 = mnesia:dirty_read({Tab,2}),
+              R3 = mnesia:dirty_read({Tab,3}),
+              {R1,R2,R3}
+            end,
+    ?match_receive({ Pid, {Val1, Val2, Val3 } }),
+    cross_check_tables(Rest,Tab,{Val1,Val2,Val3} ).   
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Should be in evil test suite !!!
+
+dump_disc_copies(doc) -> 
+      ["Check that it is not possible to dump disc_copies tables"];
+dump_disc_copies(suite)  -> [];
+dump_disc_copies(Config) when is_list(Config)  ->
+    do_dump_copies(Config, disc_copies).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Should be in evil test suite !!!
+dump_disc_only(doc) -> 
+       ["Check that it is not possible to dump disc_only_copies tables"];
+dump_disc_only(suite)  -> [];
+dump_disc_only(Config) when is_list(Config)  ->
+    do_dump_copies(Config,disc_only_copies).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+do_dump_copies(Config,Copies) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+
+    Tab = dump_copies,
+    Def = [{attributes, [key, value]},
+           {Copies, [Node1]}],      
+    
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+
+    ?match(ok, mnesia:dirty_write({Tab, 1, 4711})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 42})),
+    ?match(ok, mnesia:dirty_write({Tab, 3, 256})),
+
+    %%  dump the table
+    ?match( {aborted, {"Only allowed on ram_copies",Tab,[Node1]}},
+              mnesia:dump_tables([Tab])),
+
+    ?match(ok, mnesia:dirty_write({Tab, 1, 815})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 915})),
+
+    %% kill mnesia on node1
+    mnesia_test_lib:kill_mnesia([Node1]),
+    
+    %% wait a while, so  that mnesia is really down 
+    timer:sleep(timer:seconds(1)), 
+
+    mnesia_test_lib:start_mnesia([Node1],[Tab]),
+    
+    ?match([{Tab, 1, 815}], mnesia:dirty_read({Tab,1}) ),
+    ?match([{Tab, 2, 915}], mnesia:dirty_read({Tab,2}) ),
+    ?match([{Tab, 3, 256}], mnesia:dirty_read({Tab,3}) ),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+durability_of_disc_copies(doc) -> 
+       ["Perform all possible kinds of updates on tables and check"
+        "whether no data is lost after a restart of Mnesia.",
+        "This test is done for disc_copies"];
+
+durability_of_disc_copies(suite) -> [];
+durability_of_disc_copies(Config) when is_list(Config) -> 
+       do_disc_durability(Config,disc_copies).
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+durability_of_disc_only_copies(doc) -> 
+       ["Perform all possible kinds of updates on tables and check"
+        "whether no data is lost after a restart of Mnesia.",
+        "This test is done for disc_only_copies"];
+durability_of_disc_only_copies(suite) -> [];
+durability_of_disc_only_copies(Config) when is_list(Config) -> 
+       do_disc_durability(Config,disc_only_copies).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+do_disc_durability(Config,CopyType) ->
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(1)}]),
+    {success, [A,B,C]} = ?start_activities(Nodes),
+
+    Tab_set = disc_durability_set,
+    Def_set = [{attributes, [key, value]},
+	       {CopyType, Nodes}],  
+
+    Tab_bag = disc_durability_bag,
+    Def_bag = [{attributes, [key, value]},
+               {type, bag},
+               {CopyType, Nodes}],  
+
+    ?match({atomic, ok}, mnesia:create_table(Tab_set, Def_set)),
+    ?match({atomic, ok}, mnesia:create_table(Tab_bag, Def_bag)),
+
+    %% do updates     
+    ?match({atomic, ok},
+	   mnesia:transaction(fun()->
+				      mnesia:write({Tab_set, 11, 1111}),
+				      mnesia:write({Tab_set, 22, 2222}),
+				      mnesia:write({Tab_set, 33, 3333}),
+				      mnesia:write({Tab_set, 55, 5555})
+			      end)),
+    mnesia:dirty_write({Tab_set, 44, 4444}),
+
+    ?match({atomic, ok},
+	   mnesia:transaction(fun()->
+				      mnesia:write({Tab_bag, 11, a_1111}),
+				      mnesia:write({Tab_bag, 11, b_1111}),
+				      mnesia:write({Tab_bag, 22, a_2222}),
+				      mnesia:write({Tab_bag, 22, b_2222}),
+				      mnesia:write({Tab_bag, 33, a_3333}),
+				      mnesia:write({Tab_bag, 33, b_3333})
+			      end)),  
+    ?match({atomic, ok},
+	   mnesia:transaction(fun()-> mnesia:delete({Tab_set, 22}) end)),  
+    ?match(ok, mnesia:dirty_delete({Tab_set, 33})),
+    ?match(5558, mnesia:dirty_update_counter({Tab_set, 55}, 3)),
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun()->
+				      mnesia:delete_object({Tab_bag, 22, b_2222})
+			      end)),  
+    ?match(ok, mnesia:dirty_delete_object({Tab_bag, 33, b_3333})),
+    ?match(10, mnesia:dirty_update_counter({Tab_set, counter}, 10)),
+    ?match({atomic, ok},  % Also syncs update_counter
+	   mnesia:sync_transaction(fun() -> mnesia:write({Tab_set,66,6666}) end)),  
+    
+    Updated = {[[{Tab_set,counter,10}],
+		[{Tab_set,counter,10}],
+		[{Tab_set,counter,10}]],[]},
+    ?match(Updated, rpc:multicall(Nodes, mnesia, dirty_read, [Tab_set,counter])),
+    
+    %%  kill mnesia on all nodes, start it again and check the data
+    mnesia_test_lib:kill_mnesia(Nodes),
+    mnesia_test_lib:start_mnesia(Nodes,[Tab_set,Tab_bag]),
+    
+    ?log("Flushed ~p ~n", [mnesia_test_lib:flush()]), %% Debugging strange msgs..
+    ?log("Processes ~p ~p ~p~n", [A,B,C]),
+    check_tables([A,B,C], 
+		 [{Tab_set,11}, {Tab_set,22},{Tab_set,33},
+		  {Tab_set,44},{Tab_set,55}, {Tab_set,66},
+		  {Tab_bag,11}, {Tab_bag,22},{Tab_bag,33},
+		  {Tab_set, counter}],
+		 [[{Tab_set, 11, 1111}], [], [], [{Tab_set, 44, 4444}],
+		  [{Tab_set, 55, 5558}], [{Tab_set, 66, 6666}],
+		  lists:sort([{Tab_bag, 11, a_1111},{Tab_bag, 11, b_1111}]),
+		  [{Tab_bag, 22, a_2222}], [{Tab_bag, 33, a_3333}],
+		  [{Tab_set, counter, 10}]]),
+
+    timer:sleep(1000), %% Debugging strange msgs..
+    ?log("Flushed ~p ~n", [mnesia_test_lib:flush()]),
+    ?verify_mnesia(Nodes, []).
+
+%% check the contents of the table
+%%
+%%  all the processes in the PidList shall find all 
+%%  table entries in ValList
+
+check_tables([],_vallist,_resultList) -> ok;
+check_tables([Pid|Rest],ValList,ResultList) ->
+    Pid ! fun () ->
+              check_values(ValList)
+            end,
+    ?match_receive({ Pid, ResultList }),
+    check_tables(Rest,ValList,ResultList).
+
+check_values([]) -> [];
+check_values([{Tab,Key}|Rest]) ->
+        Ret = lists:sort(mnesia:dirty_read({Tab,Key})),
+        [Ret|check_values(Rest)].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  stolen from mnesia_recovery_test.erl:
+
+receive_messages([]) -> [];
+receive_messages(ListOfMsgs) ->
+    receive 
+        timeout ->     
+            case lists:member(timeout, ListOfMsgs) of
+                false -> 
+                    ?warning("I (~p) have received unexpected msg~n ~p ~n",
+                        [self(),timeout]),
+                    receive_messages(ListOfMsgs);
+                true -> 
+                    ?verbose("I (~p) got msg ~p  ~n", [self(),timeout]),
+                    [ timeout | receive_messages(ListOfMsgs -- [timeout])]
+            end;
+
+        {Pid, Msg} ->     
+            case lists:member(Msg, ListOfMsgs) of
+                false -> 
+                    ?warning("I (~p) have received unexpected msg~n ~p ~n",
+                        [self(),{Pid, Msg}]),
+                    receive_messages(ListOfMsgs);
+                true -> 
+                    ?verbose("I (~p) got msg ~p from ~p ~n", [self(),Msg, Pid]),
+                    [{Pid, Msg} | receive_messages(ListOfMsgs -- [Msg])]
+            end;
+
+        Else -> ?warning("Recevied unexpected Msg~n ~p ~n", [Else])
+    after timer:seconds(40) -> 
+            ?error("Timeout in receive msgs while waiting for ~p~n", 
+                   [ListOfMsgs])
+    end.  
+
diff --git a/lib/mnesia/test/mnesia_evil_backup.erl b/lib/mnesia/test/mnesia_evil_backup.erl
new file mode 100644
index 0000000000..63f4146d98
--- /dev/null
+++ b/lib/mnesia/test/mnesia_evil_backup.erl
@@ -0,0 +1,738 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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%
+%%
+
+%%
+%%%----------------------------------------------------------------------
+%%% File    : mnesia_evil_backup.erl
+%%% Author  : Dan Gudmundsson <dgud@legolas>
+%%% Purpose : Evil backup tests
+%%% Created : 3 Jun 1998 by Dan Gudmundsson <[email protected]>
+%%%----------------------------------------------------------------------
+
+-module(mnesia_evil_backup).
+-author('[email protected]').
+-compile(export_all).
+-include("mnesia_test_lib.hrl").
+
+%%-export([Function/Arity, ...]).
+
+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() -> 
+    [backup, bad_backup, global_backup_checkpoint,
+     {group, restore_tables}, traverse_backup,
+     selective_backup_checkpoint,
+     incremental_backup_checkpoint, install_fallback,
+     uninstall_fallback, local_fallback,
+     sops_with_checkpoint].
+
+groups() -> 
+    [{restore_tables, [],
+      [restore_errors, restore_clear, restore_keep,
+       restore_recreate, restore_clear_ram]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+backup(doc) -> ["Checking the interface to the function backup",
+                "We don't check that the backups can be used here",
+                "That is checked in install_fallback and in restore"];
+backup(suite) -> [];
+backup(Config) when is_list(Config) -> 
+    [Node1, Node2] = _Nodes = ?acquire_nodes(2, Config),
+    Tab = backup_tab,
+    Def = [{disc_copies, [Node1]}, {ram_copies, [Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),  
+    ?match(ok, mnesia:dirty_write({Tab, 1, test_ok})),
+    File = "backup_test.BUP",
+    ?match(ok, mnesia:backup(File)),
+
+    File2 = "backup_test2.BUP",
+    Tab2 = backup_tab2,
+    Def2 = [{disc_only_copies, [Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),  
+    ?match(ok, mnesia:backup(File2, mnesia_backup)),
+
+    File3 = "backup_test3.BUP",
+    mnesia_test_lib:kill_mnesia([Node2]),
+    ?match({error, _}, mnesia:backup(File3, mnesia_backup)),
+
+    ?match(ok, file:delete(File)),
+    ?match(ok, file:delete(File2)),
+    ?match({error, _}, file:delete(File3)),
+    ?verify_mnesia([Node1], [Node2]).
+
+
+bad_backup(suite) -> [];
+bad_backup(Config) when is_list(Config) -> 
+    [Node1] = ?acquire_nodes(1, Config),
+    Tab = backup_tab,
+    Def = [{disc_copies, [Node1]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    ?match(ok, mnesia:dirty_write({Tab, 1, test_ok})),
+    File = "backup_test.BUP",
+    ?match(ok, mnesia:backup(File)),
+    file:write_file(File, "trash", [append]),
+    ?match(ok, mnesia:dirty_write({Tab, 1, test_bad})),
+    ?match({atomic,[Tab]}, mnesia:restore(File, [{clear_tables, [Tab]}])),
+    ?match([{Tab,1,test_ok}], mnesia:dirty_read(Tab, 1)),
+    
+    ?match(ok, file:delete(File)),
+    ?verify_mnesia([Node1], []).
+
+
+
+global_backup_checkpoint(doc) -> 
+    ["Checking the interface to the function backup_checkpoint",
+     "We don't check that the backups can be used here",
+     "That is checked in install_fallback and in restore"];
+global_backup_checkpoint(suite) -> [];
+global_backup_checkpoint(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),    
+    Tab = backup_cp,
+    Def = [{disc_copies, [Node1]}, {ram_copies, [Node2]}],
+    File = "backup_checkpoint.BUP",
+    File2 = "backup_checkpoint2.BUP",
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),    
+    ?match(ok, mnesia:dirty_write({Tab, 1, test_ok})),
+    ?match({error, _}, mnesia:backup_checkpoint(cp_name, File)),
+    Spec = [{name, cp_name}, {max,  mnesia:system_info(tables)}],
+    ?match({ok, _Name, _Ns}, mnesia:activate_checkpoint(Spec)),
+    ?match(ok, mnesia:backup_checkpoint(cp_name, File)),
+    ?match({error, _}, mnesia:backup_checkpoint(cp_name_nonexist, File)),
+    ?match(ok, mnesia:backup_checkpoint(cp_name, File2, mnesia_backup)),
+    ?match({error, _}, file:delete(File)),
+    ?match(ok, file:delete(File2)),
+    ?verify_mnesia(Nodes, []).
+
+
+restore_errors(suite) -> [];
+restore_errors(Config) when is_list(Config) ->
+    [_Node] = ?acquire_nodes(1, Config),
+    ?match({aborted, enoent}, mnesia:restore(notAfile, [])),
+    ?match({aborted, {badarg, _}}, mnesia:restore(notAfile, not_a_list)),
+    ?match({aborted, {badarg, _}}, mnesia:restore(notAfile, [test_badarg])),
+    ?match({aborted, {badarg, _}}, mnesia:restore(notAfile, [{test_badarg, xxx}])),
+    ?match({aborted, {badarg, _}}, mnesia:restore(notAfile, [{skip_tables, xxx}])),
+    ?match({aborted, {badarg, _}}, mnesia:restore(notAfile, [{recreate_tables, [schema]}])),
+    ?match({aborted, {badarg, _}}, mnesia:restore(notAfile, [{default_op, asdklasd}])),
+    ok.
+
+restore_clear(suite) -> [];
+restore_clear(Config) when is_list(Config) ->
+    restore(Config, clear_tables).
+
+restore_keep(suite) -> [];
+restore_keep(Config) when is_list(Config) ->
+    restore(Config, keep_tables).
+
+restore_recreate(suite) -> [];
+restore_recreate(Config) when is_list(Config) ->
+    restore(Config, recreate_tables).
+
+check_tab(Records, Line) ->
+    Verify = fun({Table, Key, Val}) -> 
+		     case catch mnesia:dirty_read({Table, Key}) of
+			 [{Table, Key, Val}] -> ok;
+			 Else ->
+			     mnesia_test_lib:error("Not matching on Node ~p ~n"
+						   " Expected ~p~n Actual  ~p~n", 
+						   [node(), {Table, Key, Val}, Else],
+						   ?MODULE, Line),
+			     exit(error)     
+		     end;
+		(Recs) ->
+		     [{Tab, Key, _}, _] = Recs,
+		     SRecs = lists:sort(Recs),
+		     R_Recs = lists:sort(catch mnesia:dirty_read({Tab, Key})),
+		     case R_Recs of
+			 SRecs -> ok;
+			 Else ->
+			     mnesia_test_lib:error("Not matching on Node ~p ~n"
+						   " Expected ~p~n Actual  ~p~n", 
+						   [node(), SRecs, Else],
+						   ?MODULE, Line),
+			     exit(error)
+		     end
+	     end,
+    lists:foreach(Verify, Records).
+
+restore(Config, Op)  ->
+    [Node1, Node2, _Node3] = Nodes = ?acquire_nodes(3, Config),
+    
+    Tab1 = ram_snmp,
+    Def1 = [{snmp, [{key, integer}]}, {ram_copies, [Node1]}],
+    Tab2 = disc_index,
+    Def2 = [{index, [val]}, {disc_copies, [Node1, Node2]}],
+    Tab3 = dionly_bag,
+    Def3 = [{type, bag}, {disc_only_copies, Nodes}],
+    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+    ?match({atomic, ok}, mnesia:create_table(Tab3, Def3)),
+
+    File1 = "restore1.BUP",
+    File2 = "restore2.BUP",    
+
+    Restore = fun(O, A) ->
+		      case mnesia:restore(O, A) of
+			  {atomic, Tabs} when is_list(Tabs) -> {atomic, lists:sort(Tabs)};
+			  Other -> Other
+		      end
+	      end,
+    Tabs = lists:sort([Tab1, Tab2, Tab3]),
+    
+    [mnesia:dirty_write({Tab1, N, N+42}) || N <- lists:seq(1, 10)],
+    [mnesia:dirty_write({Tab2, N, N+43}) || N <- lists:seq(1, 10)],
+    [mnesia:dirty_write({Tab3, N, N+44}) || N <- lists:seq(1, 10)],
+    
+    Res1 = [{Tab1, N, N+42} || N <- lists:seq(1, 10)],
+    Res2 = [{Tab2, N, N+43} || N <- lists:seq(1, 10)],
+    Res3 = [{Tab3, N, N+44} || N <- lists:seq(1, 10)],
+    
+    {ok, Name, _} = mnesia:activate_checkpoint([{min, Tabs}, {ram_overrides_dump, true}]),
+    file:delete(File1),
+    
+    %% Test standard Restore on one table on one node
+    ?match(ok, mnesia:backup_checkpoint(Name, File1)),
+    ?match(ok, mnesia:deactivate_checkpoint(Name)),
+    ?match(ok, mnesia:backup(File2)),
+    [mnesia:dirty_write({Tab1, N, N+1}) || N <- lists:seq(1, 11)],
+    [mnesia:dirty_write({Tab2, N, N+1}) || N <- lists:seq(1, 11)],
+    [mnesia:dirty_write({Tab3, N, N+1}) || N <- lists:seq(1, 11)],
+    _Res11 = [{Tab1, N, N+1} || N <- lists:seq(1, 11)],
+    Res21 = [{Tab2, N, N+1} || N <- lists:seq(1, 11)],
+    Res31 = [[{Tab3, N, N+1}, {Tab3, N, N+44}] || N <- lists:seq(1, 10)],
+    
+    ?match({atomic, [Tab1]}, Restore(File1, [{Op, [Tab1]},
+					     {skip_tables, Tabs -- [Tab1]}])),    
+    case Op of 
+	keep_tables -> 
+	    ?match([{Tab1, 11, 12}], mnesia:dirty_read({Tab1, 11}));
+	clear_tables ->
+	    ?match([], mnesia:dirty_read({Tab1, 11}));
+	recreate_tables ->
+	    ?match([], mnesia:dirty_read({Tab1, 11}))
+    end,
+    [rpc:call(Node, ?MODULE, check_tab, [Res1, ?LINE]) || Node <- Nodes],
+    [rpc:call(Node, ?MODULE, check_tab, [Res21, ?LINE]) || Node <- Nodes],
+    [rpc:call(Node, ?MODULE, check_tab, [Res31, ?LINE]) || Node <- Nodes],
+
+    %% Restore all tables on it's nodes
+    mnesia_schema:clear_table(Tab1),
+    mnesia_schema:clear_table(Tab2),
+    mnesia_schema:clear_table(Tab3),
+    [mnesia:dirty_write({Tab1, N, N+1}) || N <- lists:seq(1, 11)],
+    [mnesia:dirty_write({Tab2, N, N+1}) || N <- lists:seq(1, 11)],
+    [mnesia:dirty_write({Tab3, N, N+1}) || N <- lists:seq(1, 11)],
+
+    ?match({atomic, ok}, mnesia:del_table_copy(Tab2, Node1)),
+
+    ?match({ok, Node1}, mnesia:subscribe({table, Tab1})),
+    
+    ?match({atomic, Tabs}, Restore(File1, [{default_op, Op},
+					   {module, mnesia_backup}])),
+    case Op of 
+	clear_tables ->
+	    ?match_receive({mnesia_table_event, {delete, {schema, Tab1}, _}}),
+	    ?match_receive({mnesia_table_event, {write, {schema, Tab1, _}, _}}),
+	    check_subscr(Tab1),
+	    [rpc:call(Node, ?MODULE, check_tab, [Res1, ?LINE]) || Node <- Nodes],
+	    [rpc:call(Node, ?MODULE, check_tab, [Res2, ?LINE]) || Node <- Nodes],
+	    [rpc:call(Node, ?MODULE, check_tab, [Res3, ?LINE]) || Node <- Nodes],	  
+	    ?match([], mnesia:dirty_read({Tab1, 11})),
+	    ?match([], mnesia:dirty_read({Tab2, 11})),
+	    ?match([], mnesia:dirty_read({Tab3, 11})),
+	    %% Check Index
+	    ?match([{Tab2, 10, 53}], mnesia:dirty_index_read(Tab2, 53, val)),
+	    ?match([], mnesia:dirty_index_read(Tab2, 11, val)),
+	    %% Check Snmp
+	    ?match({ok, [1]}, mnesia:snmp_get_next_index(Tab1,[])),
+	    ?match({ok, {Tab1, 1, 43}}, mnesia:snmp_get_row(Tab1, [1])),
+	    ?match(undefined, mnesia:snmp_get_row(Tab1, [11])),
+	    %% Check schema info
+	    ?match([Node2], mnesia:table_info(Tab2, where_to_write));
+	keep_tables -> 
+	    check_subscr(Tab1),
+	    [rpc:call(Node, ?MODULE, check_tab, [Res1, ?LINE]) || Node <- Nodes],
+	    [rpc:call(Node, ?MODULE, check_tab, [Res2, ?LINE]) || Node <- Nodes],
+	    [rpc:call(Node, ?MODULE, check_tab, [Res31, ?LINE]) || Node <- Nodes],	    
+	    ?match([{Tab1, 11, 12}], mnesia:dirty_read({Tab1, 11})),
+	    ?match([{Tab2, 11, 12}], mnesia:dirty_read({Tab2, 11})),
+	    ?match([{Tab3, 11, 12}], mnesia:dirty_read({Tab3, 11})),
+	    ?match([{Tab2, 10, 53}], mnesia:dirty_index_read(Tab2, 53, val)),
+	    %% Check Index
+	    ?match([], mnesia:dirty_index_read(Tab2, 11, val)),
+	    ?match({ok, [1]}, mnesia:snmp_get_next_index(Tab1,[])),
+	    %% Check Snmp
+	    ?match({ok, {Tab1, 1, 43}}, mnesia:snmp_get_row(Tab1, [1])),
+	    ?match({ok, {Tab1, 11, 12}}, mnesia:snmp_get_row(Tab1, [11])),
+	    %% Check schema info
+	    ?match([Node2], mnesia:table_info(Tab2, where_to_write));
+	recreate_tables ->
+	    check_subscr(Tab1, 0),
+	    [rpc:call(Node, ?MODULE, check_tab, [Res1, ?LINE]) || Node <- Nodes],
+	    [rpc:call(Node, ?MODULE, check_tab, [Res2, ?LINE]) || Node <- Nodes],
+	    [rpc:call(Node, ?MODULE, check_tab, [Res3, ?LINE]) || Node <- Nodes],	
+	    ?match([], mnesia:dirty_read({Tab1, 11})),
+	    ?match([], mnesia:dirty_read({Tab2, 11})),
+	    ?match([], mnesia:dirty_read({Tab3, 11})),
+	    %% Check Index
+	    ?match([{Tab2, 10, 53}], mnesia:dirty_index_read(Tab2, 53, val)),  	   	    
+	    ?match([], mnesia:dirty_index_read(Tab2, 11, val)),
+	    %% Check Snmp
+	    ?match({ok, [1]}, mnesia:snmp_get_next_index(Tab1,[])),
+	    ?match({ok, {Tab1, 1, 43}}, mnesia:snmp_get_row(Tab1, [1])),
+	    ?match(undefined, mnesia:snmp_get_row(Tab1, [11])),
+	    %% Check schema info
+	    Ns = lists:sort([Node1, Node2]),
+	    ?match(Ns, lists:sort(mnesia:table_info(Tab2, where_to_write)))	    
+    end,
+    ?match(ok, file:delete(File1)),
+    ?match(ok, file:delete(File2)),
+    ?verify_mnesia(Nodes, []).
+
+
+check_subscr(Tab) ->    
+    check_subscr(Tab, 10).
+
+check_subscr(_Tab, 0) ->    
+    receive 
+	Msg ->
+	    ?error("Too many msgs ~p~n", [Msg])
+    after 500 ->
+	    ok
+    end;
+check_subscr(Tab, N) ->
+    V = N +42,
+    receive
+	{mnesia_table_event, {write, {Tab, N, V}, _}} ->
+	    check_subscr(Tab, N-1)
+    after 500 ->
+	    ?error("Missing ~p~n", [{Tab, N, V}])
+    end.
+
+restore_clear_ram(suite) -> [];
+restore_clear_ram(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(3, [{diskless, true}|Config]),
+    
+    ?match({atomic, ok}, mnesia:create_table(a, [{ram_copies, Nodes}])),
+    
+    Write = fun(What) ->
+		    mnesia:write({a,1,What}),
+		    mnesia:write({a,2,What}),
+		    mnesia:write({a,3,What})
+	    end,
+    Bup = "restore_clear_ram.BUP",
+
+    ?match({atomic, ok}, mnesia:transaction(Write, [initial])),
+    ?match({ok, _, _}, mnesia:activate_checkpoint([{name,test}, 
+						   {min, [schema, a]},
+						   {ram_overrides_dump, true}])),
+    ?match(ok, mnesia:backup_checkpoint(test, Bup)),
+    
+    ?match({atomic, ok}, mnesia:transaction(Write, [data])),
+    ?match({atomic, [a]}, mnesia:restore(Bup, [{clear_tables,[a]},{default_op,skip_tables}])),
+
+    restore_clear_ram_loop(100, Nodes, Bup),
+    
+    ok.
+    
+restore_clear_ram_loop(N, Nodes = [N1,N2,N3], Bup) when N > 0 ->
+    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
+    ?match({_, []}, rpc:multicall([N1,N2], mnesia, start, [[{extra_db_nodes, Nodes}]])),
+    Key = rpc:async_call(N3, mnesia, start, [[{extra_db_nodes, Nodes}]]),
+    ?match({atomic, ok}, mnesia:create_table(a, [{ram_copies, Nodes}])),
+    ?match({atomic, [a]}, mnesia:restore(Bup, [{clear_tables,[a]},{default_op,skip_tables}])),
+    ?match(ok, rpc:yield(Key)),
+    ?match(ok, rpc:call(N3, mnesia, wait_for_tables, [[a], 3000])),
+    case rpc:multicall(Nodes, mnesia, table_info, [a,size]) of
+	{[3,3,3], []} ->
+	    restore_clear_ram_loop(N-1, Nodes, Bup);
+	Error ->
+	    ?match(3, Error)
+    end;
+restore_clear_ram_loop(_,_,_) ->
+    ok.
+
+traverse_backup(doc) -> 
+    ["Testing the traverse_backup interface, the resulting file is not tested though",
+     "See install_fallback for result using the output file from traverse_backup",
+     "A side effect is that the backup file contents are tested"];
+traverse_backup(suite) -> [];
+traverse_backup(Config) when is_list(Config) -> 
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = backup_tab,
+    Def = [{disc_copies, [Node1]}, {ram_copies, [Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),  
+    ?match(ok, mnesia:dirty_write({Tab, 1, test_nok})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, test_nok})),
+    ?match(ok, mnesia:dirty_write({Tab, 3, test_nok})),
+    ?match(ok, mnesia:dirty_write({Tab, 4, test_nok})),
+    ?match(ok, mnesia:dirty_write({Tab, 5, test_nok})),
+    File = "_treverse_backup.BUP",
+    File2 = "traverse_backup2.BUP",
+    File3 = "traverse_backup3.BUP",
+    ?match(ok, mnesia:backup(File)),
+            
+    Fun = fun({backup_tab, N, _}, Acc) -> {[{backup_tab, N, test_ok}], Acc+1};
+             (Other, Acc) -> {[Other], Acc}
+          end,
+
+    ?match({ok, 5}, mnesia:traverse_backup(File, read_only, Fun, 0)),
+    ?match(ok, file:delete(read_only)),
+    
+    ?match({ok, 5}, mnesia:traverse_backup(File, mnesia_backup, 
+                                           dummy, read_only, Fun, 0)),
+
+    ?match({ok, 5}, mnesia:traverse_backup(File, File2, Fun, 0)),    
+    ?match({ok, 5}, mnesia:traverse_backup(File2, mnesia_backup, 
+                                           File3, mnesia_backup, Fun, 0)),
+    
+    BadFun = fun({bad_tab, _N, asd}, Acc) -> {{error, error}, Acc} end,    
+    ?match({error, _}, mnesia:traverse_backup(File, read_only, BadFun, 0)),    
+    ?match({error, _}, file:delete(read_only)),
+    ?match(ok, file:delete(File)),
+    ?match(ok, file:delete(File2)),
+    ?match(ok, file:delete(File3)),
+    ?verify_mnesia(Nodes, []).
+
+
+install_fallback(doc) -> 
+    ["This tests the install_fallback intf.",
+     "It also verifies that the output from backup_checkpoint and traverse_backup",
+     "is valid"];
+install_fallback(suite) -> [];
+install_fallback(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = fallbacks_test,
+    Def = [{disc_copies, [Node1]}, {ram_copies, [Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),  
+    ?match(ok, mnesia:dirty_write({Tab, 1, test_nok})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, test_nok})),
+    ?match(ok, mnesia:dirty_write({Tab, 3, test_nok})),
+    ?match(ok, mnesia:dirty_write({Tab, 4, test_nok})),
+    ?match(ok, mnesia:dirty_write({Tab, 5, test_nok})),
+
+    Tab2 = fallbacks_test2,
+    Def2 = [{disc_copies, [node()]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),  
+    Tab3 = fallbacks_test3,
+    ?match({atomic, ok}, mnesia:create_table(Tab3, Def2)),  
+    Fun2 = fun(Key) ->
+		  Rec = {Tab2, Key, test_ok},
+		  mnesia:dirty_write(Rec),
+		  [Rec]
+	  end,
+    TabSize3 = 1000,
+    OldRecs2 = [Fun2(K) || K <- lists:seq(1, TabSize3)],
+    
+    Spec =[{name, cp_name}, {max,  mnesia:system_info(tables)}],
+    ?match({ok, _Name, Nodes}, mnesia:activate_checkpoint(Spec)),
+    ?match(ok, mnesia:dirty_write({Tab, 6, test_nok})),
+    [mnesia:dirty_write({Tab2, K, test_nok}) || K <- lists:seq(1, TabSize3 + 10)],
+    File = "install_fallback.BUP",
+    File2 = "install_fallback2.BUP",
+    File3 = "install_fallback3.BUP",
+    ?match(ok, mnesia:backup_checkpoint(cp_name, File)),
+        
+    Fun = fun({T, N, _}, Acc) when T == Tab ->
+		  case N rem 2 of 
+		      0 -> 
+			  io:format("write ~p -> ~p~n", [N, T]),
+			  {[{T, N, test_ok}], Acc + 1};
+		      1 ->
+			  io:format("write ~p -> ~p~n", [N, Tab3]),
+			  {[{Tab3, N, test_ok}], Acc + 1}
+		  end;
+             ({T, N}, Acc) when T == Tab ->
+		  case N rem 2 of 
+		      0 -> 
+			  io:format("delete ~p -> ~p~n", [N, T]),
+			  {[{T, N}], Acc + 1};
+		      1 ->
+			  io:format("delete ~p -> ~p~n", [N, Tab3]),
+			  {[{Tab3, N}], Acc + 1}
+		  end;
+             (Other, Acc) ->
+		  {[Other], Acc}
+          end,
+    ?match({ok, _}, mnesia:traverse_backup(File, File2, Fun, 0)),
+    ?match(ok, mnesia:install_fallback(File2)),
+    
+    mnesia_test_lib:kill_mnesia([Node1, Node2]),
+    timer:sleep(timer:seconds(1)), % Let it die!
+
+    ?match([], mnesia_test_lib:start_mnesia([Node1, Node2], [Tab, Tab2, Tab3])),
+
+    % Verify 
+    ?match([], mnesia:dirty_read({Tab, 1})),
+    ?match([{Tab3, 1, test_ok}], mnesia:dirty_read({Tab3, 1})),
+    ?match([{Tab, 2, test_ok}], mnesia:dirty_read({Tab, 2})),
+    ?match([], mnesia:dirty_read({Tab3, 2})),
+    ?match([], mnesia:dirty_read({Tab, 3})),
+    ?match([{Tab3, 3, test_ok}], mnesia:dirty_read({Tab3, 3})),
+    ?match([{Tab, 4, test_ok}], mnesia:dirty_read({Tab, 4})),
+    ?match([], mnesia:dirty_read({Tab3, 4})),
+    ?match([], mnesia:dirty_read({Tab, 5})),   
+    ?match([{Tab3, 5, test_ok}], mnesia:dirty_read({Tab3, 5})),   
+    ?match([], mnesia:dirty_read({Tab, 6})),   
+    ?match([], mnesia:dirty_read({Tab3, 6})),   
+    ?match([], [mnesia:dirty_read({Tab2, K}) || K <- lists:seq(1, TabSize3)] -- OldRecs2),
+    ?match(TabSize3, mnesia:table_info(Tab2, size)),
+
+    % Check the interface
+    file:delete(File3),
+    ?match({error, _}, mnesia:install_fallback(File3)),
+    ?match({error, _}, mnesia:install_fallback(File2, mnesia_badmod)),
+    ?match(ok, mnesia:install_fallback(File2, mnesia_backup)),
+    ?match(ok, file:delete(File)),
+    ?match(ok, file:delete(File2)),
+    ?match({error, _}, file:delete(File3)),
+    ?verify_mnesia(Nodes, []).
+
+uninstall_fallback(suite) -> [];
+uninstall_fallback(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = uinst_fallbacks_test,
+    File = "uinst_fallback.BUP",
+    File2 = "uinst_fallback2.BUP",
+    Def = [{disc_copies, [Node1]}, {ram_copies, [Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),  
+    ?match(ok, mnesia:dirty_write({Tab, 1, test_ok})),
+    ?match(ok, mnesia:backup(File)),
+    Fun = fun({T, N, _}, Acc) when T == Tab -> 
+                  {[{T, N, test_nok}], Acc+1};
+             (Other, Acc) -> {[Other], Acc}
+          end,
+    ?match({ok, _}, mnesia:traverse_backup(File, File2, Fun, 0)),
+    ?match({error, enoent}, mnesia:uninstall_fallback()),
+    ?match(ok, mnesia:install_fallback(File2)),
+    ?match(ok, file:delete(File)),
+    ?match(ok, file:delete(File2)),
+    ?match(ok, mnesia:uninstall_fallback()),
+    
+    mnesia_test_lib:kill_mnesia([Node1, Node2]),
+    timer:sleep(timer:seconds(1)), % Let it die!
+    ?match([], mnesia_test_lib:start_mnesia([Node1, Node2], [Tab])),
+    ?match([{Tab, 1, test_ok}], mnesia:dirty_read({Tab, 1})),
+    ?verify_mnesia(Nodes, []).
+
+local_fallback(suite) -> [];
+local_fallback(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = local_fallback,
+    File = "local_fallback.BUP",
+    Def = [{disc_copies, Nodes}],
+    Key = foo,
+    Pre =  {Tab, Key, pre},
+    Post =  {Tab, Key, post},
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),  
+    ?match(ok, mnesia:dirty_write(Pre)),
+    ?match(ok, mnesia:backup(File)),
+    ?match(ok, mnesia:dirty_write(Post)),
+    Local = [{scope, local}],
+    ?match({error, enoent}, mnesia:uninstall_fallback(Local)),
+    ?match(ok, mnesia:install_fallback(File, Local)),
+    ?match(true, mnesia:system_info(fallback_activated)),
+    ?match(ok, mnesia:uninstall_fallback(Local)),
+    ?match(false, mnesia:system_info(fallback_activated)),
+    ?match(ok, mnesia:install_fallback(File, Local)),
+    ?match(true, mnesia:system_info(fallback_activated)),
+    
+    ?match(false, rpc:call(Node2, mnesia, system_info , [fallback_activated])),
+    ?match(ok, rpc:call(Node2, mnesia, install_fallback , [File, Local])),
+    ?match([Post], mnesia:dirty_read({Tab, Key})),
+    ?match([Post], rpc:call(Node2, mnesia, dirty_read, [{Tab, Key}])),
+
+    ?match([], mnesia_test_lib:kill_mnesia(Nodes)),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, [Tab])),
+    ?match([Pre], mnesia:dirty_read({Tab, Key})),
+    ?match([Pre], rpc:call(Node2, mnesia, dirty_read, [{Tab, Key}])),
+    Dir = rpc:call(Node2, mnesia, system_info , [directory]),
+
+    ?match(ok, mnesia:dirty_write(Post)),
+    ?match([Post], mnesia:dirty_read({Tab, Key})),
+    ?match([], mnesia_test_lib:kill_mnesia([Node2])),
+    ?match(ok, mnesia:install_fallback(File, Local ++ [{mnesia_dir, Dir}])),
+    ?match([], mnesia_test_lib:kill_mnesia([Node1])),
+    
+    ?match([], mnesia_test_lib:start_mnesia([Node2], [])),
+    ?match(yes, rpc:call(Node2, mnesia, force_load_table, [Tab])),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, [Tab])), 
+    ?match([Pre], mnesia:dirty_read({Tab, Key})),
+   
+    ?match(ok, file:delete(File)),  
+    ?verify_mnesia(Nodes, []).
+    
+selective_backup_checkpoint(doc) -> 
+    ["Perform a selective backup of a checkpoint"];
+selective_backup_checkpoint(suite) -> [];
+selective_backup_checkpoint(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),    
+    Tab = sel_backup,
+    OmitTab = sel_backup_omit,
+    CpName = sel_cp,
+    Def = [{disc_copies, [Node1, Node2]}],
+    File = "selective_backup_checkpoint.BUP",
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),    
+    ?match({atomic, ok}, mnesia:create_table(OmitTab, Def)),    
+    ?match(ok, mnesia:dirty_write({Tab, 1, test_ok})),
+    ?match(ok, mnesia:dirty_write({OmitTab, 1, test_ok})),
+    CpSpec = [{name, CpName}, {max,  mnesia:system_info(tables)}],
+    ?match({ok, CpName, _Ns}, mnesia:activate_checkpoint(CpSpec)),
+
+    BupSpec = [{tables, [Tab]}],
+    ?match(ok, mnesia:backup_checkpoint(CpName, File, BupSpec)),
+
+    ?match([schema, sel_backup], bup_tables(File, mnesia_backup)),
+    ?match(ok, file:delete(File)),
+
+    BupSpec2 = [{tables, [Tab, OmitTab]}],
+    ?match(ok, mnesia:backup_checkpoint(CpName, File, BupSpec2)),
+
+    ?match([schema, sel_backup, sel_backup_omit],
+	   bup_tables(File, mnesia_backup)),
+    ?match(ok, file:delete(File)),
+    ?verify_mnesia(Nodes, []).
+
+bup_tables(File, Mod) ->
+    Fun = fun(Rec, Tabs) ->
+		  Tab = element(1, Rec),
+		  Tabs2 = [Tab | lists:delete(Tab, Tabs)],
+		  {[Rec], Tabs2}
+	  end,
+    case mnesia:traverse_backup(File, Mod, dummy, read_only, Fun, []) of
+	{ok, Tabs} ->
+	    lists:sort(Tabs);
+	{error, Reason} ->
+	    exit(Reason)
+    end.
+
+incremental_backup_checkpoint(doc) -> 
+    ["Perform a incremental backup of a checkpoint"];
+incremental_backup_checkpoint(suite) -> [];
+incremental_backup_checkpoint(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),    
+    Tab = incr_backup,
+    Def = [{disc_copies, [Node1]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    OldRecs = [{Tab, K, -K} || K <- lists:seq(1, 5)],
+    ?match([ok|_], [mnesia:dirty_write(R) || R <- OldRecs]),
+    OldCpName = old_cp,
+    OldCpSpec = [{name, OldCpName}, {min,  [Tab]}],
+    ?match({ok, OldCpName, _Ns}, mnesia:activate_checkpoint(OldCpSpec)),
+
+    BupSpec = [{tables, [Tab]}],
+    OldFile = "old_full_backup.BUP",
+    ?match(ok, mnesia:backup_checkpoint(OldCpName, OldFile, BupSpec)),
+    ?match(OldRecs, bup_records(OldFile, mnesia_backup)),
+    ?match(ok, mnesia:dirty_delete({Tab, 1})),
+    ?match(ok, mnesia:dirty_write({Tab, 2, 2})),
+    ?match(ok, mnesia:dirty_write({Tab, 3, -3})),
+
+    NewCpName = new_cp,
+    NewCpSpec = [{name, NewCpName}, {min,  [Tab]}],
+    ?match({ok, NewCpName, _Ns}, mnesia:activate_checkpoint(NewCpSpec)),
+    ?match(ok, mnesia:dirty_write({Tab, 4, 4})),
+
+    NewFile = "new_full_backup.BUP",
+    ?match(ok, mnesia:backup_checkpoint(NewCpName, NewFile, BupSpec)),
+    NewRecs = [{Tab, 2, 2}, {Tab, 3, -3},
+	       {Tab, 4, 4}, {Tab, 4}, {Tab, 4, -4}, {Tab, 5, -5}],
+    ?match(NewRecs, bup_records(NewFile, mnesia_backup)),
+
+    DiffFile = "diff_backup.BUP",
+    DiffBupSpec = [{tables, [Tab]}, {incremental, OldCpName}],
+    ?match(ok, mnesia:backup_checkpoint(NewCpName, DiffFile, DiffBupSpec)),
+    DiffRecs = [{Tab, 1}, {Tab, 2}, {Tab, 2, 2}, {Tab, 3}, {Tab, 3, -3},
+		{Tab, 4}, {Tab, 4, 4}, {Tab, 4}, {Tab, 4, -4}],
+    ?match(DiffRecs, bup_records(DiffFile, mnesia_backup)),
+
+    ?match(ok, mnesia:deactivate_checkpoint(OldCpName)),
+    ?match(ok, mnesia:deactivate_checkpoint(NewCpName)),
+    ?match(ok, file:delete(OldFile)),
+    ?match(ok, file:delete(NewFile)),
+    ?match(ok, file:delete(DiffFile)),
+
+    ?verify_mnesia(Nodes, []).
+
+bup_records(File, Mod) ->
+    Fun = fun(Rec, Recs) when element(1, Rec) == schema ->
+		  {[Rec], Recs};
+	     (Rec, Recs) ->
+		  {[Rec], [Rec | Recs]}
+	  end,
+    case mnesia:traverse_backup(File, Mod, dummy, read_only, Fun, []) of
+	{ok, Recs} ->
+	    lists:keysort(1, lists:keysort(2, lists:reverse(Recs)));
+	{error, Reason} ->
+	    exit(Reason)
+    end.
+
+sops_with_checkpoint(doc) -> 
+    ["Test schema operations during a checkpoint"];
+sops_with_checkpoint(suite) -> [];
+sops_with_checkpoint(Config) when is_list(Config) ->
+    Ns = ?acquire_nodes(2, Config),
+    
+    ?match({ok, cp1, Ns}, mnesia:activate_checkpoint([{name, cp1},{max,mnesia:system_info(tables)}])),
+    Tab = tab, 
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{disc_copies,Ns}])),
+    OldRecs = [{Tab, K, -K} || K <- lists:seq(1, 5)],
+    [mnesia:dirty_write(R) || R <- OldRecs],
+    
+    ?match({ok, cp2, Ns}, mnesia:activate_checkpoint([{name, cp2},{max,mnesia:system_info(tables)}])),
+    File1 = "cp1_delete_me.BUP",
+    ?match(ok, mnesia:dirty_write({Tab,6,-6})),
+    ?match(ok, mnesia:backup_checkpoint(cp1, File1)),
+    ?match(ok, mnesia:dirty_write({Tab,7,-7})),
+    File2 = "cp2_delete_me.BUP",
+    ?match(ok, mnesia:backup_checkpoint(cp2, File2)),
+    
+    ?match(ok, mnesia:deactivate_checkpoint(cp1)),
+    ?match(ok, mnesia:backup_checkpoint(cp2, File1)),
+    ?match(ok, mnesia:dirty_write({Tab,8,-8})),
+    
+    ?match({atomic,ok}, mnesia:delete_table(Tab)),
+    ?match({error,_}, mnesia:backup_checkpoint(cp2, File2)),
+    ?match({'EXIT',_}, mnesia:dirty_write({Tab,9,-9})),
+
+    ?match({atomic,_}, mnesia:restore(File1, [{default_op, recreate_tables}])), 
+    Test = fun(N) when N > 5 -> ?error("To many records in backup ~p ~n", [N]);
+	      (N) -> case mnesia:dirty_read(Tab,N) of
+			 [{Tab,N,B}] when -B =:= N -> ok;
+			 Other -> ?error("Not matching ~p ~p~n", [N,Other])
+		     end
+	   end,
+    [Test(N) || N <- mnesia:dirty_all_keys(Tab)],
+    ?match({aborted,enoent}, mnesia:restore(File2, [{default_op, recreate_tables}])), 
+    
+    file:delete(File1), file:delete(File2),
+
+    ?verify_mnesia(Ns, []).
diff --git a/lib/mnesia/test/mnesia_evil_coverage_test.erl b/lib/mnesia/test/mnesia_evil_coverage_test.erl
new file mode 100644
index 0000000000..668eba176f
--- /dev/null
+++ b/lib/mnesia/test/mnesia_evil_coverage_test.erl
@@ -0,0 +1,2347 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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(mnesia_evil_coverage_test).
+-author('[email protected]').
+-include("mnesia_test_lib.hrl").
+
+-compile([export_all]).
+
+-define(cleanup(N, Config),
+	mnesia_test_lib:prepare_test_case([{reload_appls, [mnesia]}],
+					  N, Config, ?FILE, ?LINE)).
+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() -> 
+    [system_info, table_info, error_description,
+     db_node_lifecycle, evil_delete_db_node, start_and_stop,
+     checkpoint, table_lifecycle, add_copy_conflict,
+     add_copy_when_going_down, replica_management,
+     schema_availability, local_content,
+     {group, table_access_modifications}, replica_location,
+     {group, table_sync}, user_properties, unsupp_user_props,
+     {group, record_name}, {group, snmp_access},
+     {group, subscriptions}, {group, iteration},
+     {group, debug_support}, sorted_ets,
+     {mnesia_dirty_access_test, all},
+     {mnesia_trans_access_test, all},
+     {mnesia_evil_backup, all}].
+
+groups() -> 
+    [{table_access_modifications, [],
+      [change_table_access_mode, change_table_load_order,
+       set_master_nodes, offline_set_master_nodes]},
+     {table_sync, [],
+      [dump_tables, dump_log, wait_for_tables,
+       force_load_table]},
+     {snmp_access, [],
+      [snmp_open_table, snmp_close_table, snmp_get_next_index,
+       snmp_get_row, snmp_get_mnesia_key, snmp_update_counter,
+       snmp_order]},
+     {subscriptions, [],
+      [subscribe_standard, subscribe_extended]},
+     {iteration, [], [foldl]},
+     {debug_support, [],
+      [info, schema_0, schema_1, view_0, view_1, view_2,
+       lkill, kill]},
+     {record_name, [], [{group, record_name_dirty_access}]},
+     {record_name_dirty_access, [],
+      [record_name_dirty_access_ram,
+       record_name_dirty_access_disc,
+       record_name_dirty_access_disc_only]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Get meta info about Mnesia
+
+system_info(suite) -> [];
+system_info(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(all, Config),
+    Ns = ?sort(Nodes),
+    ?match(yes, mnesia:system_info(is_running)),
+    ?match(Ns, ?sort(mnesia:system_info(db_nodes))),
+    ?match(Ns, ?sort(mnesia:system_info(running_db_nodes))),
+    ?match(A when is_atom(A), mnesia:system_info(debug)),
+    ?match(L when is_list(L), mnesia:system_info(directory)),
+    ?match(L when is_list(L), mnesia:system_info(log_version)),
+    ?match({_, _}, mnesia:system_info(schema_version)),
+    ?match(L when is_list(L), mnesia:system_info(tables)),
+    ?match(L when is_list(L), mnesia:system_info(local_tables)),
+    ?match(L when is_list(L), mnesia:system_info(held_locks)),
+    ?match(L when is_list(L), mnesia:system_info(lock_queue)),
+    ?match(L when is_list(L), mnesia:system_info(transactions)),
+    ?match(I when is_integer(I), mnesia:system_info(transaction_failures)),
+    ?match(I when is_integer(I), mnesia:system_info(transaction_commits)),
+    ?match(I when is_integer(I), mnesia:system_info(transaction_restarts)),
+    ?match(L when is_list(L), mnesia:system_info(checkpoints)),
+    ?match(A when is_atom(A), mnesia:system_info(backup_module)),
+    ?match(true, mnesia:system_info(auto_repair)),
+    ?match({_, _}, mnesia:system_info(dump_log_interval)),
+    ?match(A when is_atom(A), mnesia:system_info(dump_log_update_in_place)),
+    ?match(I when is_integer(I), mnesia:system_info(transaction_log_writes)),
+    ?match(I when is_integer(I), mnesia:system_info(send_compressed)),
+    ?match(L when is_list(L), mnesia:system_info(all)),
+    ?match({'EXIT', {aborted, Reason }} when element(1, Reason) == badarg
+           , mnesia:system_info(ali_baba)),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Get meta info about table
+
+table_info(suite) -> [];
+table_info(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    
+    Tab  = table_info,
+    Type = bag,
+    ValPos = 3,
+    Attrs = [k, v],
+    Arity = length(Attrs) +1,
+
+    Schema = 
+	case mnesia_test_lib:diskless(Config) of
+	    true -> [{type, Type}, {attributes, Attrs}, {index, [ValPos]},
+		     {ram_copies, Nodes}];
+	    false ->		
+		[{type, Type}, {attributes, Attrs}, {index, [ValPos]},
+		 {disc_only_copies, [Node1]}, {ram_copies, [Node2]}, 
+		 {disc_copies, [Node3]}]
+	end,
+    ?match({atomic, ok}, mnesia:create_table(Tab, Schema)),
+
+    Size = 10,
+    Keys = lists:seq(1, Size),
+    Records = [{Tab, A, 7} || A <- Keys],
+    lists:foreach(fun(Rec) -> ?match(ok, mnesia:dirty_write(Rec)) end, Records),
+    ?match(Mem when is_integer(Mem), mnesia:table_info(Tab, memory)),
+    ?match(Size, mnesia:table_info(Tab, size)),
+    ?match(Type, mnesia:table_info(Tab, type)),
+
+    case mnesia_test_lib:diskless(Config) of
+	true -> 
+	    ?match(Nodes, mnesia:table_info(Tab, ram_copies));
+	false ->              
+	    ?match([Node3], mnesia:table_info(Tab, mnesia_test_lib:storage_type(disc_copies, Config))),
+	    ?match([Node2], mnesia:table_info(Tab, ram_copies)),
+	    ?match([Node1], mnesia:table_info(Tab, mnesia_test_lib:storage_type(disc_only_copies, Config)))
+    end,
+    Read = [Node1, Node2, Node3],
+    ?match(true, lists:member(mnesia:table_info(Tab, where_to_read), Read)),
+    Write = ?sort([Node1, Node2, Node3]),
+    ?match(Write, ?sort(mnesia:table_info(Tab, where_to_write))),
+    ?match([ValPos], mnesia:table_info(Tab, index)),
+    ?match(Arity, mnesia:table_info(Tab, arity)),
+    ?match(Attrs, mnesia:table_info(Tab, attributes)),
+    ?match({Tab, '_', '_'}, mnesia:table_info(Tab, wild_pattern)),
+    ?match({atomic, Attrs}, mnesia:transaction(fun() ->
+						       mnesia:table_info(Tab, attributes) end)),
+
+    ?match(L when is_list(L), mnesia:table_info(Tab, all)),
+
+    %% Table info when table not loaded
+    ?match({atomic, ok},
+	   mnesia:create_table(tab_info, Schema)),
+    ?match(stopped, mnesia:stop()),
+    ?match(stopped, rpc:call(Node2, mnesia, stop, [])),
+    ?match(ok, mnesia:start()),
+    ?match(ok, mnesia:wait_for_tables([tab_info], 5000)),
+    ?match(0, mnesia:table_info(tab_info, size)),
+    ?verify_mnesia([Node1, Node3], [Node2]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Check the error descriptions
+
+error_description(suite) -> [];
+error_description(Config) when is_list(Config) ->
+    ?acquire_nodes(1, Config),
+    Errors = [nested_transaction, badarg, no_transaction, combine_error,
+              bad_index, already_exists, index_exists, no_exists, system_limit,
+              mnesia_down, not_a_db_node, bad_type, node_not_running, 
+              truncated_binary_file, active, illegal
+             ],
+    ?match(X when is_atom(X), mnesia:error_description({error, bad_error_msg})),
+    ?match(X when is_tuple(X), mnesia:error_description({'EXIT', pid, bad})),
+    %% This is real error msg
+    ?match(X when is_tuple(X), mnesia:error_description(
+                              {error, 
+                               {"Cannot prepare checkpoint (bad reply)",
+                                {{877,957351,758147},a@legolas},
+                                {error,{node_not_running,a1@legolas}}}})),
+    check_errors(error, Errors),
+    check_errors(aborted, Errors),
+    check_errors('EXIT', Errors).
+
+check_errors(_Err, []) -> ok;
+check_errors(Err, [Desc|R]) -> 
+    ?match(X when is_list(X), mnesia:error_description({Err, Desc})),
+    check_errors(Err, R).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Add and drop db nodes
+
+db_node_lifecycle(suite) -> [];
+db_node_lifecycle(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = AllNodes = ?acquire_nodes(3, Config),
+    Tab = db_node_lifecycle,
+
+    Who = fun(T) -> 
+		  L1 = mnesia:table_info(T, ram_copies),
+		  L2 = mnesia:table_info(T, disc_copies),
+		  L3 = mnesia:table_info(T, disc_only_copies),
+		  L1 ++ L2 ++ L3
+	  end,
+
+    SNs = ?sort(AllNodes),
+
+    Schema = [{name, Tab}, {ram_copies, [Node1, Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+
+    ?match([], mnesia_test_lib:stop_mnesia(AllNodes)),
+    ?match(ok, mnesia:delete_schema(AllNodes)),
+    ?match({error, _}, mnesia:create_schema(foo)),
+    ?match({error, _}, mnesia:create_schema([foo])),
+    ?match({error, _}, mnesia:create_schema([foo@bar])),
+    ?match(ok, mnesia:start()),
+    ?match(false, mnesia:system_info(use_dir)),
+    ?match({atomic, ok}, mnesia:create_table(Tab, [])),
+    ?match({aborted, {has_no_disc, Node1}}, mnesia:dump_tables([Tab])),
+    ?match({aborted, {has_no_disc, Node1}}, mnesia:change_table_copy_type(Tab, node(), disc_copies)),
+    ?match({aborted, {has_no_disc, Node1}}, mnesia:change_table_copy_type(Tab, node(), disc_only_copies)),
+
+    ?match(stopped, mnesia:stop()),
+
+    ?match(ok, mnesia:create_schema(AllNodes)),
+    ?match([], mnesia_test_lib:start_mnesia(AllNodes)),
+
+    ?match([SNs, SNs, SNs], 
+	   lists:map({lists, sort}, 
+		     element(1, rpc:multicall(AllNodes, mnesia, table_info, 
+					      [schema, disc_copies])))),
+
+    ?match({aborted, {already_exists, schema, Node2, _}},
+           mnesia:change_table_copy_type(schema, Node2, disc_copies)),
+    ?match({atomic, ok},
+           mnesia:change_table_copy_type(schema, Node2, ram_copies)),
+    ?match({aborted, {already_exists, schema, Node2, _}},
+           mnesia:change_table_copy_type(schema, Node2, ram_copies)),
+    
+    ?match({atomic, ok},
+           mnesia:change_table_copy_type(schema, Node2, disc_copies)),
+
+    ?match([SNs, SNs, SNs], 
+	   lists:map({lists, sort}, 
+		     element(1, rpc:multicall(AllNodes, mnesia, table_info, 
+					      [schema, disc_copies])))),
+
+    %% Delete the DB 
+
+    Tab2 = disk_tab,
+    Tab3 = not_local,
+    Tab4 = local,
+    Tab5 = remote,
+
+    Tabs = [Schema,
+	    [{name, Tab2},  {disc_copies, AllNodes}],
+	    [{name, Tab3},  {ram_copies, [Node2, Node3]}],
+	    [{name, Tab4},  {disc_only_copies, [Node1]}],
+	    [{name, Tab5},  {disc_only_copies, [Node2]}]],    
+
+    [?match({atomic, ok}, mnesia:create_table(T)) || T <- Tabs ],
+
+    ?match({aborted, {active, _, Node2}}, 
+	   mnesia:del_table_copy(schema, Node2)),
+
+    ?match([], mnesia_test_lib:stop_mnesia([Node1])),
+    ?match({aborted, {node_not_running, Node1}}, 
+	   mnesia:del_table_copy(schema, Node2)),
+
+    ?match([], mnesia_test_lib:start_mnesia([Node1],[Tab2,Tab4])),
+    ?match([], mnesia_test_lib:stop_mnesia([Node2])),
+    ?match({atomic, ok}, 
+	   mnesia:del_table_copy(schema, Node2)),
+
+    %% Check     
+    RemNodes = AllNodes -- [Node2],
+
+    ?match(RemNodes, mnesia:system_info(db_nodes)),     
+    ?match([Node1], Who(Tab)),
+    ?match(RemNodes, Who(Tab2)),
+    ?match([Node3], Who(Tab3)),
+    ?match([Node1], Who(Tab4)),
+    ?match({'EXIT', {aborted, {no_exists, _, _}}}, Who(Tab5)),
+
+    ?match({atomic, ok},
+           mnesia:change_table_copy_type(Tab2, Node3, ram_copies)),
+
+    ?match({atomic, ok},
+           mnesia:change_table_copy_type(schema, Node3, ram_copies)),
+
+    ?match([], mnesia_test_lib:stop_mnesia([Node3])),
+    ?match({atomic, ok}, 
+	   mnesia:del_table_copy(schema, Node3)),
+    ?match([Node1], mnesia:system_info(db_nodes)),     
+    ?match([Node1], Who(Tab)),
+    ?match([Node1], Who(Tab2)),
+    ?match({'EXIT', {aborted, {no_exists, _, _}}}, Who(Tab3)),
+    ?match([Node1], Who(Tab4)),
+    ?match({'EXIT', {aborted, {no_exists, _, _}}}, Who(Tab5)),
+
+    ?verify_mnesia([Node1], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Drop a db node when several disk resident nodes are down
+
+evil_delete_db_node(suite) -> [];
+evil_delete_db_node(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = AllNodes = ?acquire_nodes(3, Config),
+    Tab = evil_delete_db_node,
+
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{disc_copies, AllNodes}])),
+    
+    ?match([], mnesia_test_lib:stop_mnesia([Node2, Node3])),
+
+    ?match({atomic, ok}, mnesia:del_table_copy(schema, Node2)),
+    
+    RemNodes = AllNodes -- [Node2],
+    
+    ?match(RemNodes, mnesia:system_info(db_nodes)),
+    ?match(RemNodes, mnesia:table_info(Tab, disc_copies)),
+    
+    ?verify_mnesia([Node1], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Start and stop the system
+
+start_and_stop(suite) -> [];
+start_and_stop(Config) when is_list(Config) ->
+    [Node1 | _] = Nodes = ?acquire_nodes(all, Config),
+
+    ?match(stopped, rpc:call(Node1, mnesia, stop, [])),
+    ?match(stopped, rpc:call(Node1, mnesia, stop, [])),
+    ?match(ok, rpc:call(Node1, mnesia, start, [])),
+    ?match(ok, rpc:call(Node1, mnesia, start, [])),
+    ?match(stopped, rpc:call(Node1, mnesia, stop, [])),
+    ?verify_mnesia(Nodes -- [Node1], [Node1]),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes)),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Checkpoints and backup management
+
+checkpoint(suite) -> [];
+checkpoint(Config) when is_list(Config) ->
+    checkpoint(2, Config),
+    checkpoint(3, Config).
+
+checkpoint(NodeConfig, Config) ->
+    [Node1 | _] = TabNodes = ?acquire_nodes(NodeConfig, Config),
+    CreateTab = fun(Type, N, Ns) ->
+                        Tab0 = lists:concat(["local_checkpoint_", Type, N]),
+                        Tab = list_to_atom(Tab0),
+                        catch mnesia:delete_table(Tab),
+                        ?match({atomic, ok},
+                               mnesia:create_table(Tab, [{Type, Ns}])),
+                        Tab
+                end,
+    CreateTabs = fun(Type, Acc) ->
+                         [CreateTab(Type, 1, [hd(TabNodes)]),
+                          CreateTab(Type, 2, TabNodes),
+                          CreateTab(Type, 3, [lists:last(TabNodes)])] ++
+                             Acc
+                 end,
+    Types = [ram_copies, disc_copies, disc_only_copies],
+    Tabs = lists:foldl(CreateTabs, [], Types),
+    Recs = ?sort([{T, N, N} || T <- Tabs, N <- lists:seq(1, 10)]),
+    lists:foreach(fun(R) -> ?match(ok, mnesia:dirty_write(R)) end, Recs),
+
+    CpName = a_checkpoint_name,
+    MinArgs = [{name, CpName}, {min, Tabs}, {allow_remote, false}],
+    ?match({error, _}, rpc:call(Node1, mnesia, activate_checkpoint, [MinArgs])),
+
+    MaxArgs = [{name, CpName}, {max, Tabs}, {allow_remote, true}],
+    ?match({ok, CpName, L} when is_list(L),
+	   rpc:call(Node1, mnesia, activate_checkpoint, [MaxArgs])),
+    ?match(ok, rpc:call(Node1, mnesia, deactivate_checkpoint, [CpName])),
+
+    Args = [{name, CpName}, {min, Tabs}, {allow_remote, true}],
+    ?match({ok, CpName, L} when is_list(L),
+           rpc:call(Node1, mnesia, activate_checkpoint, [Args])),
+    Recs2 = ?sort([{T, K, 0} || {T, K, _} <- Recs]),
+    lists:foreach(fun(R) -> ?match(ok, mnesia:dirty_write(R)) end, Recs2),
+    ?match(ok, rpc:call(Node1, mnesia, deactivate_checkpoint, [CpName])),
+
+    ?match({error, Reason1 } when element(1, Reason1) == no_exists,
+           mnesia:deactivate_checkpoint(CpName)),
+    ?match({error, Reason2 } when element(1, Reason2) == badarg,
+           mnesia:activate_checkpoint(foo)),
+    ?match({error, Reason3 } when element(1, Reason3) == badarg,
+           mnesia:activate_checkpoint([{foo, foo}])),
+    ?match({error, Reason4 } when element(1, Reason4) == badarg,
+           mnesia:activate_checkpoint([{max, foo}])),
+    ?match({error, Reason5 } when element(1, Reason5) == badarg,
+           mnesia:activate_checkpoint([{min, foo}])),
+    ?match({error, _}, mnesia:activate_checkpoint([{min, [foo@bar]}])),
+    ?match({error, Reason6 } when element(1, Reason6) == badarg,
+           mnesia:activate_checkpoint([{allow_remote, foo}])),
+
+    Fun = fun(Tab) -> ?match({atomic, ok}, mnesia:delete_table(Tab)) end,
+    lists:foreach(Fun, Tabs),
+    ?verify_mnesia(TabNodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Create and delete tables
+
+%% Get meta info about table
+
+-define(vrl, mnesia_test_lib:verify_replica_location).
+
+replica_location(suite) -> [];
+replica_location(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Tab = replica_location,
+
+    %% Create three replicas
+    Schema = [{name, Tab}, {disc_only_copies, [Node1]},
+              {ram_copies, [Node2]}, {disc_copies, [Node3]}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match([], ?vrl(Tab, [Node1], [Node2], [Node3], Nodes)),
+
+    %% Delete one replica
+    ?match({atomic, ok}, mnesia:del_table_copy(Tab, Node2)),
+    ?match([], ?vrl(Tab, [Node1], [], [Node3], Nodes)),
+
+    %% Move one replica
+    ?match({atomic, ok}, mnesia:move_table_copy(Tab, Node1, Node2)),
+    ?match([], ?vrl(Tab, [Node2], [], [Node3], Nodes)),
+
+    %% Change replica type
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node2, ram_copies)),
+    ?match([], ?vrl(Tab, [], [Node2], [Node3], Nodes)),
+
+    ?verify_mnesia(Nodes, []).
+
+table_lifecycle(suite) -> [];
+table_lifecycle(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+
+    ?match({atomic, ok}, mnesia:create_table([{type, bag},
+					      {ram_copies, [Node1]},
+					      {attributes, [rajtan, tajtan]},
+					      {name, order_of_args}])),
+    ?match([], mnesia:dirty_read({order_of_args, 4711})),
+    ?match({atomic, ok}, mnesia:create_table([{name, already_exists},
+					      {ram_copies, [Node1]}])),
+    ?match({aborted, Reason23 } when element(1, Reason23) ==already_exists,
+	   mnesia:create_table([{name, already_exists}, 
+				{ram_copies, [Node1]}])),
+    ?match({aborted, Reason21 } when element(1, Reason21) == bad_type,
+           mnesia:create_table([{name, bad_node}, {ram_copies, ["foo"]}])),
+    ?match({aborted, Reason2} when element(1, Reason2) == bad_type,
+           mnesia:create_table([{name, zero_arity}, {attributes, []}])),
+    ?match({aborted, Reason3} when element(1, Reason3) == badarg,
+           mnesia:create_table([])),
+    ?match({aborted, Reason4} when element(1, Reason4) == badarg,
+           mnesia:create_table(atom)),
+    ?match({aborted, Reason5} when element(1, Reason5) == badarg,
+           mnesia:create_table({cstruct, table_name_as_atom})),
+    ?match({aborted, Reason6 } when element(1, Reason6) == bad_type,
+           mnesia:create_table([{name, no_host}, {ram_copies, foo}])),
+    ?match({aborted, Reason7 } when element(1, Reason7) == bad_type,
+           mnesia:create_table([{name, no_host}, {disc_only_copies, foo}])),
+    ?match({aborted, Reason8} when element(1, Reason8) == bad_type,
+           mnesia:create_table([{name, no_host}, {disc_copies, foo}])),
+
+    CreateFun =
+        fun() -> ?match({aborted, nested_transaction},
+                        mnesia:create_table([{name, nested_trans}])), ok
+        end,
+    ?match({atomic, ok}, mnesia:transaction(CreateFun)),
+    ?match({atomic, ok}, mnesia:create_table([{name, remote_tab},
+					      {ram_copies, [Node2]}])),
+
+    ?match({atomic, ok}, mnesia:create_table([{name, a_brand_new_tab},
+					      {ram_copies, [Node1]}])),
+    ?match([], mnesia:dirty_read({a_brand_new_tab, 4711})),
+    ?match({atomic, ok}, mnesia:delete_table(a_brand_new_tab)),
+    ?match({'EXIT', {aborted, Reason31}} when element(1, Reason31) == no_exists,
+           mnesia:dirty_read({a_brand_new_tab, 4711})),
+    ?match({aborted, Reason41} when element(1, Reason41) == no_exists,
+           mnesia:delete_table(a_brand_new_tab)),
+    ?match({aborted, Reason9} when element(1, Reason9) == badarg,
+           mnesia:create_table([])),
+
+    ?match({atomic, ok}, mnesia:create_table([{name, nested_del_trans},
+					      {ram_copies, [Node1]}])),
+
+    DeleteFun = fun() -> ?match({aborted, nested_transaction},
+                                mnesia:delete_table(nested_del_trans)), ok end,
+    ?match({atomic, ok}, mnesia:transaction(DeleteFun)),
+
+    ?match({aborted, Reason10} when element(1, Reason10) == bad_type,
+           mnesia:create_table([{name, create_with_index}, {index, 2}])),
+    ?match({aborted, Reason32} when element(1, Reason32) == bad_type,
+           mnesia:create_table([{name, create_with_index}, {index, [-1]}])),
+    ?match({aborted, Reason33} when element(1, Reason33) == bad_type,
+           mnesia:create_table([{name, create_with_index}, {index, [0]}])),
+    ?match({aborted, Reason34} when element(1, Reason34) == bad_type,
+           mnesia:create_table([{name, create_with_index}, {index, [1]}])),
+    ?match({aborted, Reason35} when element(1, Reason35) == bad_type,
+           mnesia:create_table([{name, create_with_index}, {index, [2]}])),
+    ?match({atomic, ok},
+           mnesia:create_table([{name, create_with_index}, {index, [3]},
+                                {ram_copies, [Node1]}])),
+    ets:new(ets_table, [named_table]),
+
+    ?match({aborted, _}, mnesia:create_table(ets_table, [{ram_copies, Nodes}])),
+
+    ?verify_mnesia(Nodes, []).
+
+add_copy_conflict(suite) -> [];
+add_copy_conflict(doc) -> 
+    ["Verify that OTP-5065 doesn't happen again, whitebox testing"];
+add_copy_conflict(Config) when is_list(Config) ->
+    Nodes = [Node1, Node2] = 
+	?acquire_nodes(2, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    
+    ?match({atomic, ok}, mnesia:create_table(a, [{ram_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(b, [{ram_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(test, [{ram_copies, [Node2]}])),            
+    mnesia:stop(),
+    ?match(ok,mnesia:start([{no_table_loaders, 1}])),
+
+    verify_ll_queue(10),
+
+    Self = self(),
+    Test = fun() ->
+		   Res = mnesia:add_table_copy(test, Node1, ram_copies),
+		   Self ! {test, Res}
+	   end,
+    %% Create conflict with loader queue.
+    spawn_link(Test),
+    ?match_receive(timeout),
+    %% Conflict ok
+    mnesia_controller:unblock_controller(),
+    
+    ?match_receive({test, {atomic,ok}}),
+    
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(1, Config).
+
+verify_ll_queue(0) ->
+    ?error("Couldn't find anything in queue~n",[]);
+verify_ll_queue(N) ->
+    ?match(granted,mnesia_controller:block_controller()),
+    case mnesia_controller:get_info(1000) of
+	{info,{state,_,true,[],_Loader,[],[],[],_,_,_,_,_,_}} ->
+	    %% Very slow SMP machines havn't loaded it yet..
+	    mnesia_controller:unblock_controller(),
+	    timer:sleep(10),
+	    verify_ll_queue(N-1);
+	{info,{state,_,true,[],Loader,LL,[],[],_,_,_,_,_,_}} ->
+	    io:format("~p~n", [{Loader,LL}]),
+	    ?match([_], LL);  %% Verify that something is in the loader queue
+	Else ->
+	    ?error("No match ~p maybe the internal format has changed~n",[Else])
+    end.
+
+add_copy_when_going_down(suite) -> [];
+add_copy_when_going_down(doc) -> 
+    ["Tests abort when node we load from goes down"];
+add_copy_when_going_down(Config) -> 
+    [Node1, Node2] = 
+	?acquire_nodes(2, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    ?match({atomic, ok}, mnesia:create_table(a, [{ram_copies, [Node1]}])),
+    %% Grab a write lock 
+    WriteAndWait = fun() -> 
+			   mnesia:write({a,1,1}),
+			   receive continue -> ok 
+			   end
+		   end,
+    _Lock = spawn(fun() -> mnesia:transaction(WriteAndWait) end),
+    Tester = self(),
+    spawn_link(fun() -> Res = rpc:call(Node2,mnesia, add_table_copy,
+				       [a, Node2, ram_copies]),
+			Tester ! {test, Res}
+	       end),
+    %% We have a lock here we should get a timeout
+    ?match_receive(timeout),
+    mnesia_test_lib:kill_mnesia([Node1]),
+    ?match_receive({test,{aborted,_}}),
+    ?verify_mnesia([Node2], []).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Add, drop and move replicas, change storage types
+%% Change table layout (only arity change supported)
+
+-record(replica_management, {k, v}).
+-record(new_replica_management, {k, v, extra}).
+
+-define(SS(R), lists:sort(element(1,R))).
+
+replica_management(doc) ->
+    "Add, drop and move replicas, change storage types.";
+replica_management(suite) ->
+    [];
+replica_management(Config) when is_list(Config) ->
+    %% add_table_copy/3, del_table_copy/2, move_table_copy/3,
+    %% change_table_copy_type/3, transform_table/3
+
+    Nodes = [Node1, Node2, Node3] = ?acquire_nodes(3, Config),
+
+    Tab = replica_management,
+    Attrs = record_info(fields, replica_management),
+
+    %%
+    %% Add, delete and change replicas
+    %%
+    ?match({atomic, ok},
+           mnesia:create_table([{name, Tab}, {attributes, Attrs},
+                                {ram_copies, [Node1, Node3]}])),
+    [?match(ok, mnesia:dirty_write({Tab, K, K + 2})) || K <-lists:seq(1, 10)],
+    ?match([], ?vrl(Tab, [], [Node1, Node3], [], Nodes)),
+    %% R - -
+    ?match({atomic, ok}, mnesia:dump_tables([Tab])),
+    ?match({aborted,  Reason50 } when element(1, Reason50) == combine_error,
+	   mnesia:add_table_copy(Tab, Node2, disc_copies)),
+    ?match({aborted,  Reason51 } when element(1, Reason51) == combine_error,
+           mnesia:change_table_copy_type(Tab, Node1, disc_copies)),
+    ?match({atomic, ok}, mnesia:clear_table(Tab)),
+    SyncedCheck = fun() ->
+			  mnesia:lock({record,Tab,0}, write),
+			  ?match([0,0,0], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size])))
+		  end,
+    mnesia:transaction(SyncedCheck),
+
+    ?match({[0,0,0], []}, rpc:multicall(Nodes, mnesia, table_info, [Tab, size])),
+    ?match({atomic, ok}, mnesia:del_table_copy(Tab, Node1)),
+    ?match({atomic, ok}, mnesia:del_table_copy(Tab, Node3)),
+    ?match([], ?vrl(Tab, [], [], [], Nodes)),
+    %% - - -
+    ?match({aborted,Reason52} when element(1, Reason52) ==  no_exists,
+           mnesia:add_table_copy(Tab, Node3, ram_copies)),
+
+    ?match({atomic, ok}, mnesia:create_table([{name, Tab},
+					      {attributes, Attrs},
+					      {disc_copies, [Node1]}])),
+    ?match([], ?vrl(Tab, [], [], [Node1], Nodes)),
+    %% D - -
+    [?match(ok, mnesia:dirty_write({Tab, K, K + 2})) || K <-lists:seq(1, 10)],
+
+    ?match({aborted,  Reason53} when element(1, Reason53) == badarg,
+           mnesia:add_table_copy(Tab, Node2, bad_storage_type)),
+    ?match({atomic, ok}, mnesia:add_table_copy(Tab, Node2, disc_only_copies)),
+    ?match([], ?vrl(Tab, [Node2], [], [Node1], Nodes)),
+    ?match([0,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+    %% D DO -
+    ?match({atomic, ok}, mnesia:add_table_copy(Tab, Node3, ram_copies)),
+    ?match([], ?vrl(Tab, [Node2], [Node3], [Node1], Nodes)),
+    ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+    %% D DO R
+    ?match({atomic, ok},
+           mnesia:change_table_copy_type(Tab, Node1, disc_only_copies)),
+    ?match([], ?vrl(Tab, [Node1, Node2], [Node3], [], Nodes)),
+    ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+    %% DO DO R
+    ?match({aborted,  Reason54} when element(1, Reason54) == already_exists,
+           mnesia:add_table_copy(Tab, Node3, ram_copies)),
+    ?match({atomic, ok}, mnesia:del_table_copy(Tab, Node1)),
+    ?match([], ?vrl(Tab, [Node2], [Node3], [], Nodes)),
+    %% - DO R
+    ?match({aborted, _}, mnesia:del_table_copy(Tab, Node1)),
+    ?match(Tab, ets:new(Tab, [named_table])),
+    ?match({aborted, _}, mnesia:add_table_copy(Tab, Node1, disc_copies)),
+    ?match(true, ets:delete(Tab)),
+    ?match({atomic, ok}, mnesia:add_table_copy(Tab, Node1, disc_copies)),
+    ?match([], ?vrl(Tab, [Node2], [Node3], [Node1], Nodes)),
+    ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+    %% D DO R
+    ?match({atomic, ok},mnesia:change_table_copy_type(Tab, Node3, disc_only_copies)),
+    ?match([], ?vrl(Tab, [Node2, Node3], [], [Node1], Nodes)),
+    ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+
+    %% D DO D0
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node3, ram_copies)),
+    ?match([], ?vrl(Tab, [Node2], [Node3], [Node1], Nodes)),
+    ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+    %% D DO R
+    ?match({atomic, ok},
+           mnesia:change_table_copy_type(Tab, Node2, disc_copies)),
+    ?match([], ?vrl(Tab, [], [Node3], [Node1,Node2], Nodes)),
+    ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+
+    %% D D R
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node1, disc_only_copies)),
+    ?match([], ?vrl(Tab, [Node1], [Node3], [Node2], Nodes)),
+    ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+
+    %% DO D R
+    ?match(Tab, ets:new(Tab, [named_table])),
+    ?match({aborted, _}, mnesia:change_table_copy_type(Tab, Node1, ram_copies)),
+    ?match(true, ets:delete(Tab)),
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node1, ram_copies)),
+    ?match([], ?vrl(Tab, [], [Node3,Node1], [Node2], Nodes)),
+    ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+    %% R D R
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node1, disc_copies)),
+    ?match([], ?vrl(Tab, [], [Node3], [Node2,Node1], Nodes)),
+    ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+
+    %% D D R
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node2, disc_only_copies)),
+    ?match([], ?vrl(Tab, [Node2], [Node3], [Node1], Nodes)),
+    ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+
+    %% D DO R
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, Node3, disc_only_copies)),
+    ?match([], ?vrl(Tab, [Node2, Node3], [], [Node1], Nodes)),
+    ?match([10,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+    %% D DO DO
+    %% test clear
+    ?match({atomic, ok}, mnesia:clear_table(Tab)),
+    mnesia:transaction(SyncedCheck),
+
+    %% rewrite for rest of testcase
+    [?match(ok, mnesia:dirty_write({Tab, K, K + 2})) || K <-lists:seq(1, 10)],
+
+    %% D DO DO
+    ?match({atomic, ok}, mnesia:del_table_copy(Tab, Node2)),
+    ?match([], ?vrl(Tab, [Node3], [], [Node1], Nodes)),
+    %% D - DO
+    ?match({aborted,  Reason55} when element(1, Reason55) == already_exists,
+           mnesia:change_table_copy_type(Tab, Node1, disc_copies)),
+
+    %%
+    %% Move replica
+    %%
+    ?match({atomic, ok}, mnesia:move_table_copy(Tab, Node1, Node2)),
+    ?match([], ?vrl(Tab, [Node3], [], [Node2], Nodes)),
+    ?match([0,10,10], ?SS(rpc:multicall(Nodes, mnesia, table_info, [Tab, size]))),
+    %% - D DO
+    ?match({aborted, _}, mnesia:move_table_copy(Tab, Node1, Node2)),
+    ?match([], mnesia_test_lib:stop_mnesia([Node3])),
+    ?match({atomic,ok}, mnesia:transaction(fun() -> mnesia:write({Tab, 43, sync_me}) end)),
+    ?match([], ?vrl(Tab, [Node3], [], [Node2],Nodes -- [Node3])),
+    %% - D DO
+    ?match({aborted,Reason56} when element(1, Reason56) == not_active,
+	   mnesia:move_table_copy(Tab, Node3, Node1)),
+    ?match([], ?vrl(Tab, [Node3], [], [Node2],Nodes -- [Node3])),
+    %% DO D -
+    ?match([], mnesia_test_lib:start_mnesia([Node3])),
+    ?match([], ?vrl(Tab, [Node3], [], [Node2], Nodes)),
+    %% DO D -
+    
+    %%
+    %% Transformer
+    %%
+
+    NewAttrs = record_info(fields, new_replica_management),
+    Transformer =
+        fun(Rec) when is_record(Rec, replica_management) -> 
+		#new_replica_management{k = Rec#replica_management.k,
+					v = Rec#replica_management.v,
+					extra = Rec#replica_management.k * 2}
+        end,
+    ?match({atomic, ok}, mnesia:transform_table(Tab, fun(R) -> R end, Attrs)),
+    ?match({atomic, ok}, mnesia:transform_table(Tab, Transformer, NewAttrs, new_replica_management)),
+
+    ERlist = [#new_replica_management{k = K, v = K+2, extra = K*2} || K <- lists:seq(1, 10)],
+    ARlist = [hd(mnesia:dirty_read(Tab, K)) || K <- lists:seq(1, 10)],
+
+    ?match(ERlist, ARlist),
+
+    ?match({aborted,  Reason56} when element(1, Reason56) == bad_type,
+           mnesia:transform_table(Tab, Transformer, 0)),
+    ?match({aborted, Reason57} when element(1, Reason57) ==  bad_type,
+           mnesia:transform_table(Tab, Transformer, -1)),
+    ?match({aborted, Reason58} when element(1, Reason58) ==  bad_type,
+           mnesia:transform_table(Tab, Transformer, [])),
+    ?match({aborted,  Reason59} when element(1, Reason59) == bad_type,
+           mnesia:transform_table(Tab, no_fun, NewAttrs)),
+    ?match({aborted,  Reason59} when element(1, Reason59) == bad_type,
+           mnesia:transform_table(Tab, fun(X) -> X end, NewAttrs, {tuple})),
+
+    %% OTP-3878 
+    ?match({atomic, ok}, mnesia:transform_table(Tab, ignore, 
+                                                NewAttrs ++ [dummy])),
+    ?match({atomic, ok}, mnesia:transform_table(Tab, ignore, 
+                                                NewAttrs ++ [dummy], last_rec)),
+
+    ARlist = [hd(mnesia:dirty_read(Tab, K)) || K <- lists:seq(1, 10)],
+    ?match({'EXIT',{aborted,{bad_type,_}}},
+           mnesia:dirty_write(Tab, #new_replica_management{})),
+    ?match(ok, mnesia:dirty_write(Tab, {last_rec, k, v, e, dummy})),
+
+    ?verify_mnesia(Nodes, []).
+
+schema_availability(doc) ->
+    ["Test that schema succeeds (or fails) as intended when some db nodes are down."];
+schema_availability(suite) ->
+    [];
+schema_availability(Config) when is_list(Config) ->
+    [N1, _N2, N3] = Nodes = ?acquire_nodes(3, Config),
+    Tab = schema_availability,
+    Storage = mnesia_test_lib:storage_type(ram_copies, Config),
+    Def1 = [{Storage, [N1, N3]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def1)),
+
+    N = 10,
+    ?match(ok, mnesia:sync_dirty(fun() -> [mnesia:write({Tab, K, K + 2}) || K <- lists:seq(1, N)], ok end)),
+    ?match({[N,0,N], []}, rpc:multicall(Nodes, mnesia, table_info, [Tab, size])),
+    ?match([], mnesia_test_lib:kill_mnesia([N3])),
+    ?match({[N,0,0], []}, rpc:multicall(Nodes, mnesia, table_info, [Tab, size])),
+
+    ?match([], mnesia_test_lib:start_mnesia([N3], [Tab])),
+    ?match({[N,0,N], []}, rpc:multicall(Nodes, mnesia, table_info, [Tab, size])),
+    ?match([], mnesia_test_lib:kill_mnesia([N3])),
+
+    ?match({atomic, ok}, mnesia:clear_table(Tab)),
+    ?match({[0,0,0], []}, rpc:multicall(Nodes, mnesia, table_info, [Tab, size])),
+
+    ?match([], mnesia_test_lib:start_mnesia([N3], [Tab])),
+    ?match({[0,0,0], []}, rpc:multicall(Nodes, mnesia, table_info, [Tab, size])),
+
+    ?verify_mnesia(Nodes, []).
+
+-define(badrpc(Tab), {badrpc, {'EXIT', {aborted,{no_exists,Tab}}}}).
+
+local_content(doc) ->
+    ["Test local_content functionality, we want to see that correct"
+     " properties gets propageted correctly between nodes"];
+local_content(suite) -> [];
+local_content(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config), 
+    Tab1 = local1,
+    Def1 = [{local_content, true}, {ram_copies, Nodes}],
+    Tab2 = local2,
+    Def2 = [{local_content, true}, {disc_copies, [Node1]}],
+    Tab3 = local3,
+    Def3 = [{local_content, true}, {disc_only_copies, [Node1]}],
+    Tab4 = local4,
+    Def4 = [{local_content, true}, {ram_copies, [Node1]}],
+
+    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+    ?match({atomic, ok}, mnesia:create_table(Tab3, Def3)),
+    ?match({atomic, ok}, mnesia:create_table(Tab4, Def4)),
+
+    ?match(ok, rpc:call(Node1, mnesia, dirty_write, [{Tab1, 1, Node1}])),
+    ?match(ok, rpc:call(Node2, mnesia, dirty_write, [{Tab1, 1, Node2}])),
+    ?match(ok, rpc:call(Node3, mnesia, dirty_write, [{Tab1, 1, Node3}])),
+    ?match(ok, rpc:call(Node1, mnesia, dirty_write, [{Tab2, 1, Node1}])),
+    ?match(ok, rpc:call(Node1, mnesia, dirty_write, [{Tab3, 1, Node1}])),
+    ?match(ok, rpc:call(Node1, mnesia, dirty_write, [{Tab4, 1, Node1}])),
+
+    ?match(?badrpc(Tab2), rpc:call(Node2, mnesia, dirty_write, [{Tab2, 1, Node2}])),
+    ?match(?badrpc(Tab3), rpc:call(Node2, mnesia, dirty_write, [{Tab3, 1, Node2}])),
+    ?match(?badrpc(Tab4), rpc:call(Node2, mnesia, dirty_write, [{Tab4, 1, Node2}])),
+
+    ?match({atomic, ok}, rpc:call(Node1, mnesia, add_table_copy, [Tab2, Node2, ram_copies])),    
+    ?match({atomic, ok}, rpc:call(Node2, mnesia, add_table_copy, [Tab3, Node2, disc_copies])),
+    ?match({atomic, ok}, rpc:call(Node3, mnesia, add_table_copy, [Tab4, Node2, disc_only_copies])),
+    ?match([], rpc:call(Node2, mnesia, dirty_read, [{Tab2, 1}])),
+    ?match([], rpc:call(Node2, mnesia, dirty_read, [{Tab3, 1}])),
+    ?match([], rpc:call(Node2, mnesia, dirty_read, [{Tab4, 1}])),
+
+    ?match(ok, rpc:call(Node2, mnesia, dirty_write, [{Tab2, 1, Node2}])),
+    ?match(ok, rpc:call(Node2, mnesia, dirty_write, [{Tab3, 1, Node2}])),
+    ?match(ok, rpc:call(Node2, mnesia, dirty_write, [{Tab4, 1, Node2}])),
+
+    ?match([{Tab1, 1, Node1}], rpc:call(Node1, mnesia, dirty_read, [{Tab1, 1}])),
+    ?match([{Tab2, 1, Node1}], rpc:call(Node1, mnesia, dirty_read, [{Tab2, 1}])),
+    ?match([{Tab3, 1, Node1}], rpc:call(Node1, mnesia, dirty_read, [{Tab3, 1}])),
+    ?match([{Tab4, 1, Node1}], rpc:call(Node1, mnesia, dirty_read, [{Tab4, 1}])),
+
+    ?match([{Tab1, 1, Node2}], rpc:call(Node2, mnesia, dirty_read, [{Tab1, 1}])),
+    ?match([{Tab2, 1, Node2}], rpc:call(Node2, mnesia, dirty_read, [{Tab2, 1}])),
+    ?match([{Tab3, 1, Node2}], rpc:call(Node2, mnesia, dirty_read, [{Tab3, 1}])),
+    ?match([{Tab4, 1, Node2}], rpc:call(Node2, mnesia, dirty_read, [{Tab4, 1}])),
+
+    ?match([{Tab1, 1, Node3}], rpc:call(Node3, mnesia, dirty_read, [{Tab1, 1}])),
+    ?match(?badrpc([_Tab2, 1]), rpc:call(Node3, mnesia, dirty_read, [{Tab2, 1}])),
+    ?match(?badrpc([_Tab3, 1]), rpc:call(Node3, mnesia, dirty_read, [{Tab3, 1}])),
+    ?match(?badrpc([_Tab4, 1]), rpc:call(Node3, mnesia, dirty_read, [{Tab4, 1}])),
+
+    ?match({atomic, ok}, 
+	   mnesia:change_table_copy_type(schema, Node3, ram_copies)),
+    ?match([], mnesia_test_lib:stop_mnesia([Node3])),
+
+    %% Added for OTP-44306
+    ?match(ok, rpc:call(Node3, mnesia, start, [])),
+    ?match({ok, _}, mnesia:change_config(extra_db_nodes, [Node3])),
+
+    mnesia_test_lib:sync_tables([Node3], [Tab1]),
+
+    ?match([], rpc:call(Node3, mnesia, dirty_read, [{Tab1, 1}])),
+
+    ?match({atomic, ok}, rpc:call(Node1, mnesia, clear_table, [Tab1])),
+    
+    SyncedCheck = fun(Tab) ->
+			  mnesia:lock({record,Tab,0}, write),
+			  {OK, []} = rpc:multicall(Nodes, mnesia, table_info, [Tab, size]),
+			  OK
+		  end,
+    ?match({atomic, [0,1,0]}, mnesia:transaction(SyncedCheck, [Tab1])),
+    ?match({atomic, ok}, rpc:call(Node2, mnesia, clear_table, [Tab2])),    
+    ?match({atomic, [1,0,0]}, mnesia:transaction(SyncedCheck, [Tab2])),
+    ?match({atomic, ok}, rpc:call(Node2, mnesia, clear_table, [Tab3])),    
+    ?match({atomic, [1,0,0]}, mnesia:transaction(SyncedCheck, [Tab3])),
+
+    ?verify_mnesia(Nodes, []).
+
+
+change_table_access_mode(suite) -> [];
+change_table_access_mode(Config) when is_list(Config) -> 
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Tab = test_access_mode_tab,
+
+    Def = case  mnesia_test_lib:diskless(Config) of
+	      true -> [{name, Tab}, {ram_copies, Nodes}];
+	      false -> [{name, Tab}, {ram_copies, [Node1]}, 
+			{disc_copies, [Node2]},
+			{disc_only_copies, [Node3]}]
+	  end,
+    ?match({atomic, ok}, mnesia:create_table(Def)),
+
+    Write = fun(What) -> mnesia:write({Tab, 1, What}) end,
+    Read = fun() -> mnesia:read({Tab, 1}) end,
+
+    ?match({atomic, ok}, mnesia:transaction(Write, [test_ok])),
+    %% test read_only
+    ?match({atomic, ok}, mnesia:change_table_access_mode(Tab, read_only)),
+    ?match({aborted, _}, mnesia:transaction(Write, [nok])),
+    ?match({'EXIT', {aborted, _}}, mnesia:dirty_write({Tab, 1, [nok]})),
+    ?match({aborted, _}, rpc:call(Node2, mnesia, transaction, [Write, [nok]])),
+    ?match({aborted, _}, rpc:call(Node3, mnesia, transaction, [Write, [nok]])),
+    ?match({atomic, [{Tab, 1, test_ok}]}, mnesia:transaction(Read)),
+    %% test read_write
+    ?match({atomic, ok}, mnesia:change_table_access_mode(Tab, read_write)),
+    ?match({atomic, ok}, mnesia:transaction(Write, [test_ok1])),
+    ?match({atomic, [{Tab, 1, test_ok1}]}, mnesia:transaction(Read)),
+    ?match({atomic, ok}, rpc:call(Node2, mnesia, transaction, [Write, [test_ok2]])),
+    ?match({atomic, [{Tab, 1, test_ok2}]}, mnesia:transaction(Read)),
+    ?match({atomic, ok}, rpc:call(Node3, mnesia, transaction, [Write, [test_ok3]])),
+    ?match({atomic, [{Tab, 1, test_ok3}]}, mnesia:transaction(Read)),
+
+    ?match({atomic, ok}, mnesia:delete_table(Tab)),
+
+    Def4 = [{name, Tab}, {access_mode, read_only_bad}],
+    ?match({aborted, {bad_type, _, _}}, mnesia:create_table(Def4)),
+
+    Def2 = [{name, Tab}, {access_mode, read_only}],
+    ?match({atomic, ok}, mnesia:create_table(Def2)),
+    ?match({aborted, _}, mnesia:transaction(Write, [nok])),
+
+    ?match({atomic, ok}, mnesia:change_table_access_mode(Tab, read_write)),
+    ?match({atomic, ok}, mnesia:delete_table(Tab)),
+
+    Def3 = [{name, Tab}, {mnesia_test_lib:storage_type(disc_copies, Config),
+			  [Node1, Node2]},
+	    {access_mode, read_write}],
+    ?match({atomic, ok}, mnesia:create_table(Def3)),
+    ?match({atomic, ok}, mnesia:transaction(Write, [ok])),
+    ?match({atomic, ok}, mnesia:change_table_access_mode(Tab, read_only)),
+    ?match({aborted, _}, mnesia:del_table_copy(Tab, Node2)),
+    ?match({aborted, _}, mnesia:del_table_copy(Tab, Node1)),
+    ?match({aborted, _}, mnesia:delete_table(Tab)),
+    ?match({atomic, ok}, mnesia:change_table_access_mode(Tab, read_write)),
+
+    ?match({aborted, {bad_type, _, _}},
+	   mnesia:change_table_access_mode(Tab, strange_atom)),
+    ?match({atomic, ok}, mnesia:delete_table(Tab)),
+
+    ?match({aborted, {no_exists, _}}, 
+	   mnesia:change_table_access_mode(err_tab, read_only)),
+    ?match({aborted, {no_exists, _}}, 
+	   mnesia:change_table_access_mode([Tab], read_only)),
+    ?verify_mnesia(Nodes, []).
+
+change_table_load_order(suite) -> [];
+change_table_load_order(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Tab1 = load_order_tab1,
+    Tab2 = load_order_tab2,
+    Tab3 = load_order_tab3,
+
+    Def = case mnesia_test_lib:diskless(Config) of
+	      true -> [{ram_copies, Nodes}]; 
+	      false ->		  
+		  [{ram_copies, [Node1]}, 
+		   {disc_copies, [Node2]},
+		   {disc_only_copies, [Node3]}]
+	  end,
+    ?match({atomic, ok}, mnesia:create_table(Tab1, Def)),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def)),
+    ?match({atomic, ok}, mnesia:create_table(Tab3, Def)),
+
+    ?match({aborted, _}, mnesia:change_table_load_order(Tab1, should_be_integer)),       
+    ?match({aborted, _}, mnesia:change_table_load_order(err_tab, 5)),       
+    ?match({aborted, _}, mnesia:change_table_load_order([err_tab], 5)),       
+    ?match({atomic, ok}, mnesia:change_table_load_order(Tab1, 5)),       
+    ?match({atomic, ok}, mnesia:change_table_load_order(Tab2, 4)),    
+    ?match({atomic, ok}, mnesia:change_table_load_order(Tab3, 73)),
+
+    ?match({aborted, _}, mnesia:change_table_load_order(schema, -32)),   
+
+    ?verify_mnesia(Nodes, []).
+
+set_master_nodes(suite) -> [];
+set_master_nodes(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Tab1 = master_node_tab1,
+    Tab2 = master_node_tab2,
+    Tab3 = master_node_tab3,
+    Def1 = [{ram_copies, [Node1, Node2]}],
+    Def2 = [{disc_copies, [Node2, Node3]}],
+    Def3 = [{disc_only_copies, [Node3, Node1]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+    ?match({atomic, ok}, mnesia:create_table(Tab3, Def3)),
+
+    ?match({error, _}, mnesia:set_master_nodes(schema, ['[email protected]'])),
+    ?match({error, _}, mnesia:set_master_nodes(badtab, [Node2, Node3])),
+    ?match({error, _}, mnesia:set_master_nodes(Tab1, [Node3])),
+    ?match([], mnesia:table_info(Tab1, master_nodes)),
+
+    ?match(ok, mnesia:set_master_nodes(schema, [Node3, Node1])),
+    ?match([Node3, Node1], mnesia:table_info(schema, master_nodes)),
+    ?match(ok, mnesia:set_master_nodes(Tab1, [Node2])),
+    ?match([Node2], mnesia:table_info(Tab1, master_nodes)),
+    ?match(ok, mnesia:set_master_nodes(Tab1, [Node2, Node1])),
+    ?match([Node2, Node1], mnesia:table_info(Tab1, master_nodes)),
+    ?match(ok, mnesia:set_master_nodes(Tab2, [Node2])),  % Should set where_to_read to Node2!
+    ?match([Node2], mnesia:table_info(Tab2, master_nodes)),
+    ?match(ok, mnesia:set_master_nodes(Tab3, [Node3])),
+    ?match([Node3], mnesia:table_info(Tab3, master_nodes)),
+    ?match(ok, mnesia:set_master_nodes(Tab3, [])),
+    ?match([], mnesia:table_info(Tab3, master_nodes)),
+
+    ?match(ok, mnesia:set_master_nodes([Node1])),
+    ?match([Node1], mnesia:table_info(schema, master_nodes)),
+    ?match([Node1], mnesia:table_info(Tab1, master_nodes)),
+    ?match([], mnesia:table_info(Tab2, master_nodes)),
+    ?match([Node1], mnesia:table_info(Tab3, master_nodes)),
+
+    ?match(ok, mnesia:set_master_nodes([Node1, Node2])),
+    ?match([Node1, Node2], mnesia:table_info(schema, master_nodes)),
+    ?match([Node1, Node2], mnesia:table_info(Tab1, master_nodes)),
+    ?match([Node2], mnesia:table_info(Tab2, master_nodes)),
+    ?match([Node1], mnesia:table_info(Tab3, master_nodes)),
+
+    ?verify_mnesia(Nodes, []).
+
+offline_set_master_nodes(suite) -> [];
+offline_set_master_nodes(Config) when is_list(Config) ->
+    [Node] = Nodes = ?acquire_nodes(1, Config),
+    Tab1 = offline_master_node_tab1,
+    Tab2 = offline_master_node_tab2,
+    Tab3 = offline_master_node_tab3,
+    Tabs = ?sort([Tab1, Tab2, Tab3]),
+    Def1 = [{ram_copies, [Node]}],
+    Def2 = [{disc_copies, [Node]}],
+    Def3 = [{disc_only_copies, [Node]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+    ?match({atomic, ok}, mnesia:create_table(Tab3, Def3)),
+    ?match([], mnesia:system_info(master_node_tables)),
+    ?match([], mnesia_test_lib:stop_mnesia([Node])),
+
+    ?match(ok, mnesia:set_master_nodes(Tab1, [Node])),
+    ?match(ok, mnesia:set_master_nodes(Tab2, [Node])),
+    ?match(ok, mnesia:set_master_nodes(Tab3, [Node])),
+    ?match([], mnesia_test_lib:start_mnesia([Node])),
+    ?match(Tabs, ?sort(mnesia:system_info(master_node_tables))),
+
+    ?match([], mnesia_test_lib:stop_mnesia([Node])),
+    ?match(ok, mnesia:set_master_nodes(Tab1, [])),
+    ?match(ok, mnesia:set_master_nodes(Tab2, [])),
+    ?match(ok, mnesia:set_master_nodes(Tab3, [])),
+    ?match([], mnesia_test_lib:start_mnesia([Node])),
+    ?match([], mnesia:system_info(master_node_tables)),
+
+    ?match([], mnesia_test_lib:stop_mnesia([Node])),
+    ?match(ok, mnesia:set_master_nodes([Node])),
+    ?match([], mnesia_test_lib:start_mnesia([Node])),
+    AllTabs = ?sort([schema | Tabs]),
+    ?match(AllTabs, ?sort(mnesia:system_info(master_node_tables))),
+
+    ?match([], mnesia_test_lib:stop_mnesia([Node])),
+    ?match(ok, mnesia:set_master_nodes([])),
+    ?match([], mnesia_test_lib:start_mnesia([Node])),
+    ?match([], mnesia:system_info(master_node_tables)),
+
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Syncronize table with log or disc
+%%
+
+%% Dump ram tables on disc
+dump_tables(suite) -> [];
+dump_tables(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = dump_tables,
+    Schema = [{name, Tab}, {attributes, [k, v]}, {ram_copies, [Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+
+    %% Dump 10 records
+    Size = 10,
+    Keys = lists:seq(1, Size),
+    Records = [{Tab, A, 7} || A <- Keys],
+    lists:foreach(fun(Rec) -> ?match(ok, mnesia:dirty_write(Rec)) end, Records),
+
+    AllKeys = fun() -> ?sort(mnesia:all_keys(Tab)) end,
+
+    ?match({atomic, Keys}, mnesia:transaction(AllKeys)),
+    ?match({atomic, ok}, mnesia:dump_tables([Tab])),
+
+    %% Delete one record
+    ?match(ok, mnesia:dirty_delete({Tab, 5})),
+    Keys2 = lists:delete(5, Keys),
+
+    ?match({atomic, Keys2}, mnesia:transaction(AllKeys)),
+
+    %% Check that all 10 is restored after a stop
+    ?match([], mnesia_test_lib:stop_mnesia([Node1, Node2])),
+    ?match([], mnesia_test_lib:start_mnesia([Node1, Node2])),
+    ?match(ok, mnesia:wait_for_tables([Tab], infinity)),
+
+    ?match({atomic, Keys}, mnesia:transaction(AllKeys)),
+
+    ?match({aborted,Reason} when element(1, Reason) == no_exists,
+           mnesia:dump_tables([foo])),
+    ?verify_mnesia(Nodes, []).
+
+dump_log(suite) -> [];
+dump_log(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = dump_log,
+    Schema = [{name, Tab}, {attributes, [k, v]}, {ram_copies, [Node1, Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    Tab1 = dump_log1,
+    Schema1 = [{name, Tab1}, {attributes, [k, v]}, {disc_copies, [Node1]}],
+    ?match({atomic, ok}, mnesia:create_table(Schema1)),
+    Tab2 = dump_log2,
+    Schema2 = [{name, Tab2}, {attributes, [k, v]}, {disc_only_copies, [Node1]}],
+    ?match({atomic, ok}, mnesia:create_table(Schema2)),
+
+    ?match(ok, mnesia:dirty_write({Tab, 1, ok})),
+    ?match(ok, mnesia:dirty_write({Tab1, 1, ok})),
+    ?match(ok, mnesia:dirty_write({Tab2, 1, ok})),
+
+    ?match(dumped, mnesia:dump_log()),
+    ?match(dumped, rpc:call(Node2, mnesia, dump_log, [])),
+
+    ?match({atomic, ok}, mnesia:change_table_copy_type(schema, Node2, ram_copies)),
+    ?match(dumped, rpc:call(Node2, mnesia, dump_log, [])),
+
+    Self = self(),
+    spawn(fun() -> dump_log(100, Self) end),
+    spawn(fun() -> dump_log(100, Self) end),
+
+    ?match(ok, receive finished -> ok after 3000 -> timeout end),
+    ?match(ok, receive finished -> ok after 3000 -> timeout end),
+    
+    ?verify_mnesia(Nodes, []).
+
+dump_log(N, Tester) when N > 0 ->
+    mnesia:dump_log(),
+    dump_log(N-1, Tester);
+dump_log(_, Tester) ->
+    Tester ! finished.
+
+
+wait_for_tables(doc) -> 
+    ["Intf. test of wait_for_tables, see also force_load_table"];
+wait_for_tables(suite) -> [];
+wait_for_tables(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = wf_tab,
+    Schema = [{name, Tab}, {ram_copies, [Node1, Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match(ok, mnesia:wait_for_tables([wf_tab], infinity)),
+    ?match(ok, mnesia:wait_for_tables([], timer:seconds(5))),
+    ?match({timeout, [bad_tab]}, mnesia:wait_for_tables([bad_tab], timer:seconds(5))),
+    ?match(ok, mnesia:wait_for_tables([wf_tab], 0)),
+    ?match({error,_}, mnesia:wait_for_tables([wf_tab], -1)),
+    ?verify_mnesia(Nodes, []).
+
+force_load_table(suite) -> [];
+force_load_table(Config) when is_list(Config) ->
+    [Node1, Node2] = ?acquire_nodes(2, Config),
+    Tab = wf_tab,
+
+    Schema = [{name, Tab}, {disc_copies, [Node1, Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ?match(ok, mnesia:dirty_write({Tab, 1, test_ok})),
+    mnesia_test_lib:kill_mnesia([Node1]),
+    ?match(ok, rpc:call(Node2, mnesia, dirty_write, [{Tab, 1, test_nok}])),
+    mnesia_test_lib:kill_mnesia([Node2]),
+    %%    timer:sleep(timer:seconds(5)),
+    ?match(ok, mnesia:start()),
+    ?match({timeout, [Tab]}, mnesia:wait_for_tables([Tab], 5)),
+    ?match({'EXIT', _}, mnesia:dirty_read({Tab, 1})),
+    ?match(yes, mnesia:force_load_table(Tab)),
+    ?match([{Tab, 1, test_ok}], mnesia:dirty_read({Tab, 1})),
+
+    ?match({error, _}, mnesia:force_load_table(error_tab)),
+    ?verify_mnesia([Node1], [Node2]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+user_properties(doc) ->
+    ["Test of reading, writing and deletion of user properties",
+     "Plus initialization of user properties when a table is created",
+     "Do also test mnesia:table_info(Tab, user_properties)"];
+user_properties(suite) -> [];
+user_properties(Config) when is_list(Config) ->
+    [Node] = Nodes = ?acquire_nodes(1, Config),
+    Tab1 = user_properties_1,
+    Tab2 = user_properties_2,
+    Tab3 = user_properties_3,
+    Def1 = [{ram_copies, [Node]}, {user_properties, []}],
+    Def2 = [{mnesia_test_lib:storage_type(disc_copies, Config), [Node]}],
+    Def3 = [{mnesia_test_lib:storage_type(disc_only_copies, Config), [Node]}, 
+	    {user_properties, []}],
+
+    PropKey = my_prop,
+    Prop = {PropKey, some, elements},
+    Prop2 = {PropKey, some, other, elements},
+    YourProp= {your_prop},
+    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+    ?match({atomic, ok}, mnesia:create_table(Tab3, Def3)),
+
+    ?match([], mnesia:table_info(Tab1, user_properties)),
+    ?match([], mnesia:table_info(Tab2, user_properties)),
+    ?match([], mnesia:table_info(Tab3, user_properties)),
+
+    ?match({'EXIT', {no_exists, {Tab1, user_property, PropKey}}},
+	   mnesia:read_table_property(Tab1, PropKey)),
+    ?match({'EXIT', {no_exists, {Tab2, user_property, PropKey}}},
+	   mnesia:read_table_property(Tab2, PropKey)),
+    ?match({'EXIT', {no_exists, {Tab3, user_property, PropKey}}},
+	   mnesia:read_table_property(Tab3, PropKey)),
+
+    ?match({atomic, ok}, mnesia:write_table_property(Tab1, Prop)),
+    ?match({atomic, ok}, mnesia:write_table_property(Tab2, Prop)),
+    ?match({atomic, ok}, mnesia:write_table_property(Tab3, Prop)),
+    ?match({atomic, ok}, mnesia:write_table_property(Tab1, YourProp)),
+    ?match({atomic, ok}, mnesia:write_table_property(Tab2, YourProp)),
+    ?match({atomic, ok}, mnesia:write_table_property(Tab3, YourProp)),
+
+    ?match(Prop, mnesia:read_table_property(Tab1, PropKey)),
+    ?match(Prop, mnesia:read_table_property(Tab2, PropKey)),
+    ?match(Prop, mnesia:read_table_property(Tab3, PropKey)),
+
+    ?match({atomic, ok}, mnesia:write_table_property(Tab1, Prop2)),
+    ?match({atomic, ok}, mnesia:write_table_property(Tab2, Prop2)),
+    ?match({atomic, ok}, mnesia:write_table_property(Tab3, Prop2)),
+    ?match(Prop2, mnesia:read_table_property(Tab1, PropKey)),
+    ?match(Prop2, mnesia:read_table_property(Tab2, PropKey)),
+    ?match(Prop2, mnesia:read_table_property(Tab3, PropKey)),
+
+    ?match({atomic, ok}, mnesia:delete_table_property(Tab1, PropKey)),
+    ?match({atomic, ok}, mnesia:delete_table_property(Tab2, PropKey)),
+    ?match({atomic, ok}, mnesia:delete_table_property(Tab3, PropKey)),
+
+    ?match([YourProp], mnesia:table_info(Tab1, user_properties)),
+    ?match([YourProp], mnesia:table_info(Tab2, user_properties)),
+    ?match([YourProp], mnesia:table_info(Tab3, user_properties)),
+
+    Tab4 = user_properties_4,
+    ?match({atomic, ok}, 
+	   mnesia:create_table(Tab4, [{user_properties, [Prop]}])),
+
+    ?match([Prop], mnesia:table_info(Tab4, user_properties)),
+
+    %% Some error cases
+
+    ?match({aborted, {bad_type, Tab1, {}}},
+	   mnesia:write_table_property(Tab1, {})),
+    ?match({aborted, {bad_type, Tab1, ali}},
+	   mnesia:write_table_property(Tab1, ali)),
+
+    Tab5 = user_properties_5,
+    ?match({aborted, {bad_type, Tab5, {user_properties, {}}}}, 
+	   mnesia:create_table(Tab5, [{user_properties, {}}])),
+    ?match({aborted, {bad_type, Tab5, {user_properties, ali}}}, 
+	   mnesia:create_table(Tab5, [{user_properties, ali}])),
+    ?match({aborted, {bad_type, Tab5, {user_properties, [{}]}}}, 
+	   mnesia:create_table(Tab5, [{user_properties, [{}]}])),
+    ?match({aborted, {bad_type, Tab5, {user_properties, [ali]}}}, 
+	   mnesia:create_table(Tab5, [{user_properties, [ali]}])),
+
+    ?verify_mnesia(Nodes, []).
+
+
+unsupp_user_props(doc) ->
+    ["Simple test of adding user props in a schema_transaction"];
+unsupp_user_props(suite) -> [];
+unsupp_user_props(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config),
+    Tab1 = silly1,
+    Tab2 = silly2,
+    Storage = mnesia_test_lib:storage_type(ram_copies, Config),
+
+    ?match({atomic, ok}, rpc:call(Node1, mnesia,
+				  create_table, [Tab1, [{Storage, [Node1]}]])),
+    ?match({atomic, ok}, rpc:call(Node1, mnesia,
+				  create_table, [Tab2, [{Storage, [Node1]}]])),
+
+    F1 = fun() ->
+		 mnesia_schema:do_write_table_property(
+		   silly1, {prop, propval1}),
+		 mnesia_schema:do_write_table_property(
+		   silly2, {prop, propval2}), % same key as above
+		 mnesia_schema:do_write_table_property(
+		   schema, {prop, propval3})  % same key as above
+	 end,
+    ?match({atomic, ok}, rpc:call(Node1, mnesia_schema,
+				  schema_transaction, [F1])),
+
+    ?match([{prop,propval1}], rpc:call(Node1, mnesia,
+				       table_info, [silly1, user_properties])),
+    ?match([{prop,propval2}], rpc:call(Node1, mnesia,
+				       table_info, [silly2, user_properties])),
+    ?match([{prop,propval3}], rpc:call(Node1, mnesia,
+				       table_info, [schema, user_properties])),
+
+    F2 = fun() ->
+		 mnesia_schema:do_write_table_property(
+		   silly1, {prop, propval1a}),
+		 mnesia_schema:do_write_table_property(
+		   silly1, {prop, propval1b})  % same key as above
+	 end,
+    ?match({atomic, ok}, rpc:call(Node1, mnesia_schema,
+				  schema_transaction, [F2])),
+
+    ?match([{prop,propval1b}], rpc:call(Node1, mnesia,
+					table_info,
+					[silly1, user_properties])),
+    ?verify_mnesia([Node1], []).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+snmp_open_table(suite) -> [];
+snmp_open_table(Config) when is_list(Config) -> 
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab1 = local_snmp_table,
+
+    Storage = mnesia_test_lib:storage_type(disc_copies, Config),
+    Def1 = 
+	case mnesia_test_lib:diskless(Config) of
+	    true -> [{ram_copies, Nodes}];
+	    false ->		
+		[{disc_copies, [Node1]}, {ram_copies, [Node2]}]
+	end,
+
+    Tab2 = ext_snmp_table,
+    Def2 = [{Storage, [Node2]}],
+    ErrTab = non_existing_tab,
+    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+    ?match({atomic, ok}, mnesia:snmp_open_table(Tab1, [{key, integer}])),
+    ?match({atomic, ok}, mnesia:snmp_open_table(Tab2, [{key, integer}])),
+    ?match({aborted, _}, mnesia:snmp_open_table(ErrTab, [{key, integer}])),
+    ?verify_mnesia(Nodes, []).
+
+snmp_close_table(suite) -> [];
+snmp_close_table(Config) when is_list(Config) -> 
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab1 = local_snmp_table,
+    Storage = mnesia_test_lib:storage_type(disc_copies, Config),
+    Def1 = 
+	case mnesia_test_lib:diskless(Config) of
+	    true -> [{ram_copies, Nodes}];
+	    false ->		
+		[{disc_copies, [Node1]}, {ram_copies, [Node2]}]
+	end,
+
+    Tab2 = ext_snmp_table,
+    Def2 = [{snmp, [{key, integer}]}, {Storage, [Node2]}],
+    ErrTab = non_existing_tab,
+    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+    ?match({atomic, ok}, mnesia:create_table(no_snmp_tab, [])),
+    add_some_records(Tab1, Tab2, 3),    
+    ?match({atomic, ok}, mnesia:snmp_open_table(Tab1, [{key, integer}])),    
+    add_some_records(Tab1, Tab2, 5),    
+    ?match({atomic, ok}, mnesia:snmp_close_table(Tab1)),
+
+    Transform = fun(Tab, Key) ->
+			[{T,K,V}] = mnesia:read(Tab, Key, write),
+			mnesia:delete(T,K, write),
+			mnesia:write({T, {K,K}, V, 43+V})
+		end,
+    
+    ?match({atomic, ok}, mnesia:transform_table(Tab1, ignore, [key,val,new])),
+    ?match({atomic, ok},
+	   mnesia:transaction(fun() ->
+				      mnesia:write_lock_table(Tab1),
+				      Keys = mnesia:select(Tab1, [{{'_','$1','_'}, [],
+								   ['$1']}]),
+				      [Transform(Tab1, Key) || Key <- Keys],
+				      ok
+			      end)),
+    ?match([{Tab1, {1, 1}, 1, 44}], mnesia:dirty_read(Tab1, {1, 1})),
+    ?match({atomic, ok}, mnesia:snmp_open_table(Tab1, [{key,{integer,integer}}])),
+
+    ?match({atomic, ok}, mnesia:snmp_close_table(Tab2)),
+    ?match({atomic, ok}, mnesia:transform_table(Tab2, ignore, [key,val,new])),
+    ?match({atomic, ok},
+	   mnesia:transaction(fun() ->
+				      mnesia:write_lock_table(Tab2),
+				      Keys = mnesia:select(Tab2, [{{'_','$1','_'}, [],
+								   ['$1']}]),
+				      [Transform(Tab2, Key) || Key <- Keys],
+				      ok
+			      end)),
+    
+    ?match({atomic, ok}, mnesia:snmp_open_table(Tab2, [{key,{integer,integer}}])), 
+    
+    %% Should be aborted ????
+    ?match({atomic, ok}, mnesia:snmp_close_table(no_snmp_tab)),
+    ?match({aborted, _}, mnesia:snmp_close_table(ErrTab)),
+    ?verify_mnesia(Nodes, []).
+
+snmp_get_next_index(suite) -> [];
+snmp_get_next_index(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab1 = local_snmp_table,
+    Storage = mnesia_test_lib:storage_type(disc_copies, Config),
+    Def1 = 
+	case mnesia_test_lib:diskless(Config) of
+	    true -> [{ram_copies, Nodes}];
+	    false ->		
+		[{disc_copies, [Node1]}, {ram_copies, [Node2]}]
+	end,
+
+    Tab2 = ext_snmp_table,
+    Def2 = [{Storage, [Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+    ?match({atomic, ok}, mnesia:snmp_open_table(Tab1, [{key, integer}])),
+    ?match({atomic, ok}, mnesia:snmp_open_table(Tab2, [{key, integer}])),
+    add_some_records(Tab1, Tab2, 1),
+    Test = 
+	fun() ->
+		%% Test local tables
+		{success, Res11} = ?match({ok, _}, mnesia:snmp_get_next_index(Tab1,[])),
+		{ok, Index11} = Res11,
+		{success, _Res12} = 
+		    ?match(endOfTable, mnesia:snmp_get_next_index(Tab1, Index11)),
+		?match({'EXIT',_}, mnesia:snmp_get_next_index(Tab1, endOfTable)),
+
+		%% Test external table
+		{success, Res21} =
+		    ?match({ok, _}, mnesia:snmp_get_next_index(Tab2, [])),
+		{ok, Index21} = Res21,
+		{success, _Res22} = 
+		    ?match(endOfTable, mnesia:snmp_get_next_index(Tab2, Index21)),
+
+		{ok, Row} = mnesia:snmp_get_row(Tab1, Index11),		
+		?match(ok, mnesia:dirty_delete(Tab1, hd(Index11))),
+
+		?match(endOfTable, mnesia:snmp_get_next_index(Tab1,[])),
+
+		ok = mnesia:dirty_write(Row), %% Reset to coming tests
+
+		%% Test of non existing table
+		%%?match(endOfTable, mnesia:snmp_get_next_index(ErrTab, [])),
+		ok
+	end,
+    ?match(ok, Test()),
+    ?match({atomic,ok}, mnesia:transaction(Test)),
+    ?match(ok, mnesia:sync_dirty(Test)),
+    ?match(ok, mnesia:activity(transaction,Test,mnesia)),
+
+    %%io:format("**********Before ~p~n", [mnesia_lib:val({Tab1,snmp})]),
+    %%io:format(" ~p ~n", [ets:tab2list(mnesia_lib:val({local_snmp_table,{index,snmp}}))]),
+    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, [Tab1, Tab2])),
+    %%io:format("**********After ~p~n", [mnesia_lib:val({Tab1,snmp})]),
+    %%io:format(" ~p ~n", [ets:tab2list(mnesia_lib:val({local_snmp_table,{index,snmp}}))]),
+
+    ?match(ok, Test()),
+    ?match({atomic,ok}, mnesia:transaction(Test)),
+    ?match(ok, mnesia:sync_dirty(Test)),
+    ?match(ok, mnesia:activity(transaction,Test,mnesia)),
+
+    ?verify_mnesia(Nodes, []).
+
+add_some_records(Tab1, Tab2, N) ->
+    Recs1 = [{Tab1, I, I} || I <- lists:reverse(lists:seq(1, N))],
+    Recs2 = [{Tab2, I, I} || I <- lists:reverse(lists:seq(20, 20+N-1))],
+    lists:foreach(fun(R) -> mnesia:dirty_write(R) end, Recs1),
+    Fun = fun(R) -> mnesia:write(R) end,
+    Trans = fun() -> lists:foreach(Fun, Recs2) end, 
+    {atomic, ok} = mnesia:transaction(Trans),
+    %% Sync things, so everything gets everywhere!
+    {atomic, ok} = mnesia:sync_transaction(fun() -> mnesia:write(lists:last(Recs1)) end),
+    {atomic, ok} = mnesia:sync_transaction(fun() -> mnesia:write(lists:last(Recs2)) end),
+    ?sort(Recs1 ++ Recs2).
+
+snmp_get_row(suite) -> [];
+snmp_get_row(Config) when is_list(Config) -> 
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab1 = local_snmp_table,
+    Storage = mnesia_test_lib:storage_type(disc_copies, Config),
+    Def1 = 
+	case mnesia_test_lib:diskless(Config) of
+	    true -> [{ram_copies, Nodes}];
+	    false ->		
+		[{disc_copies, [Node1]}, {ram_copies, [Node2]}]
+	end,
+    Tab2 = ext_snmp_table,
+    Def2 = [{Storage, [Node2]}],
+    Tab3 = snmp_table,
+    Def3 = [{Storage, [Node1]}, 
+            {attributes, [key, data1, data2]}],    
+
+    Setup = fun() ->
+		    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+		    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+		    ?match({atomic, ok}, mnesia:create_table(Tab3, Def3)),
+		    ?match({atomic, ok}, mnesia:snmp_open_table(Tab1, [{key, integer}])),
+		    ?match({atomic, ok}, mnesia:snmp_open_table(Tab2, [{key, integer}])),
+		    ?match({atomic, ok}, mnesia:snmp_open_table(
+					   Tab3, [{key, {fix_string,integer}}])),
+		    add_some_records(Tab1, Tab2, 1)
+	    end,
+    Clear = fun() ->
+		    ?match({atomic, ok}, mnesia:delete_table(Tab1)),
+		    ?match({atomic, ok}, mnesia:delete_table(Tab2)),
+		    ?match({atomic, ok}, mnesia:delete_table(Tab3))
+	    end,
+    Test = 
+	fun() ->
+		%% Test local tables
+		{success, Res11} = 
+		    ?match({ok, [1]}, mnesia:snmp_get_next_index(Tab1,[])),
+		{ok, Index11} = Res11,
+		?match({ok, {Tab1,1,1}}, mnesia:snmp_get_row(Tab1, Index11)),    
+		?match(endOfTable, mnesia:snmp_get_next_index(Tab1, Index11)),
+		?match({'EXIT',_}, mnesia:snmp_get_row(Tab1, endOfTable)),
+		?match(undefined, mnesia:snmp_get_row(Tab1, [73])),
+		
+		Add = fun() ->  mnesia:write({Tab3, {"f_string", 3}, data1, data2}) end,
+		?match({atomic, ok}, mnesia:transaction(Add)),
+                {success, {ok, Index31}} = ?match({ok, RowIndex31} when is_list(RowIndex31), 
+						 mnesia:snmp_get_next_index(Tab3,[])),
+		?match({ok, Row31} when is_tuple(Row31), 
+					mnesia:snmp_get_row(Tab3, Index31)),
+		?match(endOfTable, mnesia:snmp_get_next_index(Tab3, Index31)),
+		Del = fun() -> mnesia:delete({Tab3,{"f_string",3}}) end,
+		?match({atomic, ok}, mnesia:transaction(Del)),
+		?match(undefined, mnesia:snmp_get_row(Tab3, "f_string" ++ [3])),
+		?match(undefined, mnesia:snmp_get_row(Tab3, "f_string" ++ [73])),
+
+                %% Test external table
+                {success, Res21} = ?match({ok,[20]}, mnesia:snmp_get_next_index(Tab2, [])),
+		{ok, Index21} = Res21,
+                ?match({ok, Row2} when is_tuple(Row2), mnesia:snmp_get_row(Tab2, Index21)), 
+                ?match(endOfTable, mnesia:snmp_get_next_index(Tab2, Index21)),
+                %% Test of non existing table
+                %% ?match(endOfTable, mnesia:snmp_get_next_index(ErrTab, [])),
+                ok
+	end,
+    Setup(),
+    ?match(ok, Test()),
+    Clear(), Setup(),
+    ?match({atomic,ok}, mnesia:transaction(Test)),
+    Clear(), Setup(),
+    ?match(ok, mnesia:sync_dirty(Test)),
+    Clear(), Setup(),
+    ?match(ok, mnesia:activity(transaction,Test,mnesia)),
+
+    Clear(), Setup(),
+    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, [Tab1, Tab2])),
+    ?match(ok, Test()),
+    Clear(), Setup(),
+    ?match([], mnesia_test_lib:stop_mnesia(Nodes)),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, [Tab1, Tab2])),
+    ?match({atomic,ok}, mnesia:transaction(Test)),
+
+    ?verify_mnesia(Nodes, []).
+
+snmp_get_mnesia_key(suite) -> [];
+snmp_get_mnesia_key(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Tab1 = local_snmp_table,
+    Storage = mnesia_test_lib:storage_type(disc_copies, Config),
+    Def1 = 
+	case mnesia_test_lib:diskless(Config) of
+	    true -> [{ram_copies, Nodes}];
+	    false ->		
+		[{disc_copies, [Node1]}, {ram_copies, [Node2]}]
+	end,
+
+    Tab2 = ext_snmp_table,
+    Def2 = [{Storage, [Node2]}],
+
+    Tab3 = fix_string,    
+    Setup = fun() -> 
+		    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+		    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+		    ?match({atomic, ok}, mnesia:create_table(Tab3, Def1)),
+		    ?match({atomic, ok}, mnesia:snmp_open_table(Tab1, [{key, integer}])),
+		    ?match({atomic, ok}, mnesia:snmp_open_table(Tab2, [{key, integer}])),
+		    ?match({atomic, ok}, mnesia:snmp_open_table(Tab3, [{key, {fix_string,integer}}])),
+
+		    add_some_records(Tab1, Tab2, 1)	    
+	    end,
+    Clear = fun() ->
+		    ?match({atomic, ok}, mnesia:delete_table(Tab1)),
+		    ?match({atomic, ok}, mnesia:delete_table(Tab2)),
+		    ?match({atomic, ok}, mnesia:delete_table(Tab3))
+	    end,
+    Test = 
+	fun() ->
+		%% Test local tables
+		{success, Res11} = 
+		    ?match({ok, [1]}, mnesia:snmp_get_next_index(Tab1,[])),
+		{ok, Index11} = Res11,
+		?match({ok, 1}, mnesia:snmp_get_mnesia_key(Tab1, Index11)),    
+		%% Test external tables
+		{success, Res21} =
+		    ?match({ok, [20]}, mnesia:snmp_get_next_index(Tab2, [])),
+		{ok, Index21} = Res21,
+		?match({ok, 20}, mnesia:snmp_get_mnesia_key(Tab2, Index21)),
+		?match(undefined, mnesia:snmp_get_mnesia_key(Tab2, [97])),
+		?match({'EXIT', _}, mnesia:snmp_get_mnesia_key(Tab2, 97)),
+
+		?match({atomic,ok}, mnesia:transaction(fun() -> mnesia:delete({Tab1,1}) end)),
+		?match(undefined, mnesia:snmp_get_mnesia_key(Tab1, Index11)),
+		
+		?match({atomic,ok},mnesia:transaction(fun() -> mnesia:write({Tab1,73,7}) end)),
+		?match({ok, 73}, mnesia:snmp_get_mnesia_key(Tab1, [73])),
+		?match({atomic,ok}, mnesia:transaction(fun() -> mnesia:delete({Tab1,73}) end)),
+		?match(undefined, mnesia:snmp_get_mnesia_key(Tab1, [73])),
+
+		?match({atomic,ok},mnesia:transaction(fun() -> mnesia:write({Tab3,{"S",5},7}) end)),
+		?match({ok,{"S",5}}, mnesia:snmp_get_mnesia_key(Tab3, [$S,5])),
+		?match({atomic,ok},mnesia:transaction(fun() -> mnesia:delete({Tab3,{"S",5}}) end)),
+		?match(undefined, mnesia:snmp_get_mnesia_key(Tab3, [$S,5])),
+
+		ok
+	end,
+    Setup(),
+    ?match(ok, Test()),
+    Clear(), Setup(),
+    ?match({atomic,ok}, mnesia:transaction(Test)),
+    Clear(), Setup(),
+    ?match(ok, mnesia:sync_dirty(Test)),
+    Clear(), Setup(),
+    ?match(ok, mnesia:activity(transaction,Test,mnesia)),
+    ?verify_mnesia(Nodes, []).
+
+snmp_update_counter(doc) ->
+    ["Verify that counters may be updated for tables with SNMP property"];
+snmp_update_counter(suite) -> [];
+snmp_update_counter(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    Tab = snmp_update_counter,
+    Def = [{attributes, [key, value]},
+           {snmp, [{key, integer}]},
+           {ram_copies, [Node1]}
+          ],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    Oid = {Tab, 1},
+    ?match([], mnesia:dirty_read(Oid)),
+    ?match(ok, mnesia:dirty_write({Tab, 1, 1})),
+    ?match([{Tab, _Key, 1}], mnesia:dirty_read(Oid)),
+    ?match(3, mnesia:dirty_update_counter(Oid, 2)),
+    ?match([{Tab, _Key, 3}], mnesia:dirty_read(Oid)),
+    ?verify_mnesia(Nodes, []).
+
+snmp_order(doc) ->
+    ["Verify that sort order is correct in transactions and dirty variants"];
+snmp_order(suite) -> [];
+snmp_order(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    Tab = snmp_order,
+    Def = [{attributes, [key, value]},
+           {snmp, [{key, {integer, integer, integer}}]},
+           {ram_copies, [Node1]}
+          ],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    Oid = {Tab, 1},
+    ?match([], mnesia:dirty_read(Oid)),
+    ?match({'EXIT', {aborted, _}}, mnesia:dirty_write({Tab, 1, 1})),
+    [mnesia:dirty_write({Tab, {A,B,2}, default}) ||
+	A <- lists:seq(1, 9, 2),
+	B <- lists:seq(2, 8, 2)],
+    
+    Test1 = fun() ->
+		    Keys0 = get_keys(Tab, []),
+		    ?match(Keys0, lists:sort(Keys0)),
+		    ?match([[1,2,2]|_], Keys0),
+		    Keys1 = get_keys(Tab, [5]),
+		    ?match(Keys1, lists:sort(Keys1)),
+		    ?match([[5,2,2]|_], Keys1),
+		    Keys2 = get_keys(Tab, [7, 4]),
+		    ?match(Keys2, lists:sort(Keys2)),
+		    ?match([[7,4,2]|_], Keys2),
+		    ok
+	    end,
+    ?match(ok, Test1()),
+    ?match({atomic, ok},mnesia:transaction(Test1)),
+    ?match(ok,mnesia:sync_dirty(Test1)),
+   
+    Test2 = fun() ->
+		    mnesia:write(Tab, {Tab,{0,0,2},updated}, write),
+		    mnesia:write(Tab, {Tab,{5,3,2},updated}, write),
+		    mnesia:write(Tab, {Tab,{10,10,2},updated}, write),
+		    Keys0 = get_keys(Tab, []),
+		    ?match([[0,0,2],[1,2,2]|_], Keys0),
+		    ?match(Keys0, lists:sort(Keys0)),
+		    
+		    Keys1 = get_keys(Tab, [5]),
+		    ?match([[5,2,2],[5,3,2]|_], Keys1),
+		    ?match(Keys1, lists:sort(Keys1)),
+		    
+		    Keys2 = get_keys(Tab, [7,4]),
+		    ?match([[7,4,2]|_], Keys2),
+		    ?match(Keys2, lists:sort(Keys2)),
+		    ?match([10,10,2], lists:last(Keys0)),
+		    ?match([10,10,2], lists:last(Keys1)),
+		    ?match([10,10,2], lists:last(Keys2)),
+		    
+		    ?match([[10,10,2]], get_keys(Tab, [10])),
+		    ok
+	    end,
+
+    ?match({atomic, ok},mnesia:transaction(Test2)),
+
+    ?verify_mnesia(Nodes, []).
+
+get_keys(Tab, Key) ->
+    case mnesia:snmp_get_next_index(Tab, Key) of
+	endOfTable -> [];
+	{ok, Next} ->
+	    [Next|get_keys(Tab, Next)]
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-record(tab, {i, e1, e2}).			% Simple test table
+
+
+subscribe_extended(doc) ->
+    ["Test the extended set of events, test with and without checkpoints. "];
+subscribe_extended(suite) ->
+    [];
+subscribe_extended(Config) when is_list(Config) ->
+    [N1, N2]=Nodes=?acquire_nodes(2, Config),
+    Tab1 = etab,
+    Storage = mnesia_test_lib:storage_type(ram_copies, Config),
+    Def1 = [{Storage, [N1, N2]}, {attributes, record_info(fields, tab)}],
+    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+
+    Tab2 = bag,
+    Def2 = [{Storage, [N1, N2]}, 
+	    {type, bag},
+	    {record_name, Tab1},
+	    {attributes, record_info(fields, tab)}],
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+
+    ?match({ok, N1}, mnesia:subscribe({table, Tab1, detailed})),
+    ?match({ok, N1}, mnesia:subscribe({table, Tab2, detailed})),
+
+    ?match({error, {already_exists, _}}, mnesia:subscribe({table, Tab1, simple})),
+    ?match({error, {badarg, {table, Tab1, bad}}}, mnesia:subscribe({table, Tab1, bad})),
+
+    ?match({ok, N1}, mnesia:subscribe(activity)),
+    test_ext_sub(Tab1, Tab2),
+    
+    ?match({ok, N1}, mnesia:unsubscribe(activity)),
+    ?match({ok, N1}, mnesia:subscribe({table, Tab1, detailed})),
+    ?match({atomic, ok}, mnesia:clear_table(Tab1)),
+    ?match({mnesia_table_event, {delete, schema, {schema, Tab1}, [{schema, Tab1, _}],_}}, recv_event()),
+    ?match({mnesia_table_event, {write, schema, {schema, Tab1, _}, [], _}}, recv_event()),
+
+    ?match({atomic, ok}, mnesia_schema:clear_table(Tab2)),
+    ?match({mnesia_table_event, {delete, schema, {schema, Tab2}, [{schema, Tab2, _}],_}}, 
+	   recv_event()),
+    ?match({mnesia_table_event, {write, schema, {schema, Tab2, _}, [], _}}, recv_event()),
+
+    ?match({ok, N1}, mnesia:unsubscribe({table, Tab2, detailed})),    
+    {ok, _, _} = mnesia:activate_checkpoint([{name, testing}, 
+					     {ram_overrides_dump, true}, 
+					     {max, [Tab1, Tab2]}]),
+    ?match({ok, N1}, mnesia:subscribe({table, Tab2, detailed})),
+    ?match({ok, N1}, mnesia:subscribe(activity)),
+    test_ext_sub(Tab1, Tab2),
+
+    ?verify_mnesia(Nodes, []).
+
+test_ext_sub(Tab1, Tab2) ->    
+    %% The basics 
+    Rec1 = {Tab1, 1, 0, 0},
+    Rec2 = {Tab1, 1, 1, 0},
+    Rec3 = {Tab1, 2, 1, 0},
+    Rec4 = {Tab1, 2, 2, 0},
+
+    Write  = fun(Tab, Rec) -> 
+		     mnesia:transaction(fun() -> mnesia:write(Tab, Rec, write) 
+					end) 
+	     end,
+    Delete = fun(Tab, Rec) -> 
+		     mnesia:transaction(fun() -> mnesia:delete(Tab, Rec, write) 
+					end) 
+	     end,
+    DelObj = fun(Tab, Rec) -> 
+		     mnesia:transaction(fun() -> mnesia:delete_object(Tab, Rec, write) 
+					end) 
+	     end,
+
+    S = self(),
+    D = {dirty, self()},
+    %% SET 
+    ?match(ok, mnesia:dirty_write(Rec1)),
+    ?match({mnesia_table_event, {write, Tab1, Rec1, [], D}}, recv_event()), 
+    ?match(ok, mnesia:dirty_write(Rec3)),
+    ?match({mnesia_table_event, {write, Tab1, Rec3, [], D}}, recv_event()),    
+    ?match(ok, mnesia:dirty_write(Rec1)),
+    ?match({mnesia_table_event, {write, Tab1, Rec1, [Rec1], D}}, recv_event()),
+    ?match({atomic, ok}, Write(Tab1, Rec2)),
+    ?match({mnesia_table_event, {write, Tab1, Rec2, [Rec1], {tid,_,S}}}, recv_event()),    
+    ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+    ?match(ok, mnesia:dirty_delete({Tab1, 2})),
+    ?match({mnesia_table_event, {delete, Tab1, {Tab1, 2}, [Rec3], D}}, recv_event()),
+    ?match({atomic, ok}, DelObj(Tab1, Rec2)),
+    ?match({mnesia_table_event, {delete, Tab1, Rec2, [Rec2], {tid,_,S}}}, recv_event()),
+    ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+
+    ?match({atomic, ok}, Delete(Tab1, 1)),
+    ?match({mnesia_table_event, {delete, Tab1, {Tab1, 1}, [], {tid,_,S}}}, recv_event()),
+    ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+    
+    ?match({ok, _N1}, mnesia:unsubscribe({table, Tab1, detailed})),
+
+    %% BAG 
+
+    ?match({atomic, ok}, Write(Tab2, Rec1)),
+    ?match({mnesia_table_event, {write, Tab2, Rec1, [], {tid,_,S}}}, recv_event()),
+    ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+    ?match({atomic, ok}, Write(Tab2, Rec4)),
+    ?match({mnesia_table_event, {write, Tab2, Rec4, [], {tid,_,S}}}, recv_event()),    
+    ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+    ?match({atomic, ok}, Write(Tab2, Rec3)),
+    ?match({mnesia_table_event, {write, Tab2, Rec3, [Rec4], {tid,_,S}}}, recv_event()),    
+    ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+    ?match({atomic, ok}, Write(Tab2, Rec2)),
+    ?match({mnesia_table_event, {write, Tab2, Rec2, [Rec1], {tid,_,S}}}, recv_event()),    
+    ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+    ?match({atomic, ok}, Write(Tab2, Rec1)),
+    ?match({mnesia_table_event, {write, Tab2, Rec1, [Rec1, Rec2], {tid,_,S}}}, recv_event()),
+    ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+    ?match({atomic, ok}, DelObj(Tab2, Rec2)),
+    ?match({mnesia_table_event, {delete, Tab2, Rec2, [Rec2], {tid,_,S}}}, recv_event()),
+    ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+    ?match({atomic, ok}, Delete(Tab2, 1)),
+    ?match({mnesia_table_event, {delete, Tab2, {Tab2, 1}, [Rec1], {tid,_,S}}}, recv_event()),
+    ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+    ?match({atomic, ok}, Delete(Tab2, 2)),
+    ?match({mnesia_table_event, {delete, Tab2, {Tab2, 2}, [Rec4, Rec3], {tid,_,S}}}, recv_event()),
+    ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+    ok.
+
+
+subscribe_standard(doc) ->
+    ["Tests system events and the orignal table events"];
+subscribe_standard(suite) -> [];
+subscribe_standard(Config) when is_list(Config)-> 
+    [N1, N2]=?acquire_nodes(2, Config),
+    Tab = tab,
+
+    Storage = mnesia_test_lib:storage_type(disc_copies, Config),
+    Def = [{Storage, [N1, N2]}, {attributes, record_info(fields, tab)}],
+
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+
+    %% Check system events
+    ?match({ok, N1}, mnesia:subscribe(system)),
+    ?match({ok, N1}, mnesia:subscribe(activity)),
+
+    ?match([], mnesia_test_lib:kill_mnesia([N2])),
+    ?match({mnesia_system_event, {mnesia_down, N2}}, recv_event()),
+    ?match(timeout, recv_event()),
+
+    ?match([], mnesia_test_lib:start_mnesia([N2], [Tab])),
+    ?match({mnesia_activity_event, _}, recv_event()),
+    ?match({mnesia_system_event,{mnesia_up, N2}}, recv_event()),
+
+    ?match(true, lists:member(self(), mnesia:system_info(subscribers))),
+    ?match([], mnesia_test_lib:kill_mnesia([N1])),
+    timer:sleep(500),
+    mnesia_test_lib:flush(),
+    ?match([], mnesia_test_lib:start_mnesia([N1], [Tab])),
+    ?match(timeout, recv_event()),
+
+    ?match({ok, N1}, mnesia:subscribe(system)),
+    ?match({error, {already_exists, system}}, mnesia:subscribe(system)),
+    ?match(stopped, mnesia:stop()),
+    ?match({mnesia_system_event, {mnesia_down, N1}}, recv_event()),
+    ?match({error, {node_not_running, N1}}, mnesia:subscribe(system)),
+    ?match([], mnesia_test_lib:start_mnesia([N1, N2], [Tab])),
+
+    %% Check table events
+    ?match({ok, N1}, mnesia:subscribe(activity)),
+    Old_Level = mnesia:set_debug_level(trace),
+    ?match({ok, N1}, mnesia:subscribe({table,Tab})),
+
+    ?match({atomic, ok},
+	   mnesia:transaction(fun() -> mnesia:write(#tab{i=155}) end)),
+    Self = self(),
+    ?match({mnesia_table_event, {write, _, _}}, recv_event()),
+    ?match({mnesia_activity_event, {complete, {tid, _, Self}}}, recv_event()),
+
+    ?match({ok, N1}, mnesia:unsubscribe({table,Tab})),
+    ?match({ok, N1}, mnesia:unsubscribe(activity)),
+
+    ?match({atomic, ok},
+	   mnesia:transaction(fun() -> mnesia:write(#tab{i=255}) end)),
+    
+    ?match(timeout, recv_event()),
+    mnesia:set_debug_level(Old_Level),
+
+    %% Check deletion of replica
+
+    ?match({ok, N1}, mnesia:subscribe({table,Tab})),
+    ?match({ok, N1}, mnesia:subscribe(activity)),
+    ?match(ok, mnesia:dirty_write(#tab{i=355})),
+    ?match({mnesia_table_event, {write, _, _}}, recv_event()),
+    ?match({atomic, ok}, mnesia:del_table_copy(Tab, N1)),
+    ?match({mnesia_activity_event, _}, recv_event()),
+    ?match(ok, mnesia:dirty_write(#tab{i=455})),
+    ?match(timeout, recv_event()),
+
+    ?match({atomic, ok}, mnesia:move_table_copy(Tab, N2, N1)),
+    ?match({mnesia_activity_event, _}, recv_event()),
+    ?match({ok, N1}, mnesia:subscribe({table,Tab})),
+    ?match(ok, mnesia:dirty_write(#tab{i=555})),
+    ?match({mnesia_table_event, {write, _, _}}, recv_event()),
+    ?match({atomic, ok}, mnesia:move_table_copy(Tab, N1, N2)),
+    ?match({mnesia_activity_event, _}, recv_event()),
+    ?match(ok, mnesia:dirty_write(#tab{i=655})),
+    ?match(timeout, recv_event()),
+
+    ?match({atomic, ok}, mnesia:add_table_copy(Tab, N1, ram_copies)),
+    ?match({mnesia_activity_event, _}, recv_event()),
+    ?match({ok, N1}, mnesia:subscribe({table,Tab})),
+    ?match({error, {already_exists, {table,Tab, simple}}}, 
+	   mnesia:subscribe({table,Tab})),
+    ?match(ok, mnesia:dirty_write(#tab{i=755})),
+    ?match({mnesia_table_event, {write, _, _}}, recv_event()),
+
+    ?match({atomic, ok}, mnesia:delete_table(Tab)),
+    ?match({mnesia_activity_event, _}, recv_event()),
+    ?match(timeout, recv_event()),
+
+    mnesia_test_lib:kill_mnesia([N1]),
+
+    ?verify_mnesia([N2], [N1]).
+
+recv_event() ->
+    receive
+	Event -> Event
+    after 1000 -> 
+	    timeout
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+foldl(suite) ->
+    [];
+foldl(doc) ->
+    [""];
+foldl(Config) when is_list(Config) ->
+    Nodes = [_N1, N2] = ?acquire_nodes(2, Config),
+    Tab1 = fold_local,
+    Tab2 = fold_remote,
+    Tab3 = fold_ordered, 
+    ?match({atomic, ok}, mnesia:create_table(Tab1, [{ram_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, [{ram_copies, [N2]}, {type, bag}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab3, [{ram_copies, Nodes}, 
+						    {type, ordered_set}])),    
+
+    Tab1Els = [{Tab1, N, N} || N <- lists:seq(1, 10)],
+    Tab2Els = ?sort([{Tab2, 1, 2} | [{Tab2, N, N} || N <- lists:seq(1, 10)]]),
+    Tab3Els = [{Tab3, N, N} || N <- lists:seq(1, 10)],
+
+    [mnesia:sync_transaction(fun() -> mnesia:write(E) end) || E <- Tab1Els],
+    [mnesia:sync_transaction(fun() -> mnesia:write(E) end) || E <- Tab2Els],
+    [mnesia:sync_transaction(fun() -> mnesia:write(E) end) || E <- Tab3Els],
+
+    Fold = fun(Tab) ->
+		   lists:reverse(mnesia:foldl(fun(E, A) -> [E | A] end, [], Tab))
+	   end,
+    Fold2 = fun(Tab, Lock) ->
+		    lists:reverse(mnesia:foldl(fun(E, A) -> [E | A] end, [], Tab, Lock))
+	    end,    
+    Exit = fun(Tab) ->
+		   lists:reverse(mnesia:foldl(fun(_E, _A) -> exit(testing) end, [], Tab))
+	   end,
+    %% Errors 
+    ?match({aborted, _}, mnesia:transaction(Fold, [error])),
+    ?match({aborted, _}, mnesia:transaction(fun(Tab) -> mnesia:foldl(badfun,[],Tab) end,
+					    [Tab1])),    
+    ?match({aborted, testing}, mnesia:transaction(Exit, [Tab1])), 
+    ?match({aborted, _}, mnesia:transaction(Fold2, [Tab1, read_lock])),
+
+    %% Success
+    ?match({atomic, Tab1Els}, sort_res(mnesia:transaction(Fold, [Tab1]))),
+    ?match({atomic, Tab2Els}, sort_res(mnesia:transaction(Fold, [Tab2]))),
+    ?match({atomic, Tab3Els}, mnesia:transaction(Fold, [Tab3])),        
+
+    ?match({atomic, Tab1Els}, sort_res(mnesia:transaction(Fold2, [Tab1, read]))),
+    ?match({atomic, Tab1Els}, sort_res(mnesia:transaction(Fold2, [Tab1, write]))),
+
+    ?match(Tab1Els, sort_res(mnesia:sync_dirty(Fold, [Tab1]))),
+    ?match(Tab2Els, sort_res(mnesia:async_dirty(Fold, [Tab2]))),
+
+    ?verify_mnesia(Nodes, []).	   
+
+sort_res({atomic, List}) ->
+    {atomic, ?sort(List)};
+sort_res(Else) when is_list(Else) ->
+    ?sort(Else);
+sort_res(Else) ->
+    Else.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+info(suite) -> [];
+info(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(1, Config),
+    ?match(ok, mnesia:info()),
+    ?verify_mnesia(Nodes, []).
+
+schema_0(suite) -> [];
+schema_0(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(1, Config),
+    ?match(ok, mnesia:schema()),
+    ?verify_mnesia(Nodes, []).
+
+schema_1(suite) -> [];
+schema_1(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(1, Config),
+    Tab = schema_1,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [])),
+    ?match(ok, mnesia:schema(Tab)),
+    ?verify_mnesia(Nodes, []).
+
+view_0(suite) -> [];
+view_0(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(1, Config),
+    ?match(ok, mnesia_lib:view()),
+    ?verify_mnesia(Nodes, []).
+
+view_1(suite) -> [];
+view_1(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(1, Config),
+    BinCore = mnesia_lib:mkcore({crashinfo, "Just testing..."}),
+    CoreFile = lists:concat(["MnesiaCore.", node(), ".view_1.", ?MODULE]),
+    ?match(ok, file:write_file(CoreFile, BinCore)),
+    ?match(ok, mnesia_lib:view(CoreFile)),
+    ?match(ok, file:delete(CoreFile)),
+
+    ?match(stopped, mnesia:stop()),
+    Dir = mnesia:system_info(directory),
+    ?match(eof, mnesia_lib:view(filename:join(Dir, "LATEST.LOG"))),
+    ?match(ok, mnesia_lib:view(filename:join(Dir, "schema.DAT"))),
+    ?verify_mnesia([], Nodes).
+
+view_2(suite) -> [];
+view_2(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(1, Config),
+    BinCore = mnesia_lib:mkcore({crashinfo, "More testing..."}),
+    File = lists:concat([?MODULE, "view_2.", node()]),
+    ?match(ok, file:write_file(File, BinCore)),
+    ?match(ok, mnesia_lib:view(File, core)),
+    ?match(ok, file:delete(File)),
+
+    ?match(stopped, mnesia:stop()),
+    Dir = mnesia:system_info(directory),
+    ?match(ok, file:rename(filename:join(Dir, "LATEST.LOG"), File)),
+    ?match(eof, mnesia_lib:view(File, log)),
+    ?match(ok, file:delete(File)),
+
+    ?match(ok, file:rename(filename:join(Dir, "schema.DAT"), File)),
+    ?match(ok, mnesia_lib:view(File, dat)),
+    ?match(ok, file:delete(File)),
+    ?verify_mnesia([], Nodes).
+
+lkill(suite) -> [];
+lkill(Config) when is_list(Config) ->
+    [Node1, Node2] = ?acquire_nodes(2, Config),
+
+    ?match(yes, rpc:call(Node1, mnesia, system_info, [is_running])),
+    ?match(yes, rpc:call(Node2, mnesia, system_info, [is_running])),
+    ?match(ok, rpc:call(Node2, mnesia, lkill, [])),
+    ?match(yes, rpc:call(Node1, mnesia, system_info, [is_running])),
+    ?match(no, rpc:call(Node2, mnesia, system_info, [is_running])),
+    ?verify_mnesia([Node1], [Node2]).
+
+kill(suite) -> [];
+kill(Config) when is_list(Config) ->
+    [Node1, Node2] = ?acquire_nodes(2, Config),
+
+    ?match(yes, rpc:call(Node1, mnesia, system_info, [is_running])),
+    ?match(yes, rpc:call(Node2, mnesia, system_info, [is_running])),
+    ?match({_, []}, rpc:call(Node2, mnesia, kill, [])),
+    ?match(no, rpc:call(Node1, mnesia, system_info, [is_running])),
+    ?match(no, rpc:call(Node2, mnesia, system_info, [is_running])),
+    ?verify_mnesia([], [Node1, Node2]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+record_name_dirty_access_ram(suite) ->
+    [];
+record_name_dirty_access_ram(Config) when is_list(Config) ->
+    record_name_dirty_access(ram_copies, Config).
+
+record_name_dirty_access_disc(suite) ->
+    [];
+record_name_dirty_access_disc(Config) when is_list(Config) ->
+    record_name_dirty_access(disc_copies, Config).
+
+record_name_dirty_access_disc_only(suite) ->
+    [];
+record_name_dirty_access_disc_only(Config) when is_list(Config) ->
+    record_name_dirty_access(disc_only_copies, Config).
+
+record_name_dirty_access(Storage, Config) ->
+    [Node1, _Node2] = Nodes = ?acquire_nodes(2, Config),
+
+    List = lists:concat([record_name_dirty_access_, Storage]),
+    Tab = list_to_atom(List),
+    RecName = some_record,
+    Attr = val,
+    TabDef = [{type, bag},
+	      {record_name, RecName},
+	      {index, [Attr]},
+	      {Storage, Nodes}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, TabDef)),
+
+    ?match(RecName, mnesia:table_info(Tab, record_name)),
+
+    ?match(ok, mnesia:dirty_write(Tab, {RecName, 2, 20})),
+    ?match(ok, mnesia:dirty_write(Tab, {RecName, 2, 21})),
+    ?match(ok, mnesia:dirty_write(Tab, {RecName, 2, 22})),
+
+    %% Backup test
+    BupFile = List ++ ".BUP",
+    CpName = cpname,
+    CpArgs = [{name, CpName}, {min, [Tab]}, {ram_overrides_dump, true}],
+    ?match({ok, CpName, _}, mnesia:activate_checkpoint(CpArgs)),
+    ?match(ok, mnesia:backup_checkpoint(CpName, BupFile)),
+    ?match(ok, mnesia:deactivate_checkpoint(CpName)),
+
+    ?match(ok, mnesia:dirty_write(Tab, {RecName, 1, 10})),
+    ?match({ok, Node1}, mnesia:subscribe({table, Tab})),
+    ?match(ok, mnesia:dirty_write(Tab, {RecName, 3, 10})),
+
+    Twos =?sort( [{RecName, 2, 20}, {RecName, 2, 21}, {RecName, 2, 22}]),
+    ?match(Twos, ?sort(mnesia:dirty_read(Tab, 2))),
+
+    ?match(ok, mnesia:dirty_delete_object(Tab, {RecName, 2, 21})),
+
+    Tens = ?sort([{RecName, 1, 10}, {RecName, 3, 10}]),
+    TenPat = {RecName, '_', 10},
+    ?match(Tens, ?sort(mnesia:dirty_match_object(Tab, TenPat))),
+    ?match(Tens, ?sort(mnesia:dirty_select(Tab, [{TenPat, [], ['$_']}]))),
+
+    %% Subscription test
+    E = mnesia_table_event,
+    ?match_receive({E, {write, {Tab, 3, 10}, _}}),
+    ?match_receive({E, {delete_object, {Tab, 2, 21}, _}}),
+    ?match({ok, Node1}, mnesia:unsubscribe({table, Tab})),
+
+    ?match([], mnesia_test_lib:stop_mnesia([Node1])),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, [Tab])),
+
+    ?match(Tens, ?sort(mnesia:dirty_index_match_object(Tab, TenPat, Attr) )),
+    ?match(Tens, ?sort(mnesia:dirty_index_read(Tab, 10, Attr))),
+
+    ?match([1, 2, 3], ?sort(mnesia:dirty_all_keys(Tab))),
+
+    ?match({ok, Node1}, mnesia:subscribe({table, Tab})),
+    ?match(ok, mnesia:dirty_delete(Tab, 2)),
+    ?match([], mnesia:dirty_read(Tab, 2)),
+
+    ?match_receive({E, {delete, {Tab, 2}, _}}),
+    ?match([], mnesia_test_lib:flush()),
+    ?match({ok, Node1}, mnesia:unsubscribe({table, Tab})),
+
+    %% Restore test
+    ?match({atomic, [Tab]}, mnesia:restore(BupFile, [{recreate_tables, [Tab]}])),
+    ?match(RecName, mnesia:table_info(Tab, record_name)),
+
+    ?match(Twos, ?sort(mnesia:dirty_match_object(Tab, mnesia:table_info(Tab, wild_pattern)))),
+    ?match(Twos, ?sort(mnesia:dirty_select(Tab, 
+					   [{mnesia:table_info(Tab, wild_pattern),
+					     [],['$_']}]))),
+
+    %% Traverse backup test
+
+    Fun = fun(Rec, {Good, Bad}) ->
+		  ?verbose("BUP: ~p~n", [Rec]),
+		  case Rec of
+		      {T, K, V} when T == Tab ->
+			  Good2 = Good ++ [{RecName, K, V}],
+			  {[Rec], {?sort(Good2), Bad}};
+		      {T, K} when T == Tab ->
+			  Good2 = [G || G <- Good, element(2, G) /= K],
+			  {[Rec], {?sort(Good2), Bad}};
+		      _ when element(1, Rec) == schema ->
+			  {[Rec], {Good, Bad}};
+		      _ ->
+			  Bad2 = Bad ++ [Rec],
+			  {[Rec], {Good, ?sort(Bad2)}}
+		  end
+          end,
+
+    ?match({ok, {Twos, []}}, mnesia:traverse_backup(BupFile, mnesia_backup, 
+						    dummy, read_only, 
+						    Fun, {[], []})),
+    ?match(ok, file:delete(BupFile)),
+
+    %% Update counter test
+
+    CounterTab = list_to_atom(lists:concat([Tab, "_counter"])),
+    CounterTabDef = [{record_name, some_counter}],
+    C = my_counter,
+    ?match({atomic, ok}, mnesia:create_table(CounterTab, CounterTabDef)),
+    ?match(some_counter, mnesia:table_info(CounterTab, record_name)),
+    ?match(0, mnesia:dirty_update_counter(CounterTab, gurka, -10)),
+    ?match(10, mnesia:dirty_update_counter(CounterTab, C, 10)),
+    ?match(11, mnesia:dirty_update_counter(CounterTab, C, 1)),
+    ?match(4711, mnesia:dirty_update_counter(CounterTab, C, 4700)),
+    ?match([{some_counter, C, 4711}], mnesia:dirty_read(CounterTab, C)),
+    ?match(0, mnesia:dirty_update_counter(CounterTab, C, -4747)),
+
+    %% Registry tests
+
+    RegTab = list_to_atom(lists:concat([Tab, "_registry"])),
+    RegTabDef = [{record_name, some_reg}],
+    ?match(ok, mnesia_registry:create_table(RegTab, RegTabDef)),
+    ?match(some_reg, mnesia:table_info(RegTab, record_name)),
+    {success, RegRecs} =
+	?match([_ | _], mnesia_registry_test:dump_registry(node(), RegTab)),
+
+    R = ?sort(RegRecs),
+    ?match(R, ?sort(mnesia_registry_test:restore_registry(node(), RegTab))),
+
+    ?verify_mnesia(Nodes, []).
+
+sorted_ets(suite) ->
+    [];
+sorted_ets(Config) when is_list(Config) ->
+    [N1, N2, N3] = All = ?acquire_nodes(3, Config),
+
+    Tab = sorted_tab,    
+    Def = case  mnesia_test_lib:diskless(Config) of
+	      true ->  [{name, Tab}, {type, ordered_set}, {ram_copies, All}];
+	      false -> [{name, Tab}, {type, ordered_set},
+			{ram_copies, [N1]}, 
+			{disc_copies,[N2, N3]}]
+	  end,
+
+    ?match({atomic, ok}, mnesia:create_table(Def)),
+    ?match({aborted, _}, mnesia:create_table(fel, [{disc_only_copies, N1}])),
+
+    ?match([ok | _], 
+	   [mnesia:dirty_write({Tab, {dirty, N}, N}) || N <- lists:seq(1, 10)]),    
+    ?match({atomic, _}, 
+	   mnesia:sync_transaction(fun() ->
+					   [mnesia:write({Tab, {trans, N}, N}) || 
+					       N <- lists:seq(1, 10)]
+				   end)),
+
+    List = mnesia:dirty_match_object({Tab, '_', '_'}),
+    ?match(List, ?sort(List)),
+    ?match(List, rpc:call(N2, mnesia, dirty_match_object, [{Tab, '_', '_'}])),
+    ?match(List, rpc:call(N3, mnesia, dirty_match_object, [{Tab, '_', '_'}])),
+
+    mnesia_test_lib:stop_mnesia(All),
+    mnesia_test_lib:start_mnesia(All, [sorted_tab]),
+
+    List = mnesia:dirty_match_object({Tab, '_', '_'}),
+    ?match(List, ?sort(List)),
+    ?match(List, rpc:call(N2, mnesia, dirty_match_object, [{Tab, '_', '_'}])),
+    ?match(List, rpc:call(N3, mnesia, dirty_match_object, [{Tab, '_', '_'}])),
+
+    ?match(List, rpc:call(N3, mnesia, dirty_select, [Tab, [{{Tab, '_', '_'},[],['$_']}]])),
+
+    TransMatch = fun() ->
+			 mnesia:write({Tab, {trans, 0}, 0}),
+			 mnesia:write({Tab, {trans, 11}, 11}),
+			 mnesia:match_object({Tab, '_', '_'})
+		 end,
+    TransSelect = fun() ->
+			  mnesia:write({Tab, {trans, 0}, 0}),
+			  mnesia:write({Tab, {trans, 11}, 11}),
+			  mnesia:select(Tab, [{{Tab, '_', '_'},[],['$_']}])
+		  end,
+
+    TList = mnesia:transaction(TransMatch),
+    STList = ?sort(TList),
+    ?match(STList, TList),
+    ?match(STList, rpc:call(N2, mnesia, transaction, [TransMatch])),
+    ?match(STList, rpc:call(N3, mnesia, transaction, [TransMatch])),
+
+    TSel = mnesia:transaction(TransSelect),
+    ?match(STList, TSel),
+    ?match(STList, rpc:call(N2, mnesia, transaction, [TransSelect])),
+    ?match(STList, rpc:call(N3, mnesia, transaction, [TransSelect])),
+
+    ?match({atomic, ok}, mnesia:create_table(rec, [{type, ordered_set}])),
+    [ok = mnesia:dirty_write(R) || R <- [{rec,1,1}, {rec,2,1}]],
+    ?match({atomic, ok}, mnesia:add_table_index(rec, 3)),    
+    TestIt = fun() ->
+		     ok = mnesia:write({rec,1,1}),
+		     mnesia:index_read(rec, 1, 3)
+	     end,
+    ?match({atomic, [{rec,1,1}, {rec,2,1}]}, mnesia:transaction(TestIt)).
+
+
diff --git a/lib/mnesia/test/mnesia_examples_test.erl b/lib/mnesia/test/mnesia_examples_test.erl
new file mode 100644
index 0000000000..373d47a05a
--- /dev/null
+++ b/lib/mnesia/test/mnesia_examples_test.erl
@@ -0,0 +1,152 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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(mnesia_examples_test).
+-author('[email protected]').
+-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+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).
+
+-define(init(N, Config),
+	mnesia_test_lib:prepare_test_case([{init_test_case, [mnesia]},
+					   delete_schema],
+					  N, Config, ?FILE, ?LINE)).
+
+opt_net_load(ExampleMod) ->
+    opt_net_load([node() | nodes()], ExampleMod, ok).
+
+opt_net_load([Node | Nodes], ExampleMod, Res) ->
+    case rpc:call(Node, ?MODULE, opt_load, [ExampleMod]) of
+	{module, ExampleMod} ->
+	    opt_net_load(Nodes, ExampleMod, Res);
+	{error, Reason} ->
+	    Error = {opt_net_load, ExampleMod, Node, Reason},
+	    opt_net_load(Nodes, ExampleMod, {error, Error});
+	{badrpc, Reason} ->
+	    Error = {opt_net_load, ExampleMod, Node, Reason},
+	    opt_net_load(Nodes, ExampleMod, {error, Error})
+    end;
+opt_net_load([], _ExampleMod, Res) ->
+    Res.
+	    
+opt_load(Mod) ->
+    case code:is_loaded(Mod) of
+	{file, _} ->
+	    {module, Mod};
+	false ->
+	    Abs = filename:join([code:lib_dir(mnesia), examples, Mod]),
+	    code:load_abs(Abs)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+all() -> 
+    [bup, company, meter, {group, tpcb}].
+
+groups() -> 
+    [{tpcb, [],
+      [replica_test, sticky_replica_test, dist_test,
+       conflict_test, frag_test, frag2_test, remote_test,
+       remote_frag2_test]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+bup(doc) -> ["Run the backup examples in bup.erl"];
+bup(suite) -> [];
+bup(Config) when is_list(Config) ->
+    Nodes = ?init(3, Config),
+    opt_net_load(bup),
+    ?match(ok, bup:test(Nodes)).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+company(doc) ->
+    ["Run the company examples in company.erl and company_o.erl"].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+replica_test(suite) -> [];
+replica_test(Config) when is_list(Config) ->
+    ?init(3, Config),
+    opt_net_load(mnesia_tpcb),
+    ?match({ok, _}, mnesia_tpcb:start(mnesia_tpcb:config(replica_test, ram_copies))).
+
+sticky_replica_test(suite) -> [];
+sticky_replica_test(Config) when is_list(Config) ->
+    ?init(3, Config),
+    opt_net_load(mnesia_tpcb),
+    ?match({ok, _}, mnesia_tpcb:start(mnesia_tpcb:config(sticky_replica_test, ram_copies))).
+
+dist_test(suite) -> [];
+dist_test(Config) when is_list(Config) ->
+    ?init(3, [{tc_timeout, timer:minutes(10)} | Config]),
+    opt_net_load(mnesia_tpcb),
+    ?match({ok, _}, mnesia_tpcb:start(mnesia_tpcb:config(dist_test, ram_copies))).
+
+conflict_test(suite) -> [];
+conflict_test(Config) when is_list(Config) ->
+    ?init(3, Config),
+    opt_net_load(mnesia_tpcb),
+    ?match({ok, _}, mnesia_tpcb:start(mnesia_tpcb:config(conflict_test, ram_copies))).
+
+frag_test(suite) -> [];
+frag_test(Config) when is_list(Config) ->
+    ?init(3, Config),
+    opt_net_load(mnesia_tpcb),
+    ?match({ok, _}, mnesia_tpcb:start(mnesia_tpcb:config(frag_test, ram_copies))).
+
+frag2_test(suite) -> [];
+frag2_test(Config) when is_list(Config) ->
+    ?init(3, Config),
+    opt_net_load(mnesia_tpcb),
+    ?match({ok, _}, mnesia_tpcb:start(mnesia_tpcb:config(frag2_test, ram_copies))).
+
+remote_test(suite) -> [];
+remote_test(Config) when is_list(Config) ->
+    ?init(3, Config),
+    opt_net_load(mnesia_tpcb),
+    ?match({ok, _}, mnesia_tpcb:start(mnesia_tpcb:config(remote_test, ram_copies))).
+
+remote_frag2_test(suite) -> [];
+remote_frag2_test(Config) when is_list(Config) ->
+    ?init(3, Config),
+    opt_net_load(mnesia_tpcb),
+    ?match({ok, _}, mnesia_tpcb:start(mnesia_tpcb:config(remote_frag2_test, ram_copies))).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+meter(doc) ->
+    ["Run the meter example in mnesia_meter.erl"];
+meter(suite) ->
+    [];
+meter(Config) when is_list(Config) ->
+    [N | _] = ?init(3, Config),
+    opt_net_load(mnesia_meter),
+    ?match(ok, mnesia_meter:go(ram_copies, [N])).
+
+
diff --git a/lib/mnesia/test/mnesia_frag_test.erl b/lib/mnesia/test/mnesia_frag_test.erl
new file mode 100644
index 0000000000..d3f6762af7
--- /dev/null
+++ b/lib/mnesia/test/mnesia_frag_test.erl
@@ -0,0 +1,859 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2010. 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(mnesia_frag_test).
+-author('[email protected]').
+-include("mnesia_test_lib.hrl").
+
+-compile([export_all]).
+
+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).
+
+-define(match_dist(ExpectedRes, Expr),
+	case ?match(ExpectedRes, Expr) of
+	    
+	mnesia_test_lib:error(Format, Args,?FILE,?LINE)).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+all() -> 
+    [{group, light}, {group, medium}].
+
+groups() -> 
+    [{light, [], [{group, nice}, {group, evil}]},
+     {medium, [], [consistency]},
+     {nice, [],
+      [nice_single, nice_multi, nice_access, iter_access]},
+     {evil, [],
+      [evil_create, evil_delete, evil_change, evil_combine,
+       evil_loop, evil_delete_db_node]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+nice_single(suite) -> [];
+nice_single(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+
+    %% Create a table with 2 fragments and 12 records
+    Tab = nice_frag,
+    Props = [{n_fragments, 2}, {node_pool, [Node1]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{frag_properties, Props}])),
+    Records = [{Tab, N, -N} || N <- lists:seq(1, 12)],
+    [frag_write(Tab, R)  || R <- Records],
+    ?match([{Node1, 2}], frag_dist(Tab)),
+    ?match([8, 4], frag_rec_dist(Tab)),
+
+    %% Adding a new node to pool should not affect distribution
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_node, Node2})),
+    Dist =  frag_dist(Tab), 
+    ?match([{Node2, 0}, {Node1, 2}], Dist), 
+    ?match([8, 4], frag_rec_dist(Tab)),
+
+    %% Add new fragment hopefully on the new node
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_frag, Dist})),
+    Dist2 =  frag_dist(Tab), 
+    ?match([{Node2, 1}, {Node1, 2}], Dist2), 
+    ?match([3, 4, 5], frag_rec_dist(Tab)),
+    
+    %% Add new fragment hopefully on the new node
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_frag, Dist2})),
+    Dist3 =  frag_dist(Tab), 
+    ?match([{Node1, 2}, {Node2, 2}], Dist3), 
+    ?match([3, 2, 5, 2], frag_rec_dist(Tab)),
+
+    %% Add new fragment hopefully on the new node
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_frag, Dist3})),
+    Dist4 =  frag_dist(Tab), 
+    ?match([{Node2, 2}, {Node1, 3}], Dist4), 
+    ?match([_, _, _, _, _], frag_rec_dist(Tab)),
+
+    %% Dropping a node in pool should not affect distribution
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {del_node, Node1})),
+    ?match([{Node2, 2}, {Node1, 3}], frag_dist(Tab)),
+    ?match([_, _, _, _, _], frag_rec_dist(Tab)),
+
+    %% Dropping a fragment
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, del_frag)),
+    Dist5 =  frag_dist(Tab), 
+    ?match([{Node2, 2}, {Node1, 2}], Dist5), 
+    ?match([3, 2, 5, 2], frag_rec_dist(Tab)),
+    
+    %% Add new fragment hopefully on the new node
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_frag, Dist5})),
+    Dist6 =  frag_dist(Tab), 
+    ?match([{Node2, 3}, {Node1, 2}], Dist6), 
+    ?match([_, _, _, _, _], frag_rec_dist(Tab)),
+
+    %% Dropping all fragments but one
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, del_frag)),
+    ?match([3, 2, 5, 2], frag_rec_dist(Tab)),
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, del_frag)),
+    ?match([3, 4, 5], frag_rec_dist(Tab)),
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, del_frag)),
+    ?match([8, 4], frag_rec_dist(Tab)),
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, del_frag)),
+    ?match([{Node2, 0}, {Node1, 1}], frag_dist(Tab)), 
+    ?match([12], frag_rec_dist(Tab)),
+	     
+    %% Defragmenting the table clears frag_properties
+    ?match(Len when Len > 0,
+		    length(mnesia:table_info(Tab, frag_properties))),
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, deactivate)),
+    ?match(0, length(mnesia:table_info(Tab, frag_properties))),
+
+    %% Making the table fragmented again
+    Props2 = [{n_fragments, 1}],
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {activate, Props2})),
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_frag, frag_dist(Tab)})),
+    Dist7 = frag_dist(Tab),
+    ?match([{Node1, 1}, {Node2, 1}], Dist7),
+    ?match([8, 4], frag_rec_dist(Tab)),
+
+    %% Deleting the fragmented table
+    ?match({atomic, ok}, mnesia:delete_table(Tab)),
+    ?match(false, lists:member(Tab, mnesia:system_info(tables))),
+	     
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+nice_multi(doc) ->
+    ["Extending the nice case with one more node, ",
+     "one more replica and a foreign key"];
+nice_multi(suite) -> [];
+nice_multi(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+
+    %% Create a table with 2 fragments and 8 records
+    Tab = frag_master,
+    Name = frag_rec,
+    Type = case mnesia_test_lib:diskless(Config) of 
+	       true -> n_ram_copies;
+	       false -> n_disc_copies
+	   end,
+    Props = [{n_fragments, 2},
+	     {Type, 2},
+	     {node_pool, [Node2, Node1]}],
+    Def = [{frag_properties, Props},
+	   {attributes, [id, data]},
+	   {record_name, Name}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    [frag_write(Tab, {Name, Id, -Id})  || Id <- lists:seq(1, 8)],
+    ?match([6, 2], frag_rec_dist(Tab)),
+    ?match([{Node2, 2}, {Node1, 2}], frag_dist(Tab)),
+    
+    %% And connect another table to it, via a foreign key
+    TabF = frag_slave,
+    PropsF = [{foreign_key, {Tab, foreign_id}}],
+    DefF = [{frag_properties, PropsF},
+	    {attributes, [id, foreign_id]}],
+
+    ?match({atomic, ok}, mnesia:create_table(TabF, DefF)),
+    [frag_write(TabF, {TabF, {Id}, Id})  || Id <- lists:seq(1, 16)],
+    ?match([10, 6], frag_rec_dist(TabF)),
+    ?match([{Node2, 2}, {Node1, 2}], frag_dist(TabF)),
+
+    %% Adding a new node to pool should not affect distribution
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_node, Node3})),
+    Dist =  frag_dist(Tab), 
+    ?match([{Node3, 0}, {Node2, 2}, {Node1, 2}], Dist), 
+    ?match([6, 2], frag_rec_dist(Tab)),
+    DistF =  frag_dist(TabF), 
+    ?match([{Node3, 0}, {Node2, 2}, {Node1, 2}], DistF), 
+    ?match([10, 6], frag_rec_dist(TabF)),
+
+    %% Add new fragment hopefully on the new node
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_frag, Dist})),
+    Dist2 =  frag_dist(Tab), 
+    ?match([{Node3, 1},{Node1, 2},{Node2,3}], Dist2), 
+    ?match([_, _, _], frag_rec_dist(Tab)),
+    DistF2 =  frag_dist(TabF), 
+    ?match([{Node3, 1},{Node1, 2},{Node2,3}], DistF2), 
+    ?match([_, _, _], frag_rec_dist(TabF)),
+    
+    %% Add new fragment hopefully on the new node
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_frag, Dist2})),
+    Dist3 =  frag_dist(Tab), 
+    ?match([{Node3, 2},{Node2,3},{Node1, 3}], Dist3), 
+    ?match([3, 0, 3, 2], frag_rec_dist(Tab)),
+    DistF3 =  frag_dist(TabF), 
+    ?match([{Node3, 2},{Node2,3},{Node1, 3}], DistF3), 
+    ?match([3, 3, 7, 3], frag_rec_dist(TabF)),
+
+    %% Add new fragment hopefully on the new node
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_frag, Dist3})),
+    Dist4 =  frag_dist(Tab), 
+    ?match([{Node1, 3}, {Node3, 3},{Node2, 4}], Dist4), 
+    ?match([_, _, _, _, _], frag_rec_dist(Tab)),
+    DistF4 =  frag_dist(TabF), 
+    ?match([{Node1, 3}, {Node3, 3},{Node2, 4}], DistF4), 
+    ?match([_, _, _, _, _], frag_rec_dist(TabF)),
+
+    %% Dropping a node in pool should not affect distribution
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {del_node, Node1})),
+    ?match([{Node3, 3},{Node2, 4}, {Node1, 3}], frag_dist(Tab)),
+    ?match([_, _, _, _, _], frag_rec_dist(Tab)),
+    ?match([{Node3, 3},{Node2, 4}, {Node1, 3}], frag_dist(TabF)),
+    ?match([_, _, _, _, _], frag_rec_dist(TabF)),
+
+    %% Dropping a fragment
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, del_frag)),
+    Dist5 =  frag_dist(Tab), 
+    ?match([{Node3, 2},{Node2,3},{Node1, 3}], Dist5), 
+    ?match([3, 0, 3, 2], frag_rec_dist(Tab)),
+    DistF5 =  frag_dist(Tab), 
+    ?match([{Node3, 2},{Node2,3},{Node1, 3}], DistF5), 
+    ?match([3, 3, 7, 3], frag_rec_dist(TabF)),
+    
+    %% Add new fragment hopefully on the new node
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_frag, Dist5})),
+    Dist6 =  frag_dist(Tab), 
+    ?match([{Node3, 3},{Node2, 4},{Node1, 3}], Dist6), 
+    ?match([_, _, _, _, _], frag_rec_dist(Tab)),
+    DistF6 =  frag_dist(TabF), 
+    ?match([{Node3, 3},{Node2, 4},{Node1, 3}], DistF6), 
+    ?match([_, _, _, _, _], frag_rec_dist(TabF)),
+
+    %% Dropping all fragments but one
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, del_frag)),
+    ?match([3, 0, 3, 2], frag_rec_dist(Tab)),
+    ?match([3, 3, 7, 3], frag_rec_dist(TabF)),
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, del_frag)),
+    ?match([_, _, _], frag_rec_dist(Tab)),
+    ?match([_, _, _], frag_rec_dist(TabF)),
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, del_frag)),
+    ?match([6, 2], frag_rec_dist(Tab)),
+    ?match([10, 6], frag_rec_dist(TabF)),
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, del_frag)),
+    ?match([{Node3, 0}, {Node2, 1}, {Node1, 1}], frag_dist(Tab)), 
+    ?match([8], frag_rec_dist(Tab)),
+    ?match([{Node3, 0}, {Node2, 1}, {Node1, 1}], frag_dist(TabF)), 
+    ?match([16], frag_rec_dist(TabF)),
+	     
+    %% Defragmenting the tables clears frag_properties
+    ?match(Len when Len > 0,
+		    length(mnesia:table_info(TabF, frag_properties))),
+    ?match({atomic, ok}, mnesia:change_table_frag(TabF, deactivate)),
+    ?match(0, length(mnesia:table_info(TabF, frag_properties))),
+    ?match(Len when Len > 0,
+		    length(mnesia:table_info(Tab, frag_properties))),
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, deactivate)),
+    ?match(0, length(mnesia:table_info(Tab, frag_properties))),
+
+    %% Making the tables fragmented again
+    Props2 = [{n_fragments, 1}, {node_pool, [Node1, Node2]}],
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {activate, Props2})),
+    ?match({atomic, ok}, mnesia:delete_table(TabF)),
+    ?match({atomic, ok}, mnesia:create_table(TabF, DefF)),
+    [frag_write(TabF, {TabF, {Id}, Id})  || Id <- lists:seq(1, 16)],
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_frag, frag_dist(Tab)})),
+    ?match([{Node1, 2}, {Node2, 2}], frag_dist(Tab)),
+    ?match([6, 2], frag_rec_dist(Tab)),
+    ?match([{Node1, 2}, {Node2, 2}], frag_dist(TabF)),
+    ?match([10, 6], frag_rec_dist(TabF)),
+
+    %% Deleting the fragmented tables
+    ?match({atomic, ok}, mnesia:delete_table(TabF)),
+    ?match(false, lists:member(TabF, mnesia:system_info(tables))),
+    ?match({atomic, ok}, mnesia:delete_table(Tab)),
+    ?match(false, lists:member(Tab, mnesia:system_info(tables))),
+	     
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+nice_access(doc) ->
+    ["Cover entire callback interface"];
+nice_access(suite) -> [];
+nice_access(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(3, Config),
+
+    Tab = frag_access,
+    Pool = lists:sort(Nodes),
+    Props = [{n_fragments, 20},
+	     {n_ram_copies, 2},
+	     {node_pool, Pool}],
+    Def = [{frag_properties, Props},
+	   {type, ordered_set},
+	   {index, [val]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    [frag_write(Tab, {Tab, Id, Id})  || Id <- lists:seq(1, 400)],
+    
+    %% And connect another table to it, via a foreign key
+    TabF = frag_access_slave,
+    PropsF = [{foreign_key, {Tab, val}}],
+    DefF = [{frag_properties, PropsF},
+	    {index, [val]}],
+    ?match({atomic, ok}, mnesia:create_table(TabF, DefF)),
+    [frag_write(TabF, {TabF, Id, Id})  || Id <- lists:seq(1, 400)],
+
+    ?match(done, mnesia:activity(transaction, fun do_access/3, [Tab, Tab, Pool], mnesia_frag)),
+    ?match(done, mnesia:activity(transaction, fun do_access/3, [TabF, Tab, Pool], mnesia_frag)),
+
+    ?verify_mnesia(Nodes, []).
+
+do_access(Tab, Master, Pool) ->
+    ?match(20, mnesia:table_info(Tab, n_fragments)),
+    ?match(Pool, mnesia:table_info(Tab, node_pool)),
+    ?match(2, mnesia:table_info(Tab, n_ram_copies)),
+    ?match(0, mnesia:table_info(Tab, n_disc_copies)),
+    ?match(0, mnesia:table_info(Tab, n_disc_only_copies)),
+    ?match(20, length(mnesia:table_info(Tab, frag_names))),
+    ?match(20, length(mnesia:table_info(Tab, frag_size))),
+    ?match(20, length(mnesia:table_info(Tab, frag_memory))),
+    PoolSize = length(Pool),
+    ?match(PoolSize, length(mnesia:table_info(Tab, frag_dist))),
+    ?match(400, mnesia:table_info(Tab, size)),
+    ?match(I when is_integer(I), mnesia:table_info(Tab, memory)),
+    ?match(Tab, mnesia:table_info(Tab, base_table)),
+
+    Foreign = 
+	if
+	    Master == Tab ->
+		?match(undefined, mnesia:table_info(Tab, foreign_key)),
+		?match([_], mnesia:table_info(Tab, foreigners)),
+                ?match({'EXIT', {aborted, {combine_error, Tab, frag_properties, {foreign_key, undefined}}}},
+                    mnesia:read({Tab, 5}, 5, read)),
+                fun({T, _K}) -> T end;
+	    true ->
+		?match({Master, 3}, mnesia:table_info(Tab, foreign_key)),
+		?match([], mnesia:table_info(Tab, foreigners)),
+                fun({T, K}) -> {T, K} end
+	end,
+
+    Attr = val,
+    ?match(400, mnesia:table_info(Tab, size)),
+    Count = fun(_, N) -> N + 1 end,
+    ?match(400, mnesia:foldl(Count, 0, Tab)),
+    ?match(400, mnesia:foldr(Count, 0, Tab)),
+    ?match(ok, mnesia:write({Tab, [-1], 1})),
+    ?match(401, length(mnesia:match_object(Tab, {Tab, '_', '_'}, read))),
+    ?match(401, length(mnesia:select(Tab, [{{Tab, '_', '$1'}, [], ['$1']}], read))),
+
+    First = mnesia:select(Tab, [{{Tab, '_', '$1'}, [], ['$1']}], 10, read),
+    TestCont = fun('$end_of_table', Total, _This) -> 
+		       Total;
+		  ({Res,Cont1}, Total, This) ->
+		       Cont = mnesia:select(Cont1),
+		       This(Cont, length(Res) + Total, This)
+	       end,
+    ?match(401, TestCont(First, 0, TestCont)),
+
+    %% OTP 
+    [_, Frag2|_] = frag_names(Tab),
+    Frag2key = mnesia:dirty_first(Frag2),
+    ?match({[Frag2key],_},mnesia:select(Tab,[{{Tab,Frag2key,'$1'},[],['$1']}],100,read)),
+
+    ?match([{Tab, [-1], 1}], mnesia:read(Foreign({Tab, 1}), [-1], read)),
+    ?match(401, mnesia:foldl(Count, 0, Tab)),
+    ?match(401, mnesia:foldr(Count, 0, Tab)),
+    ?match(ok, mnesia:delete(Foreign({Tab, 2}), 2, write)),
+    ?match([], mnesia:read(Foreign({Tab, 2}), 2, read)),
+    ?match([{Tab, 3, 3}], mnesia:read(Foreign({Tab, 3}), 3, read)),
+    ?match(400, mnesia:foldl(Count, 0, Tab)),
+    ?match(400, mnesia:foldr(Count, 0, Tab)),
+    ?match(ok, mnesia:delete_object({Tab, 3, 3})),
+    ?match([], mnesia:read(Foreign({Tab, 3}), 3, read)),
+    One = lists:sort([{Tab, 1, 1}, {Tab, [-1], 1}]),
+    Pat = {Tab, '$1', 1},
+    ?match(One, lists:sort(mnesia:match_object(Tab, Pat, read))),
+    ?match([1,[-1]], lists:sort(mnesia:select(Tab, [{Pat, [], ['$1']}], read))),
+    ?match([[[-1]]], lists:sort(mnesia:select(Tab, [{Pat, [{is_list, '$1'}], [['$1']]}], read))),
+    ?match([[1, 100]], lists:sort(mnesia:select(Tab, [{Pat, [{is_integer, '$1'}], [['$1',100]]}], read))),
+    ?match([1,[-1]], lists:sort(mnesia:select(Tab, [{Pat, [{is_list, '$1'}], ['$1']},{Pat, [{is_integer, '$1'}], ['$1']}], read))),
+    ?match(One, lists:sort(mnesia:index_match_object(Tab, Pat, Attr, read) )),
+    ?match(One, lists:sort(mnesia:index_read(Tab, 1, Attr))),
+    Keys = mnesia:all_keys(Tab),
+    ?match([-1], lists:max(Keys)),  %% OTP-3779
+    ?match(399, length(Keys)),
+    ?match(399, mnesia:foldl(Count, 0, Tab)),
+    ?match(399, mnesia:foldr(Count, 0, Tab)),
+
+    ?match(Pool, lists:sort(mnesia:lock({table, Tab}, write))),
+
+    done.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+iter_access(doc) ->
+    ["Cover table iteration via callback interface"];
+iter_access(suite) -> [];
+iter_access(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(3, Config),
+
+    Tab = frag_access,
+    Pool = lists:sort(Nodes),
+    Props = [{n_fragments, 20},
+	     {n_ram_copies, 2},
+	     {node_pool, Pool}],
+    Def = [{frag_properties, Props},
+	   {type, ordered_set},
+	   {index, [val]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    [frag_write(Tab, {Tab, Id, Id})  || Id <- lists:seq(1, 400)],
+
+    FragNames = frag_names(Tab),
+    RawRead = 
+	fun(Frag) -> 
+		Node = mnesia:table_info(Frag, where_to_read),
+		{Frag, rpc:call(Node, ets, tab2list, [Frag])}
+	end,
+    
+    ?match(done, mnesia:activity(transaction, fun nice_iter_access/3, [Tab, FragNames, RawRead], mnesia_frag)),
+
+    FragNames = frag_names(Tab),
+    [First, Second | _] = FragNames,
+    [Last, LastButOne | _] = lists:reverse(FragNames),
+
+    ?match({atomic, ok}, mnesia:clear_table(First)),
+    ?match({atomic, ok}, mnesia:clear_table(Second)),
+    ?match({atomic, ok}, mnesia:clear_table(lists:nth(8, FragNames))),
+    ?match({atomic, ok}, mnesia:clear_table(lists:nth(9, FragNames))),
+    ?match({atomic, ok}, mnesia:clear_table(lists:nth(10, FragNames))),
+    ?match({atomic, ok}, mnesia:clear_table(lists:nth(11, FragNames))),
+    ?match({atomic, ok}, mnesia:clear_table(LastButOne)),
+    ?match({atomic, ok}, mnesia:clear_table(Last)),
+
+    ?match(done, mnesia:activity(transaction, fun evil_iter_access/3, [Tab, FragNames, RawRead], mnesia_frag)),
+    Size = fun(Table) -> mnesia:table_info(Table, size) end,
+    ?match(true, 0 < mnesia:activity(transaction, Size, [Tab], mnesia_frag)),
+    ?match({atomic, ok}, mnesia:activity(ets, fun() -> mnesia:clear_table(Tab) end, mnesia_frag)),
+    ?match(0, mnesia:activity(transaction, Size, [Tab], mnesia_frag)),
+    
+    ?verify_mnesia(Nodes, []).
+
+nice_iter_access(Tab, FragNames, RawRead) ->
+    RawData = ?ignore(lists:map(RawRead, FragNames)),
+    Keys = [K || {_, Recs} <- RawData, {_, K, _} <- Recs],
+    ExpectedFirst = hd(Keys),
+    ?match(ExpectedFirst, mnesia:first(Tab)),
+    ExpectedLast = lists:last(Keys),
+    ?match(ExpectedLast, mnesia:last(Tab)),
+    
+    ExpectedAllPrev = ['$end_of_table' | lists:reverse(tl(lists:reverse(Keys)))],
+    ?match(ExpectedAllPrev, lists:map(fun(K) -> mnesia:prev(Tab, K) end, Keys)),
+    
+    ExpectedAllNext = tl(Keys) ++ ['$end_of_table'],
+    ?match(ExpectedAllNext, lists:map(fun(K) -> mnesia:next(Tab, K) end, Keys)),
+
+    done.
+
+evil_iter_access(Tab, FragNames, RawRead) ->
+    RawData = ?ignore(lists:map(RawRead, FragNames)),
+    Keys = [K || {_, Recs} <- RawData, {_, K, _} <- Recs],
+    ExpectedFirst = hd(Keys),
+    ?match(ExpectedFirst, mnesia:first(Tab)),
+    ExpectedLast = lists:last(Keys),
+    ?match(ExpectedLast, mnesia:last(Tab)),
+    
+    ExpectedAllPrev = ['$end_of_table' | lists:reverse(tl(lists:reverse(Keys)))],
+    ?match(ExpectedAllPrev, lists:map(fun(K) -> mnesia:prev(Tab, K) end, Keys)),
+    
+    ExpectedAllNext = tl(Keys) ++ ['$end_of_table'],
+    ?match(ExpectedAllNext, lists:map(fun(K) -> mnesia:next(Tab, K) end, Keys)),
+
+    done.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+consistency(doc) ->
+    ["Add and delete fragments during TPC-B"];
+consistency(suite) -> [];
+consistency(Config) when is_list(Config) ->
+    ?skip("Not yet implemented (NYI).~n", []),
+    Nodes = ?acquire_nodes(2, Config),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+evil_create(suite) -> [];
+evil_create(Config) when is_list(Config) ->
+    [Node1, _Node2] = Nodes = ?acquire_nodes(2, Config),
+    
+    Create = fun(T, D, P) -> mnesia:create_table(T, [{frag_properties, P}| D]) end,
+    
+    Tab = evil_create,
+    %% Props in general
+    ?match({aborted, {badarg, Tab, {frag_properties, no_list}}},
+	   Create(Tab, [], no_list)),
+    ?match({aborted, {badarg,Tab , [no_tuple]}},
+	   Create(Tab, [], [no_tuple])),
+    ?match({aborted,{badarg, Tab, bad_key}},
+	   Create(Tab, [], [{bad_key, 7}])),
+
+    %% n_fragments
+    ?match({aborted,{badarg, Tab, [{n_fragments}]}},
+	   Create(Tab, [], [{n_fragments}])),
+    ?match({aborted,{badarg, Tab, [{n_fragments, 1, 1}]}},
+	   Create(Tab, [], [{n_fragments, 1, 1}])),
+    ?match({aborted, {bad_type,Tab, {n_fragments, a}}},
+	   Create(Tab, [], [{n_fragments, a}])),
+    ?match({aborted, {bad_type, Tab, {n_fragments, 0}}},
+	   Create(Tab, [], [{n_fragments, 0}])),
+
+    %% *_copies
+    ?match({aborted, {bad_type, Tab, {n_ram_copies, -1}}},
+	   Create(Tab, [], [{n_ram_copies, -1}, {n_fragments, 1}])),
+    ?match({aborted, {bad_type, Tab, {n_disc_copies, -1}}},
+	   Create(Tab, [], [{n_disc_copies, -1}, {n_fragments, 1}])),
+    ?match({aborted, {bad_type, Tab, {n_disc_only_copies, -1}}},
+	   Create(Tab, [], [{n_disc_only_copies, -1}, {n_fragments, 1}])),
+
+    %% node_pool
+    ?match({aborted, {bad_type, Tab, {node_pool, 0}}},
+	   Create(Tab, [], [{node_pool, 0}])),
+    ?match({aborted, {combine_error, Tab, "Too few nodes in node_pool"}},
+	   Create(Tab, [], [{n_ram_copies, 2}, {node_pool, [Node1]}])),
+
+    %% foreign_key
+    ?match({aborted, {bad_type, Tab, {foreign_key, bad_key}}},
+	   Create(Tab, [], [{foreign_key, bad_key}])), 
+    ?match({aborted,{bad_type, Tab, {foreign_key, {bad_key}}}}, 
+	   Create(Tab, [], [{foreign_key, {bad_key}}])), 
+    ?match({aborted, {no_exists, {bad_tab, frag_properties}}},
+	   Create(Tab, [], [{foreign_key, {bad_tab, val}}])), 
+    ?match({aborted, {combine_error, Tab, {Tab, val}}},
+	   Create(Tab, [], [{foreign_key, {Tab, val}}])),
+    ?match({atomic, ok},
+	   Create(Tab, [], [{n_fragments, 1}])),
+	   
+    ?match({aborted, {already_exists, Tab}},
+	   Create(Tab, [], [{n_fragments, 1}])),
+
+    Tab2 = evil_create2,
+    ?match({aborted, {bad_type, no_attr}},
+	   Create(Tab2, [], [{foreign_key, {Tab, no_attr}}])),
+    ?match({aborted, {combine_error, Tab2, _, _, _}},
+	   Create(Tab2, [], [{foreign_key, {Tab, val}},
+			     {node_pool, [Node1]}])),
+    ?match({aborted, {combine_error, Tab2, _, _, _}},
+	   Create(Tab2, [], [{foreign_key, {Tab, val}},
+			     {n_fragments, 2}])),
+    ?match({atomic, ok},
+	   Create(Tab2, [{attributes, [a, b, c]}], [{foreign_key, {Tab, c}}])),
+    Tab3 = evil_create3,
+    ?match({aborted, {combine_error, Tab3, _, _, _}},
+	   Create(Tab3, [{attributes, [a, b]}], [{foreign_key, {Tab2, b}}])),
+    ?match({atomic, ok},
+	   Create(Tab3, [{attributes, [a, b]}], [{foreign_key, {Tab, b}}])),
+    
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+evil_delete(suite) -> [];
+evil_delete(Config) when is_list(Config) ->
+    ?skip("Not yet implemented (NYI).~n", []),
+    Nodes = ?acquire_nodes(2, Config),
+    ?verify_mnesia(Nodes, []).
+ 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+evil_change(suite) -> [];
+evil_change(Config) when is_list(Config) ->
+    [N1,N2,_N3] = Nodes = ?acquire_nodes(3, Config),
+    Create = fun(T, D, P) -> mnesia:create_table(T, [{frag_properties, P}| D]) end,
+    Props1 = [{n_fragments, 2}, {node_pool, [N1]}],
+    Tab1 = evil_change_ram,
+    ?match({atomic, ok}, Create(Tab1, [], Props1)),
+    
+    ?match({atomic,ok}, mnesia:change_table_frag(Tab1, {add_frag, Nodes})),
+    Dist10 =  frag_dist(Tab1), 
+    ?match([{N1,3}], Dist10), 
+    ?match({atomic, ok}, mnesia:change_table_frag(Tab1, {add_node, N2})),
+    Dist11 =  frag_dist(Tab1),
+    ?match([{N2,0},{N1,3}], Dist11),
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({aborted,_}, mnesia:change_table_frag(Tab1, {add_frag, [N2,N1]})),
+    ?verbose("~p~n",[frag_dist(Tab1)]),
+    mnesia_test_lib:start_mnesia([N2]),
+
+    Tab2 = evil_change_disc,
+    ?match({atomic,ok}, Create(Tab2,[],[{n_disc_copies,1},{n_fragments,1},{node_pool,[N1,N2]}])),
+    ?verbose("~p~n", [frag_dist(Tab2)]),
+    ?match({atomic,ok}, mnesia:change_table_frag(Tab2, {add_frag, [N1,N2]})),
+    _Dist20 =  frag_dist(Tab2), 
+    mnesia_test_lib:kill_mnesia([N2]),
+    ?match({atomic,ok}, mnesia:change_table_frag(Tab2, {add_frag, [N1,N2]})),
+    ?match({aborted,_}, mnesia:change_table_frag(Tab2, {add_frag, [N2,N1]})),
+
+    mnesia_test_lib:start_mnesia([N2]),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+evil_combine(doc) -> ["Bug in mnesia_4.1.5. and earlier"];
+evil_combine(suite) -> [];
+evil_combine(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    ?match({atomic, ok},mnesia:create_table(tab1, [{disc_copies, [Node1]},
+						   {frag_properties, [{n_fragments, 2},
+								      {node_pool, [Node1]},
+								      {n_disc_copies, 1}]}])),
+    ?match({atomic, ok},mnesia:create_table(tab2, [{disc_copies, [Node1]}])),
+    mnesia:wait_for_tables([tab1, tab2], infinity),
+
+    Add2 = fun() -> 
+		   mnesia:transaction(fun() ->
+					      mnesia:write({tab2,1,1})
+				      end)
+	   end,
+    Fun = fun() ->
+		  Add2(),
+		  mnesia:write({tab1,9,10})
+	  end,
+    ?match(ok, mnesia:activity({transaction, 1}, Fun, [], mnesia_frag)),
+    
+    Read = fun(T, K) ->
+		   mnesia:read(T, K, read)
+	   end,
+    
+    ?match([{tab1,9,10}],mnesia:activity(async_dirty, Read, [tab1, 9], mnesia_frag)),
+    ?match([{tab2,1,1}],mnesia:activity(async_dirty, Read, [tab2, 1], mnesia_frag)),
+    
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+evil_loop(doc) -> ["Test select/[14]"];
+evil_loop(suite) -> [];
+evil_loop(Config) when is_list(Config) ->
+    [Node1,_Node2] = ?acquire_nodes(2, Config), 
+    Tab1 = ss_oset,
+    Tab2 = ss_set,
+    Tab3 = ss_bag,
+    Tabs = [Tab1, Tab2, Tab3],
+    RecName = ss,
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab1}, 
+					       {ram_copies, [Node1]}, 
+					       {record_name, RecName},
+					       {type,  ordered_set}])),
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab2},
+					       {record_name, RecName},
+					       {ram_copies, [Node1]},
+					       {type,  set}])),
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab3},
+					       {record_name, RecName},
+					       {ram_copies, [Node1]}, 
+					       {type,  bag}])),
+    Keys = [-3, -2] ++ lists:seq(1, 5, 2) ++ lists:seq(6, 10),
+    Recs = [{RecName, K, K} || K <- Keys],
+    [mnesia:dirty_write(Tab1, R) || R <- Recs],
+    [mnesia:dirty_write(Tab2, R) || R <- Recs],
+    [mnesia:dirty_write(Tab3, R) || R <- Recs],
+
+    Activate = 
+	fun(Tab) ->
+		?match({atomic, ok}, mnesia:change_table_frag(Tab, {activate, []})),
+		Dist = frag_dist(Tab),
+		?match({atomic, ok}, mnesia:change_table_frag(Tab, {add_frag, Dist}))
+	end,
+
+    Activate(Tab1),
+    Activate(Tab2),
+    Activate(Tab3),
+
+    Match  = fun(Tab) -> mnesia:match_object(Tab, {'_', '_', '_'}, write) end,
+    Select = fun(Tab) -> mnesia:select(Tab, [{'_', [], ['$_']}]) end,
+    Trans  = fun(Fun, Args) -> mnesia:activity(transaction, Fun, Args, mnesia_frag) end,
+    LoopHelp = fun('$end_of_table',_) ->
+		       [];
+		  ({Res,Cont},Fun) -> 
+		       Sel = mnesia:select(Cont),
+		       Res ++ Fun(Sel, Fun)
+	       end,
+    SelLoop = fun(Table) -> 
+		      Sel = mnesia:select(Table, [{'_', [], ['$_']}], 1, read),
+		      LoopHelp(Sel, LoopHelp)
+	      end,
+
+    R1 = {RecName, 2, 2},
+    R2 = {RecName, 4, 4},
+    R3 = {RecName, 2, 3},
+    R4 = {RecName, 3, 1},
+    R5 = {RecName, 104, 104},
+    W1 = fun(Tab,Search) ->
+		 mnesia:write(Tab,R1,write),
+		 mnesia:write(Tab,R2,write), 
+		 Search(Tab)
+	 end,
+    S1 = lists:sort([R1, R2| Recs]),
+    ?match(S1, sort_res(Trans(W1, [Tab1, Select]))),
+    ?match(S1, sort_res(Trans(W1, [Tab1, Match]))),
+    ?match(S1, sort_res(Trans(W1, [Tab1, SelLoop]))),
+    ?match(S1, sort_res(Trans(W1, [Tab2, Select]))),
+    ?match(S1, sort_res(Trans(W1, [Tab2, SelLoop]))),
+    ?match(S1, sort_res(Trans(W1, [Tab2, Match]))),
+    ?match(S1, sort_res(Trans(W1, [Tab3, Select]))),
+    ?match(S1, sort_res(Trans(W1, [Tab3, SelLoop]))),
+    ?match(S1, sort_res(Trans(W1, [Tab3, Match]))),
+    [mnesia:dirty_delete_object(Frag, R) || R <- [R1, R2], 
+					   Tab <- Tabs,
+					   Frag <- frag_names(Tab)],
+
+    W2 = fun(Tab, Search) -> 
+		 mnesia:write(Tab, R3, write),
+		 mnesia:write(Tab, R1, write), 
+		 Search(Tab)
+	 end,
+    S2 = lists:sort([R1 | Recs]),
+    S2Bag = lists:sort([R1, R3 | Recs]),
+    io:format("S2 = ~p\n", [S2]),
+    ?match(S2, sort_res(Trans(W2, [Tab1, Select]))),
+    ?match(S2, sort_res(Trans(W2, [Tab1, SelLoop]))),
+    ?match(S2, sort_res(Trans(W2, [Tab1, Match]))),
+    ?match(S2, sort_res(Trans(W2, [Tab2, Select]))),
+    ?match(S2, sort_res(Trans(W2, [Tab2, SelLoop]))),
+    ?match(S2, sort_res(Trans(W2, [Tab2, Match]))),
+    io:format("S2Bag = ~p\n", [S2Bag]),
+    ?match(S2Bag, sort_res(Trans(W2, [Tab3, Select]))),
+    ?match(S2Bag, sort_res(Trans(W2, [Tab3, SelLoop]))),
+    ?match(S2Bag, sort_res(Trans(W2, [Tab3, Match]))),
+
+    W3 = fun(Tab,Search) -> 
+		 mnesia:write(Tab, R4, write),
+		 mnesia:delete(Tab, element(2, R1), write), 
+		 Search(Tab)
+	 end,
+    S3Bag = lists:sort([R4 | lists:delete(R1, Recs)]),
+    S3 = lists:delete({RecName, 3, 3}, S3Bag),
+    ?match(S3, sort_res(Trans(W3, [Tab1, Select]))),
+    ?match(S3, sort_res(Trans(W3, [Tab1, SelLoop]))),
+    ?match(S3, sort_res(Trans(W3, [Tab1, Match]))),
+    ?match(S3, sort_res(Trans(W3, [Tab2, SelLoop]))),
+    ?match(S3, sort_res(Trans(W3, [Tab2, Select]))),
+    ?match(S3, sort_res(Trans(W3, [Tab2, Match]))),
+    ?match(S3Bag, sort_res(Trans(W3, [Tab3, Select]))),
+    ?match(S3Bag, sort_res(Trans(W3, [Tab3, SelLoop]))),
+    ?match(S3Bag, sort_res(Trans(W3, [Tab3, Match]))),
+
+    W4 = fun(Tab,Search) -> 
+		 mnesia:delete(Tab, -1, write),
+		 mnesia:delete(Tab, 4 , write),
+		 mnesia:delete(Tab, 17, write),
+		 mnesia:delete_object(Tab, {RecName, -1, x}, write),
+		 mnesia:delete_object(Tab, {RecName, 4, x}, write),
+		 mnesia:delete_object(Tab, {RecName, 42, x}, write),
+		 mnesia:delete_object(Tab, R2, write),
+		 mnesia:write(Tab, R5, write),
+		 Search(Tab)
+	 end,
+    S4Bag = lists:sort([R5 | S3Bag]),
+    S4    = lists:sort([R5 | S3]),
+    ?match(S4, sort_res(Trans(W4, [Tab1, Select]))),
+    ?match(S4, sort_res(Trans(W4, [Tab1, SelLoop]))),
+    ?match(S4, sort_res(Trans(W4, [Tab1, Match]))),
+    ?match(S4, sort_res(Trans(W4, [Tab2, Select]))),
+    ?match(S4, sort_res(Trans(W4, [Tab2, SelLoop]))),
+    ?match(S4, sort_res(Trans(W4, [Tab2, Match]))),
+    ?match(S4Bag, sort_res(Trans(W4, [Tab3, Select]))),
+    ?match(S4Bag, sort_res(Trans(W4, [Tab3, SelLoop]))),
+    ?match(S4Bag, sort_res(Trans(W4, [Tab3, Match]))),
+    [mnesia:dirty_delete_object(Tab, R) || R <- [{RecName, 3, 3}, R5], Tab <- Tabs],
+
+    %% hmmm anything more??
+    
+    ?verify_mnesia([Node1], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+evil_delete_db_node(doc) ->
+    ["Delete db_node with a repicated table with foreign key"];
+evil_delete_db_node(suite) -> [];
+evil_delete_db_node(Config) when is_list(Config) ->
+    Nodes = lists:sort(?acquire_nodes(2, Config)),
+    Local = node(),
+    Remote = hd(Nodes -- [Local]),
+    
+    Type = case mnesia_test_lib:diskless(Config) of 
+	       true  -> n_ram_copies;
+	       false -> n_disc_copies
+	   end,
+    Tab = frag_master,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{frag_properties, [{Type, 2}, {node_pool, Nodes}]}])),
+    ExtraTab = frag_foreigner,
+    ?match({atomic, ok}, mnesia:create_table(ExtraTab, [{frag_properties, [{foreign_key, {Tab, key}}, {node_pool, Nodes}]}])),
+    
+    GetPool = fun(T) -> 
+		      case lists:keysearch(node_pool, 1, mnesia:table_info (T, frag_properties)) of
+			  {value, {node_pool, N}} -> lists:sort(N);
+			  false                   -> []
+		      end
+	      end,
+    ?match(Nodes, GetPool(Tab)),
+    ?match(Nodes, GetPool(ExtraTab)),
+
+
+    ?match(stopped, rpc:call(Remote, mnesia, stop, [])),
+    ?match({atomic, ok}, mnesia:del_table_copy(schema, Remote)),
+	   
+    ?match([Local], GetPool(Tab)),
+    ?match([Local], GetPool(ExtraTab)),
+     
+    ?verify_mnesia([Local], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Misc convenient helpers
+
+frag_write(Tab, Rec) ->
+    Fun = fun() -> mnesia:write(Tab, Rec, write) end,
+    mnesia:activity(sync_dirty, Fun, mnesia_frag).
+
+frag_dist(Tab) ->
+    Fun = fun() -> mnesia:table_info(Tab, frag_dist) end,
+    mnesia:activity(sync_dirty, Fun, mnesia_frag).
+
+frag_names(Tab) ->
+    Fun = fun() -> mnesia:table_info(Tab, frag_names) end,
+    mnesia:activity(sync_dirty, Fun, mnesia_frag).
+
+frag_rec_dist(Tab) -> 
+    Fun = fun() -> mnesia:table_info(Tab, frag_size) end,
+    [Size || {_, Size} <- mnesia:activity(sync_dirty, Fun, mnesia_frag)].
+
+table_size(Tab) ->
+    Node = mnesia:table_info(Tab, where_to_read),
+    rpc:call(Node, mnesia, table_info, [Tab, size]).
+
+sort_res(List) when is_list(List) ->
+    lists:sort(List);
+sort_res(Else) ->
+    Else.
+
+rev_res(List) when is_list(List) ->
+    lists:reverse(List);
+rev_res(Else) ->
+    Else.
diff --git a/lib/mnesia/test/mnesia_inconsistent_database_test.erl b/lib/mnesia/test/mnesia_inconsistent_database_test.erl
new file mode 100644
index 0000000000..c4b6257d5b
--- /dev/null
+++ b/lib/mnesia/test/mnesia_inconsistent_database_test.erl
@@ -0,0 +1,74 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1998-2010. 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(mnesia_inconsistent_database_test).
+-author('[email protected]').
+
+-behaviour(gen_event).
+
+%%-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+%% gen_event callback interface
+-export([init/1, handle_event/2, handle_call/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+
+init(_Args) ->
+    ?verbose("~p installed as event_module~n", [?MODULE]),
+    {ok, []}.
+
+handle_event(Msg, State) ->
+    handle_any_event(Msg, State).
+
+handle_info(Msg, State) ->
+    handle_any_event(Msg, State).
+
+
+handle_call(Msg, State) ->
+    handle_any_event(Msg, State).
+
+
+%% The main...
+
+handle_any_event({mnesia_system_event, Event}, State)
+        when element(1, Event) == inconsistent_database ->
+    ?error("Got event: ~p~n", [Event]),
+    {ok, State};
+handle_any_event(Msg, State) ->
+    ?verbose("Got event: ~p~n", [Msg]),
+    {ok, State}.
+
+%%-----------------------------------------------------------------
+%% terminate(Reason, State) ->
+%%     AnyVal
+%%-----------------------------------------------------------------
+
+terminate(_Reason, _State) ->
+    ok.
+
+%%----------------------------------------------------------------------
+%% Func: code_change/3
+%% Purpose: Upgrade process when its code is to be changed
+%% Returns: {ok, NewState}
+%%----------------------------------------------------------------------
+code_change(_OldVsn, _State, _Extra) ->
+    exit(not_supported).
+
diff --git a/lib/mnesia/test/mnesia_install_test.erl b/lib/mnesia/test/mnesia_install_test.erl
new file mode 100644
index 0000000000..5d55fcac0e
--- /dev/null
+++ b/lib/mnesia/test/mnesia_install_test.erl
@@ -0,0 +1,331 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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(mnesia_install_test).
+-author('[email protected]').
+
+-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+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() -> 
+    [silly_durability, silly_move, silly_upgrade].
+
+groups() -> 
+    [{stress, [], stress_cases()}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Stepwise of more and more advanced features
+silly() ->
+    Nodes = [node()] ++ nodes(),
+    mnesia_test_lib:kill_mnesia(Nodes),
+    Config = [{nodes, Nodes}],
+    mnesia_test_lib:eval_test_case(?MODULE, silly2, Config).
+
+silly2(Config) when is_list(Config) ->
+    [Node1 | _] = Nodes = ?acquire_nodes(3, Config),
+    mnesia_test_lib:kill_mnesia(Nodes),
+    ?ignore([mnesia:delete_schema([N]) || N <- Nodes]),
+    ?match(ok, mnesia:create_schema([Node1])),
+    ?match(ok, rpc:call(Node1, mnesia, start, [])),
+    ?match(ok, rpc:call(Node1, mnesia, wait_for_tables,
+			[[schema], infinity])),
+    Res = silly_durability(Config),
+    StressFun = fun(F) -> apply(?MODULE, F, [Config]) end,
+    R =
+	case length(Nodes) of
+	    L when L > 1 ->
+		Node2 = lists:nth(2, Nodes),
+		AddDb = [schema, Node2, ram_copies],
+		?match({atomic, ok},
+		       rpc:call(Node1, mnesia, add_table_copy, AddDb)),
+		Args = [[{extra_db_nodes, [Node1]}]],
+		?match(ok, rpc:call(Node2, mnesia, start, Args)),
+		ChangeDb = [schema, Node2, disc_copies],
+		?match({atomic, ok},
+		       rpc:call(Node1, mnesia, change_table_copy_type,
+				ChangeDb)),
+		?match([], mnesia_test_lib:sync_tables([Node1, Node2],
+						       [schema])),
+		MoveRes = silly_move(Config),
+		UpgradeRes = silly_upgrade(Config),
+		StressRes = [StressFun(F) || F <- stress_cases()],
+		?verify_mnesia([Node2], []),
+		[Res, MoveRes, UpgradeRes] ++ StressRes;
+	    _ ->
+		StressRes = [StressFun(F) || F <- stress_cases()],
+		?warning("Too few nodes. Perform net_adm:ping(OtherNode) "
+			 "and rerun!!!~n", []),
+		[Res | StressRes]
+	end,
+    ?verify_mnesia([Node1], []),
+    R.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+silly_durability(doc) ->
+    ["Simple test of durability"];
+silly_durability(suite) -> [];
+silly_durability(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config),
+    Tab = silly,
+    Storage = mnesia_test_lib:storage_type(disc_copies, Config),   
+    
+    ?match({atomic, ok}, rpc:call(Node1, mnesia, 
+				  create_table, [Tab, [{Storage, [Node1]}]])),
+
+    Read = fun() -> mnesia:read({Tab, a}) end,
+    Write = fun() -> mnesia:write({Tab, a, b}) end,
+
+    ?match({atomic, []},
+	   rpc:call(Node1, mnesia, transaction, [Read])),
+    ?match({atomic, ok},
+	   rpc:call(Node1, mnesia, transaction, [Write])),
+    ?match({atomic, [{Tab, a, b}]}, 
+	   rpc:call(Node1, mnesia, transaction, [Read])),
+    
+    ?match(stopped, rpc:call(Node1, mnesia, stop, [])),
+    ?match(ok, rpc:call(Node1, mnesia, start, [])),
+    case mnesia_test_lib:diskless(Config) of
+	true -> 
+	    skip;
+	false ->
+	    ?match(ok, rpc:call(Node1, mnesia, wait_for_tables, [[Tab], infinity])),	    
+	    ?match({atomic, [{Tab, a, b}]},
+		   rpc:call(Node1, mnesia, transaction, [Read]))
+    end,
+    ?verify_mnesia([Node1], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+silly_move(doc) ->
+    ["Simple test of movement of a replica from one node to another"];
+silly_move(suite) -> [];
+silly_move(Config) when is_list(Config) ->
+    [Node1, Node2] = ?acquire_nodes(2, Config),
+    Tab = silly_move,
+    ?match({atomic, ok},
+	   rpc:call(Node1, mnesia,
+		    create_table, [Tab, [{ram_copies, [Node2]}]])),
+    ?match([], mnesia_test_lib:sync_tables([Node1, Node2], [Tab])),
+
+    Read = fun() -> mnesia:read({Tab, a}) end,
+    Write = fun() -> mnesia:write({Tab, a, b}) end,
+
+    ?match({atomic, []},
+	   rpc:call(Node1, mnesia, transaction, [Read])),
+    ?match({atomic, ok},
+	   rpc:call(Node1, mnesia, transaction, [Write])),
+    ?match({atomic, [{Tab, a, b}]}, 
+	   rpc:call(Node1, mnesia, transaction, [Read])),
+    
+    case mnesia_test_lib:diskless(Config) of
+	true -> skip;
+	false -> 
+	    ?match({atomic, ok}, 
+		   rpc:call(Node1, mnesia,
+			    change_table_copy_type, [Tab, Node2, disc_only_copies])),
+	    ?match([], mnesia_test_lib:sync_tables([Node1, Node2], [Tab]))
+    end,
+    ?match({atomic, [{Tab, a, b}]}, rpc:call(Node1, mnesia, transaction, [Read])),
+
+    ?match({atomic, ok},
+	   rpc:call(Node1, mnesia,
+		    move_table_copy, [Tab, Node2, Node1])),
+    ?match([], mnesia_test_lib:sync_tables([Node1, Node2], [Tab])),
+    ?match({atomic, [{Tab, a, b}]},
+	   rpc:call(Node1, mnesia, transaction, [Read])),
+    ?verify_mnesia([Node1], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+silly_upgrade(doc) ->
+    ["Simple test of a schema upgrade and restore from backup"];
+silly_upgrade(suite) -> [];
+silly_upgrade(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config),
+    Name = silly_upgrade,
+    Tab1 = silly_upgrade1,
+    Tab2 = silly_upgrade2,
+    Bup = "silly_upgrade.BUP",
+    Bup2 = "silly_upgrade_part.BUP",
+    ?match({atomic, ok}, mnesia:create_table(Tab1, [{ram_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, [{disc_only_copies, Nodes}])),
+
+    CpState = add_some_records(Tab1, Tab2, []),
+    ?match(match, verify_state(Tab1, Tab2, CpState)),
+    file:delete(Bup),
+    ?match(ok, mnesia:backup(Bup)),
+    Args = [{name, Name}, {ram_overrides_dump, true},
+	    {min, [Tab1, schema]}, {max, [Tab2]}],
+    ?match({ok, Name, _}, mnesia:activate_checkpoint(Args)),
+
+    IgnoreState = add_more_records(Tab1, Tab2, CpState),
+    ?match(match, verify_state(Tab1, Tab2, IgnoreState)),
+    ?match({mismatch, _, _}, verify_state(Tab1, Tab2, CpState)),
+    ?match({atomic, ok}, mnesia:del_table_copy(Tab2, Node1)),
+    file:delete(Bup2),
+    ?match(ok, mnesia:backup_checkpoint(Name, Bup2)),
+
+    UpgradeState = transform_some_records(Tab1, Tab2, IgnoreState),
+    ?match({mismatch, _, _}, verify_state(Tab1, Tab2, CpState)),
+    ?match({mismatch, _, _}, verify_state(Tab1, Tab2, IgnoreState)),
+    ?match(match, verify_state(Tab1, Tab2, UpgradeState)),
+
+    ?match(ok, mnesia:deactivate_checkpoint(Name)),
+    ?match(match, verify_state(Tab1, Tab2, UpgradeState)),
+
+    ?match(ok, mnesia:install_fallback(Bup2)),
+    file:delete(Bup2),
+    %% Will generate intentional crash, fatal error
+    ?match([], mnesia_test_lib:stop_mnesia([Node2])),  
+    wait_till_dead([Node1, Node2]),
+    ?match([], mnesia_test_lib:start_mnesia([Node1, Node2], [Tab1, Tab2])),
+    ?match(match, verify_state(Tab1, Tab2, CpState)),
+
+    ?match(ok, mnesia:install_fallback(Bup)),
+    file:delete(Bup),
+    %% Will generate intentional crash, fatal error
+    ?match([], mnesia_test_lib:stop_mnesia([Node1, Node2])),  
+    wait_till_dead([Node1, Node2]),
+    ?match([], mnesia_test_lib:start_mnesia([Node1, Node2], [Tab1, Tab2])),
+    CpState2 = [X || X <- CpState, element(1, X) /= Tab1],
+    ?match(match, verify_state(Tab1, Tab2, CpState2)),
+    ?verify_mnesia(Nodes, []).
+
+wait_till_dead([]) -> ok;
+wait_till_dead([N|Ns]) ->
+    Apps = rpc:call(N, application, which_applications, []),
+    case lists:keymember(mnesia, 1, Apps) of
+	true -> 
+	    timer:sleep(10),
+	    wait_till_dead([N|Ns]);
+	false -> 
+	    wait_till_dead(Ns)
+    end.
+
+add_some_records(Tab1, Tab2, Old) ->
+    Recs1 = [{Tab1, I, I} || I <- lists:seq(1, 30)],
+    Recs2 = [{Tab2, I, I} || I <- lists:seq(20, 40)],
+    lists:foreach(fun(R) -> mnesia:dirty_write(R) end, Recs1),
+    Fun = fun(R) -> mnesia:write(R) end,
+    Trans = fun() -> lists:foreach(Fun, Recs2) end,
+    ?match({atomic, _}, mnesia:transaction(Trans)),
+    lists:sort(Old ++ Recs1 ++ Recs2).
+
+add_more_records(Tab1, Tab2, Old) ->
+    Change1 = [{T, K, V+100} || {T, K, V} <- Old, K==23],
+    Change2 = [{T, K, V+100} || {T, K, V} <- Old, K==24],
+    Del = [{T, K} || {T, K, _V} <- Old, K>=25],
+    New = [{Tab1, 50, 50}, {Tab2, 50, 50}],
+    lists:foreach(fun(R) -> mnesia:dirty_write(R) end, Change1),
+    lists:foreach(fun(R) -> mnesia:dirty_delete(R) end, Del),
+    Fun = fun(R) -> mnesia:write(R) end,
+    Trans = fun() -> lists:foreach(Fun, Change2 ++ New) end,
+    ?match({atomic, ok}, mnesia:transaction(Trans)),
+    Recs = [{T, K, V} || {T, K, V} <- Old, K<23] ++ Change1 ++ Change2 ++ New,
+    lists:sort(Recs).
+
+
+verify_state(Tab1, Tab2, Exp) ->
+    Fun = fun() ->
+		  Act1 = [mnesia:read({Tab1, K}) || K <- mnesia:all_keys(Tab1)],
+		  Act2 = [mnesia:read({Tab2, K}) || K <- mnesia:all_keys(Tab2)],
+		  Act = lists:append(Act1) ++ lists:append(Act2),
+		  {ok, Act -- Exp, Exp -- Act}
+	  end,
+    case mnesia:transaction(Fun) of
+	{atomic, {ok, [], []}} -> match;
+	{atomic, {ok, More, Less}} -> {mismatch, More, Less};
+	{aborted, Reason} -> {error, Reason}
+    end.
+
+transform_some_records(Tab1, _Tab2, Old) ->
+     Fun = fun(Rec) ->
+		   list_to_tuple(tuple_to_list(Rec) ++ [4711])
+	   end,
+    ?match({atomic, ok},
+	   mnesia:transform_table(Tab1, Fun, [key, val, extra])),
+    Filter = fun(Rec) when element(1, Rec) == Tab1 -> {true, Fun(Rec)};
+		(_) -> true
+	     end,
+    lists:sort(lists:zf(Filter, Old)).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+stress_cases() -> 
+[conflict, dist].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dist(doc) ->
+    ["Avoid lock conflicts in order to maximize thruput",
+     "Ten drivers per node, tables replicated to all nodes, lots of branches"];
+dist(suite) -> [];
+dist(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, 10 * 60000}]),
+    Storage = mnesia_test_lib:storage_type(disc_copies, Config),
+    ?match({ok, _}, mnesia_tpcb:start(dist_args(Nodes, Storage))).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+conflict(doc) ->
+    ["Provoke a lot of lock conflicts.",
+     "Ten drivers per node, tables replicated to all nodes, single branch"];
+conflict(suite) -> [];
+conflict(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, 10 * 60000}]),
+    Storage = mnesia_test_lib:storage_type(disc_copies, Config),
+    ?match({ok, _}, mnesia_tpcb:start(conflict_args(Nodes, Storage))).
+
+conflict_args(Nodes, ReplicaType) ->
+    [{db_nodes, Nodes},
+     {driver_nodes, Nodes},
+     {replica_nodes, Nodes},
+     {n_drivers_per_node, 10},
+     {n_branches, 1},
+     {n_accounts_per_branch, 10},
+     {replica_type, ReplicaType},
+     {stop_after, timer:minutes(5)},
+     {report_interval, timer:seconds(10)},
+     {use_running_mnesia, true},
+     {reuse_history_id, true}].
+
+dist_args(Nodes, ReplicaType) ->
+    [{db_nodes, Nodes},
+     {driver_nodes, Nodes},
+     {replica_nodes, Nodes},
+     {n_drivers_per_node, 10},
+     {n_branches, length(Nodes) * 100},
+     {n_accounts_per_branch, 10},
+     {replica_type, ReplicaType},
+     {stop_after, timer:minutes(5)},
+     {report_interval, timer:seconds(10)},
+     {use_running_mnesia, true},
+     {reuse_history_id, true}].
+
diff --git a/lib/mnesia/test/mnesia_isolation_test.erl b/lib/mnesia/test/mnesia_isolation_test.erl
new file mode 100644
index 0000000000..3273bc4d40
--- /dev/null
+++ b/lib/mnesia/test/mnesia_isolation_test.erl
@@ -0,0 +1,2355 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1997-2010. 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(mnesia_isolation_test).
+-author('[email protected]').
+
+-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+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() -> 
+    [{group, locking}, {group, visibility}].
+
+groups() -> 
+    [{locking, [],
+      [no_conflict, simple_queue_conflict,
+       advanced_queue_conflict, simple_deadlock_conflict,
+       advanced_deadlock_conflict, lock_burst,
+       {group, sticky_locks}, {group, unbound_locking},
+       {group, admin_conflict}, nasty]},
+     {sticky_locks, [], [basic_sticky_functionality]},
+     {unbound_locking, [], [unbound1, unbound2]},
+     {admin_conflict, [],
+      [create_table, delete_table, move_table_copy,
+       add_table_index, del_table_index, transform_table,
+       snmp_open_table, snmp_close_table,
+       change_table_copy_type, change_table_access,
+       add_table_copy, del_table_copy, dump_tables,
+       {group, extra_admin_tests}]},
+     {extra_admin_tests, [],
+      [del_table_copy_1, del_table_copy_2, del_table_copy_3,
+       add_table_copy_1, add_table_copy_2, add_table_copy_3,
+       add_table_copy_4, move_table_copy_1, move_table_copy_2,
+       move_table_copy_3, move_table_copy_4]},
+     {visibility, [],
+      [dirty_updates_visible_direct,
+       dirty_reads_regardless_of_trans,
+       trans_update_invisibible_outside_trans,
+       trans_update_visible_inside_trans, write_shadows,
+       delete_shadows, write_delete_shadows_bag,
+       write_delete_shadows_bag2, {group, iteration},
+       shadow_search, snmp_shadows]},
+     {removed_resources, [], [rr_kill_copy]},
+     {iteration, [], [foldl, first_next]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+no_conflict(suite) -> [];
+no_conflict(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = no_conflict, 
+    create_conflict_table(Tab, [Node1]), 
+    Fun = fun(OtherOid, Lock1, Lock2) ->
+		  %% Start two transactions
+		  {success, [B, A]} = ?start_activities([Node1, Node1]), 
+		  ?start_transactions([B, A]), 
+		  
+		  A ! fun() -> Lock1(one_oid(Tab)),  ok end, 
+		  ?match_receive({A, ok}), 
+		  B ! fun() -> Lock2(OtherOid),  ok end, 
+		  ?match_receive({B, ok}), 
+		  A ! fun() -> mnesia:abort(ok) end, 
+		  ?match_receive({A, {aborted, ok}}), 
+		  B ! fun() -> mnesia:abort(ok) end, 
+		  ?match_receive({B, {aborted, ok}})
+	  end, 
+    NoLocks = lock_funs(no_lock, any_granularity), 
+    SharedLocks = lock_funs(shared_lock, any_granularity), 
+    AnyLocks = lock_funs(any_lock, any_granularity), 
+    OneOneFun = fun(Lock1, Lock2) -> Fun(one_oid(Tab), Lock1, Lock2) end, 
+    fun_loop(OneOneFun, NoLocks, AnyLocks), 
+    fun_loop(OneOneFun, AnyLocks, NoLocks), 
+    fun_loop(OneOneFun, SharedLocks, SharedLocks), 
+
+    %% Lock different objects
+    OneOtherFun = fun(Lock1, Lock2) -> Fun(other_oid(Tab), Lock1, Lock2) end, 
+    OneSharedLocks = lock_funs(shared_lock, one), 
+    OneExclusiveLocks = lock_funs(exclusive_lock, one), 
+    fun_loop(OneOtherFun, OneSharedLocks, OneExclusiveLocks), 
+    fun_loop(OneOtherFun, OneExclusiveLocks, OneSharedLocks), 
+    fun_loop(OneOtherFun, OneExclusiveLocks, OneExclusiveLocks), 
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+simple_queue_conflict(suite) -> [];
+simple_queue_conflict(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = simple_queue_conflict, 
+    create_conflict_table(Tab, [Node1]), 
+    Fun = fun(OneLock, OtherLock) ->
+		  %% Start two transactions
+		  {success, [B, A]} = ?start_activities([Node1, Node1]), 
+		  ?start_transactions([B, A]), 
+		  
+		  A ! fun() -> OneLock(one_oid(Tab)),  ok end, 
+		  ?match_receive({A, ok}), 
+		  B ! fun() -> OtherLock(one_oid(Tab)),  ok end, 
+		  wait_for_lock(B, [Node1], 20), % Max 10 sec
+		  A ! end_trans, 
+		  ?match_multi_receive([{A, {atomic, end_trans}}, {B, ok}]), 
+		  B ! fun() -> mnesia:abort(ok) end, 
+		  ?match_receive({B, {aborted, ok}})
+	  end, 
+    OneSharedLocks = lock_funs(shared_lock, one), 
+    AllSharedLocks = lock_funs(shared_lock, all), 
+    OneExclusiveLocks = lock_funs(exclusive_lock, one), 
+    AllExclusiveLocks = lock_funs(exclusive_lock, all), 
+    fun_loop(Fun, OneExclusiveLocks, OneExclusiveLocks), 
+    fun_loop(Fun, AllExclusiveLocks, AllExclusiveLocks), 
+    fun_loop(Fun, OneExclusiveLocks, AllExclusiveLocks), 
+    fun_loop(Fun, AllExclusiveLocks, OneExclusiveLocks), 
+    fun_loop(Fun, OneSharedLocks, AllExclusiveLocks), 
+    fun_loop(Fun, AllSharedLocks, OneExclusiveLocks), 
+    ok.
+
+wait_for_lock(Pid, _Nodes, 0) ->
+    Queue = mnesia:system_info(lock_queue),
+    ?error("Timeout while waiting for lock on Pid ~p in queue ~p~n", [Pid, Queue]);
+wait_for_lock(Pid, Nodes, N) ->
+    rpc:multicall(Nodes, sys, get_status, [mnesia_locker]), 
+    List = [rpc:call(Node, mnesia, system_info, [lock_queue]) || Node <- Nodes],
+    Q = lists:append(List),
+    check_q(Pid, Q, Nodes, N).
+
+check_q(Pid, [{_Oid, _Op, Pid, _Tid, _WFT} | _Tail], _N, _Count) -> ok;
+check_q(Pid, [_ | Tail], N, Count) -> check_q(Pid, Tail, N, Count);
+check_q(Pid, [], N, Count) ->
+    timer:sleep(500),
+    wait_for_lock(Pid, N, Count - 1).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+advanced_queue_conflict(suite) -> [];
+advanced_queue_conflict(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = advanced_queue_conflict, 
+    create_conflict_table(Tab, [Node1]), 
+    OneRec = {Tab, 3, 3}, 
+    OneOid = {Tab, 3}, 
+    OtherRec = {Tab, 4, 4}, 
+    OtherOid = {Tab, 4}, 
+    
+    %% Start four transactions
+    {success, [D, C, B, A]} = ?start_activities(lists:duplicate(4, Node1)), 
+    ?start_transactions([D, C, B, A]), 
+    sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async
+    ?match([], mnesia:system_info(held_locks)), 
+    ?match([], mnesia:system_info(lock_queue)), 
+
+    %% Acquire some locks
+    A ! fun() -> mnesia:write(OneRec) end, 
+    ?match_receive({A, ok}), 
+    A ! fun() -> mnesia:read(OneOid) end, 
+    ?match_receive({A, [OneRec]}), 
+    
+    B ! fun() -> mnesia:write(OtherRec) end, 
+    ?match_receive({B, ok}), 
+    B ! fun() -> mnesia:read(OneOid) end, 
+    ?match_receive(timeout), 
+    
+    C ! fun() -> mnesia:read(OtherOid) end, 
+    ?match_receive(timeout), 
+    D ! fun() -> mnesia:wread(OtherOid) end, 
+    ?match_receive(timeout), 
+    
+    %% and release them in a certain order
+    A ! end_trans, 
+    ?match_multi_receive([{A, {atomic, end_trans}}, {B, [OneRec]}]), 
+    B ! end_trans, 
+    ?match_multi_receive([{B, {atomic, end_trans}}, {C, [OtherRec]}]), 
+    C ! end_trans, 
+    ?match_multi_receive([{C, {atomic, end_trans}}, {D, [OtherRec]}]), 
+    D ! end_trans, 
+    ?match_receive({D, {atomic, end_trans}}), 
+    
+    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.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+simple_deadlock_conflict(suite) -> [];
+simple_deadlock_conflict(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = simple_deadlock_conflict, 
+    create_conflict_table(Tab, [Node1]), 
+    Rec = {Tab, 4, 4}, 
+    Oid = {Tab, 4}, 
+    
+    %% Start two transactions
+    {success, [B, A]} = ?start_activities(lists:duplicate(2, Node1)), 
+    mnesia_test_lib:start_transactions([B, A], 0),  % A is newest
+    sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async
+    ?match([], mnesia:system_info(held_locks)), 
+    ?match([], mnesia:system_info(lock_queue)), 
+
+    B ! fun() -> mnesia:write(Rec) end, 
+    ?match_receive({B, ok}), 
+    A ! fun() -> mnesia:read(Oid) end, 
+    ?match_receive({A, {aborted, nomore}}), 
+    B ! end_trans, 
+    ?match_receive({B, {atomic, end_trans}}), 
+
+    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.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+advanced_deadlock_conflict(suite) -> [];
+advanced_deadlock_conflict(Config) when is_list(Config) ->
+    [Node1, Node2] = ?acquire_nodes(2, Config), 
+    Tab = advanced_deadlock_conflict, 
+    create_conflict_table(Tab, [Node2]), 
+    sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async
+    Rec = {Tab, 4, 4}, 
+    Oid = {Tab, 4}, 
+    
+    %% Start two transactions
+    {success, [B, A]} = ?start_activities([Node1, Node2]), 
+    mnesia_test_lib:start_sync_transactions([B, A], 0),  % A is newest
+    sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async
+    ?match([], mnesia:system_info(held_locks)), 
+    ?match([], mnesia:system_info(lock_queue)), 
+
+    B ! fun() -> mnesia:write(Rec) end, 
+    ?match_receive({B, ok}), 
+    A ! fun() -> mnesia:read(Oid) end, 
+    ?match_receive({A, {aborted, nomore}}), 
+    B ! end_trans, 
+    ?match_receive({B, {atomic, end_trans}}), 
+
+    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.
+
+one_oid(Tab) -> {Tab, 1}.
+other_oid(Tab) -> {Tab, 2}.
+    
+create_conflict_table(Tab, Nodes) ->
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab}, 
+					     {ram_copies, Nodes}, 
+					     {attributes, [key, val]}, 
+					     {index, [val]}
+					    ])),
+    ?match([], mnesia_test_lib:sync_tables(Nodes, [Tab])),
+    init_conflict_table(Tab).
+
+init_conflict_table(Tab) ->
+    Recs = mnesia:dirty_match_object({Tab, '_', '_'}), 
+    lists:foreach(fun(R) -> mnesia:dirty_delete_object(R) end, Recs), 
+    Keys = [one_oid(Tab), other_oid(Tab)], 
+    [mnesia:dirty_write({T, K, K}) || {T, K} <- Keys].
+
+%% Apply Fun for each X and Y
+fun_loop(Fun, Xs, Ys) ->
+    lists:foreach(fun(X) -> lists:foreach(fun(Y) -> do_fun(Fun, X, Y) end, Ys) end, Xs).
+
+do_fun(Fun, X, Y) ->
+    Pid = spawn_link(?MODULE, do_fun, [self(), Fun, X, Y]), 
+    receive
+	{done_fun, Pid} -> done_fun
+    end.
+
+do_fun(Monitor, Fun, X, Y) ->
+    ?log("{do_fun ~p~n", [[Fun, X, Y]]), 
+    sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async
+    ?match([], mnesia:system_info(held_locks)), 
+    ?match([], mnesia:system_info(lock_queue)), 
+    Fun(X, Y), 
+    sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async
+    ?match([], mnesia:system_info(held_locks)), 
+    ?match([], mnesia:system_info(lock_queue)), 
+    unlink(Monitor), 
+    Monitor ! {done_fun, self()}, 
+    exit(done_fun).
+
+%% Returns a list of fun's
+lock_funs(no_lock, one) ->
+    [
+     fun(Oid) -> mnesia:dirty_read(Oid) end, 
+     fun({Tab, Key}) -> mnesia:dirty_write({Tab, Key, Key}) end, 
+     fun({Tab, Key}) -> mnesia:dirty_write({Tab, Key, Key}), 
+		       mnesia:dirty_update_counter({Tab, Key}, 0) end, 
+     fun(Oid) -> mnesia:dirty_delete(Oid) end, 
+     fun({Tab, Key}) -> mnesia:dirty_delete_object({Tab, Key, Key}) end, 
+     fun({Tab, Key}) -> mnesia:dirty_match_object({Tab, Key, Key}) end, 
+     fun({Tab, Key}) -> mnesia:dirty_index_match_object({Tab, Key, Key}, val) end, 
+     fun({Tab, Key}) -> mnesia:dirty_index_read(Tab, Key, val) end, 
+     fun({Tab, Key}) -> mnesia:dirty_index_match_object({Tab, '_', Key}, val) end
+    ];
+lock_funs(no_lock, all) ->
+    [
+     fun({Tab, _}) -> mnesia:dirty_match_object({Tab, '_', '_'}) end, 
+     fun({Tab, _}) -> slot_iter(Tab) end, 
+     fun({Tab, _}) -> key_iter(Tab) end
+    ];
+lock_funs(shared_lock, one) ->
+    
+    [
+     fun(Oid) -> mnesia:read(Oid) end, 
+     fun({Tab, Key}) ->
+	     init_conflict_table(Tab), 
+	     mnesia:dirty_delete(other_oid(Tab)), 
+	     mnesia:match_object({Tab, Key, Key}) end
+     ];
+lock_funs(shared_lock, all) ->
+    [
+     fun({Tab, _}) -> mnesia:read_lock_table(Tab) end, 
+     fun({Tab, Key}) -> mnesia:match_object({Tab, '_', Key}) end, 
+     fun({Tab, _}) -> mnesia:match_object({Tab, '_', '_'}) end, 
+     fun({Tab, _}) -> mnesia:all_keys(Tab) end, 
+     fun({Tab, Key}) -> mnesia:index_match_object({Tab, '_', Key}, val) end,
+     fun({Tab, Key}) -> mnesia:index_read(Tab, Key, val) end
+    ];
+lock_funs(exclusive_lock, one) ->
+    [
+     fun(Oid) -> mnesia:wread(Oid) end, 
+     fun({Tab, Key}) -> mnesia:write({Tab, Key, Key}) end, 
+     fun(Oid) -> mnesia:delete(Oid) end, 
+     fun({Tab, Key}) -> mnesia:delete_object({Tab, Key, Key}) end, 
+     fun({Tab, Key}) -> mnesia:s_write({Tab, Key, Key}) end, 
+     fun(Oid) -> mnesia:s_delete(Oid) end, 
+     fun({Tab, Key}) -> mnesia:s_delete_object({Tab, Key, Key}) end
+    ];
+lock_funs(exclusive_lock, all) ->
+    [
+     fun({Tab, _}) -> mnesia:write_lock_table(Tab) end
+    ];
+lock_funs(Compatibility, any_granularity) ->
+    lists:append([lock_funs(Compatibility, Granularity) ||
+		     Granularity <- [one, all]]);
+lock_funs(any_lock, Granularity) ->
+    lists:append([lock_funs(Compatibility, Granularity) ||
+		     Compatibility <- [no_lock, shared_lock, exclusive_lock]]).
+
+slot_iter(Tab) ->
+    slot_iter(Tab, mnesia:dirty_slot(Tab, 0), 1).
+slot_iter(_Tab, '$end_of_table', _) ->
+    [];
+slot_iter(Tab, Recs, Slot) ->
+    Recs ++ slot_iter(Tab, mnesia:dirty_slot(Tab, Slot), Slot+1).
+
+key_iter(Tab) ->
+    key_iter(Tab, mnesia:dirty_first(Tab)).
+key_iter(_Tab, '$end_of_table') ->
+    [];
+key_iter(Tab, Key) ->
+    [Key | key_iter(Tab, mnesia:dirty_next(Tab, Key))].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+lock_burst(suite) -> [];
+lock_burst(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = burst, 
+    ?match({atomic, ok},  mnesia:create_table(Tab, 
+					    [{attributes,  [a, b]}, 
+					     {ram_copies, [Node1]}])), 
+    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(ok, burst_em(Tab, 1000)), 
+    ?match([{burst,1,1000}], mnesia:dirty_read(Tab,1)),
+    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.
+
+burst_em(Tab, N) ->
+    spawn_link(?MODULE, burst_counter, [self(), Tab, N]), 
+    receive
+	burst_counter_done -> ok
+    end.
+
+burst_counter(Monitor, Tab, N) when N > 0 ->
+    ?match(ok, burst_gen(Tab, N, self())), 
+    Monitor ! burst_receiver(N).
+
+burst_receiver(0) ->
+    burst_counter_done;
+burst_receiver(N) ->
+    receive
+	burst_incr_done ->
+	    burst_receiver(N-1)
+    end.
+    
+burst_gen(_, 0, _) ->
+    ok;
+burst_gen(Tab, N, Father) when is_integer(N), N > 0 ->
+    spawn_link(?MODULE,  burst_incr,  [Tab, Father]), 
+    burst_gen(Tab, N-1, Father).
+
+burst_incr(Tab, Father) ->
+    Fun = fun() ->
+		  Val = 
+		      case mnesia:read({Tab, 1}) of
+			  [{Tab, 1, V}] -> V;
+			  [] -> 0
+		      end, 
+		  mnesia:write({Tab, 1, Val+1})
+	  end, 
+    ?match({atomic, ok}, mnesia:transaction(Fun)), 
+    Father ! burst_incr_done.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+basic_sticky_functionality(suite) -> [];
+basic_sticky_functionality(Config) when is_list(Config) -> 
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = basic_table,
+    Storage = mnesia_test_lib:storage_type(disc_copies, Config),
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{Storage, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(sync, [{ram_copies, Nodes}])),
+    Trans1 = fun() ->
+		     ?match(ok, mnesia:s_write({Tab, 1, 2})),
+		     ?match([{Tab, 1, 2}], mnesia:read({Tab, 1})),
+		     ?match(timeout, receive M -> M after 500 -> timeout end),
+		     ?match(ok, mnesia:s_write({Tab, 2, 2})),
+		     ?match(ok, mnesia:write({Tab, 42, 4711}))
+	     end,
+    Trans2 = fun() ->
+		     ?match([{Tab, 1, 2}],  mnesia:read({Tab, 1})),
+		     ?match(timeout, receive M -> M after 500 -> timeout end),
+		     ?match(ok, mnesia:write({Tab, 1, 4711})),
+		     ?match(ok, mnesia:s_write({Tab, 2, 4})),
+		     ?match(ok, mnesia:delete({Tab, 42}))
+	     end,
+    rpc:call(N1, mnesia, transaction, [Trans1]),
+    ?match([{Tab,N1}], rpc:call(N1, ?MODULE, get_sticky, [])),
+    ?match([{Tab,N1}], rpc:call(N2, ?MODULE, get_sticky, [])),
+
+    rpc:call(N2, mnesia, transaction, [Trans2]),
+    ?match([], rpc:call(N1, ?MODULE, get_sticky, [])),
+    ?match([], rpc:call(N2, ?MODULE, get_sticky, [])),
+    
+    Slock = fun() -> mnesia:read({sync,sync}),get_sticky() end,
+    ?match({atomic, [{Tab,1, 4711}]}, mnesia:transaction(fun() -> mnesia:read({Tab, 1}) end)),
+    ?match({atomic, [{Tab,2, 4}]},    mnesia:transaction(fun() -> mnesia:read({Tab, 2}) end)),
+    ?match({atomic, [{Tab,N1}]}, rpc:call(N1, mnesia, transaction, 
+					  [fun() -> mnesia:s_write({Tab, 1, 3}),Slock() end])),
+    ?match([{Tab,N1}], rpc:call(N2, ?MODULE, get_sticky, [])),
+    
+    ?match({atomic,[]}, rpc:call(N2, mnesia, transaction, 
+				 [fun() -> mnesia:s_write({Tab, 1, 4}),Slock()  end])),
+
+    ?match([], rpc:call(N1, ?MODULE, get_sticky, [])),
+    ?match([], rpc:call(N2, ?MODULE, get_sticky, [])),
+    
+    ?match({atomic,[{Tab,N2}]}, rpc:call(N2, mnesia, transaction, 
+					 [fun() -> mnesia:s_write({Tab, 1, 4}),Slock() end])),
+    
+    ?match({atomic,[]}, rpc:call(N1, mnesia, transaction, 
+				 [fun() -> mnesia:s_write({Tab, 1, 5}),Slock()  end])),
+    ?match({atomic,[{Tab,N1}]}, rpc:call(N1, mnesia, transaction, 
+					 [fun() -> mnesia:s_write({Tab, 1, 5}),Slock()  end])),
+    ?match({atomic,[]}, rpc:call(N2, mnesia, transaction, 
+				 [fun() -> mnesia:s_write({Tab, 1, 6}),Slock()  end])),
+    ?match({atomic,[{Tab,N2}]}, rpc:call(N2, mnesia, transaction, 
+					 [fun() -> mnesia:s_write({Tab, 1, 7}),Slock()  end])),
+    
+    ?match([{Tab,N2}], get_sticky()),
+    ?match({atomic, [{Tab,1, 7}]}, mnesia:transaction(fun() -> mnesia:read({Tab, 1}) end)),
+    ?match([{Tab,N2}], get_sticky()),
+    ?match({atomic, [{Tab,2, 4}]}, mnesia:transaction(fun() -> mnesia:read({Tab, 2}) end)),
+    ?match([{Tab,N2}], get_sticky()),
+    ?match({atomic,[{Tab,N2}]}, rpc:call(N2, mnesia, transaction, 
+					 [fun() -> mnesia:s_write({Tab, 1, 6}),Slock()  end])),
+    ?match([{Tab,N2}], get_sticky()),
+    ?match({atomic, [{Tab,1, 6}]}, mnesia:transaction(fun() -> mnesia:read({Tab, 1}) end)),
+    ?match([{Tab,N2}], get_sticky()),
+    ?match({atomic, [{Tab,2, 4}]}, mnesia:transaction(fun() -> mnesia:read({Tab, 2}) end)),
+    ?match([{Tab,N2}], get_sticky()),
+    ?verify_mnesia(Nodes, []).
+
+get_sticky() ->
+    mnesia_locker ! {get_table, self(), mnesia_sticky_locks},
+    receive {mnesia_sticky_locks, Locks} -> Locks end.
+
+get_held() ->
+    mnesia_locker ! {get_table, self(), mnesia_sticky_locks},
+    receive {mnesia_sticky_locks, Locks} -> Locks end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+unbound1(suite) -> [];
+unbound1(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config),
+    
+    ?match({atomic, ok}, mnesia:create_table(ul, [])),
+    
+    Tester = self(),
+    Write = fun() ->
+		    mnesia:write({ul, {key, {17,42}}, val}),
+		    ?log("~p Got write lock waiting...~n", [self()]),  
+		    Tester ! continue,
+		    receive 
+			continue ->
+			    ok
+		    end,
+		    ?log("..continuing~n", []),
+		    ok
+	    end,
+    
+    {success, [A]} = ?start_activities([Node1]),
+    ?start_transactions([A]),    
+    A ! Write,    
+    
+    receive continue -> ok end,
+
+    Match = fun() ->		    
+		    case catch mnesia:match_object({ul, {key, {'_', '$0'}}, '_'}) of
+			{'EXIT', What} ->  %% Cyclic first time
+			    ?log("Cyclic Restarting~n", []),
+			    A ! continue,
+			    A ! end_trans,
+			    exit(What);
+			Res ->
+			    ?log("Got match log ~p...~n", [Res]),
+			    Res
+		    end
+	    end,
+    ?match({atomic, [{ul,{key,{17,42}},val}]}, mnesia:transaction(Match)),
+
+    ?match_receive({A, ok}),
+    ?match_receive({A, {atomic, end_trans}}),
+    ok.
+
+unbound2(suite) -> [];
+unbound2(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config),
+    
+    ?match({atomic, ok}, mnesia:create_table(ul, [])),
+        
+    {success, [B, A]} = ?start_activities([Node1, Node1]),
+    
+    Me = self(),
+    
+    Write = fun() ->
+		    mnesia:write({ul, {key, {17,42}}, val}),
+		    ?log("~p Got write lock waiting... Tid ~p ~n", 
+			 [self(), get(mnesia_activity_state)]),  
+		    Me ! ok_lock,
+		    receive 
+			continue ->
+			    ok
+		    end,
+		    ?log("..continuing~n", []),
+		    ok
+	    end,
+    
+    Match = fun() ->  
+		    receive 
+			continueB -> 
+			    ?log("~p, moving on TID ~p~n", 
+				 [self(), get(mnesia_activity_state)]),
+			    Me ! {self(), continuing}
+		    end,
+		    case catch mnesia:match_object({ul, {key, {'_', '$0'}}, 
+						    '_'}) of
+			{'EXIT', What} ->  %% Cyclic first time
+			    ?log("Cyclic Restarting ~p ~n", [What]),
+			    {should_not_happen,What};
+			Res ->
+			    ?log("Got match log ~p...~n", [Res]),
+			    Res
+		    end
+	    end,
+
+    B ! fun() -> mnesia:transaction(Match) end,
+    timer:sleep(100),  %% Let B be started first..
+    A ! fun() -> mnesia:transaction(Write) end,    
+    
+    receive ok_lock -> ok end,
+
+    B ! continueB,
+    ?match_receive({B, continuing}),
+
+    %% B should now be in lock queue.
+    A ! continue,    
+    ?match_receive({A, {atomic, ok}}),    
+    ?match_receive({B, {atomic, [{ul,{key,{17,42}},val}]}}),
+    ok.
+    
+receiver() ->
+    receive 
+	{_Pid, begin_trans} ->
+	    receiver();
+	Else ->
+	    Else
+    after 
+	10000 ->
+	    timeout
+    end.   
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+create_table(suite) -> [];
+create_table(Config) when is_list(Config) ->
+    [ThisNode, Node2] = ?acquire_nodes(2, Config),
+    Tab = c_t_tab,
+    Def = [{ram_copies, [ThisNode]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    {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
+    
+    DiskMaybe = mnesia_test_lib:storage_type(disc_copies, Config),
+
+    Pid = spawn_link(?MODULE, op, [self(), mnesia, create_table,
+				   [test_tab1, [{DiskMaybe, [ThisNode]}]]]),
+    ?match_multi_receive([{Pid, {atomic, ok}},
+			  {'EXIT', Pid, normal}]), %% No Locks! op should be exec.
+
+    Pid2 = spawn_link(?MODULE, op, [self(), mnesia, create_table,
+				   [test_tab2, [{ram_copies, [Node2]}]]]),
+
+    ?match_multi_receive([{Pid2, {atomic, ok}},
+			  {'EXIT', Pid2, normal}]), %% No Locks! op should be exec.
+
+    A ! end_trans,        
+    ?match_receive({A,{atomic,end_trans}}),
+    
+    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.
+
+delete_table(suite) -> [];
+delete_table(Config) when is_list(Config) ->
+    [ThisNode, Node2] = ?acquire_nodes(2, Config),
+    Tab = d_t_tab,
+    Def = [{ram_copies, [ThisNode, Node2]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    {success, [A]} = ?start_activities([ThisNode]), 
+    mnesia_test_lib:start_sync_transactions([A], 0),
+
+    A ! fun() -> mnesia:read({Tab, 1}) end,
+    ?match_receive({A, [{Tab, 1, 1, 0}]}),   %% A is executed
+
+    Pid = spawn_link(?MODULE, op, [self(), mnesia, delete_table,
+				   [Tab]]),
+    
+    ?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 
+	Msg -> ?match({Pid, {atomic, ok}}, Msg)
+    after
+	timer:seconds(20) -> ?error("Operation timed out", [])
+    end,
+    
+    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.
+
+move_table_copy(suite) -> [];
+move_table_copy(Config) when is_list(Config) ->
+    [ThisNode, Node2] = ?acquire_nodes(2, Config),
+    Tab = m_t_c_tab,
+    Def = [{ram_copies, [ThisNode]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    {success, [A]} = ?start_activities([ThisNode]), 
+    mnesia_test_lib:start_sync_transactions([A], 0),
+
+    A ! fun() -> mnesia:write({Tab, 1, 2, 3}) end,
+    ?match_receive({A, ok}),   %% A is executed
+
+    Pid = spawn_link(?MODULE, op, [self(), mnesia, move_table_copy,
+				   [Tab, ThisNode, Node2]]),
+    
+    ?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 
+	Msg -> ?match({Pid, {atomic, ok}}, Msg)
+    after
+	timer:seconds(20) -> ?error("Operation timed out", [])
+    end,
+    
+    timer:sleep(500), %% Don't know how to sync this !!!
+    sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async
+    sys:get_status(whereis(mnesia_tm)),    % Explicit sync, release locks is async
+    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.
+
+add_table_index(suite) -> [];
+add_table_index(Config) when is_list(Config) ->
+    [ThisNode, _Node2] = ?acquire_nodes(2, Config ++ [{tc_timeout, 60000}]),
+    Tab = a_t_i_tab,
+    Def = [{ram_copies, [ThisNode]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    {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_index, [Tab, attr1]]),
+
+    ?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 
+	Msg -> ?match({Pid, {atomic, ok}}, Msg)
+    after
+	timer:seconds(20) -> ?error("Operation timed out", [])
+    end,
+    
+    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_index(suite) -> [];
+del_table_index(Config) when is_list(Config) ->
+    [ThisNode, _Node2] = ?acquire_nodes(2, Config),
+    Tab = d_t_i_tab,
+    Def = [{ram_copies, [ThisNode]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, attr1)),    
+
+    {success, [A]} = ?start_activities([ThisNode]), 
+    mnesia_test_lib:start_sync_transactions([A], 0),
+
+    A ! fun() -> mnesia:write({Tab, 51, 51, attr2}) end,
+    ?match_receive({A, ok}),   %% A is executed
+
+    Pid = spawn_link(?MODULE, op, [self(), mnesia, del_table_index,
+				   [Tab, attr1]]),
+
+    ?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}}),     
+    %% Locks released! op should be exec.
+    receive 
+	Msg -> ?match({Pid, {atomic, ok}}, Msg)
+    after
+	timer:seconds(20) -> ?error("Operation timed out", [])
+    end,
+    
+    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.
+
+transform_table(suite) -> [];
+transform_table(Config) when is_list(Config) -> 
+    [ThisNode, Node2] = ?acquire_nodes(2, Config),
+    Tab = t_t_tab,
+    Def = [{ram_copies, [ThisNode, Node2]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    {success, [A]} = ?start_activities([ThisNode]), 
+    mnesia_test_lib:start_sync_transactions([A], 0),
+
+    A ! fun() -> mnesia:read({Tab, 1}) end,
+    ?match_receive({A, [{Tab, 1, 1, 0}]}),   %% A is executed
+
+    Transform = fun({Table, Key, Attr1, Attr2}) -> % Need todo a transform
+			{Table, Key, {Attr1, Attr2}} end,    
+    Pid = spawn_link(?MODULE, op, [self(), mnesia, transform_table,
+				   [Tab, Transform, [key, attr1]]]),
+    ?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 
+	Msg -> ?match({Pid, {atomic, ok}}, Msg)
+    after
+	timer:seconds(20) -> ?error("Operation timed out", [])
+    end,
+
+    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.
+
+snmp_open_table(suite) -> [];
+snmp_open_table(Config) when is_list(Config) -> 
+    [ThisNode, _Node2] = ?acquire_nodes(2, Config),
+    Tab = s_o_t_tab,
+    Def = [{ram_copies, [ThisNode]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    {success, [A]} = ?start_activities([ThisNode]), 
+    mnesia_test_lib:start_sync_transactions([A], 0),
+
+    A ! fun() -> mnesia:write({Tab, 1, 1, 100}) end,
+    ?match_receive({A, ok}),   %% A is executed
+
+    Pid = spawn_link(?MODULE, op, [self(), mnesia, snmp_open_table,
+				   [Tab, [{key, integer}]]]),
+
+    ?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}}),     
+    
+    %% Locks released! op should be exec. Can take a while (thats the timeout)
+    receive 
+	Msg -> ?match({Pid, {atomic, ok}}, Msg)
+    after
+	timer:seconds(20) -> ?error("Operation timed out", [])
+    end,
+    
+    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.
+
+snmp_close_table(suite) -> [];
+snmp_close_table(Config) when is_list(Config) -> 
+    [ThisNode, _Node2] = ?acquire_nodes(2, Config),
+    Tab = s_c_t_tab,
+    Def = [{ram_copies, [ThisNode]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    ?match({atomic, ok}, mnesia:snmp_open_table(Tab, [{key, integer}])),
+    insert(Tab, 50),
+    {success, [A]} = ?start_activities([ThisNode]), 
+    mnesia_test_lib:start_sync_transactions([A], 0),
+
+    A ! fun() -> mnesia:write({Tab, 1, 1, 100}) end,
+    ?match_receive({A, ok}),   %% A is executed    
+
+    Pid = spawn_link(?MODULE, op, [self(), mnesia, snmp_close_table, [Tab]]),   
+    ?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}}),     
+    
+    %% Locks released! op should be exec. Can take a while (thats the timeout)
+    receive 
+	Msg -> ?match({Pid, {atomic, ok}}, Msg)
+    after
+	timer:seconds(20) -> ?error("Operation timed out", [])
+    end,
+    
+    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.
+
+change_table_copy_type(suite) -> [];
+change_table_copy_type(Config) when is_list(Config) ->
+    [ThisNode, _Node2] = ?acquire_nodes(2, Config),
+    Tab = c_t_c_t_tab,
+    Def = [{ram_copies, [ThisNode]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    {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, change_table_copy_type, 
+				   [Tab, ThisNode, disc_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 
+	Msg -> ?match({Pid, {atomic, ok}}, Msg)
+    after
+	timer:seconds(20) -> ?error("Operation timed out", [])
+    end,
+    
+    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.
+
+change_table_access(suite) -> [];
+change_table_access(Config) when is_list(Config) -> 
+    [ThisNode, _Node2] = ?acquire_nodes(2, Config),
+    Tab = c_t_a_tab,
+    Def = [{ram_copies, [ThisNode]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    {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, change_table_access_mode,
+				   [Tab, read_only]]),
+
+    
+    ?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 
+	Msg -> ?match({Pid, {atomic, ok}}, Msg)
+    after
+	timer:seconds(20) -> ?error("Operation timed out", [])
+    end,
+
+    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.
+
+add_table_copy(suite) -> [];
+add_table_copy(Config) when is_list(Config) -> 
+    [ThisNode, Node2] = ?acquire_nodes(2, Config),
+    Tab = a_t_c_tab,
+    Def = [{ram_copies, [ThisNode]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    {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, 
+				   [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 
+	Msg -> ?match({Pid, {atomic, ok}}, Msg)
+    after
+	timer:seconds(20) -> ?error("Operation timed out", [])
+    end,
+
+    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) -> [];
+del_table_copy(Config) when is_list(Config) -> 
+    [ThisNode, Node2] = ?acquire_nodes(2, Config),
+    Tab = d_t_c_tab,
+    Def = [{ram_copies, [ThisNode, Node2]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    {success, [A]} = ?start_activities([ThisNode]), 
+    mnesia_test_lib:start_sync_transactions([A], 0),
+    A ! fun() -> mnesia:write({Tab, 1, 2, 5}) end,
+    ?match_receive({A, ok}),   %% A is executed
+
+    Pid = spawn_link(?MODULE, op, [self(), mnesia, del_table_copy,
+				   [Tab, ThisNode]]),
+
+    ?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}}),     
+
+    ?match_receive({Pid, {atomic, ok}}),
+    ?match_receive({'EXIT', Pid, normal}),
+
+    timer:sleep(500), %% Don't know how to sync this !!!
+    sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async
+    sys:get_status(whereis(mnesia_tm)),    % Explicit sync, release locks is async
+    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.
+
+dump_tables(suite) -> [];
+dump_tables(Config) when is_list(Config) -> 
+    [ThisNode, Node2] = ?acquire_nodes(2, Config),
+    Tab = dump_t_tab,
+    Def = [{ram_copies, [ThisNode, Node2]}, {attributes, [key, attr1, attr2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 50),
+    {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, dump_tables,
+				   [[Tab]]]),
+
+    ?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 
+	Msg -> ?match({Pid, {atomic, ok}}, Msg)
+    after
+	timer:seconds(20) -> ?error("Operation timed out", [])
+    end,
+    
+    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.
+
+op(Father, Mod, Fun, Args) -> 
+    Res = apply(Mod, Fun, Args),
+    Father ! {self(), Res}.
+
+insert(_Tab, 0) -> ok;
+insert(Tab, N) when N > 0 ->
+    ok = mnesia:sync_dirty(fun() -> mnesia:write({Tab, N, N, 0}) end),
+    insert(Tab, N-1).
+
+
+update_own(Tab, Key, Acc) ->
+    Update = 
+	fun() -> 
+		Res = mnesia:read({Tab, Key}),
+		case Res of 
+		    [{Tab, Key, Extra, Acc}] ->
+			mnesia:write({Tab,Key,Extra, Acc+1});
+		    Val ->
+			{read, Val, {acc, Acc}}
+		end
+	end,
+    receive 
+	{Pid, quit} -> Pid ! {self(), Acc}
+    after
+	0 -> 
+	    case mnesia:transaction(Update) of
+		{atomic, ok} -> 	    
+		    update_own(Tab, Key, Acc+1);
+		Else -> 
+		    ?error("Trans failed on ~p with ~p~n"
+			   "Info w2read ~p w2write ~p w2commit ~p storage ~p ~n", 
+			   [node(), 
+			    Else,
+			    mnesia:table_info(Tab, where_to_read),
+			    mnesia:table_info(Tab, where_to_write),
+			    mnesia:table_info(Tab, where_to_commit),
+			    mnesia:table_info(Tab, storage_type)])
+	    end
+    end.
+
+update_shared(Tab, Me, Acc) ->
+    Update = 
+	fun() ->
+		W2R = mnesia:table_info(Tab, where_to_read),
+		Res = mnesia:read({Tab, 0}),
+		case Res of 
+		    [{Tab, Key, Extra, Val}] when element(Me, Extra) == Acc ->
+			Extra1 = setelement(Me, Extra, Acc+1),
+			Term = {Tab, Key, Extra1, Val+1},
+			ok = mnesia:write(Term),
+%			?log("At ~p: ~p w2r ~p w2w ~p ~n", 
+%			     [node(), Term, 
+%			      mnesia:table_info(Tab, where_to_read),
+			W2W = mnesia:table_info(Tab, where_to_write),
+			W2C = mnesia:table_info(Tab, where_to_commit),
+%%			      mnesia:table_info(Tab, storage_type)
+%			     ]),
+			{_Mod, Tid, Ts} = get(mnesia_activity_state),
+			io:format("~p ~p~n", [Tid, ets:tab2list(element(2,Ts))]),
+			{ok,Term,{W2R,W2W,W2C}};
+		    Val ->
+			Info = [{acc, Acc}, {me, Me}, 
+				{tid, element(2, mnesia:get_activity_id())},
+				{locks, mnesia:system_info(held_locks)}],
+			{read, Val, Info}
+		end
+	end,
+    receive 
+	{Pid, quit} -> Pid ! {self(), Acc}
+    after
+	0 -> 
+	    case mnesia:transaction(Update) of
+		{atomic, {ok,Term,W2}} ->
+		    io:format("~p:~p:(~p,~p) ~w@~w~n", [erlang:now(),node(),Me,Acc,Term,W2]),
+		    update_shared(Tab, Me, Acc+1);
+		Else -> 
+		    ?error("Trans failed on ~p with ~p~n"
+			   "Info w2read ~p w2write ~p w2commit ~p storage ~p ~n", 
+			   [node(), 
+			    Else,
+			    mnesia:table_info(Tab, where_to_read),
+			    mnesia:table_info(Tab, where_to_write),
+			    mnesia:table_info(Tab, where_to_commit),
+			    mnesia:table_info(Tab, storage_type)			   
+			   ])
+	    end
+    end.
+
+init_admin(Def, N1, N2, N3) ->
+    Tab = schema_ops,
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert(Tab, 1002),
+    
+    Pid1 = spawn_link(N1, ?MODULE, update_own, [Tab, 1, 0]),
+    Pid2 = spawn_link(N2, ?MODULE, update_own, [Tab, 2, 0]),
+    Pid3 = spawn_link(N3, ?MODULE, update_own, [Tab, 3, 0]),
+    
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write({Tab, 0, {0,0,0}, 0}) end)),
+
+    Pid4 = spawn_link(N1, ?MODULE, update_shared, [Tab, 1, 0]),
+    Pid5 = spawn_link(N2, ?MODULE, update_shared, [Tab, 2, 0]),
+    Pid6 = spawn_link(N3, ?MODULE, update_shared, [Tab, 3, 0]),
+    
+    {Pid1, Pid2, Pid3, Pid4, Pid5, Pid6}.
+
+verify_results({P1, P2, P3, P4, P5, P6}) ->
+    Tab = schema_ops, N1 = node(P1),  N2 = node(P2),  N3 = node(P3),
+
+    try 
+	P1 ! {self(), quit}, 
+	R1 = receive {P1, Res1} -> Res1 after 9000 -> throw({timeout,P1}) end,
+	P2 ! {self(), quit}, 
+	R2 = receive {P2, Res2} -> Res2 after 9000 -> throw({timeout,P2}) end,
+	P3 ! {self(), quit}, 
+	R3 = receive {P3, Res3} -> Res3 after 9000 -> throw({timeout,P3}) end,
+
+	P4 ! {self(), quit}, 
+	R4 = receive {P4, Res4} -> Res4 after 9000 -> throw({timeout,P4}) end,
+	P5 ! {self(), quit}, 
+	R5 = receive {P5, Res5} -> Res5 after 9000 -> throw({timeout,P5}) end,
+	P6 ! {self(), quit}, 
+	R6 = receive {P6, Res6} -> Res6 after 9000 -> throw({timeout,P6}) end,
+
+	?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write_lock_table(Tab) end)),
+	?log("Should be ~p~n", [R1]),
+	?match([{_, _, _, R1}], rpc:call(N1, mnesia, dirty_read, [{Tab, 1}])),
+	?match([{_, _, _, R1}], rpc:call(N2, mnesia, dirty_read, [{Tab, 1}])),
+	?match([{_, _, _, R1}], rpc:call(N3, mnesia, dirty_read, [{Tab, 1}])),
+	?log("Should be ~p~n", [R2]),
+	?match([{_, _, _, R2}], rpc:call(N1, mnesia, dirty_read, [{Tab, 2}])),
+	?match([{_, _, _, R2}], rpc:call(N2, mnesia, dirty_read, [{Tab, 2}])),
+	?match([{_, _, _, R2}], rpc:call(N3, mnesia, dirty_read, [{Tab, 2}])),
+	?log("Should be ~p~n", [R3]),
+	?match([{_, _, _, R3}], rpc:call(N1, mnesia, dirty_read, [{Tab, 3}])),
+	?match([{_, _, _, R3}], rpc:call(N2, mnesia, dirty_read, [{Tab, 3}])),
+	?match([{_, _, _, R3}], rpc:call(N3, mnesia, dirty_read, [{Tab, 3}])),
+
+	Res = R4+R5+R6,
+	?log("Should be {~p+~p+~p}= ~p~n", [R4, R5, R6, Res]),
+	?match([{_, _, {R4,R5,R6}, Res}], rpc:call(N1, mnesia, dirty_read, [{Tab, 0}])),
+	?match([{_, _, {R4,R5,R6}, Res}], rpc:call(N2, mnesia, dirty_read, [{Tab, 0}])),
+	?match([{_, _, {R4,R5,R6}, Res}], rpc:call(N3, mnesia, dirty_read, [{Tab, 0}]))
+    catch throw:{timeout, Pid}  ->
+	    mnesia_lib:dist_coredump(),
+	    ?error("Timeout ~p ~n", [Pid])
+    end.
+    
+
+get_info(Tab) ->
+    Info = mnesia:table_info(Tab, all),
+    mnesia_lib:verbose("~p~n", [Info]).
+
+del_table_copy_1(suite) -> [];
+del_table_copy_1(Config) when is_list(Config) ->
+    [_Node1, Node2, _Node3] = Nodes = ?acquire_nodes(3, Config),
+    del_table(Node2, Node2, Nodes). %Called on same Node as deleted
+del_table_copy_2(suite) -> [];
+del_table_copy_2(Config) when is_list(Config) ->
+    [Node1, Node2, _Node3] = Nodes = ?acquire_nodes(3, Config),
+    del_table(Node1, Node2, Nodes). %Called from other Node 
+del_table_copy_3(suite) -> [];
+del_table_copy_3(Config) when is_list(Config) ->
+    [_Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    del_table(Node3, Node2, Nodes). %Called from Node w.o. table
+
+%%% The actual test
+del_table(CallFrom, DelNode, [Node1, Node2, Node3]) ->
+    Def = [{ram_copies, [Node1]}, {disc_copies, [Node2]}, 
+	   {attributes, [key, attr1, attr2]}],
+    Tab = schema_ops,
+    Pids = init_admin(Def, Node1, Node2, Node3),
+
+    ?log("Call from ~p delete table from ~p ~n", [CallFrom, DelNode]),
+    rpc:multicall([Node1, Node2, Node3], ?MODULE, get_info, [Tab]),
+    
+    ?match({atomic, ok}, 
+	   rpc:call(CallFrom, mnesia, del_table_copy, [Tab, DelNode])),
+
+    verify_results(Pids),
+    rpc:multicall([Node1, Node2, Node3], ?MODULE, get_info, [Tab]),
+    ?verify_mnesia([Node1, Node2, Node3], []).    
+
+add_table_copy_1(suite) -> [];
+add_table_copy_1(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{disc_only_copies, [Node1, Node2]}, 
+	   {attributes, [key, attr1, attr2]}], 
+    add_table(Node1, Node3, Nodes, Def).
+add_table_copy_2(suite) -> [];
+add_table_copy_2(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{disc_only_copies, [Node1, Node2]}, 
+	   {attributes, [key, attr1, attr2]}], 
+    add_table(Node2, Node3, Nodes, Def).
+add_table_copy_3(suite) -> [];
+add_table_copy_3(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{disc_only_copies, [Node1, Node2]},
+	   {attributes, [key, attr1, attr2]}], 
+    add_table(Node3, Node3, Nodes, Def).
+add_table_copy_4(suite) -> [];
+add_table_copy_4(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{disc_only_copies, [Node1]}, 
+	   {attributes, [key, attr1, attr2]}], 
+    add_table(Node2, Node3, Nodes, Def).
+%%% The actual test
+add_table(CallFrom, AddNode, [Node1, Node2, Node3], Def) ->
+    Pids = init_admin(Def, Node1, Node2, Node3),    
+    Tab = schema_ops,
+    ?log("Call from ~p add table to ~p ~n", [CallFrom, AddNode]),
+    rpc:multicall([Node1, Node2, Node3], ?MODULE, get_info, [Tab]),
+    ?match({atomic, ok}, rpc:call(CallFrom, mnesia, add_table_copy, 
+				  [Tab, AddNode, ram_copies])),
+    verify_results(Pids),
+    rpc:multicall([Node1, Node2, Node3], ?MODULE, get_info, [Tab]),
+    ?verify_mnesia([Node1, Node2, Node3], []).
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+move_table_copy_1(suite) -> [];
+move_table_copy_1(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{disc_copies, [Node1, Node2]},
+	   {attributes, [key, attr1, attr2]}], 
+    move_table(Node1, Node1, Node3, Nodes, Def).
+move_table_copy_2(suite) -> [];
+move_table_copy_2(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{disc_copies, [Node1, Node2]},
+	   {attributes, [key, attr1, attr2]}], 
+    move_table(Node2, Node1, Node3, Nodes, Def).
+move_table_copy_3(suite) -> [];
+move_table_copy_3(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{disc_copies, [Node1, Node2]},
+	   {attributes, [key, attr1, attr2]}], 
+    move_table(Node3, Node1, Node3, Nodes, Def).
+move_table_copy_4(suite) -> [];
+move_table_copy_4(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Def = [{disc_copies, [Node1]},
+	   {attributes, [key, attr1, attr2]}], 
+    move_table(Node2, Node1, Node3, Nodes, Def).
+%%% The actual test
+move_table(CallFrom, FromNode, ToNode, [Node1, Node2, Node3], Def) ->
+    Pids = init_admin(Def, Node1, Node2, Node3),    
+    Tab = schema_ops,   
+    ?log("Call from ~p move table from ~p to ~p ~n", [CallFrom, FromNode, ToNode]),
+    rpc:multicall([Node1, Node2, Node3], ?MODULE, get_info, [Tab]),
+    ?match({atomic, ok}, rpc:call(CallFrom, mnesia, move_table_copy, 
+				  [Tab, FromNode, ToNode])),
+    verify_results(Pids),
+    rpc:multicall([Node1, Node2, Node3], ?MODULE, get_info, [Tab]),
+    ?verify_mnesia([Node1, Node2, Node3], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+dirty_updates_visible_direct(doc) ->
+    ["One process can immediately see dirty updates of another"];
+dirty_updates_visible_direct(suite) -> [];
+dirty_updates_visible_direct(Config) when is_list(Config) ->
+    dirty_visibility(outside_trans, Config).
+
+dirty_reads_regardless_of_trans(doc) ->
+    ["Dirty reads are not affected by transaction context"];
+dirty_reads_regardless_of_trans(suite) -> [];
+dirty_reads_regardless_of_trans(Config) when is_list(Config) ->
+    dirty_visibility(inside_trans, Config).
+
+dirty_visibility(Mode, Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = list_to_atom(lists:concat([dirty_visibility, '_', Mode])), 
+
+   ?match({atomic, ok},  mnesia:create_table([{name, Tab}, {ram_copies, [Node1]}])), 
+    ValPos = 3, 
+
+    ?match({atomic, ok},  mnesia:add_table_index(Tab, ValPos)), 
+    
+    %% Start two processes
+    {success, [A]} = ?start_activities([Node1]), 
+
+    case Mode of
+	inside_trans ->
+	    ?start_transactions([A]), 
+	    A ! fun() ->
+			mnesia:write({Tab, a, 11}), 
+			mnesia:write({Tab, b, 22}), 
+			mnesia:write({Tab, c, 1}), 
+			mnesia:write({Tab, d, 2}), 
+			mnesia:write({Tab, e, 3}), 
+			lists:sort(mnesia:all_keys(Tab))
+		end, 
+	    ?match_receive({A, [a, b, c, d, e]});
+	outside_trans ->
+	    ignore
+    end, 
+
+    RecA = {Tab, a, 1}, 
+    PatA = {Tab, '$1', 1}, 
+    RecB = {Tab, b, 3}, 
+    PatB = {Tab, '$1', 3}, 
+    RecB2 = {Tab, b, 2}, 
+    PatB2 = {Tab, '$1', 2}, 
+    ?match([], mnesia:dirty_read({Tab, a})), 
+    ?match([], mnesia:dirty_read({Tab, b})), 
+    ?match([], mnesia:dirty_match_object(PatA)), 
+    ?match([], mnesia:dirty_match_object(PatB)), 
+    ?match([], mnesia:dirty_match_object(PatB2)), 
+    ?match([], mnesia:dirty_index_read(Tab, 1, ValPos)), 
+    ?match([], mnesia:dirty_index_read(Tab, 3, ValPos)), 
+    ?match([], mnesia:dirty_index_match_object(PatA, ValPos)), 
+    ?match([], mnesia:dirty_index_match_object(PatB, ValPos)), 
+    ?match([], mnesia:dirty_index_match_object(PatB2, ValPos)), 
+    ?match('$end_of_table', mnesia:dirty_first(Tab)), 
+
+    %% dirty_write
+    A ! fun() -> mnesia:dirty_write(RecA) end, 
+    ?match_receive({A, ok}), 
+    ?match([RecA], mnesia:dirty_read({Tab, a})), 
+    ?match([RecA], mnesia:dirty_match_object(PatA)), 
+    ?match(a, mnesia:dirty_first(Tab)), 
+    ?match([RecA], mnesia:dirty_index_read(Tab, 1, ValPos)), 
+    ?match([RecA], mnesia:dirty_index_match_object(PatA, ValPos)), 
+    ?match('$end_of_table', mnesia:dirty_next(Tab, a)), 
+
+    %% dirty_create
+    A ! fun() -> mnesia:dirty_write(RecB) end, 
+    ?match_receive({A, ok}), 
+    ?match([RecB], mnesia:dirty_read({Tab, b})), 
+    ?match([RecB], mnesia:dirty_match_object(PatB)), 
+    ?match([RecB], mnesia:dirty_index_read(Tab, 3, ValPos)), 
+    ?match([RecB], mnesia:dirty_index_match_object(PatB, ValPos)), 
+    ?match('$end_of_table', 
+	   mnesia:dirty_next(Tab, mnesia:dirty_next(Tab, mnesia:dirty_first(Tab)))), 
+    
+    %% dirty_update_counter
+    A ! fun() -> mnesia:dirty_update_counter({Tab, b}, -1) end, 
+    ?match_receive({A, _}), 
+    ?match([RecB2], mnesia:dirty_read({Tab, b})), 
+    ?match([], mnesia:dirty_match_object(PatB)), 
+    ?match([RecB2], mnesia:dirty_match_object(PatB2)), 
+    ?match([RecB2], mnesia:dirty_index_read(Tab, 2, ValPos)), 
+    ?match([], mnesia:dirty_index_match_object(PatB, ValPos)), 
+    ?match([RecB2], mnesia:dirty_index_match_object(PatB2, ValPos)), 
+    ?match('$end_of_table', 
+	   mnesia:dirty_next(Tab, mnesia:dirty_next(Tab, mnesia:dirty_first(Tab)))), 
+
+    %% dirty_delete
+    A ! fun() -> mnesia:dirty_delete({Tab, b}) end, 
+    ?match_receive({A, ok}), 
+    ?match([], mnesia:dirty_read({Tab, b})), 
+    ?match([], mnesia:dirty_match_object(PatB2)), 
+    ?match([], mnesia:dirty_index_read(Tab, 3, ValPos)), 
+    ?match([], mnesia:dirty_index_match_object(PatB2, ValPos)), 
+    ?match(a, mnesia:dirty_first(Tab)), 
+    ?match('$end_of_table', mnesia:dirty_next(Tab, a)), 
+
+    %% dirty_delete_object
+    ?match([RecA], mnesia:dirty_match_object(PatA)), 
+    A ! fun() -> mnesia:dirty_delete_object(RecA) end, 
+    ?match_receive({A, ok}), 
+    ?match([], mnesia:dirty_read({Tab, a})), 
+    ?match([], mnesia:dirty_match_object(PatA)), 
+    ?match([], mnesia:dirty_index_read(Tab, 1, ValPos)), 
+    ?match([], mnesia:dirty_index_match_object(PatA, ValPos)), 
+    ?match('$end_of_table', mnesia:dirty_first(Tab)), 
+    
+    case Mode of
+	inside_trans ->
+	    A ! end_trans, 
+	    ?match_receive({A, {atomic, end_trans}});
+	outside_trans ->
+	    ignore
+    end, 
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+trans_update_invisibible_outside_trans(doc) ->
+    ["Updates in a transaction are invisible outside the transaction"];
+trans_update_invisibible_outside_trans(suite) -> [];
+trans_update_invisibible_outside_trans(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = trans_update_invisibible_outside_trans, 
+
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab}, 
+					     {ram_copies, [Node1]}])), 
+    ValPos = 3, 
+    RecA = {Tab, a, 1}, 
+    PatA = {Tab, '$1', 1}, 
+    RecB = {Tab, b, 3}, 
+    PatB = {Tab, '$1', 3}, 
+    ?match({atomic, ok},  mnesia:add_table_index(Tab, ValPos)), 
+
+    Verify =
+	fun() ->
+		?match([], mnesia:dirty_read({Tab, a})), 
+		?match([], mnesia:dirty_read({Tab, b})), 
+		?match([], mnesia:dirty_match_object(PatA)), 
+		?match([], mnesia:dirty_match_object(PatB)), 
+		?match([], mnesia:dirty_index_read(Tab, 1, ValPos)), 
+		?match([], mnesia:dirty_index_read(Tab, 3, ValPos)), 
+		?match([], mnesia:dirty_index_match_object(PatA, ValPos)), 
+		?match([], mnesia:dirty_index_match_object(PatB, ValPos)), 
+		?match('$end_of_table', mnesia:dirty_first(Tab))
+	     end, 
+
+    Fun = fun() ->
+		  ?match(ok, mnesia:write(RecA)), 
+		  Verify(), 
+
+		  ?match(ok, mnesia:write(RecB)), 
+		  Verify(), 
+
+		  ?match(ok, mnesia:delete({Tab, b})), 
+		  Verify(), 
+		  
+		  ?match([RecA], mnesia:match_object(PatA)), 
+		  Verify(), 
+
+		  ?match(ok, mnesia:delete_object(RecA)), 
+		  Verify(), 
+		  ok
+	  end, 
+    ?match({atomic, ok}, mnesia:transaction(Fun)), 
+    Verify(), 
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+trans_update_visible_inside_trans(doc) ->
+    ["Updates in a transaction are visible in the same transaction"];
+trans_update_visible_inside_trans(suite) -> [];
+trans_update_visible_inside_trans(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = trans_update_visible_inside_trans, 
+
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab}, 
+					     {ram_copies, [Node1]}])), 
+    ValPos = 3, 
+    RecA = {Tab, a, 1}, 
+    PatA = {Tab, '$1', 1}, 
+    RecB = {Tab, b, 3}, 
+    PatB = {Tab, '$1', 3}, 
+    ?match({atomic, ok},  mnesia:add_table_index(Tab, ValPos)), 
+
+    Fun = fun() ->
+		  %% write
+		  ?match(ok, mnesia:write(RecA)), 
+		  ?match([RecA], mnesia:read({Tab, a})), 
+		  ?match([RecA], mnesia:wread({Tab, a})), 
+		  ?match([RecA], mnesia:match_object(PatA)), 
+		  ?match([a], mnesia:all_keys(Tab)), 
+		  ?match([RecA], mnesia:index_match_object(PatA, ValPos)), 
+		  ?match([RecA], mnesia:index_read(Tab, 1, ValPos)), 
+
+		  %% create
+		  ?match(ok, mnesia:write(RecB)), 
+		  ?match([RecB], mnesia:read({Tab, b})), 
+		  ?match([RecB], mnesia:wread({Tab, b})), 
+		  ?match([RecB], mnesia:match_object(PatB)), 
+		  ?match([RecB], mnesia:index_match_object(PatB, ValPos)), 
+		  ?match([RecB], mnesia:index_read(Tab, 3, ValPos)), 
+		  
+		  %% delete
+		  ?match(ok, mnesia:delete({Tab, b})), 
+		  ?match([], mnesia:read({Tab, b})), 
+		  ?match([], mnesia:wread({Tab, b})), 
+		  ?match([], mnesia:match_object(PatB)), 
+		  ?match([a], mnesia:all_keys(Tab)), 
+		  ?match([], mnesia:index_match_object(PatB, ValPos)), 
+		  ?match([], mnesia:index_read(Tab, 2, ValPos)), 
+		  ?match([], mnesia:index_read(Tab, 3, ValPos)), 
+
+		  %% delete_object
+		  ?match(ok, mnesia:delete_object(RecA)), 
+		  ?match([], mnesia:read({Tab, a})), 
+		  ?match([], mnesia:wread({Tab, a})), 
+		  ?match([], mnesia:match_object(PatA)), 
+		  ?match([], mnesia:all_keys(Tab)), 
+		  ?match([], mnesia:index_match_object(PatA, ValPos)), 
+		  ?match([], mnesia:index_read(Tab, 2, ValPos)), 
+		  ?match([], mnesia:index_read(Tab, 3, ValPos)), 
+		  ok
+	  end, 
+    ?match({atomic, ok}, mnesia:transaction(Fun)), 
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+write_shadows(doc) ->
+    ["Tests whether the shadow shows the correct object when",
+     "writing to the table"];
+write_shadows(suite) -> [];
+write_shadows(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = write_shadows, 
+
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab}, 
+					     {ram_copies, [Node1]}, 
+					     {type,  set}])), 
+    ValPos = 3, 
+    RecA1 = {Tab, a, 1}, 
+    PatA1 = {Tab, '$1', 1}, 
+    RecA2 = {Tab, a, 2}, 
+    PatA2 = {Tab, '$1', 2}, 
+
+
+    ?match({atomic, ok},  mnesia:add_table_index(Tab, ValPos)), 
+       
+    Fun1 = fun() ->
+		   ?match(ok, mnesia:write(RecA1)), 
+		   ok
+	   end, 
+
+    ?match({atomic, ok}, mnesia:transaction(Fun1)), 
+
+    Fun2 = fun() ->
+		  %% write shadow old write - is the confirmed value visable
+		  %%                          in the shadow ?
+		  ?match([RecA1], mnesia:read({Tab, a})), 
+		  ?match([RecA1], mnesia:wread({Tab, a})), 
+		  ?match([RecA1], mnesia:match_object(PatA1)), 
+		  ?match([a], mnesia:all_keys(Tab)), 
+		  ?match([RecA1], mnesia:index_match_object(PatA1, ValPos)), 
+		  ?match([RecA1], mnesia:index_read(Tab, 1, ValPos)), 
+
+		  %% write shadow new write - is a new value visable instead
+		  %%                          of the old value ?
+		  ?match(ok, mnesia:write(RecA2)), 
+
+		  ?match([RecA2], mnesia:read({Tab, a})), 
+		  ?match([RecA2], mnesia:wread({Tab, a})), 
+		  ?match([RecA2], mnesia:match_object(PatA2)), 		  %% delete shadow old but not new write - is the new value visable
+
+		  ?match([a], mnesia:all_keys(Tab)), 
+		  ?match([RecA2], mnesia:index_match_object(PatA2, ValPos)), 
+		  ?match([RecA2], mnesia:index_read(Tab, 2, ValPos)), 
+		  ok
+
+	  end, 
+    ?match({atomic, ok}, mnesia:transaction(Fun2)), 
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+delete_shadows(doc) ->
+    ["Test whether the shadow shows the correct object when deleting objects"];
+delete_shadows(suite) -> [];
+delete_shadows(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = delete_shadows, 
+
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab}, 
+					     {ram_copies, [Node1]}, 
+					     {type,  set}])), 
+    ValPos = 3, 
+    OidA  = {Tab, a}, 
+    RecA1 = {Tab, a, 1}, 
+    PatA1 = {Tab, '$1', 1}, 
+    RecA2 = {Tab, a, 2}, 
+    PatA2 = {Tab, '$1', 2}, 
+
+
+    ?match({atomic, ok},  mnesia:add_table_index(Tab, ValPos)), 
+       
+    Fun1 = fun() ->
+		   ?match(ok, mnesia:write(RecA1)), 
+		   ok
+	   end, 
+
+    ?match({atomic, ok}, mnesia:transaction(Fun1)), 
+
+    Fun2 = fun() ->
+		   
+		   
+		  %% delete shadow old write - is the confirmed value invisible
+		  %%                           when deleted in the transaction ?
+		  ?match(ok, mnesia:delete(OidA)), 
+
+		  ?match([], mnesia:read({Tab, a})), 
+		  ?match([], mnesia:wread({Tab, a})), 
+		  ?match([], mnesia:match_object(PatA1)), 
+		  ?match([], mnesia:all_keys(Tab)), 
+		  ?match([], mnesia:index_match_object(PatA1, ValPos)), 
+		  ?match([], mnesia:index_read(Tab, 1, ValPos)), 
+
+		  %% delete shadow old but not new write - is the new value visable
+		  %%                           when the old one was deleted ?
+		  ?match(ok, mnesia:write(RecA2)), 
+
+		  ?match([RecA2], mnesia:read({Tab, a})), 
+		  ?match([RecA2], mnesia:wread({Tab, a})), 
+		  ?match([RecA2], mnesia:match_object(PatA2)), 
+		  ?match([a], mnesia:all_keys(Tab)), 
+		  ?match([RecA2], mnesia:index_match_object(PatA2, ValPos)), 
+		  ?match([RecA2], mnesia:index_read(Tab, 2, ValPos)), 
+	
+		   %% delete shadow old and new write - is the new value invisable
+		  %%                           when deleted ?
+		  ?match(ok, mnesia:delete(OidA)), 
+
+		  ?match([], mnesia:read({Tab, a})), 
+		  ?match([], mnesia:wread({Tab, a})), 
+		  ?match([], mnesia:match_object(PatA2)), 
+		  ?match([], mnesia:all_keys(Tab)), 
+		  ?match([], mnesia:index_match_object(PatA2, ValPos)), 
+		  ?match([], mnesia:index_read(Tab, 2, ValPos)), 
+		  ok
+
+	  end, 
+    ?match({atomic, ok}, mnesia:transaction(Fun2)), 
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+write_delete_shadows_bag(doc) ->
+    ["Test the visibility of written and deleted objects in an bag type table"];
+write_delete_shadows_bag(suite) -> [];
+write_delete_shadows_bag(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = write_delete_shadows_bag, 
+
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab}, 
+					       {ram_copies, [Node1]}, 
+					       {type,  bag}])), 
+    ValPos = 3, 
+    OidA  = {Tab, a}, 
+
+    RecA1 = {Tab, a, 1}, 
+    PatA1 = {Tab, '$1', 1}, 
+
+    RecA2 = {Tab, a, 2}, 
+    PatA2 = {Tab, '$1', 2}, 
+
+    RecA3 = {Tab, a, 3}, 
+    PatA3 = {Tab, '$1', 3}, 
+
+    PatA  = {Tab, a, '_'}, 
+
+
+    ?match({atomic, ok},  mnesia:add_table_index(Tab, ValPos)), 
+
+    Fun1 = fun() ->
+		   ?match(ok, mnesia:write(RecA1)), 
+		   ?match(ok, mnesia:write(RecA2)), 
+		   ok
+	   end, 
+
+    ?match({atomic, ok}, mnesia:transaction(Fun1)), 
+
+    Fun2 = fun() ->		   		   
+		   %% delete shadow old write - is the confirmed value invisible
+		   %%                           when deleted in the transaction ?
+		   ?match(ok, mnesia:delete_object(RecA1)), 
+
+		   ?match([RecA2], mnesia:read({Tab, a})), 
+		   ?match([RecA2], mnesia:wread({Tab, a})), 
+		   ?match([RecA2], mnesia:match_object(PatA2)), 
+		   ?match([a], mnesia:all_keys(Tab)), 
+		   ?match([RecA2], mnesia:index_match_object(PatA2, ValPos)), 
+		   ?match([RecA2], mnesia:index_read(Tab, 2, ValPos)), 
+
+		   ?match(ok, mnesia:delete(OidA)), 
+
+		   ?match([], mnesia:read({Tab, a})), 
+		   ?match([], mnesia:wread({Tab, a})), 
+		   ?match([], mnesia:match_object(PatA1)), 
+		   ?match([], mnesia:all_keys(Tab)), 
+		   ?match([], mnesia:index_match_object(PatA1, ValPos)), 
+		   ?match([], mnesia:index_read(Tab, 1, ValPos)), 
+
+		   %% delete shadow old but not new write - are both new value visable
+		   %%                           when the old one was deleted ?
+		   ?match(ok, mnesia:write(RecA2)), 
+		   ?match(ok, mnesia:write(RecA3)), 
+
+
+		   ?match([RecA2, RecA3], lists:sort(mnesia:read({Tab, a}))), 
+		   ?match([RecA2, RecA3], lists:sort(mnesia:wread({Tab, a}))), 
+		   ?match([RecA2], mnesia:match_object(PatA2)), 
+		   ?match([a], mnesia:all_keys(Tab)), 
+		   ?match([RecA2, RecA3], lists:sort(mnesia:match_object(PatA))),
+		   ?match([RecA2], mnesia:index_match_object(PatA2, ValPos)),
+		   ?match([RecA3], mnesia:index_match_object(PatA3, ValPos)),
+		   ?match([RecA2], mnesia:index_read(Tab, 2, ValPos)), 
+
+		   %% delete shadow old and new write - is the new value invisable
+		   %%                           when deleted ?
+		   ?match(ok, mnesia:delete(OidA)), 
+
+		   ?match([], mnesia:read({Tab, a})), 
+		   ?match([], mnesia:wread({Tab, a})), 
+		   ?match([], mnesia:match_object(PatA2)), 
+		   ?match([], mnesia:all_keys(Tab)), 
+		   ?match([], mnesia:index_match_object(PatA2, ValPos)), 
+		   ?match([], mnesia:index_read(Tab, 2, ValPos)), 
+		   ok
+	   end, 
+    ?match({atomic, ok}, mnesia:transaction(Fun2)), 
+    ok.
+
+write_delete_shadows_bag2(doc) ->
+    ["Test the visibility of written and deleted objects in an bag type table " 
+     "and verifies the results"];
+write_delete_shadows_bag2(suite) -> [];
+write_delete_shadows_bag2(Config) when is_list(Config) ->
+
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab = w_d_s_b, 
+
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab}, 
+					       {ram_copies, [Node1]}, 
+					       {type,  bag}])),     
+    Del = fun() ->
+		  R1 = mnesia:read({Tab, 1}),
+		  mnesia:delete({Tab, 1}),
+		  R2 = mnesia:read({Tab, 1}),
+		  mnesia:write({Tab, 1, 1}),
+		  mnesia:write({Tab, 1, 2}),
+		  R3 = mnesia:read({Tab, 1}),
+		  {R1, R2, R3}
+	  end,
+    DelObj = fun() ->
+		     R1 = mnesia:read({Tab, 2}),
+		     mnesia:delete_object({Tab, 2, 2}),
+		     R2 = mnesia:read({Tab, 2}),
+		     mnesia:write({Tab, 2, 1}),
+		     mnesia:write({Tab, 2, 2}),
+		     R3 = mnesia:read({Tab, 2}),
+		     {R1, R2, R3}
+	     end,
+    Both1 = [{Tab, 1, 1}, {Tab, 1, 2}],   
+    Both2 = [{Tab, 2, 1}, {Tab, 2, 2}],   
+    ?match({atomic, {[], [], Both1}}, mnesia:transaction(Del)),
+    ?match({atomic, {Both1, [], Both1}}, mnesia:transaction(Del)),
+    ?match({atomic, Both1}, mnesia:transaction(fun() -> mnesia:read({Tab, 1}) end)),
+    ?match({atomic, {[], [], Both2}}, mnesia:transaction(DelObj)),
+    ?match({atomic, {Both2, [{Tab, 2, 1}], Both2}}, mnesia:transaction(DelObj)),
+    ?match({atomic, Both2}, mnesia:transaction(fun() -> mnesia:read({Tab, 2}) end)),
+    ?verify_mnesia([Node1], []).
+
+shadow_search(doc) ->
+    ["Verifies that ordered_set tables are ordered, and the order is kept" 
+     "even when table is shadowed by transaction updates"];
+shadow_search(suite) -> [];
+shadow_search(Config) when is_list(Config) ->
+    [Node1] = ?acquire_nodes(1, Config), 
+    Tab1  = ss_oset,
+    Tab2 = ss_set,
+    Tab3 = ss_bag,
+    Tabs = [Tab1,Tab2,Tab3],
+    RecName = ss,
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab1}, 
+					       {ram_copies, [Node1]}, 
+					       {record_name, RecName},
+					       {type,  ordered_set}])),
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab2},
+					       {record_name, RecName},
+					       {ram_copies, [Node1]},
+					       {type,  set}])),
+    ?match({atomic, ok},  mnesia:create_table([{name, Tab3},
+					       {record_name, RecName},
+					       {ram_copies, [Node1]}, 
+					       {type,  bag}])),
+    Recs = [{RecName, K, K} || K <- [1,3,5]],
+    [mnesia:dirty_write(Tab1, R) || R <- Recs],
+    [mnesia:dirty_write(Tab2, R) || R <- Recs],
+    [mnesia:dirty_write(Tab3, R) || R <- Recs],
+    
+    Match  = fun(Tab) -> mnesia:match_object(Tab, {'_','_','_'}, write) end,
+    Select = fun(Tab) -> mnesia:select(Tab, [{'_', [], ['$_']}]) end,
+%    Trans = fun(Fun,Args) -> mnesia:transaction(Fun,Args) end,
+    LoopHelp = fun('$end_of_table',_) -> [];
+		  ({Res,Cont},Fun) -> 
+		       Sel = mnesia:select(Cont),
+		       Res ++ Fun(Sel, Fun)
+	       end,
+    SelLoop = fun(Table) -> 
+		      Sel = mnesia:select(Table, [{'_', [], ['$_']}], 1, read),
+		      LoopHelp(Sel,LoopHelp)
+	      end,
+    
+    R1 = {RecName, 2, 2}, R2 = {RecName, 4, 4},
+    R3 = {RecName, 2, 3}, R4 = {RecName, 3, 1},
+    R5 = {RecName, 104, 104},
+    W1 = fun(Tab,Search) -> mnesia:write(Tab,R1,write),
+			    mnesia:write(Tab,R2,write), 
+			    Search(Tab)
+	 end,
+    S1 = lists:sort([R1,R2|Recs]),
+    ?match({atomic,S1}, mnesia:transaction(W1, [Tab1,Select])),
+    ?match({atomic,S1}, mnesia:transaction(W1, [Tab1,Match])),
+    ?match({atomic,S1}, mnesia:transaction(W1, [Tab1,SelLoop])),
+    ?match({atomic,S1}, sort_res(mnesia:transaction(W1, [Tab2,Select]))),
+    ?match({atomic,S1}, sort_res(mnesia:transaction(W1, [Tab2,SelLoop]))),
+    ?match({atomic,S1}, sort_res(mnesia:transaction(W1, [Tab2,Match]))),
+    ?match({atomic,S1}, sort_res(mnesia:transaction(W1, [Tab3,Select]))),
+    ?match({atomic,S1}, sort_res(mnesia:transaction(W1, [Tab3,SelLoop]))),
+    ?match({atomic,S1}, sort_res(mnesia:transaction(W1, [Tab3,Match]))),
+    [mnesia:dirty_delete_object(Tab,R) || R <- [R1,R2], Tab <- Tabs],
+
+    W2 = fun(Tab,Search) -> 
+		 mnesia:write(Tab,R3,write),
+		 mnesia:write(Tab,R1,write), 
+		 Search(Tab)
+	 end,
+    S2 = lists:sort([R1|Recs]),
+    S2Bag = lists:sort([R1,R3|Recs]),
+    ?match({atomic,S2}, mnesia:transaction(W2, [Tab1,Select])),
+    ?match({atomic,S2}, mnesia:transaction(W2, [Tab1,SelLoop])),
+    ?match({atomic,S2}, mnesia:transaction(W2, [Tab1,Match])),
+    ?match({atomic,S2}, sort_res(mnesia:transaction(W2, [Tab2,Select]))),
+    ?match({atomic,S2}, sort_res(mnesia:transaction(W2, [Tab2,SelLoop]))),
+    ?match({atomic,S2}, sort_res(mnesia:transaction(W2, [Tab2,Match]))),
+    ?match({atomic,S2Bag}, sort_res(mnesia:transaction(W2, [Tab3,Select]))),
+    ?match({atomic,S2Bag}, sort_res(mnesia:transaction(W2, [Tab3,SelLoop]))),
+    ?match({atomic,S2Bag}, sort_res(mnesia:transaction(W2, [Tab3,Match]))),
+%%    [mnesia:dirty_delete_object(Tab,R) || R <- [R1,R3], Tab <- Tabs],
+
+    W3 = fun(Tab,Search) -> 
+		 mnesia:write(Tab,R4,write),
+		 mnesia:delete(Tab,element(2,R1),write), 
+		 Search(Tab)
+	 end,
+    S3Bag = lists:sort([R4|lists:delete(R1,Recs)]),
+    S3 = lists:delete({RecName,3,3},S3Bag),
+    ?match({atomic,S3}, mnesia:transaction(W3, [Tab1,Select])),
+    ?match({atomic,S3}, mnesia:transaction(W3, [Tab1,SelLoop])),
+    ?match({atomic,S3}, mnesia:transaction(W3, [Tab1,Match])),
+    ?match({atomic,S3}, sort_res(mnesia:transaction(W3, [Tab2,SelLoop]))),
+    ?match({atomic,S3}, sort_res(mnesia:transaction(W3, [Tab2,Select]))),
+    ?match({atomic,S3}, sort_res(mnesia:transaction(W3, [Tab2,Match]))),
+    ?match({atomic,S3Bag}, sort_res(mnesia:transaction(W3, [Tab3,Select]))),
+    ?match({atomic,S3Bag}, sort_res(mnesia:transaction(W3, [Tab3,SelLoop]))),
+    ?match({atomic,S3Bag}, sort_res(mnesia:transaction(W3, [Tab3,Match]))),
+
+    W4 = fun(Tab,Search) -> 
+		 mnesia:delete(Tab,-1,write),
+		 mnesia:delete(Tab,4 ,write),
+		 mnesia:delete(Tab,17,write),
+		 mnesia:delete_object(Tab,{RecName, -1, x},write),
+		 mnesia:delete_object(Tab,{RecName, 4, x},write),
+		 mnesia:delete_object(Tab,{RecName, 42, x},write),
+		 mnesia:delete_object(Tab,R2,write),
+		 mnesia:write(Tab, R5, write),
+		 Search(Tab)
+	 end,
+    S4Bag = lists:sort([R5|S3Bag]),
+    S4    = lists:sort([R5|S3]),
+    ?match({atomic,S4}, mnesia:transaction(W4, [Tab1,Select])),
+    ?match({atomic,S4}, mnesia:transaction(W4, [Tab1,SelLoop])),
+    ?match({atomic,S4}, mnesia:transaction(W4, [Tab1,Match])),
+    ?match({atomic,S4}, sort_res(mnesia:transaction(W4, [Tab2,Select]))),
+    ?match({atomic,S4}, sort_res(mnesia:transaction(W4, [Tab2,SelLoop]))),
+    ?match({atomic,S4}, sort_res(mnesia:transaction(W4, [Tab2,Match]))),
+    ?match({atomic,S4Bag}, sort_res(mnesia:transaction(W4, [Tab3,Select]))),
+    ?match({atomic,S4Bag}, sort_res(mnesia:transaction(W4, [Tab3,SelLoop]))),
+    ?match({atomic,S4Bag}, sort_res(mnesia:transaction(W4, [Tab3,Match]))),
+    [mnesia:dirty_delete_object(Tab,R) || R <- [{RecName,3,3},R5], Tab <- Tabs],
+        
+    %% hmmm anything more??
+    
+    ?verify_mnesia([Node1], []).
+
+
+rr_kill_copy(suite) -> [];
+rr_kill_copy(Config) when is_list(Config) ->
+    Ns = ?acquire_nodes(3,Config ++ [{tc_timeout, 60000}]),
+    DeleteMe = fun(_Tab,Where2read) ->
+		       ?match([], mnesia_test_lib:kill_mnesia([Where2read]))
+	       end,
+    Del = removed_resources(Ns, DeleteMe),
+    ?verify_mnesia(Ns -- [Del], []).
+
+removed_resources([_N1,N2,N3], DeleteRes) ->
+    Tab = del_res,
+    ?match({atomic, ok}, mnesia:create_table(Tab,[{ram_copies, [N2,N3]}])),
+    
+    Init = fun() -> [mnesia:write({Tab,Key,Key}) || Key <- lists:seq(0,99)] end,
+    ?match([], [Bad || Bad <- mnesia:sync_dirty(Init), Bad /= ok]),
+    
+    Where2Read = mnesia:table_info(Tab, where_to_read),
+    [Keep]  = [N2,N3] -- [Where2Read],
+    Tester = self(),
+    
+    Conflict = fun() -> 
+		       %% Read a value..
+		       [{Tab,1,Val}] = mnesia:read({Tab,1}),
+		       case get(restart) of
+			   undefined -> 
+			       Tester ! {pid_1, self()},
+			       %% Wait for sync, the read value have been 
+			       %% updated and this function should be restarted.
+			       receive {Tester,sync} -> ok  end,
+			       put(restart, restarted);
+			   restarted ->
+			       ok
+		       end,		       
+		       mnesia:write({Tab,1,Val+10})
+	       end,
+    Lucky    = fun() -> 
+		       [{Tab,1,Val}] = mnesia:read({Tab,1}),
+		       mnesia:write({Tab,1,Val+100})
+	       end,
+    
+    CPid = spawn_link(fun() -> Tester ! {self(), mnesia:transaction(Conflict)} end),
+    
+    %% sync first transaction
+    receive {pid_1, CPid} -> synced end,
+
+    DeleteRes(Tab, Where2Read),
+
+    ?match(Keep, mnesia:table_info(Tab, where_to_read)),
+    
+    %% Run the other/Lucky transaction, this should work since 
+    %% it won't grab a lock on the conflicting transactions Where2Read node.
+    
+    LPid = spawn_link(Keep, fun() -> Tester ! {self(),mnesia:transaction(Lucky)} end),
+    ?match_receive({LPid,{atomic,ok}}),
+    
+    %% Continue Transaction no 1
+    CPid ! {self(), sync},
+    
+    ?match(ok, receive {CPid,{atomic,ok}} -> ok after 2000 -> process_info(self()) end),
+    
+    ?match({atomic,[{del_res,1,111}]}, mnesia:transaction(fun() -> mnesia:read({Tab,1}) end)),
+    Where2Read.
+
+nasty(suite) -> [];
+
+nasty(doc) ->
+    ["Tries to fullfill a rather nasty locking scenario, where we have had "
+     "bugs, the testcase tries a combination of locks in locker queue"];
+
+%%  This testcase no longer works as it was intended to show errors when 
+%%  tablelocks was allowed to be placed in the queue though locks existed 
+%%  in the queue with less Tid's. This is no longer allowed and the testcase
+%%  has been update.
+
+nasty(Config) ->
+    ?acquire_nodes(1, Config),
+    Tab = nasty,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [])),    
+    Coord = self(),        				    
+    Write = fun(Key) ->
+		    mnesia:write({Tab, Key, write}),	 
+		    Coord ! {write, Key, self(), mnesia:get_activity_id()},
+		    receive 
+			continue ->
+			    ok
+		    end,	    
+		    Coord ! {done, {write, Key}, self()}		    
+	    end,
+    
+    Update = fun(Key) ->
+		     Coord ! {update, Key, self(), mnesia:get_activity_id()},
+		     receive
+			 continue ->
+			     ok
+		     end,
+		     mnesia:read({Tab, Key}),
+		     mnesia:write({Tab, Key, update}),
+		     receive
+			 continue ->
+			     ok
+		     end,
+		     
+		     Coord ! {done, {update, Key}, self()}
+	     end,
+    
+    TabLock = fun() ->
+		      Coord ! {tablock, Tab, self(), mnesia:get_activity_id()},
+		      receive
+			  continue ->
+			      ok
+		      end,
+		      mnesia:lock({table, Tab}, write),
+		      Coord ! {done, {tablock, Tab}, self()}
+	      end,
+
+    Up = spawn_link(mnesia, transaction, [Update,  [0]]),
+    ?match_receive({update, 0, Up, _Tid}),
+    TL = spawn_link(mnesia, transaction, [TabLock]), 
+    ?match_receive({tablock, Tab, _Tl, _Tid}),
+    W0 = spawn_link(mnesia, transaction, [Write, [0]]), 
+    ?match_receive({write, 0, W0, _Tid}),
+    W1 = spawn_link(mnesia, transaction, [Write, [1]]), 
+    ?match_receive({write, 1, W1, _Tid}),
+    
+    %% Nothing should be in msg queue!
+    ?match(timeout, receive A -> A after 1000 -> timeout end),
+    Up ! continue,  %% Should be queued
+    ?match(timeout, receive A -> A after 1000 -> timeout end),
+    TL ! continue,  %% Should be restarted
+%    ?match({tablock, _, _, _}, receive A -> A after 1000 -> timeout end),
+    ?match(timeout, receive A -> A after 1000 -> timeout end),
+    
+    LQ1 = mnesia_locker:get_lock_queue(),    
+    ?match({2, _}, {length(LQ1), LQ1}),
+    W0 ! continue,                          % Up should be in queue
+    ?match_receive({done, {write, 0}, W0}),
+    ?match_receive({'EXIT', W0, normal}),
+
+    TL ! continue,   % Should stay in queue W1
+    ?match(timeout, receive A -> A after 1000 -> timeout end),
+    Up ! continue,   % Should stay in queue (TL got higher tid)
+    ?match(timeout, receive A -> A after 1000 -> timeout end),
+
+    LQ2 = mnesia_locker:get_lock_queue(),
+    ?match({2, _}, {length(LQ2), LQ2}),    
+    
+    W1 ! continue,
+    ?match_receive({done, {write, 1}, W1}),
+    get_exit(W1),
+    get_exit(TL),
+    ?match_receive({done, {tablock,Tab}, TL}),
+    get_exit(Up),
+    ?match_receive({done, {update, 0}, Up}),
+    
+    ok.
+
+get_exit(Pid) ->
+    receive 
+	{'EXIT', Pid, normal} ->
+	    ok
+    after 10000 ->
+	    ?error("Timeout EXIT ~p~n", [Pid])
+    end.
+
+
+foldl(doc) ->
+    [""];
+foldl(suite) ->
+    [];
+foldl(Config) when is_list(Config) ->
+    Nodes = [_,N2] = ?acquire_nodes(2, Config),
+    Tab1 = foldl_local,
+    Tab2 = foldl_remote,
+    Tab3 = foldl_ordered, 
+    Tab11 = foldr_local,
+    Tab21 = foldr_remote,
+    Tab31 = foldr_ordered, 
+    ?match({atomic, ok}, mnesia:create_table(Tab1, [{ram_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, [{ram_copies, [N2]}, {type, bag}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab3, [{ram_copies, Nodes}, 
+						    {type, ordered_set}])),    
+    ?match({atomic, ok}, mnesia:create_table(Tab11, [{ram_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab21, [{ram_copies, [N2]}, {type, bag}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab31, [{ram_copies, Nodes}, 
+						    {type, ordered_set}])),    
+
+
+    Tab1Els = [{Tab1, N, N} || N <- lists:seq(1, 10)],
+    Tab2Els = [{Tab2, 1, 2} | [{Tab2, N, N} || N <- lists:seq(1, 10)]],
+    Tab3Els = [{Tab3, N, N} || N <- lists:seq(1, 10)],
+    Tab11Els = [{Tab11, N, N} || N <- lists:seq(1, 10)],
+    Tab21Els = [{Tab21, 1, 2} | [{Tab21, N, N} || N <- lists:seq(1, 10)]],
+    Tab31Els = [{Tab31, N, N} || N <- lists:seq(1, 10)],
+    
+    [mnesia:sync_dirty(fun() -> mnesia:write(E) end) || E <- Tab1Els],
+    [mnesia:sync_dirty(fun() -> mnesia:write(E) end) || E <- Tab2Els],
+    [mnesia:sync_dirty(fun() -> mnesia:write(E) end) || E <- Tab3Els],
+    [mnesia:sync_dirty(fun() -> mnesia:write(E) end) || E <- Tab11Els],
+    [mnesia:sync_dirty(fun() -> mnesia:write(E) end) || E <- Tab21Els],
+    [mnesia:sync_dirty(fun() -> mnesia:write(E) end) || E <- Tab31Els],
+    
+    Get = fun(E, A) -> [E | A] end,
+    
+    %% Before 
+    AddB = fun(Tab, Func) -> 
+		   mnesia:write({Tab, 0, 0}),
+		   mnesia:write({Tab, 1, 0}),
+		   mnesia:write({Tab, 11, 0}),
+		   mnesia:Func(Get, [], Tab)
+	   end,        
+    AddT1 = [{Tab1, 0, 0}, {Tab1, 1, 0}] ++ tl(Tab1Els) ++ [{Tab1, 11, 0}],
+    AddT2 = lists:sort([{Tab2, 0, 0}, {Tab2, 1, 0}] ++ Tab2Els ++ [{Tab2, 11, 0}]),
+    AddT3 = [{Tab3, 0, 0}, {Tab3, 1, 0}] ++ tl(Tab3Els) ++ [{Tab3, 11, 0}],
+    AddT11 = [{Tab11, 0, 0}, {Tab11, 1, 0}] ++ tl(Tab11Els) ++ [{Tab11, 11, 0}],
+    AddT21 = lists:sort([{Tab21, 0, 0}, {Tab21, 1, 0}] ++ Tab21Els ++ [{Tab21, 11, 0}]),
+    AddT31 = [{Tab31, 0, 0}, {Tab31, 1, 0}] ++ tl(Tab31Els) ++ [{Tab31, 11, 0}],
+    
+    ?match({atomic, AddT1}, sort_res(mnesia:transaction(AddB, [Tab1, foldl]))),
+    ?match({atomic, AddT2}, sort_res(mnesia:transaction(AddB, [Tab2, foldl]))),
+    ?match({atomic, AddT3}, rev_res(mnesia:transaction(AddB, [Tab3, foldl]))),
+    ?match({atomic, AddT11}, sort_res(mnesia:transaction(AddB, [Tab11, foldr]))),
+    ?match({atomic, AddT21}, sort_res(mnesia:transaction(AddB, [Tab21, foldr]))),
+    ?match({atomic, AddT31}, mnesia:transaction(AddB, [Tab31, foldr])),
+    
+    ?match({atomic, ok}, mnesia:create_table(copy, [{ram_copies, [N2]},
+						    {record_name, Tab1}])),
+    CopyRec = fun(NewRec, Acc) -> 
+		      %% OTP-5495
+		      W = fun() -> mnesia:write(copy, NewRec, write), [NewRec| Acc] end,
+		      {atomic,Res} = sort_res(mnesia:transaction(W)),
+		      Res
+	      end,
+    Copy = fun() -> 
+		   AddT1 = mnesia:foldl(CopyRec, [], Tab1),
+		   AddT1 = sort_res(mnesia:foldl(Get, [], copy))
+	   end,
+    ?match({atomic, AddT1}, sort_res(mnesia:transaction(Copy))),
+    
+    Del  = fun(E, A) -> mnesia:delete_object(E), [E|A] end,
+    DelD = fun(Tab) ->
+		   mnesia:write({Tab, 12, 12}),
+		   mnesia:delete({Tab, 0}),
+		   mnesia:foldr(Del, [], Tab),
+		   mnesia:foldl(Get, [], Tab)
+	   end,
+    ?match({atomic, []}, sort_res(mnesia:transaction(DelD, [Tab1]))),
+    ?match({atomic, []}, sort_res(mnesia:transaction(DelD, [Tab2]))),
+    ?match({atomic, []}, rev_res(mnesia:transaction(DelD, [Tab3]))),
+    
+    ListWrite = fun(Tab) ->   %% OTP-3893 
+			mnesia:write({Tab, [12], 12}),	
+			mnesia:foldr(Get, [], Tab)
+		end,
+    ?match({atomic, [{Tab1, [12], 12}]}, sort_res(mnesia:transaction(ListWrite, [Tab1]))),
+    ?match({atomic, [{Tab2, [12], 12}]}, sort_res(mnesia:transaction(ListWrite, [Tab2]))),
+    ?match({atomic, [{Tab3, [12], 12}]}, rev_res(mnesia:transaction(ListWrite, [Tab3]))),
+    
+    ?verify_mnesia(Nodes, []).	   
+
+sort_res({atomic, List}) when is_list(List) ->
+    {atomic, lists:sort(List)};
+sort_res(Else) when is_list(Else) ->
+    lists:sort(Else);
+sort_res(Else) ->
+    Else.
+
+rev_res({atomic, List}) ->
+    {atomic, lists:reverse(List)};
+rev_res(Else) ->
+    Else.
+
+
+first_next(doc) ->    [""];
+first_next(suite) ->  [];
+first_next(Config) when is_list(Config) ->
+    Nodes = [_,N2] = ?acquire_nodes(2, Config),
+    Tab1 = local,
+    Tab2 = remote,
+    Tab3 = ordered, 
+    Tab4 = bag,
+    Tabs = [Tab1,Tab2,Tab3,Tab4],
+    
+    ?match({atomic, ok}, mnesia:create_table(Tab1, [{ram_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, [{ram_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab3, [{ram_copies, Nodes}, 
+						    {type, ordered_set}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab4, [{ram_copies, Nodes}, 
+						    {type, bag}])),
+
+    %% Some Helpers
+    Trans = fun(Fun) -> mnesia:transaction(Fun) end,
+    Continue = fun(first) -> next;
+		  (last) -> prev
+	       end,
+    LoopHelp = fun('$end_of_table',_,_,_Fun) -> [];
+		  (Key,Tab,Op,Fun) -> 
+		       Next = mnesia:Op(Tab,Key),
+		       [Next |Fun(Next,Tab,Op,Fun)] 
+	       end,
+    Loop = fun(Tab,Start) -> 
+		   First = mnesia:Start(Tab),
+		   Res = [First|LoopHelp(First,Tab,Continue(Start),LoopHelp)],
+		   case mnesia:table_info(Tab, type) of
+		       ordered_set when Start == first -> Res;
+		       ordered_set -> 
+			   {L1,L2} = lists:split(length(Res)-1,Res),
+			   lists:reverse(L1) ++ L2;
+		       _ -> lists:sort(Res)
+		   end	  
+	   end,
+
+    %% Verify empty tables
+    [?match({atomic, ['$end_of_table']}, 
+ 	    Trans(fun() -> Loop(Tab,first) end)) 
+     || Tab <- Tabs],
+    [?match({atomic, ['$end_of_table']}, 
+ 	    Trans(fun() -> Loop(Tab,last) end)) 
+     || Tab <- Tabs],
+    %% Verify that trans write is visible inside trans
+    [?match({atomic, [0,10,'$end_of_table']}, 
+ 	    Trans(fun() ->
+ 			  mnesia:write({Tab,0,0}),
+ 			  mnesia:write({Tab,10,10}),
+ 			  Loop(Tab,first) end)) 
+     || Tab <- Tabs],
+    [?match({atomic, ['$end_of_table']}, 
+ 	    Trans(fun() -> 
+ 			  mnesia:delete({Tab,0}),
+ 			  mnesia:delete({Tab,10}),
+ 			  Loop(Tab,first) end)) 
+     || Tab <- Tabs],
+
+    [?match({atomic, [0,10,'$end_of_table']}, 
+ 	    Trans(fun() -> 
+ 			  mnesia:write({Tab,0,0}),
+ 			  mnesia:write({Tab,10,10}),
+ 			  Loop(Tab,last) end))
+     || Tab <- Tabs],
+    [?match({atomic, ['$end_of_table']}, 
+ 	    Trans(fun() -> 
+ 			  mnesia:delete({Tab,0}),
+ 			  mnesia:delete({Tab,10}),
+ 			  Loop(Tab,last) end)) 
+     || Tab <- Tabs],
+
+    Tab1Els = [{Tab1, N, N} || N <- lists:seq(1, 5)],
+    Tab2Els = [{Tab2, N, N} || N <- lists:seq(1, 5)],
+    Tab3Els = [{Tab3, N, N} || N <- lists:seq(1, 5)],
+    Tab4Els = [{Tab4, 1, 2} | [{Tab4, N, N} || N <- lists:seq(1, 5)]],
+
+    [mnesia:sync_dirty(fun() -> mnesia:write(E) end) || E <- Tab1Els],
+    [mnesia:sync_dirty(fun() -> mnesia:write(E) end) || E <- Tab2Els],
+    [mnesia:sync_dirty(fun() -> mnesia:write(E) end) || E <- Tab3Els],
+    [mnesia:sync_dirty(fun() -> mnesia:write(E) end) || E <- Tab4Els],
+    Keys = lists:sort(mnesia:dirty_all_keys(Tab1)),
+    R1  =  Keys++ ['$end_of_table'],
+    [?match({atomic, R1}, Trans(fun() -> Loop(Tab,first) end)) 
+     || Tab <- Tabs],
+
+    [?match({atomic, R1}, Trans(fun() -> Loop(Tab,last) end)) 
+     || Tab <- Tabs],
+    R2 = R1 -- [3],
+
+    [?match({atomic, R2}, Trans(fun() -> mnesia:delete({Tab,3}),Loop(Tab,first) end)) 
+     || Tab <- Tabs],
+    [?match({atomic, R1}, Trans(fun() -> mnesia:write({Tab,3,3}),Loop(Tab,first) end)) 
+     || Tab <- Tabs],
+    [?match({atomic, R2}, Trans(fun() -> mnesia:delete({Tab,3}),Loop(Tab,last) end)) 
+     || Tab <- Tabs],
+    [?match({atomic, R1}, Trans(fun() -> mnesia:write({Tab,3,3}),Loop(Tab,last) end)) 
+     || Tab <- Tabs],
+    [?match({atomic, R1}, Trans(fun() -> mnesia:write({Tab,4,19}),Loop(Tab,first) end)) 
+     || Tab <- Tabs],
+    [?match({atomic, R1}, Trans(fun() -> mnesia:write({Tab,4,4}),Loop(Tab,last) end)) 
+     || Tab <- Tabs],
+
+    ?verify_mnesia(Nodes, []).
+
+
+snmp_shadows(doc) ->    [""];
+snmp_shadows(suite) ->  [];
+snmp_shadows(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(1, Config),
+    Tab = snmp_shadows,
+    io:format("With fixstring~n", []),
+    ?match({atomic, ok}, mnesia:create_table(Tab,[{snmp,[{key,{fix_string,integer}}]}])),
+    snmp_shadows_test(Tab),
+    ?match({atomic, ok}, mnesia:delete_table(Tab)),
+    io:format("Without fixstring~n", []),
+    ?match({atomic, ok}, mnesia:create_table(Tab,[{snmp,[{key,{string,integer}}]}])),
+    snmp_shadows_test(Tab),
+    ?verify_mnesia(Nodes, []).
+
+snmp_shadows_test(Tab) ->
+    [mnesia:dirty_write({Tab, {"string", N}, {N, init}}) || N <- lists:seq(2,8,2)],
+    
+    CheckOrder = fun(A={_,_,{_,_,State}}, Prev) ->
+			 ?match({true, A, Prev}, {Prev < A, A, Prev}),
+			 {State,A} 
+		 end,
+    R1 = mnesia:sync_dirty(fun() -> loop_snmp(Tab, []) end),
+    lists:mapfoldl(CheckOrder, {[],foo,foo}, R1),
+    R2 = mnesia:transaction(fun() -> loop_snmp(Tab, []) end),
+    ?match({atomic, R1}, R2),
+    
+    Shadow = fun() ->
+		     ok = mnesia:write({Tab, {"string",1}, {1,update}}),
+		     ok = mnesia:write({Tab, {"string",4}, {4,update}}),
+		     ok = mnesia:write({Tab, {"string",6}, {6,update}}),
+		     ok = mnesia:delete({Tab, {"string",6}}),
+		     ok = mnesia:write({Tab, {"string",9}, {9,update}}),
+		     ok = mnesia:write({Tab, {"string",3}, {3,update}}),
+		     ok = mnesia:write({Tab, {"string",5}, {5,update}}),
+		     [Row5] = mnesia:read({Tab, {"string",5}}),
+		     ok = mnesia:delete_object(Row5),
+		     loop_snmp(Tab, [])
+	     end,
+    R3 = mnesia:sync_dirty(Shadow),
+    {L3,_} = lists:mapfoldl(CheckOrder, {[],foo,foo}, R3),
+    ?match([{1,update},{2,init},{3,update},{4,update},{8,init},{9,update}], L3),
+    ?match({atomic, ok}, mnesia:clear_table(Tab)),
+
+    [mnesia:dirty_write({Tab, {"string", N}, {N, init}}) || N <- lists:seq(2,8,2)],
+    {atomic, R3} = mnesia:transaction(Shadow),
+    {L4,_} = lists:mapfoldl(CheckOrder, {[],foo,foo}, R3),
+    ?match([{1,update},{2,init},{3,update},{4,update},{8,init},{9,update}], L4),
+    ok.
+   
+loop_snmp(Tab,Prev) ->
+    case mnesia:snmp_get_next_index(Tab,Prev) of
+	{ok, SKey} ->
+	    {{ok,Row},_} = {mnesia:snmp_get_row(Tab, SKey),{?LINE,Prev,SKey}},
+	    {{ok,MKey},_} = {mnesia:snmp_get_mnesia_key(Tab,SKey),{?LINE,Prev,SKey}},
+	    ?match({[Row],Row,SKey,MKey}, {mnesia:read({Tab,MKey}),Row,SKey,MKey}),
+	    [{SKey, MKey, Row} | loop_snmp(Tab, SKey)];
+	endOfTable ->
+	    []
+    end.
diff --git a/lib/mnesia/test/mnesia_measure_test.erl b/lib/mnesia/test/mnesia_measure_test.erl
new file mode 100644
index 0000000000..e63689d83a
--- /dev/null
+++ b/lib/mnesia/test/mnesia_measure_test.erl
@@ -0,0 +1,152 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1996-2010. 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(mnesia_measure_test).
+-author('[email protected]').
+-compile([export_all]).
+
+-include("mnesia_test_lib.hrl").
+
+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).
+
+-define(init(N, Config),
+	mnesia_test_lib:prepare_test_case([{init_test_case, [mnesia]},
+					   delete_schema],
+					  N, Config, ?FILE, ?LINE)).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+all() -> 
+    [{group, prediction}, {group, consumption},
+     {group, scalability}, {group, benchmarks}].
+
+groups() -> 
+    [{prediction, [],
+      [reader_disturbed_by_node_down,
+       writer_disturbed_by_node_down,
+       reader_disturbed_by_node_up,
+       writer_disturbed_by_node_up,
+       reader_disturbed_by_schema_ops,
+       writer_disturbed_by_schema_ops,
+       reader_disturbed_by_checkpoint,
+       writer_disturbed_by_checkpoint,
+       reader_disturbed_by_dump_log,
+       writer_disturbed_by_dump_log,
+       reader_disturbed_by_backup, writer_disturbed_by_backup,
+       reader_disturbed_by_restore,
+       writer_disturbed_by_restore, {group, fairness}]},
+     {fairness, [],
+      [reader_competing_with_reader,
+       reader_competing_with_writer,
+       writer_competing_with_reader,
+       writer_competing_with_writer]},
+     {consumption, [],
+      [measure_resource_consumption,
+       determine_resource_leakage]},
+     {scalability, [],
+      [determine_system_limits, performance_at_min_config,
+       performance_at_max_config, performance_at_full_load,
+       resource_consumption_at_min_config,
+       resource_consumption_at_max_config,
+       resource_consumption_at_full_load]},
+     {benchmarks, [],
+      [{group, meter}, cost, dbn_meters,
+       measure_all_api_functions, {group, tpcb},
+       mnemosyne_vs_mnesia_kernel]},
+     {tpcb, [], [ram_tpcb, disc_tpcb, disc_only_tpcb]},
+     {meter, [], [ram_meter, disc_meter, disc_only_meter]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+     
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+dbn_meters(suite) -> [];
+dbn_meters(Config) when is_list(Config) ->
+    _Nodes = ?init(3, Config),
+    ?match(ok, mnesia_dbn_meters:start()),
+    ok.
+
+
+tpcb(ReplicaType, Config) ->
+    HarakiriDelay = {tc_timeout, timer:minutes(20)},
+    Nodes = ?acquire_nodes(2, Config ++ [HarakiriDelay]),
+    Args = [{n_branches, 2},
+	    {n_drivers_per_node, 1},
+	    {replica_nodes, Nodes},
+	    {driver_nodes, [hd(Nodes)]},
+	    {use_running_mnesia, true},
+	    {use_sticky_locks, true},
+	    {replica_type, ReplicaType}],
+    ?match({ok, _}, mnesia_tpcb:start(Args)),
+    ?verify_mnesia(Nodes, []).
+
+ram_tpcb(suite) -> [];
+ram_tpcb(Config) when is_list(Config) ->
+    tpcb(ram_copies, Config).
+
+disc_tpcb(suite) -> [];
+disc_tpcb(Config) when is_list(Config) ->
+    tpcb(disc_copies, Config).
+
+disc_only_tpcb(suite) -> [];
+disc_only_tpcb(Config) when is_list(Config) ->
+    tpcb(disc_only_copies, Config).
+
+
+ram_meter(suite) -> [];
+ram_meter(Config) when is_list(Config) ->
+    HarakiriDelay = [{tc_timeout, timer:minutes(20)}],
+    Nodes = ?init(3, Config ++ HarakiriDelay),
+    ?match(ok, mnesia_meter:go(ram_copies, Nodes)).
+
+disc_meter(suite) -> [];
+disc_meter(Config) when is_list(Config) ->
+    HarakiriDelay = [{tc_timeout, timer:minutes(20)}],
+    Nodes = ?init(3, Config ++ HarakiriDelay),
+    ?match(ok, mnesia_meter:go(disc_copies, Nodes)).
+
+disc_only_meter(suite) -> [];
+disc_only_meter(Config) when is_list(Config) ->
+    HarakiriDelay = [{tc_timeout, timer:minutes(20)}],
+    Nodes = ?init(3, Config ++ HarakiriDelay),
+    ?match(ok, mnesia_meter:go(disc_only_copies, Nodes)).
+
+cost(suite) -> [];
+cost(Config) when is_list(Config) ->
+    Nodes = ?init(3, Config),
+    ?match(ok, mnesia_cost:go(Nodes)),
+    file:delete("MNESIA_COST").
diff --git a/lib/mnesia/test/mnesia_meter.erl b/lib/mnesia/test/mnesia_meter.erl
new file mode 100644
index 0000000000..68094c4431
--- /dev/null
+++ b/lib/mnesia/test/mnesia_meter.erl
@@ -0,0 +1,465 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
+%%
+
+%%
+%% Getting started:
+%%
+%% 1 Start one or more distributed Erlang nodes
+%% 2a Connect the nodes, e.g. with net_adm:ping/1
+%% 3a Run mnesia_meter:go()
+%% 3b Run mnesia_meter:go(ReplicaType)
+%% 3c Run mnesia_meter:go(ReplicaType, Nodes)
+
+-module(mnesia_meter).
+-author('[email protected]').
+-export([
+         go/0, 
+         go/1, 
+         go/2,
+         repeat_meter/2
+        ]).
+
+-record(person, {name,        %% atomic, unique key
+                 data,        %% compound structure
+                 married_to,  %% name of partner or undefined
+                 children}).  %% list of children
+
+-record(meter, {desc, init, meter, micros}).
+
+-record(result, {desc, list}).
+
+-define(TIMES, 1000).
+
+go() ->
+    go(ram_copies).
+
+go(ReplicaType) ->
+    go(ReplicaType, [node() | nodes()]).
+
+go(ReplicaType, Nodes) ->
+    {ok, FunOverhead} = tc(fun(_) -> {atomic, ok} end, ?TIMES),
+    Size = size(term_to_binary(#person{})),
+    io:format("A fun apply costs ~p micro seconds. Record size is ~p bytes.~n",
+              [FunOverhead, Size]),
+    Res = go(ReplicaType, Nodes, [], FunOverhead, []),
+    NewRes = rearrange(Res, []),
+    DescHeader = lists:flatten(io_lib:format("~w on ~w", [ReplicaType, Nodes])),
+    ItemHeader = lists:seq(1, length(Nodes)),
+    Header = #result{desc = DescHeader, list = ItemHeader},
+    SepList = ['--------' || _ <- Nodes],
+    Separator = #result{desc = "", list = SepList},
+    display([Separator, Header, Separator | NewRes] ++ [Separator]).
+
+go(_ReplicaType, [], _Config, _FunOverhead, Acc) ->
+    Acc;
+go(ReplicaType, [H | T], OldNodes, FunOverhead, Acc) ->
+    Nodes = [H | OldNodes],
+    Config = [{ReplicaType, Nodes}],
+    Res = run(Nodes, Config, FunOverhead),
+    go(ReplicaType, T, Nodes, FunOverhead, [{ReplicaType, Nodes, Res} | Acc]).
+
+rearrange([{_ReplicaType, _Nodes, Meters} | Tail], Acc) ->
+    Acc2 = [add_meter(M, Acc) || M <- Meters],
+    rearrange(Tail, Acc2);
+rearrange([], Acc) ->
+    Acc.
+
+add_meter(M, Acc) ->
+    case lists:keysearch(M#meter.desc, #result.desc, Acc) of
+        {value, R} ->
+            R#result{list = [M#meter.micros | R#result.list]};
+        false ->
+            #result{desc = M#meter.desc, list = [M#meter.micros]}
+    end.
+
+display(Res) ->
+    MaxDesc = lists:max([length(R#result.desc) || R <- Res]),
+    Format = lists:concat(["! ~-", MaxDesc, "s"]),
+    display(Res, Format, MaxDesc).
+
+display([R | Res], Format, MaxDesc) ->
+    case R#result.desc of
+	"" ->
+	    io:format(Format, [lists:duplicate(MaxDesc, "-")]);
+	Desc ->
+	    io:format(Format, [Desc])
+    end,
+    display_items(R#result.list, R#result.desc),
+    io:format(" !~n", []),
+    display(Res, Format, MaxDesc);
+display([], _Format, _MaxDesc) ->
+    ok.
+    
+display_items([_Item | Items], "") ->
+    io:format(" ! ~s", [lists:duplicate(10, $-)]),
+    display_items(Items, "");
+display_items([Micros | Items], Desc) ->
+    io:format(" ! ~10w", [Micros]),
+    display_items(Items, Desc);
+display_items([], _Desc) ->
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+meters() ->
+    [#meter{desc = "transaction update two records with read and write", 
+            init = fun write_records/2,
+            meter = fun update_records/1}, 
+     #meter{desc = "transaction update two records with wread and write", 
+            init = fun write_records/2,
+            meter = fun w_update_records/1}, 
+     #meter{desc = "transaction update two records with read and s_write", 
+            init = fun s_write_records/2,
+            meter = fun s_update_records/1}, 
+     #meter{desc = "sync_dirty  update two records with read and write", 
+            init = fun sync_dirty_write_records/2,
+            meter = fun sync_dirty_update_records/1}, 
+     #meter{desc = "async_dirty update two records with read and write", 
+            init = fun async_dirty_write_records/2,
+            meter = fun async_dirty_update_records/1}, 
+     #meter{desc = "plain fun   update two records with dirty_read and dirty_write", 
+            init = fun dirty_write_records/2,
+            meter = fun dirty_update_records/1}, 
+     #meter{desc = "ets         update two records with read and write (local only)", 
+            init = fun ets_opt_write_records/2,
+            meter = fun ets_update_records/1}, 
+     #meter{desc = "plain fun   update two records with ets:lookup and ets:insert (local only)", 
+            init = fun bif_opt_write_records/2,
+            meter = fun bif_update_records/1}, 
+     #meter{desc = "plain fun   update two records with dets:lookup and dets:insert (local only)", 
+            init = fun dets_opt_write_records/2,
+            meter = fun dets_update_records/1}, 
+     
+     #meter{desc = "transaction write two records with write", 
+            init = fun write_records/2,
+            meter = fun(X) -> write_records(X, 0-X) end}, 
+     #meter{desc = "transaction write two records with s_write", 
+            init = fun s_write_records/2,
+            meter = fun(X) -> s_write_records(X, 0-X) end}, 
+     #meter{desc = "sync_dirty  write two records with write", 
+            init = fun sync_dirty_write_records/2,
+            meter = fun(X) -> sync_dirty_write_records(X, 0-X) end}, 
+     #meter{desc = "async_dirty write two records with write", 
+            init = fun async_dirty_write_records/2,
+            meter = fun(X) -> async_dirty_write_records(X, 0-X) end}, 
+     #meter{desc = "plain fun   write two records with dirty_write", 
+            init = fun dirty_write_records/2,
+            meter = fun(X) -> dirty_write_records(X, 0-X) end}, 
+     #meter{desc = "ets         write two records with write (local only)", 
+            init = fun ets_opt_write_records/2,
+            meter = fun(X) -> ets_write_records(X, 0-X) end}, 
+     #meter{desc = "plain fun   write two records with ets:insert (local only)", 
+            init = fun bif_opt_write_records/2,
+            meter = fun(X) -> bif_write_records(X, 0-X) end}, 
+     #meter{desc = "plain fun   write two records with dets:insert (local only)", 
+            init = fun dets_opt_write_records/2,
+            meter = fun(X) -> dets_write_records(X, 0-X) end}, 
+     
+     #meter{desc = "transaction read two records with read", 
+            init = fun write_records/2,
+            meter = fun(X) -> read_records(X, 0-X) end}, 
+     #meter{desc = "sync_dirty  read two records with read", 
+            init = fun sync_dirty_write_records/2,
+            meter = fun(X) -> sync_dirty_read_records(X, 0-X) end}, 
+     #meter{desc = "async_dirty read two records with read", 
+            init = fun async_dirty_write_records/2,
+            meter = fun(X) -> async_dirty_read_records(X, 0-X) end}, 
+     #meter{desc = "plain fun   read two records with dirty_read", 
+            init = fun dirty_write_records/2,
+            meter = fun(X) -> dirty_read_records(X, 0-X) end}, 
+     #meter{desc = "ets         read two records with read", 
+            init = fun ets_opt_write_records/2,
+            meter = fun(X) -> ets_read_records(X, 0-X) end},
+     #meter{desc = "plain fun   read two records with ets:lookup", 
+            init = fun bif_opt_write_records/2,
+            meter = fun(X) -> bif_read_records(X, 0-X) end},
+     #meter{desc = "plain fun   read two records with dets:lookup", 
+            init = fun dets_opt_write_records/2,
+            meter = fun(X) -> dets_read_records(X, 0-X) end}
+    ].
+
+update_fun(Name) ->
+    fun() ->
+            case mnesia:read({person, Name}) of
+                [] -> 
+                    mnesia:abort(no_such_person);
+                [Pers] ->
+                    [Partner] = mnesia:read({person, Pers#person.married_to}), 
+                    mnesia:write(Pers#person{married_to = undefined}), 
+                    mnesia:write(Partner#person{married_to = undefined})
+            end
+    end.
+    
+update_records(Name) ->
+  mnesia:transaction(update_fun(Name)).
+
+sync_dirty_update_records(Name) ->
+  {atomic, mnesia:sync_dirty(update_fun(Name))}.
+
+async_dirty_update_records(Name) ->
+  {atomic, mnesia:async_dirty(update_fun(Name))}.
+
+ets_update_records(Name) ->
+  {atomic, mnesia:ets(update_fun(Name))}.
+
+w_update_records(Name) ->
+    F = fun() ->
+                case mnesia:wread({person, Name}) of
+                    [] -> 
+                        mnesia:abort(no_such_person);
+                    [Pers] ->
+                        [Partner] = mnesia:wread({person, Pers#person.married_to}), 
+                        mnesia:write(Pers#person{married_to = undefined}), 
+                        mnesia:write(Partner#person{married_to = undefined})
+                end
+        end, 
+    mnesia:transaction(F).
+
+s_update_records(Name) ->
+    F = fun() ->
+                case mnesia:read({person, Name}) of
+                    [] -> 
+                        mnesia:abort(no_such_person);
+                    [Pers] ->
+                        [Partner] = mnesia:read({person, Pers#person.married_to}), 
+                        mnesia:s_write(Pers#person{married_to = undefined}), 
+                        mnesia:s_write(Partner#person{married_to = undefined})
+                end
+        end, 
+    mnesia:transaction(F).
+
+dirty_update_records(Name) ->
+    case mnesia:dirty_read({person, Name}) of
+        [] -> 
+            mnesia:abort(no_such_person);
+        [Pers] ->
+            [Partner] = mnesia:dirty_read({person, Pers#person.married_to}), 
+            mnesia:dirty_write(Pers#person{married_to = undefined}), 
+            mnesia:dirty_write(Partner#person{married_to = undefined})
+    end,
+    {atomic, ok}.
+
+bif_update_records(Name) ->
+    case ets:lookup(person, Name) of
+        [] -> 
+            mnesia:abort(no_such_person);
+        [Pers] ->
+            [Partner] = ets:lookup(person, Pers#person.married_to), 
+            ets:insert(person, Pers#person{married_to = undefined}), 
+            ets:insert(person, Partner#person{married_to = undefined})
+    end,
+    {atomic, ok}.
+
+dets_update_records(Name) ->
+    case dets:lookup(person, Name) of
+        [] -> 
+            mnesia:abort(no_such_person);
+        [Pers] ->
+            [Partner] = dets:lookup(person, Pers#person.married_to), 
+            dets:insert(person, Pers#person{married_to = undefined}), 
+            dets:insert(person, Partner#person{married_to = undefined})
+    end,
+    {atomic, ok}.
+
+write_records_fun(Pers, Partner) ->
+    fun() ->
+            P = #person{children = [ulla, bella]}, 
+            mnesia:write(P#person{name = Pers, married_to = Partner}), 
+            mnesia:write(P#person{name = Partner, married_to = Pers})
+    end.
+
+write_records(Pers, Partner) ->
+    mnesia:transaction(write_records_fun(Pers, Partner)).
+
+sync_dirty_write_records(Pers, Partner) ->
+    {atomic, mnesia:sync_dirty(write_records_fun(Pers, Partner))}.
+
+async_dirty_write_records(Pers, Partner) ->
+    {atomic, mnesia:async_dirty(write_records_fun(Pers, Partner))}.
+
+ets_write_records(Pers, Partner) ->
+    {atomic, mnesia:ets(write_records_fun(Pers, Partner))}.
+
+s_write_records(Pers, Partner) ->
+    F = fun() ->
+                P = #person{children = [ulla, bella]}, 
+                mnesia:s_write(P#person{name = Pers, married_to = Partner}), 
+                mnesia:s_write(P#person{name = Partner, married_to = Pers})
+        end,
+    mnesia:transaction(F).
+
+dirty_write_records(Pers, Partner) ->
+    P = #person{children = [ulla, bella]}, 
+    mnesia:dirty_write(P#person{name = Pers, married_to = Partner}), 
+    mnesia:dirty_write(P#person{name = Partner, married_to = Pers}),
+    {atomic, ok}.
+
+ets_opt_write_records(Pers, Partner) ->
+    case mnesia:table_info(person, where_to_commit) of
+        [{N, ram_copies}] when N == node() ->
+            ets_write_records(Pers, Partner);
+        _ ->
+            throw(skipped)
+    end.
+
+bif_opt_write_records(Pers, Partner) ->
+    case mnesia:table_info(person, where_to_commit) of
+        [{N, ram_copies}] when N == node() ->
+            bif_write_records(Pers, Partner);
+        _ ->
+            throw(skipped)
+    end.
+
+bif_write_records(Pers, Partner) ->
+    P = #person{children = [ulla, bella]}, 
+    ets:insert(person, P#person{name = Pers, married_to = Partner}), 
+    ets:insert(person, P#person{name = Partner, married_to = Pers}),
+    {atomic, ok}.
+
+dets_opt_write_records(Pers, Partner) ->
+    case mnesia:table_info(person, where_to_commit) of
+        [{N, disc_only_copies}] when N == node() ->
+            dets_write_records(Pers, Partner);
+        _ ->
+            throw(skipped)
+    end.
+
+dets_write_records(Pers, Partner) ->
+    P = #person{children = [ulla, bella]}, 
+    dets:insert(person, P#person{name = Pers, married_to = Partner}), 
+    dets:insert(person, P#person{name = Partner, married_to = Pers}),
+    {atomic, ok}.
+
+read_records_fun(Pers, Partner) ->
+    fun() ->
+            case {mnesia:read({person, Pers}), 
+                  mnesia:read({person, Partner})} of
+                {[_], [_]} ->
+                    ok;
+                _ ->
+                    mnesia:abort(no_such_person)
+            end
+    end.
+
+read_records(Pers, Partner) ->
+    mnesia:transaction(read_records_fun(Pers, Partner)).
+
+sync_dirty_read_records(Pers, Partner) ->
+    {atomic, mnesia:sync_dirty(read_records_fun(Pers, Partner))}.
+
+async_dirty_read_records(Pers, Partner) ->
+    {atomic, mnesia:async_dirty(read_records_fun(Pers, Partner))}.
+
+ets_read_records(Pers, Partner) ->
+    {atomic, mnesia:ets(read_records_fun(Pers, Partner))}.
+
+dirty_read_records(Pers, Partner) ->
+    case {mnesia:dirty_read({person, Pers}), 
+          mnesia:dirty_read({person, Partner})} of
+        {[_], [_]} ->
+            {atomic, ok};
+        _ ->
+            mnesia:abort(no_such_person)
+    end.
+
+bif_read_records(Pers, Partner) ->
+    case {ets:lookup(person, Pers), 
+          ets:lookup(person, Partner)} of
+        {[_], [_]} ->
+            {atomic, ok};
+        _ ->
+            mnesia:abort(no_such_person)
+    end.
+
+dets_read_records(Pers, Partner) ->
+    case {dets:lookup(person, Pers), 
+          dets:lookup(person, Partner)} of
+        {[_], [_]} ->
+            {atomic, ok};
+        _ ->
+            mnesia:abort(no_such_person)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+run(Nodes, Config, FunOverhead) ->
+    Meters = meters(),
+    io:format("Run ~w meters with table config: ~w~n", [length(Meters), Config]),
+    rpc:multicall(Nodes, mnesia, lkill, []),
+    start(Nodes, Config),
+    Res = [run_meter(Data, Nodes, FunOverhead) || Data <- Meters],
+    stop(Nodes),
+    Res.
+
+run_meter(M, Nodes, FunOverhead) when is_record(M, meter) ->
+    io:format(".", []),
+    case catch init_records(M#meter.init, ?TIMES) of
+        {atomic, ok} ->
+            rpc:multicall(Nodes, mnesia, dump_log, []),
+            case tc(M#meter.meter, ?TIMES) of
+                {ok, Micros} ->
+                    M#meter{micros = lists:max([0, Micros - FunOverhead])};
+                {error, Reason} ->
+                    M#meter{micros = Reason}
+            end;
+        Res ->
+            M#meter{micros = Res}
+    end.
+
+start(Nodes, Config) ->
+    mnesia:delete_schema(Nodes), 
+    ok = mnesia:create_schema(Nodes),
+    Args = [[{dump_log_write_threshold, ?TIMES div 2},
+             {dump_log_time_threshold, timer:hours(10)}]],
+    lists:foreach(fun(Node) -> rpc:call(Node, mnesia, start, Args) end, Nodes), 
+    Attrs = record_info(fields, person), 
+    TabDef = [{attributes, Attrs} | Config], 
+    {atomic, _} = mnesia:create_table(person, TabDef).
+    
+stop(Nodes) ->
+    rpc:multicall(Nodes, mnesia, stop, []).
+
+%% Generate some dummy persons    
+init_records(_Fun, 0) ->
+    {atomic, ok};
+init_records(Fun, Times) ->
+    {atomic, ok} = Fun(Times, 0 - Times),
+    init_records(Fun, Times - 1).
+
+tc(Fun, Times) ->
+    case catch timer:tc(?MODULE, repeat_meter, [Fun, Times]) of
+        {Micros, ok} ->
+            {ok, Micros div Times};
+        {_Micros, {error, Reason}} ->
+            {error, Reason};
+        {'EXIT', Reason} ->
+            {error, Reason}
+    end.
+
+%% The meter must return {atomic, ok}
+repeat_meter(Meter, Times) ->
+    repeat_meter(Meter, {atomic, ok}, Times).
+
+repeat_meter(_, {atomic, ok}, 0) ->
+    ok;
+repeat_meter(Meter, {atomic, _Result}, Times) when Times > 0 ->
+    repeat_meter(Meter, Meter(Times), Times - 1);
+repeat_meter(_Meter, Reason, _Times) ->
+    {error, Reason}.
+
diff --git a/lib/mnesia/test/mnesia_nice_coverage_test.erl b/lib/mnesia/test/mnesia_nice_coverage_test.erl
new file mode 100644
index 0000000000..78eab67b11
--- /dev/null
+++ b/lib/mnesia/test/mnesia_nice_coverage_test.erl
@@ -0,0 +1,233 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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(mnesia_nice_coverage_test).
+-author('[email protected]').
+-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+-record(nice_tab, {key, val}).
+
+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() -> 
+    [nice].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+nice(doc) -> [""];
+nice(suite) -> [];
+nice(Config) when is_list(Config) ->
+    %% The whole test suite is one huge test case for the time beeing
+    
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config), 
+    Attrs = record_info(fields, nice_tab), 
+    
+    initialize(Attrs, Node1), 
+    dirty_access(Node1), 
+    success_and_fail(), 
+    index_mgt(), 
+    
+    adm(Attrs, Node1, Node2), 
+    snmp(Node1, Node2), 
+    backup(Node1), 
+    ?verify_mnesia(Nodes, []).
+
+initialize(Attrs, Node1) ->
+    ?match(Version when is_list(Version), mnesia:system_info(version)), 
+
+    Schema = [{name, nice_tab}, 
+	      {attributes, Attrs}, {ram_copies, [Node1]}], 
+
+    ?match({_, _}, mnesia:system_info(schema_version)), 
+    ?match({atomic, ok}, mnesia:create_table(Schema)), 
+
+    ?match(ok, mnesia:info()), 
+    ?match(set, mnesia:table_info(nice_tab, type)), 
+    ?match(ok, mnesia:schema()), 
+    ?match(ok, mnesia:schema(nice_tab)),
+    ok.
+
+dirty_access(Node1) ->
+    TwoThree = #nice_tab{key=23, val=23}, 
+    TwoFive  = #nice_tab{key=25, val=25}, 
+    ?match([], mnesia:dirty_slot(nice_tab, 0)), 
+    ?match(ok, mnesia:dirty_write(TwoThree)), 
+    ?match([TwoThree], mnesia:dirty_read({nice_tab, 23})), 
+    ?match(ok, mnesia:dirty_write(TwoFive)), 
+    ?match(ok, mnesia:dirty_delete_object(TwoFive)), 
+
+    ?match(23, mnesia:dirty_first(nice_tab)), 
+    ?match('$end_of_table', mnesia:dirty_next(nice_tab, 23)), 
+    ?match([TwoThree], mnesia:dirty_match_object(TwoThree)), 
+    ?match(ok, mnesia:dirty_delete({nice_tab, 23})), 
+
+    CounterSchema = [{ram_copies, [Node1]}], 
+    ?match({atomic, ok}, mnesia:create_table(nice_counter_tab, CounterSchema)), 
+    TwoFour  = {nice_counter_tab, 24, 24}, 
+    ?match(ok, mnesia:dirty_write(TwoFour)), 
+    ?match(34, mnesia:dirty_update_counter({nice_counter_tab, 24}, 10)), 
+    TF = {nice_counter_tab, 24, 34}, 
+    ?match([TF], mnesia:dirty_read({nice_counter_tab, 24})), 
+    ?match(ok, mnesia:dirty_delete({nice_counter_tab, 24})), 
+    ?match(ok, mnesia:dirty_delete_object(TF)),
+    ok.
+
+success_and_fail() ->
+    ?match({atomic, a_good_trans}, mnesia:transaction(fun() ->good_trans()end)), 
+
+    BadFun =
+	fun() ->
+		Two = #nice_tab{key=2, val=12}, 
+		?match([Two], mnesia:match_object(#nice_tab{key='$1', val=12})), 
+		?match([#nice_tab{key=3, val=13}], mnesia:wread({nice_tab, 3})), 
+		?match(ok, mnesia:delete({nice_tab, 1})), 
+		?match(ok, mnesia:delete_object(Two)), 
+		mnesia:abort(bad_trans), 
+		?match(bad, trans)
+	end, 
+    ?match({aborted, bad_trans}, mnesia:transaction(BadFun)), 
+    ?match(L when is_list(L), mnesia:error_description(no_exists)), 
+    ?match({atomic, ok}, mnesia:transaction(fun(A) -> lock(), A end, [ok])), 
+    ?match({atomic, ok}, mnesia:transaction(fun(A) -> lock(), A end, [ok], 3)),
+    ok.
+
+good_trans() ->
+    ?match([], mnesia:read(nice_tab, 3)), 
+    ?match([], mnesia:read({nice_tab, 3})), 
+    ?match(ok, mnesia:write(#nice_tab{key=14, val=4})), 
+    ?match([14], mnesia:all_keys(nice_tab)), 
+
+    Records = [ #nice_tab{key=K, val=K+10} || K <- lists:seq(1, 10) ], 
+    Ok = [ ok || _ <- Records], 
+    ?match(Ok, lists:map(fun(R) -> mnesia:write(R) end, Records)), 
+    a_good_trans.
+
+
+lock() ->
+    ?match(ok, mnesia:s_write(#nice_tab{key=22, val=22})), 
+    ?match(ok, mnesia:read_lock_table(nice_tab)), 
+    ?match(ok, mnesia:write_lock_table(nice_tab)),
+    ok.
+
+index_mgt() ->
+    UniversalRec = #nice_tab{key=4711, val=4711}, 
+    ?match(ok, mnesia:dirty_write(UniversalRec)), 
+    ValPos = #nice_tab.val, 
+    ?match({atomic, ok}, mnesia:add_table_index(nice_tab, ValPos)), 
+
+    IndexFun =
+	fun() ->
+		?match([UniversalRec], 
+		       mnesia:index_read(nice_tab, 4711, ValPos)), 
+		Pat = #nice_tab{key='$1', val=4711}, 
+		?match([UniversalRec], 
+		       mnesia:index_match_object(Pat, ValPos)), 
+		index_trans
+	end, 
+    ?match({atomic, index_trans}, mnesia:transaction(IndexFun, infinity)), 
+    ?match([UniversalRec], 
+	   mnesia:dirty_index_read(nice_tab, 4711, ValPos)), 
+    ?match([UniversalRec], 
+	   mnesia:dirty_index_match_object(#nice_tab{key='$1', val=4711}, ValPos)), 
+
+    ?match({atomic, ok}, mnesia:del_table_index(nice_tab, ValPos)),
+    ok.
+
+adm(Attrs, Node1, Node2) ->
+    This = node(), 
+    ?match({ok, This}, mnesia:subscribe(system)), 
+    ?match({atomic, ok}, 
+	   mnesia:add_table_copy(nice_tab, Node2, disc_only_copies)), 
+    ?match({atomic, ok}, 
+	   mnesia:change_table_copy_type(nice_tab, Node2, ram_copies)), 
+    ?match({atomic, ok}, mnesia:del_table_copy(nice_tab, Node1)), 
+    ?match(stopped, rpc:call(Node1, mnesia, stop, [])), 
+    ?match([], mnesia_test_lib:start_mnesia([Node1, Node2], [nice_tab])), 
+    ?match(ok, mnesia:wait_for_tables([schema], infinity)), 
+
+    Transformer = fun(Rec) ->
+			  list_to_tuple(tuple_to_list(Rec) ++ [initial_value])
+		  end, 
+    ?match({atomic, ok}, 
+	   mnesia:transform_table(nice_tab, Transformer, Attrs ++ [extra])), 
+
+    ?match({atomic, ok}, mnesia:delete_table(nice_tab)), 
+    DumpSchema = [{name, nice_tab}, {attributes, Attrs}, {ram_copies, [Node2]}], 
+    ?match({atomic, ok}, mnesia:create_table(DumpSchema)), 
+    ?match({atomic, ok}, mnesia:dump_tables([nice_tab])), 
+    ?match({atomic, ok}, mnesia:move_table_copy(nice_tab, Node2, Node1)), 
+
+    ?match(yes, mnesia:force_load_table(nice_counter_tab)), 
+    ?match(dumped, mnesia:dump_log()),
+    ok.
+
+backup(Node1) ->
+    Tab = backup_nice,
+    Def = [{disc_copies, [Node1]}], 
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),    
+    ?match({ok,_,_}, mnesia:activate_checkpoint([{name, cp}, {max, [Tab]}])), 
+    File = "nice_backup.BUP",
+    File2 = "nice_backup2.BUP",
+    File3 = "nice_backup3.BUP",
+    ?match(ok, mnesia:backup_checkpoint(cp, File)), 
+    ?match(ok, mnesia:backup_checkpoint(cp, File, mnesia_backup)), 
+    ?match(ok, mnesia:deactivate_checkpoint(cp)), 
+    ?match(ok, mnesia:backup(File)), 
+    ?match(ok, mnesia:backup(File, mnesia_backup)), 
+
+    Fun = fun(X, Acc) -> {[X], Acc} end,
+    ?match({ok, 0}, mnesia:traverse_backup(File, File2, Fun, 0)), 
+    ?match({ok, 0}, mnesia:traverse_backup(File, mnesia_backup, dummy, read_only, Fun, 0)), 
+    ?match(ok, mnesia:install_fallback(File)), 
+    ?match(ok, mnesia:uninstall_fallback()), 
+    ?match(ok, mnesia:install_fallback(File, mnesia_backup)), 
+    ?match(ok, mnesia:dump_to_textfile(File3)), 
+    ?match({atomic, ok}, mnesia:load_textfile(File3)),
+    ?match(ok, file:delete(File)),
+    ?match(ok, file:delete(File2)),
+    ?match(ok, file:delete(File3)),
+    ok.
+
+snmp(Node1, Node2) ->
+    Tab = nice_snmp, 
+    Def = [{disc_copies, [Node1]}, {ram_copies, [Node2]}], 
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    ?match({aborted, {badarg, Tab, _}}, mnesia:snmp_open_table(Tab, [])),
+    ?match({atomic, ok}, mnesia:snmp_open_table(Tab, [{key, integer}])),
+    ?match(endOfTable, mnesia:snmp_get_next_index(Tab, [0])), 
+    ?match(undefined, mnesia:snmp_get_row(Tab, [0])), 
+    ?match(undefined, mnesia:snmp_get_mnesia_key(Tab, [0])), 
+    ?match({atomic, ok}, mnesia:snmp_close_table(Tab)),
+    ok.
+
diff --git a/lib/mnesia/test/mnesia_qlc_test.erl b/lib/mnesia/test/mnesia_qlc_test.erl
new file mode 100644
index 0000000000..141de71d01
--- /dev/null
+++ b/lib/mnesia/test/mnesia_qlc_test.erl
@@ -0,0 +1,477 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2010. 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(mnesia_qlc_test).
+
+-compile(export_all).
+
+-export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+
+-include("mnesia_test_lib.hrl").
+-include_lib("stdlib/include/qlc.hrl"). 
+
+init_per_testcase(Func, Conf) ->
+    setup(Conf),
+    mnesia_test_lib:init_per_testcase(Func, Conf).
+
+end_per_testcase(Func, Conf) ->
+    mnesia_test_lib:end_per_testcase(Func, Conf).
+
+all() -> 
+    case code:which(qlc) of
+	non_existing -> [];
+	_ -> all_qlc()
+    end.
+
+groups() -> 
+    [{dirty, [],
+      [dirty_nice_ram_copies, dirty_nice_disc_copies,
+       dirty_nice_disc_only_copies]},
+     {trans, [],
+      [trans_nice_ram_copies, trans_nice_disc_copies,
+       trans_nice_disc_only_copies, {group, atomic}]},
+     {atomic, [], [atomic_eval]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+all_qlc() -> 
+    [{group, dirty}, {group, trans}, frag, info,
+     mnesia_down].
+
+init_testcases(Type,Config) ->
+    Nodes = [N1,N2] = ?acquire_nodes(2, Config),
+    ?match({atomic, ok}, mnesia:create_table(a, [{Type,[N1]}, {index,[3]}])),
+    ?match({atomic, ok}, mnesia:create_table(b, [{Type,[N2]}])),
+    Write = fun(Id) -> 
+		    ok = mnesia:write({a, {a,Id}, 100 - Id}),
+		    ok = mnesia:write({b, {b,100-Id}, Id})
+	    end,
+    All = fun() -> [Write(Id) || Id <- lists:seq(1,10)], ok end,
+    ?match({atomic, ok}, mnesia:sync_transaction(All)),
+    Nodes.
+
+%% Test cases       
+
+dirty_nice_ram_copies(Setup) -> dirty_nice(Setup,ram_copies).
+dirty_nice_disc_copies(Setup) -> dirty_nice(Setup,disc_copies).
+dirty_nice_disc_only_copies(Setup) -> dirty_nice(Setup,disc_only_copies).
+
+dirty_nice(suite, _) -> [];
+dirty_nice(doc, _) -> [];
+dirty_nice(Config, Type) when is_list(Config) ->
+    Ns = init_testcases(Type,Config),
+    QA = handle(<<"[Q || Q = {_,{_,Key},Val} <- mnesia:table(a),"
+		 "     Val == 90 + Key]">>),
+    QB = handle(<<"[Q || Q = {_,{_,Key},Val} <- mnesia:table(b),"
+		 "     Key == 90 + Val]">>),
+    QC = qlc:sort(mnesia:table(a, [{n_objects,1}, {lock,write}, {traverse, select}])),
+    QD = qlc:sort(mnesia:table(a, [{n_objects,1}, {traverse,{select,[{'$1',[],['$1']}]}}])),
+
+    FA = fun() -> qlc:e(QA) end,
+    FB = fun() -> qlc:e(QB) end,
+    FC = fun() -> qlc:e(QC) end,
+    FD = fun() -> qlc:e(QD) end,
+
+    %% Currently unsupported
+    ?match({'EXIT',{aborted,no_transaction}}, FA()),
+    ?match({'EXIT',{aborted,no_transaction}}, FB()),
+    %%
+    CRes = lists:sort(mnesia:dirty_match_object(a, {'_','_','_'})),
+    ?match([{a,{a,5},95}], mnesia:async_dirty(FA)),
+    ?match([{b,{b,95},5}], mnesia:async_dirty(FB)),
+    ?match(CRes, mnesia:async_dirty(FC)),
+    ?match(CRes, mnesia:async_dirty(FD)),
+    ?match([{a,{a,5},95}], mnesia:sync_dirty(FA)),
+    ?match([{b,{b,95},5}], mnesia:sync_dirty(FB)),
+    ?match(CRes, mnesia:sync_dirty(FC)),
+    ?match([{a,{a,5},95}], mnesia:activity(async_dirty, FA)),
+    ?match([{b,{b,95},5}], mnesia:activity(async_dirty, FB)),
+    ?match([{a,{a,5},95}], mnesia:activity(sync_dirty, FA)),
+    ?match([{b,{b,95},5}], mnesia:activity(sync_dirty, FB)),
+    ?match(CRes, mnesia:activity(async_dirty,FC)),
+    case Type of
+	disc_only_copies -> skip;
+	_ -> 
+	    ?match([{a,{a,5},95}], mnesia:ets(FA)),
+	    ?match([{a,{a,5},95}], mnesia:activity(ets, FA))
+    end,
+    ?verify_mnesia(Ns, []).
+
+
+trans_nice_ram_copies(Setup) -> trans_nice(Setup,ram_copies).
+trans_nice_disc_copies(Setup) -> trans_nice(Setup,disc_copies).
+trans_nice_disc_only_copies(Setup) -> trans_nice(Setup,disc_only_copies).
+
+trans_nice(suite, _) -> [];
+trans_nice(doc, _) -> [];
+trans_nice(Config, Type) when is_list(Config) ->
+    Ns = init_testcases(Type,Config),
+    QA = handle(<<"[Q || Q = {_,{_,Key},Val} <- mnesia:table(a),"
+		 "     Val == 90 + Key]">>),
+    QB = handle(<<"[Q || Q = {_,{_,Key},Val} <- mnesia:table(b),"
+		 "     Key == 90 + Val]">>),
+    QC = handle(recs(), 
+ 		<<"[Q || Q = #a{v=91} <- mnesia:table(a)]"
+ 		 >>),
+
+    QD = qlc:sort(mnesia:table(a, [{n_objects,1}, {lock,write}, {traverse, select}])),
+    QE = qlc:sort(mnesia:table(a, [{n_objects,1}, {traverse,{select,[{'$1',[],['$1']}]}}])),
+
+    DRes = lists:sort(mnesia:dirty_match_object(a, {'_','_','_'})),
+
+    FA = fun() -> qlc:e(QA) end,
+    FB = fun() -> qlc:e(QB) end,
+    FC = fun() -> qlc:e(QC) end,
+    FD = fun() -> qlc:e(QD) end,
+    FE = fun() -> qlc:e(QE) end,
+		  
+    ?match({atomic,[{a,{a,5},95}]}, mnesia:transaction(FA)),
+    ?match({atomic,[{b,{b,95},5}]}, mnesia:transaction(FB)),
+    ?match({atomic,[{a,{a,9},91}]}, mnesia:transaction(FC)),
+    ?match({atomic,[{a,{a,5},95}]}, mnesia:sync_transaction(FA)),
+    ?match({atomic,[{b,{b,95},5}]}, mnesia:sync_transaction(FB)),
+    ?match({atomic,[{a,{a,9},91}]}, mnesia:sync_transaction(FC)),
+    ?match([{a,{a,5},95}], mnesia:activity(transaction,FA)),
+    ?match([{b,{b,95},5}], mnesia:activity(transaction,FB)),
+    ?match([{a,{a,9},91}], mnesia:activity(transaction,FC)),
+    ?match([{a,{a,5},95}], mnesia:activity(sync_transaction,FA)),
+    ?match([{b,{b,95},5}], mnesia:activity(sync_transaction,FB)),
+    ?match([{a,{a,9},91}], mnesia:activity(sync_transaction,FC)),
+
+    ?match({atomic, DRes}, mnesia:transaction(FD)),
+    ?match({atomic, DRes}, mnesia:transaction(FE)),
+
+    Rest = fun(Cursor,Loop) -> 
+		   case qlc:next_answers(Cursor, 1) of
+		       [] -> [];
+		       [A]-> [A|Loop(Cursor,Loop)] 
+		   end
+	   end,
+    Loop = fun() -> 
+		   Cursor = qlc:cursor(QD),
+		   Rest(Cursor,Rest)
+	   end,
+    ?match({atomic, DRes}, mnesia:transaction(Loop)),
+
+    ?verify_mnesia(Ns, []).
+
+%% -record(a, {k,v}).
+%% -record(b, {k,v}).
+%% -record(k, {t,v}).
+
+recs() ->
+    <<"-record(a, {k,v}). "
+      "-record(b, {k,v}). "
+      "-record(k, {t,v}). "
+     >>.
+ 
+
+atomic_eval(suite) -> [];
+atomic_eval(doc) -> []; 
+atomic_eval(Config) ->
+    Ns = init_testcases(ram_copies, Config),    
+    Q1 = handle(recs(), 
+		<<"[Q || Q = #a{k={_,9}} <- mnesia:table(a)]"
+		 >>),
+    Eval = fun(Q) -> 
+		   {qlc:e(Q),
+		    mnesia:system_info(held_locks)}
+	   end,
+    Self = self(),
+    ?match({[{a,{a,9},91}], [{{a,'______WHOLETABLE_____'},read,{tid,_,Self}}]},
+	   ok(Eval,[Q1])),
+    
+    Q2 = handle(recs(), 
+		<<"[Q || Q = #a{k={a,9}} <- mnesia:table(a)]"
+		 >>),
+    
+    ?match({[{a,{a,9},91}],[{{a,{a,9}},read,{tid,_,Self}}]},
+	   ok(Eval,[Q2])),
+
+    Flush = fun(Loop) -> %% Clean queue
+		    receive _ -> Loop(Loop) 
+		    after 0 -> ok end
+	    end,
+    
+    Flush(Flush),
+
+    GrabLock = fun(Father) ->  
+		       mnesia:read(a, {a,9}, write),
+		       Father ! locked,
+		       receive cont -> ok end end,
+
+    Pid1 = spawn(fun() -> ?match(ok, ok(GrabLock, [Self])) end),    
+    ?match(locked,receive locked -> locked after 5000 -> timeout end), %% Wait
+
+    put(count,0),
+    Restart = fun(Locker,Fun) ->
+		      Count = get(count),
+		      case {Count,(catch Fun())}  of
+			  {0, {'EXIT', R}} ->
+			      Locker ! cont,
+			      put(count, Count+1),
+			      erlang:yield(),
+			      exit(R);
+			  Else ->
+			      Else
+		      end
+	      end,
+    
+    ?match({1,{[{a,{a,9},91}], [{{a,'______WHOLETABLE_____'},read,{tid,_,Self}}]}},
+	   ok(Restart,[Pid1,fun() -> Eval(Q1) end])),
+    
+    Pid2 = spawn(fun() -> ?match(ok, ok(GrabLock, [Self])) end),
+    ?match(locked,receive locked -> locked after 5000 -> timeout end), %% Wait
+    put(count,0),
+    ?match({1,{[{a,{a,9},91}],[{{a,{a,9}},read,{tid,_,Self}}]}},
+	   ok(Restart,[Pid2, fun() -> Eval(Q2) end])),
+
+%% Basic test     
+    Cursor = fun() ->
+		     QC = qlc:cursor(Q1),
+		     qlc:next_answers(QC) 
+	     end,
+
+    ?match([{a,{a,9},91}], ok(Cursor, [])),
+    %% Lock 
+
+    Pid3 = spawn(fun() -> ?match(ok, ok(GrabLock, [Self])) end),    
+    ?match(locked,receive locked -> locked after 5000 -> timeout end), %% Wait
+    put(count,0),
+    
+    ?match({1,[{a,{a,9},91}]}, ok(Restart,[Pid3, Cursor])),
+    QC1 = ok(fun() -> qlc:cursor(Q1) end, []),
+    ?match({'EXIT', _},  qlc:next_answers(QC1)),
+    ?match({aborted,_},  ok(fun()->qlc:next_answers(QC1)end,[])),
+    ?verify_mnesia(Ns, []).
+
+
+frag(suite) -> [];
+frag(doc) -> [];
+frag(Config) ->
+    Ns = init_testcases(ram_copies,Config),
+    QA = handle(<<"[Q || Q = {_,{_,Key},Val} <- mnesia:table(a),"
+		 "     Val == 90 + Key]">>),
+    QB = handle(<<"[Q || Q = {_,{_,Key},Val} <- mnesia:table(b),"
+		 "     Key == 90 + Val]">>),
+    
+    Activate = 
+	fun(Tab) ->
+		?match({atomic,ok},mnesia:change_table_frag(Tab, {activate, []})),
+		Dist = mnesia_frag_test:frag_dist(Tab),
+		?match({atomic,ok},mnesia:change_table_frag(Tab,{add_frag,Dist}))
+	end,
+    Activate(a),
+    Activate(b),
+
+    Fun = fun(Tab) -> mnesia:table_info(Tab, frag_names) end,
+    FTs = mnesia:activity(sync_dirty, Fun, [a], mnesia_frag) ++
+	mnesia:activity(sync_dirty, Fun, [b], mnesia_frag),
+    Size = fun(Tab) -> mnesia:dirty_rpc(Tab, mnesia, table_info, [Tab,size]) end,
+
+    %% Verify that all data doesn't belong to the same frag.
+    ?match([], [{Tab,Size(Tab)} || Tab <- FTs,
+				   Size(Tab) =< 0]),
+    
+    FA = fun() -> qlc:e(QA) end,
+    FB = fun() -> qlc:e(QB) end,
+    ?match([{a,{a,5},95}], mnesia:activity(transaction,FA,[],mnesia_frag)),
+    ?match([{b,{b,95},5}], mnesia:activity(transaction,FB,[],mnesia_frag)),
+    
+    ?verify_mnesia(Ns, []).
+
+info(suite) -> [];
+info(doc) -> [];
+info(Config) ->
+    Ns = init_testcases(ram_copies, Config),
+    Q1 = handle(recs(), 
+		<<"[Q || Q = #a{k={_,9}} <- mnesia:table(a)]"
+		 >>),
+    
+    Q2 = handle(recs(), 
+		<<"[Q || Q = #a{k={a,9}} <- mnesia:table(a)]"
+		 >>),
+    
+    Q3 = handle(recs(), 
+		<<"[Q || Q = #a{v=91} <- mnesia:table(a)]"
+		 >>),
+    
+    %% FIXME compile and check results!
+    
+    ?match(ok,io:format("~s~n",[qlc:info(Q1)])),
+    ?match(ok,io:format("~s~n",[qlc:info(Q2)])),
+    ?match(ok,io:format("~s~n",[qlc:info(Q3)])),
+ 
+    ?verify_mnesia(Ns, []).
+
+ok(Fun,A) ->
+    case mnesia:transaction(Fun,A) of
+	{atomic, R} -> R;
+	E -> E
+    end.
+
+
+mnesia_down(suite) -> [];
+mnesia_down(doc) ->
+    ["Test bug OTP-7968, which crashed mnesia when a"
+     "mnesia_down came after qlc had been invoked"];
+mnesia_down(Config) when is_list(Config) ->
+    [N1,N2] = init_testcases(ram_copies,Config),
+    QB = handle(<<"[Q || Q = {_,{_,Key},Val} <- mnesia:table(b),"
+		 "     Val == Key - 90]">>),
+
+    Tester = self(),    
+    
+    Eval = fun() -> 
+		   Cursor = qlc:cursor(QB), %% Forces another process
+		   Res = qlc:next_answers(Cursor),
+		   Tester ! {qlc, self(), Res},
+		   {Mod, Tid, Ts} = get(mnesia_activity_state),
+		   receive
+		       continue ->
+			   io:format("Continuing ~p ~p ~n",[self(), {Mod, Tid, Ts}]),
+			   io:format("ETS ~p~n",[ets:tab2list(element(2,Ts))]),
+			   io:format("~p~n",[process_info(self(),messages)]),
+			   Res
+		   end
+	   end,
+    spawn(fun() -> TransRes = mnesia:transaction(Eval), Tester ! {test,TransRes} end),
+
+    TMInfo = fun() ->
+		     TmInfo = mnesia_tm:get_info(5000),
+		     mnesia_tm:display_info(user, TmInfo)
+	     end,
+    receive
+	{qlc, QPid, QRes} ->
+	    ?match([{b,{b,95},5}], QRes),
+	    TMInfo(),
+	    mnesia_test_lib:kill_mnesia([N2]),
+	    %%timer:sleep(1000),
+	    QPid ! continue
+    after 2000 ->
+	    exit(timeout1)
+    end,
+
+    receive
+	{test, QRes2} ->
+	    ?match({atomic, [{b,{b,95},5}]}, QRes2)
+    after 2000 ->
+	    exit(timeout2)
+    end,
+    
+    ?verify_mnesia([N1], [N2]).
+
+
+nested_qlc(suite) -> [];
+nested_qlc(doc) ->
+    ["Test bug in OTP-7968 (the second problem) where nested"
+     "transaction don't work as expected"];
+nested_qlc(Config) when is_list(Config) ->
+    Ns = init_testcases(ram_copies,Config),    
+    Res = as_with_bs(),
+    ?match([_|_], Res),
+    top_as_with_some_bs(10),
+    
+    ?verify_mnesia(Ns, []).
+
+
+%% Code from Daniel 
+bs_by_a_id(A_id) ->
+    find(qlc:q([ B || B={_,_,F_id} <- mnesia:table(b), F_id == A_id])).
+
+as_with_bs() ->
+    find(qlc:q([ {A,bs_by_a_id(Id)} ||
+		   A = {_, {a,Id}, _} <- mnesia:table(a)])).
+
+top_as_with_some_bs(Limit) ->
+    top(
+      qlc:q([ {A,bs_by_a_id(Id)} ||
+		A = {_, {a,Id}, _} <- mnesia:table(a)]),
+      Limit,
+      fun(A1,A2) -> A1 < A2  end
+     ).
+
+% --- utils
+
+find(Q) ->
+    F = fun() -> qlc:e(Q) end,
+    {atomic, Res} = mnesia:transaction(F),
+    Res.
+
+% --- it returns top Limit results from query Q ordered by Order sort function
+top(Q, Limit, Order) ->
+    Do = fun() ->
+		 OQ = qlc:sort(Q, [{order,Order}]),
+		 QC = qlc:cursor(OQ),
+		 Res = qlc:next_answers(QC, Limit),
+		 qlc:delete_cursor(QC),
+		 Res
+	 end,
+    {atomic, Res} = mnesia:transaction(Do),
+    Res.
+
+%% To keep mnesia suite backward compatible,
+%% we compile the queries in runtime when qlc is available
+%% Compiles and returns a handle to a qlc
+handle(Expr) ->
+    handle(<<>>,Expr).
+handle(Records,Expr) ->
+    case catch handle2(Records,Expr) of
+	{ok, Handle} ->
+	    Handle;
+	Else ->
+	    ?match(ok, Else)
+    end.
+
+handle2(Records,Expr) ->
+    {FN,Mod} = temp_name(),
+    ModStr = list_to_binary("-module(" ++ atom_to_list(Mod) ++ ").\n"),
+    Prog = <<
+	    ModStr/binary,
+	    "-include_lib(\"stdlib/include/qlc.hrl\").\n",
+	    "-export([tmp/0]).\n",
+	    Records/binary,"\n",
+	    "tmp() ->\n",
+%%	    "   _ = (catch throw(fvalue_not_reset)),"
+	    "   qlc:q( ",
+	    Expr/binary,").\n">>,
+
+    ?match(ok,file:write_file(FN,Prog)),
+    {ok,Forms} = epp:parse_file(FN,"",""),
+    {ok,Mod,Bin} = compile:forms(Forms),
+    code:load_binary(Mod,FN,Bin),
+    {ok, Mod:tmp()}.
+
+setup(Config) ->
+    put(mts_config,Config),
+    put(mts_tf_counter,0).
+
+temp_name() ->
+    Conf = get(mts_config),
+    C = get(mts_tf_counter),
+    put(mts_tf_counter,C+1),
+    {filename:join([proplists:get_value(priv_dir,Conf, "."),
+		    "tempfile"++integer_to_list(C)++".tmp"]),
+     list_to_atom("tmp" ++ integer_to_list(C))}.
diff --git a/lib/mnesia/test/mnesia_recovery_test.erl b/lib/mnesia/test/mnesia_recovery_test.erl
new file mode 100644
index 0000000000..625e6e824c
--- /dev/null
+++ b/lib/mnesia/test/mnesia_recovery_test.erl
@@ -0,0 +1,1638 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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(mnesia_recovery_test).
+-author('[email protected]').
+-compile([export_all]).
+
+-include("mnesia_test_lib.hrl").
+-include_lib("kernel/include/file.hrl").
+
+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).
+
+-define(receive_messages(Msgs), receive_messages(Msgs, ?FILE, ?LINE)).
+
+% First Some debug logging 
+-define(dgb, true).
+-ifdef(dgb).
+-define(dl(X, Y), ?verbose("**TRACING: " ++ X ++ "**~n", Y)).
+-else. 
+-define(dl(X, Y), ok).
+-endif.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+all() -> 
+    [{group, mnesia_down}, {group, explicit_stop},
+     coord_dies, {group, schema_trans}, {group, async_dirty},
+     {group, sync_dirty}, {group, sym_trans},
+     {group, asym_trans}, after_full_disc_partition,
+     {group, after_corrupt_files}, disc_less, garb_decision,
+     system_upgrade].
+
+groups() -> 
+    [{schema_trans, [],
+      [{mnesia_schema_recovery_test, all}]},
+     {mnesia_down, [],
+      [{group, mnesia_down_during_startup},
+       {group, master_node_tests}, {group, read_during_down},
+       {group, with_checkpoint}, delete_during_start]},
+     {master_node_tests, [],
+      [no_master_2, no_master_3, one_master_2, one_master_3,
+       two_master_2, two_master_3, all_master_2,
+       all_master_3]},
+     {read_during_down, [],
+      [dirty_read_during_down, trans_read_during_down]},
+     {mnesia_down_during_startup, [],
+      [mnesia_down_during_startup_disk_ram,
+       mnesia_down_during_startup_init_ram,
+       mnesia_down_during_startup_init_disc,
+       mnesia_down_during_startup_init_disc_only,
+       mnesia_down_during_startup_tm_ram,
+       mnesia_down_during_startup_tm_disc,
+       mnesia_down_during_startup_tm_disc_only]},
+     {with_checkpoint, [],
+      [with_checkpoint_same, with_checkpoint_other]},
+     {explicit_stop, [], [explicit_stop_during_snmp]},
+     {sym_trans, [],
+      [sym_trans_before_commit_kill_coord_node,
+       sym_trans_before_commit_kill_coord_pid,
+       sym_trans_before_commit_kill_part_after_ask,
+       sym_trans_before_commit_kill_part_before_ask,
+       sym_trans_after_commit_kill_coord_node,
+       sym_trans_after_commit_kill_coord_pid,
+       sym_trans_after_commit_kill_part_after_ask,
+       sym_trans_after_commit_kill_part_do_commit_pre,
+       sym_trans_after_commit_kill_part_do_commit_post]},
+     {sync_dirty, [],
+      [sync_dirty_pre_kill_part,
+       sync_dirty_pre_kill_coord_node,
+       sync_dirty_pre_kill_coord_pid,
+       sync_dirty_post_kill_part,
+       sync_dirty_post_kill_coord_node,
+       sync_dirty_post_kill_coord_pid]},
+     {async_dirty, [],
+      [async_dirty_pre_kill_part,
+       async_dirty_pre_kill_coord_node,
+       async_dirty_pre_kill_coord_pid,
+       async_dirty_post_kill_part,
+       async_dirty_post_kill_coord_node,
+       async_dirty_post_kill_coord_pid]},
+     {asym_trans, [],
+      [asym_trans_kill_part_ask,
+       asym_trans_kill_part_commit_vote,
+       asym_trans_kill_part_pre_commit,
+       asym_trans_kill_part_log_commit,
+       asym_trans_kill_part_do_commit,
+       asym_trans_kill_coord_got_votes,
+       asym_trans_kill_coord_pid_got_votes,
+       asym_trans_kill_coord_log_commit_rec,
+       asym_trans_kill_coord_pid_log_commit_rec,
+       asym_trans_kill_coord_log_commit_dec,
+       asym_trans_kill_coord_pid_log_commit_dec,
+       asym_trans_kill_coord_rec_acc_pre_commit_log_commit,
+       asym_trans_kill_coord_pid_rec_acc_pre_commit_log_commit,
+       asym_trans_kill_coord_rec_acc_pre_commit_done_commit,
+       asym_trans_kill_coord_pid_rec_acc_pre_commit_done_commit]},
+     {after_corrupt_files, [],
+      [after_corrupt_files_decision_log_head,
+       after_corrupt_files_decision_log_tail,
+       after_corrupt_files_latest_log_head,
+       after_corrupt_files_latest_log_tail,
+       after_corrupt_files_table_dat_head,
+       after_corrupt_files_table_dat_tail,
+       after_corrupt_files_schema_dat_head,
+       after_corrupt_files_schema_dat_tail]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+tpcb_config(ReplicaType, _NodeConfig, Nodes) ->
+    [{n_branches, 5},
+     {n_drivers_per_node, 5},
+     {replica_nodes, Nodes},
+     {driver_nodes, Nodes},
+     {use_running_mnesia, true},
+     {report_interval, infinity},
+     {n_accounts_per_branch, 20},
+     {replica_type, ReplicaType}].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+no_master_2(suite) -> [];
+no_master_2(Config) when is_list(Config) ->    mnesia_down_2(no, Config).
+    
+no_master_3(suite) -> [];
+no_master_3(Config) when is_list(Config) ->    mnesia_down_3(no, Config).
+
+one_master_2(suite) -> [];
+one_master_2(Config) when is_list(Config) ->   mnesia_down_2(one, Config).
+
+one_master_3(suite) -> [];
+one_master_3(Config) when is_list(Config) ->   mnesia_down_3(one, Config).
+
+two_master_2(suite) -> [];
+two_master_2(Config) when is_list(Config) ->   mnesia_down_2(two, Config).
+
+two_master_3(suite) -> [];
+two_master_3(Config) when is_list(Config) ->   mnesia_down_3(two, Config).
+
+all_master_2(suite) -> [];
+all_master_2(Config) when is_list(Config) ->   mnesia_down_2(all, Config).
+
+all_master_3(suite) -> [];
+all_master_3(Config) when is_list(Config) ->   mnesia_down_3(all, Config).
+
+mnesia_down_2(Masters, Config) -> 
+    Nodes = [N1, N2] = ?acquire_nodes(2, Config),
+    ?match({atomic, ok}, mnesia:create_table(tab1, [{ram_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(tab2, [{disc_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(tab3, [{disc_only_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(tab4, [{ram_copies, [N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab5, [{ram_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab6, [{disc_copies, [N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab7, [{disc_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab8, [{disc_only_copies, [N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab9, [{disc_only_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab10, [{ram_copies, [N1]}, {disc_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab11, [{ram_copies, [N2]}, {disc_copies, [N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab12, [{ram_copies, [N1]}, {disc_only_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab13, [{ram_copies, [N2]}, {disc_only_copies, [N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab14, [{disc_only_copies, [N1]}, {disc_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab15, [{disc_only_copies, [N2]}, {disc_copies, [N1]}])),
+
+    Tabs = [tab1, tab2, tab3, tab4, tab5, tab6, tab7, tab8, 
+	    tab9, tab10, tab11, tab12, tab13, tab14, tab15],
+    [?match(ok, rpc:call(Node, mnesia, wait_for_tables, [Tabs, 10000])) || Node <- Nodes],
+    [insert_data(Tab, 20) || Tab <- Tabs],
+
+    VTabs =
+	case Masters of
+	    no ->
+		Tabs -- [tab4, tab5]; % ram copies
+	    one ->
+		?match(ok, rpc:call(N1, mnesia, set_master_nodes, [[N1]])),
+		Tabs -- [tab1, tab4, tab5, tab10, tab12]; % ram_copies
+	    two ->
+		?match(ok, rpc:call(N1, mnesia, set_master_nodes, [Nodes])),
+		Tabs -- [tab4, tab5];
+	    all -> 
+		[?match(ok, rpc:call(Node, mnesia, set_master_nodes, [[Node]])) || Node <- Nodes],
+		Tabs -- [tab1, tab4, tab5, tab10, tab11, tab12, tab13]
+	end,
+
+    mnesia_test_lib:kill_mnesia([N1]),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, Tabs)),
+
+    ?match([], mnesia_test_lib:kill_mnesia([N2])),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, Tabs)),
+
+    [?match(ok, rpc:call(N1, ?MODULE, verify_data, [Tab, 20])) || Tab <- VTabs],
+    [?match(ok, rpc:call(N2, ?MODULE, verify_data, [Tab, 20])) || Tab <- VTabs],
+    ?verify_mnesia(Nodes, []).
+
+mnesia_down_3(Masters, Config) -> 
+    Nodes = [N1, N2, N3] = ?acquire_nodes(3, Config),
+    ?match({atomic, ok}, mnesia:create_table(tab1, [{ram_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(tab2, [{disc_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(tab3, [{disc_only_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(tab4, [{ram_copies, [N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab5, [{ram_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab16, [{ram_copies, [N3]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab6, [{disc_copies, [N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab7, [{disc_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab17, [{disc_copies, [N3]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab8, [{disc_only_copies, [N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab9, [{disc_only_copies, [N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab18, [{disc_only_copies, [N3]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab10, [{ram_copies, [N1]}, {disc_copies, [N2, N3]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab11, [{ram_copies, [N2]}, {disc_copies, [N3, N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab19, [{ram_copies, [N3]}, {disc_copies, [N1, N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab12, [{ram_copies, [N1]}, {disc_only_copies, [N2, N3]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab13, [{ram_copies, [N2]}, {disc_only_copies, [N3, N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab20, [{ram_copies, [N3]}, {disc_only_copies, [N1, N2]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab14, [{disc_only_copies, [N1]}, {disc_copies, [N2, N3]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab15, [{disc_only_copies, [N2]}, {disc_copies, [N3, N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab21, [{disc_only_copies, [N3]}, {disc_copies, [N1, N2]}])),
+
+    Tabs = [tab1, tab2, tab3, tab4, tab5, tab6, tab7, tab8, 
+	    tab9, tab10, tab11, tab12, tab13, tab14, tab15,
+	    tab16, tab17, tab18, tab19, tab20, tab21],
+    [?match(ok, rpc:call(Node, mnesia, wait_for_tables, [Tabs, 10000])) || Node <- Nodes],
+    [insert_data(Tab, 20) || Tab <- Tabs],
+
+    VTabs = 
+	case Masters of
+	    no ->
+		Tabs -- [tab4, tab5, tab16]; % ram copies
+	    one ->
+		?match(ok, rpc:call(N1, mnesia, set_master_nodes, [[N1]])),
+		Tabs -- [tab1, tab4, tab5, tab16, tab10, tab12]; % ram copies
+	    two ->
+		?match(ok, rpc:call(N1, mnesia, set_master_nodes, [Nodes])),
+		Tabs -- [tab4, tab5, tab16]; % ram copies
+	    all -> 
+		[?match(ok, rpc:call(Node, mnesia, set_master_nodes, [[Node]])) || Node <- Nodes],
+		Tabs -- [tab1, tab4, tab5, tab16, tab10, 
+			 tab11, tab19, tab12, tab13, tab20] % ram copies
+	end,
+    
+    mnesia_test_lib:kill_mnesia([N1]),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, Tabs)),
+    
+    ?match([], mnesia_test_lib:kill_mnesia([N2])),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, Tabs)),
+
+    ?match([], mnesia_test_lib:kill_mnesia([N3])),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, Tabs)),
+
+    ?match([], mnesia_test_lib:kill_mnesia([N2, N1])),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, Tabs)),
+
+    ?match([], mnesia_test_lib:kill_mnesia([N2, N3])),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, Tabs)),
+
+    ?match([], mnesia_test_lib:kill_mnesia([N1, N3])),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, Tabs)),
+
+    [?match(ok, rpc:call(N1, ?MODULE, verify_data, [Tab, 20])) || Tab <- VTabs],
+    [?match(ok, rpc:call(N2, ?MODULE, verify_data, [Tab, 20])) || Tab <- VTabs],
+    [?match(ok, rpc:call(N3, ?MODULE, verify_data, [Tab, 20])) || Tab <- VTabs],
+    
+    ?verify_mnesia(Nodes, []).
+
+
+
+dirty_read_during_down(suite) ->
+    [];
+dirty_read_during_down(Config) when is_list(Config) ->
+    read_during_down(dirty, Config).
+
+trans_read_during_down(suite) ->
+    [];
+trans_read_during_down(Config) when is_list(Config) ->
+    read_during_down(trans, Config).
+
+
+read_during_down(Op, Config) when is_list(Config) ->
+    Ns = [N1|TNs] = ?acquire_nodes(3, Config),
+    Tabs = [ram, disc, disco],
+    
+    ?match({atomic, ok}, mnesia:create_table(ram, [{ram_copies, TNs}])),
+    ?match({atomic, ok}, mnesia:create_table(disc, [{disc_copies, TNs}])),
+    ?match({atomic, ok}, mnesia:create_table(disco, [{disc_only_copies, TNs}])),
+
+    %% Create some work for mnesia_controller when a node goes down
+    [{atomic, ok} = mnesia:create_table(list_to_atom("temp" ++ integer_to_list(N)),
+					[{ram_copies, Ns}]) || N <- lists:seq(1, 50)],    
+    
+    Write = fun(Tab) -> mnesia:write({Tab, key, val}) end,
+    ?match([ok,ok,ok],
+	   [mnesia:sync_dirty(Write, [Tab]) || Tab <- Tabs]),
+    
+    Readers = [spawn_link(N1, ?MODULE, reader, [Tab, Op]) || Tab <- Tabs],
+    [_|_] = W2R= [mnesia:table_info(Tab, where_to_read) || Tab <- Tabs],
+    ?log("W2R ~p~n", [W2R]),
+    loop_and_kill_mnesia(10, hd(W2R), Tabs),
+    [Pid ! self() || Pid <- Readers],
+    ?match([ok, ok, ok], [receive ok -> ok after 1000 -> {Pid, mnesia_lib:dist_coredump()} end || Pid <- Readers]),
+    ?verify_mnesia(Ns, []).
+
+reader(Tab, OP) ->
+    Res = case OP of 
+	      dirty ->
+		  catch mnesia:dirty_read({Tab, key});
+	      trans ->
+		  Read = fun() -> mnesia:read({Tab, key}) end,
+		  {_, Temp} = mnesia:transaction(Read),
+		  Temp
+	  end,
+    case Res of 
+	[{Tab, key, val}] -> ok;
+	Else -> 
+	    ?error("Expected ~p Got ~p ~n", [[{Tab, key, val}], Else]),
+	    erlang:error(test_failed)
+    end,
+    receive Pid ->
+	    Pid ! ok
+    after 50 ->
+	    reader(Tab, OP)
+    end.
+
+loop_and_kill_mnesia(0, _Node, _Tabs) -> ok;
+loop_and_kill_mnesia(N, Node, Tabs) ->
+    mnesia_test_lib:kill_mnesia([Node]),
+    timer:sleep(100), 
+    ?match([], mnesia_test_lib:start_mnesia([Node], Tabs)),
+    [KN | _] = W2R= [mnesia:table_info(Tab, where_to_read) || Tab <- Tabs],
+    ?match([KN, KN,KN], W2R),
+    timer:sleep(100), 
+    loop_and_kill_mnesia(N-1, KN, Tabs).
+
+
+mnesia_down_during_startup_disk_ram(suite) -> [];
+mnesia_down_during_startup_disk_ram(Config) when is_list(Config)->
+    [Node1, Node2] = ?acquire_nodes(2, Config ++ 
+				    [{tc_timeout, timer:minutes(2)}]),
+    Tab = down_during_startup,
+    Def = [{ram_copies, [Node2]}, {disc_copies, [Node1]}],
+    
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    ?match(ok, mnesia:dirty_write({Tab, 876234, test_ok})),
+    timer:sleep(500),
+    mnesia_test_lib:kill_mnesia([Node1, Node2]),
+    timer:sleep(500),
+    mnesia_test_lib:start_mnesia([Node1, Node2], [Tab]),
+    mnesia_test_lib:kill_mnesia([Node1]),
+    timer:sleep(500),
+    ?match([], mnesia_test_lib:start_mnesia([Node1], [Tab])),
+    ?match([{Tab, 876234, test_ok}], mnesia:dirty_read({Tab,876234})),
+    ?verify_mnesia([Node1, Node2], []).
+    
+mnesia_down_during_startup_init_ram(suite) -> [];
+mnesia_down_during_startup_init_ram(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    DP = {mnesia_loader, do_get_network_copy},
+    Type = ram_copies,
+    mnesia_down_during_startup2(Config, Type, DP, self()).
+
+mnesia_down_during_startup_init_disc(suite)  -> [];
+mnesia_down_during_startup_init_disc(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    DP = {mnesia_loader, do_get_network_copy},
+    Type = disc_copies,
+    mnesia_down_during_startup2(Config, Type, DP, self()).
+
+mnesia_down_during_startup_init_disc_only(suite) -> [];
+mnesia_down_during_startup_init_disc_only(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    DP = {mnesia_loader, do_get_network_copy},
+    Type = disc_only_copies,
+    mnesia_down_during_startup2(Config, Type, DP, self()).
+
+mnesia_down_during_startup_tm_ram(suite) -> [];
+mnesia_down_during_startup_tm_ram(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    DP = {mnesia_tm, init},
+    Type = ram_copies,
+    mnesia_down_during_startup2(Config, Type, DP, self()).
+
+mnesia_down_during_startup_tm_disc(suite) -> [];
+mnesia_down_during_startup_tm_disc(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    DP = {mnesia_tm, init},
+    Type = disc_copies,
+    mnesia_down_during_startup2(Config, Type, DP, self()).
+
+mnesia_down_during_startup_tm_disc_only(suite) -> [];
+mnesia_down_during_startup_tm_disc_only(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    DP = {mnesia_tm, init},
+    Type = disc_only_copies,
+    mnesia_down_during_startup2(Config, Type, DP, self()).
+
+mnesia_down_during_startup2(Config, ReplicaType, Debug_Point, _Father) -> 
+    ?log("TC~n mnesia_down_during_startup with type ~w and stops at ~w~n",
+	 [ReplicaType, Debug_Point]),
+    Tpcb_tabs = [history,teller,account,branch],
+    Nodes = ?acquire_nodes(2, Config),
+    Node1 = hd(Nodes),
+    {success, [A]} = ?start_activities([Node1]),
+    TpcbConfig = tpcb_config(ReplicaType, 2, Nodes),
+    mnesia_tpcb:init(TpcbConfig),
+    A ! fun () -> mnesia_tpcb:run(TpcbConfig) end,
+    ?match_receive(timeout),
+    timer:sleep(timer:seconds(10)),  % Let tpcb run for a while
+    mnesia_tpcb:stop(),
+    ?match(ok, mnesia_tpcb:verify_tabs()), 
+    mnesia_test_lib:kill_mnesia([Node1]),
+    timer:sleep(timer:seconds(2)),
+    Self = self(),
+    TestFun = fun(_MnesiaEnv, _EvalEnv) ->
+		      ?deactivate_debug_fun(Debug_Point),
+		      Self ! fun_done, 
+		      spawn(mnesia_test_lib, kill_mnesia, [[Node1]])
+	      end,    
+    ?activate_debug_fun(Debug_Point, TestFun, []),      % Kill when debug has been reached
+    mnesia:start(),
+    Res = receive fun_done -> ok after timer:minutes(3) -> timeout end, % Wait till it's killed
+    ?match(ok, Res),
+    ?match(ok, timer:sleep(timer:seconds(2))), % Wait a while, at least till it dies;
+    ?match([], mnesia_test_lib:start_mnesia([Node1], Tpcb_tabs)),  
+    ?match(ok, mnesia_tpcb:verify_tabs()), % Verify it
+    ?verify_mnesia(Nodes, []).    	    
+
+
+
+with_checkpoint_same(suite) -> [];
+with_checkpoint_same(Config) when is_list(Config) -> 
+    with_checkpoint(Config, same).
+
+with_checkpoint_other(suite) -> [];
+with_checkpoint_other(Config) when is_list(Config) -> 
+    with_checkpoint(Config, other).
+
+with_checkpoint(Config, Type) when is_list(Config) ->
+    Nodes = [Node1, Node2] = ?acquire_nodes(2, Config),
+    Kill = case Type of
+	       same ->    %% Node1 is the one used for creating the checkpoint
+		   Node1; %% and which we bring down
+	       other ->
+		   Node2  %% Here we bring node2 down..
+	   end,
+    
+    ?match({atomic, ok}, mnesia:create_table(ram, [{ram_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(disc, [{disc_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(disco, [{disc_only_copies, Nodes}])),
+    Tabs = [ram, disc, disco],
+    
+    ?match({ok, sune, _}, mnesia:activate_checkpoint([{name, sune}, 
+						      {max, mnesia:system_info(tables)}, 
+						      {ram_overrides_dump, true}])),
+
+    ?match([], check_retainers(sune, Nodes)),
+    
+    ?match(ok, mnesia:deactivate_checkpoint(sune)),
+    ?match([], check_chkp(Nodes)),
+    
+    timer:sleep(500),  %% Just to help debugging the io:formats now comes in the
+    %% correct order... :-)    
+
+    ?match({ok, sune, _}, mnesia:activate_checkpoint([{name, sune}, 
+	{max, mnesia:system_info(tables)}, 
+	{ram_overrides_dump, true}])),
+
+    [[mnesia:dirty_write({Tab,Key,Key}) || Key <- lists:seq(1,10)] || Tab <- Tabs],
+
+    mnesia_test_lib:kill_mnesia([Kill]),
+    timer:sleep(100),     
+    mnesia_test_lib:start_mnesia([Kill], Tabs),
+    io:format("Mnesia on ~p started~n", [Kill]),
+    ?match([], check_retainers(sune, Nodes)),
+    ?match(ok, mnesia:deactivate_checkpoint(sune)),
+    ?match([], check_chkp(Nodes)),
+
+    case Kill of
+	Node1 -> 
+	    ignore;
+	Node2 ->
+	    mnesia_test_lib:kill_mnesia([Kill]),
+	    timer:sleep(500),  %% Just to help debugging
+	    ?match({ok, sune, _}, mnesia:activate_checkpoint([{name, sune}, 
+		{max, mnesia:system_info(tables)}, 
+		{ram_overrides_dump, true}])),
+
+	    [[mnesia:dirty_write({Tab,Key,Key+2}) || Key <- lists:seq(1,10)] ||
+		Tab <- Tabs],
+
+	    mnesia_test_lib:start_mnesia([Kill], Tabs),
+	    io:format("Mnesia on ~p started ~n", [Kill]),
+	    ?match([], check_retainers(sune, Nodes)),
+	    ?match(ok, mnesia:deactivate_checkpoint(sune)),
+	    ?match([], check_chkp(Nodes)),	    
+	    ok
+    end,
+    ?verify_mnesia(Nodes, []).
+
+check_chkp(Nodes) ->
+    {Good, Bad} = rpc:multicall(Nodes, ?MODULE, check, []),
+    lists:flatten(Good ++ Bad).
+
+check() ->
+    [PCP] = ets:match_object(mnesia_gvar, {pending_checkpoint_pids, '_'}),
+    [PC]  = ets:match_object(mnesia_gvar, {pending_checkpoints, '_'}),
+    [CPN] = ets:match_object(mnesia_gvar, {checkpoints, '_'}),    
+    F = lists:filter(fun({_, []}) -> false; (_W) -> true end, 
+		     [PCP,PC,CPN]),    
+    CPP = ets:match_object(mnesia_gvar, {{checkpoint, '_'}, '_'}),
+    Rt  = ets:match_object(mnesia_gvar, {{'_', {retainer, '_'}}, '_'}),
+    F ++ CPP ++ Rt.
+
+
+check_retainers(CHP, Nodes) ->
+    {[R1,R2], []} = rpc:multicall(Nodes, ?MODULE, get_all_retainers, [CHP]),
+    (R1 -- R2) ++ (R2 -- R1).
+        
+get_all_retainers(CHP) ->
+    Tabs = mnesia:system_info(local_tables),
+    Iter = fun(Tab) ->
+		   {ok, Res} = 
+		       mnesia_checkpoint:iterate(CHP, Tab, fun(R, A) -> [R|A] end, [],
+						 retainer, checkpoint),
+%%		   io:format("Retainer content ~w ~n", [Res]),
+		   Res
+	   end,
+    Elements = [Iter(Tab) || Tab <- Tabs],
+    lists:sort(lists:flatten(Elements)).
+    
+delete_during_start(doc) ->
+    ["Test that tables can be delete during start, hopefully with tables"
+     " in the loader queue or soon to be"];
+delete_during_start(suite) -> [];
+delete_during_start(Config) when is_list(Config) ->
+    [N1, N2, N3] = Nodes = ?acquire_nodes(3, Config),
+    Tabs = [list_to_atom("tab" ++ integer_to_list(I)) || I <- lists:seq(1, 30)],
+    ?match({atomic, ok}, mnesia:change_table_copy_type(schema, N2, ram_copies)),
+    ?match({atomic, ok}, mnesia:change_table_copy_type(schema, N3, ram_copies)),
+
+    [?match({atomic, ok},mnesia:create_table(Tab, [{ram_copies,Nodes}])) || Tab <- Tabs],
+    lists:foldl(fun(Tab, I) ->
+			?match({atomic, ok},
+			       mnesia:change_table_load_order(Tab,I)),
+			I+1
+		end, 1, Tabs),
+    mnesia_test_lib:kill_mnesia([N2,N3]),
+%%    timer:sleep(500),
+    ?match({[ok,ok],[]}, rpc:multicall([N2,N3], mnesia,start, 
+				       [[{extra_db_nodes,[N1]}]])),
+    [Tab1,Tab2,Tab3|_] = Tabs,
+    ?match({atomic, ok}, mnesia:delete_table(Tab1)),
+    ?match({atomic, ok}, mnesia:delete_table(Tab2)),
+    
+    ?log("W4T ~p~n", [rpc:multicall([N2,N3], mnesia, wait_for_tables, [[Tab1,Tab2,Tab3],1])]),
+    
+    Remain = Tabs--[Tab1,Tab2],
+    ?match(ok, rpc:call(N2, mnesia, wait_for_tables, [Remain,10000])),
+    ?match(ok, rpc:call(N3, mnesia, wait_for_tables, [Remain,10000])),
+
+    ?match(ok, rpc:call(N2, ?MODULE, verify_where2read, [Remain])),
+    ?match(ok, rpc:call(N3, ?MODULE, verify_where2read, [Remain])),
+
+    ?verify_mnesia(Nodes, []).
+    
+verify_where2read([Tab|Tabs]) ->
+    true = (node() == mnesia:table_info(Tab,where_to_read)),
+    verify_where2read(Tabs);
+verify_where2read([]) -> ok.
+
+
+%%-------------------------------------------------------------------------------------------
+%% This is a bad implementation, but at least gives a indication if something is wrong
+explicit_stop_during_snmp(suite) -> [];
+explicit_stop_during_snmp(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(2, Config),
+    [Node1, Node2] = Nodes,
+    Tab = snmp_tab,
+    Def = [{attributes, [key, value]},
+	   {snmp, [{key, integer}]},
+	   {mnesia_test_lib:storage_type(disc_copies, Config), 
+	    [Node1, Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write({Tab, 1, 1}) end)),
+
+    Do_trans_Pid1 = spawn_link(Node2, ?MODULE, do_trans_loop, [Tab, self()]),
+    Do_trans_Pid2 = spawn_link(?MODULE, do_trans_loop, [Tab, self()]),
+    Start_stop_Pid = spawn_link(?MODULE, start_stop, [Node1, 10, self()]),
+    receive 
+	test_done -> 
+	    ok
+    after timer:minutes(5) ->
+	    ?error("test case time out~n", [])
+    end,
+    ?verify_mnesia(Nodes, []),
+    exit(Do_trans_Pid1, kill),
+    exit(Do_trans_Pid2, kill),
+    exit(Start_stop_Pid, kill),
+    ok.
+
+do_trans_loop(Tab, Father) ->
+    %% Do not trap exit
+    do_trans_loop2(Tab, Father).
+do_trans_loop2(Tab, Father) ->
+    Trans =
+	fun() ->
+		[{Tab, 1, Val}] = mnesia:read({Tab, 1}),
+		mnesia:write({Tab, 1, Val + 1})
+	end,
+    case mnesia:transaction(Trans) of
+	{atomic, ok} ->
+	    timer:sleep(200),
+	    do_trans_loop2(Tab, Father);
+	{aborted, {node_not_running, N}} when N == node() ->
+	    timer:sleep(200),
+	    do_trans_loop2(Tab, Father);
+	{aborted, {no_exists, Tab}} ->
+	    timer:sleep(200),
+	    do_trans_loop2(Tab, Father);
+	Else ->
+	    ?error("Transaction failed: ~p ~n", [Else]),
+	    Father ! test_done,
+	    exit(shutdown)
+    end.
+
+start_stop(_Node1, 0, Father) ->
+    Father ! test_done,
+    exit(shutdown);
+start_stop(Node1, N, Father) when N > 0->
+    timer:sleep(timer:seconds(5)),
+    ?match(stopped, rpc:call(Node1, mnesia, stop, [])),
+    timer:sleep(timer:seconds(2)),
+    ?match([], mnesia_test_lib:start_mnesia([Node1])),
+    start_stop(Node1, N-1, Father).    
+
+coord_dies(suite) -> [];
+coord_dies(doc) -> [""];
+coord_dies(Config) when is_list(Config) ->
+    Nodes = [N1, N2] = ?acquire_nodes(2, Config),
+    ?match({atomic, ok}, mnesia:create_table(tab1, [{ram_copies, Nodes}])),
+    ?match({atomic, ok}, mnesia:create_table(tab2, [{ram_copies, [N1]}])),
+    ?match({atomic, ok}, mnesia:create_table(tab3, [{ram_copies, [N2]}])),
+    Tester = self(),
+
+    U1 = fun(Tab) -> 
+		 [{Tab,key,Val}] = mnesia:read(Tab,key,write),
+		 mnesia:write({Tab,key, Val+1}),
+		 Tester ! {self(),continue},
+		 receive 
+		     continue -> exit(crash)
+		 end
+	 end,
+    U2 = fun(Tab) -> 
+		 [{Tab,key,Val}] = mnesia:read(Tab,key,write),
+		 mnesia:write({Tab,key, Val+1}),
+		 mnesia:transaction(U1, [Tab])
+	 end,
+    [mnesia:dirty_write(Tab,{Tab,key,0}) || Tab <- [tab1,tab2,tab3]],
+    Pid1 = spawn(fun() -> mnesia:transaction(U2, [tab1]) end), 
+    Pid2 = spawn(fun() -> mnesia:transaction(U2, [tab2]) end), 
+    Pid3 = spawn(fun() -> mnesia:transaction(U2, [tab3]) end), 
+    [receive {Pid,continue} -> ok end || Pid <- [Pid1,Pid2,Pid3]],
+    Pid1 ! continue,    Pid2 ! continue,    Pid3 ! continue,
+    ?match({atomic,[{_,key,1}]}, mnesia:transaction(fun() -> mnesia:read({tab1,key}) end)),
+    ?match({atomic,[{_,key,1}]}, mnesia:transaction(fun() -> mnesia:read({tab2,key}) end)),
+    ?match({atomic,[{_,key,1}]}, mnesia:transaction(fun() -> mnesia:read({tab3,key}) end)),
+
+    Pid4 = spawn(fun() -> mnesia:transaction(U2, [tab1]) end), 
+    Pid5 = spawn(fun() -> mnesia:transaction(U2, [tab2]) end), 
+    Pid6 = spawn(fun() -> mnesia:transaction(U2, [tab3]) end), 
+    erlang:monitor(process, Pid4),erlang:monitor(process, Pid5),erlang:monitor(process, Pid6),
+    
+    [receive {Pid,continue} -> ok end || Pid <- [Pid4,Pid5,Pid6]],
+    exit(Pid4,crash),    
+    ?match_receive({'DOWN',_,_,Pid4, _}),
+    ?match({atomic,[{_,key,1}]}, mnesia:transaction(fun() -> mnesia:read({tab1,key}) end)),
+    exit(Pid5,crash),
+    ?match_receive({'DOWN',_,_,Pid5, _}),
+    ?match({atomic,[{_,key,1}]}, mnesia:transaction(fun() -> mnesia:read({tab2,key}) end)),
+    exit(Pid6,crash),
+    ?match_receive({'DOWN',_,_,Pid6, _}),
+    ?match({atomic,[{_,key,1}]}, mnesia:transaction(fun() -> mnesia:read({tab3,key}) end)),
+    
+    ?verify_mnesia(Nodes, []).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
+
+%kill_after_debug_point(Config, TestCase, {Debug_node, Debug_Point}, TransFun, Tab)
+
+sym_trans_before_commit_kill_coord_node(suite) -> [];
+sym_trans_before_commit_kill_coord_node(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sym_trans_before_commit_kill_coord,
+    Def = [{attributes, [key, value]}, {ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    kill_after_debug_point(Coord, {Coord, {mnesia_tm, multi_commit_sym}},
+			   do_sym_trans, [{Tab, Def}], Nodes).
+
+sym_trans_before_commit_kill_coord_pid(suite) -> [];
+sym_trans_before_commit_kill_coord_pid(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sym_trans_before_commit_kill_coord,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    kill_after_debug_point(coord_pid, {Coord, {mnesia_tm, multi_commit_sym}},
+			   do_sym_trans, [{Tab, Def}], Nodes).
+
+sym_trans_before_commit_kill_part_after_ask(suite) -> [];
+sym_trans_before_commit_kill_part_after_ask(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sym_trans_before_commit_kill_part_after_ask,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    kill_after_debug_point(Part1, {Coord, {mnesia_tm, multi_commit_sym}},
+			   do_sym_trans, [{Tab, Def}], Nodes).
+
+sym_trans_before_commit_kill_part_before_ask(suite) -> [];
+sym_trans_before_commit_kill_part_before_ask(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sym_trans_before_commit_kill_part_before_ask,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, doit_ask_commit}},
+			   do_sym_trans, [{Tab, Def}], Nodes).
+
+sym_trans_after_commit_kill_coord_node(suite) -> [];
+sym_trans_after_commit_kill_coord_node(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sym_trans_after_commit_kill_coord,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    kill_after_debug_point(Coord, {Coord, {mnesia_tm, multi_commit_sym, post}},
+			  do_sym_trans, [{Tab, Def}], Nodes).
+
+sym_trans_after_commit_kill_coord_pid(suite) -> [];
+sym_trans_after_commit_kill_coord_pid(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sym_trans_after_commit_kill_coord,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    kill_after_debug_point(coord_pid, {Coord, {mnesia_tm, multi_commit_sym, post}},
+			  do_sym_trans, [{Tab,Def}], Nodes).
+
+sym_trans_after_commit_kill_part_after_ask(suite) -> [];
+sym_trans_after_commit_kill_part_after_ask(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab =  sym_trans_after_commit_kill_part_after_ask,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    kill_after_debug_point(Part1, {Coord, {mnesia_tm, multi_commit_sym, post}},
+			   do_sym_trans, [{Tab, Def}], Nodes).
+
+sym_trans_after_commit_kill_part_do_commit_pre(suite) -> [];
+sym_trans_after_commit_kill_part_do_commit_pre(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sym_trans_after_commit_kill_part_do_commit_pre,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_sym_trans,
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, do_commit, pre}},
+			   TransFun, [{Tab, Def}], Nodes).
+
+sym_trans_after_commit_kill_part_do_commit_post(suite) -> [];
+sym_trans_after_commit_kill_part_do_commit_post(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sym_trans_after_commit_kill_part_do_commit_post,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_sym_trans,
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, do_commit, post}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+do_sym_trans([Tab], _Fahter) ->
+    ?dl("Starting SYM_TRANS with active debug fun ", []),
+    Trans = fun() -> 
+		    [{_,_,Val}] = mnesia:read({Tab, 1}),
+		    mnesia:write({Tab, 1, Val+1})
+	    end,
+    Res = mnesia:transaction(Trans),
+    case Res of
+	{atomic, ok} -> ok;
+	{aborted, _Reason} -> ok;
+	Else -> ?error("Wrong output from mensia:transaction(FUN):~n ~p~n",
+		       [Else])
+    end,
+    ?dl("SYM_TRANSACTION done: ~p  (deactiv dbgfun) ", [Res]),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+sync_dirty_pre_kill_part(suite) -> [];
+sync_dirty_pre_kill_part(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sync_dirty_pre,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_sync_dirty,
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, sync_dirty, pre}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+sync_dirty_pre_kill_coord_node(suite) -> [];
+sync_dirty_pre_kill_coord_node(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sync_dirty_pre,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_sync_dirty,
+    kill_after_debug_point(Coord, {Part1, {mnesia_tm, sync_dirty, pre}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+sync_dirty_pre_kill_coord_pid(suite) -> [];
+sync_dirty_pre_kill_coord_pid(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sync_dirty_pre,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_sync_dirty,
+    kill_after_debug_point(coord_pid, {Part1, {mnesia_tm, sync_dirty, pre}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+sync_dirty_post_kill_part(suite) -> [];
+sync_dirty_post_kill_part(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sync_dirty_post,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_sync_dirty,
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, sync_dirty, post}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+sync_dirty_post_kill_coord_node(suite) -> [];
+sync_dirty_post_kill_coord_node(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sync_dirty_post,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_sync_dirty,
+    kill_after_debug_point(Coord, {Part1, {mnesia_tm, sync_dirty, post}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+sync_dirty_post_kill_coord_pid(suite) -> [];
+sync_dirty_post_kill_coord_pid(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = sync_dirty_post,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_sync_dirty,
+    kill_after_debug_point(coord_pid, {Part1, {mnesia_tm, sync_dirty, post}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+do_sync_dirty([Tab], _Father) ->
+    ?dl("Starting SYNC_DIRTY", []),
+    SYNC = fun() -> 
+		   [{_,_,Val}] = mnesia:read({Tab, 1}),
+		   mnesia:write({Tab, 1, Val+1})
+	   end,
+    {_, Res} = ?match(ok, mnesia:sync_dirty(SYNC)),
+    ?dl("SYNC_DIRTY done: ~p ", [Res]),
+    ok.
+
+
+async_dirty_pre_kill_part(suite) -> [];
+async_dirty_pre_kill_part(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = async_dirty_pre,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_async_dirty,
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, async_dirty, pre}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+async_dirty_pre_kill_coord_node(suite) -> [];
+async_dirty_pre_kill_coord_node(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = async_dirty_pre,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_async_dirty,
+    kill_after_debug_point(Coord, {Part1, {mnesia_tm, async_dirty, pre}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+async_dirty_pre_kill_coord_pid(suite) -> [];
+async_dirty_pre_kill_coord_pid(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = async_dirty_pre,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_async_dirty,
+    kill_after_debug_point(coord_pid, {Part1, {mnesia_tm, async_dirty, pre}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+async_dirty_post_kill_part(suite) -> [];
+async_dirty_post_kill_part(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = async_dirty_post,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_async_dirty,
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, async_dirty, post}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+async_dirty_post_kill_coord_node(suite) -> [];
+async_dirty_post_kill_coord_node(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = async_dirty_post,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_async_dirty,
+    kill_after_debug_point(Coord, {Part1, {mnesia_tm, async_dirty, post}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+async_dirty_post_kill_coord_pid(suite) -> [];
+async_dirty_post_kill_coord_pid(Config) when is_list(Config) ->
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab = async_dirty_post,
+    Def = [{attributes, [key, value]},{ram_copies, [Part2]},{disc_copies, [Coord, Part1]}],
+    TransFun = do_async_dirty,
+    kill_after_debug_point(coord_pid, {Part1, {mnesia_tm, async_dirty, post}}, 
+			   TransFun, [{Tab, Def}], Nodes).
+
+do_async_dirty([Tab], _Fahter) ->
+    ?dl("Starting ASYNC", []),
+    ASYNC = fun() -> 
+		    [{_,_,Val}] = mnesia:read({Tab, 1}),
+		    mnesia:write({Tab, 1, Val+1})
+	    end,
+    {_, Res} = ?match(ok, mnesia:async_dirty(ASYNC)),
+    ?dl("ASYNC done: ~p ", [Res]),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+asym_trans_kill_part_ask(suite) -> [];
+asym_trans_kill_part_ask(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, doit_ask_commit}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_part_commit_vote(suite) -> [];
+asym_trans_kill_part_commit_vote(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, commit_participant, vote_yes}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_part_pre_commit(suite) -> [];
+asym_trans_kill_part_pre_commit(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, commit_participant, pre_commit}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_part_log_commit(suite) -> [];
+asym_trans_kill_part_log_commit(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, commit_participant, log_commit}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_part_do_commit(suite) -> [];
+asym_trans_kill_part_do_commit(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(Part1, {Part1, {mnesia_tm, commit_participant, do_commit}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_coord_got_votes(suite) -> [];
+asym_trans_kill_coord_got_votes(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(Coord, {Coord, {mnesia_tm, multi_commit_asym_got_votes}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_coord_pid_got_votes(suite) -> [];
+asym_trans_kill_coord_pid_got_votes(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(coord_pid, {Coord, {mnesia_tm, multi_commit_asym_got_votes}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_coord_log_commit_rec(suite) -> [];
+asym_trans_kill_coord_log_commit_rec(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(Coord, {Coord, {mnesia_tm, multi_commit_asym_log_commit_rec}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_coord_pid_log_commit_rec(suite) -> [];
+asym_trans_kill_coord_pid_log_commit_rec(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(coord_pid, {Coord, {mnesia_tm, multi_commit_asym_log_commit_rec}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_coord_log_commit_dec(suite) -> [];
+asym_trans_kill_coord_log_commit_dec(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(Coord, {Coord, {mnesia_tm, multi_commit_asym_log_commit_dec}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_coord_pid_log_commit_dec(suite) -> [];
+asym_trans_kill_coord_pid_log_commit_dec(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(coord_pid, {Coord, {mnesia_tm, multi_commit_asym_log_commit_dec}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_coord_rec_acc_pre_commit_log_commit(suite) -> [];
+asym_trans_kill_coord_rec_acc_pre_commit_log_commit(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(Coord, {Coord, {mnesia_tm, rec_acc_pre_commit_log_commit}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_coord_pid_rec_acc_pre_commit_log_commit(suite) -> [];
+asym_trans_kill_coord_pid_rec_acc_pre_commit_log_commit(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(coord_pid, {Coord, {mnesia_tm, rec_acc_pre_commit_log_commit}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_coord_rec_acc_pre_commit_done_commit(suite) -> [];
+asym_trans_kill_coord_rec_acc_pre_commit_done_commit(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(Coord, {Coord, {mnesia_tm, rec_acc_pre_commit_done_commit}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+asym_trans_kill_coord_pid_rec_acc_pre_commit_done_commit(suite) -> [];
+asym_trans_kill_coord_pid_rec_acc_pre_commit_done_commit(Config) when is_list(Config) -> 
+    ?is_debug_compiled,
+    Nodes = ?acquire_nodes(3, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    [Coord, Part1, Part2] = Nodes,
+    Tab1 = {asym1, [{ram_copies, [Part2]}, {disc_copies, [Coord]}]},
+    Tab2 = {asym2, [{ram_copies, [Coord]}, {disc_copies, [Part1]}]},
+    TransFun = do_asym_trans,
+    kill_after_debug_point(coord_pid, {Coord, {mnesia_tm, rec_acc_pre_commit_done_commit}}, 
+			   TransFun, [Tab1, Tab2], Nodes).
+
+do_asym_trans([Tab1, Tab2 | _R], Garbhandler) ->
+    ?dl("Starting asym trans ", []),
+    ASym_Trans = fun() ->
+			 TidTs = {_Mod, Tid, _Store} =
+			     mnesia:get_activity_id(),
+			 ?verbose("===> asym_trans: ~w~n", [TidTs]),
+			 Garbhandler ! {trans_id, Tid},
+			 [{_, _, Val1}] = mnesia:read({Tab1, 1}),
+			 [{_, _, Val2}] = mnesia:read({Tab2, 1}),
+			 mnesia:write({Tab1, 1, Val1+1}),
+			 mnesia:write({Tab2, 1, Val2+1})
+		 end,
+    Res = mnesia:transaction(ASym_Trans),
+    case Res of
+	{atomic, ok} -> ok;
+	{aborted, _Reason} -> ok;
+	_Else -> ?error("Wrong output from mensia:transaction(FUN):~n ~p~n", [Res])
+    end,			
+    ?dl("Asym trans finished with: ~p ", [Res]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+kill_after_debug_point(Kill, {DebugNode, Debug_Point}, TransFun, TabsAndDefs, Nodes) ->
+    [Coord | _rest] = Nodes,
+
+    Create = fun({Tab, Def}) -> ?match({atomic, ok}, mnesia:create_table(Tab, Def)) end,
+    lists:foreach(Create, TabsAndDefs),
+    Tabs = [T || {T, _} <- TabsAndDefs],
+    Write = fun(Tab) -> ?match(ok, mnesia:dirty_write({Tab, 1, 100})) end,
+    lists:foreach(Write, Tabs),
+
+    Self = self(),    
+    SyncFun = fun(_Env1, _Env2) ->  % Just Sync with test prog
+		      Self ! {self(), fun_in_position}, 
+		      ?dl("SyncFun, sending fun_in_position ", []),
+		      receive continue -> 
+			      ?dl("SyncFun received continue ",[]),
+			      ok
+		      after timer:seconds(60) -> 
+			      ?error("Timeout in sync_fun on ~p~n", [node()])
+		      end
+	      end,
+
+    Garb_handler = spawn_link(?MODULE, garb_handler, [[]]),
+
+    ?remote_activate_debug_fun(DebugNode, Debug_Point, SyncFun, []),
+    ?dl("fun_in_position activated at ~p with ~p", [DebugNode, Debug_Point]),
+    %% Spawn and do the transaction
+    Pid = spawn(Coord, ?MODULE, TransFun, [Tabs, Garb_handler]),
+    %% Wait till all the Nodes are in correct position
+    [{StoppedPid,_}] = ?receive_messages([fun_in_position]),
+    ?dl("Received fun_in_position; Removing the debug funs ~p", [DebugNode]),
+    ?remote_deactivate_debug_fun(DebugNode, Debug_Point),    
+
+    case Kill of
+	coord_pid -> 
+	    ?dl("Intentionally killing pid ~p ", [Pid]),
+	    exit(Pid, normal);
+	Node -> 		
+	    mnesia_test_lib:kill_mnesia([Node])
+    end,
+
+    StoppedPid ! continue,    %% Send continue, it may still be alive
+
+    %% Start and check that the databases are consistent
+    ?dl("Done, Restarting and verifying result ",[]),
+    case Kill of
+	coord_pid -> ok;
+	_ ->  % Ok, mnesia on some node was killed restart it
+	    timer:sleep(timer:seconds(3)), %% Just let it have the time to die
+	    ?match(ok, rpc:call(Kill, mnesia, start, [[]])),
+	    ?match(ok, rpc:call(Kill, mnesia, wait_for_tables, [Tabs, 60000]))
+    end,
+    Trans_res = verify_tabs(Tabs, Nodes),
+    case TransFun of
+	do_asym_trans ->
+	    %% Verifies that decisions are garbed, only valid for asym_tran
+	    Garb_handler ! {get_tids, self()},
+	    Tid_list = receive 
+			   {tids, List} -> 
+			       ?dl("Fun rec ~w", [List]),
+			       List
+		       end,
+	    garb_of_decisions(Kill, Nodes, Tid_list, Trans_res);
+	_ ->
+	    ignore
+    end,
+    ?verify_mnesia(Nodes, []).
+
+garb_of_decisions(Kill, Nodes, Tid_list, Trans_res) ->
+    [Coord, Part1, Part2]  = Nodes,
+    %% Check that decision log is empty on all nodes after the trans is finished
+    verify_garb_decision_log(Nodes, Tid_list),  
+    case Trans_res of
+	aborted ->
+	    %% Check that aborted trans have not been restarted!!
+	    ?match(1, length(Tid_list)),
+	    %% Check the transient decision logs
+	    %% A transaction should only be aborted in an early stage of 
+	    %% the trans before the any Node have logged anything
+	    verify_garb_transient_logs(Nodes, Tid_list, aborted),
+	    %% And only when the coordinator are have died
+	    %% Else he would have restarted the transaction
+	    ?match(Kill, Coord);
+	updated ->
+	    case length(Tid_list) of
+		1 -> 
+		    %% If there was only one transaction, it should be logged as
+		    %% comitted on every node!
+		    [Tid1] = Tid_list,
+		    verify_garb_transient_logs(Nodes, [Tid1], committed);
+		2 -> 
+		    %% If there is two transaction id, then the first
+		    %% TID should have been aborted and the transaction
+		    %% restarted with a new TID
+		    [Tid1, Tid2] = Tid_list,
+		    verify_garb_transient_logs(Nodes, [Tid1], aborted),
+		    %% If mnesia is killed on a node i.e Coord and Part1 than they
+		    %% won't know about the restarted trans! The rest of the nodes
+		    %% should know that the trans was committed
+		    case Kill of 
+			coord_pid -> 
+			    verify_garb_transient_logs(Nodes, [Tid2], committed);
+			Coord -> 
+			    verify_garb_transient_logs([Part1, Part2], [Tid2], committed),
+			    verify_garb_transient_logs([Coord], [Tid2], not_found);
+			Part1 ->
+			    verify_garb_transient_logs([Coord, Part2], [Tid2], committed),
+			    verify_garb_transient_logs([Part1], [Tid2], not_found)
+		    end
+	    end
+    end.
+
+verify_garb_decision_log([], _Tids) -> ok;
+verify_garb_decision_log([Node|R], Tids) -> 
+    Check = fun(Tid) ->   %% Node, Tid used in debugging!
+		    ?match({{not_found, _}, Node, Tid}, 
+			   {outcome(Tid, [mnesia_decision]), Node, Tid})
+	    end,
+    rpc:call(Node, lists, foreach, [Check, Tids]),
+    verify_garb_decision_log(R, Tids).
+
+verify_garb_transient_logs([], _Tids, _) -> ok;
+verify_garb_transient_logs([Node|R], Tids, Exp_Res) -> 
+    Check = fun(Tid) -> 
+		    LatestTab = mnesia_lib:val(latest_transient_decision),
+		    PrevTabs = mnesia_lib:val(previous_transient_decisions),
+		    case outcome(Tid, [LatestTab | PrevTabs]) of
+			{found, {_, [{_,_Tid, Exp_Res}]}} -> ok;
+			{not_found, _} when Exp_Res == not_found -> ok;
+			{not_found, _} when Exp_Res == aborted -> ok;
+			Else  -> ?error("Expected ~p in trans ~p on ~p got ~p~n",
+					[Exp_Res, Tid, Node, Else])
+		    end
+	    end,    
+    rpc:call(Node, lists, foreach, [Check, Tids]),
+    verify_garb_transient_logs(R, Tids, Exp_Res). 
+    
+outcome(Tid, Tabs) ->
+    outcome(Tid, Tabs, Tabs).
+
+outcome(Tid, [Tab | Tabs], AllTabs) ->
+    case catch ets:lookup(Tab, Tid) of
+	{'EXIT', _} ->
+	    outcome(Tid, Tabs, AllTabs);
+	[] ->
+	    outcome(Tid, Tabs, AllTabs);
+	Val ->
+	    {found, {Tab, Val}}
+    end;
+outcome(_Tid, [], AllTabs) ->
+    {not_found, AllTabs}.
+
+
+verify_tabs([Tab|R], Nodes) -> 
+    [_Coord, Part1, Part2 | _rest] = Nodes, 
+    Read = fun() -> mnesia:read({Tab, 1}) end,
+    {success, A} = ?match({atomic, _}, mnesia:transaction(Read)),
+    ?match(A, rpc:call(Part1, mnesia, transaction, [Read])),
+    ?match(A, rpc:call(Part2, mnesia, transaction, [Read])),
+    {atomic, [{Tab, 1, Res}]} = A,
+    verify_tabs(R, Nodes, Res).
+
+verify_tabs([], _Nodes, Res) -> 
+    case Res of 
+	100 -> aborted;
+	101 -> updated
+    end;
+
+verify_tabs([Tab | Rest], Nodes, Res) ->
+    [Coord, Part1, Part2 | _rest] = Nodes, 
+    Read = fun() -> mnesia:read({Tab, 1}) end,
+    Exp = {atomic, [{Tab, 1, Res}]},
+    ?match(Exp, rpc:call(Coord, mnesia, transaction, [Read])),
+    ?match(Exp, rpc:call(Part1, mnesia, transaction, [Read])),
+    ?match(Exp, rpc:call(Part2, mnesia, transaction, [Read])),
+    verify_tabs(Rest, Nodes, Res).
+
+%% Gather TIDS and send them to requesting process and exit!
+garb_handler(List) -> 
+    receive 
+	{trans_id, ID} -> garb_handler([ID|List]);
+	{get_tids, Pid} -> Pid ! {tids, lists:reverse(List)}
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%
+receive_messages([], _File, _Line) -> [];
+receive_messages(ListOfMsgs, File, Line) ->
+    receive 
+	{Pid, Msg} ->     
+	    case lists:member(Msg, ListOfMsgs) of
+		false -> 
+		    mnesia_test_lib:log("<>WARNING<>~n"
+					"Received unexpected msg~n ~p ~n"
+					"While waiting for ~p~n",  
+					[{Pid, Msg}, ListOfMsgs], File, Line),
+		    receive_messages(ListOfMsgs, File, Line);
+		true -> 
+		    ?dl("Got msg ~p from ~p ", [Msg, node(Pid)]),
+		    [{Pid, Msg} | receive_messages(ListOfMsgs -- [Msg], File, Line)]
+	    end;
+	Else -> mnesia_test_lib:log("<>WARNING<>~n"
+				    "Recevied unexpected or bad formatted msg~n ~p ~n"
+				    "While waiting for ~p~n", 
+	 			    [Else, ListOfMsgs], File, Line),
+		receive_messages(ListOfMsgs, File, Line)
+    after timer:minutes(2) -> 
+	    ?error("Timeout in receive msgs while waiting for ~p~n", 
+		   [ListOfMsgs])
+    end.    
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+after_full_disc_partition(doc) ->
+    ["Verify that the database does not get corrupt",
+     "when Mnesia encounters a full disc partition"].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% interrupted_fallback_start 
+%% is implemented in consistency interupted_install_fallback!
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+after_corrupt_files_decision_log_head(suite) -> [];
+after_corrupt_files_decision_log_head(Config) when is_list(Config) ->
+    after_corrupt_files(Config, "DECISION.LOG", head, repair).
+
+after_corrupt_files_decision_log_tail(suite) -> [];
+after_corrupt_files_decision_log_tail(Config) when is_list(Config) ->
+    after_corrupt_files(Config, "DECISION.LOG", tail, repair).
+
+after_corrupt_files_latest_log_head(suite) -> [];
+after_corrupt_files_latest_log_head(Config) when is_list(Config) ->
+    after_corrupt_files(Config, "LATEST.LOG", head, repair).
+
+after_corrupt_files_latest_log_tail(suite) -> [];
+after_corrupt_files_latest_log_tail(Config) when is_list(Config) ->
+    after_corrupt_files(Config, "LATEST.LOG", tail, repair).
+
+after_corrupt_files_table_dat_head(suite) -> [];
+after_corrupt_files_table_dat_head(Config) when is_list(Config) ->
+    after_corrupt_files(Config, "rec_files.DAT", head, crash).
+
+after_corrupt_files_table_dat_tail(suite) -> [];
+after_corrupt_files_table_dat_tail(Config) when is_list(Config) ->
+    after_corrupt_files(Config, "rec_files.DAT", tail, repair).
+
+after_corrupt_files_schema_dat_head(suite) -> [];
+after_corrupt_files_schema_dat_head(Config) when is_list(Config) ->
+    after_corrupt_files(Config, "schema.DAT", head, crash).
+
+after_corrupt_files_schema_dat_tail(suite) -> [];
+after_corrupt_files_schema_dat_tail(Config) when is_list(Config) ->
+    after_corrupt_files(Config, "schema.DAT", tail, crash).
+
+
+
+%%% BUGBUG: We should also write testcase's for autorepair=false i.e. 
+%%% not the standard case!
+after_corrupt_files(Config, File, Where, Behaviour) ->
+    [Node] = ?acquire_nodes(1, Config ++ [{tc_timeout, timer:minutes(2)}]),
+    Tab = rec_files,
+    Def = [{disc_only_copies, [Node]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
+    insert_data(Tab, 100),
+    Dir = mnesia:system_info(directory),
+    mnesia_test_lib:kill_mnesia([Node]),
+    timer:sleep(timer:seconds(10)),   % Let dets finish whatever it does
+
+    DirFile = Dir ++ "/" ++ File,
+
+    {ok, Fd} = file:open(DirFile, read_write),
+    {ok, FileInfo} = file:read_file_info(DirFile),
+    case Where of
+	head -> 
+	    ?match({ok, _NewP}, file:position(Fd, {bof, 1})),
+	    ?match(ok, file:write(Fd, [255, 255, 255, 255, 255, 255, 255, 255, 254])),
+	    ok;
+	tail ->
+	    Size = FileInfo#file_info.size,
+	    Half = Size div 2,
+
+	    ?dl(" Size = ~p Half = ~p ", [Size, Half]),
+	    ?match({ok, _NewP}, file:position(Fd, {bof, Half})),
+	    ?match(ok, file:truncate(Fd)),
+	    ok
+    end,
+    ?match(ok, file:close(Fd)),
+
+    ?warning("++++++SOME OF THE after_corrupt* TEST CASES WILL INTENTIONALLY CRASH MNESIA+++++++~n", []),
+    Pid = spawn_link(?MODULE, mymnesia_start, [self()]),
+    receive
+	{Pid, ok} -> 
+	    ?match(ok, mnesia:wait_for_tables([schema, Tab], 10000)),
+	    ?match(ok, verify_data(Tab, 100)),
+	    case mnesia_monitor:get_env(auto_repair) of
+		false ->
+		    ?error("Mnesia should have crashed in ~p ~p ~n",
+			   [File, Where]);
+		true ->
+		    ok
+	    end,
+	    ?verify_mnesia([Node], []);
+	{Pid, {error, ED}} ->
+	    case {mnesia_monitor:get_env(auto_repair), Behaviour} of
+		{true, repair} ->
+		    ?error("Mnesia crashed with ~p: in ~p ~p ~n",
+			   [ED, File, Where]);
+		_ ->  %% Every other can crash!
+		    ok
+	    end,
+	    ?verify_mnesia([], [Node]);
+	Msg ->
+	    ?error("~p ~p: Got ~p during start of Mnesia~n",
+		   [File, Where, Msg])
+    end.
+
+mymnesia_start(Tester) ->
+    Res = mnesia:start(),
+    unlink(Tester),
+    Tester ! {self(), Res}.
+
+verify_data(_, 0) -> ok;
+verify_data(Tab, N) -> 
+    Actual = mnesia:dirty_read({Tab, N}),
+    Expected = [{Tab, N, N}],
+    if
+	Expected == Actual ->
+	    verify_data(Tab, N - 1);
+	true  ->
+	    mnesia:schema(Tab),
+	    {not_equal, node(), Expected, Actual}
+    end.
+
+insert_data(_Tab, 0) -> ok;
+insert_data(Tab, N) ->
+    ok = mnesia:sync_dirty(fun() -> mnesia:write({Tab, N, N}) end),
+    insert_data(Tab, N-1).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+disc_less(doc) -> 
+    ["Here is a simple test case of a simple recovery of a disc less node. "
+     "However a lot more test cases involving disc less nodes should "
+     "be written"];
+disc_less(suite) -> [];
+disc_less(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    case mnesia_test_lib:diskless(Config) of
+	true -> skip;
+	false ->    
+	    ?match({atomic, ok}, mnesia:change_table_copy_type(schema, Node3, ram_copies))
+    end,
+    Tab1 = disc_less1,
+    Tab2 = disc_less2,
+    Tab3 = disc_less3,
+    Def1 = [{ram_copies, [Node3]}, {disc_copies, [Node1, Node2]}],
+    Def2 = [{ram_copies, [Node3]}, {disc_copies, [Node1]}],
+    Def3 = [{ram_copies, [Node3]}, {disc_copies, [Node2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab1, Def1)),
+    ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
+    ?match({atomic, ok}, mnesia:create_table(Tab3, Def3)),   
+    insert_data(Tab1, 100),
+    insert_data(Tab2, 100),
+    insert_data(Tab3, 100),
+
+    mnesia_test_lib:kill_mnesia([Node1, Node2]),
+    timer:sleep(500),
+    mnesia_test_lib:kill_mnesia([Node3]),
+    ?match(ok, rpc:call(Node1, mnesia, start, [])),
+    ?match(ok, rpc:call(Node2, mnesia, start, [])),
+
+    timer:sleep(500),
+    ?match(ok, rpc:call(Node3, mnesia, start, [[{extra_db_nodes, [Node1, Node2]}]])),
+    ?match(ok, rpc:call(Node3, mnesia, wait_for_tables, [[Tab1, Tab2, Tab3], 20000])),
+
+    ?match(ok, rpc:call(Node3, ?MODULE, verify_data, [Tab1, 100])),
+    ?match(ok, rpc:call(Node3, ?MODULE, verify_data, [Tab2, 100])),
+    ?match(ok, rpc:call(Node3, ?MODULE, verify_data, [Tab3, 100])),
+
+
+    ?match(ok, rpc:call(Node2, ?MODULE, verify_data, [Tab1, 100])),
+    ?match(ok, rpc:call(Node2, ?MODULE, verify_data, [Tab2, 100])),
+    ?match(ok, rpc:call(Node2, ?MODULE, verify_data, [Tab3, 100])),
+
+    ?match(ok, rpc:call(Node1, ?MODULE, verify_data, [Tab1, 100])),
+    ?match(ok, rpc:call(Node1, ?MODULE, verify_data, [Tab2, 100])),
+    ?match(ok, rpc:call(Node1, ?MODULE, verify_data, [Tab3, 100])),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+system_upgrade(doc) ->
+    ["Test on-line and off-line upgrade of the Mnesia application"].
+
+garb_decision(doc) ->
+    ["Test that decisions are garbed correctly."];
+garb_decision(suite) -> [];
+garb_decision(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    check_garb(Nodes),
+    ?match({atomic, ok},mnesia:create_table(a, [{disc_copies, Nodes}])),
+    check_garb(Nodes),
+    ?match({atomic, ok},mnesia:create_table(b, [{ram_copies, Nodes}])),
+    check_garb(Nodes),
+    ?match({atomic, ok},mnesia:create_table(c, [{ram_copies, [Node1, Node3]},
+						{disc_copies, [Node2]}])),
+    check_garb(Nodes),
+    ?match({atomic, ok},mnesia:create_table(d, [{disc_copies, [Node1, Node3]},
+						{ram_copies, [Node2]}])),
+    check_garb(Nodes),
+
+    W = fun(Tab) ->  mnesia:write({Tab,1,1}) end,
+    A = fun(Tab) ->  mnesia:write({Tab,1,1}), exit(1) end,
+
+    ?match({atomic, ok}, mnesia:transaction(W,[a])),
+    check_garb(Nodes),
+    ?match({atomic, ok}, mnesia:transaction(W,[b])),
+    check_garb(Nodes),
+    ?match({atomic, ok}, mnesia:transaction(W,[c])),
+    check_garb(Nodes),
+    ?match({atomic, ok}, mnesia:transaction(W,[d])),
+    check_garb(Nodes),
+    ?match({aborted,1}, mnesia:transaction(A,[a])),
+    check_garb(Nodes),
+    ?match({aborted,1}, mnesia:transaction(A,[b])),
+    check_garb(Nodes),
+    ?match({aborted,1}, mnesia:transaction(A,[c])),
+    check_garb(Nodes),
+    ?match({aborted,1}, mnesia:transaction(A,[d])),
+    check_garb(Nodes),
+
+    rpc:call(Node2, mnesia, lkill, []),
+    ?match({atomic, ok}, mnesia:transaction(W,[a])),
+    ?match({atomic, ok}, mnesia:transaction(W,[b])),
+    ?match({atomic, ok}, mnesia:transaction(W,[c])),
+    ?match({atomic, ok}, mnesia:transaction(W,[d])),
+    check_garb(Nodes),
+    ?match([], mnesia_test_lib:start_mnesia([Node2])),    
+    check_garb(Nodes),
+    timer:sleep(2000),
+    check_garb(Nodes),
+    %%%%%% Check transient_decision logs %%%%%
+
+    ?match(dumped, mnesia:dump_log()), sys:get_status(mnesia_recover), % sync   
+    [{atomic, ok} = mnesia:transaction(W,[a]) || _ <- lists:seq(1,30)],
+    ?match(dumped, mnesia:dump_log()), sys:get_status(mnesia_recover), % sync   
+    TD0 = mnesia_lib:val(latest_transient_decision),
+    ?match(0, ets:info(TD0, size)),
+    {atomic, ok} = mnesia:transaction(W,[a]),
+    ?match(dumped, mnesia:dump_log()), sys:get_status(mnesia_recover), % sync   
+    ?match(TD0, mnesia_lib:val(latest_transient_decision)),
+    [{atomic, ok} = mnesia:transaction(W,[a]) || _ <- lists:seq(1,30)],
+    ?match(dumped, mnesia:dump_log()), sys:get_status(mnesia_recover), % sync   
+    ?match(false, TD0 =:= mnesia_lib:val(latest_transient_decision)),
+    ?match(true, lists:member(TD0, mnesia_lib:val(previous_transient_decisions))),
+    ?verify_mnesia(Nodes, []).
+
+check_garb(Nodes) ->
+    rpc:multicall(Nodes, sys, get_status, [mnesia_recover]),
+    ?match({_, []},rpc:multicall(Nodes, erlang, apply, [fun check_garb/0, []])).
+
+check_garb() ->
+    try 
+	Ds = ets:tab2list(mnesia_decision),
+	Check = fun({trans_tid,serial, _}) -> false;
+		   ({mnesia_down,_,_,_}) -> false;
+		   (_Else) -> true
+		end,
+	Node = node(),
+	?match({Node, []}, {node(), lists:filter(Check, Ds)})
+    catch _:_ -> ok  
+    end,
+    ok.
diff --git a/lib/mnesia/test/mnesia_registry_test.erl b/lib/mnesia/test/mnesia_registry_test.erl
new file mode 100644
index 0000000000..cf8da38632
--- /dev/null
+++ b/lib/mnesia/test/mnesia_registry_test.erl
@@ -0,0 +1,142 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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(mnesia_registry_test).
+-author('[email protected]').
+-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+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() -> 
+    [good_dump, bad_dump].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+good_dump(doc) ->
+    ["Dump a faked C-node registry"];
+good_dump(suite) -> [];
+good_dump(Config) when is_list(Config) ->
+    [Node] = Nodes = ?acquire_nodes(1, Config),
+    T1 = gordon,
+    ?match(ok, mnesia_registry:create_table(T1)),
+    One = {T1, 1, 0, integer, 0, 10},
+    Two = {T1, "two", 3, integer, 0, 20},
+    Three = {T1, 3, 0, string, 6, "thirty"},
+    ?match(ok, mnesia:dirty_write(One)),
+    ?match(ok, mnesia:dirty_write(Two)),
+    ?match(ok, mnesia:dirty_write(Three)),
+    ?match([One], mnesia:dirty_read({T1, 1})),
+    ?match([_ | _], dump_registry(Node, T1)),
+
+    NewOne = {T1, 1, 0, integer, 0, 1},
+    NewFour = {T1, "4", 1, string, 4, "four"},
+
+    ?match([NewOne], mnesia:dirty_read({T1, 1})),
+    ?match([Two], mnesia:dirty_read({T1, "two"})),
+    ?match([], mnesia:dirty_read({T1, 3})),
+    ?match([NewFour], mnesia:dirty_read({T1, "4"})),
+
+    T2 = blixt,
+    ?match({'EXIT', {aborted, {no_exists, _}}},
+	   mnesia:dirty_read({T2, 1})),
+    ?match([_ |_], dump_registry(Node, T2)),
+
+    NewOne2 = setelement(1, NewOne, T2),
+    NewFour2 = setelement(1, NewFour, T2),
+
+    ?match([NewOne2], mnesia:dirty_read({T2, 1})),
+    ?match([], mnesia:dirty_read({T2, "two"})),
+    ?match([], mnesia:dirty_read({T2, 3})),
+    ?match([NewFour2], mnesia:dirty_read({T2, "4"})),
+    ?match([_One2, NewFour2], lists:sort(restore_registry(Node, T2))),
+    
+    ?verify_mnesia(Nodes, []).
+
+dump_registry(Node, Tab) ->
+    case rpc:call(Node, mnesia_registry, start_dump, [Tab, self()]) of
+	Pid when is_pid(Pid) ->
+	    Pid ! {write, 1, 0, integer, 0, 1},
+	    Pid ! {delete, 3},
+	    Pid ! {write, "4", 1, string, 4, "four"},
+	    Pid ! {commit, self()},
+	    receive
+		{ok, Pid} ->
+		    [{Tab, "4", 1, string, 4, "four"},
+		     {Tab, 1, 0, integer, 0, 1}];
+		{'EXIT', Pid, Reason} ->
+		    exit(Reason)
+	    end;
+	{badrpc, Reason} ->
+	    exit(Reason)
+    end.
+
+restore_registry(Node, Tab) ->
+    case rpc:call(Node, mnesia_registry, start_restore, [Tab, self()]) of
+	{size, Pid, N, _LargestKeySize, _LargestValSize} ->
+	    Pid ! {send_records, self()},
+	    receive_records(Tab, N);
+	{badrpc, Reason} ->
+	    exit(Reason)
+    end.
+
+receive_records(Tab, N) when N > 0 ->
+    receive
+	{restore, KeySize, ValSize, ValType, Key, Val} -> 
+	    [{Tab, Key, KeySize, ValType, ValSize, Val} | receive_records(Tab, N -1)];
+	{'EXIT', _Pid, Reason} ->
+	    exit(Reason)
+    end;
+receive_records(_Tab, 0) ->
+    [].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+bad_dump(doc) ->
+    ["Intentionally fail with the dump of a faked C-node registry"];
+bad_dump(suite) -> [];
+bad_dump(Config) when is_list(Config) ->
+    [Node] = Nodes = ?acquire_nodes(1, Config),
+    
+    OldTab = ming,
+    ?match({'EXIT', {aborted, _}}, mnesia_registry:start_restore(no_tab, self())),
+    ?match({atomic, ok}, mnesia:create_table(OldTab, [{attributes, [a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q]}])),
+    ?match({'EXIT',{aborted,{bad_type,_}}}, dump_registry(Node, OldTab)),
+    ?match(stopped, mnesia:stop()),
+
+    ?match({'EXIT', {aborted, _}}, mnesia_registry:create_table(down_table)),
+    ?match({'EXIT', {aborted, _}}, mnesia_registry:start_restore(no_tab, self())),
+    ?match({'EXIT', {aborted, _}}, dump_registry(Node, down_dump)),
+
+    ?verify_mnesia([], Nodes).
+
diff --git a/lib/mnesia/test/mnesia_schema_recovery_test.erl b/lib/mnesia/test/mnesia_schema_recovery_test.erl
new file mode 100644
index 0000000000..0fe26efd0b
--- /dev/null
+++ b/lib/mnesia/test/mnesia_schema_recovery_test.erl
@@ -0,0 +1,777 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1998-2010. 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(mnesia_schema_recovery_test).
+-author('[email protected]').
+-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+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).
+
+-define(receive_messages(Msgs), receive_messages(Msgs, ?FILE, ?LINE)).
+
+% First Some debug logging 
+-define(dgb, true).
+-ifdef(dgb).
+-define(dl(X, Y), ?verbose("**TRACING: " ++ X ++ "**~n", Y)).
+-else. 
+-define(dl(X, Y), ok).
+-endif.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+all() -> 
+    [{group, interrupted_before_log_dump},
+     {group, interrupted_after_log_dump}].
+
+groups() -> 
+    [{interrupted_before_log_dump, [],
+      [interrupted_before_create_ram,
+       interrupted_before_create_disc,
+       interrupted_before_create_disc_only,
+       interrupted_before_create_nostore,
+       interrupted_before_delete_ram,
+       interrupted_before_delete_disc,
+       interrupted_before_delete_disc_only,
+       interrupted_before_add_ram, interrupted_before_add_disc,
+       interrupted_before_add_disc_only,
+       interrupted_before_add_kill_copier,
+       interrupted_before_move_ram,
+       interrupted_before_move_disc,
+       interrupted_before_move_disc_only,
+       interrupted_before_move_kill_copier,
+       interrupted_before_delcopy_ram,
+       interrupted_before_delcopy_disc,
+       interrupted_before_delcopy_disc_only,
+       interrupted_before_delcopy_kill_copier,
+       interrupted_before_addindex_ram,
+       interrupted_before_addindex_disc,
+       interrupted_before_addindex_disc_only,
+       interrupted_before_delindex_ram,
+       interrupted_before_delindex_disc,
+       interrupted_before_delindex_disc_only,
+       interrupted_before_change_type_ram2disc,
+       interrupted_before_change_type_ram2disc_only,
+       interrupted_before_change_type_disc2ram,
+       interrupted_before_change_type_disc2disc_only,
+       interrupted_before_change_type_disc_only2ram,
+       interrupted_before_change_type_disc_only2disc,
+       interrupted_before_change_type_other_node,
+       interrupted_before_change_schema_type]},
+     {interrupted_after_log_dump, [],
+      [interrupted_after_create_ram,
+       interrupted_after_create_disc,
+       interrupted_after_create_disc_only,
+       interrupted_after_create_nostore,
+       interrupted_after_delete_ram,
+       interrupted_after_delete_disc,
+       interrupted_after_delete_disc_only,
+       interrupted_after_add_ram, interrupted_after_add_disc,
+       interrupted_after_add_disc_only,
+       interrupted_after_add_kill_copier,
+       interrupted_after_move_ram, interrupted_after_move_disc,
+       interrupted_after_move_disc_only,
+       interrupted_after_move_kill_copier,
+       interrupted_after_delcopy_ram,
+       interrupted_after_delcopy_disc,
+       interrupted_after_delcopy_disc_only,
+       interrupted_after_delcopy_kill_copier,
+       interrupted_after_addindex_ram,
+       interrupted_after_addindex_disc,
+       interrupted_after_addindex_disc_only,
+       interrupted_after_delindex_ram,
+       interrupted_after_delindex_disc,
+       interrupted_after_delindex_disc_only,
+       interrupted_after_change_type_ram2disc,
+       interrupted_after_change_type_ram2disc_only,
+       interrupted_after_change_type_disc2ram,
+       interrupted_after_change_type_disc2disc_only,
+       interrupted_after_change_type_disc_only2ram,
+       interrupted_after_change_type_disc_only2disc,
+       interrupted_after_change_type_other_node,
+       interrupted_after_change_schema_type]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+interrupted_before_create_ram(suite) -> [];
+interrupted_before_create_ram(Config) when is_list(Config) ->
+    KillAt = {mnesia_dumper, dump_schema_op},
+    interrupted_create(Config, ram_copies, all, KillAt).
+
+interrupted_before_create_disc(suite) -> [];
+interrupted_before_create_disc(Config) when is_list(Config) ->
+    KillAt = {mnesia_dumper, dump_schema_op},
+    interrupted_create(Config, disc_copies, all, KillAt).
+
+interrupted_before_create_disc_only(suite) -> [];
+interrupted_before_create_disc_only(Config) when is_list(Config) ->
+    KillAt = {mnesia_dumper, dump_schema_op},
+    interrupted_create(Config, disc_only_copies, all, KillAt).
+
+interrupted_before_create_nostore(suite) -> [];
+interrupted_before_create_nostore(Config) when is_list(Config) ->
+    KillAt = {mnesia_dumper, dump_schema_op},
+    interrupted_create(Config, ram_copies, one, KillAt).
+
+interrupted_after_create_ram(suite) -> [];
+interrupted_after_create_ram(Config) when is_list(Config) ->
+    KillAt = {mnesia_dumper, post_dump},
+    interrupted_create(Config, ram_copies, all, KillAt).
+
+interrupted_after_create_disc(suite) -> [];
+interrupted_after_create_disc(Config) when is_list(Config) ->
+    KillAt = {mnesia_dumper, post_dump},
+    interrupted_create(Config, disc_copies, all, KillAt).
+
+interrupted_after_create_disc_only(suite) -> [];
+interrupted_after_create_disc_only(Config) when is_list(Config) ->
+    KillAt = {mnesia_dumper, post_dump},
+    interrupted_create(Config, disc_only_copies, all, KillAt).
+
+interrupted_after_create_nostore(suite) -> [];
+interrupted_after_create_nostore(Config) when is_list(Config) ->
+    KillAt = {mnesia_dumper, post_dump},
+    interrupted_create(Config, ram_copies, one, KillAt).
+
+%%% After dump don't need debug point
+interrupted_create(Config, Type, _Where, {mnesia_dumper, post_dump}) ->
+    [Node1] = Nodes = ?acquire_nodes(1, [{tc_timeout, timer:seconds(30)} | Config]),
+    ?match({atomic, ok},mnesia:create_table(itrpt, [{Type, Nodes}])),
+    ?match({atomic, ok},mnesia:create_table(test, [{disc_copies,[Node1]}])),
+    ?match(ok, mnesia:dirty_write({itrpt, before, 1})),
+    ?match(ok, mnesia:dirty_write({test, found_in_log, 1})),
+    ?match(stopped, mnesia:stop()),
+    ?match([], mnesia_test_lib:start_mnesia([Node1], [itrpt,test])),  
+    %% Verify 
+    ?match([{test, found_in_log, 1}], mnesia:dirty_read({test, found_in_log})),
+    case Type of
+	ram_copies -> 	      
+	    ?match([], mnesia:dirty_read({itrpt, before}));
+	_ ->
+	    ?match([{itrpt, before, 1}], mnesia:dirty_read({itrpt, before}))
+    end,
+    ?verify_mnesia(Nodes, []);
+interrupted_create(Config, Type, Where, KillAt) ->
+    ?is_debug_compiled,
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+    {success, [A]} = ?start_activities([Node2]),
+    setup_dbgpoint(KillAt, Node2),
+
+    if       %% CREATE TABLE
+	Where == all ->    % tables on both nodes
+	    A ! fun() -> mnesia:create_table(itrpt, [{Type, Nodes}]) end;
+	true ->            % no table on the killed node
+	    A ! fun() -> mnesia:create_table(itrpt, [{Type, [Node1]}]) end
+    end,
+    
+    kill_at_debug(),
+    ?match([], mnesia_test_lib:start_mnesia([Node2], [itrpt])),  
+    %% Verify 
+    ?match(ok, mnesia:dirty_write({itrpt, before, 1})),
+    verify_tab(Node1, Node2),
+    ?verify_mnesia(Nodes, []).
+
+interrupted_before_delete_ram(suite) -> [];
+interrupted_before_delete_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_delete(Config, ram_copies, Debug_Point).
+interrupted_before_delete_disc(suite) -> [];
+interrupted_before_delete_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_delete(Config, disc_copies, Debug_Point).
+interrupted_before_delete_disc_only(suite) -> [];
+interrupted_before_delete_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_delete(Config, disc_only_copies, Debug_Point).
+
+interrupted_after_delete_ram(suite) -> [];
+interrupted_after_delete_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_delete(Config, ram_copies, Debug_Point).
+interrupted_after_delete_disc(suite) -> [];
+interrupted_after_delete_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_delete(Config, disc_copies, Debug_Point).
+interrupted_after_delete_disc_only(suite) -> [];
+interrupted_after_delete_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_delete(Config, disc_only_copies, Debug_Point).
+
+interrupted_delete(Config, Type, KillAt) ->
+    ?is_debug_compiled,
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+    Tab = itrpt,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{Type, [Node2]}])),
+    ?match(ok, mnesia:dirty_write({Tab, before, 1})),
+    {_Alive, Kill} = {Node1, Node2},
+    {success, [A]} = ?start_activities([Kill]),
+    
+    setup_dbgpoint(KillAt, Kill),
+    A ! fun() -> mnesia:delete_table(Tab) end,
+    
+    kill_at_debug(),
+    ?match([], mnesia_test_lib:start_mnesia([Node2], [])),
+    Bad = {badrpc, {'EXIT', {aborted,{no_exists, Tab, all}}}},
+    ?match(Bad, rpc:call(Node1, mnesia, table_info, [Tab, all])),
+    ?match(Bad, rpc:call(Node2, mnesia, table_info, [Tab, all])),
+    ?verify_mnesia(Nodes, []).
+
+interrupted_before_add_ram(suite) -> [];
+interrupted_before_add_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_add(Config, ram_copies, kill_reciever, Debug_Point).
+interrupted_before_add_disc(suite) -> [];
+interrupted_before_add_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_add(Config, disc_copies, kill_reciever, Debug_Point).
+interrupted_before_add_disc_only(suite) -> [];
+interrupted_before_add_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_add(Config, disc_only_copies, kill_reciever, Debug_Point).
+interrupted_before_add_kill_copier(suite) -> [];
+interrupted_before_add_kill_copier(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_add(Config, ram_copies, kill_copier, Debug_Point).
+
+interrupted_after_add_ram(suite) -> [];
+interrupted_after_add_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_add(Config, ram_copies, kill_reciever, Debug_Point).
+interrupted_after_add_disc(suite) -> [];
+interrupted_after_add_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_add(Config, disc_copies, kill_reciever, Debug_Point).
+interrupted_after_add_disc_only(suite) -> [];
+interrupted_after_add_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_add(Config, disc_only_copies, kill_reciever, Debug_Point).
+interrupted_after_add_kill_copier(suite) -> [];
+interrupted_after_add_kill_copier(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_add(Config, ram_copies, kill_copier, Debug_Point).
+
+%%% After dump don't need debug point
+interrupted_add(Config, Type, _Where, {mnesia_dumper, post_dump}) ->
+    [Node1, Node2] = Nodes =
+	?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+    Tab = itrpt,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{Type, [Node2]}, {local_content,true}])),
+    ?match({atomic, ok},mnesia:create_table(test, [{disc_copies,[Node1]}])),
+    ?match({atomic, ok}, mnesia:add_table_copy(Tab, Node1, Type)),
+    ?match(ok, mnesia:dirty_write({itrpt, before, 1})),
+    ?match(ok, mnesia:dirty_write({test, found_in_log, 1})),
+    ?match(stopped, mnesia:stop()),
+    ?match([], mnesia_test_lib:start_mnesia([Node1], [itrpt,test])),
+    %% Verify 
+    ?match([{test, found_in_log, 1}], mnesia:dirty_read({test, found_in_log})),
+    case Type of
+	ram_copies -> 	      
+	    ?match([], mnesia:dirty_read({itrpt, before}));
+	_ ->
+	    ?match([{itrpt, before, 1}], mnesia:dirty_read({itrpt, before}))
+    end,
+    ?verify_mnesia(Nodes, []);
+interrupted_add(Config, Type, Who, KillAt) ->
+    ?is_debug_compiled,
+    [Node1, Node2] = Nodes =
+	?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+    {_Alive, Kill} = 
+	if Who == kill_reciever -> 
+		{Node1, Node2};
+	   true -> 
+		{Node2, Node1}
+	end,    
+    {success, [A]} = ?start_activities([Kill]),
+    Tab = itrpt,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{Type, [Node1]}])),
+    ?match(ok, mnesia:dirty_write({Tab, before, 1})),
+    
+    setup_dbgpoint(KillAt, Kill),
+    
+    A ! fun() -> mnesia:add_table_copy(Tab, Node2, Type) end,
+    kill_at_debug(),
+    ?match([], mnesia_test_lib:start_mnesia([Kill], [itrpt])),    
+    verify_tab(Node1, Node2),
+    ?verify_mnesia(Nodes, []).
+
+interrupted_before_move_ram(suite) -> [];
+interrupted_before_move_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_move(Config, ram_copies, kill_reciever, Debug_Point).
+interrupted_before_move_disc(suite) -> [];
+interrupted_before_move_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_move(Config, disc_copies, kill_reciever, Debug_Point).
+interrupted_before_move_disc_only(suite) -> [];
+interrupted_before_move_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_move(Config, disc_only_copies, kill_reciever, Debug_Point).
+interrupted_before_move_kill_copier(suite) -> [];
+interrupted_before_move_kill_copier(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_move(Config, ram_copies, kill_copier, Debug_Point).
+
+interrupted_after_move_ram(suite) -> [];
+interrupted_after_move_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_move(Config, ram_copies, kill_reciever, Debug_Point).
+interrupted_after_move_disc(suite) -> [];
+interrupted_after_move_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_move(Config, disc_copies, kill_reciever, Debug_Point).
+interrupted_after_move_disc_only(suite) -> [];
+interrupted_after_move_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_move(Config, disc_only_copies, kill_reciever, Debug_Point).
+interrupted_after_move_kill_copier(suite) -> [];
+interrupted_after_move_kill_copier(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_move(Config, ram_copies, kill_copier, Debug_Point).
+
+%%% After dump don't need debug point
+interrupted_move(Config, Type, _Where, {mnesia_dumper, post_dump}) ->
+    [Node1, Node2] = Nodes =
+	?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+    Tab = itrpt,
+    ?match({atomic, ok},mnesia:create_table(test, [{disc_copies,[Node1]}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{Type, [Node1]}])),
+    ?match(ok, mnesia:dirty_write({itrpt, before, 1})),
+    ?match({atomic, ok}, mnesia:move_table_copy(Tab, Node1, Node2)),
+    ?match(ok, mnesia:dirty_write({itrpt, aFter, 1})),
+    ?match(ok, mnesia:dirty_write({test, found_in_log, 1})),
+    ?match(stopped, mnesia:stop()),
+    ?match([], mnesia_test_lib:start_mnesia([Node1], [itrpt,test])),
+    %% Verify 
+    ?match([{test, found_in_log, 1}], mnesia:dirty_read({test, found_in_log})),
+    ?match([{itrpt, before, 1}], mnesia:dirty_read({itrpt, before})),
+    ?match([{itrpt, aFter, 1}], mnesia:dirty_read({itrpt, aFter})),
+    ?verify_mnesia(Nodes, []);
+interrupted_move(Config, Type, Who, KillAt) ->
+    ?is_debug_compiled,
+    [Node1, Node2] = Nodes = 
+	?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+    Tab = itrpt,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{Type, [Node1]}])),
+    ?match(ok, mnesia:dirty_write({Tab, before, 1})),
+
+    {_Alive, Kill} = 
+	if Who == kill_reciever -> 
+		if Type == ram_copies -> 
+			{atomic, ok} = mnesia:dump_tables([Tab]);
+		   true -> 
+			ignore
+		end,
+		{Node1, Node2};
+	   true -> 
+		{Node2, Node1}
+	end,
+    
+    {success, [A]} = ?start_activities([Kill]),
+    
+    setup_dbgpoint(KillAt, Kill),
+    A ! fun() -> mnesia:move_table_copy(Tab, Node1, Node2) end,
+    kill_at_debug(),
+    ?match([], mnesia_test_lib:start_mnesia([Kill], [itrpt])),    
+    verify_tab(Node1, Node2),
+    ?verify_mnesia(Nodes, []).
+
+interrupted_before_delcopy_ram(suite) -> [];
+interrupted_before_delcopy_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_delcopy(Config, ram_copies, kill_reciever, Debug_Point).
+interrupted_before_delcopy_disc(suite) -> [];
+interrupted_before_delcopy_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_delcopy(Config, disc_copies, kill_reciever, Debug_Point).
+interrupted_before_delcopy_disc_only(suite) -> [];
+interrupted_before_delcopy_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_delcopy(Config, disc_only_copies, kill_reciever, Debug_Point).
+interrupted_before_delcopy_kill_copier(suite) -> [];
+interrupted_before_delcopy_kill_copier(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_delcopy(Config, ram_copies, kill_copier, Debug_Point).
+
+interrupted_after_delcopy_ram(suite) -> [];
+interrupted_after_delcopy_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_delcopy(Config, ram_copies, kill_reciever, Debug_Point).
+interrupted_after_delcopy_disc(suite) -> [];
+interrupted_after_delcopy_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_delcopy(Config, disc_copies, kill_reciever, Debug_Point).
+interrupted_after_delcopy_disc_only(suite) -> [];
+interrupted_after_delcopy_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_delcopy(Config, disc_only_copies, kill_reciever, Debug_Point).
+interrupted_after_delcopy_kill_copier(suite) -> [];
+interrupted_after_delcopy_kill_copier(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_delcopy(Config, ram_copies, kill_copier, Debug_Point).
+
+
+%%% After dump don't need debug point
+interrupted_delcopy(Config, Type, _Where, {mnesia_dumper, post_dump}) ->
+    [Node1, Node2] = Nodes =
+	?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+    Tab = itrpt,
+    ?match({atomic, ok},mnesia:create_table(test, [{disc_copies,[Node1]}])),
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{Type, [Node1,Node2]}])),
+    ?match({atomic, ok}, mnesia:del_table_copy(Tab, Node1)),
+    ?match(ok, mnesia:dirty_write({test, found_in_log, 1})),
+    ?match(stopped, mnesia:stop()),
+    ?match([], mnesia_test_lib:start_mnesia([Node1], [test])),
+    %% Verify 
+    ?match([{test, found_in_log, 1}], mnesia:dirty_read({test, found_in_log})),
+    ?match([Node2], mnesia:table_info(itrpt,Type)),
+    ?verify_mnesia(Nodes, []);
+interrupted_delcopy(Config, Type, Who, KillAt) ->
+    ?is_debug_compiled,
+    [Node1, Node2] = Nodes = 
+	?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+    Tab = itrpt,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{Type, [Node1, Node2]}])),
+    ?match(ok, mnesia:dirty_write({Tab, before, 1})),
+
+    {_Alive, Kill} = 
+	if Who == kill_reciever -> 
+		{Node1, Node2};
+	   true -> 
+		if 
+		    Type == ram_copies -> 
+			{atomic, ok} = mnesia:dump_tables([Tab]);
+		    true -> 
+			ignore
+		end,
+		{Node2, Node1}
+	end,
+
+    {success, [A]} = ?start_activities([Kill]),
+    setup_dbgpoint(KillAt, Kill),
+    A ! fun() -> mnesia:del_table_copy(Tab, Node2) end,
+    kill_at_debug(),
+    ?match([], mnesia_test_lib:start_mnesia([Kill], [itrpt])),    
+    verify_tab(Node1, Node2),
+    ?verify_mnesia(Nodes, []).
+
+interrupted_before_addindex_ram(suite) -> [];
+interrupted_before_addindex_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_addindex(Config, ram_copies, Debug_Point).
+interrupted_before_addindex_disc(suite) -> [];
+interrupted_before_addindex_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_addindex(Config, disc_copies, Debug_Point).
+interrupted_before_addindex_disc_only(suite) -> [];
+interrupted_before_addindex_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_addindex(Config, disc_only_copies, Debug_Point).
+
+interrupted_after_addindex_ram(suite) -> [];
+interrupted_after_addindex_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},
+    interrupted_addindex(Config, ram_copies, Debug_Point).
+interrupted_after_addindex_disc(suite) -> [];
+interrupted_after_addindex_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_addindex(Config, disc_copies, Debug_Point).
+interrupted_after_addindex_disc_only(suite) -> [];
+interrupted_after_addindex_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_addindex(Config, disc_only_copies, Debug_Point).
+
+
+%%% After dump don't need debug point
+interrupted_addindex(Config, Type, {mnesia_dumper, post_dump}) ->
+    [Node1] = Nodes = ?acquire_nodes(1, [{tc_timeout, timer:seconds(30)} | Config]),
+    Tab = itrpt,
+    ?match({atomic,ok},mnesia:create_table(Tab, [{Type, Nodes}])),
+    ?match({atomic,ok},mnesia:create_table(test, [{disc_copies,[Node1]}])),
+    ?match({atomic,ok}, mnesia:add_table_index(Tab, val)),
+    ?match(ok, mnesia:dirty_write({itrpt, before, 1})),
+    ?match(ok, mnesia:dirty_write({test, found_in_log, 1})),
+    ?match(stopped, mnesia:stop()),
+    ?match([], mnesia_test_lib:start_mnesia([Node1], [itrpt,test])),  
+    %% Verify 
+    ?match([{test, found_in_log, 1}], mnesia:dirty_read({test, found_in_log})),
+    case Type of
+	ram_copies -> 	      
+	    ?match([], mnesia:dirty_index_read(itrpt, 1, val));
+	_ ->
+	    ?match([{itrpt, before, 1}], mnesia:dirty_index_read(itrpt, 1, val))
+    end,
+    ?verify_mnesia(Nodes, []);
+interrupted_addindex(Config, Type, KillAt) ->
+    ?is_debug_compiled,
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+    Tab = itrpt,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{Type, [Node1]}])),
+    ?match(ok, mnesia:dirty_write({Tab, before, 1})),
+    {_Alive, Kill} = {Node1, Node2},
+    {success, [A]} = ?start_activities([Kill]),
+    
+    setup_dbgpoint(KillAt, Kill),
+    A ! fun() -> mnesia:add_table_index(Tab, val) end,
+    kill_at_debug(),
+    ?match([], mnesia_test_lib:start_mnesia([Node2], [])),
+
+    verify_tab(Node1, Node2),
+    ?match([{Tab, b, a}, {Tab, a, a}], 
+	   rpc:call(Node1, mnesia, dirty_index_read, [itrpt, a, val])),
+    ?match([{Tab, b, a}, {Tab, a, a}], 
+	   rpc:call(Node2, mnesia, dirty_index_read, [itrpt, a, val])),
+    ?verify_mnesia(Nodes, []).
+
+interrupted_before_delindex_ram(suite) -> [];
+interrupted_before_delindex_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_delindex(Config, ram_copies, Debug_Point).
+interrupted_before_delindex_disc(suite) -> [];
+interrupted_before_delindex_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_delindex(Config, disc_copies, Debug_Point).
+interrupted_before_delindex_disc_only(suite) -> [];
+interrupted_before_delindex_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_delindex(Config, disc_only_copies, Debug_Point).
+
+interrupted_after_delindex_ram(suite) -> [];
+interrupted_after_delindex_ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_delindex(Config, ram_copies, Debug_Point).
+interrupted_after_delindex_disc(suite) -> [];
+interrupted_after_delindex_disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_delindex(Config, disc_copies, Debug_Point).
+interrupted_after_delindex_disc_only(suite) -> [];
+interrupted_after_delindex_disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_delindex(Config, disc_only_copies, Debug_Point).
+
+%%% After dump don't need debug point
+interrupted_delindex(Config, Type, {mnesia_dumper, post_dump}) ->
+    [Node1] = Nodes = ?acquire_nodes(1, [{tc_timeout, timer:seconds(30)} | Config]),
+    Tab = itrpt,
+    ?match({atomic,ok},mnesia:create_table(Tab, [{Type, Nodes},{index,[val]}])),
+    ?match({atomic,ok},mnesia:create_table(test, [{disc_copies,[Node1]}])),
+    ?match({atomic,ok}, mnesia:del_table_index(Tab, val)),
+    ?match(ok, mnesia:dirty_write({itrpt, before, 1})),
+    ?match(ok, mnesia:dirty_write({test, found_in_log, 1})),
+    ?match(stopped, mnesia:stop()),
+    ?match([], mnesia_test_lib:start_mnesia([Node1], [itrpt,test])),  
+    %% Verify 
+    ?match([{test, found_in_log, 1}], mnesia:dirty_read({test, found_in_log})),
+    ?match({'EXIT',{aborted,{badarg,_}}}, mnesia:dirty_index_read(itrpt, 1, val)),
+    ?verify_mnesia(Nodes, []);
+
+interrupted_delindex(Config, Type, KillAt) ->
+    ?is_debug_compiled,
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+    Tab = itrpt,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{index, [val]}, 
+						   {Type, [Node1]}])),
+    ?match(ok, mnesia:dirty_write({Tab, before, 1})),
+    {_Alive, Kill} = {Node1, Node2},
+    {success, [A]} = ?start_activities([Kill]),
+    setup_dbgpoint(KillAt, Kill),
+    A ! fun() -> mnesia:del_table_index(Tab, val) end,
+    kill_at_debug(),
+    ?match([], mnesia_test_lib:start_mnesia([Node2], [])),  
+    verify_tab(Node1, Node2),
+    ?match({badrpc, _}, rpc:call(Node1, mnesia, dirty_index_read, [itrpt, a, val])),
+    ?match({badrpc, _}, rpc:call(Node2, mnesia, dirty_index_read, [itrpt, a, val])),
+    ?match([], rpc:call(Node1, mnesia, table_info, [Tab, index])),
+    ?match([], rpc:call(Node2, mnesia, table_info, [Tab, index])),
+    ?verify_mnesia(Nodes, []).
+
+interrupted_before_change_type_ram2disc(suite) -> [];
+interrupted_before_change_type_ram2disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_change_type(Config, ram_copies, disc_copies, changer, Debug_Point).
+interrupted_before_change_type_ram2disc_only(suite) -> [];
+interrupted_before_change_type_ram2disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_change_type(Config, ram_copies, disc_only_copies, changer, Debug_Point).    
+interrupted_before_change_type_disc2ram(suite) -> [];
+interrupted_before_change_type_disc2ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_change_type(Config, disc_copies, ram_copies, changer, Debug_Point).
+interrupted_before_change_type_disc2disc_only(suite) -> [];
+interrupted_before_change_type_disc2disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_change_type(Config, disc_copies, disc_only_copies, changer, Debug_Point).
+interrupted_before_change_type_disc_only2ram(suite) -> [];
+interrupted_before_change_type_disc_only2ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_change_type(Config, disc_only_copies, ram_copies, changer, Debug_Point).
+interrupted_before_change_type_disc_only2disc(suite) -> [];
+interrupted_before_change_type_disc_only2disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_change_type(Config, disc_only_copies, disc_copies, changer, Debug_Point).
+interrupted_before_change_type_other_node(suite) -> [];
+interrupted_before_change_type_other_node(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, dump_schema_op},    
+    interrupted_change_type(Config, ram_copies, disc_copies, the_other_one, Debug_Point).
+
+interrupted_after_change_type_ram2disc(suite) -> [];
+interrupted_after_change_type_ram2disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_change_type(Config, ram_copies, disc_copies, changer, Debug_Point).
+interrupted_after_change_type_ram2disc_only(suite) -> [];
+interrupted_after_change_type_ram2disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_change_type(Config, ram_copies, disc_only_copies, changer, Debug_Point).    
+interrupted_after_change_type_disc2ram(suite) -> [];
+interrupted_after_change_type_disc2ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_change_type(Config, disc_copies, ram_copies, changer, Debug_Point).
+interrupted_after_change_type_disc2disc_only(suite) -> [];
+interrupted_after_change_type_disc2disc_only(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_change_type(Config, disc_copies, disc_only_copies, changer, Debug_Point).
+interrupted_after_change_type_disc_only2ram(suite) -> [];
+interrupted_after_change_type_disc_only2ram(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_change_type(Config, disc_only_copies, ram_copies, changer, Debug_Point).
+interrupted_after_change_type_disc_only2disc(suite) -> [];
+interrupted_after_change_type_disc_only2disc(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_change_type(Config, disc_only_copies, disc_copies, changer, Debug_Point).
+interrupted_after_change_type_other_node(suite) -> [];
+interrupted_after_change_type_other_node(Config) when is_list(Config) ->
+    Debug_Point = {mnesia_dumper, post_dump},    
+    interrupted_change_type(Config, ram_copies, disc_copies, the_other_one, Debug_Point).
+
+interrupted_change_type(Config, FromType, ToType, Who, KillAt) ->
+    ?is_debug_compiled,
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+    Tab = itrpt,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{FromType, [Node2, Node1]}])),
+    ?match(ok, mnesia:dirty_write({Tab, before, 1})),
+
+    {_Alive, Kill} = 
+	if Who == changer -> {Node1, Node2};
+	   true ->           {Node2, Node1}
+	end,
+    
+    {success, [A]} = ?start_activities([Kill]),
+    setup_dbgpoint(KillAt, Kill),
+    A ! fun() -> mnesia:change_table_copy_type(Tab, Node2, ToType) end,
+    kill_at_debug(),
+    ?match([], mnesia_test_lib:start_mnesia(Nodes, [itrpt])),        
+    verify_tab(Node1, Node2),
+    ?match(FromType, rpc:call(Node1, mnesia, table_info, [Tab, storage_type])),
+    ?match(ToType, rpc:call(Node2, mnesia, table_info, [Tab, storage_type])),
+    ?verify_mnesia(Nodes, []).
+
+interrupted_before_change_schema_type(suite) ->     [];
+interrupted_before_change_schema_type(Config) when is_list(Config) ->
+    KillAt = {mnesia_dumper, dump_schema_op},
+    interrupted_change_schema_type(Config, KillAt).
+
+interrupted_after_change_schema_type(suite) ->     [];
+interrupted_after_change_schema_type(Config) when is_list(Config) ->
+    KillAt = {mnesia_dumper, post_dump},
+    interrupted_change_schema_type(Config, KillAt).
+
+-define(cleanup(N, Config),
+	mnesia_test_lib:prepare_test_case([{reload_appls, [mnesia]}],
+					  N, Config, ?FILE, ?LINE)).
+    
+interrupted_change_schema_type(Config, KillAt) ->
+    ?is_debug_compiled,
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, [{tc_timeout, timer:seconds(30)} | Config]),
+
+    Tab = itrpt,
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{ram_copies, [Node2, Node1]}])),
+    ?match(ok, mnesia:dirty_write({Tab, before, 1})),
+    
+    {success, [A]} = ?start_activities([Node2]),
+    setup_dbgpoint(KillAt, Node2),	
+    
+    A ! fun() -> mnesia:change_table_copy_type(schema, Node2, ram_copies) end,
+    kill_at_debug(),    
+    ?match(ok, rpc:call(Node2, mnesia, start, [[{extra_db_nodes, [Node1, Node2]}]])),
+    ?match(ok, rpc:call(Node2, mnesia, wait_for_tables, [[itrpt, schema], 2000])),
+    ?match(disc_copies, rpc:call(Node1, mnesia, table_info, [schema, storage_type])),
+    ?match(ram_copies, rpc:call(Node2, mnesia, table_info,  [schema, storage_type])),
+    
+    %% Go back to disc_copies !!    
+    {success, [B]} = ?start_activities([Node2]),
+    setup_dbgpoint(KillAt, Node2),	
+    B ! fun() -> mnesia:change_table_copy_type(schema, Node2, disc_copies) end,
+    kill_at_debug(),
+
+    ?match(ok, rpc:call(Node2, mnesia, start, [[{extra_db_nodes, [Node1, Node2]}]])),
+    ?match(ok, rpc:call(Node2, mnesia, wait_for_tables, [[itrpt, schema], 2000])),
+    ?match(disc_copies, rpc:call(Node1, mnesia, table_info, [schema, storage_type])),
+    ?match(disc_copies, rpc:call(Node2, mnesia, table_info,  [schema, storage_type])),
+
+    ?verify_mnesia(Nodes, []),
+    ?cleanup(2, Config).
+
+%%% Helpers
+verify_tab(Node1, Node2) ->
+    ?match({atomic, ok}, 
+	   rpc:call(Node1, mnesia, transaction, [fun() -> mnesia:dirty_write({itrpt, a, a}) end])),
+    ?match({atomic, ok},
+	   rpc:call(Node2, mnesia, transaction, [fun() -> mnesia:dirty_write({itrpt, b, a}) end])),
+    ?match([{itrpt,a,a}], rpc:call(Node1, mnesia, dirty_read, [{itrpt, a}])), 
+    ?match([{itrpt,a,a}], rpc:call(Node2, mnesia, dirty_read, [{itrpt, a}])),
+    ?match([{itrpt,b,a}], rpc:call(Node1, mnesia, dirty_read, [{itrpt, b}])), 
+    ?match([{itrpt,b,a}], rpc:call(Node2, mnesia, dirty_read, [{itrpt, b}])),
+    ?match([{itrpt,before,1}], rpc:call(Node1, mnesia, dirty_read, [{itrpt, before}])),
+    ?match([{itrpt,before,1}], rpc:call(Node2, mnesia, dirty_read, [{itrpt, before}])).
+
+setup_dbgpoint(DbgPoint, Where) -> 
+    Self = self(),
+    TestFun = fun(_, [InitBy]) ->
+		      case InitBy of
+			  schema_prepare ->
+			      ignore;
+			  schema_begin ->
+			      ignore;
+			  _Other ->
+			      ?deactivate_debug_fun(DbgPoint),
+			      unlink(Self),
+			      Self ! {fun_done, node()},
+			      timer:sleep(infinity)
+		      end
+	      end, 
+    %% Kill when debug has been reached
+    ?remote_activate_debug_fun(Where, DbgPoint, TestFun, []).
+
+kill_at_debug() ->   
+    %% Wait till it's killed
+    receive 
+	{fun_done, Node} -> 
+	    ?match([], mnesia_test_lib:kill_mnesia([Node]))
+    after 
+	timer:minutes(1) -> ?error("Timeout in kill_at_debug", [])
+    end.
+
diff --git a/lib/mnesia/test/mnesia_test_lib.erl b/lib/mnesia/test/mnesia_test_lib.erl
new file mode 100644
index 0000000000..182c240084
--- /dev/null
+++ b/lib/mnesia/test/mnesia_test_lib.erl
@@ -0,0 +1,1058 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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%
+%%
+
+%%
+%%% Author: Hakan Mattsson  [email protected]
+%%% Purpose: Test case support library
+%%%
+%%% This test suite may be run as a part of the Grand Test Suite
+%%% of Erlang.  The Mnesia test suite is structured in a hierarchy.
+%%% Each test case is implemented as an exported function with arity 1.
+%%% Test case identifiers must have the following syntax: {Module, Function}.
+%%%
+%%% The driver of the test suite runs in two passes as follows:
+%%% first the test case function is invoked with the atom 'suite' as
+%%% single argument. The returned value is treated as a list of sub
+%%% test cases. If the list of sub test cases is [] the test case
+%%% function is invoked again, this time with a list of nodes as
+%%% argument. If the list of sub test cases is not empty, the test
+%%% case driver applies the algorithm recursively on each element
+%%% in the list.
+%%%
+%%% All test cases are written in such a manner
+%%% that they start to invoke ?acquire_nodes(X, Config)
+%%% in order to prepare the test case execution. When that is
+%%% done, the test machinery ensures that at least X number
+%%% of nodes are connected to each other. If too few nodes was
+%%% specified in the Config, the test case is skipped. If there
+%%% was enough node names in the Config, X of them are selected
+%%% and if some of them happens to be down they are restarted
+%%% via the slave module. When all nodes are up and running a
+%%% disk resident schema is created on all nodes and Mnesia is
+%%% started a on all nodes. This means that all test cases may
+%%% assume that Mnesia is up and running on all acquired nodes.
+%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%
+%%% doc(TestCases)
+%%%
+%%%    Generates a test spec from parts of the test case structure
+%%%
+%%% struct(TestCases)
+%%%
+%%%    Prints out the test case structure
+%%%
+%%% test(TestCases)
+%%%
+%%%    Run parts of the test suite. Uses test/2.
+%%%    Reads Config from mnesia_test.config and starts them if neccessary.
+%%%    Kills Mnesia and wipes out the Mnesia directories as a starter.
+%%%
+%%% test(TestCases, Config)
+%%%
+%%%    Run parts of the test suite on the given Nodes,
+%%%    assuming that the nodes are up and running.
+%%%    Kills Mnesia and wipes out the Mnesia directories as a starter.
+%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-module(mnesia_test_lib).
+-author('[email protected]').
+-export([
+	 log/2,
+	 log/4,
+	 verbose/4,
+	 default_config/0,
+	 diskless/1,
+	 eval_test_case/3,
+	 test_driver/2,
+	 test_case_evaluator/3,
+	 activity_evaluator/1,
+	 flush/0,
+	 pick_msg/0,
+	 start_activities/1,
+	 start_transactions/1,
+	 start_transactions/2,
+	 start_sync_transactions/1,
+	 start_sync_transactions/2,
+	 sync_trans_tid_serial/1,
+	 prepare_test_case/5,
+	 select_nodes/4,
+	 init_nodes/3,
+	 error/4,
+	 slave_start_link/0,
+	 slave_start_link/1,
+	 slave_sup/0,
+	
+	 start_mnesia/1,
+	 start_mnesia/2,
+	 start_appls/2,
+	 start_appls/3,
+	 start_wait/2,
+	 storage_type/2,
+	 stop_mnesia/1,
+	 stop_appls/2,
+	 sort/1,
+	 kill_mnesia/1,
+	 kill_appls/2,
+	 verify_mnesia/4,
+	 shutdown/0,
+	 verify_replica_location/5,
+	 lookup_config/2,
+	 sync_tables/2,
+	 remote_start/3,
+	 remote_stop/1,
+	 remote_kill/1,
+
+	 reload_appls/2,
+
+	 remote_activate_debug_fun/6,
+	 do_remote_activate_debug_fun/6,
+
+	 test/1,
+	 test/2,
+	 doc/1,
+	 struct/1,
+	 init_per_testcase/2,
+	 end_per_testcase/2,
+	 kill_tc/2	
+	]).
+
+-include("mnesia_test_lib.hrl").
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% included for test server compatibility
+%% assume that all test cases only takes Config as sole argument
+init_per_testcase(_Func, Config) ->
+    global:register_name(mnesia_global_logger, group_leader()),
+    Config.
+
+end_per_testcase(_Func, Config) ->
+    global:unregister_name(mnesia_global_logger),
+    %% Nodes = select_nodes(all, Config, ?FILE, ?LINE),
+    %% rpc:multicall(Nodes, mnesia, lkill, []),
+    Config.
+
+%% Use ?log(Format, Args) as wrapper
+log(Format, Args, LongFile, Line) ->
+    File = filename:basename(LongFile),
+    Format2 = lists:concat([File, "(", Line, ")", ": ", Format]),
+    log(Format2, Args).
+
+log(Format, Args) ->
+    case global:whereis_name(mnesia_global_logger) of
+	undefined ->
+	    io:format(user, Format, Args);
+	Pid ->
+	    io:format(Pid, Format, Args)
+    end.
+
+verbose(Format, Args, File, Line) ->
+    Arg = mnesia_test_verbose,
+    case get(Arg) of
+	false ->
+	    ok;
+	true ->
+	    log(Format, Args, File, Line);
+	undefined ->
+	    case init:get_argument(Arg) of
+		{ok, List} when is_list(List) ->
+		    case lists:last(List) of
+			["true"] ->
+			    put(Arg, true),
+			    log(Format, Args, File, Line);
+			_ ->
+			    put(Arg, false),
+			    ok
+		    end;
+		_ ->
+		    put(Arg, false),
+		    ok
+	    end
+    end.
+    
+-record('REASON', {file, line, desc}).
+
+error(Format, Args, File, Line) ->
+    global:send(mnesia_global_logger, {failed, File, Line}),
+    Fail = #'REASON'{file = filename:basename(File),
+		     line = Line,
+		     desc = Args},
+    case global:whereis_name(mnesia_test_case_sup) of
+	undefined -> 
+	    ignore;
+	Pid -> 
+	    Pid ! Fail
+%% 	    global:send(mnesia_test_case_sup, Fail),
+    end,
+    log("<>ERROR<>~n" ++ Format, Args, File, Line).
+
+storage_type(Default, Config) ->
+    case diskless(Config) of
+	true ->
+	    ram_copies;
+	false ->
+	    Default
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+default_config() ->
+    [{nodes, default_nodes()}].
+
+default_nodes() ->    
+    mk_nodes(3, []).
+
+mk_nodes(0, Nodes) ->
+    Nodes;
+mk_nodes(N, []) ->
+    mk_nodes(N - 1, [node()]);
+mk_nodes(N, Nodes) when N > 0 ->
+    Head = hd(Nodes),
+    [Name, Host] = node_to_name_and_host(Head),
+    Nodes ++ [mk_node(I, Name, Host) || I <- lists:seq(1, N)].
+
+mk_node(N, Name, Host) ->
+    list_to_atom(lists:concat([Name ++ integer_to_list(N) ++ "@" ++ Host])).
+    
+slave_start_link() ->
+    slave_start_link(node()).
+
+slave_start_link(Node) ->
+    [Local, Host] = node_to_name_and_host(Node),
+    {Mega, Sec, Micro} = erlang:now(),
+    List = [Local, "_", Mega, "_", Sec, "_", Micro],
+    Name = list_to_atom(lists:concat(List)),
+    slave_start_link(list_to_atom(Host), Name).
+
+slave_start_link(Host, Name) ->
+    slave_start_link(Host, Name, 10).
+
+slave_start_link(Host, Name, Retries) ->
+    Debug = atom_to_list(mnesia:system_info(debug)),
+    Args = "-mnesia debug " ++ Debug ++ 
+	" -pa " ++
+	filename:dirname(code:which(?MODULE)) ++ 
+	" -pa " ++ 
+	filename:dirname(code:which(mnesia)),    
+    case starter(Host, Name, Args) of
+	{ok, NewNode} ->
+	    ?match(pong, net_adm:ping(NewNode)),
+	    {ok, Cwd} = file:get_cwd(),
+	    Path = code:get_path(),
+	    ok = rpc:call(NewNode, file, set_cwd, [Cwd]),
+	    true = rpc:call(NewNode, code, set_path, [Path]),
+	    spawn_link(NewNode, ?MODULE, slave_sup, []),
+	    rpc:multicall([node() | nodes()], global, sync, []),
+	    {ok, NewNode};
+	{error, Reason} when Retries == 0->
+	    {error, Reason};
+	{error, Reason} ->	    
+	    io:format("Could not start slavenode ~p ~p retrying~n", 
+		      [{Host, Name, Args}, Reason]),
+	    timer:sleep(500),
+	    slave_start_link(Host, Name, Retries - 1)
+    end.
+
+starter(Host, Name, Args) ->
+    case os:type() of
+	vxworks ->
+	    X = test_server:start_node(Name, slave, [{args,Args}]),
+	    timer:sleep(5000),
+	    X;
+	_ ->
+	    slave:start(Host, Name, Args)
+    end.
+
+slave_sup() ->
+    process_flag(trap_exit, true),
+    receive
+	{'EXIT', _, _} -> 
+	    case os:type() of
+		vxworks ->
+		    erlang:halt();
+		_  ->
+		    ignore
+	    end
+    end.
+    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Index the test case structure
+
+doc(TestCases) when is_list(TestCases) ->
+    test(TestCases, suite),
+    SuiteFname = "index.html",
+    io:format("Generating HTML test specification to file: ~s~n",
+	      [SuiteFname]),
+    {ok, Fd} = file:open(SuiteFname, [write]),
+    io:format(Fd, "<TITLE>Test specification for ~p</TITLE>.~n", [TestCases]),
+    io:format(Fd, "<H1>Test specification for ~p</H1>~n", [TestCases]),
+    io:format(Fd, "Test cases which not are implemented yet are written in <B>bold face</B>.~n~n", []),
+    
+    io:format(Fd, "<BR><BR>~n", []),
+    io:format(Fd, "~n<DL>~n", []),
+    do_doc(Fd, TestCases, []),
+    io:format(Fd, "</DL>~n", []),
+    file:close(Fd);
+doc(TestCases) ->
+    doc([TestCases]).
+
+do_doc(Fd, [H | T], List) ->
+    case H of
+	{Module, TestCase} when is_atom(Module), is_atom(TestCase) ->
+	    do_doc(Fd, Module, TestCase, List);
+	TestCase when is_atom(TestCase), List == [] ->
+	    do_doc(Fd, mnesia_SUITE, TestCase, List);
+	TestCase when is_atom(TestCase) ->
+	    do_doc(Fd, hd(List), TestCase, List)
+    end,
+    do_doc(Fd, T, List);
+do_doc(_, [], _) ->
+    ok.
+
+do_doc(Fd, Module, TestCase, List) ->
+    case get_suite(Module, TestCase) of
+	[] ->
+	    %% Implemented leaf test case
+	    Head = ?flat_format("<A HREF=~p.html#~p_1>{~p, ~p}</A>}",
+				[Module, TestCase, Module, TestCase]),
+	    print_doc(Fd, Module, TestCase, Head);
+	Suite when is_list(Suite) ->
+	    %% Test suite
+	    Head = ?flat_format("{~p, ~p}", [Module, TestCase]),
+	    print_doc(Fd, Module, TestCase, Head),
+	    io:format(Fd, "~n<DL>~n", []),
+	    do_doc(Fd, Suite, [Module | List]),
+	    io:format(Fd, "</DL>~n", []);
+	'NYI' ->
+	    %% Not yet implemented
+	    Head = ?flat_format("<B>{~p, ~p}</B>", [Module, TestCase]),
+	    print_doc(Fd, Module, TestCase, Head)
+    end.
+
+print_doc(Fd, Mod, Fun, Head) ->
+    case catch (apply(Mod, Fun, [doc])) of
+	{'EXIT', _} -> 
+	    io:format(Fd, "<DT>~s</DT>~n", [Head]);
+	Doc when is_list(Doc) ->
+	    io:format(Fd, "<DT><U>~s</U><BR><DD>~n", [Head]),
+	    print_rows(Fd, Doc),
+	    io:format(Fd, "</DD><BR><BR>~n", [])
+    end.
+
+print_rows(_Fd, []) ->
+    ok;
+print_rows(Fd, [H | T]) when is_list(H) ->
+    io:format(Fd, "~s~n", [H]),
+    print_rows(Fd, T);
+print_rows(Fd, [H | T]) when is_integer(H) ->
+    io:format(Fd, "~s~n", [[H | T]]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Show the test case structure
+
+struct(TestCases) ->
+    T = test(TestCases, suite),
+    struct(T, "").
+
+struct({Module, TestCase}, Indentation)
+        when is_atom(Module), is_atom(TestCase) ->
+    log("~s{~p, ~p} ...~n", [Indentation, Module, TestCase]);
+struct({Module, TestCase, Other}, Indentation)
+        when is_atom(Module), is_atom(TestCase) ->
+    log("~s{~p, ~p} ~p~n", [Indentation, Module, TestCase, Other]);
+struct([], _) ->
+    ok;
+struct([TestCase | TestCases], Indentation) ->
+    struct(TestCase, Indentation),
+    struct(TestCases, Indentation);
+struct({TestCase, []}, Indentation) ->
+    struct(TestCase, Indentation);
+struct({TestCase, SubTestCases}, Indentation) when is_list(SubTestCases) ->
+    struct(TestCase, Indentation),
+    struct(SubTestCases, Indentation ++ "  ").
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Execute the test cases
+
+test(TestCases) ->
+    test(TestCases, []).
+
+test(TestCases, suite) when is_list(TestCases) ->
+    test_driver(TestCases, suite);
+test(TestCases, Config) when is_list(TestCases) ->
+    D1 = lists:duplicate(10, $=),
+    D2 =  lists:duplicate(10, $ ),
+    log("~n~s TEST CASES: ~p~n ~sCONFIG: ~p~n~n", [D1, TestCases, D2, Config]),
+    test_driver(TestCases, Config);
+test(TestCase, Config) ->
+    test([TestCase], Config).
+
+test_driver([], _Config) ->
+    [];
+test_driver([T|TestCases], Config) ->
+    L1 = test_driver(T, Config),
+    L2 = test_driver(TestCases, Config),
+    [L1|L2];
+test_driver({Module, TestCases}, Config) when is_list(TestCases)->
+    test_driver(default_module(Module, TestCases), Config);
+test_driver({_, {Module, TestCase}}, Config) ->
+    test_driver({Module, TestCase}, Config);
+test_driver({Module, TestCase}, Config) ->
+    Sec = timer:seconds(1) * 1000,
+    case get_suite(Module, TestCase) of
+	[] when Config == suite ->
+	    {Module, TestCase, 'IMPL'};
+	[] ->
+	    log("Eval test case: ~w~n", [{Module, TestCase}]),
+	    {T, Res} =
+		timer:tc(?MODULE, eval_test_case, [Module, TestCase, Config]),
+	    log("Tested ~w in ~w sec~n", [TestCase, T div Sec]),
+	    {T div Sec, Res};
+	Suite when is_list(Suite), Config == suite ->
+	    Res = test_driver(default_module(Module, Suite), Config),
+	    {{Module, TestCase}, Res};
+	Suite when is_list(Suite) ->
+	    log("Expand test case ~w~n", [{Module, TestCase}]),
+	    Def = default_module(Module, Suite),
+	    {T, Res} = timer:tc(?MODULE, test_driver, [Def, Config]),
+	    {T div Sec, {{Module, TestCase}, Res}};
+	'NYI' when Config == suite ->
+	    {Module, TestCase, 'NYI'};
+	'NYI' ->
+      	    log("<WARNING> Test case ~w NYI~n", [{Module, TestCase}]),
+	    {0, {skip, {Module, TestCase}, "NYI"}}
+    end;
+test_driver(TestCase, Config) ->
+    DefaultModule = mnesia_SUITE,
+    log("<>WARNING<> Missing module in test case identifier. "
+	"{~w, ~w} assumed~n", [DefaultModule, TestCase]),
+    test_driver({DefaultModule, TestCase}, Config).
+
+default_module(DefaultModule, TestCases) when is_list(TestCases) ->
+    Fun = fun(T) ->
+		  case T of
+		      {_, _} -> true;
+		      T -> {true, {DefaultModule, T}}
+		  end
+	  end,
+    lists:zf(Fun, TestCases).
+
+%% Returns a list (possibly empty) or the atom 'NYI'
+get_suite(Mod, Fun) ->
+    case catch (apply(Mod, Fun, [suite])) of
+	{'EXIT', _} -> 'NYI';
+	List when is_list(List) -> List
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+eval_test_case(Mod, Fun, Config) ->
+    flush(),
+    global:register_name(mnesia_test_case_sup, self()),
+    Flag = process_flag(trap_exit, true),
+    Pid = spawn_link(?MODULE, test_case_evaluator, [Mod, Fun, [Config]]),
+    R = wait_for_evaluator(Pid, Mod, Fun, Config),
+    global:unregister_name(mnesia_test_case_sup),
+    process_flag(trap_exit, Flag),
+    R.
+
+flush() ->
+    receive Msg -> [Msg | flush()]
+    after 0 -> []
+    end.
+
+wait_for_evaluator(Pid, Mod, Fun, Config) ->
+    receive
+	{'EXIT', Pid, {test_case_ok, _PidRes}} ->
+	    Errors = flush(),
+	    Res = 
+		case Errors of
+		    [] -> ok;
+		    Errors -> failed
+		end,
+	    {Res, {Mod, Fun}, Errors};
+	{'EXIT', Pid, {skipped, Reason}} ->
+	    log("<WARNING> Test case ~w skipped, because ~p~n",
+		[{Mod, Fun}, Reason]),
+	    Mod:end_per_testcase(Fun, Config),
+	    {skip, {Mod, Fun}, Reason};
+	{'EXIT', Pid, Reason} ->
+	    log("<>ERROR<> Eval process ~w exited, because ~p~n",
+		[{Mod, Fun}, Reason]),
+	    Mod:end_per_testcase(Fun, Config),
+	    {crash, {Mod, Fun}, Reason}
+    end.
+
+test_case_evaluator(Mod, Fun, [Config]) ->
+    NewConfig = Mod:init_per_testcase(Fun, Config),
+    R = apply(Mod, Fun, [NewConfig]),
+    Mod:end_per_testcase(Fun, NewConfig),
+    exit({test_case_ok, R}).
+
+activity_evaluator(Coordinator) ->
+    activity_evaluator_loop(Coordinator),
+    exit(normal).
+
+activity_evaluator_loop(Coordinator) ->
+    receive
+	begin_trans ->
+	    transaction(Coordinator, 0);
+	{begin_trans, MaxRetries} ->
+	    transaction(Coordinator, MaxRetries);
+	end_trans ->
+	    end_trans;
+	Fun when is_function(Fun) ->
+	    Coordinator ! {self(), Fun()},
+	    activity_evaluator_loop(Coordinator);
+%	{'EXIT', Coordinator, Reason} ->
+%	    Reason;
+	ExitExpr ->
+%	    ?error("activity_evaluator_loop ~p ~p: exit(~p)~n}", [Coordinator, self(), ExitExpr]),
+	    exit(ExitExpr)
+    end.
+
+transaction(Coordinator, MaxRetries) ->
+    Fun = fun() ->
+		  Coordinator ! {self(), begin_trans},
+		  activity_evaluator_loop(Coordinator)
+	  end,
+    Coordinator ! {self(), mnesia:transaction(Fun, MaxRetries)},
+    activity_evaluator_loop(Coordinator).
+
+pick_msg() ->
+    receive
+	Message -> Message
+    after 4000 -> timeout
+    end.
+
+start_activities(Nodes) ->
+    Fun = fun(N) -> spawn_link(N, ?MODULE, activity_evaluator, [self()]) end,
+    Pids = mapl(Fun, Nodes),
+    {success, Pids}.
+
+mapl(Fun, [H|T]) ->
+    Res = Fun(H),
+    [Res|mapl(Fun, T)];
+mapl(_Fun, []) ->
+    [].
+
+diskless(Config) ->
+    case lists:keysearch(diskless, 1, Config) of
+	{value, {diskless, true}} -> 
+	    true;
+	_Else ->
+	    false
+    end.
+
+
+start_transactions(Pids) ->
+    Fun = fun(Pid) ->
+		  Pid ! begin_trans,
+		  ?match_receive({Pid, begin_trans})
+	  end,
+    mapl(Fun, Pids).
+
+start_sync_transactions(Pids) ->
+    Nodes = [node(Pid) || Pid <- Pids],
+    Fun = fun(Pid) ->
+		  sync_trans_tid_serial(Nodes),
+		  Pid ! begin_trans,
+		  ?match_receive({Pid, begin_trans})
+	  end,
+    mapl(Fun, Pids).
+
+
+start_transactions(Pids, MaxRetries) ->
+    Fun = fun(Pid) ->
+		  Pid ! {begin_trans, MaxRetries},
+		  ?match_receive({Pid, begin_trans})
+	  end,
+    mapl(Fun, Pids).
+
+start_sync_transactions(Pids, MaxRetries) ->
+    Nodes = [node(Pid) || Pid <- Pids],
+    Fun = fun(Pid) ->
+		  sync_trans_tid_serial(Nodes),
+		  Pid ! {begin_trans, MaxRetries},
+		  ?match_receive({Pid, begin_trans})
+	  end,
+    mapl(Fun, Pids).
+
+sync_trans_tid_serial(Nodes) ->
+    Fun = fun() -> mnesia:write_lock_table(schema) end,
+    rpc:multicall(Nodes, mnesia, transaction, [Fun]).
+
+select_nodes(N, Config, File, Line) ->
+    prepare_test_case([], N, Config, File, Line).
+    
+prepare_test_case(Actions, N, Config, File, Line) ->
+    NodeList1 = lookup_config(nodes, Config),
+    NodeList2 = lookup_config(nodenames, Config), %% For testserver
+    NodeList3 = append_unique(NodeList1, NodeList2),
+    This = node(),
+    All = [This | lists:delete(This, NodeList3)],
+    Selected = pick_nodes(N, All, File, Line),
+    case diskless(Config) of
+	true ->
+	    ok;
+	false ->
+	    rpc:multicall(Selected, application, set_env,[mnesia, schema_location, opt_disc])
+    end,
+    do_prepare(Actions, Selected, All, Config, File, Line).
+
+do_prepare([], Selected, _All, _Config, _File, _Line) ->
+    Selected;
+do_prepare([{init_test_case, Appls} | Actions], Selected, All, Config, File, Line) ->
+    set_kill_timer(Config),
+    Started = init_nodes(Selected, File, Line),
+    All2 = append_unique(Started, All),
+    Alive = mnesia_lib:intersect(nodes() ++ [node()], All2),
+    kill_appls(Appls, Alive),
+    process_flag(trap_exit, true),
+    do_prepare(Actions, Started, All2, Config, File, Line);
+do_prepare([delete_schema | Actions], Selected, All, Config, File, Line) ->
+    Alive = mnesia_lib:intersect(nodes() ++ [node()], All),
+    case diskless(Config) of
+	true ->
+	    skip;
+	false ->
+	    Del = fun(Node) -> 
+			  case mnesia:delete_schema([Node]) of
+			      ok -> ok;
+			      {error, {"All nodes not running",_}} -> 
+				  ok;
+			      Else ->
+				  ?log("Delete schema error ~p ~n", [Else])
+			  end
+		  end,
+	    lists:foreach(Del, Alive)
+    end,
+    do_prepare(Actions, Selected, All, Config, File, Line);
+do_prepare([create_schema | Actions], Selected, All, Config, File, Line) ->
+    case diskless(Config) of
+	true -> 
+	    skip;
+	_Else ->
+	    case mnesia:create_schema(Selected) of
+		ok ->
+		    ignore;
+		BadNodes ->
+		    ?fatal("Cannot create Mnesia schema on ~p~n", [BadNodes])
+	    end
+    end,
+    do_prepare(Actions, Selected, All, Config, File, Line);
+do_prepare([{start_appls, Appls} | Actions], Selected, All, Config, File, Line) ->
+    case start_appls(Appls, Selected, Config) of
+	[] -> ok;
+	Bad -> ?fatal("Cannot start appls ~p: ~p~n", [Appls, Bad])
+    end,
+    do_prepare(Actions, Selected, All, Config, File, Line);
+do_prepare([{reload_appls, Appls} | Actions], Selected, All, Config, File, Line) ->
+    reload_appls(Appls, Selected),
+    do_prepare(Actions, Selected, All, Config, File, Line).
+
+set_kill_timer(Config) ->
+    case init:get_argument(mnesia_test_timeout) of
+	{ok, _ } -> ok;
+	_ ->
+	    Time0 = 
+		case lookup_config(tc_timeout, Config) of
+		    [] -> timer:minutes(5);
+		    ConfigTime when is_integer(ConfigTime) -> ConfigTime
+		end,
+	    Mul = try 
+		      test_server:timetrap_scale_factor()
+		  catch _:_ -> 1 end,
+	    (catch test_server:timetrap(Mul*Time0 + 1000)),
+	    spawn_link(?MODULE, kill_tc, [self(),Time0*Mul])
+    end.
+
+kill_tc(Pid, Time) ->
+    receive 
+    after Time ->
+	    case process_info(Pid) of
+		undefined ->  ok;
+		_ ->
+		    ?error("Watchdog in test case timed out "
+			   "in ~p min~n", [Time div (1000*60)]),
+		    Files = mnesia_lib:dist_coredump(),
+		    ?log("Cores dumped to:~n ~p~n", [Files]),
+		    %% Genarate erlang crashdumps.
+		    %% GenDump = fun(Node) ->
+		    %% 		      File = "CRASH_" ++ atom_to_list(Node) ++ ".dump",
+		    %% 		      rpc:call(Node, os, putenv, ["ERL_CRASH_DUMP", File]),
+		    %% 		      rpc:cast(Node, erlang, halt, ["RemoteTimeTrap"])
+		    %% 	      end,
+		    %% [GenDump(Node) || Node <- nodes()],
+
+		    %% erlang:halt("DebugTimeTrap"),
+		    exit(Pid, kill)
+	    end
+    end.
+    
+
+append_unique([], List) -> List;
+append_unique([H|R], List) -> 
+    case lists:member(H, List) of
+	true -> append_unique(R, List);
+	false -> [H | append_unique(R, List)]
+    end.
+
+pick_nodes(all, Nodes, File, Line) ->
+    pick_nodes(length(Nodes), Nodes, File, Line);
+pick_nodes(N, [H | T], File, Line) when N > 0 ->
+    [H | pick_nodes(N - 1, T, File, Line)]; 
+pick_nodes(0, _Nodes, _File, _Line) ->
+    [];
+pick_nodes(N, [], File, Line) ->
+    ?skip("Test case (~p(~p)) ignored: ~p nodes missing~n",
+	  [File, Line, N]).
+   
+init_nodes([Node | Nodes], File, Line) ->
+    case net_adm:ping(Node) of
+	pong ->
+	    [Node | init_nodes(Nodes, File, Line)];
+	pang ->
+	    [Name, Host] = node_to_name_and_host(Node),
+	    case slave_start_link(Host, Name) of
+		{ok, Node1} ->
+		    Path = code:get_path(),
+		    true = rpc:call(Node1, code, set_path, [Path]),
+		    [Node1 | init_nodes(Nodes, File, Line)];
+		Other ->
+		    ?skip("Test case (~p(~p)) ignored: cannot start node ~p: ~p~n",
+			  [File, Line, Node, Other])
+	    end
+    end;
+init_nodes([], _File, _Line) ->
+    [].
+
+%% Returns [Name, Host]    
+node_to_name_and_host(Node) ->
+    string:tokens(atom_to_list(Node), [$@]).
+
+lookup_config(Key,Config) ->
+    case lists:keysearch(Key,1,Config) of
+	{value,{Key,Val}} ->
+	    Val;
+	_ ->
+	    []
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+start_appls(Appls, Nodes) ->
+    start_appls(Appls, Nodes, [],  [schema]).
+    
+start_appls(Appls, Nodes, Config) ->
+    start_appls(Appls, Nodes, Config, [schema]).
+
+start_appls([Appl | Appls], Nodes, Config, Tabs) ->
+    {Started, BadStarters} =
+	rpc:multicall(Nodes, ?MODULE, remote_start, [Appl, Config, Nodes]),
+    BadS = [{Node, Appl, Res} || {Node, Res} <- Started, Res /= ok],
+    BadN = [{BadNode, Appl, bad_start} || BadNode <- BadStarters],
+    Bad = BadS ++ BadN,
+    case Appl of
+	mnesia when Bad == [] ->
+	    sync_tables(Nodes, Tabs);
+	_ ->
+	    ignore
+    end,
+    Bad ++ start_appls(Appls, Nodes, Config, Tabs);
+start_appls([], _Nodes, _Config, _Tabs) ->
+    [].
+
+remote_start(mnesia, Config, Nodes) ->
+    case diskless(Config) of
+	true -> 
+	    application_controller:set_env(mnesia, 
+					   extra_db_nodes, 
+					   Nodes -- [node()]),
+	    application_controller:set_env(mnesia,
+					   schema_location,
+					   ram);
+	false ->
+	    application_controller:set_env(mnesia,
+					   schema_location,
+					   opt_disc),
+	    ignore
+    end,
+    {node(), mnesia:start()};
+remote_start(Appl, _Config, _Nodes) ->
+    Res = 
+	case application:start(Appl) of
+	    {error, {already_started, Appl}} ->
+		ok;
+	    Other ->
+		Other
+	end,
+    {node(), Res}.
+
+%% Start Mnesia on all given nodes and wait for specified
+%% tables to be accessible on each node. The atom all means
+%% that we should wait for all tables to be loaded
+%% 
+%% Returns a list of error tuples {BadNode, mnesia, Reason}
+start_mnesia(Nodes) ->
+    start_appls([mnesia], Nodes).
+start_mnesia(Nodes, Tabs) when is_list(Nodes) ->
+    start_appls([mnesia], Nodes, [], Tabs).
+    
+%% Wait for the tables to be accessible from all nodes in the list
+%% and that all nodes are aware of that the other nodes also ...
+sync_tables(Nodes, Tabs) ->
+    Res = send_wait(Nodes, Tabs, []),
+    if
+	Res == 	[] ->
+	    mnesia:transaction(fun() -> mnesia:write_lock_table(schema) end),
+	    Res;
+	true ->
+	    Res
+    end.
+
+send_wait([Node | Nodes], Tabs, Pids) ->
+    Pid = spawn_link(Node, ?MODULE, start_wait, [self(), Tabs]),
+    send_wait(Nodes, Tabs, [Pid | Pids]);
+send_wait([], _Tabs, Pids) ->
+    rec_wait(Pids, []).
+
+rec_wait([Pid | Pids], BadRes) ->
+    receive
+	{'EXIT', Pid, R} ->
+	    rec_wait(Pids, [{node(Pid), bad_wait, R} | BadRes]);
+	{Pid, ok} ->
+	    rec_wait(Pids, BadRes);
+	{Pid, {error, R}} ->
+	    rec_wait(Pids, [{node(Pid), bad_wait, R} | BadRes])
+    end;
+rec_wait([], BadRes) ->
+    BadRes.
+
+start_wait(Coord, Tabs) ->
+    process_flag(trap_exit, true),
+    Mon = whereis(mnesia_monitor),
+    case catch link(Mon) of
+	{'EXIT', _} ->
+	    unlink(Coord),
+	    Coord ! {self(), {error, {node_not_running, node()}}};
+	_ ->
+	    Res = start_wait_loop(Tabs),
+	    unlink(Mon),
+	    unlink(Coord),
+	    Coord ! {self(), Res}
+    end.
+
+start_wait_loop(Tabs) ->
+    receive
+	{'EXIT', Pid, Reason} ->
+	    {error, {start_wait, Pid, Reason}}
+    after 0 ->
+	    case mnesia:wait_for_tables(Tabs, timer:seconds(30)) of
+		ok ->
+		    verify_nodes(Tabs);
+		{timeout, BadTabs} ->
+		    log("<>WARNING<> Wait for tables ~p: ~p~n", [node(), Tabs]),
+		    start_wait_loop(BadTabs);
+		{error, Reason} ->
+		    {error, {start_wait, Reason}}
+	    end
+    end.
+
+verify_nodes(Tabs) ->
+    verify_nodes(Tabs, 0).
+
+verify_nodes([], _) ->
+    ok;
+
+verify_nodes([Tab| Tabs], N) ->
+    ?match(X when is_atom(X), mnesia_lib:val({Tab, where_to_read})),
+    Nodes = mnesia:table_info(Tab, where_to_write),
+    Copies =
+	mnesia:table_info(Tab, disc_copies) ++
+        mnesia:table_info(Tab, disc_only_copies) ++
+	mnesia:table_info(Tab, ram_copies),
+    Local = mnesia:table_info(Tab, local_content),
+    case Copies -- Nodes of
+	[] -> 
+	    verify_nodes(Tabs, 0);
+	_Else when Local == true, Nodes /= [] ->
+	    verify_nodes(Tabs, 0);
+        Else ->
+	    N2 = 
+		if
+		    N > 20 -> 
+			log("<>WARNING<> ~w Waiting for table: ~p on ~p ~n", 
+				 [node(), Tab, Else]),
+			0;
+		    true -> N+1
+		end,	    
+	    timer:sleep(500),
+	    verify_nodes([Tab| Tabs], N2)
+    end.
+
+
+%% Nicely stop Mnesia on all given nodes
+%% 
+%% Returns a list of error tuples {BadNode, Reason}
+stop_mnesia(Nodes) when is_list(Nodes) ->
+    stop_appls([mnesia], Nodes).
+
+stop_appls([Appl | Appls], Nodes) when is_list(Nodes) ->
+    {Stopped, BadNodes} = rpc:multicall(Nodes, ?MODULE, remote_stop, [Appl]),
+    BadS =[{Node, Appl, Res} || {Node, Res} <- Stopped, Res /= stopped],
+    BadN =[{BadNode, Appl, bad_node} || BadNode <- BadNodes],
+    BadS ++ BadN ++ stop_appls(Appls, Nodes);
+stop_appls([], _Nodes) ->
+    [].
+
+remote_stop(mnesia) ->
+    {node(), mnesia:stop()};
+remote_stop(Appl) ->
+    {node(), application:stop(Appl)}.
+
+remote_kill([Appl | Appls]) ->
+    catch Appl:lkill(),
+    application:stop(Appl),
+    remote_kill(Appls);
+remote_kill([]) ->
+    ok.
+
+%% Abruptly kill Mnesia on all given nodes
+%% Returns []
+kill_appls(Appls, Nodes) when is_list(Nodes) ->
+    verbose("<>WARNING<> Intentionally killing ~p: ~w...~n",
+	    [Appls, Nodes], ?FILE, ?LINE),
+    rpc:multicall(Nodes, ?MODULE, remote_kill, [Appls]),
+    [].
+
+kill_mnesia(Nodes) when is_list(Nodes) ->
+    kill_appls([mnesia], Nodes).
+
+reload_appls([Appl | Appls], Selected) ->
+    kill_appls([Appl], Selected),
+    timer:sleep(1000),
+    Ok = {[ok || _N <- Selected], []},
+    {Ok2temp, Empty} = rpc:multicall(Selected, application, unload, [Appl]),
+    Conv = fun({error,{not_loaded,mnesia}}) -> ok; (Else) -> Else end,
+    Ok2 = {lists:map(Conv, Ok2temp), Empty},
+
+    Ok3 = rpc:multicall(Selected, application, load, [Appl]),
+    if
+	Ok /= Ok2 ->
+	    ?fatal("Cannot unload appl ~p: ~p~n", [Appl, Ok2]);
+	Ok /= Ok3 ->
+	    ?fatal("Cannot load appl ~p: ~p~n", [Appl, Ok3]);
+	true ->
+	    ok
+    end,
+    reload_appls(Appls, Selected);
+reload_appls([], _Selected) ->
+    ok.
+
+shutdown() ->
+    log("<>WARNING<> Intentionally shutting down all nodes... ~p~n",
+	 [nodes() ++ [node()]]),
+    rpc:multicall(nodes(), erlang, halt, []),
+    erlang:halt().
+
+verify_mnesia(Ups, Downs, File, Line) when is_list(Ups), is_list(Downs) ->
+    BadUps =
+	[N || N <- Ups, rpc:call(N, mnesia, system_info, [is_running]) /= yes],
+    BadDowns =
+	[N || N <- Downs, rpc:call(N, mnesia, system_info, [is_running]) == yes],
+    if
+	BadUps == [] ->
+	    ignore;
+	true ->
+	    error("Mnesia is not running as expected: ~p~n",
+		  [BadUps], File, Line)
+    end,
+    if
+	BadDowns == [] ->
+	    ignore;
+	true ->
+	    error("Mnesia is not stopped as expected: ~p~n",
+		  [BadDowns], File, Line)
+    end,
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+verify_replica_location(Tab, [], [], [], _) ->
+    ?match({'EXIT', _}, mnesia:table_info(Tab, ram_copies)),
+    ?match({'EXIT', _}, mnesia:table_info(Tab, disc_copies)),
+    ?match({'EXIT', _}, mnesia:table_info(Tab, disc_only_copies)),
+    ?match({'EXIT', _}, mnesia:table_info(Tab, where_to_write)),
+    ?match({'EXIT', _}, mnesia:table_info(Tab, where_to_read)),
+    [];
+
+verify_replica_location(Tab, DiscOnly0, Ram0, Disc0, AliveNodes0) ->
+%%    sync_tables(AliveNodes0, [Tab]),
+    AliveNodes = lists:sort(AliveNodes0),
+    DiscOnly = lists:sort(DiscOnly0),
+    Ram = lists:sort(Ram0),
+    Disc = lists:sort(Disc0),
+    Write = ignore_dead(DiscOnly ++ Ram ++ Disc, AliveNodes),
+    Read = ignore_dead(DiscOnly ++ Ram ++ Disc, AliveNodes),
+    This = node(),
+
+    timer:sleep(100), 
+
+    S1 = ?match(AliveNodes, lists:sort(mnesia:system_info(running_db_nodes))),
+    S2 = ?match(DiscOnly, lists:sort(mnesia:table_info(Tab, disc_only_copies))),
+    S3 = ?match(Ram, lists:sort(mnesia:table_info(Tab, ram_copies))),
+    S4 = ?match(Disc, lists:sort(mnesia:table_info(Tab, disc_copies))),
+    S5 = ?match(Write, lists:sort(mnesia:table_info(Tab, where_to_write))),
+    S6 = case lists:member(This, Read) of
+	     true ->
+		 ?match(This, mnesia:table_info(Tab, where_to_read));
+	     false ->
+		 ?match(true, lists:member(mnesia:table_info(Tab, where_to_read), Read))
+	 end,
+    lists:filter(fun({success,_}) -> false; (_) -> true end, [S1,S2,S3,S4,S5,S6]).
+
+ignore_dead(Nodes, AliveNodes) ->
+    Filter = fun(Node) -> lists:member(Node, AliveNodes) end,
+    lists:sort(lists:zf(Filter, Nodes)).
+
+
+remote_activate_debug_fun(N, I, F, C, File, Line) ->
+    Pid = spawn_link(N, ?MODULE, do_remote_activate_debug_fun, [self(), I, F, C, File, Line]),
+    receive
+	{activated, Pid} -> ok;
+	{'EXIT', Pid, Reason} -> {error, Reason}
+    end.
+
+do_remote_activate_debug_fun(From, I, F, C, File, Line) ->
+    mnesia_lib:activate_debug_fun(I, F, C, File, Line),
+    From ! {activated, self()},
+    timer:sleep(infinity).  % Dies whenever the test process dies !!
+
+
+sort(L) when is_list(L) -> 
+    lists:sort(L);
+sort({atomic, L}) when is_list(L) ->
+    {atomic, lists:sort(L)};
+sort({ok, L}) when is_list(L) ->
+    {ok, lists:sort(L)};
+sort(W) ->
+    W.
diff --git a/lib/mnesia/test/mnesia_test_lib.hrl b/lib/mnesia/test/mnesia_test_lib.hrl
new file mode 100644
index 0000000000..85f12200d4
--- /dev/null
+++ b/lib/mnesia/test/mnesia_test_lib.hrl
@@ -0,0 +1,132 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1996-2009. 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%
+%%
+
+%%
+-define(log(Format,Args),mnesia_test_lib:log(Format,Args,?FILE,?LINE)).
+-define(warning(Format,Args),?log("<>WARNING<>~n " ++ Format,Args)).
+-define(error(Format,Args),
+	mnesia_test_lib:error(Format,Args,?FILE,?LINE)).
+-define(verbose(Format,Args),mnesia_test_lib:verbose(Format,Args,?FILE,?LINE)).
+
+-define(fatal(Format,Args),
+	?error(Format, Args),
+	exit({test_case_fatal, Format, Args, ?FILE, ?LINE})).
+
+-define(skip(Format,Args),
+	?warning(Format, Args),
+	exit({skipped, ?flat_format(Format, Args)})).
+
+-define(flat_format(Format,Args),
+        lists:flatten(io_lib:format(Format, Args))).
+
+-define(sort(What), mnesia_test_lib:sort(What)).
+
+-define(ignore(Expr),
+	fun() ->
+		AcTuAlReS = (catch (Expr)),
+		?verbose("ok, ~n Result as expected:~p~n",[AcTuAlReS]),
+		AcTuAlReS
+	end()).
+
+-define(match(ExpectedRes,Expr),
+	fun() ->
+		AcTuAlReS = (catch (Expr)),
+		case AcTuAlReS of
+		    ExpectedRes ->
+			?verbose("ok, ~n Result as expected:~p~n",[AcTuAlReS]),
+			{success,AcTuAlReS};
+		    _ ->
+			?error("Not Matching Actual result was:~n ~p~n",
+			       [AcTuAlReS]),
+			{fail,AcTuAlReS}
+		end
+	end()).
+
+-define(match_inverse(NotExpectedRes,Expr),
+	fun() ->
+		AcTuAlReS = (catch (Expr)),
+		case AcTuAlReS of
+		    NotExpectedRes ->
+			?error("Not matching Actual result was:~n ~p~n",
+			       [AcTuAlReS]),
+			{fail,AcTuAlReS};
+		    _ ->
+			?verbose("ok, ~n Result as expected: ~p~n",[AcTuAlReS]),
+			{success,AcTuAlReS}
+		end
+	end()).
+
+-define(match_receive(ExpectedMsg),
+	?match(ExpectedMsg,mnesia_test_lib:pick_msg())).
+
+%% ExpectedMsgs must be completely bound
+-define(match_multi_receive(ExpectedMsgs),
+	fun() ->
+		TmPeXpCtEdMsGs = lists:sort(ExpectedMsgs),
+		?match(TmPeXpCtEdMsGs,
+		       lists:sort(lists:map(fun(_) ->
+						    mnesia_test_lib:pick_msg()
+					    end,
+					    TmPeXpCtEdMsGs)))
+	end()).
+
+-define(start_activities(Nodes),
+	mnesia_test_lib:start_activities(Nodes)).
+
+-define(start_transactions(Pids),
+	mnesia_test_lib:start_transactions(Pids)).
+
+-define(acquire_nodes(N, Config),
+	mnesia_test_lib:prepare_test_case([{init_test_case, [mnesia]},
+					   delete_schema,
+					   create_schema,
+					   {start_appls, [mnesia]}],
+					  N, Config, ?FILE, ?LINE)).
+
+-define(activate_debug_fun(I, F, C),
+	mnesia_lib:activate_debug_fun(I, F, C, ?FILE, ?LINE)).
+
+-define(remote_activate_debug_fun(N, I, F, C),
+	?match(ok, mnesia_test_lib:remote_activate_debug_fun(N, I, F, C,
+							     ?FILE, ?LINE))).
+
+-define(deactivate_debug_fun(I),
+	mnesia_lib:deactivate_debug_fun(I, ?FILE, ?LINE)).
+
+-define(remote_deactivate_debug_fun(N, I),
+	rpc:call(N, mnesia_lib, deactivate_debug_fun, [I, ?FILE, ?LINE])).
+
+-define(is_debug_compiled, 
+	case mnesia_lib:is_debug_compiled() of
+	    false ->
+		?skip("Mnesia is not debug compiled, test case ignored.~n", []);
+	    _OhTeR ->
+		ok
+	end).
+
+-define(needs_disc(Config), 
+	case mnesia_test_lib:diskless(Config) of
+	    false ->
+		ok;
+	    true ->
+		?skip("Must have disc, test case ignored.~n", [])
+	end).
+
+-define(verify_mnesia(Ups, Downs), 
+	mnesia_test_lib:verify_mnesia(Ups, Downs, ?FILE, ?LINE)).
diff --git a/lib/mnesia/test/mnesia_tpcb.erl b/lib/mnesia/test/mnesia_tpcb.erl
new file mode 100644
index 0000000000..595412ff24
--- /dev/null
+++ b/lib/mnesia/test/mnesia_tpcb.erl
@@ -0,0 +1,1268 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1996-2010. 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
+%%
+%%   mnesia_tpcb - TPC-B benchmarking of Mnesia
+%%
+%% DESCRIPTION
+%%
+%%   The metrics used in the TPC-B benchmark are throughput as measured
+%%   in transactions per second (TPS). The benchmark uses a single,
+%%   simple update-intensive transaction to load the database system.
+%%   The single transaction type provides a simple, repeatable
+%%   unit of work, and is designed to exercise the basic components of
+%%   a database system.
+%%
+%%   The definition of the TPC-B states lots of detailed rules and
+%%   conditions that must be fullfilled, e.g. how the ACID (atomicity,
+%%   consistency, isolation and durability) properties are verified,
+%%   how the random numbers must be distributed, minimum sizes of
+%%   the different types of records, minimum duration of the benchmark,
+%%   formulas to calculate prices (dollars per tps), disclosure issues
+%%   etc. Please, see http://www.tpc.org/ about the nitty gritty details.
+%%
+%%   The TPC-B benchmark is stated in terms of a hypothetical bank. The
+%%   bank has one or more branches. Each branch has multiple tellers. The
+%%   bank has many customers, each with an account. The database represents
+%%   the cash position of each entity (branch, teller and account) and a
+%%   history of recent transactions run by the bank. The transaction
+%%   represents the work done when a customer makes a deposit or a
+%%   withdrawal against his account. The transaction is performed by a
+%%   teller at some branch.
+%%
+%%   Each process that performs TPC-B transactions is called a driver.
+%%   Drivers generates teller_id, account_id and delta amount of
+%%   money randomly. An account, a teller and a branch are read, their
+%%   balances are adjusted and a history record is created. The driver
+%%   measures the time for 3 reads, 3 writes and 1 create.
+%%
+%% GETTING STARTED
+%%
+%%   Generate tables and run with default configuration:
+%%
+%%     mnesia_tpcb:start().
+%%
+%%  A little bit more advanced;
+%%
+%%     spawn(mnesia_tpcb, start, [[[{n_drivers_per_node, 8}, {stop_after, infinity}]]),
+%%     mnesia_tpcb:stop().
+%%
+%%  Really advanced;
+%%
+%%    mnesia_tpcb:init(([{n_branches, 8}, {replica_type, disc_only_copies}]),
+%%    mnesia_tpcb:run(([{n_drivers_per_node, 8}]),
+%%    mnesia_tpcb:run(([{n_drivers_per_node, 64}]).
+%%    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-module(mnesia_tpcb).
+-author('[email protected]').
+
+-export([
+	 config/2,
+	 count_balance/0,
+	 driver_init/2,
+	 init/1,
+	 reporter_init/2,
+	 run/1,
+	 start/0,
+	 start/1,
+	 start/2,
+	 stop/0,
+	 real_trans/5,
+	 verify_tabs/0,
+	 reply_gen_branch/3,
+	 frag_add_delta/7,
+
+	 conflict_test/1,
+	 dist_test/1,
+	 replica_test/1,
+	 sticky_replica_test/1,
+	 remote_test/1,
+	 remote_frag2_test/1
+	]).
+
+-define(SECOND, 1000000).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Account record, total size must be at least 100 bytes
+
+-define(ACCOUNT_FILLER,
+	{123456789012345678901234567890123456789012345678901234567890,
+	 123456789012345678901234567890123456789012345678901234567890,
+	 123456789012345678901234567890123456789012345678901234}).
+
+-record(account,
+       {
+	id           = 0, % Unique account id
+	branch_id    = 0, % Branch where the account is held
+	balance      = 0, % Account balance
+	filler       = ?ACCOUNT_FILLER  % Gap filler to ensure size >= 100 bytes
+       }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Branch record, total size must be at least 100 bytes
+
+-define(BRANCH_FILLER,
+	{123456789012345678901234567890123456789012345678901234567890,
+	 123456789012345678901234567890123456789012345678901234567890,
+	 123456789012345678901234567890123456789012345678901234567890}).
+
+-record(branch,
+       {
+	id           = 0, % Unique branch id
+	balance      = 0, % Total balance of whole branch
+	filler       = ?BRANCH_FILLER  % Gap filler to ensure size >= 100 bytes
+       }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Teller record, total size must be at least 100 bytes
+
+-define(TELLER_FILLER,
+	{123456789012345678901234567890123456789012345678901234567890,
+	 123456789012345678901234567890123456789012345678901234567890,
+	 1234567890123456789012345678901234567890123456789012345678}).
+
+-record(teller,
+       {
+	id           = 0, % Unique teller id
+	branch_id    = 0, % Branch where the teller is located
+	balance      = 0, % Teller balance
+	filler       = ?TELLER_FILLER % Gap filler to ensure size >= 100 bytes
+       }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% History record, total size must be at least 50 bytes
+
+-define(HISTORY_FILLER, 1234567890).
+
+-record(history,
+	{
+	 history_id  = {0, 0}, % {DriverId, DriverLocalHistoryid}
+	 time_stamp  = now(),  % Time point during active transaction
+	 branch_id   = 0,      % Branch associated with teller
+	 teller_id   = 0,      % Teller invlolved in transaction
+	 account_id  = 0,      % Account updated by transaction
+	 amount      = 0,      % Amount (delta) specified by transaction
+	 filler      = ?HISTORY_FILLER % Gap filler to ensure size >= 50 bytes
+       }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-record(tab_config,
+	{
+	  db_nodes = [node()],
+	  n_replicas = 1, % Ignored for non-fragmented tables
+	  replica_nodes = [node()],
+	  replica_type = ram_copies,
+	  use_running_mnesia = false,
+	  n_fragments = 0,
+	  n_branches = 1,
+	  n_tellers_per_branch = 10, % Must be 10
+	  n_accounts_per_branch = 100000, % Must be 100000
+	  branch_filler = ?BRANCH_FILLER,
+	  account_filler = ?ACCOUNT_FILLER,
+	  teller_filler = ?TELLER_FILLER
+	 }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-record(run_config,
+	{
+	  driver_nodes = [node()],
+	  n_drivers_per_node = 1,
+	  use_running_mnesia = false,
+	  stop_after = timer:minutes(15), % Minimum 15 min
+	  report_interval = timer:minutes(1),
+	  use_sticky_locks = false,
+	  spawn_near_branch = false,
+	  activity_type = transaction,
+	  reuse_history_id = false
+	 }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-record(time,
+	{
+	  n_trans = 0,
+	  min_n = 0,
+	  max_n = 0,
+	  acc_time = 0,
+	  max_time = 0
+	 }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-record(driver_state,
+	{
+	  driver_id,
+	  driver_node,
+	  seed,
+	  n_local_branches,
+	  local_branches,
+	  tab_config,
+	  run_config,
+	  history_id,
+	  time = #time{},
+	  acc_time = #time{},
+	  reuse_history_id
+	 }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-record(reporter_state,
+	{
+	  driver_pids,
+	  starter_pid,
+	  n_iters = 0,
+	  prev_tps = 0,
+	  curr = #time{},
+	  acc = #time{},
+	  init_micros,
+	  prev_micros,
+	  run_config
+	 }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% One driver on each node, table not replicated
+
+config(frag_test, ReplicaType) ->
+    Remote = nodes(),
+    Local = node(),
+    Nodes = [Local | Remote], 
+    [
+     {n_branches, length(Nodes)},
+     {n_fragments, length(Nodes)},
+     {replica_nodes, Nodes},
+     {db_nodes, Nodes},
+     {driver_nodes, Nodes},
+     {n_accounts_per_branch, 100},
+     {replica_type, ReplicaType},
+     {stop_after, timer:minutes(1)},
+     {report_interval, timer:seconds(10)},
+     {reuse_history_id, true}
+    ];
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% One driver on each node, table replicated to two nodes.
+
+config(frag2_test, ReplicaType) ->
+    Remote = nodes(),
+    Local = node(),
+    Nodes = [Local | Remote], 
+    [
+     {n_branches, length(Nodes)},
+     {n_fragments, length(Nodes)},
+     {n_replicas, 2},
+     {replica_nodes,  Nodes},
+     {db_nodes, Nodes},
+     {driver_nodes, Nodes},
+     {n_accounts_per_branch, 100},
+     {replica_type, ReplicaType},
+     {stop_after, timer:minutes(1)},
+     {report_interval, timer:seconds(10)},
+     {reuse_history_id, true}
+    ];
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% One driver on this node, table replicated to all nodes.
+
+config(replica_test, ReplicaType) ->
+    Remote = nodes(),
+    Local = node(),
+    Nodes = [Local | Remote], 
+    [
+     {db_nodes, Nodes},
+     {driver_nodes, [Local]},
+     {replica_nodes, Nodes},
+     {n_accounts_per_branch, 100},
+     {replica_type, ReplicaType},
+     {stop_after, timer:minutes(1)},
+     {report_interval, timer:seconds(10)},
+     {reuse_history_id, true}
+    ];
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% One driver on this node, table replicated to all nodes.
+
+config(sticky_replica_test, ReplicaType) ->
+    Remote = nodes(),
+    Local = node(),
+    Nodes = [Local | Remote], 
+    [
+     {db_nodes, Nodes},
+     {driver_nodes, [node()]},
+     {replica_nodes, Nodes},
+     {n_accounts_per_branch, 100},
+     {replica_type, ReplicaType},
+     {use_sticky_locks, true},
+     {stop_after, timer:minutes(1)},
+     {report_interval, timer:seconds(10)},
+     {reuse_history_id, true}
+    ];
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Ten drivers per node, tables replicated to all nodes, lots of branches
+
+config(dist_test, ReplicaType) ->  
+    Remote = nodes(),
+    Local = node(),
+    Nodes = [Local | Remote], 
+    [
+     {db_nodes, Nodes},
+     {driver_nodes, Nodes},
+     {replica_nodes, Nodes},
+     {n_drivers_per_node, 10},
+     {n_branches, 10 * length(Nodes) * 100},
+     {n_accounts_per_branch, 10},
+     {replica_type, ReplicaType},
+     {stop_after, timer:minutes(1)},
+     {report_interval, timer:seconds(10)},
+     {reuse_history_id, true}
+    ];
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Ten drivers per node, tables replicated to all nodes, single branch
+
+config(conflict_test, ReplicaType) ->
+    Remote = nodes(),
+    Local = node(),
+    Nodes = [Local | Remote], 
+    [
+     {db_nodes, Nodes},
+     {driver_nodes, Nodes},
+     {replica_nodes, Nodes},
+     {n_drivers_per_node, 10},
+     {n_branches, 1},
+     {n_accounts_per_branch, 10},
+     {replica_type, ReplicaType},
+     {stop_after, timer:minutes(1)},
+     {report_interval, timer:seconds(10)},
+     {reuse_history_id, true}
+    ];
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% One driver on this node, table replicated to all other nodes.
+
+config(remote_test, ReplicaType) ->
+    Remote = nodes(),
+    Local = node(),
+    Nodes = [Local | Remote],
+    [
+     {db_nodes, Nodes},
+     {driver_nodes, [Local]},
+     {replica_nodes, Remote},
+     {n_accounts_per_branch, 100},
+     {replica_type, ReplicaType},
+     {stop_after, timer:minutes(1)},
+     {report_interval, timer:seconds(10)},
+     {reuse_history_id, true}
+    ];
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% One driver on this node, table replicated to two other nodes.
+
+config(remote_frag2_test, ReplicaType) ->
+    Remote = nodes(),
+    Local = node(),
+    Nodes = [Local | Remote],
+    [
+     {n_branches, length(Remote)},
+     {n_fragments, length(Remote)},
+     {n_replicas, 2},
+     {replica_nodes, Remote},
+     {db_nodes, Nodes},
+     {driver_nodes, [Local]},
+     {n_accounts_per_branch, 100},
+     {replica_type, ReplicaType},
+     {stop_after, timer:minutes(1)},
+     {report_interval, timer:seconds(10)},
+     {reuse_history_id, true}
+    ].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+start(What, ReplicaType) ->
+    spawn_link(?MODULE, start, [config(What, ReplicaType)]).
+
+replica_test(ReplicaType) ->
+    start(replica_test, ReplicaType).
+
+sticky_replica_test(ReplicaType) ->
+    start(sticky_replica_test, ReplicaType).
+
+dist_test(ReplicaType) ->
+    start(dist_test, ReplicaType).
+
+conflict_test(ReplicaType) ->
+    start(conflict_test, ReplicaType).
+
+remote_test(ReplicaType) ->
+    start(remote_test, ReplicaType).
+
+remote_frag2_test(ReplicaType) ->
+    start(remote_frag2_test, ReplicaType).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Args is a list of {Key, Val} tuples where Key is a field name
+%% in either the record tab_config or run_config. Unknown keys are ignored.
+
+start() ->
+    start([]).
+start(Args) ->
+    init(Args),
+    run(Args).
+
+list2rec(List, Fields, DefaultTuple) ->
+    [Name|Defaults] = tuple_to_list(DefaultTuple),
+    List2 = list2rec(List, Fields, Defaults, []),
+    list_to_tuple([Name] ++ List2).
+
+list2rec(_List, [], [], Acc) ->
+    Acc;
+list2rec(List, [F|Fields], [D|Defaults], Acc) ->
+    {Val, List2} =
+	case lists:keysearch(F, 1, List) of
+	    false ->
+		{D, List};
+	    {value, {F, NewVal}} ->
+		{NewVal, lists:keydelete(F, 1, List)}
+	end,
+    list2rec(List2, Fields, Defaults, Acc ++ [Val]).
+
+stop() ->
+    case whereis(mnesia_tpcb) of
+	undefined ->
+	    {error, not_running};
+	Pid ->
+	    sync_stop(Pid)
+    end.
+
+sync_stop(Pid) ->
+    Pid ! {self(), stop},
+    receive
+	{Pid, {stopped, Res}} ->  Res
+    after timer:minutes(1) ->
+	    exit(Pid, kill),
+	    {error, brutal_kill}
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Initialization
+
+%% Args is a list of {Key, Val} tuples where Key is a field name
+%% in the record tab_config, unknown keys are ignored.
+
+init(Args) ->
+    TabConfig0 = list2rec(Args, record_info(fields, tab_config), #tab_config{}),
+    TabConfig = 
+	if
+	    TabConfig0#tab_config.n_fragments =:= 0 ->
+		TabConfig0#tab_config{n_replicas = length(TabConfig0#tab_config.replica_nodes)};
+	    true ->
+		TabConfig0	
+	end,
+    Tags = record_info(fields, tab_config),
+    Fun = fun(F, Pos) -> {{F, element(Pos, TabConfig)}, Pos + 1} end,
+    {List, _} = lists:mapfoldl(Fun, 2, Tags),
+    io:format("TPC-B: Table config: ~p ~n", [List]),
+
+    DbNodes = TabConfig#tab_config.db_nodes,
+    stop(),
+    if
+	TabConfig#tab_config.use_running_mnesia =:= true ->
+	    ignore;
+	true ->
+	    rpc:multicall(DbNodes, mnesia, lkill, []),
+	    case mnesia:delete_schema(DbNodes) of
+		ok ->
+		    case mnesia:create_schema(DbNodes) of
+			ok ->
+			    {Replies, BadNodes} =
+				rpc:multicall(DbNodes, mnesia, start, []),
+			    case [Res || Res <- Replies, Res =/= ok] of
+				[] when BadNodes =:= [] ->
+				    ok;
+				BadRes ->
+				    io:format("TPC-B: <ERROR> "
+					      "Failed to start ~p: ~p~n",
+					      [BadNodes, BadRes]),
+				    exit({start_failed, BadRes, BadNodes})
+			    end;
+			{error, Reason} ->
+			    io:format("TPC-B: <ERROR> "
+				      "Failed to create schema on disc: ~p~n",
+				      [Reason]),
+			    exit({create_schema_failed, Reason})
+		    end;
+		{error, Reason} ->
+		    io:format("TPC-B: <ERROR> "
+			      "Failed to delete schema on disc: ~p~n",
+			      [Reason]),
+		    exit({delete_schema_failed, Reason})
+	    end
+    end,
+    gen_tabs(TabConfig).
+
+gen_tabs(TC) ->
+    create_tab(TC, branch, record_info(fields, branch),
+	       undefined),
+    create_tab(TC, account, record_info(fields, account),
+	       {branch, #account.branch_id}),
+    create_tab(TC, teller, record_info(fields, teller),
+	       {branch, #teller.branch_id}),
+    create_tab(TC, history, record_info(fields, history),
+	       {branch, #history.branch_id}),
+
+    NB = TC#tab_config.n_branches,
+    NT = TC#tab_config.n_tellers_per_branch,
+    NA = TC#tab_config.n_accounts_per_branch,
+    io:format("TPC-B: Generating ~p branches a ~p bytes~n",
+	      [NB, size(term_to_binary(default_branch(TC)))]),
+    io:format("TPC-B: Generating ~p * ~p tellers a ~p bytes~n",
+	      [NB, NT, size(term_to_binary(default_teller(TC)))]),
+    io:format("TPC-B: Generating ~p * ~p accounts a ~p bytes~n",
+	      [NB, NA, size(term_to_binary(default_account(TC)))]),
+    io:format("TPC-B: Generating 0 history records a ~p bytes~n",
+	      [size(term_to_binary(default_history(TC)))]),
+    gen_branches(TC),
+
+    case verify_tabs() of
+	ok ->
+	    ignore;
+	{error, Reason} ->
+	    io:format("TPC-B: <ERROR> Inconsistent tables: ~w~n",
+		      [Reason]),
+	    exit({inconsistent_tables, Reason})
+    end.
+
+create_tab(TC, Name, Attrs, _ForeignKey) when TC#tab_config.n_fragments =:= 0 ->
+    Nodes = TC#tab_config.replica_nodes,
+    Type = TC#tab_config.replica_type,
+    Def = [{Type, Nodes}, {attributes, Attrs}],
+    create_tab(Name, Def);
+create_tab(TC, Name, Attrs, ForeignKey) ->
+    NReplicas = TC#tab_config.n_replicas,
+    NodePool = TC#tab_config.replica_nodes,
+    Type = TC#tab_config.replica_type,
+    NF = TC#tab_config.n_fragments,
+    Props = [{n_fragments, NF},
+	     {node_pool, NodePool},
+	     {n_copies(Type), NReplicas},
+	     {foreign_key, ForeignKey}],
+    Def = [{frag_properties, Props},
+	   {attributes, Attrs}],
+    create_tab(Name, Def).
+    
+create_tab(Name, Def) ->
+    mnesia:delete_table(Name),
+    case mnesia:create_table(Name, Def) of
+	{atomic, ok} ->
+	    ok;
+	{aborted, Reason} ->
+	    io:format("TPC-B: <ERROR> failed to create table ~w ~w: ~p~n",
+		      [Name, Def, Reason]),
+	    exit({create_table_failed, Reason})
+    end.
+
+n_copies(Type) ->
+    case Type of
+	ram_copies -> n_ram_copies;
+	disc_copies -> n_disc_copies;
+	disc_only_copies -> n_disc_only_copies
+    end.
+
+gen_branches(TC) ->
+    First = 0,
+    Last = First + TC#tab_config.n_branches - 1,
+    GenPids = gen_branches(TC, First, Last, []),
+    wait_for_gen(GenPids).
+
+wait_for_gen([]) ->
+    ok;
+wait_for_gen(Pids) ->
+    receive
+	{branch_generated, Pid} -> wait_for_gen(lists:delete(Pid, Pids));
+	Exit ->
+	    exit({tpcb_failed, Exit})
+    end.
+
+gen_branches(TC, BranchId, Last, UsedNs) when BranchId =< Last ->
+    UsedNs2 = get_branch_nodes(BranchId, UsedNs),
+    Node = hd(UsedNs2),
+    Pid = spawn_link(Node, ?MODULE, reply_gen_branch,
+		     [self(), TC, BranchId]),
+    [Pid | gen_branches(TC, BranchId + 1, Last, UsedNs2)];
+gen_branches(_, _, _, _) ->
+    [].
+
+reply_gen_branch(ReplyTo, TC, BranchId) ->
+    gen_branch(TC, BranchId),
+    ReplyTo ! {branch_generated, self()},
+    unlink(ReplyTo).
+
+%% Returns a new list of nodes with the best node as head
+get_branch_nodes(BranchId, UsedNs) ->
+    WriteNs = table_info({branch, BranchId}, where_to_write),
+    WeightedNs = [{n_duplicates(N, UsedNs, 0), N} || N <- WriteNs],
+    [{_, LeastUsed} | _ ] = lists:sort(WeightedNs),
+    [LeastUsed | UsedNs].
+
+n_duplicates(_N, [], Count) ->
+    Count;
+n_duplicates(N, [N | Tail], Count) ->    
+    n_duplicates(N, Tail, Count + 1);
+n_duplicates(N, [_ | Tail], Count) ->
+    n_duplicates(N, Tail, Count).
+
+gen_branch(TC, BranchId) ->
+    A = default_account(TC),
+    NA = TC#tab_config.n_accounts_per_branch,
+    FirstA = BranchId * NA,
+    ArgsA = [FirstA, FirstA + NA - 1, BranchId, A],
+    ok = mnesia:activity(async_dirty, fun gen_accounts/4, ArgsA, mnesia_frag),
+
+    T = default_teller(TC),
+    NT = TC#tab_config.n_tellers_per_branch,
+    FirstT = BranchId * NT,
+    ArgsT = [FirstT, FirstT + NT - 1, BranchId, T],
+    ok = mnesia:activity(async_dirty, fun gen_tellers/4, ArgsT, mnesia_frag),
+
+    B = default_branch(TC),
+    FunB = fun() -> mnesia:write(branch, B#branch{id = BranchId}, write) end,
+    ok = mnesia:activity(sync_dirty,  FunB, [], mnesia_frag).
+    
+gen_tellers(Id, Last, BranchId, T) when Id =< Last ->
+    mnesia:write(teller, T#teller{id = Id, branch_id=BranchId}, write),
+    gen_tellers(Id + 1, Last, BranchId, T);
+gen_tellers(_, _, _, _) ->
+    ok.
+    
+gen_accounts(Id, Last, BranchId, A) when Id =< Last ->
+    mnesia:write(account, A#account{id = Id, branch_id=BranchId}, write),
+    gen_accounts(Id + 1, Last, BranchId, A);
+gen_accounts(_, _, _, _) ->
+    ok.
+
+default_branch(TC) ->  #branch{filler = TC#tab_config.branch_filler}.
+default_teller(TC) ->  #teller{filler = TC#tab_config.teller_filler}.
+default_account(TC) -> #account{filler = TC#tab_config.account_filler}.
+default_history(_TC) -> #history{}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% Run the benchmark
+
+%% Args is a list of {Key, Val} tuples where Key is a field name
+%% in the record run_config, unknown keys are ignored.
+run(Args) ->
+    RunConfig = list2rec(Args, record_info(fields, run_config), #run_config{}),
+    Tags = record_info(fields, run_config),
+    Fun = fun(F, Pos) -> {{F, element(Pos, RunConfig)}, Pos + 1} end,
+    {List, _} = lists:mapfoldl(Fun, 2, Tags),
+    io:format("TPC-B: Run config: ~p ~n", [List]),
+
+    Pid = spawn_link(?MODULE, reporter_init, [self(), RunConfig]),
+    receive
+	{Pid, {stopped, Res}} ->
+	    Res; % Stopped by other process
+	Else ->
+	    {tpcb_got, Else}   
+    after RunConfig#run_config.stop_after ->
+	    sync_stop(Pid)
+    end.
+
+reporter_init(Starter, RC) ->
+    register(mnesia_tpcb, self()),
+    process_flag(trap_exit, true),
+    DbNodes = mnesia:system_info(db_nodes),
+    if
+	RC#run_config.use_running_mnesia =:= true ->
+	    ignore;
+	true ->
+	    {Replies, BadNodes} =
+		rpc:multicall(DbNodes, mnesia, start, []),
+	    case [Res || Res <- Replies, Res =/= ok] of
+		[] when BadNodes =:= [] ->
+		    ok;
+		BadRes ->
+		    io:format("TPC-B: <ERROR> "
+			      "Failed to start ~w: ~p~n",
+			      [BadNodes, BadRes]),
+		    exit({start_failed, BadRes, BadNodes})
+	    end,
+	    verify_tabs()
+    end,
+
+    N  = table_info(branch, size),
+    NT = table_info(teller, size) div N,
+    NA = table_info(account, size) div N,
+
+    {Type, NF, RepNodes} = table_storage(branch),
+    TC = #tab_config{n_fragments = NF,
+		     n_branches = N,
+		     n_tellers_per_branch = NT,
+		     n_accounts_per_branch = NA,
+		     db_nodes = DbNodes,
+		     replica_nodes = RepNodes,
+		     replica_type = Type
+		    },
+    Drivers = start_drivers(RC, TC),
+    Now = now_to_micros(erlang:now()),
+    State = #reporter_state{driver_pids = Drivers,
+			    run_config = RC,
+			    starter_pid = Starter,
+			    init_micros = Now,
+			    prev_micros = Now
+			   },
+    case catch reporter_loop(State) of
+	{'EXIT', Reason} ->
+	    io:format("TPC-B: Abnormal termination: ~p~n", [Reason]),
+	    if
+		RC#run_config.use_running_mnesia =:= true ->
+		    ignore;
+		true ->
+		    rpc:multicall(DbNodes, mnesia, lkill, [])
+	    end,
+	    unlink(Starter),
+	    Starter ! {self(), {stopped, {error, Reason}}}, % To be sure
+	    exit(shutdown);
+	{ok, Stopper, State2} ->
+	    Time = State2#reporter_state.acc,
+	    Res =
+		case verify_tabs() of
+		    ok ->
+			{ok, Time};
+		    {error, Reason} ->
+			io:format("TPC-B: <ERROR> Inconsistent tables, ~p~n",
+				  [{error, Reason}]),
+			{error, Reason}
+		end,
+	    if
+		RC#run_config.use_running_mnesia =:= true -> 
+		    ignore;
+		true -> 
+		    rpc:multicall(DbNodes, mnesia, stop, [])
+	    end,
+	    unlink(Starter),
+	    Starter ! {self(), {stopped, Res}},
+	    if
+		Stopper =/= Starter ->
+		    Stopper ! {self(), {stopped, Res}};
+		true ->
+		    ignore
+	    end,
+	    exit(shutdown)
+    end.
+
+table_info(Tab, Item) ->
+    Fun = fun() -> mnesia:table_info(Tab, Item) end,
+    mnesia:activity(sync_dirty, Fun, mnesia_frag).
+
+%% Returns {Storage, NFragments, ReplicaNodes}
+table_storage(Tab) ->
+    case mnesia:table_info(branch, frag_properties) of
+	[] ->
+	    NFO = 0,
+	    NR  = length(mnesia:table_info(Tab, ram_copies)),
+	    ND  = length(mnesia:table_info(Tab, disc_copies)),
+	    NDO = length(mnesia:table_info(Tab, disc_only_copies)),
+	    if
+		NR  =/= 0 -> {ram_copies, NFO, NR};
+		ND  =/= 0 -> {disc_copies, NFO, ND};
+		NDO =/= 0 -> {disc_copies, NFO, NDO}
+	    end;
+	Props ->
+	    {value, NFO} = lists:keysearch(n_fragments, 1, Props),
+	    NR  = table_info(Tab, n_ram_copies),
+	    ND  = table_info(Tab, n_disc_copies),
+	    NDO = table_info(Tab, n_disc_only_copies),
+	    if
+		NR  =/= 0 -> {ram_copies, NFO, NR};
+		ND  =/= 0 -> {disc_copies, NFO, ND};
+		NDO =/= 0 -> {disc_copies, NFO, NDO}
+	    end
+    end.
+    
+reporter_loop(State) ->
+    RC = State#reporter_state.run_config,
+    receive
+	{From, stop} ->
+	    {ok, From, call_drivers(State, stop)};
+	{'EXIT', Pid, Reason} when Pid =:= State#reporter_state.starter_pid ->
+	    %% call_drivers(State, stop),
+	    exit({starter_died, Pid, Reason})
+    after RC#run_config.report_interval ->
+	    Iters = State#reporter_state.n_iters,
+	    State2 = State#reporter_state{n_iters = Iters + 1},
+	    case call_drivers(State2, report) of
+		State3 when State3#reporter_state.driver_pids =/= [] ->
+		    State4 = State3#reporter_state{curr = #time{}},
+		    reporter_loop(State4);
+		_ ->
+		    exit(drivers_died)
+	    end
+    end.
+
+call_drivers(State, Msg) ->
+    Drivers = State#reporter_state.driver_pids,
+    lists:foreach(fun(Pid) -> Pid ! {self(), Msg} end, Drivers),
+    State2 = show_report(calc_reports(Drivers, State)),
+    case Msg =:= stop of
+	true ->
+	    Acc = State2#reporter_state.acc,
+	    Init = State2#reporter_state.init_micros,
+	    show_report(State2#reporter_state{n_iters = 0,
+					      curr = Acc,
+					      prev_micros = Init});
+	false ->
+	    ignore
+    end,
+    State2.
+
+calc_reports([], State) ->
+    State;
+calc_reports([Pid|Drivers], State) ->
+    receive
+	{'EXIT', P, Reason} when P =:= State#reporter_state.starter_pid ->
+	    exit({starter_died, P, Reason});
+	{'EXIT', Pid, Reason} ->
+	    exit({driver_died, Pid, Reason});
+	{Pid, Time} when is_record(Time, time) ->
+	    %% io:format("~w: ~w~n", [Pid, Time]),
+	    A = add_time(State#reporter_state.acc, Time),
+	    C = add_time(State#reporter_state.curr, Time),
+	    State2 = State#reporter_state{acc = A, curr = C},
+	    calc_reports(Drivers, State2)
+    end.
+
+add_time(Acc, New) ->
+    Acc#time{n_trans = New#time.n_trans + Acc#time.n_trans,
+	     min_n = lists:min([New#time.n_trans, Acc#time.min_n] -- [0]),
+	     max_n = lists:max([New#time.n_trans, Acc#time.max_n]),
+	     acc_time = New#time.acc_time + Acc#time.acc_time,
+	     max_time = lists:max([New#time.max_time, Acc#time.max_time])}.
+
+-define(AVOID_DIV_ZERO(_What_), try (_What_) catch _:_ -> 0 end).
+
+show_report(State) ->
+    Now    = now_to_micros(erlang:now()),
+    Iters  = State#reporter_state.n_iters,
+    Time   = State#reporter_state.curr,
+    Max    = Time#time.max_time,
+    N      = Time#time.n_trans,
+    Avg    = ?AVOID_DIV_ZERO(Time#time.acc_time div N),
+    AliveN = length(State#reporter_state.driver_pids),
+    Tps    = ?AVOID_DIV_ZERO((?SECOND * AliveN) div Avg),
+    PrevTps= State#reporter_state.prev_tps,
+    {DiffSign, DiffTps} = signed_diff(Iters, Tps, PrevTps),
+    Unfairness = ?AVOID_DIV_ZERO(Time#time.max_n / Time#time.min_n),
+    BruttoAvg = ?AVOID_DIV_ZERO((Now - State#reporter_state.prev_micros) div N),
+%%    io:format("n_iters=~p, n_trans=~p, n_drivers=~p, avg=~p, now=~p, prev=~p~n",
+%%	      [Iters, N, AliveN, BruttoAvg, Now, State#reporter_state.prev_micros]),
+    BruttoTps = ?AVOID_DIV_ZERO(?SECOND div BruttoAvg),
+    case Iters > 0 of
+	true ->
+	    io:format("TPC-B: ~p iter ~s~p diff ~p (~p) tps ~p avg micros ~p max micros ~p unfairness~n",
+		      [Iters, DiffSign, DiffTps, Tps, BruttoTps, Avg, Max, Unfairness]);
+	false ->
+	    io:format("TPC-B: ~p (~p) transactions per second, "
+		      "duration of longest transaction was ~p milliseconds~n",
+		      [Tps, BruttoTps, Max div 1000])
+    end,
+    State#reporter_state{prev_tps = Tps, prev_micros = Now}.
+
+signed_diff(Iters, Curr, Prev) ->
+    case Iters > 1 of
+	true  -> sign(Curr - Prev);
+	false -> sign(0)
+    end.
+    
+sign(N) when N > 0 -> {"+", N};
+sign(N) -> {"", N}.
+
+now_to_micros({Mega, Secs, Micros}) ->
+    DT = calendar:now_to_datetime({Mega, Secs, 0}),
+    S  = calendar:datetime_to_gregorian_seconds(DT),
+    (S * ?SECOND) + Micros.
+    
+start_drivers(RC, TC) ->
+    LastHistoryId = table_info(history, size),
+    Reuse = RC#run_config.reuse_history_id,
+    DS = #driver_state{tab_config       = TC,
+		       run_config       = RC,
+		       n_local_branches = 0,
+		       local_branches   = [],
+		       history_id       = LastHistoryId,
+		       reuse_history_id = Reuse},
+    Nodes = RC#run_config.driver_nodes,
+    NB = TC#tab_config.n_branches,
+    First = 0,
+    AllBranches = lists:seq(First, First + NB - 1),
+    ND = RC#run_config.n_drivers_per_node,
+    Spawn = fun(Spec) ->
+		    Node = Spec#driver_state.driver_node,
+		    spawn_link(Node, ?MODULE, driver_init, [Spec, AllBranches])
+	    end,
+    Specs = [DS#driver_state{driver_id = Id, driver_node = N}
+	     || N <- Nodes, 
+		Id <- lists:seq(1, ND)],
+    Specs2 = lists:sort(lists:flatten(Specs)),
+    {Specs3, OrphanBranches} = alloc_local_branches(AllBranches, Specs2, []),
+    case length(OrphanBranches) of
+	N when N =< 10 ->
+	    io:format("TPC-B: Orphan branches: ~p~n", [OrphanBranches]);
+	N ->
+	    io:format("TPC-B: Orphan branches: ~p~n", [N])
+    end,
+    [Spawn(Spec) || Spec <- Specs3].
+
+alloc_local_branches([BranchId | Tail], Specs, OrphanBranches) ->
+    Nodes = table_info({branch, BranchId}, where_to_write),
+    LocalSpecs = [DS || DS <- Specs,
+			lists:member(DS#driver_state.driver_node, Nodes)],
+    case lists:keysort(#driver_state.n_local_branches, LocalSpecs) of
+	[] ->
+	    alloc_local_branches(Tail, Specs, [BranchId | OrphanBranches]);
+	[DS | _] ->
+	    LocalNB = DS#driver_state.n_local_branches + 1,
+	    LocalBranches = [BranchId | DS#driver_state.local_branches],
+	    DS2 = DS#driver_state{n_local_branches = LocalNB,
+				  local_branches = LocalBranches},
+	    Specs2 = Specs -- [DS],
+	    Specs3 = [DS2 | Specs2],
+	    alloc_local_branches(Tail, Specs3, OrphanBranches)
+    end;
+alloc_local_branches([], Specs, OrphanBranches) ->
+    {Specs, OrphanBranches}.
+    
+driver_init(DS, AllBranches) ->
+    Seed = erlang:now(),
+    DS2 =
+	if
+	    DS#driver_state.n_local_branches =:= 0 ->
+		DS#driver_state{seed = Seed, 
+				n_local_branches = length(AllBranches),
+				local_branches   = AllBranches};
+	    true ->
+		DS#driver_state{seed = Seed}
+	end,
+    io:format("TPC-B: Driver ~p started as ~p on node ~p with ~p local branches~n",
+	      [DS2#driver_state.driver_id, self(), node(), DS2#driver_state.n_local_branches]),
+    driver_loop(DS2).
+
+driver_loop(DS) ->
+    receive
+	{From, report} ->
+	    From ! {self(), DS#driver_state.time},
+	    Acc = add_time(DS#driver_state.time, DS#driver_state.acc_time),
+	    DS2 = DS#driver_state{time=#time{}, acc_time = Acc}, % Reset timer
+	    DS3 = calc_trans(DS2),
+	    driver_loop(DS3);
+	{From, stop} ->
+	    Acc = add_time(DS#driver_state.time, DS#driver_state.acc_time),
+	    io:format("TPC-B: Driver ~p (~p) on node ~p stopped: ~w~n",
+		      [DS#driver_state.driver_id, self(), node(self()), Acc]),	
+	    From ! {self(), DS#driver_state.time},
+	    unlink(From),
+	    exit(stopped)
+    after 0 ->
+	    DS2 = calc_trans(DS),
+	    driver_loop(DS2)
+    end.
+
+calc_trans(DS) ->
+    {Micros, DS2} = time_trans(DS),
+    Time = DS2#driver_state.time,
+    Time2 = Time#time{n_trans = Time#time.n_trans + 1,
+		      acc_time = Time#time.acc_time + Micros,
+		      max_time = lists:max([Micros, Time#time.max_time])
+		     },
+    case DS#driver_state.reuse_history_id of
+	false ->
+	    HistoryId = DS#driver_state.history_id + 1,
+	    DS2#driver_state{time=Time2, history_id = HistoryId};
+	true ->
+	    DS2#driver_state{time=Time2}
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Generate teller_id, account_id and delta
+%% Time the TPC-B transaction
+time_trans(DS) ->
+    OldSeed = get(random_seed), % Avoid interference with Mnesia
+    put(random_seed, DS#driver_state.seed),
+    Random    = random:uniform(),
+    NewSeed   = get(random_seed),
+    case OldSeed of
+	undefined -> erase(random_seed);
+	_         -> put(random_seed, OldSeed)
+    end,
+
+    TC = DS#driver_state.tab_config,
+    RC = DS#driver_state.run_config,
+    {Branchid, Args} = random_to_args(Random, DS),
+    {Fun, Mod} = trans_type(TC, RC),
+    {Time, Res} = timer:tc(?MODULE, real_trans, [RC, Branchid, Fun, Args, Mod]),
+
+    case Res of
+	AccountBal when is_integer(AccountBal) ->
+	    {Time, DS#driver_state{seed = NewSeed}};
+	Other ->
+	    exit({crash, Other, Args, Random, DS})
+    end.
+
+random_to_args(Random, DS) ->
+    DriverId = DS#driver_state.driver_id,
+    TC = DS#driver_state.tab_config,
+    HistoryId = DS#driver_state.history_id,
+    Delta = trunc(Random * 1999998) - 999999, % -999999 <= Delta <= +999999
+
+    Branches = DS#driver_state.local_branches,
+    NB = DS#driver_state.n_local_branches,
+    NT = TC#tab_config.n_tellers_per_branch,
+    NA = TC#tab_config.n_accounts_per_branch,
+    Tmp = trunc(Random * NB * NT),
+    BranchPos = (Tmp div NT) + 1,
+    BranchId =
+	case TC#tab_config.n_fragments of
+	    0 -> BranchPos - 1;
+	    _ -> lists:nth(BranchPos, Branches)
+	end,
+    RelativeTellerId = Tmp div NT,
+    TellerId = (BranchId * NT) + RelativeTellerId,
+    {AccountBranchId, AccountId} =
+	if
+	    Random >= 0.85, NB > 1 ->
+		%% Pick from a remote account
+                TmpAccountId= trunc(Random * (NB - 1) * NA),
+		TmpAccountBranchId = TmpAccountId div NA,
+		if
+		    TmpAccountBranchId =:= BranchId ->
+			{TmpAccountBranchId + 1, TmpAccountId + NA};
+		    true ->
+			{TmpAccountBranchId, TmpAccountId}
+		end;
+	    true ->
+		%% Pick from a local account
+		RelativeAccountId = trunc(Random * NA),
+		TmpAccountId = (BranchId * NA) + RelativeAccountId,
+		{BranchId, TmpAccountId}
+	end,
+    
+    {BranchId, [DriverId, BranchId, TellerId, AccountBranchId, AccountId, HistoryId, Delta]}.
+
+real_trans(RC, BranchId, Fun, Args, Mod) ->
+    Type = RC#run_config.activity_type,
+    case RC#run_config.spawn_near_branch of
+	false ->
+	    mnesia:activity(Type, Fun, Args, Mod);
+	true ->
+	    Node = table_info({branch, BranchId}, where_to_read),
+	    case rpc:call(Node, mnesia, activity, [Type, Fun, Args, Mod]) of
+		{badrpc, Reason} -> exit(Reason);
+		Other -> Other
+	    end
+    end.
+
+trans_type(TC, RC) ->
+    if
+	TC#tab_config.n_fragments =:= 0,
+	RC#run_config.use_sticky_locks =:= false ->
+	    {fun add_delta/7, mnesia};
+	TC#tab_config.n_fragments =:= 0,
+	RC#run_config.use_sticky_locks =:= true ->
+	    {fun sticky_add_delta/7, mnesia};
+	TC#tab_config.n_fragments > 0,
+	RC#run_config.use_sticky_locks =:= false ->
+	    {fun frag_add_delta/7, mnesia_frag}
+    end.
+
+%%
+%% Runs the TPC-B defined transaction and returns NewAccountBalance
+%%
+
+add_delta(DriverId, BranchId, TellerId, _AccountBranchId, AccountId, HistoryId, Delta) ->
+    %% Grab write lock already when the record is read 
+    
+    %% Add delta to branch balance
+    [B]  = mnesia:read(branch, BranchId, write),
+    NewB = B#branch{balance = B#branch.balance + Delta},
+    ok = mnesia:write(branch, NewB, write),
+
+    %% Add delta to teller balance
+    [T]  = mnesia:read(teller, TellerId, write),
+    NewT = T#teller{balance = T#teller.balance + Delta},
+    ok = mnesia:write(teller, NewT, write),
+
+    %% Add delta to account balance
+    [A]  = mnesia:read(account, AccountId, write),
+    NewA = A#account{balance = A#account.balance + Delta},
+    ok = mnesia:write(account, NewA, write),
+
+    %% Append to history log
+    History = #history{history_id   = {DriverId, HistoryId},
+		       account_id   = AccountId,
+		       teller_id    = TellerId,
+		       branch_id    = BranchId,
+		       amount       = Delta
+		      },
+    ok = mnesia:write(history, History, write),
+
+    %% Return account balance
+    NewA#account.balance.
+
+sticky_add_delta(DriverId, BranchId, TellerId, _AccountBranchId, AccountId, HistoryId, Delta) ->
+    %% Grab orinary read lock when the record is read
+    %% Grab sticky write lock when the record is written
+    %% This transaction would benefit of an early  stick_write lock at read
+
+    %% Add delta to branch balance
+    [B]  = mnesia:read(branch, BranchId, read),
+    NewB = B#branch{balance = B#branch.balance + Delta},
+    ok = mnesia:write(branch, NewB, sticky_write),
+
+    %% Add delta to teller balance
+    [T]  = mnesia:read(teller, TellerId, read),
+    NewT = T#teller{balance = T#teller.balance + Delta},
+    ok = mnesia:write(teller, NewT, sticky_write),
+
+    %% Add delta to account balance
+    [A]  = mnesia:read(account, AccountId, read),
+    NewA = A#account{balance = A#account.balance + Delta},
+    ok = mnesia:write(account, NewA, sticky_write),
+
+    %% Append to history log
+    History = #history{history_id   = {DriverId, HistoryId},
+		       account_id   = AccountId,
+		       teller_id    = TellerId,
+		       branch_id    = BranchId,
+		       amount       = Delta
+		      },
+    ok = mnesia:write(history, History, sticky_write),
+
+    %% Return account balance
+    NewA#account.balance.
+
+frag_add_delta(DriverId, BranchId, TellerId, AccountBranchId, AccountId, HistoryId, Delta) ->
+    %% Access fragmented table
+    %% Grab write lock already when the record is read 
+
+    %% Add delta to branch balance
+    [B] = mnesia:read(branch, BranchId, write),
+    NewB = B#branch{balance = B#branch.balance + Delta},
+    ok = mnesia:write(NewB),
+
+    %% Add delta to teller balance
+    [T] = mnesia:read({teller, BranchId}, TellerId, write),
+    NewT = T#teller{balance = T#teller.balance + Delta},
+    ok = mnesia:write(NewT),
+
+    %% Add delta to account balance
+    %%io:format("frag_add_delta(~p): ~p\n", [node(), {account, BranchId, AccountId}]),
+    [A] = mnesia:read({account, AccountBranchId}, AccountId, write),
+    NewA = A#account{balance = A#account.balance + Delta},
+    ok = mnesia:write(NewA),
+
+    %% Append to history log
+    History = #history{history_id   = {DriverId, HistoryId},
+		       account_id   = AccountId,
+		       teller_id    = TellerId,
+		       branch_id    = BranchId,
+		       amount       = Delta
+		      },
+    ok = mnesia:write(History),
+
+    %% Return account balance
+    NewA#account.balance.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Verify table consistency
+
+verify_tabs() ->
+    Nodes = mnesia:system_info(running_db_nodes),
+    case lists:member(node(), Nodes) of
+	true ->
+	    Tabs = [branch, teller, account, history],
+	    io:format("TPC-B: Verifying tables: ~w~n", [Tabs]),
+	    rpc:multicall(Nodes, mnesia, wait_for_tables, [Tabs, infinity]),
+	    
+	    Fun = fun() ->
+			  mnesia:write_lock_table(branch),
+			  mnesia:write_lock_table(teller),
+			  mnesia:write_lock_table(account),
+			  mnesia:write_lock_table(history),
+			  {Res, BadNodes} =
+			      rpc:multicall(Nodes, ?MODULE, count_balance, []),
+			  check_balance(Res, BadNodes)
+		  end,
+	    case mnesia:transaction(Fun) of
+		{atomic, Res} -> Res;
+		{aborted, Reason} -> {error, Reason}
+	    end;
+	false ->
+	    {error, "Must be initiated from a running db_node"}
+    end.
+
+%% Returns a list of {Table, Node, Balance} tuples
+%% Assumes that no updates are performed
+
+-record(summary, {table, node, balance, size}).
+
+count_balance() ->
+    [count_balance(branch, #branch.balance),
+     count_balance(teller, #teller.balance),
+     count_balance(account, #account.balance)].
+
+count_balance(Tab, BalPos) ->
+    Frags = table_info(Tab, frag_names),
+    count_balance(Tab, Frags, 0, 0, BalPos).
+
+count_balance(Tab, [Frag | Frags], Bal, Size, BalPos) ->
+    First = mnesia:dirty_first(Frag),
+    {Bal2, Size2} = count_frag_balance(Frag, First, Bal, Size, BalPos),
+    count_balance(Tab, Frags, Bal2, Size2, BalPos);
+count_balance(Tab, [], Bal, Size, _BalPos) ->
+    #summary{table = Tab, node = node(), balance = Bal, size = Size}.
+
+count_frag_balance(_Frag, '$end_of_table', Bal, Size, _BalPos) ->
+    {Bal, Size};
+count_frag_balance(Frag, Key, Bal, Size, BalPos) ->
+    [Record] = mnesia:dirty_read({Frag, Key}),
+    Bal2 = Bal + element(BalPos, Record),
+    Next = mnesia:dirty_next(Frag, Key),
+    count_frag_balance(Frag, Next, Bal2, Size + 1, BalPos).
+
+check_balance([], []) ->
+    mnesia:abort({"No balance"});
+check_balance(Summaries, []) ->
+    [One | Rest] = lists:flatten(Summaries),
+    Balance = One#summary.balance,
+    %% Size = One#summary.size,
+    case [S ||  S <- Rest, S#summary.balance =/= Balance] of
+	[] ->
+	    ok;
+	BadSummaries ->
+	    mnesia:abort({"Bad balance", One, BadSummaries})
+    end;
+check_balance(_, BadNodes) ->
+    mnesia:abort({"Bad nodes", BadNodes}).
diff --git a/lib/mnesia/test/mnesia_trans_access_test.erl b/lib/mnesia/test/mnesia_trans_access_test.erl
new file mode 100644
index 0000000000..55ba4dd761
--- /dev/null
+++ b/lib/mnesia/test/mnesia_trans_access_test.erl
@@ -0,0 +1,1233 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1996-2010. 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(mnesia_trans_access_test).
+-author('[email protected]').
+-compile([export_all]).
+-include("mnesia_test_lib.hrl").
+
+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).
+
+-define(receive_messages(Msgs), mnesia_recovery_test:receive_messages(Msgs, ?FILE, ?LINE)).
+
+% First Some debug logging 
+-define(dgb, true).
+-ifdef(dgb).
+-define(dl(X, Y), ?verbose("**TRACING: " ++ X ++ "**~n", Y)).
+-else. 
+-define(dl(X, Y), ok).
+-endif.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+all() -> 
+    [write, read, wread, delete, delete_object,
+     match_object, select, select14, all_keys, transaction,
+     {group, nested_activities}, {group, index_tabs},
+     {group, index_lifecycle}].
+
+groups() -> 
+    [{nested_activities, [],
+      [basic_nested, {group, nested_transactions},
+       mix_of_nested_activities]},
+     {nested_transactions, [],
+      [nested_trans_both_ok, nested_trans_child_dies,
+       nested_trans_parent_dies, nested_trans_both_dies]},
+     {index_tabs, [],
+      [index_match_object, index_read, {group, index_update},
+       index_write]},
+     {index_update, [],
+      [index_update_set, index_update_bag]},
+     {index_lifecycle, [],
+      [add_table_index_ram, add_table_index_disc,
+       add_table_index_disc_only, create_live_table_index_ram,
+       create_live_table_index_disc,
+       create_live_table_index_disc_only, del_table_index_ram,
+       del_table_index_disc, del_table_index_disc_only,
+       {group, idx_schema_changes}]},
+     {idx_schema_changes, [],
+      [idx_schema_changes_ram, idx_schema_changes_disc,
+       idx_schema_changes_disc_only]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%% Write records
+
+write(suite) -> [];
+write(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = write, 
+    Schema = [{name, Tab}, {attributes, [k, v]}, {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+    
+    ?match({aborted, {bad_type, _}}, 
+	   mnesia:transaction(fun() -> mnesia:write([]) end)), 
+    ?match({aborted, {bad_type, _}}, 
+	   mnesia:transaction(fun() -> mnesia:write({Tab, 2}) end)), 
+    ?match({aborted, _}, 
+	   mnesia:transaction(fun() -> mnesia:write({foo, 2}) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write({Tab, 1, 2}) end)), 
+    
+    ?match({'EXIT', {aborted, no_transaction}},  mnesia:write({Tab, 1, 2})), 
+    ?verify_mnesia(Nodes, []).
+
+%% Read records
+
+read(suite) -> [];
+read(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = read, 
+    Schema = [{name, Tab}, {type, bag}, {attributes, [k, v]}, {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+
+    OneRec = {Tab, 1, 2}, 
+    TwoRec = {Tab, 1, 3}, 
+    ?match({aborted, {bad_type, _}}, 
+	   mnesia:transaction(fun() -> mnesia:read([]) end)), 
+    ?match({aborted, {bad_type, _}}, 
+	   mnesia:transaction(fun() -> mnesia:read({Tab}) end)), 
+    ?match({aborted, {bad_type, _}}
+	   ,  mnesia:transaction(fun() -> mnesia:read(OneRec) end)), 
+    ?match({atomic, []}, 
+	   mnesia:transaction(fun() -> mnesia:read({Tab, 1}) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(OneRec) end)), 
+    ?match({atomic, [OneRec]}, 
+	   mnesia:transaction(fun() -> mnesia:read({Tab, 1}) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(TwoRec) end)), 
+    ?match({atomic, [OneRec, TwoRec]}, 
+	   mnesia:transaction(fun() -> mnesia:read({Tab, 1}) end)), 
+    
+    ?match({'EXIT', {aborted, no_transaction}},  mnesia:read({Tab, 1})), 
+    ?verify_mnesia(Nodes, []).
+
+%% Read records and set write lock
+
+wread(suite) -> [];
+wread(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = wread, 
+    Schema = [{name, Tab}, {type, set}, {attributes, [k, v]}, {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+    
+    OneRec = {Tab, 1, 2}, 
+    TwoRec = {Tab, 1, 3}, 
+    ?match({aborted, {bad_type, _}}, 
+	   mnesia:transaction(fun() -> mnesia:wread([]) end)), 
+    ?match({aborted, {bad_type, _}}, 
+	   mnesia:transaction(fun() -> mnesia:wread({Tab}) end)), 
+    ?match({aborted, {bad_type, _}}
+	   ,  mnesia:transaction(fun() -> mnesia:wread(OneRec) end)), 
+    
+    ?match({atomic, []}, 
+	   mnesia:transaction(fun() -> mnesia:wread({Tab, 1}) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(OneRec) end)), 
+    
+    ?match({atomic, [OneRec]}, 
+	   mnesia:transaction(fun() -> mnesia:wread({Tab, 1}) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(TwoRec) end)), 
+    ?match({atomic, [TwoRec]}, 
+	   mnesia:transaction(fun() -> mnesia:wread({Tab, 1}) end)), 
+    
+    ?match({'EXIT', {aborted, no_transaction}},  mnesia:wread({Tab, 1})), 
+    ?verify_mnesia(Nodes, []).
+
+%% Delete record
+
+delete(suite) -> [];
+delete(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = delete, 
+    Schema = [{name, Tab}, {type, bag}, {attributes, [k, v]}, {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+    
+    ?match({aborted, {bad_type, _}}, 
+	   mnesia:transaction(fun() -> mnesia:delete([]) end)), 
+    ?match({aborted, {bad_type, _}}, 
+	   mnesia:transaction(fun() -> mnesia:delete({Tab}) end)), 
+    ?match({aborted, {bad_type, _}}
+	   ,  mnesia:transaction(fun() -> mnesia:delete({Tab, 1, 2}) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:delete({Tab, 1}) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write({Tab, 1, 2}) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:delete({Tab, 1}) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write({Tab, 1, 2}) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write({Tab, 1, 2}) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:delete({Tab, 1}) end)), 
+    
+    ?match({'EXIT', {aborted, no_transaction}},  mnesia:delete({Tab, 1})), 
+    ?verify_mnesia(Nodes, []).
+
+%% Delete matching record
+
+delete_object(suite) -> [];
+delete_object(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = delete_object, 
+    Schema = [{name, Tab}, {type, bag}, {attributes, [k, v]}, {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+
+    OneRec = {Tab, 1, 2}, 
+    ?match({aborted, {bad_type, _}},
+	   mnesia:transaction(fun() -> mnesia:delete_object([]) end)),
+    ?match({aborted, {bad_type, _}},
+	   mnesia:transaction(fun() -> mnesia:delete_object({Tab}) end)),
+    ?match({aborted, {bad_type, _}},
+	   mnesia:transaction(fun() -> mnesia:delete_object({Tab, 1}) end)),
+    ?match({atomic, ok},
+	   mnesia:transaction(fun() -> mnesia:delete_object(OneRec) end)),
+    ?match({atomic, ok},
+	   mnesia:transaction(fun() -> mnesia:write(OneRec) end)),
+    ?match({atomic, ok},
+	   mnesia:transaction(fun() -> mnesia:delete_object(OneRec) end)),
+    ?match({atomic, ok},
+	   mnesia:transaction(fun() -> mnesia:write(OneRec) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(OneRec) end)),
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:delete_object(OneRec) end)),
+    
+    ?match({'EXIT', {aborted, no_transaction}},  mnesia:delete_object(OneRec)),
+
+    ?match({aborted, {bad_type, Tab, _}}, 
+	   mnesia:transaction(fun() -> mnesia:delete_object({Tab, {['_']}, 21}) end)),
+    ?match({aborted, {bad_type, Tab, _}}, 
+	   mnesia:transaction(fun() -> mnesia:delete_object({Tab, {['$5']}, 21}) end)),
+
+    ?verify_mnesia(Nodes, []).
+
+%% Read matching records
+
+match_object(suite) -> [];
+match_object(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = match, 
+    Schema = [{name, Tab}, {attributes, [k, v]}, {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+    
+    OneRec = {Tab, 1, 2}, 
+    OnePat = {Tab, '$1', 2}, 
+    ?match({atomic, []}, 
+	   mnesia:transaction(fun() -> mnesia:match_object(OnePat) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(OneRec) end)), 
+    ?match({atomic, [OneRec]}, 
+	   mnesia:transaction(fun() -> mnesia:match_object(OnePat) end)), 
+    
+    ?match({aborted, _}, 
+	   mnesia:transaction(fun() -> mnesia:match_object({foo, '$1', 2}) end)), 
+    ?match({aborted, _}, 
+	   mnesia:transaction(fun() -> mnesia:match_object({[], '$1', 2}) end)), 
+    
+    ?match({'EXIT', {aborted, no_transaction}},  mnesia:match_object(OnePat)), 
+    ?verify_mnesia(Nodes, []).
+
+%% select
+select(suite) -> [];
+select(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = match, 
+    Schema = [{name, Tab}, {attributes, [k, v]}, {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+
+    OneRec = {Tab, 1, 2}, 
+    TwoRec = {Tab, 2, 3}, 
+    OnePat = [{{Tab, '$1', 2}, [], ['$_']}],
+    ?match({atomic, []}, 
+	   mnesia:transaction(fun() -> mnesia:select(Tab, OnePat) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(OneRec) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(TwoRec) end)), 
+    ?match({atomic, [OneRec]}, 
+	   mnesia:transaction(fun() -> mnesia:select(Tab, OnePat) end)), 
+
+    ?match({aborted, _}, 
+	   mnesia:transaction(fun() -> mnesia:select(Tab, {match, '$1', 2}) end)), 
+    ?match({aborted, _}, 
+	   mnesia:transaction(fun() -> mnesia:select(Tab, [{'_', [], '$1'}]) end)), 
+
+    ?match({'EXIT', {aborted, no_transaction}},  mnesia:select(Tab, OnePat)), 
+    ?verify_mnesia(Nodes, []).
+
+
+%% more select
+select14(suite) -> [];
+select14(Config) when is_list(Config) ->
+    [Node1,Node2] = Nodes = ?acquire_nodes(2, Config), 
+    Tab1 = select14_ets, 
+    Tab2 = select14_dets, 
+    Tab3 = select14_remote, 
+    Tab4 = select14_remote_dets, 
+    Schemas = [[{name, Tab1}, {attributes, [k, v]}, {ram_copies, [Node1]}], 
+	       [{name, Tab2}, {attributes, [k, v]}, {disc_only_copies, [Node1]}], 
+	       [{name, Tab3}, {attributes, [k, v]}, {ram_copies, [Node2]}],
+	       [{name, Tab4}, {attributes, [k, v]}, {disc_only_copies, [Node2]}]], 
+    [?match({atomic, ok},  mnesia:create_table(Schema)) || Schema <- Schemas],
+
+    %% Some Helpers
+    Trans = fun(Fun) -> mnesia:transaction(Fun) end,
+    LoopHelp = fun('$end_of_table',_) -> [];
+		  ({Recs,Cont},Fun) -> 
+		       Sel = mnesia:select(Cont),
+		       Recs ++ Fun(Sel, Fun)
+	       end,
+    Loop = fun(Table,Pattern) -> 
+		   Sel = mnesia:select(Table, Pattern, 1, read),
+		   Res = LoopHelp(Sel,LoopHelp),
+		   case mnesia:table_info(Table, type) of
+		       ordered_set -> Res;
+		       _ -> lists:sort(Res)
+		   end 
+	   end,
+    Test = 
+	fun(Tab) ->
+		OneRec = {Tab, 1, 2}, 
+		TwoRec = {Tab, 2, 3}, 
+		OnePat = [{{Tab, '$1', 2}, [], ['$_']}],
+		All = [OneRec,TwoRec],
+		AllPat = [{'_', [], ['$_']}],
+
+		?match({atomic, []}, Trans(fun() -> Loop(Tab, OnePat) end)), 
+		?match({atomic, ok},   mnesia:transaction(fun() -> mnesia:write(OneRec) end)), 
+		?match({atomic, ok},   mnesia:transaction(fun() -> mnesia:write(TwoRec) end)), 
+		?match({atomic, [OneRec]}, Trans(fun() -> Loop(Tab, OnePat) end)), 
+		?match({atomic, All}, Trans(fun() -> Loop(Tab, AllPat) end)), 
+		
+		{atomic,{_, Cont}} = Trans(fun() -> mnesia:select(Tab, OnePat, 1, read) end),
+		?match({aborted, wrong_transaction}, Trans(fun() -> mnesia:select(Cont) end)),
+		
+		?match({aborted, _}, Trans(fun() -> mnesia:select(Tab, {match, '$1', 2},1,read) end)), 
+		?match({aborted, _}, Trans(fun() -> mnesia:select(Tab, [{'_', [], '$1'}],1,read) end)), 
+		?match({aborted, _}, Trans(fun() -> mnesia:select(sune) end)),     
+		?match({'EXIT', {aborted, no_transaction}},  mnesia:select(Tab, OnePat,1,read)), 
+		?match({aborted, {badarg,sune}}, 
+		       Trans(fun() -> mnesia:select(sune) end))
+	end,
+    Test(Tab1),
+    Test(Tab2),
+    Test(Tab3),
+    Test(Tab4),
+    ?verify_mnesia(Nodes, []).
+
+
+%% Pick all keys from table
+
+all_keys(suite) ->[];
+all_keys(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = all_keys, 
+    Schema = [{name, Tab}, {type, bag}, {attributes, [k, v]}, {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+    
+    Write = fun() -> mnesia:write({Tab, 14, 4}) end, 
+    AllKeys = fun() -> mnesia:all_keys(Tab) end, 
+    
+    ?match({atomic, []},  mnesia:transaction(AllKeys)), 
+    
+    ?match({atomic, ok},  mnesia:transaction(Write)), 
+    ?match({atomic, [14]},  mnesia:transaction(AllKeys)), 
+    
+    ?match({atomic, ok},  mnesia:transaction(Write)), 
+    ?match({atomic, [14]},  mnesia:transaction(AllKeys)), 
+    
+    ?match({aborted, _}, 
+	   mnesia:transaction(fun() -> mnesia:all_keys(foo) end)), 
+    ?match({aborted, _}, 
+	   mnesia:transaction(fun() -> mnesia:all_keys([]) end)), 
+    
+    ?match({'EXIT', {aborted, no_transaction}},  mnesia:all_keys(Tab)), 
+    ?verify_mnesia(Nodes, []).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Use and misuse transactions
+
+transaction(suite) -> [];
+transaction(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    ?match({atomic, ali_baba}, mnesia:transaction(fun() -> ali_baba end)),
+    ?match({aborted, _}, mnesia:transaction(no_fun)),
+    ?match({aborted, _}, mnesia:transaction(?MODULE, no_fun, [foo])),
+
+    {success, [A, B, C, D, E, F, G, H]} =
+        ?start_activities(lists:duplicate(8, Node1)),
+    ?start_transactions([A, B, C, D, E, F, G, H]),
+
+    A ! fun() -> mnesia:abort(abort_bad_trans) end,
+    ?match_receive({A, {aborted, abort_bad_trans}}),
+
+    B ! fun() -> erlang:error(exit_here) end,
+    ?match_receive({B, {aborted, _}}),
+
+    C ! fun() -> throw(throw_bad_trans) end,
+    ?match_receive({C, {aborted, {throw, throw_bad_trans}}}),
+
+    D ! fun() -> exit(exit_bad_trans) end,
+    ?match_receive({D, {aborted, exit_bad_trans}}),
+
+    E ! fun() -> exit(normal) end,
+    ?match_receive({E, {aborted, normal}}),
+
+    F ! fun() -> exit(abnormal) end,
+    ?match_receive({F, {aborted, abnormal}}),
+
+    G ! fun() -> exit(G, abnormal) end,
+    ?match_receive({'EXIT', G, abnormal}),
+
+    H ! fun() -> exit(H, kill) end,
+    ?match_receive({'EXIT', H, killed}),
+
+    ?match({atomic, ali_baba},
+           mnesia:transaction(fun() -> ali_baba end, infinity)),
+    ?match({atomic, ali_baba}, mnesia:transaction(fun() -> ali_baba end, 1)),
+    ?match({atomic, ali_baba}, mnesia:transaction(fun() -> ali_baba end, 0)),
+    ?match({aborted, Reason8} when element(1, Reason8) == badarg, mnesia:transaction(fun() -> ali_baba end, -1)),
+    ?match({aborted, Reason1} when element(1, Reason1) == badarg, mnesia:transaction(fun() -> ali_baba end, foo)),
+    Fun = fun() ->
+		  ?match(true, mnesia:is_transaction()),
+		  ?match({atomic, ok},
+			 mnesia:transaction(fun() -> ?match(true, mnesia:is_transaction()),ok end)), ok end,
+    ?match({atomic, ok}, mnesia:transaction(Fun)),
+    ?verify_mnesia(Nodes, []).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% ensure that nested transactions behave correctly
+%% We create a particular table that is used by this test only
+-record(ntab,  {a,  b}).
+basic_nested(doc) -> ["Test the basic functionality of nested transactions"];
+basic_nested(suite) -> [];
+basic_nested(Config) when is_list(Config) ->
+    Nodes = ?acquire_nodes(3, Config), 
+    Args =  [{ram_copies,  Nodes}, 
+	     {attributes,  record_info(fields,  ntab)}], 
+    ?match({atomic,  ok},  mnesia:create_table(ntab,  Args)), 
+    do_nested(top), 
+    case mnesia_test_lib:diskless(Config) of
+	false ->
+	    lists:foreach(fun(N) ->
+				  ?match({atomic,  ok}, 
+					 mnesia:change_table_copy_type(ntab,  N,  disc_only_copies))
+			  end,  Nodes), 
+	    do_nested(top);
+	true -> 
+	    skip
+    end,
+    ?verify_mnesia(Nodes, []).
+
+do_nested(How) ->
+    F1 = fun() ->
+		mnesia:write(#ntab{a= 1}), 
+		mnesia:write(#ntab{a= 2})
+	end, 
+    F2 = fun() ->
+		 mnesia:read({ntab,  1})
+	 end, 
+    ?match({atomic,  ok},  mnesia:transaction(F1)), 
+    ?match({atomic,  _},  mnesia:transaction(F2)), 
+
+    ?match({atomic,  {aborted,  _}}, 
+	   mnesia:transaction(fun() -> n_f1(), 
+				mnesia:transaction(fun() -> n_f2() end)
+		       end)), 
+
+    ?match({atomic,  {aborted,  _}}, 
+	   mnesia:transaction(fun() -> n_f1(), 
+				mnesia:transaction(fun() -> n_f3() end)
+		       end)), 
+    ?match({atomic,  {atomic,  [#ntab{a = 5}]}}, 
+	   mnesia:transaction(fun() -> mnesia:write(#ntab{a = 5}), 
+				       mnesia:transaction(fun() -> n_f4() end)
+			      end)), 
+    Cyclic = fun() -> mnesia:abort({cyclic,a,a,a,a,a}) end,  %% Ugly 
+    NodeNotR = fun() -> mnesia:abort({node_not_running, testNode}) end,   
+
+    TestAbort = fun(Fun) ->
+			case get(restart_counter) of
+			    undefined ->
+				put(restart_counter, 1),
+				Fun();
+			    _ ->
+				erase(restart_counter),
+				ok
+			end
+		end,
+    
+    ?match({atomic,{atomic,ok}}, 
+	   mnesia:transaction(fun()->mnesia:transaction(TestAbort,
+							[Cyclic])end)),
+    
+    ?match({atomic,{atomic,ok}}, 
+	   mnesia:transaction(fun()->mnesia:transaction(TestAbort,
+							[NodeNotR])end)),
+							    
+    %% Now try the restart thingie
+    case How of
+	top ->	    
+	    Pids = [spawn(?MODULE,  do_nested,  [{spawned,  self()}]), 
+		    spawn(?MODULE,  do_nested,  [{spawned,  self()}]), 
+		    spawn(?MODULE,  do_nested,  [{spawned,  self()}]), 
+		    spawn(?MODULE,  do_nested,  [{spawned,  self()}])], 
+	    ?match({info, _, _}, mnesia_tm:get_info(2000)),	    
+	    lists:foreach(fun(P) -> receive
+					{P,  ok} -> ok
+				    end
+			  end,  Pids), 
+	    ?match([],  [Tab || Tab <- ets:all(), mnesia_trans_store == ets:info(Tab, name)]);
+				
+	{spawned,  Pid} ->
+	    ?match({info, _, _}, mnesia_tm:get_info(2000)),	    
+	    Pid ! {self(),  ok},
+	    exit(normal)
+    end.
+
+
+n_f1() ->
+    mnesia:read({ntab,  1}), 
+    mnesia:write(#ntab{a = 3}).
+
+n_f2() ->
+    mnesia:write(#ntab{a = 4}), 
+    erlang:error(exit_here).
+
+n_f3() ->
+    mnesia:write(#ntab{a = 4}), 
+    throw(funky).
+
+n_f4() ->
+    mnesia:read({ntab,  5}).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+nested_trans_both_ok(suite) -> [];
+nested_trans_both_ok(Config) when is_list(Config) ->
+    nested_transactions(Config, ok, ok).
+
+nested_trans_child_dies(suite) -> [];
+nested_trans_child_dies(Config) when is_list(Config) ->
+    nested_transactions(Config, abort, ok).
+
+nested_trans_parent_dies(suite) -> [];
+nested_trans_parent_dies(Config) when is_list(Config) ->
+    nested_transactions(Config, ok, abort).
+
+nested_trans_both_dies(suite) -> [];
+nested_trans_both_dies(Config) when is_list(Config) ->
+    nested_transactions(Config, abort, abort).
+
+nested_transactions(Config, Child, Father) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),    
+    Tab = nested_trans,
+
+    Def = 
+	case mnesia_test_lib:diskless(Config) of
+	    true ->
+		[{name, Tab}, {ram_copies, Nodes}];
+	    false ->
+		[{name, Tab}, {ram_copies, [Node1]}, 
+		 {disc_copies, [Node2]}, {disc_only_copies, [Node3]}]
+	end,
+
+    ?match({atomic, ok}, mnesia:create_table(Def)),
+    ?match(ok, mnesia:dirty_write({Tab, father, not_updated})),
+    ?match(ok, mnesia:dirty_write({Tab, child, not_updated})),    
+
+    ChildOk = fun() -> mnesia:write({Tab, child, updated}) end,
+    ChildAbort = fun() -> 
+			 mnesia:write({Tab, child, updated}),
+			 erlang:error(exit_here)
+		 end,
+
+    Child_Fun =   % Depending of test case
+	case Child of
+	    ok -> ChildOk;
+	    abort -> ChildAbort
+	end,
+
+    FatherOk = fun() -> mnesia:transaction(Child_Fun),
+			mnesia:write({Tab, father, updated})
+	       end,
+
+    FatherAbort = fun() -> mnesia:transaction(Child_Fun),
+			   mnesia:write({Tab, father, updated}),
+			   erlang:error(exit_here)
+		  end,
+
+    {FatherRes, ChildRes} = % Depending of test case
+	case Father of
+	    ok -> ?match({atomic, ok}, mnesia:transaction(FatherOk)),
+		  case Child of
+		      ok -> {[{Tab, father, updated}], [{Tab, child, updated}]};
+		      _ -> {[{Tab, father, updated}], [{Tab, child, not_updated}]}
+		  end;
+	    abort -> ?match({aborted, _}, mnesia:transaction(FatherAbort)),
+		     {[{Tab, father, not_updated}], [{Tab, child, not_updated}]}
+	end,
+
+    %% Syncronize things!!
+    ?match({atomic, ok}, mnesia:sync_transaction(fun() -> mnesia:write({Tab, sync, sync}) end)),
+
+    ?match(ChildRes, rpc:call(Node1, mnesia, dirty_read, [{Tab, child}])),
+    ?match(ChildRes, rpc:call(Node2, mnesia, dirty_read, [{Tab, child}])),
+    ?match(ChildRes, rpc:call(Node3, mnesia, dirty_read, [{Tab, child}])),
+
+    ?match(FatherRes, rpc:call(Node1, mnesia, dirty_read, [{Tab, father}])),
+    ?match(FatherRes, rpc:call(Node2, mnesia, dirty_read, [{Tab, father}])),
+    ?match(FatherRes, rpc:call(Node3, mnesia, dirty_read, [{Tab, father}])),
+    ?verify_mnesia(Nodes, []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+mix_of_nested_activities(doc) -> 
+    ["Verify that dirty operations in a transaction are handled like ",
+     "normal transactions"];
+mix_of_nested_activities(suite) ->   [];
+mix_of_nested_activities(Config) when is_list(Config) ->
+    [Node1, Node2, Node3] = Nodes = ?acquire_nodes(3, Config),
+    Tab = tab,
+
+    Def = 
+	case mnesia_test_lib:diskless(Config) of
+	    true -> [{ram_copies, Nodes}];
+	    false -> 
+		[{ram_copies, [Node1]}, 
+		 {disc_copies, [Node2]}, 
+		 {disc_only_copies, [Node3]}]
+	end,
+
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{type,bag}|Def])),
+    Activities = [transaction, sync_transaction, 
+		  ets, async_dirty, sync_dirty],
+    %% Make a test for all 3000 combinations
+    Tests = [[A,B,C,D,E] || 
+		A <- Activities,
+		B <- Activities,
+		C <- Activities,
+		D <- Activities,
+		E <- Activities],
+    Foreach = 
+	fun(Test,No) -> 
+		Result = lists:reverse(Test),
+		?match({No,Result},{No,catch apply_op({Tab,No},Test)}),
+		No+1
+	end,
+    lists:foldl(Foreach, 0, Tests),
+    ?verify_mnesia(Nodes, []).
+
+apply_op(Oid,[Type]) ->
+    check_res(Type,mnesia:Type(fun() -> [Type|read_op(Oid)] end));
+apply_op(Oid = {Tab,Key},[Type|Next]) ->
+    check_res(Type,mnesia:Type(fun() ->
+				       Prev = read_op(Oid),
+				       mnesia:write({Tab,Key,[Type|Prev]}),
+				       apply_op(Oid,Next)
+			       end)).
+
+check_res(transaction, {atomic,Res}) -> 
+    Res;
+check_res(sync_transaction, {atomic,Res}) -> 
+    Res;
+check_res(async_dirty, Res) when is_list(Res) ->
+    Res;
+check_res(sync_dirty, Res) when is_list(Res) ->
+    Res;
+check_res(ets, Res) when is_list(Res) ->
+    Res;
+check_res(Type,Res) ->
+    ?match(bug,{Type,Res}).
+    
+read_op(Oid) ->
+    case lists:reverse(mnesia:read(Oid)) of
+	[] -> [];
+	[{_,_,Ops}|_] -> 
+	    Ops
+    end.
+
+
+%% Read matching records by using an index
+
+index_match_object(suite) -> [];
+index_match_object(Config) when is_list(Config) ->
+    [Node1, Node2] = Nodes = ?acquire_nodes(2, Config), 
+    Tab = index_match_object, 
+    Schema = [{name, Tab}, {attributes, [k, v, e]}, {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+    ValPos = 3, 
+    BadValPos = ValPos + 2, 
+    ?match({atomic, ok},  mnesia:add_table_index(Tab, ValPos)), 
+
+    ?match({atomic, []}, 
+	   mnesia:transaction(fun() -> mnesia:index_match_object({Tab, '$1', 2}, ValPos) end)), 
+    OneRec = {Tab, {1, 1}, 2, {1, 1}}, 
+    OnePat = {Tab, '$1', 2, '_'},     
+    BadPat = {Tab, '$1', '$2', '_'},  %% See ref guide
+
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(OneRec) end)), 
+
+    Imatch = fun(Patt, Pos) -> 
+		     mnesia:transaction(fun() -> lists:sort(mnesia:index_match_object(Patt, Pos)) end)
+	     end,
+    ?match({atomic, [OneRec]}, Imatch(OnePat, ValPos)),
+    ?match({aborted, _}, Imatch(OnePat, BadValPos)),
+    ?match({aborted, _}, Imatch({foo, '$1', 2, '_'}, ValPos)),
+    ?match({aborted, _}, Imatch({[], '$1', 2, '_'}, ValPos)),
+    ?match({aborted, _}, Imatch(BadPat, ValPos)),
+    ?match({'EXIT', {aborted, no_transaction}},  mnesia:index_match_object(OnePat, ValPos)), 
+
+    Another = {Tab, {3,1}, 2, {4,4}},
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(Another) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write({Tab, {4, 4}, 3, {4, 4}}) end)), 
+
+    ?match({atomic, [OneRec]}, Imatch({Tab, {1,1}, 2, {1,1}}, ValPos)),
+    ?match({atomic, [OneRec]}, Imatch({Tab, {1,1}, 2, '$1'}, ValPos)),
+    ?match({atomic, [OneRec]}, Imatch({Tab, '$1', 2, {1,1}}, ValPos)),
+    ?match({atomic, [OneRec]}, Imatch({Tab, '$1', 2, '$1'}, ValPos)),
+    ?match({atomic, [OneRec]}, Imatch({Tab, {1, '$1'}, 2, '_'}, ValPos)),
+    ?match({atomic, [OneRec]}, Imatch({Tab, {'$2', '$1'}, 2, {'_', '$1'}}, ValPos)),
+    ?match({atomic, [OneRec, Another]}, Imatch({Tab, '_', 2, '_'}, ValPos)),
+
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write({Tab, 4, 5, {7, 4}}) end)),     
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write({Tab, 7, 5, {7, 5}}) end)),     
+
+    ?match({atomic, [{Tab, 4, 5, {7, 4}}]}, Imatch({Tab, '$1', 5, {'_', '$1'}}, ValPos)),
+
+    ?match({atomic, [OneRec]}, rpc:call(Node2, mnesia, transaction,
+					[fun() -> 
+						lists:sort(mnesia:index_match_object({Tab, {1,1}, 2, 
+										      {1,1}}, ValPos))
+					 end])),    
+    ?verify_mnesia(Nodes, []).
+
+%% Read records by using an index
+
+index_read(suite) -> [];
+index_read(Config) when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = index_read, 
+    Schema = [{name, Tab}, {attributes, [k, v]}, {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+    ValPos = 3, 
+    BadValPos = ValPos + 1, 
+    ?match({atomic, ok},  mnesia:add_table_index(Tab, ValPos)), 
+
+    OneRec = {Tab, 1, 2}, 
+    ?match({atomic, []}, 
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(OneRec) end)), 
+    ?match({atomic, [OneRec]}, 
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end)), 
+    ?match({aborted, _}, 
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, BadValPos) end)), 
+    ?match({aborted, _}, 
+	   mnesia:transaction(fun() -> mnesia:index_read(foo, 2, ValPos) end)), 
+    ?match({aborted, _}, 
+	   mnesia:transaction(fun() -> mnesia:index_read([], 2, ValPos) end)), 
+    
+    ?match({'EXIT', {aborted, no_transaction}},  mnesia:index_read(Tab, 2, ValPos)), 
+    ?verify_mnesia(Nodes, []).
+
+index_update_set(suite) -> [];
+index_update_set(Config)when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = index_test, 
+    Schema = [{name, Tab}, {attributes, [k, v1, v2, v3]}, {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+    ValPos = v1, 
+    ValPos2 = v3,
+    ?match({atomic, ok},  mnesia:add_table_index(Tab, ValPos)), 
+    
+    Pat1 = {Tab, '$1',  2,   '$2', '$3'},
+    Pat2 = {Tab, '$1', '$2', '$3', '$4'}, 
+    
+    Rec1 = {Tab, 1, 2, 3, 4}, 
+    Rec2 = {Tab, 2, 2, 13, 14},
+    Rec3 = {Tab, 1, 12, 13, 14}, 
+    Rec4 = {Tab, 4, 2, 13, 14}, 
+    
+    ?match({atomic, []}, 
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(Rec1) end)), 
+    ?match({atomic, [Rec1]}, 
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end)), 
+    
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(Rec2) end)), 
+    {atomic, R1} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end), 
+    ?match([Rec1, Rec2], lists:sort(R1)),
+    
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(Rec3) end)), 
+    {atomic, R2} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end), 
+    ?match([Rec2], lists:sort(R2)),
+    ?match({atomic, [Rec2]}, 
+	   mnesia:transaction(fun() -> mnesia:index_match_object(Pat1, ValPos) end)), 
+    
+    {atomic, R3} = mnesia:transaction(fun() -> mnesia:match_object(Pat2) end), 
+    ?match([Rec3, Rec2], lists:sort(R3)),
+    
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(Rec4) end)), 
+    {atomic, R4} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end), 
+    ?match([Rec2, Rec4], lists:sort(R4)),
+    
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:delete({Tab, 4}) end)), 
+    ?match({atomic, [Rec2]}, 
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end)), 
+    
+    ?match({atomic, ok}, mnesia:del_table_index(Tab, ValPos)),
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec4) end)),
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos2)),
+    
+    {atomic, R5} = mnesia:transaction(fun() -> mnesia:match_object(Pat2) end), 
+    ?match([Rec3, Rec2, Rec4], lists:sort(R5)),
+    
+    {atomic, R6} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec2, Rec4], lists:sort(R6)),
+    
+    ?match({atomic, []},
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 4, ValPos2) end)),
+    {atomic, R7} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 14, ValPos2) end),
+    ?match([Rec3, Rec2, Rec4], lists:sort(R7)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec1) end)),
+    {atomic, R8} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec1, Rec2, Rec4], lists:sort(R8)),
+    ?match({atomic, [Rec1]},
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 4, ValPos2) end)),
+    {atomic, R9} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 14, ValPos2) end),
+    ?match([Rec2, Rec4], lists:sort(R9)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete_object(Rec2) end)),
+    {atomic, R10} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec1, Rec4], lists:sort(R10)),
+    ?match({atomic, [Rec1]},
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 4, ValPos2) end)),
+    ?match({atomic, [Rec4]},
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 14, ValPos2) end)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete({Tab, 4}) end)),
+    {atomic, R11} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec1], lists:sort(R11)),
+    ?match({atomic, [Rec1]},mnesia:transaction(fun() -> mnesia:index_read(Tab, 4, ValPos2) end)),
+    ?match({atomic, []},mnesia:transaction(fun() -> mnesia:index_read(Tab, 14, ValPos2) end)),
+    
+    ?verify_mnesia(Nodes, []).
+
+index_update_bag(suite) -> [];
+index_update_bag(Config)when is_list(Config) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config), 
+    Tab = index_test, 
+    Schema = [{name, Tab},
+	      {type, bag},
+	      {attributes, [k, v1, v2, v3]}, 
+	      {ram_copies, [Node1]}], 
+    ?match({atomic, ok},  mnesia:create_table(Schema)), 
+    ValPos = v1, 
+    ValPos2 = v3,
+
+    ?match({atomic, ok},  mnesia:add_table_index(Tab, ValPos)), 
+
+    Pat1 = {Tab, '$1',  2,   '$2', '$3'},
+    Pat2 = {Tab, '$1', '$2', '$3', '$4'}, 
+
+    Rec1 = {Tab, 1, 2, 3, 4},    
+    Rec2 = {Tab, 2, 2, 13, 14},  
+    Rec3 = {Tab, 1, 12, 13, 14}, 
+    Rec4 = {Tab, 4, 2, 13, 4}, 
+    Rec5 = {Tab, 1, 2, 234, 14},
+
+    %% Simple Index
+    ?match({atomic, []}, 
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end)), 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(Rec1) end)), 
+    ?match({atomic, [Rec1]}, 
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end)), 
+
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(Rec2) end)), 
+    {atomic, R1} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec1, Rec2], lists:sort(R1)),
+
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(Rec3) end)), 
+    {atomic, R2} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec1, Rec2], lists:sort(R2)),
+
+    {atomic, R3} = mnesia:transaction(fun() -> mnesia:index_match_object(Pat1, ValPos) end),
+    ?match([Rec1, Rec2], lists:sort(R3)),
+ 
+    {atomic, R4} = mnesia:transaction(fun() -> mnesia:match_object(Pat2) end),
+    ?match([Rec1, Rec3, Rec2], lists:sort(R4)),
+ 
+    ?match({atomic, ok}, 
+	   mnesia:transaction(fun() -> mnesia:write(Rec4) end)), 
+    {atomic, R5} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end), 
+    ?match([Rec1, Rec2, Rec4], lists:sort(R5)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete({Tab, 4}) end)), 
+    {atomic, R6} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec1, Rec2], lists:sort(R6)),
+
+    %% OTP-6587  Needs some whitebox testing to see that the index table is cleaned correctly
+
+    [IPos] = mnesia_lib:val({Tab,index}),
+    ITab = mnesia_lib:val({index_test,{index, IPos}}),
+    io:format("~n Index ~p @ ~p => ~p ~n~n",[IPos,ITab, ets:tab2list(ITab)]),
+    ?match([{2,1},{2,2},{12,1}], ets:tab2list(ITab)),
+    
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec5) end)),
+    {atomic, R60} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec1,Rec5,Rec2], lists:sort(R60)),
+
+    ?match([{2,1},{2,2},{12,1}], ets:tab2list(ITab)),
+    
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete_object(Rec3) end)),
+    {atomic, R61} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec1,Rec5,Rec2], lists:sort(R61)),
+    {atomic, R62} = mnesia:transaction(fun() -> mnesia:index_read(Tab,12, ValPos) end),
+    ?match([], lists:sort(R62)),
+    ?match([{2,1},{2,2}], ets:tab2list(ITab)),
+    
+    %% reset for rest of testcase
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec3) end)),
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete_object(Rec5) end)),
+    {atomic, R6} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec1, Rec2], lists:sort(R6)),
+    %% OTP-6587
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete_object(Rec1) end)), 
+    ?match({atomic, [Rec2]}, 
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end)), 
+    {atomic, R7} = mnesia:transaction(fun() -> mnesia:match_object(Pat2) end),
+    ?match([Rec3, Rec2], lists:sort(R7)),
+    
+    %% Two indexies
+    ?match({atomic, ok}, mnesia:del_table_index(Tab, ValPos)),
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec1) end)),
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec4) end)),
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos2)),
+    
+    {atomic, R8} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec1, Rec2, Rec4], lists:sort(R8)),
+
+    {atomic, R9} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 4, ValPos2) end),
+    ?match([Rec1, Rec4], lists:sort(R9)),
+    {atomic, R10} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 14, ValPos2) end),
+    ?match([Rec3, Rec2], lists:sort(R10)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec5) end)),
+    {atomic, R11} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec1, Rec5, Rec2, Rec4], lists:sort(R11)),
+    {atomic, R12} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 4, ValPos2) end),
+    ?match([Rec1, Rec4], lists:sort(R12)),
+    {atomic, R13} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 14, ValPos2) end),
+    ?match([Rec5, Rec3, Rec2], lists:sort(R13)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete_object(Rec1) end)),
+    {atomic, R14} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec5, Rec2, Rec4], lists:sort(R14)),
+    ?match({atomic, [Rec4]},
+	   mnesia:transaction(fun() -> mnesia:index_read(Tab, 4, ValPos2) end)),
+    {atomic, R15} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 14, ValPos2) end),
+    ?match([Rec5, Rec3, Rec2], lists:sort(R15)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete_object(Rec5) end)),
+    {atomic, R16} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec2, Rec4], lists:sort(R16)),
+    ?match({atomic, [Rec4]}, mnesia:transaction(fun()->mnesia:index_read(Tab, 4, ValPos2) end)),
+    {atomic, R17} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 14, ValPos2) end),
+    ?match([Rec3, Rec2], lists:sort(R17)),
+
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:write(Rec1) end)),
+    ?match({atomic, ok}, mnesia:transaction(fun() -> mnesia:delete({Tab, 1}) end)),
+    {atomic, R18} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 2, ValPos) end),
+    ?match([Rec2, Rec4], lists:sort(R18)),
+    ?match({atomic, [Rec4]}, mnesia:transaction(fun()->mnesia:index_read(Tab, 4, ValPos2) end)),
+    {atomic, R19} = mnesia:transaction(fun() -> mnesia:index_read(Tab, 14, ValPos2) end),
+    ?match([Rec2], lists:sort(R19)),
+
+    ?verify_mnesia(Nodes, []).
+
+
+index_write(suite) -> [];
+index_write(doc) -> ["See ticket OTP-8072"];
+index_write(Config)when is_list(Config) ->
+    Nodes = ?acquire_nodes(1, Config), 
+    mnesia:create_table(a, [{index, [val]}]),
+    mnesia:create_table(counter, []),
+
+    CreateIfNonExist =
+	fun(Index) ->			       
+		case mnesia:index_read(a, Index, 3) of
+		    [] ->
+			Id = mnesia:dirty_update_counter(counter, id, 1),
+			New = {a, Id, Index},
+			mnesia:write(New),
+			New;
+		    [Found] ->
+			Found
+		end
+	end,
+    
+    Trans = fun(A) ->
+		    mnesia:transaction(CreateIfNonExist, [A])
+		    %% This works better most of the time
+		    %% And it is allowed to fail since it's dirty
+		    %% mnesia:async_dirty(CreateIfNonExist, [A])
+	    end,
+
+    Self = self(),
+    Update = fun() ->
+		     Res = lists:map(Trans, lists:seq(1,10)),
+		     Self ! {self(), Res}
+	     end,
+    
+    Pids = [spawn(Update) || _ <- lists:seq(1,5)],
+    
+    Gather = fun(Pid, Acc) -> receive {Pid, Res} -> [Res|Acc] end end,
+    Results = lists:foldl(Gather, [], Pids),
+    Expected = hd(Results),
+    Check = fun(Res) -> ?match(Expected, Res) end,
+    lists:foreach(Check, Results),
+    ?verify_mnesia(Nodes, []).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Add and drop indecies
+
+
+add_table_index_ram(suite) -> [];
+add_table_index_ram(Config) when is_list(Config) ->
+    add_table_index(Config, ram_copies).
+
+add_table_index_disc(suite) -> [];
+add_table_index_disc(Config) when is_list(Config) ->
+    add_table_index(Config, disc_copies).
+
+add_table_index_disc_only(suite) -> [];
+add_table_index_disc_only(Config) when is_list(Config) ->
+    add_table_index(Config, disc_only_copies).
+
+%% Add table index
+
+add_table_index(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    Tab = add_table_index,
+    Schema = [{name, Tab}, {attributes, [k, v]}, {Storage, [Node1]}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ValPos = 3,
+    BadValPos = ValPos + 1,
+    ?match({aborted, Reason41 } when element(1, Reason41) == bad_type,
+           mnesia:add_table_index(Tab, BadValPos)),
+    ?match({aborted,Reason42 } when element(1, Reason42) == bad_type,
+           mnesia:add_table_index(Tab, 2)),
+    ?match({aborted, Reason43 } when element(1, Reason43) == bad_type,
+           mnesia:add_table_index(Tab, 1)),
+    ?match({aborted, Reason44 } when element(1, Reason44) == bad_type,
+           mnesia:add_table_index(Tab, 0)),
+    ?match({aborted, Reason45 } when element(1, Reason45) == bad_type, 
+           mnesia:add_table_index(Tab, -1)),
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),
+    ?match({aborted, Reason46 } when element(1, Reason46) == already_exists,
+           mnesia:add_table_index(Tab, ValPos)),
+
+    NestedFun = fun() ->
+                        ?match({aborted, nested_transaction},
+                               mnesia:add_table_index(Tab, ValPos)), 
+                        ok
+                end,
+    ?match({atomic, ok}, mnesia:transaction(NestedFun)), 
+    ?verify_mnesia(Nodes, []).
+
+create_live_table_index_ram(suite) -> [];
+create_live_table_index_ram(Config) when is_list(Config) ->
+    create_live_table_index(Config, ram_copies).
+
+create_live_table_index_disc(suite) -> [];
+create_live_table_index_disc(Config) when is_list(Config) ->
+    create_live_table_index(Config, disc_copies).
+
+create_live_table_index_disc_only(suite) -> [];
+create_live_table_index_disc_only(Config) when is_list(Config) ->
+    create_live_table_index(Config, disc_only_copies).
+
+create_live_table_index(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    Tab = create_live_table_index,
+    Schema = [{name, Tab}, {attributes, [k, v]}, {Storage, [Node1]}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ValPos = 3,
+    mnesia:dirty_write({Tab, 1, 2}),
+
+    Fun = fun() ->
+                  ?match(ok, mnesia:write({Tab, 2, 2})),        
+                  ok
+          end,
+    ?match({atomic, ok}, mnesia:transaction(Fun)),
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),
+    ?match({atomic, [{Tab, 1, 2},{Tab, 2, 2}]}, 
+	   mnesia:transaction(fun() -> lists:sort(mnesia:index_read(Tab, 2, ValPos)) 
+			      end)),
+    ?verify_mnesia(Nodes, []).
+
+%% Drop table index
+
+del_table_index_ram(suite) ->[];
+del_table_index_ram(Config) when is_list(Config) ->
+    del_table_index(Config, ram_copies).
+
+del_table_index_disc(suite) ->[];
+del_table_index_disc(Config) when is_list(Config) ->
+    del_table_index(Config, disc_copies).
+
+del_table_index_disc_only(suite) ->[];
+del_table_index_disc_only(Config) when is_list(Config) ->
+    del_table_index(Config, disc_only_copies).
+
+del_table_index(Config, Storage) ->
+    [Node1] = Nodes = ?acquire_nodes(1, Config),
+    Tab = del_table_index,
+    Schema = [{name, Tab}, {attributes, [k, v]}, {Storage, [Node1]}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+    ValPos = 3,
+    BadValPos = ValPos + 1,
+    ?match({atomic, ok}, mnesia:add_table_index(Tab, ValPos)),
+    ?match({aborted,Reason} when element(1, Reason) == no_exists,
+           mnesia:del_table_index(Tab, BadValPos)),
+    ?match({atomic, ok}, mnesia:del_table_index(Tab, ValPos)),
+
+    ?match({aborted,Reason1} when element(1, Reason1) == no_exists,
+           mnesia:del_table_index(Tab, ValPos)),
+    NestedFun =
+        fun() ->
+                ?match({aborted, nested_transaction},
+                       mnesia:del_table_index(Tab, ValPos)),
+                ok
+        end,
+    ?match({atomic, ok}, mnesia:transaction(NestedFun)),
+    ?verify_mnesia(Nodes, []).
+
+
+idx_schema_changes_ram(suite) -> [];
+idx_schema_changes_ram(Config) when is_list(Config) ->
+    idx_schema_changes(Config, ram_copies).
+idx_schema_changes_disc(suite) -> [];
+idx_schema_changes_disc(Config) when is_list(Config) ->
+    idx_schema_changes(Config, disc_copies).
+idx_schema_changes_disc_only(suite) -> [];
+idx_schema_changes_disc_only(Config) when is_list(Config) ->
+    idx_schema_changes(Config, disc_only_copies).
+
+idx_schema_changes(Config, Storage) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    Tab = index_schema_changes,
+    Idx = 3,
+    Schema = [{name, Tab}, {index, [Idx]}, {attributes, [k, v]}, {Storage, Nodes}],
+    ?match({atomic, ok}, mnesia:create_table(Schema)),
+
+    {Storage1, Storage2} =
+	case Storage of
+	    disc_only_copies ->
+		{ram_copies, disc_copies};
+	    disc_copies ->
+		{disc_only_copies, ram_copies};
+	    ram_copies ->
+		{disc_copies, disc_only_copies}
+	end,
+    
+    Write = fun(N) ->
+		    mnesia:write({Tab, N, N+50})
+	    end,   
+    
+    [mnesia:sync_transaction(Write, [N]) || N <- lists:seq(1, 10)],
+    ?match([{Tab, 1, 51}], rpc:call(N1, mnesia, dirty_index_read, [Tab, 51, Idx])),
+    ?match([{Tab, 1, 51}], rpc:call(N2, mnesia, dirty_index_read, [Tab, 51, Idx])),
+
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, N1, Storage1)),
+    
+    ?match({atomic, ok}, rpc:call(N1, mnesia, sync_transaction, [Write, [17]])),
+    ?match({atomic, ok}, rpc:call(N2, mnesia, sync_transaction, [Write, [18]])),
+    
+    ?match([{Tab, 17, 67}], rpc:call(N2, mnesia, dirty_index_read, [Tab, 67, Idx])),
+    ?match([{Tab, 18, 68}], rpc:call(N1, mnesia, dirty_index_read, [Tab, 68, Idx])),
+    
+    ?match({atomic, ok}, mnesia:del_table_copy(Tab, N1)),
+    ?match({atomic, ok}, rpc:call(N1, mnesia, sync_transaction, [Write, [11]])),
+    ?match({atomic, ok}, rpc:call(N2, mnesia, sync_transaction, [Write, [12]])),
+    
+    ?match([{Tab, 11, 61}], rpc:call(N2, mnesia, dirty_index_read, [Tab, 61, Idx])),
+    ?match([{Tab, 12, 62}], rpc:call(N1, mnesia, dirty_index_read, [Tab, 62, Idx])),
+
+    ?match({atomic, ok}, mnesia:move_table_copy(Tab, N2, N1)),
+    ?match({atomic, ok}, rpc:call(N1, mnesia, sync_transaction, [Write, [19]])),
+    ?match({atomic, ok}, rpc:call(N2, mnesia, sync_transaction, [Write, [20]])),
+    
+    ?match([{Tab, 19, 69}], rpc:call(N2, mnesia, dirty_index_read, [Tab, 69, Idx])),
+    ?match([{Tab, 20, 70}], rpc:call(N1, mnesia, dirty_index_read, [Tab, 70, Idx])),   
+    
+    ?match({atomic, ok}, mnesia:add_table_copy(Tab, N2, Storage)),
+    ?match({atomic, ok}, rpc:call(N1, mnesia, sync_transaction, [Write, [13]])),
+    ?match({atomic, ok}, rpc:call(N2, mnesia, sync_transaction, [Write, [14]])),
+    
+    ?match([{Tab, 13, 63}], rpc:call(N2, mnesia, dirty_index_read, [Tab, 63, Idx])),
+    ?match([{Tab, 14, 64}], rpc:call(N1, mnesia, dirty_index_read, [Tab, 64, Idx])),
+    
+    ?match({atomic, ok}, mnesia:change_table_copy_type(Tab, N2, Storage2)),
+    
+    ?match({atomic, ok}, rpc:call(N1, mnesia, sync_transaction, [Write, [15]])),
+    ?match({atomic, ok}, rpc:call(N2, mnesia, sync_transaction, [Write, [16]])),
+    
+    ?match([{Tab, 15, 65}], rpc:call(N2, mnesia, dirty_index_read, [Tab, 65, Idx])),
+    ?match([{Tab, 16, 66}], rpc:call(N1, mnesia, dirty_index_read, [Tab, 66, Idx])),
+
+    ?verify_mnesia(Nodes, []).
diff --git a/lib/mnesia/test/mt b/lib/mnesia/test/mt
new file mode 100755
index 0000000000..25243f1149
--- /dev/null
+++ b/lib/mnesia/test/mt
@@ -0,0 +1,60 @@
+#! /bin/sh -f
+# ``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 via the world wide web 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.
+# 
+# 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$
+#
+#
+# Author: Hakan Mattsson <[email protected]>
+# Purpose: Simplified execution of the test suite
+#    
+# Usage: mt <args to erlang startup script>
+
+#top=".."
+top="$ERL_TOP/lib/mnesia"
+h=`hostname`
+p="-pa $top/examples -pa $top/ebin -pa $top/test -mnesia_test_verbose true"
+log=test_log$$
+latest=test_log_latest
+args=${1+"$@"}
+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 &
+
+rm "$latest" 2>/dev/null
+ln -s "$log" "$latest"
+touch "$log"
+
+echo "$erlcmd1"
+echo ""
+echo "$erlcmd2"
+echo ""
+echo "$erlcmd"
+echo ""
+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
+tail -f "$log" | egrep 'Eval|<>ERROR|NYI'
+
diff --git a/lib/mnesia/test/mt.erl b/lib/mnesia/test/mt.erl
new file mode 100644
index 0000000000..f69c4a11fd
--- /dev/null
+++ b/lib/mnesia/test/mt.erl
@@ -0,0 +1,262 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
+%%
+
+%%
+%%% Author: Hakan Mattsson  [email protected]
+%%% Purpose: Nice shortcuts intended for testing of Mnesia
+%%%
+%%% See the mnesia_SUITE module about the structure of
+%%% the test suite.
+%%%
+%%% See the mnesia_test_lib module about the test case execution.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-module(mt).
+-author('[email protected]').
+-export([
+	 t/0, t/1, t/2, t/3,                % Run test cases
+	 loop/1, loop/2, loop/3,            % loop test cases
+	 doc/0, doc/1,                      % Generate test case doc
+	 struct/0, struct/1,                % View test suite struct
+	 shutdown/0, ping/0, start_nodes/0, % Node admin
+	 read_config/0, write_config/1      % Config admin
+	]).
+
+-include("mnesia_test_lib.hrl").
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Aliases for the (sub) test suites
+alias(all) -> mnesia_SUITE;
+alias(atomicity) -> mnesia_atomicity_test;
+alias(backup) -> mnesia_evil_backup;
+alias(config) -> mnesia_config_test;
+alias(consistency) -> mnesia_consistency_test;
+alias(dirty) -> mnesia_dirty_access_test;
+alias(durability) -> mnesia_durability_test;
+alias(evil) -> mnesia_evil_coverage_test;
+alias(qlc) -> mnesia_qlc_test;
+alias(examples) -> mnesia_examples_test;
+alias(frag) -> mnesia_frag_test;
+alias(heavy) -> {mnesia_SUITE, heavy};
+alias(install) -> mnesia_install_test;
+alias(isolation) -> mnesia_isolation_test;
+alias(light) -> {mnesia_SUITE, light};
+alias(measure) -> mnesia_measure_test;
+alias(medium) -> {mnesia_SUITE, medium};
+alias(nice) -> mnesia_nice_coverage_test;
+alias(recover) -> mnesia_recover_test;
+alias(recovery) -> mnesia_recovery_test;
+alias(registry) -> mnesia_registry_test;
+alias(suite) -> mnesia_SUITE;
+alias(trans) -> mnesia_trans_access_test;
+alias(Other) -> Other.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Resolves the name of test suites and test cases
+%% according to the alias definitions. Single atoms
+%% are assumed to be the name of a test suite. 
+resolve(Suite0) when is_atom(Suite0) ->
+    case alias(Suite0) of
+	Suite when is_atom(Suite) ->
+	    {Suite, all};
+	{Suite, Case} ->
+	    {Suite, Case}
+    end;
+resolve({Suite0, Case}) when is_atom(Suite0), is_atom(Case) ->
+    case alias(Suite0) of
+	Suite when is_atom(Suite) ->
+	    {Suite, Case};
+	{Suite, Case2} ->
+	    {Suite, Case2}
+    end;
+resolve(List) when is_list(List) ->
+    [resolve(Case) || Case <- List].
+    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Run one or more test cases
+
+%% Run the default test case with default config
+t() ->
+    t(read_test_case()).
+
+%% Resolve the test case name and run the test case
+%% The test case is noted as default test case
+%% and the outcome of the tests are written to
+%% to a file.
+t(silly) ->
+    mnesia_install_test:silly();
+t(diskless) ->
+    %% Run the default test case with default config,
+    %% but diskless
+    t(read_test_case(), diskless);
+t(Case) ->
+    %% Use the default config
+    t(Case, read_config()).
+
+t(Case, Config) when Config == diskless ->
+    %% Run the test case with default config, but diskless
+    Config2 = [{diskless, true} | read_config()],
+    t(Case, Config2);
+t(Mod, Fun) when is_atom(Mod), is_atom(Fun) ->
+    %% Run the test case with default config
+    t({Mod, Fun}, read_config());
+t(RawCase, Config) when is_list(Config) ->
+    %% Resolve the test case name and run the test case
+    Case = resolve(RawCase),
+    write_test_case(Case),
+    Res = mnesia_test_lib:test(Case, Config),
+    append_test_case_info(Case, Res).
+
+t(Mod, Fun, Config) when Config == diskless ->
+    t({Mod, Fun}, diskless).
+
+config_fname() ->
+    "mnesia_test_case_config".
+
+%% Read default config file
+read_config() ->
+    Fname = config_fname(),
+    mnesia_test_lib:log("Consulting file ~s...~n", [Fname]),
+    case file:consult(Fname) of
+        {ok, Config} ->
+	    mnesia_test_lib:log("Read config ~w~n", [Config]),
+            Config;
+        _Error ->
+	    Config = mnesia_test_lib:default_config(),
+            mnesia_test_lib:log("<>WARNING<> Using default config: ~w~n", [Config]),
+            Config
+    end.
+
+%% Write new default config file
+write_config(Config) when is_list(Config) ->
+    Fname = config_fname(),
+    {ok, Fd} = file:open(Fname, write),
+    write_list(Fd, Config),
+    file:close(Fd).
+	    
+write_list(Fd, [H | T]) ->
+    ok = io:format(Fd, "~p.~n",[H]),
+    write_list(Fd, T);
+write_list(_, []) ->
+    ok.
+
+test_case_fname() ->
+    "mnesia_test_case_info".
+
+%% Read name of test case
+read_test_case() ->
+    Fname = test_case_fname(),
+    case file:open(Fname, [read]) of
+	{ok, Fd} ->
+	    Res = io:read(Fd, []),
+	    file:close(Fd),
+	    case Res of
+		{ok, TestCase} ->
+		    mnesia_test_lib:log("Using test case ~w from file ~s~n",
+					[TestCase, Fname]),
+		    TestCase;
+		{error, _} ->
+		    default_test_case(Fname)
+	    end;
+	{error, _} ->
+	    default_test_case(Fname)
+    end.
+
+default_test_case(Fname) ->
+    TestCase = all, 
+    mnesia_test_lib:log("<>WARNING<> Cannot read file ~s, "
+			"using default test case: ~w~n",
+			[Fname, TestCase]),
+    TestCase.
+
+write_test_case(TestCase) ->
+    Fname = test_case_fname(),
+    {ok, Fd} = file:open(Fname, write),
+    ok = io:format(Fd, "~p.~n",[TestCase]),
+    file:close(Fd).
+	    
+append_test_case_info(TestCase, TestCaseInfo) ->
+    Fname = test_case_fname(),
+    {ok, Fd} = file:open(Fname, [read, write]),
+    ok = io:format(Fd, "~p.~n",[TestCase]),
+    ok = io:format(Fd, "~p.~n",[TestCaseInfo]),
+    file:close(Fd),
+    TestCaseInfo.
+	    
+%% Generate HTML pages from the test case structure
+doc() ->
+    doc(suite).
+
+doc(Case) ->
+    mnesia_test_lib:doc(resolve(Case)).
+
+%% Display out the test case structure
+struct() ->
+    struct(suite).
+
+struct(Case) ->
+    mnesia_test_lib:struct([resolve(Case)]).
+
+%% Shutdown all nodes with erlang:halt/0
+shutdown() ->
+    mnesia_test_lib:shutdown().
+
+%% Ping all nodes in config spec
+ping() ->
+    Config = read_config(),
+    Nodes = mnesia_test_lib:select_nodes(all, Config, ?FILE, ?LINE),
+    [{N, net_adm:ping(N)} || N <- Nodes].
+
+%% Slave start all nodes in config spec
+start_nodes() ->
+    Config = read_config(),
+    Nodes = mnesia_test_lib:select_nodes(all, Config, ?FILE, ?LINE),
+    mnesia_test_lib:init_nodes(Nodes, ?FILE, ?LINE),
+    ping().
+
+%% loop one testcase /suite until it fails
+
+loop(Case) ->
+    loop_1(Case,-1,read_config()).
+
+loop(M,F) when is_atom(F) ->
+    loop_1({M,F},-1,read_config());
+loop(Case,N) when is_integer(N) ->
+    loop_1(Case, N,read_config()).
+
+loop(M,F,N) when is_integer(N) ->
+    loop_1({M,F},N,read_config()).
+
+loop_1(Case,N,Config) when N /= 0 ->
+    io:format("Loop test ~p ~n", [abs(N)]),
+    case ok_result(Res = t(Case,Config)) of
+	true ->
+	    loop_1(Case,N-1,Config);
+	error ->
+	    Res
+    end;
+loop_1(_,_,_) ->
+    ok.
+	    
+ok_result([{_T,{ok,_,_}}|R]) -> 
+    ok_result(R);
+ok_result([{_T,{TC,List}}|R]) when is_tuple(TC), is_list(List) -> 
+    ok_result(List) andalso ok_result(R);
+ok_result([]) -> true;
+ok_result(_) -> error.
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 31cc8f8513..5b52bc6075 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1,16 +1 @@
-
-MNESIA_VSN = 4.4.13
-
-TICKETS = OTP-8402 OTP-8406
-#TICKETS_4.4.12 = OTP-8250
-#TICKETS_4.4.11 = OTP-8074
-#TICKETS_4.4.10 = OTP-7928 OTP-7968 OTP-8002
-#TICKETS_4.4.9 = OTP-7911
-#TICKETS_4.4.8 = OTP-7753 OTP-7835
-#TICKETS_4.4.7 = OTP-7524 OTP-7625
-#TICKETS_4.4.6 =  OTP-7585
-#TICKETS_4.4.5 = OTP-7466
-#TICKETS_4.4.4 = OTP-7419
-#TICKETS_4.4.3 = OTP-7340 OTP-7378 OTP-7383
-#TICKETS_4.4.2 = OTP-7205 OTP-7208
-#TICKETS_4.4.1 = OTP-7170
+MNESIA_VSN = 4.4.16
diff --git a/lib/observer/doc/src/crashdump.xml b/lib/observer/doc/src/crashdump.xml
index f8d7641524..b6056c2ed1 100644
--- a/lib/observer/doc/src/crashdump.xml
+++ b/lib/observer/doc/src/crashdump.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2003</year>
-      <year>2007</year>
+      <year>2011</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -38,6 +38,10 @@
   <description>
     <p>The Crashdump Viewer is an HTML based tool for browsing Erlang
       crashdumps. Crashdump Viewer runs under the WebTool application.</p>
+
+    <p>See the <seealso marker="crashdump_ug">user's guide</seealso>
+    for more information about how to get started with the Crashdump
+    Viewer.</p>
   </description>
   <funcs>
     <func>
diff --git a/lib/observer/doc/src/crashdump_help.html b/lib/observer/doc/src/crashdump_help.html
index 736a024288..268b9495d6 100644
--- a/lib/observer/doc/src/crashdump_help.html
+++ b/lib/observer/doc/src/crashdump_help.html
@@ -131,7 +131,7 @@ SRC="min_head.gif"></a>
 
     
 
-    <a NAME="ets_tables">
+    <a NAME="ets_tables"><a NAME="internal_ets_tables">
     <h3>ETS tables</h3>
 
       <p>The ETS table information page shows all ETS table
@@ -304,4 +304,4 @@ Copyright &copy; 1991-2003
 </font>
 </center>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/observer/doc/src/crashdump_ug.xml b/lib/observer/doc/src/crashdump_ug.xml
index 9913b30e38..dc65fe5b39 100644
--- a/lib/observer/doc/src/crashdump_ug.xml
+++ b/lib/observer/doc/src/crashdump_ug.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -38,12 +38,31 @@
 
   <section>
     <title>Getting Started</title>
-    <p>From an erlang node, start Crashdump Viewer by calling
-      <c>crashdump_viewer:start()</c>. This will automatically start
-      WebTool and display the web address where WebTool can be
-      found. See the documentation for the WebTool application for
-      further information about how to use WebTool.
-      </p>
+
+    <p>The easiest way to start Crashdump Viewer is to use the
+    provided shell script named <c>cdv</c> with the full path to the
+    erlang crashdump as an argument. The script can be found in the
+    priv directory of the <c>observer</c> application. This starts
+    WebTool, Crashdump Viewer and a web browser, and loads the given
+    file. The browser should then display a page named General
+    Information which shows a short summary of the information in
+    the crashdump.</p>
+
+    <p>The default browser is Internet Explorer on Windows or else
+    Firefox. To use another browser, give the browser's start command
+    as the second argument to <c>cdv</c>. If the given browser name is
+    not known to Crashdump Viewer, the browser argument is executed as
+    a command with the start URL as the only argument.</p>
+
+    <p>Under Windows the batch file <c>cdv.bat</c> can be used.</p>
+
+    <p>It is also possible to start the Crashdump Viewer from within
+    an erlang node by calling <seealso
+    marker="crashdump_viewer#start/0">crashdump_viewer:start/0</seealso>. This
+    will automatically start WebTool and display the web address where
+    WebTool can be found. See the documentation for the WebTool
+    application for further information about how to use WebTool.</p>
+
     <p>Point your web browser to the address displayed, and you should
       now see the start page of WebTool. At the top of the page, you
       will see a link to "CrashDumpViewer". Click this link to get to
@@ -52,15 +71,12 @@
       connection to the internet, or you must set no proxy for
       localhost.)
       </p>
-    <p>You can also start WebTool, Crashdump Viewer and a browser in
-      one go by running the <c>start_webtool</c> script found in the
-      <c>priv</c> directory of the WebTool application, e.g.
-            <br></br>
-<c>>start_webtool crashdump_viewer</c></p>
     <p>From the start page of Crashdump Viewer, push the "Load
       Crashdump" button to load a crashdump into the tool. Then enter
-      the filename of the crashdump in the entry field and push the "Ok"
-      button.
+      the filename of the crashdump in the entry field and push the
+      "Ok" button. This will bring you to the General Information
+      page, i.e. the same page as the <c>cdv</c> script will open in
+      the browser.
       </p>
     <p>Crashdumps generated by OTP R9C and later are loaded directly
       into the Crashdump Viewer, while dumps from earlier releases first
diff --git a/lib/observer/doc/src/etop.xml b/lib/observer/doc/src/etop.xml
index 1ea67e6864..78047caab3 100644
--- a/lib/observer/doc/src/etop.xml
+++ b/lib/observer/doc/src/etop.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2002</year>
-      <year>2007</year>
+      <year>2011</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -26,27 +26,33 @@
     <title>etop</title>
     <prepared>Siri hansen</prepared>
     <responsible></responsible>
-    <docno>1</docno>
+    <docno></docno>
     <approved></approved>
     <checked></checked>
-    <date>2002-03-27</date>
-    <rev>PA1</rev>
-    <file>etop.sgml</file>
+    <date></date>
+    <rev></rev>
+    <file></file>
   </header>
   <module>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>
+
     <p><c>etop</c> should be started with the provided scripts
       <c>etop</c> and <c>getop</c> for text based and graphical
-      presentation respectively. Under Windows the batch files
-      <c>etop.bat</c> and <c>getop.bat</c> can be used.
-      </p>
-    <p>All interaction with <c>etop</c> when running the graphical
-      presentation should happen via the menus. For the text based
-      presentation the functions described below can be used.
-      </p>
-    <p>The following configuration parameters exist for <c>etop</c>.
-      </p>
+      presentation respectively. This will start a hidden erlang node
+      which connects to the node to be measured. The measured node is
+      given with the <c>-node</c> option. If the measured node has a
+      different cookie than the default cookie for the user who
+      invokes the script, the cookie must be explicitly given witht
+      the <c>-setcookie</c> option.</p>
+
+    <p>Under Windows the batch files <c>etop.bat</c> and
+      <c>getop.bat</c> can be used.</p>
+
+    <p>The following configuration parameters exist for the
+    <c>etop</c> tool. When executing the <c>etop</c> or <c>getop</c>
+    scripts, these parameters can be given as command line options,
+    e.g. <c>getop -node testnode@myhost -setcookie MyCookie</c>.</p>
     <taglist>
       <tag>node</tag>
       <item>The measured node.
@@ -96,6 +102,15 @@ Default: <c>runtime</c> (<c>reductions</c> if
 Value: <c>on | off</c>      <br></br>
 Default: <c>on</c></item>
     </taglist>
+
+    <p>All interaction with <c>etop</c> when running the graphical
+      presentation should happen via the menus. For the text based
+      presentation the functions described below can be used.
+      </p>
+
+    <p>See the <seealso marker="etop_ug">user's guide</seealso> for
+    more information about the <c>etop</c> tool.</p>
+
   </description>
   <funcs>
     <func>
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 48c7c21363..76c13fb3ff 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -31,6 +31,38 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 0.9.8.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The multitrace.erl installation example file is now
+	    installed in the examples directory. (Thanks to Peter
+	    Lemenkov.)</p>
+          <p>
+	    Own Id: OTP-8857</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Observer 0.9.8.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The test suite has been updated for R14A.</p>
+          <p>
+	    Own Id: OTP-8708</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 0.9.8.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/observer/priv/bin/cdv b/lib/observer/priv/bin/cdv
new file mode 100755
index 0000000000..1c44785ac2
--- /dev/null
+++ b/lib/observer/priv/bin/cdv
@@ -0,0 +1,4 @@
+#!/bin/sh 
+
+erl -sname cdv -noinput -s crashdump_viewer script_start $@
+
diff --git a/lib/observer/priv/bin/cdv.bat b/lib/observer/priv/bin/cdv.bat
new file mode 100644
index 0000000000..efa8bf8687
--- /dev/null
+++ b/lib/observer/priv/bin/cdv.bat
@@ -0,0 +1,2 @@
+@ECHO OFF
+CALL werl -sname cdv -s crashdump_viewer script_start %*
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index dde1ea17be..2d06cb6bc4 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2009. All Rights Reserved.
+# Copyright Ericsson AB 2002-2011. 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
@@ -59,8 +59,10 @@ BINDIR= $(PRIVDIR)/bin
 EXECUTABLES= \
 	$(BINDIR)/etop \
 	$(BINDIR)/getop \
+	$(BINDIR)/cdv \
 	$(BINDIR)/etop.bat \
-	$(BINDIR)/getop.bat
+	$(BINDIR)/getop.bat \
+	$(BINDIR)/cdv.bat
 CDVDIR= $(PRIVDIR)/crashdump_viewer
 GIF_FILES= \
 	$(CDVDIR)/collapsd.gif \
@@ -111,7 +113,8 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
 	$(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/src
+	$(INSTALL_DIR) $(RELSYSDIR)/examples
+	$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
 	$(INSTALL_DIR) $(RELSYSDIR)/include
 	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl
index 978541e470..3b8d17c7d9 100644
--- a/lib/observer/src/crashdump_viewer.erl
+++ b/lib/observer/src/crashdump_viewer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -23,7 +23,7 @@
 %% the server started by webtool and the API for the crashdump viewer tool.
 %% 
 %% All functions in the API except configData/0 and start_link/0 are 
-%% called from HTML pages via erl_scheme.
+%% called from HTML pages via erl_scheme (mod_esi).
 %% 
 %% Tables
 %% ------
@@ -34,18 +34,21 @@
 %% 
 %% cdv_dump_index_table: This table holds all tags read from the crashdump.
 %% Each tag indicates where the information about a specific item starts.
-%% The table entry for a tag includes the start and end positions for
-%% this item-information. All tags start with a "=" at the beginning of
+%% The table entry for a tag includes the start position for this
+%% item-information. All tags start with a "=" at the beginning of
 %% a line.
 %%
 %% Process state
 %% -------------
 %% file: The name of the crashdump currently viewed.
 %% procs_summary: Process summary represented by a list of 
-%% #proc records. This is used for efficiency reasons when sorting
-%% the process summary table instead of reading all processes from
-%% the dump again.
-%% sorted: atom(), indicated what item was last sorted in process summary.
+%% #proc records. This is used for efficiency reasons when sorting the
+%% process summary table instead of reading all processes from the
+%% dump again. Note that if the dump contains more than
+%% ?max_sort_process_num processes, the sort functionality is not
+%% available, and the procs_summary field in the state will have the
+%% value 'too_many'.
+%% sorted: string(), indicated what item was last sorted in process summary.
 %% This is needed so reverse sorting can be done.
 %% shared_heap: 'true' if crashdump comes from a system running shared heap,
 %% else 'false'.
@@ -54,7 +57,7 @@
 %%
 
 %% User API
--export([start/0,stop/0]).
+-export([start/0,stop/0,script_start/0,script_start/1]).
 
 %% Webtool API
 -export([configData/0,
@@ -68,26 +71,27 @@
 	 initial_info_frame/2,
 	 toggle/2,
 	 general_info/2,
-	 processes/2,
+	 processes/3,
 	 proc_details/2,
-	 ports/2,
-	 ets_tables/2,
-	 timers/2,
-	 fun_table/2,
-	 atoms/2,
+	 port/2,
+	 ports/3,
+	 ets_tables/3,
+	 internal_ets_tables/2,
+	 timers/3,
+	 fun_table/3,
+	 atoms/3,
 	 dist_info/2,
-	 loaded_modules/2,
+	 loaded_modules/3,
 	 loaded_mod_details/2,
 	 memory/2,
 	 allocated_areas/2,
 	 allocator_info/2,
 	 hash_tables/2,
 	 index_tables/2,
-	 sort_procs/2,
+	 sort_procs/3,
 	 expand/2,
 	 expand_binary/2,
-	 expand_memory/2,
-	 next/2]).
+	 expand_memory/2]).
 
 
 %% gen_server callbacks
@@ -113,24 +117,49 @@
 				% this, it must be explicitly expanded.
 -define(max_display_binary_size,50). % max size of a binary that will be
 				      % directly displayed.
+-define(max_sort_process_num,10000). % Max number of processes that allows
+				    % sorting. If more than this number of 
+				    % processes exist, they will be displayed
+				    % in the order they are found in the log.
+-define(items_chunk_size,?max_sort_process_num). % Number of items per chunk 
+						 % when page of many items
+						 % is displayed, e.g. processes,
+						 % timers, funs...
+						 % Must be equal to 
+						 % ?max_sort_process_num!
+
+%% All possible tags - use macros in order to avoid misspelling in the code
+-define(allocated_areas,allocated_areas).
+-define(allocator,allocator).
+-define(atoms,atoms).
+-define(binary,binary).
+-define(debug_proc_dictionary,debug_proc_dictionary).
+-define(ende,ende).
+-define(erl_crash_dump,erl_crash_dump).
+-define(ets,ets).
+-define(fu,fu).
+-define(hash_table,hash_table).
+-define(hidden_node,hidden_node).
+-define(index_table,index_table).
+-define(instr_data,instr_data).
+-define(internal_ets,internal_ets).
+-define(loaded_modules,loaded_modules).
+-define(memory,memory).
+-define(mod,mod).
+-define(no_distribution,no_distribution).
+-define(node,node).
+-define(not_connected,not_connected).
+-define(num_atoms,num_atoms).
+-define(old_instr_data,old_instr_data).
+-define(port,port).
+-define(proc,proc).
+-define(proc_dictionary,proc_dictionary).
+-define(proc_heap,proc_heap).
+-define(proc_messages,proc_messages).
+-define(proc_stack,proc_stack).
+-define(timer,timer).
+-define(visible_node,visible_node).
 
--define(initial_proc_record(Pid),
-	#proc{pid=Pid,
-	      %% msg_q_len, reds and stack_heap are integers because it must 
-	      %% be possible to sort on them. All other fields are strings
-	      msg_q_len=0,reds=0,stack_heap=0,
-	      %% for old dumps start_time, parent and number of heap frament
-	      %% does not exist
-	      start_time="unknown",
-	      parent="unknown",
-	      num_heap_frag="unknown", 
-	      %% current_func can be both "current function" and
-	      %% "last scheduled in for"
-	      current_func={"Current Function",?space},
-	      %% stack_dump, message queue and dictionaries should only be 
-	      %% displayed as a link to "Expand" (if dump is from OTP R9B 
-	      %% or newer)
-	      _=?space}).
 
 -record(state,{file,procs_summary,sorted,shared_heap=false,
 	       wordsize=4,num_atoms="unknown",binaries,bg_status}).
@@ -177,6 +206,85 @@ stop() ->
     webtool:stop().
 
 %%%-----------------------------------------------------------------
+%%% Start crashdump_viewer via the cdv script located in
+%%% $OBSERVER_PRIV_DIR/bin
+script_start() ->
+    usage().
+script_start([File]) ->
+    DefaultBrowser =
+	case os:type() of
+	    {win32,_} -> iexplore;
+	    _ -> firefox
+	end,
+    script_start([File,DefaultBrowser]);
+script_start([FileAtom,Browser]) ->
+    File = atom_to_list(FileAtom),
+    case filelib:is_regular(File) of
+	true ->
+	    io:format("Starting crashdump_viewer...\n"),
+	    start(),
+	    io:format("Reading crashdump..."),
+	    read_file(File),
+	    redirect([],[]),
+	    io:format("done\n"),
+	    start_browser(Browser);
+	false ->
+	    io:format("cdv error: the given file does not exist\n"),
+	    usage()
+    end.
+
+start_browser(Browser) ->
+    PortStr = integer_to_list(gen_server:call(web_tool,get_port)),
+    Url = "http://localhost:" ++ PortStr ++ ?START_PAGE,
+    {OSType,_} = os:type(),
+    case Browser of
+	none ->
+	    ok;
+	iexplore when OSType == win32->
+	    io:format("Starting internet explorer...\n"),
+	    {ok,R} = win32reg:open(""),
+	    Key="\\local_machine\\SOFTWARE\\Microsoft\\IE Setup\\Setup",
+	    win32reg:change_key(R,Key),
+	    {ok,Val} = win32reg:value(R,"Path"),
+	    IExplore=filename:join(win32reg:expand(Val),"iexplore.exe"),
+	    os:cmd("\"" ++ IExplore ++ "\" " ++ Url);
+	_ when OSType == win32 ->
+	    io:format("Starting ~w...\n",[Browser]),
+	    os:cmd("\"" ++ atom_to_list(Browser) ++ "\" " ++ Url);
+	B when B==firefox; B==mozilla ->
+	    io:format("Sending URL to ~w...",[Browser]),
+	    BStr = atom_to_list(Browser),
+	    SendCmd = BStr ++ " -raise -remote \'openUrl(" ++ Url ++ ")\'",
+	    Port = open_port({spawn,SendCmd},[exit_status]),
+	    receive
+		{Port,{exit_status,0}} ->
+		    io:format("done\n");
+		{Port,{exit_status,_Error}} ->
+		    io:format(" not running, starting ~w...\n",[Browser]),
+		    os:cmd(BStr ++ " " ++ Url)
+	    after 5000 ->
+		    io:format(" failed, starting ~w...\n",[Browser]),
+		    erlang:port_close(Port),
+		    os:cmd(BStr ++ " " ++ Url)
+	    end;
+	_ ->
+	    io:format("Starting ~w...\n",[Browser]),
+	    os:cmd(atom_to_list(Browser) ++ " " ++ Url)
+    end,
+    ok.
+
+usage() ->
+    io:format(
+      "\nusage: cdv file [ browser ]\n"
+      "\tThe \'file\' must be an existing erlang crash dump.\n"
+      "\tDefault browser is \'iexplore\' (Internet Explorer) on Windows\n"
+      "\tor else \'firefox\'.\n",
+      []).
+
+
+
+
+%%%-----------------------------------------------------------------
 %%% Return config data used by webtool
 configData() ->
     Dir = filename:join(code:priv_dir(observer),"crashdump_viewer"),
@@ -266,22 +374,24 @@ toggle(_Env,Input) ->
 %%% The following functions are called when menu items are clicked.
 general_info(_Env,_Input) ->
     call(general_info).
-processes(_Env,_Input) ->
-    call(procs_summary).
-ports(_Env,Input) -> % this is also called when a link to a port is clicked
-    call({ports,Input}).
-ets_tables(_Env,Input) ->
-    call({ets_tables,Input}).
-timers(_Env,Input) ->
-    call({timers,Input}).
-fun_table(_Env,_Input) ->
-    call(funs).
-atoms(_Env,_Input) ->
-    call(atoms).
+processes(SessionId,_Env,_Input) ->
+    call({procs_summary,SessionId}).
+ports(SessionId,_Env,_Input) ->
+    call({ports,SessionId}).
+ets_tables(SessionId,_Env,Input) ->
+    call({ets_tables,SessionId,Input}).
+internal_ets_tables(_Env,_Input) ->
+    call(internal_ets_tables).
+timers(SessionId,_Env,Input) ->
+    call({timers,SessionId,Input}).
+fun_table(SessionId,_Env,_Input) ->
+    call({funs,SessionId}).
+atoms(SessionId,_Env,_Input) ->
+    call({atoms,SessionId}).
 dist_info(_Env,_Input) ->
     call(dist_info).
-loaded_modules(_Env,_Input) ->
-    call(loaded_mods).
+loaded_modules(SessionId,_Env,_Input) ->
+    call({loaded_mods,SessionId}).
 loaded_mod_details(_Env,Input) ->
     call({loaded_mod_details,Input}).
 memory(_Env,_Input) ->
@@ -303,8 +413,13 @@ proc_details(_Env,Input) ->
 %%%-----------------------------------------------------------------
 %%% Called when one of the headings in the process summary table are
 %%% clicked. It sorts the processes by the clicked heading.
-sort_procs(_Env,Input) ->
-    call({sort_procs,Input}).
+sort_procs(SessionId,_Env,Input) ->
+    call({sort_procs,SessionId,Input}).
+
+%%%-----------------------------------------------------------------
+%%% Called when a link to a port is clicked.
+port(_Env,Input) ->
+    call({port,Input}).
 
 %%%-----------------------------------------------------------------
 %%% Called when the "Expand" link in a call stack (Last Calls) is
@@ -325,11 +440,6 @@ expand_binary(_Env,Input) ->
     call({expand_binary,Input}).
 
 %%%-----------------------------------------------------------------
-%%% Called when the "Next" link under atoms is clicked.
-next(_Env,Input) ->
-    call({next,Input}).
-
-%%%-----------------------------------------------------------------
 %%% Called on regular intervals while waiting for a dump to be read
 redirect(_Env,_Input) ->
     call(redirect).
@@ -348,7 +458,7 @@ redirect(_Env,_Input) ->
 %%--------------------------------------------------------------------
 init([]) ->
     ets:new(cdv_menu_table,[set,named_table,{keypos,#menu_item.index},public]),
-    ets:new(cdv_dump_index_table,[bag,named_table,public]),
+    ets:new(cdv_dump_index_table,[ordered_set,named_table,public]),
     {ok, #state{}}.
 
 %%--------------------------------------------------------------------
@@ -373,16 +483,7 @@ handle_call(start_page, _From, State) ->
     Reply = crashdump_viewer_html:start_page(),
     {reply,Reply,State};
 handle_call({read_file,Input}, _From, _State) ->
-    {ok,File0} = get_value("path",httpd:parse_query(Input)),
-    File = 
-	case File0 of
-	    [$"|FileAndSome] ->
-		%% Opera adds \"\" around the filename!
-		[$"|Elif] = lists:reverse(FileAndSome),
-		lists:reverse(Elif);
-	    _ ->
-		File0
-	end,
+    {ok,File} = get_value("path",httpd:parse_query(Input)),
     spawn_link(fun() -> read_file(File) end),
     Status = background_status(reading,File),
     Reply = crashdump_viewer_html:redirect(Status),
@@ -399,8 +500,17 @@ handle_call(initial_info_frame,_From,State=#state{file=File}) ->
     GenInfo = general_info(File),
     NumAtoms = GenInfo#general_info.num_atoms,
     {WS,SH} = parse_vsn_str(GenInfo#general_info.system_vsn,4,false),
+    NumProcs = list_to_integer(GenInfo#general_info.num_procs),
+    ProcsSummary = 
+	if NumProcs > ?max_sort_process_num -> too_many;
+	   true -> State#state.procs_summary
+	end,
+    NewState = State#state{shared_heap=SH,
+			   wordsize=WS,
+			   num_atoms=NumAtoms,
+			   procs_summary=ProcsSummary},
     Reply = crashdump_viewer_html:general_info(GenInfo),
-    {reply,Reply,State#state{shared_heap=SH,wordsize=WS,num_atoms=NumAtoms}};
+    {reply,Reply,NewState};
 handle_call({toggle,Input},_From,State) ->
     {ok,Index} = get_value("index",httpd:parse_query(Input)),
     do_toggle(list_to_integer(Index)),
@@ -429,7 +539,7 @@ handle_call({expand,Input},_From,State=#state{file=File}) ->
 handle_call({expand_memory,Input},_From,State=#state{file=File,binaries=B}) ->
     [{"pid",Pid},{"what",What}] = httpd:parse_query(Input),
     Reply = 
-	case truncated_warning([{"=proc",Pid}]) of
+	case truncated_warning([{?proc,Pid}]) of
 	    [] ->
 		Expanded = expand_memory(File,What,Pid,B),
 		crashdump_viewer_html:expanded_memory(What,Expanded);
@@ -450,149 +560,129 @@ handle_call({expand_binary,Input},_From,State=#state{file=File}) ->
     close(Fd),
     Reply=crashdump_viewer_html:expanded_binary(io_lib:format("~p",[Bin])),
     {reply,Reply,State};
-handle_call({next,Input},_From,State=#state{file=File}) ->
-    [{"pos",Pos},{"num",N},{"start",Start},{"what",What}] =
-	httpd:parse_query(Input),
-    Tags = related_tags(What),
-    TW = truncated_warning(Tags),
-    Next = get_next(File,list_to_integer(Pos),list_to_integer(N),
-		    list_to_integer(Start),What),
-    Reply = crashdump_viewer_html:next(Next,TW),
-    {reply,Reply,State};
 handle_call(general_info,_From,State=#state{file=File}) ->
     GenInfo=general_info(File),
     Reply = crashdump_viewer_html:general_info(GenInfo),
     {reply,Reply,State};
-handle_call(procs_summary,_From,State=#state{file=File,shared_heap=SH}) ->
-    ProcsSummary =
-	case State#state.procs_summary of
-	    undefined -> procs_summary(File);
-	    PS -> PS
-	end,
-    TW = truncated_warning(["=proc"]),
-    Reply = crashdump_viewer_html:procs_summary("pid",ProcsSummary,TW,SH),
-    {reply,Reply,State#state{procs_summary=ProcsSummary,sorted="pid"}};
-handle_call({sort_procs,Input}, _From, State=#state{shared_heap=SH}) ->
+handle_call({procs_summary,SessionId},_From,State) ->
+    TW = truncated_warning([?proc]),
+    NewState = procs_summary(SessionId,TW,"pid",State#state{sorted=undefined}),
+    {reply,ok,NewState};
+handle_call({sort_procs,SessionId,Input}, _From, State) ->
     {ok,Sort} = get_value("sort",httpd:parse_query(Input)),
-    {ProcsSummary,Sorted} = do_sort_procs(Sort,
-					  State#state.procs_summary,
-					  State#state.sorted),
-    TW = truncated_warning(["=proc"]),
-    Reply = crashdump_viewer_html:procs_summary(Sort,ProcsSummary,TW,SH),
-    {reply,Reply,State#state{sorted=Sorted}};
+    TW = truncated_warning([?proc]),
+    NewState = procs_summary(SessionId,TW,Sort,State),
+    {reply,ok,NewState};
 handle_call({proc_details,Input},_From,State=#state{file=File,shared_heap=SH}) ->
     {ok,Pid} = get_value("pid",httpd:parse_query(Input)),
     Reply = 
 	case get_proc_details(File,Pid) of
 	    {ok,Proc} -> 
-		TW = truncated_warning([{"=proc",Pid}]),
+		TW = truncated_warning([{?proc,Pid}]),
 		crashdump_viewer_html:proc_details(Pid,Proc,TW,SH);
 	    {other_node,Node} -> 
-		TW = truncated_warning(["=visible_node",
-					"=hidden_node",
-					"=not_connected"]),
+		TW = truncated_warning([?visible_node,
+					?hidden_node,
+					?not_connected]),
 		crashdump_viewer_html:nods(Node,TW);
 	    not_found -> 
 		crashdump_viewer_html:info_page(["Could not find process: ",
 						 Pid],?space)
 	end,
     {reply, Reply, State};
-handle_call({ports,Input},_From,State=#state{file=File}) ->
+handle_call({port,Input},_From,State=#state{file=File}) ->
+    {ok,P} = get_value("port",httpd:parse_query(Input)),
+    Id = [$#|P],
     Reply = 
-	case get_value("port",httpd:parse_query(Input)) of
-	    {ok,P} -> 
-		Id = [$#|P],
-		case get_port(File,Id) of
-		    {ok,PortInfo} ->
-			TW = truncated_warning([{"=port",Id}]),
-			crashdump_viewer_html:ports(Id,[PortInfo],TW);
-		    {other_node,Node} ->
-			TW = truncated_warning(["=visible_node",
-						"=hidden_node",
-						"=not_connected"]),
-			crashdump_viewer_html:nods(Node,TW);
-		    not_found -> 
-			crashdump_viewer_html:info_page(
-			  ["Could not find port: ",Id],?space)
-		end;
-	    error -> % no port identity in Input - get all ports
-		Ports=get_ports(File),
-		TW = truncated_warning(["=port"]),
-		crashdump_viewer_html:ports("Port Information",Ports,TW)
+	case get_port(File,Id) of
+	    {ok,PortInfo} ->
+		TW = truncated_warning([{?port,Id}]),
+		crashdump_viewer_html:port(Id,PortInfo,TW);
+	    {other_node,Node} ->
+		TW = truncated_warning([?visible_node,
+					?hidden_node,
+					?not_connected]),
+		crashdump_viewer_html:nods(Node,TW);
+	    not_found -> 
+		crashdump_viewer_html:info_page(
+		  ["Could not find port: ",Id],?space)
 	end,
     {reply,Reply,State};
-handle_call({ets_tables,Input},_From,State=#state{file=File,wordsize=WS}) ->
-    {Pid,Heading,InternalEts} = 
+handle_call({ports,SessionId},_From,State=#state{file=File}) ->
+    TW = truncated_warning([?port]),
+    get_ports(SessionId,File,TW),
+    {reply,ok,State};
+handle_call({ets_tables,SessionId,Input},_From,State=#state{file=File,wordsize=WS}) ->
+    {Pid,Heading} = 
 	case get_value("pid",httpd:parse_query(Input)) of
 	    {ok,P} -> 
-		{P,["ETS Tables for Process ",P],[]};
+		{P,["ETS Tables for Process ",P]};
 	    error -> 
-		I = get_internal_ets_tables(File,WS),
-		{'_',"ETS Table Information",I}
+		{'$2',"ETS Table Information"}
 	end,
-    EtsTables = get_ets_tables(File,Pid,WS),
-    TW = truncated_warning(["=ets"]),
-    Reply = crashdump_viewer_html:ets_tables(Heading,EtsTables,InternalEts,TW),
+    TW = truncated_warning([?ets]),
+    get_ets_tables(SessionId,File,Heading,TW,Pid,WS),
+    {reply,ok,State};
+handle_call(internal_ets_tables,_From,State=#state{file=File,wordsize=WS}) ->
+    InternalEts = get_internal_ets_tables(File,WS),
+    TW = truncated_warning([?internal_ets]),
+    Reply = crashdump_viewer_html:internal_ets_tables(InternalEts,TW),
     {reply,Reply,State};
-handle_call({timers,Input},_From,State=#state{file=File}) ->
+handle_call({timers,SessionId,Input},_From,State=#state{file=File}) ->
     {Pid,Heading} = 
 	case get_value("pid",httpd:parse_query(Input)) of
 	    {ok,P} -> {P,["Timers for Process ",P]};
-	    error -> {'_',"Timer Information"}
+	    error -> {'$2',"Timer Information"}
 	end,
-    Timers=get_timers(File,Pid),
-    TW = truncated_warning(["=timer"]),
-    Reply = crashdump_viewer_html:timers(Heading,Timers,TW),
-    {reply,Reply,State};
+    TW = truncated_warning([?timer]),
+    get_timers(SessionId,File,Heading,TW,Pid),
+    {reply,ok,State};
 handle_call(dist_info,_From,State=#state{file=File}) ->
     Nods=nods(File),
-    TW = truncated_warning(["=visible_node","=hidden_node","=not_connected"]),
+    TW = truncated_warning([?visible_node,?hidden_node,?not_connected]),
     Reply = crashdump_viewer_html:nods(Nods,TW),
     {reply,Reply,State};
-handle_call(loaded_mods,_From,State=#state{file=File}) ->
-    LoadedMods=loaded_mods(File),
-    TW = truncated_warning(["=mod"]),
-    Reply = crashdump_viewer_html:loaded_mods(LoadedMods,TW),
-    {reply,Reply,State};
+handle_call({loaded_mods,SessionId},_From,State=#state{file=File}) ->
+    TW = truncated_warning([?mod]),
+    loaded_mods(SessionId,File,TW),
+    {reply,ok,State};
 handle_call({loaded_mod_details,Input},_From,State=#state{file=File}) ->
     {ok,Mod} = get_value("mod",httpd:parse_query(Input)),
     ModInfo = get_loaded_mod_details(File,Mod),
-    TW = truncated_warning([{"=mod",Mod}]),
+    TW = truncated_warning([{?mod,Mod}]),
     Reply = crashdump_viewer_html:loaded_mod_details(ModInfo,TW),
     {reply,Reply,State};
-handle_call(funs,_From,State=#state{file=File}) ->
-    Funs=funs(File),
-    TW = truncated_warning(["=fun"]),
-    Reply = crashdump_viewer_html:funs(Funs,TW),
-    {reply,Reply,State};
-handle_call(atoms,_From,State=#state{file=File,num_atoms=Num}) ->
-    Atoms=atoms(File),
-    TW = truncated_warning(["=atoms","=num_atoms"]),
-    Reply = crashdump_viewer_html:atoms(Atoms,Num,TW),
-    {reply,Reply,State};
+handle_call({funs,SessionId},_From,State=#state{file=File}) ->
+    TW = truncated_warning([?fu]),
+    funs(SessionId,File,TW),
+    {reply,ok,State};
+handle_call({atoms,SessionId},_From,State=#state{file=File,num_atoms=Num}) ->
+    TW = truncated_warning([?atoms,?num_atoms]),
+    atoms(SessionId,File,TW,Num),
+    {reply,ok,State};
 handle_call(memory,_From,State=#state{file=File}) ->
     Memory=memory(File),
-    TW = truncated_warning(["=memory"]),
+    TW = truncated_warning([?memory]),
     Reply = crashdump_viewer_html:memory(Memory,TW),
     {reply,Reply,State};
 handle_call(allocated_areas,_From,State=#state{file=File}) ->
     AllocatedAreas=allocated_areas(File),
-    TW = truncated_warning(["=allocated_areas"]),
+    TW = truncated_warning([?allocated_areas]),
     Reply = crashdump_viewer_html:allocated_areas(AllocatedAreas,TW),
     {reply,Reply,State};
 handle_call(allocator_info,_From,State=#state{file=File}) ->
     SlAlloc=allocator_info(File),
-    TW = truncated_warning(["=allocator"]),
+    TW = truncated_warning([?allocator]),
     Reply = crashdump_viewer_html:allocator_info(SlAlloc,TW),
     {reply,Reply,State};
 handle_call(hash_tables,_From,State=#state{file=File}) ->
     HashTables=hash_tables(File),
-    TW = truncated_warning(["=hash_table","=index_table"]),
+    TW = truncated_warning([?hash_table,?index_table]),
     Reply = crashdump_viewer_html:hash_tables(HashTables,TW),
     {reply,Reply,State};
 handle_call(index_tables,_From,State=#state{file=File}) ->
     IndexTables=index_tables(File),
-    TW = truncated_warning(["=hash_table","=index_table"]),
+    TW = truncated_warning([?hash_table,?index_table]),
     Reply = crashdump_viewer_html:index_tables(IndexTables,TW),
     {reply,Reply,State}.
 
@@ -682,9 +772,9 @@ truncated_here(Tag) ->
 		    
 
 %% Check if the dump was truncated with the same tag, but earlier id.
-%% Eg if this is {"=proc","<0.30.0>"}, we should warn if the dump was
-%% truncated in {"=proc","<0.29.0>"} or earlier
-truncated_earlier({"=proc",Pid}) ->
+%% Eg if this is {?proc,"<0.30.0>"}, we should warn if the dump was
+%% truncated in {?proc,"<0.29.0>"} or earlier
+truncated_earlier({?proc,Pid}) ->
     compare_pid(Pid,get(truncated_proc));
 truncated_earlier(_Tag) ->
     false.
@@ -718,9 +808,37 @@ open(File) ->
 close(Fd) ->
     erase(chunk),
     file:close(Fd).
+
+%% Set position relative to beginning of file
+%% If position is within the already read Chunk, then adjust 'chunk'
+%% and 'pos' in process dictionary. Else set position in file.
 pos_bof(Fd,Pos) ->
+    case get(pos) of
+	undefined ->
+	    hard_pos_bof(Fd,Pos);
+	OldPos when Pos>=OldPos ->
+	    case get(chunk) of
+		undefined ->
+		    hard_pos_bof(Fd,Pos);
+		Chunk ->
+		    ChunkSize = byte_size(Chunk),
+		    ChunkEnd = OldPos+ChunkSize,
+		    if Pos=<ChunkEnd ->
+			    Diff = Pos-OldPos,
+			    put(pos,Pos),
+			    put(chunk,binary:part(Chunk,Diff,ChunkEnd-Pos));
+		       true ->
+			    hard_pos_bof(Fd,Pos)
+		    end
+	    end;
+	_ ->
+	    hard_pos_bof(Fd,Pos)
+    end.
+
+hard_pos_bof(Fd,Pos) ->
     reset_chunk(),
-    file:position(Fd,{bof,Pos}). 
+    file:position(Fd,{bof,Pos}).
+
 
 get_chunk(Fd) ->
     case erase(chunk) of
@@ -979,7 +1097,9 @@ initial_menu() ->
       [menu_item(0, {"./general_info","General information"},0),
        menu_item(0, {"./processes","Processes"}, 0),
        menu_item(0, {"./ports","Ports"}, 0),
-       menu_item(0, {"./ets_tables","ETS tables"}, 0),
+       menu_item(2, "ETS tables", 0),
+       menu_item(0, {"./ets_tables","ETS tables"}, 1),
+       menu_item(0, {"./internal_ets_tables","Internal ETS tables"}, 1),
        menu_item(0, {"./timers","Timers"}, 0),
        menu_item(0, {"./fun_table","Fun table"}, 0),
        menu_item(0, {"./atoms","Atoms"}, 0),
@@ -1066,9 +1186,9 @@ read_file(File) ->
 		{ok,<<$=:8,TagAndRest/binary>>} ->
 		    {Tag,Id,Rest,N1} = tag(Fd,TagAndRest,1),
 		    case Tag of
-			"=erl_crash_dump" ->
-			    ets:delete_all_objects(cdv_dump_index_table),
-			    ets:insert(cdv_dump_index_table,{Tag,Id,N1+1}),
+			?erl_crash_dump ->
+			    reset_index_table(),
+			    insert_index(Tag,Id,N1+1),
 			    put(last_tag,{Tag,""}),
 			    Status = background_status(processing,File),
 			    background_status(Status),
@@ -1107,34 +1227,35 @@ read_file(File) ->
 	    background_done({R,undefined,undefined})
     end.
 
-indexify(Fd,<<"\n=",TagAndRest/binary>>,N) ->
-    {Tag,Id,Rest,N1} = tag(Fd,TagAndRest,N+2),
-    ets:insert(cdv_dump_index_table,{Tag,Id,N1+1}), % +1 to get past newline
-    put(last_tag,{Tag,Id}),
-    indexify(Fd,Rest,N1);
-indexify(Fd,<<>>,N) ->
-    case read(Fd) of
-	{ok,Chunk} when is_binary(Chunk) ->
-	    indexify(Fd,Chunk,N);
-        eof ->
-	    eof
-    end;
-indexify(Fd,<<$\n>>,N) ->
-    %% This clause is needed in case the chunk ends with a newline and
-    %% the next chunk starts with a tag (i.e. "\n=....")
-    case read(Fd) of
-	{ok,Chunk} when is_binary(Chunk) ->
-	    indexify(Fd,<<$\n,Chunk/binary>>,N);
-        eof ->
-	    eof
-    end;
-indexify(Fd,<<_Char:8,Rest/binary>>,N) ->
-    indexify(Fd,Rest,N+1).
+indexify(Fd,Bin,N) ->
+    case binary:match(Bin,<<"\n=">>) of
+	{Start,Len} ->
+	    Pos = Start+Len,
+	    <<_:Pos/binary,TagAndRest/binary>> = Bin,
+	    {Tag,Id,Rest,N1} = tag(Fd,TagAndRest,N+Pos),
+	    insert_index(Tag,Id,N1+1), % +1 to get past newline
+	    put(last_tag,{Tag,Id}),
+	    indexify(Fd,Rest,N1);
+	nomatch ->
+	    case read(Fd) of
+		{ok,Chunk0} when is_binary(Chunk0) ->
+		    {Chunk,N1} =
+			case binary:last(Bin) of
+			    $\n ->
+				{<<$\n,Chunk0/binary>>,N+byte_size(Bin)-1};
+			    _ ->
+				{Chunk0,N+byte_size(Bin)}
+			end,
+		    indexify(Fd,Chunk,N1);
+		eof ->
+		    eof
+	    end
+    end.
 
 tag(Fd,Bin,N) ->
     tag(Fd,Bin,N,[],[],tag).
 tag(_Fd,<<$\n:8,_/binary>>=Rest,N,Gat,Di,_Now) ->
-    {[$=|lists:reverse(Gat)],lists:reverse(Di),Rest,N};
+    {tag_to_atom(lists:reverse(Gat)),lists:reverse(Di),Rest,N};
 tag(Fd,<<$\r:8,Rest/binary>>,N,Gat,Di,Now) ->
     tag(Fd,Rest,N+1,Gat,Di,Now);
 tag(Fd,<<$::8,IdAndRest/binary>>,N,Gat,Di,tag) ->
@@ -1148,12 +1269,12 @@ tag(Fd,<<>>,N,Gat,Di,Now) ->
 	{ok,Chunk} when is_binary(Chunk) ->
 	    tag(Fd,Chunk,N,Gat,Di,Now);
         eof ->
-	    {[$=|lists:reverse(Gat)],lists:reverse(Di),<<>>,N}
+	    {tag_to_atom(lists:reverse(Gat)),lists:reverse(Di),<<>>,N}
     end.
 
 check_if_truncated() ->
     case get(last_tag) of
-	{"=end",_} ->
+	{?ende,_} ->
 	    put(truncated,false),
 	    put(truncated_proc,false);
 	TruncatedTag ->
@@ -1161,32 +1282,29 @@ check_if_truncated() ->
 	    find_truncated_proc(TruncatedTag)
     end.
 	    
-find_truncated_proc({"=atom",_Id}) ->
+find_truncated_proc({?atoms,_Id}) ->
     put(truncated_proc,false);
 find_truncated_proc({Tag,Pid}) ->
     case is_proc_tag(Tag) of
 	true -> 
 	    put(truncated_proc,Pid);
 	false -> 
-	    %% This means that the dump is truncated between "=proc" and
-	    %% "=proc_heap" => memory info is missing for all procs.
+	    %% This means that the dump is truncated between ?proc and
+	    %% ?proc_heap => memory info is missing for all procs.
 	    put(truncated_proc,"<0.0.0>")
     end.
 
-is_proc_tag(Tag)  when Tag=="=proc";
-		       Tag=="=proc_dictionary";
-		       Tag=="=proc_messages";
-		       Tag=="=proc_dictionary";
-		       Tag=="=debug_proc_dictionary";
-		       Tag=="=proc_stack";
-		       Tag=="=proc_heap" ->
+is_proc_tag(Tag)  when Tag==?proc;
+		       Tag==?proc_dictionary;
+		       Tag==?proc_messages;
+		       Tag==?proc_dictionary;
+		       Tag==?debug_proc_dictionary;
+		       Tag==?proc_stack;
+		       Tag==?proc_heap ->
     true;
 is_proc_tag(_) ->
     false.
 
-related_tags("Atoms") ->
-    ["=atoms","=num_atoms"].
-
 %%% Inform the crashdump_viewer_server that a background job is completed.
 background_done(Result) ->
     Dict = get(),
@@ -1198,8 +1316,7 @@ background_status(Status) ->
 %%%-----------------------------------------------------------------
 %%% Functions for reading information from the dump
 general_info(File) ->
-    [{"=erl_crash_dump",_Id,Start}] = 
-	ets:lookup(cdv_dump_index_table,"=erl_crash_dump"),
+    [{_Id,Start}] = lookup_index(?erl_crash_dump),
     Fd = open(File),
     pos_bof(Fd,Start),
     Created = case get_rest_of_line(Fd) of
@@ -1207,15 +1324,15 @@ general_info(File) ->
 		  WholeLine -> WholeLine
 	      end,
 
-    GI0 = get_general_info(Fd,#general_info{created=Created,_=?space}),
+    GI0 = get_general_info(Fd,#general_info{created=Created}),
     GI = case GI0#general_info.num_atoms of
 	    ?space -> GI0#general_info{num_atoms=get_num_atoms(Fd)};
 	    _ -> GI0
 	end,
 
     {MemTot,MemMax} = 
-	case ets:lookup(cdv_dump_index_table,"=memory") of
-	    [{"=memory",_,MemStart}] ->
+	case lookup_index(?memory) of
+	    [{_,MemStart}] ->
 		pos_bof(Fd,MemStart),
 		Memory = get_meminfo(Fd,[]),
 		Tot = case lists:keysearch("total",1,Memory) of
@@ -1232,33 +1349,34 @@ general_info(File) ->
 	end,
 
     close(Fd),
-    {NumProcs,NumEts,NumFuns} = count(),
+    {NumProcs,NumEts,NumFuns,NumTimers} = count(),
     NodeName = 
-	case ets:lookup(cdv_dump_index_table,"=node") of
-	    [{"=node",N,_Start}] ->
+	case lookup_index(?node) of
+	    [{N,_Start}] ->
 		N;
 	    [] ->
-		case ets:lookup(cdv_dump_index_table,"=no_distribution") of
+		case lookup_index(?no_distribution) of
 		    [_] -> "nonode@nohost";
 		    [] -> "unknown"
 		end
 	end,
 
     InstrInfo =
-	case ets:member(cdv_dump_index_table,"=old_instr_data") of
-	    true ->
-		old_instr_data;
-	    false ->
-		case ets:member(cdv_dump_index_table,"=instr_data") of
-		    true ->
-			instr_data;
-		    false ->
-			false
-		end
+	case lookup_index(?old_instr_data) of
+	    [] ->
+		case lookup_index(?instr_data) of
+		    [] ->
+			false;
+		    _ ->
+			instr_data
+		end;
+	    _ ->
+		old_instr_data
 	end,
     GI#general_info{node_name=NodeName,
 		    num_procs=integer_to_list(NumProcs),
 		    num_ets=integer_to_list(NumEts),
+		    num_timers=integer_to_list(NumTimers),
 		    num_fun=integer_to_list(NumFuns),
 		    mem_tot=MemTot,
 		    mem_max=MemMax,
@@ -1285,8 +1403,8 @@ get_general_info(Fd,GenInfo) ->
     end.
 
 get_num_atoms(Fd) ->
-    case ets:match(cdv_dump_index_table,{"=hash_table","atom_tab",'$1'}) of
-	[[Pos]] -> 
+    case lookup_index(?hash_table,"atom_tab") of
+	[{_,Pos}] -> 
 	    pos_bof(Fd,Pos),
 	    skip_rest_of_line(Fd), % size
 	    skip_rest_of_line(Fd), % used
@@ -1300,10 +1418,10 @@ get_num_atoms(Fd) ->
 	    get_num_atoms2()
     end.
 get_num_atoms2() ->
-    case ets:lookup(cdv_dump_index_table,"=num_atoms") of
+    case lookup_index(?num_atoms) of
 	[] -> 
 	    ?space;
-	[{"=num_atoms",NA,_Pos}] -> 
+	[{NA,_Pos}] -> 
 	    %% If dump is translated this will exist
 	    case get(truncated) of
 		true ->
@@ -1314,43 +1432,70 @@ get_num_atoms2() ->
     end.
 
 count() ->
-    {ets:select_count(cdv_dump_index_table,count_ms("=proc")),
-     ets:select_count(cdv_dump_index_table,count_ms("=ets")),
-     ets:select_count(cdv_dump_index_table,count_ms("=fun"))}.
+    {count_index(?proc),count_index(?ets),count_index(?fu),count_index(?timer)}.
 
-count_ms(Tag) ->
-    [{{Tag,'_','_'},[],[true]}].
 
+%%-----------------------------------------------------------------
+%% Page with all processes
+%%
+%% If there are less than ?max_sort_process_num processes in the dump,
+%% we will store the list of processes in the server state in order to
+%% allow sorting according to the different columns of the
+%% table. Since ?max_sort_process_num=:=?items_chunk_size, there will
+%% never be more than one chunk in this case.
+%% 
+%% If there are more than ?max_sort_process_num processes in the dump,
+%% no sorting will be allowed, and the processes must be read (chunk
+%% by chunk) from the file each time the page is opened. This is to
+%% avoid really big data in the server state.
+procs_summary(SessionId,TW,_,State=#state{procs_summary=too_many}) ->
+    chunk_page(SessionId,State#state.file,TW,?proc,processes,
+	       {no_sort,State#state.shared_heap},procs_summary_parsefun()),
+    State;
+procs_summary(SessionId,TW,SortOn,State) ->
+    ProcsSummary = 
+	case State#state.procs_summary of
+	    undefined -> % first time - read from file
+		Fd = open(State#state.file),
+		{PS,_}=lookup_and_parse_index_chunk(first_chunk_pointer(?proc),
+						    Fd,procs_summary_parsefun()),
+		close(Fd),
+		PS;
+	    PS ->
+		PS
+	end,
+    {SortedPS,NewSorted} = do_sort_procs(SortOn,ProcsSummary,State#state.sorted),
+    HtmlInfo = 
+	crashdump_viewer_html:chunk_page(processes,SessionId,TW,
+					 {SortOn,State#state.shared_heap},
+					 SortedPS),
+    crashdump_viewer_html:chunk(SessionId,done,HtmlInfo),
+    State#state{procs_summary=ProcsSummary,sorted=NewSorted}.
 
-procs_summary(File) ->
-    AllProcs = ets:lookup(cdv_dump_index_table,"=proc"),
-    Fd = open(File),
-    R = lists:map(fun({"=proc",Pid,Start}) -> 
-			  pos_bof(Fd,Start),
-			  get_procinfo(Fd,fun main_procinfo/4,
-				       ?initial_proc_record(Pid))
-		  end, 
-		  AllProcs),
-    close(Fd),
-    R.
+procs_summary_parsefun() ->
+    fun(Fd,Pid) -> 
+	    get_procinfo(Fd,fun main_procinfo/4,#proc{pid=Pid}) 
+    end.
 
+%%-----------------------------------------------------------------
+%% Page with one process
 get_proc_details(File,Pid) ->
-    DumpVsn = ets:lookup_element(cdv_dump_index_table,"=erl_crash_dump",2),
-    case ets:match(cdv_dump_index_table,{"=proc",Pid,'$1'}) of
-	[[Start]] ->
+    [{DumpVsn,_}] = lookup_index(?erl_crash_dump),
+    case lookup_index(?proc,Pid) of
+	[{_,Start}] ->
 	    Fd = open(File),
 	    pos_bof(Fd,Start),
 	    Proc0 = 
 		case DumpVsn of
 		    "0.0" -> 
 			%% Old version (translated)
-			?initial_proc_record(Pid);
+			#proc{pid=Pid};
 		    _ ->
-			(?initial_proc_record(Pid))#proc{
-			  stack_dump=if_exist("=proc_stack",Pid),
-			  msg_q=if_exist("=proc_messages",Pid),
-			  dict=if_exist("=proc_dictionary",Pid),
-			  debug_dict=if_exist("=debug_proc_dictionary",Pid)}
+			#proc{pid=Pid,
+			      stack_dump=if_exist(?proc_stack,Pid),
+			      msg_q=if_exist(?proc_messages,Pid),
+			      dict=if_exist(?proc_dictionary,Pid),
+			      debug_dict=if_exist(?debug_proc_dictionary,Pid)}
 		end,
 	    Proc = get_procinfo(Fd,fun all_procinfo/4,Proc0),
 	    close(Fd),
@@ -1368,11 +1513,11 @@ get_proc_details(File,Pid) ->
     end.
 
 if_exist(Tag,Key) ->
-    case ets:select_count(cdv_dump_index_table,[{{Tag,Key,'_'},[],[true]}]) of
+    case count_index(Tag,Key) of
 	0 -> 
 	    Tag1 = 
 		case is_proc_tag(Tag) of
-		    true -> "=proc";
+		    true -> ?proc;
 		    false -> Tag
 		end,
 	    case truncated_here({Tag1,Key}) of
@@ -1523,13 +1668,14 @@ maybe_other_node(File,Id) ->
 		N
 	end,
     Ms = ets:fun2ms(
-	   fun({Tag,Id,Start}) when Tag=:="=visible_node", Id=:=Channel -> 
+	   fun({{Tag,Start},Ch}) when Tag=:=?visible_node, Ch=:=Channel -> 
 		   {"Visible Node",Start};
-	      ({Tag,Id,Start}) when Tag=:="=hidden_node", Id=:=Channel ->
+	      ({{Tag,Start},Ch}) when Tag=:=?hidden_node, Ch=:=Channel ->
 		   {"Hidden Node",Start};
-	      ({Tag,Id,Start}) when Tag=:="=not_connected", Id=:=Channel -> 
+	      ({{Tag,Start},Ch}) when Tag=:=?not_connected, Ch=:=Channel -> 
 		   {"Not Connected Node",Start}
 	   end),
+    
     case ets:select(cdv_dump_index_table,Ms) of
 	[] -> 
 	    not_found;
@@ -1540,6 +1686,7 @@ maybe_other_node(File,Id) ->
 	    {other_node,Type,NodeInfo}
     end.
 
+
 expand_memory(File,What,Pid,Binaries) ->
     Fd = open(File),
     put(fd,Fd),
@@ -1548,8 +1695,8 @@ expand_memory(File,What,Pid,Binaries) ->
 	case What of
 	    "StackDump" -> read_stack_dump(Fd,Pid,Dict);
 	    "MsgQueue" -> read_messages(Fd,Pid,Dict);
-	    "Dictionary" -> read_dictionary(Fd,"=proc_dictionary",Pid,Dict);
-	    "DebugDictionary" -> read_dictionary(Fd,"=debug_proc_dictionary",Pid,Dict)
+	    "Dictionary" -> read_dictionary(Fd,?proc_dictionary,Pid,Dict);
+	    "DebugDictionary" -> read_dictionary(Fd,?debug_proc_dictionary,Pid,Dict)
 	end,
     erase(fd),
     close(Fd),
@@ -1559,10 +1706,10 @@ expand_memory(File,What,Pid,Binaries) ->
 %%% Read binaries.
 %%%
 read_binaries(Fd) ->
-    AllBinaries = ets:match(cdv_dump_index_table,{"=binary",'$1','$2'}),
+    AllBinaries = lookup_index(?binary),
     read_binaries(Fd,AllBinaries, gb_trees:empty()).
 
-read_binaries(Fd,[[Addr0,Pos]|Bins],Dict0) ->
+read_binaries(Fd,[{Addr0,Pos}|Bins],Dict0) ->
     pos_bof(Fd,Pos),
     {Addr,_} = get_hex(Addr0),
     Dict = 
@@ -1603,15 +1750,15 @@ parse_binary(Addr, Line0, Dict) ->
 %%%
 
 read_stack_dump(Fd,Pid,Dict) ->
-    case ets:match(cdv_dump_index_table,{"=proc_stack",Pid,'$1'}) of
-	[[Start]] ->
+    case lookup_index(?proc_stack,Pid) of
+	[{_,Start}] ->
 	    pos_bof(Fd,Start),
 	    read_stack_dump1(Fd,Dict,[]);
 	[] ->
 	    []
     end.
 read_stack_dump1(Fd,Dict,Acc) ->
-    %% This function is never called if the dump is truncated in "=proc_heap:Pid"
+    %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case val(Fd) of
 	"=" ++ _next_tag ->
 	    lists:reverse(Acc);
@@ -1631,15 +1778,15 @@ parse_top(Line0, D) ->
 %%%
 
 read_messages(Fd,Pid,Dict) ->
-    case ets:match(cdv_dump_index_table,{"=proc_messages",Pid,'$1'}) of
-	[[Start]] ->
+    case lookup_index(?proc_messages,Pid) of
+	[{_,Start}] ->
 	    pos_bof(Fd,Start),
 	    read_messages1(Fd,Dict,[]);
 	[] ->
 	    []
     end.
 read_messages1(Fd,Dict,Acc) ->
-    %% This function is never called if the dump is truncated in "=proc_heap:Pid"
+    %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case val(Fd) of
 	"=" ++ _next_tag ->
 	    lists:reverse(Acc);
@@ -1659,15 +1806,15 @@ parse_message(Line0, D) ->
 %%%
 
 read_dictionary(Fd,Tag,Pid,Dict) ->
-    case ets:match(cdv_dump_index_table,{Tag,Pid,'$1'}) of
-	[[Start]] ->
+    case lookup_index(Tag,Pid) of
+	[{_,Start}] ->
 	    pos_bof(Fd,Start),
 	    read_dictionary1(Fd,Dict,[]);
 	[] ->
 	    []
     end.
 read_dictionary1(Fd,Dict,Acc) ->
-    %% This function is never called if the dump is truncated in "=proc_heap:Pid"
+    %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case val(Fd) of
 	"=" ++ _next_tag ->
 	    lists:reverse(Acc);
@@ -1686,8 +1833,8 @@ parse_dictionary(Line0, D) ->
 %%%
 
 read_heap(Fd,Pid,Dict0) ->
-    case ets:match(cdv_dump_index_table,{"=proc_heap",Pid,'$2'}) of
-	[[Pos]] ->
+    case lookup_index(?proc_heap,Pid) of
+	[{_,Pos}] ->
 	    pos_bof(Fd,Pos),
 	    read_heap(Dict0);
 	[] ->
@@ -1695,7 +1842,7 @@ read_heap(Fd,Pid,Dict0) ->
     end.
 
 read_heap(Dict0) ->
-    %% This function is never called if the dump is truncated in "=proc_heap:Pid"
+    %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case get(fd) of
 	end_of_heap ->
 	    Dict0;
@@ -1761,12 +1908,14 @@ do_sort_procs("name",Procs,Sorted) ->
 	_ -> {Result,"name"}
     end.
     
-
+%%-----------------------------------------------------------------
+%% Page with one port
 get_port(File,Port) ->
-    case ets:match(cdv_dump_index_table,{"=port",Port,'$1'}) of
-	[[Start]] ->
+    case lookup_index(?port,Port) of
+	[{_,Start}] ->
 	    Fd = open(File),
-	    R = get_portinfo(Fd,Port,Start),
+	    pos_bof(Fd,Start),
+	    R = get_portinfo(Fd,#port{id=Port}),
 	    close(Fd),
 	    {ok,R};
 	[] ->
@@ -1781,18 +1930,11 @@ get_port(File,Port) ->
 	    end
     end.
 
-get_ports(File) ->
-    Ports = ets:lookup(cdv_dump_index_table,"=port"),
-    Fd = open(File),
-    R = lists:map(fun({"=port",Id,Start}) -> get_portinfo(Fd,Id,Start) end, 
-		  Ports),
-    close(Fd),
-    R.
-
-
-get_portinfo(Fd,Id,Start) ->
-    pos_bof(Fd,Start),
-    get_portinfo(Fd,#port{id=Id,_=?space}).
+%%-----------------------------------------------------------------
+%% Page with all ports
+get_ports(SessionId,File,TW) ->
+    ParseFun = fun(Fd,Id) -> get_portinfo(Fd,#port{id=Id}) end,
+    chunk_page(SessionId,File,TW,?port,ports,[],ParseFun).
 
 get_portinfo(Fd,Port) ->
     case line_head(Fd) of
@@ -1802,6 +1944,10 @@ get_portinfo(Fd,Port) ->
 	    get_portinfo(Fd,Port#port{connected=val(Fd)});
 	"Links" ->
 	    get_portinfo(Fd,Port#port{links=val(Fd)});
+	"Registered as" ->
+	    get_portinfo(Fd,Port#port{name=val(Fd)});
+	"Monitors" ->
+	    get_portinfo(Fd,Port#port{monitors=val(Fd)});
 	"Port controls linked-in driver" ->
 	    get_portinfo(Fd,Port#port{controls=["Linked in driver: " |
 						val(Fd)]});
@@ -1820,30 +1966,12 @@ get_portinfo(Fd,Port) ->
 	    Port
     end.
 
-get_ets_tables(File,Pid,WS) ->
-    EtsTables = ets:match_object(cdv_dump_index_table,{"=ets",Pid,'_'}),
-    Fd = open(File),
-    R = lists:map(fun({"=ets",P,Start}) -> 
-			  get_etsinfo(Fd,P,Start,WS) 
-		  end, 
-		  EtsTables),
-    close(Fd),
-    R.
 
-get_internal_ets_tables(File,WS) ->
-    InternalEts = ets:match_object(cdv_dump_index_table,
-				   {"=internal_ets",'_','_'}),
-    Fd = open(File),
-    R = lists:map(fun({"=internal_ets",Descr,Start}) ->
-			  {Descr,get_etsinfo(Fd,undefined,Start,WS)}
-		  end,
-		  InternalEts),
-    close(Fd),
-    R.
-    
-get_etsinfo(Fd,Pid,Start,WS) ->
-    pos_bof(Fd,Start),
-    get_etsinfo(Fd,#ets_table{pid=Pid,type="hash",_=?space},WS).
+%%-----------------------------------------------------------------
+%% Page with external ets tables
+get_ets_tables(SessionId,File,Heading,TW,Pid,WS) ->
+    ParseFun = fun(Fd,Id) -> get_etsinfo(Fd,#ets_table{pid=Id},WS) end,
+    chunk_page(SessionId,File,TW,{?ets,Pid},ets_tables,Heading,ParseFun).
 
 get_etsinfo(Fd,EtsTable,WS) ->
     case line_head(Fd) of
@@ -1875,26 +2003,32 @@ get_etsinfo(Fd,EtsTable,WS) ->
 	    EtsTable
     end.
 
-get_timers(File,Pid) ->
-    Timers = ets:match_object(cdv_dump_index_table,{"=timer",Pid,'$1'}),
+
+%% Internal ets table page
+get_internal_ets_tables(File,WS) ->
+    InternalEts = lookup_index(?internal_ets),
     Fd = open(File),
-    R = lists:map(fun({"=timer",P,Start}) -> 
-			  get_timerinfo(Fd,P,Start) 
-		  end, 
-		  Timers),
+    R = lists:map(
+	  fun({Descr,Start}) ->
+		  pos_bof(Fd,Start),
+		  {Descr,get_etsinfo(Fd,#ets_table{},WS)}
+	  end,
+	  InternalEts),
     close(Fd),
     R.
 
-get_timerinfo(Fd,Pid,Start) ->
-    pos_bof(Fd,Start),
-    get_timerinfo(Fd,#timer{pid=Pid,_=?space}).
+%%-----------------------------------------------------------------
+%% Page with list of all timers 
+get_timers(SessionId,File,Heading,TW,Pid) ->
+    ParseFun = fun(Fd,Id) -> get_timerinfo_1(Fd,#timer{pid=Id}) end,
+    chunk_page(SessionId,File,TW,{?timer,Pid},timers,Heading,ParseFun).
 
-get_timerinfo(Fd,Timer) ->
+get_timerinfo_1(Fd,Timer) ->
     case line_head(Fd) of
 	"Message" ->
-	    get_timerinfo(Fd,Timer#timer{msg=val(Fd)});
+	    get_timerinfo_1(Fd,Timer#timer{msg=val(Fd)});
 	"Time left" ->
-	    get_timerinfo(Fd,Timer#timer{time=val(Fd)});
+	    get_timerinfo_1(Fd,Timer#timer{time=val(Fd)});
 	"=" ++ _next_tag ->
 	    Timer;
 	Other ->
@@ -1902,25 +2036,27 @@ get_timerinfo(Fd,Timer) ->
 	    Timer
     end.
 
+%%-----------------------------------------------------------------
+%% Page with information about the erlang distribution
 nods(File) ->
-    case ets:lookup(cdv_dump_index_table,"=no_distribution") of
+    case lookup_index(?no_distribution) of
 	[] ->
-	    V = ets:lookup(cdv_dump_index_table,"=visible_node"),
-	    H = ets:lookup(cdv_dump_index_table,"=hidden_node"),
-	    N = ets:lookup(cdv_dump_index_table,"=not_connected"),
+	    V = lookup_index(?visible_node),
+	    H = lookup_index(?hidden_node),
+	    N = lookup_index(?not_connected),
 	    Fd = open(File),
 	    Visible = lists:map(
-			fun({"=visible_node",Channel,Start}) -> 
+			fun({Channel,Start}) -> 
 				get_nodeinfo(Fd,Channel,Start)
 			end, 
 			V),
 	    Hidden = lists:map(
-		       fun({"=hidden_node",Channel,Start}) -> 
+		       fun({Channel,Start}) -> 
 			       get_nodeinfo(Fd,Channel,Start)
 		       end, 
 		       H),
 	    NotConnected = lists:map(
-			     fun({"=not_connected",Channel,Start}) -> 
+			     fun({Channel,Start}) -> 
 				     get_nodeinfo(Fd,Channel,Start)
 			     end, 
 			     N),
@@ -1932,7 +2068,7 @@ nods(File) ->
 
 get_nodeinfo(Fd,Channel,Start) ->
     pos_bof(Fd,Start),
-    get_nodeinfo(Fd,#nod{channel=Channel,_=?space}).
+    get_nodeinfo(Fd,#nod{channel=Channel}).
 
 get_nodeinfo(Fd,Nod) ->
     case line_head(Fd) of
@@ -1963,26 +2099,37 @@ get_nodeinfo(Fd,Nod) ->
 	    Nod
     end.
 
-loaded_mods(File) ->
-    case ets:lookup(cdv_dump_index_table,"=loaded_modules") of
-	[{"=loaded_modules",_,StartTotal}] ->
-	    Fd = open(File),
-	    pos_bof(Fd,StartTotal),
-	    {CC,OC} = get_loaded_mod_totals(Fd,{"unknown","unknown"}),
-	    
-	    Mods = ets:lookup(cdv_dump_index_table,"=mod"),
-	    LM = lists:map(fun({"=mod",M,Start}) -> 
-				   pos_bof(Fd,Start),
-				   InitLM = #loaded_mod{mod=M,_=?space},
-				   get_loaded_mod_info(Fd,InitLM,
-						       fun main_modinfo/3)
-			   end, 
-			   Mods),
-	    close(Fd),
-	    {CC,OC,LM};
-	[] ->
-	    {"unknown","unknown",[]}
-    end.
+%%-----------------------------------------------------------------
+%% Page with details about one loaded modules
+get_loaded_mod_details(File,Mod) ->
+    [{_,Start}] = lookup_index(?mod,Mod),
+    Fd = open(File),
+    pos_bof(Fd,Start),
+    InitLM = #loaded_mod{mod=Mod,old_size="No old code exists"},
+    ModInfo = get_loaded_mod_info(Fd,InitLM,fun all_modinfo/3),
+    close(Fd),
+    ModInfo.
+
+%%-----------------------------------------------------------------
+%% Page with list of all loaded modules
+loaded_mods(SessionId,File,TW) ->
+    ParseFun = 
+	fun(Fd,Id) -> 
+		get_loaded_mod_info(Fd,#loaded_mod{mod=Id},
+				    fun main_modinfo/3) 
+	end,
+    {CC,OC} = 
+	case lookup_index(?loaded_modules) of
+	    [{_,StartTotal}] ->
+		Fd = open(File),
+		pos_bof(Fd,StartTotal),
+		R = get_loaded_mod_totals(Fd,{"unknown","unknown"}),
+		close(Fd),
+		R;
+	    [] ->
+		{"unknown","unknown"}
+    end,
+    chunk_page(SessionId,File,TW,?mod,loaded_mods,{CC,OC},ParseFun).
 
 get_loaded_mod_totals(Fd,{CC,OC}) ->
     case line_head(Fd) of
@@ -1997,16 +2144,6 @@ get_loaded_mod_totals(Fd,{CC,OC}) ->
 	    {CC,OC} % truncated file
     end.
 
-get_loaded_mod_details(File,Mod) ->
-    [[Start]] = ets:match(cdv_dump_index_table,{"=mod",Mod,'$1'}),
-    Fd = open(File),
-    pos_bof(Fd,Start),
-    InitLM = #loaded_mod{mod=Mod,old_size="No old code exists",
-			 _="No information available"},
-    ModInfo = get_loaded_mod_info(Fd,InitLM,fun all_modinfo/3),
-    close(Fd),
-    ModInfo.
-
 get_loaded_mod_info(Fd,LM,Fun) ->
     case line_head(Fd) of
 	"Current size" ->
@@ -2073,39 +2210,26 @@ hex_to_dec("A") -> 10;
 hex_to_dec(N) -> list_to_integer(N).
     
 
+%%-----------------------------------------------------------------
+%% Page with list of all funs
+funs(SessionId,File,TW) ->
+    ParseFun = fun(Fd,_Id) -> get_funinfo(Fd,#fu{}) end,
+    chunk_page(SessionId,File,TW,?fu,funs,[],ParseFun).
 
-funs(File) ->
-    case ets:lookup(cdv_dump_index_table,"=fun") of
-	[] ->
-	    [];
-	AllFuns ->
-	    Fd = open(File),
-	    R = lists:map(fun({"=fun",_,Start}) -> 
-				  get_funinfo(Fd,Start) 
-			  end, 
-			  AllFuns),
-	    close(Fd),
-	    R
-    end.
-
-get_funinfo(Fd,Start) ->
-    pos_bof(Fd,Start),
-    get_funinfo1(Fd,#fu{_=?space}).
-
-get_funinfo1(Fd,Fu) ->
+get_funinfo(Fd,Fu) ->
     case line_head(Fd) of
 	"Module" ->
-	    get_funinfo1(Fd,Fu#fu{module=val(Fd)});
+	    get_funinfo(Fd,Fu#fu{module=val(Fd)});
 	"Uniq" ->
-	    get_funinfo1(Fd,Fu#fu{uniq=val(Fd)});
+	    get_funinfo(Fd,Fu#fu{uniq=val(Fd)});
 	"Index" ->
-	    get_funinfo1(Fd,Fu#fu{index=val(Fd)});
+	    get_funinfo(Fd,Fu#fu{index=val(Fd)});
 	"Address" ->
-	    get_funinfo1(Fd,Fu#fu{address=val(Fd)});
+	    get_funinfo(Fd,Fu#fu{address=val(Fd)});
 	"Native_address" ->
-	    get_funinfo1(Fd,Fu#fu{native_address=val(Fd)});
+	    get_funinfo(Fd,Fu#fu{native_address=val(Fd)});
 	"Refc" ->
-	    get_funinfo1(Fd,Fu#fu{refc=val(Fd)});
+	    get_funinfo(Fd,Fu#fu{refc=val(Fd)});
 	"=" ++ _next_tag ->
 	    Fu;
 	Other ->
@@ -2113,28 +2237,53 @@ get_funinfo1(Fd,Fu) ->
 	    Fu
     end.
 
-atoms(File) ->
-    case ets:lookup(cdv_dump_index_table,"=atoms") of
-	[{_atoms,_Id,Start}] ->
+%%-----------------------------------------------------------------
+%% Page with list of all atoms
+atoms(SessionId,File,TW,Num) ->
+    case lookup_index(?atoms) of
+	[{_Id,Start}] ->
 	    Fd = open(File),
 	    pos_bof(Fd,Start),
-	    R = case get_n_lines_of_tag(Fd,100) of
-		    {all,N,Lines} ->
-			{n_lines,1,N,"Atoms",Lines};
-		    {part,100,Lines} ->
-			{n_lines,1,100,"Atoms",Lines,get(pos)};
-		    empty ->
-			[]
-		end,
-	    close(Fd),
-	    R;
+	    case get_atoms(Fd,?items_chunk_size) of
+		{Atoms,Cont} ->
+		    crashdump_viewer_html:atoms(SessionId,TW,Num,Atoms),
+		    atoms_chunks(Fd,SessionId,Cont);
+		done ->
+		    crashdump_viewer_html:atoms(SessionId,TW,Num,done)
+	    end;
 	_ ->
-	    []
+	    crashdump_viewer_html:atoms(SessionId,TW,Num,done)
+    end.
+
+get_atoms(Fd,Number) ->
+    case get_n_lines_of_tag(Fd,Number) of
+	{all,_,Lines} ->
+	    close(Fd),
+	    {Lines,done};
+	{part,_,Lines} ->
+	    {Lines,Number};
+	empty ->
+	    close(Fd),
+	    done
     end.
 
+atoms_chunks(_Fd,SessionId,done) ->
+    crashdump_viewer_html:atoms_chunk(SessionId,done);
+atoms_chunks(Fd,SessionId,Number) ->
+    case get_atoms(Fd,Number) of
+	{Atoms,Cont} ->
+	    crashdump_viewer_html:atoms_chunk(SessionId,Atoms),
+	    atoms_chunks(Fd,SessionId,Cont);
+	done ->
+	    atoms_chunks(Fd,SessionId,done)
+    end.
+
+
+%%-----------------------------------------------------------------
+%% Page with memory information
 memory(File) ->
-    case ets:lookup(cdv_dump_index_table,"=memory") of
-	[{"=memory",_,Start}] ->
+    case lookup_index(?memory) of
+	[{_,Start}] ->
 	    Fd = open(File),
 	    pos_bof(Fd,Start),
 	    R = get_meminfo(Fd,[]),
@@ -2153,10 +2302,12 @@ get_meminfo(Fd,Acc) ->
 	Key ->
 	    get_meminfo(Fd,[{Key,val(Fd)}|Acc])
     end.
-	    
+
+%%-----------------------------------------------------------------
+%% Page with information about allocated areas
 allocated_areas(File) ->
-    case ets:lookup(cdv_dump_index_table,"=allocated_areas") of
-	[{"=allocated_areas",_,Start}] ->
+    case lookup_index(?allocated_areas) of
+	[{_,Start}] ->
 	    Fd = open(File),
 	    pos_bof(Fd,Start),
 	    R = get_allocareainfo(Fd,[]),
@@ -2183,14 +2334,16 @@ get_allocareainfo(Fd,Acc) ->
 		end,
 	    get_allocareainfo(Fd,[AllocInfo|Acc])
     end.
-	    
+
+%%-----------------------------------------------------------------
+%% Page with information about allocators
 allocator_info(File) ->
-    case ets:lookup(cdv_dump_index_table,"=allocator") of
+    case lookup_index(?allocator) of
 	[] ->
 	    [];
 	AllAllocators ->
 	    Fd = open(File),
-	    R = lists:map(fun({"=allocator",Heading,Start}) -> 
+	    R = lists:map(fun({Heading,Start}) ->
 				  {Heading,get_allocatorinfo(Fd,Start)} 
 			  end, 
 			  AllAllocators),
@@ -2220,14 +2373,15 @@ get_all_vals([],Acc) ->
 get_all_vals([Char|Rest],Acc) ->
     get_all_vals(Rest,[Char|Acc]).
 
-
+%%-----------------------------------------------------------------
+%% Page with hash table information
 hash_tables(File) ->
-    case ets:lookup(cdv_dump_index_table,"=hash_table") of
+    case lookup_index(?hash_table) of
 	[] ->
 	    [];
 	AllHashTables ->
 	    Fd = open(File),
-	    R = lists:map(fun({"=hash_table",Name,Start}) -> 
+	    R = lists:map(fun({Name,Start}) ->
 				  get_hashtableinfo(Fd,Name,Start) 
 			  end, 
 			  AllHashTables),
@@ -2237,7 +2391,7 @@ hash_tables(File) ->
 
 get_hashtableinfo(Fd,Name,Start) ->
     pos_bof(Fd,Start),
-    get_hashtableinfo1(Fd,#hash_table{name=Name,_=?space}).
+    get_hashtableinfo1(Fd,#hash_table{name=Name}).
 
 get_hashtableinfo1(Fd,HashTable) ->
     case line_head(Fd) of
@@ -2256,13 +2410,15 @@ get_hashtableinfo1(Fd,HashTable) ->
 	    HashTable
     end.
 
+%%-----------------------------------------------------------------
+%% Page with index table information
 index_tables(File) ->
-    case ets:lookup(cdv_dump_index_table,"=index_table") of
+    case lookup_index(?index_table) of
 	[] ->
 	    [];
 	AllIndexTables ->
 	    Fd = open(File),
-	    R = lists:map(fun({"=index_table",Name,Start}) -> 
+	    R = lists:map(fun({Name,Start}) ->
 				  get_indextableinfo(Fd,Name,Start) 
 			  end, 
 			  AllIndexTables),
@@ -2272,7 +2428,7 @@ index_tables(File) ->
 
 get_indextableinfo(Fd,Name,Start) ->
     pos_bof(Fd,Start),
-    get_indextableinfo1(Fd,#index_table{name=Name,_=?space}).
+    get_indextableinfo1(Fd,#index_table{name=Name}).
 
 get_indextableinfo1(Fd,IndexTable) ->
     case line_head(Fd) of
@@ -2284,6 +2440,8 @@ get_indextableinfo1(Fd,IndexTable) ->
 	    get_indextableinfo1(Fd,IndexTable#index_table{limit=val(Fd)});
 	"rate" ->
 	    get_indextableinfo1(Fd,IndexTable#index_table{rate=val(Fd)});
+	"entries" ->
+	    get_indextableinfo1(Fd,IndexTable#index_table{entries=val(Fd)});
     	"=" ++ _next_tag ->
 	    IndexTable;
 	Other ->
@@ -2295,6 +2453,8 @@ get_indextableinfo1(Fd,IndexTable) ->
 
 
 
+%%-----------------------------------------------------------------
+%% Expand a set of data which was shown in a truncated form on
 get_expanded(File,Pos,Size) ->
     Fd = open(File),
     R = case file:pread(Fd,Pos,Size) of
@@ -2307,20 +2467,6 @@ get_expanded(File,Pos,Size) ->
     R.
 
 
-get_next(File,Pos,N0,Start,What) ->
-    Fd = open(File),
-    pos_bof(Fd,Pos),
-    R = case get_n_lines_of_tag(Fd,N0) of
-	    {all,N,Lines} ->
-		{n_lines,Start,N,What,Lines};
-	    {part,N,Lines} ->
-		{n_lines,Start,N,What,Lines,get(pos)}
-	end,
-    close(Fd),
-    R.
-
-
-
 replace_all(From,To,[From|Rest],Acc) ->
     replace_all(From,To,Rest,[To|Acc]);
 replace_all(From,To,[Char|Rest],Acc) ->
@@ -2567,3 +2713,110 @@ get_binary(_N, [], _Acc) ->
 
 cdvbin(Sz,Pos) ->
     "#CDVBin<"++integer_to_list(Sz)++","++integer_to_list(Pos)++">".
+
+
+%%-----------------------------------------------------------------
+%% Functions for accessing the cdv_dump_index_table
+reset_index_table() ->
+    ets:delete_all_objects(cdv_dump_index_table).
+
+insert_index(Tag,Id,Pos) ->
+    ets:insert(cdv_dump_index_table,{{Tag,Pos},Id}).
+
+lookup_index(Tag) ->
+    lookup_index(Tag,'$2').
+lookup_index(Tag,Id) ->
+    ets:select(cdv_dump_index_table,[{{{Tag,'$1'},Id},[],[{{Id,'$1'}}]}]).
+
+lookup_index_chunk({'#CDVFirstChunk',Tag,Id}) ->
+    ets:select(cdv_dump_index_table,
+	       [{{{Tag,'$1'},Id},[],[{{Id,'$1'}}]}],
+	       ?items_chunk_size);
+lookup_index_chunk(Cont) ->
+    ets:select(Cont).
+
+%% Create a tag which can be used instead of an ets Continuation for
+%% the first call to lookup_index_chunk.
+first_chunk_pointer({Tag,Id}) ->
+    {'#CDVFirstChunk',Tag,Id};
+first_chunk_pointer(Tag) ->
+    first_chunk_pointer({Tag,'$2'}).
+
+count_index(Tag) ->
+    ets:select_count(cdv_dump_index_table,[{{{Tag,'_'},'_'},[],[true]}]).
+count_index(Tag,Id) ->
+    ets:select_count(cdv_dump_index_table,[{{{Tag,'_'},Id},[],[true]}]).
+
+
+%%-----------------------------------------------------------------
+%% Convert tags read from crashdump to atoms used as first part of key
+%% in cdv_dump_index_table
+tag_to_atom("allocated_areas") -> ?allocated_areas;
+tag_to_atom("allocator") -> ?allocator;
+tag_to_atom("atoms") -> ?atoms;
+tag_to_atom("binary") -> ?binary;
+tag_to_atom("debug_proc_dictionary") -> ?debug_proc_dictionary;
+tag_to_atom("end") -> ?ende;
+tag_to_atom("erl_crash_dump") -> ?erl_crash_dump;
+tag_to_atom("ets") -> ?ets;
+tag_to_atom("fun") -> ?fu;
+tag_to_atom("hash_table") -> ?hash_table;
+tag_to_atom("hidden_node") -> ?hidden_node;
+tag_to_atom("index_table") -> ?index_table;
+tag_to_atom("instr_data") -> ?instr_data;
+tag_to_atom("internal_ets") -> ?internal_ets;
+tag_to_atom("loaded_modules") -> ?loaded_modules;
+tag_to_atom("memory") -> ?memory;
+tag_to_atom("mod") -> ?mod;
+tag_to_atom("no_distribution") -> ?no_distribution;
+tag_to_atom("node") -> ?node;
+tag_to_atom("not_connected") -> ?not_connected;
+tag_to_atom("num_atoms") -> ?num_atoms;
+tag_to_atom("old_instr_data") -> ?old_instr_data;
+tag_to_atom("port") -> ?port;
+tag_to_atom("proc") -> ?proc;
+tag_to_atom("proc_dictionary") -> ?proc_dictionary;
+tag_to_atom("proc_heap") -> ?proc_heap;
+tag_to_atom("proc_messages") -> ?proc_messages;
+tag_to_atom("proc_stack") -> ?proc_stack;
+tag_to_atom("timer") -> ?timer;
+tag_to_atom("visible_node") -> ?visible_node;
+tag_to_atom(UnknownTag) ->
+    io:format("WARNING: Found unexpected tag:~s~n",[UnknownTag]),
+    list_to_atom(UnknownTag).
+
+%%%-----------------------------------------------------------------
+%%% Create a page by sending chunk by chunk to crashdump_viewer_html
+chunk_page(SessionId,File,TW,What,HtmlCB,HtmlExtra,ParseFun) ->
+    Fd = open(File),
+    case lookup_and_parse_index_chunk(first_chunk_pointer(What),Fd,ParseFun) of
+	done ->
+	    crashdump_viewer_html:chunk_page(HtmlCB,SessionId,TW,HtmlExtra,done);
+	{Chunk,Cont} ->
+	    HtmlInfo = crashdump_viewer_html:chunk_page(
+			     HtmlCB,
+			     SessionId,TW,HtmlExtra,Chunk),
+	    chunk_page_1(Fd,HtmlInfo,SessionId,ParseFun,
+			 lookup_and_parse_index_chunk(Cont,Fd,ParseFun))
+    end.
+
+chunk_page_1(_Fd,HtmlInfo,SessionId,_ParseFun,done) ->
+    crashdump_viewer_html:chunk(SessionId,done,HtmlInfo);
+chunk_page_1(Fd,HtmlInfo,SessionId,ParseFun,{Chunk,Cont}) ->
+    crashdump_viewer_html:chunk(SessionId,Chunk,HtmlInfo),
+    chunk_page_1(Fd,HtmlInfo,SessionId,ParseFun,
+		 lookup_and_parse_index_chunk(Cont,Fd,ParseFun)).
+
+lookup_and_parse_index_chunk(Pointer,Fd,ParseFun) ->
+    case lookup_index_chunk(Pointer) of
+	'$end_of_table' ->
+	    close(Fd),
+	    done;
+	{Chunk,Cont} ->
+	    R = lists:map(fun({Id,Start}) ->
+				  pos_bof(Fd,Start),
+				  ParseFun(Fd,Id)
+			  end,
+			  Chunk),
+	    {R,Cont}
+    end.
diff --git a/lib/observer/src/crashdump_viewer.hrl b/lib/observer/src/crashdump_viewer.hrl
index 6ce727cd3e..466f33b63b 100644
--- a/lib/observer/src/crashdump_viewer.hrl
+++ b/lib/observer/src/crashdump_viewer.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -17,117 +17,136 @@
 %% %CopyrightEnd%
 %%
 -define(space, "&nbsp;").
+-define(unknown, "unknown").
 
 
 -record(menu_item,{index,picture,text,depth,children,state,target}).
 
 -record(general_info,
 	{created,
-	 slogan,
-	 system_vsn,
-	 compile_time,
-	 taints,
-	 node_name,
-	 num_atoms,
-	 num_procs,
-	 num_ets,
-	 num_fun,
-	 mem_tot,
-	 mem_max,
-	 instr_info}).
+	 slogan=?space,
+	 system_vsn=?space,
+	 compile_time=?space,
+	 taints=?space,
+	 node_name=?space,
+	 num_atoms=?space,
+	 num_procs=?space,
+	 num_ets=?space,
+	 num_timers=?space,
+	 num_fun=?space,
+	 mem_tot=?space,
+	 mem_max=?space,
+	 instr_info=?space}).
 
 -record(proc,
+	%% Initial data according to the follwoing:
+	%% 
+	%% msg_q_len, reds and stack_heap are integers because it must 
+	%% be possible to sort on them. All other fields are strings
+	%%
+	%% for old dumps start_time, parent and number of heap frament
+	%% does not exist
+	%%
+	%% current_func can be both "current function" and
+	%% "last scheduled in for"
+	%%
+	%% stack_dump, message queue and dictionaries should only be 
+	%% displayed as a link to "Expand" (if dump is from OTP R9B 
+	%% or newer)
 	{pid,
-	 name,
-	 init_func,
-	 parent,
-	 start_time,
-	 state,
-	 current_func,
-	 msg_q_len,
-	 msg_q,
-	 last_calls,
-	 links,
-	 prog_count,
-	 cp,
-	 arity,
-	 dict,
-	 debug_dict,
-	 reds,
-	 num_heap_frag,
-	 heap_frag_data,
-	 stack_heap,
-	 old_heap,
-	 heap_unused,
-	 old_heap_unused,
-	 new_heap_start,
-	 new_heap_top,
-	 stack_top,
-	 stack_end,
-	 old_heap_start,
-	 old_heap_top,
-	 old_heap_end,
-	 stack_dump}).
+	 name=?space,
+	 init_func=?space,
+	 parent=?unknown,
+	 start_time=?unknown,
+	 state=?space,
+	 current_func={"Current Function",?space},
+	 msg_q_len=0,
+	 msg_q=?space,
+	 last_calls=?space,
+	 links=?space,
+	 prog_count=?space,
+	 cp=?space,
+	 arity=?space,
+	 dict=?space,
+	 debug_dict=?space,
+	 reds=0,
+	 num_heap_frag=?unknown,
+	 heap_frag_data=?space,
+	 stack_heap=0,
+	 old_heap=?space,
+	 heap_unused=?space,
+	 old_heap_unused=?space,
+	 new_heap_start=?space,
+	 new_heap_top=?space,
+	 stack_top=?space,
+	 stack_end=?space,
+	 old_heap_start=?space,
+	 old_heap_top=?space,
+	 old_heap_end=?space,
+	 stack_dump=?space}).
 
 -record(port,
 	{id,
-	 slot,
-	 connected,
-	 links,
-	 controls}).
+	 slot=?space,
+	 connected=?space,
+	 links=?space,
+	 name=?space,
+	 monitors=?space,
+	 controls=?space}).
 
 -record(ets_table,
 	{pid,
-	 slot,
-	 id,
-	 name,
-	 type,
-	 buckets,
-	 size,
-	 memory}).
+	 slot=?space,
+	 id=?space,
+	 name=?space,
+	 type="hash",
+	 buckets=?space,
+	 size=?space,
+	 memory=?space}).
 
 -record(timer,
 	{pid,
-	 msg,
-	 time}).
+	 msg=?space,
+	 time=?space}).
 
 -record(fu,
-	{module,
-	 uniq,
-	 index,
-	 address,
-	 native_address,
-	 refc}).
+	{module=?space,
+	 uniq=?space,
+	 index=?space,
+	 address=?space,
+	 native_address=?space,
+	 refc=?space}).
 
 -record(nod,
-	{name,
+	{name=?space,
 	 channel,
-	 controller,
-	 creation,
-	 remote_links,
-	 remote_mon,
-	 remote_mon_by,
-	 error}).
+	 controller=?space,
+	 creation=?space,
+	 remote_links=?space,
+	 remote_mon=?space,
+	 remote_mon_by=?space,
+	 error=?space}).
 
 -record(loaded_mod,
 	{mod,
-	 current_size,
-	 current_attrib,
-	 current_comp_info,
-	 old_size,
-	 old_attrib,
-	 old_comp_info}).
+	 current_size=?space,
+	 current_attrib=?space,
+	 current_comp_info=?space,
+	 old_size=?space,
+	 old_attrib=?space,
+	 old_comp_info=?space}).
 
 -record(hash_table,
 	{name,
-	 size,
-	 used,
-	 objs,
-	 depth}).
+	 size=?space,
+	 used=?space,
+	 objs=?space,
+	 depth=?space}).
 
 -record(index_table,
 	{name,
-	 size,
-	 used,
-	 limit,
-	 rate}).
+	 size=?space,
+	 used=?space,
+	 limit=?space,
+	 rate=?space,
+	 entries=?space}).
diff --git a/lib/observer/src/crashdump_viewer_html.erl b/lib/observer/src/crashdump_viewer_html.erl
index 5e7bbf62a0..24a80b1916 100644
--- a/lib/observer/src/crashdump_viewer_html.erl
+++ b/lib/observer/src/crashdump_viewer_html.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -32,25 +32,23 @@
 	 general_info/1,
 	 pretty_info_page/2,
 	 info_page/2,
-	 procs_summary/4,
 	 proc_details/4,
 	 expanded_memory/2,
 	 expanded_binary/1,
-	 next/2,
-	 ports/3,
-	 timers/3,
-	 ets_tables/4,
+	 port/3,
+	 internal_ets_tables/2,
 	 nods/2,
-	 loaded_mods/2,
 	 loaded_mod_details/2,
-	 funs/2,
-	 atoms/3,
+	 atoms/4,
+	 atoms_chunk/2,
 	 memory/2,
 	 allocated_areas/2,
 	 allocator_info/2,
 	 hash_tables/2,
 	 index_tables/2,
-	 error/2]).
+	 error/2,
+	 chunk_page/5,
+	 chunk/3]).
 
 -include("crashdump_viewer.hrl").
 
@@ -79,23 +77,20 @@ read_file_frame() ->
 
 
 read_file_frame_body() ->
-    Entry =
-	case webtool:is_localhost() of 
-	    true -> [input("TYPE=file NAME=browse SIZE=40"),
-		     input("TYPE=hidden NAME=path")];
-	    false -> input("TYPE=text NAME=path SIZE=60")
-	end,
+    %% Using a plain text input field instead of a file input field
+    %% (e.g. <INPUT TYPE=file NAME=pathj SIZE=40">) because most
+    %% browsers can not forward the full path from this dialog even if
+    %% the browser is running on localhost (Ref 'fakepath'-problem)
+    Entry = input("TYPE=text NAME=path SIZE=60"),
     Form = 
 	form(
-	  "NAME=read_file_form METHOD=post ACTION= \"./read_file\"",
+	  "NAME=read_file_form METHOD=post ACTION=\"./read_file\"",
 	  table(
 	    "BORDER=0",
 	    [tr(td("COLSPAN=2","Enter file to analyse")),
 	     tr(
 	       [td(Entry),
-		td("ALIGN=center",
-		   input("TYPE=submit onClick=\"path.value=browse.value;\""
-			 "VALUE=Ok"))])])),
+		td("ALIGN=center",input("TYPE=submit VALUE=Ok"))])])),
     table(
       "WIDTH=100% HEIGHT=60%",
       tr("VALIGN=middle",
@@ -235,6 +230,8 @@ general_info_body(Heading,GenInfo) ->
 	    td(GenInfo#general_info.num_procs)]),
 	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","ETS tables"),
 	    td(GenInfo#general_info.num_ets)]),
+	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Timers"),
+	    td(GenInfo#general_info.num_timers)]),
 	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Funs"),
 	    td(GenInfo#general_info.num_fun)])]),
      case GenInfo#general_info.instr_info of
@@ -295,60 +292,6 @@ pretty_info_body(Heading,Info) ->
      pre(pretty_format(Info))].
     
 %%%-----------------------------------------------------------------
-%%% Make table with summary of process information
-procs_summary(Sorted,ProcsSummary,TW,SharedHeap) ->
-    Heading = "Process Information",
-    header(Heading,
-	   body(
-	     procs_summary_body(Heading,ProcsSummary,TW,Sorted,SharedHeap))).
-    
-procs_summary_body(Heading,[],TW,_Sorted,_SharedHeap) ->
-    [h1(Heading),
-     warn(TW),
-     "No processes were found\n"];
-procs_summary_body(Heading,ProcsSummary,TW,Sorted,SharedHeap) ->
-    MemHeading = 
-	if SharedHeap -> 
-		"Stack";
-	   true ->
-		"Stack+heap"
-	end,
-
-    [heading(Heading,"processes"),
-     warn(TW),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr(
-	  [summary_table_head("pid","Pid",Sorted),
-	   summary_table_head("name_func","Name/Spawned as",Sorted),
-	   summary_table_head("state","State",Sorted), 
-	   summary_table_head("reds","Reductions",Sorted), 
-	   summary_table_head("mem",MemHeading,Sorted),
-	   summary_table_head("msg_q_len","MsgQ Length",Sorted)]) |
-	lists:map(fun(Proc) -> procs_summary_table(Proc) end,ProcsSummary)])].
-
-summary_table_head(Sorted,Text,Sorted) ->
-    %% Mark the sorted column (bigger and italic)
-    th(font("SIZE=\"+1\"",em(href("./sort_procs?sort="++Sorted,Text))));
-summary_table_head(SortOn,Text,_Sorted) ->
-    th(href("./sort_procs?sort="++SortOn,Text)).
-
-procs_summary_table(Proc) ->
-    #proc{pid=Pid,name=Name,state=State,
-	  reds=Reds,stack_heap=Mem0,msg_q_len=MsgQLen}=Proc,
-    Mem = case Mem0 of
-	      -1 -> "unknown";
-	      _ -> integer_to_list(Mem0)
-	  end,
-    tr(
-      [td(href(["./proc_details?pid=",Pid],Pid)),
-       td(Name),
-       td(State),
-       td("ALIGN=right",integer_to_list(Reds)),
-       td("ALIGN=right",Mem),
-       td("ALIGN=right",integer_to_list(MsgQLen))]).
-
-%%%-----------------------------------------------------------------
 %%% Print details for one process
 proc_details(Pid,Proc,TW,SharedHeap) ->
     Script = 
@@ -594,83 +537,33 @@ expanded_binary_body(Heading,Bin) ->
      href("javascript:history.go(-1)","BACK")].
     
 %%%-----------------------------------------------------------------
-%%% Print table of ports
-ports(Heading,Ports,TW) ->
-    header(Heading,body(ports_body(Heading,Ports,TW))).
+%%% Print info for one port
+port(Heading,Port,TW) ->
+    header(Heading,body(port_body(Heading,Port,TW))).
     
-ports_body(Heading,[],TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No ports were found\n"];
-ports_body(Heading,Ports,TW) ->
+port_body(Heading,Port,TW) ->
     [heading(Heading,"ports"),
      warn(TW),
      table(
        "BORDER=4 CELLPADDING=4",
-       [tr(
-	  [th("Id"),
-	   th("Slot"),
-	   th("Connected"),
-	   th("Links"),
-	   th("Controls")]) |
-	lists:map(fun(Port) -> ports_table(Port) end, Ports)])].
+       [tr([th(Head) || Head <- port_table_head()]), ports_table(Port)])].
 
-ports_table(Port) ->
-    #port{id=Id,slot=Slot,connected=Connected,links=Links,
-	  controls=Controls}=Port,
-    tr(
-      [td(Id),
-       td("ALIGHT=right",Slot),
-       td(href_proc_port(Connected)),
-       td(href_proc_port(Links)),
-       td(Controls)]).
-    
 %%%-----------------------------------------------------------------
-%%% Print table of ETS tables
-ets_tables(Heading,EtsTables,InternalEts,TW) ->
-    header(Heading,body(ets_tables_body(Heading,EtsTables,InternalEts,TW))).
+%%% Print table of internal ETS tables
+internal_ets_tables(InternalEts,TW) ->
+    Heading = "Internal ETS tables",
+    header(Heading,body(internal_ets_tables_body(Heading,InternalEts,TW))).
     
-ets_tables_body(Heading,[],InternalEts,TW) ->
+internal_ets_tables_body(Heading,[],TW) ->
     [h1(Heading),
      warn(TW),
-     "No ETS tables were found\n" |
-     internal_ets_tables_table(InternalEts)];
-ets_tables_body(Heading,EtsTables,InternalEts,TW) ->
-    [heading(Heading,"ets_tables"),
+     "No internal ETS tables were found\n"];
+internal_ets_tables_body(Heading,InternalEts,TW) ->
+    [heading(Heading,"internal_ets_tables"),
      warn(TW),
      table(
        "BORDER=4 CELLPADDING=4",
        [tr(
-	  [th("Owner"),
-	   th("Slot"),
-	   th("Id"),
-	   th("Name"),
-	   th("Type"),
-	   th("Buckets"),
-	   th("Objects"),
-	   th("Memory (bytes)")]) |
-	lists:map(fun(EtsTable) -> ets_tables_table(EtsTable) end,
-		  EtsTables)]) |
-    internal_ets_tables_table(InternalEts)].
-
-ets_tables_table(EtsTable) ->
-    #ets_table{pid=Pid,slot=Slot,id=Id,name=Name,type=Type,
-	       buckets=Buckets,size=Size,memory=Memory} = EtsTable,
-    tr(
-      [td(href_proc_port(Pid)),
-       td(Slot),
-       td(Id),
-       td(Name),
-       td(Type),
-       td("ALIGN=right",Buckets),
-       td("ALIGN=right",Size),
-       td("ALIGN=right",Memory)]).
-
-internal_ets_tables_table(InternalEtsTables) ->
-    [h2("Internal ETS tables"),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr(
 	  [th("Description"),
 	   th("Id"),
 	   th("Name"),
@@ -681,7 +574,7 @@ internal_ets_tables_table(InternalEtsTables) ->
 	lists:map(fun(InternalEtsTable) -> 
 			  internal_ets_tables_table1(InternalEtsTable)
 		  end,
-		  InternalEtsTables)])].
+		  InternalEts)])].
 
 internal_ets_tables_table1({Descr,InternalEtsTable}) ->
     #ets_table{id=Id,name=Name,type=Type,buckets=Buckets,
@@ -696,33 +589,6 @@ internal_ets_tables_table1({Descr,InternalEtsTable}) ->
        td("ALIGN=right",Memory)]).
 
 %%%-----------------------------------------------------------------
-%%% Print table of timers
-timers(Heading,Timers,TW) ->
-    header(Heading,body(timers_body(Heading,Timers,TW))).
-    
-timers_body(Heading,[],TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No timers were found\n"];
-timers_body(Heading,Timers,TW) ->
-    [heading(Heading,"timers"),
-     warn(TW),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr(
-	  [th("Owner"),
-	   th("Message"),
-	   th("Time left")]) |
-	lists:map(fun(Timer) -> timers_table(Timer) end, Timers)])].
-
-timers_table(Timer) ->
-    #timer{pid=Pid,msg=Msg,time=Time}=Timer,
-    tr(
-      [td(href_proc_port(Pid)),
-       td(Msg),
-       td("ALIGN=right",Time)]).
-
-%%%-----------------------------------------------------------------
 %%% Print table of nodes in distribution
 nods(Nods,TW) ->
     header("Distribution Information",body(nodes_body(Nods,TW))).
@@ -826,33 +692,6 @@ format_extra_info(Error) ->
 	 ?space -> "";
 	 _ -> font("COLOR=\"#FF0000\"",["ERROR: ",Error,"\n"])
      end.
-%%%-----------------------------------------------------------------
-%%% Print loaded modules information
-loaded_mods({CC,OC,LM},TW) ->
-    Heading = "Loaded Modules Information",
-    header(Heading,body(loaded_mods_body(Heading,CC,OC,LM,TW))).
-    
-loaded_mods_body(Heading,"unknown","unknown",[],TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No loaded modules information was found\n"];
-loaded_mods_body(Heading,CC,OC,LM,TW) ->
-    [heading(Heading,"loaded_modules"),
-     warn(TW),
-     p([b("Current code: "),CC," bytes",br(),
-	b("Old code: "),OC," bytes"]),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr([th("Module"),
-	    th("Current size (bytes)"),
-	    th("Old size (bytes)")]) |
-	lists:map(fun(Mod) -> loaded_mods_table(Mod) end,LM)])].
-
-loaded_mods_table(#loaded_mod{mod=Mod,current_size=CS,old_size=OS}) ->
-    tr([td(href(["loaded_mod_details?mod=",Mod],Mod)),
-	td("ALIGN=right",CS),
-	td("ALIGN=right",OS)]).
-    
 
 %%%-----------------------------------------------------------------
 %%% Print detailed information about one module
@@ -882,107 +721,33 @@ loaded_mod_details_body(ModInfo,TW) ->
     
 
 %%%-----------------------------------------------------------------
-%%% Print table of funs
-funs(Funs,TW) ->
-    Heading = "Fun Information",
-    header(Heading,body(funs_body(Heading,Funs,TW))).
-    
-funs_body(Heading,[],TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No Fun information was found\n"];
-funs_body(Heading,Funs,TW) ->
-    [heading(Heading,"funs"),
-     warn(TW),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr(
-	  [th("Module"),
-	   th("Uniq"),
-	   th("Index"),
-	   th("Address"),
-	   th("Native_address"),
-	   th("Refc")]) |
-	lists:map(fun(Fun) -> funs_table(Fun) end, Funs)])].
-
-funs_table(Fu) ->
-    #fu{module=Module,uniq=Uniq,index=Index,address=Address,
-	native_address=NativeAddress,refc=Refc}=Fu,
-    tr(
-      [td(Module),
-       td("ALIGN=right",Uniq),
-       td("ALIGN=right",Index),
-       td(Address),
-       td(NativeAddress),
-       td("ALIGN=right",Refc)]).
-    
-%%%-----------------------------------------------------------------
 %%% Print atoms
-atoms(Atoms,Num,TW) ->
+atoms(SessionId,TW,Num,FirstChunk) ->
     Heading = "Atoms",
-    header(Heading,body(atoms_body(Heading,Atoms,Num,TW))).
-
-atoms_body(Heading,[],Num,TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No atoms were found in log",br(),
-     "Total number of atoms in node was ", Num, br()];    
-atoms_body(Heading,Atoms,Num,TW) ->
-    [heading(Heading,"atoms"),
-     warn(TW),
-     "Total number of atoms in node was ", Num, 
-     br(),
-     "The last created atom is shown first",
-     br(),br() |
-     n_first(Atoms)].
-
-n_first({n_lines,Start,N,What,Lines,Pos}) ->
-    NextHref = next_href(N,What,Pos,Start),
-    [What," number ",integer_to_list(Start),"-",integer_to_list(Start+N-1),
-     br(),
-     NextHref, 
-     pre(Lines),
-     NextHref];
-n_first({n_lines,_Start,_N,_What,Lines}) ->
-    [pre(Lines)].
-
-%%%-----------------------------------------------------------------
-%%% Print next N lines of "something"
-next(NLines,TW) ->
-    header(element(4,NLines),body(next_body(NLines,TW))).
-
-next_body({n_lines,Start,N,What,Lines,Pos},TW) ->
-    PrefHref = prev_href(),
-    NextHref = next_href(N,What,Pos,Start),
-    [warn(TW),
-     What," number ",integer_to_list(Start),"-",integer_to_list(Start+N-1),
-     br(),
-     PrefHref,
-     ?space,
-     NextHref, 
-     pre(Lines),
-     PrefHref,
-     ?space,
-     NextHref];
-next_body({n_lines,Start,N,What,Lines},TW) ->
-    PrefHref = prev_href(),
-    [warn(TW),
-     What," number ",integer_to_list(Start),"-",integer_to_list(Start+N-1),
-     br(),
-     PrefHref,
-     pre(Lines),
-     PrefHref].
-    
-
-prev_href() ->
-    href("javascript:history.back()",["Previous"]).
-
-next_href(N,What,Pos,Start) ->
-    href(["./next?pos=",integer_to_list(Pos),
-	  "&num=",integer_to_list(N),
-	  "&start=",integer_to_list(Start+N),
-	  "&what=",What],
-	 "Next").
+    case FirstChunk of
+	done ->
+	    deliver_first(SessionId,[start_html_page(Heading),
+				     h1(Heading),
+				     warn(TW),
+				     "No atoms were found in log",br(),
+				     "Total number of atoms in node was ", Num, 
+				     br()]);
+	_ ->
+	    deliver_first(SessionId,[start_html_page(Heading),
+				     heading(Heading,"atoms"),
+				     warn(TW),
+				     "Total number of atoms in node was ", Num, 
+				     br(),
+				     "The last created atom is shown first",
+				     br(),
+				     start_pre()]),
+	    atoms_chunk(SessionId,FirstChunk)
+    end.
+	    
+atoms_chunk(SessionId,done) ->
+    deliver(SessionId,[stop_pre(),stop_html_page()]);
+atoms_chunk(SessionId,Atoms) ->
+    deliver(SessionId,Atoms).
 
 %%%-----------------------------------------------------------------
 %%% Print memory information
@@ -1120,52 +885,92 @@ index_tables_body(Heading,IndexTables,TW) ->
 	   th("Size"),
 	   th("Limit"),
 	   th("Used"),
-	   th("Rate")]) |
+	   th("Rate"),
+	   th("Entries")]) |
 	lists:map(fun(IndexTable) -> index_tables_table(IndexTable) end,
 		  IndexTables)])].
 
 index_tables_table(IndexTable) ->
-    #index_table{name=Name,size=Size,limit=Limit,used=Used,rate=Rate} = 
-	IndexTable,
+    #index_table{name=Name,size=Size,limit=Limit,used=Used,
+		 rate=Rate,entries=Entries} = IndexTable,
     tr(
       [td(Name),
        td("ALIGN=right",Size),
        td("ALIGN=right",Limit),
        td("ALIGN=right",Used),
-       td("ALIGN=right",Rate)]).
+       td("ALIGN=right",Rate),
+       td("ALIGN=right",Entries)]).
 
 %%%-----------------------------------------------------------------
 %%% Internal library
+start_html_page(Title) ->
+    [only_http_header(),
+     start_html(),
+     only_html_header(Title),
+     start_html_body()].
+
+stop_html_page() ->
+    [stop_html_body(),
+     stop_html()].
+
+only_http_header() ->
+    ["Pragma:no-cache\r\n",
+     "Content-type: text/html\r\n\r\n"].
+
+only_html_header(Title) -> 
+    only_html_header(Title,"").
+only_html_header(Title,JavaScript) ->    
+    ["<HEAD>\n",
+     "<TITLE>", Title,  "</TITLE>\n",
+     JavaScript,
+     "</HEAD>\n"].
+
+start_html() ->
+    "<HTML>\n".
+stop_html() ->
+    "</HTML>".
+start_html_body() ->
+    "<BODY BGCOLOR=\"#FFFFFF\">\n".
+stop_html_body() ->
+    "</BODY>\n".
+
 header(Body) ->
     header("","",Body).
 header(Title,Body) ->
     header(Title,"",Body).
 header(Title,JavaScript,Body) ->
-    ["Pragma:no-cache\r\n",
-     "Content-type: text/html\r\n\r\n",
+    [only_http_header(),
      html_header(Title,JavaScript,Body)].
 
 html_header(Title,JavaScript,Body) ->    
-    ["<HTML>\n",
-     "<HEAD>\n",
-     "<TITLE>", Title,  "</TITLE>\n",
-     JavaScript,
-     "</HEAD>\n",
+    [start_html(),
+     only_html_header(Title,JavaScript),
      Body,
-     "</HTML>"].
+     stop_html()].
 
 body(Text) ->
-    ["<BODY BGCOLOR=\"#FFFFFF\">\n",
+    [start_html_body(),
      Text,
-     "<\BODY>\n"].
+     stop_html_body()].
 
 frameset(Args,Frames) ->
     ["<FRAMESET ",Args,">\n", Frames, "\n</FRAMESET>\n"].
 frame(Args) ->
     ["<FRAME ",Args, ">\n"].
 
+start_visible_table() ->
+    start_table("BORDER=\"4\" CELLPADDING=\"4\"").
+start_visible_table(ColTitles) ->
+    [start_visible_table(),
+     tr([th(ColTitle) || ColTitle <- ColTitles])].
+
+start_table(Args) ->
+    ["<TABLE ", Args, ">\n"].
+stop_table() ->
+    "</TABLE>\n".
+
 table(Args,Text) ->
-    ["<TABLE ", Args, ">\n", Text, "\n</TABLE>\n"].
+    [start_table(Args), Text, stop_table()].
 tr(Text) ->
     ["<TR>\n", Text, "\n</TR>\n"].
 tr(Args,Text) ->
@@ -1183,8 +988,12 @@ b(Text) ->
     ["<B>",Text,"</B>"].
 em(Text) ->    
     ["<EM>",Text,"</EM>\n"].
+start_pre() ->
+    "<PRE>".
+stop_pre() ->
+    "</PRE>".
 pre(Text) ->
-    ["<PRE>",Text,"</PRE>"].
+    [start_pre(),Text,stop_pre()].
 href(Link,Text) ->
     ["<A HREF=\"",Link,"\">",Text,"</A>"].
 href(Args,Link,Text) ->
@@ -1199,8 +1008,6 @@ input(Args) ->
     ["<INPUT ", Args, ">\n"].
 h1(Text) ->
     ["<H1>",Text,"</H1>\n"].
-h2(Text) ->
-    ["<H2>",Text,"</H2>\n"].
 font(Args,Text) ->
     ["<FONT ",Args,">\n",Text,"\n</FONT>\n"].
 p(Text) ->    
@@ -1223,7 +1030,7 @@ href_proc_port([$#,$F,$u,$n,$<|T],Acc) ->
 href_proc_port([$#,$P,$o,$r,$t,$<|T],Acc) ->
     {[$#|Port]=HashPort,Rest} = to_gt(T,[$;,$t,$l,$&,$t,$r,$o,$P,$#]),
     href_proc_port(Rest,[href("TARGET=\"main\"",
-			      ["./ports?port=",Port],HashPort)|Acc]);
+			      ["./port?port=",Port],HashPort)|Acc]);
 href_proc_port([$<,$<|T],Acc) ->
     %% No links to binaries
     href_proc_port(T,[$;,$t,$l,$&,$;,$t,$l,$&|Acc]);
@@ -1243,7 +1050,7 @@ href_proc_port([$",$#,$C,$D,$V,$P,$o,$r,$t,$<|T],Acc) ->
     %% Port written by crashdump_viewer:parse_term(...)
     {[$#|Port]=HashPort,[$"|Rest]} = to_gt(T,[$;,$t,$l,$&,$t,$r,$o,$P,$#]),
     href_proc_port(Rest,[href("TARGET=\"main\"",
-			      ["./ports?port=",Port],HashPort)|Acc]);
+			      ["./port?port=",Port],HashPort)|Acc]);
 href_proc_port([$",$#,$C,$D,$V,$P,$i,$d,$<|T],Acc) ->
     %% Pid written by crashdump_viewer:parse_term(...)
     {Pid,[$"|Rest]} = to_gt(T,[$;,$t,$l,$&]),
@@ -1422,7 +1229,7 @@ replace_insrt("'trsni$'"++Rest,[H|T],Acc) -> % the list is reversed here!
 	    "&lt;" ++ _Pid -> 
 		href("TARGET=\"main\"",["./proc_details?pid=",H],H);
 	    "#Port&lt;" ++ Port -> 
-		href("TARGET=\"main\"",["./ports?port=","Port&lt;"++Port],H);
+		href("TARGET=\"main\"",["./port?port=","Port&lt;"++Port],H);
 	    "#" ++ _other -> 
 		H
 	end,
@@ -1431,3 +1238,173 @@ replace_insrt([H|T],Insrt,Acc) ->
     replace_insrt(T,Insrt,[H|Acc]);
 replace_insrt([],[],Acc) ->
     Acc.
+
+%%%-----------------------------------------------------------------
+%%% Create a page with one table by delivering chunk by chunk to
+%%% inets. crashdump_viewer first calls chunk_page/5 once, then
+%%% chunk/3 multiple times until all data is delivered.
+chunk_page(processes,SessionId,TW,{Sorted,SharedHeap},FirstChunk) ->
+    Columns = procs_summary_table_head(Sorted,SharedHeap),
+    chunk_page(SessionId, "Process Information", TW, FirstChunk,
+	       "processes", Columns, fun procs_summary_table/1);
+chunk_page(ports,SessionId,TW,_,FirstChunk) ->
+    chunk_page(SessionId, "Port Information", TW, FirstChunk,
+	       "ports", port_table_head(), fun ports_table/1);
+chunk_page(ets_tables,SessionId,TW,Heading,FirstChunk) ->
+    Columns = ["Owner",
+	       "Slot",
+	       "Id",
+	       "Name",
+	       "Type",
+	       "Buckets",
+	       "Objects",
+	       "Memory (bytes)"],
+    chunk_page(SessionId, Heading, TW, FirstChunk,
+	       "ets_tables", Columns, fun ets_tables_table/1);
+chunk_page(timers,SessionId,TW,Heading,FirstChunk) ->
+    chunk_page(SessionId, Heading, TW, FirstChunk, "timers",
+	       ["Owner","Message","Time left"], fun timers_table/1);
+chunk_page(loaded_mods,SessionId,TW,{CC,OC},FirstChunk) ->
+    TotalsInfo = p([b("Current code: "),CC," bytes",br(),
+		    b("Old code: "),OC," bytes"]),
+    Columns = ["Module","Current size (bytes)","Old size (bytes)"],
+    chunk_page(SessionId, "Loaded Modules Information", TW, FirstChunk,
+	       "loaded_modules", TotalsInfo,Columns, fun loaded_mods_table/1);
+chunk_page(funs,SessionId, TW, _, FirstChunk) ->
+    Columns = ["Module",
+	       "Uniq",
+	       "Index",
+	       "Address",
+	       "Native_address",
+	       "Refc"],
+    chunk_page(SessionId, "Fun Information", TW, FirstChunk,
+	       "funs", Columns, fun funs_table/1).
+
+chunk_page(SessionId,Heading,TW,FirstChunk,Type,TableColumns,TableFun) ->
+    chunk_page(SessionId,Heading,TW,FirstChunk,Type,[],TableColumns,TableFun).
+chunk_page(SessionId,Heading,TW,done,Type,_TotalsInfo,_TableColumns,_TableFun) ->
+    no_info_found(SessionId,Heading,TW,Type);
+chunk_page(SessionId,Heading,TW,FirstChunk,Type,TotalsInfo,TableColumns,TableFun) ->
+    deliver_first(SessionId,[start_html_page(Heading),
+			     heading(Heading,Type),
+			     warn(TW),
+			     TotalsInfo,
+			     start_visible_table(TableColumns)]),
+    chunk(SessionId,FirstChunk,TableFun),
+    TableFun.
+
+no_info_found(SessionId, Heading, TW, Type) ->
+    Info = ["No ", Type, " were found\n"],
+    deliver_first(SessionId,[start_html_page(Heading),
+			     h1(Heading),
+			     warn(TW),
+			     Info,
+			     stop_html_page()]).
+
+chunk(SessionId, done, _TableFun) ->
+    deliver(SessionId,[stop_table(),stop_html_page()]);
+chunk(SessionId, Items, TableFun) ->
+    deliver(SessionId, [lists:map(TableFun, Items),
+			stop_table(), %! Will produce an empty table at the end
+			start_visible_table()]). % of the page :(
+
+%%%-----------------------------------------------------------------
+%%% Deliver part of a page to inets
+%%% The first part, which includes the HTTP header, must always be
+%%% delivered as a string (i.e. no binaries). The rest of the page is
+%%% better delivered as binaries in order to avoid data copying.
+deliver_first(SessionId,String) ->
+    mod_esi:deliver(SessionId,String).
+deliver(SessionId,IoList) ->
+    mod_esi:deliver(SessionId,[list_to_binary(IoList)]).
+
+
+%%%-----------------------------------------------------------------
+%%% Page specific stuff for chunk pages
+procs_summary_table_head(Sorted,SharedHeap) ->
+    MemHeading =
+	if SharedHeap ->
+		"Stack";
+	   true ->
+		"Stack+heap"
+	end,
+    [procs_summary_table_head("pid","Pid",Sorted),
+     procs_summary_table_head("name_func","Name/Spawned as",Sorted),
+     procs_summary_table_head("state","State",Sorted),
+     procs_summary_table_head("reds","Reductions",Sorted),
+     procs_summary_table_head("mem",MemHeading,Sorted),
+     procs_summary_table_head("msg_q_len","MsgQ Length",Sorted)].
+
+procs_summary_table_head(_,Text,no_sort) ->
+    Text;
+procs_summary_table_head(Sorted,Text,Sorted) ->
+    %% Mark the sorted column (bigger and italic)
+    font("SIZE=\"+1\"",em(href("./sort_procs?sort="++Sorted,Text)));
+procs_summary_table_head(SortOn,Text,_Sorted) ->
+    href("./sort_procs?sort="++SortOn,Text).
+
+procs_summary_table(Proc) ->
+    #proc{pid=Pid,name=Name,state=State,
+	  reds=Reds,stack_heap=Mem0,msg_q_len=MsgQLen}=Proc,
+    Mem = case Mem0 of
+	      -1 -> "unknown";
+	      _ -> integer_to_list(Mem0)
+	  end,
+    tr(
+      [td(href(["./proc_details?pid=",Pid],Pid)),
+       td(Name),
+       td(State),
+       td("ALIGN=right",integer_to_list(Reds)),
+       td("ALIGN=right",Mem),
+       td("ALIGN=right",integer_to_list(MsgQLen))]).
+
+port_table_head() ->
+    ["Id","Slot","Connected","Links","Name","Monitors","Controls"].
+
+ports_table(Port) ->
+    #port{id=Id,slot=Slot,connected=Connected,links=Links,name=Name,
+	  monitors=Monitors,controls=Controls}=Port,
+    tr(
+      [td(Id),
+       td("ALIGN=right",Slot),
+       td(href_proc_port(Connected)),
+       td(href_proc_port(Links)),
+       td(Name),
+       td(href_proc_port(Monitors)),
+       td(Controls)]).
+
+ets_tables_table(EtsTable) ->
+    #ets_table{pid=Pid,slot=Slot,id=Id,name=Name,type=Type,
+	       buckets=Buckets,size=Size,memory=Memory} = EtsTable,
+    tr(
+      [td(href_proc_port(Pid)),
+       td(Slot),
+       td(Id),
+       td(Name),
+       td(Type),
+       td("ALIGN=right",Buckets),
+       td("ALIGN=right",Size),
+       td("ALIGN=right",Memory)]).
+
+timers_table(Timer) ->
+    #timer{pid=Pid,msg=Msg,time=Time}=Timer,
+    tr(
+      [td(href_proc_port(Pid)),
+       td(Msg),
+       td("ALIGN=right",Time)]).
+
+loaded_mods_table(#loaded_mod{mod=Mod,current_size=CS,old_size=OS}) ->
+    tr([td(href(["loaded_mod_details?mod=",Mod],Mod)),
+	td("ALIGN=right",CS),
+	td("ALIGN=right",OS)]).
+
+funs_table(Fu) ->
+    #fu{module=Module,uniq=Uniq,index=Index,address=Address,
+	native_address=NativeAddress,refc=Refc}=Fu,
+    tr(
+      [td(Module),
+       td("ALIGN=right",Uniq),
+       td("ALIGN=right",Index),
+       td(Address),
+       td(NativeAddress),
+       td("ALIGN=right",Refc)]).
diff --git a/lib/observer/test/Makefile b/lib/observer/test/Makefile
index 6f1430b00a..6073e6ea00 100644
--- a/lib/observer/test/Makefile
+++ b/lib/observer/test/Makefile
@@ -53,7 +53,7 @@ EBIN = .
 
 make_emakefile:
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) \
-		$(MODULES) >> $(EMAKEFILE)
+		$(MODULES) > $(EMAKEFILE)
 
 tests debug opt: make_emakefile
 	cd $(ERL_TOP)/lib/test_server/src && \
@@ -80,7 +80,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) observer.spec observer.dynspec $(EMAKEFILE) \
+	$(INSTALL_DATA) observer.spec $(EMAKEFILE) \
 		$(COVERFILE) $(ERL_FILES) \
 		$(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index fcf383dc2e..fdc4a2f1ff 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -20,12 +20,13 @@
 -module(crashdump_viewer_SUITE).
 
 %% Test functions
--export([all/1,translate/1,start/1,fini/1,load_file/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 translate/1,start/1,fini/1,load_file/1,
 	 non_existing/1,not_a_crashdump/1,old_crashdump/1]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 -include_lib("kernel/include/file.hrl").
 
@@ -46,16 +47,28 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    [translate,{conf,start,[load_file,non_existing,not_a_crashdump,
-			    old_crashdump],fini}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [translate, load_file, non_existing, not_a_crashdump,
+     old_crashdump].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_suite(doc) ->
     ["Create a lot of crashdumps which can be used in the testcases below"];
 init_per_suite(Config) when is_list(Config) ->
     Dog = ?t:timetrap(?default_timeout),
     application:start(inets), % will be using the http client later
-    http:set_options([{ipv6,disabled}]),
+    httpc:set_options([{ipfamily,inet6fb4}]),
     DataDir = ?config(data_dir,Config),
     Rels = [R || R <- [r12b,r13b], ?t:is_release_available(R)] ++ [current],
     io:format("Creating crash dumps for the following releases: ~p", [Rels]),
@@ -99,7 +112,7 @@ start(Config) when is_list(Config) ->
     undefined = whereis(crashdump_viewer_server),
     undefined = whereis(web_tool),
     Url = cdv_url(Port,"start_page"),
-    {error,_} = http:request(get,{Url,[]},[],[]),
+    {error,_} = httpc:request(Url),
 %    exit(whereis(httpc_manager),kill),
     ?t:timetrap_cancel(AngryDog),
     ok.
@@ -233,7 +246,7 @@ cdv_url(Port,Link) ->
     "http://localhost:" ++ Port ++ "/cdv_erl/crashdump_viewer/" ++ Link.
 
 request_sync(Method,HTTPReqCont) ->
-    case http:request(Method,
+    case httpc:request(Method,
 		      HTTPReqCont,
 		      [{timeout,30000}],
 		      [{full_result, false}]) of
@@ -241,13 +254,13 @@ request_sync(Method,HTTPReqCont) ->
 	    Html;
 	{ok,{Code,Html}} ->
 	    io:format("~s\n", [Html]),
-	    io:format("Received ~w from http:request(...) with\nMethod=~w\n"
+	    io:format("Received ~w from httpc:request(...) with\nMethod=~w\n"
 		      "HTTPReqCont=~p\n",
 		      [Code,Method,HTTPReqCont]),
 	    ?t:fail();
 	Other ->
 	    io:format(
-	      "Received ~w from http:request(...) with\nMethod=~w\n"
+	      "Received ~w from httpc:request(...) with\nMethod=~w\n"
 	      "HTTPReqCont=~p\n",
 	      [Other,Method,HTTPReqCont]),
 	    ?t:fail()
@@ -401,16 +414,17 @@ special(Port,File) ->
 		_ ->
 		    ok
 	    end;
-	".250atoms" ->
-	    Html1 = contents(Port,"atoms"),
-	    NextLink1 = next_link(Html1),
-	    "Atoms" = title(Html1),
-	    Html2 = contents(Port,NextLink1),
-	    NextLink2 = next_link(Html2),
-	    "Atoms" = title(Html2),
-	    Html3 = contents(Port,NextLink2),
-	    "" = next_link(Html3),
-	    "Atoms" = title(Html3);
+	%%! No longer needed - all atoms are shown on one page!!
+	%% ".250atoms" ->
+	%%     Html1 = contents(Port,"atoms"),
+	%%     NextLink1 = next_link(Html1),
+	%%     "Atoms" = title(Html1),
+	%%     Html2 = contents(Port,NextLink1),
+	%%     NextLink2 = next_link(Html2),
+	%%     "Atoms" = title(Html2),
+	%%     Html3 = contents(Port,NextLink2),
+	%%     "" = next_link(Html3),
+	%%     "Atoms" = title(Html3);
 	_ ->
 	    ok
     end,
@@ -483,27 +497,27 @@ expand_binary_link(Html) ->
     end.
 
 
-next_link(Html) ->
-    case Html of
-	"<A HREF=\"./next?pos=" ++ Rest ->
-	    "next?pos=" ++ string:sub_word(Rest,1,$");
-	[_H|T] ->
-	    next_link(T);
-	[] ->
-	    []
-    end.
+%% next_link(Html) ->
+%%     case Html of
+%% 	"<A HREF=\"./next?pos=" ++ Rest ->
+%% 	    "next?pos=" ++ string:sub_word(Rest,1,$");
+%% 	[_H|T] ->
+%% 	    next_link(T);
+%% 	[] ->
+%% 	    []
+%%     end.
 
 
 
 toggle_menu(Port) ->
-    Html = contents(Port,"toggle?index=10"),
+    Html = contents(Port,"toggle?index=4"),
     check_toggle(Html).
 
 check_toggle(Html) ->
     case Html of
-	"<A HREF=\"./toggle?index=10\"><IMG SRC=\"/crashdump_viewer/collapsd.gif\"" ++ _ ->
+	"<A HREF=\"./toggle?index=4\"><IMG SRC=\"/crashdump_viewer/collapsd.gif\"" ++ _ ->
 	    collapsed;
-	"<A HREF=\"./toggle?index=10\"><IMG SRC=\"/crashdump_viewer/exploded.gif\"" ++ _ ->
+	"<A HREF=\"./toggle?index=4\"><IMG SRC=\"/crashdump_viewer/exploded.gif\"" ++ _ ->
 	    exploded;
 	[_H|T] ->
 	    check_toggle(T)
@@ -530,10 +544,10 @@ expand_link(Html) ->
 
 
 port_details(Port) ->
-    Port1 = contents(Port,"ports?port=Port<0.1>"),
+    Port1 = contents(Port,"port?port=Port<0.1>"),
     "#Port<0.1>" = title(Port1),
     
-    Port0 = contents(Port,"ports?port=Port<0.0>"),
+    Port0 = contents(Port,"port?port=Port<0.0>"),
     "Could not find port: #Port<0.0>" = title(Port0).
 
 is_truncated(File) ->
@@ -655,7 +669,7 @@ rename(From,To) ->
     end.
 
 check_complete(File) ->
-    check_complete1(File,5).
+    check_complete1(File,10).
 
 check_complete1(_File,0) ->
     {error,enoent};
diff --git a/lib/observer/test/etop_SUITE.erl b/lib/observer/test/etop_SUITE.erl
index 54f4a78e69..ab2a6f5d18 100644
--- a/lib/observer/test/etop_SUITE.erl
+++ b/lib/observer/test/etop_SUITE.erl
@@ -20,22 +20,42 @@
 -module(etop_SUITE).
 
 %% Test functions
--export([all/1,text/1,text_tracing_off/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,text/1,text_tracing_off/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(default_timeout, ?t:minutes(1)).
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> [text,text_tracing_off].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [text, text_tracing_off].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 text(suite) ->
     [];
diff --git a/lib/observer/test/observer.cover b/lib/observer/test/observer.cover
index 47770ba839..fafb718840 100644
--- a/lib/observer/test/observer.cover
+++ b/lib/observer/test/observer.cover
@@ -1,2 +1,4 @@
-{exclude,[multitrace]}.
-{include,[observer_backend]}.
+{incl_app,observer,details}.
+
+{excl_mods,observer,[multitrace]}.
+{incl_mods,observer,[observer_backend]}.
diff --git a/lib/observer/test/observer.spec b/lib/observer/test/observer.spec
index 801eb80607..3b4b5da28c 100644
--- a/lib/observer/test/observer.spec
+++ b/lib/observer/test/observer.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../observer_test"}}.
-
+{suites,"../observer_test",all}.
diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl
index 3e9522c7a4..46d4612706 100644
--- a/lib/observer/test/observer_SUITE.erl
+++ b/lib/observer/test/observer_SUITE.erl
@@ -18,10 +18,11 @@
 %%
 
 -module(observer_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases
@@ -39,9 +40,27 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [app_file].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 app_file(suite) ->
     [];
 app_file(doc) ->
diff --git a/lib/observer/test/ttb_SUITE.erl b/lib/observer/test/ttb_SUITE.erl
index 6da5e36b29..14bd1e9c33 100644
--- a/lib/observer/test/ttb_SUITE.erl
+++ b/lib/observer/test/ttb_SUITE.erl
@@ -21,14 +21,16 @@
 
 -compile(export_all).
 %% Test functions
--export([all/1,file/1,file_no_pi/1,file_fetch/1,wrap/1,wrap_merge/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 file/1,file_no_pi/1,file_fetch/1,wrap/1,wrap_merge/1,
 	 wrap_merge_fetch_format/1,write_config1/1,write_config2/1,
 	 write_config3/1,history/1,write_trace_info/1,seq_trace/1,
 	 diskless/1,otp_4967_1/1,otp_4967_2/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 -export([foo/0]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(default_timeout, ?t:minutes(1)).
 
@@ -36,15 +38,34 @@ init_per_testcase(_Case, Config) ->
     ttb:stop(),
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> [file,file_no_pi,file_fetch,wrap,wrap_merge,
-	       wrap_merge_fetch_format,write_config1,write_config2,
-	       write_config3,history,write_trace_info,seq_trace,diskless,
-	       otp_4967_1,otp_4967_2].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [file, file_no_pi, file_fetch, wrap, wrap_merge,
+     wrap_merge_fetch_format, write_config1, write_config2,
+     write_config3, history, write_trace_info, seq_trace,
+     diskless, otp_4967_1, otp_4967_2].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 file(suite) ->
     [];
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index ff06fb992d..1b72d30eab 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 0.9.8.2
+OBSERVER_VSN = 0.9.8.4
diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c
index c9627e9d05..077d78bfe5 100644
--- a/lib/odbc/c_src/odbcserver.c
+++ b/lib/odbc/c_src/odbcserver.c
@@ -108,8 +108,8 @@
 
 #if defined WIN32
 #include <winsock2.h> 
-/*  #include <ws2tcpip.h >  When we can support a newer c-compiler*/
 #include <windows.h> 
+#include <ws2tcpip.h >
 #include <fcntl.h>
 #include <sql.h>
 #include <sqlext.h>
@@ -1599,7 +1599,7 @@ static Boolean decode_params(db_state *state, byte *buffer, int *index, param_ar
 	    break;
     case SQL_C_TYPE_TIMESTAMP:
 	    ts = (TIMESTAMP_STRUCT*) param->values.string;
-	    ei_decode_tuple_header(buffer, index, &val);
+	    ei_decode_tuple_header(buffer, index, &size);
 	    ei_decode_long(buffer, index, &val);
 	    ts[j].year = (SQLUSMALLINT)val;
 	    ei_decode_long(buffer, index, &val);
@@ -1727,74 +1727,48 @@ static byte * receive_erlang_port_msg(void)
 }
  
 /* ------------- Socket communication functions --------------------------*/
-#define USE_IPV4
-#ifdef UNIX
-#define SOCKET int   
-#endif
 
-#if defined WIN32 || defined USE_IPV4
-/* Currently only an old windows compiler is supported so we do not have ipv6
-  capabilities */
+#if defined(WIN32)
 static SOCKET connect_to_erlang(const char *port)
-{
-    SOCKET sock;
-    struct sockaddr_in sin;
-    
-    sock = socket(AF_INET, SOCK_STREAM, 0);
-    
-    memset(&sin, 0, sizeof(sin));
-    sin.sin_port = htons ((unsigned short)atoi(port));
-    sin.sin_family = AF_INET;
-    sin.sin_addr.s_addr = inet_addr("127.0.0.1");
-    
-    if (connect(sock, (struct sockaddr*)&sin, sizeof(sin)) != 0) {
-        close_socket(sock);
-        DO_EXIT(EXIT_SOCKET_CONNECT);
-    }
-    return sock;
-}
 #elif defined(UNIX)
 static int connect_to_erlang(const char *port)
+#endif
 {
-    int sock;
-    
-    struct addrinfo hints;
-    struct addrinfo *erlang_ai, *first;
-    
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = PF_UNSPEC; /* PF_INET or PF_INET6 */
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_protocol = IPPROTO_TCP;
-    
-    if (getaddrinfo("localhost", port, &hints, &first) != 0) {
-  	DO_EXIT(EXIT_FAILURE);
-    }
+#if defined(WIN32)
+	SOCKET sock;
+#elif defined(UNIX)
+	int sock;
+#endif
+	struct sockaddr_in sin;
+
+#if defined(HAVE_STRUCT_SOCKADDR_IN6_SIN6_ADDR) && defined(AF_INET6)
+	struct sockaddr_in6 sin6;
+
+	sock = socket(AF_INET6, SOCK_STREAM, 0);
+
+	memset(&sin6, 0, sizeof(sin6));
+	sin6.sin6_port = htons ((unsigned short)atoi(port));
+	sin6.sin6_family = AF_INET6;
+	sin6.sin6_addr = in6addr_loopback;
     
-    for (erlang_ai = first; erlang_ai; erlang_ai = erlang_ai->ai_next) {
+	if (connect(sock, (struct sockaddr*)&sin6, sizeof(sin6)) == 0) {
+		return sock;
+	}
+	close_socket(sock);
+#endif
+	sock = socket(AF_INET, SOCK_STREAM, 0);
+
+	memset(&sin, 0, sizeof(sin));
+	sin.sin_port = htons ((unsigned short)atoi(port));
+	sin.sin_family = AF_INET;
+	sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
 	
-	sock = socket(erlang_ai->ai_family, erlang_ai->ai_socktype,
-		      erlang_ai->ai_protocol);
-	if (sock < 0)
-	    continue;
-	if (connect(sock,  (struct sockaddr*)erlang_ai->ai_addr,
-		    erlang_ai->ai_addrlen) < 0) {
-	    close(sock); 
-	    sock = -1;
-	    continue;
-	} else {
-	    break;
+	if (connect(sock, (struct sockaddr*)&sin, sizeof(sin)) != 0) {
+		close_socket(sock);
+		DO_EXIT(EXIT_SOCKET_CONNECT);
 	}
-    }
-    freeaddrinfo(first); 
-    
-    if (sock < 0){
-	close_socket(sock); 
-	DO_EXIT(EXIT_SOCKET_CONNECT); 
-    }
-    
-    return sock;
+	return sock;
 }
-#endif
 
 #ifdef WIN32
 static void close_socket(SOCKET socket)
@@ -2177,9 +2151,9 @@ static void init_param_column(param_array *params, byte *buffer, int *index,
       params->type.sql = SQL_TYPE_TIMESTAMP;
       params->type.len = sizeof(TIMESTAMP_STRUCT);
       params->type.c = SQL_C_TYPE_TIMESTAMP;
-      params->type.col_size = (SQLUINTEGER)19;//;sizeof(TIMESTAMP_STRUCT);
+      params->type.col_size = (SQLUINTEGER)COL_SQL_TIMESTAMP;
       params->values.string =
-        (TIMESTAMP_STRUCT *)safe_malloc(num_param_values * params->type.len);      
+        (byte *)safe_malloc(num_param_values * params->type.len);
       break;
     case USER_FLOAT:
 	params->type.sql = SQL_FLOAT;
diff --git a/lib/odbc/c_src/odbcserver.h b/lib/odbc/c_src/odbcserver.h
index e6d8df1f58..3e2b22ab7d 100644
--- a/lib/odbc/c_src/odbcserver.h
+++ b/lib/odbc/c_src/odbcserver.h
@@ -98,6 +98,7 @@
 #define COL_SQL_REAL 7
 #define COL_SQL_DOUBLE 15
 #define COL_SQL_TINYINT 4
+#define COL_SQL_TIMESTAMP 19
 
 /* Types of parameters given to param_query*/
 #define USER_SMALL_INT 1
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in
index 94e8a214d4..2369e16813 100644
--- a/lib/odbc/configure.in
+++ b/lib/odbc/configure.in
@@ -118,11 +118,18 @@ AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h netdb.h stdlib.h string.h sys/socket.h])
+AC_CHECK_HEADERS([fcntl.h netdb.h stdlib.h string.h sys/socket.h winsock2.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
+AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_addr], [], [],
+			 [#if HAVE_WINSOCK2_H
+			  #include <winsock2.h>
+			  #include <ws2tcpip.h>
+			  #else
+			  #include <netinet/in.h>
+			  #endif])
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS([memset socket])
diff --git a/lib/odbc/doc/src/databases.xml b/lib/odbc/doc/src/databases.xml
index 9776736909..a6ba0e5245 100644
--- a/lib/odbc/doc/src/databases.xml
+++ b/lib/odbc/doc/src/databases.xml
@@ -258,7 +258,7 @@ when p >= 16 </cell>
         that contains more than one SQL query. For example, the
         following SQLServer-specific statement creates a procedure that
         returns a result set containing information about employees
-        that work at the department and and a result set listing the
+        that work at the department and a result set listing the
         customers of that department. </p>
       <code type="none">
  CREATE PROCEDURE DepartmentInfo (@DepartmentID INT) AS
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index 09d78c3248..7dece7c584 100644
--- a/lib/odbc/doc/src/notes.xml
+++ b/lib/odbc/doc/src/notes.xml
@@ -31,7 +31,31 @@
   <p>This document describes the changes made to the odbc application.
   </p>
 
-  <section><title>ODBC 2.10.8</title>
+  <section><title>ODBC 2.10.9</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Ipv6 is now supported on Windows as well as on UNIX for
+	    internal socket communication. (ODBC uses sockets instead
+	    of the "Erlang port pipes" as some ODBC-drivers are known
+	    to mess with stdin/stdout.) </p>
+          <p>
+	    Loopback address constants are used when connecting the
+	    c-side to the erlang-side over local socket API avoiding
+	    getaddrinfo problems, and the {ip, loopback} option is
+	    added as a listen option on the erlang-side. Also cleaned
+	    up the TIME_STAMP contribution.</p>
+          <p>
+	    Own Id: OTP-8917</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ODBC 2.10.8</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/odbc/src/odbc.appup.src b/lib/odbc/src/odbc.appup.src
index e95e542ff5..f1a370d925 100644
--- a/lib/odbc/src/odbc.appup.src
+++ b/lib/odbc/src/odbc.appup.src
@@ -1 +1,8 @@
-{"%VSN%", [],[]}
+%% -*- erlang -*-
+{"%VSN%",
+ [
+  {"2.10.8", [{restart_application, ssl}]}
+ ],
+ [
+  {"2.10.8", [{restart_application, ssl}]}
+ ]}.
diff --git a/lib/odbc/src/odbc.erl b/lib/odbc/src/odbc.erl
index eb27a471ec..83d9f33102 100644
--- a/lib/odbc/src/odbc.erl
+++ b/lib/odbc/src/odbc.erl
@@ -441,10 +441,12 @@ init(Args) ->
 
     {ok, ListenSocketSup} =
 	gen_tcp:listen(0, [Inet, binary, {packet, ?LENGTH_INDICATOR_SIZE},
-			   {active, false}, {nodelay, true}]),
+			   {active, false}, {nodelay, true},
+			   {ip, loopback}]),
     {ok, ListenSocketOdbc} =
 	gen_tcp:listen(0, [Inet, binary, {packet, ?LENGTH_INDICATOR_SIZE},
-			   {active, false}, {nodelay, true}]),
+			   {active, false}, {nodelay, true},
+			   {ip, loopback}]),
 
     %% Start the port program (a c program) that utilizes the odbc driver 
     case os:find_executable(?SERVERPROG, ?SERVERDIR) of
diff --git a/lib/odbc/test/Makefile b/lib/odbc/test/Makefile
index 935ecbf5a7..ab3cdea543 100644
--- a/lib/odbc/test/Makefile
+++ b/lib/odbc/test/Makefile
@@ -45,8 +45,8 @@ HRL_FILES= odbc_test.hrl\
 TARGET_FILES= \
 	$(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
-SPEC_FILES = odbc.spec odbc.dynspec \
-	odbc.spec.win 
+SPEC_FILES = odbc.spec
+COVER_FILE = odbc.cover
 
 EMAKEFILE  = Emakefile
 MAKE_EMAKE = $(wildcard $(ERL_TOP)/make/make_emakefile)
@@ -101,7 +101,7 @@ release_spec: opt
 
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SPEC_FILES) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
 
 
 release_docs_spec:
diff --git a/lib/odbc/test/odbc.cover b/lib/odbc/test/odbc.cover
new file mode 100644
index 0000000000..1acca281fb
--- /dev/null
+++ b/lib/odbc/test/odbc.cover
@@ -0,0 +1,2 @@
+{incl_app,odbc,details}.
+
diff --git a/lib/odbc/test/odbc.spec b/lib/odbc/test/odbc.spec
index acba9f8d98..edaf821c91 100644
--- a/lib/odbc/test/odbc.spec
+++ b/lib/odbc/test/odbc.spec
@@ -1,9 +1,25 @@
-{topcase, {dir, "../odbc_test"}}.
-{skip, {odbc_data_type_SUITE, varchar_upper_limit, "Known bug in database"}}.
-{skip, {odbc_data_type_SUITE, text_upper_limit, "Consumes too much resources"}}.
-{skip, {odbc_data_type_SUITE, bit_true , "Not supported by driver"}}.
-{skip, {odbc_data_type_SUITE, bit_false, "Not supported by driver"}}.
-{skip, {odbc_query_SUITE, multiple_select_result_sets,"Not supported by driver"}}.
-{skip, {odbc_query_SUITE, multiple_mix_result_sets, "Not supported by driver"}}.
-{skip, {odbc_query_SUITE, multiple_result_sets_error, "Not supported by driver"}}.
-{skip, {odbc_query_SUITE, param_insert_tiny_int, "Not supported by driver"}}.
\ No newline at end of file
+{suites,"../odbc_test",all}.
+{skip_cases,"../odbc_test",odbc_data_type_SUITE,
+            [varchar_upper_limit],
+            "Known bug in database"}.
+{skip_cases,"../odbc_test",odbc_data_type_SUITE,
+            [text_upper_limit],
+            "Consumes too much resources"}.
+{skip_cases,"../odbc_test",odbc_data_type_SUITE,
+            [bit_true],
+            "Not supported by driver"}.
+{skip_cases,"../odbc_test",odbc_data_type_SUITE,
+            [bit_false],
+            "Not supported by driver"}.
+{skip_cases,"../odbc_test",odbc_query_SUITE,
+            [multiple_select_result_sets],
+            "Not supported by driver"}.
+{skip_cases,"../odbc_test",odbc_query_SUITE,
+            [multiple_mix_result_sets],
+            "Not supported by driver"}.
+{skip_cases,"../odbc_test",odbc_query_SUITE,
+            [multiple_result_sets_error],
+            "Not supported by driver"}.
+{skip_cases,"../odbc_test",odbc_query_SUITE,
+            [param_insert_tiny_int],
+            "Not supported by driver"}.
diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index 4d37a8f543..fd7693de3a 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -24,7 +24,7 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 -include("odbc_test.hrl").
 
@@ -40,20 +40,32 @@
 %% Description: Returns documentation/test cases in this test suite
 %%		or a skip tuple if the platform is not supported.  
 %%--------------------------------------------------------------------
-all(doc) ->
-    ["Tests the ability to connect and disconnet to/from the database"];
-all(suite) ->
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     case odbc_test_lib:odbc_check() of
-	ok -> all();
+	ok ->
+	    [not_exist_db, commit, rollback, not_explicit_commit,
+	     no_c_node, port_dies, control_process_dies,
+	     {group, client_dies}, connect_timeout, timeout,
+	     many_timeouts, timeout_reset, disconnect_on_timeout,
+	     connection_closed, disable_scrollable_cursors,
+	     return_rows_as_lists, api_missuse];
 	Other -> {skip, Other}
-    end.						  
+    end.
+
+groups() -> 
+    [{client_dies, [],
+      [client_dies_normal, client_dies_timeout,
+       client_dies_error]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all() -> 
-    [not_exist_db, commit, rollback, not_explicit_commit,
-    no_c_node, port_dies, control_process_dies, client_dies,
-    connect_timeout, timeout, many_timeouts, timeout_reset,
-    disconnect_on_timeout, connection_closed,
-    disable_scrollable_cursors, return_rows_as_lists, api_missuse].
 
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
@@ -66,7 +78,7 @@ all() ->
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
     application:start(odbc),  
-    case odbc:connect(?RDBMS:connection_string(), 
+    case catch odbc:connect(?RDBMS:connection_string(), 
 		      [{auto_commit, off}]) of
 	{ok, Ref} ->
 	    odbc:disconnect(Ref),
@@ -283,11 +295,6 @@ control_process_dies(_Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-client_dies(doc) ->
-    ["Test that the odbc process is terminated when the client process "
-     "dies"];
-client_dies(suite) -> 
-    [client_dies_normal, client_dies_timeout, client_dies_error].
 
 %%-------------------------------------------------------------------------
 client_dies_normal(doc) ->
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index 7d4a0ca15f..83bb821e2b 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -24,7 +24,7 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 -include("test_server_line.hrl").
 -include("odbc_test.hrl").
@@ -39,16 +39,48 @@
 %% Description: Returns documentation/test cases in this test suite
 %%		or a skip tuple if the platform is not supported.  
 %%--------------------------------------------------------------------
-all(doc) ->
-    ["Tests data types"];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     case odbc_test_lib:odbc_check() of
-	ok -> all();
-	Other -> {skip,Other}
-    end.						  
+	ok ->
+	    [{group, char}, {group, int}, {group, floats},
+	     {group, dec_and_num}, timestamp];
+	Other -> {skip, Other}
+    end.
 
-all() ->
-    [char, int, floats, dec_and_num, timestamp].
+groups() -> 
+    [{char, [],
+      [char_fixed_lower_limit, char_fixed_upper_limit,
+       char_fixed_padding, varchar_lower_limit,
+       varchar_upper_limit, varchar_no_padding,
+       text_lower_limit, text_upper_limit, unicode]},
+     {binary_char, [],
+      [binary_char_fixed_lower_limit,
+       binary_char_fixed_upper_limit,
+       binary_char_fixed_padding, binary_varchar_lower_limit,
+       binary_varchar_upper_limit, binary_varchar_no_padding,
+       binary_text_lower_limit, binary_text_upper_limit,
+       unicode]},
+     {int, [],
+      [tiny_int_lower_limit, tiny_int_upper_limit,
+       small_int_lower_limit, small_int_upper_limit,
+       int_lower_limit, int_upper_limit, big_int_lower_limit,
+       big_int_upper_limit, bit_false, bit_true]},
+     {floats, [],
+      [float_lower_limit, float_upper_limit, float_zero,
+       real_zero]},
+     {dec_and_num, [],
+      [dec_long, dec_double, dec_bignum, num_long, num_double,
+       num_bignum]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+					  
 
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
@@ -124,14 +156,6 @@ end_per_testcase(_TestCase, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-char(doc) ->
-    ["Tests char data types"]; 
-
-char(suite) ->
-    [char_fixed_lower_limit, char_fixed_upper_limit,
-     char_fixed_padding, varchar_lower_limit, varchar_upper_limit,
-     varchar_no_padding, text_lower_limit, text_upper_limit, unicode
-    ].
 
 char_fixed_lower_limit(doc) ->
     ["Tests fixed length char data type lower boundaries."];
@@ -424,14 +448,6 @@ text_upper_limit(Config) when is_list(Config) ->
 %%     ok.
 
 %%-------------------------------------------------------------------------
-binary_char(doc) ->
-    ["Tests char data types returned as erlang binaries"]; 
-
-binary_char(suite) ->
-    [binary_char_fixed_lower_limit, binary_char_fixed_upper_limit,
-     binary_char_fixed_padding, binary_varchar_lower_limit, binary_varchar_upper_limit,
-     binary_varchar_no_padding, binary_text_lower_limit, binary_text_upper_limit, unicode
-    ].
 
 binary_char_fixed_lower_limit(doc) ->
     ["Tests fixed length char data type lower boundaries."];
@@ -726,13 +742,6 @@ binary_text_upper_limit(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-int(doc) ->
-    ["Tests integer data types"]; 
-
-int(suite) ->
-    [tiny_int_lower_limit, tiny_int_upper_limit, small_int_lower_limit,
-     small_int_upper_limit, int_lower_limit, int_upper_limit,
-     big_int_lower_limit, big_int_upper_limit, bit_false, bit_true].
 
 %%-------------------------------------------------------------------------
 
@@ -1053,10 +1062,6 @@ bit_true(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-floats(doc) ->
-    ["Test the datatype float."];
-floats(suite) ->
-    [float_lower_limit, float_upper_limit, float_zero, real_zero].
 
 %%-------------------------------------------------------------------------
 float_lower_limit(doc) ->
@@ -1184,10 +1189,6 @@ real_zero(Config) when is_list(Config) ->
 	    ok
     end.
 %%-------------------------------------------------------------------------
-dec_and_num(doc) ->
-    ["Tests decimal and numeric datatypes."];
-dec_and_num(suite) ->
-    [dec_long, dec_double, dec_bignum, num_long, num_double, num_bignum].
 %%------------------------------------------------------------------------
 dec_long(doc) ->
     [""];
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index 12b39be3b7..5c8126ace6 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -24,7 +24,7 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 -include("odbc_test.hrl").
 
@@ -38,22 +38,47 @@
 %% Description: Returns documentation/test cases in this test suite
 %%		or a skip tuple if the platform is not supported.  
 %%--------------------------------------------------------------------
-all(doc) ->
-    ["Tests SQL queries"];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     case odbc_test_lib:odbc_check() of
-	ok -> all();
+	ok ->
+	    [sql_query, first, last, next, prev, select_count,
+	     select_next, select_relative, select_absolute,
+	     create_table_twice, delete_table_twice, duplicate_key,
+	     not_connection_owner, no_result_set, query_error,
+	     multiple_select_result_sets, multiple_mix_result_sets,
+	     multiple_result_sets_error,
+	     {group, parameterized_queries}, {group, describe_table},
+	     delete_nonexisting_row];
 	Other -> {skip, Other}
-    end.						  
+    end.
 
-all() ->
-    [sql_query, first, last, next, prev, select_count,select_next,
-     select_relative, select_absolute, create_table_twice,
-     delete_table_twice, duplicate_key, not_connection_owner,
-     no_result_set, query_error, multiple_select_result_sets,
-     multiple_mix_result_sets, multiple_result_sets_error,
-     parameterized_queries, describe_table,
-     delete_nonexisting_row].
+groups() -> 
+    [{parameterized_queries, [],
+      [{group, param_integers}, param_insert_decimal,
+       param_insert_numeric, {group, param_insert_string},
+       param_insert_float, param_insert_real,
+       param_insert_double, param_insert_mix, param_update,
+       param_delete, param_select]},
+     {param_integers, [],
+      [param_insert_tiny_int, param_insert_small_int,
+       param_insert_int, param_insert_integer]},
+     {param_insert_string, [],
+      [param_insert_char, param_insert_character,
+       param_insert_char_varying,
+       param_insert_character_varying]},
+     {describe_table, [],
+      [describe_integer, describe_string, describe_floating,
+       describe_dec_num, describe_no_such_table]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+					  
 
 
 %%--------------------------------------------------------------------
@@ -638,23 +663,8 @@ multiple_result_sets_error(Config) when is_list(Config) ->
     end.   
 
 %%-------------------------------------------------------------------------
-parameterized_queries(doc)->
-    ["Tests diffrent variants of parameterized queries."];
-parameterized_queries(suite) ->
-    %% Note timestamps are inserted with param_query in odbc_data_type_SUITE
-    %% so no need to test this again.
-    [param_integers,
-     param_insert_decimal, param_insert_numeric,
-     param_insert_string, 
-     param_insert_float, param_insert_real, param_insert_double,
-     param_insert_mix, param_update, param_delete, param_select].
 
 %%-------------------------------------------------------------------------
-param_integers(doc)->
-    ["Test insertion of integers by parameterized queries."];
-param_integers(suite) ->
-    [param_insert_tiny_int,
-     param_insert_small_int, param_insert_int, param_insert_integer].
 %%-------------------------------------------------------------------------
 param_insert_tiny_int(doc)->
     ["Test insertion of tiny ints by parameterized queries."];
@@ -891,11 +901,6 @@ param_insert_numeric(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-param_insert_string(doc) ->
-    ["Test insertion of strings by parameterized queries."];
-param_insert_string(suite) ->
-    [param_insert_char, param_insert_character, param_insert_char_varying,
-     param_insert_character_varying].
 
 %%-------------------------------------------------------------------------
 param_insert_char(doc)->
@@ -1320,11 +1325,6 @@ param_select(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-describe_table(doc) ->
-    ["Test describe_table/[2,3]"];
-describe_table(suite) ->
-    [describe_integer, describe_string, describe_floating, describe_dec_num,
-     describe_no_such_table].
 
 %%-------------------------------------------------------------------------
 describe_integer(doc) ->
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index 2cca8e4546..902e77d210 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -24,7 +24,7 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 -include("odbc_test.hrl").
 
@@ -98,17 +98,23 @@ end_per_testcase(_TestCase, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test start/stop of odbc"];
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all(suite) -> 
+all() -> 
     case odbc_test_lib:odbc_check() of
-	ok -> all();
+	ok -> [start];
 	Other -> {skip, Other}
-    end.						  
+    end.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all() ->
-    [start].
 
 
 %% Test cases starts here.
diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl
index 92e895eb87..012eb96e43 100644
--- a/lib/odbc/test/odbc_test_lib.erl
+++ b/lib/odbc/test/odbc_test_lib.erl
@@ -51,7 +51,7 @@ odbc_check() ->
 				    [Other]))
 	    end;
 	Other ->
-	    case test_server:os_type() of
+	    case os:type() of
 		{unix, linux} ->
 		    ok;
 		Platform ->
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index d813466437..aacf3924db 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1,23 +1 @@
-ODBC_VSN = 2.10.8
-
-TICKETS = OTP-7452 OTP-8511
-
-TICKETS_2.10.6 = \
-	OTP-8250 \
-	OTP-8291
-
-TICKETS_2.10.5 = \
-	OTP-7978
-
-TICKETS_2.10.4 = \
-	OTP-7720 \
-	OTP-7721 
-
-TICKETS_2.10.3 = \
-	OTP-7418 
-TICKETS_2.10.2 = \
-	OTP-7297
-TICKETS_2.10.1 = \
-        OTP-7019 \
-	OTP-7294 \
-	OTP-7307 
+ODBC_VSN = 2.10.9
diff --git a/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl b/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl
index 7792839e22..768653c898 100644
--- a/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl
+++ b/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -536,8 +536,15 @@ lookup(_, _Ctx) ->
 receive_msg(Socket, Acc, Timeout) ->
     receive 
 	{tcp_closed, Socket} ->
-	    [_Header, Body] = re:split(Acc,"\r\n\r\n",[{return,list}]),
-	    Body;
+	    case re:split(Acc,"\r\n\r\n",[{return,list}]) of
+		[_Header, Body] ->
+		    Body;
+		What ->
+		    orber:dbg("[~p] orber_cosnaming_utils:receive_msg();~n"
+			      "HTTP server closed the connection before sending a complete reply: ~p.", 
+			      [?LINE, What], ?DEBUG_LEVEL),
+		    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
+	    end;
 	{tcp, Socket, Response} ->
 	    receive_msg(Socket, Acc ++ Response, Timeout);
 	{tcp_error, Socket, Reason} ->
diff --git a/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml b/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml
index a97ad65f0e..964ae3e92d 100644
--- a/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml
+++ b/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -445,7 +445,19 @@ void op(in myEnum a);</cell>
     <section>
       <title>Struct Data Type</title>
       <p>A <c>struct</c> may have Basic, Template, Scoped Names and Constructed 
-        types as members.</p>
+        types as members. By using forward declaration we can define a recursive struct:</p>
+      <code type="none"><![CDATA[
+struct myStruct; // Forward declaration
+typedef sequence<myStruct> myStructSeq;
+struct myStruct {
+    myStructSeq chain;
+};
+
+// Deprecated definition (anonymous) not supported by IC
+struct myStruct {
+    sequence<myStruct> chain;
+};
+      ]]></code>
     </section>
 
     <section>
@@ -510,6 +522,25 @@ union LongUnion2 switch(long) {
   default: boolean DefaultValue; 
 };
       </code>
+      <p>In the same way as structs, unions can be recursive if forward
+         declaration is used (anonymous types is deprecated and not supported):</p>
+      <code type="none"><![CDATA[
+// Forward declaration
+union myUnion;
+typedef sequence<myUnion>myUnionSeq;
+union myUnion switch (long) {
+    case 1 : myUnionSeq chain;
+    default: boolean DefaultValue;
+};
+      ]]></code>
+
+    <note>
+      <p>Recursive types (union and struct) require Light IFR. I.e. the
+         IC option {light_ifr, true} is used and that Orber is configured in such a way that
+         Light IFR is activated. Recursive TypeCode is currently not supported, which is
+         why these cannot be encapsulated in an any data type.</p>
+    </note>
+
     </section>
     <warning>
       <p>Every field in, for example, a struct must be initiated. Otherwise
@@ -890,7 +921,7 @@ attribute long RWAttribute;
       object internal state with its object reference. The object internal state is
       an Erlang term which has a format defined by the user.</p>
     <note>
-      <p>It is is not always the case that the internal state will be the first parameter, as stubs can use their own object reference as the first parameter (see the IC documentation).</p>
+      <p>It is not always the case that the internal state will be the first parameter, as stubs can use their own object reference as the first parameter (see the IC documentation).</p>
     </note>
     <p>A function call will invoke an operation. The first
       parameter of the function should be the object reference and then
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 1013d370e4..589123ef73 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,7 +33,86 @@
   </header>
 
   <section>
+    <title>Orber 3.6.20</title>
+
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Eliminated Dialyzer warnings when using exit or throw.</p>
+          <p>
+            Own Id: OTP-9050 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
+  <section>
+    <title>Orber 3.6.19</title>
+
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Partial support for recursive structs and unions.
+            Only available for the erl_corba backend and requires
+            that Light IFR is used. I.e. the IC option {light_ifr, true}
+            and that Orber is configured in such a way that Light IFR
+            is activated. Recursive TypeCode is currently not supported.</p>
+          <p>
+            Own Id: OTP-8868 Aux Id: seq11633</p>
+        </item>
+      </list>
+    </section>
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <list type="bulleted">
+        <item>
+          <p>The SSL option {ssl_imp, old} was not used if ssl_generation was
+             set to 2. Only R14B was affected by this.</p>
+          <p>Own Id: OTP-8994 Aux Id: seq11747</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
+  <section>
+    <title>Orber 3.6.18</title>
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <list type="bulleted">
+        <item>
+          <p>A corbaloc http string could return an EXIT message, instead
+             of a system exception, if the HTTP server closed the socket
+             without returning a complete message. I.e. header and a body
+             containing a stringified IOR.</p>
+          <p>Own Id: OTP-8900 Aux Id: seq11704</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
+  <section>
+    <title>Orber 3.6.17</title>
+
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Eliminated warnings for auto-imported BIF clashes.</p>
+          <p>
+            Own Id: OTP-8840</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
+  <section>
     <title>Orber 3.6.16</title>
+
     <section>
       <title>Improvements and New Features</title>
       <list type="bulleted">
@@ -41,16 +120,17 @@
           <p>
             Test suites published.</p>
           <p>
-            Own Id: OTP-8543 Aux Id:</p>
+            Own Id: OTP-8543O Aux Id:</p>
         </item>
       </list>
     </section>
+
     <section>
       <title>Fixed Bugs and Malfunctions</title>
       <list type="bulleted">
         <item>
           <p>Added missing trailing bracket to define in hrl-file.</p>
-          <p>Own id: OTP-8489 Aux Id:</p>
+          <p>Own Id: OTP-8489 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -89,11 +169,11 @@
       <list type="bulleted">
         <item>
           <p>Removed superfluous VT in the documentation.</p>
-          <p>Own id: OTP-8353 Aux Id:</p>
+          <p>Own Id: OTP-8353 Aux Id:</p>
         </item>
         <item>
           <p>Removed superfluous backslash in the documentation.</p>
-          <p>Own id: OTP-8354 Aux Id:</p>
+          <p>Own Id: OTP-8354 Aux Id:</p>
         </item>
       </list>
     </section>
@@ -125,7 +205,7 @@
         <item>
           <p>Obsolete guards, e.g. record vs is_record, has been changed 
              to avoid compiler warnings.</p>
-          <p>Own id: OTP-7987</p>
+          <p>Own Id: OTP-7987</p>
         </item>
       </list>
     </section>
@@ -143,7 +223,7 @@
              Naming Service (INS) instead. INS is a part of the OMG
              standard specification.</p>
           <p>*** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>Own id: OTP-7906 Aux Id: seq11243</p>
+          <p>Own Id: OTP-7906 Aux Id: seq11243</p>
         </item>
       </list>
     </section>
@@ -157,7 +237,7 @@
       <list type="bulleted">
         <item>
           <p>Updated file headers.</p>
-          <p>Own id: OTP-7837</p>
+          <p>Own Id: OTP-7837</p>
         </item>
       </list>
     </section>
@@ -171,7 +251,7 @@
       <list type="bulleted">
         <item>
           <p>Documentation source included in open source releases.</p>
-          <p>Own id: OTP-7595</p>
+          <p>Own Id: OTP-7595</p>
         </item>
       </list>
     </section>
@@ -185,11 +265,11 @@
       <list type="bulleted">
         <item>
           <p>Updated file headers.</p>
-          <p>Own id: OTP-7011</p>
+          <p>Own Id: OTP-7011</p>
         </item>
         <item>
           <p>Now compliant with the new behavior of stdlib.</p>
-          <p>Own id: OTP-7030 Aux Id: seq10827</p>
+          <p>Own Id: OTP-7030 Aux Id: seq10827</p>
         </item>
       </list>
     </section>
diff --git a/lib/orber/include/ifr_types.hrl b/lib/orber/include/ifr_types.hrl
index 144ec7f8a1..324b32bd4f 100644
--- a/lib/orber/include/ifr_types.hrl
+++ b/lib/orber/include/ifr_types.hrl
@@ -1,9 +1,9 @@
 %%--------------------------------------------------------------------
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 1997-2011. 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
diff --git a/lib/orber/src/cdr_decode.erl b/lib/orber/src/cdr_decode.erl
index 9d30098940..36ef6ce02f 100644
--- a/lib/orber/src/cdr_decode.erl
+++ b/lib/orber/src/cdr_decode.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -898,9 +898,13 @@ dec_sequence_struct(Version, Message, N, TypeCodeList, Len, ByteOrder, Buff, C,
     {Seq, Rest2, Len2, NewC2} = dec_sequence_struct(Version, Rest1, N - 1,  TypeCodeList, Len1, ByteOrder, 
 						    Buff, NewC, Name),
     {[list_to_tuple([Name |Struct]) | Seq], Rest2, Len2, NewC2}.
-dec_sequence_union(_, Message, 0, _DiscrTC, _Default, _ElementList, Len, _ByteOrder, _Buff, C, _Name) ->
+
+
+dec_sequence_union(_, Message, 0, _DiscrTC, _Default, _ElementList,
+		   Len, _ByteOrder, _Buff, C, _Name) ->
     {[], Message, Len, C};
-dec_sequence_union(Version, Message, N, DiscrTC, Default, ElementList, Len, ByteOrder, Buff, C, Name) ->
+dec_sequence_union(Version, Message, N, DiscrTC, Default, ElementList,
+		   Len, ByteOrder, Buff, C, Name) when is_list(ElementList) ->
 
     {Label, Rest1, Len1, NewC} = dec_type(DiscrTC, Version, Message, Len, ByteOrder, Buff, C),
     Result = dec_union(Version, stringify_enum(DiscrTC, Label), ElementList, Default, 
@@ -916,7 +920,20 @@ dec_sequence_union(Version, Message, N, DiscrTC, Default, ElementList, Len, Byte
 						   DiscrTC, Default, ElementList, 
 						   Len2, ByteOrder, 
 						   Buff, NewC3, Name),
-    {[{Name, Label, Value} | Seq], Rest3, Len3, NewC4}.
+    {[{Name, Label, Value} | Seq], Rest3, Len3, NewC4};
+dec_sequence_union(Version, Message, N, _DiscrTC, _Default, Module,
+		   Len, ByteOrder, Buff, C, Name) when is_atom(Module) ->
+    case catch Module:tc() of
+	{tk_union, _, _, DiscrTC, Default, ElementList} ->
+	    dec_sequence_union(Version, Message, N, DiscrTC, Default, ElementList,
+			       Len, ByteOrder, Buff, C, Name);
+	What ->
+	    orber:dbg("[~p] ~p:dec_sequence_union(~p). Union module doesn't exist or incorrect.", 
+		      [?LINE, ?MODULE, What], ?DEBUG_LEVEL),
+	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
+    end.
+   
+ 
 
 %% A special case; when something is encapsulated (i.e. sent as octet-sequence)
 %% we sometimes don not want the result to be converted to a list.
@@ -993,14 +1010,16 @@ dec_wstring(Version, Message, Len, ByteOrder, Buff, C) ->
 %% Func: dec_union/9
 %%-----------------------------------------------------------------
 %% ## NEW IIOP 1.2 ##
-dec_union(Version, ?SYSTEM_TYPE, Name, DiscrTC, Default, ElementList, Bytes, Len, ByteOrder, Buff, C) ->
+dec_union(Version, ?SYSTEM_TYPE, Name, DiscrTC, Default, ElementList, Bytes,
+	  Len, ByteOrder, Buff, C) ->
     {Label, Rest1, Len1, NewC} = dec_type(DiscrTC, Version, Bytes, Len, ByteOrder, Buff, C),
     {Value, Rest2, Len2, NewC3} = dec_union(Version, Label, ElementList, Default, 
 					    Rest1, Len1, ByteOrder, Buff, NewC),
     {{Name, Label, Value}, Rest2, Len2, NewC3};
 
 
-dec_union(Version, IFRId, _, DiscrTC, Default, ElementList, Bytes, Len, ByteOrder, Buff, C) ->
+dec_union(Version, IFRId, _, DiscrTC, Default, ElementList, Bytes, Len, 
+	  ByteOrder, Buff, C) when is_list(ElementList) ->
     {Label, Rest1, Len1, NewC} = dec_type(DiscrTC, Version, Bytes, Len, ByteOrder, Buff, C),
     Result = dec_union(Version, stringify_enum(DiscrTC, Label), ElementList, Default, 
 				     Rest1, Len1, ByteOrder, Buff, NewC),
@@ -1012,7 +1031,20 @@ dec_union(Version, IFRId, _, DiscrTC, Default, ElementList, Bytes, Len, ByteOrde
 		    X
 	    end,
     Name = ifrid_to_name(IFRId, ?IFR_UnionDef),
-    {{Name, Label, Value}, Rest2, Len2, NewC3}.
+    {{Name, Label, Value}, Rest2, Len2, NewC3};
+dec_union(Version, IFRId, _, _DiscrTC, _Default, Module, Bytes, Len, 
+	  ByteOrder, Buff, C) when is_atom(Module) ->
+    case catch Module:tc() of
+	{tk_union, _, Name, DiscrTC, Default, ElementList} ->
+	    dec_union(Version, IFRId, Name, DiscrTC, Default, ElementList, Bytes, Len, 
+		      ByteOrder, Buff, C);
+	What ->
+	    orber:dbg("[~p] ~p:dec_union(~p). Union module doesn't exist or incorrect.", 
+		      [?LINE, ?MODULE, What], ?DEBUG_LEVEL),
+	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
+    end.
+   
+    
 
 dec_union(_, _, [], Default,  Message, Len, _, _Buff, C) when Default < 0 ->
     {undefined, Message, Len, C};
@@ -1047,7 +1079,16 @@ dec_struct1(_, [], Message, Len, _ByteOrder, _, C) ->
 dec_struct1(Version, [{_ElemName, ElemType} | TypeCodeList], Message, Len, ByteOrder, Buff, C) ->
     {Element, Rest, Len1, NewC} = dec_type(ElemType, Version, Message, Len, ByteOrder, Buff, C),
     {Struct, Rest1, Len2, NewC2} = dec_struct1(Version, TypeCodeList, Rest, Len1, ByteOrder, Buff, NewC),
-    {[Element |Struct], Rest1, Len2, NewC2}.
+    {[Element |Struct], Rest1, Len2, NewC2};
+dec_struct1(Version, Module, Message, Len, ByteOrder, Buff, C) ->
+    case catch Module:tc() of
+	{tk_struct, _, _, TypeCodeList} ->
+	    dec_struct1(Version, TypeCodeList, Message, Len, ByteOrder, Buff, C);
+	What ->
+	    orber:dbg("[~p] ~p:dec_struct1(~p). Struct module doesn't exist or incorrect.", 
+		      [?LINE, ?MODULE, What], ?DEBUG_LEVEL),
+	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
+    end.
 
 ifrid_to_name([], Type) ->
     orber:dbg("[~p] ~p:ifrid_to_name([], ~p). No Id supplied.", 
@@ -1232,7 +1273,9 @@ get_user_exception_type(TypeId) ->
 %%-----------------------------------------------------------------
 dec_type_code(Version, Message, Len, ByteOrder, Buff, C) ->
     {TypeNo, Message1, Len1, NewC} = dec_type('tk_ulong', Version, Message, Len, ByteOrder, Buff, C),
-    dec_type_code(TypeNo, Version, Message1, Len1, ByteOrder, Buff, NewC).
+    TC = dec_type_code(TypeNo, Version, Message1, Len1, ByteOrder, Buff, NewC),
+    erase(orber_indirection),
+    TC.
 
 %%-----------------------------------------------------------------
 %% Func: dec_type_code/5
@@ -1441,13 +1484,22 @@ dec_type_code(33, Version, Message, Len, ByteOrder, Buff, C) ->
 					{"name", {'tk_string', 0}}]},
 		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
     {{'tk_local_interface', RepId, Name}, Message1, Len1, NewC};
-dec_type_code(16#ffffffff, Version, Message, Len, ByteOrder, Buff, C) ->  %% placeholder
+dec_type_code(16#ffffffff, Version, Message, Len, ByteOrder, Buff, C) ->
     {Indirection, Message1, Len1, NewC} =
 	dec_type('tk_long', Version, Message, Len, ByteOrder, Buff, C),
     Position = C+Indirection,
-    <<_:Position/binary, SubBuff/binary>> = Buff,
-    {TC, _, _, _} = dec_type_code(Version, SubBuff, Position, ByteOrder, Buff, Position),
-    {TC, Message1, Len1, NewC};
+    case put(orber_indirection, Position) of
+	Position ->
+%%	    {{'none', Indirection}, Message1, Len1, NewC};
+            %% Recursive TypeCode. Break the loop.
+ 	    orber:dbg("[~p] cdr_decode:dec_type_code(~p); Recursive TC not supported.", 
+ 		      [?LINE,Position], ?DEBUG_LEVEL),
+ 	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO});
+	_ ->
+	    <<_:Position/binary, SubBuff/binary>> = Buff,
+	    {TC, _, _, _} = dec_type_code(Version, SubBuff, Position, ByteOrder, Buff, Position),
+	    {TC, Message1, Len1, NewC}
+    end;
 dec_type_code(Type, _, _, _, _, _, _) -> 
     orber:dbg("[~p] cdr_decode:dec_type_code(~p); No match.", 
 			    [?LINE, Type], ?DEBUG_LEVEL),
diff --git a/lib/orber/src/cdr_encode.erl b/lib/orber/src/cdr_encode.erl
index 3ecb8833f5..eaf3c5b7dc 100644
--- a/lib/orber/src/cdr_encode.erl
+++ b/lib/orber/src/cdr_encode.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -815,11 +815,21 @@ enc_wstring(Env, String, MaxLength, Bytes, Len) ->
 %%-----------------------------------------------------------------
 %% Func: enc_union/5
 %%-----------------------------------------------------------------
-enc_union(Env, {_, Label, Value}, DiscrTC, Default, TypeCodeList, Bytes, Len) ->
+enc_union(Env, {_, Label, Value}, DiscrTC, Default, TypeCodeList, 
+	  Bytes, Len) when is_list(TypeCodeList) ->
     {ByteSequence, Len1} = enc_type(DiscrTC, Env, Label, Bytes, Len),
     Label2 = stringify_enum(DiscrTC,Label),
     enc_union2(Env, {Label2, Value},TypeCodeList, Default, 
-	      ByteSequence, Len1, undefined).
+	       ByteSequence, Len1, undefined);
+enc_union(Env, Value, _DiscrTC, _Default, Module, Bytes, Len) when is_atom(Module) ->
+    case catch Module:tc() of
+	{tk_union, _, _, DiscrTC, Default, ElementList} ->
+	    enc_union(Env, Value, DiscrTC, Default, ElementList, Bytes, Len);
+	What ->
+	    orber:dbg("[~p] ~p:enc_union(~p). Union module doesn't exist or incorrect.", 
+		      [?LINE, ?MODULE, What], ?DEBUG_LEVEL),
+	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
+    end.  
 
 enc_union2(_Env, _What, [], Default, Bytes, Len, _) when Default < 0 ->
     {Bytes, Len};
@@ -840,9 +850,19 @@ stringify_enum(_, Label) ->
 %%-----------------------------------------------------------------
 %% Func: enc_struct/4
 %%-----------------------------------------------------------------
-enc_struct(Env, Struct, TypeCodeList, Bytes, Len) ->
+enc_struct(Env, Struct, TypeCodeList, Bytes, Len) when is_list(TypeCodeList) ->
     [_Name | StructList] = tuple_to_list(Struct),
-    enc_struct1(Env, StructList, TypeCodeList, Bytes, Len).
+    enc_struct1(Env, StructList, TypeCodeList, Bytes, Len);
+enc_struct(Env, Struct, Module, Bytes, Len) ->
+    [Module | StructList] = tuple_to_list(Struct),
+    case catch Module:tc() of
+	{tk_struct, _, _, TypeCodeList} ->
+	    enc_struct1(Env, StructList, TypeCodeList, Bytes, Len);
+	What ->
+	    orber:dbg("[~p] ~p:enc_struct([], ~p). Struct module doesn't exist or incorrect.", 
+		      [?LINE, ?MODULE, What], ?DEBUG_LEVEL),
+	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
+    end.
 
 enc_struct1(_Env, [], [], Bytes, Len) ->
     {Bytes, Len};
diff --git a/lib/orber/src/corba.erl b/lib/orber/src/corba.erl
index ea1363742c..ecec768544 100644
--- a/lib/orber/src/corba.erl
+++ b/lib/orber/src/corba.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -620,6 +620,8 @@ get_pid(Objkey) ->
 %% Returns    : Throws the exception.
 %% Description: 
 %%----------------------------------------------------------------------
+%% To avoid dialyzer warnings due to the use of exit/throw.
+-spec raise(term()) -> no_return().
 raise(E) ->
     throw({'EXCEPTION', E}).
 
@@ -629,6 +631,8 @@ raise(E) ->
 %% Returns    : Throws the exception.
 %% Description: 
 %%----------------------------------------------------------------------
+%% To avoid dialyzer warnings due to the use of exit/throw.
+-spec raise_with_state(term(), term()) -> no_return().
 raise_with_state(E, State) ->
     throw({reply, {'EXCEPTION', E}, State}).
 
diff --git a/lib/orber/src/orber.app.src b/lib/orber/src/orber.app.src
index fe911d65a4..88df4162b6 100644
--- a/lib/orber/src/orber.app.src
+++ b/lib/orber/src/orber.app.src
@@ -101,7 +101,7 @@
 	        orber_iiop_insup, orber_init, orber_reqno,
 	        orber_objkeyserver, orber_iiop_socketsup, 
                 orber_iiop_pm, orber_env]},
-  {applications, [stdlib, kernel]},
+  {applications, [stdlib, kernel, mnesia]},
   {env, []},
   {mod, {orber, []}}
 ]}.
diff --git a/lib/orber/src/orber.erl b/lib/orber/src/orber.erl
index c3d37ad1fb..665b3cb383 100644
--- a/lib/orber/src/orber.erl
+++ b/lib/orber/src/orber.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -1027,12 +1027,18 @@ remove_node(Node) when is_atom(Node) ->
 
 
 remove_tables(Tables, Node) ->
-    remove_tables(Tables, Node, []).
+    case remove_tables(Tables, Node, []) of
+	ok ->
+	    ok;
+	{error, Node, Failed} ->
+	    ?EFORMAT("orber:remove_node(~p) failed. Unable to remove table(s): ~p", 
+		     [Node, Failed])
+    end.
 
-remove_tables([], _, []) -> ok;
+remove_tables([], _, []) -> 
+    ok;
 remove_tables([], Node, Failed) ->
-    ?EFORMAT("orber:remove_node(~p) failed. Unable to remove table(s): ~p", 
-	     [Node, Failed]);
+    {error, Node, Failed};
 remove_tables([T1|Trest], Node, Failed) ->
     case mnesia:del_table_copy(T1, Node) of
 	{atomic, ok} ->
@@ -1041,8 +1047,6 @@ remove_tables([T1|Trest], Node, Failed) ->
 	    remove_tables(Trest, Node, [{T1, Reason}|Failed])
     end.
 
-
-
 %%-----------------------------------------------------------------
 %% Internal interface functions
 %%-----------------------------------------------------------------
diff --git a/lib/orber/src/orber_socket.erl b/lib/orber/src/orber_socket.erl
index af6df01b7d..ec2cf8f42a 100644
--- a/lib/orber/src/orber_socket.erl
+++ b/lib/orber/src/orber_socket.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -37,7 +37,7 @@
 %%-----------------------------------------------------------------
 -export([start/0, connect/4, listen/3, listen/4, accept/2, accept/3, write/3,
 	 controlling_process/3, close/2, peername/2, sockname/2, 
-	 peerdata/2, peercert/2, peercert/3, sockdata/2, setopts/3, 
+	 peerdata/2, peercert/2, sockdata/2, setopts/3, 
 	 clear/2, shutdown/3, post_accept/2, post_accept/3]).
 
 %%-----------------------------------------------------------------
@@ -366,14 +366,6 @@ peercert(Type, _Socket) ->
 	      [?LINE, Type], ?DEBUG_LEVEL),
     {error, ebadsocket}.
 
-peercert(ssl, Socket, Opts) ->
-    ssl:peercert(Socket, Opts);
-peercert(Type, _Socket, Opts) ->
-    orber:dbg("[~p] orber_socket:peercert(~p, ~p);~n"
-	      "Only available for SSL sockets.", 
-	      [?LINE, Type, Opts], ?DEBUG_LEVEL),
-    {error, ebadsocket}.
-
 %%-----------------------------------------------------------------
 %% Get peerdata
 %% 
@@ -496,27 +488,17 @@ check_port(Port, _, _) ->
 
 %%-----------------------------------------------------------------
 %% Check Options. 
-%% We need this as a work-around since the SSL-app doesn't allow us
-%% to pass 'inet' as an option. Also needed for R9B :-(
 check_options(normal, Options, _Generation) ->
-    case orber:ip_version() of
-	inet ->
-	    Options;
-	inet6 ->
-	    %% Necessary for R9B. Should be [orber:ip_version()|Options];
-	    [inet6|Options]
-    end;
+    [orber:ip_version()|Options];
 check_options(ssl, Options, Generation) ->
     case orber:ip_version() of
 	inet when Generation > 2 ->
 	    [{ssl_imp, new}|Options];
 	inet ->
-	    Options;
+	    [{ssl_imp, old}|Options];
 	inet6 when Generation > 2 ->
 	    [{ssl_imp, new}, inet6|Options];
 	inet6 ->
-	    %% Will fail until SSL supports this option. 
-	    %% Note, we want this happen!
-	    [inet6|Options]
+	    [{ssl_imp, old}, inet6|Options]
     end.
 
diff --git a/lib/orber/src/orber_tb.erl b/lib/orber/src/orber_tb.erl
index 0dd2d95bc8..e6d5ee4400 100644
--- a/lib/orber/src/orber_tb.erl
+++ b/lib/orber/src/orber_tb.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -35,6 +35,8 @@
 %%----------------------------------------------------------------------
 %% External exports
 %%----------------------------------------------------------------------
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([wait_for_tables/1, wait_for_tables/2, wait_for_tables/3,
 	 is_loaded/0, is_loaded/1, is_running/0, is_running/1, 
 	 info/2, error/2, unique/1, keysearch/2, keysearch/3]).
diff --git a/lib/orber/test/Makefile b/lib/orber/test/Makefile
index 4601e84d2c..4fad44dd7d 100644
--- a/lib/orber/test/Makefile
+++ b/lib/orber/test/Makefile
@@ -34,6 +34,7 @@ RELSYSDIR = $(RELEASE_PATH)/orber_test
 # Target Specs
 # ----------------------------------------------------
 TEST_SPEC_FILE = orber.spec
+COVER_FILE = orber.cover
 
 
 IDL_FILES = \
@@ -120,7 +121,11 @@ GEN_MOD_TEST_SERVER = \
 	orber_test_server_uni \
 	orber_test_server_uni_d \
 	orber_test_timeout_server \
-	orber_parent_inherrit
+	orber_parent_inherrit \
+	orber_test_server_rec_struct \
+	orber_test_server_rec_struct_seq \
+	orber_test_server_rec_union \
+	orber_test_server_rec_union_seq
 
 GEN_HRL_TEST_SERVER = \
 	oe_orber_test_server.hrl \
@@ -218,7 +223,7 @@ release_docs_spec:
 
 release_tests_spec: tests
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
+	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) $(COVER_FILE) \
 		$(ERL_FILES) $(RELSYSDIR)
 	$(INSTALL_DATA) $(SUITE_TARGET_FILES) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
diff --git a/lib/orber/test/cdrcoding_10_SUITE.erl b/lib/orber/test/cdrcoding_10_SUITE.erl
index d5d030538f..666f474e90 100644
--- a/lib/orber/test/cdrcoding_10_SUITE.erl
+++ b/lib/orber/test/cdrcoding_10_SUITE.erl
@@ -27,7 +27,7 @@
 
 
 -include("idl_output/Module.hrl").
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
@@ -36,12 +36,11 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -49,13 +48,28 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Description", "more description"];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-cases() ->
-    [types, reply, cancel_request, close_connection, message_error].
+all() -> 
+    cases().
+
+groups() -> 
+    [{types, [],
+      [do_register, null_type, void_type, principal_type,
+       objref_type, struct_type, union_type, string_type,
+       array_type, any_type, typecode_type, alias_type,
+       exception_type, do_unregister]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+cases() -> 
+    [{group, types}, reply, cancel_request,
+     close_connection, message_error].
 %% request, locate_request, locate_reply].
 
 %%-----------------------------------------------------------------
@@ -69,14 +83,14 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
     orber:jump_start(0),
     if
 	is_list(Config) ->
@@ -85,7 +99,7 @@ init_all(Config) when is_list(Config) ->
 	    exit("Config not a list")
     end.
 
-finish_all(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     orber:jump_stop(),
     Config.
 
@@ -94,11 +108,6 @@ finish_all(Config) when is_list(Config) ->
 %% Description: Just testing the complex types, the others are 
 %%              tested in the cdrlib SUITE.
 %%-----------------------------------------------------------------
-types(doc) -> ["Description", "more description"];
-types(suite) -> [do_register, null_type, void_type, principal_type, 
-		 objref_type, struct_type, union_type, string_type,
-		 array_type, any_type, typecode_type, alias_type,
-		 exception_type, do_unregister].
 %types(Config) when list(Config) ->
 %    'oe_orber_test':'oe_register'(),
 %    null_type(), 
diff --git a/lib/orber/test/cdrcoding_11_SUITE.erl b/lib/orber/test/cdrcoding_11_SUITE.erl
index d62fe6eb3a..273c94a79e 100644
--- a/lib/orber/test/cdrcoding_11_SUITE.erl
+++ b/lib/orber/test/cdrcoding_11_SUITE.erl
@@ -27,7 +27,7 @@
 
 
 -include("idl_output/Module.hrl").
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
@@ -36,12 +36,11 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -49,13 +48,28 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Description", "more description"];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-cases() ->
-    [types, reply, cancel_request, close_connection, message_error].
+all() -> 
+    cases().
+
+groups() -> 
+    [{types, [],
+      [do_register, null_type, void_type, principal_type,
+       objref_type, struct_type, union_type, string_type,
+       array_type, any_type, typecode_type, alias_type,
+       exception_type, do_unregister]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [{group, types}, reply, cancel_request,
+     close_connection, message_error].
 %% request, locate_request, locate_reply].
 
 %%-----------------------------------------------------------------
@@ -69,14 +83,14 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
     orber:jump_start(0),
     if
 	is_list(Config) ->
@@ -85,7 +99,7 @@ init_all(Config) when is_list(Config) ->
 	    exit("Config not a list")
     end.
 
-finish_all(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     orber:jump_stop(),
     Config.
 
@@ -94,11 +108,6 @@ finish_all(Config) when is_list(Config) ->
 %% Description: Just testing the complex types, the others are 
 %%              tested in the cdrlib SUITE.
 %%-----------------------------------------------------------------
-types(doc) -> ["Description", "more description"];
-types(suite) -> [do_register, null_type, void_type, principal_type, 
-		 objref_type, struct_type, union_type, string_type,
-		 array_type, any_type, typecode_type, alias_type,
-		 exception_type, do_unregister].
 %types(Config) when list(Config) ->
 %    'oe_orber_test':'oe_register'(),
 %    null_type(), 
diff --git a/lib/orber/test/cdrcoding_12_SUITE.erl b/lib/orber/test/cdrcoding_12_SUITE.erl
index 18e8eaa08a..3a2d995b99 100644
--- a/lib/orber/test/cdrcoding_12_SUITE.erl
+++ b/lib/orber/test/cdrcoding_12_SUITE.erl
@@ -28,7 +28,7 @@
 -module(cdrcoding_12_SUITE).
 
 -include("idl_output/Module.hrl").
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
@@ -37,12 +37,11 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -50,13 +49,28 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Description", "more description"];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-cases() ->
-    [types, reply, cancel_request, close_connection, message_error].
+all() -> 
+    cases().
+
+groups() -> 
+    [{types, [],
+      [do_register, null_type, void_type, principal_type,
+       objref_type, struct_type, union_type, string_type,
+       array_type, any_type, typecode_type, alias_type,
+       exception_type, do_unregister]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [{group, types}, reply, cancel_request,
+     close_connection, message_error].
 %% request, locate_request, locate_reply].
 
 %%-----------------------------------------------------------------
@@ -70,14 +84,14 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
     orber:jump_start(0),
     if
 	is_list(Config) ->
@@ -86,7 +100,7 @@ init_all(Config) when is_list(Config) ->
 	    exit("Config not a list")
     end.
 
-finish_all(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     orber:jump_stop(),
     Config.
 
@@ -95,11 +109,6 @@ finish_all(Config) when is_list(Config) ->
 %% Description: Just testing the complex types, the others are 
 %%              tested in the cdrlib SUITE.
 %%-----------------------------------------------------------------
-types(doc) -> ["Description", "more description"];
-types(suite) -> [do_register, null_type, void_type, principal_type, 
-		 objref_type, struct_type, union_type, string_type,
-		 array_type, any_type, typecode_type, alias_type,
-		 exception_type, do_unregister].
 
 do_register(doc) -> [];
 do_register(suite) -> [];
diff --git a/lib/orber/test/cdrlib_SUITE.erl b/lib/orber/test/cdrlib_SUITE.erl
index fa2d7f2a30..faf06904f0 100644
--- a/lib/orber/test/cdrlib_SUITE.erl
+++ b/lib/orber/test/cdrlib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -25,19 +25,19 @@
 %%-----------------------------------------------------------------
 -module(cdrlib_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
 
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -45,10 +45,27 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Description", "more description"];
-all(suite) -> 
-    [short, ushort, long, ulong, longlong, ulonglong, boolean, character, octet,
-     float, double, enum].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [short, ushort, long, ulong, longlong, ulonglong,
+     boolean, character, octet, float, double, enum].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
@@ -59,7 +76,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/orber/test/corba_SUITE.erl b/lib/orber/test/corba_SUITE.erl
index dae8fcbefc..1b28228375 100644
--- a/lib/orber/test/corba_SUITE.erl
+++ b/lib/orber/test/corba_SUITE.erl
@@ -25,7 +25,7 @@
 %%-----------------------------------------------------------------
 -module(corba_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
@@ -51,7 +51,7 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
@@ -64,18 +64,29 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for the CORBA/BOA/Object/orber interfaces", ""];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
-
-cases() ->
-    [exception_info_api, corba_api, object_api, orber_api, 
-     orber_objectkeys_api, orber_pseudo_objects, callback_ok_api, 
-     callback_arity_api, callback_module_api, callback_function_api, 
-     callback_precond_api, callback_postcond_api, callback_exit_api, 
-     callback_badarith_api, callback_case_clause_api, 
-     callback_function_clause_api]. 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [exception_info_api, corba_api, object_api, orber_api,
+     orber_objectkeys_api, orber_pseudo_objects,
+     callback_ok_api, callback_arity_api,
+     callback_module_api, callback_function_api,
+     callback_precond_api, callback_postcond_api,
+     callback_exit_api, callback_badarith_api,
+     callback_case_clause_api, callback_function_clause_api]. 
 
 %% boa_api, request, locate_request, locate_reply].
 
@@ -90,14 +101,14 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     corba:orb_init([{orber_debug_level, 10}, {giop_version, {1,2}},
 		    {iiop_port, 0}]),
     mnesia:delete_schema([node()]),
@@ -112,7 +123,7 @@ init_all(Config) ->
 	    exit("Config not a list")
     end.
 
-finish_all(Config) ->
+end_per_suite(Config) ->
     application:stop(orber),
     application:stop(mnesia),
     mnesia:delete_schema([node()]),
diff --git a/lib/orber/test/csiv2_SUITE.erl b/lib/orber/test/csiv2_SUITE.erl
index 8103fd81ac..95cd8c56b3 100644
--- a/lib/orber/test/csiv2_SUITE.erl
+++ b/lib/orber/test/csiv2_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. 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
@@ -20,7 +20,7 @@
 
 -module(csiv2_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
@@ -272,8 +272,9 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1,
-	 init_per_testcase/2, fin_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0,
+	 init_per_suite/1, end_per_suite/1,
+	 init_per_testcase/2, end_per_testcase/2,
 %	 code_CertificateChain_api/1,
 %	 code_AttributeCertChain_api/1,
 %	 code_VerifyingCertChain_api/1,
@@ -316,46 +317,26 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for multi orber interfaces using CSIv2"];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% NOTE - the fragment test cases must bu first since we explicitly set a request
 %% id. Otherwise, the request-id counter would be increased and we cannot know
 %% what it is.
-cases() ->
-    [
-%     code_CertificateChain_api,
-%     code_AttributeCertChain_api,
-%     code_VerifyingCertChain_api,
-%     code_AttributeCertificate_api,
-%     code_Certificate_api,
-%     code_TBSCertificate_api,
-%     code_CertificateSerialNumber_api,
-%     code_Version_api,
-%     code_AlgorithmIdentifier_api,
-%     code_Name_api,
-%     code_RDNSequence_api,
-%     code_RelativeDistinguishedName_api,
-%     code_AttributeTypeAndValue_api,
-%     code_Attribute_api,
-%     code_Validity_api,
-%     code_SubjectPublicKeyInfo_api,
-%     code_UniqueIdentifier_api,
-%     code_Extensions_api,
-%     code_Extension_api,
-%     code_AttributeCertificateInfo_api,
-%     code_AttCertVersion_api,
-%     code_Holder_api,
-%     code_AttCertIssuer_api,
-%     code_AttCertValidityPeriod_api,
-%     code_V2Form_api,
-%     code_IssuerSerial_api,
-%     code_ObjectDigestInfo_api,
-%     code_OpenSSL509_api,
-     ssl_server_peercert_api,
-     ssl_client_peercert_api].
+cases() -> 
+    [ssl_server_peercert_api, ssl_client_peercert_api].
 
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
@@ -370,7 +351,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     oe_orber_test_server:oe_unregister(),
     orber:jump_stop(),
     Path = code:which(?MODULE),
@@ -379,15 +360,15 @@ fin_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
-    if
-	is_list(Config) ->
-	    Config;
-	true ->
-	    exit("Config not a list")
+init_per_suite(Config) ->
+    case orber_test_lib:ssl_version() of
+	no_ssl ->
+	    {skip,"SSL is not installed!"};
+	_ ->
+	    Config
     end.
 
-finish_all(Config) ->
+end_per_suite(Config) ->
     Config.
 
 %%-----------------------------------------------------------------
@@ -694,8 +675,8 @@ ssl_server_peercert_api(_Config) ->
  	    {ok, Socket} = 
 		?match({ok, _}, fake_client_ORB(ssl, ServerHost, ServerPort, SSLOptions)),
 	    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
-	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
-	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
+%% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
+%% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
 %	    ?match({ok, #'Certificate'{}}, 
 %		   'OrberCSIv2':decode('Certificate', PeerCert)),
 	    destroy_fake_ORB(ssl, Socket),
@@ -734,8 +715,8 @@ ssl_client_peercert_api(_Config) ->
 	    ?match(ok, ssl:ssl_accept(Socket)),
 	    
 	    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
-	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
-	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
+%% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
+%% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
 %	    ?match({ok, #'Certificate'{}}, 
 %		   'OrberCSIv2':decode('Certificate', PeerCert)),
 	    ssl:close(Socket),
diff --git a/lib/orber/test/data_types_SUITE.erl b/lib/orber/test/data_types_SUITE.erl
index 1feb0b3b58..45a8af9415 100644
--- a/lib/orber/test/data_types_SUITE.erl
+++ b/lib/orber/test/data_types_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
@@ -25,7 +25,7 @@
 
 -module(data_types_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -48,12 +48,12 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -61,10 +61,27 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["This suite is for testing more or less complex data types"];
-all(suite) -> 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [fixed_type, any_type].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -75,7 +92,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     Dog = ?config(watchdog, Config),
diff --git a/lib/orber/test/generated_SUITE.erl b/lib/orber/test/generated_SUITE.erl
index 1cd1674fc4..29f0a54aed 100644
--- a/lib/orber/test/generated_SUITE.erl
+++ b/lib/orber/test/generated_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -25,7 +25,7 @@
 
 -module(generated_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -71,7 +71,8 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
@@ -84,16 +85,37 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["This suite is for testing IC generated files"];
-all(suite) -> 
-    ['OrberApp_IFR', 
-     erlang_binary, erlang_pid, erlang_port, erlang_ref,
-     'CosNaming_Binding', 'CosNaming_BindingList', 'CosNaming_Name',
-     'CosNaming_NameComponent', 'CosNaming_NamingContextExt_InvalidAddress', 
-     'CosNaming_NamingContext_AlreadyBound', 'CosNaming_NamingContext_CannotProceed', 
-     'CosNaming_NamingContext_InvalidName', 'CosNaming_NamingContext_NotEmpty', 
-     'CosNaming_NamingContext_NotFound', 'CosNaming_BindingIterator', 
-     'CosNaming_NamingContext', 'CosNaming_NamingContextExt'].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    ['OrberApp_IFR', erlang_binary, erlang_pid, erlang_port,
+     erlang_ref, 'CosNaming_Binding',
+     'CosNaming_BindingList', 'CosNaming_Name',
+     'CosNaming_NameComponent',
+     'CosNaming_NamingContextExt_InvalidAddress',
+     'CosNaming_NamingContext_AlreadyBound',
+     'CosNaming_NamingContext_CannotProceed',
+     'CosNaming_NamingContext_InvalidName',
+     'CosNaming_NamingContext_NotEmpty',
+     'CosNaming_NamingContext_NotFound',
+     'CosNaming_BindingIterator', 'CosNaming_NamingContext',
+     'CosNaming_NamingContextExt'].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
@@ -103,7 +125,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/orber/test/iiop_module_do_test_impl.erl b/lib/orber/test/iiop_module_do_test_impl.erl
index bf171a3097..54fcd8239a 100644
--- a/lib/orber/test/iiop_module_do_test_impl.erl
+++ b/lib/orber/test/iiop_module_do_test_impl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/orber/test/iiop_module_test_impl.erl b/lib/orber/test/iiop_module_test_impl.erl
index fe334e1b26..2096c14a23 100644
--- a/lib/orber/test/iiop_module_test_impl.erl
+++ b/lib/orber/test/iiop_module_test_impl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/orber/test/iiop_test_impl.erl b/lib/orber/test/iiop_test_impl.erl
index fd92109c09..234f7c5f73 100644
--- a/lib/orber/test/iiop_test_impl.erl
+++ b/lib/orber/test/iiop_test_impl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
diff --git a/lib/orber/test/interceptors_SUITE.erl b/lib/orber/test/interceptors_SUITE.erl
index 27e23a9433..487cfd0aec 100644
--- a/lib/orber/test/interceptors_SUITE.erl
+++ b/lib/orber/test/interceptors_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -25,7 +25,7 @@
 
 -module(interceptors_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
@@ -65,7 +65,8 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
@@ -78,10 +79,27 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["This suite is for testing Orber Interceptors"];
-all(suite) -> 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [local_pseudo, local_default, local_local, local_global].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -96,7 +114,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     oe_orber_test_server:oe_unregister(),
     orber:jump_stop(),
     Path = code:which(?MODULE),
diff --git a/lib/orber/test/iop_ior_10_SUITE.erl b/lib/orber/test/iop_ior_10_SUITE.erl
index 1000c7f113..50d657ea4e 100644
--- a/lib/orber/test/iop_ior_10_SUITE.erl
+++ b/lib/orber/test/iop_ior_10_SUITE.erl
@@ -25,7 +25,7 @@
 %%-----------------------------------------------------------------
 -module(iop_ior_10_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -33,7 +33,8 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
@@ -46,10 +47,27 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Description", "more description"];
-all(suite) -> 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [encoding, create_and_get_ops].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -59,7 +77,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/orber/test/iop_ior_11_SUITE.erl b/lib/orber/test/iop_ior_11_SUITE.erl
index 35d01789ee..38112cc335 100644
--- a/lib/orber/test/iop_ior_11_SUITE.erl
+++ b/lib/orber/test/iop_ior_11_SUITE.erl
@@ -25,7 +25,7 @@
 %%-----------------------------------------------------------------
 -module(iop_ior_11_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -33,7 +33,8 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
@@ -46,10 +47,27 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Description", "more description"];
-all(suite) -> 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [encoding, create_and_get_ops].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -59,7 +77,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/orber/test/iop_ior_12_SUITE.erl b/lib/orber/test/iop_ior_12_SUITE.erl
index 42db130e54..3baea074c2 100644
--- a/lib/orber/test/iop_ior_12_SUITE.erl
+++ b/lib/orber/test/iop_ior_12_SUITE.erl
@@ -26,7 +26,7 @@
 -module(iop_ior_12_SUITE).
 
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -34,7 +34,8 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
@@ -47,10 +48,27 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Description", "more description"];
-all(suite) -> 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [encoding, create_and_get_ops].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -60,7 +78,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/orber/test/lname_SUITE.erl b/lib/orber/test/lname_SUITE.erl
index d1f0e7cf0e..5e283d7bba 100644
--- a/lib/orber/test/lname_SUITE.erl
+++ b/lib/orber/test/lname_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -25,7 +25,7 @@
 %%-----------------------------------------------------------------
 -module(lname_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/COSS/CosNaming/lname.hrl").
 
@@ -34,7 +34,8 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
@@ -47,10 +48,27 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Description", "more description"];
-all(suite) -> 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [lname_component, lname].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -60,7 +78,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/orber/test/multi_ORB_SUITE.erl b/lib/orber/test/multi_ORB_SUITE.erl
index d1931f5393..608fb23f3e 100644
--- a/lib/orber/test/multi_ORB_SUITE.erl
+++ b/lib/orber/test/multi_ORB_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -20,7 +20,7 @@
 
 -module(multi_ORB_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
@@ -50,8 +50,9 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1, basic_PI_api/1, multi_orber_api/1,
-	 init_per_testcase/2, fin_per_testcase/2, multi_pseudo_orber_api/1, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
+	 init_per_suite/1, end_per_suite/1, basic_PI_api/1, multi_orber_api/1,
+	 init_per_testcase/2, end_per_testcase/2, multi_pseudo_orber_api/1, 
 	 light_orber_api/1, light_orber2_api/1, 
 	 ssl_1_multi_orber_api/1, ssl_2_multi_orber_api/1, ssl_reconfigure_api/1,
 	 iiop_timeout_api/1, iiop_timeout_added_api/1, setup_connection_timeout_api/1,
@@ -86,75 +87,93 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for multi orber interfaces", 
-	     "This suite test intra-ORB communication. There are three scenarios:",
-	     "* No security at all (multi_orber_api)",
-	     "* Two secure orbs using ssl (ssl_multi_orb_api)",
-	     "* One secure and one orb with no security. (ssl_multi_orb_api)"];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% NOTE - the fragment test cases must be first since we explicitly set a request
 %% id. Otherwise, the request-id counter would be increased and we cannot know
 %% what it is.
-cases() ->
-    [fragments_server_api, 
-     fragments_max_server_api,
-     fragments_max_server_added_api,
-     fragments_client_api,
-     flags_added_api,
-     bad_fragment_id_client_api,
-     bad_giop_header_api,
-     bad_id_cancel_request_api,
-     implicit_context_api, 
-     pseudo_implicit_context_api,
+cases() -> 
+    [fragments_server_api, fragments_max_server_api,
+     fragments_max_server_added_api, fragments_client_api,
+     flags_added_api, bad_fragment_id_client_api,
+     bad_giop_header_api, bad_id_cancel_request_api,
+     implicit_context_api, pseudo_implicit_context_api,
      pseudo_two_implicit_context_api,
      implicit_context_roundtrip_api,
-     oneway_implicit_context_api, 
+     oneway_implicit_context_api,
      oneway_pseudo_implicit_context_api,
      oneway_pseudo_two_implicit_context_api,
-     proxy_interface_api,
-     proxy_interface_ipv6_api,
-     local_interface_api,
-     local_interface_ctx_override_api,
-     local_interface_acl_override_api,
-     close_connections_api,
+     proxy_interface_api, proxy_interface_ipv6_api,
+     local_interface_api, local_interface_ctx_override_api,
+     local_interface_acl_override_api, close_connections_api,
      close_connections_local_interface_api,
      close_connections_local_interface_ctx_override_api,
      close_connections_alt_iiop_addr_api,
      close_connections_multiple_profiles_api,
-     multiple_accept_api,
-     max_requests_api,
-     max_requests_added_api,
-     max_connections_api,
-     max_packet_size_exceeded_api,
-     max_packet_size_ok_api,
-     light_ifr_api,
-     multi_pseudo_orber_api, 
-     multi_orber_api, 
-     light_orber_api, 
-     light_orber2_api, 
-     basic_PI_api, 
-     iiop_timeout_api, 
-     iiop_timeout_added_api, 
-     setup_connection_timeout_api, 
-     setup_multi_connection_timeout_api, 
-     setup_multi_connection_timeout_attempts_api, 
-     setup_multi_connection_timeout_random_api, 
+     multiple_accept_api, max_requests_api,
+     max_requests_added_api, max_connections_api,
+     max_packet_size_exceeded_api, max_packet_size_ok_api,
+     light_ifr_api, multi_pseudo_orber_api, multi_orber_api,
+     light_orber_api, light_orber2_api, basic_PI_api,
+     iiop_timeout_api, iiop_timeout_added_api,
+     setup_connection_timeout_api,
+     setup_multi_connection_timeout_api,
+     setup_multi_connection_timeout_attempts_api,
+     setup_multi_connection_timeout_random_api,
      ssl_1_multi_orber_api,
      ssl_1_multi_orber_generation_3_api,
      ssl_2_multi_orber_api,
      ssl_2_multi_orber_generation_3_api,
-     ssl_reconfigure_generation_3_api,
-     ssl_reconfigure_api
-    ].
+     ssl_reconfigure_generation_3_api, ssl_reconfigure_api].
 
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
-
+init_per_testcase(TC,Config) 
+  when TC =:= ssl_1_multi_orber_api;
+       TC =:= ssl_2_multi_orber_api;
+       TC =:= ssl_reconfigure_api ->
+    init_ssl(Config);
+init_per_testcase(TC,Config) 
+  when TC =:= ssl_1_multi_orber_generation_3_api; 
+       TC =:= ssl_2_multi_orber_generation_3_api;
+       TC =:= ssl_reconfigure_generation_3_api ->
+    init_ssl_3(Config);
 init_per_testcase(_Case, Config) ->
+    init_all(Config).
+
+init_ssl(Config) ->
+    case orber_test_lib:ssl_version() of
+	no_ssl ->
+	    {skip,"SSL is not installed!"};
+	_ ->
+	    init_all(Config)
+    end.
+
+init_ssl_3(Config) ->
+    case orber_test_lib:ssl_version() of
+	3 ->
+	    init_all(Config);
+	2 ->
+	    {skip,"Could not find the correct SSL version!"};
+	no_ssl ->
+	    {skip,"SSL is not installed!"}
+    end.
+
+init_all(Config) ->
     Path = code:which(?MODULE),
     code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
     Dog=test_server:timetrap(?default_timeout),
@@ -163,7 +182,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     oe_orber_test_server:oe_unregister(),
     orber:jump_stop(),
     Path = code:which(?MODULE),
@@ -172,7 +191,7 @@ fin_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     if
 	is_list(Config) ->
 	    Config;
@@ -180,7 +199,7 @@ init_all(Config) ->
 	    exit("Config not a list")
     end.
 
-finish_all(Config) ->
+end_per_suite(Config) ->
     Config.
 
 %%-----------------------------------------------------------------
@@ -1372,7 +1391,7 @@ light_orber2_api(_Config) ->
     LocalHost = net_adm:localhost(),
     {ok, Node, _Host} = 
 	?match({ok,_,_}, orber_test_lib:js_node([], 
-						{lightweigth, ["iiop://"++LocalHost++":"++integer_to_list(orber:iiop_port())]})),
+						{lightweight, ["iiop://"++LocalHost++":"++integer_to_list(orber:iiop_port())]})),
     ?match(ok, orber:info(io)),
     ?match([_], orber_test_lib:remote_apply(Node, orber_env, get_lightweight_nodes,[])),
     
@@ -1580,17 +1599,11 @@ ssl_1_multi_orber_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
 			     "secure orbs which must raise a NO_PERMISSION exception."];
 ssl_1_multi_orber_api(suite) -> [];
 ssl_1_multi_orber_api(_Config) ->
-    case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
-						       1, [{iiop_ssl_port, 0}]),
-	    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
-						       1, [{iiop_ssl_port, 0}]),
-	    ssl_suite(ServerOptions, ClientOptions),
-	    ok
-    end.
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+					       1, [{iiop_ssl_port, 0}]),
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+					       1, [{iiop_ssl_port, 0}]),
+    ssl_suite(ServerOptions, ClientOptions).
     
 ssl_1_multi_orber_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)", 
 			       "This case set up two secure orbs and test if they can",
@@ -1598,24 +1611,14 @@ ssl_1_multi_orber_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL dep
 			     "secure orbs which must raise a NO_PERMISSION exception."];
 ssl_1_multi_orber_generation_3_api(suite) -> [];
 ssl_1_multi_orber_generation_3_api(_Config) ->
-    case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    case orber_test_lib:ssl_version() of
-		3 ->
-		    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
-							       1, [{ssl_generation, 3},
-								   {iiop_ssl_port, 0}]),
-		    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
-							       1, [{ssl_generation, 3},
-								   {iiop_ssl_port, 0}]),
-		    ssl_suite(ServerOptions, ClientOptions),
-		    ok;
-		_ ->
-		    {skipped, "Required SSL generation not available"}
-	    end
-    end.
+   
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+					       1, [{ssl_generation, 3},
+						   {iiop_ssl_port, 0}]),
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+					       1, [{ssl_generation, 3},
+						   {iiop_ssl_port, 0}]),
+    ssl_suite(ServerOptions, ClientOptions).
     
 
 %%-----------------------------------------------------------------
@@ -1628,17 +1631,12 @@ ssl_2_multi_orber_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)",
 			     "secure orbs which must raise a NO_PERMISSION exception."];
 ssl_2_multi_orber_api(suite) -> [];
 ssl_2_multi_orber_api(_Config) -> 
-    case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
-						       2, [{iiop_ssl_port, 0}]),
-	    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
-						       2, [{iiop_ssl_port, 0}]),
-	    ssl_suite(ServerOptions, ClientOptions),
-	    ok
-    end.
+    
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+					       2, [{iiop_ssl_port, 0}]),
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+					       2, [{iiop_ssl_port, 0}]),
+    ssl_suite(ServerOptions, ClientOptions).
 
 ssl_2_multi_orber_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)", 
 			     "This case set up two secure orbs and test if they can",
@@ -1646,24 +1644,14 @@ ssl_2_multi_orber_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL dep
 			     "secure orbs which must raise a NO_PERMISSION exception."];
 ssl_2_multi_orber_generation_3_api(suite) -> [];
 ssl_2_multi_orber_generation_3_api(_Config) -> 
-    case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    case orber_test_lib:ssl_version() of
-		3 ->
-		    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
-							       2, [{ssl_generation, 3},
-								   {iiop_ssl_port, 0}]),
-		    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
-							       2, [{ssl_generation, 3},
-								   {iiop_ssl_port, 0}]),
-		    ssl_suite(ServerOptions, ClientOptions),
-		    ok;
-		_ ->
-		    {skipped, "Required SSL generation not available"}
-	    end
-    end.
+    
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+					       2, [{ssl_generation, 3},
+						   {iiop_ssl_port, 0}]),
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+					       2, [{ssl_generation, 3},
+						   {iiop_ssl_port, 0}]),
+    ssl_suite(ServerOptions, ClientOptions).
 %%-----------------------------------------------------------------
 %%  API tests for ORB to ORB, ssl security depth 2
 %%-----------------------------------------------------------------
@@ -1682,69 +1670,57 @@ ssl_reconfigure_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth
 			     "secure orbs which must raise a NO_PERMISSION exception."];
 ssl_reconfigure_generation_3_api(suite) -> [];
 ssl_reconfigure_generation_3_api(_Config) -> 
-    case orber_test_lib:ssl_version() of
-	3 ->    
-		    ssl_reconfigure([{ssl_generation, 3}]);
-	
-	_ ->
-	    {skipped, "Required SSL generation not available"}
-    end.
+    ssl_reconfigure([{ssl_generation, 3}]).
 
 ssl_reconfigure(ExtraSSLOptions) ->
-    case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    IP = orber_test_lib:get_host(),
-	    Loopback = orber_test_lib:get_loopback_interface(),
-	    {ok, ServerNode, _ServerHost} = 
-		?match({ok,_,_}, 
-		       orber_test_lib:js_node([{iiop_port, 0}, 
-					       {flags, ?ORB_ENV_LOCAL_INTERFACE}, 
-					       {ip_address, IP}|ExtraSSLOptions])),
-	    orber_test_lib:remote_apply(ServerNode, ssl, start, []),
-	    orber_test_lib:remote_apply(ServerNode, crypto, start, []),
-	    orber_test_lib:remote_apply(ServerNode, ssl, seed, ["testing"]),
-	    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-						   install_test_data, 
-						   [ssl])),
-	    ?match({ok, _}, 
-		   orber_test_lib:remote_apply(ServerNode, orber, 
-					       add_listen_interface, 
-					       [Loopback, normal, [{iiop_port, 5648},
-								   {iiop_ssl_port, 5649},
-								   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]])),
-	    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
-						       2, [{flags, ?ORB_ENV_LOCAL_INTERFACE}, 
-							   {iiop_port, 5648},
+
+    IP = orber_test_lib:get_host(),
+    Loopback = orber_test_lib:get_loopback_interface(),
+    {ok, ServerNode, _ServerHost} = 
+	?match({ok,_,_}, 
+	       orber_test_lib:js_node([{iiop_port, 0}, 
+				       {flags, ?ORB_ENV_LOCAL_INTERFACE}, 
+				       {ip_address, IP}|ExtraSSLOptions])),
+    orber_test_lib:remote_apply(ServerNode, ssl, start, []),
+    orber_test_lib:remote_apply(ServerNode, crypto, start, []),
+    orber_test_lib:remote_apply(ServerNode, ssl, seed, ["testing"]),
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
+					   install_test_data, 
+					   [ssl])),
+    ?match({ok, _}, 
+	   orber_test_lib:remote_apply(ServerNode, orber, 
+				       add_listen_interface, 
+				       [Loopback, normal, [{iiop_port, 5648},
 							   {iiop_ssl_port, 5649},
-							   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]),
-	    ?match({ok, _}, 
-		   orber_test_lib:remote_apply(ServerNode, orber, 
-					       add_listen_interface, 
-					       [Loopback, ssl, ServerOptions])),
-	    
-	    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
-						       2, [{iiop_ssl_port, 0}|ExtraSSLOptions]),
-	    {ok, ClientNode, _ClientHost} = 
-		?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-	    
-	    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib, 
-						   install_test_data, 
-						   [ssl])),
-	    orber_test_lib:remote_apply(ClientNode, ssl, start, []),
-	    orber_test_lib:remote_apply(ServerNode, crypto, start, []),
-	    orber_test_lib:remote_apply(ClientNode, ssl, seed, ["testing"]),
-	    Obj = ?match(#'IOP_IOR'{}, 
-			 orber_test_lib:remote_apply(ClientNode, corba,
-						     string_to_object, ["corbaname:iiop:1.1@"++Loopback++":5648/NameService#mamba",
-									[{context, [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
-													  context_data = {configuration, ClientOptions}}]}]])),
-	    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_server, 
-						   print, [Obj])),
-	    
-	    ok
-    end.
+							   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]])),
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+					       2, [{flags, ?ORB_ENV_LOCAL_INTERFACE}, 
+						   {iiop_port, 5648},
+						   {iiop_ssl_port, 5649},
+						   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]),
+    ?match({ok, _}, 
+	   orber_test_lib:remote_apply(ServerNode, orber, 
+				       add_listen_interface, 
+				       [Loopback, ssl, ServerOptions])),
+
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+					       2, [{iiop_ssl_port, 0}|ExtraSSLOptions]),
+    {ok, ClientNode, _ClientHost} = 
+	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
+
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib, 
+					   install_test_data, 
+					   [ssl])),
+    orber_test_lib:remote_apply(ClientNode, ssl, start, []),
+    orber_test_lib:remote_apply(ServerNode, crypto, start, []),
+    orber_test_lib:remote_apply(ClientNode, ssl, seed, ["testing"]),
+    Obj = ?match(#'IOP_IOR'{}, 
+		 orber_test_lib:remote_apply(ClientNode, corba,
+					     string_to_object, ["corbaname:iiop:1.1@"++Loopback++":5648/NameService#mamba",
+								[{context, [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID, 
+												  context_data = {configuration, ClientOptions}}]}]])),
+    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_server, 
+					   print, [Obj])).
 
 
 
diff --git a/lib/orber/test/naming_context_SUITE.erl b/lib/orber/test/naming_context_SUITE.erl
index 4406e01d5a..5250beacbe 100644
--- a/lib/orber/test/naming_context_SUITE.erl
+++ b/lib/orber/test/naming_context_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -25,7 +25,7 @@
 %%-----------------------------------------------------------------
 -module(naming_context_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 -include_lib("orber/include/corba.hrl").
@@ -35,7 +35,7 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
@@ -43,7 +43,8 @@
 
 -export([name_context/1, check_list/1, name_context_ext/1]).
 
--export([init_all/1, finish_all/1, init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_suite/1, end_per_suite/1, init_per_testcase/2, 
+	 end_per_testcase/2]).
 
 
 %%-----------------------------------------------------------------
@@ -75,12 +76,22 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Description", "more description"];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-cases() ->
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
     [name_context, check_list, name_context_ext].
 
 %%-----------------------------------------------------------------
@@ -95,7 +106,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:del_path(filename:join(filename:dirname(Path), "idl_output")),
     orber:jump_stop(),
@@ -103,10 +114,10 @@ fin_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     Config.
 
-finish_all(Config) ->
+end_per_suite(Config) ->
     Config.
 
 %%-----------------------------------------------------------------
diff --git a/lib/orber/test/orber.cover b/lib/orber/test/orber.cover
new file mode 100644
index 0000000000..807a7c2c6e
--- /dev/null
+++ b/lib/orber/test/orber.cover
@@ -0,0 +1,2 @@
+{incl_app,orber,details}.
+
diff --git a/lib/orber/test/orber.spec b/lib/orber/test/orber.spec
index 9d19ea7fc1..0dd30deade 100644
--- a/lib/orber/test/orber.spec
+++ b/lib/orber/test/orber.spec
@@ -1,19 +1 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2010. 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%
-%%
-{topcase, {dir, "../orber_test"}}.
+{suites,"../orber_test",all}.
diff --git a/lib/orber/test/orber_SUITE.erl b/lib/orber/test/orber_SUITE.erl
index f54da02c0e..a55705e550 100644
--- a/lib/orber/test/orber_SUITE.erl
+++ b/lib/orber/test/orber_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -18,15 +18,16 @@
 %%
 %%
 -module(orber_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 
 -define(default_timeout, ?t:minutes(15)).
 -define(application, orber).
 
 % Test server specific exports
--export([all/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 % Test cases must be exported.
 -export([app_test/1, undefined_functions/1, install_load_order/1,
@@ -35,17 +36,33 @@
 %%
 %% all/1
 %%
-all(doc) ->
-    [];
-all(suite) ->
-    [app_test, undefined_functions, 
-     install_load_order, install_local_content].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [app_test, undefined_functions, install_load_order,
+     install_local_content].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/orber/test/orber_acl_SUITE.erl b/lib/orber/test/orber_acl_SUITE.erl
index 2c2a768af2..9e69457d6e 100644
--- a/lib/orber/test/orber_acl_SUITE.erl
+++ b/lib/orber/test/orber_acl_SUITE.erl
@@ -25,7 +25,7 @@
 %%-----------------------------------------------------------------
 -module(orber_acl_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(default_timeout, ?t:minutes(5)).
 
@@ -47,7 +47,7 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
@@ -59,15 +59,26 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Testing API for ACL (Access Control List)"];
-all(suite) -> 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [ipv4_verify, ipv4_range, ipv4_interfaces, ipv4_bm,
      ipv6_verify, ipv6_range, ipv6_interfaces, ipv6_bm].
 
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
-init_all(Config) ->
+init_per_suite(Config) ->
     if
         list(Config) ->
             Config;
@@ -75,7 +86,7 @@ init_all(Config) ->
             exit("Config not a list")
     end.
 
-finish_all(Config) ->
+end_per_suite(Config) ->
     Config.
 
 
@@ -84,7 +95,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/orber/test/orber_firewall_ipv4_in_SUITE.erl b/lib/orber/test/orber_firewall_ipv4_in_SUITE.erl
index 3ac0cb7921..e2c73c2fd0 100644
--- a/lib/orber/test/orber_firewall_ipv4_in_SUITE.erl
+++ b/lib/orber/test/orber_firewall_ipv4_in_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -20,7 +20,7 @@
 
 -module(orber_firewall_ipv4_in_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
@@ -49,8 +49,9 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1, 
-	 init_per_testcase/2, fin_per_testcase/2,  
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2,  
 	 deny_port_api/1, deny_port_range_api/1, deny_host_api/1,
 	 deny_peerhost_api/1, allow_port_range_api/1, 
 	 allow_host_api/1, allow_peerhost_api/1, check_address_api/1]).
@@ -60,17 +61,28 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for orber's firewall functionallity."];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% NOTE - the fragment test cases must bu first since we explicitly set a request
 %% id. Otherwise, the request-id counter would be increased and we cannot know
 %% what it is.
-cases() ->
-    [deny_port_api, deny_port_range_api, deny_host_api, deny_peerhost_api,
-     allow_port_range_api, allow_host_api, allow_peerhost_api, check_address_api].
+cases() -> 
+    [deny_port_api, deny_port_range_api, deny_host_api,
+     deny_peerhost_api, allow_port_range_api, allow_host_api,
+     allow_peerhost_api, check_address_api].
 
 
 init_per_testcase(_Case, Config) ->
@@ -78,12 +90,12 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     if
 	is_list(Config) ->
 	    orber:jump_start([{iiop_port, 0},
@@ -93,7 +105,7 @@ init_all(Config) ->
 	    exit("Config not a list")
     end.
 
-finish_all(Config) ->
+end_per_suite(Config) ->
     orber:jump_stop(),
     Config.
 
diff --git a/lib/orber/test/orber_firewall_ipv4_out_SUITE.erl b/lib/orber/test/orber_firewall_ipv4_out_SUITE.erl
index 193fc72f7c..ac6c7327a1 100644
--- a/lib/orber/test/orber_firewall_ipv4_out_SUITE.erl
+++ b/lib/orber/test/orber_firewall_ipv4_out_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -20,7 +20,7 @@
 
 -module(orber_firewall_ipv4_out_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
@@ -49,8 +49,9 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1, 
-	 init_per_testcase/2, fin_per_testcase/2,  
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2,  
 	 deny_port_api/1, deny_port_range_api/1, deny_host_api/1,
 	 allow_port_api/1, allow_port_range_api/1, allow_host_api/1,
 	 local_interface_api/1]).
@@ -60,15 +61,25 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for orber's firewall functionallity."];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% NOTE - the fragment test cases must bu first since we explicitly set a request
 %% id. Otherwise, the request-id counter would be increased and we cannot know
 %% what it is.
-cases() ->
+cases() -> 
     [deny_port_api, deny_port_range_api, deny_host_api,
      allow_port_api, allow_port_range_api, allow_host_api,
      local_interface_api].
@@ -79,12 +90,12 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     if
 	is_list(Config) ->
 	    orber:jump_start([{iiop_port, 0},
@@ -94,7 +105,7 @@ init_all(Config) ->
 	    exit("Config not a list")
     end.
 
-finish_all(Config) ->
+end_per_suite(Config) ->
     orber:jump_stop(),
     Config.
 
diff --git a/lib/orber/test/orber_firewall_ipv6_in_SUITE.erl b/lib/orber/test/orber_firewall_ipv6_in_SUITE.erl
index 83f48cba0c..2888565c54 100644
--- a/lib/orber/test/orber_firewall_ipv6_in_SUITE.erl
+++ b/lib/orber/test/orber_firewall_ipv6_in_SUITE.erl
@@ -20,7 +20,7 @@
 
 -module(orber_firewall_ipv6_in_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
@@ -49,8 +49,9 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1, 
-	 init_per_testcase/2, fin_per_testcase/2,  
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2,  
 	 deny_port_api/1, deny_port_range_api/1, deny_host_api/1, 
 	 deny_peerhost_api/1, allow_port_range_api/1,
 	 allow_host_api/1, allow_peerhost_api/1, check_address_api/1]).
@@ -60,18 +61,28 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for orber's firewall functionallity."];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% NOTE - the fragment test cases must bu first since we explicitly set a request
 %% id. Otherwise, the request-id counter would be increased and we cannot know
 %% what it is.
-cases() ->
-    [deny_port_api, deny_port_range_api, deny_host_api, deny_peerhost_api,
-     allow_port_range_api, allow_host_api, allow_peerhost_api, 
-     check_address_api].
+cases() -> 
+    [deny_port_api, deny_port_range_api, deny_host_api,
+     deny_peerhost_api, allow_port_range_api, allow_host_api,
+     allow_peerhost_api, check_address_api].
 
 
 init_per_testcase(_Case, Config) ->
@@ -82,13 +93,13 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     orber:jump_stop(),
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     case orber_test_lib:version_ok() of
 	true ->
 	    if
@@ -101,7 +112,7 @@ init_all(Config) ->
 	    Reason
     end.
 
-finish_all(Config) ->
+end_per_suite(Config) ->
     Config.
 
 
diff --git a/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl b/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl
index e1856b9a47..f0a865adcb 100644
--- a/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl
+++ b/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -20,7 +20,7 @@
 
 -module(orber_firewall_ipv6_out_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
@@ -49,8 +49,9 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1, 
-	 init_per_testcase/2, fin_per_testcase/2,  
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2,  
 	 deny_port_api/1, deny_port_range_api/1, deny_host_api/1,
 	 allow_port_api/1, allow_port_range_api/1, allow_host_api/1,
 	 local_interface_api/1]).
@@ -60,15 +61,25 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for orber's firewall functionallity."];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% NOTE - the fragment test cases must bu first since we explicitly set a request
 %% id. Otherwise, the request-id counter would be increased and we cannot know
 %% what it is.
-cases() ->
+cases() -> 
     [deny_port_api, deny_port_range_api, deny_host_api,
      allow_port_api, allow_port_range_api, allow_host_api,
      local_interface_api].
@@ -82,13 +93,13 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     orber:jump_stop(),
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     case orber_test_lib:version_ok() of
 	true ->
 	    if
@@ -101,7 +112,7 @@ init_all(Config) ->
 	    Reason
     end.
 
-finish_all(Config) ->
+end_per_suite(Config) ->
     Config.
 
 
diff --git a/lib/orber/test/orber_nat_SUITE.erl b/lib/orber/test/orber_nat_SUITE.erl
index 5b295dd1aa..264a8ec523 100644
--- a/lib/orber/test/orber_nat_SUITE.erl
+++ b/lib/orber/test/orber_nat_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -20,7 +20,7 @@
 
 -module(orber_nat_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
@@ -50,8 +50,9 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1, cases/0, init_all/1, finish_all/1,
-	 init_per_testcase/2, fin_per_testcase/2, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
+	 init_per_suite/1, end_per_suite/1,
+	 init_per_testcase/2, end_per_testcase/2, 
 	 nat_ip_address/1, nat_ip_address_multiple/1,
 	 nat_ip_address_local/1, nat_ip_address_local_local/1,
 	 nat_iiop_port/1, nat_iiop_port_local/1,
@@ -68,32 +69,40 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["API tests for multi orber interfaces", 
-	     "This suite test intra-ORB communication. There are three scenarios:",
-	     "* No security at all (multi_orber_api)",
-	     "* Two secure orbs using ssl (ssl_multi_orb_api)",
-	     "* One secure and one orb with no security. (ssl_multi_orb_api)"];
-all(suite) -> {req,
-               [mnesia],
-               {conf, init_all, cases(), finish_all}}.
-
-cases() ->
-    [
-     nat_ip_address,
-     nat_ip_address_multiple,
-     nat_ip_address_local,
-     nat_iiop_port,
-     nat_iiop_port_local,
-     nat_ip_address_local_local,
-     nat_iiop_port_local_local,
-     nat_iiop_ssl_port,
-     nat_iiop_ssl_port_local
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    cases().
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+cases() -> 
+    [nat_ip_address, nat_ip_address_multiple,
+     nat_ip_address_local, nat_iiop_port,
+     nat_iiop_port_local, nat_ip_address_local_local,
+     nat_iiop_port_local_local, nat_iiop_ssl_port,
+     nat_iiop_ssl_port_local].
 
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
-
+init_per_testcase(TC, Config) 
+ when TC =:= nat_iiop_ssl_port;
+      TC =:= nat_iiop_ssl_port_local ->
+    case orber_test_lib:ssl_version() of
+	no_ssl ->
+	    {skip,"SSL not installed!"};
+	_ ->
+	    init_per_testcase(dummy_tc, Config)
+    end;
 init_per_testcase(_Case, Config) ->
     Path = code:which(?MODULE),
     code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
@@ -104,7 +113,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     oe_orber_test_server:oe_unregister(),
     orber:jump_stop(),
     Path = code:which(?MODULE),
@@ -113,7 +122,7 @@ fin_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-init_all(Config) ->
+init_per_suite(Config) ->
     if
 	is_list(Config) ->
 	    Config;
@@ -121,7 +130,7 @@ init_all(Config) ->
 	    exit("Config not a list")
     end.
 
-finish_all(Config) ->
+end_per_suite(Config) ->
     Config.
 
 %%-----------------------------------------------------------------
@@ -266,107 +275,99 @@ nat_iiop_ssl_port(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
 			   "Make sure NAT works for SSL"];
 nat_iiop_ssl_port(suite) -> [];
 nat_iiop_ssl_port(_Config) ->
-    case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    IP = orber_test_lib:get_host(),
-	    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
-						       1, [{iiop_ssl_port, 0},
-							   {flags, ?ORB_ENV_ENABLE_NAT},
-							   {ip_address, IP}]),
-	    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
-						       1, [{iiop_ssl_port, 0}]),
-	    {ok, ServerNode, _ServerHost} = 
-		?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
-	    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-	    SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
-	    NATSSLServerPort = SSLServerPort+1,
-	    {ok, Ref} = ?match({ok, _},
-			       orber_test_lib:remote_apply(ServerNode, orber, 
-							   add_listen_interface, 
-							   [IP, ssl, NATSSLServerPort])),
-	    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override, 
-					[nat_iiop_ssl_port, 
-					 {local, NATSSLServerPort, [{4001, 43}]}]),
-	    
-	    {ok, ClientNode, _ClientHost} = 
-		?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-	    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-						   install_test_data, 
-						   [ssl])),
-	    
-	    IOR1 = ?match(#'IOP_IOR'{}, 
-			  orber_test_lib:remote_apply(ClientNode, corba, 
-						      string_to_object,
-						      ["corbaname::1.2@"++IP++":"++
-						       integer_to_list(ServerPort)++"/NameService#mamba"])),
-    
-	    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP, 
-				 #host_data{protocol = ssl, 
-					    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}}, 
-		   iop_ior:get_key(IOR1)),
-	    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-						   uninstall_test_data, 
-						   [ssl])),
-	    ?match(ok, 
-		   orber_test_lib:remote_apply(ServerNode, orber, 
-					       remove_listen_interface, [Ref])),
-	    ok
-    end.
+
+    IP = orber_test_lib:get_host(),
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+					       1, [{iiop_ssl_port, 0},
+						   {flags, ?ORB_ENV_ENABLE_NAT},
+						   {ip_address, IP}]),
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+					       1, [{iiop_ssl_port, 0}]),
+    {ok, ServerNode, _ServerHost} = 
+	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
+    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
+    SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
+    NATSSLServerPort = SSLServerPort+1,
+    {ok, Ref} = ?match({ok, _},
+		       orber_test_lib:remote_apply(ServerNode, orber, 
+						   add_listen_interface, 
+						   [IP, ssl, NATSSLServerPort])),
+    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override, 
+				[nat_iiop_ssl_port, 
+				 {local, NATSSLServerPort, [{4001, 43}]}]),
+
+    {ok, ClientNode, _ClientHost} = 
+	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
+					   install_test_data, 
+					   [ssl])),
+
+    IOR1 = ?match(#'IOP_IOR'{}, 
+		  orber_test_lib:remote_apply(ClientNode, corba, 
+					      string_to_object,
+					      ["corbaname::1.2@"++IP++":"++
+						   integer_to_list(ServerPort)++"/NameService#mamba"])),
+
+    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP, 
+			 #host_data{protocol = ssl, 
+				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}}, 
+	   iop_ior:get_key(IOR1)),
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
+					   uninstall_test_data, 
+					   [ssl])),
+    ?match(ok, 
+	   orber_test_lib:remote_apply(ServerNode, orber, 
+				       remove_listen_interface, [Ref])),
+    ok.
 
 nat_iiop_ssl_port_local(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)", 
 				 "Make sure NAT works for SSL"];
 nat_iiop_ssl_port_local(suite) -> [];
 nat_iiop_ssl_port_local(_Config) ->
-    case os:type() of
-        vxworks ->
-	    {skipped, "No SSL-support for VxWorks."};
-        _ ->
-	    IP = orber_test_lib:get_host(),
-	    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
-						       1, [{iiop_ssl_port, 0},
-							   {flags, 
-							    (?ORB_ENV_LOCAL_INTERFACE bor 
-							     ?ORB_ENV_ENABLE_NAT)},
-							   {ip_address, IP}]),
-	    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
-						       1, [{iiop_ssl_port, 0}]),
-	    {ok, ServerNode, _ServerHost} = 
-		?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
-	    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-	    SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
-	    NATSSLServerPort = SSLServerPort+1,
-	    {ok, Ref} = ?match({ok, _},
-			       orber_test_lib:remote_apply(ServerNode, orber, 
-							   add_listen_interface, 
-							   [IP, ssl, NATSSLServerPort])),
-	    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override, 
-					[nat_iiop_ssl_port, 
-					 {local, NATSSLServerPort, [{NATSSLServerPort, NATSSLServerPort}]}]),
-	    
-	    {ok, ClientNode, _ClientHost} = 
-		?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-	    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-						   install_test_data, 
-						   [ssl])),
-	    
-	    IOR1 = ?match(#'IOP_IOR'{}, 
-			  orber_test_lib:remote_apply(ClientNode, corba, 
-						      string_to_object,
-						      ["corbaname::1.2@"++IP++":"++
-						       integer_to_list(ServerPort)++"/NameService#mamba"])),
-    
-	    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP, 
-				 #host_data{protocol = ssl, 
-					    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}}, 
-		   iop_ior:get_key(IOR1)),
-	    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
-						   uninstall_test_data, 
-						   [ssl])),
-	    ?match(ok, 
-		   orber_test_lib:remote_apply(ServerNode, orber, 
-					       remove_listen_interface, [Ref])),
-	    ok
-    end.
+
+    IP = orber_test_lib:get_host(),
+    ServerOptions = orber_test_lib:get_options(iiop_ssl, server, 
+					       1, [{iiop_ssl_port, 0},
+						   {flags, 
+						    (?ORB_ENV_LOCAL_INTERFACE bor 
+							 ?ORB_ENV_ENABLE_NAT)},
+						   {ip_address, IP}]),
+    ClientOptions = orber_test_lib:get_options(iiop_ssl, client, 
+					       1, [{iiop_ssl_port, 0}]),
+    {ok, ServerNode, _ServerHost} = 
+	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
+    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
+    SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
+    NATSSLServerPort = SSLServerPort+1,
+    {ok, Ref} = ?match({ok, _},
+		       orber_test_lib:remote_apply(ServerNode, orber, 
+						   add_listen_interface, 
+						   [IP, ssl, NATSSLServerPort])),
+    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override, 
+				[nat_iiop_ssl_port, 
+				 {local, NATSSLServerPort, [{NATSSLServerPort, NATSSLServerPort}]}]),
+
+    {ok, ClientNode, _ClientHost} = 
+	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
+					   install_test_data, 
+					   [ssl])),
+
+    IOR1 = ?match(#'IOP_IOR'{}, 
+		  orber_test_lib:remote_apply(ClientNode, corba, 
+					      string_to_object,
+					      ["corbaname::1.2@"++IP++":"++
+						   integer_to_list(ServerPort)++"/NameService#mamba"])),
+
+    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP, 
+			 #host_data{protocol = ssl, 
+				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}}, 
+	   iop_ior:get_key(IOR1)),
+    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib, 
+					   uninstall_test_data, 
+					   [ssl])),
+    ?match(ok, 
+	   orber_test_lib:remote_apply(ServerNode, orber, 
+				       remove_listen_interface, [Ref])),
+    ok.
 
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl
index a694dc58c4..ffc13d0e3c 100644
--- a/lib/orber/test/orber_test_lib.erl
+++ b/lib/orber/test/orber_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -95,16 +95,21 @@
 %%            
 %%------------------------------------------------------------
 ssl_version() ->
-    case catch erlang:system_info(otp_release) of
-	Version when is_list(Version) ->
-	    if
-		"R12B" < Version ->
-		    3;
-		true ->
-		    2
-	    end;
-	_ ->
-	    2	    
+    try 
+	ssl:module_info(),
+	case catch erlang:system_info(otp_release) of
+	    Version when is_list(Version) ->
+		if
+		    "R12B" < Version ->
+			3;
+		    true ->
+			2
+		end;
+	    _ ->
+		2
+	end
+    catch error:undef ->
+	    no_ssl
     end.
 
 %%------------------------------------------------------------
@@ -126,13 +131,22 @@ version_ok() ->
 		_ ->
 		    case gen_tcp:listen(0, [{reuseaddr, true}, inet6]) of
 			{ok, LSock} ->
-			    gen_tcp:close(LSock),
-			    true;
+			    {ok, Port} = inet:port(LSock),
+			    case gen_tcp:connect(Hostname, Port, [inet6]) of
+				{error, _} ->
+				    gen_tcp:close(LSock),
+				    {skipped, "Inet cannot handle IPv6"};
+				{ok, Socket} ->
+				    gen_tcp:close(Socket),
+				    gen_tcp:close(LSock),
+				    true
+			    end;
 			{error, _} ->
 			    {skipped, "Inet cannot handle IPv6"}
 		    end
 	    end
     end.
+
 %%------------------------------------------------------------
 %% function : get_host
 %% Arguments: Family - inet | inet6
@@ -287,9 +301,11 @@ start_ssl(true, Node) ->
 start_ssl(_, _) ->
     ok.
 
-start_orber({lightweigth, Options}, Node) ->
+start_orber({lightweight, Options}, Node) ->
+    ok = rpc:call(Node, mnesia, start, []),
     ok = rpc:call(Node, orber, start_lightweight, [Options]);
 start_orber(lightweight, Node) ->
+    ok = rpc:call(Node, mnesia, start, []),
     ok = rpc:call(Node, orber, start_lightweight, []);
 start_orber(_, Node) ->
     ok = rpc:call(Node, orber, jump_start, []).
@@ -1280,6 +1296,22 @@ test_coding(Obj, Local) ->
     ?match({'EXCEPTION',{'MARSHAL',_,_,_}}, 
           orber_test_server:
 		 testing_iiop_server_marshal(Obj, "string")),
+    
+    RecS = #orber_test_server_rec_struct{chain = [#orber_test_server_rec_struct{chain = []}]},
+    ?match(RecS, orber_test_server:testing_iiop_rec_struct(Obj, RecS)),
+    
+    RecU = #orber_test_server_rec_union{label = 'RecursiveType', 
+					value = [#orber_test_server_rec_union{label = 'RecursiveType',
+									      value = []}]},
+    ?match(RecU, orber_test_server:testing_iiop_rec_union(Obj, RecU)),
+
+%%     RecA1 = #any{typecode = unsupported, value = RecS},
+%%     RecA2 = #any{typecode = unsupported, value = RecU},
+%%     ?match(RecA1, 
+%% 	   orber_test_server:testing_iiop_rec_any(Obj, RecA1)),    
+%%     ?match(RecA2, 
+%% 	   orber_test_server:testing_iiop_rec_any(Obj, RecA2)),    
+
     ok.
 
 %%--------------- Testing Post- & Pre-cond -------------------
diff --git a/lib/orber/test/orber_test_server.idl b/lib/orber/test/orber_test_server.idl
index a88211c941..438c10e19b 100644
--- a/lib/orber/test/orber_test_server.idl
+++ b/lib/orber/test/orber_test_server.idl
@@ -28,7 +28,7 @@ module orber_parent {
 };
 
 module orber_test { 
- 
+
   // interface server
   interface server : orber_parent::inherrit {
     typedef string array[2];
@@ -89,6 +89,23 @@ module orber_test {
     const fixed52 fixed52negconst2 = -123.00d;
     const fixed52 fixed52negconst3 = -023.00d;
 
+    struct rec_struct; // Forward declaration
+    typedef sequence<rec_struct> rec_struct_seq;
+    struct rec_struct {
+	rec_struct_seq chain;
+    };
+    
+    
+    union rec_union; // Forward declaration
+    typedef sequence<rec_union>rec_union_seq;
+    
+    enum MyEnum {RecursiveType, NameType};
+    
+    union rec_union switch (MyEnum) {
+    case RecursiveType : rec_union_seq chain;
+    case NameType :  string aName;
+    };
+    
     void stop_normal();
 
     void stop_brutal();
@@ -123,6 +140,12 @@ module orber_test {
     void testing_iiop_context();
     void testing_iiop_server_marshal(inout StrLength6 Str);
 
+    // Recursive types
+    any testing_iiop_rec_any(in any RecType);
+    rec_struct testing_iiop_rec_struct(in rec_struct RecS);
+    rec_union testing_iiop_rec_union(in rec_union RecU);
+
+
     oneway void testing_iiop_oneway_delay(in long Time);
     void testing_iiop_twoway_delay(in long Time);
 
diff --git a/lib/orber/test/orber_test_server_impl.erl b/lib/orber/test/orber_test_server_impl.erl
index 35296cb619..10a9caf242 100644
--- a/lib/orber/test/orber_test_server_impl.erl
+++ b/lib/orber/test/orber_test_server_impl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -55,6 +55,9 @@
 	 testing_iiop_void/2,
 	 testing_iiop_context/2,
 	 testing_iiop_server_marshal/3,
+	 testing_iiop_rec_any/3,
+	 testing_iiop_rec_struct/3,
+	 testing_iiop_rec_union/3,
 	 relay_call/3,
 	 relay_cast/3,
 	 %% Testing pseudo calls.
@@ -197,6 +200,16 @@ testing_iiop_context(_Self, State) ->
 testing_iiop_server_marshal(_Self, State, _String) ->
     {reply, {ok, false}, State}.
 
+testing_iiop_rec_any(_Self, State, RAny) ->
+    {reply, RAny, State}.
+
+testing_iiop_rec_struct(_Self, State, RecS) ->
+    {reply, RecS, State}.
+
+testing_iiop_rec_union(_Self, State, RecU) ->
+    {reply, RecU, State}.
+
+
 testing_iiop_oneway_delay(_Self, State, Time) ->
     timer:sleep(Time),
     {noreply, State}.
diff --git a/lib/orber/test/orber_test_timeout_server_impl.erl b/lib/orber/test/orber_test_timeout_server_impl.erl
index 138eb51d92..67ea897fdd 100644
--- a/lib/orber/test/orber_test_timeout_server_impl.erl
+++ b/lib/orber/test/orber_test_timeout_server_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
diff --git a/lib/orber/test/orber_web_SUITE.erl b/lib/orber/test/orber_web_SUITE.erl
index ffa7468853..ed5c0cbfa0 100644
--- a/lib/orber/test/orber_web_SUITE.erl
+++ b/lib/orber/test/orber_web_SUITE.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -25,7 +25,7 @@
 
 -module(orber_web_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
@@ -65,12 +65,12 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -78,10 +78,28 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["This suite is for testing the Orber Web API"];
-all(suite) -> 
-    [menu, configure, info, nameservice, ifr_select, ifr_data, 
-     create, delete_ctx, add_ctx, delete_obj, server].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [menu, configure, info, nameservice, ifr_select,
+     ifr_data, create, delete_ctx, add_ctx, delete_obj,
+     server].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
@@ -95,7 +113,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     oe_orber_test_server:oe_unregister(),
     orber:jump_stop(),
     Path = code:which(?MODULE),
diff --git a/lib/orber/test/tc_SUITE.erl b/lib/orber/test/tc_SUITE.erl
index 807a663219..9e6ee4eb90 100644
--- a/lib/orber/test/tc_SUITE.erl
+++ b/lib/orber/test/tc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -25,7 +25,7 @@
 %%-----------------------------------------------------------------
 -module(tc_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
@@ -128,12 +128,12 @@
 %%-----------------------------------------------------------------
 %% External exports
 %%-----------------------------------------------------------------
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %%-----------------------------------------------------------------
 %% Internal exports
 %%-----------------------------------------------------------------
--export([]).
 -compile(export_all).
 
 %%-----------------------------------------------------------------
@@ -141,19 +141,32 @@
 %% Args: 
 %% Returns: 
 %%-----------------------------------------------------------------
-all(doc) -> ["Description", "more description"];
-all(suite) -> 
-    [null, void, 
-     short, ushort, 
-     long, ulong, 
-     longlong, ulonglong, 
-     boolean, char, wchar, octet,
-     float, double, longdouble, 
-     any, typecode, principal, object_reference,
-     struct, union, enum, string, wstring, sequence, array, 
-     alias, exception, fixed, value, value_box, native, 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [null, void, short, ushort, long, ulong, longlong,
+     ulonglong, boolean, char, wchar, octet, float, double,
+     longdouble, any, typecode, principal, object_reference,
+     struct, union, enum, string, wstring, sequence, array,
+     alias, exception, fixed, value, value_box, native,
      abstract_interface, indirection, get_tc].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
@@ -163,7 +176,7 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, Dog}|Config].
 
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index ec349ee189..5f17cda229 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1,21 +1,3 @@
 
-ORBER_VSN = 3.6.16
+ORBER_VSN = 3.6.20
 
-TICKETS = OTP-8489 \
-	OTP-8543
-
-TICKETS_3.6.15 = OTP-8353 \
-	OTP-8354 \
-	OTP-8374 \
-	OTP-8409 \
-	OTP-8448
-
-TICKETS_3.6.14 = OTP-8201
-
-TICKETS_3.6.13 = OTP-7987
-
-TICKETS_3.6.12 = OTP-7906
-
-TICKETS_3.6.11 = OTP-7837
-
-TICKETS_3.6.10 = OTP-7595
diff --git a/lib/os_mon/test/Makefile b/lib/os_mon/test/Makefile
new file mode 100644
index 0000000000..f14a791806
--- /dev/null
+++ b/lib/os_mon/test/Makefile
@@ -0,0 +1,92 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2010. 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%
+#
+include $(ERL_TOP)/make/target.mk
+
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+MODULES= \
+	os_mon_SUITE \
+	disksup_SUITE \
+	memsup_SUITE \
+	cpu_sup_SUITE \
+	os_mon_mib_SUITE \
+	os_sup_SUITE \
+	os_mon_conf
+
+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)/os_mon_test
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+ERL_MAKE_FLAGS +=
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \
+	-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) os_mon.spec os_mon.cover $(EMAKEFILE) $(SOURCE) $(RELSYSDIR)
+
+##	tar chf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+
+release_docs_spec:
diff --git a/lib/os_mon/test/cpu_sup_SUITE.erl b/lib/os_mon/test/cpu_sup_SUITE.erl
new file mode 100644
index 0000000000..174317527c
--- /dev/null
+++ b/lib/os_mon/test/cpu_sup_SUITE.erl
@@ -0,0 +1,296 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2002-2010. 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(cpu_sup_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+%% Test server specific exports
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases
+-export([load_api/1]).
+-export([util_api/1, util_values/1]).
+-export([port/1]).
+-export([terminate/1, unavailable/1, restart/1]).
+
+%% Default timetrap timeout (set in init_per_testcase)
+-define(default_timeout, ?t:minutes(1)).
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line ok = application:start(os_mon),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ?line ok = application:stop(os_mon),
+    Config.
+
+init_per_testcase(unavailable, Config) ->
+    terminate(Config),
+    init_per_testcase(dummy, Config);
+init_per_testcase(_Case, Config) ->
+    Dog = ?t:timetrap(?default_timeout),
+    [{watchdog, Dog} | Config].
+
+end_per_testcase(unavailable, Config) ->
+    restart(Config),
+    end_per_testcase(dummy, Config);
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    case test_server:os_type() of
+	{unix, sunos} ->
+	    [load_api, util_api, util_values, port, unavailable];
+	{unix, linux} ->
+	    [load_api, util_api, util_values, port, unavailable];
+	{unix, _OSname} -> [load_api];
+	_OS -> [unavailable]
+    end.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+load_api(suite) ->
+    [];
+load_api(doc) ->
+    ["Test of load API functions"];
+load_api(Config) when is_list(Config) ->
+
+    %% nprocs()
+    ?line N = cpu_sup:nprocs(),
+    ?line true = is_integer(N),
+    ?line true = N>0,
+
+    %% avg1()
+    ?line Load1 = cpu_sup:avg1(),
+    ?line true = is_integer(Load1),
+    ?line true = Load1>0,
+
+    %% avg5()
+    ?line Load5 = cpu_sup:avg5(),
+    ?line true = is_integer(Load5),
+    ?line true = Load5>0,
+
+    %% avg15()
+    ?line Load15 = cpu_sup:avg15(),
+    ?line true = is_integer(Load15),
+    ?line true = Load15>0,
+
+    ok.
+
+util_api(suite) ->
+    [];
+util_api(doc) ->
+    ["Test of utilization API functions"];
+util_api(Config) when is_list(Config) ->
+    %% Some useful funs when testing util/1
+    BusyP = fun({user, _Share}) -> true;
+	       ({nice_user, _Share}) -> true;
+	       ({kernel, _Share}) -> true;
+	       ({hard_irq, _Share}) -> true;
+	       ({soft_irq, _Share}) -> true;
+	       (_) -> false
+	    end,
+    NonBusyP = fun({wait, _Share}) -> true;
+		  ({idle, _Share}) -> true;
+		  ({steal, _Share}) -> true;
+		  (_) -> false
+	       end,
+    Sum = fun({_Tag, X}, Acc) -> Acc+X end,
+
+    %% util()
+    ?line Util1 = cpu_sup:util(),
+    ?line true = is_number(Util1),
+    ?line true = Util1>0,
+    ?line Util2 = cpu_sup:util(),
+    ?line true = is_number(Util2),
+    ?line true = Util2>0,
+
+    %% util([])
+    ?line {all, Busy1, NonBusy1, []} = cpu_sup:util([]),
+    ?line 100.00 = Busy1 + NonBusy1,
+
+    %% util([detailed])
+    ?line {Cpus2, Busy2, NonBusy2, []} = cpu_sup:util([detailed]),
+    ?line true = lists:all(fun(X) -> is_integer(X) end, Cpus2),
+    ?line true = lists:all(BusyP, Busy2),
+    ?line true = lists:all(NonBusyP, NonBusy2),
+    ?line 100.00 = lists:foldl(Sum,0,Busy2)+lists:foldl(Sum,0,NonBusy2),
+
+    %% util([per_cpu])
+    ?line [{Cpu3, Busy3, NonBusy3, []}|_] = cpu_sup:util([per_cpu]),
+    ?line true = is_integer(Cpu3),
+    ?line 100.00 = Busy3 + NonBusy3,
+
+    %% util([detailed, per_cpu])
+    ?line [{Cpu4, Busy4, NonBusy4, []}|_] =
+	cpu_sup:util([detailed, per_cpu]),
+    ?line true = is_integer(Cpu4),
+    ?line true = lists:all(BusyP, Busy2),
+    ?line true = lists:all(NonBusyP, NonBusy2),
+    ?line 100.00 = lists:foldl(Sum,0,Busy4)+lists:foldl(Sum,0,NonBusy4),
+
+    %% bad util/1 calls
+    ?line {'EXIT',{badarg,_}} = (catch cpu_sup:util(detailed)),
+    ?line {'EXIT',{badarg,_}} = (catch cpu_sup:util([detialed])),
+
+    ok.
+
+-define(SPIN_TIME, 1000).
+
+util_values(suite) ->
+    [];
+util_values(doc) ->
+    ["Test utilization values"];
+util_values(Config) when is_list(Config) ->
+
+    Tester = self(),
+    Ref = make_ref(),
+    Loop = fun (L) -> L(L) end,
+    Spinner = fun () ->
+		      Looper = spawn_link(fun () -> Loop(Loop) end),
+		      receive after ?SPIN_TIME -> ok end,
+		      unlink(Looper),
+		      exit(Looper, kill),
+		      Tester ! Ref
+	      end,
+
+    ?line cpu_sup:util(),
+
+    ?line spawn_link(Spinner),
+    ?line receive Ref -> ok end,
+    ?line HighUtil1 = cpu_sup:util(),
+
+    ?line receive after ?SPIN_TIME -> ok end,
+    ?line LowUtil1 = cpu_sup:util(),
+
+    ?line spawn_link(Spinner),
+    ?line receive Ref -> ok end,
+    ?line HighUtil2 = cpu_sup:util(),
+
+    ?line receive after ?SPIN_TIME -> ok end,
+    ?line LowUtil2 = cpu_sup:util(),
+
+    Utils = [{high1,HighUtil1}, {low1,LowUtil1},
+	     {high2,HighUtil2}, {low2,LowUtil2}],
+    ?t:format("Utils: ~p~n", [Utils]),
+
+    ?line false = LowUtil1 > HighUtil1,
+    ?line false = LowUtil1 > HighUtil2,
+    ?line false = LowUtil2 > HighUtil1,
+    ?line false = LowUtil2 > HighUtil2,
+
+    ok.
+
+
+% Outdated
+% The portprogram is now restarted if killed, and not by os_mon...
+
+port(suite) ->
+    [];
+port(doc) ->
+    ["Test that cpu_sup handles a terminating port program"];
+port(Config) when is_list(Config) ->
+    case cpu_sup_os_pid() of
+	{ok, PidStr} ->
+	    %% Monitor cpu_sup
+	    ?line MonRef = erlang:monitor(process, cpu_sup),
+	    ?line N1 = cpu_sup:nprocs(),
+	    ?line true = N1>0,
+
+	    %% Kill the port program
+	    case os:cmd("kill -9 " ++ PidStr) of
+		[] ->
+		    %% cpu_sup should not terminate
+		    receive
+			{'DOWN', MonRef, _, _, Reason} ->
+			    ?line ?t:fail({unexpected_exit_reason, Reason})
+		    after 3000 ->
+			ok
+		    end,
+
+		    %% Give cpu_sup time to restart cpu_sup port
+		    ?t:sleep(?t:seconds(3)),
+		    ?line N2 = cpu_sup:nprocs(),
+		    ?line true = N2>0,
+
+		    erlang:demonitor(MonRef),
+		    ok;
+
+		Line ->
+		    erlang:demonitor(MonRef),
+		    {skip, {not_killed, Line}}
+	    end;
+	_ ->
+	    {skip, os_pid_not_found }
+    end.
+
+terminate(suite) ->
+    [];
+terminate(Config) when is_list(Config) ->
+    ?line ok = application:set_env(os_mon, start_cpu_sup, false),
+    ?line ok = supervisor:terminate_child(os_mon_sup, cpu_sup),
+    ok.
+
+unavailable(suite) ->
+    [];
+unavailable(doc) ->
+    ["Test correct behaviour when service is unavailable"];
+unavailable(Config) when is_list(Config) ->
+
+    %% Make sure all API functions return their dummy values
+    ?line 0 = cpu_sup:nprocs(),
+    ?line 0 = cpu_sup:avg1(),
+    ?line 0 = cpu_sup:avg5(),
+    ?line 0 = cpu_sup:avg15(),
+    ?line 0 = cpu_sup:util(),
+    ?line {all,0,0,[]} = cpu_sup:util([]),
+    ?line {all,0,0,[]} = cpu_sup:util([detailed]),
+    ?line {all,0,0,[]} = cpu_sup:util([per_cpu]),
+    ?line {all,0,0,[]} = cpu_sup:util([detailed,per_cpu]),
+
+    ok.
+
+restart(suite) ->
+    [];
+restart(Config) when is_list(Config) ->
+    ?line ok = application:set_env(os_mon, start_cpu_sup, true),
+    ?line {ok, _Pid} = supervisor:restart_child(os_mon_sup, cpu_sup),
+    ok.
+
+%% Aux
+
+cpu_sup_os_pid() ->
+    Str = os:cmd("ps -e | grep '[c]pu_sup'"),
+    case io_lib:fread("~s", Str) of
+	{ok, [Pid], _Rest} -> {ok, Pid};
+	_ -> {error, pid_not_found}
+    end.
diff --git a/lib/os_mon/test/disksup_SUITE.erl b/lib/os_mon/test/disksup_SUITE.erl
new file mode 100644
index 0000000000..a3c6c7782d
--- /dev/null
+++ b/lib/os_mon/test/disksup_SUITE.erl
@@ -0,0 +1,440 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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(disksup_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+%% Test server specific exports
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases
+-export([api/1, config/1, alarm/1]).
+-export([port/1]).
+-export([terminate/1, unavailable/1, restart/1]).
+-export([otp_5910/1]).
+
+%% Default timetrap timeout (set in init_per_testcase)
+-define(default_timeout, ?t:minutes(1)).
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line ok = application:start(os_mon),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ?line ok = application:stop(os_mon),
+    Config.
+
+init_per_testcase(unavailable, Config) ->
+    terminate(Config),
+    init_per_testcase(dummy, Config);
+init_per_testcase(_Case, Config) ->
+    Dog = ?t:timetrap(?default_timeout),
+    [{watchdog,Dog} | Config].
+
+end_per_testcase(unavailable, Config) ->
+    restart(Config),
+    end_per_testcase(dummy, Config);
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    Bugs = [otp_5910],
+    case test_server:os_type() of
+	{unix, sunos} ->
+	    [api, config, alarm, port, unavailable] ++ Bugs;
+	{unix, _OSname} -> [api, alarm] ++ Bugs;
+	{win32, _OSname} -> [api, alarm] ++ Bugs;
+	_OS -> [unavailable]
+    end.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+api(suite) ->
+    [];
+api(doc) ->
+    ["Test of API functions"];
+api(Config) when is_list(Config) ->
+
+    %% get_disk_data()
+    ?line [{Id, KByte, Capacity}|_] = disksup:get_disk_data(),
+    ?line true = io_lib:printable_list(Id),
+    ?line true = is_integer(KByte),
+    ?line true = is_integer(Capacity),
+    ?line true = KByte>0,
+    ?line true = Capacity>0,
+
+    %% get_check_interval()
+    ?line 1800000 = disksup:get_check_interval(),
+
+    %% set_check_interval(Minutes)
+    ?line ok = disksup:set_check_interval(20),
+    ?line 1200000 = disksup:get_check_interval(),
+    ?line {'EXIT',{badarg,_}} = (catch disksup:set_check_interval(0.5)),
+    ?line 1200000 = disksup:get_check_interval(),
+    ?line ok = disksup:set_check_interval(30),
+
+    %% get_almost_full_threshold()
+    ?line 80 = disksup:get_almost_full_threshold(),
+
+    %% set_almost_full_threshold(Float)
+    ?line ok = disksup:set_almost_full_threshold(0.90),
+    ?line 90 = disksup:get_almost_full_threshold(),
+    ?line {'EXIT',{badarg,_}} =
+	(catch disksup:set_almost_full_threshold(-0.5)),
+    ?line 90 = disksup:get_almost_full_threshold(),
+    ?line ok = disksup:set_almost_full_threshold(0.80),
+
+    ok.
+
+config(suite) ->
+    [];
+config(doc) ->
+    ["Test configuration"];
+config(Config) when is_list(Config) ->
+
+    %% Change configuration parameters and make sure change is reflected
+    %% when disksup is restarted
+    ?line ok =
+	application:set_env(os_mon, disk_space_check_interval, 29),
+    ?line ok =
+	application:set_env(os_mon, disk_almost_full_threshold, 0.81),
+
+    ?line ok = supervisor:terminate_child(os_mon_sup, disksup),
+    ?line {ok, _Child1} = supervisor:restart_child(os_mon_sup, disksup),
+
+    ?line 1740000 = disksup:get_check_interval(),
+    ?line 81 = disksup:get_almost_full_threshold(),
+
+    %% Also try this with bad parameter values, should be ignored
+    ?line ok =
+	application:set_env(os_mon, disk_space_check_interval, 0.5),
+    ?line ok =
+	application:set_env(os_mon, disk_almost_full_threshold, -0.81),
+
+    ?line ok = supervisor:terminate_child(os_mon_sup, disksup),
+    ?line {ok, _Child2} = supervisor:restart_child(os_mon_sup, disksup),
+
+    ?line 1800000 = disksup:get_check_interval(),
+    ?line 80 = disksup:get_almost_full_threshold(),
+
+    %% Reset configuration parameters
+    ?line ok =
+	application:set_env(os_mon, disk_space_check_interval, 30),
+    ?line ok =
+	application:set_env(os_mon, disk_almost_full_threshold, 0.80),
+
+    ok.
+
+%%----------------------------------------------------------------------
+%% NOTE: The test case is a bit weak as it will fail if the disk usage
+%% changes too much during its course, or if there are timing problems
+%% with the alarm_handler receiving the alarms too late
+%%----------------------------------------------------------------------
+alarm(suite) ->
+    [];
+alarm(doc) ->
+    ["Test that alarms are set and cleared"];
+alarm(Config) when is_list(Config) ->
+
+    %% Find out how many disks exceed the threshold
+    %% and make sure the corresponding number of alarms is set
+    ?line Threshold1 = disksup:get_almost_full_threshold(), % 80
+    ?line Data1 = disksup:get_disk_data(),
+    ?line Over1 = over_threshold(Data1, Threshold1),
+    ?line Alarms1 = get_alarms(),
+    if
+	Over1==length(Alarms1) ->
+	    ?line true;
+	true ->
+	    dump_info(),
+	    ?line ?t:fail({bad_alarms, Threshold1, Data1, Alarms1})
+    end,
+
+    %% Try to find a disk with space usage below Threshold1,
+    %% lower the threshold accordingly and make sure new alarms are set
+    Fun1 = fun({_Id, _Kbyte, Capacity}) ->
+		   if
+		       Capacity>0, Capacity<Threshold1 -> true;
+		       true -> false
+		   end
+	   end,
+    ?line case until(Fun1, Data1) of
+	      {_, _, Cap1} ->
+		  Threshold2 = Cap1-1,
+		  ?line ok =
+		      disksup:set_almost_full_threshold(Threshold2/100),
+		  ?line disksup ! timeout, % force a disk check
+		  ?line Data2 = disksup:get_disk_data(),
+		  ?line Over2 = over_threshold(Data2, Threshold2),
+		  ?line Alarms2 = get_alarms(),
+		  if
+		      Over2==length(Alarms2), Over2>Over1 ->
+			  ?line true;
+		      true ->
+			  dump_info(),
+			  ?line ?t:fail({bad_alarms, Threshold2, Data2, Alarms2})
+		  end;
+	      false ->
+		  ?line ignore
+	  end,
+
+    %% Find out the highest space usage among all disks
+    %% and try to raise the threshold above this value,
+    %% make sure all alarms are cleared
+    Fun2 = fun({_Id, _Kbyte, Capacity}, MaxAcc) ->
+		   if
+		       Capacity>MaxAcc -> Capacity;
+		       true -> MaxAcc
+		   end
+	   end,
+    ?line case lists:foldl(Fun2, 0, Data1) of
+	      Max when Max<100 ->
+		  Threshold3 = Max+1,
+		  ?line ok =
+		      disksup:set_almost_full_threshold(Threshold3/100),
+		  ?line disksup ! timeout, % force a disk check
+		  ?line Data3 = disksup:get_disk_data(),
+		  ?line Over3 = over_threshold(Data3, Threshold3),
+		  ?line Alarms3 = get_alarms(),
+		  if
+		      Over3==0, length(Alarms3)==0 ->
+			  ?line ok;
+		      true ->
+			  dump_info(),
+			  ?line ?t:fail({bad_alarms, Threshold3, Data3, Alarms3})
+		  end;
+	      100 ->
+		  ?line ignore
+	  end,
+
+    %% Reset threshold
+    ?line ok = disksup:set_almost_full_threshold(Threshold1/100),
+
+    ok.
+
+over_threshold(Data, Threshold) ->
+    Data2 = remove_duplicated_disks(lists:keysort(1, Data)),
+    lists:foldl(fun({_Id, _Kbyte, Cap}, N) when Cap>=Threshold ->
+			N+1;
+		   (_DiskData, N) ->
+			N
+		end,
+		0,
+		Data2).
+
+%% On some platforms (for example MontaVista) data for one disk can be
+%% "duplicated":
+%%  Linux ppb 2.4.20_mvl31-pcore680 #1 Sun Feb 1 23:12:56 PST 2004 ppc unknown
+%%
+%%  MontaVista(R) Linux(R) Professional Edition 3.1
+%%
+%%  [ppb:~]> /bin/df -lk
+%%  Filesystem           1k-blocks      Used Available Use% Mounted on
+%%  rootfs                 8066141   3023763   4961717  38% /
+%%  /dev/root              8066141   3023763   4961717  38% /
+%%  tmpfs                   192892         0    192892   0% /dev/shm
+%%
+%% disksup:
+%%  [{"/",8066141,38}, {"/",8066141,38}, {"/dev/shm",192892,0}]
+%%
+%% disksup will only set ONE alarm for "/".
+%% Therefore the list of disk data must be sorted and duplicated disk
+%% tuples removed before calculating how many alarms should be set, or
+%% the testcase will fail erroneously.
+remove_duplicated_disks([{Id, _, _}, {Id, Kbyte, Cap}|T]) ->
+    remove_duplicated_disks([{Id, Kbyte, Cap}|T]);
+remove_duplicated_disks([H|T]) ->
+    [H|remove_duplicated_disks(T)];
+remove_duplicated_disks([]) ->
+    [].
+
+get_alarms() ->
+    lists:filter(fun({{disk_almost_full, _Disk},_}) -> true;
+		    (_) -> false
+		 end,
+		 alarm_handler:get_alarms()).
+
+until(Fun, [H|T]) ->
+    case Fun(H) of
+	true -> H;
+	false ->
+	    until(Fun, T)
+    end;
+until(_Fun, []) ->
+    false.
+
+port(suite) ->
+    [];
+port(doc) ->
+    ["Test that disksup handles a terminating port program"];
+port(Config) when is_list(Config) ->
+    ?line Str = os:cmd("ps -ef | grep '[d]isksup'"),
+    case io_lib:fread("~s ~s", Str) of
+	 {ok, [_Uid,Pid], _Rest} ->
+
+	    %% Monitor disksup
+	    ?line MonRef = erlang:monitor(process, disksup),
+	    ?line [{_Disk1,Kbyte1,_Cap1}|_] = disksup:get_disk_data(),
+	    ?line true = Kbyte1>0,
+
+	    %% Kill the port program
+	    case os:cmd("kill -9 " ++ Pid) of
+		[] ->
+
+		    %% disksup should now terminate
+		    receive
+			{'DOWN', MonRef, _, _, {port_died, _Reason}} ->
+			    ok;
+			{'DOWN', MonRef, _, _, Reason} ->
+			    ?line ?t:fail({unexpected_exit_reason, Reason})
+		    after
+			3000 ->
+			    ?line ?t:fail({still_alive, Str})
+		    end,
+
+		    %% Give os_mon_sup time to restart disksup
+		    ?t:sleep(?t:seconds(3)),
+		    ?line [{_Disk2,Kbyte2,_Cap2}|_] =
+			disksup:get_disk_data(),
+		    ?line true = Kbyte2>0,
+
+		    ok;
+
+		Line ->
+		    erlang:demonitor(MonRef),
+		    {skip, {not_killed, Line}}
+	    end;
+	_ ->
+	    {skip, {os_pid_not_found, Str}}
+    end.
+
+terminate(suite) ->
+    [];
+terminate(Config) when is_list(Config) ->
+    ?line ok = application:set_env(os_mon, start_disksup, false),
+    ?line ok = supervisor:terminate_child(os_mon_sup, disksup),
+    ok.
+
+unavailable(suite) ->
+    [];
+unavailable(doc) ->
+    ["Test correct behaviour when service is unavailable"];
+unavailable(Config) when is_list(Config) ->
+
+    %% Make sure all API functions return their dummy values
+    ?line [{"none",0,0}] = disksup:get_disk_data(),
+    ?line 1800000 = disksup:get_check_interval(),
+    ?line ok = disksup:set_check_interval(5),
+    ?line 80 = disksup:get_almost_full_threshold(),
+    ?line ok = disksup:set_almost_full_threshold(0.9),
+
+    ok.
+
+restart(suite) ->
+    [];
+restart(Config) when is_list(Config) ->
+    ?line ok = application:set_env(os_mon, start_disksup, true),
+    ?line {ok, _Pid} = supervisor:restart_child(os_mon_sup, disksup),
+    ok.
+
+otp_5910(suite) ->
+    [];
+otp_5910(doc) ->
+    ["Test that alarms are cleared if disksup crashes or "
+     "if OS_Mon is stopped"];
+otp_5910(Config) when is_list(Config) ->
+
+    %% Make sure disksup sets at least one alarm
+    ?line Data = disksup:get_disk_data(),
+    ?line Threshold0 = disksup:get_almost_full_threshold(),
+    ?line Threshold = case over_threshold(Data, Threshold0) of
+			  0 ->
+			      [{_Id,_Kbyte,Cap}|_] = Data,
+			      ?line ok = disksup:set_almost_full_threshold((Cap-1)/100),
+			      Cap-1;
+			  _N ->
+			      Threshold0
+		      end,
+    ?line ok = application:set_env(os_mon,
+				   disk_almost_full_threshold,
+				   Threshold/100),
+    ?line disksup ! timeout, % force a disk check
+    ?line Data2 = disksup:get_disk_data(),
+    ?line Over = over_threshold(Data2, Threshold),
+    ?line Alarms = get_alarms(),
+    if
+	Over==0 ->
+	    ?line ?t:fail({threshold_too_low, Data2, Threshold});
+	Over==length(Alarms) ->
+	    ok;
+	true ->
+	    dump_info(),
+	    ?line ?t:fail({bad_alarms, Threshold, Data2, Alarms})
+    end,
+
+    %% Kill disksup
+    exit(whereis(disksup), faked_disksup_crash),
+
+    %% Wait a little to make sure disksup has been restarted,
+    %% then make sure the alarms are set once, but not twice
+    ?t:sleep(?t:seconds(1)),
+    ?line Data3 = disksup:get_disk_data(),
+    ?line Alarms2 = get_alarms(),
+    if
+	length(Alarms2)==length(Alarms) ->
+	    ok;
+	true ->
+	    dump_info(),
+	    ?line ?t:fail({bad_alarms, Threshold, Data3, Alarms,Alarms2})
+    end,
+
+    %% Stop OS_Mon and make sure all disksup alarms are cleared
+    ?line ok = application:stop(os_mon),
+    ?t:sleep(?t:seconds(1)),
+    ?line Alarms3 = get_alarms(),
+    if
+	length(Alarms3)==0 ->
+	    ok;
+	true ->
+	    ?line ?t:fail({alarms_not_cleared, Alarms3})
+    end,
+
+    %% Reset threshold and restart OS_Mon
+    ?line ok = application:set_env(os_mon,
+				   disksup_almost_full_threshold, 0.8),
+    ?line ok = disksup:set_almost_full_threshold(0.8),
+    ?line ok = application:start(os_mon),
+
+    ok.
+
+dump_info() ->
+    io:format("Status: ~p~n", [sys:get_status(disksup)]).
diff --git a/lib/os_mon/test/memsup_SUITE.erl b/lib/os_mon/test/memsup_SUITE.erl
new file mode 100644
index 0000000000..afc14d1c83
--- /dev/null
+++ b/lib/os_mon/test/memsup_SUITE.erl
@@ -0,0 +1,793 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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(memsup_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+%% Test server specific exports
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases
+-export([api/1, alarm1/1, alarm2/1, process/1]).
+-export([config/1, timeout/1, unavailable/1, port/1]).
+-export([otp_5910/1]).
+
+%% Default timetrap timeout (set in init_per_testcase)
+-define(default_timeout, ?t:minutes(1)).
+
+init_per_suite(Config) when is_list(Config) ->
+    ?line ok = application:start(os_mon),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ?line ok = application:stop(os_mon),
+    Config.
+
+init_per_testcase(_Case, Config) ->
+    Dog = ?t:timetrap(?default_timeout),
+    [{watchdog,Dog} | Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    Config.
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    All = case test_server:os_type() of
+	      {unix, sunos} ->
+		  [api, alarm1, alarm2, process, config, timeout,
+		   unavailable, port];
+	      {unix, linux} ->
+		  [api, alarm1, alarm2, process, timeout];
+	      _OS -> [api, alarm1, alarm2, process]
+	  end,
+    Bugs = [otp_5910],
+    All ++ Bugs.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+api(suite) ->
+    [];
+api(doc) ->
+    ["Test of API functions"];
+api(Config) when is_list(Config) ->
+
+    %% get_memory_data()
+    ?line RegMemData = memsup:get_memory_data(),
+    case RegMemData of
+	{TotMem, AllBytes, {Pid, PidBytes}} when is_integer(TotMem),
+						 is_integer(AllBytes),
+						 is_pid(Pid),
+						 is_integer(PidBytes) ->
+	    ok;
+	{0, 0, _WorstPid} ->
+	    ?line ?t:fail(first_data_collection_failed);
+	_ ->
+	    ?line ?t:fail({bad_return, RegMemData})
+    end,
+
+    %% get_system_memory_data()
+    ?line ExtMemData = memsup:get_system_memory_data(),
+    Tags = [	total_memory,
+		free_memory,
+		system_total_memory,
+		largest_free,
+		number_of_free,
+		free_swap,
+		total_swap,
+		cached_memory,
+		buffered_memory,
+		shared_memory],
+
+    ?line true = lists:all(fun({Tag,Value}) when is_atom(Tag),
+						 is_integer(Value) ->
+				   lists:member(Tag, Tags);
+			      (_) ->
+				   false
+			   end,
+			   ExtMemData),
+
+    %% get_os_wordsize()
+    ?line ok = case memsup:get_os_wordsize() of
+	32             -> ok;
+	64             -> ok;
+	unsupported_os -> ok;
+	_ -> error
+    end,
+
+    %% get_check_interval()
+    ?line 60000 = memsup:get_check_interval(),
+
+    %% set_check_interval(Minutes)
+    ?line ok = memsup:set_check_interval(2),
+    ?line 120000 = memsup:get_check_interval(),
+    ?line {'EXIT',{badarg,_}} =
+	(catch memsup:set_check_interval(0.2)),
+    ?line 120000 = memsup:get_check_interval(),
+    ?line ok = memsup:set_check_interval(1),
+
+    %% get_procmem_high_watermark()
+    ?line 5 = memsup:get_procmem_high_watermark(),
+
+    %% set_procmem_high_watermark()
+    ?line ok = memsup:set_procmem_high_watermark(0.1),
+    ?line 10 = memsup:get_procmem_high_watermark(),
+    ?line {'EXIT',{badarg,_}} =
+	(catch memsup:set_procmem_high_watermark(-0.1)),
+    ?line 10 = memsup:get_procmem_high_watermark(),
+    ?line ok = memsup:set_procmem_high_watermark(0.05),
+
+    %% get_sysmem_high_watermark()
+    ?line 80 = memsup:get_sysmem_high_watermark(),
+
+    %% set_sysmem_high_watermark()
+    ?line ok = memsup:set_sysmem_high_watermark(0.9),
+    ?line 90 = memsup:get_sysmem_high_watermark(),
+    ?line {'EXIT',{badarg,_}} =
+	(catch memsup:set_sysmem_high_watermark(-0.9)),
+    ?line 90 = memsup:get_sysmem_high_watermark(),
+    ?line ok = memsup:set_sysmem_high_watermark(0.8),
+
+    %% get|set_helper_timeout
+    ?line 30 = memsup:get_helper_timeout(),
+    ?line ok = memsup:set_helper_timeout(29),
+    ?line 29 = memsup:get_helper_timeout(),
+    ?line {'EXIT',{badarg,_}} = (catch memsup:set_helper_timeout(31.0)),
+    ?line 29 = memsup:get_helper_timeout(),
+    ok.
+
+%%----------------------------------------------------------------------
+%% NOTE: The test case is a bit weak as it will fail if the memory
+%% usage changes too much during its course.
+%%----------------------------------------------------------------------
+alarm1(suite) ->
+    [];
+alarm1(doc) ->
+    ["Test alarms when memsup_system_only==false"];
+alarm1(Config) when is_list(Config) ->
+
+    %% If system memory usage is too high, the testcase cannot
+    %% be run correctly
+    ?line {Total, Alloc, {_Pid,_PidAlloc}} = memsup:get_memory_data(),
+    io:format("alarm1: Total: ~p, Alloc: ~p~n", [Total, Alloc]),
+    ?line SysUsage = Alloc/Total,
+    if
+	SysUsage>0.99 ->
+	    {skip, sys_mem_too_high};
+	true ->
+	    alarm1(Config, SysUsage)
+    end.
+
+alarm1(_Config, SysUsage) ->
+    %% Set a long memory check interval, we will force memory checks
+    %% instead
+    ?line ok = memsup:set_check_interval(60),
+
+    %% Check thresholds
+    ?line SysThreshold = (memsup:get_sysmem_high_watermark()/100),
+    ?line ProcThreshold = (memsup:get_procmem_high_watermark()/100),
+
+    %% Check if a system alarm already should be set or not
+    SysP = if
+	       SysUsage>SysThreshold -> true;
+	       SysUsage=<SysThreshold -> false
+	   end,
+
+    %% If system memory is higher than threshold, make sure the system
+    %% alarm is set. Otherwise, make sure it is not set
+    case alarm_set(system_memory_high_watermark) of
+	{true, []} when SysP ->
+	    ok;
+	false when not SysP ->
+	    ok;
+	_ ->
+	    ?line ?t:fail({sys_alarm, SysUsage, SysThreshold})
+    end,
+
+    %% Lower/raise the threshold to clear/set the alarm
+    NewSysThreshold = if
+        SysP ->
+            Value = 1.1*SysUsage,
+            if
+                Value > 0.99 -> 0.99;
+                true -> Value
+            end;
+        not SysP -> 0.9*SysUsage
+    end,
+
+    ?line ok = memsup:set_sysmem_high_watermark(NewSysThreshold),
+
+    %% Initiate and wait for a new data collection
+    ?line ok = force_collection(),
+
+    %% Make sure the alarm is cleared/set
+    ?t:sleep(?t:seconds(5)),
+    case alarm_set(system_memory_high_watermark) of
+	{true, []} when not SysP ->
+	    ok;
+	false when SysP ->
+	    ok;
+	_ ->
+	    ?line ?t:fail({sys_alarm, SysUsage, NewSysThreshold})
+    end,
+
+    %% Reset the threshold to set/clear the alarm again
+    ?line ok = memsup:set_sysmem_high_watermark(SysThreshold),
+    ?line ok = force_collection(),
+    ?t:sleep(?t:seconds(1)),
+    case alarm_set(system_memory_high_watermark) of
+	{true, []} when SysP ->
+	    ok;
+	false when not SysP ->
+	    ok;
+	_ ->
+	    ?line ?t:fail({sys_alarm, SysUsage, SysThreshold})
+    end,
+
+    %% Check memory usage
+    ?line {Total2, _, {WorstPid, PidAlloc}} = memsup:get_memory_data(),
+
+    %% Check if a process alarm already should be set or not
+    PidUsage = PidAlloc/Total2,
+    ProcP = if
+		PidUsage>ProcThreshold -> true;
+		PidUsage=<ProcThreshold -> false
+	    end,
+
+    %% Make sure the process alarm is set/not set accordingly
+    case alarm_set(process_memory_high_watermark) of
+	{true, WorstPid} when ProcP ->
+	    ok;
+	false when not ProcP ->
+	    ok;
+	{true, BadPid1} when ProcP ->
+	    ?line ?t:fail({proc_alarm, WorstPid, BadPid1});
+	_ ->
+	    ?line ?t:fail({proc_alarm, PidUsage, ProcThreshold})
+    end,
+
+    %% Lower/raise the threshold to clear/set the alarm
+    NewProcThreshold = if
+			   ProcP -> 1.1*PidUsage;
+			   not ProcP -> 0.9*PidUsage
+		       end,
+    ?line ok = memsup:set_procmem_high_watermark(NewProcThreshold),
+    ?line ok = force_collection(),
+    ?t:sleep(?t:seconds(1)),
+    case alarm_set(process_memory_high_watermark) of
+	{true, WorstPid} when not ProcP ->
+	    ok;
+	false when ProcP ->
+	    ok;
+	{true, BadPid2} when not ProcP ->
+	    ?line test_server:fail({proc_alarm, WorstPid, BadPid2});
+	_ ->
+	    ?line ?t:fail({proc_alarm, PidUsage, ProcThreshold})
+    end,
+
+    %% Reset the threshold to clear/set the alarm
+    ?line ok = memsup:set_procmem_high_watermark(ProcThreshold),
+    ?line ok = force_collection(),
+    ?t:sleep(?t:seconds(1)),
+    case alarm_set(process_memory_high_watermark) of
+	{true, WorstPid} when ProcP ->
+	    ok;
+	false when not ProcP ->
+	    ok;
+	{true, BadPid3} when ProcP ->
+	    ?line test_server:fail({proc_alarm, WorstPid, BadPid3});
+	_ ->
+	    ?line ?t:fail({proc_alarm, PidUsage, ProcThreshold})
+    end,
+
+    %% Reset memory check interval
+    ?line ok = memsup:set_check_interval(1),
+    ok.
+
+alarm2(suite) ->
+    [];
+alarm2(doc) ->
+    ["Test alarms when memsup_system_only==true"];
+alarm2(Config) when is_list(Config) ->
+
+    %% If system memory usage is too high, the testcase cannot
+    %% be run correctly
+    ?line {Total, Alloc, {_Pid,_PidAlloc}} = memsup:get_memory_data(),
+    ?line SysUsage = Alloc/Total,
+    if
+	SysUsage>0.99 ->
+	    {skip, sys_mem_too_high};
+	true ->
+	    alarm2(Config, SysUsage)
+    end.
+
+alarm2(_Config, _SysUsage) ->
+
+    %% Change memsup_system_only and restart memsup
+    ?line ok = application:set_env(os_mon, memsup_system_only, true),
+    ?line ok = supervisor:terminate_child(os_mon_sup, memsup),
+    ?line {ok, _Memsup1} = supervisor:restart_child(os_mon_sup, memsup),
+
+    %% Set a long memory check interval, we will force memory checks
+    %% instead
+    ?line ok = memsup:set_check_interval(60),
+
+    %% Check data and thresholds
+    ?line {Total, Alloc, undefined} = memsup:get_memory_data(),
+    ?line SysThreshold = (memsup:get_sysmem_high_watermark()/100),
+    ?line true = is_integer(memsup:get_procmem_high_watermark()),
+
+    %% Check if a system alarm already should be set or not
+    ?line SysUsage = Alloc/Total,
+    SysP = if
+	       SysUsage>SysThreshold -> true;
+	       SysUsage=<SysThreshold -> false
+	   end,
+
+    %% If system memory is higher than threshold, make sure the system
+    %% alarm is set. Otherwise, make sure it is not set
+    case alarm_set(system_memory_high_watermark) of
+	{true, []} when SysP ->
+	    ok;
+	false when not SysP ->
+	    ok;
+	_ ->
+	    ?line ?t:fail({sys_alarm, SysUsage, SysThreshold})
+    end,
+
+    %% Lower/raise the threshold to clear/set the alarm
+    NewSysThreshold = if
+        SysP ->
+            Value = 1.1*SysUsage,
+            if
+                Value > 0.99 -> 0.99;
+                true -> Value
+            end;
+        not SysP -> 0.9*SysUsage
+    end,
+
+    ?line ok = memsup:set_sysmem_high_watermark(NewSysThreshold),
+
+    %% Initiate and wait for a new data collection
+    ?line ok = force_collection(),
+
+    %% Make sure the alarm is cleared/set
+    ?t:sleep(?t:seconds(1)),
+    case alarm_set(system_memory_high_watermark) of
+	{true, []} when not SysP ->
+	    ok;
+	false when SysP ->
+	    ok;
+	_ ->
+	    ?line ?t:fail({sys_alarm, SysUsage, NewSysThreshold})
+    end,
+
+    %% Reset the threshold to set/clear the alarm again
+    ?line ok = memsup:set_sysmem_high_watermark(SysThreshold),
+    ?line ok = force_collection(),
+    ?t:sleep(?t:seconds(1)),
+    case alarm_set(system_memory_high_watermark) of
+	{true, []} when SysP ->
+	    ok;
+	false when not SysP ->
+	    ok;
+	_ ->
+	    ?line ?t:fail({sys_alarm, SysUsage, SysThreshold})
+    end,
+
+    %% Reset memsup_system_only and restart memsup
+    %% (memory check interval is then automatically reset)
+    ?line ok = application:set_env(os_mon, memsup_system_only, false),
+    ?line ok = supervisor:terminate_child(os_mon_sup, memsup),
+    ?line {ok, _Memsup2} = supervisor:restart_child(os_mon_sup, memsup),
+
+    ok.
+
+alarm_set(Alarm) ->
+    alarm_set(Alarm, alarm_handler:get_alarms()).
+alarm_set(Alarm, [{Alarm,Data}|_]) ->
+    {true,Data};
+alarm_set(Alarm, [_|T]) ->
+    alarm_set(Alarm, T);
+alarm_set(_Alarm, []) ->
+    false.
+
+process(suite) ->
+    [];
+process(doc) ->
+    ["Make sure memsup discovers a process grown very large"];
+process(Config) when is_list(Config) ->
+
+    %% Set a long memory check interval, we will force memory checks
+    %% instead
+    ?line ok = memsup:set_check_interval(60),
+
+    %% Collect data
+    MemData = memsup:get_memory_data(),
+    io:format("process: memsup:get_memory_data() = ~p~n", [MemData]),
+    ?line {_Total,_Free,{_,Bytes}} = MemData,
+
+    %% Start a new process larger than Worst
+    ?line WorsePid = spawn(fun() -> new_hog(Bytes) end),
+    ?t:sleep(?t:seconds(1)),
+
+    %% Initiate and wait for a new data collection
+    ?line ok = force_collection(),
+
+    %% Check that get_memory_data() returns updated result
+    ?line case memsup:get_memory_data() of
+	      {_, _, {WorsePid, _MoreBytes}} ->
+		  ok;
+	      {_, _, BadWorst} ->
+		  ?line ?t:fail({worst_pid, BadWorst})
+	  end,
+
+    %% Reset memory check interval
+    ?line exit(WorsePid, done),
+    ?line ok = memsup:set_check_interval(1),
+    ok.
+
+new_hog(Bytes) ->
+    WordSize = erlang:system_info(wordsize),
+    N = (Bytes+200) div WordSize div 2,
+    List = lists:duplicate(N, a),
+    new_hog_1(List).
+
+new_hog_1(List) ->
+    receive
+	_Any -> exit(List)
+    end.
+
+config(suite) ->
+    [];
+config(doc) ->
+    ["Test configuration"];
+config(Config) when is_list(Config) ->
+
+    %% Change configuration parameters and make sure change is reflected
+    %% when memsup is restarted
+    ?line ok = application:set_env(os_mon, memory_check_interval, 2),
+    ?line ok =
+	application:set_env(os_mon, system_memory_high_watermark, 0.9),
+    ?line ok =
+	application:set_env(os_mon, process_memory_high_watermark, 0.1),
+    ?line ok = application:set_env(os_mon, memsup_helper_timeout, 35),
+    ?line ok = application:set_env(os_mon, memsup_system_only, true),
+
+    ?line ok = supervisor:terminate_child(os_mon_sup, memsup),
+    ?line {ok, _Child1} = supervisor:restart_child(os_mon_sup, memsup),
+
+    ?line 120000 = memsup:get_check_interval(),
+    ?line 90 = memsup:get_sysmem_high_watermark(),
+    ?line 10 = memsup:get_procmem_high_watermark(),
+    ?line 35 = memsup:get_helper_timeout(),
+
+    %% Also try this with bad parameter values, should be ignored
+    ?line ok = application:set_env(os_mon, memory_check_interval, 0.2),
+    ?line ok =
+	application:set_env(os_mon, system_memory_high_watermark, -0.9),
+    ?line ok =
+	application:set_env(os_mon, process_memory_high_watermark,-0.1),
+    ?line ok = application:set_env(os_mon, memsup_helper_timeout, 0.35),
+    ?line ok = application:set_env(os_mon, memsup_system_only, arne),
+
+    ?line ok = supervisor:terminate_child(os_mon_sup, memsup),
+    ?line {ok, _Child2} = supervisor:restart_child(os_mon_sup, memsup),
+
+    ?line 60000 = memsup:get_check_interval(),
+    ?line 80 = memsup:get_sysmem_high_watermark(),
+    ?line 5 = memsup:get_procmem_high_watermark(),
+    ?line 30 = memsup:get_helper_timeout(),
+
+    %% Reset configuration parameters
+    ?line ok = application:set_env(os_mon, memory_check_interval, 1),
+    ?line ok =
+	application:set_env(os_mon, system_memory_high_watermark, 0.8),
+    ?line ok =
+	application:set_env(os_mon, process_memory_high_watermark,0.05),
+    ?line ok = application:set_env(os_mon, memsup_helper_timeout, 30),
+    ?line ok = application:set_env(os_mon, memsup_system_only, false),
+
+    ok.
+
+unavailable(suite) ->
+    [];
+unavailable(doc) ->
+    ["Test correct behaviour when service is unavailable"];
+unavailable(Config) when is_list(Config) ->
+
+    %% Close memsup
+    ?line ok = application:set_env(os_mon, start_memsup, false),
+    ?line ok = supervisor:terminate_child(os_mon_sup, memsup),
+
+    %% Make sure all API functions return their dummy values
+    ?line {0,0,{_Pid,0}} = memsup:get_memory_data(),
+    ?line ok = application:set_env(os_mon, memsup_system_only, true),
+    ?line {0,0,undefined} = memsup:get_memory_data(),
+    ?line ok = application:set_env(os_mon, memsup_system_only, false),
+    ?line [] = memsup:get_system_memory_data(),
+    ?line 0  = memsup:get_os_wordsize(),
+    ?line 60000 = memsup:get_check_interval(),
+    ?line ok = memsup:set_check_interval(2),
+    ?line 5 = memsup:get_procmem_high_watermark(),
+    ?line ok = memsup:set_procmem_high_watermark(0.10),
+    ?line 80 = memsup:get_sysmem_high_watermark(),
+    ?line ok = memsup:set_sysmem_high_watermark(0.90),
+    ?line 30 = memsup:get_helper_timeout(),
+    ?line ok = memsup:set_helper_timeout(35),
+
+    %% Start memsup again,
+    ?line ok = application:set_env(os_mon, start_memsup, true),
+    ?line {ok, _Child} = supervisor:restart_child(os_mon_sup, memsup),
+
+    ok.
+
+timeout(suite) ->
+    [];
+timeout(doc) ->
+    ["Test stability of memsup when data collection times out"];
+timeout(Config) when is_list(Config) ->
+
+    %% Set a long memory check interval and memsup_helper timeout,
+    %% we will force memory checks instead and fake timeouts
+    ?line ok = memsup:set_check_interval(60),
+    ?line ok = memsup:set_helper_timeout(3600),
+
+    %% Provoke a timeout during memory collection
+    ?line memsup ! time_to_collect,
+    ?line memsup ! reg_collection_timeout,
+
+    %% Not much we can check though, except that memsup is still running
+    ?line {_,_,_} = memsup:get_memory_data(),
+
+    %% Provoke a timeout during extensive memory collection
+    %% We fake a gen_server:call/2 to be able to send a timeout message
+    %% while the request is being handled
+
+    %% Linux should be handled the same way as solaris.
+
+%    TimeoutMsg = case ?t:os_type() of
+%		     {unix, sunos} -> ext_collection_timeout;
+%		     {unix, linux} -> reg_collection_timeout
+%		 end,
+
+    TimeoutMsg = ext_collection_timeout,
+
+    ?line Pid = whereis(memsup),
+    ?line Mref = erlang:monitor(process, Pid),
+    ?line Pid ! {'$gen_call', {self(), Mref}, get_system_memory_data},
+    ?line Pid ! TimeoutMsg,
+    receive
+	{Mref, []} ->
+	    erlang:demonitor(Mref),
+	    ?line ok;
+	{Mref, Res} ->
+	    erlang:demonitor(Mref),
+	    ?line ?t:fail({unexpected_result, Res});
+	{'DOWN', Mref, _, _, _} ->
+	    ?line ?t:fail(no_result)
+    end,
+
+    %% Reset memory check interval and memsup_helper timeout
+    ?line ok = memsup:set_check_interval(1),
+    ?line ok = memsup:set_helper_timeout(30),
+    ?line memsup ! time_to_collect,
+
+    ?line [_|_] = memsup:get_system_memory_data(),
+
+    ok.
+
+port(suite) ->
+    [];
+port(doc) ->
+    ["Test that memsup handles a terminating port program"];
+port(Config) when is_list(Config) ->
+    ?line Str = os:cmd("ps -e | grep '[m]emsup'"),
+    case io_lib:fread("~s", Str) of
+	{ok, [Pid], _Rest} ->
+
+	    %% Monitor memsup
+	    ?line MonRef = erlang:monitor(process, memsup),
+	    ?line {Total1,_Alloc1,_Worst1} = memsup:get_memory_data(),
+	    ?line true = Total1>0,
+
+	    %% Kill the port program
+	    case os:cmd("kill -9 " ++ Pid) of
+		[] ->
+
+		    %% memsup should now terminate
+		    receive
+			{'DOWN', MonRef, _, _, {port_died, _Reason}} ->
+			    ok;
+			{'DOWN', MonRef, _, _, Reason} ->
+			    ?line ?t:fail({unexpected_exit_reason, Reason})
+		    after
+			3000 ->
+			    ?line ?t:fail(still_alive)
+		    end,
+
+		    %% Give os_mon_sup time to restart memsup
+		    ?t:sleep(?t:seconds(3)),
+		    ?line {Total2,_Alloc2,_Worst2} =
+			memsup:get_memory_data(),
+		    ?line true = Total2>0,
+
+		    ok;
+
+		Line ->
+		    erlang:demonitor(MonRef),
+		    {skip, {not_killed, Line}}
+	    end;
+	_ ->
+	    {skip, {os_pid_not_found, Str}}
+    end.
+
+otp_5910(suite) ->
+    [];
+otp_5910(doc) ->
+    ["Test that alarms are cleared and not set twice"];
+otp_5910(Config) when is_list(Config) ->
+    Alarms =
+	[system_memory_high_watermark, process_memory_high_watermark],
+
+    %% Make sure memsup sets both alarms
+    ?line ok = application:set_env(os_mon, memory_check_interval, 60),
+    ?line ok = memsup:set_check_interval(60),
+    ?line SysThreshold = (memsup:get_sysmem_high_watermark()/100),
+    ?line ProcThreshold = (memsup:get_procmem_high_watermark()/100),
+
+    MemData = memsup:get_memory_data(),
+
+    io:format("otp_5910: memsup:get_memory_data() = ~p~n", [MemData]),
+    ?line {Total, Alloc, {_Pid, _Bytes}} = MemData,
+    ?line Pid = spawn_opt(fun() ->
+				  receive
+				      die -> ok
+				  end
+			  end, [{min_heap_size, 1000}]),
+    %% Create a process guaranteed to live, be constant and
+    %% break memsup process limit
+    ?line {memory, Bytes} = erlang:process_info(Pid,memory),
+    ?line SysUsage = Alloc/Total,
+    ?line ProcUsage = Bytes/Total,
+
+    if
+	SysUsage>SysThreshold ->
+	    ok;
+	SysUsage=<SysThreshold ->
+	    ?line ok = application:set_env(os_mon,
+					   sys_mem_high_watermark,
+					   0.5 * SysUsage),
+	    ?line ok = memsup:set_sysmem_high_watermark(0.5 * SysUsage)
+    end,
+    if
+	ProcUsage>ProcThreshold ->
+	    ok;
+	ProcUsage=<ProcThreshold ->
+	    ?line ok = application:set_env(os_mon,
+					   proc_mem_high_watermark,
+					   0.5 * ProcUsage),
+	    ?line ok = memsup:set_procmem_high_watermark(0.5 *ProcUsage)
+    end,
+    ?line ok = force_collection(),
+    ?t:sleep(?t:seconds(1)),
+    lists:foreach(fun(AlarmId) ->
+			  case alarm_set(AlarmId) of
+			      {true, _} -> ok;
+			      false ->
+				  ?line ?t:fail({alarm_not_set,
+						 AlarmId})
+			  end
+		  end,
+		  Alarms),
+
+    %% Kill guaranteed process...
+    Pid ! die,
+    %% Kill memsup
+    exit(whereis(memsup), faked_memsup_crash),
+    %% Wait a little to make sure memsup has been restarted,
+    %% then make sure the alarms are set once, but not twice
+    ?t:sleep(?t:seconds(1)),
+    ?line MemUsage = memsup:get_memory_data(),
+    SetAlarms = alarm_handler:get_alarms(),
+    case lists:foldl(fun(system_memory_high_watermark, {S, P}) ->
+			     {S+1, P};
+			(process_memory_high_watermark, {S, P}) ->
+			     {S, P+1};
+			(_AlarmId, Acc0) ->
+			     Acc0
+		     end,
+		     {0, 0},
+		     SetAlarms) of
+	{0, 0} ->
+	    ok;
+	_ ->
+	    ?line ?t:fail({bad_number_of_alarms, SetAlarms, MemUsage})
+    end,
+
+    %% Stop OS_Mon and make sure all memsup alarms are cleared
+    ?line ok = application:stop(os_mon),
+    ?t:sleep(?t:seconds(1)),
+    lists:foreach(fun(AlarmId) ->
+			  case alarm_set(AlarmId) of
+			      false -> ok;
+			      {true, _} ->
+				  ?line ?t:fail({alarm_is_set, AlarmId})
+			  end
+		  end,
+		  Alarms),
+
+    %% Reset configuration and restart OS_Mon
+    ?line ok = application:set_env(os_mon,memory_check_interval,1),
+    ?line ok = application:set_env(os_mon,sys_mem_high_watermark,0.8),
+    ?line ok = application:set_env(os_mon,proc_mem_high_watermark,0.05),
+    ?line ok = application:start(os_mon),
+
+    ok.
+
+%%----------------------------------------------------------------------
+%% Auxiliary
+%%----------------------------------------------------------------------
+
+force_collection() ->
+    erlang:trace(whereis(memsup), true, ['receive']),
+    memsup ! time_to_collect,
+    TimerRef = erlang:send_after(5000, self(), timeout),
+    force_collection(TimerRef).
+
+force_collection(TimerRef) ->
+    receive
+	{trace, _Pid, 'receive', {collected_sys, _Sys}} ->
+	    erlang:cancel_timer(TimerRef),
+	    erlang:trace(whereis(memsup), false, ['receive']),
+	    flush(),
+	    ok;
+	{trace, _Pid, 'receive', reg_collection_timeout} ->
+	    erlang:cancel_timer(TimerRef),
+	    erlang:trace(whereis(memsup), false, ['receive']),
+	    flush(),
+	    collection_timeout;
+	timout ->
+	    erlang:trace(whereis(memsup), false, ['receive']),
+	    flush(),
+	    timeout;
+	_Msg ->
+	    force_collection(TimerRef)
+    end.
+
+flush() ->
+    receive
+	{trace, _, _, _} ->
+	    flush();
+	timeout ->
+	    flush()
+    after 0 ->
+	    ok
+    end.
diff --git a/lib/os_mon/test/os_mon.cover b/lib/os_mon/test/os_mon.cover
new file mode 100644
index 0000000000..aa07391351
--- /dev/null
+++ b/lib/os_mon/test/os_mon.cover
@@ -0,0 +1,2 @@
+{incl_app,os_mon,details}.
+
diff --git a/lib/os_mon/test/os_mon.spec b/lib/os_mon/test/os_mon.spec
new file mode 100644
index 0000000000..d292b258f3
--- /dev/null
+++ b/lib/os_mon/test/os_mon.spec
@@ -0,0 +1 @@
+{suites,"../os_mon_test",all}.
diff --git a/lib/os_mon/test/os_mon_SUITE.erl b/lib/os_mon/test/os_mon_SUITE.erl
new file mode 100644
index 0000000000..dd0ab0fbba
--- /dev/null
+++ b/lib/os_mon/test/os_mon_SUITE.erl
@@ -0,0 +1,108 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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(os_mon_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+%% Test server specific exports
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases
+-export([app_file/1, config/1]).
+
+%% Default timetrap timeout (set in init_per_testcase)
+-define(default_timeout, ?t:minutes(1)).
+
+init_per_testcase(_Case, Config) ->
+    Dog = test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    case test_server:os_type() of
+	{unix, sunos} -> [app_file, config];
+	_OS -> [app_file]
+    end.
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+app_file(suite) ->
+    [];
+app_file(doc) ->
+    ["Testing .app file"];
+app_file(Config) when is_list(Config) ->
+    ?line ok = test_server:app_test(os_mon),
+    ok.
+
+config(suite) ->
+    [];
+config(doc) ->
+    ["Test OS_Mon configuration"];
+config(Config) when is_list(Config) ->
+
+    IsReg = fun(Name) -> is_pid(whereis(Name)) end,
+    IsNotReg = fun(Name) -> undefined == whereis(Name) end,
+
+    ?line ok = application:start(os_mon),
+    ?line true = lists:all(IsReg, [cpu_sup, disksup, memsup]),
+    ?line ok = application:stop(os_mon),
+
+    ?line ok = application:set_env(os_mon, start_cpu_sup, false),
+    ?line ok = application:start(os_mon),
+    ?line true = lists:all(IsReg, [disksup, memsup]),
+    ?line true = IsNotReg(cpu_sup),
+    ?line ok = application:stop(os_mon),
+    ?line ok = application:set_env(os_mon, start_cpu_sup, true),
+
+    ?line ok = application:set_env(os_mon, start_disksup, false),
+    ?line ok = application:start(os_mon),
+    ?line true = lists:all(IsReg, [cpu_sup, memsup]),
+    ?line true = IsNotReg(disksup),
+    ?line ok = application:stop(os_mon),
+    ?line ok = application:set_env(os_mon, start_disksup, true),
+
+    ?line ok = application:set_env(os_mon, start_memsup, false),
+    ?line ok = application:start(os_mon),
+    ?line true = lists:all(IsReg, [cpu_sup, disksup]),
+    ?line true = IsNotReg(memsup),
+    ?line ok = application:stop(os_mon),
+    ?line ok = application:set_env(os_mon, start_memsup, true),
+
+    ok.
diff --git a/lib/os_mon/test/os_mon_conf.erl b/lib/os_mon/test/os_mon_conf.erl
new file mode 100644
index 0000000000..5c1fa43047
--- /dev/null
+++ b/lib/os_mon/test/os_mon_conf.erl
@@ -0,0 +1,28 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2010. 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(os_mon_conf).
+-export([init/1,fin/1]).
+
+init(Conf) ->
+    RetVal = application:start(os_mon,temporary),
+    [{os_mon,RetVal}|Conf].
+
+fin(Conf) ->
+    application:stop(os_mon),
+    lists:keydelete(os_mon,1,Conf).
diff --git a/lib/os_mon/test/os_mon_mib_SUITE.erl b/lib/os_mon/test/os_mon_mib_SUITE.erl
new file mode 100644
index 0000000000..01feb3a57c
--- /dev/null
+++ b/lib/os_mon/test/os_mon_mib_SUITE.erl
@@ -0,0 +1,742 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2010. 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(os_mon_mib_SUITE).
+
+%-define(STANDALONE,1).
+
+-ifdef(STANDALONE).
+-define(line,erlang:display({line,?LINE}),).
+-define(config(A,B), config(A,B)).
+-else.
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("os_mon/include/OTP-OS-MON-MIB.hrl").
+-include_lib("snmp/include/snmp_types.hrl").
+-endif.
+
+% 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([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([]).
+-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).
+
+%%---------------------------------------------------------------------
+-ifdef(STANDALONE).
+-export([run/0]).
+run() ->
+    catch init_per_suite([]),
+    Ret = (catch update_load_table([])),
+    catch end_per_suite([]),
+    Ret.
+-else.
+
+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]}].
+
+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]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+-endif.
+%%---------------------------------------------------------------------
+%%--------------------------------------------------------------------
+%% 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) ->
+    ?line application:start(sasl),
+    ?line application:start(mnesia),
+    ?line application:start(os_mon),
+
+    %% Create initial configuration data for the snmp application
+    ?line PrivDir = ?config(priv_dir, Config),
+    ?line ConfDir = filename:join(PrivDir, "conf"),
+    ?line DbDir = filename:join(PrivDir,"db"),
+    ?line MgrDir =  filename:join(PrivDir,"mgr"),
+
+    ?line file:make_dir(ConfDir),
+    ?line file:make_dir(DbDir),
+    ?line file:make_dir(MgrDir),
+
+    {ok, HostName} = inet:gethostname(),
+    {ok, Addr} = inet:getaddr(HostName, inet),
+
+    ?line snmp_config:write_agent_snmp_files(ConfDir, ?CONF_FILE_VER,
+					     tuple_to_list(Addr), ?TRAP_UDP,
+					     tuple_to_list(Addr),
+					     ?AGENT_UDP, ?SYS_NAME),
+
+    ?line snmp_config:write_manager_snmp_files(MgrDir, tuple_to_list(Addr),
+					       ?MGR_PORT, ?MAX_MSG_SIZE,
+					       ?ENGINE_ID, [], [], []),
+
+    %% To make sure application:set_env is not overwritten by any
+    %% app-file settings.
+    ?line ok = application:load(snmp),
+
+    ?line application:set_env(snmp, agent, [{db_dir, DbDir},
+					    {config, [{dir, ConfDir}]},
+					    {agent_type, master},
+					    {agent_verbosity, trace},
+					    {net_if, [{verbosity, trace}]}]),
+    ?line application:set_env(snmp, manager, [{config, [{dir, MgrDir},
+							{db_dir, MgrDir},
+							{verbosity, trace}]},
+					      {server, [{verbosity, trace}]},
+					      {net_if, [{verbosity, trace}]},
+					      {versions, [v1, v2, v3]}]),
+    application:start(snmp),
+
+    %% Load the mibs that should be tested
+    otp_mib:load(snmp_master_agent),
+    os_mon_mib:load(snmp_master_agent),
+
+    [{agent_ip, Addr}| 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 = ?config(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
+%%---------------------------------------------------------------------
+load_unload(doc) ->
+    ["Test to unload and the reload the OTP.mib "];
+load_unload(suite) -> [];
+load_unload(Config) when list(Config) ->
+    ?line os_mon_mib:unload(snmp_master_agent),
+    ?line os_mon_mib:load(snmp_master_agent),
+    ok.
+%%---------------------------------------------------------------------
+
+update_load_table(doc) ->
+    ["check os_mon_mib:update_load_table error handling"];
+update_load_table(suite) ->
+    [];
+update_load_table(Config) when is_list(Config) ->
+    ?line Node = start_node(),
+    ?line ok = rpc:call(Node,application,start,[sasl]),
+    ?line ok = rpc:call(Node,application,start,[os_mon]),
+    ?line ok = os_mon_mib:update_load_table(),
+    ?line rpc:call(Node,application,stop,[os_mon]),
+    ?line ok = os_mon_mib:update_load_table(),
+    ?line stop_node(Node),
+    ok.
+
+otp_6351(doc) ->
+    ["like update_load_table, when memsup_system_only==true"];
+otp_6351(suite) ->
+    [];
+otp_6351(Config) when is_list(Config) ->
+    ?line Node = start_node(),
+    ?line ok = rpc:call(Node,application,start,[sasl]),
+    ?line ok = rpc:call(Node,application,load,[os_mon]),
+    ?line ok = rpc:call(Node,application,set_env,
+			[os_mon,memsup_system_only,true]),
+    ?line ok = rpc:call(Node,application,start,[os_mon]),
+    ?line Res = rpc:call(Node,os_mon_mib,get_load,[Node]),
+    if
+	is_tuple(Res), element(1, Res)==loadTable ->
+	    ?line ok;
+	true ->
+	    ?line ?t:fail(Res)
+    end,
+    ?line rpc:call(Node,application,stop,[os_mon]),
+    ?line stop_node(Node),
+    ok.
+
+
+
+
+%%---------------------------------------------------------------------
+get_mem_sys_mark(doc) ->
+    ["Simulates a get call to test the instrumentation function "
+     "for the loadMemorySystemWatermark variable."];
+get_mem_sys_mark(suite) ->
+    [];
+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;
+	_ ->
+	    ?line test_server:fail(sys_mark_value_not_integer)
+    end.
+%%---------------------------------------------------------------------
+get_mem_proc_mark(doc) ->
+    ["Simulates a get call to test the instrumentation function "
+     "for the loadMemoryErlProcWatermark variable."];
+get_mem_proc_mark(suite) ->
+    [];
+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;
+	_ ->
+	    ?line test_server:fail(proc_mark_value_not_integer)
+    end.
+%%---------------------------------------------------------------------
+get_disk_threshold(doc) ->
+    ["Simulates a get call to test the instrumentation function "
+     "for the diskAlmostFullThreshold variable."];
+get_disk_threshold(suite) ->
+    [];
+get_disk_threshold(Config) when is_list(Config) ->
+     case os_mon_mib:disk_threshold(get) of
+	{value, ProcMark} when is_integer(ProcMark) ->
+	    ok;
+	_ ->
+	    ?line test_server: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
+
+get_load_table(doc) ->
+    ["Simulates get calls to test the instrumentation function "
+     "for the loadTable"];
+get_load_table(suite) ->
+    [];
+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])),
+    ?line [{value, NodeStr},{value, PidStr}] =
+	os_mon_mib:load_table(get, [NodeLen  | NodeStr],
+			      [?loadErlNodeName, ?loadLargestErlProcess]),
+
+    ?line 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;
+	_ ->
+	    ?line test_server:fail(value_not_integer)
+    end,
+
+    ?line [{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(doc) ->
+    [];
+sys_tot_mem(suite) ->
+    [];
+sys_tot_mem(Config) when is_list(Config) ->
+    ?line [{[?loadSystemTotalMemory, Len | NodeStr], Mem}] =
+	os_mon_mib:load_table(get_next, [], [?loadSystemTotalMemory]),
+    ?line Len = length(NodeStr),
+    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+    case Mem of
+	Mem when is_integer(Mem) ->
+	    ok;
+	_ ->
+	    ?line test_server:fail(sys_tot_mem_value_not_integer)
+    end.
+
+sys_used_mem(doc) ->
+    [];
+sys_used_mem(suite) -> [];
+sys_used_mem(Config) when is_list(Config) ->
+    ?line [{[?loadSystemUsedMemory, Len | NodeStr], Mem}] =
+	os_mon_mib:load_table(get_next,[], [?loadSystemUsedMemory]),
+    ?line Len = length(NodeStr),
+    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+    case Mem of
+	Mem when is_integer(Mem) ->
+	    ok;
+	_ ->
+	    ?line test_server:fail(sys_used_mem_value_not_integer)
+    end.
+
+large_erl_process(doc) ->
+    [];
+large_erl_process(suite) ->
+    [];
+large_erl_process(Config) when is_list(Config) ->
+    {_, _, {Pid, _}} = memsup:get_memory_data(),
+    PidStr = lists:flatten(io_lib:format("~w", [Pid])),
+    ?line [{[?loadLargestErlProcess, Len | NodeStr], PidStr}] =
+	os_mon_mib:load_table(get_next,[], [?loadLargestErlProcess]),
+    ?line Len = length(NodeStr),
+    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+    ok.
+
+large_erl_process_mem(doc) ->
+    [];
+large_erl_process_mem(suite) ->
+    [];
+large_erl_process_mem(Config) when is_list(Config) ->
+
+    ?line [{[?loadLargestErlProcessUsedMemory, Len | NodeStr], Mem}] =
+	os_mon_mib:load_table(get_next,[],
+			      [?loadLargestErlProcessUsedMemory]),
+    ?line Len = length(NodeStr),
+    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+     case Mem of
+	Mem when is_integer(Mem) ->
+	    ok;
+	_ ->
+	    ?line test_server:fail(erl_pid_mem_value_not_integer)
+    end.
+
+cpu_load(doc) ->
+    [];
+cpu_load(suite) ->
+    [];
+cpu_load(Config) when list(Config) ->
+    ?line [{[?loadCpuLoad, Len | NodeStr], Load}] =
+	os_mon_mib:load_table(get_next,[], [?loadCpuLoad]),
+    ?line Len = length(NodeStr),
+    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+    case Load of
+	Load when is_integer(Load) ->
+	    ok;
+	_ ->
+	    ?line test_server:fail(cpu_load_value_not_integer)
+    end.
+
+cpu_load5(doc) ->
+    [];
+cpu_load5(suite) ->
+    [];
+cpu_load5(Config) when is_list(Config) ->
+    ?line [{[?loadCpuLoad5, Len | NodeStr], Load}] =
+	os_mon_mib:load_table(get_next,[], [?loadCpuLoad5]),
+    ?line Len = length(NodeStr),
+    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+    case Load of
+	Load when is_integer(Load) ->
+	    ok;
+	_ ->
+	    ?line test_server:fail(cpu_load5_value_not_integer)
+    end.
+
+cpu_load15(doc) ->
+    [];
+cpu_load15(suite) ->
+    [];
+cpu_load15(Config) when is_list(Config) ->
+    ?line [{[?loadCpuLoad15, Len | NodeStr], Load}] =
+	os_mon_mib:load_table(get_next,[], [?loadCpuLoad15]),
+    ?line Len = length(NodeStr),
+    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+     case Load of
+	 Load when is_integer(Load) ->
+	     ok;
+	 _ ->
+	     ?line test_server:fail(cpu_load15_value_not_integer)
+     end.
+
+os_wordsize(doc) ->
+    [];
+os_wordsize(suite) ->
+    [];
+os_wordsize(Config) when is_list(Config) ->
+    ?line [{[?loadOsWordsize, Len | NodeStr], Wordsize}] =
+	os_mon_mib:load_table(get_next,[], [?loadOsWordsize]),
+    ?line Len = length(NodeStr),
+    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+     case Wordsize of
+	 Wordsize when is_integer(Wordsize) ->
+	     ok;
+	 _ ->
+	     ?line test_server:fail(os_wordsize_value_not_integer)
+     end.
+
+sys_tot_mem64(doc) ->
+    [];
+sys_tot_mem64(suite) ->
+    [];
+sys_tot_mem64(Config) when is_list(Config) ->
+    ?line [{[?loadSystemTotalMemory64, Len | NodeStr], Mem}] =
+	os_mon_mib:load_table(get_next, [], [?loadSystemTotalMemory64]),
+    ?line Len = length(NodeStr),
+    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+    case Mem of
+	Mem when is_integer(Mem) ->
+	    ok;
+	_ ->
+	    ?line test_server:fail(sys_tot_mem_value_not_integer)
+    end.
+
+sys_used_mem64(doc) ->
+    [];
+sys_used_mem64(suite) -> [];
+sys_used_mem64(Config) when is_list(Config) ->
+    ?line [{[?loadSystemUsedMemory64, Len | NodeStr], Mem}] =
+	os_mon_mib:load_table(get_next,[], [?loadSystemUsedMemory64]),
+    ?line Len = length(NodeStr),
+    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+    case Mem of
+	Mem when is_integer(Mem) ->
+	    ok;
+	_ ->
+	    ?line test_server:fail(sys_used_mem_value_not_integer)
+    end.
+
+large_erl_process_mem64(doc) ->
+    [];
+large_erl_process_mem64(suite) ->
+    [];
+large_erl_process_mem64(Config) when is_list(Config) ->
+
+    ?line [{[?loadLargestErlProcessUsedMemory64, Len | NodeStr], Mem}] =
+	os_mon_mib:load_table(get_next,[],
+			      [?loadLargestErlProcessUsedMemory64]),
+    ?line Len = length(NodeStr),
+    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+     case Mem of
+	Mem when is_integer(Mem) ->
+	    ok;
+	_ ->
+	    ?line test_server:fail(erl_pid_mem_value_not_integer)
+    end.
+%%---------------------------------------------------------------------
+get_disk_table(doc) ->
+    ["Simulates get calls to test the instrumentation function "
+     "for the diskTable."];
+get_disk_table(suite) ->
+    [];
+get_disk_table(Config) when is_list(Config) ->
+
+    DiskData = disksup:get_disk_data(),
+    DiskDataLen = length(DiskData),
+
+    if
+	DiskDataLen > 0 ->
+	    ?line [{value, Value}] =
+		os_mon_mib:disk_table(get, [1,1], [?diskDescr]),
+
+	    case is_list(Value) of
+		true ->
+		    ok;
+		false ->
+		    ?line test_server:fail(value_not_a_string)
+	    end,
+
+	    ?line 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;
+		_ ->
+		    ?line test_server:fail(value_not_integer)
+	    end
+    end,
+
+    ?line [{noValue,noSuchInstance}, {noValue,noSuchInstance},
+	   {noValue,noSuchInstance}, {noValue,noSuchInstance}] =
+	os_mon_mib:disk_table(get, [1, DiskDataLen + 1], [?diskId,
+							  ?diskDescr,
+							  ?diskKBytes,
+							  ?diskCapacity]),
+
+    ok.
+
+%%---------------------------------------------------------------------
+
+disk_descr(doc) ->
+    [];
+disk_descr(suite) ->
+    [];
+disk_descr(Config) when is_list(Config) ->
+    ?line [{[?diskDescr, 1,1], Descr}] =
+	os_mon_mib:disk_table(get_next, [], [?diskDescr]),
+
+    case Descr of
+	Descr when is_list(Descr) ->
+	    ok;
+	_ ->
+	    ?line test_server:fail(disk_descr_value_not_a_string)
+    end.
+
+disk_kbytes(doc) ->
+    [];
+disk_kbytes(suite) -> [];
+disk_kbytes(Config) when is_list(Config) ->
+    ?line [{[?diskKBytes, 1,1], Kbytes}] =
+	os_mon_mib:disk_table(get_next,[], [?diskKBytes]),
+
+    case Kbytes of
+	Kbytes when is_integer(Kbytes) ->
+	    ok;
+	_ ->
+	    ?line test_server:fail(disk_kbytes_value_not_integer)
+    end.
+
+
+disk_capacity(doc) ->
+    [];
+disk_capacity(suite) -> [];
+disk_capacity(Config) when is_list(Config) ->
+    ?line [{[?diskCapacity, 1,1], Capacity}] =
+	os_mon_mib:disk_table(get_next,[], [?diskCapacity]),
+
+    case Capacity of
+	Capacity when is_integer(Capacity) ->
+	    ok;
+	_ ->
+	    ?line test_server:fail(disk_capacity_value_not_integer)
+    end.
+
+%%---------------------------------------------------------------------
+real_snmp_request(doc) ->
+    ["Starts an snmp manager and sends a real snmp-reques. i.e. "
+     "sends a udp message on the correct format."];
+real_snmp_request(suite) -> [];
+real_snmp_request(Config) when list(Config) ->
+    Agent_ip = ?config(agent_ip, Config),
+
+    ?line ok = snmpm:register_user(os_mon_mib_test, snmpm_user_default, []),
+    ?line ok = snmpm:register_agent(os_mon_mib_test, Agent_ip, ?AGENT_UDP),
+
+    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]),
+    ?line ok = snmp_get(Agent_ip,
+			[?loadEntry ++
+			 [?loadLargestErlProcess, Len | NodStr]],
+			PidStr),
+    ?line ok = snmp_get_next(Agent_ip,
+			     [?loadEntry ++
+			      [?loadSystemUsedMemory, Len | NodStr]],
+			     ?loadEntry ++ [?loadSystemUsedMemory + 1, Len
+					    | NodStr], PidStr),
+    ?line ok = snmp_set(Agent_ip, [?loadEntry ++
+				   [?loadLargestErlProcess,  Len | NodStr]],
+			s, "<0.101.0>"),
+    ok.
+
+otp_7441(doc) ->
+    ["Starts an snmp manager and requests total memory. Was previously
+     integer32 which was errornous on 64 bit machines."];
+otp_7441(suite) ->
+    [];
+otp_7441(Config) when is_list(Config) ->
+    Agent_ip = ?config(agent_ip, Config),
+
+
+    NodStr = atom_to_list(node()),
+    Len = length(NodStr),
+    Oids = [Oid|_] = [?loadEntry ++ [?loadSystemTotalMemory, Len | NodStr]],
+    ?line { ok, {noError,0,[#varbind{oid = Oid, variabletype = 'Unsigned32'}]}, _} =
+	snmpm:g(os_mon_mib_test, Agent_ip, ?AGENT_UDP, Oids),
+
+    ok.
+
+%%---------------------------------------------------------------------
+%% Internal functions
+%%---------------------------------------------------------------------
+-ifdef(STANDALONE).
+config(priv_dir,_) ->
+    "/tmp".
+
+start_node() ->
+    Host = hd(tl(string:tokens(atom_to_list(node()),"@"))),
+    {ok,Node} = slave:start(Host,testnisse),
+    net_adm:ping(testnisse),
+    Node.
+
+
+stop_node(Node) ->
+   rpc:call(Node,erlang,halt,[]).
+-else.
+start_node() ->
+    ?line Pa = filename:dirname(code:which(?MODULE)),
+    ?line {ok,Node} = test_server:start_node(testnisse, slave,
+					     [{args, " -pa " ++ Pa}]),
+    Node.
+
+stop_node(Node) ->
+    test_server:stop_node(Node).
+
+-endif.
+
+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({file, delete}, FullPathFiles),
+    file:del_dir(Dir).
+
+%%---------------------------------------------------------------------
+snmp_get(Agent_ip, Oids = [Oid |_], Result) ->
+    ?line {ok,{noError,0,[#varbind{oid = Oid,
+				   variabletype = 'OCTET STRING',
+				   value = Result}]}, _} =
+	snmpm:g(os_mon_mib_test, Agent_ip, ?AGENT_UDP, Oids),
+    ok.
+
+snmp_get_next(Agent_ip, Oids, NextOid, Result) ->
+    ?line {ok,{noError,0,[#varbind{oid = NextOid,
+				   variabletype = 'OCTET STRING',
+				   value = Result}]},_} =
+	snmpm:gn(os_mon_mib_test, Agent_ip, ?AGENT_UDP, Oids),
+    ok.
+
+snmp_set(Agent_ip, Oid, ValuType, Value) ->
+    ?line {ok, {notWritable, _, _}, _} =
+	snmpm:s(os_mon_mib_test,Agent_ip,?AGENT_UDP,[{Oid, ValuType, Value}]),
+    ok.
diff --git a/lib/os_mon/test/os_sup_SUITE.erl b/lib/os_mon/test/os_sup_SUITE.erl
new file mode 100644
index 0000000000..873db06317
--- /dev/null
+++ b/lib/os_mon/test/os_sup_SUITE.erl
@@ -0,0 +1,200 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2010. 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(os_sup_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+%% Test server specific exports
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases
+-export([message/1]).
+-export([config/1, port/1]).
+
+%% Default timetrap timeout (set in init_per_testcase)
+-define(default_timeout, ?t:minutes(1)).
+
+-define(TAG, test_tag).
+-define(MFA, {?MODULE, test_mfa, [?TAG]}).
+
+-export([test_mfa/2]).
+
+init_per_suite(Config) when is_list(Config) ->
+    spawn(fun() -> message_receptor() end),
+    ?line application:load(os_mon),
+    ?line ok = application:set_env(os_mon, start_os_sup, true),
+    ?line ok = application:set_env(os_mon, os_sup_mfa, ?MFA),
+    ?line ok = application:set_env(os_mon, os_sup_enable, false),
+    ?line ok = application:start(os_mon),
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    ?line application:stop(os_mon),
+    ?line ok = application:set_env(os_mon, start_os_sup, false),
+    MFA = {os_sup, error_report, [std_error]},
+    ?line ok = application:set_env(os_mon, os_sup_mfa, MFA),
+    ?line ok = application:set_env(os_mon, os_sup_enable, true),
+    ?line exit(whereis(message_receptor), done),
+    Config.
+
+init_per_testcase(_Case, Config) ->
+    Dog = ?t:timetrap(?default_timeout),
+    [{watchdog,Dog} | Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    case test_server:os_type() of
+	{unix, sunos} -> [message, config, port];
+	{win32, _OSname} -> [message];
+	OS ->
+	    Str = io_lib:format("os_sup not available for ~p",
+				[OS]),
+	    {skip, lists:flatten(Str)}
+    end.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+message(suite) ->
+    [];
+message(doc) ->
+    ["Test OS message handling"];
+message(Config) when is_list(Config) ->
+
+    %% Fake an OS message
+    Data = "10H11386278426HSystem4HTest5HError5HTesto",
+    ?line os_sup_server ! {faked_port, {data, Data}},
+
+    %% Check with message_receptor that it has been received
+    ?t:sleep(?t:seconds(1)),
+    Msg =
+	case ?t:os_type() of
+	    {unix, sunos} ->
+		{?TAG, Data};
+	    {win32, _} ->
+		{?TAG,{{1138,627842,0},"System","Test","Error","Testo"}}
+	end,
+    ?line message_receptor ! {check, self(), Msg},
+    receive
+	{result, true} ->
+	    ok;
+	{result, Rec} ->
+	    ?t:fail({no_message, Rec})
+    end,
+
+    ok.
+
+config(suite) ->
+    [];
+config(doc) ->
+    ["Test configuration"];
+config(Config) when is_list(Config) ->
+
+    %% os_sup_enable==true and os_sup_own/os_sup_syslogconf cannot
+    %% be tested as test_server is not running is root
+
+    %% os_sup_mfa is already tested, sort of (in init_per_suite)
+
+    %% os_sup_errortag should be tested, however
+
+    ok.
+
+port(suite) ->
+    [];
+port(doc) ->
+    ["Test that os_sup handles a terminating port program"];
+port(Config) when is_list(Config) ->
+    ?line Str = os:cmd("ps -e | grep '[f]errule'"),
+    case io_lib:fread("~s", Str) of
+	 {ok, [Pid], _Rest} ->
+
+	    %% Monitor os_sup_server
+	    ?line MonRef = erlang:monitor(process, os_sup_server),
+
+	    %% Kill the port program
+	    case os:cmd("kill -9 " ++ Pid) of
+		[] ->
+
+		    %% os_sup_server should now terminate
+		    receive
+			{'DOWN', MonRef, _, _, {port_died, _Reason}} ->
+			    ok;
+			{'DOWN', MonRef, _, _, Reason} ->
+			    ?line ?t:fail({unexpected_exit_reason, Reason})
+		    after
+			3000 ->
+			    ?line ?t:fail(still_alive)
+		    end,
+
+		    %% Give os_mon_sup time to restart os_sup
+		    ?t:sleep(?t:seconds(3)),
+		    ?line true = is_pid(whereis(os_sup_server)),
+
+		    ok;
+
+		Line ->
+		    erlang:demonitor(MonRef),
+		    {skip, {not_killed, Line}}
+	    end;
+	_ ->
+	    {skip, {os_pid_not_found}}
+    end.
+
+%%----------------------------------------------------------------------
+%% Auxiliary
+%%----------------------------------------------------------------------
+
+test_mfa(Message, Tag) ->
+    message_receptor ! {Tag, Message}.
+
+message_receptor() ->
+    register(message_receptor, self()),
+    message_receptor([]).
+
+message_receptor(Received) ->
+    receive
+	%% Check if a certain message has been received
+	{check, From, Msg} ->
+	    case lists:member(Msg, Received) of
+		true ->
+		    From ! {result, true},
+		    message_receptor(lists:delete(Msg, Received));
+		false ->
+		    From ! {result, Received},
+		    message_receptor(Received)
+	    end;
+
+	%% Save all other messages
+	Msg ->
+	    message_receptor([Msg|Received])
+    end.
diff --git a/lib/parsetools/doc/src/notes.xml b/lib/parsetools/doc/src/notes.xml
index 8a6f2c2714..77b3a1a657 100644
--- a/lib/parsetools/doc/src/notes.xml
+++ b/lib/parsetools/doc/src/notes.xml
@@ -30,6 +30,58 @@
   </header>
   <p>This document describes the changes made to the Parsetools application.</p>
 
+<section><title>Parsetools 2.0.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> The formating of Yecc's error messages has been
+	    improved. (Thanks to Joe Armstrong.) </p>
+          <p>
+	    Own Id: OTP-8919</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Parsetools 2.0.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Running HiPE-compiled Yecc parsers no longer results
+	    in a <c>function_clause</c> error.</p>
+          <p>
+	    Own Id: OTP-8771</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Parsetools 2.0.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Yecc failed to report reduce/reduce conflicts where
+	    one of the reductions involved the root symbol. This bug
+	    has been fixed. (Thanks to Manolis Papadakis.)</p>
+          <p>
+	    Own Id: OTP-8483</p>
+        </item>
+        <item>
+	    <p>A bug introduced in Parsetools 1.4.4 (R12B-2) has been
+	    fixed. (Thanks to Manolis Papadakis.)</p>
+          <p>
+	    Own Id: OTP-8486</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Parsetools 2.0.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/parsetools/include/yeccpre.hrl b/lib/parsetools/include/yeccpre.hrl
index 33a103d95f..80a3afbdb6 100644
--- a/lib/parsetools/include/yeccpre.hrl
+++ b/lib/parsetools/include/yeccpre.hrl
@@ -26,8 +26,8 @@
 parse(Tokens) ->
     yeccpars0(Tokens, {no_func, no_line}, 0, [], []).
 
--spec parse_and_scan({function() | {atom(), atom()}, [_]} | {atom(), atom(), [_]}) ->
-            yecc_ret().
+-spec parse_and_scan({function() | {atom(), atom()}, [_]}
+                     | {atom(), atom(), [_]}) -> yecc_ret().
 parse_and_scan({F, A}) -> % Fun or {M, F}
     yeccpars0([], {{F, A}, no_line}, 0, [], []);
 parse_and_scan({M, F, A}) ->
@@ -44,7 +44,7 @@ format_error(Message) ->
 
 %% To be used in grammar files to throw an error message to the parser
 %% toplevel. Doesn't have to be exported!
--compile({nowarn_unused_function,{return_error,2}}).
+-compile({nowarn_unused_function, return_error/2}).
 -spec return_error(integer(), any()) -> no_return().
 return_error(Line, Message) ->
     throw({error, {Line, ?MODULE, Message}}).
@@ -57,10 +57,7 @@ yeccpars0(Tokens, Tzr, State, States, Vstack) ->
         error: Error ->
             Stacktrace = erlang:get_stacktrace(),
             try yecc_error_type(Error, Stacktrace) of
-                {syntax_error, Token} ->
-                    yeccerror(Token);
-                {missing_in_goto_table=Tag, Symbol, State} ->
-                    Desc = {Symbol, State, Tag},
+                Desc ->
                     erlang:raise(error, {yecc_bug, ?CODE_VERSION, Desc},
                                  Stacktrace)
             catch _:_ -> erlang:raise(error, Error, Stacktrace)
@@ -70,13 +67,15 @@ yeccpars0(Tokens, Tzr, State, States, Vstack) ->
             Error
     end.
 
-yecc_error_type(function_clause, [{?MODULE,F,[State,_,_,_,Token,_,_]} | _]) ->
+yecc_error_type(function_clause, [{?MODULE,F,ArityOrArgs} | _]) ->
     case atom_to_list(F) of
-        "yeccpars2" ++ _ ->
-            {syntax_error, Token};
         "yeccgoto_" ++ SymbolL ->
             {ok,[{atom,_,Symbol}],_} = erl_scan:string(SymbolL),
-            {missing_in_goto_table, Symbol, State}
+            State = case ArityOrArgs of
+                        [S,_,_,_,_,_,_] -> S;
+                        _ -> state_is_unknown
+                    end,
+            {Symbol, State, missing_in_goto_table}
     end.
 
 yeccpars1([Token | Tokens], Tzr, State, States, Vstack) ->
@@ -141,11 +140,13 @@ yecctoken_end_location(Token) ->
         yecctoken_location(Token)
     end.
 
+-compile({nowarn_unused_function, yeccerror/1}).
 yeccerror(Token) ->
     Text = yecctoken_to_string(Token),
     Location = yecctoken_location(Token),
     {error, {Location, ?MODULE, ["syntax error before: ", Text]}}.
 
+-compile({nowarn_unused_function, yecctoken_to_string/1}).
 yecctoken_to_string(Token) ->
     case catch erl_scan:token_info(Token, text) of
         {text, Txt} -> Txt;
@@ -158,6 +159,7 @@ yecctoken_location(Token) ->
         _ -> element(2, Token)
     end.
 
+-compile({nowarn_unused_function, yecctoken2string/1}).
 yecctoken2string({atom, _, A}) -> io_lib:write(A);
 yecctoken2string({integer,_,N}) -> io_lib:write(N);
 yecctoken2string({float,_,F}) -> io_lib:write(F);
@@ -165,7 +167,7 @@ yecctoken2string({char,_,C}) -> io_lib:write_char(C);
 yecctoken2string({var,_,V}) -> io_lib:format("~s", [V]);
 yecctoken2string({string,_,S}) -> io_lib:write_unicode_string(S);
 yecctoken2string({reserved_symbol, _, A}) -> io_lib:write(A);
-yecctoken2string({_Cat, _, Val}) -> io_lib:write(Val);
+yecctoken2string({_Cat, _, Val}) -> io_lib:format("~p",[Val]);
 yecctoken2string({dot, _}) -> "'.'";
 yecctoken2string({'$end', _}) ->
     [];
diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl
index c4a47d008f..4119e2631b 100644
--- a/lib/parsetools/src/yecc.erl
+++ b/lib/parsetools/src/yecc.erl
@@ -1875,8 +1875,12 @@ format_conflict({Symbol, N, Reduce, Confl}) ->
 %%   - "__Stack" has been substituted for "Stack";
 %%   - several states can share yeccpars2_S_cont(), which reduces code size;
 %%   - instead if calling lists:nthtail() matching code is emitted.
+%%
+%% "1.4", parsetools-2.0.4:
+%% - yeccerror() is called when a syntax error is found (as in version 1.1).
+%% - the include file yeccpre.hrl has been changed.
 
--define(CODE_VERSION, "1.3").
+-define(CODE_VERSION, "1.4").
 -define(YECC_BUG(M, A), 
         iolist_to_binary([" erlang:error({yecc_bug,\"",?CODE_VERSION,"\",",
                           io_lib:fwrite(M, A), "}).\n\n"])).
@@ -2106,13 +2110,11 @@ output_call_to_includefile(NewState, St) ->
     fwrite(St, <<" yeccpars1(S, ~w, Ss, Stack, T, Ts, Tzr)">>, 
            [NewState]).
 
-output_state_actions_fini(State, #yecc{includefile_version = {1,1}}=St0) ->
-    %% Backward compatibility.
+output_state_actions_fini(State, St0) ->
+    %% Backward compatible.
     St10 = delim(St0, false),
     St = fwrite(St10, <<"yeccpars2_~w(_, _, _, _, T, _, _) ->\n">>, [State]),
-    fwrite(St, <<" yeccerror(T).\n\n">>, []);
-output_state_actions_fini(_State, St) ->
-    fwrite(St, <<".\n\n">>, []).
+    fwrite(St, <<" yeccerror(T).\n\n">>, []).
 
 output_reduce(St0, State, Terminal0, 
               #reduce{rule_nmbr = RuleNmbr, 
@@ -2416,7 +2418,7 @@ include1(Line, Inport, Outport, Nmbr_of_lines) ->
     include1(io:get_line(Inport, ''), Inport, Outport, Nmbr_of_lines + Incr).
 
 includefile_version([]) ->
-    {1,2};
+    {1,4};
 includefile_version(Includefile) ->
     case epp:open(Includefile, []) of
         {ok, Epp} ->
@@ -2432,7 +2434,7 @@ includefile_version(Includefile) ->
 parse_file(Epp) ->
     case epp:parse_erl_form(Epp) of
         {ok, {function,_Line,yeccpars1,7,_Clauses}} ->
-            {1,2};
+            {1,4};
         {eof,_Line} ->
             {1,1};
         _Form ->
diff --git a/lib/parsetools/src/yeccparser.erl b/lib/parsetools/src/yeccparser.erl
index 415547b4ce..63127802ee 100644
--- a/lib/parsetools/src/yeccparser.erl
+++ b/lib/parsetools/src/yeccparser.erl
@@ -38,16 +38,16 @@ line_of(Token) ->
 
 -type yecc_ret() :: {'error', _} | {'ok', _}.
 
--spec parse(_) -> yecc_ret().
+-spec parse(Tokens :: list()) -> yecc_ret().
 parse(Tokens) ->
-    yeccpars0(Tokens, false).
+    yeccpars0(Tokens, {no_func, no_line}, 0, [], []).
 
--spec parse_and_scan({function() | {atom(), atom()}, [_]} | {atom(), atom(), [_]}) ->
-            yecc_ret().
+-spec parse_and_scan({function() | {atom(), atom()}, [_]}
+                     | {atom(), atom(), [_]}) -> yecc_ret().
 parse_and_scan({F, A}) -> % Fun or {M, F}
-    yeccpars0([], {F, A});
+    yeccpars0([], {{F, A}, no_line}, 0, [], []);
 parse_and_scan({M, F, A}) ->
-    yeccpars0([], {{M, F}, A}).
+    yeccpars0([], {{{M, F}, A}, no_line}, 0, [], []).
 
 -spec format_error(any()) -> [char() | list()].
 format_error(Message) ->
@@ -60,54 +60,58 @@ format_error(Message) ->
 
 %% To be used in grammar files to throw an error message to the parser
 %% toplevel. Doesn't have to be exported!
--compile({nowarn_unused_function,{return_error,2}}).
+-compile({nowarn_unused_function, return_error/2}).
 -spec return_error(integer(), any()) -> no_return().
 return_error(Line, Message) ->
     throw({error, {Line, ?MODULE, Message}}).
 
--define(CODE_VERSION, "1.3").
+-define(CODE_VERSION, "1.4").
 
-yeccpars0(Tokens, MFA) ->
-    try yeccpars1(Tokens, MFA, 0, [], [])
+yeccpars0(Tokens, Tzr, State, States, Vstack) ->
+    try yeccpars1(Tokens, Tzr, State, States, Vstack)
     catch 
         error: Error ->
             Stacktrace = erlang:get_stacktrace(),
             try yecc_error_type(Error, Stacktrace) of
-                {syntax_error, Token} ->
-                    yeccerror(Token);
-                {missing_in_goto_table=Tag, Symbol, State} ->
-                    Desc = {Symbol, State, Tag},
+                Desc ->
                     erlang:raise(error, {yecc_bug, ?CODE_VERSION, Desc},
-                                Stacktrace)
+                                 Stacktrace)
             catch _:_ -> erlang:raise(error, Error, Stacktrace)
             end;
-        throw: {error, {_Line, ?MODULE, _M}} = Error -> 
-            Error % probably from return_error/2
+        %% Probably thrown from return_error/2:
+        throw: {error, {_Line, ?MODULE, _M}} = Error ->
+            Error
     end.
 
-yecc_error_type(function_clause, [{?MODULE,F,[State,_,_,_,Token,_,_]} | _]) ->
+yecc_error_type(function_clause, [{?MODULE,F,ArityOrArgs} | _]) ->
     case atom_to_list(F) of
-        "yeccpars2" ++ _ ->
-            {syntax_error, Token};
         "yeccgoto_" ++ SymbolL ->
             {ok,[{atom,_,Symbol}],_} = erl_scan:string(SymbolL),
-            {missing_in_goto_table, Symbol, State}
+            State = case ArityOrArgs of
+                        [S,_,_,_,_,_,_] -> S;
+                        _ -> state_is_unknown
+                    end,
+            {Symbol, State, missing_in_goto_table}
     end.
 
-yeccpars1([Token | Tokens], Tokenizer, State, States, Vstack) ->
-    yeccpars2(State, element(1, Token), States, Vstack, Token, Tokens, 
-              Tokenizer);
-yeccpars1([], {F, A}, State, States, Vstack) ->
+yeccpars1([Token | Tokens], Tzr, State, States, Vstack) ->
+    yeccpars2(State, element(1, Token), States, Vstack, Token, Tokens, Tzr);
+yeccpars1([], {{F, A},_Line}, State, States, Vstack) ->
     case apply(F, A) of
-        {ok, Tokens, _Endline} ->
-            yeccpars1(Tokens, {F, A}, State, States, Vstack);
-        {eof, _Endline} ->
-            yeccpars1([], false, State, States, Vstack);
+        {ok, Tokens, Endline} ->
+            yeccpars1(Tokens, {{F, A}, Endline}, State, States, Vstack);
+        {eof, Endline} ->
+            yeccpars1([], {no_func, Endline}, State, States, Vstack);
         {error, Descriptor, _Endline} ->
             {error, Descriptor}
     end;
-yeccpars1([], false, State, States, Vstack) ->
-    yeccpars2(State, '$end', States, Vstack, {'$end', 999999}, [], false).
+yeccpars1([], {no_func, no_line}, State, States, Vstack) ->
+    Line = 999999,
+    yeccpars2(State, '$end', States, Vstack, yecc_end(Line), [],
+              {no_func, Line});
+yeccpars1([], {no_func, Endline}, State, States, Vstack) ->
+    yeccpars2(State, '$end', States, Vstack, yecc_end(Endline), [],
+              {no_func, Endline}).
 
 %% yeccpars1/7 is called from generated code.
 %%
@@ -115,48 +119,73 @@ yeccpars1([], false, State, States, Vstack) ->
 %% yeccpars1/7 can be found by parsing the file without following
 %% include directives. yecc will otherwise assume that an old
 %% yeccpre.hrl is included (one which defines yeccpars1/5).
-yeccpars1(State1, State, States, Vstack, Stack1, [Token | Tokens], 
-          Tokenizer) ->
+yeccpars1(State1, State, States, Vstack, Token0, [Token | Tokens], Tzr) ->
     yeccpars2(State, element(1, Token), [State1 | States],
-              [Stack1 | Vstack], Token, Tokens, Tokenizer);
-yeccpars1(State1, State, States, Vstack, Stack1, [], {F, A}) ->
-    case apply(F, A) of
-        {ok, Tokens, _Endline} ->
-            yeccpars1(State1, State, States, Vstack, Stack1, Tokens, {F, A});
-        {eof, _Endline} ->
-            yeccpars1(State1, State, States, Vstack, Stack1, [], false);
-        {error, Descriptor, _Endline} ->
-            {error, Descriptor}
-    end;
-yeccpars1(State1, State, States, Vstack, Stack1, [], false) ->
-    yeccpars2(State, '$end', [State1 | States], [Stack1 | Vstack],
-              {'$end', 999999}, [], false).
+              [Token0 | Vstack], Token, Tokens, Tzr);
+yeccpars1(State1, State, States, Vstack, Token0, [], {{_F,_A}, _Line}=Tzr) ->
+    yeccpars1([], Tzr, State, [State1 | States], [Token0 | Vstack]);
+yeccpars1(State1, State, States, Vstack, Token0, [], {no_func, no_line}) ->
+    Line = yecctoken_end_location(Token0),
+    yeccpars2(State, '$end', [State1 | States], [Token0 | Vstack],
+              yecc_end(Line), [], {no_func, Line});
+yeccpars1(State1, State, States, Vstack, Token0, [], {no_func, Line}) ->
+    yeccpars2(State, '$end', [State1 | States], [Token0 | Vstack],
+              yecc_end(Line), [], {no_func, Line}).
+
+%% For internal use only.
+yecc_end({Line,_Column}) ->
+    {'$end', Line};
+yecc_end(Line) ->
+    {'$end', Line}.
+
+yecctoken_end_location(Token) ->
+    try
+        {text, Str} = erl_scan:token_info(Token, text),
+        {line, Line} = erl_scan:token_info(Token, line),
+        Parts = re:split(Str, "\n"),
+        Dline = length(Parts) - 1,
+        Yline = Line + Dline,
+        case erl_scan:token_info(Token, column) of
+            {column, Column} ->
+                Col = byte_size(lists:last(Parts)),
+                {Yline, Col + if Dline =:= 0 -> Column; true -> 1 end};
+            undefined ->
+                Yline
+        end
+    catch _:_ ->
+        yecctoken_location(Token)
+    end.
 
-% For internal use only.
 yeccerror(Token) ->
-    Text = case catch erl_scan:token_info(Token, text) of
-               {text, Txt} -> Txt;
-               _ -> yecctoken2string(Token)
-           end,
-    Location = case catch erl_scan:token_info(Token, location) of
-                   {location, Loc} -> Loc;
-                   _ -> element(2, Token)
-               end,
+    Text = yecctoken_to_string(Token),
+    Location = yecctoken_location(Token),
     {error, {Location, ?MODULE, ["syntax error before: ", Text]}}.
 
+yecctoken_to_string(Token) ->
+    case catch erl_scan:token_info(Token, text) of
+        {text, Txt} -> Txt;
+        _ -> yecctoken2string(Token)
+    end.
+
+yecctoken_location(Token) ->
+    case catch erl_scan:token_info(Token, location) of
+        {location, Loc} -> Loc;
+        _ -> element(2, Token)
+    end.
+
 yecctoken2string({atom, _, A}) -> io_lib:write(A);
 yecctoken2string({integer,_,N}) -> io_lib:write(N);
 yecctoken2string({float,_,F}) -> io_lib:write(F);
 yecctoken2string({char,_,C}) -> io_lib:write_char(C);
 yecctoken2string({var,_,V}) -> io_lib:format("~s", [V]);
 yecctoken2string({string,_,S}) -> io_lib:write_unicode_string(S);
-yecctoken2string({reserved_symbol, _, A}) -> io_lib:format("~w", [A]);
-yecctoken2string({_Cat, _, Val}) -> io_lib:format("~w", [Val]);
+yecctoken2string({reserved_symbol, _, A}) -> io_lib:write(A);
+yecctoken2string({_Cat, _, Val}) -> io_lib:write(Val);
 yecctoken2string({dot, _}) -> "'.'";
 yecctoken2string({'$end', _}) ->
     [];
 yecctoken2string({Other, _}) when is_atom(Other) ->
-    io_lib:format("~w", [Other]);
+    io_lib:write(Other);
 yecctoken2string(Other) ->
     io_lib:write(Other).
 
@@ -164,7 +193,7 @@ yecctoken2string(Other) ->
 
 
 
--file("yeccparser.erl", 168).
+-file("yeccparser.erl", 196).
 
 yeccpars2(0=S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_0(S, Cat, Ss, Stack, T, Ts, Tzr);
@@ -248,7 +277,9 @@ yeccpars2_0(S, integer, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_0(S, reserved_word, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 8, Ss, Stack, T, Ts, Tzr);
 yeccpars2_0(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 9, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 9, Ss, Stack, T, Ts, Tzr);
+yeccpars2_0(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_1(S, atom, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 6, Ss, Stack, T, Ts, Tzr);
@@ -267,10 +298,14 @@ yeccpars2_2(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_grammar(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
 
 yeccpars2_3(S, '->', Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 10, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 10, Ss, Stack, T, Ts, Tzr);
+yeccpars2_3(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
-yeccpars2_4(_S, '$end', _Ss, Stack,  _T, _Ts, _Tzr) ->
- {ok, hd(Stack)}.
+yeccpars2_4(_S, '$end', _Ss, Stack, _T, _Ts, _Tzr) ->
+ {ok, hd(Stack)};
+yeccpars2_4(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_5(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_grammar(hd(Ss), Cat, Ss, Stack, T, Ts, Tzr).
@@ -317,7 +352,9 @@ yeccpars2_13(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_symbols(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_14(S, dot, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 29, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 29, Ss, Stack, T, Ts, Tzr);
+yeccpars2_14(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_15(S, '->', Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 18, Ss, Stack, T, Ts, Tzr);
@@ -338,7 +375,9 @@ yeccpars2_15(S, reserved_word, Ss, Stack, T, Ts, Tzr) ->
 yeccpars2_15(S, string, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 26, Ss, Stack, T, Ts, Tzr);
 yeccpars2_15(S, var, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 27, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 27, Ss, Stack, T, Ts, Tzr);
+yeccpars2_15(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_16(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  [_|Nss] = Ss,
@@ -414,10 +453,14 @@ yeccpars2_29(_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccgoto_rule(hd(Nss), Cat, Nss, NewStack, T, Ts, Tzr).
 
 yeccpars2_30(S, dot, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 35, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 35, Ss, Stack, T, Ts, Tzr);
+yeccpars2_30(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_31(S, dot, Ss, Stack, T, Ts, Tzr) ->
- yeccpars1(S, 34, Ss, Stack, T, Ts, Tzr).
+ yeccpars1(S, 34, Ss, Stack, T, Ts, Tzr);
+yeccpars2_31(_, _, _, _, T, _, _) ->
+ yeccerror(T).
 
 yeccpars2_32(S, string, Ss, Stack, T, Ts, Tzr) ->
  yeccpars1(S, 32, Ss, Stack, T, Ts, Tzr);
@@ -486,7 +529,7 @@ yeccgoto_tokens(15=_S, Cat, Ss, Stack, T, Ts, Tzr) ->
 yeccgoto_tokens(17=_S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_28(_S, Cat, Ss, Stack, T, Ts, Tzr).
 
--compile({inline,{yeccpars2_6_,1}}).
+-compile({inline,yeccpars2_6_/1}).
 -file("yeccgramm.yrl", 44).
 yeccpars2_6_(__Stack0) ->
  [__1 | __Stack] = __Stack0,
@@ -494,7 +537,7 @@ yeccpars2_6_(__Stack0) ->
    symbol ( __1 )
   end | __Stack].
 
--compile({inline,{yeccpars2_7_,1}}).
+-compile({inline,yeccpars2_7_/1}).
 -file("yeccgramm.yrl", 45).
 yeccpars2_7_(__Stack0) ->
  [__1 | __Stack] = __Stack0,
@@ -502,7 +545,7 @@ yeccpars2_7_(__Stack0) ->
    symbol ( __1 )
   end | __Stack].
 
--compile({inline,{yeccpars2_8_,1}}).
+-compile({inline,yeccpars2_8_/1}).
 -file("yeccgramm.yrl", 46).
 yeccpars2_8_(__Stack0) ->
  [__1 | __Stack] = __Stack0,
@@ -510,7 +553,7 @@ yeccpars2_8_(__Stack0) ->
    symbol ( __1 )
   end | __Stack].
 
--compile({inline,{yeccpars2_9_,1}}).
+-compile({inline,yeccpars2_9_/1}).
 -file("yeccgramm.yrl", 43).
 yeccpars2_9_(__Stack0) ->
  [__1 | __Stack] = __Stack0,
@@ -518,14 +561,14 @@ yeccpars2_9_(__Stack0) ->
    symbol ( __1 )
   end | __Stack].
 
--compile({inline,{yeccpars2_11_,1}}).
+-compile({inline,yeccpars2_11_/1}).
 -file("yeccgramm.yrl", 40).
 yeccpars2_11_(__Stack0) ->
  [begin
    { erlang_code , [ { atom , 0 , '$undefined' } ] }
   end | __Stack0].
 
--compile({inline,{yeccpars2_12_,1}}).
+-compile({inline,yeccpars2_12_/1}).
 -file("yeccgramm.yrl", 35).
 yeccpars2_12_(__Stack0) ->
  [__1 | __Stack] = __Stack0,
@@ -533,7 +576,7 @@ yeccpars2_12_(__Stack0) ->
    [ __1 ]
   end | __Stack].
 
--compile({inline,{yeccpars2_13_,1}}).
+-compile({inline,yeccpars2_13_/1}).
 -file("yeccgramm.yrl", 36).
 yeccpars2_13_(__Stack0) ->
  [__2,__1 | __Stack] = __Stack0,
@@ -541,7 +584,7 @@ yeccpars2_13_(__Stack0) ->
    [ __1 | __2 ]
   end | __Stack].
 
--compile({inline,{yeccpars2_16_,1}}).
+-compile({inline,yeccpars2_16_/1}).
 -file("yeccgramm.yrl", 39).
 yeccpars2_16_(__Stack0) ->
  [__2,__1 | __Stack] = __Stack0,
@@ -549,7 +592,7 @@ yeccpars2_16_(__Stack0) ->
    { erlang_code , __2 }
   end | __Stack].
 
--compile({inline,{yeccpars2_17_,1}}).
+-compile({inline,yeccpars2_17_/1}).
 -file("yeccgramm.yrl", 41).
 yeccpars2_17_(__Stack0) ->
  [__1 | __Stack] = __Stack0,
@@ -557,7 +600,7 @@ yeccpars2_17_(__Stack0) ->
    [ __1 ]
   end | __Stack].
 
--compile({inline,{yeccpars2_18_,1}}).
+-compile({inline,yeccpars2_18_/1}).
 -file("yeccgramm.yrl", 55).
 yeccpars2_18_(__Stack0) ->
  [__1 | __Stack] = __Stack0,
@@ -565,7 +608,7 @@ yeccpars2_18_(__Stack0) ->
    { '->' , line_of ( __1 ) }
   end | __Stack].
 
--compile({inline,{yeccpars2_19_,1}}).
+-compile({inline,yeccpars2_19_/1}).
 -file("yeccgramm.yrl", 56).
 yeccpars2_19_(__Stack0) ->
  [__1 | __Stack] = __Stack0,
@@ -573,7 +616,7 @@ yeccpars2_19_(__Stack0) ->
    { ':' , line_of ( __1 ) }
   end | __Stack].
 
--compile({inline,{yeccpars2_24_,1}}).
+-compile({inline,yeccpars2_24_/1}).
 -file("yeccgramm.yrl", 53).
 yeccpars2_24_(__Stack0) ->
  [__1 | __Stack] = __Stack0,
@@ -581,7 +624,7 @@ yeccpars2_24_(__Stack0) ->
    { value_of ( __1 ) , line_of ( __1 ) }
   end | __Stack].
 
--compile({inline,{yeccpars2_25_,1}}).
+-compile({inline,yeccpars2_25_/1}).
 -file("yeccgramm.yrl", 54).
 yeccpars2_25_(__Stack0) ->
  [__1 | __Stack] = __Stack0,
@@ -589,7 +632,7 @@ yeccpars2_25_(__Stack0) ->
    { value_of ( __1 ) , line_of ( __1 ) }
   end | __Stack].
 
--compile({inline,{yeccpars2_28_,1}}).
+-compile({inline,yeccpars2_28_/1}).
 -file("yeccgramm.yrl", 42).
 yeccpars2_28_(__Stack0) ->
  [__2,__1 | __Stack] = __Stack0,
@@ -597,7 +640,7 @@ yeccpars2_28_(__Stack0) ->
    [ __1 | __2 ]
   end | __Stack].
 
--compile({inline,{yeccpars2_29_,1}}).
+-compile({inline,yeccpars2_29_/1}).
 -file("yeccgramm.yrl", 33).
 yeccpars2_29_(__Stack0) ->
  [__5,__4,__3,__2,__1 | __Stack] = __Stack0,
@@ -605,7 +648,7 @@ yeccpars2_29_(__Stack0) ->
    { rule , [ __1 | __3 ] , __4 }
   end | __Stack].
 
--compile({inline,{yeccpars2_32_,1}}).
+-compile({inline,yeccpars2_32_/1}).
 -file("yeccgramm.yrl", 37).
 yeccpars2_32_(__Stack0) ->
  [__1 | __Stack] = __Stack0,
@@ -613,7 +656,7 @@ yeccpars2_32_(__Stack0) ->
    [ __1 ]
   end | __Stack].
 
--compile({inline,{yeccpars2_33_,1}}).
+-compile({inline,yeccpars2_33_/1}).
 -file("yeccgramm.yrl", 38).
 yeccpars2_33_(__Stack0) ->
  [__2,__1 | __Stack] = __Stack0,
@@ -621,7 +664,7 @@ yeccpars2_33_(__Stack0) ->
    [ __1 | __2 ]
   end | __Stack].
 
--compile({inline,{yeccpars2_34_,1}}).
+-compile({inline,yeccpars2_34_/1}).
 -file("yeccgramm.yrl", 32).
 yeccpars2_34_(__Stack0) ->
  [__3,__2,__1 | __Stack] = __Stack0,
@@ -629,7 +672,7 @@ yeccpars2_34_(__Stack0) ->
    { __1 , __2 }
   end | __Stack].
 
--compile({inline,{yeccpars2_35_,1}}).
+-compile({inline,yeccpars2_35_/1}).
 -file("yeccgramm.yrl", 31).
 yeccpars2_35_(__Stack0) ->
  [__3,__2,__1 | __Stack] = __Stack0,
diff --git a/lib/parsetools/test/Makefile b/lib/parsetools/test/Makefile
index 19354b87b2..2d9d0a71e5 100644
--- a/lib/parsetools/test/Makefile
+++ b/lib/parsetools/test/Makefile
@@ -71,7 +71,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) parsetools.spec $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) parsetools.spec parsetools.cover $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	# @tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/parsetools/test/leex_SUITE.erl b/lib/parsetools/test/leex_SUITE.erl
index 069f780b5e..066d221ae7 100644
--- a/lib/parsetools/test/leex_SUITE.erl
+++ b/lib/parsetools/test/leex_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2010. 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
@@ -30,17 +30,19 @@
 -define(privdir, "leex_SUITE_priv").
 -define(t, test_server).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(datadir, ?config(data_dir, Config)).
 -define(privdir, ?config(priv_dir, Config)).
 -endif.
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([checks/1,
-             file/1, compile/1, syntax/1,
-         examples/1,
-             pt/1, man/1, ex/1, ex2/1, not_yet/1]).
+-export([
+	 file/1, compile/1, syntax/1,
+	 
+	 pt/1, man/1, ex/1, ex2/1, not_yet/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -49,15 +51,33 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> [checks, examples].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, checks}, {group, examples}].
+
+groups() -> 
+    [{checks, [], [file, compile, syntax]},
+     {examples, [], [pt, man, ex, ex2, not_yet]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-checks(suite) ->
-    [file, compile, syntax].
 
 file(doc) ->
     "Bad files and options.";
@@ -330,8 +350,6 @@ syntax(Config) when is_list(Config) ->
         leex:file(Filename, Ret),
     ok.
 
-examples(suite) ->
-    [pt,man,ex,ex2,not_yet].
 
 pt(doc) ->
     "Pushing back characters.";
diff --git a/lib/parsetools/test/parsetools.cover b/lib/parsetools/test/parsetools.cover
new file mode 100644
index 0000000000..13f84e3ba6
--- /dev/null
+++ b/lib/parsetools/test/parsetools.cover
@@ -0,0 +1,2 @@
+{incl_app,parsetools,details}.
+
diff --git a/lib/parsetools/test/parsetools.spec b/lib/parsetools/test/parsetools.spec
index 5b34633378..870d57baf1 100644
--- a/lib/parsetools/test/parsetools.spec
+++ b/lib/parsetools/test/parsetools.spec
@@ -1 +1 @@
-{topcase, {dir, "../parsetools_test"}}.
+{suites,"../parsetools_test",all}.
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index 61e2456323..8e27ddb13d 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -29,24 +29,26 @@
 -define(privdir, "yecc_SUITE_priv").
 -define(t, test_server).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(datadir, ?config(data_dir, Config)).
 -define(privdir, ?config(priv_dir, Config)).
 -endif.
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([app_test/1,
-         checks/1, 
-             file/1, syntax/1, compile/1, rules/1, expect/1,
-             conflicts/1,
-         examples/1,
-             empty/1, prec/1, yeccpre/1, lalr/1, old_yecc/1, 
-             other_examples/1,
-         bugs/1, 
-             otp_5369/1, otp_6362/1, otp_7945/1, otp_8483/1, otp_8486/1,
-         improvements/1,
-             otp_7292/1, otp_7969/1]).
+	 
+	 file/1, syntax/1, compile/1, rules/1, expect/1,
+	 conflicts/1,
+	 
+	 empty/1, prec/1, yeccpre/1, lalr/1, old_yecc/1, 
+	 other_examples/1,
+	 
+	 otp_5369/1, otp_6362/1, otp_7945/1, otp_8483/1, otp_8486/1,
+	 
+	 otp_7292/1, otp_7969/1, otp_8919/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -55,12 +57,38 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> [app_test, checks, examples, bugs, improvements].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [app_test, {group, checks}, {group, examples},
+     {group, bugs}, {group, improvements}].
+
+groups() -> 
+    [{checks, [],
+      [file, syntax, compile, rules, expect, conflicts]},
+     {examples, [],
+      [empty, prec, yeccpre, lalr, old_yecc, other_examples]},
+     {bugs, [],
+      [otp_5369, otp_6362, otp_7945, otp_8483, otp_8486]},
+     {improvements, [], [otp_7292, otp_7969, otp_8919]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 app_test(doc) ->
     ["Tests the applications consistency."];
@@ -70,8 +98,6 @@ app_test(Config) when is_list(Config) ->
     ?line ok=?t:app_test(parsetools),
     ok.
 
-checks(suite) ->
-    [file, syntax, compile, rules, expect, conflicts].
 
 file(doc) ->
     "Bad files and options.";
@@ -298,8 +324,8 @@ syntax(Config) when is_list(Config) ->
                           {_,[{L1,_,{undefined_function,{yeccpars2_2_,1}}},
                               {L2,_,{bad_inline,{yeccpars2_2_,1}}}]}],
                    []} = compile:file(Parserfile1, [basic_validation,return]),
-            ?line L1 = 24 + SzYeccPre,
-            ?line L2 = 31 + SzYeccPre
+            ?line L1 = 28 + SzYeccPre,
+            ?line L2 = 35 + SzYeccPre
     end(),
 
     %% Bad macro in action. OTP-7224.
@@ -316,8 +342,8 @@ syntax(Config) when is_list(Config) ->
                           {_,[{L1,_,{undefined_function,{yeccpars2_2_,1}}},
                               {L2,_,{bad_inline,{yeccpars2_2_,1}}}]}],
                    []} = compile:file(Parserfile1, [basic_validation,return]),
-            ?line L1 = 24 + SzYeccPre,
-            ?line L2 = 31 + SzYeccPre
+            ?line L1 = 28 + SzYeccPre,
+            ?line L2 = 35 + SzYeccPre
     end(),
 
     %% Check line numbers. OTP-7224.
@@ -730,8 +756,6 @@ rules(Config) when is_list(Config) ->
     ?line run(Config, Ts),
     ok.
 
-examples(suite) ->
-    [empty, prec, yeccpre, lalr, old_yecc, other_examples].
 
 expect(doc) ->
     "Check of expect.";
@@ -1283,8 +1307,6 @@ other_examples(Config) when is_list(Config) ->
     ?line run(Config, Ts),
     ok.
 
-bugs(suite) ->
-    [otp_5369, otp_6362, otp_7945, otp_8483, otp_8486].
 
 otp_5369(doc) ->
     "OTP-5369. A bug in parse_and_scan reported on erlang questions.";
@@ -1540,9 +1562,6 @@ otp_8486(Config) when is_list(Config) ->
     ?line run(Config, Ts),
     ok.
 
-improvements(suite) ->
-    [otp_7292, otp_7969].
-
 otp_7292(doc) ->
     "OTP-7292. Header declarations for edoc.";
 otp_7292(suite) -> [];
@@ -1584,8 +1603,8 @@ otp_7292(Config) when is_list(Config) ->
                         {L2,_,{bad_inline,{yeccpars2_2_,1}}}]}],
                    [{_,[{16,_,{unused_function,{foo,0}}}]}]} = 
                 compile:file(Parserfile1, [basic_validation, return]),
-            ?line L1 = 34 + SzYeccPre,
-            ?line L2 = 41 + SzYeccPre
+            ?line L1 = 38 + SzYeccPre,
+            ?line L2 = 45 + SzYeccPre
     end(),
 
     YeccPre = filename:join(Dir, "yeccpre.hrl"),
@@ -1602,8 +1621,8 @@ otp_7292(Config) when is_list(Config) ->
                         {L2,_,{bad_inline,{yeccpars2_2_,1}}}]}],
                    [{_,[{16,_,{unused_function,{foo,0}}}]}]} = 
                 compile:file(Parserfile1, [basic_validation, return]),
-            ?line L1 = 33 + SzYeccPre,
-            ?line L2 = 40 + SzYeccPre
+            ?line L1 = 37 + SzYeccPre,
+            ?line L2 = 44 + SzYeccPre
     end(),
 
     file:delete(YeccPre),
@@ -1773,6 +1792,14 @@ otp_7969(Config) when is_list(Config) ->
     ?line {error,{{1,11},erl_parse,_}} = erl_parse:parse_and_scan({F6, []}),
     ok.
 
+otp_8919(doc) ->
+    "OTP-8919. Improve formating of Yecc error messages.";
+otp_8919(suite) -> [];
+otp_8919(Config) when is_list(Config) ->
+    {error,{1,Mod,Mess}} = erl_parse:parse([{cat,1,"hello"}]),
+    "syntax error before: \"hello\"" = lists:flatten(Mod:format_error(Mess)),
+    ok.
+
 yeccpre_size() ->
     yeccpre_size(default_yeccpre()).
 
diff --git a/lib/parsetools/vsn.mk b/lib/parsetools/vsn.mk
index b1354e89d8..812bf21f03 100644
--- a/lib/parsetools/vsn.mk
+++ b/lib/parsetools/vsn.mk
@@ -1 +1 @@
-PARSETOOLS_VSN = 2.0.2
+PARSETOOLS_VSN = 2.0.5
diff --git a/lib/percept/src/egd.erl b/lib/percept/src/egd.erl
index 4fb5b6c46a..63e5c30572 100644
--- a/lib/percept/src/egd.erl
+++ b/lib/percept/src/egd.erl
@@ -42,6 +42,7 @@
 %%==========================================================================
 
 %% @type egd_image()
+%% @type font()
 %% @type point() = {integer(), integer()}
 %% @type color()  
 %% @type render_option() = {render_engine, opaque} | {render_engine, alpha}
diff --git a/lib/percept/src/percept.erl b/lib/percept/src/percept.erl
index f5e0f7e469..3a2d9f7601 100644
--- a/lib/percept/src/percept.erl
+++ b/lib/percept/src/percept.erl
@@ -185,10 +185,27 @@ stop_webserver() ->
     	undefined -> 
 	    {error, not_started};
 	Pid ->
-	    Pid ! {self(), get_port},
-	    receive Port -> ok end,
-	    Pid ! quit,
-	    stop_webserver(Port)
+            do_stop([], Pid)
+    end.
+
+do_stop([], Pid)->
+    Pid ! {self(), get_port},
+    Port = receive P -> P end,
+    do_stop(Port, Pid);
+do_stop(Port, [])->
+    case whereis(percept_httpd) of
+        undefined ->
+            {error, not_started};
+        Pid ->
+            do_stop(Port, Pid)
+    end;
+do_stop(Port, Pid)->
+    case find_service_pid_from_port(inets:services_info(), Port) of
+        undefined ->
+            {error, not_started};
+        Pid2 ->
+            Pid ! quit,
+            inets:stop(httpd, Pid2)
     end.
 
 %% @spec stop_webserver(integer()) -> ok | {error, not_started}
@@ -196,12 +213,7 @@ stop_webserver() ->
 %% @hidden
 
 stop_webserver(Port) ->
-    case find_service_pid_from_port(inets:services_info(), Port) of
-	undefined ->
-	    {error, not_started};
-	Pid ->
-	    inets:stop(httpd, Pid)
-    end. 
+    do_stop(Port,[]).
 
 %%==========================================================================
 %%
diff --git a/lib/percept/src/percept_db.erl b/lib/percept/src/percept_db.erl
index edb0d79a29..52e9afb78f 100644
--- a/lib/percept/src/percept_db.erl
+++ b/lib/percept/src/percept_db.erl
@@ -33,7 +33,7 @@
 	]).
 
 -include("percept.hrl").
-
+-define(STOP_TIMEOUT, 1000).
 %%==========================================================================
 %%
 %% 		Type definitions 
@@ -77,17 +77,32 @@
 start() ->
     case erlang:whereis(percept_db) of
     	undefined ->
-	    Pid = spawn( fun() -> init_percept_db() end),
-	    erlang:register(percept_db, Pid),
-	    {started, Pid};
+	    {started, do_start()};
 	PerceptDB ->
-	    erlang:unregister(percept_db),
-	    PerceptDB ! {action, stop},
-	    Pid = spawn( fun() -> init_percept_db() end),
-	    erlang:register(percept_db, Pid),
-	    {restarted, Pid}
+	    {restarted, restart(PerceptDB)}
     end.
 
+%% @spec restart(pid()) -> pid()
+%% @private
+%% @doc restarts the percept database.
+
+-spec restart(pid())-> pid().
+
+restart(PerceptDB)->
+        stop_sync(PerceptDB),
+        do_start().
+
+%% @spec do_start(pid()) -> pid()
+%% @private
+%% @doc starts the percept database.
+
+-spec do_start()-> pid().
+
+do_start()->
+    Pid = spawn( fun() -> init_percept_db() end),
+    erlang:register(percept_db, Pid),
+    Pid.
+
 %% @spec stop() -> not_started | {stopped, Pid}
 %%	Pid = pid()
 %% @doc Stops the percept database.
@@ -103,6 +118,22 @@ stop() ->
 	    {stopped, Pid}
     end.
 
+%% @spec stop_sync(pid()) -> true
+%% @private
+%% @doc Stops the percept database, with a synchronous call.
+
+-spec stop_sync(pid())-> true.
+
+stop_sync(Pid)->
+    MonitorRef = erlang:monitor(process, Pid),
+    stop(),
+    receive
+        {'DOWN', MonitorRef, _Type, Pid, _Info}->
+            true
+    after ?STOP_TIMEOUT->
+            exit(Pid, kill)
+    end.
+
 %% @spec insert(tuple()) -> ok
 %% @doc Inserts a trace or profile message to the database.  
 
diff --git a/lib/percept/test/Makefile b/lib/percept/test/Makefile
index 0984b02c81..0420ce40f2 100644
--- a/lib/percept/test/Makefile
+++ b/lib/percept/test/Makefile
@@ -82,7 +82,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) percept.spec $(EMAKEFILE) $(SOURCE) $(RELSYSDIR)
+	$(INSTALL_DATA) percept.spec percept.cover $(EMAKEFILE) $(SOURCE) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/percept/test/egd_SUITE.erl b/lib/percept/test/egd_SUITE.erl
index fde02b47d5..39d87efcf8 100644
--- a/lib/percept/test/egd_SUITE.erl
+++ b/lib/percept/test/egd_SUITE.erl
@@ -18,10 +18,10 @@
 %%
 
 -module(egd_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -54,16 +54,22 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    % Test cases
-    [	
-	image_create_and_destroy, 
-	image_shape, 
-	image_primitives,
-	image_colors, 
-	image_font, 
-	image_png_compliant
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [image_create_and_destroy, image_shape,
+     image_primitives, image_colors, image_font,
+     image_png_compliant].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%----------------------------------------------------------------------
 %% Tests
diff --git a/lib/percept/test/percept.cover b/lib/percept/test/percept.cover
new file mode 100644
index 0000000000..8a5ad0a55e
--- /dev/null
+++ b/lib/percept/test/percept.cover
@@ -0,0 +1,2 @@
+{incl_app,percept,details}.
+
diff --git a/lib/percept/test/percept.spec b/lib/percept/test/percept.spec
index 75aacc1fd6..f3ef76bd60 100644
--- a/lib/percept/test/percept.spec
+++ b/lib/percept/test/percept.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../percept_test"}}.
-
+{suites,"../percept_test",all}.
diff --git a/lib/percept/test/percept_SUITE.erl b/lib/percept/test/percept_SUITE.erl
index ff7cccdaa8..411fcd78f3 100644
--- a/lib/percept/test/percept_SUITE.erl
+++ b/lib/percept/test/percept_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -18,10 +18,10 @@
 %%
 
 -module(percept_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -51,12 +51,20 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    % Test cases
-    [	webserver,
-	profile,
-	analyze,
-	analyze_dist].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [webserver, profile, analyze, analyze_dist].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%----------------------------------------------------------------------
 %% Tests
@@ -70,6 +78,10 @@ webserver(Config) when is_list(Config) ->
     % Explicit start inets?
     ?line {started, _, Port} = percept:start_webserver(),
     ?line ok = percept:stop_webserver(Port), 
+    ?line {started, _, _} = percept:start_webserver(),
+    ?line ok = percept:stop_webserver(),
+    ?line {started, _, NewPort} = percept:start_webserver(),
+    ?line ok = percept:stop_webserver(NewPort),
     ?line application:stop(inets),
     ok.
 
diff --git a/lib/percept/test/percept_db_SUITE.erl b/lib/percept/test/percept_db_SUITE.erl
new file mode 100644
index 0000000000..79be9714ba
--- /dev/null
+++ b/lib/percept/test/percept_db_SUITE.erl
@@ -0,0 +1,76 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-2010. 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(percept_db_SUITE).
+-include("test_server.hrl").
+
+%% Test server specific exports
+-export([all/1]).
+-export([init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases
+-export([
+	start/1
+	]).
+
+%% Default timetrap timeout (set in init_per_testcase)
+-define(default_timeout, ?t:minutes(2)).
+-define(restarts, 10).
+-define(alive_timeout, 500).
+
+init_per_suite(Config) when is_list(Config) ->
+    Config.
+
+end_per_suite(Config) when is_list(Config) ->
+    Config.
+
+init_per_testcase(_Case, Config) ->
+    Dog = ?t:timetrap(?default_timeout),
+    [{max_size, 300}, {watchdog,Dog} | Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+all(suite) ->
+    % Test cases
+    [start].
+
+%%----------------------------------------------------------------------
+%% Tests
+%%----------------------------------------------------------------------
+
+start(suite) ->
+    [];
+start(doc) ->
+    ["Percept_db start and restart test."];
+start(Config) when is_list(Config) ->
+    ok = restart(?restarts),
+    {stopped, _DB} = percept_db:stop(),
+    ok.
+
+restart(0)->
+    ok;
+restart(N)->
+    {_, DB} = percept_db:start(),
+    timer:sleep(?alive_timeout),
+    true = erlang:is_process_alive(DB),
+    restart(N-1).
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1
index c0cf440496..ad704191a9 100644
--- a/lib/public_key/asn1/OTP-PKIX.asn1
+++ b/lib/public_key/asn1/OTP-PKIX.asn1
@@ -302,18 +302,25 @@ SupportedPublicKeyAlgorithms PUBLIC-KEY-ALGORITHM-CLASS ::= {
 
    --   DSA Keys and Signatures
 
+
+      DSAParams  ::=  CHOICE
+       {
+        params     Dss-Parms,
+        null       NULL
+       }
+
    -- SubjectPublicKeyInfo:
 
    dsa PUBLIC-KEY-ALGORITHM-CLASS ::= {
        ID id-dsa
-       TYPE Dss-Parms -- XXX Must be OPTIONAL
+       TYPE DSAParams -- XXX Must be OPTIONAL
        PUBLIC-KEY-TYPE DSAPublicKey }
 
    -- Certificate.signatureAlgorithm
 
    dsa-with-sha1 SIGNATURE-ALGORITHM-CLASS ::= {
-		 ID id-dsa-with-sha1 
-		 TYPE Dss-Parms } 
+		 ID id-dsa-with-sha1
+		 TYPE  DSAParams }
 
 				  --
    --   RSA Keys and Signatures
diff --git a/lib/public_key/doc/src/cert_records.xml b/lib/public_key/doc/src/cert_records.xml
index 8cfe57f670..0d6113acef 100644
--- a/lib/public_key/doc/src/cert_records.xml
+++ b/lib/public_key/doc/src/cert_records.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -37,7 +37,7 @@
   <p>This chapter briefly describes erlang records derived from asn1
   specifications used to handle X509 certificates. The intent is to
   describe the data types and not to specify the meaning of each
-  component for this we refer you to RFC 3280.
+  component for this we refer you to RFC 5280.
   </p>
 
   <p>Use the following include directive to get access to the
@@ -45,11 +45,7 @@
   
   <code> -include_lib("public_key/include/public_key.hrl"). </code>
 
-  <p>The used specification is available in <c>OTP-PKIX.asn1</c>,
-    which is an amelioration of
-    the <c>PKIX1Explicit88.asn1</c>, <c>PKIX1Implicit88.asn1</c>
-    and <c>PKIX1Algorithms88.asn1</c> modules.     
-    You find all these modules in the <c>asn1</c> subdirectory
+  <p>The used asn1 specifications are available <c>asn1</c> subdirectory
     of the application <c>public_key</c>.
   </p>
 
@@ -62,6 +58,9 @@
      marker="public_key">public key reference manual </seealso> or
     follows here.</p>
 
+    <p><c>oid() - a tuple of integers 
+    as generated by the asn1 compiler.</c></p>
+
     <p><c>time() = uct_time() | general_time()</c></p>
     
     <p><c>uct_time() = {utcTime, "YYMMDDHHMMSSZ"} </c></p>
@@ -119,9 +118,31 @@
 	  algorithm,  % oid() 
 	  parameters  % asn1_der_encoded()
 	 }.
+</code>
+
+<code>
+#'OTPCertificate'{
+		tbsCertificate,        % #'OTPTBSCertificate'{}
+		signatureAlgorithm,    % #'SignatureAlgorithm'
+		signature              % {0, binary()} - asn1 compact bitstring
+	       }.
+
+#'OTPTBSCertificate'{
+	  version,              % v1 | v2 | v3 
+	  serialNumber,         % integer() 
+	  signature,            % #'SignatureAlgorithm'
+	  issuer,               % {rdnSequence, [#AttributeTypeAndValue'{}]} 
+	  validity,             % #'Validity'{}
+	  subject,              % {rdnSequence, [#AttributeTypeAndValue'{}]} 
+	  subjectPublicKeyInfo, % #'SubjectPublicKeyInfo'{}
+	  issuerUniqueID,       % binary() | asn1_novalue
+	  subjectUniqueID,      % binary() | asn1_novalue
+	  extensions            % [#'Extension'{}] 
+	 }.
+	  
 #'SignatureAlgorithm'{
 	  algorithm,  % id_signature_algorithm()
-	  parameters  % public_key_params()
+	  parameters  % asn1_novalue | #'Dss-Parms'{}
 	 }.
 </code>
 
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 33a424f432..befbd3e586 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>2008</year>
-      <year>2008</year>
+      <year>2010</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -33,6 +33,140 @@
     <rev>A</rev>
     <file>notes.xml</file>
   </header>
+
+<section><title>Public_Key 0.10</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improved dialyzer specs.</p>
+          <p>
+	    Own Id: OTP-8964</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Public_Key 0.9</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Updated ssl to ignore CA certs that violate the asn1-spec
+	    for a certificate, and updated public key asn1 spec to
+	    handle inherited DSS-params.</p>
+          <p>
+	    Own Id: OTP-7884</p>
+        </item>
+        <item>
+          <p>
+	    Changed ssl implementation to retain backwards
+	    compatibility for old option {verify, 0} that shall be
+	    equivalent to {verify, verify_none}, also separate the
+	    cases unknown ca and selfsigned peer cert, and restored
+	    return value of deprecated function
+	    public_key:pem_to_der/1.</p>
+          <p>
+	    Own Id: OTP-8858</p>
+        </item>
+        <item>
+          <p>
+	    Better handling of v1 and v2 certificates. V1 and v2
+	    certificates does not have any extensions so then
+	    validate_extensions should just accept that there are
+	    none and not end up in missing_basic_constraints clause.</p>
+          <p>
+	    Own Id: OTP-8867</p>
+        </item>
+        <item>
+          <p>
+	    Changed the verify fun so that it differentiate between
+	    the peer certificate and CA certificates by using
+	    valid_peer or valid as the second argument to the verify
+	    fun. It may not always be trivial or even possible to
+	    know when the peer certificate is reached otherwise.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8873</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Public_Key 0.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Handling of unknown CA certificates was changed in ssl
+	    and public_key to work as intended.</p>
+          <p>
+	    Own Id: OTP-8788</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Revise the public_key API - Cleaned up and documented the
+	    public_key API to make it useful for general use, also
+	    changed ssl to use the new API.</p>
+          <p>
+	    Own Id: OTP-8722</p>
+        </item>
+        <item>
+          <p>
+	    Added the functionality so that the verification fun will
+	    be called when a certificate is considered valid by the
+	    path validation to allow access to each certificate in
+	    the path to the user application. Also try to verify
+	    subject-AltName, if unable to verify it let the
+	    application verify it.</p>
+          <p>
+	    Own Id: OTP-8825</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Public_Key 0.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            Certificates without any extensions could not be handled
+            by public_key.</p>
+          <p>
+            Own Id: OTP-8626</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+            Code cleanup and minor bugfixes.</p>
+          <p>
+            Own Id: OTP-8649</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 0.6</title>
 
 <section><title>Improvements and New Features</title>
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index dc9a96906f..91e058f74e 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -34,11 +34,7 @@
   <modulesummary> API module for public key infrastructure.</modulesummary>
   <description>
     <p>This module provides functions to handle public key infrastructure
-    from RFC 3280 - X.509 certificates (will later be upgraded to RFC 5280)
-    and some parts of the PKCS-standard.
-    Currently this application is mainly used by the new
-    ssl implementation. The API is yet under construction 
-    and only a few of the functions are currently documented and thereby supported.
+    from RFC 5280 - X.509 certificates and some parts of the PKCS-standard.
     </p>
   </description>
 
@@ -62,37 +58,37 @@
     
     <p><c>boolean() = true | false</c></p> 
 
-    <p><c>string = [bytes()]</c></p> 
-     
-    <p><c>asn1_der_encoded() = binary() | [bytes()]</c></p> 
+    <p><c>string = [bytes()]</c></p>
+   
+    <p><c>der_encoded() = binary() </c></p>
 
-    <p><c>der_bin() = binary() </c></p> 
+    <p><c>decrypt_der() = binary() </c></p>
     
-    <p><c>oid() - a tuple of integers 
-    as generated by the asn1 compiler.</c></p>
-
-    <p><c>public_key() = rsa_public_key() | dsa_public_key()</c></p> 
+    <p><c>pki_asn1_type() = 'Certificate' | 'RSAPrivateKey'| 'RSAPublicKey'
+    'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo'</c></p>
 
+     <p><c>pem_entry () = {pki_asn1_type(), der_encoded() | decrypt_der(), not_encrypted |
+     {"DES-CBC" | "DES-EDE3-CBC",  crypto:rand_bytes(8)}}.</c></p>
+     
     <p><c>rsa_public_key()  = #'RSAPublicKey'{}</c></p> 
     
     <p><c>rsa_private_key() = #'RSAPrivateKey'{} </c></p>
 
-    <p><c>dsa_public_key() = integer() </c></p> 
-
-    <p><c>public_key_params() = dsa_key_params() </c></p>
-    
-    <p><c>dsa_key_params()  = #'Dss-Parms'{} </c></p> 
-    
-    <p><c>private_key() =  rsa_private_key() | dsa_private_key()</c></p> 
+    <p><c>dsa_public_key() = {integer(),  #'Dss-Parms'{}} </c></p> 
 
     <p><c>rsa_private_key() = #'RSAPrivateKey'{} </c></p> 
     
     <p><c>dsa_private_key() = #'DSAPrivateKey'{}</c></p>
+    
+    <p><c> public_crypt_options() = [{rsa_pad, rsa_padding()}]. </c></p>
 
-    <p><c>x509_certificate() = "#Certificate{}"</c></p>
-
-    <p><c>x509_tbs_certificate() = #'TBSCertificate'{} </c></p> 
-
+    <p><c> rsa_padding() =  'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' 
+    | 'rsa_no_padding'</c></p>
+    
+    <p><c> rsa_digest_type()  = 'md5' | 'sha' </c></p>
+    
+    <p><c> dss_digest_type()  = 'none' | 'sha' </c></p>
+    
 <!--     <p><c>policy_tree() = [Root, Children]</c></p> -->
     
 <!--     <p><c>Root = #policy_tree_node{}</c></p>    -->
@@ -121,197 +117,308 @@
 <!--          that would satisfy this policy in the certificate x+1. </item>         -->
 <!--     </taglist> -->
   </section> 
-  
-<funcs>  
-  <func> 
-    <name>decode_private_key(KeyInfo) -> </name> 
-    <name>decode_private_key(KeyInfo, Password) -> {ok, PrivateKey} | {error, Reason}</name> 
-    <fsummary> Decodes an asn1 der encoded private key.</fsummary> 
-    <type> 
-      <v> KeyInfo =  {KeyType, der_bin(), ChipherInfo} </v>
-      <d> As returned from pem_to_der/1 for private keys</d>
-      <v> KeyType =  rsa_private_key | dsa_private_key </v>
-      <v> ChipherInfo = opaque() | no_encryption </v>
-      <d> ChipherInfo may contain encryption parameters if the private key is password
-      protected, these are opaque to the user just pass the value returned by pem_to_der/1
-      to this function.</d>
-      <v> Password =  string() </v>
-      <d>Must be specified if CipherInfo =/= no_encryption</d>
-      <v> PrivateKey =  private_key() </v>
-      <v> Reason = term() </v> 
-    </type>
-    <desc>
-	 <p>Decodes an asn1 der encoded private key.</p>
-    </desc> 
-  </func> 
-     
+
+<funcs>    
+
   <func>
-    <name>pem_to_der(File) -> {ok, [Entry]}</name>
-    <fsummary>Reads a PEM file and translates it into its asn1 der
-    encoded parts.</fsummary>
+    <name>decrypt_private(CipherText, Key [, Options]) -> binary()</name>
+    <fsummary>Public key decryption.</fsummary>
     <type>
-      <v>File = path()</v> 
-    <v>Password = string()</v> 
-    <v>Entry = {entry_type(), der_bin(), CipherInfo}</v>
-    <v> ChipherInfo = opaque() | no_encryption </v>
-    <d> ChipherInfo may contain encryption parameters if the private key is password
-    protected, these will be handled by the function decode_private_key/2. </d>
-    <v>entry_type() = cert | cert_req | rsa_private_key | dsa_private_key | 
-    dh_params </v>
+      <v>CipherText = binary()</v>
+      <v>Key = rsa_private_key()</v>
+      <v>Options = public_crypt_options()</v>
   </type> 
   <desc> 
-    <p>Reads a PEM file and translates it into its asn1 der 
-    encoded parts.</p> 
+    <p>Public key decryption using the private key.</p> 
+  </desc> 
+  </func>
+
+  <func>
+    <name>decrypt_public(CipherText, Key [, Options]) - > binary()</name>
+    <fsummary></fsummary>
+    <type>
+      <v>CipherText = binary()</v>
+      <v>Key = rsa_public_key()</v>
+      <v>Options = public_crypt_options()</v>
+  </type> 
+  <desc> 
+    <p> Public key decryption using the public key.</p> 
   </desc> 
   </func> 
-    
-  <func> 
-    <name>pkix_decode_cert(Cert, Type) -> {ok, DecodedCert} | {error, Reason}</name> 
-    <fsummary> Decodes an asn1 der encoded pkix certificate. </fsummary> 
-    <type> 
-      <v>Cert = asn1_der_encoded() </v>
-      <v>Type = plain | otp</v> 
-      <v>DecodeCert = x509_certificate() </v> 
-      <d>When type is specified as otp the asn1 spec OTP-PKIX.asn1 is used to decode known
-      extensions and enhance the signature field in
-      #'Certificate'{} and '#TBSCertificate'{}. This is currently used by the new ssl
-      implementation but not documented and supported for the public_key application.</d> 
-      <v>Reason = term() </v> 
+
+  <func>
+    <name>der_decode(Asn1type, Der) -> term()</name>
+    <fsummary> Decodes a public key asn1 der encoded entity.</fsummary>
+    <type>
+      <v>Asn1Type = atom() -</v>
+      <d> Asn1 type present in the public_key applications
+      asn1 specifications.</d>
+      <v>Der = der_encoded()</v>
     </type> 
-    <desc>
-      <p> Decodes an asn1 encoded pkix certificate.</p> 
+    <desc> 
+      <p> Decodes a public key asn1 der encoded entity.</p> 
     </desc> 
   </func>
+    
+  <func>
+    <name>der_encode(Asn1Type, Entity) -> der_encoded()</name>
+    <fsummary> Encodes a public key entity with asn1 DER encoding.</fsummary>
+    <type>
+      <v>Asn1Type = atom()</v>
+      <d> Asn1 type present in the public_key applications
+	 asn1 specifications.</d>
+      <v>Entity = term() - The erlang representation of <c> Asn1Type</c></v>
+  </type> 
+  <desc> 
+    <p> Encodes a public key entity with asn1 DER encoding.</p> 
+  </desc> 
+  </func>
+
+  <func>
+    <name>pem_decode(PemBin) -> [pem_entry()]</name>
+    <fsummary>Decode PEM binary data and return
+    entries as asn1 der encoded entities. </fsummary>
+    <type>
+      <v>PemBin = binary()</v>
+      <d>Example {ok, PemBin} = file:read_file("cert.pem").</d>
+    </type> 
+  <desc> 
+    <p>Decode PEM binary data and return
+    entries as asn1 der encoded entities.</p> 
+  </desc> 
+  </func> 
+    
+   <func>
+    <name>pem_encode(PemEntries) -> binary()</name>
+    <fsummary>Creates a PEM binary</fsummary>
+    <type>
+      <v> PemEntries = [pem_entry()] </v> 
+  </type> 
+  <desc> 
+    <p>Creates a PEM binary</p> 
+  </desc> 
+  </func>
+
+   <func>
+    <name>pem_entry_decode(PemEntry [, Password]) -> term()</name>
+    <fsummary>Decodes a pem entry.</fsummary>
+    <type>
+      <v> PemEntry = pem_entry() </v> 
+      <v> Password = string() </v> 
+  </type> 
+  <desc> 
+    <p>Decodes a pem entry. pem_decode/1 returns a list of pem
+    entries. Note that if the pem entry is of type
+    'SubjectPublickeyInfo' it will be further decoded to an
+    rsa_public_key() or dsa_public_key().</p>
+  </desc> 
+  </func>
+
+   <func>
+    <name>pem_entry_encode(Asn1Type, Entity [,{CipherInfo, Password}]) -> pem_entry()</name>
+    <fsummary> Creates a pem entry that can be fed to pem_encode/1.</fsummary>
+    <type>
+      <v>Asn1Type = pki_asn1_type()</v>
+      <v>Entity = term() - The Erlang representation of
+      <c>Asn1Type</c>.  If <c>Asn1Type</c> is 'SubjectPublicKeyInfo'
+      then <c>Entity</c> must be either an rsa_public_key() or a
+      dsa_public_key() and this function will create the appropriate
+      'SubjectPublicKeyInfo' entry.
+      </v>
+      <v>CipherInfo = {"DES-CBC" | "DES-EDE3-CBC",  crypto:rand_bytes(8)}</v>
+      <v>Password = string()</v> 
+  </type> 
+  <desc> 
+    <p> Creates a pem entry that can be feed to pem_encode/1.</p> 
+  </desc> 
+  </func>
+
+  <func>
+    <name>encrypt_private(PlainText, Key) -> binary()</name>
+    <fsummary> Public key encryption using the private key.</fsummary>
+    <type>
+      <v>PlainText = binary()</v>
+      <v>Key = rsa_private_key()</v> 
+  </type> 
+  <desc> 
+    <p> Public key encryption using the private key.</p> 
+  </desc> 
+  </func>   
+
+  <func>
+    <name>encrypt_public(PlainText, Key) -> binary()</name>
+    <fsummary> Public key encryption using the public key.</fsummary>
+    <type>
+      <v>PlainText = binary()</v>
+      <v>Key = rsa_public_key()</v> 
+  </type> 
+  <desc> 
+    <p> Public key encryption using the public key.</p> 
+  </desc> 
+  </func>   
   
-<!--     <func> -->
-<!--       <name> pkix_encode_cert(Cert) -> {ok, EncodedCert} | {error, Reason}</name> -->
-<!--       <fsummary>Encodes a certificate record using asn1. </fsummary> -->
-<!--       <type> -->
-<!-- 	<v>Cert = x509_certificate() </v> -->
-<!-- 	<v>EncodedCert = asn1_der_encoded() </v> -->
-<!-- 	<v>Reason = term() </v> -->
-<!--       </type> -->
-<!--       <desc> -->
-<!-- 	<p> Encodes a certificate record using asn1.</p> -->
-<!--       </desc> -->
-<!--     </func> -->
+  <func>
+    <name> pkix_decode_cert(Cert, otp|plain) ->  #'Certificate'{} | #'OTPCertificate'{}</name>
+    <fsummary> Decodes an asn1 der encoded pkix x509 certificate.</fsummary>
+    <type>
+      <v>Cert = der_encoded()</v> 
+  </type> 
+  <desc> 
+    <p>Decodes an asn1 der encoded pkix certificate.  The otp option
+    will use the customized asn1 specification OTP-PKIX.asn1 for
+    decoding and also recursively decode most of the standard
+    parts.</p>
+  </desc> 
+  </func>
 
-<!--     <func> -->
-<!--       <name>pkix_path_validation(TrustedCert, CertChain, Options) -> {ok, Result} | {error, Reason}</name> -->
-      
-<!--       <fsummary>Performs a basic path validation according to RFC 3280</fsummary> -->
-<!--       <type> -->
-<!-- 	<v>TrustedCert = asn1_der_encoded()</v> -->
-<!-- 	<v>CertChain = [asn1_der_encoded()]</v> -->
-<!-- 	<v>Options = [{Option, Value}]</v>	 -->
-<!--       <v>Result = {{algorithm(), public_key(), -->
-<!--       public_key_params()}, policy_tree()}</v> -->
-<!--       </type> -->
+  <func>
+    <name>pkix_encode(Asn1Type, Entity, otp | plain) -> der_encoded()</name>
+    <fsummary>Der encodes a pkix x509 certificate or part of such a
+    certificate.</fsummary>
+    <type>
+      <v>Asn1Type = atom()</v>
+      <d>The asn1 type can be 'Certificate', 'OTPCertificate' or a subtype of either .</d>
+  </type> 
+  <desc> 
+    <p>Der encodes a pkix x509 certificate or part of such a
+    certificate. This function must be used for encoding certificates or parts of certificates
+    that are decoded/created on the otp format, whereas for the plain format this
+    function will directly call der_encode/2. </p> 
+  </desc> 
+  </func>
+
+ <func>
+    <name>pkix_is_issuer(Cert, IssuerCert) -> boolean()</name>
+    <fsummary> Checks if <c>IssuerCert</c> issued <c>Cert</c> </fsummary>
+    <type>
+      <v>Cert = der_encode() | #'OTPCertificate'{}</v> 
+      <v>IssuerCert = der_encode() | #'OTPCertificate'{}</v> 
+  </type> 
+  <desc> 
+    <p> Checks if <c>IssuerCert</c> issued <c>Cert</c> </p> 
+  </desc> 
+  </func>
+  
+  <func>
+    <name>pkix_is_fixed_dh_cert(Cert) -> boolean()</name>
+    <fsummary> Checks if a Certificate is a fixed Diffie-Hellman Cert.</fsummary>
+    <type>
+        <v>Cert = der_encode() | #'OTPCertificate'{}</v> 
+  </type> 
+  <desc> 
+    <p> Checks if a Certificate is a fixed Diffie-Hellman Cert.</p> 
+  </desc> 
+  </func>  
+  
+  <func>
+    <name>pkix_is_self_signed(Cert) -> boolean()</name>
+    <fsummary> Checks if a Certificate is self signed.</fsummary>
+    <type>
+       <v>Cert = der_encode() | #'OTPCertificate'{}</v> 
+  </type> 
+  <desc> 
+    <p> Checks if a Certificate is self signed.</p> 
+  </desc> 
+  </func>
+
+  <func>
+    <name>pkix_issuer_id(Cert, IssuedBy) -> {ok, IssuerID} | {error, Reason}</name>
+    <fsummary> Returns the issuer id.</fsummary>
+    <type>
+        <v>Cert = der_encode() | #'OTPCertificate'{}</v>
+	<v>IssuedBy = self | other</v>
+	<v>IssuerID = {integer(), {rdnSequence, [#'AttributeTypeAndValue'{}]}}</v>
+	<d>The issuer id consists of the serial number and the issuers name.</d>
+	<v>Reason = term()</v>
+  </type> 
+  <desc> 
+    <p> Returns the issuer id.</p> 
+  </desc> 
+  </func>
 
-<!--       <desc>  -->
-<!-- 	 <p>Available options are: </p> -->
-<!--       <taglist> -->
-<!-- 	    <tag>{validate_extension_fun, fun()}</tag> -->
-<!-- 	    <item> A fun behaving according to the following outline: -->
-<!-- 	    <code> -->
-<!-- [...] -->
-<!-- ValidateExtensionFun = fun(Extensions, UserState) -> -->
-<!--                            validate_extensions(Extensions, UserState, []) -->
-<!--                        end, -->
-<!-- [...] -->
+  <func>
+    <name>pkix_normalize_name(Issuer) -> Normalized</name>
+    <fsummary>Normalizes a issuer name so that it can be easily
+    compared to another issuer name. </fsummary>
+    <type>
+      <v>Issuer = {rdnSequence,[#'AttributeTypeAndValue'{}]}</v>
+      <v>Normalized = {rdnSequence, [#'AttributeTypeAndValue'{}]}</v>
+  </type> 
+  <desc> 
+    <p>Normalizes a issuer name so that it can be easily
+    compared to another issuer name.</p> 
+  </desc> 
+  </func>
+   
+  <!-- <func> -->
+  <!--   <name>pkix_path_validation()</name> -->
+  <!--   <fsummary> Performs a basic path validation according to RFC 5280.</fsummary> -->
+  <!--   <type> -->
+  <!--     <v></v>  -->
+  <!--   </type>  -->
+  <!--   <desc>  -->
+  <!--     <p> Performs a basic path validation according to RFC 5280.</p>  -->
+  <!--   </desc>  -->
+  <!-- </func> -->
 
-<!-- validate_extensions([], UserState, UnknowExtension) -> -->
-<!--     {UserState, UnknowExtension}; -->
-<!-- validate_extensions([#'Extension'{} = Ext | Rest], UserState, UnknowExtension) -> -->
-<!--     case valid_extension(Ext) of -->
-<!-- 	{true, NewUserState} ->  -->
-<!-- 	    validate_extensions(Rest, NewUserState, UnknowExtension); -->
-<!-- 	unknown -> -->
-<!-- 	    validate_extensions(Rest, UserState, [Ext | UnknowExtension]); -->
-<!-- 	{false, Reason} -> -->
-<!-- 	    throw(bad_cert, Reason) -->
-<!--     end.				    -->
-<!-- 	    </code> -->
-	    
-<!-- 	    </item> -->
-	    
-<!-- 	    <tag>{policy_set, [oid()]}</tag> -->
-<!-- 	    <item>A set of certificate policy -->
-<!-- 	    identifiers naming the policies that are acceptable to the -->
-<!-- 	    certificate user. If the user is not concerned about -->
-<!-- 	    certificate policy there is no need -->
-<!-- 	    to set this option. Defaults to the -->
-<!-- 	    special value [?anyPolicy]. -->
-<!-- 	    </item> -->
-	    
-<!-- 	    <tag>{policy_mapping, boolean()}</tag> -->
-<!-- 	    <item>Indicates if policy -->
-<!-- 	    mapping, initially, is allowed in the certification path. -->
-<!-- 	    Defaults to false. -->
-<!-- 	    </item> -->
-	    
-<!-- 	    <tag> {explicit_policy, boolean()}</tag> -->
-<!-- 	    <item>Indicates if the path, initially, must be -->
-<!-- 	    valid for at least one of the certificate policies in the user -->
-<!-- 	    specified policy set. -->
-<!-- 	    Defaults to false. -->
-<!-- 	    </item>  -->
+  
+  <func>
+    <name>pkix_sign(#'OTPTBSCertificate'{}, Key) -> der_encode()</name>
+    <fsummary>Signs certificate.</fsummary>
+    <type>
+      <v>Key = rsa_public_key() | dsa_public_key()</v> 
+    </type> 
+    <desc> 
+      <p>Signs a 'OTPTBSCertificate'. Returns the corresponding
+      der encoded certificate.</p> 
+    </desc> 
+  </func> 
 
-<!-- 	    <tag>{inhibit_any_policy, boolean()}</tag> -->
-<!-- 	    <item>Indicates whether the anyPolicy OID, initially, should -->
-<!-- 	    be processed if it is included in a certificate. -->
-<!-- 	    Defaults to false. -->
-<!-- 	    </item> -->
-	    
-<!-- 	  </taglist> -->
- 
-<!-- 	<p>Performs a basic path validation according to RFC 3280, -->
-<!-- 	e.i. signature validation, time validation, issuer validation, -->
-<!-- 	alternative subject name validation, CRL validation, policy -->
-<!-- 	validation and checks that no unknown extensions -->
-<!-- 	are marked as critical. The option <c>validate_extension_fun</c> -->
-<!-- 	may be used to validate application specific extensions. If -->
-<!-- 	a validation criteria is found to be invalid the validation process -->
-<!-- 	will immediately be stopped and this functions will return -->
-<!-- 	{error, Reason}. -->
-<!-- 	</p> -->
-<!--       </desc> -->
-<!--     </func> -->
+  <func>  
+    <name>pkix_verify(Cert, Key) -> boolean()</name>
+    <fsummary> Verify pkix x.509 certificate signature.</fsummary>
+    <type>
+      <v>Cert = der_encode()</v> 
+      <v>Key = rsa_public_key() | dsa_public_key()</v> 
+    </type> 
+  <desc> 
+    <p> Verify pkix x.509 certificate signature.</p> 
+  </desc> 
+  </func> 
 
-<!--     <func> -->
-<!--       <name>sign(DigestOrTBSCert, Key) -> </name> -->
-<!--       <name>sign(DigestOrTBSCert, Key, KeyParams) -> {ok, SignatureOrDerCert} | {error, Reason}</name> -->
-<!--       <fsummary>Signs Digest/Certificate using Key.</fsummary> -->
-<!--       <type> -->
-<!-- 	<v>DigestOrTBSCert = binary() | x509_tbs_certificate()</v> -->
-<!-- 	<v>Key = private_key()</v> -->
-<!-- 	<v>SignatureORDerCert = binary() | der_bin() </v> -->
-<!-- 	<v>Reason = term() </v> -->
-<!--       </type> -->
-<!--       <desc> -->
-<!-- 	<p> Signs Digest/Certificate using Key, in the later -->
-<!-- 	case a der encoded x509_certificate() will be returned. </p> -->
-<!--       </desc> -->
-<!--     </func> -->
+  <func>
+    <name>sign(Msg, DigestType, Key) -> binary()</name>
+    <fsummary> Create digital signature.</fsummary>
+    <type>
+       <v>Msg = binary()</v>
+       <d>The msg is either the binary "plain text" data to be
+       signed or in the case that digest type is <c>none</c>
+       it is the hashed value of "plain text" i.e. the digest.</d>
+       <v>DigestType = rsa_digest_type() | dsa_digest_type()</v>
+       <v>Key = rsa_public_key() | dsa_public_key()</v> 
+  </type> 
+  <desc> 
+    <p> Creates a digital signature.</p> 
+  </desc> 
+  </func>   
 
-<!--     <func> -->
-<!--      <name>verify_signature(Digest, Signature, Key) -> </name> -->
-<!--      <name>verify_signature(DerCert, Key, KeyParams) -> </name> -->
-<!--      <name>verify_signature(Digest, Signature, Key, Params) -> Verified </name> -->
-<!--       <fsummary> Verifies the signature. </fsummary> -->
-<!--       <type> -->
-<!-- 	<v>Digest = binary() </v> -->
-<!-- 	<v>DerCert = der_bin() </v> -->
-<!-- 	<v>Signature = binary() </v> -->
-<!-- 	<v>Key = public_key() </v> -->
-<!-- 	<v>Params = key_params()</v> -->
-<!-- 	<v>Verified = boolean()</v> -->
-<!--       </type> -->
-<!--       <desc> -->
-<!-- 	<p> Verifies the signature Signature. If the key is an rsa-key no -->
-<!-- 	paramters are neeed.</p> -->
-<!--       </desc> -->
-<!--     </func> -->
+  <func>
+    <name>verify(Msg, DigestType, Signature, Key) -> boolean()</name>
+    <fsummary>Verifies a digital signature.</fsummary>
+    <type>
+      <v>Msg = binary()</v>
+       <d>The msg is either the binary "plain text" data 
+        or in the case that digest type is <c>none</c>
+	it is the hashed value of "plain text" i.e. the digest.</d>
+      <v>DigestType = rsa_digest_type() | dsa_digest_type()</v>
+      <v>Signature = binary()</v>
+      <v>Key = rsa_public_key() | dsa_public_key()</v> 
+  </type> 
+  <desc> 
+    <p>Verifies a digital signature</p> 
+  </desc> 
+  </func>
+  
 </funcs>
 
 </erlref>
diff --git a/lib/public_key/include/public_key.hrl b/lib/public_key/include/public_key.hrl
index fbce10f0eb..f29ab859ed 100644
--- a/lib/public_key/include/public_key.hrl
+++ b/lib/public_key/include/public_key.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -28,6 +28,17 @@
  	  algorithm, 
  	  parameters = asn1_NOVALUE}).
 
+-define(DEFAULT_VERIFYFUN,
+	{fun(_,{bad_cert, _} = Reason, _) ->
+		 {fail, Reason};
+	    (_,{extension, _}, UserState) ->
+		 {unknown, UserState};
+	    (_, valid, UserState) ->
+		 {valid, UserState};
+	    (_, valid_peer, UserState) ->
+		 {valid, UserState}
+	 end, []}).
+
 -record(path_validation_state, {
 	  valid_policy_tree,
 	  explicit_policy,
@@ -42,7 +53,7 @@
 	  working_public_key_parameters,
 	  working_issuer_name,
 	  max_path_length,
-	  acc_errors,  %% If verify_none option is set
+	  verify_fun,
 	  user_state
 	 }).
 
@@ -59,4 +70,14 @@
 	  interim_reasons_mask
 	 }).
 
+
+-type der_encoded()          :: binary().
+-type decrypt_der()          :: binary().
+-type pki_asn1_type()        ::  'Certificate' | 'RSAPrivateKey' | 'RSAPublicKey'
+			       | 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter'
+                               | 'SubjectPublicKeyInfo'.
+-type pem_entry()            :: {pki_asn1_type(), der_encoded() | decrypt_der(),
+				 not_encrypted | {Cipher :: string(), Salt :: binary()}}.
+-type asn1_type()            :: atom(). %% see "OTP-PUB-KEY.hrl
+
 -endif. % -ifdef(public_key).
diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
index c30399f33a..51f405361b 100644
--- a/lib/public_key/src/Makefile
+++ b/lib/public_key/src/Makefile
@@ -42,8 +42,7 @@ MODULES = \
 	public_key \
 	pubkey_pem \
 	pubkey_cert \
-        pubkey_cert_records \
-	pubkey_crypto
+        pubkey_cert_records 
 
 HRL_FILES = $(INCLUDE)/public_key.hrl
 
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
index 0651dcec29..fadb993ed9 100644
--- a/lib/public_key/src/pubkey_cert.erl
+++ b/lib/public_key/src/pubkey_cert.erl
@@ -23,14 +23,13 @@
 
 -include("public_key.hrl").
 
--export([verify_signature/3,
-	 init_validation_state/3, prepare_for_next_cert/2,
+-export([init_validation_state/3, prepare_for_next_cert/2,
  	 validate_time/3, validate_signature/6,
  	 validate_issuer/4, validate_names/6,
 	 validate_revoked_status/3, validate_extensions/4,
-	 validate_unknown_extensions/3,
 	 normalize_general_name/1, digest_type/1, is_self_signed/1,
-	 is_issuer/2, issuer_id/2, is_fixed_dh_cert/1]).
+	 is_issuer/2, issuer_id/2, is_fixed_dh_cert/1,
+	 verify_data/1, verify_fun/4]).
 
 -define(NULL, 0).
  
@@ -38,10 +37,22 @@
 %% Internal application API
 %%====================================================================
 
-verify_signature(DerCert, Key, KeyParams) ->
-    {ok, OtpCert} = pubkey_cert_records:decode_cert(DerCert, otp),
-    verify_signature(OtpCert, DerCert, Key, KeyParams).
+%%--------------------------------------------------------------------
+-spec verify_data(der_encoded()) -> {md5 | sha,  binary(), binary()}.
+%%
+%% Description: Extracts data from DerCert needed to call public_key:verify/4.
+%%--------------------------------------------------------------------	 
+verify_data(DerCert) ->
+    {ok, OtpCert} = pubkey_cert_records:decode_cert(DerCert),
+    extract_verify_data(OtpCert, DerCert).
 
+%%--------------------------------------------------------------------
+-spec init_validation_state(#'OTPCertificate'{}, integer(), list()) ->
+				   #path_validation_state{}.
+%%
+%% Description: Creates inital version of path_validation_state for
+%% basic path validation of x509 certificates.
+%%--------------------------------------------------------------------	 
 init_validation_state(#'OTPCertificate'{} = OtpCert, DefaultPathLen, 
 		      Options) ->
     PolicyTree = #policy_tree_node{valid_policy = ?anyPolicy,
@@ -56,16 +67,23 @@ init_validation_state(#'OTPCertificate'{} = OtpCert, DefaultPathLen,
 					     Options, false)),
     PolicyMapping = policy_indicator(MaxLen,
 		      proplists:get_value(policy_mapping, Options, false)),
-    AccErrors =  proplists:get_value(acc_errors, Options, []),
-    State = #path_validation_state{max_path_length   =  MaxLen,
-				   valid_policy_tree =  PolicyTree,
-				   explicit_policy   =  ExplicitPolicy,
-				   inhibit_any_policy = InhibitAnyPolicy,
-				   policy_mapping    =  PolicyMapping,
-				   acc_errors        =  AccErrors,
+    {VerifyFun, UserState} =  proplists:get_value(verify_fun, Options, ?DEFAULT_VERIFYFUN),
+    State = #path_validation_state{max_path_length    =  MaxLen,
+				   valid_policy_tree  =  PolicyTree,
+				   explicit_policy    =  ExplicitPolicy,
+				   inhibit_any_policy =  InhibitAnyPolicy,
+				   policy_mapping     =  PolicyMapping,
+				   verify_fun         =  VerifyFun,
+				   user_state	      =  UserState,
 				   cert_num =           0},
     prepare_for_next_cert(OtpCert, State).
 
+%%--------------------------------------------------------------------
+-spec prepare_for_next_cert(#'OTPCertificate'{}, #path_validation_state{}) ->
+				   #path_validation_state{}.
+%%
+%% Description: Update path_validation_state for next iteration.
+%%--------------------------------------------------------------------	
 prepare_for_next_cert(OtpCert, ValidationState = #path_validation_state{
 				 working_public_key_algorithm = PrevAlgo,
 				 working_public_key_parameters = 
@@ -92,8 +110,14 @@ prepare_for_next_cert(OtpCert, ValidationState = #path_validation_state{
       working_issuer_name = Issuer,
       cert_num = ValidationState#path_validation_state.cert_num + 1
      }.
-   
-validate_time(OtpCert, AccErr, Verify) ->
+
+ %%--------------------------------------------------------------------
+-spec validate_time(#'OTPCertificate'{}, term(), fun()) -> term().
+%%
+%% Description: Check that the certificate validity period includes the 
+%% current time.
+%%--------------------------------------------------------------------	  
+validate_time(OtpCert, UserState, VerifyFun) ->
     TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
     {'Validity', NotBeforeStr, NotAfterStr} 
 	= TBSCert#'OTPTBSCertificate'.validity,
@@ -103,34 +127,52 @@ validate_time(OtpCert, AccErr, Verify) ->
 
     case ((NotBefore =< Now) and (Now =< NotAfter)) of
 	true ->
-	    AccErr;
+	    UserState;
 	false ->
-	    not_valid({bad_cert, cert_expired}, Verify, AccErr)
+	    verify_fun(OtpCert, {bad_cert, cert_expired}, UserState, VerifyFun)
     end.
-
-validate_issuer(OtpCert, Issuer, AccErr, Verify) ->
+%%--------------------------------------------------------------------
+-spec validate_issuer(#'OTPCertificate'{}, term(), term(), fun()) -> term().
+%%
+%% Description: Check that the certificate issuer name is the working_issuer_name
+%% in path_validation_state.
+%%--------------------------------------------------------------------	
+validate_issuer(OtpCert, Issuer, UserState, VerifyFun) ->
     TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
     case is_issuer(Issuer, TBSCert#'OTPTBSCertificate'.issuer) of
 	true ->
-	    AccErr;
+	    UserState;
 	_ ->
-	    not_valid({bad_cert, invalid_issuer}, Verify, AccErr)
+	    verify_fun(OtpCert, {bad_cert, invalid_issuer}, UserState, VerifyFun)
     end. 
-
+%%--------------------------------------------------------------------
+-spec validate_signature(#'OTPCertificate'{}, der_encoded(),
+			 term(),term(), term(), fun()) -> term().
+				
+%%
+%% Description: Check that the signature on the certificate can be verified using
+%% working_public_key_algorithm, the working_public_key, and
+%% the working_public_key_parameters in path_validation_state.
+%%--------------------------------------------------------------------	
 validate_signature(OtpCert, DerCert, Key, KeyParams,
-		   AccErr, Verify) ->
+		   UserState, VerifyFun) ->
     
     case verify_signature(OtpCert, DerCert, Key, KeyParams) of
 	true ->
-	    AccErr;
+	    UserState;
 	false ->
-	    not_valid({bad_cert, invalid_signature}, Verify, AccErr)
+	    verify_fun(OtpCert, {bad_cert, invalid_signature}, UserState, VerifyFun)
     end.
-
-validate_names(OtpCert, Permit, Exclude, Last, AccErr, Verify) ->
+%%--------------------------------------------------------------------
+-spec validate_names(#'OTPCertificate'{}, no_constraints | list(), list(),
+		     term(), term(), fun())-> term().
+%%
+%% Description: Validate Subject Alternative Name.
+%%--------------------------------------------------------------------	
+validate_names(OtpCert, Permit, Exclude, Last, UserState, VerifyFun) ->
     case is_self_signed(OtpCert) andalso (not Last) of
 	true -> 
-	    AccErr;
+	    UserState;
 	false ->
 	    TBSCert = OtpCert#'OTPCertificate'.tbsCertificate, 
 	    Subject = TBSCert#'OTPTBSCertificate'.subject,
@@ -143,8 +185,10 @@ validate_names(OtpCert, Permit, Exclude, Last, AccErr, Verify) ->
 	    Name = [{directoryName, Subject}|EmailAddress],
 	    
 	    AltNames = case AltSubject of
-			   undefined -> [];
-			   _ ->	        AltSubject#'Extension'.extnValue
+			   undefined -> 
+			       [];
+			   _ ->	
+			       AltSubject#'Extension'.extnValue
 		       end,
 	    
 	    case (is_permitted(Name, Permit) andalso 
@@ -152,65 +196,74 @@ validate_names(OtpCert, Permit, Exclude, Last, AccErr, Verify) ->
 		  (not is_excluded(Name, Exclude)) andalso
 		  (not is_excluded(AltNames, Exclude))) of
 		true ->
-		    AccErr;
+		    UserState;
 		false ->
-		    not_valid({bad_cert, name_not_permitted}, 
-			      Verify, AccErr)
+		    verify_fun(OtpCert, {bad_cert, name_not_permitted},
+			      UserState, VerifyFun)
 	    end
     end.
 
-
-%% See rfc3280 4.1.2.6 Subject: regarding emails.
-extract_email({rdnSequence, List}) ->
-    extract_email2(List).
-extract_email2([[#'AttributeTypeAndValue'{type=?'id-emailAddress', 
-					  value=Mail}]|_]) ->
-    [{rfc822Name, Mail}];
-extract_email2([_|Rest]) ->
-    extract_email2(Rest);
-extract_email2([]) -> [].
-
-validate_revoked_status(_OtpCert, _Verify, AccErr) ->
-    %% true |
+%%--------------------------------------------------------------------
+-spec validate_revoked_status(#'OTPCertificate'{}, term(), fun()) ->
+				      term().
+%%
+%% Description: Check if certificate has been revoked.
+%%--------------------------------------------------------------------	
+validate_revoked_status(_OtpCert, UserState, _VerifyFun) ->
+    %% TODO: Implement or leave for application?!
+    %% valid |
     %% throw({bad_cert, cert_revoked})
-    AccErr.
-
-validate_extensions(OtpCert, ValidationState, Verify, AccErr) ->
+    UserState.
+%%--------------------------------------------------------------------
+-spec validate_extensions(#'OTPCertificate'{}, #path_validation_state{},
+			  term(), fun())->
+				 {#path_validation_state{}, UserState :: term()}.
+%%
+%% Description: Check extensions included in basic path validation.
+%%--------------------------------------------------------------------	
+validate_extensions(OtpCert, ValidationState, UserState, VerifyFun) ->
     TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
-    Extensions = TBSCert#'OTPTBSCertificate'.extensions,
-    validate_extensions(Extensions, ValidationState, no_basic_constraint,
-			is_self_signed(OtpCert), [], Verify, AccErr).
-
-validate_unknown_extensions([], AccErr, _Verify) -> 
-    AccErr;
-validate_unknown_extensions([#'Extension'{critical = true} | _],
-			    AccErr, Verify) ->
-    not_valid({bad_cert, unknown_critical_extension}, Verify, AccErr);
-validate_unknown_extensions([#'Extension'{critical = false} | Rest], 
-			    AccErr, Verify) ->
-    validate_unknown_extensions(Rest, AccErr, Verify).
-
+    case TBSCert#'OTPTBSCertificate'.version of
+	N when N >= 3 ->
+	    Extensions = TBSCert#'OTPTBSCertificate'.extensions,
+	    validate_extensions(OtpCert, Extensions,
+				ValidationState, no_basic_constraint,
+				is_self_signed(OtpCert), UserState, VerifyFun);
+	_ -> %% Extensions not present in versions 1 & 2
+	    {ValidationState, UserState}
+    end.
+%%--------------------------------------------------------------------
+-spec normalize_general_name({rdnSequence, term()}) -> {rdnSequence, term()}. 
+%%
+%% Description: Normalizes a general name so that it can be easily
+%%              compared to another genral name. 
+%%--------------------------------------------------------------------	
 normalize_general_name({rdnSequence, Issuer}) ->
-    NormIssuer = normalize_general_name(Issuer),
-    {rdnSequence, NormIssuer};
-
-normalize_general_name(Issuer) ->
-    Normalize = fun([{Description, Type, {printableString, Value}}]) ->
-			NewValue = string:to_lower(strip_spaces(Value)),
-			[{Description, Type, {printableString, NewValue}}];
-		   (Atter)  ->
-			Atter
-		end,
-    lists:sort(lists:map(Normalize, Issuer)).
+    NormIssuer = do_normalize_general_name(Issuer),
+    {rdnSequence, NormIssuer}.
 
+%%--------------------------------------------------------------------
+-spec is_self_signed(#'OTPCertificate'{}) -> boolean().
+%%
+%% Description: Checks if the certificate is self signed.
+%%--------------------------------------------------------------------	
 is_self_signed(#'OTPCertificate'{tbsCertificate=
 				 #'OTPTBSCertificate'{issuer = Issuer, 
 						      subject = Subject}}) ->
     is_issuer(Issuer, Subject).
-
+%%--------------------------------------------------------------------
+-spec is_issuer({rdnSequence, term()}, {rdnSequence, term()}) -> boolean().		       
+%%
+%% Description:  Checks if <Issuer> issued <Candidate>.
+%%--------------------------------------------------------------------	
 is_issuer({rdnSequence, Issuer}, {rdnSequence, Candidate}) ->
     is_dir_name(Issuer, Candidate, true).
-
+%%--------------------------------------------------------------------
+-spec issuer_id(#'OTPCertificate'{}, self | other) -> 
+		       {ok, {integer(), term()}}  | {error, issuer_not_found}.
+%%
+%% Description: Extracts the issuer id from a certificate if possible.
+%%--------------------------------------------------------------------	
 issuer_id(Otpcert, other) ->
     TBSCert = Otpcert#'OTPCertificate'.tbsCertificate,
     Extensions = extensions_list(TBSCert#'OTPTBSCertificate'.extensions),
@@ -227,7 +280,12 @@ issuer_id(Otpcert, self) ->
     SerialNr = TBSCert#'OTPTBSCertificate'.serialNumber,
     {ok, {SerialNr, normalize_general_name(Issuer)}}.  
 
-
+%%--------------------------------------------------------------------
+-spec is_fixed_dh_cert(#'OTPCertificate'{}) -> boolean().  
+%%
+%% Description: Checks if the certificate can be be used
+%% for DH key agreement.
+%%--------------------------------------------------------------------	
 is_fixed_dh_cert(#'OTPCertificate'{tbsCertificate =
 				   #'OTPTBSCertificate'{subjectPublicKeyInfo = 
 							SubjectPublicKeyInfo,
@@ -235,31 +293,79 @@ is_fixed_dh_cert(#'OTPCertificate'{tbsCertificate =
 							Extensions}}) ->
     is_fixed_dh_cert(SubjectPublicKeyInfo, extensions_list(Extensions)). 
 
+
+%%--------------------------------------------------------------------
+-spec verify_fun(#'OTPCertificate'{}, {bad_cert, atom()} | {extension, #'Extension'{}}|
+		 valid | valid_peer, term(), fun()) -> term().
+%%
+%% Description: Gives the user application the opportunity handle path
+%% validation errors and unknown extensions and optional do other
+%% things with a validated certificate.
+%% --------------------------------------------------------------------
+verify_fun(Otpcert, Result, UserState0, VerifyFun) ->
+    case VerifyFun(Otpcert, Result, UserState0) of
+	{valid,UserState} ->
+	    UserState;
+	{fail, Reason} ->
+	    case Result of
+		{bad_cert, _} ->
+		    throw(Result);
+		_ ->
+		    throw({bad_cert, Reason})
+	    end;
+	{unknown, UserState} ->
+	    case Result of
+		{extension, #'Extension'{critical = true}} ->
+		    throw({bad_cert, unknown_critical_extension});
+		_ ->
+		    UserState
+	    end
+    end.
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
+do_normalize_general_name(Issuer) ->
+    Normalize = fun([{Description, Type, {printableString, Value}}]) ->
+			NewValue = string:to_lower(strip_spaces(Value)),
+			[{Description, Type, {printableString, NewValue}}];
+		   (Atter)  ->
+			Atter
+		end,
+    lists:sort(lists:map(Normalize, Issuer)).
+
+%% See rfc3280 4.1.2.6 Subject: regarding emails.
+extract_email({rdnSequence, List}) ->
+    extract_email2(List).
+extract_email2([[#'AttributeTypeAndValue'{type=?'id-emailAddress', 
+					  value=Mail}]|_]) ->
+    [{rfc822Name, Mail}];
+extract_email2([_|Rest]) ->
+    extract_email2(Rest);
+extract_email2([]) -> [].
 
 extensions_list(asn1_NOVALUE) ->
     [];
 extensions_list(Extensions) ->
     Extensions.
 
-not_valid(Error, true, _) ->
-    throw(Error);
-not_valid(Error, false, AccErrors) ->
-    [Error | AccErrors].
 
-verify_signature(OtpCert, DerCert, Key, KeyParams) ->
-    %% Signature is an ASN1 compact bit string 
+extract_verify_data(OtpCert, DerCert) ->
     {0, Signature} = OtpCert#'OTPCertificate'.signature,
     SigAlgRec = OtpCert#'OTPCertificate'.signatureAlgorithm,
     SigAlg = SigAlgRec#'SignatureAlgorithm'.algorithm,
-    EncTBSCert = encoded_tbs_cert(DerCert),
-    verify(SigAlg, EncTBSCert, Signature, Key, KeyParams).
+    PlainText = encoded_tbs_cert(DerCert),
+    DigestType = digest_type(SigAlg),
+    {DigestType, PlainText, Signature}.
 
-verify(Alg, PlainText, Signature, Key, KeyParams) ->
-    public_key:verify_signature(PlainText, digest_type(Alg), 
-				Signature, Key, KeyParams).
+verify_signature(OtpCert, DerCert, Key, KeyParams) ->
+    {DigestType, PlainText, Signature} = extract_verify_data(OtpCert, DerCert),
+    case Key of
+	#'RSAPublicKey'{} ->
+	    public_key:verify(PlainText, DigestType, Signature, Key);
+	_ ->
+	    public_key:verify(PlainText, DigestType, Signature, {Key, KeyParams})
+    end.
 
 encoded_tbs_cert(Cert) ->
     {ok, PKIXCert} = 
@@ -288,10 +394,12 @@ public_key_info(PublicKeyInfo,
     
     NewPublicKeyParams =
 	case PublicKeyParams of
-	    'NULL' when WorkingAlgorithm == Algorithm ->
+	    {null, 'NULL'} when WorkingAlgorithm == Algorithm ->
 		WorkingParams;
-	    _ ->
-		PublicKeyParams
+	    {params, Params} ->
+		Params;
+	    Params ->
+		Params
 	end,
     {Algorithm, PublicKey, NewPublicKeyParams}.
 
@@ -369,210 +477,179 @@ select_extension(Id, [_ | Extensions]) ->
     select_extension(Id, Extensions).
 
 %% No extensions present
-validate_extensions(asn1_NOVALUE, ValidationState, ExistBasicCon, 
-		    SelfSigned, UnknownExtensions, Verify, AccErr) ->
-    validate_extensions([], ValidationState, ExistBasicCon, 
-			SelfSigned, UnknownExtensions, Verify, AccErr);
-
-validate_extensions([], ValidationState, basic_constraint, _SelfSigned, 
-		    UnknownExtensions, _Verify, AccErr) ->
-    {ValidationState, UnknownExtensions, AccErr};
-validate_extensions([], ValidationState = 
-		    #path_validation_state{max_path_length = Len, 
-					   last_cert = Last}, 
-		    no_basic_constraint, SelfSigned, UnknownExtensions, 
-		    Verify, AccErr0) ->
+validate_extensions(OtpCert, asn1_NOVALUE, ValidationState, ExistBasicCon,
+		    SelfSigned, UserState, VerifyFun) ->
+    validate_extensions(OtpCert, [], ValidationState, ExistBasicCon,
+			SelfSigned, UserState, VerifyFun);
+
+validate_extensions(_,[], ValidationState, basic_constraint, _SelfSigned,
+		    UserState, _) ->
+    {ValidationState, UserState};
+validate_extensions(OtpCert, [], ValidationState =
+			#path_validation_state{max_path_length = Len,
+					       last_cert = Last},
+		    no_basic_constraint, SelfSigned, UserState0, VerifyFun) ->
     case Last of
 	true when SelfSigned ->
-	    {ValidationState, UnknownExtensions, AccErr0};
+	    {ValidationState, UserState0};
 	true  ->
 	    {ValidationState#path_validation_state{max_path_length = Len - 1},
-	     UnknownExtensions, AccErr0};
+	     UserState0};
 	%% basic_constraint must appear in certs used for digital sign
 	%% see 4.2.1.10 in rfc 3280
 	false ->
-	    AccErr = not_valid({bad_cert, missing_basic_constraint}, 
-			       Verify, AccErr0), 
+	    UserState = verify_fun(OtpCert, {bad_cert, missing_basic_constraint},
+				   UserState0, VerifyFun),
 	    case SelfSigned of
 		true ->
-		    {ValidationState, UnknownExtensions, AccErr};
+		    {ValidationState, UserState};
 		false ->
 		    {ValidationState#path_validation_state{max_path_length = 
-							   Len - 1},
-		     UnknownExtensions, AccErr}
+							       Len - 1},
+		     UserState}
 	    end
     end;
 
-validate_extensions([#'Extension'{extnID = ?'id-ce-basicConstraints',
+validate_extensions(OtpCert,
+		    [#'Extension'{extnID = ?'id-ce-basicConstraints',
 				  extnValue = 
-				  #'BasicConstraints'{cA = true,
-						      pathLenConstraint = N}} |
+				      #'BasicConstraints'{cA = true,
+							  pathLenConstraint = N}} |
 		     Rest],
-		    ValidationState = 
-		    #path_validation_state{max_path_length = Len}, _,
-		    SelfSigned, UnknownExtensions, Verify, AccErr) ->
-    Length = if SelfSigned -> min(N, Len);
-		true -> min(N, Len-1)
+		    ValidationState =
+			#path_validation_state{max_path_length = Len}, _,
+		    SelfSigned, UserState, VerifyFun) ->
+    Length = if SelfSigned -> erlang:min(N, Len);
+		true -> erlang:min(N, Len-1)
 	     end,
-    validate_extensions(Rest,
+    validate_extensions(OtpCert, Rest,
 			ValidationState#path_validation_state{max_path_length =
-							      Length},
-			basic_constraint, SelfSigned, UnknownExtensions,
-			Verify, AccErr);
+								  Length},
+			basic_constraint, SelfSigned,
+			UserState, VerifyFun);
 %% The pathLenConstraint field is meaningful only if cA is set to
 %% TRUE.
-validate_extensions([#'Extension'{extnID = ?'id-ce-basicConstraints',
-				  extnValue = 
-				  #'BasicConstraints'{cA = false}} |
-		     Rest], ValidationState, ExistBasicCon, 
-		    SelfSigned, UnknownExtensions, Verify, AccErr) ->
-    validate_extensions(Rest, ValidationState, ExistBasicCon, 
-			SelfSigned, UnknownExtensions, Verify, AccErr);
-  
-%% 
-validate_extensions([#'Extension'{extnID = ?'id-ce-keyUsage',
-				  extnValue = KeyUse
-				 } | Rest], 
-		    #path_validation_state{last_cert=Last} = ValidationState, 
-		    ExistBasicCon, SelfSigned, UnknownExtensions, 
-		    Verify, AccErr0) ->
+validate_extensions(OtpCert, [#'Extension'{extnID = ?'id-ce-basicConstraints',
+					   extnValue =
+					       #'BasicConstraints'{cA = false}} |
+			      Rest], ValidationState, ExistBasicCon,
+		    SelfSigned, UserState, VerifyFun) ->
+    validate_extensions(OtpCert, Rest, ValidationState, ExistBasicCon,
+			SelfSigned, UserState, VerifyFun);
+
+validate_extensions(OtpCert, [#'Extension'{extnID = ?'id-ce-keyUsage',
+					   extnValue = KeyUse
+					  } | Rest],
+		    #path_validation_state{last_cert=Last} = ValidationState,
+		    ExistBasicCon, SelfSigned,
+		    UserState0, VerifyFun) ->
     case Last orelse is_valid_key_usage(KeyUse, keyCertSign) of
 	true ->
-	    validate_extensions(Rest, ValidationState, ExistBasicCon,
-				SelfSigned, UnknownExtensions, Verify, 
-				AccErr0);
+	    validate_extensions(OtpCert, Rest, ValidationState, ExistBasicCon,
+				SelfSigned, UserState0, VerifyFun);
 	false ->
-	    AccErr = not_valid({bad_cert, invalid_key_usage}, Verify, AccErr0),
-	    validate_extensions(Rest, ValidationState, ExistBasicCon,
-				SelfSigned, UnknownExtensions, Verify, 
-				AccErr)
+	    UserState = verify_fun(OtpCert, {bad_cert, invalid_key_usage},
+				   UserState0, VerifyFun),
+	    validate_extensions(OtpCert, Rest, ValidationState, ExistBasicCon,
+				SelfSigned, UserState, VerifyFun)
     end;
 
-validate_extensions([#'Extension'{extnID = ?'id-ce-subjectAltName',
-				  extnValue = Names} | Rest], 
-		    ValidationState, ExistBasicCon, 
-		    SelfSigned, UnknownExtensions, Verify, AccErr0)  ->    
+validate_extensions(OtpCert, [#'Extension'{extnID = ?'id-ce-subjectAltName',
+					   extnValue = Names,
+					   critical = true} = Ext | Rest],
+		    ValidationState, ExistBasicCon,
+		    SelfSigned, UserState0, VerifyFun)  ->
     case validate_subject_alt_names(Names) of
-	true when Names =/= [] ->
-	    validate_extensions(Rest, ValidationState, ExistBasicCon,
-				SelfSigned, UnknownExtensions, Verify,
-				AccErr0);
-	_ ->
-	    AccErr = 
-		not_valid({bad_cert, invalid_subject_altname}, 
-			  Verify, AccErr0),
-	    validate_extensions(Rest, ValidationState, ExistBasicCon,
-				SelfSigned, UnknownExtensions, Verify,
-				AccErr)
+	true  ->
+	    validate_extensions(OtpCert, Rest, ValidationState, ExistBasicCon,
+				SelfSigned, UserState0, VerifyFun);
+	false ->
+	    UserState = verify_fun(OtpCert, {extension, Ext},
+				   UserState0, VerifyFun),
+	    validate_extensions(OtpCert, Rest, ValidationState, ExistBasicCon,
+				SelfSigned, UserState, VerifyFun)
     end;
 
-%% This extension SHOULD NOT be marked critical. Its value
-%% does not have to be further validated at this point.
-validate_extensions([#'Extension'{extnID = ?'id-ce-issuerAltName', 
-				  extnValue = _} | Rest], 
-		    ValidationState, ExistBasicCon, 
-		    SelfSigned, UnknownExtensions, Verify, AccErr) ->
-    validate_extensions(Rest, ValidationState, ExistBasicCon,
-			SelfSigned, UnknownExtensions, Verify, AccErr);
-
-%% This extension MUST NOT be marked critical.Its value
-%% does not have to be further validated at this point.
-validate_extensions([#'Extension'{extnID = Id,
-				  extnValue = _,
-				  critical = false} | Rest], 
-		    ValidationState, 
-		    ExistBasicCon, SelfSigned, UnknownExtensions,
-		    Verify, AccErr) 
-  when Id == ?'id-ce-subjectKeyIdentifier'; 
-       Id == ?'id-ce-authorityKeyIdentifier'->
-    validate_extensions(Rest, ValidationState, ExistBasicCon,
-			SelfSigned, UnknownExtensions, Verify, AccErr);
-
-validate_extensions([#'Extension'{extnID = ?'id-ce-nameConstraints',
+validate_extensions(OtpCert, [#'Extension'{extnID = ?'id-ce-nameConstraints',
 				  extnValue = NameConst} | Rest], 
 		    ValidationState, 
-		    ExistBasicCon, SelfSigned, UnknownExtensions,
-		    Verify, AccErr) ->
+		    ExistBasicCon, SelfSigned, UserState, VerifyFun) ->
     Permitted = NameConst#'NameConstraints'.permittedSubtrees, 
     Excluded = NameConst#'NameConstraints'.excludedSubtrees,
     
     NewValidationState = add_name_constraints(Permitted, Excluded, 
 					      ValidationState),
     
-    validate_extensions(Rest, NewValidationState, ExistBasicCon,
-			SelfSigned, UnknownExtensions, Verify, AccErr);
-
+    validate_extensions(OtpCert, Rest, NewValidationState, ExistBasicCon,
+			SelfSigned, UserState, VerifyFun);
 
-validate_extensions([#'Extension'{extnID = ?'id-ce-certificatePolicies',
-				  critical = true} | Rest], ValidationState,
-		    ExistBasicCon, SelfSigned, 
-		    UnknownExtensions, Verify, AccErr0) ->
+validate_extensions(OtpCert, [#'Extension'{extnID = ?'id-ce-certificatePolicies',
+					   critical = true} = Ext| Rest], ValidationState,
+		    ExistBasicCon, SelfSigned, UserState0, VerifyFun) ->
     %% TODO: Remove this clause when policy handling is
     %% fully implemented
-    AccErr = 
-	not_valid({bad_cert, unknown_critical_extension}, Verify, AccErr0),
-    validate_extensions(Rest, ValidationState, ExistBasicCon,
-			SelfSigned, UnknownExtensions, Verify, AccErr);
-
-validate_extensions([#'Extension'{extnID = ?'id-ce-certificatePolicies',
-				  extnValue = #'PolicyInformation'{
-				    policyIdentifier = Id,
-				    policyQualifiers = Qualifier}} 
-		     | Rest], #path_validation_state{valid_policy_tree = Tree}
+    UserState = verify_fun(OtpCert, {extension, Ext},
+			   UserState0, VerifyFun),
+    validate_extensions(OtpCert,Rest, ValidationState, ExistBasicCon,
+			SelfSigned, UserState, VerifyFun);
+
+validate_extensions(OtpCert, [#'Extension'{extnID = ?'id-ce-certificatePolicies',
+					   extnValue = #'PolicyInformation'{
+					     policyIdentifier = Id,
+					     policyQualifiers = Qualifier}}
+			      | Rest], #path_validation_state{valid_policy_tree = Tree}
 		    = ValidationState,
-		    ExistBasicCon, SelfSigned, UnknownExtensions,
-		    Verify, AccErr) ->
+		    ExistBasicCon, SelfSigned, UserState, VerifyFun) ->
 
     %% TODO: Policy imp incomplete
     NewTree = process_policy_tree(Id, Qualifier, Tree),
     
-    validate_extensions(Rest, 
+    validate_extensions(OtpCert, Rest,
 			ValidationState#path_validation_state{
 			  valid_policy_tree = NewTree}, 
-			ExistBasicCon, SelfSigned, UnknownExtensions,
-			Verify, AccErr);
+			ExistBasicCon, SelfSigned, UserState, VerifyFun);
 
-validate_extensions([#'Extension'{extnID = ?'id-ce-policyConstraints',
-				  critical = true} | Rest], ValidationState,
-		    ExistBasicCon, SelfSigned, UnknownExtensions, Verify,
-		    AccErr0) ->
+validate_extensions(OtpCert, [#'Extension'{extnID = ?'id-ce-policyConstraints',
+					   critical = true} = Ext | Rest], ValidationState,
+		    ExistBasicCon, SelfSigned, UserState0, VerifyFun) ->
     %% TODO: Remove this clause when policy handling is
     %% fully implemented
-    AccErr = 
-	not_valid({bad_cert, unknown_critical_extension}, Verify, AccErr0),
-    validate_extensions(Rest, ValidationState, ExistBasicCon,
-			SelfSigned, UnknownExtensions, Verify, AccErr);
-validate_extensions([#'Extension'{extnID = ?'id-ce-policyConstraints',
-				  extnValue = #'PolicyConstraints'{
-				    requireExplicitPolicy = ExpPolicy,
-				    inhibitPolicyMapping = MapPolicy}} 
-		     | Rest], ValidationState, ExistBasicCon,
-		    SelfSigned, UnknownExtensions, Verify, AccErr) ->
+    UserState = verify_fun(OtpCert, {extension, Ext},
+			   UserState0, VerifyFun),
+    validate_extensions(OtpCert, Rest, ValidationState, ExistBasicCon,
+			SelfSigned, UserState, VerifyFun);
+validate_extensions(OtpCert, [#'Extension'{extnID = ?'id-ce-policyConstraints',
+					   extnValue = #'PolicyConstraints'{
+					     requireExplicitPolicy = ExpPolicy,
+					     inhibitPolicyMapping = MapPolicy}}
+			      | Rest], ValidationState, ExistBasicCon,
+		    SelfSigned, UserState, VerifyFun) ->
     
     %% TODO: Policy imp incomplete
-    NewValidationState = add_policy_constraints(ExpPolicy, MapPolicy, 
+    NewValidationState = add_policy_constraints(ExpPolicy, MapPolicy,
 						ValidationState),
 
-    validate_extensions(Rest, NewValidationState, ExistBasicCon,
-			SelfSigned, UnknownExtensions, Verify, AccErr);
+    validate_extensions(OtpCert, Rest, NewValidationState, ExistBasicCon,
+			SelfSigned, UserState, VerifyFun);
 
-validate_extensions([Extension | Rest], ValidationState,
-		    ExistBasicCon, SelfSigned, UnknownExtensions, 
-		    Verify, AccErr) ->
-    validate_extensions(Rest, ValidationState, ExistBasicCon, SelfSigned, 
-			[Extension | UnknownExtensions], Verify, AccErr).
+validate_extensions(OtpCert, [#'Extension'{} = Extension | Rest],
+		    ValidationState, ExistBasicCon,
+		    SelfSigned, UserState0, VerifyFun) ->
+    UserState = verify_fun(OtpCert, {extension, Extension}, UserState0, VerifyFun),
+    validate_extensions(OtpCert, Rest, ValidationState, ExistBasicCon, SelfSigned,
+			UserState, VerifyFun).
 
 is_valid_key_usage(KeyUse, Use) ->
     lists:member(Use, KeyUse).
  
 validate_subject_alt_names([]) ->
-    true;
+    false;
 validate_subject_alt_names([AltName | Rest]) ->
     case is_valid_subject_alt_name(AltName) of
 	true ->
-	    validate_subject_alt_names(Rest);
+	    true;
 	false ->
-	    false
+	    validate_subject_alt_names(Rest)
     end.
 
 is_valid_subject_alt_name({Name, Value}) when Name == rfc822Name;
@@ -600,14 +677,11 @@ is_valid_subject_alt_name({directoryName, _}) ->
     true;
 is_valid_subject_alt_name({_, [_|_]}) ->
     true;
+is_valid_subject_alt_name({otherName, #'AnotherName'{}}) ->
+    false;
 is_valid_subject_alt_name({_, _}) ->
     false.
 
-min(N, M) when N =< M ->
-    N;
-min(_, M) ->
-    M.
-
 is_ip_address(Address) ->
     case inet_parse:address(Address) of
 	{ok, _} ->
@@ -670,10 +744,11 @@ split_auth_path(URIPart) ->
     end.
 
 split_uri(UriPart, SplitChar, NoMatchResult, SkipLeft, SkipRight) ->
-    case regexp:first_match(UriPart, SplitChar) of
-	{match, Match, _} ->
-	    {string:substr(UriPart, 1, Match - SkipLeft),
-	     string:substr(UriPart, Match + SkipRight, length(UriPart))}; 
+    case re:run(UriPart, SplitChar) of
+	{match,[{Start, _}]} ->
+	    StrPos = Start + 1,
+	    {string:substr(UriPart, 1, StrPos - SkipLeft),
+	     string:substr(UriPart, StrPos + SkipRight, length(UriPart))}; 
 	nomatch ->
 	    NoMatchResult
     end.
@@ -926,7 +1001,7 @@ add_policy_constraints(ExpPolicy, MapPolicy,
 policy_constraint(Current, asn1_NOVALUE, _) ->
     Current;
 policy_constraint(Current, New, CertNum) ->
-    min(Current, New + CertNum).
+    erlang:min(Current, New + CertNum).
 
 process_policy_tree(_,_, ?NULL) ->
     ?NULL;
diff --git a/lib/public_key/src/pubkey_cert_records.erl b/lib/public_key/src/pubkey_cert_records.erl
index ac04e1c2cb..7a387e487c 100644
--- a/lib/public_key/src/pubkey_cert_records.erl
+++ b/lib/public_key/src/pubkey_cert_records.erl
@@ -23,42 +23,81 @@
 
 -include("public_key.hrl").
 
--export([decode_cert/2, encode_cert/1, encode_tbs_cert/1, transform/2]).
+-export([decode_cert/1, transform/2, supportedPublicKeyAlgorithms/1]).
 
 %%====================================================================
 %% Internal application API
 %%====================================================================
 
-decode_cert(DerCert, plain) ->
-    'OTP-PUB-KEY':decode('Certificate', DerCert);
-decode_cert(DerCert, otp) ->
+%%--------------------------------------------------------------------
+-spec decode_cert(der_encoded()) -> {ok, #'OTPCertificate'{}}.
+%%
+%% Description: Recursively decodes a Certificate. 
+%%-------------------------------------------------------------------- 
+decode_cert(DerCert) ->
     {ok, Cert} = 'OTP-PUB-KEY':decode('OTPCertificate', DerCert),
     #'OTPCertificate'{tbsCertificate = TBS} = Cert,
     {ok, Cert#'OTPCertificate'{tbsCertificate = decode_tbs(TBS)}}.
 
-encode_cert(Cert = #'Certificate'{}) ->
-    {ok, EncCert} = 'OTP-PUB-KEY':encode('Certificate', Cert),
-    list_to_binary(EncCert);
-encode_cert(C = #'OTPCertificate'{tbsCertificate = TBS}) ->
-    Cert = C#'OTPCertificate'{tbsCertificate=encode_tbs(TBS)},
-    {ok, EncCert} = 'OTP-PUB-KEY':encode('OTPCertificate', Cert),
-    list_to_binary(EncCert).
-
-encode_tbs_cert(TBS) ->
-    {ok, EncTBSCert} = 'OTP-PUB-KEY':encode('OTPTBSCertificate', encode_tbs(TBS)),
-    list_to_binary(EncTBSCert).
+%%--------------------------------------------------------------------
+-spec transform(term(), encode | decode) ->term().
+%%
+%% Description: Transforms between encoded and decode otp formated
+%% certificate parts.
+%%-------------------------------------------------------------------- 
+
+transform(#'OTPCertificate'{tbsCertificate = TBS} = Cert, encode) ->
+    Cert#'OTPCertificate'{tbsCertificate=encode_tbs(TBS)};
+transform(#'OTPCertificate'{tbsCertificate = TBS} = Cert, decode) ->
+    Cert#'OTPCertificate'{tbsCertificate=decode_tbs(TBS)};
+transform(#'OTPTBSCertificate'{}= TBS, encode) ->
+    encode_tbs(TBS);
+transform(#'OTPTBSCertificate'{}= TBS, decode) ->
+    decode_tbs(TBS);
+transform(#'AttributeTypeAndValue'{type=Id,value=Value0} = ATAV, Func) ->
+    {ok, Value} =
+        case attribute_type(Id) of
+            Type when is_atom(Type) -> 'OTP-PUB-KEY':Func(Type, Value0);
+            _UnknownType            -> {ok, Value0}
+        end,
+    ATAV#'AttributeTypeAndValue'{value=Value};
+transform(AKI = #'AuthorityKeyIdentifier'{authorityCertIssuer=ACI},Func) ->
+    AKI#'AuthorityKeyIdentifier'{authorityCertIssuer=transform(ACI,Func)};
+transform(List = [{directoryName, _}],Func) ->
+    [{directoryName, transform(Value,Func)} || {directoryName, Value} <- List];
+transform({directoryName, Value},Func) ->
+    {directoryName, transform(Value,Func)};
+transform({rdnSequence, SeqList},Func) when is_list(SeqList) ->
+    {rdnSequence, 
+     lists:map(fun(Seq) -> 
+		       lists:map(fun(Element) -> transform(Element,Func) end, Seq)
+	       end, SeqList)};
+transform(#'NameConstraints'{permittedSubtrees=Permitted, excludedSubtrees=Excluded}, Func) ->
+    #'NameConstraints'{permittedSubtrees=transform_sub_tree(Permitted,Func),
+		       excludedSubtrees=transform_sub_tree(Excluded,Func)};
+	  
+transform(Other,_) ->
+    Other.
 
 %%--------------------------------------------------------------------
-%%% Internal functions
+-spec supportedPublicKeyAlgorithms(Oid::tuple()) -> asn1_type().
+%%
+%% Description: Returns the public key type for an algorithm
+%% identifier tuple as found in SubjectPublicKeyInfo.
+%%
 %%--------------------------------------------------------------------
-
-%%% SubjectPublicKey
 supportedPublicKeyAlgorithms(?'rsaEncryption') -> 'RSAPublicKey';
 supportedPublicKeyAlgorithms(?'id-dsa') -> 'DSAPublicKey';
 supportedPublicKeyAlgorithms(?'dhpublicnumber') -> 'DHPublicKey';
 supportedPublicKeyAlgorithms(?'id-keyExchangeAlgorithm') -> 'KEA-PublicKey';
 supportedPublicKeyAlgorithms(?'id-ecPublicKey') -> 'ECPoint'.
 
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
+%%% SubjectPublicKey
+
 decode_supportedPublicKey(#'OTPSubjectPublicKeyInfo'{algorithm= PA =
 						  #'PublicKeyAlgorithm'{algorithm=Algo},
 						  subjectPublicKey = {0,SPK0}}) ->
@@ -132,31 +171,6 @@ encode_extensions(Exts) ->
 		      end
 	      end, Exts).
 
-transform(#'AttributeTypeAndValue'{type=Id,value=Value0} = ATAV, Func) ->
-    {ok, Value} =
-        case attribute_type(Id) of
-            Type when is_atom(Type) -> 'OTP-PUB-KEY':Func(Type, Value0);
-            _UnknownType            -> {ok, Value0}
-        end,
-    ATAV#'AttributeTypeAndValue'{value=Value};
-transform(AKI = #'AuthorityKeyIdentifier'{authorityCertIssuer=ACI},Func) ->
-    AKI#'AuthorityKeyIdentifier'{authorityCertIssuer=transform(ACI,Func)};
-transform(List = [{directoryName, _}],Func) ->
-    [{directoryName, transform(Value,Func)} || {directoryName, Value} <- List];
-transform({directoryName, Value},Func) ->
-    {directoryName, transform(Value,Func)};
-transform({rdnSequence, SeqList},Func) when is_list(SeqList) ->
-    {rdnSequence, 
-     lists:map(fun(Seq) -> 
-		       lists:map(fun(Element) -> transform(Element,Func) end, Seq)
-	       end, SeqList)};
-transform(#'NameConstraints'{permittedSubtrees=Permitted, excludedSubtrees=Excluded}, Func) ->
-    #'NameConstraints'{permittedSubtrees=transform_sub_tree(Permitted,Func),
-		       excludedSubtrees=transform_sub_tree(Excluded,Func)};
-	  
-transform(Other,_) ->
-    Other.
-
 encode_tbs(TBS=#'OTPTBSCertificate'{issuer=Issuer0,
 				    subject=Subject0,
 				    subjectPublicKeyInfo=Spki0,
diff --git a/lib/public_key/src/pubkey_crypto.erl b/lib/public_key/src/pubkey_crypto.erl
deleted file mode 100644
index 4ab655e977..0000000000
--- a/lib/public_key/src/pubkey_crypto.erl
+++ /dev/null
@@ -1,160 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. 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%
-%%
-
-%%
-%% Description: Functions that call the crypto driver.
-
--module(pubkey_crypto).
-
--include("public_key.hrl").
-
--export([encrypt_public/3, decrypt_private/3, 
-	 encrypt_private/3, decrypt_public/3, 
-	 sign/2, sign/3, verify/5, gen_key/2]).
-
--define(UINT32(X), X:32/unsigned-big-integer).
-
-%%====================================================================
-%% Internal application API
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: encrypt(PlainText, Key, Padding) -> Encrypted
-%%
-%%	PlainText = binary()
-%%	Key       = rsa_public_key() | rsa_private_key()
-%%      Padding   = rsa_pkcs1_padding | rsa_pkcs1_oaep_padding 
-%%      Encrypted = binary()
-%%
-%% Description: Public key encrypts PlainText.
-%%--------------------------------------------------------------------
-encrypt_public(PlainText, #'RSAPublicKey'{modulus=N,publicExponent=E}, 
-	       Padding) ->
-    crypto:rsa_public_encrypt(PlainText, [crypto:mpint(E),crypto:mpint(N)],
-			      Padding);
-encrypt_public(PlainText, #'RSAPrivateKey'{modulus=N,publicExponent=E},
-	       Padding) ->
-    crypto:rsa_public_encrypt(PlainText, [crypto:mpint(E),crypto:mpint(N)],
-			      Padding).
-
-encrypt_private(PlainText, #'RSAPrivateKey'{modulus = N,
-					    publicExponent = E, 
-					    privateExponent = D}, Padding) ->
-    crypto:rsa_private_encrypt(PlainText, [crypto:mpint(E), 
-					   crypto:mpint(N), 
-					   crypto:mpint(D)], Padding).
-
-%%--------------------------------------------------------------------
-%% Function: decrypt(CipherText, Key) -> PlainText
-%%
-%%	ChipherText = binary()
-%%	Key       = rsa_private_key() 
-%%      Padding   = rsa_pkcs1_padding | rsa_pkcs1_oaep_padding 
-%%      PlainText = binary()
-%%
-%% Description: Uses private key to decrypt public key encrypted data.
-%%--------------------------------------------------------------------
-decrypt_private(CipherText, 
-		#'RSAPrivateKey'{modulus = N,publicExponent = E,
-				 privateExponent = D}, 
-		Padding) ->
-    crypto:rsa_private_decrypt(CipherText, 
-			       [crypto:mpint(E), crypto:mpint(N),
-				crypto:mpint(D)], Padding).
-decrypt_public(CipherText, #'RSAPublicKey'{modulus = N, publicExponent = E}, 
-	       Padding) ->
-    crypto:rsa_public_decrypt(CipherText,[crypto:mpint(E), crypto:mpint(N)], 
-			      Padding);
-decrypt_public(CipherText, #'RSAPrivateKey'{modulus = N, publicExponent = E}, 
-	       Padding) ->
-    crypto:rsa_public_decrypt(CipherText,[crypto:mpint(E), crypto:mpint(N)], 
-			      Padding).
-
-%%--------------------------------------------------------------------
-%% Function: sign(PlainText, Key) ->
-%%           sign(DigestType, PlainText, Key) -> Signature
-%%
-%%      DigestType = sha | md5
-%%	PlainText  = binary()
-%%	Key        = rsa_private_key() | dsa_private_key() 
-%%      Signature  = binary()
-%%
-%% Description: Signs PlainText using Key.
-%%--------------------------------------------------------------------
-sign(PlainText, Digest) ->
-    sign(sha, PlainText, Digest).
-
-sign(DigestType, PlainText, #'RSAPrivateKey'{modulus = N, publicExponent = E,
-				       privateExponent = D}) ->
-    crypto:rsa_sign(DigestType, sized_binary(PlainText), [crypto:mpint(E),
-						    crypto:mpint(N),
-						    crypto:mpint(D)]);
-
-sign(sha, PlainText, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) ->
-    crypto:dss_sign(sized_binary(PlainText), 
-		    [crypto:mpint(P), crypto:mpint(Q), 
-		     crypto:mpint(G), crypto:mpint(X)]).
-    
-%%--------------------------------------------------------------------
-%% Function: verify(DigestType, PlainText, Signature, Key) -> true | false
-%%
-%%      DigestType = sha | md5
-%%      PlainText  = binary()
-%%      Signature = binary()
-%%      Key       = rsa_public_key() | dsa_public_key()
-%%
-%% Description: Verifies the signature <Signature>.
-%%--------------------------------------------------------------------
-verify(DigestType, PlainText, Signature, 
-       #'RSAPublicKey'{modulus = Mod, publicExponent = Exp}, _) ->
-    crypto:rsa_verify(DigestType,
-		      sized_binary(PlainText), 
-		      sized_binary(Signature), 
-		      [crypto:mpint(Exp), crypto:mpint(Mod)]);
-
-verify(sha, PlainText, Signature, Key,  #'Dss-Parms'{p = P, q = Q, g = G}) ->
-    crypto:dss_verify(sized_binary(PlainText), 
-		      sized_binary(Signature), 
-		      [crypto:mpint(P), crypto:mpint(Q), 
-		       crypto:mpint(G), crypto:mpint(Key)]).
-
-    
-%%--------------------------------------------------------------------
-%% Function: gen_key(Type, Params) ->
-%%	Type = diffie_hellman 
-%%      Params = [P,G] | [Y, P, G]
-%% Description: Generates keys.
-%% -----------------------------------------------------------------
-gen_key(diffie_hellman, [Y, P, G]) ->
-    crypto:dh_generate_key(crypto:mpint(Y), [crypto:mpint(P), 
-					     crypto:mpint(G)]);
-gen_key(diffie_hellman, [P, G]) ->
-    crypto:dh_generate_key([crypto:mpint(P), crypto:mpint(G)]).
-
-%%% TODO: Support rsa, dss key_gen
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-sized_binary(Binary) when is_binary(Binary) ->
-    Size = size(Binary),
-    <<?UINT32(Size), Binary/binary>>;
-sized_binary(List) ->
-    sized_binary(list_to_binary(List)).
-
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl
index 65879f1bbe..78870e5cd7 100644
--- a/lib/public_key/src/pubkey_pem.erl
+++ b/lib/public_key/src/pubkey_pem.erl
@@ -40,7 +40,10 @@
 
 -module(pubkey_pem).
 
--export([read_file/1, read_file/2, write_file/2, decode/2]).
+-include("public_key.hrl").
+
+-export([encode/1, decode/1, decipher/2, cipher/3]).
+%% Backwards compatibility
 -export([decode_key/2]).
 
 -define(ENCODED_LINE_LENGTH, 64).
@@ -48,28 +51,82 @@
 %%====================================================================
 %% Internal application API
 %%====================================================================
-read_file(File) ->
-    read_file(File, no_passwd).
 
-read_file(File, Passwd) ->
-    {ok, Bin} = file:read_file(File),
-    decode(Bin, Passwd).
+%%--------------------------------------------------------------------
+-spec decode(binary()) -> [pem_entry()].
+%%
+%% Description: Decodes a PEM binary.
+%%--------------------------------------------------------------------		    
+decode(Bin) ->
+    decode_pem_entries(split_bin(Bin), []).
 
-write_file(File, Ds) ->
-    file:write_file(File, encode_file(Ds)).
+%%--------------------------------------------------------------------
+-spec encode([pem_entry()]) -> iolist().
+%%
+%% Description: Encodes a list of PEM entries.
+%%--------------------------------------------------------------------		    
+encode(PemEntries) ->
+    encode_pem_entries(PemEntries).
 
-decode_key({_Type, Bin, not_encrypted}, _) ->
-    Bin;
-decode_key({_Type, Bin, {Chipher,Salt}}, Password) ->
-    decode_key(Bin, Password, Chipher, Salt).
+%%--------------------------------------------------------------------
+-spec decipher({pki_asn1_type(), decrypt_der(),{Cipher :: string(), Salt :: binary()}}, string()) ->  
+		      der_encoded().
+%%
+%% Description: Deciphers a decrypted pem entry.
+%%--------------------------------------------------------------------
+decipher({_, DecryptDer, {Cipher,Salt}}, Password) ->
+    decode_key(DecryptDer, Password, Cipher, Salt).	
 
-decode(Bin, Passwd) ->
-    decode_file(split_bin(Bin), Passwd).
+%%--------------------------------------------------------------------
+-spec cipher(der_encoded(),{Cipher :: string(), Salt :: binary()} , string()) -> binary().
+%%
+%% Description: Ciphers a PEM entry
+%%--------------------------------------------------------------------
+cipher(Der, {Cipher,Salt}, Password)->
+    encode_key(Der, Password, Cipher, Salt).
 
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
+encode_pem_entries(Entries) ->
+    [encode_pem_entry(Entry) || Entry <- Entries].
 
+encode_pem_entry({Asn1Type, Der, not_encrypted}) ->
+    StartStr = pem_start(Asn1Type),
+    [StartStr, "\n", b64encode_and_split(Der), "\n", pem_end(StartStr) ,"\n\n"];
+encode_pem_entry({Asn1Type, Der, {Cipher, Salt}}) ->
+    StartStr = pem_start(Asn1Type),
+    [StartStr,"\n", pem_decrypt(),"\n", pem_decrypt_info(Cipher, Salt),"\n",
+     b64encode_and_split(Der), "\n", pem_end(StartStr) ,"\n\n"].
+
+decode_pem_entries([], Entries) ->
+    lists:reverse(Entries);
+decode_pem_entries([<<>>], Entries) ->
+   lists:reverse(Entries);
+decode_pem_entries([<<>> | Lines], Entries) ->
+    decode_pem_entries(Lines, Entries);
+decode_pem_entries([Start| Lines], Entries) ->
+    case pem_end(Start) of
+	undefined ->
+	    decode_pem_entries(Lines, Entries);
+	_End ->
+	    {Entry, RestLines} = join_entry(Lines, []),
+	    decode_pem_entries(RestLines, [decode_pem_entry(Start, Entry) | Entries])
+    end.
+
+decode_pem_entry(Start, [<<"Proc-Type: 4,ENCRYPTED", _/binary>>, Line | Lines]) ->
+    Asn1Type = asn1_type(Start),
+    Cs = erlang:iolist_to_binary(Lines),
+    Decoded = base64:mime_decode(Cs),
+    [_, DekInfo0] = string:tokens(binary_to_list(Line), ": "),
+    [Cipher, Salt] = string:tokens(DekInfo0, ","), 
+    {Asn1Type, Decoded, {Cipher, unhex(Salt)}};
+decode_pem_entry(Start, Lines) ->
+    Asn1Type = asn1_type(Start),
+    Cs = erlang:iolist_to_binary(Lines),
+    Der = base64:mime_decode(Cs),
+    {Asn1Type, Der, not_encrypted}.
+    
 split_bin(Bin) ->
     split_bin(0, Bin).
 
@@ -85,88 +142,32 @@ split_bin(N, Bin) ->
 	    split_bin(N+1, Bin)
     end.
 
-decode_file(Bin, Passwd) ->
-    decode_file(Bin, [], [Passwd]).
-
-decode_file([<<"-----BEGIN CERTIFICATE REQUEST-----", _/binary>>|Rest], Ens, Info) ->
-    decode_file2(Rest, [], Ens, cert_req, Info);
-decode_file([<<"-----BEGIN CERTIFICATE-----", _/binary>>|Rest], Ens, Info) ->
-    decode_file2(Rest, [], Ens, cert, Info);
-decode_file([<<"-----BEGIN RSA PRIVATE KEY-----", _/binary>>|Rest], Ens, Info) ->
-    decode_file2(Rest, [], Ens, rsa_private_key, Info);
-decode_file([<<"-----BEGIN DSA PRIVATE KEY-----", _/binary>>|Rest], Ens, Info) ->
-    decode_file2(Rest, [], Ens, dsa_private_key, Info);
-decode_file([<<"-----BEGIN DH PARAMETERS-----", _/binary>>|Rest], Ens, Info) ->
-    decode_file2(Rest, [], Ens, dh_params, Info);
-decode_file([_|Rest], Ens, Info) ->
-    decode_file(Rest, Ens, Info);
-decode_file([], Ens, _Info) ->
-    {ok, lists:reverse(Ens)}.
-
-decode_file2([<<"Proc-Type: 4,ENCRYPTED", _/binary>>| Rest0], RLs, Ens, Tag, Info0) ->
-    [InfoLine|Rest] = Rest0,
-    Info = dek_info(InfoLine, Info0),
-    decode_file2(Rest, RLs, Ens, Tag, Info);
-decode_file2([<<"-----END", _/binary>>| Rest], RLs, Ens, Tag, Info0) ->
-    Cs = erlang:iolist_to_binary(lists:reverse(RLs)),
-    Bin = base64:mime_decode(Cs),
-    case Info0 of
-	[Password, Cipher, SaltHex | Info1] ->
-	    Salt = unhex(SaltHex),
-	    Enc = {Cipher, Salt},
-	    Decoded = decode_key(Bin, Password, Cipher, Salt),
-	    decode_file(Rest, [{Tag, Decoded, Enc}| Ens], Info1);
-	_ ->
-	    decode_file(Rest, [{Tag, Bin, not_encrypted}| Ens], Info0)
-    end;
-decode_file2([L|Rest], RLs, Ens, Tag, Info0) ->
-    decode_file2(Rest, [L|RLs], Ens, Tag, Info0);
-decode_file2([], _, Ens, _, _) ->
-    {ok, lists:reverse(Ens)}.
-
-%% Support same as decode_file
-encode_file(Ds) ->
-    lists:map(
-      fun({cert, Bin, not_encrypted}) -> 
-	      %% PKIX (X.509)
-	      ["-----BEGIN CERTIFICATE-----\n",
-	       b64encode_and_split(Bin),
-	       "-----END CERTIFICATE-----\n\n"];
-	 ({cert_req, Bin, not_encrypted}) -> 
-	      %% PKCS#10
-	      ["-----BEGIN CERTIFICATE REQUEST-----\n",
-	       b64encode_and_split(Bin),
-	       "-----END CERTIFICATE REQUEST-----\n\n"];
-	 ({rsa_private_key, Bin, not_encrypted}) -> 
-	      %% PKCS#?
-	      ["XXX Following key assumed not encrypted\n",
-	       "-----BEGIN RSA PRIVATE KEY-----\n",
-	       b64encode_and_split(Bin),
-	       "-----END RSA PRIVATE KEY-----\n\n"];
-	 ({dsa_private_key, Bin, not_encrypted}) -> 
-	      %% PKCS#?
-	      ["XXX Following key assumed not encrypted\n",
-	       "-----BEGIN DSA PRIVATE KEY-----\n",
-	       b64encode_and_split(Bin),
-	       "-----END DSA PRIVATE KEY-----\n\n"]
-      end, Ds).
-
-dek_info(Line0, Info) ->
-    Line = binary_to_list(Line0),
-    [_, DekInfo0] = string:tokens(Line, ": "),
-    DekInfo1 = string:tokens(DekInfo0, ",\n"), 
-    Info ++ DekInfo1.
+b64encode_and_split(Bin) ->
+    split_lines(base64:encode(Bin)).
 
-unhex(S) ->
-    unhex(S, []).
+split_lines(<<Text:?ENCODED_LINE_LENGTH/binary>>) ->
+    [Text];
+split_lines(<<Text:?ENCODED_LINE_LENGTH/binary, Rest/binary>>) ->
+    [Text, $\n | split_lines(Rest)];
+split_lines(Bin) ->
+    [Bin].
 
-unhex("", Acc) ->
-    list_to_binary(lists:reverse(Acc));
-unhex([D1, D2 | Rest], Acc) ->
-    unhex(Rest, [erlang:list_to_integer([D1, D2], 16) | Acc]).
+%% Ignore white space at end of line
+join_entry([<<"-----END CERTIFICATE-----", _/binary>>| Lines], Entry) ->
+    {lists:reverse(Entry), Lines};
+join_entry([<<"-----END RSA PRIVATE KEY-----", _/binary>>| Lines], Entry) ->
+    {lists:reverse(Entry), Lines};
+join_entry([<<"-----END PUBLIC KEY-----", _/binary>>| Lines], Entry) ->
+    {lists:reverse(Entry), Lines};
+join_entry([<<"-----END RSA PUBLIC KEY-----", _/binary>>| Lines], Entry) ->
+    {lists:reverse(Entry), Lines};
+join_entry([<<"-----END DSA PRIVATE KEY-----", _/binary>>| Lines], Entry) ->
+    {lists:reverse(Entry), Lines};
+join_entry([<<"-----END DH PARAMETERS-----", _/binary>>| Lines], Entry) ->
+    {lists:reverse(Entry), Lines};
+join_entry([Line | Lines], Entry) ->
+    join_entry(Lines, [Line | Entry]).
 
-decode_key(Data, no_passwd, _Alg, _Salt) ->
-    Data;
 decode_key(Data, Password, "DES-CBC", Salt) ->
     Key = password_to_key(Password, Salt, 8),
     IV = Salt,
@@ -177,6 +178,16 @@ decode_key(Data,  Password, "DES-EDE3-CBC", Salt) ->
     <<Key1:8/binary, Key2:8/binary, Key3:8/binary>> = Key,
     crypto:des_ede3_cbc_decrypt(Key1, Key2, Key3, IV, Data).
 
+encode_key(Data, Password, "DES-CBC", Salt) ->
+    Key = password_to_key(Password, Salt, 8),
+    IV = Salt,
+    crypto:des_cbc_encrypt(Key, IV, Data);
+encode_key(Data, Password, "DES-EDE3-CBC", Salt) ->
+    Key = password_to_key(Password, Salt, 24),
+    IV = Salt,
+    <<Key1:8/binary, Key2:8/binary, Key3:8/binary>> = Key,
+    crypto:des_ede3_cbc_encrypt(Key1, Key2, Key3, IV, Data).
+
 password_to_key(Data, Salt, KeyLen) ->
     <<Key:KeyLen/binary, _/binary>> = 
 	password_to_key(<<>>, Data, Salt, KeyLen, <<>>),
@@ -188,11 +199,69 @@ password_to_key(Prev, Data, Salt, Len, Acc) ->
     M = crypto:md5([Prev, Data, Salt]),
     password_to_key(M, Data, Salt, Len - size(M), <<Acc/binary, M/binary>>).
 
-b64encode_and_split(Bin) ->
-    split_lines(base64:encode(Bin)).
+unhex(S) ->
+    unhex(S, []).
 
-split_lines(<<Text:?ENCODED_LINE_LENGTH/binary, Rest/binary>>) ->
-    [Text, $\n | split_lines(Rest)];
-split_lines(Bin) ->
-    [Bin, $\n].
+unhex("", Acc) ->
+    list_to_binary(lists:reverse(Acc));
+unhex([D1, D2 | Rest], Acc) ->
+    unhex(Rest, [erlang:list_to_integer([D1, D2], 16) | Acc]).
+
+hexify(L) -> [[hex_byte(B)] || B <- binary_to_list(L)].
+
+hex_byte(B) when B < 16#10 -> ["0", erlang:integer_to_list(B, 16)];
+hex_byte(B) -> erlang:integer_to_list(B, 16).
+
+pem_start('Certificate') ->
+    <<"-----BEGIN CERTIFICATE-----">>;
+pem_start('RSAPrivateKey') ->
+    <<"-----BEGIN RSA PRIVATE KEY-----">>;
+pem_start('RSAPublicKey') ->
+    <<"-----BEGIN RSA PUBLIC KEY-----">>;
+pem_start('SubjectPublicKeyInfo') ->
+    <<"-----BEGIN PUBLIC KEY-----">>;
+pem_start('DSAPrivateKey') ->
+    <<"-----BEGIN DSA PRIVATE KEY-----">>;
+pem_start('DHParameter') ->
+    <<"-----BEGIN DH PARAMETERS-----">>.
+pem_end(<<"-----BEGIN CERTIFICATE-----">>) ->
+    <<"-----END CERTIFICATE-----">>;
+pem_end(<<"-----BEGIN RSA PRIVATE KEY-----">>) ->
+    <<"-----END RSA PRIVATE KEY-----">>;
+pem_end(<<"-----BEGIN RSA PUBLIC KEY-----">>) ->
+    <<"-----END RSA PUBLIC KEY-----">>;
+pem_end(<<"-----BEGIN PUBLIC KEY-----">>) ->
+    <<"-----END PUBLIC KEY-----">>;
+pem_end(<<"-----BEGIN DSA PRIVATE KEY-----">>) ->
+    <<"-----END DSA PRIVATE KEY-----">>;
+pem_end(<<"-----BEGIN DH PARAMETERS-----">>) ->
+    <<"-----END DH PARAMETERS-----">>;
+pem_end(_) ->
+    undefined.
+
+asn1_type(<<"-----BEGIN CERTIFICATE-----">>) ->
+    'Certificate';
+asn1_type(<<"-----BEGIN RSA PRIVATE KEY-----">>) ->
+    'RSAPrivateKey';
+asn1_type(<<"-----BEGIN RSA PUBLIC KEY-----">>) ->
+    'RSAPublicKey';
+asn1_type(<<"-----BEGIN PUBLIC KEY-----">>) ->
+    'SubjectPublicKeyInfo';
+asn1_type(<<"-----BEGIN DSA PRIVATE KEY-----">>) ->
+    'DSAPrivateKey';
+asn1_type(<<"-----BEGIN DH PARAMETERS-----">>) ->
+    'DHParameter'.
+
+pem_decrypt() ->
+    <<"Proc-Type: 4,ENCRYPTED">>.
 
+pem_decrypt_info(Cipher, Salt) ->
+    io_lib:format("DEK-Info: ~s,~s", [Cipher, lists:flatten(hexify(Salt))]).
+
+%%--------------------------------------------------------------------
+%%% Deprecated
+%%--------------------------------------------------------------------
+decode_key({_Type, Bin, not_encrypted}, _) ->
+    Bin;
+decode_key({_Type, Bin, {Chipher,Salt}}, Password) ->
+    decode_key(Bin, Password, Chipher, Salt).
diff --git a/lib/public_key/src/public_key.app.src b/lib/public_key/src/public_key.app.src
index edede7c874..60487946fa 100644
--- a/lib/public_key/src/public_key.app.src
+++ b/lib/public_key/src/public_key.app.src
@@ -4,7 +4,6 @@
    {modules, [
 	          public_key,
 		  pubkey_pem, 
-		  pubkey_crypto,
 		  pubkey_cert,
 		  pubkey_cert_records,
 		  'OTP-PUB-KEY'
@@ -13,4 +12,5 @@
    {registered, []},
    {env, []}  
    ]
-}.
\ No newline at end of file
+}.
+
diff --git a/lib/public_key/src/public_key.appup.src b/lib/public_key/src/public_key.appup.src
index 46e5ecca33..6b6b76d0a5 100644
--- a/lib/public_key/src/public_key.appup.src
+++ b/lib/public_key/src/public_key.appup.src
@@ -1,40 +1,36 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {"0.5",
+ {"0.9",
    [
     {update, public_key, soft, soft_purge, soft_purge, []},
-    {update, pubkey_crypto, soft, soft_purge, soft_purge, []},
-    {update, pubkey_pem, soft, soft_purge, soft_purge, []},
     {update, pubkey_cert, soft, soft_purge, soft_purge, []}
    ]
   },
-  {"0.4",
+  {"0.8",
    [
+    {update, 'OTP-PUB-KEY', soft, soft_purge, soft_purge, []},
     {update, public_key, soft, soft_purge, soft_purge, []},
-    {update, pubkey_cert_records, soft, soft_purge, soft_purge, []},
-    {update, pubkey_crypto, soft, soft_purge, soft_purge, []},
     {update, pubkey_pem, soft, soft_purge, soft_purge, []},
+    {update, pubkey_cert_records, soft, soft_purge, soft_purge, []},
     {update, pubkey_cert, soft, soft_purge, soft_purge, []}
-    ]
+   ]
   }
  ],
  [
-  {"0.5",
+   {"0.9",
+    [
+     {update, public_key, soft, soft_purge, soft_purge, []},
+     {update, pubkey_cert, soft, soft_purge, soft_purge, []}
+    ]
+   },
+  {"0.8",
    [
+    {update, 'OTP-PUB-KEY', soft, soft_purge, soft_purge, []},
     {update, public_key, soft, soft_purge, soft_purge, []},
-    {update, pubkey_crypto, soft, soft_purge, soft_purge, []},
     {update, pubkey_pem, soft, soft_purge, soft_purge, []},
-    {update, pubkey_cert, soft, soft_purge, soft_purge, []}
-   ]
-  },
-  {"0.4",
-   [
-    {update, public_key, soft, soft_purge, soft_purge, []},
     {update, pubkey_cert_records, soft, soft_purge, soft_purge, []},
-    {update, pubkey_crypto, soft, soft_purge, soft_purge, []},
-    {update, pubkey_pem, soft, soft_purge, soft_purge, []},
     {update, pubkey_cert, soft, soft_purge, soft_purge, []}
    ]
-  }
+   }
  ]}.
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index d1d45f21a0..fad73e8e92 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -23,239 +23,426 @@
 
 -include("public_key.hrl").
 
--export([decode_private_key/1, decode_private_key/2, decode_dhparams/1, 
-	 decrypt_private/2, decrypt_private/3, encrypt_public/2, 
-	 encrypt_public/3, decrypt_public/2, decrypt_public/3, 
-	 encrypt_private/2, encrypt_private/3, gen_key/1, sign/2, sign/3,
-	 verify_signature/3, verify_signature/4, verify_signature/5,
-	 pem_to_der/1, pem_to_der/2, der_to_pem/2,
-	 pkix_decode_cert/2, pkix_encode_cert/1, pkix_transform/2,
-	 pkix_is_self_signed/1, pkix_is_fixed_dh_cert/1,
+-export([pem_decode/1, pem_encode/1, 
+	 der_decode/2, der_encode/2,
+	 pem_entry_decode/1,
+	 pem_entry_decode/2,
+	 pem_entry_encode/2,
+	 pem_entry_encode/3,
+	 pkix_decode_cert/2, pkix_encode/3,
+	 encrypt_private/2, encrypt_private/3,
+	 decrypt_private/2, decrypt_private/3, 
+	 encrypt_public/2, encrypt_public/3, 
+	 decrypt_public/2, decrypt_public/3,
+	 sign/3, verify/4,
+	 pkix_sign/2, pkix_verify/2,	 
+	 pkix_is_self_signed/1, 
+	 pkix_is_fixed_dh_cert/1,
+	 pkix_is_issuer/2,
 	 pkix_issuer_id/2,
-	 pkix_is_issuer/2, pkix_normalize_general_name/1,
+	 pkix_normalize_name/1,
 	 pkix_path_validation/3
 	]).
 
+%% Deprecated
+-export([decode_private_key/1, decode_private_key/2, pem_to_der/1]).
+
+-deprecated({pem_to_der, 1, next_major_release}).
+-deprecated({decode_private_key, 1, next_major_release}).
+-deprecated({decode_private_key, 2, next_major_release}).
+
+-type rsa_public_key()       ::  #'RSAPublicKey'{}.
+-type rsa_private_key()      ::  #'RSAPrivateKey'{}.
+-type dsa_private_key()      ::  #'DSAPrivateKey'{}.
+-type dsa_public_key()       :: {integer(), #'Dss-Parms'{}}.
+-type rsa_padding()          :: 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' 
+			      | 'rsa_no_padding'.
+-type public_crypt_options() :: [{rsa_pad, rsa_padding()}].
+-type rsa_digest_type()      :: 'md5' | 'sha'.
+-type dss_digest_type()      :: 'none' | 'sha'.
+
+-define(UINT32(X), X:32/unsigned-big-integer).
+-define(DER_NULL, <<5, 0>>).
+
 %%====================================================================
 %% API
 %%====================================================================
 
 %%--------------------------------------------------------------------
-%% Function: decode_private_key(KeyInfo [,Password]) -> 
-%%                                     {ok, PrivateKey} | {error, Reason}
-%%
-%%	KeyInfo = {Type, der_bin(), ChipherInfo} - as returned from
-%%	pem_to_der/[1,2] for private keys
-%%      Type = rsa_private_key | dsa_private_key
-%%	ChipherInfo = opaque() | no_encryption
+-spec pem_decode(binary()) -> [pem_entry()].
 %%
-%% Description: Decodes an asn1 der encoded private key.
+%% Description: Decode PEM binary data and return
+%% entries as asn1 der encoded entities. 
 %%--------------------------------------------------------------------
-decode_private_key(KeyInfo) ->
-    decode_private_key(KeyInfo, no_passwd).
-
-decode_private_key(KeyInfo = {rsa_private_key, _, _}, Password) ->
-    DerEncoded = pubkey_pem:decode_key(KeyInfo, Password),
-    'OTP-PUB-KEY':decode('RSAPrivateKey', DerEncoded);
-decode_private_key(KeyInfo = {dsa_private_key, _, _}, Password) ->
-    DerEncoded = pubkey_pem:decode_key(KeyInfo, Password),
-    'OTP-PUB-KEY':decode('DSAPrivateKey', DerEncoded).
-
+pem_decode(PemBin) when is_binary(PemBin) ->
+    pubkey_pem:decode(PemBin).
 
 %%--------------------------------------------------------------------
-%% Function: decode_dhparams(DhParamInfo) -> 
-%%                                     {ok, DhParams} | {error, Reason}
+-spec pem_encode([pem_entry()]) -> binary().
 %%
-%%	DhParamsInfo = {Type, der_bin(), ChipherInfo} - as returned from
-%%	pem_to_der/[1,2] for DH parameters.
-%%      Type = dh_params
-%%	ChipherInfo = opaque() | no_encryption
-%%
-%% Description: Decodes an asn1 der encoded DH parameters.
+%% Description: Creates a PEM binary.
 %%--------------------------------------------------------------------
-decode_dhparams({dh_params, DerEncoded, not_encrypted}) ->
-    'OTP-PUB-KEY':decode('DHParameter', DerEncoded).
+pem_encode(PemEntries) when is_list(PemEntries) ->
+    iolist_to_binary(pubkey_pem:encode(PemEntries)).
 
 %%--------------------------------------------------------------------
-%% Function: decrypt_private(CipherText, Key) -> 
-%%           decrypt_private(CipherText, Key, Options) -> PlainTex
-%%           decrypt_public(CipherText, Key) -> 
-%%           decrypt_public(CipherText, Key, Options) -> PlainTex
-%%
-%%	CipherText = binary()
-%%      Key = rsa_key()
-%%      PlainText = binary()
-%%
-%% Description: Decrypts <CipherText>.
+-spec pem_entry_decode(pem_entry(), [string()]) -> term().
+%
+%% Description: Decodes a pem entry. pem_decode/1 returns a list of
+%% pem entries.
+%%--------------------------------------------------------------------
+pem_entry_decode({'SubjectPublicKeyInfo', Der, _}) ->
+    {_, {'AlgorithmIdentifier', AlgId, Params}, {0, Key0}}
+        = der_decode('SubjectPublicKeyInfo', Der),
+    KeyType = pubkey_cert_records:supportedPublicKeyAlgorithms(AlgId),
+    case KeyType of
+        'RSAPublicKey' ->
+            der_decode(KeyType, Key0);
+        'DSAPublicKey' ->
+            {params, DssParams} = der_decode('DSAParams', Params),
+            {der_decode(KeyType, Key0), DssParams}
+    end;
+pem_entry_decode({Asn1Type, Der, not_encrypted}) when is_atom(Asn1Type),
+						      is_binary(Der) ->
+    der_decode(Asn1Type, Der).
+pem_entry_decode({Asn1Type, Der, not_encrypted}, _) when is_atom(Asn1Type),
+							 is_binary(Der) ->
+    der_decode(Asn1Type, Der);
+pem_entry_decode({Asn1Type, CryptDer, {Cipher, Salt}} = PemEntry, 
+		 Password) when is_atom(Asn1Type),
+				is_binary(CryptDer),
+				is_list(Cipher),
+				is_binary(Salt),
+				erlang:byte_size(Salt) == 8
+				->
+    Der = pubkey_pem:decipher(PemEntry, Password),
+    der_decode(Asn1Type, Der).
+
+%%--------------------------------------------------------------------
+-spec pem_entry_encode(pki_asn1_type(), term()) -> pem_entry().
+-spec pem_entry_encode(pki_asn1_type(), term(),
+		       {{Cipher :: string(), Salt :: binary()}, string()}) ->
+			      pem_entry().
+%
+%% Description: Creates a pem entry that can be feed to pem_encode/1.
+%%--------------------------------------------------------------------
+pem_entry_encode('SubjectPublicKeyInfo', Entity=#'RSAPublicKey'{}) ->
+    Der = der_encode('RSAPublicKey', Entity),
+    Spki = {'SubjectPublicKeyInfo',
+            {'AlgorithmIdentifier', ?'rsaEncryption', ?DER_NULL}, {0, Der}},
+    pem_entry_encode('SubjectPublicKeyInfo', Spki);
+pem_entry_encode('SubjectPublicKeyInfo',
+                 {DsaInt, Params=#'Dss-Parms'{}}) when is_integer(DsaInt) ->
+    KeyDer = der_encode('DSAPublicKey', DsaInt),
+    ParamDer = der_encode('DSAParams', {params, Params}),
+    Spki = {'SubjectPublicKeyInfo',
+            {'AlgorithmIdentifier', ?'id-dsa', ParamDer}, {0, KeyDer}},
+    pem_entry_encode('SubjectPublicKeyInfo', Spki);
+pem_entry_encode(Asn1Type, Entity)  when is_atom(Asn1Type) ->
+    Der = der_encode(Asn1Type, Entity),
+    {Asn1Type, Der, not_encrypted}.
+pem_entry_encode(Asn1Type, Entity, 
+		 {{Cipher, Salt}= CipherInfo, Password}) when is_atom(Asn1Type),
+							      is_list(Cipher),
+							      is_binary(Salt),
+							      erlang:byte_size(Salt) == 8,
+							      is_list(Password)->
+    Der = der_encode(Asn1Type, Entity),
+    DecryptDer = pubkey_pem:cipher(Der, CipherInfo, Password),
+    {Asn1Type, DecryptDer, CipherInfo}.
+
+%%--------------------------------------------------------------------
+-spec der_decode(asn1_type(), der_encoded()) -> term().
+%%
+%% Description: Decodes a public key asn1 der encoded entity.
+%%--------------------------------------------------------------------
+der_decode(Asn1Type, Der) when is_atom(Asn1Type), is_binary(Der) ->
+    try 
+	{ok, Decoded} = 'OTP-PUB-KEY':decode(Asn1Type, Der),
+	Decoded
+    catch	    
+	error:{badmatch, {error, _}} = Error ->
+	    erlang:error(Error)
+    end.
+
+%%--------------------------------------------------------------------
+-spec der_encode(asn1_type(), term()) -> der_encoded().
+%%
+%% Description: Encodes a public key entity with asn1 DER encoding.
+%%--------------------------------------------------------------------
+der_encode(Asn1Type, Entity) when is_atom(Asn1Type) ->
+    try 
+	{ok, Encoded} = 'OTP-PUB-KEY':encode(Asn1Type, Entity),
+	iolist_to_binary(Encoded)
+    catch	    
+	error:{badmatch, {error, _}} = Error ->
+	    erlang:error(Error)
+    end.
+
+%%--------------------------------------------------------------------
+-spec pkix_decode_cert(der_encoded(), plain | otp) -> 
+			      #'Certificate'{} | #'OTPCertificate'{}.
+%%
+%% Description: Decodes an asn1 der encoded pkix certificate. The otp
+%% option will use the customized asn1 specification OTP-PKIX.asn1 for
+%% decoding and also recursively decode most of the standard
+%% extensions.
+%% --------------------------------------------------------------------
+pkix_decode_cert(DerCert, plain)  when is_binary(DerCert) ->
+    der_decode('Certificate', DerCert);
+pkix_decode_cert(DerCert, otp) when is_binary(DerCert) ->
+    try 
+	{ok, #'OTPCertificate'{}= Cert} = 
+	    pubkey_cert_records:decode_cert(DerCert),
+	Cert
+    catch
+	error:{badmatch, {error, _}} = Error ->
+	    erlang:error(Error)
+    end.
+
+%%--------------------------------------------------------------------
+-spec pkix_encode(asn1_type(), term(), otp | plain) -> der_encoded().
+%%
+%% Description: Der encodes a certificate or part of a certificate.
+%% This function must be used for encoding certificates or parts of certificates
+%% that are decoded with the otp format, whereas for the plain format this
+%% function will only call der_encode/2.   
+%%--------------------------------------------------------------------
+pkix_encode(Asn1Type, Term, plain) when is_atom(Asn1Type) ->
+    der_encode(Asn1Type, Term);
+
+pkix_encode(Asn1Type, Term0, otp) when is_atom(Asn1Type) ->
+    Term = pubkey_cert_records:transform(Term0, encode),
+    der_encode(Asn1Type, Term).
+
+%%--------------------------------------------------------------------
+-spec decrypt_private(CipherText :: binary(), rsa_private_key()) -> 
+			     PlainText :: binary().
+-spec decrypt_private(CipherText :: binary(), rsa_private_key(), 
+		      public_crypt_options()) -> PlainText :: binary().
+%%
+%% Description: Public key decryption using the private key.
 %%--------------------------------------------------------------------
 decrypt_private(CipherText, Key) ->
     decrypt_private(CipherText, Key, []).
-decrypt_private(CipherText, Key, Options)  ->
-    Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    pubkey_crypto:decrypt_private(CipherText, Key, Padding).
 
-decrypt_public(CipherText, Key) ->
-    decrypt_public(CipherText, Key, []).
-decrypt_public(CipherText, Key, Options)  ->
+decrypt_private(CipherText, 
+		#'RSAPrivateKey'{modulus = N,publicExponent = E,
+				 privateExponent = D}, 
+		Options)  when is_binary(CipherText), 
+			       is_list(Options) ->
     Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    pubkey_crypto:decrypt_public(CipherText, Key, Padding).
+    crypto:rsa_private_decrypt(CipherText, 
+			       [crypto:mpint(E), crypto:mpint(N),
+				crypto:mpint(D)], Padding).
 
 %%--------------------------------------------------------------------
-%% Function: encrypt_public(PlainText, Key, Options) -> CipherText
-%%           encrypt_private(PlainText, Key, Options) -> CipherText
-%%
-%%      PlainText = iolist()
-%%      Key = rsa_private_key()
-%%      CipherText = binary()
+-spec decrypt_public(CipherText :: binary(), rsa_public_key() | rsa_private_key()) ->
+			    PlainText :: binary().
+-spec decrypt_public(CipherText :: binary(), rsa_public_key() | rsa_private_key(),
+		     public_crypt_options()) -> PlainText :: binary().
+%% NOTE: The rsa_private_key() is not part of the documented API it is
+%% here for testing purposes, in a real situation this is not a relevant
+%% thing to do.
 %%
-%% Description: Encrypts <Plain>
+%% Description: Public key decryption using the public key.
 %%--------------------------------------------------------------------
-encrypt_public(PlainText, Key) ->
-    encrypt_public(PlainText, Key, []).
-encrypt_public(PlainText, Key, Options)  ->
-    Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    pubkey_crypto:encrypt_public(PlainText, Key, Padding).
+decrypt_public(CipherText, Key) ->
+    decrypt_public(CipherText, Key, []).
 
-encrypt_private(PlainText, Key) ->
-    encrypt_private(PlainText, Key, []).
-encrypt_private(PlainText, Key, Options)  ->
-    Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    pubkey_crypto:encrypt_private(PlainText, Key, Padding).
+decrypt_public(CipherText, #'RSAPublicKey'{modulus = N, publicExponent = E}, 
+	       Options) when is_binary(CipherText), is_list(Options)  ->
+    decrypt_public(CipherText, N,E, Options);
 
-%%--------------------------------------------------------------------
-%% Function: gen_key(Params) -> Keys
-%%
-%%	Params = #'DomainParameters'{} - Currently only supported option
-%%	Keys = {PublicDHKey = integer(), PrivateDHKey = integer()}
-%%
-%% Description: Generates keys. Currently supports Diffie-Hellman keys.
-%%--------------------------------------------------------------------
-gen_key(#'DHParameter'{prime = P, base = G}) when is_integer(P), 
-						  is_integer(G) ->
-    pubkey_crypto:gen_key(diffie_hellman, [P, G]).
+decrypt_public(CipherText,#'RSAPrivateKey'{modulus = N, publicExponent = E}, 
+	       Options) when is_binary(CipherText), is_list(Options) ->
+    decrypt_public(CipherText, N,E, Options).
 
 %%--------------------------------------------------------------------
-%% Function: pem_to_der(CertSource) ->
-%%           pem_to_der(CertSource, Password) -> {ok, [Entry]} |
-%%                                               {error, Reason}
-%%
-%%      CertSource = File | CertData
-%%      CertData = binary()
-%%	File = path()
-%%	Entry = {entry_type(), der_bin(), ChipherInfo}
-%%      ChipherInfo = opague() | no_encryption
-%%      der_bin() = binary()
-%%	entry_type() = cert | cert_req | rsa_private_key | dsa_private_key
-%%      dh_params
+-spec encrypt_public(PlainText :: binary(), rsa_public_key() | rsa_private_key()) ->
+			    CipherText :: binary().
+-spec encrypt_public(PlainText :: binary(), rsa_public_key() | rsa_private_key(),
+		     public_crypt_options()) ->  CipherText :: binary().
+
+%% NOTE: The rsa_private_key() is not part of the documented API it is
+%% here for testing purposes, in a real situation this is not a relevant
+%% thing to do.
 %%
-%% Description: decode PEM binary data or a PEM file and return
-%% entries as asn1 der encoded entities. Currently supported entry
-%% types are certificates, certificate requests, rsa private keys and
-%% dsa private keys. In the case of a key entry ChipherInfo will be
-%% private keys and Diffie Hellam parameters .In the case of a key
-%% entry ChipherInfo will be used by decode_private_key/2 if the key
-%% is protected by a password.
+%% Description: Public key encryption using the public key.
 %%--------------------------------------------------------------------
-pem_to_der(CertSource) ->
-    pem_to_der(CertSource, no_passwd).
+encrypt_public(PlainText, Key) ->
+    encrypt_public(PlainText, Key, []).
 
-pem_to_der(File, Password) when is_list(File) ->
-    pubkey_pem:read_file(File, Password);
-pem_to_der(PemBin, Password) when is_binary(PemBin) ->
-    pubkey_pem:decode(PemBin, Password).
+encrypt_public(PlainText, #'RSAPublicKey'{modulus=N,publicExponent=E}, 
+	       Options) when is_binary(PlainText), is_list(Options) ->
+    encrypt_public(PlainText, N,E, Options);
 
-der_to_pem(File, TypeDerList) ->
-    pubkey_pem:write_file(File, TypeDerList).
+encrypt_public(PlainText, #'RSAPrivateKey'{modulus=N,publicExponent=E}, 
+	       Options) when is_binary(PlainText), is_list(Options) ->
+    encrypt_public(PlainText, N,E, Options).
 
 %%--------------------------------------------------------------------
-%% Function: pkix_decode_cert(BerCert, Type) -> {ok, Cert} | {error, Reason}
-%%
-%%	BerCert = binary()
-%%      Type = plain | otp
-%%      Cert = certificate()
+-spec encrypt_private(PlainText :: binary(), rsa_private_key()) -> 
+			     CipherText :: binary().
+-spec encrypt_private(PlainText :: binary(), rsa_private_key(), 
+		      public_crypt_options()) -> CipherText :: binary().
 %%
-%% Description:  Decodes an asn1 ber encoded pkix certificate.
-%% otp - Uses OTP-PKIX.asn1 to decode known extensions and
-%% enhance the signature field in #'Certificate'{} and '#TBSCertificate'{}. 
+%% Description: Public key encryption using the private key.
 %%--------------------------------------------------------------------
-pkix_decode_cert(BinCert, Type) ->
-    pubkey_cert_records:decode_cert(BinCert, Type).
+encrypt_private(PlainText, Key) ->
+    encrypt_private(PlainText, Key, []).
+
+encrypt_private(PlainText, #'RSAPrivateKey'{modulus = N,
+					    publicExponent = E, 
+					    privateExponent = D}, 
+		Options) when is_binary(PlainText), is_list(Options) ->		
+    Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
+    crypto:rsa_private_encrypt(PlainText, [crypto:mpint(E), 
+					   crypto:mpint(N), 
+					   crypto:mpint(D)], Padding).
 
 %%--------------------------------------------------------------------
-%% Function: pkix_encode_cert(Cert) -> {ok, binary()} | {error, Reason}
-%%
-%%	Cert = #'Certificate'{} 
+-spec sign(PlainTextOrDigest :: binary(), rsa_digest_type() | dss_digest_type(), 
+	   rsa_private_key() | 
+	   dsa_private_key()) -> Signature :: binary().
 %%
-%% Description: Encodes a certificate record using asn1.
+%% Description: Create digital signature.
 %%--------------------------------------------------------------------
-pkix_encode_cert(Cert) ->
-    pubkey_cert_records:encode_cert(Cert).
+sign(PlainText, DigestType,  #'RSAPrivateKey'{modulus = N,  publicExponent = E,
+					      privateExponent = D}) 
+  when is_binary(PlainText),
+       (DigestType == md5 orelse
+	DigestType == sha) ->
     
+    crypto:rsa_sign(DigestType, sized_binary(PlainText), [crypto:mpint(E),
+							  crypto:mpint(N),
+							  crypto:mpint(D)]);
+
+sign(Digest, none, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) 
+  when is_binary(Digest)->
+    crypto:dss_sign(none, Digest, 
+		    [crypto:mpint(P), crypto:mpint(Q), 
+		     crypto:mpint(G), crypto:mpint(X)]);
+  
+sign(PlainText, sha, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) 
+  when is_binary(PlainText) ->
+    crypto:dss_sign(sized_binary(PlainText), 
+		    [crypto:mpint(P), crypto:mpint(Q), 
+		     crypto:mpint(G), crypto:mpint(X)]).
+
+%%--------------------------------------------------------------------
+-spec verify(PlainTextOrDigest :: binary(), rsa_digest_type() | dss_digest_type(), 
+	     Signature :: binary(), rsa_public_key() 
+	     | dsa_public_key()) -> boolean().
+%%
+%% Description: Verifies a digital signature.
+%%--------------------------------------------------------------------
+verify(PlainText, DigestType, Signature, 
+       #'RSAPublicKey'{modulus = Mod, publicExponent = Exp}) 
+  when is_binary (PlainText), DigestType == sha; DigestType == md5 ->
+    crypto:rsa_verify(DigestType,
+		      sized_binary(PlainText), 
+		      sized_binary(Signature), 
+		      [crypto:mpint(Exp), crypto:mpint(Mod)]);
+
+verify(Digest, none, Signature, {Key,  #'Dss-Parms'{p = P, q = Q, g = G}}) 
+  when is_integer(Key),  is_binary(Digest), is_binary(Signature) ->
+    crypto:dss_verify(none, 
+		      Digest, 
+		      sized_binary(Signature), 
+		      [crypto:mpint(P), crypto:mpint(Q), 
+		       crypto:mpint(G), crypto:mpint(Key)]);
+    
+verify(PlainText, sha, Signature, {Key,  #'Dss-Parms'{p = P, q = Q, g = G}}) 
+  when is_integer(Key),  is_binary(PlainText), is_binary(Signature) ->
+    crypto:dss_verify(sized_binary(PlainText), 
+		      sized_binary(Signature), 
+		      [crypto:mpint(P), crypto:mpint(Q), 
+		       crypto:mpint(G), crypto:mpint(Key)]).
 %%--------------------------------------------------------------------
-%% Function: pkix_transform(CertPart, Op) -> TransformedCertPart
-%%
-%%	CertPart = pkix part data
-%%      Op = encode | decode
+-spec pkix_sign(#'OTPTBSCertificate'{},
+		rsa_private_key() | dsa_private_key()) -> der_encoded().
 %%
-%% Description: Transform parts of a pkix certificate between 'plain' format
-%% and the internal 'otp' format, see pkix_decode_cert/2.
-%% Decode transforms from 'plain' to 'otp' and encode from 'otp' to 'plain'
-%% format.
+%% Description: Sign a pkix x.509 certificate. Returns the corresponding
+%% der encoded 'Certificate'{}
 %%--------------------------------------------------------------------
-pkix_transform(CertPart, Op) ->
-    pubkey_cert_records:transform(CertPart, Op).
+pkix_sign(#'OTPTBSCertificate'{signature = 
+				   #'SignatureAlgorithm'{algorithm = Alg} 
+			       = SigAlg} = TBSCert, Key) ->
+
+    Msg = pkix_encode('OTPTBSCertificate', TBSCert, otp),    
+    DigestType = pubkey_cert:digest_type(Alg),
+    Signature = sign(Msg, DigestType, Key),
+    Cert = #'OTPCertificate'{tbsCertificate= TBSCert,
+			     signatureAlgorithm = SigAlg,
+			     signature = {0, Signature}
+			    },
+    pkix_encode('OTPCertificate', Cert, otp).
 
 %%--------------------------------------------------------------------
-%% Function: pkix_path_validation(TrustedCert, CertChain, Options) -> 
-%%   {ok, {{algorithm(), public_key(), public_key_params()} policy_tree()}} |
-%%   {error, Reason}
+-spec pkix_verify(der_encoded(), rsa_public_key()| 
+		  dsa_public_key()) -> boolean().
 %%
-%% Description: Performs a bacis path validation according to RFC 3280.
+%% Description: Verify pkix x.509 certificate signature.
 %%--------------------------------------------------------------------
-pkix_path_validation(TrustedCert, CertChain, Options)
-  when is_binary(TrustedCert) ->
-    {ok, OtpCert} = pkix_decode_cert(TrustedCert, otp),
-    pkix_path_validation(OtpCert, CertChain, Options);
+pkix_verify(DerCert, {Key, #'Dss-Parms'{}} = DSAKey) 
+  when is_binary(DerCert), is_integer(Key) ->
+    {DigestType, PlainText, Signature} = pubkey_cert:verify_data(DerCert),
+    verify(PlainText, DigestType, Signature, DSAKey);
 
-pkix_path_validation(#'OTPCertificate'{} = TrustedCert, CertChain, Options) 
-  when is_list(CertChain), is_list(Options) ->
-    MaxPathDefault = length(CertChain),
-    ValidationState = pubkey_cert:init_validation_state(TrustedCert, 
-							MaxPathDefault, 
-							Options),
-    Fun = proplists:get_value(validate_extensions_fun, Options,
-			      fun(Extensions, State, _, AccError) ->
-				      {Extensions, State, AccError}
-			      end),
-    Verify = proplists:get_value(verify, Options, true),
-    path_validation(CertChain, ValidationState, Fun, Verify).
-%%--------------------------------------------------------------------
-%% Function: pkix_is_fixed_dh_cert(Cert) -> true | false
+pkix_verify(DerCert,  #'RSAPublicKey'{} = RSAKey) 
+  when is_binary(DerCert) ->
+    {DigestType, PlainText, Signature} = pubkey_cert:verify_data(DerCert),
+    verify(PlainText, DigestType, Signature, RSAKey).
+
+%%--------------------------------------------------------------------
+-spec pkix_is_issuer(Cert :: der_encoded()| #'OTPCertificate'{},
+		     IssuerCert :: der_encoded()| 
+				   #'OTPCertificate'{}) -> boolean().
 %%
-%% Description: Checks if a Certificate is a fixed Diffie-Hellman Cert
+%% Description: Checks if <IssuerCert> issued <Cert>.
 %%--------------------------------------------------------------------
-pkix_is_fixed_dh_cert(#'OTPCertificate'{} = OTPCert) ->
-    pubkey_cert:is_fixed_dh_cert(OTPCert);
-pkix_is_fixed_dh_cert(Cert) when is_binary(Cert) ->
-    {ok, OtpCert} = pkix_decode_cert(Cert, otp),
-    pkix_is_fixed_dh_cert(OtpCert).
+pkix_is_issuer(Cert, IssuerCert)  when is_binary(Cert) ->
+    OtpCert = pkix_decode_cert(Cert, otp),
+    pkix_is_issuer(OtpCert, IssuerCert);
+pkix_is_issuer(Cert, IssuerCert) when is_binary(IssuerCert) ->
+    OtpIssuerCert = pkix_decode_cert(IssuerCert, otp),
+    pkix_is_issuer(Cert, OtpIssuerCert);
+pkix_is_issuer(#'OTPCertificate'{tbsCertificate = TBSCert}, 
+	       #'OTPCertificate'{tbsCertificate = Candidate}) ->
+    pubkey_cert:is_issuer(TBSCert#'OTPTBSCertificate'.issuer,
+			  Candidate#'OTPTBSCertificate'.subject).
 
 %%--------------------------------------------------------------------
-%% Function: pkix_is_self_signed(Cert) -> true | false
+-spec pkix_is_self_signed(der_encoded()| #'OTPCertificate'{}) -> boolean().
 %%
 %% Description: Checks if a Certificate is self signed. 
 %%--------------------------------------------------------------------
 pkix_is_self_signed(#'OTPCertificate'{} = OTPCert) ->
     pubkey_cert:is_self_signed(OTPCert);
 pkix_is_self_signed(Cert) when is_binary(Cert) ->
-    {ok, OtpCert} = pkix_decode_cert(Cert, otp),
+    OtpCert = pkix_decode_cert(Cert, otp),
     pkix_is_self_signed(OtpCert).
-
+  
 %%--------------------------------------------------------------------
-%% Function: pkix_issuer_id(Cert) -> {ok, {SerialNr, Issuer}} | {error, Reason}
-%%                                     
-%%	Cert = asn1_der_encoded() | 'OTPCertificate'{}
+-spec pkix_is_fixed_dh_cert(der_encoded()| #'OTPCertificate'{}) -> boolean().
 %%
+%% Description: Checks if a Certificate is a fixed Diffie-Hellman Cert.
+%%--------------------------------------------------------------------
+pkix_is_fixed_dh_cert(#'OTPCertificate'{} = OTPCert) ->
+    pubkey_cert:is_fixed_dh_cert(OTPCert);
+pkix_is_fixed_dh_cert(Cert) when is_binary(Cert) ->
+    OtpCert = pkix_decode_cert(Cert, otp),
+    pkix_is_fixed_dh_cert(OtpCert).
+
+%%--------------------------------------------------------------------
+-spec pkix_issuer_id(der_encoded()| #'OTPCertificate'{}, 
+		     IssuedBy :: self | other) -> 
+			    {ok, {SerialNr :: integer(), 
+				  Issuer :: {rdnSequence, 
+					     [#'AttributeTypeAndValue'{}]}}} 
+				| {error, Reason :: term()}.
+%
 %% Description: Returns the issuer id.  
 %%--------------------------------------------------------------------
 pkix_issuer_id(#'OTPCertificate'{} = OtpCert, self) ->
@@ -265,151 +452,112 @@ pkix_issuer_id(#'OTPCertificate'{} = OtpCert, other) ->
     pubkey_cert:issuer_id(OtpCert, other);
 
 pkix_issuer_id(Cert, Signed) when is_binary(Cert) ->
-    {ok, OtpCert} = pkix_decode_cert(Cert, otp),
+    OtpCert = pkix_decode_cert(Cert, otp),
     pkix_issuer_id(OtpCert, Signed).
 
 %%--------------------------------------------------------------------
-%% Function: pkix_is_issuer(Cert, IssuerCert) -> true | false
+-spec pkix_normalize_name({rdnSequence, 
+				   [#'AttributeTypeAndValue'{}]}) -> 
+					 {rdnSequence, 
+					  [#'AttributeTypeAndValue'{}]}.
 %%
-%%	Cert = asn1_der_encoded() | 'OTPCertificate'{}
-%%	IssuerCert = asn1_der_encoded() | 'OTPCertificate'{}
-%%
-%% Description: Checks if <IssuerCert> issued <Cert>.
+%% Description: Normalizes a issuer name so that it can be easily
+%%              compared to another issuer name. 
 %%--------------------------------------------------------------------
-pkix_is_issuer(Cert, IssuerCert)  when is_binary(Cert) ->
-    {ok, OtpCert} = pkix_decode_cert(Cert, otp),
-    pkix_is_issuer(OtpCert, IssuerCert);
+pkix_normalize_name(Issuer) -> 
+    pubkey_cert:normalize_general_name(Issuer).
 
-pkix_is_issuer(Cert, IssuerCert) when is_binary(IssuerCert) ->
-    {ok, OtpIssuerCert} = pkix_decode_cert(IssuerCert, otp),
-    pkix_is_issuer(Cert, OtpIssuerCert);
+%%-------------------------------------------------------------------- 
+-spec pkix_path_validation(der_encoded()| #'OTPCertificate'{} | atom(),
+			   CertChain :: [der_encoded()] , 
+			   Options :: list()) ->  
+				  {ok, {PublicKeyInfo :: term(), 
+					PolicyTree :: term()}} |
+				  {error, {bad_cert, Reason :: term()}}.
+%% Description: Performs a basic path validation according to RFC 5280.
+%%--------------------------------------------------------------------
+pkix_path_validation(PathErr, [Cert | Chain], Options0) when is_atom(PathErr)->
+    {VerifyFun, Userstat0} =
+	proplists:get_value(verify_fun, Options0, ?DEFAULT_VERIFYFUN),
+    Otpcert = pkix_decode_cert(Cert, otp),
+    Reason = {bad_cert, PathErr},
+    try VerifyFun(Otpcert, Reason, Userstat0) of
+	{valid, Userstate} ->
+	    Options = proplists:delete(verify_fun, Options0),
+	    pkix_path_validation(Otpcert, Chain, [{verify_fun,
+						   {VerifyFun, Userstate}}| Options]);
+	{fail, _} ->
+	    {error, Reason}
+    catch
+	_:_ ->
+	    {error, Reason}
+    end;
+pkix_path_validation(TrustedCert, CertChain, Options) when
+  is_binary(TrustedCert) -> OtpCert = pkix_decode_cert(TrustedCert,
+  otp), pkix_path_validation(OtpCert, CertChain, Options);
 
-pkix_is_issuer(#'OTPCertificate'{tbsCertificate = TBSCert}, 
-	       #'OTPCertificate'{tbsCertificate = Candidate}) ->
-    pubkey_cert:is_issuer(TBSCert#'OTPTBSCertificate'.issuer,
-			  Candidate#'OTPTBSCertificate'.subject).
-    
-%%--------------------------------------------------------------------
-%% Function: pkix_normalize_general_name(Issuer) -> 
-%%
-%%	Issuer = general_name() - see PKIX
-%%   
-%% Description: Normalizes a general name so that it can be easily
-%%              compared to another genral name. 
-%%--------------------------------------------------------------------
-pkix_normalize_general_name(Issuer) -> 
-    pubkey_cert:normalize_general_name(Issuer).
+pkix_path_validation(#'OTPCertificate'{} = TrustedCert, CertChain, Options) 
+  when is_list(CertChain), is_list(Options) ->
+    MaxPathDefault = length(CertChain),
+    ValidationState = pubkey_cert:init_validation_state(TrustedCert, 
+							MaxPathDefault, 
+							Options),
+    path_validation(CertChain, ValidationState).
 
 %%--------------------------------------------------------------------
-%% Function:sign(Msg, Key) -> {ok, Signature} 
-%%          sign(Msg, Key, KeyParams) -> {ok, Signature}
-%%
-%%	Msg = binary() | #'TBSCertificate'{}
-%%      Key = private_key()
-%%	KeyParams = key_params()
-%%      Signature = binary()
-%%
-%% Description: Signs plaintext Msg or #TBSCertificate{}, in the later
-%%              case a der encoded "#Certificate{}" will be returned. 
+%%% Internal functions
 %%--------------------------------------------------------------------
-sign(Msg, #'RSAPrivateKey'{} = Key) when is_binary(Msg) -> 
-    pubkey_crypto:sign(Msg, Key);
 
-sign(Msg, #'DSAPrivateKey'{} = Key) when is_binary(Msg) ->
-    pubkey_crypto:sign(Msg, Key);
-
-sign(#'OTPTBSCertificate'{signature = #'SignatureAlgorithm'{algorithm = Alg} 
-			  = SigAlg} = TBSCert, Key) ->
-    Msg = pubkey_cert_records:encode_tbs_cert(TBSCert),
-    DigestType = pubkey_cert:digest_type(Alg),
-    Signature = pubkey_crypto:sign(DigestType, Msg, Key),
-    Cert = #'OTPCertificate'{tbsCertificate= TBSCert,
-			     signatureAlgorithm = SigAlg,
-			     signature = {0, Signature}
-			    },
-    pkix_encode_cert(Cert).
+encrypt_public(PlainText, N, E, Options)->
+    Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
+    crypto:rsa_public_encrypt(PlainText, [crypto:mpint(E),crypto:mpint(N)],
+			      Padding).
 
-sign(DigestType, Msg, Key) ->
-    pubkey_crypto:sign(DigestType, Msg, Key).
+decrypt_public(CipherText, N,E, Options) ->  
+    Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
+    crypto:rsa_public_decrypt(CipherText,[crypto:mpint(E), crypto:mpint(N)], 
+			      Padding).
 
-%%--------------------------------------------------------------------
-%% Function: verify_signature(PlainText, DigestType, Signature, Key) ->
-%%           verify_signature(PlainText, DigestType,
-%%                                       Signature, Key, KeyParams) -> 
-%%           verify_signature(DerCert, Key, KeyParams) ->
-%%
-%%      PlainText = binary()
-%%      DigestType = md5 | sha
-%%      DerCert = asn1_der_encoded()
-%%      Signature = binary()
-%%      Key = public_key()
-%%      KeyParams = key_params()
-%%      Verified = boolean()
-%%
-%% Description: Verifies the signature <Signature>.
-%%--------------------------------------------------------------------
-verify_signature(PlainText, DigestType, Signature, #'RSAPublicKey'{} = Key)
-  when is_binary(PlainText), is_binary(Signature), DigestType == sha;
-       DigestType == md5 ->
-    pubkey_crypto:verify(DigestType, PlainText, Signature, Key, undefined).
-
-verify_signature(PlainText, DigestType, Signature, #'RSAPublicKey'{} = Key,
-		 KeyParams) 
-  when is_binary(PlainText), is_binary(Signature), DigestType == sha;
-       DigestType == md5 ->
-    pubkey_crypto:verify(DigestType, PlainText, Signature, Key, KeyParams);
-verify_signature(PlainText, sha, Signature, Key, #'Dss-Parms'{} = KeyParams) 
-  when is_binary(PlainText), is_binary(Signature), is_integer(Key) ->
-    pubkey_crypto:verify(sha, PlainText, Signature, Key, KeyParams).
-
-verify_signature(DerCert, Key, #'Dss-Parms'{} = KeyParams) 
-  when is_binary(DerCert), is_integer(Key) ->
-    pubkey_cert:verify_signature(DerCert, Key, KeyParams);
-verify_signature(DerCert,  #'RSAPublicKey'{} = Key, KeyParams) 
-  when is_binary(DerCert) ->
-    pubkey_cert:verify_signature(DerCert, Key, KeyParams).
 
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
 path_validation([], #path_validation_state{working_public_key_algorithm
 					   = Algorithm,
 					   working_public_key =
 					   PublicKey,
 					   working_public_key_parameters 
 					   = PublicKeyParams,
-					   valid_policy_tree = Tree,
-					   acc_errors = AccErrors
-					  }, _, _) ->
-    {ok, {{Algorithm, PublicKey, PublicKeyParams}, Tree, AccErrors}};
+					   valid_policy_tree = Tree
+					  }) ->
+    {ok, {{Algorithm, PublicKey, PublicKeyParams}, Tree}};
 
 path_validation([DerCert | Rest], ValidationState = #path_validation_state{
-				    max_path_length = Len}, 
-		Fun, Verify) when Len >= 0 ->    
-    try validate(DerCert, 
-		 ValidationState#path_validation_state{last_cert=Rest=:=[]}, 
-		 Fun, Verify) of 
+				    max_path_length = Len}) when Len >= 0 ->
+    try validate(DerCert,
+		 ValidationState#path_validation_state{last_cert=Rest=:=[]}) of
 	#path_validation_state{} = NewValidationState ->
-	    path_validation(Rest, NewValidationState, Fun, Verify)
+	    path_validation(Rest, NewValidationState)
     catch   
 	throw:Reason ->
 	    {error, Reason}
     end;
 
-path_validation(_, _, _, true) ->
-    {error, {bad_cert, max_path_length_reached}};
-
-path_validation(_, #path_validation_state{working_public_key_algorithm
-					   = Algorithm,
-					   working_public_key =
-					   PublicKey,
-					   working_public_key_parameters 
-					   = PublicKeyParams,
-					  valid_policy_tree = Tree,
-					  acc_errors = AccErrors
-					 }, _, false) ->
-    {ok, {{Algorithm, PublicKey, PublicKeyParams}, Tree, 
-	  [{bad_cert, max_path_length_reached}|AccErrors]}}.
+path_validation([DerCert | _] = Path,
+		#path_validation_state{user_state = UserState0,
+				       verify_fun = VerifyFun} =
+		    ValidationState) ->
+    Reason = {bad_cert, max_path_length_reached},
+    OtpCert = pkix_decode_cert(DerCert, otp),
+    try VerifyFun(OtpCert,  Reason, UserState0) of
+	{valid, UserState} ->
+	    path_validation(Path,
+			    ValidationState#path_validation_state{
+			      max_path_length = 0,
+			      user_state = UserState});
+	{fail, _} ->
+	    {error, Reason}
+    catch
+	_:_ ->
+	    {error, Reason}
+    end.
 
 validate(DerCert, #path_validation_state{working_issuer_name = Issuer,
 					 working_public_key = Key,
@@ -419,38 +567,58 @@ validate(DerCert, #path_validation_state{working_issuer_name = Issuer,
 					 excluded_subtrees = Exclude,
 					 last_cert = Last,
 					 user_state = UserState0,
-					 acc_errors = AccErr0} = 
-	 ValidationState0, ValidateExtensionFun, Verify) -> 
-    {ok, OtpCert} = pkix_decode_cert(DerCert, otp),
-    %% All validate functions will throw {bad_cert, Reason} if they 
-    %% fail and Verify = true if Verify = false errors
-    %% will be accumulated in the validationstate 
-    AccErr1 = pubkey_cert:validate_time(OtpCert, AccErr0, Verify),
-
-    AccErr2 = pubkey_cert:validate_issuer(OtpCert, Issuer, AccErr1, Verify),
-
-    AccErr3 = pubkey_cert:validate_names(OtpCert, Permit, Exclude, Last,
-					 AccErr2, Verify),
-    AccErr4 = 
-	pubkey_cert:validate_revoked_status(OtpCert, Verify, AccErr3),
+					 verify_fun = VerifyFun} =
+	     ValidationState0) ->
+
+    OtpCert = pkix_decode_cert(DerCert, otp),
+
+    UserState1 = pubkey_cert:validate_time(OtpCert, UserState0, VerifyFun),
+
+    UserState2 = pubkey_cert:validate_issuer(OtpCert, Issuer, UserState1, VerifyFun),
+
+    UserState3 = pubkey_cert:validate_names(OtpCert, Permit, Exclude, Last,
+					    UserState2,VerifyFun),
+
+    UserState4 = pubkey_cert:validate_revoked_status(OtpCert, UserState3, VerifyFun),
     
-    {ValidationState1, UnknownExtensions0, AccErr5} = 
-	pubkey_cert:validate_extensions(OtpCert, ValidationState0, Verify,
-					AccErr4),
-    %% We want the key_usage extension to be checked before we validate 
+    {ValidationState1, UserState5} =
+	pubkey_cert:validate_extensions(OtpCert, ValidationState0, UserState4,
+					VerifyFun),
+
+    %% We want the key_usage extension to be checked before we validate
     %% the signature. 
-    AccErr6 = 
-	pubkey_cert:validate_signature(OtpCert, DerCert, Key, KeyParams,
-				       AccErr5, Verify),
-
-    {UnknownExtensions, UserState, AccErr7} = 
-	ValidateExtensionFun(UnknownExtensions0, UserState0, Verify, AccErr6),
-   
-    %% Check that all critical extensions have been handled 
-    AccErr = 
-	pubkey_cert:validate_unknown_extensions(UnknownExtensions, AccErr7, 
-						Verify),
+    UserState6 = pubkey_cert:validate_signature(OtpCert, DerCert,
+						Key, KeyParams, UserState5, VerifyFun),
+    UserState = case Last of
+		    false ->
+			pubkey_cert:verify_fun(OtpCert, valid, UserState6, VerifyFun);
+		    true ->
+			pubkey_cert:verify_fun(OtpCert, valid_peer,
+					       UserState6, VerifyFun)
+		end,
+
     ValidationState  = 
-	ValidationState1#path_validation_state{user_state = UserState,
-					       acc_errors = AccErr},
+	ValidationState1#path_validation_state{user_state = UserState},
+
     pubkey_cert:prepare_for_next_cert(OtpCert, ValidationState).
+
+sized_binary(Binary) ->
+    Size = size(Binary),
+    <<?UINT32(Size), Binary/binary>>.
+
+%%--------------------------------------------------------------------
+%%% Deprecated functions
+%%--------------------------------------------------------------------
+pem_to_der(CertSource) ->
+    {ok, Bin} = file:read_file(CertSource),
+    {ok, pubkey_pem:decode(Bin)}.
+
+decode_private_key(KeyInfo) ->
+    decode_private_key(KeyInfo, no_passwd).
+
+decode_private_key(KeyInfo = {'RSAPrivateKey', _, _}, Password) ->
+    DerEncoded = pubkey_pem:decode_key(KeyInfo, Password),
+    'OTP-PUB-KEY':decode('RSAPrivateKey', DerEncoded);
+decode_private_key(KeyInfo = {'DSAPrivateKey', _, _}, Password) ->
+    DerEncoded = pubkey_pem:decode_key(KeyInfo, Password),
+    'OTP-PUB-KEY':decode('DSAPrivateKey', DerEncoded).
diff --git a/lib/public_key/test/Makefile b/lib/public_key/test/Makefile
index 5544339ff2..e20b903942 100644
--- a/lib/public_key/test/Makefile
+++ b/lib/public_key/test/Makefile
@@ -28,7 +28,7 @@ INCLUDES= -I. -I ../include
 # ----------------------------------------------------
 
 MODULES= \
-	pkey_test \
+	erl_make_certs \
 	public_key_SUITE \
 	pkits_SUITE
 
diff --git a/lib/public_key/test/pkey_test.erl b/lib/public_key/test/erl_make_certs.erl
index 9d596eee4f..8b01ca3ad4 100644
--- a/lib/public_key/test/pkey_test.erl
+++ b/lib/public_key/test/erl_make_certs.erl
@@ -19,7 +19,7 @@
 
 %% Create test certificates
 
--module(pkey_test).
+-module(erl_make_certs).
 -include_lib("public_key/include/public_key.hrl").
 
 -export([make_cert/1, gen_rsa/1, verify_signature/3, write_pem/3]).
@@ -34,7 +34,7 @@
 %%   version                                        3
 %%   subject                                        [] list of the following content
 %%      {name,  Name}
-%%      {email, Email}
+%%      {email, Email} 
 %%      {city,  City}
 %%      {state, State}
 %%      {org, Org}
@@ -56,7 +56,7 @@
 make_cert(Opts) ->
     SubjectPrivateKey = get_key(Opts),
     {TBSCert, IssuerKey} = make_tbs(SubjectPrivateKey, Opts),
-    Cert = public_key:sign(TBSCert, IssuerKey),
+    Cert = public_key:pkix_sign(TBSCert, IssuerKey),
     true = verify_signature(Cert, IssuerKey, undef), %% verify that the keys where ok
     {Cert, encode_key(SubjectPrivateKey)}.
 
@@ -66,8 +66,9 @@ make_cert(Opts) ->
 %% @end
 %%--------------------------------------------------------------------
 write_pem(Dir, FileName, {Cert, Key = {_,_,not_encrypted}}) when is_binary(Cert) ->
-    ok = public_key:der_to_pem(filename:join(Dir, FileName ++ ".pem"), [{cert, Cert, not_encrypted}]),
-    ok = public_key:der_to_pem(filename:join(Dir, FileName ++ "_key.pem"), [Key]).
+    ok = der_to_pem(filename:join(Dir, FileName ++ ".pem"),
+			       [{'Certificate', Cert, not_encrypted}]),
+    ok = der_to_pem(filename:join(Dir, FileName ++ "_key.pem"), [Key]).
 
 %%--------------------------------------------------------------------
 %% @doc Creates a rsa key (OBS: for testing only)
@@ -94,18 +95,14 @@ gen_dsa(LSize,NSize) when is_integer(LSize), is_integer(NSize) ->
 %% @spec (::binary(), ::tuple()) -> ::boolean()
 %% @end
 %%--------------------------------------------------------------------
-verify_signature(DerEncodedCert, DerKey, KeyParams) ->
+verify_signature(DerEncodedCert, DerKey, _KeyParams) ->
     Key = decode_key(DerKey),
     case Key of 
 	#'RSAPrivateKey'{modulus=Mod, publicExponent=Exp} ->
-	    public_key:verify_signature(DerEncodedCert, 
-					#'RSAPublicKey'{modulus=Mod, publicExponent=Exp}, 
-					'NULL');
+	    public_key:pkix_verify(DerEncodedCert, 
+				   #'RSAPublicKey'{modulus=Mod, publicExponent=Exp});
 	#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y} ->
-	    public_key:verify_signature(DerEncodedCert, Y, #'Dss-Parms'{p=P, q=Q, g=G});
-
-	_  ->
-	    public_key:verify_signature(DerEncodedCert, Key, KeyParams)
+	    public_key:pkix_verify(DerEncodedCert, {Y, #'Dss-Parms'{p=P, q=Q, g=G}})
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%% Implementation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -132,59 +129,63 @@ decode_key(#'RSAPrivateKey'{} = Key,_) ->
     Key;
 decode_key(#'DSAPrivateKey'{} = Key,_) ->
     Key;
-decode_key(Der = {_,_,_}, Pw) ->
-    {ok, Key} = public_key:decode_private_key(Der, Pw),
-    Key;
-decode_key(FileOrDer, Pw) ->
-    {ok, [KeyInfo]} = public_key:pem_to_der(FileOrDer),
+decode_key(PemEntry = {_,_,_}, Pw) ->
+    public_key:pem_entry_decode(PemEntry, Pw);
+decode_key(PemBin, Pw) ->
+    [KeyInfo] = public_key:pem_decode(PemBin),
     decode_key(KeyInfo, Pw).
 
 encode_key(Key = #'RSAPrivateKey'{}) ->
     {ok, Der} = 'OTP-PUB-KEY':encode('RSAPrivateKey', Key),
-    {rsa_private_key, list_to_binary(Der), not_encrypted};   
+    {'RSAPrivateKey', list_to_binary(Der), not_encrypted};   
 encode_key(Key = #'DSAPrivateKey'{}) ->
     {ok, Der} = 'OTP-PUB-KEY':encode('DSAPrivateKey', Key),
-    {dsa_private_key, list_to_binary(Der), not_encrypted}.
+    {'DSAPrivateKey', list_to_binary(Der), not_encrypted}.
 
 make_tbs(SubjectKey, Opts) ->    
     Version = list_to_atom("v"++integer_to_list(proplists:get_value(version, Opts, 3))),
-    {Issuer, IssuerKey}  = issuer(Opts, SubjectKey),
+
+    IssuerProp = proplists:get_value(issuer, Opts, true),
+    {Issuer, IssuerKey}  = issuer(IssuerProp, Opts, SubjectKey),
 
     {Algo, Parameters} = sign_algorithm(IssuerKey, Opts),
     
     SignAlgo = #'SignatureAlgorithm'{algorithm  = Algo,
 				     parameters = Parameters},    
-    
+    Subject = case IssuerProp of
+		  true -> %% Is a Root Ca
+		      Issuer;
+		  _ ->
+		      subject(proplists:get_value(subject, Opts),false)
+	      end,
+
     {#'OTPTBSCertificate'{serialNumber = trunc(random:uniform()*100000000)*10000 + 1,
 			  signature    = SignAlgo,
 			  issuer       = Issuer,
 			  validity     = validity(Opts),
-			  subject      = subject(proplists:get_value(subject, Opts),false),
+			  subject      = Subject,
 			  subjectPublicKeyInfo = publickey(SubjectKey),
 			  version      = Version,
 			  extensions   = extensions(Opts)
 			 }, IssuerKey}.
 
-issuer(Opts, SubjectKey) ->
-    IssuerProp = proplists:get_value(issuer, Opts, true),
-    case IssuerProp of 
-	true -> %% Self signed
-	    {subject(proplists:get_value(subject, Opts), true), SubjectKey};
-	{Issuer, IssuerKey} when is_binary(Issuer) ->
-	    {issuer_der(Issuer), decode_key(IssuerKey)};
-        {File, IssuerKey} when is_list(File) ->
-	    {ok, [{cert, Cert, _}|_]} = public_key:pem_to_der(File),
-	    {issuer_der(Cert), decode_key(IssuerKey)}
-    end.
+issuer(true, Opts, SubjectKey) ->
+    %% Self signed
+    {subject(proplists:get_value(subject, Opts), true), SubjectKey};
+issuer({Issuer, IssuerKey}, _Opts, _SubjectKey) when is_binary(Issuer) ->
+    {issuer_der(Issuer), decode_key(IssuerKey)};
+issuer({File, IssuerKey}, _Opts, _SubjectKey) when is_list(File) ->
+    {ok, [{cert, Cert, _}|_]} = public_key:pem_to_der(File),
+    {issuer_der(Cert), decode_key(IssuerKey)}.
 
 issuer_der(Issuer) ->
-    {ok, Decoded} = public_key:pkix_decode_cert(Issuer, otp),
+    Decoded = public_key:pkix_decode_cert(Issuer, otp),
     #'OTPCertificate'{tbsCertificate=Tbs} = Decoded,
     #'OTPTBSCertificate'{subject=Subject} = Tbs,
     Subject.
 
-subject(undefined, IsCA) ->
-    User = if IsCA -> "CA"; true -> os:getenv("USER") end,
+subject(undefined, IsRootCA) ->
+    User = if IsRootCA -> "RootCA"; true -> os:getenv("USER") end,
     Opts = [{email, User ++ "@erlang.org"},
 	    {name, User},
 	    {city, "Stockholm"},
@@ -267,11 +268,11 @@ publickey(#'RSAPrivateKey'{modulus=N, publicExponent=E}) ->
 			       subjectPublicKey = Public};
 publickey(#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y}) ->
     Algo = #'PublicKeyAlgorithm'{algorithm= ?'id-dsa', 
-				 parameters=#'Dss-Parms'{p=P, q=Q, g=G}},
+				 parameters={params, #'Dss-Parms'{p=P, q=Q, g=G}}},
     #'OTPSubjectPublicKeyInfo'{algorithm = Algo, subjectPublicKey = Y}.
 
 validity(Opts) ->
-    DefFrom0 = date(),
+    DefFrom0 = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())-1),
     DefTo0   = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())+7),
     {DefFrom, DefTo} = proplists:get_value(validity, Opts, {DefFrom0, DefTo0}),
     Format = fun({Y,M,D}) -> lists:flatten(io_lib:format("~w~2..0w~2..0w000000Z",[Y,M,D])) end,
@@ -289,7 +290,7 @@ sign_algorithm(#'RSAPrivateKey'{}, Opts) ->
 	   end,
     {Type, 'NULL'};
 sign_algorithm(#'DSAPrivateKey'{p=P, q=Q, g=G}, _Opts) ->
-    {?'id-dsa-with-sha1', #'Dss-Parms'{p=P, q=Q, g=G}}.
+    {?'id-dsa-with-sha1', {params,#'Dss-Parms'{p=P, q=Q, g=G}}}.
 
 make_key(rsa, _Opts) ->
     %% (OBS: for testing only)
@@ -410,3 +411,11 @@ extended_gcd(A, B) ->
 	    {X, Y} = extended_gcd(B, N),
 	    {Y, X-Y*(A div B)}
     end.
+
+pem_to_der(File) ->
+    {ok, PemBin} = file:read_file(File),
+    public_key:pem_decode(PemBin).
+
+der_to_pem(File, Entries) ->
+    PemBin = public_key:pem_encode(Entries),
+    file:write_file(File, PemBin).
diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl
index 5d58b39e26..fd976cb2f3 100644
--- a/lib/public_key/test/pkits_SUITE.erl
+++ b/lib/public_key/test/pkits_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -25,8 +25,8 @@
 
 -compile(export_all).
 
-%%-include_lib("public_key/include/public_key.hrl").
--include("public_key.hrl").
+-include_lib("public_key/include/public_key.hrl").
+%%-include("public_key.hrl").
 
 -define(error(Format,Args), error(Format,Args,?FILE,?LINE)).
 -define(warning(Format,Args), warning(Format,Args,?FILE,?LINE)).
@@ -43,25 +43,24 @@
 -define(NIST6, "2.16.840.1.101.3.2.1.48.6").
 
 %%
-all(doc) ->
-    ["PKITS tests for RFC3280 compliance"];
-all(suite) ->    
-    [signature_verification,
-     validity_periods,
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [signature_verification, validity_periods,
      verifying_name_chaining,
-     %% basic_certificate_revocation_tests,
      verifying_paths_with_self_issued_certificates,
-     verifying_basic_constraints,
-     key_usage,
-%%      certificate_policies,
-%%      require_explicit_policy,
-%%      policy_mappings,
-%%      inhibit_policy_mapping,
-%%      inhibit_any_policy,
-     name_constraints,	     
-%%      distribution_points,
-%%      delta_crls,
-     private_certificate_extensions].
+     verifying_basic_constraints, key_usage,
+     name_constraints, private_certificate_extensions].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 signature_verification(doc) ->    [""];
 signature_verification(suite) -> [];
@@ -129,7 +128,6 @@ private_certificate_extensions(Config) when is_list(Config) ->
     run(private_certificate_extensions()).
     
 run() ->
-    catch crypto:start(),
     Tests = 
 	[signature_verification(),
 	 validity_periods(),
@@ -187,9 +185,9 @@ run([],_) -> ok.
 read_certs(Test) ->
     File = test_file(Test),
     %% io:format("Read ~p ",[File]),
-    {ok, Ders} = public_key:pem_to_der(File),
+    Ders = erl_make_certs:pem_to_der(File),
     %% io:format("Ders ~p ~n",[length(Ders)]),
-    [Cert || {cert,Cert,not_encrypted} <- Ders].
+    [Cert || {'Certificate', Cert, not_encrypted} <- Ders].
 
 test_file(Test) ->
     file(?CONV, lists:append(string:tokens(Test, " -")) ++ ".pem").
@@ -581,17 +579,21 @@ init_per_testcase(_Func, Config) ->
     put(datadir, Datadir),
     Config.
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     %% Nodes = select_nodes(all, Config, ?FILE, ?LINE),
     %% rpc:multicall(Nodes, mnesia, lkill, []),
     Config.
 
 init_per_suite(Config) ->
-    crypto:start(),
-    Config.
+    case application:start(crypto) of
+	ok ->
+	    Config;
+	_  ->
+	    {skip, "Crypto did not start"}
+    end.
 
 end_per_suite(_Config) ->
-    crypto:stop().
+    application:stop(crypto).
 
 error(Format, Args, File0, Line) ->
     File = filename:basename(File0),
diff --git a/lib/public_key/test/public_key.cover b/lib/public_key/test/public_key.cover
index 8477c76ef6..ec00814578 100644
--- a/lib/public_key/test/public_key.cover
+++ b/lib/public_key/test/public_key.cover
@@ -1,2 +1,4 @@
+{incl_app,public_key,details}.
 
-{exclude, ['OTP-PUB-KEY']}.
\ No newline at end of file
+
+{excl_mods, public_key, ['OTP-PUB-KEY']}.
diff --git a/lib/public_key/test/public_key.spec b/lib/public_key/test/public_key.spec
index dee9ad44ed..1749822c2d 100644
--- a/lib/public_key/test/public_key.spec
+++ b/lib/public_key/test/public_key.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../public_key_test"}}.
-
+{suites,"../public_key_test",all}.
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index 6a3d6bfcf5..d130196c15 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -23,10 +23,10 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("test_server/include/test_server_line.hrl").
 
--include("public_key.hrl").
+-include_lib("public_key/include/public_key.hrl").
 
 -define(TIMEOUT, 120000). % 2 min
 
@@ -41,9 +41,12 @@
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    crypto:start(),
-    Config.
-
+    case application:start(crypto) of
+	ok ->
+	    Config;
+	_ ->
+	    {skip, "Crypto did not start"}
+    end.
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]
@@ -51,7 +54,7 @@ init_per_suite(Config) ->
 %% Description: Cleanup after the whole suite
 %%--------------------------------------------------------------------
 end_per_suite(_Config) ->
-    crypto:stop().
+    application:stop(crypto).
 
 %%--------------------------------------------------------------------
 %% Function: init_per_testcase(TestCase, Config) -> Config
@@ -96,19 +99,21 @@ end_per_testcase(_TestCase, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test the public_key rsa functionality"];
-
-all(suite) -> 
-    [app, 
-     dh, 
-     pem_to_der, 
-     decode_private_key,
-     encrypt_decrypt, 
-     sign_verify,
-     pkix,
-     pkix_path_validation
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [app, pk_decode_encode, encrypt_decrypt, sign_verify,
+     pkix, pkix_path_validation, deprecated].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
@@ -120,85 +125,125 @@ app(suite) ->
 app(Config) when is_list(Config) ->
     ok = test_server:app_test(public_key).
 
-dh(doc) ->
-    "Test diffie-hellman functions file is ok";
-dh(suite) ->
+pk_decode_encode(doc) -> 
+    ["Tests pem_decode/1, pem_encode/1, "
+     "der_decode/2, der_encode/2, "
+     "pem_entry_decode/1, pem_entry_decode/2,"
+     "pem_entry_encode/2, pem_entry_encode/3."];
+
+pk_decode_encode(suite) -> 
     [];
-dh(Config) when is_list(Config) ->
+pk_decode_encode(Config) when is_list(Config) -> 
     Datadir = ?config(data_dir, Config),
-    {ok,[DerDHparams = {dh_params, _, _}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "dh.pem")),
-    {ok, DHps = #'DHParameter'{prime=P,base=G}} = public_key:decode_dhparams(DerDHparams),
-    DHKeys = {Private,_Public} = public_key:gen_key(DHps),
-    test_server:format("DHparams = ~p~nDH Keys~p~n", [DHps, DHKeys]),
-    {_Private,_Public2} = pubkey_crypto:gen_key(diffie_hellman, [crypto:erlint(Private), P, G]),
-    ok.
+
+    [{'DSAPrivateKey', DerDSAKey, not_encrypted} = Entry0 ] = 
+	erl_make_certs:pem_to_der(filename:join(Datadir, "dsa.pem")), 
+    
+    DSAKey = public_key:der_decode('DSAPrivateKey', DerDSAKey),
+    
+    DSAKey = public_key:pem_entry_decode(Entry0),
+
+    {ok, DSAPubPem} = file:read_file(filename:join(Datadir, "dsa_pub.pem")),
+    [{'SubjectPublicKeyInfo', _, _} = PubEntry0] =
+        public_key:pem_decode(DSAPubPem),
+    DSAPubKey = public_key:pem_entry_decode(PubEntry0),
+    true = check_entry_type(DSAPubKey, 'DSAPublicKey'),
+    PubEntry0 = public_key:pem_entry_encode('SubjectPublicKeyInfo', DSAPubKey),
+    DSAPubPemNoEndNewLines = strip_ending_newlines(DSAPubPem),
+    DSAPubPemEndNoNewLines = strip_ending_newlines(public_key:pem_encode([PubEntry0])),
+    
+    [{'RSAPrivateKey', DerRSAKey, not_encrypted} =  Entry1 ] = 
+	erl_make_certs:pem_to_der(filename:join(Datadir, "client_key.pem")),
+    
+    RSAKey0 = public_key:der_decode('RSAPrivateKey', DerRSAKey),
+    
+    RSAKey0 = public_key:pem_entry_decode(Entry1),
+        
+    [{'RSAPrivateKey', _, {_,_}} = Entry2] = 
+	erl_make_certs:pem_to_der(filename:join(Datadir, "rsa.pem")),
     
+    true = check_entry_type(public_key:pem_entry_decode(Entry2, "abcd1234"), 
+			    'RSAPrivateKey'),
+
+    {ok, RSAPubPem} = file:read_file(filename:join(Datadir, "rsa_pub.pem")),
+    [{'SubjectPublicKeyInfo', _, _} = PubEntry1] =
+        public_key:pem_decode(RSAPubPem),
+    RSAPubKey = public_key:pem_entry_decode(PubEntry1),
+    true = check_entry_type(RSAPubKey, 'RSAPublicKey'),
+    PubEntry1 = public_key:pem_entry_encode('SubjectPublicKeyInfo', RSAPubKey),
+    RSAPubPemNoEndNewLines = strip_ending_newlines(RSAPubPem),
+    RSAPubPemNoEndNewLines = strip_ending_newlines(public_key:pem_encode([PubEntry1])),
+
+    {ok, RSARawPem} = file:read_file(filename:join(Datadir, "rsa_pub_key.pem")),
+    [{'RSAPublicKey', _, _} = PubEntry2] =
+        public_key:pem_decode(RSARawPem),
+    RSAPubKey = public_key:pem_entry_decode(PubEntry2),
+    RSARawPemNoEndNewLines = strip_ending_newlines(RSARawPem),
+    RSARawPemNoEndNewLines = strip_ending_newlines(public_key:pem_encode([PubEntry2])),
+
+    Salt0 = crypto:rand_bytes(8),
+    Entry3 = public_key:pem_entry_encode('RSAPrivateKey', RSAKey0, 
+					 {{"DES-EDE3-CBC", Salt0}, "1234abcd"}),
+    
+    RSAKey0 = public_key:pem_entry_decode(Entry3,"1234abcd"),
+    
+    Des3KeyFile = filename:join(Datadir, "des3_client_key.pem"),
 
-pem_to_der(doc) -> 
-    ["Check that supported PEM files are decoded into the expected entry type"];
-pem_to_der(suite) -> 
-    [];
-pem_to_der(Config) when is_list(Config) -> 
-    Datadir = ?config(data_dir, Config),
-    {ok,DSAKey =[{dsa_private_key, _, not_encrypted}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "dsa.pem")), 
-    {ok,[{rsa_private_key, _, _}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "client_key.pem")),
-    {ok, [{rsa_private_key, _, _}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "rsa.pem")),
-    {ok,[{rsa_private_key, _, _}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "rsa.pem"), "abcd1234"),
-    {ok, Bin0} = file:read_file(filename:join(Datadir, "rsa.pem")), 
-    {ok, [{rsa_private_key, _, _}]} = public_key:pem_to_der(Bin0, "abcd1234"),
-
-    {ok,[{dh_params, _, _}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "dh.pem")),
-    {ok,[{cert, _, not_encrypted}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "client_cert.pem")),
-    {ok,[{cert_req, _, _}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "req.pem")),
-    {ok, Certs = [{cert, _, _}, {cert, _, _}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "cacerts.pem")),
-
-    {ok, Bin1} = file:read_file(filename:join(Datadir, "cacerts.pem")),
-    {ok, [{cert, _, _}, {cert, _, _}]} = public_key:pem_to_der(Bin1),
-
-    ok = public_key:der_to_pem(filename:join(Datadir, "wcacerts.pem"), Certs), 
-    ok = public_key:der_to_pem(filename:join(Datadir, "wdsa.pem"), DSAKey), 
+    erl_make_certs:der_to_pem(Des3KeyFile, [Entry3]),
+
+    [{'RSAPrivateKey', _, {"DES-EDE3-CBC", Salt0}}] = erl_make_certs:pem_to_der(Des3KeyFile),
     
-    {ok, Certs} = public_key:pem_to_der(filename:join(Datadir, "wcacerts.pem")),
-    {ok, DSAKey} = public_key:pem_to_der(filename:join(Datadir, "wdsa.pem")),
+    Salt1 = crypto:rand_bytes(8),
+    Entry4 = public_key:pem_entry_encode('RSAPrivateKey', RSAKey0, 
+					   {{"DES-CBC", Salt1}, "4567efgh"}),
 
-    ok.
-%%--------------------------------------------------------------------
-decode_private_key(doc) -> 
-    ["Check that private keys are decode to the expected key type."];
-decode_private_key(suite) -> 
-    [];
-decode_private_key(Config) when is_list(Config) -> 
-    Datadir = ?config(data_dir, Config),
-    {ok,[DsaKey = {dsa_private_key, _DsaKey, _}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "dsa.pem")), 
-    {ok,[RsaKey = {rsa_private_key, _RsaKey,_}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "client_key.pem")),
-    {ok,[ProtectedRsaKey1 = {rsa_private_key, _ProtectedRsaKey1,_}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "rsa.pem"), "abcd1234"),
-    {ok,[ProtectedRsaKey2 = {rsa_private_key, _ProtectedRsaKey2,_}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "rsa.pem")),
 
-    {ok, #'DSAPrivateKey'{}} = public_key:decode_private_key(DsaKey),
-    {ok, #'RSAPrivateKey'{}} = public_key:decode_private_key(RsaKey),
-    {ok, #'RSAPrivateKey'{}} = public_key:decode_private_key(ProtectedRsaKey1),
-    {ok, #'RSAPrivateKey'{}} = public_key:decode_private_key(ProtectedRsaKey2, "abcd1234"),
+    DesKeyFile = filename:join(Datadir, "des_client_key.pem"),
+    
+    erl_make_certs:der_to_pem(DesKeyFile, [Entry4]),
+
+    [{'RSAPrivateKey', _, {"DES-CBC", Salt1}} =Entry5] = erl_make_certs:pem_to_der(DesKeyFile),
+
+    
+     true = check_entry_type(public_key:pem_entry_decode(Entry5, "4567efgh"),
+			     'RSAPrivateKey'),
+
+    [{'DHParameter', DerDH, not_encrypted} = Entry6] =  
+	erl_make_certs:pem_to_der(filename:join(Datadir, "dh.pem")),
+    
+    erl_make_certs:der_to_pem(filename:join(Datadir, "new_dh.pem"), [Entry6]),
+
+    DHParameter = public_key:der_decode('DHParameter', DerDH),
+    DHParameter = public_key:pem_entry_decode(Entry6),
+
+    Entry6 = public_key:pem_entry_encode('DHParameter', DHParameter),
+   
+    [{'Certificate', DerCert, not_encrypted} = Entry7] =  
+	erl_make_certs:pem_to_der(filename:join(Datadir, "client_cert.pem")),
+    
+    Cert = public_key:der_decode('Certificate', DerCert),
+    Cert = public_key:pem_entry_decode(Entry7),
+    
+    CertEntries = [{'Certificate', _, not_encrypted} = CertEntry0, 
+		   {'Certificate', _, not_encrypted} = CertEntry1] = 
+        erl_make_certs:pem_to_der(filename:join(Datadir, "cacerts.pem")),
+    
+    ok = erl_make_certs:der_to_pem(filename:join(Datadir, "wcacerts.pem"), CertEntries), 
+    ok = erl_make_certs:der_to_pem(filename:join(Datadir, "wdsa.pem"), [Entry0]), 
+    
+     NewCertEntries = erl_make_certs:pem_to_der(filename:join(Datadir, "wcacerts.pem")),
+     true = lists:member(CertEntry0, NewCertEntries),
+     true = lists:member(CertEntry1, NewCertEntries),
+    [Entry0] = erl_make_certs:pem_to_der(filename:join(Datadir, "wdsa.pem")),
     ok.
+
 %%--------------------------------------------------------------------
 encrypt_decrypt(doc) -> 
     [""];
 encrypt_decrypt(suite) -> 
     [];
 encrypt_decrypt(Config) when is_list(Config) -> 
-    {PrivateKey, _DerKey} = pkey_test:gen_rsa(64),
+    {PrivateKey, _DerKey} = erl_make_certs:gen_rsa(64),
     #'RSAPrivateKey'{modulus=Mod, publicExponent=Exp} = PrivateKey,
     PublicKey = #'RSAPublicKey'{modulus=Mod, publicExponent=Exp},
     Msg = list_to_binary(lists:duplicate(5, "Foo bar 100")),
@@ -219,69 +264,79 @@ sign_verify(suite) ->
     [];
 sign_verify(Config) when is_list(Config) -> 
     %% Make cert signs and validates the signature using RSA and DSA
-    Ca = {_, CaKey} = pkey_test:make_cert([]),
-    {ok, PrivateRSA = #'RSAPrivateKey'{modulus=Mod, publicExponent=Exp}} = 
-	public_key:decode_private_key(CaKey),
+    Ca = {_, CaKey} = erl_make_certs:make_cert([]),
+    PrivateRSA = #'RSAPrivateKey'{modulus=Mod, publicExponent=Exp} = 
+	public_key:pem_entry_decode(CaKey),
 
-    CertInfo = {Cert1,CertKey1} = pkey_test:make_cert([{key, dsa}, {issuer, Ca}]),
+    CertInfo = {Cert1,CertKey1} = erl_make_certs:make_cert([{key, dsa}, {issuer, Ca}]),
 
     PublicRSA = #'RSAPublicKey'{modulus=Mod, publicExponent=Exp},
-    true = public_key:verify_signature(Cert1, PublicRSA, undefined),
+    true = public_key:pkix_verify(Cert1, PublicRSA),
 
-    {Cert2,_CertKey} = pkey_test:make_cert([{issuer, CertInfo}]),
+    {Cert2,_CertKey} = erl_make_certs:make_cert([{issuer, CertInfo}]),
 
-    {ok, #'DSAPrivateKey'{p=P, q=Q, g=G, y=Y, x=_X}} = 
-	public_key:decode_private_key(CertKey1),
-    true = public_key:verify_signature(Cert2, Y, #'Dss-Parms'{p=P, q=Q, g=G}),
+    #'DSAPrivateKey'{p=P, q=Q, g=G, y=Y, x=_X} = 
+	public_key:pem_entry_decode(CertKey1),
+    true = public_key:pkix_verify(Cert2, {Y, #'Dss-Parms'{p=P, q=Q, g=G}}),
     
     %% RSA sign
-    Msg0 = lists:duplicate(5, "Foo bar 100"),
-    Msg  = list_to_binary(Msg0),
-    RSASign = public_key:sign(sha, Msg0, PrivateRSA),
-    RSASign = public_key:sign(Msg, PrivateRSA),
-    true = public_key:verify_signature(Msg, sha, RSASign, PublicRSA), 
-    false = public_key:verify_signature(<<1:8, Msg/binary>>, sha, RSASign, PublicRSA), 
-    false = public_key:verify_signature(Msg, sha, <<1:8, RSASign/binary>>, PublicRSA), 
-    RSASign = public_key:sign(sha, Msg, PrivateRSA),
-
-    RSASign1 = public_key:sign(md5, Msg, PrivateRSA),
-    true = public_key:verify_signature(Msg, md5, RSASign1, PublicRSA), 
+    Msg = list_to_binary(lists:duplicate(5, "Foo bar 100")),
+
+    RSASign = public_key:sign(Msg, sha, PrivateRSA),
+    true = public_key:verify(Msg, sha, RSASign, PublicRSA), 
+    false = public_key:verify(<<1:8, Msg/binary>>, sha, RSASign, PublicRSA), 
+    false = public_key:verify(Msg, sha, <<1:8, RSASign/binary>>, PublicRSA), 
+
+    RSASign1 = public_key:sign(Msg, md5, PrivateRSA),
+    true = public_key:verify(Msg, md5, RSASign1, PublicRSA), 
     
     %% DSA sign
     Datadir = ?config(data_dir, Config),
-    {ok,[DsaKey = {dsa_private_key, _, _}]} = 
-	public_key:pem_to_der(filename:join(Datadir, "dsa.pem")), 
-    {ok, DSAPrivateKey} = public_key:decode_private_key(DsaKey),
+    [DsaKey = {'DSAPrivateKey', _, _}] = 
+	erl_make_certs:pem_to_der(filename:join(Datadir, "dsa.pem")), 
+    DSAPrivateKey = public_key:pem_entry_decode(DsaKey),
     #'DSAPrivateKey'{p=P1, q=Q1, g=G1, y=Y1, x=_X1} = DSAPrivateKey,
-    DSASign = public_key:sign(Msg, DSAPrivateKey),
+    DSASign = public_key:sign(Msg, sha, DSAPrivateKey),
     DSAPublicKey = Y1,
     DSAParams = #'Dss-Parms'{p=P1, q=Q1, g=G1},
-    true = public_key:verify_signature(Msg, sha, DSASign, DSAPublicKey, DSAParams), 
-    false = public_key:verify_signature(<<1:8, Msg/binary>>, sha, DSASign, DSAPublicKey, DSAParams), 
-    false = public_key:verify_signature(Msg, sha, <<1:8, DSASign/binary>>, DSAPublicKey, DSAParams), 
+    true = public_key:verify(Msg, sha, DSASign, {DSAPublicKey, DSAParams}), 
+    false = public_key:verify(<<1:8, Msg/binary>>, sha, DSASign, 
+			      {DSAPublicKey, DSAParams}), 
+    false = public_key:verify(Msg, sha, <<1:8, DSASign/binary>>, 
+			      {DSAPublicKey, DSAParams}), 
+    
+    Digest = crypto:sha(Msg),
+    DigestSign = public_key:sign(Digest, none, DSAPrivateKey),
+    true = public_key:verify(Digest, none, DigestSign, {DSAPublicKey, DSAParams}), 
+    <<_:8, RestDigest/binary>> = Digest,
+    false = public_key:verify(<<1:8, RestDigest/binary>>, none, DigestSign, 
+			      {DSAPublicKey, DSAParams}), 
+    false = public_key:verify(Digest, none, <<1:8, DigestSign/binary>>, 
+			      {DSAPublicKey, DSAParams}), 
     
     ok.
-
+%%--------------------------------------------------------------------
 pkix(doc) ->
     "Misc pkix tests not covered elsewhere";
 pkix(suite) ->
     [];
 pkix(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
-    {ok,Certs0} = public_key:pem_to_der(filename:join(Datadir, "cacerts.pem")),
-    {ok,Certs1} = public_key:pem_to_der(filename:join(Datadir, "client_cert.pem")),
-    TestTransform = fun({cert, CertDer, not_encrypted}) ->
-			    {ok, PlainCert} = public_key:pkix_decode_cert(CertDer, plain),
-			    {ok, OtpCert} = public_key:pkix_decode_cert(CertDer, otp),
-			    CertDer = public_key:pkix_encode_cert(OtpCert),
-			    CertDer = public_key:pkix_encode_cert(PlainCert),
-
-			    OTPSubj = (OtpCert#'OTPCertificate'.tbsCertificate)#'OTPTBSCertificate'.subject,
-			    Subj = public_key:pkix_transform(OTPSubj, encode),
-			    {ok, DNEncoded} = 'OTP-PUB-KEY':encode('Name', Subj),
-			    Subj2 = (PlainCert#'Certificate'.tbsCertificate)#'TBSCertificate'.subject,
-			    {ok, DNEncoded} = 'OTP-PUB-KEY':encode('Name', Subj2),
-			    OTPSubj = public_key:pkix_transform(Subj2, decode),
+    Certs0 = erl_make_certs:pem_to_der(filename:join(Datadir, "cacerts.pem")),
+    Certs1 = erl_make_certs:pem_to_der(filename:join(Datadir, "client_cert.pem")),
+    TestTransform = fun({'Certificate', CertDer, not_encrypted}) ->
+			    PlainCert = public_key:pkix_decode_cert(CertDer, plain),
+			    OtpCert = public_key:pkix_decode_cert(CertDer, otp),
+			    CertDer = 
+				public_key:pkix_encode('OTPCertificate', OtpCert, otp),
+			    CertDer = 
+				public_key:pkix_encode('Certificate', PlainCert, plain),
+			    OTPTBS = OtpCert#'OTPCertificate'.tbsCertificate,
+			    OTPSubj = OTPTBS#'OTPTBSCertificate'.subject, 
+			    DNEncoded = public_key:pkix_encode('Name', OTPSubj, otp),
+			    PlainTBS = PlainCert#'Certificate'.tbsCertificate,
+			    Subj2 = PlainTBS#'TBSCertificate'.subject,
+			    DNEncoded = public_key:pkix_encode('Name', Subj2, plain),
 
 			    false = public_key:pkix_is_fixed_dh_cert(CertDer)
 		    end,
@@ -290,26 +345,31 @@ pkix(Config) when is_list(Config) ->
     true = public_key:pkix_is_self_signed(element(2,hd(Certs0))),
     false = public_key:pkix_is_self_signed(element(2,hd(Certs1))),
 
-    CaIds = [element(2, public_key:pkix_issuer_id(Cert, self)) || {cert, Cert, _} <- Certs0],
-    {ok, IssuerId = {_, IssuerName}} = public_key:pkix_issuer_id(element(2,hd(Certs1)), other),
+    CaIds = [element(2, public_key:pkix_issuer_id(Cert, self)) || 
+		{'Certificate', Cert, _} <- Certs0],
+    {ok, IssuerId = {_, _IssuerName}} = 
+	public_key:pkix_issuer_id(element(2,hd(Certs1)), other),
+
     true = lists:member(IssuerId, CaIds),
 
     %% Should be normalized allready
-    TestStr   = {rdnSequence, [[{'AttributeTypeAndValue', {2,5,4,3},{printableString,"ERLANGCA"}}],
-			       [{'AttributeTypeAndValue', {2,5,4,3},{printableString," erlang  ca "}}]]},
-    VerifyStr = {rdnSequence, [[{'AttributeTypeAndValue', {2,5,4,3},{printableString,"erlang ca"}}],
-			       [{'AttributeTypeAndValue', {2,5,4,3},{printableString,"erlangca"}}]]},
-    VerifyStr = public_key:pkix_normalize_general_name(TestStr),
+    TestStr   = {rdnSequence, 
+		 [[{'AttributeTypeAndValue', {2,5,4,3},{printableString,"ERLANGCA"}}],
+		  [{'AttributeTypeAndValue', {2,5,4,3},{printableString," erlang  ca "}}]]},
+    VerifyStr = {rdnSequence, 
+		 [[{'AttributeTypeAndValue', {2,5,4,3},{printableString,"erlang ca"}}],
+		  [{'AttributeTypeAndValue', {2,5,4,3},{printableString,"erlangca"}}]]},
+    VerifyStr = public_key:pkix_normalize_name(TestStr),
 
     ok.
-
+%%--------------------------------------------------------------------
 pkix_path_validation(doc) ->
     "Misc pkix tests not covered elsewhere";
 pkix_path_validation(suite) ->
     [];
 pkix_path_validation(Config) when is_list(Config) ->
     CaK = {Trusted,_} = 
-	pkey_test:make_cert([{key, dsa},
+	erl_make_certs:make_cert([{key, dsa},
 			     {subject, [
 					{name, "Public Key"},
 					{?'id-at-name', {printableString, "public_key"}},
@@ -320,26 +380,96 @@ pkix_path_validation(Config) when is_list(Config) ->
 					{org_unit, "testing dep"}
 				       ]}
 			    ]),
-    ok = pkey_test:write_pem("/tmp", "cacert", CaK),
-
-    CertK1 = {Cert1, _} = pkey_test:make_cert([{issuer, CaK}]),
-    CertK2 = {Cert2,_} = pkey_test:make_cert([{issuer, CertK1}, {digest, md5}, {extensions, false}]),
-    ok = pkey_test:write_pem("/tmp", "cert", CertK2),
+    ok = erl_make_certs:write_pem("./", "public_key_cacert", CaK),
 
+    CertK1 = {Cert1, _} = erl_make_certs:make_cert([{issuer, CaK}]),
+    CertK2 = {Cert2,_} = erl_make_certs:make_cert([{issuer, CertK1}, 
+					      {digest, md5}, {extensions, false}]),
+    ok = erl_make_certs:write_pem("./", "public_key_cert", CertK2),
+    
     {ok, _} = public_key:pkix_path_validation(Trusted, [Cert1], []),
     
-    {error, {bad_cert,invalid_issuer}} = public_key:pkix_path_validation(Trusted, [Cert2], []),
-    %%{error, {bad_cert,invalid_issuer}} = public_key:pkix_path_validation(Trusted, [Cert2], [{verify,false}]), 
+    {error, {bad_cert,invalid_issuer}} = 
+	public_key:pkix_path_validation(Trusted, [Cert2], []),
     
     {ok, _} = public_key:pkix_path_validation(Trusted, [Cert1, Cert2], []),    
     {error, issuer_not_found} = public_key:pkix_issuer_id(Cert2, other),
 
-    CertK3 = {Cert3,_}  = pkey_test:make_cert([{issuer, CertK1}, {extensions, [{basic_constraints, false}]}]),
-    {Cert4,_}  = pkey_test:make_cert([{issuer, CertK3}]),
-    {error, E={bad_cert,missing_basic_constraint}} = 
+    CertK3 = {Cert3,_}  = erl_make_certs:make_cert([{issuer, CertK1}, 
+					       {extensions, [{basic_constraints, false}]}]),
+    {Cert4,_}  = erl_make_certs:make_cert([{issuer, CertK3}]),
+    {error, {bad_cert,missing_basic_constraint}} =
 	public_key:pkix_path_validation(Trusted, [Cert1, Cert3,Cert4], []),
-    
-    {ok, {_,_,[E]}} = public_key:pkix_path_validation(Trusted, [Cert1, Cert3,Cert4], [{verify,false}]),
 
-    % test_server:format("PV ~p ~n", [Result]),
+    VerifyFunAndState0  = {fun(_,{bad_cert, missing_basic_constraint}, UserState) ->
+				   {valid, UserState};
+			      (_,{bad_cert, _} = Reason, _) ->
+				   {fail, Reason};
+			      (_,{extension, _}, UserState) ->
+				   {unknown, UserState};
+			      (_, valid, UserState) ->
+				   {valid, UserState};
+			      (_, valid_peer, UserState) ->
+				   {valid, UserState}
+			   end, []},
+    {ok, _} =
+	public_key:pkix_path_validation(Trusted, [Cert1, Cert3,Cert4],
+					[{verify_fun, VerifyFunAndState0}]),
+
+    {error, {bad_cert, unknown_ca}} =
+	public_key:pkix_path_validation(unknown_ca, [Cert1, Cert3, Cert4], []),
+
+    VerifyFunAndState1 =
+	{fun(_,{bad_cert, unknown_ca}, UserState) ->
+		 {valid, UserState};
+	    (_,{bad_cert, _} = Reason, _) ->
+		 {fail, Reason};
+	    (_,{extension, _}, UserState) ->
+		 {unknown, UserState};
+	    (_, valid, UserState) ->
+		 {valid, UserState}
+	 end, []},
+
+    {ok, _} =
+	public_key:pkix_path_validation(unknown_ca, [Cert1], [{verify_fun,
+							      VerifyFunAndState1}]),
     ok.
+
+%%--------------------------------------------------------------------
+deprecated(doc) -> 
+    ["Check deprecated functions."];
+deprecated(suite) -> 
+    [];
+deprecated(Config) when is_list(Config) -> 
+    Datadir = ?config(data_dir, Config),
+    {ok, [DsaKey = {'DSAPrivateKey', _DsaKey, _}]} =
+	public_key:pem_to_der(filename:join(Datadir, "dsa.pem")), 
+    {ok, [RsaKey = {'RSAPrivateKey', _RsaKey,_}]} =
+	public_key:pem_to_der(filename:join(Datadir, "client_key.pem")),
+    {ok, [ProtectedRsaKey = {'RSAPrivateKey', _ProtectedRsaKey,_}]} =
+	public_key:pem_to_der(filename:join(Datadir, "rsa.pem")),
+
+    {ok, #'DSAPrivateKey'{}} = public_key:decode_private_key(DsaKey),
+    {ok, #'RSAPrivateKey'{}} = public_key:decode_private_key(RsaKey),
+    {ok, #'RSAPrivateKey'{}} = public_key:decode_private_key(ProtectedRsaKey, "abcd1234"),
+    ok.
+
+%%--------------------------------------------------------------------
+
+check_entry_type(#'DSAPrivateKey'{}, 'DSAPrivateKey') ->
+    true;
+check_entry_type(#'RSAPrivateKey'{}, 'RSAPrivateKey') ->
+    true;
+check_entry_type(#'RSAPublicKey'{}, 'RSAPublicKey') ->
+    true;
+check_entry_type({_Int, #'Dss-Parms'{}}, 'DSAPublicKey') when is_integer(_Int) ->
+    true;
+check_entry_type(#'DHParameter'{}, 'DHParameter') ->
+    true;
+check_entry_type(#'Certificate'{}, 'Certificate') ->
+    true;
+check_entry_type(_,_) ->
+    false.
+
+strip_ending_newlines(Bin) ->
+    string:strip(binary_to_list(Bin), right, 10).
diff --git a/lib/public_key/test/public_key_SUITE_data/dsa_pub.pem b/lib/public_key/test/public_key_SUITE_data/dsa_pub.pem
new file mode 100644
index 0000000000..d3635e5b20
--- /dev/null
+++ b/lib/public_key/test/public_key_SUITE_data/dsa_pub.pem
@@ -0,0 +1,12 @@
+-----BEGIN PUBLIC KEY-----
+MIIBtzCCASwGByqGSM44BAEwggEfAoGBALez5tklY5CdFeTMos899pA6i4u4uCts
+zgBzrdBk6cl5FVqzdzWMGTQiynnTpGsrOESinzP06Ip+pG15We2OORwgvCxD/W95
+aCiN0/+MdiXqlsmboBARMzsa+SmBENN3gF/+tuuEAFzOXU1q2cmEywRLyfbM2KIB
+VE/TChWYw2eRAhUA1R64VvcQ90XA8SOKVDmMA0dBzukCgYEAlLMYP0pbgBlgHQVO
+3/avAHlWNrIq52Lxk7SdPJWgMvPjTK9Z6sv88kxsCcydtjvO439j1yqcwk50GQc+
+86ktBWWz93/HkIdnFyqafef4mmWvm2Uq6ClQKS+A0Asfaj8Mys+HUMiI+qsfdjRb
+yIpwb7MX1nsVdsKzALnZNMW27A0DgYQAAoGAfEIAb3mLjtFfiF/tsZb4/DGHdWSb
+6Ir0hFkoBUZ9ymBO70wlfZVSQGs240kZtOMpAOpJL1Dy8oH6PUQ+JyacwZIo8fdq
+19/Kwm6CPrpaEhzErmMvwT2CZJYZ+HOk55ljLkVCiyG7MzEj2+odLKym9yoQsbsJ
+olHzIRpkLk45y4c=
+-----END PUBLIC KEY-----
diff --git a/lib/public_key/test/public_key_SUITE_data/rsa_pub.pem b/lib/public_key/test/public_key_SUITE_data/rsa_pub.pem
new file mode 100644
index 0000000000..cbe81343f7
--- /dev/null
+++ b/lib/public_key/test/public_key_SUITE_data/rsa_pub.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANRiyZg0uci74Nc6mnqZ8AoDl88aT7x6
+JA0MfgHIHzteEj7Qg+lE5QxMGAafurVE5vqoHkDfwk4uzzsCAJuz91MCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/lib/public_key/test/public_key_SUITE_data/rsa_pub_key.pem b/lib/public_key/test/public_key_SUITE_data/rsa_pub_key.pem
new file mode 100644
index 0000000000..3b9d7568ff
--- /dev/null
+++ b/lib/public_key/test/public_key_SUITE_data/rsa_pub_key.pem
@@ -0,0 +1,4 @@
+-----BEGIN RSA PUBLIC KEY-----
+MEgCQQDUYsmYNLnIu+DXOpp6mfAKA5fPGk+8eiQNDH4ByB87XhI+0IPpROUMTBgG
+n7q1ROb6qB5A38JOLs87AgCbs/dTAgMBAAE=
+-----END RSA PUBLIC KEY-----
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 8c4e4127b2..334b9d792e 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1,11 +1 @@
-PUBLIC_KEY_VSN = 0.7
-
-TICKETS = OTP-8626
-
-#TICKETS_0.6 = OTP-7046 \
-#	  OTP-8553
-#TICKETS_0.5 = OTP-8372
-#TICKETS_0.4 = OTP-8250
-#TICKETS_0.3 = OTP-8100 OTP-8142
-#TICKETS_0.2 = OTP-7860
-#TICKETS_0.1 = OTP-7637
\ No newline at end of file
+PUBLIC_KEY_VSN = 0.10
diff --git a/lib/reltool/bin/reltool.escript b/lib/reltool/bin/reltool.escript
index 0dcd5ad1e9..0dcd5ad1e9 100644..100755
--- a/lib/reltool/bin/reltool.escript
+++ b/lib/reltool/bin/reltool.escript
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index 524d728901..95e379db53 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -37,6 +37,73 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Reltool.</p>
 
+  <section><title>Reltool 0.5.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+            Added function <c>zip:foldl/3</c> to iterate over zip
+            archives.</p>
+          <p>
+            Added functions to create and extract escripts. See
+            <c>escript:create/2</c> and <c>escript:extract/2</c>.</p>
+          <p>
+            The undocumented function <c>escript:foldl/3</c> has been
+            removed. The same functionality can be achieved with the
+            more flexible functions <c>escript:extract/2</c> and
+            <c>zip:foldl/3</c>.</p>
+          <p>
+            Record fields has been annotated with type info. Source
+            files as been adapted to fit within 80 chars and trailing
+            whitespace has been removed.</p>
+          <p>
+            Own Id: OTP-8521</p>
+        </item>
+        <item>
+            <p>A new escript, called <c>reltool</c>, has been
+            introduced in order to simplify the usage of the reltool
+            application from makefiles.</p>
+            <p>The handling of applications included in releases has
+            been improved. Applications that are required to be
+            started before other applications in a release are now
+            automatically included in the release. The <c>kernel</c>
+            and <c>stdlib</c> applications are always included as
+            they are mandatory.</p>
+            <p>Applications that are (explicitly or implicitly)
+            included in a release are now automatically included as
+            if they were explicitly included with the incl_cond
+            flag.</p>
+            <p>A new <c>embedded_app_type</c> option has been
+            introduced. It is intended to be used for embedded
+            systems where all included applications must be loaded
+            from the boot script, as these systems does not utilize
+            dynamic code loading. If <c>embedded_app_type </c> is set
+            to something else than <c>undefined</c>, all included
+            applications will be included in both the release as well
+            as in the boot script. If the <c>profile</c> is
+            <c>embedded</c> the <c>embedded_app_type</c> option
+            defaults to <c>load</c>.</p>
+            <p>A new function called <c>reltool:get_status/1</c> has
+            been introduced. It returns status about the
+            configuration in the server.</p>
+            <p>The API functions that may take <c>PidOrOptions</c> as
+            input and actually gets <c>Options</c> does now print out
+            warnings.</p>
+            <p>The internal error handling has been improved. For
+            example <c>{error,Reason}</c> is always returned in case
+            of errors even when the server dies.</p>
+            <p><c>app</c> and <c>appup</c> files has been added as
+            well as a corresponding test suite.</p>
+            <p>Various cleanups has been made in the code and in the
+            documentation.</p>
+          <p>
+            Own Id: OTP-8590</p>
+        </item>
+      </list>
+    </section>
+
+  </section>
 
     <section><title>Reltool 0.5.3</title>
 
diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml
index 0c2b7d2a2b..598594145a 100644
--- a/lib/reltool/doc/src/reltool.xml
+++ b/lib/reltool/doc/src/reltool.xml
@@ -48,8 +48,8 @@
     <c>root_dir</c> is the root directory of the analysed system and
     it defaults to the system executing <c>reltool</c>. Applications
     may also be located outside <c>root_dir</c>. <c>lib_dirs</c>
-    defines additional library directories where applications
-    additional may reside and it defaults to the the directories
+    defines library directories where additional applications
+    may reside and it defaults to the directories
     listed by the operating system environment variable
     <c>ERL_LIBS</c>. See the module <c>code</c> for more info.
     Finally single modules and entire applications may be read from
@@ -58,10 +58,10 @@
     <p>Some configuration parameters control the behavior of Reltool
     on system (<c>sys</c>) level. Others provide control on
     application (<c>app</c>) level and yet others are on module
-    (<c>mod</c>) level. Module level parameters overrides application
-    level parameters and application level parameters overrides system
+    (<c>mod</c>) level. Module level parameters override application
+    level parameters and application level parameters override system
     level parameters. Escript <c>escript</c> level parameters
-    overrides system level parameters.</p>
+    override system level parameters.</p>
 
     <p>The following top level <c>options</c> are supported:</p>
 
@@ -74,7 +74,7 @@
            a name of a <c>file</c> containing a sys tuple.</p>
       </item>
 
-      <tag><c>trap_exit></c></tag>
+      <tag><c>trap_exit</c></tag>
       <item>
         <p>This option controls the error handling behavior of
            <c>reltool</c>.  By default the window processes traps
@@ -123,10 +123,10 @@
         defaults to <c>all</c> which means that if an application is
         included (either explicitly or implicitly) all modules in that
         application will be included. This implies that both modules
-        that exists on the <c>ebin</c> directory of the application,
+        that exist in the <c>ebin</c> directory of the application,
         as well as modules that are named in the <c>app</c> file will
         be included. If the parameter is set to <c>ebin</c>, both
-        modules on the <c>ebin</c> directory and derived modules are
+        modules in the <c>ebin</c> directory and derived modules are
         included. If the parameter is set to <c>app</c>, both modules
         in the <c>app</c> file and derived modules are included.
         <c>derived</c> means that only modules that are used by other
@@ -138,13 +138,13 @@
       <item>
         <p>This parameter controls the application and escript
         inclusion policy. It defaults to <c>derived</c> which means
-        that the applications that not have any explicit
+        that the applications that do not have any explicit
         <c>incl_cond</c> setting, will only be included if any other
         (explicitly or implicitly included) application uses it. The
         value <c>include</c> implies that all applications and
-        escripts that that not have any explicit <c>incl_cond</c>
+        escripts that do not have any explicit <c>incl_cond</c>
         setting will be included. <c>exclude</c> implies that all
-        applications and escripts) that that not have any explicit
+        applications and escripts) that do not have any explicit
         <c>incl_cond</c> setting will be excluded.</p>
       </item>
 
@@ -158,7 +158,7 @@
       <tag><c>rel</c></tag>
       <item>
         <p>Release specific configuration. Each release maps to a
-        <c>rel</c>, <c>script</c> and <c>boot </c> file. See the
+        <c>rel</c>, <c>script</c> and <c>boot</c> file. See the
         module <c>systools</c> for more info about the details. Each
         release has a name, a version and a set of applications with a
         few release specific parameters such as type and included
@@ -168,7 +168,7 @@
       <tag><c>relocatable</c></tag>
       <item>
         <p>This parameter controls whether the <c>erl</c> executable
-        in the target system automatically should determine where it
+        in the target system should automatically determine where it
         is installed or if it should use a hardcoded path to the
         installation. In the latter case the target system must be
         installed with <c>reltool:install/2</c> before it can be
@@ -182,7 +182,7 @@
         <p>The creation of the specification for a target system is
         performed in two steps. In the first step a complete
         specification is generated. It will likely contain much more
-        files than you are interested in your customized target
+        files than you are interested in in your customized target
         system. In the second step the specification will be filtered
         according to your filters. There you have the ability to
         specify filters per application as well as system wide
@@ -224,12 +224,12 @@
       <tag><c>incl_sys_filters</c></tag>
       <item>
         <p>This parameter normally contains a list of regular
-        expressions that controls which files in the system that
+        expressions that controls which files in the system
         should be included. Each file in the target system must match
         at least one of the listed regular expressions in order to be
         included. Further the files may not match any filter in
         <c>excl_sys_filters</c> in order to be included. Which
-        application files that should be included are controlled with
+        application files should be included is controlled with
         the parameters <c>incl_app_filters</c> and
         <c>excl_app_filters</c>. This parameter defaults to
         <c>[".*"]</c>.</p>
@@ -238,8 +238,8 @@
       <tag><c>excl_sys_filters</c></tag>
       <item>
         <p>This parameter normally contains a list of regular
-        expressions that controls which files in the system that not
-        should be included in the target system. In order to be
+        expressions that controls which files in the system should
+        not be included in the target system. In order to be
         included, a file must match some filter in
         <c>incl_sys_filters</c> but not any filter in
         <c>excl_sys_filters</c>. This parameter defaults to
@@ -260,7 +260,7 @@
       <item>
         <p>This parameter normally contains a list of regular
         expressions that controls which application specific files
-        that not should be included in the target system. In order to
+        should not be included in the target system. In order to
         be included, a file must match some filter in
         <c>incl_app_filters</c> but not any filter in
         <c>excl_app_filters</c>. This parameter defaults to
@@ -271,8 +271,8 @@
       <item>
         <p>This parameter normally contains a list of regular
         expressions that controls which top level directories in an
-        application that should be included in an archive file (as
-        opposed of beeing included as a regular directory outside the
+        application should be included in an archive file (as
+        opposed to being included as a regular directory outside the
         archive). Each top directory in the application must match at
         least one of the listed regular expressions in order to be
         included. Further the files may not match any filter in
@@ -284,7 +284,7 @@
       <item>
         <p>This parameter normally contains a list of regular
         expressions that controls which top level directories in an
-        application that not should be included in an archive file. In
+        application should not be included in an archive file. In
         order to be included in the application archive, a top
         directory must match some filter in <c>incl_archive_filters</c>
         but not any filter in <c>excl_archive_filters</c>. This
@@ -295,15 +295,15 @@
       <item>
         <p>This parameter contains a list of options that are given to
         <c>zip:create/3</c> when application specific files are
-        packaged into an archive. All options are not supported. The
-        most useful options in this context, are the ones that
-        controls which types of files that should be compressed. This
+        packaged into an archive. Only a subset of the options are
+        supported. The most useful options in this context are the ones
+        that control which types of files should be compressed. This
         parameter defaults to <c>[]</c>.</p>
       </item>
 
     </taglist>
 
-    <p>On application (<c>escript</c>) level,the following options are
+    <p>On application (<c>escript</c>) level, the following options are
     supported:</p>
 
    <taglist>
@@ -314,7 +314,7 @@
       </item>
     </taglist>
 
-    <p>On application (<c>app</c>) level,the following options are
+    <p>On application (<c>app</c>) level, the following options are
        supported:</p>
 
    <taglist>
@@ -322,8 +322,8 @@
       <item>
         <p>The version of the application. In an installed system there may
         exist several versions of an application. The <c>vsn</c> parameter
-        controls which version of the application that will be choosen. If it
-        is omitted, the latest version will be choosen.</p>
+        controls which version of the application will be chosen. If it
+        is omitted, the latest version will be chosen.</p>
       </item>
       <tag><c>mod</c></tag>
       <item>
@@ -380,7 +380,7 @@
       </item>
     </taglist>
 
-     <p>On module (<c>mod</c>) level,the following options are
+     <p>On module (<c>mod</c>) level, the following options are
        supported:</p>
 
    <taglist>
@@ -391,9 +391,9 @@
         will be used to control whether the module is included or not. The
         value of <c>incl_cond</c> overrides the module inclusion policy.
         <c>include</c> implies that the module is included, while
-        <c>exclude</c> implies that the module not is included.
-        <c>derived</c> implies that the is included if any included uses the
-        module.</p>
+        <c>exclude</c> implies that the module is not included.
+        <c>derived</c> implies that the module is included if it is used
+        by any other included module.</p>
       </item>
       <tag><c>debug_info</c></tag>
       <item>
@@ -546,12 +546,12 @@ target_spec()       = [target_spec()]
       files are by default copied to the target system. The
       <c>releases</c> directory contains generated <c>rel</c>,
       <c>script</c>, and <c>boot</c> files. The <c>lib</c> directory
-      contains the applications. Which applications that are included
+      contains the applications. Which applications are included
       and if they should be customized (archived, stripped from debug
       info etc.) is specified with various configuration
       parameters. The files in the <c>bin</c> directory are copied
       from the <c>erts-vsn/bin</c> directory, but only those files
-      that was originally included in <c>bin</c> directory of the
+      that were originally included in the <c>bin</c> directory of the
       source system.</p>
 
       <p>If the configuration parameter <c>relocatable</c> was set to
@@ -584,10 +584,10 @@ target_spec()       = [target_spec()]
         <v>Reason        = reason()</v>
       </type>
       <desc><p>Get reltool configuration. Normally, only the explicit
-      configuration parameters with values that differs from their
+      configuration parameters with values that differ from their
       defaults are interesting. But the builtin default values can be
       returned by setting <c>InclDefaults</c> to <c>true</c>. The
-      derived configuration can be return by setting
+      derived configuration can be returned by setting
       <c>InclDerived</c> to <c>true</c>.</p></desc>
     </func>
 
@@ -705,7 +705,7 @@ target_spec()       = [target_spec()]
         <v>Reason      = reason()</v>
       </type>
       <desc><p>Start a server process with options. The server process
-      identity can be given as argument to several other functions in the
+      identity can be given as an argument to several other functions in the
       API.</p></desc>
     </func>
 
diff --git a/lib/reltool/doc/src/reltool_usage.xml b/lib/reltool/doc/src/reltool_usage.xml
index 885828d1f0..0a053a014e 100644
--- a/lib/reltool/doc/src/reltool_usage.xml
+++ b/lib/reltool/doc/src/reltool_usage.xml
@@ -44,7 +44,7 @@
   <section>
     <title>System window</title>
     <p>The system window is started with the function
-    <c>reltool:start/1</c>. At startup the tool will process the all
+    <c>reltool:start/1</c>. At startup the tool will process all
     <c>beam</c> files and <c>app</c> files in order to find out dependencies
     between applications and their modules. Once all this information has been
     derived, it will be possible to explore the tool.</p>
@@ -67,29 +67,29 @@
     <section>
     <title>Libraries</title>
         <p>On the library page it is possible to control which sources
-        that the tool will use. The page is organized as a tree which
+        the tool will use. The page is organized as a tree which
         can be expanded and collapsed by clicking on the little symbol
         in the beginning of the expandable/collapsible lines.</p>
 
 	<p>The <c>Root directory</c> can be edited by selecting the
 	line where the path of the root directory is displayed and
-	clicking with the right mouse button. Choose edit in the menu
-	that pops up. </p>
+	clicking the right mouse button. Choose edit in the menu
+	that pops up.</p>
 
 	<p>Library directories can be added, edited or deleted. This
 	is done by selecting the line where the path to a library
-	directory is displayed and clicking with the right mouse
+	directory is displayed and clicking the right mouse
 	button. Choose add, edit or delete in the menu that pops
 	up. New library directories can also be added by selecting the
-	line <c>Library directories</c> and clicking with the right
+	line <c>Library directories</c> and clicking the right
 	mouse button. Choose add in the menu that pops up.</p>
 
 	<p>Escript files can be added, edited or deleted. This is done
 	by selecting the line where the path to an escript file is
-	displayed and clicking with the right mouse button. Choose
+	displayed and clicking the right mouse button. Choose
 	add, edit or delete in the menu that pops up. New escripts can
 	also be added by selecting the line <c>Escript files</c> and
-	clicking with the right mouse button. Choose add in the menu
+	clicking the right mouse button. Choose add in the menu
 	that pops up.</p>
 
 	<p>When libraries and escripts are expanded, the names of
@@ -102,7 +102,7 @@
         <p>On the system settings page it is possible to control some
         global settings that are used as defaults for all
         applications. Set the <c>Application inclusion policy</c> to
-        <c>include</c> to include all applications that not are
+        <c>include</c> to include all applications that are not
         explicitly excluded. See <c>incl_cond</c> (application
         inclusion) and <c>mod_cond</c> (module inclusion) in the
         reference manual for the module <c>reltool</c> for more
@@ -131,14 +131,14 @@
 
 	<p>The symbols in front of the application names are intended
 	to describe the status of the application. There are error
-	symbols and warning symbols that means that there are
-	something that needs attention. The tick symbol means that the
+	and warning symbols to signalize that there is
+	something which needs attention. The tick symbol means that the
 	application is included or derived and no problem has been
 	detected. The cross symbol means that the application is
 	excluded or available and no problem has been
 	detected. Applications with error symbols are listed first in
-	each category, then comes the warnings and the normal ones
-	(ticks and crosses) are found at the end.</p>
+  each category and are followed by the warnings and the
+  normal ones (ticks and crosses) at the end.</p>
 
 	<p>Double click on an application to launch its application
 	window.</p>
@@ -175,8 +175,8 @@
 	</item>
 	<item>
 	  <p><c>Save configuration</c> - Saves the current
-	  configuration to file. Normally, only the explictit
-	  configuration parameters with values that differs from their
+	  configuration to file. Normally, only the explicit
+	  configuration parameters with values that differ from their
 	  defaults are saved. But the configuration with or without
 	  default values and with or without derived values may also
 	  be saved.</p>
@@ -204,21 +204,21 @@
       <p>It is possible to perform some limited manipulations of the
       graph. Nodes can be moved, selected, locked or deleted. Move a
       single node or the entire graph by moving the mouse while the
-      left mouse button is pressed. A node is can be locked into a fix
+      left mouse button is pressed. A node can be locked into a fix
       position by holding down the shift button when the left mouse
       button is released. Select several nodes by moving the mouse
-      while the control key and the left mouse button i
+      while the control key and the left mouse button are
       pressed. Selected nodes can be locked, unlocked or deleted by
-      klicking on a suitable button.</p>
+      clicking on a suitable button.</p>
 
       <p>The algorithm that is used to draw a graph with as few
       crossed links as possible is called force graph. A force graph
-      consists of nodes and directed link between nodes. Each node is
+      consists of nodes and directed links between nodes. Each node is
       associated with a repulsive force that pushes nodes away from
       each other. This force can be adjusted with the left slider or
       with the mouse wheel. Each link is associated with an attractive
-      force that pulls the nodes nearer each other. This force can be
-      adjusted with the right slider. If this force becomes to strong,
+      force that pulls the nodes nearer to each other. This force can be
+      adjusted with the right slider. If this force becomes too strong,
       the graph will be unstable. The third parameter that can be
       adjusted is the length of the links. It is adjusted with the
       middle slider.</p>
@@ -256,7 +256,7 @@
     <p>Select version of the application in the <c>Source selection
     policy</c> part of the page. By default the latest version of the
     application is selected, but it is possible to override this by
-    explicitly select another version.</p>
+    explicitly selecting another version.</p>
     
     <p>By default the <c>Application inclusion policy</c> on system
     level is used for all applications. Set the value to
@@ -272,10 +272,10 @@
     want actually used modules to be included. Set it to <c>app</c> if
     you, besides derived modules, also want the modules listed in the
     app file to be included. Set it to <c>ebin</c> if you, besides
-    derived modules, also want the modules that exists as beam files
-    on the ebin directory to be included. Set it to <c>all</c> if you
+    derived modules, also want the modules that exist as beam files
+    in the ebin directory to be included. Set it to <c>all</c> if you
     want all modules to be included, that is the union of modules
-    found on the ebin directory and listed in the app file.</p>
+    found in the ebin directory and listed in the app file.</p>
 
     <p>The application settings page is rather incomplete.</p>
     </section>
@@ -299,16 +299,16 @@
     undone.</p>
 
     <p>The symbols in front of the module names are intended to
-    describe the status of the module. There are error symbols
-    and warning symbols that means that there are something that needs
+    describe the status of the module. There are error and
+    and warning symbols to signalize that there is something that needs
     attention. The tick symbol means that the module is included
     or derived and no problem has been detected. The cross symbol
     means that the module is excluded or available and no problem
     has been detected. Modules with error symbols are listed
-    first in each category, then comes the warnings and the normal
-    ones (ticks and crosses) are found at the end.</p>
+    first in each category and are followed by warnings and the
+    normal ones (ticks and crosses) at the end.</p>
 
-    <p>Double click on an module to launch its module window.</p>
+    <p>Double click on a module to launch its module window.</p>
 
     </section>
 
@@ -323,7 +323,7 @@
     <c>app</c> file. If the application includes other applications,
     these are listed under <c>Included</c>. These applications are
     listed in the <c>included_applications</c> part of the <c>app</c>
-    file.  If the application uses modules other applications, these
+    file.  If the application uses other applications, these
     are listed under <c>Uses</c>.</p>
 
     <p>Double click on an application name to launch an application window.</p>
@@ -336,7 +336,7 @@
     <p>There are two categories of modules on the <c>Module
     dependencies</c> page. If the module is used by other modules,
     these are listed under <c>Modules used by others</c>. If the
-    module uses modules other modules, these are listed under <c>Used
+    module uses other modules, these are listed under <c>Used
     modules</c>.</p>
 
     <p>Double click on an module name to launch a module window.</p>
@@ -365,8 +365,8 @@
 
     <p>There are two categories of modules on the <c>Dependencies</c>
     page. If the module is used by other modules, these are listed
-    under <c>Modules used by others</c>. If the module uses modules
-    other modules, these are listed under <c>Used modules</c>.</p>
+    under <c>Modules used by others</c>. If the module uses other
+    modules, these are listed under <c>Used modules</c>.</p>
 
     <p>Double click on an module name to launch a module window.</p>
 
@@ -378,7 +378,7 @@
     <p>On the <c>Code</c> page the Erlang source code is displayed. It
     is possible to search forwards and backwards for text in the
     module. Enter a regular expression in the <c>Find</c> field and
-    press enter. It is also possible to goto a certain line on the
+    press enter. It is also possible to go to a certain line in the
     module. The <c>Back</c> button can be used to go back to the
     previous position.</p>
 
diff --git a/lib/reltool/src/reltool_mod_win.erl b/lib/reltool/src/reltool_mod_win.erl
index f68c61fd6f..281d2c8ad4 100644
--- a/lib/reltool/src/reltool_mod_win.erl
+++ b/lib/reltool/src/reltool_mod_win.erl
@@ -334,9 +334,9 @@ find_regular_bin(App, Mod) ->
     ActiveDir = App#app.active_dir,
     SrcDir = filename:join([ActiveDir, "src"]),
     ModStr = atom_to_list(Mod#mod.name),
-    Base = ModStr ++ ".erl",
-    Find = fun(F, _Acc) -> file:read_file(F) end,
-    case filelib:fold_files(SrcDir, Base, true, Find, {error, enoent}) of
+    Base = "^" ++ ModStr ++ "\\.erl$",
+    Find = fun(F, _Acc) -> throw(file:read_file(F)) end,
+    case catch filelib:fold_files(SrcDir, Base, true, Find, {error, enoent}) of
 	{ok, Bin} ->
 	    Bin;
 	{error, enoent} ->
diff --git a/lib/reltool/test/Makefile b/lib/reltool/test/Makefile
index 34781ae720..e4ab216298 100644
--- a/lib/reltool/test/Makefile
+++ b/lib/reltool/test/Makefile
@@ -73,8 +73,9 @@ release_spec: opt
 
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) reltool.spec $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
-	$(INSTALL_PROGRAM) rtt $(INSTALL_PROGS) $(RELSYSDIR)
+	$(INSTALL_DATA) reltool.spec reltool.cover $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
+	$(INSTALL_SCRIPT) rtt $(INSTALL_PROGS) $(RELSYSDIR)
+	$(INSTALL_DATA) $(INSTALL_PROGS) $(RELSYSDIR)
 #	chmod -f -R u+w $(RELSYSDIR)
 #	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/reltool/test/reltool.cover b/lib/reltool/test/reltool.cover
new file mode 100644
index 0000000000..ca425b9f98
--- /dev/null
+++ b/lib/reltool/test/reltool.cover
@@ -0,0 +1,2 @@
+{incl_app,reltool,details}.
+
diff --git a/lib/reltool/test/reltool.spec b/lib/reltool/test/reltool.spec
index 252232e09d..2995720105 100644
--- a/lib/reltool/test/reltool.spec
+++ b/lib/reltool/test/reltool.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../reltool_test"}}.
-
+{suites,"../reltool_test",all}.
diff --git a/lib/reltool/test/reltool_app_SUITE.erl b/lib/reltool/test/reltool_app_SUITE.erl
index f8433f73d0..537a06315a 100644
--- a/lib/reltool/test/reltool_app_SUITE.erl
+++ b/lib/reltool/test/reltool_app_SUITE.erl
@@ -58,22 +58,22 @@ init_per_testcase(Case, Config) ->
 end_per_testcase(Func,Config) ->
     reltool_test_lib:end_per_testcase(Func,Config).
 
-fin_per_testcase(Case, Config) ->
-    reltool_test_lib:end_per_testcase(Case, Config).
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all() ->
-    all(suite).
-
-all(suite) ->
-    [
-     fields,
-     modules,
-     export_all,
-     app_depend,
-     undef_funcs
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [fields, modules, export_all, app_depend, undef_funcs].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index faf1bdbba2..b9b53b5a59 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -18,8 +18,9 @@
 
 -module(reltool_server_SUITE).
 
--export([all/0, init_per_suite/1, end_per_suite/1, 
-         init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1, 
+         init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
 
@@ -42,25 +43,26 @@ init_per_testcase(Func,Config) ->
     reltool_test_lib:init_per_testcase(Func,Config).
 end_per_testcase(Func,Config) -> 
     reltool_test_lib:end_per_testcase(Func,Config).
-fin_per_testcase(Func,Config) -> %% For test_server
-    reltool_test_lib:end_per_testcase(Func,Config).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% SUITE specification
 
-all() ->
-    all(suite).
-all(suite) ->
-    [
-     start_server,
-     set_config,
-     create_release,
-     create_script,
-     create_target,
-     create_embedded,
-     create_standalone,
-     create_old_target
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [start_server, set_config, create_release,
+     create_script, create_target, create_embedded,
+     create_standalone, create_old_target].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% The test cases
 
diff --git a/lib/reltool/test/reltool_test_lib.erl b/lib/reltool/test/reltool_test_lib.erl
index 5390b0a75e..b8bcbcd009 100644
--- a/lib/reltool/test/reltool_test_lib.erl
+++ b/lib/reltool/test/reltool_test_lib.erl
@@ -97,7 +97,7 @@ wx_init_per_suite(Config) ->
 					  exit({skipped, "Can not test on MacOSX"});
 				      {unix, _} ->
 					  io:format("DISPLAY ~s~n", [os:getenv("DISPLAY")]),
-					  case proplists:get_value(xserver, Config, none) of
+					  case ct:get_config(xserver, none) of
 					      none   -> ignore;
 					      Server -> os:putenv("DISPLAY", Server)
 					  end;
@@ -295,7 +295,7 @@ eval_test_case(Mod, Fun, Config) ->
 test_case_evaluator(Mod, Fun, [Config]) ->
     NewConfig = Mod:init_per_testcase(Fun, Config),
     R = apply(Mod, Fun, [NewConfig]),
-    Mod:fin_per_testcase(Fun, NewConfig),
+    Mod:end_per_testcase(Fun, NewConfig),
     exit({test_case_ok, R}).
 
 wait_for_evaluator(Pid, Mod, Fun, Config) ->
@@ -311,12 +311,12 @@ wait_for_evaluator(Pid, Mod, Fun, Config) ->
 	{'EXIT', Pid, {skipped, Reason}} ->
 	    log("<WARNING> Test case ~w skipped, because ~p~n",
 		[{Mod, Fun}, Reason]),
-	    Mod:fin_per_testcase(Fun, Config),
+	    Mod:end_per_testcase(Fun, Config),
 	    {skip, {Mod, Fun}, Reason};
 	{'EXIT', Pid, Reason} ->
 	    log("<ERROR> Eval process ~w exited, because\n\t~p~n",
 		[{Mod, Fun}, Reason]),
-	    Mod:fin_per_testcase(Fun, Config),
+	    Mod:end_per_testcase(Fun, Config),
 	    {crash, {Mod, Fun}, Reason}
     end.
 
diff --git a/lib/reltool/test/reltool_wx_SUITE.erl b/lib/reltool/test/reltool_wx_SUITE.erl
index 2e2b355e07..56b0a3ed4a 100644
--- a/lib/reltool/test/reltool_wx_SUITE.erl
+++ b/lib/reltool/test/reltool_wx_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2010. 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
@@ -18,8 +18,9 @@
 
 -module(reltool_wx_SUITE).
 
--export([all/0, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
 
@@ -36,16 +37,22 @@ init_per_testcase(Func,Config) ->
     reltool_test_lib:init_per_testcase(Func,Config).
 end_per_testcase(Func,Config) -> 
     reltool_test_lib:end_per_testcase(Func,Config).
-fin_per_testcase(Func,Config) -> %% For test_server
-    reltool_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
-all() ->
-    all(suite).
-all(suite) ->
-    [
-     start_all_windows
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [start_all_windows].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% The test cases
 
diff --git a/lib/reltool/test/rtt.erl b/lib/reltool/test/rtt.erl
index 6755b8400f..437009e26a 100644
--- a/lib/reltool/test/rtt.erl
+++ b/lib/reltool/test/rtt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2010. 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
diff --git a/lib/reltool/vsn.mk b/lib/reltool/vsn.mk
index b0561a6110..9e0bce1d01 100644
--- a/lib/reltool/vsn.mk
+++ b/lib/reltool/vsn.mk
@@ -1,27 +1 @@
-# This is an -*-makefile-*- file.
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2009-2010. 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%
-
-RELTOOL_VSN = 0.5.3
-
-TICKETS       = OTP-8057
-TICKETS_0_5_2 = OTP-8254
-TICKETS_0_5_1 = OTP-8199
-TICKETS_0_5   = OTP-7949
-TICKETS_0_2_2 = OTP-7999
-TICKETS_2_2_1 = OTP-7840
-TICKETS_0_2   = OTP-7805
+RELTOOL_VSN = 0.5.4
diff --git a/lib/runtime_tools/c_src/trace_file_drv.c b/lib/runtime_tools/c_src/trace_file_drv.c
index 482fcc0288..cd54f36af0 100644
--- a/lib/runtime_tools/c_src/trace_file_drv.c
+++ b/lib/runtime_tools/c_src/trace_file_drv.c
@@ -520,7 +520,7 @@ static int do_write(FILETYPE fd, unsigned char *buff, int siz) {
 */
 static int my_write(TraceFileData *data, unsigned char *buff, int siz) 
 {
-    int wrote, w;
+    int wrote;
 
     if (data->buff_siz - data->buff_pos >= siz) {
 	memcpy(data->buff + data->buff_pos, buff, siz);
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index 9eb13727c7..92629c18e5 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -31,6 +31,42 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
+<section><title>Runtime_Tools 1.8.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Minor corrections and removal of a temporary workaround.</p>
+          <p>
+	    Own Id: OTP-8755 Aux Id: seq-11628, seq-11639 </p>
+        </item>
+        <item>
+          <p>
+	    Small fix in inviso_autostart_server.</p>
+          <p>
+	    Own Id: OTP-8783 Aux Id: seq11628 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Runtime_Tools 1.8.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Miscellaneous updates.</p>
+          <p>
+	    Own Id: OTP-8705</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Runtime_Tools 1.8.3</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/runtime_tools/src/inviso_autostart.erl b/lib/runtime_tools/src/inviso_autostart.erl
index 134133ad1f..787292e244 100644
--- a/lib/runtime_tools/src/inviso_autostart.erl
+++ b/lib/runtime_tools/src/inviso_autostart.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -59,17 +59,10 @@ autostart(_AutoModArgs) ->
 		case try_load_module(FileNames) of
 		    ok ->
 			autostart_apply(M,F);
+
 		    false ->                % No such module available
 			"inviso_autostart.config"
 		end;
-	    {ok,{gettia_asc,asc_file}} ->   % Uggly hack to not have to change in GSN-CPS.
-		case try_load_module(["/tmp/DPE_COMMONLOG/gettia_asc",
-				      "/tmp/DPE_COMMONLOG/gettia_overload"]) of
-		    ok ->
-			autostart_apply(gettia_asc,asc_file);
-		    false ->                % No such module available
-			false
-		end;
 	    {ok,{M,F}} ->                   % Use M:F(node())
 		autostart_apply(M,F);
 	    {ok,no_autostart} ->
diff --git a/lib/runtime_tools/src/inviso_autostart_server.erl b/lib/runtime_tools/src/inviso_autostart_server.erl
index 5af96e4e39..1e352822f4 100644
--- a/lib/runtime_tools/src/inviso_autostart_server.erl
+++ b/lib/runtime_tools/src/inviso_autostart_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -84,7 +84,7 @@ init(ArgsFromConfig) ->
     case get_tracerdata_opts(ArgsFromConfig) of
 	{ok,TracerData} ->                  % Otherwise we can not start a trace!
 	    case inviso_rt:init_tracing(TracerData) of
-		{ok,_} ->                   % Ok, tracing has been initiated.
+		{ok,_Response} ->                   % Ok, tracing has been initiated.
 		    case get_cmdfiles_opts(ArgsFromConfig) of
 			{ok,CmdFiles} ->    % List of cmd-files.
 			    Bindings=get_initialbindings_opts(ArgsFromConfig),
@@ -164,11 +164,11 @@ interpret_cmd_files([{FileName,LocalBindings}|Rest],GlobalBindings,Translations,
     Bindings=join_local_and_global_vars(LocalBindings,GlobalBindings),
     interpret_cmd_files_1(FileName,Bindings,Translations,Dbg),
     interpret_cmd_files(Rest,GlobalBindings,Translations,Dbg);
-interpret_cmd_files([FileName|Rest],GlobalBindings,Translations,Dbg) ->
-    interpret_cmd_files_1(FileName,GlobalBindings,Translations,Dbg),
-    interpret_cmd_files(Rest,GlobalBindings,Translations,Dbg);
 interpret_cmd_files([],_,_,_) ->            % Done, return nothing significant!
-    true.
+    true;
+interpret_cmd_files(FileName,GlobalBindings,Translations,Dbg) ->
+    interpret_cmd_files_1(FileName,GlobalBindings,Translations,Dbg).
+%    interpret_cmd_files(Rest,GlobalBindings,Translations,Dbg).
 
 %% This is "inline" inviso calls.
 interpret_cmd_files_1({inviso,F,Args},Bindings,Translations,Dbg) ->
diff --git a/lib/runtime_tools/test/Makefile b/lib/runtime_tools/test/Makefile
new file mode 100644
index 0000000000..7dc7a015e1
--- /dev/null
+++ b/lib/runtime_tools/test/Makefile
@@ -0,0 +1,65 @@
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+MODULES =  \
+	runtime_tools_SUITE \
+	inviso_testmodule1_foo \
+	inviso_SUITE \
+	dbg_SUITE \
+	erts_alloc_config_SUITE
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+INSTALL_PROGS= $(TARGET_FILES)
+
+EMAKEFILE=Emakefile
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/runtime_tools_test
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+
+ERL_MAKE_FLAGS +=
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+
+EBIN = .
+
+# ----------------------------------------------------
+# 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: opt
+
+release_tests_spec: make_emakefile
+	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DATA) runtime_tools.spec runtime_tools.cover $(ERL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) $(EMAKEFILE) runtime_tools.cover $(RELSYSDIR)
+	chmod -f -R u+w $(RELSYSDIR)
+	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+
+release_docs_spec:
diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
new file mode 100644
index 0000000000..8e01e75aba
--- /dev/null
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -0,0 +1,922 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(dbg_SUITE).
+
+%% Test functions
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 big/1, tiny/1, simple/1, message/1, distributed/1,
+	 ip_port/1, file_port/1, file_port2/1, file_port_schedfix/1,
+	 ip_port_busy/1, wrap_port/1, wrap_port_time/1,
+	 with_seq_trace/1, dead_suspend/1, local_trace/1,
+	 saved_patterns/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+-export([tracee1/1, tracee2/1]).
+-export([dummy/0, exported/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+-define(default_timeout, ?t:minutes(1)).
+
+init_per_testcase(_Case, Config) ->
+    ?line Dog=test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+end_per_testcase(_Case, Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [big, tiny, simple, message, distributed, ip_port,
+     file_port, file_port2, file_port_schedfix, ip_port_busy,
+     wrap_port, wrap_port_time, with_seq_trace, dead_suspend,
+     local_trace, saved_patterns].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+big(suite) -> [];
+big(doc) -> ["Rudimentary interface test"];
+big(Config) when is_list(Config) ->
+	?line {ok,OldCurDir} = file:get_cwd(),
+	Datadir=?config(data_dir, Config),
+	Privdir=?config(priv_dir, Config),
+	?line ok=file:set_cwd(Privdir),
+    try
+	%% make sure dbg is stopped (and returns correctly)
+	?line ok = dbg:stop(),
+
+	%% compile test module and make sure it is loaded.
+	?line {ok,Mod} = compile:file(Datadir++"/dbg_test",[trace]),
+	?line code:purge(dbg_test),
+	?line {module, Mod}=code:load_file(dbg_test),
+
+	%% run/debug a named test function.
+	?line Pid = spawn_link(dbg_test, loop, [Config]),
+	?line true = register(dbg_test_loop, Pid),
+	?line {ok,_} = dbg:tracer(),
+	?line {ok,[{matched, _node, 1}]} = dbg:p(dbg_test_loop, [m,p,c]),
+	?line ok = dbg:c(dbg_test, test, [Config]),
+	?line ok = dbg:i(),
+	?line dbg_test_loop ! {dbg_test, stop},
+	unregister(dbg_test_loop),
+	?line ok = dbg:stop(),
+
+	%% run/debug a Pid.
+	?line Pid2=spawn_link(dbg_test,loop,[Config]),
+	?line {ok,_} = dbg:tracer(),
+	?line {ok,[{matched, _node, 1}]} = dbg:p(Pid2,[s,r,p]),
+	?line ok = dbg:c(dbg_test, test, [Config]),
+	?line ok = dbg:i(),
+	?line Pid2 ! {dbg_test, stop},
+
+	?line ok=file:set_cwd(OldCurDir)
+    after
+	?line dbg:stop()
+    end,
+    ok.
+
+
+tiny(suite) -> [];
+tiny(doc) -> ["Rudimentary interface test"];
+tiny(Config) when is_list(Config) ->
+    ?line {ok,OldCurDir} = file:get_cwd(),
+    Datadir=?config(data_dir, Config),
+    Privdir=?config(priv_dir, Config),
+    ?line ok=file:set_cwd(Privdir),
+    try
+	%% compile test module and make sure it is loaded.
+	?line {ok, Mod} = compile:file(Datadir++"/dbg_test",[trace]),
+	?line code:purge(dbg_test),
+	?line {module, Mod}=code:load_file(dbg_test),
+
+	?line Pid=spawn_link(dbg_test,loop,[Config]),
+	if
+	    is_pid(Pid) ->
+		?line dbg:tracer(),
+		?line {ok,[{matched, _node, 1}]} = dbg:p(Pid,[s,r,m,p,c]),
+		?line ok = dbg:c(dbg_test,test,[Config]),
+		?line ok = dbg:i(),
+		?line Pid ! {dbg_test, stop};
+	    true ->
+		?line ok=file:set_cwd(OldCurDir),
+		?t:fail("Could not spawn external test process.~n"),
+		failure
+	end
+    after
+	?line ok = dbg:stop(),
+        ?line ok = file:set_cwd(OldCurDir)
+    end,
+    ok.
+
+simple(suite) ->
+    [];
+simple(doc) ->
+    ["Simple interface test with own handler"];
+simple(Config) when is_list(Config) ->
+    try
+	?line start(),
+	?line dbg:p(self(),call),
+	?line dbg:tp(dbg,ltp,[]),
+	?line dbg:ltp(),
+	?line stop(),
+	?line S = self(),
+	?line [{trace,S,call,{dbg,ltp,[]}}] = flush()
+    after
+	?line dbg:stop()
+    end,
+    ok.
+
+message(suite) ->
+    [];
+message(doc) ->
+    ["Simple interface test with pam code that appends a message"];
+message(Config) when is_list(Config) ->
+    ?line {ok, _} = start(),
+    try
+	?line {ok, [{matched, _node, 1}]} = dbg:p(self(),call),
+	?line {ok, X} = dbg:tp(dbg,ltp,[{'_',[],[{message, {self}}]}]),
+	?line {value, {saved, Saved}} = lists:keysearch(saved, 1, X),
+	?line {ok, Y} = dbg:tp(dbg,ln,Saved),
+	?line {value, {saved, Saved}} = lists:keysearch(saved, 1, Y),
+	?line ok = dbg:ltp(),
+	?line ok = dbg:ln()
+    after
+	?line stop()
+    end,
+    ?line S = self(),
+    ?line [{trace,S,call,{dbg,ltp,[]},S},
+	   {trace,S,call,{dbg,ln,[]},S}] = flush(),
+    ok.
+
+distributed(suite) ->
+    [];
+distributed(doc) ->
+    ["Simple test of distributed tracing"];
+distributed(Config) when is_list(Config) ->
+    ?line {ok, _} = start(),
+    ?line Node = start_slave(),
+    try
+	?line RexPid = rpc:call(Node, erlang, whereis, [rex]),
+	?line RexPidList = pid_to_list(RexPid),
+	?line {ok, Node} = dbg:n(Node),
+	?line {ok, X} = dbg:p(all,call),
+	?line {value, {matched, Node, _}} = lists:keysearch(Node, 2, X),
+	?line {ok, Y} = dbg:p(RexPidList, s),
+	?line {value, {matched, Node, 1}} = lists:keysearch(Node, 2, Y),
+	?line {ok, Z} = dbg:tp(dbg,ltp,[]),
+	?line {value, {matched, Node, 1}} = lists:keysearch(Node, 2, Z),
+	?line dbg:cn(Node),
+	?line dbg:tp(dbg,ln,[]),
+	?line ok = rpc:call(Node, dbg, ltp, []),
+	?line ok = rpc:call(Node, dbg, ln, []),
+	?line ok = dbg:ln(),
+	?line S = self(),
+	?line {TraceSend, TraceCall} =
+	lists:partition(fun ({trace,RP,send,_,_}) when RP =:= RexPid -> true;
+			    (_) -> false end,
+			flush()),
+	?line [_|_] = TraceSend,
+	?line [{trace,Pid,call,{dbg,ltp,[]}},
+	       {trace,S,call,{dbg,ln,[]}}] = TraceCall,
+	?line Node = node(Pid),
+	%%
+	?line stop()
+    after
+	?line stop_slave(Node),
+        ?line stop()
+    end,
+    ok.
+
+
+local_trace(suite) ->
+    [];
+local_trace(doc) ->
+    ["Tests tracing of local function calls."];
+local_trace(Config) when is_list(Config) ->
+    ?line {ok, _} = start(),
+    try
+	?line S = self(),
+	?line %% Split "<X.Y.Z>" into {X, Y, Z}
+	?line "<"++L1 = L = pid_to_list(S),
+	?line NoDot = fun ($.) -> false; (_) -> true end,
+	?line {LX,"."++L2} = lists:splitwith(NoDot, L1),
+	?line {LY,"."++L3} = lists:splitwith(NoDot, L2),
+	?line ">"++L4 = lists:reverse(L3),
+	?line LZ = lists:reverse(L4),
+	?line X = 0 = list_to_integer(LX),
+	?line Y = list_to_integer(LY),
+	?line Z = list_to_integer(LZ),
+	?line XYZ = {X, Y, Z},
+	?line io:format("Self = ~w = ~w~n", [S,XYZ]),
+	?line {ok, [{matched, _node, 1}]} = dbg:p(S,call),
+	?line {ok, [{matched, _node, 1}]} = dbg:p(XYZ,call),
+	if Z =:= 0 ->
+		?line {ok, [{matched, _node, 1}]} = dbg:p(Y,call);
+	   true -> ok
+	end,
+	?line {ok, [{matched, _node, 1}]} = dbg:p(L,call),
+	?line {ok, _} = dbg:tpl(?MODULE,not_exported,[]),
+	?line 4 = not_exported(2),
+	?line [{trace,S,call,{?MODULE,not_exported,[2]}}] = flush(),
+	?line {ok, _} = dbg:tp(?MODULE,exported,[]),
+	?line 4 = ?MODULE:exported(2),
+	?line [{trace,S,call,{?MODULE,exported,[2]}},
+	       {trace,S,call,{?MODULE,not_exported,[2]}}] = flush(),
+	?line {ok, _} = dbg:ctpl(?MODULE),
+	?line 4 = ?MODULE:exported(2),
+	?line [{trace,S,call,{?MODULE,exported,[2]}}] = flush(),
+	?line {ok, _} = dbg:tpl(?MODULE,not_exported,[]),
+	?line {ok, _} = dbg:ctp(?MODULE),
+	?line 4 = ?MODULE:exported(2),
+	?line [] = flush(),
+	?line {ok, _} = dbg:tpl(?MODULE,not_exported,x),
+	?line catch ?MODULE:exported(x),
+	?line [{trace,S,call,{dbg_SUITE,not_exported,[x]}},
+	       {trace,S,exception_from,
+		{dbg_SUITE,not_exported,1},
+		{error,badarith}}] = flush()
+    after
+	?line stop()
+    end,
+    ok.
+
+saved_patterns(suite) ->
+    [];
+saved_patterns(doc) ->
+    ["Tests saving of match_spec's."];
+saved_patterns(Config) when is_list(Config) ->
+    ?line dbg:stop(),
+    ?line {ok,[{saved,1}]} =
+	dbg:tp(dbg,ctp,1,[{'_',[],[{message, blahonga}]}]),
+    ?line {ok,[{saved,2}]} =
+	dbg:tp(dbg,ctp,1,[{['_'],[],[{message, blahonga}]}]),
+    ?line Privdir=?config(priv_dir, Config),
+    ?line file:make_dir(Privdir),
+    ?line File = filename:join([Privdir, "blahonga.ms"]),
+    ?line dbg:wtp(File),
+    ?line dbg:stop(),
+    ?line dbg:ctp('_','_','_'),
+    ?line {ok, _} = start(),
+    try
+	?line dbg:rtp(File),
+	?line {ok,[{matched,_node,1},{saved,1}]} = dbg:tp(dbg,ltp,0,1),
+	?line {ok, [{matched, _node, 1}]} = dbg:p(self(),call),
+	?line dbg:ltp(),
+	?line S = self(),
+	?line [{trace,S,call,{dbg,ltp,[]},blahonga}] = flush()
+    after
+	?line stop()
+    end,
+    ok.
+
+
+
+not_exported(N) ->
+    N * 2.
+
+exported(N) ->
+    not_exported(N).
+
+ip_port(suite) ->
+    [];
+ip_port(doc) ->
+    ["Test tracing to IP port"];
+ip_port(Config) when is_list(Config) ->
+    ?line stop(),
+    ?line Port = dbg:trace_port(ip, 0),
+    ?line {ok, _} = dbg:tracer(port, Port),
+    try
+	?line {ok, [{matched, _node, 1}]} = dbg:p(self(),call),
+	?line {ok, X} = dbg:tp(dbg, ltp,[{'_',[],[{message, {self}}]}]),
+	?line {value, {saved, _Saved}} = lists:keysearch(saved, 1, X),
+	?line {ok, Y} = dbg:tp(dbg, ln, [{'_',[],[{message, hej}]}]),
+	?line {value, {saved, _}} = lists:keysearch(saved, 1, Y),
+	?line ok = dbg:ltp(),
+	?line ok = dbg:ln(),
+	?line {ok, IpPort} = dbg:trace_port_control(get_listen_port),
+	?line io:format("IpPort = ~p~n", [IpPort]),
+	?line dbg:trace_client(ip, IpPort, {fun myhandler/2, self()}),
+	?line S = self(),
+	?line [{trace,S,call,{dbg,ltp,[]},S},
+	       {trace,S,call,{dbg,ln,[]},hej}] = flush()
+    after
+	?line stop()
+    end,
+    ok.
+
+
+
+ip_port_busy(suite) ->
+    [];
+ip_port_busy(doc) ->
+    ["Test that the dbg server does not hang if the tracer don't start ",
+     "(OTP-3592)"];
+ip_port_busy(Config) when is_list(Config) ->
+    ?line stop(),
+    ?line Tracer = dbg:trace_port(ip, 4745),
+    ?line Port = Tracer(),
+    ?line {error, Reason} = dbg:tracer(port, Tracer),
+    try
+	?line io:format("Error reason = ~p~n", [Reason]),
+	?line true = port_close(Port)
+    after
+	?line dbg:stop()
+    end,
+    ?line ok.
+
+
+
+file_port(suite) ->
+    [];
+file_port(doc) ->
+    ["Test tracing to file port (simple)"];
+file_port(Config) when is_list(Config) ->
+    ?line stop(),
+    ?line {A,B,C} = erlang:now(),
+    ?line FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++ "-" ++
+	integer_to_list(B) ++ "-" ++ integer_to_list(C),
+    ?line FName = filename:join([?config(data_dir, Config), FTMP]),
+    ?line Port = dbg:trace_port(file, FName),
+    ?line {ok, _} = dbg:tracer(port, Port),
+    try
+	?line {ok, [{matched, _node, 1}]} = dbg:p(self(),call),
+	?line {ok, X} = dbg:tp(dbg, ltp,[{'_',[],[{message, {self}}]}]),
+	?line {value, {saved, _Saved}} = lists:keysearch(saved, 1, X),
+	?line {ok, Y} = dbg:tp(dbg, ln, [{'_',[],[{message, hej}]}]),
+	?line {value, {saved, _}} = lists:keysearch(saved, 1, Y),
+	?line ok = dbg:ltp(),
+	?line ok = dbg:ln(),
+	?line stop(),
+	?line dbg:trace_client(file, FName, {fun myhandler/2, self()}),
+	?line S = self(),
+	?line [{trace,S,call,{dbg,ltp,[]},S},
+	       {trace,S,call,{dbg,ln,[]},hej},
+	       end_of_trace] = flush()
+    after
+	?line stop(),
+        ?line file:delete(FName)
+    end,
+    ok.
+
+file_port2(suite) ->
+    [];
+file_port2(doc) ->
+    ["Test tracing to file port with 'follow_file'"];
+file_port2(Config) when is_list(Config) ->
+    case os:type() of
+	vxworks ->
+	    {skipped, "VxWorks NFS cache ruins it all."};
+	_ ->
+	    ?line stop(),
+	    ?line {A,B,C} = erlang:now(),
+	    ?line FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++
+		"-" ++ integer_to_list(B) ++ "-" ++ integer_to_list(C),
+	    ?line FName = filename:join([?config(data_dir, Config), FTMP]),
+	    %% Ok, lets try with flush and follow_file, not a chance on VxWorks
+	    %% with NFS caching...
+	    ?line Port2 = dbg:trace_port(file, FName),
+	    ?line {ok, _} = dbg:tracer(port, Port2),
+	    try
+		?line {ok, [{matched, _node, 1}]} = dbg:p(self(),call),
+		?line {ok, _} = dbg:tp(dbg, ltp,[{'_',[],[{message, {self}}]}]),
+		?line {ok, _} = dbg:tp(dbg, ln, [{'_',[],[{message, hej}]}]),
+		?line ok = dbg:ltp(),
+		?line ok = dbg:flush_trace_port(),
+		?line dbg:trace_client(follow_file, FName,
+				       {fun myhandler/2, self()}),
+		?line S = self(),
+		?line [{trace,S,call,{dbg,ltp,[]},S}] = flush(),
+		?line ok = dbg:ln(),
+		?line ok = dbg:flush_trace_port(),
+		?line receive after 1000 -> ok end, %% Polls every second...
+		?line [{trace,S,call,{dbg,ln,[]},hej}] = flush(),
+		?line stop(),
+		?line [] = flush()
+	    after
+		?line stop(),
+		?line file:delete(FName)
+	    end,
+	    ok
+    end.
+
+file_port_schedfix(suite) ->
+    [];
+file_port_schedfix(doc) ->
+    ["Test that the scheduling timestamp fix for trace flag 'running' works."];
+file_port_schedfix(Config) when is_list(Config) ->
+    ?line case (catch erlang:system_info(smp_support)) of
+	      true ->
+		  {skip, "No schedule fix on SMP"};
+	      _ ->
+		  try
+		      file_port_schedfix1(Config)
+		  after
+		      dbg:stop()
+		  end
+	  end.
+file_port_schedfix1(Config) when is_list(Config) ->
+    ?line stop(),
+    ?line {A,B,C} = erlang:now(),
+    ?line FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++
+	"-" ++ integer_to_list(B) ++ "-" ++ integer_to_list(C),
+    ?line FName = filename:join([?config(data_dir, Config), FTMP]),
+    %%
+    ?line Port = dbg:trace_port(file, {FName, wrap, ".wraplog", 8*1024, 4}),
+    ?line {ok, _} = dbg:tracer(port, Port),
+    ?line {ok,[{matched,_node,0}]} = dbg:p(new,[running,procs,send,timestamp]),
+    %%
+    %% Generate the trace data
+    %%
+    %% This starts 3 processes that sends a message to each other in a ring,
+    %% 4 laps. Prior to sending the message to the next in the ring, each
+    %% process send 8 messages to itself, just to generate some trace data,
+    %% and to lower the possibility that the trace log wraps just after
+    %% a schedule out message (which would not burden any process and hence
+    %% not show up in the result)
+    %%
+    %% The wrap file trace is used because it burns a lot of time when the
+    %% driver swaps files, a lot more than the regular file trace. The test
+    %% case is dimensioned so that the log fills two files and just starts
+    %% on the third (out of four wrap files). This gives two file swaps,
+    %% and there are three processes, so one process will NOT be burdened.
+    %% The criterion for trace success is then that the max process
+    %% execution time must not be more than twice the min process
+    %% execution time. Wallclock. A normal result is about 10 times more
+    %% without schedule in - schedule out compensation (OTP-3938).
+    %%
+    ?line ok = token_volleyball(3, 4, 8),
+    %%
+    ?line {ok,[{matched,_,_}]} = dbg:p(all, [clear]),
+    ?line stop(),
+    % Some debug code to run on all platforms, for finding the fault on genny
+    % Dont touch please /PaN
+    ?line io:format("Trace dump by PaN BEGIN~n"),
+    ?line dbg:trace_client(file,{FName, wrap, ".wraplog"},{fun(end_of_trace,Pid)-> Pid ! done; (Mesg,Pid) -> io:format("~w~n",[Mesg]),Pid end,self()}),
+    receive done -> ok end,
+    ?line io:format("Trace dump by PaN END~n"),
+      %%
+    %% Get the trace result
+    %%
+    ?line Tag = make_ref(),
+    ?line dbg:trace_client(file, {FName, wrap, ".wraplog"},
+			   {fun schedstat_handler/2, {self(), Tag, []}}),
+    ?line Result =
+	receive
+	    {Tag, D} ->
+		lists:map(
+		  fun({Pid, {A1, B1, C1}}) ->
+			  {Pid, C1/1000000 + B1 + A1*1000000}
+		  end,
+		  D)
+	end,
+    ?line ok = io:format("Result=~p", [Result]),
+%    erlang:display({?MODULE, ?LINE, Result}),
+    %%
+    %% Analyze the result
+    %%
+    ?line {Min, Max} =
+	lists:foldl(
+	  fun({_Pid, M}, {Mi, Ma}) ->
+		  {if M < Mi -> M; true -> Mi end,
+		   if M > Ma -> M; true -> Ma end}
+	  end,
+	  {void, 0},
+	  Result),
+    % More PaN debug
+    ?line io:format("Min = ~f, Max = ~f~n",[Min,Max]),
+    %%
+    %% Cleanup
+    %%
+    ?line ToBeDeleted = filelib:wildcard(FName++"*"++".wraplog"),
+    ?line lists:map({file, delete}, ToBeDeleted),
+%    io:format("ToBeDeleted=~p", [ToBeDeleted]),
+    %%
+    %% Present the result
+    %%
+    P = (Max / Min - 1) * 100,
+    BottomLine = lists:flatten(io_lib:format("~.2f %", [P])),
+    if P > 100 ->
+	    Reason = {BottomLine, '>', "100%"},
+	    erlang:display({file_port_schedfix, fail, Reason}),
+	    test_server:fail(Reason);
+       true ->
+	    {comment, BottomLine}
+    end.
+
+wrap_port(suite) ->
+    [];
+wrap_port(doc) ->
+    ["Test tracing to wrapping file port"];
+wrap_port(Config) when is_list(Config) ->
+    ?line Self = self(),
+    ?line stop(),
+    ?line {A,B,C} = erlang:now(),
+    ?line FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++ "-" ++
+	integer_to_list(B) ++ "-" ++ integer_to_list(C) ++ "-",
+    ?line FName = filename:join([?config(data_dir, Config), FTMP]),
+    ?line FNameWildcard = FName++"*"++".trace",
+    %% WrapSize=0 and WrapCnt=11 will force the trace to wrap after
+    %% every trace message, and to contain only the last 10 entries
+    %% after trace stop since the last file will be empty waiting
+    %% for its first trace message.
+    ?line WrapSize = 0,
+    ?line WrapCnt = 11,
+    ?line WrapFilesSpec = {FName, wrap, ".trace", WrapSize, WrapCnt},
+    ?line wrap_port_init(WrapFilesSpec),
+    %% The number of iterations, N, is tested to place wrap the log,
+    %% giving a gap in the filename sequence at index 3.
+    %% This should be a difficult case for
+    %% the trace_client file sorting functionality.
+    N = 7,
+    ?line lists:foreach(
+	    fun(Cnt) ->
+		    ?MODULE:tracee1(Cnt),
+		    ?MODULE:tracee2(Cnt)
+	    end,
+	    lists:seq(1, N)),
+    ?line stop(),
+    try
+	?line Files1 = filelib:wildcard(FNameWildcard),
+	?line io:format("~p~n", [Files1]),
+	?line Tc1 = dbg:trace_client(file, WrapFilesSpec,
+				     {fun myhandler/2, {wait_for_go,Self}}),
+	?line Tref1 = erlang:monitor(process, Tc1),
+	Tc1 ! {go,Self},
+	?line [{'DOWN',Tref1,_,_,normal},
+	       end_of_trace
+	       |Result] = lists:reverse(flush()),
+	?line M = N - (WrapCnt-1) div 2,
+	?line M = wrap_port_result(Result, Self, N),
+	%%
+	%% Start a new wrap log with the same name to verify that
+	%% all files are cleared at wrap log start. Only produce
+	%% two trace messages to also place the gap at index 3,
+	%% so the trace log will be misinterpreted.
+	%%
+	?line wrap_port_init(WrapFilesSpec),
+	?line Files2 = filelib:wildcard(FNameWildcard),
+	?line io:format("~p~n", [Files2]),
+	?line -1 = ?MODULE:tracee1(-1),
+	?line -1 = ?MODULE:tracee2(-1),
+	?line stop(),
+	?line Files = filelib:wildcard(FNameWildcard),
+	?line io:format("~p~n", [Files]),
+	?line Tc2 = dbg:trace_client(file, WrapFilesSpec,
+				     {fun myhandler/2, {wait_for_go,Self}}),
+	?line Tref2 = erlang:monitor(process, Tc2),
+	Tc2 ! {go,Self},
+	?line [{trace,Self,call,{?MODULE,tracee1,[-1]},Self},
+	       {trace,Self,call,{?MODULE,tracee2,[-1]},hej},
+	       end_of_trace,
+	       {'DOWN',Tref2,_,_,normal}] = flush(),
+	%%
+	?line lists:map(fun(F) -> file:delete(F) end, Files)
+    after
+	?line stop()
+    end,
+    ok.
+
+wrap_port_init(WrapFilesSpec) ->
+    ?line Port = dbg:trace_port(file, WrapFilesSpec),
+    ?line {ok, _} = dbg:tracer(port, Port),
+    ?line {ok, [{matched, _node, 1}]} = dbg:p(self(),call),
+    ?line {ok, X} = dbg:tp(?MODULE, tracee1,[{'_',[],[{message, {self}}]}]),
+    ?line {value, {saved, _Saved}} = lists:keysearch(saved, 1, X),
+    ?line {ok, Y} = dbg:tp(?MODULE, tracee2, [{'_',[],[{message, hej}]}]),
+    ?line {value, {saved, _}} = lists:keysearch(saved, 1, Y),
+    ok.
+
+tracee1(X) ->
+    X.
+
+tracee2(X) ->
+    X.
+
+wrap_port_result([], _S, M) ->
+    M;
+wrap_port_result([{trace, S, call, {?MODULE, tracee2, [M]}, hej},
+		  {trace, S, call, {?MODULE, tracee1, [M]}, S} | Tail],
+		 S,
+		 M) ->
+    wrap_port_result(Tail, S, M-1).
+
+
+wrap_port_time(suite) ->
+    [];
+wrap_port_time(doc) ->
+    ["Test tracing to time limited wrapping file port"];
+wrap_port_time(Config) when is_list(Config) ->
+    ?line stop(),
+    ?line {A,B,C} = erlang:now(),
+    ?line FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++ "-" ++
+	integer_to_list(B) ++ "-" ++ integer_to_list(C) ++ "-",
+    ?line FName = filename:join([?config(data_dir, Config), FTMP]),
+    %% WrapTime=2 and WrapCnt=4 will force the trace to wrap after
+    %% every 2 seconds, and to contain between 3*2 and 4*2 seconds
+    %% of trace entries.
+    ?line WrapFilesSpec = {FName, wrap, ".trace", {time, 2000}, 4},
+    ?line Port = dbg:trace_port(file, WrapFilesSpec),
+    ?line {ok, _} = dbg:tracer(port, Port),
+    try
+	?line {ok, [{matched, _node, 1}]} = dbg:p(self(),call),
+	?line {ok, X} = dbg:tp(?MODULE, tracee1,[{'_',[],[{message, {self}}]}]),
+	?line {value, {saved, _Saved1}} = lists:keysearch(saved, 1, X),
+	?line {ok, Y} = dbg:tp(?MODULE, tracee2, [{'_',[],[{message, hej}]}]),
+	?line {value, {saved, _Saved2}} = lists:keysearch(saved, 1, Y),
+	%% The delays in the iterations places two trace messages in each
+	%% trace file, but the last which is empty waiting for its first
+	%% trace message. The number of iterations is chosen so that
+	%% one trace file has been wasted, and therefore the first pair
+	%% of trace messages.
+	?line lists:foreach(
+		fun(Cnt) ->
+			receive after 1000 -> ok end,
+			?MODULE:tracee1(Cnt),
+			?MODULE:tracee2(Cnt),
+			receive after 1100 -> ok end
+		end,
+		lists:seq(1, 4)),
+	?line stop(),
+	?line Files = filelib:wildcard(FName ++ "*" ++ ".trace"),
+	?line io:format("~p~n", [Files]),
+	?line dbg:trace_client(file, WrapFilesSpec, {fun myhandler/2, self()}),
+	?line S = self(),
+	?line [{trace, S, call, {?MODULE, tracee1, [2]}, S},
+	       {trace, S, call, {?MODULE, tracee2, [2]}, hej},
+	       {trace, S, call, {?MODULE, tracee1, [3]}, S},
+	       {trace, S, call, {?MODULE, tracee2, [3]}, hej},
+	       {trace, S, call, {?MODULE, tracee1, [4]}, S},
+	       {trace, S, call, {?MODULE, tracee2, [4]}, hej},
+	       end_of_trace] = flush(),
+	?line lists:map(fun(F) -> file:delete(F) end, Files)
+    after
+	?line stop()
+    end,
+    ok.
+
+with_seq_trace(suite) ->
+    [];
+with_seq_trace(doc) ->
+    ["Test ordinary tracing combined with seq_trace"];
+with_seq_trace(Config) when is_list(Config) ->
+    try
+	?line {ok, Server} = start(),
+	?line {ok, Tracer} = dbg:get_tracer(),
+	?line {ok, X} = dbg:tp(dbg, get_tracer, [{[],[],
+						  [{set_seq_token, send, true}]}]),
+	?line {value, {saved, _}} = lists:keysearch(saved, 1, X),
+	?line {ok, [{matched, _node, 1}]} = dbg:p(self(),call),
+	?line seq_trace:set_system_tracer(Tracer),
+	?line dbg:get_tracer(),
+	receive
+	    after 1 ->
+		    ok
+	    end,
+	?line S = self(),
+	?line ThisNode = node(),
+	?line [{trace,S,call,{dbg,get_tracer,[]}},
+	       {seq_trace,0,{send,_,S,Server,{S,{get_tracer,ThisNode}}}},
+	       {seq_trace,0,{send,_,Server,S,{dbg,{ok,Tracer}}}}] =
+	flush()
+    after
+	?line stop()
+    end,
+    ok.
+
+dead_suspend(suite) ->
+    [];
+dead_suspend(doc) ->
+    ["Test that trace messages concerning a now dead process does "
+     "not crash dbg."];
+
+dead_suspend(Config) when is_list(Config) ->
+    ?line start(),
+    try
+	survived = run_dead_suspend()
+    after
+	?line stop()
+    end.
+
+run_dead_suspend() ->
+    dbg:p(new, call),
+    dbg:tp(?MODULE, dummy, []),
+    spawn(?MODULE, dummy, []),
+    spawn(?MODULE, dummy, []),
+    spawn(?MODULE, dummy, []),
+    spawn(?MODULE, dummy, []),
+    spawn(?MODULE, dummy, []),
+    receive after 1000 -> ok end,
+    case whereis(dbg) of
+	undefined ->
+	    died;
+	_ ->
+	    survived
+    end.
+
+dummy() ->
+    ok.
+
+
+%%
+%% Support functions
+%%
+
+start_slave() ->
+    {A, B, C} = now(),
+    Name = "asdkxlkmd" ++ integer_to_list(A+B+C),
+    {ok, Node} = test_server:start_node(Name,slave,[]),
+    ok = wait_node(Node, 15),
+    Node.
+
+stop_slave(Node) ->
+    test_server:stop_node(Node).
+
+wait_node(_,0) ->
+    no;
+wait_node(Node, N) ->
+    case net_adm:ping(Node) of
+	pong ->
+	    ok;
+	pang ->
+	    receive
+	    after 1000 ->
+		    ok
+	    end,
+	    wait_node(Node, N - 1)
+    end.
+
+myhandler(Message, {wait_for_go,Pid}) ->
+    receive
+	{go,Pid} ->
+	    myhandler(Message, Pid)
+    end;
+myhandler(Message, Relay) ->
+    Relay ! Message,
+    case Message of
+	end_of_trace ->
+	    ok;
+	_ ->
+	    Relay
+    end.
+
+flush() ->
+    flush([]).
+flush(Acc) ->
+    receive
+	X ->
+	    flush(Acc ++ [X])
+    after 1000 ->
+	    Acc
+    end.
+
+start() ->
+    stop(),
+    dbg:tracer(process, {fun myhandler/2, self()}).
+
+stop() ->
+    dbg:stop().
+
+
+
+schedstat_handler(TraceMsg, {Parent, Tag, Data} = State) ->
+    case TraceMsg of
+	{trace_ts, Pid, in, _, Ts} ->
+	    NewData =
+		case lists:keysearch(Pid, 1, Data) of
+		    {value, {Pid, Acc}} ->
+			[{Pid, Acc, Ts} | lists:keydelete(Pid, 1, Data)];
+		    false ->
+			[{Pid, {0, 0, 0}, Ts} | Data];
+		    Other ->
+			exit(Parent, {?MODULE, ?LINE, Other}),
+			erlang:display({?MODULE, ?LINE, Other}),
+			Data
+		end,
+	    {Parent, Tag, NewData};
+	{trace_ts, Pid, out, _, {A3, B3, C3}} ->
+	    NewData =
+		case lists:keysearch(Pid, 1, Data) of
+		    {value, {Pid, {A1, B1, C1}, {A2, B2, C2}}} ->
+			[{Pid, {A3-A2+A1, B3-B2+B1, C3-C2+C1}} |
+			 lists:keydelete(Pid, 1, Data)];
+		    Other ->
+			exit(Parent, {?MODULE, ?LINE, Other}),
+			erlang:display({?MODULE, ?LINE, Other}),
+			Data
+		end,
+	    {Parent, Tag, NewData};
+	{trace_ts, Pid, exit, normal, {A3, B3, C3}} ->
+	    NewData =
+		case lists:keysearch(Pid, 1, Data) of
+		    {value, {Pid, {A1, B1, C1}, {A2, B2, C2}}} ->
+			[{Pid, {A3-A2+A1, B3-B2+B1, C3-C2+C1}} |
+			 lists:keydelete(Pid, 1, Data)];
+		    {value, {Pid, _Acc}} ->
+			Data;
+		    false ->
+			[{Pid, {0, 0, 0}} | Data];
+		    Other ->
+			exit(Parent, {?MODULE, ?LINE, Other}),
+			erlang:display({?MODULE, ?LINE, Other}),
+			Data
+		end,
+	    {Parent, Tag, NewData};
+	{trace_ts, _Pid, send, _Msg, _OtherPid, _Ts} ->
+	    State;
+	end_of_trace ->
+	    Parent ! {Tag, Data},
+	    State
+    end.
+
+
+
+pass_token(Token, Next, Loops) ->
+    receive
+	{Token, 1} = Msg ->
+	    sendloop(Loops),
+	    Next ! Msg;
+	{Token, _Cnt} = Msg->
+	    sendloop(Loops),
+	    Next ! Msg,
+	    pass_token(Token, Next, Loops)
+    end.
+
+pass_token(Token, Final, Cnt, Loops) ->
+    receive
+	{Token, start, Next} ->
+	    sendloop(Loops),
+	    Msg = {Token, Cnt},
+	    Next ! Msg,
+	    pass_token(Token, Final, Next, Cnt, Loops)
+    end.
+
+pass_token(Token, Final, Next, Cnt, Loops) ->
+    receive
+	{Token, 1} ->
+	    sendloop(Loops),
+	    Msg = {Token, done},
+	    Final ! Msg;
+	{Token, Cnt} ->
+	    sendloop(Loops),
+	    NextCnt = Cnt-1,
+	    Msg = {Token, NextCnt},
+	    Next ! Msg,
+	    pass_token(Token, Final, Next, NextCnt, Loops)
+    end.
+
+sendloop(Loops) ->
+    sendloop(make_ref(), Loops).
+
+sendloop(_Tag, 0) ->
+    ok;
+sendloop(Tag, Loops) ->
+    self() ! {Tag, Loops},
+    receive {Tag, Loops} -> ok end,
+    sendloop(Tag, Loops-1).
+
+token_volleyball(N, Cnt, Loops)
+  when is_integer(N), N >= 1, is_integer(Cnt), Cnt >= 1,
+       is_integer(Loops), Loops >= 0 ->
+    Self = self(),
+    Token = make_ref(),
+    Last = spawn_link(fun() -> pass_token(Token, Self, Cnt, Loops) end),
+    First = token_volleyball(Token, Last, N-1, Loops),
+    Last ! {Token, start, First},
+    receive {Token, done} -> ok end.
+
+token_volleyball(Token, Next, 1, Loops) ->
+    spawn_link(fun() -> pass_token(Token, Next, Loops) end);
+token_volleyball(Token, Next, N, Loops) ->
+    Pid = spawn_link(fun() -> pass_token(Token, Next, Loops) end),
+    token_volleyball(Token, Pid, N-1, Loops).
diff --git a/lib/runtime_tools/test/dbg_SUITE_data/dbg_test.erl b/lib/runtime_tools/test/dbg_SUITE_data/dbg_test.erl
new file mode 100644
index 0000000000..2edbf6f99a
--- /dev/null
+++ b/lib/runtime_tools/test/dbg_SUITE_data/dbg_test.erl
@@ -0,0 +1,87 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+%%%----------------------------------------------------------------------
+%%% Purpose : A priority queue.
+%%%----------------------------------------------------------------------
+%%% This module implements a priority queue as defined in
+%%% "Priority Queues and the STL" by Mark Nelson in Dr.Dobb's Journal, Jan 1996
+%%% see http://web2.airmail.net/markn/articles/pq_stl/priority.htm for more
+%%% information. (A heap implementation is planned aswell)
+%%%----------------------------------------------------------------------
+%%% The items of the queue is kept priority sorted, and because of that,
+%%% a push() operation costs more than a pop() operation (wich only
+%%% needs to return the top item of the queue(read: list)).
+%%%----------------------------------------------------------------------
+%%% The priority queue can be deceptively nice to use when creating for
+%%% example a Huffman coding tree.
+%%% See http://web2.airmail.net/markn/articles/pq_stl/priority.htm or
+%%% Dr.Dobb's Journal Jan, 96 for more information on this.
+%%%----------------------------------------------------------------------
+
+%%% Used here strictly as something for dbg_SUITE to run.
+
+-module(dbg_test).
+-export([test/1, loop/1]).
+-export([new/0, push/3, pop/1]).
+
+loop(Config) ->
+    test(Config),
+    receive
+	{dbg_test, stop} ->
+	    ok;
+	Other ->
+	    loop(Config)
+    end,
+    ok.
+
+test(Config) ->
+    Q1=new(),
+    Q2=push(Q1, "monkey",  3),
+    Q3=push(Q2, "banana",  4),
+    Q4=push(Q3, "jungle",  2),
+    Q5=push(Q4, "world",   5),
+    Q6=push(Q5, "universe",6),
+    Q7=push(Q6, "peanut",  1),
+%    io:format("~p~n",[Q7]),
+    {Itm, Q8}=pop(Q7),
+    ok.
+
+%% Returns a new priority queue.
+new() ->
+    [].
+
+%% Pushes a new item with a set priority into the queue.
+push(Queue, Itm, Pri) ->
+    insert(Queue, Itm, Pri, []).
+
+%% Pops the item with the highest priority out of the queue.
+pop([{Itm, Pri}|Queue]) ->
+    {Itm, Queue}.
+
+%% --- -- -
+%% Support functions.
+insert([], Itm, Pri, NewQ) ->
+    lists:flatten([lists:reverse(NewQ)|[{Itm, Pri}]]);
+% Itm>QItm>NewQ>Queue
+insert([{QItm,QPri}|Queue], Itm, Pri, NewQ) when Pri>QPri->
+    A = [{Itm, Pri}|[{QItm, QPri}]],
+    lists:flatten([[A|NewQ]|Queue]);
+insert([QItm|Rest], Itm, Pri, NewQ) ->
+    insert(Rest, Itm, Pri, [QItm|NewQ]).
+%% --- -- -
diff --git a/lib/runtime_tools/test/dbg_SUITE_data/exref_td.erl b/lib/runtime_tools/test/dbg_SUITE_data/exref_td.erl
new file mode 100644
index 0000000000..85faf620aa
--- /dev/null
+++ b/lib/runtime_tools/test/dbg_SUITE_data/exref_td.erl
@@ -0,0 +1,50 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(exref_td).
+
+-export([a/1,b/1,c/1,d/1,e/1,my_analyse/1]).
+
+a("edcba") ->
+    true;
+a(_) ->
+    lists:reverse("abcde").
+
+b(_) ->
+    a(nil).
+
+c(_) ->
+    nonexistentmodule:f().
+
+d(_) ->
+    lists:nonexistentfunction().
+
+e(_) ->
+    [a(x),b(x),c(x)].
+
+localfuncnotcalled() ->
+    true.
+
+localfunccalledbyf(A) ->
+    A.
+
+f() ->
+    lists:filter(fun localfunccalledbyf/1,"aaabba"),
+    F = fun localfuncnotcalled/0.
+
+my_analyse(Graph) -> ok.
diff --git a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
new file mode 100644
index 0000000000..d4957c060e
--- /dev/null
+++ b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
@@ -0,0 +1,226 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(erts_alloc_config_SUITE).
+
+%-define(line_trace, 1).
+
+-include_lib("test_server/include/test_server.hrl").
+
+%-compile(export_all).
+-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]).
+
+%% Testcases
+-export([basic/1]).
+
+%% internal export
+-export([make_basic_config/1]).
+
+-define(DEFAULT_TIMEOUT, ?t:minutes(2)).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(Case, Config) when is_list(Config) ->
+    [{testcase, Case},
+     {watchdog, ?t:timetrap(?DEFAULT_TIMEOUT)},
+     {erl_flags_env, save_env()} | Config].
+
+end_per_testcase(_Case, Config) when is_list(Config) ->
+    ?t:timetrap_cancel(?config(watchdog, Config)),
+    restore_env(?config(erl_flags_env, Config)),
+    ok.
+
+%%%
+%%% The test cases ------------------------------------------------------------
+%%%
+
+basic(doc) -> [];
+basic(suite) -> [];
+basic(Config) when is_list(Config) ->
+    ?line ErtsAllocConfig = privfile("generated", Config),
+
+    SbctMod = " +MBsbct 1024 +MHsbct 4096",
+
+    %% Make sure we have enabled allocators
+    ZFlgs = case os:getenv("ERL_ZFLAGS") of
+		FlgString when is_list(FlgString) ->
+		    FlgString;
+		_ ->
+		    ""
+	    end ++ " +Mea max +Mea config",
+
+    ?line os:putenv("ERL_ZFLAGS", ZFlgs ++ SbctMod),
+
+    ?line {ok, Node1} = start_node(Config),
+    ?line ok = rpc:call(Node1, ?MODULE, make_basic_config, [ErtsAllocConfig]),
+    ?line stop_node(Node1),
+
+    ?line display_file(ErtsAllocConfig),
+
+    ?line ManualConfig = privfile("manual", Config),
+    ?line {ok, IOD} = file:open(ManualConfig, [write]),
+    ?line io:format(IOD, "~s", ["+MBsbct 2048"]),
+    ?line file:close(IOD),
+    ?line display_file(ManualConfig),
+
+    ?line os:putenv("ERL_ZFLAGS", ZFlgs),
+
+    ?line {ok, Node2} = start_node(Config,
+				   "-args_file " ++ ErtsAllocConfig
+				   ++ " -args_file " ++ ManualConfig),
+
+    ?line {_, _, _, Cfg} = rpc:call(Node2, erlang, system_info, [allocator]),
+
+    ?line stop_node(Node2),
+
+    ?line {value,{binary_alloc, BCfg}} = lists:keysearch(binary_alloc, 1, Cfg),
+    ?line {value,{sbct, 2097152}} = lists:keysearch(sbct, 1, BCfg),
+    ?line {value,{eheap_alloc, HCfg}} = lists:keysearch(eheap_alloc, 1, Cfg),
+    ?line {value,{sbct, 4194304}} = lists:keysearch(sbct, 1, HCfg),
+
+    ?line ok.
+
+make_basic_config(ErtsAllocConfig) ->
+    %% Save some different scenarios
+    Tester = self(),
+    SSBegun = make_ref(),
+    SSDone = make_ref(),
+    SSFun = fun (F) ->
+		    receive
+			SSDone ->
+			    ok = erts_alloc_config:save_scenario(),
+			    Tester ! SSDone
+		    after 500 ->
+			    ok = erts_alloc_config:save_scenario(),
+			    F(F)
+		    end
+	    end,
+    SS = spawn_link(fun () ->
+			    ok = erts_alloc_config:save_scenario(),
+			    Tester ! SSBegun,
+			    SSFun(SSFun)
+		    end),
+    receive SSBegun -> ok end,
+    Ref = make_ref(),
+    Tab = ets:new(?MODULE, [bag, public]),
+    Ps = lists:map(
+	   fun (_) ->
+		   spawn_link(
+		     fun () ->
+			     ets:insert(Tab,
+					{self(),
+					 lists:seq(1, 1000)}),
+			     receive after 1000 -> ok end,
+			     Tester ! {Ref, self()}
+		     end)
+	   end,
+	   lists:seq(1, 10000)),
+    lists:foreach(fun (P) -> receive {Ref, P} -> ok end end, Ps),
+    ets:delete(Tab),
+    SS ! SSDone,
+    receive SSDone -> ok end,
+
+    ok = erts_alloc_config:make_config(ErtsAllocConfig).
+
+
+
+%%
+%% Utils ----------------------------------------------------------------------
+%%
+
+display_file(FileName) ->
+    ?t:format("filename: ~s~n", [FileName]),
+    {ok, Bin} = file:read_file(FileName),
+    io:format("~s", [binary_to_list(Bin)]),
+    ?t:format("eof: ~s~n", [FileName]),
+    ok.
+
+mk_name(Config) when is_list(Config) ->
+    {A, B, C} = now(),
+    list_to_atom(atom_to_list(?MODULE)
+		 ++ "-" ++ atom_to_list(?config(testcase, Config))
+		 ++ "-" ++ integer_to_list(A)
+		 ++ "-" ++ integer_to_list(B)
+		 ++ "-" ++ integer_to_list(C)).
+
+start_node(Config) ->
+    start_node(Config, "").
+
+start_node(Config, Args) ->
+    ?line Pa = filename:dirname(code:which(?MODULE)),
+    ?line ?t:start_node(mk_name(Config),
+			slave,
+			[{args, "-pa " ++ Pa ++ " " ++ Args}]).
+
+stop_node(Node) ->
+    ?line true = ?t:stop_node(Node).
+
+privfile(Name, Config) ->
+    filename:join([?config(priv_dir, Config),
+		   atom_to_list(?config(testcase, Config)) ++ "." ++ Name]).
+
+save_env() ->
+    {erl_flags,
+     os:getenv("ERL_AFLAGS"),
+     os:getenv("ERL_FLAGS"),
+     os:getenv("ERL_"++erlang:system_info(otp_release)++"_FLAGS"),
+     os:getenv("ERL_ZFLAGS")}.
+
+restore_env(EVar, false) when is_list(EVar) ->
+    restore_env(EVar, "");
+restore_env(EVar, "") when is_list(EVar) ->
+    case os:getenv(EVar) of
+	false -> ok;
+	"" -> ok;
+	" " -> ok;
+	_ -> os:putenv(EVar, " ")
+    end;
+restore_env(EVar, Value) when is_list(EVar), is_list(Value) ->
+    case os:getenv(EVar) of
+	Value -> ok;
+	_ -> os:putenv(EVar, Value)
+    end.
+
+restore_env({erl_flags, AFlgs, Flgs, RFlgs, ZFlgs}) ->
+    restore_env("ERL_AFLAGS", AFlgs),
+    restore_env("ERL_FLAGS", Flgs),
+    restore_env("ERL_"++erlang:system_info(otp_release)++"_FLAGS", RFlgs),
+    restore_env("ERL_ZFLAGS", ZFlgs),
+    ok.
diff --git a/lib/runtime_tools/test/inviso_SUITE.erl b/lib/runtime_tools/test/inviso_SUITE.erl
new file mode 100644
index 0000000000..817ebfbbba
--- /dev/null
+++ b/lib/runtime_tools/test/inviso_SUITE.erl
@@ -0,0 +1,2831 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+%% Description:
+%% Test suite for inviso (basic parts, i.e not inviso tools). Note that
+%% inviso basic parts have modules in both the runtime_tools and
+%% inviso applications.
+%%
+%% Authors:
+%% Ann-Marie L�f, [email protected]
+%% Lennart �hman, [email protected]
+%% -----------------------------------------------------------------------------
+
+-module(inviso_SUITE).
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("kernel/include/file.hrl").
+
+-define(l,?line).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic_dist_trace_1, basic_dist_trace_2,
+     basic_dist_trace_3, basic_dist_trace_ti_1,
+     basic_dist_trace_ti_2, basic_dist_trace_ti_3,
+     suspend_dist_trace_ti_1, suspend_dist_trace_ti_2,
+     meta_cleanfunc_dist_1, basic_handlerfun_dist_1,
+     delete_log_dist_1, autostart_dist_1, autostart_dist_2,
+     autostart_dist_3, running_alone_dist_1,
+     running_alone_dist_2, running_alone_dist_3,
+     running_alone_dist_4, running_alone_dist_5,
+     overload_dist_1, overload_dist_2, overload_dist_3,
+     overload_dist_4, overload_dist_5, subscribe_dist_1,
+     lfm_trace_dist_1, lfm_trace_ti_dist_2,
+     handle_logfile_sort_wrapset, fetch_log_dist_trace_1,
+     fetch_log_dist_trace_2, fetch_log_dist_trace_3,
+     fetch_log_dist_error_1, fetch_log_dist_error_2,
+     expand_regexp_dist_1, only_loaded_dist_1].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+
+init_per_suite(Config) ->
+    %% No never know who skrewed up this node before this suite! :-)
+    erlang:trace_pattern({'_','_','_'},[],[local]),
+    erlang:trace_pattern({'_','_','_'},[],[global]),
+    erlang:trace(all,false,[all]),
+
+    ?l ok=application:start(runtime_tools),
+    Config.
+
+end_per_suite(_Config) ->
+    ?l ok=application:stop(runtime_tools).
+
+
+%% For each distributed testcase, we need two other distributed nodes to run the
+%% runtime components on. Since they are freshly started every time there is no
+%% need to clean them up first.
+init_per_testcase(_Case,Config) ->
+    ?l TH=test_server:timetrap(100000),
+    ?l {ok,Node1}=test_server:start_node(inviso1,peer,[]),
+    ?l {ok,Node2}=test_server:start_node(inviso2,peer,[]),
+    ?l SuiteDir=filename:dirname(code:which(?MODULE)),
+
+    %% Otherwise peer nodes will not find this module!
+    ?l true=rpc:call(Node1,code,add_patha,[SuiteDir]),
+    ?l true=rpc:call(Node2,code,add_patha,[SuiteDir]),
+
+    ?l start_side_effect_logger(node()),
+    ?l start_side_effect_logger(Node1),
+    ?l start_side_effect_logger(Node2),
+
+
+    %% SPECIAL FOR MY PRIVATE TEST ENVIROMENT
+%    ?l rpc:call(Node1,code,add_patha,["/clearcase/otp/tools/runtime_tools/ebin"]),
+%    ?l rpc:call(Node1,code,add_patha,["/clearcase/otp/tools/inviso/ebin"]),
+%    ?l rpc:call(Node2,code,add_patha,["/clearcase/otp/tools/runtime_tools/ebin"]),
+%    ?l rpc:call(Node2,code,add_patha,["/clearcase/otp/tools/inviso/ebin"]),
+
+%    %% SPECIAL FOR MY PRIVATE TEST ENVIROMENT, windows.
+%    ?l rpc:call(Node1,code,add_patha,["Z:/DATA/PROJECTS/inviso_project/runtime_tools/ebin"]),
+%    ?l rpc:call(Node1,code,add_patha,["Z:/DATA/PROJECTS/inviso_project/inviso/ebin"]),
+%    ?l rpc:call(Node2,code,add_patha,["Z:/DATA/PROJECTS/inviso_project/runtime_tools/ebin"]),
+%    ?l rpc:call(Node2,code,add_patha,["Z:/DATA/PROJECTS/inviso_project/inviso/ebin"]),
+
+    ?l ok=rpc:call(Node1,application,start,[runtime_tools]),
+    ?l ok=rpc:call(Node2,application,start,[runtime_tools]),
+    ?l timer:sleep(100),                     % Problem with autostarted runtime.
+    %% The following is a test that the inviso_rt processes which are autostarted
+    %% are now gone.
+
+    ?l ok=poll(rpc,call,[Node1,erlang,whereis,[inviso_rt]],undefined,20),
+    ?l ok=poll(rpc,call,[Node2,erlang,whereis,[inviso_rt]],undefined,20),
+
+%    ?l ok=poll(rpc,call,[Node1,supervisor,which_children,[runtime_tools_sup]],[],20),
+%    ?l ok=poll(rpc,call,[Node2,supervisor,which_children,[runtime_tools_sup]],[],20),
+    NewConfig1=insert_remotenode_config(inviso1,Node1,Config),
+    NewConfig2=insert_remotenode_config(inviso2,Node2,NewConfig1),
+    insert_timetraphandle_config(TH,NewConfig2).
+%% -----------------------------------------------------------------------------
+
+end_per_testcase(Case,Config) ->
+    ?l test_server:stop_node(get_remotenode_config(inviso1,Config)),
+    ?l test_server:stop_node(get_remotenode_config(inviso2,Config)),
+
+    case whereis(inviso_c) of
+	undefined ->                         % Should not exist.
+	    true;
+	Pid when is_pid(Pid) ->                 % But if it exists...
+	    exit(Pid,kill),                  % Remove it!
+	    io:format("Had to kill the control component in end_per_testcase,~p.~n",[Case])
+    end,
+    case whereis(inviso_rt) of
+	undefined ->                         % Should not exist.
+	    true;
+	Pid2 when is_pid(Pid2) ->               % But if it exists...
+	    exit(Pid2,kill),                 % Remove it!
+	    io:format("Had to kill local runtime component in end_per_testcase,~p.~n",[Case])
+    end,
+    ?l process_killer([inviso_test_proc,
+		       inviso_tab_proc,
+		       inviso_collector_proc,
+		       global_inviso_test_proc]),
+    ?l test_server:timetrap_cancel(get_timetraphandle_config(Config)),
+
+    NewConfig1=remove_remotenode_config(inviso1,Config),
+    NewConfig2=remove_remotenode_config(inviso2,NewConfig1),
+    remove_timetraphandle_config(NewConfig2).
+%% -----------------------------------------------------------------------------
+
+%% ==============================================================================
+%% Testcases.
+%% ==============================================================================
+
+%% TEST CASE: Basic, distributed, trace only.
+basic_dist_trace_1(suite) -> [];
+basic_dist_trace_1(doc) ->
+    ["Basic case, start of distributed tracing, using only trac."];
+basic_dist_trace_1(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=lists:map(fun(N)->{N,{file,filename:join([PrivDir,
+							     "tf1_"++
+							     atom_to_list(N)
+							    ])}} end,
+			     Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
+    activate_local_tracing(Nodes),
+    deactivate_local_tracing(Nodes),
+    stop_tracing(Nodes),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+
+%% TEST CASE: Basic, distributed, activate global tracing for functions in modules
+%% pointed out using a regexp. No tracing will be done.
+basic_dist_trace_2(suite) -> [];
+basic_dist_trace_2(doc) ->
+    [""];
+basic_dist_trace_2(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=lists:map(fun(N)->{N,{file,filename:join([PrivDir,
+							     "tf1a_"++
+							     atom_to_list(N)
+							    ])}} end,
+			     Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
+    Funcs1=activate_global_tracing_regexp(Nodes),
+    deactivate_global_tracing_regexp(Nodes,Funcs1),
+    stop_tracing(Nodes),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Basic, distributed, activate global tracing for functions in modules
+%% pointed out using a dir-regexp. No tracing will be done.
+basic_dist_trace_3(suite) -> [];
+basic_dist_trace_3(doc) ->
+    [""];
+basic_dist_trace_3(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=lists:map(fun(N)->{N,{file,filename:join([PrivDir,
+							     "tf1b_"++
+							     atom_to_list(N)
+							    ])}} end,
+			     Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
+    Funcs1=activate_global_tracing_regexp_dir(Nodes),
+    deactivate_global_tracing_regexp_dir(Nodes,Funcs1),
+    stop_tracing(Nodes),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Basic, distributed, trace and ti.
+basic_dist_trace_ti_1(suite) -> [];
+basic_dist_trace_ti_1(doc) ->
+    [""];
+basic_dist_trace_ti_1(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataFun=
+	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf2_"++atom_to_list(N)])}},
+		    {ti,{file,filename:join([PrivDir,"tf2_"++atom_to_list(N)++".ti"])}}]}
+	end,
+    TracerDataList=lists:map(TracerDataFun,Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
+    activate_local_tracing(Nodes),
+    activate_meta_tracing(Nodes),
+    ?l true=(is_pid(whereis(inviso_rt))),
+    ?l true=(is_pid(whereis(inviso_rt_meta))),
+    deactivate_meta_tracing(Nodes),
+    deactivate_local_tracing(Nodes),
+    stop_tracing(Nodes),
+    ?l true=(is_pid(whereis(inviso_rt))),  % Shall still be running.
+    ?l ok=poll(erlang,whereis,[inviso_rt_meta],undefined,3),
+    stop(Nodes),
+    timer:sleep(200),                      % Give it time to terminate.
+    ?l ok=poll(erlang,whereis,[inviso_rt],undefined,3),% Shall be gone now.
+    ?l undefined=whereis(inviso_rt_meta),  % Still gone.
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% Test CASE: Testing that the tpm_tracer functionality works. That is appending
+%% {tracer,Tracer} to a meta match spec.
+basic_dist_trace_ti_2(suite) -> [];
+basic_dist_trace_ti_2(doc) ->
+    [""];
+basic_dist_trace_ti_2(Config) when is_list(Config) ->
+    case erlang:system_info(version) of
+	"5.4"++_ ->                        % Perhaps not perfect, but work now :-)
+	    {skip,"Old emulator"};
+	_ ->
+	    basic_dist_trace_ti_2_do(Config)
+    end.
+
+basic_dist_trace_ti_2_do(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataFun=
+	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf3_"++atom_to_list(N)])}},
+		    {ti,{file,filename:join([PrivDir,"tf3_"++atom_to_list(N)++".ti"])}}]}
+	end,
+    TracerDataList=lists:map(TracerDataFun,Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
+    activate_deactivate_meta_tracing_tracer(Nodes),
+    stop_tracing(Nodes),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Basic, distributed, trace and ti, where we try to use ctp_all to
+%% check that all global and local patterns are removed but that meta patterns
+%% remain.
+%% This test also checks that if the meta tracer is terminated an error value
+%% is generated when trying to do meta tracing at that node.
+basic_dist_trace_ti_3(suite) -> [];
+basic_dist_trace_ti_3(doc) ->
+    [""];
+basic_dist_trace_ti_3(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataFun=
+	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf4_"++atom_to_list(N)])}},
+		    {ti,{file,filename:join([PrivDir,"tf4_"++atom_to_list(N)++".ti"])}}]}
+	end,
+    TracerDataList=lists:map(TracerDataFun,Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
+    activate_local_tracing(Nodes),
+    activate_global_tracing(Nodes),
+    activate_meta_tracing(Nodes),
+    ?l true=(is_pid(whereis(inviso_rt))),
+    ?l true=(is_pid(whereis(inviso_rt_meta))),
+    ?l {ok,NodeResults1}=inviso:ctp_all(Nodes), % Removes local and global patterns.
+    ?l true=check_noderesults(Nodes,ok,NodeResults1),
+    ?l true=check_on_nodes(Nodes,erlang,trace_info,[{code,which,1},traced],{traced,false}),
+    ?l true=check_on_nodes(Nodes,erlang,trace_info,[{code,get_path,0},traced],{traced,false}),
+    %% But meta patters shall remain.
+    ?l true=check_on_nodes(Nodes,
+			   erlang,
+			   trace_info,
+			   [{lists,module_info,0},meta_match_spec],
+			   fun({meta_match_spec,L})when length(L)>0 ->true end),
+    ?l true=check_on_nodes(Nodes,
+			   erlang,
+			   trace_info,
+			   [{lists,module_info,0},meta],
+			   fun({meta,P})when is_pid(P) ->
+				   P=rpc:call(node(P),erlang,whereis,[inviso_rt_meta]),
+				   true
+			   end),
+    %% Now kill the meta tracer somewhere and try to activate meta tracing.
+    ?l [ANode|_]=Nodes,
+    ?l AMetaPid=rpc:call(ANode,erlang,whereis,[inviso_rt_meta]),
+    ?l rpc:call(ANode,erlang,exit,[AMetaPid,kill]),
+    ?l {ok,NodeResults2}=inviso:tpm(Nodes,math,pi,0,[],void),
+    ?l {value,{ANode,{error,_}}}=lists:keysearch(ANode,1,NodeResults2),
+
+    ?l stop_tracing(Nodes),
+    ?l stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% -----------------------------------------------------------------------------
+%% Test cases for SUSPEND
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: In this test case a trace with ti is started. Trace flags are set,
+%% trace patterns are set and meta trace patterns. We then check that the trace
+%% flags and the meta patterns are removed when tracing suspended.
+%% The suspension is cancelled and we check that it is possible to reactivate
+%% tracing by setting the process flags and meta patterns again.
+suspend_dist_trace_ti_1(suite) -> [];
+suspend_dist_trace_ti_1(doc) ->
+    [""];
+suspend_dist_trace_ti_1(Config) when is_list(Config) ->
+    ?l RemoteNodes=get_remotenodes_config(Config),
+    ?l Nodes=[node()|RemoteNodes],
+    ?l PrivDir=filename:join(?config(priv_dir,Config),""),
+    ?l TracerDataFun=
+	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf_suspend1_"++atom_to_list(N)])}},
+		    {ti,{file,filename:join([PrivDir,"tf_suspend1_"++atom_to_list(N)++".ti"])}}]}
+	end,
+    ?l TracerDataList=lists:map(TracerDataFun,Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
+    activate_local_tracing(Nodes),
+    activate_meta_tracing(Nodes),
+    ?l true=(is_pid(whereis(inviso_rt))),
+    ?l true=(is_pid(whereis(inviso_rt_meta))),
+    %% Set some trace flags on some newly started test procs.
+    activate_traceflags(Nodes),
+
+    %% Now suspend the tracing on all nodes. That shall result in the removal
+    %% of trace flags and meta trace patterns, but not local trace patterns.
+    ?l {ok,NodeResults1}=inviso:suspend(Nodes,test),
+    ?l true=check_noderesults(Nodes,ok,NodeResults1),
+    %% Trace flags gone?
+    ?l TestProcs=lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_test_proc]) end,Nodes),
+    ?l lists:foreach(fun(P)->
+			     {flags,[]}=
+				 rpc:call(node(P),erlang,trace_info,[P,flags])
+		     end,
+		     TestProcs),
+    %% Meta patterns shall be gone too, but local functions still there.
+    ?l lists:foreach(fun(N)->
+			     {meta,false}=
+				 rpc:call(N,
+					  erlang,
+					  trace_info,
+					  [{math,module_info,1},meta]),
+			     {traced,local}=
+				 rpc:call(N,
+					  erlang,
+					  trace_info,
+					  [{code,which,1},traced])
+		     end,
+		     Nodes),
+
+    %% Try to activate trace flags, trace patterns and meta tracing while
+    %% suspended. Should not succeed of course!
+    ?l ThisNode=node(),
+    ?l {ok,[{ThisNode,{error,suspended}}]}=
+	inviso:tf([ThisNode],inviso_test_proc,[call]),
+    ?l {ok,[{ThisNode,{error,suspended}}]}=
+	inviso:tpl([ThisNode],math,module_info,1,[]),
+    ?l {ok,[{ThisNode,{error,suspended}}]}=
+	inviso:init_tpm([ThisNode],
+			math,
+			module_info,
+			1,
+			{?MODULE,tpm_init_func2}, % Does not exist on purpose.
+			{?MODULE,tpm_call_func2}, % Does not exist on purpose.
+			{?MODULE,tpm_return_func2}, % Does not exist on purpose.
+			{?MODULE,tpm_remove_func2}), % Does not exist on purpose.
+
+    %% Now we want to cancel suspension and see that we can reactivate tracing.
+    ?l {ok,NodeResults2}=inviso:cancel_suspension(Nodes),
+    ?l true=check_noderesults(Nodes,ok,NodeResults2),
+
+    ?l {ok,NodeResults3}=
+	inviso:init_tpm(math,
+			module_info,
+			1,
+			{?MODULE,tpm_init_func2}, % Does not exist on purpose.
+			{?MODULE,tpm_call_func2}, % Does not exist on purpose.
+			{?MODULE,tpm_return_func2}, % Does not exist on purpose.
+			{?MODULE,tpm_remove_func2}), % Does not exist on purpose.
+    ?l true=check_noderesults(Nodes,ok,NodeResults3),
+    ?l {ok,NodeResults5}=
+	inviso:tpm_ms(math,module_info,1,ms1,[{'_',[],[{return_trace}]}]),
+    ?l true=check_noderesults(Nodes,{ok,1},NodeResults5),
+    ?l true=check_on_nodes(Nodes,
+			   erlang,
+			   trace_info,
+			   [{math,module_info,1},meta_match_spec],
+			   {meta_match_spec,[{'_',[],[{return_trace}]}]}),
+    ?l {ok,NodeResults6}=inviso:tf(Nodes,inviso_test_proc,[call]),
+    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults6),
+
+    %deactivate_meta_tracing(Nodes),
+    %deactivate_local_tracing(Nodes),
+    stop_tracing(Nodes),
+    ?l true=(is_pid(whereis(inviso_rt))),  % Shall still be running.
+    ?l ok=poll(erlang,whereis,[inviso_rt_meta],undefined,3),
+    stop(Nodes),
+    ?l timer:sleep(200),                   % Give it time to terminate.
+    ?l ok=poll(erlang,whereis,[inviso_rt],undefined,3),% Shall be gone now.
+    ?l undefined=whereis(inviso_rt_meta),  % Still gone.
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: In this test case a trace with ti is started. Trace flags are set,
+%% trace patterns are set and meta trace patterns. We then suspend tracing at
+%% all nodes, then stop tracing which shall be allowed. We then try to initiate
+%% tracing again which shall not be possible.
+suspend_dist_trace_ti_2(suite) -> [];
+suspend_dist_trace_ti_2(doc) ->
+    [""];
+suspend_dist_trace_ti_2(Config) when is_list(Config) ->
+    ?l RemoteNodes=get_remotenodes_config(Config),
+    ?l Nodes=[node()|RemoteNodes],
+    ?l PrivDir=filename:join(?config(priv_dir,Config),""),
+    ?l TracerDataFun=
+	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf_suspend2_"++atom_to_list(N)])}},
+		    {ti,{file,filename:join([PrivDir,"tf_suspend2_"++atom_to_list(N)++".ti"])}}]}
+	end,
+    ?l TracerDataList=lists:map(TracerDataFun,Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
+    activate_local_tracing(Nodes),
+    activate_meta_tracing(Nodes),
+    ?l true=(is_pid(whereis(inviso_rt))),
+    ?l true=(is_pid(whereis(inviso_rt_meta))),
+    %% Set some trace flags on some newly started test procs.
+    activate_traceflags(Nodes),
+
+    %% Now suspend the tracing on all nodes. That shall result in the removal
+    %% of trace flags and meta trace patterns, but not local trace patterns.
+    ?l {ok,NodeResults1}=inviso:suspend(Nodes,test),
+    ?l true=check_noderesults(Nodes,ok,NodeResults1),
+
+    %% Now stop tracing.
+    ?l {ok,NodeResults3}=inviso:stop_tracing(Nodes),
+    ?l true=check_noderesults(Nodes,{ok,idle},NodeResults3),
+    %% Now try to initiate tracing again.
+    ThisNode=node(),
+    ?l {ok,[{ThisNode,{error,suspended}}]}=
+	inviso:init_tracing([ThisNode],
+			    [{trace,{file,filename:join([PrivDir,"tf_suspend3_"++
+							 atom_to_list(ThisNode)])}},
+			     {ti,{file,{filename:join([PrivDir,"tf_suspend3_"++
+						       atom_to_list(ThisNode)])}}}]),
+
+    %% Cancel the suspension and initiate tracing again.
+    ?l {ok,NodeResults2}=inviso:cancel_suspension(Nodes),
+    ?l true=check_noderesults(Nodes,ok,NodeResults2),
+    ?l TracerDataFun2=
+	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf_suspend4_"++atom_to_list(N)])}},
+		    {ti,{file,filename:join([PrivDir,"tf_suspend4_"++atom_to_list(N)++".ti"])}}]}
+	end,
+    ?l TracerDataList2=lists:map(TracerDataFun2,Nodes),
+    ?l {ok,NodeResults4}=inviso:init_tracing(TracerDataList2),
+    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok},{ti_log,ok}]},NodeResults4),
+    stop_tracing(Nodes),
+    ?l true=(is_pid(whereis(inviso_rt))),  % Shall still be running.
+    stop(Nodes),
+    ?l timer:sleep(200),                   % Give it time to terminate.
+    ?l ok=poll(erlang,whereis,[inviso_rt],undefined,3),% Shall be gone now.
+    ok.
+%% -----------------------------------------------------------------------------
+
+
+
+%% TEST CASE: This test case tests that the clean function removes (prosumed)
+%% expired data from the internal public-loopdata structure in the inviso_rt_meta
+%% process.
+meta_cleanfunc_dist_1(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataFun=
+	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"mcf1_"++atom_to_list(N)])}},
+		    {ti,{file,filename:join([PrivDir,"mcf1_"++atom_to_list(N)++".ti"])}}]}
+	end,
+    TracerDataList=lists:map(TracerDataFun,Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
+    %% Now initialize meta tracing, but the call_func is a bit "fixed".
+    ?l {ok,NodeResults1}=
+	inviso:tpm(Nodes,math,module_info,1,[],
+		   {?MODULE,meta_cleanfunc_initfunc_1},
+		   {?MODULE,meta_cleanfunc_callfunc_1},
+		   void,void),
+    ?l true=check_noderesults(Nodes,{ok,1},NodeResults1),
+    %% Nothing in the "our" part of the public loop data.
+    ?l true=check_on_nodes(Nodes,
+			   inviso_rt_meta,get_state,[inviso_rt_meta],
+			   fun({ok,_LD,{{_,[]},_}})->true end),
+    ?l lists:foreach(fun(N)->rpc:call(N,math,module_info,[exports]) end,Nodes),
+    %% Check that it has been added to the public loopdata structure.
+    ?l true=check_on_nodes(Nodes,
+			   ?MODULE,poll,[inviso_rt_meta,
+					 get_state,
+					 [inviso_rt_meta],
+					 fun({ok,_LD,{{_,[{meta_cleanfunc_test1,_Now}]},_}})->
+						 true;
+					    (_)->false
+					 end,
+					 20],
+			   ok),
+    %% While we wait for 60 seconds to pass, we test a few other things.
+    ?l {ok,NodeResults2}=
+	inviso:tpm(Nodes,?MODULE,slowfunction2,0,[{'_',[],[{return_trace}]}],
+		   {?MODULE,meta_cleanfunc_initfunc_2},
+		   {?MODULE,meta_cleanfunc_callfunc_2},
+		   {?MODULE,meta_cleanfunc_returnfunc_2},
+		   void),
+    ?l true=check_noderesults(Nodes,{ok,1},NodeResults2),
+    ?l lists:foreach(fun(N)->rpc:call(N,?MODULE,slowfunction,[]) end,Nodes),
+    %% Believe it or not but slowfunction is still running, in its own process,
+    %% we are therefore free now to examine the meta tracer.
+    ?l true=check_on_nodes(Nodes,
+			   ?MODULE,poll,[inviso_rt_meta,
+					 get_state,
+					 [inviso_rt_meta],
+					 fun({ok,_LD,{{[],Tuples},_}})->
+						 {value,_}=
+						     lists:keysearch(meta_cleanfunc_test2,
+								     1,
+								     Tuples),
+						 {value,_}=
+						     lists:keysearch(meta_cleanfunc_test1,
+								     1,
+								     Tuples),
+						 true;
+					    (_)->
+						 false
+					 end,
+					 20],
+			   ok),
+    %% Now we wait for slowfunction to return and that the meta_cleanfunc_test2
+    %% to be removed from public loopdata strucuture.
+    ?l timer:sleep(10000),
+    %% The only thing remaining should be the meta_cleanfunc_test1 which will not
+    %% go away for less than that the clean functionality removes it.
+    ?l true=check_on_nodes(Nodes,
+			   ?MODULE,poll,[inviso_rt_meta,
+					 get_state,
+					 [inviso_rt_meta],
+					 fun({ok,_LD,{{_,[{meta_cleanfunc_test1,_Now}]},_}})->
+						 true;
+					    (_)->
+						 false
+					 end,
+					 20],
+			   ok),
+    %% Wait for the clean function to clean meta_cleanfunc_test1 away.
+    ?l timer:sleep(51000),                       % Shall be gone after 5 seconds.
+    ?l true=check_on_nodes(Nodes,
+			   ?MODULE,poll,[inviso_rt_meta,
+					 get_state,
+					 [inviso_rt_meta],
+					 fun({ok,_LD,{{_,[]},_}})->true;
+					    (_)->false
+					 end,
+			                 20],
+			   ok),
+    stop_tracing(Nodes),
+    stop(Nodes),
+    ok.
+
+%% This function acts as tpm initialization function when we are going to test
+%% that the clean function works. Note that we here assume standard public loop
+%% datastructure.
+meta_cleanfunc_initfunc_1(_M,_F,_Arity,{E1,_E2}) ->
+    {ok,{E1,[]},void}.
+%% Function that is supposed to be called when the meta traced function is
+%% called.
+meta_cleanfunc_callfunc_1(_Pid,_Args,{{E1,E2},Global}) ->
+    {ok,{{E1,[{meta_cleanfunc_test1,now()}|E2]},Global},void}.
+
+meta_cleanfunc_initfunc_2(_M,_F,_Arity,PublLD) ->
+    {ok,PublLD,void}.
+meta_cleanfunc_callfunc_2(_Pid,_Args,{{E1,E2},Global}) ->
+    {ok,{{E1,[{meta_cleanfunc_test2,now()}|E2]},Global},void}.
+meta_cleanfunc_returnfunc_2(_Pid,_,{{E1,E2},Global}) ->
+    {value,_}=lists:keysearch(meta_cleanfunc_test2,1,E2),
+    {ok,{{E1,lists:keydelete(meta_cleanfunc_test2,1,E2)},Global},void}.
+
+slowfunction() ->
+    spawn(?MODULE,slowfunction1,[]).
+slowfunction1() ->
+    slowfunction2().                         % Meta trace on this function call.
+slowfunction2() ->
+    timer:sleep(2000),
+    true.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Testing that a runtime component can be started instructing it
+%% to use a handler fun. Checks that the handler fun is called if a trace
+%% message comes in.
+basic_handlerfun_dist_1(suite) -> [];
+basic_handlerfun_dist_1(doc) ->
+    [""];
+basic_handlerfun_dist_1(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    ?l lists:foreach(fun(N)->rpc:call(N,ets,insert,[inviso_sideeffect_tab,{bhf1,0}]) end,
+		     Nodes),
+    TracerDataFun=
+	fun(N)->{N,{fun basic_handlerfun_dist_1_fun/2,inviso_sideeffect_tab}} end,
+    TracerDataList=lists:map(TracerDataFun,Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
+    activate_local_tracing(Nodes),
+    activate_traceflags(Nodes),
+    ?l lists:foreach(fun(N)->[{bhf1,0}]=
+				 rpc:call(N,ets,lookup,[inviso_sideeffect_tab,bhf1])
+		     end,
+		     Nodes),
+    ?l inviso_test_proc ! {apply,code,which,[lists]},
+    ok=poll(ets,lookup,[inviso_sideeffect_tab,bhf1],[{bhf1,1}],20),
+    deactivate_traceflags(Nodes),
+    deactivate_local_tracing(Nodes),
+    stop_tracing(Nodes),
+    timer:sleep(100),
+    ?l [{bhf1,1}]=ets:lookup(inviso_sideeffect_tab,bhf1),
+    stop(Nodes),
+    ok.
+
+%% Function used as handler fun for testcase above.
+basic_handlerfun_dist_1_fun(_Msg,TId) ->
+    ets:update_counter(TId,bhf1,1),
+    TId.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Here we test that delete_log removes the files at the involved
+%% runtime nodes. In this case we test that we remove logs according to last
+%% used tracer data.
+delete_log_dist_1(suite) -> [];
+delete_log_dist_1(doc) -> [""];
+delete_log_dist_1(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataFun=
+	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"dl1_"++atom_to_list(N)])}},
+		    {ti,{file,filename:join([PrivDir,"dl1_"++atom_to_list(N)++".ti"])}}]}
+	end,
+    TracerDataList=lists:map(TracerDataFun,Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
+    ?l Files=lists:map(fun({N,TD})->
+			       ?l {value,{_,{_,TraceFile}}}=lists:keysearch(trace,1,TD),
+			       ?l {value,{_,{_,TiFile}}}=lists:keysearch(ti,1,TD),
+			       ?l {N,{TraceFile,TiFile}}
+		       end,
+		       TracerDataList),
+    io:format("The Files is:~w~n",[Files]),
+    ?l {ok,NodeResults1}=inviso:delete_log(Nodes), % Should not work!
+    ?l true=check_noderesults(Nodes,{error,tracing},NodeResults1),
+    stop_tracing(Nodes),
+    %% Files still here.
+    ?l lists:foreach(fun({N,{F1,F2}})->
+			     ?l {ok,_}=rpc:call(N,file,read_file_info,[F1]),
+			     ?l {ok,_}=rpc:call(N,file,read_file_info,[F2])
+		     end,
+		     Files),
+    ?l {ok,NodeResults2}=inviso:delete_log(Nodes),
+    ?l true=check_noderesults(Nodes,
+			      fun({_N,{ok,LogInfos}})->
+				      ?l {value,{_,[{ok,_FName1}]}}=
+					  lists:keysearch(trace_log,1,LogInfos),
+				      ?l {value,{_,[{ok,_FName2}]}}=
+					  lists:keysearch(ti_log,1,LogInfos),
+				      true
+			      end,
+			      NodeResults2),
+    %% The files shall be gone now.
+    ?l lists:foreach(fun({N,{F1,F2}})->
+			     ?l {error,enoent}=rpc:call(N,file,read_file_info,[F1]),
+			     ?l {error,enoent}=rpc:call(N,file,read_file_info,[F2])
+		     end,
+		     Files),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+
+%% TEST CASE: Test of the autostart behaviour of the runtime component.
+%% Here we test that a runtime component is started according to the autostart.conf
+%% file. Note that the repeat parameter is set to 2.
+autostart_dist_1(suite) -> [];
+autostart_dist_1(doc) ->
+    [""];
+autostart_dist_1(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    AutoConfFile=filename:join(PrivDir,"autostart1.conf"),
+    [RNode|_]=RemoteNodes,
+    ?l ok=rpc:call(RNode,application,stop,[runtime_tools]),
+    ?l ok=rpc:call(RNode,application,set_env,[runtime_tools,
+					      inviso_autostart_conf,
+					      AutoConfFile]),
+    ?l {ok,FD}=file:open(AutoConfFile,[write]),
+    ?l ok=io:format(FD,"~w.~n~w.~n",[{repeat,2},{tag,c_ref}]),
+    ?l file:close(FD),
+    ?l ok=rpc:call(RNode,application,start,[runtime_tools]),
+    timer:sleep(1000),
+    ?l P1=rpc:call(RNode,erlang,whereis,[inviso_rt]),
+    ?l true=is_pid(P1),
+    ?l rpc:call(RNode,erlang,exit,[P1,kill]),
+    ?l ok=rpc:call(RNode,application,stop,[runtime_tools]),
+    ?l ok=rpc:call(RNode,application,start,[runtime_tools]),
+    timer:sleep(1000),
+    ?l P2=rpc:call(RNode,erlang,whereis,[inviso_rt]),
+    ?l true=is_pid(P2),
+    ?l rpc:call(RNode,erlang,exit,[P2,kill]),
+    ?l ok=rpc:call(RNode,application,stop,[runtime_tools]),
+    ?l ok=rpc:call(RNode,application,start,[runtime_tools]),
+    timer:sleep(1000),
+    ?l undefined=rpc:call(RNode,erlang,whereis,[inviso_rt]),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Test of autostart. Here we focus on that an autostarted
+%% runtime component actually follows the trace case command file and
+%% initiates tracing.
+autostart_dist_2(suite) -> [];
+autostart_dist_2(doc) ->
+    [""];
+autostart_dist_2(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    AutoConfFile=filename:join(PrivDir,"autostart2.conf"),
+    [RNode|_]=RemoteNodes,
+    ?l ok=rpc:call(RNode,application,stop,[runtime_tools]),
+    ?l ok=rpc:call(RNode,application,set_env,[runtime_tools,
+					      inviso_autostart_conf,
+					      AutoConfFile]),
+    ?l CmdFileName=filename:join(PrivDir,"autostart_cmd_as1"),
+    ?l {ok,FD}=file:open(CmdFileName,[write]),
+    ?l ok=io:format(FD,
+		    "inviso:tpl(Nodes,M,F,Arity,[]).~n"
+		    "inviso:tf(Nodes,inviso_test_proc,[call]).~n",
+		    []),
+    ?l file:close(FD),
+    ?l TraceFileName=filename:join([PrivDir,"as1_"++atom_to_list(RNode)]),
+    ?l TiFileName=filename:join([PrivDir,"as1_"++atom_to_list(RNode)++".ti"]),
+    ?l inviso_as_lib:setup_autostart(RNode,
+				     2,
+				     [],
+				     [{trace,{file,TraceFileName}},
+				      {ti,{file,TiFileName}}],
+				     [[CmdFileName]],
+				     [{'M',code},{'F',which},{'Arity',1}],
+				     [{{inviso,tpl,5},{inviso_rt,tpl,{erlang,tl}}},
+				      {{inviso,tf,3},{inviso_rt,tf,{erlang,tl}}}]),
+    ?l TestP=spawn(RNode,?MODULE,test_proc_init,[]),
+    ?l ok=rpc:call(RNode,application,start,[runtime_tools]),
+    ?l timer:sleep(1000),
+    ?l {ok,_}=file:read_file_info(TraceFileName),
+    ?l {ok,_}=file:read_file_info(TiFileName),
+    ?l true=is_pid(P=rpc:call(RNode,erlang,whereis,[inviso_rt])),
+    ?l ok=poll(rpc,call,[RNode,erlang,trace_info,[{code,which,1},traced]],{traced,local},10),
+    ?l {flags,[call]}=rpc:call(RNode,erlang,trace_info,[TestP,flags]),
+    ?l rpc:call(RNode,erlang,exit,[P,kill]),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Here we test that an autostarted runtime component with a dependency
+%% to a specific control component tries to connect to that control component
+%% during its start-up.
+autostart_dist_3(suite) -> [];
+autostart_dist_3(doc) ->
+    [""];
+autostart_dist_3(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    AutoConfFile=filename:join(PrivDir,"autostart3.conf"),
+    [RNode|_]=RemoteNodes,
+    ?l ok=rpc:call(RNode,application,stop,[runtime_tools]),
+    ?l ok=rpc:call(RNode,application,set_env,[runtime_tools,
+					      inviso_autostart_conf,
+					      AutoConfFile]),
+    ?l {ok,FD}=file:open(AutoConfFile,[write]),
+    ?l ok=io:format(FD,"~w.~n~w.~n~w.~n",
+		    [{options,[{dependency,{infinity,node()}}]},{repeat,2},{tag,c_ref}]),
+    ?l file:close(FD),
+    %% Now start inviso at this node here for the runtime to connect.
+    ?l {ok,_Pid}=inviso:start(),
+    ?l ok=poll(erlang,whereis,[inviso_c],fun(P) when is_pid(P)->true;(_)->false end,10),
+    %% Make the runtime component start.
+    ?l ok=rpc:call(RNode,application,start,[runtime_tools]),
+    ?l ok=poll(rpc,call,[RNode,erlang,whereis,[inviso_rt]],
+	       fun(P) when is_pid(P)->true;(_)->false end,10),
+    %% Check that the runtime component started.
+    ?l ok=poll(inviso,get_status,[[RNode]],{ok,[{RNode,{ok,{new,running}}}]},20),
+%    ?l {ok,[{RNode,{ok,{new,running}}}]}=inviso:get_status([RNode]),
+    stop([RNode]),
+    ok.
+%% -----------------------------------------------------------------------------
+
+
+
+%% TEST CASE: Test of the dependency mechanism in the runtime component.
+%% Default behaviour is dependency=infinity, i.e the runtime components remains.
+%% We also test here that we can reconnect to the runtime.
+running_alone_dist_1(suite) -> [];
+running_alone_dist_1(doc) ->
+    [""];
+running_alone_dist_1(Config) when is_list(Config) ->
+    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,[]),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    ?l shutdown=inviso:stop(),                  % Stop the control component!
+    ?l undefined=whereis(inviso_c),
+    timer:sleep(3000),                          % How long shall we wait? :-)
+    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
+		     Nodes),
+    ?l {ok,_Pid2}=inviso:start(),
+    ?l {ok,NodeResults2}=inviso:add_nodes(Nodes,b_ref,[]),
+    ?l true=check_noderesults(Nodes,{ok,{adopted,new,running,a_ref}},NodeResults2),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Test of the dependency mechanism in the runtime component.
+%% Test that the runtime components terminates after the specified 5000 ms.
+running_alone_dist_2(suite) -> [];
+running_alone_dist_2(doc) ->
+    [""];
+running_alone_dist_2(Config) when is_list(Config) ->
+    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,[{dependency,5000}]),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    ?l shutdown=inviso:stop(),                  % Stop the control component!
+    ?l undefined=whereis(inviso_c),
+    timer:sleep(2000),
+    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
+		     Nodes),
+    timer:sleep(4000),                          % Now they shall be dead!
+    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt]) end,
+		     Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Test of the dependency mechanism in the runtime component.
+%% Test that the runtime components terminates after the specified 5000 ms.
+running_alone_dist_3(suite) -> [];
+running_alone_dist_3(doc) ->
+    [""];
+running_alone_dist_3(Config) when is_list(Config) ->
+    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,[{dependency,1000}]),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    ?l {ok,NodeResults2}=inviso:change_options(Nodes,[{dependency,5000}]),
+    ?l true=check_noderesults(Nodes,ok,NodeResults2),
+    ?l shutdown=inviso:stop(),                  % Stop the control component!
+    ?l undefined=whereis(inviso_c),
+    timer:sleep(3000),
+    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
+		     Nodes),
+    timer:sleep(3000),                          % Now they shall be dead!
+    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt]) end,
+		     Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Test of the dependency mechanism in the runtime component.
+%% Test that the runtime components terminates after the specified 5000 ms,
+%% like we did in running_alone_dist_2. But now we also start tracing and checks
+%% that all inviso processes actually disappears when the time-out is reached.
+running_alone_dist_4(suite) -> [];
+running_alone_dist_4(doc) ->
+    [""];
+running_alone_dist_4(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    %% Start some tracing!
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataFun=
+	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf_ra4"++atom_to_list(N)])}},
+		    {ti,{file,filename:join([PrivDir,"tf_ra4_"++atom_to_list(N)++".ti"])}}]}
+	end,
+    TracerDataList=lists:map(TracerDataFun,Nodes),
+    start_and_init_tracing2(Nodes,
+			    [{dependency,5000}],
+			    TracerDataList,
+			    {ok,[{trace_log,ok},{ti_log,ok}]}),
+
+    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt_meta])) end,
+		     Nodes),
+    %% Stop control component and wait for the runtimes to terminate after
+    %% running alone timer has expired.
+    ?l shutdown=inviso:stop(),                  % Stop the control component!
+    ?l undefined=whereis(inviso_c),
+    timer:sleep(2000),
+    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt_meta])) end,
+		     Nodes),
+    timer:sleep(4000),                          % Now they shall be dead!
+    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt]) end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt_meta]) end,
+		     Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Test of the dependency mechanism in the runtime component.
+%% Test that the runtime components terminates imeediately when the control
+%% component is stopped. Check that all processes are gone.
+running_alone_dist_5(suite) -> [];
+running_alone_dist_5(doc) ->
+    [""];
+running_alone_dist_5(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    %% Start some tracing!
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataFun=
+	fun(N)->{N,[{trace,{file,filename:join([PrivDir,"tf_ra5"++atom_to_list(N)])}},
+		    {ti,{file,filename:join([PrivDir,"tf_ra5_"++atom_to_list(N)++".ti"])}}]}
+	end,
+    TracerDataList=lists:map(TracerDataFun,Nodes),
+    start_and_init_tracing2(Nodes,
+			    [{dependency,0}],
+			    TracerDataList,
+			    {ok,[{trace_log,ok},{ti_log,ok}]}),
+
+    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt])) end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->true=is_pid(rpc:call(N,erlang,whereis,[inviso_rt_meta])) end,
+		     Nodes),
+    %% Stop control component and check that all runtime component processes have
+    %% terminate more or less immediately afterwards, since dependency==0.
+    ?l shutdown=inviso:stop(),                  % Stop the control component!
+    timer:sleep(100),
+    ?l undefined=whereis(inviso_c),
+    timer:sleep(500),
+    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt]) end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->undefined=rpc:call(N,erlang,whereis,[inviso_rt_meta]) end,
+		     Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Test of the overload protection mechanism. The mechanism checks
+%% for overload using the callback approximately at the interval specified.
+%% Check that it does not start protection until start of tracing.
+overload_dist_1(suite) -> [];
+overload_dist_1(doc) ->
+    [""];
+overload_dist_1(Config) when is_list(Config) ->
+    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    ?l lists:foreach(fun(N)->true=rpc:call(N,ets,insert,[inviso_sideeffect_tab,{ovl1,0}]) end,
+		     Nodes),                    % Initiate the counter.
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,
+					  a_ref,
+					  [{overload,{{?MODULE,overload1},500}}]),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    timer:sleep(1000),                          % Give the loadcheck time to perform.
+    ?l [{_,0}]=ets:lookup(inviso_sideeffect_tab,ovl1), % Nothing should have happened.
+
+    %% Overload check shall not start until we start tracing.
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=lists:map(fun(N)->{N,[{trace,
+					  {file,filename:join([PrivDir,
+							       "tf_ovl1."++atom_to_list(N)
+							      ])}}]}
+			     end,
+			     Nodes),
+    ?l {ok,NodeResults2}=inviso:init_tracing(TracerDataList),
+    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok}]},NodeResults2),
+    timer:sleep(1500),                          % Give the loadcheck time to perform.
+    ?l [{_,N}]=ets:lookup(inviso_sideeffect_tab,ovl1),
+    ?l true=(N>=2),                             % After 1,5 seconds, at least 2 checks.
+
+    %% Now change options and remove overload checking!
+    ?l {ok,NodeResults3}=inviso:change_options(Nodes,[overload]),
+    ?l true=check_noderesults(Nodes,ok,NodeResults3),
+    ?l [{_,N2}]=ets:lookup(inviso_sideeffect_tab,ovl1),
+    timer:sleep(1000),
+    ?l [{_,N2}]=ets:lookup(inviso_sideeffect_tab,ovl1), % No more loadchecks!
+
+    stop_tracing(Nodes),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Test of the overload protection mechanism. In this case we focus
+%% in that the init and remove functions are carried out at change_options and
+%% when starting and stoping the runtime component.
+overload_dist_2(suite) -> [];
+overload_dist_2(doc) ->
+    [""];
+overload_dist_2(Config) when is_list(Config) ->
+    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,
+					  a_ref,
+					  [{overload,{{?MODULE,overload2},
+						      500,
+						      {?MODULE,overload2i,[]},
+						      {?MODULE,overload2r,[]}}}]),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    ?l [{_,0}]=ets:lookup(inviso_sideeffect_tab,ovl2),
+
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=lists:map(fun(N)->{N,[{trace,
+					  {file,filename:join([PrivDir,
+							       "tf_ovl2."++atom_to_list(N)
+							      ])}}]}
+			     end,
+			     Nodes),
+    ?l {ok,NodeResults2}=inviso:init_tracing(TracerDataList),
+    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok}]},NodeResults2),
+    timer:sleep(1500),                          % Give the loadcheck time to perform.
+    ?l [{_,N}]=ets:lookup(inviso_sideeffect_tab,ovl2),
+    io:format("� is:~p~n",[N]),
+    ?l true=(N>=2),                             % After 1,5 seconds, at least 2 checks.
+    ?l {ok,NodeResults3}=inviso:change_options(Nodes,[{overload,{{?MODULE,overload3},
+								 500,
+								 {?MODULE,overload3i,[]},
+								 {?MODULE,overload3r,[]}}}]),
+    ?l true=check_noderesults(Nodes,ok,NodeResults3),
+    ?l []=ets:lookup(inviso_sideeffect_tab,ovl2),
+    timer:sleep(1500),
+    ?l [{_,N2}]=ets:lookup(inviso_sideeffect_tab,ovl3),
+    ?l true=(N2>=2),                            % After 1,5 seconds, at least 2 checks.
+    stop_tracing(Nodes),
+    ?l []=ets:lookup(inviso_sideeffect_tab,ovl3r), % Remove function shall not be called.
+    ?l [{_,N3}]=ets:lookup(inviso_sideeffect_tab,ovl3),
+    timer:sleep(1000),                          % Check that overloadchecking has stopped.
+    ?l [{_,N3}]=ets:lookup(inviso_sideeffect_tab,ovl3),
+    stop(Nodes),
+    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,ovl3r],[{ovl3r,done}],20),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Test of the overload protections mechanism. Here we focus on testing
+%% that if overload is reached tracing is really suspended.
+overload_dist_3(suite) -> [];
+overload_dist_3(doc) ->
+    [""];
+overload_dist_3(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=
+	lists:map(fun(N)->{N,[{trace,{file,filename:join([PrivDir,
+							  "tf_ovl3."++atom_to_list(N)])}},
+			      {ti,{file,filename:join([PrivDir,
+						       "tf_ovl3_ti."++atom_to_list(N)])}}]}
+		  end,
+		  Nodes),
+    ?l lists:foreach(fun(N)->
+			     true=rpc:call(N,ets,insert,[inviso_sideeffect_tab,{ovl4,0}])
+		     end,
+		     Nodes),
+    start_and_init_tracing2(Nodes,
+			    [{overload,{{?MODULE,overload4},500}}],
+			    TracerDataList,
+			    {ok,[{trace_log,ok},{ti_log,ok}]}),
+    activate_local_tracing(Nodes),
+    activate_meta_tracing(Nodes),
+    activate_traceflags(Nodes),
+    timer:sleep(600),
+    ?l [{_,N1}]=ets:lookup(inviso_sideeffect_tab,ovl4),
+    ?l true=(N1>=1),                            % Overload check has been done!
+    ?l Node=node(),
+    ?l {ok,[{Node,{ok,{tracing,running}}}]}=inviso:get_status([node()]),
+    ?l true=ets:insert(inviso_sideeffect_tab,{ovl4_suspend,true}),
+    timer:sleep(600),
+    ?l {ok,[{Node,{ok,{tracing,{suspended,test}}}}]}=inviso:get_status([node()]),
+    ?l [{_,N2}]=ets:lookup(inviso_sideeffect_tab,ovl4),
+    ?l {flags,[]}=erlang:trace_info(whereis(inviso_test_proc),flags),
+    ?l {meta,false}=erlang:trace_info({lists,module_info,0},meta),
+    ?l {traced,local}=erlang:trace_info({code,which,1},traced),
+    ?l true=(is_pid(whereis(inviso_rt_meta))),
+    ?l true=ets:delete(inviso_sideeffect_tab,ovl4_suspend),
+    timer:sleep(600),
+    ?l [{_,N2}]=ets:lookup(inviso_sideeffect_tab,ovl4), % No checking while suspended!
+    ?l {ok,[{Node,ok}]}=inviso:cancel_suspension([node()]),
+    ?l {ok,NodeResults1}=inviso:get_status(Nodes),
+    ?l true=check_noderesults(Nodes,{ok,{tracing,running}},NodeResults1),
+    timer:sleep(600),
+    ?l [{_,N3}]=ets:lookup(inviso_sideeffect_tab,ovl4),
+    ?l true=(N3>N2),
+    ?l deactivate_local_tracing(Nodes),
+    ?l stop_tracing(Nodes),
+    ?l stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE. Test that the overload mechanism is triggered by to the runtime
+%% component incomming messages, and nothing else.
+overload_dist_4(suite) -> [];
+overload_dist_4(doc) ->
+    [""];
+overload_dist_4(Config) when is_list(Config) ->
+    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,
+					  a_ref,
+					  [{overload,{{?MODULE,overload5},
+						      infinity,
+						      {?MODULE,overload5i,[]},
+						      {?MODULE,overload5r,[]}}}]),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    ?l [{_,0}]=ets:lookup(inviso_sideeffect_tab,ovl5),
+
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=lists:map(fun(N)->{N,[{trace,
+					  {file,filename:join([PrivDir,
+							       "tf_ovl4."++atom_to_list(N)
+							      ])}}]}
+			     end,
+			     Nodes),
+    ?l {ok,NodeResults2}=inviso:init_tracing(TracerDataList),
+    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok}]},NodeResults2),
+    timer:sleep(2000),                          % Give the loadcheck time to perform.
+    ?l [{_,N}]=ets:lookup(inviso_sideeffect_tab,ovl5),
+    ?l true=(N==0),                             % And nothing shall have happend!
+    %% Now we send a message to the inviso_rt, then the load check function
+    %% shall be called.
+    ?l whereis(inviso_rt) ! test_of_loadcheck,
+    timer:sleep(200),                           % Make sure the inviso_rt gets scheduled.
+    ?l [{_,1}]=ets:lookup(inviso_sideeffect_tab,ovl5),
+    stop_tracing(Nodes),
+    ?l []=ets:lookup(inviso_sideeffect_tab,ovl5r), % Remove function shall not be called.
+    ?l [{_,N3}]=ets:lookup(inviso_sideeffect_tab,ovl5),
+    ?l whereis(inviso_rt) ! test_of_loadcheck,
+    timer:sleep(1000),                          % Check that overloadchecking has stopped.
+    ?l [{_,N3}]=ets:lookup(inviso_sideeffect_tab,ovl5),
+    stop(Nodes),
+    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,ovl5r],[{ovl5r,done}],20),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE. Test that the overload mechanism correctly calculates remaining time
+%% to next load check if a message comes into the runtime component "interupting"
+%% the waiting for loadcheck timeout. (Loadcheck timeout is implemented as an after
+%% in the receive).
+overload_dist_5(suite) -> [];
+overload_dist_5(doc) ->
+    [""];
+overload_dist_5(Config) when is_list(Config) ->
+    ?l {ok,_Pid1}=inviso:start(),               % Start a control component.
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    ?l lists:foreach(fun(N)->true=rpc:call(N,ets,insert,[inviso_sideeffect_tab,{ovl6,0}]) end,
+		     Nodes),                    % Initiate the counter.
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,
+					  a_ref,
+					  [{overload,{{?MODULE,overload6},1000}}]),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    %% Overload check shall not start until we start tracing.
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=lists:map(fun(N)->{N,[{trace,
+					  {file,filename:join([PrivDir,
+							       "tf_ovl5."++atom_to_list(N)
+							      ])}}]}
+			     end,
+			     Nodes),
+    ?l {ok,NodeResults2}=inviso:init_tracing(TracerDataList),
+    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok}]},NodeResults2),
+    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,ovl6],[{ovl6,2}],25),
+    %% Now we know that exactly 2 checks have been made. Try to Distract the runtime :-)
+    ?l inviso_rt:state(whereis(inviso_rt)),     % Make it have to receive a message.
+    timer:sleep(500),
+    ?l [{_,2}]=ets:lookup(inviso_sideeffect_tab,ovl6), % Should still be 2.
+    timer:sleep(600),
+    ?l [{_,3}]=ets:lookup(inviso_sideeffect_tab,ovl6), % We expect yet one check.
+    timer:sleep(1100),
+    ?l [{_,4}]=ets:lookup(inviso_sideeffect_tab,ovl6),
+
+    stop_tracing(Nodes),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+
+%% TEST CASE: Test of the subscription mechanism.
+subscribe_dist_1(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    Pid=spawn(?MODULE,inviso_msg_collector,[]),
+    CtrlPid=whereis(inviso_c),
+
+    ?l {ok,_Pid}=inviso:start(),             % Start a control component.
+    ?l ok=inviso:subscribe(Pid),
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,[]),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    ?l {ok,NodeResults2}=inviso:get_status(Nodes),
+    ?l true=check_noderesults(Nodes,{ok,{new,running}},NodeResults2),
+    check_msg_collector(Nodes,
+			fun({inviso_event,CP,_,{connected,N,{_Tag,{idle,running}}}})
+			   when CP==CtrlPid ->
+				{true,N};
+			   (_) ->
+				false
+			end,
+			13),
+    TracerDataList=lists:map(fun(N)->{N,{file,
+					 filename:join([PrivDir,
+							"tf_sub1"++atom_to_list(N)])}}
+			     end,
+			     Nodes),
+    ?l {ok,NodeResults3}=inviso:init_tracing(TracerDataList),
+    ?l true=check_noderesults(Nodes,{ok,[{trace_log,ok}]},NodeResults3),
+    check_msg_collector(Nodes,
+			fun({inviso_event,CP,_,{state_change,N,{tracing,running}}})
+			   when CP==CtrlPid ->
+				{true,N};
+			   (_) ->
+				false
+			end,
+			13),
+    ?l {ok,NodeResults4}=inviso:suspend(Nodes,test),
+    ?l true=check_noderesults(Nodes,ok,NodeResults4),
+    check_msg_collector(Nodes,
+			fun({inviso_event,CP,_,{state_change,N,{tracing,{suspended,test}}}})
+			   when CP==CtrlPid ->
+				{true,N};
+			   (_) ->
+				false
+			end,
+			13),
+    ?l [RNode|_]=RemoteNodes,
+    ?l RInvisoPid=rpc:call(RNode,erlang,whereis,[inviso_rt]),
+    ?l rpc:call(RNode,erlang,exit,[RInvisoPid,kill]),
+    check_msg_collector([RNode],
+			fun({inviso_event,CP,_,{disconnected,N,_Info}})
+			   when CP==CtrlPid ->
+				{true,N};
+			   (_) ->
+				false
+			end,
+			11),
+
+    ?l {ok,_NodeResults5}=inviso:stop_tracing(Nodes),
+    ?l {ok,_NodeResults6}=inviso:stop_nodes(Nodes),
+    ?l shutdown=inviso:stop(),
+    ok.
+%% -----------------------------------------------------------------------------
+
+
+%% TEST CASE: fetch_log test of single straight trace_log file in distributed
+%% environment.
+fetch_log_dist_trace_1(suite) -> [];
+fetch_log_dist_trace_1(doc) ->
+    ["fetch_log test of single straight trace_log file in distributed"
+     "environment."];
+fetch_log_dist_trace_1(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=lists:map(fun(N)->{N,[{trace,{file,filename:join([PrivDir,
+								     "testfile1."++
+								     atom_to_list(N)
+								    ])}}]} end,
+			     Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
+
+    %% Put some output in the logs.
+    ?l inviso:tp(Nodes,math,module_info,0,[]),
+    ?l inviso:tf(Nodes,all,[call]),
+    ?l lists:foreach(fun(N)->rpc:call(N,math,module_info,[]) end,Nodes),
+
+    stop_tracing(Nodes),
+    {H,M,S}=time(),
+    FetchToDir=filename:join([PrivDir,
+			      "fetch_log_test1_"++integer_to_list(H)++"_"++
+			      integer_to_list(M)++"_"++integer_to_list(S)]),
+    ?l ok=file:make_dir(FetchToDir),
+    ?l {ok,NodeResults}=inviso:fetch_log(RemoteNodes,FetchToDir,"p1"),
+    io:format("~p~n",[NodeResults]),
+    ?l true=check_noderesults(RemoteNodes,
+			      fun({N,{complete,[{trace_log,[{ok,File}]},{ti_log,[]}]}}) ->
+				      ?l File="p1testfile1."++atom_to_list(N),
+				      true;
+				 (_)->
+				      false
+			      end,
+			      NodeResults),
+    ?l ON=filename:join(PrivDir,"testfile1."),
+    ?l FN=filename:join(FetchToDir,"p1testfile1."),
+    ?l lists:foreach(fun(N)->
+			     {ok,#file_info{size=Size}}=
+				 file:read_file_info(ON++atom_to_list(N)),
+			     {ok,#file_info{size=Size}}=
+				 file:read_file_info(FN++atom_to_list(N))
+		     end,
+		     RemoteNodes),
+    %% Now we wish to see that we get an incomplete if we try to fetch to a
+    %% directory that does not exist.
+    ?l FetchToErrorDir=filename:join([PrivDir,nonexistingingdir]),
+    ?l {ok,NodeResults2}=inviso:fetch_log(RemoteNodes,FetchToErrorDir,"p1"),
+    ?l io:format("NodeResults2:~w~n",[NodeResults2]),
+    ?l true=check_noderesults(RemoteNodes,
+			      fun({_,{incomplete,_}}) ->
+				      true;
+				 (_)->
+				      false
+			      end,
+			      NodeResults2),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+fetch_log_dist_trace_2(suite) -> [];
+fetch_log_dist_trace_2(doc) ->
+    [""];
+fetch_log_dist_trace_2(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+
+    {H,M,S}=time(),
+    ?l Name="wrap"++integer_to_list(H)++"_"++integer_to_list(M)++"_"++integer_to_list(S),
+    ?l BaseName=filename:join(PrivDir,Name),
+    Fun=fun(N)->{N,[{trace,{file,{BaseName++atom_to_list(N),wrap,".log",512,2}}},
+		    {ti,{file,BaseName++"_ti_"++atom_to_list(N)++".ti"}}]}
+	end,
+    ?l TracerDataList=lists:map(Fun,Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
+    fill_and_reach_two_wrapfiles(PrivDir,"^"++Name,Nodes),
+
+    stop_tracing(Nodes),
+    FetchToDir=filename:join([PrivDir,
+			      "fetch_log_test2_"++integer_to_list(H)++"_"++
+			      integer_to_list(M)++"_"++integer_to_list(S)]),
+    ?l ok=file:make_dir(FetchToDir),
+    ?l {ok,NodeResults}=inviso:fetch_log(RemoteNodes,FetchToDir,"p1"),
+    io:format("~p~n",[NodeResults]),
+    CheckFun=fun({N,{complete,[{trace_log,FileResults1},{ti_log,[{ok,TiFile}]}]}}) ->
+		     Fun2=fun({ok,File}) ->
+				  {match,1,_}=
+				      regexp:first_match(File,
+							 "^"++"p1"++Name++atom_to_list(N)),
+				  true;
+			     (_) ->
+				  false
+			  end,
+		     ?l true=lists:all(Fun2,FileResults1),
+		     ?l TiFile="p1"++Name++"_ti_"++atom_to_list(N)++".ti",
+		     true;
+		(_)->
+		     false
+	     end,
+    ?l true=check_noderesults(RemoteNodes,CheckFun,NodeResults),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+fetch_log_dist_trace_3(suite) -> [];
+fetch_log_dist_trace_3(doc) ->
+    [""];
+fetch_log_dist_trace_3(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+
+    {H,M,S}=time(),
+    ?l Name="wrap2_"++integer_to_list(H)++"_"++integer_to_list(M)++"_"++integer_to_list(S),
+    ?l BaseName=filename:join(PrivDir,Name),
+    Fun=fun(N)->{N,[{trace,{file,{BaseName++atom_to_list(N),wrap,".log",512,2}}},
+		    {ti,{file,BaseName++"_ti_"++atom_to_list(N)++".ti"}}]}
+	end,
+    ?l TracerDataList=lists:map(Fun,Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
+    fill_and_reach_two_wrapfiles(PrivDir,"^"++Name,Nodes),
+
+    stop_tracing(Nodes),
+    FetchToDir=filename:join([PrivDir,
+			      "fetch_log_test3_"++integer_to_list(H)++"_"++
+			      integer_to_list(M)++"_"++integer_to_list(S)]),
+    ?l ok=file:make_dir(FetchToDir),
+    ?l {ok,NodeResults1}=inviso:list_logs(Nodes),
+    CheckFun=fun({N,{ok,[{trace_log,PrivDir2,[F1,F2]},{ti_log,PrivDir2,[F3]}]}})->
+		     PrivDir2=PrivDir,
+		     RegExp="^"++Name++atom_to_list(N)++"[0-9]+"++"\.log",
+		     {match,1,_}=regexp:first_match(F1,RegExp),
+		     {match,1,_}=regexp:first_match(F2,RegExp),
+		     F3=Name++"_ti_"++atom_to_list(N)++".ti",
+		     true;
+		(_) ->
+		     false
+	     end,
+    ?l true=check_noderesults(Nodes,CheckFun,NodeResults1),
+    ?l NodeFileSpecList=lists:map(fun({N,{ok,L}})->{N,L} end,
+				  lists:keydelete(node(),1,NodeResults1)),
+    ?l {ok,NodeResults2}=inviso:fetch_log(NodeFileSpecList,FetchToDir,"p1"),
+io:format("~p~n",[NodeResults2]),
+    CheckFun2=fun({N,{complete,[{trace_log,FileResults1},{ti_log,[{ok,TiFile}]}]}}) ->
+		     Fun2=fun({ok,File}) ->
+				  {match,1,_}=
+				      regexp:first_match(File,
+							 "^"++"p1"++Name++atom_to_list(N)),
+				  true;
+			     (_) ->
+				  false
+			  end,
+		     ?l true=lists:all(Fun2,FileResults1),
+		     ?l TiFile="p1"++Name++"_ti_"++atom_to_list(N)++".ti",
+		     true;
+		(_)->
+		     false
+	     end,
+    ?l true=check_noderesults(RemoteNodes,CheckFun2,NodeResults2),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+fetch_log_dist_error_1(suite) -> [];
+fetch_log_dist_error_1(doc) ->
+    [""];
+fetch_log_dist_error_1(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    ?l {ok,_Pid}=inviso:start(),             % Start a control component.
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    ?l {ok,NodeResults2}=inviso:fetch_log(RemoteNodes,"foo","bar"),
+io:format("~p~n",[NodeResults2]),
+    ?l true=check_noderesults(RemoteNodes,
+			      fun({_N,{error,no_tracerdata}})->true;
+				 (_)->false
+			      end,
+			      NodeResults2),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+fetch_log_dist_error_2(suite) -> [];
+fetch_log_dist_error_2(doc) ->
+    [""];
+fetch_log_dist_error_2(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    ?l {ok,_Pid}=inviso:start(),             % Start a control component.
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    ?l NodeLogList=lists:map(fun(N)->{N,[{trace_log,
+					  PrivDir,
+					  ["f1,fil","f2.fil"]},
+					 {ti_log,
+					  PrivDir,
+					  ["f.ti"]}]}
+			     end,
+			     RemoteNodes),
+    ?l {ok,NodeResults2}=inviso:fetch_log(NodeLogList,"foo","bar"),
+    io:format("~p~n",[NodeResults2]),
+    ?l true=check_noderesults(RemoteNodes,
+			      fun({_N,{incomplete,_}}) ->
+				      true;
+				 (_) ->
+				      false
+			      end,
+			      NodeResults2),
+    ?l NodeTracerData=lists:map(fun(N)->{N,
+					 [{trace,{file,filename:join(PrivDir,"foo")}},
+					  {ti,{file,filename:join(PrivDir,"bar.ti")}}]}
+				end,
+				RemoteNodes),
+    {ok,NodeResults3}=inviso:fetch_log(NodeTracerData,"foo","bar"),
+    io:format("~p~n",[NodeResults3]),
+%% This should work this way. Now it says complete [], which is not entirely
+%% incorrect. But to follow the sematics of when fetching named files should
+%% say incomplete.
+%% Must do some rework to make that work. No real danger leaving it this way
+%% for now.
+%    ?l true=check_noderesults(RemoteNodes,
+%			      fun({_N,{incomplete,_}}) ->
+%				      true;
+%				 (_) ->
+%				      false
+%			      end,
+%			      NodeResults3),
+    stop(Nodes),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: This case tests that the log file merger merges files in the
+%% correct order, based on the timestamps.
+lfm_trace_dist_1(suite) -> [];
+lfm_trace_dist_1(doc) ->
+    [""];
+lfm_trace_dist_1(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    [RNode1,RNode2|_]=RemoteNodes,
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=
+	lists:map(fun(N)->{N,{file,filename:join([PrivDir,"lfm1_"++atom_to_list(N)])}} end,
+		  Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
+    activate_local_tracing(Nodes),
+    activate_traceflags(Nodes),
+
+    {inviso_test_proc,RNode2} ! {apply,code,which,[lists]},
+    timer:sleep(300),
+    {inviso_test_proc,RNode1} ! {apply,code,which,[lists]},
+    timer:sleep(300),
+    {inviso_test_proc,RNode1} ! {apply,code,which,[lists]},
+    timer:sleep(300),
+    inviso_test_proc ! {apply,code,which,[lists]},
+    timer:sleep(300),
+    {inviso_test_proc,RNode2} ! {apply,code,which,[lists]},
+    timer:sleep(300),
+    inviso_test_proc ! {apply,code,which,[lists]},
+
+    deactivate_traceflags(Nodes),
+    deactivate_local_tracing(Nodes),
+    stop_tracing(Nodes),
+    stop(Nodes),
+
+    DestFile=filename:join(PrivDir,"lfm1_out.txt"),
+    ?l {ok,6}=
+	inviso_lfm:merge([{node(),
+			   [{trace_log,
+			     [filename:join(PrivDir,"lfm1_"++atom_to_list(node()))]}]},
+			  {RNode1,
+			   [{trace_log,
+			     [filename:join(PrivDir,"lfm1_"++atom_to_list(RNode1))]}]},
+			  {RNode2,
+			   [{trace_log,
+			     [filename:join(PrivDir,"lfm1_"++atom_to_list(RNode2))]}]}],
+			 DestFile),
+    ?l {ok,FD}=file:open(DestFile,[read]),
+    ?l S1=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(RNode2),S1),
+    ?l S2=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(RNode1),S2),
+    ?l S3=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(RNode1),S3),
+    ?l S4=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(node()),S4),
+    ?l S5=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(RNode2),S5),
+    ?l S6=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(node()),S6),
+    ?l file:close(FD),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: Testing to the full extent that pid-mappings work with both
+%% local and global registration. Also checks that pidmappings can be removed
+%% and that consequently the mappings in the resulting merged file stops.
+lfm_trace_ti_dist_2(suite) -> [];
+lfm_trace_ti_dist_2(doc) ->
+    [""];
+lfm_trace_ti_dist_2(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    [RNode1,RNode2|_]=RemoteNodes,
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=
+	lists:map(fun(N)->{N,[{trace,{file,filename:join(PrivDir,"lfm2_"++atom_to_list(N))}},
+			      {ti,{file,filename:join(PrivDir,"lfm2_ti_"++atom_to_list(N))}}]}
+		  end,
+		  Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok},{ti_log,ok}]}),
+    activate_local_tracing(Nodes),
+    activate_meta_tracing(Nodes),
+    activate_traceflags(Nodes),
+
+    {inviso_test_proc,RNode2} ! {apply,code,which,[lists]},
+    timer:sleep(300),
+    {inviso_test_proc,RNode1} ! {apply,code,which,[lists]},
+    timer:sleep(300),
+    {inviso_test_proc,RNode1} ! {apply,code,which,[lists]},
+    timer:sleep(300),
+    inviso_test_proc ! {apply,code,which,[lists]},
+    timer:sleep(300),
+
+    P2=spawn(RNode2,?MODULE,test_proc_loop,[]),
+    P1=spawn(RNode1,?MODULE,test_proc_loop,[]),
+    P0=spawn_link(?MODULE,test_proc_loop,[]),
+    ThisNode=node(),
+    ?l {ok,[{ThisNode,{ok,[1]}}]}=inviso:tf([node()],P0,[call,timestamp]),
+    ?l {ok,[{RNode1,{ok,[1]}}]}=inviso:tf([RNode1],P1,[call,timestamp]),
+    ?l {ok,[{RNode2,{ok,[1]}}]}=inviso:tf([RNode2],P2,[call,timestamp]),
+    P2 ! {apply,code,which,[lists]},
+    timer:sleep(300),
+    P1 ! {apply,code,which,[lists]},
+    timer:sleep(300),
+    P0 ! {apply,code,which,[lists]},
+    timer:sleep(300),
+
+    P3=spawn(RNode2,?MODULE,test_proc_loop,[]),
+    ?l yes=global:register_name(inviso_test_proc_globalname,P3),
+    ?l {ok,[{RNode2,{ok,[1]}}]}=inviso:tf([RNode2],P3,[call,timestamp]),
+    timer:sleep(300),
+    P3 ! {apply,code,which,[lists]},
+    timer:sleep(300),
+
+    P4=rpc:call(RNode1,erlang,whereis,[inviso_test_proc]),
+    ?l true=rpc:call(RNode1,erlang,unregister,[inviso_test_proc]),
+    timer:sleep(300),
+    P4 ! {apply,code,which,[lists]},
+    timer:sleep(300),
+
+    ?l true=rpc:call(RNode1,erlang,register,[inviso_test_proc,P4]),
+
+    ?l global:unregister_name(inviso_test_proc_globalname),
+    timer:sleep(300),
+    ?l P3 ! {apply,code,which,[lists]},
+    timer:sleep(300),
+
+    deactivate_traceflags(Nodes),
+    deactivate_local_tracing(Nodes),
+    stop_tracing(Nodes),
+    stop(Nodes),
+
+    DestFile=filename:join(PrivDir,"lfm2_out.txt"),
+    ?l {ok,10}=
+	inviso_lfm:merge([
+			  {node(),
+			   [{trace_log,
+			     [filename:join(PrivDir,"lfm2_"++atom_to_list(node()))]},
+			    {ti_log,
+			     [filename:join(PrivDir,"lfm2_ti_"++atom_to_list(node()))]}]},
+			  {RNode1,
+			   [{trace_log,
+			     [filename:join(PrivDir,"lfm2_"++atom_to_list(RNode1))]},
+			    {ti_log,
+			     [filename:join(PrivDir,"lfm2_ti_"++atom_to_list(RNode1))]}]},
+			  {RNode2,
+			   [{trace_log,
+			     [filename:join(PrivDir,"lfm2_"++atom_to_list(RNode2))]},
+			    {ti_log,
+			     [filename:join(PrivDir,"lfm2_ti_"++atom_to_list(RNode2))]}]}
+			 ],
+			 DestFile),
+    ?l {ok,FD}=file:open(DestFile,[read]),
+    ?l S1=io:get_line(FD,""),
+io:format("S1 is:~p~n",[S1]),
+    ?l true=lists:prefix(atom_to_list(RNode2)++" [inviso_test_proc",S1),
+    ?l S2=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(RNode1)++" [inviso_test_proc",S2),
+    ?l S3=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(RNode1)++" [inviso_test_proc",S3),
+    ?l S4=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(node())++" [inviso_test_proc",S4),
+    ?l S5=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(RNode2)++" []",S5),
+    ?l S6=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(RNode1)++" []",S6),
+    ?l S7=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(node())++" []",S7),
+    ?l S8=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(RNode2)++" [{global,inviso_test_proc_globalname}]",S8),
+    ?l S9=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(RNode1)++" []",S9),
+    ?l S10=io:get_line(FD,""),
+    ?l true=lists:prefix(atom_to_list(RNode2)++" []",S10),
+    ?l file:close(FD),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: This tests that the wrapset sorter works.
+handle_logfile_sort_wrapset(suite) -> [];
+handle_logfile_sort_wrapset(doc) ->
+    [""];
+handle_logfile_sort_wrapset(Config) when is_list(Config) ->
+    File0="prefix10.fil",
+    File1="prefix11.fil",
+    File2="prefix12.fil",
+    File3="prefix13.fil",
+    ?l [File0,File1,File2,File3]=
+	inviso_lfm_tpfreader:handle_logfile_sort_wrapset([File2,File1,File0,File3]),
+    File5="prefix15.fil",
+    ?l [File5,File0,File1,File2,File3]=
+	inviso_lfm_tpfreader:handle_logfile_sort_wrapset([File2,File5,File1,File0,File3]),
+    ok.
+%% -----------------------------------------------------------------------------
+
+%% TEST CASE: This case tests that the regexp mechanism in the inviso_rt_lib can
+%% find modules using regexps and that its only_loaded mechanism works.
+%% This test case can not be run when using cover because cover will make the
+%% modules no longer loaded from the path containing "runtime_tools".
+expand_regexp_dist_1(suite) -> [];
+expand_regexp_dist_1(doc) ->
+    [""];
+expand_regexp_dist_1(Config) when is_list(Config) ->
+    case ?t:is_cover() of
+	true ->
+	    {skip,"Cover is running"};
+	false ->
+	    expand_regexp_dist_1_nocover(Config)
+    end.
+
+expand_regexp_dist_1_nocover(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    [RNode1|_]=RemoteNodes,
+    ?l NodeResults1=inviso_rt_lib:expand_regexp(Nodes,"^inviso_rt.*",[]),
+    ?l L1=length(Nodes),
+    ?l L1=length(NodeResults1),
+    ?l true=lists:all(fun({_,Mods})->
+			      ?l 3=length(Mods),
+			      ?l true=lists:member(inviso_rt,Mods),
+			      ?l true=lists:member(inviso_rt_lib,Mods),
+			      ?l true=lists:member(inviso_rt_meta,Mods),
+			      true;
+			 (_) ->
+			      false
+		      end,
+		      NodeResults1),
+    %% Check the dir-option. In the following inviso_tool_lib shall not be found.
+    ?l NodeResults2=inviso_rt_lib:expand_regexp(Nodes,"runtime_tools","invi.*lib.*",[]),
+?l io:format("NodeResults2:~w~n",[NodeResults2]),
+    ?l L1=length(NodeResults2),          % Same number of nodes replying.
+    ?l true=lists:all(fun({_,Mods})->
+			      2=length(Mods),
+			      true=lists:member(inviso_as_lib,Mods),
+			      true=lists:member(inviso_rt_lib,Mods),
+			      true;
+			 (_) ->
+			      false
+		      end,
+		      NodeResults2),
+    ?l [{RNode1,[]}]=
+	inviso_rt_lib:expand_regexp([RNode1],"^inviso_testmodule1.*",[only_loaded]),
+    ?l [{RNode1,[inviso_testmodule1_foo]}]=
+	inviso_rt_lib:expand_regexp([RNode1],"^inviso_testmodule1.*",[]),
+    ok.
+%% -----------------------------------------------------------------------------
+
+
+only_loaded_dist_1(suite) -> [];
+only_loaded_dist_1(doc) ->
+    [""];
+only_loaded_dist_1(Config) when is_list(Config) ->
+    RemoteNodes=get_remotenodes_config(Config),
+    Nodes=[node()|RemoteNodes],
+    [RNode1|_]=RemoteNodes,
+    PrivDir=filename:join(?config(priv_dir,Config),""),
+    TracerDataList=
+	lists:map(fun(N)->{N,[{trace,{file,filename:join(PrivDir,"ol_1_"++atom_to_list(N))}}]}
+		  end,
+		  Nodes),
+    start_and_init_tracing2(Nodes,[],TracerDataList,{ok,[{trace_log,ok}]}),
+    ?l false=rpc:call(RNode1,erlang,module_loaded,[inviso_testmodule1_foo]),
+    ?l {ok,[{RNode1,{ok,[0]}}]}=
+	inviso:tpl([RNode1],inviso_testmodule1_foo,'_','_',[],[only_loaded]),
+    ?l false=rpc:call(RNode1,erlang,module_loaded,[inviso_testmodule1_foo]),
+    ?l {ok,[{RNode1,{ok,[3]}}]}=
+	inviso:tpl([RNode1],inviso_testmodule1_foo,'_','_',[],[]),
+    stop_tracing(Nodes),
+    stop(Nodes),
+    ok.
+
+
+%% ==============================================================================
+%% Common functions setting up inviso.
+%% ==============================================================================
+
+%% Starts controlcomponent and adds runtime components on the nodes specified.
+%% Also initiates tracing on the nodes.
+start_and_init_tracing1(Nodes,Options,TracerData,Reply) when is_list(Nodes) ->
+    ?l {ok,_Pid}=inviso:start(),             % Start a control component.
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,Options),
+    io:format("~p~n",[NodeResults1]),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    ?l {ok,NodeResults2}=inviso:get_status(Nodes),
+    ?l true=check_noderesults(Nodes,{ok,{new,running}},NodeResults2),
+    ?l {ok,NodeResults3}=inviso:init_tracing(Nodes,TracerData),
+    ?l true=check_noderesults(Nodes,Reply,NodeResults3),
+    ok.
+start_and_init_tracing2(Nodes,Options,TracerDataList,Reply) ->
+    ?l {ok,_Pid}=inviso:start(),             % Start a control component.
+    ?l {ok,NodeResults1}=inviso:add_nodes(Nodes,a_ref,Options),
+    io:format("~p~n",[NodeResults1]),
+    ?l true=check_noderesults(Nodes,{ok,new},NodeResults1),
+    ?l {ok,NodeResults2}=inviso:get_status(Nodes),
+    ?l true=check_noderesults(Nodes,{ok,{new,running}},NodeResults2),
+    ?l {ok,NodeResults4}=inviso:get_tracerdata(Nodes),
+    ?l true=check_noderesults(Nodes,{ok,no_tracerdata},NodeResults4),
+    ?l {ok,NodeResults3}=inviso:init_tracing(TracerDataList),
+    io:format("Tracerdatalist:~p~n",[TracerDataList]),
+    ?l true=check_noderesults(Nodes,Reply,NodeResults3),
+
+    ?l Fun1=fun({N,{ok,TD}}) when is_list(TD)->
+		    ?l {value,{trace,Trace}}=lists:keysearch(trace,1,TD),
+		    ?l {value,{N,TD2}}=lists:keysearch(N,1,TracerDataList),
+		    ?l true=lists:member({trace,Trace},TD2),
+		    %% Check that the trace file really exists.
+		    ?l case Trace of % Trace={file,FilePortParameters}
+			   {file,FileName1} when is_list(FileName1) ->
+			       ?l {ok,_}=rpc:call(N,file,read_file_info,[FileName1]);
+			   _ ->              % This should be extended with more cases.
+			       true
+		       end,
+		    ?l case lists:keysearch(ti,1,TD2) of
+			   {value,{_,Ti}} -> % Ok, we have ti too.
+			       ?l {value,{_,Ti}}=lists:keysearch(ti,1,TD),
+			       ?l FileName2=element(2,Ti),
+			       ?l {ok,_}=rpc:call(N,file,read_file_info,[FileName2]),
+			       true;
+			   false ->          % No ti, we are done now.
+			       true
+		       end;
+	       ({N,{ok,{file,FileName}}}) ->
+		    ?l {value,{N,{file,FileName}}}=lists:keysearch(N,1,TracerDataList),
+		    ?l {ok,_}=rpc:call(N,file,read_file_info,[FileName]),
+		    true;
+	       ({N,{ok,LogTD}}) ->           % The case using a fun.
+		    ?l {value,{N,LogTD}}=lists:keysearch(N,1,TracerDataList),
+		    true
+	    end,
+    ?l {ok,NodeResults5}=inviso:get_tracerdata(Nodes),
+    ?l true=check_noderesults(Nodes,Fun1,NodeResults5),
+    ok.
+%% ------------------------------------------------------------------------------
+
+%% Stops tracing on Nodes.
+stop_tracing(Nodes) when is_list(Nodes) ->
+    ?l {ok,NodeResults1}=inviso:stop_tracing(Nodes),
+    ?l true=check_noderesults(Nodes,{ok,idle},NodeResults1),
+    ?l {ok,NodeResults2}=inviso:get_status(Nodes),
+    ?l true=check_noderesults(Nodes,{ok,{idle,running}},NodeResults2),
+    %% The implementation says that the meta tracer shall be stopped when
+    %% tracing is stopped. Check that.
+    ?l lists:foreach(fun(N)->
+			     ok=poll(erlang,whereis,[inviso_rt_meta],undefined,20)
+		     end,
+		     Nodes).
+%% ------------------------------------------------------------------------------
+
+%% Stops the runtime components on Nodes and stops the control component at this
+%% Erlang node.
+stop(Nodes) when is_list(Nodes) ->
+    ?l true=check_on_nodes(Nodes,erlang,whereis,[inviso_rt],fun(P) when is_pid(P)->true end),
+    ?l {ok,NodeResults}=inviso:stop_nodes(Nodes),
+    ?l true=check_noderesults(Nodes,ok,NodeResults),
+    ?l true=check_on_nodes(Nodes,erlang,whereis,[inviso_rt],fun(undefined)->true end),
+    ?l true=is_pid(whereis(inviso_c)),
+    ?l shutdown=inviso:stop(),
+    ?l ok=poll(erlang,whereis,[inviso_c],undefined,20).
+%% ------------------------------------------------------------------------------
+
+%% Help function activating local tracing.
+activate_local_tracing(Nodes) when is_list(Nodes) ->
+    ?l true=check_on_nodes(Nodes,
+			   erlang,
+			   trace_info,
+			   [{code,which,1},traced],
+			   {traced,false}),
+    ?l {ok,NodeResults}=inviso:tpl(Nodes,code,which,1,[]),
+    ?l true=check_noderesults(Nodes,fun({_,{ok,[1]}})->true end,NodeResults),
+    ?l true=check_on_nodes(Nodes,
+			   erlang,
+			   trace_info,
+			   [{code,which,1},traced],
+			   {traced,local}).
+%% ------------------------------------------------------------------------------
+
+%% Help function activating global tracing.
+activate_global_tracing(Nodes) when is_list(Nodes) ->
+    ?l true=check_on_nodes(Nodes,
+			   erlang,
+			   trace_info,
+			   [{code,get_path,0},traced],
+			   {traced,false}),
+    ?l {ok,NodeResults}=inviso:tp(Nodes,code,get_path,0,[]),
+    ?l true=check_noderesults(Nodes,fun({_,{ok,[1]}})->true end,NodeResults),
+    ?l true=check_on_nodes(Nodes,
+			   erlang,
+			   trace_info,
+			   [{code,get_path,0},traced],
+			   {traced,global}).
+%% ------------------------------------------------------------------------------
+
+
+%% Help function activating local tracing and using a regexp to point out modules.
+%% Returns the structure of modules and functions that were activated. Must be used
+%% when deactivating.
+activate_global_tracing_regexp(Nodes) when is_list(Nodes) ->
+    %% First find out which modules will be effected.
+    ?l Mods1=inviso_rt_lib:expand_regexp("application.*",[]),
+    ?l true=(length(Mods1)>1),                % Should find more than one module!
+    ?l Funcs1=lists:foldl(fun(M,Acc)->[{M,M:module_info(exports)}|Acc] end,[],Mods1),
+    %% Check that these functions are not traced.
+    io:format("Modules:~w~n",[Mods1]),
+    ?l {ok,NodeResults}=inviso:tp(Nodes,"application.*",'_','_',[],[]),
+    io:format("Here 2~w~n",[NodeResults]),
+    ?l N=lists:foldl(fun({_,L1},A1)->lists:foldl(fun(_,A2)->A2+1 end,A1,L1) end,0,Funcs1),
+    ?l true=check_noderesults(Nodes,fun({_,{ok,L}})-> N==lists:sum(L) end,NodeResults),
+    io:format("Here 3~n",[]),
+    %% Check again!
+    ?l lists:foreach(fun({M,Funcs})->
+			     lists:foreach(fun({F,Arity})->
+						   true=check_on_nodes(Nodes,
+								       erlang,
+								       trace_info,
+								       [{M,F,Arity},traced],
+								       {traced,global})
+					   end,
+					   Funcs)
+		     end,
+		     Funcs1),
+    Funcs1.
+%% ------------------------------------------------------------------------------
+
+%% Help function as above but uses the dir feature as well.
+activate_global_tracing_regexp_dir(Nodes) when is_list(Nodes) ->
+    %% First find out which modules will be effected.
+    ?l Mods1=inviso_rt_lib:expand_regexp(".*kernel.*","application.*",[]),
+    ?l true=(length(Mods1)>1),                % Should find more than one module!
+    ?l Funcs1=lists:foldl(fun(M,Acc)->[{M,M:module_info(exports)}|Acc] end,[],Mods1),
+    %% Check that these functions are not traced.
+    io:format("Modules:~w~n",[Mods1]),
+    ?l {ok,NodeResults}=inviso:tp(Nodes,{".*kernel.*","application.*"},'_','_',[],[]),
+    io:format("Here 2~w~n",[NodeResults]),
+    ?l N=lists:foldl(fun({_,L1},A1)->lists:foldl(fun(_,A2)->A2+1 end,A1,L1) end,0,Funcs1),
+    ?l true=check_noderesults(Nodes,fun({_,{ok,L}})-> N==lists:sum(L) end,NodeResults),
+    io:format("Here 3~n",[]),
+    %% Check again!
+    ?l lists:foreach(fun({M,Funcs})->
+			     lists:foreach(fun({F,Arity})->
+						   true=check_on_nodes(Nodes,
+								       erlang,
+								       trace_info,
+								       [{M,F,Arity},traced],
+								       {traced,global})
+					   end,
+					   Funcs)
+		     end,
+		     Funcs1),
+    Funcs1.
+%% ------------------------------------------------------------------------------
+
+deactivate_local_tracing(Nodes) when is_list(Nodes) ->
+    ?l true=check_on_nodes(Nodes,
+			   erlang,
+			   trace_info,
+			   [{code,which,1},traced],
+			   {traced,local}),
+    ?l {ok,NodeResults}=inviso:ctpl(Nodes,code,'_','_'),
+    ?l true=check_noderesults(Nodes,fun({_,{ok,[N]}})when is_integer(N)->true end,NodeResults),
+    ?l true=check_on_nodes(Nodes,
+			   erlang,
+			   trace_info,
+			   [{code,which,1},traced],
+			   {traced,false}).
+%% ------------------------------------------------------------------------------
+
+deactivate_global_tracing(Nodes) when is_list(Nodes) ->
+    ?l true=check_on_nodes(Nodes,
+			   erlang,
+			   trace_info,
+			   [{code,get_path,0},traced],
+			   {traced,global}),
+    ?l {ok,NodeResults}=inviso:ctp(Nodes,code,'_','_'),
+    ?l true=check_noderesults(Nodes,fun({_,{ok,[N]}})when is_integer(N)->true end,NodeResults),
+    ?l true=check_on_nodes(Nodes,
+			   erlang,
+			   trace_info,
+			   [{code,get_path,0},traced],
+			   {traced,false}).
+%% ------------------------------------------------------------------------------
+
+
+%% Function deactivating the functions activated by activate_global_tracing_regexp/1.
+deactivate_global_tracing_regexp(Nodes,Funcs1) ->
+    ?l lists:foreach(fun({M,Funcs})->
+			     lists:foreach(fun({F,Arity})->
+						   true=check_on_nodes(Nodes,
+								       erlang,
+								       trace_info,
+								       [{M,F,Arity},traced],
+								       {traced,global})
+					   end,
+					   Funcs)
+		     end,
+		     Funcs1),
+    ?l {ok,NodeResults}=inviso:ctp(Nodes,"application.*",'_','_'),
+    ?l N=lists:foldl(fun({_,L1},A1)->lists:foldl(fun(_,A2)->A2+1 end,A1,L1) end,0,Funcs1),
+    io:format("Noderesult from deactivate;~w~n",[NodeResults]),
+    ?l true=check_noderesults(Nodes,fun({_,{ok,L}})-> N==lists:sum(L) end,NodeResults),
+    ?l lists:foreach(fun({M,Funcs})->
+			     lists:foreach(fun({F,Arity})->
+						   true=check_on_nodes(Nodes,
+								       erlang,
+								       trace_info,
+								       [{M,F,Arity},traced],
+								       {traced,false})
+					   end,
+					   Funcs)
+		     end,
+		     Funcs1).
+%% ------------------------------------------------------------------------------
+
+%% Function deactivating the functions activated by activate_global_tracing_regexp_dir/1.
+deactivate_global_tracing_regexp_dir(Nodes,Funcs1) ->
+    ?l lists:foreach(fun({M,Funcs})->
+			     lists:foreach(fun({F,Arity})->
+						   true=check_on_nodes(Nodes,
+								       erlang,
+								       trace_info,
+								       [{M,F,Arity},traced],
+								       {traced,global})
+					   end,
+					   Funcs)
+		     end,
+		     Funcs1),
+    ?l {ok,NodeResults}=inviso:ctp(Nodes,{".*kernel.*","application.*"},'_','_'),
+    ?l N=lists:foldl(fun({_,L1},A1)->lists:foldl(fun(_,A2)->A2+1 end,A1,L1) end,0,Funcs1),
+    io:format("Noderesult from deactivate;~w~n",[NodeResults]),
+    ?l true=check_noderesults(Nodes,fun({_,{ok,L}})-> N==lists:sum(L) end,NodeResults),
+    ?l lists:foreach(fun({M,Funcs})->
+			     lists:foreach(fun({F,Arity})->
+						   true=check_on_nodes(Nodes,
+								       erlang,
+								       trace_info,
+								       [{M,F,Arity},traced],
+								       {traced,false})
+					   end,
+					   Funcs)
+		     end,
+		     Funcs1).
+%% ------------------------------------------------------------------------------
+
+%% Help function which starts the inviso_test_proc on all nodes and then sets
+%% the call flag on that process.
+activate_traceflags(Nodes) ->
+    ?l lists:foreach(fun(N)->spawn(N,?MODULE,test_proc_init,[]) end,Nodes),
+    ?l lists:foreach(fun(N)->
+			     P=rpc:call(N,erlang,whereis,[inviso_test_proc]),
+			     {flags,[]}=rpc:call(N,erlang,trace_info,[P,flags])
+		     end,
+		     Nodes),
+    ?l {ok,NodeResults}=inviso:tf(Nodes,inviso_test_proc,[call,timestamp]),
+    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults),
+    ?l lists:foreach(fun(N)->
+			     P=rpc:call(N,erlang,whereis,[inviso_test_proc]),
+			     {flags,Flags}=rpc:call(N,erlang,trace_info,[P,flags]),
+			     true=lists:member(call,Flags),
+			     true=lists:member(timestamp,Flags)
+		     end,
+		     Nodes),
+    %% Now try a globally registered process.
+    ?l [ANode|_]=Nodes,
+    ?l GPid=spawn(ANode,?MODULE,global_test_proc_init,[]),
+    ?l ok=poll(global,whereis_name,[global_inviso_test_proc],
+	       fun(P) when is_pid(P)->true;(_)->false end,
+	       10),
+    ?l {ok,NodeResults2}=
+	inviso:tf(Nodes,{global,global_inviso_test_proc},[call,timestamp]),
+    ?l true=check_noderesults(Nodes,
+			      fun({N,{ok,[1]}}) when N==ANode->true;
+				 ({_,{ok,[0]}})->true;
+				 (_)->false
+			      end,
+			      NodeResults2),
+    ?l {flags,Flags2}=rpc:call(ANode,erlang,trace_info,[GPid,flags]),
+    ?l 2=length(Flags2),
+    ?l true=lists:member(call,Flags2),
+    ?l true=lists:member(timestamp,Flags2),
+    true.
+%% ------------------------------------------------------------------------------
+
+deactivate_traceflags(Nodes) ->
+    ?l lists:foreach(fun(N)->
+			     P=rpc:call(N,erlang,whereis,[inviso_test_proc]),
+			     {flags,Flags}=rpc:call(N,erlang,trace_info,[P,flags]),
+			     true=lists:member(call,Flags),
+			     true=lists:member(timestamp,Flags)
+		     end,
+		     Nodes),
+    ?l {ok,NodeResults}=inviso:ctf(Nodes,inviso_test_proc,[call,timestamp]),
+    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults),
+    ?l lists:foreach(fun(N)->
+			     P=rpc:call(N,erlang,whereis,[inviso_test_proc]),
+			     {flags,[]}=rpc:call(N,erlang,trace_info,[P,flags])
+		     end,
+		     Nodes),
+    ?l GPid=global:whereis_name(global_inviso_test_proc),
+    ?l ANode=node(GPid),
+    ?l {flags,Flags2}=rpc:call(ANode,erlang,trace_info,[GPid,flags]),
+    ?l 2=length(Flags2),
+    ?l {ok,NodeResults2}=inviso:ctf(Nodes,{global,global_inviso_test_proc},[call,timestamp]),
+    ?l true=check_noderesults(Nodes,
+			      fun({N,{ok,[1]}}) when N==ANode->true;
+				 ({_,{ok,[0]}})->true;
+				 (_)->false
+			      end,
+			      NodeResults2).
+%% ------------------------------------------------------------------------------
+
+
+activate_meta_tracing(Nodes) ->
+    ?l {ok,NodeResults1}=inviso:tpm_localnames(),
+    ?l true=check_noderesults(Nodes,{{ok,1},{ok,1}},NodeResults1),
+    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
+			     {meta,P}=rpc:call(N,erlang,trace_info,[{erlang,register,2},meta])
+		     end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
+			     {meta,P}=rpc:call(N,erlang,trace_info,[{erlang,unregister,1},meta])
+		     end,
+		     Nodes),
+    ?l {ok,NodeResults2}=inviso:tpm_globalnames(),
+    ?l true=check_noderesults(Nodes,{{ok,1},{ok,1}},NodeResults2),
+    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
+			     {meta,P}=rpc:call(N,
+					       erlang,
+					       trace_info,
+					       [{global,handle_call,3},meta])
+		     end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
+			     {meta,P}=rpc:call(N,
+					       erlang,
+					       trace_info,
+					       [{global,delete_global_name,2},meta])
+		     end,
+		     Nodes),
+
+    ?l lists:foreach(fun(N)->true=rpc:call(N,
+					   ets,
+					   insert,
+					   [inviso_sideeffect_tab,{tpm_init_func1,0}]),
+			     true=rpc:call(N,
+					   ets,
+					   insert,
+					   [inviso_sideeffect_tab,{tpm_call_func1,0}]),
+			     true=rpc:call(N,
+					   ets,
+					   insert,
+					   [inviso_sideeffect_tab,{tpm_return_func1,0}])
+		     end,
+		     Nodes),
+    ?l {ok,NodeResults3}=
+	inviso:init_tpm(lists,
+			module_info,
+			0,
+			{?MODULE,tpm_init_func1},
+			{?MODULE,tpm_call_func1},
+			{?MODULE,tpm_return_func1},
+			{?MODULE,tpm_remove_func1}),
+    ?l true=check_noderesults(Nodes,ok,NodeResults3),
+    ?l [{_,1}]=ets:lookup(inviso_sideeffect_tab,tpm_init_func1),
+    ?l {ok,NodeResults3a}=
+	inviso:init_tpm(lists,
+			module_info,
+			0,
+			{?MODULE,tpm_init_func1},
+			{?MODULE,tpm_call_func1},
+			{?MODULE,tpm_return_func1},
+			{?MODULE,tpm_remove_func1}),
+    ?l true=check_noderesults(Nodes,{error,already_initiated},NodeResults3a),
+%    %% Try more forbidden things. Wildcards not allowed in meta tracing!
+%    ?l {ok,NodeResults3b}=inviso:tpm(Nodes,lists,'_',0,[{'_',[],[{return_trace}]}]),
+%    io:format("The noderesults3b is:~w~n",[NodeResults3b]),
+%    ?l true=check_noderesults(Nodes,{error,bad_mfa},NodeResults3b),
+    ?l {ok,NodeResults3c}=inviso:tpm(Nodes,lists,module_info,0,[{'_',[],[{return_trace}]}]),
+    ?l true=check_noderesults(Nodes,{ok,1},NodeResults3c),
+    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
+			     {meta,P}=rpc:call(N,erlang,trace_info,[{lists,module_info,0},meta])
+		     end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->rpc:call(N,lists,module_info,[]) end,Nodes),
+    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_call_func1],[{tpm_call_func1,1}],20),
+    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_return_func1],[{tpm_return_func1,1}],20),
+    ?l lists:foreach(fun(N)->rpc:call(N,lists,module_info,[]) end,Nodes),
+    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_call_func1],[{tpm_call_func1,2}],20),
+    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_return_func1],[{tpm_return_func1,2}],20),
+
+    ?l {ok,NodeResults4}=
+	inviso:init_tpm(math,
+			module_info,
+			1,
+			{?MODULE,tpm_init_func2}, % Does not exist on purpose.
+			{?MODULE,tpm_call_func2}, % Does not exist on purpose.
+			{?MODULE,tpm_return_func2}, % Does not exist on purpose.
+			{?MODULE,tpm_remove_func2}), % Does not exist on purpose.
+    ?l true=check_noderesults(Nodes,ok,NodeResults4),
+    ?l {ok,NodeResults5}=
+	inviso:tpm_ms(math,module_info,1,ms1,[{'_',[],[{return_trace}]}]),
+    ?l true=check_noderesults(Nodes,{ok,1},NodeResults5),
+    ?l lists:foreach(fun(N)->{meta_match_spec,[{'_',[],[{return_trace}]}]}=
+				 rpc:call(N,erlang,trace_info,[{math,module_info,1},
+							       meta_match_spec])
+		     end,
+		     Nodes),
+
+    ?l {ok,NodeResults6}=inviso:tpm_ms(math,module_info,1,ms2,[{[exports],[],[]}]),
+    ?l true=check_noderesults(Nodes,{ok,1},NodeResults6),
+    ?l lists:foreach(fun(N)->{meta_match_spec,[{[exports],[],[]},{'_',[],[{return_trace}]}]}=
+				 rpc:call(N,erlang,trace_info,[{math,module_info,1},
+							       meta_match_spec])
+		     end,
+		     Nodes),
+    ?l {ok,NodeResults7}=inviso:tpm_ms(math,module_info,1,ms3,[{[attributes],[],[]}]),
+    ?l true=check_noderesults(Nodes,{ok,1},NodeResults7),
+    ?l lists:foreach(fun(N)->{meta_match_spec,[{[attributes],[],[]},
+					       {[exports],[],[]},
+					       {'_',[],[{return_trace}]}]}=
+				 rpc:call(N,erlang,trace_info,[{math,module_info,1},
+							       meta_match_spec])
+		     end,
+		     Nodes),
+    ?l {ok,NodeResults8}=inviso:ctpm_ms(math,module_info,1,ms2),
+    ?l true=check_noderesults(Nodes,ok,NodeResults8),
+    ?l lists:foreach(fun(N)->{meta_match_spec,[{[attributes],[],[]},
+					       {'_',[],[{return_trace}]}]}=
+				 rpc:call(N,erlang,trace_info,[{math,module_info,1},
+							       meta_match_spec])
+		     end,
+		     Nodes),
+    ?l io:format("whereis:~w~n",[lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_rt_meta]) end,Nodes)]),
+    ?l {ok,NodeResults8}=inviso:ctpm_ms(math,module_info,1,ms3),
+    ?l io:format("whereis:~w~n",[lists:map(fun(N)->rpc:call(N,erlang,whereis,[inviso_rt_meta]) end,Nodes)]),
+    ?l {ok,NodeResults8}=inviso:ctpm_ms(math,module_info,1,ms1),
+    ?l lists:foreach(fun(N)->{meta_match_spec,false}=
+			      rpc:call(N,erlang,trace_info,[{math,module_info,1},
+							    meta_match_spec])
+		     end,
+		     Nodes),
+
+    %% Now try to do this with exception tracing instead.
+    %% Reset the side effect tables.
+    ?l lists:foreach(fun(N)->true=rpc:call(N,
+					   ets,
+					   insert,
+					   [inviso_sideeffect_tab,{tpm_init_func1,0}]),
+			     true=rpc:call(N,
+					   ets,
+					   insert,
+					   [inviso_sideeffect_tab,{tpm_call_func1,0}]),
+			     true=rpc:call(N,
+					   ets,
+					   insert,
+					   [inviso_sideeffect_tab,{tpm_return_func1,0}])
+		     end,
+		     Nodes),
+    ?l {ok,NodeResults9}=
+	inviso:init_tpm(?MODULE,
+			failing_function,
+			1,
+			{?MODULE,tpm_init_func1},
+			{?MODULE,tpm_call_func1},
+			{?MODULE,tpm_return_func1},
+			{?MODULE,tpm_remove_func1}),
+    ?l true=check_noderesults(Nodes,ok,NodeResults9),
+    ?l [{_,1}]=ets:lookup(inviso_sideeffect_tab,tpm_init_func1),
+    ?l {ok,NodeResults10}=inviso:tpm(Nodes,?MODULE,failing_function,1,[{'_',[],[{exception_trace}]}]),
+    ?l true=check_noderesults(Nodes,{ok,1},NodeResults10),
+    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
+			     {meta,P}=rpc:call(N,erlang,trace_info,[{?MODULE,failing_function,1},meta])
+		     end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->rpc:call(N,?MODULE,failing_function,[nofailure]) end,Nodes),
+    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_call_func1],[{tpm_call_func1,1}],20),
+    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_return_func1],[{tpm_return_func1,1}],20),
+    ?l lists:foreach(fun(N)->rpc:call(N,?MODULE,failing_function,[failure]) end,Nodes),
+    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_call_func1],[{tpm_call_func1,2}],20),
+    ?l ok=poll(ets,lookup,[inviso_sideeffect_tab,tpm_return_func1],[{tpm_return_func1,3}],20),
+
+    ok.
+%% ------------------------------------------------------------------------------
+
+%% This function is for testing that appending the tracer to a trace action term
+%% works.
+activate_deactivate_meta_tracing_tracer(Nodes) ->
+    ?l {ok,NodeResults}=
+	inviso:tpm_tracer(Nodes,lists,module_info,0,[{'_',[],[{trace,[all],[call]}]}],void),
+    ?l true=check_noderesults(Nodes,{ok,1},NodeResults),
+    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
+			     {meta,P}=rpc:call(N,erlang,trace_info,[{lists,module_info,0},meta]),
+			     {meta_match_spec,[{'_',[],[{trace,[all],Enable}]}]}=
+				 rpc:call(N,erlang,trace_info,[{lists,module_info,0},
+							       meta_match_spec]),
+			     true=list_search(Enable,fun({{tracer,P}}) when is_port(P)->true;
+							(_) -> false
+						     end)
+		     end,
+		     Nodes),
+    ?l {ok,NodeResults2}=
+	inviso:ctpm(Nodes,lists,module_info,0),
+    ?l true=check_noderesults(Nodes,ok,NodeResults2),
+    ?l lists:foreach(fun(N)->{meta,false}=
+				 rpc:call(N,erlang,trace_info,[{lists,module_info,0},meta])
+		     end,
+		     Nodes),
+    ok.
+%% ------------------------------------------------------------------------------
+
+deactivate_meta_tracing(Nodes) ->
+    ?l lists:foreach(fun(N)->{meta,P}=
+				 rpc:call(N,erlang,trace_info,[{erlang,register,2},meta]),
+			     true=is_pid(P)
+		     end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->{meta,P}=
+				 rpc:call(N,erlang,trace_info,[{erlang,unregister,1},meta]),
+			     true=is_pid(P)
+		     end,
+		     Nodes),
+    ?l {ok,NodeResults1}=inviso:ctpm_localnames(),
+    ?l lists:foreach(fun(N)->{meta,false}=
+				 rpc:call(N,erlang,trace_info,[{erlang,register,2},meta]) end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->{meta,false}=
+				 rpc:call(N,erlang,trace_info,[{erlang,unregister,1},meta])
+		     end,
+		     Nodes),
+    ?l true=check_noderesults(Nodes,{ok,ok},NodeResults1),
+
+    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
+			     {meta,P}=rpc:call(N,
+					       erlang,
+					       trace_info,
+					       [{global,handle_call,3},meta])
+		     end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->P=rpc:call(N,erlang,whereis,[inviso_rt_meta]),
+			     {meta,P}=rpc:call(N,
+					       erlang,
+					       trace_info,
+					       [{global,delete_global_name,2},meta])
+		     end,
+		     Nodes),
+    ?l {ok,NodeResults1b}=inviso:ctpm_globalnames(),
+    ?l true=check_noderesults(Nodes,{ok,ok},NodeResults1b),
+    ?l lists:foreach(fun(N)->
+			     {meta,false}=rpc:call(N,
+						   erlang,
+						   trace_info,
+						   [{global,handle_call,3},meta])
+		     end,
+		     Nodes),
+    ?l lists:foreach(fun(N)->
+			     {meta,false}=rpc:call(N,
+						   erlang,
+						   trace_info,
+						   [{global,delete_global_name,2},meta])
+		     end,
+		     Nodes),
+
+    ?l lists:foreach(fun(N)->{meta,P}=
+				 rpc:call(N,erlang,trace_info,[{lists,module_info,0},meta]),
+			     true=is_pid(P)
+		     end,
+		     Nodes),
+    ?l {ok,NodeResults2}=inviso:ctpm(lists,module_info,0),
+    ?l true=check_noderesults(Nodes,ok,NodeResults2),
+    ?l lists:foreach(fun(N)->{meta,false}=
+				 rpc:call(N,erlang,trace_info,[{lists,module_info,0},meta]) end,
+		     Nodes),
+    ?l [{_,0}]=ets:lookup(inviso_sideeffect_tab,tpm_init_func1),
+    ?l {ok,NodeResults3}=inviso:ctpm(math,module_info,1),
+    ?l true=check_noderesults(Nodes,ok,NodeResults3),
+    ok.
+%% ------------------------------------------------------------------------------
+
+%% Functions acting as callbacks for testing the meta tracing mechanisms.
+tpm_init_func1(_M,_F,_Arity,PublLD) ->
+    ets:update_counter(inviso_sideeffect_tab,tpm_init_func1,1),
+    {ok,PublLD,void}.
+tpm_call_func1(_Pid,{call,_Args,_TS},PublLD) ->
+    ets:update_counter(inviso_sideeffect_tab,tpm_call_func1,1),
+    {ok,PublLD,void}.
+tpm_return_func1(_Pid,{return_from,_ReturnVal,_TS},PublLD) ->
+    ets:update_counter(inviso_sideeffect_tab,tpm_return_func1,1),
+    {ok,PublLD,void};
+tpm_return_func1(_Pid,{exception_from,_ReturnVal,_TS},PublLD) ->
+    ets:update_counter(inviso_sideeffect_tab,tpm_return_func1,1),
+    ets:update_counter(inviso_sideeffect_tab,tpm_return_func1,1),
+    {ok,PublLD,void}.
+tpm_remove_func1(_M,_F,_Arity,PublLD) ->
+    ets:update_counter(inviso_sideeffect_tab,tpm_init_func1,-1),
+    {ok,PublLD}.
+%% ------------------------------------------------------------------------------
+
+
+%% Help function which traces on a function and makes function calls until there
+%% are two files in the wrap-set.
+fill_and_reach_two_wrapfiles(PrivDir,RegExp,Nodes) ->
+    ?l lists:foreach(fun(N)->spawn(N,?MODULE,test_proc_init,[]) end,Nodes),
+    ?l {ok,NodeResults1}=inviso:tpl(Nodes,?MODULE,test_function,0,[]),
+    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults1),
+    ?l {ok,NodeResults2}=inviso:tf(Nodes,inviso_test_proc,[call]),
+    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults2),
+    fill_and_reach_two_wrapfiles_2(PrivDir,RegExp,Nodes),
+    ?l {ok,NodeResults3}=inviso:ctf(Nodes,inviso_test_proc,[call]),
+    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults3),
+    ?l {ok,NodeResults4}=inviso:ctpl(Nodes,?MODULE,test_function,0),
+    ?l true=check_noderesults(Nodes,{ok,[1]},NodeResults4),
+    ok.
+
+fill_and_reach_two_wrapfiles_2(PrivDir,RegExp,[Node|Rest]) ->
+    ?l ok=rpc:call(Node,?MODULE,fill_and_reach_two_wrapfiles_3,[PrivDir,RegExp]),
+    fill_and_reach_two_wrapfiles_2(PrivDir,RegExp,Rest);
+fill_and_reach_two_wrapfiles_2(_,_,[]) ->
+    ok.
+
+fill_and_reach_two_wrapfiles_3(Dir,RegExp) ->
+    ok=send_to_test_proc({apply,?MODULE,test_function,[]},
+			 fun reach_two_wraps_stopfun/1,
+			 {Dir,RegExp++atom_to_list(node())},
+			 100).
+
+%% Help function intended to be used as fun in a send_to_test_proc/4 call.
+%% The function lists the content of Dir and looks for occurancies of String.
+%% If two files containing the string String are found, 'done' is returned.
+%% Otherwise 'continue'.
+reach_two_wraps_stopfun({Dir,RegExp}) ->
+    case file:list_dir(Dir) of
+	{ok,FileNames} ->
+	    case how_many_files_regexp(FileNames,RegExp,0) of
+		{ok,2} ->
+		    done;
+		_ ->
+		    continue
+	    end;
+	{error,_Reason} ->
+	    error
+    end.
+%% ------------------------------------------------------------------------------
+
+%% ------------------------------------------------------------------------------
+%% Help function for the overload tests. These functions are used as callbacks.
+%% ------------------------------------------------------------------------------
+
+overload1(_) ->
+    ets:update_counter(inviso_sideeffect_tab,ovl1,1),
+    ok.
+%% This function is used when timeout occurs inside the runtime component.
+%% That is it is time to check for overload.
+overload2({timeout,overload2i_data}) ->
+    ets:update_counter(inviso_sideeffect_tab,ovl2,1),
+    ok.
+overload2i() ->
+    ets:insert(inviso_sideeffect_tab,{ovl2,0}),
+    {ok,overload2i_data}.
+overload2r(overload2i_data) ->
+    ets:delete(inviso_sideeffect_tab,ovl2).
+
+%% This function is used when timeout occurs inside the runtime component.
+%% That is it is time to check for overload.
+overload3({timeout,overload3i_data}) ->
+    ets:update_counter(inviso_sideeffect_tab,ovl3,1),
+    ok;
+overload3(_) ->                                 % Must handle garbage too.
+    ignore.
+overload3i() ->
+    ets:insert(inviso_sideeffect_tab,{ovl3,0}),
+    {ok,overload3i_data}.
+overload3r(overload3i_data) ->
+    ets:insert(inviso_sideeffect_tab,{ovl3r,done}),
+    ets:delete(inviso_sideeffect_tab,ovl3).
+
+overload4(_) ->
+    case ets:lookup(inviso_sideeffect_tab,ovl4_suspend) of
+	[] ->                                   % We are supposed to be running.
+	    ets:update_counter(inviso_sideeffect_tab,ovl4,1),
+	    ok;
+	[_] ->
+	    {suspend,test}
+    end.
+
+%% This function is used when overload check is done by icomming message.
+overload5({msg,{test_of_loadcheck,overload5i_data}}) ->
+    ets:update_counter(inviso_sideeffect_tab,ovl5,1),
+    ok;
+overload5(_) ->
+    ignore.
+overload5i() ->
+    ets:insert(inviso_sideeffect_tab,{ovl5,0}),
+    {ok,overload5i_data}.
+overload5r(overload5i_data) ->
+    ets:delete(inviso_sideeffect_tab,ovl5),
+    ets:insert(inviso_sideeffect_tab,{ovl5r,done});
+overload5r(X) ->
+    erlang:display({'***',overload5r,X}).
+
+overload6(_) ->
+    ets:update_counter(inviso_sideeffect_tab,ovl6,1),
+    ok.
+%% ------------------------------------------------------------------------------
+
+%% ------------------------------------------------------------------------------
+%% Help function for the subscription tests. These function implements a collector
+%% process which will subscribe to inviso_events from the control component.
+%% ------------------------------------------------------------------------------
+
+%% Function which can be used to check if an inviso_event has arrived. The function
+%% takes a fun which tests the messages.
+check_msg_collector([],_,_) ->
+    true;
+check_msg_collector(_,_,0) ->
+    false;
+check_msg_collector(Nodes,Fun,T) ->
+    Ref=make_ref(),
+    inviso_collector_proc ! {fetch_message,self(),Ref,Fun},
+    receive
+	{inviso,Ref,{true,Node}} ->
+	    check_msg_collector(lists:delete(Node,Nodes),Fun,T-1);
+	{inviso,Ref,false} ->
+	    timer:sleep(100),
+	    check_msg_collector(Nodes,Fun,T-1)
+    end.
+
+%% Spawn on this function to get a subscriber.
+inviso_msg_collector() ->
+    register(inviso_collector_proc,self()),
+    inviso_msg_collector_loop([]).
+
+inviso_msg_collector_loop(Msgs) ->
+    receive
+	{fetch_message,From,Ref,Fun} ->
+	    {NewMsgs,Reply}=inviso_msg_collector_selector(Msgs,Fun,[]),
+	    From ! {inviso,Ref,Reply},
+	    inviso_msg_collector_loop(NewMsgs);
+	Msg ->
+	    inviso_msg_collector_loop([Msg|Msgs])
+    end.
+
+inviso_msg_collector_selector([M|Rest],Fun,Accum) ->
+    case Fun(M) of
+	{true,X} ->
+	    {Rest++Accum,{true,X}};
+	_ ->
+	    inviso_msg_collector_selector(Rest,Fun,[M|Accum])
+    end;
+inviso_msg_collector_selector([],_,Accum) ->
+    {Accum,false}.
+%% ------------------------------------------------------------------------------
+
+
+%% ==============================================================================
+%% Help functions
+%% ==============================================================================
+
+list_search([E|Rest],Fun) ->
+    case Fun(E) of
+	true ->
+	    true;
+	false ->
+	    list_search(Rest,Fun)
+    end;
+list_search([],_Fun) ->
+    false.
+%% ------------------------------------------------------------------------------
+
+%% Help function checking that there is a Result for each node in Nodes.
+%% Returns 'true' if successful.
+check_noderesults(Nodes,Fun,[{Node,Result}|Rest]) when is_function(Fun) ->
+    case Fun({Node,Result}) of
+	true ->
+	    case lists:member(Node,Nodes) of
+		true ->
+		    check_noderesults(lists:delete(Node,Nodes),Fun,Rest);
+		false ->                     % Not good.
+		    unknown_node_in_returnvalue
+	    end;
+	_ ->
+	    illegal_result
+    end;
+check_noderesults(Nodes,Result,[{Node,Result}|Rest]) ->
+    case lists:member(Node,Nodes) of
+	true ->
+	    check_noderesults(lists:delete(Node,Nodes),Result,Rest);
+	false ->                             % Not good.
+	    unknown_node_in_returnvalue
+    end;
+check_noderesults([],_,[]) ->
+    true;
+check_noderesults(X,Y,Z) ->
+    io:format("Bad arguments to check noderesults:~w~n~w~n~w~n",[X,Y,Z]),
+    false.
+%% ------------------------------------------------------------------------------
+
+%% Help function doing rpc on all nodes in Nodes calling M:F. Returns 'true' if
+%% successful.
+check_on_nodes([Node|Rest],M,F,Args,Result) when Node==node() ->
+    if
+	is_function(Result) ->
+	    ?l true=Result(apply(M,F,Args));
+	true ->
+	    ?l Result=apply(M,F,Args)
+    end,
+    check_on_nodes(Rest,M,F,Args,Result);
+check_on_nodes([Node|Rest],M,F,Args,Result) ->
+    if
+	is_function(Result) ->
+	    ?l true=Result(rpc:call(Node,M,F,Args));
+	true ->
+	    ?l Result=rpc:call(Node,M,F,Args)
+    end,
+    check_on_nodes(Rest,M,F,Args,Result);
+check_on_nodes([],_,_,_,_) ->
+    true.
+%% ------------------------------------------------------------------------------
+
+%% Help function which given a list of files searches through it and returns
+%% how many satisfies the RegExp.
+%% Returns {ok,N}.
+how_many_files_regexp([],_,N) ->
+    {ok,N};
+how_many_files_regexp([FName|Rest],RegExp,N) ->
+    case regexp:first_match(FName,RegExp) of
+	{match,1,_} ->
+	    how_many_files_regexp(Rest,RegExp,N+1);
+	nomatch ->
+	    how_many_files_regexp(Rest,RegExp,N);
+	{error,Reason} ->
+	    test_server:fail(Reason)
+    end.
+%% ------------------------------------------------------------------------------
+
+%% Help function killing a bunch of registered processes.
+process_killer([RegName|Rest]) ->
+    case whereis(RegName) of
+	undefined ->
+	    case global:whereis_name(RegName) of
+		undefined ->
+		    process_killer(Rest);
+		P when is_pid(P) ->
+		    if
+			node()==node(P) ->
+			    exit(P,kill);
+			true ->
+			    true
+		    end,
+		    process_killer(Rest)
+	    end;
+	P when is_pid(P) ->
+	    exit(P,kill),
+	    process_killer(Rest)
+    end;
+process_killer([]) ->
+    true.
+%% ------------------------------------------------------------------------------
+
+%% Help function which waits for a function call to become Result. This is useful
+%% if what we are waiting for can happend independantly of indications we have
+%% access to.
+poll(_,_,_,_,0) ->
+    error;
+poll(M,F,Args,Result,Times) ->
+    try apply(M,F,Args) of
+	What when is_function(Result) ->
+	    case Result(What) of
+		true ->
+		    ok;
+		_ ->
+		    timer:sleep(100),
+		    poll(M,F,Args,Result,Times-1)
+	    end;
+	Result ->
+	    ok;
+	_ ->
+	    timer:sleep(100),
+	    poll(M,F,Args,Result,Times-1)
+    catch
+	error:Reason ->
+	    io:format("Apply in suite-function poll/5 failed, ~w~n",[Reason]),
+	    timer:sleep(100),
+	    poll(M,F,Args,Result,Times-1)
+    end.
+%% ------------------------------------------------------------------------------
+
+insert_remotenode_config(Name,Node,Config) ->
+    [{remotenode,{Name,Node}}|Config].
+%% ------------------------------------------------------------------------------
+
+insert_timetraphandle_config(Handle,Config) ->
+    [{timetraphandle,Handle}|Config].
+%% ------------------------------------------------------------------------------
+
+get_remotenode_config(Name, [{remotenode, {Name, Node}}| _Cs]) ->
+    Node;
+get_remotenode_config(Name, [_ | Cs]) ->
+    get_remotenode_config(Name, Cs);
+get_remotenode_config(Name, []) ->
+    exit({no_remotenode, Name}).
+
+%% ------------------------------------------------------------------------------
+
+get_timetraphandle_config(Config) ->
+    {value,{_,Handle}}=lists:keysearch(timetraphandle,1,Config),
+    Handle.
+%% ------------------------------------------------------------------------------
+
+get_remotenodes_config([{remotenode,{_Name,Node}}|Config]) ->
+    [Node|get_remotenodes_config(Config)];
+get_remotenodes_config([_|Config]) ->
+    get_remotenodes_config(Config);
+get_remotenodes_config([]) ->
+    [].
+%% ------------------------------------------------------------------------------
+
+remove_remotenode_config(Name, [{remotenode, {Name, _}} | Cs]) ->
+    Cs;
+remove_remotenode_config(Name, [C | Cs]) ->
+    [C | remove_remotenode_config(Name, Cs)];
+remove_remotenode_config(_Name, []) ->
+    [].
+
+%% ------------------------------------------------------------------------------
+
+remove_timetraphandle_config(Config) ->
+    lists:keydelete(timetraphandle,1,Config).
+%% ------------------------------------------------------------------------------
+
+%% This function can be meta traced in order to check that exception_trace works.
+%% Must be exported.
+failing_function(nofailure) ->
+    true;
+failing_function(failure) ->
+    exit(failure).
+%% ------------------------------------------------------------------------------
+
+%% ==============================================================================
+%% Code for a test process which can be started.
+%% ==============================================================================
+
+test_proc_init() ->
+    register(inviso_test_proc,self()),
+    test_proc_loop().
+
+test_proc_loop() ->
+    receive
+	{apply,M,F,Args} ->
+	    apply(M,F,Args),
+	    test_proc_loop();
+	X ->
+	    io:format("Got ~w~n",[X]),
+	    test_proc_loop()
+    end.
+
+global_test_proc_init() ->
+    global:register_name(global_inviso_test_proc,self()),
+    test_proc_loop().
+%% ------------------------------------------------------------------------------
+
+send_to_test_proc(_,_,_,0) ->
+    error;
+send_to_test_proc(Msg,Fun,FunArg,N) ->
+    inviso_test_proc ! Msg,
+    case Fun(FunArg) of
+	done ->
+	    ok;
+	error ->
+	    test_server:fail(send_to_test_proc);
+	_ ->
+	    send_to_test_proc(Msg,Fun,FunArg,N-1)
+    end.
+%% ------------------------------------------------------------------------------
+
+
+%% This function is here to be traced on by the inviso_test_proc. Must be exported.
+test_function() ->
+    1+1.
+%% ------------------------------------------------------------------------------
+
+
+%% ==============================================================================
+%% Code for a test side effect table process.
+%% ==============================================================================
+
+%% The side effect logger is a process owning a public ETS table. The idea is that
+%% various callback functions can write in the table when called. In that way
+%% correct calling of the call-backs can be verified.
+start_side_effect_logger(Node) ->
+    ?l true=is_pid(spawn(Node,?MODULE,side_effect_logger_proc,[])),
+    ?l ok=poll(rpc,call,[Node,ets,lookup,[inviso_sideeffect_tab,foo]],[],20).
+
+%% This one must be exported.
+side_effect_logger_proc() ->
+    register(inviso_tab_proc,self()),        % So we can kill it later.
+    ets:new(inviso_sideeffect_tab,[public,named_table]),
+    side_effect_logger_proc_2().
+
+side_effect_logger_proc_2() ->
+    receive
+	_X ->                                % This process is not expecting anything!
+	    side_effect_logger_proc_2()
+    end.
+%% ------------------------------------------------------------------------------
diff --git a/lib/runtime_tools/test/inviso_testmodule1_foo.erl b/lib/runtime_tools/test/inviso_testmodule1_foo.erl
new file mode 100644
index 0000000000..a7a22cad39
--- /dev/null
+++ b/lib/runtime_tools/test/inviso_testmodule1_foo.erl
@@ -0,0 +1,9 @@
+-module(inviso_testmodule1_foo).
+
+-compile(export_all).
+
+%% The purpose of this module is simply to have a module that is
+%% guaranteed not loaded.
+
+foo() ->
+    true.
diff --git a/lib/runtime_tools/test/runtime_tools.cover b/lib/runtime_tools/test/runtime_tools.cover
new file mode 100644
index 0000000000..ef850bc377
--- /dev/null
+++ b/lib/runtime_tools/test/runtime_tools.cover
@@ -0,0 +1,3 @@
+{incl_app,runtime_tools,details}.
+
+{excl_mods, runtime_tools, [observer_backend]}.
diff --git a/lib/runtime_tools/test/runtime_tools.spec b/lib/runtime_tools/test/runtime_tools.spec
new file mode 100644
index 0000000000..0a24232be8
--- /dev/null
+++ b/lib/runtime_tools/test/runtime_tools.spec
@@ -0,0 +1 @@
+{suites,"../runtime_tools_test",all}.
diff --git a/lib/runtime_tools/test/runtime_tools_SUITE.erl b/lib/runtime_tools/test/runtime_tools_SUITE.erl
new file mode 100644
index 0000000000..4d46d75b62
--- /dev/null
+++ b/lib/runtime_tools/test/runtime_tools_SUITE.erl
@@ -0,0 +1,69 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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(runtime_tools_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+
+%% Test server specific exports
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases
+-export([app_file/1]).
+
+%% Default timetrap timeout (set in init_per_testcase)
+-define(default_timeout, ?t:minutes(1)).
+
+init_per_testcase(_Case, Config) ->
+    Dog = test_server:timetrap(?default_timeout),
+    [{watchdog, Dog} | Config].
+
+end_per_testcase(_Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [app_file].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+app_file(suite) ->
+    [];
+app_file(doc) ->
+    ["Testing .app file"];
+app_file(Config) when is_list(Config) ->
+    ?line ok = ?t:app_test(runtime_tools),
+    ok.
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index 4bbdef19de..8be4ae613b 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.8.3
+RUNTIME_TOOLS_VSN = 1.8.4.1
diff --git a/lib/snmp/doc/man1/.gitignore b/lib/snmp/doc/man1/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/lib/snmp/doc/man1/.gitignore
diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile
index e8d9efb148..70c2e1d09e 100644
--- a/lib/snmp/doc/src/Makefile
+++ b/lib/snmp/doc/src/Makefile
@@ -67,12 +67,15 @@ XML_OUTPUT = $(XML_FILES:%.xml=%.latex.xmls_output) \
 
 INFO_FILE = ../../info
 
+#HTML_REF1_FILES = $(XML_REF1_FILES:%.xml=$(HTMLDIR)/%.html)
 HTML_REF3_FILES = $(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html)
 HTML_REF6_FILES = $(XML_REF6_FILES:%.xml=$(HTMLDIR)/%.html)
 HTML_CHAP_FILES = $(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
 
-EXTRA_FILES = summary.html.src \
+EXTRA_FILES = \
+        summary.html.src \
         $(DEFAULT_HTML_FILES)  \
+        $(HTML_REF1_FILES)     \
         $(HTML_REF3_FILES)     \
         $(HTML_REF6_FILES)     \
         $(HTML_CHAP_FILES)
@@ -80,6 +83,7 @@ EXTRA_FILES = summary.html.src \
 
 MAN7DIR = $(DOCDIR)/man7
 
+MAN1_FILES = $(MAN1DIR)/snmpc.1
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6)
 MAN7_FILES = $(MIB_FILES:$(MIBSDIR)/%.mib=$(MAN7DIR)/%.7)
@@ -95,6 +99,7 @@ else
 TEX_FILES_BOOK = \
 	$(BOOK_FILES:%.xml=%.tex)
 TEX_FILES_REF_MAN = \
+	$(XML_REF1_FILES:%.xml=%.tex) \
 	$(XML_REF3_FILES:%.xml=%.tex) \
 	$(XML_REF6_FILES:%.xml=%.tex) \
 	$(XML_APPLICATION_FILES:%.xml=%.tex)
@@ -169,7 +174,7 @@ ps: $(TOP_PS_FILE)
 
 html: $(HTML_FILES) $(TOP_HTML_FILES) gifs 
 
-html2: gifs $(TOP_HTML_FILES) $(HTML_FILES) $(HTML_REF3_FILES) $(HTML_REF6_FILES) $(HTML_CHAP_FILES) 
+html2: gifs $(TOP_HTML_FILES) $(HTML_FILES) $(HTML_REF1_FILES) $(HTML_REF3_FILES) $(HTML_REF6_FILES) $(HTML_CHAP_FILES) 
 
 clean: clean_tex clean_html clean_man clean_docs
 
@@ -195,7 +200,9 @@ endif
 $(INDEX_TARGET): $(INDEX_SRC) ../../vsn.mk	# Create top make file 
 	sed -e 's;%VSN%;$(VSN);' $< > $@	# inserting version number
 
-man: man3 man6 man7
+man: man1 man3 man6 man7
+
+man1: $(MAN1_FILES)
 
 man3: $(MAN3_FILES)
 
@@ -213,6 +220,7 @@ clean_pdf:
 
 clean_man:
 	@echo "cleaning man:"
+	rm -f $(MAN1DIR)/*
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(MAN7DIR)/*
@@ -233,6 +241,11 @@ $(MAN7DIR)/%.7: $(MIBSDIR)/%.mib
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
+
+$(MAN1DIR)/snmpc.1: snmpc_cmd.xml
+	date=`date +"%B %e %Y"`; \
+        xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
+
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 ifdef DOCSUPPORT
@@ -244,6 +257,8 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(HTMLDIR)/* \
 		$(RELSYSDIR)/doc/html
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
+	$(INSTALL_DIR) $(RELEASE_PATH)/man/man1
+	$(INSTALL_DATA) $(MAN1DIR)/* $(RELEASE_PATH)/man/man1
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
@@ -269,7 +284,9 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
 		$(RELSYSDIR)/doc/html
 	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
+	$(INSTALL_DIR) $(RELEASE_PATH)/man/man1
+	$(INSTALL_DATA) $(MAN1_FILES) $(RELEASE_PATH)/man/man1
+	$(INSTALL_DIR) $(RELEASE_PATH)/man/man
 	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
 	$(INSTALL_DATA) $(MAN6_FILES) $(RELEASE_PATH)/man/man6
@@ -286,6 +303,10 @@ release_spec:
 
 ifdef DOCSUPPORT
 info: info_xml info_man info_html
+	@echo "MAN1DIR: $(MAN1DIR)"
+	@echo "MAN3DIR: $(MAN3DIR)"
+	@echo "MAN6DIR: $(MAN6DIR)"
+	@echo "MAN7DIR: $(MAN7DIR)"
 else
 info: info_xml info_man info_html info_tex
 	@echo "DVI2PS        = $(DVI2PS)"
@@ -297,6 +318,7 @@ endif
 
 info_man: 
 	@echo "man files:"
+	@echo "MAN1_FILES = $(MAN1_FILES)"
 	@echo "MAN3_FILES = $(MAN3_FILES)"
 	@echo "MAN6_FILES = $(MAN6_FILES)"
 	@echo "MAN7_FILES = $(MAN7_FILES)"
@@ -305,6 +327,7 @@ info_man:
 
 info_xml: 
 	@echo "xml files:"
+#	@echo "XML_REF1_FILES        = $(XML_REF1_FILES)"
 	@echo "XML_REF3_FILES        = $(XML_REF3_FILES)"
 	@echo "XML_REF6_FILES        = $(XML_REF6_FILES)"
 	@echo "XML_PART_FILES        = $(XML_PART_FILES)"
@@ -333,6 +356,7 @@ info_html:
 	@echo ""
 	@echo "DEFAULT_HTML_FILES = $(DEFAULT_HTML_FILES)"
 	@echo ""
+#	@echo "HTML_REF1_FILES = $(HTML_REF1_FILES)"
 	@echo "HTML_REF3_FILES = $(HTML_REF3_FILES)"
 	@echo "HTML_REF6_FILES = $(HTML_REF6_FILES)"
 	@echo "HTML_CHAP_FILES = $(HTML_CHAP_FILES)"
diff --git a/lib/snmp/doc/src/depend.mk b/lib/snmp/doc/src/depend.mk
index bf9833274d..4538f744de 100644
--- a/lib/snmp/doc/src/depend.mk
+++ b/lib/snmp/doc/src/depend.mk
@@ -48,6 +48,7 @@ $(HTMLDIR)/ref_man.html: \
 	snmp_app.xml \
 	snmp.xml \
 	snmpc.xml \
+	snmpc_cmd.xml \
 	snmpa.xml \
 	snmpa_conf.xml \
 	snmpa_discovery_handler.xml \
diff --git a/lib/snmp/doc/src/files.mk b/lib/snmp/doc/src/files.mk
index 293fb52ce0..f8462098be 100644
--- a/lib/snmp/doc/src/files.mk
+++ b/lib/snmp/doc/src/files.mk
@@ -23,6 +23,9 @@ XML_APPLICATION_FILES = \
 XML_APP_REF3_FILES = \
         snmp.xml
 
+XML_COMP_REF1_FILES = \
+        snmpc_cmd.xml
+
 XML_COMP_REF3_FILES = \
         snmpc.xml
 
@@ -98,12 +101,13 @@ XML_CHAPTER_FILES = \
 
 BOOK_FILES = book.xml
 
-XML_FILES = $(BOOK_FILES)         \
-             $(XML_CHAPTER_FILES) \
-             $(XML_PART_FILES)    \
-             $(XML_REF6_FILES)    \
-             $(XML_REF3_FILES)    \
-             $(XML_APPLICATION_FILES)
+XML_FILES = $(BOOK_FILES)        \
+            $(XML_CHAPTER_FILES) \
+            $(XML_PART_FILES)    \
+            $(XML_REF1_FILES)    \
+            $(XML_REF3_FILES)    \
+            $(XML_REF6_FILES)    \
+            $(XML_APPLICATION_FILES)
 
 GIF_FILES = book.gif \
 	getnext1.gif \
diff --git a/lib/snmp/doc/src/make.dep b/lib/snmp/doc/src/make.dep
index ccd01b9d3a..6d741ec1b9 100644
--- a/lib/snmp/doc/src/make.dep
+++ b/lib/snmp/doc/src/make.dep
@@ -52,7 +52,7 @@ book.dvi: book.tex part.tex ref_man.tex snmp.tex snmp_advanced_agent.tex \
 		snmpa_notification_delivery_info_receiver.tex \
 		snmpa_notification_filter.tex \
 		snmpa_supervisor.tex \
-		snmpc.tex snmpm.tex snmpm_conf.tex snmpm_mpd.tex \
+		snmpc.tex snmpc_cmd.tex snmpm.tex snmpm_conf.tex snmpm_mpd.tex \
 		snmpm_network_interface.tex snmpm_network_interface_filter.tex \
 		snmpm_user.tex
 
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 3f4954cfbd..2efeb8ae3f 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>SNMP Release Notes</title>
@@ -33,6 +33,163 @@
   </header>
 
   <section>
+    <title>SNMP Development Toolkit 4.19</title>
+    <p>Version 4.19 supports code replacement in runtime from/to
+      version 4.18.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+      <list type="bulleted">
+        <item>
+          <p>[compiler] Added support for textual convention 
+	  <c>AGENT-CAPABILITIES</c> and "full" support for textual 
+          convention MODULE-COMPLIANCE, both defined by the SNMPv2-CONF 
+          mib.</p>
+          <p>The <c>reference</c> and <c>modules</c> part(s) are
+	  stored in the <c>assocList</c> of the mib-entry (<c>me</c>) 
+	  record. 
+	  Only handled <em>if</em> the option(s) <c>agent_capabilities</c>
+	  and <c>module_compliance</c> (respectively) are provided to the 
+	  compiler. </p>
+	  <p>See <seealso marker="snmpc#compile">compile/2</seealso> 
+	  for more info. </p>
+	  <p>For backward compatibillity, the MIBs provided with 
+	  this application are <em>not</em> compiled with these 
+	  options. </p>
+          <p>Own Id: OTP-8966</p>
+        </item>
+
+        <item>
+          <p>[agent] Added a "complete" set of (snmp) table and variable
+          print functions, for each mib handled by the SNMP (agent)
+          application. This will be usefull when debugging a running agent.</p>
+          <p>See
+          <seealso marker="snmpa#print_mib_info">print_mib_info/0</seealso>,
+          <seealso marker="snmpa#print_mib_tables">print_mib_tables/0</seealso>
+          and
+          <seealso marker="snmpa#print_mib_variables">print_mib_variables/0</seealso>
+          for more info. </p>
+          <p>Own Id: OTP-8977</p>
+        </item>
+
+        <item>
+          <p>[compiler] Added a MIB compiler (frontend) escript, 
+          <c>snmpc</c>. </p>
+          <p>Own Id: OTP-9004</p>
+        </item>
+
+      </list>
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+<!--
+      <p>-</p> 
+-->
+      <list type="bulleted">
+        <item>
+          <p>[agent] For the table vacmAccessTable,
+          when performing the is_set_ok and set operation(s),
+          all values of the vacmAccessSecurityModel column was
+          incorrectly translated to <c>any</c>. </p>
+<!--
+that is when calling:
+snmp_view_basec_acm_mib:vacmAccessTable(set, RowIndex, Cols).
+-->
+          <p>Own Id: OTP-8980</p>
+        </item>
+
+        <item>
+          <p>[agent] When calling
+          <seealso marker="snmp_view_based_acm_mib#reconfigure">snmp_view_based_acm_mib:reconfigure/1</seealso>
+          on a running node, the table <c>vacmAccessTable</c> was not properly
+          cleaned.
+          This meant that if some entries in the vacm.conf file was removed
+          (compared to the <c>current</c> config),
+          while others where modified and/or added, the removed entrie(s)
+          would still exist in the <c>vacmAccessTable</c> table. </p>
+          <p>Own Id: OTP-8981</p>
+          <p>Aux Id: Seq 11750</p>
+        </item>
+
+      </list>
+    </section>
+
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+
+  </section> <!-- 4.19 -->
+
+  <section>
+    <title>SNMP Development Toolkit 4.18</title>
+    <p>Version 4.18 supports code replacement in runtime from/to
+      version 4.17.1 and 4.17.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <list type="bulleted">
+        <item>
+          <p>Prepared for R14B release.</p>
+        </item>
+      </list>
+    </section>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <p>-</p>
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[agent] When the function FilterMod:accept_recv/2 returned false
+          the SNMP agent stopped collecting messages from UDP.</p>
+          <p>Own Id: OTP-8761</p>
+        </item>
+      </list>
+-->
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+  </section> <!-- 4.18 -->
+
+
+  <section>
+    <title>SNMP Development Toolkit 4.17.1</title>
+    <p>Version 4.17.1 supports code replacement in runtime from/to
+      version 4.17, 4.16.2, 4.16.1, 4.16, 4.15, 4.14 and 4.13.5.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p> 
+    </section>
+
+    <section>
+      <title>Reported Fixed Bugs and Malfunctions</title>
+      <list type="bulleted">
+        <item>
+          <p>When the function FilterMod:accept_recv/2
+	  returned false the SNMP agent stopped collecting 
+	  messages from UDP.</p>
+          <p>Own Id: OTP-8761</p>
+        </item>
+      </list>
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+  </section> <!-- 4.17.1 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.17</title>
     <p>Version 4.17 supports code replacement in runtime from/to
       version 4.16.2, 4.16.1, 4.16, 4.15, 4.14 and 4.13.5.</p>
diff --git a/lib/snmp/doc/src/ref_man.xml b/lib/snmp/doc/src/ref_man.xml
index 1ae5a8205b..815d21d33e 100644
--- a/lib/snmp/doc/src/ref_man.xml
+++ b/lib/snmp/doc/src/ref_man.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -61,6 +61,7 @@
   <xi:include href="snmp_user_based_sm_mib.xml"/>
   <xi:include href="snmp_view_based_acm_mib.xml"/>
   <xi:include href="snmpc.xml"/>
+  <xi:include href="snmpc_cmd.xml"/>
   <xi:include href="snmpm.xml"/>
   <xi:include href="snmpm_conf.xml"/>
   <xi:include href="snmpm_mpd.xml"/>
diff --git a/lib/snmp/doc/src/snmp_agent_config_files.xml b/lib/snmp/doc/src/snmp_agent_config_files.xml
index 0bab563f87..b62269d506 100644
--- a/lib/snmp/doc/src/snmp_agent_config_files.xml
+++ b/lib/snmp/doc/src/snmp_agent_config_files.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -178,11 +178,12 @@
       <c>community.conf</c>.  It must be present if the agent is
       configured for SNMPv1 or SNMPv2c.
       </p>
+    <p>An SNMP <em>community</em> is a relationship between an SNMP
+    agent and a set of SNMP managers that defines authentication, access 
+    control and proxy characteristics. </p>
     <p>The corresponding table is <c>snmpCommunityTable</c> in the
-      SNMP-COMMUNITY-MIB.
-      </p>
-    <p>Each entry is a term:
-      </p>
+      SNMP-COMMUNITY-MIB. </p>
+    <p>Each entry is a term: </p>
     <p><c>{CommunityIndex, CommunityName, SecurityName, ContextName, TransportTag}.</c></p>
     <list type="bulleted">
       <item><c>CommunityIndex</c> is a non-empty string.
diff --git a/lib/snmp/doc/src/snmp_config.xml b/lib/snmp/doc/src/snmp_config.xml
index 769b908adc..4e41cb5037 100644
--- a/lib/snmp/doc/src/snmp_config.xml
+++ b/lib/snmp/doc/src/snmp_config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -1004,36 +1004,16 @@ ok
     </taglist>
 
     <p>Another usefull way to debug the agent is to pretty-print the content of 
-      some of the (MIB-) tables handled directly by the agent. This can be done 
-      for the following tables: </p>
-    <taglist>
-      <tag><c><![CDATA[snmpCommunityTable]]></c></tag>
-      <item>
-        <p><c><![CDATA[snmp_community_mib:snmpCommunityTable(print).]]></c></p>
-      </item>
-
-      <tag><c><![CDATA[snmpNotifyTable]]></c></tag>
-      <item>
-        <p><c><![CDATA[snmp_notification_mib:snmpNotifyTable(print).]]></c></p>
-      </item>
-
-      <tag><c><![CDATA[snmpTargetAddrTable]]></c></tag>
-      <item>
-        <p><c><![CDATA[snmp_target_mib:snmpTargetAddrTable(print).]]></c></p>
-      </item>
-
-      <tag><c><![CDATA[snmpTargetParamsTable]]></c></tag>
-      <item>
-        <p><c><![CDATA[snmp_target_mib:snmpTargetParamsTable(print).]]></c></p>
-      </item>
-
-      <tag><c><![CDATA[usmUserTable]]></c></tag>
-      <item>
-        <p><c><![CDATA[snmp_user_based_sm_mib:usmUserTable(print).]]></c></p>
-      </item>
-
-    </taglist>
-
+    all the tables and/or variables handled directly by the agent. 
+    This can be done by simply calling: </p>
+    <p><c><![CDATA[snmpa:print_mib_info()]]></c></p>
+    <p>See 
+    <seealso marker="snmpa#print_mib_info">print_mib_info/0</seealso>, 
+    <seealso marker="snmpa#print_mib_tables">print_mib_tables/0</seealso>
+    or
+    <seealso marker="snmpa#print_mib_variables">print_mib_variables/0</seealso> 
+    for more info. </p>
+      
   </section>
 </chapter>
 
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 ffea256608..d595f6b93b 100644
--- a/lib/snmp/doc/src/snmp_view_based_acm_mib.xml
+++ b/lib/snmp/doc/src/snmp_view_based_acm_mib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -38,7 +38,10 @@
       SNMP-VIEW-BASED-ACM-MIB, and functions for configuring the database.
       </p>
     <p>The configuration files are described in the SNMP User's Manual.</p>
+
+    <marker id="configure"></marker>
   </description>
+
   <funcs>
     <func>
       <name>configure(ConfDir) -> void()</name>
@@ -48,27 +51,24 @@
       </type>
       <desc>
         <p>This function is called from the supervisor at system
-          start-up.
-          </p>
+	start-up. </p>
         <p>Inserts all data in the configuration files into the
-          database and destroys all old rows with StorageType
-          <c>volatile</c>.  The rows created from the configuration file
-          will have StorageType <c>nonVolatile</c>.
-          </p>
-        <p>All <c>snmp</c> counters are set to zero.
-          </p>
+	database and destroys all old rows with StorageType
+	<c>volatile</c>.  The rows created from the configuration file
+	will have StorageType <c>nonVolatile</c>. </p>
+        <p>All <c>snmp</c> counters are set to zero. </p>
         <p>If an error is found in the configuration file, it is
-          reported using the function <c>config_err/2</c> of the error
-          report module, and the function fails with the reason 
-          <c>configuration_error</c>.
-          </p>
+	reported using the function <c>config_err/2</c> of the error
+	report module, and the function fails with the reason 
+	<c>configuration_error</c>. </p>
         <p><c>ConfDir</c> is a string which points to the directory
-          where the configuration files are found.
-          </p>
-        <p>The configuration file read is: <c>vacm.conf</c>.
-          </p>
+	where the configuration files are found. </p>
+        <p>The configuration file read is: <c>vacm.conf</c>. </p>
+
+	<marker id="reconfigure"></marker>
       </desc>
     </func>
+
     <func>
       <name>reconfigure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-VIEW-BASED-ACM-MIB</fsummary>
@@ -88,18 +88,20 @@
         <p>All <c>snmp</c> counters are set to zero.
           </p>
         <p>If an error is found in the configuration file, it is
-          reported using the function <c>config_err/2</c> of the error
-          report module, and the function fails with the reason 
+          reported using the function 
+	  <seealso marker="snmpa_error#config_err">config_err/2</seealso> 
+	  of the error report module, and the function fails with the reason 
           <c>configuration_error</c>.
           </p>
         <p><c>ConfDir</c> is a string which points to the directory
           where the configuration files are found.
           </p>
-        <p>The configuration file read is: <c>vacm.conf</c>.
-                    <marker id="add_sec2group"></marker>
-</p>
+        <p>The configuration file read is: <c>vacm.conf</c>. </p>
+
+	<marker id="add_sec2group"></marker>
       </desc>
     </func>
+
     <func>
       <name>add_sec2group(SecModel, SecName, GroupName) -> Ret</name>
       <fsummary>Add one security to group definition</fsummary>
@@ -113,10 +115,13 @@
       </type>
       <desc>
         <p>Adds a security to group definition to the agent config. 
-          Equivalent to one vacmSecurityToGroup-line in the <c>vacm.conf</c> file.</p>
+	Equivalent to one vacmSecurityToGroup-line in the 
+	<c>vacm.conf</c> file.</p>
+
         <marker id="delete_sec2group"></marker>
       </desc>
     </func>
+
     <func>
       <name>delete_sec2group(Key) -> Ret</name>
       <fsummary>Delete one security to group definition</fsummary>
@@ -127,9 +132,11 @@
       </type>
       <desc>
         <p>Delete a security to group definition from the agent config.</p>
+
         <marker id="add_access"></marker>
       </desc>
     </func>
+
     <func>
       <name>add_access(GroupName, Prefix, SecModel, SecLevel, Match, RV, WV, NV) -> Ret</name>
       <fsummary>Add one access definition</fsummary>
@@ -148,10 +155,12 @@
       </type>
       <desc>
         <p>Adds a access definition to the agent config. 
-          Equivalent to one vacmAccess-line in the <c>vacm.conf</c> file.</p>
-        <marker id="delete_access"></marker>
+	Equivalent to one vacmAccess-line in the <c>vacm.conf</c> file.</p>
+        
+	<marker id="delete_access"></marker>
       </desc>
     </func>
+
     <func>
       <name>delete_access(Key) -> Ret</name>
       <fsummary>Delete one access definition</fsummary>
@@ -161,10 +170,12 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Delete a access definition from the agent config.</p>
-        <marker id="add_view_tree_fam"></marker>
+	<p>Delete a access definition from the agent config.</p>
+
+	<marker id="add_view_tree_fam"></marker>
       </desc>
     </func>
+
     <func>
       <name>add_view_tree_fam(ViewIndex, SubTree, Status, Mask) -> Ret</name>
       <fsummary>Add one view tree family definition</fsummary>
@@ -178,11 +189,14 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Adds a view tree family definition to the agent config. 
-          Equivalent to one vacmViewTreeFamily-line in the <c>vacm.conf</c> file.</p>
-        <marker id="delete_view_tree_fam"></marker>
+	<p>Adds a view tree family definition to the agent config. 
+	Equivalent to one vacmViewTreeFamily-line in the 
+	<c>vacm.conf</c> file.</p>
+	  
+	  <marker id="delete_view_tree_fam"></marker>
       </desc>
     </func>
+
     <func>
       <name>delete_view_tree_fam(Key) -> Ret</name>
       <fsummary>Delete one view tree family definition</fsummary>
diff --git a/lib/snmp/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml
index 1be6abe6dd..1d680e80f5 100644
--- a/lib/snmp/doc/src/snmpa.xml
+++ b/lib/snmp/doc/src/snmpa.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -1233,7 +1233,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
       </type>
       <desc>
         <p>Restart the worker process of a multi-threaded agent.</p>
-        <p>This is a utility function, that can be usefull when 
+        <p>This is a utility function, that can be useful when
           e.g. debugging instrumentation functions.</p>
 
         <marker id="restart_set_worker"></marker>
@@ -1249,9 +1249,42 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
       </type>
       <desc>
         <p>Restart the set worker process of a multi-threaded agent.</p>
-        <p>This is a utility function, that can be usefull when 
+        <p>This is a utility function, that can be useful when
           e.g. debugging instrumentation functions.</p>
 
+        <marker id="print_mib_info"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>print_mib_info() -> void()</name>
+      <fsummary>Print mib info</fsummary>
+      <desc>
+        <p>Prints the content of all the (snmp) tables and variables 
+	for all mibs handled by the snmp agent. </p>
+
+        <marker id="print_mib_tables"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>print_mib_tables() -> void()</name>
+      <fsummary>Print mib tables</fsummary>
+      <desc>
+        <p>Prints the content of all the (snmp) tables 
+	for all mibs handled by the snmp agent. </p>
+
+        <marker id="print_mib_variables"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>print_mib_variables() -> void()</name>
+      <fsummary>Print mib variables</fsummary>
+      <desc>
+        <p>Prints the content of all the (snmp) variables 
+	for all mibs handled by the snmp agent. </p>
+
         <marker id="verbosity"></marker>
       </desc>
     </func>
diff --git a/lib/snmp/doc/src/snmpa_error.xml b/lib/snmp/doc/src/snmpa_error.xml
index a7312e8b24..4dbafdfbb7 100644
--- a/lib/snmp/doc/src/snmpa_error.xml
+++ b/lib/snmp/doc/src/snmpa_error.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -51,6 +51,8 @@
       <c>error_report_mod</c>, see
       <seealso marker="snmp_config#configuration_params">configuration parameters</seealso>.
       </p>
+
+      <marker id="config_err"></marker>
   </description>
   <funcs>
     <func>
@@ -67,8 +69,11 @@
           </p>
         <p><c>Format</c> and <c>Args</c> are as in
           <c>io:format(Format, Args)</c>.</p>
+
+	  <marker id="user_err"></marker>
       </desc>
     </func>
+
     <func>
       <name>user_err(Format, Args) -> void()</name>
       <fsummary>Called if a user related error occurs</fsummary>
diff --git a/lib/snmp/doc/src/snmpc.xml b/lib/snmp/doc/src/snmpc.xml
index fbd0950c69..771629492d 100644
--- a/lib/snmp/doc/src/snmpc.xml
+++ b/lib/snmp/doc/src/snmpc.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -37,6 +37,7 @@
     <p>The module <c>snmpc</c> contains interface functions to the 
       SNMP toolkit MIB compiler.</p>
 
+    <marker id="compile"></marker>
   </description>
 
   <funcs>
@@ -47,7 +48,7 @@
       <type>
         <v>File = string()</v>
         <v>Options = [opt()]</v>
-        <v>opt() = db() | relaxed_row_name_assign_check() | deprecated() | description() | reference() | group_check() |  i() | il() | imports() | module() | module_identity() | outdir() |  no_defs() | verbosity() | warnings()</v>
+        <v>opt() = db() | relaxed_row_name_assign_check() | deprecated() | description() | reference() | group_check() |  i() | il() | imports() | module() | module_identity() | module_compliance() | agent_capabilities() | outdir() |  no_defs() | verbosity() | warnings()</v>
         <v>db() = {db, volatile|persistent|mnesia}</v>
         <v>deprecated() = {deprecated, bool()}</v>
         <v>relaxed_row_name_assign_check() = relaxed_row_name_assign_check</v>
@@ -59,6 +60,8 @@
         <v>imports() = imports</v>
         <v>module() = {module, atom()}</v>
         <v>module_identity() = module_identity</v>
+        <v>module_compliance() = module_compliance</v>
+        <v>agent_capabilities() = agent_capabilities</v>
         <v>no_defs() = no_defs</v>
         <v>outdir() = {outdir, dir()}</v>
         <v>verbosity() = {verbosity, silence|warning|info|log|debug|trace}</v>
@@ -77,6 +80,7 @@
 	      be used for the default instrumentation. </p>
 	    <p>Default is <c>volatile</c>. </p>
           </item>
+
           <item>
 	    <p>The option <c>deprecated</c> specifies if a deprecated 
               definition should be kept or not. If the option is 
@@ -84,6 +88,7 @@
               definitions. </p>
 	    <p>Default is <c>true</c>. </p>
           </item>
+
           <item>
 	    <p>The option <c>relaxed_row_name_assign_check</c>, if present,
 	      specifies that the row name assign check shall not be done 
@@ -94,12 +99,14 @@
 	    <p>By default it is not included, but if this option is present 
 	      it will be. </p>
           </item>
+
           <item>
 	    <p>The option <c>description</c> specifies if the text
               of the DESCRIPTION field will be included or not. </p>
 	    <p>By default it is not included, but if this option is 
 	      present it will be. </p>
           </item>
+
           <item>
 	    <p>The option <c>reference</c> specifies if the text
               of the REFERENCE field, when found in a table definition, 
@@ -108,18 +115,21 @@
 	      it will be. The reference text will be placed in the allocList 
 	      field of the mib-entry record (#me{}) for the table. </p>
           </item>
+
           <item>
 	    <p>The option <c>group_check</c> specifies whether the
 	      mib compiler should check the OBJECT-GROUP macro and
               the NOTIFICATION-GROUP macro for correctness or not.  </p>
 	    <p>Default is <c>true</c>. </p>
           </item>
+
           <item>
 	    <p>The option <c>i</c> specifies the path to search for
 	      imported (compiled) MIB files. The directories should be
               strings with a trailing directory delimiter. </p>
 	    <p>Default is <c>["./"]</c>. </p>
           </item>
+
           <item>
 	    <p>The option <c>il</c> (include_lib) also specifies a
               list of directories to search for imported MIBs. It
@@ -132,11 +142,13 @@
 	      <c><![CDATA[<snmp-home>/priv/mibs/]]></c>
               are always listed last in the include path. </p>
           </item>
+
           <item>
 	    <p>The option <c>imports</c>, if present, specifies that 
               the IMPORT statement of the MIB shall be included in the 
 	      compiled mib. </p>
           </item>
+
           <item>
 	    <p>The option <c>module</c>, if present, specifies the
               name of a module which implements all instrumentation
@@ -145,11 +157,29 @@
               functions must be the same as the corresponding managed
               object it implements. </p>
           </item>
+
           <item>
 	    <p>The option <c>module_identity</c>, if present, specifies 
               that the info part of the MODULE-IDENTITY statement of the MIB 
               shall be included in the compiled mib. </p>
           </item>
+
+          <item>
+	    <p>The option <c>module_compliance</c>, if present, specifies 
+              that the MODULE-COMPLIANCE statement of the MIB shall be included 
+              (with a mib-entry record) in the compiled mib. The mib-entry record 
+	      of the module-compliance will contain <c>reference</c> and <c>module</c> 
+	      part(s) this info in the <c>assocList</c> field). </p>
+          </item>
+
+          <item>
+	    <p>The option <c>agent_capabilities</c>, if present, specifies 
+              that the AGENT-CAPABILITIES statement of the MIB shall be included 
+              (with a mib-entry record) in the compiled mib. The mib-entry record 
+	      of the agent-capabilitie will contain <c>reference</c> and <c>modules</c> 
+	      part(s) this info in the <c>assocList</c> field). </p>
+          </item>
+
           <item>
 	    <p>The option <c>no_defs</c>, if present, specifies 
               that if a managed object does not have an instrumentation
@@ -157,6 +187,7 @@
               be used, instead this is reported as an error, and the
               compilation aborts. </p>
           </item>
+
           <item>
 	    <p>The option <c>verbosity</c> specifies the verbosity of
 	      the SNMP mib compiler. I.e. if warning, info, log, debug 
@@ -166,11 +197,13 @@
               option <c>verbosity</c> is <c>silence</c>, warning messages will
               still be shown. </p>
           </item>
+
           <item>
 	    <p>The option <c>warnings</c> specifies whether warning
               messages should be shown. </p>
 	    <p>Default is <c>true</c>. </p>
           </item>
+
         </list>
         <p>The MIB compiler understands both SMIv1 and SMIv2 MIBs.  It
           uses the <c>MODULE-IDENTITY</c> statement to determine if the MIB is
@@ -185,8 +218,11 @@
           have to be specified to <c>erlc</c> using the syntax 
           <c>+term</c>.  See <c>erlc(1)</c> for details.
           </p>
+
+	  <marker id="is_consistent"></marker>
       </desc>
     </func>
+
     <func>
       <name>is_consistent(Mibs) -> ok | {error, Reason}</name>
       <fsummary>Check for OID conflicts between MIBs</fsummary>
@@ -198,8 +234,11 @@
         <p>Checks for multiple usage of object identifiers and traps
           between MIBs.
           </p>
+
+	  <marker id="mib_to_hrl"></marker>
       </desc>
     </func>
+
     <func>
       <name>mib_to_hrl(MibName) -> ok | {error, Reason}</name>
       <fsummary>Generate constants for the objects in the MIB</fsummary>
diff --git a/lib/snmp/doc/src/snmpc_cmd.xml b/lib/snmp/doc/src/snmpc_cmd.xml
new file mode 100644
index 0000000000..18ff71631c
--- /dev/null
+++ b/lib/snmp/doc/src/snmpc_cmd.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE comref SYSTEM "comref.dtd">
+
+<comref>
+  <header>
+    <copyright>
+      <year>2011</year><year>2011</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>snmpc</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev></rev>
+    <file>snmpc_cmd.xml</file>
+  </header>
+  <com>snmpc</com>
+  <comsummary>SNMP MIB compiler frontend</comsummary>
+  <description>
+    <p>The <c><![CDATA[snmpc]]></c> program provides a way to run
+    the SNMP MIB compiler of the Erlang system. </p>
+  </description>
+
+  <funcs>
+    <func>
+      <name>snmpc [options] file.mib | file.bin</name>
+      <fsummary>Compile MIBs</fsummary>
+      <desc>
+        <p><c><![CDATA[snmpc]]></c> compile a SNMP MIB file, 
+	see <seealso marker="snmpc#compile">compile/1,2</seealso> for 
+	more info. </p>
+	<p>It can also be used to generate a header file (.hrl) 
+	with definitions of Erlang constants for the objects in 
+	the MIB, see 
+	<seealso marker="snmpc#mib_to_hrl">mib_to_hrl/1</seealso>. </p>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <title>Compiler options</title>
+    <p>The following options are supported (note that most of these relate 
+    to the compilation of the MIB file):</p>
+    <taglist>
+      <tag>--help</tag>
+      <item>
+        <p>Prints help info.</p>
+      </item>
+
+      <tag>--version</tag>
+      <item>
+        <p>Prints application and mib format version.</p>
+      </item>
+
+      <tag>--verbosity <em>verbosity</em></tag>
+      <item>
+        <p>Print debug info. </p>
+	<p><c>verbosity</c> = <c>trace</c> | <c>debug</c> | <c>log</c> | <c>info</c> | <c>silence</c></p>
+	<p>Defaults to <c>silence</c>.</p>
+      </item>
+
+      <tag>--warnings</tag>
+      <item>
+        <p>Print warning messages. </p>
+      </item>
+
+      <tag>--o <em>directory</em></tag>
+      <item>
+        <p>The directory where the compiler should place the output files.
+	If not specified, output files will be placed in the current working
+	directory.</p>
+      </item>
+
+      <tag>--i <em>Directory</em></tag>
+      <item>
+        <p>Specifies the path to search for imported (compiled) MIB files. 
+	By default, the current working directory is always included. </p>
+	<p>This option can be present several times, each time specifying
+	<em>one</em> path. </p>
+      </item>
+
+      <tag>--il <em>Directory</em></tag>
+      <item>
+        <p>This option (include_lib), specifies a list of directories to 
+	search for imported MIBs. It assumes that the first element in 
+	the directory name corresponds to an OTP application. The compiler 
+	will find the current installed version. For example, the value 
+	["snmp/mibs/"] will be replaced by ["snmp-3.1.1/mibs/"] (or what 
+	the current version may be in the system). The current directory 
+	and the "snmp-home"/priv/mibs/ are always listed last in the
+        include path. </p>
+      </item>
+
+      <tag>--sgc</tag>
+      <item>
+	<p>This option (skip group check), if present, disables the 
+	group check of the mib compiler. 
+	That is, should the OBJECT-GROUP and the NOTIFICATION-GROUP 
+	macro(s) be checked for correctness or not. </p>
+      </item>
+
+      <tag>--dep</tag>
+      <item>
+        <p>Keep deprecated definition(s). 
+	If not specified the compiler will ignore deprecated definitions. </p>
+      </item>
+
+      <tag>--desc</tag>
+      <item>
+        <p>The DESCRIPTION field will be included. </p>
+      </item>
+
+      <tag>--ref</tag>
+      <item>
+        <p>The REFERENCE field will be included. </p>
+      </item>
+
+      <tag>--imp</tag>
+      <item>
+        <p>The IMPORTS field will be included. </p>
+      </item>
+
+      <tag>--mi</tag>
+      <item>
+        <p>The MODULE-IDENTITY field will be included. </p>
+      </item>
+
+      <tag>--mc</tag>
+      <item>
+        <p>The MODULE-COMPLIANCE field will be included. </p>
+      </item>
+
+      <tag>--ac</tag>
+      <item>
+        <p>The AGENT-CAPABILITIES field will be included. </p>
+      </item>
+
+      <tag>--mod <em>module</em></tag>
+      <item>
+        <p>The module which implements all the instrumentation functions. </p>
+	<p>The name of all instrumentation functions must be the 
+	same as the corresponding managed object it implements. </p>
+      </item>
+
+      <tag>--nd</tag>
+      <item>
+        <p>The default instrumentation functions will <em>not</em> be
+	used if a managed object have no instrumentation function.
+	Instead this will be reported as an error, and the compilation 
+	aborts. </p>
+      </item>
+
+      <tag>--rrnac</tag>
+      <item>
+        <p>This option, if present, specifies that the row name assign check 
+	shall not be done strictly according to the SMI (which allows only 
+	the value 1). </p>
+	<p>With this option, all values greater than zero is allowed (>= 1). 
+	This means that the error will be converted to a warning. </p>
+	<p>By default it is not included, but if this option is present 
+	it will be. </p>
+      </item>
+
+    </taglist>
+  </section>
+
+  <section>
+    <title>SEE ALSO</title>
+    <p><seealso marker="erlc">erlc(1)</seealso>,
+    <seealso marker="compiler:compile">compile(3)</seealso>,
+    <seealso marker="snmp:snmpc">snmpc(3)</seealso></p>
+  </section>
+</comref>
+
diff --git a/lib/snmp/examples/ex2/snmp_ex2_manager.erl b/lib/snmp/examples/ex2/snmp_ex2_manager.erl
index 79cfd94469..ff873327bc 100644
--- a/lib/snmp/examples/ex2/snmp_ex2_manager.erl
+++ b/lib/snmp/examples/ex2/snmp_ex2_manager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -25,6 +25,8 @@
 -behaviour(gen_server).
 -behaviour(snmpm_user).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([start_link/0, start_link/1, stop/0,
 	 agent/2, 
          sync_get/2, 
diff --git a/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl b/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl
index 16fe79d1a5..81939dd614 100644
--- a/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl
+++ b/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -22,6 +22,8 @@
 
 -module(snmp_ex2_simple_standard_test).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([start/0, start/1, start/3]).
 
 -include_lib("snmp/include/snmp_types.hrl").
diff --git a/lib/snmp/include/snmp_types.hrl b/lib/snmp/include/snmp_types.hrl
index 1fd6d153c9..4adb24361c 100644
--- a/lib/snmp/include/snmp_types.hrl
+++ b/lib/snmp/include/snmp_types.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -192,7 +192,7 @@
 %%----------------------------------------------------------------------
 -record(mib, 
 	{misc = [], 
-	 mib_format_version = "3.1", 
+	 mib_format_version = "3.2", 
 	 name = "",
 	 module_identity,  %% Not in SMIv1, and only with +module_identity
 	 mes = [], 
diff --git a/lib/snmp/mibs/Makefile.in b/lib/snmp/mibs/Makefile.in
index b85a8b0767..7aefb0ea34 100644
--- a/lib/snmp/mibs/Makefile.in
+++ b/lib/snmp/mibs/Makefile.in
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
+# Copyright Ericsson AB 1996-2011. 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
@@ -108,20 +108,28 @@ TARGET_FILES = \
 # FLAGS
 # ----------------------------------------------------
 
-SNMP_FLAGS += -pa ../ebin +version 
+SNMP_FLAGS += -pa ../ebin +version
 
 ifneq ($(MIBS_VERBOSITY),) 
-SNMP_FLAGS += +'{verbosity,$(MIBS_VERBOSITY)}'
+SNMP_FLAGS += +'{verbosity, $(MIBS_VERBOSITY)}'
 endif
 
-ifneq ($(MIBS_REFERENCE),) 
+ifeq ($(MIBS_REFERENCE),true) 
 SNMP_FLAGS += +reference
 endif
 
-ifneq ($(MIBS_OPTIONS),) 
+ifeq ($(MIBS_OPTIONS),true) 
 SNMP_FLAGS += +options
 endif
 
+ifeq ($(MIBS_MC),true) 
+SNMP_FLAGS += +module_compliance
+endif
+
+ifeq ($(MIBS_AC),true) 
+SNMP_FLAGS += +agent_capabilities
+endif
+
 
 # ----------------------------------------------------
 # Targets
@@ -148,6 +156,14 @@ conf:
 	cd ..; $(MAKE) conf
 
 info:
+	@echo "MIBS_REFERENCE  = $(MIBS_REFERENCE)"
+	@echo ""
+	@echo "MIBS_OPTIONS    = $(MIBS_OPTIONS)"
+	@echo ""
+	@echo "MIBS_MC         = $(MIBS_MC)"
+	@echo ""
+	@echo "MIBS_AC         = $(MIBS_AC)"
+	@echo ""
 	@echo "SNMP_FLAGS      = $(SNMP_FLAGS)"
 	@echo ""
 	@echo "MIBS            = $(MIBS)"
diff --git a/lib/snmp/src/agent/snmp_community_mib.erl b/lib/snmp/src/agent/snmp_community_mib.erl
index a2ee7bf0c9..5644a43345 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -18,6 +18,8 @@
 %%
 -module(snmp_community_mib).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([configure/1, reconfigure/1,
 	 snmpCommunityTable/1, snmpCommunityTable/3,
 	 snmpTargetAddrExtTable/3,
@@ -334,6 +336,8 @@ get_target_addr_ext_mms(TDomain, TAddress, Key) ->
 		    get_target_addr_ext_mms(TDomain, TAddress, NextKey)
 	    end
     end.
+
+
 %%-----------------------------------------------------------------
 %% Instrumentation Functions
 %%-----------------------------------------------------------------
@@ -345,7 +349,7 @@ snmpCommunityTable(print) ->
     PrintRow = 
 	fun(Prefix, Row) ->
 		lists:flatten(
-		  io_lib:format("~sIndex:             ~p"
+		  io_lib:format("~sIndex:           ~p"
 				"~n~sName:            ~p"
 				"~n~sSecurityName:    ~p"
 				"~n~sContextEngineID: ~p"
diff --git a/lib/snmp/src/agent/snmp_framework_mib.erl b/lib/snmp/src/agent/snmp_framework_mib.erl
index 0916e2ec74..0d7866d94d 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -37,6 +37,8 @@
 %%% over all known contexts.
 %%%-----------------------------------------------------------------
 %% External exports
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([init/0, configure/1]).
 -export([intContextTable/1, intContextTable/3,
 	 intAgentUDPPort/1, intAgentIpAddress/1,
@@ -371,15 +373,27 @@ intAgentUDPPort(Op) ->
 intAgentIpAddress(Op) ->
     snmp_generic:variable_func(Op, db(intAgentIpAddress)).
 
+snmpEngineID(print) ->
+    VarAndValue = [{snmpEngineID, snmpEngineID(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
 snmpEngineID(Op) ->
     snmp_generic:variable_func(Op, db(snmpEngineID)).
 
+snmpEngineMaxMessageSize(print) ->
+    VarAndValue = [{snmpEngineMaxMessageSize, snmpEngineMaxMessageSize(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
 snmpEngineMaxMessageSize(Op) ->
     snmp_generic:variable_func(Op, db(snmpEngineMaxMessageSize)).
 
+snmpEngineBoots(print) ->
+    VarAndValue = [{snmpEngineBoots, snmpEngineBoots(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
 snmpEngineBoots(Op) ->
     snmp_generic:variable_func(Op, db(snmpEngineBoots)).
 
+snmpEngineTime(print) ->
+    VarAndValue = [{snmpEngineTime, snmpEngineTime(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
 snmpEngineTime(get) ->
     {value, get_engine_time()}.
 
diff --git a/lib/snmp/src/agent/snmp_generic.erl b/lib/snmp/src/agent/snmp_generic.erl
index 508aa090d9..06afa68d96 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -18,6 +18,8 @@
 %%
 -module(snmp_generic).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([variable_func/2, variable_func/3, variable_get/1, variable_set/2]).
 -export([table_func/2, table_func/4, 
 	 table_set_row/5, table_set_cols/3, table_set_cols/4,
diff --git a/lib/snmp/src/agent/snmp_notification_mib.erl b/lib/snmp/src/agent/snmp_notification_mib.erl
index 16e43f05d7..1cd69b430f 100644
--- a/lib/snmp/src/agent/snmp_notification_mib.erl
+++ b/lib/snmp/src/agent/snmp_notification_mib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -18,6 +18,8 @@
 %%
 -module(snmp_notification_mib).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([configure/1, reconfigure/1, invalidate_cache/0,
 	 snmpNotifyTable/1, snmpNotifyTable/3,
 	 snmpNotifyFilterTable/3, snmpNotifyFilterProfileTable/3,
diff --git a/lib/snmp/src/agent/snmp_standard_mib.erl b/lib/snmp/src/agent/snmp_standard_mib.erl
index 3928a8afe6..b6834d278c 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -33,11 +33,35 @@
 -define(disabled, 2).
 
 %% External exports
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([configure/1, reconfigure/1, reset/0, sys_up_time/0, sys_up_time/1,
 	 snmp_enable_authen_traps/1, snmp_enable_authen_traps/2,
 	 sys_object_id/1, sys_object_id/2, sys_or_table/3,
 	 variable_func/1, variable_func/2,
 	 inc/1, inc/2]).
+-export([sysDescr/1, sysContact/1, sysName/1, sysLocation/1, 
+	 sysServices/1, sysUpTime/1, snmpEnableAuthenTraps/1, 
+	 sysObjectID/1, 
+	 snmpInPkts/1, snmpOutPkts/1, 
+	 snmpInBadVersions/1, 
+	 snmpInBadCommunityNames/1, snmpInBadCommunityUses/1, 
+	 snmpInASNParseErrs/1, 
+	 snmpInTooBigs/1, 
+	 snmpInNoSuchNames/1, snmpInBadValues/1,
+	 snmpInReadOnlys/1, snmpInGenErrs/1, 
+	 snmpInTotalReqVars/1, snmpInTotalSetVars/1, 
+	 snmpInGetRequests/1, snmpInSetRequests/1, 
+	 snmpInGetNexts/1, 
+	 snmpInGetResponses/1, snmpInTraps/1,
+	 snmpOutTooBigs/1,
+	 snmpOutNoSuchNames/1,
+	 snmpOutBadValues/1, 
+	 snmpOutGenErrs/1,
+	 snmpOutGetRequests/1, snmpOutSetRequests/1, 
+	 snmpOutGetNexts/1,
+	 snmpOutGetResponses/1,
+	 snmpOutTraps/1]).
 -export([dummy/1, snmp_set_serial_no/1, snmp_set_serial_no/2]).
 -export([add_agent_caps/2, del_agent_caps/1, get_agent_caps/0]).
 -export([check_standard/1]).
@@ -200,18 +224,257 @@ variable_func(get, Name) ->
 inc(Name) -> inc(Name, 1).
 inc(Name, N) -> ets:update_counter(snmp_agent_table, Name, N).
 
+
+sysDescr(print) ->
+    VarAndValue = [{sysDescr,  sysDescr(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+    
+sysDescr(get) ->
+    VarDB = db(sysDescr), 
+    snmp_generic:variable_get(VarDB).
+    
+
+sysContact(print) ->
+    VarAndValue = [{sysContact,  sysContact(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+
+sysContact(get) ->
+    VarDB = db(sysContact), 
+    snmp_generic:variable_get(VarDB).
+
+
+sysName(print) ->
+    VarAndValue = [{sysName,  sysName(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+
+sysName(get) ->
+    VarDB = db(sysName), 
+    snmp_generic:variable_get(VarDB).
+
+
+sysLocation(print) ->
+    VarAndValue = [{sysLocation,  sysLocation(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+
+sysLocation(get) ->
+    VarDB = db(sysLocation), 
+    snmp_generic:variable_get(VarDB).
+
+
+sysServices(print) ->
+    VarAndValue = [{sysServices,  sysServices(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+
+sysServices(get) ->
+    VarDB = db(sysServices), 
+    snmp_generic:variable_get(VarDB).
+
+
+snmpInPkts(print) ->
+    gen_counter(print, snmpInPkts);
+snmpInPkts(get) ->
+    gen_counter(get, snmpInPkts).
+
+
+snmpOutPkts(print) ->
+    gen_counter(print, snmpOutPkts);
+snmpOutPkts(get) ->
+    gen_counter(get, snmpOutPkts).
+
+
+snmpInASNParseErrs(print) ->
+    gen_counter(print, snmpInASNParseErrs);
+snmpInASNParseErrs(get) ->
+    gen_counter(get, snmpInASNParseErrs).
+    
+
+snmpInBadCommunityNames(print) ->
+    gen_counter(print, snmpInBadCommunityNames);
+snmpInBadCommunityNames(get) ->
+    gen_counter(get, snmpInBadCommunityNames).
+    
+
+snmpInBadCommunityUses(print) ->
+    gen_counter(print, snmpInBadCommunityUses);
+
+snmpInBadCommunityUses(get) ->
+    gen_counter(get, snmpInBadCommunityUses).
+    
+
+snmpInBadVersions(print) ->
+    gen_counter(print, snmpInBadVersions);
+snmpInBadVersions(get) ->
+    gen_counter(get, snmpInBadVersions).
+    
+
+snmpInTooBigs(print) ->
+    gen_counter(print, snmpInTooBigs);
+snmpInTooBigs(get) ->
+    gen_counter(get, snmpInTooBigs).
+    
+
+snmpInNoSuchNames(print) ->
+    gen_counter(print, snmpInNoSuchNames);
+snmpInNoSuchNames(get) ->
+    gen_counter(get, snmpInNoSuchNames).
+    
+
+snmpInBadValues(print) ->
+    gen_counter(print, snmpInBadValues);
+snmpInBadValues(get) ->
+    gen_counter(get, snmpInBadValues).
+    
+
+snmpInReadOnlys(print) ->
+    gen_counter(print, snmpInReadOnlys);
+snmpInReadOnlys(get) ->
+    gen_counter(get, snmpInReadOnlys).
+    
+
+snmpInGenErrs(print) ->
+    gen_counter(print, snmpInGenErrs);
+snmpInGenErrs(get) ->
+    gen_counter(get, snmpInGenErrs).
+    
+
+snmpInTotalReqVars(print) ->
+    gen_counter(print, snmpInTotalReqVars);
+snmpInTotalReqVars(get) ->
+    gen_counter(get, snmpInTotalReqVars).
+    
+
+snmpInTotalSetVars(print) ->
+    gen_counter(print, snmpInTotalSetVars);
+snmpInTotalSetVars(get) ->
+    gen_counter(get, snmpInTotalSetVars).
+    
+
+snmpInGetRequests(print) ->
+    gen_counter(print, snmpInGetRequests);
+snmpInGetRequests(get) ->
+    gen_counter(get, snmpInGetRequests).
+    
+
+snmpInSetRequests(print) ->
+    gen_counter(print, snmpInSetRequests);
+snmpInSetRequests(get) ->
+    gen_counter(get, snmpInSetRequests).
+    
+
+snmpInGetNexts(print) ->
+    gen_counter(print, snmpInGetNexts);
+snmpInGetNexts(get) ->
+    gen_counter(get, snmpInGetNexts).
+    
+
+snmpInGetResponses(print) ->
+    gen_counter(print, snmpInGetResponses);
+snmpInGetResponses(get) ->
+    gen_counter(get, snmpInGetResponses).
+    
+
+snmpInTraps(print) ->
+    gen_counter(print, snmpInTraps);
+snmpInTraps(get) ->
+    gen_counter(get, snmpInTraps).
+    
+
+snmpOutTooBigs(print) ->
+    gen_counter(print, snmpOutTooBigs);
+snmpOutTooBigs(get) ->
+    gen_counter(get, snmpOutTooBigs).
+    
+
+snmpOutNoSuchNames(print) ->
+    gen_counter(print, snmpOutNoSuchNames);
+snmpOutNoSuchNames(get) ->
+    gen_counter(get, snmpOutNoSuchNames).
+    
+
+snmpOutBadValues(print) ->
+    gen_counter(print, snmpOutBadValues);
+snmpOutBadValues(get) ->
+    gen_counter(get, snmpOutBadValues).
+    
+
+snmpOutGenErrs(print) ->
+    gen_counter(print, snmpOutGenErrs);
+snmpOutGenErrs(get) ->
+    gen_counter(get, snmpOutGenErrs).
+    
+
+snmpOutGetRequests(print) ->
+    gen_counter(print, snmpOutGetRequests);
+snmpOutGetRequests(get) ->
+    gen_counter(get, snmpOutGetRequests).
+    
+
+snmpOutSetRequests(print) ->
+    gen_counter(print, snmpOutSetRequests);
+snmpOutSetRequests(get) ->
+    gen_counter(get, snmpOutSetRequests).
+    
+
+snmpOutGetNexts(print) ->
+    gen_counter(print, snmpOutGetNexts);
+snmpOutGetNexts(get) ->
+    gen_counter(get, snmpOutGetNexts).
+    
+
+snmpOutGetResponses(print) ->
+    gen_counter(print, snmpOutGetResponses);
+snmpOutGetResponses(get) ->
+    gen_counter(get, snmpOutGetResponses).
+    
+
+snmpOutTraps(print) ->
+    gen_counter(print, snmpOutTraps);
+snmpOutTraps(get) ->
+    gen_counter(get, snmpOutTraps).
+    
+
+gen_counter(print, Counter) ->
+    Val         = gen_counter(get, Counter), 
+    VarAndValue = [{Counter, Val}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+    
+gen_counter(get, Counter) ->
+    variable_func(get, Counter).
+
+
 %%-----------------------------------------------------------------
 %% This is the instrumentation function for sysUpTime.
 %%-----------------------------------------------------------------
+sysUpTime(print) ->
+    sys_up_time(print);
+sysUpTime(get) ->
+    sys_up_time(get).
+
 sys_up_time() ->
     snmpa:sys_up_time().
 
+sys_up_time(print) ->
+    VarAndValue = [{sysUpTime,  sys_up_time(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+
 sys_up_time(get) ->
     {value, snmpa:sys_up_time()}.
 
+
 %%-----------------------------------------------------------------
 %% This is the instrumentation function for snmpEnableAuthenTraps
 %%-----------------------------------------------------------------
+
+snmpEnableAuthenTraps(print) ->
+    snmp_enable_authen_traps(print);
+snmpEnableAuthenTraps(get) ->
+    snmp_enable_authen_traps(get).
+
+
+snmp_enable_authen_traps(print) ->
+    VarAndValue = [{snmpEnableAuthenTraps,  snmp_enable_authen_traps(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+    
 snmp_enable_authen_traps(new) ->
     snmp_generic:variable_func(new, db(snmpEnableAuthenTraps));
 
@@ -224,9 +487,19 @@ snmp_enable_authen_traps(get) ->
 snmp_enable_authen_traps(set, NewVal) ->
     snmp_generic:variable_func(set, NewVal, db(snmpEnableAuthenTraps)).
 
+
 %%-----------------------------------------------------------------
-%% This is the instrumentation function for sysObjectId
+%% This is the instrumentation function for sysObjectID
 %%-----------------------------------------------------------------
+sysObjectID(print) ->
+    sys_object_id(print);
+sysObjectID(get) ->
+    sys_object_id(get).
+
+sys_object_id(print) ->
+    VarAndValue = [{sysObjectID,  sys_object_id(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+
 sys_object_id(new) ->
     snmp_generic:variable_func(new, db(sysObjectID));
 
@@ -239,6 +512,7 @@ sys_object_id(get) ->
 sys_object_id(set, NewVal) ->
     snmp_generic:variable_func(set, NewVal, db(sysObjectID)).
 
+
 %%-----------------------------------------------------------------
 %% This is a dummy instrumentation function for objects like
 %% snmpTrapOID, that is accessible-for-notify, with different
@@ -247,6 +521,7 @@ sys_object_id(set, NewVal) ->
 %%-----------------------------------------------------------------
 dummy(_Op) -> ok.
 
+
 %%-----------------------------------------------------------------
 %% This is the instrumentation function for snmpSetSerialNo.
 %% It is always volatile.
diff --git a/lib/snmp/src/agent/snmp_target_mib.erl b/lib/snmp/src/agent/snmp_target_mib.erl
index a3ac67b533..270a5fd5b6 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -18,6 +18,8 @@
 %% 
 -module(snmp_target_mib).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([configure/1, reconfigure/1,
 	 snmpTargetSpinLock/1, snmpTargetSpinLock/2,
 	 snmpTargetAddrTable/1, snmpTargetAddrTable/3,
@@ -509,6 +511,10 @@ set_target_engine_id(TargetAddrName, EngineId) ->
 %%-----------------------------------------------------------------
 %% Instrumentation Functions
 %%-----------------------------------------------------------------
+snmpTargetSpinLock(print) ->
+    VarAndValue = [{snmpTargetSpinLock, snmpTargetSpinLock(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+    
 snmpTargetSpinLock(new) ->
     snmp_generic:variable_func(new, {snmpTargetSpinLock, volatile}),
     {A1,A2,A3} = erlang:now(),
@@ -589,12 +595,9 @@ snmpTargetAddrTable(print) ->
 				     ?'snmpTargetAddrRowStatus_active' -> active;
 				     _ -> undefined
 				 end,
-				 Prefix,
-				 element(?snmpTargetAddrEngineId, Row),
-				 Prefix,
-				 element(?snmpTargetAddrTMask, Row),
-				 Prefix,
-				 element(?snmpTargetAddrMMS, Row)]))
+				 Prefix, element(?snmpTargetAddrEngineId, Row),
+				 Prefix, element(?snmpTargetAddrTMask, Row),
+				 Prefix, element(?snmpTargetAddrMMS, Row)]))
 	end,
     snmpa_mib_lib:print_table(Table, DB, FOI, PrintRow);
 %% Op == new | 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 7b881f888c..69cebc858b 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -18,12 +18,20 @@
 %% 
 -module(snmp_user_based_sm_mib).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([configure/1, reconfigure/1,
 	 usmUserSpinLock/1, usmUserSpinLock/2,
 	 usmUserTable/1, usmUserTable/3,
 	 table_next/2,
 	 is_engine_id_known/1, get_user/2, get_user_from_security_name/2,
 	 mk_key_change/3, mk_key_change/5, extract_new_key/3, mk_random/1]).
+-export([usmStatsUnsupportedSecLevels/1,
+	 usmStatsNotInTimeWindows/1,
+	 usmStatsUnknownUserNames/1,
+	 usmStatsUnknownEngineIDs/1,
+	 usmStatsWrongDigests/1,
+	 usmStatsDecryptionErrors/1]).
 -export([add_user/1, add_user/13, delete_user/1]).
 
 %% Internal
@@ -301,6 +309,54 @@ gc_tabs() ->
 %%-----------------------------------------------------------------
 %% Counter functions
 %%-----------------------------------------------------------------
+
+usmStatsUnsupportedSecLevels(print) ->
+    VarAndValue = [{usmStatsUnsupportedSecLevels, 
+		    usmStatsUnsupportedSecLevels(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+usmStatsUnsupportedSecLevels(get) ->
+    get_counter(usmStatsUnsupportedSecLevels).
+
+usmStatsNotInTimeWindows(print) ->
+    VarAndValue = [{usmStatsNotInTimeWindows, usmStatsNotInTimeWindows(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+usmStatsNotInTimeWindows(get) ->
+    get_counter(usmStatsNotInTimeWindows).
+
+usmStatsUnknownUserNames(print) ->
+    VarAndValue = [{usmStatsUnknownUserNames, usmStatsUnknownUserNames(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+usmStatsUnknownUserNames(get) ->
+    get_counter(usmStatsUnknownUserNames).
+
+usmStatsUnknownEngineIDs(print) ->
+    VarAndValue = [{usmStatsUnknownEngineIDs, usmStatsUnknownEngineIDs(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+usmStatsUnknownEngineIDs(get) ->
+    get_counter(usmStatsUnknownEngineIDs).
+
+usmStatsWrongDigests(print) ->
+    VarAndValue = [{usmStatsWrongDigests, usmStatsWrongDigests(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+usmStatsWrongDigests(get) ->
+    get_counter(usmStatsWrongDigests).
+
+usmStatsDecryptionErrors(print) ->
+    VarAndValue = [{usmStatsDecryptionErrors, usmStatsDecryptionErrors(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+usmStatsDecryptionErrors(get) ->
+    get_counter(usmStatsDecryptionErrors).
+
+
+get_counter(Name) ->
+    case (catch ets:lookup(snmp_agent_table, Name)) of
+	[{_, Val}] ->
+	    {value, Val};
+	_ ->
+	    genErr
+    end.
+
+
 init_vars() -> lists:map(fun maybe_create_var/1, vars()).
 
 maybe_create_var(Var) ->
@@ -321,6 +377,7 @@ vars() ->
      usmStatsDecryptionErrors
     ].
 
+
 %%-----------------------------------------------------------------
 %% API functions
 %%-----------------------------------------------------------------
@@ -372,6 +429,11 @@ get_user_from_security_name(EngineID, SecName) ->
 %%-----------------------------------------------------------------
 %% Instrumentation Functions
 %%-----------------------------------------------------------------
+
+usmUserSpinLock(print) ->
+    VarAndValue = [{usmUserSpinLock, usmUserSpinLock(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+    
 usmUserSpinLock(new) ->
     snmp_generic:variable_func(new, {usmUserSpinLock, volatile}),
     {A1,A2,A3} = erlang:now(),
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 873ab00545..3e5091a555 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -18,6 +18,8 @@
 %% 
 -module(snmp_view_based_acm_mib).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([configure/1, reconfigure/1, table_next/2, get/3]).
 
 -export([vacmAccessTable/1, vacmAccessTable/3,
@@ -131,7 +133,6 @@ check_vacm({vacmSecurityToGroup, SecModel, SecName, GroupName}) ->
     {ok, SecM} = snmp_conf:check_sec_model(SecModel, []),
     snmp_conf:check_string(SecName),
     snmp_conf:check_string(GroupName),
-
     Vacm = {SecM, SecName, GroupName,
 	    ?'StorageType_nonVolatile', ?'RowStatus_active'},
     {ok, {vacmSecurityToGroup, Vacm}};
@@ -179,15 +180,22 @@ init_tabs(Sec2Group, Access, View) ->
     snmpa_local_db:table_delete(db(vacmSecurityToGroupTable)),
     snmpa_local_db:table_create(db(vacmSecurityToGroupTable)),
     init_sec2group_table(Sec2Group),
+
+    ?vdebug("create vacm access table",[]),
+    snmpa_vacm:cleanup(),
     init_access_table(Access),
+
     ?vdebug("create vacm view-tree-family table",[]),
     snmpa_local_db:table_delete(db(vacmViewTreeFamilyTable)),
     snmpa_local_db:table_create(db(vacmViewTreeFamilyTable)),
-    init_view_table(View).
+    init_view_table(View),
+
+    ?vdebug("table(s) initiated",[]),
+    ok.
     
 init_sec2group_table([Row | T]) ->
-%     ?vtrace("init security-to-group table: "
-% 	    "~n   Row: ~p",[Row]),    
+%%      ?vtrace("init security-to-group table: "
+%%  	    "~n   Row: ~p",[Row]),    
     Key1 = element(1, Row),
     Key2 = element(2, Row),
     Key = [Key1, length(Key2) | Key2],
@@ -196,12 +204,12 @@ init_sec2group_table([Row | T]) ->
 init_sec2group_table([]) -> true.
 
 init_access_table([{GN, Prefix, Model, Level, Row} | T]) ->
-%     ?vtrace("init access table: "
-% 	    "~n   GN:     ~p"
-% 	    "~n   Prefix: ~p"
-% 	    "~n   Model:  ~p"
-% 	    "~n   Level:  ~p"
-% 	    "~n   Row:    ~p",[GN, Prefix, Model, Level, Row]),    
+%%     ?vtrace("init access table: "
+%%  	    "~n   GN:     ~p"
+%%  	    "~n   Prefix: ~p"
+%%  	    "~n   Model:  ~p"
+%%  	    "~n   Level:  ~p"
+%%  	    "~n   Row:    ~p",[GN, Prefix, Model, Level, Row]),    
     Key = [length(GN) | GN] ++ [length(Prefix) | Prefix] ++ [Model, Level],
     snmpa_vacm:insert([{Key, Row}], false),
     init_access_table(T);
@@ -209,8 +217,8 @@ init_access_table([]) ->
     snmpa_vacm:dump_table().
 
 init_view_table([Row | T]) ->
-%     ?vtrace("init view table: "
-% 	    "~n   Row: ~p",[Row]),    
+%%     ?vtrace("init view table: "
+%%  	    "~n   Row: ~p",[Row]),    
     Key1 = element(1, Row),
     Key2 = element(2, Row),
     Key = [length(Key1) | Key1] ++ [length(Key2) | Key2],
@@ -346,6 +354,49 @@ vacmContextTable(Op, Arg1, Arg2) ->
     snmp_framework_mib:intContextTable(Op, Arg1, Arg2).
 
 
+vacmSecurityToGroupTable(print) ->
+    Table = vacmSecurityToGroupTable, 
+    DB    = db(Table),
+    FOI   = foi(Table),
+    PrintRow = 
+	fun(Prefix, Row) ->
+		lists:flatten(
+		  io_lib:format("~sSecurityModel: ~p (~w)"
+				"~n~sSecurityName:  ~p"
+				"~n~sGroupName:     ~p"
+				"~n~sStorageType:   ~p (~w)"
+				"~n~sStatus:        ~p (~w)", 
+				[Prefix, element(?vacmSecurityModel, Row), 
+				 case element(?vacmSecurityModel, Row) of
+				     ?SEC_ANY -> any;
+				     ?SEC_V1  -> v1;
+				     ?SEC_V2C -> v2c;
+				     ?SEC_USM -> usm;
+				     _ -> undefined
+				 end,
+				 Prefix, element(?vacmSecurityName, Row),
+				 Prefix, element(?vacmGroupName, Row),
+				 Prefix, element(?vacmSecurityToGroupStorageType, Row),
+				 case element(?vacmSecurityToGroupStorageType, Row) of
+				     ?'vacmSecurityToGroupStorageType_readOnly' -> readOnly;
+				     ?'vacmSecurityToGroupStorageType_permanent' -> permanent;
+				     ?'vacmSecurityToGroupStorageType_nonVolatile' -> nonVolatile;
+				     ?'vacmSecurityToGroupStorageType_volatile' -> volatile;
+				     ?'vacmSecurityToGroupStorageType_other' -> other;
+				     _ -> undefined
+				 end,
+				 Prefix, element(?vacmSecurityToGroupStatus, Row), 
+				 case element(?vacmSecurityToGroupStatus, Row) of
+				     ?'vacmSecurityToGroupStatus_destroy' -> destroy;
+				     ?'vacmSecurityToGroupStatus_createAndWait' -> createAndWait;
+				     ?'vacmSecurityToGroupStatus_createAndGo' -> createAndGo;
+				     ?'vacmSecurityToGroupStatus_notReady' -> notReady;
+				     ?'vacmSecurityToGroupStatus_notInService' -> notInService;
+				     ?'vacmSecurityToGroupStatus_active' -> active;
+				     _ -> undefined
+				 end]))
+	end,
+    snmpa_mib_lib:print_table(Table, DB, FOI, PrintRow);
 vacmSecurityToGroupTable(Op) ->
     snmp_generic:table_func(Op, db(vacmSecurityToGroupTable)).
 
@@ -400,13 +451,13 @@ verify_vacmSecurityToGroupTable_cols([{Col, Val0}|Cols], Acc) ->
 verify_vacmSecurityToGroupTable_col(?vacmSecurityModel, Model) ->
     case Model of
 	any      -> ?SEC_ANY;
-	v1       -> ?SEC_ANY;
-	v2c      -> ?SEC_ANY;
-	usm      -> ?SEC_ANY;
+	v1       -> ?SEC_V1;
+	v2c      -> ?SEC_V2C;
+	usm      -> ?SEC_USM;
 	?SEC_ANY -> ?SEC_ANY;
-	?SEC_V1  -> ?SEC_ANY;
-	?SEC_V2C -> ?SEC_ANY;
-	?SEC_USM -> ?SEC_ANY;
+	?SEC_V1  -> ?SEC_V1;
+	?SEC_V2C -> ?SEC_V2C;
+	?SEC_USM -> ?SEC_USM;
 	_ ->
 	    ?vlog("verification of vacmSecurityModel(~w) ~p failed", 
 		  [?vacmSecurityModel, Model]),
@@ -443,6 +494,49 @@ verify_vacmSecurityToGroupTable_col(_, Val) ->
 %%    {RowIndex, {Col4, Col5, ..., Col9}}
 %%
 %%-----------------------------------------------------------------
+vacmAccessTable(print) ->
+    %% M�ste jag g�ra om alla entrien till {RowIdx, Row}?
+    TableInfo = get_table(vacmAccessTable), 
+    PrintRow = 
+	fun(Prefix, Row) ->
+		lists:flatten(
+		  io_lib:format("~sContextMatch:   ~p (~w)"
+				"~n~sReadViewName:   ~p"
+				"~n~sWriteViewName:  ~p"
+				"~n~sNotifyViewName: ~p"
+				"~n~sStorageType:    ~p (~w)"
+				"~n~sStatus:         ~p (~w)", 
+				[Prefix, element(?vacmAccessContextMatch-3, Row), 
+				 case element(?vacmAccessContextMatch-3, Row) of
+				     ?vacmAccessContextMatch_exact  -> exact;
+				     ?vacmAccessContextMatch_prefix -> prefix;
+				     _ -> undefined
+				 end,
+				 Prefix, element(?vacmAccessReadViewName-3, Row), 
+				 Prefix, element(?vacmAccessWriteViewName-3, Row), 
+				 Prefix, element(?vacmAccessNotifyViewName-3, Row), 
+ 				 Prefix, element(?vacmAccessStorageType-3, Row), 
+ 				 case element(?vacmAccessStorageType-3, Row) of
+ 				     ?vacmAccessStorageType_other       -> other ;
+ 				     ?vacmAccessStorageType_volatile    -> volatile;
+ 				     ?vacmAccessStorageType_nonVolatile -> nonVolatile;
+ 				     ?vacmAccessStorageType_permanent   -> permanent;
+ 				     ?vacmAccessStorageType_readOnly    -> readOnly;
+ 				     _ -> undefined
+ 				 end,
+ 				 Prefix, element(?vacmAccessStatus-3, Row), 
+ 				 case element(?vacmAccessStatus-3, Row) of
+ 				     ?vacmAccessStatus_destroy       -> destroy;
+ 				     ?vacmAccessStatus_createAndWait -> createAndWait;
+ 				     ?vacmAccessStatus_createAndGo   -> createAndGo;
+ 				     ?vacmAccessStatus_notReady      -> notReady;
+ 				     ?vacmAccessStatus_notInService  -> notInService;
+ 				     ?vacmAccessStatus_active        -> active;
+ 				     _ -> undefined
+ 				 end
+				]))
+	end,
+    snmpa_mib_lib:print_table(vacmAccessTable, {ok, TableInfo}, PrintRow);
 vacmAccessTable(_Op) ->
     ok.
 vacmAccessTable(get, RowIndex, Cols) ->
@@ -538,24 +632,24 @@ verify_vacmAccessTable_col(?vacmAccessContextPrefix, Pref) ->
 verify_vacmAccessTable_col(?vacmAccessSecurityModel, Model) ->
     case Model of
 	any      -> ?SEC_ANY;
-	v1       -> ?SEC_ANY;
-	v2c      -> ?SEC_ANY;
-	usm      -> ?SEC_ANY;
+	v1       -> ?SEC_V1;
+	v2c      -> ?SEC_V2C;
+	usm      -> ?SEC_USM;
 	?SEC_ANY -> ?SEC_ANY;
-	?SEC_V1  -> ?SEC_ANY;
-	?SEC_V2C -> ?SEC_ANY;
-	?SEC_USM -> ?SEC_ANY;
+	?SEC_V1  -> ?SEC_V1;
+	?SEC_V2C -> ?SEC_V2C;
+	?SEC_USM -> ?SEC_USM;
 	_ ->
 	    wrongValue(?vacmAccessSecurityModel)
     end;
 verify_vacmAccessTable_col(?vacmAccessSecurityLevel, Level) ->
     case Level of
-        noAuthNoPriv -> 1;
-        authNoPriv   -> 2;
-        authPriv     -> 3;
-        1            -> 1;
-        2            -> 2;
-        3            -> 3;
+        noAuthNoPriv -> ?vacmAccessSecurityLevel_noAuthNoPriv;
+        authNoPriv   -> ?vacmAccessSecurityLevel_authNoPriv;
+        authPriv     -> ?vacmAccessSecurityLevel_authPriv;
+        ?vacmAccessSecurityLevel_noAuthNoPriv -> ?vacmAccessSecurityLevel_noAuthNoPriv;
+        ?vacmAccessSecurityLevel_authNoPriv   -> ?vacmAccessSecurityLevel_authNoPriv;
+        ?vacmAccessSecurityLevel_authPriv     -> ?vacmAccessSecurityLevel_authPriv;
         _            -> wrongValue(?vacmAccessSecurityLevel)
     end;
 verify_vacmAccessTable_col(?vacmAccessContextMatch, Match) ->
@@ -662,6 +756,7 @@ do_get_next(RowIndex, Cols) ->
 	    end
     end.
 
+
 %%-----------------------------------------------------------------
 %% Functions to manipulate vacmAccessRows.
 %%-----------------------------------------------------------------
@@ -694,29 +789,76 @@ split_cols([Col | Cols], PreCols) when Col =< 3 ->
 split_cols(Cols, PreCols) ->
     {PreCols, Cols}.
 
+vacmViewSpinLock(print) ->
+    VarAndValue = [{vacmViewSpinLock, vacmViewSpinLock(get)}],
+    snmpa_mib_lib:print_variables(VarAndValue);
+
 vacmViewSpinLock(new) ->
-    snmp_generic:variable_func(new, {vacmViewSpinLock, volatile}),
+    snmp_generic:variable_func(new, volatile_db(vacmViewSpinLock)),
     {A1,A2,A3} = erlang:now(),
     random:seed(A1,A2,A3),
     Val = random:uniform(2147483648) - 1,
-    snmp_generic:variable_func(set, Val, {vacmViewSpinLock, volatile});
+    snmp_generic:variable_func(set, Val, volatile_db(vacmViewSpinLock));
 
 vacmViewSpinLock(delete) ->
     ok;
 
 vacmViewSpinLock(get) ->
-    snmp_generic:variable_func(get, {vacmViewSpinLock, volatile}).
+    snmp_generic:variable_func(get, volatile_db(vacmViewSpinLock)).
 
 vacmViewSpinLock(is_set_ok, NewVal) ->
-    case snmp_generic:variable_func(get, {vacmViewSpinLock, volatile}) of
+    case snmp_generic:variable_func(get, volatile_db(vacmViewSpinLock)) of
 	{value, NewVal} -> noError;
 	_ -> inconsistentValue
     end;
 vacmViewSpinLock(set, NewVal) ->
     snmp_generic:variable_func(set, (NewVal + 1) rem 2147483648,
-			       {vacmViewSpinLock, volatile}).
-
-
+			       volatile_db(vacmViewSpinLock)).
+
+
+vacmViewTreeFamilyTable(print) ->
+    Table = vacmViewTreeFamilyTable, 
+    DB    = db(Table),
+    FOI   = foi(Table),
+    PrintRow = 
+	fun(Prefix, Row) ->
+		lists:flatten(
+		  io_lib:format("~sViewName:    ~p"
+				"~n~sSubtree:     ~p"
+				"~n~sMask:        ~p"
+				"~n~sType:        ~p (~w)"
+				"~n~sStorageType: ~p (~w)"
+				"~n~sStatus:      ~p (~w)", 
+				[Prefix, element(?vacmViewTreeFamilyViewName, Row),
+				 Prefix, element(?vacmViewTreeFamilySubtree,  Row),
+				 Prefix, element(?vacmViewTreeFamilyMask, Row),
+				 Prefix, element(?vacmViewTreeFamilyType, Row), 
+				 case element(?vacmViewTreeFamilyType, Row) of
+				     ?vacmViewTreeFamilyType_included -> included;
+				     ?vacmViewTreeFamilyType_excluded -> excluded;
+				     _ -> undefined
+				 end,
+				 Prefix, element(?vacmViewTreeFamilyStorageType, Row), 
+				 case element(?vacmViewTreeFamilyStorageType, Row) of
+				     ?vacmViewTreeFamilyStorageType_readOnly -> readOnly;
+				     ?vacmViewTreeFamilyStorageType_permanent -> permanent;
+				     ?vacmViewTreeFamilyStorageType_nonVolatile -> nonVolatile;
+				     ?vacmViewTreeFamilyStorageType_volatile -> volatile;
+				     ?vacmViewTreeFamilyStorageType_other -> other;
+				     _ -> undefined
+				 end,
+				 Prefix, element(?vacmViewTreeFamilyStatus, Row), 
+				 case element(?vacmViewTreeFamilyStatus, Row) of
+				     ?vacmViewTreeFamilyStatus_destroy -> destroy;
+				     ?vacmViewTreeFamilyStatus_createAndWait -> createAndWait;
+				     ?vacmViewTreeFamilyStatus_createAndGo -> createAndGo;
+				     ?vacmViewTreeFamilyStatus_notReady -> notReady;
+				     ?vacmViewTreeFamilyStatus_notInService -> notInService;
+				     ?vacmViewTreeFamilyStatus_active -> active;
+				     _ -> undefined
+				 end]))
+	end,
+    snmpa_mib_lib:print_table(Table, DB, FOI, PrintRow);
 vacmViewTreeFamilyTable(Op) ->
     snmp_generic:table_func(Op, db(vacmViewTreeFamilyTable)).
 vacmViewTreeFamilyTable(get_next, RowIndex, Cols) ->
@@ -793,7 +935,25 @@ table_next(Name, RestOid) ->
     snmp_generic:table_next(db(Name), RestOid).
 
 
-db(X) -> snmpa_agent:db(X).
+get_table(vacmAccessTable) ->
+    do_get_vacmAccessTable([], []).
+
+do_get_vacmAccessTable(Key0, Acc) ->
+    case snmpa_vacm:get_next_row(Key0) of
+	{Key, _Row} = Entry ->
+	    do_get_vacmAccessTable(Key, [Entry | Acc]);
+	false ->
+	    lists:reverse(Acc)
+    end.
+
+
+%%-----------------------------------------------------------------
+%% Wrappers
+%%-----------------------------------------------------------------
+
+db(X)          -> snmpa_agent:db(X).
+volatile_db(X) -> {X, volatile}.
+    
 
 fa(vacmSecurityToGroupTable) -> ?vacmGroupName;
 fa(vacmViewTreeFamilyTable) -> ?vacmViewTreeFamilyMask.
diff --git a/lib/snmp/src/agent/snmpa.erl b/lib/snmp/src/agent/snmpa.erl
index 87b191caed..22fbd33add 100644
--- a/lib/snmp/src/agent/snmpa.erl
+++ b/lib/snmp/src/agent/snmpa.erl
@@ -105,6 +105,8 @@
 	 set_request_limit/1, set_request_limit/2
 	]).
 
+-export([print_mib_info/0, print_mib_tables/0, print_mib_variables/0]).
+
 -include("snmpa_atl.hrl").
 
 -define(EXTRA_INFO, undefined).
@@ -283,6 +285,186 @@ whereis_mib(Agent, Mib) when is_atom(Mib) ->
 
 %% -
 
+mibs_info() ->
+    [
+     {snmp_standard_mib, 
+      [],
+      [
+       sysDescr, 
+       sysObjectID, 
+       sysContact, 
+       sysName, 
+       sysLocation, 
+       sysServices, 
+       snmpEnableAuthenTraps,
+       sysUpTime,
+       snmpInPkts,
+       snmpOutPkts, 
+       snmpInBadVersions, 
+       snmpInBadCommunityNames, 
+       snmpInBadCommunityUses, 
+       snmpInASNParseErrs, 
+       snmpInTooBigs, 
+       snmpInNoSuchNames, 
+       snmpInBadValues, 
+       snmpInReadOnlys, 
+       snmpInGenErrs, 
+       snmpInTotalReqVars, 
+       snmpInTotalSetVars, 
+       snmpInGetRequests, 
+       snmpInSetRequests, 
+       snmpInGetNexts, 
+       snmpInGetResponses, 
+       snmpInTraps, 
+       snmpOutTooBigs, 
+       snmpOutNoSuchNames, 
+       snmpOutBadValues, 
+       snmpOutGenErrs, 
+       snmpOutGetRequests, 
+       snmpOutSetRequests, 
+       snmpOutGetNexts, 
+       snmpOutGetResponses, 
+       snmpOutTraps
+      ]
+     },
+     {snmp_framework_mib, 
+      [
+      ],
+      [
+       snmpEngineID,
+       snmpEngineBoots,
+       snmpEngineTime,
+       snmpEngineMaxMessageSize
+      ]
+     },
+     {snmp_view_based_acm_mib, 
+      [
+       vacmAccessTable,
+       vacmSecurityToGroupTable,
+       vacmViewTreeFamilyTable
+      ],
+      [
+       vacmViewSpinLock
+      ]
+     },
+     {snmp_target_mib, 
+      [
+       snmpTargetAddrTable,
+       snmpTargetParamsTable
+      ], 
+      [
+       snmpTargetSpinLock
+      ]
+     },
+     {snmp_community_mib, 
+      [
+       snmpCommunityTable
+      ], 
+      []
+     },
+     {snmp_notification_mib, 
+      [
+       snmpNotifyTable
+      ], 
+      []},
+     {snmp_user_based_sm_mib, 
+      [
+       usmUserTable
+      ], 
+      [
+       usmUserSpinLock,
+       usmStatsUnsupportedSecLevels, 
+       usmStatsNotInTimeWindows, 
+       usmStatsUnknownUserNames, 
+       usmStatsUnknownEngineIDs, 
+       usmStatsWrongDigests, 
+       usmStatsDecryptionErrors
+      ]
+     }
+    ].
+
+print_mib_info() ->
+    MibsInfo = mibs_info(),
+    print_mib_info(MibsInfo).
+
+print_mib_info([]) ->
+    io:format("~n", []),
+    ok;
+print_mib_info([{Mod, Tables, Variables} | MibsInfo]) ->
+    io:format("~n** ~s ** ~n~n", [make_pretty_mib(Mod)]),
+    print_mib_variables2(Mod, Variables),
+    print_mib_tables2(Mod, Tables),
+    io:format("~n", []),
+    print_mib_info(MibsInfo).
+
+
+print_mib_tables() ->
+    Tables = [{Mod, Tabs} || {Mod, Tabs, _Vars} <- mibs_info()],
+    print_mib_tables(Tables).
+
+print_mib_tables([]) ->
+    ok;
+print_mib_tables([{Mod, Tabs}|MibTabs]) 
+  when is_atom(Mod) andalso is_list(Tabs) ->
+    print_mib_tables(Mod, Tabs),
+    print_mib_tables(MibTabs);
+print_mib_tables([_|MibTabs]) ->
+    print_mib_tables(MibTabs).
+
+print_mib_tables(_Mod, [] = _Tables) ->
+    ok;
+print_mib_tables(Mod, Tables) ->
+    io:format("~n** ~s ** ~n~n", [make_pretty_mib(Mod)]),
+    print_mib_tables2(Mod, Tables), 
+    io:format("~n", []).
+
+print_mib_tables2(Mod, Tables) ->
+    [(catch Mod:Table(print)) || Table <- Tables].
+
+
+print_mib_variables() ->
+    Variables = [{Mod, Vars} || {Mod, _Tabs, Vars} <- mibs_info()],
+    print_mib_variables(Variables).
+
+print_mib_variables([]) ->
+    ok;
+print_mib_variables([{Mod, Vars}|MibVars]) 
+  when is_atom(Mod) andalso is_list(Vars) ->
+    print_mib_variables(Mod, Vars),
+    print_mib_variables(MibVars);
+print_mib_variables([_|MibVars]) ->
+    print_mib_variables(MibVars).
+
+print_mib_variables(_Mod, [] = _Vars) ->
+    ok;
+print_mib_variables(Mod, Vars) ->
+    io:format("~n** ~s ** ~n~n", [make_pretty_mib(Mod)]),
+    print_mib_variables2(Mod, Vars), 
+    io:format("~n", []).
+
+print_mib_variables2(Mod, Variables) ->
+    Vars = [{Var, (catch Mod:Var(get))} || Var <- Variables],
+    snmpa_mib_lib:print_variables(Vars).
+
+
+make_pretty_mib(snmp_view_based_acm_mib) ->
+    "SNMP-VIEW-BASED-ACM-MIB";
+make_pretty_mib(snmp_target_mib) ->
+    "SNMP-TARGET-MIB";
+make_pretty_mib(snmp_community_mib) ->
+    "SNMP-COMMUNITY-MIB";
+make_pretty_mib(snmp_notification_mib) ->
+    "SNMP-NOTIFICATION-MIB";
+make_pretty_mib(snmp_user_based_sm_mib) ->
+    "SNMP-USER-BASED-SM-MIB";
+make_pretty_mib(snmp_framework_mib) ->
+    "SNMP-FRAMEWORK-MIB";
+make_pretty_mib(Mod) ->
+    atom_to_list(Mod).
+
+
+%% -
+
 mib_of(Oid) ->
     snmpa_agent:mib_of(Oid).
 
diff --git a/lib/snmp/src/agent/snmpa_conf.erl b/lib/snmp/src/agent/snmpa_conf.erl
index b14a0c806c..b4fc716b3e 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -19,6 +19,8 @@
 
 -module(snmpa_conf).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([
 	 %% agent.conf
 	 agent_entry/2,
diff --git a/lib/snmp/src/agent/snmpa_mib_lib.erl b/lib/snmp/src/agent/snmpa_mib_lib.erl
index 441228b9ee..cb96ff8056 100644
--- a/lib/snmp/src/agent/snmpa_mib_lib.erl
+++ b/lib/snmp/src/agent/snmpa_mib_lib.erl
@@ -19,7 +19,8 @@
 -module(snmpa_mib_lib).
 
 -export([table_cre_row/3, table_del_row/2]).
--export([get_table/2, print_table/3, print_table/4, print_tables/1]).
+-export([get_table/2]).
+-export([print_variables/1, print_table/3, print_table/4, print_tables/1]).
 -export([gc_tab/3, gc_tab/5]).
 
 -include("SNMPv2-TC.hrl").
@@ -81,31 +82,69 @@ get_table(NameDb, FOI, Oid, Acc) ->
     end.
     
 
+print_variables(Variables) when is_list(Variables) ->
+    Variables2 = print_variables_prefixify(Variables), 
+    lists:foreach(fun({Variable, ValueResult, Prefix}) ->
+			  print_variable(Variable, ValueResult, Prefix)
+		  end, Variables2),
+    ok.
+
+print_variable(Variable, {value, Val}, Prefix) when is_atom(Variable) ->
+    io:format("~w~s=> ~p~n", [Variable, Prefix, Val]);
+print_variable(Variable, Error, Prefix) when is_atom(Variable) ->
+    io:format("~w~s=> [e] ~p~n", [Variable, Prefix, Error]).
+
+print_variables_prefixify(Variables) ->
+    MaxVarLength = print_variables_maxlength(Variables),
+    print_variables_prefixify(Variables, MaxVarLength, []).
+
+print_variables_prefixify([], _MaxVarLength, Acc) ->
+    lists:reverse(Acc);
+print_variables_prefixify([{Var, Res}|Variables], MaxVarLength, Acc) ->
+    Prefix = make_variable_print_prefix(Var, MaxVarLength),
+    print_variables_prefixify(Variables, MaxVarLength, 
+			      [{Var, Res, Prefix}|Acc]).
+    
+make_variable_print_prefix(Var, MaxVarLength) ->
+    lists:duplicate(MaxVarLength - length(atom_to_list(Var)) + 1, $ ).
+
+print_variables_maxlength(Variables) ->
+    print_variables_maxlength(Variables, 0).
+
+print_variables_maxlength([], MaxLength) ->
+    MaxLength;
+print_variables_maxlength([{Var, _}|Variables], MaxLength) when is_atom(Var) ->
+    VarLen = length(atom_to_list(Var)),
+    if 
+	VarLen > MaxLength ->
+	    print_variables_maxlength(Variables, VarLen);
+	true ->
+	    print_variables_maxlength(Variables, MaxLength)
+    end.
+
+
 print_tables(Tables) when is_list(Tables) ->
     lists:foreach(fun({Table, DB, FOI, PrintRow}) ->
 			  print_table(Table, DB, FOI, PrintRow)
 		  end, Tables),
     ok.
 
-%% print_table(Table, DB, FOI, PrintRow) ->
-%%     TableInfo = get_table(DB(Table), FOI(Table)),
-%%     print_table(Table, TableInfo, PrintRow),
-%%     ok.
-
 print_table(Table, DB, FOI, PrintRow) ->
     TableInfo = get_table(DB, FOI),
     print_table(Table, TableInfo, PrintRow).
 
 print_table(Table, TableInfo, PrintRow) when is_function(PrintRow, 2) ->
-    io:format("~w => ~n", [Table]),
+    io:format("~w =>", [Table]),
     do_print_table(TableInfo, PrintRow).
 
+do_print_table({ok, [] = _TableInfo}, _PrintRow) ->
+    io:format(" -~n", []);
 do_print_table({ok, TableInfo}, PrintRow) when is_function(PrintRow, 2) ->
+    io:format("~n", []),
     lists:foreach(fun({RowIdx, Row}) ->
 			  io:format("   ~w => ~n~s~n", 
 				    [RowIdx, PrintRow("      ", Row)])
-		  end, TableInfo),
-    io:format("~n", []);
+		  end, TableInfo);
 do_print_table({error, {invalid_rowindex, BadRowIndex, []}}, _PrintRow) ->
     io:format("Error: Bad rowindex ~w~n", [BadRowIndex]);
 do_print_table({error, {invalid_rowindex, BadRowIndex, TableInfo}}, PrintRow) ->
diff --git a/lib/snmp/src/agent/snmpa_net_if.erl b/lib/snmp/src/agent/snmpa_net_if.erl
index 3a91cf4033..97a7a63dee 100644
--- a/lib/snmp/src/agent/snmpa_net_if.erl
+++ b/lib/snmp/src/agent/snmpa_net_if.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2004-2010. 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(snmpa_net_if).
@@ -478,12 +478,13 @@ update_req_counter_outgoing(#state{limit = Limit, rcnt = RCnt} = S,
     S#state{rcnt = NewRCnt}.
     
 
-maybe_handle_recv(#state{filter = FilterMod} = S, 
+maybe_handle_recv(#state{usock = Sock, filter = FilterMod} = S, 
 		  Ip, Port, Packet) ->
     case (catch FilterMod:accept_recv(Ip, Port)) of
 	false ->
 	    %% Drop the received packet 
 	    inc(netIfMsgInDrops),
+	    active_once(Sock),
 	    S;
 	_ ->
 	    handle_recv(S, Ip, Port, Packet)
diff --git a/lib/snmp/src/agent/snmpa_target_cache.erl b/lib/snmp/src/agent/snmpa_target_cache.erl
index 6fdecacc68..2aa35aa46a 100644
--- a/lib/snmp/src/agent/snmpa_target_cache.erl
+++ b/lib/snmp/src/agent/snmpa_target_cache.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -21,6 +21,8 @@
 -behaviour(gen_server).
 
 %% External exports
+%% Avoid warning for local function demonitor/1 clashing with autoimported BIF.
+-compile({no_auto_import,[demonitor/1]}).
 -export([start_link/2, stop/0, verbosity/1]).
 
 -export([
diff --git a/lib/snmp/src/agent/snmpa_usm.erl b/lib/snmp/src/agent/snmpa_usm.erl
index ae584bb3c1..f35d1f1916 100644
--- a/lib/snmp/src/agent/snmpa_usm.erl
+++ b/lib/snmp/src/agent/snmpa_usm.erl
@@ -18,6 +18,10 @@
 %%
 -module(snmpa_usm).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([
 	 process_incoming_msg/4, process_incoming_msg/5, 
 	 generate_outgoing_msg/5, generate_outgoing_msg/6,
diff --git a/lib/snmp/src/agent/snmpa_vacm.erl b/lib/snmp/src/agent/snmpa_vacm.erl
index 2eacea4301..892dc265f1 100644
--- a/lib/snmp/src/agent/snmpa_vacm.erl
+++ b/lib/snmp/src/agent/snmpa_vacm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -21,7 +21,7 @@
 -export([get_mib_view/5]).
 -export([init/1, init/2, backup/1]).
 -export([delete/1, get_row/1, get_next_row/1, insert/1, insert/2,
-	 dump_table/0]).
+	 cleanup/0, dump_table/0]).
 
 -include("SNMPv2-TC.hrl").
 -include("SNMP-VIEW-BASED-ACM-MIB.hrl").
@@ -256,6 +256,11 @@ delete(Key) ->
     ets:delete(snmpa_vacm, Key),
     dump_table().
 
+
+cleanup() ->
+    ets:delete_all_objects(snmpa_vacm),
+    dump_table().
+
 dump_table(true) ->
     dump_table();
 dump_table(_) ->
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 9ad16ffad2..de0e5d6e14 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 1999-2011. 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%
 %%
 
@@ -22,126 +22,30 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
-  {"4.16.2", 
-   [
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, []},
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.16.1", 
-   [
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-    {load_module, snmp_pdus, soft_purge, soft_purge, []},
-    {load_module, snmp_usm, soft_purge, soft_purge, []},
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
-    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.16", 
-   [
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-    {load_module, snmp_usm, soft_purge, soft_purge, []},
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
-    {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
-    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]}, 
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []},
-    {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},
-    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.15",   
-   [
-    {load_module, snmp_config, soft_purge, soft_purge, []},
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-    {load_module, snmp_usm, soft_purge, soft_purge, []},
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
-    {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
-    {update,      snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
-     soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-    {update,      snmpm_net_if, {advanced, upgrade_from_pre_4_16}, 
-     soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
-    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
-    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.14",   
-   [
-    {load_module, snmp_config, soft_purge, soft_purge, []},
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-    {load_module, snmp_usm, soft_purge, soft_purge, []},
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
-    {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
-    {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
-     soft_purge, soft_purge, [snmp_log, snmpa_agent]}, 
-    {update, snmpa_mib, soft, soft_purge, soft_purge, []},
-    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []},
-    {load_module, snmpm_user, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
-    {update, snmpm_net_if, {advanced, upgrade_from_pre_4_16}, 
-     soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
-    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
-    {update,      snmpm_server, soft, soft_purge, soft_purge,  
-     [snmpm_user_default]}
-   ]
-  }, 
-  {"4.13.5",   
+  {"4.18", 
    [
-    {load_module, snmp_config, soft_purge, soft_purge, []},
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-    {load_module, snmp_usm, soft_purge, soft_purge, []},
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
-    {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {load_module, snmpa_mib_data, soft_purge, soft_purge, []},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
-    {update, snmpa_net_if, {advanced, upgrade_from_pre_4_16}, 
-     soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update, snmpa_mib, soft, soft_purge, soft_purge, [snmpa_mib_data]},
-    {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []},
-    {load_module, snmpm_user, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
-    {update, snmpm_net_if, {advanced, upgrade_from_pre_4_14}, 
-     soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
-    {update, snmpm_config, soft, soft_purge, soft_purge, []},
-    {update, snmpm_server, soft, soft_purge, soft_purge, [snmpm_user_default]},
-    {add_module, snmpm_net_if_filter},
-    {add_module, snmpm_network_interface_filter}
+    {load_module, snmp_misc, soft_purge, soft_purge, []},
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
+    {load_module, snmpa, soft_purge, soft_purge, 
+     [snmp_community_mib, 
+      snmp_framework_mib, 
+      snmp_standard_mib, 
+      snmp_target_mib, 
+      snmp_user_based_sm_mib, 
+      snmp_view_based_acm_mib]},
+    {load_module, snmp_community_mib,      soft_purge, soft_purge, 
+     [snmpa_mib_lib]},
+    {load_module, snmp_framework_mib,      soft_purge, soft_purge, 
+     [snmpa_mib_lib]},
+    {load_module, snmp_standard_mib,       soft_purge, soft_purge, 
+     [snmpa_mib_lib]},
+    {load_module, snmp_target_mib,         soft_purge, soft_purge, 
+     [snmpa_mib_lib]},
+    {load_module, snmp_user_based_sm_mib,  soft_purge, soft_purge, 
+     [snmpa_mib_lib]},
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
+     [snmpa_mib_lib, snmpa_vacm]},
+    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}
    ]
   }
  ], 
@@ -149,128 +53,30 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
-  {"4.16.2", 
-   [
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, []},
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []},
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.16.1", 
-   [
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-    {load_module, snmp_pdus, soft_purge, soft_purge, []},
-    {load_module, snmp_usm, soft_purge, soft_purge, []},
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
-    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.16", 
-   [
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-    {load_module, snmp_usm, soft_purge, soft_purge, []},
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
-    {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
-    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []},
-    {update,      snmpm_net_if, soft, soft_purge, soft_purge, []},
-    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.15",   
-   [
-    {load_module, snmp_config, soft_purge, soft_purge, []},
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-    {load_module, snmp_usm, soft_purge, soft_purge, []},
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
-    {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
-    {update,      snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
-     soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
-    {update,      snmpm_net_if, {advanced, downgrade_to_pre_4_16}, 
-     soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
-    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
-    {update,      snmpm_server, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.14",   
-   [
-    {load_module, snmp_config, soft_purge, soft_purge, []},
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-    {load_module, snmp_usm, soft_purge, soft_purge, []},
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
-    {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
-    {update,      snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
-     soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update,      snmpa_mib, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []},
-    {load_module, snmpm_user, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
-    {update,      snmpm_net_if, {advanced, downgrade_to_pre_4_16}, 
-     soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
-    {update,      snmpm_config, soft, soft_purge, soft_purge, []},
-    {update,      snmpm_server, soft, soft_purge, soft_purge, 
-     [snmpm_user_default]}
-   ]
-  }, 
-  {"4.13.5",
+  {"4.18", 
    [
-    {load_module, snmp_config, soft_purge, soft_purge, []},
-    {load_module, snmp_log, soft_purge, soft_purge, []},
-    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
-    {load_module, snmp_usm, soft_purge, soft_purge, []},
-
-    {load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
-    {load_module, snmpa_general_db, soft_purge, soft_purge, []},
-    {load_module, snmpa_mib_data, soft_purge, soft_purge, []},
-    {load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
-    {load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
-    {update, snmpa_net_if, {advanced, downgrade_to_pre_4_16}, 
-     soft_purge, soft_purge, [snmpa_agent, snmp_log]}, 
-    {update,      snmpa_mib, soft, soft_purge, soft_purge, [snmpa_mib_data]}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
-
-    {load_module, snmpm_mpd, soft_purge, soft_purge, []},
-    {load_module, snmpm_user, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]}, 
-    {update, snmpm_net_if, {advanced, downgrade_to_pre_4_14}, 
-     soft_purge, soft_purge, [snmpm_config, snmp_log]}, 
-    {update, snmpm_config, soft, soft_purge, soft_purge, []},
-    {update, snmpm_server, soft, soft_purge, soft_purge, [snmpm_user_default]},
-
-    {remove, {snmpm_net_if_filter, soft_purge, brutal_purge}},
-    {remove, {snmpm_network_interface_filter, soft_purge, brutal_purge}}
+    {load_module, snmp_misc, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []},
+    {load_module, snmpa, soft_purge, soft_purge, 
+     [snmp_community_mib, 
+      snmp_framework_mib, 
+      snmp_standard_mib, 
+      snmp_target_mib, 
+      snmp_user_based_sm_mib, 
+      snmp_view_based_acm_mib]},
+    {load_module, snmp_community_mib,      soft_purge, soft_purge, 
+     [snmpa_mib_lib]},
+    {load_module, snmp_framework_mib,      soft_purge, soft_purge, 
+     [snmpa_mib_lib]},
+    {load_module, snmp_standard_mib,       soft_purge, soft_purge, 
+     [snmpa_mib_lib]},
+    {load_module, snmp_target_mib,         soft_purge, soft_purge, 
+     [snmpa_mib_lib]},
+    {load_module, snmp_user_based_sm_mib,  soft_purge, soft_purge, 
+     [snmpa_mib_lib]},
+    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, 
+     [snmpa_mib_lib, snmpa_vacm]},
+    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}
    ]
   }
  ]
diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile
index 4be60e1835..1f1086eae1 100644
--- a/lib/snmp/src/compile/Makefile
+++ b/lib/snmp/src/compile/Makefile
@@ -20,6 +20,7 @@
 include $(ERL_TOP)/make/target.mk
 
 EBIN = ../../ebin
+BIN  = ../../bin
 
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
@@ -44,9 +45,11 @@ RELSYSDIR = $(RELEASE_PATH)/lib/snmp-$(VSN)
 
 include modules.mk
 
+ESCRIPT_BIN = $(ESCRIPT_SRC:%.src=$(BIN)/%)
+
 ERL_FILES = $(MODULES:%=%.erl)
 
-TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(ESCRIPT_BIN)
 
 GENERATED_PARSER = $(PARSER_MODULE:%=%.erl)
 
@@ -97,8 +100,12 @@ info:
 	@echo ""
 	@echo "EBIN: $(EBIN)"
 	@echo ""
+	@echo "ESCRIPT_SRC:      $(ESCRIPT_SRC)"
+	@echo "ESCRIPT_BIN:      $(ESCRIPT_BIN)"
+	@echo ""
 	@echo ""
 
+
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
@@ -107,6 +114,7 @@ parser: $(PARSER_TARGET)
 
 $(GENERATED_PARSER): $(PARSER_SRC)
 
+
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
@@ -115,9 +123,11 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
 	$(INSTALL_DIR) $(RELSYSDIR)/src/compiler
-	$(INSTALL_DATA) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/compiler
+	$(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src/compiler
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+	$(INSTALL_DIR) $(RELSYSDIR)/bin
+	$(INSTALL_SCRIPT) $(ESCRIPT_BIN) $(RELSYSDIR)/bin
 
 release_docs_spec:
 
diff --git a/lib/snmp/src/compile/depend.mk b/lib/snmp/src/compile/depend.mk
index 75af1bf293..74eb6e0864 100644
--- a/lib/snmp/src/compile/depend.mk
+++ b/lib/snmp/src/compile/depend.mk
@@ -44,3 +44,6 @@ $(EBIN)/snmpc_mib_gram.$(EMULATOR): \
 	../../include/snmp_types.hrl \
 	snmpc_mib_gram.erl
 
+$(BIN)/snmpc: snmpc.src
+	$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
+	chmod 755 $@
diff --git a/lib/snmp/src/compile/modules.mk b/lib/snmp/src/compile/modules.mk
index 6365b0e694..ca78e2e6a9 100644
--- a/lib/snmp/src/compile/modules.mk
+++ b/lib/snmp/src/compile/modules.mk
@@ -21,6 +21,9 @@ PARSER_SRC = snmpc_mib_gram.yrl
 
 PARSER_MODULE = $(PARSER_SRC:%.yrl=%)
 
+ESCRIPT_SRC = \
+	snmpc.src
+
 MODULES = \
 	$(PARSER_MODULE) \
 	snmpc \
diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl
index a7f2cdc2bc..195c238184 100644
--- a/lib/snmp/src/compile/snmpc.erl
+++ b/lib/snmp/src/compile/snmpc.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -112,6 +112,8 @@ compile(FileName) ->
 %%          description
 %%          reference
 %%          imports
+%%          agent_capabilities
+%%          module_compliance
 %%          module_identity
 %%          {module, string()}
 %%          no_defs
@@ -203,6 +205,10 @@ get_options([imports|Opts], Formats, Args) ->
     get_options(Opts, ["~n   imports"|Formats], Args);
 get_options([module_identity|Opts], Formats, Args) ->
     get_options(Opts, ["~n   module_identity"|Formats], Args);
+get_options([module_compliance|Opts], Formats, Args) ->
+    get_options(Opts, ["~n   module_compliance"|Formats], Args);
+get_options([agent_capabilities|Opts], Formats, Args) ->
+    get_options(Opts, ["~n   agent_capabilities"|Formats], Args);
 get_options([relaxed_row_name_assign_check|Opts], Formats, Args) ->
     get_options(Opts, ["~n   relaxed_row_name_assign_check"|Formats], Args);
 get_options([_|Opts], Formats, Args) ->
@@ -288,6 +294,10 @@ check_options([imports| T]) ->
     check_options(T);
 check_options([module_identity| T]) ->
     check_options(T);
+check_options([module_compliance| T]) ->
+    check_options(T);
+check_options([agent_capabilities| T]) ->
+    check_options(T);
 check_options([relaxed_row_name_assign_check| T]) ->
     check_options(T);
 check_options([{module, M} | T]) when is_atom(M) ->
@@ -315,6 +325,12 @@ get_description(Options) ->
 get_reference(Options) ->
     get_bool_option(reference, Options).
 
+get_agent_capabilities(Options) ->
+    get_bool_option(agent_capabilities, Options).
+
+get_module_compliance(Options) ->
+    get_bool_option(module_compliance, Options).
+
 get_relaxed_row_name_assign_check(Options) ->
     lists:member(relaxed_row_name_assign_check, Options).
 
@@ -387,10 +403,12 @@ get_verbosity(Options) ->
 init(From, MibFileName, Options) ->
     {A,B,C} = now(),
     random:seed(A,B,C),
-    put(options,     Options),
-    put(verbosity,   get_verbosity(Options)),
-    put(description, get_description(Options)),
-    put(reference,   get_reference(Options)),
+    put(options,            Options),
+    put(verbosity,          get_verbosity(Options)),
+    put(description,        get_description(Options)),
+    put(reference,          get_reference(Options)),
+    put(agent_capabilities, get_agent_capabilities(Options)),
+    put(module_compliance,  get_module_compliance(Options)),
     File = filename:rootname(MibFileName, ".mib"),
     put(filename, filename:basename(File ++ ".mib")),
     R = case catch c_impl(File) of
@@ -876,12 +894,12 @@ definitions_loop([{#mc_object_type{name        = NameOfEntry,
 
 definitions_loop([{#mc_notification{name   = TrapName,
 				    status = deprecated}, Line}|T],
-		 false) ->
+		 #dldata{deprecated = false} = Data) ->
     ?vinfo2("defloop -> notification ~w is deprecated => ignored",
 	    [TrapName], Line),    
     update_status(TrapName, deprecated),
     ensure_macro_imported('NOTIFICATION-TYPE', Line),
-    definitions_loop(T, false);    
+    definitions_loop(T, Data);    
 
 definitions_loop([{#mc_notification{name   = TrapName,
 				    status = obsolete}, Line}|T],
@@ -921,10 +939,96 @@ definitions_loop([{#mc_notification{name        = TrapName,
     snmpc_lib:add_cdata(#cdata.traps, [Notif]),
     definitions_loop(T, Data);    
 
-definitions_loop([{#mc_module_compliance{name = Name},Line}|T], Data) ->
-    ?vlog2("defloop -> module_compliance:"
-	   "~n   Name: ~p", [Name], Line),
+definitions_loop([{#mc_agent_capabilities{name        = Name,
+					  status      = Status,
+					  description = Desc,
+					  reference   = Ref,
+					  modules     = Mods, 
+					  name_assign = {Parent, SubIdx}},Line}|T], Data) ->
+    ?vlog2("defloop -> agent_capabilities ~p:"
+	   "~n   Status:       ~p"
+	   "~n   Desc:         ~p"
+	   "~n   Ref:          ~p"
+	   "~n   Mods:         ~p"
+	   "~n   Parent:       ~p"
+	   "~n   SubIndex:     ~p", 
+	   [Name, Status, Desc, Ref, Mods, Parent, SubIdx], Line),
+    ensure_macro_imported('AGENT-CAPABILITIES', Line),
+    case get(agent_capabilities) of
+	true ->
+	    update_status(Name, Status),
+	    snmpc_lib:register_oid(Line, Name, Parent, SubIdx),
+	    NewME       = snmpc_lib:makeInternalNode2(false, Name),
+	    Description = make_description(Desc), 
+	    Reference   = 
+		case Ref of
+		    undefined ->
+			[];
+		    _ ->
+			[{reference, Ref}]
+		end,
+	    Modules     = 
+		case Mods of
+		    undefined ->
+			[];
+		    [] ->
+			[];
+		    _ ->
+			[{modules, Mods}]
+		end,
+	    AssocList = Reference ++ Modules,
+	    NewME2 = NewME#me{description = Description,
+			      assocList   = AssocList}, 
+	    snmpc_lib:add_cdata(#cdata.mes, [NewME2]);
+	_ ->
+	    ok
+    end,
+    definitions_loop(T, Data);
+
+definitions_loop([{#mc_module_compliance{name        = Name,
+					 status      = Status,
+					 description = Desc,
+					 reference   = Ref,
+					 modules     = Mods, 
+					 name_assign = {Parent, SubIdx}},Line}|T], Data) ->
+    ?vlog2("defloop -> module_compliance: ~p"
+	   "~n   Status:       ~p"
+	   "~n   Desc:         ~p"
+	   "~n   Ref:          ~p"
+	   "~n   Mods:         ~p"
+	   "~n   Parent:       ~p"
+	   "~n   SubIndex:     ~p", 
+	   [Name, Status, Desc, Ref, Mods, Parent, SubIdx], Line),
     ensure_macro_imported('MODULE-COMPLIANCE', Line),
+    case get(module_compliance) of
+	true ->
+	    update_status(Name, Status),
+	    snmpc_lib:register_oid(Line, Name, Parent, SubIdx),
+	    NewME       = snmpc_lib:makeInternalNode2(false, Name),
+	    Description = make_description(Desc), 
+	    Reference   = 
+		case Ref of
+		    undefined ->
+			[];
+		    _ ->
+			[{reference, Ref}]
+		end,
+	    Modules    = 
+		case Mods of
+		    undefined ->
+			[];
+		    [] ->
+			[];
+		    _ ->
+			[{modules, Mods}]
+		end,
+	    AssocList = Reference ++ Modules,
+	    NewME2 = NewME#me{description = Description,
+			      assocList   = AssocList}, 
+	    snmpc_lib:add_cdata(#cdata.mes, [NewME2]);
+	_ ->
+	    ok
+    end,
     definitions_loop(T, Data);
 
 definitions_loop([{#mc_object_group{name        = Name,
@@ -1328,22 +1432,26 @@ save(Filename, MibName, Options) ->
 
 
 parse(FileName) ->
+%%     ?vtrace("parse -> start tokenizer for ~p", [FileName]),
     case snmpc_tok:start_link(reserved_words(),
 			      [{file, FileName ++ ".mib"},
 			       {forget_stringdata, true}]) of
 	{error,ReasonStr} ->
 	    snmpc_lib:error(lists:flatten(ReasonStr),[]);
 	{ok, TokPid} ->
+%% 	    ?vtrace("parse ->  tokenizer start, now get tokens", []),
 	    Toks = snmpc_tok:get_all_tokens(TokPid),
+%% 	    ?vtrace("parse ->  tokens: ~p", [Toks]),
 	    set_version(Toks),
-	    %% io:format("parse -> lexical analysis: ~n~p~n", [Toks]),
-	    %% t("parse -> lexical analysis: ~n~p", [Toks]),
+	    %% ?vtrace("parse -> lexical analysis: ~n~p", [Toks]),
             CDataArg =
                 case lists:keysearch(module, 1, get(options)) of
                     {value, {module, M}} -> {module, M};
                     _ -> {file, FileName ++ ".funcs"}
                 end,
             put(cdata,snmpc_lib:make_cdata(CDataArg)),
+%% 	    ?vtrace("parse ->  stop tokenizer and then do the actual parse", 
+%% 		    []),
 	    snmpc_tok:stop(TokPid),
 	    Res = if 
 		      is_list(Toks) ->
@@ -1351,7 +1459,7 @@ parse(FileName) ->
 		      true ->
 			  Toks
 		  end,
-	    %% t("parse -> parsed: ~n~p", [Res]),
+%% 	    ?vtrace("parse -> parsed result: ~n~p", [Res]),
 	    case Res of
 		{ok, PData} ->
 		    {ok, PData};
@@ -1443,6 +1551,10 @@ reserved_words() ->
       'NOTIFICATION-GROUP',
       'NOTIFICATIONS',
       'MODULE-COMPLIANCE',
+      'AGENT-CAPABILITIES',
+      'PRODUCT-RELEASE',
+      'SUPPORTS',
+      'INCLUDES',
       'MODULE',
       'MANDATORY-GROUPS',
       'GROUP',
diff --git a/lib/snmp/src/compile/snmpc.hrl b/lib/snmp/src/compile/snmpc.hrl
index eb896cde6b..1c0808d065 100644
--- a/lib/snmp/src/compile/snmpc.hrl
+++ b/lib/snmp/src/compile/snmpc.hrl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -103,16 +103,75 @@
        ).
 
 
+-record(mc_agent_capabilities,
+	{name,
+	 product_release,
+	 status,
+	 description,
+	 reference,
+	 modules,
+	 name_assign
+	}
+       ).
+
+-record(mc_ac_module, 
+	{name,
+	 groups,
+	 variation
+	}
+       ).
+
+-record(mc_ac_object_variation,
+	{name,
+	 syntax, 
+	 write_syntax,
+	 access,
+	 creation,
+	 default_value,
+	 description
+	}
+       ).
+
+-record(mc_ac_notification_variation,
+	{name,
+	 access,
+	 description
+	}
+       ).
+
+
 -record(mc_module_compliance,
 	{name,
 	 status,
 	 description,
 	 reference,
-	 module,
+	 modules,
 	 name_assign
 	}
        ).
 
+-record(mc_mc_compliance_group, 
+	{name,
+	 description
+	}
+       ).
+
+-record(mc_mc_object, 
+	{name,
+	 syntax,
+	 write_syntax,
+	 access, 
+	 description
+	}
+       ).
+
+-record(mc_mc_module, 
+	{name,
+	 mandatory,
+	 compliance
+	}
+       ).
+
 
 -record(mc_object_group,
 	{name,
diff --git a/lib/snmp/src/compile/snmpc.src b/lib/snmp/src/compile/snmpc.src
new file mode 100644
index 0000000000..e0734c056e
--- /dev/null
+++ b/lib/snmp/src/compile/snmpc.src
@@ -0,0 +1,381 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2008-2009. 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%
+%%
+%% SNMP MIB compiler frontend
+%% 
+
+-mode(compile).
+
+-include_lib("kernel/include/file.hrl").
+-include_lib("snmp/include/snmp_types.hrl").
+
+
+-record(state, 
+        {
+	 version = "%VSN%", 
+         mfv, 
+         file, % .mib or .bin depending on which are compiled
+         outdir = "./",
+         db = volatile,
+	 include_dirs = ["./"],
+         include_lib_dirs = [],
+	 deprecated         = false,
+	 group_check        = true,
+	 description        = false,
+	 reference          = false,
+	 imports            = false,
+	 module_identity    = false,
+	 module_compliance  = false, 
+	 agent_capabilities = false,
+	 module,
+	 no_defaults        = false,
+	 relaxed_row_name_assigne_check = false,
+	 %% The default verbosity (silence) will be filled in 
+	 %% during argument processing.
+	 verbosity, 
+	 warnings           = false
+        }).
+
+
+%% ------------------------------------------------------------------------
+%% Valid arguments: 
+%% --o Dir [defaults to "./"]
+%% --i Dir [defaults to "./"]
+%% --il Dir
+%% --sgc
+%% --db DB [defaults to volatile]
+%% --dep
+%% --desc
+%% --ref
+%% --imp
+%% --mi
+%% --mc
+%% --ac
+%% --mod Mod
+%% --nd
+%% --rrnac
+%% --version
+%% --verbosity V
+%% --warnings
+main(Args) when is_list(Args) ->
+    case (catch process_args(Args)) of
+	ok ->
+	    usage();
+        {ok, State} when is_record(State, state) ->
+	    compile(State);
+        {ok, Str} when is_list(Str) ->
+            io:format("~s~n~n", [Str]),
+            halt(1);
+        {error, ReasonStr} ->
+            usage(ReasonStr)
+    end;
+main(_) ->
+    usage().
+
+compile(State) ->
+    %% io:format("snmpc: ~p~n", [State]),
+    case mk_file(State) of
+	{mib, File} ->
+	    Options = mk_mib_options(State),
+	    case mib2bin(File, Options) of
+		{ok, _BinFileName} ->
+		    ok;
+		{error, Reason} ->
+		    io:format("ERROR: Failed compiling mib: "
+			      "~n   ~p~n", [Reason]),
+		    halt(1)
+	    end;
+	{bin, File} ->
+	    Options = mk_hrl_options(State),
+	    case bin2hrl(File, Options) of
+		ok ->
+		    ok;
+		{error, Reason} ->
+		    io:format("ERROR: Failed generating hrl from mib: "
+			      "~n   ~p~n", [Reason]),
+		    halt(1)
+	    end
+    end.
+
+mib2bin(MibFileName, Options) ->
+    snmpc:compile(MibFileName, Options).
+
+bin2hrl(BinFileName, {OutDir, Verbosity}) ->
+    MibName = filename:basename(BinFileName), 
+    BinFile = BinFileName ++ ".bin",
+    HrlFile = filename:join(OutDir, MibName) ++ ".hrl",
+    put(verbosity, Verbosity),
+    snmpc_mib_to_hrl:convert(BinFile, HrlFile, MibName).
+	    
+
+mk_file(#state{file = MIB}) ->
+    DirName  = filename:dirname(MIB),
+    case filename:extension(MIB) of
+	".mib" ->
+	    BaseName = filename:basename(MIB, ".mib"),
+	    {mib, filename:join(DirName, BaseName)};
+	".bin"  ->
+	    BaseName = filename:basename(MIB, ".bin"),
+	    {bin, filename:join(DirName, BaseName)};
+	BadExt ->
+	    e(lists:flatten(io_lib:format("Unsupported file type: ~s", [BadExt])))
+    end.
+
+mk_mib_options(#state{outdir             = OutDir, 
+		      db                 = DB,
+		      include_dirs       = IDs,
+		      include_lib_dirs   = ILDs,
+		      deprecated         = Dep,
+		      group_check        = GC,
+		      description        = Desc,
+		      reference          = Ref,
+		      imports            = Imp,
+		      module_identity    = MI,
+		      module_compliance  = MC, 
+		      agent_capabilities = AC,
+		      module             = Mod,
+		      no_defaults        = ND,
+		      relaxed_row_name_assigne_check = RRNAC,
+		      %% The default verbosity (silence) will be filled in 
+		      %% during argument processing.
+		      verbosity          = V, 
+		      warnings           = W}) ->
+    [{outdir,                        OutDir}, 
+     {db,                            DB},
+     {i,                             IDs},
+     {il,                            ILDs},
+     {group_check,                   GC},
+     {verbosity,                     V}, 
+     {warnings,                      W}, 
+     {deprecated,                    Dep}] ++ 
+	if
+	    (Mod =/= undefined) ->
+		[{module, Mod}];
+	    true ->
+		[]
+	end ++ 
+	maybe_option(ND,    no_defs) ++ 
+	maybe_option(RRNAC, relaxed_row_name_assign_check) ++ 
+	maybe_option(Desc,  description) ++ 
+	maybe_option(Ref,   reference) ++ 
+	maybe_option(Imp,   imports) ++ 
+	maybe_option(MI,    module_identity) ++ 
+	maybe_option(MC,    module_compliance) ++ 
+	maybe_option(AC,    agent_capabilities).
+
+maybe_option(true, Opt) -> [Opt];
+maybe_option(_,    _)   -> [].
+    
+
+mk_hrl_options(#state{outdir    = OutDir, 
+		      verbosity = Verbosity}) ->
+    {OutDir, Verbosity}.
+
+
+process_args([]) ->
+    e("No input file");
+process_args(Args) ->
+    #mib{mib_format_version = MFV} = #mib{},
+    State = #state{}, 
+    process_args(Args, State#state{mfv = MFV}).
+    
+process_args([], #state{verbosity = Verbosity0, file = MIB} = State) ->
+    if 
+	(MIB =:= undefined) ->
+	    e("No input file");
+	true ->
+	    Verbosity = 
+		case Verbosity0 of
+		    undefined ->
+			silence;
+		    _ ->
+			Verbosity0
+		end,
+	    IPath  = lists:reverse(State#state.include_dirs),
+	    IlPath = lists:reverse(State#state.include_lib_dirs),
+	    {ok, State#state{verbosity        = Verbosity,
+			     include_dirs     = IPath,
+			     include_lib_dirs = IlPath}}
+    end;
+process_args(["--help"|_Args], _State) ->
+    ok;
+process_args(["--version"|_Args], #state{version = Version, mfv = MFV} = _State) ->
+    {ok, lists:flatten(io_lib:format("snmpc ~s (~s)", [Version, MFV]))};
+process_args(["--verbosity", Verbosity0|Args], #state{verbosity = V} = State) 
+  when (V =:= undefined) ->
+    Verbosity = list_to_atom(Verbosity0),
+    case lists:member(Verbosity, [trace,debug,log,info,silence]) of
+	true ->
+	    process_args(Args, State#state{verbosity = Verbosity});
+	false ->
+	    e(lists:flatten(io_lib:format("Unknown verbosity: ~s", [Verbosity0])))
+    end;
+process_args(["--verbosity"|_Args], #state{verbosity = V}) 
+  when (V =/= undefined) ->
+    e(lists:flatten(io_lib:format("Verbosity already set to ~w", [V])));
+process_args(["--warnings"|Args], State) ->
+    process_args(Args, State#state{warnings = true});
+process_args(["--o", Dir|Args], State) ->
+    case (catch file:read_file_info(Dir)) of
+        {ok, #file_info{type = directory}} ->
+            process_args(Args, State#state{outdir = Dir});
+        {ok, #file_info{type = BadType}} ->
+            e(lists:flatten(io_lib:format("Not a directory: ~p (~w)", [Dir, BadType])));
+        _ ->
+            e(lists:flatten(io_lib:format("Bad directory: ~p", [Dir])))
+    end;
+process_args(["--i", Dir|Args], State) ->
+    case (catch file:read_file_info(Dir)) of
+        {ok, #file_info{type = directory}} ->
+	    IPath = [Dir | State#state.include_dirs], 
+            process_args(Args, State#state{include_dirs = IPath});
+        {ok, #file_info{type = BadType}} ->
+            e(lists:flatten(io_lib:format("Not a directory: ~p (~w)", [Dir, BadType])));
+        _ ->
+            e(lists:flatten(io_lib:format("Bad directory: ~p", [Dir])))
+    end;
+process_args(["--il", Dir|Args], State) ->
+    case (catch file:read_file_info(Dir)) of
+        {ok, #file_info{type = directory}} ->
+	    IlPath = [Dir | State#state.include_lib_dirs], 
+            process_args(Args, State#state{include_lib_dirs = IlPath});
+        {ok, #file_info{type = BadType}} ->
+            e(lists:flatten(io_lib:format("Not a directory: ~p (~w)", [Dir, BadType])));
+        _ ->
+            e(lists:flatten(io_lib:format("Bad directory: ~p", [Dir])))
+    end;
+process_args(["--db", DB0|Args], State) ->
+    DB = list_to_atom(DB0),
+    case lists:member(DB, [volatile,persistent,mnesia]) of
+	true ->
+	    process_args(Args, State#state{db = DB});
+	false ->
+            e(lists:flatten(io_lib:format("Invalid db: ~s", [DB0])))
+    end;
+process_args(["--dep"|Args], State) ->
+    process_args(Args, State#state{deprecated = true});
+process_args(["--sgc"|Args], State) ->
+    process_args(Args, State#state{group_check = false});
+process_args(["--desc"|Args], State) ->
+    process_args(Args, State#state{description = true});
+process_args(["--ref"|Args], State) ->
+    process_args(Args, State#state{reference = true});
+process_args(["--imp"|Args], State) ->
+    process_args(Args, State#state{imports = true});
+process_args(["--mi"|Args], State) ->
+    process_args(Args, State#state{module_identity = true});
+process_args(["--mod", Module0|Args], #state{module = M} = State) 
+  when (M =:= undefined) ->
+    Module = list_to_atom(Module0),
+    process_args(Args, State#state{module = Module});
+process_args(["--mod"|_Args], #state{module = M}) 
+  when (M =/= undefined) ->
+    e(lists:flatten(io_lib:format("Module already set to ~w", [M])));
+process_args(["--nd"|Args], State) ->
+    process_args(Args, State#state{no_defaults = true});
+process_args(["--rrnac"|Args], State) ->
+    process_args(Args, State#state{relaxed_row_name_assigne_check = true});
+process_args([MIB], State) ->
+    Ext = filename:extension(MIB),
+    if 
+	((Ext =:= ".mib") orelse (Ext =:= ".bin")) ->
+	    case (catch file:read_file_info(MIB)) of
+		{ok, #file_info{type = regular}} ->
+		    process_args([], State#state{file = MIB});
+		{ok, #file_info{type = BadType}} ->
+		    e(lists:flatten(io_lib:format("~s not a file: ~w", [MIB, BadType])));
+		{error, enoent} ->
+		    e(lists:flatten(io_lib:format("No such file: ~s", [MIB])));
+		_ ->
+		    e(lists:flatten(io_lib:format("Bad file: ~s", [MIB])))
+	    end; 
+	true ->
+	    e(lists:flatten(io_lib:format("Unknown option: ~s", [MIB])))
+    end;
+process_args([Arg|Args], _State) when Args =/= [] ->
+    e(lists:flatten(io_lib:format("Unknown option: ~s", [Arg]))).
+
+usage(ReasonStr) ->
+    io:format("ERROR: ~s~n", [ReasonStr]),
+    usage().
+
+usage() ->
+    io:format("Usage: snmpc [options] MIB.mib|MIB.bin"
+	      "~nCompile a MIB (.mib -> .bin) or generate an erlang header "
+	      "~nfile from a compiled MIB file (.bin -> .hrl)"
+	      "~nOptions:"
+	      "~n   --help                   - Prints this info."
+	      "~n   --version                - Prints compiler version."
+	      "~n   --verbosity <verbosity>  - Print debug info."
+	      "~n                              verbosity = trace | debug | log | info | silence"
+	      "~n                              Defaults to silence."
+	      "~n   --warnings               - Print warning messages."
+	      "~n   --o <output dir>         - The output dir."
+	      "~n                              Defaults to current working dir."
+	      "~n   --i <include dir>        - Add this dir to the list of dirs that will be"
+	      "~n                              searched for imported (compiled) MIB files."
+	      "~n                              The current workin dir will always be included. "
+	      "~n   --il <include_lib dir>   - Add this dir to the list of dirs that will be"
+	      "~n                              searched for imported (compiled) MIB files."
+	      "~n                              It assumes that the first element in the dir name"
+	      "~n                              correspond to an OTP application. For example snmp/mibs/"
+	      "~n                              The current workin dir and the <snmp-home>/priv/mibs "
+	      "~n                              are always listed last the includ path. "
+	      "~n   --db <DB>                - Database to used for the default instrumentation."
+	      "~n                              Defaults to volatile."
+	      "~n   --sgc                    - This option (skip group check), if present, disables "
+	      "~n                              the \"group check\" of the mib compiler. "
+	      "~n                              That is, should the OBJECT-GROUP and the NOTIFICATION-GROUP "
+	      "~n                              macro(s) be checked for correctness or not. "
+	      "~n                              By default the check is done. "
+	      "~n   --dep                    - Keep deprecated definition(s)."
+	      "~n                              If not specified the compiler will ignore"
+	      "~n                              deprecated definitions."
+	      "~n   --desc                   - The DESCRIPTION field will be included."
+	      "~n   --ref                    - The REFERENCE field will be included."
+	      "~n   --imp                    - The IMPORTS field will be included."
+	      "~n   --mi                     - The MODULE-IDENTITY field will be included."
+	      "~n   --mc                     - The MODULE-COMPLIANCE field will be included."
+	      "~n   --ac                     - The AGENT-CAPABILITIES field will be included."
+	      "~n   --mod <module>           - The module which implements all the instrumentation"
+	      "~n                              functions. "
+	      "~n                              The name of all instrumentation functions must"
+	      "~n                              be the same as the corresponding managed object"
+	      "~n                              it implements."
+	      "~n   --nd                     - The default instrumentation functions will *not* be used"
+	      "~n                              if a managed object have no instrumentation function. "
+	      "~n                              Instead this will be reported as an error, and the "
+	      "~n                              compilation aborts. "
+	      "~n   --rrnac                  - This option, if present, specifies that the row name "
+	      "~n                              assign check shall not be done strictly according to"
+	      "~n                              the SMI (which allows only the value 1). "
+	      "~n                              With this option, all values greater than zero is allowed"
+	      "~n                              (>= 1). This means that the error will be converted to "
+	      "~n                              a warning. "
+	      "~n                              By default it is not included, but if this option is "
+	      "~n                              present it will be. "
+	      "~n   "
+	      "~n", []),
+    halt(1).
+
+
+e(Reason) ->
+    throw({error, Reason}).
+
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl
index 4e5bc69f81..4f71c47bfa 100644
--- a/lib/snmp/src/compile/snmpc_lib.erl
+++ b/lib/snmp/src/compile/snmpc_lib.erl
@@ -20,6 +20,8 @@
 -module(snmpc_lib).
 
 %% API
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([test_father/4, make_ASN1type/1, import/1, makeInternalNode2/2,
 	 is_consistent/1, resolve_defval/1, make_variable_info/1,
 	 check_trap_name/3, make_table_info/4, get_final_mib/2, set_dir/2,
@@ -304,7 +306,10 @@ import_mib({{'SNMPv2-TC', ImportsFromMib},Line}) ->
     Macros = ['TEXTUAL-CONVENTION'],
     import_built_in_loop(ImportsFromMib,Nodes,Types,Macros,'SNMPv2-TC',Line);
 import_mib({{'SNMPv2-CONF', ImportsFromMib},Line}) ->
-    Macros = ['OBJECT-GROUP','NOTIFICATION-GROUP','MODULE-COMPLIANCE'],
+    Macros = ['OBJECT-GROUP',
+	      'NOTIFICATION-GROUP',
+	      'MODULE-COMPLIANCE', 
+	      'AGENT-CAPABILITIES'],
     import_built_in_loop(ImportsFromMib,[],[],Macros,'SNMPv2-CONF',Line);
 import_mib({{'RFC1155-SMI', ImportsFromMib},Line}) ->
     Nodes = [makeInternalNode(internet, [1,3,6,1]),
diff --git a/lib/snmp/src/compile/snmpc_mib_gram.yrl b/lib/snmp/src/compile/snmpc_mib_gram.yrl
index 1957f52936..74b9ddaa25 100644
--- a/lib/snmp/src/compile/snmpc_mib_gram.yrl
+++ b/lib/snmp/src/compile/snmpc_mib_gram.yrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -59,6 +59,7 @@ newtypename
 objectidentifier
 objectname
 objecttypev1
+prodrel
 range_num
 referpart
 size
@@ -79,7 +80,7 @@ revisions
 listofdefinitionsv2
 mibid
 last_updated
-oranization
+organization
 contact_info
 revision
 revision_string
@@ -101,19 +102,31 @@ textualconvention
 objectgroup
 notificationgroup
 modulecompliance
-modulepart
-modules
-module
-modulenamepart
-mandatorypart
-compliancepart
-compliances
-compliance
-compliancegroup
-object
+mc_modulepart
+mc_modules
+mc_module
+mc_modulenamepart
+mc_mandatorypart
+mc_compliancepart
+mc_compliances
+mc_compliance
+mc_compliancegroup
+mc_object
+mc_accesspart
+agentcapabilities
+ac_status
+ac_modulepart
+ac_modules
+ac_module
+ac_modulenamepart
+ac_variationpart
+ac_variations
+ac_variation
+ac_accesspart
+ac_access
+ac_creationpart
 syntaxpart
 writesyntaxpart
-accesspart
 fsyntax
 defbitsvalue
 defbitsnames
@@ -161,6 +174,12 @@ integer variable atom string quote '{' '}' '::=' ':' '=' ',' '.' '(' ')' ';' '|'
 'CONTACT-INFO'
 'MODULE-IDENTITY'
 'NOTIFICATION-TYPE'
+'PRODUCT-RELEASE'
+'AGENT-CAPABILITIES'
+'INCLUDES'
+'SUPPORTS'
+'VARIATION'
+'CREATION-REQUIRES'
 'MODULE-COMPLIANCE'
 'OBJECT-GROUP'
 'NOTIFICATION-GROUP'
@@ -212,8 +231,8 @@ mib -> mibname 'DEFINITIONS' implies 'BEGIN'
              defs        = Defs}.
 
 v1orv2 -> moduleidentity listofdefinitionsv2 :
-			  {v2_mib, ['$1'|lists:reverse('$2')]}.
-v1orv2 -> listofdefinitions : {v1_mib, lists:reverse('$1')}.
+			  {v2_mib, ['$1'|lreverse(v1orv2_mod, '$2')]}.
+v1orv2 -> listofdefinitions : {v1_mib, lreverse(v1orv2_list, '$1')}.
 
 definition -> objectidentifier : '$1'.
 definition -> objecttypev1 : '$1'.
@@ -231,7 +250,7 @@ imports -> imports_from_one_mib : ['$1'].
 imports -> imports_from_one_mib imports : ['$1' | '$2'].
 
 imports_from_one_mib -> listofimports 'FROM' variable :
-                        {{val('$3'), lists:reverse('$1')}, line_of('$2')}.
+                        {{val('$3'), lreverse(imports_from_one_mib, '$1')}, line_of('$2')}.
 
 listofimports -> import_stuff : ['$1'].
 listofimports -> listofimports ',' import_stuff : ['$3' | '$1'].
@@ -251,6 +270,8 @@ import_stuff -> 'MODULE-IDENTITY'
        : ensure_ver(2,'$1'), {builtin, 'MODULE-IDENTITY'}.
 import_stuff -> 'NOTIFICATION-TYPE' 
        : ensure_ver(2,'$1'), {builtin, 'NOTIFICATION-TYPE'}.
+import_stuff -> 'AGENT-CAPABILITIES' 
+       : ensure_ver(2,'$1'), {builtin, 'AGENT-CAPABILITIES'}.
 import_stuff -> 'MODULE-COMPLIANCE' 
        : ensure_ver(2,'$1'), {builtin, 'MODULE-COMPLIANCE'}.
 import_stuff -> 'NOTIFICATION-GROUP' 
@@ -296,7 +317,7 @@ import_stuff -> 'TAddress'
 
 traptype -> objectname 'TRAP-TYPE' 'ENTERPRISE' objectname varpart
 	    description referpart implies integer :
-            Trap = make_trap('$1', '$4', lists:reverse('$5'), 
+            Trap = make_trap('$1', '$4', lreverse(traptype, '$5'), 
                              '$6', '$7', val('$9')),
             {Trap, line_of('$2')}.
 
@@ -324,7 +345,7 @@ newtype -> newtypename implies syntax :
            {NT, line_of('$2')}.
 
 tableentrydefinition -> newtypename implies 'SEQUENCE' '{' fields '}' : 
-                        Seq = make_sequence('$1', lists:reverse('$5')),
+                        Seq = make_sequence('$1', lreverse(tableentrydefinition, '$5')),
                         {Seq, line_of('$3')}.
 
 % returns: list of {<fieldname>, <asn1_type>}
@@ -408,9 +429,9 @@ variables -> variables ',' objectname : ['$3' | '$1'].
 
 implies -> '::=' : '$1'.
 implies -> ':' ':' '=' : w("Sloppy asignment on line ~p", [line_of('$1')]), '$1'.
-descriptionfield -> string : lists:reverse(val('$1')).
+descriptionfield -> string : lreverse(descriptionfield, val('$1')).
 descriptionfield -> '$empty' : undefined.
-description -> 'DESCRIPTION' string : lists:reverse(val('$2')).
+description -> 'DESCRIPTION' string : lreverse(description, val('$2')).
 description -> '$empty' : undefined.
 
 displaypart -> 'DISPLAY-HINT' string : display_hint('$2') .
@@ -418,7 +439,7 @@ displaypart -> '$empty' : undefined .
 
 % returns: {indexes, undefined} 
 %        | {indexes, IndexList} where IndexList is a list of aliasnames.
-indexpartv1 -> 'INDEX' '{' indextypesv1 '}' : {indexes, lists:reverse('$3')}.
+indexpartv1 -> 'INDEX' '{' indextypesv1 '}' : {indexes, lreverse(indexpartv1, '$3')}.
 indexpartv1 -> '$empty' : {indexes, undefined}.
 
 indextypesv1 -> indextypev1 : ['$1'].
@@ -436,14 +457,16 @@ parentintegers -> atom '(' integer ')' parentintegers : [val('$3') | '$5'].
 defvalpart -> 'DEFVAL' '{' integer '}' : {defval, val('$3')}.
 defvalpart -> 'DEFVAL' '{' atom '}' : {defval, val('$3')}.
 defvalpart -> 'DEFVAL' '{' '{' defbitsvalue '}' '}' : {defval, '$4'}.
-defvalpart -> 'DEFVAL' '{' quote atom '}' 
-     : {defval, make_defval_for_string(line_of('$1'), lists:reverse(val('$3')),
-				       val('$4'))}.
-defvalpart -> 'DEFVAL' '{' quote variable '}' 
-     : {defval, make_defval_for_string(line_of('$1'), lists:reverse(val('$3')),
-				       val('$4'))}.
-defvalpart -> 'DEFVAL' '{' string '}' 
-     : {defval, lists:reverse(val('$3'))}.
+defvalpart -> 'DEFVAL' '{' quote atom '}' : 
+	      {defval, make_defval_for_string(line_of('$1'), 
+					      lreverse(defvalpart_quote_atom, val('$3')),
+					      val('$4'))}.
+defvalpart -> 'DEFVAL' '{' quote variable '}' : 
+	      {defval, make_defval_for_string(line_of('$1'), 
+					      lreverse(defvalpart_quote_variable, val('$3')),
+					      val('$4'))}.
+defvalpart -> 'DEFVAL' '{' string '}' : 
+	      {defval, lreverse(defvalpart_string, val('$3'))}.
 defvalpart -> '$empty' : undefined.
 
 defbitsvalue -> defbitsnames : '$1'.
@@ -461,7 +484,7 @@ accessv1 -> atom: accessv1('$1').
 
 statusv1 -> atom : statusv1('$1').
 
-referpart -> 'REFERENCE' string : lists:reverse(val('$2')).
+referpart -> 'REFERENCE' string : lreverse(referpart, val('$2')).
 referpart -> '$empty' : undefined.
 
 
@@ -471,7 +494,7 @@ referpart -> '$empty' : undefined.
 %%----------------------------------------------------------------------
 moduleidentity -> mibid 'MODULE-IDENTITY' 
                   'LAST-UPDATED' last_updated
-	          'ORGANIZATION' oranization
+	          'ORGANIZATION' organization
                   'CONTACT-INFO' contact_info
 	          'DESCRIPTION' descriptionfield 
                   revisionpart nameassign : 
@@ -480,20 +503,20 @@ moduleidentity -> mibid 'MODULE-IDENTITY'
                   {MI, line_of('$2')}.
 
 mibid -> atom : val('$1').
-last_updated -> string : lists:reverse(val('$1')) .
-oranization -> string : lists:reverse(val('$1')) .
-contact_info -> string : lists:reverse(val('$1')) .
+last_updated -> string : lreverse(last_updated, val('$1')) .
+organization -> string : lreverse(organization, val('$1')) .
+contact_info -> string : lreverse(contact_info, val('$1')) .
 
 revisionpart -> '$empty' : [] .
-revisionpart -> revisions : lists:reverse('$1') .
+revisionpart -> revisions : lreverse(revisionpart, '$1') .
 
 revisions -> revision : ['$1'] .
 revisions -> revisions revision : ['$2' | '$1'] .
 revision -> 'REVISION' revision_string 'DESCRIPTION' revision_desc : 
             make_revision('$2', '$4') .
 
-revision_string -> string : lists:reverse(val('$1')) .
-revision_desc   -> string : lists:reverse(val('$1')) .
+revision_string -> string : lreverse(revision_string, val('$1')) .
+revision_desc   -> string : lreverse(revision_desc, val('$1')) .
 
 definitionv2 -> objectidentifier : '$1'.
 definitionv2 -> objecttypev2 : '$1'.
@@ -505,6 +528,7 @@ definitionv2 -> notification : '$1'.
 definitionv2 -> objectgroup : '$1'.
 definitionv2 -> notificationgroup : '$1'.
 definitionv2 -> modulecompliance : '$1'.
+definitionv2 -> agentcapabilities : '$1'.
 
 listofdefinitionsv2 -> '$empty' : [] .
 listofdefinitionsv2 -> listofdefinitionsv2 definitionv2 : ['$2' | '$1'].
@@ -535,46 +559,127 @@ notificationgroup -> objectname 'NOTIFICATION-GROUP' 'NOTIFICATIONS' '{'
                      {NG, line_of('$2')}.
 
 modulecompliance -> objectname 'MODULE-COMPLIANCE' 'STATUS' statusv2
-                    description referpart modulepart nameassign : 
+                    description referpart mc_modulepart nameassign : 
+%% 			io:format("modulecompliance -> "
+%% 				  "~n   '$1': ~p"
+%% 				  "~n   '$4': ~p"
+%% 				  "~n   '$5': ~p"
+%% 				  "~n   '$6': ~p"
+%% 				  "~n   '$7': ~p"
+%% 				  "~n   '$8': ~p"
+%% 				  "~n", ['$1', '$4', '$5', '$6', '$7', '$8']),
                     MC = make_module_compliance('$1', '$4', '$5', '$6', 
                                                 '$7', '$8'),
+%% 			io:format("modulecompliance -> "
+%% 				  "~n   MC: ~p"
+%% 				  "~n", [MC]),
                     {MC, line_of('$2')}.
 
-modulepart -> '$empty'.
-modulepart -> modules.
 
-modules -> module.
-modules -> modules module.
+agentcapabilities -> objectname 'AGENT-CAPABILITIES' 
+                     'PRODUCT-RELEASE' prodrel 
+                     'STATUS' ac_status
+                     description referpart ac_modulepart nameassign : 
+                     AC = make_agent_capabilities('$1', '$4', '$6', '$7', 
+                                                  '$8', '$9', '$10'),
+                     {AC, line_of('$2')}.
+
+prodrel -> string : lreverse(prodrel, val('$1')).
+
+ac_status -> atom : ac_status('$1').
+
+ac_modulepart -> ac_modules : 
+                 lreverse(ac_modulepart, '$1').
+ac_modulepart -> '$empty' : 
+                 [].
+
+ac_modules -> ac_module : 
+              ['$1'].
+ac_modules -> ac_module ac_modules : 
+              ['$1' | '$2'].
+
+ac_module -> 'SUPPORTS' ac_modulenamepart 'INCLUDES' '{' objects '}' ac_variationpart : 
+             make_ac_module('$2', '$5', '$7').
+
+ac_modulenamepart -> mibname : '$1'.
+ac_modulenamepart -> '$empty' : undefined.
+    
+ac_variationpart -> '$empty' : 
+                    [].
+ac_variationpart -> ac_variations : 
+                    lreverse(ac_variationpart, '$1').
+
+ac_variations -> ac_variation : 
+                 ['$1'].
+ac_variations -> ac_variation ac_variations : 
+                 ['$1' | '$2'].
+
+%% ac_variation -> ac_objectvariation.
+%% ac_variation -> ac_notificationvariation.
+
+ac_variation -> 'VARIATION' objectname syntaxpart writesyntaxpart ac_accesspart ac_creationpart defvalpart description : 
+                 make_ac_variation('$2', '$3', '$4', '$5', '$6', '$7', '$8').
+
+ac_accesspart -> 'ACCESS' ac_access : '$2'.
+ac_accesspart -> '$empty' : undefined. 
+
+ac_access -> atom: ac_access('$1').     
+
+ac_creationpart -> 'CREATION-REQUIRES' '{' objects '}' : 
+                   lreverse(ac_creationpart, '$3').
+ac_creationpart -> '$empty'                            : 
+                   []. 
+
+mc_modulepart -> '$empty'   : 
+                 [].
+mc_modulepart -> mc_modules : 
+                 lreverse(mc_modulepart, '$1').
+
+mc_modules -> mc_module : 
+              ['$1'].
+mc_modules -> mc_module mc_modules : 
+              ['$1' | '$2'].
     
-module -> 'MODULE' modulenamepart mandatorypart compliancepart.
+mc_module -> 'MODULE' mc_modulenamepart mc_mandatorypart mc_compliancepart : 
+             make_mc_module('$2', '$3', '$4').
 
-modulenamepart -> mibname.
-modulenamepart -> '$empty'.
+mc_modulenamepart -> mibname : '$1'.
+mc_modulenamepart -> '$empty' : undefined.
 
-mandatorypart -> 'MANDATORY-GROUPS' '{' objects '}'.
-mandatorypart -> '$empty'.
+mc_mandatorypart -> 'MANDATORY-GROUPS' '{' objects '}' : 
+                    lreverse(mc_mandatorypart, '$3').
+mc_mandatorypart -> '$empty' : 
+                    [].
     
-compliancepart -> compliances.
-compliancepart -> '$empty'.
+mc_compliancepart -> mc_compliances : 
+                     lreverse(mc_compliancepart, '$1').
+mc_compliancepart -> '$empty'       : 
+                     [].
 
-compliances -> compliance.
-compliances -> compliances compliance.
+mc_compliances -> mc_compliance : 
+                  ['$1'].
+mc_compliances -> mc_compliance mc_compliances : 
+                  ['$1' | '$2'].
 
-compliance -> compliancegroup.
-compliance -> object.
+mc_compliance -> mc_compliancegroup : 
+                 '$1'.
+mc_compliance -> mc_object          : 
+                 '$1'.
 
-compliancegroup -> 'GROUP' objectname description.
+mc_compliancegroup -> 'GROUP' objectname description : 
+                      make_mc_compliance_group('$2', '$3').
 
-object -> 'OBJECT' objectname syntaxpart writesyntaxpart accesspart description.
+mc_object -> 'OBJECT' objectname syntaxpart writesyntaxpart mc_accesspart description : 
+             make_mc_object('$2', '$3', '$4', '$5', '$6').
 
-syntaxpart -> 'SYNTAX' syntax.
-syntaxpart -> '$empty'.
+syntaxpart -> 'SYNTAX' syntax : '$2'.
+syntaxpart -> '$empty'        : undefined.
 
-writesyntaxpart -> 'WRITE-SYNTAX' syntax.
-writesyntaxpart -> '$empty'.
+writesyntaxpart -> 'WRITE-SYNTAX' syntax : '$2'.
+writesyntaxpart -> '$empty'              : undefined.
     
-accesspart -> 'MIN-ACCESS' accessv2.
-accesspart -> '$empty'.
+mc_accesspart -> 'MIN-ACCESS' accessv2 : '$2'.
+mc_accesspart -> '$empty'              : undefined.
     
 objecttypev2 ->	objectname 'OBJECT-TYPE' 
 		'SYNTAX' syntax
@@ -589,7 +694,7 @@ objecttypev2 ->	objectname 'OBJECT-TYPE'
                                       '$11', '$12', Kind, '$15'),
                 {OT, line_of('$2')}.
 
-indexpartv2 -> 'INDEX' '{' indextypesv2 '}' : {indexes, lists:reverse('$3')}.
+indexpartv2 -> 'INDEX' '{' indextypesv2 '}' : {indexes, lreverse(indexpartv2, '$3')}.
 indexpartv2 -> 'AUGMENTS' '{' entry  '}' : {augments, '$3'}.
 indexpartv2 -> '$empty' : {indexes, undefined}.
 
@@ -614,7 +719,7 @@ notification -> objectname 'NOTIFICATION-TYPE' objectspart
                 Not = make_notification('$1','$3','$5', '$7', '$8', '$9'),
                 {Not, line_of('$2')}.
 
-objectspart -> 'OBJECTS' '{' objects '}' : lists:reverse('$3').
+objectspart -> 'OBJECTS' '{' objects '}' : lreverse(objectspart, '$3').
 objectspart -> '$empty' : [].
 
 objects -> objectname : ['$1'].
@@ -655,6 +760,14 @@ statusv2(Tok) ->
                              "syntax error before: " ++ atom_to_list(Else))
     end.
 
+ac_status(Tok) ->
+    case val(Tok) of
+        current -> current;
+        obsolete -> obsolete;
+        Else -> return_error(line_of(Tok),
+                             "syntax error before: " ++ atom_to_list(Else))
+    end.
+
 accessv1(Tok) ->
     case val(Tok) of
         'read-only' -> 'read-only';
@@ -676,6 +789,18 @@ accessv2(Tok) ->
                              "syntax error before: " ++ atom_to_list(Else))
     end.
 
+ac_access(Tok) ->
+    case val(Tok) of
+        'not-implemented' -> 'not-implemented'; % only for notifications
+        'accessible-for-notify' -> 'accessible-for-notify';
+        'read-only' -> 'read-only';
+        'read-write' -> 'read-write';
+        'read-create' -> 'read-create';
+        'write-only' -> 'write-only'; % for backward-compatibility only
+        Else -> return_error(line_of(Tok),
+                             "syntax error before: " ++ atom_to_list(Else))
+    end.
+
 %% ---------------------------------------------------------------------
 %% Various basic record build functions
 %% ---------------------------------------------------------------------
@@ -744,14 +869,79 @@ make_notification(Name, Vars, Status, Desc, Ref, NA) ->
 	             reference   = Ref,
 	             name_assign = NA}.
 
-make_module_compliance(Name, Status, Desc, Ref, Mod, NA) ->
+make_agent_capabilities(Name, ProdRel, Status, Desc, Ref, Mods, NA) ->
+    #mc_agent_capabilities{name            = Name,
+                           product_release = ProdRel,
+                           status          = Status,
+                           description     = Desc,
+	                   reference       = Ref,
+                           modules         = Mods,
+	                   name_assign     = NA}.
+
+make_ac_variation(Name, 
+		  undefined = _Syntax, 
+		  undefined = _WriteSyntax, 
+		  Access, 
+		  undefined = _Creation, 
+		  undefined = _DefVal, 
+		  Desc) ->
+%%     io:format("make_ac_variation -> entry with"
+%% 	      "~n   Name:        ~p"
+%% 	      "~n   Access:      ~p"
+%% 	      "~n   Desc:        ~p"
+%% 	      "~n", [Name, Access, Desc]),
+    #mc_ac_notification_variation{name        = Name, 
+ 				  access      = Access,
+ 				  description = Desc};
+
+make_ac_variation(Name, Syntax, WriteSyntax, Access, Creation, DefVal, Desc) ->
+%%     io:format("make_ac_variation -> entry with"
+%% 	      "~n   Name:        ~p"
+%% 	      "~n   Syntax:      ~p"
+%% 	      "~n   WriteSyntax: ~p"
+%% 	      "~n   Access:      ~p"
+%% 	      "~n   Creation:    ~p"
+%% 	      "~n   DefVal:      ~p"
+%% 	      "~n   Desc:        ~p"
+%% 	      "~n", [Name, Syntax, WriteSyntax, Access, Creation, DefVal, Desc]),
+    #mc_ac_object_variation{name          = Name, 
+			    syntax        = Syntax, 
+			    write_syntax  = WriteSyntax, 
+			    access        = Access,
+			    creation      = Creation,
+			    default_value = DefVal,
+			    description   = Desc}.
+
+make_ac_module(Name, Grps, Var) ->
+    #mc_ac_module{name      = Name, 
+		  groups    = Grps,
+		  variation = Var}.
+
+
+make_module_compliance(Name, Status, Desc, Ref, Mods, NA) ->
     #mc_module_compliance{name        = Name,
                           status      = Status,
                           description = Desc,
 	                  reference   = Ref,
-                          module      = Mod,
+                          modules     = Mods,
 	                  name_assign = NA}.
 
+make_mc_module(Name, Mand, Compl) ->
+    #mc_mc_module{name       = Name, 
+		  mandatory  = Mand,
+		  compliance = Compl}.
+
+make_mc_compliance_group(Name, Desc) ->
+    #mc_mc_compliance_group{name        = Name,
+			    description = Desc}.
+
+make_mc_object(Name, Syntax, WriteSyntax, Access, Desc) ->
+    #mc_mc_object{name         = Name,
+		  syntax       = Syntax,
+		  write_syntax = WriteSyntax,
+		  access       = Access, 
+		  description  = Desc}.
+
 make_object_group(Name, Objs, Status, Desc, Ref, NA) ->
     #mc_object_group{name        = Name,
                      objects     = Objs,
@@ -968,6 +1158,12 @@ filter_v2imports(_,Type)         -> {type, Type}.
 w(F, A) ->
     ?vwarning(F, A).
 
-%i(F, A) ->
-%    io:format("~w:" ++ F ++ "~n", [?MODULE|A]).
+lreverse(_Tag, L) when is_list(L) ->
+    lists:reverse(L);
+lreverse(Tag, X) ->
+    exit({bad_list, Tag, X}).
+
+
+%% i(F, A) ->
+%%     io:format("~w:" ++ F ++ "~n", [?MODULE|A]).
 
diff --git a/lib/snmp/src/compile/snmpc_mib_to_hrl.erl b/lib/snmp/src/compile/snmpc_mib_to_hrl.erl
index 07bd29231b..decc1ce557 100644
--- a/lib/snmp/src/compile/snmpc_mib_to_hrl.erl
+++ b/lib/snmp/src/compile/snmpc_mib_to_hrl.erl
@@ -24,7 +24,8 @@
 -include("snmpc_lib.hrl").
 
 %% External exports
--export([convert/1, compile/3]).
+-export([convert/1, convert/3, compile/3]).
+
 
 %%-----------------------------------------------------------------
 %% Func: convert/1
diff --git a/lib/snmp/src/compile/snmpc_tok.erl b/lib/snmp/src/compile/snmpc_tok.erl
index 6b99e7ae43..e238b256d0 100644
--- a/lib/snmp/src/compile/snmpc_tok.erl
+++ b/lib/snmp/src/compile/snmpc_tok.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -37,6 +37,8 @@
 -export([null_get_line/0, format_error/1, terminate/2, handle_call/3, init/1,
 	 test/0]).
 
+-include("snmpc_lib.hrl").
+
 
 %%----------------------------------------------------------------------
 %% Reserved_words: list of KeyWords. Example: ['IF', 'BEGIN', ..., 'GOTO']
@@ -130,6 +132,10 @@ test() ->
 		'current','deprecated','not-accessible','obsolete', 
 		'read-create','read-only','read-write', 'IMPORTS', 'FROM',
 		'MODULE-COMPLIANCE',
+		'AGENT-CAPABILITIES',
+		'PRODUCT-RELEASE',
+		'SUPPORTS',
+		'INCLUDES',
 		'DisplayString', 
 		'PhysAddress', 
 		'MacAddress', 
@@ -225,6 +231,7 @@ get_all_tokens(Str,Toks) ->
     case catch tokenise(Str) of
 	{error, ErrorInfo} -> {error, ErrorInfo};
 	{Token, RestChars} when is_tuple(Token) -> 
+	    %% ?vtrace("get_all_tokens -> Token: ~p", [Token]),
 	    get_all_tokens(RestChars, [Token|Toks])
     end.
 
diff --git a/lib/snmp/src/manager/snmpm.erl b/lib/snmp/src/manager/snmpm.erl
index 141addf440..5b6321b4c3 100644
--- a/lib/snmp/src/manager/snmpm.erl
+++ b/lib/snmp/src/manager/snmpm.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -24,6 +24,8 @@
 %%----------------------------------------------------------------------
 
 %% User interface
+%% Avoid warning for local function demonitor/1 clashing with autoimported BIF.
+-compile({no_auto_import,[demonitor/1]}).
 -export([
 	 %% 
 	 %% Management API
diff --git a/lib/snmp/src/manager/snmpm_conf.erl b/lib/snmp/src/manager/snmpm_conf.erl
index 75f9c09477..e50508c489 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -21,6 +21,8 @@
 
 -include_lib("kernel/include/file.hrl").
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([
 	 %% manager.conf
 	 manager_entry/2, 
diff --git a/lib/snmp/src/manager/snmpm_config.erl b/lib/snmp/src/manager/snmpm_config.erl
index b976e8f568..fd6da3e71a 100644
--- a/lib/snmp/src/manager/snmpm_config.erl
+++ b/lib/snmp/src/manager/snmpm_config.erl
@@ -28,6 +28,8 @@
 -behaviour(gen_server).
 
 %% External exports
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([start_link/1, stop/0, is_started/0]).
 -export([register_user/4, unregister_user/1, 
 	 which_users/0, 
diff --git a/lib/snmp/src/manager/snmpm_usm.erl b/lib/snmp/src/manager/snmpm_usm.erl
index 8cb3062d4b..449127844a 100644
--- a/lib/snmp/src/manager/snmpm_usm.erl
+++ b/lib/snmp/src/manager/snmpm_usm.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -23,6 +23,10 @@
 
 -module(snmpm_usm).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([init/0, 
 	 reset/0, 
 	 process_incoming_msg/4, generate_outgoing_msg/5]).
diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl
index 63762ac17b..4d2f5d8f92 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -23,6 +23,8 @@
 
 
 %% External exports
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([read_files/2, read/2]).
 
 %% Basic (type) check functions
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index c066680160..25350e08cb 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -22,6 +22,8 @@
 -include_lib("kernel/include/file.hrl").
 -include("snmp_types.hrl").
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([config/0]).
 
 -export([write_config_file/4, append_config_file/4, read_config_file/3]).
diff --git a/lib/snmp/src/misc/snmp_usm.erl b/lib/snmp/src/misc/snmp_usm.erl
index 3508f9e1c2..df2c1f0b18 100644
--- a/lib/snmp/src/misc/snmp_usm.erl
+++ b/lib/snmp/src/misc/snmp_usm.erl
@@ -19,6 +19,8 @@
 
 -module(snmp_usm).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([passwd2localized_key/3, localize_key/3]).
 -export([auth_in/4, auth_out/4, set_msg_auth_params/3]).
 -export([des_encrypt/3, des_decrypt/3]).
diff --git a/lib/snmp/test/klas3.erl b/lib/snmp/test/klas3.erl
index a5ce2af8c5..ec78d19dbb 100644
--- a/lib/snmp/test/klas3.erl
+++ b/lib/snmp/test/klas3.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
diff --git a/lib/snmp/test/modules.mk b/lib/snmp/test/modules.mk
index 6a0c3e9481..eacc749b53 100644
--- a/lib/snmp/test/modules.mk
+++ b/lib/snmp/test/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2010. All Rights Reserved.
+# Copyright Ericsson AB 2004-2011. 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
@@ -62,6 +62,8 @@ COMPILER_MIB_FILES = \
 	OTP8574-MIB
 
 MIB_FILES = \
+	AC-TEST-MIB.mib \
+	MC-TEST-MIB.mib \
 	OLD-SNMPEA-MIB.mib \
 	OLD-SNMPEA-MIB-v2.mib \
 	Klas1.mib \
diff --git a/lib/snmp/test/sa.erl b/lib/snmp/test/sa.erl
index ad3ccce08f..fee50c0e8c 100644
--- a/lib/snmp/test/sa.erl
+++ b/lib/snmp/test/sa.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
diff --git a/lib/snmp/test/snmp.cover b/lib/snmp/test/snmp.cover
index 027dce68c1..a2e7dd978f 100644
--- a/lib/snmp/test/snmp.cover
+++ b/lib/snmp/test/snmp.cover
@@ -1,5 +1,7 @@
 %% -*- erlang -*-
-{exclude,
+{incl_app,snmp,details}.
+
+{excl_mods,snmp,
  [snmp_index,
   snmpa_error_io, 
   snmpa_authentication_service, 
diff --git a/lib/snmp/test/snmp.spec b/lib/snmp/test/snmp.spec
index 0af52c139e..88ae0145f0 100644
--- a/lib/snmp/test/snmp.spec
+++ b/lib/snmp/test/snmp.spec
@@ -1 +1 @@
-{topcase, {dir, "../snmp_test"}}.
+{suites,"../snmp_test",all}.
diff --git a/lib/snmp/test/snmp_SUITE.erl b/lib/snmp/test/snmp_SUITE.erl
index f560e36663..b6d72da2fa 100644
--- a/lib/snmp/test/snmp_SUITE.erl
+++ b/lib/snmp/test/snmp_SUITE.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -19,27 +19,14 @@
 
 -module(snmp_SUITE).
 
--export([all/1, 
-	 init_per_testcase/2, fin_per_testcase/2
+-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([app/1, compiler/1, misc/1, agent/1, manager/1]).
-
--export([
-	 app_test/1,
-	 appup_test/1,
-	 compiler_test/1,
-	 conf_test/1,
-	 pdus_test/1,
-	 log_test/1,
-	 note_store_test/1,
-	 mibs_test/1,
-	 nfilter_test/1,
-	 agent_test/1,
-	 manager_config_test/1,
-	 manager_user_test/1,
-	 manager_test/1
-	]).
 
 %%
 %% -----
@@ -48,110 +35,60 @@
 init_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
-all(doc) ->
-    ["Test suites for the snmp application.",
-     "There are eight different sub test-suites."];
-
-all(suite) ->
-    [
-     app,
-     compiler,
-     misc,
-     agent,
-     manager
-
-    ].
-
-app(suite) ->
-    [
-     app_test,
-     appup_test
-     ].
-
-compiler(suite) ->
-    [
-     compiler_test
-    ].
-
-misc(suite) ->
-    [
-     conf_test,
-     pdus_test,
-     log_test,
-     note_store_test
-    ].
-
-agent(suite) ->
-    [
-     mibs_test,
-     nfilter_test,
-     agent_test
-    ].
-
-manager(suite) ->
-    [
-     manager_config_test,
-     manager_user_test,
-     manager_test
-    ].
-
-
-app_test(suite) ->
-    [{snmp_app_test, all}].
-
-
-appup_test(suite) ->
-    [{snmp_appup_test, all}].
-
-
-compiler_test(suite) ->
-    [{snmp_compiler_test, all}].  
-
-
-conf_test(suite) ->
-    [{snmp_conf_test, all}].  
-
-
-pdus_test(suite) ->
-    [{snmp_pdus_test, all}].  
-
-
-log_test(suite) ->
-    [{snmp_log_test, all}].  
-
-
-note_store_test(suite) ->
-    [{snmp_note_store_test, all}].  
-
-
-mibs_test(suite) ->
-    [{snmp_agent_mibs_test, all}].
-
-
-nfilter_test(suite) ->
-    [{snmp_agent_nfilter_test, all}].
-
-
-agent_test(suite) ->
-    [{snmp_agent_test, all}].
-
-
-manager_config_test(suite) ->
-    [{snmp_manager_config_test, all}].  
-
-
-manager_user_test(suite) ->
-    [{snmp_manager_user_test, all}].  
+suite() -> 
+    [{ct_hooks, [ts_install_cth]}].
+
+all() -> 
+    [{group, app}, 
+     {group, compiler}, 
+     {group, misc},
+     {group, agent}, 
+     {group, manager}].
+
+groups() -> 
+    [{app,      [], [{group, app_test}, 
+		     {group, appup_test}]},
+     {compiler, [], [{group, compiler_test}]},
+     {misc,     [], [{group, conf_test}, 
+		     {group, pdus_test},
+		     {group, log_test}, 
+		     {group, note_store_test}]},
+     {agent, [],    [{group, mibs_test}, 
+		     {group, nfilter_test},
+		     {group, agent_test}]},
+     {manager, [],  [{group, manager_config_test},
+		     {group, manager_user_test}, 
+		     {group, manager_test}]},
+     {app_test,            [], [{snmp_app_test,            all}]},
+     {appup_test,          [], [{snmp_appup_test,          all}]},
+     {compiler_test,       [], [{snmp_compiler_test,       all}]},
+     {conf_test,           [], [{snmp_conf_test,           all}]},
+     {pdus_test,           [], [{snmp_pdus_test,           all}]},
+     {log_test,            [], [{snmp_log_test,            all}]},
+     {note_store_test,     [], [{snmp_note_store_test,     all}]},
+     {mibs_test,           [], [{snmp_agent_mibs_test,     all}]},
+     {nfilter_test,        [], [{snmp_agent_nfilter_test,  all}]},
+     {agent_test,          [], [{snmp_agent_test,          all}]},
+     {manager_config_test, [], [{snmp_manager_config_test, all}]},
+     {manager_user_test,   [], [{snmp_manager_user_test,   all}]},
+     {manager_test,        [], [{snmp_manager_test,        all}]}].
+
+init_per_suite(Config) ->
+    Config.
 
+end_per_suite(_Config) ->
+    ok.
 
-manager_test(suite) ->
-    [{snmp_manager_test, all}].  
+init_per_group(_GroupName, Config) ->
+    Config.
 
+end_per_group(_GroupName, Config) ->
+    Config.
 
diff --git a/lib/snmp/test/snmp_agent_bl_test.erl b/lib/snmp/test/snmp_agent_bl_test.erl
index 4608d90201..b17489a755 100644
--- a/lib/snmp/test/snmp_agent_bl_test.erl
+++ b/lib/snmp/test/snmp_agent_bl_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -89,7 +89,7 @@ init_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?t:timetrap(?t:minutes(6)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) when list(Config) ->
+end_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     Config.
diff --git a/lib/snmp/test/snmp_agent_mibs_test.erl b/lib/snmp/test/snmp_agent_mibs_test.erl
index 5f1ff53a79..3e48130fac 100644
--- a/lib/snmp/test/snmp_agent_mibs_test.erl
+++ b/lib/snmp/test/snmp_agent_mibs_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -26,7 +26,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -include_lib("snmp/include/snmp_types.hrl").
 -include_lib("snmp/include/SNMP-COMMUNITY-MIB.hrl").
@@ -39,12 +39,12 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-	 all/1, 
-         init_per_testcase/2, fin_per_testcase/2,
-	 init_all/1, finish_all/1, 
+	all/0,groups/0,init_per_group/2,end_per_group/2, 
+         init_per_testcase/2, end_per_testcase/2,
+	 init_per_suite/1, end_per_suite/1, 
 
 	 start_and_stop/1,
-	 size_check/1,
+	
 	 size_check_ets/1,
 	 size_check_dets/1,
 	 size_check_mnesia/1,
@@ -58,8 +58,6 @@
 %%----------------------------------------------------------------------
 %% Internal exports
 %%----------------------------------------------------------------------
--export([
-        ]).
 
 %%----------------------------------------------------------------------
 %% Macros
@@ -100,20 +98,20 @@ init_per_testcase(cache_test, Config) when is_list(Config) ->
 init_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
-fin_per_testcase(size_check_dets, Config) when is_list(Config) ->
+end_per_testcase(size_check_dets, Config) when is_list(Config) ->
     Dir = ?config(dets_dir, Config),
     ?line ok = ?DEL_DIR(Dir),
     lists:keydelete(dets_dir, 1, Config);
-fin_per_testcase(size_check_mnesia, Config) when is_list(Config) ->
+end_per_testcase(size_check_mnesia, Config) when is_list(Config) ->
     mnesia_stop(),
     Dir = ?config(mnesia_dir, Config),
     ?line ok = ?DEL_DIR(Dir),
     lists:keydelete(mnesia_dir, 1, Config);
-fin_per_testcase(cache_test, Config) when is_list(Config) ->
+end_per_testcase(cache_test, Config) when is_list(Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     Config;
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
 
@@ -121,20 +119,25 @@ fin_per_testcase(_Case, Config) when is_list(Config) ->
 %% Test case definitions
 %%======================================================================
 
-all(suite) ->
-    {conf, init_all, cases(), finish_all}.
+all() -> 
+cases().
+
+groups() -> 
+    [{size_check, [],
+  [size_check_ets, size_check_dets, size_check_mnesia]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
-cases() ->
-    [
-     start_and_stop,
-     load_unload,
-     size_check,
-     me_lookup,
-     which_mib,
-     cache_test
-    ].
+cases() -> 
+[start_and_stop, load_unload, {group, size_check},
+ me_lookup, which_mib, cache_test].
 
-init_all(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
     %% Data dir points wrong
     DataDir0     = ?config(data_dir, Config),
     DataDir1     = filename:split(filename:absname(DataDir0)),
@@ -142,7 +145,7 @@ init_all(Config) when is_list(Config) ->
     DataDir      = filename:join(lists:reverse(DataDir2) ++ [?snmp_test_data]),
     [{snmp_data_dir, DataDir ++ "/"}|Config].
 
-finish_all(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     lists:keydelete(snmp_data_dir, 1, Config).
 
 
@@ -217,12 +220,6 @@ load_unload(Config) when is_list(Config) ->
 
 %% ---------------------------------------------------------------------
 
-size_check(suite) ->
-    [
-     size_check_ets,
-     size_check_dets,
-     size_check_mnesia
-    ].
 
 size_check_ets(suite) ->
     [];
diff --git a/lib/snmp/test/snmp_agent_ms_test.erl b/lib/snmp/test/snmp_agent_ms_test.erl
index 3a3a790e6a..1f34f1c8d1 100644
--- a/lib/snmp/test/snmp_agent_ms_test.erl
+++ b/lib/snmp/test/snmp_agent_ms_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -28,7 +28,7 @@
 -define(application, snmp).
 
 -include_lib("kernel/include/file.hrl").
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
@@ -83,39 +83,165 @@
 		   _ -> V3
 	       end).
 
-all(suite) -> {req,
-	       [mnesia, distribution,
-		{local_slave_nodes, 2}, {time, 360}],
-	       [{conf, init_all, cases(), finish_all}]}.
+all() -> 
+[cases()].
+
+groups() -> 
+    [{mib_storage, [],
+  [{group, mib_storage_ets}, {group, mib_storage_dets},
+   {group, mib_storage_mnesia},
+   {group, mib_storage_size_check_ets},
+   {group, mib_storage_size_check_dets},
+   {group, mib_storage_size_check_mnesia},
+   {group, mib_storage_varm_dets},
+   {group, mib_storage_varm_mnesia}]},
+ {mib_storage_ets, [], mib_storage_ets_cases()},
+ {mib_storage_dets, [], mib_storage_dets_cases()},
+ {mib_storage_mnesia, [], mib_storage_mnesia_cases()},
+ {mib_storage_size_check_ets, [],
+  mse_size_check_cases()},
+ {mib_storage_size_check_dets, [],
+  msd_size_check_cases()},
+ {mib_storage_size_check_mnesia, [],
+  msm_size_check_cases()},
+ {mib_storage_varm_dets, [],
+  varm_mib_storage_dets_cases()},
+ {mib_storage_varm_mnesia, [],
+  varm_mib_storage_mnesia_cases()},
+ {test_v1, [], v1_cases()}, {test_v2, [], v2_cases()},
+ {test_v1_v2, [], v1_v2_cases()},
+ {test_v3, [], v3_cases()},
+ {test_multi_threaded, [], mt_cases()},
+ {multiple_reqs, [], mul_cases()},
+ {multiple_reqs_2, [], mul_cases_2()},
+ {v2_inform, [], [v2_inform_i]},
+ {v3_security, [],
+  [v3_crypto_basic, v3_md5_auth, v3_sha_auth,
+   v3_des_priv]},
+ {standard_mibs, [],
+  [snmp_standard_mib, snmp_community_mib,
+   snmp_framework_mib, snmp_target_mib,
+   snmp_notification_mib, snmp_view_based_acm_mib]},
+ {standard_mibs_2, [],
+  [snmpv2_mib_2, snmp_community_mib_2,
+   snmp_framework_mib_2, snmp_target_mib_2,
+   snmp_notification_mib_2, snmp_view_based_acm_mib_2]},
+ {standard_mibs_3, [],
+  [snmpv2_mib_3, snmp_framework_mib_3, snmp_mpd_mib_3,
+   snmp_target_mib_3, snmp_notification_mib_3,
+   snmp_view_based_acm_mib_3, snmp_user_based_sm_mib_3]},
+ {reported_bugs, [],
+  [otp_1128, otp_1129, otp_1131, otp_1162, otp_1222,
+   otp_1298, otp_1331, otp_1338, otp_1342, otp_2776,
+   otp_2979, otp_3187, otp_3725]},
+ {reported_bugs_2, [],
+  [otp_1128_2, otp_1129_2, otp_1131_2, otp_1162_2,
+   otp_1222_2, otp_1298_2, otp_1331_2, otp_1338_2,
+   otp_1342_2, otp_2776_2, otp_2979_2, otp_3187_2]},
+ {reported_bugs_3, [],
+  [otp_1128_3, otp_1129_3, otp_1131_3, otp_1162_3,
+   otp_1222_3, otp_1298_3, otp_1331_3, otp_1338_3,
+   otp_1342_3, otp_2776_3, otp_2979_3, otp_3187_3,
+   otp_3542]},
+ {tickets, [], [{group, otp_4394}]},
+ {otp_4394, [], [otp_4394_test]}].
+
+init_per_group(otp_4394, Config) -> 
+	init_otp_4394(Config);
+init_per_group(v2_inform, Config) -> 
+	init_v2_inform(Config);
+init_per_group(multiple_reqs_2, Config) -> 
+	init_mul(Config);
+init_per_group(multiple_reqs, Config) -> 
+	init_mul(Config);
+init_per_group(test_multi_threaded, Config) -> 
+	init_mt(Config);
+init_per_group(test_v3, Config) -> 
+	init_v3(Config);
+init_per_group(test_v1_v2, Config) -> 
+	init_v1_v2(Config);
+init_per_group(test_v2, Config) -> 
+	init_v2(Config);
+init_per_group(test_v1, Config) -> 
+	init_v1(Config);
+init_per_group(mib_storage_varm_mnesia, Config) -> 
+	init_varm_mib_storage_mnesia(Config);
+init_per_group(mib_storage_varm_dets, Config) -> 
+	init_varm_mib_storage_dets(Config);
+init_per_group(mib_storage_size_check_mnesia, Config) -> 
+	init_size_check_msm(Config);
+init_per_group(mib_storage_size_check_dets, Config) -> 
+	init_size_check_msd(Config);
+init_per_group(mib_storage_size_check_ets, Config) -> 
+	init_size_check_mse(Config);
+init_per_group(mib_storage_mnesia, Config) -> 
+	init_mib_storage_mnesia(Config);
+init_per_group(mib_storage_dets, Config) -> 
+	init_mib_storage_dets(Config);
+init_per_group(mib_storage_ets, Config) -> 
+	init_mib_storage_ets(Config);
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(otp_4394, Config) -> 
+	finish_otp_4394(Config);
+end_per_group(v2_inform, Config) -> 
+	finish_v2_inform(Config);
+end_per_group(multiple_reqs_2, Config) -> 
+	finish_mul(Config);
+end_per_group(multiple_reqs, Config) -> 
+	finish_mul(Config);
+end_per_group(test_multi_threaded, Config) -> 
+	finish_mt(Config);
+end_per_group(test_v3, Config) -> 
+	finish_v3(Config);
+end_per_group(test_v1_v2, Config) -> 
+	finish_v1_v2(Config);
+end_per_group(test_v2, Config) -> 
+	finish_v2(Config);
+end_per_group(test_v1, Config) -> 
+	finish_v1(Config);
+end_per_group(mib_storage_varm_mnesia, Config) -> 
+	finish_varm_mib_storage_mnesia(Config);
+end_per_group(mib_storage_varm_dets, Config) -> 
+	finish_varm_mib_storage_dets(Config);
+end_per_group(mib_storage_size_check_mnesia, Config) -> 
+	finish_size_check_msm(Config);
+end_per_group(mib_storage_size_check_dets, Config) -> 
+	finish_size_check_msd(Config);
+end_per_group(mib_storage_size_check_ets, Config) -> 
+	finish_size_check_mse(Config);
+end_per_group(mib_storage_mnesia, Config) -> 
+	finish_mib_storage_mnesia(Config);
+end_per_group(mib_storage_dets, Config) -> 
+	finish_mib_storage_dets(Config);
+end_per_group(mib_storage_ets, Config) -> 
+	finish_mib_storage_ets(Config);
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 init_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?t:timetrap(?t:minutes(6)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) when list(Config) ->
+end_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     Config.
 
-cases() ->
-    case ?OSTYPE() of
-	vxworks ->
-	    %% No crypto app, so skip v3 testcases
- 	    [
-	     app_info, 
-	     test_v1, test_v2, test_v1_v2, 
-	     test_multi_threaded, 
- 	     mib_storage, 
-	     tickets];
-	_Else ->
-  	    [
-	     app_info, 
- 	     test_v1, test_v2, test_v1_v2, test_v3, 
-   	     test_multi_threaded, 
-	     mib_storage, 
-	     tickets
-	    ]
-    end.
+cases() -> 
+case ?OSTYPE() of
+  vxworks ->
+      [app_info, {group, test_v1}, {group, test_v2},
+       {group, test_v1_v2}, {group, test_multi_threaded},
+       {group, mib_storage}, {group, tickets}];
+  _Else ->
+      [app_info, {group, test_v1}, {group, test_v2},
+       {group, test_v1_v2}, {group, test_v3},
+       {group, test_multi_threaded}, {group, mib_storage},
+       {group, tickets}]
+end.
 
 
 %%%-----------------------------------------------------------------
@@ -460,144 +586,56 @@ delete_mib_storage_mnesia_tables() ->
 %% <base>, and a second version <base>_2.  There may be several
 %% versions as well, <base>_N.
 %%-----------------------------------------------------------------
-mib_storage(suite) -> [
-		       mib_storage_ets, 
- 		       mib_storage_dets, 
- 		       mib_storage_mnesia,
- 		       mib_storage_size_check_ets,
- 		       mib_storage_size_check_dets,
- 		       mib_storage_size_check_mnesia,
- 		       mib_storage_varm_dets,
- 		       mib_storage_varm_mnesia
-		      ].
-
-mib_storage_ets(suite) -> {req, [], {conf, init_mib_storage_ets, 
-				     mib_storage_ets_cases(), 
-				     finish_mib_storage_ets}}.
-
-mib_storage_dets(suite) -> {req, [], {conf, init_mib_storage_dets, 
-				     mib_storage_dets_cases(), 
-				     finish_mib_storage_dets}}.
-
-mib_storage_mnesia(suite) -> {req, [], {conf, init_mib_storage_mnesia, 
-					mib_storage_mnesia_cases(), 
-					finish_mib_storage_mnesia}}.
-
-mib_storage_size_check_ets(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_mse, 
-	       mse_size_check_cases(), 
-	       finish_size_check_mse}}.
-
-mib_storage_size_check_dets(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_msd, 
-	       msd_size_check_cases(), 
-	       finish_size_check_msd}}.
-
-mib_storage_size_check_mnesia(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_msm, 
-	       msm_size_check_cases(), 
-	       finish_size_check_msm}}.
-
-mib_storage_varm_dets(suite) -> 
-    {req, [], {conf, 
-	       init_varm_mib_storage_dets, 
-	       varm_mib_storage_dets_cases(), 
-	       finish_varm_mib_storage_dets}}.
-
-mib_storage_varm_mnesia(suite) -> 
-    {req, [], {conf, 
-	       init_varm_mib_storage_mnesia, 
-	       varm_mib_storage_mnesia_cases(), 
-	       finish_varm_mib_storage_mnesia}}.
-
-mib_storage_ets_cases() ->
-    [
-     mse_simple, 
-     mse_v1_processing, 
-     mse_big, 
-     mse_big2, 
-     mse_loop_mib, 
-     mse_api, 
-     mse_sa_register, 
-     mse_v1_trap, 
-     mse_sa_error, 
-     mse_next_across_sa, 
-     mse_undo,
-     mse_standard_mib, 
-     mse_community_mib, 
-     mse_framework_mib, 
-     mse_target_mib, 
-     mse_notification_mib, 
-     mse_view_based_acm_mib, 
-     mse_sparse_table,
-     mse_me_of,
-     mse_mib_of].
-
-mib_storage_dets_cases() ->
-    [
-     msd_simple, 
-     msd_v1_processing, 
-     msd_big, 
-     msd_big2, 
-     msd_loop_mib, 
-     msd_api, 
-     msd_sa_register, 
-     msd_v1_trap, 
-     msd_sa_error, 
-     msd_next_across_sa, 
-     msd_undo,
-     msd_standard_mib,
-     msd_community_mib, 
-     msd_framework_mib, 
-     msd_target_mib, 
-     msd_notification_mib, 
-     msd_view_based_acm_mib, 
-     msd_sparse_table,
-     msd_me_of,
-     msd_mib_of
-    ].
-
-mib_storage_mnesia_cases() ->
-    [
-     msm_simple, 
-     msm_v1_processing, 
-     msm_big, 
-     msm_big2, 
-     msm_loop_mib, 
-     msm_api, 
-     msm_sa_register, 
-     msm_v1_trap, 
-     msm_sa_error, 
-     msm_next_across_sa, 
-     msm_undo,
-     msm_standard_mib, 
-     msm_community_mib, 
-     msm_framework_mib, 
-     msm_target_mib, 
-     msm_notification_mib, 
-     msm_view_based_acm_mib, 
-     msm_sparse_table,
-     msm_me_of,
-     msm_mib_of
-    ].
-
-mse_size_check_cases() ->
-    [mse_size_check].
-
-msd_size_check_cases() ->
-    [msd_size_check].
-
-msm_size_check_cases() ->
-    [msm_size_check].
-
-varm_mib_storage_dets_cases() ->
-    [msd_varm_mib_start].
-
-varm_mib_storage_mnesia_cases() ->
-    [msm_varm_mib_start].
+
+
+
+
+
+
+
+
+
+mib_storage_ets_cases() -> 
+[mse_simple, mse_v1_processing, mse_big, mse_big2,
+ mse_loop_mib, mse_api, mse_sa_register, mse_v1_trap,
+ mse_sa_error, mse_next_across_sa, mse_undo,
+ mse_standard_mib, mse_community_mib, mse_framework_mib,
+ mse_target_mib, mse_notification_mib,
+ mse_view_based_acm_mib, mse_sparse_table, mse_me_of,
+ mse_mib_of].
+
+mib_storage_dets_cases() -> 
+[msd_simple, msd_v1_processing, msd_big, msd_big2,
+ msd_loop_mib, msd_api, msd_sa_register, msd_v1_trap,
+ msd_sa_error, msd_next_across_sa, msd_undo,
+ msd_standard_mib, msd_community_mib, msd_framework_mib,
+ msd_target_mib, msd_notification_mib,
+ msd_view_based_acm_mib, msd_sparse_table, msd_me_of,
+ msd_mib_of].
+
+mib_storage_mnesia_cases() -> 
+[msm_simple, msm_v1_processing, msm_big, msm_big2,
+ msm_loop_mib, msm_api, msm_sa_register, msm_v1_trap,
+ msm_sa_error, msm_next_across_sa, msm_undo,
+ msm_standard_mib, msm_community_mib, msm_framework_mib,
+ msm_target_mib, msm_notification_mib,
+ msm_view_based_acm_mib, msm_sparse_table, msm_me_of,
+ msm_mib_of].
+
+mse_size_check_cases() -> 
+[mse_size_check].
+
+msd_size_check_cases() -> 
+[msd_size_check].
+
+msm_size_check_cases() -> 
+[msm_size_check].
+
+varm_mib_storage_dets_cases() -> 
+[msd_varm_mib_start].
+
+varm_mib_storage_mnesia_cases() -> 
+[msm_varm_mib_start].
 
 init_mib_storage_ets(Config) when list(Config) ->
     ?LOG("init_mib_storage_ets -> entry", []),
@@ -1099,20 +1137,14 @@ app_dir(App) ->
     end.
 
 
-test_v1(suite) -> {req, [], {conf, init_v1, v1_cases(), finish_v1}}.
 
 %v1_cases() -> [loop_mib];
-v1_cases() ->
-    [simple, 
-     db_notify_client,
-     v1_processing, big, big2, loop_mib, 
-     api, subagent, mnesia, multiple_reqs,
-     sa_register, v1_trap, sa_error, next_across_sa, undo, reported_bugs,
-     standard_mibs, sparse_table, cnt_64, 
-     opaque,
-     % opaque].
-    
-     change_target_addr_config].  
+v1_cases() -> 
+[simple, db_notify_client, v1_processing, big, big2,
+ loop_mib, api, subagent, mnesia, {group, multiple_reqs},
+ sa_register, v1_trap, sa_error, next_across_sa, undo,
+ {group, reported_bugs}, {group, standard_mibs},
+ sparse_table, cnt_64, opaque, change_target_addr_config].  
 
 init_v1(Config) when list(Config) ->
     ?line SaNode = ?config(snmp_sa, Config),
@@ -1129,15 +1161,15 @@ finish_v1(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v2(suite) -> {req, [], {conf, init_v2, v2_cases(), finish_v2}}.
 
 %v2_cases() -> [loop_mib_2];
-v2_cases() ->
-    [simple_2, v2_processing, big_2, big2_2, loop_mib_2,
-     api_2, subagent_2, mnesia_2,
-     multiple_reqs_2, sa_register_2, v2_trap, v2_inform, sa_error_2,
-     next_across_sa_2, undo_2, reported_bugs_2, standard_mibs_2,
-     v2_types, implied, sparse_table_2, cnt_64_2, opaque_2, v2_caps].
+v2_cases() -> 
+[simple_2, v2_processing, big_2, big2_2, loop_mib_2,
+ api_2, subagent_2, mnesia_2, {group, multiple_reqs_2},
+ sa_register_2, v2_trap, {group, v2_inform}, sa_error_2,
+ next_across_sa_2, undo_2, {group, reported_bugs_2},
+ {group, standard_mibs_2}, v2_types, implied,
+ sparse_table_2, cnt_64_2, opaque_2, v2_caps].
 
 init_v2(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1154,10 +1186,9 @@ finish_v2(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v1_v2(suite) -> {req, [], {conf, init_v1_v2, v1_v2_cases(), finish_v1_v2}}.
 
-v1_v2_cases() ->
-    [simple_bi].
+v1_v2_cases() -> 
+[simple_bi].
 
 init_v1_v2(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1174,16 +1205,16 @@ finish_v1_v2(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v3(suite) -> {req, [], {conf, init_v3, v3_cases(), finish_v3}}.
 
 %v3_cases() -> [loop_mib_3];
-v3_cases() ->
-    [simple_3, v3_processing,
-     big_3, big2_3, api_3, subagent_3, mnesia_3, loop_mib_3,
-     multiple_reqs_3, sa_register_3, v3_trap, v3_inform, sa_error_3,
-     next_across_sa_3, undo_3, reported_bugs_3, standard_mibs_3,
-     v3_security,
-     v2_types_3, implied_3, sparse_table_3, cnt_64_3, opaque_3, v2_caps_3].
+v3_cases() -> 
+[simple_3, v3_processing, big_3, big2_3, api_3,
+ subagent_3, mnesia_3, loop_mib_3, multiple_reqs_3,
+ sa_register_3, v3_trap, v3_inform, sa_error_3,
+ next_across_sa_3, undo_3, {group, reported_bugs_3},
+ {group, standard_mibs_3}, {group, v3_security},
+ v2_types_3, implied_3, sparse_table_3, cnt_64_3,
+ opaque_3, v2_caps_3].
 
 init_v3(Config) when list(Config) ->
     %% Make sure crypto works, otherwise start_agent will fail
@@ -1221,10 +1252,9 @@ finish_v3(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_multi_threaded(suite) -> {req, [], {conf, init_mt, mt_cases(), finish_mt}}.
 
-mt_cases() ->
-    [multi_threaded, mt_trap].
+mt_cases() -> 
+[multi_threaded, mt_trap].
 
 init_mt(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1739,21 +1769,19 @@ mnesia_2(X) -> mnesia(X).
 mnesia_3(X) -> mnesia(X).
 
 
-multiple_reqs(suite) ->
-    {req, [], {conf, init_mul, mul_cases(), finish_mul}}.
 
-mul_cases() ->
-    [mul_get, mul_get_err, mul_next, mul_next_err, mul_set_err].
+mul_cases() -> 
+[mul_get, mul_get_err, mul_next, mul_next_err,
+ mul_set_err].
     
-multiple_reqs_2(suite) ->
-    {req, [], {conf, init_mul, mul_cases_2(), finish_mul}}.
 
 multiple_reqs_3(_X) -> 
     {req, [], {conf, init_mul, mul_cases_3(), finish_mul}}.
 
 
-mul_cases_2() ->
-    [mul_get_2, mul_get_err_2, mul_next_2, mul_next_err_2, mul_set_err_2].
+mul_cases_2() -> 
+[mul_get_2, mul_get_err_2, mul_next_2, mul_next_err_2,
+ mul_set_err_2].
     
 
 mul_cases_3() ->
@@ -1939,8 +1967,6 @@ v2_trap(Config) when list(Config) ->
 v3_trap(X) ->
     v2_trap(X).
 
-v2_inform(suite) ->
-    {req, [], {conf, init_v2_inform, [v2_inform_i], finish_v2_inform}}.
 
 v3_inform(_X) ->
     %% v2_inform(X).
@@ -2112,7 +2138,6 @@ v3_processing(Config) when list(Config) ->
 %% accomplished by the first inform sent.  That one will generate a
 %% report, which makes it in sync.  The notification-generating
 %% application times out, and send again.  This time it'll work.
-v3_security(suite) -> [v3_crypto_basic, v3_md5_auth, v3_sha_auth, v3_des_priv].
 
 v3_crypto_basic(suite) -> [];
 v3_crypto_basic(_Config) ->
@@ -3591,22 +3616,8 @@ bad_return() ->
 %%% Note that many of the functions in the standard mib is
 %%% already tested by the normal tests.
 %%%-----------------------------------------------------------------
-standard_mibs(suite) ->
-    [snmp_standard_mib, snmp_community_mib,
-     snmp_framework_mib,
-     snmp_target_mib, snmp_notification_mib,
-     snmp_view_based_acm_mib].
-
-standard_mibs_2(suite) ->
-    [snmpv2_mib_2, snmp_community_mib_2,
-     snmp_framework_mib_2,
-     snmp_target_mib_2, snmp_notification_mib_2,
-     snmp_view_based_acm_mib_2].
-
-standard_mibs_3(suite) ->
-    [snmpv2_mib_3,snmp_framework_mib_3, snmp_mpd_mib_3,
-     snmp_target_mib_3, snmp_notification_mib_3,
-     snmp_view_based_acm_mib_3, snmp_user_based_sm_mib_3].
+
+
 
 %%-----------------------------------------------------------------
 %% For this test, the agent is configured for v1.
@@ -4527,27 +4538,12 @@ loop_it_2(Oid, N) ->
 %%% Testing of reported bugs and other tickets.
 %%%-----------------------------------------------------------------
 
-reported_bugs(suite) ->
-    [otp_1128, otp_1129, otp_1131, otp_1162,
-     otp_1222, otp_1298, otp_1331, otp_1338,
-     otp_1342, otp_2776, otp_2979, otp_3187, otp_3725].
 
-reported_bugs_2(suite) ->
-    [otp_1128_2, otp_1129_2, otp_1131_2, otp_1162_2,
-     otp_1222_2, otp_1298_2, otp_1331_2, otp_1338_2,
-     otp_1342_2, otp_2776_2, otp_2979_2, otp_3187_2].
 
-reported_bugs_3(suite) ->
-    [otp_1128_3, otp_1129_3, otp_1131_3, otp_1162_3,
-     otp_1222_3, otp_1298_3, otp_1331_3, otp_1338_3,
-     otp_1342_3, otp_2776_3, otp_2979_3, otp_3187_3,
-     otp_3542].
 
 
 %% These are (ticket) test cases where the initiation has to be done
 %% individually.
-tickets(suite) ->
-    [otp_4394].
 
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1128
@@ -4971,10 +4967,6 @@ otp_3725_test(MaNode) ->
 %%-----------------------------------------------------------------
 
 
-otp_4394(suite) -> {req, [], {conf, 
-			      init_otp_4394, 
-			      [otp_4394_test], 
-			      finish_otp_4394}}.
 
 init_otp_4394(Config) when list(Config) ->
     ?DBG("init_otp_4394 -> entry with"
diff --git a/lib/snmp/test/snmp_agent_mt_test.erl b/lib/snmp/test/snmp_agent_mt_test.erl
index 8d5a57f58d..4f125c0017 100644
--- a/lib/snmp/test/snmp_agent_mt_test.erl
+++ b/lib/snmp/test/snmp_agent_mt_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -28,7 +28,7 @@
 -define(application, snmp).
 
 -include_lib("kernel/include/file.hrl").
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
@@ -83,39 +83,165 @@
 		   _ -> V3
 	       end).
 
-all(suite) -> {req,
-	       [mnesia, distribution,
-		{local_slave_nodes, 2}, {time, 360}],
-	       [{conf, init_all, cases(), finish_all}]}.
+all() -> 
+[cases()].
+
+groups() -> 
+    [{mib_storage, [],
+  [{group, mib_storage_ets}, {group, mib_storage_dets},
+   {group, mib_storage_mnesia},
+   {group, mib_storage_size_check_ets},
+   {group, mib_storage_size_check_dets},
+   {group, mib_storage_size_check_mnesia},
+   {group, mib_storage_varm_dets},
+   {group, mib_storage_varm_mnesia}]},
+ {mib_storage_ets, [], mib_storage_ets_cases()},
+ {mib_storage_dets, [], mib_storage_dets_cases()},
+ {mib_storage_mnesia, [], mib_storage_mnesia_cases()},
+ {mib_storage_size_check_ets, [],
+  mse_size_check_cases()},
+ {mib_storage_size_check_dets, [],
+  msd_size_check_cases()},
+ {mib_storage_size_check_mnesia, [],
+  msm_size_check_cases()},
+ {mib_storage_varm_dets, [],
+  varm_mib_storage_dets_cases()},
+ {mib_storage_varm_mnesia, [],
+  varm_mib_storage_mnesia_cases()},
+ {test_v1, [], v1_cases()}, {test_v2, [], v2_cases()},
+ {test_v1_v2, [], v1_v2_cases()},
+ {test_v3, [], v3_cases()},
+ {test_multi_threaded, [], mt_cases()},
+ {multiple_reqs, [], mul_cases()},
+ {multiple_reqs_2, [], mul_cases_2()},
+ {v2_inform, [], [v2_inform_i]},
+ {v3_security, [],
+  [v3_crypto_basic, v3_md5_auth, v3_sha_auth,
+   v3_des_priv]},
+ {standard_mibs, [],
+  [snmp_standard_mib, snmp_community_mib,
+   snmp_framework_mib, snmp_target_mib,
+   snmp_notification_mib, snmp_view_based_acm_mib]},
+ {standard_mibs_2, [],
+  [snmpv2_mib_2, snmp_community_mib_2,
+   snmp_framework_mib_2, snmp_target_mib_2,
+   snmp_notification_mib_2, snmp_view_based_acm_mib_2]},
+ {standard_mibs_3, [],
+  [snmpv2_mib_3, snmp_framework_mib_3, snmp_mpd_mib_3,
+   snmp_target_mib_3, snmp_notification_mib_3,
+   snmp_view_based_acm_mib_3, snmp_user_based_sm_mib_3]},
+ {reported_bugs, [],
+  [otp_1128, otp_1129, otp_1131, otp_1162, otp_1222,
+   otp_1298, otp_1331, otp_1338, otp_1342, otp_2776,
+   otp_2979, otp_3187, otp_3725]},
+ {reported_bugs_2, [],
+  [otp_1128_2, otp_1129_2, otp_1131_2, otp_1162_2,
+   otp_1222_2, otp_1298_2, otp_1331_2, otp_1338_2,
+   otp_1342_2, otp_2776_2, otp_2979_2, otp_3187_2]},
+ {reported_bugs_3, [],
+  [otp_1128_3, otp_1129_3, otp_1131_3, otp_1162_3,
+   otp_1222_3, otp_1298_3, otp_1331_3, otp_1338_3,
+   otp_1342_3, otp_2776_3, otp_2979_3, otp_3187_3,
+   otp_3542]},
+ {tickets, [], [{group, otp_4394}]},
+ {otp_4394, [], [otp_4394_test]}].
+
+init_per_group(otp_4394, Config) -> 
+	init_otp_4394(Config);
+init_per_group(v2_inform, Config) -> 
+	init_v2_inform(Config);
+init_per_group(multiple_reqs_2, Config) -> 
+	init_mul(Config);
+init_per_group(multiple_reqs, Config) -> 
+	init_mul(Config);
+init_per_group(test_multi_threaded, Config) -> 
+	init_mt(Config);
+init_per_group(test_v3, Config) -> 
+	init_v3(Config);
+init_per_group(test_v1_v2, Config) -> 
+	init_v1_v2(Config);
+init_per_group(test_v2, Config) -> 
+	init_v2(Config);
+init_per_group(test_v1, Config) -> 
+	init_v1(Config);
+init_per_group(mib_storage_varm_mnesia, Config) -> 
+	init_varm_mib_storage_mnesia(Config);
+init_per_group(mib_storage_varm_dets, Config) -> 
+	init_varm_mib_storage_dets(Config);
+init_per_group(mib_storage_size_check_mnesia, Config) -> 
+	init_size_check_msm(Config);
+init_per_group(mib_storage_size_check_dets, Config) -> 
+	init_size_check_msd(Config);
+init_per_group(mib_storage_size_check_ets, Config) -> 
+	init_size_check_mse(Config);
+init_per_group(mib_storage_mnesia, Config) -> 
+	init_mib_storage_mnesia(Config);
+init_per_group(mib_storage_dets, Config) -> 
+	init_mib_storage_dets(Config);
+init_per_group(mib_storage_ets, Config) -> 
+	init_mib_storage_ets(Config);
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(otp_4394, Config) -> 
+	finish_otp_4394(Config);
+end_per_group(v2_inform, Config) -> 
+	finish_v2_inform(Config);
+end_per_group(multiple_reqs_2, Config) -> 
+	finish_mul(Config);
+end_per_group(multiple_reqs, Config) -> 
+	finish_mul(Config);
+end_per_group(test_multi_threaded, Config) -> 
+	finish_mt(Config);
+end_per_group(test_v3, Config) -> 
+	finish_v3(Config);
+end_per_group(test_v1_v2, Config) -> 
+	finish_v1_v2(Config);
+end_per_group(test_v2, Config) -> 
+	finish_v2(Config);
+end_per_group(test_v1, Config) -> 
+	finish_v1(Config);
+end_per_group(mib_storage_varm_mnesia, Config) -> 
+	finish_varm_mib_storage_mnesia(Config);
+end_per_group(mib_storage_varm_dets, Config) -> 
+	finish_varm_mib_storage_dets(Config);
+end_per_group(mib_storage_size_check_mnesia, Config) -> 
+	finish_size_check_msm(Config);
+end_per_group(mib_storage_size_check_dets, Config) -> 
+	finish_size_check_msd(Config);
+end_per_group(mib_storage_size_check_ets, Config) -> 
+	finish_size_check_mse(Config);
+end_per_group(mib_storage_mnesia, Config) -> 
+	finish_mib_storage_mnesia(Config);
+end_per_group(mib_storage_dets, Config) -> 
+	finish_mib_storage_dets(Config);
+end_per_group(mib_storage_ets, Config) -> 
+	finish_mib_storage_ets(Config);
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 init_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?t:timetrap(?t:minutes(6)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) when list(Config) ->
+end_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     Config.
 
-cases() ->
-    case ?OSTYPE() of
-	vxworks ->
-	    %% No crypto app, so skip v3 testcases
- 	    [
-	     app_info, 
-	     test_v1, test_v2, test_v1_v2, 
-	     test_multi_threaded, 
- 	     mib_storage, 
-	     tickets];
-	_Else ->
-  	    [
-	     app_info, 
- 	     test_v1, test_v2, test_v1_v2, test_v3, 
-   	     test_multi_threaded, 
-	     mib_storage, 
-	     tickets
-	    ]
-    end.
+cases() -> 
+case ?OSTYPE() of
+  vxworks ->
+      [app_info, {group, test_v1}, {group, test_v2},
+       {group, test_v1_v2}, {group, test_multi_threaded},
+       {group, mib_storage}, {group, tickets}];
+  _Else ->
+      [app_info, {group, test_v1}, {group, test_v2},
+       {group, test_v1_v2}, {group, test_v3},
+       {group, test_multi_threaded}, {group, mib_storage},
+       {group, tickets}]
+end.
 
 
 %%%-----------------------------------------------------------------
@@ -460,144 +586,56 @@ delete_mib_storage_mnesia_tables() ->
 %% <base>, and a second version <base>_2.  There may be several
 %% versions as well, <base>_N.
 %%-----------------------------------------------------------------
-mib_storage(suite) -> [
-		       mib_storage_ets, 
- 		       mib_storage_dets, 
- 		       mib_storage_mnesia,
- 		       mib_storage_size_check_ets,
- 		       mib_storage_size_check_dets,
- 		       mib_storage_size_check_mnesia,
- 		       mib_storage_varm_dets,
- 		       mib_storage_varm_mnesia
-		      ].
-
-mib_storage_ets(suite) -> {req, [], {conf, init_mib_storage_ets, 
-				     mib_storage_ets_cases(), 
-				     finish_mib_storage_ets}}.
-
-mib_storage_dets(suite) -> {req, [], {conf, init_mib_storage_dets, 
-				     mib_storage_dets_cases(), 
-				     finish_mib_storage_dets}}.
-
-mib_storage_mnesia(suite) -> {req, [], {conf, init_mib_storage_mnesia, 
-					mib_storage_mnesia_cases(), 
-					finish_mib_storage_mnesia}}.
-
-mib_storage_size_check_ets(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_mse, 
-	       mse_size_check_cases(), 
-	       finish_size_check_mse}}.
-
-mib_storage_size_check_dets(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_msd, 
-	       msd_size_check_cases(), 
-	       finish_size_check_msd}}.
-
-mib_storage_size_check_mnesia(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_msm, 
-	       msm_size_check_cases(), 
-	       finish_size_check_msm}}.
-
-mib_storage_varm_dets(suite) -> 
-    {req, [], {conf, 
-	       init_varm_mib_storage_dets, 
-	       varm_mib_storage_dets_cases(), 
-	       finish_varm_mib_storage_dets}}.
-
-mib_storage_varm_mnesia(suite) -> 
-    {req, [], {conf, 
-	       init_varm_mib_storage_mnesia, 
-	       varm_mib_storage_mnesia_cases(), 
-	       finish_varm_mib_storage_mnesia}}.
-
-mib_storage_ets_cases() ->
-    [
-     mse_simple, 
-     mse_v1_processing, 
-     mse_big, 
-     mse_big2, 
-     mse_loop_mib, 
-     mse_api, 
-     mse_sa_register, 
-     mse_v1_trap, 
-     mse_sa_error, 
-     mse_next_across_sa, 
-     mse_undo,
-     mse_standard_mib, 
-     mse_community_mib, 
-     mse_framework_mib, 
-     mse_target_mib, 
-     mse_notification_mib, 
-     mse_view_based_acm_mib, 
-     mse_sparse_table,
-     mse_me_of,
-     mse_mib_of].
-
-mib_storage_dets_cases() ->
-    [
-     msd_simple, 
-     msd_v1_processing, 
-     msd_big, 
-     msd_big2, 
-     msd_loop_mib, 
-     msd_api, 
-     msd_sa_register, 
-     msd_v1_trap, 
-     msd_sa_error, 
-     msd_next_across_sa, 
-     msd_undo,
-     msd_standard_mib,
-     msd_community_mib, 
-     msd_framework_mib, 
-     msd_target_mib, 
-     msd_notification_mib, 
-     msd_view_based_acm_mib, 
-     msd_sparse_table,
-     msd_me_of,
-     msd_mib_of
-    ].
-
-mib_storage_mnesia_cases() ->
-    [
-     msm_simple, 
-     msm_v1_processing, 
-     msm_big, 
-     msm_big2, 
-     msm_loop_mib, 
-     msm_api, 
-     msm_sa_register, 
-     msm_v1_trap, 
-     msm_sa_error, 
-     msm_next_across_sa, 
-     msm_undo,
-     msm_standard_mib, 
-     msm_community_mib, 
-     msm_framework_mib, 
-     msm_target_mib, 
-     msm_notification_mib, 
-     msm_view_based_acm_mib, 
-     msm_sparse_table,
-     msm_me_of,
-     msm_mib_of
-    ].
-
-mse_size_check_cases() ->
-    [mse_size_check].
-
-msd_size_check_cases() ->
-    [msd_size_check].
-
-msm_size_check_cases() ->
-    [msm_size_check].
-
-varm_mib_storage_dets_cases() ->
-    [msd_varm_mib_start].
-
-varm_mib_storage_mnesia_cases() ->
-    [msm_varm_mib_start].
+
+
+
+
+
+
+
+
+
+mib_storage_ets_cases() -> 
+[mse_simple, mse_v1_processing, mse_big, mse_big2,
+ mse_loop_mib, mse_api, mse_sa_register, mse_v1_trap,
+ mse_sa_error, mse_next_across_sa, mse_undo,
+ mse_standard_mib, mse_community_mib, mse_framework_mib,
+ mse_target_mib, mse_notification_mib,
+ mse_view_based_acm_mib, mse_sparse_table, mse_me_of,
+ mse_mib_of].
+
+mib_storage_dets_cases() -> 
+[msd_simple, msd_v1_processing, msd_big, msd_big2,
+ msd_loop_mib, msd_api, msd_sa_register, msd_v1_trap,
+ msd_sa_error, msd_next_across_sa, msd_undo,
+ msd_standard_mib, msd_community_mib, msd_framework_mib,
+ msd_target_mib, msd_notification_mib,
+ msd_view_based_acm_mib, msd_sparse_table, msd_me_of,
+ msd_mib_of].
+
+mib_storage_mnesia_cases() -> 
+[msm_simple, msm_v1_processing, msm_big, msm_big2,
+ msm_loop_mib, msm_api, msm_sa_register, msm_v1_trap,
+ msm_sa_error, msm_next_across_sa, msm_undo,
+ msm_standard_mib, msm_community_mib, msm_framework_mib,
+ msm_target_mib, msm_notification_mib,
+ msm_view_based_acm_mib, msm_sparse_table, msm_me_of,
+ msm_mib_of].
+
+mse_size_check_cases() -> 
+[mse_size_check].
+
+msd_size_check_cases() -> 
+[msd_size_check].
+
+msm_size_check_cases() -> 
+[msm_size_check].
+
+varm_mib_storage_dets_cases() -> 
+[msd_varm_mib_start].
+
+varm_mib_storage_mnesia_cases() -> 
+[msm_varm_mib_start].
 
 init_mib_storage_ets(Config) when list(Config) ->
     ?LOG("init_mib_storage_ets -> entry", []),
@@ -1099,20 +1137,14 @@ app_dir(App) ->
     end.
 
 
-test_v1(suite) -> {req, [], {conf, init_v1, v1_cases(), finish_v1}}.
 
 %v1_cases() -> [loop_mib];
-v1_cases() ->
-    [simple, 
-     db_notify_client,
-     v1_processing, big, big2, loop_mib, 
-     api, subagent, mnesia, multiple_reqs,
-     sa_register, v1_trap, sa_error, next_across_sa, undo, reported_bugs,
-     standard_mibs, sparse_table, cnt_64, 
-     opaque,
-     % opaque].
-    
-     change_target_addr_config].  
+v1_cases() -> 
+[simple, db_notify_client, v1_processing, big, big2,
+ loop_mib, api, subagent, mnesia, {group, multiple_reqs},
+ sa_register, v1_trap, sa_error, next_across_sa, undo,
+ {group, reported_bugs}, {group, standard_mibs},
+ sparse_table, cnt_64, opaque, change_target_addr_config].  
 
 init_v1(Config) when list(Config) ->
     ?line SaNode = ?config(snmp_sa, Config),
@@ -1129,15 +1161,15 @@ finish_v1(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v2(suite) -> {req, [], {conf, init_v2, v2_cases(), finish_v2}}.
 
 %v2_cases() -> [loop_mib_2];
-v2_cases() ->
-    [simple_2, v2_processing, big_2, big2_2, loop_mib_2,
-     api_2, subagent_2, mnesia_2,
-     multiple_reqs_2, sa_register_2, v2_trap, v2_inform, sa_error_2,
-     next_across_sa_2, undo_2, reported_bugs_2, standard_mibs_2,
-     v2_types, implied, sparse_table_2, cnt_64_2, opaque_2, v2_caps].
+v2_cases() -> 
+[simple_2, v2_processing, big_2, big2_2, loop_mib_2,
+ api_2, subagent_2, mnesia_2, {group, multiple_reqs_2},
+ sa_register_2, v2_trap, {group, v2_inform}, sa_error_2,
+ next_across_sa_2, undo_2, {group, reported_bugs_2},
+ {group, standard_mibs_2}, v2_types, implied,
+ sparse_table_2, cnt_64_2, opaque_2, v2_caps].
 
 init_v2(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1154,10 +1186,9 @@ finish_v2(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v1_v2(suite) -> {req, [], {conf, init_v1_v2, v1_v2_cases(), finish_v1_v2}}.
 
-v1_v2_cases() ->
-    [simple_bi].
+v1_v2_cases() -> 
+[simple_bi].
 
 init_v1_v2(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1174,16 +1205,16 @@ finish_v1_v2(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v3(suite) -> {req, [], {conf, init_v3, v3_cases(), finish_v3}}.
 
 %v3_cases() -> [loop_mib_3];
-v3_cases() ->
-    [simple_3, v3_processing,
-     big_3, big2_3, api_3, subagent_3, mnesia_3, loop_mib_3,
-     multiple_reqs_3, sa_register_3, v3_trap, v3_inform, sa_error_3,
-     next_across_sa_3, undo_3, reported_bugs_3, standard_mibs_3,
-     v3_security,
-     v2_types_3, implied_3, sparse_table_3, cnt_64_3, opaque_3, v2_caps_3].
+v3_cases() -> 
+[simple_3, v3_processing, big_3, big2_3, api_3,
+ subagent_3, mnesia_3, loop_mib_3, multiple_reqs_3,
+ sa_register_3, v3_trap, v3_inform, sa_error_3,
+ next_across_sa_3, undo_3, {group, reported_bugs_3},
+ {group, standard_mibs_3}, {group, v3_security},
+ v2_types_3, implied_3, sparse_table_3, cnt_64_3,
+ opaque_3, v2_caps_3].
 
 init_v3(Config) when list(Config) ->
     %% Make sure crypto works, otherwise start_agent will fail
@@ -1221,10 +1252,9 @@ finish_v3(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_multi_threaded(suite) -> {req, [], {conf, init_mt, mt_cases(), finish_mt}}.
 
-mt_cases() ->
-    [multi_threaded, mt_trap].
+mt_cases() -> 
+[multi_threaded, mt_trap].
 
 init_mt(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1739,21 +1769,19 @@ mnesia_2(X) -> mnesia(X).
 mnesia_3(X) -> mnesia(X).
 
 
-multiple_reqs(suite) ->
-    {req, [], {conf, init_mul, mul_cases(), finish_mul}}.
 
-mul_cases() ->
-    [mul_get, mul_get_err, mul_next, mul_next_err, mul_set_err].
+mul_cases() -> 
+[mul_get, mul_get_err, mul_next, mul_next_err,
+ mul_set_err].
     
-multiple_reqs_2(suite) ->
-    {req, [], {conf, init_mul, mul_cases_2(), finish_mul}}.
 
 multiple_reqs_3(_X) -> 
     {req, [], {conf, init_mul, mul_cases_3(), finish_mul}}.
 
 
-mul_cases_2() ->
-    [mul_get_2, mul_get_err_2, mul_next_2, mul_next_err_2, mul_set_err_2].
+mul_cases_2() -> 
+[mul_get_2, mul_get_err_2, mul_next_2, mul_next_err_2,
+ mul_set_err_2].
     
 
 mul_cases_3() ->
@@ -1939,8 +1967,6 @@ v2_trap(Config) when list(Config) ->
 v3_trap(X) ->
     v2_trap(X).
 
-v2_inform(suite) ->
-    {req, [], {conf, init_v2_inform, [v2_inform_i], finish_v2_inform}}.
 
 v3_inform(_X) ->
     %% v2_inform(X).
@@ -2112,7 +2138,6 @@ v3_processing(Config) when list(Config) ->
 %% accomplished by the first inform sent.  That one will generate a
 %% report, which makes it in sync.  The notification-generating
 %% application times out, and send again.  This time it'll work.
-v3_security(suite) -> [v3_crypto_basic, v3_md5_auth, v3_sha_auth, v3_des_priv].
 
 v3_crypto_basic(suite) -> [];
 v3_crypto_basic(_Config) ->
@@ -3591,22 +3616,8 @@ bad_return() ->
 %%% Note that many of the functions in the standard mib is
 %%% already tested by the normal tests.
 %%%-----------------------------------------------------------------
-standard_mibs(suite) ->
-    [snmp_standard_mib, snmp_community_mib,
-     snmp_framework_mib,
-     snmp_target_mib, snmp_notification_mib,
-     snmp_view_based_acm_mib].
-
-standard_mibs_2(suite) ->
-    [snmpv2_mib_2, snmp_community_mib_2,
-     snmp_framework_mib_2,
-     snmp_target_mib_2, snmp_notification_mib_2,
-     snmp_view_based_acm_mib_2].
-
-standard_mibs_3(suite) ->
-    [snmpv2_mib_3,snmp_framework_mib_3, snmp_mpd_mib_3,
-     snmp_target_mib_3, snmp_notification_mib_3,
-     snmp_view_based_acm_mib_3, snmp_user_based_sm_mib_3].
+
+
 
 %%-----------------------------------------------------------------
 %% For this test, the agent is configured for v1.
@@ -4527,27 +4538,12 @@ loop_it_2(Oid, N) ->
 %%% Testing of reported bugs and other tickets.
 %%%-----------------------------------------------------------------
 
-reported_bugs(suite) ->
-    [otp_1128, otp_1129, otp_1131, otp_1162,
-     otp_1222, otp_1298, otp_1331, otp_1338,
-     otp_1342, otp_2776, otp_2979, otp_3187, otp_3725].
 
-reported_bugs_2(suite) ->
-    [otp_1128_2, otp_1129_2, otp_1131_2, otp_1162_2,
-     otp_1222_2, otp_1298_2, otp_1331_2, otp_1338_2,
-     otp_1342_2, otp_2776_2, otp_2979_2, otp_3187_2].
 
-reported_bugs_3(suite) ->
-    [otp_1128_3, otp_1129_3, otp_1131_3, otp_1162_3,
-     otp_1222_3, otp_1298_3, otp_1331_3, otp_1338_3,
-     otp_1342_3, otp_2776_3, otp_2979_3, otp_3187_3,
-     otp_3542].
 
 
 %% These are (ticket) test cases where the initiation has to be done
 %% individually.
-tickets(suite) ->
-    [otp_4394].
 
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1128
@@ -4971,10 +4967,6 @@ otp_3725_test(MaNode) ->
 %%-----------------------------------------------------------------
 
 
-otp_4394(suite) -> {req, [], {conf, 
-			      init_otp_4394, 
-			      [otp_4394_test], 
-			      finish_otp_4394}}.
 
 init_otp_4394(Config) when list(Config) ->
     ?DBG("init_otp_4394 -> entry with"
diff --git a/lib/snmp/test/snmp_agent_nfilter_test.erl b/lib/snmp/test/snmp_agent_nfilter_test.erl
index 269c7c96c9..f08060cee3 100644
--- a/lib/snmp/test/snmp_agent_nfilter_test.erl
+++ b/lib/snmp/test/snmp_agent_nfilter_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -25,7 +25,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 
 
@@ -33,8 +33,8 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-	 all/1, 
-         init_per_testcase/2, fin_per_testcase/2
+	 all/0, 
+         init_per_testcase/2, end_per_testcase/2
 	]).
 
 %%----------------------------------------------------------------------
@@ -58,14 +58,14 @@
 init_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
 %%======================================================================
 %% Test case definitions
 %%======================================================================
-all(_) ->
-    ?SKIP(not_yet_implemented).
+all() ->
+    {skip,not_yet_implemented}.
 
 
 %%======================================================================
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index 2534147769..692d29fda0 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -28,7 +28,7 @@
 -define(application, snmp).
 
 -include_lib("kernel/include/file.hrl").
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
@@ -85,18 +85,171 @@
 	       end).
 
 
-all(suite) -> 
-    Reqs = [mnesia, distribution, {local_slave_nodes, 2}, {time, 360}], 
-    Conf1 = [{conf, init_all, cases(), finish_all}], 
-    Conf2 = [tickets2], 
-    {req, Reqs, Conf1 ++ Conf2}.
+all() -> 
+    Reqs = [mnesia, distribution, {local_slave_nodes, 2},
+	    {time, 360}],
+    Conf1 = [{group, all_tcs}],
+    Conf2 = [{group, tickets2}],
+    Conf1 ++ Conf2.
+
+groups() -> 
+    [{all_tcs, [], cases()},
+     {mib_storage, [],
+      [{group, mib_storage_ets}, {group, mib_storage_dets},
+       {group, mib_storage_mnesia},
+       {group, mib_storage_size_check_ets},
+       {group, mib_storage_size_check_dets},
+       {group, mib_storage_size_check_mnesia},
+       {group, mib_storage_varm_dets},
+       {group, mib_storage_varm_mnesia}]},
+     {mib_storage_ets, [], mib_storage_ets_cases()},
+     {mib_storage_dets, [], mib_storage_dets_cases()},
+     {mib_storage_mnesia, [], mib_storage_mnesia_cases()},
+     {mib_storage_size_check_ets, [],
+      mse_size_check_cases()},
+     {mib_storage_size_check_dets, [],
+      msd_size_check_cases()},
+     {mib_storage_size_check_mnesia, [],
+      msm_size_check_cases()},
+     {mib_storage_varm_dets, [],
+      varm_mib_storage_dets_cases()},
+     {mib_storage_varm_mnesia, [],
+      varm_mib_storage_mnesia_cases()},
+     {misc, [], misc_cases()}, {test_v1, [], v1_cases()},
+     {test_v2, [], v2_cases()},
+     {test_v1_v2, [], v1_v2_cases()},
+     {test_v3, [], v3_cases()},
+     {test_multi_threaded, [], mt_cases()},
+     {multiple_reqs, [], mul_cases()},
+     {multiple_reqs_2, [], mul_cases_2()},
+     {v2_inform, [], [v2_inform_i]},
+     {v3_security, [],
+      [v3_crypto_basic, v3_md5_auth, v3_sha_auth,
+       v3_des_priv]},
+     {standard_mibs, [],
+      [snmp_standard_mib, snmp_community_mib,
+       snmp_framework_mib, snmp_target_mib,
+       snmp_notification_mib, snmp_view_based_acm_mib]},
+     {standard_mibs_2, [],
+      [snmpv2_mib_2, snmp_community_mib_2,
+       snmp_framework_mib_2, snmp_target_mib_2,
+       snmp_notification_mib_2, snmp_view_based_acm_mib_2]},
+     {standard_mibs_3, [],
+      [snmpv2_mib_3, snmp_framework_mib_3, snmp_mpd_mib_3,
+       snmp_target_mib_3, snmp_notification_mib_3,
+       snmp_view_based_acm_mib_3, snmp_user_based_sm_mib_3]},
+     {reported_bugs, [],
+      [otp_1128, otp_1129, otp_1131, otp_1162, otp_1222,
+       otp_1298, otp_1331, otp_1338, otp_1342, otp_2776,
+       otp_2979, otp_3187, otp_3725]},
+     {reported_bugs_2, [],
+      [otp_1128_2, otp_1129_2, otp_1131_2, otp_1162_2,
+       otp_1222_2, otp_1298_2, otp_1331_2, otp_1338_2,
+       otp_1342_2, otp_2776_2, otp_2979_2, otp_3187_2]},
+     {reported_bugs_3, [],
+      [otp_1128_3, otp_1129_3, otp_1131_3, otp_1162_3,
+       otp_1222_3, otp_1298_3, otp_1331_3, otp_1338_3,
+       otp_1342_3, otp_2776_3, otp_2979_3, otp_3187_3,
+       otp_3542]},
+     {tickets1, [], [{group, otp_4394}, {group, otp_7157}]},
+     {tickets2, [], [otp8395]},
+     {otp_4394, [], [otp_4394_test]},
+     {otp_7157, [],
+      begin Reqs = [], Conf = [otp_7157_test], Conf end}].
+
+init_per_group(all_tcs, Config) ->
+    init_all(Config);
+init_per_group(otp_7157, Config) -> 
+	init_otp_7157(Config);
+init_per_group(otp_4394, Config) -> 
+	init_otp_4394(Config);
+init_per_group(v2_inform, Config) -> 
+	init_v2_inform(Config);
+init_per_group(multiple_reqs_2, Config) -> 
+	init_mul(Config);
+init_per_group(multiple_reqs, Config) -> 
+	init_mul(Config);
+init_per_group(test_multi_threaded, Config) -> 
+	init_mt(Config);
+init_per_group(test_v3, Config) -> 
+	init_v3(Config);
+init_per_group(test_v1_v2, Config) -> 
+	init_v1_v2(Config);
+init_per_group(test_v2, Config) -> 
+	init_v2(Config);
+init_per_group(test_v1, Config) -> 
+	init_v1(Config);
+init_per_group(misc, Config) -> 
+	init_misc(Config);
+init_per_group(mib_storage_varm_mnesia, Config) -> 
+	init_varm_mib_storage_mnesia(Config);
+init_per_group(mib_storage_varm_dets, Config) -> 
+	init_varm_mib_storage_dets(Config);
+init_per_group(mib_storage_size_check_mnesia, Config) -> 
+	init_size_check_msm(Config);
+init_per_group(mib_storage_size_check_dets, Config) -> 
+	init_size_check_msd(Config);
+init_per_group(mib_storage_size_check_ets, Config) -> 
+	init_size_check_mse(Config);
+init_per_group(mib_storage_mnesia, Config) -> 
+	init_mib_storage_mnesia(Config);
+init_per_group(mib_storage_dets, Config) -> 
+	init_mib_storage_dets(Config);
+init_per_group(mib_storage_ets, Config) -> 
+	init_mib_storage_ets(Config);
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(all_tcs, Config) ->
+    finish_all(Config);
+end_per_group(otp_7157, Config) -> 
+	finish_otp_7157(Config);
+end_per_group(otp_4394, Config) -> 
+	finish_otp_4394(Config);
+end_per_group(v2_inform, Config) -> 
+	finish_v2_inform(Config);
+end_per_group(multiple_reqs_2, Config) -> 
+	finish_mul(Config);
+end_per_group(multiple_reqs, Config) -> 
+	finish_mul(Config);
+end_per_group(test_multi_threaded, Config) -> 
+	finish_mt(Config);
+end_per_group(test_v3, Config) -> 
+	finish_v3(Config);
+end_per_group(test_v1_v2, Config) -> 
+	finish_v1_v2(Config);
+end_per_group(test_v2, Config) -> 
+	finish_v2(Config);
+end_per_group(test_v1, Config) -> 
+	finish_v1(Config);
+end_per_group(misc, Config) -> 
+	finish_misc(Config);
+end_per_group(mib_storage_varm_mnesia, Config) -> 
+	finish_varm_mib_storage_mnesia(Config);
+end_per_group(mib_storage_varm_dets, Config) -> 
+	finish_varm_mib_storage_dets(Config);
+end_per_group(mib_storage_size_check_mnesia, Config) -> 
+	finish_size_check_msm(Config);
+end_per_group(mib_storage_size_check_dets, Config) -> 
+	finish_size_check_msd(Config);
+end_per_group(mib_storage_size_check_ets, Config) -> 
+	finish_size_check_mse(Config);
+end_per_group(mib_storage_mnesia, Config) -> 
+	finish_mib_storage_mnesia(Config);
+end_per_group(mib_storage_dets, Config) -> 
+	finish_mib_storage_dets(Config);
+end_per_group(mib_storage_ets, Config) -> 
+	finish_mib_storage_ets(Config);
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 
 init_per_testcase(otp8395 = Case, Config) when is_list(Config) ->
     ?DBG("init_per_testcase -> entry with"
 	 "~n   Case:   ~p"
 	 "~n   Config: ~p", [Case, Config]),
-    Config2 = init_per_testcase2(Case, init_suite(Config)), 
+    Config2 = init_per_testcase2(Case, init_per_suite(Config)), 
     otp8395({init, Config2});
 init_per_testcase(otp_7157_test = _Case, Config) when is_list(Config) ->
     ?DBG("init_per_testcase -> entry with"
@@ -123,10 +276,10 @@ init_per_testcase(_Case, Config) when is_list(Config) ->
     Dog = ?WD_START(?MINS(6)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(otp8395, Config) when is_list(Config) ->
+end_per_testcase(otp8395, Config) when is_list(Config) ->
     otp8395({fin, Config});
-fin_per_testcase(_Case, Config) when is_list(Config) ->
-    ?DBG("fin_per_testcase -> entry with"
+end_per_testcase(_Case, Config) when is_list(Config) ->
+    ?DBG("end_per_testcase -> entry with"
 	 "~n   Case:   ~p"
 	 "~n   Config: ~p", [_Case, Config]),
     Dog = ?config(watchdog, Config),
@@ -134,8 +287,8 @@ fin_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
 
-init_suite(Config) ->
-    ?DBG("init_suite -> entry with"
+init_per_suite(Config) ->
+    ?DBG("init_per_suite -> entry with"
 	 "~n   Config: ~p", [Config]),
 
     %% Suite root dir for test suite
@@ -170,12 +323,12 @@ init_suite(Config) ->
 	       {mib_dir,       MibDir}, 
 	       {std_mib_dir,   StdMibDir} | Config1],
 
-    ?DBG("init_suite -> done when"
+    ?DBG("init_per_suite -> done when"
 	 "~n   Config2: ~p", [Config2]),
     Config2.
 
 %% end_per_suite(Config) ->
-end_suite(Config) ->
+end_per_suite(Config) ->
     Config.
 
 fix_data_dir(Config) ->
@@ -220,35 +373,22 @@ init_per_testcase2(Case, Config) ->
      {sub_agent_top_dir, SubAgentTopDir}, 
      {manager_top_dir,   ManagerTopDir} | Config].
 
-fin_per_testcase2(_Case, Config) ->
+end_per_testcase2(_Case, Config) ->
     Config.
 
 
-cases() ->
-    case ?OSTYPE() of
-	vxworks ->
-	    %% No crypto app, so skip v3 testcases
- 	    [
-	     misc, 
-   	     test_v1, 
-   	     test_v2, 
-   	     test_v1_v2, 
-   	     test_multi_threaded, 
-    	     mib_storage, 
-   	     tickets1
-	    ];
-	_Else ->
-  	    [
-             misc, 
-             test_v1, 
-             test_v2, 
-             test_v1_v2, 
-             test_v3, 
-             test_multi_threaded, 
-             mib_storage, 
-             tickets1
-	    ]
-    end.
+cases() -> 
+case ?OSTYPE() of
+  vxworks ->
+      [{group, misc}, {group, test_v1}, {group, test_v2},
+       {group, test_v1_v2}, {group, test_multi_threaded},
+       {group, mib_storage}, {group, tickets1}];
+  _Else ->
+      [{group, misc}, {group, test_v1}, {group, test_v2},
+       {group, test_v1_v2}, {group, test_v3},
+       {group, test_multi_threaded}, {group, mib_storage},
+       {group, tickets1}]
+end.
 
 
 %%%-----------------------------------------------------------------
@@ -355,144 +495,56 @@ delete_mib_storage_mnesia_tables() ->
 %% <base>, and a second version <base>_2.  There may be several
 %% versions as well, <base>_N.
 %%-----------------------------------------------------------------
-mib_storage(suite) -> [
-		       mib_storage_ets, 
- 		       mib_storage_dets, 
- 		       mib_storage_mnesia,
- 		       mib_storage_size_check_ets,
- 		       mib_storage_size_check_dets,
- 		       mib_storage_size_check_mnesia,
- 		       mib_storage_varm_dets,
- 		       mib_storage_varm_mnesia
-		      ].
-
-mib_storage_ets(suite) -> {req, [], {conf, init_mib_storage_ets, 
-				     mib_storage_ets_cases(), 
-				     finish_mib_storage_ets}}.
-
-mib_storage_dets(suite) -> {req, [], {conf, init_mib_storage_dets, 
-				     mib_storage_dets_cases(), 
-				     finish_mib_storage_dets}}.
-
-mib_storage_mnesia(suite) -> {req, [], {conf, init_mib_storage_mnesia, 
-					mib_storage_mnesia_cases(), 
-					finish_mib_storage_mnesia}}.
-
-mib_storage_size_check_ets(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_mse, 
-	       mse_size_check_cases(), 
-	       finish_size_check_mse}}.
-
-mib_storage_size_check_dets(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_msd, 
-	       msd_size_check_cases(), 
-	       finish_size_check_msd}}.
-
-mib_storage_size_check_mnesia(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_msm, 
-	       msm_size_check_cases(), 
-	       finish_size_check_msm}}.
-
-mib_storage_varm_dets(suite) -> 
-    {req, [], {conf, 
-	       init_varm_mib_storage_dets, 
-	       varm_mib_storage_dets_cases(), 
-	       finish_varm_mib_storage_dets}}.
-
-mib_storage_varm_mnesia(suite) -> 
-    {req, [], {conf, 
-	       init_varm_mib_storage_mnesia, 
-	       varm_mib_storage_mnesia_cases(), 
-	       finish_varm_mib_storage_mnesia}}.
-
-mib_storage_ets_cases() ->
-    [
-     mse_simple, 
-     mse_v1_processing, 
-     mse_big, 
-     mse_big2, 
-     mse_loop_mib, 
-     mse_api, 
-     mse_sa_register, 
-     mse_v1_trap, 
-     mse_sa_error, 
-     mse_next_across_sa, 
-     mse_undo,
-     mse_standard_mib, 
-     mse_community_mib, 
-     mse_framework_mib, 
-     mse_target_mib, 
-     mse_notification_mib, 
-     mse_view_based_acm_mib, 
-     mse_sparse_table,
-     mse_me_of,
-     mse_mib_of].
-
-mib_storage_dets_cases() ->
-    [
-     msd_simple, 
-     msd_v1_processing, 
-     msd_big, 
-     msd_big2, 
-     msd_loop_mib, 
-     msd_api, 
-     msd_sa_register, 
-     msd_v1_trap, 
-     msd_sa_error, 
-     msd_next_across_sa, 
-     msd_undo,
-     msd_standard_mib,
-     msd_community_mib, 
-     msd_framework_mib, 
-     msd_target_mib, 
-     msd_notification_mib, 
-     msd_view_based_acm_mib, 
-     msd_sparse_table,
-     msd_me_of,
-     msd_mib_of
-    ].
-
-mib_storage_mnesia_cases() ->
-    [
-     msm_simple, 
-     msm_v1_processing, 
-     msm_big, 
-     msm_big2, 
-     msm_loop_mib, 
-     msm_api, 
-     msm_sa_register, 
-     msm_v1_trap, 
-     msm_sa_error, 
-     msm_next_across_sa, 
-     msm_undo,
-     msm_standard_mib, 
-     msm_community_mib, 
-     msm_framework_mib, 
-     msm_target_mib, 
-     msm_notification_mib, 
-     msm_view_based_acm_mib, 
-     msm_sparse_table,
-     msm_me_of,
-     msm_mib_of
-    ].
-
-mse_size_check_cases() ->
-    [mse_size_check].
-
-msd_size_check_cases() ->
-    [msd_size_check].
-
-msm_size_check_cases() ->
-    [msm_size_check].
-
-varm_mib_storage_dets_cases() ->
-    [msd_varm_mib_start].
-
-varm_mib_storage_mnesia_cases() ->
-    [msm_varm_mib_start].
+
+
+
+
+
+
+
+
+
+mib_storage_ets_cases() -> 
+[mse_simple, mse_v1_processing, mse_big, mse_big2,
+ mse_loop_mib, mse_api, mse_sa_register, mse_v1_trap,
+ mse_sa_error, mse_next_across_sa, mse_undo,
+ mse_standard_mib, mse_community_mib, mse_framework_mib,
+ mse_target_mib, mse_notification_mib,
+ mse_view_based_acm_mib, mse_sparse_table, mse_me_of,
+ mse_mib_of].
+
+mib_storage_dets_cases() -> 
+[msd_simple, msd_v1_processing, msd_big, msd_big2,
+ msd_loop_mib, msd_api, msd_sa_register, msd_v1_trap,
+ msd_sa_error, msd_next_across_sa, msd_undo,
+ msd_standard_mib, msd_community_mib, msd_framework_mib,
+ msd_target_mib, msd_notification_mib,
+ msd_view_based_acm_mib, msd_sparse_table, msd_me_of,
+ msd_mib_of].
+
+mib_storage_mnesia_cases() -> 
+[msm_simple, msm_v1_processing, msm_big, msm_big2,
+ msm_loop_mib, msm_api, msm_sa_register, msm_v1_trap,
+ msm_sa_error, msm_next_across_sa, msm_undo,
+ msm_standard_mib, msm_community_mib, msm_framework_mib,
+ msm_target_mib, msm_notification_mib,
+ msm_view_based_acm_mib, msm_sparse_table, msm_me_of,
+ msm_mib_of].
+
+mse_size_check_cases() -> 
+[mse_size_check].
+
+msd_size_check_cases() -> 
+[msd_size_check].
+
+msm_size_check_cases() -> 
+[msm_size_check].
+
+varm_mib_storage_dets_cases() -> 
+[msd_varm_mib_start].
+
+varm_mib_storage_mnesia_cases() -> 
+[msm_varm_mib_start].
 
 init_mib_storage_ets(Config) when is_list(Config) ->
     ?LOG("init_mib_storage_ets -> entry", []),
@@ -975,8 +1027,6 @@ mib_of(Oid, ExpectedMibName) ->
     end.
 
 
-misc(suite) ->
-    {req, [], {conf, init_misc, misc_cases(), finish_misc}}.
 
 init_misc(Config) ->
     init_v1(Config).
@@ -984,11 +1034,8 @@ init_misc(Config) ->
 finish_misc(Config) ->
     finish_v1(Config).
 
-misc_cases() ->
-    [
-     app_info,
-     info_test
-    ].
+misc_cases() -> 
+[app_info, info_test].
 
 app_info(suite) -> [];
 app_info(Config) when is_list(Config) ->
@@ -1021,34 +1068,14 @@ app_dir(App) ->
     end.
 
 
-test_v1(suite) -> {req, [], {conf, init_v1, v1_cases(), finish_v1}}.
 
 %v1_cases() -> [loop_mib];
-v1_cases() ->
-    [
-     simple, 
-     db_notify_client,
-     v1_processing, 
-     big, 
-     big2, 
-     loop_mib, 
-     api, 
-     subagent, 
-     mnesia, 
-     multiple_reqs,
-     sa_register, 
-     v1_trap, 
-     sa_error, 
-     next_across_sa, 
-     undo, 
-     reported_bugs,
-     standard_mibs, 
-     sparse_table, 
-     cnt_64, 
-     opaque,
-
-     change_target_addr_config
-    ].  
+v1_cases() -> 
+[simple, db_notify_client, v1_processing, big, big2,
+ loop_mib, api, subagent, mnesia, {group, multiple_reqs},
+ sa_register, v1_trap, sa_error, next_across_sa, undo,
+ {group, reported_bugs}, {group, standard_mibs},
+ sparse_table, cnt_64, opaque, change_target_addr_config].  
 
 init_v1(Config) when is_list(Config) ->
     ?line SaNode = ?config(snmp_sa, Config),
@@ -1065,34 +1092,14 @@ finish_v1(Config) when is_list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v2(suite) -> {req, [], {conf, init_v2, v2_cases(), finish_v2}}.
-
-v2_cases() ->
-    [
-     simple_2, 
-     v2_processing, 
-     big_2, 
-     big2_2, 
-     loop_mib_2,
-     api_2, 
-     subagent_2, 
-     mnesia_2,
-     multiple_reqs_2, 
-     sa_register_2, 
-     v2_trap, 
-     v2_inform, 
-     sa_error_2,
-     next_across_sa_2, 
-     undo_2, 
-     reported_bugs_2, 
-     standard_mibs_2,
-     v2_types, 
-     implied, 
-     sparse_table_2, 
-     cnt_64_2, 
-     opaque_2, 
-     v2_caps
-    ].
+
+v2_cases() -> 
+[simple_2, v2_processing, big_2, big2_2, loop_mib_2,
+ api_2, subagent_2, mnesia_2, {group, multiple_reqs_2},
+ sa_register_2, v2_trap, {group, v2_inform}, sa_error_2,
+ next_across_sa_2, undo_2, {group, reported_bugs_2},
+ {group, standard_mibs_2}, v2_types, implied,
+ sparse_table_2, cnt_64_2, opaque_2, v2_caps].
 
 init_v2(Config) when is_list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1109,11 +1116,9 @@ finish_v2(Config) when is_list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v1_v2(suite) -> 
-    {req, [], {conf, init_v1_v2, v1_v2_cases(), finish_v1_v2}}.
 
-v1_v2_cases() ->
-    [simple_bi].
+v1_v2_cases() -> 
+[simple_bi].
 
 init_v1_v2(Config) when is_list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1130,35 +1135,15 @@ finish_v1_v2(Config) when is_list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v3(suite) -> {req, [], {conf, init_v3, v3_cases(), finish_v3}}.
-
-v3_cases() ->
-    [
-     simple_3, 
-     v3_processing,
-     big_3, 
-     big2_3, 
-     api_3, 
-     subagent_3, 
-     mnesia_3, 
-     loop_mib_3,
-     multiple_reqs_3, 
-     sa_register_3, 
-     v3_trap, 
-     v3_inform, 
-     sa_error_3,
-     next_across_sa_3, 
-     undo_3, 
-     reported_bugs_3, 
-     standard_mibs_3,
-     v3_security,
-     v2_types_3, 
-     implied_3, 
-     sparse_table_3, 
-     cnt_64_3, 
-     opaque_3, 
-     v2_caps_3
-    ].
+
+v3_cases() -> 
+[simple_3, v3_processing, big_3, big2_3, api_3,
+ subagent_3, mnesia_3, loop_mib_3, multiple_reqs_3,
+ sa_register_3, v3_trap, v3_inform, sa_error_3,
+ next_across_sa_3, undo_3, {group, reported_bugs_3},
+ {group, standard_mibs_3}, {group, v3_security},
+ v2_types_3, implied_3, sparse_table_3, cnt_64_3,
+ opaque_3, v2_caps_3].
 
 init_v3(Config) when is_list(Config) ->
     %% Make sure crypto works, otherwise start_agent will fail
@@ -1196,11 +1181,9 @@ finish_v3(Config) when is_list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_multi_threaded(suite) -> 
-    {req, [], {conf, init_mt, mt_cases(), finish_mt}}.
 
-mt_cases() ->
-    [multi_threaded, mt_trap].
+mt_cases() -> 
+[multi_threaded, mt_trap].
 
 init_mt(Config) when is_list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1690,21 +1673,19 @@ mnesia_2(X) -> ?P(mnesia_2), mnesia(X).
 mnesia_3(X) -> ?P(mnesia_3), mnesia(X).
 
 
-multiple_reqs(suite) ->
-    {req, [], {conf, init_mul, mul_cases(), finish_mul}}.
 
-mul_cases() ->
-    [mul_get, mul_get_err, mul_next, mul_next_err, mul_set_err].
+mul_cases() -> 
+[mul_get, mul_get_err, mul_next, mul_next_err,
+ mul_set_err].
     
-multiple_reqs_2(suite) ->
-    {req, [], {conf, init_mul, mul_cases_2(), finish_mul}}.
 
 multiple_reqs_3(_X) -> 
     {req, [], {conf, init_mul, mul_cases_3(), finish_mul}}.
 
 
-mul_cases_2() ->
-    [mul_get_2, mul_get_err_2, mul_next_2, mul_next_err_2, mul_set_err_2].
+mul_cases_2() -> 
+[mul_get_2, mul_get_err_2, mul_next_2, mul_next_err_2,
+ mul_set_err_2].
     
 
 mul_cases_3() ->
@@ -1929,8 +1910,6 @@ v3_trap(Config) when is_list(Config) ->
     ?P(v3_trap), 
     trap2(Config).
 
-v2_inform(suite) ->
-    {req, [], {conf, init_v2_inform, [v2_inform_i], finish_v2_inform}}.
 
 v3_inform(_X) ->
     %% v2_inform(X).
@@ -2190,13 +2169,6 @@ v3_processing(Config) when is_list(Config) ->
 %% accomplished by the first inform sent.  That one will generate a
 %% report, which makes it in sync.  The notification-generating
 %% application times out, and send again.  This time it'll work.
-v3_security(suite) -> 
-    [
-     v3_crypto_basic, 
-     v3_md5_auth, 
-     v3_sha_auth, 
-     v3_des_priv
-    ].
 
 v3_crypto_basic(suite) -> [];
 v3_crypto_basic(_Config) ->
@@ -4044,36 +4016,8 @@ bad_return() ->
 %%% Note that many of the functions in the standard mib is
 %%% already tested by the normal tests.
 %%%-----------------------------------------------------------------
-standard_mibs(suite) ->
-    [
-     snmp_standard_mib, 
-     snmp_community_mib,
-     snmp_framework_mib,
-     snmp_target_mib, 
-     snmp_notification_mib,
-     snmp_view_based_acm_mib
-    ].
-
-standard_mibs_2(suite) ->
-    [
-     snmpv2_mib_2, 
-     snmp_community_mib_2,
-     snmp_framework_mib_2,
-     snmp_target_mib_2, 
-     snmp_notification_mib_2,
-     snmp_view_based_acm_mib_2
-    ].
-
-standard_mibs_3(suite) ->
-    [
-     snmpv2_mib_3,
-     snmp_framework_mib_3, 
-     snmp_mpd_mib_3,
-     snmp_target_mib_3, 
-     snmp_notification_mib_3,
-     snmp_view_based_acm_mib_3, 
-     snmp_user_based_sm_mib_3
-    ].
+
+
 
 %%-----------------------------------------------------------------
 %% For this test, the agent is configured for v1.
@@ -5117,70 +5061,14 @@ loop_it_2(Oid, N) ->
 %%% Testing of reported bugs and other tickets.
 %%%-----------------------------------------------------------------
 
-reported_bugs(suite) ->
-    [
-     otp_1128, 
-     otp_1129, 
-     otp_1131, 
-     otp_1162,
-     otp_1222, 
-     otp_1298, 
-     otp_1331, 
-     otp_1338,
-     otp_1342, 
-     otp_2776, 
-     otp_2979, 
-     otp_3187, 
-     otp_3725
-    ].
-
-reported_bugs_2(suite) ->
-    [
-     otp_1128_2, 
-     otp_1129_2, 
-     otp_1131_2, 
-     otp_1162_2,
-     otp_1222_2, 
-     otp_1298_2, 
-     otp_1331_2, 
-     otp_1338_2,
-     otp_1342_2, 
-     otp_2776_2, 
-     otp_2979_2, 
-     otp_3187_2
-    ].
-
-reported_bugs_3(suite) ->
-    [
-     otp_1128_3, 
-     otp_1129_3, 
-     otp_1131_3, 
-     otp_1162_3,
-     otp_1222_3, 
-     otp_1298_3, 
-     otp_1331_3, 
-     otp_1338_3,
-     otp_1342_3, 
-     otp_2776_3, 
-     otp_2979_3, 
-     otp_3187_3,
-     otp_3542
-    ].
+
+
 
 
 %% These are (ticket) test cases where the initiation has to be done
 %% individually.
-tickets1(suite) ->
-    [
-     otp_4394, 
-     otp_7157
-    ].
 
 
-tickets2(suite) ->
-    [
-     otp8395
-    ].
 
 
 
@@ -5260,7 +5148,35 @@ otp_1131_2(X) -> ?P(otp_1131_2), otp_1131(X).
 
 otp_1131_3(X) -> 
     %% <CONDITIONAL-SKIP>
-    Skippable = [{unix, [darwin]}],
+    %% This is intended to catch Montavista Linux 4.0/ppc (2.6.5)
+    %% Montavista Linux looks like a Debian distro (/etc/issue)
+    LinuxVersionVerify = 
+	fun() ->
+		case os:cmd("uname -m") of
+		    "ppc" ++ _ ->
+			case file:read_file_info("/etc/issue") of
+			    {ok, _} ->
+				case os:cmd("grep -i montavista /etc/issue") of
+				    Info when (is_list(Info) andalso 
+					       (length(Info) > 0)) ->
+					case os:version() of
+					    {2, 6, 10} ->
+						true;
+					    _ ->
+						false
+					end;
+				    _ -> % Maybe plain Debian or Ubuntu
+					false
+				end;
+			    _ ->
+				%% Not a Debian based distro
+				false
+			end;
+		    _ ->
+			false
+		end
+	end,
+    Skippable = [{unix, [darwin, {linux, LinuxVersionVerify}]}],
     Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
     ?NON_PC_TC_MAYBE_SKIP(X, Condition),
     %% </CONDITIONAL-SKIP>
@@ -5633,10 +5549,6 @@ otp_3725_test(MaNode) ->
 %%-----------------------------------------------------------------
 
 
-otp_4394(suite) -> {req, [], {conf, 
-			      init_otp_4394, 
-			      [otp_4394_test], 
-			      finish_otp_4394}}.
 
 init_otp_4394(Config) when is_list(Config) ->
     ?DBG("init_otp_4394 -> entry with"
@@ -5730,10 +5642,6 @@ otp_4394_test1() ->
 %%-----------------------------------------------------------------
 
 
-otp_7157(suite) -> 
-    Reqs = [], 
-    Conf = [{conf, init_otp_7157, [otp_7157_test], finish_otp_7157}], 
-    {req, Reqs, Conf}.
 
 init_otp_7157(Config) when is_list(Config) ->
     %% <CONDITIONAL-SKIP>
diff --git a/lib/snmp/test/snmp_agent_v1_test.erl b/lib/snmp/test/snmp_agent_v1_test.erl
index 52ac6cf58f..737bb25cc3 100644
--- a/lib/snmp/test/snmp_agent_v1_test.erl
+++ b/lib/snmp/test/snmp_agent_v1_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -103,7 +103,7 @@ init_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?t:timetrap(?t:minutes(6)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) when list(Config) ->
+end_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     Config.
diff --git a/lib/snmp/test/snmp_agent_v2_test.erl b/lib/snmp/test/snmp_agent_v2_test.erl
index eca66dc30d..dc94c18ad9 100644
--- a/lib/snmp/test/snmp_agent_v2_test.erl
+++ b/lib/snmp/test/snmp_agent_v2_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -28,7 +28,7 @@
 -define(application, snmp).
 
 -include_lib("kernel/include/file.hrl").
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
@@ -83,39 +83,165 @@
 		   _ -> V3
 	       end).
 
-all(suite) -> {req,
-	       [mnesia, distribution,
-		{local_slave_nodes, 2}, {time, 360}],
-	       [{conf, init_all, cases(), finish_all}]}.
+all() -> 
+[cases()].
+
+groups() -> 
+    [{mib_storage, [],
+  [{group, mib_storage_ets}, {group, mib_storage_dets},
+   {group, mib_storage_mnesia},
+   {group, mib_storage_size_check_ets},
+   {group, mib_storage_size_check_dets},
+   {group, mib_storage_size_check_mnesia},
+   {group, mib_storage_varm_dets},
+   {group, mib_storage_varm_mnesia}]},
+ {mib_storage_ets, [], mib_storage_ets_cases()},
+ {mib_storage_dets, [], mib_storage_dets_cases()},
+ {mib_storage_mnesia, [], mib_storage_mnesia_cases()},
+ {mib_storage_size_check_ets, [],
+  mse_size_check_cases()},
+ {mib_storage_size_check_dets, [],
+  msd_size_check_cases()},
+ {mib_storage_size_check_mnesia, [],
+  msm_size_check_cases()},
+ {mib_storage_varm_dets, [],
+  varm_mib_storage_dets_cases()},
+ {mib_storage_varm_mnesia, [],
+  varm_mib_storage_mnesia_cases()},
+ {test_v1, [], v1_cases()}, {test_v2, [], v2_cases()},
+ {test_v1_v2, [], v1_v2_cases()},
+ {test_v3, [], v3_cases()},
+ {test_multi_threaded, [], mt_cases()},
+ {multiple_reqs, [], mul_cases()},
+ {multiple_reqs_2, [], mul_cases_2()},
+ {v2_inform, [], [v2_inform_i]},
+ {v3_security, [],
+  [v3_crypto_basic, v3_md5_auth, v3_sha_auth,
+   v3_des_priv]},
+ {standard_mibs, [],
+  [snmp_standard_mib, snmp_community_mib,
+   snmp_framework_mib, snmp_target_mib,
+   snmp_notification_mib, snmp_view_based_acm_mib]},
+ {standard_mibs_2, [],
+  [snmpv2_mib_2, snmp_community_mib_2,
+   snmp_framework_mib_2, snmp_target_mib_2,
+   snmp_notification_mib_2, snmp_view_based_acm_mib_2]},
+ {standard_mibs_3, [],
+  [snmpv2_mib_3, snmp_framework_mib_3, snmp_mpd_mib_3,
+   snmp_target_mib_3, snmp_notification_mib_3,
+   snmp_view_based_acm_mib_3, snmp_user_based_sm_mib_3]},
+ {reported_bugs, [],
+  [otp_1128, otp_1129, otp_1131, otp_1162, otp_1222,
+   otp_1298, otp_1331, otp_1338, otp_1342, otp_2776,
+   otp_2979, otp_3187, otp_3725]},
+ {reported_bugs_2, [],
+  [otp_1128_2, otp_1129_2, otp_1131_2, otp_1162_2,
+   otp_1222_2, otp_1298_2, otp_1331_2, otp_1338_2,
+   otp_1342_2, otp_2776_2, otp_2979_2, otp_3187_2]},
+ {reported_bugs_3, [],
+  [otp_1128_3, otp_1129_3, otp_1131_3, otp_1162_3,
+   otp_1222_3, otp_1298_3, otp_1331_3, otp_1338_3,
+   otp_1342_3, otp_2776_3, otp_2979_3, otp_3187_3,
+   otp_3542]},
+ {tickets, [], [{group, otp_4394}]},
+ {otp_4394, [], [otp_4394_test]}].
+
+init_per_group(otp_4394, Config) -> 
+	init_otp_4394(Config);
+init_per_group(v2_inform, Config) -> 
+	init_v2_inform(Config);
+init_per_group(multiple_reqs_2, Config) -> 
+	init_mul(Config);
+init_per_group(multiple_reqs, Config) -> 
+	init_mul(Config);
+init_per_group(test_multi_threaded, Config) -> 
+	init_mt(Config);
+init_per_group(test_v3, Config) -> 
+	init_v3(Config);
+init_per_group(test_v1_v2, Config) -> 
+	init_v1_v2(Config);
+init_per_group(test_v2, Config) -> 
+	init_v2(Config);
+init_per_group(test_v1, Config) -> 
+	init_v1(Config);
+init_per_group(mib_storage_varm_mnesia, Config) -> 
+	init_varm_mib_storage_mnesia(Config);
+init_per_group(mib_storage_varm_dets, Config) -> 
+	init_varm_mib_storage_dets(Config);
+init_per_group(mib_storage_size_check_mnesia, Config) -> 
+	init_size_check_msm(Config);
+init_per_group(mib_storage_size_check_dets, Config) -> 
+	init_size_check_msd(Config);
+init_per_group(mib_storage_size_check_ets, Config) -> 
+	init_size_check_mse(Config);
+init_per_group(mib_storage_mnesia, Config) -> 
+	init_mib_storage_mnesia(Config);
+init_per_group(mib_storage_dets, Config) -> 
+	init_mib_storage_dets(Config);
+init_per_group(mib_storage_ets, Config) -> 
+	init_mib_storage_ets(Config);
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(otp_4394, Config) -> 
+	finish_otp_4394(Config);
+end_per_group(v2_inform, Config) -> 
+	finish_v2_inform(Config);
+end_per_group(multiple_reqs_2, Config) -> 
+	finish_mul(Config);
+end_per_group(multiple_reqs, Config) -> 
+	finish_mul(Config);
+end_per_group(test_multi_threaded, Config) -> 
+	finish_mt(Config);
+end_per_group(test_v3, Config) -> 
+	finish_v3(Config);
+end_per_group(test_v1_v2, Config) -> 
+	finish_v1_v2(Config);
+end_per_group(test_v2, Config) -> 
+	finish_v2(Config);
+end_per_group(test_v1, Config) -> 
+	finish_v1(Config);
+end_per_group(mib_storage_varm_mnesia, Config) -> 
+	finish_varm_mib_storage_mnesia(Config);
+end_per_group(mib_storage_varm_dets, Config) -> 
+	finish_varm_mib_storage_dets(Config);
+end_per_group(mib_storage_size_check_mnesia, Config) -> 
+	finish_size_check_msm(Config);
+end_per_group(mib_storage_size_check_dets, Config) -> 
+	finish_size_check_msd(Config);
+end_per_group(mib_storage_size_check_ets, Config) -> 
+	finish_size_check_mse(Config);
+end_per_group(mib_storage_mnesia, Config) -> 
+	finish_mib_storage_mnesia(Config);
+end_per_group(mib_storage_dets, Config) -> 
+	finish_mib_storage_dets(Config);
+end_per_group(mib_storage_ets, Config) -> 
+	finish_mib_storage_ets(Config);
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 init_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?t:timetrap(?t:minutes(6)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) when list(Config) ->
+end_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     Config.
 
-cases() ->
-    case ?OSTYPE() of
-	vxworks ->
-	    %% No crypto app, so skip v3 testcases
- 	    [
-	     app_info, 
-	     test_v1, test_v2, test_v1_v2, 
-	     test_multi_threaded, 
- 	     mib_storage, 
-	     tickets];
-	_Else ->
-  	    [
-	     app_info, 
- 	     test_v1, test_v2, test_v1_v2, test_v3, 
-   	     test_multi_threaded, 
-	     mib_storage, 
-	     tickets
-	    ]
-    end.
+cases() -> 
+case ?OSTYPE() of
+  vxworks ->
+      [app_info, {group, test_v1}, {group, test_v2},
+       {group, test_v1_v2}, {group, test_multi_threaded},
+       {group, mib_storage}, {group, tickets}];
+  _Else ->
+      [app_info, {group, test_v1}, {group, test_v2},
+       {group, test_v1_v2}, {group, test_v3},
+       {group, test_multi_threaded}, {group, mib_storage},
+       {group, tickets}]
+end.
 
 
 %%%-----------------------------------------------------------------
@@ -460,144 +586,56 @@ delete_mib_storage_mnesia_tables() ->
 %% <base>, and a second version <base>_2.  There may be several
 %% versions as well, <base>_N.
 %%-----------------------------------------------------------------
-mib_storage(suite) -> [
-		       mib_storage_ets, 
- 		       mib_storage_dets, 
- 		       mib_storage_mnesia,
- 		       mib_storage_size_check_ets,
- 		       mib_storage_size_check_dets,
- 		       mib_storage_size_check_mnesia,
- 		       mib_storage_varm_dets,
- 		       mib_storage_varm_mnesia
-		      ].
-
-mib_storage_ets(suite) -> {req, [], {conf, init_mib_storage_ets, 
-				     mib_storage_ets_cases(), 
-				     finish_mib_storage_ets}}.
-
-mib_storage_dets(suite) -> {req, [], {conf, init_mib_storage_dets, 
-				     mib_storage_dets_cases(), 
-				     finish_mib_storage_dets}}.
-
-mib_storage_mnesia(suite) -> {req, [], {conf, init_mib_storage_mnesia, 
-					mib_storage_mnesia_cases(), 
-					finish_mib_storage_mnesia}}.
-
-mib_storage_size_check_ets(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_mse, 
-	       mse_size_check_cases(), 
-	       finish_size_check_mse}}.
-
-mib_storage_size_check_dets(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_msd, 
-	       msd_size_check_cases(), 
-	       finish_size_check_msd}}.
-
-mib_storage_size_check_mnesia(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_msm, 
-	       msm_size_check_cases(), 
-	       finish_size_check_msm}}.
-
-mib_storage_varm_dets(suite) -> 
-    {req, [], {conf, 
-	       init_varm_mib_storage_dets, 
-	       varm_mib_storage_dets_cases(), 
-	       finish_varm_mib_storage_dets}}.
-
-mib_storage_varm_mnesia(suite) -> 
-    {req, [], {conf, 
-	       init_varm_mib_storage_mnesia, 
-	       varm_mib_storage_mnesia_cases(), 
-	       finish_varm_mib_storage_mnesia}}.
-
-mib_storage_ets_cases() ->
-    [
-     mse_simple, 
-     mse_v1_processing, 
-     mse_big, 
-     mse_big2, 
-     mse_loop_mib, 
-     mse_api, 
-     mse_sa_register, 
-     mse_v1_trap, 
-     mse_sa_error, 
-     mse_next_across_sa, 
-     mse_undo,
-     mse_standard_mib, 
-     mse_community_mib, 
-     mse_framework_mib, 
-     mse_target_mib, 
-     mse_notification_mib, 
-     mse_view_based_acm_mib, 
-     mse_sparse_table,
-     mse_me_of,
-     mse_mib_of].
-
-mib_storage_dets_cases() ->
-    [
-     msd_simple, 
-     msd_v1_processing, 
-     msd_big, 
-     msd_big2, 
-     msd_loop_mib, 
-     msd_api, 
-     msd_sa_register, 
-     msd_v1_trap, 
-     msd_sa_error, 
-     msd_next_across_sa, 
-     msd_undo,
-     msd_standard_mib,
-     msd_community_mib, 
-     msd_framework_mib, 
-     msd_target_mib, 
-     msd_notification_mib, 
-     msd_view_based_acm_mib, 
-     msd_sparse_table,
-     msd_me_of,
-     msd_mib_of
-    ].
-
-mib_storage_mnesia_cases() ->
-    [
-     msm_simple, 
-     msm_v1_processing, 
-     msm_big, 
-     msm_big2, 
-     msm_loop_mib, 
-     msm_api, 
-     msm_sa_register, 
-     msm_v1_trap, 
-     msm_sa_error, 
-     msm_next_across_sa, 
-     msm_undo,
-     msm_standard_mib, 
-     msm_community_mib, 
-     msm_framework_mib, 
-     msm_target_mib, 
-     msm_notification_mib, 
-     msm_view_based_acm_mib, 
-     msm_sparse_table,
-     msm_me_of,
-     msm_mib_of
-    ].
-
-mse_size_check_cases() ->
-    [mse_size_check].
-
-msd_size_check_cases() ->
-    [msd_size_check].
-
-msm_size_check_cases() ->
-    [msm_size_check].
-
-varm_mib_storage_dets_cases() ->
-    [msd_varm_mib_start].
-
-varm_mib_storage_mnesia_cases() ->
-    [msm_varm_mib_start].
+
+
+
+
+
+
+
+
+
+mib_storage_ets_cases() -> 
+[mse_simple, mse_v1_processing, mse_big, mse_big2,
+ mse_loop_mib, mse_api, mse_sa_register, mse_v1_trap,
+ mse_sa_error, mse_next_across_sa, mse_undo,
+ mse_standard_mib, mse_community_mib, mse_framework_mib,
+ mse_target_mib, mse_notification_mib,
+ mse_view_based_acm_mib, mse_sparse_table, mse_me_of,
+ mse_mib_of].
+
+mib_storage_dets_cases() -> 
+[msd_simple, msd_v1_processing, msd_big, msd_big2,
+ msd_loop_mib, msd_api, msd_sa_register, msd_v1_trap,
+ msd_sa_error, msd_next_across_sa, msd_undo,
+ msd_standard_mib, msd_community_mib, msd_framework_mib,
+ msd_target_mib, msd_notification_mib,
+ msd_view_based_acm_mib, msd_sparse_table, msd_me_of,
+ msd_mib_of].
+
+mib_storage_mnesia_cases() -> 
+[msm_simple, msm_v1_processing, msm_big, msm_big2,
+ msm_loop_mib, msm_api, msm_sa_register, msm_v1_trap,
+ msm_sa_error, msm_next_across_sa, msm_undo,
+ msm_standard_mib, msm_community_mib, msm_framework_mib,
+ msm_target_mib, msm_notification_mib,
+ msm_view_based_acm_mib, msm_sparse_table, msm_me_of,
+ msm_mib_of].
+
+mse_size_check_cases() -> 
+[mse_size_check].
+
+msd_size_check_cases() -> 
+[msd_size_check].
+
+msm_size_check_cases() -> 
+[msm_size_check].
+
+varm_mib_storage_dets_cases() -> 
+[msd_varm_mib_start].
+
+varm_mib_storage_mnesia_cases() -> 
+[msm_varm_mib_start].
 
 init_mib_storage_ets(Config) when list(Config) ->
     ?LOG("init_mib_storage_ets -> entry", []),
@@ -1099,20 +1137,14 @@ app_dir(App) ->
     end.
 
 
-test_v1(suite) -> {req, [], {conf, init_v1, v1_cases(), finish_v1}}.
 
 %v1_cases() -> [loop_mib];
-v1_cases() ->
-    [simple, 
-     db_notify_client,
-     v1_processing, big, big2, loop_mib, 
-     api, subagent, mnesia, multiple_reqs,
-     sa_register, v1_trap, sa_error, next_across_sa, undo, reported_bugs,
-     standard_mibs, sparse_table, cnt_64, 
-     opaque,
-     % opaque].
-    
-     change_target_addr_config].  
+v1_cases() -> 
+[simple, db_notify_client, v1_processing, big, big2,
+ loop_mib, api, subagent, mnesia, {group, multiple_reqs},
+ sa_register, v1_trap, sa_error, next_across_sa, undo,
+ {group, reported_bugs}, {group, standard_mibs},
+ sparse_table, cnt_64, opaque, change_target_addr_config].  
 
 init_v1(Config) when list(Config) ->
     ?line SaNode = ?config(snmp_sa, Config),
@@ -1129,15 +1161,15 @@ finish_v1(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v2(suite) -> {req, [], {conf, init_v2, v2_cases(), finish_v2}}.
 
 %v2_cases() -> [loop_mib_2];
-v2_cases() ->
-    [simple_2, v2_processing, big_2, big2_2, loop_mib_2,
-     api_2, subagent_2, mnesia_2,
-     multiple_reqs_2, sa_register_2, v2_trap, v2_inform, sa_error_2,
-     next_across_sa_2, undo_2, reported_bugs_2, standard_mibs_2,
-     v2_types, implied, sparse_table_2, cnt_64_2, opaque_2, v2_caps].
+v2_cases() -> 
+[simple_2, v2_processing, big_2, big2_2, loop_mib_2,
+ api_2, subagent_2, mnesia_2, {group, multiple_reqs_2},
+ sa_register_2, v2_trap, {group, v2_inform}, sa_error_2,
+ next_across_sa_2, undo_2, {group, reported_bugs_2},
+ {group, standard_mibs_2}, v2_types, implied,
+ sparse_table_2, cnt_64_2, opaque_2, v2_caps].
 
 init_v2(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1154,10 +1186,9 @@ finish_v2(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v1_v2(suite) -> {req, [], {conf, init_v1_v2, v1_v2_cases(), finish_v1_v2}}.
 
-v1_v2_cases() ->
-    [simple_bi].
+v1_v2_cases() -> 
+[simple_bi].
 
 init_v1_v2(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1174,16 +1205,16 @@ finish_v1_v2(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v3(suite) -> {req, [], {conf, init_v3, v3_cases(), finish_v3}}.
 
 %v3_cases() -> [loop_mib_3];
-v3_cases() ->
-    [simple_3, v3_processing,
-     big_3, big2_3, api_3, subagent_3, mnesia_3, loop_mib_3,
-     multiple_reqs_3, sa_register_3, v3_trap, v3_inform, sa_error_3,
-     next_across_sa_3, undo_3, reported_bugs_3, standard_mibs_3,
-     v3_security,
-     v2_types_3, implied_3, sparse_table_3, cnt_64_3, opaque_3, v2_caps_3].
+v3_cases() -> 
+[simple_3, v3_processing, big_3, big2_3, api_3,
+ subagent_3, mnesia_3, loop_mib_3, multiple_reqs_3,
+ sa_register_3, v3_trap, v3_inform, sa_error_3,
+ next_across_sa_3, undo_3, {group, reported_bugs_3},
+ {group, standard_mibs_3}, {group, v3_security},
+ v2_types_3, implied_3, sparse_table_3, cnt_64_3,
+ opaque_3, v2_caps_3].
 
 init_v3(Config) when list(Config) ->
     %% Make sure crypto works, otherwise start_agent will fail
@@ -1221,10 +1252,9 @@ finish_v3(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_multi_threaded(suite) -> {req, [], {conf, init_mt, mt_cases(), finish_mt}}.
 
-mt_cases() ->
-    [multi_threaded, mt_trap].
+mt_cases() -> 
+[multi_threaded, mt_trap].
 
 init_mt(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1739,21 +1769,19 @@ mnesia_2(X) -> mnesia(X).
 mnesia_3(X) -> mnesia(X).
 
 
-multiple_reqs(suite) ->
-    {req, [], {conf, init_mul, mul_cases(), finish_mul}}.
 
-mul_cases() ->
-    [mul_get, mul_get_err, mul_next, mul_next_err, mul_set_err].
+mul_cases() -> 
+[mul_get, mul_get_err, mul_next, mul_next_err,
+ mul_set_err].
     
-multiple_reqs_2(suite) ->
-    {req, [], {conf, init_mul, mul_cases_2(), finish_mul}}.
 
 multiple_reqs_3(_X) -> 
     {req, [], {conf, init_mul, mul_cases_3(), finish_mul}}.
 
 
-mul_cases_2() ->
-    [mul_get_2, mul_get_err_2, mul_next_2, mul_next_err_2, mul_set_err_2].
+mul_cases_2() -> 
+[mul_get_2, mul_get_err_2, mul_next_2, mul_next_err_2,
+ mul_set_err_2].
     
 
 mul_cases_3() ->
@@ -1939,8 +1967,6 @@ v2_trap(Config) when list(Config) ->
 v3_trap(X) ->
     v2_trap(X).
 
-v2_inform(suite) ->
-    {req, [], {conf, init_v2_inform, [v2_inform_i], finish_v2_inform}}.
 
 v3_inform(_X) ->
     %% v2_inform(X).
@@ -2112,7 +2138,6 @@ v3_processing(Config) when list(Config) ->
 %% accomplished by the first inform sent.  That one will generate a
 %% report, which makes it in sync.  The notification-generating
 %% application times out, and send again.  This time it'll work.
-v3_security(suite) -> [v3_crypto_basic, v3_md5_auth, v3_sha_auth, v3_des_priv].
 
 v3_crypto_basic(suite) -> [];
 v3_crypto_basic(_Config) ->
@@ -3591,22 +3616,8 @@ bad_return() ->
 %%% Note that many of the functions in the standard mib is
 %%% already tested by the normal tests.
 %%%-----------------------------------------------------------------
-standard_mibs(suite) ->
-    [snmp_standard_mib, snmp_community_mib,
-     snmp_framework_mib,
-     snmp_target_mib, snmp_notification_mib,
-     snmp_view_based_acm_mib].
-
-standard_mibs_2(suite) ->
-    [snmpv2_mib_2, snmp_community_mib_2,
-     snmp_framework_mib_2,
-     snmp_target_mib_2, snmp_notification_mib_2,
-     snmp_view_based_acm_mib_2].
-
-standard_mibs_3(suite) ->
-    [snmpv2_mib_3,snmp_framework_mib_3, snmp_mpd_mib_3,
-     snmp_target_mib_3, snmp_notification_mib_3,
-     snmp_view_based_acm_mib_3, snmp_user_based_sm_mib_3].
+
+
 
 %%-----------------------------------------------------------------
 %% For this test, the agent is configured for v1.
@@ -4527,27 +4538,12 @@ loop_it_2(Oid, N) ->
 %%% Testing of reported bugs and other tickets.
 %%%-----------------------------------------------------------------
 
-reported_bugs(suite) ->
-    [otp_1128, otp_1129, otp_1131, otp_1162,
-     otp_1222, otp_1298, otp_1331, otp_1338,
-     otp_1342, otp_2776, otp_2979, otp_3187, otp_3725].
 
-reported_bugs_2(suite) ->
-    [otp_1128_2, otp_1129_2, otp_1131_2, otp_1162_2,
-     otp_1222_2, otp_1298_2, otp_1331_2, otp_1338_2,
-     otp_1342_2, otp_2776_2, otp_2979_2, otp_3187_2].
 
-reported_bugs_3(suite) ->
-    [otp_1128_3, otp_1129_3, otp_1131_3, otp_1162_3,
-     otp_1222_3, otp_1298_3, otp_1331_3, otp_1338_3,
-     otp_1342_3, otp_2776_3, otp_2979_3, otp_3187_3,
-     otp_3542].
 
 
 %% These are (ticket) test cases where the initiation has to be done
 %% individually.
-tickets(suite) ->
-    [otp_4394].
 
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1128
@@ -4971,10 +4967,6 @@ otp_3725_test(MaNode) ->
 %%-----------------------------------------------------------------
 
 
-otp_4394(suite) -> {req, [], {conf, 
-			      init_otp_4394, 
-			      [otp_4394_test], 
-			      finish_otp_4394}}.
 
 init_otp_4394(Config) when list(Config) ->
     ?DBG("init_otp_4394 -> entry with"
diff --git a/lib/snmp/test/snmp_agent_v3_test.erl b/lib/snmp/test/snmp_agent_v3_test.erl
index 823c914136..266be72878 100644
--- a/lib/snmp/test/snmp_agent_v3_test.erl
+++ b/lib/snmp/test/snmp_agent_v3_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -28,7 +28,7 @@
 -define(application, snmp).
 
 -include_lib("kernel/include/file.hrl").
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
@@ -83,39 +83,165 @@
 		   _ -> V3
 	       end).
 
-all(suite) -> {req,
-	       [mnesia, distribution,
-		{local_slave_nodes, 2}, {time, 360}],
-	       [{conf, init_all, cases(), finish_all}]}.
+all() -> 
+[cases()].
+
+groups() -> 
+    [{mib_storage, [],
+  [{group, mib_storage_ets}, {group, mib_storage_dets},
+   {group, mib_storage_mnesia},
+   {group, mib_storage_size_check_ets},
+   {group, mib_storage_size_check_dets},
+   {group, mib_storage_size_check_mnesia},
+   {group, mib_storage_varm_dets},
+   {group, mib_storage_varm_mnesia}]},
+ {mib_storage_ets, [], mib_storage_ets_cases()},
+ {mib_storage_dets, [], mib_storage_dets_cases()},
+ {mib_storage_mnesia, [], mib_storage_mnesia_cases()},
+ {mib_storage_size_check_ets, [],
+  mse_size_check_cases()},
+ {mib_storage_size_check_dets, [],
+  msd_size_check_cases()},
+ {mib_storage_size_check_mnesia, [],
+  msm_size_check_cases()},
+ {mib_storage_varm_dets, [],
+  varm_mib_storage_dets_cases()},
+ {mib_storage_varm_mnesia, [],
+  varm_mib_storage_mnesia_cases()},
+ {test_v1, [], v1_cases()}, {test_v2, [], v2_cases()},
+ {test_v1_v2, [], v1_v2_cases()},
+ {test_v3, [], v3_cases()},
+ {test_multi_threaded, [], mt_cases()},
+ {multiple_reqs, [], mul_cases()},
+ {multiple_reqs_2, [], mul_cases_2()},
+ {v2_inform, [], [v2_inform_i]},
+ {v3_security, [],
+  [v3_crypto_basic, v3_md5_auth, v3_sha_auth,
+   v3_des_priv]},
+ {standard_mibs, [],
+  [snmp_standard_mib, snmp_community_mib,
+   snmp_framework_mib, snmp_target_mib,
+   snmp_notification_mib, snmp_view_based_acm_mib]},
+ {standard_mibs_2, [],
+  [snmpv2_mib_2, snmp_community_mib_2,
+   snmp_framework_mib_2, snmp_target_mib_2,
+   snmp_notification_mib_2, snmp_view_based_acm_mib_2]},
+ {standard_mibs_3, [],
+  [snmpv2_mib_3, snmp_framework_mib_3, snmp_mpd_mib_3,
+   snmp_target_mib_3, snmp_notification_mib_3,
+   snmp_view_based_acm_mib_3, snmp_user_based_sm_mib_3]},
+ {reported_bugs, [],
+  [otp_1128, otp_1129, otp_1131, otp_1162, otp_1222,
+   otp_1298, otp_1331, otp_1338, otp_1342, otp_2776,
+   otp_2979, otp_3187, otp_3725]},
+ {reported_bugs_2, [],
+  [otp_1128_2, otp_1129_2, otp_1131_2, otp_1162_2,
+   otp_1222_2, otp_1298_2, otp_1331_2, otp_1338_2,
+   otp_1342_2, otp_2776_2, otp_2979_2, otp_3187_2]},
+ {reported_bugs_3, [],
+  [otp_1128_3, otp_1129_3, otp_1131_3, otp_1162_3,
+   otp_1222_3, otp_1298_3, otp_1331_3, otp_1338_3,
+   otp_1342_3, otp_2776_3, otp_2979_3, otp_3187_3,
+   otp_3542]},
+ {tickets, [], [{group, otp_4394}]},
+ {otp_4394, [], [otp_4394_test]}].
+
+init_per_group(otp_4394, Config) -> 
+	init_otp_4394(Config);
+init_per_group(v2_inform, Config) -> 
+	init_v2_inform(Config);
+init_per_group(multiple_reqs_2, Config) -> 
+	init_mul(Config);
+init_per_group(multiple_reqs, Config) -> 
+	init_mul(Config);
+init_per_group(test_multi_threaded, Config) -> 
+	init_mt(Config);
+init_per_group(test_v3, Config) -> 
+	init_v3(Config);
+init_per_group(test_v1_v2, Config) -> 
+	init_v1_v2(Config);
+init_per_group(test_v2, Config) -> 
+	init_v2(Config);
+init_per_group(test_v1, Config) -> 
+	init_v1(Config);
+init_per_group(mib_storage_varm_mnesia, Config) -> 
+	init_varm_mib_storage_mnesia(Config);
+init_per_group(mib_storage_varm_dets, Config) -> 
+	init_varm_mib_storage_dets(Config);
+init_per_group(mib_storage_size_check_mnesia, Config) -> 
+	init_size_check_msm(Config);
+init_per_group(mib_storage_size_check_dets, Config) -> 
+	init_size_check_msd(Config);
+init_per_group(mib_storage_size_check_ets, Config) -> 
+	init_size_check_mse(Config);
+init_per_group(mib_storage_mnesia, Config) -> 
+	init_mib_storage_mnesia(Config);
+init_per_group(mib_storage_dets, Config) -> 
+	init_mib_storage_dets(Config);
+init_per_group(mib_storage_ets, Config) -> 
+	init_mib_storage_ets(Config);
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(otp_4394, Config) -> 
+	finish_otp_4394(Config);
+end_per_group(v2_inform, Config) -> 
+	finish_v2_inform(Config);
+end_per_group(multiple_reqs_2, Config) -> 
+	finish_mul(Config);
+end_per_group(multiple_reqs, Config) -> 
+	finish_mul(Config);
+end_per_group(test_multi_threaded, Config) -> 
+	finish_mt(Config);
+end_per_group(test_v3, Config) -> 
+	finish_v3(Config);
+end_per_group(test_v1_v2, Config) -> 
+	finish_v1_v2(Config);
+end_per_group(test_v2, Config) -> 
+	finish_v2(Config);
+end_per_group(test_v1, Config) -> 
+	finish_v1(Config);
+end_per_group(mib_storage_varm_mnesia, Config) -> 
+	finish_varm_mib_storage_mnesia(Config);
+end_per_group(mib_storage_varm_dets, Config) -> 
+	finish_varm_mib_storage_dets(Config);
+end_per_group(mib_storage_size_check_mnesia, Config) -> 
+	finish_size_check_msm(Config);
+end_per_group(mib_storage_size_check_dets, Config) -> 
+	finish_size_check_msd(Config);
+end_per_group(mib_storage_size_check_ets, Config) -> 
+	finish_size_check_mse(Config);
+end_per_group(mib_storage_mnesia, Config) -> 
+	finish_mib_storage_mnesia(Config);
+end_per_group(mib_storage_dets, Config) -> 
+	finish_mib_storage_dets(Config);
+end_per_group(mib_storage_ets, Config) -> 
+	finish_mib_storage_ets(Config);
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 init_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?t:timetrap(?t:minutes(6)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) when list(Config) ->
+end_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     Config.
 
-cases() ->
-    case ?OSTYPE() of
-	vxworks ->
-	    %% No crypto app, so skip v3 testcases
- 	    [
-	     app_info, 
-	     test_v1, test_v2, test_v1_v2, 
-	     test_multi_threaded, 
- 	     mib_storage, 
-	     tickets];
-	_Else ->
-  	    [
-	     app_info, 
- 	     test_v1, test_v2, test_v1_v2, test_v3, 
-   	     test_multi_threaded, 
-	     mib_storage, 
-	     tickets
-	    ]
-    end.
+cases() -> 
+case ?OSTYPE() of
+  vxworks ->
+      [app_info, {group, test_v1}, {group, test_v2},
+       {group, test_v1_v2}, {group, test_multi_threaded},
+       {group, mib_storage}, {group, tickets}];
+  _Else ->
+      [app_info, {group, test_v1}, {group, test_v2},
+       {group, test_v1_v2}, {group, test_v3},
+       {group, test_multi_threaded}, {group, mib_storage},
+       {group, tickets}]
+end.
 
 
 %%%-----------------------------------------------------------------
@@ -460,144 +586,56 @@ delete_mib_storage_mnesia_tables() ->
 %% <base>, and a second version <base>_2.  There may be several
 %% versions as well, <base>_N.
 %%-----------------------------------------------------------------
-mib_storage(suite) -> [
-		       mib_storage_ets, 
- 		       mib_storage_dets, 
- 		       mib_storage_mnesia,
- 		       mib_storage_size_check_ets,
- 		       mib_storage_size_check_dets,
- 		       mib_storage_size_check_mnesia,
- 		       mib_storage_varm_dets,
- 		       mib_storage_varm_mnesia
-		      ].
-
-mib_storage_ets(suite) -> {req, [], {conf, init_mib_storage_ets, 
-				     mib_storage_ets_cases(), 
-				     finish_mib_storage_ets}}.
-
-mib_storage_dets(suite) -> {req, [], {conf, init_mib_storage_dets, 
-				     mib_storage_dets_cases(), 
-				     finish_mib_storage_dets}}.
-
-mib_storage_mnesia(suite) -> {req, [], {conf, init_mib_storage_mnesia, 
-					mib_storage_mnesia_cases(), 
-					finish_mib_storage_mnesia}}.
-
-mib_storage_size_check_ets(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_mse, 
-	       mse_size_check_cases(), 
-	       finish_size_check_mse}}.
-
-mib_storage_size_check_dets(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_msd, 
-	       msd_size_check_cases(), 
-	       finish_size_check_msd}}.
-
-mib_storage_size_check_mnesia(suite) -> 
-    {req, [], {conf, 
-	       init_size_check_msm, 
-	       msm_size_check_cases(), 
-	       finish_size_check_msm}}.
-
-mib_storage_varm_dets(suite) -> 
-    {req, [], {conf, 
-	       init_varm_mib_storage_dets, 
-	       varm_mib_storage_dets_cases(), 
-	       finish_varm_mib_storage_dets}}.
-
-mib_storage_varm_mnesia(suite) -> 
-    {req, [], {conf, 
-	       init_varm_mib_storage_mnesia, 
-	       varm_mib_storage_mnesia_cases(), 
-	       finish_varm_mib_storage_mnesia}}.
-
-mib_storage_ets_cases() ->
-    [
-     mse_simple, 
-     mse_v1_processing, 
-     mse_big, 
-     mse_big2, 
-     mse_loop_mib, 
-     mse_api, 
-     mse_sa_register, 
-     mse_v1_trap, 
-     mse_sa_error, 
-     mse_next_across_sa, 
-     mse_undo,
-     mse_standard_mib, 
-     mse_community_mib, 
-     mse_framework_mib, 
-     mse_target_mib, 
-     mse_notification_mib, 
-     mse_view_based_acm_mib, 
-     mse_sparse_table,
-     mse_me_of,
-     mse_mib_of].
-
-mib_storage_dets_cases() ->
-    [
-     msd_simple, 
-     msd_v1_processing, 
-     msd_big, 
-     msd_big2, 
-     msd_loop_mib, 
-     msd_api, 
-     msd_sa_register, 
-     msd_v1_trap, 
-     msd_sa_error, 
-     msd_next_across_sa, 
-     msd_undo,
-     msd_standard_mib,
-     msd_community_mib, 
-     msd_framework_mib, 
-     msd_target_mib, 
-     msd_notification_mib, 
-     msd_view_based_acm_mib, 
-     msd_sparse_table,
-     msd_me_of,
-     msd_mib_of
-    ].
-
-mib_storage_mnesia_cases() ->
-    [
-     msm_simple, 
-     msm_v1_processing, 
-     msm_big, 
-     msm_big2, 
-     msm_loop_mib, 
-     msm_api, 
-     msm_sa_register, 
-     msm_v1_trap, 
-     msm_sa_error, 
-     msm_next_across_sa, 
-     msm_undo,
-     msm_standard_mib, 
-     msm_community_mib, 
-     msm_framework_mib, 
-     msm_target_mib, 
-     msm_notification_mib, 
-     msm_view_based_acm_mib, 
-     msm_sparse_table,
-     msm_me_of,
-     msm_mib_of
-    ].
-
-mse_size_check_cases() ->
-    [mse_size_check].
-
-msd_size_check_cases() ->
-    [msd_size_check].
-
-msm_size_check_cases() ->
-    [msm_size_check].
-
-varm_mib_storage_dets_cases() ->
-    [msd_varm_mib_start].
-
-varm_mib_storage_mnesia_cases() ->
-    [msm_varm_mib_start].
+
+
+
+
+
+
+
+
+
+mib_storage_ets_cases() -> 
+[mse_simple, mse_v1_processing, mse_big, mse_big2,
+ mse_loop_mib, mse_api, mse_sa_register, mse_v1_trap,
+ mse_sa_error, mse_next_across_sa, mse_undo,
+ mse_standard_mib, mse_community_mib, mse_framework_mib,
+ mse_target_mib, mse_notification_mib,
+ mse_view_based_acm_mib, mse_sparse_table, mse_me_of,
+ mse_mib_of].
+
+mib_storage_dets_cases() -> 
+[msd_simple, msd_v1_processing, msd_big, msd_big2,
+ msd_loop_mib, msd_api, msd_sa_register, msd_v1_trap,
+ msd_sa_error, msd_next_across_sa, msd_undo,
+ msd_standard_mib, msd_community_mib, msd_framework_mib,
+ msd_target_mib, msd_notification_mib,
+ msd_view_based_acm_mib, msd_sparse_table, msd_me_of,
+ msd_mib_of].
+
+mib_storage_mnesia_cases() -> 
+[msm_simple, msm_v1_processing, msm_big, msm_big2,
+ msm_loop_mib, msm_api, msm_sa_register, msm_v1_trap,
+ msm_sa_error, msm_next_across_sa, msm_undo,
+ msm_standard_mib, msm_community_mib, msm_framework_mib,
+ msm_target_mib, msm_notification_mib,
+ msm_view_based_acm_mib, msm_sparse_table, msm_me_of,
+ msm_mib_of].
+
+mse_size_check_cases() -> 
+[mse_size_check].
+
+msd_size_check_cases() -> 
+[msd_size_check].
+
+msm_size_check_cases() -> 
+[msm_size_check].
+
+varm_mib_storage_dets_cases() -> 
+[msd_varm_mib_start].
+
+varm_mib_storage_mnesia_cases() -> 
+[msm_varm_mib_start].
 
 init_mib_storage_ets(Config) when list(Config) ->
     ?LOG("init_mib_storage_ets -> entry", []),
@@ -1099,20 +1137,14 @@ app_dir(App) ->
     end.
 
 
-test_v1(suite) -> {req, [], {conf, init_v1, v1_cases(), finish_v1}}.
 
 %v1_cases() -> [loop_mib];
-v1_cases() ->
-    [simple, 
-     db_notify_client,
-     v1_processing, big, big2, loop_mib, 
-     api, subagent, mnesia, multiple_reqs,
-     sa_register, v1_trap, sa_error, next_across_sa, undo, reported_bugs,
-     standard_mibs, sparse_table, cnt_64, 
-     opaque,
-     % opaque].
-    
-     change_target_addr_config].  
+v1_cases() -> 
+[simple, db_notify_client, v1_processing, big, big2,
+ loop_mib, api, subagent, mnesia, {group, multiple_reqs},
+ sa_register, v1_trap, sa_error, next_across_sa, undo,
+ {group, reported_bugs}, {group, standard_mibs},
+ sparse_table, cnt_64, opaque, change_target_addr_config].  
 
 init_v1(Config) when list(Config) ->
     ?line SaNode = ?config(snmp_sa, Config),
@@ -1129,15 +1161,15 @@ finish_v1(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v2(suite) -> {req, [], {conf, init_v2, v2_cases(), finish_v2}}.
 
 %v2_cases() -> [loop_mib_2];
-v2_cases() ->
-    [simple_2, v2_processing, big_2, big2_2, loop_mib_2,
-     api_2, subagent_2, mnesia_2,
-     multiple_reqs_2, sa_register_2, v2_trap, v2_inform, sa_error_2,
-     next_across_sa_2, undo_2, reported_bugs_2, standard_mibs_2,
-     v2_types, implied, sparse_table_2, cnt_64_2, opaque_2, v2_caps].
+v2_cases() -> 
+[simple_2, v2_processing, big_2, big2_2, loop_mib_2,
+ api_2, subagent_2, mnesia_2, {group, multiple_reqs_2},
+ sa_register_2, v2_trap, {group, v2_inform}, sa_error_2,
+ next_across_sa_2, undo_2, {group, reported_bugs_2},
+ {group, standard_mibs_2}, v2_types, implied,
+ sparse_table_2, cnt_64_2, opaque_2, v2_caps].
 
 init_v2(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1154,10 +1186,9 @@ finish_v2(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v1_v2(suite) -> {req, [], {conf, init_v1_v2, v1_v2_cases(), finish_v1_v2}}.
 
-v1_v2_cases() ->
-    [simple_bi].
+v1_v2_cases() -> 
+[simple_bi].
 
 init_v1_v2(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1174,16 +1205,16 @@ finish_v1_v2(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_v3(suite) -> {req, [], {conf, init_v3, v3_cases(), finish_v3}}.
 
 %v3_cases() -> [loop_mib_3];
-v3_cases() ->
-    [simple_3, v3_processing,
-     big_3, big2_3, api_3, subagent_3, mnesia_3, loop_mib_3,
-     multiple_reqs_3, sa_register_3, v3_trap, v3_inform, sa_error_3,
-     next_across_sa_3, undo_3, reported_bugs_3, standard_mibs_3,
-     v3_security,
-     v2_types_3, implied_3, sparse_table_3, cnt_64_3, opaque_3, v2_caps_3].
+v3_cases() -> 
+[simple_3, v3_processing, big_3, big2_3, api_3,
+ subagent_3, mnesia_3, loop_mib_3, multiple_reqs_3,
+ sa_register_3, v3_trap, v3_inform, sa_error_3,
+ next_across_sa_3, undo_3, {group, reported_bugs_3},
+ {group, standard_mibs_3}, {group, v3_security},
+ v2_types_3, implied_3, sparse_table_3, cnt_64_3,
+ opaque_3, v2_caps_3].
 
 init_v3(Config) when list(Config) ->
     %% Make sure crypto works, otherwise start_agent will fail
@@ -1221,10 +1252,9 @@ finish_v3(Config) when list(Config) ->
     delete_files(C1),
     lists:keydelete(vsn, 1, C1).
 
-test_multi_threaded(suite) -> {req, [], {conf, init_mt, mt_cases(), finish_mt}}.
 
-mt_cases() ->
-    [multi_threaded, mt_trap].
+mt_cases() -> 
+[multi_threaded, mt_trap].
 
 init_mt(Config) when list(Config) ->
     SaNode = ?config(snmp_sa, Config),
@@ -1739,21 +1769,19 @@ mnesia_2(X) -> mnesia(X).
 mnesia_3(X) -> mnesia(X).
 
 
-multiple_reqs(suite) ->
-    {req, [], {conf, init_mul, mul_cases(), finish_mul}}.
 
-mul_cases() ->
-    [mul_get, mul_get_err, mul_next, mul_next_err, mul_set_err].
+mul_cases() -> 
+[mul_get, mul_get_err, mul_next, mul_next_err,
+ mul_set_err].
     
-multiple_reqs_2(suite) ->
-    {req, [], {conf, init_mul, mul_cases_2(), finish_mul}}.
 
 multiple_reqs_3(_X) -> 
     {req, [], {conf, init_mul, mul_cases_3(), finish_mul}}.
 
 
-mul_cases_2() ->
-    [mul_get_2, mul_get_err_2, mul_next_2, mul_next_err_2, mul_set_err_2].
+mul_cases_2() -> 
+[mul_get_2, mul_get_err_2, mul_next_2, mul_next_err_2,
+ mul_set_err_2].
     
 
 mul_cases_3() ->
@@ -1939,8 +1967,6 @@ v2_trap(Config) when list(Config) ->
 v3_trap(X) ->
     v2_trap(X).
 
-v2_inform(suite) ->
-    {req, [], {conf, init_v2_inform, [v2_inform_i], finish_v2_inform}}.
 
 v3_inform(_X) ->
     %% v2_inform(X).
@@ -2112,7 +2138,6 @@ v3_processing(Config) when list(Config) ->
 %% accomplished by the first inform sent.  That one will generate a
 %% report, which makes it in sync.  The notification-generating
 %% application times out, and send again.  This time it'll work.
-v3_security(suite) -> [v3_crypto_basic, v3_md5_auth, v3_sha_auth, v3_des_priv].
 
 v3_crypto_basic(suite) -> [];
 v3_crypto_basic(_Config) ->
@@ -3591,22 +3616,8 @@ bad_return() ->
 %%% Note that many of the functions in the standard mib is
 %%% already tested by the normal tests.
 %%%-----------------------------------------------------------------
-standard_mibs(suite) ->
-    [snmp_standard_mib, snmp_community_mib,
-     snmp_framework_mib,
-     snmp_target_mib, snmp_notification_mib,
-     snmp_view_based_acm_mib].
-
-standard_mibs_2(suite) ->
-    [snmpv2_mib_2, snmp_community_mib_2,
-     snmp_framework_mib_2,
-     snmp_target_mib_2, snmp_notification_mib_2,
-     snmp_view_based_acm_mib_2].
-
-standard_mibs_3(suite) ->
-    [snmpv2_mib_3,snmp_framework_mib_3, snmp_mpd_mib_3,
-     snmp_target_mib_3, snmp_notification_mib_3,
-     snmp_view_based_acm_mib_3, snmp_user_based_sm_mib_3].
+
+
 
 %%-----------------------------------------------------------------
 %% For this test, the agent is configured for v1.
@@ -4527,27 +4538,12 @@ loop_it_2(Oid, N) ->
 %%% Testing of reported bugs and other tickets.
 %%%-----------------------------------------------------------------
 
-reported_bugs(suite) ->
-    [otp_1128, otp_1129, otp_1131, otp_1162,
-     otp_1222, otp_1298, otp_1331, otp_1338,
-     otp_1342, otp_2776, otp_2979, otp_3187, otp_3725].
 
-reported_bugs_2(suite) ->
-    [otp_1128_2, otp_1129_2, otp_1131_2, otp_1162_2,
-     otp_1222_2, otp_1298_2, otp_1331_2, otp_1338_2,
-     otp_1342_2, otp_2776_2, otp_2979_2, otp_3187_2].
 
-reported_bugs_3(suite) ->
-    [otp_1128_3, otp_1129_3, otp_1131_3, otp_1162_3,
-     otp_1222_3, otp_1298_3, otp_1331_3, otp_1338_3,
-     otp_1342_3, otp_2776_3, otp_2979_3, otp_3187_3,
-     otp_3542].
 
 
 %% These are (ticket) test cases where the initiation has to be done
 %% individually.
-tickets(suite) ->
-    [otp_4394].
 
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1128
@@ -4971,10 +4967,6 @@ otp_3725_test(MaNode) ->
 %%-----------------------------------------------------------------
 
 
-otp_4394(suite) -> {req, [], {conf, 
-			      init_otp_4394, 
-			      [otp_4394_test], 
-			      finish_otp_4394}}.
 
 init_otp_4394(Config) when list(Config) ->
     ?DBG("init_otp_4394 -> entry with"
diff --git a/lib/snmp/test/snmp_app_test.erl b/lib/snmp/test/snmp_app_test.erl
index 5c5a5285a0..27a7b4af2e 100644
--- a/lib/snmp/test/snmp_app_test.erl
+++ b/lib/snmp/test/snmp_app_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -23,8 +23,9 @@
 -module(snmp_app_test).
 
 -export([
-	 all/1, init_suite/1, fin_suite/1,
-	 init_per_testcase/2, fin_per_testcase/2, 
+	all/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, 
 
 	 fields/1,
 	 modules/1,
@@ -32,7 +33,7 @@
 	 app_depend/1,
 	 undef_funcs/1,
 
-	 start_and_stop/1,
+	
 	 start_and_stop_empty/1, 
 	 start_and_stop_with_agent/1, 
 	 start_and_stop_with_manager/1,
@@ -44,25 +45,34 @@
 
 
 -include_lib("kernel/include/file.hrl").
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
-    Cases = 
-	[
-	 fields,
-	 modules,
-	 exportall,
-	 app_depend,
-         undef_funcs,
-	 start_and_stop
-	],
-    {conf, init_suite, Cases, fin_suite}.
-
-init_suite(Config) when is_list(Config) ->
+all() -> 
+Cases = [fields, modules, exportall, app_depend,
+	 undef_funcs, {group, start_and_stop}],
+	Cases.
+
+groups() -> 
+    [{start_and_stop, [],
+  [start_and_stop_empty, start_and_stop_with_agent,
+   start_and_stop_with_manager,
+   start_and_stop_with_agent_and_manager,
+   start_epmty_and_then_agent_and_manager_and_stop,
+   start_with_agent_and_then_manager_and_stop,
+   start_with_manager_and_then_agent_and_stop]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+init_per_suite(Config) when is_list(Config) ->
     ?DISPLAY_SUITE_INFO(), 
     PrivDir = ?config(priv_dir, Config),
     TopDir = filename:join(PrivDir, app),
@@ -97,9 +107,9 @@ is_app(App) ->
 	    {error, {invalid_format, Error}}
     end.
 
-fin_suite(suite) -> [];
-fin_suite(doc) -> [];
-fin_suite(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
@@ -112,7 +122,7 @@ init_per_testcase(undef_funcs, Config) ->
 init_per_testcase(_Case, Config) ->
     Config.
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Config.
 
 
@@ -290,6 +300,25 @@ undef_funcs(Config) when is_list(Config) ->
     xref:stop(XRef),
     analyze_undefined_function_calls(Undefs, Mods, []).
 
+valid_undef(crypto = CalledMod) ->
+    case (catch CalledMod:version()) of
+        Version when is_list(Version) ->
+	    %% The called module was crypto and the version 
+	    %% function returns a valid value. 
+	    %% This means that the function is
+	    %% actually undefined...
+	    true;
+	_ ->
+	    %% The called module was crypto but the version 
+	    %% function does *not* return a valid value.
+	    %% This means the crypto was not actually not
+	    %% build, which is an case snmp handles.
+	    false
+    end;
+valid_undef(_) ->
+    true.
+
+    
 analyze_undefined_function_calls([], _, []) ->
     ok;
 analyze_undefined_function_calls([], _, AppUndefs) ->
@@ -302,14 +331,25 @@ analyze_undefined_function_calls([{{Mod, _F, _A}, _C} = AppUndef|Undefs],
             {Calling,Called} = AppUndef,
             {Mod1,Func1,Ar1} = Calling,
             {Mod2,Func2,Ar2} = Called,
-            io:format("undefined function call: "
-                      "~n   ~w:~w/~w calls ~w:~w/~w~n",
-                      [Mod1,Func1,Ar1,Mod2,Func2,Ar2]),
-            analyze_undefined_function_calls(Undefs, AppModules,
-                                             [AppUndef|AppUndefs]);
+	    %% If the called module is crypto, then we will *not*
+	    %% fail if crypto is not built (since crypto is actually 
+	    %% not built for all platforms)
+	    case valid_undef(Mod2) of
+		true ->
+		    io:format("undefined function call: "
+			      "~n   ~w:~w/~w calls ~w:~w/~w~n",
+			      [Mod1,Func1,Ar1,Mod2,Func2,Ar2]),
+		    analyze_undefined_function_calls(
+		      Undefs, AppModules, [AppUndef|AppUndefs]);
+		false ->
+		    io:format("skipping ~p (calling ~w:~w/~w)~n", 
+			      [Mod, Mod2, Func2, Ar2]),
+		    analyze_undefined_function_calls(Undefs, 
+						     AppModules, AppUndefs)
+	    end;
         false ->
-            io:format("dropping ~p~n", [Mod]),
-            analyze_undefined_function_calls(Undefs, AppModules, AppUndefs)
+	    io:format("dropping ~p~n", [Mod]),
+	    analyze_undefined_function_calls(Undefs, AppModules, AppUndefs)
     end.
 
 %% This function is used simply to avoid cut-and-paste errors later...
@@ -319,16 +359,6 @@ undef_funcs_make_name(App, PostFix) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-start_and_stop(suite) ->
-    [
-     start_and_stop_empty, 
-     start_and_stop_with_agent, 
-     start_and_stop_with_manager,
-     start_and_stop_with_agent_and_manager,
-     start_epmty_and_then_agent_and_manager_and_stop,
-     start_with_agent_and_then_manager_and_stop,
-     start_with_manager_and_then_agent_and_stop
-    ].
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/snmp/test/snmp_appup_mgr.erl b/lib/snmp/test/snmp_appup_mgr.erl
index 271d6a2847..6648ce9dbe 100644
--- a/lib/snmp/test/snmp_appup_mgr.erl
+++ b/lib/snmp/test/snmp_appup_mgr.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
diff --git a/lib/snmp/test/snmp_appup_test.erl b/lib/snmp/test/snmp_appup_test.erl
index 18509526cf..99994a2410 100644
--- a/lib/snmp/test/snmp_appup_test.erl
+++ b/lib/snmp/test/snmp_appup_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -23,32 +23,46 @@
 -module(snmp_appup_test).
 
 -export([
-	 all/1, init_suite/1, fin_suite/1,
-	 init_per_testcase/2, fin_per_testcase/2, 
+	 all/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, 
 
 	 appup_file/1
 
 	]).
 
--include("test_server.hrl").
+-compile({no_auto_import, [error/1]}).
+
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) ->
+all() -> 
     Cases = 
 	[
 	 appup_file
 	],
-    {conf, init_suite, Cases, fin_suite}.
+    Cases.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-init_suite(suite) -> [];
-init_suite(doc) -> [];
-init_suite(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     TopDir  = filename:join(PrivDir, appup),
     case file:make_dir(TopDir) of
@@ -76,9 +90,9 @@ file_name(App, Ext) ->
     filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
 
 
-fin_suite(suite) -> [];
-fin_suite(doc) -> [];
-fin_suite(Config) when is_list(Config) ->
+end_per_suite(suite) -> [];
+end_per_suite(doc) -> [];
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
@@ -88,7 +102,7 @@ fin_suite(Config) when is_list(Config) ->
 init_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
 
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index ad77b01362..2e6020ae7a 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2011. 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
@@ -28,7 +28,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -include_lib("snmp/include/snmp_types.hrl").
 
@@ -37,15 +37,17 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-	 all/1, 
-         init_per_testcase/2, fin_per_testcase/2,
+	 all/0, 
+	 groups/0, init_per_group/2, end_per_group/2, 
+         init_per_testcase/2, end_per_testcase/2,
 
 	 description/1,
 	 oid_conflicts/1,
 	 imports/1,
 	 module_identity/1,
+	 agent_capabilities/1,
+	 module_compliance/1, 
 
-	 tickets/1,
 	 otp_6150/1,
 	 otp_8574/1, 
 	 otp_8595/1
@@ -78,9 +80,9 @@ init_per_testcase(_Case, Config) when is_list(Config) ->
     MibDir = join(lists:reverse(["snmp_test_data"|RL])),
     CompDir = join(Dir, "comp_dir/"),
     ?line ok = file:make_dir(CompDir),
-    [{comp_dir, CompDir},{mib_dir, MibDir}|Config].
+    [{comp_dir, CompDir}, {mib_dir, MibDir} | Config].
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     CompDir = ?config(comp_dir, Config),
     ?line ok = ?DEL_DIR(CompDir),
     lists:keydelete(comp_dir, 1, Config).
@@ -90,21 +92,27 @@ fin_per_testcase(_Case, Config) when is_list(Config) ->
 %% Test case definitions
 %%======================================================================
 
-all(suite) ->
+all() -> 
     [
-     description,
-     oid_conflicts,
-     imports,
+     description, 
+     oid_conflicts, 
+     imports, 
      module_identity,
-     tickets
+     agent_capabilities,
+     module_compliance,
+     {group, tickets}
     ].
 
-tickets(suite) ->
-    [
-     otp_6150,
-     otp_8574,
-     otp_8595
-    ].
+groups() -> 
+    [{tickets, [], [otp_6150, otp_8574, otp_8595]}].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 
 
 %%======================================================================
@@ -169,6 +177,88 @@ module_identity(Config) when is_list(Config) ->
     ?SKIP(not_yet_implemented).
 
 
+agent_capabilities(suite) ->
+    [];
+agent_capabilities(Config) when is_list(Config) ->
+    put(tname,agent_capabilities),
+    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,"AC-TEST-MIB.mib"),
+    ?line {ok, MibFile1} = snmpc:compile(AcMib, [options,
+						 version,
+						 {i,         [SnmpMibsDir, OtpMibsMibsDir]}, 
+						 {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]}, 
+						 {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 -> "
+	      "~n   MEDiff: ~p"
+	      "~n   Mib1:   ~p"
+	      "~n   Mib2:   ~p"
+	      "~n", [MEDiff, Mib1, Mib2]),
+    case length(MEDiff) of
+	2 ->
+	    ok;
+	_BadLen ->
+	    exit({unexpected_mes, MEDiff})
+    end,
+    ok.
+
+
+module_compliance(suite) ->
+    [];
+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"),
+    ?line {ok, MibFile1} = snmpc:compile(AcMib, [options,
+						 version,
+						 {i,           [SnmpMibsDir, OtpMibsMibsDir]}, 
+						 {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]}, 
+						 {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 -> "
+	      "~n   MEDiff: ~p"
+	      "~n   Mib1:   ~p"
+	      "~n   Mib2:   ~p"
+	      "~n", [MEDiff, Mib1, Mib2]),
+    case length(MEDiff) of
+	1 ->
+	    ok;
+	_BadLen ->
+	    exit({unexpected_mes, MEDiff})
+    end,
+    ok.
+
+
 otp_6150(suite) ->
     [];
 otp_6150(Config) when is_list(Config) ->
@@ -257,7 +347,7 @@ LAST-UPDATED \"0005290000Z\"
                         Ericsson Utvecklings AB
 Open System
 Box 1505
-SE-125 25 �LVSJ�\"
+SE-125 25 ÄLVSJÖ\"
 
 DESCRIPTION 
 \" Objects for management \"
diff --git a/lib/snmp/test/snmp_conf_test.erl b/lib/snmp/test/snmp_conf_test.erl
index d2f9631947..c4341d8d7e 100644
--- a/lib/snmp/test/snmp_conf_test.erl
+++ b/lib/snmp/test/snmp_conf_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -26,7 +26,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 
 -include_lib("snmp/include/STANDARD-MIB.hrl").
@@ -37,8 +37,8 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-	 all/1, 
-         init_per_testcase/2, fin_per_testcase/2,
+	all/0,groups/0,init_per_group/2,end_per_group/2, 
+         init_per_testcase/2, end_per_testcase/2,
 
 	 check_mandatory/1,
 	 check_integer1/1,
@@ -80,32 +80,28 @@
 init_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
 %%======================================================================
 %% Test case definitions
 %%======================================================================
-all(suite) ->
-    [
-     check_mandatory,
-     check_integer1,
-     check_integer2,
-     check_string1,
-     check_string2,
-     check_atom,
-     check_ip,
-     check_taddress,
-     check_packet_size,
-     check_oid,
-     check_sec_model1,
-     check_sec_model2,
-     check_sec_level,
-     check_timer,
-
-     read,
-     read_files
-    ].
+all() -> 
+[check_mandatory, check_integer1, check_integer2,
+ check_string1, check_string2, check_atom, check_ip,
+ check_taddress, check_packet_size, check_oid,
+ check_sec_model1, check_sec_model2, check_sec_level,
+ check_timer, read, read_files].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 
 %%======================================================================
diff --git a/lib/snmp/test/snmp_log_test.erl b/lib/snmp/test/snmp_log_test.erl
index 91bdc3e849..b692017407 100644
--- a/lib/snmp/test/snmp_log_test.erl
+++ b/lib/snmp/test/snmp_log_test.erl
@@ -29,7 +29,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
@@ -40,19 +40,19 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-         init_per_testcase/2, fin_per_testcase/2,
+         init_per_testcase/2, end_per_testcase/2,
 
-	 all/1, 
+	all/0,groups/0,init_per_group/2,end_per_group/2, 
 	 open_and_close/1,
-	 open_write_and_close/1,
+	
 	 open_write_and_close1/1,
 	 open_write_and_close2/1,
 	 open_write_and_close3/1,
 	 open_write_and_close4/1,
-	 log_to_io/1,
+	
 	 log_to_io1/1,
 	 log_to_io2/1,
-	 log_to_txt/1,
+	
 	 log_to_txt1/1,
   	 log_to_txt2/1,
   	 log_to_txt3/1
@@ -97,7 +97,7 @@ init_per_testcase(Case, Config) when is_list(Config) ->
     Dog = ?WD_START(?MINS(5)),
     [{log_dir, CaseDir}, {watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     %% Leave the dirs created above (enable debugging of the test case(s))
     Dog = ?config(watchdog, Config),
     ?WD_STOP(Dog),
@@ -108,37 +108,30 @@ fin_per_testcase(_Case, Config) when is_list(Config) ->
 %% Test case definitions
 %%======================================================================
 %% ?SKIP(not_yet_implemented).
-all(suite) ->
-    [
-     open_and_close,
-     open_write_and_close,
-     log_to_io,
-     log_to_txt
-    ].
-
-
-open_write_and_close(suite) ->
-    [
-     open_write_and_close1,
-     open_write_and_close2,
-     open_write_and_close3,
-     open_write_and_close4
-    ].
-
-
-log_to_io(suite) ->
-    [
-     log_to_io1,
-     log_to_io2
-    ].
-
-
-log_to_txt(suite) ->
-    [
-     log_to_txt1,
-     log_to_txt2,
-     log_to_txt3
-    ].
+all() -> 
+[open_and_close, {group, open_write_and_close},
+ {group, log_to_io}, {group, log_to_txt}].
+
+groups() -> 
+    [{open_write_and_close, [],
+  [open_write_and_close1, open_write_and_close2,
+   open_write_and_close3, open_write_and_close4]},
+ {log_to_io, [], [log_to_io1, log_to_io2]},
+ {log_to_txt, [],
+  [log_to_txt1, log_to_txt2, log_to_txt3]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+
+
+
+
+
 
 
 %%======================================================================
diff --git a/lib/snmp/test/snmp_manager_config_test.erl b/lib/snmp/test/snmp_manager_config_test.erl
index d5dc1387f7..e38a99d413 100644
--- a/lib/snmp/test/snmp_manager_config_test.erl
+++ b/lib/snmp/test/snmp_manager_config_test.erl
@@ -31,7 +31,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -include_lib("snmp/src/manager/snmpm_usm.hrl").
 
@@ -42,10 +42,10 @@
 %% -compile(export_all).
 
 -export([
-	 all/1, 
-         init_per_testcase/2, fin_per_testcase/2,
+	all/0,groups/0,init_per_group/2,end_per_group/2, 
+         init_per_testcase/2, end_per_testcase/2,
 
-	 start_and_stop/1,
+	
 
 	 simple_start_and_stop/1,
 	 start_without_mandatory_opts1/1,
@@ -58,36 +58,36 @@
 	 start_with_invalid_agents_conf_file1/1,
 	 start_with_invalid_usm_conf_file1/1,
 
-	 normal_op/1,
+	
 
-	 system/1,
+	
 	 simple_system_op/1,
 
-	 users/1,
+	
 	 register_user_using_file/1,
 	 register_user_using_function/1,
 	 register_user_failed_using_function1/1,
 
-	 agents/1,
+	
 	 register_agent_using_file/1,
 	 register_agent_using_function/1,
 	 register_agent_failed_using_function1/1,
 
-	 usm_users/1,
+	
 	 register_usm_user_using_file/1,
 	 register_usm_user_using_function/1,
 	 register_usm_user_failed_using_function1/1,
 	 update_usm_user_info/1, 
 
-	 counter/1,
+	
 	 create_and_increment/1,
 
-	 stats_counter/1,
+	
 	 stats_create_and_increment/1,
 
-	 tickets/1,
+	
 	 otp_7219/1, 
-	 otp_8395/1, 
+	 
 	 otp_8395_1/1, 
 	 otp_8395_2/1, 
 	 otp_8395_3/1, 
@@ -150,8 +150,8 @@ init_per_testcase(Case, Config) when is_list(Config) ->
      {manager_log_dir,  MgrLogDir} | Config].
 
 
-fin_per_testcase(Case, Config) when is_list(Config) ->
-    p("fin_per_testcase -> Case: ~p", [Case]),
+end_per_testcase(Case, Config) when is_list(Config) ->
+    p("end_per_testcase -> Case: ~p", [Case]),
     %% The cleanup is removed due to some really discusting NFS behaviour...
     %% CaseTopDir = ?config(manager_dir, Config),
     %% ?line ok = ?DEL_DIR(CaseTopDir),
@@ -163,33 +163,60 @@ fin_per_testcase(Case, Config) when is_list(Config) ->
 %%======================================================================
 % all(doc) ->
 %     "The top snmp manager config test case";
-all(suite) ->
-    [
-     start_and_stop,
-     normal_op,
-     tickets
-    ].
+all() -> 
+[{group, start_and_stop}, {group, normal_op},
+ {group, tickets}].
+
+groups() -> 
+    [{start_and_stop, [],
+      [simple_start_and_stop, 
+       start_without_mandatory_opts1,
+       start_without_mandatory_opts2,
+       start_with_all_valid_opts, start_with_unknown_opts,
+       start_with_incorrect_opts,
+       start_with_invalid_manager_conf_file1,
+       start_with_invalid_users_conf_file1,
+       start_with_invalid_agents_conf_file1,
+       start_with_invalid_usm_conf_file1]},
+     {normal_op, [],
+      [{group, system}, 
+       {group, agents}, 
+       {group, users},
+       {group, usm_users}, 
+       {group, counter},
+       {group, stats_counter}]},
+     {system, [], [simple_system_op]},
+     {users, [],
+      [register_user_using_file, 
+       register_user_using_function,
+       register_user_failed_using_function1]},
+     {agents, [],
+      [register_agent_using_file,
+       register_agent_using_function,
+       register_agent_failed_using_function1]},
+     {usm_users, [],
+      [register_usm_user_using_file,
+       register_usm_user_using_function,
+       register_usm_user_failed_using_function1,
+       update_usm_user_info]},
+     {counter, [], [create_and_increment]},
+     {stats_counter, [], [stats_create_and_increment]},
+     {tickets, [], [otp_7219, {group, otp_8395}]},
+     {otp_8395, [],
+      [otp_8395_1, otp_8395_2, otp_8395_3, otp_8395_4]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 
 %%======================================================================
 %% Test functions
 %%======================================================================
 
-start_and_stop(doc) ->
-    "A collection of start and stop tests";
-start_and_stop(suite) ->
-    [
-     simple_start_and_stop,
-     start_without_mandatory_opts1,
-     start_without_mandatory_opts2,
-     start_with_all_valid_opts,
-     start_with_unknown_opts,
-     start_with_incorrect_opts,
-     start_with_invalid_manager_conf_file1,
-     start_with_invalid_users_conf_file1,
-     start_with_invalid_agents_conf_file1,
-     start_with_invalid_usm_conf_file1
-    ].
 
 
 %% 
@@ -794,7 +821,10 @@ start_with_invalid_users_conf_file1(Conf) when is_list(Conf) ->
     p("start"),
     process_flag(trap_exit, true),
     ConfDir = ?config(manager_conf_dir, Conf),
-    DbDir = ?config(manager_db_dir, Conf),
+    DbDir   = ?config(manager_db_dir, Conf),
+
+    verify_dir_existing(conf, ConfDir),
+    verify_dir_existing(db,   DbDir),
 
     Opts = [{versions, [v1]}, 
 	    {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}],
@@ -895,7 +925,10 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) ->
     p("start"),
     process_flag(trap_exit, true),
     ConfDir = ?config(manager_conf_dir, Conf),
-    DbDir = ?config(manager_db_dir, Conf),
+    DbDir   = ?config(manager_db_dir, Conf),
+
+    verify_dir_existing(conf, ConfDir),
+    verify_dir_existing(db,   DbDir),
 
     Opts = [{versions, [v1]}, 
 	    {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}],
@@ -1641,29 +1674,12 @@ start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) ->
 %% ---
 %% 
 
-normal_op(doc) ->
-    "A collection of tests for normal operation";
-normal_op(suite) ->
-    [
-     system,
-     agents,
-     users,
-     usm_users,
-     counter,
-     stats_counter
-    ].
 
 
 %% 
 %% ---
 %% 
 
-system(doc) ->
-    "Various system related operations with the snmp manager config";
-system(suite) ->
-    [
-     simple_system_op
-    ].
 
 simple_system_op(suite) -> [];
 simple_system_op(doc) -> 
@@ -1702,14 +1718,6 @@ simple_system_op(Conf) when is_list(Conf) ->
 %% ---
 %% 
 
-users(doc) ->
-    "Various users related operations with the snmp manager config";
-users(suite) ->
-    [
-     register_user_using_file,
-     register_user_using_function,
-     register_user_failed_using_function1
-    ].
 
 
 %% 
@@ -1764,14 +1772,6 @@ register_user_failed_using_function1(Conf) when is_list(Conf) ->
 %% ---
 %% 
 
-agents(doc) ->
-    "Various agents related operations with the snmp manager config";
-agents(suite) ->
-    [
-     register_agent_using_file,
-     register_agent_using_function,
-     register_agent_failed_using_function1
-    ].
 
 
 %% 
@@ -1950,15 +1950,6 @@ register_agent_failed_using_function1(Conf) when is_list(Conf) ->
 %% ---
 %% 
 
-usm_users(doc) ->
-    "Various USM users related operations with the snmp manager config";
-usm_users(suite) ->
-    [
-     register_usm_user_using_file,
-     register_usm_user_using_function,
-     register_usm_user_failed_using_function1,
-     update_usm_user_info
-    ].
 
 
 %% 
@@ -2042,7 +2033,6 @@ register_usm_user_using_file(Conf) when is_list(Conf) ->
     %% --
     p("done"),
     ok.
-%% ?SKIP(not_yet_implemented).
 
 
 %% 
@@ -2208,12 +2198,6 @@ update_usm_user_info(Conf) when is_list(Conf) ->
 %% ---
 %% 
 
-counter(doc) ->
-    "Various counter related operations with the snmp manager config";
-counter(suite) ->
-    [
-     create_and_increment
-    ].
 
 
 %% 
@@ -2258,13 +2242,6 @@ create_and_increment(Conf) when is_list(Conf) ->
 %% ---
 %% 
 
-stats_counter(doc) ->
-    "Various statistic counter related operations with the "
- 	"snmp manager config";
-stats_counter(suite) ->
-    [
-     stats_create_and_increment
-    ].
 
 
 %% 
@@ -2323,11 +2300,6 @@ loop(N, _, F) when (N > 0) andalso is_function(F) ->
 %% Ticket test-cases
 %%======================================================================
 
-tickets(suite) ->
-    [
-     otp_7219, 
-     otp_8395
-    ].
 
 
 otp_7219(suite) ->
@@ -2379,13 +2351,6 @@ otp_7219(Config) when is_list(Config) ->
 
 
 
-otp_8395(suite) ->
-    [
-     otp_8395_1, 
-     otp_8395_2, 
-     otp_8395_3, 
-     otp_8395_4 
-    ].
 
 otp_8395_1(suite) -> [];
 otp_8395_1(doc) ->
@@ -2696,9 +2661,21 @@ write_usm_conf2(Dir, Str) ->
 
 
 write_conf_file(Dir, File, Str) ->
-    ?line {ok, Fd} = file:open(filename:join(Dir, File), write),
-    ?line ok = io:format(Fd, "~s", [Str]),
-    file:close(Fd).
+    case file:open(filename:join(Dir, File), write) of
+	{ok, Fd} ->
+	    ?line ok = io:format(Fd, "~s", [Str]),
+	    file:close(Fd);
+	{error, Reason} ->
+	    Info = 
+		[{dir, Dir, case (catch file:read_file_info(Dir)) of
+				{ok, FI} -> 
+				    FI;
+				_ ->
+				    undefined
+			    end},
+		 {file, File}], 
+	    exit({failed_writing_conf_file, Info, Reason})
+    end.
 
 
 maybe_start_crypto() ->
@@ -2724,6 +2701,17 @@ maybe_stop_crypto() ->
 
 %% ------
 
+verify_dir_existing(DirName, Dir) ->
+    case file:read_file_info(Dir) of
+	{ok, _} ->
+	    ok;
+	{error, Reason} ->
+	    exit({non_existing_dir, DirName, Dir, Reason})
+    end.
+
+
+%% ------
+
 str(X) ->
     lists:flatten(io_lib:format("~w", [X])).
 
diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index 518b8b34de..50836db731 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -31,7 +31,7 @@
 %% Include files
 %%----------------------------------------------------------------------
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -include("snmp_test_data/Test2.hrl").
 
@@ -43,10 +43,10 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-	 all/1, 
-         init_per_testcase/2, fin_per_testcase/2,
+	all/0,groups/0,init_per_group/2,end_per_group/2, 
+         init_per_testcase/2, end_per_testcase/2,
 
-	 start_and_stop_tests/1,
+	
 	 simple_start_and_stop1/1,
 	 simple_start_and_stop2/1,
 	 simple_start_and_monitor_crash1/1,
@@ -54,49 +54,49 @@
 	 notify_started01/1,
 	 notify_started02/1,
 
-	 user_tests/1,
+	
 	 register_user1/1,
 	 
-	 agent_tests/1,
+	
 	 register_agent1/1,
 	 register_agent2/1,
 
-	 misc_tests/1,
+	
 	 info/1,
 	 
-	 request_tests/1, 
+	 
 
-	 get_tests/1,
+	
 	 simple_sync_get1/1, 
 	 simple_sync_get2/1, 
 	 simple_async_get1/1, 
 	 simple_async_get2/1, 
 
-	 get_next_tests/1,
+	
   	 simple_sync_get_next1/1, 
   	 simple_sync_get_next2/1, 
   	 simple_async_get_next1/1, 
   	 simple_async_get_next2/1, 
 
-	 set_tests/1, 
+	 
 	 simple_sync_set1/1, 
 	 simple_sync_set2/1, 
 	 simple_async_set1/1, 
 	 simple_async_set2/1, 
 
-	 bulk_tests/1, 
+	 
   	 simple_sync_get_bulk1/1, 
   	 simple_sync_get_bulk2/1, 
   	 simple_async_get_bulk1/1, 
   	 simple_async_get_bulk2/1, 
 
-	 misc_request_tests/1, 
+	 
   	 misc_async1/1, 
   	 misc_async2/1, 
 
 	 discovery/1,
 
-	 event_tests/1, 
+	 
 	 
 	 trap1/1,
 	 trap2/1,
@@ -109,10 +109,10 @@
 
 	 report/1,
 
-	 tickets/1,
-	 otp8015/1,
+	
+	
 	 otp8015_1/1, 
-	 otp8395/1,
+	
 	 otp8395_1/1
 
 	]).
@@ -289,18 +289,18 @@ init_per_testcase3(Case, Config) ->
 	    Config
     end.
 
-fin_per_testcase(Case, Config) when is_list(Config) ->
+end_per_testcase(Case, Config) when is_list(Config) ->
     ?DBG("fin [~w] Nodes [1]: ~p", [Case, erlang:nodes()]),
     Dog    = ?config(watchdog, Config),
     ?WD_STOP(Dog),
     Conf1  = lists:keydelete(watchdog, 1, Config),
-    Conf2  = fin_per_testcase2(Case, Conf1),
+    Conf2  = end_per_testcase2(Case, Conf1),
     ?DBG("fin [~w] Nodes [2]: ~p", [Case, erlang:nodes()]),
     %%     TopDir = ?config(top_dir, Conf2),
     %%     ?DEL_DIR(TopDir),
     Conf2.
 
-fin_per_testcase2(Case, Config) ->
+end_per_testcase2(Case, Config) ->
     OldApiCases = 
 	[
 	 simple_sync_get1, 
@@ -359,118 +359,64 @@ fin_per_testcase2(Case, Config) ->
 %% Test case definitions
 %%======================================================================
 
-all(suite) ->
-    [
-     start_and_stop_tests,
-     misc_tests,
-     user_tests,
-     agent_tests,
-     request_tests,
-     event_tests, 
-     discovery,
-     tickets
-    ].
-
-start_and_stop_tests(suite) ->
-    [
-     simple_start_and_stop1,
-     simple_start_and_stop2,
-     simple_start_and_monitor_crash1,
-     simple_start_and_monitor_crash2,
-     notify_started01,
-     notify_started02
-    ].
-
-misc_tests(suite) ->
-    [
-     info
-    ].
-
-user_tests(suite) ->
-    [
-     register_user1
-    ].
-
-agent_tests(suite) ->
-    [
-     register_agent1, 
-     register_agent2
-    ].
-
-request_tests(suite) ->
-    [
-     get_tests,
-     get_next_tests,
-     set_tests,
-     bulk_tests,
-     misc_request_tests
-    ].
-
-get_tests(suite) ->
-    [
-     simple_sync_get1,
-     simple_sync_get2,
-     simple_async_get1,
-     simple_async_get2
-    ].
-
-get_next_tests(suite) ->
-    [
-     simple_sync_get_next1,
-     simple_sync_get_next2,
-     simple_async_get_next1,
-     simple_async_get_next2
-    ].
-
-set_tests(suite) ->
-    [
-     simple_sync_set1,
-     simple_sync_set2,
-     simple_async_set1,
-     simple_async_set2
-    ].
-
-bulk_tests(suite) ->
-    [
-     simple_sync_get_bulk1,
-     simple_sync_get_bulk2,
-     simple_async_get_bulk1,
-     simple_async_get_bulk2
-    ].
-
-misc_request_tests(suite) ->
-    [
-     misc_async1,
-     misc_async2
-    ].
-
-event_tests(suite) ->
-    [
-     trap1,
-     trap2,
-     inform1,
-     inform2,
-     inform3,
-     inform4,
-     inform_swarm,
-     report
-    ].
-
-tickets(suite) ->
-    [
-     otp8015,
-     otp8395
-    ].
-
-otp8015(suite) ->
-    [
-     otp8015_1
-    ].
-
-otp8395(suite) ->
-    [
-     otp8395_1
-    ].
+all() -> 
+[{group, start_and_stop_tests}, {group, misc_tests},
+ {group, user_tests}, {group, agent_tests},
+ {group, request_tests}, {group, event_tests}, discovery,
+ {group, tickets}].
+
+groups() -> 
+    [{start_and_stop_tests, [],
+  [simple_start_and_stop1, simple_start_and_stop2,
+   simple_start_and_monitor_crash1,
+   simple_start_and_monitor_crash2, notify_started01,
+   notify_started02]},
+ {misc_tests, [], [info]},
+ {user_tests, [], [register_user1]},
+ {agent_tests, [], [register_agent1, register_agent2]},
+ {request_tests, [],
+  [{group, get_tests}, {group, get_next_tests},
+   {group, set_tests}, {group, bulk_tests},
+   {group, misc_request_tests}]},
+ {get_tests, [],
+  [simple_sync_get1, simple_sync_get2, simple_async_get1,
+   simple_async_get2]},
+ {get_next_tests, [],
+  [simple_sync_get_next1, simple_sync_get_next2,
+   simple_async_get_next1, simple_async_get_next2]},
+ {set_tests, [],
+  [simple_sync_set1, simple_sync_set2, simple_async_set1,
+   simple_async_set2]},
+ {bulk_tests, [],
+  [simple_sync_get_bulk1, simple_sync_get_bulk2,
+   simple_async_get_bulk1, simple_async_get_bulk2]},
+ {misc_request_tests, [], [misc_async1, misc_async2]},
+ {event_tests, [],
+  [trap1, trap2, inform1, inform2, inform3, inform4,
+   inform_swarm, report]},
+ {tickets, [], [{group, otp8015}, {group, otp8395}]},
+ {otp8015, [], [otp8015_1]}, {otp8395, [], [otp8395_1]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 %%======================================================================
@@ -795,6 +741,35 @@ notify_started02(suite) -> [];
 notify_started02(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     put(tname,ns02),
+
+    %% <CONDITIONAL-SKIP>
+    %% The point of this is to catch machines running 
+    %% SLES9 (2.6.5)
+    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;
+			    {2, Min, _} when Min > 6 ->
+				true;
+			    {Maj, _, _} when Maj > 2 ->
+				true;
+			    _ ->
+				false
+			end;
+		    _ ->
+			true
+		end
+	end,
+    Skippable = [{unix, [{linux, LinuxVersionVerify}]}],
+    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
+    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
+    %% </CONDITIONAL-SKIP>
+
     p("starting with Config: ~n~p", [Config]),
 
     ConfDir = ?config(manager_conf_dir, Config),
diff --git a/lib/snmp/test/snmp_manager_user.erl b/lib/snmp/test/snmp_manager_user.erl
index 07b56bde39..b0e192344d 100644
--- a/lib/snmp/test/snmp_manager_user.erl
+++ b/lib/snmp/test/snmp_manager_user.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
diff --git a/lib/snmp/test/snmp_manager_user_old.erl b/lib/snmp/test/snmp_manager_user_old.erl
index b53514d699..edffc80dd4 100755
--- a/lib/snmp/test/snmp_manager_user_old.erl
+++ b/lib/snmp/test/snmp_manager_user_old.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2010. 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
diff --git a/lib/snmp/test/snmp_manager_user_test.erl b/lib/snmp/test/snmp_manager_user_test.erl
index 24ed3b0b73..fefa1ad713 100644
--- a/lib/snmp/test/snmp_manager_user_test.erl
+++ b/lib/snmp/test/snmp_manager_user_test.erl
@@ -1,19 +1,19 @@
 %% 
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2004-2010. 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%
 %% 
 
@@ -26,7 +26,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
  
 
@@ -36,10 +36,10 @@
 %% -compile(export_all).
 
 -export([
-         all/1,
-         init_per_testcase/2, fin_per_testcase/2,
+all/0,groups/0,init_per_group/2,end_per_group/2,
+         init_per_testcase/2, end_per_testcase/2,
+	 
 	 
-	 register_user/1, 
 	 simple_register_and_unregister1/1,
 	 simple_register_and_unregister2/1,
 	 simple_register_and_unregister3/1,
@@ -62,7 +62,7 @@
 	 register_monitor_request_and_crash3/1,
 	 register_monitor_request_and_crash4/1, 
 
-	 tickets/1,
+	
 	 otp7902/1
 
 	]).
@@ -123,8 +123,8 @@ init_per_testcase(Case, Config) when is_list(Config) ->
      {manager_log_dir,  MgrLogDir} | Config].
 
 
-fin_per_testcase(Case, Config) when is_list(Config) ->
-    p("fin_per_testcase -> Case: ~p", [Case]),
+end_per_testcase(Case, Config) when is_list(Config) ->
+    p("end_per_testcase -> Case: ~p", [Case]),
 %     MgrTopDir = ?config(manager_dir, Config),
 %     ?DEL_DIR(MgrTopDir),
     Config.
@@ -134,42 +134,41 @@ fin_per_testcase(Case, Config) when is_list(Config) ->
 %% Test case definitions
 %%======================================================================
 
-all(suite) ->
-    [
-     register_user,
-     tickets
-    ].
-
-register_user(suite) ->
-    [
-     simple_register_and_unregister1,
-     simple_register_and_unregister2,
-     simple_register_and_unregister3,
-     register_and_crash1,
-     register_and_crash2,
-     register_and_crash3,
-     register_request_and_crash1,
-     register_request_and_crash2,
-     register_request_and_crash3,
-     simple_register_monitor_and_unregister1,
-     simple_register_monitor_and_unregister2,
-     simple_register_monitor_and_unregister3,
-     register_monitor_and_crash1,
-     register_monitor_and_crash2,
-     register_monitor_and_crash3,
-     register_monitor_and_crash4,
-     register_monitor_and_crash5,
-     register_monitor_request_and_crash1,
-     register_monitor_request_and_crash2,
-     register_monitor_request_and_crash3,
-     register_monitor_request_and_crash4
-    ].
-
-
-tickets(suite) ->
-    [
-     otp7902
-    ].
+all() -> 
+[{group, register_user}, {group, tickets}].
+
+groups() -> 
+    [{register_user, [],
+  [simple_register_and_unregister1,
+   simple_register_and_unregister2,
+   simple_register_and_unregister3, register_and_crash1,
+   register_and_crash2, register_and_crash3,
+   register_request_and_crash1,
+   register_request_and_crash2,
+   register_request_and_crash3,
+   simple_register_monitor_and_unregister1,
+   simple_register_monitor_and_unregister2,
+   simple_register_monitor_and_unregister3,
+   register_monitor_and_crash1,
+   register_monitor_and_crash2,
+   register_monitor_and_crash3,
+   register_monitor_and_crash4,
+   register_monitor_and_crash5,
+   register_monitor_request_and_crash1,
+   register_monitor_request_and_crash2,
+   register_monitor_request_and_crash3,
+   register_monitor_request_and_crash4]},
+ {tickets, [], [otp7902]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
+
+
 
 
 %%======================================================================
@@ -822,10 +821,39 @@ register_monitor_and_crash3(doc) ->
     "Start a single user process, "
 	"register-monitor one user and register one user, "
 	"crash the single user process.";
-register_monitor_and_crash3(Conf) when is_list(Conf) ->
+register_monitor_and_crash3(Conf) when is_list(Conf) -> 
+    process_flag(trap_exit, true),
     put(tname,rlac3),
+
+    %% <CONDITIONAL-SKIP>
+    %% The point of this is to catch machines running 
+    %% SLES9 (2.6.5)
+    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;
+			    {2, Min, _} when Min > 6 ->
+				true;
+			    {Maj, _, _} when Maj > 2 ->
+				true;
+			    _ ->
+				false
+			end;
+		    _ ->
+			true
+		end
+	end,
+    Skippable = [{unix, [{linux, LinuxVersionVerify}]}],
+    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
+    ?NON_PC_TC_MAYBE_SKIP(Conf, Condition),
+    %% </CONDITIONAL-SKIP>
+
     p("start"),
-    process_flag(trap_exit, true),
 
     ConfDir = ?config(manager_conf_dir, Conf),
     DbDir = ?config(manager_db_dir, Conf),
diff --git a/lib/snmp/test/snmp_manager_user_test_lib.erl b/lib/snmp/test/snmp_manager_user_test_lib.erl
index a49fe93178..bf8fff7c4c 100644
--- a/lib/snmp/test/snmp_manager_user_test_lib.erl
+++ b/lib/snmp/test/snmp_manager_user_test_lib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
diff --git a/lib/snmp/test/snmp_note_store_test.erl b/lib/snmp/test/snmp_note_store_test.erl
index 8686a47468..24ba88f986 100644
--- a/lib/snmp/test/snmp_note_store_test.erl
+++ b/lib/snmp/test/snmp_note_store_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -25,7 +25,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 
 
@@ -33,8 +33,8 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-         init_per_testcase/2, fin_per_testcase/2,
-	 all/1, 
+         init_per_testcase/2, end_per_testcase/2,
+	all/0,groups/0,init_per_group/2,end_per_group/2, 
 	 start_and_stop/1,
 	 notes/1,
 	 info/1,
@@ -63,20 +63,24 @@
 init_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
 %%======================================================================
 %% Test case definitions
 %%======================================================================
-all(suite) ->
-    [
-     start_and_stop,
-     notes,
-     info,
-     garbage_in
-     
-    ].
+all() -> 
+[start_and_stop, notes, info, garbage_in].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 
 %%======================================================================
diff --git a/lib/snmp/test/snmp_pdus_test.erl b/lib/snmp/test/snmp_pdus_test.erl
index 6dc5b779aa..ef510ad62e 100644
--- a/lib/snmp/test/snmp_pdus_test.erl
+++ b/lib/snmp/test/snmp_pdus_test.erl
@@ -25,7 +25,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -include_lib("snmp/include/snmp_types.hrl").
 
@@ -34,11 +34,11 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-	 all/1, 
-	 tickets/1,
+	all/0,groups/0,init_per_group/2,end_per_group/2, 
+	
 	 otp7575/1,
 	 otp8563/1, 
-         init_per_testcase/2, fin_per_testcase/2
+         init_per_testcase/2, end_per_testcase/2
 	]).
 
 
@@ -64,23 +64,26 @@
 init_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     Config.
 
 
 %%======================================================================
 %% Test case definitions
 %%======================================================================
-all(suite) ->
-    [
-     tickets
-    ].
-
-tickets(suite) ->
-    [
-     otp7575,
-     otp8563
-    ].
+all() -> 
+[{group, tickets}].
+
+groups() -> 
+    [{tickets, [], [otp7575, otp8563]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
+
 
 
 
diff --git a/lib/snmp/test/snmp_test_data/AC-TEST-MIB.mib b/lib/snmp/test/snmp_test_data/AC-TEST-MIB.mib
new file mode 100644
index 0000000000..58defbe1cf
--- /dev/null
+++ b/lib/snmp/test/snmp_test_data/AC-TEST-MIB.mib
@@ -0,0 +1,131 @@
+--

+-- AC-TEST-MIB.mib

+-- MIB generated by MG-SOFT Visual MIB Builder Version 5.0  Build 250

+-- Tuesday, November 30, 2010 at 23:03:18

+--

+

+	AC-TEST-MIB DEFINITIONS ::= BEGIN

+ 

+		IMPORTS

+			otpExpr			

+				FROM OTP-REG			

+			OBJECT-GROUP, AGENT-CAPABILITIES			

+				FROM SNMPv2-CONF			

+			Integer32, OBJECT-TYPE, MODULE-IDENTITY, OBJECT-IDENTITY			

+				FROM SNMPv2-SMI;

+	

+	

+		acTestModule MODULE-IDENTITY 

+			LAST-UPDATED "201011302230Z"		-- November 30, 2010 at 22:30 GMT

+			ORGANIZATION 

+				"Ac Test Co."

+			CONTACT-INFO 

+				"[email protected]."

+			DESCRIPTION 

+				"Ac Test module."

+			::= { reg 1 }

+

+		

+	

+--

+-- Node definitions

+--

+	

+		acTest OBJECT-IDENTITY

+			STATUS current

+			DESCRIPTION 

+				"Test area."

+			::= { otpExpr 4321 }

+

+		

+		reg OBJECT-IDENTITY

+			STATUS current

+			DESCRIPTION 

+				"Registrations."

+			::= { acTest 1 }

+

+		

+		mib OBJECT-IDENTITY

+			STATUS current

+			DESCRIPTION 

+				"Objects."

+			::= { acTest 2 }

+

+		

+		someObject OBJECT-TYPE

+			SYNTAX Integer32

+			MAX-ACCESS read-write

+			STATUS current

+			DESCRIPTION

+				"Description."

+			::= { mib 1 }

+

+		

+		oneMore OBJECT-TYPE

+			SYNTAX Integer32

+			MAX-ACCESS read-write

+			STATUS current

+			DESCRIPTION

+				"Description."

+			::= { mib 2 }

+

+		

+		grp OBJECT-IDENTITY

+			STATUS current

+			DESCRIPTION 

+				"Groups

+				."

+			::= { acTest 3 }

+

+		

+		basicGrp OBJECT-GROUP

+			OBJECTS { someObject }

+			STATUS current

+			DESCRIPTION 

+				"Basic set of objects."

+			::= { grp 1 }

+

+		

+		allObjects OBJECT-GROUP

+			OBJECTS { someObject, oneMore }

+			STATUS current

+			DESCRIPTION 

+				"Complete set."

+			::= { grp 2 }

+

+		

+		cap OBJECT-IDENTITY

+			STATUS current

+			DESCRIPTION 

+				"Capabilities."

+			::= { acTest 5 }

+

+

+		basicAgent AGENT-CAPABILITIES

+			PRODUCT-RELEASE 

+				"Product release v1."

+			STATUS current

+			DESCRIPTION 

+				"Basic agent."

+			SUPPORTS AC-TEST-MIB

+				INCLUDES { basicGrp }

+			::= { cap 1 }

+

+		

+		fullAgent AGENT-CAPABILITIES

+			PRODUCT-RELEASE 

+				"Product release v2."

+			STATUS current

+			DESCRIPTION 

+				"Full featured agent."

+			SUPPORTS AC-TEST-MIB

+				INCLUDES { allObjects }

+			::= { cap 2 }

+

+		

+	

+	END

+

+--

+-- AC-TEST-MIB.mib

+--

diff --git a/lib/snmp/test/snmp_test_data/MC-TEST-MIB.mib b/lib/snmp/test/snmp_test_data/MC-TEST-MIB.mib
new file mode 100644
index 0000000000..cadaa6f891
--- /dev/null
+++ b/lib/snmp/test/snmp_test_data/MC-TEST-MIB.mib
@@ -0,0 +1,173 @@
+MC-TEST-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    otpExpr
+        FROM OTP-REG
+    MODULE-IDENTITY, OBJECT-TYPE,
+    mib-2, NOTIFICATION-TYPE, OBJECT-IDENTITY
+        FROM SNMPv2-SMI
+    TDomain, TAddress, DisplayString, TEXTUAL-CONVENTION,
+    AutonomousType, RowPointer, TimeStamp, 
+    RowStatus, StorageType
+        FROM SNMPv2-TC
+    MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
+        FROM SNMPv2-CONF;
+
+mcTestModule MODULE-IDENTITY
+    LAST-UPDATED "9605160000Z"
+    ORGANIZATION "MC Test Co."
+    CONTACT-INFO
+            "[email protected]."
+    DESCRIPTION
+            "MC Test module."
+    ::= { reg 1 }
+
+mcObjects OBJECT IDENTIFIER ::= { mcTestModule 1 }
+
+-- MIB contains one group
+
+mcMisc     OBJECT IDENTIFIER ::= { mcObjects 1 }
+mcGeneral  OBJECT IDENTIFIER ::= { mcObjects 2 }
+
+
+mcTest OBJECT-IDENTITY
+     STATUS current
+     DESCRIPTION
+             "Test area."
+     ::= { otpExpr 4322 }
+
+
+reg OBJECT-IDENTITY
+     STATUS current
+     DESCRIPTION
+             "Registrations."
+     ::= { mcTest 1 }
+
+
+mcTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF McEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "This table contains one row per physical entity.  There is
+            always at least one row for an 'overall' physical entity."
+    ::= { mcMisc 1 }
+
+mcEntry       OBJECT-TYPE
+    SYNTAX      McEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "Table entry..."
+    INDEX   { mcIndex }
+    ::= { mcTable 1 }
+
+McEntry ::= SEQUENCE {
+      mcIndex         INTEGER, 
+      mcName          DisplayString,
+      mcStorageType   StorageType,
+      mcRowStatus     RowStatus
+}
+
+mcIndex    OBJECT-TYPE
+    SYNTAX      INTEGER
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "The index for this entry."
+    ::= { mcEntry 1 }
+
+mcName OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Name of... "
+    ::= { mcEntry 2 }
+
+
+mcStorageType OBJECT-TYPE
+    SYNTAX      StorageType
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+           "The storage type for this conceptual row."
+    DEFVAL { nonVolatile }
+    ::= { mcEntry 3 }
+
+mcRowStatus OBJECT-TYPE
+    SYNTAX      RowStatus
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+           "The status of this conceptual row..."
+       ::= { mcEntry 4 }
+
+
+-- last change time stamp for the whole MIB
+mcTimeStamp OBJECT-TYPE
+    SYNTAX      TimeStamp
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "The sysUpTime value when of the last time *anything* in the 
+	    MIB was changed. "
+    ::= { mcGeneral 1 }
+
+-- Entity MIB Trap Definitions
+mcTraps      OBJECT IDENTIFIER ::= { mcTestModule 2 }
+mcTrapPrefix OBJECT IDENTIFIER ::= { mcTraps 0 }
+
+mcConfigChange NOTIFICATION-TYPE
+    STATUS             current
+    DESCRIPTION
+            "An mcConfigChange trap is sent when the value of
+            entLastChangeTime changes..."
+   ::= { mcTrapPrefix 1 }
+
+-- conformance information
+mcConformance OBJECT IDENTIFIER ::= { mcTestModule 3 }
+
+mcCompliances OBJECT IDENTIFIER ::= { mcConformance 1 }
+mcGroups      OBJECT IDENTIFIER ::= { mcConformance 2 }
+
+-- compliance statements
+
+
+mcCompliance MODULE-COMPLIANCE
+    STATUS  current
+    DESCRIPTION
+            "The compliance statement for SNMP entities which implement
+            the MC Test MIB."
+    MODULE  -- this module
+        MANDATORY-GROUPS { mcGeneralGroup,
+                           mcNotificationsGroup }
+    ::= { mcCompliances 1 }
+
+-- MIB groupings
+
+mcGeneralGroup    OBJECT-GROUP
+    OBJECTS {
+              mcName, 
+              mcStorageType, 
+              mcRowStatus, 
+              mcTimeStamp
+            }
+    STATUS  current
+    DESCRIPTION
+            "The collection of objects which are used to represent
+            general information..."
+    ::= { mcGroups 1 }
+
+mcNotificationsGroup NOTIFICATION-GROUP
+    NOTIFICATIONS { mcConfigChange }
+    STATUS        current
+    DESCRIPTION
+            "The collection of notifications..."
+    ::= { mcGroups 2 }
+
+
+END
+
+
+
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index 2586b66a13..54839d989b 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -1,19 +1,19 @@
 %% 
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2002-2010. 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%
 %% 
 
@@ -172,7 +172,17 @@ os_based_skip(Skippable) when is_list(Skippable) ->
                 {value, {OsFam, OsName}} ->
                     true;
                 {value, {OsFam, OsNames}} when is_list(OsNames) ->
-                    lists:member(OsName, OsNames);
+                    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
+		    end;
                 _ ->
                     false
             end
diff --git a/lib/snmp/test/snmp_test_manager.erl b/lib/snmp/test/snmp_test_manager.erl
index 9d9c52ef8d..4cc6d36acc 100644
--- a/lib/snmp/test/snmp_test_manager.erl
+++ b/lib/snmp/test/snmp_test_manager.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl
index ef1ba0b948..fc6dedd96d 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-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -33,6 +33,8 @@
 %% internal exports
 -export([init_packet/10]).
 
+-compile({no_auto_import, [error/2]}).
+
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
 
diff --git a/lib/snmp/test/snmp_test_server.erl b/lib/snmp/test/snmp_test_server.erl
index d0a5185452..ffbd2126a3 100644
--- a/lib/snmp/test/snmp_test_server.erl
+++ b/lib/snmp/test/snmp_test_server.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -33,7 +33,7 @@
 	 fatal_skip/3,
 
 	 init_per_testcase/2,
-	 fin_per_testcase/2
+	 end_per_testcase/2
 	]).
 
 -include("snmp_test_lib.hrl").
@@ -229,7 +229,7 @@ eval(Mod, Fun, Config) ->
     Eval    = fun() -> do_eval(Self, Mod, Fun, Config2) end,
     Pid     = spawn_link(Eval),
     R       = wait_for_evaluator(Pid, Mod, Fun, Config2, []),
-    Mod:fin_per_testcase(Fun, Config2),
+    Mod:end_per_testcase(Fun, Config2),
     global:unregister_name(?TEST_CASE_SUP),
     process_flag(trap_exit, Flag),
     R.
@@ -361,7 +361,7 @@ init_per_testcase(_Case, Config) ->
     global:register_name(?GLOBAL_LOGGER, group_leader()),
     Config.
 
-fin_per_testcase(_Case, _Config) ->
+end_per_testcase(_Case, _Config) ->
     global:unregister_name(?GLOBAL_LOGGER),
     ok.
 
diff --git a/lib/snmp/test/snmp_test_suite.erl b/lib/snmp/test/snmp_test_suite.erl
index a6e203eba3..77aaa508ad 100644
--- a/lib/snmp/test/snmp_test_suite.erl
+++ b/lib/snmp/test/snmp_test_suite.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -29,7 +29,7 @@ behaviour_info(callbacks) ->
     [
      {all,               1},
      {init_per_testcase, 2},
-     {fin_per_testcase,  2}
+     {end_per_testcase,  2}
     ];
 behaviour_info(_Other) ->
     undefined.
diff --git a/lib/snmp/test/test1.erl b/lib/snmp/test/test1.erl
index b26b03d4ce..23cfaf6aaa 100644
--- a/lib/snmp/test/test1.erl
+++ b/lib/snmp/test/test1.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
diff --git a/lib/snmp/test/test2.erl b/lib/snmp/test/test2.erl
index dc010cfa11..a33208af7b 100644
--- a/lib/snmp/test/test2.erl
+++ b/lib/snmp/test/test2.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
diff --git a/lib/snmp/test/test_config/.gitignore b/lib/snmp/test/test_config/.gitignore
new file mode 100644
index 0000000000..fc2d5dbadf
--- /dev/null
+++ b/lib/snmp/test/test_config/.gitignore
@@ -0,0 +1,19 @@
+# Sys config files (Generated)
+/sys.config
+/sys-agent.config
+/sys-manager.config
+
+# Agent config files (Generated)
+/agent/agent.conf
+/agent/community.conf
+/agent/context.conf
+/agent/notify.conf
+/agent/standard.conf
+/agent/target_addr.conf
+/agent/target_params.conf
+/agent/usm.conf
+/agent/vacm.conf
+
+# Manager config files (Generated)
+/manager/manager.conf
+/manager/usm.conf
diff --git a/lib/snmp/test/test_config/Makefile b/lib/snmp/test/test_config/Makefile
new file mode 100644
index 0000000000..4953de7fe8
--- /dev/null
+++ b/lib/snmp/test/test_config/Makefile
@@ -0,0 +1,199 @@
+#-*-makefile-*-   ; force emacs to enter makefile-mode
+
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 1997-2009. 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%
+
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../../vsn.mk
+
+VSN = $(SNMP_VSN)
+
+
+# ----------------------------------------------------
+# Configured variables
+# ----------------------------------------------------
+
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+include modules.mk
+
+ERL_TARGETS = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+SYS_CONFIG_SRCS     = $(SYS_CONFIG_FILES:%=%.src)
+AGENT_CONFIG_SRCS   = $(AGENT_CONFIG_FILES:%=%.src)
+MANAGER_CONFIG_SRCS = $(MANAGER_CONFIG_FILES:%=%.src)
+
+CONFIG_FILES = \
+	$(SYS_CONFIG_FILES) \
+	$(AGENT_CONFIG_FILES) \
+	$(MANAGER_CONFIG_FILES)
+
+TARGETS = \
+	$(ERL_TARGETS) \
+	$(CONFIG_FILES)
+
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+ifeq ($(TESTROOT),)
+TESTROOT=/tmp
+endif
+RELSYSDIR = $(TESTROOT)
+
+
+# ----------------------------------------------------
+# FLAGS AND VARIABLES
+# ----------------------------------------------------
+
+EBIN = .
+
+ERL_COMPILE_FLAGS += +'{parse_transform,sys_pre_attributes}' \
+                     +'{attribute,insert,app_vsn,$(APP_VSN)}'
+
+ifeq ($(ADDR),)
+ADDR = $(shell erl -noshell -s snmp_test_config ip_address -s init stop)
+endif
+
+ifeq ($(TARGET_NAME_PRE),)
+TARGET_NAME_PRE = $(shell erl -noshell -s snmp_test_config ip_address2 -s init stop)
+endif
+
+ifeq ($(SYS_CONTACT),)
+SYS_CONTACT = [email protected]
+endif
+
+ifeq ($(SYS_LOCATION),)
+SYS_LOCATION = Erlang/OTP
+endif
+
+ifeq ($(SYS_NAME),)
+SYS_NAME = FOO
+endif
+
+ifeq ($(AGENT_ENGINE_ID),)
+AGENT_ENGINE_ID = Agent engine of $(USER)
+endif
+
+ifeq ($(AGENT_USM_ENGINE_ID),)
+AGENT_USM_ENGINE_ID = $(AGENT_ENGINE_ID)
+endif
+
+ifeq ($(MANAGER_ENGINE_ID),)
+MANAGER_ENGINE_ID = Manager engine of $(USER)
+endif
+
+ifeq ($(MANAGER_USM_ENGINE_ID),)
+MANAGER_USM_ENGINE_ID = $(MANAGER_ENGINE_ID)
+endif
+
+
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+tests debug opt: $(TARGETS) 
+
+clean:
+	rm -f $(CONFIG_FILES)
+	rm -f $(ERL_TARGETS)
+	rm -f core
+
+docs:
+
+%.config: %.config.src
+	@echo "$< -> $@"
+	$(PERL) -p -e 's?%DIR%?$(RELSYSDIR)? ' < $< > $@
+
+agent/%.conf: agent/%.conf.src
+	@echo "$< -> $@"
+	sed -e 's?%ADDR%?$(ADDR)? ' \
+            -e 's?%SYS_CONTACT%?$(SYS_CONTACT)? ' \
+            -e 's?%SYS_LOCATION%?$(SYS_LOCATION)? ' \
+            -e 's?%SYS_NAME%?$(SYS_NAME)? ' \
+            -e 's?%TARGET_NAME_PRE%?$(TARGET_NAME_PRE)? ' \
+            -e 's?%ENGINE_ID%?\"$(AGENT_ENGINE_ID)\"? ' \
+            -e 's?%USM_ENGINE_ID%?\"$(AGENT_USM_ENGINE_ID)\"? ' < $< > $@
+
+manager/%.conf: manager/%.conf.src
+	@echo "$< -> $@"
+	sed -e 's?%ADDR%?$(ADDR)? ' \
+            -e 's?%ENGINE_ID%?\"$(MANAGER_ENGINE_ID)\"? ' \
+            -e 's?%USM_ENGINE_ID%?\"$(MANAGER_USM_ENGINE_ID)\"? ' < $< > $@
+
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec:
+
+release_tests_spec: clean opt
+	$(INSTALL_DIR)  $(RELSYSDIR)
+	chmod -f -R u+w $(RELSYSDIR)
+	$(INSTALL_DIR)  $(RELSYSDIR)/agent
+	chmod -f -R u+w $(RELSYSDIR)/agent
+	$(INSTALL_DIR)  $(RELSYSDIR)/agent/conf
+	chmod -f -R u+w $(RELSYSDIR)/agent/conf
+	$(INSTALL_DIR)  $(RELSYSDIR)/agent/db
+	chmod -f -R u+w $(RELSYSDIR)/agent/db
+	$(INSTALL_DIR)  $(RELSYSDIR)/agent/log
+	chmod -f -R u+w $(RELSYSDIR)/agent/log
+	$(INSTALL_DIR)  $(RELSYSDIR)/manager
+	chmod -f -R u+w $(RELSYSDIR)/manager
+	$(INSTALL_DIR)  $(RELSYSDIR)/manager/conf
+	chmod -f -R u+w $(RELSYSDIR)/manager/conf
+	$(INSTALL_DIR)  $(RELSYSDIR)/manager/db
+	chmod -f -R u+w $(RELSYSDIR)/manager/db
+	$(INSTALL_DIR)  $(RELSYSDIR)/manager/log
+	chmod -f -R u+w $(RELSYSDIR)/manager/log
+	$(INSTALL_DATA) $(SYS_CONFIG_FILES)     $(RELSYSDIR)
+	$(INSTALL_DATA) $(AGENT_CONFIG_FILES)   $(RELSYSDIR)/agent/conf
+	$(INSTALL_DATA) $(MANAGER_CONFIG_FILES) $(RELSYSDIR)/manager/conf
+
+release_docs_spec:
+
+
+info:
+	@echo ""
+	@echo "RELSYSDIR            = $(RELSYSDIR)"
+	@echo ""
+	@echo "SYS_CONFIG_SRCS      = $(SYS_CONFIG_SRCS)"
+	@echo "SYS_CONFIG_FILES     = $(SYS_CONFIG_FILES)"
+	@echo ""
+	@echo "AGENT_CONFIG_SRCS    = $(AGENT_CONFIG_SRCS)"
+	@echo "AGENT_CONFIG_FILES   = $(AGENT_CONFIG_FILES)"
+	@echo ""
+	@echo "MANAGER_CONFIG_SRCS  = $(MANAGER_CONFIG_SRCS)"
+	@echo "MANAGER_CONFIG_FILES = $(MANAGER_CONFIG_FILES)"
+	@echo ""
+	@echo "ADDR            = $(ADDR)"
+	@echo "TARGET_NAME_PRE = $(TARGET_NAME_PRE)"
+	@echo ""
+
+
diff --git a/lib/snmp/test/test_config/agent/agent.conf.src b/lib/snmp/test/test_config/agent/agent.conf.src
new file mode 100644
index 0000000000..1fe95cc72d
--- /dev/null
+++ b/lib/snmp/test/test_config/agent/agent.conf.src
@@ -0,0 +1,19 @@
+%% This file defines the Agent local configuration info
+%% The data is inserted into the snmpEngine* variables defined
+%% in SNMP-FRAMEWORK-MIB, and the intAgent* variables defined
+%% in OTP-SNMPEA-MIB.
+%% Each row is a 2-tuple:
+%% {AgentVariable, Value}.
+%% For example
+%% {intAgentUDPPort, 4000}.
+%% The ip address for the agent is sent as id in traps.
+%% {intAgentIpAddress, [127,42,17,5]}.
+%% {snmpEngineID, "agentEngine"}.
+%% {snmpEngineMaxMessageSize, 484}.
+%%
+
+
+{intAgentUDPPort, 4000}.
+{intAgentIpAddress, %ADDR%}.
+{snmpEngineID, %ENGINE_ID%}.
+{snmpEngineMaxMessageSize, 484}.
diff --git a/lib/snmp/test/test_config/agent/community.conf.src b/lib/snmp/test/test_config/agent/community.conf.src
new file mode 100644
index 0000000000..8dccb929c9
--- /dev/null
+++ b/lib/snmp/test/test_config/agent/community.conf.src
@@ -0,0 +1,15 @@
+%% This file defines the community info which maps to VACM parameters.
+%% The data is inserted into the snmpCommunityTable defined
+%% in SNMP-COMMUNITY-MIB.
+%% Each row is a 5-tuple:
+%% {CommunityIndex, CommunityName, SecurityName, ContextName, TransportTag}.
+%% For example
+%% {"1", "public", "initial", "", ""}.
+%% {"2", "secret", "secret_name", "", "tag"}.
+%% {"3", "bridge1", "initial", "bridge1", ""}.
+%%
+
+
+{"public", "public", "initial", "", ""}.
+{"all-rights", "all-rights", "all-rights", "", ""}.
+{"standard trap", "standard trap", "initial", "", ""}.
diff --git a/lib/snmp/test/test_config/agent/context.conf.src b/lib/snmp/test/test_config/agent/context.conf.src
new file mode 100644
index 0000000000..ea8b5a97eb
--- /dev/null
+++ b/lib/snmp/test/test_config/agent/context.conf.src
@@ -0,0 +1,14 @@
+%% This file defines the contexts known to the agent.
+%% The data is inserted into the vacmContextTable defined
+%% in SNMP-VIEW-BASED-ACM-MIB.
+%% Each row is a string:
+%% ContextName.
+%%
+%% The empty string is the default context.
+%% For example
+%% "bridge1".
+%% "bridge2".
+%%
+
+
+"".
diff --git a/lib/snmp/test/test_config/agent/notify.conf.src b/lib/snmp/test/test_config/agent/notify.conf.src
new file mode 100644
index 0000000000..164fd25b95
--- /dev/null
+++ b/lib/snmp/test/test_config/agent/notify.conf.src
@@ -0,0 +1,13 @@
+%% This file defines the notification parameters.
+%% The data is inserted into the snmpNotifyTable defined
+%% in SNMP-NOTIFICATION-MIB.
+%% The Name is used as CommunityString for v1 and v2c.
+%% Each row is a 3-tuple:
+%% {Name, Tag, Type}.
+%% For example
+%% {"standard trap", "std_trap", trap}.
+%% {"standard inform", "std_inform", inform}.
+%%
+
+
+{"stadard_trap", "std_trap", trap}.
diff --git a/lib/snmp/test/test_config/agent/standard.conf.src b/lib/snmp/test/test_config/agent/standard.conf.src
new file mode 100644
index 0000000000..31e04e7695
--- /dev/null
+++ b/lib/snmp/test/test_config/agent/standard.conf.src
@@ -0,0 +1,21 @@
+%% This file defines the STANDARD-MIB info.
+%% Each row is a 2-tuple:
+%% {StandardVariable, Value}.
+%% For example
+%% {sysDescr, "Erlang SNMP agent"}.
+%% {sysObjectID, [1,2,3]}.
+%% {sysContact, "[email protected]"}.
+%% {sysName, "test"}.
+%% {sysLocation, "erlang"}.
+%% {sysServices, 72}.
+%% {snmpEnableAuthenTraps, enabled}.
+%%
+
+
+{sysDescr,              "Erlang SNMP agent"}.
+{sysObjectID,           [1,2,3]}.
+{sysContact,            "%SYS_CONTACT%"}.
+{sysLocation,           "%SYS_LOCATION%"}.
+{sysServices,           72}.
+{snmpEnableAuthenTraps, disabled}.
+{sysName,               "%SYS_NAME%"}.
diff --git a/lib/snmp/test/test_config/agent/target_addr.conf.src b/lib/snmp/test/test_config/agent/target_addr.conf.src
new file mode 100644
index 0000000000..740df74ecf
--- /dev/null
+++ b/lib/snmp/test/test_config/agent/target_addr.conf.src
@@ -0,0 +1,21 @@
+%% This file defines the target address parameters.
+%% The data is inserted into the snmpTargetAddrTable defined
+%% in SNMP-TARGET-MIB, and in the snmpTargetAddrExtTable defined
+%% in SNMP-COMMUNITY-MIB.
+%% Each row is a 10-tuple:
+%% {Name, Ip, Udp, Timeout, RetryCount, TagList, ParamsName, EngineId,
+%%        TMask, MaxMessageSize}.
+%% The EngineId value is only used if Inform-Requests are sent to this
+%% target.  If Informs are not sent, this value is ignored, and can be
+%% e.g. an empty string.  However, if Informs are sent, it is essential
+%% that the value of EngineId matches the value of the target's
+%% actual snmpEngineID.
+%% For example
+%% {"1.2.3.4 v1", [1,2,3,4], 162, 
+%%  1500, 3, "std_inform", "otp_v2", "",
+%%  [127,0,0,0],  2048}.
+%%
+
+
+{"%TARGET_NAME_PRE% v2",   %ADDR%, 5000, 1500, 3, "std_trap",   "target_v2", "", [], 2048}.
+{"%TARGET_NAME_PRE% v2.2", %ADDR%, 5000, 1500, 3, "std_inform", "target_v2", "", [], 2048}.
diff --git a/lib/snmp/test/test_config/agent/target_params.conf.src b/lib/snmp/test/test_config/agent/target_params.conf.src
new file mode 100644
index 0000000000..a4a535baa2
--- /dev/null
+++ b/lib/snmp/test/test_config/agent/target_params.conf.src
@@ -0,0 +1,11 @@
+%% This file defines the target parameters.
+%% The data is inserted into the snmpTargetParamsTable defined
+%% in SNMP-TARGET-MIB.
+%% Each row is a 5-tuple:
+%% {Name, MPModel, SecurityModel, SecurityName, SecurityLevel}.
+%% For example
+%% {"target_v3", v3, usm, "", noAuthNoPriv}.
+%%
+
+
+{"target_v2", v2c, v2c, "initial", noAuthNoPriv}.
diff --git a/lib/snmp/test/test_config/agent/usm.conf.src b/lib/snmp/test/test_config/agent/usm.conf.src
new file mode 100644
index 0000000000..0409084048
--- /dev/null
+++ b/lib/snmp/test/test_config/agent/usm.conf.src
@@ -0,0 +1,17 @@
+%% This file defines the security parameters for the user-based
+%% security model.
+%% The data is inserted into the usmUserTable defined
+%% in SNMP-USER-BASED-SM-MIB.
+%% Each row is a 13-tuple:
+%% {EngineID, UserName, SecName, Clone, AuthP, AuthKeyC, OwnAuthKeyC,
+%%  PrivP, PrivKeyC, OwnPrivKeyC, Public, AuthKey, PrivKey}.
+%% For example
+%% {"agentEngine", "initial", "initial", zeroDotZero,
+%%  usmNoAuthProtocol, "", "", usmNoPrivProtocol, "", "", "",
+%%  "", ""}.
+%%
+
+
+{%USM_ENGINE_ID%, "initial", "initial", zeroDotZero, usmHMACMD5AuthProtocol, "", "", usmNoPrivProtocol, "", "", "", [160,66,33,136,178,59,246,214,102,63,131,131,54,14,221,177], ""}.
+{%USM_ENGINE_ID%, "templateMD5", "templateMD5", zeroDotZero, usmHMACMD5AuthProtocol, "", "", usmNoPrivProtocol, "", "", "", [160,66,33,136,178,59,246,214,102,63,131,131,54,14,221,177], ""}.
+{%USM_ENGINE_ID%, "templateSHA", "templateSHA", zeroDotZero, usmHMACSHAAuthProtocol, "", "", usmNoPrivProtocol, "", "", "", [199,94,239,13,229,135,141,77,124,129,65,189,230,240,115,163,239,15,13,242], ""}.
diff --git a/lib/snmp/test/test_config/agent/vacm.conf.src b/lib/snmp/test/test_config/agent/vacm.conf.src
new file mode 100644
index 0000000000..86271443ad
--- /dev/null
+++ b/lib/snmp/test/test_config/agent/vacm.conf.src
@@ -0,0 +1,27 @@
+%% This file defines the Mib Views.
+%% The data is inserted into the vacm* tables defined
+%% in SNMP-VIEW-BASED-ACM-MIB.
+%% Each row is one of 3 tuples; one for each table in the MIB:
+%% {vacmSecurityToGroup, SecModel, SecName, GroupName}.
+%% {vacmAccess, GroupName, Prefix, SecModel, SecLevel, Match, RV, WV, NV}.
+%% {vacmViewTreeFamily, ViewIndex, ViewSubtree, ViewStatus, ViewMask}.
+%% For example
+%% {vacmSecurityToGroup, v2c, "initial", "initial"}.
+%% {vacmSecurityToGroup, usm, "initial", "initial"}.
+%%  read/notify access to system
+%% {vacmAccess, "initial", "", any, noAuthNoPriv, exact,
+%%              "system", "", "system"}.
+%% {vacmViewTreeFamily, "system", [1,3,6,1,2,1,1], included, null}.
+%% {vacmViewTreeFamily, "exmib", [1,3,6,1,3], included, null}. % for EX1-MIB
+%% {vacmViewTreeFamily, "internet", [1,3,6,1], included, null}.
+%%
+
+
+{vacmSecurityToGroup, v2c, "initial", "initial"}.
+{vacmSecurityToGroup, v2c, "all-rights", "all-rights"}.
+{vacmAccess, "initial", "", any, noAuthNoPriv, exact, "restricted", "", "restricted"}.
+{vacmAccess, "initial", "", usm, authNoPriv, exact, "internet", "internet", "internet"}.
+{vacmAccess, "initial", "", usm, authPriv, exact, "internet", "internet", "internet"}.
+{vacmAccess, "all-rights", "", any, noAuthNoPriv, exact, "internet", "internet", "internet"}.
+{vacmViewTreeFamily, "restricted", [1,3,6,1], included, null}.
+{vacmViewTreeFamily, "internet", [1,3,6,1], included, null}.
diff --git a/lib/snmp/test/test_config/manager/manager.conf.src b/lib/snmp/test/test_config/manager/manager.conf.src
new file mode 100644
index 0000000000..c38a61b13c
--- /dev/null
+++ b/lib/snmp/test/test_config/manager/manager.conf.src
@@ -0,0 +1,16 @@
+%% This file was generated by snmp_config (version-4.9.3) 2007-06-29 13:35:05
+%% This file defines the Manager local configuration info
+%% Each row is a 2-tuple:
+%% {Variable, Value}.
+%% For example
+%% {port,             5000}.
+%% {address,          [127,42,17,5]}.
+%% {engine_id,        "managerEngine"}.
+%% {max_message_size, 484}.
+%%
+
+
+{port, 5000}.
+{address, %ADDR%}.
+{engine_id, %ENGINE_ID%}.
+{max_message_size, 484}.
diff --git a/lib/snmp/test/test_config/manager/usm.conf.src b/lib/snmp/test/test_config/manager/usm.conf.src
new file mode 100644
index 0000000000..a558c86710
--- /dev/null
+++ b/lib/snmp/test/test_config/manager/usm.conf.src
@@ -0,0 +1,9 @@
+%% This file was generated by snmp_config (version-4.9.3) 2007-06-29 13:35:05
+%% This file defines the usm users the manager handles
+%% Each row is a 6 or 7-tuple:
+%% {EngineID, UserName, AuthP, AuthKey, PrivP, PrivKey}
+%% {EngineID, UserName, SecName, AuthP, AuthKey, PrivP, PrivKey}
+%%
+
+{%USM_ENGINE_ID%, "initial", usmNoAuthProtocol, "", usmNoPrivProtocol, ""}.
+
diff --git a/lib/snmp/test/test_config/modules.mk b/lib/snmp/test/test_config/modules.mk
new file mode 100644
index 0000000000..3d084cef01
--- /dev/null
+++ b/lib/snmp/test/test_config/modules.mk
@@ -0,0 +1,41 @@
+#-*-makefile-*-   ; force emacs to enter makefile-mode
+
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2004-2010. 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%
+
+SYS_CONFIG_FILES = \
+	sys.config \
+	sys-agent.config \
+	sys-manager.config
+
+AGENT_CONFIG_FILES = \
+	agent/agent.conf \
+	agent/community.conf \
+	agent/context.conf \
+	agent/notify.conf \
+	agent/standard.conf \
+	agent/target_addr.conf \
+	agent/target_params.conf \
+	agent/usm.conf \
+	agent/vacm.conf
+
+MANAGER_CONFIG_FILES = \
+	manager/manager.conf \
+	manager/usm.conf
+
+MODULES = \
+	snmp_test_config
diff --git a/lib/snmp/test/test_config/snmp_test_config.erl b/lib/snmp/test/test_config/snmp_test_config.erl
new file mode 100644
index 0000000000..550a276c4c
--- /dev/null
+++ b/lib/snmp/test/test_config/snmp_test_config.erl
@@ -0,0 +1,32 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2002-2010. 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(snmp_test_config).
+
+-export([ip_address/0, ip_address2/0]).
+
+ip_address() ->
+    {ok, Hostname} = inet:gethostname(),
+    {ok, Address}  = inet:getaddr(Hostname, inet),
+    io:format("~w", [tuple_to_list(Address)]).
+
+ip_address2() ->
+    {ok, Hostname} = inet:gethostname(),
+    {ok, {A1, A2, A3, A4}}  = inet:getaddr(Hostname, inet),
+    io:format("~w.~w.~w.~w", [A1, A2, A3, A4]).
diff --git a/lib/snmp/test/test_config/sys-agent.config.src b/lib/snmp/test/test_config/sys-agent.config.src
new file mode 100644
index 0000000000..46a458203d
--- /dev/null
+++ b/lib/snmp/test/test_config/sys-agent.config.src
@@ -0,0 +1,43 @@
+%% This is an example sys config file for starting the snmp application
+%% with only a agent running.
+[{snmp, 
+  [
+   {agent,
+    [
+     {priority, normal}, 
+     {versions, [v1,v2,v3]}, 
+     {db_dir, "%DIR%/agent/db"}, 
+     {mib_storage, ets}, 
+%%     {agent_mib_storage, volatile},
+     {agent_mib_storage, persistent},
+     {target_cache, [{verbosity,silence}]}, 
+     {symbolic_store, [{verbosity,silence}]}, 
+     {local_db, [{repair,true},{auto_save,5000},{verbosity,silence}]}, 
+     {error_report_module, snmpa_error_logger}, 
+     {agent_type, master}, 
+     {agent_verbosity, trace}, 
+     {audit_trail_log, [{type, read}, 
+                        {dir, "%DIR%/agent/log"},
+                        {size, {10240,10}}]},
+     {config, [{dir,        "%DIR%/agent/conf"}, 
+               {force_load, true}, 
+               {verbosity,  trace}]}, 
+     {multi_threaded, true}, 
+     {mib_server, [{mibentry_override,  false},
+                   {trapentry_override, false},
+                   {cache,              true},
+                   {verbosity,          trace}]}, 
+     {note_store, [{timeout,30000}, {verbosity,silence}]}, 
+     {supervisor, [{verbosity,silence}]}, 
+     {net_if, [{module,    snmpa_net_if},
+               {verbosity, silence},
+               {options,   [{bind_to,   true},
+                            {no_reuse,  false},
+                            {req_limit, infinity},
+                            {sndbuf,    32000}, 
+                            {recbuf,    32000}]}]}
+    ]
+   }
+  ]
+ }
+].
diff --git a/lib/snmp/test/test_config/sys-manager.config.src b/lib/snmp/test/test_config/sys-manager.config.src
new file mode 100644
index 0000000000..4366263084
--- /dev/null
+++ b/lib/snmp/test/test_config/sys-manager.config.src
@@ -0,0 +1,35 @@
+%% This is an example sys config file for starting the snmp application
+%% with only a manager running.
+[{snmp, 
+  [
+   {manager,
+    [
+     {priority, normal}, 
+     {versions, [v1,v2,v3]}, 
+     {config, [{dir, "%DIR%/manager/conf"}, 
+               {verbosity, trace}, 
+               {db_dir, "%DIR%/manager/db"}, 
+               {repair, true}, 
+               {auto_save, 5000}]}, 
+     {inform_request_behaviour, user}, 
+     {mibs, []}, 
+     {server, [{timeout,   30000},
+               {verbosity, trace}]}, 
+     {note_store, [{timeout,30000},
+                   {verbosity,silence}]}, 
+     {audit_trail_log, [{type, read}, 
+                        {dir, "%DIR%/manager/log"},
+                        {size, {10240,10}}]},
+     {net_if, [{module,snmpm_net_if},
+               {verbosity, trace},
+               {options, [{bind_to,  true}, 
+                          {no_reuse, false},
+%                          {sndbuf,   32000},
+                          {recbuf,   45000}]}]}, 
+     {def_user_mod,  snmpm_user_default}, 
+     {def_user_data, undefined}
+    ]
+   }
+  ]
+ }
+].
diff --git a/lib/snmp/test/test_config/sys.config.src b/lib/snmp/test/test_config/sys.config.src
new file mode 100644
index 0000000000..b2cd399883
--- /dev/null
+++ b/lib/snmp/test/test_config/sys.config.src
@@ -0,0 +1,68 @@
+%% This is an example sys config file for starting the snmp application
+%% with both an agent and a manager running.
+[{snmp, 
+  [
+   {agent,
+    [
+     {priority, normal}, 
+     {versions, [v1,v2,v3]}, 
+     {db_dir, "%DIR%/agent/db"}, 
+     {mib_storage, ets}, 
+     {agent_mib_storage, volatile},
+     {target_cache, [{verbosity,silence}]}, 
+     {symbolic_store, [{verbosity,silence}]}, 
+     {local_db, [{repair,true},{auto_save,5000},{verbosity,silence}]}, 
+     {error_report_module, snmpa_error_logger}, 
+     {agent_type, master}, 
+     {agent_verbosity, silence}, 
+     {audit_trail_log, [{type, read}, 
+                        {dir, "%DIR%/agent/log"},
+                        {size, {10240,10}}]},
+     {config, [{dir,        "%DIR%/agent/conf"}, 
+               {force_load, true}, 
+               {verbosity,  silence}]}, 
+     {multi_threaded, false}, 
+     {mib_server, [{mibentry_override,  false},
+                   {trapentry_override, false},
+                   {verbosity,          silence}]}, 
+     {note_store, [{timeout,30000},{verbosity,silence}]}, 
+     {net_if, [{module,    snmpa_net_if},
+               {verbosity, silence},
+               {options,   [{bind_to,   true},
+                            {no_reuse,  false},
+                            {req_limit, infinity},
+                            {sndbuf,    32000}, 
+                            {recbuf,    32000}]}]}
+    ]
+   }, 
+   {manager,
+    [
+     {priority, normal}, 
+     {versions, [v1,v2,v3]}, 
+     {config, [{dir, "%DIR%/manager/conf"}, 
+               {verbosity, silence}, 
+               {db_dir, "%DIR%/manager/db"}, 
+               {repair, true}, 
+               {auto_save, 5000}]}, 
+     {inform_request_behaviour, auto}, 
+     {mibs, []}, 
+     {server, [{timeout,   30000},
+               {verbosity, silence}]}, 
+     {note_store, [{timeout,   30000},
+                   {verbosity, silence}]}, 
+     {audit_trail_log, [{type, read}, 
+                        {dir, "%DIR%/manager/log"},
+                        {size, {10240,10}}]},
+     {net_if, [{module,snmpm_net_if},
+               {verbosity, silence},
+               {options, [{bind_to,  true}, 
+                          {no_reuse, false},
+                          {recbuf,   33000},
+                          {sndbuf,   34000}]}]},
+     {def_user_mod,  snmpm_user_default}, 
+     {def_user_data, undefined}
+    ]
+   }
+  ]
+ }
+].
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 4ca1fb7901..e70c97dcb8 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2010. All Rights Reserved.
+# Copyright Ericsson AB 1997-2011. 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
@@ -17,41 +17,6 @@
 #
 # %CopyrightEnd%
 
-SNMP_VSN = 4.17
+SNMP_VSN = 4.19
 PRE_VSN  =
 APP_VSN  = "snmp-$(SNMP_VSN)$(PRE_VSN)"
-
-TICKETS = OTP-8478
-
-TICKETS_4_16_2 = \
-	OTP-8563 \
-	OTP-8574 \
-	OTP-8594 \
-	OTP-8595 \
-	OTP-8646 \
-	OTP-8648
-
-TICKETS_4_16_1 = \
-	OTP-8480 \
-	OTP-8481
-
-TICKETS_4_16 = \
-	OTP-8395 \
-	OTP-8433 \
-	OTP-8442
-
-TICKETS_4_15 = \
-	OTP-8229 \
-	OTP-8249
-
-TICKETS_4_14 = \
-	OTP-8223 \
-	OTP-8228 \
-	OTP-8237
-
-TICKETS_4_13_5 = \
-	OTP-8116 \
-	OTP-8120 \
-	OTP-8181 \
-	OTP-8182
-
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 7c8735cf56..af667b1a71 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,7 +29,120 @@
     <file>notes.xml</file>
   </header>
 
- <section><title>Ssh 2.0</title>
+<section><title>Ssh 2.0.4</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>In some cases SSH returned {error, normal} when a channel was terminated
+             unexpectedly. This has now been changed to {error, channel_closed}.</p>
+          <p>
+            *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+            Own Id: OTP-8987 Aux Id: seq11748</p>
+        </item>
+        <item>
+          <p>
+            SSH did not handle the error reason enetunreach
+            when trying to open a IPv6 connection.</p>
+          <p>
+            Own Id: OTP-9031</p>
+        </item>
+      </list>
+    </section>
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+            It is now possible to use SSH to sign and verify binary data.</p>
+          <p>
+            Own Id: OTP-8986</p>
+        </item>
+        <item>
+          <p>
+            SSH now ensures that the .ssh directory exists before trying
+            to access files located in that directory.</p>
+          <p>
+            Own Id: OTP-9010</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+<section><title>Ssh 2.0.3</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            The fix regarding OTP-8849 was not included in the
+            previous version as stated.</p>
+          <p>
+            Own Id: OTP-8918</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+<section><title>Ssh 2.0.2</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            The ssh_system_sup did not catch noproc and shutdown
+            messages.</p>
+          <p>
+            Own Id: OTP-8863</p>
+        </item>
+        <item>
+          <p>
+            In some cases a crash report was generated when a
+            connection was closing down. This was caused by a race
+            condition between two processes.</p>
+          <p>
+            Own Id: OTP-8881 Aux Id: seq11656, seq11648 </p>
+        </item>
+      </list>
+    </section>
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+            SSH no longer use deprecated public_key functions.</p>
+          <p>
+            Own Id: OTP-8849</p>
+        </item>
+      </list>
+    </section>
+ </section>
+ <section><title>Ssh 2.0.1</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    SSH in some cases terminated channels with reason normal
+	    when it should have been shutdown.</p>
+          <p>
+	    Own Id: OTP-8714</p>
+        </item>
+        <item>
+          <p>
+	    SSH in some cases generated a crash report when a channel
+	    was closed in a normal way.</p>
+          <p>
+	    Own Id: OTP-8735 Aux Id: seq11615 </p>
+        </item>
+        <item>
+          <p>
+	    The processes ssh_subsystem_sup and one ssh_channel_sup
+	    was not terminated when a connection was closed.</p>
+          <p>
+	    Own Id: OTP-8807</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 2.0</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 71e6b2cd3d..2c5096a25f 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -283,6 +283,22 @@
     </func>
 
     <func>
+      <name>sign_data(Data, Algorithm) -> Signature | {error, Reason}</name>
+      <fsummary> </fsummary>
+      <type>
+        <v> Data = binary()</v>
+	<v> Algorithm = "ssh-rsa"</v>
+	<v> Signature = binary()</v>
+	<v> Reason = term()</v>
+      </type>
+      <desc>
+        <p>Signs the supplied binary using the SSH key.
+	</p>
+      </desc>
+    </func>
+
+
+    <func>
       <name>start() -> </name>
       <name>start(Type) -> ok | {error, Reason}</name>
       <fsummary>Starts the Ssh application. </fsummary>
@@ -339,6 +355,22 @@
 	by the listener up and running.</p>
       </desc>
     </func>
+
+    <func>
+      <name>verify_data(Data, Signature, Algorithm) -> ok | {error, Reason}</name>
+      <fsummary> </fsummary>
+      <type>
+        <v> Data = binary()</v>
+	<v> Algorithm = "ssh-rsa"</v>
+	<v> Signature = binary()</v>
+	<v> Reason = term()</v>
+      </type>
+      <desc>
+        <p>Verifies the supplied binary against the binary signature.
+	</p>
+      </desc>
+    </func>
+
   </funcs>
   
 </erlref>
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 21f7508555..501da8ceb9 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -19,9 +19,35 @@
 
 {"%VSN%",	
  [
+  {"2.0.3", [{load_module, ssh_file, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_rsa, soft_purge, soft_purge, []},
+             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
+             {load_module, ssh_transport, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+  {"2.0.2", [{load_module, ssh_file, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_rsa, soft_purge, soft_purge, []},
+             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
+             {load_module, ssh_transport, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+  {"2.0.1", [{restart_application, ssh}]}
  ],
  [
- ] 
+  {"2.0.3", [{load_module, ssh_file, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_rsa, soft_purge, soft_purge, []},
+             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
+             {load_module, ssh_transport, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+  {"2.0.2", [{load_module, ssh_file, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_rsa, soft_purge, soft_purge, []},
+             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
+             {load_module, ssh_transport, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+  {"2.0.1", [{restart_application, ssh}]}
+ ]
 }.
 
 
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 994c77436a..cada109df0 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -30,6 +30,8 @@
 	 stop_listener/1, stop_listener/2, stop_daemon/1, stop_daemon/2,
 	 shell/1, shell/2, shell/3]).
 
+-export([sign_data/2, verify_data/3]).
+
 %%--------------------------------------------------------------------
 %% Function: start([, Type]) -> ok
 %%
@@ -94,11 +96,17 @@ connect(Host, Port, Options, Timeout) ->
 		    do_demonitor(MRef, Manager),
 		    {error, Other};
 		{'DOWN', MRef, _, Manager, Reason} when is_pid(Manager) ->
+		    error_logger:warning_report([{ssh, connect},
+						 {diagnose,
+						  "Connection was closed before properly set up."},
+						 {host, Host},
+						 {port, Port},
+						 {reason, Reason}]),
 		    receive %% Clear EXIT message from queue
 			{'EXIT', Manager, _What} -> 
-			    {error, Reason}
+			    {error, channel_closed}
 		    after 0 ->
-			    {error, Reason}
+			    {error, channel_closed}
 		    end
 	    after Timeout  ->
 		    do_demonitor(MRef, Manager),
@@ -239,6 +247,43 @@ shell(Host, Port, Options) ->
 	    Error
     end.
 
+
+%%--------------------------------------------------------------------
+%% Function: sign_data(Data, Algorithm) -> binary() | 
+%%                                         {error, Reason}
+%%
+%%   Data = binary()
+%%   Algorithm = "ssh-rsa"
+%%
+%% Description: Use SSH key to sign data.
+%%--------------------------------------------------------------------
+sign_data(Data, Algorithm) when is_binary(Data) ->
+    case ssh_file:private_identity_key(Algorithm,[]) of
+	{ok, Key} when Algorithm == "ssh-rsa" ->
+	    ssh_rsa:sign(Key, Data);
+	Error ->
+	    Error
+    end.
+
+%%--------------------------------------------------------------------
+%% Function: verify_data(Data, Signature, Algorithm) -> ok | 
+%%                                                      {error, Reason}
+%%
+%%   Data = binary()
+%%   Signature = binary()
+%%   Algorithm = "ssh-rsa"
+%%
+%% Description: Use SSH signature to verify data.
+%%--------------------------------------------------------------------
+verify_data(Data, Signature, Algorithm) when is_binary(Data), is_binary(Signature) ->
+    case ssh_file:public_identity_key(Algorithm, []) of
+	{ok, Key} when Algorithm == "ssh-rsa" ->
+	    ssh_rsa:verify(Key, Data, Signature);
+	Error ->
+	    Error
+    end.
+
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl
index 9060626ab3..59fbd24cf5 100644
--- a/lib/ssh/src/ssh_acceptor.erl
+++ b/lib/ssh/src/ssh_acceptor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -55,6 +55,10 @@ acceptor_init(Parent, Port, Address, SockOpts, Opts, AcceptTimeout) ->
    
 do_socket_listen(Callback, Port, Opts) ->
     case Callback:listen(Port, Opts) of
+	{error, nxdomain} ->
+	    Callback:listen(Port, lists:delete(inet6, Opts));
+	{error, enetunreach} ->
+	    Callback:listen(Port, lists:delete(inet6, Opts));
 	{error, eafnosupport} ->
 	    Callback:listen(Port, lists:delete(inet6, Opts));
 	Other ->
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl
index 8a49a44a6c..dcb2d69290 100644
--- a/lib/ssh/src/ssh_channel.erl
+++ b/lib/ssh/src/ssh_channel.erl
@@ -238,9 +238,19 @@ handle_info(Msg, #state{cm = ConnectionManager, channel_cb = Module,
 	    {noreply, State#state{channel_state = ChannelState}};
 	{ok, ChannelState, Timeout} ->
 	    {noreply, State#state{channel_state = ChannelState}, Timeout};
+	{stop, Reason, ChannelState} when is_atom(Reason)->
+	    {stop, Reason, State#state{close_sent = true,
+				       channel_state = ChannelState}};
 	{stop, ChannelId, ChannelState} ->
-	    ssh_connection:close(ConnectionManager, ChannelId),
-	    {stop, normal, State#state{close_sent = true,
+	    Reason =
+		case Msg of
+		    {'EXIT', _Pid, shutdown} ->
+			shutdown;
+		    _ ->
+			normal
+		end,
+	    (catch ssh_connection:close(ConnectionManager, ChannelId)),
+	    {stop, Reason, State#state{close_sent = true,
 				       channel_state = ChannelState}}
     end.
 
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index e3b6ffa125..cb78acb84c 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -415,14 +415,12 @@ start_shell(ConnectionManager, State) ->
     Shell = State#state.shell,
     ShellFun = case is_function(Shell) of
 		   true ->
+		       {ok, User} = 
+			   ssh_userreg:lookup_user(ConnectionManager),
 		       case erlang:fun_info(Shell, arity) of
 			   {arity, 1} ->
-			       {ok, User} = 
-				   ssh_userreg:lookup_user(ConnectionManager),
 			       fun() -> Shell(User) end;
 			   {arity, 2} ->
-			       {ok, User} = 
-				   ssh_userreg:lookup_user(ConnectionManager),
 			       {ok, PeerAddr} = 
 				   ssh_connection_manager:peer_addr(ConnectionManager),
 			       fun() -> Shell(User, PeerAddr) end;
@@ -437,10 +435,28 @@ start_shell(ConnectionManager, State) ->
     State#state{group = Group, buf = empty_buf()}.
 
 start_shell(_ConnectionManager, Cmd, #state{exec={M, F, A}} = State) ->
-    Group = group:start(self(), {M, F, A++[Cmd]}, [{echo,false}]),
+    Group = group:start(self(), {M, F, A++[Cmd]}, [{echo, false}]),
+    State#state{group = Group, buf = empty_buf()};
+start_shell(ConnectionManager, Cmd, #state{exec=Shell} = State) when is_function(Shell) ->
+    {ok, User} = 
+	ssh_userreg:lookup_user(ConnectionManager),
+    ShellFun = 
+	case erlang:fun_info(Shell, arity) of
+	    {arity, 1} ->
+		fun() -> Shell(Cmd) end;
+	    {arity, 2} ->
+		fun() -> Shell(Cmd, User) end;
+	    {arity, 3} ->
+		{ok, PeerAddr} = 
+		    ssh_connection_manager:peer_addr(ConnectionManager),
+		fun() -> Shell(Cmd, User, PeerAddr) end;
+	    _ ->
+		Shell
+	end,
+    Echo = get_echo(State#state.pty),
+    Group = group:start(self(), ShellFun, [{echo,Echo}]),
     State#state{group = Group, buf = empty_buf()}.
 
-
 % Pty can be undefined if the client never sets any pty options before
 % starting the shell.
 get_echo(undefined) ->
diff --git a/lib/ssh/src/ssh_connection_controler.erl b/lib/ssh/src/ssh_connection_controler.erl
index 636ecba532..ca3e62dc83 100644
--- a/lib/ssh/src/ssh_connection_controler.erl
+++ b/lib/ssh/src/ssh_connection_controler.erl
@@ -126,8 +126,8 @@ handle_cast(_, State) ->
 %% handle_info(ssh_connected, State) ->
 %%     {stop, normal, State};
 %% Servant termination.
-handle_info({'EXIT', _Pid, normal}, State) ->
-    {stop, normal, State}.
+handle_info({'EXIT', _Pid, Reason}, State) ->
+    {stop, Reason, State}.
 
 %%-----------------------------------------------------------------
 %% Func: code_change/3
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index d46002c494..0ba11b0a26 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -705,11 +705,19 @@ generate_event(<<?BYTE(Byte), _/binary>> = Msg, StateName,
 	Byte == ?SSH_MSG_CHANNEL_REQUEST;
 	Byte == ?SSH_MSG_CHANNEL_SUCCESS;
 	Byte == ?SSH_MSG_CHANNEL_FAILURE ->
-    ssh_connection_manager:event(Pid, Msg),
-    State = generate_event_new_state(State0, EncData),
-    next_packet(State),
-    {next_state, StateName, State};
 
+    try 
+	ssh_connection_manager:event(Pid, Msg),
+	State = generate_event_new_state(State0, EncData),
+	next_packet(State),
+	{next_state, StateName, State}
+    catch
+	exit:{noproc, _Reason} ->
+	    Report = io_lib:format("~p Connection Handler terminated: ~p~n",
+				   [self(), Pid]),
+	    error_logger:info_report(Report),
+	    {stop, normal, State0}
+    end;
 generate_event(Msg, StateName, State0, EncData) ->
     Event = ssh_bits:decode(Msg),
     State = generate_event_new_state(State0, EncData),
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index cffeade485..9bfd5270da 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2008-2010. 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%
 %%
 %%
@@ -146,6 +146,8 @@ adjust_window(ConnectionManager, Channel, Bytes) ->
 close(ConnectionManager, ChannelId) ->
     try   call(ConnectionManager, {close, ChannelId}) of
 	  ok ->
+	    ok;
+	  {error, channel_closed} ->
 	    ok
     catch
 	exit:{noproc, _} ->
@@ -155,6 +157,8 @@ close(ConnectionManager, ChannelId) ->
 stop(ConnectionManager) ->
     try call(ConnectionManager, stop) of
 	ok ->
+	    ok;
+	{error, channel_closed} ->
 	    ok
     catch
 	exit:{noproc, _} ->
@@ -556,13 +560,18 @@ handle_info({'EXIT', _, _}, State) ->
 %% The return value is ignored.
 %%--------------------------------------------------------------------
 terminate(Reason, #state{connection_state =  
-			 #connection{requests = Requests},
+			 #connection{requests = Requests,
+			            sub_system_supervisor = SubSysSup},
 			 opts = Opts}) ->
     SSHOpts = proplists:get_value(ssh_opts, Opts),
     disconnect_fun(Reason, SSHOpts),
     (catch lists:foreach(fun({_, From}) -> 
 				 gen_server:reply(From, {error, connection_closed})
 			 end, Requests)),
+    Address =  proplists:get_value(address, Opts),
+    Port = proplists:get_value(port, Opts),
+    SystemSup = ssh_system_sup:system_supervisor(Address, Port),
+    ssh_system_sup:stop_subsystem(SystemSup, SubSysSup),
     ok.
 
 %%--------------------------------------------------------------------
@@ -593,7 +602,9 @@ call(Pid, Msg, Timeout) ->
 	    Result
     catch
 	exit:{timeout, _} ->
-	    {error, timeout}
+	    {error, timeout};
+	exit:{normal, _} ->
+	    {error, channel_closed}
     end.
 
 cast(Pid, Msg) ->
diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl
index 5572349fe7..ff23f714cd 100755
--- a/lib/ssh/src/ssh_file.erl
+++ b/lib/ssh/src/ssh_file.erl
@@ -27,14 +27,16 @@
 -include("PKCS-1.hrl").
 -include("DSS.hrl").
 
+-include_lib("kernel/include/file.hrl").
+
 -export([public_host_dsa_key/2,private_host_dsa_key/2,
 	 public_host_rsa_key/2,private_host_rsa_key/2,
 	 public_host_key/2,private_host_key/2,
 	 lookup_host_key/3, add_host_key/3, % del_host_key/2,
 	 lookup_user_key/3, ssh_dir/2, file_name/3]).
 
--export([private_identity_key/2]).
-%% , public_identity_key/2,
+-export([private_identity_key/2, 
+	 public_identity_key/2]).
 %% 	 identity_keys/2]).
 
 -export([encode_public_key/1, decode_public_key_v2/2]).
@@ -43,6 +45,9 @@
 
 -define(DBG_PATHS, true).
 
+-define(PERM_700, 8#700).
+-define(PERM_644, 8#644).
+
 %% API
 public_host_dsa_key(Type, Opts) ->
     File = file_name(Type, "ssh_host_dsa_key.pub", Opts),
@@ -113,8 +118,10 @@ do_lookup_host_key(Host, Alg, Opts) ->
 
 add_host_key(Host, Key, Opts) ->
     Host1 = add_ip(replace_localhost(Host)),
-    case file:open(file_name(user, "known_hosts", Opts),[write,append]) of
+    KnownHosts = file_name(user, "known_hosts", Opts),
+    case file:open(KnownHosts, [write,append]) of
    	{ok, Fd} ->
+	    ok = file:change_mode(KnownHosts, ?PERM_644),
    	    Res = add_key_fd(Fd, Host1, Key),
    	    file:close(Fd),
    	    Res;
@@ -140,6 +147,11 @@ private_identity_key(Alg, Opts) ->
     Path = file_name(user, identity_key_filename(Alg), Opts),
     read_private_key_v2(Path, Alg).
 
+public_identity_key(Alg, Opts) ->
+    Path = file_name(user, identity_key_filename(Alg) ++ ".pub", Opts),
+    read_public_key_v2(Path, Alg).
+
+
 read_public_key_v2(File, Type) ->
     case file:read_file(File) of
 	{ok,Bin} ->
@@ -198,12 +210,17 @@ read_public_key_v1(File) ->
 %% pem_type("ssh-rsa") -> "RSA".
 
 read_private_key_v2(File, Type) ->
-     case catch (public_key:pem_to_der(File)) of
-	 {ok, [{_, Bin, not_encrypted}]} ->
-	     decode_private_key_v2(Bin, Type);
-	 Error -> %% Note we do not handle password encrypted keys at the moment
-	     {error, Error}
-     end.
+    case file:read_file(File) of
+        {ok, PemBin} ->
+            case catch (public_key:pem_decode(PemBin)) of
+                [{_, Bin, not_encrypted}] ->
+                    decode_private_key_v2(Bin, Type);
+                Error -> %% Note we do not handle password encrypted keys at the moment
+                    {error, Error}
+            end;
+        {error, Reason} ->
+            {error, Reason}
+    end.
 %%  case file:read_file(File) of
 %% 	{ok,Bin} ->
 %% 	    case read_pem(binary_to_list(Bin), pem_type(Type)) of
@@ -527,4 +544,7 @@ file_name(Type, Name, Opts) ->
 
 default_user_dir()->
     {ok,[[Home|_]]} = init:get_argument(home),
-    filename:join(Home, ".ssh").
+    UserDir = filename:join(Home, ".ssh"),
+    ok = filelib:ensure_dir(filename:join(UserDir, "dummy")),
+    ok = file:change_mode(UserDir, ?PERM_700),
+    UserDir.
diff --git a/lib/ssh/src/ssh_rsa.erl b/lib/ssh/src/ssh_rsa.erl
index e27cdcf7bd..91b8285b2e 100755
--- a/lib/ssh/src/ssh_rsa.erl
+++ b/lib/ssh/src/ssh_rsa.erl
@@ -202,8 +202,7 @@ rsassa_pkcs1_v1_5_verify(Public=#ssh_key { public={N,_E}}, Mb, Sb) ->
     case emsa_pkcs1_v1_5_encode(Mb, K) of
 	EM -> ok;
 	_S ->
-	    io:format("S: ~p~n", [_S]),
-	    {error, invalid_signature} % exit(invalid_signature)
+	    {error, invalid_signature}
     end.
 
 
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index 40db2e4adf..920baaadef 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -33,7 +33,8 @@
 	 stop_system/2, system_supervisor/2,
 	 subsystem_supervisor/1, channel_supervisor/1, 
 	 connection_supervisor/1, 
-	 acceptor_supervisor/1, start_subsystem/2, restart_subsystem/2, restart_acceptor/2]).
+	 acceptor_supervisor/1, start_subsystem/2, restart_subsystem/2,
+	 restart_acceptor/2, stop_subsystem/2]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -83,6 +84,23 @@ start_subsystem(SystemSup, Options) ->
     Spec = ssh_subsystem_child_spec(Options),
     supervisor:start_child(SystemSup, Spec).
 
+stop_subsystem(SystemSup, SubSys) ->
+    case catch lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of
+	false ->
+	    {error, not_found};
+	{Id, _, _, _} ->
+	    spawn(fun() -> supervisor:terminate_child(SystemSup, Id),
+			   supervisor:delete_child(SystemSup, Id) end),
+	    ok;
+	{'EXIT', {noproc, _}} ->
+	    %% Already terminated; probably shutting down.
+	    ok;
+	{'EXIT', {shutdown, _}} ->
+	    %% Already shutting down.
+	    ok
+    end.
+
+
 restart_subsystem(Address, Port) ->
     SysSupName = make_name(Address, Port),
     SubSysName = id(ssh_subsystem_sup, Address, Port),
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index e79ccdda0c..de3e29e2f1 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2011. 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
@@ -169,6 +169,8 @@ do_connect(Callback, Address, Port, SocketOpts, Timeout) ->
 	    Callback:connect(Address, Port, lists:delete(inet6, Opts), Timeout);
 	{error, eafnosupport}  ->
 	    Callback:connect(Address, Port, lists:delete(inet6, Opts), Timeout);
+	{error, enetunreach}  ->
+	    Callback:connect(Address, Port, lists:delete(inet6, Opts), Timeout);
 	Other ->
 	    Other
     end.
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index ccdbfe4f9a..51f9f47446 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,84 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 2.0
+SSH_VSN = 2.0.4
 APP_VSN    = "ssh-$(SSH_VSN)"
 
-TICKETS = OTP-8524 \
-	OTP-8534 \
-	OTP-8535 \
-	OTP-8550 \
-	OTP-8596 \
-	OTP-8644 \
-	OTP-8645
-
-TICKETS_1.1.8 = OTP-8356 \
-	OTP-8401
-
-TICKETS_1.1.7 = OTP-8121 \
-	OTP-8277 \
-	OTP-8278 \
-	OTP-8201
-
-TICKETS_1.1.6 = OTP-8110 \
-	OTP-8162 \
-	OTP-8173 \
-	OTP-8174 \
-	OTP-8175 \
-	OTP-8176
-
-TICKETS_1.1.5 = OTP-8159 \
-	OTP-8160 \
-	OTP-8161
-
-TICKETS_1.1.4 = OTP-8071
-
-TICKETS_1.1.3 = OTP-7996 \
-	OTP-8034  \
-	OTP-8035
-
-TICKETS_1.1.2 = OTP-7914 \
-	OTP-7917 \
-	OTP-7918 \
-	OTP-7921 \
-	OTP-7919 \
-	OTP-7930 \
-	OTP-7957
-
-TICKETS_1.1.1 = OTP-7828 \
-	  OTP-7795 \
-	  OTP-7807 \
-	  OTP-7808 \
-	  OTP-7809
-
-TICKETS_1.1 = OTP-7676 \
-	  OTP-7683 \
-	  OTP-7685 \
-	  OTP-7766 \
-	  OTP-7767 \
-          OTP-7768 \
-          OTP-7770 \
-          OTP-7456 \
-          OTP-7769 \
-	  OTP-7516 \
-          OTP-7645 \
-
-TICKETS_1.0.2 = \
-	OTP-7141\
-
-TICKETS_1.0.1 = \
-	OTP-7318 \
-	OTP-7305 \
-	OTP-7564 \
-        OTP-7565 \
-	OTP-7566 \
-
-TICKETS_1.0 = \
-	OTP-7485 \
-	OTP-7504 \
-	OTP-7356 \
-	OTP-7502 \
-	OTP-7503
-
-TICKETS_0.9.9.6 = \
-	OTP-7246  \
-	OTP-7247  \
\ No newline at end of file
diff --git a/lib/ssl/Makefile b/lib/ssl/Makefile
index a3dec8da38..daad7dc3e6 100644
--- a/lib/ssl/Makefile
+++ b/lib/ssl/Makefile
@@ -1,19 +1,19 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 1999-2010. 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%
 #
 
@@ -24,22 +24,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 #
 # Macros
 #
-ifeq ($(findstring win32,$(TARGET)),win32)
-ifeq ($(HOST_OS),)
-HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
-endif
-ifeq ($(findstring solaris,$(HOST_OS)),solaris)
-SKIP_BUILDING_BINARIES := true
-endif
-else
-SKIP_BUILDING_BINARIES := false
-endif
-
-ifeq ($(SKIP_BUILDING_BINARIES), true)
-SUB_DIRECTORIES = pkix src c_src doc/src 
-else
-SUB_DIRECTORIES = pkix src c_src doc/src examples/certs examples/src
-endif
+
+SUB_DIRECTORIES = src c_src doc/src examples/certs examples/src
 
 include vsn.mk
 VSN = $(SSL_VSN)
diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile
index fa263d28ab..3119d37af0 100644
--- a/lib/ssl/doc/src/Makefile
+++ b/lib/ssl/doc/src/Makefile
@@ -37,7 +37,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = refman.xml
-XML_REF3_FILES = ssl.xml new_ssl.xml
+XML_REF3_FILES = ssl.xml old_ssl.xml ssl_session_cache_api.xml
 XML_REF6_FILES = ssl_app.xml
 
 XML_PART_FILES = release_notes.xml usersguide.xml
@@ -45,9 +45,7 @@ XML_CHAPTER_FILES = \
 	ssl_protocol.xml \
 	using_ssl.xml \
 	pkix_certs.xml \
-	create_certs.xml \
 	ssl_distribution.xml \
-	licenses.xml \
 	notes.xml
 
 BOOK_FILES = book.xml
diff --git a/lib/ssl/doc/src/book.xml b/lib/ssl/doc/src/book.xml
index 9122addb74..85d6b56b26 100644
--- a/lib/ssl/doc/src/book.xml
+++ b/lib/ssl/doc/src/book.xml
@@ -28,9 +28,6 @@
     <rev>A</rev>
     <file>book.sgml</file>
   </header>
-  <insidecover>
-    <include file="insidecover"></include>
-  </insidecover>
   <pagetext>SSL Application</pagetext>
   <preamble>
     <contents level="2"></contents>
diff --git a/lib/ssl/doc/src/create_certs.xml b/lib/ssl/doc/src/create_certs.xml
deleted file mode 100644
index 79cc8a0537..0000000000
--- a/lib/ssl/doc/src/create_certs.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2003</year><year>2009</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>Creating Certificates</title>
-    <prepared>UAB/F/P Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>2003-06-16</date>
-    <rev>A</rev>
-    <file>create_certs.xml</file>
-  </header>
-  <p>Here we consider the creation of example certificates. 
-    </p>
-
-  <section>
-    <title>The openssl Command</title>
-    <p>The <c>openssl</c> command is a utility that comes with the
-      OpenSSL distribution. It provides a variety of subcommands. Each
-      subcommand is invoked as</p>
-    <code type="none"><![CDATA[
-      openssl subcmd <options and arguments>    ]]></code>
-    <p>where <c>subcmd</c> denotes the subcommand in question.
-      </p>
-    <p>We shall use the following subcommands to create certificates for
-      the purpose of testing Erlang/OTP SSL:
-      </p>
-    <list type="bulleted">
-      <item><em>req</em> to create certificate requests and a
-       self-signed certificates, 
-      </item>
-      <item><em>ca</em> to create certificates from certificate requests.</item>
-    </list>
-    <p>We create the following certificates:
-      </p>
-    <list type="bulleted">
-      <item>the <em>erlangCA</em> root certificate (a self-signed
-       certificate), </item>
-      <item>the <em>otpCA</em> certificate signed by the <em>erlangCA</em>, </item>
-      <item>a client certificate signed by the <em>otpCA</em>, and</item>
-      <item>a server certificate signed by the <em>otpCA</em>.</item>
-    </list>
-
-    <section>
-      <title>The openssl configuration file</title>
-      <p>An <c>openssl</c> configuration file consist of a number of
-        sections, where each section starts with one line containing
-        <c>[ section_name ]</c>, where <c>section_name</c> is the name
-        of the section. The first section of the file is either
-        unnamed, or is named <c>[ default ]</c>. For further details
-        see the OpenSSL config(5) manual page.
-        </p>
-      <p>The required sections for the subcommands we are going to 
-        use are as follows:
-        </p>
-      <table>
-        <row>
-          <cell align="left" valign="middle">subcommand</cell>
-          <cell align="left" valign="middle">required/default section</cell>
-          <cell align="left" valign="middle">override command line option</cell>
-          <cell align="left" valign="middle">configuration file option</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">req</cell>
-          <cell align="left" valign="middle">[req]</cell>
-          <cell align="left" valign="middle">-</cell>
-          <cell align="left" valign="middle"><c>-config FILE</c></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">ca</cell>
-          <cell align="left" valign="middle">[ca]</cell>
-          <cell align="left" valign="middle"><c>-name section</c></cell>
-          <cell align="left" valign="middle"><c>-config FILE</c></cell>
-        </row>
-        <tcaption>openssl subcommands to use</tcaption>
-      </table>
-    </section>
-
-    <section>
-      <title>Creating the Erlang root CA</title>
-      <p>The Erlang root CA is created with the command</p>
-      <code type="none">
-	openssl req -new -x509 -config /some/path/req.cnf \\
-                -keyout /some/path/key.pem -out /some/path/cert.pem </code>
-      <p>where the option <c>-new</c> indicates that we want to create
-        a new certificate request and the option <c>-x509</c> implies
-        that a self-signed certificate is created.
-      </p>
-    </section>
-
-    <section>
-      <title>Creating the OTP CA</title>
-      <p>The OTP CA is created by first creating a certificate request
-        with the command</p>
-      <code type="none">
-	openssl req -new -config /some/path/req.cnf \\
-	        -keyout /some/path/key.pem -out /some/path/req.pem      </code>
-      <p>and the ask the Erlang CA to sign it:</p>
-      <code type="none">
-	openssl ca -batch -notext -config /some/path/req.cnf \\
-	        -extensions ca_cert -in /some/path/req.pem -out /some/path/cert.pem      </code>
-      <p>where the option <c>-extensions</c> refers to a section in the
-        configuration file saying that it should create a CA certificate, 
-        and not a plain user certificate. 
-        </p>
-      <p>The <c>client</c> and <c>server</c> certificates are created
-        similarly, except that the option <c>-extensions</c> then has the 
-        value <c>user_cert</c>.  
-        </p>
-    </section>
-  </section>
-
-  <section>
-    <title>An Example</title>
-    <p>The following module <c>create_certs</c> is used by the Erlang/OTP
-      SSL application for generating certificates to be used in tests. The
-      source code is also found in <c>ssl-X.Y.Z/examples/certs/src</c>.
-      </p>
-    <p>The purpose of the <c>create_certs:all/1</c> function is to make
-      it possible to provide from the <c>erl</c> command line, the
-      full path name of the <c>openssl</c> command.
-      </p>
-    <p>Note that the module creates temporary OpenSSL configuration files
-      for the <c>req</c> and <c>ca</c> subcommands. 
-      </p>
-    <codeinclude file="../../examples/certs/src/make_certs.erl" tag="" type="erl"></codeinclude>
-  </section>
-</chapter>
-
-
diff --git a/lib/ssl/doc/src/insidecover.xml b/lib/ssl/doc/src/insidecover.xml
deleted file mode 100644
index 4f3f5e5951..0000000000
--- a/lib/ssl/doc/src/insidecover.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE bookinsidecover SYSTEM "bookinsidecover.dtd">
-
-<bookinsidecover>
-The Erlang/OTP SSL application includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/). Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.  <br></br>
-This product includes cryptographic software written by Eric Young ([email protected]).  This product includes software written by Tim Hudson ([email protected]). Copyright (C) 1995-1998 Eric Young ([email protected]). All rights reserved.  <br></br>
-For further OpenSSL and SSLeay license information se the chapter  <bold>Licenses</bold>
-.  <vfill></vfill>
-  <br></br>
-  <tt>http://www.erlang.org</tt>
-  <br></br>
-</bookinsidecover>
-
-
diff --git a/lib/ssl/doc/src/licenses.xml b/lib/ssl/doc/src/licenses.xml
deleted file mode 100644
index 0969f9ad6e..0000000000
--- a/lib/ssl/doc/src/licenses.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2003</year><year>2009</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>Licenses</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>2003-05-26</date>
-    <rev>A</rev>
-    <file>licenses.xml</file>
-  </header>
-  <p>    <marker id="licenses"></marker>
-This chapter contains in extenso versions
-    of the OpenSSL and SSLeay licenses.
-    </p>
-
-  <section>
-    <title>OpenSSL License</title>
-    <code type="none">
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    [email protected].
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * ([email protected]).  This product includes software written by Tim
- * Hudson ([email protected]).
- *
- */    </code>
-  </section>
-
-  <section>
-    <title>SSLeay License</title>
-    <code type="none">
-/* Copyright (C) 1995-1998 Eric Young ([email protected])
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young ([email protected]).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson ([email protected]).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young ([email protected])"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson ([email protected])"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */    </code>
-  </section>
-</chapter>
-
-
diff --git a/lib/ssl/doc/src/make.dep b/lib/ssl/doc/src/make.dep
deleted file mode 100644
index 2ff81bee1f..0000000000
--- a/lib/ssl/doc/src/make.dep
+++ /dev/null
@@ -1,30 +0,0 @@
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex create_certs.tex licenses.tex new_ssl.tex \
-		pkix_certs.tex refman.tex ssl.tex ssl_app.tex \
-		ssl_distribution.tex ssl_protocol.tex usersguide.tex \
-		using_ssl.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: refman.xml
-
-create_certs.tex: ../../examples/certs/src/make_certs.erl
-
-using_ssl.tex: ../../examples/src/client_server.erl
-
-pkix_certs.tex: ../../../../system/doc/definitions/cite.defs
-
-ssl_protocol.tex: ../../../../system/doc/definitions/cite.defs
-
diff --git a/lib/ssl/doc/src/new_ssl.xml b/lib/ssl/doc/src/new_ssl.xml
deleted file mode 100644
index 4ffaa9d96a..0000000000
--- a/lib/ssl/doc/src/new_ssl.xml
+++ /dev/null
@@ -1,684 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year>
-      <year>2007</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 aniline's 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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>ssl</title>
-    <prepared>Ingela Anderton Andin</prepared>
-    <responsible>Ingela Anderton Andin</responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2003-03-25</date>
-    <rev></rev>
-    <file>new_ssl.xml</file>
-  </header>
-  <module>new_ssl</module>
-  <modulesummary>Interface Functions for Secure Socket Layer</modulesummary>
-  <description>
-    <p>This module contains interface functions to the Secure Socket
-      Layer. 
-    </p>
-  </description>
-  
-  <section>
-    <title>NEW SSL</title>
-
-    <p>This manual page describes functions that are defined
-      in the ssl module and represents the new ssl implementation
-      that coexists with the old one, as the new implementation
-      is not yet complete enough to replace the old one.</p>
-       
-    <p>The new implementation can be
-      accessed by providing the option {ssl_imp, new} to the
-      ssl:connect and ssl:listen functions.</p>
-    
-    <p>The new implementation is Erlang based and all logic
-      is in Erlang and only payload encryption calculations are
-      done in C via the crypto application. The main reason for
-      making a new implementation is that the old solution was
-      very crippled as the control of the ssl-socket was deep
-      down in openssl making it hard if not impossible to
-      support all inet options, ipv6 and upgrade of a tcp
-      connection to a ssl connection. This version has a
-      few limitations that will be removed before the ssl-4.0
-      release. Main differences and limitations are listed below.</p>
-
-    <list type="bulleted">
-      <item>New ssl requires the crypto
-	application.</item>
-      <item>The option reuseaddr is
-	supported and the default value is false as in gen_tcp.
-	Old ssl is patched to accept that the option is set to
-	true to provide a smoother migration between the
-	versions. In old ssl the option is hard coded to
-	true.</item>
-      <item>ssl:version/0 is replaced by
-            ssl:versions/0</item>
-      <item>ssl:ciphers/0 is replaced by
-            ssl:cipher_suites/0</item>
-      <item>ssl:pid/1 is a
-            meaningless function in new ssl and will be deprecated in
-            ssl-4.0 until it is removed it will return a valid but
-            meaningless pid.</item>
-      <item>New API functions are
-            ssl:shutdown/2, ssl:cipher_suites/[0,1] and
-            ssl:versions/0</item>
-      <item>CRL and policy certificate
-            extensions are not supported yet. </item>
-      <item>Supported SSL/TLS-versions are SSL-3.0 and TLS-1.0 </item>
-      <item>For security reasons sslv2 is not supported.</item>
-      <item>Ephemeral Diffie-Hellman cipher suites are supported
-      but not Diffie Hellman Certificates cipher suites.</item>
-      <item>Export cipher suites are not supported as the
-      U.S. lifted its export restrictions in early 2000.</item>
-    </list>
- 
-  </section>
-  
-  <section>
-    <title>COMMON DATA TYPES</title>
-    <p>The following data types are used in the functions below:
-    </p>
-
-    <p><c>boolean() = true | false</c></p> 
-    
-    <p><c>property() = atom()</c></p>
-    
-    <p><c>option() = socketoption() | ssloption() | transportoption()</c></p>
-
-     <p><c>socketoption() = [{property(), term()}] - defaults to
-      [{mode,list},{packet, 0},{header, 0},{active, true}].
-    </c></p>
-
-    <p>For valid options
-      see <seealso marker="kernel:inet">inet(3) </seealso> and
-      <seealso marker="kernel:gen_tcp">gen_tcp(3) </seealso>.
-    </p>
-    
-    <p> <c>ssloption() = {verify, verify_type()} |
-      {fail_if_no_peer_cert, boolean()}
-      {depth, integer()} |
-      {certfile, path()} | {keyfile, path()} | {password, string()} |
-      {cacertfile, path()} | {dhfile, path()} | {ciphers, ciphers()} |
-      {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} | {reuse_session, fun()} 
-    </c></p>
-
-    <p><c>transportoption() = {CallbackModule, DataTag, ClosedTag}
-	- defaults to {gen_tcp, tcp, tcp_closed}. Ssl may be
-	run over any reliable transport protocol that has
-	an equivalent API to gen_tcp's.</c></p>
-    
-    <p><c>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CallbackModule =
-	atom()</c>
-    </p> <p><c>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DataTag =
-	atom() - tag used in socket data message.</c></p>
-    <p><c>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ClosedTag = atom() - tag used in
-    socket close message.</c></p>
-
-    <p><c>verify_type() = verify_none | verify_peer</c></p>
-    
-    <p><c>path() = string() - representing a file path.</c></p>
-    
-    <p><c>host() = hostname() | ipaddress()</c></p>
-        
-    <p><c>hostname() = string()</c></p>
-    
-    <p><c>
-      ip_address() = {N1,N2,N3,N4}  % IPv4
-      | {K1,K2,K3,K4,K5,K6,K7,K8}  % IPv6    </c></p>
-
-    <p><c>sslsocket() - opaque to the user. </c></p>
-    
-    <p><c>protocol() = sslv3 | tlsv1 </c></p>
-    
-    <p><c>ciphers() = [ciphersuite()] | string() (according to old API)</c></p>
-    
-    <p><c>ciphersuite() =
-      {key_exchange(), cipher(), hash()}</c></p>
-    
-    <p><c>key_exchange() =  rsa | dhe_dss | dhe_rsa
-    </c></p>
-
-   <p><c>cipher() = rc4_128 | des_cbc | '3des_ede_cbc'
-      | aes_128_cbc | aes_256_cbc </c></p>
-
-   <p> <c>hash() = md5 | sha
-    </c></p>
-
-    <p><c>ssl_imp() = new | old - default is old.</c></p>
-    
-  </section>
-  
-<section>
-    <title>SSL OPTION DESCRIPTIONS</title>
-    
-    <taglist>
-      <tag>{verify, verify_type()}</tag>
-      <item> If <c>verify_none</c> is specified x509-certificate
-      path validation errors at the client side
-      will not  automatically cause the connection to fail, as
-      it will if the verify type is <c>verify_peer</c>. See also
-      the option verify_fun.
-      Servers only do the path validation if <c>verify_peer</c> is set to
-      true, as it then will 
-      send a certificate request to
-      the client (this message is not sent if the verify option is
-      <c>verify_none</c>) and you may then also want to specify
-      the option <c>fail_if_no_peer_cert</c>.
-      </item>
-
-      <tag>{fail_if_no_peer_cert, boolean()}</tag>
-      <item>Used together with {verify, verify_peer} by a ssl server.
-      If set to true,
-      the server will fail if the client does not have a certificate
-      to send, e.i sends a empty certificate, if set to false it will
-      only fail if the client sends a invalid certificate (an empty
-      certificate is considered valid).
-      </item>
-      
-      <tag>{verify_fun, fun(ErrorList) -> boolean()}</tag>
-      <item>Used by the ssl client to determine if 
-	x509-certificate path validations errors are acceptable or
-	if the connection should fail. Defaults to:
-       
-<code>
-fun(ErrorList) ->
-	case lists:foldl(fun({bad_cert,unknown_ca}, Acc) ->
-						  Acc;
-			    (Other, Acc) ->
-				 [Other | Acc]
-			 end, [], ErrorList) of
-	    [] ->
-		true;
-	    [_|_] ->
-		false
-	end
-end
-</code>
-       I.e. by default if the only error found was that the CA-certificate
-       holder was unknown this will be accepted.
-
-       Possible errors in the error list are: 
-       {bad_cert, cert_expired}, {bad_cert, invalid_issuer},
-       {bad_cert, invalid_signature}, {bad_cert, name_not_permitted},
-       {bad_cert, unknown_ca},
-       {bad_cert, cert_expired}, {bad_cert, invalid_issuer},
-       {bad_cert, invalid_signature}, {bad_cert, name_not_permitted},
-       {bad_cert, cert_revoked} (not implemented yet),
-       {bad_cert, unknown_critical_extension} or {bad_cert, term()} (Will
-								    be relevant later when an option is added for the user to be able to verify application specific extensions.) 
-      </item>
-      
-      <tag>{depth, integer()}</tag>
-      <item>Specifies the maximum
-      verification depth, i.e. how far in a chain of certificates the
-      verification process can proceed before the verification is
-      considered to fail. Peer certificate = 0, CA certificate = 1,
-      higher level CA certificate = 2, etc.  The value 2 thus means
-      that a chain can at most contain peer cert, CA cert, next CA
-      cert, and an additional CA cert. The default value is 1.
-      </item>
-
-      <tag>{certfile, path()}</tag>
-      <item>Path to a file containing the
-          user's certificate. Optional for clients but note
-      that some servers requires that the client can certify
-      itself. </item>
-      <tag>{keyfile, path()}</tag>
-      <item>Path to file containing user's
-      private PEM encoded key. As PEM-files may contain several
-      entries this option defaults to the same file as given by
-      certfile option.</item>
-      <tag>{password, string()}</tag>
-      <item>String containing the user's password.
-	Only used if the private keyfile is password protected.
-      </item>
-      <tag>{cacertfile, path()}</tag>
-      <item>Path to file containing PEM encoded
-      CA certificates (trusted certificates used for verifying a peer
-      certificate). May be omitted if you do not want to verify
-      the peer.</item>
-
-      <tag>{dhfile, path()}</tag>
-      <item>Path to file containing PEM encoded Diffie Hellman parameters,
-      for the server to use if a cipher suite using Diffie Hellman key exchange
-      is negotiated. If not specified hardcode parameters will be used.
-      </item>
-      
-      <tag>{ciphers, ciphers()}</tag>
-      <item>The function <c>ciphers_suites/0</c> can
-	be used to find all available ciphers.
-      </item>
-
-      <tag>{ssl_imp, ssl_imp()}</tag>
-      <item>Specify which ssl implementation you want to use.
-      </item>
-
-      <tag>{reuse_sessions, boolean()}</tag>
-      <item>Specifies if ssl sessions should be reused
-	when possible.
-      </item>
-
-       <tag>{reuse_session, fun(SuggestedSessionId,
-       PeerCert, Compression, CipherSuite) -> boolean()}</tag>
-      <item>Enables the ssl server to have a local policy
-      for deciding if a session should be reused or not,
-      only meaning full if <c>reuse_sessions</c> is set to true.
-      SuggestedSessionId is a binary(),  PeerCert is a DER encoded
-      certificate, Compression is an enumeration integer
-      and CipherSuite of type ciphersuite().      
-      </item>
-    </taglist>
-  </section>
-  
-  <section>
-    <title>General</title>
-      
-    <p>When a ssl 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>
-    <list type="bulleted">
-      <item>{ssl, Socket, Data}
-      </item>
-      <item>{ssl_closed, Socket}
-      </item>
-      <item>
-        {ssl_error, Socket, Reason}
-      </item>
-    </list>
-    
-    <p>A <c>Timeout</c> argument specifies a timeout in milliseconds. The 
-      default value for a <c>Timeout</c> argument is <c>infinity</c>.
-    </p>
-  </section>
-  
-  <funcs>
-    <func>
-      <name>cipher_suites() -></name>
-      <name>cipher_suites(Type) -> ciphers()</name>
-      <fsummary> Returns a list of supported cipher suites</fsummary>
-      <type>
-        <v>Type = erlang | openssl</v>
-
-      </type>
-      <desc><p>Returns a list of supported cipher suites.
-	cipher_suites() is equivalent to cipher_suites(erlang).
-	Type openssl is provided for backwards compatibility with
-	old ssl that used openssl.
-	</p>
-    </desc>
-    </func>
-    
-    <func>
-      <name>connect(Socket, SslOptions) -> </name>
-      <name>connect(Socket, SslOptions, Timeout) -> {ok, SslSocket}
-	| {error, Reason}</name>
-      <fsummary> Upgrades a gen_tcp, or
-	equivalent, connected socket to a ssl socket. </fsummary>
-      <type>
-        <v>Socket = socket()</v>
-        <v>SslOptions = [ssloption()]</v>
-	<v>Timeout = integer() | infinity</v>
-	<v>SslSocket = sslsocket()</v>
-	<v>Reason = term()</v>
-      </type>
-      <desc> <p>Upgrades a gen_tcp, or equivalent,
-	  connected socket to a ssl socket e.i performs the
-	  client-side ssl handshake.</p>
-    </desc>
-    </func>
-
-    <func>
-      <name>connect(Host, Port, Options) -></name>
-      <name>connect(Host, Port, Options, Timeout) ->
-	  {ok, SslSocket} | {error, Reason}</name>
-      <fsummary>Opens an ssl connection to Host, Port. </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 ssl connection to Host, Port.</p> </desc>
-    </func>
-
-    <func>
-      <name>close(SslSocket) -> ok | {error, Reason}</name>
-      <fsummary>Close a ssl connection</fsummary>
-      <type>
-	  <v>SslSocket = sslsocket()</v>
-	  <v>Reason = term()</v>
-      </type>
-      <desc><p>Close a ssl connection.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>controlling_process(SslSocket, NewOwner) ->
-	ok | {error, Reason}</name>
-      
-	<fsummary>Assigns a new controlling process to the
-	ssl-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 a ssl-socket, and receives
-      all messages from the socket.</p>
-      </desc>
-    </func>
-
-    <func>
-	<name>connection_info(SslSocket) ->
-	  {ok, {ProtocolVersion, CipherSuite}} |  {error, Reason} </name>
-      <fsummary>Returns the negotiated protocol version and cipher suite.
-      </fsummary>
-      <type>
-        <v>CipherSuite = ciphersuite()</v>
-        <v>ProtocolVersion = protocol()</v>
-      </type>
-      <desc><p>Returns the negotiated protocol version and cipher suite.</p> 
-      </desc>
-    </func>
-
-    <func>
-      <name>getopts(Socket) -> </name>
-      <name>getopts(Socket, OptionNames) ->
-	{ok, [socketoption()]} | {error, Reason}</name>
-      <fsummary>Get the value of the specified options.</fsummary>
-      <type>
-	<v>Socket = sslsocket()</v>
-	<v>OptionNames = [property()]</v>
-      </type>
-      <desc>
-	<p>Get the value of the specified socket options, if no
-	  options are specified all options are returned.
-	</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>listen(Port, Options) ->
-	{ok, ListenSocket} | {error, Reason}</name>
-      <fsummary>Creates a ssl listen socket.</fsummary>
-      <type>
-	<v>Port = integer()</v>
-	<v>Options = options()</v>
-	<v>ListenSocket = sslsocket()</v>
-      </type>
-      <desc>
-	<p>Creates a ssl listen socket.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>peercert(Socket) -> {ok, Cert} | {error, Reason}</name>
-      <fsummary>Return the peer certificate.</fsummary>
-     <type>
-        <v>Socket = sslsocket()</v>
-        <v>Cert = binary()</v>
-        <v>Subject = term()</v>
-      </type>
-      <desc>
-        <p>The peer certificate is returned as a DER encoded binary.
-	  The certificate can be decoded with <c>public_key:pkix_decode_cert/2</c>.
-        </p>
-      </desc>
-    </func>
-    <func>
-      <name>peername(Socket) -> {ok, {Address, Port}} |
-	{error, Reason}</name>
-      <fsummary>Return peer address and port.</fsummary>
-      <type>
-        <v>Socket = 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>recv(Socket, Length) -> </name>
-      <name>recv(Socket, Length, Timeout) -> {ok, Data} | {error,
-	Reason}</name>
-      <fsummary>Receive data on a socket.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Length = integer()</v>
-        <v>Timeout = integer()</v>
-        <v>Data = [char()] | binary()</v>
-      </type>
-      <desc>
-        <p>This function receives a packet from a socket in passive
-          mode. A closed socket is indicated by a return value
-          <c>{error, closed}</c>.</p>
-        <p>The <c>Length</c> argument is only meaningful when
-          the socket is in <c>raw</c> mode and denotes the number of
-          bytes to read. If <c>Length</c> = 0, all available bytes are
-          returned. If <c>Length</c> &gt; 0, exactly <c>Length</c>
-          bytes are returned, or an error; possibly discarding less
-          than <c>Length</c> bytes of data when the socket gets closed
-          from the other side.</p>
-        <p>The optional <c>Timeout</c> parameter specifies a timeout in
-          milliseconds. The default value is <c>infinity</c>.</p>
-      </desc>
-    </func>
-    
-    <func>
-      <name>renegotiate(Socket) -> ok | {error, Reason}</name>
-      <fsummary> Initiates a new handshake.</fsummary>
-      <type>
-	<v>Socket = 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
-      is still active using the previously negotiated session.</p>
-      </desc>
-    </func>
-    
-    <func>
-      <name>send(Socket, Data) -> ok | {error, Reason}</name>
-      <fsummary>Write data to a socket.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Data = iolist() | binary()</v>
-      </type>
-      <desc>
-        <p>Writes <c>Data</c> to <c>Socket</c>. </p>
-        <p>A notable return value is <c>{error, closed}</c> indicating that
-          the socket is closed.</p>
-      </desc>
-    </func>
-    <func>
-      <name>setopts(Socket, Options) -> ok | {error, Reason}</name>
-      <fsummary>Set socket options.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Options = [socketoption]()</v>
-      </type>
-      <desc>
-        <p>Sets options according to <c>Options</c> for the socket 
-          <c>Socket</c>. </p>
-      </desc>
-    </func>
-
-    <func>
-      <name>shutdown(Socket, How) -> ok | {error, Reason}</name>
-      <fsummary>Immediately close a socket</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>How = read | write | read_write</v>
-        <v>Reason = reason()</v>
-      </type>
-      <desc>
-        <p>Immediately close a socket in one or two directions.</p>
-        <p><c>How == write</c> means closing the socket for writing,
-          reading from it is still possible.</p>
-        <p>To be able to handle that the peer has done a shutdown on
-          the write side, the <c>{exit_on_close, false}</c> option
-          is useful.</p>
-      </desc>
-    </func>
-    
-    <func>
-      <name>ssl_accept(ListenSocket) -> </name>
-      <name>ssl_accept(ListenSocket, Timeout) -> ok | {error, Reason}</name>
-      <fsummary>Perform server-side SSL handshake</fsummary>
-      <type>
-        <v>ListenSocket = sslsocket()</v>
-        <v>Timeout = integer()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>The <c>ssl_accept</c> function establish the SSL connection
-          on the server side. It should be called directly after
-          <c>transport_accept</c>, in the spawned server-loop.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>ssl_accept(ListenSocket, SslOptions) -> </name>
-      <name>ssl_accept(ListenSocket, SslOptions, Timeout) -> {ok, Socket} | {error, Reason}</name>
-      <fsummary>Perform server-side SSL handshake</fsummary>
-      <type>
-        <v>ListenSocket = socket()</v>
-	<v>SslOptions = ssloptions()</v>
-        <v>Timeout = integer()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p> Upgrades a gen_tcp, or
-	  equivalent, socket to a ssl socket e.i performs the
-	ssl server-side handshake.</p>
-	<p><note>Note that the listen socket should be in {active, false} mode
-	before telling the client that the server is ready to upgrade
-	and calling this function, otherwise the upgrade may
-	or may not succeed depending on timing.</note></p>
-      </desc>
-    </func>
-    
-    <func>
-      <name>sockname(Socket) -> {ok, {Address, Port}} |
-	{error, Reason}</name>
-      <fsummary>Return the local address and port.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-        <v>Address = ipaddress()</v>
-        <v>Port = integer()</v>
-      </type>
-      <desc>
-        <p>Returns the local address and port number of the socket
-          <c>Socket</c>.</p>
-      </desc>
-    </func>
-    
-    <func>
-      <name>start() -> </name>
-      <name>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 temporary.
-          <seealso marker="kernel:application">application(3)</seealso></p>
-      </desc>
-    </func>
-    <func>
-      <name>stop() -> ok </name>
-      <fsummary>Stops the Ssl application.</fsummary>
-      <desc>
-        <p>Stops the Ssl application.
-          <seealso marker="kernel:application">application(3)</seealso></p>
-      </desc>
-    </func>
-
-    <func>
-      <name>transport_accept(Socket) -></name>
-      <name>transport_accept(Socket, Timeout) ->
-	{ok, NewSocket} | {error, Reason}</name>
-      <fsummary>Accept an incoming connection and
-	prepare for <c>ssl_accept</c></fsummary>
-      <type>
-        <v>Socket = NewSocket = 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
-          <c>listen/2</c>.  The socket returned should be passed to
-          <c>ssl_accept</c> to complete ssl handshaking and
-          establishing the connection.</p>
-        <warning>
-          <p>The socket returned can only be used with <c>ssl_accept</c>,
-            no traffic can be sent or received before that call.</p>
-        </warning>
-        <p>The accepted socket inherits the options set for
-          <c>ListenSocket</c> in <c>listen/2</c>.</p>
-	<p>The default
-          value for <c>Timeout</c> is <c>infinity</c>. If
-          <c>Timeout</c> is specified, and no connection is accepted
-          within the given time, <c>{error, timeout}</c> is
-          returned.</p>
-      </desc>
-    </func>
-    
-    <func>
-      <name>versions() ->
-	[{SslAppVer, SupportedSslVer, AvailableSslVsn}]</name>
-      <fsummary>Returns version information relevant for the
-	ssl application.</fsummary>
-      <type>
-	<v>SslAppVer = string()</v>
-      	<v>SupportedSslVer = [protocol()]</v>
-      	<v>AvailableSslVsn = [protocol()]</v>
-      </type>
-      <desc>
-	<p>
-	  Returns version information relevant for the
-	  ssl application.</p>
-      </desc>
-    </func>
-  </funcs> 
-      
-  <section>
-    <title>SEE ALSO</title>
-    <p><seealso marker="kernel:inet">inet(3) </seealso> and 
-      <seealso marker="kernel:gen_tcp">gen_tcp(3) </seealso>
-    </p>
-  </section>
-
-</erlref>
-
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 9d13427677..8f81ccb567 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -30,6 +30,328 @@
   </header>
   <p>This document describes the changes made to the SSL application.
     </p>
+
+    <section><title>SSL 4.1.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed error in cache-handling fix from ssl-4.1.2</p>
+          <p>
+	    Own Id: OTP-9018 Aux Id: seq11739 </p>
+        </item>
+        <item>
+          <p>
+	    Verification of a critical extended_key_usage-extension
+	    corrected</p>
+          <p>
+	    Own Id: OTP-9029 Aux Id: seq11541 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 4.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The ssl application caches certificate files, it will now
+	    invalidate cache entries if the diskfile is changed.</p>
+          <p>
+	    Own Id: OTP-8965 Aux Id: seq11739 </p>
+        </item>
+        <item>
+          <p>
+	    Now runs the terminate function before returning from the
+	    call made by ssl:close/1, as before the caller of
+	    ssl:close/1 could get problems with the reuseaddr option.</p>
+          <p>
+	    Own Id: OTP-8992</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 4.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Correct handling of client certificate verify message
+	    When checking the client certificate verify message the
+	    server used the wrong algorithm identifier to determine
+	    the signing algorithm, causing a function clause error in
+	    the public_key application when the key-exchange
+	    algorithm and the public key algorithm of the client
+	    certificate happen to differ.</p>
+          <p>
+	    Own Id: OTP-8897</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    For testing purposes ssl now also support some anonymous
+	    cipher suites when explicitly configured to do so.</p>
+          <p>
+	    Own Id: OTP-8870</p>
+        </item>
+        <item>
+          <p>
+	    Sends an error alert instead of crashing if a crypto
+	    function for the selected cipher suite fails.</p>
+          <p>
+	    Own Id: OTP-8930 Aux Id: seq11720 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 4.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Updated ssl to ignore CA certs that violate the asn1-spec
+	    for a certificate, and updated public key asn1 spec to
+	    handle inherited DSS-params.</p>
+          <p>
+	    Own Id: OTP-7884</p>
+        </item>
+        <item>
+          <p>
+	    Changed ssl implementation to retain backwards
+	    compatibility for old option {verify, 0} that shall be
+	    equivalent to {verify, verify_none}, also separate the
+	    cases unknown ca and selfsigned peer cert, and restored
+	    return value of deprecated function
+	    public_key:pem_to_der/1.</p>
+          <p>
+	    Own Id: OTP-8858</p>
+        </item>
+        <item>
+          <p>
+	    Changed the verify fun so that it differentiate between
+	    the peer certificate and CA certificates by using
+	    valid_peer or valid as the second argument to the verify
+	    fun. It may not always be trivial or even possible to
+	    know when the peer certificate is reached otherwise.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8873</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 4.0.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The server now verifies the client certificate verify
+	    message correctly, instead of causing a case-clause.</p>
+          <p>
+	    Own Id: OTP-8721</p>
+        </item>
+        <item>
+          <p>
+	    The client hello message now always include ALL available
+	    cipher suites (or those specified by the ciphers option).
+	    Previous implementation would filter them based on the
+	    client certificate key usage extension (such filtering
+	    only makes sense for the server certificate).</p>
+          <p>
+	    Own Id: OTP-8772</p>
+        </item>
+        <item>
+          <p>
+	    Fixed handling of the option {mode, list} that was broken
+	    for some packet types for instance line.</p>
+          <p>
+	    Own Id: OTP-8785</p>
+        </item>
+        <item>
+          <p>
+	    Empty packets were not delivered to the client.</p>
+          <p>
+	    Own Id: OTP-8790</p>
+        </item>
+        <item>
+	    <p> Building in a source tree without prebuilt platform
+	    independent build results failed on the SSL examples
+	    when: </p> <list><item> cross building. This has been
+	    solved by not building the SSL examples during a cross
+	    build. </item><item> building on Windows. </item></list>
+          <p>
+	    Own Id: OTP-8791</p>
+        </item>
+        <item>
+          <p>
+	    Fixed a handshake error which occurred on some ssl
+	    implementations.</p>
+          <p>
+	    Own Id: OTP-8793</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Revise the public_key API - Cleaned up and documented the
+	    public_key API to make it useful for general use, also
+	    changed ssl to use the new API.</p>
+          <p>
+	    Own Id: OTP-8722</p>
+        </item>
+        <item>
+          <p>
+	    Added support for inputing certificates and keys directly
+	    in DER format these options will override the pem-file
+	    options if specified.</p>
+          <p>
+	    Own Id: OTP-8723</p>
+        </item>
+        <item>
+          <p>
+	    To gain interoperability ssl will not check for padding
+	    errors when using TLS 1.0. It is first in TLS 1.1 that
+	    checking the padding is an requirement.</p>
+          <p>
+	    Own Id: OTP-8740</p>
+        </item>
+        <item>
+          <p>
+	    Changed the semantics of the verify_fun option in the
+	    ssl-application so that it takes care of both application
+	    handling of path validation errors and verification of
+	    application specific extensions. This means that it is
+	    now possible for the server application in verify_peer
+	    mode to handle path validation errors. This change moved
+	    some functionality earlier in ssl to the public_key
+	    application.</p>
+          <p>
+	    Own Id: OTP-8770</p>
+        </item>
+        <item>
+          <p>
+	    Added the functionality so that the verification fun will
+	    be called when a certificate is considered valid by the
+	    path validation to allow access to each certificate in
+	    the path to the user application. Also try to verify
+	    subject-AltName, if unable to verify it let the
+	    application verify it.</p>
+          <p>
+	    Own Id: OTP-8825</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 4.0</title>
+    
+    <section><title>Improvements and New Features</title>
+    <list>
+      <item>
+	<p>
+	  New ssl now support client/server-certificates signed by
+	dsa keys.</p>
+	<p>
+	Own Id: OTP-8587</p>
+      </item>
+      <item>
+	<p>
+	  Ssl has now switched default implementation and removed
+	  deprecated certificate handling. All certificate handling
+	is done by the public_key application.</p>
+	<p>
+	Own Id: OTP-8695</p>
+      </item>
+    </list>
+    </section>
+    
+    </section>
+
+    
+    <section><title>SSL 3.11.1</title>
+    
+    <section><title>Fixed Bugs and Malfunctions</title>
+    <list>
+      <item>
+          <p>
+            Fixed handling of several ssl/tls packets arriving at the
+	    same time. This was broken during a refactoring of the
+            code.</p>
+	    <p>
+	    Own Id: OTP-8679</p>
+      </item>
+      </list>
+    </section>
+    
+
+    <section><title>Improvements and New Features</title>
+    <list>
+        <item>
+          <p>
+            Added missing checks for padding and Mac value. Removed
+            code for export ciphers and DH certificates as we decided
+            not to support them.</p>
+          <p>
+            Own Id: OTP-7047</p>
+        </item>
+        <item>
+          <p>
+            New ssl will no longer return esslerrssl to be backwards
+            compatible with old ssl as this hids infomation from the
+            user. format_error/1 has been updated to support new ssl.</p>
+          <p>
+            *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+            Own Id: OTP-7049</p>
+        </item>
+        <item>
+          <p>
+            New ssl now supports secure renegotiation as described by
+            RFC 5746.</p>
+          <p>
+            Own Id: OTP-8568</p>
+        </item>
+        <item>
+          <p>
+            Alert handling has been improved to better handle
+            unexpected but valid messages and the implementation is
+            also changed to avoid timing related issues that could
+            cause different error messages depending on network
+            latency. Packet handling was sort of broken but would
+            mostly work as expected when socket was in binary mode.
+            This has now been fixed.</p>
+          <p>
+            Own Id: OTP-8588</p>
+        </item>
+      </list>
+    </section>
+    
+</section>
+    
 <section><title>SSL 3.11</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -733,7 +1055,7 @@
       <title>Fixed Bugs and Malfunctions</title>
       <list type="bulleted">
         <item>
-          <p>When a file descriptor was marked for closing, and and
+          <p>When a file descriptor was marked for closing, and
             end-of-file condition had already been detected, the file
             descriptor was never closed.</p>
           <p>Own Id: OTP-5093 Aux Id: seq8806 </p>
diff --git a/lib/ssl/doc/src/old_ssl.xml b/lib/ssl/doc/src/old_ssl.xml
new file mode 100644
index 0000000000..0d2e1afdbd
--- /dev/null
+++ b/lib/ssl/doc/src/old_ssl.xml
@@ -0,0 +1,709 @@
+<?xml version="1.0" encoding="latin1" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>1999</year><year>2010</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>ssl</title>
+    <prepared>Peter H&ouml;gfeldt</prepared>
+    <responsible>Peter H&ouml;gfeldt</responsible>
+    <docno></docno>
+    <approved>Peter H&ouml;gfeldt</approved>
+    <checked></checked>
+    <date>2003-03-25</date>
+    <rev>D</rev>
+    <file>old_ssl.xml</file>
+  </header>
+  <module>old_ssl</module>
+  <modulesummary>Interface Functions for Secure Socket Layer</modulesummary>
+  <description>
+    <p>This module contains interface functions to the Secure Socket Layer.</p>
+  </description>
+
+  <section>
+    <title>General</title>
+
+    <p>This manual page describes functions that are defined
+      in the ssl module and represents the old ssl implementation
+      that coexists with the new one until it has been
+      totally phased out. </p>
+
+   <p>The old implementation can be
+      accessed by providing the option {ssl_imp, old} to the
+      ssl:connect and ssl:listen functions.</p>
+      
+    <p>The reader is advised to also read the <c>ssl(6)</c> manual page
+      describing the SSL application.
+      </p>
+    <warning>
+      <p>It is strongly advised to seed the random generator after
+        the ssl application has been started (see <c>seed/1</c>
+        below), and before any connections are established. Although
+        the port program interfacing to the ssl libraries does a
+        "random" seeding of its own in order to make everything work
+        properly, that seeding is by no means random for the world
+        since it has a constant value which is known to everyone
+        reading the source code of the port program.</p>
+    </warning>
+  </section>
+
+  <section>
+    <title>Common data types</title>
+    <p>The following datatypes are used in the functions below:
+      </p>
+    <list type="bulleted">
+      <item>
+        <p><c>options() = [option()]</c></p>
+      </item>
+      <item>
+        <p><c>option() = socketoption() | ssloption()</c></p>
+      </item>
+      <item>
+        <p><c>socketoption() = {mode, list} | {mode, binary} |  binary | {packet, packettype()} | {header, integer()} | {nodelay, boolean()} | {active, activetype()} |  {backlog, integer()} | {ip, ipaddress()} | {port, integer()}</c></p>
+      </item>
+      <item>
+        <p><c>ssloption() = {verify, code()} | {depth, depth()} |  {certfile, path()} | {keyfile, path()} | {password, string()} | {cacertfile, path()} | {ciphers, string()}</c></p>
+      </item>
+      <item>
+        <p><c>packettype()</c>  (see inet(3))</p>
+      </item>
+      <item>
+        <p><c>activetype()</c>  (see inet(3))</p>
+      </item>
+      <item>
+        <p><c>reason() = atom() | {atom(), string()}</c></p>
+      </item>
+      <item>
+        <p><c>bytes() = [byte()]</c></p>
+      </item>
+      <item>
+        <p><c>string() = [byte()]</c></p>
+      </item>
+      <item>
+        <p><c>byte() = 0 | 1 | 2 | ... | 255</c></p>
+      </item>
+      <item>
+        <p><c>code() = 0 | 1 | 2</c></p>
+      </item>
+      <item>
+        <p><c>depth() = byte()</c></p>
+      </item>
+      <item>
+        <p><c>address() = hostname() | ipstring() | ipaddress()</c></p>
+      </item>
+      <item>
+        <p><c>ipaddress() = ipstring() | iptuple()</c></p>
+      </item>
+      <item>
+        <p><c>hostname() = string()</c></p>
+      </item>
+      <item>
+        <p><c>ipstring() = string()</c></p>
+      </item>
+      <item>
+        <p><c>iptuple() = {byte(), byte(), byte(), byte()}</c></p>
+      </item>
+      <item>
+        <p><c>sslsocket()</c></p>
+      </item>
+      <item>
+        <p><c>protocol() = sslv2 | sslv3 | tlsv1</c></p>
+      </item>
+      <item>
+        <p><c></c></p>
+      </item>
+    </list>
+    <p>The socket option <c>{backlog, integer()}</c> is for
+      <c>listen/2</c> only, and the option <c>{port, integer()}</c>
+      is for <c>connect/3/4</c> only. 
+      </p>
+    <p>The following socket options are set by default: <c>{mode, list}</c>, <c>{packet, 0}</c>, <c>{header, 0}</c>, <c>{nodelay, false}</c>, <c>{active, true}</c>, <c>{backlog, 5}</c>,
+      <c>{ip, {0,0,0,0}}</c>, and <c>{port, 0}</c>.
+      </p>
+    <p>Note that the options <c>{mode, binary}</c> and <c>binary</c>
+      are equivalent. Similarly <c>{mode, list}</c> and the absence of
+      option <c>binary</c> are equivalent. 
+      </p>
+    <p>The ssl options are for setting specific SSL parameters as follows:
+      </p>
+    <list type="bulleted">
+      <item>
+        <p><c>{verify, code()}</c> Specifies type of verification:
+          0 = do not verify peer; 1 = verify peer, 2 = verify peer,
+          fail if no peer certificate.  The default value is 0.
+          </p>
+      </item>
+      <item>
+        <p><c>{depth, depth()}</c> Specifies the maximum
+          verification depth, i.e. how far in a chain of certificates
+          the verification process can proceed before the verification
+          is considered to fail. 
+          </p>
+        <p>Peer certificate = 0, CA certificate = 1, higher level CA
+          certificate = 2, etc.  The value 2 thus means that a chain
+          can at most contain peer cert, CA cert, next CA cert, and an
+          additional CA cert.
+          </p>
+        <p>The default value is 1.
+          </p>
+      </item>
+      <item>
+        <p><c>{certfile, path()}</c> Path to a file containing the
+          user's certificate.
+          chain of PEM encoded certificates.</p>
+      </item>
+      <item>
+        <p><c>{keyfile, path()}</c> Path to file containing user's
+          private PEM encoded key.</p>
+      </item>
+      <item>
+        <p><c>{password, string()}</c> String containing the user's
+          password. Only used if the private keyfile is password protected.</p>
+      </item>
+      <item>
+        <p><c>{cacertfile, path()}</c> Path to file containing PEM encoded
+          CA certificates (trusted certificates used for verifying a peer
+          certificate).</p>
+      </item>
+      <item>
+        <p><c>{ciphers, string()}</c> String of ciphers as a colon
+          separated list of ciphers. The function <c>ciphers/0</c> can
+          be used to find all available ciphers.</p>
+      </item>
+    </list>
+    <p>The type <c>sslsocket()</c> is opaque to the user.
+      </p>
+    <p>The owner of a socket is the one that created it by a call to
+      <c>transport_accept/[1,2]</c>,  <c>connect/[3,4]</c>,
+      or <c>listen/2</c>.
+      </p>
+    <p>When a 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>
+    <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>
+    <p>A <c>Timeout</c> argument specifies a timeout in milliseconds. The 
+      default value for a <c>Timeout</c> argument is <c>infinity</c>.
+      </p>
+    <p>Functions listed below may return the value <c>{error, closed}</c>, which only indicates that the SSL socket is
+      considered closed for the operation in question. It is for
+      instance possible to have <c>{error, closed}</c> returned from
+      an call to <c>send/2</c>, and a subsequent call to <c>recv/3</c>
+      returning <c>{ok, Data}</c>.
+      </p>
+    <p>Hence a return value of <c>{error, closed}</c> must not be
+      interpreted as if the socket was completely closed. On the
+      contrary, in order to free all resources occupied by an SSL
+      socket, <c>close/1</c> must be called, or else the process owning
+      the socket has to terminate.
+      </p>
+    <p>For each SSL socket there is an Erlang process representing the
+      socket.  When a socket is opened, that process links to the
+      calling client process.  Implementations that want to detect
+      abnormal exits from the socket process by receiving <c>{'EXIT', Pid, Reason}</c> messages, should use the function <c>pid/1</c>
+      to retrieve the process identifier from the socket, in order to
+      be able to match exit messages properly.</p>
+  </section>
+  <funcs>
+    <func>
+      <name>ciphers() -> {ok, string()} | {error, enotstarted}</name>
+      <fsummary>Get supported ciphers.</fsummary>
+      <desc>
+        <p>Returns a string consisting of colon separated cipher
+          designations that are supported by the current SSL library
+          implementation.
+          </p>
+        <p>The SSL application has to be started to return the string
+          of ciphers.</p>
+      </desc>
+    </func>
+    <func>
+      <name>close(Socket) -> ok | {error, Reason}</name>
+      <fsummary>Close a socket returned by <c>transport_accept/[1,2]</c>, <c>connect/3/4</c>, or <c>listen/2</c>.</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+      </type>
+      <desc>
+	<p>Closes a socket returned by <c>transport_accept/[1,2]</c>,
+	<c>connect/[3,4]</c>, or <c>listen/2</c></p>
+      </desc>
+    </func>
+    <func>
+      <name>connect(Address, Port, Options) -> {ok, Socket} | {error, Reason}</name>
+      <name>connect(Address, Port, Options, Timeout) -> {ok, Socket} | {error, Reason}</name>
+      <fsummary>Connect to <c>Port</c>at <c>Address</c>.</fsummary>
+      <type>
+        <v>Address = address()</v>
+        <v>Port = integer()</v>
+        <v>Options = [connect_option()]</v>
+        <v>connect_option() = {mode, list} | {mode, binary} | binary | {packet, packettype()} | {header, integer()} | {nodelay, boolean()} | {active, activetype()} | {ip, ipaddress()} | {port, integer()} | {verify, code()} | {depth, depth()} | {certfile, path()} | {keyfile, path()} | {password, string()} | {cacertfile, path()} | {ciphers, string()}</v>
+        <v>Timeout = integer()</v>
+        <v>Socket = sslsocket()</v>
+      </type>
+      <desc>
+        <p>Connects to <c>Port</c> at <c>Address</c>. If the optional 
+          <c>Timeout</c> argument is specified, and a connection could not
+          be established within the given time, <c>{error, timeout}</c> is
+          returned. The default value for <c>Timeout</c> is <c>infinity</c>.
+          </p>
+        <p>The <c>ip</c> and <c>port</c> options are for binding to a 
+          particular <em>local</em> address and port, respectively.</p>
+      </desc>
+    </func>
+    <func>
+      <name>connection_info(Socket) -> {ok, {Protocol, Cipher}} | {error, Reason}</name>
+      <fsummary>Get current protocol version and cipher.</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+        <v>Protocol = protocol()</v>
+        <v>Cipher = string()</v>
+      </type>
+      <desc>
+        <p>Gets the chosen protocol version and cipher for an established
+          connection (accepted och connected). </p>
+      </desc>
+    </func>
+    <func>
+      <name>controlling_process(Socket, NewOwner) -> ok | {error, Reason}</name>
+      <fsummary>Assign a new controlling process to the socket.</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+        <v>NewOwner = pid()</v>
+      </type>
+      <desc>
+        <p>Assigns a new controlling process to <c>Socket</c>. A controlling
+          process is the owner of a socket, and receives all messages from
+          the socket.</p>
+      </desc>
+    </func>
+    <func>
+      <name>format_error(ErrorCode) -> string()</name>
+      <fsummary>Return an error string.</fsummary>
+      <type>
+        <v>ErrorCode = term()</v>
+      </type>
+      <desc>
+        <p>Returns a diagnostic string describing an error.</p>
+      </desc>
+    </func>
+    <func>
+      <name>getopts(Socket, OptionsTags) -> {ok, Options} | {error, Reason}</name>
+      <fsummary>Get options set for socket</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+        <v>OptionTags = [optiontag()]()</v>
+      </type>
+      <desc>
+        <p>Returns the options the tags of which are <c>OptionTags</c> for
+          for the socket <c>Socket</c>. </p>
+      </desc>
+    </func>
+    <func>
+      <name>listen(Port, Options) -> {ok, ListenSocket} | {error, Reason}</name>
+      <fsummary>Set up a socket to listen on a port on the local host.</fsummary>
+      <type>
+        <v>Port = integer()</v>
+        <v>Options = [listen_option()]</v>
+        <v>listen_option() = {mode, list} | {mode, binary} | binary | {packet, packettype()} | {header, integer()} | {active, activetype()} | {backlog, integer()} | {ip, ipaddress()} | {verify, code()} | {depth, depth()} | {certfile, path()} | {keyfile, path()} | {password, string()} | {cacertfile, path()} | {ciphers, string()}</v>
+        <v>ListenSocket = sslsocket()</v>
+      </type>
+      <desc>
+        <p>Sets up a socket to listen on port <c>Port</c> at the local host.
+          If <c>Port</c> is zero, <c>listen/2</c> picks an available port
+          number (use <c>port/1</c> to retrieve it).
+          </p>
+        <p>The listen queue size defaults to 5. If a different value is 
+          wanted, the option <c>{backlog, Size}</c> should be added to the 
+          list of options.
+          </p>
+        <p>An empty <c>Options</c> list is considered an error, and
+          <c>{error, enooptions}</c> is returned.
+          </p>
+        <p>The returned <c>ListenSocket</c> can only be used in calls to 
+          <c>transport_accept/[1,2]</c>.</p>
+      </desc>
+    </func>
+    <func>
+      <name>peercert(Socket) -> {ok, Cert} |  {error, Reason}</name>
+      <fsummary>Return the peer certificate.</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+        <v>Cert = binary()()</v>
+        <v>Subject = term()()</v>
+      </type>
+      <desc>
+	<p>Returns the DER encoded peer certificate, the certificate can be decoded with
+	  <c>public_key:pkix_decode_cert/2</c>.
+	</p>
+      </desc>
+    </func>
+    <func>
+      <name>peername(Socket) -> {ok, {Address, Port}} | {error, Reason}</name>
+      <fsummary>Return peer address and port.</fsummary>
+      <type>
+        <v>Socket = 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>pid(Socket) -> pid()</name>
+      <fsummary>Return the pid of the socket process.</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+      </type>
+      <desc>
+        <p>Returns the pid of the socket process. The returned pid should
+          only be used for receiving exit messages.</p>
+      </desc>
+    </func>
+    <func>
+      <name>recv(Socket, Length) -> {ok, Data} | {error, Reason}</name>
+      <name>recv(Socket, Length, Timeout) -> {ok, Data} | {error, Reason}</name>
+      <fsummary>Receive data on socket.</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+        <v>Length = integer() >= 0</v>
+        <v>Timeout = integer()</v>
+        <v>Data = bytes() | binary()</v>
+      </type>
+      <desc>
+        <p>Receives data on socket <c>Socket</c> when the socket is in
+          passive mode, i.e. when the option <c>{active, false}</c>
+          has been specified.
+          </p>
+        <p>A notable return value is <c>{error, closed}</c> which
+          indicates that the socket is closed.
+          </p>
+        <p>A positive value of the <c>Length</c> argument is only
+          valid when the socket is in raw mode (option <c>{packet, 0}</c> is set, and the option <c>binary</c> is <em>not</em>
+          set); otherwise it should be set to 0, whence all available
+          bytes are returned.
+          </p>
+        <p>If the optional <c>Timeout</c> parameter is specified, and
+          no data was available within the given time, <c>{error, timeout}</c> is returned. The default value for
+          <c>Timeout</c> is <c>infinity</c>.</p>
+      </desc>
+    </func>
+    <func>
+      <name>seed(Data) -> ok | {error, Reason}</name>
+      <fsummary>Seed the ssl random generator.</fsummary>
+      <type>
+        <v>Data = iolist() | binary()</v>
+      </type>
+      <desc>
+        <p>Seeds the ssl random generator.
+          </p>
+        <p>It is strongly advised to seed the random generator after
+          the ssl application has been started, and before any
+          connections are established. Although the port program
+          interfacing to the OpenSSL libraries does a "random" seeding
+          of its own in order to make everything work properly, that
+          seeding is by no means random for the world since it has a 
+          constant value which is known to everyone reading the source
+          code of the seeding. 
+          </p>
+        <p>A notable return value is <c>{error, edata}}</c> indicating that
+          <c>Data</c> was not a binary nor an iolist.</p>
+      </desc>
+    </func>
+    <func>
+      <name>send(Socket, Data) -> ok | {error, Reason}</name>
+      <fsummary>Write data to a socket.</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+        <v>Data = iolist() | binary()</v>
+      </type>
+      <desc>
+        <p>Writes <c>Data</c> to <c>Socket</c>. </p>
+        <p>A notable return value is <c>{error, closed}</c> indicating that
+          the socket is closed.</p>
+      </desc>
+    </func>
+    <func>
+      <name>setopts(Socket, Options) -> ok | {error, Reason}</name>
+      <fsummary>Set socket options.</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+        <v>Options = [socketoption]()</v>
+      </type>
+      <desc>
+        <p>Sets options according to <c>Options</c> for the socket 
+          <c>Socket</c>. </p>
+      </desc>
+    </func>
+    <func>
+      <name>ssl_accept(Socket) -> ok | {error, Reason}</name>
+      <name>ssl_accept(Socket, Timeout) -> ok | {error, Reason}</name>
+      <fsummary>Perform server-side SSL handshake and key exchange</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+        <v>Timeout = integer()</v>
+        <v>Reason = atom()</v>
+      </type>
+      <desc>
+        <p>The <c>ssl_accept</c> function establish the SSL connection
+          on the server side. It should be called directly after
+          <c>transport_accept</c>, in the spawned server-loop.</p>
+        <p>Note that the ssl connection is not complete until <c>ssl_accept</c>
+          has returned <c>true</c>, and if an error is returned, the socket
+          is unavailable and for instance <c>close/1</c> will crash.</p>
+      </desc>
+    </func>
+    <func>
+      <name>sockname(Socket) -> {ok, {Address, Port}} | {error, Reason}</name>
+      <fsummary>Return the local address and port.</fsummary>
+      <type>
+        <v>Socket = sslsocket()</v>
+        <v>Address = ipaddress()</v>
+        <v>Port = integer()</v>
+      </type>
+      <desc>
+        <p>Returns the local address and port number of the socket
+          <c>Socket</c>.</p>
+      </desc>
+    </func>
+    <func>
+      <name>transport_accept(Socket) -> {ok, NewSocket} | {error, Reason}</name>
+      <name>transport_accept(Socket, Timeout) -> {ok, NewSocket} | {error, Reason}</name>
+      <fsummary>Accept an incoming connection and prepare for <c>ssl_accept</c></fsummary>
+      <type>
+        <v>Socket = NewSocket = sslsocket()</v>
+        <v>Timeout = integer()</v>
+        <v>Reason = atom()</v>
+      </type>
+      <desc>
+        <p>Accepts an incoming connection request on a listen socket.
+          <c>ListenSocket</c> must be a socket returned from <c>listen/2</c>.
+          The socket returned should be passed to <c>ssl_accept</c> to
+          complete ssl handshaking and establishing the connection.</p>
+        <warning>
+          <p>The socket returned can only be used with <c>ssl_accept</c>,
+            no traffic can be sent or received before that call.</p>
+        </warning>
+        <p>The accepted socket inherits the options set for <c>ListenSocket</c>
+          in <c>listen/2</c>.</p>
+        <p>The default value for <c>Timeout</c> is <c>infinity</c>. If 
+          <c>Timeout</c> is specified, and no connection is accepted within
+          the given time, <c>{error, timeout}</c> is returned.</p>
+      </desc>
+    </func>
+    <func>
+      <name>version() -> {ok, {SSLVsn, CompVsn, LibVsn}}</name>
+      <fsummary>Return the version of SSL.</fsummary>
+      <type>
+        <v>SSLVsn = CompVsn = LibVsn = string()()</v>
+      </type>
+      <desc>
+        <p>Returns the SSL application version (<c>SSLVsn</c>), the library
+          version used when compiling the SSL application port program
+          (<c>CompVsn</c>), and the actual library version used when
+          dynamically linking in runtime (<c>LibVsn</c>).
+          </p>
+        <p>If the SSL application has not been started, <c>CompVsn</c> and
+          <c>LibVsn</c> are empty strings.
+          </p>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <title>ERRORS</title>
+    <p>The possible error reasons and the corresponding diagnostic strings 
+      returned by <c>format_error/1</c> are either the same as those defined
+      in the <c>inet(3)</c> reference manual, or as follows:
+      </p>
+    <taglist>
+      <tag><c>closed</c></tag>
+      <item>
+        <p>Connection closed for the operation in question.
+          </p>
+      </item>
+      <tag><c>ebadsocket</c></tag>
+      <item>
+        <p>Connection not found (internal error).
+          </p>
+      </item>
+      <tag><c>ebadstate</c></tag>
+      <item>
+        <p>Connection not in connect state (internal error).
+          </p>
+      </item>
+      <tag><c>ebrokertype</c></tag>
+      <item>
+        <p>Wrong broker type (internal error).
+          </p>
+      </item>
+      <tag><c>ecacertfile</c></tag>
+      <item>
+        <p>Own CA certificate file is invalid.
+          </p>
+      </item>
+      <tag><c>ecertfile</c></tag>
+      <item>
+        <p>Own certificate file is invalid.
+          </p>
+      </item>
+      <tag><c>echaintoolong</c></tag>
+      <item>
+        <p>The chain of certificates provided by peer is too long.
+          </p>
+      </item>
+      <tag><c>ecipher</c></tag>
+      <item>
+        <p>Own list of specified ciphers is invalid.
+          </p>
+      </item>
+      <tag><c>ekeyfile</c></tag>
+      <item>
+        <p>Own private key file is invalid.
+          </p>
+      </item>
+      <tag><c>ekeymismatch</c></tag>
+      <item>
+        <p>Own private key does not match own certificate.
+          </p>
+      </item>
+      <tag><c>enoissuercert</c></tag>
+      <item>
+        <p>Cannot find certificate of issuer of certificate provided
+          by peer.
+          </p>
+      </item>
+      <tag><c>enoservercert</c></tag>
+      <item>
+        <p>Attempt to do accept without having set own certificate.
+          </p>
+      </item>
+      <tag><c>enotlistener</c></tag>
+      <item>
+        <p>Attempt to accept on a non-listening socket.
+          </p>
+      </item>
+      <tag><c>enoproxysocket</c></tag>
+      <item>
+        <p>No proxy socket found (internal error).
+          </p>
+      </item>
+      <tag><c>enooptions</c></tag>
+      <item>
+        <p>The list of options is empty.
+          </p>
+      </item>
+      <tag><c>enotstarted</c></tag>
+      <item>
+        <p>The SSL application has not been started.
+          </p>
+      </item>
+      <tag><c>eoptions</c></tag>
+      <item>
+        <p>Invalid list of options.
+          </p>
+      </item>
+      <tag><c>epeercert</c></tag>
+      <item>
+        <p>Certificate provided by peer is in error.
+          </p>
+      </item>
+      <tag><c>epeercertexpired</c></tag>
+      <item>
+        <p>Certificate provided by peer has expired.
+          </p>
+      </item>
+      <tag><c>epeercertinvalid</c></tag>
+      <item>
+        <p>Certificate provided by peer is invalid.
+          </p>
+      </item>
+      <tag><c>eselfsignedcert</c></tag>
+      <item>
+        <p>Certificate provided by peer is self signed.
+          </p>
+      </item>
+      <tag><c>esslaccept</c></tag>
+      <item>
+        <p>Server SSL handshake procedure between client and server failed.
+          </p>
+      </item>
+      <tag><c>esslconnect</c></tag>
+      <item>
+        <p>Client SSL handshake procedure between client and server failed.
+          </p>
+      </item>
+      <tag><c>esslerrssl</c></tag>
+      <item>
+        <p>SSL protocol failure. Typically because of a fatal alert 
+          from peer.
+          </p>
+      </item>
+      <tag><c>ewantconnect</c></tag>
+      <item>
+        <p>Protocol wants to connect, which is not supported in
+          this version of the SSL application.
+          </p>
+      </item>
+      <tag><c>ex509lookup</c></tag>
+      <item>
+        <p>Protocol wants X.509 lookup, which is not supported in
+          this version of the SSL application.
+          </p>
+      </item>
+      <tag><c>{badcall, Call}</c></tag>
+      <item>
+        <p>Call not recognized for current mode (active or passive) and
+          state of socket.
+          </p>
+      </item>
+      <tag><c>{badcast, Cast}</c></tag>
+      <item>
+        <p>Call not recognized for current mode (active or passive) and
+          state of socket. 
+          </p>
+      </item>
+      <tag><c>{badinfo, Info}</c></tag>
+      <item>
+        <p>Call not recognized for current mode (active or passive) and
+          state of socket.
+          </p>
+      </item>
+    </taglist>
+  </section>
+
+  <section>
+    <title>SEE ALSO</title>
+    <p>gen_tcp(3), inet(3) public_key(3) </p>
+  </section>
+  
+</erlref>
+
+
diff --git a/lib/ssl/doc/src/refman.xml b/lib/ssl/doc/src/refman.xml
index 3ad5a01b46..68f84660f3 100644
--- a/lib/ssl/doc/src/refman.xml
+++ b/lib/ssl/doc/src/refman.xml
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>SSL Reference Manual</title>
@@ -45,7 +45,8 @@
   </description>
   <xi:include href="ssl_app.xml"/>
   <xi:include href="ssl.xml"/>
-  <xi:include href="new_ssl.xml"/>  
+  <xi:include href="old_ssl.xml"/>
+  <xi:include href="ssl_session_cache_api.xml"/>
 </application>
 
 
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 217eb791d0..daf7b77527 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,355 +13,513 @@
       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>
 
+    </legalnotice>
     <title>ssl</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <responsible>Peter H&ouml;gfeldt</responsible>
-    <docno></docno>
-    <approved>Peter H&ouml;gfeldt</approved>
-    <checked></checked>
-    <date>2003-03-25</date>
-    <rev>D</rev>
-    <file>ssl.sgml</file>
+    <file>ssl.xml</file>
   </header>
   <module>ssl</module>
   <modulesummary>Interface Functions for Secure Socket Layer</modulesummary>
   <description>
-    <p>This module contains interface functions to the Secure Socket Layer.</p>
+    <p>This module contains interface functions to the Secure Socket
+      Layer. 
+    </p>
   </description>
+  
+  <section>
+    <title>SSL</title>
 
+    <list type="bulleted">
+      <item>ssl requires the crypto an public_key applications.</item>
+      <item>Supported SSL/TLS-versions are SSL-3.0 and TLS-1.0 </item>
+      <item>For security reasons sslv2 is not supported.</item>
+      <item>Ephemeral Diffie-Hellman cipher suites are supported
+      but not Diffie Hellman Certificates cipher suites.</item>
+      <item>Export cipher suites are not supported as the
+      U.S. lifted its export restrictions in early 2000.</item>
+      <item>CRL and policy certificate
+            extensions are not supported yet. </item>
+    </list>
+ 
+  </section>
+  
   <section>
-    <title>General</title>
+    <title>COMMON DATA TYPES</title>
+    <p>The following data types are used in the functions below:
+    </p>
+
+    <p><c>boolean() = true | false</c></p> 
+    
+    <p><c>property() = atom()</c></p>
+    
+    <p><c>option() = socketoption() | ssloption() | transportoption()</c></p>
+
+     <p><c>socketoption() = [{property(), term()}] - defaults to
+      [{mode,list},{packet, 0},{header, 0},{active, true}].
+    </c></p>
+
+    <p>For valid options
+      see <seealso marker="kernel:inet">inet(3) </seealso> and
+      <seealso marker="kernel:gen_tcp">gen_tcp(3) </seealso>.
+    </p>
+    
+    <p> <c>ssloption() = {verify, verify_type()} |
+      {verify_fun, {fun(), term()}} |
+      {fail_if_no_peer_cert, boolean()}
+      {depth, integer()} |
+      {cert, der_encoded()}| {certfile, path()} |
+      {key, der_encoded()} | {keyfile, path()} | {password, string()} |
+      {cacerts, [der_encoded()]} | {cacertfile, path()} |
+      |{dh, der_encoded()} | {dhfile, path()} | {ciphers, ciphers()} |
+      {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} | {reuse_session, fun()} 
+    </c></p>
 
-    <p>There is a new implementation of ssl available in 
-    this module but until it is 100 % complete, so that it can replace
-    the old implementation in all aspects it will be
-    described here <seealso marker="new_ssl"> new ssl API </seealso></p>
+    <p><c>transportoption() = {CallbackModule, DataTag, ClosedTag}
+	- defaults to {gen_tcp, tcp, tcp_closed}. Ssl may be
+	run over any reliable transport protocol that has
+	an equivalent API to gen_tcp's.</c></p>
+    
+    <p><c>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CallbackModule =
+	atom()</c>
+    </p> <p><c>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DataTag =
+	atom() - tag used in socket data message.</c></p>
+    <p><c>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ClosedTag = atom() - tag used in
+    socket close message.</c></p>
+
+    <p><c>verify_type() = verify_none | verify_peer</c></p>
+    
+    <p><c>path() = string() - representing a file path.</c></p>
+
+    <p><c>der_encoded() = binary() -Asn1 DER encoded entity as an erlang binary.</c></p>
+    
+    <p><c>host() = hostname() | ipaddress()</c></p>
+        
+    <p><c>hostname() = string()</c></p>
+    
+    <p><c>
+      ip_address() = {N1,N2,N3,N4}  % IPv4
+      | {K1,K2,K3,K4,K5,K6,K7,K8}  % IPv6    </c></p>
+
+    <p><c>sslsocket() - opaque to the user. </c></p>
+    
+    <p><c>protocol() = sslv3 | tlsv1 </c></p>
+    
+    <p><c>ciphers() = [ciphersuite()] | string() (according to old API)</c></p>
+    
+    <p><c>ciphersuite() =
+      {key_exchange(), cipher(), hash()}</c></p>
+    
+    <p><c>key_exchange() =  rsa | dhe_dss | dhe_rsa | dh_anon
+    </c></p>
+
+   <p><c>cipher() = rc4_128 | des_cbc | '3des_ede_cbc'
+      | aes_128_cbc | aes_256_cbc </c></p>
+
+   <p> <c>hash() = md5 | sha
+    </c></p>
+
+    <p><c>ssl_imp() = new | old - default is new.</c></p>
     
-    <p>The reader is advised to also read the <c>ssl(6)</c> manual page
-      describing the SSL application.
-      </p>
-    <warning>
-      <p>It is strongly advised to seed the random generator after
-        the ssl application has been started (see <c>seed/1</c>
-        below), and before any connections are established. Although
-        the port program interfacing to the ssl libraries does a
-        "random" seeding of its own in order to make everything work
-        properly, that seeding is by no means random for the world
-        since it has a constant value which is known to everyone
-        reading the source code of the port program.</p>
-    </warning>
   </section>
 
   <section>
-    <title>Common data types</title>
-    <p>The following datatypes are used in the functions below:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p><c>options() = [option()]</c></p>
-      </item>
-      <item>
-        <p><c>option() = socketoption() | ssloption()</c></p>
-      </item>
-      <item>
-        <p><c>socketoption() = {mode, list} | {mode, binary} |  binary | {packet, packettype()} | {header, integer()} | {nodelay, boolean()} | {active, activetype()} |  {backlog, integer()} | {ip, ipaddress()} | {port, integer()}</c></p>
-      </item>
-      <item>
-        <p><c>ssloption() = {verify, code()} | {depth, depth()} |  {certfile, path()} | {keyfile, path()} | {password, string()} | {cacertfile, path()} | {ciphers, string()}</c></p>
-      </item>
-      <item>
-        <p><c>packettype()</c>  (see inet(3))</p>
-      </item>
-      <item>
-        <p><c>activetype()</c>  (see inet(3))</p>
-      </item>
-      <item>
-        <p><c>reason() = atom() | {atom(), string()}</c></p>
-      </item>
-      <item>
-        <p><c>bytes() = [byte()]</c></p>
-      </item>
-      <item>
-        <p><c>string() = [byte()]</c></p>
-      </item>
-      <item>
-        <p><c>byte() = 0 | 1 | 2 | ... | 255</c></p>
-      </item>
-      <item>
-        <p><c>code() = 0 | 1 | 2</c></p>
-      </item>
-      <item>
-        <p><c>depth() = byte()</c></p>
-      </item>
-      <item>
-        <p><c>address() = hostname() | ipstring() | ipaddress()</c></p>
-      </item>
-      <item>
-        <p><c>ipaddress() = ipstring() | iptuple()</c></p>
+    <title>SSL OPTION DESCRIPTIONS - COMMON for SERVER and CLIENT</title>
+
+    <p>Options described here are options that are have the same
+    meaning in the client and the server.
+    </p>
+    
+    <taglist>
+
+      <tag>{cert, der_encoded()}</tag>
+      <item> The DER encoded users certificate. If this option
+      is supplied it will override the certfile option.</item>
+      
+      <tag>{certfile, path()}</tag>
+      <item>Path to a file containing the user's certificate.</item>
+      
+      <tag>{key, der_encoded()}</tag>
+      <item> The DER encoded users private key. If this option
+      is supplied it will override the keyfile option.</item>
+      
+      <tag>{keyfile, path()}</tag>
+      <item>Path to file containing user's
+      private PEM encoded key. As PEM-files may contain several
+      entries this option defaults to the same file as given by
+      certfile option.</item>
+
+      <tag>{password, string()}</tag>
+      <item>String containing the user's password.
+	Only used if the private keyfile is password protected.
       </item>
-      <item>
-        <p><c>hostname() = string()</c></p>
+
+      <tag>{cacerts, [der_encoded()]}</tag>
+      <item> The DER encoded trusted certificates. If this option
+      is supplied it will override the cacertfile option.</item>
+
+      <tag>{cacertfile, path()}</tag>
+      <item>Path to file containing PEM encoded
+      CA certificates (trusted certificates used for verifying a peer
+      certificate). May be omitted if you do not want to verify
+      the peer.</item>
+
+      <tag>{ciphers, ciphers()}</tag>
+      <item>The cipher suites that should be supported. The function
+      <c>cipher_suites/0</c> can be used to find all available
+      ciphers. Additionally some anonymous cipher suites ({dh_anon,
+      rc4_128, md5}, {dh_anon, des_cbc, sha}, {dh_anon,
+      '3des_ede_cbc', sha}, {dh_anon, aes_128_cbc, sha}, {dh_anon,
+      aes_256_cbc, sha}) are supported for testing purposes and will
+      only work if explicitly enabled by this option and they are supported/enabled
+      by the peer also.
       </item>
-      <item>
-        <p><c>ipstring() = string()</c></p>
+
+      <tag>{ssl_imp, ssl_imp()}</tag>
+      <item>Specify which ssl implementation you want to use. Defaults to
+      new.
       </item>
-      <item>
-        <p><c>iptuple() = {byte(), byte(), byte(), byte()}</c></p>
+
+      <tag>{secure_renegotiate, boolean()}</tag>
+      <item>Specifies if to reject renegotiation attempt that does
+      not live up to RFC 5746. By default secure_renegotiate is
+      set to false i.e. secure renegotiation will be used if possible
+      but it will fallback to unsecure renegotiation if the peer
+      does not support RFC 5746.
       </item>
-      <item>
-        <p><c>sslsocket()</c></p>
+
+      <tag>{depth, integer()}</tag>
+      <item>Specifies the maximum
+      verification depth, i.e. how far in a chain of certificates the
+      verification process can proceed before the verification is
+      considered to fail. Peer certificate = 0, CA certificate = 1,
+      higher level CA certificate = 2, etc.  The value 2 thus means
+      that a chain can at most contain peer cert, CA cert, next CA
+      cert, and an additional CA cert. The default value is 1.
       </item>
+
+      <tag>{verify_fun, {Verifyfun :: fun(), InitialUserState :: term()}}</tag>
       <item>
-        <p><c>protocol() = sslv2 | sslv3 | tlsv1</c></p>
+	<p>The verification fun should be defined as:</p>
+
+	<code>
+fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
+	     {extension, #'Extension'{}}, InitialUserState :: term()) ->
+	{valid, UserState :: term()} | {valid_peer, UserState :: term()} |
+	{fail, Reason :: term()} | {unknown, UserState :: term()}.
+	</code>
+
+	<p>The verify fun will be called during the X509-path
+	validation when an error or an extension unknown to the ssl
+	application is encountered. Additionally it will be called
+	when a certificate is considered valid by the path validation
+	to allow access to each certificate in the path to the user
+	application. Note that the it will differentiate between the
+	peer certificate and CA certificates by using valid_peer or
+	valid as the second argument to the verify fun.  See <seealso
+	marker="public_key:cert_records">the public_key User's
+	Guide</seealso> for definition of #'OTPCertificate'{} and
+	#'Extension'{}.</p>
+
+	<p>If the verify callback fun returns {fail, Reason}, the
+	verification process is immediately stopped and an alert is
+	sent to the peer and the TLS/SSL handshake is terminated. If
+	the verify callback fun returns {valid, UserState}, the
+	verification process is continued.  If the verify callback fun
+	always returns {valid, UserState}, the TLS/SSL handshake will
+	not be terminated with respect to verification failures and
+	the connection will be established. If called with an
+	extension unknown to the user application the return value
+	{unknown, UserState} should be used.</p>
+
+	<p>The default verify_fun option in verify_peer mode:</p>
+
+      <code>
+{fun(_,{bad_cert, _} = Reason, _) ->
+	 {fail, Reason};
+    (_,{extension, _}, UserState) ->
+	 {unknown, UserState};
+    (_, valid, UserState) ->
+	 {valid, UserState};
+    (_, valid_peer, UserState) ->
+         {valid, UserState}
+ end, []}
+      </code>
+
+      <p>The default verify_fun option in verify_none mode:</p>
+
+       <code>
+{fun(_,{bad_cert, _}, UserState) ->
+	 {valid, UserState};
+    (_,{extension, _}, UserState) ->
+	 {unknown, UserState};
+    (_, valid, UserState) ->
+	 {valid, UserState};
+    (_, valid_peer, UserState) ->
+         {valid, UserState}
+ end, []}
+      </code>
+
+<p>Possible path validation errors: </p>
+
+<p> {bad_cert, cert_expired}, {bad_cert, invalid_issuer}, {bad_cert, invalid_signature}, {bad_cert, unknown_ca}, {bad_cert, name_not_permitted}, {bad_cert, missing_basic_constraint}, {bad_cert, invalid_key_usage}</p>
       </item>
-      <item>
-        <p><c></c></p>
+
+    </taglist>
+
+  </section>
+
+   <section>
+    <title>SSL OPTION DESCRIPTIONS - CLIENT SIDE</title>
+
+    <p>Options described here are client specific or has a slightly different
+    meaning in the client than in the server.</p>
+
+    <taglist>
+      <tag>{verify, verify_type()}</tag>
+      <item> In verify_none mode the default behavior will be to
+      allow all x509-path validation errors. See also the verify_fun
+      option.
       </item>
-    </list>
-    <p>The socket option <c>{backlog, integer()}</c> is for
-      <c>listen/2</c> only, and the option <c>{port, integer()}</c>
-      is for <c>connect/3/4</c> only. 
-      </p>
-    <p>The following socket options are set by default: <c>{mode, list}</c>, <c>{packet, 0}</c>, <c>{header, 0}</c>, <c>{nodelay, false}</c>, <c>{active, true}</c>, <c>{backlog, 5}</c>,
-      <c>{ip, {0,0,0,0}}</c>, and <c>{port, 0}</c>.
-      </p>
-    <p>Note that the options <c>{mode, binary}</c> and <c>binary</c>
-      are equivalent. Similarly <c>{mode, list}</c> and the absence of
-      option <c>binary</c> are equivalent. 
-      </p>
-    <p>The ssl options are for setting specific SSL parameters as follows:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p><c>{verify, code()}</c> Specifies type of verification:
-          0 = do not verify peer; 1 = verify peer, 2 = verify peer,
-          fail if no peer certificate.  The default value is 0.
-          </p>
+      <tag>{reuse_sessions, boolean()}</tag>
+      <item>Specifies if client should try to reuse sessions
+      when possible.
       </item>
-      <item>
-        <p><c>{depth, depth()}</c> Specifies the maximum
-          verification depth, i.e. how far in a chain of certificates
-          the verification process can proceed before the verification
-          is considered to fail. 
-          </p>
-        <p>Peer certificate = 0, CA certificate = 1, higher level CA
-          certificate = 2, etc.  The value 2 thus means that a chain
-          can at most contain peer cert, CA cert, next CA cert, and an
-          additional CA cert.
-          </p>
-        <p>The default value is 1.
-          </p>
+
+    </taglist>
+  </section>
+
+  <section>
+    <title>SSL OPTION DESCRIPTIONS - SERVER SIDE</title>
+
+    <p>Options described here are server specific or has a slightly different
+    meaning in the server than in the client.</p>
+
+    <taglist>
+
+      <tag>{dh, der_encoded()}</tag>
+      <item>The DER encoded Diffie Hellman parameters. If this option
+      is supplied it will override the dhfile option.
       </item>
-      <item>
-        <p><c>{certfile, path()}</c> Path to a file containing the
-          user's certificate.
-          chain of PEM encoded certificates.</p>
+
+      <tag>{dhfile, path()}</tag>
+      <item>Path to file containing PEM encoded Diffie Hellman parameters,
+      for the server to use if a cipher suite using Diffie Hellman key exchange
+      is negotiated. If not specified default parameters will be used.
       </item>
-      <item>
-        <p><c>{keyfile, path()}</c> Path to file containing user's
-          private PEM encoded key.</p>
+
+      <tag>{verify, verify_type()}</tag>
+      <item>Servers only do the x509-path validation in verify_peer
+      mode, as it then will send a certificate request to the client
+      (this message is not sent if the verify option is verify_none)
+      and you may then also want to specify the option
+      fail_if_no_peer_cert.
       </item>
-      <item>
-        <p><c>{password, string()}</c> String containing the user's
-          password. Only used if the private keyfile is password protected.</p>
+
+      <tag>{fail_if_no_peer_cert, boolean()}</tag>
+      <item>Used together with {verify, verify_peer} by a ssl server.
+      If set to true, the server will fail if the client does not have
+      a certificate to send, i.e. sends a empty certificate, if set to
+      false it will only fail if the client sends a invalid
+      certificate (an empty certificate is considered valid).
       </item>
-      <item>
-        <p><c>{cacertfile, path()}</c> Path to file containing PEM encoded
-          CA certificates (trusted certificates used for verifying a peer
-          certificate).</p>
+
+      <tag>{reuse_sessions, boolean()}</tag>
+      <item>Specifies if the server should agree to reuse sessions
+      when the clients request to do so. See also the reuse_session
+      option.
       </item>
-      <item>
-        <p><c>{ciphers, string()}</c> String of ciphers as a colon
-          separated list of ciphers. The function <c>ciphers/0</c> can
-          be used to find all available ciphers.</p>
+
+      <tag>{reuse_session, fun(SuggestedSessionId,
+      PeerCert, Compression, CipherSuite) -> boolean()}</tag>
+      <item>Enables the ssl server to have a local policy
+      for deciding if a session should be reused or not,
+      only meaning full if <c>reuse_sessions</c> is set to true.
+      SuggestedSessionId is a binary(),  PeerCert is a DER encoded
+      certificate, Compression is an enumeration integer
+      and CipherSuite of type ciphersuite().      
       </item>
-    </list>
-    <p>The type <c>sslsocket()</c> is opaque to the user.
-      </p>
-    <p>The owner of a socket is the one that created it by a call to
-      <c>transport_accept/[1,2]</c>,  <c>connect/[3,4]</c>,
-      or <c>listen/2</c>.
-      </p>
-    <p>When a socket is in active mode (the default), data from the
+
+    </taglist>
+  </section>
+  
+  <section>
+    <title>General</title>
+      
+    <p>When a ssl 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>
+    </p>
     <list type="bulleted">
-      <item>
-        <p><c>{ssl, Socket, Data}</c></p>
+      <item>{ssl, Socket, Data}
       </item>
-      <item>
-        <p><c>{ssl_closed, Socket}</c></p>
+      <item>{ssl_closed, Socket}
       </item>
       <item>
-        <p><c>{ssl_error, Socket, Reason}</c></p>
+        {ssl_error, Socket, Reason}
       </item>
     </list>
+    
     <p>A <c>Timeout</c> argument specifies a timeout in milliseconds. The 
       default value for a <c>Timeout</c> argument is <c>infinity</c>.
-      </p>
-    <p>Functions listed below may return the value <c>{error, closed}</c>, which only indicates that the SSL socket is
-      considered closed for the operation in question. It is for
-      instance possible to have <c>{error, closed}</c> returned from
-      an call to <c>send/2</c>, and a subsequent call to <c>recv/3</c>
-      returning <c>{ok, Data}</c>.
-      </p>
-    <p>Hence a return value of <c>{error, closed}</c> must not be
-      interpreted as if the socket was completely closed. On the
-      contrary, in order to free all resources occupied by an SSL
-      socket, <c>close/1</c> must be called, or else the process owning
-      the socket has to terminate.
-      </p>
-    <p>For each SSL socket there is an Erlang process representing the
-      socket.  When a socket is opened, that process links to the
-      calling client process.  Implementations that want to detect
-      abnormal exits from the socket process by receiving <c>{'EXIT', Pid, Reason}</c> messages, should use the function <c>pid/1</c>
-      to retrieve the process identifier from the socket, in order to
-      be able to match exit messages properly.</p>
+    </p>
   </section>
+  
   <funcs>
     <func>
-      <name>ciphers() -> {ok, string()} | {error, enotstarted}</name>
-      <fsummary>Get supported ciphers.</fsummary>
-      <desc>
-        <p>Returns a string consisting of colon separated cipher
-          designations that are supported by the current SSL library
-          implementation.
-          </p>
-        <p>The SSL application has to be started to return the string
-          of ciphers.</p>
-      </desc>
+      <name>cipher_suites() -></name>
+      <name>cipher_suites(Type) -> ciphers()</name>
+      <fsummary> Returns a list of supported cipher suites</fsummary>
+      <type>
+        <v>Type = erlang | openssl</v>
+
+      </type>
+      <desc><p>Returns a list of supported cipher suites.
+	cipher_suites() is equivalent to cipher_suites(erlang).
+	Type openssl is provided for backwards compatibility with
+	old ssl that used openssl.
+	</p>
+    </desc>
     </func>
+    
     <func>
-      <name>close(Socket) -> ok | {error, Reason}</name>
-      <fsummary>Close a socket returned by <c>transport_accept/[1,2]</c>, <c>connect/3/4</c>, or <c>listen/2</c>.</fsummary>
+      <name>connect(Socket, SslOptions) -> </name>
+      <name>connect(Socket, SslOptions, Timeout) -> {ok, SslSocket}
+	| {error, Reason}</name>
+      <fsummary> Upgrades a gen_tcp, or
+	equivalent, connected socket to a ssl socket. </fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
+        <v>Socket = socket()</v>
+        <v>SslOptions = [ssloption()]</v>
+	<v>Timeout = integer() | infinity</v>
+	<v>SslSocket = sslsocket()</v>
+	<v>Reason = term()</v>
       </type>
-      <desc>
-	<p>Closes a socket returned by <c>transport_accept/[1,2]</c>,
-	<c>connect/[3,4]</c>, or <c>listen/2</c></p>
-      </desc>
+      <desc> <p>Upgrades a gen_tcp, or equivalent,
+	  connected socket to a ssl socket i.e. performs the
+	  client-side ssl handshake.</p>
+    </desc>
     </func>
+
     <func>
-      <name>connect(Address, Port, Options) -> {ok, Socket} | {error, Reason}</name>
-      <name>connect(Address, Port, Options, Timeout) -> {ok, Socket} | {error, Reason}</name>
-      <fsummary>Connect to <c>Port</c>at <c>Address</c>.</fsummary>
+      <name>connect(Host, Port, Options) -></name>
+      <name>connect(Host, Port, Options, Timeout) ->
+	  {ok, SslSocket} | {error, Reason}</name>
+      <fsummary>Opens an ssl connection to Host, Port. </fsummary>
       <type>
-        <v>Address = address()</v>
-        <v>Port = integer()</v>
-        <v>Options = [connect_option()]</v>
-        <v>connect_option() = {mode, list} | {mode, binary} | binary | {packet, packettype()} | {header, integer()} | {nodelay, boolean()} | {active, activetype()} | {ip, ipaddress()} | {port, integer()} | {verify, code()} | {depth, depth()} | {certfile, path()} | {keyfile, path()} | {password, string()} | {cacertfile, path()} | {ciphers, string()}</v>
-        <v>Timeout = integer()</v>
-        <v>Socket = sslsocket()</v>
+	  <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>Connects to <c>Port</c> at <c>Address</c>. If the optional 
-          <c>Timeout</c> argument is specified, and a connection could not
-          be established within the given time, <c>{error, timeout}</c> is
-          returned. The default value for <c>Timeout</c> is <c>infinity</c>.
-          </p>
-        <p>The <c>ip</c> and <c>port</c> options are for binding to a 
-          particular <em>local</em> address and port, respectively.</p>
-      </desc>
+      <desc> <p>Opens an ssl connection to Host, Port.</p> </desc>
     </func>
+
     <func>
-      <name>connection_info(Socket) -> {ok, {Protocol, Cipher}} | {error, Reason}</name>
-      <fsummary>Get current protocol version and cipher.</fsummary>
+      <name>close(SslSocket) -> ok | {error, Reason}</name>
+      <fsummary>Close a ssl connection</fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
-        <v>Protocol = protocol()</v>
-        <v>Cipher = string()</v>
+	  <v>SslSocket = sslsocket()</v>
+	  <v>Reason = term()</v>
       </type>
-      <desc>
-        <p>Gets the chosen protocol version and cipher for an established
-          connection (accepted och connected). </p>
+      <desc><p>Close a ssl connection.</p>
       </desc>
     </func>
+
     <func>
-      <name>controlling_process(Socket, NewOwner) -> ok | {error, Reason}</name>
-      <fsummary>Assign a new controlling process to the socket.</fsummary>
+      <name>controlling_process(SslSocket, NewOwner) ->
+	ok | {error, Reason}</name>
+      
+	<fsummary>Assigns a new controlling process to the
+	ssl-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 a ssl-socket, and receives
+      all messages from the socket.</p>
+      </desc>
+    </func>
+
+    <func>
+	<name>connection_info(SslSocket) ->
+	  {ok, {ProtocolVersion, CipherSuite}} |  {error, Reason} </name>
+      <fsummary>Returns the negotiated protocol version and cipher suite.
+      </fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
-        <v>NewOwner = pid()</v>
+        <v>CipherSuite = ciphersuite()</v>
+        <v>ProtocolVersion = protocol()</v>
       </type>
-      <desc>
-        <p>Assigns a new controlling process to <c>Socket</c>. A controlling
-          process is the owner of a socket, and receives all messages from
-          the socket.</p>
+      <desc><p>Returns the negotiated protocol version and cipher suite.</p> 
       </desc>
     </func>
-    <func>
-      <name>format_error(ErrorCode) -> string()</name>
+
+     <func>
+      <name>format_error(Reason) -> string()</name>
       <fsummary>Return an error string.</fsummary>
       <type>
-        <v>ErrorCode = term()</v>
+        <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Returns a diagnostic string describing an error.</p>
+        <p>Presents the error returned by an ssl function as a printable string.</p>
       </desc>
     </func>
+   
     <func>
-      <name>getopts(Socket, OptionsTags) -> {ok, Options} | {error, Reason}</name>
-      <fsummary>Get options set for socket</fsummary>
+      <name>getopts(Socket) -> </name>
+      <name>getopts(Socket, OptionNames) ->
+	{ok, [socketoption()]} | {error, Reason}</name>
+      <fsummary>Get the value of the specified options.</fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
-        <v>OptionTags = [optiontag()]()</v>
+	<v>Socket = sslsocket()</v>
+	<v>OptionNames = [property()]</v>
       </type>
       <desc>
-        <p>Returns the options the tags of which are <c>OptionTags</c> for
-          for the socket <c>Socket</c>. </p>
+	<p>Get the value of the specified socket options, if no
+	  options are specified all options are returned.
+	</p>
       </desc>
     </func>
+
     <func>
-      <name>listen(Port, Options) -> {ok, ListenSocket} | {error, Reason}</name>
-      <fsummary>Set up a socket to listen on a port on the local host.</fsummary>
+      <name>listen(Port, Options) ->
+	{ok, ListenSocket} | {error, Reason}</name>
+      <fsummary>Creates a ssl listen socket.</fsummary>
       <type>
-        <v>Port = integer()</v>
-        <v>Options = [listen_option()]</v>
-        <v>listen_option() = {mode, list} | {mode, binary} | binary | {packet, packettype()} | {header, integer()} | {active, activetype()} | {backlog, integer()} | {ip, ipaddress()} | {verify, code()} | {depth, depth()} | {certfile, path()} | {keyfile, path()} | {password, string()} | {cacertfile, path()} | {ciphers, string()}</v>
-        <v>ListenSocket = sslsocket()</v>
+	<v>Port = integer()</v>
+	<v>Options = options()</v>
+	<v>ListenSocket = sslsocket()</v>
       </type>
       <desc>
-        <p>Sets up a socket to listen on port <c>Port</c> at the local host.
-          If <c>Port</c> is zero, <c>listen/2</c> picks an available port
-          number (use <c>port/1</c> to retrieve it).
-          </p>
-        <p>The listen queue size defaults to 5. If a different value is 
-          wanted, the option <c>{backlog, Size}</c> should be added to the 
-          list of options.
-          </p>
-        <p>An empty <c>Options</c> list is considered an error, and
-          <c>{error, enooptions}</c> is returned.
-          </p>
-        <p>The returned <c>ListenSocket</c> can only be used in calls to 
-          <c>transport_accept/[1,2]</c>.</p>
+	<p>Creates a ssl listen socket.</p>
       </desc>
     </func>
+
     <func>
-      <name>peercert(Socket) -> {ok, Cert} |  {error, Reason}</name>
+      <name>peercert(Socket) -> {ok, Cert} | {error, Reason}</name>
       <fsummary>Return the peer certificate.</fsummary>
-      <type>
+     <type>
         <v>Socket = sslsocket()</v>
-        <v>Cert = binary()()</v>
-        <v>Subject = term()()</v>
+        <v>Cert = binary()</v>
       </type>
       <desc>
-	<p>Returns the DER encoded peer certificate, the certificate can be decoded with
-	  <c>public_key:pkix_decode_cert/2</c>.
-	</p>
+        <p>The peer certificate is returned as a DER encoded binary.
+	  The certificate can be decoded with <c>public_key:pkix_decode_cert/2</c>.
+        </p>
       </desc>
     </func>
     <func>
-      <name>peername(Socket) -> {ok, {Address, Port}} | {error, Reason}</name>
+      <name>peername(Socket) -> {ok, {Address, Port}} |
+	{error, Reason}</name>
       <fsummary>Return peer address and port.</fsummary>
       <type>
         <v>Socket = sslsocket()</v>
@@ -372,67 +530,47 @@
         <p>Returns the address and port number of the peer.</p>
       </desc>
     </func>
+    
     <func>
-      <name>pid(Socket) -> pid()</name>
-      <fsummary>Return the pid of the socket process.</fsummary>
-      <type>
-        <v>Socket = sslsocket()</v>
-      </type>
-      <desc>
-        <p>Returns the pid of the socket process. The returned pid should
-          only be used for receiving exit messages.</p>
-      </desc>
-    </func>
-    <func>
-      <name>recv(Socket, Length) -> {ok, Data} | {error, Reason}</name>
-      <name>recv(Socket, Length, Timeout) -> {ok, Data} | {error, Reason}</name>
-      <fsummary>Receive data on socket.</fsummary>
+      <name>recv(Socket, Length) -> </name>
+      <name>recv(Socket, Length, Timeout) -> {ok, Data} | {error,
+	Reason}</name>
+      <fsummary>Receive data on a socket.</fsummary>
       <type>
         <v>Socket = sslsocket()</v>
-        <v>Length = integer() >= 0</v>
+        <v>Length = integer()</v>
         <v>Timeout = integer()</v>
-        <v>Data = bytes() | binary()</v>
+        <v>Data = [char()] | binary()</v>
       </type>
       <desc>
-        <p>Receives data on socket <c>Socket</c> when the socket is in
-          passive mode, i.e. when the option <c>{active, false}</c>
-          has been specified.
-          </p>
-        <p>A notable return value is <c>{error, closed}</c> which
-          indicates that the socket is closed.
-          </p>
-        <p>A positive value of the <c>Length</c> argument is only
-          valid when the socket is in raw mode (option <c>{packet, 0}</c> is set, and the option <c>binary</c> is <em>not</em>
-          set); otherwise it should be set to 0, whence all available
-          bytes are returned.
-          </p>
-        <p>If the optional <c>Timeout</c> parameter is specified, and
-          no data was available within the given time, <c>{error, timeout}</c> is returned. The default value for
-          <c>Timeout</c> is <c>infinity</c>.</p>
+        <p>This function receives a packet from a socket in passive
+          mode. A closed socket is indicated by a return value
+          <c>{error, closed}</c>.</p>
+        <p>The <c>Length</c> argument is only meaningful when
+          the socket is in <c>raw</c> mode and denotes the number of
+          bytes to read. If <c>Length</c> = 0, all available bytes are
+          returned. If <c>Length</c> &gt; 0, exactly <c>Length</c>
+          bytes are returned, or an error; possibly discarding less
+          than <c>Length</c> bytes of data when the socket gets closed
+          from the other side.</p>
+        <p>The optional <c>Timeout</c> parameter specifies a timeout in
+          milliseconds. The default value is <c>infinity</c>.</p>
       </desc>
     </func>
+    
     <func>
-      <name>seed(Data) -> ok | {error, Reason}</name>
-      <fsummary>Seed the ssl random generator.</fsummary>
+      <name>renegotiate(Socket) -> ok | {error, Reason}</name>
+      <fsummary> Initiates a new handshake.</fsummary>
       <type>
-        <v>Data = iolist() | binary()</v>
+	<v>Socket = sslsocket()</v>
       </type>
-      <desc>
-        <p>Seeds the ssl random generator.
-          </p>
-        <p>It is strongly advised to seed the random generator after
-          the ssl application has been started, and before any
-          connections are established. Although the port program
-          interfacing to the OpenSSL libraries does a "random" seeding
-          of its own in order to make everything work properly, that
-          seeding is by no means random for the world since it has a 
-          constant value which is known to everyone reading the source
-          code of the seeding. 
-          </p>
-        <p>A notable return value is <c>{error, edata}}</c> indicating that
-          <c>Data</c> was not a binary nor an iolist.</p>
+      <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
+      is still active using the previously negotiated session.</p>
       </desc>
     </func>
+    
     <func>
       <name>send(Socket, Data) -> ok | {error, Reason}</name>
       <fsummary>Write data to a socket.</fsummary>
@@ -458,26 +596,65 @@
           <c>Socket</c>. </p>
       </desc>
     </func>
+
     <func>
-      <name>ssl_accept(Socket) -> ok | {error, Reason}</name>
-      <name>ssl_accept(Socket, Timeout) -> ok | {error, Reason}</name>
-      <fsummary>Perform server-side SSL handshake and key exchange</fsummary>
+      <name>shutdown(Socket, How) -> ok | {error, Reason}</name>
+      <fsummary>Immediately close a socket</fsummary>
       <type>
         <v>Socket = sslsocket()</v>
+        <v>How = read | write | read_write</v>
+        <v>Reason = reason()</v>
+      </type>
+      <desc>
+        <p>Immediately close a socket in one or two directions.</p>
+        <p><c>How == write</c> means closing the socket for writing,
+          reading from it is still possible.</p>
+        <p>To be able to handle that the peer has done a shutdown on
+          the write side, the <c>{exit_on_close, false}</c> option
+          is useful.</p>
+      </desc>
+    </func>
+    
+    <func>
+      <name>ssl_accept(ListenSocket) -> </name>
+      <name>ssl_accept(ListenSocket, Timeout) -> ok | {error, Reason}</name>
+      <fsummary>Perform server-side SSL handshake</fsummary>
+      <type>
+        <v>ListenSocket = sslsocket()</v>
         <v>Timeout = integer()</v>
-        <v>Reason = atom()</v>
+        <v>Reason = term()</v>
       </type>
       <desc>
         <p>The <c>ssl_accept</c> function establish the SSL connection
           on the server side. It should be called directly after
           <c>transport_accept</c>, in the spawned server-loop.</p>
-        <p>Note that the ssl connection is not complete until <c>ssl_accept</c>
-          has returned <c>true</c>, and if an error is returned, the socket
-          is unavailable and for instance <c>close/1</c> will crash.</p>
       </desc>
     </func>
+
+    <func>
+      <name>ssl_accept(ListenSocket, SslOptions) -> </name>
+      <name>ssl_accept(ListenSocket, SslOptions, Timeout) -> {ok, Socket} | {error, Reason}</name>
+      <fsummary>Perform server-side SSL handshake</fsummary>
+      <type>
+        <v>ListenSocket = socket()</v>
+	<v>SslOptions = ssloptions()</v>
+        <v>Timeout = integer()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p> Upgrades a gen_tcp, or
+	  equivalent, socket to a ssl socket i.e. performs the
+	ssl server-side handshake.</p>
+	<p><warning>Note that the listen socket should be in {active, false} mode
+	before telling the client that the server is ready to upgrade
+	and calling this function, otherwise the upgrade may
+	or may not succeed depending on timing.</warning></p>
+      </desc>
+    </func>
+    
     <func>
-      <name>sockname(Socket) -> {ok, {Address, Port}} | {error, Reason}</name>
+      <name>sockname(Socket) -> {ok, {Address, Port}} |
+	{error, Reason}</name>
       <fsummary>Return the local address and port.</fsummary>
       <type>
         <v>Socket = sslsocket()</v>
@@ -489,217 +666,84 @@
           <c>Socket</c>.</p>
       </desc>
     </func>
+    
+    <func>
+      <name>start() -> </name>
+      <name>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 temporary.
+          <seealso marker="kernel:application">application(3)</seealso></p>
+      </desc>
+    </func>
+    <func>
+      <name>stop() -> ok </name>
+      <fsummary>Stops the Ssl application.</fsummary>
+      <desc>
+        <p>Stops the Ssl application.
+          <seealso marker="kernel:application">application(3)</seealso></p>
+      </desc>
+    </func>
+
     <func>
-      <name>transport_accept(Socket) -> {ok, NewSocket} | {error, Reason}</name>
-      <name>transport_accept(Socket, Timeout) -> {ok, NewSocket} | {error, Reason}</name>
-      <fsummary>Accept an incoming connection and prepare for <c>ssl_accept</c></fsummary>
+      <name>transport_accept(Socket) -></name>
+      <name>transport_accept(Socket, Timeout) ->
+	{ok, NewSocket} | {error, Reason}</name>
+      <fsummary>Accept an incoming connection and
+	prepare for <c>ssl_accept</c></fsummary>
       <type>
         <v>Socket = NewSocket = sslsocket()</v>
         <v>Timeout = integer()</v>
-        <v>Reason = atom()</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 <c>listen/2</c>.
-          The socket returned should be passed to <c>ssl_accept</c> to
-          complete ssl handshaking and establishing the connection.</p>
+          <c>ListenSocket</c> must be a socket returned from
+          <c>listen/2</c>.  The socket returned should be passed to
+          <c>ssl_accept</c> to complete ssl handshaking and
+          establishing the connection.</p>
         <warning>
           <p>The socket returned can only be used with <c>ssl_accept</c>,
             no traffic can be sent or received before that call.</p>
         </warning>
-        <p>The accepted socket inherits the options set for <c>ListenSocket</c>
-          in <c>listen/2</c>.</p>
-        <p>The default value for <c>Timeout</c> is <c>infinity</c>. If 
-          <c>Timeout</c> is specified, and no connection is accepted within
-          the given time, <c>{error, timeout}</c> is returned.</p>
+        <p>The accepted socket inherits the options set for
+          <c>ListenSocket</c> in <c>listen/2</c>.</p>
+	<p>The default
+          value for <c>Timeout</c> is <c>infinity</c>. If
+          <c>Timeout</c> is specified, and no connection is accepted
+          within the given time, <c>{error, timeout}</c> is
+          returned.</p>
       </desc>
     </func>
+    
     <func>
-      <name>version() -> {ok, {SSLVsn, CompVsn, LibVsn}}</name>
-      <fsummary>Return the version of SSL.</fsummary>
+      <name>versions() ->
+	[{SslAppVer, SupportedSslVer, AvailableSslVsn}]</name>
+      <fsummary>Returns version information relevant for the
+	ssl application.</fsummary>
       <type>
-        <v>SSLVsn = CompVsn = LibVsn = string()()</v>
+	<v>SslAppVer = string()</v>
+      	<v>SupportedSslVer = [protocol()]</v>
+      	<v>AvailableSslVsn = [protocol()]</v>
       </type>
       <desc>
-        <p>Returns the SSL application version (<c>SSLVsn</c>), the library
-          version used when compiling the SSL application port program
-          (<c>CompVsn</c>), and the actual library version used when
-          dynamically linking in runtime (<c>LibVsn</c>).
-          </p>
-        <p>If the SSL application has not been started, <c>CompVsn</c> and
-          <c>LibVsn</c> are empty strings.
-          </p>
+	<p>
+	  Returns version information relevant for the
+	  ssl application.</p>
       </desc>
     </func>
-  </funcs>
-
-  <section>
-    <title>ERRORS</title>
-    <p>The possible error reasons and the corresponding diagnostic strings 
-      returned by <c>format_error/1</c> are either the same as those defined
-      in the <c>inet(3)</c> reference manual, or as follows:
-      </p>
-    <taglist>
-      <tag><c>closed</c></tag>
-      <item>
-        <p>Connection closed for the operation in question.
-          </p>
-      </item>
-      <tag><c>ebadsocket</c></tag>
-      <item>
-        <p>Connection not found (internal error).
-          </p>
-      </item>
-      <tag><c>ebadstate</c></tag>
-      <item>
-        <p>Connection not in connect state (internal error).
-          </p>
-      </item>
-      <tag><c>ebrokertype</c></tag>
-      <item>
-        <p>Wrong broker type (internal error).
-          </p>
-      </item>
-      <tag><c>ecacertfile</c></tag>
-      <item>
-        <p>Own CA certificate file is invalid.
-          </p>
-      </item>
-      <tag><c>ecertfile</c></tag>
-      <item>
-        <p>Own certificate file is invalid.
-          </p>
-      </item>
-      <tag><c>echaintoolong</c></tag>
-      <item>
-        <p>The chain of certificates provided by peer is too long.
-          </p>
-      </item>
-      <tag><c>ecipher</c></tag>
-      <item>
-        <p>Own list of specified ciphers is invalid.
-          </p>
-      </item>
-      <tag><c>ekeyfile</c></tag>
-      <item>
-        <p>Own private key file is invalid.
-          </p>
-      </item>
-      <tag><c>ekeymismatch</c></tag>
-      <item>
-        <p>Own private key does not match own certificate.
-          </p>
-      </item>
-      <tag><c>enoissuercert</c></tag>
-      <item>
-        <p>Cannot find certificate of issuer of certificate provided
-          by peer.
-          </p>
-      </item>
-      <tag><c>enoservercert</c></tag>
-      <item>
-        <p>Attempt to do accept without having set own certificate.
-          </p>
-      </item>
-      <tag><c>enotlistener</c></tag>
-      <item>
-        <p>Attempt to accept on a non-listening socket.
-          </p>
-      </item>
-      <tag><c>enoproxysocket</c></tag>
-      <item>
-        <p>No proxy socket found (internal error).
-          </p>
-      </item>
-      <tag><c>enooptions</c></tag>
-      <item>
-        <p>The list of options is empty.
-          </p>
-      </item>
-      <tag><c>enotstarted</c></tag>
-      <item>
-        <p>The SSL application has not been started.
-          </p>
-      </item>
-      <tag><c>eoptions</c></tag>
-      <item>
-        <p>Invalid list of options.
-          </p>
-      </item>
-      <tag><c>epeercert</c></tag>
-      <item>
-        <p>Certificate provided by peer is in error.
-          </p>
-      </item>
-      <tag><c>epeercertexpired</c></tag>
-      <item>
-        <p>Certificate provided by peer has expired.
-          </p>
-      </item>
-      <tag><c>epeercertinvalid</c></tag>
-      <item>
-        <p>Certificate provided by peer is invalid.
-          </p>
-      </item>
-      <tag><c>eselfsignedcert</c></tag>
-      <item>
-        <p>Certificate provided by peer is self signed.
-          </p>
-      </item>
-      <tag><c>esslaccept</c></tag>
-      <item>
-        <p>Server SSL handshake procedure between client and server failed.
-          </p>
-      </item>
-      <tag><c>esslconnect</c></tag>
-      <item>
-        <p>Client SSL handshake procedure between client and server failed.
-          </p>
-      </item>
-      <tag><c>esslerrssl</c></tag>
-      <item>
-        <p>SSL protocol failure. Typically because of a fatal alert 
-          from peer.
-          </p>
-      </item>
-      <tag><c>ewantconnect</c></tag>
-      <item>
-        <p>Protocol wants to connect, which is not supported in
-          this version of the SSL application.
-          </p>
-      </item>
-      <tag><c>ex509lookup</c></tag>
-      <item>
-        <p>Protocol wants X.509 lookup, which is not supported in
-          this version of the SSL application.
-          </p>
-      </item>
-      <tag><c>{badcall, Call}</c></tag>
-      <item>
-        <p>Call not recognized for current mode (active or passive) and
-          state of socket.
-          </p>
-      </item>
-      <tag><c>{badcast, Cast}</c></tag>
-      <item>
-        <p>Call not recognized for current mode (active or passive) and
-          state of socket. 
-          </p>
-      </item>
-      <tag><c>{badinfo, Info}</c></tag>
-      <item>
-        <p>Call not recognized for current mode (active or passive) and
-          state of socket.
-          </p>
-      </item>
-    </taglist>
-  </section>
-
+  </funcs> 
+      
   <section>
     <title>SEE ALSO</title>
-    <p>gen_tcp(3), inet(3) public_key(3) </p>
+    <p><seealso marker="kernel:inet">inet(3) </seealso> and 
+      <seealso marker="kernel:gen_tcp">gen_tcp(3) </seealso>
+    </p>
   </section>
-  
-</erlref>
 
+</erlref>
 
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index ae8bd87781..2ba6f48611 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,45 +13,20 @@
       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>ssl</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <responsible>Peter H&ouml;gfeldt</responsible>
-    <docno></docno>
-    <approved>Peter H&ouml;gfeldt</approved>
-    <checked>Peter H&ouml;gfeldt</checked>
-    <date>2005-03-10</date>
-    <rev>E</rev>
     <file>ssl_app.sgml</file>
   </header>
   <app>ssl</app>
-  <appsummary>The SSL Application</appsummary>
-  <description>
-    <p>The Secure Socket Layer (SSL) application provides secure
-      socket communication over TCP/IP.
-      </p>
-  </description>
-
-  <section>
-    <title>Warning</title>
-    <p>In previous versions of Erlang/OTP SSL it was advised, as a
-      work-around, to set the operating system environment variable
-      <c>SSL_CERT_FILE</c> to point at a file containing CA
-      certificates. That variable is no longer needed, and is not
-      recognised by Erlang/OTP SSL any more.
-      </p>
-    <p>However, the OpenSSL package does interpret that environment
-      variable. Hence a setting of that variable might have
-      unpredictable effects on the Erlang/OTP SSL application. It is
-      therefore adviced to not used that environment variable at all.</p>
-  </section>
+  <appsummary>The SSL application provides secure communication over
+  sockets.</appsummary>
 
   <section>
     <title>Environment</title>
@@ -61,115 +36,43 @@
       </p>
     <p>Note that the environment parameters can be set on the command line,
       for instance,</p>
-    <p><c>erl ... -ssl protocol_version '[sslv2,sslv3]' ...</c>.
+    <p><c>erl ... -ssl protocol_version '[sslv3, tlsv1]' ...</c>.
       </p>
     <taglist>
-      <tag><c><![CDATA[ephemeral_rsa = true | false <optional>]]></c></tag>
-      <item>
-        <p>Enables all SSL servers (those that listen and accept)
-          to use ephemeral RSA key generation when a clients connect with
-          weak handshake cipher specifications, that need equally weak
-          ciphers from the server (i.e. obsolete restrictions on export
-          ciphers).  Default is <c>false</c>.
-          </p>
-      </item>
-      <tag><c><![CDATA[debug = true | false <optional>]]></c></tag>
-      <item>
-        <p>Causes debug information to be written to standard
-          output. Default is <c>false</c>.
-          </p>
-      </item>
-      <tag><c><![CDATA[debugdir = path() | false <optional>]]></c></tag>
-      <item>
-        <p>Causes debug information output controlled by <c>debug</c>
-          and <c>msgdebug</c> to be printed to a file named 
-          <c><![CDATA[ssl_esock.<pid>.log]]></c> in the directory specified by
-          <c>debugdir</c>, where <c><![CDATA[<pid>]]></c> is the operating system
-          specific textual representation of the process identifier 
-          of the external port program of the SSL application. Default
-          is <c>false</c>, i.e. no log file is produced.
-          </p>
-      </item>
-      <tag><c><![CDATA[msgdebug = true | false <optional>]]></c></tag>
+      <tag><c><![CDATA[protocol_version = [sslv3|tlsv1] <optional>]]></c>.</tag>
       <item>
-        <p>Sets <c>debug = true</c> and causes also the contents
-          of low level messages to be printed to standard output.
-          Default is <c>false</c>.
-          </p>
+	<p>Protocol that will be supported by started clients and
+	servers. If this option is not set it will default to all
+	protocols currently supported by the erlang ssl application.
+	Note that this option may be overridden by the version option
+	to ssl:connect/[2,3] and ssl:listen/2.
+	</p>
       </item>
-      <tag><c><![CDATA[port_program = string() | false <optional>]]></c></tag>
-      <item>
-        <p>Name of port program. The default is <c>ssl_esock</c>.
-          </p>
-      </item>
-      <tag><c><![CDATA[protocol_version = [sslv2|sslv3|tlsv1] <optional>]]></c>.</tag>
+
+      <tag><c><![CDATA[session_lifetime = integer() <optional>]]></c></tag>
       <item>
-        <p>Name of protocols to use. If this option is not set, 
-          all protocols are assumed, i.e. the default value is
-          <c>[sslv2, sslv3, tlsv1]</c>.
-          </p>
+	<p>The lifetime of session data in seconds. 
+	</p>
       </item>
-      <tag><c><![CDATA[proxylsport = integer() | false <optional>]]></c></tag>
+
+        <tag><c><![CDATA[session_cb = atom() <optional>]]></c></tag>
       <item>
-        <p>Define the port number of the listen port of the 
-          SSL port program. Almost never is this option needed.
+        <p>
+	  Name of session cache callback module that implements
+	  the ssl_session_cache_api behavior, defaults to
+	  ssl_session_cache.erl.
           </p>
       </item>
-      <tag><c><![CDATA[proxylsbacklog = integer() | false <optional>]]></c></tag>
+
+      <tag><c><![CDATA[session_cb_init_args = list() <optional>]]></c></tag>
       <item>
-        <p>Set the listen queue size of the listen port of the
-          SSL port program. The default is 128.
-          </p>
+	<p>
+	  List of arguments to the init function in session cache
+	  callback module, defaults to [].
+	</p>
       </item>
-    </taglist>
-  </section>
 
-  <section>
-    <title>OpenSSL libraries</title>
-    <p>The current implementation of the Erlang SSL application is
-      based on the <em>OpenSSL</em> package version 0.9.7 or higher.
-      There are source and binary releases on the web.
-      </p>
-    <p>Source releases of OpenSSL can be downloaded from the <url href="http://www.openssl.org">OpenSSL</url> project home page,
-      or mirror sites listed there.
-      </p>
-    <p>The same URL also contains links to some compiled binaries and
-      libraries of OpenSSL (see the <c>Related/Binaries</c> menu) of
-      which the <url href="http://www.shininglightpro.com/search.php?searchname=Win32+OpenSSL">Shining Light Productions Win32 and OpenSSL</url> pages are of
-      interest for the Win32 user.
-      </p>
-    <p>For some Unix flavours there are binary packages available
-      on the net. 
-      </p>
-    <p>If you cannot find a suitable binary OpenSSL package, you 
-      have to fetch an OpenSSL source release and compile it. 
-      </p>
-    <p>You then have to compile and install the libraries
-      <c>libcrypto.so</c> and <c>libssl.so</c> (Unix), or the
-      libraries <c>libeay32.dll</c> and <c>ssleay32.dll</c> (Win32).
-      </p>
-    <p>For Unix The <c>ssl_esock</c> port program is delivered linked
-      to OpenSSL libraries in <c>/usr/local/lib</c>, but the default
-      dynamic linking will also accept libraries in <c>/lib</c> and
-      <c>/usr/lib</c>.
-      </p>
-    <p>If that is not applicable to the particular Unix operating
-      system used, the example <c>Makefile</c> in the SSL
-      <c>priv/obj</c> directory, should be used as a guide to
-      relinking the final version of the port program.
-      </p>
-    <p>For <c>Win32</c> it is only required that the libraries can be
-      found from the <c>PATH</c> environment variable, or that they
-      reside in the appropriate <c>SYSTEM32</c> directory; hence no
-      particular relinking is need. Hence no example <c>Makefile</c>
-      for Win32 is provided.</p>
-  </section>
-
-  <section>
-    <title>Restrictions</title>
-    <p>Users must be aware of export restrictions and patent rights
-      concerning cryptographic software.
-      </p>
+    </taglist>
   </section>
 
   <section>
@@ -178,5 +81,3 @@
   </section>
   
 </appref>
-
-
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index c743cd67a3..7bcc12eb5f 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,7 +32,13 @@
     <file>ssl_distribution.xml</file>
   </header>
   <p>This chapter describes how the Erlang distribution can use 
-    SSL to get additional verification and security.</p>
+    SSL to get additional verification and security.
+
+    <note><p>Note this
+    documentation is written for the old ssl implementation and
+    will be updated for the new one once this functionality is
+    supported by the new implementation.</p></note>
+  </p>
 
   <section>
     <title>Introduction</title>
@@ -49,7 +55,7 @@
       all participating Erlang nodes in a distributed system must use
       this distribution module.</p>
     <p>The security depends on how the connections are set up, one can
-      use key files or certificates to just get a crypted
+      use key files or certificates to just get a encrypted
       connection. One can also make the SSL package verify the
       certificates of other nodes to get additional security. 
       Cookies are however always used as they can be used to
@@ -173,7 +179,7 @@ Eshell V5.0  (abort with ^G)
       <c>certfile</c> can (and usually needs to) be specified as
       <c>client_certfile</c> and <c>server_certfile</c>. The
       <c>client_certfile</c> is used when the distribution initiates a
-      connection to another node and the <c>server_cerfile</c> is used
+      connection to another node and the <c>server_certfile</c> is used
       when accepting a connection from a remote node. </p>
     <p>The command line argument for specifying the SSL options is named 
       <c>-ssl_dist_opt</c> and should be followed by an even number of
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml
index 3dc2332795..6936408881 100644
--- a/lib/ssl/doc/src/ssl_protocol.xml
+++ b/lib/ssl/doc/src/ssl_protocol.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,337 +13,138 @@
       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>The SSL Protocol</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>2003-04-28</date>
-    <rev>PA2</rev>
+    <title>Transport Layer Security (TLS) and its predecessor, Secure Socket Layer (SSL)</title>
     <file>ssl_protocol.xml</file>
   </header>
-  <p>Here we provide a short introduction to the SSL protocol. We only
-    consider those part of the protocol that are important from a
-    programming point of view.
-    </p>
-  <p>For a very good general introduction to SSL and TLS see the book
-    <cite id="rescorla"></cite>.
-    </p>
-  <p><em>Outline:</em></p>
-  <list type="bulleted">
-    <item>Two types of connections - connection: handshake, data transfer, and
-     shutdown - 
-     SSL/TLS protocol - server must have certificate - what the the
-     server sends to the client - client may verify the server -
-     server may ask client for certificate - what the client sends to
-     the server - server may then verify the client - verification -
-     certificate chains - root certificates - public keys - key
-     agreement - purpose of certificate - references</item>
-  </list>
+  
+  <p>The erlang ssl application currently supports SSL 3.0 and TLS 1.0
+  RFC 2246, and will in the future also support later versions of TLS.
+  SSL 2.0 is not supported.
+  </p>
 
-  <section>
-    <title>SSL Connections</title>
-    <p>The SSL protocol is implemented on top of the TCP/IP protocol.
-      From an endpoint view it also has the same type of connections
-      as that protocol, almost always created by calls to socket
-      interface functions <em>listen</em>, <em>accept</em> and
-      <em>connect</em>. The endpoints are <em>servers</em> and
-      <em>clients</em>.
-      </p>
-    <p>A <em>server</em><em>listen</em>s for connections on a
-      specific address and port. This is done once. The server then
-      <em>accept</em>s each connections on that same address and
-      port. This is typically done indefinitely many times.
-      </p>
-    <p>A <em>client</em> connects to a server on a specific address 
-      and port. For each purpose this is done once.
-      </p>
-    <p>For a plain TCP/IP connection the establishment of a connection
-      (through an accept or a connect) is followed by data transfer between
-      the client and server, finally ended by a connection close. 
-      </p>
-    <p>An SSL connection also consists of data transfer and connection
-      close, However, the data transfer contains encrypted data, and
-      in order to establish the encryption parameters, the data
-      transfer is preceded by an SSL <em>handshake</em>. In this
-      handshake the server plays a dominant role, and the main
-      instrument used in achieving a valid SSL connection is the
-      server's <em>certificate</em>. We consider certificates in the
-      next section, and the SSL handshake in a subsequent section.</p>
-  </section>
+  <p>By default erlang ssl is run over the TCP/IP protocol even
+  though you could plug in an other reliable transport protocol
+  with the same API as gen_tcp.</p>
+  
+  <p>If a client and server wants to use an upgrade mechanism, such as
+  defined by RFC2817, to upgrade a regular TCP/IP connection to a ssl
+  connection the erlang ssl API supports this. This can be useful for
+  things such as supporting HTTP and HTTPS on the same port and
+  implementing virtual hosting.
+  </p>
 
   <section>
-    <title>Certificates</title>
-    <p>A certificate is similar to a driver's license, or a
-      passport. The holder of the certificate is called the
-      <em>subject</em>.  First of all the certificate identifies the
-      subject in terms of the name of the subject, its postal address,
-      country name, company name (if applicable), etc.
-      </p>
-    <p>Although a driver's license is always issued by a well-known and
-      distinct authority, a certificate may have an <em>issuer</em>
-      that is not so well-known. Therefore a certificate also always
-      contains information on the issuer of the certificate. That
-      information is of the same type as the information on the
-      subject. The issuer of a certificate also signs the certificate
-      with a <em>digital signature</em> (the signature is an inherent
-      part of the certificate), which allow others to verify that the
-      issuer really is the issuer of the certificate.
-      </p>
-    <p>Now that a certificate can be checked by verifying the
-      signature of the issuer, the question is how to trust the
-      issuer. The answer to this question is to require that there is
-      a certificate for the issuer as well. That issuer has in turn an
-      issuer, which must also have a certificate, and so on. This
-      <em>certificate chain</em> has to have en end, which then must
-      be a certificate that is trusted by other means. We shall cover
-      this problem of <em>authentication</em> in a subsequent
-      section.
-      </p>
+    <title>Security overview</title>
+      
+   <p>To achieve authentication and privacy the client and server will
+    perform a TLS Handshake procedure before transmitting or receiving
+    any data. During the handshake they agree on a protocol version and
+    cryptographic algorithms, they generate shared secrets using public
+    key cryptographics and optionally authenticate each other with
+    digital certificates.</p>
   </section>
-
+  
   <section>
-    <title>Encryption Algorithms</title>
-    <p>An encryption algorithm is a mathematical algorithm for
-      encryption and decryption of messages (arrays of bytes,
-      say). The algorithm as such is always required to be publicly
-      known, otherwise its strength cannot be evaluated, and hence it
-      cannot be used reliably. The secrecy of an encrypted message is
-      not achieved by the secrecy of the algorithm used, but by the
-      secrecy of the <em>keys</em> used as input to the encryption and
-      decryption algorithms. For an account of cryptography in general
-      see <cite id="schneier"></cite>.
-      </p>
-    <p>There are two classes of encryption algorithms: <em>symmetric key</em> algorithms and <em>public key</em> algorithms.  Both
-      types of algorithms are used in the SSL protocol.
-      </p>
-    <p>In the sequel we assume holders of keys keep them secret (except
-      public keys) and that they in that sense are trusted. How a 
-      holder of a secret key is proved to be the one it claims to be
-      is a question of <em>authentication</em>, which, in the context
-      of the SSL protocol, is described in a section further below.
-      </p>
-
-    <section>
-      <title>Symmetric Key Algorithms</title>
-      <p>A <em>symmetric key</em> algorithm has one key only. The key
-        is used for both encryption and decryption. Obviously the key
-        of a symmetric key algorithm must always be kept secret by the
-        users of the key. DES is an example of a symmetric key
-        algorithm.
-        </p>
-      <p>Symmetric key algorithms are fast compared to public key
-        algorithms. They are therefore typically used for encrypting
-        bulk data.
-        </p>
-    </section>
-
-    <section>
-      <title>Public Key Algorithms</title>
-      <p>A <em>public key</em> algorithm has two keys. Any of the two
-        keys can be used for encryption. A message encrypted with one
-        of the keys, can only be decrypted with the other key. One of
-        the keys is public (known to the world), while the other key
-        is private (i.e. kept secret) by the owner of the two keys.
-        </p>
-      <p>RSA is an example of a public key algorithm.
-        </p>
-      <p>Public key algorithms are slow compared to symmetric key
-        algorithms, and they are therefore seldom used for bulk data
-        encryption. They are therefore only used in cases where the
-        fact that one key is public and the other is private, provides
-        features that cannot be provided by symmetric algorithms.
-        </p>
-    </section>
-
-    <section>
-      <title>Digital Signature Algorithms</title>
-      <p>An interesting feature of a public key algorithm is that its
-        public and private keys can both be used for encryption.
-        Anyone can use the public key to encrypt a message, and send
-        that message to the owner of the private key, and be sure of
-        that only the holder of the private key can decrypt the
-        message.
-        </p>
-      <p>On the other hand, the owner of the private key can encrypt a
-        message with the private key, thus obtaining an encrypted
-        message that can decrypted by anyone having the public key.
-        </p>
-      <p>The last approach can be used as a digital signature
-        algorithm.  The holder of the private key signs an array of
-        bytes by performing a specified well-known <em>message digest algorithm</em> to compute a hash of the array, encrypts the
-        hash value with its private key, an then presents the original
-        array, the name of the digest algorithm, and the encryption of
-        the hash value as a <em>signed array of bytes</em>.
-        </p>
-      <p>Now anyone having the public key, can decrypt the encrypted
-        hash value with that key, compute the hash with the specified
-        digest algorithm, and check that the hash values compare equal
-        in order to verify that the original array was indeed signed
-        by the holder of the private key.
-        </p>
-      <p>What we have accounted for so far is by no means all that can
-        be said about digital signatures (see <cite id="schneier"></cite>for
-        further details).
-        </p>
-    </section>
-
-    <section>
-      <title>Message Digests Algorithms</title>
-      <p>A message digest algorithm is a hash function that accepts 
-        an array bytes of arbitrary but finite length of input, and 
-        outputs an array of bytes of fixed length. Such an algorithm
-        is also required to be very hard to invert.  
-        </p>
-      <p>MD5 (16 bytes output) and SHA1 (20 bytes output) are examples
-        of message digest algorithms.
-        </p>
-    </section>
+    <title>Data Privacy and Integrity</title>
+    
+    <p>A <em>symmetric key</em> algorithm has one key only. The key is
+    used for both encryption and decryption. These algorithms are fast
+    compared to public key algorithms (using two keys, a public and a
+    private one) and are therefore typically used for encrypting bulk
+    data.
+    </p>
+    
+    <p>The keys for the symmetric encryption are generated uniquely
+    for each connection and are based on a secret negotiated
+    in the TLS handshake. </p>
+    
+   <p>The TLS handshake protocol and data transfer is run on top of
+    the TLS Record Protocol that uses a keyed-hash MAC (Message
+    Authenticity Code), or HMAC, to protect the message's data
+    integrity. From the TLS RFC "A Message Authentication Code is a
+    one-way hash computed from a message and some secret data. It is
+    difficult to forge without knowing the secret data. Its purpose is
+    to detect if the message has been altered."
+    </p>
+    
   </section>
 
-  <section>
-    <title>SSL Handshake</title>
-    <p>The main purpose of the handshake performed before an an SSL
-      connection is established is to negotiate the encryption
-      algorithm and key to be used for the bulk data transfer between
-      the client and the server. We are writing <em>the</em> key,
-      since the algorithm to choose for bulk encryption one of the
-      symmetric algorithms.
-      </p>
-    <p>There is thus only one key to agree upon, and obviously that
-      key has to be kept secret between the client and the server. To
-      obtain that the handshake has to be encrypted as well.
-      </p>
-    <p>The SSL protocol requires that the server always sends its
-      certificate to the client in the beginning of the handshake. The
-      client then retrieves the server's public key from the
-      certificate, which means that the client can use the server's
-      public key to encrypt messages to the server, and the server can
-      decrypt those messages with its private key. Similarly, the
-      server can encrypt messages to the client with its private key,
-      and the client can decrypt messages with the server's public
-      key. It is thus is with the server's public and private keys
-      that messages in the handshake are encrypted and decrypted, and
-      hence the key agreed upon for symmetric encryption of bulk data
-      can be kept secret (there are more things to consider to really
-      keep it secret, see <cite id="rescorla"></cite>).
-      </p>
-    <p>The above indicates that the server does not care who is
-      connecting, and that only the client has the possibility to
-      properly identify the server based on the server's certificate.
-      That is indeed true in the minimal use of the protocol, but it
-      is possible to instruct the server to request the certificate of
-      the client, in order to have a means to identify the client, but
-      it is by no means required to establish an SSL connection.
-      </p>
-    <p>If a server request the client certificate, it verifies, as a
-      part of the protocol, that the client really holds the private
-      key of the certificate by sending the client a string of bytes
-      to encrypt with its private key, which the server then decrypts
-      with the client's public key, the result of which is compared
-      with the original string of bytes (a similar procedure is always
-      performed by the client when it has received the server's
-      certificate).
-      </p>
-    <p>The way clients and servers <em>authenticate</em> each other,
-      i.e. proves that their respective peers are what they claim to
-      be, is the topic of the next section.
-      </p>
-  </section>
+   <section>
+     <title>Digital Certificates</title>
+     <p>A certificate is similar to a driver's license, or a
+     passport. The holder of the certificate is called the
+     <em>subject</em>. The certificate is signed 
+     with the private key of the issuer of the certificate. A chain
+     of trust is build by having the issuer in its turn being
+     certified by an other certificate and so on until you reach the
+     so called root certificate that is self signed i.e. issued
+     by itself.</p>
+     
+     <p>Certificates are issued by <em>certification
+     authorities</em> (<em>CA</em>s) only.  There are a handful of
+     top CAs in the world that issue root certificates. You can
+     examine the certificates of several of them by clicking
+     through the menus of your web browser.
+     </p>
+   </section>
+	   
+   <section>
+     <title>Authentication of Sender</title>
+      
+     <p>Authentication of the sender is done by public key path
+     validation as defined in RFC 3280. Simplified that means that
+     each certificate in the certificate chain is issued by the one
+     before, the certificates attributes are valid ones, and the
+     root cert is a trusted cert that is present in the trusted
+     certs database kept by the peer.</p>
+     
+     <p>The server will always send a certificate chain as part of
+     the TLS handshake, but the client will only send one if
+     the server requests it. If the client does not have
+     an appropriate certificate it may send an "empty" certificate
+     to the server.</p>
+     
+     <p>The client may choose to accept some path evaluation errors
+     for instance a web browser may ask the user if they want to
+     accept an unknown CA root certificate. The server, if it request
+     a certificate, will on the other hand not accept any path validation
+     errors. It is configurable if the server should accept
+     or reject an "empty" certificate as response to
+     a certificate request.</p>
+   </section>
+  
+   <section>
+     <title>TLS Sessions</title>
+     
+     <p>From the TLS RFC "A TLS session is an association between a
+     client and a server.  Sessions are created by the handshake
+     protocol. Sessions define a set of cryptographic security
+     parameters, which can be shared among multiple
+     connections. Sessions are used to avoid the expensive negotiation
+     of new security parameters for each connection."</p>
 
-  <section>
-    <title>Authentication</title>
-    <p>As we have already seen the reception of a certificate from a
-      peer is not enough to prove that the peer is authentic. More
-      certificates are needed, and we have to consider how certificates
-      are issued and on what grounds.
-      </p>
-    <p>Certificates are issued by <em>certification authorities</em>
-      (<em>CA</em>s) only. They issue certificates both for other CAs
-      and ordinary users (which are not CAs). 
-      </p>
-    <p>Certain CAs are <em>top CAs</em>, i.e. they do not have a
-      certificate issued by another CA. Instead they issue their own
-      certificate, where the subject and issuer part of the
-      certificate are identical (such a certificate is called a
-      self-signed certificate). A top CA has to be well-known, and has
-      to have a publicly available policy telling on what grounds it
-      issues certificates. 
-      </p>
-    <p>There are a handful of top CAs in the world. You can examine the
-      certificates of several of them by clicking through the menus of
-      your web browser. 
-      </p>
-    <p>A top CA typically issues certificates for other CAs, called
-      <em>intermediate CAs</em>, but possibly also to ordinary users. Thus
-      the certificates derivable from a top CA constitute a tree, where
-      the leaves of the tree are ordinary user certificates. 
-      </p>
-    <p>A <em>certificate chain</em> is an ordered sequence of
-      certificates, <c>C1, C2, ..., Cn</c>, say, where <c>C1</c> is a
-      top CA certificate, and where <c>Cn</c> is an ordinary user
-      certificate, and where the holder of <c>C1</c> is the issuer of
-      <c>C2</c>, the holder of <c>C2</c> is the issuer of <c>C3</c>,
-      ..., and the holder of <c>Cn-1</c> is the issuer of <c>Cn</c>,
-      the ordinary user certificate. The holders of <c>C2, C3, ..., Cn-1</c> are then intermediate CAs.
-      </p>
-    <p>Now to verify that a certificate chain is unbroken we have to
-      take the public key from each certificate <c>Ck</c>, and apply
-      that key to decrypt the signature of certificate <c>Ck-1</c>,
-      thus obtaining the message digest computed by the holder of the
-      <c>Ck</c> certificate, compute the real message digest of the
-      <c>Ck-1</c> certificate and compare the results. If they compare
-      equal the link of the chain between <c>Ck</c> and <c>Ck-1</c> is
-      considered to unbroken. This is done for each link k = 1, 2,
-      ..., n-1. If all links are found to be unbroken, the user
-      certificate <c>Cn</c> is considered authenticated.
-      </p>
+     <p>Session data is by default kept by the ssl application in a
+     memory storage hence session data will be lost at application
+     restart or takeover. Users may define their own callback module
+     to handle session data storage if persistent data storage is
+     required. Session data will also be invalidated after 24 hours
+     from it was saved, for security reasons. It is of course
+     possible to configure the amount of time the session data should be
+     saved.</p>
 
-    <section>
-      <title>Trusted Certificates</title>
-      <p>Now that there is a way to authenticate a certificate by
-        checking that all links of a certificate chain are unbroken,
-        the question is how you can be sure to trust the certificates
-        in the chain, and in particular the top CA certificate of the
-        chain.
-        </p>
-      <p>To provide an answer to that question consider the
-        perspective of a client, which have just received the
-        certificate of the server. In order to authenticate the server
-        the client has to construct a certificate chain and to prove
-        that the chain is unbroken. The client has to have a set of CA
-        certificates (top CA or intermediate CA certificates) not
-        obtained from the server, but obtained by other means. Those
-        certificates are kept <c>locally</c> by the client, and are 
-        trusted by the client.
-        </p>
-      <p>More specifically, the client does not really have to have
-        top CA certificates in its local storage. In order to
-        authenticate a server it is sufficient for the client to
-        posses the trusted certificate of the issuer of the server
-        certificate.
-        </p>
-      <p>Now that is not the whole story. A server can send an
-        (incomplete) certificate chain to its client, and then the
-        task of the client is to construct a certificate chain that
-        begins with a trusted certificate and ends with the server's
-        certificate. (A client can also send a chain to its server, 
-        provided the server requested the client's certificate.)
-        </p>
-      <p>All this means that an unbroken certificate chain begins with
-        a trusted certificate (top CA or not), and ends with the peer
-        certificate. That is the end of the chain is obtained from the
-        peer, but the beginning of the chain is obtained from local
-        storage, which is considered trusted.
-        </p>
-    </section>
-  </section>
-</chapter>
+     <p>Ssl clients will by default try to reuse an available session,
+     ssl servers will by default agree to reuse sessions when clients
+     ask to do so.</p>
+
+   </section>
+ </chapter>
 
 
diff --git a/lib/ssl/doc/src/ssl_session_cache_api.xml b/lib/ssl/doc/src/ssl_session_cache_api.xml
new file mode 100644
index 0000000000..e0b07961fb
--- /dev/null
+++ b/lib/ssl/doc/src/ssl_session_cache_api.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>1999</year><year>2010</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>ssl</title>
+    <file>ssl_session_cache_api.xml</file>
+  </header>
+  <module>ssl_session_cache_api</module>
+  <modulesummary>Defines the API for the TLS session cache so
+    that the data storage scheme can be replaced by
+    defining a new callback module implementing this API.</modulesummary>
+
+  <section>
+    <title>Common Data Types</title>
+
+    <p>The following data types are used in the functions below:
+    </p>
+
+    <p><c>cache_ref() = opaque()</c></p> 
+    
+    <p><c>key() = {partialkey(), session_id()}</c></p>
+    
+    <p><c>partialkey() = opaque()</c></p>
+    
+    <p><c>session_id() = binary()</c></p>
+
+    <p><c>session() = opaque()</c></p>
+    
+  </section>
+  
+  <funcs>   
+
+    <func>
+      <name>delete(Cache, Key) -> _</name>
+      <fsummary></fsummary>
+      <type>
+	<v> Cache = cache_ref()</v>
+	<v> Key  = key()</v>
+      </type>
+      <desc>
+	<p> Deletes a cache entry. Will only be called from the cache
+	handling process.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>foldl(Fun, Acc0, Cache) -> Acc</name>
+      <fsummary></fsummary>
+      <type>
+	<v></v>
+      </type>
+      <desc>
+	<p>Calls Fun(Elem, AccIn) on successive elements of the
+	cache, starting with AccIn == Acc0. Fun/2 must return a new
+	accumulator which is passed to the next call. The function returns
+	the final value of the accumulator. Acc0 is returned if the cache is
+	empty. 
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>init() -> opaque() </name>
+      <fsummary>Return cache reference</fsummary>
+      <type>
+	<v></v>
+      </type>
+      <desc>
+	<p>Performs possible initializations of the cache and returns
+	a reference to it that will be used as parameter to the other
+	api functions. Will be called by the cache handling processes
+	init function, hence putting the same requirements on it as
+	a normal process init function.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>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>
+      </type>
+      <desc>
+	<p>Looks up a cache entry. Should be callable from any
+         process.
+         </p>
+      </desc>
+    </func>
+    
+    <func>
+      <name>select_session(Cache, PartialKey) -> [session()]</name>
+      <fsummary>>Selects sessions that could be reused.</fsummary>
+      <type>
+	<v> Cache = cache_ref()</v>
+	<v> PartialKey = partialkey()</v>
+	<v> Session = session()</v>
+      </type>
+      <desc>
+	<p>Selects sessions that could be reused. Should be callable
+	from any process.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>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>
+      </type>
+      <desc>
+	<p>Takes care of possible cleanup that is needed when the
+	cache handling process terminates.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>update(Cache, Key, Session) -> _</name>
+      <fsummary> Caches a new session or updates a already cached one.</fsummary>
+      <type>
+	<v> Cache = cache_ref()</v>
+	<v> Key  = key()</v>
+	<v> Session = session()</v>
+      </type>
+      <desc>
+	<p> Caches a new session or updates a already cached one. Will
+	only be called from the cache handling process.
+	</p>
+      </desc>
+    </func>
+    
+  </funcs> 
+  
+</erlref>
diff --git a/lib/ssl/doc/src/usersguide.xml b/lib/ssl/doc/src/usersguide.xml
index 98071f5742..6528c00a0b 100644
--- a/lib/ssl/doc/src/usersguide.xml
+++ b/lib/ssl/doc/src/usersguide.xml
@@ -4,7 +4,7 @@
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,43 +13,27 @@
       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>SSL User's Guide</title>
     <prepared>OTP Team</prepared>
-    <docno></docno>
     <date>2003-05-26</date>
-    <rev>B</rev>
     <file>usersguide.sgml</file>
   </header>
   <description>
     <p>The <em>SSL</em> application provides secure communication over
       sockets.
       </p>
-    <p>This product includes software developed by the OpenSSL Project for
-      use in the OpenSSL Toolkit (http://www.openssl.org/).
-      </p>
-    <p>This product includes cryptographic software written by Eric Young
-      ([email protected]).  
-      </p>
-    <p>This product includes software written by Tim Hudson
-      ([email protected]).
-      </p>
-    <p>For full OpenSSL and SSLeay license texts, see <seealso marker="licenses#licenses">Licenses</seealso>.
-      </p>
   </description>
   <xi:include href="ssl_protocol.xml"/>
   <xi:include href="using_ssl.xml"/>
-  <xi:include href="pkix_certs.xml"/>
-  <xi:include href="create_certs.xml"/>
   <xi:include href="ssl_distribution.xml"/>
-  <xi:include href="licenses.xml"/>
 </part>
 
 
diff --git a/lib/ssl/doc/src/using_ssl.xml b/lib/ssl/doc/src/using_ssl.xml
index ba74dcfef4..4bdd8f97b4 100644
--- a/lib/ssl/doc/src/using_ssl.xml
+++ b/lib/ssl/doc/src/using_ssl.xml
@@ -21,93 +21,129 @@
     
     </legalnotice>
 
-    <title>Using the SSL application</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>2003-04-23</date>
-    <rev>PA2</rev>
+    <title>Using the SSL API</title>
     <file>using_ssl.xml</file>
   </header>
-  <p>Here we provide an introduction to using the Erlang/OTP SSL
-    application, which is accessed through the <c>ssl</c> interface
-    module. 
-    </p>
-  <p>We also present example code in the Erlang module
-    <c>client_server</c>, also provided in the directory
-    <c>ssl-X.Y.Z/examples</c>, with source code in <c>src</c> and the
-    compiled module in <c>ebin</c> of that directory.
-    </p>
 
   <section>
-    <title>The ssl Module</title>
-    <p>The <c>ssl</c> module provides the user interface to the Erlang/OTP
-      SSL application. The interface functions provided are very similar
-      to those provided by the <c>gen_tcp</c> and <c>inet</c> modules. 
-      </p>
-    <p>Servers use the interface functions <c>listen</c> and
-      <c>accept</c>. The <c>listen</c> function specifies a TCP port
-      to to listen to, and each call to the <c>accept</c> function
-      establishes an incoming connection.
-      </p>
-    <p>Clients use the <c>connect</c> function which specifies the address 
-      and port of a server to connect to, and  a successful call establishes
-      such a connection. 
-      </p>
-    <p>The <c>listen</c> and <c>connect</c> functions have almost all
-      the options that the corresponding functions in <c>gen_tcp/</c> have, 
-      but there are also additional options specific to the SSL protocol. 
-      </p>
-    <p>The most important SSL specific option is the <c>cacertfile</c>
-      option which specifies a local file containing trusted CA
-      certificates which are and used for peer authentication. This
-      option is used by clients and servers in case they want to
-      authenticate their peers.
-      </p>
-    <p>The <c>certfile</c> option specifies a local path to a file
-      containing the certificate of the holder of the connection
-      endpoint. In case of a server endpoint this option is mandatory
-      since the contents of the sever certificate is needed in the
-      the handshake preceding the establishment of a connection. 
-      </p>
-    <p>Similarly, the <c>keyfile</c> option points to a local file
-      containing the private key of the holder of the endpoint. If the
-      <c>certfile</c> option is present, this option has to be
-      specified as well, unless the private key is provided in the
-      same file as specified by the <c>certfile</c> option (a
-      certificate and a private key can thus coexist in the same file).
-      </p>
-    <p>The <c>verify</c> option specifies how the peer should be verified:
-      </p>
-    <taglist>
-      <tag>0</tag>
-      <item>Do not verify the peer,</item>
-      <tag>1</tag>
-      <item>Verify peer,</item>
-      <tag>2</tag>
-      <item>Verify peer, fail the verification if the peer has no 
-       certificate. </item>
-    </taglist>
-    <p>The <c>depth</c> option specifies the maximum length of the
-      verification certificate chain. Depth = 0 means the peer
-      certificate, depth = 1 the CA certificate, depth = 2 the next CA
-      certificate etc. If the verification process does not find a
-      trusted CA certificate within the maximum length, the verification
-      fails.
-      </p>
-    <p>The <c>ciphers</c> option specifies which ciphers to use (a
-      string of colon separated cipher names). To obtain a list of
-      available ciphers, evaluate the <c>ssl:ciphers/0</c> function
-      (the SSL application has to be running). 
-      </p>
-  </section>
+    <title>General information</title>
+    <p>To see relevant version information for ssl you can
+    call ssl:versions/0</p>
+    
+    <p>To see all supported cipher suites 
+    call ssl:cipher_suites/0. Note that available cipher suites
+    for a connection will depend on your certificate. It is also
+    possible to specify a specific cipher suite(s) that you
+    want your connection to use. Default is to use the  strongest
+    available.</p>
 
-  <section>
-    <title>A Client-Server Example</title>
-    <p>Here is a simple client server example. 
-      </p>
-    <codeinclude file="../../examples/src/client_server.erl" tag="" type="erl"></codeinclude>
   </section>
-</chapter>
-
-
+  
+  <section>
+    <title>Setting up connections</title>
+    
+    <p>Here follows some small example of how to set up client/server connections
+    using the erlang shell. The returned value of the sslsocket has been abbreviated with
+    <c>[...]</c> as it can be fairly large and is opaque.</p>
+    
+    <section>
+      <title>Minmal example</title>
+      
+      <note><p> The minimal setup is not the  most secure setup of ssl.</p>    
+      </note>
+      
+      <p> Start server side</p>
+      <code type="erl">1 server> ssl:start().
+ok</code>
+      
+      <p>Create a ssl listen socket</p>
+      <code type="erl">2 server> {ok, ListenSocket} =
+ssl:listen(9999, [{certfile, "cert.pem"}, {keyfile, "key.pem"},{reuseaddr, true}]).
+{ok,{sslsocket, [...]}}</code>
+      
+      <p>Do a transport accept on the ssl listen socket</p>
+      <code type="erl">3 server> {ok, Socket} = ssl:transport_accept(ListenSocket).
+{ok,{sslsocket, [...]}}</code>
 
+      <p>Start client side</p>
+      <code type="erl">1 client> ssl:start().
+ok</code>
+      
+      <code type="erl">2 client> {ok, Socket} = ssl:connect("localhost", 9999,  [], infinity).
+{ok,{sslsocket, [...]}}</code>
+      
+      <p>Do the ssl handshake</p>
+      <code type="erl">4 server> ok = ssl:ssl_accept(Socket).
+ok</code>
+      
+      <p>Send a messag over ssl</p>
+      <code type="erl">5 server> ssl:send(Socket, "foo").
+ok</code>
+      
+      <p>Flush the shell message queue to see that we got the message
+      sent on the server side</p>
+      <code type="erl">3 client> flush().
+Shell got {ssl,{sslsocket,[...]},"foo"}
+ok</code>
+    </section>
+    
+    <section>
+      <title>Upgrade example</title>
+      
+      <note><p> To upgrade a TCP/IP connection to a ssl connection the
+      client and server have to aggre to do so. Agreement
+      may be accompliced by using a protocol such the one used by HTTP
+      specified in RFC 2817.</p> </note>
+      
+      <p>Start server side</p>
+      <code type="erl">1 server> ssl:start().
+ok</code>
+      
+      <p>Create a normal tcp listen socket</p>
+      <code type="erl">2 server> {ok, ListenSocket} = gen_tcp:listen(9999, [{reuseaddr, true}]).
+{ok, #Port&lt;0.475&gt;}</code>
+      
+      <p>Accept client connection</p>
+      <code type="erl">3 server> {ok, Socket} = gen_tcp:accept(ListenSocket).
+{ok, #Port&lt;0.476&gt;}</code>
+      
+      <p>Start client side</p>
+      <code type="erl">1 client> ssl:start().
+ok</code>
+      
+      <code type="erl">2 client> {ok, Socket} = gen_tcp:connect("localhost", 9999,  [], infinity).</code>
+      
+      <p>Make sure active is set to false before trying
+      to upgrade a connection to a ssl connection, otherwhise
+      ssl handshake messages may be deliverd to the wrong process.</p>
+      <code type="erl">4 server> inet:setopts(Socket, [{active, false}]).
+ok</code>
+      
+      <p>Do the ssl handshake.</p>
+      <code type="erl">5 server> {ok, SSLSocket} = ssl:ssl_accept(Socket, [{cacertfile, "cacerts.pem"},
+{certfile, "cert.pem"}, {keyfile, "key.pem"}]).
+{ok,{sslsocket,[...]}}</code>
+      
+      <p> Upgrade to a ssl connection. Note that the client and server
+      must agree upon the upgrade and the server must call
+      ssl:accept/2 before the client calls ssl:connect/3.</p>
+      <code type="erl">3 client>{ok, SSLSocket} = ssl:connect(Socket, [{cacertfile, "cacerts.pem"},
+{certfile, "cert.pem"}, {keyfile, "key.pem"}], infinity).
+{ok,{sslsocket,[...]}}</code>
+      
+      <p>Send a messag over ssl</p>
+      <code type="erl">4 client> ssl:send(SSLSocket, "foo").
+ok</code>
+      
+      <p>Set active true on the ssl socket</p>
+      <code type="erl">4 server> ssl:setopts(SSLSocket, [{active, true}]).
+ok</code>
+      
+      <p>Flush the shell message queue to see that we got the message
+      sent on the client side</p>
+      <code type="erl">5 server> flush().
+Shell got {ssl,{sslsocket,[...]},"foo"}
+ok</code>
+    </section>
+  </section>
+ </chapter>
diff --git a/lib/ssl/examples/certs/Makefile b/lib/ssl/examples/certs/Makefile
index 121fcc6950..b811b461dc 100644
--- a/lib/ssl/examples/certs/Makefile
+++ b/lib/ssl/examples/certs/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
+# Copyright Ericsson AB 2003-2010. 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
@@ -21,4 +21,41 @@
 # Invoke with GNU make or clearmake -C gnu.
 #
 
-include $(ERL_TOP)/make/run_make.mk
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../../vsn.mk
+VSN=$(SSL_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/ssl-$(VSN)
+
+TARGET_FILES=
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+debug opt: $(TARGET_FILES)
+
+clean:
+	rm -fr $(TARGET_FILES) *~ *.beam 
+
+docs:
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR) $(RELSYSDIR)/examples/certs
+	tar cf - etc | \
+		(cd $(RELSYSDIR)/examples/certs; tar xf -)
+	chmod -f -R ug+rw $(RELSYSDIR)/examples
+release_docs_spec:
diff --git a/lib/ssl/examples/certs/Makefile.in b/lib/ssl/examples/certs/Makefile.in
deleted file mode 100644
index 4ea7aaf6dc..0000000000
--- a/lib/ssl/examples/certs/Makefile.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2003-2009. 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%
-#
-
-#
-
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-include ../../vsn.mk
-VSN=$(SSL_VSN)
-
-RELSYSDIR = $(RELEASE_PATH)/lib/ssl-$(VSN)
-
-EBIN = ebin
-ETC = etc
-SRC = src
-
-OPENSSL_CMD = @OPENSSL_CMD@
-
-# We are generating more files than in the following list, but we take
-# there existence as successful execution of make rules
-
-PEMS = cacerts.pem cert.pem key.pem
-
-PEMFILES = $(PEMS:%=$(ETC)/client/%) $(PEMS:%=$(ETC)/server/%)
-
-debug opt:	$(PEMFILES)
-
-$(PEMFILES):	done
-
-done:	$(EBIN)/make_certs.beam 
-	erl -noinput -pa $(EBIN) -run make_certs all $(OPENSSL_CMD) \
-		-s erlang halt
-	echo >done
-
-$(EBIN)/make_certs.beam:	$(SRC)/make_certs.erl
-	cd src; erlc -W -o ../$(EBIN) make_certs.erl
-
-clean:
-	rm -fr $(EBIN)/* $(SRC)/*~ $(SRC)/*.beam $(ETC) done \
-		stderr.txt erl_crash.dump *~
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/certs
-	tar cf - Makefile ebin etc rnd src  | \
-		(cd $(RELSYSDIR)/examples/certs; tar xf -)
-	chmod -f -R ug+rw $(RELSYSDIR)/examples
-
-release_docs_spec:
-
-
-
-
-
-
-
-
diff --git a/lib/ssl/examples/certs/etc/client/cacerts.pem b/lib/ssl/examples/certs/etc/client/cacerts.pem
new file mode 100644
index 0000000000..cb19d3d41e
--- /dev/null
+++ b/lib/ssl/examples/certs/etc/client/cacerts.pem
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIICizCCAfSgAwIBAgIFdMMs9fEwDQYJKoZIhvcNAQEFBQAwfTERMA8GA1UEAxMI
+ZXJsYW5nQ0ExIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBlcmxhbmcub3JnMRIwEAYD
+VQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYDVQQKEwZlcmxhbmcxFDAS
+BgNVBAsTC3Rlc3RpbmcgZGVwMCIYDzIwMTAwOTAxMDAwMDAwWhgPMjAyNTA4Mjgw
+MDAwMDBaMH0xETAPBgNVBAMTCGVybGFuZ0NBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0
+ZXJAZXJsYW5nLm9yZzESMBAGA1UEBxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEP
+MA0GA1UEChMGZXJsYW5nMRQwEgYDVQQLEwt0ZXN0aW5nIGRlcDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAgmHw2xApZqdzZOOPTzwHr1hRYd1OqbLOsXbAq6kJ
+Kuu+qe5jAlMF3vnUhiHomuZeNZVJe3SP+JfBt3BHMjm2CLChCuNgfctKURMlEc/L
+xo8fO1Jk9MD5mbG2Utx3m3gM6Liwt9fHVABlCTyB6/jXrK1tYpEG5CrwUXyy8Htl
+jHECAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAl
+0tMEXWPgzXTpDuNmuKh6aGq9CuExUuEXXQQWPThzEuluA3aHFmObziQlMY1+KeO1
+AL0kpx0Yhvju/rfAJ+OF6MMni6hJoKlYTVml+fCY89A3nmY1rJHJavjHp0OIPGxh
+4Sr+EcjROkqe8jE0DmbwmM6lzpwSJscxte+V6HvGRw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICiDCCAfGgAwIBAgIFSHyFNTEwDQYJKoZIhvcNAQEFBQAwfTERMA8GA1UEAxMI
+ZXJsYW5nQ0ExIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBlcmxhbmcub3JnMRIwEAYD
+VQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYDVQQKEwZlcmxhbmcxFDAS
+BgNVBAsTC3Rlc3RpbmcgZGVwMCIYDzIwMTAwOTAxMDAwMDAwWhgPMjAyNTA4Mjgw
+MDAwMDBaMHoxDjAMBgNVBAMTBW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJA
+ZXJsYW5nLm9yZzESMBAGA1UEBxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0G
+A1UEChMGZXJsYW5nMRQwEgYDVQQLEwt0ZXN0aW5nIGRlcDCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAjEt9iy365+mTialKDKb3l2QPg71yavJA1ZC6aGC14X7x
+KCm1FhUYsVKOlWjmC1VYJiCS01gvKqMXiogreHJGM93E+URlKkOm9kmOWQwLfFb8
+JLzafPi3/8TUdjl8UuIDHyPsoQiM2ZBDUVWezfl+CBsTYFO3U4Lqf9OKbCxTF78C
+AwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAv6vHw
+wK3MvxzlhDJIx7rUasOYJDZJyOt71KdOKeA7+ocbvDIblmV7sTbe3oQNqbSATZ6H
+RUqHZdPhKIZ9wjEBSKdBTL8rc0TvbztMvd+i0rkTCL/bspQYchA2zCcjgkWqpaN4
+OhOjQR1+9/ntmaU/r5Ca7KmrXEf5XSQIGLSMag==
+-----END CERTIFICATE-----
+
diff --git a/lib/ssl/examples/certs/etc/client/cert.pem b/lib/ssl/examples/certs/etc/client/cert.pem
new file mode 100644
index 0000000000..a2f53aaf82
--- /dev/null
+++ b/lib/ssl/examples/certs/etc/client/cert.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIIChzCCAfCgAwIBAgIGAIsapa8BMA0GCSqGSIb3DQEBBQUAMHoxDjAMBgNVBAMT
+BW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJAZXJsYW5nLm9yZzESMBAGA1UE
+BxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0GA1UEChMGZXJsYW5nMRQwEgYD
+VQQLEwt0ZXN0aW5nIGRlcDAiGA8yMDEwMDkwMTAwMDAwMFoYDzIwMjUwODI4MDAw
+MDAwWjB7MQ8wDQYDVQQDEwZjbGllbnQxIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBl
+cmxhbmcub3JnMRIwEAYDVQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYD
+VQQKEwZlcmxhbmcxFDASBgNVBAsTC3Rlc3RpbmcgZGVwMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQCTFBPkOO98fDY3j6MIxIGKp+rampfIay50Lx4+EnCnRSSV
+wC+n0VVmP7V5SGFJpuXJzN0hvqPUWOOjiMTNlNRaGy0pqu2oMXWAPLOxHWL1wT53
+h2Zr3FUNU/N0Rvnkttse1KZJ9uYCLKUiuXXsv2rR62nH3OhRIiBHSAcSv0NRWwID
+AQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAG8t6f1A
+PF7xayGxtUpG2r6W5ETylC3ZIKPS2kfJk9aYi7AZNTp7/xTU6SgqvFBN8aBPzxCD
+4jHrSNC8DSb4X1x9uimarb6qdZDHEdij+DRAd2eygJHZxEf7+8B4Fx34thQeU9hZ
+S1Izke5AlsyFMkvB7h0anE4k9BfuU70vl6v5
+-----END CERTIFICATE-----
+
diff --git a/lib/ssl/examples/certs/etc/client/key.pem b/lib/ssl/examples/certs/etc/client/key.pem
new file mode 100644
index 0000000000..4d55b08f4c
--- /dev/null
+++ b/lib/ssl/examples/certs/etc/client/key.pem
@@ -0,0 +1,16 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCTFBPkOO98fDY3j6MIxIGKp+rampfIay50Lx4+EnCnRSSVwC+n
+0VVmP7V5SGFJpuXJzN0hvqPUWOOjiMTNlNRaGy0pqu2oMXWAPLOxHWL1wT53h2Zr
+3FUNU/N0Rvnkttse1KZJ9uYCLKUiuXXsv2rR62nH3OhRIiBHSAcSv0NRWwIDAQAB
+AoGACdIVYe/LTeydUihtInC8lZ2QuPgJmoBNocRjqJFipEihoL4scHAx25n1bBvB
+I0HZphffzBkGp28oBAtl2LRPWXqu527unc/RWRfLMqSK1xNSq1DxD1a30zkrZPna
+QiV65vEJuNSJTtlDy/Zqc/BVZXCpxWlzYQedZgkmf0Qse8ECQQCmaz02Yur8zC9f
+eSQKU5OSzGw3bSIumEzziCfHdTheK6MEoccf5TCAyLXhZwA7QlKja4tFXfeyVxws
+/LlnUJN9AkEA4j+xnOeYUyGKXL5i+BAbnqpI4MzPiq+IoCYkaRlD/wAws24r5HNI
+ZQmEHWqD/NNzOf/A2XuyLtMiTGJPW/DftwJBAKKpJP6Ytuh6xz8BUCnLwO12Y7vV
+LtjuQiCzD3aUa5EYA9HOMqxJPxxRkf0LyR0i2VUkE8+sZiPpov+R0cJa7p0CQQCj
+40GUiArGRSiF7/+e84QeVfl+pb29F1QftiFv5DZmFEwy3Z572KpbTh5edJbxYHY6
+UDHxGHJFCvnwXNJhpkVXAkBJqfEfiMJ3Q/E5Gpf3sQizacouW92iiN8ojlF1oB80
+t34RysJH7SgI3gdMhTribCo2UUaV0StjR6yodPN+TB2J
+-----END RSA PRIVATE KEY-----
+
diff --git a/lib/ssl/examples/certs/etc/erlangCA/cert.pem b/lib/ssl/examples/certs/etc/erlangCA/cert.pem
new file mode 100644
index 0000000000..c4386494dc
--- /dev/null
+++ b/lib/ssl/examples/certs/etc/erlangCA/cert.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICizCCAfSgAwIBAgIFdMMs9fEwDQYJKoZIhvcNAQEFBQAwfTERMA8GA1UEAxMI
+ZXJsYW5nQ0ExIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBlcmxhbmcub3JnMRIwEAYD
+VQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYDVQQKEwZlcmxhbmcxFDAS
+BgNVBAsTC3Rlc3RpbmcgZGVwMCIYDzIwMTAwOTAxMDAwMDAwWhgPMjAyNTA4Mjgw
+MDAwMDBaMH0xETAPBgNVBAMTCGVybGFuZ0NBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0
+ZXJAZXJsYW5nLm9yZzESMBAGA1UEBxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEP
+MA0GA1UEChMGZXJsYW5nMRQwEgYDVQQLEwt0ZXN0aW5nIGRlcDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAgmHw2xApZqdzZOOPTzwHr1hRYd1OqbLOsXbAq6kJ
+Kuu+qe5jAlMF3vnUhiHomuZeNZVJe3SP+JfBt3BHMjm2CLChCuNgfctKURMlEc/L
+xo8fO1Jk9MD5mbG2Utx3m3gM6Liwt9fHVABlCTyB6/jXrK1tYpEG5CrwUXyy8Htl
+jHECAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAl
+0tMEXWPgzXTpDuNmuKh6aGq9CuExUuEXXQQWPThzEuluA3aHFmObziQlMY1+KeO1
+AL0kpx0Yhvju/rfAJ+OF6MMni6hJoKlYTVml+fCY89A3nmY1rJHJavjHp0OIPGxh
+4Sr+EcjROkqe8jE0DmbwmM6lzpwSJscxte+V6HvGRw==
+-----END CERTIFICATE-----
+
diff --git a/lib/ssl/examples/certs/etc/otpCA/cert.pem b/lib/ssl/examples/certs/etc/otpCA/cert.pem
new file mode 100644
index 0000000000..8610621695
--- /dev/null
+++ b/lib/ssl/examples/certs/etc/otpCA/cert.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICiDCCAfGgAwIBAgIFSHyFNTEwDQYJKoZIhvcNAQEFBQAwfTERMA8GA1UEAxMI
+ZXJsYW5nQ0ExIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBlcmxhbmcub3JnMRIwEAYD
+VQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYDVQQKEwZlcmxhbmcxFDAS
+BgNVBAsTC3Rlc3RpbmcgZGVwMCIYDzIwMTAwOTAxMDAwMDAwWhgPMjAyNTA4Mjgw
+MDAwMDBaMHoxDjAMBgNVBAMTBW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJA
+ZXJsYW5nLm9yZzESMBAGA1UEBxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0G
+A1UEChMGZXJsYW5nMRQwEgYDVQQLEwt0ZXN0aW5nIGRlcDCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAjEt9iy365+mTialKDKb3l2QPg71yavJA1ZC6aGC14X7x
+KCm1FhUYsVKOlWjmC1VYJiCS01gvKqMXiogreHJGM93E+URlKkOm9kmOWQwLfFb8
+JLzafPi3/8TUdjl8UuIDHyPsoQiM2ZBDUVWezfl+CBsTYFO3U4Lqf9OKbCxTF78C
+AwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAv6vHw
+wK3MvxzlhDJIx7rUasOYJDZJyOt71KdOKeA7+ocbvDIblmV7sTbe3oQNqbSATZ6H
+RUqHZdPhKIZ9wjEBSKdBTL8rc0TvbztMvd+i0rkTCL/bspQYchA2zCcjgkWqpaN4
+OhOjQR1+9/ntmaU/r5Ca7KmrXEf5XSQIGLSMag==
+-----END CERTIFICATE-----
+
diff --git a/lib/ssl/examples/certs/etc/server/cacerts.pem b/lib/ssl/examples/certs/etc/server/cacerts.pem
new file mode 100644
index 0000000000..cb19d3d41e
--- /dev/null
+++ b/lib/ssl/examples/certs/etc/server/cacerts.pem
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIICizCCAfSgAwIBAgIFdMMs9fEwDQYJKoZIhvcNAQEFBQAwfTERMA8GA1UEAxMI
+ZXJsYW5nQ0ExIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBlcmxhbmcub3JnMRIwEAYD
+VQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYDVQQKEwZlcmxhbmcxFDAS
+BgNVBAsTC3Rlc3RpbmcgZGVwMCIYDzIwMTAwOTAxMDAwMDAwWhgPMjAyNTA4Mjgw
+MDAwMDBaMH0xETAPBgNVBAMTCGVybGFuZ0NBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0
+ZXJAZXJsYW5nLm9yZzESMBAGA1UEBxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEP
+MA0GA1UEChMGZXJsYW5nMRQwEgYDVQQLEwt0ZXN0aW5nIGRlcDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAgmHw2xApZqdzZOOPTzwHr1hRYd1OqbLOsXbAq6kJ
+Kuu+qe5jAlMF3vnUhiHomuZeNZVJe3SP+JfBt3BHMjm2CLChCuNgfctKURMlEc/L
+xo8fO1Jk9MD5mbG2Utx3m3gM6Liwt9fHVABlCTyB6/jXrK1tYpEG5CrwUXyy8Htl
+jHECAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAl
+0tMEXWPgzXTpDuNmuKh6aGq9CuExUuEXXQQWPThzEuluA3aHFmObziQlMY1+KeO1
+AL0kpx0Yhvju/rfAJ+OF6MMni6hJoKlYTVml+fCY89A3nmY1rJHJavjHp0OIPGxh
+4Sr+EcjROkqe8jE0DmbwmM6lzpwSJscxte+V6HvGRw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICiDCCAfGgAwIBAgIFSHyFNTEwDQYJKoZIhvcNAQEFBQAwfTERMA8GA1UEAxMI
+ZXJsYW5nQ0ExIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBlcmxhbmcub3JnMRIwEAYD
+VQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYDVQQKEwZlcmxhbmcxFDAS
+BgNVBAsTC3Rlc3RpbmcgZGVwMCIYDzIwMTAwOTAxMDAwMDAwWhgPMjAyNTA4Mjgw
+MDAwMDBaMHoxDjAMBgNVBAMTBW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJA
+ZXJsYW5nLm9yZzESMBAGA1UEBxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0G
+A1UEChMGZXJsYW5nMRQwEgYDVQQLEwt0ZXN0aW5nIGRlcDCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAjEt9iy365+mTialKDKb3l2QPg71yavJA1ZC6aGC14X7x
+KCm1FhUYsVKOlWjmC1VYJiCS01gvKqMXiogreHJGM93E+URlKkOm9kmOWQwLfFb8
+JLzafPi3/8TUdjl8UuIDHyPsoQiM2ZBDUVWezfl+CBsTYFO3U4Lqf9OKbCxTF78C
+AwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAv6vHw
+wK3MvxzlhDJIx7rUasOYJDZJyOt71KdOKeA7+ocbvDIblmV7sTbe3oQNqbSATZ6H
+RUqHZdPhKIZ9wjEBSKdBTL8rc0TvbztMvd+i0rkTCL/bspQYchA2zCcjgkWqpaN4
+OhOjQR1+9/ntmaU/r5Ca7KmrXEf5XSQIGLSMag==
+-----END CERTIFICATE-----
+
diff --git a/lib/ssl/examples/certs/etc/server/cert.pem b/lib/ssl/examples/certs/etc/server/cert.pem
new file mode 100644
index 0000000000..f26adb7f5c
--- /dev/null
+++ b/lib/ssl/examples/certs/etc/server/cert.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIIChzCCAfCgAwIBAgIGANUxXM9BMA0GCSqGSIb3DQEBBQUAMHoxDjAMBgNVBAMT
+BW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJAZXJsYW5nLm9yZzESMBAGA1UE
+BxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0GA1UEChMGZXJsYW5nMRQwEgYD
+VQQLEwt0ZXN0aW5nIGRlcDAiGA8yMDEwMDkwMTAwMDAwMFoYDzIwMjUwODI4MDAw
+MDAwWjB7MQ8wDQYDVQQDEwZzZXJ2ZXIxIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBl
+cmxhbmcub3JnMRIwEAYDVQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYD
+VQQKEwZlcmxhbmcxFDASBgNVBAsTC3Rlc3RpbmcgZGVwMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQCf4Htxr99lLs5W8QQw7jdakqyAkIjOW4aqH8sr4va4SvZ9
+Adq67k8jMHefCVZo+F8x4cwsBgB4aWzFIGBnvFTi6YsH27XW7f9O9IPCej8fdhRZ
+4UAtNHa253buOWpDGla2JmIdkmfFvXFJycMIKbG5tYilVXoWKBMKmCwWaXz0nQID
+AQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAGF5Pfwk
+QDdwJup/mVITPxbBls4Yl7anDooUQsq8066lA1g54H/PRfXscGkyCFGh1ifXvf1L
+psMRoBAdDHL/wSJplk3rRavkC94eBgnTFZmfKL6844g1j53yameiYL8IEVExYMBg
+/XGyc0qwq57WT8B/K4aElrvlBlQ0wF3wN54M
+-----END CERTIFICATE-----
+
diff --git a/lib/ssl/examples/certs/etc/server/key.pem b/lib/ssl/examples/certs/etc/server/key.pem
new file mode 100644
index 0000000000..c1392ca557
--- /dev/null
+++ b/lib/ssl/examples/certs/etc/server/key.pem
@@ -0,0 +1,16 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCf4Htxr99lLs5W8QQw7jdakqyAkIjOW4aqH8sr4va4SvZ9Adq6
+7k8jMHefCVZo+F8x4cwsBgB4aWzFIGBnvFTi6YsH27XW7f9O9IPCej8fdhRZ4UAt
+NHa253buOWpDGla2JmIdkmfFvXFJycMIKbG5tYilVXoWKBMKmCwWaXz0nQIDAQAB
+AoGAQIlma0r6W6bcRj4+Wd4fXCFvHuq5Psu1fYEeC5Yvz8761xVjjSfbrDHJZ9pm
+FjOEgedK+s5lbDXqYVyjbdyZSugStBRocSmbG8SQHcAsxR2ZIkNzX2hYzB+lslWo
+T3YJojDyB134O7XJznCu+ZFXP86jyJ1JT6k6a+OIHcwnJ+ECQQDYn57dY4Px3mEd
+VBLStN3YkRF5oFyT+xk7IaKeLLB6n4gCnoVbBoHut7PFbPYPzoNzEwPk3MQKDIHb
+Kig3S5CpAkEAvPA1VmoJWAlN6kUi+F2L8HXEArzE8x7vwdsslrwMKUe4dFS+ZC/7
+5iDOaxcZ7TYkCgwzBt341++DCgP6j3fY1QJBALB6AcOcwi52m6l4B8mu3ZkEPjdX
+BHTuONTqhv/TqoaLlxODL2NDvvDKqeMp7KBd/srt79swW2lQXS4+fvrlTdkCQQCm
+zxj4O1QWkthkfje6ubSkTwUIOatUzrp1F9GNH2dJRtX2dx9FCwxGCC7WY6XzRXqa
+GF0wsedSllbGD+82nWQlAkAicMGqCqRq4hKR/cVmFatOqKVWCVkx6OFF2FhuiI5Z
+h5eIOPGCt8dVRs1P9DNSld/D98Sfm65m85z8BtXovvYV
+-----END RSA PRIVATE KEY-----
+
diff --git a/lib/ssl/examples/certs/rnd/RAND b/lib/ssl/examples/certs/rnd/RAND
deleted file mode 100644
index 70997bd01f..0000000000
--- a/lib/ssl/examples/certs/rnd/RAND
+++ /dev/null
diff --git a/lib/ssl/examples/certs/src/make_certs.erl b/lib/ssl/examples/certs/src/make_certs.erl
index c374836568..fe267bed28 100644
--- a/lib/ssl/examples/certs/src/make_certs.erl
+++ b/lib/ssl/examples/certs/src/make_certs.erl
@@ -1,261 +1,48 @@
-%% The purpose of this module is to create example certificates for
-%% testing. 
-%% Run it as: 
-%%
-%% erl -noinput -run make_certs all "/path/to/openssl" -s erlang halt
-%%
+%% The purpose of this module is to log how the example certs where created,
+%% it requires erl_make_certs found in the test directory.
 
 -module(make_certs).
--export([all/0, all/1]).
-
--record(dn, {commonName, 
-	     organizationalUnitName = "Erlang OTP",
-	     organizationName = "Ericsson AB",
-	     localityName = "Stockholm",
-	     countryName = "SE",
-	     emailAddress = "[email protected]"}).
+-export([all/0]).
 
 all() ->
-    all(["openssl"]).
-
-all([OpenSSLCmd]) ->
-    Root = filename:dirname(filename:dirname((code:which(?MODULE)))),
-    %% io:fwrite("Root : ~s~n", [Root]),
-    NRoot = filename:join([Root, "etc"]), 
-    file:make_dir(NRoot), 
-    create_rnd(Root, "etc"),			% For all requests
-    rootCA(NRoot, OpenSSLCmd, "erlangCA"),
-    intermediateCA(NRoot, OpenSSLCmd, "otpCA", "erlangCA"),
-    endusers(NRoot, OpenSSLCmd, "otpCA", ["client", "server"]),
-    collect_certs(NRoot, ["erlangCA", "otpCA"], ["client", "server"]),
-    remove_rnd(Root, "etc").
-
-rootCA(Root, OpenSSLCmd, Name) ->
-    create_ca_dir(Root, Name, ca_cnf(Name)),
-    DN = #dn{commonName = Name},
-    create_self_signed_cert(Root, OpenSSLCmd, Name, req_cnf(DN)),
-    ok.
-
-intermediateCA(Root, OpenSSLCmd, CA, ParentCA) ->
-    CA = "otpCA", 
-    create_ca_dir(Root, CA, ca_cnf(CA)),
-    CARoot = filename:join([Root, CA]),
-    DN = #dn{commonName = CA},
-    CnfFile = filename:join([CARoot, "req.cnf"]),
-    file:write_file(CnfFile, req_cnf(DN)),
-    KeyFile = filename:join([CARoot, "private", "key.pem"]), 
-    ReqFile =  filename:join([CARoot, "req.pem"]), 
-    create_req(Root, OpenSSLCmd, CnfFile, KeyFile, ReqFile),
-    CertFile = filename:join([CARoot, "cert.pem"]),
-    sign_req(Root, OpenSSLCmd, ParentCA, "ca_cert", ReqFile, CertFile).
-
-endusers(Root, OpenSSLCmd, CA, Users) ->
-    lists:foreach(fun(User) -> enduser(Root, OpenSSLCmd, CA, User) end, Users).
-
-enduser(Root, OpenSSLCmd, CA, User) -> 
-    UsrRoot = filename:join([Root, User]),
-    file:make_dir(UsrRoot),
-    CnfFile = filename:join([UsrRoot, "req.cnf"]),
-    DN = #dn{commonName = User},
-    file:write_file(CnfFile, req_cnf(DN)),
-    KeyFile = filename:join([UsrRoot, "key.pem"]), 
-    ReqFile =  filename:join([UsrRoot, "req.pem"]), 
-    create_req(Root, OpenSSLCmd, CnfFile, KeyFile, ReqFile),
-    CertFile =  filename:join([UsrRoot, "cert.pem"]), 
-    sign_req(Root, OpenSSLCmd, CA, "user_cert", ReqFile, CertFile).
-
-collect_certs(Root, CAs, Users) ->
-    Bins = lists:foldr(
-	     fun(CA, Acc) -> 
-		     File = filename:join([Root, CA, "cert.pem"]),
-		     {ok, Bin} = file:read_file(File),
-		     [Bin, "\n" | Acc]
-	     end, [], CAs),
-    lists:foreach(
-      fun(User) ->
-	      File = filename:join([Root, User, "cacerts.pem"]),
-	      file:write_file(File, Bins)
-      end, Users).
-
-create_self_signed_cert(Root, OpenSSLCmd, CAName, Cnf) ->
-    CARoot = filename:join([Root, CAName]),
-    CnfFile = filename:join([CARoot, "req.cnf"]),
-    file:write_file(CnfFile, Cnf),
-    KeyFile = filename:join([CARoot, "private", "key.pem"]), 
-    CertFile = filename:join([CARoot, "cert.pem"]), 
-    Cmd = [OpenSSLCmd, " req"
-	   " -new"
-	   " -x509"
-	   " -config ", CnfFile,
-	   " -keyout ", KeyFile, 
-	   " -out ", CertFile], 
-    Env = [{"ROOTDIR", Root}],  
-    cmd(Cmd, Env).
-
-create_ca_dir(Root, CAName, Cnf) ->
-    CARoot = filename:join([Root, CAName]),
-    file:make_dir(CARoot),
-    create_dirs(CARoot, ["certs", "crl", "newcerts", "private"]),
-    create_rnd(Root, filename:join([CAName, "private"])),
-    create_files(CARoot, [{"serial", "01\n"},
-			  {"index.txt", ""},
-			  {"ca.cnf", Cnf}]).
-
-create_req(Root, OpenSSLCmd, CnfFile, KeyFile, ReqFile) ->
-    Cmd = [OpenSSLCmd, " req"
-	   " -new"
-	   " -config ", CnfFile,
-	   " -keyout ", KeyFile, 
-	   " -out ", ReqFile], 
-    Env = [{"ROOTDIR", Root}], 
-    cmd(Cmd, Env).
-
-sign_req(Root, OpenSSLCmd, CA, CertType, ReqFile, CertFile) ->
-    CACnfFile = filename:join([Root, CA, "ca.cnf"]),
-    Cmd = [OpenSSLCmd, " ca"
-	   " -batch"
-	   " -notext"
-	   " -config ", CACnfFile, 
-	   " -extensions ", CertType,
-	   " -in ", ReqFile, 
-	   " -out ", CertFile],
-    Env = [{"ROOTDIR", Root}], 
-    cmd(Cmd, Env).
+    LongTime = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())+15*365),
+    Validity = {date(), LongTime},
+    Subject = [{email, "[email protected]"},
+	       {city, "Stockholm"},
+	       {country, "SE"},
+	       {org, "erlang"},
+	       {org_unit, "testing dep"}],
+
+    RootCa = erl_make_certs:make_cert([{validity, Validity}, {subject, [{name, "erlangCA"}|Subject]}]),
+    ImedCa = erl_make_certs:make_cert([{issuer, RootCa}, {validity, Validity}, 
+				       {subject, [{name, "otpCA"}|Subject]}]),
+    ClientCa = erl_make_certs:make_cert([{issuer, ImedCa}, {validity, Validity}, 
+					 {subject, [{name, "client"}|Subject]}]),
+    ServerCa = erl_make_certs:make_cert([{issuer, ImedCa}, {validity, Validity}, 
+					 {subject, [{name, "server"}|Subject]}]),
+
+    Root0  = filename:dirname(filename:dirname((code:which(?MODULE)))),
+    Root   = filename:join([Root0, "etc"]),    file:make_dir(Root), 
+    CaPath = filename:join([Root, "erlangCA"]), file:make_dir(CaPath), 
+    IPath  = filename:join([Root, "otpCA"]),   file:make_dir(IPath), 
+    CPath  = filename:join([Root, "client"]),  file:make_dir(CPath), 
+    SPath  = filename:join([Root, "server"]),  file:make_dir(SPath), 
+
+    erl_make_certs:write_pem(CaPath,"cert", RootCa),
+    erl_make_certs:write_pem(IPath, "cert", ImedCa),
+
+    {ok, CaBin0} = file:read_file(filename:join(CaPath, "cert.pem")),
+    {ok, CaBin1} = file:read_file(filename:join(IPath, "cert.pem")),
+    CaBin = <<CaBin0/binary, CaBin1/binary>>, 
+
+    erl_make_certs:write_pem(CPath, "cert", ClientCa),
+    ok = file:write_file(filename:join(CPath, "cacerts.pem"), CaBin),
+    erl_make_certs:write_pem(SPath, "cert", ServerCa),
+    ok = file:write_file(filename:join(SPath, "cacerts.pem"), CaBin),
     
-%%
-%%  Misc
-%%
-    
-create_dirs(Root, Dirs) ->
-    lists:foreach(fun(Dir) ->
-			  file:make_dir(filename:join([Root, Dir])) end,
-		  Dirs).
-
-create_files(Root, NameContents) ->
-    lists:foreach(
-      fun({Name, Contents}) ->
-	      file:write_file(filename:join([Root, Name]), Contents) end,
-      NameContents).
-
-create_rnd(Root, Dir) ->
-    From = filename:join([Root, "rnd", "RAND"]),
-    To = filename:join([Root, Dir, "RAND"]),
-    file:copy(From, To).
-
-remove_rnd(Root, Dir) ->
-    File = filename:join([Root, Dir, "RAND"]),
-    file:delete(File).
-
-cmd(Cmd, Env) ->
-    FCmd = lists:flatten(Cmd),
-    Port = open_port({spawn, FCmd}, [stream, eof, exit_status, 
-				    {env, Env}]),
-    eval_cmd(Port).
-
-eval_cmd(Port) ->
-    receive 
-	{Port, {data, _}} ->
-	    eval_cmd(Port);
-	{Port, eof} ->
-	    ok
-    end,
-    receive
-	{Port, {exit_status, Status}} when Status /= 0 ->
-	    %% io:fwrite("exit status: ~w~n", [Status]),
-	    erlang:halt(Status)
-    after 0 ->
-	    ok
-    end.
-
-%%
-%% Contents of configuration files 
-%%
-
-req_cnf(DN) ->
-    ["# Purpose: Configuration for requests (end users and CAs)."
-     "\n"
-     "ROOTDIR	        = $ENV::ROOTDIR\n"
-     "\n"
-
-     "[req]\n"
-     "input_password	= secret\n"
-     "output_password	= secret\n"
-     "default_bits	= 1024\n"
-     "RANDFILE		= $ROOTDIR/RAND\n"
-     "encrypt_key	= no\n"
-     "default_md	= sha1\n"
-     "#string_mask	= pkix\n"
-     "x509_extensions	= ca_ext\n"
-     "prompt		= no\n"
-     "distinguished_name= name\n"
-     "\n"
-
-     "[name]\n"
-     "commonName		= ", DN#dn.commonName, "\n"
-     "organizationalUnitName	= ", DN#dn.organizationalUnitName, "\n"
-     "organizationName	        = ", DN#dn.organizationName, "\n" 
-     "localityName		= ", DN#dn.localityName, "\n"
-     "countryName		= ", DN#dn.countryName, "\n"
-     "emailAddress		= ", DN#dn.emailAddress, "\n"
-     "\n"
-
-     "[ca_ext]\n"
-     "basicConstraints 	= critical, CA:true\n"
-     "keyUsage 		= cRLSign, keyCertSign\n"
-     "subjectKeyIdentifier = hash\n"
-     "subjectAltName	= email:copy\n"].
-
-
-ca_cnf(CA) ->
-    ["# Purpose: Configuration for CAs.\n"
-     "\n"
-     "ROOTDIR	        = $ENV::ROOTDIR\n"
-     "default_ca	= ca\n"
-     "\n"
-
-     "[ca]\n"
-     "dir		= $ROOTDIR/", CA, "\n"
-     "certs		= $dir/certs\n"
-     "crl_dir	        = $dir/crl\n"
-     "database	        = $dir/index.txt\n"
-     "new_certs_dir	= $dir/newcerts\n"
-     "certificate	= $dir/cert.pem\n"
-     "serial		= $dir/serial\n"
-     "crl		= $dir/crl.pem\n"
-     "private_key	= $dir/private/key.pem\n"
-     "RANDFILE	        = $dir/private/RAND\n"
-     "\n"
-     "x509_extensions   = user_cert\n"
-     "default_days	= 3600\n"
-     "default_md	= sha1\n"
-     "preserve	        = no\n"
-     "policy		= policy_match\n"
-     "\n"
-
-     "[policy_match]\n"
-     "commonName		= supplied\n"
-     "organizationalUnitName	= optional\n"
-     "organizationName	        = match\n"
-     "countryName		= match\n"
-     "localityName		= match\n"
-     "emailAddress		= supplied\n"
-     "\n"
-
-     "[user_cert]\n"
-     "basicConstraints	= CA:false\n"
-     "keyUsage 		= nonRepudiation, digitalSignature, keyEncipherment\n"
-     "subjectKeyIdentifier = hash\n"
-     "authorityKeyIdentifier = keyid,issuer:always\n"
-     "subjectAltName	= email:copy\n"
-     "issuerAltName	= issuer:copy\n"
-     "\n"
-
-     "[ca_cert]\n"
-     "basicConstraints 	= critical,CA:true\n"
-     "keyUsage 		= cRLSign, keyCertSign\n"
-     "subjectKeyIdentifier = hash\n"
-     "authorityKeyIdentifier = keyid:always,issuer:always\n"
-     "subjectAltName	= email:copy\n"
-     "issuerAltName	= issuer:copy\n"].
-
+    file:delete(filename:join(CaPath, "cert_key.pem")),
+    file:delete(filename:join(IPath, "cert_key.pem")),
+    file:rename(filename:join(CPath, "cert_key.pem"), filename:join(CPath, "key.pem")), 
+    file:rename(filename:join(SPath, "cert_key.pem"), filename:join(SPath, "key.pem")), 
+    ok.
 
diff --git a/lib/ssl/pkix/Makefile b/lib/ssl/pkix/Makefile
deleted file mode 100644
index 260361c025..0000000000
--- a/lib/ssl/pkix/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2003-2009. 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%
-#
-
-#
-
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(SSL_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/ssl-$(VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-.SUFFIXES: .asn1
-.PRECIOUS: %.erl
-
-ASN_TOP = OTP-PKIX
-ASN_MODULES = PKIX1Explicit88 PKIX1Implicit88 PKIX1Algorithms88 \
-	PKIXAttributeCertificate SSL-PKIX 
-ASN_ASNS = $(ASN_MODULES:%=%.asn1)
-ASN_ERLS = $(ASN_TOP).erl
-ASN_HRLS = $(ASN_TOP).hrl
-ASN_CONFIGS = OTP-PKIX.asn1config
-ASN_DBS = $(ASN_MODULES:%=%.asn1db)
-ASN_TABLES = $(ASN_MODULES:%=%.table)
-
-GEN_MODULES = ssl_pkix_oid $(ORBER_TMP_FIX_ERL)
-GEN_ERLS    = $(GEN_MODULES:%=%.erl)
-ERL_MODULES = $(ASN_TOP) $(GEN_MODULES)
-
-TARGET_FILES= $(ERL_MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-HRL_FILES = $(ASN_HRLS:%=$(INCLUDE)/%)
-
-ORBER_TMP_FIX_HRL = PKIX1Algorithms88.hrl PKIX1Explicit88.hrl \
-	PKIX1Implicit88.hrl PKIXAttributeCertificate.hrl
-
-INCLUDE = ../include
-EBIN = ../ebin
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-EXTRA_ERLC_FLAGS = 
-ERL_COMPILE_FLAGS += $(EXTRA_ERLC_FLAGS)
-
-ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj +asn1config +inline
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES) $(HRL_FILES)
-
-clean:
-	-rm -f $(ASN_ERLS) $(GEN_ERLS) $(ASN_HRLS) $(HRL_FILES) $(ASN_DBS) \
-		$(ASN_TABLES)  $(TARGET_FILES) *.beam *~
-
-docs:
-
-%.erl: %.set.asn
-	erlc $(ASN_FLAGS) $<
-
-ssl_pkix_oid.erl:	mk_ssl_pkix_oid.beam $(EBIN)/OTP-PKIX.beam
-	erl -pa $(EBIN) -noshell -s mk_ssl_pkix_oid make -s erlang halt
-
-$(HRL_FILES):	$(ASN_HRLS)
-	cp -p $(ASN_HRLS) $(INCLUDE)
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
-	$(INSTALL_DIR) $(RELSYSDIR)/pkix
-	$(INSTALL_DATA) $(ASN_ASNS) $(ASN_ERLS) $(ASN_HRLS) $(ASN_CONFIGS) \
-		$(ORBER_TMP_FIX_HRL) $(GEN_ERLS) mk_ssl_pkix_oid.erl $(RELSYSDIR)/pkix
-	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
-
-release_docs_spec:
-
-#
-# Dependencies
-
-$(EBIN)/OTP-PKIX.beam: 	OTP-PKIX.erl OTP-PKIX.hrl
-OTP-PKIX.erl OTP-PKIX.hrl:	OTP-PKIX.asn1db
-OTP-PKIX.asn1db:		PKIX1Algorithms88.asn1 \
-				PKIX1Explicit88.asn1 \
-				PKIX1Implicit88.asn1 \
-				PKIXAttributeCertificate.asn1 \
-				SSL-PKIX.asn1
diff --git a/lib/ssl/pkix/OTP-PKIX.asn1config b/lib/ssl/pkix/OTP-PKIX.asn1config
deleted file mode 100644
index 0caa158f52..0000000000
--- a/lib/ssl/pkix/OTP-PKIX.asn1config
+++ /dev/null
@@ -1,2 +0,0 @@
-{exclusive_decode,{'OTP-PKIX',
-        [{decode_TBSCert_exclusive,['Certificate',[{tbsCertificate,undecoded}]]}]}}.
diff --git a/lib/ssl/pkix/OTP-PKIX.set.asn b/lib/ssl/pkix/OTP-PKIX.set.asn
deleted file mode 100644
index 1c3483d519..0000000000
--- a/lib/ssl/pkix/OTP-PKIX.set.asn
+++ /dev/null
@@ -1,6 +0,0 @@
-SSL-PKIX.asn1
-PKIX1Explicit88.asn1
-PKIX1Implicit88.asn1
-PKIXAttributeCertificate.asn1
-PKIX1Algorithms88.asn1
-PKCS-1.asn1
diff --git a/lib/ssl/pkix/PKCS-1.asn1 b/lib/ssl/pkix/PKCS-1.asn1
deleted file mode 100755
index 547cc2e072..0000000000
--- a/lib/ssl/pkix/PKCS-1.asn1
+++ /dev/null
@@ -1,54 +0,0 @@
-PKCS-1 {
-    iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1)
-    modules(0) pkcs-1(1)
-}
-
-
-DEFINITIONS IMPLICIT TAGS ::= BEGIN
-
--- EXPORTS ALL --
-
-IMPORTS
-  AlgorithmIdentifier
-    FROM PKIX1Explicit88 {iso(1) identified-organization(3)
-                          dod(6) internet(1) security(5) mechanisms(5)
-                          pkix(7) id-mod(0) id-pkix1-explicit-88(1)} ;
-
-pkcs-1    OBJECT IDENTIFIER ::= {
-    iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 1 }
-
-RSAPrivateKey ::= SEQUENCE {
-    version           Version,
-    modulus           INTEGER,  -- n
-    publicExponent    INTEGER,  -- e
-    privateExponent   INTEGER,  -- d
-    prime1            INTEGER,  -- p
-    prime2            INTEGER,  -- q
-    exponent1         INTEGER,  -- d mod (p-1)
-    exponent2         INTEGER,  -- d mod (q-1)
-    coefficient       INTEGER,  -- (inverse of q) mod p
-    otherPrimeInfos   OtherPrimeInfos OPTIONAL
-}
-
-Version ::= INTEGER { two-prime(0), multi(1) }
-     (CONSTRAINED BY {
-         -- version must be multi if otherPrimeInfos present --
-     })
-
-OtherPrimeInfos ::= SEQUENCE SIZE(1..MAX) OF OtherPrimeInfo
-
-OtherPrimeInfo ::= SEQUENCE {
-    prime             INTEGER,  -- ri
-    exponent          INTEGER,  -- di
-    coefficient       INTEGER   -- ti
-}
-
-DigestInfo ::= SEQUENCE {
-	digestAlgorithm DigestAlgorithmIdentifier,
-	digest OCTET STRING
-}
-
-DigestAlgorithmIdentifier ::= AlgorithmIdentifier
-
-END  -- PKCS1Definitions
-
diff --git a/lib/ssl/pkix/PKIX1Algorithms88.asn1 b/lib/ssl/pkix/PKIX1Algorithms88.asn1
deleted file mode 100644
index e78de69b0e..0000000000
--- a/lib/ssl/pkix/PKIX1Algorithms88.asn1
+++ /dev/null
@@ -1,274 +0,0 @@
-   PKIX1Algorithms88 { iso(1) identified-organization(3) dod(6)
-   internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
-   id-mod-pkix1-algorithms(17) }
-
-   DEFINITIONS EXPLICIT TAGS ::= BEGIN
-
-   -- EXPORTS All;
-
-   -- IMPORTS NONE;
-
-   --
-   --   One-way Hash Functions
-   --
-
-   md2  OBJECT IDENTIFIER ::= {
-     iso(1) member-body(2) us(840) rsadsi(113549)
-     digestAlgorithm(2) 2 }
-
-   md5  OBJECT IDENTIFIER ::= {
-     iso(1) member-body(2) us(840) rsadsi(113549)
-     digestAlgorithm(2) 5 }
-
-   id-sha1  OBJECT IDENTIFIER ::= {
-     iso(1) identified-organization(3) oiw(14) secsig(3)
-     algorithms(2) 26 }
-
-   --
-   --   DSA Keys and Signatures
-   --
-
-   -- OID for DSA public key
-
-   id-dsa OBJECT IDENTIFIER ::= {
-        iso(1) member-body(2) us(840) x9-57(10040) x9algorithm(4) 1 }
-
-   -- encoding for DSA public key
-
-   DSAPublicKey ::= INTEGER  -- public key, y
-
-   Dss-Parms  ::=  SEQUENCE  {
-      p             INTEGER,
-      q             INTEGER,
-      g             INTEGER  }
-
-   -- OID for DSA signature generated with SHA-1 hash
-
-   id-dsa-with-sha1 OBJECT IDENTIFIER ::=  {
-        iso(1) member-body(2) us(840) x9-57 (10040) x9algorithm(4) 3 }
-
-   -- encoding for DSA signature generated with SHA-1 hash
-
-   Dss-Sig-Value  ::=  SEQUENCE  {
-      r       INTEGER,
-      s       INTEGER  }
-
-   --
-   --   RSA Keys and Signatures
-   --
-
-   -- arc for RSA public key and RSA signature OIDs
-
-   pkcs-1 OBJECT IDENTIFIER ::= {
-         iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 1 }
-
-   -- OID for RSA public keys
-
-   rsaEncryption OBJECT IDENTIFIER ::=  { pkcs-1 1 }
-
-   -- OID for RSA signature generated with MD2 hash
-
-   md2WithRSAEncryption OBJECT IDENTIFIER  ::=  { pkcs-1 2 }
-
-   -- OID for RSA signature generated with MD5 hash
-
-   md5WithRSAEncryption OBJECT IDENTIFIER  ::=  { pkcs-1 4 }
-
-   -- OID for RSA signature generated with SHA-1 hash
-
-   sha1WithRSAEncryption OBJECT IDENTIFIER  ::=  { pkcs-1 5 }
-
-   -- encoding for RSA public key
-
-   RSAPublicKey ::= SEQUENCE {
-      modulus            INTEGER,    -- n
-      publicExponent     INTEGER  }  -- e
-
-   --
-   --   Diffie-Hellman Keys
-   --
-
-   dhpublicnumber OBJECT IDENTIFIER ::= {
-        iso(1) member-body(2) us(840) ansi-x942(10046)
-        number-type(2) 1 }
-
-   -- encoding for DSA public key
-
-   DHPublicKey ::= INTEGER  -- public key, y = g^x mod p
-
-   DomainParameters ::= SEQUENCE {
-      p       INTEGER,           -- odd prime, p=jq +1
-      g       INTEGER,           -- generator, g
-      q       INTEGER,           -- factor of p-1
-      j       INTEGER OPTIONAL,  -- subgroup factor, j>= 2
-      validationParms  ValidationParms OPTIONAL }
-
-   ValidationParms ::= SEQUENCE {
-      seed             BIT STRING,
-      pgenCounter      INTEGER }
-
-   --
-   --   KEA Keys
-   --
-
-   id-keyExchangeAlgorithm  OBJECT IDENTIFIER  ::=
-        { 2 16 840 1 101 2 1 1 22 }
-
-   KEA-Parms-Id ::= OCTET STRING
-
-   --
-   --   Elliptic Curve Keys, Signatures, and Curves
-   --
-
-   ansi-X9-62 OBJECT IDENTIFIER ::= {
-        iso(1) member-body(2) us(840) 10045 }
-
-   FieldID ::= SEQUENCE {                    -- Finite field
-      fieldType   OBJECT IDENTIFIER,
-      parameters  ANY DEFINED BY fieldType }
-
-   -- Arc for ECDSA signature OIDS
-
-   id-ecSigType OBJECT IDENTIFIER ::= { ansi-X9-62 signatures(4) }
-
-   -- OID for ECDSA signatures with SHA-1
-
-   ecdsa-with-SHA1 OBJECT IDENTIFIER ::= { id-ecSigType 1 }
-
-   -- OID for an elliptic curve signature
-   -- format for the value of an ECDSA signature value
-
-   ECDSA-Sig-Value ::= SEQUENCE {
-      r     INTEGER,
-      s     INTEGER }
-
-   -- recognized field type OIDs are defined in the following arc
-
-   id-fieldType OBJECT IDENTIFIER ::= { ansi-X9-62 fieldType(1) }
-
-   -- where fieldType is prime-field, the parameters are of type Prime-p
-
-   prime-field OBJECT IDENTIFIER ::= { id-fieldType 1 }
-
-   Prime-p ::= INTEGER -- Finite field F(p), where p is an odd prime
-
-   -- where fieldType is characteristic-two-field, the parameters are
-   -- of type Characteristic-two
-
-   characteristic-two-field OBJECT IDENTIFIER ::= { id-fieldType 2 }
-
-   Characteristic-two ::= SEQUENCE {
-      m           INTEGER,                   -- Field size 2^m
-      basis       OBJECT IDENTIFIER,
-      parameters  ANY DEFINED BY basis }
-
-   -- recognized basis type OIDs are defined in the following arc
-
-   id-characteristic-two-basis OBJECT IDENTIFIER ::= {
-        characteristic-two-field basisType(3) }
-
-   -- gnbasis is identified by OID gnBasis and indicates
-   -- parameters are NULL
-
-   gnBasis OBJECT IDENTIFIER ::= { id-characteristic-two-basis 1 }
-
-   -- parameters for this basis are NULL
-
-   -- trinomial basis is identified by OID tpBasis and indicates
-   -- parameters of type Pentanomial
-
-   tpBasis OBJECT IDENTIFIER ::= { id-characteristic-two-basis 2 }
-
-   -- Trinomial basis representation of F2^m
-   -- Integer k for reduction polynomial xm + xk + 1
-
-   Trinomial ::= INTEGER
-
-   -- for pentanomial basis is identified by OID ppBasis and indicates
-   -- parameters of type Pentanomial
-
-   ppBasis OBJECT IDENTIFIER ::= { id-characteristic-two-basis 3 }
-
-   -- Pentanomial basis representation of F2^m
-   -- reduction polynomial integers k1, k2, k3
-   -- f(x) = x**m + x**k3 + x**k2 + x**k1 + 1
-
-   Pentanomial ::= SEQUENCE {
-      k1  INTEGER,
-      k2  INTEGER,
-      k3  INTEGER }
-
-   -- The object identifiers gnBasis, tpBasis and ppBasis name
-   -- three kinds of basis for characteristic-two finite fields
-
-   FieldElement ::= OCTET STRING             -- Finite field element
-
-   ECPoint  ::= OCTET STRING                 -- Elliptic curve point
-
-   -- Elliptic Curve parameters may be specified explicitly,
-   -- specified implicitly through a "named curve", or
-   -- inherited from the CA
-
-   EcpkParameters ::= CHOICE {
-      ecParameters  ECParameters,
-      namedCurve    OBJECT IDENTIFIER,
-      implicitlyCA  NULL }
-
-   ECParameters  ::= SEQUENCE {         -- Elliptic curve parameters
-      version   ECPVer,
-      fieldID   FieldID,
-      curve     Curve,
-      base      ECPoint,                -- Base point G
-      order     INTEGER,                -- Order n of the base point
-      cofactor  INTEGER  OPTIONAL }     -- The integer h = #E(Fq)/n
-
-   ECPVer ::= INTEGER {ecpVer1(1)}
-
-   Curve  ::= SEQUENCE {
-      a     FieldElement,            -- Elliptic curve coefficient a
-      b     FieldElement,            -- Elliptic curve coefficient b
-      seed  BIT STRING  OPTIONAL }
-
-   id-publicKeyType OBJECT IDENTIFIER  ::= { ansi-X9-62 keyType(2) }
-
-   id-ecPublicKey OBJECT IDENTIFIER ::= { id-publicKeyType 1 }
-
-   -- Named Elliptic Curves in ANSI X9.62.
-
-   ellipticCurve OBJECT IDENTIFIER ::= { ansi-X9-62 curves(3) }
-
-   c-TwoCurve OBJECT IDENTIFIER ::= {
-        ellipticCurve characteristicTwo(0) }
-
-   c2pnb163v1  OBJECT IDENTIFIER  ::=  { c-TwoCurve  1 }
-   c2pnb163v2  OBJECT IDENTIFIER  ::=  { c-TwoCurve  2 }
-   c2pnb163v3  OBJECT IDENTIFIER  ::=  { c-TwoCurve  3 }
-   c2pnb176w1  OBJECT IDENTIFIER  ::=  { c-TwoCurve  4 }
-   c2tnb191v1  OBJECT IDENTIFIER  ::=  { c-TwoCurve  5 }
-   c2tnb191v2  OBJECT IDENTIFIER  ::=  { c-TwoCurve  6 }
-   c2tnb191v3  OBJECT IDENTIFIER  ::=  { c-TwoCurve  7 }
-   c2onb191v4  OBJECT IDENTIFIER  ::=  { c-TwoCurve  8 }
-   c2onb191v5  OBJECT IDENTIFIER  ::=  { c-TwoCurve  9 }
-   c2pnb208w1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 10 }
-   c2tnb239v1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 11 }
-   c2tnb239v2  OBJECT IDENTIFIER  ::=  { c-TwoCurve 12 }
-   c2tnb239v3  OBJECT IDENTIFIER  ::=  { c-TwoCurve 13 }
-   c2onb239v4  OBJECT IDENTIFIER  ::=  { c-TwoCurve 14 }
-   c2onb239v5  OBJECT IDENTIFIER  ::=  { c-TwoCurve 15 }
-   c2pnb272w1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 16 }
-   c2pnb304w1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 17 }
-   c2tnb359v1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 18 }
-   c2pnb368w1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 19 }
-   c2tnb431r1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 20 }
-
-   primeCurve OBJECT IDENTIFIER ::= { ellipticCurve prime(1) }
-
-   prime192v1  OBJECT IDENTIFIER  ::=  { primeCurve  1 }
-   prime192v2  OBJECT IDENTIFIER  ::=  { primeCurve  2 }
-   prime192v3  OBJECT IDENTIFIER  ::=  { primeCurve  3 }
-   prime239v1  OBJECT IDENTIFIER  ::=  { primeCurve  4 }
-   prime239v2  OBJECT IDENTIFIER  ::=  { primeCurve  5 }
-   prime239v3  OBJECT IDENTIFIER  ::=  { primeCurve  6 }
-   prime256v1  OBJECT IDENTIFIER  ::=  { primeCurve  7 }
-
-   END
diff --git a/lib/ssl/pkix/PKIX1Algorithms88.hrl b/lib/ssl/pkix/PKIX1Algorithms88.hrl
deleted file mode 100644
index a11793618d..0000000000
--- a/lib/ssl/pkix/PKIX1Algorithms88.hrl
+++ /dev/null
@@ -1,94 +0,0 @@
-%% Generated by the Erlang ASN.1 compiler version:1.4.4.8
-%% Purpose: Erlang record definitions for each named and unnamed
-%% SEQUENCE and SET, and macro definitions for each value
-%% definition,in module PKIX1Algorithms88
-
-
-
--record('Dss-Parms',{
-p, q, g}).
-
--record('Dss-Sig-Value',{
-r, s}).
-
--record('RSAPublicKey',{
-modulus, publicExponent}).
-
--record('DomainParameters',{
-p, g, q, j = asn1_NOVALUE, validationParms = asn1_NOVALUE}).
-
--record('ValidationParms',{
-seed, pgenCounter}).
-
--record('FieldID',{
-fieldType, parameters}).
-
--record('ECDSA-Sig-Value',{
-r, s}).
-
--record('Characteristic-two',{
-m, basis, parameters}).
-
--record('Pentanomial',{
-k1, k2, k3}).
-
--record('ECParameters',{
-version, fieldID, curve, base, order, cofactor = asn1_NOVALUE}).
-
--record('Curve',{
-a, b, seed = asn1_NOVALUE}).
-
--define('md2', {1,2,840,113549,2,2}).
--define('md5', {1,2,840,113549,2,5}).
--define('id-sha1', {1,3,14,3,2,26}).
--define('id-dsa', {1,2,840,10040,4,1}).
--define('id-dsa-with-sha1', {1,2,840,10040,4,3}).
--define('pkcs-1', {1,2,840,113549,1,1}).
--define('rsaEncryption', {1,2,840,113549,1,1,1}).
--define('md2WithRSAEncryption', {1,2,840,113549,1,1,2}).
--define('md5WithRSAEncryption', {1,2,840,113549,1,1,4}).
--define('sha1WithRSAEncryption', {1,2,840,113549,1,1,5}).
--define('dhpublicnumber', {1,2,840,10046,2,1}).
--define('id-keyExchangeAlgorithm', {2,16,840,1,101,2,1,1,22}).
--define('ansi-X9-62', {1,2,840,10045}).
--define('id-ecSigType', {1,2,840,10045,4}).
--define('ecdsa-with-SHA1', {1,2,840,10045,4,1}).
--define('id-fieldType', {1,2,840,10045,1}).
--define('prime-field', {1,2,840,10045,1,1}).
--define('characteristic-two-field', {1,2,840,10045,1,2}).
--define('id-characteristic-two-basis', {1,2,840,10045,1,2,3}).
--define('gnBasis', {1,2,840,10045,1,2,3,1}).
--define('tpBasis', {1,2,840,10045,1,2,3,2}).
--define('ppBasis', {1,2,840,10045,1,2,3,3}).
--define('id-publicKeyType', {1,2,840,10045,2}).
--define('id-ecPublicKey', {1,2,840,10045,2,1}).
--define('ellipticCurve', {1,2,840,10045,3}).
--define('c-TwoCurve', {1,2,840,10045,3,0}).
--define('c2pnb163v1', {1,2,840,10045,3,0,1}).
--define('c2pnb163v2', {1,2,840,10045,3,0,2}).
--define('c2pnb163v3', {1,2,840,10045,3,0,3}).
--define('c2pnb176w1', {1,2,840,10045,3,0,4}).
--define('c2tnb191v1', {1,2,840,10045,3,0,5}).
--define('c2tnb191v2', {1,2,840,10045,3,0,6}).
--define('c2tnb191v3', {1,2,840,10045,3,0,7}).
--define('c2onb191v4', {1,2,840,10045,3,0,8}).
--define('c2onb191v5', {1,2,840,10045,3,0,9}).
--define('c2pnb208w1', {1,2,840,10045,3,0,10}).
--define('c2tnb239v1', {1,2,840,10045,3,0,11}).
--define('c2tnb239v2', {1,2,840,10045,3,0,12}).
--define('c2tnb239v3', {1,2,840,10045,3,0,13}).
--define('c2onb239v4', {1,2,840,10045,3,0,14}).
--define('c2onb239v5', {1,2,840,10045,3,0,15}).
--define('c2pnb272w1', {1,2,840,10045,3,0,16}).
--define('c2pnb304w1', {1,2,840,10045,3,0,17}).
--define('c2tnb359v1', {1,2,840,10045,3,0,18}).
--define('c2pnb368w1', {1,2,840,10045,3,0,19}).
--define('c2tnb431r1', {1,2,840,10045,3,0,20}).
--define('primeCurve', {1,2,840,10045,3,1}).
--define('prime192v1', {1,2,840,10045,3,1,1}).
--define('prime192v2', {1,2,840,10045,3,1,2}).
--define('prime192v3', {1,2,840,10045,3,1,3}).
--define('prime239v1', {1,2,840,10045,3,1,4}).
--define('prime239v2', {1,2,840,10045,3,1,5}).
--define('prime239v3', {1,2,840,10045,3,1,6}).
--define('prime256v1', {1,2,840,10045,3,1,7}).
diff --git a/lib/ssl/pkix/PKIX1Explicit88.asn1 b/lib/ssl/pkix/PKIX1Explicit88.asn1
deleted file mode 100644
index 9b8068fed0..0000000000
--- a/lib/ssl/pkix/PKIX1Explicit88.asn1
+++ /dev/null
@@ -1,619 +0,0 @@
-PKIX1Explicit88 { iso(1) identified-organization(3) dod(6) internet(1)
-  security(5) mechanisms(5) pkix(7) id-mod(0) id-pkix1-explicit(18) }
-
-DEFINITIONS EXPLICIT TAGS ::=
-
-BEGIN
-
--- EXPORTS ALL --
-
--- IMPORTS NONE --
-
--- UNIVERSAL Types defined in 1993 and 1998 ASN.1
--- and required by this specification
-
--- UniversalString ::= [UNIVERSAL 28] IMPLICIT OCTET STRING
-        -- UniversalString is defined in ASN.1:1993
-
--- BMPString ::= [UNIVERSAL 30] IMPLICIT OCTET STRING
-      -- BMPString is the subtype of UniversalString and models
-      -- the Basic Multilingual Plane of ISO/IEC/ITU 10646-1
-
--- UTF8String ::= [UNIVERSAL 12] IMPLICIT OCTET STRING
-      -- The content of this type conforms to RFC 2279.
-
--- PKIX specific OIDs
-
-id-pkix  OBJECT IDENTIFIER  ::=
-         { iso(1) identified-organization(3) dod(6) internet(1)
-                    security(5) mechanisms(5) pkix(7) }
-
--- PKIX arcs
-
-id-pe OBJECT IDENTIFIER  ::=  { id-pkix 1 }
-        -- arc for private certificate extensions
-id-qt OBJECT IDENTIFIER ::= { id-pkix 2 }
-        -- arc for policy qualifier types
-id-kp OBJECT IDENTIFIER ::= { id-pkix 3 }
-        -- arc for extended key purpose OIDS
-id-ad OBJECT IDENTIFIER ::= { id-pkix 48 }
-        -- arc for access descriptors
-
--- policyQualifierIds for Internet policy qualifiers
-
-id-qt-cps      OBJECT IDENTIFIER ::=  { id-qt 1 }
-      -- OID for CPS qualifier
-id-qt-unotice  OBJECT IDENTIFIER ::=  { id-qt 2 }
-      -- OID for user notice qualifier
-
--- access descriptor definitions
-
-id-ad-ocsp         OBJECT IDENTIFIER ::= { id-ad 1 }
-id-ad-caIssuers    OBJECT IDENTIFIER ::= { id-ad 2 }
-id-ad-timeStamping OBJECT IDENTIFIER ::= { id-ad 3 }
-id-ad-caRepository OBJECT IDENTIFIER ::= { id-ad 5 }
-
--- attribute data types
-
-Attribute       ::=     SEQUENCE {
-      type              AttributeType,
-      values    SET OF AttributeValue }
-            -- at least one value is required
-
-AttributeType           ::=  OBJECT IDENTIFIER
-
-AttributeValue          ::=  ANY
-
-AttributeTypeAndValue           ::=     SEQUENCE {
-        type    AttributeType,
-        value   AttributeValue }
-
--- suggested naming attributes: Definition of the following
---   information object set may be augmented to meet local
---   requirements.  Note that deleting members of the set may
---   prevent interoperability with conforming implementations.
--- presented in pairs: the AttributeType followed by the
---   type definition for the corresponding AttributeValue
---Arc for standard naming attributes
-id-at OBJECT IDENTIFIER ::= { joint-iso-ccitt(2) ds(5) 4 }
-
--- Naming attributes of type X520name
-
-id-at-name              AttributeType ::= { id-at 41 }
-id-at-surname           AttributeType ::= { id-at 4 }
-id-at-givenName         AttributeType ::= { id-at 42 }
-id-at-initials          AttributeType ::= { id-at 43 }
-id-at-generationQualifier AttributeType ::= { id-at 44 }
-
-X520name ::= CHOICE {
-      teletexString     TeletexString   (SIZE (1..ub-name)),
-      printableString   PrintableString (SIZE (1..ub-name)),
-      universalString   UniversalString (SIZE (1..ub-name)),
-      utf8String        UTF8String      (SIZE (1..ub-name)),
-      bmpString         BMPString       (SIZE (1..ub-name)) }
-
--- Naming attributes of type X520CommonName
-
-id-at-commonName        AttributeType ::= { id-at 3 }
-
-X520CommonName ::= CHOICE {
-      teletexString     TeletexString   (SIZE (1..ub-common-name)),
-      printableString   PrintableString (SIZE (1..ub-common-name)),
-      universalString   UniversalString (SIZE (1..ub-common-name)),
-      utf8String        UTF8String      (SIZE (1..ub-common-name)),
-      bmpString         BMPString       (SIZE (1..ub-common-name)) }
-
--- Naming attributes of type X520LocalityName
-
-id-at-localityName      AttributeType ::= { id-at 7 }
-
-X520LocalityName ::= CHOICE {
-      teletexString     TeletexString   (SIZE (1..ub-locality-name)),
-      printableString   PrintableString (SIZE (1..ub-locality-name)),
-      universalString   UniversalString (SIZE (1..ub-locality-name)),
-      utf8String        UTF8String      (SIZE (1..ub-locality-name)),
-      bmpString         BMPString       (SIZE (1..ub-locality-name)) }
-
--- Naming attributes of type X520StateOrProvinceName
-
-id-at-stateOrProvinceName AttributeType ::= { id-at 8 }
-
-X520StateOrProvinceName ::= CHOICE {
-      teletexString     TeletexString   (SIZE (1..ub-state-name)),
-      printableString   PrintableString (SIZE (1..ub-state-name)),
-      universalString   UniversalString (SIZE (1..ub-state-name)),
-      utf8String        UTF8String      (SIZE (1..ub-state-name)),
-      bmpString         BMPString       (SIZE(1..ub-state-name)) }
-
--- Naming attributes of type X520OrganizationName
-
-id-at-organizationName  AttributeType ::= { id-at 10 }
-
-X520OrganizationName ::= CHOICE {
-      teletexString     TeletexString
-                          (SIZE (1..ub-organization-name)),
-      printableString   PrintableString
-                          (SIZE (1..ub-organization-name)),
-      universalString   UniversalString
-                          (SIZE (1..ub-organization-name)),
-      utf8String        UTF8String
-                          (SIZE (1..ub-organization-name)),
-      bmpString         BMPString
-                          (SIZE (1..ub-organization-name))  }
-
--- Naming attributes of type X520OrganizationalUnitName
-
-id-at-organizationalUnitName AttributeType ::= { id-at 11 }
-
-X520OrganizationalUnitName ::= CHOICE {
-      teletexString     TeletexString
-                          (SIZE (1..ub-organizational-unit-name)),
-      printableString   PrintableString
-                          (SIZE (1..ub-organizational-unit-name)),
-      universalString   UniversalString
-                          (SIZE (1..ub-organizational-unit-name)),
-      utf8String        UTF8String
-                          (SIZE (1..ub-organizational-unit-name)),
-      bmpString         BMPString
-                          (SIZE (1..ub-organizational-unit-name)) }
-
--- Naming attributes of type X520Title
-
-id-at-title             AttributeType ::= { id-at 12 }
-
-X520Title ::= CHOICE {
-      teletexString     TeletexString   (SIZE (1..ub-title)),
-      printableString   PrintableString (SIZE (1..ub-title)),
-      universalString   UniversalString (SIZE (1..ub-title)),
-      utf8String        UTF8String      (SIZE (1..ub-title)),
-      bmpString         BMPString       (SIZE (1..ub-title)) }
-
--- Naming attributes of type X520dnQualifier
-
-id-at-dnQualifier       AttributeType ::= { id-at 46 }
-
-X520dnQualifier ::=     PrintableString
-
--- Naming attributes of type X520countryName (digraph from IS 3166)
-
-id-at-countryName       AttributeType ::= { id-at 6 }
-
-X520countryName ::=     PrintableString (SIZE (2))
-
--- Naming attributes of type X520SerialNumber
-
-id-at-serialNumber      AttributeType ::= { id-at 5 }
-
-X520SerialNumber ::=    PrintableString (SIZE (1..ub-serial-number))
-
--- Naming attributes of type X520Pseudonym
-
-id-at-pseudonym         AttributeType ::= { id-at 65 }
-
-X520Pseudonym ::= CHOICE {
-   teletexString     TeletexString   (SIZE (1..ub-pseudonym)),
-   printableString   PrintableString (SIZE (1..ub-pseudonym)),
-   universalString   UniversalString (SIZE (1..ub-pseudonym)),
-   utf8String        UTF8String      (SIZE (1..ub-pseudonym)),
-   bmpString         BMPString       (SIZE (1..ub-pseudonym)) }
-
--- Naming attributes of type DomainComponent (from RFC 2247)
-
-id-domainComponent      AttributeType ::=
-                          { 0 9 2342 19200300 100 1 25 }
-
-DomainComponent ::=     IA5String
-
--- Legacy attributes
-
-pkcs-9 OBJECT IDENTIFIER ::=
-       { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 9 }
-
-id-emailAddress          AttributeType ::= { pkcs-9 1 }
-
-EmailAddress ::=         IA5String (SIZE (1..ub-emailaddress-length))
-
--- naming data types --
-
-Name ::= CHOICE { -- only one possibility for now --
-      rdnSequence  RDNSequence }
-
-RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
-
-DistinguishedName ::=   RDNSequence
-
-RelativeDistinguishedName  ::=
-                    SET SIZE (1 .. MAX) OF AttributeTypeAndValue
-
--- Directory string type --
-
-DirectoryString ::= CHOICE {
-      teletexString             TeletexString   (SIZE (1..MAX)),
-      printableString           PrintableString (SIZE (1..MAX)),
-      universalString           UniversalString (SIZE (1..MAX)),
-      utf8String              UTF8String      (SIZE (1..MAX)),
-      bmpString               BMPString       (SIZE (1..MAX)) }
-
--- certificate and CRL specific structures begin here
-
-Certificate  ::=  SEQUENCE  {
-     tbsCertificate       TBSCertificate,
-     signatureAlgorithm   AlgorithmIdentifier,
-     signature            BIT STRING  }
-
-TBSCertificate  ::=  SEQUENCE  {
-     version         [0]  Version DEFAULT v1,
-     serialNumber         CertificateSerialNumber,
-     signature            AlgorithmIdentifier,
-     issuer               Name,
-     validity             Validity,
-     subject              Name,
-     subjectPublicKeyInfo SubjectPublicKeyInfo,
-     issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
-                          -- If present, version MUST be v2 or v3
-     subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
-                          -- If present, version MUST be v2 or v3
-     extensions      [3]  Extensions OPTIONAL
-                          -- If present, version MUST be v3 --  }
-
-Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
-
-CertificateSerialNumber  ::=  INTEGER
-
-Validity ::= SEQUENCE {
-     notBefore      Time,
-     notAfter       Time  }
-
-Time ::= CHOICE {
-     utcTime        UTCTime,
-     generalTime    GeneralizedTime }
-
-UniqueIdentifier  ::=  BIT STRING
-
-SubjectPublicKeyInfo  ::=  SEQUENCE  {
-     algorithm            AlgorithmIdentifier,
-     subjectPublicKey     BIT STRING  }
-
-Extensions  ::=  SEQUENCE SIZE (1..MAX) OF Extension
-
-Extension  ::=  SEQUENCE  {
-     extnID      OBJECT IDENTIFIER,
-     critical    BOOLEAN DEFAULT FALSE,
-     extnValue   OCTET STRING  }
-
--- CRL structures
-
-CertificateList  ::=  SEQUENCE  {
-     tbsCertList          TBSCertList,
-     signatureAlgorithm   AlgorithmIdentifier,
-     signature            BIT STRING  }
-
-TBSCertList  ::=  SEQUENCE  {
-     version                 Version OPTIONAL,
-                                  -- if present, MUST be v2
-     signature               AlgorithmIdentifier,
-     issuer                  Name,
-     thisUpdate              Time,
-     nextUpdate              Time OPTIONAL,
-     revokedCertificates     SEQUENCE OF SEQUENCE  {
-          userCertificate         CertificateSerialNumber,
-          revocationDate          Time,
-          crlEntryExtensions      Extensions OPTIONAL
-                                         -- if present, MUST be v2
-                               }  OPTIONAL,
-     crlExtensions           [0] Extensions OPTIONAL }
-                                         -- if present, MUST be v2
-
--- Version, Time, CertificateSerialNumber, and Extensions were
--- defined earlier for use in the certificate structure
-
-AlgorithmIdentifier  ::=  SEQUENCE  {
-     algorithm               OBJECT IDENTIFIER,
-     parameters              ANY DEFINED BY algorithm OPTIONAL  }
-                                -- contains a value of the type
-                                -- registered for use with the
-                                -- algorithm object identifier value
-
--- X.400 address syntax starts here
-
-ORAddress ::= SEQUENCE {
-   built-in-standard-attributes BuiltInStandardAttributes,
-   built-in-domain-defined-attributes
-                   BuiltInDomainDefinedAttributes OPTIONAL,
-   -- see also teletex-domain-defined-attributes
-   extension-attributes ExtensionAttributes OPTIONAL }
-
--- Built-in Standard Attributes
-
-BuiltInStandardAttributes ::= SEQUENCE {
-   country-name                  CountryName OPTIONAL,
-   administration-domain-name    AdministrationDomainName OPTIONAL,
-   network-address           [0] IMPLICIT NetworkAddress OPTIONAL,
-     -- see also extended-network-address
-   terminal-identifier       [1] IMPLICIT TerminalIdentifier OPTIONAL,
-   private-domain-name       [2] PrivateDomainName OPTIONAL,
-   organization-name         [3] IMPLICIT OrganizationName OPTIONAL,
-     -- see also teletex-organization-name
-   numeric-user-identifier   [4] IMPLICIT NumericUserIdentifier
-                                 OPTIONAL,
-   personal-name             [5] IMPLICIT PersonalName OPTIONAL,
-     -- see also teletex-personal-name
-   organizational-unit-names [6] IMPLICIT OrganizationalUnitNames
-                                 OPTIONAL }
-     -- see also teletex-organizational-unit-names
-
-CountryName ::= [APPLICATION 1] CHOICE {
-   x121-dcc-code         NumericString
-                           (SIZE (ub-country-name-numeric-length)),
-   iso-3166-alpha2-code  PrintableString
-                           (SIZE (ub-country-name-alpha-length)) }
-
-AdministrationDomainName ::= [APPLICATION 2] CHOICE {
-   numeric   NumericString   (SIZE (0..ub-domain-name-length)),
-   printable PrintableString (SIZE (0..ub-domain-name-length)) }
-
-NetworkAddress ::= X121Address  -- see also extended-network-address
-
-X121Address ::= NumericString (SIZE (1..ub-x121-address-length))
-
-TerminalIdentifier ::= PrintableString (SIZE
-(1..ub-terminal-id-length))
-
-PrivateDomainName ::= CHOICE {
-   numeric   NumericString   (SIZE (1..ub-domain-name-length)),
-   printable PrintableString (SIZE (1..ub-domain-name-length)) }
-
-OrganizationName ::= PrintableString
-                            (SIZE (1..ub-organization-name-length))
-  -- see also teletex-organization-name
-
-NumericUserIdentifier ::= NumericString
-                            (SIZE (1..ub-numeric-user-id-length))
-
-PersonalName ::= SET {
-   surname     [0] IMPLICIT PrintableString
-                    (SIZE (1..ub-surname-length)),
-   given-name  [1] IMPLICIT PrintableString
-                    (SIZE (1..ub-given-name-length)) OPTIONAL,
-   initials    [2] IMPLICIT PrintableString
-                    (SIZE (1..ub-initials-length)) OPTIONAL,
-   generation-qualifier [3] IMPLICIT PrintableString
-                    (SIZE (1..ub-generation-qualifier-length))
-                    OPTIONAL }
-  -- see also teletex-personal-name
-
-OrganizationalUnitNames ::= SEQUENCE SIZE (1..ub-organizational-units)
-                             OF OrganizationalUnitName
-  -- see also teletex-organizational-unit-names
-
-OrganizationalUnitName ::= PrintableString (SIZE
-                    (1..ub-organizational-unit-name-length))
-
--- Built-in Domain-defined Attributes
-
-BuiltInDomainDefinedAttributes ::= SEQUENCE SIZE
-                    (1..ub-domain-defined-attributes) OF
-                    BuiltInDomainDefinedAttribute
-
-BuiltInDomainDefinedAttribute ::= SEQUENCE {
-   type PrintableString (SIZE
-                   (1..ub-domain-defined-attribute-type-length)),
-   value PrintableString (SIZE
-                   (1..ub-domain-defined-attribute-value-length)) }
-
--- Extension Attributes
-
-ExtensionAttributes ::= SET SIZE (1..ub-extension-attributes) OF
-               ExtensionAttribute
-
-ExtensionAttribute ::=  SEQUENCE {
-   extension-attribute-type [0] IMPLICIT INTEGER
-                   (0..ub-extension-attributes),
-   extension-attribute-value [1]
-                   ANY DEFINED BY extension-attribute-type }
-
--- Extension types and attribute values
-
-common-name INTEGER ::= 1
-
-CommonName ::= PrintableString (SIZE (1..ub-common-name-length))
-
-teletex-common-name INTEGER ::= 2
-
-TeletexCommonName ::= TeletexString (SIZE (1..ub-common-name-length))
-
-teletex-organization-name INTEGER ::= 3
-
-TeletexOrganizationName ::=
-                TeletexString (SIZE (1..ub-organization-name-length))
-
-teletex-personal-name INTEGER ::= 4
-
-TeletexPersonalName ::= SET {
-   surname     [0] IMPLICIT TeletexString
-                    (SIZE (1..ub-surname-length)),
-   given-name  [1] IMPLICIT TeletexString
-                    (SIZE (1..ub-given-name-length)) OPTIONAL,
-   initials    [2] IMPLICIT TeletexString
-                    (SIZE (1..ub-initials-length)) OPTIONAL,
-   generation-qualifier [3] IMPLICIT TeletexString
-                    (SIZE (1..ub-generation-qualifier-length))
-                    OPTIONAL }
-
-teletex-organizational-unit-names INTEGER ::= 5
-
-TeletexOrganizationalUnitNames ::= SEQUENCE SIZE
-      (1..ub-organizational-units) OF TeletexOrganizationalUnitName
-
-TeletexOrganizationalUnitName ::= TeletexString
-                  (SIZE (1..ub-organizational-unit-name-length))
-
-pds-name INTEGER ::= 7
-
-PDSName ::= PrintableString (SIZE (1..ub-pds-name-length))
-
-physical-delivery-country-name INTEGER ::= 8
-
-PhysicalDeliveryCountryName ::= CHOICE {
-   x121-dcc-code NumericString (SIZE
-(ub-country-name-numeric-length)),
-   iso-3166-alpha2-code PrintableString
-                  (SIZE (ub-country-name-alpha-length)) }
-
-postal-code INTEGER ::= 9
-
-PostalCode ::= CHOICE {
-   numeric-code NumericString (SIZE (1..ub-postal-code-length)),
-   printable-code PrintableString (SIZE (1..ub-postal-code-length)) }
-
-physical-delivery-office-name INTEGER ::= 10
-
-PhysicalDeliveryOfficeName ::= PDSParameter
-
-physical-delivery-office-number INTEGER ::= 11
-
-PhysicalDeliveryOfficeNumber ::= PDSParameter
-
-extension-OR-address-components INTEGER ::= 12
-
-ExtensionORAddressComponents ::= PDSParameter
-
-physical-delivery-personal-name INTEGER ::= 13
-
-PhysicalDeliveryPersonalName ::= PDSParameter
-
-physical-delivery-organization-name INTEGER ::= 14
-
-PhysicalDeliveryOrganizationName ::= PDSParameter
-
-extension-physical-delivery-address-components INTEGER ::= 15
-
-ExtensionPhysicalDeliveryAddressComponents ::= PDSParameter
-
-unformatted-postal-address INTEGER ::= 16
-
-UnformattedPostalAddress ::= SET {
-   printable-address SEQUENCE SIZE (1..ub-pds-physical-address-lines)
-         OF PrintableString (SIZE (1..ub-pds-parameter-length))
-         OPTIONAL,
-   teletex-string TeletexString
-         (SIZE (1..ub-unformatted-address-length)) OPTIONAL }
-
-street-address INTEGER ::= 17
-
-StreetAddress ::= PDSParameter
-
-post-office-box-address INTEGER ::= 18
-
-PostOfficeBoxAddress ::= PDSParameter
-
-poste-restante-address INTEGER ::= 19
-
-PosteRestanteAddress ::= PDSParameter
-
-unique-postal-name INTEGER ::= 20
-
-UniquePostalName ::= PDSParameter
-
-local-postal-attributes INTEGER ::= 21
-
-LocalPostalAttributes ::= PDSParameter
-
-PDSParameter ::= SET {
-   printable-string PrintableString
-                (SIZE(1..ub-pds-parameter-length)) OPTIONAL,
-   teletex-string TeletexString
-                (SIZE(1..ub-pds-parameter-length)) OPTIONAL }
-
-extended-network-address INTEGER ::= 22
-
-ExtendedNetworkAddress ::= CHOICE {
-   e163-4-address SEQUENCE {
-      number      [0] IMPLICIT NumericString
-                       (SIZE (1..ub-e163-4-number-length)),
-      sub-address [1] IMPLICIT NumericString
-                       (SIZE (1..ub-e163-4-sub-address-length))
-                       OPTIONAL },
-   psap-address [0] IMPLICIT PresentationAddress }
-
-PresentationAddress ::= SEQUENCE {
-    pSelector     [0] EXPLICIT OCTET STRING OPTIONAL,
-    sSelector     [1] EXPLICIT OCTET STRING OPTIONAL,
-    tSelector     [2] EXPLICIT OCTET STRING OPTIONAL,
-    nAddresses    [3] EXPLICIT SET SIZE (1..MAX) OF OCTET STRING }
-
-terminal-type  INTEGER ::= 23
-
-TerminalType ::= INTEGER {
-   telex (3),
-   teletex (4),
-   g3-facsimile (5),
-   g4-facsimile (6),
-   ia5-terminal (7),
-   videotex (8) } (0..ub-integer-options)
-
--- Extension Domain-defined Attributes
-
-teletex-domain-defined-attributes INTEGER ::= 6
-
-TeletexDomainDefinedAttributes ::= SEQUENCE SIZE
-   (1..ub-domain-defined-attributes) OF TeletexDomainDefinedAttribute
-
-TeletexDomainDefinedAttribute ::= SEQUENCE {
-        type TeletexString
-               (SIZE (1..ub-domain-defined-attribute-type-length)),
-        value TeletexString
-               (SIZE (1..ub-domain-defined-attribute-value-length)) }
-
---  specifications of Upper Bounds MUST be regarded as mandatory
---  from Annex B of ITU-T X.411 Reference Definition of MTS Parameter
---  Upper Bounds
-
--- Upper Bounds
-ub-name INTEGER ::= 32768
-ub-common-name INTEGER ::= 64
-ub-locality-name INTEGER ::= 128
-ub-state-name INTEGER ::= 128
-ub-organization-name INTEGER ::= 64
-ub-organizational-unit-name INTEGER ::= 64
-ub-title INTEGER ::= 64
-ub-serial-number INTEGER ::= 64
-ub-match INTEGER ::= 128
-ub-emailaddress-length INTEGER ::= 128
-ub-common-name-length INTEGER ::= 64
-ub-country-name-alpha-length INTEGER ::= 2
-ub-country-name-numeric-length INTEGER ::= 3
-ub-domain-defined-attributes INTEGER ::= 4
-ub-domain-defined-attribute-type-length INTEGER ::= 8
-ub-domain-defined-attribute-value-length INTEGER ::= 128
-ub-domain-name-length INTEGER ::= 16
-ub-extension-attributes INTEGER ::= 256
-ub-e163-4-number-length INTEGER ::= 15
-ub-e163-4-sub-address-length INTEGER ::= 40
-ub-generation-qualifier-length INTEGER ::= 3
-ub-given-name-length INTEGER ::= 16
-ub-initials-length INTEGER ::= 5
-ub-integer-options INTEGER ::= 256
-ub-numeric-user-id-length INTEGER ::= 32
-ub-organization-name-length INTEGER ::= 64
-ub-organizational-unit-name-length INTEGER ::= 32
-ub-organizational-units INTEGER ::= 4
-ub-pds-name-length INTEGER ::= 16
-ub-pds-parameter-length INTEGER ::= 30
-ub-pds-physical-address-lines INTEGER ::= 6
-ub-postal-code-length INTEGER ::= 16
-ub-pseudonym INTEGER ::= 128
-ub-surname-length INTEGER ::= 40
-ub-terminal-id-length INTEGER ::= 24
-ub-unformatted-address-length INTEGER ::= 180
-ub-x121-address-length INTEGER ::= 16
-
--- Note - upper bounds on string types, such as TeletexString, are
--- measured in characters.  Excepting PrintableString or IA5String, a
--- significantly greater number of octets will be required to hold
--- such a value.  As a minimum, 16 octets, or twice the specified
--- upper bound, whichever is the larger, should be allowed for
--- TeletexString.  For UTF8String or UniversalString at least four
--- times the upper bound should be allowed.
-
-END
diff --git a/lib/ssl/pkix/PKIX1Explicit88.hrl b/lib/ssl/pkix/PKIX1Explicit88.hrl
deleted file mode 100644
index 5940c1e245..0000000000
--- a/lib/ssl/pkix/PKIX1Explicit88.hrl
+++ /dev/null
@@ -1,163 +0,0 @@
-%% Generated by the Erlang ASN.1 compiler version:1.4.4.8
-%% Purpose: Erlang record definitions for each named and unnamed
-%% SEQUENCE and SET, and macro definitions for each value
-%% definition,in module PKIX1Explicit88
-
-
-
--record('Attribute',{
-type, values}).
-
--record('AttributeTypeAndValue',{
-type, value}).
-
--record('Certificate',{
-tbsCertificate, signatureAlgorithm, signature}).
-
--record('TBSCertificate',{
-version = asn1_DEFAULT, serialNumber, signature, issuer, validity, subject, subjectPublicKeyInfo, issuerUniqueID = asn1_NOVALUE, subjectUniqueID = asn1_NOVALUE, extensions = asn1_NOVALUE}).
-
--record('Validity',{
-notBefore, notAfter}).
-
--record('SubjectPublicKeyInfo',{
-algorithm, subjectPublicKey}).
-
--record('Extension',{
-extnID, critical = asn1_DEFAULT, extnValue}).
-
--record('CertificateList',{
-tbsCertList, signatureAlgorithm, signature}).
-
--record('TBSCertList',{
-version = asn1_NOVALUE, signature, issuer, thisUpdate, nextUpdate = asn1_NOVALUE, revokedCertificates = asn1_NOVALUE, crlExtensions = asn1_NOVALUE}).
-
--record('TBSCertList_revokedCertificates_SEQOF',{
-userCertificate, revocationDate, crlEntryExtensions = asn1_NOVALUE}).
-
--record('AlgorithmIdentifier',{
-algorithm, parameters = asn1_NOVALUE}).
-
--record('ORAddress',{
-'built-in-standard-attributes', 'built-in-domain-defined-attributes' = asn1_NOVALUE, 'extension-attributes' = asn1_NOVALUE}).
-
--record('BuiltInStandardAttributes',{
-'country-name' = asn1_NOVALUE, 'administration-domain-name' = asn1_NOVALUE, 'network-address' = asn1_NOVALUE, 'terminal-identifier' = asn1_NOVALUE, 'private-domain-name' = asn1_NOVALUE, 'organization-name' = asn1_NOVALUE, 'numeric-user-identifier' = asn1_NOVALUE, 'personal-name' = asn1_NOVALUE, 'organizational-unit-names' = asn1_NOVALUE}).
-
--record('PersonalName',{
-surname, 'given-name' = asn1_NOVALUE, initials = asn1_NOVALUE, 'generation-qualifier' = asn1_NOVALUE}).
-
--record('BuiltInDomainDefinedAttribute',{
-type, value}).
-
--record('ExtensionAttribute',{
-'extension-attribute-type', 'extension-attribute-value'}).
-
--record('TeletexPersonalName',{
-surname, 'given-name' = asn1_NOVALUE, initials = asn1_NOVALUE, 'generation-qualifier' = asn1_NOVALUE}).
-
--record('UnformattedPostalAddress',{
-'printable-address' = asn1_NOVALUE, 'teletex-string' = asn1_NOVALUE}).
-
--record('PDSParameter',{
-'printable-string' = asn1_NOVALUE, 'teletex-string' = asn1_NOVALUE}).
-
--record('ExtendedNetworkAddress_e163-4-address',{
-number, 'sub-address' = asn1_NOVALUE}).
-
--record('PresentationAddress',{
-pSelector = asn1_NOVALUE, sSelector = asn1_NOVALUE, tSelector = asn1_NOVALUE, nAddresses}).
-
--record('TeletexDomainDefinedAttribute',{
-type, value}).
-
--define('id-pkix', {1,3,6,1,5,5,7}).
--define('id-pe', {1,3,6,1,5,5,7,1}).
--define('id-qt', {1,3,6,1,5,5,7,2}).
--define('id-kp', {1,3,6,1,5,5,7,3}).
--define('id-ad', {1,3,6,1,5,5,7,48}).
--define('id-qt-cps', {1,3,6,1,5,5,7,2,1}).
--define('id-qt-unotice', {1,3,6,1,5,5,7,2,2}).
--define('id-ad-ocsp', {1,3,6,1,5,5,7,48,1}).
--define('id-ad-caIssuers', {1,3,6,1,5,5,7,48,2}).
--define('id-ad-timeStamping', {1,3,6,1,5,5,7,48,3}).
--define('id-ad-caRepository', {1,3,6,1,5,5,7,48,5}).
--define('id-at', {2,5,4}).
--define('id-at-name', {2,5,4,41}).
--define('id-at-surname', {2,5,4,4}).
--define('id-at-givenName', {2,5,4,42}).
--define('id-at-initials', {2,5,4,43}).
--define('id-at-generationQualifier', {2,5,4,44}).
--define('id-at-commonName', {2,5,4,3}).
--define('id-at-localityName', {2,5,4,7}).
--define('id-at-stateOrProvinceName', {2,5,4,8}).
--define('id-at-organizationName', {2,5,4,10}).
--define('id-at-organizationalUnitName', {2,5,4,11}).
--define('id-at-title', {2,5,4,12}).
--define('id-at-dnQualifier', {2,5,4,46}).
--define('id-at-countryName', {2,5,4,6}).
--define('id-at-serialNumber', {2,5,4,5}).
--define('id-at-pseudonym', {2,5,4,65}).
--define('id-domainComponent', {0,9,2342,19200300,100,1,25}).
--define('pkcs-9', {1,2,840,113549,1,9}).
--define('id-emailAddress', {1,2,840,113549,1,9,1}).
--define('common-name', 1).
--define('teletex-common-name', 2).
--define('teletex-organization-name', 3).
--define('teletex-personal-name', 4).
--define('teletex-organizational-unit-names', 5).
--define('pds-name', 7).
--define('physical-delivery-country-name', 8).
--define('postal-code', 9).
--define('physical-delivery-office-name', 10).
--define('physical-delivery-office-number', 11).
--define('extension-OR-address-components', 12).
--define('physical-delivery-personal-name', 13).
--define('physical-delivery-organization-name', 14).
--define('extension-physical-delivery-address-components', 15).
--define('unformatted-postal-address', 16).
--define('street-address', 17).
--define('post-office-box-address', 18).
--define('poste-restante-address', 19).
--define('unique-postal-name', 20).
--define('local-postal-attributes', 21).
--define('extended-network-address', 22).
--define('terminal-type', 23).
--define('teletex-domain-defined-attributes', 6).
--define('ub-name', 32768).
--define('ub-common-name', 64).
--define('ub-locality-name', 128).
--define('ub-state-name', 128).
--define('ub-organization-name', 64).
--define('ub-organizational-unit-name', 64).
--define('ub-title', 64).
--define('ub-serial-number', 64).
--define('ub-match', 128).
--define('ub-emailaddress-length', 128).
--define('ub-common-name-length', 64).
--define('ub-country-name-alpha-length', 2).
--define('ub-country-name-numeric-length', 3).
--define('ub-domain-defined-attributes', 4).
--define('ub-domain-defined-attribute-type-length', 8).
--define('ub-domain-defined-attribute-value-length', 128).
--define('ub-domain-name-length', 16).
--define('ub-extension-attributes', 256).
--define('ub-e163-4-number-length', 15).
--define('ub-e163-4-sub-address-length', 40).
--define('ub-generation-qualifier-length', 3).
--define('ub-given-name-length', 16).
--define('ub-initials-length', 5).
--define('ub-integer-options', 256).
--define('ub-numeric-user-id-length', 32).
--define('ub-organization-name-length', 64).
--define('ub-organizational-unit-name-length', 32).
--define('ub-organizational-units', 4).
--define('ub-pds-name-length', 16).
--define('ub-pds-parameter-length', 30).
--define('ub-pds-physical-address-lines', 6).
--define('ub-postal-code-length', 16).
--define('ub-pseudonym', 128).
--define('ub-surname-length', 40).
--define('ub-terminal-id-length', 24).
--define('ub-unformatted-address-length', 180).
--define('ub-x121-address-length', 16).
diff --git a/lib/ssl/pkix/PKIX1Implicit88.asn1 b/lib/ssl/pkix/PKIX1Implicit88.asn1
deleted file mode 100644
index ced270baf6..0000000000
--- a/lib/ssl/pkix/PKIX1Implicit88.asn1
+++ /dev/null
@@ -1,349 +0,0 @@
-PKIX1Implicit88 { iso(1) identified-organization(3) dod(6) internet(1)
-  security(5) mechanisms(5) pkix(7) id-mod(0) id-pkix1-implicit(19) }
-
-DEFINITIONS IMPLICIT TAGS ::=
-
-BEGIN
-
--- EXPORTS ALL --
-
-IMPORTS
-      id-pe, id-kp, id-qt-unotice, id-qt-cps,
-      -- delete following line if "new" types are supported --
-      -- BMPString, 
-      -- UTF8String,  end "new" types --
-      ORAddress, Name, RelativeDistinguishedName,
-      CertificateSerialNumber, Attribute, DirectoryString
-      FROM PKIX1Explicit88 { iso(1) identified-organization(3)
-            dod(6) internet(1) security(5) mechanisms(5) pkix(7)
-            id-mod(0) id-pkix1-explicit(18) };
-
-
--- ISO arc for standard certificate and CRL extensions
-
-id-ce OBJECT IDENTIFIER  ::=  {joint-iso-ccitt(2) ds(5) 29}
-
--- authority key identifier OID and syntax
-
-id-ce-authorityKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 35 }
-
-AuthorityKeyIdentifier ::= SEQUENCE {
-    keyIdentifier             [0] KeyIdentifier            OPTIONAL,
-    authorityCertIssuer       [1] GeneralNames             OPTIONAL,
-    authorityCertSerialNumber [2] CertificateSerialNumber  OPTIONAL }
-    -- authorityCertIssuer and authorityCertSerialNumber MUST both
-    -- be present or both be absent
-
-KeyIdentifier ::= OCTET STRING
-
--- subject key identifier OID and syntax
-
-id-ce-subjectKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 14 }
-
-SubjectKeyIdentifier ::= KeyIdentifier
-
--- key usage extension OID and syntax
-
-id-ce-keyUsage OBJECT IDENTIFIER ::=  { id-ce 15 }
-
-KeyUsage ::= BIT STRING {
-     digitalSignature        (0),
-     nonRepudiation          (1),
-     keyEncipherment         (2),
-     dataEncipherment        (3),
-     keyAgreement            (4),
-     keyCertSign             (5),
-     cRLSign                 (6),
-     encipherOnly            (7),
-     decipherOnly            (8) }
-
--- private key usage period extension OID and syntax
-
-id-ce-privateKeyUsagePeriod OBJECT IDENTIFIER ::=  { id-ce 16 }
-
-PrivateKeyUsagePeriod ::= SEQUENCE {
-     notBefore       [0]     GeneralizedTime OPTIONAL,
-     notAfter        [1]     GeneralizedTime OPTIONAL }
-     -- either notBefore or notAfter MUST be present
-
--- certificate policies extension OID and syntax
-
-id-ce-certificatePolicies OBJECT IDENTIFIER ::=  { id-ce 32 }
-
-anyPolicy OBJECT IDENTIFIER ::= { id-ce-certificatePolicies 0 }
-
-CertificatePolicies ::= SEQUENCE SIZE (1..MAX) OF PolicyInformation
-
-PolicyInformation ::= SEQUENCE {
-     policyIdentifier   CertPolicyId,
-     policyQualifiers   SEQUENCE SIZE (1..MAX) OF
-             PolicyQualifierInfo OPTIONAL }
-
-CertPolicyId ::= OBJECT IDENTIFIER
-
-PolicyQualifierInfo ::= SEQUENCE {
-       policyQualifierId  PolicyQualifierId,
-       qualifier        ANY DEFINED BY policyQualifierId }
-
--- Implementations that recognize additional policy qualifiers MUST
--- augment the following definition for PolicyQualifierId
-
-PolicyQualifierId ::=
-    OBJECT IDENTIFIER ( id-qt-cps | id-qt-unotice )
-
--- CPS pointer qualifier
-
-CPSuri ::= IA5String
-
--- user notice qualifier
-
-UserNotice ::= SEQUENCE {
-     noticeRef        NoticeReference OPTIONAL,
-     explicitText     DisplayText OPTIONAL}
-
-NoticeReference ::= SEQUENCE {
-     organization     DisplayText,
-     noticeNumbers    SEQUENCE OF INTEGER }
-
-DisplayText ::= CHOICE {
-     ia5String        IA5String      (SIZE (1..200)),
-     visibleString    VisibleString  (SIZE (1..200)),
-     bmpString        BMPString      (SIZE (1..200)),
-     utf8String       UTF8String     (SIZE (1..200)) }
-
--- policy mapping extension OID and syntax
-
-id-ce-policyMappings OBJECT IDENTIFIER ::=  { id-ce 33 }
-
-PolicyMappings ::= SEQUENCE SIZE (1..MAX) OF SEQUENCE {
-     issuerDomainPolicy      CertPolicyId,
-     subjectDomainPolicy     CertPolicyId }
-
--- subject alternative name extension OID and syntax
-
-id-ce-subjectAltName OBJECT IDENTIFIER ::=  { id-ce 17 }
-
-SubjectAltName ::= GeneralNames
-
-GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
-
-GeneralName ::= CHOICE {
-     otherName                       [0]     AnotherName,
-     rfc822Name                      [1]     IA5String,
-     dNSName                         [2]     IA5String,
-     x400Address                     [3]     ORAddress,
-     directoryName                   [4]     Name,
-     ediPartyName                    [5]     EDIPartyName,
-     uniformResourceIdentifier       [6]     IA5String,
-     iPAddress                       [7]     OCTET STRING,
-     registeredID                    [8]     OBJECT IDENTIFIER }
-
--- AnotherName replaces OTHER-NAME ::= TYPE-IDENTIFIER, as
--- TYPE-IDENTIFIER is not supported in the '88 ASN.1 syntax
-
-AnotherName ::= SEQUENCE {
-     type-id    OBJECT IDENTIFIER,
-     value      [0] EXPLICIT ANY DEFINED BY type-id }
-
-EDIPartyName ::= SEQUENCE {
-     nameAssigner            [0]     DirectoryString OPTIONAL,
-     partyName               [1]     DirectoryString }
-
--- issuer alternative name extension OID and syntax
-
-id-ce-issuerAltName OBJECT IDENTIFIER ::=  { id-ce 18 }
-
-IssuerAltName ::= GeneralNames
-
-id-ce-subjectDirectoryAttributes OBJECT IDENTIFIER ::=  { id-ce 9 }
-
-SubjectDirectoryAttributes ::= SEQUENCE SIZE (1..MAX) OF Attribute
-
--- basic constraints extension OID and syntax
-
-id-ce-basicConstraints OBJECT IDENTIFIER ::=  { id-ce 19 }
-
-BasicConstraints ::= SEQUENCE {
-     cA                      BOOLEAN DEFAULT FALSE,
-     pathLenConstraint       INTEGER (0..MAX) OPTIONAL }
-
--- name constraints extension OID and syntax
-
-id-ce-nameConstraints OBJECT IDENTIFIER ::=  { id-ce 30 }
-
-NameConstraints ::= SEQUENCE {
-     permittedSubtrees       [0]     GeneralSubtrees OPTIONAL,
-     excludedSubtrees        [1]     GeneralSubtrees OPTIONAL }
-
-GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree
-
-GeneralSubtree ::= SEQUENCE {
-     base                    GeneralName,
-     minimum         [0]     BaseDistance DEFAULT 0,
-     maximum         [1]     BaseDistance OPTIONAL }
-
-BaseDistance ::= INTEGER (0..MAX)
-
--- policy constraints extension OID and syntax
-
-id-ce-policyConstraints OBJECT IDENTIFIER ::=  { id-ce 36 }
-
-PolicyConstraints ::= SEQUENCE {
-     requireExplicitPolicy           [0] SkipCerts OPTIONAL,
-     inhibitPolicyMapping            [1] SkipCerts OPTIONAL }
-
-SkipCerts ::= INTEGER (0..MAX)
-
--- CRL distribution points extension OID and syntax
-
-id-ce-cRLDistributionPoints     OBJECT IDENTIFIER  ::=  {id-ce 31}
-
-CRLDistributionPoints ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint
-
-DistributionPoint ::= SEQUENCE {
-     distributionPoint       [0]     DistributionPointName OPTIONAL,
-     reasons                 [1]     ReasonFlags OPTIONAL,
-     cRLIssuer               [2]     GeneralNames OPTIONAL }
-
-DistributionPointName ::= CHOICE {
-     fullName                [0]     GeneralNames,
-     nameRelativeToCRLIssuer [1]     RelativeDistinguishedName }
-
-ReasonFlags ::= BIT STRING {
-     unused                  (0),
-     keyCompromise           (1),
-     cACompromise            (2),
-     affiliationChanged      (3),
-     superseded              (4),
-     cessationOfOperation    (5),
-     certificateHold         (6),
-     privilegeWithdrawn      (7),
-     aACompromise            (8) }
-
--- extended key usage extension OID and syntax
-
-id-ce-extKeyUsage OBJECT IDENTIFIER ::= {id-ce 37}
-
-ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
-
-
-KeyPurposeId ::= OBJECT IDENTIFIER
-
--- permit unspecified key uses
-
-anyExtendedKeyUsage OBJECT IDENTIFIER ::= { id-ce-extKeyUsage 0 }
-
--- extended key purpose OIDs
-
-id-kp-serverAuth             OBJECT IDENTIFIER ::= { id-kp 1 }
-id-kp-clientAuth             OBJECT IDENTIFIER ::= { id-kp 2 }
-id-kp-codeSigning            OBJECT IDENTIFIER ::= { id-kp 3 }
-id-kp-emailProtection        OBJECT IDENTIFIER ::= { id-kp 4 }
-id-kp-timeStamping           OBJECT IDENTIFIER ::= { id-kp 8 }
-id-kp-OCSPSigning            OBJECT IDENTIFIER ::= { id-kp 9 }
-
--- inhibit any policy OID and syntax
-
-id-ce-inhibitAnyPolicy OBJECT IDENTIFIER ::=  { id-ce 54 }
-
-InhibitAnyPolicy ::= SkipCerts
-
--- freshest (delta)CRL extension OID and syntax
-
-id-ce-freshestCRL OBJECT IDENTIFIER ::=  { id-ce 46 }
-
-FreshestCRL ::= CRLDistributionPoints
-
--- authority info access
-
-id-pe-authorityInfoAccess OBJECT IDENTIFIER ::= { id-pe 1 }
-
-AuthorityInfoAccessSyntax  ::=
-        SEQUENCE SIZE (1..MAX) OF AccessDescription
-
-AccessDescription  ::=  SEQUENCE {
-        accessMethod          OBJECT IDENTIFIER,
-        accessLocation        GeneralName  }
-
--- subject info access
-
-id-pe-subjectInfoAccess OBJECT IDENTIFIER ::= { id-pe 11 }
-
-SubjectInfoAccessSyntax  ::=
-        SEQUENCE SIZE (1..MAX) OF AccessDescription
-
--- CRL number extension OID and syntax
-
-id-ce-cRLNumber OBJECT IDENTIFIER ::= { id-ce 20 }
-
-CRLNumber ::= INTEGER (0..MAX)
-
--- issuing distribution point extension OID and syntax
-
-id-ce-issuingDistributionPoint OBJECT IDENTIFIER ::= { id-ce 28 }
-
-IssuingDistributionPoint ::= SEQUENCE {
-     distributionPoint          [0] DistributionPointName OPTIONAL,
-     onlyContainsUserCerts      [1] BOOLEAN DEFAULT FALSE,
-     onlyContainsCACerts        [2] BOOLEAN DEFAULT FALSE,
-     onlySomeReasons            [3] ReasonFlags OPTIONAL,
-     indirectCRL                [4] BOOLEAN DEFAULT FALSE,
-     onlyContainsAttributeCerts [5] BOOLEAN DEFAULT FALSE }
-
-id-ce-deltaCRLIndicator OBJECT IDENTIFIER ::= { id-ce 27 }
-
-BaseCRLNumber ::= CRLNumber
-
--- CRL reasons extension OID and syntax
-
-id-ce-cRLReasons OBJECT IDENTIFIER ::= { id-ce 21 }
-
-CRLReason ::= ENUMERATED {
-     unspecified             (0),
-     keyCompromise           (1),
-     cACompromise            (2),
-     affiliationChanged      (3),
-     superseded              (4),
-     cessationOfOperation    (5),
-     certificateHold         (6),
-     removeFromCRL           (8),
-     privilegeWithdrawn      (9),
-     aACompromise           (10) }
-
--- certificate issuer CRL entry extension OID and syntax
-
-id-ce-certificateIssuer OBJECT IDENTIFIER ::= { id-ce 29 }
-
-CertificateIssuer ::= GeneralNames
-
--- hold instruction extension OID and syntax
-
-id-ce-holdInstructionCode OBJECT IDENTIFIER ::= { id-ce 23 }
-
-HoldInstructionCode ::= OBJECT IDENTIFIER
-
--- ANSI x9 holdinstructions
-
--- ANSI x9 arc holdinstruction arc
-
-holdInstruction OBJECT IDENTIFIER ::=
-          {joint-iso-itu-t(2) member-body(2) us(840) x9cm(10040) 2}
-
--- ANSI X9 holdinstructions referenced by this standard
-
-id-holdinstruction-none OBJECT IDENTIFIER  ::=
-                {holdInstruction 1} -- deprecated
-
-id-holdinstruction-callissuer OBJECT IDENTIFIER ::=
-                {holdInstruction 2}
-
-id-holdinstruction-reject OBJECT IDENTIFIER ::=
-                {holdInstruction 3}
-
--- invalidity date CRL entry extension OID and syntax
-
-id-ce-invalidityDate OBJECT IDENTIFIER ::= { id-ce 24 }
-
-InvalidityDate ::=  GeneralizedTime
-
-END
diff --git a/lib/ssl/pkix/PKIX1Implicit88.hrl b/lib/ssl/pkix/PKIX1Implicit88.hrl
deleted file mode 100644
index 8fa1836284..0000000000
--- a/lib/ssl/pkix/PKIX1Implicit88.hrl
+++ /dev/null
@@ -1,93 +0,0 @@
-%% Generated by the Erlang ASN.1 compiler version:1.4.4.8
-%% Purpose: Erlang record definitions for each named and unnamed
-%% SEQUENCE and SET, and macro definitions for each value
-%% definition,in module PKIX1Implicit88
-
-
-
--record('AuthorityKeyIdentifier',{
-keyIdentifier = asn1_NOVALUE, authorityCertIssuer = asn1_NOVALUE, authorityCertSerialNumber = asn1_NOVALUE}).
-
--record('PrivateKeyUsagePeriod',{
-notBefore = asn1_NOVALUE, notAfter = asn1_NOVALUE}).
-
--record('PolicyInformation',{
-policyIdentifier, policyQualifiers = asn1_NOVALUE}).
-
--record('PolicyQualifierInfo',{
-policyQualifierId, qualifier}).
-
--record('UserNotice',{
-noticeRef = asn1_NOVALUE, explicitText = asn1_NOVALUE}).
-
--record('NoticeReference',{
-organization, noticeNumbers}).
-
--record('PolicyMappings_SEQOF',{
-issuerDomainPolicy, subjectDomainPolicy}).
-
--record('AnotherName',{
-'type-id', value}).
-
--record('EDIPartyName',{
-nameAssigner = asn1_NOVALUE, partyName}).
-
--record('BasicConstraints',{
-cA = asn1_DEFAULT, pathLenConstraint = asn1_NOVALUE}).
-
--record('NameConstraints',{
-permittedSubtrees = asn1_NOVALUE, excludedSubtrees = asn1_NOVALUE}).
-
--record('GeneralSubtree',{
-base, minimum = asn1_DEFAULT, maximum = asn1_NOVALUE}).
-
--record('PolicyConstraints',{
-requireExplicitPolicy = asn1_NOVALUE, inhibitPolicyMapping = asn1_NOVALUE}).
-
--record('DistributionPoint',{
-distributionPoint = asn1_NOVALUE, reasons = asn1_NOVALUE, cRLIssuer = asn1_NOVALUE}).
-
--record('AccessDescription',{
-accessMethod, accessLocation}).
-
--record('IssuingDistributionPoint',{
-distributionPoint = asn1_NOVALUE, onlyContainsUserCerts = asn1_DEFAULT, onlyContainsCACerts = asn1_DEFAULT, onlySomeReasons = asn1_NOVALUE, indirectCRL = asn1_DEFAULT, onlyContainsAttributeCerts = asn1_DEFAULT}).
-
--define('id-ce', {2,5,29}).
--define('id-ce-authorityKeyIdentifier', {2,5,29,35}).
--define('id-ce-subjectKeyIdentifier', {2,5,29,14}).
--define('id-ce-keyUsage', {2,5,29,15}).
--define('id-ce-privateKeyUsagePeriod', {2,5,29,16}).
--define('id-ce-certificatePolicies', {2,5,29,32}).
--define('anyPolicy', {2,5,29,32,0}).
--define('id-ce-policyMappings', {2,5,29,33}).
--define('id-ce-subjectAltName', {2,5,29,17}).
--define('id-ce-issuerAltName', {2,5,29,18}).
--define('id-ce-subjectDirectoryAttributes', {2,5,29,9}).
--define('id-ce-basicConstraints', {2,5,29,19}).
--define('id-ce-nameConstraints', {2,5,29,30}).
--define('id-ce-policyConstraints', {2,5,29,36}).
--define('id-ce-cRLDistributionPoints', {2,5,29,31}).
--define('id-ce-extKeyUsage', {2,5,29,37}).
--define('anyExtendedKeyUsage', {2,5,29,37,0}).
--define('id-kp-serverAuth', {1,3,6,1,5,5,7,3,1}).
--define('id-kp-clientAuth', {1,3,6,1,5,5,7,3,2}).
--define('id-kp-codeSigning', {1,3,6,1,5,5,7,3,3}).
--define('id-kp-emailProtection', {1,3,6,1,5,5,7,3,4}).
--define('id-kp-timeStamping', {1,3,6,1,5,5,7,3,8}).
--define('id-kp-OCSPSigning', {1,3,6,1,5,5,7,3,9}).
--define('id-ce-inhibitAnyPolicy', {2,5,29,54}).
--define('id-ce-freshestCRL', {2,5,29,46}).
--define('id-pe-authorityInfoAccess', {1,3,6,1,5,5,7,1,1}).
--define('id-pe-subjectInfoAccess', {1,3,6,1,5,5,7,1,11}).
--define('id-ce-cRLNumber', {2,5,29,20}).
--define('id-ce-issuingDistributionPoint', {2,5,29,28}).
--define('id-ce-deltaCRLIndicator', {2,5,29,27}).
--define('id-ce-cRLReasons', {2,5,29,21}).
--define('id-ce-certificateIssuer', {2,5,29,29}).
--define('id-ce-holdInstructionCode', {2,5,29,23}).
--define('holdInstruction', {2,2,840,10040,2}).
--define('id-holdinstruction-none', {2,2,840,10040,2,1}).
--define('id-holdinstruction-callissuer', {2,2,840,10040,2,2}).
--define('id-holdinstruction-reject', {2,2,840,10040,2,3}).
--define('id-ce-invalidityDate', {2,5,29,24}).
diff --git a/lib/ssl/pkix/PKIXAttributeCertificate.asn1 b/lib/ssl/pkix/PKIXAttributeCertificate.asn1
deleted file mode 100644
index 7d93e6b37e..0000000000
--- a/lib/ssl/pkix/PKIXAttributeCertificate.asn1
+++ /dev/null
@@ -1,189 +0,0 @@
-   PKIXAttributeCertificate {iso(1) identified-organization(3) dod(6)
-                internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
-                id-mod-attribute-cert(12)}
-
-      DEFINITIONS IMPLICIT TAGS ::=
-
-      BEGIN
-
-      -- EXPORTS ALL --
-
-      IMPORTS
-
-            -- IMPORTed module OIDs MAY change if [PKIXPROF] changes
-            -- PKIX Certificate Extensions
-               Attribute, AlgorithmIdentifier, CertificateSerialNumber,
-               Extensions, UniqueIdentifier,
-               id-pkix, id-pe, id-kp, id-ad, id-at
-               FROM PKIX1Explicit88 {iso(1) identified-organization(3)
-                        dod(6) internet(1) security(5) mechanisms(5)
-                        pkix(7) id-mod(0) id-pkix1-explicit-88(1)}
-
-               GeneralName, GeneralNames, id-ce
-               FROM PKIX1Implicit88 {iso(1) identified-organization(3)
-                        dod(6) internet(1) security(5) mechanisms(5)
-                        pkix(7) id-mod(0) id-pkix1-implicit-88(2)} ;
-
-      id-pe-ac-auditIdentity       OBJECT IDENTIFIER ::= { id-pe 4 }
-      id-pe-aaControls             OBJECT IDENTIFIER ::= { id-pe 6 }
-      id-pe-ac-proxying            OBJECT IDENTIFIER ::= { id-pe 10 }
-      id-ce-targetInformation      OBJECT IDENTIFIER ::= { id-ce 55 }
-
-      id-aca                       OBJECT IDENTIFIER ::= { id-pkix 10 }
-      id-aca-authenticationInfo    OBJECT IDENTIFIER ::= { id-aca 1 }
-      id-aca-accessIdentity        OBJECT IDENTIFIER ::= { id-aca 2 }
-      id-aca-chargingIdentity      OBJECT IDENTIFIER ::= { id-aca 3 }
-      id-aca-group                 OBJECT IDENTIFIER ::= { id-aca 4 }
-      -- { id-aca 5 } is reserved
-      id-aca-encAttrs              OBJECT IDENTIFIER ::= { id-aca 6 }
-
-      id-at-role                   OBJECT IDENTIFIER ::= { id-at 72}
-      id-at-clearance              OBJECT IDENTIFIER ::=
-                  { joint-iso-ccitt(2) ds(5) module(1)
-                    selected-attribute-types(5) clearance (55) }
-
-             -- Uncomment this if using a 1988 level ASN.1 compiler
-             -- UTF8String ::= [UNIVERSAL 12] IMPLICIT OCTET STRING
-
-             AttributeCertificate ::= SEQUENCE {
-                   acinfo               AttributeCertificateInfo,
-                   signatureAlgorithm   AlgorithmIdentifier,
-                   signatureValue       BIT STRING
-             }
-
-             AttributeCertificateInfo ::= SEQUENCE {
-                version        AttCertVersion,  -- version is v2
-                holder         Holder,
-                issuer         AttCertIssuer,
-                signature      AlgorithmIdentifier,
-                serialNumber   CertificateSerialNumber,
-                attrCertValidityPeriod   AttCertValidityPeriod,
-                attributes     SEQUENCE OF Attribute,
-                issuerUniqueID UniqueIdentifier OPTIONAL,
-                extensions     Extensions     OPTIONAL
-             }
-
-             AttCertVersion ::= INTEGER { v2(1) }
-
-             Holder ::= SEQUENCE {
-                   baseCertificateID   [0] IssuerSerial OPTIONAL,
-                             -- the issuer and serial number of
-                             -- the holder's Public Key Certificate
-                   entityName          [1] GeneralNames OPTIONAL,
-                             -- the name of the claimant or role
-                   objectDigestInfo    [2] ObjectDigestInfo OPTIONAL
-                             -- used to directly authenticate the
-                             -- holder, for example, an executable
-             }
-
-             ObjectDigestInfo    ::= SEQUENCE {
-                   digestedObjectType  ENUMERATED {
-                        publicKey            (0),
-                        publicKeyCert        (1),
-                        otherObjectTypes     (2) },
-                                -- otherObjectTypes MUST NOT
-                                -- MUST NOT be used in this profile
-                   otherObjectTypeID   OBJECT IDENTIFIER  OPTIONAL,
-                   digestAlgorithm     AlgorithmIdentifier,
-                   objectDigest        BIT STRING
-             }
-
-             AttCertIssuer ::= CHOICE {
-                   v1Form   GeneralNames,  -- MUST NOT be used in this
-                                           -- profile
-                   v2Form   [0] V2Form     -- v2 only
-             }
-
-             V2Form ::= SEQUENCE {
-                   issuerName            GeneralNames  OPTIONAL,
-                   baseCertificateID     [0] IssuerSerial  OPTIONAL,
-                   objectDigestInfo      [1] ObjectDigestInfo  OPTIONAL
-                      -- issuerName MUST be present in this profile
-                      -- baseCertificateID and objectDigestInfo MUST
-                      -- NOT be present in this profile
-             }
-
-             IssuerSerial  ::=  SEQUENCE {
-                   issuer         GeneralNames,
-                   serial         CertificateSerialNumber,
-                   issuerUID      UniqueIdentifier OPTIONAL
-             }
-
-             AttCertValidityPeriod  ::= SEQUENCE {
-                   notBeforeTime  GeneralizedTime,
-                   notAfterTime   GeneralizedTime
-             }
-
-             Targets ::= SEQUENCE OF Target
-
-             Target  ::= CHOICE {
-                   targetName     [0] GeneralName,
-                   targetGroup    [1] GeneralName,
-                   targetCert     [2] TargetCert
-             }
-
-             TargetCert  ::= SEQUENCE {
-                   targetCertificate  IssuerSerial,
-                   targetName         GeneralName OPTIONAL,
-                   certDigestInfo     ObjectDigestInfo OPTIONAL
-             }
-
-             IetfAttrSyntax ::= SEQUENCE {
-                  policyAuthority[0] GeneralNames    OPTIONAL,
-                  values         SEQUENCE OF CHOICE {
-                                 octets    OCTET STRING,
-                                 oid       OBJECT IDENTIFIER,
-                                 string    UTF8String
-                 }
-             }
-
-             SvceAuthInfo ::=    SEQUENCE {
-                   service       GeneralName,
-                   ident         GeneralName,
-                   authInfo      OCTET STRING OPTIONAL
-             }
-
-             RoleSyntax ::= SEQUENCE {
-                   roleAuthority  [0] GeneralNames OPTIONAL,
-                   roleName       [1] GeneralName
-             }
-
-             Clearance  ::=  SEQUENCE {
-                   policyId       [0] OBJECT IDENTIFIER,
-                   classList      [1] ClassList DEFAULT {unclassified},
-                   securityCategories
-                                  [2] SET OF SecurityCategory  OPTIONAL
-             }
-
-             ClassList  ::=  BIT STRING {
-                   unmarked       (0),
-                   unclassified   (1),
-                   restricted     (2),
-                   confidential   (3),
-                   secret         (4),
-                   topSecret      (5)
-             }
-
-             SecurityCategory ::= SEQUENCE {
-                   type      [0]  IMPLICIT OBJECT IDENTIFIER,
-                   value     [1]  ANY DEFINED BY type
-             }
-
-             AAControls ::= SEQUENCE {
-                   pathLenConstraint INTEGER (0..MAX) OPTIONAL,
-                   permittedAttrs    [0] AttrSpec OPTIONAL,
-                   excludedAttrs     [1] AttrSpec OPTIONAL,
-                   permitUnSpecified BOOLEAN DEFAULT TRUE
-             }
-
-             AttrSpec::= SEQUENCE OF OBJECT IDENTIFIER
-
-             ACClearAttrs ::= SEQUENCE {
-                   acIssuer          GeneralName,
-                   acSerial          INTEGER,
-                   attrs             SEQUENCE OF Attribute
-             }
-
-             ProxyInfo ::= SEQUENCE OF Targets
-
-      END
diff --git a/lib/ssl/pkix/PKIXAttributeCertificate.hrl b/lib/ssl/pkix/PKIXAttributeCertificate.hrl
deleted file mode 100644
index 99389c4852..0000000000
--- a/lib/ssl/pkix/PKIXAttributeCertificate.hrl
+++ /dev/null
@@ -1,64 +0,0 @@
-%% Generated by the Erlang ASN.1 compiler version:1.4.4.8
-%% Purpose: Erlang record definitions for each named and unnamed
-%% SEQUENCE and SET, and macro definitions for each value
-%% definition,in module PKIXAttributeCertificate
-
-
-
--record('AttributeCertificate',{
-acinfo, signatureAlgorithm, signatureValue}).
-
--record('AttributeCertificateInfo',{
-version, holder, issuer, signature, serialNumber, attrCertValidityPeriod, attributes, issuerUniqueID = asn1_NOVALUE, extensions = asn1_NOVALUE}).
-
--record('Holder',{
-baseCertificateID = asn1_NOVALUE, entityName = asn1_NOVALUE, objectDigestInfo = asn1_NOVALUE}).
-
--record('ObjectDigestInfo',{
-digestedObjectType, otherObjectTypeID = asn1_NOVALUE, digestAlgorithm, objectDigest}).
-
--record('V2Form',{
-issuerName = asn1_NOVALUE, baseCertificateID = asn1_NOVALUE, objectDigestInfo = asn1_NOVALUE}).
-
--record('IssuerSerial',{
-issuer, serial, issuerUID = asn1_NOVALUE}).
-
--record('AttCertValidityPeriod',{
-notBeforeTime, notAfterTime}).
-
--record('TargetCert',{
-targetCertificate, targetName = asn1_NOVALUE, certDigestInfo = asn1_NOVALUE}).
-
--record('IetfAttrSyntax',{
-policyAuthority = asn1_NOVALUE, values}).
-
--record('SvceAuthInfo',{
-service, ident, authInfo = asn1_NOVALUE}).
-
--record('RoleSyntax',{
-roleAuthority = asn1_NOVALUE, roleName}).
-
--record('Clearance',{
-policyId, classList = asn1_DEFAULT, securityCategories = asn1_NOVALUE}).
-
--record('SecurityCategory',{
-type, value}).
-
--record('AAControls',{
-pathLenConstraint = asn1_NOVALUE, permittedAttrs = asn1_NOVALUE, excludedAttrs = asn1_NOVALUE, permitUnSpecified = asn1_DEFAULT}).
-
--record('ACClearAttrs',{
-acIssuer, acSerial, attrs}).
-
--define('id-pe-ac-auditIdentity', {1,3,6,1,5,5,7,1,4}).
--define('id-pe-aaControls', {1,3,6,1,5,5,7,1,6}).
--define('id-pe-ac-proxying', {1,3,6,1,5,5,7,1,10}).
--define('id-ce-targetInformation', {2,5,29,55}).
--define('id-aca', {1,3,6,1,5,5,7,10}).
--define('id-aca-authenticationInfo', {1,3,6,1,5,5,7,10,1}).
--define('id-aca-accessIdentity', {1,3,6,1,5,5,7,10,2}).
--define('id-aca-chargingIdentity', {1,3,6,1,5,5,7,10,3}).
--define('id-aca-group', {1,3,6,1,5,5,7,10,4}).
--define('id-aca-encAttrs', {1,3,6,1,5,5,7,10,6}).
--define('id-at-role', {2,5,4,72}).
--define('id-at-clearance', {2,5,1,5,55}).
diff --git a/lib/ssl/pkix/README b/lib/ssl/pkix/README
deleted file mode 100644
index 8be2c15de5..0000000000
--- a/lib/ssl/pkix/README
+++ /dev/null
@@ -1,49 +0,0 @@
-The files
-
-	PKIX1Algorithms88.asn1
-	PKIX1Explicit88.asn1
-	PKIX1Implicit88.asn1
-	PKIXAttributeCertificate.asn1
-
-are from RFCs 3279, 3280 and 3281.
-
-We have edited PKIX1Explicit88.asn1, PKIX1Implicit88.asn1, and 
-PKIXAttributeCertificate.asn1 as follows:
-
-
-1. Removal of definition of UniversalString and BMPString:
-
-diff -r1.1 PKIX1Explicit88.asn1
-15c15
-< UniversalString ::= [UNIVERSAL 28] IMPLICIT OCTET STRING
----
-> -- UniversalString ::= [UNIVERSAL 28] IMPLICIT OCTET STRING
-18c18
-< BMPString ::= [UNIVERSAL 30] IMPLICIT OCTET STRING
----
-> -- BMPString ::= [UNIVERSAL 30] IMPLICIT OCTET STRING
-
-
-2. Removal of definition of BMPString:
-
-diff -r1.1 PKIX1Implicit88.asn1
-13c13,14
-<       BMPString, UTF8String,  -- end "new" types --
----
->       -- BMPString, 
->       UTF8String,  -- end "new" types --
-
-
-3. Addition of definition of UTF8String, and correction of a typo.
-
-diff -r1.1 PKIXAttributeCertificate.asn1
-46c46
-<              -- UTF8String ::= [UNIVERSAL 12] IMPLICIT OCTET STRING
----
->              UTF8String ::= [UNIVERSAL 12] IMPLICIT OCTET STRING
-55c55
-<                 version        AttCertVersion  -- version is v2,
----
->                 version        AttCertVersion,  -- version is v2
-
-PKIX1Algorithms88.asn1 is unchanged.
diff --git a/lib/ssl/pkix/SSL-PKIX.asn1 b/lib/ssl/pkix/SSL-PKIX.asn1
deleted file mode 100644
index ea6333f953..0000000000
--- a/lib/ssl/pkix/SSL-PKIX.asn1
+++ /dev/null
@@ -1,704 +0,0 @@
-SSL-PKIX {iso(1) identified-organization(3) dod(6) internet(1)
-	private(4) enterprices(1) ericsson(193) otp(19) ssl(10)
-	pkix1(1)}
-
-DEFINITIONS EXPLICIT TAGS ::=
-
-BEGIN
-
--- EXPORTS ALL
-
-IMPORTS
-	-- Certificate (parts of)
-	Version, 
-	CertificateSerialNumber,
-	--AlgorithmIdentifier,
-	Validity,
-	UniqueIdentifier,
-
-	-- AttribyteTypeAndValue
-	Name, 
-	AttributeType, 	
-	id-at-name,
-	id-at-surname,
-	id-at-givenName,
-	id-at-initials,
-	id-at-generationQualifier, X520name,
- 	id-at-commonName, X520CommonName,
-	id-at-localityName, X520LocalityName,
-	id-at-stateOrProvinceName, X520StateOrProvinceName,
-	id-at-organizationName, X520OrganizationName,
-	id-at-organizationalUnitName, X520OrganizationalUnitName,
-	id-at-title, X520Title,
-	id-at-dnQualifier, X520dnQualifier,
-	id-at-countryName, X520countryName,
-	id-at-serialNumber, X520SerialNumber,
-	id-at-pseudonym, X520Pseudonym,
-	id-domainComponent, DomainComponent,
-	id-emailAddress, EmailAddress,
-
-	-- Extension Attributes
-       common-name, CommonName,
-       teletex-common-name, TeletexCommonName,
-       teletex-personal-name, TeletexPersonalName,
-       pds-name, PDSName,
-       physical-delivery-country-name, PhysicalDeliveryCountryName,
-       postal-code, PostalCode,
-       physical-delivery-office-name, PhysicalDeliveryOfficeName,
-       physical-delivery-office-number, PhysicalDeliveryOfficeNumber,
-       extension-OR-address-components, ExtensionORAddressComponents,
-       physical-delivery-personal-name, PhysicalDeliveryPersonalName,
-       physical-delivery-organization-name, PhysicalDeliveryOrganizationName,
-       extension-physical-delivery-address-components, 
-              ExtensionPhysicalDeliveryAddressComponents,
-       unformatted-postal-address, UnformattedPostalAddress,
-       street-address, StreetAddress,
-       post-office-box-address, PostOfficeBoxAddress,
-       poste-restante-address,  PosteRestanteAddress,
-       unique-postal-name, UniquePostalName,
-       local-postal-attributes, LocalPostalAttributes,
-       extended-network-address, ExtendedNetworkAddress,
-       terminal-type, TerminalType,
-       teletex-domain-defined-attributes, TeletexDomainDefinedAttributes
-
-	FROM PKIX1Explicit88 { iso(1) identified-organization(3) dod(6) 
-	     internet(1) security(5) mechanisms(5) pkix(7) id-mod(0) 
-	     id-pkix1-explicit(18) }
-
-       -- Extensions
-       id-ce-authorityKeyIdentifier, AuthorityKeyIdentifier,
-       id-ce-subjectKeyIdentifier, SubjectKeyIdentifier,
-       id-ce-keyUsage, KeyUsage,
-       id-ce-privateKeyUsagePeriod, PrivateKeyUsagePeriod,
-       id-ce-certificatePolicies, CertificatePolicies,
-       id-ce-policyMappings, PolicyMappings,
-       id-ce-subjectAltName, SubjectAltName,
-       id-ce-issuerAltName, IssuerAltName,
-       id-ce-subjectDirectoryAttributes, SubjectDirectoryAttributes,
-       id-ce-basicConstraints, BasicConstraints,
-       id-ce-nameConstraints, NameConstraints,
-       id-ce-policyConstraints, PolicyConstraints,
-       id-ce-cRLDistributionPoints, CRLDistributionPoints,
-       id-ce-extKeyUsage, ExtKeyUsageSyntax,
-       id-ce-inhibitAnyPolicy, InhibitAnyPolicy,
-       id-ce-freshestCRL, FreshestCRL,
-       id-pe-authorityInfoAccess, AuthorityInfoAccessSyntax,
-       id-pe-subjectInfoAccess, SubjectInfoAccessSyntax,
-       id-ce-cRLNumber, CRLNumber,
-       id-ce-issuingDistributionPoint, IssuingDistributionPoint,
-       id-ce-deltaCRLIndicator, BaseCRLNumber,
-       id-ce-cRLReasons, CRLReason,
-       id-ce-certificateIssuer, CertificateIssuer,
-       id-ce-holdInstructionCode, HoldInstructionCode,
-       id-ce-invalidityDate, InvalidityDate
-
-       FROM PKIX1Implicit88 { iso(1) identified-organization(3) dod(6) 
-       internet(1) security(5) mechanisms(5) pkix(7) id-mod(0) 
-       id-pkix1-implicit(19) }
-
-	--Keys and Signatures
-	id-dsa, Dss-Parms, DSAPublicKey, 
-	id-dsa-with-sha1,
-	md2WithRSAEncryption,
-	md5WithRSAEncryption,
-	sha1WithRSAEncryption,
-	rsaEncryption, RSAPublicKey,
-	dhpublicnumber, DomainParameters, DHPublicKey,
-	id-keyExchangeAlgorithm, KEA-Parms-Id, --KEA-PublicKey,
-	ecdsa-with-SHA1, 
-	prime-field, Prime-p, 
-	characteristic-two-field, --Characteristic-two, 
-	gnBasis, 
-	tpBasis, Trinomial,
-	ppBasis, Pentanomial,
-	id-ecPublicKey, EcpkParameters, ECPoint
-	FROM PKIX1Algorithms88 { iso(1) identified-organization(3) dod(6)
-	     internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
-	     id-mod-pkix1-algorithms(17) };
-
---
--- Certificate
---
-
-SSLCertificate  ::=  SEQUENCE  {
-     tbsCertificate       TBSCertificate,
-     signatureAlgorithm   SignatureAlgorithm,
-     signature            BIT STRING  }
-
-SSLTBSCertificate  ::=  SEQUENCE  {
-     version         [0]  Version DEFAULT v1,
-     serialNumber         CertificateSerialNumber,
-     signature            SignatureAlgorithm,
-     issuer               Name,
-     validity             Validity,
-     subject              Name,
-     subjectPublicKeyInfo SubjectPublicKeyInfo,
-     issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
-                          -- If present, version MUST be v2 or v3
-     subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
-                          -- If present, version MUST be v2 or v3
-     extensions      [3]  Extensions OPTIONAL
-                          -- If present, version MUST be v3 --  }
-
-
--- Attribute type and values
---
-
-ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= CLASS {
-	&id AttributeType UNIQUE,
-	&Type }
-   WITH SYNTAX {
-	ID &id
-	TYPE &Type }
-	
-SSLAttributeTypeAndValue ::=  SEQUENCE {
-        type    ATTRIBUTE-TYPE-AND-VALUE-CLASS.&id
-		({SupportedAttributeTypeAndValues}),
-        value   ATTRIBUTE-TYPE-AND-VALUE-CLASS.&Type
-		({SupportedAttributeTypeAndValues}{@type}) }
-
-SupportedAttributeTypeAndValues ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= 
-	{ name | surname | givenName | initials | generationQualifier |
-	  commonName | localityName | stateOrProvinceName | organizationName |
-	  organizationalUnitName | title | dnQualifier | countryName |
-	  serialNumber | pseudonym | domainComponent | emailAddress }
-
-name ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-name
-	TYPE X520name }
-
-surname ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-surname
-	TYPE X520name }
-
-givenName ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-givenName
-	TYPE X520name }
-
-initials ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-initials
-	TYPE X520name }
-
-generationQualifier ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-generationQualifier
-	TYPE X520name }
-
-commonName ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-commonName
-	TYPE X520CommonName }
-
-localityName ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-localityName
-	TYPE X520LocalityName }
-
-stateOrProvinceName ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-stateOrProvinceName
-	TYPE X520StateOrProvinceName }
-
-organizationName ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-organizationName
-	TYPE X520OrganizationName }
-
-organizationalUnitName ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-organizationalUnitName
-	TYPE X520OrganizationalUnitName }
-
-title ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-title
-	TYPE X520Title }
-
-dnQualifier ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-dnQualifier
-	TYPE X520dnQualifier }
-
-countryName ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-countryName
-	TYPE X520countryName }
-
-serialNumber ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-serialNumber
-	TYPE X520SerialNumber }
-
-pseudonym ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-at-pseudonym
-	TYPE X520Pseudonym }
-
-domainComponent ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-domainComponent
-	TYPE DomainComponent }
-
-emailAddress ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
-	ID id-emailAddress
-	TYPE EmailAddress }
-
---
--- Signature and Public Key Algorithms
---
-
-SSLSubjectPublicKeyInfo ::=  SEQUENCE  {
-     algorithm SEQUENCE {
-               algo     PUBLIC-KEY-ALGORITHM-CLASS.&id
-			     ({SupportedPublicKeyAlgorithms}), 
-	       parameters    PUBLIC-KEY-ALGORITHM-CLASS.&Type
-			     ({SupportedPublicKeyAlgorithms}{@.algo}) 
-			     OPTIONAL
-               }, 
-     subjectPublicKey  PUBLIC-KEY-ALGORITHM-CLASS.&PublicKeyType
-		       ({SupportedPublicKeyAlgorithms}{@algorithm.algo}) }
-
--- The following is needed for conversion of SubjectPublicKeyInfo.
-
-SSLSubjectPublicKeyInfo-Any  ::=  SEQUENCE  {
-     algorithm            PublicKeyAlgorithm,
-     subjectPublicKey     ANY }
-
-
-SIGNATURE-ALGORITHM-CLASS ::= CLASS {
-	&id OBJECT IDENTIFIER UNIQUE,
-	&Type OPTIONAL }
-   WITH SYNTAX {
-	ID &id
-	[TYPE &Type] }
-
-PUBLIC-KEY-ALGORITHM-CLASS ::= CLASS {
-	&id OBJECT IDENTIFIER UNIQUE,
-	&Type OPTIONAL,
-	&PublicKeyType OPTIONAL }
-   WITH SYNTAX {
-	ID &id
-	[TYPE &Type] 
-	[PUBLIC-KEY-TYPE &PublicKeyType] }
-	
-SignatureAlgorithm ::=  SEQUENCE  {
-     algorithm     SIGNATURE-ALGORITHM-CLASS.&id
-				({SupportedSignatureAlgorithms}), 
-     parameters    SIGNATURE-ALGORITHM-CLASS.&Type
-				({SupportedSignatureAlgorithms}{@algorithm}) 
-		   OPTIONAL } 
-
-SignatureAlgorithm-Any ::=  SEQUENCE  {
-     algorithm     OBJECT IDENTIFIER, 
-     parameters    ANY OPTIONAL } 
-
-PublicKeyAlgorithm ::=  SEQUENCE  {
-     algorithm     PUBLIC-KEY-ALGORITHM-CLASS.&id
-			({SupportedPublicKeyAlgorithms}), 
-     parameters    PUBLIC-KEY-ALGORITHM-CLASS.&Type
-			({SupportedPublicKeyAlgorithms}{@algorithm}) 
-		   OPTIONAL } 
-
-SupportedSignatureAlgorithms SIGNATURE-ALGORITHM-CLASS ::= { 
-		    dsa-with-sha1 | md2-with-rsa-encryption |
-		    md5-with-rsa-encryption | sha1-with-rsa-encryption |
-		    ecdsa-with-sha1 } 
-
-SupportedPublicKeyAlgorithms PUBLIC-KEY-ALGORITHM-CLASS ::= { 
-		    dsa | rsa-encryption | dh | kea | ec-public-key }
-
-   --   DSA Keys and Signatures
-
-   -- SubjectPublicKeyInfo:
-
-   dsa PUBLIC-KEY-ALGORITHM-CLASS ::= {
-       ID id-dsa
-       TYPE Dss-Parms -- XXX Must be OPTIONAL
-       PUBLIC-KEY-TYPE DSAPublicKey }
-
-   -- Certificate.signatureAlgorithm
-
-   dsa-with-sha1 SIGNATURE-ALGORITHM-CLASS ::= {
-		 ID id-dsa-with-sha1 
-		 TYPE NULL } -- XXX Must be empty and not NULL
-
-				  --
-   --   RSA Keys and Signatures
-   --
-
-   -- Certificate.signatureAlgorithm
-
-   md2-with-rsa-encryption SIGNATURE-ALGORITHM-CLASS ::= {
-			   ID md2WithRSAEncryption 
-			   TYPE NULL }
-
-   md5-with-rsa-encryption SIGNATURE-ALGORITHM-CLASS ::= {
-			   ID md5WithRSAEncryption 
-			   TYPE NULL }
-
-   sha1-with-rsa-encryption SIGNATURE-ALGORITHM-CLASS ::= {
-			    ID sha1WithRSAEncryption 
-			    TYPE NULL }
-
-   -- Certificate.signature
-   -- See PKCS #1 (RFC 2313). XXX
-
-   -- SubjectPublicKeyInfo:
-
-   rsa-encryption PUBLIC-KEY-ALGORITHM-CLASS ::= {
-		  ID rsaEncryption
-		  TYPE NULL
-		  PUBLIC-KEY-TYPE RSAPublicKey }
-
-   --
-   --   Diffie-Hellman Keys
-   --
-
-   -- SubjectPublicKeyInfo:
-
-   dh PUBLIC-KEY-ALGORITHM-CLASS ::= {
-      ID dhpublicnumber
-      TYPE DomainParameters
-      PUBLIC-KEY-TYPE DHPublicKey }
-
-   -- There are no Diffie-Hellman signature algorithms
-
-   --
-   --   KEA Keys
-   --
-
-   -- SubjectPublicKeyInfo:
-
-   KEA-PublicKey ::= INTEGER
-
-   kea PUBLIC-KEY-ALGORITHM-CLASS ::= {
-       ID id-keyExchangeAlgorithm
-       TYPE KEA-Parms-Id
-       PUBLIC-KEY-TYPE KEA-PublicKey }
-
-   -- There are no KEA signature algorithms
-
-   --
-   --   Elliptic Curve Keys, Signatures, and Curves
-   --
-
-   -- Certificate.signatureAlgorithm
-
-   ecdsa-with-sha1 SIGNATURE-ALGORITHM-CLASS ::= {
-       ID ecdsa-with-SHA1
-       TYPE NULL }  -- XXX Must be empty and not NULL
-
-   FIELD-ID-CLASS ::= CLASS {
-	&id OBJECT IDENTIFIER UNIQUE,
-	&Type }
-   WITH SYNTAX {
-	ID &id
-	TYPE &Type }
-
-   SSLFieldID ::= SEQUENCE {                    -- Finite field
-      fieldType   FIELD-ID-CLASS.&id({SupportedFieldIds}),
-      parameters  FIELD-ID-CLASS.&Type({SupportedFieldIds}{@fieldType}) }
-
-   SupportedFieldIds FIELD-ID-CLASS ::= {
-		     field-prime-field | field-characteristic-two }
-
-   field-prime-field FIELD-ID-CLASS ::= {
-		     ID prime-field
-		     TYPE Prime-p }
-
-   CHARACTERISTIC-TWO-CLASS ::= CLASS {
-	&id OBJECT IDENTIFIER UNIQUE,
-	&Type }
-   WITH SYNTAX {
-	ID &id
-	TYPE &Type }
-
-   SSLCharacteristic-two ::= SEQUENCE {                    -- Finite field
-      m           INTEGER,                   -- Field size 2^m
-      basis       CHARACTERISTIC-TWO-CLASS.&id({SupportedCharacteristicTwos}),
-      parameters  CHARACTERISTIC-TWO-CLASS.&Type
-		  ({SupportedCharacteristicTwos}{@basis}) }
-
-   SupportedCharacteristicTwos CHARACTERISTIC-TWO-CLASS ::= {
-			       gn-basis | tp-basis | pp-basis }
-
-   field-characteristic-two FIELD-ID-CLASS ::= {
-		     ID characteristic-two-field
-		     TYPE Characteristic-two }
-
-   gn-basis CHARACTERISTIC-TWO-CLASS ::= {
-	    ID gnBasis
-	    TYPE NULL }
-
-   tp-basis CHARACTERISTIC-TWO-CLASS ::= {
-	    ID tpBasis
-	    TYPE Trinomial }
-
-   pp-basis CHARACTERISTIC-TWO-CLASS ::= {
-	    ID ppBasis
-	    TYPE Pentanomial }
-
-   -- SubjectPublicKeyInfo.algorithm
-
-   ec-public-key PUBLIC-KEY-ALGORITHM-CLASS ::= {
-      ID id-ecPublicKey
-      TYPE EcpkParameters
-      PUBLIC-KEY-TYPE ECPoint }
-
---
--- Extension Attributes
---
-
-EXTENSION-ATTRIBUTE-CLASS ::= CLASS {
-	&id INTEGER UNIQUE, 
-	&Type }
-   WITH SYNTAX {
-	ID &id
-	TYPE &Type }
-	
-SSLExtensionAttributes ::= SET SIZE (1..MAX) OF ExtensionAttribute
-
--- XXX Below we should have extension-attribute-type and extension-
--- attribute-value but Erlang ASN1 does not like it. 
-SSLExtensionAttribute ::=  SEQUENCE {
-   extensionAttributeType [0] IMPLICIT EXTENSION-ATTRIBUTE-CLASS.&id
-		({SupportedExtensionAttributes}),
-   extensionAttributeValue [1] EXTENSION-ATTRIBUTE-CLASS.&Type
-		({SupportedExtensionAttributes}{@extensionAttributeType}) } 
-
-SupportedExtensionAttributes EXTENSION-ATTRIBUTE-CLASS ::= {
-	     x400-common-name |
-	     x400-teletex-common-name |
-	     x400-teletex-personal-name |
-	     x400-pds-name |
-	     x400-physical-delivery-country-name |
-	     x400-postal-code |
-	     x400-physical-delivery-office-name |
-	     x400-physical-delivery-office-number |
-	     x400-extension-OR-address-components |
-	     x400-physical-delivery-personal-name |
-	     x400-physical-delivery-organization-name |
-	     x400-extension-physical-delivery-address-components |
-	     x400-unformatted-postal-address |
-	     x400-street-address |
-	     x400-post-office-box-address |
-	     x400-poste-restante-address |
-	     x400-unique-postal-name |
-	     x400-local-postal-attributes |
-	     x400-extended-network-address |
-	     x400-terminal-type |
-	     x400-teletex-domain-defined-attributes }
-
--- Extension types and attribute values
-
-x400-common-name  EXTENSION-ATTRIBUTE-CLASS ::= {
-       ID common-name
-       TYPE CommonName }
-
-x400-teletex-common-name  EXTENSION-ATTRIBUTE-CLASS ::= {
-			  ID teletex-common-name
-			  TYPE TeletexCommonName }
-
-x400-teletex-personal-name  EXTENSION-ATTRIBUTE-CLASS ::= {
-			    ID teletex-personal-name
-			    TYPE TeletexPersonalName }
-
-x400-pds-name  EXTENSION-ATTRIBUTE-CLASS ::= {
-	       ID pds-name
-	       TYPE PDSName }
-
-x400-physical-delivery-country-name EXTENSION-ATTRIBUTE-CLASS ::= {
-				    ID physical-delivery-country-name
-				    TYPE PhysicalDeliveryCountryName }
-
-x400-postal-code  EXTENSION-ATTRIBUTE-CLASS ::= {
-		  ID postal-code
-		  TYPE PostalCode }
-
-x400-physical-delivery-office-name EXTENSION-ATTRIBUTE-CLASS ::= { 
-				   ID physical-delivery-office-name 
-				   TYPE PhysicalDeliveryOfficeName }
-
-x400-physical-delivery-office-number EXTENSION-ATTRIBUTE-CLASS ::= {
-				     ID physical-delivery-office-number
-				     TYPE PhysicalDeliveryOfficeNumber }
-
-x400-extension-OR-address-components EXTENSION-ATTRIBUTE-CLASS ::= {
-				     ID extension-OR-address-components
-				     TYPE ExtensionORAddressComponents }
-
-x400-physical-delivery-personal-name EXTENSION-ATTRIBUTE-CLASS ::= {
-				     ID physical-delivery-personal-name
-				     TYPE PhysicalDeliveryPersonalName }
-
-x400-physical-delivery-organization-name  EXTENSION-ATTRIBUTE-CLASS ::= {
-       ID physical-delivery-organization-name
-       TYPE PhysicalDeliveryOrganizationName }
-
-x400-extension-physical-delivery-address-components 
-    EXTENSION-ATTRIBUTE-CLASS ::= {
-       ID extension-physical-delivery-address-components
-       TYPE ExtensionPhysicalDeliveryAddressComponents }
-
-x400-unformatted-postal-address  EXTENSION-ATTRIBUTE-CLASS ::= {
-				 ID unformatted-postal-address
-				 TYPE UnformattedPostalAddress }
-
-x400-street-address  EXTENSION-ATTRIBUTE-CLASS ::= {
-		     ID street-address
-		     TYPE StreetAddress }
-
-x400-post-office-box-address  EXTENSION-ATTRIBUTE-CLASS ::= {
-			      ID post-office-box-address
-			      TYPE PostOfficeBoxAddress }
-
-x400-poste-restante-address EXTENSION-ATTRIBUTE-CLASS ::= {
-			    ID poste-restante-address
-			    TYPE PosteRestanteAddress }
-
-x400-unique-postal-name EXTENSION-ATTRIBUTE-CLASS ::= {
-			ID unique-postal-name
-			TYPE UniquePostalName }
-
-x400-local-postal-attributes EXTENSION-ATTRIBUTE-CLASS ::= {
-			      ID local-postal-attributes
-			      TYPE LocalPostalAttributes }
-
-x400-extended-network-address EXTENSION-ATTRIBUTE-CLASS ::= {
-       ID extended-network-address
-       TYPE ExtendedNetworkAddress }
-
-x400-terminal-type  EXTENSION-ATTRIBUTE-CLASS ::= {
-		    ID terminal-type
-		    TYPE TerminalType }
-
-x400-teletex-domain-defined-attributes  EXTENSION-ATTRIBUTE-CLASS ::= {
-       ID teletex-domain-defined-attributes
-       TYPE TeletexDomainDefinedAttributes }
-
--- Extensions
-
-SSLExtensions  ::=  SEQUENCE SIZE (1..MAX) OF Extension
-
-EXTENSION-CLASS ::= CLASS {
-	&id OBJECT IDENTIFIER UNIQUE,
-	&Type OPTIONAL}
-   WITH SYNTAX {
-	ID &id
-	[TYPE &Type] }
-
-SSLExtension ::=  SEQUENCE {
-        extnID	  EXTENSION-CLASS.&id({SupportedExtensions}),
-	critical  BOOLEAN DEFAULT FALSE,
-        extnValue EXTENSION-CLASS.&Type({SupportedExtensions}{@extnID}) }
-
--- The following is needed for conversion between Extension and Extension-Cd
-
-ObjId ::= OBJECT IDENTIFIER
-Boolean ::= BOOLEAN
-Any ::= ANY
-
-Extension-Any  ::=  SEQUENCE  {
-     extnID      OBJECT IDENTIFIER,
-     critical    BOOLEAN DEFAULT FALSE,
-     extnValue   ANY }
-
-SupportedExtensions EXTENSION-CLASS ::= { authorityKeyIdentifier |
-	subjectKeyIdentifier | keyUsage | privateKeyUsagePeriod |
-	certificatePolicies | policyMappings | subjectAltName | 
-	issuerAltName | subjectDirectoryAttributes | basicConstraints |
-	nameConstraints | policyConstraints | cRLDistributionPoints | 
-	extKeyUsage | inhibitAnyPolicy | freshestCRL | authorityInfoAccess |
-	subjectInfoAccess | cRLNumber | issuingDistributionPoint |
-	deltaCRLIndicator | cRLReasons | certificateIssuer |
-	holdInstructionCode | invalidityDate }
-
-authorityKeyIdentifier EXTENSION-CLASS ::= {
-		ID id-ce-authorityKeyIdentifier
-		TYPE AuthorityKeyIdentifier }
-
-subjectKeyIdentifier EXTENSION-CLASS ::= {
-	ID id-ce-subjectKeyIdentifier
-	TYPE SubjectKeyIdentifier }
-
-keyUsage EXTENSION-CLASS ::= {
-	ID id-ce-keyUsage 
-	TYPE KeyUsage }
-
-privateKeyUsagePeriod EXTENSION-CLASS ::= {
-	ID id-ce-privateKeyUsagePeriod
-	TYPE PrivateKeyUsagePeriod }
-
-certificatePolicies EXTENSION-CLASS ::= {
-	ID id-ce-certificatePolicies
-	TYPE CertificatePolicies }
-
-policyMappings EXTENSION-CLASS ::= {
-	ID id-ce-policyMappings
-	TYPE PolicyMappings }
-
-subjectAltName EXTENSION-CLASS ::= {
-	ID id-ce-subjectAltName 
-	TYPE SubjectAltName }
-
-issuerAltName EXTENSION-CLASS ::= {
-	ID id-ce-issuerAltName
-	TYPE IssuerAltName }
-
-subjectDirectoryAttributes EXTENSION-CLASS ::= {
-	ID id-ce-subjectDirectoryAttributes
-	TYPE SubjectDirectoryAttributes }
-
-basicConstraints EXTENSION-CLASS ::= {
-	ID id-ce-basicConstraints
-	TYPE BasicConstraints }
-
-nameConstraints EXTENSION-CLASS ::= {
-	ID id-ce-nameConstraints
-	TYPE NameConstraints }
-
-policyConstraints EXTENSION-CLASS ::= {
-	ID id-ce-policyConstraints 
-	TYPE PolicyConstraints  }
-
-cRLDistributionPoints EXTENSION-CLASS ::= {
-	ID id-ce-cRLDistributionPoints
-	TYPE CRLDistributionPoints }
-
-extKeyUsage EXTENSION-CLASS ::= {
-	ID id-ce-extKeyUsage
-	TYPE ExtKeyUsageSyntax }
-
-inhibitAnyPolicy EXTENSION-CLASS ::= {
-	ID id-ce-inhibitAnyPolicy 
-	TYPE InhibitAnyPolicy }
-
-freshestCRL EXTENSION-CLASS ::= {
-	ID id-ce-freshestCRL
-	TYPE FreshestCRL }
-
-authorityInfoAccess EXTENSION-CLASS ::= {
-	ID id-pe-authorityInfoAccess
-	TYPE AuthorityInfoAccessSyntax }
-
-subjectInfoAccess EXTENSION-CLASS ::= {
-	ID id-pe-subjectInfoAccess 
-	TYPE SubjectInfoAccessSyntax }
-
-cRLNumber EXTENSION-CLASS ::= {
-	ID id-ce-cRLNumber 
-	TYPE CRLNumber }
-
-issuingDistributionPoint EXTENSION-CLASS ::= {
-	ID id-ce-issuingDistributionPoint
-	TYPE IssuingDistributionPoint }
-
-deltaCRLIndicator EXTENSION-CLASS ::= {
-	ID id-ce-deltaCRLIndicator
-	TYPE BaseCRLNumber }
-
-cRLReasons EXTENSION-CLASS ::= {
-	ID id-ce-cRLReasons
-	TYPE CRLReason }
-
-certificateIssuer EXTENSION-CLASS ::= {
-	ID id-ce-certificateIssuer
-	TYPE CertificateIssuer }
-
-holdInstructionCode EXTENSION-CLASS ::= {
-	ID id-ce-holdInstructionCode
-	TYPE HoldInstructionCode }
-
-invalidityDate EXTENSION-CLASS ::= {
-	ID id-ce-invalidityDate 
-	TYPE InvalidityDate }
-
-END
diff --git a/lib/ssl/pkix/mk_ssl_pkix_oid.erl b/lib/ssl/pkix/mk_ssl_pkix_oid.erl
deleted file mode 100644
index 06edc5113a..0000000000
--- a/lib/ssl/pkix/mk_ssl_pkix_oid.erl
+++ /dev/null
@@ -1,94 +0,0 @@
--module(mk_ssl_pkix_oid).
-
--export([make/0]).
-
--define(PKIX_MODULES, ['OTP-PKIX']).
-
-make() ->
-    {ok, Fd} = file:open("ssl_pkix_oid.erl", [write]),
-    io:fwrite(Fd, "%%% File: ssl_pkix_oid.erl\n"
-	      "%%% NB This file has been automatically generated by "
-	      "mk_ssl_pkix_oid.\n"
-	      "%%% Do not edit it.\n\n", []),
-    io:fwrite(Fd, "-module(ssl_pkix_oid).\n", []),
-    io:fwrite(Fd, "-export([id2atom/1, atom2id/1, all_atoms/0, "
-	      "all_ids/0]).\n\n", []),
-
-
-    AIds0 = get_atom_ids(?PKIX_MODULES),
-
-    AIds1 = modify_atoms(AIds0),
-    gen_id2atom(Fd, AIds1),
-    gen_atom2id(Fd, AIds1),
-    gen_all(Fd, AIds1),
-    file:close(Fd).
-
-get_atom_ids(Ms) ->
-    get_atom_ids(Ms, []).
-
-get_atom_ids([], AIdss) ->
-    lists:flatten(AIdss);
-get_atom_ids([M| Ms], AIdss) ->
-    {value, {exports, Exports}} = 
-	lists:keysearch(exports, 1, M:module_info()),
-    As = lists:zf(
-	   fun ({info, 0}) -> false;
-	       ({module_info, 0}) -> false;
-	       ({encoding_rule, 0}) -> false;
-	       ({F, 0}) -> 
-		   case atom_to_list(F) of
-		   %% Remove upper-bound (ub-) functions
-		       "ub-" ++ _Rest ->
-			   false;
-		       _ ->
-			   {true, F}
-		   end;
-	       (_) -> false 
-	   end, Exports),
-    AIds = lists:map(fun(F) -> {F, M:F()} end, As),
-    get_atom_ids(Ms, [AIds| AIdss]).
-
-modify_atoms(AIds) ->
-    F = fun({A, I}) ->
-		NAS = case atom_to_list(A) of
-			  "id-" ++ Rest ->
-			      Rest;
-			  Any ->
-			      Any
-		      end,
-		{list_to_atom(NAS), I} end,
-    lists:map(F, AIds). 
-
-gen_id2atom(Fd, AIds0) ->
-    AIds1 = lists:keysort(2, AIds0),
-    Txt = join(";\n", 
-	       lists:map(
-		 fun({Atom, Id}) ->
-			 io_lib:fwrite("id2atom(~p) ->\n    ~p", [Id, Atom]) 
-		 end, AIds1)),
-    io:fwrite(Fd, "~s;\nid2atom(Any)->\n    Any.\n\n", [Txt]).
-
-gen_atom2id(Fd, AIds0) ->
-    AIds1 = lists:keysort(1, AIds0),
-    Txt = join(";\n", 
-	       lists:map(
-		 fun({Atom, Id}) ->
-			 io_lib:fwrite("atom2id(~p) ->\n    ~p", [Atom, Id]) 
-		 end, AIds1)),
-    io:fwrite(Fd, "~s;\natom2id(Any)->\n    Any.\n\n", [Txt]).
-
-gen_all(Fd, AIds) ->
-    Atoms = lists:sort([A || {A, _} <- AIds]),
-    Ids = lists:sort([I || {_, I} <- AIds]),
-    F = fun(X) -> io_lib:fwrite("    ~w", [X]) end,
-    ATxt = "all_atoms() ->\n" ++ join(",\n", lists:map(F, Atoms)),
-    io:fwrite(Fd, "~s.\n\n", [ATxt]),
-    ITxt = "all_ids() ->\n" ++ 	join(",\n", lists:map(F, Ids)),
-    io:fwrite(Fd, "~s.\n\n", [ITxt]).
-
-join(Sep, [H1, H2| T]) ->
-    [H1, Sep| join(Sep, [H2| T])]; 
-join(_Sep, [H1]) ->
-    H1;
-join(_, []) ->
-    [].
diff --git a/lib/ssl/pkix/prebuild.skip b/lib/ssl/pkix/prebuild.skip
deleted file mode 100644
index ffe82be68b..0000000000
--- a/lib/ssl/pkix/prebuild.skip
+++ /dev/null
@@ -1,5 +0,0 @@
-PKIX1Algorithms88.asn1db
-PKIXAttributeCertificate.asn1db
-PKIX1Explicit88.asn1db
-SSL-PKIX.asn1db
-PKIX1Implicit88.asn1db
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index fabf8a4e0d..7514ad2aa2 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -1,19 +1,19 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 1999-2010. 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%
 #
 
@@ -46,9 +46,6 @@ MODULES= \
 	ssl_server \
 	ssl_sup \
 	ssl_prim \
-	ssl_pkix \
-	ssl_pem	\
-	ssl_base64 \
 	inet_ssl_dist \
 	ssl_certificate\
 	ssl_certificate_db\
@@ -71,8 +68,6 @@ INTERNAL_HRL_FILES = \
 	 ssl_alert.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_internal.hrl \
 	 ssl_record.hrl
 
-PUBLIC_HRL_FILES = ssl_pkix.hrl 
-
 ERL_FILES= $(MODULES:%=%.erl)
 
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
@@ -85,15 +80,12 @@ APP_TARGET= $(EBIN)/$(APP_FILE)
 APPUP_SRC= $(APPUP_FILE).src
 APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
-INCLUDE = ../include
-
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
 EXTRA_ERLC_FLAGS = +warn_unused_vars
 ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
 	-pz $(ERL_TOP)/lib/public_key/ebin \
-	-I$(INCLUDE) \
 	$(EXTRA_ERLC_FLAGS) -DVSN=\"$(VSN)\"
 
 
@@ -101,7 +93,7 @@ ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(PUBLIC_HRL_FILES)
+debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) 
 
 clean:
 	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) 
@@ -113,9 +105,6 @@ $(APP_TARGET):	$(APP_SRC) ../vsn.mk
 $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
 	sed -e 's;%VSN%;$(VSN);' $< > $@
 
-$(PUBLIC_HRL_FILES):
-	cp -f $(PUBLIC_HRL_FILES) $(INCLUDE)
-
 docs:
 
 # ----------------------------------------------------
@@ -126,8 +115,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
 	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
-	$(INSTALL_DIR) $(RELSYSDIR)/include
-	$(INSTALL_DATA) $(PUBLIC_HRL_FILES) $(RELSYSDIR)/include
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
 	$(APPUP_TARGET) $(RELSYSDIR)/ebin
diff --git a/lib/ssl/src/inet_ssl_dist.erl b/lib/ssl/src/inet_ssl_dist.erl
index f62aefd35a..6c0fbc0618 100644
--- a/lib/ssl/src/inet_ssl_dist.erl
+++ b/lib/ssl/src/inet_ssl_dist.erl
@@ -1,8 +1,8 @@
-%%<copyright>
-%% <year>2000-2008</year>
-%% <holder>Ericsson AB, All Rights Reserved</holder>
-%%</copyright>
-%%<legalnotice>
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2000-2011. 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
@@ -14,8 +14,9 @@
 %% the License for the specific language governing rights and limitations
 %% under the License.
 %%
-%% The Initial Developer of the Original Code is Ericsson AB.
-%%</legalnotice>
+%% %CopyrightEnd%
+%%
+
 %%
 -module(inet_ssl_dist).
 
@@ -135,6 +136,9 @@ accept_connection(AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
 	       [self(), AcceptPid, Socket, MyNode,
 		Allowed, SetupTime]).
 
+%% Suppress dialyzer warning, we do not really care about old ssl code
+%% as we intend to remove it.
+-spec(do_accept(_,_,_,_,_,_) -> no_return()).
 do_accept(Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
     process_flag(priority, max),
     receive
@@ -167,8 +171,8 @@ do_accept(Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
 					ssl_prim:getll(S)
 				end,
 		      f_address = fun get_remote_id/2,
-		      mf_tick = {?MODULE, tick},
-		      mf_getstat = {?MODULE,getstat}
+		      mf_tick = fun ?MODULE:tick/1,
+		      mf_getstat = fun ?MODULE:getstat/1
 		     },
 		    dist_util:handshake_other_started(HSData);
 		{false,IP} ->
@@ -204,6 +208,9 @@ setup(Node, Type, MyNode, LongOrShortNames,SetupTime) ->
 				   LongOrShortNames,
 				   SetupTime]).
 
+%% Suppress dialyzer warning, we do not really care about old ssl code
+%% as we intend to remove it.
+-spec(do_setup(_,_,_,_,_,_) -> no_return()).
 do_setup(Kernel, Node, Type, MyNode, LongOrShortNames,SetupTime) ->
     process_flag(priority, max),
     ?trace("~p~n",[{inet_ssl_dist,self(),setup,Node}]),
@@ -258,8 +265,8 @@ do_setup(Kernel, Node, Type, MyNode, LongOrShortNames,SetupTime) ->
 				   protocol = ssl,
 				   family = inet}
 			      end,
-			      mf_tick = {?MODULE, tick},
-			      mf_getstat = {?MODULE,getstat},
+			      mf_tick = fun ?MODULE:tick/1,
+			      mf_getstat = fun ?MODULE:getstat/1,
 			      request_type = Type
 			     },
 			    dist_util:handshake_we_started(HSData);
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index 2a7d451341..b9716786e6 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -7,10 +7,6 @@
 	       ssl_server,
 	       ssl_broker,
 	       ssl_broker_sup,
-	       ssl_base64,
-	       ssl_pem,
-	       ssl_pkix,
-	       ssl_pkix_oid,
 	       ssl_prim,
 	       inet_ssl_dist,
 	       ssl_tls1,
@@ -28,11 +24,10 @@
 	       ssl_cipher,
 	       ssl_certificate_db,
 	       ssl_certificate,
-	       ssl_alert,
-	       'OTP-PKIX'
+	       ssl_alert
 	       ]},
     {registered, [ssl_sup, ssl_server, ssl_broker_sup]},
-    {applications, [kernel, stdlib]},
+    {applications, [crypto, public_key, kernel, stdlib]},
     {env, []},
     {mod, {ssl_app, []}}]}.
 
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index e8ae6846aa..e6a8c557fc 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,26 +1,15 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {"3.10", [{restart_application, ssl}]},			
-  {"3.10.1", [{restart_application, ssl}]},
-  {"3.10.2", [{restart_application, ssl}]},
-  {"3.10.3", [{restart_application, ssl}]},
-  {"3.10.4", [{restart_application, ssl}]},
-  {"3.10.5", [{restart_application, ssl}]},
-  {"3.10.6", [{restart_application, ssl}]},
-  {"3.10.7", [{restart_application, ssl}]},
-  {"3.10.8", [{restart_application, ssl}]},
-  {"3.10.9", [{restart_application, ssl}]}
+  {"4.1.2", [{restart_application, ssl}]},
+  {"4.1.1", [{restart_application, ssl}]},
+  {"4.1", [{restart_application, ssl}]},
+  {"4.0.1", [{restart_application, ssl}]}
  ], 
  [
-  {"3.10", [{restart_application, ssl}]},	
-  {"3.10.1", [{restart_application, ssl}]},		
-  {"3.10.2", [{restart_application, ssl}]},
-  {"3.10.3", [{restart_application, ssl}]},
-  {"3.10.4", [{restart_application, ssl}]},
-  {"3.10.5", [{restart_application, ssl}]},
-  {"3.10.6", [{restart_application, ssl}]},
-  {"3.10.8", [{restart_application, ssl}]},
-  {"3.10.9", [{restart_application, ssl}]}
+  {"4.1.2", [{restart_application, ssl}]},
+  {"4.1.1", [{restart_application, ssl}]},
+  {"4.1", [{restart_application, ssl}]},
+  {"4.0.1", [{restart_application, ssl}]}
  ]}.
 
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 185a1f755a..b85188b878 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -34,10 +34,14 @@
 
 %% Should be deprecated as soon as old ssl is removed
 %%-deprecated({pid, 1, next_major_release}).
+-deprecated({peercert, 2, next_major_release}).
 
 -include("ssl_int.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl").
+-include("ssl_cipher.hrl").
+
+-include_lib("public_key/include/public_key.hrl"). 
 
 -record(config, {ssl,               %% SSL parameters
 		 inet_user,         %% User set inet options
@@ -45,24 +49,48 @@
 		 inet_ssl,          %% inet options for internal ssl socket 
 		 cb                 %% Callback info
 		}).
+-type option()       :: socketoption() | ssloption() | transportoption().
+-type socketoption() :: [{property(), term()}]. %% See gen_tcp and inet
+-type property()     :: atom().
+
+-type ssloption()    :: {verify, verify_type()} |
+			{verify_fun, {fun(), InitialUserState::term()}} |
+                        {fail_if_no_peer_cert, boolean()} | {depth, integer()} |
+                        {cert, der_encoded()} | {certfile, path()} | {key, der_encoded()} |
+                        {keyfile, path()} | {password, string()} | {cacerts, [der_encoded()]} |
+                        {cacertfile, path()} | {dh, der_encoded()} | {dhfile, path()} |
+                        {ciphers, ciphers()} | {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} |
+                        {reuse_session, fun()}.
+
+-type verify_type()  :: verify_none | verify_peer.
+-type path()         :: string().
+-type ciphers()      :: [erl_cipher_suite()] |
+			string(). % (according to old API)
+-type ssl_imp()      :: new | old.
+
+-type transportoption() :: {CallbackModule::atom(), DataTag::atom(), ClosedTag::atom()}.
+
 
 %%--------------------------------------------------------------------
-%% Function: start([, Type]) -> ok
-%%
-%%  Type =  permanent | transient | temporary
-%%  Vsns = [Vsn] 
-%%  Vsn = ssl3 | tlsv1 | 'tlsv1.1'
+-spec start() -> ok  | {error, reason()}.
+-spec start(permanent | transient | temporary) -> ok | {error, reason()}.
 %%
-%% Description: Starts the ssl application. Default type
+%% Description: Utility function that starts the ssl, 
+%% crypto and public_key applications. Default type
 %% is temporary. see application(3)
 %%--------------------------------------------------------------------
 start() ->
+    application:start(crypto),
+    application:start(public_key),
     application:start(ssl).
+
 start(Type) ->
+    application:start(crypto, Type),
+    application:start(public_key, Type),
     application:start(ssl, Type).
 
 %%--------------------------------------------------------------------
-%% Function: stop() -> ok
+-spec stop() -> ok.
 %%
 %% Description: Stops the ssl application.
 %%--------------------------------------------------------------------
@@ -70,7 +98,13 @@ stop() ->
     application:stop(ssl).
 
 %%--------------------------------------------------------------------
-%% Function: connect(Address, Port, Options[, Timeout]) -> {ok, Socket}
+-spec connect(host() | port(), [option()]) -> {ok, #sslsocket{}} |
+					      {error, reason()}.
+-spec connect(host() | port(), [option()] | port_num(), timeout() | list()) ->
+		     {ok, #sslsocket{}} | {error, reason()}.
+-spec connect(host() | port(), port_num(), list(), timeout()) ->
+		     {ok, #sslsocket{}} | {error, reason()}.
+
 %%
 %% Description: Connect to a ssl server.
 %%--------------------------------------------------------------------
@@ -96,13 +130,13 @@ connect(Socket, SslOptions0, Timeout) when is_port(Socket) ->
             {error, Reason}
     end;
 
-connect(Address, Port, Options) ->
-    connect(Address, Port, Options, infinity).
+connect(Host, Port, Options) ->
+    connect(Host, Port, Options, infinity).
 
-connect(Address, Port, Options0, Timeout) ->
-    case proplists:get_value(ssl_imp, Options0, old) of
+connect(Host, Port, Options0, Timeout) ->
+    case proplists:get_value(ssl_imp, Options0, new) of
         new ->
-            new_connect(Address, Port, Options0, Timeout);
+            new_connect(Host, Port, Options0, Timeout);
         old ->
 	    %% Allow the option reuseaddr to be present
 	    %% so that new and old ssl can be run by the same
@@ -110,20 +144,21 @@ connect(Address, Port, Options0, Timeout) ->
 	    %% that hardcodes reuseaddr to true in its portprogram.
 	    Options1 = proplists:delete(reuseaddr, Options0),
 	    Options  = proplists:delete(ssl_imp, Options1),
-            old_connect(Address, Port, Options, Timeout);
+            old_connect(Host, Port, Options, Timeout);
 	Value ->
 	    {error, {eoptions, {ssl_imp, Value}}}
     end.
 
 %%--------------------------------------------------------------------
-%% Function: listen(Port, Options) -> {ok, ListenSock} | {error, Reason}
+-spec listen(port_num(), [option()]) ->{ok, #sslsocket{}} | {error, reason()}.
+		    
 %%
 %% Description: Creates a ssl listen socket.
 %%--------------------------------------------------------------------
 listen(_Port, []) ->
     {error, enooptions};
 listen(Port, Options0) ->
-    case proplists:get_value(ssl_imp, Options0, old) of
+    case proplists:get_value(ssl_imp, Options0, new) of
 	new ->
 	    new_listen(Port, Options0);
 	old ->
@@ -139,7 +174,10 @@ listen(Port, Options0) ->
     end.
 
 %%--------------------------------------------------------------------
-%% Function: transport_accept(ListenSocket[, Timeout]) -> {ok, Socket}.
+-spec transport_accept(#sslsocket{}) -> {ok, #sslsocket{}} |
+					{error, reason()}.
+-spec transport_accept(#sslsocket{}, timeout()) -> {ok, #sslsocket{}} |
+						   {error, reason()}.
 %%
 %% Description: Performs transport accept on a ssl listen socket 
 %%--------------------------------------------------------------------
@@ -177,8 +215,10 @@ transport_accept(#sslsocket{} = ListenSocket, Timeout) ->
     ssl_broker:transport_accept(Pid, ListenSocket, Timeout).
 
 %%--------------------------------------------------------------------
-%% Function: ssl_accept(ListenSocket[, Timeout]) -> {ok, Socket} | 
-%%                                                  {error, Reason}
+-spec ssl_accept(#sslsocket{}) -> ok | {error, reason()}.
+-spec ssl_accept(#sslsocket{} | port(), timeout()| [option()]) ->
+			ok | {ok, #sslsocket{}} | {error, reason()}.
+-spec ssl_accept(port(), [option()], timeout()) -> {ok, #sslsocket{}} | {error, reason()}.
 %%
 %% Description: Performs accept on a ssl listen socket. e.i. performs
 %%              ssl handshake. 
@@ -205,14 +245,14 @@ ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket) ->
 	{ok, #config{cb=CbInfo,ssl=SslOpts, emulated=EmOpts}} ->
 	    {ok, Port} = inet:port(Socket),
 	    ssl_connection:ssl_accept(Port, Socket,
-				  {SslOpts, EmOpts},
-				  self(), CbInfo, Timeout)
+				      {SslOpts, EmOpts},
+				      self(), CbInfo, Timeout)
     catch 
 	Error = {error, _Reason} -> Error
     end.
 
 %%--------------------------------------------------------------------
-%% Function: close() -> ok 
+-spec  close(#sslsocket{}) -> term().
 %%
 %% Description: Close a ssl connection
 %%--------------------------------------------------------------------  
@@ -225,7 +265,7 @@ close(Socket = #sslsocket{}) ->
     ssl_broker:close(Socket).
 
 %%--------------------------------------------------------------------
-%% Function:  send(Socket, Data) -> ok | {error, Reason}
+-spec send(#sslsocket{}, iolist()) -> ok | {error, reason()}.
 %% 
 %% Description: Sends data over the ssl connection
 %%--------------------------------------------------------------------
@@ -237,7 +277,8 @@ send(#sslsocket{} = Socket, Data) ->
     ssl_broker:send(Socket, Data).
 
 %%--------------------------------------------------------------------
-%% Function: recv(Socket, Length [,Timeout]) -> {ok, Data} | {error, reason}
+-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
 %%--------------------------------------------------------------------
@@ -251,8 +292,8 @@ recv(Socket = #sslsocket{}, Length, Timeout) ->
     ssl_broker:recv(Socket, Length, Timeout).
 
 %%--------------------------------------------------------------------
-%% Function: controlling_process(Socket, NewOwner) -> ok | {error, Reason}
-%%
+-spec controlling_process(#sslsocket{}, pid()) -> ok | {error, reason()}.
+%%				 
 %% Description: Changes process that receives the messages when active = true
 %% or once. 
 %%--------------------------------------------------------------------
@@ -265,11 +306,8 @@ controlling_process(Socket, NewOwner) when is_pid(NewOwner) ->
     ssl_broker:controlling_process(Socket, NewOwner).
 
 %%--------------------------------------------------------------------
-%% Function: connection_info(Socket) -> {ok, {Protocol, CipherSuite}} | 
-%%                                      {error, Reason}
-%% Protocol = sslv3 | tlsv1 | tlsv1.1
-%% CipherSuite = {KeyExchange, Chipher, Hash, Exportable}
-%% 
+-spec connection_info(#sslsocket{}) -> 	{ok, {tls_atom_version(), erl_cipher_suite()}} | 
+					{error, reason()}.
 %%
 %% Description: Returns ssl protocol and cipher used for the connection
 %%--------------------------------------------------------------------
@@ -281,9 +319,9 @@ connection_info(#sslsocket{} = Socket) ->
     ssl_broker:connection_info(Socket).
 
 %%--------------------------------------------------------------------
-%% Function: peercert(Socket[, Opts]) -> {ok, Cert} | {error, Reason}
+-spec peercert(#sslsocket{}) ->{ok, der_cert()} | {error, reason()}.
 %%
-%% Description: 
+%% Description: Returns the peercert.
 %%--------------------------------------------------------------------
 peercert(Socket) ->
     peercert(Socket, []).
@@ -293,14 +331,7 @@ peercert(#sslsocket{pid = Pid, fd = new_ssl}, Opts) ->
 	{ok, undefined} ->
 	    {error, no_peercert};
         {ok, BinCert} ->
-	    PKOpts = [case Opt of ssl -> otp; pkix -> plain end || 
-			 Opt <- Opts, Opt =:= ssl orelse Opt =:= pkix],
-	    case PKOpts of
-		[Opt] ->
-		    public_key:pkix_decode_cert(BinCert, Opt);
-		[] ->
-		    {ok, BinCert}
-	    end;
+	    decode_peercert(BinCert, Opts);
         {error, Reason}  ->
             {error, Reason}
     end;
@@ -309,15 +340,44 @@ peercert(#sslsocket{} = Socket, Opts) ->
     ensure_old_ssl_started(),
     case ssl_broker:peercert(Socket) of
         {ok, Bin} ->
-            ssl_pkix:decode_cert(Bin, Opts);
+	    decode_peercert(Bin, Opts);
         {error, Reason}  ->
             {error, Reason}
     end.
 
+
+decode_peercert(BinCert, Opts) ->
+    PKOpts = [case Opt of ssl -> otp; pkix -> plain end || 
+		 Opt <- Opts, Opt =:= ssl orelse Opt =:= pkix],
+    case PKOpts of
+	[Opt] ->
+	    select_part(Opt, public_key:pkix_decode_cert(BinCert, Opt), Opts);
+	[] ->
+	    {ok, BinCert}
+    end.
+
+select_part(otp, Cert, Opts) ->
+    case lists:member(subject, Opts) of 
+	true ->
+	    TBS = Cert#'OTPCertificate'.tbsCertificate,
+	    {ok, TBS#'OTPTBSCertificate'.subject};
+	false ->
+	    {ok, Cert}
+    end;
+
+select_part(plain, Cert, Opts) ->
+    case lists:member(subject, Opts) of 
+	true ->
+	    TBS = Cert#'Certificate'.tbsCertificate,
+	    {ok,  TBS#'TBSCertificate'.subject};
+	false ->
+	    {ok, Cert}
+    end.
+
 %%--------------------------------------------------------------------
-%% Function: peername(Socket) -> {ok, {Address, Port}} | {error, Reason}
+-spec peername(#sslsocket{}) -> {ok, {tuple(), port_num()}} | {error, reason()}.
 %%
-%% Description:
+%% Description: same as inet:peername/1.
 %%--------------------------------------------------------------------
 peername(#sslsocket{fd = new_ssl, pid = Pid}) ->
     ssl_connection:peername(Pid);
@@ -327,9 +387,10 @@ peername(#sslsocket{} = Socket) ->
     ssl_broker:peername(Socket).
 
 %%--------------------------------------------------------------------
-%% Function: cipher_suites() -> 
-%%
-%% Description:
+-spec cipher_suites() -> [erl_cipher_suite()].
+-spec cipher_suites(erlang | openssl) -> [erl_cipher_suite()] | [string()].
+			   
+%% Description: Returns all supported cipher suites.
 %%--------------------------------------------------------------------
 cipher_suites() ->
     cipher_suites(erlang).
@@ -343,7 +404,7 @@ cipher_suites(openssl) ->
     [ssl_cipher:openssl_suite_name(S) || S <- ssl_cipher:suites(Version)].
 
 %%--------------------------------------------------------------------
-%% Function: getopts(Socket, OptTags) -> {ok, Options} | {error, Reason}
+-spec getopts(#sslsocket{}, [atom()]) -> {ok, [{atom(), term()}]}| {error, reason()}.
 %% 
 %% Description:
 %%--------------------------------------------------------------------
@@ -356,7 +417,7 @@ getopts(#sslsocket{} = Socket, Options) ->
     ssl_broker:getopts(Socket, Options).
 
 %%--------------------------------------------------------------------
-%% Function: setopts(Socket, Options) -> ok | {error, Reason}
+-spec setopts(#sslsocket{},  [{atom(), term()}]) -> ok | {error, reason()}.
 %% 
 %% Description:
 %%--------------------------------------------------------------------
@@ -371,8 +432,8 @@ setopts(#sslsocket{} = Socket, Options) ->
     ssl_broker:setopts(Socket, Options).
 
 %%---------------------------------------------------------------
-%% Function: shutdown(Socket, How) -> ok | {error, Reason}
-%% 
+-spec shutdown(#sslsocket{}, read | write | read_write) ->  ok | {error, reason()}.
+%%		      
 %% Description: Same as gen_tcp:shutdown/2
 %%--------------------------------------------------------------------
 shutdown(#sslsocket{pid = {ListenSocket, #config{cb={CbMod,_, _, _}}}, fd = new_ssl}, How) ->
@@ -381,8 +442,8 @@ shutdown(#sslsocket{pid = Pid, fd = new_ssl}, How) ->
     ssl_connection:shutdown(Pid, How).
 
 %%--------------------------------------------------------------------
-%% Function: sockname(Socket) -> {ok, {Address, Port}} | {error, Reason}
-%% 
+-spec sockname(#sslsocket{}) -> {ok, {tuple(), port_num()}} | {error, reason()}.
+%%		     
 %% Description: Same as inet:sockname/1
 %%--------------------------------------------------------------------
 sockname(#sslsocket{fd = new_ssl, pid = {ListenSocket, _}}) ->
@@ -396,9 +457,9 @@ sockname(#sslsocket{} = Socket) ->
     ssl_broker:sockname(Socket).
 
 %%---------------------------------------------------------------
-%% Function: seed(Data) -> ok | {error, edata}
+-spec seed(term()) ->term().
 %% 
-%% Description:
+%% Description: Only used by old ssl.
 %%--------------------------------------------------------------------
 %% TODO: crypto:seed ?
 seed(Data) ->
@@ -406,20 +467,17 @@ seed(Data) ->
     ssl_server:seed(Data).
 
 %%---------------------------------------------------------------
-%% Function: session_id(Socket) -> {ok, PropList} | {error, Reason} 
+-spec session_info(#sslsocket{}) -> {ok, list()} | {error, reason()}.
 %% 
-%% Description:
+%% Description: Returns list of session info currently [{session_id, session_id(),
+%% {cipher_suite, cipher_suite()}]
 %%--------------------------------------------------------------------
 session_info(#sslsocket{pid = Pid, fd = new_ssl}) ->
     ssl_connection:session_info(Pid).
 
 %%---------------------------------------------------------------
-%% Function: versions() -> [{SslAppVer, SupportedSslVer, AvailableSslVsn}]
-%% 
-%% SslAppVer = string()  - t.ex: ssl-4.0
-%% SupportedSslVer = [SslVer]
-%% AvailableSslVsn = [SSLVer]
-%% SSLVer = sslv3 | tlsv1  | 'tlsv1.1'
+-spec versions() -> [{ssl_app, string()} | {supported, [tls_atom_version()]} | 
+		      {available, [tls_atom_version()]}]. 
 %%
 %% Description: Returns a list of relevant versions.
 %%--------------------------------------------------------------------
@@ -430,9 +488,105 @@ versions() ->
     [{ssl_app, ?VSN}, {supported, SupportedVsns}, {available, AvailableVsns}].
 
 
+%%---------------------------------------------------------------
+-spec renegotiate(#sslsocket{}) -> ok | {error, reason()}.
+%% 
+%% Description: Initiates a renegotiation.
+%%--------------------------------------------------------------------
 renegotiate(#sslsocket{pid = Pid, fd = new_ssl}) ->
     ssl_connection:renegotiation(Pid).
 
+%%---------------------------------------------------------------
+-spec format_error({error, term()}) -> list().
+%%
+%% Description: Creates error string.
+%%--------------------------------------------------------------------
+format_error({error, Reason}) ->
+    format_error(Reason);
+format_error(Reason) when is_list(Reason) ->
+    Reason;
+format_error(closed) ->
+    "The connection is closed";
+format_error(ecacertfile) ->
+    "Own CA certificate file is invalid.";
+format_error(ecertfile) ->
+    "Own certificate file is invalid.";
+format_error(ekeyfile) ->
+    "Own private key file is invalid.";
+format_error(esslaccept) ->
+    "Server SSL handshake procedure between client and server failed.";
+format_error(esslconnect) ->
+    "Client SSL handshake procedure between client and server failed.";
+format_error({eoptions, Options}) ->
+    lists:flatten(io_lib:format("Error in options list: ~p~n", [Options]));
+
+%%%%%%%%%%%%  START OLD SSL format_error %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+format_error(ebadsocket) ->
+    "Connection not found (internal error).";
+format_error(ebadstate) ->
+    "Connection not in connect state (internal error).";
+format_error(ebrokertype) ->
+    "Wrong broker type (internal error).";
+format_error(echaintoolong) ->
+    "The chain of certificates provided by peer is too long.";
+format_error(ecipher) ->
+    "Own list of specified ciphers is invalid.";
+format_error(ekeymismatch) ->
+    "Own private key does not match own certificate.";
+format_error(enoissuercert) ->
+    "Cannot find certificate of issuer of certificate provided by peer.";
+format_error(enoservercert) ->
+    "Attempt to do accept without having set own certificate.";
+format_error(enotlistener) ->
+    "Attempt to accept on a non-listening socket.";
+format_error(enoproxysocket) ->
+    "No proxy socket found (internal error or max number of file "
+        "descriptors exceeded).";
+format_error(enooptions) ->
+    "List of options is empty.";
+format_error(enotstarted) ->
+    "The SSL application has not been started.";
+format_error(eoptions) ->
+    "Invalid list of options.";
+format_error(epeercert) ->
+    "Certificate provided by peer is in error.";
+format_error(epeercertexpired) ->
+    "Certificate provided by peer has expired.";
+format_error(epeercertinvalid) ->
+    "Certificate provided by peer is invalid.";
+format_error(eselfsignedcert) ->
+    "Certificate provided by peer is self signed.";
+format_error(esslerrssl) ->
+    "SSL protocol failure. Typically because of a fatal alert from peer.";
+format_error(ewantconnect) ->
+    "Protocol wants to connect, which is not supported in this "
+        "version of the SSL application.";
+format_error(ex509lookup) ->
+    "Protocol wants X.509 lookup, which is not supported in this "
+        "version of the SSL application.";
+format_error({badcall, _Call}) ->
+    "Call not recognized for current mode (active or passive) and state "
+        "of socket.";
+format_error({badcast, _Cast}) ->
+    "Call not recognized for current mode (active or passive) and state "
+        "of socket.";
+
+format_error({badinfo, _Info}) ->
+    "Call not recognized for current mode (active or passive) and state "
+        "of socket.";
+
+%%%%%%%%%%%%%%%%%% END OLD SSL format_error %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+format_error(Error) ->
+    case (catch inet:format_error(Error)) of
+        "unkknown POSIX" ++ _ ->
+            no_format(Error);
+        {'EXIT', _} ->
+            no_format(Error);
+        Other ->
+            Other
+    end.
+
 %%%--------------------------------------------------------------
 %%% Internal functions
 %%%--------------------------------------------------------------------
@@ -488,59 +642,68 @@ old_listen(Port, Options) ->
     {ok, Pid} = ssl_broker:start_broker(listener),
     ssl_broker:listen(Pid, Port, Options).
 
-handle_options(Opts0, Role) ->
+handle_options(Opts0, _Role) ->
     Opts = proplists:expand([{binary, [{mode, binary}]},
 			     {list, [{mode, list}]}], Opts0),
     
     ReuseSessionFun = fun(_, _, _, _) -> true end,
 
-    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,
+    DefaultVerifyNoneFun =
+	{fun(_,{bad_cert, _}, UserState) ->
+		 {valid, UserState};
+	    (_,{extension, _}, UserState) ->
+		 {unknown, UserState};
+	    (_, valid, UserState) ->
+		 {valid, UserState};
+	    (_, valid_peer, UserState) ->
+		 {valid, UserState}
+	 end, []},
 
-    UserFailIfNoPeerCert = validate_option(fail_if_no_peer_cert, 
-					   proplists:get_value(fail_if_no_peer_cert, Opts, false)),
+    VerifyNoneFun = handle_option(verify_fun, Opts, DefaultVerifyNoneFun),
 
-    {Verify, FailIfNoPeerCert, CaCertDefault} = 
+    UserFailIfNoPeerCert = handle_option(fail_if_no_peer_cert, Opts, false),
+    UserVerifyFun = handle_option(verify_fun, Opts, undefined),
+    CaCerts = handle_option(cacerts, Opts, undefined),
+
+    {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun} =
 	%% Handle 0, 1, 2 for backwards compatibility
 	case proplists:get_value(verify, Opts, verify_none) of
 	    0 ->
-		{verify_none, false, ca_cert_default(verify_none, Role)};
+		{verify_none, false,
+		 ca_cert_default(verify_none, VerifyNoneFun, CaCerts), VerifyNoneFun};
 	    1  ->
-		{verify_peer, false, ca_cert_default(verify_peer, Role)};
+		{verify_peer, false,
+		 ca_cert_default(verify_peer, UserVerifyFun, CaCerts), UserVerifyFun};
 	    2 ->
-		{verify_peer, true,  ca_cert_default(verify_peer, Role)};
+		{verify_peer, true,
+		 ca_cert_default(verify_peer, UserVerifyFun, CaCerts), UserVerifyFun};
 	    verify_none ->
-		{verify_none, false, ca_cert_default(verify_none, Role)};
+		{verify_none, false,
+		 ca_cert_default(verify_none, VerifyNoneFun, CaCerts), VerifyNoneFun};
 	    verify_peer ->
-		{verify_peer, UserFailIfNoPeerCert, ca_cert_default(verify_peer, Role)};
+		{verify_peer, UserFailIfNoPeerCert,
+		 ca_cert_default(verify_peer, UserVerifyFun, CaCerts), UserVerifyFun};
 	    Value ->
 		throw({error, {eoptions, {verify, Value}}})
-	end,   
+	end,
 
     CertFile = handle_option(certfile, Opts, ""),
     
     SSLOptions = #ssl_options{
       versions   = handle_option(versions, Opts, []),
       verify     = validate_option(verify, Verify),
-      verify_fun = handle_option(verify_fun, Opts, VerifyFun),
+      verify_fun = VerifyFun,
       fail_if_no_peer_cert = FailIfNoPeerCert,
       verify_client_once =  handle_option(verify_client_once, Opts, false),
-      validate_extensions_fun = handle_option(validate_extensions_fun, Opts, undefined),
       depth      = handle_option(depth,  Opts, 1),
+      cert       = handle_option(cert, Opts, undefined),
       certfile   = CertFile,
-      keyfile    = handle_option(keyfile,  Opts, CertFile),
       key        = handle_option(key, Opts, undefined),
+      keyfile    = handle_option(keyfile,  Opts, CertFile),
       password   = handle_option(password, Opts, ""),
+      cacerts    = CaCerts,
       cacertfile = handle_option(cacertfile, Opts, CaCertDefault),
+      dh         = handle_option(dh, Opts, undefined),
       dhfile     = handle_option(dhfile, Opts, undefined),
       ciphers    = handle_option(ciphers, Opts, []),
       %% Server side option
@@ -552,10 +715,10 @@ handle_options(Opts0, Role) ->
      },
 
     CbInfo  = proplists:get_value(cb_info, Opts, {gen_tcp, tcp, tcp_closed, tcp_error}),    
-    SslOptions = [versions, verify, verify_fun, validate_extensions_fun, 
+    SslOptions = [versions, verify, verify_fun,
 		  fail_if_no_peer_cert, verify_client_once,
-		  depth, certfile, keyfile,
-		  key, password, cacertfile, dhfile, ciphers,
+		  depth, cert, certfile, key, keyfile,
+		  password, cacerts, cacertfile, dh, dhfile, ciphers,
 		  debug, reuse_session, reuse_sessions, ssl_imp,
 		  cb_info, renegotiate_at, secure_renegotiate],
     
@@ -579,7 +742,25 @@ validate_option(ssl_imp, Value) when Value == new; Value == old ->
 validate_option(verify, Value) 
   when Value == verify_none; Value == verify_peer ->
     Value;
-validate_option(verify_fun, Value) when is_function(Value) ->
+validate_option(verify_fun, undefined)  ->
+    undefined;
+%% Backwards compatibility
+validate_option(verify_fun, Fun) when is_function(Fun) ->
+    {fun(_,{bad_cert, _} = Reason, OldFun) ->
+	     case OldFun([Reason]) of
+		 true ->
+		     {valid, OldFun};
+		 false ->
+		     {fail, Reason}
+	     end;
+	(_,{extension, _}, UserState) ->
+	     {unknown, UserState};
+	(_, valid, UserState) ->
+	     {valid, UserState};
+	(_, valid_peer, UserState) ->
+	     {valid, UserState}
+     end, Fun};
+validate_option(verify_fun, {Fun, _} = Value) when is_function(Fun) ->
    Value;
 validate_option(fail_if_no_peer_cert, Value) 
   when Value == true; Value == false ->
@@ -587,29 +768,38 @@ validate_option(fail_if_no_peer_cert, Value)
 validate_option(verify_client_once, Value) 
   when Value == true; Value == false ->
     Value;
-
-validate_option(validate_extensions_fun, Value) when Value == undefined; is_function(Value) ->
-    Value;
 validate_option(depth, Value) when is_integer(Value), 
                                    Value >= 0, Value =< 255->
     Value;
-validate_option(certfile, Value) when is_list(Value) ->
+validate_option(cert, Value) when Value == undefined;
+                                 is_binary(Value) ->
     Value;
-validate_option(keyfile, Value) when is_list(Value) ->
+validate_option(certfile, Value) when Value == undefined; is_list(Value) ->
     Value;
-validate_option(key, Value) when Value == undefined;
-                                 is_tuple(Value) ->
-    %% element(1, Value)=='RSAPrivateKey' ->
+
+validate_option(key, undefined) ->
+    undefined;
+validate_option(key, {KeyType, Value}) when is_binary(Value),
+					    KeyType == rsa;
+					    KeyType == dsa ->
+    {KeyType, Value};
+validate_option(keyfile, Value) when is_list(Value) ->
     Value;
 validate_option(password, Value) when is_list(Value) ->
     Value;
 
+validate_option(cacerts, Value) when Value == undefined;
+				     is_list(Value) ->
+    Value;
 %% certfile must be present in some cases otherwhise it can be set
 %% to the empty string.
 validate_option(cacertfile, undefined) ->
     "";
 validate_option(cacertfile, Value) when is_list(Value), Value =/= "" ->
     Value;
+validate_option(dh, Value) when Value == undefined;
+				is_binary(Value) ->
+    Value;
 validate_option(dhfile, undefined = Value)  ->
     Value;
 validate_option(dhfile, Value) when is_list(Value), Value =/= "" ->
@@ -633,7 +823,7 @@ validate_option(secure_renegotiate, Value) when Value == true;
 						Value == false ->
     Value;
 validate_option(renegotiate_at, Value) when is_integer(Value) ->
-    min(Value, ?DEFAULT_RENEGOTIATE_AT);
+    erlang:min(Value, ?DEFAULT_RENEGOTIATE_AT);
 
 validate_option(debug, Value) when is_list(Value); Value == true ->
     Value;
@@ -667,14 +857,16 @@ validate_inet_option(active, Value)
 validate_inet_option(_, _) ->
     ok.
 
-ca_cert_default(verify_none, _) ->
+%% The option cacerts overrides cacertsfile
+ca_cert_default(_,_, [_|_]) ->
+    undefined;
+ca_cert_default(verify_none, _, _) ->
     undefined;
-%% Client may leave verification up to the user
-ca_cert_default(verify_peer, client) ->
+ca_cert_default(verify_peer, {Fun,_}, _) when is_function(Fun) ->
     undefined;
-%% Server that wants to verify_peer must have
+%% Server that wants to verify_peer and has no verify_fun must have
 %% some trusted certs.
-ca_cert_default(verify_peer, server) ->
+ca_cert_default(verify_peer, undefined, _) ->
     "".
 
 emulated_options() ->
@@ -725,7 +917,7 @@ cipher_suites(Version, [{_,_,_}| _] = Ciphers0) ->
     Ciphers = [ssl_cipher:suite(C) || C <- Ciphers0],
     cipher_suites(Version, Ciphers);
 cipher_suites(Version, [Cipher0 | _] = Ciphers0) when is_binary(Cipher0) ->
-    Supported = ssl_cipher:suites(Version),
+    Supported = ssl_cipher:suites(Version) ++ ssl_cipher:anonymous_suites(),
     case [Cipher || Cipher <- Ciphers0, lists:member(Cipher, Supported)] of
 	[] ->
 	    Supported;
@@ -741,92 +933,6 @@ cipher_suites(Version, Ciphers0)  ->
     Ciphers = [ssl_cipher:openssl_suite(C) || C <- string:tokens(Ciphers0, ":")],
     cipher_suites(Version, Ciphers).
 
-format_error({error, Reason}) ->
-    format_error(Reason);
-format_error(Reason) when is_list(Reason) ->
-    Reason;
-format_error(closed) ->
-    "The connection is closed";
-format_error(ecacertfile) ->
-    "Own CA certificate file is invalid.";
-format_error(ecertfile) ->
-    "Own certificate file is invalid.";
-format_error(ekeyfile) ->
-    "Own private key file is invalid.";
-format_error(esslaccept) ->
-    "Server SSL handshake procedure between client and server failed.";
-format_error(esslconnect) ->
-    "Client SSL handshake procedure between client and server failed.";
-format_error({eoptions, Options}) ->
-    lists:flatten(io_lib:format("Error in options list: ~p~n", [Options]));
-
-%%%%%%%%%%%%  START OLD SSL format_error %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-format_error(ebadsocket) ->
-    "Connection not found (internal error).";
-format_error(ebadstate) ->
-    "Connection not in connect state (internal error).";
-format_error(ebrokertype) ->
-    "Wrong broker type (internal error).";
-format_error(echaintoolong) ->
-    "The chain of certificates provided by peer is too long.";
-format_error(ecipher) ->
-    "Own list of specified ciphers is invalid.";
-format_error(ekeymismatch) ->
-    "Own private key does not match own certificate.";
-format_error(enoissuercert) ->
-    "Cannot find certificate of issuer of certificate provided by peer.";
-format_error(enoservercert) ->
-    "Attempt to do accept without having set own certificate.";
-format_error(enotlistener) ->
-    "Attempt to accept on a non-listening socket.";
-format_error(enoproxysocket) ->
-    "No proxy socket found (internal error or max number of file "
-        "descriptors exceeded).";
-format_error(enooptions) ->
-    "List of options is empty.";
-format_error(enotstarted) ->
-    "The SSL application has not been started.";
-format_error(eoptions) ->
-    "Invalid list of options.";
-format_error(epeercert) ->
-    "Certificate provided by peer is in error.";
-format_error(epeercertexpired) ->
-    "Certificate provided by peer has expired.";
-format_error(epeercertinvalid) ->
-    "Certificate provided by peer is invalid.";
-format_error(eselfsignedcert) ->
-    "Certificate provided by peer is self signed.";
-format_error(esslerrssl) ->
-    "SSL protocol failure. Typically because of a fatal alert from peer.";
-format_error(ewantconnect) ->
-    "Protocol wants to connect, which is not supported in this "
-        "version of the SSL application.";
-format_error(ex509lookup) ->
-    "Protocol wants X.509 lookup, which is not supported in this "
-        "version of the SSL application.";
-format_error({badcall, _Call}) ->
-    "Call not recognized for current mode (active or passive) and state "
-        "of socket.";
-format_error({badcast, _Cast}) ->
-    "Call not recognized for current mode (active or passive) and state "
-        "of socket."; 
-
-format_error({badinfo, _Info}) ->
-    "Call not recognized for current mode (active or passive) and state "
-        "of socket.";
-
-%%%%%%%%%%%%%%%%%% END OLD SSL format_error %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-format_error(Error) ->
-    case (catch inet:format_error(Error)) of
-        "unkknown POSIX" ++ _ ->
-            no_format(Error);
-        {'EXIT', _} ->
-            no_format(Error);
-        Other ->
-            Other
-    end.
-
 no_format(Error) ->    
     lists:flatten(io_lib:format("No format string for error: \"~p\" available.", [Error])).
 
@@ -863,10 +969,6 @@ version() ->
                         end,
     {ok, {SSLVsn, CompVsn, LibVsn}}.
 
-min(N,M) when N < M ->
-    N;
-min(_, M) ->
-    M.
                                 
 %% Only used to remove exit messages from old ssl
 %% First is a nonsense clause to provide some
diff --git a/lib/ssl/src/ssl_alert.erl b/lib/ssl/src/ssl_alert.erl
index db9a883654..eb1228afa4 100644
--- a/lib/ssl/src/ssl_alert.erl
+++ b/lib/ssl/src/ssl_alert.erl
@@ -32,6 +32,17 @@
 
 -export([alert_txt/1, reason_code/2]).
 
+%%====================================================================
+%% Internal application API
+%%====================================================================
+%%--------------------------------------------------------------------
+-spec reason_code(#alert{}, client | server) -> closed | esslconnect |
+						esslaccept | string().
+%%
+%% Description: Returns the error reason that will be returned to the
+%% user.
+%%--------------------------------------------------------------------
+
 reason_code(#alert{description = ?CLOSE_NOTIFY}, _) ->
     closed;
 reason_code(#alert{description = ?HANDSHAKE_FAILURE}, client) ->
@@ -41,10 +52,19 @@ reason_code(#alert{description = ?HANDSHAKE_FAILURE}, server) ->
 reason_code(#alert{description = Description}, _) ->
     description_txt(Description).
 
+%%--------------------------------------------------------------------
+-spec alert_txt(#alert{}) -> string().
+%%
+%% Description: Returns the error string for given alert.
+%%--------------------------------------------------------------------
+
 alert_txt(#alert{level = Level, description = Description, where = {Mod,Line}}) ->
     Mod ++ ":" ++ integer_to_list(Line) ++ ":" ++ 
 	level_txt(Level) ++" "++ description_txt(Description).
 
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
 level_txt(?WARNING) ->
     "Warning:";
 level_txt(?FATAL) ->
@@ -96,8 +116,3 @@ description_txt(?USER_CANCELED) ->
     "user canceled";
 description_txt(?NO_RENEGOTIATION) ->
     "no renegotiation".
-
-
-
-
-
diff --git a/lib/ssl/src/ssl_app.erl b/lib/ssl/src/ssl_app.erl
index 6ca1c42631..8d50fd7bdb 100644
--- a/lib/ssl/src/ssl_app.erl
+++ b/lib/ssl/src/ssl_app.erl
@@ -27,14 +27,16 @@
 
 -export([start/2, stop/1]).
 
-%% start/2(Type, StartArgs) -> {ok, Pid} | {ok, Pid, State} | 
-%%                             {error, Reason}
-%%
+%%--------------------------------------------------------------------
+-spec start(normal | {takeover, node()} | {failover, node()}, list()) -> 
+		   ignore | {ok, pid()} | {error, term()}.
+%%--------------------------------------------------------------------
 start(_Type, _StartArgs) ->
     ssl_sup:start_link().
 
-%% stop(State) -> void()
-%%
+%--------------------------------------------------------------------
+-spec stop(term())-> ok.
+%%-------------------------------------------------------------------- 
 stop(_State) ->
     ok.
 
diff --git a/lib/ssl/src/ssl_base64.erl b/lib/ssl/src/ssl_base64.erl
deleted file mode 100644
index cfc42407e8..0000000000
--- a/lib/ssl/src/ssl_base64.erl
+++ /dev/null
@@ -1,129 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. 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%
-%%
-
-%%
-
-%%% Purpose : Base 64 encoding and decoding.
-
--module(ssl_base64).
-
--export([encode/1, encode_split/1, decode/1, join_decode/1]).
-
--define(st(X,A), ((X-A+256) div 256)).
--define(CHARS, 64).
-
-%% A PEM encoding consists of characters A-Z, a-z, 0-9, +, / and
-%% =. Each character encodes a 6 bits value from 0 to 63 (A = 0, / =
-%% 63); = is a padding character.
-%%
-
-%%
-%% encode(Bytes|Binary) -> Chars
-%%
-%% Take 3 bytes a time (3 x 8 = 24 bits), and make 4 characters out of
-%% them (4 x 6 = 24 bits).
-%%
-encode(Bs) when is_list(Bs) ->
-    encode(list_to_binary(Bs));
-encode(<<B:3/binary, Bs/binary>>) ->
-    <<C1:6, C2:6, C3:6, C4:6>> = B,
-    [enc(C1), enc(C2), enc(C3), enc(C4)| encode(Bs)];
-encode(<<B:2/binary>>) ->
-    <<C1:6, C2:6, C3:6, _:6>> = <<B/binary, 0>>,
-    [enc(C1), enc(C2), enc(C3), $=];
-encode(<<B:1/binary>>) ->
-    <<C1:6, C2:6, _:12>> = <<B/binary, 0, 0>>,
-    [enc(C1), enc(C2), $=, $=];
-encode(<<>>) ->
-    [].
-
-%% 
-%% encode_split(Bytes|Binary) -> Lines
-%%
-%% The encoding is divided into lines separated by <NL>, and each line
-%% is precisely 64 characters long (excluding the <NL> characters,
-%% except the last line which 64 characters long or shorter. <NL> may
-%% follow the last line.
-%% 
-encode_split(Bs) ->
-    split(encode(Bs)).
-
-%%
-%% decode(Chars) -> Binary
-%%
-decode(Cs) ->
-    list_to_binary(decode1(Cs)).
-
-decode1([C1, C2, $=, $=]) ->
-    <<B1, _:16>> = <<(dec(C1)):6, (dec(C2)):6, 0:12>>, 
-    [B1];
-decode1([C1, C2, C3, $=]) ->
-    <<B1, B2, _:8>> = <<(dec(C1)):6, (dec(C2)):6, (dec(C3)):6, (dec(0)):6>>, 
-    [B1, B2];
-decode1([C1, C2, C3, C4| Cs]) ->
-    Bin = <<(dec(C1)):6, (dec(C2)):6, (dec(C3)):6, (dec(C4)):6>>, 
-    [Bin| decode1(Cs)];
-decode1([]) ->
-    [].
-
-%% 
-%% join_decode(Lines) -> Binary
-%%
-%% Remove <NL> before decoding.
-%%
-join_decode(Cs) ->    
-    decode(join(Cs)).
-
-%% 
-%% Locals
-%%    
-
-%% enc/1 and dec/1
-%%
-%% Mapping: 0-25 -> A-Z, 26-51 -> a-z, 52-61 -> 0-9, 62 -> +, 63 -> /
-%%
-enc(C) ->
-    65 + C + 6*?st(C,26) - 75*?st(C,52) -15*?st(C,62) + 3*?st(C,63).
-
-dec(C) ->
-    62*?st(C,43) + ?st(C,47) + (C-59)*?st(C,48) - 69*?st(C,65) - 6*?st(C,97).
-
-%% split encoding into lines
-%%
-split(Cs) ->
-    split(Cs, ?CHARS).
-
-split([], _N) ->
-    [$\n];
-split(Cs, 0) ->
-    [$\n| split(Cs, ?CHARS)];
-split([C| Cs], N) ->
-    [C| split(Cs, N-1)].
-
-%% join lines of encodings
-%%
-join([$\r, $\n| Cs]) ->
-    join(Cs);
-join([$\n| Cs]) ->
-    join(Cs);
-join([C| Cs]) ->
-    [C| join(Cs)];
-join([]) ->
-    [].
-
diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl
index 37d5646673..8c0c2bfa5d 100644
--- a/lib/ssl/src/ssl_certificate.erl
+++ b/lib/ssl/src/ssl_certificate.erl
@@ -28,91 +28,155 @@
 -include("ssl_handshake.hrl").
 -include("ssl_alert.hrl").
 -include("ssl_internal.hrl").
--include("ssl_debug.hrl").
 -include_lib("public_key/include/public_key.hrl"). 
 
--export([trusted_cert_and_path/3, 
+-export([trusted_cert_and_path/2,
 	 certificate_chain/2, 
 	 file_to_certificats/1,
-	 validate_extensions/6]).
+	 validate_extension/3,
+	 is_valid_extkey_usage/2,
+	 is_valid_key_usage/2,
+	 select_extension/2,
+	 extensions_list/1,
+	 signature_type/1
+	]).
  
 %%====================================================================
 %% Internal application API
 %%====================================================================
 
-trusted_cert_and_path(CertChain, CertDbRef, Verify) ->
-    [Cert | RestPath] = lists:reverse(CertChain),
-    {ok, OtpCert} = public_key:pkix_decode_cert(Cert, otp),
-    IssuerAnPath = 
+%%--------------------------------------------------------------------
+-spec trusted_cert_and_path([der_cert()], certdb_ref()) ->
+				   {der_cert() | unknown_ca, [der_cert()]}.
+%%
+%% Description: Extracts the root cert (if not presents tries to 
+%% look it up, if not found {bad_cert, unknown_ca} will be added verification
+%% errors. Returns {RootCert, Path, VerifyErrors}
+%%--------------------------------------------------------------------
+trusted_cert_and_path(CertChain, CertDbRef) ->
+    Path = [Cert | _] = lists:reverse(CertChain),
+    OtpCert = public_key:pkix_decode_cert(Cert, otp),
+    SignedAndIssuerID =
 	case public_key:pkix_is_self_signed(OtpCert) of
 	    true ->
 		{ok, IssuerId} = public_key:pkix_issuer_id(OtpCert, self),
-		{IssuerId, RestPath};
-	    false  ->
+		{self, IssuerId};
+	    false ->
 		case public_key:pkix_issuer_id(OtpCert, other) of
 		    {ok, IssuerId} ->
-			{IssuerId, [Cert | RestPath]};
+			{other, IssuerId};
 		    {error, issuer_not_found} ->
 			case find_issuer(OtpCert, no_candidate) of
 			    {ok, IssuerId} ->
-				{IssuerId, [Cert | RestPath]};
+				{other, IssuerId};
 			    Other ->
-				{Other, RestPath}
+				Other
 			end
 		end
 	end,
     
-    case IssuerAnPath of
-	{{error, issuer_not_found}, _ } ->
-	    %% The root CA was not sent and can not be found, we fail if verify = true
-	    not_valid(?ALERT_REC(?FATAL, ?UNKNOWN_CA), Verify, {Cert, RestPath});
-	{{SerialNr, Issuer}, Path} ->
-	    case ssl_manager:lookup_trusted_cert(CertDbRef, 
-							SerialNr, Issuer) of
+    case SignedAndIssuerID of
+	{error, issuer_not_found} ->
+	    %% The root CA was not sent and can not be found.
+	    {unknown_ca, Path};
+	{self, _} when length(Path) == 1 ->
+	    {selfsigned_peer, Path};
+	{_ ,{SerialNr, Issuer}} ->
+	    case ssl_manager:lookup_trusted_cert(CertDbRef, SerialNr, Issuer) of
 		{ok, {BinCert,_}} ->
-		    {BinCert, Path, []};
+		    {BinCert, Path};
 		_ ->
-		    %%  Fail if verify = true
-		    not_valid(?ALERT_REC(?FATAL, ?UNKNOWN_CA),
-			     Verify,  {Cert, RestPath})
+		    %% Root CA could not be verified
+		    {unknown_ca, Path}
 	    end
     end.
 
-
+%%--------------------------------------------------------------------
+-spec certificate_chain(undefined | binary(), certdb_ref()) -> 
+			  {error, no_cert} | {ok, [der_cert()]}.
+%%
+%% Description: Return the certificate chain to send to peer.
+%%--------------------------------------------------------------------
 certificate_chain(undefined, _CertsDbRef) ->
     {error, no_cert};
 certificate_chain(OwnCert, CertsDbRef) ->
-    {ok, ErlCert} = public_key:pkix_decode_cert(OwnCert, otp),
+    ErlCert = public_key:pkix_decode_cert(OwnCert, otp),
     certificate_chain(ErlCert, OwnCert, CertsDbRef, [OwnCert]).
-
+%%--------------------------------------------------------------------
+-spec file_to_certificats(string()) -> [der_cert()].
+%%
+%% Description: Return list of DER encoded certificates.
+%%--------------------------------------------------------------------
 file_to_certificats(File) -> 
     {ok, List} = ssl_manager:cache_pem_file(File),
-    [Bin || {cert, Bin, not_encrypted} <- List].
-
-
-%% Validates ssl/tls specific extensions
-validate_extensions([], ValidationState, UnknownExtensions, _, AccErr, _) -> 
-    {UnknownExtensions, ValidationState, AccErr};
-
-validate_extensions([#'Extension'{extnID = ?'id-ce-extKeyUsage',
-				  extnValue = KeyUse,
-				  critical = true} | Rest], 
-		    ValidationState, UnknownExtensions, Verify, AccErr0, Role) ->
+    [Bin || {'Certificate', Bin, not_encrypted} <- List].
+%%--------------------------------------------------------------------
+-spec validate_extension(term(), #'Extension'{} | {bad_cert, atom()} | valid,
+			 term()) -> {valid, term()} |
+				    {fail, tuple()} |
+				    {unknown, term()}.
+%%
+%% Description:  Validates ssl/tls specific extensions
+%%--------------------------------------------------------------------
+validate_extension(_,{extension, #'Extension'{extnID = ?'id-ce-extKeyUsage',
+					      extnValue = KeyUse}}, Role) ->
     case is_valid_extkey_usage(KeyUse, Role) of
 	true ->
-	    validate_extensions(Rest, ValidationState, UnknownExtensions, 
-				Verify, AccErr0, Role);
+	    {valid, Role};
 	false ->
-	    AccErr = 
-		not_valid_extension({bad_cert, invalid_ext_key_usage}, Verify, AccErr0),
-	    validate_extensions(Rest, ValidationState, UnknownExtensions, Verify, AccErr, Role)
+	    {fail, {bad_cert, invalid_ext_key_usage}}
     end;
+validate_extension(_, {bad_cert, _} = Reason, _) ->
+    {fail, Reason};
+validate_extension(_, {extension, _}, Role) ->
+    {unknown, Role};
+validate_extension(_, valid, Role) ->
+    {valid, Role};
+validate_extension(_, valid_peer, Role) ->
+    {valid, Role}.
+
+%%--------------------------------------------------------------------
+-spec is_valid_key_usage(list(), term()) -> boolean().
+%%
+%% Description: Checks if Use is a valid key usage.
+%%--------------------------------------------------------------------
+is_valid_key_usage(KeyUse, Use) ->
+    lists:member(Use, KeyUse).
+ 
+%%--------------------------------------------------------------------
+-spec select_extension(term(), list()) -> undefined | #'Extension'{}.
+%%
+%% Description: Selects the extension identified by Id if present in
+%% a list of extensions.
+%%--------------------------------------------------------------------
+select_extension(_, []) ->
+    undefined;
+select_extension(Id, [#'Extension'{extnID = Id} = Extension | _]) ->
+    Extension;
+select_extension(Id, [_ | Extensions]) ->
+    select_extension(Id, Extensions).
+
+%%--------------------------------------------------------------------
+-spec extensions_list(asn1_NOVALUE | list()) -> list().
+%%
+%% Description: Handles that 
+%%--------------------------------------------------------------------
+extensions_list(asn1_NOVALUE) ->
+    [];
+extensions_list(Extensions) ->
+    Extensions.
+
+%%--------------------------------------------------------------------
+-spec signature_type(term()) -> rsa | dsa .
+%%
+%% Description: 
+%%--------------------------------------------------------------------
+signature_type(RSA) when RSA == ?sha1WithRSAEncryption;
+			 RSA == ?md5WithRSAEncryption ->
+    rsa;
+signature_type(?'id-dsa-with-sha1') ->
+    dsa.
 
-validate_extensions([Extension | Rest],  ValidationState, UnknownExtensions, 
-		    Verify, AccErr, Role) ->
-    validate_extensions(Rest, ValidationState, [Extension | UnknownExtensions],
-		       Verify, AccErr, Role).
-    
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
@@ -151,7 +215,7 @@ certificate_chain(CertsDbRef, Chain, SerialNr, Issuer, _SelfSigned) ->
     case ssl_manager:lookup_trusted_cert(CertsDbRef, 
 						SerialNr, Issuer) of
 	{ok, {IssuerCert, ErlCert}} ->
-	    {ok, ErlCert} = public_key:pkix_decode_cert(IssuerCert, otp),
+	    ErlCert = public_key:pkix_decode_cert(IssuerCert, otp),
 	    certificate_chain(ErlCert, IssuerCert, 
 			      CertsDbRef, [IssuerCert | Chain]);
 	_ ->
@@ -176,22 +240,9 @@ find_issuer(OtpCert, PrevCandidateKey) ->
 	    end
     end.
 
-not_valid(Alert, true, _) ->
-    throw(Alert);
-not_valid(_, false, {ErlCert, Path}) ->
-    {ErlCert, Path, [{bad_cert, unknown_ca}]}.
-
 is_valid_extkey_usage(KeyUse, client) ->
     %% Client wants to verify server
     is_valid_key_usage(KeyUse,?'id-kp-serverAuth');
 is_valid_extkey_usage(KeyUse, server) ->
     %% Server wants to verify client
     is_valid_key_usage(KeyUse, ?'id-kp-clientAuth').
-
-is_valid_key_usage(KeyUse, Use) ->
-    lists:member(Use, KeyUse).
-
-not_valid_extension(Error, true, _) ->
-    throw(Error);
-not_valid_extension(Error, false, AccErrors) ->
-    [Error | AccErrors].
diff --git a/lib/ssl/src/ssl_certificate_db.erl b/lib/ssl/src/ssl_certificate_db.erl
index b8c3c6f6b7..3eceefa304 100644
--- a/lib/ssl/src/ssl_certificate_db.erl
+++ b/lib/ssl/src/ssl_certificate_db.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -22,20 +22,21 @@
 %%----------------------------------------------------------------------
 
 -module(ssl_certificate_db).
-
+-include("ssl_internal.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
 -export([create/0, remove/1, add_trusted_certs/3, 
 	 remove_trusted_certs/2, lookup_trusted_cert/3, issuer_candidate/1,
-	 lookup_cached_certs/1, cache_pem_file/3]).
+	 lookup_cached_certs/1, cache_pem_file/4, uncache_pem_file/2, lookup/2]).
+
+-type time()      :: {non_neg_integer(), non_neg_integer(), non_neg_integer()}.
 
 %%====================================================================
 %% Internal application API
 %%====================================================================
 
 %%--------------------------------------------------------------------
-%% Function: create() -> Db
-%% Db = term() - Reference to the crated database 
+-spec create() -> certdb_ref().
 %% 
 %% Description: Creates a new certificate db.
 %% Note: lookup_trusted_cert/3 may be called from any process but only
@@ -47,8 +48,7 @@ create() ->
      ets:new(ssl_pid_to_file, [bag, private])]. 
 
 %%--------------------------------------------------------------------
-%% Function: delete(Db) -> _
-%% Db = Database refererence as returned by create/0
+-spec remove(certdb_ref()) -> term().
 %%
 %% Description: Removes database db  
 %%--------------------------------------------------------------------
@@ -56,11 +56,9 @@ remove(Dbs) ->
     lists:foreach(fun(Db) -> true = ets:delete(Db) end, Dbs).
 
 %%--------------------------------------------------------------------
-%% Function: lookup_trusted_cert(Ref, SerialNumber, Issuer) -> {BinCert,DecodedCert}
-%% Ref = ref()
-%% SerialNumber = integer()
-%% Issuer = {rdnSequence, IssuerAttrs}
-%% BinCert = binary()
+-spec lookup_trusted_cert(reference(), serialnumber(), issuer()) -> 
+				 undefined | {ok, {der_cert(), #'OTPCertificate'{}}}.
+
 %%
 %% Description: Retrives the trusted certificate identified by 
 %% <SerialNumber, Issuer>. Ref is used as it is specified  
@@ -78,16 +76,16 @@ lookup_cached_certs(File) ->
     ets:lookup(certificate_db_name(), {file, File}).
 
 %%--------------------------------------------------------------------
-%% Function: add_trusted_certs(Pid, File, Db) -> {ok, Ref}
-%% Pid = pid() 
-%% File = string()
-%% Db = Database refererence as returned by create/0
-%% Ref = ref()
+-spec add_trusted_certs(pid(), string() | {der, list()}, certdb_ref()) -> {ok, certdb_ref()}.
 %%
 %% Description: Adds the trusted certificates from file <File> to the
 %% runtime database. Returns Ref that should be handed to lookup_trusted_cert
 %% together with the cert serialnumber and issuer.
 %%--------------------------------------------------------------------
+add_trusted_certs(_Pid, {der, DerList}, [CerDb, _,_]) ->
+    NewRef = make_ref(),
+    add_certs_from_der(DerList, NewRef, CerDb),
+    {ok, NewRef};
 add_trusted_certs(Pid, File, [CertsDb, FileToRefDb, PidToFileDb]) ->
     Ref = case lookup(File, FileToRefDb) of
 	      undefined ->
@@ -101,20 +99,39 @@ add_trusted_certs(Pid, File, [CertsDb, FileToRefDb, PidToFileDb]) ->
 	  end,
     insert(Pid, File, PidToFileDb),
     {ok, Ref}.
-
 %%--------------------------------------------------------------------
-%% Function: cache_pem_file(Pid, File, Db) -> FileContent
+-spec cache_pem_file(pid(), string(), time(), certdb_ref()) -> term().
 %%
 %% Description: Cache file as binary in DB
 %%--------------------------------------------------------------------
-cache_pem_file(Pid, File, [CertsDb, _FileToRefDb, PidToFileDb]) ->
-    Res = {ok, Content} = public_key:pem_to_der(File),
-    insert({file, File}, Content, CertsDb),
+cache_pem_file(Pid, File, Time, [CertsDb, _FileToRefDb, PidToFileDb]) ->
+    {ok, PemBin} = file:read_file(File), 
+    Content = public_key:pem_decode(PemBin),
+    insert({file, File}, {Time, Content}, CertsDb),
     insert(Pid, File, PidToFileDb),
-    Res.
+    {ok, Content}.
+
+%--------------------------------------------------------------------
+-spec uncache_pem_file(string(), certdb_ref()) -> no_return().
+%%
+%% Description: If a cached file is no longer valid (changed on disk)
+%% we must terminate the connections using the old file content, and
+%% when those processes are finish the cache will be cleaned. It is
+%% a rare but possible case a new ssl client/server is started with
+%% a filename with the same name as previously started client/server
+%% but with different content.
+%% --------------------------------------------------------------------
+uncache_pem_file(File, [_CertsDb, _FileToRefDb, PidToFileDb]) ->
+    Pids = select(PidToFileDb, [{{'$1', File},[],['$$']}]),
+    lists:foreach(fun([Pid]) ->
+			  exit(Pid, shutdown)
+		  end, Pids).
+
+
 
 %%--------------------------------------------------------------------
-%% Function: remove_trusted_certs(Pid, Db) -> _ 
+-spec remove_trusted_certs(pid(), certdb_ref()) -> term().
+				  
 %%
 %% Description: Removes trusted certs originating from 
 %% the file associated to Pid from the runtime database.  
@@ -144,15 +161,13 @@ remove_trusted_certs(Pid, [CertsDb, FileToRefDb, PidToFileDb]) ->
     end.
 
 %%--------------------------------------------------------------------
-%% Function: issuer_candidate() -> {Key, Candidate} | no_more_candidates   
+-spec issuer_candidate(no_candidate | cert_key() | {file, term()}) -> 
+			      {cert_key(),{der_cert(), #'OTPCertificate'{}}} | no_more_candidates.
 %%
-%%     Candidate
-%%     
-%%     
 %% Description: If a certificat does not define its issuer through
 %%              the extension 'ce-authorityKeyIdentifier' we can
 %%              try to find the issuer in the database over known
-%%              certificates.
+%%              certificates. 
 %%--------------------------------------------------------------------
 issuer_candidate(no_candidate) ->
     Db = certificate_db_name(),
@@ -179,6 +194,22 @@ issuer_candidate(PrevCandidateKey) ->
     end.
 
 %%--------------------------------------------------------------------
+-spec lookup(term(), term()) -> term() | undefined.
+%%
+%% Description: Looks up an element in a certificat <Db>.
+%%--------------------------------------------------------------------
+lookup(Key, Db) ->
+    case ets:lookup(Db, Key) of
+	[] ->
+	    undefined;
+	Contents  ->
+	    Pick = fun({_, Data}) -> Data;
+		      ({_,_,Data}) -> Data
+		   end,
+	    [Pick(Data) || Data <- Contents]
+    end.
+
+%%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
 certificate_db_name() ->
@@ -196,29 +227,32 @@ ref_count(Key, Db,N) ->
 delete(Key, Db) ->
     _ = ets:delete(Db, Key).
 
-lookup(Key, Db) ->
-    case ets:lookup(Db, Key) of
-	[] ->
-	    undefined;
-	Contents  ->
-	    Pick = fun({_, Data}) -> Data;
-		      ({_,_,Data}) -> Data
-		   end,
-	    [Pick(Data) || Data <- Contents]
-    end.
+select(Db, MatchSpec)->
+    ets:select(Db, MatchSpec).
 
 remove_certs(Ref, CertsDb) ->
     ets:match_delete(CertsDb, {{Ref, '_', '_'}, '_'}).
 
+add_certs_from_der(DerList, Ref, CertsDb) ->
+    Add = fun(Cert) -> add_certs(Cert, Ref, CertsDb) end,
+     [Add(Cert) || Cert <- DerList].
+
 add_certs_from_file(File, Ref, CertsDb) ->   
-    Decode = fun(Cert) ->
-		     {ok, ErlCert} = public_key:pkix_decode_cert(Cert, otp),
-		     TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate,
-		     SerialNumber = TBSCertificate#'OTPTBSCertificate'.serialNumber,
-		     Issuer = public_key:pkix_normalize_general_name(
-				TBSCertificate#'OTPTBSCertificate'.issuer),
-		     insert({Ref, SerialNumber, Issuer}, {Cert,ErlCert}, CertsDb)
-	     end,
-    {ok,Der} = public_key:pem_to_der(File),
-    [Decode(Cert) || {cert, Cert, not_encrypted} <- Der].
+    Add = fun(Cert) -> add_certs(Cert, Ref, CertsDb) end,
+    {ok, PemBin} = file:read_file(File),
+    PemEntries = public_key:pem_decode(PemBin),
+    [Add(Cert) || {'Certificate', Cert, not_encrypted} <- PemEntries].
     
+add_certs(Cert, Ref, CertsDb) ->
+    try  ErlCert = public_key:pkix_decode_cert(Cert, otp),
+	 TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate,
+	 SerialNumber = TBSCertificate#'OTPTBSCertificate'.serialNumber,
+	 Issuer = public_key:pkix_normalize_name(
+		    TBSCertificate#'OTPTBSCertificate'.issuer),
+	 insert({Ref, SerialNumber, Issuer}, {Cert,ErlCert}, CertsDb)
+    catch
+	error:_ ->
+	    Report = io_lib:format("SSL WARNING: Ignoring a CA cert as "
+				   "it could not be correctly decoded.~n", []),
+	    error_logger:info_report(Report)
+    end.
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index f425886ce5..72f02a4362 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -29,21 +29,18 @@
 -include("ssl_record.hrl").
 -include("ssl_cipher.hrl").
 -include("ssl_alert.hrl").
--include("ssl_debug.hrl").
+-include_lib("public_key/include/public_key.hrl").
 
 -export([security_parameters/2, suite_definition/1,
 	 decipher/5, cipher/4, 
-	 suite/1, suites/1,
-	 openssl_suite/1, openssl_suite_name/1]).
+	 suite/1, suites/1, anonymous_suites/0,
+	 openssl_suite/1, openssl_suite_name/1, filter/2]).
 
 -compile(inline).
 
 %%--------------------------------------------------------------------
-%% Function: security_parameters(CipherSuite, SecParams) -> 
-%%                                              #security_parameters{}
-%%
-%% CipherSuite - as defined in ssl_cipher.hrl
-%% SecParams - #security_parameters{}
+-spec security_parameters(cipher_suite(), #security_parameters{}) -> 
+				 #security_parameters{}.
 %%
 %% Description: Returns a security parameters record where the
 %% cipher values has been updated according to <CipherSuite> 
@@ -62,15 +59,11 @@ security_parameters(CipherSuite, SecParams) ->
       hash_size = hash_size(Hash)}.
 
 %%--------------------------------------------------------------------
-%% Function: cipher(Method, CipherState, Mac, Data) -> 
-%%                                         {Encrypted, UpdateCipherState}
-%%
-%% Method - integer() (as defined in ssl_cipher.hrl)
-%% CipherState, UpdatedCipherState - #cipher_state{}
-%% Data, Encrypted - binary()
+-spec cipher(cipher_enum(), #cipher_state{}, binary(), binary()) -> 
+		    {binary(), #cipher_state{}}. 
 %%
-%% Description: Encrypts the data and the mac using method, updating
-%% the cipher state
+%% Description: Encrypts the data and the MAC using chipher described
+%% by cipher_enum() and updating the cipher state
 %%-------------------------------------------------------------------
 cipher(?NULL, CipherState, <<>>, Fragment) ->
     GenStreamCipherList = [Fragment, <<>>],
@@ -81,20 +74,12 @@ cipher(?RC4, CipherState, Mac, Fragment) ->
                  S -> S
              end,
     GenStreamCipherList = [Fragment, Mac],
-
-    ?DBG_HEX(GenStreamCipherList),
-    ?DBG_HEX(State0),
     {State1, T} = crypto:rc4_encrypt_with_state(State0, GenStreamCipherList),
-    ?DBG_HEX(T),
     {T, CipherState#cipher_state{state = State1}};
 cipher(?DES, CipherState, Mac, Fragment) ->
     block_cipher(fun(Key, IV, T) ->
 			 crypto:des_cbc_encrypt(Key, IV, T)
 		 end, block_size(des_cbc), CipherState, Mac, Fragment);
-%% cipher(?DES40, CipherState, Mac, Fragment) ->
-%%     block_cipher(fun(Key, IV, T) ->
-%% 			 crypto:des_cbc_encrypt(Key, IV, T)
-%% 		 end, block_size(des_cbc), CipherState, Mac, Fragment);
 cipher(?'3DES', CipherState, Mac, Fragment) ->
     block_cipher(fun(<<K1:8/binary, K2:8/binary, K3:8/binary>>, IV, T) ->
 			 crypto:des3_cbc_encrypt(K1, K2, K3, IV, T)
@@ -115,48 +100,43 @@ block_cipher(Fun, BlockSz, #cipher_state{key=Key, iv=IV} = CS0,
     TotSz = byte_size(Mac) + erlang:iolist_size(Fragment) + 1,
     {PaddingLength, Padding} = get_padding(TotSz, BlockSz),
     L = [Fragment, Mac, PaddingLength, Padding],
-    ?DBG_HEX(Key),
-    ?DBG_HEX(IV),
-    ?DBG_HEX(L),
     T = Fun(Key, IV, L),
-    ?DBG_HEX(T),
     NextIV = next_iv(T, IV),
     {T, CS0#cipher_state{iv=NextIV}}.
 
 %%--------------------------------------------------------------------
-%% Function: decipher(Method, CipherState, Mac, Data, Version) -> 
-%%                                           {Decrypted, UpdateCipherState}
-%%
-%% Method - integer() (as defined in ssl_cipher.hrl)
-%% CipherState, UpdatedCipherState - #cipher_state{}
-%% Data, Encrypted - binary()
+-spec decipher(cipher_enum(), integer(), #cipher_state{}, binary(), tls_version()) ->
+		      {binary(), binary(), #cipher_state{}} | #alert{}.
 %%
-%% Description: Decrypts the data and the mac using method, updating
-%% the cipher state
+%% Description: Decrypts the data and the MAC using cipher described
+%% by cipher_enum() and updating the cipher state.
 %%-------------------------------------------------------------------
 decipher(?NULL, _HashSz, CipherState, Fragment, _) ->
     {Fragment, <<>>, CipherState};
 decipher(?RC4, HashSz, CipherState, Fragment, _) ->
-    ?DBG_TERM(CipherState#cipher_state.key),
     State0 = case CipherState#cipher_state.state of
                  undefined -> crypto:rc4_set_key(CipherState#cipher_state.key);
                  S -> S
              end,
-    ?DBG_HEX(State0),
-    ?DBG_HEX(Fragment),
-    {State1, T} = crypto:rc4_encrypt_with_state(State0, Fragment),
-    ?DBG_HEX(T),
-    GSC = generic_stream_cipher_from_bin(T, HashSz),
-    #generic_stream_cipher{content=Content, mac=Mac} = GSC,
-    {Content, Mac, CipherState#cipher_state{state=State1}};
+    try crypto:rc4_encrypt_with_state(State0, Fragment) of
+	{State, Text} ->
+	    GSC = generic_stream_cipher_from_bin(Text, HashSz),
+	    #generic_stream_cipher{content = Content, mac = Mac} = GSC,
+	    {Content, Mac, CipherState#cipher_state{state = State}}
+    catch
+	_:_ ->
+	    %% This is a DECRYPTION_FAILED but
+	    %% "differentiating between bad_record_mac and decryption_failed
+	    %% alerts may permit certain attacks against CBC mode as used in
+	    %% TLS [CBCATT].  It is preferable to uniformly use the
+	    %% bad_record_mac alert to hide the specific type of the error."
+	    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+    end;
+
 decipher(?DES, HashSz, CipherState, Fragment, Version) ->
     block_decipher(fun(Key, IV, T) ->
 			   crypto:des_cbc_decrypt(Key, IV, T)
 		   end, CipherState, HashSz, Fragment, Version);
-%% decipher(?DES40, HashSz, CipherState, Fragment, Version) ->
-%%     block_decipher(fun(Key, IV, T) ->
-%% 			   crypto:des_cbc_decrypt(Key, IV, T)
-%% 		   end, CipherState, HashSz, Fragment, Version);
 decipher(?'3DES', HashSz, CipherState, Fragment, Version) ->
     block_decipher(fun(<<K1:8/binary, K2:8/binary, K3:8/binary>>, IV, T) ->
 			   crypto:des3_cbc_decrypt(K1, K2, K3, IV, T)
@@ -174,27 +154,29 @@ decipher(?AES, HashSz, CipherState, Fragment, Version) ->
 
 block_decipher(Fun, #cipher_state{key=Key, iv=IV} = CipherState0, 
 	       HashSz, Fragment, Version) ->
-    ?DBG_HEX(Key),
-    ?DBG_HEX(IV),
-    ?DBG_HEX(Fragment),
-    T = Fun(Key, IV, Fragment),
-    ?DBG_HEX(T),
-    GBC = generic_block_cipher_from_bin(T, HashSz),
-    case is_correct_padding(GBC, Version) of  
-	true ->
-	    Content = GBC#generic_block_cipher.content,
-	    Mac = GBC#generic_block_cipher.mac,
-	    CipherState1 = CipherState0#cipher_state{iv=next_iv(Fragment, IV)},
-	    {Content, Mac, CipherState1};
-	false ->
+    try Fun(Key, IV, Fragment) of
+	Text ->
+	    GBC = generic_block_cipher_from_bin(Text, HashSz),
+	    case is_correct_padding(GBC, Version) of
+		true ->
+		    Content = GBC#generic_block_cipher.content,
+		    Mac = GBC#generic_block_cipher.mac,
+		    CipherState1 = CipherState0#cipher_state{iv=next_iv(Fragment, IV)},
+		    {Content, Mac, CipherState1};
+		false ->
+		    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+	    end
+    catch
+	_:_ ->
+	    %% This is a DECRYPTION_FAILED but
+	    %% "differentiating between bad_record_mac and decryption_failed
+	    %% alerts may permit certain attacks against CBC mode as used in
+	    %% TLS [CBCATT].  It is preferable to uniformly use the
+	    %% bad_record_mac alert to hide the specific type of the error."
 	    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
     end.
-	    
 %%--------------------------------------------------------------------
-%% Function: suites(Version) -> [Suite]
-%%
-%% Version = version()
-%% Suite = binary() from ssl_cipher.hrl
+-spec suites(tls_version()) -> [cipher_suite()].
 %%
 %% Description: Returns a list of supported cipher suites.
 %%--------------------------------------------------------------------
@@ -204,19 +186,22 @@ suites({3, N}) when N == 1; N == 2 ->
     ssl_tls1:suites().
 
 %%--------------------------------------------------------------------
-%% Function: suite_definition(CipherSuite) -> 
-%%                                {KeyExchange, Cipher, Hash}
-%%                                             
+-spec anonymous_suites() -> [cipher_suite()].
 %%
-%% CipherSuite - as defined in ssl_cipher.hrl
-%% KeyExchange - rsa | dh_anon | dhe_dss | dhe_rsa | kerb5
-%%                
-%% Cipher      - null | rc4_128 | idea_cbc | des_cbc | '3des_ede_cbc'
-%%               des40_cbc | aes_128_cbc | aes_256_cbc  
-%% Hash        - null | md5 | sha
+%% Description: Returns a list of the anonymous cipher suites, only supported
+%% if explicitly set by user. Intended only for testing.
+%%--------------------------------------------------------------------
+anonymous_suites() ->
+    [?TLS_DH_anon_WITH_RC4_128_MD5,
+     ?TLS_DH_anon_WITH_DES_CBC_SHA,
+     ?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_DH_anon_WITH_AES_128_CBC_SHA,
+     ?TLS_DH_anon_WITH_AES_256_CBC_SHA].
+
+%%--------------------------------------------------------------------
+-spec suite_definition(cipher_suite()) -> erl_cipher_suite().
 %%
-%% Description: Returns a security parameters tuple where the
-%% cipher values has been updated according to <CipherSuite> 
+%% Description: Return erlang cipher suite definition.
 %% Note: Currently not supported suites are commented away.
 %% They should be supported or removed in the future.
 %%-------------------------------------------------------------------
@@ -240,7 +225,7 @@ suite_definition(?TLS_RSA_WITH_3DES_EDE_CBC_SHA) ->
 suite_definition(?TLS_DHE_DSS_WITH_DES_CBC_SHA) ->
     {dhe_dss, des_cbc, sha};
 suite_definition(?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA) ->
-    {dhe_dss, '3des_ede_cbc'};
+    {dhe_dss, '3des_ede_cbc', sha};
 suite_definition(?TLS_DHE_RSA_WITH_DES_CBC_SHA) ->
     {dhe_rsa, des_cbc, sha};
 suite_definition(?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA) ->
@@ -258,26 +243,26 @@ suite_definition(?TLS_RSA_WITH_AES_256_CBC_SHA) ->
 suite_definition(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA) ->
     {dhe_dss, aes_256_cbc, sha};
 suite_definition(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA) ->
-    {dhe_rsa, aes_256_cbc, sha}.
-
-%% TODO: support kerbos key exchange?
-%% TSL V1.1 KRB SUITES 
-%% suite_definition(?TLS_KRB5_WITH_DES_CBC_SHA) ->
-%%     {krb5, des_cbc, sha};
-%% suite_definition(?TLS_KRB5_WITH_3DES_EDE_CBC_SHA) ->
-%%     {krb5, '3des_ede_cbc', sha};
-%% suite_definition(?TLS_KRB5_WITH_RC4_128_SHA) ->
-%%     {krb5, rc4_128, sha};
-%% suite_definition(?TLS_KRB5_WITH_IDEA_CBC_SHA) ->
-%%     {krb5, idea_cbc, sha};
-%% suite_definition(?TLS_KRB5_WITH_DES_CBC_MD5) ->
-%%     {krb5, des_cbc, md5};
-%% suite_definition(?TLS_KRB5_WITH_3DES_EDE_CBC_MD5) ->
-%%     {krb5, '3des_ede_cbc', md5};
-%% suite_definition(?TLS_KRB5_WITH_RC4_128_MD5) ->
-%%     {krb5, rc4_128, md5};
-%% suite_definition(?TLS_KRB5_WITH_IDEA_CBC_MD5) ->
-%%     {krb5, idea_cbc, md5};
+    {dhe_rsa, aes_256_cbc, sha};
+
+%%% DH-ANON deprecated by TLS spec and not available
+%%% by default, but good for testing purposes.
+suite_definition(?TLS_DH_anon_WITH_RC4_128_MD5) ->
+    {dh_anon, rc4_128, md5};
+suite_definition(?TLS_DH_anon_WITH_DES_CBC_SHA) ->
+    {dh_anon, des_cbc, sha};
+suite_definition(?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA) ->
+    {dh_anon, '3des_ede_cbc', sha};
+suite_definition(?TLS_DH_anon_WITH_AES_128_CBC_SHA) ->
+    {dh_anon, aes_128_cbc, sha};
+suite_definition(?TLS_DH_anon_WITH_AES_256_CBC_SHA) ->
+    {dh_anon, aes_256_cbc, sha}.
+
+%%--------------------------------------------------------------------
+-spec suite(erl_cipher_suite()) -> cipher_suite().
+%%
+%% Description: Return TLS cipher suite definition.
+%%--------------------------------------------------------------------
 
 %% TLS v1.1 suites
 %%suite({rsa, null, md5}) ->
@@ -302,54 +287,37 @@ suite({dhe_rsa, des_cbc, sha}) ->
     ?TLS_DHE_RSA_WITH_DES_CBC_SHA;
 suite({dhe_rsa, '3des_ede_cbc', sha}) ->
     ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA; 
-%% suite({dh_anon, rc4_128, md5}) ->
-%%     ?TLS_DH_anon_WITH_RC4_128_MD5;
-%% suite({dh_anon, des40_cbc, sha}) ->
-%%     ?TLS_DH_anon_WITH_DES_CBC_SHA;
-%% suite({dh_anon, '3des_ede_cbc', sha}) ->
-%%     ?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA;
+suite({dh_anon, rc4_128, md5}) ->
+    ?TLS_DH_anon_WITH_RC4_128_MD5;
+suite({dh_anon, des_cbc, sha}) ->
+    ?TLS_DH_anon_WITH_DES_CBC_SHA;
+suite({dh_anon, '3des_ede_cbc', sha}) ->
+    ?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA;
 
 %%% TSL V1.1 AES suites
 suite({rsa, aes_128_cbc, sha}) ->
     ?TLS_RSA_WITH_AES_128_CBC_SHA; 
-%% suite({dhe_dss, aes_128_cbc, sha}) ->
-%%     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA; 
+suite({dhe_dss, aes_128_cbc, sha}) ->
+    ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA; 
 suite({dhe_rsa, aes_128_cbc, sha}) ->
     ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA;
-%% suite({dh_anon, aes_128_cbc, sha}) ->
-%%     ?TLS_DH_anon_WITH_AES_128_CBC_SHA;
+suite({dh_anon, aes_128_cbc, sha}) ->
+    ?TLS_DH_anon_WITH_AES_128_CBC_SHA;
 suite({rsa, aes_256_cbc, sha}) ->
     ?TLS_RSA_WITH_AES_256_CBC_SHA;
 suite({dhe_dss, aes_256_cbc, sha}) ->
     ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA;
 suite({dhe_rsa, aes_256_cbc, sha}) ->
-    ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA.
-%% suite({dh_anon, aes_256_cbc, sha}) ->
-%%     ?TLS_DH_anon_WITH_AES_256_CBC_SHA.
-
-%% TODO: support kerbos key exchange?
-%% TSL V1.1 KRB SUITES
-%% suite({krb5, des_cbc, sha}) ->
-%%     ?TLS_KRB5_WITH_DES_CBC_SHA;
-%% suite({krb5_cbc, '3des_ede_cbc', sha}) ->
-%%     ?TLS_KRB5_WITH_3DES_EDE_CBC_SHA;
-%% suite({krb5, rc4_128, sha}) ->
-%%      ?TLS_KRB5_WITH_RC4_128_SHA;
-%% suite({krb5_cbc, idea_cbc, sha}) ->
-%%     ?TLS_KRB5_WITH_IDEA_CBC_SHA;
-%% suite({krb5_cbc, md5}) ->
-%%     ?TLS_KRB5_WITH_DES_CBC_MD5;
-%% suite({krb5_ede_cbc, des_cbc, md5}) ->
-%%     ?TLS_KRB5_WITH_3DES_EDE_CBC_MD5;
-%% suite({krb5_128, rc4_128, md5}) ->
-%%     ?TLS_KRB5_WITH_RC4_128_MD5;
-%% suite({krb5, idea_cbc, md5}) ->
-%%     ?TLS_KRB5_WITH_IDEA_CBC_MD5;
+    ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
+suite({dh_anon, aes_256_cbc, sha}) ->
+    ?TLS_DH_anon_WITH_AES_256_CBC_SHA.
 
+%%--------------------------------------------------------------------
+-spec openssl_suite(openssl_cipher_suite()) -> cipher_suite().
+%%
+%% Description: Return TLS cipher suite definition.
+%%--------------------------------------------------------------------
 %% translate constants <-> openssl-strings
-%% TODO: Is there a pattern in the nameing
-%% that is useable to make a nicer function defention?
-
 openssl_suite("DHE-RSA-AES256-SHA") ->
     ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
 openssl_suite("DHE-DSS-AES256-SHA") ->
@@ -368,22 +336,21 @@ 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;
-%% TODO: Do we want to support this?
-%% openssl_suite("DHE-DSS-RC4-SHA") ->
-%%     ?TLS_DHE_DSS_WITH_RC4_128_SHA;
 %%openssl_suite("IDEA-CBC-SHA") ->
 %%    ?TLS_RSA_WITH_IDEA_CBC_SHA;
 openssl_suite("RC4-SHA") ->
     ?TLS_RSA_WITH_RC4_128_SHA;
 openssl_suite("RC4-MD5") -> 
     ?TLS_RSA_WITH_RC4_128_MD5;
-%% openssl_suite("DHE-DSS-RC4-SHA") ->
-%%     ?TLS_DHE_DSS_WITH_RC4_128_SHA;
 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.
-
+%%--------------------------------------------------------------------
+-spec openssl_suite_name(cipher_suite()) -> openssl_cipher_suite().
+%%
+%% Description: Return openssl cipher suite name.
+%%-------------------------------------------------------------------
 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) ->
@@ -412,15 +379,28 @@ 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_DHE_DSS_WITH_RC4_128_SHA) ->
-%%     "DHE-DSS-RC4-SHA";
-
 %% No oppenssl name
 openssl_suite_name(Cipher) ->
     suite_definition(Cipher).
 
 %%--------------------------------------------------------------------
+-spec filter(undefined | binary(), [cipher_suite()]) -> [cipher_suite()].
+%%
+%% Description: .
+%%-------------------------------------------------------------------
+filter(undefined, Ciphers) -> 
+    Ciphers;
+filter(DerCert, Ciphers) ->
+    OtpCert = public_key:pkix_decode_cert(DerCert, otp),
+    SigAlg = OtpCert#'OTPCertificate'.signatureAlgorithm,
+    case ssl_certificate:signature_type(SigAlg#'SignatureAlgorithm'.algorithm) of
+	rsa ->
+	    filter_rsa(OtpCert, Ciphers -- dsa_signed_suites());
+	dsa ->
+	    Ciphers -- rsa_signed_suites()
+    end.
+	
+%%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
 
@@ -431,8 +411,6 @@ bulk_cipher_algorithm(null) ->
 %%     ?IDEA;
 bulk_cipher_algorithm(rc4_128) ->
     ?RC4;
-%% bulk_cipher_algorithm(des40_cbc) ->
-%%     ?DES40;
 bulk_cipher_algorithm(des_cbc) ->
     ?DES;
 bulk_cipher_algorithm('3des_ede_cbc') ->
@@ -446,7 +424,6 @@ type(Cipher) when Cipher == null;
     ?STREAM;
 
 type(Cipher) when Cipher == idea_cbc;
-		  Cipher == des40_cbc;
 		  Cipher == des_cbc;
 		  Cipher == '3des_ede_cbc';
 		  Cipher == aes_128_cbc;
@@ -458,8 +435,6 @@ key_material(null) ->
 key_material(Cipher) when Cipher == idea_cbc;
  			  Cipher == rc4_128 ->
     16;
-%%key_material(des40_cbc) ->	
-%%   5;
 key_material(des_cbc) ->
     8;
 key_material('3des_ede_cbc') ->
@@ -474,8 +449,7 @@ expanded_key_material(null) ->
 expanded_key_material(Cipher) when Cipher == idea_cbc;
  				   Cipher == rc4_128 ->
     16;
-expanded_key_material(Cipher) when Cipher == des_cbc;
- 				   Cipher == des40_cbc ->
+expanded_key_material(Cipher) when Cipher == des_cbc ->
     8;
 expanded_key_material('3des_ede_cbc') ->
     24;
@@ -486,8 +460,6 @@ expanded_key_material(Cipher) when Cipher == aes_128_cbc;
 
 effective_key_bits(null) ->
     0;
-%%effective_key_bits(des40_cbc) -> 
-%%    40;
 effective_key_bits(des_cbc) ->
     56;
 effective_key_bits(Cipher) when Cipher == idea_cbc;
@@ -506,7 +478,6 @@ iv_size(Cipher) ->
     block_size(Cipher).
 
 block_size(Cipher) when Cipher == idea_cbc;
-			Cipher == des40_cbc;
 			Cipher == des_cbc;
 			Cipher == '3des_ede_cbc' -> 
     8;
@@ -547,6 +518,12 @@ generic_stream_cipher_from_bin(T, HashSz) ->
 
 is_correct_padding(_, {3, 0}) ->
     true; 
+%% For interoperability reasons we do not check the padding in TLS 1.0 as it
+%% is not strictly required and breaks interopability with for instance 
+%% Google. 
+is_correct_padding(_, {3, 1}) ->
+    true; 
+%% Padding must be check in TLS 1.1 and after  
 is_correct_padding(#generic_block_cipher{padding_length = Len, padding = Padding}, _) ->
     list_to_binary(lists:duplicate(Len, Len))  == Padding.
 
@@ -567,3 +544,51 @@ next_iv(Bin, IV) ->
     <<_:FirstPart/binary, NextIV:IVSz/binary>> = Bin,
     NextIV.
 
+rsa_signed_suites() ->
+    dhe_rsa_suites() ++ rsa_suites().
+
+dhe_rsa_suites() ->
+    [?TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
+     ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
+     ?TLS_DHE_RSA_WITH_DES_CBC_SHA].
+
+rsa_suites() ->
+    [?TLS_RSA_WITH_AES_256_CBC_SHA,
+     ?TLS_RSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_RSA_WITH_AES_128_CBC_SHA,
+     %%?TLS_RSA_WITH_IDEA_CBC_SHA,
+     ?TLS_RSA_WITH_RC4_128_SHA,
+     ?TLS_RSA_WITH_RC4_128_MD5,
+     ?TLS_RSA_WITH_DES_CBC_SHA].
+    
+dsa_signed_suites() ->
+    dhe_dss_suites().
+
+dhe_dss_suites()  ->
+    [?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
+     ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
+     ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA].
+
+filter_rsa(OtpCert, RsaCiphers) ->
+    TBSCert = OtpCert#'OTPCertificate'.tbsCertificate, 
+    TBSExtensions = TBSCert#'OTPTBSCertificate'.extensions,
+    Extensions = ssl_certificate:extensions_list(TBSExtensions),
+    case ssl_certificate:select_extension(?'id-ce-keyUsage', Extensions) of
+	undefined ->
+	    RsaCiphers;
+	#'Extension'{extnValue = KeyUse} ->
+	    Result = filter_rsa_suites(keyEncipherment, 
+				       KeyUse, RsaCiphers, rsa_suites()),
+	    filter_rsa_suites(digitalSignature, 
+			      KeyUse, Result, dhe_rsa_suites())
+    end.
+
+filter_rsa_suites(Use, KeyUse, CipherSuits, RsaSuites) ->
+    case ssl_certificate:is_valid_key_usage(KeyUse, Use) of
+	true ->
+	    CipherSuits;
+	false ->
+	    CipherSuits -- RsaSuites
+    end.
diff --git a/lib/ssl/src/ssl_cipher.hrl b/lib/ssl/src/ssl_cipher.hrl
index 80fe527f45..8bd68cc190 100644
--- a/lib/ssl/src/ssl_cipher.hrl
+++ b/lib/ssl/src/ssl_cipher.hrl
@@ -26,6 +26,14 @@
 -ifndef(ssl_cipher).
 -define(ssl_cipher, true).
 
+-type cipher()            :: null |rc4_128 | idea_cbc | des40_cbc | des_cbc | '3des_ede_cbc' 
+			   | aes_128_cbc |  aes_256_cbc.
+-type hash()              :: null | sha | md5.
+-type erl_cipher_suite()  :: {key_algo(), cipher(), hash()}.
+-type cipher_suite()      :: binary().
+-type cipher_enum()        :: integer().
+-type openssl_cipher_suite()  :: string().
+
 %%% SSL cipher protocol  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -define(CHANGE_CIPHER_SPEC_PROTO, 1).           % _PROTO to not clash with 
 						% SSL record protocol
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 644c2772b2..85245f4342 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -29,7 +29,6 @@
 
 -behaviour(gen_fsm).
 
--include("ssl_debug.hrl").
 -include("ssl_handshake.hrl").
 -include("ssl_alert.hrl").
 -include("ssl_record.hrl").
@@ -65,16 +64,16 @@
           ssl_options,        % #ssl_options{}
           socket_options,     % #socket_options{}
           connection_states,  % #connection_states{} from ssl_record.hrl
+	  tls_packets = [],        % Not yet handled decode ssl/tls packets.
           tls_record_buffer,  % binary() buffer of incomplete records
           tls_handshake_buffer, % binary() buffer of incomplete handshakes
 	  %% {{md5_hash, sha_hash}, {prev_md5, prev_sha}} (binary())
           tls_handshake_hashes, % see above 
           tls_cipher_texts,     % list() received but not deciphered yet
-          own_cert,             % binary()  
-          session,              % #session{} from ssl_handshake.erl
+          session,              % #session{} from ssl_handshake.hrl
 	  session_cache,        % 
 	  session_cache_cb,     %
-          negotiated_version,   % #protocol_version{}
+          negotiated_version,   % tls_version()
           supported_protocol_versions, % [atom()]
           client_certificate_requested = false,
 	  key_algorithm,       % atom as defined by cipher_suite
@@ -90,19 +89,25 @@
 	  log_alert,           % boolean() 
 	  renegotiation,        % {boolean(), From | internal | peer}
 	  recv_during_renegotiation,  %boolean() 
-	  send_queue           % queue()
+	  send_queue,           % queue()
+	  terminated = false   %
 	 }).
 
 -define(DEFAULT_DIFFIE_HELLMAN_PARAMS, 
 	#'DHParameter'{prime = ?DEFAULT_DIFFIE_HELLMAN_PRIME, 
 		       base = ?DEFAULT_DIFFIE_HELLMAN_GENERATOR}).
 
+-type state_name()           :: hello | abbreviated | certify | cipher | connection.
+-type gen_fsm_state_return() :: {next_state, state_name(), #state{}} |
+				{next_state, state_name(), #state{}, timeout()} |
+				{stop, term(), #state{}}.
+
 %%====================================================================
 %% Internal application API
 %%====================================================================	     
 
 %%--------------------------------------------------------------------
-%% Function: send(Pid, Data) ->  ok | {error, Reason} 
+-spec send(pid(), iolist()) -> ok | {error, reason()}.
 %%
 %% Description: Sends data over the ssl connection
 %%--------------------------------------------------------------------
@@ -111,34 +116,45 @@ send(Pid, Data) ->
 				    erlang:iolist_to_binary(Data)}, infinity).
 
 %%--------------------------------------------------------------------
-%% Function:  recv(Socket, Length Timeout) -> {ok, Data} | {error, reason}
+-spec recv(pid(), integer(), timeout()) ->  
+    {ok, binary() | list()} | {error, reason()}.
 %%
 %% Description:  Receives data when active = false
 %%--------------------------------------------------------------------
 recv(Pid, Length, Timeout) -> 
     sync_send_all_state_event(Pid, {recv, Length}, Timeout).
 %%--------------------------------------------------------------------
-%% Function: : connect(Host, Port, Socket, Options, 
-%%                     User, CbInfo, Timeout) -> {ok, Socket}
+-spec connect(host(), port_num(), port(), {#ssl_options{}, #socket_options{}},
+	      pid(), tuple(), timeout()) ->
+		     {ok, #sslsocket{}} | {error, reason()}.
 %%
 %% Description: Connect to a ssl server.
 %%--------------------------------------------------------------------
 connect(Host, Port, Socket, Options, User, CbInfo, Timeout) ->
-    start_fsm(client, Host, Port, Socket, Options, User, CbInfo,
-	      Timeout).
+    try start_fsm(client, Host, Port, Socket, Options, User, CbInfo,
+		  Timeout)
+    catch
+	exit:{noproc, _} ->
+	    {error, ssl_not_started}
+    end.
 %%--------------------------------------------------------------------
-%% Function: accept(Port, Socket, Opts, User, 
-%%                  CbInfo, Timeout) -> {ok, Socket} | {error, Reason}
+-spec ssl_accept(port_num(), port(), {#ssl_options{}, #socket_options{}}, 
+				      pid(), tuple(), timeout()) ->
+    {ok, #sslsocket{}} | {error, reason()}.
 %%
 %% Description: Performs accept on a ssl listen socket. e.i. performs
 %%              ssl handshake. 
 %%--------------------------------------------------------------------
 ssl_accept(Port, Socket, Opts, User, CbInfo, Timeout) ->
-    start_fsm(server, "localhost", Port, Socket, Opts, User, 
-	      CbInfo, Timeout).
+    try start_fsm(server, "localhost", Port, Socket, Opts, User, 
+		  CbInfo, Timeout)
+    catch
+	exit:{noproc, _} ->
+	    {error, ssl_not_started}
+    end.	
 
 %%--------------------------------------------------------------------
-%% Function: handshake(SslSocket, Timeout) -> ok | {error, Reason}
+-spec handshake(#sslsocket{}, timeout()) ->  ok | {error, reason()}.
 %%
 %% Description: Starts ssl handshake. 
 %%--------------------------------------------------------------------
@@ -150,7 +166,8 @@ handshake(#sslsocket{pid = Pid}, Timeout) ->
 	    Error
     end.
 %--------------------------------------------------------------------
-%% Function: socket_control(Pid) -> {ok, SslSocket} | {error, Reason}
+-spec socket_control(port(), pid(), atom()) -> 
+    {ok, #sslsocket{}} | {error, reason()}.  
 %%
 %% Description: Set the ssl process to own the accept socket
 %%--------------------------------------------------------------------	    
@@ -163,7 +180,7 @@ socket_control(Socket, Pid, CbModule) ->
     end.
 
 %%--------------------------------------------------------------------
-%% Function:  close() -> ok 
+-spec close(pid()) -> ok | {error, reason()}.  
 %%
 %% Description:  Close a ssl connection
 %%--------------------------------------------------------------------
@@ -176,7 +193,7 @@ close(ConnectionPid) ->
     end.
 
 %%--------------------------------------------------------------------
-%% Function:  shutdown(Socket, How) -> ok | {error, Reason}
+-spec shutdown(pid(), atom()) -> ok | {error, reason()}.  
 %%
 %% Description: Same as gen_tcp:shutdown/2
 %%--------------------------------------------------------------------
@@ -184,7 +201,7 @@ shutdown(ConnectionPid, How) ->
     sync_send_all_state_event(ConnectionPid, {shutdown, How}).
 
 %%--------------------------------------------------------------------
-%% Function: new_user(ConnectionPid, User) -> ok | {error, Reason}
+-spec new_user(pid(), pid()) ->  ok | {error, reason()}.
 %%
 %% Description:  Changes process that receives the messages when active = true
 %% or once. 
@@ -192,28 +209,28 @@ shutdown(ConnectionPid, How) ->
 new_user(ConnectionPid, User) ->
     sync_send_all_state_event(ConnectionPid, {new_user, User}).
 %%--------------------------------------------------------------------
-%% Function: sockname(ConnectionPid) -> {ok, {Address, Port}} | {error, Reason}
+-spec sockname(pid()) -> {ok, {tuple(), port_num()}} | {error, reason()}.
 %%
 %% Description:  Same as inet:sockname/1
 %%--------------------------------------------------------------------
 sockname(ConnectionPid) ->
     sync_send_all_state_event(ConnectionPid, sockname).
 %%--------------------------------------------------------------------
-%% Function: peername(ConnectionPid) -> {ok, {Address, Port}} | {error, Reason}
+-spec peername(pid()) -> {ok, {tuple(), port_num()}} | {error, reason()}.
 %%
 %% Description:  Same as inet:peername/1
 %%--------------------------------------------------------------------
 peername(ConnectionPid) ->
     sync_send_all_state_event(ConnectionPid, peername).
 %%--------------------------------------------------------------------
-%% Function: get_opts(ConnectionPid, OptTags) -> {ok, Options} | {error, Reason}
+-spec get_opts(pid(), list()) -> {ok, list()} | {error, reason()}.    
 %%
 %% Description: Same as inet:getopts/2
 %%--------------------------------------------------------------------
 get_opts(ConnectionPid, OptTags) ->
     sync_send_all_state_event(ConnectionPid, {get_opts, OptTags}).
 %%--------------------------------------------------------------------
-%% Function:  setopts(Socket, Options) -> ok | {error, Reason}
+-spec set_opts(pid(), list()) -> ok | {error, reason()}. 
 %%
 %% Description:  Same as inet:setopts/2
 %%--------------------------------------------------------------------
@@ -221,8 +238,7 @@ set_opts(ConnectionPid, Options) ->
     sync_send_all_state_event(ConnectionPid, {set_opts, Options}).
 
 %%--------------------------------------------------------------------
-%% Function: info(ConnectionPid) ->  {ok, {Protocol, CipherSuite}} | 
-%%                                      {error, Reason}
+-spec info(pid()) ->  {ok, {atom(), tuple()}} | {error, reason()}. 
 %%
 %% Description:  Returns ssl protocol and cipher used for the connection
 %%--------------------------------------------------------------------
@@ -230,7 +246,7 @@ info(ConnectionPid) ->
     sync_send_all_state_event(ConnectionPid, info). 
 
 %%--------------------------------------------------------------------
-%% Function: session_info(ConnectionPid) -> {ok, PropList} | {error, Reason} 
+-spec session_info(pid()) -> {ok, list()} | {error, reason()}. 
 %%
 %% Description:  Returns info about the ssl session
 %%--------------------------------------------------------------------
@@ -238,7 +254,7 @@ session_info(ConnectionPid) ->
     sync_send_all_state_event(ConnectionPid, session_info). 
 
 %%--------------------------------------------------------------------
-%% Function:  peercert(ConnectionPid) -> {ok, Cert} | {error, Reason}
+-spec peer_certificate(pid()) -> {ok, binary()| undefined} | {error, reason()}.
 %%
 %% Description: Returns the peer cert
 %%--------------------------------------------------------------------
@@ -246,7 +262,7 @@ peer_certificate(ConnectionPid) ->
     sync_send_all_state_event(ConnectionPid, peer_certificate). 
 
 %%--------------------------------------------------------------------
-%% Function: renegotiation(ConnectionPid) -> ok | {error, Reason}
+-spec renegotiation(pid()) -> ok | {error, reason()}.
 %%
 %% Description: Starts a renegotiation of the ssl session.
 %%--------------------------------------------------------------------
@@ -258,7 +274,8 @@ renegotiation(ConnectionPid) ->
 %%====================================================================
 
 %%--------------------------------------------------------------------
-%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+-spec start_link(atom(), host(), port_num(), port(), list(), pid(), tuple()) ->
+    {ok, pid()} | ignore |  {error, reason()}.
 %%
 %% Description: Creates a gen_fsm process which calls Module:init/1 to
 %% initialize. To ensure a synchronized start-up procedure, this function
@@ -272,23 +289,24 @@ start_link(Role, Host, Port, Socket, Options, User, CbInfo) ->
 %% gen_fsm callbacks
 %%====================================================================
 %%--------------------------------------------------------------------
-%% Function: init(Args) -> {ok, StateName, State} |
-%%                         {ok, StateName, State, Timeout} |
-%%                         ignore                              |
-%%                         {stop, StopReason}                   
+-spec init(list()) -> {ok, state_name(), #state{}} | {stop, term()}.                   
+%% Possible return values not used now.
+%%			  | {ok, state_name(), #state{}, timeout()} |
+%%			  ignore  
 %% Description:Whenever a gen_fsm is started using gen_fsm:start/[3,4] or
 %% gen_fsm:start_link/3,4, this function is called by the new process to 
 %% initialize. 
 %%--------------------------------------------------------------------
-init([Role, Host, Port, Socket, {SSLOpts, _} = Options, 
+init([Role, Host, Port, Socket, {SSLOpts0, _} = Options, 
       User, CbInfo]) ->
     State0 = initial_state(Role, Host, Port, Socket, Options, User, CbInfo),
     Hashes0 = ssl_handshake:init_hashes(),    
 
-    try ssl_init(SSLOpts, Role) of
+    try ssl_init(SSLOpts0, Role) of
 	{ok, Ref, CacheRef, OwnCert, Key, DHParams} ->	   
+	    Session = State0#state.session,
 	    State = State0#state{tls_handshake_hashes = Hashes0,
-				 own_cert = OwnCert,
+				 session = Session#session{own_certificate = OwnCert},
 				 cert_db_ref = Ref,
 				 session_cache = CacheRef,
 				 private_key = Key,
@@ -300,11 +318,7 @@ init([Role, Host, Port, Socket, {SSLOpts, _} = Options,
     end.
    
 %%--------------------------------------------------------------------
-%% Function: 
-%% state_name(Event, State) -> {next_state, NextStateName, NextState}|
-%%                             {next_state, NextStateName, 
-%%                                NextState, Timeout} |
-%%                             {stop, Reason, NewState}
+%% -spec state_name(event(), #state{}) -> gen_fsm_state_return()
 %%
 %% Description:There should be one instance of this function for each
 %% possible state name. Whenever a gen_fsm receives an event sent
@@ -313,14 +327,18 @@ init([Role, Host, Port, Socket, {SSLOpts, _} = Options,
 %% the event. It is also called if a timeout occurs.
 %%
 %%--------------------------------------------------------------------
+-spec hello(start | #hello_request{} | #client_hello{} | #server_hello{} | term(),
+	    #state{}) -> gen_fsm_state_return().    
+%%--------------------------------------------------------------------
 hello(start, #state{host = Host, port = Port, role = client,
 		    ssl_options = SslOpts, 
+		    session = #session{own_certificate = Cert} = Session0,
 		    transport_cb = Transport, socket = Socket,
 		    connection_states = ConnectionStates,
-		    renegotiation = {Renegotiation, _}}
-      = State0) ->
+		    renegotiation = {Renegotiation, _}} = State0) ->
     Hello = ssl_handshake:client_hello(Host, Port, 
-				       ConnectionStates, SslOpts, Renegotiation),
+				       ConnectionStates, 
+				       SslOpts, Renegotiation, Cert),
 
     Version = Hello#client_hello.client_version,
     Hashes0 = ssl_handshake:init_hashes(),
@@ -329,13 +347,13 @@ hello(start, #state{host = Host, port = Port, role = client,
     Transport:send(Socket, BinMsg),
     State1 = State0#state{connection_states = CS2,
 			 negotiated_version = Version, %% Requested version
-			 session = 
-                         #session{session_id = Hello#client_hello.session_id,
-                                  is_resumable = false},
-                         tls_handshake_hashes = Hashes1},
+			  session =
+			      Session0#session{session_id = Hello#client_hello.session_id,
+					       is_resumable = false},
+			  tls_handshake_hashes = Hashes1},
     {Record, State} = next_record(State1),
     next_state(hello, Record, State);
-    
+
 hello(start, #state{role = server} = State0) ->
     {Record, State} = next_record(State0),
     next_state(hello, Record, State);
@@ -346,49 +364,29 @@ hello(#hello_request{}, #state{role = client} = State0) ->
 
 hello(#server_hello{cipher_suite = CipherSuite,
 		    compression_method = Compression} = Hello,
-      #state{session = Session0 = #session{session_id = OldId},
+      #state{session = #session{session_id = OldId},
 	     connection_states = ConnectionStates0,
 	     role = client,
 	     negotiated_version = ReqVersion,
-	     host = Host, port = Port,
 	     renegotiation = {Renegotiation, _},
-	     ssl_options = SslOptions,
-	     session_cache = Cache,
-	     session_cache_cb = CacheCb} = State0) ->
-
+	     ssl_options = SslOptions} = State0) ->
     case ssl_handshake:hello(Hello, SslOptions, ConnectionStates0, Renegotiation) of
-	{Version, NewId, ConnectionStates1} ->
-	    {KeyAlgorithm, _, _} = 
+	{Version, NewId, ConnectionStates} ->
+	    {KeyAlgorithm, _, _} =
 		ssl_cipher:suite_definition(CipherSuite),
 	    
 	    PremasterSecret = make_premaster_secret(ReqVersion, KeyAlgorithm),
 	    
-	    State1 = State0#state{key_algorithm = KeyAlgorithm,
-				  negotiated_version = Version,
-				  connection_states = ConnectionStates1,
-				  premaster_secret = PremasterSecret},
+	    State = State0#state{key_algorithm = KeyAlgorithm,
+				 negotiated_version = Version,
+				 connection_states = ConnectionStates,
+				 premaster_secret = PremasterSecret},
 	    
 	    case ssl_session:is_new(OldId, NewId) of
 		true ->
-		    Session = Session0#session{session_id = NewId,
-					       cipher_suite = CipherSuite,
-				       compression_method = Compression}, 
-		    {Record, State} = next_record(State1#state{session = Session}),
-		    next_state(certify, Record, State);
+		    handle_new_session(NewId, CipherSuite, Compression, State);
 		false ->
-		    Session = CacheCb:lookup(Cache, {{Host, Port}, NewId}),
-		    case ssl_handshake:master_secret(Version, Session, 
-						     ConnectionStates1, client) of
-			{_, ConnectionStates2} ->	
-			    {Record, State} = 
-				next_record(State1#state{
-					      connection_states = ConnectionStates2,
-					      session = Session}),
-			    next_state(abbreviated, Record, State);
-			#alert{} = Alert ->
-			    handle_own_alert(Alert, Version, hello, State1), 
-			    {stop, normal, State1}
-		    end
+		    handle_resumed_session(NewId, State#state{connection_states = ConnectionStates}) 
 	    end;
 	#alert{} = Alert ->
 	    handle_own_alert(Alert, ReqVersion, hello, State0), 
@@ -397,14 +395,13 @@ hello(#server_hello{cipher_suite = CipherSuite,
 
 hello(Hello = #client_hello{client_version = ClientVersion}, 
       State = #state{connection_states = ConnectionStates0,
-		     port = Port, session = Session0,
+		     port = Port, session = #session{own_certificate = Cert} = Session0,
 		     renegotiation = {Renegotiation, _},
 		     session_cache = Cache,		  
 		     session_cache_cb = CacheCb,
 		     ssl_options = SslOpts}) ->
-    
     case ssl_handshake:hello(Hello, SslOpts, {Port, Session0, Cache, CacheCb,
-				     ConnectionStates0}, Renegotiation) of
+				     ConnectionStates0, Cert}, Renegotiation) of
         {Version, {Type, Session}, ConnectionStates} ->       
             do_server_hello(Type, State#state{connection_states  = 
 					      ConnectionStates,
@@ -417,7 +414,10 @@ hello(Hello = #client_hello{client_version = ClientVersion},
 
 hello(Msg, State) ->
     handle_unexpected_message(Msg, hello, State).
-
+%%--------------------------------------------------------------------
+-spec abbreviated(#hello_request{} | #finished{} | term(),
+		  #state{}) -> gen_fsm_state_return().   
+%%--------------------------------------------------------------------
 abbreviated(#hello_request{}, State0) ->
     {Record, State} = next_record(State0),
     next_state(hello, Record, State);
@@ -463,6 +463,11 @@ abbreviated(#finished{verify_data = Data} = Finished,
 abbreviated(Msg, State) ->
     handle_unexpected_message(Msg, abbreviated, State).
 
+%%--------------------------------------------------------------------
+-spec certify(#hello_request{} | #certificate{} |  #server_key_exchange{} |
+	      #certificate_request{} | #server_hello_done{} | #client_key_exchange{} | term(),
+	      #state{}) -> gen_fsm_state_return().   
+%%--------------------------------------------------------------------
 certify(#hello_request{}, State0) ->
     {Record, State} = next_record(State0),
     next_state(hello, Record, State);
@@ -491,8 +496,7 @@ certify(#certificate{} = Cert,
 	       ssl_options = Opts} = State) ->
     case ssl_handshake:certify(Cert, CertDbRef, Opts#ssl_options.depth, 
 			       Opts#ssl_options.verify,
-			       Opts#ssl_options.verify_fun,
-			       Opts#ssl_options.validate_extensions_fun, Role) of
+			       Opts#ssl_options.verify_fun, Role) of
         {PeerCert, PublicKeyInfo} ->
 	    handle_peer_cert(PeerCert, PublicKeyInfo, 
 			     State#state{client_certificate_requested = false});
@@ -504,7 +508,7 @@ certify(#certificate{} = Cert,
 certify(#server_key_exchange{} = KeyExchangeMsg, 
         #state{role = client, negotiated_version = Version,
 	       key_algorithm = Alg} = State0) 
-  when Alg == dhe_dss; Alg == dhe_rsa ->
+  when Alg == dhe_dss; Alg == dhe_rsa;  Alg == dh_anon ->
     case handle_server_key(KeyExchangeMsg, State0) of
 	#state{} = State1 ->
 	    {Record, State} = next_record(State1),
@@ -529,7 +533,7 @@ certify(#server_hello_done{},
 	       connection_states = ConnectionStates0,
 	       negotiated_version = Version,
 	       premaster_secret = undefined,
-	       role = client} = State0) ->    
+	       role = client} = State0) ->
     case ssl_handshake:master_secret(Version, Session, 
 				     ConnectionStates0, client) of
 	{MasterSecret, ConnectionStates1} -> 
@@ -568,70 +572,58 @@ certify(#client_key_exchange{} = Msg,
     %% We expect a certificate here
     handle_unexpected_message(Msg, certify_client_key_exchange, State);
 
-certify(#client_key_exchange{exchange_keys 
-			     = #encrypted_premaster_secret{premaster_secret 
-							   = EncPMS}},
-        #state{negotiated_version = Version,
-	       connection_states = ConnectionStates0,
-	       session = Session0,
-	       private_key = Key} = State0) ->
-    try ssl_handshake:decrypt_premaster_secret(EncPMS, Key) of
-	PremasterSecret ->
-	    case ssl_handshake:master_secret(Version, PremasterSecret, 
-					     ConnectionStates0, server) of
-		{MasterSecret, ConnectionStates} ->
-		    Session = Session0#session{master_secret = MasterSecret},
-		    State1 = State0#state{connection_states = ConnectionStates,
-					 session = Session},
-		    {Record, State} = next_record(State1),
-		    next_state(cipher, Record, State);
-		#alert{} = Alert ->
-		    handle_own_alert(Alert, Version, 
-				     certify_client_key_exchange, State0),
-		    {stop, normal, State0} 
-	    end
+certify(#client_key_exchange{exchange_keys = Keys},
+	State = #state{key_algorithm = KeyAlg, negotiated_version = Version}) ->
+    try
+	certify_client_key_exchange(ssl_handshake:decode_client_key(Keys, KeyAlg, Version), State)
     catch 
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify_client_key_exchange, 
-			     State0),
-	    {stop, normal, State0} 
+	    handle_own_alert(Alert, Version, certify_client_key_exchange, State),
+	    {stop, normal, State}
     end;
 
-certify(#client_key_exchange{exchange_keys = #client_diffie_hellman_public{
-			       dh_public = ClientPublicDhKey}},
-        #state{negotiated_version = Version,
-	       diffie_hellman_params = #'DHParameter'{prime = P,
-						      base = G},
-	       diffie_hellman_keys = {_, ServerDhPrivateKey},
-	       role = Role,
-	       session = Session,
-	       connection_states = ConnectionStates0} = State0) ->
-    
-    PMpint = crypto:mpint(P),
-    GMpint = crypto:mpint(G),	
-    PremasterSecret = crypto:dh_compute_key(mpint_binary(ClientPublicDhKey),
-					    ServerDhPrivateKey,
-					    [PMpint, GMpint]),
-    
+certify(Msg, State) ->
+    handle_unexpected_message(Msg, certify, State).
+
+certify_client_key_exchange(#encrypted_premaster_secret{premaster_secret= EncPMS},
+			    #state{negotiated_version = Version,
+				   connection_states = ConnectionStates0,
+				   session = Session0,
+				   private_key = Key} = State0) ->
+    PremasterSecret = ssl_handshake:decrypt_premaster_secret(EncPMS, Key),
     case ssl_handshake:master_secret(Version, PremasterSecret,
-				     ConnectionStates0, Role) of
+				     ConnectionStates0, server) of
 	{MasterSecret, ConnectionStates} ->
-	    State1 = State0#state{session = 
-				 Session#session{master_secret 
-						 = MasterSecret},
-				connection_states = ConnectionStates},
-
+	    Session = Session0#session{master_secret = MasterSecret},
+	    State1 = State0#state{connection_states = ConnectionStates,
+				  session = Session},
 	    {Record, State} = next_record(State1),
 	    next_state(cipher, Record, State);
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, 
+	    handle_own_alert(Alert, Version,
 			     certify_client_key_exchange, State0),
 	    {stop, normal, State0} 
     end;
 
-certify(Msg, State) ->
-    handle_unexpected_message(Msg, certify, State).
+certify_client_key_exchange(#client_diffie_hellman_public{dh_public = ClientPublicDhKey},
+			    #state{negotiated_version = Version,
+				   diffie_hellman_params = #'DHParameter'{prime = P,
+									  base = G},
+				   diffie_hellman_keys = {_, ServerDhPrivateKey}} = State0) ->
+    case dh_master_secret(crypto:mpint(P), crypto:mpint(G), ClientPublicDhKey, ServerDhPrivateKey, State0) of
+	#state{} = State1 ->
+	    {Record, State} = next_record(State1),
+	    next_state(cipher, Record, State);
+	#alert{} = Alert ->
+	    handle_own_alert(Alert, Version, 
+			     certify_client_key_exchange, State0),
+	    {stop, normal, State0} 
+    end.
 
+%%--------------------------------------------------------------------
+-spec cipher(#hello_request{} | #certificate_verify{} | #finished{} | term(),
+	     #state{}) -> gen_fsm_state_return().  
+%%--------------------------------------------------------------------
 cipher(#hello_request{}, State0) ->
     {Record, State} = next_record(State0),
     next_state(hello, Record, State);
@@ -641,12 +633,10 @@ cipher(#certificate_verify{signature = Signature},
 	      public_key_info = PublicKeyInfo,
 	      negotiated_version = Version,
 	      session = #session{master_secret = MasterSecret},
-	      key_algorithm = Algorithm,
 	      tls_handshake_hashes = Hashes
 	     } = State0) -> 
     case ssl_handshake:certificate_verify(Signature, PublicKeyInfo,
-					  Version, MasterSecret, 
-					  Algorithm, Hashes) of
+					  Version, MasterSecret, Hashes) of
 	valid ->
 	    {Record, State} = next_record(State0),
 	    next_state(cipher, Record, State);
@@ -662,31 +652,13 @@ cipher(#finished{verify_data = Data} = Finished,
 	      role = Role,
 	      session = #session{master_secret = MasterSecret} 
 	      = Session0,
-	      tls_handshake_hashes = Hashes0,
-	     connection_states = ConnectionStates0} = State) ->    
-    
+	      tls_handshake_hashes = Hashes0} = State) ->
     case ssl_handshake:verify_connection(Version, Finished, 
 					 opposite_role(Role), 
                                          MasterSecret, Hashes0) of
         verified ->
 	    Session = register_session(Role, Host, Port, Session0),
-            case Role of
-                client ->
-		    ConnectionStates = ssl_record:set_server_verify_data(current_both, Data, ConnectionStates0),
-                    next_state_connection(cipher, ack_connection(State#state{session = Session,
-									     connection_states = ConnectionStates}));
-                server ->
-		    ConnectionStates1 = ssl_record:set_client_verify_data(current_read, Data, ConnectionStates0),
-                    {ConnectionStates, Hashes} = 
-                        finalize_handshake(State#state{ 
-						    connection_states = ConnectionStates1,
-						    session = Session}, cipher),
-                    next_state_connection(cipher, ack_connection(State#state{connection_states = 
-									     ConnectionStates,
-									     session = Session,
-									     tls_handshake_hashes =
-									     Hashes}))
-            end;
+	    cipher_role(Role, Data, Session, State);
         #alert{} = Alert ->
 	    handle_own_alert(Alert, Version, cipher, State),
             {stop, normal, State} 
@@ -695,18 +667,21 @@ cipher(#finished{verify_data = Data} = Finished,
 cipher(Msg, State) ->
     handle_unexpected_message(Msg, cipher, State).
 
-
+%%--------------------------------------------------------------------
+-spec connection(#hello_request{} | #client_hello{} | term(),
+		 #state{}) -> gen_fsm_state_return().  
+%%--------------------------------------------------------------------
 connection(#hello_request{}, #state{host = Host, port = Port,
 				    socket = Socket,
+				    session = #session{own_certificate = Cert},
 				    ssl_options = SslOpts,
 				    negotiated_version = Version,
 				    transport_cb = Transport,
 				    connection_states = ConnectionStates0,
 				    renegotiation = {Renegotiation, _},
 				    tls_handshake_hashes = Hashes0} = State0) ->
-   
-    Hello = ssl_handshake:client_hello(Host, Port, 
-				       ConnectionStates0, SslOpts, Renegotiation),
+    Hello = ssl_handshake:client_hello(Host, Port, ConnectionStates0,
+				       SslOpts, Renegotiation, Cert),
   
     {BinMsg, ConnectionStates1, Hashes1} =
         encode_handshake(Hello, Version, ConnectionStates0, Hashes0),
@@ -721,30 +696,24 @@ connection(#client_hello{} = Hello, #state{role = server} = State) ->
 connection(Msg, State) ->
     handle_unexpected_message(Msg, connection, State).
 %%--------------------------------------------------------------------
-%% Function: 
-%% handle_event(Event, StateName, State) -> {next_state, NextStateName, 
-%%                                                  NextState} |
-%%                                          {next_state, NextStateName, 
-%%                                                  NextState, Timeout} |
-%%                                          {stop, Reason, NewState}
+-spec handle_event(term(), state_name(), #state{}) -> term().
+%% As it is not currently used gen_fsm_state_return() makes
+%% dialyzer unhappy!
+%%
 %% Description: Whenever a gen_fsm receives an event sent using
 %% gen_fsm:send_all_state_event/2, this function is called to handle
-%% the event.
+%% the event. Not currently used!
 %%--------------------------------------------------------------------
 handle_event(_Event, StateName, State) ->
     {next_state, StateName, State}.
 
 %%--------------------------------------------------------------------
-%% Function: 
-%% handle_sync_event(Event, From, StateName, 
-%%                   State) -> {next_state, NextStateName, NextState} |
-%%                             {next_state, NextStateName, NextState, 
-%%                              Timeout} |
-%%                             {reply, Reply, NextStateName, NextState}|
-%%                             {reply, Reply, NextStateName, NextState, 
-%%                              Timeout} |
-%%                             {stop, Reason, NewState} |
-%%                             {stop, Reason, Reply, NewState}
+-spec handle_sync_event(term(), from(), state_name(), #state{}) -> 
+			       gen_fsm_state_return() |  
+			       {reply, reply(), state_name(), #state{}} |
+			       {reply, reply(), state_name(), #state{}, timeout()} |
+			       {stop, reason(), reply(), #state{}}.
+%%
 %% Description: Whenever a gen_fsm receives an event sent using
 %% gen_fsm:sync_send_all_state_event/2,3, this function is called to handle
 %% the event.
@@ -803,8 +772,12 @@ handle_sync_event(start, _, connection, State) ->
 handle_sync_event(start, From, StateName, State) ->
     {next_state, StateName, State#state{from = From}};
 
-handle_sync_event(close, _, _StateName, State) ->
-    {stop, normal, ok, State};
+handle_sync_event(close, _, StateName, State) ->
+    %% Run terminate before returning
+    %% so that the reuseaddr inet-option will work
+    %% as intended.
+    (catch terminate(user_close, StateName, State)),
+    {stop, normal, ok, State#state{terminated = true}};
 
 handle_sync_event({shutdown, How0}, _, StateName,
 		  #state{transport_cb = Transport,
@@ -921,11 +894,11 @@ handle_sync_event(peer_certificate, _, StateName,
     {reply, {ok, Cert}, StateName, State}.
 
 %%--------------------------------------------------------------------
-%% Function: 
-%% handle_info(Info,StateName,State)-> {next_state, NextStateName, NextState}|
-%%                                     {next_state, NextStateName, NextState, 
-%%                                       Timeout} |
-%%                                     {stop, Reason, NewState}
+-spec handle_info(msg(),state_name(), #state{}) -> 
+			 {next_state, state_name(), #state{}}|
+			 {next_state, state_name(), #state{}, timeout()} |
+			 {stop, reason(), #state{}}.
+%%
 %% Description: This function is called by a gen_fsm when it receives any
 %% other message than a synchronous or asynchronous event
 %% (or a system message).
@@ -985,34 +958,40 @@ handle_info(Msg, StateName, State) ->
     {next_state, StateName, State}.
 
 %%--------------------------------------------------------------------
-%% Function: terminate(Reason, StateName, State) -> void()
+-spec terminate(reason(), state_name(), #state{}) -> term().
+%%
 %% Description:This function is called by a gen_fsm when it is about
 %% to terminate. It should be the opposite of Module:init/1 and do any
 %% necessary cleaning up. When it returns, the gen_fsm terminates with
 %% Reason. The return value is ignored.
 %%--------------------------------------------------------------------
-terminate(_Reason, connection, #state{negotiated_version = Version,
+terminate(_, _, #state{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.
+    ok;
+terminate(Reason, connection, #state{negotiated_version = Version,
 				      connection_states = ConnectionStates,
 				      transport_cb = Transport,
 				      socket = Socket, send_queue = SendQueue,
 				      renegotiation = Renegotiate}) ->
     notify_senders(SendQueue),
     notify_renegotiater(Renegotiate),
-    {BinAlert, _} = encode_alert(?ALERT_REC(?WARNING,?CLOSE_NOTIFY),
-				 Version, ConnectionStates),
+    BinAlert = terminate_alert(Reason, Version, ConnectionStates),
     Transport:send(Socket, BinAlert),
-    workaround_transport_delivery_problems(Socket, Transport),
+    workaround_transport_delivery_problems(Socket, Transport, Reason),
     Transport:close(Socket);
-terminate(_Reason, _StateName, #state{transport_cb = Transport, 
+terminate(Reason, _StateName, #state{transport_cb = Transport,
 				      socket = Socket, send_queue = SendQueue,
 				      renegotiation = Renegotiate}) ->
     notify_senders(SendQueue),
     notify_renegotiater(Renegotiate),
-    workaround_transport_delivery_problems(Socket, Transport),
+    workaround_transport_delivery_problems(Socket, Transport, Reason),
     Transport:close(Socket).
 
 %%--------------------------------------------------------------------
-%% Function:
+-spec code_change(term(), state_name(), #state{}, list()) -> {ok, state_name(), #state{}}.
+%%			 
 %% code_change(OldVsn, StateName, State, Extra) -> {ok, StateName, NewState}
 %% Description: Convert process state when code is changed
 %%--------------------------------------------------------------------
@@ -1024,106 +1003,121 @@ code_change(_OldVsn, StateName, State, _Extra) ->
 %%--------------------------------------------------------------------
 start_fsm(Role, Host, Port, Socket, Opts,  User, {CbModule, _,_, _} = CbInfo, 
 	  Timeout) -> 
-    case ssl_connection_sup:start_child([Role, Host, Port, Socket, 
-                                         Opts, User, CbInfo]) of
-        {ok, Pid} -> 
-	    case socket_control(Socket, Pid, CbModule) of
-		{ok, SslSocket} ->
-		    case handshake(SslSocket, Timeout) of
-			ok  ->
-			    {ok, SslSocket};
-			{error, Reason} ->
-			    {error, Reason} 
-		    end;
-		{error, Reason} ->
-		    {error, Reason}
-            end;
-	{error, Reason} ->
-            {error, Reason}
+    try 
+	{ok, Pid} = ssl_connection_sup:start_child([Role, Host, Port, Socket, 
+						    Opts, User, CbInfo]), 
+	{ok, SslSocket} = socket_control(Socket, Pid, CbModule),
+	ok = handshake(SslSocket, Timeout),
+	{ok, SslSocket} 
+    catch
+	error:{badmatch, {error, _} = Error} ->
+	    Error
     end.
- 
+
 ssl_init(SslOpts, Role) ->
     {ok, CertDbRef, CacheRef, OwnCert} = init_certificates(SslOpts, Role),
     PrivateKey =
 	init_private_key(SslOpts#ssl_options.key, SslOpts#ssl_options.keyfile,
 			 SslOpts#ssl_options.password, Role),
-    DHParams = init_diffie_hellman(SslOpts#ssl_options.dhfile, Role),
+    DHParams = init_diffie_hellman(SslOpts#ssl_options.dh, SslOpts#ssl_options.dhfile, Role),
     {ok, CertDbRef, CacheRef, OwnCert, PrivateKey, DHParams}.
 
-init_certificates(#ssl_options{cacertfile = CACertFile,
-			       certfile = CertFile}, Role) ->
 
-    case ssl_manager:connection_init(CACertFile, Role) of
-	{ok, CertDbRef, CacheRef} ->
-	    init_certificates(CertDbRef, CacheRef, CertFile, Role);
-	{error, Reason} ->
-	    handle_file_error(?LINE, error, Reason, CACertFile, ecacertfile,
-			      erlang:get_stacktrace())
-    end.
-
-init_certificates(CertDbRef, CacheRef, CertFile, client) -> 
+init_certificates(#ssl_options{cacerts = CaCerts,
+			       cacertfile = CACertFile,
+			       certfile = CertFile,
+			       cert = Cert}, Role) ->
+    {ok, CertDbRef, CacheRef} = 
+	try 
+	    Certs = case CaCerts of
+			undefined ->
+			    CACertFile;
+			_ ->
+			    {der, CaCerts}
+		    end,
+	    {ok, _, _} = ssl_manager:connection_init(Certs, Role)
+	catch
+	    Error:Reason ->
+		handle_file_error(?LINE, Error, Reason, CACertFile, ecacertfile,
+				  erlang:get_stacktrace())
+	end,
+    init_certificates(Cert, CertDbRef, CacheRef, CertFile, Role).
+
+init_certificates(undefined, CertDbRef, CacheRef, "", _) ->
+    {ok, CertDbRef, CacheRef, undefined};
+
+init_certificates(undefined, CertDbRef, CacheRef, CertFile, client) ->
     try 
 	[OwnCert] = ssl_certificate:file_to_certificats(CertFile),
 	{ok, CertDbRef, CacheRef, OwnCert}
-    catch _E:_R  ->
+    catch _Error:_Reason  ->
 	    {ok, CertDbRef, CacheRef, undefined}
     end;
 
-init_certificates(CertDbRef, CacheRef, CertFile, server) ->
-     try 
+init_certificates(undefined, CertDbRef, CacheRef, CertFile, server) ->
+    try
 	[OwnCert] = ssl_certificate:file_to_certificats(CertFile),
 	{ok, CertDbRef, CacheRef, OwnCert}
-     catch
-	 Error:Reason ->
-	     handle_file_error(?LINE, Error, Reason, CertFile, ecertfile,
-			       erlang:get_stacktrace())
-     end.
+    catch
+	Error:Reason ->
+	    handle_file_error(?LINE, Error, Reason, CertFile, ecertfile,
+			      erlang:get_stacktrace())
+    end;
+init_certificates(Cert, CertDbRef, CacheRef, _, _) ->
+    {ok, CertDbRef, CacheRef, Cert}.
 
-init_private_key(undefined, "", _Password, client) -> 
+init_private_key(undefined, "", _Password, _Client) ->
     undefined;
 init_private_key(undefined, KeyFile, Password, _)  -> 
-    case ssl_manager:cache_pem_file(KeyFile) of
-	{ok, List} ->
-	    [Der] = [Der || Der = {PKey, _ , _} <- List,
-			    PKey =:= rsa_private_key orelse 
-				PKey =:= dsa_private_key],
-	    {ok, Decoded} = public_key:decode_private_key(Der,Password),
-	    Decoded;
-	{error, Reason} -> 
-	    handle_file_error(?LINE, error, Reason, KeyFile, ekeyfile,
+    try
+	{ok, List} = ssl_manager:cache_pem_file(KeyFile), 
+	[PemEntry] = [PemEntry || PemEntry = {PKey, _ , _} <- List,
+				  PKey =:= 'RSAPrivateKey' orelse 
+				      PKey =:= 'DSAPrivateKey'],
+	public_key:pem_entry_decode(PemEntry, Password)
+    catch 
+	Error:Reason ->
+	    handle_file_error(?LINE, Error, Reason, KeyFile, ekeyfile,
 			      erlang:get_stacktrace()) 
     end;
 
-init_private_key(PrivateKey, _, _,_) ->
-    PrivateKey.
+init_private_key({rsa, PrivateKey}, _, _,_) ->
+    public_key:der_decode('RSAPrivateKey', PrivateKey);
+init_private_key({dsa, PrivateKey},_,_,_) ->
+    public_key:der_decode('DSAPrivateKey', PrivateKey).
 
+-spec(handle_file_error(_,_,_,_,_,_) -> no_return()).
 handle_file_error(Line, Error, {badmatch, Reason}, File, Throw, Stack) ->
     file_error(Line, Error, Reason, File, Throw, Stack);
 handle_file_error(Line, Error, Reason, File, Throw, Stack) ->
     file_error(Line, Error, Reason, File, Throw, Stack).
 
+-spec(file_error(_,_,_,_,_,_) -> no_return()).
 file_error(Line, Error, Reason, File, Throw, Stack) ->
     Report = io_lib:format("SSL: ~p: ~p:~p ~s~n  ~p~n",
 			   [Line, Error, Reason, File, Stack]),
     error_logger:error_report(Report),
     throw(Throw).
 
-init_diffie_hellman(_, client) ->
+init_diffie_hellman(Params, _,_) when is_binary(Params)->
+    public_key:der_decode('DHParameter', Params);
+init_diffie_hellman(_,_, client) ->
     undefined;
-init_diffie_hellman(undefined, _) ->
+init_diffie_hellman(_,undefined, _) ->
     ?DEFAULT_DIFFIE_HELLMAN_PARAMS;
-init_diffie_hellman(DHParamFile, server) ->
-    case ssl_manager:cache_pem_file(DHParamFile) of
-	{ok, List} ->
-	    case [Der || Der = {dh_params, _ , _} <- List] of
-		[Der] ->
-		    {ok, Decoded} = public_key:decode_dhparams(Der),
-		    Decoded;
-		[] ->
-		    ?DEFAULT_DIFFIE_HELLMAN_PARAMS
-	    end;
-	{error, Reason} ->
-	    handle_file_error(?LINE, error, Reason, DHParamFile, edhfile,  erlang:get_stacktrace()) 
+init_diffie_hellman(_, DHParamFile, server) ->
+    try
+	{ok, List} = ssl_manager:cache_pem_file(DHParamFile), 
+	case [Entry || Entry = {'DHParameter', _ , _} <- List] of
+	    [Entry] ->
+		public_key:pem_entry_decode(Entry);
+	    [] ->
+		?DEFAULT_DIFFIE_HELLMAN_PARAMS
+	end
+    catch
+	Error:Reason ->
+	    handle_file_error(?LINE, Error, Reason, 
+			      DHParamFile, edhfile,  erlang:get_stacktrace()) 
     end.
 
 sync_send_all_state_event(FsmPid, Event) ->
@@ -1158,7 +1152,7 @@ certify_client(#state{client_certificate_requested = true, role = client,
                       transport_cb = Transport,
                       negotiated_version = Version,
                       cert_db_ref = CertDbRef,
-                      own_cert = OwnCert,
+		      session = #session{own_certificate = OwnCert},
                       socket = Socket,
                       tls_handshake_hashes = Hashes0} = State) ->
     Certificate = ssl_handshake:certificate(OwnCert, CertDbRef, client),
@@ -1174,25 +1168,24 @@ verify_client_cert(#state{client_certificate_requested = true, role = client,
 			  connection_states = ConnectionStates0,
 			  transport_cb = Transport,
 			  negotiated_version = Version,
-			  own_cert = OwnCert,
 			  socket = Socket,
-			  key_algorithm = KeyAlg,
 			  private_key = PrivateKey,
-			  session = #session{master_secret = MasterSecret},
+			  session = #session{master_secret = MasterSecret,
+					     own_certificate = OwnCert},
 			  tls_handshake_hashes = Hashes0} = State) ->
+
     case ssl_handshake:client_certificate_verify(OwnCert, MasterSecret, 
-						 Version, KeyAlg, 
-						 PrivateKey, Hashes0) of
+						 Version, PrivateKey, Hashes0) of
         #certificate_verify{} = Verified ->
             {BinVerified, ConnectionStates1, Hashes1} = 
-                encode_handshake(Verified, KeyAlg, Version, 
+                encode_handshake(Verified, Version,
                                  ConnectionStates0, Hashes0),
             Transport:send(Socket, BinVerified),
             State#state{connection_states = ConnectionStates1,
                         tls_handshake_hashes = Hashes1};
 	ignore ->
 	    State;
-	 #alert{} = Alert ->
+	#alert{} = Alert ->
 	    handle_own_alert(Alert, Version, certify, State)
 	    
     end;
@@ -1200,18 +1193,19 @@ verify_client_cert(#state{client_certificate_requested = false} = State) ->
     State.
 
 do_server_hello(Type, #state{negotiated_version = Version,
-			     session = Session,
+			     session = #session{session_id = SessId} = Session,
 			     connection_states = ConnectionStates0,
 			     renegotiation = {Renegotiation, _}} 
 		= State0) when is_atom(Type) -> 
+
     ServerHello = 
-        ssl_handshake:server_hello(Session#session.session_id, Version, 
+        ssl_handshake:server_hello(SessId, Version, 
                                    ConnectionStates0, Renegotiation),
     State1 = server_hello(ServerHello, State0),
     
     case Type of	
 	new ->
-	    do_server_hello(ServerHello, State1);
+	    new_server_hello(ServerHello, State1);
 	resumed ->
 	    ConnectionStates1 = State1#state.connection_states,
 	    case ssl_handshake:master_secret(Version, Session,
@@ -1230,9 +1224,9 @@ do_server_hello(Type, #state{negotiated_version = Version,
 		    handle_own_alert(Alert, Version, hello, State1), 
 		    {stop, normal, State1}
 	    end
-    end;
+    end.
 
-do_server_hello(#server_hello{cipher_suite = CipherSuite,
+new_server_hello(#server_hello{cipher_suite = CipherSuite,
 			      compression_method = Compression,
 			      session_id = SessionId}, 
 		#state{session = Session0,
@@ -1252,6 +1246,33 @@ do_server_hello(#server_hello{cipher_suite = CipherSuite,
 	    {stop, normal, State0}
     end.
 
+handle_new_session(NewId, CipherSuite, Compression, #state{session = Session0} = State0) ->
+    Session = Session0#session{session_id = NewId,
+			       cipher_suite = CipherSuite,
+			       compression_method = Compression}, 
+    {Record, State} = next_record(State0#state{session = Session}),
+    next_state(certify, Record, State).
+
+handle_resumed_session(SessId, #state{connection_states = ConnectionStates0,
+				      negotiated_version = Version,
+				      host = Host, port = Port,
+				      session_cache = Cache,
+				      session_cache_cb = CacheCb} = State0) ->
+    Session = CacheCb:lookup(Cache, {{Host, Port}, SessId}),
+    case ssl_handshake:master_secret(Version, Session, 
+				     ConnectionStates0, client) of
+	{_, ConnectionStates1} ->	
+	    {Record, State} = 
+		next_record(State0#state{
+			      connection_states = ConnectionStates1,
+			      session = Session}),
+	    next_state(abbreviated, Record, State);
+	#alert{} = Alert ->
+	    handle_own_alert(Alert, Version, hello, State0), 
+	    {stop, normal, State0}
+    end.
+
+
 client_certify_and_key_exchange(#state{negotiated_version = Version} = 
 				State0) ->
     try do_client_certify_and_key_exchange(State0) of 
@@ -1306,15 +1327,17 @@ server_hello_done(#state{transport_cb = Transport,
     Transport:send(Socket, BinHelloDone),
     State#state{connection_states = NewConnectionStates,
 		tls_handshake_hashes = NewHashes}.
-   
-certify_server(#state{transport_cb = Transport,
-                      socket = Socket,
-                      negotiated_version = Version,
-                      connection_states = ConnectionStates,
-                      tls_handshake_hashes = Hashes,
-                      cert_db_ref = CertDbRef,
-                      own_cert = OwnCert} = State) ->
 
+certify_server(#state{key_algorithm = dh_anon} = State) ->
+    State;
+
+certify_server(#state{transport_cb = Transport,
+		      socket = Socket,
+		      negotiated_version = Version,
+		      connection_states = ConnectionStates,
+		      tls_handshake_hashes = Hashes,
+		      cert_db_ref = CertDbRef,
+		      session = #session{own_certificate = OwnCert}} = State) ->
     case ssl_handshake:certificate(OwnCert, CertDbRef, server) of
 	CertMsg = #certificate{} ->
 	    {BinCertMsg, NewConnectionStates, NewHashes} =
@@ -1330,7 +1353,7 @@ certify_server(#state{transport_cb = Transport,
 key_exchange(#state{role = server, key_algorithm = rsa} = State) ->
     State;
 key_exchange(#state{role = server, key_algorithm = Algo,
-		    diffie_hellman_params = Params,
+		    diffie_hellman_params = #'DHParameter'{prime = P, base = G} = Params,
 		    private_key = PrivateKey,
 		    connection_states = ConnectionStates0,
 		    negotiated_version = Version,
@@ -1339,11 +1362,9 @@ key_exchange(#state{role = server, key_algorithm = Algo,
 		    transport_cb = Transport
 		   } = State) 
   when Algo == dhe_dss;
-       Algo == dhe_dss_export;
        Algo == dhe_rsa;
-       Algo == dhe_rsa_export  ->
-
-    Keys = public_key:gen_key(Params),
+       Algo == dh_anon ->
+    Keys = crypto:dh_generate_key([crypto:mpint(P), crypto:mpint(G)]),
     ConnectionState = 
 	ssl_record:pending_connection_state(ConnectionStates0, read),
     SecParams = ConnectionState#connection_state.security_parameters,
@@ -1360,11 +1381,6 @@ key_exchange(#state{role = server, key_algorithm = Algo,
 		diffie_hellman_keys = Keys,
                 tls_handshake_hashes = Hashes1};
 
-
-%% key_algorithm = dh_anon is not supported. Should be by default disabled
-%% if support is implemented and then we need a key_exchange clause for it
-%% here. 
-   
 key_exchange(#state{role = client, 
 		    connection_states = ConnectionStates0,
 		    key_algorithm = rsa,
@@ -1387,9 +1403,8 @@ key_exchange(#state{role = client,
 		    socket = Socket, transport_cb = Transport,
 		    tls_handshake_hashes = Hashes0} = State) 
   when Algorithm == dhe_dss;
-       Algorithm == dhe_dss_export;
        Algorithm == dhe_rsa;
-       Algorithm == dhe_rsa_export ->
+       Algorithm == dh_anon ->
     Msg =  ssl_handshake:key_exchange(client, {dh, DhPubKey}),
     {BinMsg, ConnectionStates1, Hashes1} =
         encode_handshake(Msg, Version, ConnectionStates0, Hashes0),
@@ -1465,23 +1480,30 @@ save_verify_data(client, #finished{verify_data = Data}, ConnectionStates, abbrev
 save_verify_data(server, #finished{verify_data = Data}, ConnectionStates, abbreviated) ->
     ssl_record:set_server_verify_data(current_write, Data, ConnectionStates).
 
+handle_server_key(#server_key_exchange{params =
+					   #server_dh_params{dh_p = P,
+							     dh_g = G,
+							     dh_y = ServerPublicDhKey},
+				       signed_params = <<>>},
+		  #state{key_algorithm = dh_anon} = State) ->
+    dh_master_secret(P, G, ServerPublicDhKey, undefined, State);
+
 handle_server_key(
   #server_key_exchange{params = 
 		       #server_dh_params{dh_p = P,
 					 dh_g = G,
 					 dh_y = ServerPublicDhKey}, 
 		       signed_params = Signed}, 
-  #state{session = Session, negotiated_version = Version, role = Role,
-	 public_key_info = PubKeyInfo,
+  #state{public_key_info = PubKeyInfo,
 	 key_algorithm = KeyAlgo,
-	 connection_states = ConnectionStates0} = State) ->
+	 connection_states = ConnectionStates} = State) ->
      
     PLen = size(P),
     GLen = size(G),
     YLen = size(ServerPublicDhKey),
 
     ConnectionState = 
-	ssl_record:pending_connection_state(ConnectionStates0, read),
+	ssl_record:pending_connection_state(ConnectionStates, read),
     SecParams = ConnectionState#connection_state.security_parameters,
     #security_parameters{client_random = ClientRandom,
 			 server_random = ServerRandom} = SecParams, 
@@ -1495,52 +1517,70 @@ handle_server_key(
     
     case verify_dh_params(Signed, Hash, PubKeyInfo) of
 	true ->
-	    PMpint = mpint_binary(P),
-	    GMpint = mpint_binary(G),	
-	    Keys = {_, ClientDhPrivateKey} = 
-		crypto:dh_generate_key([PMpint,GMpint]),
-	    PremasterSecret = 
-		crypto:dh_compute_key(mpint_binary(ServerPublicDhKey), 
-				      ClientDhPrivateKey, [PMpint, GMpint]),
-	    case ssl_handshake:master_secret(Version, PremasterSecret, 
-					     ConnectionStates0, Role) of
-		{MasterSecret, ConnectionStates} ->
-		    State#state{diffie_hellman_keys = Keys,
-				 session = 
-				 Session#session{master_secret 
-						 = MasterSecret},
-				 connection_states = ConnectionStates};
-		#alert{} = Alert ->
-		    Alert
-	    end;
+	    dh_master_secret(P, G, ServerPublicDhKey, undefined, State);
 	false ->
-	    ?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE)
+	    ?ALERT_REC(?FATAL, ?DECRYPT_ERROR)
     end.
 
-verify_dh_params(Signed, Hash, {?rsaEncryption, PubKey, _PubKeyparams}) ->
+verify_dh_params(Signed, Hashes, {?rsaEncryption, PubKey, _PubKeyParams}) ->
     case public_key:decrypt_public(Signed, PubKey, 
 				   [{rsa_pad, rsa_pkcs1_padding}]) of
-	Hash ->
+	Hashes ->
 	    true;
 	_ ->
 	    false
+    end;
+verify_dh_params(Signed, Hash, {?'id-dsa', PublicKey, PublicKeyParams}) ->
+    public_key:verify(Hash, none, Signed, {PublicKey, PublicKeyParams}). 
+
+dh_master_secret(Prime, Base, PublicDhKey, undefined, State) ->
+    PMpint = mpint_binary(Prime),
+    GMpint = mpint_binary(Base),
+    Keys = {_, PrivateDhKey} =
+	crypto:dh_generate_key([PMpint,GMpint]),
+    dh_master_secret(PMpint, GMpint, PublicDhKey, PrivateDhKey, State#state{diffie_hellman_keys = Keys});
+
+dh_master_secret(PMpint, GMpint, PublicDhKey, PrivateDhKey,
+		 #state{session = Session,
+			negotiated_version = Version, role = Role,
+			connection_states = ConnectionStates0} = State) ->
+    PremasterSecret =
+	crypto:dh_compute_key(mpint_binary(PublicDhKey), PrivateDhKey,
+			      [PMpint, GMpint]),
+    case ssl_handshake:master_secret(Version, PremasterSecret,
+				     ConnectionStates0, Role) of
+	{MasterSecret, ConnectionStates} ->
+	    State#state{
+	      session =
+		  Session#session{master_secret = MasterSecret},
+	      connection_states = ConnectionStates};
+	#alert{} = Alert ->
+	    Alert
     end.
 
+cipher_role(client, Data, Session, #state{connection_states = ConnectionStates0} = State) -> 
+    ConnectionStates = ssl_record:set_server_verify_data(current_both, Data, ConnectionStates0),
+    next_state_connection(cipher, ack_connection(State#state{session = Session,
+							     connection_states = ConnectionStates}));
+     
+cipher_role(server, Data, Session,  #state{connection_states = ConnectionStates0} = State) -> 
+    ConnectionStates1 = ssl_record:set_client_verify_data(current_read, Data, ConnectionStates0),
+    {ConnectionStates, Hashes} = 
+	finalize_handshake(State#state{connection_states = ConnectionStates1,
+				       session = Session}, cipher),
+    next_state_connection(cipher, ack_connection(State#state{connection_states = 
+							     ConnectionStates,
+							     session = Session,
+							     tls_handshake_hashes =
+							     Hashes})).
 encode_alert(#alert{} = Alert, Version, ConnectionStates) ->
-    ?DBG_TERM(Alert),
     ssl_record:encode_alert_record(Alert, Version, ConnectionStates).
 
 encode_change_cipher(#change_cipher_spec{}, Version, ConnectionStates) ->
-    ?DBG_TERM(#change_cipher_spec{}),
     ssl_record:encode_change_cipher_spec(Version, ConnectionStates).
 
-encode_handshake(HandshakeRec, Version, ConnectionStates, Hashes) ->
-    encode_handshake(HandshakeRec, undefined, Version, 
-		     ConnectionStates, Hashes).
-
-encode_handshake(HandshakeRec, SigAlg, Version, ConnectionStates0, Hashes0) ->
-    ?DBG_TERM(HandshakeRec),
-    Frag = ssl_handshake:encode_handshake(HandshakeRec, Version, SigAlg),
+encode_handshake(HandshakeRec, Version, ConnectionStates0, Hashes0) ->
+    Frag = ssl_handshake:encode_handshake(HandshakeRec, Version),
     Hashes1 = ssl_handshake:update_hashes(Hashes0, Frag),
     {E, ConnectionStates1} =
         ssl_record:encode_handshake(Frag, Version, ConnectionStates0),
@@ -1598,8 +1638,6 @@ application_data(Data, #state{user_application = {_Mon, Pid},
 		  true -> <<Buffer0/binary, Data/binary>>
 	      end,
     case get_data(SOpts, BytesToRead, Buffer1) of
-	{ok, <<>>, Buffer} -> % no reply, we need more data
-	    next_record(State0#state{user_data_buffer = Buffer});
 	{ok, ClientData, Buffer} -> % Send data
 	    SocketOpt = deliver_app_data(SOpts, ClientData, Pid, From),
 	    State = State0#state{user_data_buffer = Buffer,
@@ -1615,12 +1653,16 @@ application_data(Data, #state{user_application = {_Mon, Pid},
 	 	true -> %% We have more data
  		    application_data(<<>>, State)
 	    end;
+	{more, Buffer} -> % no reply, we need more data
+	    next_record(State0#state{user_data_buffer = Buffer});
 	{error,_Reason} -> %% Invalid packet in packet mode
 	    deliver_packet_error(SOpts, Buffer1, Pid, From),
 	    {stop, normal, State0}
     end.
 
 %% Picks ClientData 
+get_data(_, _, <<>>) ->
+    {more, <<>>};
 get_data(#socket_options{active=Active, packet=Raw}, BytesToRead, Buffer) 
   when Raw =:= raw; Raw =:= 0 ->   %% Raw Mode
     if 
@@ -1633,13 +1675,13 @@ get_data(#socket_options{active=Active, packet=Raw}, BytesToRead, Buffer)
 	    {ok, Data, Rest};
 	true ->
 	    %% Passive Mode not enough data
-	    {ok, <<>>, Buffer}
+	    {more, Buffer}
     end;
 get_data(#socket_options{packet=Type, packet_size=Size}, _, Buffer) ->
     PacketOpts = [{packet_size, Size}], 
     case decode_packet(Type, Buffer, PacketOpts) of
 	{more, _} ->
-	    {ok, <<>>, Buffer};
+	    {more, Buffer};
 	Decoded ->
 	    Decoded
     end.
@@ -1698,11 +1740,13 @@ format_packet_error(#socket_options{active = _, mode = Mode}, Data) ->
 
 format_reply(binary, _, N, Data) when N > 0 ->  % Header mode
     header(N, Data);
-format_reply(binary, _, _, Data) ->  Data;
-format_reply(list, Packet, _, Data) when is_integer(Packet); Packet == raw -> 
-    binary_to_list(Data);
+format_reply(binary, _, _, Data) ->  
+    Data;
+format_reply(list, Packet, _, Data)
+  when Packet == http; Packet == {http, headers};  Packet == http_bin; Packet == {http_bin, headers} ->
+    Data;
 format_reply(list, _,_, Data) ->
-    Data.
+    binary_to_list(Data).
 
 header(0, <<>>) ->
     <<>>;
@@ -1727,9 +1771,23 @@ opposite_role(server) ->
 send_user(Pid, Msg) ->
     Pid ! Msg.
 
+handle_tls_handshake(Handle, StateName, #state{tls_packets = [Packet]} = State) ->
+    FsmReturn = {next_state, StateName, State#state{tls_packets = []}},
+    Handle(Packet, FsmReturn);
+
+handle_tls_handshake(Handle, StateName, #state{tls_packets = [Packet | Packets]} = State0) ->
+    FsmReturn = {next_state, StateName, State0#state{tls_packets = Packets}},
+    case Handle(Packet, FsmReturn) of
+	{next_state, NextStateName, State} ->
+	    handle_tls_handshake(Handle, NextStateName, State);
+	{stop, _,_} = Stop ->
+	    Stop
+    end.
+
 next_state(_, #alert{} = Alert, #state{negotiated_version = Version} = State) ->
     handle_own_alert(Alert, Version, decipher_error, State),
     {stop, normal, State};
+
 next_state(Next, no_record, State) ->
     {next_state, Next, State};
 
@@ -1738,9 +1796,7 @@ next_state(Next, #ssl_tls{type = ?ALERT, fragment = EncAlerts}, State) ->
     handle_alerts(Alerts,  {next_state, Next, State});
 
 next_state(StateName, #ssl_tls{type = ?HANDSHAKE, fragment = Data},
-  	   State0 = #state{key_algorithm = KeyAlg,
-  			   tls_handshake_buffer = Buf0,
-  			   negotiated_version = Version}) ->
+	   State0 = #state{tls_handshake_buffer = Buf0, negotiated_version = Version}) ->
     Handle = 
    	fun({#hello_request{} = Packet, _}, {next_state, connection = SName, State}) ->
    		%% This message should not be included in handshake
@@ -1763,9 +1819,9 @@ next_state(StateName, #ssl_tls{type = ?HANDSHAKE, fragment = Data},
    	   (_, StopState) -> StopState
    	end,
     try
-   	{Packets, Buf} = ssl_handshake:get_tls_handshake(Data,Buf0, KeyAlg,Version),
-   	Start = {next_state, StateName, State0#state{tls_handshake_buffer = Buf}},
-	lists:foldl(Handle, Start, Packets)
+	{Packets, Buf} = ssl_handshake:get_tls_handshake(Data,Buf0),
+	State = State0#state{tls_packets = Packets, tls_handshake_buffer = Buf},
+	handle_tls_handshake(Handle, StateName, State)
     catch throw:#alert{} = Alert ->
    	    handle_own_alert(Alert, Version, StateName, State0), 
    	    {stop, normal, State0}
@@ -1775,13 +1831,12 @@ next_state(StateName, #ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, State
     case application_data(Data, State0) of
 	Stop = {stop,_,_} ->
    	    Stop;
-	 {Record, State} ->
+	{Record, State} ->
    	    next_state(StateName, Record, State)
     end;
 next_state(StateName, #ssl_tls{type = ?CHANGE_CIPHER_SPEC, fragment = <<1>>} = 
  	   _ChangeCipher, 
  	   #state{connection_states = ConnectionStates0} = State0) ->
-    ?DBG_TERM(_ChangeCipher),
     ConnectionStates1 =
  	ssl_record:activate_pending_connection_state(ConnectionStates0, read),
     {Record, State} = next_record(State0#state{connection_states = ConnectionStates1}),
@@ -1802,17 +1857,19 @@ next_tls_record(Data, #state{tls_record_buffer = Buf0,
 	    Alert
     end.
 
-next_record(#state{tls_cipher_texts = [], socket = Socket} = State) ->
+next_record(#state{tls_packets = [], tls_cipher_texts = [], socket = Socket} = State) ->
     inet:setopts(Socket, [{active,once}]),
     {no_record, State};
-next_record(#state{tls_cipher_texts = [CT | Rest], 
+next_record(#state{tls_packets = [], tls_cipher_texts = [CT | Rest],
 		   connection_states = ConnStates0} = State) ->
     case ssl_record:decode_cipher_text(CT, ConnStates0) of
 	{Plain, ConnStates} ->		      
 	    {Plain, State#state{tls_cipher_texts = Rest, connection_states = ConnStates}};
 	#alert{} = Alert ->
 	    {Alert, State}
-    end.
+    end;
+next_record(State) ->
+    {no_record, State}.
 
 next_record_if_active(State = 
 		      #state{socket_options = 
@@ -1856,14 +1913,22 @@ next_state_connection(StateName, #state{send_queue = Queue0,
 	    next_state_is_connection(State)
     end.
 
+%% In next_state_is_connection/1: clear tls_handshake_hashes,
+%% premaster_secret and public_key_info (only needed during handshake)
+%% to reduce memory foot print of a connection.
 next_state_is_connection(State = 
 		      #state{recv_during_renegotiation = true, socket_options = 
 			     #socket_options{active = false}})  -> 
-    passive_receive(State#state{recv_during_renegotiation = false}, connection);
+    passive_receive(State#state{recv_during_renegotiation = false,
+				premaster_secret = undefined,
+				public_key_info = undefined,
+				tls_handshake_hashes = {<<>>, <<>>}}, connection);
 
 next_state_is_connection(State0) ->
     {Record, State} = next_record_if_active(State0),
-    next_state(connection, Record, State).
+    next_state(connection, Record, State#state{premaster_secret = undefined,
+					       public_key_info = undefined,
+					       tls_handshake_hashes = {<<>>, <<>>}}).
 
 register_session(_, _, _, #session{is_resumable = true} = Session) ->
     Session; %% Already registered
@@ -2110,7 +2175,7 @@ renegotiate(#state{role = server,
 		   negotiated_version = Version,
 		   connection_states = ConnectionStates0} = State0) ->
     HelloRequest = ssl_handshake:hello_request(),
-    Frag = ssl_handshake:encode_handshake(HelloRequest, Version, undefined),
+    Frag = ssl_handshake:encode_handshake(HelloRequest, Version),
     Hs0 = ssl_handshake:init_hashes(),
     {BinMsg, ConnectionStates} = 
 	ssl_record:encode_handshake(Frag, Version, ConnectionStates0),
@@ -2130,10 +2195,23 @@ notify_renegotiater({true, From}) when not is_atom(From)  ->
 notify_renegotiater(_) ->
     ok.
 
-workaround_transport_delivery_problems(Socket, Transport) ->
+terminate_alert(Reason, Version, ConnectionStates) when Reason == normal; Reason == shutdown;
+							Reason == user_close ->
+    {BinAlert, _} = encode_alert(?ALERT_REC(?WARNING, ?CLOSE_NOTIFY),
+				 Version, ConnectionStates),
+    BinAlert;
+terminate_alert(_, Version, ConnectionStates) ->
+    {BinAlert, _} = encode_alert(?ALERT_REC(?FATAL, ?INTERNAL_ERROR),
+				 Version, ConnectionStates),
+    BinAlert.
+
+workaround_transport_delivery_problems(_,_, user_close) ->
+    ok;
+workaround_transport_delivery_problems(Socket, Transport, _) ->
     %% Standard trick to try to make sure all
     %% data sent to to tcp port is really sent
-    %% before tcp port is closed.
+    %% before tcp port is closed so that the peer will
+    %% get a correct error message.
     inet:setopts(Socket, [{active, false}]),
     Transport:shutdown(Socket, write),
     Transport:recv(Socket, 0).
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 454d726f0d..1f4c44d115 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -28,36 +28,34 @@
 -include("ssl_cipher.hrl").
 -include("ssl_alert.hrl").
 -include("ssl_internal.hrl").
--include("ssl_debug.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
--export([master_secret/4, client_hello/5, server_hello/4, hello/4,
-	 hello_request/0, certify/7, certificate/3, 
-	 client_certificate_verify/6, 
-	 certificate_verify/6, certificate_request/2,
-	 key_exchange/2, server_key_exchange_hash/2,  finished/4,
-	 verify_connection/5, 
-	 get_tls_handshake/4,
-	 server_hello_done/0, sig_alg/1,
-         encode_handshake/3, init_hashes/0, 
-         update_hashes/2, decrypt_premaster_secret/2]).
+-export([master_secret/4, client_hello/6, server_hello/4, hello/4,
+	 hello_request/0, certify/6, certificate/3,
+	 client_certificate_verify/5, certificate_verify/5,
+	 certificate_request/2, key_exchange/2, server_key_exchange_hash/2,
+	 finished/4, verify_connection/5, get_tls_handshake/2,
+	 decode_client_key/3, server_hello_done/0,
+	 encode_handshake/2, init_hashes/0, update_hashes/2,
+	 decrypt_premaster_secret/2]).
+
+-type tls_handshake() :: #client_hello{} | #server_hello{} |
+			 #server_hello_done{} | #certificate{} | #certificate_request{} |
+			 #client_key_exchange{} | #finished{} | #certificate_verify{} |
+			 #hello_request{}.
 
 %%====================================================================
 %% Internal application API
 %%====================================================================
 %%--------------------------------------------------------------------
-%% Function: client_hello(Host, Port, ConnectionStates, SslOpts) -> 
-%%                                                  #client_hello{} 
-%%      Host
-%%      Port
-%%      ConnectionStates = #connection_states{}
-%%      SslOpts = #ssl_options{}
+-spec client_hello(host(), port_num(), #connection_states{},
+		   #ssl_options{}, boolean(), der_cert()) -> #client_hello{}.
 %%
 %% Description: Creates a client hello message.
 %%--------------------------------------------------------------------
 client_hello(Host, Port, ConnectionStates, #ssl_options{versions = Versions,
-							ciphers = Ciphers} 
-	     = SslOpts, Renegotiation) ->
+							ciphers = UserSuites} 
+	     = SslOpts, Renegotiation, OwnCert) ->
     
     Fun = fun(Version) ->
 		  ssl_record:protocol_version(Version)
@@ -65,8 +63,9 @@ client_hello(Host, Port, ConnectionStates, #ssl_options{versions = Versions,
     Version = ssl_record:highest_protocol_version(lists:map(Fun, Versions)),
     Pending = ssl_record:pending_connection_state(ConnectionStates, read),
     SecParams = Pending#connection_state.security_parameters,
-   
-    Id = ssl_manager:client_session_id(Host, Port, SslOpts),
+    Ciphers = available_suites(UserSuites, Version),
+
+    Id = ssl_manager:client_session_id(Host, Port, SslOpts, OwnCert),
 
     #client_hello{session_id = Id, 
 		  client_version = Version,
@@ -78,13 +77,8 @@ client_hello(Host, Port, ConnectionStates, #ssl_options{versions = Versions,
 		 }.
 
 %%--------------------------------------------------------------------
-%% Function: server_hello(SessionId, Version, 
-%%                        ConnectionStates, Renegotiation) -> #server_hello{} 
-%%      SessionId
-%%      Version
-%%      ConnectionStates
-%%      Renegotiation 
-%%	
+-spec server_hello(session_id(), tls_version(), #connection_states{}, 
+		   boolean()) -> #server_hello{}.
 %%
 %% Description: Creates a server hello message.
 %%--------------------------------------------------------------------
@@ -102,7 +96,7 @@ server_hello(SessionId, Version, ConnectionStates, Renegotiation) ->
 		 }.
 
 %%--------------------------------------------------------------------
-%% Function: hello_request() -> #hello_request{} 
+-spec hello_request() -> #hello_request{}.
 %%
 %% Description: Creates a hello request message sent by server to 
 %% trigger renegotiation.
@@ -111,15 +105,12 @@ hello_request() ->
     #hello_request{}.
 
 %%--------------------------------------------------------------------
-%% Function: hello(Hello, Info, Renegotiation) -> 
-%%                                   {Version, Id, NewConnectionStates} |
-%%                                   #alert{}
-%%
-%%      Hello = #client_hello{} | #server_hello{}
-%%      Info = ConnectionStates | {Port, #ssl_options{}, Session, 
-%%                                 Cahce, CahceCb, ConnectionStates}
-%%      ConnectionStates = #connection_states{}
-%%      Renegotiation = boolean()
+-spec hello(#server_hello{} | #client_hello{}, #ssl_options{},
+ 	    #connection_states{} | {port_num(), #session{}, cache_ref(),
+ 				    atom(), #connection_states{}, binary()},
+ 	    boolean()) -> {tls_version(), session_id(), #connection_states{}}| 
+ 			  {tls_version(), {resumed | new, #session{}}, 
+ 			   #connection_states{}} | #alert{}.
 %%
 %% Description: Handles a recieved hello message
 %%--------------------------------------------------------------------
@@ -150,14 +141,14 @@ hello(#client_hello{client_version = ClientVersion, random = Random,
 		    renegotiation_info = Info} = Hello,
       #ssl_options{versions = Versions, 
 		   secure_renegotiate = SecureRenegotation} = SslOpts,
-      {Port, Session0, Cache, CacheCb, ConnectionStates0}, Renegotiation) ->
+      {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert}, Renegotiation) ->
     Version = select_version(ClientVersion, Versions),
     case ssl_record:is_acceptable_version(Version) of
 	true ->
 	    {Type, #session{cipher_suite = CipherSuite,
 			    compression_method = Compression} = Session} 
 		= select_session(Hello, Port, Session0, Version, 
-				 SslOpts, Cache, CacheCb),
+				 SslOpts, Cache, CacheCb, Cert),
 	    case CipherSuite of 
 		no_suite ->
 		    ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY);
@@ -182,71 +173,56 @@ hello(#client_hello{client_version = ClientVersion, random = Random,
     end.
 
 %%--------------------------------------------------------------------
-%% Function: certify(Certs, CertDbRef, MaxPathLen) ->
-%%                                 {PeerCert, PublicKeyInfo}  | #alert{}
-%%
-%%      Certs = #certificate{}
-%%	CertDbRef = reference()
-%%      MaxPathLen = integer() | nolimit
+-spec certify(#certificate{}, term(), integer() | nolimit,
+	      verify_peer | verify_none, {fun(), term},
+	      client | server) ->  {der_cert(), public_key_info()} | #alert{}.
 %%
 %% Description: Handles a certificate handshake message
 %%--------------------------------------------------------------------
-certify(#certificate{asn1_certificates = ASN1Certs}, CertDbRef, 
-	MaxPathLen, Verify, VerifyFun, ValidateFun, Role) -> 
+certify(#certificate{asn1_certificates = ASN1Certs}, CertDbRef,
+	MaxPathLen, _Verify, VerifyFunAndState, Role) ->
     [PeerCert | _] = ASN1Certs,
-    VerifyBool =  verify_bool(Verify),
       
-    ValidateExtensionFun = 
-	case ValidateFun of
+    ValidationFunAndState =
+	case VerifyFunAndState of
 	    undefined ->
-		fun(Extensions, ValidationState, Verify0, AccError) ->
-			ssl_certificate:validate_extensions(Extensions, ValidationState,
-							   [], Verify0, AccError, Role)
-		end;
-	    Fun ->
-		fun(Extensions, ValidationState, Verify0, AccError) ->
-		 {NewExtensions, NewValidationState, NewAccError} 
-			    = ssl_certificate:validate_extensions(Extensions, ValidationState,
-								  [], Verify0, AccError, Role),
-			Fun(NewExtensions, NewValidationState, Verify0, NewAccError)
-		end
+		{fun(OtpCert, ExtensionOrError, SslState) ->
+			 ssl_certificate:validate_extension(OtpCert,
+							    ExtensionOrError, SslState)
+		 end, Role};
+	    {Fun, UserState0} ->
+		{fun(OtpCert, ExtensionOrError, {SslState, UserState}) ->
+			 case ssl_certificate:validate_extension(OtpCert,
+								 ExtensionOrError,
+								 SslState) of
+			     {valid, NewSslState} ->
+				 {valid, {NewSslState, UserState}};
+			     {fail, Reason} ->
+				 apply_user_fun(Fun, OtpCert, Reason, UserState,
+						SslState);
+			     {unknown, _} ->
+				 apply_user_fun(Fun, OtpCert,
+						ExtensionOrError, UserState, SslState)
+			 end
+		 end, {Role, UserState0}}
 	end,
-    try
-	%% Allow missing root_cert and check that with VerifyFun
-	ssl_certificate:trusted_cert_and_path(ASN1Certs, CertDbRef, false) of
-	{TrustedErlCert, CertPath, VerifyErrors} ->
-	    Result = public_key:pkix_path_validation(TrustedErlCert, 
-						     CertPath, 
-						     [{max_path_length, 
-						       MaxPathLen},
-						      {verify, VerifyBool},
-						      {validate_extensions_fun, 
-						       ValidateExtensionFun},
-						      {acc_errors, 
-						       VerifyErrors}]),
-	    case Result of
-		{error, Reason} ->
-		    path_validation_alert(Reason, Verify);
-		{ok, {PublicKeyInfo,_, []}} ->
-		    {PeerCert, PublicKeyInfo};
-		{ok, {PublicKeyInfo,_, AccErrors = [Error | _]}} ->
-		    case VerifyFun(AccErrors) of
-			true ->
-			    {PeerCert, PublicKeyInfo};
-			false ->
-			    path_validation_alert(Error, Verify)
-		    end
-	    end
-    catch 
-	throw:Alert ->
-	    Alert
+
+    {TrustedErlCert, CertPath}  =
+	ssl_certificate:trusted_cert_and_path(ASN1Certs, CertDbRef),
+
+    case public_key:pkix_path_validation(TrustedErlCert,
+					 CertPath,
+					 [{max_path_length,
+					   MaxPathLen},
+					  {verify_fun, ValidationFunAndState}]) of
+	{ok, {PublicKeyInfo,_}} ->
+	    {PeerCert, PublicKeyInfo};
+	{error, Reason} ->
+	    path_validation_alert(Reason)
     end.
-	    
+
 %%--------------------------------------------------------------------
-%% Function: certificate(OwnCert, CertDbRef, Role) -> #certificate{}
-%%
-%%      OwnCert = binary()
-%%      CertDbRef = term() as returned by ssl_certificate_db:create()
+-spec certificate(der_cert(), term(), client | server) -> #certificate{} | #alert{}. 
 %%
 %% Description: Creates a certificate message.
 %%--------------------------------------------------------------------
@@ -258,7 +234,7 @@ certificate(OwnCert, CertDbRef, client) ->
 	    {error, _} -> 
 		%% If no suitable certificate is available, the client
 		%% SHOULD send a certificate message containing no
-		%% certificates. (chapter 7.4.6. rfc 4346) 
+		%% certificates. (chapter 7.4.6. RFC 4346)
 		[]	 
 	end,
     #certificate{asn1_certificates = Chain};
@@ -272,18 +248,18 @@ certificate(OwnCert, CertDbRef, server) ->
     end.
 
 %%--------------------------------------------------------------------
-%% Function: client_certificate_verify(Cert, ConnectionStates) -> 
-%%                                          #certificate_verify{} | ignore
-%% Cert             = #'OTPcertificate'{}
-%% ConnectionStates = #connection_states{}
+-spec client_certificate_verify(undefined | der_cert(), binary(),
+				tls_version(), private_key(),
+				{{binary(), binary()},{binary(), binary()}}) ->  
+    #certificate_verify{} | ignore | #alert{}.
 %%
 %% Description: Creates a certificate_verify message, called by the client.
 %%--------------------------------------------------------------------
-client_certificate_verify(undefined, _, _, _, _, _) ->
+client_certificate_verify(undefined, _, _, _, _) ->
     ignore;
-client_certificate_verify(_, _, _, _, undefined, _) ->
+client_certificate_verify(_, _, _, undefined, _) ->
     ignore;
-client_certificate_verify(OwnCert, MasterSecret, Version, Algorithm,
+client_certificate_verify(OwnCert, MasterSecret, Version,
 			  PrivateKey, {Hashes0, _}) ->
     case public_key:pkix_is_fixed_dh_cert(OwnCert) of
 	true ->
@@ -291,37 +267,43 @@ client_certificate_verify(OwnCert, MasterSecret, Version, Algorithm,
 	false ->	    
 	    Hashes = 
 		calc_certificate_verify(Version, MasterSecret,
-					Algorithm, Hashes0), 
+					alg_oid(PrivateKey), Hashes0),
 	    Signed = digitally_signed(Hashes, PrivateKey),
 	    #certificate_verify{signature = Signed}
     end.
 
 %%--------------------------------------------------------------------
-%% Function: certificate_verify(Signature, PublicKeyInfo) -> valid | #alert{}
-%%
-%% Signature     = binary()
-%% PublicKeyInfo = {Algorithm, PublicKey, PublicKeyParams}
+-spec certificate_verify(binary(), public_key_info(), tls_version(),
+			 binary(), {_, {binary(), binary()}}) -> valid | #alert{}.
 %%
 %% Description: Checks that the certificate_verify message is valid.
 %%--------------------------------------------------------------------
-certificate_verify(Signature, {_, PublicKey, _}, Version, 
-		   MasterSecret, Algorithm, {_, Hashes0}) 
-  when Algorithm == rsa;
-       Algorithm == dhe_rsa ->
+certificate_verify(Signature, {?'rsaEncryption'= Algorithm, PublicKey, _}, Version,
+		   MasterSecret, {_, Hashes0}) ->
     Hashes = calc_certificate_verify(Version, MasterSecret,
 					   Algorithm, Hashes0),
-    case public_key:decrypt_public(Signature, PublicKey, 
+    case public_key:decrypt_public(Signature, PublicKey,
 				   [{rsa_pad, rsa_pkcs1_padding}]) of
 	Hashes ->
 	    valid;
 	_ ->
 	    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE)
+    end;
+certificate_verify(Signature, {?'id-dsa' = Algorithm, PublicKey, PublicKeyParams}, Version,
+		   MasterSecret, {_, Hashes0}) ->
+    Hashes = calc_certificate_verify(Version, MasterSecret,
+				     Algorithm, Hashes0),
+    case public_key:verify(Hashes, none, Signature, {PublicKey, PublicKeyParams}) of
+    	true ->
+    	    valid;
+    	false ->
+    	    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE)
     end.
-%% TODO dsa clause
+
 
 %%--------------------------------------------------------------------
-%% Function: certificate_request(ConnectionStates, CertDbRef) -> 
-%%                                                #certificate_request{}
+-spec certificate_request(#connection_states{}, certdb_ref()) -> 
+    #certificate_request{}.
 %%
 %% Description: Creates a certificate_request message, called by the server.
 %%--------------------------------------------------------------------
@@ -337,11 +319,12 @@ certificate_request(ConnectionStates, CertDbRef) ->
 		   }.
 
 %%--------------------------------------------------------------------
-%% Function: key_exchange(Role, Secret, Params) -> 
-%%                         #client_key_exchange{} | #server_key_exchange{}
-%%
-%%      Secret -
-%%      Params - 
+-spec key_exchange(client | server, 
+		   {premaster_secret, binary(), public_key_info()} |
+		   {dh, binary()} |
+		   {dh, {binary(), binary()}, #'DHParameter'{}, key_algo(),
+		   binary(), binary(), private_key()}) ->
+    #client_key_exchange{} | #server_key_exchange{}.
 %%
 %% Description: Creates a keyexchange message.
 %%--------------------------------------------------------------------
@@ -356,7 +339,7 @@ key_exchange(client, {dh, <<?UINT32(Len), PublicKey:Len/binary>>}) ->
 		dh_public = PublicKey}
 	       };
 
-key_exchange(server, {dh, {<<?UINT32(_), PublicKey/binary>>, _}, 
+key_exchange(server, {dh, {<<?UINT32(Len), PublicKey:Len/binary>>, _}, 
 		      #'DHParameter'{prime = P, base = G},
 		      KeyAlgo, ClientRandom, ServerRandom, PrivateKey}) ->
     <<?UINT32(_), PBin/binary>> = crypto:mpint(P),
@@ -365,28 +348,28 @@ key_exchange(server, {dh, {<<?UINT32(_), PublicKey/binary>>, _},
     GLen = byte_size(GBin),
     YLen = byte_size(PublicKey),
     ServerDHParams = #server_dh_params{dh_p = PBin, 
-				       dh_g = GBin, dh_y = PublicKey},
-    
-    Hash = 
-	server_key_exchange_hash(KeyAlgo, <<ClientRandom/binary, 
-					   ServerRandom/binary, 
-					   ?UINT16(PLen), PBin/binary, 
-					   ?UINT16(GLen), GBin/binary,
-					   ?UINT16(YLen), PublicKey/binary>>),
-    Signed = digitally_signed(Hash, PrivateKey),
-    #server_key_exchange{params = ServerDHParams,
-			 signed_params = Signed}.
+				       dh_g = GBin, dh_y = PublicKey},    
+
+    case KeyAlgo of
+	dh_anon ->
+	    #server_key_exchange{params = ServerDHParams,
+				 signed_params = <<>>};
+	_ ->
+	    Hash =
+		server_key_exchange_hash(KeyAlgo, <<ClientRandom/binary,
+						    ServerRandom/binary,
+						    ?UINT16(PLen), PBin/binary,
+						    ?UINT16(GLen), GBin/binary,
+						    ?UINT16(YLen), PublicKey/binary>>),
+	    Signed = digitally_signed(Hash, PrivateKey),
+	    #server_key_exchange{params = ServerDHParams,
+				 signed_params = Signed}
+    end.
 
 %%--------------------------------------------------------------------
-%% Function: master_secret(Version, Session/PremasterSecret, 
-%%                         ConnectionStates, Role) -> 
-%%                          {MasterSecret, NewConnectionStates} | #alert{}
-%%      Version = #protocol_version{}
-%%      Session = #session{} (session contains master secret)
-%%      PremasterSecret = binary()  
-%%      ConnectionStates = #connection_states{}
-%%      Role = client | server
-%%
+-spec master_secret(tls_version(), #session{} | binary(), #connection_states{},
+		   client | server) -> {binary(), #connection_states{}} | #alert{}.
+%%    
 %% Description: Sets or calculates the master secret and calculate keys,
 %% updating the pending connection states. The Mastersecret and the update
 %% connection states are returned or an alert if the calculation fails.
@@ -423,9 +406,8 @@ master_secret(Version, PremasterSecret, ConnectionStates, Role) ->
     end.
 
 %%--------------------------------------------------------------------
-%% Function: finished(Version, Role, MacSecret, Hashes) -> #finished{}
-%%
-%%      ConnectionStates = #connection_states{}
+-spec finished(tls_version(), client | server, binary(), {{binary(), binary()},_}) ->
+    #finished{}.
 %%
 %% Description: Creates a handshake finished message
 %%-------------------------------------------------------------------
@@ -434,15 +416,8 @@ finished(Version, Role, MasterSecret, {Hashes, _}) -> % use the current hashes
 	      calc_finished(Version, Role, MasterSecret, Hashes)}.
 
 %%--------------------------------------------------------------------
-%% Function: verify_connection(Finished, Role, 
-%%                             MasterSecret, Hashes) -> verified | #alert{}
-%% 
-%% Finished = #finished{}
-%% Role = client | server - the role of the process that sent the finished
-%% message.
-%% MasterSecret = binary()
-%% Hashes = binary() -  {md5_hash, sha_hash} 
-%%
+-spec verify_connection(tls_version(), #finished{}, client | server, binary(), 
+			{_, {binary(), binary()}}) -> verified | #alert{}.
 %%
 %% Description: Checks the ssl handshake finished message to verify
 %%              the connection.
@@ -450,92 +425,153 @@ finished(Version, Role, MasterSecret, {Hashes, _}) -> % use the current hashes
 verify_connection(Version, #finished{verify_data = Data}, 
 		  Role, MasterSecret, {_, {MD5, SHA}}) -> 
     %% use the previous hashes
-    ?DBG_HEX(crypto:md5_final(MD5)),
-    ?DBG_HEX(crypto:sha_final(SHA)),
     case calc_finished(Version, Role, MasterSecret, {MD5, SHA}) of
 	Data ->
 	    verified;
-	_E ->
- 	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
+	_ ->
+	    ?ALERT_REC(?FATAL, ?DECRYPT_ERROR)
     end.
-	    
+%%--------------------------------------------------------------------
+-spec server_hello_done() ->  #server_hello_done{}.
+%%     
+%% Description: Creates a server hello done message.
+%%--------------------------------------------------------------------	    
 server_hello_done() ->
     #server_hello_done{}.
 
 %%--------------------------------------------------------------------
-%% Function: encode_handshake(HandshakeRec) -> BinHandshake
-%% HandshakeRec = #client_hello | #server_hello{} | server_hello_done |
-%%              #certificate{} | #client_key_exchange{} | #finished{} |
-%%              #client_certify_request{}
+-spec encode_handshake(tls_handshake(), tls_version()) -> iolist().
 %%     
-%% encode a handshake packet to binary
+%% Description: Encode a handshake packet to binary
 %%--------------------------------------------------------------------
-encode_handshake(Package, Version, KeyAlg) ->
-    SigAlg = sig_alg(KeyAlg),
-    {MsgType, Bin} = enc_hs(Package, Version, SigAlg),
+encode_handshake(Package, Version) ->
+    {MsgType, Bin} = enc_hs(Package, Version),
     Len = byte_size(Bin),
     [MsgType, ?uint24(Len), Bin].
 
 %%--------------------------------------------------------------------
-%% Function: get_tls_handshake(Data, Buffer) -> Result
-%%      Result = {[#handshake{}], [Raw], NewBuffer}
-%%      Data = Buffer = NewBuffer = Raw = binary()
+-spec get_tls_handshake(binary(), binary() | iolist()) ->
+     {[tls_handshake()], binary()}.
 %%
 %% Description: Given buffered and new data from ssl_record, collects
-%% and returns it as a list of #handshake, also returns leftover
+%% and returns it as a list of handshake messages, also returns leftover
 %% data.
 %%--------------------------------------------------------------------
-get_tls_handshake(Data, <<>>, KeyAlg, Version) ->
-    get_tls_handshake_aux(Data, KeyAlg, Version, []);
-get_tls_handshake(Data, Buffer, KeyAlg, Version) ->
-    get_tls_handshake_aux(list_to_binary([Buffer, Data]), 
-			  KeyAlg, Version, []).
+get_tls_handshake(Data, <<>>) ->
+    get_tls_handshake_aux(Data, []);
+get_tls_handshake(Data, Buffer) ->
+    get_tls_handshake_aux(list_to_binary([Buffer, Data]), []).
 
-get_tls_handshake_aux(<<?BYTE(Type), ?UINT24(Length), 
-		       Body:Length/binary,Rest/binary>>, KeyAlg, 
-		      Version, Acc) ->
-    Raw = <<?BYTE(Type), ?UINT24(Length), Body/binary>>,
-    H = dec_hs(Type, Body, key_exchange_alg(KeyAlg), Version),
-    get_tls_handshake_aux(Rest, KeyAlg, Version, [{H,Raw} | Acc]);
-get_tls_handshake_aux(Data, _KeyAlg, _Version, Acc) ->
-    {lists:reverse(Acc), Data}.
+%%--------------------------------------------------------------------
+-spec decode_client_key(binary(), key_algo(), tls_version()) ->
+			    #encrypted_premaster_secret{} | #client_diffie_hellman_public{}.
+%%
+%% Description: Decode client_key data and return appropriate type
+%%--------------------------------------------------------------------
+decode_client_key(ClientKey, Type, Version) ->
+    dec_client_key(ClientKey, key_exchange_alg(Type), Version).
+
+%%--------------------------------------------------------------------
+-spec init_hashes() ->{{binary(), binary()}, {binary(), binary()}}.
+
+%%
+%% Description: Calls crypto hash (md5 and sha) init functions to
+%% initalize the hash context.
+%%--------------------------------------------------------------------
+init_hashes() ->
+    T = {crypto:md5_init(), crypto:sha_init()},
+    {T, T}.
+
+%%--------------------------------------------------------------------
+-spec update_hashes({{binary(), binary()}, {binary(), binary()}}, Data ::term()) ->
+			   {{binary(), binary()}, {binary(), binary()}}.
+%%
+%% Description: Calls crypto hash (md5 and sha) update functions to
+%% update the hash context with Data.
+%%--------------------------------------------------------------------
+update_hashes(Hashes, % special-case SSL2 client hello
+	      <<?CLIENT_HELLO, ?UINT24(_), ?BYTE(Major), ?BYTE(Minor),
+		?UINT16(CSLength), ?UINT16(0),
+		?UINT16(CDLength),
+	       CipherSuites:CSLength/binary,
+	       ChallengeData:CDLength/binary>>) ->
+    update_hashes(Hashes,
+		  <<?CLIENT_HELLO, ?BYTE(Major), ?BYTE(Minor),
+		   ?UINT16(CSLength), ?UINT16(0),
+		   ?UINT16(CDLength),
+		   CipherSuites:CSLength/binary,
+		   ChallengeData:CDLength/binary>>);
+update_hashes({{MD50, SHA0}, _Prev}, Data) ->
+    {MD51, SHA1} = {crypto:md5_update(MD50, Data),
+		    crypto:sha_update(SHA0, Data)},
+    {{MD51, SHA1}, {MD50, SHA0}}.
+
+%%--------------------------------------------------------------------
+-spec decrypt_premaster_secret(binary(), #'RSAPrivateKey'{}) -> binary().
+
+%%
+%% Description: Public key decryption using the private key.
+%%--------------------------------------------------------------------
+decrypt_premaster_secret(Secret, RSAPrivateKey) ->
+    try public_key:decrypt_private(Secret, RSAPrivateKey,
+				   [{rsa_pad, rsa_pkcs1_padding}])
+    catch
+	_:_ ->
+	    throw(?ALERT_REC(?FATAL, ?DECRYPT_ERROR))
+    end.
+
+%%--------------------------------------------------------------------
+-spec server_key_exchange_hash(rsa | dhe_rsa| dhe_dss | dh_anon, binary()) -> binary().
+
+%%
+%% Description: Calculate server key exchange hash
+%%--------------------------------------------------------------------
+server_key_exchange_hash(Algorithm, Value) when Algorithm == rsa;
+						Algorithm == dhe_rsa ->
+    MD5 = crypto:md5(Value),
+    SHA =  crypto:sha(Value),
+    <<MD5/binary, SHA/binary>>;
+
+server_key_exchange_hash(dhe_dss, Value) ->
+    crypto:sha(Value).
 
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-verify_bool(verify_peer) ->
-    true;
-verify_bool(verify_none) ->
-    false.
+get_tls_handshake_aux(<<?BYTE(Type), ?UINT24(Length), 
+			Body:Length/binary,Rest/binary>>, Acc) ->
+    Raw = <<?BYTE(Type), ?UINT24(Length), Body/binary>>,
+    H = dec_hs(Type, Body),
+    get_tls_handshake_aux(Rest, [{H,Raw} | Acc]);
+get_tls_handshake_aux(Data, Acc) ->
+    {lists:reverse(Acc), Data}.
 
-path_validation_alert({bad_cert, cert_expired}, _) ->
+path_validation_alert({bad_cert, cert_expired}) ->
     ?ALERT_REC(?FATAL, ?CERTIFICATE_EXPIRED);
-path_validation_alert({bad_cert, invalid_issuer}, _) ->
+path_validation_alert({bad_cert, invalid_issuer}) ->
     ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
-path_validation_alert({bad_cert, invalid_signature} , _) ->
+path_validation_alert({bad_cert, invalid_signature}) ->
     ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
-path_validation_alert({bad_cert, name_not_permitted}, _) ->
+path_validation_alert({bad_cert, name_not_permitted}) ->
     ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
-path_validation_alert({bad_cert, unknown_critical_extension}, _) ->
+path_validation_alert({bad_cert, unknown_critical_extension}) ->
     ?ALERT_REC(?FATAL, ?UNSUPPORTED_CERTIFICATE);
-path_validation_alert({bad_cert, cert_revoked}, _) ->
+path_validation_alert({bad_cert, cert_revoked}) ->
     ?ALERT_REC(?FATAL, ?CERTIFICATE_REVOKED);
-path_validation_alert(_, _) ->
+path_validation_alert({bad_cert, selfsigned_peer}) ->
+    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
+path_validation_alert({bad_cert, unknown_ca}) ->
+     ?ALERT_REC(?FATAL, ?UNKNOWN_CA);
+path_validation_alert(_) ->
     ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE).
 
 select_session(Hello, Port, Session, Version, 
-	       #ssl_options{ciphers = UserSuites} = SslOpts, Cache, CacheCb) ->
+	       #ssl_options{ciphers = UserSuites} = SslOpts, Cache, CacheCb, Cert) ->
     SuggestedSessionId = Hello#client_hello.session_id,
     SessionId = ssl_manager:server_session_id(Port, SuggestedSessionId, 
-					      SslOpts),
+					      SslOpts, Cert),
     
-    Suites = case UserSuites of
-		 [] ->
-		     ssl_cipher:suites(Version);
-		 _ ->
-		   UserSuites
-	     end,
-
+    Suites = available_suites(Cert, UserSuites, Version), 
     case ssl_session:is_new(SuggestedSessionId, SessionId) of
         true ->
 	    CipherSuite = 
@@ -549,7 +585,17 @@ select_session(Hello, Port, Session, Version,
 	    {resumed, CacheCb:lookup(Cache, {Port, SessionId})}
     end.
 
+available_suites(UserSuites, Version) ->
+    case UserSuites of
+	[] ->
+	    ssl_cipher:suites(Version);
+	_ ->
+	    UserSuites
+    end.
 
+available_suites(ServerCert, UserSuites, Version) ->
+    ssl_cipher:filter(ServerCert, available_suites(UserSuites, Version)).
+ 
 cipher_suites(Suites, false) ->
     [?TLS_EMPTY_RENEGOTIATION_INFO_SCSV | Suites];
 cipher_suites(Suites, true) ->
@@ -728,8 +774,7 @@ master_secret(Version, MasterSecret, #security_parameters{
      ServerWriteKey, ClientIV, ServerIV} =
 	setup_keys(Version, MasterSecret, ServerRandom, 
 		   ClientRandom, HashSize, KML, EKML, IVS),
-    ?DBG_HEX(ClientWriteKey),
-    ?DBG_HEX(ClientIV),
+
     ConnStates1 = ssl_record:set_master_secret(MasterSecret, ConnectionStates),
     ConnStates2 =
 	ssl_record:set_mac_secret(ClientWriteMacSecret, ServerWriteMacSecret,
@@ -742,7 +787,7 @@ master_secret(Version, MasterSecret, #security_parameters{
 					 ServerCipherState, Role)}.
 
 
-dec_hs(?HELLO_REQUEST, <<>>, _, _) ->
+dec_hs(?HELLO_REQUEST, <<>>) ->
     #hello_request{};
 
 %% Client hello v2.
@@ -752,10 +797,7 @@ dec_hs(?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor),
 		       ?UINT16(CSLength), ?UINT16(0),
 		       ?UINT16(CDLength), 
 		       CipherSuites:CSLength/binary, 
-		       ChallengeData:CDLength/binary>>,
-       _, _) ->
-    ?DBG_HEX(CipherSuites),
-    ?DBG_HEX(CipherSuites),
+		       ChallengeData:CDLength/binary>>) ->
     #client_hello{client_version = {Major, Minor},
 		  random = ssl_ssl2:client_random(ChallengeData, CDLength),
 		  session_id = 0,
@@ -767,8 +809,7 @@ dec_hs(?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>>,
-       _, _) ->
+		       Extensions/binary>>) ->
     
     RenegotiationInfo = proplists:get_value(renegotiation_info, dec_hello_extensions(Extensions),
 					   undefined),    
@@ -783,7 +824,7 @@ dec_hs(?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 
 dec_hs(?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 		       ?BYTE(SID_length), Session_ID:SID_length/binary,
-		       Cipher_suite:2/binary, ?BYTE(Comp_method)>>, _, _) ->    
+		       Cipher_suite:2/binary, ?BYTE(Comp_method)>>) ->
     #server_hello{
 	server_version = {Major,Minor},
 	random = Random,
@@ -795,7 +836,7 @@ dec_hs(?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 dec_hs(?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>>, _, _) ->
+		       ?UINT16(ExtLen), Extensions:ExtLen/binary>>) ->
     
     RenegotiationInfo = proplists:get_value(renegotiation_info, dec_hello_extensions(Extensions, []),
 					   undefined),   
@@ -806,45 +847,49 @@ dec_hs(?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 	cipher_suite = Cipher_suite,
 	compression_method = Comp_method,
 	renegotiation_info = RenegotiationInfo};
-dec_hs(?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>, _, _) ->
+dec_hs(?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>) ->
     #certificate{asn1_certificates = certs_to_list(ASN1Certs)};
 
 dec_hs(?SERVER_KEY_EXCHANGE, <<?UINT16(PLen), P:PLen/binary,
 			      ?UINT16(GLen), G:GLen/binary,
 			      ?UINT16(YLen), Y:YLen/binary,
-			      ?UINT16(_), Sig/binary>>,
-       ?KEY_EXCHANGE_DIFFIE_HELLMAN, _) ->
+			       ?UINT16(0)>>) -> %% May happen if key_algorithm is dh_anon
+    #server_key_exchange{params = #server_dh_params{dh_p = P,dh_g = G,
+						    dh_y = Y},
+			 signed_params = <<>>};
+dec_hs(?SERVER_KEY_EXCHANGE, <<?UINT16(PLen), P:PLen/binary,
+			      ?UINT16(GLen), G:GLen/binary,
+			      ?UINT16(YLen), Y:YLen/binary,
+			      ?UINT16(Len), Sig:Len/binary>>) ->
     #server_key_exchange{params = #server_dh_params{dh_p = P,dh_g = G, 
 						    dh_y = Y},
 			 signed_params = Sig};
 dec_hs(?CERTIFICATE_REQUEST,
        <<?BYTE(CertTypesLen), CertTypes:CertTypesLen/binary,
-	?UINT16(CertAuthsLen), CertAuths:CertAuthsLen/binary>>, _, _) ->
-    %% TODO: maybe we should chop up CertAuths into a list?
+	?UINT16(CertAuthsLen), CertAuths:CertAuthsLen/binary>>) ->
     #certificate_request{certificate_types = CertTypes,
 			 certificate_authorities = CertAuths};
-dec_hs(?SERVER_HELLO_DONE, <<>>, _, _) ->
+dec_hs(?SERVER_HELLO_DONE, <<>>) ->
     #server_hello_done{};
-dec_hs(?CERTIFICATE_VERIFY,<<?UINT16(_), Signature/binary>>, _, _)->
+dec_hs(?CERTIFICATE_VERIFY,<<?UINT16(_), Signature/binary>>)->
     #certificate_verify{signature = Signature};
-dec_hs(?CLIENT_KEY_EXCHANGE, PKEPMS, ?KEY_EXCHANGE_RSA, {3, 0}) ->
-    PreSecret = #encrypted_premaster_secret{premaster_secret = PKEPMS},
-    #client_key_exchange{exchange_keys = PreSecret};
-dec_hs(?CLIENT_KEY_EXCHANGE, <<?UINT16(_), PKEPMS/binary>>, 
-       ?KEY_EXCHANGE_RSA, _) ->
-    PreSecret = #encrypted_premaster_secret{premaster_secret = PKEPMS},
-    #client_key_exchange{exchange_keys = PreSecret};
-dec_hs(?CLIENT_KEY_EXCHANGE, <<>>, ?KEY_EXCHANGE_DIFFIE_HELLMAN, _) -> 
-    throw(?ALERT_REC(?FATAL, ?UNSUPPORTED_CERTIFICATE));
-dec_hs(?CLIENT_KEY_EXCHANGE, <<?UINT16(DH_YLen), DH_Y:DH_YLen/binary>>,
-       ?KEY_EXCHANGE_DIFFIE_HELLMAN, _) ->
-    #client_key_exchange{exchange_keys = 
-			 #client_diffie_hellman_public{dh_public = DH_Y}};
-dec_hs(?FINISHED, VerifyData, _, _) ->
+dec_hs(?CLIENT_KEY_EXCHANGE, PKEPMS) ->
+    #client_key_exchange{exchange_keys = PKEPMS};
+dec_hs(?FINISHED, VerifyData) ->
     #finished{verify_data = VerifyData};
-dec_hs(_, _, _, _) ->
+dec_hs(_, _) ->
     throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)).
 
+dec_client_key(PKEPMS, ?KEY_EXCHANGE_RSA, {3, 0}) ->
+    #encrypted_premaster_secret{premaster_secret = PKEPMS};
+dec_client_key(<<?UINT16(_), PKEPMS/binary>>, ?KEY_EXCHANGE_RSA, _) ->
+    #encrypted_premaster_secret{premaster_secret = PKEPMS};
+dec_client_key(<<>>, ?KEY_EXCHANGE_DIFFIE_HELLMAN, _) ->
+    throw(?ALERT_REC(?FATAL, ?UNSUPPORTED_CERTIFICATE));
+dec_client_key(<<?UINT16(DH_YLen), DH_Y:DH_YLen/binary>>,
+	       ?KEY_EXCHANGE_DIFFIE_HELLMAN, _) ->
+    #client_diffie_hellman_public{dh_public = DH_Y}.
+
 dec_hello_extensions(<<>>) ->
     [];
 dec_hello_extensions(<<?UINT16(ExtLen), Extensions:ExtLen/binary>>) ->
@@ -882,14 +927,6 @@ encrypted_premaster_secret(Secret, RSAPublicKey) ->
 	    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE))
     end.
 
-decrypt_premaster_secret(Secret, RSAPrivateKey) ->
-    try public_key:decrypt_private(Secret, RSAPrivateKey,  
-				   [{rsa_pad, rsa_pkcs1_padding}])
-    catch
-	_:_ ->
-	    throw(?ALERT_REC(?FATAL, ?DECRYPTION_FAILED))
-    end.
-    
 %% encode/decode stream of certificate data to/from list of certificate data 
 certs_to_list(ASN1Certs) ->
     certs_to_list(ASN1Certs, []).
@@ -905,14 +942,14 @@ certs_from_list(ACList) ->
                         <<?UINT24(CertLen), Cert/binary>>
 		    end || Cert <- ACList]).
 
-enc_hs(#hello_request{}, _Version, _) ->
+enc_hs(#hello_request{}, _Version) ->
     {?HELLO_REQUEST, <<>>};
 enc_hs(#client_hello{client_version = {Major, Minor},
 		     random = Random,
 		     session_id = SessionID,
 		     cipher_suites = CipherSuites,
 		     compression_methods = CompMethods, 
-		     renegotiation_info = RenegotiationInfo}, _Version, _) ->
+		     renegotiation_info = RenegotiationInfo}, _Version) ->
     SIDLength = byte_size(SessionID),
     BinCompMethods = list_to_binary(CompMethods),
     CmLength = byte_size(BinCompMethods),
@@ -930,20 +967,20 @@ enc_hs(#server_hello{server_version = {Major, Minor},
 		     session_id = Session_ID,
 		     cipher_suite = Cipher_suite,
 		     compression_method = Comp_method,
-		     renegotiation_info = RenegotiationInfo}, _Version, _) ->
+		     renegotiation_info = RenegotiationInfo}, _Version) ->
     SID_length = byte_size(Session_ID),
     Extensions  = hello_extensions(RenegotiationInfo),
     ExtensionsBin = enc_hello_extensions(Extensions),
     {?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 		     ?BYTE(SID_length), Session_ID/binary,
                      Cipher_suite/binary, ?BYTE(Comp_method), ExtensionsBin/binary>>};
-enc_hs(#certificate{asn1_certificates = ASN1CertList}, _Version, _) ->
+enc_hs(#certificate{asn1_certificates = ASN1CertList}, _Version) ->
     ASN1Certs = certs_from_list(ASN1CertList),
     ACLen = erlang:iolist_size(ASN1Certs),
     {?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>};
 enc_hs(#server_key_exchange{params = #server_dh_params{
 			      dh_p = P, dh_g = G, dh_y = Y},
-	signed_params = SignedParams}, _Version, _) ->
+	signed_params = SignedParams}, _Version) ->
     PLen = byte_size(P),
     GLen = byte_size(G),
     YLen = byte_size(Y),
@@ -955,21 +992,21 @@ enc_hs(#server_key_exchange{params = #server_dh_params{
     };
 enc_hs(#certificate_request{certificate_types = CertTypes,
 			    certificate_authorities = CertAuths}, 
-       _Version, _) ->
+       _Version) ->
     CertTypesLen = byte_size(CertTypes),
     CertAuthsLen = byte_size(CertAuths),
     {?CERTIFICATE_REQUEST,
        <<?BYTE(CertTypesLen), CertTypes/binary,
 	?UINT16(CertAuthsLen), CertAuths/binary>>
     };
-enc_hs(#server_hello_done{}, _Version, _) ->
+enc_hs(#server_hello_done{}, _Version) ->
     {?SERVER_HELLO_DONE, <<>>};
-enc_hs(#client_key_exchange{exchange_keys = ExchangeKeys}, Version, _) ->
+enc_hs(#client_key_exchange{exchange_keys = ExchangeKeys}, Version) ->
     {?CLIENT_KEY_EXCHANGE, enc_cke(ExchangeKeys, Version)};
-enc_hs(#certificate_verify{signature = BinSig}, _, _) ->
+enc_hs(#certificate_verify{signature = BinSig}, _) ->
     EncSig = enc_bin_sig(BinSig),
     {?CERTIFICATE_VERIFY, EncSig};
-enc_hs(#finished{verify_data = VerifyData}, _Version, _) ->
+enc_hs(#finished{verify_data = VerifyData}, _Version) ->
     {?FINISHED, VerifyData}.
 
 enc_cke(#encrypted_premaster_secret{premaster_secret = PKEPMS},{3, 0}) ->
@@ -1008,29 +1045,6 @@ enc_hello_extensions([#renegotiation_info{renegotiated_connection = Info} | Rest
     Len = InfoLen +1,
     enc_hello_extensions(Rest, <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), ?BYTE(InfoLen), Info/binary, Acc/binary>>).
 
-init_hashes() ->
-    T = {crypto:md5_init(), crypto:sha_init()},
-    {T, T}.
-
-update_hashes(Hashes, % special-case SSL2 client hello
-	      <<?CLIENT_HELLO, ?UINT24(_), ?BYTE(Major), ?BYTE(Minor),
-	       ?UINT16(CSLength), ?UINT16(0),
-	       ?UINT16(CDLength), 
-	       CipherSuites:CSLength/binary, 
-	       ChallengeData:CDLength/binary>>) ->
-    update_hashes(Hashes,
-		  <<?CLIENT_HELLO, ?BYTE(Major), ?BYTE(Minor),
-		   ?UINT16(CSLength), ?UINT16(0),
-		   ?UINT16(CDLength), 
-		   CipherSuites:CSLength/binary, 
-		   ChallengeData:CDLength/binary>>);
-update_hashes({{MD50, SHA0}, _Prev}, Data) ->
-    ?DBG_HEX(Data),
-    {MD51, SHA1} = {crypto:md5_update(MD50, Data),
-		    crypto:sha_update(SHA0, Data)},
-    ?DBG_HEX(crypto:md5_final(MD51)),
-    ?DBG_HEX(crypto:sha_final(SHA1)),
-    {{MD51, SHA1}, {MD50, SHA0}}.
 
 from_3bytes(Bin3) ->
     from_3bytes(Bin3, []).
@@ -1061,9 +1075,10 @@ certificate_authorities(CertDbRef) ->
     Authorities = certificate_authorities_from_db(CertDbRef),
     Enc = fun(#'OTPCertificate'{tbsCertificate=TBSCert}) ->
 		  OTPSubj = TBSCert#'OTPTBSCertificate'.subject,
-		  Subj = public_key:pkix_transform(OTPSubj, encode),
-		  {ok, DNEncoded} = 'OTP-PUB-KEY':encode('Name', Subj),
-		  DNEncodedBin = iolist_to_binary(DNEncoded),
+		  DNEncodedBin = public_key:pkix_encode('Name', OTPSubj, otp),
+		  %%Subj = public_key:pkix_transform(OTPSubj, encode),
+		  %% {ok, DNEncoded} = 'OTP-PUB-KEY':encode('Name', Subj),
+		  %% DNEncodedBin = iolist_to_binary(DNEncoded),
 		  DNEncodedLen = byte_size(DNEncodedBin),
 		  <<?UINT16(DNEncodedLen), DNEncodedBin/binary>>
 	  end,
@@ -1083,13 +1098,12 @@ certificate_authorities_from_db(CertDbRef, PrevKey, Acc) ->
 	    certificate_authorities_from_db(CertDbRef, Key, Acc)
     end.
 
-digitally_signed(Hashes, #'RSAPrivateKey'{} = Key) ->
-    public_key:encrypt_private(Hashes, Key,
+digitally_signed(Hash, #'RSAPrivateKey'{} = Key) ->
+    public_key:encrypt_private(Hash, Key,
 			       [{rsa_pad, rsa_pkcs1_padding}]);
-digitally_signed(Hashes, #'DSAPrivateKey'{} = Key) ->
-    public_key:sign(Hashes, Key).
-
-
+digitally_signed(Hash, #'DSAPrivateKey'{} = Key) ->
+    public_key:sign(Hash, none, Key).
+    
 calc_master_secret({3,0}, PremasterSecret, ClientRandom, ServerRandom) ->
     ssl_ssl3:master_secret(PremasterSecret, ClientRandom, ServerRandom);
 
@@ -1119,33 +1133,6 @@ calc_certificate_verify({3, N}, _, Algorithm, Hashes)
   when  N == 1; N == 2 ->
     ssl_tls1:certificate_verify(Algorithm, Hashes).
 
-server_key_exchange_hash(Algorithm, Value) when Algorithm == rsa;
- 						Algorithm == dhe_rsa ->
-    MD5Context = crypto:md5_init(),
-    NewMD5Context = crypto:md5_update(MD5Context, Value),
-    MD5 = crypto:md5_final(NewMD5Context),
-    
-    SHAContext = crypto:sha_init(),
-    NewSHAContext = crypto:sha_update(SHAContext, Value),
-    SHA =  crypto:sha_final(NewSHAContext),
-
-    <<MD5/binary, SHA/binary>>;
-
-server_key_exchange_hash(dhe_dss, Value) ->
-    SHAContext = crypto:sha_init(),
-    NewSHAContext = crypto:sha_update(SHAContext, Value),
-    crypto:sha_final(NewSHAContext).
-
-
-sig_alg(dh_anon) ->
-    ?SIGNATURE_ANONYMOUS;
-sig_alg(Alg) when Alg == dhe_rsa; Alg == rsa ->
-    ?SIGNATURE_RSA;
-sig_alg(dhe_dss) ->
-    ?SIGNATURE_DSA;
-sig_alg(_) ->
-    ?NULL.
-
 key_exchange_alg(rsa) ->
     ?KEY_EXCHANGE_RSA;
 key_exchange_alg(Alg) when Alg == dhe_rsa; Alg == dhe_dss;
@@ -1153,3 +1140,18 @@ key_exchange_alg(Alg) when Alg == dhe_rsa; Alg == dhe_dss;
     ?KEY_EXCHANGE_DIFFIE_HELLMAN;
 key_exchange_alg(_) ->
     ?NULL.
+
+apply_user_fun(Fun, OtpCert, ExtensionOrError, UserState0, SslState) ->
+    case Fun(OtpCert, ExtensionOrError, UserState0) of
+	{valid, UserState} ->
+	    {valid, {SslState, UserState}};
+	{fail, _} = Fail ->
+	    Fail;
+	{unknown, UserState} ->
+	    {unknown, {SslState, UserState}}
+    end.
+
+alg_oid(#'RSAPrivateKey'{}) ->
+    ?'rsaEncryption';
+alg_oid(#'DSAPrivateKey'{}) ->
+    ?'id-dsa'.
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl
index 74fba3786c..8ae4d2332e 100644
--- a/lib/ssl/src/ssl_handshake.hrl
+++ b/lib/ssl/src/ssl_handshake.hrl
@@ -26,9 +26,17 @@
 -ifndef(ssl_handshake).
 -define(ssl_handshake, true).
 
+-include_lib("public_key/include/public_key.hrl").
+
+-type algo_oid()          :: ?'rsaEncryption' | ?'id-dsa'.
+-type public_key()        :: #'RSAPublicKey'{} | integer().
+-type public_key_params() :: #'Dss-Parms'{} | term().
+-type public_key_info()   :: {algo_oid(), public_key(), public_key_params()}.
+
 -record(session, {
 	  session_id,
 	  peer_certificate,
+	  own_certificate,
 	  compression_method,
 	  cipher_suite,
 	  master_secret,
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index fdc0c33750..715941e3ad 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -19,10 +19,29 @@
 
 %%
 
-
 -ifndef(ssl_internal).
 -define(ssl_internal, true).
 
+-include_lib("public_key/include/public_key.hrl"). 
+
+-type reason()            :: term().
+-type reply()             :: term().
+-type msg()               :: term().
+-type from()              :: term().
+-type host()		  :: string() | tuple().
+-type port_num()	  :: integer().
+-type session_id()        :: 0 | binary().
+-type tls_version()       :: {integer(), integer()}.
+-type tls_atom_version()  :: sslv3 | tlsv1.
+-type cache_ref()         :: term().
+-type certdb_ref()        :: term().
+-type key_algo()          :: null | rsa | dhe_rsa | dhe_dss | dh_anon.
+-type der_cert()          :: binary().
+-type private_key()       :: #'RSAPrivateKey'{} | #'DSAPrivateKey'{}.
+-type issuer()            :: tuple().
+-type serialnumber()      :: integer().
+-type cert_key()          :: {reference(), integer(), issuer()}.
+
 %% basic binary constructors
 -define(BOOLEAN(X),  X:8/unsigned-big-integer).
 -define(BYTE(X),     X:8/unsigned-big-integer).
@@ -61,10 +80,13 @@
 	  validate_extensions_fun, 
 	  depth,      % integer()
 	  certfile,   % file()
+	  cert,       % der_encoded()
 	  keyfile,    % file()
-	  key,	      % 
+	  key,	      % der_encoded()
 	  password,   % 
+	  cacerts,    % [der_encoded()]
 	  cacertfile, % file()
+	  dh,         % der_encoded()
 	  dhfile,     % file()
 	  ciphers,    % 
 	  %% Local policy for the server if it want's to reuse the session
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index 19bdcfa1f5..f845b1ecc0 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -24,10 +24,13 @@
 -module(ssl_manager).
 -behaviour(gen_server).
 
+-include("ssl_internal.hrl").
+
 %% Internal application API
--export([start_link/0, start_link/1, 
+-export([start_link/1, 
 	 connection_init/2, cache_pem_file/1,
-	 lookup_trusted_cert/3, issuer_candidate/1, client_session_id/3, server_session_id/3,
+	 lookup_trusted_cert/3, issuer_candidate/1, client_session_id/4,
+	 server_session_id/4,
 	 register_session/2, register_session/3, invalidate_session/2,
 	 invalidate_session/3]).
 
@@ -40,6 +43,7 @@
 
 -include("ssl_handshake.hrl").
 -include("ssl_internal.hrl").
+-include_lib("kernel/include/file.hrl").
 
 -record(state, {
 	  session_cache,
@@ -58,70 +62,84 @@
 %% API
 %%====================================================================
 %%--------------------------------------------------------------------
-%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+-spec start_link(list()) -> {ok, pid()} | ignore | {error, term()}.
+%%
 %% Description: Starts the server
 %%--------------------------------------------------------------------
-start_link() ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
 start_link(Opts) ->
     gen_server:start_link({local, ?MODULE}, ?MODULE, [Opts], []).
 
 %%--------------------------------------------------------------------
-%% Function: 
-%% Description: 
+-spec connection_init(string()| {der, list()}, client | server) -> {ok, reference(), cache_ref()}.
+%%			     
+%% Description: Do necessary initializations for a new connection.
 %%--------------------------------------------------------------------
-connection_init(TrustedcertsFile, Role) ->
-    call({connection_init, TrustedcertsFile, Role}).
-
-cache_pem_file(File) ->   
-    case ssl_certificate_db:lookup_cached_certs(File) of
-	[{_,Content}] ->
-	    {ok, Content};
-	[] ->
-	    call({cache_pem, File})
-    end.
-
+connection_init(Trustedcerts, Role) ->
+    call({connection_init, Trustedcerts, Role}).
+%%--------------------------------------------------------------------
+-spec cache_pem_file(string()) -> {ok, term()} | {error, reason()}.
+%%		    
+%% Description: Cach a pem file and return its content.
 %%--------------------------------------------------------------------
-%% Function: 
-%% Description: 
+cache_pem_file(File) ->
+    try file:read_file_info(File) of
+	{ok, #file_info{mtime = LastWrite}} ->
+	    cache_pem_file(File, LastWrite)
+    catch
+	_:Reason ->
+	    {error, Reason}
+    end.
 %%--------------------------------------------------------------------
+-spec lookup_trusted_cert(reference(), serialnumber(), issuer()) -> 
+				 undefined | 
+				 {ok, {der_cert(), #'OTPCertificate'{}}}.
+%%				 
+%% Description: Lookup the trusted cert with Key = {reference(),
+%% serialnumber(), issuer()}.
+%% --------------------------------------------------------------------
 lookup_trusted_cert(Ref, SerialNumber, Issuer) ->
     ssl_certificate_db:lookup_trusted_cert(Ref, SerialNumber, Issuer).
-
 %%--------------------------------------------------------------------
-%% Function: 
-%% Description: 
+-spec issuer_candidate(cert_key() | no_candidate) -> 
+			      {cert_key(), {der_cert(), #'OTPCertificate'{}}} | no_more_candidates.      
+%%
+%% Description: Return next issuer candidate.
 %%--------------------------------------------------------------------
 issuer_candidate(PrevCandidateKey) ->
     ssl_certificate_db:issuer_candidate(PrevCandidateKey).
-
 %%--------------------------------------------------------------------
-%% Function: 
-%% Description: 
+-spec client_session_id(host(), port_num(), #ssl_options{},
+			der_cert() | undefined) -> session_id().
+%%
+%% Description: Select a session id for the client.
 %%--------------------------------------------------------------------
-client_session_id(Host, Port, SslOpts) ->
-    call({client_session_id, Host, Port, SslOpts}).
-   
+client_session_id(Host, Port, SslOpts, OwnCert) ->
+    call({client_session_id, Host, Port, SslOpts, OwnCert}).
+
 %%--------------------------------------------------------------------
-%% Function: 
-%% Description: 
+-spec server_session_id(host(), port_num(), #ssl_options{}, der_cert()) -> session_id().
+%%
+%% Description: Select a session id for the server.
 %%--------------------------------------------------------------------
-server_session_id(Port, SuggestedSessionId, SslOpts) ->
-    call({server_session_id, Port, SuggestedSessionId, SslOpts}).
+server_session_id(Port, SuggestedSessionId, SslOpts, OwnCert) ->
+    call({server_session_id, Port, SuggestedSessionId, SslOpts, OwnCert}).
 
 %%--------------------------------------------------------------------
-%% Function: 
-%% Description: 
+-spec register_session(port_num(), #session{}) -> ok.
+-spec register_session(host(), port_num(), #session{}) -> ok.
+%%
+%% Description: Make the session available for reuse.
 %%--------------------------------------------------------------------
 register_session(Host, Port, Session) ->
     cast({register_session, Host, Port, Session}).
 
 register_session(Port, Session) ->
     cast({register_session, Port, Session}).
-
 %%--------------------------------------------------------------------
-%% Function: 
-%% Description: 
+-spec invalidate_session(port_num(), #session{}) -> ok.
+-spec invalidate_session(host(), port_num(), #session{}) -> ok.
+%%
+%% Description: Make the session unavilable for reuse.
 %%--------------------------------------------------------------------
 invalidate_session(Host, Port, Session) ->
     cast({invalidate_session, Host, Port, Session}).
@@ -134,10 +152,10 @@ invalidate_session(Port, Session) ->
 %%====================================================================
 
 %%--------------------------------------------------------------------
-%% Function: init(Args) -> {ok, State} |
-%%                         {ok, State, Timeout} |
-%%                         ignore               |
-%%                         {stop, Reason}
+-spec init(list()) -> {ok, #state{}}.
+%% Possible return values not used now. 
+%% |  {ok, #state{}, timeout()} | ignore | {stop, term()}.		  
+%%
 %% Description: Initiates the server
 %%--------------------------------------------------------------------
 init([Opts]) ->
@@ -156,12 +174,14 @@ init([Opts]) ->
 		session_validation_timer = Timer}}.
 
 %%--------------------------------------------------------------------
-%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
-%%                                      {reply, Reply, State, Timeout} |
-%%                                      {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, Reply, State} |
-%%                                      {stop, Reason, State}
+-spec handle_call(msg(), from(), #state{}) -> {reply, reply(), #state{}}. 
+%% Possible return values not used now.  
+%%					      {reply, reply(), #state{}, timeout()} |
+%%					      {noreply, #state{}} |
+%%					      {noreply, #state{}, timeout()} |
+%%					      {stop, reason(), reply(), #state{}} |
+%%					      {stop, reason(), #state{}}.
+%%
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
 handle_call({{connection_init, "", _Role}, Pid}, _From, 
@@ -170,13 +190,13 @@ handle_call({{connection_init, "", _Role}, Pid}, _From,
     Result = {ok, make_ref(), Cache},
     {reply, Result, State};
 
-handle_call({{connection_init, TrustedcertsFile, _Role}, Pid}, _From, 
+handle_call({{connection_init, Trustedcerts, _Role}, Pid}, _From,
 	    #state{certificate_db = Db,
 		   session_cache = Cache} = State) ->
     erlang:monitor(process, Pid),
     Result = 
 	try
-	    {ok, Ref} = ssl_certificate_db:add_trusted_certs(Pid, TrustedcertsFile, Db),
+	    {ok, Ref} = ssl_certificate_db:add_trusted_certs(Pid, Trustedcerts, Db),
 	    {ok, Ref, Cache}
 	catch
 	    _:Reason ->
@@ -184,32 +204,41 @@ handle_call({{connection_init, TrustedcertsFile, _Role}, Pid}, _From,
 	end,
     {reply, Result, State};
 
-handle_call({{client_session_id, Host, Port, SslOpts}, _}, _, 
+handle_call({{client_session_id, Host, Port, SslOpts, OwnCert}, _}, _,
 	    #state{session_cache = Cache,
 		  session_cache_cb = CacheCb} = State) ->
-    Id = ssl_session:id({Host, Port, SslOpts}, Cache, CacheCb),
+    Id = ssl_session:id({Host, Port, SslOpts}, Cache, CacheCb, OwnCert),
     {reply, Id, State};
 
-handle_call({{server_session_id, Port, SuggestedSessionId, SslOpts}, _},
+handle_call({{server_session_id, Port, SuggestedSessionId, SslOpts, OwnCert}, _},
 	    _, #state{session_cache_cb = CacheCb,
 		      session_cache = Cache,
 		      session_lifetime = LifeTime} = State) ->
     Id = ssl_session:id(Port, SuggestedSessionId, SslOpts,
-			Cache, CacheCb, LifeTime),
+			Cache, CacheCb, LifeTime, OwnCert),
     {reply, Id, State};
 
-handle_call({{cache_pem, File},Pid}, _, State = #state{certificate_db = Db}) ->
-    try ssl_certificate_db:cache_pem_file(Pid,File,Db) of
+handle_call({{cache_pem, File, LastWrite}, Pid}, _, 
+	    #state{certificate_db = Db} = State) ->
+    try ssl_certificate_db:cache_pem_file(Pid, File, LastWrite, Db) of
 	Result ->
 	    {reply, Result, State}
     catch 
 	_:Reason ->
 	    {reply, {error, Reason}, State}
-    end.
+    end;
+handle_call({{recache_pem, File, LastWrite}, Pid}, From,
+	    #state{certificate_db = Db} = State) ->
+    ssl_certificate_db:uncache_pem_file(File, Db),
+    cast({recache_pem, File, LastWrite, Pid, From}),
+    {noreply, State}.
+
 %%--------------------------------------------------------------------
-%% Function: handle_cast(Msg, State) -> {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, State}
+-spec  handle_cast(msg(), #state{}) -> {noreply, #state{}}.
+%% Possible return values not used now.  
+%%				      | {noreply, #state{}, timeout()} |
+%%				       {stop, reason(), #state{}}.
+%%
 %% Description: Handling cast messages
 %%--------------------------------------------------------------------
 handle_cast({register_session, Host, Port, Session}, 
@@ -240,12 +269,28 @@ handle_cast({invalidate_session, Port, #session{session_id = ID}},
 	    #state{session_cache = Cache,
 		   session_cache_cb = CacheCb} = State) ->
     CacheCb:delete(Cache, {Port, ID}),
-    {noreply, State}.
+    {noreply, State};
+
+handle_cast({recache_pem, File, LastWrite, Pid, From},
+	    #state{certificate_db = [_, FileToRefDb, _]} = State0) ->
+    case ssl_certificate_db:lookup(File, FileToRefDb) of
+	undefined ->
+	    {reply, Msg, State} = handle_call({{cache_pem, File, LastWrite}, Pid}, From, State0),
+	    gen_server:reply(From, Msg),
+	    {noreply, State};
+	_ -> %% Send message to self letting cleanup messages be handled
+	     %% first so that no reference to the old version of file
+             %% exists when we cache the new one.
+	    cast({recache_pem, File, LastWrite, Pid, From}),
+	    {noreply, State0}
+    end.
 
 %%--------------------------------------------------------------------
-%% Function: handle_info(Info, State) -> {noreply, State} |
-%%                                       {noreply, State, Timeout} |
-%%                                       {stop, Reason, State}
+-spec handle_info(msg(), #state{}) -> {noreply, #state{}}.
+%% Possible return values not used now.
+%%				      |{noreply, #state{}, timeout()} |
+%%				      {stop, reason(), #state{}}.
+%%
 %% Description: Handling all non call/cast messages
 %%-------------------------------------------------------------------- 
 handle_info(validate_sessions, #state{session_cache_cb = CacheCb,
@@ -265,12 +310,14 @@ handle_info({'EXIT', _, _}, State) ->
 handle_info({'DOWN', _Ref, _Type, _Pid, ecacertfile}, State) ->
     {noreply, State};
 
+handle_info({'DOWN', _Ref, _Type, Pid, shutdown}, State) ->
+    handle_info({remove_trusted_certs, Pid}, State);
 handle_info({'DOWN', _Ref, _Type, Pid, _Reason}, State) ->
     erlang:send_after(?CERTIFICATE_CACHE_CLEANUP, self(), 
 		      {remove_trusted_certs, Pid}),
     {noreply, State};
 handle_info({remove_trusted_certs, Pid}, 
-	    State = #state{certificate_db = Db}) ->
+	    #state{certificate_db = Db} = State) ->
     ssl_certificate_db:remove_trusted_certs(Pid, Db),
     {noreply, State};
 
@@ -278,7 +325,8 @@ handle_info(_Info, State) ->
     {noreply, State}.
 
 %%--------------------------------------------------------------------
-%% Function: terminate(Reason, State) -> void()
+-spec terminate(reason(), #state{}) -> term().
+%%		       
 %% Description: This function is called by a gen_server when it is about to
 %% terminate. It should be the opposite of Module:init/1 and do any necessary
 %% cleaning up. When it returns, the gen_server terminates with Reason.
@@ -294,7 +342,8 @@ terminate(_Reason, #state{certificate_db = Db,
     ok.
 
 %%--------------------------------------------------------------------
-%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
+-spec code_change(term(), #state{}, list()) -> {ok, #state{}}.			 
+%%
 %% Description: Convert process state when code is changed
 %%--------------------------------------------------------------------
 code_change(_OldVsn, State, _Extra) ->
@@ -339,4 +388,16 @@ session_validation({{{Host, Port}, _}, Session}, LifeTime) ->
 session_validation({{Port, _}, Session}, LifeTime) ->
     validate_session(Port, Session, LifeTime),
     LifeTime.
-    
+
+cache_pem_file(File, LastWrite) ->
+    case ssl_certificate_db:lookup_cached_certs(File) of
+	[{_, {Mtime, Content}}] ->
+	    case LastWrite of
+		Mtime ->
+		    {ok, Content};
+		_ ->
+		    call({recache_pem, File, LastWrite})
+	    end;
+	[] ->
+	    call({cache_pem, File, LastWrite})
+    end.
diff --git a/lib/ssl/src/ssl_pem.erl b/lib/ssl/src/ssl_pem.erl
deleted file mode 100644
index 0a1bf0f32a..0000000000
--- a/lib/ssl/src/ssl_pem.erl
+++ /dev/null
@@ -1,147 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. 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_pem).
-
-%%% Purpose: Reading and writing of PEM type encoded files for SSL.
-
-%% NB write_file/2 is only preliminary.
-
-%% PEM encoded files have the following structure:
-%%
-%%	<text>
-%%	-----BEGIN SOMETHING-----<CR><LF>
-%%	<Base64 encoding line><CR><LF>
-%%	<Base64 encoding line><CR><LF>
-%%	...
-%%	-----END SOMETHING-----<CR><LF>
-%%	<text>
-%%
-%% A file can contain several BEGIN/END blocks. Text lines between
-%% blocks are ignored.
-
--export([read_file/1, read_file/2, write_file/2]).
-
-%% Read a PEM file and return each decoding as a binary. 
-
-read_file(File) ->
-    read_file(File, no_passwd).
-
-read_file(File, Passwd) ->
-    {ok, Fd} = file:open(File, [read]),
-    Result = decode_file(Fd, Passwd),
-    file:close(Fd),
-    Result.
-
-decode_file(Fd, Passwd) ->
-    decode_file(Fd, [], [], notag, [Passwd]).
-
-decode_file(Fd, _RLs, Ens, notag, Info) ->
-    case io:get_line(Fd, "") of
-	"-----BEGIN CERTIFICATE REQUEST-----" ++ _ ->
-	    decode_file(Fd, [], Ens, cert_req, Info);
-	"-----BEGIN CERTIFICATE-----" ++ _ ->
-	    decode_file(Fd, [], Ens, cert, Info);
-	"-----BEGIN RSA PRIVATE KEY-----" ++ _ ->
-	    decode_file(Fd, [], Ens, rsa_private_key, Info);
-	eof ->
-	    {ok, lists:reverse(Ens)};
-	_ ->
-	    decode_file(Fd, [], Ens, notag, Info)
-    end;
-decode_file(Fd, RLs, Ens, Tag, Info0) ->
-    case io:get_line(Fd, "") of
-	"Proc-Type: 4,ENCRYPTED"++_ ->
-	    Info = dek_info(Fd, Info0),
-	    decode_file(Fd, RLs, Ens, Tag, Info);
-	"-----END" ++ _ ->			% XXX sloppy
-	    Cs = lists:flatten(lists:reverse(RLs)),
-	    Bin = ssl_base64:join_decode(Cs),
-	    case Info0 of
-		[Password, Cipher, SaltHex | Info1] ->
-		    Decoded = decode_key(Bin, Password, Cipher, unhex(SaltHex)),
-		    decode_file(Fd, [], [{Tag, Decoded}| Ens], notag, Info1);
-		_ ->
-		    decode_file(Fd, [], [{Tag, Bin}| Ens], notag, Info0)
-	    end;
-	eof ->
-	    {ok, lists:reverse(Ens)};
-	L ->
-	    decode_file(Fd, [L|RLs], Ens, Tag, Info0)
-    end.
-
-dek_info(Fd, Info) ->
-    Line = io:get_line(Fd, ""),
-    [_, DekInfo0] = string:tokens(Line, ": "),
-    DekInfo1 = string:tokens(DekInfo0, ",\n"), 
-    Info ++ DekInfo1.
-
-unhex(S) ->
-    unhex(S, []).
-
-unhex("", Acc) ->
-    lists:reverse(Acc);
-unhex([D1, D2 | Rest], Acc) ->
-    unhex(Rest, [erlang:list_to_integer([D1, D2], 16) | Acc]).
-
-decode_key(Data, Password, "DES-CBC", Salt) ->
-    Key = password_to_key(Password, Salt, 8),
-    IV = Salt,
-    crypto:des_cbc_decrypt(Key, IV, Data);
-decode_key(Data,  Password, "DES-EDE3-CBC", Salt) ->
-    Key = password_to_key(Password, Salt, 24),
-    IV = Salt,
-    <<Key1:8/binary, Key2:8/binary, Key3:8/binary>> = Key,
-    crypto:des_ede3_cbc_decrypt(Key1, Key2, Key3, IV, Data).
-
-write_file(File, Ds) ->
-    file:write_file(File, encode_file(Ds)).
-
-encode_file(Ds) ->
-    [encode_file_1(D) || D <- Ds].
-
-encode_file_1({cert, Bin}) -> 
-    %% PKIX (X.509)
-    ["-----BEGIN CERTIFICATE-----\n",
-     ssl_base64:encode_split(Bin),
-     "-----END CERTIFICATE-----\n\n"];
-encode_file_1({cert_req, Bin}) -> 
-    %% PKCS#10
-    ["-----BEGIN CERTIFICATE REQUEST-----\n",
-     ssl_base64:encode_split(Bin),
-     "-----END CERTIFICATE REQUEST-----\n\n"];
-encode_file_1({rsa_private_key, Bin}) -> 
-    %% PKCS#?
-    ["XXX Following key assumed not encrypted\n",
-     "-----BEGIN RSA PRIVATE KEY-----\n",
-     ssl_base64:encode_split(Bin),
-     "-----END RSA PRIVATE KEY-----\n\n"].
-
-password_to_key(Data, Salt, KeyLen) ->
-    <<Key:KeyLen/binary, _/binary>> = 
-	password_to_key(<<>>, Data, Salt, KeyLen, <<>>),
-    Key.
-
-password_to_key(_, _, _, Len, Acc) when Len =< 0 ->
-    Acc;
-password_to_key(Prev, Data, Salt, Len, Acc) ->
-    M = crypto:md5([Prev, Data, Salt]),
-    password_to_key(M, Data, Salt, Len - byte_size(M), <<Acc/binary, M/binary>>).
diff --git a/lib/ssl/src/ssl_pkix.erl b/lib/ssl/src/ssl_pkix.erl
deleted file mode 100644
index 8f540f74ad..0000000000
--- a/lib/ssl/src/ssl_pkix.erl
+++ /dev/null
@@ -1,307 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. 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%
-%%
-
-%%% Purpose : API module for decoding of certificates.
-
--module(ssl_pkix).
-
--include("ssl_pkix.hrl").
-
--export([decode_cert_file/1, decode_cert_file/2, 
-	 decode_cert/1, decode_cert/2, encode_cert/1, encoded_tbs_cert/1,
-	 signature_digest/1, decode_rsa_keyfile/2]).
-
-%% The public API is dprecated by public_key and
-%% the internal application API is no longer used ssl.
-%% So this file can be compleatly removed in  R14. 
--deprecated({decode_cert_file, 1, next_major_release}).
--deprecated({decode_cert_file, 2, next_major_release}).
--deprecated({decode_cert, 1, next_major_release}).
--deprecated({decode_cert, 2, next_major_release}).
-
-%%====================================================================
-%% API
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: decode_cert_file(File, <Opts>) -> {ok, Cert} | {ok, [Cert]}
-%%           
-%%  File = string() 
-%%  Opts = [Opt]    
-%%  Opt = pem | ssl | pkix - ssl and pkix are mutual exclusive
-%%  Cert = term()
-%%
-%% Description: Decodes certificats found in file <File>.
-%% If the options list is empty the certificate is
-%% returned as a DER encoded binary, i.e. {ok, Bin} is returned, where
-%% Bin> is the provided input. The options pkix and ssl imply that the
-%% certificate is returned as a parsed ASN.1 structure in the form of
-%% an Erlang term.  The ssl option gives a more elaborate return
-%% structure, with more explicit information. In particular object
-%% identifiers are replaced by atoms. The option subject implies that
-%% only the subject's distinguished name part of the certificate is
-%% returned. It can only be used together with the option pkix or the
-%% option ssl.
-%%--------------------------------------------------------------------
-decode_cert_file(File) ->
-    decode_cert_file(File, []).
-
-decode_cert_file(File, Opts) ->
-    case lists:member(pem, Opts) of
-	true -> 
-	    {ok, List} = ssl_pem:read_file(File),
-	    Certs = [Bin || {cert, Bin} <- List],
-	    NewOpts =  lists:delete(pem, Opts),
-	    Fun = fun(Cert) ->
-			  {ok, Decoded} = decode_cert(Cert, NewOpts),
-			  Decoded
-		  end,
-	    case lists:map(Fun, Certs) of
-		[DecodedCert] ->
-		    {ok, DecodedCert};
-		DecodedCerts ->
-		    {ok, DecodedCerts}
-	    end;
-	false  ->
-	    {ok, Bin} = file:read_file(File),
-	    decode_cert(Bin, Opts)
-    end.
-%%--------------------------------------------------------------------
-%% Function: decode_cert(Bin, <Opts>) -> {ok, Cert}
-%% Bin - binary()           
-%% Opts = [Opt]    
-%% Opt = ssl | pkix | subject - ssl and pkix are mutual exclusive      
-%% Cert = term()
-%% 
-%% Description: If the options list is empty the certificate is
-%% returned as a DER encoded binary, i.e. {ok, Bin} is returned, where
-%% Bin> is the provided input. The options pkix and ssl imply that the
-%% certificate is returned as a parsed ASN.1 structure in the form of
-%% an Erlang term.  The ssl option gives a more elaborate return
-%% structure, with more explicit information. In particular object
-%% identifiers are replaced by atoms. The option subject implies that
-%% only the subject's distinguished name part of the certificate is
-%% returned. It can only be used together with the option pkix or the
-%% option ssl.
-%%--------------------------------------------------------------------
-decode_cert(Bin) ->
-    decode_cert(Bin, []).
-
-decode_cert(Bin, []) when is_binary(Bin) ->
-    {ok, Bin};
-decode_cert(Bin, Opts) when is_binary(Bin) ->
-
-    {ok, Cert} = 'OTP-PKIX':decode('Certificate', Bin), 
-
-    case {lists:member(ssl, Opts), lists:member(pkix, Opts)} of
-	{true, false} ->
-	    cert_return(transform(Cert, ssl), Opts);
-	{false, true} ->
-	    cert_return(transform(Cert, pkix), Opts);
-	_ ->
-	    {error, eoptions} 
-    end.
-
-encode_cert(#'Certificate'{} = Cert) ->
-    {ok, List} = 'OTP-PKIX':encode('Certificate', Cert),
-    list_to_binary(List).
-
-decode_rsa_keyfile(KeyFile, Password) ->
-    {ok, List} = ssl_pem:read_file(KeyFile, Password),
-    [PrivatKey] = [Bin || {rsa_private_key, Bin} <- List],
-    'OTP-PKIX':decode('RSAPrivateKey', PrivatKey).
-
-%%====================================================================
-%%  Application internal API
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: encoded_tbs_cert(Cert) -> PKXCert 
-%%           
-%% Cert = binary() - Der encoded
-%% PKXCert = binary() - Der encoded
-%%      
-%% Description: Extracts the binary TBSCert from the binary Certificate.
-%%--------------------------------------------------------------------
-encoded_tbs_cert(Cert) ->
-    {ok, PKIXCert} = 
-	'OTP-PKIX':decode_TBSCert_exclusive(Cert),
-    {'Certificate',
-     {'Certificate_tbsCertificate', EncodedTBSCert}, _, _} = PKIXCert,
-    EncodedTBSCert.
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-
-cert_return(Cert, Opts) ->
-    case lists:member(subject, Opts) of
-	true ->
-	    {ok, get_subj(Cert)};
-	false  ->
-	    {ok, Cert}
-    end.  
-
-
-%% Transfrom from PKIX1-Explicit88 to SSL-PKIX. 
-
-transform(#'Certificate'{signature = Signature,
-			 signatureAlgorithm = SignatureAlgorithm,
-			 tbsCertificate = TbsCertificate} = Cert, Type) ->
-    Cert#'Certificate'{tbsCertificate = transform(TbsCertificate, Type),
-		       signatureAlgorithm = transform(SignatureAlgorithm, Type),
-		       signature = transform(Signature, Type)};
-
-%% -record('TBSCertificate',{
-%% version = asn1_DEFAULT, serialNumber, signature, issuer, validity, subject,
-%% subjectPublicKeyInfo, issuerUniqueID = asn1_NOVALUE, 
-%% subjectUniqueID = asn1_NOVALUE, extensions = asn1_NOVALUE}).
-
-transform(#'TBSCertificate'{signature = Signature, issuer = Issuer,
-			    subject = Subject, extensions = Extensions,
-			    subjectPublicKeyInfo = SPKInfo} = TBSCert, Type) ->
-    TBSCert#'TBSCertificate'{signature = transform(Signature, Type),
-			     issuer = transform(Issuer, Type),
-			     subject = transform(Subject, Type),
-			     subjectPublicKeyInfo = transform(SPKInfo, Type),
-			     extensions = transform_extensions(Extensions, Type)
-			    };
-
-transform(#'AlgorithmIdentifier'{algorithm = Algorithm, 
-				 parameters = Params}, ssl) ->
-    SignAlgAny = 
-	#'SignatureAlgorithm-Any'{algorithm = Algorithm, parameters = Params},
-    {ok, AnyEnc} = 'OTP-PKIX':encode('SignatureAlgorithm-Any', SignAlgAny),
-    {ok, SignAlgCd} =  'OTP-PKIX':decode('SignatureAlgorithm', 
-					list_to_binary(AnyEnc)),
-    NAlgo = ssl_pkix_oid:id2atom(SignAlgCd#'SignatureAlgorithm'.algorithm),
-    SignAlgCd#'SignatureAlgorithm'{algorithm = NAlgo};
-
-transform({rdnSequence, Lss}, Type) when is_list(Lss) ->
-    {rdnSequence, [[transform(L, Type) || L <- Ls] || Ls <- Lss]};
-transform({rdnSequence, Lss}, _) ->
-    {rdnSequence, Lss}; 
-
-transform(#'AttributeTypeAndValue'{} = ATAV, ssl) ->
-    {ok, ATAVEnc} = 
-	'OTP-PKIX':encode('AttributeTypeAndValue', ATAV),
-    {ok, ATAVDec} = 'OTP-PKIX':decode('SSLAttributeTypeAndValue', 
-				      list_to_binary(ATAVEnc)),
-    AttrType = ATAVDec#'SSLAttributeTypeAndValue'.type,
-    #'AttributeTypeAndValue'{type = ssl_pkix_oid:id2atom(AttrType),
-			     value =  
-			     ATAVDec#'SSLAttributeTypeAndValue'.value};
-
-transform(#'AttributeTypeAndValue'{} = Att, pkix) ->
-    Att;
-
-%% -record('SubjectPublicKeyInfo',{
-%% algorithm, subjectPublicKey}).
-%%
-%% -record('SubjectPublicKeyInfo_algorithm',{
-%% algo, parameters = asn1_NOVALUE}).
-%%
-%% -record('SubjectPublicKeyInfo-Any',{
-%% algorithm, subjectPublicKey}).
-%%
-%% -record('PublicKeyAlgorithm',{
-%% algorithm, parameters = asn1_NOVALUE}).
-
-transform(#'SubjectPublicKeyInfo'{subjectPublicKey = SubjectPublicKey,
-				  algorithm = Algorithm}, ssl)  ->
-    %% Transform from SubjectPublicKeyInfo (PKIX1Explicit88) 
-    %% to SubjectPublicKeyInfo-Any (SSL-PKIX). 
-    Algo = Algorithm#'AlgorithmIdentifier'.algorithm,
-    Parameters = Algorithm#'AlgorithmIdentifier'.parameters,
-    AlgorithmAny = #'PublicKeyAlgorithm'{algorithm = Algo, 
-					 parameters = Parameters},
-    {0, Bin} = SubjectPublicKey,
-    SInfoAny = #'SSLSubjectPublicKeyInfo-Any'{algorithm = AlgorithmAny,
-					    subjectPublicKey = Bin},
-
-    %% Encode according to SubjectPublicKeyInfo-Any, and decode according
-    %% to SubjectPublicKeyInfo. 
-    {ok, AnyEnc} = 
-	'OTP-PKIX':encode('SSLSubjectPublicKeyInfo-Any', SInfoAny),
-    {ok, SInfoCd} = 'OTP-PKIX':decode('SSLSubjectPublicKeyInfo', 
-				      list_to_binary(AnyEnc)),
-    %% Replace object identifier by atom
-    AlgorithmCd = SInfoCd#'SSLSubjectPublicKeyInfo'.algorithm,
-    AlgoCd = AlgorithmCd#'SSLSubjectPublicKeyInfo_algorithm'.algo, 
-    Params = AlgorithmCd#'SSLSubjectPublicKeyInfo_algorithm'.parameters,
-    Key = SInfoCd#'SSLSubjectPublicKeyInfo'.subjectPublicKey,
-    NAlgoCd = ssl_pkix_oid:id2atom(AlgoCd),
-    NAlgorithmCd = 
-	#'SubjectPublicKeyInfo_algorithm'{algorithm = NAlgoCd, 
-					  parameters = Params},
-    #'SubjectPublicKeyInfo'{algorithm = NAlgorithmCd,
-			    subjectPublicKey = Key
-			   };
-transform(#'SubjectPublicKeyInfo'{} = SInfo, pkix) ->
-    SInfo;
-
-transform(#'Extension'{extnID = ExtnID} = Ext, ssl) ->
-    NewExtID = ssl_pkix_oid:id2atom(ExtnID),
-    ExtAny = setelement(1, Ext, 'Extension-Any'),
-    {ok, AnyEnc} = 'OTP-PKIX':encode('Extension-Any', ExtAny),
-    {ok, ExtCd} =  'OTP-PKIX':decode('SSLExtension', list_to_binary(AnyEnc)),
-    
-    ExtValue = transform_extension_value(NewExtID, 
-					 ExtCd#'SSLExtension'.extnValue,
-					 ssl),
-    #'Extension'{extnID = NewExtID,
-		 critical = ExtCd#'SSLExtension'.critical,
-		 extnValue = ExtValue};
-
-transform(#'Extension'{extnID = ExtnID, extnValue = ExtnValue} = Ext, pkix) -> 
-    NewExtID = ssl_pkix_oid:id2atom(ExtnID),
-    ExtValue = transform_extension_value(NewExtID, ExtnValue, pkix),
-    Ext#'Extension'{extnValue = ExtValue};
-
-transform(#'AuthorityKeyIdentifier'{authorityCertIssuer = CertIssuer} = Ext,
-	  Type) ->
-    Ext#'AuthorityKeyIdentifier'{authorityCertIssuer = 
-				 transform(CertIssuer, Type)};
-
-transform([{directoryName, Value}], Type) ->
-     [{directoryName, transform(Value, Type)}];
-
-transform(X, _) ->
-    X.
-
-transform_extension_value('ce-authorityKeyIdentifier', Value, Type) ->
-    transform(Value, Type);
-transform_extension_value(_, Value, _) ->
-    Value.
-
-transform_extensions(Exts, Type) when is_list(Exts) ->
-    [transform(Ext, Type) || Ext <- Exts];
-transform_extensions(Exts, _) ->
-    Exts.
-
-get_subj(Cert) ->
-    (Cert#'Certificate'.tbsCertificate)#'TBSCertificate'.subject.
-
-signature_digest(BinSignature) ->
-    case (catch 'OTP-PKIX':decode('DigestInfo', BinSignature)) of
-	{ok, DigestInfo} ->
-	    list_to_binary(DigestInfo#'DigestInfo'.digest);
-	_ ->
-	    {error, decode_error}
-    end.
diff --git a/lib/ssl/src/ssl_pkix.hrl b/lib/ssl/src/ssl_pkix.hrl
deleted file mode 100644
index a8463369f6..0000000000
--- a/lib/ssl/src/ssl_pkix.hrl
+++ /dev/null
@@ -1,81 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. 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%
-%%
-
-%%
-
--ifndef(ssl_pkix).
--define(ssl_pkix, true).
-
--include("OTP-PKIX.hrl").
-
-%% The following commented out records are currently defined in OTP-PKIX.hrl
-%% and are considered a public interface through ssl_pkix.hrl.
-%% NOTE do not include OTP-PKIX.hrl it is an generated file
-%% and may change but the following records will still be
-%% availanble from this file.  
-
-% -record('Certificate', {
-% 	  tbsCertificate, 
-% 	  signatureAlgorithm, 
-% 	  signature}).
-
-% -record('TBSCertificate', {
-% 	  version = asn1_DEFAULT, 
-% 	  serialNumber, 
-% 	  signature, 
-% 	  issuer, 
-% 	  validity, 
-% 	  subject, 
-% 	  subjectPublicKeyInfo, 
-% 	  issuerUniqueID = asn1_NOVALUE, 
-% 	  subjectUniqueID = asn1_NOVALUE, 
-% 	  extensions = asn1_NOVALUE}).
-
-% -record('AttributeTypeAndValue', {
-% 	  type, 
-% 	  value}).
-
-% -record('SubjectPublicKeyInfo', {
-% 	  algorithm, 
-% 	  subjectPublicKey}).
-
--record('SubjectPublicKeyInfo_algorithm', {
- 	  algorithm, 
- 	  parameters = asn1_NOVALUE}).
-
-% -record('FieldID', {
-% 	  fieldType,
-% 	  parameters}).
-
-% -record('Characteristic-two', {
-% 	  m, 
-% 	  basis, 
-% 	  parameters}).
-
-% -record('ExtensionAttribute', {
-% 	  extensionAttributeType, 
-% 	  extensionAttributeValue}).
-
-% -record('Extension', {
-% 	  extnID, 
-% 	  critical = asn1_DEFAULT, 
-% 	  extnValue}).
-
--endif. % -ifdef(ssl_pkix).
-
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index 7c4b0ee959..f1c0073965 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -30,7 +30,6 @@
 -include("ssl_alert.hrl").
 -include("ssl_handshake.hrl").
 -include("ssl_cipher.hrl").
--include("ssl_debug.hrl").
 
 %% Connection state handling
 -export([init_connection_states/1, 
@@ -66,10 +65,9 @@
 %%====================================================================
 %% Internal application API
 %%====================================================================
+
 %%--------------------------------------------------------------------
-%% Function: init_connection_states(Role) -> #connection_states{} 
-%%	Role = client | server
-%%      Random = binary()
+-spec init_connection_states(client | server) -> #connection_states{}.
 %%
 %% Description: Creates a connection_states record with appropriate
 %% values for the initial SSL connection setup. 
@@ -85,9 +83,8 @@ init_connection_states(Role) ->
                       }.
 
 %%--------------------------------------------------------------------
-%% Function: current_connection_state(States, Type) -> #connection_state{}
-%%	States = #connection_states{}
-%%      Type = read | write
+-spec current_connection_state(#connection_states{}, read | write) ->
+				      #connection_state{}.
 %%
 %% Description: Returns the instance of the connection_state record
 %% that is currently defined as the current conection state.
@@ -100,9 +97,8 @@ current_connection_state(#connection_states{current_write = Current},
     Current.
 
 %%--------------------------------------------------------------------
-%% Function: pending_connection_state(States, Type) -> #connection_state{}
-%%	States = #connection_states{}
-%%      Type = read | write
+-spec pending_connection_state(#connection_states{}, read | write) ->
+				      #connection_state{}.
 %%
 %% Description: Returns the instance of the connection_state record
 %% that is currently defined as the pending conection state.
@@ -115,14 +111,11 @@ pending_connection_state(#connection_states{pending_write = Pending},
     Pending.
 
 %%--------------------------------------------------------------------
-%% Function: update_security_params(Params, States) -> 
-%%                                                     #connection_states{}
-%%      Params = #security_parameters{}
-%%	States = #connection_states{}
+-spec update_security_params(#security_parameters{}, #security_parameters{},
+			     #connection_states{}) -> #connection_states{}.
 %%
 %% Description: Creates a new instance of the connection_states record
-%% where the pending states gets its security parameters
-%% updated to <Params>.
+%% where the pending states gets its security parameters updated.
 %%--------------------------------------------------------------------  
 update_security_params(ReadParams, WriteParams, States = 
 		       #connection_states{pending_read = Read,
@@ -135,14 +128,10 @@ update_security_params(ReadParams, WriteParams, States =
                                                     WriteParams}
                             }.
 %%--------------------------------------------------------------------
-%% Function: set_mac_secret(ClientWriteMacSecret,
-%%                            ServerWriteMacSecret, Role, States) -> 
-%%                                       #connection_states{}
-%%      MacSecret = binary()
-%%	States = #connection_states{}
-%%	Role = server | client
+-spec set_mac_secret(binary(), binary(), client | server, 
+			#connection_states{}) -> #connection_states{}.			       
 %%
-%% update the mac_secret field in pending connection states
+%% Description: update the mac_secret field in pending connection states
 %%--------------------------------------------------------------------
 set_mac_secret(ClientWriteMacSecret, ServerWriteMacSecret, client, States) ->
     set_mac_secret(ServerWriteMacSecret, ClientWriteMacSecret, States);
@@ -159,12 +148,9 @@ set_mac_secret(ReadMacSecret, WriteMacSecret,
 
 
 %%--------------------------------------------------------------------
-%% Function: set_master_secret(MasterSecret, States) -> 
-%%                                                #connection_states{}
-%%      MacSecret = 
-%%	States = #connection_states{}
+-spec set_master_secret(binary(), #connection_states{}) -> #connection_states{}.
 %%
-%% Set master_secret in pending connection states
+%% Description: Set master_secret in pending connection states
 %%--------------------------------------------------------------------
 set_master_secret(MasterSecret,
                   States = #connection_states{pending_read = Read,
@@ -180,12 +166,9 @@ set_master_secret(MasterSecret,
     States#connection_states{pending_read = Read1, pending_write = Write1}.
 
 %%--------------------------------------------------------------------
-%% Function: set_renegotiation_flag(Flag, States) -> 
-%%                                                #connection_states{}
-%%      Flag = boolean()
-%%	States = #connection_states{}
+-spec set_renegotiation_flag(boolean(), #connection_states{}) -> #connection_states{}.
 %%
-%% Set master_secret in pending connection states
+%% Description: Set secure_renegotiation in pending connection states
 %%--------------------------------------------------------------------
 set_renegotiation_flag(Flag, #connection_states{
 			 current_read = CurrentRead0,
@@ -203,13 +186,11 @@ set_renegotiation_flag(Flag, #connection_states{
 				       pending_write = PendingWrite}.
 
 %%--------------------------------------------------------------------
-%% Function: set_client_verify_data(State, Data, States) -> 
-%%                                                #connection_states{}
-%%      State = atom()
-%%      Data = binary()
-%%	States = #connection_states{}
+-spec set_client_verify_data(current_read | current_write | current_both,
+			     binary(), #connection_states{})->
+				    #connection_states{}.
 %%
-%% Set verify data in connection states.                 
+%% Description: Set verify data in connection states.                 
 %%--------------------------------------------------------------------
 set_client_verify_data(current_read, Data, 
 		       #connection_states{current_read = CurrentRead0,
@@ -235,15 +216,12 @@ set_client_verify_data(current_both, Data,
     CurrentWrite = CurrentWrite0#connection_state{client_verify_data = Data},
     ConnectionStates#connection_states{current_read = CurrentRead,
 				       current_write = CurrentWrite}.
-
 %%--------------------------------------------------------------------
-%% Function: set_server_verify_data(State, Data, States) -> 
-%%                                                #connection_states{}
-%%      State = atom()
-%%      Data = binary()
-%%	States = #connection_states{}
+-spec set_server_verify_data(current_read | current_write | current_both,
+			     binary(), #connection_states{})->
+				    #connection_states{}.
 %%
-%% Set verify data in pending connection states.
+%% Description: Set verify data in pending connection states.
 %%--------------------------------------------------------------------
 set_server_verify_data(current_write, Data, 
 		       #connection_states{pending_read = PendingRead0,
@@ -273,10 +251,8 @@ set_server_verify_data(current_both, Data,
 				       current_write = CurrentWrite}.
 
 %%--------------------------------------------------------------------
-%% Function: activate_pending_connection_state(States, Type) -> 
-%%                                                   #connection_states{} 
-%%	States = #connection_states{}
-%%      Type = read | write
+-spec activate_pending_connection_state(#connection_states{}, read | write) ->
+					       #connection_states{}.
 %%
 %% Description: Creates a new instance of the connection_states record
 %% where the pending state of <Type> has been activated. 
@@ -308,11 +284,9 @@ activate_pending_connection_state(States =
                             }.
 
 %%--------------------------------------------------------------------
-%% Function: set_pending_cipher_state(States, ClientState, 
-%%                                    ServerState, Role) -> 
-%%                                                #connection_states{}
-%%       ClientState = ServerState = #cipher_state{}
-%%	 States = #connection_states{}
+-spec set_pending_cipher_state(#connection_states{}, #cipher_state{},
+			       #cipher_state{}, client | server) ->
+				      #connection_states{}.
 %%
 %% Description: Set the cipher state in the specified pending connection state.
 %%--------------------------------------------------------------------
@@ -331,12 +305,10 @@ set_pending_cipher_state(#connection_states{pending_read = Read,
         pending_write = Write#connection_state{cipher_state = ClientState}}.
 
 %%--------------------------------------------------------------------
-%% Function: get_tls_record(Data, Buffer) -> Result
-%%      Result = {[#tls_compressed{}], NewBuffer}
-%%      Data = Buffer = NewBuffer = binary()
-%%
-%% Description: given old buffer and new data from TCP, packs up a records
-%% and returns it as a list of #tls_compressed, also returns leftover
+-spec get_tls_records(binary(), binary()) -> {[binary()], binary()} | #alert{}.
+%%			     
+%% Description: Given old buffer and new data from TCP, packs up a records
+%% and returns it as a list of tls_compressed binaries also returns leftover
 %% data
 %%--------------------------------------------------------------------
 get_tls_records(Data, <<>>) ->
@@ -399,8 +371,8 @@ get_tls_records_aux(Data, Acc) ->
     {lists:reverse(Acc), Data}.
 
 %%--------------------------------------------------------------------
-%% Function: protocol_version(Version) -> #protocol_version{}
-%%     Version = atom()
+-spec protocol_version(tls_atom_version() | tls_version()) -> 
+			      tls_version() | tls_atom_version().		      
 %%     
 %% Description: Creates a protocol version record from a version atom
 %% or vice versa.
@@ -420,8 +392,7 @@ protocol_version({3, 1}) ->
 protocol_version({3, 0}) ->
     sslv3.
 %%--------------------------------------------------------------------
-%% Function: protocol_version(Version1, Version2) -> #protocol_version{}
-%%     Version1 = Version2 = #protocol_version{}
+-spec lowest_protocol_version(tls_version(), tls_version()) -> tls_version().
 %%     
 %% Description: Lowes protocol version of two given versions 
 %%--------------------------------------------------------------------
@@ -436,8 +407,7 @@ lowest_protocol_version(Version = {M,_},
 lowest_protocol_version(_,Version) ->
     Version.
 %%--------------------------------------------------------------------
-%% Function: protocol_version(Versions) -> #protocol_version{}
-%%     Versions = [#protocol_version{}]
+-spec highest_protocol_version([tls_version()]) -> tls_version().
 %%     
 %% Description: Highest protocol version present in a list
 %%--------------------------------------------------------------------
@@ -459,9 +429,8 @@ highest_protocol_version(_, [Version | Rest]) ->
     highest_protocol_version(Version, Rest).
 
 %%--------------------------------------------------------------------
-%% Function: supported_protocol_versions() -> Versions
-%%     Versions = [#protocol_version{}]
-%%     
+-spec supported_protocol_versions() -> [tls_version()].					 
+%%
 %% Description: Protocol versions supported
 %%--------------------------------------------------------------------
 supported_protocol_versions() ->
@@ -487,8 +456,7 @@ supported_protocol_versions([_|_] = Vsns) ->
     Vsns.
 
 %%--------------------------------------------------------------------
-%% Function: is_acceptable_version(Version) -> true | false
-%%     Version = #protocol_version{}
+-spec is_acceptable_version(tls_version()) -> boolean().
 %%     
 %% Description: ssl version 2 is not acceptable security risks are too big.
 %%--------------------------------------------------------------------
@@ -499,7 +467,7 @@ is_acceptable_version(_) ->
     false.
 
 %%--------------------------------------------------------------------
-%% Function: compressions() -> binary()
+-spec compressions() -> [binary()].
 %%     
 %% Description: return a list of compressions supported (currently none)
 %%--------------------------------------------------------------------
@@ -507,8 +475,8 @@ compressions() ->
     [?byte(?NULL)].
 
 %%--------------------------------------------------------------------
-%% Function: decode_cipher_text(CipherText, ConnectionStates0) -> 
-%%                                     {Plain, ConnectionStates}
+-spec decode_cipher_text(#ssl_tls{}, #connection_states{}) ->
+				{#ssl_tls{}, #connection_states{}}| #alert{}.
 %%     
 %% Description: Decode cipher text
 %%--------------------------------------------------------------------
@@ -528,6 +496,66 @@ decode_cipher_text(CipherText, ConnnectionStates0) ->
        #alert{} = Alert ->
 	   Alert
    end.
+%%--------------------------------------------------------------------
+-spec encode_data(iolist(), tls_version(), #connection_states{}, integer()) ->
+			 {iolist(), iolist(), #connection_states{}}.
+%%
+%% Description: Encodes data to send on the ssl-socket.
+%%--------------------------------------------------------------------
+encode_data(Frag, Version, ConnectionStates, RenegotiateAt)
+  when byte_size(Frag) < (?MAX_PLAIN_TEXT_LENGTH - 2048) ->
+    case encode_plain_text(?APPLICATION_DATA,Version,Frag,ConnectionStates, RenegotiateAt) of
+	{renegotiate, Data} ->
+	    {[], Data, ConnectionStates};
+	{Msg, CS} ->
+	    {Msg, [], CS}
+    end;
+
+encode_data(Frag, Version, ConnectionStates, RenegotiateAt) when is_binary(Frag) ->
+    Data = split_bin(Frag, ?MAX_PLAIN_TEXT_LENGTH - 2048),
+    encode_data(Data, Version, ConnectionStates, RenegotiateAt);
+
+encode_data(Data, Version, ConnectionStates0, RenegotiateAt) when is_list(Data) ->
+    {ConnectionStates, EncodedMsg, NotEncdedData} =
+        lists:foldl(fun(B, {CS0, Encoded, Rest}) ->
+			    case encode_plain_text(?APPLICATION_DATA,
+						   Version, B, CS0, RenegotiateAt) of
+				{renegotiate, NotEnc} ->
+				    {CS0, Encoded, [NotEnc | Rest]};
+				{Enc, CS1} ->
+				    {CS1, [Enc | Encoded], Rest}
+			    end
+		    end, {ConnectionStates0, [], []}, Data),
+    {lists:reverse(EncodedMsg), lists:reverse(NotEncdedData), ConnectionStates}.
+
+%%--------------------------------------------------------------------
+-spec encode_handshake(iolist(), tls_version(), #connection_states{}) ->
+			      {iolist(), #connection_states{}}.
+%%
+%% Description: Encodes a handshake message to send on the ssl-socket.
+%%--------------------------------------------------------------------
+encode_handshake(Frag, Version, ConnectionStates) ->
+    encode_plain_text(?HANDSHAKE, Version, Frag, ConnectionStates).
+
+%%--------------------------------------------------------------------
+-spec encode_alert_record(#alert{}, tls_version(), #connection_states{}) ->
+				 {iolist(), #connection_states{}}.
+%%
+%% Description: Encodes an alert message to send on the ssl-socket.
+%%--------------------------------------------------------------------
+encode_alert_record(#alert{level = Level, description = Description},
+                    Version, ConnectionStates) ->
+    encode_plain_text(?ALERT, Version, <<?BYTE(Level), ?BYTE(Description)>>,
+		      ConnectionStates).
+
+%%--------------------------------------------------------------------
+-spec encode_change_cipher_spec(tls_version(), #connection_states{}) ->
+				       {iolist(), #connection_states{}}.
+%%
+%% Description: Encodes a change_cipher_spec-message to send on the ssl socket.
+%%--------------------------------------------------------------------
+encode_change_cipher_spec(Version, ConnectionStates) ->
+    encode_plain_text(?CHANGE_CIPHER_SPEC, Version, <<1:8>>, ConnectionStates).
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -581,43 +609,6 @@ split_bin(Bin, ChunkSize, Acc) ->
             lists:reverse(Acc, [Bin])
     end.
 
-encode_data(Frag, Version, ConnectionStates, RenegotiateAt) 
-  when byte_size(Frag) < (?MAX_PLAIN_TEXT_LENGTH - 2048) -> 
-    case encode_plain_text(?APPLICATION_DATA,Version,Frag,ConnectionStates, RenegotiateAt) of
-	{renegotiate, Data} ->
-	    {[], Data, ConnectionStates};
-	{Msg, CS} ->
-	    {Msg, [], CS}
-    end;
-
-encode_data(Frag, Version, ConnectionStates, RenegotiateAt) when is_binary(Frag) ->
-    Data = split_bin(Frag, ?MAX_PLAIN_TEXT_LENGTH - 2048),
-    encode_data(Data, Version, ConnectionStates, RenegotiateAt);
-
-encode_data(Data, Version, ConnectionStates0, RenegotiateAt) when is_list(Data) ->
-    {ConnectionStates, EncodedMsg, NotEncdedData} = 
-        lists:foldl(fun(B, {CS0, Encoded, Rest}) ->
-			    case encode_plain_text(?APPLICATION_DATA,
-						   Version, B, CS0, RenegotiateAt) of
-				{renegotiate, NotEnc} ->
-				    {CS0, Encoded, [NotEnc | Rest]};
-				{Enc, CS1} ->
-				    {CS1, [Enc | Encoded], Rest}
-			    end 
-		    end, {ConnectionStates0, [], []}, Data),
-    {lists:reverse(EncodedMsg), lists:reverse(NotEncdedData), ConnectionStates}.
-
-encode_handshake(Frag, Version, ConnectionStates) ->
-    encode_plain_text(?HANDSHAKE, Version, Frag, ConnectionStates).
-
-encode_alert_record(#alert{level = Level, description = Description},
-                    Version, ConnectionStates) ->
-    encode_plain_text(?ALERT, Version, <<?BYTE(Level), ?BYTE(Description)>>, 
-		      ConnectionStates).
-
-encode_change_cipher_spec(Version, ConnectionStates) ->
-    encode_plain_text(?CHANGE_CIPHER_SPEC, Version, <<1:8>>, ConnectionStates).
-
 encode_plain_text(Type, Version, Data, ConnectionStates, RenegotiateAt) ->
     #connection_states{current_write = 
 		       #connection_state{sequence_number = Num}} = ConnectionStates,
@@ -657,9 +648,7 @@ cipher(Type, Version, Fragment, CS0) ->
 						      BCA}
 				}} = 
 	hash_and_bump_seqno(CS0, Type, Version, Length, Fragment),
-    ?DBG_HEX(Fragment),
     {Ciphered, CipherS1} = ssl_cipher:cipher(BCA, CipherS0, MacHash, Fragment),
-    ?DBG_HEX(Ciphered),
     CS2 = CS1#connection_state{cipher_state=CipherS1},
     {Ciphered, CS2}.
 
@@ -705,7 +694,6 @@ hash_and_bump_seqno(#connection_state{sequence_number = SeqNo,
 is_correct_mac(Mac, Mac) ->
     true;
 is_correct_mac(_M,_H) ->
-    io:format("Mac ~p ~n Hash: ~p~n",[_M, _H]),
     false.
 
 mac_hash({_,_}, ?NULL, _MacSecret, _SeqNo, _Type,
diff --git a/lib/ssl/src/ssl_session.erl b/lib/ssl/src/ssl_session.erl
index bcb10daf69..dc4b7a711c 100644
--- a/lib/ssl/src/ssl_session.erl
+++ b/lib/ssl/src/ssl_session.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -28,15 +28,14 @@
 -include("ssl_internal.hrl").
 
 %% Internal application API
--export([is_new/2, id/3, id/6, valid_session/2]).
+-export([is_new/2, id/4, id/7, valid_session/2]).
 
 -define(GEN_UNIQUE_ID_MAX_TRIES, 10).
 
+-type seconds()   :: integer(). 
+
 %%--------------------------------------------------------------------
-%% Function: is_new(ClientSuggestedId, ServerDecidedId) -> true | false
-%%
-%%      ClientSuggestedId = binary() 
-%%      ServerDecidedId = binary()
+-spec is_new(session_id(), session_id()) -> boolean().
 %%
 %% Description: Checks if the session id decided by the server is a
 %%              new or resumed sesion id.
@@ -45,23 +44,18 @@ is_new(<<>>, _) ->
     true;
 is_new(SessionId, SessionId) ->
     false;
-is_new(_, _) ->
+is_new(_ClientSuggestion, _ServerDecision) ->
     true.
 
 %%--------------------------------------------------------------------
-%% Function: id(ClientInfo, Cache, CacheCb) -> SessionId 
-%%
-%%      ClientInfo = {HostIP, Port, SslOpts}
-%%      HostIP = ipadress()
-%%      Port = integer() 
-%%      CacheCb = atom()
-%%      SessionId = binary()
+-spec id({host(), port_num(), #ssl_options{}}, cache_ref(), atom(),
+	 undefined | binary()) -> binary().
 %%
 %% Description: Should be called by the client side to get an id 
 %%              for the client hello message.
 %%--------------------------------------------------------------------
-id(ClientInfo, Cache, CacheCb) ->
-    case select_session(ClientInfo, Cache, CacheCb) of
+id(ClientInfo, Cache, CacheCb, OwnCert) ->
+    case select_session(ClientInfo, Cache, CacheCb, OwnCert) of
 	no_session ->
 	    <<>>;
 	SessionId ->
@@ -69,36 +63,27 @@ id(ClientInfo, Cache, CacheCb) ->
     end.
 
 %%--------------------------------------------------------------------
-%% Function: id(Port, SuggestedSessionId, ReuseFun, CacheCb,
-%%              SecondLifeTime) -> SessionId 
-%%
-%%      Port = integer() 
-%%      SuggestedSessionId = SessionId = binary()
-%%      ReuseFun = fun(SessionId, PeerCert, Compression, CipherSuite) -> 
-%%                                                             true | false 
-%%      CacheCb = atom()
+-spec id(port_num(), binary(), #ssl_options{}, cache_ref(), 
+	 atom(), seconds(), binary()) -> binary().
 %%
 %% Description: Should be called by the server side to get an id 
 %%              for the server hello message.
 %%--------------------------------------------------------------------
-id(Port, <<>>, _, Cache, CacheCb, _) ->
+id(Port, <<>>, _, Cache, CacheCb, _, _) ->
     new_id(Port, ?GEN_UNIQUE_ID_MAX_TRIES, Cache, CacheCb);
 
 id(Port, SuggestedSessionId, #ssl_options{reuse_sessions = ReuseEnabled,
 					  reuse_session = ReuseFun}, 
-   Cache, CacheCb, SecondLifeTime) ->
+   Cache, CacheCb, SecondLifeTime, OwnCert) ->
     case is_resumable(SuggestedSessionId, Port, ReuseEnabled, 
-		      ReuseFun, Cache, CacheCb, SecondLifeTime) of
+		      ReuseFun, Cache, CacheCb, SecondLifeTime, OwnCert) of
 	true ->
 	    SuggestedSessionId;
 	false ->
 	    new_id(Port, ?GEN_UNIQUE_ID_MAX_TRIES, Cache, CacheCb)
     end.
 %%--------------------------------------------------------------------
-%% Function: valid_session(Session, LifeTime) -> true | false 
-%%
-%%	Session  = #session{}
-%%      LifeTime = integer() - seconds
+-spec valid_session(#session{}, seconds()) -> boolean().
 %%
 %% Description: Check that the session has not expired
 %%--------------------------------------------------------------------
@@ -109,19 +94,20 @@ valid_session(#session{time_stamp = TimeStamp}, LifeTime) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-select_session({HostIP, Port, SslOpts}, Cache, CacheCb) ->    
+select_session({HostIP, Port, SslOpts}, Cache, CacheCb, OwnCert) ->
     Sessions = CacheCb:select_session(Cache, {HostIP, Port}),
-    select_session(Sessions, SslOpts).
+    select_session(Sessions, SslOpts, OwnCert).
 
-select_session([], _) ->
+select_session([], _, _) ->
     no_session;
 
 select_session(Sessions, #ssl_options{ciphers = Ciphers,
-				      reuse_sessions = ReuseSession}) ->
+				      reuse_sessions = ReuseSession}, OwnCert) ->
     IsResumable = 
  	fun(Session) -> 
  		ReuseSession andalso (Session#session.is_resumable) andalso  
  		    lists:member(Session#session.cipher_suite, Ciphers)
+		    andalso (OwnCert == Session#session.own_certificate)
  	end,
     case [Id || [Id, Session] <- Sessions, IsResumable(Session)] of
  	[] ->
@@ -129,7 +115,7 @@ select_session(Sessions, #ssl_options{ciphers = Ciphers,
  	List ->
  	    hd(List)
     end.
-	    
+
 %% If we can not 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
@@ -156,14 +142,16 @@ new_id(Port, Tries, Cache, CacheCb) ->
     end.
 
 is_resumable(SuggestedSessionId, Port, ReuseEnabled, ReuseFun, Cache, 
-	     CacheCb, SecondLifeTime) ->
+	     CacheCb, SecondLifeTime, OwnCert) ->
     case CacheCb:lookup(Cache, {Port, SuggestedSessionId}) of
 	#session{cipher_suite = CipherSuite,
+		 own_certificate = SessionOwnCert,
 		 compression_method = Compression,
 		 is_resumable = Is_resumable,
 		 peer_certificate = PeerCert} = Session ->
 	    ReuseEnabled 
 		andalso Is_resumable  
+		andalso (OwnCert == SessionOwnCert)
 		andalso valid_session(Session, SecondLifeTime) 
 		andalso ReuseFun(SuggestedSessionId, PeerCert, 
 				 Compression, CipherSuite);
diff --git a/lib/ssl/src/ssl_session_cache.erl b/lib/ssl/src/ssl_session_cache.erl
index 1f2d1fc7d3..823bf7acfa 100644
--- a/lib/ssl/src/ssl_session_cache.erl
+++ b/lib/ssl/src/ssl_session_cache.erl
@@ -22,13 +22,16 @@
 
 -behaviour(ssl_session_cache_api).
 
+-include("ssl_handshake.hrl").
+-include("ssl_internal.hrl").
+
 -export([init/1, terminate/1, lookup/2, update/3, delete/2, foldl/3, 
 	 select_session/2]). 
 
+-type key() :: {{host(), port_num()}, session_id()} |  {port_num(), session_id()}.
+
 %%--------------------------------------------------------------------
-%% Function: init() -> Cache  
-%%
-%%	Cache - Reference to the cash (opaque)    
+-spec init(list()) -> cache_ref(). %% Returns reference to the cache (opaque)    
 %%
 %% Description: Return table reference. Called by ssl_manager process. 
 %%--------------------------------------------------------------------
@@ -36,9 +39,7 @@ init(_) ->
     ets:new(cache_name(), [set, protected]).
 
 %%--------------------------------------------------------------------
-%% Function: terminate(Cache) -> 
-%%
-%%      Cache - as returned by create/0
+-spec terminate(cache_ref()) -> any(). %%    
 %%
 %% Description: Handles cache table at termination of ssl manager. 
 %%--------------------------------------------------------------------
@@ -46,9 +47,7 @@ terminate(Cache) ->
     ets:delete(Cache).
 
 %%--------------------------------------------------------------------
-%% Function: lookup(Cache, Key) -> Session | undefined   
-%%      Cache - as returned by create/0   
-%%      Session = #session{}
+-spec lookup(cache_ref(), key()) -> #session{} | undefined.
 %%
 %% Description: Looks up a cach entry. Should be callable from any
 %% process.
@@ -62,9 +61,7 @@ lookup(Cache, Key) ->
     end.
 
 %%--------------------------------------------------------------------
-%% Function: update(Cache, Key, Session) -> _
-%%      Cache - as returned by create/0
-%%      Session = #session{}
+-spec update(cache_ref(), key(), #session{}) -> any().
 %%
 %% Description: Caches a new session or updates a already cached one.
 %% Will only be called from the ssl_manager process.
@@ -73,11 +70,7 @@ update(Cache, Key, Session) ->
     ets:insert(Cache, {Key, Session}).
 
 %%--------------------------------------------------------------------
-%% Function: delete(Cache, HostIP, Port, Id) -> _
-%%      Cache - as returned by create/0   
-%%      HostIP =  Host = string() | ipadress()
-%%      Port =  integer()
-%%      Id = 
+-spec delete(cache_ref(), key()) -> any().
 %%
 %% Description: Delets a cache entry.
 %% Will only be called from the ssl_manager process.
@@ -86,28 +79,19 @@ delete(Cache, Key) ->
     ets:delete(Cache, Key).
 
 %%--------------------------------------------------------------------
-%% Function: foldl(Fun, Acc0, Cache) -> Acc
-%%   
-%%	Fun  - fun()
-%%      Acc0  - term()
-%%      Cache  - cache_ref()
-%%
+-spec foldl(fun(), term(), cache_ref()) -> term().
 %%
 %% Description: Calls Fun(Elem, AccIn) on successive elements of the
 %% cache, starting with AccIn == Acc0. Fun/2 must return a new
 %% accumulator which is passed to the next call. The function returns
-%% the final value of the accumulator. Acc0 is returned if the cache is
-%% empty. 
-%% Should be callable from any process
+%% the final value of the accumulator. Acc0 is returned if the cache
+%% is empty.Should be callable from any process
 %%--------------------------------------------------------------------
 foldl(Fun, Acc0, Cache) ->
     ets:foldl(Fun, Acc0, Cache).
   
 %%--------------------------------------------------------------------
-%% Function: select_session(Cache, PartialKey) -> [Sessions]
-%%
-%%     Cache - as returned by create/0   
-%%     PartialKey - opaque  Key = {PartialKey, SessionId}
+-spec select_session(cache_ref(), {host(), port_num()} | port_num()) -> [#session{}].
 %%
 %% Description: Selects a session that could be reused. Should be callable
 %% from any process.
@@ -119,6 +103,5 @@ select_session(Cache, PartialKey) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-
 cache_name() ->
     ssl_otp_session_cache.
diff --git a/lib/ssl/src/ssl_ssl3.erl b/lib/ssl/src/ssl_ssl3.erl
index 1bf8c2b458..f2926b2d2f 100644
--- a/lib/ssl/src/ssl_ssl3.erl
+++ b/lib/ssl/src/ssl_ssl3.erl
@@ -25,7 +25,6 @@
 -module(ssl_ssl3).
 
 -include("ssl_cipher.hrl").
--include("ssl_debug.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl"). 			% MD5 and SHA
 
@@ -38,10 +37,9 @@
 %% Internal application API
 %%====================================================================
 
+-spec master_secret(binary(), binary(), binary()) -> binary().
+
 master_secret(PremasterSecret, ClientRandom, ServerRandom) ->
-    ?DBG_HEX(PremasterSecret),
-    ?DBG_HEX(ClientRandom),
-    ?DBG_HEX(ServerRandom),
     %%  draft-ietf-tls-ssl-version3-00 - 6.2.2 
     %% key_block =
     %%   MD5(master_secret + SHA(`A' + master_secret +
@@ -53,9 +51,10 @@ master_secret(PremasterSecret, ClientRandom, ServerRandom) ->
     %%   MD5(master_secret + SHA(`CCC' + master_secret +
     %%                           ServerHello.random +
     %%                           ClientHello.random)) + [...];
-    B = generate_keyblock(PremasterSecret, ClientRandom, ServerRandom, 48),
-    ?DBG_HEX(B),
-    B.
+    Block = generate_keyblock(PremasterSecret, ClientRandom, ServerRandom, 48),
+    Block.
+
+-spec finished(client | server, binary(), {binary(), binary()}) -> binary().
 
 finished(Role, MasterSecret, {MD5Hash, SHAHash}) ->
    %%  draft-ietf-tls-ssl-version3-00 - 5.6.9 Finished
@@ -75,8 +74,9 @@ finished(Role, MasterSecret, {MD5Hash, SHAHash}) ->
     SHA = handshake_hash(?SHA, MasterSecret, Sender, SHAHash),
     <<MD5/binary, SHA/binary>>.
 
-certificate_verify(Algorithm, MasterSecret, {MD5Hash, SHAHash}) 
-  when Algorithm == rsa; Algorithm == dhe_rsa ->
+-spec certificate_verify(OID::tuple(), binary(), {binary(), binary()}) -> binary().
+
+certificate_verify(?'rsaEncryption', MasterSecret, {MD5Hash, SHAHash}) ->
      %% md5_hash
      %%           MD5(master_secret + pad_2 +
      %%               MD5(handshake_messages + master_secret + pad_1));
@@ -88,31 +88,30 @@ certificate_verify(Algorithm, MasterSecret, {MD5Hash, SHAHash})
     SHA = handshake_hash(?SHA, MasterSecret, undefined, SHAHash),
     <<MD5/binary, SHA/binary>>;
 
-certificate_verify(dhe_dss, MasterSecret, {_, SHAHash}) ->
+certificate_verify(?'id-dsa', MasterSecret, {_, SHAHash}) ->
      %% sha_hash
      %%           SHA(master_secret + pad_2 +
      %%               SHA(handshake_messages + master_secret + pad_1));
     handshake_hash(?SHA, MasterSecret, undefined, SHAHash).
 
+-spec mac_hash(integer(), binary(), integer(), integer(), integer(), binary()) -> binary(). 
+
 mac_hash(Method, Mac_write_secret, Seq_num, Type, Length, Fragment) ->
     %% draft-ietf-tls-ssl-version3-00 - 5.2.3.1 
     %% hash(MAC_write_secret + pad_2 +
     %%      hash(MAC_write_secret + pad_1 + seq_num +
     %%           SSLCompressed.type + SSLCompressed.length +
     %%           SSLCompressed.fragment));
-    case Method of
-        ?NULL -> ok;
-        _ ->
-	    ?DBG_HEX(Mac_write_secret),
-	    ?DBG_HEX(hash(Method, Fragment)),
-            ok
-    end,
     Mac = mac_hash(Method, Mac_write_secret, 
 		   [<<?UINT64(Seq_num), ?BYTE(Type), 
 		     ?UINT16(Length)>>, Fragment]),
-    ?DBG_HEX(Mac),
     Mac.
 
+-spec setup_keys(binary(), binary(), binary(),  
+		 integer(), integer(), term(), integer()) -> 
+			{binary(), binary(), binary(), 
+			 binary(), binary(), binary()}.  
+
 setup_keys(MasterSecret, ServerRandom, ClientRandom, HS, KML, _EKML, IVS) ->
     KeyBlock = generate_keyblock(MasterSecret, ServerRandom, ClientRandom,
 				 2*(HS+KML+IVS)),
@@ -127,32 +126,25 @@ setup_keys(MasterSecret, ServerRandom, ClientRandom, HS, KML, _EKML, IVS) ->
     <<ClientWriteMacSecret:HS/binary, ServerWriteMacSecret:HS/binary,
      ClientWriteKey:KML/binary, ServerWriteKey:KML/binary,
      ClientIV:IVS/binary, ServerIV:IVS/binary>> = KeyBlock,
-    ?DBG_HEX(ClientWriteMacSecret),
-    ?DBG_HEX(ServerWriteMacSecret),
-    ?DBG_HEX(ClientWriteKey),
-    ?DBG_HEX(ServerWriteKey),
-    ?DBG_HEX(ClientIV),
-    ?DBG_HEX(ServerIV),
     {ClientWriteMacSecret, ServerWriteMacSecret, ClientWriteKey,
      ServerWriteKey, ClientIV, ServerIV}.
 
+-spec suites() -> [cipher_suite()].
+
 suites() ->
     [ 
-      %% TODO: uncomment when supported
       ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
-      %%       ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
+      ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
       ?TLS_RSA_WITH_AES_256_CBC_SHA,
       ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
-      %%       ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
+      ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
       ?TLS_RSA_WITH_3DES_EDE_CBC_SHA,
       ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
-      %%       ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
+      ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
       ?TLS_RSA_WITH_AES_128_CBC_SHA,
-      %%?TLS_DHE_DSS_WITH_RC4_128_SHA, 
-      %% ?TLS_RSA_WITH_IDEA_CBC_SHA, Not supported: in later openssl version than OTP requires
+      %%?TLS_RSA_WITH_IDEA_CBC_SHA, 
       ?TLS_RSA_WITH_RC4_128_SHA,
       ?TLS_RSA_WITH_RC4_128_MD5,
-      %%?TLS_DHE_DSS_WITH_RC4_128_SHA,
       ?TLS_RSA_WITH_DES_CBC_SHA
      ].
 
diff --git a/lib/ssl/src/ssl_sup.erl b/lib/ssl/src/ssl_sup.erl
index b7cb5c3ab3..316ed8a4e9 100644
--- a/lib/ssl/src/ssl_sup.erl
+++ b/lib/ssl/src/ssl_sup.erl
@@ -32,14 +32,17 @@
 %%%=========================================================================
 %%%  API
 %%%=========================================================================
+
+-spec start_link() -> {ok, pid()} | ignore | {error, term()}.
+			
 start_link() ->
     supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 
 %%%=========================================================================
 %%%  Supervisor callback
 %%%=========================================================================
-%% init([]) -> {ok,  {SupFlags,  [ChildSpec]}}
-%%
+-spec init([]) -> {ok,  {SupFlags :: tuple(),  [ChildSpec :: tuple()]}}.
+
 init([]) ->    
     %% OLD ssl - moved start to ssl.erl only if old
     %% ssl is acctualy run!
diff --git a/lib/ssl/src/ssl_tls1.erl b/lib/ssl/src/ssl_tls1.erl
index 900b8e166d..5f9850c386 100644
--- a/lib/ssl/src/ssl_tls1.erl
+++ b/lib/ssl/src/ssl_tls1.erl
@@ -27,7 +27,6 @@
 -include("ssl_cipher.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl"). 			
--include("ssl_debug.hrl").
 
 -export([master_secret/3, finished/3, certificate_verify/2, mac_hash/7, 
 	 setup_keys/6, suites/0]).
@@ -36,6 +35,8 @@
 %% Internal application API
 %%====================================================================
 
+-spec master_secret(binary(), binary(), binary()) -> binary().
+
 master_secret(PreMasterSecret, ClientRandom, ServerRandom) ->
     %% RFC 2246 & 4346 - 8.1 %% master_secret = PRF(pre_master_secret,
     %%                           "master secret", ClientHello.random +
@@ -43,6 +44,8 @@ master_secret(PreMasterSecret, ClientRandom, ServerRandom) ->
     prf(PreMasterSecret, <<"master secret">>, 
 	[ClientRandom, ServerRandom], 48).
 
+-spec finished(client | server, binary(), {binary(), binary()}) -> binary().
+
 finished(Role, MasterSecret, {MD5Hash, SHAHash}) ->
     %% RFC 2246 & 4346 - 7.4.9. Finished
     %% struct {
@@ -56,16 +59,20 @@ finished(Role, MasterSecret, {MD5Hash, SHAHash}) ->
     SHA = hash_final(?SHA, SHAHash),
     prf(MasterSecret, finished_label(Role), [MD5, SHA], 12).
 
+-spec certificate_verify(OID::tuple(), {binary(), binary()}) -> binary().
 
-certificate_verify(Algorithm, {MD5Hash, SHAHash}) when Algorithm == rsa;
-						       Algorithm == dhe_rsa ->
+certificate_verify(?'rsaEncryption', {MD5Hash, SHAHash}) ->
     MD5 = hash_final(?MD5, MD5Hash),
     SHA = hash_final(?SHA, SHAHash),
     <<MD5/binary, SHA/binary>>;
 
-certificate_verify(dhe_dss, {_, SHAHash}) ->
+certificate_verify(?'id-dsa', {_, SHAHash}) ->
     hash_final(?SHA, SHAHash).
-    
+
+-spec setup_keys(binary(), binary(), binary(), integer(), 
+		 integer(), integer()) -> {binary(), binary(), binary(), 
+					  binary(), binary(), binary()}.  
+
 setup_keys(MasterSecret, ServerRandom, ClientRandom, HashSize,
 	   KeyMatLen, IVSize) ->
     %% RFC 2246 - 6.3. Key calculation
@@ -112,44 +119,38 @@ setup_keys(MasterSecret, ServerRandom, ClientRandom, HashSize,
 %%     {ClientWriteMacSecret, ServerWriteMacSecret, ClientWriteKey,
 %%      ServerWriteKey, undefined, undefined}.
 
+-spec mac_hash(integer(), binary(), integer(), integer(), tls_version(),
+	       integer(), binary()) -> binary(). 
+
 mac_hash(Method, Mac_write_secret, Seq_num, Type, {Major, Minor}, 
 	 Length, Fragment) ->
     %% RFC 2246 & 4346 - 6.2.3.1.
     %% HMAC_hash(MAC_write_secret, seq_num + TLSCompressed.type +
     %%              TLSCompressed.version + TLSCompressed.length +
     %%              TLSCompressed.fragment));
-    case Method of
-        ?NULL -> ok;
-        _ ->
-	    ?DBG_HEX(Mac_write_secret),
-	    ?DBG_HEX(hash(Method, Fragment)),
-            ok
-    end,
     Mac = hmac_hash(Method, Mac_write_secret, 
 		    [<<?UINT64(Seq_num), ?BYTE(Type), 
 		      ?BYTE(Major), ?BYTE(Minor), ?UINT16(Length)>>, 
 		     Fragment]),
-    ?DBG_HEX(Mac),
     Mac.
 
+-spec suites() -> [cipher_suite()].
+    
 suites() ->
     [ 
-      %% TODO: uncomment when supported
       ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
-      %%?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
+      ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
       ?TLS_RSA_WITH_AES_256_CBC_SHA,
       ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
-      %%?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
+      ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
       ?TLS_RSA_WITH_3DES_EDE_CBC_SHA,
       ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
-      %%?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
+      ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
       ?TLS_RSA_WITH_AES_128_CBC_SHA,
-      %%?TLS_DHE_DSS_WITH_RC4_128_SHA, 
       %%?TLS_RSA_WITH_IDEA_CBC_SHA,
       ?TLS_RSA_WITH_RC4_128_SHA,
       ?TLS_RSA_WITH_RC4_128_MD5,
       ?TLS_DHE_RSA_WITH_DES_CBC_SHA,
-      %%TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
       ?TLS_RSA_WITH_DES_CBC_SHA
      ].
 
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
index bd86120c98..823401c863 100644
--- a/lib/ssl/test/Makefile
+++ b/lib/ssl/test/Makefile
@@ -1,19 +1,19 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 1999-2010. 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%
 #
 
@@ -40,6 +40,7 @@ MODULES = \
 	ssl_packet_SUITE \
 	ssl_payload_SUITE \
 	ssl_to_openssl_SUITE \
+	ssl_session_cache_SUITE	\
 	ssl_test_MACHINE \
 	old_ssl_active_SUITE \
 	old_ssl_active_once_SUITE \
@@ -50,7 +51,8 @@ MODULES = \
 	old_ssl_protocol_SUITE \
 	old_transport_accept_SUITE \
 	old_ssl_dist_SUITE \
-	make_certs 
+	make_certs\
+	erl_make_certs
 
 
 ERL_FILES = $(MODULES:%=%.erl)
@@ -58,12 +60,10 @@ ERL_FILES = $(MODULES:%=%.erl)
 HRL_FILES = ssl_test_MACHINE.hrl 
 
 HRL_FILES_SRC = \
-	ssl_pkix.hrl \
 	ssl_alert.hrl \
 	ssl_handshake.hrl
 
-HRL_FILES_INC = \
-	OTP-PKIX.hrl
+HRL_FILES_INC = 
 
 HRL_FILES_NEEDED_IN_TEST = \
 	$(HRL_FILES_SRC:%=../src/%) \
@@ -126,7 +126,7 @@ release_spec: opt
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(HRL_FILES_NEEDED_IN_TEST) $(COVER_FILE) $(RELSYSDIR)
-	$(INSTALL_DATA) ssl.spec $(RELSYSDIR)
+	$(INSTALL_DATA) ssl.spec ssl.cover $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/ssl/test/erl_make_certs.erl b/lib/ssl/test/erl_make_certs.erl
new file mode 100644
index 0000000000..8b01ca3ad4
--- /dev/null
+++ b/lib/ssl/test/erl_make_certs.erl
@@ -0,0 +1,421 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+
+%% Create test certificates
+
+-module(erl_make_certs).
+-include_lib("public_key/include/public_key.hrl").
+
+-export([make_cert/1, gen_rsa/1, verify_signature/3, write_pem/3]).
+-compile(export_all).
+
+%%--------------------------------------------------------------------
+%% @doc  Create and return a der encoded certificate
+%%   Option                                         Default
+%%   -------------------------------------------------------
+%%   digest                                         sha1
+%%   validity                                       {date(), date() + week()}
+%%   version                                        3
+%%   subject                                        [] list of the following content
+%%      {name,  Name}
+%%      {email, Email} 
+%%      {city,  City}
+%%      {state, State}
+%%      {org, Org}
+%%      {org_unit, OrgUnit}
+%%      {country, Country} 
+%%      {serial, Serial}
+%%      {title, Title}
+%%      {dnQualifer, DnQ}
+%%   issuer = {Issuer, IssuerKey}                   true (i.e. a ca cert is created) 
+%%                                                  (obs IssuerKey migth be {Key, Password}
+%%   key = KeyFile|KeyBin|rsa|dsa                   Subject PublicKey rsa or dsa generates key
+%%   
+%%
+%%   (OBS: The generated keys are for testing only)
+%% @spec ([{::atom(), ::term()}]) -> {Cert::binary(), Key::binary()}
+%% @end
+%%--------------------------------------------------------------------
+
+make_cert(Opts) ->
+    SubjectPrivateKey = get_key(Opts),
+    {TBSCert, IssuerKey} = make_tbs(SubjectPrivateKey, Opts),
+    Cert = public_key:pkix_sign(TBSCert, IssuerKey),
+    true = verify_signature(Cert, IssuerKey, undef), %% verify that the keys where ok
+    {Cert, encode_key(SubjectPrivateKey)}.
+
+%%--------------------------------------------------------------------
+%% @doc Writes pem files in Dir with FileName ++ ".pem" and FileName ++ "_key.pem"
+%% @spec (::string(), ::string(), {Cert,Key}) -> ok
+%% @end
+%%--------------------------------------------------------------------
+write_pem(Dir, FileName, {Cert, Key = {_,_,not_encrypted}}) when is_binary(Cert) ->
+    ok = der_to_pem(filename:join(Dir, FileName ++ ".pem"),
+			       [{'Certificate', Cert, not_encrypted}]),
+    ok = der_to_pem(filename:join(Dir, FileName ++ "_key.pem"), [Key]).
+
+%%--------------------------------------------------------------------
+%% @doc Creates a rsa key (OBS: for testing only)
+%%   the size are in bytes
+%% @spec (::integer()) -> {::atom(), ::binary(), ::opaque()}
+%% @end
+%%--------------------------------------------------------------------
+gen_rsa(Size) when is_integer(Size) ->
+    Key = gen_rsa2(Size),
+    {Key, encode_key(Key)}.
+
+%%--------------------------------------------------------------------
+%% @doc Creates a dsa key (OBS: for testing only)
+%%   the sizes are in bytes
+%% @spec (::integer()) -> {::atom(), ::binary(), ::opaque()}
+%% @end
+%%--------------------------------------------------------------------
+gen_dsa(LSize,NSize) when is_integer(LSize), is_integer(NSize) ->
+    Key = gen_dsa2(LSize, NSize),
+    {Key, encode_key(Key)}.
+
+%%--------------------------------------------------------------------
+%% @doc Verifies cert signatures
+%% @spec (::binary(), ::tuple()) -> ::boolean()
+%% @end
+%%--------------------------------------------------------------------
+verify_signature(DerEncodedCert, DerKey, _KeyParams) ->
+    Key = decode_key(DerKey),
+    case Key of 
+	#'RSAPrivateKey'{modulus=Mod, publicExponent=Exp} ->
+	    public_key:pkix_verify(DerEncodedCert, 
+				   #'RSAPublicKey'{modulus=Mod, publicExponent=Exp});
+	#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y} ->
+	    public_key:pkix_verify(DerEncodedCert, {Y, #'Dss-Parms'{p=P, q=Q, g=G}})
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%% Implementation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+get_key(Opts) ->
+    case proplists:get_value(key, Opts) of
+	undefined -> make_key(rsa, Opts);
+	rsa ->       make_key(rsa, Opts);
+	dsa ->       make_key(dsa, Opts);
+	Key ->
+	    Password = proplists:get_value(password, Opts, no_passwd),
+	    decode_key(Key, Password)
+    end.
+
+decode_key({Key, Pw}) ->
+    decode_key(Key, Pw);
+decode_key(Key) ->
+    decode_key(Key, no_passwd).
+    
+
+decode_key(#'RSAPublicKey'{} = Key,_) ->
+    Key;
+decode_key(#'RSAPrivateKey'{} = Key,_) ->
+    Key;
+decode_key(#'DSAPrivateKey'{} = Key,_) ->
+    Key;
+decode_key(PemEntry = {_,_,_}, Pw) ->
+    public_key:pem_entry_decode(PemEntry, Pw);
+decode_key(PemBin, Pw) ->
+    [KeyInfo] = public_key:pem_decode(PemBin),
+    decode_key(KeyInfo, Pw).
+
+encode_key(Key = #'RSAPrivateKey'{}) ->
+    {ok, Der} = 'OTP-PUB-KEY':encode('RSAPrivateKey', Key),
+    {'RSAPrivateKey', list_to_binary(Der), not_encrypted};   
+encode_key(Key = #'DSAPrivateKey'{}) ->
+    {ok, Der} = 'OTP-PUB-KEY':encode('DSAPrivateKey', Key),
+    {'DSAPrivateKey', list_to_binary(Der), not_encrypted}.
+
+make_tbs(SubjectKey, Opts) ->    
+    Version = list_to_atom("v"++integer_to_list(proplists:get_value(version, Opts, 3))),
+
+    IssuerProp = proplists:get_value(issuer, Opts, true),
+    {Issuer, IssuerKey}  = issuer(IssuerProp, Opts, SubjectKey),
+
+    {Algo, Parameters} = sign_algorithm(IssuerKey, Opts),
+    
+    SignAlgo = #'SignatureAlgorithm'{algorithm  = Algo,
+				     parameters = Parameters},    
+    Subject = case IssuerProp of
+		  true -> %% Is a Root Ca
+		      Issuer;
+		  _ ->
+		      subject(proplists:get_value(subject, Opts),false)
+	      end,
+
+    {#'OTPTBSCertificate'{serialNumber = trunc(random:uniform()*100000000)*10000 + 1,
+			  signature    = SignAlgo,
+			  issuer       = Issuer,
+			  validity     = validity(Opts),
+			  subject      = Subject,
+			  subjectPublicKeyInfo = publickey(SubjectKey),
+			  version      = Version,
+			  extensions   = extensions(Opts)
+			 }, IssuerKey}.
+
+issuer(true, Opts, SubjectKey) ->
+    %% Self signed
+    {subject(proplists:get_value(subject, Opts), true), SubjectKey};
+issuer({Issuer, IssuerKey}, _Opts, _SubjectKey) when is_binary(Issuer) ->
+    {issuer_der(Issuer), decode_key(IssuerKey)};
+issuer({File, IssuerKey}, _Opts, _SubjectKey) when is_list(File) ->
+    {ok, [{cert, Cert, _}|_]} = public_key:pem_to_der(File),
+    {issuer_der(Cert), decode_key(IssuerKey)}.
+
+issuer_der(Issuer) ->
+    Decoded = public_key:pkix_decode_cert(Issuer, otp),
+    #'OTPCertificate'{tbsCertificate=Tbs} = Decoded,
+    #'OTPTBSCertificate'{subject=Subject} = Tbs,
+    Subject.
+
+subject(undefined, IsRootCA) ->
+    User = if IsRootCA -> "RootCA"; true -> os:getenv("USER") end,
+    Opts = [{email, User ++ "@erlang.org"},
+	    {name, User},
+	    {city, "Stockholm"},
+	    {country, "SE"},
+	    {org, "erlang"},
+	    {org_unit, "testing dep"}],
+    subject(Opts);
+subject(Opts, _) ->
+    subject(Opts).
+
+subject(SubjectOpts) when is_list(SubjectOpts) ->
+    Encode = fun(Opt) ->
+		     {Type,Value} = subject_enc(Opt),
+		     [#'AttributeTypeAndValue'{type=Type, value=Value}]
+	     end,
+    {rdnSequence, [Encode(Opt) || Opt <- SubjectOpts]}.
+
+%% Fill in the blanks
+subject_enc({name,  Name}) ->       {?'id-at-commonName', {printableString, Name}};
+subject_enc({email, Email}) ->      {?'id-emailAddress', Email};
+subject_enc({city,  City}) ->       {?'id-at-localityName', {printableString, City}};
+subject_enc({state, State}) ->      {?'id-at-stateOrProvinceName', {printableString, State}};
+subject_enc({org, Org}) ->          {?'id-at-organizationName', {printableString, Org}};
+subject_enc({org_unit, OrgUnit}) -> {?'id-at-organizationalUnitName', {printableString, OrgUnit}};
+subject_enc({country, Country}) ->  {?'id-at-countryName', Country};
+subject_enc({serial, Serial}) ->    {?'id-at-serialNumber', Serial};
+subject_enc({title, Title}) ->      {?'id-at-title', {printableString, Title}};
+subject_enc({dnQualifer, DnQ}) ->   {?'id-at-dnQualifier', DnQ};
+subject_enc(Other) ->               Other.
+
+
+extensions(Opts) ->
+    case proplists:get_value(extensions, Opts, []) of
+	false -> 
+	    asn1_NOVALUE;
+	Exts  -> 
+	    lists:flatten([extension(Ext) || Ext <- default_extensions(Exts)])
+    end.
+
+default_extensions(Exts) ->
+    Def = [{key_usage,undefined}, 
+	   {subject_altname, undefined},
+	   {issuer_altname, undefined},
+	   {basic_constraints, default},
+	   {name_constraints, undefined},
+	   {policy_constraints, undefined},
+	   {ext_key_usage, undefined},
+	   {inhibit_any, undefined},
+	   {auth_key_id, undefined},
+	   {subject_key_id, undefined},
+	   {policy_mapping, undefined}],
+    Filter = fun({Key, _}, D) -> lists:keydelete(Key, 1, D) end,
+    Exts ++ lists:foldl(Filter, Def, Exts).
+       	
+extension({_, undefined}) -> [];
+extension({basic_constraints, Data}) ->
+    case Data of
+	default ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = #'BasicConstraints'{cA=true},
+			 critical=true};
+	false -> 
+	    [];
+	Len when is_integer(Len) ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = #'BasicConstraints'{cA=true, pathLenConstraint=Len},
+			 critical=true};
+	_ ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = Data}
+    end;
+extension({Id, Data, Critical}) ->
+    #'Extension'{extnID = Id, extnValue = Data, critical = Critical}.
+
+
+publickey(#'RSAPrivateKey'{modulus=N, publicExponent=E}) ->
+    Public = #'RSAPublicKey'{modulus=N, publicExponent=E},
+    Algo = #'PublicKeyAlgorithm'{algorithm= ?rsaEncryption, parameters='NULL'},
+    #'OTPSubjectPublicKeyInfo'{algorithm = Algo,
+			       subjectPublicKey = Public};
+publickey(#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y}) ->
+    Algo = #'PublicKeyAlgorithm'{algorithm= ?'id-dsa', 
+				 parameters={params, #'Dss-Parms'{p=P, q=Q, g=G}}},
+    #'OTPSubjectPublicKeyInfo'{algorithm = Algo, subjectPublicKey = Y}.
+
+validity(Opts) ->
+    DefFrom0 = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())-1),
+    DefTo0   = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())+7),
+    {DefFrom, DefTo} = proplists:get_value(validity, Opts, {DefFrom0, DefTo0}),
+    Format = fun({Y,M,D}) -> lists:flatten(io_lib:format("~w~2..0w~2..0w000000Z",[Y,M,D])) end,
+    #'Validity'{notBefore={generalTime, Format(DefFrom)},
+		notAfter ={generalTime, Format(DefTo)}}.
+
+sign_algorithm(#'RSAPrivateKey'{}, Opts) ->
+    Type = case proplists:get_value(digest, Opts, sha1) of
+	       sha1 ->   ?'sha1WithRSAEncryption';
+	       sha512 -> ?'sha512WithRSAEncryption';
+	       sha384 -> ?'sha384WithRSAEncryption';
+	       sha256 -> ?'sha256WithRSAEncryption';
+	       md5    -> ?'md5WithRSAEncryption';
+	       md2    -> ?'md2WithRSAEncryption'
+	   end,
+    {Type, 'NULL'};
+sign_algorithm(#'DSAPrivateKey'{p=P, q=Q, g=G}, _Opts) ->
+    {?'id-dsa-with-sha1', {params,#'Dss-Parms'{p=P, q=Q, g=G}}}.
+
+make_key(rsa, _Opts) ->
+    %% (OBS: for testing only)
+    gen_rsa2(64);
+make_key(dsa, _Opts) ->
+    gen_dsa2(128, 20).  %% Bytes i.e. {1024, 160} 
+    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% RSA key generation  (OBS: for testing only)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(SMALL_PRIMES, [65537,97,89,83,79,73,71,67,61,59,53,
+		       47,43,41,37,31,29,23,19,17,13,11,7,5,3]).
+
+gen_rsa2(Size) ->
+    P = prime(Size),
+    Q = prime(Size),
+    N = P*Q,
+    Tot = (P - 1) * (Q - 1),
+    [E|_] = lists:dropwhile(fun(Candidate) -> (Tot rem Candidate) == 0 end, ?SMALL_PRIMES),
+    {D1,D2} = extended_gcd(E, Tot),
+    D = erlang:max(D1,D2),
+    case D < E of
+	true ->
+	    gen_rsa2(Size);
+	false ->
+	    {Co1,Co2} = extended_gcd(Q, P),
+	    Co = erlang:max(Co1,Co2),
+	    #'RSAPrivateKey'{version = 'two-prime',
+			     modulus = N,
+			     publicExponent  = E,
+			     privateExponent = D, 
+			     prime1 = P, 
+			     prime2 = Q, 
+			     exponent1 = D rem (P-1), 
+			     exponent2 = D rem (Q-1), 
+			     coefficient = Co
+			    }
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% DSA key generation  (OBS: for testing only)
+%% See http://en.wikipedia.org/wiki/Digital_Signature_Algorithm
+%% and the fips_186-3.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+gen_dsa2(LSize, NSize) ->
+    Q  = prime(NSize),  %% Choose N-bit prime Q
+    X0 = prime(LSize),
+    P0 = prime((LSize div 2) +1),
+    
+    %% Choose L-bit prime modulus P such that p–1 is a multiple of q.
+    case dsa_search(X0 div (2*Q*P0), P0, Q, 1000) of
+	error -> 
+	    gen_dsa2(LSize, NSize);
+	P ->	    
+	    G = crypto:mod_exp(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
+	    %%                 such that This may be done by setting g = h^(p–1)/q mod p, commonly h=2 is used.
+	    
+	    X = prime(20),               %% Choose x by some random method, where 0 < x < q.
+	    Y = crypto:mod_exp(G, X, P), %% Calculate y = g^x mod p.
+	    
+	    #'DSAPrivateKey'{version=0, p=P, q=Q, g=G, y=Y, x=X}
+    end.
+    
+%% See fips_186-3.pdf
+dsa_search(T, P0, Q, Iter) when Iter > 0 ->
+    P = 2*T*Q*P0 + 1,
+    case is_prime(crypto:mpint(P), 50) of
+	true -> P;
+	false -> dsa_search(T+1, P0, Q, Iter-1)
+    end;
+dsa_search(_,_,_,_) -> 
+    error.
+
+
+%%%%%%% Crypto Math %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+prime(ByteSize) ->
+    Rand = odd_rand(ByteSize),
+    crypto:erlint(prime_odd(Rand, 0)).
+
+prime_odd(Rand, N) ->
+    case is_prime(Rand, 50) of
+	true -> 
+	    Rand;
+	false -> 
+	    NotPrime = crypto:erlint(Rand),
+	    prime_odd(crypto:mpint(NotPrime+2), N+1)
+    end.
+
+%% see http://en.wikipedia.org/wiki/Fermat_primality_test
+is_prime(_, 0) -> true;
+is_prime(Candidate, Test) -> 
+    CoPrime = odd_rand(<<0,0,0,4, 10000:32>>, Candidate),
+    case crypto:mod_exp(CoPrime, Candidate, Candidate) of
+	CoPrime -> is_prime(Candidate, Test-1);
+	_       -> false
+    end.
+
+odd_rand(Size) ->
+    Min = 1 bsl (Size*8-1),
+    Max = (1 bsl (Size*8))-1,
+    odd_rand(crypto:mpint(Min), crypto:mpint(Max)).
+
+odd_rand(Min,Max) ->
+    Rand = <<Sz:32, _/binary>> = crypto:rand_uniform(Min,Max),
+    BitSkip = (Sz+4)*8-1,
+    case Rand of
+	Odd  = <<_:BitSkip,  1:1>> -> Odd;
+	Even = <<_:BitSkip,  0:1>> -> 
+	    crypto:mpint(crypto:erlint(Even)+1)
+    end.
+
+extended_gcd(A, B) ->
+    case A rem B of
+	0 ->
+	    {0, 1};
+	N ->
+	    {X, Y} = extended_gcd(B, N),
+	    {Y, X-Y*(A div B)}
+    end.
+
+pem_to_der(File) ->
+    {ok, PemBin} = file:read_file(File),
+    public_key:pem_decode(PemBin).
+
+der_to_pem(File, Entries) ->
+    PemBin = public_key:pem_encode(Entries),
+    file:write_file(File, PemBin).
diff --git a/lib/ssl/test/make_certs.erl b/lib/ssl/test/make_certs.erl
index 0cdf33c3e2..693289990c 100644
--- a/lib/ssl/test/make_certs.erl
+++ b/lib/ssl/test/make_certs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -90,8 +90,10 @@ enduser(Root, OpenSSLCmd, CA, User) ->
     KeyFile = filename:join([UsrRoot, "key.pem"]), 
     ReqFile =  filename:join([UsrRoot, "req.pem"]), 
     create_req(Root, OpenSSLCmd, CnfFile, KeyFile, ReqFile),
-    CertFile =  filename:join([UsrRoot, "cert.pem"]), 
-    sign_req(Root, OpenSSLCmd, CA, "user_cert", ReqFile, CertFile).
+    CertFileAllUsage =  filename:join([UsrRoot, "cert.pem"]),
+    sign_req(Root, OpenSSLCmd, CA, "user_cert", ReqFile, CertFileAllUsage),
+    CertFileDigitalSigOnly =  filename:join([UsrRoot, "digital_signature_only_cert.pem"]),
+    sign_req(Root, OpenSSLCmd, CA, "user_cert_digital_signature_only", ReqFile, CertFileDigitalSigOnly).
 
 collect_certs(Root, CAs, Users) ->
     Bins = lists:foldr(
@@ -255,6 +257,7 @@ ca_cnf(CA) ->
      "RANDFILE	        = $dir/private/RAND\n"
      "\n"
      "x509_extensions   = user_cert\n"
+     "unique_subject  = no\n"
      "default_days	= 3600\n"
      "default_md	= sha1\n"
      "preserve	        = no\n"
@@ -279,6 +282,15 @@ ca_cnf(CA) ->
      "issuerAltName	= issuer:copy\n"
      "\n"
 
+     "[user_cert_digital_signature_only]\n"
+     "basicConstraints	= CA:false\n"
+     "keyUsage 		= digitalSignature\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     "\n"
+
      "[ca_cert]\n"
      "basicConstraints 	= critical,CA:true\n"
      "keyUsage 		= cRLSign, keyCertSign\n"
diff --git a/lib/ssl/test/old_ssl_active_SUITE.erl b/lib/ssl/test/old_ssl_active_SUITE.erl
index 010596f351..a878c5af68 100644
--- a/lib/ssl/test/old_ssl_active_SUITE.erl
+++ b/lib/ssl/test/old_ssl_active_SUITE.erl
@@ -20,11 +20,10 @@
 %%
 -module(old_ssl_active_SUITE).
 
--export([all/1,
+-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,
-	 fin_per_testcase/2,
-	 config/1,
-	 finish/1,
+	 end_per_testcase/2,
 	 cinit_return_chkclose/1,
 	 sinit_return_chkclose/1,
 	 cinit_big_return_chkclose/1,
@@ -40,7 +39,7 @@
 -import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
 			   test_server_only/6]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ssl_test_MACHINE.hrl").
 
 -define(MANYCONNS, ssl_test_MACHINE:many_conns()).
@@ -49,33 +48,35 @@ init_per_testcase(_Case, Config) ->
     WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
     [{watchdog, WatchDog}| Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     WatchDog = ?config(watchdog, Config),
     test_server:timetrap_cancel(WatchDog).
 
-all(doc) ->
-    "Test of ssl.erl interface in active mode.";
-all(suite) ->
-    {conf, 
-     config,
-     [cinit_return_chkclose,
-      sinit_return_chkclose,
-      cinit_big_return_chkclose,
-      sinit_big_return_chkclose,
-      cinit_big_echo_chkclose,
-      cinit_huge_echo_chkclose,
-      sinit_big_echo_chkclose,
-      cinit_few_echo_chkclose,
-      cinit_many_echo_chkclose,
-      cinit_cnocert],
-     finish}.
-
-config(doc) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [cinit_return_chkclose, sinit_return_chkclose,
+     cinit_big_return_chkclose, sinit_big_return_chkclose,
+     cinit_big_echo_chkclose, cinit_huge_echo_chkclose,
+     sinit_big_echo_chkclose, cinit_few_echo_chkclose,
+     cinit_many_echo_chkclose, cinit_cnocert].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(doc) ->
     "Want to se what Config contains, and record the number of available "
 	"file descriptors";
-config(suite) ->
+init_per_suite(suite) ->
     [];
-config(Config) ->
+init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
     case os:type() of
 	{unix, _} ->
@@ -87,18 +88,25 @@ config(Config) ->
     %% operating system, version of OTP, Erts, kernel and stdlib. 
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
-
-finish(doc) ->
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto!"}
+    end.
+
+end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
-finish(suite) ->
+end_per_suite(suite) ->
     [];
-finish(Config) ->
+end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 cinit_return_chkclose(doc) ->
diff --git a/lib/ssl/test/old_ssl_active_once_SUITE.erl b/lib/ssl/test/old_ssl_active_once_SUITE.erl
index 6224b17aa7..b68ff6c66a 100644
--- a/lib/ssl/test/old_ssl_active_once_SUITE.erl
+++ b/lib/ssl/test/old_ssl_active_once_SUITE.erl
@@ -1,30 +1,29 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2002-2010. 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(old_ssl_active_once_SUITE).
 
--export([all/1,
+-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,
-	 fin_per_testcase/2,
-	 config/1,
-	 finish/1,
+	 end_per_testcase/2,
 	 server_accept_timeout/1,
 	 cinit_return_chkclose/1,
 	 sinit_return_chkclose/1,
@@ -40,7 +39,7 @@
 
 -import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
 			   test_server_only/6]).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ssl_test_MACHINE.hrl").
 
 -define(MANYCONNS, ssl_test_MACHINE:many_conns()).
@@ -49,48 +48,57 @@ init_per_testcase(_Case, Config) ->
     WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
     [{watchdog, WatchDog}| Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     WatchDog = ?config(watchdog, Config),
     test_server:timetrap_cancel(WatchDog).
 
-all(doc) ->
-    "Test of ssl.erl interface in passive mode.";
-all(suite) ->
-    {conf, 
-     config,
-     [server_accept_timeout,
-      cinit_return_chkclose,
-      sinit_return_chkclose,
-      cinit_big_return_chkclose,
-      sinit_big_return_chkclose,
-      cinit_big_echo_chkclose,
-      cinit_huge_echo_chkclose,
-      sinit_big_echo_chkclose,
-      cinit_few_echo_chkclose,
-      cinit_many_echo_chkclose,
-      cinit_cnocert],
-     finish}.
-
-config(doc) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [server_accept_timeout, cinit_return_chkclose,
+     sinit_return_chkclose, cinit_big_return_chkclose,
+     sinit_big_return_chkclose, cinit_big_echo_chkclose,
+     cinit_huge_echo_chkclose, sinit_big_echo_chkclose,
+     cinit_few_echo_chkclose, cinit_many_echo_chkclose,
+     cinit_cnocert].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(doc) ->
     "Want to se what Config contains.";
-config(suite) ->
+init_per_suite(suite) ->
     [];
-config(Config) ->
+init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
-
-finish(doc) ->
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto"}
+    end.
+
+end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
-finish(suite) ->
+end_per_suite(suite) ->
     [];
-finish(Config) ->
+end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 server_accept_timeout(doc) ->
diff --git a/lib/ssl/test/old_ssl_dist_SUITE.erl b/lib/ssl/test/old_ssl_dist_SUITE.erl
index 56209c3530..6a072c9d98 100644
--- a/lib/ssl/test/old_ssl_dist_SUITE.erl
+++ b/lib/ssl/test/old_ssl_dist_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2007-2010. 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%
 %%
 
@@ -29,28 +29,38 @@
 %%%-------------------------------------------------------------------
 -module(old_ssl_dist_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(DEFAULT_TIMETRAP_SECS, 240).
 
 -define(AWAIT_SLL_NODE_UP_TIMEOUT, 30000).
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_suite/1,
 	 end_per_suite/1,
 	 init_per_testcase/2,
-	 fin_per_testcase/2]).
+	 end_per_testcase/2]).
 -export([cnct2tstsrvr/1]).
 
 -export([basic/1]).
 
 -record(node_handle, {connection_handler, socket, name, nodename}).
 
-all(doc) ->
-    [];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [basic].
 
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 init_per_suite(Config) ->
     add_ssl_opts_config(Config).
 
@@ -61,7 +71,7 @@ init_per_testcase(Case, Config) when list(Config) ->
     Dog = ?t:timetrap(?t:seconds(?DEFAULT_TIMETRAP_SECS)),
     [{watchdog, Dog},{testcase, Case}|Config].
 
-fin_per_testcase(_Case, Config) when list(Config) ->
+end_per_testcase(_Case, Config) when list(Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
@@ -254,7 +264,8 @@ mk_node_cmdline(ListenPort, Name, Args) ->
     Prog ++ " "
 	++ Static ++ " "
 	++ NameSw ++ " " ++ Name ++ " "
-	++ "-pa " ++ Pa ++ " "
+	++ "-pa " ++ Pa ++ " " 
+ 	++ "-run application start crypto -run application start public_key "
 	++ "-run " ++ atom_to_list(?MODULE) ++ " cnct2tstsrvr "
 	++ host_name() ++ " "
 	++ integer_to_list(ListenPort) ++ " "
@@ -524,23 +535,10 @@ add_ssl_opts_config(Config) ->
 	KrnlDir = filename:join([LibDir, "kernel-" ++ KRNL_VSN]),
 	{ok, _} = file:read_file_info(StdlDir),
 	{ok, _} = file:read_file_info(KrnlDir),
-	SSL_VSN = case lists:keysearch(ssl, 1, Apps) of
-		      {value, {ssl, _, VSN}} ->
-			  VSN;
-		      _ ->
-			  application:start(ssl),
-			  try
-			      {value,
-			       {ssl,
-				_,
-				VSN}} = lists:keysearch(ssl,
-							1,
-							application:which_applications()),
-			      VSN
-			  after
-			      application:stop(ssl)
-			  end
-		  end,
+	SSL_VSN = vsn(ssl),
+	VSN_CRYPTO = vsn(crypto),
+	VSN_PKEY = vsn(public_key),
+	
 	SslDir = filename:join([LibDir, "ssl-" ++ SSL_VSN]),
 	{ok, _} = file:read_file_info(SslDir),
 	%% We are using an installed otp system, create the boot script.
@@ -552,6 +550,8 @@ add_ssl_opts_config(Config) ->
 		  " {erts, \"~s\"},~n"
 		  " [{kernel, \"~s\"},~n"
 		  "  {stdlib, \"~s\"},~n"
+		  "  {crypto, \"~s\"},~n"
+		  "  {public_key, \"~s\"},~n"
 		  "  {ssl, \"~s\"}]}.~n",
 		  [case catch erlang:system_info(otp_release) of
 		       {'EXIT', _} -> "R11B";
@@ -560,6 +560,8 @@ add_ssl_opts_config(Config) ->
 		   erlang:system_info(version),
 		   KRNL_VSN,
 		   STDL_VSN,
+		   VSN_CRYPTO,
+		   VSN_PKEY,
 		   SSL_VSN]),
 	ok = file:close(RelFile),
 	ok = systools:make_script(Script, []),
@@ -593,3 +595,17 @@ success(Config) ->
 	{value, {comment, _} = Res} -> Res;
 	_ -> ok
     end.
+
+vsn(App) ->
+    application:start(App),
+    try
+	{value,
+	 {ssl,
+	  _,
+	  VSN}} = lists:keysearch(App,
+				  1,
+				  application:which_applications()),
+	VSN
+     after
+	 application:stop(ssl)
+     end.
diff --git a/lib/ssl/test/old_ssl_misc_SUITE.erl b/lib/ssl/test/old_ssl_misc_SUITE.erl
index 55d1b71025..e1a21096bc 100644
--- a/lib/ssl/test/old_ssl_misc_SUITE.erl
+++ b/lib/ssl/test/old_ssl_misc_SUITE.erl
@@ -1,37 +1,36 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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(old_ssl_misc_SUITE).
 
--export([all/1,
+-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,
-	 fin_per_testcase/2,
-	 config/1,
-	 finish/1,
+	 end_per_testcase/2,
 	 seed/1,
 	 app/1
 	]).
 
 -import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
 			   test_server_only/6]).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ssl_test_MACHINE.hrl").
 
 -define(MANYCONNS, 5).
@@ -40,39 +39,52 @@ init_per_testcase(_Case, Config) ->
     WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
     [{watchdog, WatchDog}| Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     WatchDog = ?config(watchdog, Config),
     test_server:timetrap_cancel(WatchDog).
 
-all(doc) ->
-    "Test of misc in ssl.erl interface.";
-all(suite) ->
-    {conf,
-     config,
-     [seed, app],
-     finish
-    }.
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-config(doc) ->
+all() -> 
+    [seed, app].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(doc) ->
     "Want to se what Config contains.";
-config(suite) ->
+init_per_suite(suite) ->
     [];
-config(Config) ->
+init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
-
-finish(doc) ->
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto!"}
+    end.
+
+end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
-finish(suite) ->
+end_per_suite(suite) ->
     [];
-finish(Config) ->
+end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 seed(doc) ->
diff --git a/lib/ssl/test/old_ssl_passive_SUITE.erl b/lib/ssl/test/old_ssl_passive_SUITE.erl
index 4cb8c1f0cd..8bdadd4ea6 100644
--- a/lib/ssl/test/old_ssl_passive_SUITE.erl
+++ b/lib/ssl/test/old_ssl_passive_SUITE.erl
@@ -1,30 +1,29 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1999-2010. 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(old_ssl_passive_SUITE).
 
--export([all/1,
+-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,
-	 fin_per_testcase/2,
-	 config/1,
-	 finish/1,
+	 end_per_testcase/2,
 	 server_accept_timeout/1,
 	 cinit_return_chkclose/1,
 	 sinit_return_chkclose/1,
@@ -40,7 +39,7 @@
 -import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
 			   test_server_only/6]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ssl_test_MACHINE.hrl").
 
 -define(MANYCONNS, ssl_test_MACHINE:many_conns()).
@@ -49,47 +48,56 @@ init_per_testcase(_Case, Config) ->
     WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
     [{watchdog, WatchDog}| Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     WatchDog = ?config(watchdog, Config),
     test_server:timetrap_cancel(WatchDog).
 
-all(doc) ->
-    "Test of ssl.erl interface in passive mode.";
-all(suite) ->
-    {conf,
-     config,
-     [server_accept_timeout,
-      cinit_return_chkclose,
-      sinit_return_chkclose,
-      cinit_big_return_chkclose,
-      sinit_big_return_chkclose,
-      cinit_big_echo_chkclose,
-      sinit_big_echo_chkclose,
-      cinit_few_echo_chkclose,
-      cinit_many_echo_chkclose,
-      cinit_cnocert],
-     finish}.
-
-config(doc) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [server_accept_timeout, cinit_return_chkclose,
+     sinit_return_chkclose, cinit_big_return_chkclose,
+     sinit_big_return_chkclose, cinit_big_echo_chkclose,
+     sinit_big_echo_chkclose, cinit_few_echo_chkclose,
+     cinit_many_echo_chkclose, cinit_cnocert].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(doc) ->
     "Want to se what Config contains.";
-config(suite) ->
+init_per_suite(suite) ->
     [];
-config(Config) ->
+init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
-
-finish(doc) ->
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto"}
+    end.
+
+end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
-finish(suite) ->
+end_per_suite(suite) ->
     [];
-finish(Config) ->
+end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 server_accept_timeout(doc) ->
diff --git a/lib/ssl/test/old_ssl_peer_cert_SUITE.erl b/lib/ssl/test/old_ssl_peer_cert_SUITE.erl
index f0b8db2607..54f06aec2f 100644
--- a/lib/ssl/test/old_ssl_peer_cert_SUITE.erl
+++ b/lib/ssl/test/old_ssl_peer_cert_SUITE.erl
@@ -1,30 +1,29 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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(old_ssl_peer_cert_SUITE).
 
--export([all/1,
+-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,
-	 fin_per_testcase/2,
-	 config/1,
-	 finish/1,
+	 end_per_testcase/2,
 	 cinit_plain/1,
 	 cinit_both_verify/1,
 	 cinit_cnocert/1
@@ -32,7 +31,7 @@
 
 -import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
 			   test_server_only/6]).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ssl_test_MACHINE.hrl").
 
 
@@ -40,40 +39,52 @@ init_per_testcase(_Case, Config) ->
     WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
     [{watchdog, WatchDog}| Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     WatchDog = ?config(watchdog, Config),
     test_server:timetrap_cancel(WatchDog).
 
-all(doc) ->
-    "Test of ssl verification and peer certificate retrieval.";
-all(suite) ->
-    {conf,
-     config,
-     [cinit_plain,
-      cinit_both_verify,
-      cinit_cnocert],
-     finish}.
-
-config(doc) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [cinit_plain, cinit_both_verify, cinit_cnocert].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(doc) ->
     "Want to se what Config contains.";
-config(suite) ->
+init_per_suite(suite) ->
     [];
-config(Config) ->
+init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
-
-finish(doc) ->
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto"}
+    end.
+
+end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
-finish(suite) ->
+end_per_suite(suite) ->
     [];
-finish(Config) ->
+end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 cinit_plain(doc) ->
diff --git a/lib/ssl/test/old_ssl_protocol_SUITE.erl b/lib/ssl/test/old_ssl_protocol_SUITE.erl
index 7bde5d6749..779491ee69 100644
--- a/lib/ssl/test/old_ssl_protocol_SUITE.erl
+++ b/lib/ssl/test/old_ssl_protocol_SUITE.erl
@@ -1,32 +1,34 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-2010. 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(old_ssl_protocol_SUITE).
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2, config/1,
-	 finish/1, sslv2/1, sslv3/1, tlsv1/1, sslv2_sslv3/1,
+-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, 
+	 sslv2/1, sslv3/1, tlsv1/1, sslv2_sslv3/1,
 	 sslv2_tlsv1/1, sslv3_tlsv1/1, sslv2_sslv3_tlsv1/1]).
 
 -import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
 			   test_server_only/6]).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ssl_test_MACHINE.hrl").
 
 
@@ -34,39 +36,53 @@ init_per_testcase(_Case, Config) ->
     WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
     [{watchdog, WatchDog}| Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     WatchDog = ?config(watchdog, Config),
     test_server:timetrap_cancel(WatchDog).
 
-all(doc) ->
-    "Test of configuration protocol_version.";
-all(suite) ->
-    {conf,
-     config,
-     [sslv2, sslv3, tlsv1, sslv2_sslv3, sslv2_tlsv1, sslv3_tlsv1, 
-      sslv2_sslv3_tlsv1],
-     finish}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-config(doc) ->
+all() -> 
+    [sslv2, sslv3, tlsv1, sslv2_sslv3, sslv2_tlsv1,
+     sslv3_tlsv1, sslv2_sslv3_tlsv1].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(doc) ->
     "Want to se what Config contains.";
-config(suite) ->
+init_per_suite(suite) ->
     [];
-config(Config) ->
+init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
-
-finish(doc) ->
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto"}
+    end.
+
+end_per_suite(doc) ->
     "This test case has no other purpose than closing the conf case.";
-finish(suite) ->
+end_per_suite(suite) ->
     [];
-finish(Config) ->
+end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 %%%%%
diff --git a/lib/ssl/test/old_ssl_verify_SUITE.erl b/lib/ssl/test/old_ssl_verify_SUITE.erl
index 5db964526f..d388484141 100644
--- a/lib/ssl/test/old_ssl_verify_SUITE.erl
+++ b/lib/ssl/test/old_ssl_verify_SUITE.erl
@@ -1,37 +1,36 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1999-2010. 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(old_ssl_verify_SUITE).
 
--export([all/1,
+-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,
-	 fin_per_testcase/2,
-	 config/1,
-	 finish/1,
+	 end_per_testcase/2,
 	 cinit_both_verify/1,
 	 cinit_cnocert/1
 	 ]).
 
 -import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
 			   test_server_only/6]).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("ssl_test_MACHINE.hrl").
 
 
@@ -39,39 +38,52 @@ init_per_testcase(_Case, Config) ->
     WatchDog = ssl_test_lib:timetrap(?DEFAULT_TIMEOUT),
     [{watchdog, WatchDog}| Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     WatchDog = ?config(watchdog, Config),
     test_server:timetrap_cancel(WatchDog).
 
-all(doc) ->
-    "Test of ssl.erl interface in active mode.";
-all(suite) ->
-    {conf,
-     config,
-     [cinit_both_verify,
-      cinit_cnocert],
-     finish}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-config(doc) ->
+all() -> 
+    [cinit_both_verify, cinit_cnocert].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(doc) ->
     "Want to se what Config contains.";
-config(suite) ->
+init_per_suite(suite) ->
     [];
-config(Config) ->
+init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
-
-finish(doc) ->
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto"}
+    end.
+
+end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
-finish(suite) ->
+end_per_suite(suite) ->
     [];
-finish(Config) ->
+end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 cinit_both_verify(doc) ->
diff --git a/lib/ssl/test/old_transport_accept_SUITE.erl b/lib/ssl/test/old_transport_accept_SUITE.erl
index 4bb09cee19..21ee0690b1 100644
--- a/lib/ssl/test/old_transport_accept_SUITE.erl
+++ b/lib/ssl/test/old_transport_accept_SUITE.erl
@@ -1,34 +1,35 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2007-2010. 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(old_transport_accept_SUITE).
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 
 %% Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
 -define(application, ssh).
 
--export([all/1,
+-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,
-	 fin_per_testcase/2,
+	 end_per_testcase/2,
 	 config/1,
 	 echo_once/1,
 	 echo_twice/1,
@@ -43,15 +44,31 @@ init_per_testcase(_Case, Config) ->
     [{watchdog, WatchDog}, {protomod, gen_tcp}, {serialize_accept, true}| 
      Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     WatchDog = ?config(watchdog, Config),
     test_server:timetrap_cancel(WatchDog).
 
-all(doc) ->
-    "Test transport_accept and ssl_accept";
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [config, echo_once, echo_twice, close_before_ssl_accept].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 config(doc) ->
     "Want to se what Config contains.";
 config(suite) ->
@@ -224,12 +241,9 @@ tolerant_server_loop(Client, LSock, Msg, N) ->
     tolerant_server_loop(Client, LSock, Msg, N-1).
 
 app() ->
-    case application:get_application(ssl) of
-	undefined ->
-	    application:start(ssl);
-	_ ->
-	    ok
-    end.
+    crypto:start(),
+    application:start(public_key),
+    ssl:start().
 
 start_node(Kind, Params) ->
     S = atom_to_list(?MODULE)++"_" ++ atom_to_list(Kind),
diff --git a/lib/ssl/test/ssl.cover b/lib/ssl/test/ssl.cover
index e8daa363c5..60774cc0f1 100644
--- a/lib/ssl/test/ssl.cover
+++ b/lib/ssl/test/ssl.cover
@@ -1,19 +1,21 @@
-{exclude, [ssl_pkix_oid,
-	   'PKIX1Algorithms88', 
-	   'PKIX1Explicit88',
-	   'PKIX1Implicit88',
-	   'PKIXAttributeCertificate',
-	   'SSL-PKIX',
-	   ssl_pem,
-	   ssl_pkix,
-	   ssl_base64,
-	   ssl_broker,
-           ssl_broker_int,
-	   ssl_broker_sup,
-	   ssl_debug,
-	   ssl_server,		
-	   ssl_prim,
-	   inet_ssl_dist,
-	   'OTP-PKIX'	
+{incl_app,ssl,details}.
+
+{excl_mods, ssl, [ssl_pkix_oid,
+		  'PKIX1Algorithms88', 
+		  'PKIX1Explicit88',
+		  'PKIX1Implicit88',
+		  'PKIXAttributeCertificate',
+		  'SSL-PKIX',
+		  ssl_pem,
+		  ssl_pkix,
+		  ssl_base64,
+		  ssl_broker,
+		  ssl_broker_int,
+		  ssl_broker_sup,
+		  ssl_debug,
+		  ssl_server,		
+		  ssl_prim,
+		  inet_ssl_dist,
+		  'OTP-PKIX'	
 		]}.
 
diff --git a/lib/ssl/test/ssl.spec b/lib/ssl/test/ssl.spec
index 6ef4fb73db..fc7c1bbb82 100644
--- a/lib/ssl/test/ssl.spec
+++ b/lib/ssl/test/ssl.spec
@@ -1 +1 @@
-{topcase, {dir, "../ssl_test"}}.
+{suites,"../ssl_test",all}.
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index ad87cfcba1..87d5fc8d71 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -1,13 +1,13 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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/.
+%% retrieved online at http://www.erlang.org/.2
 %%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
@@ -24,22 +24,18 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 -include_lib("public_key/include/public_key.hrl").
+
 -include("ssl_alert.hrl").
 
 -define('24H_in_sec', 86400).  
 -define(TIMEOUT, 60000).
+-define(LONG_TIMEOUT, 600000).
 -define(EXPIRE, 10).
 -define(SLEEP, 500).
 
--behaviour(ssl_session_cache_api).
-
-%% For the session cache tests
--export([init/1, terminate/1, lookup/2, update/3, 
-	 delete/2, foldl/3, select_session/2]).
-
 %% Test server callback functions
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
@@ -50,15 +46,25 @@
 %% 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) ->
-    crypto:start(),
-    ssl:start(),
-    Result = 
-	(catch make_certs:all(?config(data_dir, Config), 
-			      ?config(priv_dir, Config))),
-    test_server:format("Make certs  ~p~n", [Result]),
-    ssl_test_lib:cert_options(Config).
-
+init_per_suite(Config0) ->
+    Dog = ssl_test_lib:timetrap(?LONG_TIMEOUT *2),
+    case application:start(crypto) of
+	ok ->
+	    application:start(public_key),
+	    ssl:start(),
+
+	    %% make rsa certs using oppenssl
+	    Result =
+		(catch make_certs:all(?config(data_dir, Config0),
+				      ?config(priv_dir, Config0))),
+	    test_server:format("Make certs  ~p~n", [Result]),
+
+	    Config1 = ssl_test_lib:make_dsa_cert(Config0),
+	    Config = ssl_test_lib:cert_options(Config1),
+	    [{watchdog, Dog} | Config];
+	_ ->
+	    {skip, "Crypto did not start"}
+    end.
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]
@@ -67,7 +73,7 @@ init_per_suite(Config) ->
 %%--------------------------------------------------------------------
 end_per_suite(_Config) ->
     ssl:stop(),
-    crypto:stop().
+    application:stop(crypto).
 
 %%--------------------------------------------------------------------
 %% Function: init_per_testcase(TestCase, Config) -> Config
@@ -105,8 +111,10 @@ init_per_testcase(no_authority_key_identifier, Config) ->
     ssl:start(), 
     Config;
 
-init_per_testcase(TestCase, Config) when TestCase == ciphers_ssl3; 
-					 TestCase == ciphers_ssl3_openssl_names ->
+init_per_testcase(TestCase, Config) when TestCase == ciphers_rsa_signed_certs_ssl3; 
+					 TestCase == ciphers_rsa_signed_certs_openssl_names_ssl3;
+					 TestCase == ciphers_dsa_signed_certs_ssl3; 
+					 TestCase == ciphers_dsa_signed_certs_openssl_names_ssl3 ->
     ssl:stop(),
     application:load(ssl),
     application:set_env(ssl, protocol_version, sslv3),
@@ -124,11 +132,13 @@ init_per_testcase(protocol_versions, Config)  ->
 init_per_testcase(empty_protocol_versions, Config)  ->
     ssl:stop(),
     application:load(ssl),
-    %% For backwards compatibility sslv2 should be filtered out.
     application:set_env(ssl, protocol_version, []),
     ssl:start(),
     Config;
 
+init_per_testcase(different_ca_peer_sign, Config0) ->
+    ssl_test_lib:make_mix_cert(Config0);
+
 init_per_testcase(_TestCase, Config0) ->
     Config = lists:keydelete(watchdog, 1, Config0),
     Dog = test_server:timetrap(?TIMEOUT),
@@ -165,8 +175,10 @@ end_per_testcase(session_cache_process_mnesia, Config) ->
 end_per_testcase(reuse_session_expired, Config) ->
     application:unset_env(ssl, session_lifetime),
     end_per_testcase(default_action, Config);
-end_per_testcase(TestCase, Config) when TestCase == ciphers_ssl3; 
-					TestCase == ciphers_ssl3_openssl_names;
+end_per_testcase(TestCase, Config) when TestCase == ciphers_rsa_signed_certs_ssl3; 
+					TestCase == ciphers_rsa_signed_certs_openssl_names_ssl3;
+					TestCase == ciphers_dsa_signed_certs_ssl3; 
+					TestCase == ciphers_dsa_signed_certs_openssl_names_ssl3;
 					TestCase == protocol_versions;
 					TestCase == empty_protocol_versions->
     application:unset_env(ssl, protocol_version),
@@ -188,36 +200,66 @@ end_per_testcase(_TestCase, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test the basic ssl functionality"];
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all(suite) -> 
+all() -> 
     [app, alerts, connection_info, protocol_versions,
-    empty_protocol_versions, controlling_process, controller_dies,
-    client_closes_socket, peercert, connect_dist, peername, sockname,
-    socket_options, misc_ssl_options, versions, cipher_suites,
-    upgrade, upgrade_with_timeout, tcp_connect, ipv6, ekeyfile,
-    ecertfile, ecacertfile, eoptions, shutdown, shutdown_write,
-    shutdown_both, shutdown_error, ciphers, ciphers_ssl3,
-    ciphers_openssl_names, send_close,
-    close_transport_accept, dh_params, server_verify_peer_passive,
-    server_verify_peer_active, server_verify_peer_active_once,
-    server_verify_none_passive, server_verify_none_active,
-    server_verify_none_active_once, server_verify_no_cacerts,
-    server_require_peer_cert_ok, server_require_peer_cert_fail,
-    server_verify_client_once_passive,
-    server_verify_client_once_active,
-    server_verify_client_once_active_once, client_verify_none_passive,
-    client_verify_none_active, client_verify_none_active_once,
-    session_cache_process_list, session_cache_process_mnesia,
-    reuse_session, reuse_session_expired,
-    server_does_not_want_to_reuse_session, client_renegotiate,
-    server_renegotiate, client_renegotiate_reused_session,
-    server_renegotiate_reused_session, client_no_wrap_sequence_number,
-    server_no_wrap_sequence_number, extended_key_usage,
-    validate_extensions_fun, no_authority_key_identifier,
-    invalid_signature_client, invalid_signature_server, cert_expired
-    ].
+     empty_protocol_versions, controlling_process,
+     controller_dies, client_closes_socket, peercert,
+     connect_dist, peername, sockname, socket_options,
+     misc_ssl_options, versions, cipher_suites, upgrade,
+     upgrade_with_timeout, tcp_connect, ipv6, ekeyfile,
+     ecertfile, ecacertfile, eoptions, shutdown,
+     shutdown_write, shutdown_both, shutdown_error,
+     ciphers_rsa_signed_certs, ciphers_rsa_signed_certs_ssl3,
+     ciphers_rsa_signed_certs_openssl_names,
+     ciphers_rsa_signed_certs_openssl_names_ssl3,
+     ciphers_dsa_signed_certs, ciphers_dsa_signed_certs_ssl3,
+     ciphers_dsa_signed_certs_openssl_names,
+     ciphers_dsa_signed_certs_openssl_names_ssl3,
+     anonymous_cipher_suites,
+     default_reject_anonymous,
+     send_close,
+     close_transport_accept, dh_params,
+     server_verify_peer_passive, server_verify_peer_active,
+     server_verify_peer_active_once,
+     server_verify_none_passive, server_verify_none_active,
+     server_verify_none_active_once,
+     server_verify_no_cacerts, server_require_peer_cert_ok,
+     server_require_peer_cert_fail,
+     server_verify_client_once_passive,
+     server_verify_client_once_active,
+     server_verify_client_once_active_once,
+     client_verify_none_passive, client_verify_none_active,
+     client_verify_none_active_once,
+     reuse_session,
+     reuse_session_expired,
+     server_does_not_want_to_reuse_session,
+     client_renegotiate, server_renegotiate,
+     client_renegotiate_reused_session,
+     server_renegotiate_reused_session,
+     client_no_wrap_sequence_number,
+     server_no_wrap_sequence_number, extended_key_usage_verify_peer,
+     extended_key_usage_verify_none,
+     no_authority_key_identifier, invalid_signature_client,
+     invalid_signature_server, cert_expired,
+     client_with_cert_cipher_suites_handshake,
+     unknown_server_ca_fail, der_input,
+     unknown_server_ca_accept_verify_none,
+     unknown_server_ca_accept_verify_peer,
+     unknown_server_ca_accept_backwardscompatibilty,
+     %%different_ca_peer_sign,
+     no_reuses_session_server_restart_new_cert,
+     no_reuses_session_server_restart_new_cert_file, reuseaddr].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
@@ -332,7 +374,6 @@ basic_test(Config) ->
     
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
-
 %%--------------------------------------------------------------------
 
 controlling_process(doc) -> 
@@ -532,9 +573,7 @@ client_closes_socket(Config) when is_list(Config) ->
     
     _Client = spawn_link(Connect),
 
-    ssl_test_lib:check_result(Server, {error,closed}),
-    
-    ssl_test_lib:close(Server).
+    ssl_test_lib:check_result(Server, {error,closed}).
 
 %%--------------------------------------------------------------------
 
@@ -561,8 +600,8 @@ peercert(Config) when is_list(Config) ->
 			   {options, ClientOpts}]),
     
     CertFile = proplists:get_value(certfile, ServerOpts),
-    {ok, [{cert, BinCert, _}]} = public_key:pem_to_der(CertFile),
-    {ok, ErlCert} = public_key:pkix_decode_cert(BinCert, otp),
+    [{'Certificate', BinCert, _}]= ssl_test_lib:pem_to_der(CertFile),
+    ErlCert = public_key:pkix_decode_cert(BinCert, otp),
        
     ServerMsg = {{error, no_peercert}, {error, no_peercert}},
     ClientMsg = {{ok, BinCert}, {ok, ErlCert}},
@@ -749,7 +788,6 @@ socket_options(Config) when is_list(Config) ->
     ssl_test_lib:check_result(Server, ok, Client, ok),
 
     ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
     
     {ok, Listen} = ssl:listen(0, ServerOpts),
     {ok,[{mode,list}]} = ssl:getopts(Listen, [mode]),
@@ -852,6 +890,7 @@ send_recv(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
+%%--------------------------------------------------------------------
 send_close(doc) -> 
     [""];
 
@@ -878,8 +917,7 @@ send_close(Config) when is_list(Config) ->
     ok = ssl:send(SslS, "Hello world"),      
     {ok,<<"Hello world">>} = ssl:recv(SslS, 11),    
     gen_tcp:close(TcpS),    
-    {error, _} = ssl:send(SslS, "Hello world"),    
-    ssl_test_lib:close(Server).
+    {error, _} = ssl:send(SslS, "Hello world").
 
 %%--------------------------------------------------------------------
 close_transport_accept(doc) ->
@@ -1054,8 +1092,7 @@ tcp_connect(Config) when is_list(Config) ->
 		{Server, {error, Error}} ->
 		    test_server:format("Error ~p", [Error])
 	    end
-    end,
-    ssl_test_lib:close(Server).
+    end.
 
 
 dummy(_Socket) ->
@@ -1064,6 +1101,8 @@ dummy(_Socket) ->
     exit(kill).
 
 %%--------------------------------------------------------------------
+ipv6() ->
+    [{require, ipv6_hosts}].
 ipv6(doc) ->
     ["Test ipv6."];
 ipv6(suite) ->
@@ -1071,7 +1110,7 @@ ipv6(suite) ->
 ipv6(Config) when is_list(Config) ->
     {ok, Hostname0} = inet:gethostname(),
     
-    case lists:member(list_to_atom(Hostname0), ?config(ipv6_hosts, Config)) of
+    case lists:member(list_to_atom(Hostname0), ct:get_config(ipv6_hosts)) of
 	true ->
 	    ClientOpts = ?config(client_opts, Config),
 	    ServerOpts = ?config(server_opts, Config),
@@ -1145,13 +1184,13 @@ ecertfile(Config) when is_list(Config) ->
     Server = 
 	ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
 					 {from, self()},
-			    {options, ServerBadOpts}]),
+					 {options, ServerBadOpts}]),
 
     Port = ssl_test_lib:inet_port(Server),
 
     Client =
 	ssl_test_lib:start_client_error([{node, ClientNode}, 
-			    {port, Port}, {host, Hostname},
+					 {port, Port}, {host, Hostname},
 					 {from, self()}, 
 					 {options, ClientOpts}]),
     
@@ -1160,13 +1199,13 @@ ecertfile(Config) when is_list(Config) ->
     
 
 %%--------------------------------------------------------------------
-ecacertfile(doc) -> 
+ecacertfile(doc) ->
     ["Test what happens with an invalid cacert file"];
 
-ecacertfile(suite) -> 
+ecacertfile(suite) ->
     [];
 
-ecacertfile(Config) when is_list(Config) -> 
+ecacertfile(Config) when is_list(Config) ->
     ClientOpts    = [{reuseaddr, true}|?config(client_opts, Config)],
     ServerBadOpts = [{reuseaddr, true}|?config(server_bad_ca, Config)],
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -1241,7 +1280,6 @@ eoptions(Config) when is_list(Config) ->
 		{verify_fun, function},
 		{fail_if_no_peer_cert, 0}, 
 		{verify_client_once, 1},
-		{validate_extensions_fun, function}, 
 		{depth, four}, 
 		{certfile, 'cert.pem'}, 
 		{keyfile,'key.pem' }, 
@@ -1394,66 +1432,141 @@ shutdown_error(Config) when is_list(Config) ->
     {error, closed} = ssl:shutdown(Listen, read_write).
 
 %%-------------------------------------------------------------------
-ciphers(doc) -> 
-    ["Test all ssl cipher suites in highest support ssl/tls version"];
+ciphers_rsa_signed_certs(doc) -> 
+    ["Test all rsa ssl cipher suites in highest support ssl/tls version"];
        
-ciphers(suite) -> 
+ciphers_rsa_signed_certs(suite) -> 
     [];
 
-ciphers(Config) when is_list(Config) ->
+ciphers_rsa_signed_certs(Config) when is_list(Config) ->
     Version = 
 	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
 
-    Ciphers = ssl:cipher_suites(),
+    Ciphers = ssl_test_lib:rsa_suites(),
     test_server:format("tls1 erlang cipher suites ~p~n", [Ciphers]),
-    Result =  lists:map(fun(Cipher) -> 
-				cipher(Cipher, Version, Config) end,
-			Ciphers),
-    case lists:flatten(Result) of
-	[] ->
-	    ok;
-	Error ->
-	    test_server:format("Cipher suite errors: ~p~n", [Error]),
-	    test_server:fail(cipher_suite_failed_see_test_case_log) 
-    end.
+    run_suites(Ciphers, Version, Config, rsa).
 
-ciphers_ssl3(doc) -> 
-    ["Test all ssl cipher suites in ssl3"];
+ciphers_rsa_signed_certs_ssl3(doc) -> 
+    ["Test all rsa ssl cipher suites in ssl3"];
        
-ciphers_ssl3(suite) -> 
+ciphers_rsa_signed_certs_ssl3(suite) -> 
     [];
 
-ciphers_ssl3(Config) when is_list(Config) ->
+ciphers_rsa_signed_certs_ssl3(Config) when is_list(Config) ->
     Version = 
 	ssl_record:protocol_version({3,0}),
 
-    Ciphers = ssl:cipher_suites(),
+    Ciphers = ssl_test_lib:rsa_suites(),
     test_server:format("ssl3 erlang cipher suites ~p~n", [Ciphers]),
-    Result =  lists:map(fun(Cipher) -> 
-				cipher(Cipher, Version, Config) end,
-			Ciphers),
-    case lists:flatten(Result) of
-	[] ->
-	    ok;
-	Error ->
-	    test_server:format("Cipher suite errors: ~p~n", [Error]),
-	    test_server:fail(cipher_suite_failed_see_test_case_log) 
-    end.
+    run_suites(Ciphers, Version, 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(suite) -> 
+    [];
+
+ciphers_rsa_signed_certs_openssl_names(Config) when is_list(Config) ->
+    Version = 
+	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    Ciphers = ssl_test_lib:openssl_rsa_suites(),  
+    test_server:format("tls1 openssl cipher suites ~p~n", [Ciphers]),
+    run_suites(Ciphers, Version, Config, rsa).
+
+
+ciphers_rsa_signed_certs_openssl_names_ssl3(doc) -> 
+    ["Test all dsa ssl cipher suites in ssl3"];
+       
+ciphers_rsa_signed_certs_openssl_names_ssl3(suite) -> 
+    [];
+
+ciphers_rsa_signed_certs_openssl_names_ssl3(Config) when is_list(Config) ->
+    Version = ssl_record:protocol_version({3,0}),
+    Ciphers = ssl_test_lib:openssl_rsa_suites(),
+    run_suites(Ciphers, Version, Config, rsa).
+
+
+ciphers_dsa_signed_certs(doc) -> 
+    ["Test all dsa ssl cipher suites in highest support ssl/tls version"];
+       
+ciphers_dsa_signed_certs(suite) -> 
+    [];
+
+ciphers_dsa_signed_certs(Config) when is_list(Config) ->
+    Version = 
+	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+
+    Ciphers = ssl_test_lib:dsa_suites(),
+    test_server:format("tls1 erlang cipher suites ~p~n", [Ciphers]),
+    run_suites(Ciphers, Version, Config, dsa).
+
+ciphers_dsa_signed_certs_ssl3(doc) -> 
+    ["Test all dsa ssl cipher suites in ssl3"];
+       
+ciphers_dsa_signed_certs_ssl3(suite) -> 
+    [];
+
+ciphers_dsa_signed_certs_ssl3(Config) when is_list(Config) ->
+    Version = 
+	ssl_record:protocol_version({3,0}),
+
+    Ciphers = ssl_test_lib:dsa_suites(),
+    test_server:format("ssl3 erlang cipher suites ~p~n", [Ciphers]),  
+    run_suites(Ciphers, Version, Config, dsa).
+    
 
-ciphers_openssl_names(doc) -> 
-    ["Test all ssl cipher suites in highest support ssl/tls version"];
+ciphers_dsa_signed_certs_openssl_names(doc) -> 
+    ["Test all dsa ssl cipher suites in highest support ssl/tls version"];
        
-ciphers_openssl_names(suite) -> 
+ciphers_dsa_signed_certs_openssl_names(suite) -> 
     [];
 
-ciphers_openssl_names(Config) when is_list(Config) ->
+ciphers_dsa_signed_certs_openssl_names(Config) when is_list(Config) ->
     Version = 
 	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
 
-    Ciphers = ssl:cipher_suites(openssl),
+    Ciphers = ssl_test_lib:openssl_dsa_suites(),
     test_server:format("tls1 openssl cipher suites ~p~n", [Ciphers]),
+    run_suites(Ciphers, Version, Config, dsa).
+
+
+ciphers_dsa_signed_certs_openssl_names_ssl3(doc) -> 
+    ["Test all dsa ssl cipher suites in ssl3"];
+       
+ciphers_dsa_signed_certs_openssl_names_ssl3(suite) -> 
+    [];
+
+ciphers_dsa_signed_certs_openssl_names_ssl3(Config) when is_list(Config) ->
+    Version = ssl_record:protocol_version({3,0}),
+    Ciphers = ssl_test_lib:openssl_dsa_suites(),
+    run_suites(Ciphers, Version, Config, dsa).
+
+anonymous_cipher_suites(doc)->
+    ["Test the anonymous ciphersuites"];
+anonymous_cipher_suites(suite) ->
+    [];
+anonymous_cipher_suites(Config) when is_list(Config) ->
+    Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+    Ciphers = ssl_test_lib:anonymous_suites(),
+    run_suites(Ciphers, Version, Config, anonymous).
+
+run_suites(Ciphers, Version, Config, Type) ->
+    {ClientOpts, ServerOpts} =
+	case Type of 
+	    rsa ->
+		{?config(client_opts, Config),
+		 ?config(server_opts, Config)};
+	    dsa ->
+		{?config(client_opts, Config),
+		 ?config(server_dsa_opts, Config)};
+	    anonymous ->
+		%% No certs in opts!
+		{?config(client_opts, Config),
+		 ?config(server_anon, Config)}
+	    end,
+    
     Result =  lists:map(fun(Cipher) -> 
-				cipher(Cipher, Version, Config) end,
+				cipher(Cipher, Version, Config, ClientOpts, ServerOpts) end,
 			Ciphers),
     case lists:flatten(Result) of
 	[] ->
@@ -1463,43 +1576,38 @@ ciphers_openssl_names(Config) when is_list(Config) ->
 	    test_server:fail(cipher_suite_failed_see_test_case_log) 
     end.
 
+erlang_cipher_suite(Suite) when is_list(Suite)->
+    ssl_cipher:suite_definition(ssl_cipher:openssl_suite(Suite));
+erlang_cipher_suite(Suite) ->
+    Suite.
 
-cipher(CipherSuite, Version, Config) ->   
-    process_flag(trap_exit, true),
+cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->   
+    %% process_flag(trap_exit, true),
     test_server:format("Testing CipherSuite ~p~n", [CipherSuite]),
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
     {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, {?MODULE, connection_info_result, []}},
+			   {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, {?MODULE, connection_info_result, []}},
+			   {mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}},
 			   {options, 
 			    [{ciphers,[CipherSuite]} | 
 			     ClientOpts]}]), 
-   
-    ErlangCipherSuite = erlang_cipher_suite(CipherSuite),
-
-    ServerMsg = ClientMsg = {ok, {Version, ErlangCipherSuite}},
-			   
-    Result = ssl_test_lib:wait_for_result(Server, ServerMsg, 
-					  Client, ClientMsg),    
+  			   
+    Result = ssl_test_lib:wait_for_result(Server, ok, Client, ok),   
+ 
     ssl_test_lib:close(Server),
-    receive 
-	{'EXIT', Server, normal} ->
-	    ok
-     end,
     ssl_test_lib:close(Client),
-    receive 
-	{'EXIT', Client, normal} ->
-	    ok
-    end,
-    process_flag(trap_exit, false),
+
     case Result of
 	ok ->
 	    [];
@@ -1507,10 +1615,31 @@ cipher(CipherSuite, Version, Config) ->
 	    [{ErlangCipherSuite, Error}]
     end.
 
-erlang_cipher_suite(Suite) when is_list(Suite)->
-    ssl_cipher:suite_definition(ssl_cipher:openssl_suite(Suite));
-erlang_cipher_suite(Suite) ->
-    Suite.
+%%--------------------------------------------------------------------
+default_reject_anonymous(doc)->
+    ["Test that by default anonymous cipher suites are rejected "];
+default_reject_anonymous(suite) ->
+    [];
+default_reject_anonymous(Config) when is_list(Config) ->
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+
+    [Cipher | _] = ssl_test_lib:anonymous_suites(),
+
+    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,[Cipher]} |
+			     ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, {error, "insufficient security"},
+			      Client, {error, "insufficient security"}).
 
 %%--------------------------------------------------------------------
 reuse_session(doc) -> 
@@ -1520,7 +1649,6 @@ reuse_session(suite) ->
     [];
 
 reuse_session(Config) when is_list(Config) -> 
-    process_flag(trap_exit, true),
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -1528,13 +1656,13 @@ reuse_session(Config) when is_list(Config) ->
     Server = 
 	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
 				   {from, self()},
-		      {mfa, {?MODULE, session_info_result, []}},
-		      {options, ServerOpts}]),
+				   {mfa, {?MODULE, 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, []}},
+				   {mfa, {ssl_test_lib, no_result, []}},
 		      {from, self()},  {options, ClientOpts}]),   
     SessionInfo = 
 	receive
@@ -1542,16 +1670,16 @@ reuse_session(Config) when is_list(Config) ->
 		Info
 	end,
        
-    Server ! listen,
+    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
     
     %% Make sure session is registered
     test_server:sleep(?SLEEP),
 
     Client1 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
-		      {port, Port}, {host, Hostname},
-		      {mfa, {?MODULE, session_info_result, []}},
-		      {from, self()},  {options, ClientOpts}]),    
+	ssl_test_lib:start_client([{node, ClientNode},
+				   {port, Port}, {host, Hostname},
+				   {mfa, {?MODULE, session_info_result, []}},
+				   {from, self()},  {options, ClientOpts}]),
     receive
 	{Client1, SessionInfo} ->
 	    ok;
@@ -1561,10 +1689,10 @@ reuse_session(Config) when is_list(Config) ->
 	    test_server:fail(session_not_reused)
     end,
     
-    Server ! listen,
+    Server !  {listen, {mfa, {ssl_test_lib, no_result, []}}},
     
     Client2 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
+	ssl_test_lib:start_client([{node, ClientNode},
 		      {port, Port}, {host, Hostname},
 			    {mfa, {?MODULE, session_info_result, []}},
 		      {from, self()},  {options, [{reuse_sessions, false}
@@ -1578,10 +1706,6 @@ reuse_session(Config) when is_list(Config) ->
     end,
     
     ssl_test_lib:close(Server),
-    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}, 
@@ -1593,7 +1717,7 @@ reuse_session(Config) when is_list(Config) ->
     Client3 =
 	ssl_test_lib:start_client([{node, ClientNode}, 
 				   {port, Port1}, {host, Hostname},
-				   {mfa, {?MODULE, session_info_result, []}},
+				   {mfa, {ssl_test_lib, no_result, []}},
 				   {from, self()},  {options, ClientOpts}]), 
 
     SessionInfo1 = 
@@ -1602,7 +1726,7 @@ reuse_session(Config) when is_list(Config) ->
 		Info1
 	end,
        
-    Server1 ! listen,
+    Server1 ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
     
     %% Make sure session is registered
     test_server:sleep(?SLEEP),
@@ -1618,14 +1742,16 @@ reuse_session(Config) when is_list(Config) ->
 	    test_server:fail(
 	      session_reused_when_session_reuse_disabled_by_server);
 	{Client4, _Other} ->
+	    test_server:format("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),
-    process_flag(trap_exit, false).
-
+    ssl_test_lib:close(Client4).
 
 session_info_result(Socket) ->                                            
     ssl:session_info(Socket).
@@ -1638,7 +1764,6 @@ reuse_session_expired(suite) ->
     [];
 
 reuse_session_expired(Config) when is_list(Config) -> 
-    process_flag(trap_exit, true),
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -1659,8 +1784,8 @@ reuse_session_expired(Config) when is_list(Config) ->
 	    {Server, Info} ->
 		Info
 	end,
-       
-    Server ! listen,
+
+    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
     
     %% Make sure session is registered
     test_server:sleep(?SLEEP),
@@ -1680,7 +1805,7 @@ reuse_session_expired(Config) when is_list(Config) ->
     end,
     
     Server ! listen,
-    
+
     %% Make sure session is unregistered due to expiration
     test_server:sleep((?EXPIRE+1) * 1000),
     
@@ -1695,12 +1820,12 @@ reuse_session_expired(Config) when is_list(Config) ->
 	{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),
-    process_flag(trap_exit, false).
+    ssl_test_lib:close(Client2).
+
 %%--------------------------------------------------------------------
 server_does_not_want_to_reuse_session(doc) -> 
     ["Test reuse of sessions (short handshake)"];
@@ -1733,10 +1858,11 @@ server_does_not_want_to_reuse_session(Config) when is_list(Config) ->
 		Info
 	end,
        
-    Server ! listen,
+    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
     
     %% Make sure session is registered
     test_server:sleep(?SLEEP),
+    ssl_test_lib:close(Client0),
 
     Client1 =
 	ssl_test_lib:start_client([{node, ClientNode}, 
@@ -1749,11 +1875,9 @@ server_does_not_want_to_reuse_session(Config) when is_list(Config) ->
 	{Client1, _Other} ->
 	   ok
     end,
-    
+
     ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client0),
-    ssl_test_lib:close(Client1),
-    process_flag(trap_exit, false).
+    ssl_test_lib:close(Client1).
 
 %%--------------------------------------------------------------------
 
@@ -1920,6 +2044,7 @@ server_verify_none_active_once(Config) when is_list(Config) ->
     ssl_test_lib:check_result(Server, ok, Client, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
+
 %%--------------------------------------------------------------------
 
 server_verify_client_once_passive(doc) -> 
@@ -1947,7 +2072,7 @@ server_verify_client_once_passive(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok, Client0, ok),
     ssl_test_lib:close(Client0),
-    Server ! listen,
+    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
     Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
 					{from, self()}, 
@@ -1985,7 +2110,7 @@ server_verify_client_once_active(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok, Client0, ok),
     ssl_test_lib:close(Client0),
-    Server ! listen,
+    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
     Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
 					{from, self()}, 
@@ -1996,7 +2121,6 @@ server_verify_client_once_active(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client1).
     
-
 %%--------------------------------------------------------------------
 
 server_verify_client_once_active_once(doc) -> 
@@ -2024,18 +2148,17 @@ server_verify_client_once_active_once(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok, Client0, ok),
     ssl_test_lib:close(Client0),
-    Server ! listen,
-    
+    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
     Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, result_ok, []}},
-					{options, [{active, once} | ClientOpts]}]),
+					 {host, Hostname},
+					 {from, self()},
+					 {mfa, {?MODULE, result_ok, []}},
+					 {options, [{active, once} | ClientOpts]}]),
     
     ssl_test_lib:check_result(Client1, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client1).
-    
+
 %%--------------------------------------------------------------------
 
 server_verify_no_cacerts(doc) -> 
@@ -2043,9 +2166,8 @@ server_verify_no_cacerts(doc) ->
 
 server_verify_no_cacerts(suite) -> 
     [];
-
 server_verify_no_cacerts(Config) when is_list(Config) ->
-    ServerOpts =  ServerOpts =  ?config(server_opts, Config), 
+    ServerOpts =  ?config(server_opts, Config),
     {_, ServerNode, _} = ssl_test_lib:run_where(Config),
     Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
 					      {from, self()}, 
@@ -2191,14 +2313,7 @@ client_verify_none_active_once(Config) when is_list(Config) ->
 			   {mfa, {?MODULE, send_recv_result_active_once, []}},
 			   {options, [{active, once} | ServerOpts]}]),
     Port  = ssl_test_lib:inet_port(Server),
-    %% TODO: send message to test process to make sure
-    %% verifyfun has beeen run as it has the same behavior as
-    %% the default fun
-    VerifyFun =  fun([{bad_cert, unknown_ca}]) ->
- 			 true;
- 		    (_) ->
- 			 false
- 		 end,
+
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
 					{from, self()}, 
@@ -2206,16 +2321,13 @@ client_verify_none_active_once(Config) when is_list(Config) ->
 					       send_recv_result_active_once, 
 					       []}},
 					{options, [{active, once}, 
-						   {verify, verify_none},
-						   {verify_fun, VerifyFun}
+						   {verify, verify_none}
 						   | ClientOpts]}]),
     
     ssl_test_lib:check_result(Server, ok, Client, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
-
-
 %%--------------------------------------------------------------------
 client_renegotiate(doc) -> 
     ["Test ssl:renegotiate/1 on client."];
@@ -2224,7 +2336,6 @@ client_renegotiate(suite) ->
     [];
 
 client_renegotiate(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
     ClientOpts = ?config(client_opts, Config),  
 
@@ -2247,11 +2358,9 @@ client_renegotiate(Config) when is_list(Config) ->
 					{options, [{reuse_sessions, false} | ClientOpts]}]),
     
     ssl_test_lib:check_result(Client, ok, Server, ok), 
-
     ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
+    ssl_test_lib:close(Client).
+
 %%--------------------------------------------------------------------
 server_renegotiate(doc) -> 
     ["Test ssl:renegotiate/1 on server."];
@@ -2260,7 +2369,6 @@ server_renegotiate(suite) ->
     [];
 
 server_renegotiate(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
     ClientOpts = ?config(client_opts, Config),  
 
@@ -2283,8 +2391,7 @@ server_renegotiate(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok, Client, ok),
     ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    ok.
+    ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
 client_renegotiate_reused_session(doc) -> 
@@ -2294,7 +2401,6 @@ client_renegotiate_reused_session(suite) ->
     [];
 
 client_renegotiate_reused_session(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
     ClientOpts = ?config(client_opts, Config),  
 
@@ -2317,11 +2423,8 @@ client_renegotiate_reused_session(Config) when is_list(Config) ->
 					{options, [{reuse_sessions, true} | ClientOpts]}]),
     
     ssl_test_lib:check_result(Client, ok, Server, ok), 
-
     ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
+    ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
 server_renegotiate_reused_session(doc) -> 
     ["Test ssl:renegotiate/1 on server when the ssl session will be reused."];
@@ -2330,7 +2433,6 @@ server_renegotiate_reused_session(suite) ->
     [];
 
 server_renegotiate_reused_session(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
     ClientOpts = ?config(client_opts, Config),  
 
@@ -2353,9 +2455,7 @@ server_renegotiate_reused_session(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok, Client, ok),
     ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    ok.
-
+    ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
 client_no_wrap_sequence_number(doc) -> 
     ["Test that erlang client will renegotiate session when",  
@@ -2367,7 +2467,6 @@ client_no_wrap_sequence_number(suite) ->
     [];
 
 client_no_wrap_sequence_number(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
     ClientOpts = ?config(client_opts, Config),  
 
@@ -2392,11 +2491,8 @@ client_no_wrap_sequence_number(Config) when is_list(Config) ->
 						   {renegotiate_at, N} | ClientOpts]}]),
     
     ssl_test_lib:check_result(Client, ok), 
-
     ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
-    ok.
+    ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
 server_no_wrap_sequence_number(doc) -> 
     ["Test that erlang server will renegotiate session when",  
@@ -2408,7 +2504,6 @@ server_no_wrap_sequence_number(suite) ->
     [];
 
 server_no_wrap_sequence_number(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
     ServerOpts = ?config(server_opts, Config),  
     ClientOpts = ?config(client_opts, Config),  
 
@@ -2432,125 +2527,151 @@ server_no_wrap_sequence_number(Config) when is_list(Config) ->
     
     ssl_test_lib:check_result(Server, ok),
     ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    ok.
-
+    ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
-extended_key_usage(doc) -> 
-    ["Test cert that has a critical extended_key_usage extension"];
+extended_key_usage_verify_peer(doc) ->
+    ["Test cert that has a critical extended_key_usage extension in verify_peer mode"];
 
-extended_key_usage(suite) -> 
+extended_key_usage_verify_peer(suite) ->
     [];
 
-extended_key_usage(Config) when is_list(Config) -> 
+extended_key_usage_verify_peer(Config) when is_list(Config) ->
     ClientOpts = ?config(client_verification_opts, Config),
     ServerOpts = ?config(server_verification_opts, Config),
     PrivDir = ?config(priv_dir, Config),
    
     KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"), 
-    {ok, [KeyInfo]} = public_key:pem_to_der(KeyFile),
-    {ok, Key} = public_key:decode_private_key(KeyInfo),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = public_key:pem_entry_decode(KeyEntry),
 
     ServerCertFile = proplists:get_value(certfile, ServerOpts),
     NewServerCertFile = filename:join(PrivDir, "server/new_cert.pem"),
-    {ok, [{cert, ServerDerCert, _}]} = public_key:pem_to_der(ServerCertFile),
-    {ok, ServerOTPCert} = public_key:pkix_decode_cert(ServerDerCert, otp),
+    [{'Certificate', ServerDerCert, _}] = ssl_test_lib:pem_to_der(ServerCertFile),
+    ServerOTPCert = public_key:pkix_decode_cert(ServerDerCert, otp),
     ServerExtKeyUsageExt = {'Extension', ?'id-ce-extKeyUsage', true, [?'id-kp-serverAuth']},
     ServerOTPTbsCert = ServerOTPCert#'OTPCertificate'.tbsCertificate,
     ServerExtensions =  ServerOTPTbsCert#'OTPTBSCertificate'.extensions,
-    NewServerOTPTbsCert = ServerOTPTbsCert#'OTPTBSCertificate'{extensions = 
-							       [ServerExtKeyUsageExt | 
+    NewServerOTPTbsCert = ServerOTPTbsCert#'OTPTBSCertificate'{extensions =
+							       [ServerExtKeyUsageExt |
 								ServerExtensions]},
-    NewServerDerCert = public_key:sign(NewServerOTPTbsCert, Key), 
-    public_key:der_to_pem(NewServerCertFile, [{cert, NewServerDerCert, not_encrypted}]),
+    NewServerDerCert = public_key:pkix_sign(NewServerOTPTbsCert, Key),
+    ssl_test_lib:der_to_pem(NewServerCertFile, [{'Certificate', NewServerDerCert, not_encrypted}]),
     NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)],
-    
+
     ClientCertFile = proplists:get_value(certfile, ClientOpts),
     NewClientCertFile = filename:join(PrivDir, "client/new_cert.pem"),
-    {ok, [{cert, ClientDerCert, _}]} = public_key:pem_to_der(ClientCertFile),
-    {ok, ClientOTPCert} = public_key:pkix_decode_cert(ClientDerCert, otp),
+    [{'Certificate', ClientDerCert, _}] = ssl_test_lib:pem_to_der(ClientCertFile),
+    ClientOTPCert = public_key:pkix_decode_cert(ClientDerCert, otp),
     ClientExtKeyUsageExt = {'Extension', ?'id-ce-extKeyUsage', true, [?'id-kp-clientAuth']},
     ClientOTPTbsCert = ClientOTPCert#'OTPCertificate'.tbsCertificate,
     ClientExtensions =  ClientOTPTbsCert#'OTPTBSCertificate'.extensions,
-    NewClientOTPTbsCert = ClientOTPTbsCert#'OTPTBSCertificate'{extensions = 
+    NewClientOTPTbsCert = ClientOTPTbsCert#'OTPTBSCertificate'{extensions =
  							       [ClientExtKeyUsageExt |
  								ClientExtensions]},
-    NewClientDerCert = public_key:sign(NewClientOTPTbsCert, Key), 
-    public_key:der_to_pem(NewClientCertFile, [{cert, NewClientDerCert, not_encrypted}]),
+    NewClientDerCert = public_key:pkix_sign(NewClientOTPTbsCert, Key),
+    ssl_test_lib:der_to_pem(NewClientCertFile, [{'Certificate', NewClientDerCert, not_encrypted}]),
     NewClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts)],
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
 			   {mfa, {?MODULE, send_recv_result_active, []}},
 			   {options, [{verify, verify_peer} | NewServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 					{host, Hostname},
-			   {from, self()}, 
+			   {from, self()},
 			   {mfa, {?MODULE, send_recv_result_active, []}},
 					{options, [{verify, verify_peer} | NewClientOpts]}]),
-    
+
     ssl_test_lib:check_result(Server, ok, Client, ok),
-    
+
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
-validate_extensions_fun(doc) -> 
-    ["Test that it is possible to specify a validate_extensions_fun"];
+extended_key_usage_verify_none(doc) ->
+    ["Test cert that has a critical extended_key_usage extension in verify_none mode"];
 
-validate_extensions_fun(suite) -> 
+extended_key_usage_verify_none(suite) ->
     [];
 
-validate_extensions_fun(Config) when is_list(Config) -> 
+extended_key_usage_verify_none(Config) when is_list(Config) ->
     ClientOpts = ?config(client_verification_opts, Config),
     ServerOpts = ?config(server_verification_opts, Config),
-    
-    Fun = fun(Extensions, State, _, AccError) ->
-		  {Extensions, State, AccError}
-	  end,
-    
+    PrivDir = ?config(priv_dir, Config),
+
+    KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = public_key:pem_entry_decode(KeyEntry),
+
+    ServerCertFile = proplists:get_value(certfile, ServerOpts),
+    NewServerCertFile = filename:join(PrivDir, "server/new_cert.pem"),
+    [{'Certificate', ServerDerCert, _}] = ssl_test_lib:pem_to_der(ServerCertFile),
+    ServerOTPCert = public_key:pkix_decode_cert(ServerDerCert, otp),
+    ServerExtKeyUsageExt = {'Extension', ?'id-ce-extKeyUsage', true, [?'id-kp-serverAuth']},
+    ServerOTPTbsCert = ServerOTPCert#'OTPCertificate'.tbsCertificate,
+    ServerExtensions =  ServerOTPTbsCert#'OTPTBSCertificate'.extensions,
+    NewServerOTPTbsCert = ServerOTPTbsCert#'OTPTBSCertificate'{extensions =
+							       [ServerExtKeyUsageExt |
+								ServerExtensions]},
+    NewServerDerCert = public_key:pkix_sign(NewServerOTPTbsCert, Key),
+    ssl_test_lib:der_to_pem(NewServerCertFile, [{'Certificate', NewServerDerCert, not_encrypted}]),
+    NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)],
+
+    ClientCertFile = proplists:get_value(certfile, ClientOpts),
+    NewClientCertFile = filename:join(PrivDir, "client/new_cert.pem"),
+    [{'Certificate', ClientDerCert, _}] = ssl_test_lib:pem_to_der(ClientCertFile),
+    ClientOTPCert = public_key:pkix_decode_cert(ClientDerCert, otp),
+    ClientExtKeyUsageExt = {'Extension', ?'id-ce-extKeyUsage', true, [?'id-kp-clientAuth']},
+    ClientOTPTbsCert = ClientOTPCert#'OTPCertificate'.tbsCertificate,
+    ClientExtensions =  ClientOTPTbsCert#'OTPTBSCertificate'.extensions,
+    NewClientOTPTbsCert = ClientOTPTbsCert#'OTPTBSCertificate'{extensions =
+								   [ClientExtKeyUsageExt |
+								    ClientExtensions]},
+    NewClientDerCert = public_key:pkix_sign(NewClientOTPTbsCert, Key),
+    ssl_test_lib:der_to_pem(NewClientCertFile, [{'Certificate', NewClientDerCert, not_encrypted}]),
+    NewClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts)],
+
     {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_active, []}},
-					{options, [{validate_extensions_fun, Fun}, 
-						   {verify, verify_peer} | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
 
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {?MODULE, send_recv_result_active, []}},
+			   {options, [{verify, verify_none} | NewServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 					{host, Hostname},
-			   {from, self()}, 
+			   {from, self()},
 			   {mfa, {?MODULE, send_recv_result_active, []}},
-			   {options,[{validate_extensions_fun, Fun} | ClientOpts]}]),
-    
+					{options, [{verify, verify_none} | NewClientOpts]}]),
+
     ssl_test_lib:check_result(Server, ok, Client, ok),
-    
+
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
 no_authority_key_identifier(doc) -> 
-    ["Test cert that does not have authorityKeyIdentifier extension"];
+    ["Test cert that does not have authorityKeyIdentifier extension"
+     " but are present in trusted certs db."];
 
 no_authority_key_identifier(suite) -> 
     [];
 no_authority_key_identifier(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
+    ClientOpts = ?config(client_verification_opts, Config),
     ServerOpts = ?config(server_opts, Config),
     PrivDir = ?config(priv_dir, Config),
    
     KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"),
-    {ok, [KeyInfo]} = public_key:pem_to_der(KeyFile),
-    {ok, Key} = public_key:decode_private_key(KeyInfo),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = public_key:pem_entry_decode(KeyEntry),
 
     CertFile = proplists:get_value(certfile, ServerOpts),
     NewCertFile = filename:join(PrivDir, "server/new_cert.pem"),
-    {ok, [{cert, DerCert, _}]} = public_key:pem_to_der(CertFile),
-    {ok, OTPCert} = public_key:pkix_decode_cert(DerCert, otp),
+    [{'Certificate', DerCert, _}] = ssl_test_lib:pem_to_der(CertFile),
+    OTPCert = public_key:pkix_decode_cert(DerCert, otp),
     OTPTbsCert = OTPCert#'OTPCertificate'.tbsCertificate,
     Extensions =  OTPTbsCert#'OTPTBSCertificate'.extensions,
     NewExtensions =  delete_authority_key_extension(Extensions, []),
@@ -2558,8 +2679,8 @@ no_authority_key_identifier(Config) when is_list(Config) ->
 
     test_server:format("Extensions ~p~n, NewExtensions: ~p~n", [Extensions, NewExtensions]),
 
-    NewDerCert = public_key:sign(NewOTPTbsCert, Key), 
-    public_key:der_to_pem(NewCertFile, [{cert, NewDerCert, not_encrypted}]),
+    NewDerCert = public_key:pkix_sign(NewOTPTbsCert, Key), 
+    ssl_test_lib:der_to_pem(NewCertFile, [{'Certificate', NewDerCert, not_encrypted}]),
     NewServerOpts = [{certfile, NewCertFile} | proplists:delete(certfile, ServerOpts)],
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -2597,21 +2718,21 @@ invalid_signature_server(suite) ->
     [];
 
 invalid_signature_server(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
+    ClientOpts = ?config(client_verification_opts, Config),
     ServerOpts = ?config(server_verification_opts, Config),
     PrivDir = ?config(priv_dir, Config),
    
     KeyFile = filename:join(PrivDir, "server/key.pem"),
-    {ok, [KeyInfo]} = public_key:pem_to_der(KeyFile),
-    {ok, Key} = public_key:decode_private_key(KeyInfo),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = public_key:pem_entry_decode(KeyEntry),
 
     ServerCertFile = proplists:get_value(certfile, ServerOpts),
     NewServerCertFile = filename:join(PrivDir, "server/invalid_cert.pem"),
-    {ok, [{cert, ServerDerCert, _}]} = public_key:pem_to_der(ServerCertFile),
-    {ok, ServerOTPCert} = public_key:pkix_decode_cert(ServerDerCert, otp),
+    [{'Certificate', ServerDerCert, _}] = ssl_test_lib:pem_to_der(ServerCertFile),
+    ServerOTPCert = public_key:pkix_decode_cert(ServerDerCert, otp),
     ServerOTPTbsCert = ServerOTPCert#'OTPCertificate'.tbsCertificate,
-    NewServerDerCert = public_key:sign(ServerOTPTbsCert, Key), 
-    public_key:der_to_pem(NewServerCertFile, [{cert, NewServerDerCert, not_encrypted}]),
+    NewServerDerCert = public_key:pkix_sign(ServerOTPTbsCert, Key), 
+    ssl_test_lib:der_to_pem(NewServerCertFile, [{'Certificate', NewServerDerCert, not_encrypted}]),
     NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)],
     
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -2642,16 +2763,16 @@ invalid_signature_client(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
    
     KeyFile = filename:join(PrivDir, "client/key.pem"),
-    {ok, [KeyInfo]} = public_key:pem_to_der(KeyFile),
-    {ok, Key} = public_key:decode_private_key(KeyInfo),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = public_key:pem_entry_decode(KeyEntry),
 
     ClientCertFile = proplists:get_value(certfile, ClientOpts),
     NewClientCertFile = filename:join(PrivDir, "client/invalid_cert.pem"),
-    {ok, [{cert, ClientDerCert, _}]} = public_key:pem_to_der(ClientCertFile),
-    {ok, ClientOTPCert} = public_key:pkix_decode_cert(ClientDerCert, otp),
+    [{'Certificate', ClientDerCert, _}] = ssl_test_lib:pem_to_der(ClientCertFile),
+    ClientOTPCert = public_key:pkix_decode_cert(ClientDerCert, otp),
     ClientOTPTbsCert = ClientOTPCert#'OTPCertificate'.tbsCertificate,
-    NewClientDerCert = public_key:sign(ClientOTPTbsCert, Key), 
-    public_key:der_to_pem(NewClientCertFile, [{cert, NewClientDerCert, not_encrypted}]),
+    NewClientDerCert = public_key:pkix_sign(ClientOTPTbsCert, Key), 
+    ssl_test_lib:der_to_pem(NewClientCertFile, [{'Certificate', NewClientDerCert, not_encrypted}]),
     NewClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts)],
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -2664,11 +2785,11 @@ invalid_signature_client(Config) when is_list(Config) ->
 					      {host, Hostname},
 					      {from, self()}, 
 					      {options, NewClientOpts}]),
-    
+
     tcp_delivery_workaround(Server, {error, "bad certificate"},
 			    Client, {error,"bad certificate"}).
 
-tcp_delivery_workaround(Server, ServMsg, Client, ClientMsg) ->
+tcp_delivery_workaround(Server, ServerMsg, Client, ClientMsg) ->
     receive 
 	{Server, ServerMsg} ->
 	    receive 
@@ -2714,18 +2835,18 @@ cert_expired(suite) ->
     [];
 
 cert_expired(Config) when is_list(Config) -> 
-    ClientOpts = ?config(client_opts, Config),
+    ClientOpts = ?config(client_verification_opts, Config),
     ServerOpts = ?config(server_verification_opts, Config),
     PrivDir = ?config(priv_dir, Config),
    
     KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"),
-    {ok, [KeyInfo]} = public_key:pem_to_der(KeyFile),
-    {ok, Key} = public_key:decode_private_key(KeyInfo),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = public_key:pem_entry_decode(KeyEntry),
 
     ServerCertFile = proplists:get_value(certfile, ServerOpts),
     NewServerCertFile = filename:join(PrivDir, "server/expired_cert.pem"),
-    {ok, [{cert, DerCert, _}]} = public_key:pem_to_der(ServerCertFile),
-    {ok, OTPCert} = public_key:pkix_decode_cert(DerCert, otp),
+    [{'Certificate', DerCert, _}] = ssl_test_lib:pem_to_der(ServerCertFile),
+    OTPCert = public_key:pkix_decode_cert(DerCert, otp),
     OTPTbsCert = OTPCert#'OTPCertificate'.tbsCertificate,
 
     {Year, Month, Day} = date(),
@@ -2748,8 +2869,8 @@ cert_expired(Config) when is_list(Config) ->
 		       [OTPTbsCert#'OTPTBSCertificate'.validity, NewValidity]),
 
     NewOTPTbsCert =  OTPTbsCert#'OTPTBSCertificate'{validity = NewValidity},
-    NewServerDerCert = public_key:sign(NewOTPTbsCert, Key), 
-    public_key:der_to_pem(NewServerCertFile, [{cert, NewServerDerCert, not_encrypted}]),
+    NewServerDerCert = public_key:pkix_sign(NewOTPTbsCert, Key), 
+    ssl_test_lib:der_to_pem(NewServerCertFile, [{'Certificate', NewServerDerCert, not_encrypted}]),
     NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)],
     
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -2772,6 +2893,432 @@ two_digits_str(N) ->
     lists:flatten(io_lib:format("~p", [N])).
 
 %%--------------------------------------------------------------------
+
+client_with_cert_cipher_suites_handshake(doc) ->
+    ["Test that client with a certificate without keyEncipherment usage "
+    " extension can connect to a server with restricted cipher suites "];
+
+client_with_cert_cipher_suites_handshake(suite) ->
+    [];
+
+client_with_cert_cipher_suites_handshake(Config) when is_list(Config) ->
+    ClientOpts =  ?config(client_verification_opts_digital_signature_only, Config),
+    ServerOpts =  ?config(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,
+					       send_recv_result_active, []}},
+					{options, [{active, true},
+						   {ciphers, ssl_test_lib:rsa_non_signed_suites()}
+						   | 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_active, []}},
+					{options, [{active, true}
+						   | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+unknown_server_ca_fail(doc) ->
+    ["Test that the client fails if the ca is unknown in verify_peer mode"];
+unknown_server_ca_fail(suite) ->
+    [];
+unknown_server_ca_fail(Config) when is_list(Config) ->
+    ClientOpts =  ?config(client_opts, Config),
+    ServerOpts =  ?config(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()},
+					      {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]}]),
+
+    ssl_test_lib:check_result(Server, {error,"unknown ca"},
+			      Client, {error, "unknown ca"}).
+
+%%--------------------------------------------------------------------
+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(suite) ->
+    [];
+unknown_server_ca_accept_verify_none(Config) when is_list(Config) ->
+    ClientOpts =  ?config(client_opts, Config),
+    ServerOpts =  ?config(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,
+					       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,
+					       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(suite) ->
+    [];
+unknown_server_ca_accept_verify_peer(Config) when is_list(Config) ->
+    ClientOpts =  ?config(client_opts, Config),
+    ServerOpts =  ?config(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,
+					       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, {?MODULE,
+					       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_backwardscompatibilty(doc) ->
+    ["Test that old style verify_funs will work"];
+unknown_server_ca_accept_backwardscompatibilty(suite) ->
+    [];
+unknown_server_ca_accept_backwardscompatibilty(Config) when is_list(Config) ->
+    ClientOpts =  ?config(client_opts, Config),
+    ServerOpts =  ?config(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,
+					       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, {?MODULE,
+					       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).
+
+%%--------------------------------------------------------------------
+der_input(doc) ->
+    ["Test to input certs and key as der"];
+
+der_input(suite) ->
+    [];
+
+der_input(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    DHParamFile = filename:join(DataDir, "dHParam.pem"),
+
+    SeverVerifyOpts = ?config(server_verification_opts, Config),
+    {ServerCert, ServerKey, ServerCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
+								       SeverVerifyOpts]),
+    ClientVerifyOpts = ?config(client_verification_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, {?MODULE, 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, 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).
+
+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),
+    [{_, 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, {rsa, Key}, CaCerts, DHParams}.
+
+%%--------------------------------------------------------------------
+%% different_ca_peer_sign(doc) ->
+%%     ["Check that a CA can have a different signature algorithm than the peer cert."];
+
+%% different_ca_peer_sign(suite) ->
+%%     [];
+
+%% different_ca_peer_sign(Config) when is_list(Config) ->
+%%     ClientOpts =  ?config(client_mix_opts, Config),
+%%     ServerOpts =  ?config(server_mix_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, {?MODULE, send_recv_result_active_once, []}},
+%% 			   {options, [{active, once},
+%% 				      {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,
+%% 					       send_recv_result_active_once,
+%% 					       []}},
+%% 					{options, [{active, once},
+%% 						   {verify, verify_peer}
+%% 						   | ClientOpts]}]),
+
+%%     ssl_test_lib:check_result(Server, ok, Client, ok),
+%%     ssl_test_lib:close(Server),
+%%     ssl_test_lib:close(Client).
+
+
+%%--------------------------------------------------------------------
+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(suite) ->
+    [];
+
+no_reuses_session_server_restart_new_cert(Config) when is_list(Config) ->
+
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    DsaServerOpts = ?config(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, {?MODULE, 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
+    test_server:sleep(?SLEEP),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client0),
+
+    Server1 =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
+				   {from, self()},
+		      {mfa, {ssl_test_lib, no_result, []}},
+				   {options, DsaServerOpts}]),
+
+    Client1 =
+	ssl_test_lib:start_client([{node, ClientNode},
+		      {port, Port}, {host, Hostname},
+		      {mfa, {?MODULE, session_info_result, []}},
+		      {from, self()},  {options, ClientOpts}]),
+    receive
+	{Client1, SessionInfo} ->
+	    test_server: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(suite) ->
+    [];
+
+no_reuses_session_server_restart_new_cert_file(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_verification_opts, Config),
+    DsaServerOpts = ?config(server_dsa_opts, Config),
+    PrivDir =  ?config(priv_dir, Config),
+
+    NewServerOpts = 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, {?MODULE, session_info_result, []}},
+				   {options, NewServerOpts}]),
+    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!
+    test_server:sleep(?SLEEP* 2),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client0),
+
+    NewServerOpts = new_config(PrivDir, DsaServerOpts),
+
+    Server1 =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
+				   {from, self()},
+		      {mfa, {ssl_test_lib, no_result, []}},
+				   {options, NewServerOpts}]),
+    Client1 =
+	ssl_test_lib:start_client([{node, ClientNode},
+		      {port, Port}, {host, Hostname},
+		      {mfa, {?MODULE, session_info_result, []}},
+				   {from, self()},  {options, ClientOpts}]),
+    receive
+	{Client1, SessionInfo} ->
+	    test_server:fail(session_reused_when_server_has_new_cert);
+	{Client1, _Other} ->
+	   ok
+    end,
+    ssl_test_lib:close(Server1),
+    ssl_test_lib:close(Client1).
+
+%%--------------------------------------------------------------------
+reuseaddr(doc) ->
+    [""];
+
+reuseaddr(suite) ->
+    [];
+
+reuseaddr(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(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]}]),
+    test_server:sleep(?SLEEP),
+    ssl_test_lib:close(Server),
+
+    Server1 =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
+				   {from, self()},
+				   {mfa, {?MODULE, send_recv_result, []}},
+				   {options,  [{active, false} | ServerOpts]}]),
+    Client1 =
+	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+				   {host, Hostname},
+				   {from, self()},
+				   {mfa, {?MODULE, 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
 %%--------------------------------------------------------------------
 send_recv_result(Socket) ->
@@ -2812,7 +3359,27 @@ renegotiate_reuse_session(Socket, Data) ->
     %% Make sure session is registerd
     test_server:sleep(?SLEEP),
     renegotiate(Socket, Data).
- 
+
+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),
+    test_server:format("CA file content: ~p~n", [public_key:pem_decode(PEM)]),
+
+    [{cacertfile, NewCaCertFile}, {certfile, NewCertFile},
+     {keyfile, NewKeyFile} | ServerOpts].
+
 session_cache_process_list(doc) -> 
     ["Test reuse of sessions (short handshake)"];
 
@@ -2971,4 +3538,3 @@ erlang_ssl_receive(Socket, Data) ->
     after ?SLEEP * 3 ->
 	    test_server:fail({did_not_get, Data})
     end.
- 
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index a019e660e9..1ecf55d6e8 100644
--- a/lib/ssl/test/ssl_packet_SUITE.erl
+++ b/lib/ssl/test/ssl_packet_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -23,7 +23,7 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(BYTE(X),     X:8/unsigned-big-integer).
 -define(UINT16(X),   X:16/unsigned-big-integer).
@@ -53,14 +53,18 @@
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    crypto:start(),
-    ssl:start(),
-    Result = 
-	(catch make_certs:all(?config(data_dir, Config), 
-			      ?config(priv_dir, Config))),
-    test_server:format("Make certs  ~p~n", [Result]),
-    ssl_test_lib:cert_options(Config).
-
+    case application:start(crypto) of
+	ok ->
+	    application:start(public_key),
+	    ssl:start(),
+	    Result =
+		(catch make_certs:all(?config(data_dir, Config),
+				      ?config(priv_dir, Config))),
+	    test_server:format("Make certs  ~p~n", [Result]),
+	    ssl_test_lib:cert_options(Config);
+	_  ->
+	    {skip, "Crypto did not start"}
+    end.
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]
@@ -69,7 +73,7 @@ init_per_suite(Config) ->
 %%--------------------------------------------------------------------
 end_per_suite(_Config) ->
     ssl:stop(),
-    crypto:stop().
+    application:stop(crypto).
 
 %%--------------------------------------------------------------------
 %% Function: init_per_testcase(TestCase, Config) -> Config
@@ -114,50 +118,56 @@ end_per_testcase(_TestCase, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test that erlang:decode_packet/3 seems to be handled correctly."
-     "We only use the most basic packet types in our tests as testing of"
-     "the packet types are for inet to verify"
-    ];
-
-all(suite) -> 
-    [packet_raw_passive_many_small, 
-     packet_0_passive_many_small, packet_1_passive_many_small,
-     packet_2_passive_many_small, packet_4_passive_many_small, 
-     packet_raw_passive_some_big, packet_0_passive_some_big, 
-     packet_1_passive_some_big,
-     packet_2_passive_some_big, packet_4_passive_some_big, 
-     packet_raw_active_once_many_small, 
-     packet_0_active_once_many_small, packet_1_active_once_many_small,
-     packet_2_active_once_many_small, packet_4_active_once_many_small,
-     packet_raw_active_once_some_big, 
-     packet_0_active_once_some_big, packet_1_active_once_some_big,
-     packet_2_active_once_some_big, packet_4_active_once_some_big,
-     packet_raw_active_many_small, packet_0_active_many_small, 
-     packet_1_active_many_small,
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [packet_raw_passive_many_small,
+     packet_0_passive_many_small,
+     packet_1_passive_many_small,
+     packet_2_passive_many_small,
+     packet_4_passive_many_small,
+     packet_raw_passive_some_big, packet_0_passive_some_big,
+     packet_1_passive_some_big, packet_2_passive_some_big,
+     packet_4_passive_some_big,
+     packet_raw_active_once_many_small,
+     packet_0_active_once_many_small,
+     packet_1_active_once_many_small,
+     packet_2_active_once_many_small,
+     packet_4_active_once_many_small,
+     packet_raw_active_once_some_big,
+     packet_0_active_once_some_big,
+     packet_1_active_once_some_big,
+     packet_2_active_once_some_big,
+     packet_4_active_once_some_big,
+     packet_raw_active_many_small,
+     packet_0_active_many_small, packet_1_active_many_small,
      packet_2_active_many_small, packet_4_active_many_small,
-     packet_raw_active_some_big, packet_0_active_some_big, 
-     packet_1_active_some_big, packet_2_active_some_big, 
-     packet_4_active_some_big,
-     packet_send_to_large,
+     packet_raw_active_some_big, packet_0_active_some_big,
+     packet_1_active_some_big, packet_2_active_some_big,
+     packet_4_active_some_big, packet_send_to_large,
      packet_wait_passive, packet_wait_active,
      packet_baddata_passive, packet_baddata_active,
      packet_size_passive, packet_size_active,
-     packet_cdr_decode,
-     packet_http_decode,
-     packet_http_decode_list,
-     packet_http_bin_decode_multi,
-     packet_line_decode,
-     packet_asn1_decode,
-     packet_tpkt_decode,
-     %packet_fcgi_decode,
-     packet_sunrm_decode,
-     header_decode_one_byte,
-     header_decode_two_bytes,
+     packet_cdr_decode, packet_cdr_decode_list,
+     packet_http_decode, packet_http_decode_list,
+     packet_http_bin_decode_multi, packet_http_error_passive,
+     packet_line_decode, packet_line_decode_list,
+     packet_asn1_decode, packet_asn1_decode_list,
+     packet_tpkt_decode, packet_tpkt_decode_list,
+     packet_sunrm_decode, packet_sunrm_decode_list,
+     header_decode_one_byte, header_decode_two_bytes,
      header_decode_two_bytes_one_sent,
-     header_decode_two_bytes_two_sent
+     header_decode_two_bytes_two_sent].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-    ].
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
@@ -1428,7 +1438,7 @@ packet_size_passive(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 packet_cdr_decode(doc) ->
-    ["Test setting the packet option {packet, cdr}"];
+    ["Test setting the packet option {packet, cdr}, {mode, binary}"];
 packet_cdr_decode(suite) ->
     [];
 packet_cdr_decode(Config) when is_list(Config) ->
@@ -1462,8 +1472,44 @@ packet_cdr_decode(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
+packet_cdr_decode_list(doc) ->
+    ["Test setting the packet option {packet, cdr} {mode, list}"];
+packet_cdr_decode_list(suite) ->
+    [];
+packet_cdr_decode_list(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    %% A valid cdr packet
+    Data = [71,73,79,80,1,2,2,1,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,1,78,
+	     69,79,0,0,0,0,2,0,10,0,0,0,0,0,0,0,0,0,18,0,0,0,0,0,0,0,4,49],
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_packet_decode,
+					       [Data]}},
+					{options, [{active, true}, list,
+						   {packet, cdr}|ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_packet_decode, 
+					       [Data]}},
+					{options, [{active, true}, {packet, cdr},
+						   list | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
 packet_http_decode(doc) ->
-    ["Test setting the packet option {packet, http} {mode, binary}"];
+    ["Test setting the packet option {packet, http} {mode, binary} "
+     "(Body will be binary http strings are lists)"];
 packet_http_decode(suite) ->
     [];
 
@@ -1484,7 +1530,7 @@ packet_http_decode(Config) when is_list(Config) ->
 					{from, self()},
 					{mfa, {?MODULE, server_http_decode, 
 					       [Response]}},
-					{options, [{active, true}, binary, 
+					{options, [{active, true},binary,
 						   {packet, http} | ServerOpts]}]),
 
     Port = ssl_test_lib:inet_port(Server),
@@ -1493,7 +1539,7 @@ packet_http_decode(Config) when is_list(Config) ->
 					{from, self()},
 					{mfa, {?MODULE, client_http_decode, 
 					       [Request]}},
-					{options, [{active, true}, binary, 
+					{options, [{active, true}, binary,
 						   {packet, http} |
 						   ClientOpts]}]),
 
@@ -1547,7 +1593,8 @@ client_http_decode(Socket, HttpRequest) ->
 
 %%--------------------------------------------------------------------
 packet_http_decode_list(doc) ->
-    ["Test setting the packet option {packet, http}, {mode, list}"];
+    ["Test setting the packet option {packet, http}, {mode, list}"
+     "(Body will be litst too)"];
 packet_http_decode_list(suite) ->
     [];
 packet_http_decode_list(Config) when is_list(Config) ->
@@ -1694,9 +1741,74 @@ client_http_bin_decode(Socket, HttpRequest, Count) when Count > 0 ->
     client_http_bin_decode(Socket, HttpRequest, Count - 1);
 client_http_bin_decode(_, _, _) ->
     ok.
+
+%%--------------------------------------------------------------------
+packet_http_error_passive(doc) ->
+    ["Test setting the packet option {packet, http}, {active, false}"
+    " with a incorrect http header." ];
+packet_http_error_passive(suite) ->
+    [];
+packet_http_error_passive(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Request = "GET / HTTP/1.1\r\n"
+              "host: www.example.com\r\n"
+	      "user-agent HttpTester\r\n"
+	      "\r\n",
+    Response = "HTTP/1.1 200 OK\r\n"
+	       "\r\n"
+	       "Hello!",
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_http_decode_error,
+					       [Response]}},
+					{options, [{active, false}, binary,
+						   {packet, http} |
+						   ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_http_decode_list,
+					       [Request]}},
+					{options, [{active, true}, list,
+						   {packet, http} |
+						   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+server_http_decode_error(Socket, HttpResponse) ->
+    assert_packet_opt(Socket, http),
+
+    {ok, {http_request, 'GET', _, {1,1}}} = ssl:recv(Socket, 0),
+
+    assert_packet_opt(Socket, http),
+
+    {ok, {http_header, _, 'Host', _, "www.example.com"}} = ssl:recv(Socket, 0),
+    assert_packet_opt(Socket, http),
+
+    {ok, {http_error, _}} = ssl:recv(Socket, 0),
+
+    assert_packet_opt(Socket, http),
+
+    {ok, http_eoh} = ssl:recv(Socket, 0),
+
+    assert_packet_opt(Socket, http),
+    ok = ssl:send(Socket, HttpResponse),
+    ok.
+
+
 %%--------------------------------------------------------------------
 packet_line_decode(doc) ->
-    ["Test setting the packet option {packet, line}"];
+    ["Test setting the packet option {packet, line}, {mode, binary}"];
 packet_line_decode(suite) ->
     [];
 packet_line_decode(Config) when is_list(Config) ->
@@ -1730,30 +1842,44 @@ packet_line_decode(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
+%%--------------------------------------------------------------------
 
-server_line_packet_decode(Socket, Lines) ->
-    receive
-	{ssl, Socket,  <<"Line ends here.\n">>} -> ok;
-	Other1 -> exit({?LINE, Other1})
-    end,
-    receive
-	{ssl, Socket,  <<"Now it is a new line.\n">>} -> ok;
-	Other2 -> exit({?LINE, Other2})
-    end,
-    ok = ssl:send(Socket, Lines).
+packet_line_decode_list(doc) ->
+    ["Test setting the packet option {packet, line}, {mode, list}"];
+packet_line_decode_list(suite) ->
+    [];
+packet_line_decode_list(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = lists:flatten(io_lib:format("Line ends here.~n"
+				       "Now it is a new line.~n", [])),
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, 
+					       server_line_packet_decode,
+					       [Data]}},
+					{options, [{active, true}, list, 
+						   {packet, line}|ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, 
+					       client_line_packet_decode, 
+					       [Data]}},
+					{options, [{active, true}, 
+						   {packet, line}, 
+						   list | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
 
-client_line_packet_decode(Socket, Lines) ->
-    <<P1:10/binary, P2/binary>> = Lines,
-    ok = ssl:send(Socket, P1),
-    ok = ssl:send(Socket, P2),
-    receive
-	{ssl, Socket,  <<"Line ends here.\n">>} -> ok;
-	Other1 -> exit({?LINE, Other1})
-    end,
-    receive
-	{ssl, Socket,  <<"Now it is a new line.\n">>} -> ok;
-	Other2 -> exit({?LINE, Other2})
-    end.
 
 %%--------------------------------------------------------------------
 
@@ -1769,7 +1895,7 @@ packet_asn1_decode(Config) when is_list(Config) ->
     File = proplists:get_value(certfile, ServerOpts),
 
     %% A valid asn1 BER packet (DER is stricter BER)
-    {ok,[{cert, Data, _}]} = public_key:pem_to_der(File),
+    [{'Certificate', Data, _}] = ssl_test_lib:pem_to_der(File),
     
     Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
 					{from, self()},
@@ -1793,6 +1919,44 @@ packet_asn1_decode(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
+packet_asn1_decode_list(doc) ->
+    ["Test setting the packet option {packet, asn1}"];
+packet_asn1_decode_list(suite) ->
+    [];
+packet_asn1_decode_list(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    
+    File = proplists:get_value(certfile, ServerOpts),
+
+    %% A valid asn1 BER packet (DER is stricter BER)
+    [{'Certificate', BinData, _}] = ssl_test_lib:pem_to_der(File),
+    
+    Data = binary_to_list(BinData),
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_packet_decode,
+					       [Data]}},
+					{options, [{active, true}, list, 
+						   {packet, asn1}|ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_packet_decode, 
+					       [Data]}},
+					{options, [{active, true}, {packet, asn1},
+						   list | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
 packet_tpkt_decode(doc) ->
     ["Test setting the packet option {packet, tpkt}"];
 packet_tpkt_decode(suite) ->
@@ -1825,6 +1989,38 @@ packet_tpkt_decode(Config) when is_list(Config) ->
 
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+packet_tpkt_decode_list(doc) ->
+    ["Test setting the packet option {packet, tpkt}"];
+packet_tpkt_decode_list(suite) ->
+    [];
+packet_tpkt_decode_list(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    
+    Data = binary_to_list(list_to_binary(add_tpkt_header("TPKT data"))),
+    
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_packet_decode,
+					       [Data]}},
+					{options, [{active, true}, list, 
+						   {packet, tpkt}|ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_packet_decode, 
+					       [Data]}},
+					{options, [{active, true}, {packet, tpkt},
+						   list | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
 
@@ -1894,6 +2090,39 @@ packet_sunrm_decode(Config) when is_list(Config) ->
 
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+packet_sunrm_decode_list(doc) ->
+    ["Test setting the packet option {packet, sunrm}"];
+packet_sunrm_decode_list(suite) ->
+    [];
+packet_sunrm_decode_list(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    
+    Data = binary_to_list(list_to_binary([<<11:32>>, "Hello world"])),
+    
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, server_packet_decode,
+					       [Data]}},
+					{options, [{active, true}, list, 
+						   {packet, sunrm}|ServerOpts]}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, client_packet_decode, 
+					       [Data]}},
+					{options, [{active, true}, {packet, sunrm},
+						   list | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
 %%--------------------------------------------------------------------
 
 header_decode_one_byte(doc) ->
@@ -2036,21 +2265,29 @@ header_decode_two_bytes_one_sent(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 %% Internal functions
 
-send_raw(_,_, 0) ->
+send_raw(Socket,_, 0) ->
+    ssl:send(Socket, <<>>),
     no_result_msg;
 send_raw(Socket, Data, N) ->
     ssl:send(Socket, Data),
     send_raw(Socket, Data, N-1).
 
-passive_raw(_, _, 0) ->
+passive_raw(Socket, _, 0) ->
+    {error, timeout} = ssl:recv(Socket, 0, 500),
     ok;
 passive_raw(Socket, Data, N) ->
     Length = length(Data),
     {ok, Data} = ssl:recv(Socket, Length),
     passive_raw(Socket, Data, N-1).
 
-passive_recv_packet(_, _, 0) ->
-    ok;
+passive_recv_packet(Socket, _, 0) ->
+    case ssl:recv(Socket, 0) of
+	{ok, []} ->
+	    {error, timeout} = ssl:recv(Socket, 0, 500),
+	    ok;
+	Other ->
+	    {other, Other, ssl:session_info(Socket), 0}
+    end;
 passive_recv_packet(Socket, Data, N) ->
     case ssl:recv(Socket, 0) of
 	{ok, Data} -> 
@@ -2059,7 +2296,8 @@ passive_recv_packet(Socket, Data, N) ->
 	    {other, Other, ssl:session_info(Socket), N}
     end.
 
-send(_,_, 0) ->
+send(Socket,_, 0) ->
+    ssl:send(Socket, <<>>),
     no_result_msg;
 send(Socket, Data, N) ->
     case ssl:send(Socket, [Data]) of
@@ -2073,6 +2311,7 @@ send_incomplete(Socket, Data, N) ->
     send_incomplete(Socket, Data, N, <<>>).
 send_incomplete(Socket, _Data, 0, Prev) ->
     ssl:send(Socket, Prev),
+    ssl:send(Socket, [?uint32(0)]),
     no_result_msg;
 send_incomplete(Socket, Data, N, Prev) ->
     Length = size(Data),
@@ -2101,8 +2340,13 @@ active_once_raw(Socket, Data, N, Acc) ->
 	    end
     end.
 
-active_once_packet(_,_, 0) ->
-    ok;
+active_once_packet(Socket,_, 0) ->
+    receive
+	{ssl, Socket, []} ->
+	    ok;
+	{ssl, Socket, Other} ->
+	    {other, Other, ssl:session_info(Socket), 0}
+    end;
 active_once_packet(Socket, Data, N) ->
     receive 
 	{ssl, Socket, Data} ->
@@ -2114,7 +2358,7 @@ active_once_packet(Socket, Data, N) ->
 active_raw(Socket, Data, N) ->
     active_raw(Socket, Data, N, []).
 
-active_raw(_, _, 0, _) ->
+active_raw(_Socket, _, 0, _) ->
     ok;
 active_raw(Socket, Data, N, Acc) ->
     receive 
@@ -2129,8 +2373,13 @@ active_raw(Socket, Data, N, Acc) ->
 	    end
     end.
 
-active_packet(_, _, 0) ->
-    ok;
+active_packet(Socket, _, 0) ->
+    receive
+	{ssl, Socket, []} ->
+	    ok;
+	Other ->
+	    {other, Other, ssl:session_info(Socket), 0}
+    end;
 active_packet(Socket, Data, N) ->
     receive 
 	{ssl, Socket, Data} ->
@@ -2154,8 +2403,14 @@ server_packet_decode(Socket, Packet) ->
     end,
     ok = ssl:send(Socket, Packet).
 
-client_packet_decode(Socket, Packet) ->
+client_packet_decode(Socket, Packet) when is_binary(Packet)->
     <<P1:10/binary, P2/binary>> = Packet,
+    client_packet_decode(Socket, P1, P2, Packet);
+client_packet_decode(Socket, [Head | Tail] = Packet) ->
+    client_packet_decode(Socket, [Head], Tail, Packet).
+
+client_packet_decode(Socket, P1, P2, Packet) ->
+    test_server:format("Packet: ~p ~n", [Packet]),
     ok = ssl:send(Socket, P1),
     ok = ssl:send(Socket, P2),
     receive
@@ -2175,7 +2430,7 @@ server_header_decode(Socket, Packet, Result) ->
     end,
     ok = ssl:send(Socket, Packet),
     receive
-	{ssl, Socket,  Result}  -> ok;
+	{ssl, Socket, Result}  -> ok;
 	Other2 -> exit({?LINE, Other2})
     end,
     ok = ssl:send(Socket, Packet).
@@ -2191,6 +2446,44 @@ client_header_decode(Socket, Packet, Result) ->
 	{ssl, Socket, Result}  -> ok;
 	Other2 -> exit({?LINE, Other2})
     end.
+    
+server_line_packet_decode(Socket, Packet) when is_binary(Packet) ->
+    [L1, L2] = string:tokens(binary_to_list(Packet), "\n"),
+    server_line_packet_decode(Socket, list_to_binary(L1 ++ "\n"), list_to_binary(L2 ++ "\n"), Packet);
+server_line_packet_decode(Socket, Packet) ->
+    [L1, L2] = string:tokens(Packet, "\n"),
+    server_line_packet_decode(Socket, L1 ++ "\n", L2 ++ "\n", Packet).
+
+server_line_packet_decode(Socket, L1, L2, Packet) ->
+    receive
+  	{ssl, Socket,  L1} -> ok;
+  	Other1 -> exit({?LINE, Other1})
+    end,
+    receive
+  	{ssl, Socket,  L2} -> ok;
+  	Other2 -> exit({?LINE, Other2})
+    end,
+    ok = ssl:send(Socket, Packet).
+
+client_line_packet_decode(Socket, Packet) when is_binary(Packet)->
+    <<P1:10/binary, P2/binary>> = Packet,
+    [L1, L2] = string:tokens(binary_to_list(Packet), "\n"),
+    client_line_packet_decode(Socket, P1, P2, list_to_binary(L1 ++ "\n"), list_to_binary(L2 ++ "\n"));
+client_line_packet_decode(Socket, [Head | Tail] = Packet) ->
+    [L1, L2] = string:tokens(Packet, "\n"),
+    client_line_packet_decode(Socket, [Head], Tail, L1 ++ "\n", L2 ++ "\n").
+
+client_line_packet_decode(Socket, P1, P2, L1, L2) ->
+    ok = ssl:send(Socket, P1),
+    ok = ssl:send(Socket, P2),
+    receive
+  	{ssl, Socket, L1} -> ok;
+  	Other1 -> exit({?LINE, Other1})
+    end,
+    receive
+  	{ssl, Socket,  L2} -> ok;
+  	Other2 -> exit({?LINE, Other2})
+    end.
 
 add_tpkt_header(Data) when is_binary(Data) ->
     L = size(Data) + 4,
diff --git a/lib/ssl/test/ssl_payload_SUITE.erl b/lib/ssl/test/ssl_payload_SUITE.erl
index a0aa92bdf2..f57d7fa0e8 100644
--- a/lib/ssl/test/ssl_payload_SUITE.erl
+++ b/lib/ssl/test/ssl_payload_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2008-2011. 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%
 %%
 
@@ -22,7 +22,7 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(TIMEOUT, 600000).
 
@@ -37,11 +37,15 @@
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    crypto:start(),
-    ssl:start(),
-    make_certs:all(?config(data_dir, Config), ?config(priv_dir, Config)),
-    ssl_test_lib:cert_options(Config).
-
+    case application:start(crypto) of
+	ok ->
+	    application:start(public_key),
+	    ssl:start(),
+	    make_certs:all(?config(data_dir, Config), ?config(priv_dir, Config)),
+	    ssl_test_lib:cert_options(Config);
+	_  ->
+	    {skip, "Crypto did not start"}
+    end.
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]
@@ -50,7 +54,7 @@ init_per_suite(Config) ->
 %%--------------------------------------------------------------------
 end_per_suite(_Config) ->
     ssl:stop(),
-    crypto:stop().
+    application:stop(crypto).
 
 %%--------------------------------------------------------------------
 %% Function: init_per_testcase(TestCase, Config) -> Config
@@ -95,24 +99,30 @@ end_per_testcase(_TestCase, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test payload over ssl in all socket modes, active, active_once,"
-     "and passive mode."];
-
-all(suite) -> 
-    [server_echos_passive_small, server_echos_active_once_small, 
-     server_echos_active_small,
-     client_echos_passive_small, client_echos_active_once_small, 
-     client_echos_active_small,
-     server_echos_passive_big, server_echos_active_once_big, 
-     server_echos_active_big,
-     client_echos_passive_big, client_echos_active_once_big, 
-     client_echos_active_big,
-     server_echos_passive_huge, server_echos_active_once_huge, 
-     server_echos_active_huge,
-     client_echos_passive_huge, client_echos_active_once_huge, 
-     client_echos_active_huge    
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [server_echos_passive_small,
+     server_echos_active_once_small,
+     server_echos_active_small, client_echos_passive_small,
+     client_echos_active_once_small,
+     client_echos_active_small, server_echos_passive_big,
+     server_echos_active_once_big, server_echos_active_big,
+     client_echos_passive_big, client_echos_active_once_big,
+     client_echos_active_big, server_echos_passive_huge,
+     server_echos_active_once_huge, server_echos_active_huge,
+     client_echos_passive_huge,
+     client_echos_active_once_huge, client_echos_active_huge].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl
new file mode 100644
index 0000000000..b47efe0941
--- /dev/null
+++ b/lib/ssl/test/ssl_session_cache_SUITE.erl
@@ -0,0 +1,317 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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/.2
+%%
+%% 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_session_cache_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(SLEEP, 500).
+-define(TIMEOUT, 60000).
+-define(LONG_TIMEOUT, 600000).
+-behaviour(ssl_session_cache_api).
+
+%% For the session cache tests
+-export([init/1, terminate/1, lookup/2, update/3,
+	 delete/2, foldl/3, select_session/2]).
+
+%% 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(Config0) ->
+    Dog = ssl_test_lib:timetrap(?LONG_TIMEOUT *2),
+    case application:start(crypto) of
+	ok ->
+	    application:start(public_key),
+	    ssl:start(),
+
+	    %% make rsa certs using oppenssl
+	    Result =
+		(catch make_certs:all(?config(data_dir, Config0),
+				      ?config(priv_dir, Config0))),
+	    test_server:format("Make certs  ~p~n", [Result]),
+
+	    Config1 = ssl_test_lib:make_dsa_cert(Config0),
+	    Config = ssl_test_lib:cert_options(Config1),
+	    [{watchdog, Dog} | Config];
+	_ ->
+	    {skip, "Crypto did not start"}
+    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) ->
+    ssl:stop(),
+    application:stop(crypto).
+
+%%--------------------------------------------------------------------
+%% 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(session_cache_process_list, Config) ->
+    init_customized_session_cache(list, Config);
+
+init_per_testcase(session_cache_process_mnesia, Config) ->
+    mnesia:start(),
+    init_customized_session_cache(mnesia, Config);
+
+init_per_testcase(_TestCase, Config0) ->
+    Config = lists:keydelete(watchdog, 1, Config0),
+    Dog = test_server:timetrap(?TIMEOUT),
+   [{watchdog, Dog} | Config].
+
+init_customized_session_cache(Type, Config0) ->
+    Config = lists:keydelete(watchdog, 1, Config0),
+    Dog = test_server:timetrap(?TIMEOUT),
+    ssl:stop(),
+    application:load(ssl),
+    application:set_env(ssl, session_cb, ?MODULE),
+    application:set_env(ssl, session_cb_init_args, [Type]),
+    ssl:start(),
+    [{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(session_cache_process_list, Config) ->
+    application:unset_env(ssl, session_cb),
+    end_per_testcase(default_action, Config);
+end_per_testcase(session_cache_process_mnesia, Config) ->
+    application:unset_env(ssl, session_cb),
+    application:unset_env(ssl, session_cb_init_args),
+    mnesia:kill(),
+    ssl:stop(),
+    ssl:start(),
+    end_per_testcase(default_action, Config);
+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() -> 
+    [session_cache_process_list,
+     session_cache_process_mnesia].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+session_cache_process_list(doc) ->
+    ["Test reuse of sessions (short handshake)"];
+
+session_cache_process_list(suite) ->
+    [];
+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(suite) ->
+    [];
+session_cache_process_mnesia(Config) when is_list(Config) ->
+    session_cache_process(mnesia,Config).
+
+
+%%--------------------------------------------------------------------
+%%% Session cache API callbacks
+%%--------------------------------------------------------------------
+
+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.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
+session_cache_process(_Type,Config) when is_list(Config) ->
+    ssl_basic_SUITE:reuse_session(Config).
diff --git a/lib/ssl/test/ssl_test_MACHINE.erl b/lib/ssl/test/ssl_test_MACHINE.erl
index e75f7079ed..e0ffa15d80 100644
--- a/lib/ssl/test/ssl_test_MACHINE.erl
+++ b/lib/ssl/test/ssl_test_MACHINE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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%
 %%
 
@@ -60,10 +60,12 @@ many_conns_1() ->
 %% 
 mk_ssl_cert_opts(_Config) ->
     Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    COpts = [{cacertfile, filename:join([Dir, "client", "cacerts.pem"])}, 
+    COpts = [{ssl_imp, old},
+	     {cacertfile, filename:join([Dir, "client", "cacerts.pem"])}, 
 	     {certfile, filename:join([Dir, "client", "cert.pem"])}, 
 	     {keyfile, filename:join([Dir, "client", "key.pem"])}], 
-    SOpts = [{cacertfile, filename:join([Dir, "server", "cacerts.pem"])}, 
+    SOpts = [{ssl_imp, old},
+	     {cacertfile, filename:join([Dir, "server", "cacerts.pem"])}, 
 	     {certfile, filename:join([Dir, "server", "cert.pem"])}, 
 	     {keyfile, filename:join([Dir, "server", "key.pem"])}], 
     {ok, {COpts, SOpts}}.
@@ -225,11 +227,13 @@ start_ssl(Nodes, Config) ->
     ok.
 
 do_start(Env) ->
+    application:start(crypto),
+    application:start(public_key),
     application:load(ssl),
     lists:foreach(
       fun({Par, Val}) -> application:set_env(ssl, Par, Val) end, Env),
-    application:start(ssl),
-    application:start(crypto).
+    application:start(ssl).
+
     
 %%
 %% start_node(Name) -> {ok, Node}
@@ -542,7 +546,7 @@ get_active(St) ->
 listen(St, LPort) ->
     case St#st.protomod of
 	ssl ->
-	    ssl:listen(LPort, St#st.sockopts ++ St#st.sslopts);
+	    ssl:listen(LPort, [{ssl_imp, old} | St#st.sockopts ++ St#st.sslopts]);
 	gen_tcp ->
 	    gen_tcp:listen(LPort, St#st.sockopts)
     end.
@@ -584,7 +588,8 @@ connect(St, Host, Port) ->
     
     case St#st.protomod of
 	ssl ->
-	    case ssl:connect(Host, Port, St#st.sockopts ++ St#st.sslopts, 
+	    case ssl:connect(Host, Port, 
+			     [{ssl_imp, old} | St#st.sockopts ++ St#st.sslopts], 
 			     St#st.timeout) of
 		{ok, Sock} ->
 		    {ok, LPort} = ssl:sockname(Sock),
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 46b6eb401d..f6ccbe85e3 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -81,14 +81,20 @@ run_server(ListenSocket, Opts) ->
 	no_result_msg ->
 	    ok;
 	Msg ->
-	    test_server:format("Msg: ~p ~n", [Msg]),    
+	    test_server:format("Server Msg: ~p ~n", [Msg]),
 	    Pid ! {self(), Msg}
     end,
-    receive 
+    receive
 	listen ->
 	    run_server(ListenSocket, Opts);
+	{listen, MFA} ->
+	    run_server(ListenSocket, [MFA | proplists:delete(mfa, Opts)]);
 	close ->
-	    ok = rpc:call(Node, ssl, close, [AcceptSocket])
+	    test_server:format("Server closing  ~p ~n", [self()]),
+	    Result = rpc:call(Node, ssl, close, [AcceptSocket], 500),
+	    test_server:format("Result ~p ~n", [Result]);
+	{ssl_closed, _} ->
+	    ok
     end.
 
 %%% To enable to test with s_client -reconnect
@@ -151,19 +157,30 @@ run_client(Opts) ->
 		no_result_msg ->
 		    ok;
 		Msg ->
+		    test_server:format("Client Msg: ~p ~n", [Msg]),
 		    Pid ! {self(), Msg}
 	    end,
-	    receive 
+	    receive
 		close ->
-		    ok = rpc:call(Node, ssl, close, [Socket])
+		    test_server:format("Client closing~n", []),
+		    rpc:call(Node, ssl, close, [Socket]);
+		{ssl_closed, Socket} ->
+		    ok
 	    end;
 	{error, Reason} ->
-	    test_server:format("Client: connection failed: ~p ~n", [Reason]), 
+	    test_server:format("Client: connection failed: ~p ~n", [Reason]),
 	       Pid ! {self(), {error, Reason}}
     end.
 
 close(Pid) ->
-    Pid ! close.
+    test_server:format("Close ~p ~n", [Pid]),
+    Monitor = erlang:monitor(process, Pid),
+    Pid ! close,
+    receive
+	{'DOWN', Monitor, process, Pid, Reason} ->
+	    erlang:demonitor(Monitor),
+	    test_server:format("Pid: ~p down due to:~p ~n", [Pid, Reason])
+    end.
 
 check_result(Server, ServerMsg, Client, ClientMsg) -> 
     receive 
@@ -208,47 +225,27 @@ check_result(Pid, Msg) ->
 	    test_server:fail(Reason)
     end.
 
-check_result_ignore_renegotiation_reject(Pid, Msg) -> 
-    receive 
-	{Pid,  fail_session_fatal_alert_during_renegotiation} ->
-	    test_server:comment("Server rejected old renegotiation"),
-	    ok;
-	{ssl_error, _, esslconnect} ->
-	    test_server:comment("Server rejected old renegotiation"),
-	    ok;
-	{Pid, Msg} -> 
-	    ok;
-	{Port, {data,Debug}} when is_port(Port) ->
-	    io:format("openssl ~s~n",[Debug]),
-	    check_result(Pid,Msg);
-	Unexpected ->
-	    Reason = {{expected, {Pid, Msg}}, 
-		      {got, Unexpected}},
-	    test_server:fail(Reason)
-    end.
-
-
 wait_for_result(Server, ServerMsg, Client, ClientMsg) -> 
     receive 
 	{Server, ServerMsg} -> 
 	    receive 
 		{Client, ClientMsg} ->
-		    ok;
-		Unexpected ->
-		    Unexpected
+		    ok
+		%% Unexpected ->
+		%%     Unexpected
 	    end;
 	{Client, ClientMsg} -> 
 	    receive 
 		{Server, ServerMsg} ->
-		    ok;
-		Unexpected ->
-		    Unexpected
+		    ok
+		%% Unexpected ->
+		%%     Unexpected
 	    end;
 	{Port, {data,Debug}} when is_port(Port) ->
 	    io:format("openssl ~s~n",[Debug]),
-	    wait_for_result(Server, ServerMsg, Client, ClientMsg);
-	Unexpected ->
-	    Unexpected
+	    wait_for_result(Server, ServerMsg, Client, ClientMsg)
+	%% Unexpected ->
+	%%     Unexpected
     end.
 
 
@@ -258,9 +255,9 @@ wait_for_result(Pid, Msg) ->
 	    ok;
 	{Port, {data,Debug}} when is_port(Port) ->
 	    io:format("openssl ~s~n",[Debug]),
-	    wait_for_result(Pid,Msg);
-	Unexpected ->
-	    Unexpected
+	    wait_for_result(Pid,Msg)
+	%% Unexpected ->
+	%%     Unexpected
     end.
 
 cert_options(Config) ->
@@ -268,6 +265,8 @@ cert_options(Config) ->
 				      "client", "cacerts.pem"]),
     ClientCertFile = filename:join([?config(priv_dir, Config), 
 				    "client", "cert.pem"]),
+    ClientCertFileDigitalSignatureOnly = filename:join([?config(priv_dir, Config),
+				    "client", "digital_signature_only_cert.pem"]),
     ServerCaCertFile = filename:join([?config(priv_dir, Config), 
 				      "server", "cacerts.pem"]),
     ServerCertFile = filename:join([?config(priv_dir, Config), 
@@ -292,8 +291,13 @@ cert_options(Config) ->
 				{certfile, ClientCertFile},  
 				{keyfile, ClientKeyFile},
 				{ssl_imp, new}]}, 
+     {client_verification_opts_digital_signature_only, [{cacertfile, ClientCaCertFile},
+				{certfile, ClientCertFileDigitalSignatureOnly},
+				{keyfile, ClientKeyFile},
+				{ssl_imp, new}]},
      {server_opts, [{ssl_imp, new},{reuseaddr, true}, 
 		    {certfile, ServerCertFile}, {keyfile, ServerKeyFile}]},
+     {server_anon, [{ssl_imp, new},{reuseaddr, true}, {ciphers, anonymous_suites()}]},
      {server_verification_opts, [{ssl_imp, new},{reuseaddr, true}, 
 		    {cacertfile, ServerCaCertFile},
 		    {certfile, ServerCertFile}, {keyfile, ServerKeyFile}]},
@@ -318,6 +322,58 @@ cert_options(Config) ->
      | Config].
 
 
+make_dsa_cert(Config) ->
+    
+    {ServerCaCertFile, ServerCertFile, ServerKeyFile} = make_cert_files("server", Config, dsa, dsa, ""),
+    {ClientCaCertFile, ClientCertFile, ClientKeyFile} = make_cert_files("client", Config, dsa, dsa, ""),
+    [{server_dsa_opts, [{ssl_imp, new},{reuseaddr, true}, 
+				 {cacertfile, ServerCaCertFile},
+				 {certfile, ServerCertFile}, {keyfile, ServerKeyFile}]},
+     {server_dsa_verify_opts, [{ssl_imp, new},{reuseaddr, true}, 
+			       {cacertfile, ClientCaCertFile},
+			       {certfile, ServerCertFile}, {keyfile, ServerKeyFile},
+			       {verify, verify_peer}]},
+     {client_dsa_opts, [{ssl_imp, new},{reuseaddr, true}, 
+			{cacertfile, ClientCaCertFile},
+			{certfile, ClientCertFile}, {keyfile, ClientKeyFile}]}
+     | Config].
+
+
+make_mix_cert(Config) ->
+    {ServerCaCertFile, ServerCertFile, ServerKeyFile} = make_cert_files("server", Config, dsa,
+									rsa, "mix"),
+    {ClientCaCertFile, ClientCertFile, ClientKeyFile} = make_cert_files("client", Config, dsa,
+									rsa, "mix"),
+    [{server_mix_opts, [{ssl_imp, new},{reuseaddr, true},
+				 {cacertfile, ServerCaCertFile},
+				 {certfile, ServerCertFile}, {keyfile, ServerKeyFile}]},
+     {server_mix_verify_opts, [{ssl_imp, new},{reuseaddr, true},
+			       {cacertfile, ClientCaCertFile},
+			       {certfile, ServerCertFile}, {keyfile, ServerKeyFile},
+			       {verify, verify_peer}]},
+     {client_mix_opts, [{ssl_imp, new},{reuseaddr, true},
+			{cacertfile, ClientCaCertFile},
+			{certfile, ClientCertFile}, {keyfile, ClientKeyFile}]}
+     | Config].
+
+make_cert_files(RoleStr, Config, Alg1, Alg2, Prefix) ->
+    Alg1Str = atom_to_list(Alg1),
+    Alg2Str = atom_to_list(Alg2),
+    CaInfo = {CaCert, _} = erl_make_certs:make_cert([{key, Alg1}]),
+    {Cert, CertKey} = erl_make_certs:make_cert([{key, Alg2}, {issuer, CaInfo}]),
+    CaCertFile = filename:join([?config(priv_dir, Config), 
+				RoleStr, Prefix ++ Alg1Str ++ "_cacerts.pem"]),
+    CertFile = filename:join([?config(priv_dir, Config), 
+			      RoleStr, Prefix ++ Alg2Str ++ "_cert.pem"]),
+    KeyFile = filename:join([?config(priv_dir, Config), 
+				   RoleStr, Prefix ++ Alg2Str ++ "_key.pem"]),
+    
+    der_to_pem(CaCertFile, [{'Certificate', CaCert, not_encrypted}]),
+    der_to_pem(CertFile, [{'Certificate', Cert, not_encrypted}]),
+    der_to_pem(KeyFile, [CertKey]),
+    {CaCertFile, CertFile, KeyFile}.
+
+
 start_upgrade_server(Args) ->
     Result = spawn_link(?MODULE, run_upgrade_server, [Args]),
     receive
@@ -355,10 +411,12 @@ run_upgrade_server(Opts) ->
 				end,
 	{Module, Function, Args} = proplists:get_value(mfa, Opts),
 	Msg = rpc:call(Node, Module, Function, [SslAcceptSocket | Args]),
+	test_server:format("Upgrade Server Msg: ~p ~n", [Msg]),
 	Pid ! {self(), Msg},
 	receive
 	    close ->
-		ok = rpc:call(Node, ssl, close, [SslAcceptSocket])
+		test_server:format("Upgrade Server closing~n", []),
+		rpc:call(Node, ssl, close, [SslAcceptSocket])
 	end
     catch error:{badmatch, Error} ->
 	    Pid ! {self(), Error}
@@ -388,10 +446,12 @@ run_upgrade_client(Opts) ->
     test_server:format("apply(~p, ~p, ~p)~n", 
 		       [Module, Function, [SslSocket | Args]]),
     Msg = rpc:call(Node, Module, Function, [SslSocket | Args]),
+    test_server:format("Upgrade Client Msg: ~p ~n", [Msg]),
     Pid ! {self(), Msg},
     receive 
 	close ->
-	    ok = rpc:call(Node, ssl, close, [SslSocket])
+	    test_server:format("Upgrade Client closing~n", []),
+	    rpc:call(Node, ssl, close, [SslSocket])
     end.
 
 start_upgrade_server_error(Args) ->
@@ -529,3 +589,82 @@ send_selected_port(Pid, 0, Socket) ->
     Pid ! {self(), {port, NewPort}};
 send_selected_port(_,_,_) ->
     ok.
+
+rsa_suites() ->
+    lists:filter(fun({dhe_dss, _, _}) ->
+			 false;
+		    (_) ->
+			 true
+		 end,
+		 ssl:cipher_suites()).
+
+rsa_non_signed_suites() ->
+    lists:filter(fun({rsa, _, _}) ->
+			 true;
+		    (_) ->
+			 false
+		 end,
+		 ssl:cipher_suites()).
+
+dsa_suites() ->
+     lists:filter(fun({dhe_dss, _, _}) ->
+			 true;
+		    (_) ->
+			 false
+		 end,
+		 ssl:cipher_suites()).
+
+
+openssl_rsa_suites() ->
+    Ciphers = ssl:cipher_suites(openssl),
+    lists:filter(fun(Str) ->
+			 case re:run(Str,"DSS",[]) of
+			     nomatch ->
+				 true;
+			     _ ->
+				 false
+			 end 
+		 end, Ciphers).
+
+openssl_dsa_suites() ->
+    Ciphers = ssl:cipher_suites(openssl),
+    lists:filter(fun(Str) ->
+			 case re:run(Str,"DSS",[]) of
+			     nomatch ->
+				 false;
+			     _ ->
+				 true
+			 end 
+		 end, Ciphers).
+
+anonymous_suites() ->
+    [{dh_anon, rc4_128, md5},
+     {dh_anon, des_cbc, sha},
+     {dh_anon, '3des_ede_cbc', sha},
+     {dh_anon, aes_128_cbc, sha},
+     {dh_anon, aes_256_cbc, sha}].
+
+pem_to_der(File) ->
+    {ok, PemBin} = file:read_file(File),
+    public_key:pem_decode(PemBin).
+
+der_to_pem(File, Entries) ->
+    PemBin = public_key:pem_encode(Entries),
+    file:write_file(File, PemBin).
+
+cipher_result(Socket, Result) ->
+    Result = ssl:connection_info(Socket),
+    test_server:format("Successfull connect: ~p~n", [Result]),
+    %% Importante to send two packets here
+    %% to properly test "cipher state" handling
+    ssl:send(Socket, "Hello\n"),
+    receive 
+	{ssl, Socket, "Hello\n"} ->
+	    ssl:send(Socket, " world\n"),
+	    receive
+		{ssl, Socket, " world\n"} ->
+		    ok
+	    end;       
+	Other ->
+	    {unexpected, Other}
+    end.
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 1c18f10038..4ab8fe3273 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -24,11 +24,10 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include("test_server.hrl").
--include("test_server_line.hrl").
--include("ssl_pkix.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(TIMEOUT, 120000).
+-define(LONG_TIMEOUT, 600000).
 -define(SLEEP, 1000).
 -define(OPENSSL_RENEGOTIATE, "r\n").
 -define(OPENSSL_QUIT, "Q\n").
@@ -45,18 +44,26 @@
 %% 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) ->
+init_per_suite(Config0) ->
+    Dog = ssl_test_lib:timetrap(?LONG_TIMEOUT *2),
     case os:find_executable("openssl") of
 	false ->
 	    {skip, "Openssl not found"};
 	_ ->
-	    crypto:start(),
-	    ssl:start(),
-	    Result = 
-		(catch make_certs:all(?config(data_dir, Config), 
-				      ?config(priv_dir, Config))),
-	    test_server:format("Make certs  ~p~n", [Result]),
-	    ssl_test_lib:cert_options(Config)
+	    case application:start(crypto) of
+		ok ->
+		    application:start(public_key),
+		    ssl:start(),
+		    Result =
+			(catch make_certs:all(?config(data_dir, Config0),
+					      ?config(priv_dir, Config0))),
+		    test_server:format("Make certs  ~p~n", [Result]),
+		    Config1 = ssl_test_lib:make_dsa_cert(Config0),
+		    Config = ssl_test_lib:cert_options(Config1),
+		    [{watchdog, Dog} | Config];
+		_  ->
+		    {skip, "Crypto did not start"}
+	    end
     end.
 
 %%--------------------------------------------------------------------
@@ -67,7 +74,7 @@ init_per_suite(Config) ->
 %%--------------------------------------------------------------------
 end_per_suite(_Config) ->
     ssl:stop(),
-    crypto:stop().
+    application:stop(crypto).
 
 %%--------------------------------------------------------------------
 %% Function: init_per_testcase(TestCase, Config) -> Config
@@ -136,32 +143,43 @@ end_per_testcase(_, Config) ->
 %%   Name of a test case.
 %% Description: Returns a list of all test cases in this test suite
 %%--------------------------------------------------------------------
-all(doc) -> 
-    ["Test erlangs ssl against openssl"];
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all(suite) -> 
-    [erlang_client_openssl_server, 
+all() -> 
+    [erlang_client_openssl_server,
      erlang_server_openssl_client,
+     tls1_erlang_client_openssl_server_dsa_cert,
+     tls1_erlang_server_openssl_client_dsa_cert,
+     ssl3_erlang_client_openssl_server_dsa_cert,
+     ssl3_erlang_server_openssl_client_dsa_cert,
      erlang_server_openssl_client_reuse_session,
      erlang_client_openssl_server_renegotiate,
      erlang_client_openssl_server_no_wrap_sequence_number,
      erlang_server_openssl_client_no_wrap_sequence_number,
      erlang_client_openssl_server_no_server_ca_cert,
-     ssl3_erlang_client_openssl_server, 
+     ssl3_erlang_client_openssl_server,
      ssl3_erlang_server_openssl_client,
      ssl3_erlang_client_openssl_server_client_cert,
      ssl3_erlang_server_openssl_client_client_cert,
      ssl3_erlang_server_erlang_client_client_cert,
-     tls1_erlang_client_openssl_server, 
+     tls1_erlang_client_openssl_server,
      tls1_erlang_server_openssl_client,
      tls1_erlang_client_openssl_server_client_cert,
      tls1_erlang_server_openssl_client_client_cert,
      tls1_erlang_server_erlang_client_client_cert,
-     ciphers,
-     erlang_client_bad_openssl_server,
-     expired_session,
-     ssl2_erlang_server_openssl_client
-    ].
+     ciphers_rsa_signed_certs, ciphers_dsa_signed_certs,
+     erlang_client_bad_openssl_server, expired_session,
+     ssl2_erlang_server_openssl_client].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% Test cases starts here.
 %%--------------------------------------------------------------------
@@ -247,6 +265,185 @@ erlang_server_openssl_client(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------- 
 
+tls1_erlang_client_openssl_server_dsa_cert(doc) ->
+    ["Test erlang server with openssl client"];
+tls1_erlang_client_openssl_server_dsa_cert(suite) ->
+    [];
+tls1_erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ClientOpts = ?config(client_dsa_opts, Config),  
+    ServerOpts = ?config(server_dsa_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),
+   
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
+	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile  
+	++ " -key " ++ KeyFile ++ " -Verify 2 -tls1 -msg", 
+    
+    test_server:format("openssl cmd: ~p~n", [Cmd]),
+
+    OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
+
+    wait_for_openssl_server(),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					{host, Hostname},
+					{from, self()}, 
+					{mfa, {?MODULE, 
+					       erlang_ssl_receive, [Data]}},
+					{options, ClientOpts}]),
+
+    port_command(OpensslPort, Data),
+    
+    ssl_test_lib:check_result(Client, ok), 
+   
+    %% Clean close down!   Server needs to be closed first !!
+    close_port(OpensslPort),
+
+    ssl_test_lib:close(Client),
+    process_flag(trap_exit, false),
+    ok.
+
+%%-------------------------------------------------------------------- 
+
+tls1_erlang_server_openssl_client_dsa_cert(doc) ->
+    ["Test erlang server with openssl client"];
+tls1_erlang_server_openssl_client_dsa_cert(suite) ->
+    [];
+tls1_erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ClientOpts = ?config(client_dsa_opts, Config),
+    ServerOpts = ?config(server_dsa_verify_opts, Config),  
+
+    {_, ServerNode, _} = 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),
+    
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ 
+	" -host localhost " ++	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile  
+	++ " -key " ++ KeyFile ++ " -tls1 -msg",
+
+    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    
+    OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
+    port_command(OpenSslPort, Data),
+    
+    ssl_test_lib:check_result(Server, ok),
+    
+    ssl_test_lib:close(Server),
+
+    close_port(OpenSslPort),
+    process_flag(trap_exit, false),
+    ok.
+
+%%-------------------------------------------------------------------- 
+
+ssl3_erlang_client_openssl_server_dsa_cert(doc) ->
+    ["Test erlang server with openssl client"];
+ssl3_erlang_client_openssl_server_dsa_cert(suite) ->
+    [];
+ssl3_erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ClientOpts = ?config(client_dsa_opts, Config),  
+    ServerOpts = ?config(server_dsa_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),
+   
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
+	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile  
+	++ " -key " ++ KeyFile ++ " -Verify 2 -ssl3 -msg", 
+    
+    test_server:format("openssl cmd: ~p~n", [Cmd]),
+
+    OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
+
+    wait_for_openssl_server(),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					{host, Hostname},
+					{from, self()}, 
+					{mfa, {?MODULE, 
+					       erlang_ssl_receive, [Data]}},
+					{options, ClientOpts}]),
+
+    port_command(OpensslPort, Data),
+    
+    ssl_test_lib:check_result(Client, ok), 
+   
+    %% Clean close down!   Server needs to be closed first !!
+    close_port(OpensslPort),
+
+    ssl_test_lib:close(Client),
+    process_flag(trap_exit, false),
+    ok.
+
+%%-------------------------------------------------------------------- 
+
+ssl3_erlang_server_openssl_client_dsa_cert(doc) ->
+    ["Test erlang server with openssl client"];
+ssl3_erlang_server_openssl_client_dsa_cert(suite) ->
+    [];
+ssl3_erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ClientOpts = ?config(client_dsa_opts, Config),
+    ServerOpts = ?config(server_dsa_verify_opts, Config),  
+
+    {_, ServerNode, _} = 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),
+    
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ 
+	" -host localhost " ++	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile  
+	++ " -key " ++ KeyFile ++ " -ssl3 -msg",
+
+    test_server:format("openssl cmd: ~p~n", [Cmd]),
+    
+    OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
+    port_command(OpenSslPort, Data),
+    
+    ssl_test_lib:check_result(Server, ok),
+    
+    ssl_test_lib:close(Server),
+
+    close_port(OpenSslPort),
+    process_flag(trap_exit, false),
+    ok.
+
+
+%%-------------------------------------------------------------------- 
+
 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."];
@@ -881,19 +1078,46 @@ tls1_erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
     ok.
 %%--------------------------------------------------------------------
 
-ciphers(doc) -> 
-    [""];
+ciphers_rsa_signed_certs(doc) -> 
+    ["Test cipher suites that uses rsa certs"];
+       
+ciphers_rsa_signed_certs(suite) -> 
+    [];
+
+ciphers_rsa_signed_certs(Config) when is_list(Config) ->
+    Version = 
+	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+
+    Ciphers = ssl_test_lib:rsa_suites(),
+    run_suites(Ciphers, Version, Config, rsa).
+
+
+ciphers_dsa_signed_certs(doc) -> 
+    ["Test cipher suites that uses dsa certs"];
        
-ciphers(suite) -> 
+ciphers_dsa_signed_certs(suite) -> 
     [];
 
-ciphers(Config) when is_list(Config) ->
+ciphers_dsa_signed_certs(Config) when is_list(Config) ->
     Version = 
 	ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
 
-    Ciphers = ssl:cipher_suites(),
+    Ciphers = ssl_test_lib:dsa_suites(),
+    run_suites(Ciphers, Version, Config, dsa).
+
+run_suites(Ciphers, Version, Config, Type) ->
+    {ClientOpts, ServerOpts} =
+	case Type of 
+	    rsa ->
+		{?config(client_opts, Config),
+		 ?config(server_opts, Config)};
+	    dsa ->
+		{?config(client_opts, Config),
+		 ?config(server_dsa_opts, Config)}
+	end,
+    
     Result =  lists:map(fun(Cipher) -> 
-				cipher(Cipher, Version, Config) end,
+				cipher(Cipher, Version, Config, ClientOpts, ServerOpts) end,
 			Ciphers),
     case lists:flatten(Result) of
 	[] ->
@@ -902,12 +1126,10 @@ ciphers(Config) when is_list(Config) ->
 	    test_server:format("Cipher suite errors: ~p~n", [Error]),
 	    test_server:fail(cipher_suite_failed_see_test_case_log) 
     end.
-    
-cipher(CipherSuite, Version, Config) ->   
+
+cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->   
     process_flag(trap_exit, true),
     test_server:format("Testing CipherSuite ~p~n", [CipherSuite]),
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
     {ClientNode, _ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     
     Port = ssl_test_lib:inet_port(node()),
@@ -915,33 +1137,43 @@ cipher(CipherSuite, Version, Config) ->
     KeyFile = proplists:get_value(keyfile, ServerOpts),
    
     Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ 
-	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "", 
-    
+	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "",
+
     test_server:format("openssl cmd: ~p~n", [Cmd]),
     
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
     
     wait_for_openssl_server(),
 
+    ConnectionInfo = {ok, {Version, CipherSuite}},
+
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {?MODULE, connection_info_result, []}},
-			   {options, 
-			    [{ciphers,[CipherSuite]} | 
-			     ClientOpts]}]), 
-   
-    ClientMsg = {ok, {Version, CipherSuite}},
-			   
-    Result = ssl_test_lib:wait_for_result(Client, ClientMsg),    
+					{from, self()},
+					{mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}},
+					{options,
+					 [{ciphers,[CipherSuite]} |
+			     ClientOpts]}]),
+
+    port_command(OpenSslPort, "Hello\n"),
+    
+    receive
+	{Port, {data, _}} when is_port(Port) ->
+	    ok
+    after 500 ->
+	    test_server:format("Time out on openssl port, check that"
+			       " the messages Hello and world are received"
+			       " during close of port" , []),
+	    ok
+    end,
+
+    port_command(OpenSslPort, " world\n"),
+    
+    Result = ssl_test_lib:wait_for_result(Client, ok),    
 
     close_port(OpenSslPort),
     %% Clean close down!
     ssl_test_lib:close(Client),
-    receive 
-	{'EXIT', Client, normal} ->
-	    ok
-    end,
     
     Return = case Result of
 		 ok ->
@@ -1194,7 +1426,9 @@ wait_for_openssl_server() ->
 	    
 check_sane_openssl_renegotaite(Config) ->
     case os:cmd("openssl version") of
-	"OpenSSL 0.9.8l" ++ _ ->
+	"OpenSSL 0.9.8" ++ _ ->
+	    {skip, "Known renegotiation bug in OppenSSL"};
+	"OpenSSL 0.9.7" ++ _ ->
 	    {skip, "Known renegotiation bug in OppenSSL"};
 	_ ->
 	    Config
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index e3db7008e3..a4be7bb889 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1,56 +1,2 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1999-2010. 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%
-#
 
-SSL_VSN = 3.11.1
-
-TICKETS = OTP-8588 \
-	  OTP-8568 \
-	  OTP-7049
-
-#TICKETS_3.11 = OTP-8517 \
-#	  OTP-7046 \
-#         OTP-8557 \
-#	  OTP-8560 \
-#	  OTP-8545 \
-#	  OTP-8554
-
-#TICKETS_3.10.9 = OTP-8510
-
-#TICKETS_3.10.8 = OTP-8372 OTP-8441 OTP-8459
-#TICKETS_3.10.7 = OTP-8260 OTP-8218 OTP-8250
-
-#TICKETS_3.10.6 = OTP-8275
-
-#TICKETS_3.10.5 = OTP-8224 OTP-8244
-
-#TICKETS_3.10.4 = OTP-8137
-
-#TICKETS_3.10.3 = OTP-8011
-#TICKETS_3.10.2 = OTP-7963
-
-# TICKETS_3.10.1 = OTP-7878 \
-# 	  OTP-7656 \
-#           OTP-7870 \
-#           OTP-7871
-
-# TICKETS_3.10 = OTP-7258 \
-# 	  OTP-6894 \
-# 	  OTP-7037 \
-# 	  OTP-7039 \
-# 	  OTP-7150
+SSL_VSN = 4.1.3
diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml
index 27308e02f3..adc411e272 100644
--- a/lib/stdlib/doc/src/beam_lib.xml
+++ b/lib/stdlib/doc/src/beam_lib.xml
@@ -341,6 +341,7 @@ chunkref() = chunkname() | chunkid()</code>
         <v>Beam1 = Beam2 = beam()</v>
         <v>Reason = {modules_different, Module1, Module2}</v>
         <v>&nbsp;&nbsp;| {chunks_different, ChunkId}</v>
+        <v>&nbsp;&nbsp;| different_chunks</v>
         <v>&nbsp;&nbsp;| Reason1 -- see info/1</v>
         <v>&nbsp;Module1 = Module2 = atom()</v>
         <v>&nbsp;ChunkId = chunkid()</v>
diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml
index 36f0c03162..f90d8308b6 100644
--- a/lib/stdlib/doc/src/calendar.xml
+++ b/lib/stdlib/doc/src/calendar.xml
@@ -63,6 +63,14 @@
       given as local time, they must be converted to universal time, in
       order to get the correct value of the elapsed time between epochs.
       Use of the function <c>time_difference/2</c> is discouraged.</p>
+    <p>There exists different definitions for the week of the year.
+      The calendar module contains a week of the year implementation
+      which conforms to the ISO 8601 standard. Since the week number for
+      a given date can fall on the previous, the current or on the next
+      year it is important to provide the information which year is it
+      together with the week number. The function <c>iso_week_number/0</c>
+      and <c>iso_week_number/1</c> returns a tuple of the year and the
+      week number.</p>
   </description>
 
   <section>
@@ -154,6 +162,30 @@ time() = {Hour, Minute, Second}
       </desc>
     </func>
     <func>
+      <name>iso_week_number() -> IsoWeekNumber</name>
+      <fsummary>Compute the iso week number for the actual date</fsummary>
+      <type>
+        <v>IsoWeekNumber = {int(), int()}</v>
+      </type>
+      <desc>
+        <p>This function returns the tuple {Year, WeekNum} representing
+          the iso week number for the actual date. For determining the
+          actual date, the function <c>local_time/0</c> is used.</p>
+      </desc>
+    </func>
+    <func>
+      <name>iso_week_number(Date) -> IsoWeekNumber</name>
+      <fsummary>Compute the iso week number for the given date</fsummary>
+      <type>
+        <v>Date = date()</v>
+        <v>IsoWeekNumber = {int(), int()}</v>
+      </type>
+      <desc>
+        <p>This function returns the tuple {Year, WeekNum} representing
+          the iso week number for the given date.</p>
+      </desc>
+    </func>
+    <func>
       <name>last_day_of_the_month(Year, Month) -> int()</name>
       <fsummary>Compute the number of days in a month</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml
index 8d1398d3b7..b002af6616 100644
--- a/lib/stdlib/doc/src/dets.xml
+++ b/lib/stdlib/doc/src/dets.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -109,7 +109,7 @@ bool() = true | false
 file() = string()
 int() = integer() >= 0
 keypos() = integer() >= 1
-name() = atom() | ref()
+name() = atom() | reference()
 no_slots() = integer() >= 0 | default
 object() = tuple()
 object_cont() = tuple()
@@ -759,7 +759,7 @@ ok
       <fsummary>Open an existing Dets table.</fsummary>
       <type>
         <v>FileName = file()</v>
-        <v>Reference = ref()</v>
+        <v>Reference = reference()</v>
       </type>
       <desc>
         <p>Opens an existing table. If the table has not been properly
@@ -816,7 +816,7 @@ ok
           </item>
           <item>
             <p><c>{max_no_slots, no_slots()}</c>, the maximum number
-              of slots that will be used. The default value is 2 M, and
+              of slots that will be used. The default value as well as
               the maximal value is 32 M. Note that a higher value may
               increase the fragmentation of the table, and conversely,
               that a smaller value may decrease the fragmentation, at
diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml
index ebcd2eed09..1695e9d14f 100644
--- a/lib/stdlib/doc/src/dict.xml
+++ b/lib/stdlib/doc/src/dict.xml
@@ -165,8 +165,8 @@ dictionary()
         <v>Dict = dictionary()</v>
       </type>
       <desc>
-        <p>This function converts the key/value list <c>List</c> to a 
-          dictionary.</p>
+        <p>This function converts the <c>Key</c> - <c>Value</c> list
+          <c>List</c> to a dictionary.</p>
       </desc>
     </func>
     <func>
@@ -270,7 +270,7 @@ merge(Fun, D1, D2) ->
         <v>Dict1 = Dict2 = dictionary()</v>
       </type>
       <desc>
-        <p>Update the a value in a dictionary by calling <c>Fun</c> on
+        <p>Update a value in a dictionary by calling <c>Fun</c> on
           the value to get a new value.  An exception is generated if
           <c>Key</c> is not present in the dictionary.</p>
       </desc>
@@ -285,7 +285,7 @@ merge(Fun, D1, D2) ->
         <v>Dict1 = Dict2 = dictionary()</v>
       </type>
       <desc>
-        <p>Update the a value in a dictionary by calling <c>Fun</c> on
+        <p>Update a value in a dictionary by calling <c>Fun</c> on
           the value to get a new value.  If <c>Key</c> is not present
           in the dictionary then <c>Initial</c> will be stored as
           the first value. For example <c>append/3</c> could be defined
diff --git a/lib/stdlib/doc/src/erl_id_trans.xml b/lib/stdlib/doc/src/erl_id_trans.xml
index 7c821d2efc..cfb18ec131 100644
--- a/lib/stdlib/doc/src/erl_id_trans.xml
+++ b/lib/stdlib/doc/src/erl_id_trans.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1996</year>
-      <year>2007</year>
+      <year>2010</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -70,7 +70,8 @@
 
   <section>
     <title>See Also</title>
-    <p><seealso marker="erl_parse">erl_parse(3)</seealso>, compile(3).</p>
+    <p><seealso marker="erl_parse">erl_parse(3)</seealso>,
+    <seealso marker="compiler:compile">compile(3)</seealso>.</p>
   </section>
 </erlref>
 
diff --git a/lib/stdlib/doc/src/erl_lint.xml b/lib/stdlib/doc/src/erl_lint.xml
index 6a7d37765c..8639d678fa 100644
--- a/lib/stdlib/doc/src/erl_lint.xml
+++ b/lib/stdlib/doc/src/erl_lint.xml
@@ -96,8 +96,8 @@
         <p>The <c>AbsForms</c> of a module which comes from a file
           that is read through <c>epp</c>, the Erlang pre-processor,
           can come from many files. This means that any references to
-          errors must include the file name (see <seealso marker="epp">epp(3)</seealso>, or parser <seealso marker="erl_parse">erl_parse(3)</seealso> The warnings and
-          errors returned have the following format:
+          errors must include the file name (see <seealso marker="epp">epp(3)</seealso>, or parser <seealso marker="erl_parse">erl_parse(3)</seealso>).
+          The warnings and errors returned have the following format:
           </p>
         <code type="none">
     [{FileName2,[ErrorInfo]}]        </code>
diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml
index ae8a8afd5c..18b592deea 100644
--- a/lib/stdlib/doc/src/erl_parse.xml
+++ b/lib/stdlib/doc/src/erl_parse.xml
@@ -39,7 +39,7 @@
       expressions, or terms. The Abstract Format is described in the ERTS
       User's Guide.
       Note that a token list must end with the <em>dot</em> token in order
-      to be acceptable to the parse functions (see erl_scan).</p>
+      to be acceptable to the parse functions (see <seealso marker="erl_scan">erl_scan(3)</seealso>).</p>
   </description>
   <funcs>
     <func>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index ee1befc882..746f94d3f4 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -56,8 +56,8 @@
       Even if there are no references to a table from any process, it
       will not automatically be destroyed unless the owner process
       terminates. It can be destroyed explicitly by using
-      <c>delete/1</c>.</p>
-    <p>Since R13B01, table ownership can be transferred at process termination
+      <c>delete/1</c>. The default owner is the process that created the
+      table. Table ownership can be transferred at process termination
       by using the <seealso marker="#heir">heir</seealso> option or explicitly
       by calling <seealso marker="#give_away/3">give_away/3</seealso>.</p>
     <p>Some implementation details:</p>
@@ -82,11 +82,15 @@
       <c>float()</c> that extends to the same value, hence the key
       <c>1</c> and the key <c>1.0</c> are regarded as equal in an
       <c>ordered_set</c> table.</p>
-    <p>In general, the functions below will exit with reason
-      <c>badarg</c> if any argument is of the wrong format, or if the
-      table identifier is invalid.</p>
   </description>
-
+  <section>
+    <title>Failure</title>
+    <p>In general, the functions below will exit with reason
+      <c>badarg</c> if any argument is of the wrong format, if the
+      table identifier is invalid or if the operation is denied due to
+      table access rights (<seealso marker="#protected">protected</seealso>
+      or <seealso marker="#private">private</seealso>).</p>
+  </section>
   <section><marker id="concurrency"></marker>
     <title>Concurrency</title>
       <p>This module provides some limited support for concurrent access.
@@ -481,6 +485,9 @@ Error: fun containing local Erlang function calls
           <item><c>Item=protection, Value=public|protected|private</c>          <br></br>
 
            The table access rights.</item>
+           <item><c>Item=compressed, Value=true|false</c>          <br></br>
+
+            Indicates if the table is compressed or not.</item>
         </list>
       </desc>
     </func>
@@ -947,9 +954,10 @@ ets:select(Table,MatchSpec),</code>
       <type>
         <v>Name = atom()</v>
         <v>Options = [Option]</v>
-        <v>&nbsp;Option = Type | Access | named_table | {keypos,Pos} | {heir,pid(),HeirData} | {heir,none} | {write_concurrency,bool()}</v>
+        <v>&nbsp;Option = Type | Access | named_table | {keypos,Pos} | {heir,pid(),HeirData} | {heir,none} | Tweaks</v>
         <v>&nbsp;&nbsp;Type = set | ordered_set | bag | duplicate_bag</v>
         <v>&nbsp;&nbsp;Access = public | protected | private</v>
+        <v>&nbsp;&nbsp;Tweaks = {write_concurrency,bool()} | {read_concurrency,bool()} | compressed</v>
         <v>&nbsp;&nbsp;Pos = int()</v>
         <v>&nbsp;&nbsp;HeirData = term()</v>
       </type>
@@ -963,7 +971,7 @@ ets:select(Table,MatchSpec),</code>
           table is named or not. If one or more options are left out,
           the default values are used. This means that not specifying
           any options (<c>[]</c>) is the same as specifying
-          <c>[set,protected,{keypos,1},{heir,none},{write_concurrency,false}]</c>.</p>
+          <c>[set,protected,{keypos,1},{heir,none},{write_concurrency,false},{read_concurrency,false}]</c>.</p>
         <list type="bulleted">
           <item>
             <p><c>set</c>
@@ -1002,12 +1010,14 @@ ets:select(Table,MatchSpec),</code>
               Any process may read or write to the table.</p>
           </item>
           <item>
+            <marker id="protected"></marker>
             <p><c>protected</c>
               The owner process can read and write to the table. Other
               processes can only read the table. This is the default
               setting for the access rights.</p>
           </item>
           <item>
+            <marker id="private"></marker>
             <p><c>private</c>
               Only the owner process can read or write to the table.</p>
           </item>
@@ -1039,15 +1049,22 @@ ets:select(Table,MatchSpec),</code>
               the owner terminates.</p>
           </item>
           <item>
+            <marker id="new_2_write_concurrency"></marker>
             <p><c>{write_concurrency,bool()}</c>
-              Performance tuning. Default is <c>false</c>, which means that the table
-              is optimized towards concurrent read access. An operation that
+              Performance tuning. Default is <c>false</c>, in which case an operation that
               mutates (writes to) the table will obtain exclusive access,
               blocking any concurrent access of the same table until finished.
               If set to <c>true</c>, the table is optimized towards concurrent
               write access. Different objects of the same table can be mutated
               (and read) by concurrent processes. This is achieved to some degree
-              at the expense of single access and concurrent reader performance.
+              at the expense of sequential access and concurrent reader performance.
+	      The <c>write_concurrency</c> option can be combined with the
+	      <seealso marker="#new_2_read_concurrency">read_concurrency</seealso>
+	      option. You typically want to combine these when large concurrent
+	      read bursts and large concurrent write bursts are common (see the
+	      documentation of the
+	      <seealso marker="#new_2_read_concurrency">read_concurrency</seealso>
+	      option for more information).
               Note that this option does not change any guarantees about 
               <seealso marker="#concurrency">atomicy and isolation</seealso>.
               Functions that makes such promises over several objects (like
@@ -1055,6 +1072,38 @@ ets:select(Table,MatchSpec),</code>
              <p>Table type <c>ordered_set</c> is not affected by this option in current
               implementation.</p>
           </item>
+          <item>
+            <marker id="new_2_read_concurrency"></marker>
+	    <p><c>{read_concurrency,bool()}</c>
+              Performance tuning. Default is <c>false</c>. When set to
+	      <c>true</c>, the table is optimized for concurrent read
+	      operations. When this option is enabled on a runtime system with
+	      SMP support, read operations become much cheaper; especially on
+	      systems with multiple physical processors. However, switching
+	      between read and write operations becomes more expensive. You
+	      typically want to enable this option when concurrent read
+	      operations are much more frequent than write operations, or when
+	      concurrent reads and writes comes in large read and write
+	      bursts (i.e., lots of reads not interrupted by writes, and lots
+	      of writes not interrupted by reads). You typically do
+	      <em>not</em> want to enable this option when the common access
+	      pattern is a few read operations interleaved with a few write
+	      operations repeatedly. In this case you will get a performance
+	      degradation by enabling this option. The <c>read_concurrency</c>
+	      option can be combined with the
+	      <seealso marker="#new_2_write_concurrency">write_concurrency</seealso>
+	      option. You typically want to combine these when large concurrent
+	      read bursts and large concurrent write bursts are common.</p>
+          </item>
+          <item>
+            <marker id="new_2_compressed"></marker>
+	          <p><c>compressed</c>
+              If this option is present, the table data will be stored in a more compact format to
+              consume less memory. The downside is that it will make table operations slower.
+              Especially operations that need to inspect entire objects,
+              such as <c>match</c> and <c>select</c>, will get much slower. The key element
+              is not compressed in current implementation.</p>
+          </item>
         </list>
       </desc>
     </func>
@@ -1355,6 +1404,28 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
+      <name>select_count(Tab, MatchSpec) -> NumMatched</name>
+      <fsummary>Match the objects in an ETS table against a match_spec and returns the number of objects for which the match_spec returned 'true'</fsummary>
+      <type>
+        <v>Tab = tid() | atom()</v>
+        <v>Object = tuple()</v>
+        <v>MatchSpec = match_spec()</v>
+        <v>NumMatched = integer()</v>
+      </type>
+      <desc>
+        <p>Matches the objects in the table <c>Tab</c> using a
+          <seealso marker="#match_spec">match_spec</seealso>. If the
+          match_spec returns <c>true</c> for an object, that object
+          considered a match and is counted. For any other result from
+          the match_spec the object is not considered a match and is
+          therefore not counted.</p>
+        <p>The function could be described as a <c>match_delete/2</c>
+          that does not actually delete any elements, but only counts
+          them.</p>
+        <p>The function returns the number of objects matched.</p>
+      </desc>
+    </func>
+    <func>
       <name>select_delete(Tab, MatchSpec) -> NumDeleted</name>
       <fsummary>Match the objects in an ETS table against a match_spec and deletes objects where the match_spec returns 'true'</fsummary>
       <type>
@@ -1381,25 +1452,82 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
       </desc>
     </func>
     <func>
-      <name>select_count(Tab, MatchSpec) -> NumMatched</name>
-      <fsummary>Match the objects in an ETS table against a match_spec and returns the number of objects for which the match_spec returned 'true'</fsummary>
+      <name>select_reverse(Tab, MatchSpec) -> [Match]</name>
+      <fsummary>Match the objects in an ETS table against a match_spec.</fsummary>
       <type>
         <v>Tab = tid() | atom()</v>
-        <v>Object = tuple()</v>
+        <v>Match = term()</v>
         <v>MatchSpec = match_spec()</v>
-        <v>NumMatched = integer()</v>
       </type>
       <desc>
-        <p>Matches the objects in the table <c>Tab</c> using a
-          <seealso marker="#match_spec">match_spec</seealso>. If the
-          match_spec returns <c>true</c> for an object, that object
-          considered a match and is counted. For any other result from
-          the match_spec the object is not considered a match and is
-          therefore not counted.</p>
-        <p>The function could be described as a <c>match_delete/2</c>
-          that does not actually delete any elements, but only counts
-          them.</p>
-        <p>The function returns the number of objects matched.</p>
+
+      <p>Works like <c>select/2</c>, but returns the list in reverse
+      order for the <c>ordered_set</c> table type. For all other table
+      types, the return value is identical to that of <c>select/2</c>.</p>
+
+      </desc>
+    </func>
+    <func>
+      <name>select_reverse(Tab, MatchSpec, Limit) -> {[Match],Continuation} | '$end_of_table'</name>
+      <fsummary>Match the objects in an ETS table against a match_spec and returns part of the answers.</fsummary>
+      <type>
+        <v>Tab = tid() | atom()</v>
+        <v>Match = term()</v>
+        <v>MatchSpec = match_spec()</v>
+        <v>Continuation = term()</v>
+      </type>
+      <desc>
+
+      <p>Works like <c>select/3</c>, but for the <c>ordered_set</c>
+      table type, traversing is done starting at the last object in
+      Erlang term order and moves towards the first. For all other
+      table types, the return value is identical to that of
+      <c>select/3</c>.</p>
+
+      <p>Note that this is <em>not</em> equivalent to
+      reversing the result list of a <c>select/3</c> call, as the result list
+      is not only reversed, but also contains the last <c>Limit</c>
+      matching objects in the table, not the first.</p>
+
+      </desc>
+    </func>
+    <func>
+      <name>select_reverse(Continuation) -> {[Match],Continuation} | '$end_of_table'</name>
+      <fsummary>Continue matching objects in an ETS table.</fsummary>
+      <type>
+        <v>Match = term()</v>
+        <v>Continuation = term()</v>
+      </type>
+      <desc>
+
+      <p>Continues a match started with
+      <c>ets:select_reverse/3</c>. If the table is an
+      <c>ordered_set</c>, the traversal of the table will continue
+      towards objects with keys earlier in the Erlang term order. The
+      returned list will also contain objects with keys in reverse
+      order.</p>
+
+      <p>For all other table types, the behaviour is exatly that of <c>select/1</c>.</p>
+      <p>Example:</p>
+      <code>
+1> T = ets:new(x,[ordered_set]).
+2> [ ets:insert(T,{N}) || N &lt;- lists:seq(1,10) ].
+...
+3> {R0,C0} = ets:select_reverse(T,[{'_',[],['$_']}],4).
+...
+4> R0.
+[{10},{9},{8},{7}]
+5> {R1,C1} = ets:select_reverse(C0).
+...
+6> R1.
+[{6},{5},{4},{3}]
+7> {R2,C2} = ets:select_reverse(C1).
+...
+8> R2.
+[{2},{1}]
+9> '$end_of_table' = ets:select_reverse(C2).
+...
+      </code>
       </desc>
     </func>
     <func>
diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml
index c1c4ca9350..47d64f245c 100644
--- a/lib/stdlib/doc/src/filelib.xml
+++ b/lib/stdlib/doc/src/filelib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -36,14 +36,23 @@
   <description>
     <p>This module contains utilities on a higher level than the <c>file</c>
       module.</p>
+    <p>The module supports Unicode file names, so that it will match against regular expressions given in Unicode and that it will find and process raw file names (i.e. files named in a way that does not confirm to the expected encoding).</p>
+    <p>If the VM operates in Unicode file naming mode on a machine with transparent file naming, the <c>fun()</c> provided to <c>fold_files/5</c> needs to be prepared to handle binary file names.</p>
+    <p>For more information about raw file names, see the <seealso marker="kernel:file">file</seealso> module.</p>
   </description>
 
   <section>
     <title>DATA TYPES</title>
     <code type="none">
-filename() = string() | atom() | DeepList
-dirname() = filename()
-DeepList = [char() | atom() | DeepList]</code>
+filename() =  = string() | atom() | DeepList | RawFilename
+  DeepList = [char() | atom() | DeepList]
+  RawFilename = binary()
+  If VM is in unicode filename mode, string() and char() are allowed to be > 255.
+  RawFilename is a filename not subject to Unicode translation, meaning that it 
+  can contain characters not conforming to the Unicode encoding expected from the 
+  filesystem (i.e. non-UTF-8 characters although the VM is started in Unicode 
+  filename mode).
+dirname() = filename()</code>
   </section>
 
   <funcs>
@@ -90,6 +99,18 @@ DeepList = [char() | atom() | DeepList]</code>
           If <c>Recursive</c> is true all sub-directories to <c>Dir</c>
           are processed. The regular expression matching is done on just
 	  the filename without the directory part.</p>
+
+	  <p>If Unicode file name translation is in effect and the file
+	  system is completely transparent, file names that cannot be
+	  interpreted as Unicode may be encountered, in which case the
+	  <c>fun()</c> must be prepared to handle raw file names
+	  (i.e. binaries). If the regular expression contains
+	  codepoints beyond 255, it will not match file names that do
+	  not conform to the expected character encoding (i.e. are not
+	  encoded in valid UTF-8).</p>
+
+	  <p>For more information about raw file names, see the 
+          <seealso marker="kernel:file">file</seealso> module.</p>
       </desc>
     </func>
     <func>
@@ -160,6 +181,12 @@ DeepList = [char() | atom() | DeepList]</code>
             <p>Matches any number of characters up to the end of
               the filename, the next dot, or the next slash.</p>
           </item>
+          <tag>[Character1,Character2,...]</tag>
+          <item>
+            <p>Matches any of the characters listed. Two characters
+	    separated by a hyphen will match a range of characters.
+	    Example: <c>[A-Z]</c> will match any uppercase letter.</p>
+          </item>
           <tag>{Item,...}</tag>
           <item>
             <p>Alternation. Matches one of the alternatives.</p>
diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml
index 0cf82fa48b..cdee6e4a81 100644
--- a/lib/stdlib/doc/src/filename.xml
+++ b/lib/stdlib/doc/src/filename.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -43,13 +43,22 @@
       only, even if the arguments contain back slashes. Use
       <c>join/1</c> to normalize a file name by removing redundant
       directory separators.</p>
+    <p>The module supports raw file names in the way that if a binary is present, or the file name cannot be interpreted according to the return value of 
+    <seealso marker="kernel:file#native_name_encoding/0">file:native_name_encoding/0</seealso>, a raw file name will also be returned. For example filename:join/1 provided with a path component being a binary (and also not being possible to interpret under the current native file name encoding) will result in a raw file name being returned (the join operation will have been performed of course). For more information about raw file names, see the <seealso marker="kernel:file">file</seealso> module.</p>
   </description>
 
   <section>
     <title>DATA TYPES</title>
     <code type="none">
-name() = string() | atom() | DeepList
-  DeepList = [char() | atom() | DeepList]</code>
+name() = string() | atom() | DeepList | RawFilename
+  DeepList = [char() | atom() | DeepList]
+  RawFilename = binary()
+  If VM is in unicode filename mode, string() and char() are allowed to be > 255.
+  RawFilename is a filename not subject to Unicode translation, meaning that it 
+  can contain characters not conforming to the Unicode encoding expected from the 
+  filesystem (i.e. non-UTF-8 characters although the VM is started in Unicode 
+  filename mode).
+    </code>
   </section>
   <funcs>
     <func>
diff --git a/lib/stdlib/doc/src/io_protocol.xml b/lib/stdlib/doc/src/io_protocol.xml
index b52e862a5c..a97d996d98 100644
--- a/lib/stdlib/doc/src/io_protocol.xml
+++ b/lib/stdlib/doc/src/io_protocol.xml
@@ -79,7 +79,7 @@ sends the reply to.</item>
 io_reply. The io-module in the Erlang standard library simply uses the pid()
 of the io_server as the ReplyAs datum, but a more complicated client
 could have several outstanding io-requests to the same server and
-would then use i.e. a ref() or something else to differentiate among
+would then use i.e. a reference() or something else to differentiate among
 the incoming io_reply's. The ReplyAs element should be considered
 opaque by the io_server. Note that the pid() of the server is not
 explicitly present in the io_reply. The reply can be sent from any
diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml
index a273a2301f..92c4eb4f4c 100644
--- a/lib/stdlib/doc/src/lists.xml
+++ b/lib/stdlib/doc/src/lists.xml
@@ -48,7 +48,7 @@
       <item><p>if x <c>F</c> y and y <c>F</c> x then x = y (<c>F</c>
         is antisymmetric);</p>
       </item>
-      <item><p>if x <c>F</c> y and and y <c>F</c> z then x <c>F</c> z
+      <item><p>if x <c>F</c> y and y <c>F</c> z then x <c>F</c> z
         (<c>F</c> is transitive);</p>
       </item>
       <item><p>x <c>F</c> y or y <c>F</c> x (<c>F</c> is total).</p>
@@ -220,7 +220,7 @@
           follows:</p>
         <code type="none">
 flatmap(Fun, List1) ->
-    append(map(Fun, List1))</code>
+    append(map(Fun, List1)).</code>
         <p>Example:</p>
         <pre>
 > <input>lists:flatmap(fun(X)->[X,X] end, [a,b,c]).</input>
@@ -523,7 +523,7 @@ flatmap(Fun, List1) ->
         <v>&nbsp;A = B = term()</v>
       </type>
       <desc>
-        <p><c>mapfold</c> combines the operations of <c>map/2</c> and
+        <p><c>mapfoldl</c> combines the operations of <c>map/2</c> and
           <c>foldl/3</c> into one pass. An example, summing
           the elements in a list and double them at the same time:</p>
         <pre>
@@ -543,7 +543,7 @@ flatmap(Fun, List1) ->
         <v>&nbsp;A = B = term()</v>
       </type>
       <desc>
-        <p><c>mapfold</c> combines the operations of <c>map/2</c> and
+        <p><c>mapfoldr</c> combines the operations of <c>map/2</c> and
           <c>foldr/3</c> into one pass.</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 28a3719d38..a8fe41f000 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -30,6 +30,557 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 1.17.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Several type specifications for standard libraries were
+	    wrong in the R14B01 release. This is now corrected. The
+	    corrections concern types in re,io,filename and the
+	    module erlang itself.</p>
+          <p>
+	    Own Id: OTP-9008</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 1.17.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> When several clients accessed a Dets table
+	    simultaneously, one of them calling
+	    <c>dets:insert_new/2</c>, the Dets server could crash.
+	    Alternatively, under the same conditions, <c>ok</c> was
+	    sometimes returned instead of <c>true</c>. (Thanks to
+	    John Hughes.) </p>
+          <p>
+	    Own Id: OTP-8856</p>
+        </item>
+        <item>
+	    <p> When several clients accessed a Dets table
+	    simultaneously, inserted or updated objects were
+	    sometimes lost due to the Dets file being truncated.
+	    (Thanks to John Hughes.) </p>
+          <p>
+	    Own Id: OTP-8898</p>
+        </item>
+        <item>
+	    <p> When several clients accessed a Dets table
+	    simultaneously, modifications of the Dets server's
+	    internal state were sometimes thrown away. The symptoms
+	    are diverse: error with reason <c>bad_object</c>;
+	    inserted objects not returned by <c>lookup()</c>; et
+	    cetera. (Thanks to John Hughes.) </p>
+          <p>
+	    Own Id: OTP-8899</p>
+        </item>
+        <item>
+	    <p> If a Dets table was closed after calling
+	    <c>bchunk/2</c>, <c>match/1,3</c>,
+	    <c>match_object/1,3</c>, or <c>select/1,3</c> and then
+	    opened again, a subsequent call using the returned
+	    continuation would normally return a reply. This bug has
+	    fixed; now the call fails with reason <c>badarg</c>. </p>
+          <p>
+	    Own Id: OTP-8903</p>
+        </item>
+        <item>
+	    <p> Cover did not collect coverage data for files such as
+	    Yecc parses containing include directives. The bug has
+	    been fixed by modifying <c>epp</c>, the Erlang Code
+	    Preprocessor. </p>
+          <p>
+	    Own Id: OTP-8911</p>
+        </item>
+        <item>
+	    <p> If a Dets table with fewer slots than keys was opened
+	    and then closed after just a lookup, the contents were no
+	    longer well-formed. This bug has been fixed. (Thanks to
+	    Matthew Evans.) </p>
+          <p>
+	    Own Id: OTP-8923</p>
+        </item>
+        <item>
+          <p>
+	    In a supervisor, when it terminates a child, if that
+	    child happens to have exited fractionally early, with
+	    normal, the supervisor reports this as an error. This
+	    should not be reported as an error.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8938 Aux Id: seq11615 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The documentation filelib:wildcard/1,2 now describes the
+	    character set syntax for wildcards.</p>
+          <p>
+	    Own Id: OTP-8879 Aux Id: seq11683 </p>
+        </item>
+        <item>
+	    <p>Buffer overflows have been prevented in <c>erlc</c>,
+	    <c>dialyzer</c>, <c>typer</c>, <c>run_test</c>,
+	    <c>heart</c>, <c>escript</c>, and <c>erlexec</c>.</p>
+	    (Thanks to Michael Santos.)
+          <p>
+	    Own Id: OTP-8892</p>
+        </item>
+        <item>
+          <p>
+	    Using a float for the number of copies for
+	    <c>string:copies/2</c> resulted in an infinite loop. Now
+	    it will fail with an exception instead. (Thanks to
+	    Michael Santos.)</p>
+          <p>
+	    Own Id: OTP-8915</p>
+        </item>
+        <item>
+          <p>
+	    New ETS option <c>compressed</c>, to enable a more
+	    compact storage format at the expence of heavier table
+	    operations. For test and evaluation, <c>erl +ec</c> can
+	    be used to force compression on all ETS tables.</p>
+          <p>
+	    Own Id: OTP-8922 Aux Id: seq11658 </p>
+        </item>
+        <item>
+	    <p> The default maximum number of slots of a Dets table
+	    has been changed as to be equal to the maximum number of
+	    slots. (Thanks to Richard Carlsson.) </p>
+          <p>
+	    Own Id: OTP-8959</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 1.17.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>reference() has been substituted for ref() in the
+	    documentation.</p>
+          <p>
+	    Own Id: OTP-8733</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The ms_transform now warns if the fun head shadows
+	    surrounding variables (just like the warnings you would
+	    get for an ordinary fun in the same context).</p>
+          <p>
+	    Own Id: OTP-6759</p>
+        </item>
+        <item>
+          <p>
+	    ets:select_reverse/{1,2,3} are now documented.</p>
+          <p>
+	    Own Id: OTP-7863</p>
+        </item>
+        <item>
+          <p>
+	    Large parts of the <c>ethread</c> library have been
+	    rewritten. The <c>ethread</c> library is an Erlang
+	    runtime system internal, portable thread library used by
+	    the runtime system itself.</p>
+          <p>
+	    Most notable improvement is a reader optimized rwlock
+	    implementation which dramatically improve the performance
+	    of read-lock/read-unlock operations on multi processor
+	    systems by avoiding ping-ponging of the rwlock cache
+	    lines. The reader optimized rwlock implementation is used
+	    by miscellaneous rwlocks in the runtime system that are
+	    known to be read-locked frequently, and can be enabled on
+	    ETS tables by passing the <seealso
+	    marker="stdlib:ets#new_2_read_concurrency">{read_concurrency,
+	    true}</seealso> option upon table creation. See the
+	    documentation of <seealso
+	    marker="stdlib:ets#new/2">ets:new/2</seealso> for more
+	    information. The reader optimized rwlock implementation
+	    can be fine tuned when starting the runtime system. For
+	    more information, see the documentation of the <seealso
+	    marker="erts:erl#+rg">+rg</seealso> command line argument
+	    of <c>erl</c>.</p>
+          <p>
+	    There is also a new implementation of rwlocks that is not
+	    optimized for readers. Both implementations interleaves
+	    readers and writers during contention as opposed to,
+	    e.g., the NPTL (Linux) pthread rwlock implementation
+	    which use either a reader or writer preferred strategy.
+	    The reader/writer preferred strategy is problematic since
+	    it starves threads doing the non-preferred operation.</p>
+          <p>
+	    The new rwlock implementations in general performs better
+	    in ERTS than common pthread implementations. However, in
+	    some extremely heavily contended cases this is not the
+	    case. Such heavy contention can more or less only appear
+	    on ETS tables. This when multiple processes do very large
+	    amounts of write locked operations simultaneously on the
+	    same table. Such use of ETS is bad regardless of rwlock
+	    implementation, will never scale, and is something we
+	    strongly advise against.</p>
+          <p>
+	    The new rwlock implementations depend on atomic
+	    operations. If no native atomic implementation is found,
+	    a fallback solution will be used. Using the fallback
+	    implies a performance degradation. That is, it is more
+	    important now than before to build OTP with a native
+	    atomic implementation.</p>
+          <p>
+	    The <c>ethread</c> library contains native atomic
+	    implementations for, x86 (32 and 64 bit), powerpc (32
+	    bit), sparc V9 (32 and 64 bit), and tilera (32 bit). On
+	    other hardware gcc's builtin support for atomic memory
+	    access will be used if such exists. If no such support is
+	    found, <c>configure</c> will warn about no atomic
+	    implementation available.</p>
+          <p>
+	    The <c>ethread</c> library can now also use the
+	    <c>libatomic_ops</c> library for atomic memory accesses.
+	    This makes it possible for the Erlang runtime system to
+	    utilize optimized native atomic operations on more
+	    platforms than before. If <c>configure</c> warns about no
+	    atomic implementation available, try using the
+	    <c>libatomic_ops</c> library. Use the <seealso
+	    marker="doc/installation_guide:INSTALL#How-to-Build-and-Install-ErlangOTP_A-Closer-Look-at-the-individual-Steps_Configuring">--with-libatomic_ops=PATH</seealso>
+	    <c>configure</c> command line argument when specifying
+	    where the <c>libatomic_ops</c> installation is located.
+	    The <c>libatomic_ops</c> library can be downloaded from:
+	    <url
+	    href="http://www.hpl.hp.com/research/linux/atomic_ops/">http://www.hpl.hp.com/research/linux/atomic_ops/</url></p>
+          <p>
+	    The changed API of the <c>ethread</c> library has also
+	    caused modifications in the Erlang runtime system.
+	    Preparations for the to come "delayed deallocation"
+	    feature has also been done since it depends on the
+	    <c>ethread</c> library.</p>
+          <p>
+	    <em>Note</em>: When building for x86, the <c>ethread</c>
+	    library will now use instructions that first appeared on
+	    the pentium 4 processor. If you want the runtime system
+	    to be compatible with older processors (back to 486) you
+	    need to pass the <seealso
+	    marker="doc/installation_guide:INSTALL#How-to-Build-and-Install-ErlangOTP_A-Closer-Look-at-the-individual-Steps_Configuring">--enable-ethread-pre-pentium4-compatibility</seealso>
+	    <c>configure</c> command line argument when configuring
+	    the system.</p>
+          <p>
+	    Own Id: OTP-8544</p>
+        </item>
+        <item>
+          <p>
+	    Some Built In Functions (BIFs) from the module erlang was
+	    never made autoimported for backward compatibility
+	    reasons. As local functions now override autoimports, new
+	    autoimports is no longer a problem, why the following
+	    BIFs are finally made autoimported: monitor/2, monitor/3,
+	    demonitor/2, demonitor/3, error/1, error/2,
+	    integer_to_list/2, list_to_integer/2.</p>
+          <p>
+	    Own Id: OTP-8763</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 1.17</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The Erlang code preprocessor (<c>epp</c>) sent extra
+	    messages on the form <c>{eof,Location}</c> to the client
+	    when parsing the <c>file</c> attribute. This bug,
+	    introduced in R11B, has been fixed.</p>
+          <p>
+	    Own Id: OTP-8470</p>
+        </item>
+        <item>
+	    <p>The abstract type 'fun' could not be printed by the
+	    Erlang pretty printer (<c>erl_pp</c>). This bug has been
+	    fixed.</p>
+          <p>
+	    Own Id: OTP-8473</p>
+        </item>
+        <item>
+	    <p>The function <c>erl_scan:reserved_word/1</c> no longer
+	    returns <c>true</c> when given the word <c>spec</c>. This
+	    bug was introduced in STDLIB-1.15.3 (R12B-3).</p>
+          <p>
+	    Own Id: OTP-8567</p>
+        </item>
+        <item>
+	    <p>The documentation of <c>lists:keysort/2</c> states
+	    that the sort is stable.</p>
+          <p>
+	    Own Id: OTP-8628 Aux Id: seq11576 </p>
+        </item>
+        <item>
+          <p>
+	    The shell's line editing has been improved to more
+	    resemble the behaviour of readline and other shells.
+	    (Thanks to Dave Peticolas)</p>
+          <p>
+	    Own Id: OTP-8635</p>
+        </item>
+        <item>
+	    <p>The Erlang code preprocessor (<c>epp</c>) did not
+	    correctly handle premature end-of-input when defining
+	    macros. This bug, introduced in STDLIB 1.16, has been
+	    fixed.</p>
+          <p>
+	    Own Id: OTP-8665 Aux Id: OTP-7810 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The module binary from EEP31 (and EEP9) is implemented.</p>
+          <p>
+	    Own Id: OTP-8217</p>
+        </item>
+        <item>
+	    <p>The erlang pretty printer (<c>erl_pp</c>) no longer
+	    quotes atoms in types.</p>
+          <p>
+	    Own Id: OTP-8501</p>
+        </item>
+        <item>
+	    <p>The Erlang code preprocessor (<c>epp</c>) now
+	    considers records with no fields as typed.</p>
+          <p>
+	    Own Id: OTP-8503</p>
+        </item>
+        <item>
+          <p>
+	    Added function <c>zip:foldl/3</c> to iterate over zip
+	    archives.</p>
+          <p>
+	    Added functions to create and extract escripts. See
+	    <c>escript:create/2</c> and <c>escript:extract/2</c>.</p>
+          <p>
+	    The undocumented function <c>escript:foldl/3</c> has been
+	    removed. The same functionality can be achieved with the
+	    more flexible functions <c>escript:extract/2</c> and
+	    <c>zip:foldl/3</c>.</p>
+          <p>
+	    Record fields has been annotated with type info. Source
+	    files as been adapted to fit within 80 chars and trailing
+	    whitespace has been removed.</p>
+          <p>
+	    Own Id: OTP-8521</p>
+        </item>
+        <item>
+	    <p>The Erlang parser no longer duplicates the singleton
+	    type <c>undefined</c> in the type of record fields
+	    without initial value.</p>
+          <p>
+	    Own Id: OTP-8522</p>
+        </item>
+        <item>
+	    <p>A regular expression with many levels of parenthesis
+	    could cause a buffer overflow. That has been corrected.
+	    (Thanks to Michael Santos.)</p>
+          <p>
+	    Own Id: OTP-8539</p>
+        </item>
+        <item>
+	    <p>When defining macros the closing right parenthesis
+	    before the dot is now mandatory.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8562</p>
+        </item>
+        <item>
+          <p>
+	    Some properties of a compiled re pattern are defined to
+	    allow for guard tests.</p>
+          <p>
+	    Own Id: OTP-8577</p>
+        </item>
+        <item>
+	    <p>Local and imported functions now override the
+	    auto-imported BIFs when the names clash. The pre R14
+	    behaviour was that auto-imported BIFs would override
+	    local functions. To avoid that old programs change
+	    behaviour, the following will generate an error:</p>
+	    <list><item><p>Doing a call without explicit module name
+	    to a local function having a name clashing with the name
+	    of an auto-imported BIF that was present (and
+	    auto-imported) before OTP R14A</p></item>
+	    <item><p>Explicitly importing a function having a name
+	    clashing with the name of an autoimported BIF that was
+	    present (and autoimported) before OTP R14A</p></item>
+	    <item><p>Using any form of the old compiler directive
+	    <c>nowarn_bif_clash</c></p></item> </list> <p>If the BIF
+	    was added or auto-imported in OTP R14A or later,
+	    overriding it with an import or a local function will
+	    only result in a warning,</p> <p>To resolve clashes, you
+	    can either use the explicit module name <c>erlang</c> to
+	    call the BIF, or you can remove the auto-import of that
+	    specific BIF by using the new compiler directive
+	    <c>-compile({no_auto_import,[F/A]}).</c>, which makes all
+	    calls to the local or imported function without explicit
+	    module name pass without warnings or errors.</p> <p>The
+	    change makes it possible to add auto-imported BIFs
+	    without breaking or silently changing old code in the
+	    future. However some current code ingeniously utilizing
+	    the old behaviour or the <c>nowarn_bif_clash</c> compiler
+	    directive, might need changing to be accepted by the
+	    compiler.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8579</p>
+        </item>
+        <item>
+	    <p>The undocumented, unsupport, and deprecated function
+	    <c>lists:flat_length/1</c> has been removed.</p>
+          <p>
+	    Own Id: OTP-8584</p>
+        </item>
+        <item>
+          <p>
+	    A bug in re that could cause certain regular expression
+	    matches never to terminate is corrected. (Thanks to
+	    Michael Santos and Gordon Guthrie.)</p>
+          <p>
+	    Own Id: OTP-8589</p>
+        </item>
+        <item>
+	    <p>Nested records can now be accessed without
+	    parenthesis. See the Reference Manual for examples.
+	    (Thanks to YAMASHINA Hio and Tuncer Ayaz.)</p>
+          <p>
+	    Own Id: OTP-8597</p>
+        </item>
+        <item>
+	    <p><c>receive</c> statements that can only read out a
+	    newly created reference are now specially optimized so
+	    that it will execute in constant time regardless of the
+	    number of messages in the receive queue for the process.
+	    That optimization will benefit calls to
+	    <c>gen_server:call()</c>. (See <c>gen:do_call/4</c> for
+	    an example of a receive statement that will be
+	    optimized.)</p>
+          <p>
+	    Own Id: OTP-8623</p>
+        </item>
+        <item>
+	    <p>The beam_lib:cmp/2 function now compares BEAM files in
+	    stricter way. The BEAM files will be considered different
+	    if there are any changes except in the compilation
+	    information ("CInf") chunk. beam_lib:cmp/2 used to ignore
+	    differences in the debug information (significant for
+	    Dialyzer) and other chunks that did not directly change
+	    the run-time behavior.</p>
+          <p>
+	    Own Id: OTP-8625</p>
+        </item>
+        <item>
+          <p>
+	    When a gen_server, gen_fsm process, or gen_event
+	    terminates abnormally, sometimes the text representation
+	    of the process state can occupy many lines of the error
+	    log, depending on the definition of the state term. A
+	    mechanism to trim out parts of the state from the log has
+	    been added (using a format_status/2 callback). See the
+	    documentation.</p>
+          <p>
+	    Own Id: OTP-8630</p>
+        </item>
+        <item>
+          <p>
+	    Calling <c>sys:get_status()</c> for processes that have
+	    globally registered names that were not atoms would cause
+	    a crash. Corrected. (Thanks to Steve Vinoski.)</p>
+          <p>
+	    Own Id: OTP-8656</p>
+        </item>
+        <item>
+	    <p>The Erlang scanner has been augmented with two new
+	    tokens: <c>..</c> and <c>...</c>.</p>
+          <p>
+	    Own Id: OTP-8657</p>
+        </item>
+        <item>
+	    <p>Expressions evaluating to integers can now be used in
+	    types and function specifications where hitherto only
+	    integers were allowed ("Erlang_Integer").</p>
+          <p>
+	    Own Id: OTP-8664</p>
+        </item>
+        <item>
+	    <p>The compiler optimizes record operations better.</p>
+          <p>
+	    Own Id: OTP-8668</p>
+        </item>
+        <item>
+          <p>
+	    The recently added BIFs erlang:min/2, erlang:max/2 and
+	    erlang:port_command/3 are now auto-imported (as they were
+	    originally intended to be). Due to the recent compiler
+	    change (OTP-8579), the only impact on old code defining
+	    it's own min/2, max/2 or port_command/3 functions will be
+	    a warning, the local functions will still be used. The
+	    warning can be removed by using
+	    -compile({no_auto_import,[min/2,max/2,port_command/3]}).
+	    in the source file.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8669 Aux Id: OTP-8579 </p>
+        </item>
+        <item>
+          <p>
+	    Now, binary_to_term/2 is auto-imported. This will cause a
+	    compile warning if and only if a module has got a local
+	    function with that name.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8671</p>
+        </item>
+        <item>
+          <p>
+	    The predefined builtin type tid() has been removed.
+	    Instead, ets:tid() should be used.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8687</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 1.16.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/doc/src/orddict.xml b/lib/stdlib/doc/src/orddict.xml
index 08c808f822..9d036f0725 100644
--- a/lib/stdlib/doc/src/orddict.xml
+++ b/lib/stdlib/doc/src/orddict.xml
@@ -172,8 +172,8 @@ ordered_dictionary()
         <v>Orddict = ordered_dictionary()</v>
       </type>
       <desc>
-        <p>This function converts the key/value list <c>List</c> to a 
-          dictionary.</p>
+        <p>This function converts the <c>Key</c> - <c>Value</c> list
+          <c>List</c> to a dictionary.</p>
       </desc>
     </func>
     <func>
@@ -277,7 +277,7 @@ merge(Fun, D1, D2) ->
         <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
       </type>
       <desc>
-        <p>Update the a value in a dictionary by calling <c>Fun</c> on
+        <p>Update a value in a dictionary by calling <c>Fun</c> on
           the value to get a new value.  An exception is generated if
           <c>Key</c> is not present in the dictionary.</p>
       </desc>
@@ -292,7 +292,7 @@ merge(Fun, D1, D2) ->
         <v>Orddict1 = Orddict2 = ordered_dictionary()</v>
       </type>
       <desc>
-        <p>Update the a value in a dictionary by calling <c>Fun</c> on
+        <p>Update a value in a dictionary by calling <c>Fun</c> on
           the value to get a new value.  If <c>Key</c> is not present
           in the dictionary then <c>Initial</c> will be stored as
           the first value. For example <c>append/3</c> could be defined
diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml
index 80adc3e347..056e7bc9b9 100644
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
@@ -37,29 +37,24 @@
   <modulesummary>Perl like regular expressions for Erlang</modulesummary>
   <description>
 
-    <p>This module contains functions for regular expression
-      matching for strings and binaries.</p>
+    <p>This module contains regular expression matching functions for
+    strings and binaries.</p>
 
     <p>The regular expression syntax and semantics resemble that of
-    Perl.  This library in many ways replaces the old regexp library
-    written purely in Erlang, as it has a richer syntax as well as
-    many more options. The library is also faster than the
-    older regexp implementation.</p>
-
-    <p>Although the library's matching algorithms are currently based
-    on the PCRE library, it is not to be viewed as an Erlang to PCRE
-    mapping. Only parts of the PCRE library is interfaced and the re
-    library in some ways extend PCRE. The PCRE documentation contains
-    many parts of no interest to the Erlang programmer, why only the
-    relevant part of the documentation is included here. There should
-    bee no need to go directly to the PCRE library documentation.</p>
+    Perl. This library replaces the deprecated pure-Erlang regexp
+    library; it has a richer syntax, more options and is faster.</p>
+
+    <p>The library's matching algorithms are currently based on the
+    PCRE library, but not all of the PCRE library is interfaced and
+    some parts of the library go beyond what PCRE offers. The sections of
+    the PCRE documentation which are relevant to this module are included
+    here.</p>
 
     <note>
-    <p>The Erlang literal syntax for strings give special
-    meaning to the &quot;\&quot; (backslash) character. To literally write
-    a regular expression or a replacement string containing a
-    backslash in your code or in the shell, two backslashes have to be written:
-    &quot;\\&quot;.</p>
+    <p>The Erlang literal syntax for strings uses the &quot;\&quot;
+    (backslash) character as an escape code. You need to escape
+    backslashes in literal strings, both in your code and in the shell,
+    with an additional backslash, i.e.: &quot;\\&quot;.</p>
     </note>
 
 
@@ -72,7 +67,7 @@
       - a binary is allowed as the tail of the list</code>
       <code type="none">
     unicode_binary() = binary() with characters encoded in UTF-8 coding standard
-    unicode_char() = integer() representing valid unicode codepoint
+    unicode_char() = integer() representing a valid unicode codepoint
 
     chardata() = charlist() | unicode_binary()
 
@@ -82,9 +77,9 @@
       <code type="none">
     mp() = Opaque datatype containing a compiled regular expression.
       - The mp() is guaranteed to be a tuple() having the atom
-	're_pattern' as it's first element, to allow for matching in
+	're_pattern' as its first element, to allow for matching in
         guards. The arity of the tuple() or the content of the other fields
-	is however not to be trusted.</code>
+	may change in future releases.</code>
   </section>
   <funcs>
     <func>
@@ -132,7 +127,7 @@
       <tag><c>dollar_endonly</c></tag>
       <item>A dollar metacharacter in the pattern matches only at the end of the subject string. Without this option, a dollar also matches immediately before a newline at the end of the string (but not before any other newlines). The <c>dollar_endonly</c> option is ignored if <c>multiline</c> is given. There is no equivalent option in Perl, and no way to set it within a pattern.</item>
       <tag><c>dotall</c></tag>
-      <item>A dot maturate in the pattern matches all characters, including those that indicate newline. Without it, a dot does not match when the current position is at a newline. This option is equivalent to Perl's /s option, and it can be changed within a pattern by a (?s) option setting. A negative class such as [^a] always matches newline characters, independent of the setting of this option.</item>
+      <item>A dot in the pattern matches all characters, including those that indicate newline. Without it, a dot does not match when the current position is at a newline. This option is equivalent to Perl's /s option, and it can be changed within a pattern by a (?s) option setting. A negative class such as [^a] always matches newline characters, independent of this option's setting.</item>
       <tag><c>extended</c></tag>
       <item>Whitespace data characters in the pattern are ignored except when escaped or inside a character class. Whitespace does not include the VT character (ASCII 11). In addition, characters between an unescaped # outside a character class and the next newline, inclusive, are also ignored. This is equivalent to Perl's /x option, and it can be changed within a pattern by a (?x) option setting.
 
@@ -214,9 +209,10 @@ This option makes it possible to include comments inside complicated patterns. N
       or as a pre compiled <c>mp()</c> in which case it is executed
       against the subject directly.</p>
 
-      <p>When compilation is involved, the exception <c>badarg</c> is thrown if
-      a compilation error occurs. To locate the error in the regular
-      expression, use the function <c>re:compile/2</c> to get more information.</p>
+      <p>When compilation is involved, the exception <c>badarg</c> is
+      thrown if a compilation error occurs. Call <c>re:compile/2</c>
+      to get information about the location of the error in the
+      regular expression.</p>
 
       <p>If the regular expression is previously compiled, the option
       list can only contain the options <c>anchored</c>,
@@ -246,7 +242,7 @@ This option makes it possible to include comments inside complicated patterns. N
       how captured substrings are to be returned (as index tuples,
       lists or binaries). The <c>capture</c> option makes the function
       quite flexible and powerful. The different options are described
-      in detail below</p>
+      in detail below.</p>
 
       <p>If the capture options describe that no substring capturing
       at all is to be done (<c>{capture, none}</c>), the function will
@@ -256,7 +252,7 @@ This option makes it possible to include comments inside complicated patterns. N
       be done either by specifying <c>none</c> or an empty list as
       <c>ValueSpec</c>.</p>
 
-      <p>A description of all the options relevant for execution follows:</p>
+      <p>The options relevant for execution are:</p>
 
       <taglist>
       <tag><c>anchored</c></tag>
@@ -270,27 +266,25 @@ This option makes it possible to include comments inside complicated patterns. N
       <tag><c>global</c></tag>
       <item>
 
-      <p>Implements global (repetitive) search as the <c>g</c> flag in
-      i.e. Perl. Each match found is returned as a separate
+      <p>Implements global (repetitive) search (the <c>g</c> flag in
+      Perl). Each match is returned as a separate
       <c>list()</c> containing the specific match as well as any
       matching subexpressions (or as specified by the <c>capture
       option</c>). The <c>Captured</c> part of the return value will
-      hence be a <c>list()</c> of <c>list()</c>'s when this
+      hence be a <c>list()</c> of <c>list()</c>s when this
       option is given.</p>
 
-      <p>When the regular expression matches an empty string, the
-      behaviour might seem non-intuitive, why the behaviour requites
-      some clarifying.  With the global option, <c>re:run/3</c>
-      handles empty matches in the same way as Perl, meaning that a
-      match at any point giving an empty string (with length 0) will
-      be retried with the options
-      <c>[anchored, notempty]</c> as well. If that 
-      search gives a result of length &gt; 0, the result is included. 
-      An example:</p>
+      <p>The interaction of the global option with a regular
+      expression which matches an empty string surprises some users.
+      When the global option is given, <c>re:run/3</c> handles empty
+      matches in the same way as Perl: a zero-length match at any
+      point will be retried with the options <c>[anchored,
+      notempty]</c> as well. If that search gives a result of length
+      &gt; 0, the result is included.  For example:</p>
       
 <code>    re:run("cat","(|at)",[global]).</code>
 
-      <p>The matching will be performed as following:</p>
+      <p>The following matching will be performed:</p>
       <taglist>
       <tag>At offset <c>0</c></tag>
       <item>The regexp <c>(|at)</c> will first match at the initial
@@ -302,11 +296,11 @@ This option makes it possible to include comments inside complicated patterns. N
       <item> The search is retried
       with the options <c>[anchored, notempty]</c> at the same
       position, which does not give any interesting result of longer
-      length, why the search position is now advanced to the next
+      length, so the search position is now advanced to the next
       character (<c>a</c>).</item>
       <tag>At offset <c>1</c></tag>
-      <item>Now the search results in
-      <c>[{1,0},{1,0}]</c> meaning this search will also be repeated
+      <item>This time, the search results in
+      <c>[{1,0},{1,0}]</c>, so this search will also be repeated
       with the extra options.</item>
       <tag>At offset <c>1</c> with <c>[anchored, notempty]</c></tag>
       <item>Now the <c>ab</c> alternative
@@ -333,16 +327,17 @@ This option makes it possible to include comments inside complicated patterns. N
       entire match fails. For example, if the pattern</p>
 <code>    a?b?</code>
       <p>is applied to a string not beginning with "a" or "b", it
-      matches the empty string at the start of the subject. With
-      <c>notempty</c> given, this match is not valid, so re:run/3 searches
-      further into the string for occurrences of "a" or "b".</p>
+      would normally match the empty string at the start of the
+      subject. With the <c>notempty</c> option, this match is not
+      valid, so re:run/3 searches further into the string for
+      occurrences of "a" or "b".</p>
 
       <p>Perl has no direct equivalent of <c>notempty</c>, but it does
       make a special case of a pattern match of the empty string
       within its split() function, and when using the /g modifier. It
       is possible to emulate Perl's behavior after matching a null
       string by first trying the match again at the same offset with
-      <c>notempty</c> and <c>anchored</c>, and then if that fails by
+      <c>notempty</c> and <c>anchored</c>, and then, if that fails, by
       advancing the starting offset (see below) and trying an ordinary
       match again.</p>
       </item>
@@ -352,7 +347,7 @@ This option makes it possible to include comments inside complicated patterns. N
       string is not the beginning of a line, so the circumflex
       metacharacter should not match before it. Setting this without
       <c>multiline</c> (at compile time) causes circumflex never to
-      match. This option affects only the behavior of the circumflex
+      match. This option only affects the behavior of the circumflex
       metacharacter. It does not affect \A.</item>
 
       <tag><c>noteol</c></tag>
@@ -388,7 +383,7 @@ This option makes it possible to include comments inside complicated patterns. N
       </taglist>
       </item>
       <tag><c>bsr_anycrlf</c></tag>
-      <item>Specifies specifically that \R is to match only the cr, lf or crlf sequences, not the Unicode specific newline characters.(overrides compilation option)</item>
+      <item>Specifies specifically that \R is to match only the cr, lf or crlf sequences, not the Unicode specific newline characters. (overrides compilation option)</item>
       <tag><c>bsr_unicode</c></tag>
       <item>Specifies specifically that \R is to match all the Unicode newline characters (including crlf etc, the default).(overrides compilation option)</item>
 
@@ -444,7 +439,7 @@ This option makes it possible to include comments inside complicated patterns. N
         <tag><c>none</c></tag>
         <item>Do not return matching subpatterns at all, yielding the single atom <c>match</c> as the return value of the function when matching successfully instead of the <c>{match, list()}</c> return. Specifying an empty list gives the same behavior.</item>
         </taglist>
-      <p>The value list is a list of indexes for the subpatterns to return, where index 0 is for all of the pattern, and 1 is for the first explicit capturing subpattern in the regular expression, and so forth. When using named captured subpatterns (see below) in the regular expression, one can use <c>atom()</c>'s or <c>string()</c>'s to specify the subpatterns to be returned. This deserves an example, consider the following regular expression:</p>
+      <p>The value list is a list of indexes for the subpatterns to return, where index 0 is for all of the pattern, and 1 is for the first explicit capturing subpattern in the regular expression, and so forth. When using named captured subpatterns (see below) in the regular expression, one can use <c>atom()</c>s or <c>string()</c>s to specify the subpatterns to be returned. For example, consider the regular expression:</p>
       <code>    ".*(abcd).*"</code>
       <p>matched against the string ""ABCabcdABC", capturing only the "abcd" part (the first explicit subpattern):</p>
       <code>    re:run("ABCabcdABC",".*(abcd).*",[{capture,[1]}]).</code>
@@ -455,7 +450,7 @@ This option makes it possible to include comments inside complicated patterns. N
       <code>    ".*(?&lt;FOO&gt;abcd).*"</code>
       <p>With this expression, we could still give the index of the subpattern with the following call:</p>
       <code>    re:run("ABCabcdABC",".*(?&lt;FOO&gt;abcd).*",[{capture,[1]}]).</code>
-      <p>giving the same result as before. But as the subpattern is named, we can also give its name in the value list:</p>
+      <p>giving the same result as before. But, since the subpattern is named, we can also specify its name in the value list:</p>
       <code>    re:run("ABCabcdABC",".*(?&lt;FOO&gt;abcd).*",[{capture,['FOO']}]).</code>
       <p>which would yield the same result as the earlier examples, namely:</p>
       <code>    {match,[{3,4}]}</code>
@@ -473,15 +468,15 @@ This option makes it possible to include comments inside complicated patterns. N
       <item><p>Optionally specifies how captured substrings are to be returned. If omitted, the default of <c>index</c> is used. The <c>Type</c> can be one of the following:</p>
         <taglist>
         <tag><c>index</c></tag> 
-        <item>Return captured substrings as pairs of byte indexes into the subject string and length of the matching string in the subject (as if the subject string was flattened with <c>iolist_to_binary/1</c> or <c>unicode:characters_to_binary/2</c> prior to matching). Note that the <c>unicode</c> option results in <em>byte-oriented</em> indexes in a (possibly imagined) <em>UTF-8 encoded</em> binary. A byte index tuple <c>{0,2}</c> might therefore represent one or two characters when <c>unicode</c> is in effect. This might seem contra-intuitive, but has been deemed the most effective and useful way to way to do it. To return lists instead might result in simpler code if that is desired. This return type is the default.</item>
+        <item>Return captured substrings as pairs of byte indexes into the subject string and length of the matching string in the subject (as if the subject string was flattened with <c>iolist_to_binary/1</c> or <c>unicode:characters_to_binary/2</c> prior to matching). Note that the <c>unicode</c> option results in <em>byte-oriented</em> indexes in a (possibly virtual) <em>UTF-8 encoded</em> binary. A byte index tuple <c>{0,2}</c> might therefore represent one or two characters when <c>unicode</c> is in effect. This might seem counter-intuitive, but has been deemed the most effective and useful way to way to do it. To return lists instead might result in simpler code if that is desired. This return type is the default.</item>
         <tag><c>list</c></tag> 
-        <item>Return matching substrings as lists of characters (Erlang <c>string()</c>'s). It the <c>unicode</c> option is used in combination with the \C sequence in the regular expression, a captured subpattern can contain bytes that has is not valid UTF-8 (\C matches bytes regardless of character encoding). In that case the <c>list</c> capturing may result in the same types of tuples that <c>unicode:characters_to_list/2</c> can return, namely three-tuples with the tag <c>incomplete</c> or <c>error</c>, the successfully converted characters and the invalid UTF-8 tail of the conversion as a binary. The best strategy is to avoid using the \C sequence when capturing lists.</item>
+        <item>Return matching substrings as lists of characters (Erlang <c>string()</c>s). It the <c>unicode</c> option is used in combination with the \C sequence in the regular expression, a captured subpattern can contain bytes that are not valid UTF-8 (\C matches bytes regardless of character encoding). In that case the <c>list</c> capturing may result in the same types of tuples that <c>unicode:characters_to_list/2</c> can return, namely three-tuples with the tag <c>incomplete</c> or <c>error</c>, the successfully converted characters and the invalid UTF-8 tail of the conversion as a binary. The best strategy is to avoid using the \C sequence when capturing lists.</item>
         <tag><c>binary</c></tag> 
-        <item>Return matching substrings as binaries. If the <c>unicode</c> option is used, these binaries is in UTF-8. If the \C sequence is used together with <c>unicode</c> the binaries may be invalid UTF-8.</item>
+        <item>Return matching substrings as binaries. If the <c>unicode</c> option is used, these binaries are in UTF-8. If the \C sequence is used together with <c>unicode</c> the binaries may be invalid UTF-8.</item>
         </taglist>
       </item>
       </taglist>
-      <p>In general, subpatterns that got assigned no value in the match are returned as the tuple <c>{-1,0}</c> when <c>type</c> is <c>index</c>. Unassigned subpatterns are returned as the empty binary or list respectively for other return types. Consider the regular expression:</p>
+      <p>In general, subpatterns that were not assigned a value in the match are returned as the tuple <c>{-1,0}</c> when <c>type</c> is <c>index</c>. Unassigned subpatterns are returned as the empty binary or list, respectively, for other return types. Consider the regular expression:</p>
 <code>    ".*((?&lt;FOO&gt;abdd)|a(..d)).*"</code>
       <p>There are three explicitly capturing subpatterns, where the opening parenthesis position determines the order in the result, hence <c>((?&lt;FOO&gt;abdd)|a(..d))</c> is subpattern index 1, <c>(?&lt;FOO&gt;abdd)</c> is subpattern index 2 and <c>(..d)</c> is subpattern index 3. When matched against the following string:</p>
 <code>    "ABCabcdABC"</code>
@@ -533,8 +528,8 @@ This option makes it possible to include comments inside complicated patterns. N
 	<v>NLSpec = cr | crlf | lf | anycrlf | any </v>
       </type>
       <desc>
-      <p>Replaces the matched part of the <c>Subject</c> string with the content of <c>Replacement</c>.</p>
-      <p>Options are given as to the <c>re:run/3</c> function except that the <c>capture</c> option of <c>re:run/3</c> is not allowed. 
+      <p>Replaces the matched part of the <c>Subject</c> string with the contents of <c>Replacement</c>.</p>
+      <p>The permissible options are the same as for <c>re:run/3</c>, except that the <c>capture</c> option is not allowed.
       Instead a <c>{return, ReturnType}</c> is present. The default return type is <c>iodata</c>, constructed in a 
       way to minimize copying. The <c>iodata</c> result can be used directly in many i/o-operations. If a flat <c>list()</c> is
       desired, specify <c>{return, list}</c> and if a binary is preferred, specify <c>{return, binary}</c>.</p>
@@ -544,7 +539,7 @@ This option makes it possible to include comments inside complicated patterns. N
       a Unicode <c>charlist()</c>. If compilation is done implicitly
       and the <c>unicode</c> compilation option is given to this
       function, both the regular expression and the <c>Subject</c>
-      should be given as valid Unicode <c>charlist()</c>'s.</p>
+      should be given as valid Unicode <c>charlist()</c>s.</p>
 
       <p>The replacement string can contain the special character
       <c>&amp;</c>, which inserts the whole matching expression in the
@@ -554,7 +549,7 @@ This option makes it possible to include comments inside complicated patterns. N
       generated by the regular expression, nothing is inserted.</p>
       <p>To insert an <c>&amp;</c> or <c>\</c> in the result, precede it
       with a <c>\</c>. Note that Erlang already gives a special
-      meaning to <c>\</c> in literal strings, why a single <c>\</c>
+      meaning to <c>\</c> in literal strings, so a single <c>\</c>
       has to be written as <c>"\\"</c> and therefore a double <c>\</c>
       as <c>"\\\\"</c>. Example:</p>
       <code>    re:replace("abcd","c","[&amp;]",[{return,list}]).</code>
@@ -611,7 +606,7 @@ This option makes it possible to include comments inside complicated patterns. N
       a Unicode <c>charlist()</c>. If compilation is done implicitly
       and the <c>unicode</c> compilation option is given to this
       function, both the regular expression and the <c>Subject</c>
-      should be given as valid Unicode <c>charlist()</c>'s.</p>
+      should be given as valid Unicode <c>charlist()</c>s.</p>
 
       <p>The result is given as a list of &quot;strings&quot;, the
       preferred datatype given in the <c>return</c> option (default iodata).</p> 
@@ -656,25 +651,25 @@ This option makes it possible to include comments inside complicated patterns. N
       <p>Here the regular expression matched first the &quot;l&quot;,
       causing &quot;Er&quot; to be the first part in the result. When
       the regular expression matched, the (only) subexpression was
-      bound to the &quot;l&quot;, why the &quot;l&quot; is inserted
+      bound to the &quot;l&quot;, so the &quot;l&quot; is inserted
       in the group together with &quot;Er&quot;. The next match is of
       the &quot;n&quot;, making &quot;a&quot; the next part to be
-      returned. As the subexpression is bound to the substring
+      returned. Since the subexpression is bound to the substring
       &quot;n&quot; in this case, the &quot;n&quot; is inserted into
       this group. The last group consists of the rest of the string,
       as no more matches are found.</p>
 
 
       <p>By default, all parts of the string, including the empty
-      strings are returned from the function. As an example:</p>      
+      strings, are returned from the function. For example:</p>
 
 <code>    re:split("Erlang","[lg]",[{return,list}]).</code>
 
-      <p>The result will be:</p>
+      <p>will return:</p>
 
 <code>    ["Er","an",[]]</code>
 
-      <p>as the matching of the &quot;g&quot; in the end of the string
+      <p>since the matching of the &quot;g&quot; in the end of the string
       leaves an empty rest which is also returned. This behaviour
       differs from the default behaviour of the split function in
       Perl, where empty strings at the end are by default removed. To
@@ -701,10 +696,10 @@ This option makes it possible to include comments inside complicated patterns. N
 
       <p>Note that the last part is &quot;ang&quot;, not
       &quot;an&quot;, as we only specified splitting into two parts,
-      and the splitting stops when enough parts are given, why the
-      result differs from that of <c>trim</c>.</p>
+      and the splitting stops when enough parts are given, which is
+      why the result differs from that of <c>trim</c>.</p>
 
-      <p>More than three parts are not possible with this indata, why</p>
+      <p>More than three parts are not possible with this indata, so</p>
 
 <code>    re:split("Erlang","[lg]",[{return,list},{parts,4}]).</code>
 
@@ -745,7 +740,7 @@ This option makes it possible to include comments inside complicated patterns. N
       the parts of the string matching the subexpressions of the
       regexp.</p>
       <p>The return value from the function will in this case be a
-      <c>list()</c> of <c>list()</c>'s.  Each sublist begins with the
+      <c>list()</c> of <c>list()</c>s.  Each sublist begins with the
       string picked out of the subject string, followed by the parts
       matching each of the subexpressions in order of occurrence in the
       regular expression.</p>
@@ -782,10 +777,8 @@ This option makes it possible to include comments inside complicated patterns. N
     <title>PERL LIKE REGULAR EXPRESSIONS SYNTAX</title>
     <p>The following sections contain reference material for the
     regular expressions used by this module. The regular expression
-    reference is taken from the PCRE documentation, but converted as
-    needed.</p>
-    <p>The documentation is altered where appropriate and where the re 
-    module behaves differently than the PCRE library.</p>
+    reference is based on the PCRE documentation, with changes in
+    cases where the re module behaves differently to the PCRE library.</p>
   </section>
 
 <section><title>PCRE regular expression details</title>
diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml
index 8c8ae51262..729df1e678 100644
--- a/lib/stdlib/doc/src/sofs.xml
+++ b/lib/stdlib/doc/src/sofs.xml
@@ -210,7 +210,7 @@
       X[i] to Y[i] and S a subset of
       X[1]&nbsp;&times;&nbsp;...&nbsp;&times;&nbsp;X[n]. 
       The <marker id="multiple_relative_product"></marker><em>multiple 
-      relative product</em> of TR and and S is defined to be the 
+      relative product</em> of TR and S is defined to be the
       set {z&nbsp;: z&nbsp;= ((x[1],&nbsp;...,&nbsp;x[n]), (y[1],...,y[n]))
       for some (x[1],&nbsp;...,&nbsp;x[n])&nbsp;in&nbsp;S and for some
       (x[i],&nbsp;y[i]) in R[i],
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index c696434d49..45fa0847a8 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -156,7 +156,7 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           the child process to terminate by calling
           <c>exit(Child,shutdown)</c> and then wait for an exit signal
           with reason <c>shutdown</c> back from the child process. If
-          no exit signal is received within the specified time,
+          no exit signal is received within the specified number of milliseconds,
           the child process is unconditionally terminated using
           <c>exit(Child,kill)</c>.</p>
         <p>If the child process is another supervisor, <c>Shutdown</c>
diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml
index 10ead62073..8cbfb9387b 100644
--- a/lib/stdlib/doc/src/sys.xml
+++ b/lib/stdlib/doc/src/sys.xml
@@ -34,7 +34,7 @@
   <module>sys</module>
   <modulesummary>A Functional Interface to System Messages</modulesummary>
   <description>
-    <p>This module contains functions for sending system messages used by programs, and messaged used for debugging purposes.
+    <p>This module contains functions for sending system messages used by programs, and messages used for debugging purposes.
       </p>
     <p>Functions used for implementation of processes 
       should also understand system messages such as debugging
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index 0b6807dd6c..1b34e71490 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -202,18 +202,33 @@
     </func>
     <func>
       <name>tc(Module, Function, Arguments) -> {Time, Value}</name>
-      <fsummary>Measure the real time it takes to evaluate <c>apply(Module, Function, Arguments)</c></fsummary>
+      <name>tc(Fun, Arguments) -> {Time, Value}</name>
+      <fsummary>Measure the real time it takes to evaluate <c>apply(Module,
+      Function, Arguments)</c> or <c>apply(Fun, Arguments)</c></fsummary>
       <type>
         <v>Module = Function = atom()</v>
+        <v>Fun = fun()</v>
         <v>Arguments = [term()]</v>
         <v>Time = integer() in microseconds</v>
         <v>Value = term()</v>
       </type>
       <desc>
-        <p>Evaluates <c>apply(Module, Function, Arguments)</c> and measures
-          the elapsed real time. Returns <c>{Time, Value}</c>, where 
-          <c>Time</c> is the elapsed real time in <em>microseconds</em>,
-          and <c>Value</c> is what is returned from the apply.</p>
+        <p></p>
+        <taglist>
+          <tag><c>tc/3</c></tag>
+          <item>
+            <p>Evaluates <c>apply(Module, Function, Arguments)</c> and measures
+              the elapsed real time as reported by <c>now/0</c>.
+              Returns <c>{Time, Value}</c>, where
+              <c>Time</c> is the elapsed real time in <em>microseconds</em>,
+              and <c>Value</c> is what is returned from the apply.</p>
+          </item>
+          <tag><c>tc/2</c></tag>
+          <item>
+            <p>Evaluates <c>apply(Fun, Arguments)</c>. Otherwise works
+            like <c>tc/3</c>.</p>
+          </item>
+        </taglist>
       </desc>
     </func>
     <func>
diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index f1b0659ea2..416df1f02c 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1999</year>
-      <year>2009</year>
+      <year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -168,6 +168,48 @@ Eshell V5.7  (abort with ^G)
 <image file="ushell2.gif"><icaption>Unicode characters in allowed and disallowed context</icaption></image>
 </section> 
 <section>
+<title>Unicode file names</title>
+<p>Most modern operating systems support Unicode file names in some way or another. There are several different ways to do this and Erlang by default treats the different approaches differently:</p>
+<taglist>
+<tag>Mandatory Unicode file naming</tag>
+<item>
+<p>Windows and, for most common uses, MacOSX enforces Unicode support for file names. All files created in the filesystem have names that can consistently be interpreted. In MacOSX, all file names are retrieved in UTF-8 encoding, while Windows has selected an approach where each system call handling file names has a special Unicode aware variant, giving much the same effect. There are no file names on these systems that are not Unicode file names, why the default behavior of the Erlang VM is to work in &quot;Unicode file name translation mode&quot;, meaning that a file name can be given as a Unicode list and that will be automatically translated to the proper name encoding for the underlying operating and file system.</p>
+<p>Doing i.e. a <c>file:list_dir/1</c> on one of these systems may return Unicode lists with codepoints beyond 255, depending on the content of the actual filesystem.</p>
+<p>As the feature is fairly new, you may still stumble upon non core applications that cannot handle being provided with file names containing characters with codepoints larger than 255, but the core Erlang system should have no problems with Unicode file names.</p>
+</item>
+<tag>Transparent file naming</tag>
+<item>
+<p>Most Unix operating systems have adopted a simpler approach, namely that Unicode file naming is not enforced, but by convention. Those systems usually use UTF-8 encoding for Unicode file names, but do not enforce it. On such a system, a file name containing characters having codepoints between 128 and 255 may be named either as plain ISO-latin-1 or using UTF-8 encoding. As no consistency is enforced, the Erlang VM can do no consistent translation of all file names. If the VM would automatically select encoding based on heuristics, one could get unexpected behavior on these systems, therefore file names not being encoded in UTF-8 are returned as &quot;raw file names&quot; if Unicode file naming support is turned on.</p>
+<p>A raw file name is not a list, but a binary. Many non core applications still do not handle file names given as binaries, why such raw names are avoided by default. This means that systems having implemented Unicode file naming through transparent file systems and an UTF-8 convention, do not by default have Unicode file naming turned on. Explicitly turning Unicode file name handling on for these types of systems is considered experimental.</p>
+</item>
+</taglist>
+<p>The Unicode file naming support was introduced with OTP release R14B01. A VM operating in Unicode file mode can work with files having names in any language or character set (as long as it's supported by the underlying OS and file system). The Unicode character list is used to denote file or directory names and if the file system content is listed, you will also be able to get Unicode lists as return value. The support lies in the kernel and stdlib modules, why most applications (that does not explicitly require the file names to be in the ISO-latin-1 range) will benefit from the Unicode support without change.</p>
+
+<p>On Operating systems with mandatory Unicode file names, this means that you more easily conform to the file names of other (non Erlang) applications, and you can also process file names that, at least on Windows, were completely inaccessible (due to having names that could not be represented in ISO-latin-1). Also you will avoid creating incomprehensible file names on MacOSX as the vfs layer of the OS will accept all your file names as UTF-8 and will not rewrite them.</p>
+
+<p>For most systems, turning on Unicode file name translation is no problem even if it uses transparent file naming. Very few systems have mixed file name encodings. A consistent UTF-8 named system will work perfectly in Unicode file name mode. It is still however considered experimental in R14B01. Unicode file name translation is turned on with the <c>+fnu</c> switch to the <c>erl</c> program. If the VM is started in Unicode file name translation mode, <c>file:native_name_encoding/0</c> will return the atom <c>utf8</c>.</p>
+
+<p>In Unicode file name mode, file names given to the BIF <c>open_port/2</c> with the option <c>{spawn_executable,...}</c> are also interpreted as Unicode. So is the parameter list given in the <c>args</c> option available when using <c>spawn_executable</c>. The UTF-8 translation of arguments can be avoided using binaries, see the discussion about raw file names below.</p>
+
+<p>It is worth noting that the file <c>encoding</c> options given when opening a file has nothing to do with the file <em>name</em> encoding convention. You can very well open files containing UTF-8 but having file names in ISO-latin-1 or vice versa.</p>
+
+<note>Erlang drivers and NIF shared objects still can not be named with names containing codepoints beyond 127. This is a known limitation to be removed in a future release. Erlang modules however can, but it is definitely not a good idea and is still considered experimental.</note> 
+
+<section>
+<title>Notes about raw file names and automatic file name conversion</title>
+<p>Raw file names is introduced together with Unicode file name support in erts-5.8.2 (OTP R14B01). The reason &quot;raw file names&quot; is introduced in the system is to be able to consistently represent file names given in different encodings on the same system. Having the VM automatically translate a file name that is not in UTF-8 to a list of Unicode characters might seem practical, but this would open up for both duplicate file names and other inconsistent behavior. Consider a directory containing a file named &quot;bj�rn&quot; in ISO-latin-1, while the Erlang VM is operating in Unicode file name mode (and therefore expecting UTF-8 file naming). The ISO-latin-1 name is not valid UTF-8 and one could be tempted to think that automatic conversion in for example <c>file:list_dir/1</c> is a good idea. But what would happen if we later tried to open the file and have the name as a Unicode list (magically converted from the ISO-latin-1 file name)? The VM will convert the file name given to UTF-8, as this is the encoding expected. Effectively this means trying to open the file named &lt;&lt;&quot;bj�rn&quot;/utf8&gt;&gt;. This file does not exist, and even if it existed it would not be the same file as the one that was listed. We could even create two files named &quot;bj�rn&quot;, one named in the UTF-8 encoding and one not. If <c>file:list_dir/1</c> would automatically convert the ISO-latin-1 file name to a list, we would get two identical file names as the result. To avoid this, we need to differentiate between file names being properly encoded according to the Unicode file naming convention (i.e. UTF-8) and file names being invalid under the encoding. This is done by representing invalid encoding as &quot;raw&quot; file names, i.e. as binaries.</p>
+<p>The core system of Erlang (kernel and stdlib) accepts raw file names except for loadable drivers and executables invoked using <c>open_port({spawn, ...} ...)</c>. <c>open_port({spawn_executable, ...} ...)</c> however does accept them. As mentioned earlier, the arguments given in the option list to <c>open_port({spawn_executable, ...} ...)</c> undergo the same conversion as the file names, meaning that the executable will be provided with arguments in UTF-8 as well. This translation is avoided consistently with how the file names are treated, by giving the argument as a binary.</p>
+<p>To force Unicode file name translation mode on systems where this is not the default is considered experimental in OTP R14B01 due to the raw file names possibly being a new experience to the programmer and that the non core applications of OTP are not tested for compliance with raw file names yet. Unicode file name translation is expected to be default in future releases.</p>
+<p>If working with raw file names, one can still conform to the encoding convention of the Erlang VM by using the <c>file:native_name_encoding/0</c> function, which returns either the atom <c>latin1</c> or the atom <c>utf8</c> depending on the file name translation mode. On Linux, a VM started without explicitly stating the file name translation mode will default to <c>latin1</c> as the native file name encoding, why file names on the disk encoded as UTF-8 will be returned as a list of the names interpreted as ISO-latin-1. The &quot;UTF-8 list&quot; is not a practical type for displaying or operating on in Erlang, but it is backward compatible and usable in all functions requiring a file name. On Windows and MacOSX, the default behavior is that of file name translation, why the <c>file:native_name_encoding/0</c> by default returns <c>utf8</c> on those systems (the fact that Windows actually does not use UTF-8 on the file system level can safely be ignored by the Erlang programmer). The default behavior can be changed using the <c>+fnu</c> or <c>+fnl</c> options to the VM, see the <c>erl</c> command manual page.</p> 
+<p>Even if you are operating without Unicode file naming translation automatically done by the VM, you can access and create files with names in UTF-8 encoding by using raw file names encoded as UTF-8. Enforcing the UTF-8 encoding regardless of the mode the Erlang VM is started in might, in some circumstances be a good idea, as the convention of using UTF-8 file names is spreading.</p>  
+</section>
+<section>
+<title>Notes about MacOSX</title>
+<p>MacOSXs vfs layer enforces UTF-8 file names in a quite aggressive way. Older versions did this by simply refusing to create non UTF-8 conforming file names, while newer versions replace offending bytes with the sequence &quot;%HH&quot;, where HH is the original character in hexadecimal notation. As Unicode translation is enabled by default on MacOSX, the only way to come up against this is to either start the VM with the <c>+fnl</c> flag or to use a raw file name in <c>latin1</c> encoding. In that case, the file can not be opened with the same name as the one used to create this. The problem is by design in newer versions of MacOSX.</p>
+<p>MacOSX also reorganizes the names of files so that the representation of accents etc is denormalized, i.e. the character <c>�</c> is represented as the codepoints [111,776], where 111 is the character <c>o</c> and 776 is a special accent character. This type of denormalized Unicode is otherwise very seldom used and Erlang normalizes those file names on retrieval, so that denormalized file names is not passed up to the Erlang application. In Erlang the file name &quot;bj�rn&quot; is retrieved as [98,106,246,114,110], not as [98,106,117,776,114,110], even though the file system might think differently.</p>
+</section>
+</section>
+<section>
 <title>Unicode-aware modules</title>
 <p>Most of the modules in Erlang/OTP are of course Unicode-unaware in the sense that they have no notion of Unicode and really shouldn't have. Typically they handle non-textual or byte-oriented data (like <c>gen_tcp</c> etc).</p>
 <p>Modules that actually handle textual data (like <c>io_lib</c>, <c>string</c> etc) are sometimes subject to conversion or extension to be able to handle Unicode characters.</p>
diff --git a/lib/stdlib/src/base64.erl b/lib/stdlib/src/base64.erl
index ebef998ee1..a14a72ac6d 100644
--- a/lib/stdlib/src/base64.erl
+++ b/lib/stdlib/src/base64.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -114,7 +114,7 @@ decode(List) when is_list(List) ->
 mime_decode(Bin) when is_binary(Bin) ->
     mime_decode_binary(<<>>, Bin);
 mime_decode(List) when is_list(List) ->
-    list_to_binary(mime_decode_l(List)).
+    mime_decode(list_to_binary(List)).
 
 -spec decode_l(string()) -> string().
 
@@ -125,7 +125,7 @@ decode_l(List) ->
 -spec mime_decode_l(string()) -> string().
 
 mime_decode_l(List) ->
-    L = strip_illegal(List, []),
+    L = strip_illegal(List, [], 0),
     decode(L, []).
 
 %%-------------------------------------------------------------------------
@@ -198,6 +198,9 @@ decode_binary(Result, <<>>) ->
     true = is_binary(Result),
     Result.
 
+%% Skipping pad character if not at end of string. Also liberal about
+%% excess padding and skipping of other illegal (non-base64 alphabet)
+%% characters. See section 3.3 of RFC4648
 mime_decode_binary(Result, <<0:8,T/bits>>) ->
     mime_decode_binary(Result, T);
 mime_decode_binary(Result0, <<C:8,T/bits>>) ->
@@ -205,15 +208,27 @@ mime_decode_binary(Result0, <<C:8,T/bits>>) ->
 	Bits when is_integer(Bits) ->
 	    mime_decode_binary(<<Result0/bits,Bits:6>>, T);
 	eq ->
-	    case tail_contains_equal(T) of
-		true ->
-		    Split = byte_size(Result0) - 1,
-		    <<Result:Split/bytes,_:4>> = Result0,
-		    Result;
-		false ->
-		    Split = byte_size(Result0) - 1,
-		    <<Result:Split/bytes,_:2>> = Result0,
-		    Result
+	    case tail_contains_more(T, false) of
+		{<<>>, Eq} ->
+		    %% No more valid data.
+		    case bit_size(Result0) rem 8 of
+			0 ->
+			    %% '====' is not uncommon.
+			    Result0;
+			4 when Eq ->
+			    %% enforce at least one more '=' only ignoring illegals and spacing
+			    Split =  byte_size(Result0) - 1,
+			    <<Result:Split/bytes,_:4>> = Result0,
+			    Result;
+			2 ->
+			    %% remove 2 bits
+			    Split =  byte_size(Result0) - 1,
+			    <<Result:Split/bytes,_:2>> = Result0,
+			    Result
+		    end;
+		{More, _} ->
+		    %% More valid data, skip the eq as invalid
+		    mime_decode_binary(Result0, More)
 	    end;
 	_ ->
 	    mime_decode_binary(Result0, T)
@@ -262,31 +277,63 @@ strip_ws(<<$\s,T/binary>>) ->
     strip_ws(T);
 strip_ws(T) -> T.
 
-strip_illegal([0|Cs], A) ->
-    strip_illegal(Cs, A);
-strip_illegal([C|Cs], A) ->
+%% Skipping pad character if not at end of string. Also liberal about
+%% excess padding and skipping of other illegal (non-base64 alphabet)
+%% characters. See section 3.3 of RFC4648
+strip_illegal([], A, _Cnt) ->
+    A;
+strip_illegal([0|Cs], A, Cnt) ->
+    strip_illegal(Cs, A, Cnt);
+strip_illegal([C|Cs], A, Cnt) ->
     case element(C, ?DECODE_MAP) of
-	bad -> strip_illegal(Cs, A);
-	ws -> strip_illegal(Cs, A);
-	eq -> strip_illegal_end(Cs, [$=|A]);
-	_ -> strip_illegal(Cs, [C|A])
-    end;
-strip_illegal([], A) -> A.
+	bad ->
+	    strip_illegal(Cs, A, Cnt);
+	ws ->
+	    strip_illegal(Cs, A, Cnt);
+	eq ->
+	    case {tail_contains_more(Cs, false), Cnt rem 4} of
+		{{[], _}, 0} ->
+		    A;            %% Ignore extra =
+		{{[], true}, 2} ->
+		    [$=|[$=|A]];  %% 'XX=='
+		{{[], _}, 3} ->
+		    [$=|A];       %% 'XXX='
+		{{[H|T], _}, _} ->
+		    %% more data, skip equals
+		    strip_illegal(T, [H|A], Cnt+1)
+	    end;
+	_ ->
+	    strip_illegal(Cs, [C|A], Cnt+1)
+    end.
 
-strip_illegal_end([0|Cs], A) ->
-    strip_illegal_end(Cs, A);
-strip_illegal_end([C|Cs], A) ->
+%% Search the tail for more valid data and remember if we saw
+%% another equals along the way.
+tail_contains_more([], Eq) ->
+    {[], Eq};
+tail_contains_more(<<>>, Eq) ->
+    {<<>>, Eq};
+tail_contains_more([C|T]=More, Eq) ->
     case element(C, ?DECODE_MAP) of
-	bad -> strip_illegal(Cs, A);
-	ws -> strip_illegal(Cs, A);
-	eq -> [C|A];
-	_ -> strip_illegal(Cs, [C|A])
+	bad ->
+	    tail_contains_more(T, Eq);
+	ws ->
+	    tail_contains_more(T, Eq);
+	eq ->
+	    tail_contains_more(T, true);
+	_ ->
+	    {More, Eq}
     end;
-strip_illegal_end([], A) -> A.
-
-tail_contains_equal(<<$=,_/binary>>) -> true;
-tail_contains_equal(<<_,T/binary>>) -> tail_contains_equal(T);
-tail_contains_equal(<<>>) -> false.
+tail_contains_more(<<C:8,T/bits>> =More, Eq) ->
+    case element(C, ?DECODE_MAP) of
+	bad ->
+	    tail_contains_more(T, Eq);
+	ws ->
+	    tail_contains_more(T, Eq);
+	eq ->
+	    tail_contains_more(T, true);
+	_ ->
+	    {More, Eq}
+    end.
     
 %% accessors 
 b64e(X) ->
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index 91ff2438c6..74d4ad3da7 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -19,6 +19,10 @@
 -module(beam_lib).
 -behaviour(gen_server).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([info/1,
 	 cmp/2,
 	 cmp_dirs/2,
@@ -105,6 +109,7 @@
                    | info_rsn().
 -type cmp_rsn()   :: {'modules_different', module(), module()}
                    | {'chunks_different', chunkid()}
+                   | 'different_chunks'
                    | info_rsn().
 
 %%-------------------------------------------------------------------------
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index e05a1c787f..235ea939a8 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -20,6 +20,8 @@
 
 %% Utilities to use from shell.
 
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([help/0,lc/1,c/1,c/2,nc/1,nc/2, nl/1,l/1,i/0,i/1,ni/0,
          y/1, y/2,
 	 lc_batch/0, lc_batch/1,
@@ -40,31 +42,31 @@
 -spec help() -> 'ok'.
 
 help() ->
-    format("bt(Pid)    -- stack backtrace for a process\n"
-	   "c(File)    -- compile and load code in <File>\n"
-	   "cd(Dir)    -- change working directory\n"
-	   "flush()    -- flush any messages sent to the shell\n"
-	   "help()     -- help info\n"
-	   "i()        -- information about the system\n"
-	   "ni()       -- information about the networked system\n"
-	   "i(X,Y,Z)   -- information about pid <X,Y,Z>\n"
-	   "l(Module)  -- load or reload module\n"
-	   "lc([File]) -- compile a list of Erlang modules\n"
-	   "ls()       -- list files in the current directory\n"
-	   "ls(Dir)    -- list files in directory <Dir>\n"
-	   "m()        -- which modules are loaded\n"
-	   "m(Mod)     -- information about module <Mod>\n"
-	   "memory()   -- memory allocation information\n"
-	   "memory(T)  -- memory allocation information of type <T>\n"
-	   "nc(File)   -- compile and load code in <File> on all nodes\n"
-	   "nl(Module) -- load module on all nodes\n"
-	   "pid(X,Y,Z) -- convert X,Y,Z to a Pid\n"
-	   "pwd()      -- print working directory\n"
-	   "q()        -- quit - shorthand for init:stop()\n"
-	   "regs()     -- information about registered processes\n"
-	   "nregs()    -- information about all registered processes\n"
-	   "xm(M)      -- cross reference check a module\n"
-           "y(File)    -- generate a Yecc parser\n").
+    io:put_chars(<<"bt(Pid)    -- stack backtrace for a process\n"
+		   "c(File)    -- compile and load code in <File>\n"
+		   "cd(Dir)    -- change working directory\n"
+		   "flush()    -- flush any messages sent to the shell\n"
+		   "help()     -- help info\n"
+		   "i()        -- information about the system\n"
+		   "ni()       -- information about the networked system\n"
+		   "i(X,Y,Z)   -- information about pid <X,Y,Z>\n"
+		   "l(Module)  -- load or reload module\n"
+		   "lc([File]) -- compile a list of Erlang modules\n"
+		   "ls()       -- list files in the current directory\n"
+		   "ls(Dir)    -- list files in directory <Dir>\n"
+		   "m()        -- which modules are loaded\n"
+		   "m(Mod)     -- information about module <Mod>\n"
+		   "memory()   -- memory allocation information\n"
+		   "memory(T)  -- memory allocation information of type <T>\n"
+		   "nc(File)   -- compile and load code in <File> on all nodes\n"
+		   "nl(Module) -- load module on all nodes\n"
+		   "pid(X,Y,Z) -- convert X,Y,Z to a Pid\n"
+		   "pwd()      -- print working directory\n"
+		   "q()        -- quit - shorthand for init:stop()\n"
+		   "regs()     -- information about registered processes\n"
+		   "nregs()    -- information about all registered processes\n"
+		   "xm(M)      -- cross reference check a module\n"
+		   "y(File)    -- generate a Yecc parser\n">>).
 
 %% c(FileName)
 %%  Compile a file/module.
@@ -657,7 +659,7 @@ portformat(Name, Id, Cmd) ->
 pwd() ->
     case file:get_cwd() of
 	{ok, Str} ->
-	    ok = io:format("~s\n", [Str]);
+	    ok = io:format("~ts\n", [fixup_one_bin(Str)]);
 	{error, _} ->
 	    ok = io:format("Cannot determine current directory\n")
     end.
@@ -682,11 +684,27 @@ ls() ->
 ls(Dir) ->
     case file:list_dir(Dir) of
 	{ok, Entries} ->
-	    ls_print(sort(Entries));
+	    ls_print(sort(fixup_bin(Entries)));
 	{error,_E} ->
 	    format("Invalid directory\n")
     end.
 
+fixup_one_bin(X) when is_binary(X) ->
+    L = binary_to_list(X),
+    [ if 
+	  El > 127 ->
+	      $?;
+	  true ->
+	      El
+      end || El <- L];
+fixup_one_bin(X) -> 
+    X.
+fixup_bin([H|T]) ->
+    [fixup_one_bin(H) | fixup_bin(T)];
+fixup_bin([]) ->
+    [].
+	      
+
 ls_print([]) -> ok;
 ls_print(L) ->
     Width = min([max(lengths(L, [])), 40]) + 5,
@@ -696,7 +714,7 @@ ls_print(X, Width, Len) when Width + Len >= 80 ->
     io:nl(),
     ls_print(X, Width, 0);
 ls_print([H|T], Width, Len) ->
-    io:format("~-*s",[Width,H]),
+    io:format("~-*ts",[Width,H]),
     ls_print(T, Width, Len+Width);
 ls_print([], _, _) ->
     io:nl().
diff --git a/lib/stdlib/src/calendar.erl b/lib/stdlib/src/calendar.erl
index ddc0666f77..57b7c28dee 100644
--- a/lib/stdlib/src/calendar.erl
+++ b/lib/stdlib/src/calendar.erl
@@ -28,6 +28,8 @@
 	 gregorian_days_to_date/1,
 	 gregorian_seconds_to_datetime/1,
 	 is_leap_year/1,
+	 iso_week_number/0,
+	 iso_week_number/1,
 	 last_day_of_the_month/2,
 	 local_time/0, 
 	 local_time_to_universal_time/1, 
@@ -70,6 +72,7 @@
 -type second()   :: 0..59.
 -type daynum()   :: 1..7.
 -type ldom()     :: 28 | 29 | 30 | 31. % last day of month
+-type weeknum()  :: 1..53.
 
 -type t_now()    :: {non_neg_integer(),non_neg_integer(),non_neg_integer()}.
 
@@ -77,6 +80,7 @@
 -type t_time()         :: {hour(),minute(),second()}.
 -type t_datetime()     :: {t_date(),t_time()}.
 -type t_datetime1970() :: {{year1970(),month(),day()},t_time()}.
+-type t_yearweeknum()  :: {year(),weeknum()}.
 
 %%----------------------------------------------------------------------
 
@@ -172,6 +176,42 @@ is_leap_year1(Year) when Year rem 400 =:= 0 ->
 is_leap_year1(_) -> false.
 
 
+%%
+%% Calculates the iso week number for the current date.
+%%
+-spec iso_week_number() -> t_yearweeknum().
+iso_week_number() ->
+    {Date, _} = local_time(),
+    iso_week_number(Date).
+
+
+%%
+%% Calculates the iso week number for the given date.
+%%
+-spec iso_week_number(t_date()) -> t_yearweeknum().
+iso_week_number({Year, Month, Day}) ->
+    D = date_to_gregorian_days({Year, Month, Day}),
+    W01_1_Year = gregorian_days_of_iso_w01_1(Year),
+    W01_1_NextYear = gregorian_days_of_iso_w01_1(Year + 1),
+    if W01_1_Year =< D andalso D < W01_1_NextYear ->
+	    % Current Year Week 01..52(,53)
+	    {Year, (D - W01_1_Year) div 7 + 1};
+	D < W01_1_Year ->
+	    % Previous Year 52 or 53
+	    PWN = case day_of_the_week(Year - 1, 1, 1) of
+		4 -> 53;
+		_ -> case day_of_the_week(Year - 1, 12, 31) of
+			4 -> 53;
+			_ -> 52
+		     end
+		end,
+	    {Year - 1, PWN};
+	W01_1_NextYear =< D ->
+	    % Next Year, Week 01
+	    {Year + 1, 1}
+    end.
+
+
 %% last_day_of_the_month(Year, Month)
 %%
 %% Returns the number of days in a month.
@@ -377,6 +417,19 @@ dty(Y, D1, D2) when D1 < D2 ->
 dty(Y, _D1, D2) ->
     {Y, D2}.
 
+%%
+%% The Gregorian days of the iso week 01 day 1 for a given year.
+%%
+-spec gregorian_days_of_iso_w01_1(year()) -> non_neg_integer().
+gregorian_days_of_iso_w01_1(Year) ->
+    D0101 = date_to_gregorian_days(Year, 1, 1),
+    DOW = day_of_the_week(Year, 1, 1),
+    if DOW =< 4 ->
+	D0101 - DOW + 1;
+    true ->
+	D0101 + 7 - DOW + 1
+    end.
+
 %% year_day_to_date(Year, DayOfYear)  = {Month,  DayOfMonth}
 %%
 %% Note: 1 is the first day of the month. 
diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index 4584b8184f..6c91f1efb7 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -147,6 +147,7 @@
 	 bin,         % small chunk not consumed, or 'eof' at end-of-file
 	 alloc,       % the part of the file not yet scanned, mostly a binary
 	 tab,
+         proc,        % the pid of the Dets process
          match_program % true | compiled_match_spec() | undefined
 	 }).
 
@@ -208,8 +209,6 @@ all() ->
 
 bchunk(Tab, start) ->
     badarg(treq(Tab, {bchunk_init, Tab}), [Tab, start]);
-bchunk(Tab, #dets_cont{bin = eof, tab = Tab}) ->
-    '$end_of_table';
 bchunk(Tab, #dets_cont{what = bchunk, tab = Tab} = State) ->
     badarg(treq(Tab, {bchunk, State}), [Tab, State]);
 bchunk(Tab, Term) ->
@@ -722,11 +721,14 @@ init_chunk_match(Tab, Pat, What, N) when is_integer(N), N >= 0;
                                          N =:= default ->
     case compile_match_spec(What, Pat) of
 	{Spec, MP} ->
-	    case req(dets_server:get_pid(Tab), {match, MP, Spec, N}) of
+            Proc = dets_server:get_pid(Tab),
+	    case req(Proc, {match, MP, Spec, N}) of
 		{done, L} ->
-		    {L, #dets_cont{tab = Tab, what = What, bin = eof}};
+		    {L, #dets_cont{tab = Tab, proc = Proc, what = What,
+                                   bin = eof}};
 		{cont, State} ->
-		    chunk_match(State#dets_cont{what = What, tab = Tab});
+		    chunk_match(State#dets_cont{what = What, tab = Tab,
+                                                proc = Proc});
 		Error ->
 		    Error
 	    end;
@@ -736,34 +738,28 @@ init_chunk_match(Tab, Pat, What, N) when is_integer(N), N >= 0;
 init_chunk_match(_Tab, _Pat, _What, _) ->
     badarg.
 
-chunk_match(State) ->
-    case catch dets_server:get_pid(State#dets_cont.tab) of
-	{'EXIT', _Reason} ->
-	    badarg;
-	_Proc when State#dets_cont.bin =:= eof ->
-	    '$end_of_table';
-	Proc ->
-	    case req(Proc, {match_init, State}) of
-		{cont, {Bins, NewState}} ->
-		    MP = NewState#dets_cont.match_program,
-		    case catch do_foldl_bins(Bins, MP) of
-			{'EXIT', _} ->
-                            case ets:is_compiled_ms(MP) of
-                                true ->
-                                    Bad = dets_utils:bad_object(chunk_match, 
-                                                                Bins),
-                                    req(Proc, {corrupt, Bad});
-                                false ->
-                                    badarg
-                            end;
-                        [] ->
-                            chunk_match(NewState);
-			Terms ->
-			    {Terms, NewState}
-		    end;
-		Error ->
-		    Error
-	    end
+chunk_match(#dets_cont{proc = Proc}=State) ->
+    case req(Proc, {match_init, State}) of
+        '$end_of_table'=Reply ->
+            Reply;
+        {cont, {Bins, NewState}} ->
+            MP = NewState#dets_cont.match_program,
+            case catch do_foldl_bins(Bins, MP) of
+                {'EXIT', _} ->
+                    case ets:is_compiled_ms(MP) of
+                        true ->
+                            Bad = dets_utils:bad_object(chunk_match, Bins),
+                            req(Proc, {corrupt, Bad});
+                        false ->
+                            badarg
+                    end;
+                [] ->
+                    chunk_match(NewState);
+                Terms ->
+                    {Terms, NewState}
+            end;
+        Error ->
+            Error
     end.
 
 do_foldl_bins(Bins, true) ->
@@ -1094,7 +1090,9 @@ do_apply_op(Op, From, Head, N) ->
         {N2, H2} when is_record(H2, head), is_integer(N2) ->
             open_file_loop(H2, N2);
         H2 when is_record(H2, head) ->
-            open_file_loop(H2, N)
+            open_file_loop(H2, N);
+        {{more,From1,Op1,N1}, NewHead} ->
+            do_apply_op(Op1, From1, NewHead, N1)
     catch 
         exit:normal -> 
             exit(normal);
@@ -1363,37 +1361,35 @@ start_auto_save_timer(Head) ->
 %% lookup requests in parallel. Evalute delete_object, delete and
 %% insert as well.
 stream_op(Op, Pid, Pids, Head, N) ->
-    stream_op(Head, Pids, [], N, Pid, Op, Head#head.fixed).
+    #head{fixed = Fxd, update_mode = M} = Head, 
+    stream_op(Head, Pids, [], N, Pid, Op, Fxd, M).
 
-stream_loop(Head, Pids, C, N, false = Fxd) ->
+stream_loop(Head, Pids, C, N, false = Fxd, M) ->
     receive
 	?DETS_CALL(From, Message) ->
-	    stream_op(Head, Pids, C, N, From, Message, Fxd)
+	    stream_op(Head, Pids, C, N, From, Message, Fxd, M)
     after 0 ->
 	    stream_end(Head, Pids, C, N, no_more)
     end;
-stream_loop(Head, Pids, C, N, _Fxd) ->
+stream_loop(Head, Pids, C, N, _Fxd, _M) ->
     stream_end(Head, Pids, C, N, no_more).
 
-stream_op(Head, Pids, C, N, Pid, {lookup_keys,Keys}, Fxd) ->
+stream_op(Head, Pids, C, N, Pid, {lookup_keys,Keys}, Fxd, M) ->
     NC = [{{lookup,Pid},Keys} | C],
-    stream_loop(Head, Pids, NC, N, Fxd);
-stream_op(Head, Pids, C, N, Pid, {insert, _Objects} = Op, Fxd) ->
-    NC = [Op | C],
-    stream_loop(Head, [Pid | Pids], NC, N, Fxd);
-stream_op(Head, Pids, C, N, Pid, {insert_new, _Objects} = Op, Fxd) ->
+    stream_loop(Head, Pids, NC, N, Fxd, M);
+stream_op(Head, Pids, C, N, Pid, {insert, _Objects} = Op, Fxd, dirty = M) ->
     NC = [Op | C],
-    stream_loop(Head, [Pid | Pids], NC, N, Fxd);
-stream_op(Head, Pids, C, N, Pid, {delete_key, _Keys} = Op, Fxd) ->
+    stream_loop(Head, [Pid | Pids], NC, N, Fxd, M);
+stream_op(Head, Pids, C, N, Pid, {delete_key, _Keys} = Op, Fxd, dirty = M) ->
     NC = [Op | C],
-    stream_loop(Head, [Pid | Pids], NC, N, Fxd);
-stream_op(Head, Pids, C, N, Pid, {delete_object, _Objects} = Op, Fxd) ->
+    stream_loop(Head, [Pid | Pids], NC, N, Fxd, M);
+stream_op(Head, Pids, C, N, Pid, {delete_object, _Os} = Op, Fxd, dirty = M) ->
     NC = [Op | C],
-    stream_loop(Head, [Pid | Pids], NC, N, Fxd);
-stream_op(Head, Pids, C, N, Pid, {member, Key}, Fxd) ->
+    stream_loop(Head, [Pid | Pids], NC, N, Fxd, M);
+stream_op(Head, Pids, C, N, Pid, {member, Key}, Fxd, M) ->
     NC = [{{lookup,[Pid]},[Key]} | C],
-    stream_loop(Head, Pids, NC, N, Fxd);
-stream_op(Head, Pids, C, N, Pid, Op, _Fxd) ->
+    stream_loop(Head, Pids, NC, N, Fxd, M);
+stream_op(Head, Pids, C, N, Pid, Op, _Fxd, _M) ->
     stream_end(Head, Pids, C, N, {Pid,Op}).
 
 stream_end(Head, Pids0, C, N, Next) ->
@@ -1438,7 +1434,7 @@ stream_end2([], Ps, no_more, N, C, Head, _Reply) ->
     penalty(Head, Ps, C),
     {N, Head};
 stream_end2([], _Ps, {From, Op}, N, _C, Head, _Reply) ->
-    apply_op(Op, From, Head, N).
+    {{more,From,Op,N},Head}.
 
 penalty(H, _Ps, _C) when H#head.fixed =:= false ->
     ok;
@@ -1578,13 +1574,18 @@ do_bchunk_init(Head, Tab) ->
                     L = dets_utils:all_allocated(H2),
                     C0 = #dets_cont{no_objs = default, bin = <<>>, alloc = L},
 		    BinParms = term_to_binary(Parms),
-		    {H2, {C0#dets_cont{tab = Tab, what = bchunk}, [BinParms]}}
+		    {H2, {C0#dets_cont{tab = Tab, proc = self(),what = bchunk},
+                          [BinParms]}}
 	    end;
 	{NewHead, _} = HeadError when is_record(NewHead, head) ->
 	    HeadError
     end.
 
 %% -> {NewHead, {cont(), [binary()]}} | {NewHead, Error}
+do_bchunk(Head, #dets_cont{proc = Proc}) when Proc =/= self() ->
+    {Head, badarg};
+do_bchunk(Head, #dets_cont{bin = eof}) ->
+    {Head, '$end_of_table'};
 do_bchunk(Head, State) ->
     case dets_v9:read_bchunks(Head, State#dets_cont.alloc) of
 	{error, Reason} ->
@@ -1954,6 +1955,8 @@ flookup_keys(Head, Keys) ->
     end.
 
 %% -> {NewHead, Result}
+fmatch_init(Head, #dets_cont{bin = eof}) ->
+    {Head, '$end_of_table'};
 fmatch_init(Head, C) ->
     case scan(Head, C) of
 	{scan_error, Reason} ->
diff --git a/lib/stdlib/src/dets.hrl b/lib/stdlib/src/dets.hrl
index 6e59770753..fbffc9d008 100644
--- a/lib/stdlib/src/dets.hrl
+++ b/lib/stdlib/src/dets.hrl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -18,7 +18,7 @@
 %%
 
 -define(DEFAULT_MIN_NO_SLOTS, 256).
--define(DEFAULT_MAX_NO_SLOTS, 2*1024*1024).
+-define(DEFAULT_MAX_NO_SLOTS, 32*1024*1024).
 -define(DEFAULT_AUTOSAVE, 3). % minutes
 -define(DEFAULT_CACHE, {3000, 14000}). % {delay,size} in {milliseconds,bytes}
 
diff --git a/lib/stdlib/src/dets_v8.erl b/lib/stdlib/src/dets_v8.erl
index 1f9f84cd27..af36958c1c 100644
--- a/lib/stdlib/src/dets_v8.erl
+++ b/lib/stdlib/src/dets_v8.erl
@@ -1074,6 +1074,8 @@ wl([], _Type, Del, Lookup, I, Objs) ->
     [{Del, Lookup, Objs} | I].
 
 %% -> {NewHead, ok} | {NewHead, Error}
+may_grow(Head, 0, once) ->
+    {Head, ok};
 may_grow(Head, _N, _How) when Head#head.fixed =/= false ->
     {Head, ok};
 may_grow(#head{access = read}=Head, _N, _How) ->
diff --git a/lib/stdlib/src/dets_v9.erl b/lib/stdlib/src/dets_v9.erl
index 53238e962f..132af01f79 100644
--- a/lib/stdlib/src/dets_v9.erl
+++ b/lib/stdlib/src/dets_v9.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -1908,6 +1908,9 @@ write_cache(Head) ->
     end.
 
 %% -> {NewHead, ok} | {NewHead, Error}
+may_grow(Head, 0, once) ->
+    %% Do not re-hash if there is a chance that the file is not dirty.
+    {Head, ok};
 may_grow(Head, _N, _How) when Head#head.fixed =/= false ->
     {Head, ok};
 may_grow(#head{access = read}=Head, _N, _How) ->
diff --git a/lib/stdlib/src/digraph.erl b/lib/stdlib/src/digraph.erl
index b5f52da921..5edc868a94 100644
--- a/lib/stdlib/src/digraph.erl
+++ b/lib/stdlib/src/digraph.erl
@@ -36,7 +36,7 @@
 
 -export([get_short_path/3, get_short_cycle/2]).
 
--export_type([d_type/0, vertex/0]).
+-export_type([digraph/0, d_type/0, vertex/0]).
 
 -record(digraph, {vtab = notable :: ets:tab(),
 		  etab = notable :: ets:tab(),
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index 81b2431f40..e5ccaddbb4 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -33,7 +33,9 @@
 %% Epp state record.
 -record(epp, {file,				%Current file
 	      location,         		%Current location
+              delta,                            %Offset from Location (-file)
 	      name="",				%Current file name
+              name2="",                         %-"-, modified by -file
 	      istk=[],				%Ifdef stack
 	      sstk=[],				%State stack
 	      path=[],				%Include-path
@@ -234,8 +236,8 @@ init_server(Pid, Name, File, AtLocation, Path, Pdm, Pre) ->
     case user_predef(Pdm, Ms0) of
 	{ok,Ms1} ->
 	    epp_reply(Pid, {ok,self()}),
-	    St = #epp{file=File, location=AtLocation, name=Name,
-                      path=Path, macs=Ms1, pre_opened = Pre},
+	    St = #epp{file=File, location=AtLocation, delta=0, name=Name,
+                      name2=Name, path=Path, macs=Ms1, pre_opened = Pre},
 	    From = wait_request(St),
 	    enter_file_reply(From, Name, AtLocation, AtLocation),
 	    wait_req_scan(St);
@@ -358,8 +360,8 @@ enter_file2(NewF, Pname, From, St, AtLocation, ExtraPath) ->
     enter_file_reply(From, Pname, Loc, AtLocation),
     Ms = dict:store({atom,'FILE'}, {none,[{string,Loc,Pname}]}, St#epp.macs),
     Path = St#epp.path ++ ExtraPath,
-    #epp{location=Loc,file=NewF,
-         name=Pname,sstk=[St|St#epp.sstk],path=Path,macs=Ms}.
+    #epp{file=NewF,location=Loc,name=Pname,delta=0,
+         sstk=[St|St#epp.sstk],path=Path,macs=Ms}.
 
 enter_file_reply(From, Name, Location, AtLocation) ->
     Attr = loc_attr(AtLocation),
@@ -391,14 +393,23 @@ leave_file(From, St) ->
 	    case St#epp.sstk of
 		[OldSt|Sts] ->
 		    close_file(St),
-		    enter_file_reply(From, OldSt#epp.name,
-                                     OldSt#epp.location, OldSt#epp.location),
+                    #epp{location=OldLoc, delta=Delta, name=OldName,
+                         name2=OldName2} = OldSt,
+                    CurrLoc = add_line(OldLoc, Delta),
 		    Ms = dict:store({atom,'FILE'},
-				    {none,
-				     [{string,OldSt#epp.location,
-                                       OldSt#epp.name}]},
+				    {none,[{string,CurrLoc,OldName2}]},
 				    St#epp.macs),
-		    wait_req_scan(OldSt#epp{sstk=Sts,macs=Ms});
+                    NextSt = OldSt#epp{sstk=Sts,macs=Ms},
+		    enter_file_reply(From, OldName, CurrLoc, CurrLoc),
+                    case OldName2 =:= OldName of
+                        true ->
+                            From;
+                        false ->
+                            NFrom = wait_request(NextSt),
+                            enter_file_reply(NFrom, OldName2, OldLoc,
+                                             neg_line(CurrLoc))
+                        end,
+                    wait_req_scan(NextSt);
 		[] ->
 		    epp_reply(From, {eof,St#epp.location}),
 		    wait_req_scan(St)
@@ -768,7 +779,8 @@ scan_file([{'(',_Llp},{string,_Ls,Name},{',',_Lc},{integer,_Li,Ln},{')',_Lrp},
     Ms = dict:store({atom,'FILE'}, {none,[{string,1,Name}]}, St#epp.macs),
     Locf = loc(Tf),
     NewLoc = new_location(Ln, St#epp.location, Locf),
-    wait_req_scan(St#epp{name=Name,location=NewLoc,macs=Ms});
+    Delta = abs(get_line(element(2, Tf)))-Ln + St#epp.delta, 
+    wait_req_scan(St#epp{name2=Name,location=NewLoc,delta=Delta,macs=Ms});
 scan_file(_Toks, Tf, From, St) ->
     epp_reply(From, {error,{loc(Tf),epp,{bad,file}}}),
     wait_req_scan(St).
@@ -1132,6 +1144,9 @@ neg_line(L) ->
 abs_line(L) ->
     erl_scan:set_attribute(line, L, fun(Line) -> abs(Line) end).
 
+add_line(L, Offset) ->
+    erl_scan:set_attribute(line, L, fun(Line) -> Line+Offset end).
+
 start_loc(Line) when is_integer(Line) ->
     1;
 start_loc({_Line, _Column}) ->
@@ -1191,10 +1206,10 @@ interpret_file_attr([{attribute,Loc,file,{File,Line}}=Form | Forms],
             %% -include or -include_lib
             % true = L =:= Line,
             case Fs of
-                [_, Delta1, File | Fs1] -> % end of included file
-                    [Form | interpret_file_attr(Forms, Delta1, [File | Fs1])];
+                [_, File | Fs1] -> % end of included file
+                    [Form | interpret_file_attr(Forms, 0, [File | Fs1])];
                 _ -> % start of included file
-                    [Form | interpret_file_attr(Forms, 0, [File, Delta | Fs])]
+                    [Form | interpret_file_attr(Forms, 0, [File | Fs])]
             end
     end;
 interpret_file_attr([Form0 | Forms], Delta, Fs) ->
diff --git a/lib/stdlib/src/erl_expand_records.erl b/lib/stdlib/src/erl_expand_records.erl
index 18c467db81..61ce41f714 100644
--- a/lib/stdlib/src/erl_expand_records.erl
+++ b/lib/stdlib/src/erl_expand_records.erl
@@ -97,7 +97,7 @@ forms([], St) -> {[],St}.
 clauses([{clause,Line,H0,G0,B0} | Cs0], St0) ->
     {H1,St1} = head(H0, St0),
     {G1,St2} = guard(G0, St1),
-    {H,G} = optimize_is_record(H1, G1),
+    {H,G} = optimize_is_record(H1, G1, St2),
     {B,St3} = exprs(B0, St2),
     {Cs,St4} = clauses(Cs0, St3),
     {[{clause,Line,H,G,B} | Cs],St4};
@@ -805,14 +805,19 @@ imported(F, A, St) ->
 %%% Replace is_record/3 in guards with matching if possible.
 %%%
 
-optimize_is_record(H0, G0) ->
+optimize_is_record(H0, G0, #exprec{compile=Opts}) ->
     case opt_rec_vars(G0) of
 	[] ->
 	    {H0,G0};
 	Rs0 ->
-	    {H,Rs} = opt_pattern_list(H0, Rs0),
-	    G = opt_remove(G0, Rs),
-	    {H,G}
+	    case lists:member(no_is_record_optimization, Opts) of
+		true ->
+		    {H0,G0};
+		false ->
+		    {H,Rs} = opt_pattern_list(H0, Rs0),
+		    G = opt_remove(G0, Rs),
+		    {H,G}
+	    end
     end.
 
 
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index bf6e5bc5ca..b30b02a96f 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -247,10 +247,14 @@ bif(check_process_code, 2) -> true;
 bif(concat_binary, 1) -> true;
 bif(date, 0) -> true;
 bif(delete_module, 1) -> true;
+bif(demonitor, 1) -> true;
+bif(demonitor, 2) -> true;
 bif(disconnect_node, 1) -> true;
 bif(element, 2) -> true;
 bif(erase, 0) -> true;
 bif(erase, 1) -> true;
+bif(error, 1) -> true;
+bif(error, 2) -> true;
 bif(exit, 1) -> true;
 bif(exit, 2) -> true;
 bif(float, 1) -> true;
@@ -266,6 +270,7 @@ bif(halt, 0) -> true;
 bif(halt, 1) -> true;
 bif(hd, 1) -> true;
 bif(integer_to_list, 1) -> true;
+bif(integer_to_list, 2) -> true;
 bif(iolist_size, 1) -> true;
 bif(iolist_to_binary, 1) -> true;
 bif(is_alive, 0) -> true;
@@ -295,6 +300,7 @@ bif(list_to_bitstring, 1) -> true;
 bif(list_to_existing_atom, 1) -> true;
 bif(list_to_float, 1) -> true;
 bif(list_to_integer, 1) -> true;
+bif(list_to_integer, 2) -> true;
 bif(list_to_pid, 1) -> true;
 bif(list_to_tuple, 1) -> true;
 bif(load_module, 2) -> true;
@@ -302,6 +308,8 @@ bif(make_ref, 0) -> true;
 bif(max,2) -> true;
 bif(min,2) -> true;
 bif(module_loaded, 1) -> true;
+bif(monitor, 2) -> true;
+bif(monitor, 3) -> true;
 bif(monitor_node, 2) -> true;
 bif(node, 0) -> true;
 bif(node, 1) -> true;
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 6bbb52ebae..cfb9f0ca98 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -60,6 +60,10 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
               (_Opt, Def) -> Def
           end, Default, Opts).
 
+%% The maximum number of arguments allowed for a function.
+
+-define(MAX_ARGUMENTS, 255).
+
 %% The error and warning info structures, {Line,Module,Descriptor},
 %% are kept in their seperate fields in the lint state record together
 %% with the name of the file (when a new file is entered, marked by
@@ -197,19 +201,19 @@ format_error({define_import,{F,A}}) ->
 format_error({unused_function,{F,A}}) ->
     io_lib:format("function ~w/~w is unused", [F,A]);
 format_error({call_to_redefined_bif,{F,A}}) ->
-    io_lib:format("ambiguous call of redefined auto-imported BIF ~w/~w~n"
+    io_lib:format("ambiguous call of overridden auto-imported BIF ~w/~w~n"
 		  " - use erlang:~w/~w or \"-compile({no_auto_import,[~w/~w]}).\" "
 		  "to resolve name clash", [F,A,F,A,F,A]);
 format_error({call_to_redefined_old_bif,{F,A}}) ->
-    io_lib:format("ambiguous call of redefined pre R14 auto-imported BIF ~w/~w~n"
+    io_lib:format("ambiguous call of overridden pre R14 auto-imported BIF ~w/~w~n"
 		  " - use erlang:~w/~w or \"-compile({no_auto_import,[~w/~w]}).\" "
 		  "to resolve name clash", [F,A,F,A,F,A]);
 format_error({redefine_old_bif_import,{F,A}}) ->
-    io_lib:format("import directive redefines pre R14 auto-imported BIF ~w/~w~n"
+    io_lib:format("import directive overrides pre R14 auto-imported BIF ~w/~w~n"
 		  " - use \"-compile({no_auto_import,[~w/~w]}).\" "
 		  "to resolve name clash", [F,A,F,A]);
 format_error({redefine_bif_import,{F,A}}) ->
-    io_lib:format("import directive redefines auto-imported BIF ~w/~w~n"
+    io_lib:format("import directive overrides auto-imported BIF ~w/~w~n"
 		  " - use \"-compile({no_auto_import,[~w/~w]}).\" to resolve name clash", [F,A,F,A]);
 
 format_error({deprecated, MFA, ReplacementMFA, Rel}) ->
@@ -226,11 +230,17 @@ format_error({obsolete_guard, {F, A}}) ->
     io_lib:format("~p/~p obsolete", [F, A]);
 format_error({reserved_for_future,K}) ->
     io_lib:format("atom ~w: future reserved keyword - rename or quote", [K]);
+format_error({too_many_arguments,Arity}) ->
+    io_lib:format("too many arguments (~w) - "
+		  "maximum allowed is ~w", [Arity,?MAX_ARGUMENTS]);
 %% --- patterns and guards ---
 format_error(illegal_pattern) -> "illegal pattern";
 format_error(illegal_bin_pattern) ->
     "binary patterns cannot be matched in parallel using '='";
 format_error(illegal_expr) -> "illegal expression";
+format_error({illegal_guard_local_call, {F,A}}) -> 
+    io_lib:format("call to local/imported function ~w/~w is illegal in guard",
+		  [F,A]);
 format_error(illegal_guard_expr) -> "illegal guard expression";
 %% --- exports ---
 format_error({explicit_export,F,A}) ->
@@ -308,6 +318,8 @@ format_error({ill_defined_behaviour_callbacks,Behaviour}) ->
 %% --- types and specs ---
 format_error({singleton_typevar, Name}) ->
     io_lib:format("type variable ~w is only used once (is unbound)", [Name]);
+format_error({bad_export_type, _ETs}) ->
+    io_lib:format("bad export_type declaration", []);
 format_error({duplicated_export_type, {T, A}}) ->
     io_lib:format("type ~w/~w already exported", [T, A]);
 format_error({undefined_type, {TypeName, Arity}}) ->
@@ -1125,8 +1137,7 @@ export(Line, Es, #lint{exports = Es0, called = Called} = St0) ->
 
 export_type(Line, ETs, #lint{usage = Usage, exp_types = ETs0} = St0) ->
     UTs0 = Usage#usage.used_types,
-    {ETs1,UTs1,St1} =
-	foldl(fun (TA, {E,U,St2}) ->
+    try foldl(fun ({T,A}=TA, {E,U,St2}) when is_atom(T), is_integer(A) ->
 		      St = case gb_sets:is_element(TA, E) of
 			       true ->
 				   Warn = {duplicated_export_type,TA},
@@ -1136,8 +1147,13 @@ export_type(Line, ETs, #lint{usage = Usage, exp_types = ETs0} = St0) ->
 			   end,
 		      {gb_sets:add_element(TA, E), dict:store(TA, Line, U), St}
 	      end,
-	      {ETs0,UTs0,St0}, ETs),
-    St1#lint{usage = Usage#usage{used_types = UTs1}, exp_types = ETs1}.
+	      {ETs0,UTs0,St0}, ETs) of
+	{ETs1,UTs1,St1} ->
+	    St1#lint{usage = Usage#usage{used_types = UTs1}, exp_types = ETs1}
+    catch
+	error:_ ->
+	    add_error(Line, {bad_export_type, ETs}, St0)
+    end.
 
 -type import() :: {module(), [fa()]} | module().
 -spec import(line(), import(), lint_state()) -> lint_state().
@@ -1298,13 +1314,18 @@ define_function(Line, Name, Arity, St0) ->
         true ->
             add_error(Line, {redefine_function,NA}, St1);
         false ->
-            St2 = St1#lint{defined=gb_sets:add_element(NA, St1#lint.defined)},
-            case imported(Name, Arity, St2) of
-                {yes,_M} -> add_error(Line, {define_import,NA}, St2);
-                no -> St2
+	    St2 = function_check_max_args(Line, Arity, St1),
+            St3 = St2#lint{defined=gb_sets:add_element(NA, St2#lint.defined)},
+            case imported(Name, Arity, St3) of
+                {yes,_M} -> add_error(Line, {define_import,NA}, St3);
+                no -> St3
             end
     end.
 
+function_check_max_args(Line, Arity, St) when Arity > ?MAX_ARGUMENTS ->
+    add_error(Line, {too_many_arguments,Arity}, St);
+function_check_max_args(_, _, St) -> St.
+
 %% clauses([Clause], VarTable, State) -> {VarTable, State}.
 
 clauses(Cs, Vt, St) ->
@@ -1811,7 +1832,13 @@ gexpr({call,Line,{atom,_La,F},As}, Vt, St0) ->
 		false -> {Asvt,add_error(Line, {explicit_export,F,A}, St1)}
 	    end;
         false ->
-	    {Asvt,add_error(Line, illegal_guard_expr, St1)}
+	    case is_local_function(St1#lint.locals,{F,A}) orelse
+		is_imported_function(St1#lint.imports,{F,A}) of
+		true ->
+		    {Asvt,add_error(Line, {illegal_guard_local_call,{F,A}}, St1)};
+		_ ->
+		    {Asvt,add_error(Line, illegal_guard_expr, St1)}
+	    end
     end;
 gexpr({call,Line,{remote,_Lr,{atom,_Lm,erlang},{atom,_Lf,F}},As}, Vt, St0) ->
     {Asvt,St1} = gexpr_list(As, Vt, St0),
@@ -2076,12 +2103,14 @@ expr({call,Line,{atom,La,F},As}, Vt, St0) ->
     IsAutoBif = erl_internal:bif(F, A),
     AutoSuppressed = is_autoimport_suppressed(St2#lint.no_auto,{F,A}),
     Warn = is_warn_enabled(bif_clash, St2) and (not bif_clash_specifically_disabled(St2,{F,A})),
-    case ((not IsLocal) andalso IsAutoBif andalso (not AutoSuppressed)) of
+    Imported = imported(F, A, St2),
+    case ((not IsLocal) andalso (Imported =:= no) andalso 
+	  IsAutoBif andalso (not AutoSuppressed)) of
         true ->
 	    St3 = deprecated_function(Line, erlang, F, As, St2),
 	    {Asvt,St3};
         false ->
-            {Asvt,case imported(F, A, St2) of
+            {Asvt,case Imported of
                       {yes,M} ->
                           St3 = check_remote_function(Line, M, F, As, St2),
                           U0 = St3#lint.usage,
@@ -2672,7 +2701,6 @@ default_types() ->
 		{set, 0},
 		{string, 0},
 		{term, 0},
-		{tid, 0},
 		{timeout, 0},
 		{var, 1}],
     dict:from_list([{T, -1} || T <- DefTypes]).
@@ -2694,7 +2722,6 @@ is_newly_introduced_builtin_type({gb_tree, 0}) -> true; % opaque
 is_newly_introduced_builtin_type({iodata, 0}) -> true;
 is_newly_introduced_builtin_type({queue, 0}) -> true; % opaque
 is_newly_introduced_builtin_type({set, 0}) -> true; % opaque
-is_newly_introduced_builtin_type({tid, 0}) -> true; % opaque
 %% R13B01
 is_newly_introduced_builtin_type({boolean, 0}) -> true;
 is_newly_introduced_builtin_type({Name, _}) when is_atom(Name) -> false.
diff --git a/lib/stdlib/src/erl_posix_msg.erl b/lib/stdlib/src/erl_posix_msg.erl
index fe981b23a7..909cc1d102 100644
--- a/lib/stdlib/src/erl_posix_msg.erl
+++ b/lib/stdlib/src/erl_posix_msg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -24,143 +24,146 @@
 
 -spec message(atom()) -> string().
 
-message(e2big) -> "argument list too long";
-message(eacces) -> "permission denied";
-message(eaddrinuse) -> "address already in use";
-message(eaddrnotavail) -> "can't assign requested address";
-message(eadv) -> "advertise error";
-message(eafnosupport) -> "address family not supported by protocol family";
-message(eagain) -> "resource temporarily unavailable";
-message(ealign) -> "EALIGN";
-message(ealready) -> "operation already in progress";
-message(ebade) -> "bad exchange descriptor";
-message(ebadf) -> "bad file number";
-message(ebadfd) -> "file descriptor in bad state";
-message(ebadmsg) -> "not a data message";
-message(ebadr) -> "bad request descriptor";
-message(ebadrpc) -> "RPC structure is bad";
-message(ebadrqc) -> "bad request code";
-message(ebadslt) -> "invalid slot";
-message(ebfont) -> "bad font file format";
-message(ebusy) -> "file busy";
-message(echild) -> "no children";
-message(echrng) -> "channel number out of range";
-message(ecomm) -> "communication error on send";
-message(econnaborted) -> "software caused connection abort";
-message(econnrefused) -> "connection refused";
-message(econnreset) -> "connection reset by peer";
-message(edeadlk) -> "resource deadlock avoided";
-message(edeadlock) -> "resource deadlock avoided";
-message(edestaddrreq) -> "destination address required";
-message(edirty) -> "mounting a dirty fs w/o force";
-message(edom) -> "math argument out of range";
-message(edotdot) -> "cross mount point";
-message(edquot) -> "disk quota exceeded";
-message(eduppkg) -> "duplicate package name";
-message(eexist) -> "file already exists";
-message(efault) -> "bad address in system call argument";
-message(efbig) -> "file too large";
-message(ehostdown) -> "host is down";
-message(ehostunreach) -> "host is unreachable";
-message(eidrm) -> "identifier removed";
-message(einit) -> "initialization error";
-message(einprogress) -> "operation now in progress";
-message(eintr) -> "interrupted system call";
-message(einval) -> "invalid argument";
-message(eio) -> "I/O error";
-message(eisconn) -> "socket is already connected";
-message(eisdir) -> "illegal operation on a directory";
-message(eisnam) -> "is a name file";
-message(elbin) -> "ELBIN";
-message(el2hlt) -> "level 2 halted";
-message(el2nsync) -> "level 2 not synchronized";
-message(el3hlt) -> "level 3 halted";
-message(el3rst) -> "level 3 reset";
-message(elibacc) -> "can not access a needed shared library";
-message(elibbad) -> "accessing a corrupted shared library";
-message(elibexec) -> "can not exec a shared library directly";
-message(elibmax) ->
-    "attempting to link in more shared libraries than system limit";
-message(elibscn) -> ".lib section in a.out corrupted";
-message(elnrng) -> "link number out of range";
-message(eloop) -> "too many levels of symbolic links";
-message(emfile) -> "too many open files";
-message(emlink) -> "too many links";
-message(emsgsize) -> "message too long";
-message(emultihop) -> "multihop attempted";
-message(enametoolong) -> "file name too long";
-message(enavail) -> "not available";
-message(enet) -> "ENET";
-message(enetdown) -> "network is down";
-message(enetreset) -> "network dropped connection on reset";
-message(enetunreach) -> "network is unreachable";
-message(enfile) -> "file table overflow";
-message(enoano) -> "anode table overflow";
-message(enobufs) -> "no buffer space available";
-message(enocsi) -> "no CSI structure available";
-message(enodata) -> "no data available";
-message(enodev) -> "no such device";
-message(enoent) -> "no such file or directory";
-message(enoexec) -> "exec format error";
-message(enolck) -> "no locks available";
-message(enolink) -> "link has be severed";
-message(enomem) -> "not enough memory";
-message(enomsg) -> "no message of desired type";
-message(enonet) -> "machine is not on the network";
-message(enopkg) -> "package not installed";
-message(enoprotoopt) -> "bad proocol option";
-message(enospc) -> "no space left on device";
-message(enosr) -> "out of stream resources or not a stream device";
-message(enosym) -> "unresolved symbol name";
-message(enosys) -> "function not implemented";
-message(enotblk) -> "block device required";
-message(enotconn) -> "socket is not connected";
-message(enotdir) -> "not a directory";
-message(enotempty) -> "directory not empty";
-message(enotnam) -> "not a name file";
-message(enotsock) -> "socket operation on non-socket";
-message(enotsup) -> "operation not supported";
-message(enotty) -> "inappropriate device for ioctl";
-message(enotuniq) -> "name not unique on network";
-message(enxio) -> "no such device or address";
-message(eopnotsupp) -> "operation not supported on socket";
-message(eperm) -> "not owner";
-message(epfnosupport) -> "protocol family not supported";
-message(epipe) -> "broken pipe";
-message(eproclim) -> "too many processes";
-message(eprocunavail) -> "bad procedure for program";
-message(eprogmismatch) -> "program version wrong";
-message(eprogunavail) -> "RPC program not available";
-message(eproto) -> "protocol error";
-message(eprotonosupport) -> "protocol not suppored";
-message(eprototype) -> "protocol wrong type for socket";
-message(erange) -> "math result unrepresentable";
-message(erefused) -> "EREFUSED";
-message(eremchg) -> "remote address changed";
-message(eremdev) -> "remote device";
-message(eremote) -> "pathname hit remote file system";
-message(eremoteio) -> "remote i/o error";
-message(eremoterelease) -> "EREMOTERELEASE";
-message(erofs) -> "read-only file system";
-message(erpcmismatch) -> "RPC version is wrong";
-message(erremote) -> "object is remote";
-message(eshutdown) -> "can't send after socket shutdown";
-message(esocktnosupport) -> "socket type not supported";
-message(espipe) -> "invalid seek";
-message(esrch) -> "no such process";
-message(esrmnt) -> "srmount error";
-message(estale) -> "stale remote file handle";
-message(esuccess) -> "Error 0";
-message(etime) -> "timer expired";
-message(etimedout) -> "connection timed out";
-message(etoomanyrefs) -> "too many references: can't splice";
-message(etxtbsy) -> "text file or pseudo-device busy";
-message(euclean) -> "structure needs cleaning";
-message(eunatch) -> "protocol driver not attached";
-message(eusers) -> "too many users";
-message(eversion) -> "version mismatch";
-message(ewouldblock) -> "operation would block";
-message(exdev) -> "cross-domain link";
-message(exfull) -> "message tables full";
-message(nxdomain) -> "non-existing domain";
-message(_) -> "unknown POSIX error".
+message(T) ->
+    binary_to_list(message_1(T)).
+
+message_1(e2big) -> <<"argument list too long">>;
+message_1(eacces) -> <<"permission denied">>;
+message_1(eaddrinuse) -> <<"address already in use">>;
+message_1(eaddrnotavail) -> <<"can't assign requested address">>;
+message_1(eadv) -> <<"advertise error">>;
+message_1(eafnosupport) -> <<"address family not supported by protocol family">>;
+message_1(eagain) -> <<"resource temporarily unavailable">>;
+message_1(ealign) -> <<"EALIGN">>;
+message_1(ealready) -> <<"operation already in progress">>;
+message_1(ebade) -> <<"bad exchange descriptor">>;
+message_1(ebadf) -> <<"bad file number">>;
+message_1(ebadfd) -> <<"file descriptor in bad state">>;
+message_1(ebadmsg) -> <<"not a data message">>;
+message_1(ebadr) -> <<"bad request descriptor">>;
+message_1(ebadrpc) -> <<"RPC structure is bad">>;
+message_1(ebadrqc) -> <<"bad request code">>;
+message_1(ebadslt) -> <<"invalid slot">>;
+message_1(ebfont) -> <<"bad font file format">>;
+message_1(ebusy) -> <<"file busy">>;
+message_1(echild) -> <<"no children">>;
+message_1(echrng) -> <<"channel number out of range">>;
+message_1(ecomm) -> <<"communication error on send">>;
+message_1(econnaborted) -> <<"software caused connection abort">>;
+message_1(econnrefused) -> <<"connection refused">>;
+message_1(econnreset) -> <<"connection reset by peer">>;
+message_1(edeadlk) -> <<"resource deadlock avoided">>;
+message_1(edeadlock) -> <<"resource deadlock avoided">>;
+message_1(edestaddrreq) -> <<"destination address required">>;
+message_1(edirty) -> <<"mounting a dirty fs w/o force">>;
+message_1(edom) -> <<"math argument out of range">>;
+message_1(edotdot) -> <<"cross mount point">>;
+message_1(edquot) -> <<"disk quota exceeded">>;
+message_1(eduppkg) -> <<"duplicate package name">>;
+message_1(eexist) -> <<"file already exists">>;
+message_1(efault) -> <<"bad address in system call argument">>;
+message_1(efbig) -> <<"file too large">>;
+message_1(ehostdown) -> <<"host is down">>;
+message_1(ehostunreach) -> <<"host is unreachable">>;
+message_1(eidrm) -> <<"identifier removed">>;
+message_1(einit) -> <<"initialization error">>;
+message_1(einprogress) -> <<"operation now in progress">>;
+message_1(eintr) -> <<"interrupted system call">>;
+message_1(einval) -> <<"invalid argument">>;
+message_1(eio) -> <<"I/O error">>;
+message_1(eisconn) -> <<"socket is already connected">>;
+message_1(eisdir) -> <<"illegal operation on a directory">>;
+message_1(eisnam) -> <<"is a name file">>;
+message_1(elbin) -> <<"ELBIN">>;
+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(elibbad) -> <<"accessing a corrupted shared library">>;
+message_1(elibexec) -> <<"can not 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">>;
+message_1(elnrng) -> <<"link number out of range">>;
+message_1(eloop) -> <<"too many levels of symbolic links">>;
+message_1(emfile) -> <<"too many open files">>;
+message_1(emlink) -> <<"too many links">>;
+message_1(emsgsize) -> <<"message too long">>;
+message_1(emultihop) -> <<"multihop attempted">>;
+message_1(enametoolong) -> <<"file name too long">>;
+message_1(enavail) -> <<"not available">>;
+message_1(enet) -> <<"ENET">>;
+message_1(enetdown) -> <<"network is down">>;
+message_1(enetreset) -> <<"network dropped connection on reset">>;
+message_1(enetunreach) -> <<"network is unreachable">>;
+message_1(enfile) -> <<"file table overflow">>;
+message_1(enoano) -> <<"anode table overflow">>;
+message_1(enobufs) -> <<"no buffer space available">>;
+message_1(enocsi) -> <<"no CSI structure available">>;
+message_1(enodata) -> <<"no data available">>;
+message_1(enodev) -> <<"no such device">>;
+message_1(enoent) -> <<"no such file or directory">>;
+message_1(enoexec) -> <<"exec format error">>;
+message_1(enolck) -> <<"no locks available">>;
+message_1(enolink) -> <<"link has be severed">>;
+message_1(enomem) -> <<"not enough memory">>;
+message_1(enomsg) -> <<"no message of desired type">>;
+message_1(enonet) -> <<"machine is not on the network">>;
+message_1(enopkg) -> <<"package not installed">>;
+message_1(enoprotoopt) -> <<"bad proocol option">>;
+message_1(enospc) -> <<"no space left on device">>;
+message_1(enosr) -> <<"out of stream resources or not a stream device">>;
+message_1(enosym) -> <<"unresolved symbol name">>;
+message_1(enosys) -> <<"function not implemented">>;
+message_1(enotblk) -> <<"block device required">>;
+message_1(enotconn) -> <<"socket is not connected">>;
+message_1(enotdir) -> <<"not a directory">>;
+message_1(enotempty) -> <<"directory not empty">>;
+message_1(enotnam) -> <<"not a name file">>;
+message_1(enotsock) -> <<"socket operation on non-socket">>;
+message_1(enotsup) -> <<"operation not supported">>;
+message_1(enotty) -> <<"inappropriate device for ioctl">>;
+message_1(enotuniq) -> <<"name not unique on network">>;
+message_1(enxio) -> <<"no such device or address">>;
+message_1(eopnotsupp) -> <<"operation not supported on socket">>;
+message_1(eperm) -> <<"not owner">>;
+message_1(epfnosupport) -> <<"protocol family not supported">>;
+message_1(epipe) -> <<"broken pipe">>;
+message_1(eproclim) -> <<"too many processes">>;
+message_1(eprocunavail) -> <<"bad procedure for program">>;
+message_1(eprogmismatch) -> <<"program version wrong">>;
+message_1(eprogunavail) -> <<"RPC program not available">>;
+message_1(eproto) -> <<"protocol error">>;
+message_1(eprotonosupport) -> <<"protocol not suppored">>;
+message_1(eprototype) -> <<"protocol wrong type for socket">>;
+message_1(erange) -> <<"math result unrepresentable">>;
+message_1(erefused) -> <<"EREFUSED">>;
+message_1(eremchg) -> <<"remote address changed">>;
+message_1(eremdev) -> <<"remote device">>;
+message_1(eremote) -> <<"pathname hit remote file system">>;
+message_1(eremoteio) -> <<"remote i/o error">>;
+message_1(eremoterelease) -> <<"EREMOTERELEASE">>;
+message_1(erofs) -> <<"read-only file system">>;
+message_1(erpcmismatch) -> <<"RPC version is wrong">>;
+message_1(erremote) -> <<"object is remote">>;
+message_1(eshutdown) -> <<"can't send after socket shutdown">>;
+message_1(esocktnosupport) -> <<"socket type not supported">>;
+message_1(espipe) -> <<"invalid seek">>;
+message_1(esrch) -> <<"no such process">>;
+message_1(esrmnt) -> <<"srmount error">>;
+message_1(estale) -> <<"stale remote file handle">>;
+message_1(esuccess) -> <<"Error 0">>;
+message_1(etime) -> <<"timer expired">>;
+message_1(etimedout) -> <<"connection timed out">>;
+message_1(etoomanyrefs) -> <<"too many references: can't splice">>;
+message_1(etxtbsy) -> <<"text file or pseudo-device busy">>;
+message_1(euclean) -> <<"structure needs cleaning">>;
+message_1(eunatch) -> <<"protocol driver not attached">>;
+message_1(eusers) -> <<"too many users">>;
+message_1(eversion) -> <<"version mismatch">>;
+message_1(ewouldblock) -> <<"operation would block">>;
+message_1(exdev) -> <<"cross-domain link">>;
+message_1(exfull) -> <<"message tables full">>;
+message_1(nxdomain) -> <<"non-existing domain">>;
+message_1(_) -> <<"unknown POSIX error">>.
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index d26443f277..0d2d23180a 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -24,35 +24,41 @@
 %% Internal API.
 -export([start/0, start/1]).
 
--include_lib("kernel/include/file.hrl").
+%%-----------------------------------------------------------------------
 
 -define(SHEBANG,  "/usr/bin/env escript").
 -define(COMMENT,  "This is an -*- erlang -*- file").
 
--record(state, {file,
-                module,
+%%-----------------------------------------------------------------------
+
+-type mode()   :: 'native' | 'compile' | 'debug' | 'interpret' | 'run'.
+-type source() :: 'archive' | 'beam' | 'text'.
+
+-record(state, {file         :: file:filename(),
+                module       :: module(),
                 forms_or_bin,
-                source,
-                n_errors,
-                mode,
-                exports_main,
-                has_records}).
--record(sections, {type,
-		   shebang,
-		   comment,
-		   emu_args,
-		   body}).
--record(extract_options, {compile_source}).
+                source       :: source(),
+                n_errors     :: non_neg_integer(),
+                mode         :: mode(),
+                exports_main :: boolean(),
+                has_records  :: boolean()}).
 
 -type shebang() :: string().
 -type comment() :: string().
 -type emu_args() :: string().
--type escript_filename() :: string().
--type filename() :: string().
+
+-record(sections, {type,
+		   shebang  :: shebang(),
+		   comment  :: comment(),
+		   emu_args :: emu_args(),
+		   body}).
+
+-record(extract_options, {compile_source}).
+
 -type zip_file() ::
-	filename()
-	| {filename(), binary()}
-	| {filename(), binary(), #file_info{}}.
+	  file:filename()
+	| {file:filename(), binary()}
+	| {file:filename(), binary(), file:file_info()}.
 -type zip_create_option() :: term().
 -type section() ::
 	  shebang
@@ -60,13 +66,15 @@
 	| comment
 	| {comment, comment()}
 	| {emu_args, emu_args()}
-	| {source, filename() | binary()}
-	| {beam, filename() | binary()}
-	| {archive, filename() | binary()}
+	| {source, file:filename() | binary()}
+	| {beam, file:filename() | binary()}
+	| {archive, file:filename() | binary()}
 	| {archive, [zip_file()], [zip_create_option()]}.
 
+%%-----------------------------------------------------------------------
+
 %% Create a complete escript file with both header and body
--spec create(escript_filename() | binary, [section()]) ->
+-spec create(file:filename() | binary, [section()]) ->
 		    ok | {ok, binary()} | {error, term()}.
 
 create(File, Options) when is_list(Options) ->
@@ -149,7 +157,9 @@ prepare(BadOptions, _) ->
 
 -type section_name() :: shebang | comment | emu_args | body .
 -type extract_option() :: compile_source | {section, [section_name()]}.
--spec extract(filename(), [extract_option()]) -> {ok, [section()]} | {error, term()}.
+-spec extract(file:filename(), [extract_option()]) ->
+        {ok, [section()]} | {error, term()}.
+
 extract(File, Options) when is_list(File), is_list(Options) ->
     try
 	EO = parse_extract_options(Options,
@@ -239,6 +249,7 @@ normalize_section(Name, Chars) ->
     {Name, Chars}.
 
 -spec script_name() -> string().
+
 script_name() ->
     [ScriptName|_] = init:get_plain_arguments(),
     ScriptName.
@@ -248,10 +259,12 @@ script_name() ->
 %%
 
 -spec start() -> no_return().
+
 start() ->
     start([]).
 
 -spec start([string()]) -> no_return().
+
 start(EscriptOptions) ->
     try
         %% Commands run using -run or -s are run in a process
@@ -291,7 +304,11 @@ parse_and_run(File, Args, Options) ->
 		    false ->
 			case lists:member("i", Options) of
 			    true  -> interpret;
-			    false -> Mode
+			    false -> 
+				case lists:member("n", Options) of
+				    true -> native;
+				    false -> Mode
+				end
 			end
 		end
         end,
@@ -308,6 +325,14 @@ parse_and_run(File, Args, Options) ->
                         _Other ->
                             fatal("There were compilation errors.")
                     end;
+		native ->
+                    case compile:forms(FormsOrBin, [report,native]) of
+                        {ok, Module, BeamBin} ->
+                            {module, Module} = code:load_binary(Module, File, BeamBin),
+                            run(Module, Args);
+                        _Other ->
+                            fatal("There were compilation errors.")
+                    end;
                 debug ->
                     case compile:forms(FormsOrBin, [report, debug_info]) of
                         {ok,Module,BeamBin} ->
@@ -484,18 +509,12 @@ find_first_body_line(Fd, HeaderSz0, LineNo, KeepFirst, Sections) ->
 
 classify_line(Line) ->
     case Line of
-        [$\#, $\! | _] ->
-	    shebang;
-	[$P, $K | _] ->
-	    archive;
-	[$F, $O, $R, $1 | _] ->
-	    beam;
-	[$%, $%, $\! | _] ->
-	    emu_args;
-	[$% | _] ->
-	    comment;
-	 _ ->
-	    undefined
+        "#!" ++ _ -> shebang;
+        "PK" ++ _ -> archive;
+        "FOR1" ++ _ -> beam;
+        "%%!" ++ _ -> emu_args;
+        "%" ++ _ -> comment;
+        _ -> undefined
    end.
 
 guess_type(Line) ->
@@ -531,7 +550,6 @@ parse_archive(S, File, HeaderSz) ->
                             end,
                         list_to_atom(lists:reverse(RevBase2))
 		end,
-
 	    S#state{source = archive,
 		    mode = run,
 		    module = Mod,
@@ -564,9 +582,7 @@ parse_beam(S, File, HeaderSz, CheckOnly) ->
 			    forms_or_bin = Bin}
 	    end;
 	{error, beam_lib, Reason} when is_tuple(Reason) ->
-            fatal(element(1, Reason));
-        {error, beam_lib, Reason} ->
-            fatal(Reason)
+            fatal(element(1, Reason))
     end.
 
 parse_source(S, File, Fd, StartLine, HeaderSz, CheckOnly) ->
@@ -587,8 +603,8 @@ parse_source(S, File, Fd, StartLine, HeaderSz, CheckOnly) ->
                         epp_parse_file2(Epp, S2, [ModForm, FileForm], OptModRes);
                     {error, _} ->
                         epp_parse_file2(Epp, S2, [FileForm], OptModRes);
-                    {eof,LastLine} ->
-                        S#state{forms_or_bin = [FileForm, {eof,LastLine}]}
+                    {eof, _LastLine} = Eof ->
+                        S#state{forms_or_bin = [FileForm, Eof]}
                 end,
             ok = epp:close(Epp),
             ok = file:close(Fd),
@@ -660,7 +676,7 @@ epp_parse_file2(Epp, S, Forms, Parsed) ->
                 {attribute,Ln,mode,NewMode} ->
                     S2 = S#state{mode = NewMode},
                     if
-                        NewMode =:= compile; NewMode =:= interpret; NewMode =:= debug ->
+                        NewMode =:= compile; NewMode =:= interpret; NewMode =:= debug; NewMode =:= native ->
                             epp_parse_file(Epp, S2, [Form | Forms]);
                         true ->
                             Args = lists:flatten(io_lib:format("illegal mode attribute: ~p", [NewMode])),
@@ -683,8 +699,8 @@ epp_parse_file2(Epp, S, Forms, Parsed) ->
             io:format("~s:~w: ~s\n",
                       [S#state.file,Ln,Mod:format_error(Args)]),
             epp_parse_file(Epp, S#state{n_errors = S#state.n_errors + 1}, [Form | Forms]);
-        {eof,LastLine} ->
-            S#state{forms_or_bin = lists:reverse([{eof, LastLine} | Forms])}
+        {eof, _LastLine} = Eof ->
+            S#state{forms_or_bin = lists:reverse([Eof | Forms])}
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index b0a197d784..6e6e949e2c 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -42,12 +42,15 @@
 
 -export([i/0, i/1, i/2, i/3]).
 
--export_type([tab/0]).
+-export_type([tab/0, tid/0]).
 
-%%------------------------------------------------------------------------------
+%%-----------------------------------------------------------------------------
 
 -type tab()        :: atom() | tid().
 
+%% a similar definition is also in erl_types
+-opaque tid()      :: integer().
+
 -type ext_info()   :: 'md5sum' | 'object_count'.
 -type protection() :: 'private' | 'protected' | 'public'.
 -type type()       :: 'bag' | 'duplicate_bag' | 'ordered_set' | 'set'.
@@ -65,7 +68,7 @@
 -type match_pattern() :: atom() | tuple().
 -type match_specs()   :: [{match_pattern(), [_], [_]}].
 
-%%------------------------------------------------------------------------------
+%%-----------------------------------------------------------------------------
 
 %% The following functions used to be found in this module, but
 %% are now BIFs (i.e. implemented in C).
@@ -509,7 +512,7 @@ file2tab(File) ->
 
 file2tab(File, Opts) ->
     try
-	{ok,Verify} = parse_f2t_opts(Opts,false),
+	{ok,Verify,TabArg} = parse_f2t_opts(Opts,false,[]),
 	Name = make_ref(),
 	{ok, Major, Minor, FtOptions, MD5State, FullHeader, DLContext} = 
 	    case disk_log:open([{name, Name}, 
@@ -537,7 +540,7 @@ file2tab(File, Opts) ->
 		true ->
 		    ok
 	    end,
-	    {ok, Tab, HeadCount} = create_tab(FullHeader),
+	    {ok, Tab, HeadCount} = create_tab(FullHeader, TabArg),
 	    StrippedOptions = 				   
 	        case Verify of
 		    true ->
@@ -673,15 +676,17 @@ do_read_and_verify(ReadFun,InitState,Tab,FtOptions,HeadCount,Verify) ->
 	    {ok,Tab}
     end.
 
-parse_f2t_opts([],Verify) ->
-    {ok,Verify};
-parse_f2t_opts([{verify, true}|T],_OV) ->
-    parse_f2t_opts(T,true);
-parse_f2t_opts([{verify,false}|T],OV) ->
-    parse_f2t_opts(T,OV);
-parse_f2t_opts([Unexpected|_],_) ->
+parse_f2t_opts([],Verify,Tab) ->
+    {ok,Verify,Tab};
+parse_f2t_opts([{verify, true}|T],_OV,Tab) ->
+    parse_f2t_opts(T,true,Tab);
+parse_f2t_opts([{verify,false}|T],OV,Tab) ->
+    parse_f2t_opts(T,OV,Tab);
+parse_f2t_opts([{table,Tab}|T],OV,[]) ->
+    parse_f2t_opts(T,OV,Tab);
+parse_f2t_opts([Unexpected|_],_,_) ->
     throw({unknown_option,Unexpected});
-parse_f2t_opts(Malformed,_) ->
+parse_f2t_opts(Malformed,_,_) ->
     throw({malformed_option,Malformed}).
 			   
 count_mandatory([]) ->
@@ -857,19 +862,28 @@ load_table(ReadFun, State, Tab) ->
 	    load_table(ReadFun, NewState, Tab)
     end.
 
-create_tab(I) ->
+create_tab(I, TabArg) ->
     {name, Name} = lists:keyfind(name, 1, I),
     {type, Type} = lists:keyfind(type, 1, I),
     {protection, P} = lists:keyfind(protection, 1, I),
     {named_table, Val} = lists:keyfind(named_table, 1, I),
     {keypos, _Kp} = Keypos = lists:keyfind(keypos, 1, I),
     {size, Sz} = lists:keyfind(size, 1, I),
-    try
-	Tab = ets:new(Name, [Type, P, Keypos | named_table(Val)]),
-	{ok, Tab, Sz}
-    catch
-	_:_ ->
-	    throw(cannot_create_table)
+    Comp = case lists:keyfind(compressed, 1, I) of
+	{compressed, true} -> [compressed];
+	{compressed, false} -> [];
+	false -> []
+    end,
+    case TabArg of
+        [] ->
+	    try
+		Tab = ets:new(Name, [Type, P, Keypos] ++ named_table(Val) ++ Comp),
+		{ok, Tab, Sz}
+	    catch _:_ ->
+		throw(cannot_create_table)
+            end;
+        _ ->
+            {ok, TabArg, Sz}
     end.
 
 named_table(true) -> [named_table];
diff --git a/lib/stdlib/src/eval_bits.erl b/lib/stdlib/src/eval_bits.erl
index 3671aecdcb..2cbd6cdae7 100644
--- a/lib/stdlib/src/eval_bits.erl
+++ b/lib/stdlib/src/eval_bits.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -19,6 +19,8 @@
 %%
 -module(eval_bits).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([expr_grp/3,expr_grp/5,match_bits/6, 
 	 match_bits/7,bin_gen/6]).
 
diff --git a/lib/stdlib/src/file_sorter.erl b/lib/stdlib/src/file_sorter.erl
index 3875eca39d..2a5b08b581 100644
--- a/lib/stdlib/src/file_sorter.erl
+++ b/lib/stdlib/src/file_sorter.erl
@@ -18,6 +18,8 @@
 %%
 -module(file_sorter).
 
+%% Avoid warning for local function error/2 clashing with autoimported BIF.
+-compile({no_auto_import,[error/2]}).
 -export([sort/1, sort/2, sort/3, 
          keysort/2, keysort/3, keysort/4,
          merge/2, merge/3, 
diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl
index 5c5e084e17..c845b61204 100644
--- a/lib/stdlib/src/filelib.erl
+++ b/lib/stdlib/src/filelib.erl
@@ -20,6 +20,8 @@
 
 %% File utilities.
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([wildcard/1, wildcard/2, is_dir/1, is_file/1, is_regular/1, 
 	 compile_wildcard/1]).
 -export([fold_files/5, last_modified/1, file_size/1, ensure_dir/1]).
@@ -45,14 +47,14 @@ wildcard(Pattern) when is_list(Pattern) ->
     ?HANDLE_ERROR(do_wildcard(Pattern, file)).
 
 -spec wildcard(file:name(), file:name() | atom()) -> [file:filename()].
-wildcard(Pattern, Cwd) when is_list(Pattern), is_list(Cwd) ->
+wildcard(Pattern, Cwd) when is_list(Pattern), (is_list(Cwd) or is_binary(Cwd)) ->
     ?HANDLE_ERROR(do_wildcard(Pattern, Cwd, file));
 wildcard(Pattern, Mod) when is_list(Pattern), is_atom(Mod) ->
     ?HANDLE_ERROR(do_wildcard(Pattern, Mod)).
 
 -spec wildcard(file:name(), file:name(), atom()) -> [file:filename()].
 wildcard(Pattern, Cwd, Mod)
-  when is_list(Pattern), is_list(Cwd), is_atom(Mod) ->
+  when is_list(Pattern), (is_list(Cwd) or is_binary(Cwd)), is_atom(Mod) ->
     ?HANDLE_ERROR(do_wildcard(Pattern, Cwd, Mod)).
 
 -spec is_dir(file:name()) -> boolean().
@@ -116,7 +118,7 @@ do_wildcard_comp({compiled_wildcard,{exists,File}}, Mod) ->
 do_wildcard_comp({compiled_wildcard,[Base|Rest]}, Mod) ->
     do_wildcard_1([Base], Rest, Mod).
 
-do_wildcard(Pattern, Cwd, Mod) when is_list(Pattern), is_list(Cwd) ->
+do_wildcard(Pattern, Cwd, Mod) when is_list(Pattern), (is_list(Cwd) or is_binary(Cwd)) ->
     do_wildcard_comp(do_compile_wildcard(Pattern), Cwd, Mod).
 
 do_wildcard_comp({compiled_wildcard,{exists,File}}, Cwd, Mod) ->
@@ -125,9 +127,18 @@ do_wildcard_comp({compiled_wildcard,{exists,File}}, Cwd, Mod) ->
 	_ -> []
     end;
 do_wildcard_comp({compiled_wildcard,[current|Rest]}, Cwd0, Mod) ->
-    Cwd = filename:join([Cwd0]),		%Slash away redundant slashes.
-    PrefixLen = length(Cwd)+1,
-    [lists:nthtail(PrefixLen, N) || N <- do_wildcard_1([Cwd], Rest, Mod)];
+    {Cwd,PrefixLen} = case filename:join([Cwd0]) of
+	      Bin when is_binary(Bin) -> {Bin,byte_size(Bin)+1};
+	      Other -> {Other,length(Other)+1}
+	  end,		%Slash away redundant slashes.
+    [
+     if 
+	 is_binary(N) ->
+	     <<_:PrefixLen/binary,Res/binary>> = N,
+	     Res;
+	 true ->
+	     lists:nthtail(PrefixLen, N)
+     end || N <- do_wildcard_1([Cwd], Rest, Mod)];
 do_wildcard_comp({compiled_wildcard,[Base|Rest]}, _Cwd, Mod) ->
     do_wildcard_1([Base], Rest, Mod).
 
@@ -164,36 +175,44 @@ do_is_regular(File, Mod) ->
 %%   If <Recursive> is true all sub-directories to <Dir> are processed
 
 do_fold_files(Dir, RegExp, Recursive, Fun, Acc, Mod) ->
-    {ok, Re1} = re:compile(RegExp),
-    do_fold_files1(Dir, Re1, Recursive, Fun, Acc, Mod).
+    {ok, Re1} = re:compile(RegExp,[unicode]),
+    do_fold_files1(Dir, Re1, RegExp, Recursive, Fun, Acc, Mod).
 
-do_fold_files1(Dir, RegExp, Recursive, Fun, Acc, Mod) ->
+do_fold_files1(Dir, RegExp, OrigRE, Recursive, Fun, Acc, Mod) ->
     case eval_list_dir(Dir, Mod) of
-	{ok, Files} -> do_fold_files2(Files, Dir, RegExp, Recursive, Fun, Acc, Mod);
+	{ok, Files} -> do_fold_files2(Files, Dir, RegExp, OrigRE,
+				      Recursive, Fun, Acc, Mod);
 	{error, _}  -> Acc
     end.
 
-do_fold_files2([], _Dir, _RegExp, _Recursive, _Fun, Acc, _Mod) -> 
+%% OrigRE is not to be compiled as it's for non conforming filenames,
+%% i.e. for filenames that does not comply to the current encoding, which should
+%% be very rare. We use it only in those cases and do not want to precompile.
+do_fold_files2([], _Dir, _RegExp, _OrigRE, _Recursive, _Fun, Acc, _Mod) -> 
     Acc;
-do_fold_files2([File|T], Dir, RegExp, Recursive, Fun, Acc0, Mod) ->
+do_fold_files2([File|T], Dir, RegExp, OrigRE, Recursive, Fun, Acc0, Mod) ->
     FullName = filename:join(Dir, File),
     case do_is_regular(FullName, Mod) of
 	true  ->
-	    case re:run(File, RegExp, [{capture,none}]) of
+	    case (catch re:run(File, if is_binary(File) -> OrigRE; 
+					true -> RegExp end, 
+			       [{capture,none}])) of
 		match  -> 
 		    Acc = Fun(FullName, Acc0),
-		    do_fold_files2(T, Dir, RegExp, Recursive, Fun, Acc, Mod);
+		    do_fold_files2(T, Dir, RegExp, OrigRE, Recursive, Fun, Acc, Mod);
+		{'EXIT',_} ->
+		    do_fold_files2(T, Dir, RegExp, OrigRE, Recursive, Fun, Acc0, Mod);
 		nomatch ->
-		    do_fold_files2(T, Dir, RegExp, Recursive, Fun, Acc0, Mod)
+		    do_fold_files2(T, Dir, RegExp, OrigRE, Recursive, Fun, Acc0, Mod)
 	    end;
 	false ->
 	    case Recursive andalso do_is_dir(FullName, Mod) of
 		true ->
-		    Acc1 = do_fold_files1(FullName, RegExp, Recursive,
+		    Acc1 = do_fold_files1(FullName, RegExp, OrigRE, Recursive,
 					  Fun, Acc0, Mod),
-		    do_fold_files2(T, Dir, RegExp, Recursive, Fun, Acc1, Mod);
+		    do_fold_files2(T, Dir, RegExp, OrigRE, Recursive, Fun, Acc1, Mod);
 		false ->
-		    do_fold_files2(T, Dir, RegExp, Recursive, Fun, Acc0, Mod)
+		    do_fold_files2(T, Dir, RegExp, OrigRE, Recursive, Fun, Acc0, Mod)
 	    end
     end.
 
@@ -266,6 +285,13 @@ do_wildcard_3(Base, [Pattern|Rest], Result, Mod) ->
 do_wildcard_3(Base, [], Result, _Mod) ->
     [Base|Result].
 
+wildcard_4(Pattern, [File|Rest], Base, Result) when is_binary(File) ->
+    case wildcard_5(Pattern, binary_to_list(File)) of
+	true ->
+	    wildcard_4(Pattern, Rest, Base, [join(Base, File)|Result]);
+	false ->
+	    wildcard_4(Pattern, Rest, Base, Result)
+    end;
 wildcard_4(Pattern, [File|Rest], Base, Result) ->
     case wildcard_5(Pattern, File) of
 	true ->
diff --git a/lib/stdlib/src/filename.erl b/lib/stdlib/src/filename.erl
index 01c06e4596..24abf1e977 100644
--- a/lib/stdlib/src/filename.erl
+++ b/lib/stdlib/src/filename.erl
@@ -41,6 +41,9 @@
 
 -include_lib("kernel/include/file.hrl").
 
+-define(IS_DRIVELETTER(Letter),(((Letter >= $A) andalso (Letter =< $Z)) orelse
+				((Letter >= $a) andalso (Letter =< $z)))). 
+
 %% Converts a relative filename to an absolute filename
 %% or the filename itself if it already is an absolute filename
 %% Note that no attempt is made to create the most beatiful
@@ -57,12 +60,18 @@
 %% (for Unix) : absname("/") -> "/"
 %% (for WIN32): absname("/") -> "D:/"
 
--spec absname(file:name()) -> string().
+
+-spec absname(file:name()) -> file:filename().
 absname(Name) ->
     {ok, Cwd} = file:get_cwd(),
     absname(Name, Cwd).
 
--spec absname(file:name(), string()) -> string().
+-spec absname(file:name(), file:filename()) -> file:filename().
+absname(Name, AbsBase) when is_binary(Name), is_list(AbsBase) ->
+    absname(Name,filename_string_to_binary(AbsBase));
+absname(Name, AbsBase) when is_list(Name), is_binary(AbsBase) ->
+    absname(filename_string_to_binary(Name),AbsBase);
+
 absname(Name, AbsBase) ->
     case pathtype(Name) of
 	relative ->
@@ -77,6 +86,20 @@ absname(Name, AbsBase) ->
 
 %% Handles volumerelative names (on Windows only).
 
+absname_vr([<<"/">>|Rest1], [Volume|_], _AbsBase) ->
+    %% Absolute path on current drive.
+    join([Volume|Rest1]);
+absname_vr([<<X, $:>>|Rest1], [<<X,_/binary>>|_], AbsBase) ->
+    %% Relative to current directory on current drive.
+    absname(join(Rest1), AbsBase);
+absname_vr([<<X, $:>>|Name], _, _AbsBase) ->
+    %% Relative to current directory on another drive.
+    Dcwd =
+	case file:get_cwd([X, $:]) of
+	    {ok, Dir}  -> filename_string_to_binary(Dir);
+	    {error, _} -> <<X, $:, $/>>
+    end,
+    absname(join(Name), Dcwd);
 absname_vr(["/"|Rest1], [Volume|_], _AbsBase) ->
     %% Absolute path on current drive.
     join([Volume|Rest1]);
@@ -92,41 +115,13 @@ absname_vr([[X, $:]|Name], _, _AbsBase) ->
     end,
     absname(join(Name), Dcwd).
 
-%% Joins a relative filename to an absolute base. For VxWorks the 
-%% resulting name is  fixed to minimize the length by collapsing 
-%% ".." directories.
-%% For other systems this is just a join/2, but assumes that 
+%% Joins a relative filename to an absolute base. 
+%% This is just a join/2, but assumes that 
 %% AbsBase must be absolute and Name must be relative.
 
--spec absname_join(string(), file:name()) -> string().
+-spec absname_join(file:filename(), file:name()) -> file:filename().
 absname_join(AbsBase, Name) ->
-    case major_os_type() of
-	vxworks -> 
-	    absname_pretty(AbsBase, split(Name), lists:reverse(split(AbsBase)));
-	_Else ->
-	    join(AbsBase, flatten(Name))
-    end.
-
-%% Handles absolute filenames for VxWorks - these are 'pretty-printed',
-%% since a C function call chdir("/erlang/lib/../bin") really sets
-%% cwd to '/erlang/lib/../bin' which also works, but the long term
-%% effect is potentially not so good ...
-%%
-%% absname_pretty("../bin", "/erlang/lib") -> "/erlang/bin"
-%% absname_pretty("../../../..", "/erlang") -> "/erlang"
-
-absname_pretty(Abspath, Relpath, []) ->
-    %% AbsBase _must_ begin with a vxworks device name
-    {device, _Rest, Dev} = vxworks_first(Abspath),
-    absname_pretty(Abspath, Relpath, [lists:reverse(Dev)]);
-absname_pretty(_Abspath, [], AbsBase) ->
-    join(lists:reverse(AbsBase));
-absname_pretty(Abspath, [[$.]|Rest], AbsBase) ->
-    absname_pretty(Abspath, Rest, AbsBase);
-absname_pretty(Abspath, [[$.,$.]|Rest], [_|AbsRest]) ->
-    absname_pretty(Abspath, Rest, AbsRest);
-absname_pretty(Abspath, [First|Rest], AbsBase) ->
-    absname_pretty(Abspath, Rest, [First|AbsBase]).
+    join(AbsBase, flatten(Name)).
 
 %% Returns the part of the filename after the last directory separator,
 %% or the filename itself if it has no separators.
@@ -136,18 +131,40 @@ absname_pretty(Abspath, [First|Rest], AbsBase) ->
 %%           basename("/usr/foo/") -> "foo"  (trailing slashes ignored)
 %%           basename("/") -> []
 
--spec basename(file:name()) -> string().
+-spec basename(file:name()) -> file:filename().
+basename(Name) when is_binary(Name) ->
+    case os:type() of
+	{win32,_} ->
+	    win_basenameb(Name);
+	_ ->
+	    basenameb(Name,[<<"/">>])
+    end;
+    
 basename(Name0) ->
     Name = flatten(Name0),
     {DirSep2, DrvSep} = separators(),
     basename1(skip_prefix(Name, DrvSep), [], DirSep2).
 
+win_basenameb(<<Letter,$:,Rest/binary>>) when ?IS_DRIVELETTER(Letter) ->
+    basenameb(Rest,[<<"/">>,<<"\\">>]);
+win_basenameb(O) ->
+    basenameb(O,[<<"/">>,<<"\\">>]).
+basenameb(Bin,Sep) ->
+    Parts = [ X || X <- binary:split(Bin,Sep,[global]),
+		   X =/= <<>> ],
+    if
+	Parts =:= [] ->
+	    <<>>;
+	true ->
+	    lists:last(Parts)
+    end.
+    
+
+
 basename1([$/|[]], Tail, DirSep2) ->
     basename1([], Tail, DirSep2);
 basename1([$/|Rest], _Tail, DirSep2) ->
     basename1(Rest, [], DirSep2);
-basename1([[_|_]=List|Rest], Tail, DirSep2) ->
-    basename1(List++Rest, Tail, DirSep2);
 basename1([DirSep2|Rest], Tail, DirSep2) when is_integer(DirSep2) ->
     basename1([$/|Rest], Tail, DirSep2);
 basename1([Char|Rest], Tail, DirSep2) when is_integer(Char) ->
@@ -155,26 +172,11 @@ basename1([Char|Rest], Tail, DirSep2) when is_integer(Char) ->
 basename1([], Tail, _DirSep2) ->
     lists:reverse(Tail).
 
-skip_prefix(Name, false) ->	% No prefix for unix, but for VxWorks.
-    case major_os_type() of
-	vxworks -> 
-	    case vxworks_first(Name) of
-		{device, Rest, _Device} ->
-		    Rest;
-		{not_device, _Rest, _First} ->
-		    Name
-	    end;
-	_Else ->
-	    Name
-    end;
-skip_prefix(Name, DrvSep) ->
-    skip_prefix1(Name, DrvSep).
-
-skip_prefix1([L, DrvSep|Name], DrvSep) when is_integer(L) ->
+skip_prefix(Name, false) ->
     Name;
-skip_prefix1([L], _) when is_integer(L) ->
-    [L];
-skip_prefix1(Name, _) ->
+skip_prefix([L, DrvSep|Name], DrvSep) when ?IS_DRIVELETTER(L) ->
+    Name;
+skip_prefix(Name, _) ->
     Name.
 
 %% Returns the last component of the filename, with the given
@@ -190,7 +192,29 @@ skip_prefix1(Name, _) ->
 %%	    rootname(basename("xxx.jam")) -> "xxx"
 %%	    rootname(basename("xxx.erl")) -> "xxx"
 
--spec basename(file:name(), file:name()) -> string().
+-spec basename(file:name(), file:name()) -> file:filename().
+basename(Name, Ext) when is_binary(Name), is_list(Ext) ->
+    basename(Name,filename_string_to_binary(Ext));
+basename(Name, Ext) when is_list(Name), is_binary(Ext) ->
+    basename(filename_string_to_binary(Name),Ext);
+basename(Name, Ext) when is_binary(Name), is_binary(Ext) ->
+    BName = basename(Name),
+    LAll = byte_size(Name),
+    LN = byte_size(BName),
+    LE = byte_size(Ext),
+    case LN - LE of
+	Neg when Neg < 0 ->
+	    BName;
+	Pos ->
+	    StartLen = LAll - Pos - LE,
+	    case Name of
+		<<_:StartLen/binary,Part:Pos/binary,Ext/binary>> ->
+		    Part;
+		_Other ->
+		    BName
+	    end
+    end;
+
 basename(Name0, Ext0) ->
     Name = flatten(Name0),
     Ext = flatten(Ext0),
@@ -204,7 +228,7 @@ basename([$/|[]], Ext, Tail, DrvSep2) ->
     basename([], Ext, Tail, DrvSep2);
 basename([$/|Rest], Ext, _Tail, DrvSep2) ->
     basename(Rest, Ext, [], DrvSep2);
-basename([$\\|Rest], Ext, Tail, DirSep2) when is_integer(DirSep2) ->
+basename([DirSep2|Rest], Ext, Tail, DirSep2) when is_integer(DirSep2) ->
     basename([$/|Rest], Ext, Tail, DirSep2);
 basename([Char|Rest], Ext, Tail, DrvSep2) when is_integer(Char) ->
     basename(Rest, Ext, [Char|Tail], DrvSep2);
@@ -216,24 +240,44 @@ basename([], _Ext, Tail, _DrvSep2) ->
 %% Example: dirname("/usr/src/kalle.erl") -> "/usr/src",
 %%	    dirname("kalle.erl") -> "."
 
--spec dirname(file:name()) -> string().
+-spec dirname(file:name()) -> file:filename().
+dirname(Name) when is_binary(Name) ->
+    {Dsep,Drivesep} = separators(),
+    SList = case Dsep of
+		Sep when is_integer(Sep) -> 
+		    [ <<Sep>> ];
+		_ ->
+		    []
+	    end,
+    {XPart0,Dirs} = case Drivesep of
+		       X when is_integer(X) ->
+			   case Name of
+			       <<DL,X,Rest/binary>> when ?IS_DRIVELETTER(DL) ->
+				   {<<DL,X>>,Rest};
+			       _ ->
+				   {<<>>,Name}
+			   end;
+		       _ ->
+			   {<<>>,Name} 
+		   end,
+    Parts0 = binary:split(Dirs,[<<"/">>|SList],[global]),
+    %% Fairly short lists of parts, OK to reverse twice...
+    Parts = case Parts0 of
+		[] -> [];
+		_ -> lists:reverse(fstrip(tl(lists:reverse(Parts0))))
+	    end,
+    XPart = case {Parts,XPart0} of
+		{[],<<>>} ->
+		    <<".">>;
+		_ ->
+		    XPart0
+	    end,
+    dirjoin(Parts,XPart,<<"/">>);
+
 dirname(Name0) ->
     Name = flatten(Name0),
-    case os:type() of
-	vxworks ->
-	    {Devicep, Restname, FirstComp} = vxworks_first(Name),
-	    case Devicep of
-		device ->
-		    dirname(Restname, FirstComp, [], separators());
-		_ -> 
-		    dirname(Name, [], [], separators())
-	    end;
-	_ ->
-	    dirname(Name, [], [], separators())
-    end.
+    dirname(Name, [], [], separators()).
 
-dirname([[_|_]=List|Rest], Dir, File, Seps) ->
-    dirname(List++Rest, Dir, File, Seps);
 dirname([$/|Rest], Dir, File, Seps) ->
     dirname(Rest, File++Dir, [$/], Seps);
 dirname([DirSep|Rest], Dir, File, {DirSep,_}=Seps) when is_integer(DirSep) ->
@@ -258,6 +302,26 @@ dirname([], [DrvSep,Dl], File, {_,DrvSep}) ->
     end;
 dirname([], Dir, _, _) ->
     lists:reverse(Dir).
+
+%% Compatibility with lists variant, remove trailing slashes
+fstrip([<<>>,X|Y]) ->
+    fstrip([X|Y]);
+fstrip(A) ->
+    A.
+			   
+
+dirjoin([<<>>|T],Acc,Sep) ->
+    dirjoin1(T,<<Acc/binary,"/">>,Sep);
+dirjoin(A,B,C) ->
+    dirjoin1(A,B,C).
+
+dirjoin1([],Acc,_) ->
+    Acc;
+dirjoin1([One],Acc,_) ->
+    <<Acc/binary,One/binary>>;
+dirjoin1([H|T],Acc,Sep) ->
+    dirjoin(T,<<Acc/binary,H/binary,Sep/binary>>,Sep).
+
     
 %% Given a filename string, returns the file extension,
 %% including the period.  Returns an empty list if there
@@ -268,7 +332,29 @@ dirname([], Dir, _, _) ->
 %%
 %% On Windows:  fn:dirname("\\usr\\src/kalle.erl") -> "/usr/src"
 
--spec extension(file:name()) -> string().
+-spec extension(file:name()) -> file:filename().
+extension(Name) when is_binary(Name) ->
+    {Dsep,_} = separators(),
+    SList = case Dsep of
+		Sep when is_integer(Sep) -> 
+		    [ <<Sep>> ];
+		_ ->
+		    []
+	    end,
+    case binary:matches(Name,[<<".">>]) of
+	[] ->
+	    <<>>;
+	List ->
+	    {Pos,_} = lists:last(List),
+	    <<_:Pos/binary,Part/binary>> = Name,
+	    case binary:match(Part,[<<"/">>|SList]) of
+		nomatch ->
+		    Part;
+		_ ->
+		    <<>>
+	    end
+    end;
+
 extension(Name0) ->
     Name = flatten(Name0),
     extension(Name, [], major_os_type()).
@@ -281,8 +367,6 @@ extension([$/|Rest], _Result, OsType) ->
     extension(Rest, [], OsType);
 extension([$\\|Rest], _Result, win32) ->
     extension(Rest, [], win32);
-extension([$\\|Rest], _Result, vxworks) ->
-    extension(Rest, [], vxworks);
 extension([Char|Rest], Result, OsType) when is_integer(Char) ->
     extension(Rest, [Char|Result], OsType);
 extension([], Result, _OsType) ->
@@ -290,23 +374,36 @@ extension([], Result, _OsType) ->
 
 %% Joins a list of filenames with directory separators.
 
--spec join([string()]) -> string().
+-spec join([file:filename()]) -> file:filename().
 join([Name1, Name2|Rest]) ->
     join([join(Name1, Name2)|Rest]);
 join([Name]) when is_list(Name) ->
     join1(Name, [], [], major_os_type());
+join([Name]) when is_binary(Name) ->
+    join1b(Name, <<>>, [], major_os_type());
 join([Name]) when is_atom(Name) ->
     join([atom_to_list(Name)]).
 
 %% Joins two filenames with directory separators.
 
--spec join(string(), string()) -> string().
+-spec join(file:filename(), file:filename()) -> file:filename().
 join(Name1, Name2) when is_list(Name1), is_list(Name2) ->
     OsType = major_os_type(),
     case pathtype(Name2) of
 	relative -> join1(Name1, Name2, [], OsType);
 	_Other -> join1(Name2, [], [], OsType)
     end;
+join(Name1, Name2) when is_binary(Name1), is_list(Name2) ->
+    join(Name1,filename_string_to_binary(Name2));
+join(Name1, Name2) when is_list(Name1), is_binary(Name2) ->
+    join(filename_string_to_binary(Name1),Name2);
+join(Name1, Name2) when is_binary(Name1), is_binary(Name2) ->
+    OsType = major_os_type(),
+    case pathtype(Name2) of
+	relative -> join1b(Name1, Name2, [], OsType);
+	_Other -> join1b(Name2, <<>>, [], OsType)
+    end;
+    
 join(Name1, Name2) when is_atom(Name1) ->
     join(atom_to_list(Name1), Name2);
 join(Name1, Name2) when is_atom(Name2) ->
@@ -321,8 +418,6 @@ when is_integer(UcLetter), UcLetter >= $A, UcLetter =< $Z ->
     join1(Rest, RelativeName, [$:, UcLetter+$a-$A], win32);
 join1([$\\|Rest], RelativeName, Result, win32) ->
     join1([$/|Rest], RelativeName, Result, win32);
-join1([$\\|Rest], RelativeName, Result, vxworks) ->
-    join1([$/|Rest], RelativeName, Result, vxworks);
 join1([$/|Rest], RelativeName, [$., $/|Result], OsType) ->
     join1(Rest, RelativeName, [$/|Result], OsType);
 join1([$/|Rest], RelativeName, [$/|Result], OsType) ->
@@ -344,6 +439,26 @@ join1([Char|Rest], RelativeName, Result, OsType) when is_integer(Char) ->
 join1([Atom|Rest], RelativeName, Result, OsType) when is_atom(Atom) ->
     join1(atom_to_list(Atom)++Rest, RelativeName, Result, OsType).
 
+join1b(<<UcLetter, $:, Rest/binary>>, RelativeName, [], win32)
+when is_integer(UcLetter), UcLetter >= $A, UcLetter =< $Z ->
+    join1b(Rest, RelativeName, [$:, UcLetter+$a-$A], win32);
+join1b(<<$\\,Rest/binary>>, RelativeName, Result, win32) ->
+    join1b(<<$/,Rest/binary>>, RelativeName, Result, win32);
+join1b(<<$/,Rest/binary>>, RelativeName, [$., $/|Result], OsType) ->
+    join1b(Rest, RelativeName, [$/|Result], OsType);
+join1b(<<$/,Rest/binary>>, RelativeName, [$/|Result], OsType) ->
+    join1b(Rest, RelativeName, [$/|Result], OsType);
+join1b(<<>>, <<>>, Result, OsType) ->
+    list_to_binary(maybe_remove_dirsep(Result, OsType));
+join1b(<<>>, RelativeName, [$:|Rest], win32) ->
+    join1b(RelativeName, <<>>, [$:|Rest], win32);
+join1b(<<>>, RelativeName, [$/|Result], OsType) ->
+    join1b(RelativeName, <<>>, [$/|Result], OsType);
+join1b(<<>>, RelativeName, Result, OsType) ->
+    join1b(RelativeName, <<>>, [$/|Result], OsType);
+join1b(<<Char,Rest/binary>>, RelativeName, Result, OsType) when is_integer(Char) ->
+    join1b(Rest, RelativeName, [Char|Result], OsType).
+
 maybe_remove_dirsep([$/, $:, Letter], win32) ->
     [Letter, $:, $/];
 maybe_remove_dirsep([$/], _) ->
@@ -357,7 +472,13 @@ maybe_remove_dirsep(Name, _) ->
 %% a given base directory, which is is assumed to be normalised
 %% by a previous call to join/{1,2}.
 
--spec append(string(), file:name()) -> string().
+-spec append(file:filename(), file:name()) -> file:filename().
+append(Dir, Name) when is_binary(Dir), is_binary(Name) ->
+    <<Dir/binary,$/:8,Name/binary>>;
+append(Dir, Name) when is_binary(Dir) ->
+    append(Dir,filename_string_to_binary(Name));
+append(Dir, Name) when is_binary(Name) ->
+    append(filename_string_to_binary(Dir),Name);
 append(Dir, Name) ->
     Dir ++ [$/|Name].
 
@@ -376,19 +497,14 @@ append(Dir, Name) ->
 -spec pathtype(file:name()) -> 'absolute' | 'relative' | 'volumerelative'.
 pathtype(Atom) when is_atom(Atom) ->
     pathtype(atom_to_list(Atom));
-pathtype(Name) when is_list(Name) ->
+pathtype(Name) when is_list(Name) or is_binary(Name) ->
     case os:type() of
 	{unix, _}  -> unix_pathtype(Name);
-	{win32, _} -> win32_pathtype(Name);
-	vxworks ->  case vxworks_first(Name) of
-			{device, _Rest, _Dev} ->
-			    absolute;
-			_ ->
-			    relative
-		    end;
-	{ose,_} -> unix_pathtype(Name)
+	{win32, _} -> win32_pathtype(Name)
     end.
 
+unix_pathtype(<<$/,_/binary>>) ->
+    absolute;
 unix_pathtype([$/|_]) ->
     absolute;
 unix_pathtype([List|Rest]) when is_list(List) ->
@@ -404,6 +520,15 @@ win32_pathtype([Atom|Rest]) when is_atom(Atom) ->
     win32_pathtype(atom_to_list(Atom)++Rest);
 win32_pathtype([Char, List|Rest]) when is_list(List) ->
     win32_pathtype([Char|List++Rest]);
+win32_pathtype(<<$/, $/, _/binary>>) -> absolute;
+win32_pathtype(<<$\\, $/, _/binary>>) -> absolute;
+win32_pathtype(<<$/, $\\, _/binary>>) -> absolute;
+win32_pathtype(<<$\\, $\\, _/binary>>) -> absolute;
+win32_pathtype(<<$/, _/binary>>) -> volumerelative;
+win32_pathtype(<<$\\, _/binary>>) -> volumerelative;
+win32_pathtype(<<_Letter, $:, $/, _/binary>>) -> absolute;
+win32_pathtype(<<_Letter, $:, $\\, _/binary>>) -> absolute;
+win32_pathtype(<<_Letter, $:, _/binary>>) -> volumerelative;
 win32_pathtype([$/, $/|_]) -> absolute;
 win32_pathtype([$\\, $/|_]) -> absolute;
 win32_pathtype([$/, $\\|_]) -> absolute;
@@ -422,7 +547,9 @@ win32_pathtype(_) 		  -> relative.
 %% Examples: rootname("/jam.src/kalle") -> "/jam.src/kalle"
 %%           rootname("/jam.src/foo.erl") -> "/jam.src/foo"
 
--spec rootname(file:name()) -> string().
+-spec rootname(file:name()) -> file:filename().
+rootname(Name) when is_binary(Name) ->
+    list_to_binary(rootname(binary_to_list(Name))); % No need to handle unicode, . is < 128
 rootname(Name0) ->
     Name = flatten(Name0),
     rootname(Name, [], [], major_os_type()).
@@ -431,8 +558,6 @@ rootname([$/|Rest], Root, Ext, OsType) ->
     rootname(Rest, [$/]++Ext++Root, [], OsType);
 rootname([$\\|Rest], Root, Ext, win32) ->
     rootname(Rest, [$/]++Ext++Root, [], win32);
-rootname([$\\|Rest], Root, Ext, vxworks) ->
-    rootname(Rest, [$/]++Ext++Root, [], vxworks);
 rootname([$.|Rest], Root, [], OsType) ->
     rootname(Rest, Root, ".", OsType);
 rootname([$.|Rest], Root, Ext, OsType) ->
@@ -451,7 +576,13 @@ rootname([], Root, _Ext, _OsType) ->
 %% Examples: rootname("/jam.src/kalle.jam", ".erl") -> "/jam.src/kalle.jam"
 %%           rootname("/jam.src/foo.erl", ".erl") -> "/jam.src/foo"
 
--spec rootname(file:name(), file:name()) -> string().
+-spec rootname(file:name(), file:name()) -> file:filename().
+rootname(Name, Ext) when is_binary(Name), is_binary(Ext) ->
+    list_to_binary(rootname(binary_to_list(Name),binary_to_list(Ext)));
+rootname(Name, Ext) when is_binary(Name) ->
+    rootname(Name,filename_string_to_binary(Ext));
+rootname(Name, Ext) when is_binary(Ext) ->
+    rootname(filename_string_to_binary(Name),Ext);
 rootname(Name0, Ext0) ->
     Name = flatten(Name0),
     Ext = flatten(Ext0),
@@ -471,27 +602,55 @@ rootname2([Char|Rest], Ext, Result) when is_integer(Char) ->
 %% split("foo/bar") -> ["foo", "bar"]
 %% split("a:\\msdev\\include") -> ["a:/", "msdev", "include"]
 
--spec split(file:name()) -> [string()].
+-spec split(file:name()) -> [file:filename()].
+split(Name) when is_binary(Name) ->
+    case os:type() of
+	{win32, _} -> win32_splitb(Name);
+	_  -> unix_splitb(Name)
+    end;
+
 split(Name0) ->
     Name = flatten(Name0),
     case os:type() of
-	{unix, _}  -> unix_split(Name);
 	{win32, _} -> win32_split(Name);
-	vxworks -> vxworks_split(Name);
-	{ose,_} -> unix_split(Name)
+	_  -> unix_split(Name)
     end.
 
-%% If a VxWorks filename starts with '[/\].*[^/\]' '[/\].*:' or '.*:' 
-%% that part of the filename is considered a device.  
-%% The rest of the name is interpreted exactly as for win32.
 
-%% XXX - dirty solution to make filename:split([]) return the same thing on
-%%       VxWorks as on unix and win32.
-vxworks_split([]) ->
-    [];
-vxworks_split(L) -> 
-    {_Devicep, Rest, FirstComp} = vxworks_first(L),
-    split(Rest, [], [lists:reverse(FirstComp)], win32).
+unix_splitb(Name) ->
+    L = binary:split(Name,[<<"/">>],[global]),
+    LL = case L of
+	     [<<>>|Rest] ->
+		 [<<"/">>|Rest];
+	     _ ->
+		 L
+	 end,
+    [ X || X <- LL, X =/= <<>>].
+
+
+fix_driveletter(Letter0) ->
+    if
+	Letter0 >= $A, Letter0 =< $Z ->  
+	    Letter0+$a-$A;
+	true ->
+	    Letter0
+    end.
+win32_splitb(<<Letter0,$:, Slash, Rest/binary>>) when (((Slash =:= $\\) orelse (Slash =:= $/)) andalso
+							 ?IS_DRIVELETTER(Letter0)) ->
+    Letter = fix_driveletter(Letter0),
+    L = binary:split(Rest,[<<"/">>,<<"\\">>],[global]),
+    [<<Letter,$:,$/>> | [ X || X <- L, X =/= <<>> ]]; 
+win32_splitb(<<Letter0,$:,Rest/binary>>) when ?IS_DRIVELETTER(Letter0) ->
+    Letter = fix_driveletter(Letter0),
+    L = binary:split(Rest,[<<"/">>,<<"\\">>],[global]),
+    [<<Letter,$:>> | [ X || X <- L, X =/= <<>> ]];
+win32_splitb(<<Slash,Rest/binary>>) when ((Slash =:= $\\) orelse (Slash =:= $/)) ->
+    L = binary:split(Rest,[<<"/">>,<<"\\">>],[global]),
+    [<<$/>> | [ X || X <- L, X =/= <<>> ]];
+win32_splitb(Name) ->
+    L = binary:split(Name,[<<"/">>,<<"\\">>],[global]),
+    [ X || X <- L, X =/= <<>> ].
+    
 
 unix_split(Name) ->
     split(Name, [], unix).
@@ -502,8 +661,6 @@ win32_split([X, $\\|Rest]) when is_integer(X) ->
     win32_split([X, $/|Rest]);
 win32_split([X, Y, $\\|Rest]) when is_integer(X), is_integer(Y) ->
     win32_split([X, Y, $/|Rest]);
-win32_split([$/, $/|Rest]) ->
-    split(Rest, [], [[$/, $/]]);
 win32_split([UcLetter, $:|Rest]) when UcLetter >= $A, UcLetter =< $Z ->
     win32_split([UcLetter+$a-$A, $:|Rest]);
 win32_split([Letter, $:, $/|Rest]) ->
@@ -528,8 +685,6 @@ split([$/|Rest], Comp, Components, OsType) ->
     split(Rest, [], [lists:reverse(Comp)|Components], OsType);
 split([Char|Rest], Comp, Components, OsType) when is_integer(Char) ->
     split(Rest, [Char|Comp], Components, OsType);
-split([List|Rest], Comp, Components, OsType) when is_list(List) ->
-    split(List++Rest, Comp, Components, OsType);
 split([], [], Components, _OsType) ->
     lists:reverse(Components);
 split([], Comp, Components, OsType) ->
@@ -540,7 +695,7 @@ split([], Comp, Components, OsType) ->
 %% will be converted to backslashes.  On all platforms, the
 %% name will be normalized as done by join/1.
 
--spec nativename(string()) -> string().
+-spec nativename(file:filename()) -> file:filename().
 nativename(Name0) ->
     Name = join([Name0]),			%Normalize.
     case os:type() of
@@ -557,13 +712,12 @@ win32_nativename([]) ->
 
 separators() ->
     case os:type() of
-	{unix, _}  -> {false, false};
 	{win32, _} -> {$\\, $:};
-	vxworks -> {$\\, false};
-	{ose,_} -> {false, false}
+	_ -> {false, false}
     end.
 
 
+
 %% find_src(Module) --
 %% find_src(Module, Rules) --
 %%
@@ -733,45 +887,12 @@ major_os_type() ->
 	OsT -> OsT
     end.
 
-%% Need to take care of the first pathname component separately
-%% due to VxWorks less than good device naming rules.
-%% (i.e. this is VxWorks specific ...)
-%% The following four all starts with device names
-%% elrond:/foo -> elrond:
-%% elrond:\\foo.bar -> elrond:
-%% /DISK1:foo -> /DISK1:
-%% /usr/include -> /usr
-%% This one doesn't:
-%% foo/bar
-
-vxworks_first([]) ->
-    {not_device, [], []};
-vxworks_first([$/|T]) ->
-    vxworks_first2(device, T, [$/]);
-vxworks_first([$\\|T]) ->
-    vxworks_first2(device, T, [$/]);
-vxworks_first([H|T]) when is_list(H) ->
-    vxworks_first(H++T);
-vxworks_first([H|T]) ->
-    vxworks_first2(not_device, T, [H]).
-
-vxworks_first2(Devicep, [], FirstComp) ->
-    {Devicep, [], FirstComp};
-vxworks_first2(Devicep, [$/|T], FirstComp) ->
-    {Devicep, [$/|T], FirstComp};
-vxworks_first2(Devicep, [$\\|T], FirstComp) ->
-    {Devicep, [$/|T], FirstComp};
-vxworks_first2(_Devicep, [$:|T], FirstComp)->
-    {device, T, [$:|FirstComp]};
-vxworks_first2(Devicep, [H|T], FirstComp) when is_list(H) ->
-    vxworks_first2(Devicep, H++T, FirstComp);
-vxworks_first2(Devicep, [H|T], FirstComp) ->
-    vxworks_first2(Devicep, T, [H|FirstComp]).
-    
 %% flatten(List)
 %%  Flatten a list, also accepting atoms.
 
--spec flatten(file:name()) -> string().
+-spec flatten(file:name()) -> file:filename().
+flatten(Bin) when is_binary(Bin) ->
+    Bin;
 flatten(List) ->
     do_flatten(List, []).
 
@@ -785,3 +906,12 @@ do_flatten([], Tail) ->
     Tail;
 do_flatten(Atom, Tail) when is_atom(Atom) ->
     atom_to_list(Atom) ++ flatten(Tail).
+
+filename_string_to_binary(List) ->
+    case unicode:characters_to_binary(flatten(List),unicode,file:native_name_encoding()) of
+	{error,_,_} ->
+	    erlang:error(badarg);
+	Bin when is_binary(Bin) ->
+	    Bin
+    end.
+
diff --git a/lib/stdlib/src/gb_sets.erl b/lib/stdlib/src/gb_sets.erl
index 086dc79b46..113f29e252 100644
--- a/lib/stdlib/src/gb_sets.erl
+++ b/lib/stdlib/src/gb_sets.erl
@@ -657,7 +657,7 @@ intersection_2([], _, As, S) ->
 intersection_2(_, [], As, S) ->
     {S, balance_revlist(As, S)}.
 
--spec intersection([gb_set()]) -> gb_set().
+-spec intersection([gb_set(),...]) -> gb_set().
 
 intersection([S | Ss]) ->
     intersection_list(S, Ss).
diff --git a/lib/stdlib/src/io.erl b/lib/stdlib/src/io.erl
index 1d0f9374bc..3efa68ca09 100644
--- a/lib/stdlib/src/io.erl
+++ b/lib/stdlib/src/io.erl
@@ -39,6 +39,8 @@
 -type device() :: atom() | pid().
 -type prompt() :: atom() | string().
 
+-type error_description() :: term(). % Whatever the io-server sends.
+-type request_error() :: {'error',error_description()}.
 %% XXX: Some uses of line() in this file may need to read erl_scan:location()
 -type line()   :: pos_integer().
 
@@ -53,26 +55,12 @@
 to_tuple(T) when is_tuple(T) -> T;
 to_tuple(T) -> {T}.
 
-%% Problem: the variables Other, Name and Args may collide with surrounding
-%% ones.
-%% Give extra args to macro, being the variables to use.
--define(O_REQUEST(Io, Request),
-    case request(Io, Request) of
-	{error, Reason} ->
-	    [Name | Args] = tuple_to_list(to_tuple(Request)),
-	    erlang:error(conv_reason(Name, Reason), [Name, Io | Args]);
-	Other ->
-	    Other
-    end).
-
 o_request(Io, Request, Func) ->
     case request(Io, Request) of
 	{error, Reason} ->
 	    [_Name | Args] = tuple_to_list(to_tuple(Request)),
-	    {'EXIT',{undef,[_Current|Mfas]}} = (catch erlang:error(undef)),
-	    MFA = {io, Func, [Io | Args]},
-	    exit({conv_reason(Func, Reason),[MFA|Mfas]});
-%	    erlang:error(conv_reason(Name, Reason), [Name, Io | Args]);
+	    {'EXIT',{get_stacktrace,[_Current|Mfas]}} = (catch erlang:error(get_stacktrace)),
+	    erlang:raise(error, conv_reason(Func, Reason), [{io, Func, [Io | Args]}|Mfas]);
 	Other ->
 	    Other
     end.
@@ -299,32 +287,32 @@ format(Io, Format, Args) ->
 
 %% Scanning Erlang code.
 
--spec scan_erl_exprs(prompt()) -> erl_scan:tokens_result().
+-spec scan_erl_exprs(prompt()) -> erl_scan:tokens_result() | request_error().
  
 scan_erl_exprs(Prompt) ->
     scan_erl_exprs(default_input(), Prompt, 1).
 
--spec scan_erl_exprs(device(), prompt()) -> erl_scan:tokens_result().
+-spec scan_erl_exprs(device(), prompt()) -> erl_scan:tokens_result() | request_error().
 
 scan_erl_exprs(Io, Prompt) ->
     scan_erl_exprs(Io, Prompt, 1).
 
--spec scan_erl_exprs(device(), prompt(), line()) -> erl_scan:tokens_result().
+-spec scan_erl_exprs(device(), prompt(), line()) -> erl_scan:tokens_result() | request_error().
 
 scan_erl_exprs(Io, Prompt, Pos0) ->
     request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0]}).
 
--spec scan_erl_form(prompt()) -> erl_scan:tokens_result().
+-spec scan_erl_form(prompt()) -> erl_scan:tokens_result() | request_error().
 
 scan_erl_form(Prompt) ->
     scan_erl_form(default_input(), Prompt, 1).
 
--spec scan_erl_form(device(), prompt()) -> erl_scan:tokens_result().
+-spec scan_erl_form(device(), prompt()) -> erl_scan:tokens_result() | request_error().
 
 scan_erl_form(Io, Prompt) ->
     scan_erl_form(Io, Prompt, 1).
 
--spec scan_erl_form(device(), prompt(), line()) -> erl_scan:tokens_result().
+-spec scan_erl_form(device(), prompt(), line()) -> erl_scan:tokens_result() | request_error().
 
 scan_erl_form(Io, Prompt, Pos0) ->
     request(Io, {get_until,unicode,Prompt,erl_scan,tokens,[Pos0]}).
@@ -335,7 +323,8 @@ scan_erl_form(Io, Prompt, Pos0) ->
 
 -type parse_ret() :: {'ok', erl_parse_expr_list(), line()}
                    | {'eof', line()}
-                   | {'error', erl_scan:error_info(), line()}.
+                   | {'error', erl_scan:error_info(), line()}
+                   | request_error().
 
 -spec parse_erl_exprs(prompt()) -> parse_ret().
 
@@ -364,7 +353,8 @@ parse_erl_exprs(Io, Prompt, Pos0) ->
 
 -type parse_form_ret() :: {'ok', erl_parse_absform(), line()}
                         | {'eof', line()}
-                        | {'error', erl_scan:error_info(), line()}.
+                        | {'error', erl_scan:error_info(), line()}
+                        | request_error().
 
 -spec parse_erl_form(prompt()) -> parse_form_ret().
 
diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl
index 08ee595f4d..c669c1f7c1 100644
--- a/lib/stdlib/src/lists.erl
+++ b/lib/stdlib/src/lists.erl
@@ -350,7 +350,7 @@ sort_1(X, [], R) ->
 %% merge(List) -> L
 %%  merges a list of sorted lists
 
--spec merge([T]) -> [T].
+-spec merge([[T]]) -> [T].
 
 merge(L) ->
     mergel(L, []).
@@ -358,7 +358,7 @@ merge(L) ->
 %% merge3(X, Y, Z) -> L
 %%  merges three sorted lists X, Y and Z
 
--spec merge3([_], [_], [_]) -> [_].
+-spec merge3([X], [Y], [Z]) -> [(X | Y | Z)].
 
 merge3(L1, [], L3) ->
    merge(L1, L3);
@@ -370,7 +370,7 @@ merge3(L1, [H2 | T2], [H3 | T3]) ->
 %% rmerge3(X, Y, Z) -> L
 %%  merges three reversed sorted lists X, Y and Z
 
--spec rmerge3([_], [_], [_]) -> [_].
+-spec rmerge3([X], [Y], [Z]) -> [(X | Y | Z)].
 
 rmerge3(L1, [], L3) ->
    rmerge(L1, L3);
@@ -382,7 +382,7 @@ rmerge3(L1, [H2 | T2], [H3 | T3]) ->
 %% merge(X, Y) -> L
 %%  merges two sorted lists X and Y
 
--spec merge([_], [_]) -> [_].
+-spec merge([X], [Y]) -> [(X | Y)].
 
 merge(T1, []) ->
     T1;
@@ -394,7 +394,7 @@ merge(T1, [H2 | T2]) ->
 
 %% reverse(rmerge(reverse(A),reverse(B))) is equal to merge(I,A,B).
 
--spec rmerge([_], [_]) -> [_].
+-spec rmerge([X], [Y]) -> [(X | Y)].
 
 rmerge(T1, []) ->
     T1;
@@ -420,12 +420,12 @@ thing_to_list(X) when is_list(X)    -> X.	%Assumed to be a string
 %% flatten(List, Tail)
 %%  Flatten a list, adding optional tail.
 
--spec flatten([_]) -> [_].
+-spec flatten([term()]) -> [term()].
 
 flatten(List) when is_list(List) ->
     do_flatten(List, []).
 
--spec flatten([_], [_]) -> [_].
+-spec flatten([term()], [term()]) -> [term()].
 
 flatten(List, Tail) when is_list(List), is_list(Tail) ->
     do_flatten(List, Tail).
@@ -440,7 +440,7 @@ do_flatten([], Tail) ->
 %% flatlength(List)
 %%  Calculate the length of a list of lists.
 
--spec flatlength([_]) -> non_neg_integer().
+-spec flatlength([term()]) -> non_neg_integer().
 
 flatlength(List) ->
     flatlength(List, 0).
@@ -481,7 +481,7 @@ flatlength([], L) -> L.
 %    keysearch3(Key, N, T);
 %keysearch3(Key, N, []) -> false.
 
--spec keydelete(_, pos_integer(), [T]) -> [T].
+-spec keydelete(term(), pos_integer(), [T]) -> [T] when T :: tuple().
 
 keydelete(K, N, L) when is_integer(N), N > 0 ->
     keydelete3(K, N, L).
@@ -491,7 +491,7 @@ keydelete3(Key, N, [H|T]) ->
     [H|keydelete3(Key, N, T)];
 keydelete3(_, _, []) -> [].
 
--spec keyreplace(_, pos_integer(), [_], tuple()) -> [_].
+-spec keyreplace(term(), pos_integer(), [tuple()], tuple()) -> [tuple()].
 
 keyreplace(K, N, L, New) when is_integer(N), N > 0, is_tuple(New) ->
     keyreplace3(K, N, L, New).
@@ -502,7 +502,8 @@ keyreplace3(Key, Pos, [H|T], New) ->
     [H|keyreplace3(Key, Pos, T, New)];
 keyreplace3(_, _, [], _) -> [].
 
--spec keytake(_, pos_integer(), [_]) -> {'value', tuple(), [_]} | 'false'.
+-spec keytake(term(), pos_integer(), [tuple()]) ->
+	{'value', tuple(), [tuple()]} | 'false'.
 
 keytake(Key, N, L) when is_integer(N), N > 0 ->
     keytake(Key, N, L, []).
@@ -513,7 +514,8 @@ keytake(Key, N, [H|T], L) ->
     keytake(Key, N, T, [H|L]);
 keytake(_K, _N, [], _L) -> false.
 
--spec keystore(_, pos_integer(), [_], tuple()) -> [_].
+-spec keystore(term(), pos_integer(), [tuple()], tuple()) -> [tuple(),...].
+
 keystore(K, N, L, New) when is_integer(N), N > 0, is_tuple(New) ->
     keystore2(K, N, L, New).
 
@@ -524,7 +526,7 @@ keystore2(Key, N, [H|T], New) ->
 keystore2(_Key, _N, [], New) ->
     [New].
 
--spec keysort(pos_integer(), [T]) -> [T] when is_subtype(T, tuple()).
+-spec keysort(pos_integer(), [T]) -> [T] when T :: tuple().
 
 keysort(I, L) when is_integer(I), I > 0 ->
     case L of
@@ -582,7 +584,7 @@ keysort_1(_I, X, _EX, [], R) ->
     lists:reverse(R, [X]).
 
 -spec keymerge(pos_integer(), [X], [Y]) ->
-	     [R] when is_subtype(X, tuple()), is_subtype(Y, tuple()), is_subtype(R, tuple()).
+	[R] when X :: tuple(), Y :: tuple(), R :: tuple().
 
 keymerge(Index, T1, L2) when is_integer(Index), Index > 0 -> 
     case L2 of
@@ -597,7 +599,7 @@ keymerge(Index, T1, L2) when is_integer(Index), Index > 0 ->
 %% reverse(rkeymerge(I,reverse(A),reverse(B))) is equal to keymerge(I,A,B).
 
 -spec rkeymerge(pos_integer(), [X], [Y]) ->
-	     [R] when is_subtype(X, tuple()), is_subtype(Y, tuple()), is_subtype(R, tuple()).
+	[R] when X :: tuple(), Y :: tuple(), R :: tuple().
 
 rkeymerge(Index, T1, L2) when is_integer(Index), Index > 0 -> 
     case L2 of
@@ -609,7 +611,7 @@ rkeymerge(Index, T1, L2) when is_integer(Index), Index > 0 ->
 	    lists:reverse(M, [])
     end.
 
--spec ukeysort(pos_integer(), [T]) -> [T] when is_subtype(T, tuple()).
+-spec ukeysort(pos_integer(), [T]) -> [T] when T :: tuple().
 
 ukeysort(I, L) when is_integer(I), I > 0 ->
     case L of
@@ -675,7 +677,7 @@ ukeysort_1(_I, X, _EX, []) ->
     [X].
 
 -spec ukeymerge(pos_integer(), [X], [Y]) ->
-	     [(X | Y)] when is_subtype(X, tuple()), is_subtype(Y, tuple()).
+	[(X | Y)] when X :: tuple(), Y :: tuple().
 
 ukeymerge(Index, L1, T2) when is_integer(Index), Index > 0 ->
     case L1 of
@@ -690,7 +692,7 @@ ukeymerge(Index, L1, T2) when is_integer(Index), Index > 0 ->
 %% reverse(rukeymerge(I,reverse(A),reverse(B))) is equal to ukeymerge(I,A,B).
 
 -spec rukeymerge(pos_integer(), [X], [Y]) ->
-	     [(X | Y)] when is_subtype(X, tuple()), is_subtype(Y, tuple()).
+	[(X | Y)] when X :: tuple(), Y :: tuple().
 
 rukeymerge(Index, T1, L2) when is_integer(Index), Index > 0 ->
     case L2 of
@@ -702,7 +704,7 @@ rukeymerge(Index, T1, L2) when is_integer(Index), Index > 0 ->
 	    lists:reverse(M, [])
     end.
 
--spec keymap(fun((_) -> _), pos_integer(), [tuple()]) -> [tuple()].
+-spec keymap(fun((term()) -> term()), pos_integer(), [tuple()]) -> [tuple()].
 
 keymap(Fun, Index, [Tup|Tail]) ->
    [setelement(Index, Tup, Fun(element(Index, Tup)))|keymap(Fun, Index, Tail)];
@@ -725,7 +727,7 @@ sort(Fun, [X, Y | T]) ->
 	    fsplit_2(Y, X, Fun, T, [], [])
     end.
 
--spec merge(fun((X, Y) -> boolean()), [X], [Y]) -> [_].
+-spec merge(fun((X, Y) -> boolean()), [X], [Y]) -> [(X | Y)].
 
 merge(Fun, T1, [H2 | T2]) when is_function(Fun, 2) ->
     lists:reverse(fmerge2_1(T1, H2, Fun, T2, []), []);
@@ -734,7 +736,7 @@ merge(Fun, T1, []) when is_function(Fun, 2) ->
 
 %% reverse(rmerge(F,reverse(A),reverse(B))) is equal to merge(F,A,B).
 
--spec rmerge(fun((X, Y) -> boolean()), [X], [Y]) -> [_].
+-spec rmerge(fun((X, Y) -> boolean()), [X], [Y]) -> [(X | Y)].
 
 rmerge(Fun, T1, [H2 | T2]) when is_function(Fun, 2) ->
     lists:reverse(rfmerge2_1(T1, H2, Fun, T2, []), []);
@@ -768,7 +770,7 @@ usort_1(Fun, X, [Y | L]) ->
 	    ufsplit_2(Y, L, Fun, [X])
     end.
                     
--spec umerge(fun((X, Y) -> boolean()), [X], [Y]) -> [_].
+-spec umerge(fun((X, Y) -> boolean()), [X], [Y]) -> [(X | Y)].
 
 umerge(Fun, [], T2) when is_function(Fun, 2) ->
     T2;
@@ -777,7 +779,7 @@ umerge(Fun, [H1 | T1], T2) when is_function(Fun, 2) ->
 
 %% reverse(rumerge(F,reverse(A),reverse(B))) is equal to umerge(F,A,B).
 
--spec rumerge(fun((X, Y) -> boolean()), [X], [Y]) -> [_].
+-spec rumerge(fun((X, Y) -> boolean()), [X], [Y]) -> [(X | Y)].
 
 rumerge(Fun, T1, []) when is_function(Fun, 2) ->
     T1;
@@ -842,7 +844,7 @@ usort_1(X, []) ->
 %% umerge(List) -> L
 %%  merges a list of sorted lists without duplicates, removes duplicates
 
--spec umerge([T]) -> [T].
+-spec umerge([[T]]) -> [T].
 
 umerge(L) ->
     umergel(L).
@@ -851,7 +853,7 @@ umerge(L) ->
 %%  merges three sorted lists X, Y and Z without duplicates, 
 %%  removes duplicates
 
--spec umerge3([_], [_], [_]) -> [_].
+-spec umerge3([X], [Y], [Z]) -> [(X | Y | Z)].
 
 umerge3(L1, [], L3) ->
    umerge(L1, L3);
@@ -864,7 +866,7 @@ umerge3(L1, [H2 | T2], [H3 | T3]) ->
 %%  merges three reversed sorted lists X, Y and Z without duplicates,
 %%  removes duplicates
 
--spec rumerge3([_], [_], [_]) -> [_].
+-spec rumerge3([X], [Y], [Z]) -> [(X | Y | Z)].
 
 rumerge3(L1, [], L3) ->
    rumerge(L1, L3);
@@ -876,7 +878,7 @@ rumerge3(L1, [H2 | T2], [H3 | T3]) ->
 %% umerge(X, Y) -> L
 %%  merges two sorted lists X and Y without duplicates, removes duplicates
 
--spec umerge([_], [_]) -> [_].
+-spec umerge([X], [Y]) -> [(X | Y)].
 
 umerge([], T2) ->
     T2;
@@ -889,7 +891,7 @@ umerge([H1 | T1], T2) ->
 
 %% reverse(rumerge(reverse(A),reverse(B))) is equal to umerge(I,A,B).
 
--spec rumerge([_], [_]) -> [_].
+-spec rumerge([X], [Y]) -> [(X | Y)].
 
 rumerge(T1, []) ->
     T1;
@@ -952,13 +954,13 @@ flatmap(F, [Hd|Tail]) ->
     F(Hd) ++ flatmap(F, Tail);
 flatmap(F, []) when is_function(F, 1) -> [].
 
--spec foldl(fun((T, _) -> _), _, [T]) -> _.
+-spec foldl(fun((T, term()) -> term()), term(), [T]) -> term().
 
 foldl(F, Accu, [Hd|Tail]) ->
     foldl(F, F(Hd, Accu), Tail);
 foldl(F, Accu, []) when is_function(F, 2) -> Accu.
 
--spec foldr(fun((T, _) -> _), _, [T]) -> _.
+-spec foldr(fun((T, term()) -> term()), term(), [T]) -> term().
 
 foldr(F, Accu, [Hd|Tail]) ->
     F(Hd, foldr(F, Accu, Tail));
@@ -998,14 +1000,14 @@ zf(F, [Hd|Tail]) ->
     end;
 zf(F, []) when is_function(F, 1) -> [].
 
--spec foreach(F :: fun((T) -> _), List :: [T]) -> 'ok'.
+-spec foreach(F :: fun((T) -> term()), List :: [T]) -> 'ok'.
 
 foreach(F, [Hd|Tail]) ->
     F(Hd),
     foreach(F, Tail);
 foreach(F, []) when is_function(F, 1) -> ok.
 
--spec mapfoldl(fun((T, _) -> {_, _}), _, [T]) -> {[_], _}.
+-spec mapfoldl(fun((A, term()) -> {B, term()}), term(), [A]) -> {[B], term()}.
 
 mapfoldl(F, Accu0, [Hd|Tail]) ->
     {R,Accu1} = F(Hd, Accu0),
@@ -1013,7 +1015,7 @@ mapfoldl(F, Accu0, [Hd|Tail]) ->
     {[R|Rs],Accu2};
 mapfoldl(F, Accu, []) when is_function(F, 2) -> {[],Accu}.
 
--spec mapfoldr(fun((T, _) -> {_, _}), _, [T]) -> {[_], _}.
+-spec mapfoldr(fun((A, term()) -> {B, term()}), term(), [A]) -> {[B], term()}.
 
 mapfoldr(F, Accu0, [Hd|Tail]) ->
     {Rs,Accu1} = mapfoldr(F, Accu0, Tail),
diff --git a/lib/stdlib/src/ms_transform.erl b/lib/stdlib/src/ms_transform.erl
index 78b1de6e16..a249dea525 100644
--- a/lib/stdlib/src/ms_transform.erl
+++ b/lib/stdlib/src/ms_transform.erl
@@ -43,6 +43,7 @@
 -define(ERR_GENREMOTECALL,22).
 -define(ERR_GENBINCONSTRUCT,23).
 -define(ERR_GENDISALLOWEDOP,24).
+-define(WARN_SHADOW_VAR,50).
 -define(ERR_GUARDMATCH,?ERR_GENMATCH+?ERROR_BASE_GUARD).
 -define(ERR_BODYMATCH,?ERR_GENMATCH+?ERROR_BASE_BODY).
 -define(ERR_GUARDLOCALCALL,?ERR_GENLOCALCALL+?ERROR_BASE_GUARD).
@@ -63,8 +64,13 @@
 -define(ERR_BODYDISALLOWEDOP,?ERR_GENDISALLOWEDOP+?ERROR_BASE_BODY).
 
 %%
-%% Called by compiler or ets/dbg:fun2ms when errors occur
+%% Called by compiler or ets/dbg:fun2ms when errors/warnings occur
 %%
+format_error({?WARN_SHADOW_VAR,Name}) ->
+    lists:flatten(
+      io_lib:format("variable ~p shadowed in ms_transform fun head",
+		    [Name]));
+
 format_error(?ERR_NOFUN) ->	    
     "Parameter of ets/dbg:fun2ms/1 is not a literal fun";
 format_error(?ERR_ETS_HEAD) ->	    
@@ -182,7 +188,7 @@ format_error(Else) ->
 %%
 transform_from_shell(Dialect, Clauses, BoundEnvironment) ->
     SaveFilename = setup_filename(),
-    case catch ms_clause_list(1,Clauses,Dialect) of
+    case catch ms_clause_list(1,Clauses,Dialect,gb_sets:new()) of
 	{'EXIT',Reason} ->
 	    cleanup_filename(SaveFilename),
 	    exit(Reason);
@@ -207,6 +213,7 @@ transform_from_shell(Dialect, Clauses, BoundEnvironment) ->
 %%
 parse_transform(Forms, _Options) ->
     SaveFilename = setup_filename(),
+    %io:format("Forms: ~p~n",[Forms]),
     case catch forms(Forms) of
 	{'EXIT',Reason} ->
 	    cleanup_filename(SaveFilename),
@@ -215,12 +222,31 @@ parse_transform(Forms, _Options) ->
 	    {error, [{cleanup_filename(SaveFilename),
 		      [{Line, ?MODULE, R}]}], []};
 	Else ->
-	    cleanup_filename(SaveFilename),
+	    %io:format("Transformed into: ~p~n",[Else]),
+	    case get_warnings() of
+		[] ->
+		    cleanup_filename(SaveFilename),
+		    Else;
+		WL ->
+		    FName = cleanup_filename(SaveFilename) ,
+		    WList = [ {FName, [{L, ?MODULE, R}]} || {L,R} <- WL ],
+		    {warning, Else, WList}
+	    end
+    end.
+
+get_warnings() ->
+    case get(warnings) of
+	undefined ->
+	    [];
+	Else ->
 	    Else
     end.
 
+add_warning(Line,R) ->
+    put(warnings,[{Line,R}| get_warnings()]).
+
 setup_filename() ->
-    {erase(filename),erase(records)}.
+    {erase(filename),erase(records),erase(warnings)}.
 
 put_filename(Name) ->
     put(filename,Name).
@@ -235,7 +261,7 @@ get_records() ->
 	Else ->
 	    Else
     end.
-cleanup_filename({Old,OldRec}) ->
+cleanup_filename({Old,OldRec,OldWarnings}) ->
     Ret = case erase(filename) of
 	      undefined ->
 		  "TOP_LEVEL";
@@ -248,6 +274,12 @@ cleanup_filename({Old,OldRec}) ->
 	Rec ->
 	    put(records,Rec)
     end,
+    case OldWarnings of
+	undefined ->
+	    erase(warnings);
+	Warn ->
+	    put(warnings,Warn)
+    end,
     case Old of
 	undefined ->
 	    Ret;
@@ -285,42 +317,77 @@ form({function,Line,Name0,Arity0,Clauses0}) ->
 form(AnyOther) ->
     AnyOther.
 function(Name, Arity, Clauses0) ->
-    Clauses1 = clauses(Clauses0),
+    {Clauses1,_} = clauses(Clauses0,gb_sets:new()),
     {Name,Arity,Clauses1}.
-clauses([C0|Cs]) ->
-    C1 = clause(C0),
-    [C1|clauses(Cs)];
-clauses([]) -> [].
-clause({clause,Line,H0,G0,B0}) ->
-    B1 = copy(B0),
-    {clause,Line,H0,G0,B1}.
+clauses([C0|Cs],Bound) ->
+    {C1,Bound1} = clause(C0,Bound),
+    {C2,Bound2} = clauses(Cs,Bound1),
+    {[C1|C2],Bound2};
+clauses([],Bound) -> {[],Bound}.
+clause({clause,Line,H0,G0,B0},Bound) ->
+    {H1,Bound1} = copy(H0,Bound),
+    {B1,Bound2} = copy(B0,Bound1),
+    {{clause,Line,H1,G0,B1},Bound2}.
 
 copy({call,Line,{remote,_Line2,{atom,_Line3,ets},{atom,_Line4,fun2ms}},
-      As0}) ->
-    transform_call(ets,Line,As0);
+      As0},Bound) ->
+    {transform_call(ets,Line,As0,Bound),Bound};
 copy({call,Line,{remote,_Line2,{record_field,_Line3,
                                 {atom,_Line4,''},{atom,_Line5,ets}},
-                 {atom,_Line6,fun2ms}}, As0}) ->
+                 {atom,_Line6,fun2ms}}, As0},Bound) ->
     %% Packages...
-    transform_call(ets,Line,As0);
+    {transform_call(ets,Line,As0,Bound),Bound};
 copy({call,Line,{remote,_Line2,{atom,_Line3,dbg},{atom,_Line4,fun2ms}},
-      As0}) ->
-    transform_call(dbg,Line,As0);
-copy(T) when is_tuple(T) ->
-    list_to_tuple(copy_list(tuple_to_list(T)));
-copy(L) when is_list(L) ->
-    copy_list(L);
-copy(AnyOther) ->
-    AnyOther.
+      As0},Bound) ->
+    {transform_call(dbg,Line,As0,Bound),Bound};
+copy({match,Line,A,B},Bound) ->
+    {B1,Bound1} = copy(B,Bound),
+    {A1,Bound2} = copy(A,Bound),
+    {{match,Line,A1,B1},gb_sets:union(Bound1,Bound2)};
+copy({var,_Line,'_'} = VarDef,Bound) ->
+    {VarDef,Bound};
+copy({var,_Line,Name} = VarDef,Bound) ->
+    Bound1 = gb_sets:add(Name,Bound),
+    {VarDef,Bound1};
+copy({'fun',Line,{clauses,Clauses}},Bound) -> % Dont export bindings from funs
+    {NewClauses,_IgnoredBindings} = copy_list(Clauses,Bound),
+    {{'fun',Line,{clauses,NewClauses}},Bound};
+copy({'case',Line,Of,ClausesList},Bound) -> % Dont export bindings from funs
+    {NewOf,NewBind0} = copy(Of,Bound),
+    {NewClausesList,NewBindings} = copy_case_clauses(ClausesList,NewBind0,[]),
+    {{'case',Line,NewOf,NewClausesList},NewBindings};
+copy(T,Bound) when is_tuple(T) ->
+    {L,Bound1} = copy_list(tuple_to_list(T),Bound),
+    {list_to_tuple(L),Bound1};
+copy(L,Bound) when is_list(L) ->
+    copy_list(L,Bound);
+copy(AnyOther,Bound) ->
+    {AnyOther,Bound}.
 
-copy_list([H|T]) ->
-    [copy(H)|copy_list(T)];
-copy_list([]) ->
-    [].
+copy_case_clauses([],Bound,AddSets) ->
+    ReallyAdded = gb_sets:intersection(AddSets),
+    {[],gb_sets:union(Bound,ReallyAdded)};
+copy_case_clauses([{clause,Line,Match,Guard,Clauses}|T],Bound,AddSets) ->
+    {NewMatch,MatchBinds} = copy(Match,Bound),
+    {NewGuard,GuardBinds} = copy(Guard,MatchBinds), %% Really no new binds
+    {NewClauses,AllBinds} = copy(Clauses,GuardBinds),
+    %% To limit the setsizes, I subtract what I had before the case clause
+    %% and add it in the end
+    AddedBinds = gb_sets:subtract(AllBinds,Bound),
+    {NewTail,ExportedBindings} =
+	copy_case_clauses(T,Bound,[AddedBinds | AddSets]),
+    {[{clause,Line,NewMatch,NewGuard,NewClauses}|NewTail],ExportedBindings}.
 
-transform_call(Type,_Line,[{'fun',Line2,{clauses, ClauseList}}]) ->
-    ms_clause_list(Line2, ClauseList,Type);
-transform_call(_Type,Line,_NoAbstractFun) ->
+copy_list([H|T],Bound) ->
+    {C1,Bound1} = copy(H,Bound),
+    {C2,Bound2} = copy_list(T,Bound1),
+    {[C1|C2],Bound2};
+copy_list([],Bound) ->
+    {[],Bound}.
+
+transform_call(Type,_Line,[{'fun',Line2,{clauses, ClauseList}}],Bound) ->
+    ms_clause_list(Line2, ClauseList,Type,Bound);
+transform_call(_Type,Line,_NoAbstractFun,_) ->
     throw({error,Line,?ERR_NOFUN}).
 
 % Fixup semicolons in guards
@@ -329,18 +396,19 @@ ms_clause_expand({clause, Line, Parameters, Guard = [_,_|_], Body}) ->
 ms_clause_expand(_Other) ->
     false.
 
-ms_clause_list(Line,[H|T],Type) ->
+ms_clause_list(Line,[H|T],Type,Bound) ->
     case ms_clause_expand(H) of
 	NewHead when is_list(NewHead) ->
-	    ms_clause_list(Line,NewHead ++ T, Type);
+	    ms_clause_list(Line,NewHead ++ T, Type, Bound);
 	false ->
-	    {cons, Line, ms_clause(H,Type), ms_clause_list(Line, T,Type)}
+	    {cons, Line, ms_clause(H, Type, Bound),
+	     ms_clause_list(Line, T, Type, Bound)}
     end;
-ms_clause_list(Line,[],_) ->
+ms_clause_list(Line,[],_,_) ->
     {nil,Line}.
-ms_clause({clause, Line, Parameters, Guards, Body},Type) ->
+ms_clause({clause, Line, Parameters, Guards, Body},Type,Bound) ->
     check_type(Line,Parameters,Type),
-    {MSHead,Bindings} = transform_head(Parameters),
+    {MSHead,Bindings} = transform_head(Parameters,Bound),
     MSGuards = transform_guards(Line, Guards, Bindings),
     MSBody = transform_body(Line,Body,Bindings),
     {tuple, Line, [MSHead,MSGuards,MSBody]}.
@@ -627,29 +695,31 @@ tg(Other,B) ->
     Element = io_lib:format("unknown element ~w", [Other]),
     throw({error,unknown,{?ERR_GENELEMENT+B#tgd.eb,Element}}).
 
-transform_head([V]) ->
+transform_head([V],OuterBound) ->
     Bind = cre_bind(),
-    {NewV,NewBind} = toplevel_head_match(V,Bind),
-    th(NewV,NewBind).
+    {NewV,NewBind} = toplevel_head_match(V,Bind,OuterBound),
+    th(NewV,NewBind,OuterBound).
 
 
-toplevel_head_match({match,_,{var,_,VName},Expr},B) ->
+toplevel_head_match({match,Line,{var,_,VName},Expr},B,OB) ->
+    warn_var_clash(Line,VName,OB),
     {Expr,new_bind({VName,'$_'},B)};
-toplevel_head_match({match,_,Expr,{var,_,VName}},B) ->
+toplevel_head_match({match,Line,Expr,{var,_,VName}},B,OB) ->
+    warn_var_clash(Line,VName,OB),
     {Expr,new_bind({VName,'$_'},B)};
-toplevel_head_match(Other,B) ->
+toplevel_head_match(Other,B,_OB) ->
     {Other,B}.
 
-th({record,Line,RName,RFields},B) ->
+th({record,Line,RName,RFields},B,OB) ->
     % youch...
     RDefs = get_records(),
     {KeyList0,NewB} = lists:foldl(fun({record_field,_,{atom,_,Key},Value},
 				     {L,B0}) ->
-					 {NV,B1} = th(Value,B0),
+					 {NV,B1} = th(Value,B0,OB),
 					 {[{Key,NV}|L],B1};
 				    ({record_field,_,{var,_,'_'},Value},
 				     {L,B0}) ->
-					 {NV,B1} = th(Value,B0),
+					 {NV,B1} = th(Value,B0,OB),
 					 {[{{default},NV}|L],B1};
 				    (_,_) ->
 					 throw({error,Line,{?ERR_HEADBADREC,
@@ -692,9 +762,9 @@ th({record,Line,RName,RFields},B) ->
 	_ ->
 	    throw({error,Line,{?ERR_HEADBADREC,RName}})
     end;
-th({match,Line,_,_},_) -> 
+th({match,Line,_,_},_,_) ->
     throw({error,Line,?ERR_HEADMATCH});
-th({atom,Line,A},B) ->
+th({atom,Line,A},B,_OB) ->
     case atom_to_list(A) of
 	[$$|NL] ->
 	    case (catch list_to_integer(NL)) of
@@ -706,10 +776,11 @@ th({atom,Line,A},B) ->
 	_ ->
 	    {{atom,Line,A},B}
     end;
-th({bin_element,_Line0,{var, Line, A},_,_},_) ->
+th({bin_element,_Line0,{var, Line, A},_,_},_,_) ->
     throw({error,Line,{?ERR_HEADBINMATCH,A}});
 
-th({var,Line,Name},B) ->
+th({var,Line,Name},B,OB) ->
+    warn_var_clash(Line,Name,OB),
     case lkup_bind(Name,B) of
 	undefined ->
 	    NewB = new_bind(Name,B),
@@ -717,16 +788,24 @@ th({var,Line,Name},B) ->
 	Trans ->
 	    {{atom,Line,Trans},B}
     end;
-th([H|T],B) ->
-    {NH,NB} = th(H,B),
-    {NT,NNB} = th(T,NB),
+th([H|T],B,OB) ->
+    {NH,NB} = th(H,B,OB),
+    {NT,NNB} = th(T,NB,OB),
     {[NH|NT],NNB};
-th(T,B) when is_tuple(T) ->
-    {L,NB} = th(tuple_to_list(T),B),
+th(T,B,OB) when is_tuple(T) ->
+    {L,NB} = th(tuple_to_list(T),B,OB),
     {list_to_tuple(L),NB};
-th(Nonstruct,B) ->
+th(Nonstruct,B,_OB) ->
     {Nonstruct,B}.
 
+warn_var_clash(Line,Name,OuterBound) ->
+    case gb_sets:is_member(Name,OuterBound) of
+	true ->
+	    add_warning(Line,{?WARN_SHADOW_VAR,Name});
+	_ ->
+	    ok
+    end.
+
 %% Could be more efficient...
 check_multi_field(_, _, [], _) ->
     ok;
diff --git a/lib/stdlib/src/orddict.erl b/lib/stdlib/src/orddict.erl
index c7b52b933e..8a13992785 100644
--- a/lib/stdlib/src/orddict.erl
+++ b/lib/stdlib/src/orddict.erl
@@ -151,7 +151,7 @@ map(F, [{Key,Val}|D]) ->
     [{Key,F(Key, Val)}|map(F, D)];
 map(F, []) when is_function(F, 2) -> [].
 
--spec filter(fun((term(), term()) -> term()), orddict()) -> orddict().
+-spec filter(fun((term(), term()) -> boolean()), orddict()) -> orddict().
 
 filter(F, [{Key,Val}=E|D]) ->
     case F(Key, Val) of
diff --git a/lib/stdlib/src/ordsets.erl b/lib/stdlib/src/ordsets.erl
index 05041c15f1..4c72e351d0 100644
--- a/lib/stdlib/src/ordsets.erl
+++ b/lib/stdlib/src/ordsets.erl
@@ -26,12 +26,14 @@
 -export([subtract/2,is_subset/2]).
 -export([fold/3,filter/2]).
 
+-export_type([ordset/1]).
+
 -type ordset(T) :: [T].
 
 %% new() -> Set.
 %%  Return a new empty ordered set.
 
--spec new() -> ordset(term()).
+-spec new() -> [].
 
 new() -> [].
 
@@ -84,7 +86,7 @@ is_element(_, []) -> false.
 %% add_element(Element, OrdSet) -> OrdSet.
 %%  Return OrdSet with Element inserted in it.
 
--spec add_element(term(), ordset(_)) -> ordset(_).
+-spec add_element(E, ordset(T)) -> [T | E,...].
 
 add_element(E, [H|Es]) when E > H -> [H|add_element(E, Es)];
 add_element(E, [H|_]=Set) when E < H -> [E|Set];
@@ -94,7 +96,7 @@ add_element(E, []) -> [E].
 %% del_element(Element, OrdSet) -> OrdSet.
 %%  Return OrdSet but with Element removed.
 
--spec del_element(term(), ordset(_)) -> ordset(_).
+-spec del_element(term(), ordset(T)) -> ordset(T).
 
 del_element(E, [H|Es]) when E > H -> [H|del_element(E, Es)];
 del_element(E, [H|_]=Set) when E < H -> Set;
@@ -104,7 +106,7 @@ del_element(_, []) -> [].
 %% union(OrdSet1, OrdSet2) -> OrdSet
 %%  Return the union of OrdSet1 and OrdSet2.
 
--spec union(ordset(_), ordset(_)) -> ordset(_).
+-spec union(ordset(T1), ordset(T2)) -> ordset(T1 | T2).
 
 union([E1|Es1], [E2|_]=Set2) when E1 < E2 ->
     [E1|union(Es1, Set2)];
@@ -118,7 +120,7 @@ union(Es1, []) -> Es1.
 %% union([OrdSet]) -> OrdSet
 %%  Return the union of the list of ordered sets.
 
--spec union([ordset(_)]) -> ordset(_).
+-spec union([ordset(T)]) -> ordset(T).
 
 union([S1,S2|Ss]) ->
     union1(union(S1, S2), Ss);
@@ -147,7 +149,7 @@ intersection(_, []) ->
 %% intersection([OrdSet]) -> OrdSet.
 %%  Return the intersection of the list of ordered sets.
 
--spec intersection([ordset(_)]) -> ordset(_).
+-spec intersection([ordset(_),...]) -> ordset(_).
 
 intersection([S1,S2|Ss]) ->
     intersection1(intersection(S1, S2), Ss);
@@ -206,7 +208,7 @@ is_subset(_, []) -> false.
 %% fold(Fun, Accumulator, OrdSet) -> Accumulator.
 %%  Fold function Fun over all elements in OrdSet and return Accumulator.
 
--spec fold(fun((_, _) -> _), _, ordset(_)) -> _.
+-spec fold(fun((T, term()) -> term()), term(), ordset(T)) -> term().
 
 fold(F, Acc, Set) ->
     lists:foldl(F, Acc, Set).
@@ -214,7 +216,7 @@ fold(F, Acc, Set) ->
 %% filter(Fun, OrdSet) -> OrdSet.
 %%  Filter OrdSet with Fun.
 
--spec filter(fun((_) -> boolean()), ordset(_)) -> ordset(_).
+-spec filter(fun((T) -> boolean()), ordset(T)) -> ordset(T).
 
 filter(F, Set) ->
     lists:filter(F, Set).
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index f3cfd78d54..5c52dfcbf0 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -349,14 +349,24 @@ obsolete_1(ssh_sftp, stop, 1) ->
 
 %% Added in R13B01.
 obsolete_1(ssl_pkix, decode_cert_file, A) when A =:= 1; A =:= 2 ->
-    {deprecated,"deprecated (will be removed in R14B); use public_key:pem_to_der/1 and public_key:pkix_decode_cert/2 instead"};
+    {removed,"removed in R14A; use public_key:pem_to_der/1 and public_key:pkix_decode_cert/2 instead"};
 obsolete_1(ssl_pkix, decode_cert, A) when A =:= 1; A =:= 2 ->
-    {deprecated,{public_key,pkix_decode_cert,2},"R14B"};
+    {removed,{public_key,pkix_decode_cert,2},"R14A"};
 
 %% Added in R13B04.
 obsolete_1(erlang, concat_binary, 1) ->
     {deprecated,{erlang,list_to_binary,1},"R15B"};
-    
+
+%% Added in R14A.
+obsolete_1(ssl, peercert, 2) ->
+    {deprecated,"deprecated (will be 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) ->
+    {deprecated,"deprecated (will be 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 ->
+    {deprecated,{public_key,pem_entry_decode,1},"R15A"};
+
 obsolete_1(_, _, _) ->
     no.
 
diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index 6e48d95973..bc6944e520 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -24,6 +24,8 @@
 
 %% External exports 
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([parse_transform/2, transform_from_evaluator/2]).
 
 -export([q/1, q/2]).
diff --git a/lib/stdlib/src/re.erl b/lib/stdlib/src/re.erl
index 296a6b3d23..9642de17b4 100644
--- a/lib/stdlib/src/re.erl
+++ b/lib/stdlib/src/re.erl
@@ -208,29 +208,25 @@ replace(Subject,RE,Replacement,Options) ->
 	process_repl_params(Options,iodata,false),
     FlatSubject = to_binary(Subject, Unicode),
     FlatReplacement = to_binary(Replacement, Unicode),
-    case do_replace(FlatSubject,Subject,RE,FlatReplacement,NewOpt) of
-	{error,_Err} ->
-	    throw(badre);
-	IoList ->
-	    case Convert of
-		iodata ->
-		    IoList;
-		binary ->
-		    case Unicode of
-			false ->
-			    iolist_to_binary(IoList);
-			true ->
-			    unicode:characters_to_binary(IoList,unicode)
-		    end;
-		list ->
-		    case Unicode of
-			false ->
-			    binary_to_list(iolist_to_binary(IoList));
-			true ->
-			    unicode:characters_to_list(IoList,unicode)
-		    end
-	    end
-    end
+    IoList = do_replace(FlatSubject,Subject,RE,FlatReplacement,NewOpt),
+	case Convert of
+	    iodata ->
+		IoList;
+	    binary ->
+		case Unicode of
+		    false ->
+			iolist_to_binary(IoList);
+		    true ->
+			unicode:characters_to_binary(IoList,unicode)
+		end;
+	    list ->
+		case Unicode of
+		    false ->
+			binary_to_list(iolist_to_binary(IoList));
+		    true ->
+			unicode:characters_to_list(IoList,unicode)
+		end
+	end
     catch
 	throw:badopt ->
 	    erlang:error(badarg,[Subject,RE,Replacement,Options]);
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index 6636a03f06..c987c224db 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -201,7 +201,7 @@ chars(C, 0, Tail) when is_integer(C) ->
 
 -spec copies(string(), non_neg_integer()) -> string().
 
-copies(CharList, Num) when is_list(CharList), Num >= 0 ->
+copies(CharList, Num) when is_list(CharList), is_integer(Num), Num >= 0 ->
     copies(CharList, Num, []).
 
 copies(_CharList, 0, R) ->
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index f5d5441184..3c5800effa 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -33,12 +33,14 @@
 -export([init/1, handle_call/3, handle_info/2, terminate/2, code_change/3]).
 -export([handle_cast/2]).
 
--export_type([child_spec/0, strategy/0]).
+%%--------------------------------------------------------------------------
+
+-export_type([child_spec/0, del_err/0, startchild_ret/0, strategy/0]).
 
 %%--------------------------------------------------------------------------
 
 -type child_id() :: pid() | 'undefined'.
--type mfargs()   :: {module(), atom(), [term()]}.
+-type mfargs()   :: {module(), atom(), [term()] | undefined}.
 -type modules()  :: [module()] | 'dynamic'.
 -type restart()  :: 'permanent' | 'transient' | 'temporary'.
 -type shutdown() :: 'brutal_kill' | timeout().
@@ -67,7 +69,7 @@
 -record(state, {name,
 		strategy               :: strategy(),
 		children = []          :: [child()],
-		dynamics = ?DICT:new() :: ?DICT(),
+		dynamics               :: ?DICT() | list(),
 		intensity              :: non_neg_integer(),
 		period                 :: pos_integer(),
 		restarts = [],
@@ -77,6 +79,10 @@
 
 -define(is_simple(State), State#state.strategy =:= simple_one_for_one).
 
+%%--------------------------------------------------------------------------
+
+-spec behaviour_info(atom()) -> 'undefined' | [{atom(), arity()}].
+
 behaviour_info(callbacks) ->
     [{init,1}];
 behaviour_info(_Other) ->
@@ -160,11 +166,13 @@ check_childspecs(X) -> {error, {badarg, X}}.
 %%% 
 %%% ---------------------------------------------------
 
+-type init_sup_name() :: sup_name() | 'self'.
+
 -type stop_rsn() :: 'shutdown' | {'bad_return', {module(),'init', term()}}
                   | {'bad_start_spec', term()} | {'start_spec', term()}
                   | {'supervisor_data', term()}.
 
--spec init({sup_name(), module(), [term()]}) ->
+-spec init({init_sup_name(), module(), [term()]}) ->
         {'ok', state()} | 'ignore' | {'stop', stop_rsn()}.
 
 init({SupName, Mod, Args}) ->
@@ -184,7 +192,7 @@ init({SupName, Mod, Args}) ->
 	Error ->
 	    {stop, {bad_return, {Mod, init, Error}}}
     end.
-	
+
 init_children(State, StartSpec) ->
     SupName = State#state.name,
     case check_startspec(StartSpec) of
@@ -275,16 +283,15 @@ do_start_child_i(M, F, A) ->
 -spec handle_call(call(), term(), state()) -> {'reply', term(), state()}.
 
 handle_call({start_child, EArgs}, _From, State) when ?is_simple(State) ->
-    #child{mfargs = {M, F, A}} = hd(State#state.children),
+    Child = hd(State#state.children),
+    #child{mfargs = {M, F, A}} = Child,
     Args = A ++ EArgs,
     case do_start_child_i(M, F, Args) of
 	{ok, Pid} ->
-	    NState = State#state{dynamics = 
-				 ?DICT:store(Pid, Args, State#state.dynamics)},
+	    NState = save_dynamic_child(Child#child.restart_type, Pid, Args, State),
 	    {reply, {ok, Pid}, NState};
 	{ok, Pid, Extra} ->
-	    NState = State#state{dynamics = 
-				 ?DICT:store(Pid, Args, State#state.dynamics)},
+	    NState = save_dynamic_child(Child#child.restart_type, Pid, Args, State),
 	    {reply, {ok, Pid, Extra}, NState};
 	What ->
 	    {reply, What, State}
@@ -343,10 +350,20 @@ handle_call({terminate_child, Name}, _From, State) ->
 	    {reply, {error, not_found}, State}
     end;
 
-handle_call(which_children, _From, State) when ?is_simple(State) ->
-    [#child{child_type = CT, modules = Mods}] = State#state.children,
+handle_call(which_children, _From, #state{children = [#child{restart_type = temporary,
+							     child_type = CT,
+							     modules = Mods}]} =
+		State) when ?is_simple(State) ->
+    Reply = lists:map(fun(Pid) -> {undefined, Pid, CT, Mods} end, dynamics_db(temporary,
+									      State#state.dynamics)),
+    {reply, Reply, State};
+
+handle_call(which_children, _From, #state{children = [#child{restart_type = RType,
+							 child_type = CT,
+							 modules = Mods}]} =
+		State) when ?is_simple(State) ->
     Reply = lists:map(fun({Pid, _}) -> {undefined, Pid, CT, Mods} end,
-		      ?DICT:to_list(State#state.dynamics)),
+		      ?DICT:to_list(dynamics_db(RType, State#state.dynamics))),
     {reply, Reply, State};
 
 handle_call(which_children, _From, State) ->
@@ -358,13 +375,31 @@ handle_call(which_children, _From, State) ->
 		  State#state.children),
     {reply, Resp, State};
 
-handle_call(count_children, _From, State) when ?is_simple(State) ->
-    [#child{child_type = CT}] = State#state.children,
+
+handle_call(count_children, _From, #state{children = [#child{restart_type = temporary,
+							     child_type = CT}]} = State)
+  when ?is_simple(State) ->
+    {Active, Count} =
+	lists:foldl(fun(Pid, {Alive, Tot}) ->
+			   if is_pid(Pid) -> {Alive+1, Tot +1};
+			      true -> {Alive, Tot + 1} end
+		   end, {0, 0}, dynamics_db(temporary, State#state.dynamics)),
+    Reply = case CT of
+		supervisor -> [{specs, 1}, {active, Active},
+			       {supervisors, Count}, {workers, 0}];
+		worker -> [{specs, 1}, {active, Active},
+			   {supervisors, 0}, {workers, Count}]
+	    end,
+    {reply, Reply, State};
+
+handle_call(count_children, _From,  #state{children = [#child{restart_type = RType,
+							      child_type = CT}]} = State)
+  when ?is_simple(State) ->
     {Active, Count} =
 	?DICT:fold(fun(Pid, _Val, {Alive, Tot}) ->
 			   if is_pid(Pid) -> {Alive+1, Tot +1};
 			      true -> {Alive, Tot + 1} end
-		   end, {0, 0}, State#state.dynamics),
+		   end, {0, 0}, dynamics_db(RType, State#state.dynamics)),
     Reply = case CT of
 		supervisor -> [{specs, 1}, {active, Active},
 			       {supervisors, Count}, {workers, 0}];
@@ -527,15 +562,11 @@ handle_start_child(Child, State) ->
 	false ->
 	    case do_start_child(State#state.name, Child) of
 		{ok, Pid} ->
-		    Children = State#state.children,
 		    {{ok, Pid},
-		     State#state{children = 
-				 [Child#child{pid = Pid}|Children]}};
+		     save_child(Child#child{pid = Pid}, State)};
 		{ok, Pid, Extra} ->
-		    Children = State#state.children,
 		    {{ok, Pid, Extra},
-		     State#state{children = 
-				 [Child#child{pid = Pid}|Children]}};
+		     save_child(Child#child{pid = Pid}, State)};
 		{error, What} ->
 		    {{error, {What, Child}}, State}
 	    end;
@@ -550,22 +581,21 @@ handle_start_child(Child, State) ->
 %%% Returns: {ok, state()} | {shutdown, state()}
 %%% ---------------------------------------------------
 
-restart_child(Pid, Reason, State) when ?is_simple(State) ->
-    case ?DICT:find(Pid, State#state.dynamics) of
+restart_child(Pid, Reason, #state{children = [Child]} = State) when ?is_simple(State) ->
+    RestartType = Child#child.restart_type,
+    case dynamic_child_args(Pid, dynamics_db(RestartType, State#state.dynamics)) of
 	{ok, Args} ->
-	    [Child] = State#state.children,
-	    RestartType = Child#child.restart_type,
 	    {M, F, _} = Child#child.mfargs,
 	    NChild = Child#child{pid = Pid, mfargs = {M, F, Args}},
 	    do_restart(RestartType, Reason, NChild, State);
 	error ->
-	    {ok, State}
+            {ok, State}
     end;
+
 restart_child(Pid, Reason, State) ->
     Children = State#state.children,
     case lists:keyfind(Pid, #child.pid, Children) of
-	#child{} = Child ->
-	    RestartType = Child#child.restart_type,
+	#child{restart_type = RestartType} = Child ->
 	    do_restart(RestartType, Reason, Child, State);
 	false ->
 	    {ok, State}
@@ -600,7 +630,8 @@ restart(Child, State) ->
 
 restart(simple_one_for_one, Child, State) ->
     #child{mfargs = {M, F, A}} = Child,
-    Dynamics = ?DICT:erase(Child#child.pid, State#state.dynamics),
+    Dynamics = ?DICT:erase(Child#child.pid, dynamics_db(Child#child.restart_type,
+							State#state.dynamics)),
     case do_start_child_i(M, F, A) of
 	{ok, Pid} ->
 	    NState = State#state{dynamics = ?DICT:store(Pid, A, Dynamics)},
@@ -660,14 +691,15 @@ terminate_children([], _SupName, Res) ->
     Res.
 
 do_terminate(Child, SupName) when Child#child.pid =/= undefined ->
-    case shutdown(Child#child.pid,
-		  Child#child.shutdown) of
-	ok ->
-	    Child#child{pid = undefined};
-	{error, OtherReason} ->
-	    report_error(shutdown_error, OtherReason, Child, SupName),
-	    Child#child{pid = undefined}
-    end;
+    case shutdown(Child#child.pid, Child#child.shutdown) of
+        ok ->
+            ok;
+        {error, normal} when Child#child.restart_type =/= permanent ->
+            ok;
+        {error, OtherReason} ->
+            report_error(shutdown_error, OtherReason, Child, SupName)
+    end,
+    Child#child{pid = undefined};
 do_terminate(Child, _SupName) ->
     Child.
 
@@ -746,8 +778,40 @@ monitor_child(Pid) ->
 %%-----------------------------------------------------------------
 %% Child/State manipulating functions.
 %%-----------------------------------------------------------------
-state_del_child(#child{pid = Pid}, State) when ?is_simple(State) ->
-    NDynamics = ?DICT:erase(Pid, State#state.dynamics),
+
+%% Note we do not want to save the parameter list for temporary processes as
+%% they will not be restarted, and hence we do not need this information.
+%% Especially for dynamic children to simple_one_for_one supervisors
+%% it could become very costly as it is not uncommon to spawn
+%% very many such processes.
+save_child(#child{restart_type = temporary,
+		  mfargs = {M, F, _}} = Child, #state{children = Children} = State) ->
+    State#state{children = [Child#child{mfargs = {M, F, undefined}} |Children]};
+save_child(Child, #state{children = Children} = State) ->
+    State#state{children = [Child |Children]}.
+
+save_dynamic_child(temporary, Pid, _, #state{dynamics = Dynamics} = State) ->
+    State#state{dynamics = [Pid | dynamics_db(temporary, Dynamics)]};
+save_dynamic_child(RestartType, Pid, Args, #state{dynamics = Dynamics} = State) ->
+    State#state{dynamics = ?DICT:store(Pid, Args, dynamics_db(RestartType, Dynamics))}.
+
+dynamics_db(temporary, undefined) ->
+    [];
+dynamics_db(_, undefined) ->
+    ?DICT:new();
+dynamics_db(_,Dynamics) ->
+    Dynamics.
+
+dynamic_child_args(_, Dynamics) when is_list(Dynamics)->
+    {ok, undefined};
+dynamic_child_args(Pid, Dynamics) ->
+    ?DICT:find(Pid, Dynamics).
+
+state_del_child(#child{pid = Pid, restart_type = temporary}, State) when ?is_simple(State) ->
+    NDynamics = lists:delete(Pid, dynamics_db(temporary, State#state.dynamics)),
+    State#state{dynamics = NDynamics};
+state_del_child(#child{pid = Pid, restart_type = RType}, State) when ?is_simple(State) ->
+    NDynamics = ?DICT:erase(Pid, dynamics_db(RType, State#state.dynamics)),
     State#state{dynamics = NDynamics};
 state_del_child(Child, State) ->
     NChildren = del_child(Child#child.name, State#state.children),
diff --git a/lib/stdlib/src/timer.erl b/lib/stdlib/src/timer.erl
index 6ee837c3e6..b456c5d6c1 100644
--- a/lib/stdlib/src/timer.erl
+++ b/lib/stdlib/src/timer.erl
@@ -22,7 +22,7 @@
 	 send_after/3, send_after/2,
 	 exit_after/3, exit_after/2, kill_after/2, kill_after/1,
 	 apply_interval/4, send_interval/3, send_interval/2,
-	 cancel/1, sleep/1, tc/3, now_diff/2,
+	 cancel/1, sleep/1, tc/2, tc/3, now_diff/2,
 	 seconds/1, minutes/1, hours/1, hms/3]).
 
 -export([start_link/0, start/0, 
@@ -33,6 +33,9 @@
 %% internal exports for test purposes only
 -export([get_status/0]).
 
+%% types which can be used by other modules
+-export_type([tref/0]).
+
 %% Max
 -define(MAX_TIMEOUT, 16#0800000).
 -define(TIMER_TAB, timer_tab).
@@ -98,6 +101,17 @@ sleep(T) ->
     after T -> ok
     end.
 
+
+%%
+%% Measure the execution time (in microseconds) for Fun(Args).
+%%
+-spec tc(function(), [_]) -> {time(), term()}.
+tc(F, A) ->
+    Before = erlang:now(),
+    Val = (catch apply(F, A)),
+    After = erlang:now(),
+    {now_diff(After, Before), Val}.
+
 %%
 %% Measure the execution time (in microseconds) for an MFA.
 %%
diff --git a/lib/stdlib/src/unicode.erl b/lib/stdlib/src/unicode.erl
index 09b1deff9c..869505ba83 100644
--- a/lib/stdlib/src/unicode.erl
+++ b/lib/stdlib/src/unicode.erl
@@ -25,8 +25,17 @@
 %%                         InEncoding is not {latin1 | unicode | utf8})
 %%
 
--export([characters_to_list/1, characters_to_list_int/2, characters_to_binary/1,characters_to_binary_int/2, characters_to_binary/3,bom_to_encoding/1, encoding_to_bom/1]).
+-export([characters_to_list/1, characters_to_list_int/2,
+	 characters_to_binary/1, characters_to_binary_int/2,
+	 characters_to_binary/3,
+	 bom_to_encoding/1, encoding_to_bom/1]).
 
+-export_type([encoding/0]).
+
+-type encoding()  :: 'latin1' | 'unicode' | 'utf8'
+                   | 'utf16' | {'utf16', endian()}
+                   | 'utf32' | {'utf32', endian()}.
+-type endian()    :: 'big' | 'little'.
 
 characters_to_list(ML) ->
     unicode:characters_to_list(ML,unicode).
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile
index 3bbd9ce318..3dd0a91870 100644
--- a/lib/stdlib/test/Makefile
+++ b/lib/stdlib/test/Makefile
@@ -133,7 +133,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) stdlib.spec stdlib.spec.vxworks $(EMAKEFILE) \
+	$(INSTALL_DATA) stdlib.spec $(EMAKEFILE) \
 		$(ERL_FILES) $(COVERFILE) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
diff --git a/lib/stdlib/test/array_SUITE.erl b/lib/stdlib/test/array_SUITE.erl
index e7cfc65be1..a8b252f081 100644
--- a/lib/stdlib/test/array_SUITE.erl
+++ b/lib/stdlib/test/array_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2010. 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
@@ -19,7 +19,7 @@
 
 -module(array_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Default timetrap timeout (set in init_per_testcase).
 %% This should be set relatively high (10-15 times the expected
@@ -27,8 +27,9 @@
 -define(default_timeout, ?t:seconds(60)).
 
 %% Test server specific exports
--export([all/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([
   	 new_test/1,
@@ -64,33 +65,37 @@
 %%
 %% all/1
 %%
-all(doc) ->
-    [];
-all(suite) ->
-    [new_test,
-     fix_test,
-     relax_test,
-     resize_test,
-     set_get_test,
-     to_list_test,
-     sparse_to_list_test,
-     from_list_test,
-     to_orddict_test,
-     sparse_to_orddict_test,
-     from_orddict_test,
-     map_test,
-     sparse_map_test,
-     foldl_test,
-     sparse_foldl_test,
-     foldr_test,
-     sparse_foldr_test
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [new_test, fix_test, relax_test, resize_test,
+     set_get_test, to_list_test, sparse_to_list_test,
+     from_list_test, to_orddict_test, sparse_to_orddict_test,
+     from_orddict_test, map_test, sparse_map_test,
+     foldl_test, sparse_foldl_test, foldr_test,
+     sparse_foldr_test].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/stdlib/test/base64_SUITE.erl b/lib/stdlib/test/base64_SUITE.erl
index 44742063b3..c64a961ffa 100644
--- a/lib/stdlib/test/base64_SUITE.erl
+++ b/lib/stdlib/test/base64_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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
@@ -18,18 +18,19 @@
 %%
 
 -module(base64_SUITE).
--author('[email protected]').
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
 
 %% Test server specific exports
--export([all/1, init_per_testcase/2, end_per_testcase/2]).
+-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]).
 
 %% Test cases must be exported.
 -export([base64_encode/1, base64_decode/1, base64_otp_5635/1,
 	 base64_otp_6279/1, big/1, illegal/1, mime_decode/1,
-	 roundtrip/1]).
+	 mime_decode_to_string/1, roundtrip/1]).
 
 init_per_testcase(_, Config) ->
     Dog = test_server:timetrap(?t:minutes(2)),
@@ -44,14 +45,29 @@ end_per_testcase(_, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-all(doc) ->
-    ["Test library functions for base64 encode and decode "
-     "(taken from inets/test/http_format_SUITE)"];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [base64_encode, base64_decode, base64_otp_5635,
-     base64_otp_6279, big, illegal, mime_decode,
+     base64_otp_6279, big, illegal, mime_decode, mime_decode_to_string,
      roundtrip].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 
 %%-------------------------------------------------------------------------
 base64_encode(doc) ->
@@ -59,7 +75,7 @@ base64_encode(doc) ->
 base64_encode(suite) ->
     [];
 base64_encode(Config) when is_list(Config) ->
-    %% Two pads 
+    %% Two pads
     <<"QWxhZGRpbjpvcGVuIHNlc2FtZQ==">> =
 	base64:encode("Aladdin:open sesame"),
     %% One pad
@@ -77,8 +93,8 @@ base64_decode(doc) ->
 base64_decode(suite) ->
     [];
 base64_decode(Config) when is_list(Config) ->
-    %% Two pads 
-    <<"Aladdin:open sesame">> = 
+    %% Two pads
+    <<"Aladdin:open sesame">> =
 	base64:decode("QWxhZGRpbjpvcGVuIHNlc2FtZQ=="),
     %% One pad
     <<"Hello World">> = base64:decode(<<"SGVsbG8gV29ybGQ=">>),
@@ -138,20 +154,85 @@ illegal(Config) when is_list(Config) ->
     {'EXIT',{function_clause, _}} = (catch base64:decode("()")),
     ok.
 %%-------------------------------------------------------------------------
+%% mime_decode and mime_decode_to_string have different implementations
+%% so test both with the same input separately. Both functions have
+%% the same implementation for binary/string arguments.
 mime_decode(doc) ->
     ["Test base64:mime_decode/1."];
 mime_decode(suite) ->
     [];
 mime_decode(Config) when is_list(Config) ->
-    %% Two pads 
-    <<"Aladdin:open sesame">> = 
+    %% Test correct padding
+    <<"one">> = base64:mime_decode(<<"b25l">>),
+    <<"on">>  = base64:mime_decode(<<"b24=">>),
+    <<"o">>   = base64:mime_decode(<<"bw==">>),
+    %% Test 1 extra padding
+    <<"one">> = base64:mime_decode(<<"b25l= =">>),
+    <<"on">>  = base64:mime_decode(<<"b24== =">>),
+    <<"o">>   = base64:mime_decode(<<"bw=== =">>),
+    %% Test 2 extra padding
+    <<"one">> = base64:mime_decode(<<"b25l===">>),
+    <<"on">>  = base64:mime_decode(<<"b24====">>),
+    <<"o">>   = base64:mime_decode(<<"bw=====">>),
+    %% Test misc embedded padding
+    <<"one">> = base64:mime_decode(<<"b2=5l===">>),
+    <<"on">>  = base64:mime_decode(<<"b=24====">>),
+    <<"o">>   = base64:mime_decode(<<"b=w=====">>),
+    %% Test misc white space and illegals with embedded padding
+    <<"one">> = base64:mime_decode(<<" b~2=\r\n5()l===">>),
+    <<"on">>  = base64:mime_decode(<<"\tb =2\"�4=�=   ==">>),
+    <<"o">>   = base64:mime_decode(<<"\nb=w=====">>),
+    %% Two pads
+    <<"Aladdin:open sesame">> =
 	base64:mime_decode("QWxhZGRpbjpvc()GVuIHNlc2FtZQ=="),
-    %% One pad, followed by ignored text
-    <<"Hello World">> = base64:mime_decode(<<"SGVsb)(G8gV29ybGQ=apa">>),
+    %% One pad to ignore, followed by more text
+    <<"Hello World!!">> = base64:mime_decode(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
+    %% No pad
+    <<"Aladdin:open sesam">> =
+	base64:mime_decode("QWxhZGRpbjpvcG�\")(VuIHNlc2Ft"),
+    %% Encoded base 64 strings may be divided by non base 64 chars.
+    %% In this cases whitespaces.
+    <<"0123456789!@#0^&*();:<>,. []{}">> =
+	base64:mime_decode(
+	  <<"MDEy MzQ1Njc4 \tOSFAIzBeJ \nio)(oKTs6 PD4sLi \r\nBbXXt9">>),
+    ok.
+
+%%-------------------------------------------------------------------------
+
+%% Repeat of mime_decode() tests
+mime_decode_to_string(doc) ->
+    ["Test base64:mime_decode_to_string/1."];
+mime_decode_to_string(suite) ->
+    [];
+mime_decode_to_string(Config) when is_list(Config) ->
+    %% Test correct padding
+    "one" = base64:mime_decode_to_string(<<"b25l">>),
+    "on"  = base64:mime_decode_to_string(<<"b24=">>),
+    "o"   = base64:mime_decode_to_string(<<"bw==">>),
+    %% Test 1 extra padding
+    "one" = base64:mime_decode_to_string(<<"b25l= =">>),
+    "on"  = base64:mime_decode_to_string(<<"b24== =">>),
+    "o"   = base64:mime_decode_to_string(<<"bw=== =">>),
+    %% Test 2 extra padding
+    "one" = base64:mime_decode_to_string(<<"b25l===">>),
+    "on"  = base64:mime_decode_to_string(<<"b24====">>),
+    "o"   = base64:mime_decode_to_string(<<"bw=====">>),
+    %% Test misc embedded padding
+    "one" = base64:mime_decode_to_string(<<"b2=5l===">>),
+    "on"  = base64:mime_decode_to_string(<<"b=24====">>),
+    "o"   = base64:mime_decode_to_string(<<"b=w=====">>),
+    %% Test misc white space and illegals with embedded padding
+    "one" = base64:mime_decode_to_string(<<" b~2=\r\n5()l===">>),
+    "on"  = base64:mime_decode_to_string(<<"\tb =2\"�4=�=   ==">>),
+    "o"   = base64:mime_decode_to_string(<<"\nb=w=====">>),
+    %% Two pads
+    "Aladdin:open sesame" =
+	base64:mime_decode_to_string("QWxhZGRpbjpvc()GVuIHNlc2FtZQ=="),
+    %% One pad to ignore, followed by more text
+    "Hello World!!" = base64:mime_decode_to_string(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
     %% No pad
     "Aladdin:open sesam" = 
 	base64:mime_decode_to_string("QWxhZGRpbjpvcG�\")(VuIHNlc2Ft"),
-
     %% Encoded base 64 strings may be divided by non base 64 chars.
     %% In this cases whitespaces.
     "0123456789!@#0^&*();:<>,. []{}" =
@@ -159,6 +240,7 @@ mime_decode(Config) when is_list(Config) ->
 	  <<"MDEy MzQ1Njc4 \tOSFAIzBeJ \nio)(oKTs6 PD4sLi \r\nBbXXt9">>),
     ok.
 
+%%-------------------------------------------------------------------------
 
 roundtrip(Config) when is_list(Config) ->
     Sizes = lists:seq(1, 255) ++ lists:seq(2400-5, 2440),
diff --git a/lib/stdlib/test/beam_lib_SUITE.erl b/lib/stdlib/test/beam_lib_SUITE.erl
index bc867a3770..994abebc1a 100644
--- a/lib/stdlib/test/beam_lib_SUITE.erl
+++ b/lib/stdlib/test/beam_lib_SUITE.erl
@@ -1,6 +1,19 @@
 %%
 %% %CopyrightBegin%
 %%
+%% Copyright Ericsson AB 1997-2010. 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(beam_lib_SUITE).
@@ -14,25 +27,45 @@
 -define(t,test_server).
 -define(privdir, "beam_lib_SUITE_priv").
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(format(S, A), ok).
 -define(privdir, ?config(priv_dir, Conf)).
 -endif.
 
--export([all/1, normal/1, error/1, cmp/1, cmp_literals/1, strip/1, otp_6711/1,
+-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,
          building/1, md5/1, encrypted_abstr/1, encrypted_abstr_file/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [error, normal, cmp, cmp_literals, strip, otp_6711,
+     building, md5, encrypted_abstr, encrypted_abstr_file].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) ->
-    [error, normal, cmp, cmp_literals, strip, otp_6711, building, md5,
-     encrypted_abstr, encrypted_abstr_file].
 
 init_per_testcase(_Case, Config) ->
     Dog=?t:timetrap(?t:minutes(2)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/stdlib/test/binary_module_SUITE.erl b/lib/stdlib/test/binary_module_SUITE.erl
index 16ed9a2c26..f6bf874741 100644
--- a/lib/stdlib/test/binary_module_SUITE.erl
+++ b/lib/stdlib/test/binary_module_SUITE.erl
@@ -1,6 +1,26 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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(binary_module_SUITE).
 
--export([all/1, interesting/1,random_ref_comp/1,random_ref_sr_comp/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 interesting/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]).
 
@@ -16,8 +36,8 @@
 
 -else.
 
--include("test_server.hrl").
--export([init_per_testcase/2, fin_per_testcase/2]).
+-include_lib("test_server/include/test_server.hrl").
+-export([init_per_testcase/2, end_per_testcase/2]).
 % Default timetrap timeout (set in init_per_testcase).
 % Some of these testcases are really heavy...
 -define(default_timeout, ?t:minutes(20)).
@@ -38,15 +58,35 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     ?line Dog = ?config(watchdog, Config),
     ?line test_server:timetrap_cancel(Dog),
     ok.
 -endif.
 
-all(suite) -> [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].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [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].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 -define(MASK_ERROR(EXPR),mask_error((catch (EXPR)))).
 
@@ -186,7 +226,7 @@ badargs(Config) when is_list(Config) ->
 	   binary:match(<<1,2,3>>,
 			{ac,ets:match_spec_compile([{'_',[],['$_']}])},
 			[{scope,{0,1}}])),
-     ?line nomatch =
+     ?line [] =
 	?MASK_ERROR(binary:matches(<<1,2,3>>,<<1>>,[{scope,{0,0}}])),
     ?line badarg =
 	?MASK_ERROR(binary:matches(<<1,2,3>>,{bm,<<>>},[{scope,{0,1}}])),
diff --git a/lib/stdlib/test/c_SUITE.erl b/lib/stdlib/test/c_SUITE.erl
index 2edbc7ab4c..e4c794ca84 100644
--- a/lib/stdlib/test/c_SUITE.erl
+++ b/lib/stdlib/test/c_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -17,18 +17,36 @@
 %% %CopyrightEnd%
 %%
 -module(c_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([c_1/1, c_2/1, c_3/1, c_4/1, nc_1/1, nc_2/1, nc_3/1, nc_4/1,
          memory/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -import(c, [c/2, nc/2]).
 
-all(doc) -> ["Test cases for the 'c' module."];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [c_1, c_2, c_3, c_4, nc_1, nc_2, nc_3, nc_4, memory].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%% Write output to a directory other than current directory:
 
 c_1(doc) ->
diff --git a/lib/stdlib/test/calendar_SUITE.erl b/lib/stdlib/test/calendar_SUITE.erl
index 10fb72c1b1..8192d035ca 100644
--- a/lib/stdlib/test/calendar_SUITE.erl
+++ b/lib/stdlib/test/calendar_SUITE.erl
@@ -18,29 +18,43 @@
 %%
 -module(calendar_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, 
+-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,
 	 gregorian_seconds/1,
 	 day_of_the_week/1,
 	 day_of_the_week_calibrate/1,
 	 leap_years/1,
 	 last_day_of_the_month/1,
-	 local_time_to_universal_time_dst/1]).
+	 local_time_to_universal_time_dst/1,
+	 iso_week_number/1]).
 
 -define(START_YEAR, 1947).			
 -define(END_YEAR, 2012).
 
-all(suite) -> [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];
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all(doc) -> "This is the test suite for calendar.erl".
+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].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 gregorian_days(doc) ->
     "Tests that date_to_gregorian_days and gregorian_days_to_date "
@@ -156,6 +170,15 @@ local_time_to_universal_time_dst_x(Config) when is_list(Config) ->
 	    {comment,"Bug in mktime() in this OS"}
     end.
 
+iso_week_number(doc) ->
+	"Test the iso week number calculation for all three possibilities."
+	" When the date falls on the last week of the previous year,"
+	" when the date falls on a week within the given year and finally,"
+	" when the date falls on the first week of the next year.";
+iso_week_number(suite) ->
+	[];
+iso_week_number(Config) when is_list(Config) ->
+	?line check_iso_week_number().
 
 %%
 %% LOCAL FUNCTIONS
@@ -245,7 +268,12 @@ check_last_day_of_the_month({SYr, SMon}, {EYr, EMon}) when SYr < EYr ->
 check_last_day_of_the_month(_, _) ->
     ok.
 
-
+%% check_iso_week_number
+%%
+check_iso_week_number() ->
+    ?line {2004, 53} = calendar:iso_week_number({2005, 1, 1}),
+    ?line {2007, 1} = calendar:iso_week_number({2007, 1, 1}),
+    ?line {2009, 1} = calendar:iso_week_number({2008, 12, 29}).
     
 
 
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index 760e610e00..a37822ea9d 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -28,13 +28,15 @@
 -define(privdir(_), "./dets_SUITE_priv").
 -define(datadir(_), "./dets_SUITE_data").
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(format(S, A), ok).
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -define(datadir(Conf), ?config(data_dir, Conf)).
 -endif.
 
--export([all/1, not_run/1, newly_started/1, basic_v8/1, basic_v9/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 not_run/1, newly_started/1, basic_v8/1, basic_v9/1,
 	 open_v8/1, open_v9/1, sets_v8/1, sets_v9/1, bags_v8/1,
 	 bags_v9/1, duplicate_bags_v8/1, duplicate_bags_v9/1,
 	 access_v8/1, access_v9/1, dirty_mark/1, dirty_mark2/1,
@@ -50,13 +52,14 @@
 	 otp_4208/1, otp_4989/1, many_clients/1, otp_4906/1, otp_5402/1,
          simultaneous_open/1, insert_new/1, repair_continuation/1,
          otp_5487/1, otp_6206/1, otp_6359/1, otp_4738/1, otp_7146/1,
-         otp_8070/1]).
+         otp_8070/1, otp_8856/1, otp_8898/1, otp_8899/1, otp_8903/1,
+         otp_8923/1]).
 
 -export([dets_dirty_loop/0]).
 
 -export([histogram/1, sum_histogram/1, ave_histogram/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Internal export.
 -export([client/2]).
@@ -82,35 +85,51 @@ init_per_testcase(_Case, Config) ->
     Dog=?t:timetrap(?t:minutes(15)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, _Config) ->
+end_per_testcase(_Case, _Config) ->
     Dog=?config(watchdog, _Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     case os:type() of
-	vxworks ->
-	    [not_run];
+	vxworks -> [not_run];
 	_ ->
-	    {req,[stdlib],
-	     [basic_v8, basic_v9, open_v8, open_v9, sets_v8, sets_v9,
-	      bags_v8, bags_v9, duplicate_bags_v8, duplicate_bags_v9,
-	      newly_started, open_file_v8, open_file_v9,
-	      init_table_v8, init_table_v9, repair_v8, repair_v9,
-	      access_v8, access_v9, oldbugs_v8, oldbugs_v9,
-	      unsafe_assumptions, truncated_segment_array_v8,
-	      truncated_segment_array_v9, dirty_mark, dirty_mark2,
-	      bag_next_v8, bag_next_v9, hash_v8b_v8c, phash, fold_v8,
-	      fold_v9, fixtable_v8, fixtable_v9, match_v8, match_v9,
-	      select_v8, select_v9, update_counter, badarg,
-	      cache_sets_v8, cache_sets_v9, cache_bags_v8,
-	      cache_bags_v9, cache_duplicate_bags_v8,
-	      cache_duplicate_bags_v9, otp_4208, otp_4989, many_clients,
-              otp_4906, otp_5402, simultaneous_open, insert_new, 
-              repair_continuation, otp_5487, otp_6206, otp_6359, otp_4738,
-              otp_7146, otp_8070]} 
+	    [basic_v8, basic_v9, open_v8, open_v9, sets_v8, sets_v9,
+	     bags_v8, bags_v9, duplicate_bags_v8, duplicate_bags_v9,
+	     newly_started, open_file_v8, open_file_v9,
+	     init_table_v8, init_table_v9, repair_v8, repair_v9,
+	     access_v8, access_v9, oldbugs_v8, oldbugs_v9,
+	     unsafe_assumptions, truncated_segment_array_v8,
+	     truncated_segment_array_v9, dirty_mark, dirty_mark2,
+	     bag_next_v8, bag_next_v9, hash_v8b_v8c, phash, fold_v8,
+	     fold_v9, fixtable_v8, fixtable_v9, match_v8, match_v9,
+	     select_v8, select_v9, update_counter, badarg,
+	     cache_sets_v8, cache_sets_v9, cache_bags_v8,
+	     cache_bags_v9, cache_duplicate_bags_v8,
+	     cache_duplicate_bags_v9, otp_4208, otp_4989,
+	     many_clients, otp_4906, otp_5402, simultaneous_open,
+	     insert_new, repair_continuation, otp_5487, otp_6206,
+	     otp_6359, otp_4738, otp_7146, otp_8070, otp_8856, otp_8898,
+	     otp_8899, otp_8903, otp_8923]
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 not_run(suite) -> [];
 not_run(Conf) when is_list(Conf) ->
     {comment, "Not runnable VxWorks/NFS"}.
@@ -2935,6 +2954,57 @@ ets_init(Tab, N) ->
     ets:insert(Tab, {N,N}),
     ets_init(Tab, N - 1).
 
+otp_8898(doc) ->
+    ["OTP-8898. Truncated Dets file."];
+otp_8898(suite) ->
+    [];
+otp_8898(Config) when is_list(Config) ->
+    Tab = otp_8898,
+    ?line FName = filename(Tab, Config),
+
+    Server = self(),
+
+    ?line file:delete(FName),
+    ?line {ok, _} = dets:open_file(Tab,[{file, FName}]),
+    ?line [P1,P2,P3] = new_clients(3, Tab),
+
+    Seq = [{P1,[sync]},{P2,[{lookup,1,[]}]},{P3,[{insert,{1,b}}]}],
+    ?line atomic_requests(Server, Tab, [[]], Seq),
+    ?line true = get_replies([{P1,ok},{P2,ok},{P3,ok}]),
+    ?line ok = dets:close(Tab),
+    ?line {ok, _} = dets:open_file(Tab,[{file, FName}]),
+    ?line file:delete(FName),
+
+    ok.
+
+otp_8899(doc) ->
+    ["OTP-8899. Several clients. Updated Head was ignored."];
+otp_8899(suite) ->
+    [];
+otp_8899(Config) when is_list(Config) ->
+    Tab = many_clients,
+    ?line FName = filename(Tab, Config),
+
+    Server = self(),
+
+    ?line file:delete(FName),
+    ?line {ok, _} = dets:open_file(Tab,[{file, FName},{version,9}]),
+    ?line [P1,P2,P3,P4] = new_clients(4, Tab),
+
+    MC = [Tab],
+    Seq6a = [{P1,[{insert,[{used_to_be_skipped_by,match}]},
+                  {lookup,1,[{1,a}]}]},
+             {P2,[{verbose,true,MC}]},
+             {P3,[{lookup,1,[{1,a}]}]}, {P4,[{verbose,true,MC}]}],
+    ?line atomic_requests(Server, Tab, [[{1,a},{2,b},{3,c}]], Seq6a),
+    ?line true = get_replies([{P1,ok}, {P2,ok}, {P3,ok}, {P4,ok}]),
+    ?line [{1,a},{2,b},{3,c},{used_to_be_skipped_by,match}] =
+        lists:sort(dets:match_object(Tab, '_')),
+    ?line _ = dets:close(Tab),
+    ?line file:delete(FName),
+
+    ok.
+
 many_clients(doc) ->
     ["Several clients accessing a table simultaneously."];
 many_clients(suite) ->
@@ -3071,6 +3141,11 @@ client(S, Tab) ->
 
 eval([], _Tab) ->
     ok;
+eval([{verbose,Bool,Expected} | L], Tab) ->
+    ?line case dets:verbose(Bool) of
+	      Expected -> eval(L, Tab);
+	      Error -> {error, {verbose,Error}}
+	  end;
 eval([sync | L], Tab) ->
     ?line case dets:sync(Tab) of
 	      ok -> eval(L, Tab);
@@ -3701,6 +3776,87 @@ otp_8070(Config) when is_list(Config) ->
     file:delete(File),
     ok.
 
+otp_8856(doc) ->
+    ["OTP-8856. insert_new() bug."];
+otp_8856(suite) ->
+    [];
+otp_8856(Config) when is_list(Config) ->
+    Tab = otp_8856,
+    File = filename(Tab, Config),
+    file:delete(File),
+    Me = self(),
+    ?line {ok, _} = dets:open_file(Tab, [{type, bag}, {file, File}]),
+    spawn(fun()-> Me ! {1, dets:insert(Tab, [])} end),
+    spawn(fun()-> Me ! {2, dets:insert_new(Tab, [])} end),
+    ?line ok = dets:close(Tab),
+    ?line receive {1, ok} -> ok end,
+    ?line receive {2, true} -> ok end,
+    file:delete(File),
+
+    ?line {ok, _} = dets:open_file(Tab, [{type, set}, {file, File}]),
+    spawn(fun() -> dets:delete(Tab, 0) end),
+    spawn(fun() -> Me ! {3, dets:insert_new(Tab, {0,0})} end),
+    ?line ok = dets:close(Tab),
+    ?line receive {3, true} -> ok end,
+    file:delete(File),
+    ok.
+
+otp_8903(doc) ->
+    ["OTP-8903. bchunk/match/select bug."];
+otp_8903(suite) ->
+    [];
+otp_8903(Config) when is_list(Config) ->
+    Tab = otp_8903,
+    File = filename(Tab, Config),
+    ?line {ok,T} = dets:open_file(bug, [{file,File}]),
+    ?line ok = dets:insert(T, [{1,a},{2,b},{3,c}]),
+    ?line dets:safe_fixtable(T, true),
+    ?line {[_],C1} = dets:match_object(T, '_', 1),
+    ?line {BC1,_D} = dets:bchunk(T, start),
+    ?line ok = dets:close(T),
+    ?line {'EXIT', {badarg, _}} = (catch {foo,dets:match_object(C1)}),
+    ?line {'EXIT', {badarg, _}} = (catch {foo,dets:bchunk(T, BC1)}),
+    ?line {ok,T} = dets:open_file(bug, [{file,File}]),
+    ?line false = dets:info(T, safe_fixed),
+    ?line {'EXIT', {badarg, _}} = (catch {foo,dets:match_object(C1)}),
+    ?line {'EXIT', {badarg, _}} = (catch {foo,dets:bchunk(T, BC1)}),
+    ?line ok = dets:close(T),
+    file:delete(File),
+    ok.
+
+otp_8923(doc) ->
+    ["OTP-8923. rehash due to lookup after initialization."];
+otp_8923(suite) ->
+    [];
+otp_8923(Config) when is_list(Config) ->
+    Tab = otp_8923,
+    File = filename(Tab, Config),
+    %% Create a file with more than 256 keys:
+    file:delete(File),
+    Bin = list_to_binary([ 0 || _ <- lists:seq(1, 400) ]),
+    BigBin = list_to_binary([ 0 ||_ <- lists:seq(1, 4000)]),
+    Ets = ets:new(temp, [{keypos,1}]),
+    ?line [ true = ets:insert(Ets, {C,Bin}) || C <- lists:seq(1, 700) ],
+    ?line true = ets:insert(Ets, {helper_data,BigBin}),
+    ?line true = ets:insert(Ets, {prim_btree,BigBin}),
+    ?line true = ets:insert(Ets, {sec_btree,BigBin}),
+    %% Note: too few slots; re-hash will take place
+    ?line {ok, Tab} = dets:open_file(Tab, [{file,File}]),
+    ?line Tab = ets:to_dets(Ets, Tab),
+    ?line ok = dets:close(Tab),
+    ?line true = ets:delete(Ets),
+    
+    ?line {ok,Ref} = dets:open_file(File),
+    ?line [{1,_}] = dets:lookup(Ref, 1),
+    ?line ok = dets:close(Ref),
+
+    ?line {ok,Ref2} = dets:open_file(File),
+    ?line [{helper_data,_}] = dets:lookup(Ref2, helper_data),
+    ?line ok = dets:close(Ref2),
+
+    file:delete(File),
+    ok.
+
 %%
 %% Parts common to several test cases
 %% 
diff --git a/lib/stdlib/test/dict_SUITE.erl b/lib/stdlib/test/dict_SUITE.erl
index 6a90870bda..396a8d4763 100644
--- a/lib/stdlib/test/dict_SUITE.erl
+++ b/lib/stdlib/test/dict_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -22,21 +22,41 @@
 
 -module(dict_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 create/1,store/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -import(lists, [foldl/3,reverse/1]).
 
-all(suite) ->
-    [create,store].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [create, store].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?t:minutes(5)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/stdlib/test/dict_test_lib.erl b/lib/stdlib/test/dict_test_lib.erl
index fd15baa5ff..92a75dad89 100644
--- a/lib/stdlib/test/dict_test_lib.erl
+++ b/lib/stdlib/test/dict_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
diff --git a/lib/stdlib/test/digraph_SUITE.erl b/lib/stdlib/test/digraph_SUITE.erl
index 6ef5b1ddef..4e7c468097 100644
--- a/lib/stdlib/test/digraph_SUITE.erl
+++ b/lib/stdlib/test/digraph_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -23,19 +23,41 @@
 -ifdef(STANDALONE).
 -define(line, put(line, ?LINE), ).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -endif.
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
--export([opts/1, degree/1, path/1, cycle/1, misc/1, vertices/1,
-	 edges/1, data/1, tickets/1, otp_3522/1, otp_3630/1, otp_8066/1]).
+-export([opts/1, degree/1, path/1, cycle/1, vertices/1,
+	 edges/1, data/1, otp_3522/1, otp_3630/1, otp_8066/1]).
 
 -export([spawn_graph/2]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) -> {req, [stdlib], [opts, degree, path, cycle, misc, tickets]}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [opts, degree, path, cycle, {group, misc},
+     {group, tickets}].
+
+groups() -> 
+    [{misc, [], [vertices, edges, data]},
+     {tickets, [], [otp_3522, otp_3630, otp_8066]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -147,7 +169,6 @@ cycle(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-misc(suite) -> [vertices, edges, data].
 
 vertices(doc) -> [];
 vertices(suite) -> [];
@@ -210,7 +231,6 @@ data(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-tickets(suite) -> [otp_3522, otp_3630, otp_8066].
 
 otp_3522(doc) -> [];
 otp_3522(suite) -> [];
diff --git a/lib/stdlib/test/digraph_utils_SUITE.erl b/lib/stdlib/test/digraph_utils_SUITE.erl
index d6d477b388..28daf0f0fb 100644
--- a/lib/stdlib/test/digraph_utils_SUITE.erl
+++ b/lib/stdlib/test/digraph_utils_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -22,10 +22,11 @@
 -ifdef(debug).
 -define(line, put(line, ?LINE), ).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -endif.
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([simple/1, loop/1, isolated/1, topsort/1, subgraph/1, 
          condensation/1, tree/1]).
@@ -33,8 +34,27 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) -> {req, [stdlib], [simple, loop, isolated, topsort, 
-			       subgraph, condensation, tree]}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [simple, loop, isolated, topsort, subgraph,
+     condensation, tree].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/stdlib/test/dummy_h.erl b/lib/stdlib/test/dummy_h.erl
index 01eb790a75..7546fe78a0 100644
--- a/lib/stdlib/test/dummy_h.erl
+++ b/lib/stdlib/test/dummy_h.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
diff --git a/lib/stdlib/test/edlin_expand_SUITE.erl b/lib/stdlib/test/edlin_expand_SUITE.erl
index 613bfd000e..514d22c4d2 100644
--- a/lib/stdlib/test/edlin_expand_SUITE.erl
+++ b/lib/stdlib/test/edlin_expand_SUITE.erl
@@ -17,13 +17,14 @@
 %% %CopyrightEnd%
 %%
 -module(edlin_expand_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([normal/1, quoted_fun/1, quoted_module/1, quoted_both/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -31,16 +32,36 @@
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(doc) ->
-    ["Test cases for edlin_expand."];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [normal, quoted_fun, quoted_module, quoted_both].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    true = code:delete(expand_test),
+    true = code:delete(expand_test1),
+    true = code:delete('ExpandTestCaps'),
+    true = code:delete('ExpandTestCaps1'),
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 normal(doc) ->
     [""];
 normal(suite) ->
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index e31dfdd764..195eeb5e89 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -17,14 +17,15 @@
 %% %CopyrightEnd%
 
 -module(epp_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([rec_1/1, predef_mac/1,
-	 upcase_mac/1, upcase_mac_1/1, upcase_mac_2/1,
-	 variable/1, variable_1/1, otp_4870/1, otp_4871/1, otp_5362/1,
+	 upcase_mac_1/1, upcase_mac_2/1,
+	 variable_1/1, otp_4870/1, otp_4871/1, otp_5362/1,
          pmod/1, not_circular/1, skip_header/1, otp_6277/1, otp_7702/1,
          otp_8130/1, overload_mac/1, otp_8388/1, otp_8470/1, otp_8503/1,
-         otp_8562/1, otp_8665/1]).
+         otp_8562/1, otp_8665/1, otp_8911/1]).
 
 -export([epp_parse_erl_form/2]).
 
@@ -44,8 +45,8 @@ config(priv_dir, _) ->
 config(data_dir, _) ->
     filename:absname("./epp_SUITE_data").
 -else.
--include("test_server.hrl").
--export([init_per_testcase/2, fin_per_testcase/2]).
+-include_lib("test_server/include/test_server.hrl").
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -53,18 +54,36 @@ config(data_dir, _) ->
 init_per_testcase(_, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
-fin_per_testcase(_, Config) ->
+end_per_testcase(_, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 -endif.
 
-all(doc) ->
-    ["Test cases for epp."];
-all(suite) ->
-    [rec_1, upcase_mac, predef_mac, variable, otp_4870, otp_4871, otp_5362,
-     pmod, not_circular, skip_header, otp_6277, otp_7702, otp_8130,
-     overload_mac, otp_8388, otp_8470, otp_8503, otp_8562, otp_8665].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [rec_1, {group, upcase_mac}, predef_mac,
+     {group, variable}, otp_4870, otp_4871, otp_5362, pmod,
+     not_circular, skip_header, otp_6277, otp_7702, otp_8130,
+     overload_mac, otp_8388, otp_8470, otp_8503, otp_8562,
+     otp_8665, otp_8911].
+
+groups() -> 
+    [{upcase_mac, [], [upcase_mac_1, upcase_mac_2]},
+     {variable, [], [variable_1]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 rec_1(doc) ->
     ["Recursive macros hang or crash epp (OTP-1398)."];
@@ -127,10 +146,6 @@ check_errors([{error, Info} | Rest]) ->
 check_errors([_ | Rest]) ->
     check_errors(Rest).
 
-upcase_mac(doc) ->
-    ["Check that uppercase macro names are implicitly quoted (OTP-2608)"];
-upcase_mac(suite) ->
-    [upcase_mac_1, upcase_mac_2].
 
 upcase_mac_1(doc) ->
     [];
@@ -176,10 +191,6 @@ predef_mac(Config) when is_list(Config) ->
           end,
     ok.
 
-variable(doc) ->
-    ["Check variable as first file component of the include directives."];
-variable(suite) ->
-    [variable_1].
 
 variable_1(doc) ->
     [];
@@ -1197,6 +1208,40 @@ otp_8562(Config) when is_list(Config) ->
     ?line [] = compile(Config, Cs),
     ok.
 
+otp_8911(doc) ->
+    ["OTP-8911. -file and file inclusion bug"];
+otp_8911(suite) ->
+    [];
+otp_8911(Config) when is_list(Config) ->
+    ?line {ok, CWD} = file:get_cwd(),
+    ?line ok = file:set_cwd(?config(priv_dir, Config)),
+
+    File = "i.erl",
+    Cont = <<"-module(i).
+              -compile(export_all).
+              -file(\"fil1\", 100).
+              -include(\"i1.erl\").
+              t() ->
+                  a.
+           ">>,
+    ?line ok = file:write_file(File, Cont),
+    Incl = <<"-file(\"fil2\", 35).
+              t1() ->
+                  b.
+           ">>,
+    File1 = "i1.erl",
+    ?line ok = file:write_file(File1, Incl),
+
+    ?line {ok, i} = cover:compile(File),
+    ?line a = i:t(),
+    ?line {ok,[{{i,6},1}]} = cover:analyse(i, calls, line),
+    ?line cover:stop(),
+
+    file:delete(File),
+    file:delete(File1),
+    ?line file:set_cwd(CWD),
+    ok.
+
 otp_8665(doc) ->
     ["OTP-8665. Bugfix premature end."];
 otp_8665(suite) ->
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index c60a558fa1..6277b2c52e 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -17,7 +17,8 @@
 %% %CopyrightEnd%
 
 -module(erl_eval_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([guard_1/1, guard_2/1,
 	 match_pattern/1,
@@ -38,7 +39,8 @@
          otp_8133/1,
          funs/1,
 	 try_catch/1,
-	 eval_expr_5/1]).
+	 eval_expr_5/1,
+	 zero_width/1]).
 
 %%
 %% Define to run outside of test server
@@ -57,26 +59,42 @@
 config(priv_dir,_) ->
     ".".
 -else.
--include("test_server.hrl").
--export([init_per_testcase/2, fin_per_testcase/2]).
+-include_lib("test_server/include/test_server.hrl").
+-export([init_per_testcase/2, end_per_testcase/2]).
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 -endif.
 
-all(doc) ->
-    ["Test cases for the 'erl_eval' module."];
-all(suite) ->
-    [guard_1, guard_2, match_pattern, string_plusplus, pattern_expr,
-     match_bin, guard_3, guard_4, 
-     lc, simple_cases, unary_plus, apply_atom, otp_5269, otp_6539, otp_6543,
-     otp_6787, otp_6977, otp_7550, otp_8133, funs, try_catch, eval_expr_5].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [guard_1, guard_2, match_pattern, string_plusplus,
+     pattern_expr, match_bin, guard_3, guard_4, lc,
+     simple_cases, unary_plus, apply_atom, otp_5269,
+     otp_6539, otp_6543, otp_6787, otp_6977, otp_7550,
+     otp_8133, funs, try_catch, eval_expr_5, zero_width].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 guard_1(doc) ->
     ["(OTP-2405)"];
@@ -1326,6 +1344,14 @@ eval_expr_5(Config) when is_list(Config) ->
 	    ok
     end.
 
+zero_width(Config) when is_list(Config) ->
+    ?line check(fun() ->
+			{'EXIT',{badarg,_}} = (catch <<not_a_number:0>>),
+			ok
+		end, "begin {'EXIT',{badarg,_}} = (catch <<not_a_number:0>>), "
+		"ok end.", ok),
+    ok.
+
 %% Check the string in different contexts: as is; in fun; from compiled code.
 check(F, String, Result) ->
     check1(F, String, Result),
diff --git a/lib/stdlib/test/erl_eval_helper.erl b/lib/stdlib/test/erl_eval_helper.erl
index 7fdbabcb17..6863b40108 100644
--- a/lib/stdlib/test/erl_eval_helper.erl
+++ b/lib/stdlib/test/erl_eval_helper.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
diff --git a/lib/stdlib/test/erl_expand_records_SUITE.erl b/lib/stdlib/test/erl_expand_records_SUITE.erl
index 1d621c65df..44c986640f 100644
--- a/lib/stdlib/test/erl_expand_records_SUITE.erl
+++ b/lib/stdlib/test/erl_expand_records_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2010. 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
@@ -27,15 +27,17 @@
 -define(privdir, "erl_expand_records_SUITE_priv").
 -define(t, test_server).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(privdir, ?config(priv_dir, Config)).
 -endif.
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([abstract_module/1, attributes/1, expr/1, guard/1,
          init/1, pattern/1, strict/1, update/1,
-         tickets/1, otp_5915/1, otp_7931/1, otp_5990/1,
+	 otp_5915/1, otp_7931/1, otp_5990/1,
 	 otp_7078/1, otp_7101/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
@@ -45,14 +47,33 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, _Config) ->
+end_per_testcase(_Case, _Config) ->
     Dog = ?config(watchdog, _Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    [abstract_module, attributes, expr, guard, init, pattern, 
-     strict, update, tickets].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [abstract_module, attributes, expr, guard, init,
+     pattern, strict, update, {group, tickets}].
+
+groups() -> 
+    [{tickets, [],
+      [otp_5915, otp_7931, otp_5990, otp_7078, otp_7101]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 abstract_module(doc) ->
     "Compile an abstract module.";
@@ -399,8 +420,6 @@ update(Config) when is_list(Config) ->
     ?line run(Config, Ts),
     ok.
     
-tickets(suite) ->
-    [otp_5915, otp_7931, otp_5990, otp_7078, otp_7101].
 
 otp_5915(doc) ->
     "Strict record tests in guards.";
diff --git a/lib/stdlib/test/erl_internal_SUITE.erl b/lib/stdlib/test/erl_internal_SUITE.erl
index 8f675c94ec..678e22c252 100644
--- a/lib/stdlib/test/erl_internal_SUITE.erl
+++ b/lib/stdlib/test/erl_internal_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -18,15 +18,35 @@
 %%
 -module(erl_internal_SUITE).
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([behav/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [behav].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> [behav].
 
 -define(default_timeout, ?t:minutes(2)).
 
@@ -34,7 +54,7 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 01f494ee38..f980d52e4e 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-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2011. 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
@@ -27,34 +27,37 @@
 -define(privdir, "erl_lint_SUITE_priv").
 -define(t, test_server).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(datadir, ?config(data_dir, Conf)).
 -define(privdir, ?config(priv_dir, Conf)).
 -endif.
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
-
--export([unused_vars_warn/1, 
-             unused_vars_warn_basic/1, 
-             unused_vars_warn_lc/1, 
-             unused_vars_warn_rec/1,
-             unused_vars_warn_fun/1, 
-             unused_vars_OTP_4858/1,
-         export_vars_warn/1,
-	 shadow_vars/1,
-	 unused_import/1,
-	 unused_function/1,
-         unsafe_vars/1,unsafe_vars2/1,
-	 unsafe_vars_try/1,
-         guard/1, otp_4886/1, otp_4988/1, otp_5091/1, otp_5276/1, otp_5338/1,
-         otp_5362/1, otp_5371/1, otp_7227/1, otp_5494/1, otp_5644/1, otp_5878/1,
-         otp_5917/1, otp_6585/1, otp_6885/1, export_all/1,
-	 bif_clash/1,
-	 behaviour_basic/1, behaviour_multiple/1,
-	 otp_7550/1,
-         otp_8051/1,
-	 format_warn/1,
-	 on_load/1, on_load_successful/1, on_load_failing/1
+-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([ 
+	  unused_vars_warn_basic/1, 
+	  unused_vars_warn_lc/1, 
+	  unused_vars_warn_rec/1,
+	  unused_vars_warn_fun/1, 
+	  unused_vars_OTP_4858/1,
+	  export_vars_warn/1,
+	  shadow_vars/1,
+	  unused_import/1,
+	  unused_function/1,
+	  unsafe_vars/1,unsafe_vars2/1,
+	  unsafe_vars_try/1,
+	  guard/1, otp_4886/1, otp_4988/1, otp_5091/1, otp_5276/1, otp_5338/1,
+	  otp_5362/1, otp_5371/1, otp_7227/1, otp_5494/1, otp_5644/1, otp_5878/1,
+	  otp_5917/1, otp_6585/1, otp_6885/1, export_all/1,
+	  bif_clash/1,
+	  behaviour_basic/1, behaviour_multiple/1,
+	  otp_7550/1,
+	  otp_8051/1,
+	  format_warn/1,
+	  on_load_successful/1, on_load_failing/1, 
+	  too_many_arguments/1
         ]).
 
 % Default timetrap timeout (set in init_per_testcase).
@@ -64,24 +67,44 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, _Config) ->
+end_per_testcase(_Case, _Config) ->
     Dog = ?config(watchdog, _Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    [unused_vars_warn, export_vars_warn, 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, unused_vars_warn}, export_vars_warn,
      shadow_vars, unused_import, unused_function,
-     unsafe_vars, unsafe_vars2, unsafe_vars_try,
-     guard, otp_4886, otp_4988, otp_5091, otp_5276, otp_5338, 
-     otp_5362, otp_5371, otp_7227, otp_5494, otp_5644, otp_5878, otp_5917, otp_6585,
-     otp_6885, export_all, bif_clash,
-     behaviour_basic, behaviour_multiple, otp_7550, otp_8051, format_warn,
-     on_load].
+     unsafe_vars, unsafe_vars2, unsafe_vars_try, guard,
+     otp_4886, otp_4988, otp_5091, otp_5276, otp_5338,
+     otp_5362, otp_5371, otp_7227, otp_5494, otp_5644,
+     otp_5878, otp_5917, otp_6585, otp_6885, export_all,
+     bif_clash, behaviour_basic, behaviour_multiple,
+     otp_7550, otp_8051, format_warn, {group, on_load},
+     too_many_arguments].
+
+groups() -> 
+    [{unused_vars_warn, [],
+      [unused_vars_warn_basic, unused_vars_warn_lc,
+       unused_vars_warn_rec, unused_vars_warn_fun,
+       unused_vars_OTP_4858]},
+     {on_load, [], [on_load_successful, on_load_failing]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-unused_vars_warn(suite) ->
-    [unused_vars_warn_basic, unused_vars_warn_lc, unused_vars_warn_rec, 
-     unused_vars_warn_fun, unused_vars_OTP_4858].
 
 unused_vars_warn_basic(doc) ->
     "Warnings for unused variables in some simple cases.";
@@ -2252,7 +2275,7 @@ otp_5878(Config) when is_list(Config) ->
                    {15,erl_lint,{undefined_field,r3,q}},
                    {17,erl_lint,{undefined_field,r,q}},
                    {21,erl_lint,illegal_guard_expr},
-                   {23,erl_lint,illegal_guard_expr}],
+                   {23,erl_lint,{illegal_guard_local_call,{l,0}}}],
            []} = 
         run_test2(Config, Ill1, [warn_unused_record]),
 
@@ -2492,7 +2515,7 @@ bif_clash(Config) when is_list(Config) ->
                 binary:part(B,X,Y).
              ">>,
 	   [],
-	   {errors,[{3,erl_lint,illegal_guard_expr}],[]}},
+	   {errors,[{3,erl_lint,{illegal_guard_local_call,{binary_part,2}}}],[]}},
           %% no_auto_import is not like nowarn_bif_clash, it actually removes the autoimport
 	  {clash9,
            <<"-export([x/1]).
@@ -2599,7 +2622,16 @@ bif_clash(Config) when is_list(Config) ->
                  binary_part(A,B,C+1).
              ">>,
 	   [],
-	   {errors,[{4,erl_lint,illegal_guard_expr}],[]}}
+	   {errors,[{4,erl_lint,illegal_guard_expr}],[]}},
+	  %% Not with local functions either
+	  {clash20,
+           <<"-export([binary_port/3]).
+              -import(x,[binary_part/3]).
+              binary_port(A,B,C) ->
+                 binary_part(A,B,C).
+             ">>,
+	   [warn_unused_import],
+	   {warnings,[{2,erl_lint,{redefine_bif_import,{binary_part,3}}}]}}
 	 ],
 
     ?line [] = run(Config, Ts),
@@ -2822,8 +2854,6 @@ format_level(Level, Count, Config) ->
 
 %% Test the -on_load(Name/0) directive.
 
-on_load(suite) ->
-    [on_load_successful, on_load_failing].
 
 on_load_successful(Config) when is_list(Config) ->
     Ts = [{on_load_1,
@@ -2904,6 +2934,21 @@ on_load_failing(Config) when is_list(Config) ->
     ?line [] = run(Config, Ts),
     ok.
 
+too_many_arguments(doc) ->
+    "Test that too many arguments is not accepted.";
+too_many_arguments(suite) -> [];
+too_many_arguments(Config) when is_list(Config) ->
+    Ts = [{too_many_1,
+	   <<"f(_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_) -> ok.">>,
+	   [],
+	   {errors,
+	    [{1,erl_lint,{too_many_arguments,256}}],[]}}
+	 ],
+	  
+    ?line [] = run(Config, Ts),
+    ok.
+
+
 run(Config, Tests) ->
     F = fun({N,P,Ws,E}, BadL) ->
                 case catch run_test(Config, P, Ws) of
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index c57541fba9..e0f233fb2a 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -30,23 +30,25 @@
 -define(privdir, "erl_pp_SUITE_priv").
 -define(t, test_server).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(datadir, ?config(data_dir, Config)).
 -define(privdir, ?config(priv_dir, Config)).
 -endif.
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([expr/1, func/1, call/1, recs/1, try_catch/1, if_then/1,
-            receive_after/1, bits/1, head_tail/1, package/1,
-            cond1/1, block/1, case1/1, ops/1, messages/1,
-	    old_mnemosyne_syntax/1,
-         attributes/1, import_export/1, misc_attrs/1,
-         hook/1,
-         neg_indent/1,
-         tickets/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]).
+-export([ func/1, call/1, recs/1, try_catch/1, if_then/1,
+	  receive_after/1, bits/1, head_tail/1, package/1,
+	  cond1/1, block/1, case1/1, ops/1, messages/1,
+	  old_mnemosyne_syntax/1,
+	  import_export/1, misc_attrs/1,
+	  hook/1,
+	  neg_indent/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]).
 
 %% Internal export.
 -export([ehook/6]).
@@ -58,17 +60,40 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, _Config) ->
+end_per_testcase(_Case, _Config) ->
     Dog = ?config(watchdog, _Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    [expr, attributes, hook, neg_indent, tickets].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, expr}, {group, attributes}, hook, neg_indent,
+     {group, tickets}].
+
+groups() -> 
+    [{expr, [],
+      [func, call, recs, try_catch, if_then, receive_after,
+       bits, head_tail, package, cond1, block, case1, ops,
+       messages, old_mnemosyne_syntax]},
+     {attributes, [], [misc_attrs, import_export]},
+     {tickets, [],
+      [otp_6321, otp_6911, otp_6914, otp_8150, otp_8238,
+       otp_8473, otp_8522, otp_8567, otp_8664]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-expr(suite) ->
-    [func, call, recs, try_catch, if_then, receive_after, bits, head_tail,
-     package, cond1, block, case1, ops, messages, old_mnemosyne_syntax].
 
 func(suite) ->
     [];
@@ -564,8 +589,6 @@ old_mnemosyne_syntax(Config) when is_list(Config) ->
     ok.
 
 
-attributes(suite) ->
-    [misc_attrs, import_export].
 
 import_export(suite) ->
     [];
@@ -763,9 +786,6 @@ neg_indent(Config) when is_list(Config) ->
 
     ok.
 
-tickets(suite) ->
-    [otp_6321, otp_6911, otp_6914, otp_8150, otp_8238, otp_8473, otp_8522,
-     otp_8567, otp_8664].
 
 otp_6321(doc) ->
     "OTP_6321. Bug fix of exprs().";
diff --git a/lib/stdlib/test/erl_scan_SUITE.erl b/lib/stdlib/test/erl_scan_SUITE.erl
index 32eb97bc92..75e908e97c 100644
--- a/lib/stdlib/test/erl_scan_SUITE.erl
+++ b/lib/stdlib/test/erl_scan_SUITE.erl
@@ -17,9 +17,10 @@
 %% %CopyrightEnd%
 
 -module(erl_scan_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
--export([error/1, error_1/1, error_2/1, iso88591/1, otp_7810/1]).
+-export([ error_1/1, error_2/1, iso88591/1, otp_7810/1]).
 
 -import(lists, [nth/2,flatten/1]).
 -import(io_lib, [print/1]).
@@ -39,14 +40,14 @@
 %% config(data_dir, _) ->
 %%     ".".
 -else.
--include("test_server.hrl").
--export([init_per_testcase/2, fin_per_testcase/2]).
+-include_lib("test_server/include/test_server.hrl").
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 init_per_testcase(_Case, Config) when is_list(Config) ->
     ?line Dog=test_server:timetrap(test_server:seconds(1200)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -55,15 +56,27 @@ fin_per_testcase(_Case, Config) ->
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
 
-all(doc) ->
-    ["Test cases for the 'erl_scan' module."];
-all(suite) ->
-    [error,iso88591,otp_7810].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, error}, iso88591, otp_7810].
+
+groups() -> 
+    [{error, [], [error_1, error_2]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-error(doc) ->
-    ["Error cases"];
-error(suite) ->
-    [error_1, error_2].
 
 error_1(doc) ->
     ["(OTP-2347)"];
diff --git a/lib/stdlib/test/error_logger_forwarder.erl b/lib/stdlib/test/error_logger_forwarder.erl
index 7d99d07860..5703ac769a 100644
--- a/lib/stdlib/test/error_logger_forwarder.erl
+++ b/lib/stdlib/test/error_logger_forwarder.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
+%% Copyright Ericsson AB 2010. 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
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl
index 77fd190e45..447d6fb629 100644
--- a/lib/stdlib/test/escript_SUITE.erl
+++ b/lib/stdlib/test/escript_SUITE.erl
@@ -18,9 +18,10 @@
 
 -module(escript_SUITE).
 -export([
-	 all/1,
+	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,
-	 fin_per_testcase/2,
+	 end_per_testcase/2,
 	 basic/1,
 	 errors/1,
 	 strange_name/1,
@@ -31,31 +32,40 @@
 	 epp/1,
 	 create_and_extract/1,
 	 foldl/1,
+	 overflow/1,
 	 verify_sections/3
 	]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
-all(suite) ->
-    [
-     basic,
-     errors,
-     strange_name,
-     emulator_flags,
-     module_script,
-     beam_script,
-     archive_script,
-     epp,
-     create_and_extract,
-     foldl
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic, errors, strange_name, emulator_flags,
+     module_script, beam_script, archive_script, epp,
+     create_and_extract, foldl, overflow].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?t:minutes(1)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -736,6 +746,17 @@ emulate_escript_foldl(Fun, Acc, File) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+overflow(Config) when is_list(Config) ->
+    Data = ?config(data_dir, Config),
+    Dir = filename:absname(Data),		%Get rid of trailing slash.
+    ?line run(Dir, "arg_overflow",
+	      [<<"ExitCode:0">>]),
+    ?line run(Dir, "linebuf_overflow",
+	      [<<"ExitCode:0">>]),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 run(Dir, Cmd0, Expected0) ->
     Expected = iolist_to_binary(expected_output(Expected0, Dir)),
     Cmd = case os:type() of
diff --git a/lib/stdlib/test/escript_SUITE_data/arg_overflow b/lib/stdlib/test/escript_SUITE_data/arg_overflow
new file mode 100755
index 0000000000..dd5accc051
--- /dev/null
+++ b/lib/stdlib/test/escript_SUITE_data/arg_overflow
@@ -0,0 +1,5 @@
+#! /usr/bin/env escript
+%% -*- erlang -*-
+%%!x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
+main(_) ->
+    halt(0).
diff --git a/lib/stdlib/test/escript_SUITE_data/linebuf_overflow b/lib/stdlib/test/escript_SUITE_data/linebuf_overflow
new file mode 100755
index 0000000000..33133c1ce9
--- /dev/null
+++ b/lib/stdlib/test/escript_SUITE_data/linebuf_overflow
@@ -0,0 +1,5 @@
+#! /usr/bin/env escript
+%% -*- erlang -*-
+%%!xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+main(_) ->
+    halt(0).
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 13c87ca005..9d348b5f1a 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -18,24 +18,25 @@
 %%
 -module(ets_SUITE).
 
--export([all/1]).
--export([new/1,default/1,setbag/1,badnew/1,verybadnew/1,named/1,keypos2/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([default/1,setbag/1,badnew/1,verybadnew/1,named/1,keypos2/1,
 	 privacy/1,privacy_owner/2]).
--export([insert/1,empty/1,badinsert/1]).
--export([lookup/1,time_lookup/1,badlookup/1,lookup_order/1]).
--export([delete/1,delete_elem/1,delete_tab/1,delete_large_tab/1,
+-export([empty/1,badinsert/1]).
+-export([time_lookup/1,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]).
 -export([match_delete3/1]).
 -export([firstnext/1,firstnext_concurrent/1]).
 -export([slot/1]).
--export([match/1, match1/1, match2/1, match_object/1, match_object2/1]).
--export([misc/1, dups/1, misc1/1, safe_fixtable/1, info/1, tab2list/1]).
--export([files/1, tab2file/1, tab2file2/1, tab2file3/1, tabfile_ext1/1,
+-export([ match1/1, match2/1, match_object/1, match_object2/1]).
+-export([ dups/1, misc1/1, safe_fixtable/1, info/1, tab2list/1]).
+-export([ tab2file/1, tab2file2/1, tabfile_ext1/1,
 	tabfile_ext2/1, tabfile_ext3/1, tabfile_ext4/1]).
--export([heavy/1, heavy_lookup/1, heavy_lookup_element/1]).
--export([lookup_element/1, lookup_element_mult/1]).
--export([fold/1]).
+-export([ heavy_lookup/1, heavy_lookup_element/1, heavy_concurrent/1]).
+-export([ lookup_element_mult/1]).
+-export([]).
 -export([foldl_ordered/1, foldr_ordered/1, foldl/1, foldr/1, fold_empty/1]).
 -export([t_delete_object/1, t_init_table/1, t_whitebox/1, 
 	 t_delete_all_objects/1, t_insert_list/1, t_test_ms/1,
@@ -59,25 +60,26 @@
 -export([otp_7665/1]).
 -export([meta_wb/1]).
 -export([grow_shrink/1, grow_pseudo_deleted/1, shrink_pseudo_deleted/1]).
--export([meta_smp/1,
+-export([
 	 meta_lookup_unnamed_read/1, meta_lookup_unnamed_write/1, 
 	 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, otp_8166/1]).
+-export([smp_insert/1, smp_fixed_delete/1, smp_unfix_fix/1, smp_select_delete/1,
+         otp_8166/1, otp_8732/1]).
 -export([exit_large_table_owner/1,
 	 exit_many_large_table_owner/1,
 	 exit_many_tables_owner/1,
 	 exit_many_many_tables_owner/1]).
 -export([write_concurrency/1, heir/1, give_away/1, setopts/1]).
--export([bad_table/1]).
+-export([bad_table/1, types/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 %% Convenience for manual testing
 -export([random_test/0]).
 
 % internal exports
 -export([dont_make_worse_sub/0, make_better_sub1/0, make_better_sub2/0]).
--export([t_repair_continuation_do/1, default_do/1, t_bucket_disappears_do/1,
+-export([t_repair_continuation_do/1, t_bucket_disappears_do/1,
 	 select_fail_do/1, whitebox_1/1, whitebox_2/1, t_delete_all_objects_do/1,
 	 t_delete_object_do/1, t_init_table_do/1, t_insert_list_do/1,
 	 update_element_opts/1, update_element_opts/4, update_element/4, update_element_do/4,
@@ -89,10 +91,17 @@
 	 match_delete_do/1, match_delete3_do/1, firstnext_do/1, 
 	 slot_do/1, match1_do/1, match2_do/1, match_object_do/1, match_object2_do/1,
 	 misc1_do/1, safe_fixtable_do/1, info_do/1, dups_do/1, heavy_lookup_do/1,
-	 heavy_lookup_element_do/1, member_do/1, otp_5340_do/1, otp_7665_do/1, meta_wb_do/1
+	 heavy_lookup_element_do/1, member_do/1, otp_5340_do/1, otp_7665_do/1, meta_wb_do/1,
+	 do_heavy_concurrent/1, tab2file2_do/2, exit_large_table_owner_do/2,
+         types_do/1, sleeper/0, rpc_externals/0, memory_do/1,
+	 ms_tracee_dummy/1, ms_tracee_dummy/2, ms_tracee_dummy/3, ms_tracee_dummy/4
 	]).
 
--include("test_server.hrl").
+-export([t_select_reverse/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+-define(m(A,B), ?line assert_eq(A,B)).
 
 init_per_testcase(Case, Config) ->
     Seed = {S1,S2,S3} = random:seed0(), %now(),
@@ -103,44 +112,80 @@ init_per_testcase(Case, Config) ->
     Dog=test_server:timetrap(test_server:minutes(20)),
     [{watchdog, Dog}, {test_case, Case} | Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     wait_for_test_procs(true),
     test_server:timetrap_cancel(Dog).
-    
+   
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, new}, {group, insert}, {group, lookup},
+     {group, delete}, firstnext, firstnext_concurrent, slot,
+     {group, match}, t_match_spec_run,
+     {group, lookup_element}, {group, misc}, {group, files},
+     {group, heavy}, ordered, ordered_match,
+     interface_equality, fixtable_next, fixtable_insert,
+     rename, rename_unnamed, evil_rename, update_element,
+     update_counter, evil_update_counter, partly_bound,
+     match_heavy, {group, fold}, member, t_delete_object,
+     t_init_table, t_whitebox, t_delete_all_objects,
+     t_insert_list, t_test_ms, t_select_delete, t_ets_dets,
+     memory, t_select_reverse, t_bucket_disappears,
+     select_fail, t_insert_new, t_repair_continuation,
+     otp_5340, otp_6338, otp_6842_select_1000, otp_7665,
+     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_delete,
+     otp_8166, exit_large_table_owner,
+     exit_many_large_table_owner, exit_many_tables_owner,
+     exit_many_many_tables_owner, write_concurrency, heir,
+     give_away, setopts, bad_table, types].
+
+groups() -> 
+    [{new, [],
+      [default, setbag, badnew, verybadnew, named, keypos2,
+       privacy]},
+     {insert, [], [empty, badinsert]},
+     {lookup, [], [time_lookup, badlookup, lookup_order]},
+     {lookup_element, [], [lookup_element_mult]},
+     {delete, [],
+      [delete_elem, delete_tab, delete_large_tab,
+       delete_large_named_table, evil_delete, table_leak,
+       baddelete, match_delete, match_delete3]},
+     {match, [],
+      [match1, match2, match_object, match_object2]},
+     {misc, [],
+      [misc1, safe_fixtable, info, dups, tab2list]},
+     {files, [],
+      [tab2file, tab2file2, tabfile_ext1,
+       tabfile_ext2, tabfile_ext3, tabfile_ext4]},
+     {heavy, [],
+      [heavy_lookup, heavy_lookup_element, heavy_concurrent]},
+     {fold, [],
+      [foldl_ordered, foldr_ordered, foldl, foldr,
+       fold_empty]},
+     {meta_smp, [],
+      [meta_lookup_unnamed_read, meta_lookup_unnamed_write,
+       meta_lookup_named_read, meta_lookup_named_write,
+       meta_newdel_unnamed, meta_newdel_named]}].
+
+init_per_suite(Config) ->
+    Config.
 
 end_per_suite(_Config) ->
     stop_spawn_logger(),
     catch erts_debug:set_internal_state(available_internal_state, false).
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
 
-all(suite) ->
-    [
-     new,insert,lookup,delete,firstnext,firstnext_concurrent,slot,match,
-     t_match_spec_run,
-     lookup_element, misc,files, heavy, 
-     ordered, ordered_match, interface_equality,
-     fixtable_next, fixtable_insert, rename, rename_unnamed, evil_rename,
-     update_element, update_counter, evil_update_counter, partly_bound,
-     match_heavy, fold, member,
-     t_delete_object, t_init_table, t_whitebox, 
-     t_delete_all_objects, t_insert_list, t_test_ms,
-     t_select_delete, t_ets_dets, memory,
-     t_bucket_disappears,
-     select_fail,t_insert_new, t_repair_continuation, otp_5340, otp_6338,
-     otp_6842_select_1000, otp_7665,
-     meta_wb,
-     grow_shrink, grow_pseudo_deleted, shrink_pseudo_deleted,
-     meta_smp,
-     smp_insert, smp_fixed_delete, smp_unfix_fix, 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, give_away, setopts,
-     bad_table
-    ].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -153,7 +198,7 @@ t_bucket_disappears(Config) when is_list(Config) ->
 
 t_bucket_disappears_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line ets:new(abcd, [named_table, public, {keypos, 2} | Opts]),
+    ?line ets_new(abcd, [named_table, public, {keypos, 2} | Opts]),
     ?line ets:insert(abcd, {abcd,1,2}),
     ?line ets:insert(abcd, {abcd,2,2}),
     ?line ets:insert(abcd, {abcd,3,2}),
@@ -171,29 +216,180 @@ t_match_spec_run(suite) ->
 t_match_spec_run(doc) ->
     ["Check ets:match_spec_run/2."];
 t_match_spec_run(Config) when is_list(Config) ->
+    init_externals(),
     ?line EtsMem = etsmem(),
-    ?line [2,3] = ets:match_spec_run([{1},{2},{3}],
-				     ets:match_spec_compile(
-				       [{{'$1'},[{'>','$1',1}],['$1']}])),
+
+    t_match_spec_run_test([{1},{2},{3}],
+			  [{{'$1'},[{'>','$1',1}],['$1']}],
+			  [2,3]),
+
     ?line Huge = [{X} || X <- lists:seq(1,2500)],
     ?line L = lists:seq(2476,2500),
-    ?line L = ets:match_spec_run(Huge,
-				 ets:match_spec_compile(
-				   [{{'$1'},[{'>','$1',2475}],['$1']}])),
+    t_match_spec_run_test(Huge, [{{'$1'},[{'>','$1',2475}],['$1']}], L),
+
     ?line L2 = [{X*16#FFFFFFF} || X <- L],
-    ?line L2 = ets:match_spec_run(Huge,
-				  ets:match_spec_compile(
-				    [{{'$1'},
-				      [{'>','$1',2475}],
-				      [{{{'*','$1',16#FFFFFFF}}}]}])),
-    ?line [500,1000,1500,2000,2500] = 
-	ets:match_spec_run(Huge,
-			   ets:match_spec_compile(
-			     [{{'$1'},
-			       [{'=:=',{'rem','$1',500},0}],
-			       ['$1']}])),
+    t_match_spec_run_test(Huge,
+			  [{{'$1'}, [{'>','$1',2475}], [{{{'*','$1',16#FFFFFFF}}}]}],
+			  L2),
+
+    t_match_spec_run_test(Huge, [{{'$1'}, [{'=:=',{'rem','$1',500},0}], ['$1']}],
+			  [500,1000,1500,2000,2500]),
+
+    %% More matching fun with several match clauses and guards,
+    %% applied to a variety of terms.
+    Fun = fun(Term) ->
+		  CTerm = {const, Term},
+
+		  N_List = [{Term, "0", "v-element"},
+			    {"=hidden_node", "0", Term},
+			    {"0", Term, Term},
+			    {"something", Term, "something else"},
+			    {"guard and res", Term, 872346},
+			    {Term, {'and',Term,'again'}, 3.14},
+			    {Term, {'and',Term,'again'}, "m&g"},
+			    {Term, {'and',Term,'again'}, "m&g&r"},
+			    {[{second,Term}, 'and', "tail"], Term, ['and',"tail"]}],
+
+		  N_MS = [{{'$1','$2','$3'},
+			   [{'=:=','$1',CTerm}, {'=:=','$2',{const,"0"}}],
+			   [{{"Guard only for $1",'$3'}}]},
+
+			  {{'$3','$1','$4'},
+			   [{'=:=','$3',"=hidden_node"}, {'=:=','$1',{const,"0"}}],
+			   [{{"Result only for $4",'$4'}}]},
+
+			  {{'$2','$1','$1'},
+			   [{'=:=','$2',{const,"0"}}],
+			   [{{"Match only for $1",'$2'}}]},
+
+			  {{'$2',Term,['$3'|'_']},
+			   [{is_list,'$2'},{'=:=','$3',$s}],
+			   [{{"Matching term",'$2'}}]},
+
+			  {{'$1','$2',872346},
+			   [{'=:=','$2',CTerm}, {is_list,'$1'}],
+			   [{{"Guard and result",'$2'}}]},
+
+			  {{'$1', {'and','$1','again'}, '$2'},
+			   [{is_float,'$2'}],
+			   [{{"Match and result",'$1'}}]},
+
+			  {{'$1', {'and','$1','again'}, '$2'},
+			   [{'=:=','$1',CTerm}, {'=:=', '$2', "m&g"}],
+			   [{{"Match and guard",'$2'}}]},
+
+			  {{'$1', {'and','$1','again'}, "m&g&r"},
+			   [{'=:=','$1',CTerm}],
+			   [{{"Match, guard and result",'$1'}}]},
+
+			  {{'$1', '$2', '$3'},
+			   [{'=:=','$1',[{{second,'$2'}} | '$3']}],
+			   [{{"Building guard"}}]}
+			 ],
+
+		  N_Result = [{"Guard only for $1", "v-element"},
+			      {"Result only for $4", Term},
+			      {"Match only for $1", "0"},
+			      {"Matching term","something"},
+			      {"Guard and result",Term},
+			      {"Match and result",Term},
+			      {"Match and guard","m&g"},
+			      {"Match, guard and result",Term},
+			      {"Building guard"}],
+
+		  F = fun(N_MS_Perm) ->
+			      t_match_spec_run_test(N_List, N_MS_Perm, N_Result)
+		      end,
+		  repeat_for_permutations(F, N_MS)
+	  end,
+
+    test_terms(Fun, skip_refc_check),
+
     ?line verify_etsmem(EtsMem).
 
+t_match_spec_run_test(List, MS, Result) ->
+
+    %%io:format("ms = ~p\n",[MS]),
+
+    ?m(Result, ets:match_spec_run(List, ets:match_spec_compile(MS))),
+
+    %% Check that ets:select agree
+    Tab = ets:new(xxx, [bag]),
+    ets:insert(Tab, List),
+    SRes = lists:sort(Result),
+    ?m(SRes, lists:sort(ets:select(Tab, MS))),
+    ets:delete(Tab),
+
+    %% Check that tracing agree
+    Self = self(),
+    {Tracee, MonRef} = spawn_monitor(fun() -> ms_tracee(Self, List) end),
+    receive {Tracee, ready} -> ok end,
+
+    MST = lists:map(fun(Clause) -> ms_clause_ets_to_trace(Clause) end, MS),
+
+    %%io:format("MS = ~p\nMST= ~p\n",[MS,MST]),
+
+    erlang:trace_pattern({?MODULE,ms_tracee_dummy,'_'}, MST , [local]),
+    erlang:trace(Tracee, true, [call]),
+    Tracee ! start,
+    TRes = ms_tracer_collect(Tracee, MonRef, []),
+    %erlang:trace(Tracee, false, [call]),
+    %Tracee ! stop,
+    case TRes of
+	SRes -> ok;
+	_ ->
+	    io:format("TRACE MATCH FAILED\n"),
+	    io:format("Input = ~p\nMST = ~p\nExpected = ~p\nGot = ~p\n", [List, MST, SRes, TRes]),
+	    ?t:fail("TRACE MATCH FAILED")
+    end,
+    ok.
+
+
+
+ms_tracer_collect(Tracee, Ref, Acc) ->
+    receive
+	{trace, Tracee, call, _Args, [Msg]} ->
+	    %io:format("trace Args=~p  Msg=~p\n", [_Args, Msg]),
+	    ms_tracer_collect(Tracee, Ref, [Msg | Acc]);
+
+	{'DOWN', Ref, process, Tracee, _} ->
+	    %io:format("monitor DOWN for ~p\n", [Tracee]),
+	    TDRef = erlang:trace_delivered(Tracee),
+	    ms_tracer_collect(Tracee, TDRef, Acc);
+
+	{trace_delivered, Tracee, Ref} ->
+	    %%io:format("trace delivered for ~p\n", [Tracee]),
+	    lists:sort(Acc);
+
+	Other ->
+	    io:format("Unexpected message = ~p\n", [Other]),
+	    ?t:fail("Unexpected tracer msg")
+    end.
+
+
+ms_tracee(Parent, CallArgList) ->
+    %io:format("ms_tracee ~p started with ArgList = ~p\n", [self(), CallArgList]),
+    Parent ! {self(), ready},
+    receive start -> ok end,
+    lists:foreach(fun(Args) ->
+			  erlang:apply(?MODULE, ms_tracee_dummy, tuple_to_list(Args))
+		  end, CallArgList).
+    %%receive stop -> ok end.
+
+
+
+ms_tracee_dummy(_) -> ok.
+ms_tracee_dummy(_,_) -> ok.
+ms_tracee_dummy(_,_,_) -> ok.
+ms_tracee_dummy(_,_,_,_) -> ok.
+
+ms_clause_ets_to_trace({Head, Guard, Body}) ->
+    {tuple_to_list(Head), Guard, [{message, Body}]}.
+
+assert_eq(A,A) -> ok;
+assert_eq(A,B) ->
+    io:format("FAILED MATCH:\n~p\n =/=\n~p\n",[A,B]),
+    ?t:fail("assert_eq failed").
 
 
 t_repair_continuation(suite) -> 
@@ -209,7 +405,7 @@ t_repair_continuation_do(Opts) ->
     ?line MS = [{'_',[],[true]}],
     ?line MS2 = [{{{'$1','_'},'_'},[],['$1']}],
     (fun() ->
-	     ?line T = ets:new(x,[ordered_set|Opts]),
+	     ?line T = ets_new(x,[ordered_set|Opts]),
 	     ?line F = fun(0,_)->ok;(N,F) -> ets:insert(T,{N,N}), F(N-1,F) end,
 	     ?line F(1000,F),
 	     ?line {_,C} = ets:select(T,MS,5),
@@ -221,7 +417,7 @@ t_repair_continuation_do(Opts) ->
 	     ?line true = ets:delete(T)
      end)(),
     (fun() ->
-	     ?line T = ets:new(x,[ordered_set|Opts]),
+	     ?line T = ets_new(x,[ordered_set|Opts]),
 	     ?line F = fun(0,_)->ok;(N,F) -> ets:insert(T,{N,N}), F(N-1,F) end,
 	     ?line F(1000,F),
 	     ?line {_,C} = ets:select(T,MS,1001),
@@ -233,7 +429,7 @@ t_repair_continuation_do(Opts) ->
      end)(),
     
     (fun() ->
-	     ?line T = ets:new(x,[ordered_set|Opts]),
+	     ?line T = ets_new(x,[ordered_set|Opts]),
 	     ?line F = fun(0,_)->ok;(N,F) -> 
 			       ets:insert(T,{integer_to_list(N),N}), 
 			       F(N-1,F) 
@@ -248,7 +444,7 @@ t_repair_continuation_do(Opts) ->
 	     ?line true = ets:delete(T)
      end)(),
     (fun() ->
-	     ?line T = ets:new(x,[ordered_set|Opts]),
+	     ?line T = ets_new(x,[ordered_set|Opts]),
 	     ?line F = fun(0,_)->ok;(N,F) -> 
 			       ets:insert(T,{{integer_to_list(N),N},N}), 
 			       F(N-1,F) 
@@ -264,7 +460,7 @@ t_repair_continuation_do(Opts) ->
      end)(),
     
     (fun() ->
-	     ?line T = ets:new(x,[set|Opts]),
+	     ?line T = ets_new(x,[set|Opts]),
 	     ?line F = fun(0,_)->ok;(N,F) -> 
 			       ets:insert(T,{N,N}), 
 			       F(N-1,F) 
@@ -279,7 +475,7 @@ t_repair_continuation_do(Opts) ->
 	     ?line true = ets:delete(T)
      end)(),
     (fun() ->
-	     ?line T = ets:new(x,[set|Opts]),
+	     ?line T = ets_new(x,[set|Opts]),
 	     ?line F = fun(0,_)->ok;(N,F) -> 
 			       ets:insert(T,{integer_to_list(N),N}), 
 			       F(N-1,F) 
@@ -294,7 +490,7 @@ t_repair_continuation_do(Opts) ->
 	     ?line true = ets:delete(T)
      end)(),
     (fun() ->
-	     ?line T = ets:new(x,[bag|Opts]),
+	     ?line T = ets_new(x,[bag|Opts]),
 	     ?line F = fun(0,_)->ok;(N,F) -> 
 			       ets:insert(T,{integer_to_list(N),N}), 
 			       F(N-1,F) 
@@ -309,7 +505,7 @@ t_repair_continuation_do(Opts) ->
 	     ?line true = ets:delete(T)
      end)(),
     (fun() ->
-	     ?line T = ets:new(x,[duplicate_bag|Opts]),
+	     ?line T = ets_new(x,[duplicate_bag|Opts]),
 	     ?line F = fun(0,_)->ok;(N,F) -> 
 			       ets:insert(T,{integer_to_list(N),N}), 
 			       F(N-1,F) 
@@ -327,21 +523,22 @@ t_repair_continuation_do(Opts) ->
     ?line true = ets:is_compiled_ms(ets:match_spec_compile(MS)),
     ?line verify_etsmem(EtsMem).
 
-new(suite) -> [default,setbag,badnew,verybadnew,named,keypos2,privacy].
 
 default(doc) ->
-    ["Test case to check that a new ets table is defined as a `set' and "
-     "`protected'"];
+    ["Check correct default vaules of a new ets table"];
 default(suite) -> [];
 default(Config) when is_list(Config) ->
     %% Default should be set,protected
-    repeat_for_opts(default_do).
-
-default_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Def = ets:new(def,Opts),
+    ?line Def = ets_new(def,[]),
     ?line set = ets:info(Def,type),
     ?line protected = ets:info(Def,protection),
+    Compressed = erlang:system_info(ets_always_compress),
+    ?line Compressed = ets:info(Def,compressed),
+    Self = self(),
+    ?line Self = ets:info(Def,owner),
+    ?line none = ets:info(Def, heir),
+    ?line false = ets:info(Def,named_table),
     ?line ets:delete(Def),
     ?line verify_etsmem(EtsMem).
 
@@ -355,7 +552,7 @@ select_fail(Config) when is_list(Config) ->
     ?line verify_etsmem(EtsMem).
 
 select_fail_do(Opts) ->
-    ?line T = ets:new(x,Opts),
+    ?line T = ets_new(x,Opts),
     ?line ets:insert(T,{a,a}),
     ?line case (catch 
 		    ets:select(T,[{{a,'_'},[],[{snuffla}]}])) of
@@ -378,20 +575,27 @@ select_fail_do(Opts) ->
 
 -define(S(T),ets:info(T,memory)).
 -define(TAB_STRUCT_SZ, erts_debug:get_internal_state('DbTable_words')).
--define(NORMAL_TAB_STRUCT_SZ, 26). %% SunOS5.8, 32-bit, non smp, private heap
+%%-define(NORMAL_TAB_STRUCT_SZ, 26). %% SunOS5.8, 32-bit, non smp, private heap
 %%
 %% The hardcoded expected memory sizes (in words) are the ones we expect on:
 %%   SunOS5.8, 32-bit, non smp, private heap
 %%
-memory(doc) ->
-    ["Whitebox test of ets:info(X,memory)"];
-memory(suite) ->
-    [];
+memory(doc) -> ["Whitebox test of ets:info(X,memory)"];
+memory(suite) -> [];
 memory(Config) when is_list(Config) ->
     ?line erts_debug:set_internal_state(available_internal_state, true),
     ?line ok = chk_normal_tab_struct_size(),
-    ?line L = [T1,T2,T3,T4] = fill_sets_int(1000),
-    ?line XRes1 = adjust_xmem(L, {16862,16072,16072,16078}),
+    repeat_for_opts(memory_do,[compressed]),
+    ?line catch erts_debug:set_internal_state(available_internal_state, false).
+
+memory_do(Opts) ->
+    ?line L = [T1,T2,T3,T4] = fill_sets_int(1000,Opts),
+    XR1 = case mem_mode(T1) of
+	    {normal,_} ->     {13836,13046,13046,13052}; %{13862,13072,13072,13078};
+	    {compressed,4} -> {11041,10251,10251,10252}; %{11067,10277,10277,10278};
+	    {compressed,8} -> {10050,9260,9260,9260} %{10076,9286,9286,9286}
+	  end,
+    ?line XRes1 = adjust_xmem(L, XR1),
     ?line Res1 = {?S(T1),?S(T2),?S(T3),?S(T4)},
     ?line lists:foreach(fun(T) ->
  				Before = ets:info(T,size),
@@ -402,7 +606,12 @@ memory(Config) when is_list(Config) ->
 					  [Key, ets:info(T,type), Before, ets:info(T,size), Objs])
 		  end,
 		  L),
-    ?line XRes2 = adjust_xmem(L, {16849,16060,16048,16054}),
+    XR2 = case mem_mode(T1) of
+	    {normal,_} ->     {13826,13037,13028,13034}; %{13852,13063,13054,13060};
+	    {compressed,4} -> {11031,10242,10233,10234}; %{11057,10268,10259,10260};
+	    {compressed,8} -> {10040,9251,9242,9242}     %10066,9277,9268,9268}
+	  end,
+    ?line XRes2 = adjust_xmem(L, XR2),
     ?line Res2 = {?S(T1),?S(T2),?S(T3),?S(T4)},
     ?line lists:foreach(fun(T) ->
  				Before = ets:info(T,size),
@@ -413,13 +622,18 @@ memory(Config) when is_list(Config) ->
 					  [Key, ets:info(T,type), Before, ets:info(T,size), Objs])
 			end,
 			L),
-    ?line XRes3 = adjust_xmem(L, {16836,16048,16024,16030}),
+    XR3 = case mem_mode(T1) of
+		{normal,_} ->     {13816,13028,13010,13016}; %{13842,13054,13036,13042};
+		{compressed,4} -> {11021,10233,10215,10216}; %{11047,10259,10241,10242};
+		{compressed,8} -> {10030,9242,9224,9224} %{10056,9268,9250,9250}
+	  end,
+    ?line XRes3 = adjust_xmem(L, XR3),
     ?line Res3 = {?S(T1),?S(T2),?S(T3),?S(T4)},
     ?line lists:foreach(fun(T) ->
 			  ?line ets:delete_all_objects(T)
 		  end,
 		  L),
-    ?line XRes4 = adjust_xmem(L, {76,286,286,286}),
+    ?line XRes4 = adjust_xmem(L, {50,260,260,260}), %{76,286,286,286}),
     ?line Res4 = {?S(T1),?S(T2),?S(T3),?S(T4)},
     lists:foreach(fun(T) ->
 			  ?line ets:delete(T)
@@ -430,9 +644,9 @@ memory(Config) when is_list(Config) ->
 			  ?line ets:select_delete(T,[{'_',[],[true]}])
 		  end,
 		  L2),
-    ?line XRes5 = adjust_xmem(L2, {76,286,286,286}),
+    ?line XRes5 = adjust_xmem(L2, {50,260,260,260}), %{76,286,286,286}),
     ?line Res5 = {?S(T11),?S(T12),?S(T13),?S(T14)},
-    ?line ?t:format("XRes1 = ~p~n"
+    ?line io:format("XRes1 = ~p~n"
 		    " Res1 = ~p~n~n"
 		    "XRes2 = ~p~n"
 		    " Res2 = ~p~n~n"
@@ -452,9 +666,15 @@ memory(Config) when is_list(Config) ->
     ?line XRes3 = Res3,
     ?line XRes4 = Res4,
     ?line XRes5 = Res5,
-    ?line catch erts_debug:set_internal_state(available_internal_state, false),
     ?line ok.
 
+mem_mode(T) ->
+    {case ets:info(T,compressed) of
+	true -> compressed;
+	false -> normal
+     end,
+     erlang:system_info(wordsize)}.
+
 chk_normal_tab_struct_size() ->
     ?line System = {os:type(),
 		    os:version(),
@@ -462,36 +682,58 @@ chk_normal_tab_struct_size() ->
 		    erlang:system_info(smp_support),
 		    erlang:system_info(heap_type)},
     ?line ?t:format("System = ~p~n", [System]),
-    ?line ?t:format("?NORMAL_TAB_STRUCT_SZ=~p~n", [?NORMAL_TAB_STRUCT_SZ]),
+    %%?line ?t:format("?NORMAL_TAB_STRUCT_SZ=~p~n", [?NORMAL_TAB_STRUCT_SZ]),
     ?line ?t:format("?TAB_STRUCT_SZ=~p~n", [?TAB_STRUCT_SZ]),
-    ?line case System of
-	      {{unix, sunos}, {5, 8, 0}, 4, false, private} ->
-		  ?line ?NORMAL_TAB_STRUCT_SZ = ?TAB_STRUCT_SZ,
-		  ?line ok;
-	      _ ->
-		  ?line ok
-	  end.
-
-adjust_xmem([T1,T2,T3,T4], {A0,B0,C0,D0} = Mem0) ->
+    ok.
+%   ?line case System of
+%             {{unix, sunos}, {5, 8, 0}, 4, false, private} ->
+%       	  ?line ?NORMAL_TAB_STRUCT_SZ = ?TAB_STRUCT_SZ,
+%       	  ?line ok;
+%             _ ->
+%       	  ?line ok
+%         end.
+
+-define(DB_TREE_STACK_NEED,50). % The static stack for a tree, in halfword pointers are two internal words
+                                % so the stack gets twice as big
+-define(DB_HASH_SIZEOF_EXTSEG,260). % The segment size in words, in halfword this will be twice as large.
+
+adjust_xmem([T1,T2,T3,T4], {A0,B0,C0,D0} = _Mem0) ->
     %% Adjust for 64-bit, smp, and os:
     %%   Table struct size may differ.
-    Mem1 = case ?TAB_STRUCT_SZ of
-	       ?NORMAL_TAB_STRUCT_SZ ->
-		   Mem0;
-	       TabStructSz ->
-		   TabDiff = TabStructSz - ?NORMAL_TAB_STRUCT_SZ,
-		   {A0+TabDiff, B0+TabDiff, C0+TabDiff, D0+TabDiff}
-	   end,
+
+%   Mem1 = case ?TAB_STRUCT_SZ of
+%              ?NORMAL_TAB_STRUCT_SZ ->
+%       	   Mem0;
+%              TabStructSz ->
+%       	   TabDiff = TabStructSz - ?NORMAL_TAB_STRUCT_SZ,
+%       	   {A0+TabDiff, B0+TabDiff, C0+TabDiff, D0+TabDiff}
+%          end,
+
+    TabDiff = ?TAB_STRUCT_SZ,
+    Mem1 = {A0+TabDiff, B0+TabDiff, C0+TabDiff, D0+TabDiff},
+
+    Mem2 = case {erlang:system_info({wordsize,internal}),erlang:system_info({wordsize,external})} of
+	         %% Halfword, corrections for regular pointers occupying two internal words.
+		 {4,8} ->
+			{A1,B1,C1,D1} = Mem1,
+			{A1+4*ets:info(T1, size)+?DB_TREE_STACK_NEED,
+			 B1+3*ets:info(T2, size)+?DB_HASH_SIZEOF_EXTSEG,
+			 C1+3*ets:info(T3, size)+?DB_HASH_SIZEOF_EXTSEG,
+			 D1+3*ets:info(T4, size)+?DB_HASH_SIZEOF_EXTSEG};
+		 _ ->
+			Mem1
+		end,
+
     %% Adjust for hybrid and shared heaps:
     %%   Each record is one word smaller.
-    Mem2 = case erlang:system_info(heap_type) of
-	       private ->
-		   Mem1;
-	       _ ->
-		   {A1,B1,C1,D1} = Mem1,
-		   {A1-ets:info(T1, size),B1-ets:info(T2, size),
-		    C1-ets:info(T3, size),D1-ets:info(T4, size)}
-	   end,
+    %%Mem2 = case erlang:system_info(heap_type) of
+    %%    	   private ->
+    %%    	       Mem1;
+    %%    	   _ ->
+    %%    	       {A1,B1,C1,D1} = Mem1,
+    %%    	       {A1-ets:info(T1, size),B1-ets:info(T2, size),
+    %%    		C1-ets:info(T3, size),D1-ets:info(T4, size)}
+    %%          end,
     %%{Mem2,{ets:info(T1,stats),ets:info(T2,stats),ets:info(T3,stats),ets:info(T4,stats)}}.
     Mem2.
 
@@ -510,7 +752,7 @@ t_whitebox(Config) when is_list(Config) ->
     ?line verify_etsmem(EtsMem).
 
 whitebox_1(Opts) ->
-    ?line T=ets:new(x,[bag | Opts]),
+    ?line T=ets_new(x,[bag | Opts]),
     ?line ets:insert(T,[{du,glade},{ta,en}]),
     ?line ets:insert(T,[{hej,hopp2},{du,glade2},{ta,en2}]),
     ?line {_,C}=ets:match(T,{ta,'$1'},1),
@@ -520,8 +762,8 @@ whitebox_1(Opts) ->
     ok.
 
 whitebox_2(Opts) ->
-    ?line T=ets:new(x,[ordered_set, {keypos,2} | Opts]),
-    ?line T2=ets:new(x,[set, {keypos,2}| Opts]),
+    ?line T=ets_new(x,[ordered_set, {keypos,2} | Opts]),
+    ?line T2=ets_new(x,[set, {keypos,2}| Opts]),
     ?line 0 = ets:select_delete(T,[{{hej},[],[true]}]),
     ?line 0 = ets:select_delete(T,[{{hej,hopp},[],[true]}]),
     ?line 0 = ets:select_delete(T2,[{{hej},[],[true]}]),
@@ -543,7 +785,7 @@ t_ets_dets(Config, Opts) ->
     ?line (catch file:delete(Fname)),
     ?line {ok,DTab} = dets:open_file(testdets_1,
 			       [{file, Fname}]),
-    ?line ETab = ets:new(x,Opts),
+    ?line ETab = ets_new(x,Opts),
     ?line filltabint(ETab,3000),
     ?line DTab = ets:to_dets(ETab,DTab),
     ?line ets:delete_all_objects(ETab),
@@ -555,7 +797,7 @@ t_ets_dets(Config, Opts) ->
 	(catch ets:to_dets(ETab,DTab)),
     ?line {'EXIT',{badarg,[{ets,from_dets,[ETab,DTab]}|_]}} =
 	(catch ets:from_dets(ETab,DTab)),
-    ?line ETab2 = ets:new(x,Opts),
+    ?line ETab2 = ets_new(x,Opts),
     ?line filltabint(ETab2,3000),
     ?line dets:close(DTab),
     ?line {'EXIT',{badarg,[{ets,to_dets,[ETab2,DTab]}|_]}} =
@@ -576,7 +818,7 @@ t_delete_all_objects(Config) when is_list(Config) ->
     ?line verify_etsmem(EtsMem).
 
 t_delete_all_objects_do(Opts) ->
-    ?line T=ets:new(x,Opts),
+    ?line T=ets_new(x,Opts),
     ?line filltabint(T,4000),
     ?line O=ets:first(T),
     ?line ets:next(T,O),
@@ -605,7 +847,7 @@ t_delete_object(Config) when is_list(Config) ->
     ?line verify_etsmem(EtsMem).
 
 t_delete_object_do(Opts) ->
-    ?line T = ets:new(x,Opts),
+    ?line T = ets_new(x,Opts),
     ?line filltabint(T,4000),
     ?line del_one_by_one_set(T,1,4001),
     ?line filltabint(T,4000),
@@ -622,19 +864,19 @@ t_delete_object_do(Opts) ->
     ?line 3999 = ets:info(T,size),
     ?line 0 = ets:info(T,kept_objects),
     ?line ets:delete(T),
-    ?line T1 = ets:new(x,[ordered_set | Opts]),
+    ?line T1 = ets_new(x,[ordered_set | Opts]),
     ?line filltabint(T1,4000),
     ?line del_one_by_one_set(T1,1,4001),
     ?line filltabint(T1,4000),
     ?line del_one_by_one_set(T1,4000,0),
     ?line ets:delete(T1),
-    ?line T2 = ets:new(x,[bag | Opts]),
+    ?line T2 = ets_new(x,[bag | Opts]),
     ?line filltabint2(T2,4000),
     ?line del_one_by_one_bag(T2,1,4001),
     ?line filltabint2(T2,4000),
     ?line del_one_by_one_bag(T2,4000,0),
     ?line ets:delete(T2),
-    ?line T3 = ets:new(x,[duplicate_bag | Opts]),
+    ?line T3 = ets_new(x,[duplicate_bag | Opts]),
     ?line filltabint3(T3,4000),
     ?line del_one_by_one_dbag_1(T3,1,4001),
     ?line filltabint3(T3,4000),
@@ -681,7 +923,7 @@ t_init_table(Config) when is_list(Config)->
     ?line verify_etsmem(EtsMem).
 
 t_init_table_do(Opts) ->
-    ?line T = ets:new(x,[duplicate_bag | Opts]),
+    ?line T = ets_new(x,[duplicate_bag | Opts]),
     ?line filltabint(T,4000),
     ?line ets:init_table(T, make_init_fun(1)),
     ?line del_one_by_one_dbag_1(T,4000,0),
@@ -763,7 +1005,7 @@ t_insert_list(Config) when is_list(Config) ->
     ?line verify_etsmem(EtsMem).
 
 t_insert_list_do(Opts) ->
-    ?line T = ets:new(x,[duplicate_bag | Opts]),
+    ?line T = ets_new(x,[duplicate_bag | Opts]),
     ?line do_fill_dbag_using_lists(T,4000),
     ?line del_one_by_one_dbag_2(T,4000,0),
     ?line ets:delete(T).
@@ -786,6 +1028,67 @@ t_test_ms(Config) when is_list(Config) ->
     ?line true = (if is_list(String) -> true; true -> false end),
     ?line verify_etsmem(EtsMem).
 
+t_select_reverse(doc) ->
+    ["Test the select reverse BIF's"];
+t_select_reverse(suite) ->
+    [];
+t_select_reverse(Config) when is_list(Config) ->
+    ?line Table = ets_new(xxx, [ordered_set]),
+    ?line filltabint(Table,1000),
+    ?line A = lists:reverse(ets:select(Table,[{{'$1', '_'},
+					 [{'>',
+					   {'rem',
+					    '$1', 5},
+					   2}],
+					 ['$_']}])),
+    ?line A = ets:select_reverse(Table,[{{'$1', '_'},
+				   [{'>',
+				     {'rem',
+				      '$1', 5},
+				     2}],
+				   ['$_']}]),
+    ?line A = reverse_chunked(Table,[{{'$1', '_'},
+				   [{'>',
+				     {'rem',
+				      '$1', 5},
+				     2}],
+				   ['$_']}],3),
+    % A set/bag/duplicate_bag should get the same result regardless
+    % of select or select_reverse
+    ?line Table2 = ets_new(xxx, [set]),
+    ?line filltabint(Table2,1000),
+    ?line Table3 = ets_new(xxx, [bag]),
+    ?line filltabint(Table3,1000),
+    ?line Table4 = ets_new(xxx, [duplicate_bag]),
+    ?line filltabint(Table4,1000),
+    ?line lists:map(fun(Tab) ->
+		      B = ets:select(Tab,[{{'$1', '_'},
+					   [{'>',
+					     {'rem',
+					      '$1', 5},
+					     2}],
+					   ['$_']}]),
+		      B = ets:select_reverse(Tab,[{{'$1', '_'},
+						   [{'>',
+						     {'rem',
+						      '$1', 5},
+						     2}],
+						   ['$_']}])
+	      end,[Table2, Table3, Table4]),
+    ok.
+
+
+
+reverse_chunked(T,MS,N) ->
+    do_reverse_chunked(ets:select_reverse(T,MS,N),[]).
+
+do_reverse_chunked('$end_of_table',Acc) ->
+    lists:reverse(Acc);
+do_reverse_chunked({L,C},Acc) ->
+    NewAcc = lists:reverse(L)++Acc,
+    do_reverse_chunked(ets:select_reverse(C), NewAcc).
+
+
 t_select_delete(doc) ->
     ["Test the ets:select_delete/2 and ets:select_count/2 BIF's"];
 t_select_delete(suite) ->
@@ -1064,8 +1367,8 @@ random_test() ->
 
 do_random_test() ->
     ?line EtsMem = etsmem(),
-    ?line OrdSet = ets:new(xxx,[ordered_set]),
-    ?line Set = ets:new(xxx,[]),
+    ?line OrdSet = ets_new(xxx,[ordered_set]),
+    ?line Set = ets_new(xxx,[]),
     ?line do_n_times(fun() ->
 		       ?line Key = create_random_string(25),
 		       ?line Value = create_random_tuple(25),
@@ -1269,8 +1572,8 @@ update_element_opts(Opts) ->
 
 
 update_element_opts(Tuple,KeyPos,UpdPos,Opts) ->
-    Set = ets:new(set,[{keypos,KeyPos} | Opts]),
-    OrdSet = ets:new(ordered_set,[ordered_set,{keypos,KeyPos} | Opts]),
+    Set = ets_new(set,[{keypos,KeyPos} | Opts]),
+    OrdSet = ets_new(ordered_set,[ordered_set,{keypos,KeyPos} | Opts]),
     update_element(Set,Tuple,KeyPos,UpdPos),
     update_element(OrdSet,Tuple,KeyPos,UpdPos),
     true = ets:delete(Set),
@@ -1278,7 +1581,7 @@ update_element_opts(Tuple,KeyPos,UpdPos,Opts) ->
     ok.
 
 update_element(T,Tuple,KeyPos,UpdPos) -> 
-    KeyList = [Key || Key <- lists:seq(1,100)],
+    KeyList = [17,"seventeen",<<"seventeen">>,{17},list_to_binary(lists:seq(1,100)),make_ref(), self()],
     lists:foreach(fun(Key) -> 
 			  TupleWithKey = setelement(KeyPos,Tuple,Key),
 			  update_element_do(T,TupleWithKey,Key,UpdPos)
@@ -1292,6 +1595,8 @@ update_element_do(Tab,Tuple,Key,UpdPos) ->
     % This will try all combinations of {fromValue,toValue}
     %
     % IMPORTANT: size(Values) must be a prime number for this to work!!!
+
+    %io:format("update_element_do for key=~p\n",[Key]),
     Big32 = 16#12345678,
     Big64 = 16#123456789abcdef0,
     Values = { 623, -27, 0, Big32, -Big32, Big64, -Big64, Big32*Big32,
@@ -1312,14 +1617,6 @@ update_element_do(Tab,Tuple,Key,UpdPos) ->
 		    (ToIx, [], Pos, _Rand, _MeF) ->
 			 {Pos, element(ToIx+1,Values)}   % single {pos,value} arg
 		 end,
-			 			
-    NewTupleF = fun({Pos,Val}, Tpl, _MeF) ->
-			setelement(Pos, Tpl, Val);
-		   ([{Pos,Val} | Tail], Tpl, MeF) ->
-			MeF(Tail,setelement(Pos, Tpl, Val),MeF);
-		   ([], Tpl, _MeF) ->
-			Tpl
-		end,
 
     UpdateF = fun(ToIx,Rand) -> 
 		      PosValArg = PosValArgF(ToIx,[],UpdPos,Rand,PosValArgF),
@@ -1327,7 +1624,7 @@ update_element_do(Tab,Tuple,Key,UpdPos) ->
 		      ArgHash = erlang:phash2({Tab,Key,PosValArg}),
 		      ?line true = ets:update_element(Tab, Key, PosValArg),
 		      ?line ArgHash = erlang:phash2({Tab,Key,PosValArg}),
-		      NewTuple = NewTupleF(PosValArg,Tuple,NewTupleF),
+		      NewTuple = update_tuple(PosValArg,Tuple),
 		      ?line [NewTuple] = ets:lookup(Tab,Key)
 	      end,
 
@@ -1355,9 +1652,18 @@ update_element_do(Tab,Tuple,Key,UpdPos) ->
     ?line Checksum = (Length-1)*Length*(Length+1) div 2,  % if Length is a prime
     ok.
 
+update_tuple({Pos,Val}, Tpl) ->
+    setelement(Pos, Tpl, Val);
+update_tuple([{Pos,Val} | Tail], Tpl) ->
+    update_tuple(Tail,setelement(Pos, Tpl, Val));
+update_tuple([], Tpl) ->
+    Tpl.
+
+
+
 update_element_neg(Opts) ->
-    Set = ets:new(set,Opts),
-    OrdSet = ets:new(ordered_set,[ordered_set | Opts]),
+    Set = ets_new(set,Opts),
+    OrdSet = ets_new(ordered_set,[ordered_set | Opts]),
     update_element_neg_do(Set),
     update_element_neg_do(OrdSet),
     ets:delete(Set),
@@ -1365,8 +1671,8 @@ update_element_neg(Opts) ->
     ets:delete(OrdSet),
     ?line {'EXIT',{badarg,_}} = (catch ets:update_element(OrdSet,key,{2,1})),
 
-    ?line Bag = ets:new(bag,[bag | Opts]),
-    ?line DBag = ets:new(duplicate_bag,[duplicate_bag | Opts]),
+    ?line Bag = ets_new(bag,[bag | Opts]),
+    ?line DBag = ets_new(duplicate_bag,[duplicate_bag | Opts]),
     ?line {'EXIT',{badarg,_}} = (catch ets:update_element(Bag,key,{2,1})),
     ?line {'EXIT',{badarg,_}} = (catch ets:update_element(DBag,key,{2,1})),
     true = ets:delete(Bag),
@@ -1416,8 +1722,8 @@ update_counter(Config) when is_list(Config) ->
     ?line verify_etsmem(EtsMem).
 
 update_counter_do(Opts) ->
-    Set = ets:new(set,Opts),
-    OrdSet = ets:new(ordered_set,[ordered_set | Opts]),
+    Set = ets_new(set,Opts),
+    OrdSet = ets_new(ordered_set,[ordered_set | Opts]),
     update_counter_for(Set),
     update_counter_for(OrdSet),
     ets:delete(Set),
@@ -1438,6 +1744,7 @@ update_counter_for(T) ->
 		 (Obj, Times, Arg3, Myself) ->
 		      ?line {NewObj, Ret} = uc_mimic(Obj,Arg3),
 		      ArgHash = erlang:phash2({T,a,Arg3}),
+		      %%io:format("update_counter(~p, ~p, ~p) expecting ~p\n",[T,a,Arg3,Ret]),
 		      ?line Ret = ets:update_counter(T,a,Arg3),
 		      ?line ArgHash = erlang:phash2({T,a,Arg3}),
 		      %%io:format("NewObj=~p~n ",[NewObj]),
@@ -1563,8 +1870,8 @@ uc_adder(Init, {_Pos, Add, Thres, Warp}) ->
     end.
     
 update_counter_neg(Opts) ->
-    Set = ets:new(set,Opts),
-    OrdSet = ets:new(ordered_set,[ordered_set | Opts]),
+    Set = ets_new(set,Opts),
+    OrdSet = ets_new(ordered_set,[ordered_set | Opts]),
     update_counter_neg_for(Set),
     update_counter_neg_for(OrdSet),
     ets:delete(Set),
@@ -1572,8 +1879,8 @@ update_counter_neg(Opts) ->
     ets:delete(OrdSet),
     ?line {'EXIT',{badarg,_}} = (catch ets:update_counter(OrdSet,key,1)),
 
-    ?line Bag = ets:new(bag,[bag | Opts]),
-    ?line DBag = ets:new(duplicate_bag,[duplicate_bag | Opts]),
+    ?line Bag = ets_new(bag,[bag | Opts]),
+    ?line DBag = ets_new(duplicate_bag,[duplicate_bag | Opts]),
     ?line {'EXIT',{badarg,_}} = (catch ets:update_counter(Bag,key,1)),
     ?line {'EXIT',{badarg,_}} = (catch ets:update_counter(DBag,key,1)),
     true = ets:delete(Bag),
@@ -1646,7 +1953,7 @@ wait_for_all(Pids0) ->
     end.
 
 evil_counter(I,Opts) ->
-    T = ets:new(a, Opts),
+    T = ets_new(a, Opts),
     Start0 = case I rem 3 of
 		0 -> 16#12345678;
 		1 -> 16#12345678FFFFFFFF;
@@ -1654,7 +1961,7 @@ evil_counter(I,Opts) ->
 	    end,
     Start = Start0 + random:uniform(100000),
     ets:insert(T, {dracula,Start}),
-    Iter = 90000,
+    Iter = 40000,
     End = Start + Iter,
     End = evil_counter_1(Iter, T),
     ets:delete(T).
@@ -1675,7 +1982,7 @@ fixtable_next(Config) when is_list(Config) ->
 
 fixtable_next_do(Opts) ->
     ?line EtsMem = etsmem(),    
-    ?line do_fixtable_next(ets:new(set,[public | Opts])),
+    ?line do_fixtable_next(ets_new(set,[public | Opts])),
     ?line verify_etsmem(EtsMem).
     
 do_fixtable_next(Tab) ->
@@ -1756,24 +2063,24 @@ write_concurrency(doc) -> ["The 'write_concurrency' option"];
 write_concurrency(suite) -> [];
 write_concurrency(Config) when is_list(Config) ->
     ?line EtsMem = etsmem(),
-    Yes1 = ets:new(foo,[public,{write_concurrency,true}]),
-    Yes2 = ets:new(foo,[protected,{write_concurrency,true}]),
-    No1 = ets:new(foo,[private,{write_concurrency,true}]),
+    Yes1 = ets_new(foo,[public,{write_concurrency,true}]),
+    Yes2 = ets_new(foo,[protected,{write_concurrency,true}]),
+    No1 = ets_new(foo,[private,{write_concurrency,true}]),
 
-    Yes3 = ets:new(foo,[bag,public,{write_concurrency,true}]),
-    Yes4 = ets:new(foo,[bag,protected,{write_concurrency,true}]),
-    No2 = ets:new(foo,[bag,private,{write_concurrency,true}]),
+    Yes3 = ets_new(foo,[bag,public,{write_concurrency,true}]),
+    Yes4 = ets_new(foo,[bag,protected,{write_concurrency,true}]),
+    No2 = ets_new(foo,[bag,private,{write_concurrency,true}]),
 
-    Yes5 = ets:new(foo,[duplicate_bag,public,{write_concurrency,true}]),
-    Yes6 = ets:new(foo,[duplicate_bag,protected,{write_concurrency,true}]),
-    No3 = ets:new(foo,[duplicate_bag,private,{write_concurrency,true}]),
+    Yes5 = ets_new(foo,[duplicate_bag,public,{write_concurrency,true}]),
+    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}]),
+    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}]),
+    No7 = ets_new(foo,[public,{write_concurrency,false}]),
+    No8 = ets_new(foo,[protected,{write_concurrency,false}]),
 
     ?line YesMem = ets:info(Yes1,memory),
     ?line NoHashMem = ets:info(No1,memory),
@@ -1800,10 +2107,10 @@ write_concurrency(Config) when is_list(Config) ->
 	    ?line true = YesMem =:= NoHashMem
     end,
 
-    ?line {'EXIT',{badarg,_}} = (catch ets:new(foo,[public,{write_concurrency,foo}])),
-    ?line {'EXIT',{badarg,_}} = (catch ets:new(foo,[public,{write_concurrency}])),
-    ?line {'EXIT',{badarg,_}} = (catch ets:new(foo,[public,{write_concurrency,true,foo}])),
-    ?line {'EXIT',{badarg,_}} = (catch ets:new(foo,[public,write_concurrency])),
+    ?line {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency,foo}])),
+    ?line {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency}])),
+    ?line {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency,true,foo}])),
+    ?line {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,write_concurrency])),
 
     lists:foreach(fun(T) -> ets:delete(T) end,
 		  [Yes1,Yes2,Yes3,Yes4,Yes5,Yes6,
@@ -1880,7 +2187,7 @@ heir_founder(Master, HeirData, Opts) ->
 		  none -> {heir,none};
 		  _ -> {heir, Heir, HeirData}
 	      end,
-    ?line T = ets:new(foo,[named_table, private, HeirTpl | Opts]),
+    ?line T = ets_new(foo,[named_table, private, HeirTpl | Opts]),
     ?line true = ets:insert(T,{key,1}),
     ?line [{key,1}] = ets:lookup(T,key),
     Self = self(),
@@ -1952,7 +2259,7 @@ give_away(Config) when is_list(Config) ->
     repeat_for_opts(give_away_do).
 
 give_away_do(Opts) ->
-    ?line T = ets:new(foo,[named_table, private | Opts]),
+    ?line T = ets_new(foo,[named_table, private | Opts]),
     ?line true = ets:insert(T,{key,1}),
     ?line [{key,1}] = ets:lookup(T,key),
     Parent = self(),
@@ -1978,7 +2285,7 @@ give_away_do(Opts) ->
     ?line undefined = ets:info(T),
 
     %% Give and then kill receiver to get back
-    ?line T2 = ets:new(foo,[private | Opts]),
+    ?line T2 = ets_new(foo,[private | Opts]),
     ?line true = ets:insert(T2,{key,1}),
     ?line ets:setopts(T2,{heir,self(),"Som en gummiboll..."}),
     ?line {Receiver2,Mref2} = spawn_monitor(fun()-> give_away_receiver(T2,Parent) end),
@@ -2000,7 +2307,7 @@ give_away_do(Opts) ->
     ?line give_me = receive_any(),
     ?line {'EXIT',{badarg,_}} = (catch ets:give_away(T2,ReceiverNeg,"A deleted table")),
 
-    ?line T3 = ets:new(foo,[public | Opts]),
+    ?line T3 = ets_new(foo,[public | Opts]),
     spawn_link(fun()-> {'EXIT',{badarg,_}} = (catch ets:give_away(T3,ReceiverNeg,"From non owner")),
 		       Parent ! done
 	       end),
@@ -2035,7 +2342,7 @@ setopts(Config) when is_list(Config) ->
 
 setopts_do(Opts) ->
     Self = self(),
-    ?line T = ets:new(foo,[named_table, private | Opts]),
+    ?line T = ets_new(foo,[named_table, private | Opts]),
     ?line none = ets:info(T,heir),
     Heir = spawn_link(fun()->heir_heir(Self) end),
     ?line ets:setopts(T,{heir,Heir,"Data"}),
@@ -2088,10 +2395,10 @@ bad_table(Config) when is_list(Config) ->
 
 bad_table_do(Opts, DummyFile) ->
     Parent = self(),    
-    {Pid,Mref} = spawn_opt(fun()-> ets:new(priv,[private,named_table | Opts]),
-				   Priv = ets:new(priv,[private | Opts]),
-				   ets:new(prot,[protected,named_table | Opts]),
-				   Prot = ets:new(prot,[protected | Opts]),
+    {Pid,Mref} = spawn_opt(fun()-> ets_new(priv,[private,named_table | Opts]),
+				   Priv = ets_new(priv,[private | Opts]),
+				   ets_new(prot,[protected,named_table | Opts]),
+				   Prot = ets_new(prot,[protected | Opts]),
 				   Parent ! {self(),Priv,Prot},
 				   die_please = receive_any()
 			   end,
@@ -2149,11 +2456,11 @@ bad_table_do(Opts, DummyFile) ->
 
 bad_table_op({Opts,Priv,Prot}, Op) ->
     %%io:format("Doing Op=~p on ~p's\n",[Op,Type]),
-    T1 = ets:new(noname,Opts),
+    T1 = ets_new(noname,Opts),
     bad_table_call(noname,Op),
     ets:delete(T1),
     bad_table_call(T1,Op),
-    T2 = ets:new(named,[named_table | Opts]),
+    T2 = ets_new(named,[named_table | Opts]),
     ets:delete(T2),
     bad_table_call(named,Op),
     bad_table_call(T2,Op),
@@ -2187,7 +2494,7 @@ rename(Config) when is_list(Config) ->
 
 rename_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ets:new(foobazz,[named_table, public | Opts]),
+    ets_new(foobazz,[named_table, public | Opts]),
     ets:insert(foobazz,{foo,bazz}),
     ungermanbazz = ets:rename(foobazz,ungermanbazz),
     {'EXIT',{badarg, _}} = (catch ets:lookup(foobazz,foo)),
@@ -2205,7 +2512,7 @@ rename_unnamed(Config) when is_list(Config) ->
 
 rename_unnamed_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(bonkz,[public | Opts]),
+    ?line Tab = ets_new(bonkz,[public | Opts]),
     ?line {'EXIT',{badarg, _}} = (catch ets:insert(bonkz,{foo,bazz})),
     ?line bonkz = ets:info(Tab, name),
     ?line Tab = ets:rename(Tab, tjabonkz),
@@ -2224,7 +2531,7 @@ evil_rename(Config) when is_list(Config) ->
 
 evil_rename_1(Old, New, Flags) ->
     ?line process_flag(trap_exit, true),
-    ?line Old = ets:new(Old, Flags),
+    ?line Old = ets_new(Old, Flags),
     ?line Fixer = fun() -> ets:safe_fixtable(Old, true) end,
     ?line crazy_fixtable(15000, Fixer),
     ?line erlang:yield(),
@@ -2234,7 +2541,7 @@ evil_rename_1(Old, New, Flags) ->
     ok.
 
 crazy_fixtable(N, Fixer) ->
-    Dracula = ets:new(count_dracula, [public]),
+    Dracula = ets_new(count_dracula, [public]),
     ets:insert(Dracula, {count,0}),
     SpawnFun = fun() ->
 		       Fixer(),
@@ -2268,7 +2575,7 @@ evil_creater_destroyer() ->
     ets:delete(T1).
 
 evil_create_fixed_tab() ->
-    T = ets:new(arne, [public]),
+    T = ets_new(arne, [public]),
     ets:safe_fixtable(T, true),
     T.
 
@@ -2282,8 +2589,8 @@ interface_equality(Config) when is_list(Config) ->
 
 interface_equality_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Set = ets:new(set,[set | Opts]),
-    ?line OrderedSet = ets:new(ordered_set,[ordered_set | Opts]),
+    ?line Set = ets_new(set,[set | Opts]),
+    ?line OrderedSet = ets_new(ordered_set,[ordered_set | Opts]),
     ?line F = fun(X,T,FF) -> case X of 
 			   0 -> true; 
 			   _ -> 
@@ -2362,7 +2669,7 @@ ordered_match_do(Opts) ->
 			     FF(X-1,T,FF) 
 		     end 
 	end,
-    ?line T1 = ets:new(xxx,[ordered_set| Opts]),
+    ?line T1 = ets_new(xxx,[ordered_set| Opts]),
     ?line F(3000,T1,F),
     ?line [[3,3],[3,3],[3,3]] = ets:match(T1, {'_','_','$1','$2',3}),
     ?line F2 = fun(X,Rem,Res,FF) -> case X of 
@@ -2400,7 +2707,7 @@ ordered(Config) when is_list(Config) ->
 
 ordered_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line T = ets:new(oset, [ordered_set | Opts]),
+    ?line T = ets_new(oset, [ordered_set | Opts]),
     ?line InsList = [ 
 		      25,26,27,28,
 		      5,6,7,8,
@@ -2461,8 +2768,8 @@ setbag(doc) ->   ["Small test case for both set and bag type ets tables."];
 setbag(suite) -> [];
 setbag(Config) when is_list(Config) ->    
     ?line EtsMem = etsmem(),
-    ?line Set = ets:new(set,[set]),
-    ?line Bag = ets:new(bag,[bag]),
+    ?line Set = ets_new(set,[set]),
+    ?line Bag = ets_new(bag,[bag]),
     ?line Key = {foo,bar},
     
     %% insert some value
@@ -2482,15 +2789,15 @@ setbag(Config) when is_list(Config) ->
     ?line verify_etsmem(EtsMem).
 
 badnew(doc) ->
-    ["Test case to check proper return values for illegal ets:new() calls."];
+    ["Test case to check proper return values for illegal ets_new() calls."];
 badnew(suite) -> [];
 badnew(Config) when is_list(Config) ->
     ?line EtsMem = etsmem(),
-    ?line {'EXIT',{badarg,_}} = (catch ets:new(12,[])),
-    ?line {'EXIT',{badarg,_}} = (catch ets:new({a,b},[])),
-    ?line {'EXIT',{badarg,_}} = (catch ets:new(name,[foo])),
-    ?line {'EXIT',{badarg,_}} = (catch ets:new(name,{bag})),
-    ?line {'EXIT',{badarg,_}} = (catch ets:new(name,bag)),
+    ?line {'EXIT',{badarg,_}} = (catch ets_new(12,[])),
+    ?line {'EXIT',{badarg,_}} = (catch ets_new({a,b},[])),
+    ?line {'EXIT',{badarg,_}} = (catch ets_new(name,[foo])),
+    ?line {'EXIT',{badarg,_}} = (catch ets_new(name,{bag})),
+    ?line {'EXIT',{badarg,_}} = (catch ets_new(name,bag)),
     ?line verify_etsmem(EtsMem).
 
 verybadnew(doc) ->
@@ -2499,7 +2806,7 @@ verybadnew(doc) ->
 verybadnew(suite) -> [];
 verybadnew(Config) when is_list(Config) ->
     ?line EtsMem = etsmem(),
-    ?line {'EXIT',{badarg,_}} = (catch ets:new(verybad,[set|protected])),
+    ?line {'EXIT',{badarg,_}} = (catch ets_new(verybad,[set|protected])),
     ?line verify_etsmem(EtsMem).
 
 named(doc) ->   ["Small check to see if named tables work."];
@@ -2576,9 +2883,9 @@ privacy_check(Pub,Prot,Priv) ->
     ?line [] = ets:lookup(Prot,foo).
 
 privacy_owner(Boss, Opts) ->
-    ets:new(pub, [public,named_table | Opts]),
-    ets:new(prot,[protected,named_table | Opts]),
-    ets:new(priv,[private,named_table | Opts]),
+    ets_new(pub, [public,named_table | Opts]),
+    ets_new(prot,[protected,named_table | Opts]),
+    ets_new(priv,[private,named_table | Opts]),
     Boss ! ok,
     privacy_owner_loop(Boss).
 
@@ -2605,8 +2912,6 @@ rotate_tuple(Tuple, N) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-insert(doc) ->   ["Test proper and improper inserts into a table."];
-insert(suite) -> [empty,badinsert].
 
 empty(doc) ->
     ["Check lookup in an empty table and lookup of a non-existing key"];
@@ -2616,7 +2921,7 @@ empty(Config) when is_list(Config) ->
 
 empty_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(foo,Opts),
+    ?line Tab = ets_new(foo,Opts),
     ?line [] = ets:lookup(Tab,key),
     ?line true = ets:insert(Tab,{key2,val}),
     ?line [] = ets:lookup(Tab,key),
@@ -2633,10 +2938,10 @@ badinsert_do(Opts) ->
     ?line EtsMem = etsmem(),
     ?line {'EXIT',{badarg,_}} = (catch ets:insert(foo,{key,val})),
     
-    ?line Tab = ets:new(foo,Opts),
+    ?line Tab = ets_new(foo,Opts),
     ?line {'EXIT',{badarg,_}} = (catch ets:insert(Tab,{})),
 
-    ?line Tab3 = ets:new(foo,[{keypos,3}| Opts]),
+    ?line Tab3 = ets_new(foo,[{keypos,3}| Opts]),
     ?line {'EXIT',{badarg,_}} = (catch ets:insert(Tab3,{a,b})),
 
     ?line {'EXIT',{badarg,_}} = (catch ets:insert(Tab,[key,val2])),
@@ -2646,8 +2951,6 @@ badinsert_do(Opts) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-lookup(doc) -> ["Some tests for lookups (timing, bad lookups, etc.)."];
-lookup(suite) -> [time_lookup,badlookup,lookup_order].
 
 time_lookup(doc) ->   ["Lookup timing."];
 time_lookup(suite) -> [];
@@ -2660,7 +2963,7 @@ time_lookup(Config) when is_list(Config) ->
 				   "~p ets lookups/s",[Values]))}.
 
 time_lookup_do(Opts) ->
-    ?line Tab = ets:new(foo,Opts),
+    ?line Tab = ets_new(foo,Opts),
     ?line fill_tab(Tab,foo),
     ?line ets:insert(Tab,{{a,key},foo}),
     ?line {Time,_} = ?t:timecall(test_server,do_times,
@@ -2675,7 +2978,7 @@ badlookup(suite) -> [];
 badlookup(Config) when is_list(Config) ->
     ?line EtsMem = etsmem(),
     ?line {'EXIT',{badarg,_}} = (catch ets:lookup(foo,key)),
-    ?line Tab = ets:new(foo,[]),
+    ?line Tab = ets_new(foo,[]),
     ?line ets:delete(Tab),
     ?line {'EXIT',{badarg,_}} = (catch ets:lookup(Tab,key)),
     ?line verify_etsmem(EtsMem).
@@ -2700,7 +3003,7 @@ lookup_order_2(Opts, Fixed) ->
     Pair = [{A,B},{B,A},{A,C},{C,A},{B,C},{C,B}],
     Combos = [{D1,D2,D3} || D1<-ABC, D2<-Pair, D3<-Pair],
     lists:foreach(fun({D1,{D2a,D2b},{D3a,D3b}}) ->
-			  T = ets:new(foo,Opts),
+			  T = ets_new(foo,Opts),
 			  case Fixed of
 			      true -> ets:safe_fixtable(T,true);
 			      false -> ok
@@ -2774,8 +3077,6 @@ fill_tab(Tab,Val) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-lookup_element(doc) -> ["Some tests for lookup_element."];
-lookup_element(suite) -> [lookup_element_mult].
 
 lookup_element_mult(doc) ->   ["Multiple return elements (OTP-2386)"];
 lookup_element_mult(suite) -> [];
@@ -2784,10 +3085,12 @@ lookup_element_mult(Config) when is_list(Config) ->
 
 lookup_element_mult_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line T = ets:new(service, [bag, {keypos, 2} | Opts]),
+    ?line T = ets_new(service, [bag, {keypos, 2} | Opts]),
     ?line D = lists:reverse(lem_data()),
     ?line lists:foreach(fun(X) -> ets:insert(T, X) end, D),
     ?line ok = lem_crash_3(T),
+    ?line ets:insert(T, {0, "heap_key"}),
+    ?line ets:lookup_element(T, "heap_key", 2),
     ?line true = ets:delete(T),
     ?line verify_etsmem(EtsMem).
 
@@ -2815,11 +3118,6 @@ lem_crash_3(T) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-delete(doc) ->
-    ["Check delete functionality (proper/improper deletes)"];
-delete(suite) ->
-    [delete_elem,delete_tab,delete_large_tab,delete_large_named_table,evil_delete,
-     table_leak,baddelete,match_delete,match_delete3].
 
 delete_elem(doc) ->
     ["Check delete of an element inserted in a `filled' table."];
@@ -2829,7 +3127,7 @@ delete_elem(Config) when is_list(Config) ->
 
 delete_elem_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(foo,Opts),
+    ?line Tab = ets_new(foo,Opts),
     ?line fill_tab(Tab,foo),
     ?line ets:insert(Tab,{{b,key},foo}),
     ?line ets:insert(Tab,{{c,key},foo}),
@@ -2849,17 +3147,17 @@ delete_tab(Config) when is_list(Config) ->
 delete_tab_do(Opts) ->
     Name = foo,
     ?line EtsMem = etsmem(),
-    ?line Name = ets:new(Name, [named_table | Opts]),
+    ?line Name = ets_new(Name, [named_table | Opts]),
     ?line true = ets:delete(foo),
     %% The name should be available again.
-    ?line Name = ets:new(Name, [named_table | Opts]),
+    ?line Name = ets_new(Name, [named_table | Opts]),
     ?line true = ets:delete(Name),
     ?line verify_etsmem(EtsMem).
 
 delete_large_tab(doc) ->
     "Check that ets:delete/1 works and that other processes can run.";
 delete_large_tab(Config) when is_list(Config) ->
-    ?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 500000)],
+    ?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 200000)],
     ?line EtsMem = etsmem(),
     repeat_for_opts(fun(Opts) -> delete_large_tab_do(Opts,Data) end),
     ?line verify_etsmem(EtsMem).
@@ -2871,7 +3169,7 @@ delete_large_tab_do(Opts,Data) ->
 
 
 delete_large_tab_1(Name, Flags, Data, Fix) ->
-    ?line Tab = ets:new(Name, Flags),
+    ?line Tab = ets_new(Name, Flags),
     ?line ets:insert(Tab, Data),
 
     case Fix of
@@ -2938,7 +3236,7 @@ delete_large_named_table_do(Opts,Data) ->
     ?line delete_large_named_table_1(foo_hash, [named_table | Opts], Data, true).
 
 delete_large_named_table_1(Name, Flags, Data, Fix) ->
-    ?line Tab = ets:new(Name, Flags),
+    ?line Tab = ets_new(Name, Flags),
     ?line ets:insert(Tab, Data),
 
     case Fix of
@@ -2951,7 +3249,7 @@ delete_large_named_table_1(Name, Flags, Data, Fix) ->
     Pid = spawn_link(fun() ->
 			     receive
 				 {trace,Parent,call,_} ->
-				     ets:new(Name, [named_table])
+				     ets_new(Name, [named_table])
 			     end
 		     end),
     ?line erlang:trace(self(), true, [call,{tracer,Pid}]),
@@ -2985,7 +3283,7 @@ evil_delete_do(Opts,Data) ->
 
 evil_delete_not_owner(Name, Flags, Data, Fix) ->
     io:format("Not owner: ~p, fix = ~p", [Name,Fix]),
-    ?line Tab = ets:new(Name, [public|Flags]),
+    ?line Tab = ets_new(Name, [public|Flags]),
     ?line ets:insert(Tab, Data),
     case Fix of
 	false -> ok;
@@ -3010,7 +3308,7 @@ evil_delete_not_owner(Name, Flags, Data, Fix) ->
 
 evil_delete_owner(Name, Flags, Data, Fix) ->
     ?line Fun = fun() ->
-			?line Tab = ets:new(Name, [public|Flags]),
+			?line Tab = ets_new(Name, [public|Flags]),
 			?line ets:insert(Tab, Data),
 			case Fix of
 			    false -> ok;
@@ -3037,48 +3335,60 @@ exit_large_table_owner(doc) ->
 exit_large_table_owner(suite) ->
     [];
 exit_large_table_owner(Config) when is_list(Config) ->
-    ?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 500000)],
+    %%?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 500000)],
+    ?line FEData = fun(Do) -> repeat_while(fun(500000) -> {false,ok};
+                                              (I) -> Do({erlang:phash2(I, 16#ffffff),I}),
+                                                     {true, I+1}
+                                           end, 1)
+                   end,
     ?line EtsMem = etsmem(),
-    repeat_for_opts(fun(Opts) -> exit_large_table_owner_do(Opts,Data,Config) end),
+    repeat_for_opts({exit_large_table_owner_do,{FEData,Config}}),
     ?line verify_etsmem(EtsMem).
 
-exit_large_table_owner_do(Opts,Data,Config) ->
-    ?line verify_rescheduling_exit(Config, Data, [named_table | Opts], true, 1, 1),
-    ?line verify_rescheduling_exit(Config, Data, Opts, false, 1, 1).
+exit_large_table_owner_do(Opts,{FEData,Config}) ->
+    ?line verify_rescheduling_exit(Config, FEData, [named_table | Opts], true, 1, 1),
+    ?line verify_rescheduling_exit(Config, FEData, Opts, false, 1, 1).
 
 exit_many_large_table_owner(doc) -> [];
 exit_many_large_table_owner(suite) -> [];
 exit_many_large_table_owner(Config) when is_list(Config) ->
-    ?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 500000)],
+    %%?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 500000)],
+    ?line FEData = fun(Do) -> repeat_while(fun(500000) -> {false,ok};
+                                              (I) -> Do({erlang:phash2(I, 16#ffffff),I}),
+                                                     {true, I+1}
+                                           end, 1)
+                   end,
     ?line EtsMem = etsmem(),
-    repeat_for_opts(fun(Opts) -> exit_many_large_table_owner_do(Opts,Data,Config) end),
+    repeat_for_opts(fun(Opts) -> exit_many_large_table_owner_do(Opts,FEData,Config) end),
     ?line verify_etsmem(EtsMem).
 
-exit_many_large_table_owner_do(Opts,Data,Config) -> 
-    ?line verify_rescheduling_exit(Config, Data, Opts, true, 1, 4),
-    ?line verify_rescheduling_exit(Config, Data, [named_table | Opts], false, 1, 4).
+exit_many_large_table_owner_do(Opts,FEData,Config) ->
+    ?line verify_rescheduling_exit(Config, FEData, Opts, true, 1, 4),
+    ?line verify_rescheduling_exit(Config, FEData, [named_table | Opts], false, 1, 4).
 
 exit_many_tables_owner(doc) -> [];
 exit_many_tables_owner(suite) -> [];
 exit_many_tables_owner(Config) when is_list(Config) ->
+    NoData = fun(_Do) -> ok end,
     ?line EtsMem = etsmem(),
-    ?line verify_rescheduling_exit(Config, [], [named_table], false, 1000, 1),
-    ?line verify_rescheduling_exit(Config, [], [named_table,{write_concurrency,true}], false, 1000, 1),
+    ?line verify_rescheduling_exit(Config, NoData, [named_table], false, 1000, 1),
+    ?line verify_rescheduling_exit(Config, NoData, [named_table,{write_concurrency,true}], false, 1000, 1),
     ?line verify_etsmem(EtsMem).
 
 exit_many_many_tables_owner(doc) -> [];
 exit_many_many_tables_owner(suite) -> [];
 exit_many_many_tables_owner(Config) when is_list(Config) ->
     ?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 50)],
-    repeat_for_opts(fun(Opts) -> exit_many_many_tables_owner_do(Opts,Data,Config) end).
+    ?line FEData = fun(Do) -> lists:foreach(Do, Data) end,
+    repeat_for_opts(fun(Opts) -> exit_many_many_tables_owner_do(Opts,FEData,Config) end).
 
-exit_many_many_tables_owner_do(Opts,Data,Config) ->
-    ?line verify_rescheduling_exit(Config, Data, [named_table | Opts], true, 200, 5),
-    ?line verify_rescheduling_exit(Config, Data, Opts, false, 200, 5),
+exit_many_many_tables_owner_do(Opts,FEData,Config) ->
+    ?line verify_rescheduling_exit(Config, FEData, [named_table | Opts], true, 200, 5),
+    ?line verify_rescheduling_exit(Config, FEData, Opts, false, 200, 5),
     ?line wait_for_test_procs(),
     ?line EtsMem = etsmem(),
-    ?line verify_rescheduling_exit(Config, Data, Opts, true, 200, 5),
-    ?line verify_rescheduling_exit(Config, Data, [named_table | Opts], false, 200, 5),
+    ?line verify_rescheduling_exit(Config, FEData, Opts, true, 200, 5),
+    ?line verify_rescheduling_exit(Config, FEData, [named_table | Opts], false, 200, 5),
     ?line verify_etsmem(EtsMem).
     
 
@@ -3121,7 +3431,7 @@ vre_fix_tables(Tab) ->
     receive Go -> ok end,
     ok.
 
-verify_rescheduling_exit(Config, Data, Flags, Fix, NOTabs, NOProcs) ->
+verify_rescheduling_exit(Config, ForEachData, Flags, Fix, NOTabs, NOProcs) ->
     ?line NoFix = 5,
     ?line TestCase = atom_to_list(?config(test_case, Config)),
     ?line Parent = self(),
@@ -3136,8 +3446,8 @@ verify_rescheduling_exit(Config, Data, Flags, Fix, NOTabs, NOProcs) ->
 					 ++ "-" ++ integer_to_list(A)
 					 ++ "-" ++ integer_to_list(B)
 					 ++ "-" ++ integer_to_list(C)),
-			  Tab = ets:new(Name, Flags),
-			  ets:insert(Tab, Data),
+			  Tab = ets_new(Name, Flags),
+                          ForEachData(fun(Data) -> ets:insert(Tab, Data) end),
 			  case Fix of
 			      false -> ok;
 			      true ->
@@ -3145,10 +3455,10 @@ verify_rescheduling_exit(Config, Data, Flags, Fix, NOTabs, NOProcs) ->
 							vre_fix_tables(Tab)
 						end,
 						lists:seq(1,NoFix)),
-				  lists:foreach(fun({K,_}) ->
-							ets:delete(Tab, K)
-						end,
-						Data)
+                                  KeyPos = ets:info(Tab,keypos),
+                                  ForEachData(fun(Data) ->
+                                                ets:delete(Tab, element(KeyPos,Data))
+                                              end)
 			  end
 		  end,
 		  NOTabs),
@@ -3195,7 +3505,7 @@ table_leak(Config) when is_list(Config) ->
 
 table_leak_1(_,0) -> ok;
 table_leak_1(Opts,N) ->
-    ?line T = ets:new(fooflarf, Opts),
+    ?line T = ets_new(fooflarf, Opts),
     ?line true = ets:delete(T),
     table_leak_1(Opts,N-1).
 
@@ -3205,7 +3515,7 @@ baddelete(suite) -> [];
 baddelete(Config) when is_list(Config) ->
     ?line EtsMem = etsmem(),
     ?line {'EXIT',{badarg,_}} = (catch ets:delete(foo)),
-    ?line Tab = ets:new(foo,[]),
+    ?line Tab = ets_new(foo,[]),
     ?line true = ets:delete(Tab),
     ?line {'EXIT',{badarg,_}} = (catch ets:delete(Tab)),
     ?line verify_etsmem(EtsMem).
@@ -3220,7 +3530,7 @@ match_delete(Config) when is_list(Config) ->
 
 match_delete_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(kad,Opts),
+    ?line Tab = ets_new(kad,Opts),
     ?line fill_tab(Tab,foo),
     ?line ets:insert(Tab,{{c,key},bar}),
     ?line _ = ets:match_delete(Tab,{'_',foo}),
@@ -3264,7 +3574,7 @@ firstnext(Config) when is_list(Config) ->
 
 firstnext_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(foo,Opts),
+    ?line Tab = ets_new(foo,Opts),
     ?line [] = firstnext_collect(Tab,ets:first(Tab),[]),
     ?line fill_tab(Tab,foo),
     ?line Len = length(ets:tab2list(Tab)),
@@ -3287,10 +3597,10 @@ firstnext_concurrent(Config) when is_list(Config) ->
     [dynamic_go() || _ <- lists:seq(1, 2)],
     receive
 	after 5000 -> ok
-	end.
+    end.
 
 ets_init(Tab, N) ->
-    ets:new(Tab, [named_table,public,ordered_set]),
+    ets_new(Tab, [named_table,public,ordered_set]),
     cycle(Tab, lists:seq(1,N+1)).
 
 cycle(_Tab, [H|T]) when H > length(T)-> ok;
@@ -3323,7 +3633,7 @@ slot(Config) when is_list(Config) ->
 
 slot_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(foo,Opts),
+    ?line Tab = ets_new(foo,Opts),
     ?line fill_tab(Tab,foo),
     ?line Elts = ets:info(Tab,size),
     ?line Elts = slot_loop(Tab,0,0),
@@ -3342,7 +3652,6 @@ slot_loop(Tab,SlotNo,EltsSoFar) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-match(suite) -> [match1, match2, match_object, match_object2].
 
 match1(suite) -> [];
 match1(Config) when is_list(Config) ->
@@ -3350,7 +3659,7 @@ match1(Config) when is_list(Config) ->
 
 match1_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(foo,Opts),
+    ?line Tab = ets_new(foo,Opts),
     ?line fill_tab(Tab,foo),
     ?line [] = ets:match(Tab,{}),
     ?line ets:insert(Tab,{{one,4},4}),
@@ -3415,7 +3724,7 @@ match_object(Config) when is_list(Config) ->
 
 match_object_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(foobar, Opts),
+    ?line Tab = ets_new(foobar, Opts),
     ?line fill_tab(Tab, foo),
     ?line ets:insert(Tab, {{one, 4}, 4}),
     ?line ets:insert(Tab,{{one,5},5}),
@@ -3459,7 +3768,7 @@ match_object2(Config) when is_list(Config) ->
 
 match_object2_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(foo, [bag, {keypos, 2} | Opts]),
+    ?line Tab = ets_new(foo, [bag, {keypos, 2} | Opts]),
     ?line fill_tab2(Tab, 0, 13005),     % match_db_object does 1000
                                        % elements per pass, might
                                        % change in the future.
@@ -3477,7 +3786,6 @@ match_object2_do(Opts) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-misc(suite) -> [misc1, safe_fixtable, info, dups, tab2list].
 
 tab2list(doc) -> ["Tests tab2list (OTP-3319)"];
 tab2list(suite) -> [];
@@ -3498,7 +3806,7 @@ misc1(Config) when is_list(Config) ->
 
 misc1_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(foo,Opts),
+    ?line Tab = ets_new(foo,Opts),
     ?line true = lists:member(Tab,ets:all()),
     ?line ets:delete(Tab),
     ?line false = lists:member(Tab,ets:all()),
@@ -3517,7 +3825,7 @@ safe_fixtable(Config) when is_list(Config) ->
 
 safe_fixtable_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(foo, Opts),
+    ?line Tab = ets_new(foo, Opts),
     ?line fill_tab(Tab, foobar),
     ?line true = ets:safe_fixtable(Tab, true),
     ?line receive after 1 -> ok end,
@@ -3556,7 +3864,7 @@ info_do(Opts) ->
     ?line EtsMem = etsmem(),
     ?line MeMyselfI=self(),
     ?line ThisNode=node(),
-    ?line Tab = ets:new(foobar, [{keypos, 2} | Opts]),
+    ?line Tab = ets_new(foobar, [{keypos, 2} | Opts]),
 
     %% Note: ets:info/1 used to return a tuple, but from R11B onwards it
     %% returns a list.
@@ -3610,15 +3918,12 @@ dups_do(Opts) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-files(suite) -> [tab2file, tab2file2, tab2file3, tabfile_ext1, tabfile_ext2,
-		 tabfile_ext3, tabfile_ext4].
-
 tab2file(doc) -> ["Check the ets:tab2file function on an empty "
 		  "ets table."];
 tab2file(suite) -> [];
 tab2file(Config) when is_list(Config) ->
     %% Write an empty ets table to a file, read back and check properties.
-    ?line Tab = ets:new(ets_SUITE_foo_tab, [named_table, set, private,
+    ?line Tab = ets_new(ets_SUITE_foo_tab, [named_table, set, private,
 					    {keypos, 2}]),
     ?line FName = filename:join([?config(priv_dir, Config),"tab2file_case"]),
     ?line ok = ets:tab2file(Tab, FName),
@@ -3634,51 +3939,36 @@ tab2file(Config) when is_list(Config) ->
     ?line verify_etsmem(EtsMem).
     
 tab2file2(doc) -> ["Check the ets:tab2file function on a ",
-		   "filled set type ets table."];
+		   "filled set/bag type ets table."];
 tab2file2(suite) -> [];
-tab2file2(Config) when is_list(Config) ->	
-    %% Try the same on a filled set table.
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(ets_SUITE_foo_tab, [named_table, set, private,
-					    {keypos, 2}]),
-    ?line FName = filename:join([?config(priv_dir, Config),"tab2file2_case"]),
-    ?line ok = fill_tab2(Tab, 0, 10000),   % Fill up the table (grucho mucho!)
-    ?line Len = length(ets:tab2list(Tab)),
-    ?line ok = ets:tab2file(Tab, FName),
-    ?line true = ets:delete(Tab),
-    %
-    ?line {ok, Tab2} = ets:file2tab(FName),
-    ?line private = ets:info(Tab2, protection),
-    ?line true = ets:info(Tab2, named_table),
-    ?line 2 = ets:info(Tab2, keypos),
-    ?line set = ets:info(Tab2, type),
-    ?line Len = length(ets:tab2list(Tab2)),
-    ?line true = ets:delete(Tab2),
-    ?line verify_etsmem(EtsMem).
+tab2file2(Config) when is_list(Config) ->
+    repeat_for_opts({tab2file2_do,Config}, [[set,bag],compressed]).
 
-tab2file3(doc) -> ["Check the ets:tab2file function on a ",
-		   "filled bag type ets table."];
-tab2file3(suite) -> [];
-tab2file3(Config) when is_list(Config) ->
-    %% Try the same on a filled bag table.
+tab2file2_do(Opts, Config) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(ets_SUITE_foo_tab, [named_table, bag, private,
-					    {keypos, 2}]),
-    ?line FName = filename:join([?config(priv_dir, Config),"tab2file3_case"]),
+    ?line Tab = ets_new(ets_SUITE_foo_tab, [named_table, private,
+					    {keypos, 2} | Opts]),
+    ?line FName = filename:join([?config(priv_dir, Config),"tab2file2_case"]),
     ?line ok = fill_tab2(Tab, 0, 10000),   % Fill up the table (grucho mucho!)
     ?line Len = length(ets:tab2list(Tab)),
     ?line Mem = ets:info(Tab, memory),
+    ?line Type = ets:info(Tab, type),
+    %%io:format("org tab: ~p\n",[ets:info(Tab)]),
     ?line ok = ets:tab2file(Tab, FName),
     ?line true = ets:delete(Tab),
 
+    ?line EtsMem4 = etsmem(),
+
     ?line {ok, Tab2} = ets:file2tab(FName),
+    %%io:format("loaded tab: ~p\n",[ets:info(Tab2)]),
     ?line private = ets:info(Tab2, protection),
     ?line true = ets:info(Tab2, named_table),
     ?line 2 = ets:info(Tab2, keypos),
-    ?line bag = ets:info(Tab2, type),
+    ?line Type = ets:info(Tab2, type),
     ?line Len = length(ets:tab2list(Tab2)),
     ?line Mem = ets:info(Tab2, memory),
     ?line true = ets:delete(Tab2),
+    io:format("Between = ~p\n", [EtsMem4]),
     ?line verify_etsmem(EtsMem).
 
 -define(test_list, [8,5,4,1,58,125,255, 250, 245, 240, 235,
@@ -3722,7 +4012,7 @@ tabfile_ext1_do(Opts,Config) ->
     ?line FName = filename:join([?config(priv_dir, Config),"nisse.dat"]),
     ?line FName2 = filename:join([?config(priv_dir, Config),"countflip.dat"]),
     L = lists:seq(1,10),
-    T = ets:new(x,Opts),
+    T = ets_new(x,Opts),
     Name = make_ref(),
     [ets:insert(T,{X,integer_to_list(X)}) || X <- L],
     ok = ets:tab2file(T,FName,[{extended_info,[object_count]}]),
@@ -3762,7 +4052,7 @@ tabfile_ext2_do(Opts,Config) ->
     ?line FName = filename:join([?config(priv_dir, Config),"olle.dat"]),
     ?line FName2 = filename:join([?config(priv_dir, Config),"bitflip.dat"]),
     L = lists:seq(1,10),
-    T = ets:new(x,Opts),
+    T = ets_new(x,Opts),
     Name = make_ref(),
     [ets:insert(T,{X,integer_to_list(X)}) || X <- L],
     ok = ets:tab2file(T,FName,[{extended_info,[md5sum]}]),
@@ -3800,7 +4090,7 @@ tabfile_ext3(Config) when is_list(Config) ->
     ?line FName2 = filename:join([?config(priv_dir, Config),"ncountflip.dat"]),
     L = lists:seq(1,10),
     Name = make_ref(),
-    ?MODULE = ets:new(?MODULE,[named_table]),
+    ?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),
@@ -3832,7 +4122,7 @@ tabfile_ext4(doc) ->
 tabfile_ext4(Config) when is_list(Config) ->
     ?line FName = filename:join([?config(priv_dir, Config),"bauta.dat"]),
     LL = lists:seq(1,10000),
-    TL = ets:new(x,[]),
+    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]}]),
@@ -3877,7 +4167,6 @@ make_sub_binary(List, Num) when is_list(List) ->
     {_,B} = split_binary(Bin, N+1),
     B.
 
-heavy(suite) -> [heavy_lookup, heavy_lookup_element].
 
 %% Lookup stuff like crazy...
 heavy_lookup(doc) -> ["Performs multiple lookups for every key ",
@@ -3888,7 +4177,7 @@ heavy_lookup(Config) when is_list(Config) ->
 
 heavy_lookup_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(foobar_table, [set, protected, {keypos, 2} | Opts]),
+    ?line Tab = ets_new(foobar_table, [set, protected, {keypos, 2} | Opts]),
     ?line ok = fill_tab2(Tab, 0, 7000),
     ?line ?t:do_times(50, ?MODULE, do_lookup, [Tab, 6999]),
     ?line true = ets:delete(Tab),
@@ -3911,7 +4200,7 @@ heavy_lookup_element(Config) when is_list(Config) ->
 
 heavy_lookup_element_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line Tab = ets:new(foobar_table, [set, protected, {keypos, 2} | Opts]),
+    ?line Tab = ets_new(foobar_table, [set, protected, {keypos, 2} | Opts]),
     ?line ok = fill_tab2(Tab, 0, 7000),
     case os:type() of
 	vxworks ->
@@ -3940,9 +4229,44 @@ do_lookup_element(Tab, N, M) ->
     end.
 
 
-fold(suite) -> [foldl_ordered, foldr_ordered,
-		foldl, foldr,
-		fold_empty].
+heavy_concurrent(Config) when is_list(Config) ->
+    repeat_for_opts(do_heavy_concurrent).
+
+do_heavy_concurrent(Opts) ->
+    ?line Size = 10000,
+    ?line EtsMem = etsmem(),
+    ?line Tab = ets_new(blupp, [set, public, {keypos, 2} | Opts]),
+    ?line ok = fill_tab2(Tab, 0, Size),
+    ?line Procs = lists:map(
+		    fun (N) ->
+			    spawn_link(
+			      fun () ->
+				      do_heavy_concurrent_proc(Tab, Size, N)
+			      end)
+		    end,
+		    lists:seq(1, 500)),
+    ?line lists:foreach(fun (P) ->
+				M = erlang:monitor(process, P),
+				receive
+				    {'DOWN', M, process, P, _} ->
+					ok
+				end
+			end,
+			Procs),
+    ?line true = ets:delete(Tab),
+    ?line verify_etsmem(EtsMem).
+
+do_heavy_concurrent_proc(_Tab, 0, _Offs) ->
+    done;
+do_heavy_concurrent_proc(Tab, N, Offs) when (N+Offs) rem 100 == 0 ->
+    Data = {"here", are, "S O M E ", data, "toooooooooooooooooo", insert,
+	    make_ref(), make_ref(), make_ref()},
+    true=ets:insert(Tab, {{self(),Data}, N}),
+    do_heavy_concurrent_proc(Tab, N-1, Offs);
+do_heavy_concurrent_proc(Tab, N, Offs) ->
+    _ = ets:lookup(Tab, N),
+    do_heavy_concurrent_proc(Tab, N-1, Offs).
+
 
 fold_empty(doc) ->
     [];
@@ -4012,7 +4336,7 @@ member(Config) when is_list(Config) ->
 
 member_do(Opts) ->
     ?line EtsMem = etsmem(),
-    ?line T = ets:new(xxx, Opts),
+    ?line T = ets_new(xxx, Opts),
     ?line false = ets:member(T,hej),
     ?line E = fun(0,_F)->ok;
 		 (N,F) -> 
@@ -4037,7 +4361,7 @@ member_do(Opts) ->
 
 
 build_table(L1,L2,Num) ->
-    T = ets:new(xxx, [ordered_set]
+    T = ets_new(xxx, [ordered_set]
 	       ),
     lists:foreach(
       fun(X1) ->
@@ -4059,7 +4383,7 @@ build_table(L1,L2,Num) ->
     T.
 
 build_table2(L1,L2,Num) ->
-    T = ets:new(xxx, [ordered_set]
+    T = ets_new(xxx, [ordered_set]
 	       ),
     lists:foreach(
       fun(X1) ->
@@ -4190,7 +4514,7 @@ do_n_times(Fun,N) ->
     do_n_times(Fun,N-1).
 
 make_table(Name, Options, Elements) ->
-    T = ets:new(Name, Options),
+    T = ets_new(Name, Options),
     lists:foreach(fun(E) -> ets:insert(T, E) end, Elements),
     T.
 filltabint(Tab,0) ->
@@ -4254,13 +4578,13 @@ xfilltabstr(Tab,N) ->
 fill_sets_int(N) ->
     fill_sets_int(N,[]).
 fill_sets_int(N,Opts) ->
-    Tab1 = ets:new(xxx, [ordered_set|Opts]),
+    Tab1 = ets_new(xxx, [ordered_set|Opts]),
     filltabint(Tab1,N),
-    Tab2 = ets:new(xxx, [set|Opts]),
+    Tab2 = ets_new(xxx, [set|Opts]),
     filltabint(Tab2,N),
-    Tab3 = ets:new(xxx, [bag|Opts]),
+    Tab3 = ets_new(xxx, [bag|Opts]),
     filltabint2(Tab3,N),
-    Tab4 = ets:new(xxx, [duplicate_bag|Opts]),
+    Tab4 = ets_new(xxx, [duplicate_bag|Opts]),
     filltabint3(Tab4,N),
     [Tab1,Tab2,Tab3,Tab4].
 
@@ -4412,7 +4736,7 @@ gen_dets_filename(Config,N) ->
 		  "testdets_" ++ integer_to_list(N) ++ ".dets").
 
 otp_6842_select_1000(Config) when is_list(Config) -> 
-    ?line Tab = ets:new(xxx,[ordered_set]),
+    ?line Tab = ets_new(xxx,[ordered_set]),
     ?line [ets:insert(Tab,{X,X}) || X <- lists:seq(1,10000)],
     ?line AllTrue = lists:duplicate(10,true),
     ?line AllTrue = 
@@ -4445,7 +4769,7 @@ check_seq(A,B,C) ->
 
 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]),
+    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).
@@ -4456,7 +4780,7 @@ otp_5340(Config) when is_list(Config) ->
 
 otp_5340_do(Opts) ->
     N = 3000,
-    T = ets:new(otp_5340, [bag,public | Opts]),
+    T = ets_new(otp_5340, [bag,public | Opts]),
     Ids = [1,2,3,4,5],
     [w(T, N, Id) || Id <- Ids],
     verify(T, Ids),
@@ -4492,7 +4816,7 @@ otp_7665(Config) when is_list(Config) ->
     repeat_for_opts(otp_7665_do).
 
 otp_7665_do(Opts) ->
-    Tab = ets:new(otp_7665,[bag | Opts]),
+    Tab = ets_new(otp_7665,[bag | Opts]),
     Min = 0,
     Max = 10,
     lists:foreach(fun(N)-> otp_7665_act(Tab,Min,Max,N) end,
@@ -4555,7 +4879,7 @@ meta_wb_do(Opts) ->
 		  Names).
     
 meta_wb_new(Name, _, Tabs, Opts) ->
-    case (catch ets:new(Name,[named_table|Opts])) of
+    case (catch ets_new(Name,[named_table|Opts])) of
 	Name ->
 	    ?line false = lists:member(Name, Tabs),
 	    [Name | Tabs];	
@@ -4603,7 +4927,7 @@ grow_shrink_0([N|Ns], EtsMem) ->
 grow_shrink_0([], _) -> ok.
 
 grow_shrink_1(N, Flags) ->
-    ?line T = ets:new(a, Flags),
+    ?line T = ets_new(a, Flags),
     ?line grow_shrink_2(N, N, T),
     ?line ets:delete(T).
 
@@ -4633,7 +4957,7 @@ grow_pseudo_deleted_do() ->
 grow_pseudo_deleted_do(Type) ->
     process_flag(scheduler,1),
     Self = self(),
-    ?line T = ets:new(kalle,[Type,public,{write_concurrency,true}]),
+    ?line T = ets_new(kalle,[Type,public,{write_concurrency,true}]),
     Mod = 7, Mult = 10000,
     filltabint(T,Mod*Mult),
     ?line true = ets:safe_fixtable(T,true),
@@ -4675,7 +4999,7 @@ shrink_pseudo_deleted_do() ->
 shrink_pseudo_deleted_do(Type) ->
     process_flag(scheduler,1),
     Self = self(),
-    ?line T = ets:new(kalle,[Type,public,{write_concurrency,true}]),
+    ?line T = ets_new(kalle,[Type,public,{write_concurrency,true}]),
     Half = 10000,
     filltabint(T,Half*2),
     ?line true = ets:safe_fixtable(T,true),
@@ -4704,17 +5028,10 @@ shrink_pseudo_deleted_do(Type) ->
     process_flag(scheduler,0).
 
     
-meta_smp(suite) ->
-    [meta_lookup_unnamed_read,
-     meta_lookup_unnamed_write,
-     meta_lookup_named_read,
-     meta_lookup_named_write,
-     meta_newdel_unnamed,
-     meta_newdel_named].
 
 meta_lookup_unnamed_read(suite) -> [];
 meta_lookup_unnamed_read(Config) when is_list(Config) ->
-    InitF = fun(_) -> Tab = ets:new(unnamed,[]),
+    InitF = fun(_) -> Tab = ets_new(unnamed,[]),
 		     true = ets:insert(Tab,{key,data}),
 		     Tab
 	    end,
@@ -4727,7 +5044,7 @@ meta_lookup_unnamed_read(Config) when is_list(Config) ->
 
 meta_lookup_unnamed_write(suite) -> [];
 meta_lookup_unnamed_write(Config) when is_list(Config) ->
-    InitF = fun(_) -> Tab = ets:new(unnamed,[]),
+    InitF = fun(_) -> Tab = ets_new(unnamed,[]),
 			  {Tab,0}
 	    end,
     ExecF = fun({Tab,N}) -> true = ets:insert(Tab,{key,N}),
@@ -4740,7 +5057,7 @@ meta_lookup_unnamed_write(Config) when is_list(Config) ->
 meta_lookup_named_read(suite) -> [];
 meta_lookup_named_read(Config) when is_list(Config) ->
     InitF = fun([ProcN|_]) -> Name = list_to_atom(integer_to_list(ProcN)),
-			      Tab = ets:new(Name,[named_table]),
+			      Tab = ets_new(Name,[named_table]),
 			      true = ets:insert(Tab,{key,data}),
 			      Tab
 	    end,
@@ -4754,7 +5071,7 @@ meta_lookup_named_read(Config) when is_list(Config) ->
 meta_lookup_named_write(suite) -> [];
 meta_lookup_named_write(Config) when is_list(Config) ->
     InitF = fun([ProcN|_]) -> Name = list_to_atom(integer_to_list(ProcN)),
-			  Tab = ets:new(Name,[named_table]),
+			  Tab = ets_new(Name,[named_table]),
 			  {Tab,0}
 	    end,
     ExecF = fun({Tab,N}) -> true = ets:insert(Tab,{key,N}),
@@ -4767,7 +5084,7 @@ meta_lookup_named_write(Config) when is_list(Config) ->
 meta_newdel_unnamed(suite) -> [];
 meta_newdel_unnamed(Config) when is_list(Config) ->
     InitF = fun(_) -> ok end,
-    ExecF = fun(_) -> Tab = ets:new(unnamed,[]),
+    ExecF = fun(_) -> Tab = ets_new(unnamed,[]),
 		      true = ets:delete(Tab)
 	    end,
     FiniF = fun(_) -> ok end,
@@ -4777,7 +5094,7 @@ meta_newdel_named(suite) -> [];
 meta_newdel_named(Config) when is_list(Config) ->
     InitF = fun([ProcN|_]) -> list_to_atom(integer_to_list(ProcN))
 	    end,
-    ExecF = fun(Name) -> Name = ets:new(Name,[named_table]),
+    ExecF = fun(Name) -> Name = ets_new(Name,[named_table]),
 			 true = ets:delete(Name),
 			 Name
 	    end,
@@ -4787,7 +5104,7 @@ meta_newdel_named(Config) when is_list(Config) ->
 smp_insert(doc) -> ["Concurrent insert's on same table"];
 smp_insert(suite) -> [];
 smp_insert(Config) when is_list(Config) ->
-    ets:new(smp_insert,[named_table,public,{write_concurrency,true}]),
+    ets_new(smp_insert,[named_table,public,{write_concurrency,true}]),
     InitF = fun(_) -> ok end,
     ExecF = fun(_) -> true = ets:insert(smp_insert,{random:uniform(10000)})
 	    end,
@@ -4802,7 +5119,7 @@ smp_fixed_delete(Config) when is_list(Config) ->
     only_if_smp(fun()->smp_fixed_delete_do() end).
 
 smp_fixed_delete_do() ->
-    T = ets:new(foo,[public,{write_concurrency,true}]),
+    T = ets_new(foo,[public,{write_concurrency,true}]),
     %%Mem = ets:info(T,memory),
     NumOfObjs = 100000,
     filltabint(T,NumOfObjs),
@@ -4838,7 +5155,7 @@ smp_unfix_fix(Config) when is_list(Config) ->
 smp_unfix_fix_do() ->
     process_flag(scheduler,1),
     Parent = self(),
-    T = ets:new(foo,[public,{write_concurrency,true}]),
+    T = ets_new(foo,[public,{write_concurrency,true}]),
     %%Mem = ets:info(T,memory),
     NumOfObjs = 100000,
     Deleted = 50000,    
@@ -4898,7 +5215,7 @@ otp_8166_do(WC) ->
     %% Bug scenario: One process segv while reading the table because another
     %% process is doing unfix without write-lock at the end of a trapping match_object.
     process_flag(scheduler,1),
-    T = ets:new(foo,[public, {write_concurrency,WC}]),
+    T = ets_new(foo,[public, {write_concurrency,WC}]),
     NumOfObjs = 3000,  %% Need more than 1000 live objects for match_object to trap one time
     Deleted = NumOfObjs div 2,
     filltabint(T,NumOfObjs),
@@ -5010,14 +5327,20 @@ verify_table_load(T) ->
 	       end.
     
 		  
-    
-    
+otp_8732(doc) -> ["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"}),
+    ?line [] = ets:match(Tab,{'_',nomatch}), %% Will hang if bug not fixed
+    ok.
+
 
 smp_select_delete(suite) -> [];
 smp_select_delete(doc) ->
     ["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}]),
+    T = ets_new(smp_select_delete,[named_table,public,{write_concurrency,true}]),
     Mod = 17,
     Zeros = erlang:make_tuple(Mod,0),
     InitF = fun(_) -> Zeros end,
@@ -5070,6 +5393,39 @@ smp_select_delete(Config) when is_list(Config) ->
     ?line false = ets:info(T,fixed),
     ets:delete(T).
 
+types(doc) -> ["Test different types"];
+types(Config) when is_list(Config) ->
+    init_externals(),
+    repeat_for_opts(types_do,[[set,ordered_set],compressed]).
+
+types_do(Opts) ->
+    EtsMem = etsmem(),
+    ?line T = ets_new(xxx,Opts),
+    Fun = fun(Term) ->
+            ets:insert(T,{Term}),
+            ?line [{Term}] = ets:lookup(T,Term),
+            ets:insert(T,{Term,xxx}),
+            ?line [{Term,xxx}] = ets:lookup(T,Term),
+            ets:insert(T,{Term,"xxx"}),
+            ?line [{Term,"xxx"}] = ets:lookup(T,Term),
+            ets:insert(T,{xxx,Term}),
+            ?line [{xxx,Term}] = ets:lookup(T,xxx),
+            ets:insert(T,{"xxx",Term}),
+            ?line [{"xxx",Term}] = ets:lookup(T,"xxx"),
+            ets:delete_all_objects(T),
+            ?line 0 = ets:info(T,size)
+          end,
+    test_terms(Fun, strict),
+    ets:delete(T),
+    ?line verify_etsmem(EtsMem).
+
+
+
+
+%
+% Utility functions:
+%
+
 add_lists(L1,L2) ->     
     add_lists(L1,L2,[]).
 add_lists([],[],Acc) ->
@@ -5134,7 +5490,29 @@ my_tab_to_list(_Ts,'$end_of_table', Acc) -> lists:reverse(Acc);
 my_tab_to_list(Ts,Key, Acc) ->
     my_tab_to_list(Ts,ets:next(Ts,Key),[ets:lookup(Ts, Key)| Acc]).
 
+wait_for_all_schedulers_online_to_execute() ->
+    PMs = lists:map(fun (Sched) ->
+			    spawn_opt(fun () -> ok end,
+				      [monitor, {scheduler, Sched}])
+		    end,
+		    lists:seq(1,erlang:system_info(schedulers_online))),
+    lists:foreach(fun ({P, M}) ->
+			  receive
+			      {'DOWN', M, process, P, _} -> ok
+			  end
+		  end,
+		  PMs),
+    ok.
+
 etsmem() ->
+    %% Wait until it is guaranteed that all already scheduled
+    %% deallocations of DbTable structures have completed.
+    wait_for_all_schedulers_online_to_execute(),
+
+    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()),
+    Mem =
     {try erlang:memory(ets) catch error:notsup -> notsup end,
      case erlang:system_info({allocator,ets_alloc}) of
 	 false -> undefined;
@@ -5153,12 +5531,13 @@ etsmem() ->
 		       {value,{_,BlSz,_,_}} = lists:keysearch(blocks_size, 1, L),
 		       {Bl0+Bl,BlSz0+BlSz}
 	       end, {0,0}, MSBCS)
-     end}.
+     end},
+     {Mem,AllTabs}.
 
-verify_etsmem(MemInfo) ->
+verify_etsmem({MemInfo,AllTabs}) ->
     wait_for_test_procs(),
     case etsmem() of
-	MemInfo ->
+	{MemInfo,_} ->
 	    io:format("Ets mem info: ~p", [MemInfo]),
 	    case MemInfo of
 		{ErlMem,EtsAlloc} when ErlMem == notsup; EtsAlloc == undefined ->
@@ -5167,12 +5546,15 @@ verify_etsmem(MemInfo) ->
 		_ ->
 		    ok
 	    end;
-	Other ->
+	{MemInfo2, AllTabs2} ->
 	    io:format("Expected: ~p", [MemInfo]),
-	    io:format("Actual:   ~p", [Other]),
+	    io:format("Actual:   ~p", [MemInfo2]),
+	    io:format("Changed tables before: ~p\n",[AllTabs -- AllTabs2]),
+	    io:format("Changed tables after: ~p\n", [AllTabs2 -- AllTabs]),
 	    ?t:fail()
     end.
 
+
 start_loopers(N, Prio, Fun, State) ->
     lists:map(fun (_) ->
 		      my_spawn_opt(fun () -> looper(Fun, State) end,
@@ -5277,6 +5659,20 @@ repeat_while(Fun, Arg0) ->
 	{false,Ret} -> Ret
     end.
 
+%% Some (but not all) permutations of List
+repeat_for_permutations(Fun, List) ->
+    repeat_for_permutations(Fun, List, length(List)-1).
+repeat_for_permutations(Fun, List, 0) ->
+    Fun(List);
+repeat_for_permutations(Fun, List, N) ->
+    {A,B} = lists:split(N, List),
+    L1 = B++A,
+    L2 = lists:reverse(L1),
+    L3 = B++lists:reverse(A),
+    L4 = lists:reverse(B)++A,
+    Fun(L1), Fun(L2), Fun(L3), Fun(L4),
+    repeat_for_permutations(Fun, List, N-1).
+
 receive_any() ->
     receive M ->
 	    io:format("Process ~p got msg ~p\n", [self(),M]),
@@ -5332,22 +5728,232 @@ only_if_smp(Schedulers, Func) ->
 	{true,_} -> Func()
     end.
 
+%% Copy-paste from emulator/test/binary_SUITE.erl
+-define(heap_binary_size, 64).
+test_terms(Test_Func, Mode) ->
+    garbage_collect(),
+    ?line Pib0 = process_info(self(),binary),
+
+    ?line Test_Func(atom),
+    ?line Test_Func(''),
+    ?line Test_Func('a'),
+    ?line Test_Func('ab'),
+    ?line Test_Func('abc'),
+    ?line Test_Func('abcd'),
+    ?line Test_Func('abcde'),
+    ?line Test_Func('abcdef'),
+    ?line Test_Func('abcdefg'),
+    ?line Test_Func('abcdefgh'),
+
+    ?line Test_Func(fun() -> ok end),
+    X = id([a,{b,c},c]),
+    Y = id({x,y,z}),
+    Z = id(1 bsl 8*257),
+    ?line Test_Func(fun() -> X end),
+    ?line Test_Func(fun() -> {X,Y} end),
+    ?line Test_Func([fun() -> {X,Y,Z} end,
+              fun() -> {Z,X,Y} end,
+              fun() -> {Y,Z,X} end]),
+
+    ?line Test_Func({trace_ts,{even_bigger,{some_data,fun() -> ok end}},{1,2,3}}),
+    ?line Test_Func({trace_ts,{even_bigger,{some_data,<<1,2,3,4,5,6,7,8,9,10>>}},
+              {1,2,3}}),
+
+    ?line Test_Func(1),
+    ?line Test_Func(42),
+    ?line Test_Func(-23),
+    ?line Test_Func(256),
+    ?line Test_Func(25555),
+    ?line Test_Func(-3333),
+
+    ?line Test_Func(1.0),
+
+    ?line Test_Func(183749783987483978498378478393874),
+    ?line Test_Func(-37894183749783987483978498378478393874),
+    Very_Big = very_big_num(),
+    ?line Test_Func(Very_Big),
+    ?line Test_Func(-Very_Big+1),
+
+    ?line Test_Func([]),
+    ?line Test_Func("abcdef"),
+    ?line Test_Func([a, b, 1, 2]),
+    ?line Test_Func([a|b]),
+
+    ?line Test_Func({}),
+    ?line Test_Func({1}),
+    ?line Test_Func({a, b}),
+    ?line Test_Func({a, b, c}),
+    ?line Test_Func(list_to_tuple(lists:seq(0, 255))),
+    ?line Test_Func(list_to_tuple(lists:seq(0, 256))),
+
+    ?line Test_Func(make_ref()),
+    ?line Test_Func([make_ref(), make_ref()]),
+
+    ?line Test_Func(make_port()),
+
+    ?line Test_Func(make_pid()),
+    ?line Test_Func(make_ext_pid()),
+    ?line Test_Func(make_ext_port()),
+    ?line Test_Func(make_ext_ref()),
+
+    Bin0 = list_to_binary(lists:seq(0, 14)),
+    ?line Test_Func(Bin0),
+    Bin1 = list_to_binary(lists:seq(0, ?heap_binary_size)),
+    ?line Test_Func(Bin1),
+    Bin2 = list_to_binary(lists:seq(0, ?heap_binary_size+1)),
+    ?line Test_Func(Bin2),
+    Bin3 = list_to_binary(lists:seq(0, 255)),
+    garbage_collect(),
+    Pib = process_info(self(),binary),
+    ?line Test_Func(Bin3),
+    garbage_collect(),
+    case Mode of
+	strict -> ?line Pib = process_info(self(),binary);
+	skip_refc_check -> ok
+    end,
+
+    ?line Test_Func(make_unaligned_sub_binary(Bin0)),
+    ?line Test_Func(make_unaligned_sub_binary(Bin1)),
+    ?line Test_Func(make_unaligned_sub_binary(Bin2)),
+    ?line Test_Func(make_unaligned_sub_binary(Bin3)),
+
+    ?line Test_Func(make_sub_binary(lists:seq(42, 43))),
+    ?line Test_Func(make_sub_binary([42,43,44])),
+    ?line Test_Func(make_sub_binary([42,43,44,45])),
+    ?line Test_Func(make_sub_binary([42,43,44,45,46])),
+    ?line Test_Func(make_sub_binary([42,43,44,45,46,47])),
+    ?line Test_Func(make_sub_binary([42,43,44,45,46,47,48])),
+    ?line Test_Func(make_sub_binary(lists:seq(42, 49))),
+    ?line Test_Func(make_sub_binary(lists:seq(0, 14))),
+    ?line Test_Func(make_sub_binary(lists:seq(0, ?heap_binary_size))),
+    ?line Test_Func(make_sub_binary(lists:seq(0, ?heap_binary_size+1))),
+    ?line Test_Func(make_sub_binary(lists:seq(0, 255))),
+
+    ?line Test_Func(make_unaligned_sub_binary(lists:seq(42, 43))),
+    ?line Test_Func(make_unaligned_sub_binary([42,43,44])),
+    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45])),
+    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45,46])),
+    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45,46,47])),
+    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45,46,47,48])),
+    ?line Test_Func(make_unaligned_sub_binary(lists:seq(42, 49))),
+    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, 14))),
+    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, ?heap_binary_size))),
+    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, ?heap_binary_size+1))),
+    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, 255))),
+
+    %% Bit level binaries.
+    ?line Test_Func(<<1:1>>),
+    ?line Test_Func(<<2:2>>),
+    ?line Test_Func(<<42:10>>),
+    ?line Test_Func(list_to_bitstring([<<5:6>>|lists:seq(0, 255)])),
+
+    ?line Test_Func(F = fun(A) -> 42*A end),
+    ?line Test_Func(lists:duplicate(32, F)),
+
+    ?line Test_Func(FF = fun binary_SUITE:all/1),
+    ?line Test_Func(lists:duplicate(32, FF)),
+
+    garbage_collect(),
+    case Mode of
+	strict -> ?line Pib0 = process_info(self(),binary);
+	skip_refc_check -> ok
+    end,
+    ok.
+
+
+id(I) -> I.
+
+very_big_num() ->
+    very_big_num(33, 1).
+
+very_big_num(Left, Result) when Left > 0 ->
+    ?line very_big_num(Left-1, Result*256);
+very_big_num(0, Result) ->
+    ?line Result.
+
+make_port() ->
+    ?line open_port({spawn, efile}, [eof]).
+
+make_pid() ->
+    ?line spawn_link(?MODULE, sleeper, []).
+
+sleeper() ->
+    ?line receive after infinity -> ok end.
+
+make_ext_pid() ->
+    {Pid, _, _} = get(externals),
+    Pid.
+
+make_ext_port() ->
+    {_, Port, _} = get(externals),
+    Port.
+make_ext_ref() ->
+    {_, _, Ref} = get(externals),
+    Ref.
+
+init_externals() ->
+    case get(externals) of
+	undefined ->
+	    SysDistSz = ets:info(sys_dist,size),
+	    ?line Pa = filename:dirname(code:which(?MODULE)),
+	    ?line {ok, Node} = test_server:start_node(plopp, slave, [{args, " -pa " ++ Pa}]),
+	    ?line Res = case rpc:call(Node, ?MODULE, rpc_externals, []) of
+			    {badrpc, {'EXIT', E}} ->
+				test_server:fail({rpcresult, E});
+			    R -> R
+			end,
+	    ?line test_server:stop_node(Node),
+
+	    %% Wait for table 'sys_dist' to stabilize
+	    repeat_while(fun() ->
+				 case ets:info(sys_dist,size) of
+				     SysDistSz -> false;
+				     Sz ->
+					 io:format("Waiting for sys_dist to revert size from ~p to size ~p\n",
+						   [Sz, SysDistSz]),
+					 receive after 1000 -> true end
+				 end
+			 end),
+	    put(externals, Res);
+
+	{_,_,_} -> ok
+    end.
+
+rpc_externals() ->
+    {self(), make_port(), make_ref()}.
+
+make_sub_binary(Bin) when is_binary(Bin) ->
+    {_,B} = split_binary(list_to_binary([0,1,3,Bin]), 3),
+    B;
+make_sub_binary(List) ->
+    make_sub_binary(list_to_binary(List)).
+
+make_unaligned_sub_binary(Bin0) when is_binary(Bin0) ->
+    Bin1 = <<0:3,Bin0/binary,31:5>>,
+    Sz = size(Bin0),
+    <<0:3,Bin:Sz/binary,31:5>> = id(Bin1),
+    Bin;
+make_unaligned_sub_binary(List) ->
+    make_unaligned_sub_binary(list_to_binary(List)).
 
 %% Repeat test function with different combination of table options
 %%       
 repeat_for_opts(F) ->
-    repeat_for_opts(F, [write_concurrency]).
+    repeat_for_opts(F, [write_concurrency, read_concurrency, compressed]).
 
 repeat_for_opts(F, OptGenList) when is_atom(F) ->
     repeat_for_opts(fun(Opts) -> ?MODULE:F(Opts) end, OptGenList);
+repeat_for_opts({F,Args}, OptGenList) when is_atom(F) ->
+    repeat_for_opts(fun(Opts) -> ?MODULE:F(Opts,Args) end, OptGenList);
 repeat_for_opts(F, OptGenList) ->
     repeat_for_opts(F, OptGenList, []).
 
 repeat_for_opts(F, [], Acc) ->
-    lists:map(fun(Opts) -> 
-		      io:format("Calling with options ~p\n",[Opts]),
-		      F(Opts)
-	      end, Acc);
+    lists:map(fun(Opts) ->
+                    OptList = lists:filter(fun(E) -> E =/= void end, Opts),
+                    io:format("Calling with options ~p\n",[OptList]),
+		            F(OptList)
+	          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) ->
@@ -5356,6 +5962,10 @@ 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(write_concurrency) -> [{write_concurrency,false},{write_concurrency,true}].
-
+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).
diff --git a/lib/stdlib/test/ets_tough_SUITE.erl b/lib/stdlib/test/ets_tough_SUITE.erl
index 4c8d941f13..0386a0272a 100644
--- a/lib/stdlib/test/ets_tough_SUITE.erl
+++ b/lib/stdlib/test/ets_tough_SUITE.erl
@@ -17,13 +17,33 @@
 %% %CopyrightEnd%
 %%
 -module(ets_tough_SUITE).
--export([all/1,ex1/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,ex1/1]).
 -export([init/1,terminate/2,handle_call/3,handle_info/2]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 -compile([export_all]).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [ex1].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> [ex1].
 
 
 -define(DEBUG(X),debug_disabled).
@@ -34,7 +54,7 @@ init_per_testcase(_Func, Config) ->
     Dog=test_server:timetrap(test_server:seconds(300)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ets:delete(?GLOBAL_PARAMS).
diff --git a/lib/stdlib/test/file_sorter_SUITE.erl b/lib/stdlib/test/file_sorter_SUITE.erl
index c00ed91fe7..9ca2460a05 100644
--- a/lib/stdlib/test/file_sorter_SUITE.erl
+++ b/lib/stdlib/test/file_sorter_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -27,12 +27,13 @@
 -define(t,test_server).
 -define(privdir(_), "./file_sorter_SUITE_priv").
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(format(S, A), ok).
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -endif.
 
--export([all/1, basic/1, badarg/1, 
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, basic/1, badarg/1, 
 	 term_sort/1, term_keysort/1,
 	 binary_term_sort/1, binary_term_keysort/1,
 	 binary_sort/1, 
@@ -44,30 +45,42 @@
 	 binary_check/1,
 	 inout/1, misc/1, many/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 init_per_testcase(_Case, Config) ->
     Dog=?t:timetrap(?t:minutes(2)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    {req,[stdlib,kernel],
-     [basic, badarg, 
-      term_sort, term_keysort, 
-      binary_term_sort, binary_term_keysort, 
-      binary_sort, 
-      term_merge, term_keymerge, 
-      binary_term_merge, binary_term_keymerge,
-      binary_merge,
-      term_check, binary_term_keycheck,
-      binary_term_check, binary_term_keycheck,
-      binary_check,
-      inout, misc, many]}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [basic, badarg, term_sort, term_keysort,
+     binary_term_sort, binary_term_keysort, binary_sort,
+     term_merge, term_keymerge, binary_term_merge,
+     binary_term_keymerge, binary_merge, term_check,
+     binary_term_keycheck, binary_term_check,
+     binary_term_keycheck, binary_check, inout, misc, many].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 basic(doc) ->
     ["Basic test case."];
diff --git a/lib/stdlib/test/filelib_SUITE.erl b/lib/stdlib/test/filelib_SUITE.erl
index d54741051f..628e741870 100644
--- a/lib/stdlib/test/filelib_SUITE.erl
+++ b/lib/stdlib/test/filelib_SUITE.erl
@@ -19,27 +19,47 @@
 
 -module(filelib_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 wildcard_one/1,wildcard_two/1,wildcard_errors/1,
 	 fold_files/1,otp_5960/1,ensure_dir_eexist/1]).
 
 -import(lists, [foreach/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?t:minutes(5)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    [wildcard_one,wildcard_two,wildcard_errors,fold_files,otp_5960,
-     ensure_dir_eexist].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [wildcard_one, wildcard_two, wildcard_errors,
+     fold_files, otp_5960, ensure_dir_eexist].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 wildcard_one(Config) when is_list(Config) ->
     ?line {ok,OldCwd} = file:get_cwd(),
@@ -53,8 +73,11 @@ wildcard_one(Config) when is_list(Config) ->
 
 wildcard_two(Config) when is_list(Config) ->
     ?line Dir = filename:join(?config(priv_dir, Config), "wildcard_two"),
+    ?line DirB = unicode:characters_to_binary(Dir, file:native_name_encoding()),
     ?line ok = file:make_dir(Dir),
-    ?line do_wildcard_1(Dir, fun(Wc) -> filelib:wildcard(Wc, Dir) end),
+    ?line do_wildcard_1(Dir, fun(Wc) -> io:format("~p~n",[{Wc,Dir, X = filelib:wildcard(Wc, Dir)}]),X  end),
+    ?line do_wildcard_1(Dir, fun(Wc) -> io:format("~p~n",[{Wc,DirB, X = filelib:wildcard(Wc, DirB)}]),
+					[unicode:characters_to_list(Y,file:native_name_encoding()) || Y <- X] end),
     ?line do_wildcard_1(Dir, fun(Wc) -> filelib:wildcard(Wc, Dir++"/") end),
     case os:type() of
 	{win32,_} ->
@@ -253,5 +276,7 @@ ensure_dir_eexist(Config) when is_list(Config) ->
     %% There already is a file with the name of the directory
     %% we want to create.
     ?line NeedFile = filename:join(Name, "file"),
+    ?line NeedFileB = filename:join(Name, <<"file">>),
     ?line {error, eexist} = filelib:ensure_dir(NeedFile),
+    ?line {error, eexist} = filelib:ensure_dir(NeedFileB),
     ok.
diff --git a/lib/stdlib/test/filename_SUITE.erl b/lib/stdlib/test/filename_SUITE.erl
index ab6521f37b..a72af3448b 100644
--- a/lib/stdlib/test/filename_SUITE.erl
+++ b/lib/stdlib/test/filename_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -17,17 +17,44 @@
 %% %CopyrightEnd%
 %%
 -module(filename_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([absname/1, absname_2/1, 
 	 basename_1/1, basename_2/1,
 	 dirname/1, extension/1, join/1, t_nativename/1]).
 -export([pathtype/1,rootname/1,split/1,find_src/1]).
--include("test_server.hrl").
+-export([absname_bin/1, absname_bin_2/1, 
+	 basename_bin_1/1, basename_bin_2/1,
+	 dirname_bin/1, extension_bin/1, join_bin/1]).
+-export([pathtype_bin/1,rootname_bin/1,split_bin/1]).
 
-all(suite) ->
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [absname, absname_2, basename_1, basename_2, dirname,
      extension,
-     join, pathtype, rootname, split, t_nativename, find_src].
+     join, pathtype, rootname, split, t_nativename, find_src,
+     absname_bin, absname_bin_2, basename_bin_1, basename_bin_2, dirname_bin,
+     extension_bin,
+     join_bin, pathtype_bin, rootname_bin, split_bin].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -457,3 +484,307 @@ find_src(Config) when is_list(Config) ->
     %% Try to find the source for a preloaded module.
     ?line {error,{preloaded,init}} = filename:find_src(init),
     ok.
+
+%%
+%%
+%% With binaries
+%%
+%%
+
+absname_bin(Config) when is_list(Config) ->
+    case os:type() of
+	{win32, _} -> 
+	    ?line [Drive|_] = ?config(priv_dir, Config),
+	    ?line Temp = filename:join([Drive|":/"], "temp"),
+	    ?line case file:make_dir(Temp) of
+		      ok -> ok;
+		      {error,eexist} -> ok
+		  end,
+	    ?line {ok,Cwd} = file:get_cwd(),
+	    ?line ok = file:set_cwd(Temp),
+	    ?line <<Drive:8,":/temp/foo">> = filename:absname(<<"foo">>),
+	    ?line <<Drive:8,":/temp/../ebin">> = filename:absname(<<"../ebin">>),
+	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>),
+	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>),
+	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\src">>),
+	    ?line <<Drive:8,":/temp/erlang">> = filename:absname(<<Drive:8,":erlang">>),
+	    ?line <<Drive:8,":/temp/erlang/src">> =
+		filename:absname(<<Drive:8,":erlang/src">>),
+	    ?line <<Drive:8,":/temp/erlang/src">> =
+		filename:absname(<<Drive:8,":erlang\\src\\">>),
+	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>),
+	    
+	    ?line file:set_cwd(<<Drive:8,":/">>),
+	    ?line <<Drive:8,":/foo">> = filename:absname(<<"foo">>),
+	    ?line <<Drive:8,":/../ebin">> = filename:absname(<<"../ebin">>),
+	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>),
+	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>),
+	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\\\src">>),
+	    ?line <<Drive:8,":/erlang">> = filename:absname(<<Drive:8,":erlang">>),
+	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>),
+	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>),
+	    
+	    ?line file:set_cwd(Cwd),
+	    ok;
+	{unix, _} ->  
+	    ?line ok = file:set_cwd(<<"/usr">>),
+	    ?line <<"/usr/foo">> = filename:absname(<<"foo">>),
+	    ?line <<"/usr/../ebin">> = filename:absname(<<"../ebin">>),
+	    
+	    ?line file:set_cwd(<<"/">>),
+	    ?line <<"/foo">> = filename:absname(<<"foo">>),
+	    ?line <<"/../ebin">> = filename:absname(<<"../ebin">>),
+	    ?line <<"/erlang">> = filename:absname(<<"/erlang">>),
+	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang/src">>),
+	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang///src">>),
+	    ok
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+absname_bin_2(Config) when is_list(Config) ->
+    case os:type() of
+	{win32, _} ->
+	    ?line [Drive|_] = ?config(priv_dir, Config),
+	    ?line <<Drive:8,":/temp/foo">> = filename:absname(<<"foo">>, <<Drive:8,":/temp">>),
+	    ?line <<Drive:8,":/temp/../ebin">> = filename:absname(<<"../ebin">>,
+							      <<Drive:8,":/temp">>),
+	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>, <<Drive:8,":/temp">>),
+	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>,
+							    <<Drive:8,":/temp">>),
+	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\src">>,
+							    <<Drive:8,":/temp">>),
+	    ?line <<Drive:8,":/temp/erlang">> = filename:absname(<<Drive:8,":erlang">>,
+							     <<Drive:8,":/temp">>),
+	    ?line <<Drive:8,":/temp/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>,
+								 <<Drive:8,":/temp">>),
+	    ?line <<Drive:8,":/temp/erlang/src">> =
+		filename:absname(<<Drive:8,":erlang\\src\\">>, <<Drive:8,":/temp">>),
+	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>, <<Drive:8,":/temp">>),
+	    
+	    ?line file:set_cwd(<<Drive:8,":/">>),
+	    ?line <<Drive:8,":/foo">> = filename:absname(foo, <<Drive:8,":/">>),
+	    ?line <<Drive:8,":/foo">> = filename:absname(<<"foo">>, <<Drive:8,":/">>),
+	    ?line <<Drive:8,":/../ebin">> = filename:absname(<<"../ebin">>, <<Drive:8,":/">>),
+	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>, <<Drive:8,":/">>),
+	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>,
+							    <<Drive:8,":/">>),
+	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\\\src">>,
+							    <<Drive:8,":/">>),
+	    ?line <<Drive:8,":/erlang">> = filename:absname(<<Drive:8,":erlang">>,
+							<<Drive:8,":/">>),
+	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>,
+							    <<Drive:8,":/">>),
+	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>, <<Drive:8,":/">>),
+	    
+	    ok;
+	{unix, _} ->
+	    ?line <<"/usr/foo">> = filename:absname(<<"foo">>, <<"/usr">>),
+	    ?line <<"/usr/../ebin">> = filename:absname(<<"../ebin">>, <<"/usr">>),
+	    
+	    ?line <<"/foo">> = filename:absname(<<"foo">>, <<"/">>),
+	    ?line <<"/../ebin">> = filename:absname(<<"../ebin">>, <<"/">>),
+	    ?line <<"/erlang">> = filename:absname(<<"/erlang">>, <<"/">>),
+	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang/src">>, <<"/">>),
+	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang///src">>, <<"/">>),
+	    ok
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+basename_bin_1(Config) when is_list(Config) ->
+    ?line Dog = test_server:timetrap(test_server:seconds(10)),
+    ?line <<".">> = filename:basename(<<".">>),
+    ?line <<"foo">> = filename:basename(<<"foo">>),
+    ?line <<"foo">> = filename:basename(<<"/usr/foo">>),
+    ?line <<"foo.erl">> = filename:basename(<<"A:usr/foo.erl">>),
+    ?line case os:type() of
+	      {win32, _} ->
+		  ?line <<"foo">> = filename:basename(<<"A:\\usr\\foo">>),
+		  ?line <<"foo">> = filename:basename(<<"A:foo">>);
+	      {unix, _} ->
+		  ?line <<"strange\\but\\true">> =
+		      filename:basename(<<"strange\\but\\true">>)
+	  end,
+    ?line test_server:timetrap_cancel(Dog),
+    ok.
+
+basename_bin_2(Config) when is_list(Config) ->
+    ?line Dog = test_server:timetrap(test_server:seconds(10)),
+    ?line <<".">> = filename:basename(<<".">>, <<".erl">>),
+    ?line <<"foo">> = filename:basename(<<"foo.erl">>, <<".erl">>),
+    ?line <<"foo.erl">> = filename:basename(<<"/usr/foo.erl">>, <<".hrl">>),
+    ?line <<"foo.erl">> = filename:basename(<<"/usr.hrl/foo.erl">>, <<".hrl">>),
+    ?line <<"foo">> = filename:basename(<<"/usr.hrl/foo">>, <<".hrl">>),
+    ?line <<"foo">> = filename:basename(<<"usr/foo/">>, <<".erl">>),
+    ?line <<"foo.erl">> = filename:basename(<<"usr/foo.erl/">>, <<".erl">>),
+    ?line case os:type() of
+	      {win32, _} ->
+		  ?line <<"foo">> = filename:basename(<<"A:foo">>, <<".erl">>),
+		  ?line <<"foo.erl">> = filename:basename(<<"a:\\usr\\foo.erl">>,
+						      <<".hrl">>),
+		  ?line <<"foo.erl">> = filename:basename(<<"c:\\usr.hrl\\foo.erl">>,
+						      <<".hrl">>),
+		  ?line <<"foo">> = filename:basename(<<"A:\\usr\\foo">>, <<".hrl">>);
+	      {unix, _} ->
+		  ?line <<"strange\\but\\true">> =
+		      filename:basename(<<"strange\\but\\true.erl">>, <<".erl">>),
+		  ?line <<"strange\\but\\true">> =
+		      filename:basename(<<"strange\\but\\true">>, <<".erl">>)
+	  end,
+    ?line test_server:timetrap_cancel(Dog),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+dirname_bin(Config) when is_list(Config) ->
+    case os:type() of
+       {win32,_} ->
+	    ?line <<"A:/usr">> = filename:dirname(<<"A:/usr/foo.erl">>),
+	    ?line <<"A:usr">> = filename:dirname(<<"A:usr/foo.erl">>),
+	    ?line <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
+	    ?line <<"/">> = filename:dirname(<<"\\usr">>),
+	    ?line <<"A:">> = filename:dirname(<<"A:">>);
+       vxworks ->
+	    ?line <<"net:/usr">> = filename:dirname(<<"net:/usr/foo.erl">>),
+	    ?line <<"/disk0:/usr">> = filename:dirname(<<"/disk0:/usr/foo.erl">>),
+	    ?line <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
+	    ?line <<"/usr">> = filename:dirname(<<"\\usr">>),
+	    ?line <<"net:">> = filename:dirname(<<"net:">>);
+	_ -> true
+    end,
+    ?line <<"usr">> = filename:dirname(<<"usr///foo.erl">>),
+    ?line <<".">> = filename:dirname(<<"foo.erl">>),
+    ?line <<".">> = filename:dirname(<<".">>),
+    case os:type() of
+	vxworks -> 
+	    ?line <<"/">> = filename:dirname(<<"/">>),
+	    ?line <<"/usr">> = filename:dirname(<<"/usr">>);
+	_ ->
+	    ?line <<"/">> = filename:dirname(<<"/">>),
+	    ?line <<"/">> = filename:dirname(<<"/usr">>)
+    end,
+    ok.
+    
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+extension_bin(Config) when is_list(Config) ->
+    ?line <<".erl">> = filename:extension(<<"A:/usr/foo.erl">>),
+    ?line <<".erl">> = filename:extension(<<"A:/usr/foo.nisse.erl">>),
+    ?line <<".erl">> = filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
+    ?line <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
+    ?line <<"">> = filename:extension(<<"A:/usr/foo">>),
+    ?line case os:type() of
+	      {win32, _} ->
+		  ?line <<"">> = filename:extension(<<"A:\\usr\\foo">>),
+		  ?line <<".erl">> =
+		      filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
+		  ?line <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
+		  ok;
+	      vxworks ->
+		  ?line <<"">> = filename:extension(<<"/disk0:\\usr\\foo">>),
+		  ?line <<".erl">> =
+		      filename:extension(<<"net:/usr.bar/foo.nisse.erl">>),
+		  ?line <<"">> = filename:extension(<<"net:/usr.bar/foo">>),
+		  ok;
+	      _ -> ok
+	  end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    
+join_bin(Config) when is_list(Config) ->
+    ?line <<"/">> = filename:join([<<"/">>]),
+    ?line <<"/">> = filename:join([<<"//">>]),
+    ?line <<"usr/foo.erl">> = filename:join(<<"usr">>,<<"foo.erl">>),
+    ?line <<"/src/foo.erl">> = filename:join(usr, <<"/src/foo.erl">>),
+    ?line <<"/src/foo.erl">> = filename:join([<<"/src/">>,'foo.erl']),
+    ?line <<"/src/foo.erl">> = filename:join(<<"usr">>, ["/sr", 'c/foo.erl']),
+    ?line <<"/src/foo.erl">> = filename:join(<<"usr">>, <<"/src/foo.erl">>),
+
+    %% Make sure that redundant slashes work too.
+    ?line <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c/////d//e/f/g">>]),
+    ?line <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c/">>, <<"d//e/f/g">>]),
+    ?line <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"d//e/f/g">>]),
+    ?line <<"/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"/d//e/f/g">>]),
+    ?line <<"/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"//d//e/f/g">>]),
+
+    ?line <<"foo/bar">> = filename:join([$f,$o,$o,$/,[]], <<"bar">>),
+
+    ?line case os:type() of
+	      {win32, _} ->
+		  ?line <<"d:/">> = filename:join([<<"D:/">>]),
+		  ?line <<"d:/">> = filename:join([<<"D:\\">>]),
+		  ?line <<"d:/abc">> = filename:join([<<"D:/">>, <<"abc">>]),
+		  ?line <<"d:abc">> = filename:join([<<"D:">>, <<"abc">>]),
+		  ?line <<"a/b/c/d/e/f/g">> =
+		      filename:join([<<"a//b\\c//\\/\\d/\\e/f\\g">>]),
+		  ?line <<"a:usr/foo.erl">> =
+		      filename:join([<<"A:">>,<<"usr">>,<<"foo.erl">>]),
+		  ?line <<"/usr/foo.erl">> =
+		      filename:join([<<"A:">>,<<"/usr">>,<<"foo.erl">>]),
+		  ?line <<"c:usr">> = filename:join(<<"A:">>,<<"C:usr">>),
+		  ?line <<"a:usr">> = filename:join(<<"A:">>,<<"usr">>),
+		  ?line <<"c:/usr">> = filename:join(<<"A:">>, <<"C:/usr">>),
+		  ?line <<"c:/usr/foo.erl">> =
+		      filename:join([<<"A:">>,<<"C:/usr">>,<<"foo.erl">>]),
+		  ?line <<"c:usr/foo.erl">> =
+		      filename:join([<<"A:">>,<<"C:usr">>,<<"foo.erl">>]),
+		  ?line <<"d:/foo">> = filename:join([$D, $:, $/, []], <<"foo">>),
+		  ok;
+	      {unix, _} ->
+		  ok
+	  end.
+
+pathtype_bin(Config) when is_list(Config) ->
+    ?line relative = filename:pathtype(<<"..">>),
+    ?line relative = filename:pathtype(<<"foo">>),
+    ?line relative = filename:pathtype(<<"foo/bar">>),
+    ?line relative = filename:pathtype('foo/bar'),
+    case os:type() of
+	{win32, _} ->
+	    ?line volumerelative = filename:pathtype(<<"/usr/local/bin">>),
+	    ?line volumerelative = filename:pathtype(<<"A:usr/local/bin">>),
+	    ok;
+	{unix, _} ->
+	    ?line absolute = filename:pathtype(<<"/">>),
+	    ?line absolute = filename:pathtype(<<"/usr/local/bin">>),
+	    ok
+    end.
+
+rootname_bin(Config) when is_list(Config) ->
+    ?line <<"/jam.src/kalle">> = filename:rootname(<<"/jam.src/kalle">>),
+    ?line <<"/jam.src/foo">> = filename:rootname(<<"/jam.src/foo.erl">>),
+    ?line <<"/jam.src/foo">> = filename:rootname(<<"/jam.src/foo.erl">>, <<".erl">>),
+    ?line <<"/jam.src/foo.jam">> = filename:rootname(<<"/jam.src/foo.jam">>, <<".erl">>),
+    ?line <<"/jam.src/foo.jam">> = filename:rootname(["/jam.sr",'c/foo.j',"am"],<<".erl">>),
+    ?line <<"/jam.src/foo.jam">> = filename:rootname(["/jam.sr",'c/foo.j'|am],<<".erl">>),
+    ok.
+
+split_bin(Config) when is_list(Config) ->
+    case os:type() of 
+	vxworks ->
+	    ?line [<<"/usr">>,<<"local">>,<<"bin">>] = filename:split(<<"/usr/local/bin">>);
+	_ ->
+	    ?line [<<"/">>,<<"usr">>,<<"local">>,<<"bin">>] = filename:split(<<"/usr/local/bin">>)
+    end,
+    ?line [<<"foo">>,<<"bar">>]= filename:split(<<"foo/bar">>),
+    ?line [<<"foo">>, <<"bar">>, <<"hello">>]= filename:split(<<"foo////bar//hello">>),
+    case os:type() of
+       {win32,_} ->
+	    ?line [<<"a:/">>,<<"msdev">>,<<"include">>] =
+		filename:split(<<"a:/msdev/include">>),
+	    ?line [<<"a:/">>,<<"msdev">>,<<"include">>] =
+		filename:split(<<"A:/msdev/include">>),
+	    ?line [<<"msdev">>,<<"include">>] =
+		filename:split(<<"msdev\\include">>),
+	    ?line [<<"a:/">>,<<"msdev">>,<<"include">>] =
+		filename:split(<<"a:\\msdev\\include">>),
+	    ?line [<<"a:">>,<<"msdev">>,<<"include">>] =
+		filename:split(<<"a:msdev\\include">>),
+	    ok;
+       _ ->
+	    ok
+    end.
+
diff --git a/lib/stdlib/test/fixtable_SUITE.erl b/lib/stdlib/test/fixtable_SUITE.erl
index 1940ee147e..c2160d8ba7 100644
--- a/lib/stdlib/test/fixtable_SUITE.erl
+++ b/lib/stdlib/test/fixtable_SUITE.erl
@@ -21,22 +21,41 @@
 %%%----------------------------------------------------------------------
 
 -module(fixtable_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 %%% Test cases
 -export([multiple_fixes/1, multiple_processes/1,
 	 other_process_deletes/1, owner_dies/1,
 	 other_process_closes/1,insert_same_key/1]).
 -export([fixbag/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 %%% Internal exports
 -export([command_loop/0,start_commander/0]).
 
-all(suite) -> {req, [stdlib],
-	       [multiple_fixes, multiple_processes,
-		other_process_deletes, owner_dies,
-		other_process_closes,insert_same_key,fixbag]}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
--include("test_server.hrl").
+all() -> 
+    [multiple_fixes, multiple_processes,
+     other_process_deletes, owner_dies, other_process_closes,
+     insert_same_key, fixbag].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+-include_lib("test_server/include/test_server.hrl").
 
 %%% I wrote this thinking I would use more than one temporary at a time, but 
 %%% I wasn't... Well, maybe in the future...
@@ -53,7 +72,7 @@ init_per_testcase(_Func, Config) ->
     Dog=test_server:timetrap(test_server:seconds(60)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     lists:foreach(fun(X) ->
diff --git a/lib/stdlib/test/format_SUITE.erl b/lib/stdlib/test/format_SUITE.erl
index 1c9e953003..c1a896abe8 100644
--- a/lib/stdlib/test/format_SUITE.erl
+++ b/lib/stdlib/test/format_SUITE.erl
@@ -17,13 +17,14 @@
 %% %CopyrightEnd%
 %%
 -module(format_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([hang_1/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -31,16 +32,32 @@
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(doc) ->
-    ["Test cases for io:format/[2,3]."];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [hang_1].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 hang_1(doc) ->
     ["Bad args can hang (OTP-2400)"];
 hang_1(suite) ->
diff --git a/lib/stdlib/test/gen_event_SUITE.erl b/lib/stdlib/test/gen_event_SUITE.erl
index 4f7de451e3..8fa2f4e3a3 100644
--- a/lib/stdlib/test/gen_event_SUITE.erl
+++ b/lib/stdlib/test/gen_event_SUITE.erl
@@ -18,16 +18,39 @@
 %%
 -module(gen_event_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
--export([start/1, test_all/1, add_handler/1, add_sup_handler/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([start/1, add_handler/1, add_sup_handler/1,
 	 delete_handler/1, swap_handler/1, swap_sup_handler/1,
 	 notify/1, sync_notify/1, call/1, info/1, hibernate/1,
 	 call_format_status/1, error_format_status/1]).
 
-all(suite) -> {req, [stdlib], [start, test_all, hibernate,
-			       call_format_status, error_format_status]}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [start, {group, test_all}, hibernate,
+     call_format_status, error_format_status].
+
+groups() -> 
+    [{test_all, [],
+      [add_handler, add_sup_handler, delete_handler,
+       swap_handler, swap_sup_handler, notify, sync_notify,
+       call, info]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% --------------------------------------
 %% Start an event manager.
@@ -171,9 +194,6 @@ hibernate(Config) when is_list(Config) ->
     ok.
 
 
-test_all(suite) -> [add_handler, add_sup_handler, delete_handler,
-		    swap_handler, swap_sup_handler, notify,
-		    sync_notify, call, info].
 
 add_handler(doc) -> [];
 add_handler(suite) -> [];
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index dd120f8c05..9d9e1f8dd8 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -18,19 +18,20 @@
 %%
 -module(gen_fsm_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test cases
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
--export([start/1, start1/1, start2/1, start3/1, start4/1 , start5/1, start6/1,
+-export([ start1/1, start2/1, start3/1, start4/1 , start5/1, start6/1,
 	 start7/1, start8/1, start9/1, start10/1, start11/1]).
 
--export([abnormal/1, abnormal1/1, abnormal2/1]).
+-export([ abnormal1/1, abnormal2/1]).
 
 -export([shutdown/1]).
 
--export([sys/1, sys1/1, call_format_status/1, error_format_status/1]).
+-export([ sys1/1, call_format_status/1, error_format_status/1]).
 
 -export([hibernate/1,hiber_idle/3,hiber_wakeup/3,hiber_idle/2,hiber_wakeup/2]).
 
@@ -53,13 +54,31 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-all(suite) ->
-    [start, abnormal, shutdown, sys, hibernate, enter_loop].
-    
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, start}, {group, abnormal}, shutdown,
+     {group, sys}, hibernate, enter_loop].
+
+groups() -> 
+    [{start, [],
+      [start1, start2, start3, start4, start5, start6, start7,
+       start8, start9, start10, start11]},
+     {abnormal, [], [abnormal1, abnormal2]},
+     {sys, [],
+      [sys1, call_format_status, error_format_status]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
 
+init_per_group(_GroupName, Config) ->
+    Config.
 
-start(suite) -> [start1, start2, start3, start4, start5, start6, start7,
-		 start8, start9, start10, start11].
+end_per_group(_GroupName, Config) ->
+    Config.
 
 %% anonymous
 start1(Config) when is_list(Config) ->
@@ -239,7 +258,6 @@ start11(Config) when is_list(Config) ->
     test_server:messages_get(),
     ok.
 
-abnormal(suite) -> [abnormal1, abnormal2].
 
 %% Check that time outs in calls work
 abnormal1(suite) -> [];
@@ -305,7 +323,6 @@ shutdown(Config) when is_list(Config) ->
     ok.
 
 
-sys(suite) -> [sys1, call_format_status, error_format_status].
 
 sys1(Config) when is_list(Config) ->
     ?line {ok, Pid} = 
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index 99388ba2e3..5a248d7c10 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -18,12 +18,13 @@
 %%
 -module(gen_server_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/inet.hrl").
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([start/1, crash/1, call/1, cast/1, cast_fast/1,
 	 info/1, abcast/1, multicall/1, multicall_down/1,
 	 call_remote1/1, call_remote2/1, call_remote3/1,
@@ -45,23 +46,55 @@
 -export([init/1, handle_call/3, handle_cast/2,
 	 handle_info/2, terminate/2, format_status/2]).
 
-all(suite) ->
-    [start, crash, call, cast, cast_fast, info,
-     abcast, multicall, multicall_down, call_remote1,
-     call_remote2, call_remote3, call_remote_n1,
-     call_remote_n2, call_remote_n3, spec_init,
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [start, crash, call, cast, cast_fast, info, abcast,
+     multicall, multicall_down, call_remote1, call_remote2,
+     call_remote3, call_remote_n1, call_remote_n2,
+     call_remote_n3, spec_init,
      spec_init_local_registered_parent,
-     spec_init_global_registered_parent,
-     otp_5854, hibernate, otp_7669,
-     call_format_status, error_format_status,
+     spec_init_global_registered_parent, otp_5854, hibernate,
+     otp_7669, call_format_status, error_format_status,
      call_with_huge_message_queue].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 -define(default_timeout, ?t:minutes(1)).
  
+init_per_testcase(Case, Config) when Case == call_remote1;
+				     Case == call_remote2;
+				     Case == call_remote3;
+				     Case == call_remote_n1;
+				     Case == call_remote_n2;
+				     Case == call_remote_n3 ->
+    {ok,N} = start_node(hubba),
+    ?line Dog = ?t:timetrap(?default_timeout),
+    [{node,N},{watchdog, Dog} | Config];
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
+    case proplists:get_value(node, Config) of
+	undefined ->
+	    ok;
+	N ->
+	    test_server:stop_node(N)
+    end,
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -294,8 +327,8 @@ start_node(Name) ->
 
 call_remote1(suite) -> [];
 call_remote1(Config) when is_list(Config) ->
-    ?line N = hubba,
-    ?line {ok, Node} = start_node(N),
+    N = hubba,
+    ?line Node = proplists:get_value(node,Config),
     ?line {ok, Pid} = rpc:call(Node, gen_server, start,
 			       [{global, N}, ?MODULE, [], []]),    
     ?line ok = (catch gen_server:call({global, N}, started_p, infinity)),
@@ -308,7 +341,7 @@ call_remote1(Config) when is_list(Config) ->
 call_remote2(suite) -> [];
 call_remote2(Config) when is_list(Config) ->
     ?line N = hubba,
-    ?line {ok, Node} = start_node(N),
+    ?line Node = proplists:get_value(node,Config),
 
     ?line {ok, Pid} = rpc:call(Node, gen_server, start,
 			       [{global, N}, ?MODULE, [], []]),
@@ -321,8 +354,7 @@ call_remote2(Config) when is_list(Config) ->
 
 call_remote3(suite) -> [];
 call_remote3(Config) when is_list(Config) ->
-    ?line N = hubba,
-    ?line {ok, Node} = start_node(N),
+    ?line Node = proplists:get_value(node,Config),
 
     ?line {ok, Pid} = rpc:call(Node, gen_server, start,
 			       [{local, piller}, ?MODULE, [], []]),
@@ -340,7 +372,7 @@ call_remote3(Config) when is_list(Config) ->
 call_remote_n1(suite) -> [];
 call_remote_n1(Config) when is_list(Config) ->
     ?line N = hubba,
-    ?line {ok, Node} = start_node(N),
+    ?line Node = proplists:get_value(node,Config),    
     ?line {ok, _Pid} = rpc:call(Node, gen_server, start,
 			       [{global, N}, ?MODULE, [], []]),
     ?line _ = test_server:stop_node(Node),
@@ -352,7 +384,7 @@ call_remote_n1(Config) when is_list(Config) ->
 call_remote_n2(suite) -> [];
 call_remote_n2(Config) when is_list(Config) ->
     ?line N = hubba,
-    ?line {ok, Node} = start_node(N),
+    ?line Node = proplists:get_value(node,Config),
 
     ?line {ok, Pid} = rpc:call(Node, gen_server, start,
 			       [{global, N}, ?MODULE, [], []]),
@@ -364,8 +396,7 @@ call_remote_n2(Config) when is_list(Config) ->
 
 call_remote_n3(suite) -> [];
 call_remote_n3(Config) when is_list(Config) ->
-    ?line N = hubba,
-    ?line {ok, Node} = start_node(N),
+    ?line Node = proplists:get_value(node,Config),
 
     ?line {ok, _Pid} = rpc:call(Node, gen_server, start,
 			       [{local, piller}, ?MODULE, [], []]),
diff --git a/lib/stdlib/test/id_transform_SUITE.erl b/lib/stdlib/test/id_transform_SUITE.erl
index 95ee509833..da52f43728 100644
--- a/lib/stdlib/test/id_transform_SUITE.erl
+++ b/lib/stdlib/test/id_transform_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -21,17 +21,37 @@
 
 -include_lib("kernel/include/file.hrl").
           
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 id_transform/1]).
 
 -export([check/2,check2/1,g/0,f/1,t/1,t1/1,t2/1,t3/1,t4/1,
 	 t5/1,t6/1,apa/1,new_fun/0]).
 
-% Serves as test...
+						% Serves as test...
 -hej(hopp).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [id_transform].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> [id_transform].
 
 id_transform(doc) -> "Test erl_id_trans.";
 id_transform(Config) when is_list(Config) ->
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index 73efeb004a..497fd3c562 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -18,9 +18,10 @@
 %%
 -module(io_SUITE).
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([error_1/1, float_g/1, otp_5403/1, otp_5813/1, otp_6230/1, 
          otp_6282/1, otp_6354/1, otp_6495/1, otp_6517/1, otp_6502/1,
@@ -37,7 +38,7 @@
 -define(t, test_server).
 -define(privdir(_), "./io_SUITE_priv").
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(format(S, A), ok).
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -endif.
@@ -49,17 +50,35 @@
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
-fin_per_testcase(_Case, _Config) ->
+end_per_testcase(_Case, _Config) ->
     Dog = ?config(watchdog, _Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(doc) ->
-    ["Test cases for io."];
-all(suite) ->
-    [error_1,float_g,otp_5403,otp_5813,otp_6230,otp_6282,otp_6354,otp_6495,
-     otp_6517,otp_6502,manpage,otp_6708,otp_7084,otp_7421,
-     io_lib_collect_line_3_wb,cr_whitespace_in_string,io_fread_newlines].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [error_1, float_g, otp_5403, otp_5813, otp_6230,
+     otp_6282, otp_6354, otp_6495, otp_6517, otp_6502,
+     manpage, otp_6708, otp_7084, otp_7421,
+     io_lib_collect_line_3_wb, cr_whitespace_in_string,
+     io_fread_newlines].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 error_1(doc) ->
     ["Error cases for output"];
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index d9672a8c7b..3474f41ee6 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -19,15 +19,19 @@
 -module(io_proto_SUITE).
 -compile(r12).
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--export([setopts_getopts/1,unicode_options/1,unicode_options_gen/1, binary_options/1, bc_with_r12/1,
-	 bc_with_r12_gl/1, read_modes_gl/1,bc_with_r12_ogl/1, read_modes_ogl/1, broken_unicode/1,eof_on_pipe/1,unicode_prompt/1]).
+-export([setopts_getopts/1,unicode_options/1,unicode_options_gen/1, 
+	 binary_options/1, bc_with_r12/1,
+	 bc_with_r12_gl/1, read_modes_gl/1,bc_with_r12_ogl/1, 
+	 read_modes_ogl/1, broken_unicode/1,eof_on_pipe/1,unicode_prompt/1]).
 
 
--export([io_server_proxy/1,start_io_server_proxy/0, proxy_getall/1, proxy_setnext/2, proxy_quit/1]).
+-export([io_server_proxy/1,start_io_server_proxy/0, proxy_getall/1, 
+	 proxy_setnext/2, proxy_quit/1]).
 %% For spawn
 -export([toerl_server/3,hold_the_line/3,answering_machine1/3,
 	 answering_machine2/3]).
@@ -42,7 +46,7 @@
 -define(t, test_server).
 -define(privdir(_), "./io_SUITE_priv").
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -endif.
 
@@ -73,19 +77,36 @@ init_per_testcase(_Case, Config) ->
 	   end,
     os:putenv("TERM","vt100"),
     [{watchdog, Dog}, {term, Term} | Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     Term = ?config(term,Config),
     os:putenv("TERM",Term),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(doc) ->
-    ["Test cases for the io_protocol."];
-all(suite) ->
-    [setopts_getopts, unicode_options, unicode_options_gen, binary_options, bc_with_r12, 
-     bc_with_r12_gl,bc_with_r12_ogl, read_modes_gl, read_modes_ogl, 
-     broken_unicode,eof_on_pipe,unicode_prompt].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [setopts_getopts, unicode_options, unicode_options_gen,
+     binary_options, bc_with_r12, bc_with_r12_gl,
+     bc_with_r12_ogl, read_modes_gl, read_modes_ogl,
+     broken_unicode, eof_on_pipe, unicode_prompt].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 -record(state, {
diff --git a/lib/stdlib/test/lists_SUITE.erl b/lib/stdlib/test/lists_SUITE.erl
index 0089e874c8..1fc9de09c3 100644
--- a/lib/stdlib/test/lists_SUITE.erl
+++ b/lib/stdlib/test/lists_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -21,7 +21,7 @@
 %%%-----------------------------------------------------------------
 
 -module(lists_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 
 % Default timetrap timeout (set in init_per_testcase).
@@ -30,36 +30,37 @@
 -define(default_timeout, ?t:minutes(4)).
 
 % Test server specific exports
--export([all/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 % Test cases must be exported.
 -export([member/1, reverse/1,
 	 keymember/1, keysearch_keyfind/1,
          keystore/1, keytake/1,
-	 append/1, append_1/1, append_2/1,
-	 seq/1, seq_loop/1, seq_2/1, seq_3/1, seq_2_e/1, seq_3_e/1,
-	 sublist/1, flatten/1,
+	 append_1/1, append_2/1,
+	 seq_loop/1, seq_2/1, seq_3/1, seq_2_e/1, seq_3_e/1,
+	
 	 sublist_2/1, sublist_3/1, sublist_2_e/1, sublist_3_e/1,
 	 flatten_1/1, flatten_2/1, flatten_1_e/1, flatten_2_e/1,
 	 dropwhile/1,
-	 sort/1, sort_1/1, sort_stable/1, merge/1, rmerge/1, sort_rand/1,
-         usort/1, usort_1/1, usort_stable/1, umerge/1, rumerge/1,usort_rand/1,
+	 sort_1/1, sort_stable/1, merge/1, rmerge/1, sort_rand/1,
+	 usort_1/1, usort_stable/1, umerge/1, rumerge/1,usort_rand/1,
 	 keymerge/1, rkeymerge/1,
-	 keysort/1, keysort_1/1, keysort_i/1, keysort_stable/1,
+	 keysort_1/1, keysort_i/1, keysort_stable/1,
 	 keysort_rand/1, keysort_error/1,
 	 ukeymerge/1, rukeymerge/1,
-	 ukeysort/1, ukeysort_1/1, ukeysort_i/1, ukeysort_stable/1,
+	 ukeysort_1/1, ukeysort_i/1, ukeysort_stable/1,
 	 ukeysort_rand/1, ukeysort_error/1,
 	 funmerge/1, rfunmerge/1,
-	 funsort/1, funsort_1/1, funsort_stable/1, funsort_rand/1,
+	 funsort_1/1, funsort_stable/1, funsort_rand/1,
 	 funsort_error/1,
 	 ufunmerge/1, rufunmerge/1,
-	 ufunsort/1, ufunsort_1/1, ufunsort_stable/1, ufunsort_rand/1,
+	 ufunsort_1/1, ufunsort_stable/1, ufunsort_rand/1,
 	 ufunsort_error/1,
 	 zip_unzip/1, zip_unzip3/1, zipwith/1, zipwith3/1,
 	 filter_partition/1, 
-         tickets/1, otp_5939/1, otp_6023/1, otp_6606/1, otp_7230/1,
+	 otp_5939/1, otp_6023/1, otp_6606/1, otp_7230/1,
 	 suffix/1, subtract/1]).
 
 %% Sort randomized lists until stopped.
@@ -76,21 +77,59 @@
 %%
 %% all/1
 %%
-all(doc) ->
-    [];
-all(suite) ->
-    [append, reverse, member, keymember, keysearch_keyfind, keystore, keytake,
-     dropwhile,
-     sort, usort, keysort, ukeysort, 
-     funsort, ufunsort, sublist, flatten, seq,
-     zip_unzip, zip_unzip3, zipwith, zipwith3,
-     filter_partition, tickets, suffix, subtract].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, append}, reverse, member, keymember,
+     keysearch_keyfind, keystore, keytake, dropwhile, {group,sort},
+     {group, usort}, {group, keysort}, {group, ukeysort},
+     {group, funsort}, {group, ufunsort}, {group, sublist},
+     {group, flatten}, {group, seq}, zip_unzip, zip_unzip3,
+     zipwith, zipwith3, filter_partition, {group, tickets},
+     suffix, subtract].
+
+groups() -> 
+    [{append, [], [append_1, append_2]},
+     {usort, [],
+      [umerge, rumerge, usort_1, usort_rand, usort_stable]},
+     {keysort, [],
+      [keymerge, rkeymerge, keysort_1, keysort_rand,
+       keysort_i, keysort_stable, keysort_error]},
+     {sort,[],[merge, rmerge, sort_1, sort_rand]},
+     {ukeysort, [],
+      [ukeymerge, rukeymerge, ukeysort_1, ukeysort_rand,
+       ukeysort_i, ukeysort_stable, ukeysort_error]},
+     {funsort, [],
+      [funmerge, rfunmerge, funsort_1, funsort_stable,
+       funsort_error, funsort_rand]},
+     {ufunsort, [],
+      [ufunmerge, rufunmerge, ufunsort_1, ufunsort_stable,
+       ufunsort_error, ufunsort_rand]},
+     {seq, [], [seq_loop, seq_2, seq_3, seq_2_e, seq_3_e]},
+     {sublist, [],
+      [sublist_2, sublist_3, sublist_2_e, sublist_3_e]},
+     {flatten, [],
+      [flatten_1, flatten_2, flatten_1_e, flatten_2_e]},
+     {tickets, [], [otp_5939, otp_6023, otp_6606, otp_7230]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -98,10 +137,6 @@ fin_per_testcase(_Case, Config) ->
 %
 % Test cases starts here.
 %
-append(doc) ->
-    ["Tests lists:append/1 & lists:append/2"];
-append(suite) ->
-    [append_1, append_2].
 
 append_1(doc) ->   [];
 append_1(suite) -> [];
@@ -346,12 +381,6 @@ keytake(Config) when is_list(Config) ->
     ?line false = lists:keytake(4, 2, L),
     ok.
 
-sort(doc) ->
-    ["Tests merge functions and lists:sort/1"];
-sort(suite) ->
-    %% [merge, rmerge, sort_1, sort_rand, sort_stable].
-    [merge, rmerge, sort_1, sort_rand].
-
 merge(doc) ->   ["merge functions"];
 merge(suite) -> [];
 merge(Config) when is_list(Config) ->
@@ -536,10 +565,6 @@ expl_pid([{I,F} | T], L) when is_function(F) ->
 expl_pid([], L) ->
     L.
 
-usort(doc) ->
-    ["Tests unique merge functions and lists:usort/1"];
-usort(suite) ->
-    [umerge, rumerge, usort_1, usort_rand, usort_stable].
 
 usort_1(suite) -> [];
 usort_1(doc) -> [""];
@@ -750,11 +775,6 @@ ucheck_stability(L) ->
     U = lists:usort(L),
     check_stab(L, U, S, "usort/1", "ukeysort/2").
 
-keysort(doc) ->
-    ["Tests lists:keysort/2"];
-keysort(suite) ->
-    [keymerge, rkeymerge,
-     keysort_1, keysort_rand, keysort_i, keysort_stable, keysort_error].
 
 keymerge(doc) -> ["Key merge two lists."];
 keymerge(suite) -> [];
@@ -946,11 +966,6 @@ keycompare(I, J, A, B) when element(I, A) == element(I, B),
 			    element(J, A) =< element(J, B) ->
     ok.
 
-ukeysort(doc) ->
-    ["Tests lists:ukeysort/2"];
-ukeysort(suite) ->
-    [ukeymerge, rukeymerge,
-     ukeysort_1, ukeysort_rand, ukeysort_i, ukeysort_stable, ukeysort_error].
 
 ukeymerge(suite) -> [];
 ukeymerge(doc) -> ["Merge two lists while removing duplicates."];
@@ -1240,11 +1255,6 @@ ukeycompare(I, J, A, B) when A =/= B,
     ok.
 
 
-funsort(doc) ->
-    ["Tests lists:sort/2"];
-funsort(suite) ->
-    [funmerge, rfunmerge, 
-     funsort_1, funsort_stable, funsort_error, funsort_rand].
 
 funmerge(doc) -> ["Merge two lists using a fun."];
 funmerge(suite) -> [];
@@ -1377,11 +1387,6 @@ funsort_check(I, Input, Expected) ->
     ?line Expected = funsort(I, Input),
     check_sorted(I, Input, Expected).
 
-ufunsort(doc) ->
-    ["Tests lists:usort/2"];
-ufunsort(suite) ->
-    [ufunmerge, rufunmerge, 
-     ufunsort_1, ufunsort_stable, ufunsort_error, ufunsort_rand].
 
 ufunmerge(suite) -> [];
 ufunmerge(doc) -> ["Merge two lists while removing duplicates using a fun."];
@@ -2076,12 +2081,6 @@ rkeymerge2_2(_I, T1, _E1, [], M, H1) ->
 
 %%%------------------------------------------------------------
 
-seq(doc) ->
-    ["Tests lists:seq/3"];
-seq(suite) ->
-    [
-     seq_loop,
-     seq_2, seq_3, seq_2_e, seq_3_e].
 
 seq_loop(doc) ->
     ["Test for infinite loop (OTP-2404)."];
@@ -2229,10 +2228,6 @@ property(From, To, Step) ->
 
 %%%------------------------------------------------------------
 
-sublist(doc) ->
-    ["Tests lists:sublist/[2,3]"];
-sublist(suite) ->
-    [sublist_2, sublist_3, sublist_2_e, sublist_3_e].
 
 -define(sublist_error2(X,Y), ?line {'EXIT', _} = (catch lists:sublist(X,Y))).
 -define(sublist_error3(X,Y,Z), ?line {'EXIT', _} = (catch lists:sublist(X,Y,Z))).
@@ -2326,10 +2321,6 @@ sublist_3_e(Config) when is_list(Config) ->
 
 %%%------------------------------------------------------------
 
-flatten(doc) ->
-    ["Tests lists:flatten/[1,2]"];
-flatten(suite) ->
-    [flatten_1, flatten_2, flatten_1_e, flatten_2_e].
 
 -define(flatten_error1(X), ?line {'EXIT', _} = (catch lists:flatten(X))).
 -define(flatten_error2(X,Y), ?line {'EXIT', _} = (catch lists:flatten(X,Y))).
@@ -2489,10 +2480,6 @@ filpart(F, All, Exp) ->
     Other = lists:filter(fun(E) -> not F(E) end, All),
     {Exp,Other} = lists:partition(F, All).
 
-tickets(doc) ->
-    ["Ticktes."];
-tickets(suite) ->
-    [otp_5939, otp_6023, otp_6606, otp_7230].
 
 otp_5939(doc) ->   ["OTP-5939. Guard tests added."];
 otp_5939(suite) -> [];
diff --git a/lib/stdlib/test/log_mf_h_SUITE.erl b/lib/stdlib/test/log_mf_h_SUITE.erl
index 640261f665..688be31e64 100644
--- a/lib/stdlib/test/log_mf_h_SUITE.erl
+++ b/lib/stdlib/test/log_mf_h_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -18,12 +18,32 @@
 %%
 -module(log_mf_h_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
--export([all/1, test/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, test/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [test].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all(suite) -> [test].
 
 
 %%-----------------------------------------------------------------
diff --git a/lib/stdlib/test/ms_transform_SUITE.erl b/lib/stdlib/test/ms_transform_SUITE.erl
index 79a0a9af89..f747d09f3c 100644
--- a/lib/stdlib/test/ms_transform_SUITE.erl
+++ b/lib/stdlib/test/ms_transform_SUITE.erl
@@ -19,9 +19,10 @@
 -module(ms_transform_SUITE).
 -author('[email protected]').
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([basic_ets/1]).
 -export([basic_dbg/1]).
 -export([from_shell/1]).
@@ -37,20 +38,122 @@
 -export([andalso_orelse/1]).
 -export([float_1_function/1]).
 -export([action_function/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([warnings/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 init_per_testcase(_Func, Config) ->
     Dog=test_server:timetrap(test_server:seconds(360)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
-all(suite) -> [from_shell,basic_ets,basic_dbg,records,record_index,multipass,
-	       bitsyntax, record_defaults, andalso_orelse,
-               float_1_function, action_function, 
-	       top_match, old_guards, autoimported, semicolon].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [from_shell, basic_ets, basic_dbg, records,
+     record_index, multipass, bitsyntax, record_defaults,
+     andalso_orelse, float_1_function, action_function,
+     warnings, top_match, old_guards, autoimported,
+     semicolon].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%% This may be subject to change
+-define(WARN_NUMBER_SHADOW,50).
+warnings(suite) ->
+    [];
+warnings(doc) ->
+    ["Check that shadowed variables in fun head generate warning"];
+warnings(Config) when is_list(Config) ->
+    ?line setup(Config),
+    Prog = <<"A=5, "
+	    "ets:fun2ms(fun({A,B}) "
+	    "            when is_integer(A) and (A+5 > B) -> "
+	    "              A andalso B "
+	    "            end)">>,
+    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'A'}}]}] =
+	compile_ww(Prog),
+    Prog2 = <<"C=5, "
+	    "ets:fun2ms(fun({A,B} = C) "
+	    "            when is_integer(A) and (A+5 > B) -> "
+	    "              {A andalso B,C} "
+	    "            end)">>,
+    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'C'}}]}] =
+	compile_ww(Prog2),
+    Rec3 = <<"-record(a,{a,b,c,d=foppa}).">>,
+    Prog3 = <<"A=3,C=5, "
+	    "ets:fun2ms(fun(#a{a = A, b = B} = C) "
+	    "            when is_integer(A) and (A+5 > B) -> "
+	    "              {A andalso B,C} "
+	    "            end)">>,
+    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'A'}},
+	       {_,ms_transform,{?WARN_NUMBER_SHADOW,'C'}}]}] =
+	compile_ww(Rec3,Prog3),
+    Rec4 = <<"-record(a,{a,b,c,d=foppa}).">>,
+    Prog4 = <<"A=3,C=5, "
+	     "F = fun(B) -> B*3 end,"
+	     "erlang:display(F(A)),"
+	     "ets:fun2ms(fun(#a{a = A, b = B} = C) "
+	     "            when is_integer(A) and (A+5 > B) -> "
+	     "              {A andalso B,C} "
+	     "            end)">>,
+    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'A'}},
+	       {_,ms_transform,{?WARN_NUMBER_SHADOW,'C'}}]}] =
+	compile_ww(Rec4,Prog4),
+    Rec5 = <<"-record(a,{a,b,c,d=foppa}).">>,
+    Prog5 = <<"A=3,C=5, "
+	     "F = fun(B) -> B*3 end,"
+	     "erlang:display(F(A)),"
+	     "B = ets:fun2ms(fun(#a{a = A, b = B} = C) "
+	     "            when is_integer(A) and (A+5 > B) -> "
+	     "              {A andalso B,C} "
+	     "            end)">>,
+    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'A'}},
+	       {_,ms_transform,{?WARN_NUMBER_SHADOW,'C'}}]}] =
+	compile_ww(Rec5,Prog5),
+    Prog6 = <<"   X=bar, "
+	     "    A = case X of"
+	     "       foo ->"
+	     "          foo;"
+	     "       Y ->"
+	     "          ets:fun2ms(fun(Y) ->" % This is a warning
+	     "                         3*Y"
+	     "                     end)"
+	     "   end,"
+	     "   ets:fun2ms(fun(Y) ->" % Y out of "scope" here, so no warning
+	     "                  {3*Y,A}"
+	     "              end)">>,
+    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'Y'}}]}] =
+	compile_ww(Prog6),
+    Prog7 = <<"   X=bar, "
+	     "    A = case X of"
+	     "       foo ->"
+	     "          Y = foo;"
+	     "       Y ->"
+	     "          bar"
+	     "   end,"
+	     "   ets:fun2ms(fun(Y) ->" % Y exported from case and safe, so warn
+	     "                  {3*Y,A}"
+	     "              end)">>,
+    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'Y'}}]}] =
+	compile_ww(Prog7),
+    ok.
 
 andalso_orelse(suite) ->
     [];
@@ -721,6 +824,24 @@ compile_and_run(Records,Expr) ->
     code:load_binary(tmp,FN,Bin),
     tmp:tmp().
 
+compile_ww(Expr) ->
+    compile_ww(<<>>,Expr).
+compile_ww(Records,Expr) ->
+    Prog = <<
+	"-module(tmp).\n",
+    "-include_lib(\"stdlib/include/ms_transform.hrl\").\n",
+    "-export([tmp/0]).\n",
+    Records/binary,"\n",
+    "tmp() ->\n",
+    Expr/binary,".\n">>,
+    FN=temp_name(),
+    file:write_file(FN,Prog),
+    {ok,Forms} = epp:parse_file(FN,"",""),
+    {ok,tmp,_Bin,Wlist} = compile:forms(Forms,[return_warnings,
+					       nowarn_unused_vars,
+					       nowarn_unused_record]),
+    Wlist.
+
 do_eval(String) ->
     {done,{ok,T,_},[]} = erl_scan:tokens(
 			   [],
diff --git a/lib/stdlib/test/naughty_child.erl b/lib/stdlib/test/naughty_child.erl
index b56130929c..b939436bfc 100644
--- a/lib/stdlib/test/naughty_child.erl
+++ b/lib/stdlib/test/naughty_child.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2010. 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
diff --git a/lib/stdlib/test/proc_lib_SUITE.erl b/lib/stdlib/test/proc_lib_SUITE.erl
index 2fd7725335..25a385950e 100644
--- a/lib/stdlib/test/proc_lib_SUITE.erl
+++ b/lib/stdlib/test/proc_lib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -23,10 +23,12 @@
 %%
 %%-define(STANDALONE,1).
 
--export([all/1, crash/1, sync_start/1, sync_start_nolink/1, sync_start_link/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 crash/1, sync_start_nolink/1, sync_start_link/1,
          spawn_opt/1, sp1/0, sp2/0, sp3/1, sp4/2, sp5/1,
 	 hibernate/1]).
--export([tickets/1, otp_6345/1]).
+-export([ otp_6345/1]).
 
 -export([hib_loop/1, awaken/1]).
 
@@ -40,12 +42,32 @@
 -ifdef(STANDALONE).
 -define(line, noop, ).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -endif.
 
-all(suite) -> [crash, sync_start, spawn_opt, hibernate, tickets].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [crash, {group, sync_start}, spawn_opt, hibernate,
+     {group, tickets}].
+
+groups() -> 
+    [{tickets, [], [otp_6345]},
+     {sync_start, [], [sync_start_nolink, sync_start_link]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
-tickets(suite) -> [otp_6345].
 
 %%-----------------------------------------------------------------
 %% We don't have to test that spwn and spawn_link actually spawns
@@ -127,7 +149,6 @@ crash(Config) when is_list(Config) ->
 		ok
 	end.
 
-sync_start(suite) -> [sync_start_nolink, sync_start_link].
 
 sync_start_nolink(Config) when is_list(Config) ->
     _Pid = spawn_link(?MODULE, sp5, [self()]),
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index e21de8770a..05d8c5f8e3 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -43,7 +43,7 @@
 -define(testcase, current_testcase). % don't know
 -define(t, test_server).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(datadir, ?config(data_dir, Config)).
 -define(privdir, ?config(priv_dir, Config)).
 -define(testcase, ?config(?TESTCASE, Config)).
@@ -51,36 +51,33 @@
 
 -include_lib("stdlib/include/ms_transform.hrl").
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-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([parse_transform/1, 
-             badarg/1, nested_qlc/1, unused_var/1, lc/1, fun_clauses/1,
-             filter_var/1, single/1, exported_var/1, generator_vars/1,
-             nomatch/1, errors/1, pattern/1, 
+-export([ 
+	  badarg/1, nested_qlc/1, unused_var/1, lc/1, fun_clauses/1,
+	  filter_var/1, single/1, exported_var/1, generator_vars/1,
+	  nomatch/1, errors/1, pattern/1, 
 
-         evaluation/1, 
-             eval/1, cursor/1, fold/1, eval_unique/1, eval_cache/1, append/1, 
-             evaluator/1, string_to_handle/1, table/1, process_dies/1, 
-             sort/1, keysort/1, filesort/1, cache/1, cache_list/1, filter/1, 
-             info/1, nested_info/1, lookup1/1, lookup2/1, lookup_rec/1, 
-             indices/1, pre_fun/1, skip_filters/1,
+	  eval/1, cursor/1, fold/1, eval_unique/1, eval_cache/1, append/1, 
+	  evaluator/1, string_to_handle/1, table/1, process_dies/1, 
+	  sort/1, keysort/1, filesort/1, cache/1, cache_list/1, filter/1, 
+	  info/1, nested_info/1, lookup1/1, lookup2/1, lookup_rec/1, 
+	  indices/1, pre_fun/1, skip_filters/1,
 
-         table_impls/1,
-             ets/1, dets/1,
+	  ets/1, dets/1,
 
-         join/1,
-             join_option/1, join_filter/1, join_lookup/1, join_merge/1,
-             join_sort/1, join_complex/1,
+	  join_option/1, join_filter/1, join_lookup/1, join_merge/1,
+	  join_sort/1, join_complex/1,
 
-         tickets/1,
-             otp_5644/1, otp_5195/1, otp_6038_bug/1, otp_6359/1, otp_6562/1,
-             otp_6590/1, otp_6673/1, otp_6964/1, otp_7114/1, otp_7238/1,
-             otp_7232/1, otp_7552/1, otp_6674/1, otp_7714/1,
+	  otp_5644/1, otp_5195/1, otp_6038_bug/1, otp_6359/1, otp_6562/1,
+	  otp_6590/1, otp_6673/1, otp_6964/1, otp_7114/1, otp_7238/1,
+	  otp_7232/1, otp_7552/1, otp_6674/1, otp_7714/1,
 
-         manpage/1,
+	  manpage/1,
 
-         compat/1,
-             backward/1, forward/1]).
+	  backward/1, forward/1]).
 
 %% Internal exports.
 -export([bad_table_throw/1, bad_table_exit/1, default_table/1, bad_table/1,
@@ -114,17 +111,50 @@ init_per_testcase(Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{?TESTCASE, Case}, {watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, _Config) ->
+end_per_testcase(_Case, _Config) ->
     Dog = ?config(watchdog, _Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> 
-    [parse_transform, evaluation, table_impls, join, tickets, manpage, compat].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, parse_transform}, {group, evaluation},
+     {group, table_impls}, {group, join}, {group, tickets},
+     manpage, {group, compat}].
+
+groups() -> 
+    [{parse_transform, [],
+      [badarg, nested_qlc, unused_var, lc, fun_clauses,
+       filter_var, single, exported_var, generator_vars,
+       nomatch, errors, pattern]},
+     {evaluation, [],
+      [eval, cursor, fold, eval_unique, eval_cache, append,
+       evaluator, string_to_handle, table, process_dies, sort,
+       keysort, filesort, cache, cache_list, filter, info,
+       nested_info, lookup1, lookup2, lookup_rec, indices,
+       pre_fun, skip_filters]},
+     {table_impls, [], [ets, dets]},
+     {join, [],
+      [join_option, join_filter, join_lookup, join_merge,
+       join_sort, join_complex]},
+     {tickets, [],
+      [otp_5644, otp_5195, otp_6038_bug, otp_6359, otp_6562,
+       otp_6590, otp_6673, otp_6964, otp_7114, otp_7232,
+       otp_7238, otp_7552, otp_6674, otp_7714]},
+     {compat, [], [backward, forward]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
 
-parse_transform(suite) ->
-    [badarg, nested_qlc, unused_var, lc, fun_clauses, filter_var,
-     single, exported_var, generator_vars, nomatch, errors, pattern].
+end_per_group(_GroupName, Config) ->
+    Config.
 
 badarg(doc) ->
     "Badarg.";
@@ -461,11 +491,6 @@ pattern(Config) when is_list(Config) ->
                          -record(k, {t,v}).\n">>, Ts),
     ok.
 
-evaluation(suite) ->
-    [eval, cursor, fold, eval_unique, eval_cache, append, evaluator, 
-     string_to_handle, table, process_dies, sort, keysort, filesort, cache,
-     cache_list, filter, info, nested_info, lookup1, lookup2, lookup_rec, 
-     indices, pre_fun, skip_filters].
 
 eval(doc) ->
     "eval/2";
@@ -4297,8 +4322,6 @@ skip_filters(Config) when is_list(Config) ->
 
     ok.
 
-table_impls(suite) ->
-    [ets, dets].
 
 ets(doc) ->
     "ets:table/1,2.";
@@ -4445,9 +4468,6 @@ dets(Config) when is_list(Config) ->
     _ = file:delete(Fname),
     ok.
 
-join(suite) ->
-    [join_option, join_filter, join_lookup, join_merge, 
-     join_sort, join_complex].
 
 join_option(doc) ->
     "The 'join' option (any, lookup, merge, nested_loop). Also cache/unique.";
@@ -5729,10 +5749,6 @@ join_complex(Config) when is_list(Config) ->
 
     ok.
 
-tickets(suite) ->
-    [otp_5644, otp_5195, otp_6038_bug, otp_6359, otp_6562, otp_6590, 
-     otp_6673, otp_6964, otp_7114, otp_7232, otp_7238, otp_7552, otp_6674,
-     otp_7714].
 
 otp_5644(doc) ->
     "OTP-5644. Handle the new language element M:F/A.";
@@ -7378,8 +7394,6 @@ gb_iter(I0, N, EFun) ->
     end.
     ">>.
 
-compat(suite) ->
-    [backward, forward].
 
 backward(doc) ->
     "OTP-6674. Join info and extra constants.";
diff --git a/lib/stdlib/test/queue_SUITE.erl b/lib/stdlib/test/queue_SUITE.erl
index 2cd6b52311..4095b62643 100644
--- a/lib/stdlib/test/queue_SUITE.erl
+++ b/lib/stdlib/test/queue_SUITE.erl
@@ -17,13 +17,14 @@
 %% %CopyrightEnd%
 %%
 -module(queue_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([do/1, to_list/1, io_test/1, op_test/1, error/1, oops/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -31,16 +32,32 @@
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(doc) ->
-    ["Test cases for queue."];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [do, to_list, io_test, op_test, error, oops].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 do(doc) ->
     [""];
 do(suite) ->
diff --git a/lib/stdlib/test/random_SUITE.erl b/lib/stdlib/test/random_SUITE.erl
index 8f1c304705..6164301e38 100644
--- a/lib/stdlib/test/random_SUITE.erl
+++ b/lib/stdlib/test/random_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2010. 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
@@ -17,13 +17,14 @@
 %% %CopyrightEnd%
 
 -module(random_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([interval_1/1, seed0/1, seed/1]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -31,16 +32,32 @@
 init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(doc) ->
-    ["Test cases for random."];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [interval_1, seed0, seed].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 seed0(doc) ->
     ["Test that seed is set implicitly, and always the same."];
 seed0(suite) ->
diff --git a/lib/stdlib/test/random_iolist.erl b/lib/stdlib/test/random_iolist.erl
index 4bce347d9a..8f21b5a3b3 100644
--- a/lib/stdlib/test/random_iolist.erl
+++ b/lib/stdlib/test/random_iolist.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
diff --git a/lib/stdlib/test/random_unicode_list.erl b/lib/stdlib/test/random_unicode_list.erl
index 3e83383b08..b8bd719b89 100644
--- a/lib/stdlib/test/random_unicode_list.erl
+++ b/lib/stdlib/test/random_unicode_list.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index 46a84d4e24..b82835854e 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -18,12 +18,41 @@
 %%
 -module(re_SUITE).
 
--export([all/1, pcre/1,compile_options/1,run_options/1,combined_options/1,replace_autogen/1,global_capture/1,replace_input_types/1,replace_return/1,split_autogen/1,split_options/1,split_specials/1,error_handling/1,pcre_cve_2008_2371/1,pcre_compile_workspace_overflow/1,re_infinite_loop/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, pcre/1,compile_options/1,
+	 run_options/1,combined_options/1,replace_autogen/1,
+	 global_capture/1,replace_input_types/1,replace_return/1,
+	 split_autogen/1,split_options/1,split_specials/1,
+	 error_handling/1,pcre_cve_2008_2371/1,
+	 pcre_compile_workspace_overflow/1,re_infinite_loop/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
-all(suite) -> [pcre,compile_options,run_options,combined_options,replace_autogen,global_capture,replace_input_types,replace_return,split_autogen,split_options,split_specials,error_handling,pcre_cve_2008_2371,pcre_compile_workspace_overflow,re_infinite_loop].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [pcre, compile_options, run_options, combined_options,
+     replace_autogen, global_capture, replace_input_types,
+     replace_return, split_autogen, split_options,
+     split_specials, error_handling, pcre_cve_2008_2371,
+     pcre_compile_workspace_overflow, re_infinite_loop].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 pcre(doc) ->
     ["Run all applicable tests from the PCRE testsuites."];
diff --git a/lib/stdlib/test/select_SUITE.erl b/lib/stdlib/test/select_SUITE.erl
index 6900f1a8f5..af67b798b0 100644
--- a/lib/stdlib/test/select_SUITE.erl
+++ b/lib/stdlib/test/select_SUITE.erl
@@ -37,7 +37,7 @@
 -export([config/2]).
 -define(fmt(A,B),io:format(A,B)).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(fmt(A,B),test_server:format(A,B)).
 -endif.
  
@@ -58,23 +58,41 @@ config(priv_dir,_) ->
     ".".
 -else.
 %% When run in test server.
--export([all/1,select_test/1,init_per_testcase/2, fin_per_testcase/2, 
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,select_test/1,
+	 init_per_testcase/2, end_per_testcase/2, 
 	 return_values/1]).
 
 init_per_testcase(_Case, Config) when is_list(Config) ->
     ?line Dog=test_server:timetrap(test_server:seconds(1200)),
     [{watchdog, Dog}|Config].
- 
-fin_per_testcase(_Case, Config) ->
+
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(doc) ->
-    ["Test ets:select"];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [return_values, select_test].
- 
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 select_test(suite) ->
     [];
 select_test(doc) ->
diff --git a/lib/stdlib/test/sets_SUITE.erl b/lib/stdlib/test/sets_SUITE.erl
index c9f1a03598..bce23c7b12 100644
--- a/lib/stdlib/test/sets_SUITE.erl
+++ b/lib/stdlib/test/sets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -22,13 +22,15 @@
 
 -module(sets_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2,
+-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,
 	 create/1,add_element/1,del_element/1,
 	 subtract/1,intersection/1,union/1,is_subset/1,
 	 is_set/1,fold/1,filter/1,
 	 take_smallest/1,take_largest/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -import(lists, [foldl/3,reverse/1]).
 
@@ -36,15 +38,33 @@ init_per_testcase(_Case, Config) ->
     ?line Dog = ?t:timetrap(?t:minutes(5)),
     [{watchdog,Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    [create,add_element,del_element,subtract,
-     intersection,union,is_subset,is_set,fold,filter,
-     take_smallest,take_largest].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [create, add_element, del_element, subtract,
+     intersection, union, is_subset, is_set, fold, filter,
+     take_smallest, take_largest].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 create(Config) when is_list(Config) ->
     test_all(fun create_1/1).
diff --git a/lib/stdlib/test/sets_test_lib.erl b/lib/stdlib/test/sets_test_lib.erl
index 6b6fb00550..bdfb0d59d2 100644
--- a/lib/stdlib/test/sets_test_lib.erl
+++ b/lib/stdlib/test/sets_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 588342d46a..4f8c9dffd3 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -17,21 +17,22 @@
 %% %CopyrightEnd%
 %%
 -module(shell_SUITE).
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([forget/1, records/1, known_bugs/1, otp_5226/1, otp_5327/1,
-                 otp_5435/1, otp_5195/1, otp_5915/1, otp_5916/1,
-         bits/1, bs_match_misc_SUITE/1, bs_match_int_SUITE/1,
-                 bs_match_tail_SUITE/1, bs_match_bin_SUITE/1,
-                 bs_construct_SUITE/1,
-         refman/1, refman_bit_syntax/1, 
-         progex/1, progex_bit_syntax/1, progex_records/1, 
-                   progex_lc/1, progex_funs/1,
-         tickets/1, otp_5990/1, otp_6166/1, otp_6554/1, otp_6785/1,
-                    otp_7184/1, otp_7232/1, otp_8393/1]).
-
--export([restricted/1, start_restricted_from_shell/1, 
-	 start_restricted_on_command_line/1,restricted_local/1]).
+	 otp_5435/1, otp_5195/1, otp_5915/1, otp_5916/1,
+	 bs_match_misc_SUITE/1, bs_match_int_SUITE/1,
+	 bs_match_tail_SUITE/1, bs_match_bin_SUITE/1,
+	 bs_construct_SUITE/1,
+	 refman_bit_syntax/1, 
+	 progex_bit_syntax/1, progex_records/1, 
+	 progex_lc/1, progex_funs/1,
+	 otp_5990/1, otp_6166/1, otp_6554/1, otp_6785/1,
+	 otp_7184/1, otp_7232/1, otp_8393/1]).
+
+-export([ start_restricted_from_shell/1, 
+	  start_restricted_on_command_line/1,restricted_local/1]).
 
 %% Internal export.
 -export([otp_5435_2/0, prompt1/1, prompt2/1, prompt3/1, prompt4/1,
@@ -50,8 +51,8 @@
 config(priv_dir,_) ->
     ".".
 -else.
--include("test_server.hrl").
--export([init_per_testcase/2, fin_per_testcase/2]).
+-include_lib("test_server/include/test_server.hrl").
+-export([init_per_testcase/2, end_per_testcase/2]).
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(2)).
 init_per_testcase(_Case, Config) ->
@@ -60,7 +61,7 @@ init_per_testcase(_Case, Config) ->
     ?line code:add_patha(?config(priv_dir,Config)),
     [{orig_path,OrigPath}, {watchdog, Dog} | Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     ?line Dog = ?config(watchdog, Config),
     ?line test_server:timetrap_cancel(Dog),
     ?line OrigPath = ?config(orig_path,Config),
@@ -71,18 +72,44 @@ fin_per_testcase(_Case, Config) ->
     ok.
 -endif.
 
-all(doc) ->
-    ["Test cases for the 'shell' module."];
-all(suite) ->
-    [forget, records, known_bugs, otp_5226, otp_5327, otp_5435, otp_5195,
-     otp_5915, otp_5916, bits, refman, progex, tickets, restricted].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [forget, records, known_bugs, otp_5226, otp_5327,
+     otp_5435, otp_5195, otp_5915, otp_5916, {group, bits},
+     {group, refman}, {group, progex}, {group, tickets},
+     {group, restricted}].
+
+groups() -> 
+    [{restricted, [],
+      [start_restricted_from_shell,
+       start_restricted_on_command_line, restricted_local]},
+     {bits, [],
+      [bs_match_misc_SUITE, bs_match_tail_SUITE,
+       bs_match_bin_SUITE, bs_construct_SUITE]},
+     {refman, [], [refman_bit_syntax]},
+     {progex, [],
+      [progex_bit_syntax, progex_records, progex_lc,
+       progex_funs]},
+     {tickets, [],
+      [otp_5990, otp_6166, otp_6554, otp_6785, otp_7184,
+       otp_7232, otp_8393]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 -record(state, {bin, reply, leader}).
 
-restricted(doc) ->
-    ["Test restricted_shell"];
-restricted(suite) ->
-    [start_restricted_from_shell,start_restricted_on_command_line,restricted_local].
 
 start_restricted_from_shell(doc) ->
     ["Test that a restricted shell can be started from the normal shell"];
@@ -797,9 +824,6 @@ otp_5916(Config) when is_list(Config) ->
     [ok] = scan(C),
     ok.
 
-bits(suite) ->
-    [bs_match_misc_SUITE, % bs_match_int_SUITE/,
-     bs_match_tail_SUITE, bs_match_bin_SUITE, bs_construct_SUITE].
 
 bs_match_misc_SUITE(doc) ->
     ["OTP-5327. Adopted from parts of emulator/test/bs_match_misc_SUITE.erl."];
@@ -1520,8 +1544,6 @@ evaluate(Str, Vars) ->
 	    Result
     end.
 
-refman(suite) ->
-    [refman_bit_syntax].
 
 refman_bit_syntax(doc) ->
     ["Bit syntax examples from the Reference Manual. OTP-5237."];
@@ -1564,8 +1586,6 @@ refman_bit_syntax(Config) when is_list(Config) ->
     ?line <<2,4,6>> =  << << (X*2) >> || <<X>> <= << 1,2,3 >> >>,
     ok.
 
-progex(suite) ->
-    [progex_bit_syntax, progex_records, progex_lc, progex_funs].
 
 -define(IP_VERSION, 4).
 -define(IP_MIN_HDR_LEN, 5).
@@ -2256,8 +2276,6 @@ progex_funs(Config) when is_list(Config) ->
     ?line [ok] = scan(Test2_shell),
     ok.
 
-tickets(suite) ->
-    [otp_5990, otp_6166, otp_6554, otp_6785, otp_7184, otp_7232, otp_8393].
 
 otp_5990(doc) ->
     "OTP-5990. {erlang,is_record}.";
diff --git a/lib/stdlib/test/slave_SUITE.erl b/lib/stdlib/test/slave_SUITE.erl
index 5c1282fe9b..12325dcca9 100644
--- a/lib/stdlib/test/slave_SUITE.erl
+++ b/lib/stdlib/test/slave_SUITE.erl
@@ -18,18 +18,37 @@
 %%
 -module(slave_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, t_start/1, t_start_link/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, t_start/1, t_start_link/1,
 	 start_link_nodedown/1, errors/1]).
 
 %% Internal exports.
 -export([fun_init/1, test_errors/1]).
 -export([timeout_test/1, auth_test/1, rsh_test/1, start_a_slave/3]).
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [t_start_link, start_link_nodedown, t_start, errors].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 t_start_link(suite) -> [];
 t_start_link(Config) when is_list(Config) ->
     ?line Dog = test_server:timetrap(test_server:seconds(20)),
diff --git a/lib/stdlib/test/sofs_SUITE.erl b/lib/stdlib/test/sofs_SUITE.erl
index d60cfc6895..e1eaf7f8ec 100644
--- a/lib/stdlib/test/sofs_SUITE.erl
+++ b/lib/stdlib/test/sofs_SUITE.erl
@@ -26,13 +26,14 @@
 -define(config(X,Y), foo).
 -define(t, test_server).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(format(S, A), ok).
 -endif.
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
--export([sofs/1, from_term_1/1, set_1/1, from_sets_1/1, relation_1/1,
+-export([ from_term_1/1, set_1/1, from_sets_1/1, relation_1/1,
 	 a_function_1/1, family_1/1, projection/1,
 	 relation_to_family_1/1, domain_1/1, range_1/1, image/1,
 	 inverse_image/1, inverse_1/1, converse_1/1, no_elements_1/1,
@@ -47,7 +48,7 @@
 	 multiple_relative_product/1, digraph/1, constant_function/1,
 	 misc/1]).
 
--export([sofs_family/1, family_specification/1,
+-export([ family_specification/1,
          family_domain_1/1, family_range_1/1,
 	 family_to_relation_1/1, 
          union_of_family_1/1, intersection_of_family_1/1,
@@ -81,18 +82,56 @@
 	 union/1, union/2, family_to_digraph/1, family_to_digraph/2,
 	 digraph_to_family/1, digraph_to_family/2]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 -compile({inline,[{eval,2}]}).
 
-all(suite) ->
-    [sofs, sofs_family].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, sofs}, {group, sofs_family}].
+
+groups() -> 
+    [{sofs, [],
+      [from_term_1, set_1, from_sets_1, relation_1,
+       a_function_1, family_1, relation_to_family_1, domain_1,
+       range_1, image, inverse_image, inverse_1, converse_1,
+       no_elements_1, substitution, restriction, drestriction,
+       projection, strict_relation_1, extension,
+       weak_relation_1, to_sets_1, specification, union_1,
+       intersection_1, difference, symdiff,
+       symmetric_partition, is_sofs_set_1, is_set_1, is_equal,
+       is_subset, is_a_function_1, is_disjoint, join,
+       canonical, composite_1, relative_product_1,
+       relative_product_2, product_1, partition_1, partition_3,
+       multiple_relative_product, digraph, constant_function,
+       misc]},
+     {sofs_family, [],
+      [family_specification, family_domain_1, family_range_1,
+       family_to_relation_1, union_of_family_1,
+       intersection_of_family_1, family_projection,
+       family_difference, family_intersection_1,
+       family_intersection_2, family_union_1, family_union_2,
+       partition_family]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     Dog=?t:timetrap(?t:minutes(2)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -100,18 +139,6 @@ fin_per_testcase(_Case, Config) ->
 %% [{2,b},{1,a,b}] == lists:sort([{2,b},{1,a,b}])
 %% [{1,a,b},{2,b}] == lists:keysort(1,[{2,b},{1,a,b}])
 
-sofs(suite) ->
-    [from_term_1, set_1, from_sets_1, relation_1, a_function_1,
-     family_1, relation_to_family_1, domain_1, range_1, image,
-     inverse_image, inverse_1, converse_1, no_elements_1,
-     substitution, restriction, drestriction, projection,
-     strict_relation_1, extension, weak_relation_1, to_sets_1,
-     specification, union_1, intersection_1, difference, symdiff,
-     symmetric_partition, is_sofs_set_1, is_set_1, is_equal,
-     is_subset, is_a_function_1, is_disjoint, join, canonical,
-     composite_1, relative_product_1, relative_product_2, product_1,
-     partition_1, partition_3, multiple_relative_product, digraph,
-     constant_function, misc].
 
 from_term_1(suite) -> [];
 from_term_1(doc) -> [""];
@@ -1934,12 +1961,6 @@ relational_restriction(R) ->
     Fun = fun(S) -> no_elements(S) > 1 end,
     family_to_relation(family_specification(Fun, relation_to_family(R))).
 
-sofs_family(suite) ->
-    [family_specification, family_domain_1, family_range_1, 
-     family_to_relation_1, union_of_family_1, intersection_of_family_1, 
-     family_projection, family_difference, 
-     family_intersection_1, family_intersection_2, 
-     family_union_1, family_union_2, partition_family].
 
 family_specification(suite) -> [];
 family_specification(doc) -> [""];
diff --git a/lib/stdlib/test/stdlib.cover b/lib/stdlib/test/stdlib.cover
index b98d949889..61f4f064b9 100644
--- a/lib/stdlib/test/stdlib.cover
+++ b/lib/stdlib/test/stdlib.cover
@@ -1,10 +1,17 @@
 %% -*- erlang -*-
-{exclude,
-	[erl_parse,
-         ets,
-	 filename,
-	 gen_event,
-	 gen_server,
-	 gen,
-	 lists,
-	 proc_lib]}.
+{incl_app,stdlib,details}.
+
+{excl_mods,stdlib,
+ [erl_parse,
+  erl_eval,
+  ets,
+  filename,
+  gen_event,
+  gen_server,
+  gen,
+  lists,
+  io,
+  io_lib,
+  io_lib_format,
+  io_lib_pretty,
+  proc_lib]}.
diff --git a/lib/stdlib/test/stdlib.spec b/lib/stdlib/test/stdlib.spec
index bbfb43bd15..3768e494b2 100644
--- a/lib/stdlib/test/stdlib.spec
+++ b/lib/stdlib/test/stdlib.spec
@@ -1,4 +1 @@
-{topcase, {dir, "../stdlib_test"}}.
-%{skip,{dets_SUITE,open_file_1,"Crashes Windows tests"}}.
-%{skip,{dets_SUITE,fold,"Crashes Windows tests"}}.
-%{skip,{dets_SUITE,match,"Crashes Windows tests"}}.
+{suites,"../stdlib_test",all}.
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl
index d46a2caf90..0cca030b3d 100644
--- a/lib/stdlib/test/stdlib_SUITE.erl
+++ b/lib/stdlib/test/stdlib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2011. 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
@@ -20,7 +20,7 @@
 %%% Purpose:Stdlib application test suite.
 %%%-----------------------------------------------------------------
 -module(stdlib_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 
 % Default timetrap timeout (set in init_per_testcase).
@@ -28,8 +28,9 @@
 -define(application, stdlib).
 
 % Test server specific exports
--export([all/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 % Test cases must be exported.
 -export([app_test/1]).
@@ -38,15 +39,31 @@
 %%
 %% all/1
 %%
-all(doc) ->
-    [];
-all(suite) ->
-    [?cases].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [app_test].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -58,7 +75,7 @@ app_test(suite) ->
     [];
 app_test(doc) ->
     ["Application consistency test."];
-app_test(Config) when list(Config) ->
+app_test(Config) when is_list(Config) ->
     ?t:app_test(stdlib),
     ok.
 
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl
index 3171b87c44..7e52441a67 100644
--- a/lib/stdlib/test/string_SUITE.erl
+++ b/lib/stdlib/test/string_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. 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
@@ -20,15 +20,16 @@
 %%% Purpose: string test suite.
 %%%-----------------------------------------------------------------
 -module(string_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
 
 % Test server specific exports
--export([all/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 % Test cases must be exported.
 -export([len/1,equal/1,concat/1,chr_rchr/1,str_rstr/1]).
@@ -40,19 +41,34 @@
 %%
 %% all/1
 %%
-all(doc) ->
-    [];
-all(suite) ->
-    [len,equal,concat,chr_rchr,str_rstr,
-     span_cspan,substr,tokens,chars,
-     copies,words,strip,sub_word,left_right,
-     sub_string,centre, join,
-     to_integer,to_float,to_upper_to_lower].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [len, equal, concat, chr_rchr, str_rstr, span_cspan,
+     substr, tokens, chars, copies, words, strip, sub_word,
+     left_right, sub_string, centre, join, to_integer,
+     to_float, to_upper_to_lower].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
@@ -240,7 +256,8 @@ copies(Config) when is_list(Config) ->
     ?line "." = string:copies(".", 1),
     ?line 30 = length(string:copies("123", 10)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:chars("hej", -1)),
+    ?line {'EXIT',_} = (catch string:copies("hej", -1)),
+    ?line {'EXIT',_} = (catch string:copies("hej", 2.0)),
     ok.
 
 words(suite) ->
diff --git a/lib/stdlib/test/supervisor_1.erl b/lib/stdlib/test/supervisor_1.erl
index 297550b230..3198be0fed 100644
--- a/lib/stdlib/test/supervisor_1.erl
+++ b/lib/stdlib/test/supervisor_1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index 039ea298c4..6e927da2ab 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2011. 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
@@ -20,49 +20,104 @@
 
 -module(supervisor_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Testserver specific export
--export([all/1]).
+-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]).
 
 %% Indirect spawn export
 -export([init/1]).
 
 %% API tests
--export([sup_start/1, sup_start_normal/1, sup_start_ignore_init/1, 
+-export([ sup_start_normal/1, sup_start_ignore_init/1, 
 	 sup_start_ignore_child/1, sup_start_error_return/1, 
-	 sup_start_fail/1, sup_stop/1, sup_stop_infinity/1, 
+	 sup_start_fail/1, sup_stop_infinity/1, 
 	 sup_stop_timeout/1, sup_stop_brutal_kill/1, child_adm/1,
 	 child_adm_simple/1, child_specs/1, extra_return/1]).
 
 %% Tests concept permanent, transient and temporary 
--export([normal_termination/1, permanent_normal/1, transient_normal/1,
-	 temporary_normal/1, abnormal_termination/1,
+-export([ permanent_normal/1, transient_normal/1,
+	 temporary_normal/1,
 	 permanent_abnormal/1, transient_abnormal/1,
 	 temporary_abnormal/1]).
 
 %% Restart strategy tests 
--export([restart_one_for_one/1, one_for_one/1,
-	 one_for_one_escalation/1, restart_one_for_all/1, one_for_all/1,
-	 one_for_all_escalation/1, restart_simple_one_for_one/1,
+-export([ one_for_one/1,
+	 one_for_one_escalation/1, one_for_all/1,
+	 one_for_all_escalation/1,
 	 simple_one_for_one/1, simple_one_for_one_escalation/1,
-	 restart_rest_for_one/1, rest_for_one/1, rest_for_one_escalation/1,
+	 rest_for_one/1, rest_for_one_escalation/1,
 	 simple_one_for_one_extra/1]).
 
 %% Misc tests
--export([child_unlink/1, tree/1, count_children_memory/1]).
+-export([child_unlink/1, tree/1, count_children_memory/1,
+	 do_not_save_start_parameters_for_temporary_children/1]).
 
 %-------------------------------------------------------------------------
 
-all(suite) -> 
-    {req,[stdlib], 
-     [sup_start, sup_stop, child_adm,
-      child_adm_simple, extra_return, child_specs,
-      restart_one_for_one, restart_one_for_all,
-      restart_simple_one_for_one, restart_rest_for_one,
-      normal_termination, abnormal_termination, child_unlink, tree,
-      count_children_memory]}.
 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, sup_start}, {group, sup_stop}, child_adm,
+     child_adm_simple, extra_return, child_specs,
+     {group, restart_one_for_one},
+     {group, restart_one_for_all},
+     {group, restart_simple_one_for_one},
+     {group, restart_rest_for_one},
+     {group, normal_termination},
+     {group, abnormal_termination}, child_unlink, tree,
+     count_children_memory, do_not_save_start_parameters_for_temporary_children].
+
+groups() -> 
+    [{sup_start, [],
+      [sup_start_normal, sup_start_ignore_init,
+       sup_start_ignore_child, sup_start_error_return,
+       sup_start_fail]},
+     {sup_stop, [],
+      [sup_stop_infinity, sup_stop_timeout,
+       sup_stop_brutal_kill]},
+     {normal_termination, [],
+      [permanent_normal, transient_normal, temporary_normal]},
+     {abnormal_termination, [],
+      [permanent_abnormal, transient_abnormal,
+       temporary_abnormal]},
+     {restart_one_for_one, [],
+      [one_for_one, one_for_one_escalation]},
+     {restart_one_for_all, [],
+      [one_for_all, one_for_all_escalation]},
+     {restart_simple_one_for_one, [],
+      [simple_one_for_one, simple_one_for_one_extra,
+       simple_one_for_one_escalation]},
+     {restart_rest_for_one, [],
+      [rest_for_one, rest_for_one_escalation]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+init_per_testcase(count_children_memory, Config) ->
+    MemoryState = erlang:system_info(allocator),
+    case count_children_allocator_test(MemoryState) of
+	true -> Config;
+	false ->
+	    {skip, "+Meamin used during test; erlang:memory/1 not available"}
+    end;
+init_per_testcase(_Case, Config) ->
+    Config.
+
+end_per_testcase(_Case, _Config) ->
+    ok.
 
 start(InitResult) ->
     supervisor:start_link({local, sup_test}, ?MODULE, InitResult).
@@ -81,19 +136,8 @@ get_child_counts(Supervisor) ->
      proplists:get_value(supervisors, Counts),
      proplists:get_value(workers, Counts)].
 
-
 %-------------------------------------------------------------------------
-%
 % Test cases starts here.
-%
-%-------------------------------------------------------------------------
-
-sup_start(doc) ->
-    ["Test start of a supervisor."];
-sup_start(suite) ->
-    [sup_start_normal, sup_start_ignore_init, sup_start_ignore_child,
-     sup_start_error_return, sup_start_fail].
-
 %-------------------------------------------------------------------------
 sup_start_normal(doc) ->
     ["Tests that the supervisor process starts correctly and that it "
@@ -192,12 +236,6 @@ sup_start_fail(Config) when is_list(Config) ->
     end,
     ok.
 %-------------------------------------------------------------------------
-sup_stop(doc) ->
-    ["Tests that the supervisor shoutdowns its children if it is " 
-     "shutdown itself."];
-sup_stop(suite) -> [sup_stop_infinity, sup_stop_timeout, sup_stop_brutal_kill].
-
-%-------------------------------------------------------------------------
 
 sup_stop_infinity(doc) ->
     ["See sup_stop/1 when Shutdown = infinity, this walue is only allowed "
@@ -549,11 +587,6 @@ child_specs(Config) when is_list(Config) ->
     ?line ok = supervisor:check_childspecs([C3]),
     ?line ok = supervisor:check_childspecs([C4]),
     ok.
-%-------------------------------------------------------------------------
-normal_termination(doc) ->
-    ["Testes the supervisors behaviour if a child dies with reason normal"];
-normal_termination(suite) -> 
-    [permanent_normal, transient_normal, temporary_normal].
 
 %-------------------------------------------------------------------------
 permanent_normal(doc) ->
@@ -615,11 +648,6 @@ temporary_normal(Config) when is_list(Config) ->
     ?line [1,0,0,1] = get_child_counts(sup_test),
 
     ok.
-%-------------------------------------------------------------------------
-abnormal_termination(doc) ->
-    ["Testes the supervisors behaviour if a child dies with reason abnormal"];
-abnormal_termination(suite) -> 
-    [permanent_abnormal, transient_abnormal, temporary_abnormal].
 
 %-------------------------------------------------------------------------
 permanent_abnormal(doc) ->
@@ -688,12 +716,6 @@ temporary_abnormal(Config) when is_list(Config) ->
 
     ok.
 %-------------------------------------------------------------------------
-restart_one_for_one(doc) ->
-    ["Test that the one_for_one strategy works."];
-
-restart_one_for_one(suite) -> [one_for_one, one_for_one_escalation].
-
-%-------------------------------------------------------------------------
 one_for_one(doc) ->
     ["Test the one_for_one base case."];
 one_for_one(suite) -> [];
@@ -772,13 +794,6 @@ one_for_one_escalation(Config) when is_list(Config) ->
     end,
     ok.
 %-------------------------------------------------------------------------
-restart_one_for_all(doc) ->
-    ["Test that the one_for_all strategy works."];
-
-restart_one_for_all(suite) -> 
-    [one_for_all, one_for_all_escalation].
-
-%-------------------------------------------------------------------------
 one_for_all(doc) ->
     ["Test the one_for_all base case."];
 one_for_all(suite) -> [];
@@ -866,14 +881,6 @@ one_for_all_escalation(Config) when is_list(Config) ->
     ok.
 
 %-------------------------------------------------------------------------
-restart_simple_one_for_one(doc) ->
-    ["Test that the simple_one_for_one strategy works."];
-
-restart_simple_one_for_one(suite) -> 
-    [simple_one_for_one, simple_one_for_one_extra,
-     simple_one_for_one_escalation].
-
-%-------------------------------------------------------------------------
 simple_one_for_one(doc) ->
     ["Test the simple_one_for_one base case."];
 simple_one_for_one(suite) -> [];
@@ -990,11 +997,6 @@ simple_one_for_one_escalation(Config) when is_list(Config) ->
     end,
     ok.
 %-------------------------------------------------------------------------
-restart_rest_for_one(doc) ->
-    ["Test that the rest_for_one strategy works."];
-restart_rest_for_one(suite) -> [rest_for_one, rest_for_one_escalation].
-
-%-------------------------------------------------------------------------
 rest_for_one(doc) ->
     ["Test the rest_for_one base case."];
 rest_for_one(suite) -> [];
@@ -1267,26 +1269,10 @@ tree(Config) when is_list(Config) ->
     
     ok.
 %-------------------------------------------------------------------------
-count_children_allocator_test(MemoryState) ->
-    Allocators = [temp_alloc, eheap_alloc, binary_alloc, ets_alloc,
-		  driver_alloc, sl_alloc, ll_alloc, fix_alloc, std_alloc,
-		  sys_alloc],
-    MemoryStateList = element(4, MemoryState),
-    AllocTypes = [lists:keyfind(Alloc, 1, MemoryStateList)
-		  || Alloc <- Allocators],
-    AllocStates = [lists:keyfind(e, 1, AllocValue)
-		   || {_Type, AllocValue} <- AllocTypes],
-    lists:all(fun(State) -> State == {e, true} end, AllocStates).
-
 count_children_memory(doc) ->
-    ["Test that which_children eats memory, but count_children does not."];
+    ["Test that count_children does not eat memory."];
 count_children_memory(suite) ->
-    MemoryState = erlang:system_info(allocator),
-    case count_children_allocator_test(MemoryState) of
-	true -> [];
-	false ->
-	    {skip, "+Meamin used during test; erlang:memory/1 not available"}
-    end;
+    [];
 count_children_memory(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     Child = {child, {supervisor_1, start_child, []}, temporary, 1000,
@@ -1299,7 +1285,7 @@ count_children_memory(Config) when is_list(Config) ->
     Children = supervisor:which_children(sup_test),
     _Size2 = erlang:memory(processes_used),
     ChildCount = get_child_counts(sup_test),
-    Size3 = erlang:memory(processes_used),
+    _Size3 = erlang:memory(processes_used),
 
     [supervisor:start_child(sup_test, []) || _Ignore2 <- lists:seq(1,1000)],
 
@@ -1323,8 +1309,8 @@ count_children_memory(Config) when is_list(Config) ->
     ?line ChildCount3 = ChildCount2,
 
     %% count_children consumes memory using an accumulator function,
-    %% but the space can be reclaimed incrementally, whereas
-    %% which_children generates a return list.
+    %% but the space can be reclaimed incrementally,
+    %% which_children may generate garbage that will be reclaimed later.
     case (Size5 =< Size4) of
 	true -> ok;
 	false ->
@@ -1336,19 +1322,98 @@ count_children_memory(Config) when is_list(Config) ->
 	    ?line test_server:fail({count_children, used_more_memory})
     end,
 
-    case Size4 > Size3 of
-	true -> ok;
-	false ->
-	    ?line test_server:fail({which_children, used_no_memory})
-    end,
-    case Size6 > Size5 of
-	true -> ok;
-	false ->
-	    ?line test_server:fail({which_children, used_no_memory})
-    end,
-
     [exit(Pid, kill) || {undefined, Pid, worker, _Modules} <- Children3],
     test_server:sleep(100),
     ?line [1,0,0,0] = get_child_counts(sup_test),
-
     ok.
+count_children_allocator_test(MemoryState) ->
+    Allocators = [temp_alloc, eheap_alloc, binary_alloc, ets_alloc,
+		  driver_alloc, sl_alloc, ll_alloc, fix_alloc, std_alloc,
+		  sys_alloc],
+    MemoryStateList = element(4, MemoryState),
+    AllocTypes = [lists:keyfind(Alloc, 1, MemoryStateList)
+		  || Alloc <- Allocators],
+    AllocStates = [lists:keyfind(e, 1, AllocValue)
+		   || {_Type, AllocValue} <- AllocTypes],
+    lists:all(fun(State) -> State == {e, true} end, AllocStates).
+%-------------------------------------------------------------------------
+do_not_save_start_parameters_for_temporary_children(doc) ->
+    ["Temporary children shall not be restarted so they should not "
+     "save start parameters, as it potentially can "
+     "take up a huge amount of memory for no purpose."];
+do_not_save_start_parameters_for_temporary_children(suite) ->
+    [];
+do_not_save_start_parameters_for_temporary_children(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    dont_save_start_parameters_for_temporary_children(one_for_all),
+    dont_save_start_parameters_for_temporary_children(one_for_one),
+    dont_save_start_parameters_for_temporary_children(rest_for_one),
+    dont_save_start_parameters_for_temporary_children(simple_one_for_one).
+
+dont_save_start_parameters_for_temporary_children(simple_one_for_one = Type) ->
+    Permanent = {child, {supervisor_1, start_child, []},
+		 permanent, 1000, worker, []},
+    Transient = {child, {supervisor_1, start_child, []},
+		 transient, 1000, worker, []},
+    Temporary = {child, {supervisor_1, start_child, []},
+		 temporary, 1000, worker, []},
+    {ok, Sup1} = supervisor:start_link(?MODULE, {ok, {{Type, 2, 3600}, [Permanent]}}),
+    {ok, Sup2} = supervisor:start_link(?MODULE, {ok, {{Type, 2, 3600}, [Transient]}}),
+    {ok, Sup3} = supervisor:start_link(?MODULE, {ok, {{Type, 2, 3600}, [Temporary]}}),
+
+    LargeList = lists:duplicate(10, "Potentially large"),
+
+    start_children(Sup1, [LargeList], 100),
+    start_children(Sup2, [LargeList], 100),
+    start_children(Sup3, [LargeList], 100),
+
+    [{memory,Mem1}] = process_info(Sup1, [memory]),
+    [{memory,Mem2}] = process_info(Sup2, [memory]),
+    [{memory,Mem3}] = process_info(Sup3, [memory]),
+
+    true = (Mem3 < Mem1)  and  (Mem3 < Mem2),
+
+    exit(Sup1, shutdown),
+    exit(Sup2, shutdown),
+    exit(Sup3, shutdown);
+
+dont_save_start_parameters_for_temporary_children(Type) ->
+    {ok, Sup1} = supervisor:start_link(?MODULE, {ok, {{Type, 2, 3600}, []}}),
+    {ok, Sup2} = supervisor:start_link(?MODULE, {ok, {{Type, 2, 3600}, []}}),
+    {ok, Sup3} = supervisor:start_link(?MODULE, {ok, {{Type, 2, 3600}, []}}),
+
+    LargeList = lists:duplicate(10, "Potentially large"),
+
+    Permanent = {child1, {supervisor_1, start_child, [LargeList]},
+		 permanent, 1000, worker, []},
+    Transient = {child2, {supervisor_1, start_child, [LargeList]},
+		 transient, 1000, worker, []},
+    Temporary = {child3, {supervisor_1, start_child, [LargeList]},
+		 temporary, 1000, worker, []},
+
+    start_children(Sup1, Permanent, 100),
+    start_children(Sup2, Transient, 100),
+    start_children(Sup3, Temporary, 100),
+
+    [{memory,Mem1}] = process_info(Sup1, [memory]),
+    [{memory,Mem2}] = process_info(Sup2, [memory]),
+    [{memory,Mem3}] = process_info(Sup3, [memory]),
+
+    true = (Mem3 < Mem1)  and  (Mem3 < Mem2),
+
+    exit(Sup1, shutdown),
+    exit(Sup2, shutdown),
+    exit(Sup3, shutdown).
+
+start_children(_,_, 0) ->
+    ok;
+start_children(Sup, Args, N) ->
+    Spec = child_spec(Args, N),
+    {ok, _, _} = supervisor:start_child(Sup, Spec),
+    start_children(Sup, Args, N-1).
+
+child_spec([_|_] = SimpleOneForOneArgs, _) ->
+    SimpleOneForOneArgs;
+child_spec({Name, MFA, RestartType, Shutdown, Type, Modules}, N) ->
+    NewName = list_to_atom((atom_to_list(Name) ++ integer_to_list(N))),
+    {NewName, MFA, RestartType, Shutdown, Type, Modules}.
diff --git a/lib/stdlib/test/supervisor_bridge_SUITE.erl b/lib/stdlib/test/supervisor_bridge_SUITE.erl
index b23bac2d44..407968747c 100644
--- a/lib/stdlib/test/supervisor_bridge_SUITE.erl
+++ b/lib/stdlib/test/supervisor_bridge_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -17,16 +17,37 @@
 %% %CopyrightEnd%
 %%
 -module(supervisor_bridge_SUITE).
--export([all/1,starting/1,mini_terminate/1,mini_die/1,badstart/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,starting/1,
+	 mini_terminate/1,mini_die/1,badstart/1]).
 -export([client/1,init/1,internal_loop_init/1,terminate/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(bridge_name,supervisor_bridge_SUITE_server).
 -define(work_bridge_name,work_supervisor_bridge_SUITE_server).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all(suite) -> [starting,mini_terminate,mini_die,badstart].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [starting, mini_terminate, mini_die, badstart].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/stdlib/test/sys_SUITE.erl b/lib/stdlib/test/sys_SUITE.erl
index e44fd56403..dcb2380910 100644
--- a/lib/stdlib/test/sys_SUITE.erl
+++ b/lib/stdlib/test/sys_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2010. 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
@@ -17,9 +17,11 @@
 %% %CopyrightEnd%
 %%
 -module(sys_SUITE).
--export([all/1,log/1,log_to_file/1,stats/1,trace/1,suspend/1,install/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,log/1,log_to_file/1,
+	 stats/1,trace/1,suspend/1,install/1]).
 -export([handle_call/3,terminate/2,init/1]).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(server,sys_SUITE_server).
 
@@ -29,7 +31,26 @@
 %% system messages at all.
 
 
-all(suite) -> [log,log_to_file,stats,trace,suspend,install].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [log, log_to_file, stats, trace, suspend, install].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/stdlib/test/tar_SUITE.erl b/lib/stdlib/test/tar_SUITE.erl
index 7646f4c249..84c3915749 100644
--- a/lib/stdlib/test/tar_SUITE.erl
+++ b/lib/stdlib/test/tar_SUITE.erl
@@ -18,21 +18,39 @@
 %%
 -module(tar_SUITE).
 
--export([all/1, borderline/1, atomic/1, long_names/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, borderline/1, atomic/1, long_names/1,
 	 create_long_names/1, bad_tar/1, errors/1, extract_from_binary/1,
 	 extract_from_binary_compressed/1,
 	 extract_from_open_file/1, symlinks/1, open_add_close/1, cooked_compressed/1,
 	 memory/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
-all(suite) -> [borderline, atomic, long_names, create_long_names,
-	       bad_tar, errors,
-	       extract_from_binary, extract_from_binary_compressed,
-	       extract_from_open_file,
-	       symlinks, open_add_close, cooked_compressed,
-	       memory].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [borderline, atomic, long_names, create_long_names,
+     bad_tar, errors, extract_from_binary,
+     extract_from_binary_compressed, extract_from_open_file,
+     symlinks, open_add_close, cooked_compressed, memory].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 borderline(doc) ->
     ["Test creating, listing and extracting one file from an archive",
diff --git a/lib/stdlib/test/timer_SUITE.erl b/lib/stdlib/test/timer_SUITE.erl
index 5f38c91c64..cc05e3d832 100644
--- a/lib/stdlib/test/timer_SUITE.erl
+++ b/lib/stdlib/test/timer_SUITE.erl
@@ -18,12 +18,12 @@
 %%
 -module(timer_SUITE).
 
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
 -export([do_big_test/1]).
 -export([big_test/1, collect/3, i_t/3, a_t/2]).
 -export([do_nrev/1, internal_watchdog/2]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test suite for timer module. This is a really nasty test it runs a
 %% lot of timeouts and then checks in the end if any of them was
@@ -51,7 +51,26 @@
 %% amount of load. The test suite should also include tests that test the
 %% interface of the timer module.
 
-all(suite) -> [do_big_test].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [do_big_test].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% ------------------------------------------------------- %%
 
diff --git a/lib/stdlib/test/timer_simple_SUITE.erl b/lib/stdlib/test/timer_simple_SUITE.erl
index 021a22c61b..afe6699920 100644
--- a/lib/stdlib/test/timer_simple_SUITE.erl
+++ b/lib/stdlib/test/timer_simple_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -21,7 +21,8 @@
 -module(timer_simple_SUITE).
 
 %% external
--export([all/1, 
+-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,
 	 apply_after/1,
 	 send_after1/1,
@@ -49,31 +50,35 @@
 	 timer/4,
 	 timer/5]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(MAXREF, (1 bsl 18)).
 -define(REFMARG, 30).
 
-all(doc) -> "Test of the timer module.";
-all(suite) -> 
-    [apply_after,
-     send_after1,
-     send_after2,
-     send_after3,
-     exit_after1,
-     exit_after2,
-     kill_after1,
-     kill_after2,
-     apply_interval,
-     send_interval1,
-     send_interval2,
-     send_interval3,
-     send_interval4,
-     cancel1,
-     cancel2,
-     tc,
-     unique_refs,
-     timer_perf].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [apply_after, send_after1, send_after2, send_after3,
+     exit_after1, exit_after2, kill_after1, kill_after2,
+     apply_interval, send_interval1, send_interval2,
+     send_interval3, send_interval4, cancel1, cancel2, tc,
+     unique_refs, timer_perf].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init_per_testcase(_, Config) when is_list(Config) ->
     timer:start(),
@@ -224,11 +229,19 @@ cancel2(Config) when is_list(Config) ->
 tc(doc) -> "Test sleep/1 and tc/3.";
 tc(suite) -> [];
 tc(Config) when is_list(Config) ->
-    % This should both sleep and tc 
-    ?line {Res, ok} = timer:tc(timer, sleep, [500]),  
-    ?line ok = 	if 
-		    Res < 500*1000 -> {too_early, Res};  % Too early
-		    Res > 800*1000 -> {too_late, Res};  % Too much time
+    % This should both sleep and tc/3
+    ?line {Res1, ok} = timer:tc(timer, sleep, [500]),
+    ?line ok = 	if
+		    Res1 < 500*1000 -> {too_early, Res1}; % Too early
+		    Res1 > 800*1000 -> {too_late, Res1};  % Too much time
+		    true -> ok
+		end,
+
+    % This should both sleep and tc/2
+    ?line {Res2, ok} = timer:tc(fun(T) -> timer:sleep(T) end, [500]),
+    ?line ok = 	if
+		    Res2 < 500*1000 -> {too_early, Res2}; % Too early
+		    Res2 > 800*1000 -> {too_late, Res2};  % Too much time
 		    true -> ok
 		end,
 
diff --git a/lib/stdlib/test/unicode_SUITE.erl b/lib/stdlib/test/unicode_SUITE.erl
index 141ac64606..3cca1ab894 100644
--- a/lib/stdlib/test/unicode_SUITE.erl
+++ b/lib/stdlib/test/unicode_SUITE.erl
@@ -18,11 +18,12 @@
 %%
 -module(unicode_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,	 
+-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,
-	 fin_per_testcase/2,
+	 end_per_testcase/2,
 	 utf8_illegal_sequences_bif/1,
 	 utf16_illegal_sequences_bif/1,
 	 random_lists/1,
@@ -34,12 +35,32 @@ init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     Dog=?t:timetrap(?t:minutes(20)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
-all(suite) ->
-    [utf8_illegal_sequences_bif,utf16_illegal_sequences_bif,random_lists,roundtrips,latin1,exceptions].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [utf8_illegal_sequences_bif,
+     utf16_illegal_sequences_bif, random_lists, roundtrips,
+     latin1, exceptions].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 
 exceptions(Config) when is_list(Config) ->
diff --git a/lib/stdlib/test/win32reg_SUITE.erl b/lib/stdlib/test/win32reg_SUITE.erl
index c8cc82f61e..f54cd2dcca 100644
--- a/lib/stdlib/test/win32reg_SUITE.erl
+++ b/lib/stdlib/test/win32reg_SUITE.erl
@@ -18,22 +18,34 @@
 %%
 -module(win32reg_SUITE).
 
--export([all/1,long/1,evil_write/1]).
--export([ostype/1,fini/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,long/1,evil_write/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
-all(suite) ->
-    [{conf,ostype,[long,evil_write],fini}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
-ostype(Config) when is_list(Config) ->
+all() -> 
+    [long, evil_write].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
 	    Config;
 	_ ->
 	    {skip,"Doesn't run on UNIX."}
     end.
-fini(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 long(doc) -> "Test long keys and entries (OTP-3446).";
diff --git a/lib/stdlib/test/y2k_SUITE.erl b/lib/stdlib/test/y2k_SUITE.erl
index a574d5e36e..0ea51355e2 100644
--- a/lib/stdlib/test/y2k_SUITE.erl
+++ b/lib/stdlib/test/y2k_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2010. 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
@@ -21,30 +21,38 @@
 
 -module(y2k_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 date_1999_01_01/1, date_1999_02_28/1, 
 	 date_1999_09_09/1, date_2000_01_01/1, 
 	 date_2000_02_29/1, date_2001_01_01/1, 
 	 date_2001_02_29/1, date_2004_02_29/1
 	]).
 
-all(doc) ->
-    "This is the test suite for year 2000. Eight dates according "
-    "to Ericsson Corporate Millennium Test Specification "
-    "(LME/DT-98:1097 are tested.";
-
-all(suite) ->
-    [date_1999_01_01, 
-     date_1999_02_28,
-     date_1999_09_09,
-     date_2000_01_01,
-     date_2000_02_29,
-     date_2001_01_01,
-     date_2001_02_29,
-     date_2004_02_29
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [date_1999_01_01, date_1999_02_28, date_1999_09_09,
+     date_2000_01_01, date_2000_02_29, date_2001_01_01,
+     date_2001_02_29, date_2004_02_29].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 date_1999_01_01(doc) ->
     "#1 : 1999-01-01: test roll-over from 1998-12-31 to 1999-01-01.";
diff --git a/lib/stdlib/test/zip_SUITE.erl b/lib/stdlib/test/zip_SUITE.erl
index 48b14396c1..895019ab96 100644
--- a/lib/stdlib/test/zip_SUITE.erl
+++ b/lib/stdlib/test/zip_SUITE.erl
@@ -18,7 +18,8 @@
 %%
 -module(zip_SUITE).
 
--export([all/1, borderline/1, atomic/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, borderline/1, atomic/1,
          bad_zip/1, unzip_from_binary/1, unzip_to_binary/1,
          zip_to_binary/1,
          unzip_options/1, zip_options/1, list_dir_options/1, aliases/1,
@@ -26,18 +27,34 @@
          compress_control/1,
 	 foldl/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -include("test_server_line.hrl").
 -include_lib("kernel/include/file.hrl").
 -include_lib("stdlib/include/zip.hrl").
 
-all(suite) -> [borderline, atomic, bad_zip,
-               unzip_from_binary, unzip_to_binary,
-               zip_to_binary,
-               unzip_options, zip_options, list_dir_options, aliases,
-               openzip_api, zip_api, unzip_jar,
-               compress_control,
-	       foldl].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [borderline, atomic, bad_zip, unzip_from_binary,
+     unzip_to_binary, zip_to_binary, unzip_options,
+     zip_options, list_dir_options, aliases, openzip_api,
+     zip_api, unzip_jar, compress_control, foldl].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 borderline(doc) ->
     ["Test creating, listing and extracting one file from an archive "
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index f081bd60e2..ac02e1f359 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1,21 +1 @@
-# 
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2010. 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%
-# 
-
-STDLIB_VSN = 1.17
-
+STDLIB_VSN = 1.17.3
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index a3b842b50b..3f5eb7231e 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -31,6 +31,35 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 1.6.7</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Miscellaneous updates</p>
+          <p>
+	    Own Id: OTP-8976</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Syntax_Tools 1.6.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Minor changes and clean-ups.</p>
+          <p>
+	    Own Id: OTP-8709</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Syntax_Tools 1.6.5</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/syntax_tools/src/epp_dodger.erl b/lib/syntax_tools/src/epp_dodger.erl
index 6b0f2034f8..9f6f7d815e 100644
--- a/lib/syntax_tools/src/epp_dodger.erl
+++ b/lib/syntax_tools/src/epp_dodger.erl
@@ -809,6 +809,8 @@ tokens_to_string([{atom,_,A} | Ts]) ->
     io_lib:write_atom(A) ++ " " ++ tokens_to_string(Ts);
 tokens_to_string([{string, _, S} | Ts]) ->
     io_lib:write_string(S) ++ " " ++ tokens_to_string(Ts);
+tokens_to_string([{char, _, C} | Ts]) ->
+    io_lib:write_char(C) ++ " " ++ tokens_to_string(Ts);
 tokens_to_string([{float, _, F} | Ts]) ->
     float_to_list(F) ++ " " ++ tokens_to_string(Ts);
 tokens_to_string([{integer, _, N} | Ts]) ->
diff --git a/lib/syntax_tools/src/erl_prettypr.erl b/lib/syntax_tools/src/erl_prettypr.erl
index c2c72d1ed2..7caf0b3db6 100644
--- a/lib/syntax_tools/src/erl_prettypr.erl
+++ b/lib/syntax_tools/src/erl_prettypr.erl
@@ -50,11 +50,15 @@
 
 -type hook() :: 'none'
               | fun((erl_syntax:syntaxTree(), _, _) -> prettypr:document()).
+-type clause_t() :: 'case_expr' | 'cond_expr' | 'fun_expr'
+                  | 'if_expr' | 'receive_expr' | 'try_expr'
+                  | {'function', prettypr:document()}
+                  | {'rule', prettypr:document()}.
 
 -record(ctxt, {prec = 0           :: integer(),
 	       sub_indent = 2     :: non_neg_integer(),
 	       break_indent = 4   :: non_neg_integer(),
-	       clause = undefined,
+	       clause = undefined :: clause_t() | 'undefined',
 	       hook = ?NOHOOK     :: hook(),
 	       paper = ?PAPER     :: integer(),
 	       ribbon = ?RIBBON   :: integer(),
@@ -599,9 +603,8 @@ lay_2(Node, Ctxt) ->
 	case_expr ->
 	    Ctxt1 = reset_prec(Ctxt),
 	    D1 = lay(erl_syntax:case_expr_argument(Node), Ctxt1),
-	    D2 = lay_clauses(
-		   erl_syntax:case_expr_clauses(Node),
-		   case_expr, Ctxt1),
+	    D2 = lay_clauses(erl_syntax:case_expr_clauses(Node),
+			     case_expr, Ctxt1),
 	    sep([par([follow(text("case"), D1, Ctxt1#ctxt.sub_indent),
 		      text("of")],
 		     Ctxt1#ctxt.break_indent),
@@ -819,9 +822,8 @@ lay_2(Node, Ctxt) ->
 
 	receive_expr ->
 	    Ctxt1 = reset_prec(Ctxt),
-	    D1 = lay_clauses(
-		   erl_syntax:receive_expr_clauses(Node),
-		   receive_expr, Ctxt1),
+	    D1 = lay_clauses(erl_syntax:receive_expr_clauses(Node),
+			     receive_expr, Ctxt1),
 	    D2 = case erl_syntax:receive_expr_timeout(Node) of
 		     none ->
 			 D1;
diff --git a/lib/syntax_tools/src/erl_recomment.erl b/lib/syntax_tools/src/erl_recomment.erl
index 94e760dad7..919e9cfc5d 100644
--- a/lib/syntax_tools/src/erl_recomment.erl
+++ b/lib/syntax_tools/src/erl_recomment.erl
@@ -215,7 +215,8 @@ comment_delta(Text) ->
 %% the source file itself, but have been included by preprocessing. This
 %% way, comments will not be inserted into such parts by mistake.
 
--record(filter, {file = undefined, line = 0 :: integer()}).
+-record(filter, {file = undefined :: file:filename() | 'undefined',
+		 line = 0         :: integer()}).
 
 filter_forms(Fs) ->
     filter_forms(Fs, false, #filter{}).
@@ -721,8 +722,6 @@ tree_node_attrs(#tree{attrs = Attrs}) ->
 %% =====================================================================
 %% General utility functions
 
-%% Just the generic "maximum" function
-
 %% Return the least positive integer of X and Y, or zero if none of them
 %% are positive. (This is necessary for computing minimum source line
 %% numbers, since zero (or negative) numbers may occur, but they
diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl
index a40bf83c5a..9df5f26454 100644
--- a/lib/syntax_tools/src/erl_syntax.erl
+++ b/lib/syntax_tools/src/erl_syntax.erl
@@ -1818,7 +1818,7 @@ char_value(Node) ->
 %%
 %% @see char/1
 
--spec char_literal(syntaxTree()) -> string().
+-spec char_literal(syntaxTree()) -> nonempty_string().
 
 char_literal(Node) ->
     io_lib:write_char(char_value(Node)).
@@ -1908,7 +1908,7 @@ string_value(Node) ->
 %%
 %% @see string/1
 
--spec string_literal(syntaxTree()) -> string().
+-spec string_literal(syntaxTree()) -> nonempty_string().
 
 string_literal(Node) ->
     io_lib:write_string(string_value(Node)).
diff --git a/lib/syntax_tools/src/erl_syntax_lib.erl b/lib/syntax_tools/src/erl_syntax_lib.erl
index 4808971a59..97dfbfd7cd 100644
--- a/lib/syntax_tools/src/erl_syntax_lib.erl
+++ b/lib/syntax_tools/src/erl_syntax_lib.erl
@@ -49,10 +49,6 @@
 -export_type([info_pair/0]).
 
 %% =====================================================================
-
--type ordset(X) :: [X].  % XXX: TAKE ME OUT
-
-%% =====================================================================
 %% @spec map(Function, Tree::syntaxTree()) -> syntaxTree()
 %%
 %%          Function = (syntaxTree()) -> syntaxTree()
@@ -480,7 +476,7 @@ new_variable_names(0, Names, _, _, _) ->
 %% @see annotate_bindings/1
 %% @see //stdlib/ordsets
 
--spec annotate_bindings(erl_syntax:syntaxTree(), ordset(atom())) ->
+-spec annotate_bindings(erl_syntax:syntaxTree(), ordsets:ordset(atom())) ->
         erl_syntax:syntaxTree().
 
 annotate_bindings(Tree, Env) ->
@@ -1134,21 +1130,21 @@ collect_attribute(_, {N, V}, Info) ->
 
 %% Abstract datatype for collecting module information.
 
--record(forms, {module, exports, module_imports, imports, attributes,
-		records, errors, warnings, functions, rules}).
+-record(forms, {module         = none :: 'none' | {'value', atom()},
+		exports        = []   :: [{atom(), arity()}],
+		module_imports = []   :: [atom()],
+		imports        = []   :: [{atom(), [{atom(), arity()}]}],
+		attributes     = []   :: [{atom(), term()}],
+		records        = []   :: [{atom(), [{atom(), field_default()}]}],
+		errors         = []   :: [term()],
+		warnings       = []   :: [term()],
+		functions      = []   :: [{atom(), arity()}],
+		rules          = []   :: [{atom(), arity()}]}).
+
+-type field_default() :: 'none' | erl_syntax:syntaxTree().
 
 new_finfo() ->
-    #forms{module = none,
-           exports = [],
-           module_imports = [],
-           imports = [],
-           attributes = [],
-           records = [],
-           errors = [],
-           warnings = [],
-           functions = [],
-           rules = []
-          }.
+    #forms{}.
 
 finfo_set_module(Name, Info) ->
     case Info#forms.module of
diff --git a/lib/syntax_tools/src/erl_tidy.erl b/lib/syntax_tools/src/erl_tidy.erl
index 021ab18736..1cfdc7234a 100644
--- a/lib/syntax_tools/src/erl_tidy.erl
+++ b/lib/syntax_tools/src/erl_tidy.erl
@@ -935,12 +935,13 @@ hidden_uses_2(Tree, Used) ->
             Used
     end.
 
+-type fa()      :: {atom(), arity()}.
 -type context() :: 'guard_expr' | 'guard_test' | 'normal'.
 
 -record(env, {file		       :: file:filename(),
-              module,
-              current,
-              imports,
+              module                   :: atom(),
+              current                  :: fa(),
+              imports = dict:new()     :: dict(),
               context = normal	       :: context(),
               verbosity = 1	       :: 0 | 1 | 2,
               quiet = false            :: boolean(),
@@ -951,7 +952,13 @@ hidden_uses_2(Tree, Used) ->
               new_guard_tests = true   :: boolean(),
 	      old_guard_tests = false  :: boolean()}).
 
--record(st, {varc, used, imported, vars, functions, new_forms, rename}).
+-record(st, {varc              :: non_neg_integer(),
+	     used = sets:new() :: set(),
+	     imported          :: set(),
+	     vars              :: set(),
+	     functions         :: set(),
+	     new_forms = []    :: [erl_syntax:syntaxTree()],
+	     rename            :: dict()}).
 
 visit_used(Names, Defs, Roots, Imports, Module, Opts) ->
     File = proplists:get_value(file, Opts, ""),
diff --git a/lib/syntax_tools/src/igor.erl b/lib/syntax_tools/src/igor.erl
index 702b399615..aa933eb54b 100644
--- a/lib/syntax_tools/src/igor.erl
+++ b/lib/syntax_tools/src/igor.erl
@@ -119,20 +119,16 @@
 
 %% =====================================================================
 
--type ordset(X) :: [X].  % XXX: TAKE ME OUT
-
-%% =====================================================================
-
 %% Data structure for module information
 
 -record(module, {name        :: atom(),
 		 vars = none :: [atom()] | 'none',
-		 functions   :: ordset({atom(), arity()}),
-		 exports     :: ordset({atom(), arity()})
-			      | ordset({{atom(), arity()}, term()}),
-		 aliases     :: ordset({{atom(), arity()},
-					{atom(), {atom(), arity()}}}),
-		 attributes  :: ordset({atom(), term()}),
+		 functions   :: ordsets:ordset({atom(), arity()}),
+		 exports     :: ordsets:ordset({atom(), arity()})
+			      | ordsets:ordset({{atom(), arity()}, term()}),
+		 aliases     :: ordsets:ordset({{atom(), arity()},
+						{atom(), {atom(), arity()}}}),
+		 attributes  :: ordsets:ordset({atom(), term()}),
 		 records     :: [{atom(), [{atom(), term()}]}]
 		}).
 
@@ -149,7 +145,7 @@ default_printer(Tree, Options) ->
 -type moduleName()     :: atom().
 -type functionName()   :: {atom(), arity()}.
 -type functionPair()   :: {functionName(), {moduleName(), functionName()}}.
--type stubDescriptor() :: [{moduleName(), [functionPair()], [attribute()]}].
+-type stubDescriptor() :: {moduleName(), [functionPair()], [attribute()]}.
 
 -type notes() :: 'always' | 'yes' | 'no'.
 
@@ -209,7 +205,7 @@ parse_transform(Forms, Options) ->
 %% @spec merge(Name::atom(), Files::[filename()]) -> [filename()]
 %% @equiv merge(Name, Files, [])
 
--spec merge(atom(), [file:filename()]) -> [file:filename()].
+-spec merge(atom(), [file:filename()]) -> [file:filename(),...].
 
 merge(Name, Files) ->
     merge(Name, Files, []).
@@ -343,7 +339,7 @@ merge(Name, Files) ->
 	 {suffix, ?DEFAULT_SUFFIX},
 	 {verbose, false}]).
 
--spec merge(atom(), [file:filename()], [option()]) -> [file:filename()].
+-spec merge(atom(), [file:filename()], [option()]) -> [file:filename(),...].
 
 merge(Name, Files, Opts) ->
     Opts1 = Opts ++ ?DEFAULT_MERGE_OPTS,
@@ -484,7 +480,7 @@ merge_files(Name, Trees, Files, Opts) ->
 %%
 %%     Forms = syntaxTree() | [syntaxTree()]
 %%
-%% @type stubDescriptor() = [{ModuleName, Functions, [Attribute]}]
+%% @type stubDescriptor() = {ModuleName, Functions, [Attribute]}
 %%	    ModuleName = atom()
 %%	    Functions = [{FunctionName, {ModuleName, FunctionName}}]
 %%	    FunctionName = {atom(), integer()}
@@ -687,15 +683,15 @@ merge_files(Name, Trees, Files, Opts) ->
 %% Data structure for merging environment.
 
 -record(merge, {target     :: atom(),
-		sources    :: ordset(atom()),
-		export     :: ordset(atom()),
-		static     :: ordset(atom()),
-		safe       :: ordset(atom()),
+		sources    :: ordsets:ordset(atom()),
+		export     :: ordsets:ordset(atom()),
+		static     :: ordsets:ordset(atom()),
+		safe       :: ordsets:ordset(atom()),
 		preserved  :: boolean(),
 		no_headers :: boolean(),
 		notes      :: notes(),
 		redirect   :: dict(),	% = dict(atom(), atom())
-		no_imports :: ordset(atom()),
+		no_imports :: ordsets:ordset(atom()),
 		options	   :: [option()]
 	       }).
 
@@ -1035,7 +1031,12 @@ make_stub(M, Map, Env) ->
 %% Removing and/or out-commenting program forms. The returned form
 %% sequence tree is not necessarily flat.
 
--record(filter, {records :: set(), file_attributes, attributes}).
+-type atts()      :: 'delete' | 'kill'.
+-type file_atts() :: 'delete' | 'keep' | 'kill'.
+
+-record(filter, {records         :: set(),
+		 file_attributes :: file_atts(),
+		 attributes      :: atts()}).
 
 filter_forms(Tree, Env) ->
     Forms = erl_syntax:form_list_elements(
@@ -1576,6 +1577,8 @@ alias_expansions_2(Modules, Table) ->
 %% ---------------------------------------------------------------------
 %% Merging the source code.
 
+-type map_fun() :: fun(({atom(), integer()}) -> {atom(), integer()}).
+
 %% Data structure for code transformation environment.
 
 -record(code, {module     :: atom(),
@@ -1586,11 +1589,10 @@ alias_expansions_2(Modules, Table) ->
 	       preserved  :: boolean(),
 	       no_headers :: boolean(),
 	       notes      :: notes(),
-	       map,		% = ({atom(), int()}) -> {atom(), int()}
-	       renaming,	% = (atom()) -> ({atom(), int()}) ->
-				%               {atom(), int()}
-	       expand     :: dict(),	% = dict({atom(), int()},
-					%      {atom(), {atom(), int()}})
+	       map        :: map_fun(),
+	       renaming   :: fun((atom()) -> map_fun()),
+	       expand     :: dict(),	% = dict({atom(), integer()},
+					%      {atom(), {atom(), integer()}})
 	       redirect	  :: dict()	% = dict(atom(), atom())
 	      }).
 
diff --git a/lib/syntax_tools/test/Makefile b/lib/syntax_tools/test/Makefile
index 621c76f5a5..e793dec566 100644
--- a/lib/syntax_tools/test/Makefile
+++ b/lib/syntax_tools/test/Makefile
@@ -59,7 +59,7 @@ release_spec: opt
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
-	$(INSTALL_DATA) syntax_tools.dynspec $(RELSYSDIR)
+	$(INSTALL_DATA) syntax_tools.spec syntax_tools.cover $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 
 release_docs_spec:
diff --git a/lib/syntax_tools/test/syntax_tools.cover b/lib/syntax_tools/test/syntax_tools.cover
new file mode 100644
index 0000000000..fd30f66cc4
--- /dev/null
+++ b/lib/syntax_tools/test/syntax_tools.cover
@@ -0,0 +1,2 @@
+{incl_app,syntax_tools,details}.
+
diff --git a/lib/syntax_tools/test/syntax_tools.dynspec b/lib/syntax_tools/test/syntax_tools.dynspec
deleted file mode 100644
index 981cb8175e..0000000000
--- a/lib/syntax_tools/test/syntax_tools.dynspec
+++ /dev/null
@@ -1,5 +0,0 @@
-%% -*- erlang -*-
-%% You can test this file using this command.
-%%    file:script("syntax_tools.dynspec", [{'Os',"Unix"}]).
-
-[].
diff --git a/lib/syntax_tools/test/syntax_tools.spec b/lib/syntax_tools/test/syntax_tools.spec
new file mode 100644
index 0000000000..e7ddbf7586
--- /dev/null
+++ b/lib/syntax_tools/test/syntax_tools.spec
@@ -0,0 +1,2 @@
+%% -*- erlang -*-
+{suites,"../syntax_tools_test",all}.
diff --git a/lib/syntax_tools/test/syntax_tools_SUITE.erl b/lib/syntax_tools/test/syntax_tools_SUITE.erl
index 16f794683b..fd381f0b25 100644
--- a/lib/syntax_tools/test/syntax_tools_SUITE.erl
+++ b/lib/syntax_tools/test/syntax_tools_SUITE.erl
@@ -17,17 +17,36 @@
 %%
 -module(syntax_tools_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 %% Test cases
 -export([smoke_test/1]).
 
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [smoke_test].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %% Read and parse all source in the OTP release.
 smoke_test(Config) when is_list(Config) ->
     ?line Dog = ?t:timetrap(?t:minutes(12)),
diff --git a/lib/syntax_tools/vsn.mk b/lib/syntax_tools/vsn.mk
index 2ba5eac582..2e23f6aef9 100644
--- a/lib/syntax_tools/vsn.mk
+++ b/lib/syntax_tools/vsn.mk
@@ -1 +1 @@
-SYNTAX_TOOLS_VSN = 1.6.5
+SYNTAX_TOOLS_VSN = 1.6.7
diff --git a/lib/test_server/doc/src/notes.xml b/lib/test_server/doc/src/notes.xml
index b6e0a6cefa..ab329c399b 100644
--- a/lib/test_server/doc/src/notes.xml
+++ b/lib/test_server/doc/src/notes.xml
@@ -32,6 +32,126 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Test_Server 3.4.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Miscellaneous updates</p>
+          <p>
+	    Own Id: OTP-8976</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Test_Server 3.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Returning {return_group_result,failed} from end_per_group
+	    in a group that is part of a sequence, did not cause the
+	    proceeding cases (or groups) to get skipped. This has
+	    been fixed.</p>
+          <p>
+	    Own Id: OTP-8753 Aux Id: seq11644 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Common Test has been updated to handle start options and
+	    test specification terms for test case groups (and test
+	    cases in groups). Also, an option named 'label', has been
+	    added that associates the test run with a name that
+	    Common Test prints in the overview HTML logs.</p>
+          <p>
+	    Own Id: OTP-8725 Aux Id: OTP-8727 </p>
+        </item>
+        <item>
+          <p>
+	    It is now possible to skip all tests in a suite, or a
+	    group, by returning {fail,Reason} from the end_tc/5
+	    framework function for init_per_suite, or init_per_group.</p>
+          <p>
+	    Own Id: OTP-8805 Aux Id: seq11664 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Test_Server 3.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Returning {fail,Reason} from the framework end_tc
+	    function was not handled properly by Test Server for all
+	    test suite functions.</p>
+          <p>
+	    Own Id: OTP-8492 Aux Id: seq11502 </p>
+        </item>
+        <item>
+          <p>
+	    If the framework end_tc function would hang and get
+	    aborted by Test Server, there was no indication of
+	    failure in the logs. This has been fixed.</p>
+          <p>
+	    Own Id: OTP-8682 Aux Id: seq11504 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    It is now possible for the Test Server framework end_tc
+	    function to change the status of the test case from ok or
+	    auto-skipped to failed by returning {fail,Reason}.</p>
+          <p>
+	    Own Id: OTP-8495 Aux Id: seq11502 </p>
+        </item>
+        <item>
+          <p>
+	    Test Server will now call the end_per_testcase/2 function
+	    even if the test case has been terminated explicitly
+	    (with abort_current_testcase/1), or after a timetrap
+	    timeout. Under these circumstances the return value of
+	    end_per_testcase is completely ignored. Therefore the
+	    function will not be able to change the reason for test
+	    case termination by returning {fail,Reason}, nor will it
+	    be able to save data with {save_config,Data}.</p>
+          <p>
+	    Own Id: OTP-8500 Aux Id: seq11521 </p>
+        </item>
+        <item>
+          <p>
+	    Previously, a repeat property of a test case group
+	    specified the number of times the group should be
+	    repeated after the main test run. I.e. {repeat,N} would
+	    case the group to execute 1+N times. To be consistent
+	    with the behaviour of the run_test repeat option, this
+	    has been changed. N now specifies the absolute number of
+	    executions instead.</p>
+          <p>
+	    Own Id: OTP-8689 Aux Id: seq11502 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Test_Server 3.3.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/test_server/doc/src/test_server.xml b/lib/test_server/doc/src/test_server.xml
index 6e75425862..0cae75d692 100644
--- a/lib/test_server/doc/src/test_server.xml
+++ b/lib/test_server/doc/src/test_server.xml
@@ -167,6 +167,22 @@
       </desc>
     </func>
     <func>
+      <name>adjusted_sleep(MSecs) -> ok</name>
+      <fsummary>Suspens the calling task for a specified time.</fsummary>
+      <type>
+        <v>MSecs = integer() | float() | infinity</v>
+        <d>The default number of milliseconds to sleep</d>
+      </type>
+      <desc>
+        <p>This function suspends the calling process for at least the
+          supplied number of milliseconds. The function behaves the same
+	  way as <c>test_server:sleep/1</c>, only <c>MSecs</c>
+	  will be multiplied by the 'multiply_timetraps' value, if set,
+	  and also automatically scaled up if 'scale_timetraps' is set
+	  to true (which it is by default).</p>
+      </desc>
+    </func>
+    <func>
       <name>hours(N) -> MSecs</name>
       <name>minutes(N) -> MSecs</name>
       <name>seconds(N) -> MSecs</name>
diff --git a/lib/test_server/doc/src/test_server_ctrl.xml b/lib/test_server/doc/src/test_server_ctrl.xml
index 8b60849b61..2368c4bacc 100644
--- a/lib/test_server/doc/src/test_server_ctrl.xml
+++ b/lib/test_server/doc/src/test_server_ctrl.xml
@@ -376,6 +376,31 @@ Optional, if not given the test server controller node
       </desc>
     </func>
     <func>
+      <name>scale_timetraps(Bool) -> ok</name>
+      <fsummary>.</fsummary>
+      <type>
+        <v>Bool = true | false</v>
+      </type>
+      <desc>
+        <p>This function should be called before a test is started.
+	  The parameter specifies if test_server should attempt
+	  to automatically scale the timetrap value in order to compensate
+	  for delays caused by e.g. the cover tool.</p>
+      </desc>
+    </func>
+    <func>
+      <name>get_timetrap_parameters() -> {N,Bool} </name>
+      <fsummary>Read the parameter values that affect timetraps.</fsummary>
+      <type>
+        <v>N = integer() | infinity</v>
+        <v>Bool = true | false</v>
+      </type>
+      <desc>
+        <p>This function may be called to read the values set by
+	<c>multiply_timetraps/1</c> and <c>scale_timetraps/1</c>.</p>
+      </desc>
+    </func>
+    <func>
       <name>cover(Application,Analyse) -> ok</name>
       <name>cover(CoverFile,Analyse) -> ok</name>
       <name>cover(App,CoverFile,Analyse) -> ok</name>
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
index d55a3a597d..0858d24fce 100644
--- a/lib/test_server/src/Makefile
+++ b/lib/test_server/src/Makefile
@@ -57,7 +57,8 @@ TS_MODULES= \
 	ts_erl_config \
 	ts_autoconf_win32 \
         ts_autoconf_vxworks \
-	ts_install
+	ts_install \
+	ts_install_cth
 
 TARGET_MODULES= $(MODULES:%=$(EBIN)/%)
 TS_TARGET_MODULES= $(TS_MODULES:%=$(EBIN)/%)
@@ -71,7 +72,7 @@ C_FILES =
 AUTOCONF_FILES = configure.in conf_vars.in
 COVER_FILES = cross.cover
 PROGRAMS = configure config.sub config.guess install-sh 
-CONFIG = ts.config ts.unix.config ts.win32.config ts.vxworks.config
+CONFIG = ts.config ts.unix.config ts.win32.config
 
 TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) \
 	       $(APP_TARGET) $(APPUP_TARGET)
@@ -136,10 +137,10 @@ release_tests_spec: opt
 	$(INSTALL_DIR) $(RELEASE_PATH)/test_server
 	$(INSTALL_DATA) $(ERL_FILES) $(TS_ERL_FILES) \
 		$(HRL_FILES) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) \
-		$(TARGET_FILES) $(TS_TARGET_FILES) \
+		$(TS_TARGET_FILES) \
 		$(AUTOCONF_FILES) $(C_FILES) $(COVER_FILES) $(CONFIG) \
 		$(RELEASE_PATH)/test_server
-	$(INSTALL_PROGRAM) $(PROGRAMS) $(RELEASE_PATH)/test_server
+	$(INSTALL_SCRIPT) $(PROGRAMS) $(RELEASE_PATH)/test_server
 
 release_docs_spec:
 
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 7db103a4c6..2ab4e9c28a 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -35,7 +35,7 @@
 -export([fail/0,fail/1,format/1,format/2,format/3]).
 -export([capture_start/0,capture_stop/0,capture_get/0]).
 -export([messages_get/0]).
--export([hours/1,minutes/1,seconds/1,sleep/1,timecall/3]).
+-export([hours/1,minutes/1,seconds/1,sleep/1,adjusted_sleep/1,timecall/3]).
 -export([timetrap_scale_factor/0,timetrap/1,timetrap_cancel/1]).
 -export([m_out_of_n/3,do_times/4,do_times/2]).
 -export([call_crash/3,call_crash/4,call_crash/5]).
@@ -89,14 +89,14 @@ init(Host,Port,Starter) ->
     global:register_name(?MODULE,self()),
     process_flag(trap_exit,true),
     test_server_sup:cleanup_crash_dumps(),
-    case gen_tcp:connect(Host,Port, [binary, 
-				     {reuseaddr,true}, 
+    case gen_tcp:connect(Host,Port, [binary,
+				     {reuseaddr,true},
 				     {packet,2}]) of
-	{ok,MainSock} -> 
+	{ok,MainSock} ->
 	    Starter ! {self(),started},
 	    request(MainSock,{target_info,init_target_info()}),
 	    loop(#state{controller={Host,MainSock}});
-	Error -> 
+	Error ->
 	    Starter ! {self(),{error,
 			       {could_not_contact_controller,Error}}}
     end.
@@ -127,7 +127,7 @@ loop(#state{controller={_,MainSock}} = State) ->
 	    halt();
 	{'EXIT',Pid,Reason} ->
 	    case lists:keysearch(Pid,1,State#state.jobs) of
-		{value,{Pid,Name}} -> 
+		{value,{Pid,Name}} ->
 		    case Reason of
 			normal -> ignore;
 			_other -> request(MainSock,{job_proc_killed,Name,Reason})
@@ -157,14 +157,14 @@ init_purify() ->
 job(Host,Port,Starter) ->
     process_flag(trap_exit,true),
     init_purify(),
-    case gen_tcp:connect(Host,Port, [binary, 
-				     {reuseaddr,true}, 
+    case gen_tcp:connect(Host,Port, [binary,
+				     {reuseaddr,true},
 				     {packet,4},
 				     {active,false}]) of
 	{ok,JobSock} ->
 	    Starter ! {self(),started},
 	    job(JobSock);
-	Error -> 
+	Error ->
 	    Starter ! {self(),{error,
 			       {could_not_contact_controller,Error}}}
     end.
@@ -192,7 +192,7 @@ get_jobdir() ->
 	true ->
 	    {ok,Cwd} = file:get_cwd(),
 	    Cwd ++ "/" ++ Basename;
-	false ->	    
+	false ->
 	    filename:absname(Basename)
     end.
 
@@ -216,7 +216,7 @@ send_privdir(JobDir,JobSock) ->
 
 del_dir(Dir) ->
     case file:read_file_info(Dir) of
-	{ok,#file_info{type=directory}} -> 
+	{ok,#file_info{type=directory}} ->
 	    {ok,Cont} = file:list_dir(Dir),
 	    lists:foreach(fun(F) -> del_dir(filename:join(Dir,F)) end, Cont),
 	    ok = file:del_dir(Dir);
@@ -227,7 +227,7 @@ del_dir(Dir) ->
 	    catch file:delete(Dir),
 	    ok
     end.
-    
+
 %%
 %% Receive and decode request on job socket
 %%
@@ -237,7 +237,7 @@ job_loop(JobSock) ->
 	ok -> job_loop(JobSock);
 	{stop,R} -> R
     end.
-    
+
 decode_job({{beam,Mod,Which},Beam}) ->
     % FIXME, shared directory structure on host and target required,
     % "Library beams" are not loaded from HOST... /Patrik
@@ -254,7 +254,7 @@ decode_job({{datadir,Tarfile0},Archive}) ->
     ok = erl_tar:extract(Tarfile,[compressed,{cwd,JobDir}]),
     ok = file:delete(Tarfile),
     ok;
-decode_job({test_case,Case}) -> 
+decode_job({test_case,Case}) ->
     Result = run_test_case_apply(Case),
     JobSock = get(test_server_job_sock),
     request(JobSock,{test_case_result,Result}),
@@ -266,11 +266,11 @@ decode_job({test_case,Case}) ->
 	    request(JobSock,{{crash_dumps,filename:basename(TarFile)},TarBin})
     end,
     ok;
-decode_job({sync_apply,{M,F,A}}) -> 
+decode_job({sync_apply,{M,F,A}}) ->
     R = apply(M,F,A),
     request(get(test_server_job_sock),{sync_result,R}),
     ok;
-decode_job(job_done) -> 
+decode_job(job_done) ->
     {stop,stopped}.
 
 %%
@@ -282,9 +282,9 @@ decode_job(job_done) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% cover_compile({App,Include,Exclude,Cross}) -> 
+%% cover_compile({App,Include,Exclude,Cross}) ->
 %%                                          {ok,AnalyseModules} | {error,Reason}
-%% 
+%%
 %% App = atom() , name of application to be compiled
 %% Exclude = [atom()], list of modules to exclude
 %% Include = [atom()], list of modules outside of App that should be included
@@ -293,7 +293,7 @@ decode_job(job_done) ->
 %%                 in the cover compilation, but that shall not be part of
 %%                 the cover analysis for this application.
 %%
-%% Cover compile the given application. Return {ok,AnalyseMods} if application 
+%% Cover compile the given application. Return {ok,AnalyseMods} if application
 %% is found, else {error,application_not_found}.
 
 cover_compile({none,_Exclude,Include,Cross}) ->
@@ -330,7 +330,7 @@ cover_compile({App,all,Include,Cross}) ->
     end;
 cover_compile({App,Exclude,Include,Cross}) ->
     case code:lib_dir(App) of
-	{error,bad_name} -> 
+	{error,bad_name} ->
 	    case Include++Cross of
 		[] ->
 		    io:format("\nWARNING: Can't find lib_dir for \'~w\'\n"
@@ -366,7 +366,7 @@ cover_compile({App,Exclude,Include,Cross}) ->
 		    {ok,AnalyseMods}
 	    end
     end.
-    
+
 
 module_names(Beams) ->
     [list_to_atom(filename:basename(filename:rootname(Beam))) || Beam <- Beams].
@@ -380,11 +380,11 @@ do_cover_compile1([Dont|Rest]) when Dont=:=cover;
 				    Dont=:=test_server_ctrl ->
     do_cover_compile1(Rest);
 do_cover_compile1([M|Rest]) ->
-    case {code:is_sticky(M),code:is_loaded(M)} of 
+    case {code:is_sticky(M),code:is_loaded(M)} of
 	{true,_} ->
 	    code:unstick_mod(M),
 	    case cover:compile_beam(M) of
-		{ok,_} -> 
+		{ok,_} ->
 		    ok;
 		Error ->
 		    io:fwrite("\nWARNING: Could not cover compile ~w: ~p\n",
@@ -402,7 +402,7 @@ do_cover_compile1([M|Rest]) ->
 	    end;
 	{false,_} ->
 	    case cover:compile_beam(M) of
-		{ok,_} -> 
+		{ok,_} ->
 		    ok;
 		Error ->
 		    io:fwrite("\nWARNING: Could not cover compile ~w: ~p\n",
@@ -415,14 +415,14 @@ do_cover_compile1([]) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% cover_analyse(Analyse,Modules) -> [{M,{Cov,NotCov,Details}}]
-%% 
+%%
 %% Analyse = {details,Dir} | details | {overview,void()} | overview
 %% Modules = [atom()], the modules to analyse
 %%
 %% Cover analysis. If this is a remote target, analyse_to_file can not be used.
 %% In that case the analyse level 'line' is used instead if Analyse==details.
 %%
-%% If this is a local target, the test directory is given 
+%% If this is a local target, the test directory is given
 %% (Analyse=={details,Dir}) and analyse_to_file can be used directly.
 %%
 %% If Analyse==overview | {overview,Dir} analyse_to_file is not used, only
@@ -432,12 +432,12 @@ do_cover_compile1([]) ->
 %% all.coverdata in that directory.
 cover_analyse(Analyse,Modules) ->
     io:fwrite("Cover analysing...\n",[]),
-    DetailsFun = 
+    DetailsFun =
 	case Analyse of
 	    {details,Dir} ->
 		case cover:export(filename:join(Dir,"all.coverdata")) of
 		    ok ->
-			fun(M) -> 
+			fun(M) ->
 				OutFile = filename:join(Dir,
 							atom_to_list(M) ++
 							".COVER.html"),
@@ -451,7 +451,7 @@ cover_analyse(Analyse,Modules) ->
 		    Error ->
 			fun(_) -> Error end
 		end;
-	    details -> 
+	    details ->
 		fun(M) ->
 			case cover:analyse(M,line) of
 			    {ok,Lines} ->
@@ -470,7 +470,7 @@ cover_analyse(Analyse,Modules) ->
 	    overview ->
 		fun(_) -> undefined end
 	end,
-    R = lists:map(
+    R = pmap(
 	  fun(M) ->
 		  case cover:analyse(M,module) of
 		      {ok,{M,{Cov,NotCov}}} ->
@@ -486,10 +486,23 @@ cover_analyse(Analyse,Modules) ->
     stick_all_sticky(node(),Sticky),
     R.
 
+pmap(Fun,List) ->
+    Collector = self(),
+    Pids = lists:map(fun(E) ->
+			     spawn(fun() ->
+					   Collector ! {res,self(),Fun(E)} 
+				   end) 
+		     end, List),
+    lists:map(fun(Pid) ->
+		      receive
+			  {res,Pid,Res} ->
+			      Res
+		      end
+	      end, Pids).
 
 unstick_all_sticky(Node) ->
     lists:filter(
-      fun(M) -> 
+      fun(M) ->
 	      case code:is_sticky(M) of
 		  true ->
 		      rpc:call(Node,code,unstick_mod,[M]),
@@ -502,24 +515,24 @@ unstick_all_sticky(Node) ->
 
 stick_all_sticky(Node,Sticky) ->
     lists:foreach(
-      fun(M) -> 
+      fun(M) ->
 	      rpc:call(Node,code,stick_mod,[M])
       end,
       Sticky).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% run_test_case_apply(Mod,Func,Args,Name,RunInit,MultiplyTimetrap) -> 
+%% run_test_case_apply(Mod,Func,Args,Name,RunInit,TimetrapData) ->
 %%               {Time,Value,Loc,Opts,Comment} | {died,Reason,unknown,Comment}
-%% 
+%%
 %% Time = float()   (seconds)
 %% Value = term()
 %% Loc = term()
 %% Comment = string()
 %% Reason = term()
 %%
-%% Spawns off a process (case process) that actually runs the test suite. 
-%% The case process will have the job process as group leader, which makes 
+%% Spawns off a process (case process) that actually runs the test suite.
+%% The case process will have the job process as group leader, which makes
 %% it possible to capture all it's output from io:format/2, etc.
 %%
 %% The job process then sits down and waits for news from the case process.
@@ -535,40 +548,43 @@ stick_all_sticky(Node,Sticky) ->
 %% called or the comment given by the return value {comment,Comment} from
 %% a test case.
 %%
-%% {died,Reason,unknown,Comment} is returned if the test case was killed 
+%% {died,Reason,unknown,Comment} is returned if the test case was killed
 %% by some other process. Reason is the kill reason provided.
 %%
-%% MultiplyTimetrap indicates a possible extension of all timetraps
-%% Timetraps will be multiplied by this integer. If it is infinity, no
-%% timetraps will be started at all.
+%% TimetrapData = {MultiplyTimetrap,ScaleTimetrap}, which indicates a
+%% possible extension of all timetraps. Timetraps will be multiplied by
+%% MultiplyTimetrap. If it is infinity, no timetraps will be started at all.
+%% ScaleTimetrap indicates if test_server should attemp to automatically
+%% compensate timetraps for runtime delays introduced by e.g. tools like
+%% cover.
 
-run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,MultiplyTimetrap}) ->
+run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,TimetrapData}) ->
     purify_format("Test case #~w ~w:~w/1", [CaseNum, Mod, Func]),
     case os:getenv("TS_RUN_VALGRIND") of
-	false -> 
+	false ->
 	    ok;
 	_ ->
 	    os:putenv("VALGRIND_LOGFILE_INFIX",atom_to_list(Mod)++"."++
 		      atom_to_list(Func)++"-")
     end,
     test_server_h:testcase({Mod,Func,1}),
-    ProcBef = erlang:system_info(process_count),    
-    Result = run_test_case_apply(Mod, Func, Args, Name, RunInit, MultiplyTimetrap),
+    ProcBef = erlang:system_info(process_count),
+    Result = run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData),
     ProcAft = erlang:system_info(process_count),
     purify_new_leaks(),
     DetFail = get(test_server_detected_fail),
     {Result,DetFail,ProcBef,ProcAft}.
-    
-run_test_case_apply(Mod, Func, Args, Name, RunInit, MultiplyTimetrap) ->
+
+run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
     case get(test_server_job_dir) of
 	undefined ->
 	    %% i'm a local target
-	    do_run_test_case_apply(Mod, Func, Args, Name, RunInit, MultiplyTimetrap);
+	    do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData);
 	JobDir ->
 	    %% i'm a remote target
 	    case Args of
 		[Config] when is_list(Config) ->
-		    {value,{data_dir,HostDataDir}} = 
+		    {value,{data_dir,HostDataDir}} =
 			lists:keysearch(data_dir, 1, Config),
 		    DataBase = filename:basename(HostDataDir),
 		    TargetDataDir = filename:join(JobDir, DataBase),
@@ -578,18 +594,18 @@ run_test_case_apply(Mod, Func, Args, Name, RunInit, MultiplyTimetrap) ->
 		    Config2 = lists:keyreplace(priv_dir, 1, Config1,
 					       {priv_dir,TargetPrivDir}),
 		    do_run_test_case_apply(Mod, Func, [Config2], Name, RunInit,
-					   MultiplyTimetrap);
+					   TimetrapData);
 		_other ->
 		    do_run_test_case_apply(Mod, Func, Args, Name, RunInit,
-					   MultiplyTimetrap)
+					   TimetrapData)
 	    end
     end.
-do_run_test_case_apply(Mod, Func, Args, Name, RunInit, MultiplyTimetrap) ->
+do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
     {ok,Cwd} = file:get_cwd(),
     Args2Print = case Args of
-		     [Args1] when is_list(Args1) -> 
+		     [Args1] when is_list(Args1) ->
 			 lists:keydelete(tc_group_result, 1, Args1);
-		     _ -> 
+		     _ ->
 			 Args
 		 end,
     print(minor, "Test case started with:\n~s:~s(~p)\n", [Mod,Func,Args2Print]),
@@ -600,16 +616,16 @@ do_run_test_case_apply(Mod, Func, Args, Name, RunInit, MultiplyTimetrap) ->
     OldGLeader = group_leader(),
     %% Set ourself to group leader for the spawned process
     group_leader(self(),self()),
-    Pid = 
+    Pid =
 	spawn_link(
-	  fun() -> 
-		  run_test_case_eval(Mod, Func, Args, Name, Ref, 
-				     RunInit, MultiplyTimetrap,
+	  fun() ->
+		  run_test_case_eval(Mod, Func, Args, Name, Ref,
+				     RunInit, TimetrapData,
 				     TCCallback)
 	  end),
     group_leader(OldGLeader, self()),
     put(test_server_detected_fail, []),
-    run_test_case_msgloop(Ref, Pid, false, false, "").
+    run_test_case_msgloop(Ref, Pid, false, false, "", undefined).
 
 %% Ugly bug (pre R5A):
 %% If this process (group leader of the test case) terminates before
@@ -620,7 +636,7 @@ do_run_test_case_apply(Mod, Func, Args, Name, RunInit, MultiplyTimetrap) ->
 %% A test case is known to have failed if it returns {'EXIT', _} tuple,
 %% or sends a message {failed, File, Line} to it's group_leader
 %%
-run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment) ->
+run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
     %% NOTE: Keep job_proxy_msgloop/0 up to date when changes
     %%       are made in this function!
     {Timeout,ReturnValue} =
@@ -641,13 +657,13 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment) ->
 		receive
 		    {'DOWN', Mon, process, Pid, _} ->
 			Comment
-		    after 10000 ->		    
+		    after 10000 ->
 			    %% Pid is probably trapping exits, hit it harder...
 			    exit(Pid, kill),
 			    %% here's the only place we know Reason, so we save
 			    %% it as a comment, potentially replacing user data
 			    Error = lists:flatten(io_lib:format("Aborted: ~p",[Reason])),
-			    Error1 = lists:flatten([string:strip(S,left) || 
+			    Error1 = lists:flatten([string:strip(S,left) ||
 						    S <- string:tokens(Error,[$\n])]),
 			    if length(Error1) > 63 ->
 				    string:substr(Error1,1,60) ++ "...";
@@ -655,149 +671,224 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment) ->
 				    Error1
 			    end
 		    end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,NewComment);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,NewComment,CurrConf);
         {io_request,From,ReplyAs,{put_chars,io_lib,Func,[Format,Args]}}
 	when is_list(Format) ->
 	    Msg = (catch io_lib:Func(Format,Args)),
 	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
         {io_request,From,ReplyAs,{put_chars,io_lib,Func,[Format,Args]}}
 	when is_atom(Format) ->
 	    Msg = (catch io_lib:Func(Format,Args)),
 	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
         {io_request,From,ReplyAs,{put_chars,Bytes}} ->
 	    run_test_case_msgloop_io(
 	      ReplyAs,CaptureStdout,Bytes,From,put_chars),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
         {io_request,From,ReplyAs,{put_chars,unicode,io_lib,Func,[Format,Args]}}
 	when is_list(Format) ->
 	    Msg = unicode_to_latin1(catch io_lib:Func(Format,Args)),
 	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
         {io_request,From,ReplyAs,{put_chars,latin1,io_lib,Func,[Format,Args]}}
 	when is_list(Format) ->
 	    Msg = (catch io_lib:Func(Format,Args)),
 	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
         {io_request,From,ReplyAs,{put_chars,unicode,io_lib,Func,[Format,Args]}}
 	when is_atom(Format) ->
 	    Msg = unicode_to_latin1(catch io_lib:Func(Format,Args)),
 	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
         {io_request,From,ReplyAs,{put_chars,latin1,io_lib,Func,[Format,Args]}}
 	when is_atom(Format) ->
 	    Msg = (catch io_lib:Func(Format,Args)),
 	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
         {io_request,From,ReplyAs,{put_chars,unicode,Bytes}} ->
 	    run_test_case_msgloop_io(
 	      ReplyAs,CaptureStdout,unicode_to_latin1(Bytes),From,put_chars),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
         {io_request,From,ReplyAs,{put_chars,latin1,Bytes}} ->
 	    run_test_case_msgloop_io(
 	      ReplyAs,CaptureStdout,Bytes,From,put_chars),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
         IoReq when element(1, IoReq) == io_request ->
 	    %% something else, just pass it on
             group_leader() ! IoReq,
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 	{structured_io,ClientPid,Msg} ->
 	    output(Msg, ClientPid),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 	{capture,NewCapture} ->
-            run_test_case_msgloop(Ref,Pid,NewCapture,Terminate,Comment);
+            run_test_case_msgloop(Ref,Pid,NewCapture,Terminate,Comment,CurrConf);
 	{sync_apply,From,MFA} ->
 	    sync_local_or_remote_apply(false,From,MFA),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 	{sync_apply_proxy,Proxy,From,MFA} ->
 	    sync_local_or_remote_apply(Proxy,From,MFA),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 	{printout,Detail,Format,Args} ->
 	    print(Detail,Format,Args),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 	{comment,NewComment} ->
 	    Terminate1 =
 		case Terminate of
-		    {true,{Time,Value,Loc,Opts,_OldComment}} -> 
+		    {true,{Time,Value,Loc,Opts,_OldComment}} ->
 			{true,{Time,Value,mod_loc(Loc),Opts,NewComment}};
 		    Other ->
 			Other
 		end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate1,NewComment);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate1,NewComment,CurrConf);
+	{set_curr_conf,NewCurrConf} ->
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,NewCurrConf);
 	{'EXIT',Pid,{Ref,Time,Value,Loc,Opts}} ->
 	    RetVal = {Time/1000000,Value,mod_loc(Loc),Opts,Comment},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},Comment);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},Comment,undefined);
 	{'EXIT',Pid,Reason} ->
 	    case Reason of
 		{timetrap_timeout,TVal,Loc} ->
 		    %% convert Loc to form that can be formatted
-		    Loc1 = mod_loc(Loc),
-		    {Mod,Func} = get_mf(Loc1),
-		    %% The framework functions mustn't execute on this
-		    %% group leader process or io will cause deadlock,
-		    %% so we spawn a dedicated process for the operation
-		    %% and let the group leader go back to handle io.
-		    spawn_fw_call(Mod,Func,Pid,{timetrap_timeout,TVal},
-				  Loc1,self(),Comment),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+		    case mod_loc(Loc) of
+			{FwMod,FwFunc,framework} ->
+			    %% timout during framework call
+			    spawn_fw_call(FwMod,FwFunc,Pid,
+					  {framework_error,{timetrap,TVal}},
+					  unknown,self(),Comment),
+			    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+						  Comment,undefined);
+			Loc1 ->
+			    {Mod,Func} = get_mf(Loc1),
+			    %% call end_per_testcase on a separate process,
+			    %% only so that the user has a chance to clean up
+			    %% after init_per_testcase, even after a timetrap timeout
+			    NewCurrConf =
+				case CurrConf of
+				    {{Mod,Func},Conf} ->
+					EndConfPid =
+					    call_end_conf(Mod,Func,Pid,
+							  {timetrap_timeout,TVal},
+							  Loc1,[{tc_status,
+								 {failed,
+								  timetrap_timeout}}|Conf],
+							  TVal),
+					{EndConfPid,{Mod,Func},Conf};
+				    _ ->
+					%% The framework functions mustn't execute on this
+					%% group leader process or io will cause deadlock,
+					%% so we spawn a dedicated process for the operation
+					%% and let the group leader go back to handle io.
+					spawn_fw_call(Mod,Func,Pid,{timetrap_timeout,TVal},
+						      Loc1,self(),Comment),
+					undefined
+				end,
+			    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+						  Comment,NewCurrConf)
+		    end;
 		{timetrap_timeout,TVal,Loc,InitOrEnd} ->
-		    Loc1 = mod_loc(Loc),
-		    {Mod,_Func} = get_mf(Loc1),
-		    spawn_fw_call(Mod,InitOrEnd,Pid,{timetrap_timeout,TVal},
-				  Loc1,self(),Comment),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);		    
-		{testcase_aborted,Reason,Loc} ->
-		    Loc1 = mod_loc(Loc),
-		    {Mod,Func} = get_mf(Loc1),
-		    spawn_fw_call(Mod,Func,Pid,{testcase_aborted,Reason},
-				  Loc1,self(),Comment),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
-		killed ->			
+		    case mod_loc(Loc) of
+			{FwMod,FwFunc,framework} ->
+			    %% timout during framework call
+			    spawn_fw_call(FwMod,FwFunc,Pid,
+					  {framework_error,{timetrap,TVal}},
+					  unknown,self(),Comment);
+			Loc1 ->
+			    {Mod,_Func} = get_mf(Loc1),
+			    spawn_fw_call(Mod,InitOrEnd,Pid,{timetrap_timeout,TVal},
+					  Loc1,self(),Comment)
+		    end,
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
+		{testcase_aborted,AbortReason,AbortLoc} ->
+		    ErrorMsg = {testcase_aborted,AbortReason},
+		    case mod_loc(AbortLoc) of
+			{FwMod,FwFunc,framework} ->
+			    %% abort during framework call
+			    spawn_fw_call(FwMod,FwFunc,Pid,
+					  {framework_error,ErrorMsg},
+					  unknown,self(),Comment),
+			    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+						  Comment,undefined);
+			Loc1 ->
+			    {Mod,Func} = get_mf(Loc1),
+			    %% call end_per_testcase on a separate process, only so
+			    %% that the user has a chance to clean up after init_per_testcase,
+			    %% even after abortion
+			    NewCurrConf =
+				case CurrConf of
+				    {{Mod,Func},Conf} ->
+					TVal = case lists:keysearch(default_timeout,1,Conf) of
+						   {value,{default_timeout,Tmo}} -> Tmo;
+						   _ -> ?DEFAULT_TIMETRAP_SECS*1000
+					       end,
+					EndConfPid =
+					    call_end_conf(Mod,Func,Pid,ErrorMsg,
+							  Loc1,
+							  [{tc_status,{failed,ErrorMsg}}|Conf],
+							  TVal),
+					{EndConfPid,{Mod,Func},Conf};
+				    _ ->
+					spawn_fw_call(Mod,Func,Pid,ErrorMsg,
+						      Loc1,self(),Comment),
+					undefined
+				end,
+			    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+						  Comment,NewCurrConf)
+		    end;
+		killed ->
 		    %% result of an exit(TestCase,kill) call, which is the
-		    %% only way to abort a testcase process that traps exits 
+		    %% only way to abort a testcase process that traps exits
 		    %% (see abort_current_testcase)
 		    spawn_fw_call(undefined,undefined,Pid,testcase_aborted_or_killed,
 				  unknown,self(),Comment),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 		{fw_error,{FwMod,FwFunc,FwError}} ->
 		    spawn_fw_call(FwMod,FwFunc,Pid,{framework_error,FwError},
 				  unknown,self(),Comment),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);		    
-		_ ->
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
+		_Other ->
 		    %% the testcase has terminated because of Reason (e.g. an exit
 		    %% because a linked process failed)
 		    spawn_fw_call(undefined,undefined,Pid,Reason,
 				  unknown,self(),Comment),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment)
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf)
+	    end;
+	{EndConfPid,{call_end_conf,Data,_Result}} ->
+	    case CurrConf of
+		{EndConfPid,{Mod,Func},_Conf} ->
+		    {_Mod,_Func,TCPid,TCExitReason,Loc} = Data,
+		    spawn_fw_call(Mod,Func,TCPid,TCExitReason,Loc,self(),Comment),
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,undefined);
+		_ ->
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf)
 	    end;
 	{_FwCallPid,fw_notify_done,RetVal} ->
 	    %% the framework has been notified, we're finished
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},Comment);	    
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},Comment,undefined);
  	{'EXIT',_FwCallPid,{fw_notify_done,Func,Error}} ->
 	    %% a framework function failed
 	    CB = os:getenv("TEST_SERVER_FRAMEWORK"),
 	    Loc = case CB of
-		      false -> 
+		      FW when FW =:= false; FW =:= "undefined" ->
 			  {test_server,Func};
-		      _ -> 
+		      _ ->
 			  {list_to_atom(CB),Func}
 		  end,
 	    RetVal = {died,{framework_error,Loc,Error},Loc,"Framework error"},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},Comment);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},Comment,undefined);
 	{failed,File,Line} ->
-	    put(test_server_detected_fail, 
+	    put(test_server_detected_fail,
 		[{File, Line}| get(test_server_detected_fail)]),
-       	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 	_Other when not is_tuple(_Other) ->
 	    %% ignore anything not generated by test server
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment);	    
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
 	_Other when element(1, _Other) /= 'EXIT',
 		    element(1, _Other) /= started,
 		    element(1, _Other) /= finished,
 		    element(1, _Other) /= print ->
 	    %% ignore anything not generated by test server
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment)
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf)
     after Timeout ->
 	    ReturnValue
     end.
@@ -819,15 +910,45 @@ run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func) ->
 output(Msg,Sender) ->
     local_or_remote_apply({test_server_ctrl,output,[Msg,Sender]}).
 
+call_end_conf(Mod,Func,TCPid,TCExitReason,Loc,Conf,TVal) ->
+    Starter = self(),
+    Data = {Mod,Func,TCPid,TCExitReason,Loc},
+    EndConfProc =
+	fun() ->
+		Supervisor = self(),
+		EndConfApply =
+		    fun() ->
+			    case catch apply(Mod,end_per_testcase,[Func,Conf]) of
+				{'EXIT',Why} ->
+				    group_leader() ! {printout,12,
+						      "ERROR! ~p:end_per_testcase(~p, ~p)"
+						      " crashed!\n\tReason: ~p\n",
+						      [Mod,Func,Conf,Why]};
+				_ ->
+				    ok
+			    end,
+			    Supervisor ! {self(),end_conf}
+		       end,
+		Pid = spawn_link(EndConfApply),
+		receive
+		    {Pid,end_conf} ->
+			Starter ! {self(),{call_end_conf,Data,ok}};
+		    {'EXIT',Pid,Reason} ->
+			Starter ! {self(),{call_end_conf,Data,{error,Reason}}}
+		after TVal ->
+			Starter ! {self(),{call_end_conf,Data,{error,timeout}}}
+		end
+	end,
+    spawn_link(EndConfProc).
+
 spawn_fw_call(Mod,{init_per_testcase,Func},Pid,{timetrap_timeout,TVal}=Why,
 	      Loc,SendTo,Comment) ->
     FwCall =
 	fun() ->
 	    Skip = {skip,{failed,{Mod,init_per_testcase,Why}}},
-	    %% if init_per_testcase fails, the test case 
+	    %% if init_per_testcase fails, the test case
 	    %% should be skipped
-	    case catch test_server_sup:framework_call(
-			 end_tc,[?pl2a(Mod),Func,{Pid,Skip,[[]]}]) of
+	    case catch do_end_tc_call(Mod,Func,{Pid,Skip,[[]]},Why) of
 		{'EXIT',FwEndTCErr} ->
 		    exit({fw_notify_done,end_tc,FwEndTCErr});
 		_ ->
@@ -838,6 +959,7 @@ spawn_fw_call(Mod,{init_per_testcase,Func},Pid,{timetrap_timeout,TVal}=Why,
 		      {TVal/1000,Skip,Loc,[],Comment}}
 	end,
     spawn_link(FwCall);
+
 spawn_fw_call(Mod,{end_per_testcase,Func},Pid,{timetrap_timeout,TVal}=Why,
 	      Loc,SendTo,_Comment) ->
     FwCall =
@@ -845,11 +967,9 @@ spawn_fw_call(Mod,{end_per_testcase,Func},Pid,{timetrap_timeout,TVal}=Why,
 	    Conf = [{tc_status,ok}],
 	    %% if end_per_testcase fails, the test case should be
 	    %% reported successful with a warning printed as comment
-	    case catch test_server_sup:framework_call(end_tc,
-						      [?pl2a(Mod),Func,
-						       {Pid,
-							{failed,{Mod,end_per_testcase,Why}},
-							[Conf]}]) of
+	    case catch do_end_tc_call(Mod,Func,{Pid,
+						{failed,{Mod,end_per_testcase,Why}},
+						[Conf]}, Why) of
 		{'EXIT',FwEndTCErr} ->
 		    exit({fw_notify_done,end_tc,FwEndTCErr});
 		_ ->
@@ -869,7 +989,7 @@ spawn_fw_call(FwMod,FwFunc,_Pid,{framework_error,FwError},_,SendTo,_Comment) ->
 	fun() ->
 		test_server_sup:framework_call(report, [framework_error,
 							{{FwMod,FwFunc},FwError}]),
-		Comment = 
+		Comment =
 		    lists:flatten(
 		      io_lib:format("<font color=\"red\">"
 				    "WARNING! ~w:~w failed!</font>", [FwMod,FwFunc])),
@@ -891,9 +1011,7 @@ spawn_fw_call(Mod,Func,Pid,Error,Loc,SendTo,Comment) ->
 			ok
 		end,
 		Conf = [{tc_status,{failed,timetrap_timeout}}],
-		case catch test_server_sup:framework_call(end_tc,
-							  [?pl2a(Mod),Func,
-							   {Pid,Error,[Conf]}]) of
+		case catch do_end_tc_call(Mod,Func,{Pid,Error,[Conf]},Error) of
 		    {'EXIT',FwEndTCErr} ->
 			exit({fw_notify_done,end_tc,FwEndTCErr});
 		    _ ->
@@ -953,32 +1071,33 @@ job_proxy_msgloop() ->
 %% A test case is known to have failed if it returns {'EXIT', _} tuple,
 %% or sends a message {failed, File, Line} to it's group_leader
 
-run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit, 
-		   MultiplyTimetrap, TCCallback) ->
-    put(test_server_multiply_timetraps,MultiplyTimetrap),
+run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
+		   TimetrapData, TCCallback) ->
+    put(test_server_multiply_timetraps,TimetrapData),
+
     {{Time,Value},Loc,Opts} =
 	case test_server_sup:framework_call(init_tc,[?pl2a(Mod),Func,Args0],
-					    {ok,Args0}) of
+					    {ok, Args0}) of
 	    {ok,Args} ->
 		run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback);
 	    Error = {error,_Reason} ->
-		test_server_sup:framework_call(end_tc,[?pl2a(Mod),Func,{Error,Args0}]),
-		{{0,{skip,{failed,Error}}},{Mod,Func},[]};
+		NewResult = do_end_tc_call(Mod,Func,{Error,Args0},
+					   {skip,{failed,Error}}),
+		{{0,NewResult},{Mod,Func},[]};
 	    {fail,Reason} ->
 		[Conf] = Args0,
 		Conf1 = [{tc_status,{failed,Reason}} | Conf],
 		fw_error_notify(Mod, Func, Conf, Reason),
-		test_server_sup:framework_call(end_tc,[?pl2a(Mod),Func,
-						       {{error,Reason},[Conf1]}]),
-		{{0,{failed,Reason}},{Mod,Func},[]};
+		NewResult = do_end_tc_call(Mod,Func, {{error,Reason},[Conf1]},
+					   {fail, Reason}),
+		{{0,NewResult},{Mod,Func},[]};
 	    Skip = {skip,_Reason} ->
-		test_server_sup:framework_call(end_tc,[?pl2a(Mod),Func,{Skip,Args0}]),
-		{{0,Skip},{Mod,Func},[]};
+		NewResult = do_end_tc_call(Mod,Func,{Skip,Args0},Skip),
+		{{0,NewResult},{Mod,Func},[]};
 	    {auto_skip,Reason} ->
-		test_server_sup:framework_call(end_tc,[?pl2a(Mod),
-						       Func,
-						       {{skip,Reason},Args0}]),
-		{{0,{skip,{fw_auto_skip,Reason}}},{Mod,Func},[]}
+		NewResult = do_end_tc_call(Mod, Func, {{skip,Reason},Args0},
+					   {skip, {fw_auto_skip,Reason}}),
+		{{0,NewResult},{Mod,Func},[]}
 	end,
     exit({Ref,Time,Value,Loc,Opts}).
 
@@ -992,18 +1111,20 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 		Skip = {skip,Reason} ->
 		    Line = get_loc(),
 		    Conf = [{tc_status,{skipped,Reason}}],
-		    test_server_sup:framework_call(end_tc,[?pl2a(Mod),Func,{Skip,[Conf]}]),
-		    {{0,{skip,Reason}},Line,[]};
+		    NewRes = do_end_tc_call(Mod,Func,{Skip,[Conf]}, Skip),
+		    {{0,NewRes},Line,[]};
 		{skip_and_save,Reason,SaveCfg} ->
 		    Line = get_loc(),
 		    Conf = [{tc_status,{skipped,Reason}},{save_config,SaveCfg}],
-		    test_server_sup:framework_call(end_tc,[?pl2a(Mod),Func,
-							   {{skip,Reason},[Conf]}]),
-		    {{0,{skip,Reason}},Line,[]};
+		    NewRes = do_end_tc_call(Mod, Func, {{skip, Reason}, [Conf]},
+					    {skip, Reason}),
+		    {{0,NewRes},Line,[]};
 		{ok,NewConf} ->
 		    put(test_server_init_or_end_conf,undefined),
 		    %% call user callback function if defined
 		    NewConf1 = user_callback(TCCallback, Mod, Func, init, NewConf),
+		    %% save current state in controller loop
+		    group_leader() ! {set_curr_conf,{{Mod,Func},NewConf1}},
 		    put(test_server_loc, {Mod,Func}),
 		    %% execute the test case
 		    {{T,Return},Loc} = {ts_tc(Mod, Func, [NewConf1]),get_loc()},
@@ -1025,6 +1146,8 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 			    _ ->
 				{[{tc_status,ok}|NewConf1],Return,ok}
 			end,
+		    %% clear current state in controller loop
+		    group_leader() ! {set_curr_conf,undefined},
 		    %% call user callback function if defined
 		    EndConf1 = user_callback(TCCallback, Mod, Func, 'end', EndConf),
 		    {FWReturn1,TSReturn1,EndConf2} =
@@ -1036,16 +1159,16 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 				{{error,ReasonToFail},{failed,ReasonToFail},EndConf1};
 			    {failed,{_,end_per_testcase,_}} = Failure -> % unexpected termination
 				{Failure,TSReturn,EndConf1};
-			    _ -> 
+			    _ ->
 				{FWReturn,TSReturn,EndConf1}
 			end,
-		    case test_server_sup:framework_call(end_tc, [?pl2a(Mod), Func,
-								 {FWReturn1,[EndConf2]}]) of
-			{fail,Reason} ->
-			    fw_error_notify(Mod, Func, EndConf2, Reason),
-			    {{T,{failed,Reason}},{Mod,Func},[]};
-			_ ->
-			    {{T,TSReturn1},Loc,[]}
+		    put(test_server_init_or_end_conf,undefined),
+		    case do_end_tc_call(Mod, Func, {FWReturn1,[EndConf2]}, TSReturn1) of
+			{failed,Reason} = NewReturn ->
+			    fw_error_notify(Mod,Func,EndConf2, Reason),
+			    {{T,NewReturn},{Mod,Func},[]};
+			NewReturn ->
+			    {{T,NewReturn},Loc,[]}
 		    end
 	    end;
 	skip_init ->
@@ -1063,11 +1186,37 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 	    {{T,Return},Loc} = {ts_tc(Mod, Func, Args2),get_loc()},
 	    %% call user callback function if defined
 	    Return1 = user_callback(TCCallback, Mod, Func, 'end', Return),
-	    {Return2,Opts} = process_return_val([Return1], Mod,Func,Args1, Loc, Return1),
+	    {Return2,Opts} = process_return_val([Return1], Mod, Func,
+						Args1, Loc, Return1),
 	    {{T,Return2},Loc,Opts}
     end.
 
-%% the return value is a list and we have to check if it contains 
+do_end_tc_call(M,F,Res,Return) ->
+    Ref = make_ref(),
+    case test_server_sup:framework_call(
+	   end_tc, [?pl2a(M),F,Res], Ref) of
+	{fail,FWReason} ->
+	    {failed,FWReason};
+	Ref ->
+	    case test_server_sup:framework_call(
+		   end_tc, [?pl2a(M),F,Res, Return], ok) of
+		{fail,FWReason} ->
+		    {failed,FWReason};
+		ok ->
+		    case Return of
+			{fail,Reason} ->
+			    {failed,Reason};
+			Return ->
+			    Return
+		    end;
+		NewReturn ->
+		    NewReturn
+	    end;
+	_ ->
+	    Return
+    end.
+
+%% the return value is a list and we have to check if it contains
 %% the result of an end conf case or if it's a Config list
 process_return_val([Return], M,F,A, Loc, Final) when is_list(Return) ->
     ReturnTags = [skip,skip_and_save,save_config,comment,return_group_result],
@@ -1081,25 +1230,34 @@ process_return_val([Return], M,F,A, Loc, Final) when is_list(Return) ->
 		   end, Return) of
 	true ->		     % must be return value from end conf case
 	    process_return_val1(Return, M,F,A, Loc, Final, []);
-	false ->	     % must be Config value from init conf case
-	    test_server_sup:framework_call(end_tc, [?pl2a(M),F,{ok,A}]),
-	    {Return,[]}
+	false -> % must be Config value from init conf case
+	    case do_end_tc_call(M,F,{ok,A}, Return) of
+		{failed, FWReason} = Failed ->
+		    fw_error_notify(M,F,A, FWReason),
+		    {Failed, []};
+		NewReturn ->
+		    {NewReturn, []}
+	    end
     end;
 %% the return value is not a list, so it's the return value from an
 %% end conf case or it's a dummy value that can be ignored
 process_return_val(Return, M,F,A, Loc, Final) ->
     process_return_val1(Return, M,F,A, Loc, Final, []).
 
-process_return_val1([Failed={E,TCError}|_], M,F,A=[Args], Loc, _, SaveOpts) when E=='EXIT'; 
-										 E==failed ->
+process_return_val1([Failed={E,TCError}|_], M,F,A=[Args], Loc, _, SaveOpts)
+  when E=='EXIT';
+       E==failed ->
     fw_error_notify(M,F,A, TCError, mod_loc(Loc)),
-    test_server_sup:framework_call(end_tc,
-				   [?pl2a(M),F,{{error,TCError},
-						[[{tc_status,{failed,TCError}}|Args]]}]),
-    {Failed,SaveOpts};
-process_return_val1([SaveCfg={save_config,_}|Opts], M,F,[Args], Loc, Final, SaveOpts) ->    
+    case do_end_tc_call(M,F,{{error,TCError},
+			     [[{tc_status,{failed,TCError}}|Args]]}, Failed) of
+	{failed,FWReason} ->
+	    {{failed,FWReason},SaveOpts};
+	NewReturn ->
+	    {NewReturn,SaveOpts}
+    end;
+process_return_val1([SaveCfg={save_config,_}|Opts], M,F,[Args], Loc, Final, SaveOpts) ->
     process_return_val1(Opts, M,F,[[SaveCfg|Args]], Loc, Final, SaveOpts);
-process_return_val1([{skip_and_save,Why,SaveCfg}|Opts], M,F,[Args], Loc, _, SaveOpts) ->    
+process_return_val1([{skip_and_save,Why,SaveCfg}|Opts], M,F,[Args], Loc, _, SaveOpts) ->
     process_return_val1(Opts, M,F,[[{save_config,SaveCfg}|Args]], Loc, {skip,Why}, SaveOpts);
 process_return_val1([GR={return_group_result,_}|Opts], M,F,A, Loc, Final, SaveOpts) ->
     process_return_val1(Opts, M,F,A, Loc, Final, [GR|SaveOpts]);
@@ -1109,8 +1267,12 @@ process_return_val1([RetVal={Tag,_}|Opts], M,F,A, Loc, _, SaveOpts) when Tag==sk
 process_return_val1([_|Opts], M,F,A, Loc, Final, SaveOpts) ->
     process_return_val1(Opts, M,F,A, Loc, Final, SaveOpts);
 process_return_val1([], M,F,A, _Loc, Final, SaveOpts) ->
-    test_server_sup:framework_call(end_tc, [?pl2a(M),F,{Final,A}]),
-    {Final,lists:reverse(SaveOpts)}.
+    case do_end_tc_call(M,F,{Final,A}, Final) of
+	{failed,FWReason} ->
+	    {{failed,FWReason},SaveOpts};
+	NewReturn ->
+	    {NewReturn,lists:reverse(SaveOpts)}
+    end.
 
 user_callback(undefined, _, _, _, Args) ->
     Args;
@@ -1134,11 +1296,11 @@ init_per_testcase(Mod, Func, Args) ->
 	false -> code:load_file(Mod);
 	_ -> ok
     end,
-    %% init_per_testcase defined, returns new configuration
+%% init_per_testcase defined, returns new configuration
     case erlang:function_exported(Mod,init_per_testcase,2) of
 	true ->
 	    case catch my_apply(Mod, init_per_testcase, [Func|Args]) of
-		{'$test_server_ok',{Skip,Reason}} when Skip==skip; 
+		{'$test_server_ok',{Skip,Reason}} when Skip==skip;
 						       Skip==skipped ->
 		    {skip,Reason};
 		{'$test_server_ok',Res={skip_and_save,_,_}} ->
@@ -1149,40 +1311,40 @@ init_per_testcase(Mod, Func, Args) ->
 			[] ->
 			    {ok,NewConf};
 			Bad ->
-			    group_leader() ! {printout,12, 
+			    group_leader() ! {printout,12,
 					      "ERROR! init_per_testcase has returned "
-					      "bad elements in Config: ~p\n",[Bad]},  
+					      "bad elements in Config: ~p\n",[Bad]},
 			    {skip,{failed,{Mod,init_per_testcase,bad_return}}}
 		    end;
 		{'$test_server_ok',_Other} ->
-		    group_leader() ! {printout,12, 
+		    group_leader() ! {printout,12,
 				      "ERROR! init_per_testcase did not return "
-				      "a Config list.\n",[]},   
+				      "a Config list.\n",[]},
 		    {skip,{failed,{Mod,init_per_testcase,bad_return}}};
 		{'EXIT',Reason} ->
 		    Line = get_loc(),
 		    FormattedLoc = test_server_sup:format_loc(mod_loc(Line)),
-		    group_leader() ! {printout,12, 
+		    group_leader() ! {printout,12,
 				      "ERROR! init_per_testcase crashed!\n"
 				      "\tLocation: ~s\n\tReason: ~p\n",
-				      [FormattedLoc,Reason]},  
+				      [FormattedLoc,Reason]},
 		    {skip,{failed,{Mod,init_per_testcase,Reason}}};
 		Other ->
 		    Line = get_loc(),
 		    FormattedLoc = test_server_sup:format_loc(mod_loc(Line)),
-		    group_leader() ! {printout,12, 
+		    group_leader() ! {printout,12,
 				      "ERROR! init_per_testcase thrown!\n"
 				      "\tLocation: ~s\n\tReason: ~p\n",
-				      [FormattedLoc, Other]},  
+				      [FormattedLoc, Other]},
 		    {skip,{failed,{Mod,init_per_testcase,Other}}}
 	    end;
 	false ->
-	    %% Optional init_per_testcase not defined
-	    %% keep quiet.
+%% Optional init_per_testcase not defined
+%% keep quiet.
 	    [Config] = Args,
 	    {ok, Config}
     end.
-	    
+
 end_per_testcase(Mod, Func, Conf) ->
     case erlang:function_exported(Mod,end_per_testcase,2) of
 	true ->
@@ -1211,11 +1373,11 @@ do_end_per_testcase(Mod,EndFunc,Func,Conf) ->
 	    comment(io_lib:format("<font color=\"red\">"
 				  "WARNING: ~w crashed!"
 				  "</font>\n",[EndFunc])),
-	    group_leader() ! {printout,12, 
+	    group_leader() ! {printout,12,
 			      "WARNING: ~w crashed!\n"
 			      "Reason: ~p\n"
 			      "Line: ~s\n",
-			      [EndFunc, Reason, 
+			      [EndFunc, Reason,
 			       test_server_sup:format_loc(
 				 mod_loc(get_loc()))]},
 	    {failed,{Mod,end_per_testcase,Why}};
@@ -1223,13 +1385,13 @@ do_end_per_testcase(Mod,EndFunc,Func,Conf) ->
 	    comment(io_lib:format("<font color=\"red\">"
 				  "WARNING: ~w thrown!"
 				  "</font>\n",[EndFunc])),
-	    group_leader() ! {printout,12, 
+	    group_leader() ! {printout,12,
 			      "WARNING: ~w thrown!\n"
 			      "Reason: ~p\n"
 			      "Line: ~s\n",
-			      [EndFunc, Other, 
+			      [EndFunc, Other,
 			       test_server_sup:format_loc(
-				 mod_loc(get_loc()))]},  
+				 mod_loc(get_loc()))]},
 	    {failed,{Mod,end_per_testcase,Other}}
     end.
 
@@ -1254,7 +1416,7 @@ get_mf(_)           -> {undefined,undefined}.
 
 mod_loc(Loc) ->
     %% handle diff line num versions
-    case Loc of	
+    case Loc of
 	[{{_M,_F},_L}|_] ->
 	    [{?pl2a(M),F,L} || {{M,F},L} <- Loc];
 	[{_M,_F}|_] ->
@@ -1286,7 +1448,7 @@ fw_error_notify(Mod, Func, Args, Error, Loc) ->
 %% Args = [term()]
 %%
 %% Just like io:format, except that depending on the Detail value, the output
-%% is directed to console, major and/or minor log files. 
+%% is directed to console, major and/or minor log files.
 
 print(Detail,Format,Args) ->
     local_or_remote_apply({test_server_ctrl,print,[Detail,Format,Args]}).
@@ -1296,11 +1458,11 @@ print(Detail,Format,Args) ->
 %%
 %% Prints Leader followed by a time stamp (date and time). Depending on
 %% the Detail value, the output is directed to console, major and/or minor
-%% log files. 
+%% log files.
 
 print_timestamp(Detail,Leader) ->
     local_or_remote_apply({test_server_ctrl,print_timestamp,[Detail,Leader]}).
-    
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% lookup_config(Key,Config) -> {value,{Key,Value}} | undefined
@@ -1326,11 +1488,11 @@ ts_tc(M, F, A) ->
     Val = (catch my_apply(M, F, A)),
     After = erlang:now(),
     Result = case Val of
-		 {'$test_server_ok', R} -> 
+		 {'$test_server_ok', R} ->
 		     R; % test case ok
-		 {'EXIT',_Reason} = R -> 
+		 {'EXIT',_Reason} = R ->
 		     R; % test case crashed
-		 Other -> 
+		 Other ->
 		     {failed, {thrown,Other}} % test case was thrown
 	  end,
     Elapsed =
@@ -1352,7 +1514,7 @@ my_apply(M, F, A) ->
 %%       in an attempt to keep this modules small (yeah, right!)    %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 unicode_to_latin1(Chars) when is_list(Chars); is_binary(Chars) ->
-    lists:flatten( 
+    lists:flatten(
       [ case X of
 	    High when High > 255 ->
 		io_lib:format("\\{~.8B}",[X]);
@@ -1460,6 +1622,44 @@ sleep(MSecs) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% adjusted_sleep(Time) -> ok
+%% Time = integer() | float() | infinity
+%%
+%% Sleeps the specified number of milliseconds, multiplied by the
+%% 'multiply_timetraps' value (if set) and possibly also automatically scaled
+%% up if 'scale_timetraps' is set to true (which is default).
+%% This function also accepts floating point numbers (which are truncated) and
+%% the atom 'infinity'.
+adjusted_sleep(infinity) ->
+    receive
+    after infinity ->
+	    ok
+    end;
+adjusted_sleep(MSecs) ->
+    {Multiplier,ScaleFactor} =
+	case test_server_ctrl:get_timetrap_parameters() of
+	    {undefined,undefined} ->
+		{1,1};
+	    {undefined,false} ->
+		{1,1};
+	    {undefined,true} ->
+		{1,timetrap_scale_factor()};
+	    {infinity,_} ->
+		{infinity,1};
+	    {Mult,undefined} ->
+		{Mult,1};
+	    {Mult,false} ->
+		{Mult,1};
+	    {Mult,true} ->
+		{Mult,timetrap_scale_factor()}
+	end,
+    receive
+    after trunc(MSecs*Multiplier*ScaleFactor) ->
+	    ok
+    end,
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% fail(Reason) -> exit({suite_failed,Reason})
 %%
 %% Immediately calls exit. Included because test suites are easier
@@ -1509,9 +1709,9 @@ break(Comment) ->
     receive continue -> ok end.
 
 spawn_break_process(Pid) ->
-    spawn(fun() -> 
+    spawn(fun() ->
 		  register(test_server_break_process,self()),
-		  receive 
+		  receive
 		      continue -> continue(Pid);
 		      cancel -> ok
 		  end
@@ -1561,20 +1761,21 @@ timetrap_scale_factor() ->
 %% timetrap(Timeout) -> Handle
 %% Handle = term()
 %%
-%% Creates a time trap, that will kill the calling process if the 
+%% Creates a time trap, that will kill the calling process if the
 %% trap is not cancelled with timetrap_cancel/1, within Timeout milliseconds.
-
 timetrap(Timeout0) ->
     Timeout = time_ms(Timeout0),
     cancel_default_timetrap(),
     case get(test_server_multiply_timetraps) of
-	undefined -> timetrap1(Timeout);
-	infinity -> infinity;
-	Int -> timetrap1(Timeout*Int)
+	undefined -> timetrap1(Timeout, true);
+	{undefined,false} -> timetrap1(Timeout, false);
+	{undefined,_} -> timetrap1(Timeout, true);
+	{infinity,_} -> infinity;
+	{Int,Scale} -> timetrap1(Timeout*Int, Scale)
     end.
 
-timetrap1(Timeout) ->
-    Ref = spawn_link(test_server_sup,timetrap,[Timeout,self()]),
+timetrap1(Timeout, Scale) ->
+    Ref = spawn_link(test_server_sup,timetrap,[Timeout,Scale,self()]),
     case get(test_server_timetraps) of
 	undefined -> put(test_server_timetraps,[Ref]);
 	List -> put(test_server_timetraps,[Ref|List])
@@ -1582,7 +1783,6 @@ timetrap1(Timeout) ->
     Ref.
 
 ensure_timetrap(Config) ->
-    %format("ensure_timetrap:~p~n",[Config]),
     case get(test_server_timetraps) of
 	[_|_] ->
 	    ok;
@@ -1623,7 +1823,7 @@ cancel_default_timetrap() ->
 time_ms({hours,N}) -> hours(N);
 time_ms({minutes,N}) -> minutes(N);
 time_ms({seconds,N}) -> seconds(N);
-time_ms({Other,_N}) -> 
+time_ms({Other,_N}) ->
     format("=== ERROR: Invalid time specification: ~p. "
 	   "Should be seconds, minutes, or hours.~n", [Other]),
     exit({invalid_time_spec,Other});
@@ -1770,14 +1970,14 @@ call_crash(Time,Crash,M,F,A) ->
 %%                          by the test server after completion of the test case
 %%                          Therefore it is IMPORTANT that the USER terminates
 %%                          the node!!
-%% {erl, ReleaseList}     - Use an Erlang emulator determined by ReleaseList 
-%%                          when starting nodes, instead of the same emulator 
+%% {erl, ReleaseList}     - Use an Erlang emulator determined by ReleaseList
+%%                          when starting nodes, instead of the same emulator
 %%                          as the test server is running. ReleaseList is a list
-%%                          of specifiers, where a specifier is either 
-%%                          {release, Rel}, {prog, Prog}, or 'this'. Rel is 
-%%                          either the name of a release, e.g., "r7a" or 
-%%                          'latest'. 'this' means using the same emulator as 
-%%                          the test server. Prog is the name of an emulator 
+%%                          of specifiers, where a specifier is either
+%%                          {release, Rel}, {prog, Prog}, or 'this'. Rel is
+%%                          either the name of a release, e.g., "r7a" or
+%%                          'latest'. 'this' means using the same emulator as
+%%                          the test server. Prog is the name of an emulator
 %%                          executable.  If the list has more than one element,
 %%                          one of them is picked randomly. (Only
 %%                          works on Solaris and Linux, and the test
@@ -1792,13 +1992,13 @@ call_crash(Time,Crash,M,F,A) ->
 %%                          peer nodes.
 %%                          Note that slave nodes always act as if they had
 %%                          fail_on_error==false.
-%% 
+%%
 
 start_node(Name, Type, Options) ->
     lists:foreach(
-      fun(N) -> 
+      fun(N) ->
 	      case firstname(N) of
-		  Name -> 
+		  Name ->
 		      format("=== WARNING: Trying to start node \'~w\' when node"
 			     " with same first name exists: ~w", [Name, N]);
 		  _other -> ok
@@ -1817,19 +2017,19 @@ start_node(Name, Type, Options) ->
             %% Cannot run cover on shielded node or on a node started
             %% by a shielded node.
             Cover = case is_cover() of
-                        true -> 
+                        true ->
                             not is_shielded(Name) andalso same_version(Node);
-                        false -> 
+                        false ->
                             false
                     end,
 
 	    net_adm:ping(Node),
 	    case Cover of
-		true -> 
+		true ->
 		    Sticky = unstick_all_sticky(Node),
 		    cover:start(Node),
 		    stick_all_sticky(Node,Sticky);
-		_ -> 
+		_ ->
 		    ok
 	    end,
 	    {ok,Node};
@@ -1857,7 +2057,7 @@ wait_for_node(Slave) ->
 		      self(),
 		      {test_server_ctrl,wait_for_node,[Slave]}},
     receive {sync_result,R} -> R end.
-    
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% stop_node(Name) -> true|false
@@ -1867,7 +2067,7 @@ wait_for_node(Slave) ->
 stop_node(Slave) ->
     Nocover = is_shielded(Slave) orelse not same_version(Slave),
     case is_cover() of
-	true when not Nocover -> 
+	true when not Nocover ->
 	    Sticky = unstick_all_sticky(Slave),
 	    cover:stop(Slave),
 	    stick_all_sticky(Slave,Sticky);
@@ -1895,10 +2095,10 @@ stop_node(Slave) ->
 	    %% with the {cleanup,false} option, or it was started
 	    %% in some other way than test_server:start_node/3
 	    format("=== WARNING: Attempt to stop a nonexisting slavenode (~p)~n"
-		   "===          Trying to kill it anyway!!!", 
+		   "===          Trying to kill it anyway!!!",
 		   [Slave]),
 	    case net_adm:ping(Slave)of
-		pong -> 
+		pong ->
 		    slave:stop(Slave),
 		    true;
 		pang ->
@@ -1918,7 +2118,7 @@ is_release_available(Release) ->
 		      self(),
 		      {test_server_ctrl,is_release_available,[Release]}},
     receive {sync_result,R} -> R end.
-    
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% run_on_shielded_node(Fun, CArgs) -> term()
@@ -1937,7 +2137,7 @@ is_release_available(Release) ->
 %%
 %% Fun    -  Function to execute
 %% CArg   -  Extra command line arguments to use when starting
-%%           the shielded node. 
+%%           the shielded node.
 %%
 %% If Fun is successfully executed, the result is returned.
 %%
@@ -2037,8 +2237,8 @@ is_native(Mod) ->
 %% The given String will occur in the comment field
 %% of the table on the test suite result page. If
 %% called several times, only the last comment is
-%% printed. 
-%% comment/1 is also overwritten by the return value 
+%% printed.
+%% comment/1 is also overwritten by the return value
 %% {comment,Comment} or fail/1 (which prints Reason
 %% as a comment).
 comment(String) ->
@@ -2154,7 +2354,7 @@ purify_new_fds_inuse() ->
 	{'EXIT', _} -> false;
 	Inuse when is_integer(Inuse) -> Inuse
     end.
-    
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% purify_format(Format, Args) -> ok
 %% Format = string()
@@ -2202,9 +2402,9 @@ local_or_remote_apply({M,F,A} = MFA) ->
 request(Sock,Request) ->
     gen_tcp:send(Sock,<<1,(term_to_binary(Request))/binary>>).
 
-%% 
+%%
 %% Generic receive function for communication with host
-%% 
+%%
 recv(Sock) ->
     case gen_tcp:recv(Sock,0) of
 	{error,closed} ->
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 4cb5863955..7cd58642d0 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -27,7 +27,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% MODULE DEPENDENCIES:
-%% HARD TO REMOVE: erlang, lists, io_lib, gen_server, file, io, string, 
+%% HARD TO REMOVE: erlang, lists, io_lib, gen_server, file, io, string,
 %%                 code, ets, rpc, gen_tcp, inet, erl_tar, sets,
 %%                 test_server, test_server_sup, test_server_node
 %% EASIER TO REMOVE: filename, filelib, lib, re
@@ -36,7 +36,7 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% ARCHITECTURE
-%% 
+%%
 %% The Erlang Test Server can be run on the target machine (local target)
 %% or towards a remote target. The execution flow is mainly the same in
 %% both cases, but with a remote target the test cases are (obviously)
@@ -44,11 +44,11 @@
 %% socket connections because the host should not be introduced as an
 %% additional node in the distributed erlang system in which the test
 %% cases are run.
-%% 
-%% 
+%%
+%%
 %% Local Target:
 %% =============
-%% 
+%%
 %%   -----
 %%   |   |  test_server_ctrl ({global,test_server})
 %%   ----- (test_server_ctrl.erl)
@@ -62,33 +62,33 @@
 %%   -----
 %%   |   | CaseProc
 %%   ----- (test_server.erl)
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %% test_server_ctrl is the main process in the system. It is a registered
 %% process, and it will always be alive when testing is ongoing.
 %% test_server_ctrl initiates testing and monitors JobProc(s).
-%% 
-%% When target is local, and Test Server is *not* being used by a framework 
-%% application (where it might cause duplicate name problems in a distributed 
-%% test environment), the process is globally registered as 'test_server' 
+%%
+%% When target is local, and Test Server is *not* being used by a framework
+%% application (where it might cause duplicate name problems in a distributed
+%% test environment), the process is globally registered as 'test_server'
 %% to be able to simulate the {global,test_server} process on a remote target.
-%% 
-%% JobProc is spawned for each 'job' added to the test_server_ctrl. 
+%%
+%% JobProc is spawned for each 'job' added to the test_server_ctrl.
 %% A job can mean one test case, one test suite or one spec.
 %% JobProc creates and writes logs and presents results from testing.
 %% JobProc is the group leader for CaseProc.
-%% 
+%%
 %% CaseProc is spawned for each test case. It runs the test case and
 %% sends results and any other information to its group leader - JobProc.
-%% 
-%% 
-%% 
+%%
+%%
+%%
 %% Remote Target:
 %% ==============
-%% 
+%%
 %% 		HOST				TARGET
-%% 
+%%
 %% 	                   -----  MainSock   -----
 %%        test_server_ctrl |   |- - - - - - -|   | {global,test_server}
 %%  (test_server_ctrl.erl) -----	     ----- (test_server.erl)
@@ -102,36 +102,36 @@
 %% 					     -----
 %% 					     |   | CaseProc
 %% 					     ----- (test_server.erl)
-%% 
-%% 
-%% 
-%% 
+%%
+%%
+%%
+%%
 %% A separate test_server process only exists when target is remote. It
 %% is then the main process on target. It is started when test_server_ctrl
 %% is started, and a socket connection is established between
 %% test_server_ctrl and test_server. The following information can be sent
 %% over MainSock:
-%% 
+%%
 %% HOST			TARGET
 %%  -> {target_info, TargetInfo}     (during initiation)
 %%  <- {job_proc_killed,Name,Reason} (if a JobProcT dies unexpectedly)
 %%  -> {job,Port,Name}               (to start a new JobProcT)
-%% 
-%% 
+%%
+%%
 %% When target is remote, JobProc is split into to processes: JobProcH
 %% executing on Host and JobProcT executing on Target. (The two processes
 %% execute the same code as JobProc does when target is local.) JobProcH
 %% and JobProcT communicates over a socket connection. The following
 %% information can be sent over JobSock:
-%% 
+%%
 %% HOST			TARGET
 %%  -> {test_case, Case}          To start a new test case
 %%  -> {beam,Mod}                 .beam file as binary to be loaded
 %% 				  on target, e.g. a test suite
 %%  -> {datadir,Tarfile}          Content of the datadir for a test suite
 %%  <- {apply,MFA}                MFA to be applied on host, ignore return;
-%% 				  (apply is used for printing information in 
-%% 				  log or console) 
+%% 				  (apply is used for printing information in
+%% 				  log or console)
 %%  <- {sync_apply,MFA}           MFA to be applied on host, wait for return
 %% 				  (used for starting and stopping slave nodes)
 %%  -> {sync_apply,MFA}           MFA to be applied on target, wait for return
@@ -141,7 +141,7 @@
 %%  <- {crash_dumps,Tarfile}      When a test case is finished
 %%  -> job_done			  When a job is finished
 %%  <- {privdir,Privdir}          When a job is finished
-%% 
+%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
@@ -151,21 +151,24 @@
 
 %%% OPERATOR INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -export([add_spec/1, add_dir/2, add_dir/3]).
--export([add_module/1, add_module/2, add_case/2, add_case/3, add_cases/2,
-	 add_cases/3]).
+-export([add_module/1, add_module/2,
+	 add_conf/3,
+	 add_case/2, add_case/3, add_cases/2, add_cases/3]).
 -export([add_dir_with_skip/3, add_dir_with_skip/4, add_tests_with_skip/3]).
 -export([add_module_with_skip/2, add_module_with_skip/3,
+	 add_conf_with_skip/4,
 	 add_case_with_skip/3, add_case_with_skip/4,
 	 add_cases_with_skip/3, add_cases_with_skip/4]).
 -export([jobs/0, run_test/1, wait_finish/0, idle_notify/1,
 	 abort_current_testcase/1, abort/0]).
 -export([start_get_totals/1, stop_get_totals/0]).
 -export([get_levels/0, set_levels/3]).
--export([multiply_timetraps/1]).
+-export([multiply_timetraps/1, scale_timetraps/1, get_timetrap_parameters/0]).
 -export([cover/2, cover/3, cover/7,
 	 cross_cover_analyse/1, cross_cover_analyse/2, trc/1, stop_trace/0]).
 -export([testcase_callback/1]).
 -export([set_random_seed/1]).
+-export([kill_slavenodes/0]).
 
 %%% TEST_SERVER INTERFACE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -export([output/2, print/2, print/3, print_timestamp/2]).
@@ -207,13 +210,15 @@
 
 -define(pl2a(M), test_server_sup:package_atom(M)).
 -define(void_fun, fun() -> ok end).
--define(mod_result(X), if X == skip -> skipped; 
-			  X == auto_skip -> skipped; 
+-define(mod_result(X), if X == skip -> skipped;
+			  X == auto_skip -> skipped;
 			  true -> X end).
 
--record(state,{jobs=[],levels={1,19,10},multiply_timetraps=1,finish=false,
+-record(state,{jobs=[],levels={1,19,10},
+	       multiply_timetraps=1,scale_timetraps=true,
+	       finish=false,
 	       target_info, trc=false, cover=false, wait_for_node=[],
-	       testcase_callback=undefined, idle_notify=[], 
+	       testcase_callback=undefined, idle_notify=[],
 	       get_totals=false, random_seed=undefined}).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -222,21 +227,28 @@
 add_dir(Name, Job=[Dir|_Dirs]) when is_list(Dir) ->
     add_job(cast_to_list(Name),
 	    lists:map(fun(D)-> {dir,cast_to_list(D)} end, Job));
-add_dir(Name, Dir) -> 
+add_dir(Name, Dir) ->
     add_job(cast_to_list(Name), {dir,cast_to_list(Dir)}).
 
 add_dir(Name, Job=[Dir|_Dirs], Pattern) when is_list(Dir) ->
     add_job(cast_to_list(Name),
 	    lists:map(fun(D)-> {dir,cast_to_list(D),
 				cast_to_list(Pattern)} end, Job));
-add_dir(Name, Dir, Pattern) -> 
+add_dir(Name, Dir, Pattern) ->
     add_job(cast_to_list(Name), {dir,cast_to_list(Dir),cast_to_list(Pattern)}).
 
 add_module(Mod) when is_atom(Mod) ->
     add_job(atom_to_list(Mod), {Mod,all}).
+
 add_module(Name, Mods) when is_list(Mods) ->
     add_job(cast_to_list(Name), lists:map(fun(Mod) -> {Mod,all} end, Mods)).
 
+add_conf(Name, Mod, Conf) when is_tuple(Conf) ->
+    add_job(cast_to_list(Name), {Mod,[Conf]});
+
+add_conf(Name, Mod, Confs) when is_list(Confs) ->
+    add_job(cast_to_list(Name), {Mod,Confs}).
+
 add_case(Mod, Case) when is_atom(Mod), is_atom(Case) ->
     add_job(atom_to_list(Mod), {Mod,Case}).
 
@@ -256,14 +268,14 @@ add_spec(Spec) ->
 	false -> {error,nofile}
     end.
 
-%% This version of the interface is to be used if there are 
+%% This version of the interface is to be used if there are
 %% suites or cases that should be skipped.
 
 add_dir_with_skip(Name, Job=[Dir|_Dirs], Skip) when is_list(Dir) ->
     add_job(cast_to_list(Name),
 	    lists:map(fun(D)-> {dir,cast_to_list(D)} end, Job),
 	    Skip);
-add_dir_with_skip(Name, Dir, Skip) -> 
+add_dir_with_skip(Name, Dir, Skip) ->
     add_job(cast_to_list(Name), {dir,cast_to_list(Dir)}, Skip).
 
 add_dir_with_skip(Name, Job=[Dir|_Dirs], Pattern, Skip) when is_list(Dir) ->
@@ -271,7 +283,7 @@ add_dir_with_skip(Name, Job=[Dir|_Dirs], Pattern, Skip) when is_list(Dir) ->
 	    lists:map(fun(D)-> {dir,cast_to_list(D),
 				cast_to_list(Pattern)} end, Job),
 	    Skip);
-add_dir_with_skip(Name, Dir, Pattern, Skip) -> 
+add_dir_with_skip(Name, Dir, Pattern, Skip) ->
     add_job(cast_to_list(Name),
 	    {dir,cast_to_list(Dir),cast_to_list(Pattern)}, Skip).
 
@@ -281,6 +293,12 @@ add_module_with_skip(Mod, Skip) when is_atom(Mod) ->
 add_module_with_skip(Name, Mods, Skip) when is_list(Mods) ->
     add_job(cast_to_list(Name), lists:map(fun(Mod) -> {Mod,all} end, Mods), Skip).
 
+add_conf_with_skip(Name, Mod, Conf, Skip) when is_tuple(Conf) ->
+    add_job(cast_to_list(Name), {Mod,[Conf]}, Skip);
+
+add_conf_with_skip(Name, Mod, Confs, Skip) when is_list(Confs) ->
+    add_job(cast_to_list(Name), {Mod,Confs}, Skip).
+
 add_case_with_skip(Mod, Case, Skip) when is_atom(Mod), is_atom(Case) ->
     add_job(atom_to_list(Mod), {Mod,Case}, Skip).
 
@@ -295,15 +313,14 @@ add_cases_with_skip(Name, Mod, Cases, Skip) when is_atom(Mod), is_list(Cases) ->
 
 add_tests_with_skip(LogDir, Tests, Skip) ->
     add_job(LogDir,
-	    lists:map(fun({Dir,all,all}) -> 
+	    lists:map(fun({Dir,all,all}) ->
 			      {Dir,{dir,Dir}};
-			 ({Dir,Mods,all}) -> 
+			 ({Dir,Mods,all}) ->
 			      {Dir,lists:map(fun(M) -> {M,all} end, Mods)};
 			 ({Dir,Mod,Cases}) ->
 			      {Dir,{Mod,Cases}}
 		      end, Tests),
 	    Skip).
-		      
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% COMMAND LINE INTERFACE
@@ -315,7 +332,7 @@ parse_cmd_line(['SPEC',Spec|Cmds], SpecList, Names, Param, Trc, Cov, TCCB) ->
     case file:consult(Spec) of
 	{ok, TermList} ->
 	    Name = filename:rootname(Spec),
-	    parse_cmd_line(Cmds, TermList++SpecList, [Name|Names], Param, 
+	    parse_cmd_line(Cmds, TermList++SpecList, [Name|Names], Param,
 			   Trc, Cov, TCCB);
 	{error,Reason} ->
 	    io:format("Can't open ~s: ~p\n",
@@ -406,7 +423,7 @@ run_test(CommandLine) ->
     end,
     testcase_callback(TCCB),
     add_job(Name, {command_line,SpecList}),
-    
+
     %% adding of jobs involves file i/o which may take long time
     %% when running a nfs mounted file system (VxWorks).
     case controller_call(get_target_info) of
@@ -479,6 +496,12 @@ set_levels(Show, Major, Minor) ->
 multiply_timetraps(N) ->
     controller_call({multiply_timetraps,N}).
 
+scale_timetraps(Bool) ->
+    controller_call({scale_timetraps,Bool}).
+
+get_timetrap_parameters() ->
+    controller_call(get_timetrap_parameters).
+
 trc(TraceFile) ->
     controller_call({trace,TraceFile}, 2*?ACCEPT_TIMEOUT).
 
@@ -503,6 +526,9 @@ testcase_callback(ModFunc) ->
 set_random_seed(Seed) ->
     controller_call({set_random_seed,Seed}).
 
+kill_slavenodes() ->
+    controller_call(kill_slavenodes).
+
 get_hosts() ->
     get(test_server_hosts).
 
@@ -511,6 +537,8 @@ get_target_os_type() ->
 	undefined ->
 	    %% This is probably called on the target node
 	    os:type();
+	Pid when Pid =:= self() ->
+	    os:type();
 	_pid ->
 	    %% This is called on the controller, e.g. from a
 	    %% specification clause of a test case
@@ -551,7 +579,7 @@ controller_call(Arg, Timeout) ->
 	Other ->
 	    Other
     end.
-    
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -615,9 +643,9 @@ contact_main_target(local) ->
     %% When used by a general framework, global registration of
     %% test_server should not be required.
     case os:getenv("TEST_SERVER_FRAMEWORK") of
-	false ->
+	FW when FW =:= false; FW =:= "undefined" ->
 	    %% Local target! The global test_server process implemented by
-	    %% test_server.erl will not be started, so we simulate it by 
+	    %% test_server.erl will not be started, so we simulate it by
 	    %% globally registering this process instead.
 	    global:sync(),
 	    case global:whereis_name(test_server) of
@@ -681,9 +709,9 @@ read_parameters([], Par) when Par#par.type==undefined ->
 read_parameters([], Par) when Par#par.target==undefined ->
     {error, {missing_mandatory_parameter,target}};
 read_parameters([], Par0) ->
-    Par = 
+    Par =
 	case {Par0#par.type, Par0#par.master} of
-	    {ose, undefined} -> 
+	    {ose, undefined} ->
 		%% Use this node as master and bootserver for target
 		%% and slave nodes
 		Par0#par{master = atom_to_list(node()),
@@ -691,10 +719,10 @@ read_parameters([], Par0) ->
 	    {ose, _Master} ->
 		%% Master for target and slave nodes was defined in parameterfile
 		Par0;
-	    _ -> 
+	    _ ->
 		%% Use target as master for slave nodes,
 		%% (No master is used for target)
-		Par0#par{master="test_server@" ++ Par0#par.target} 
+		Par0#par{master="test_server@" ++ Par0#par.target}
 	end,
     {ok,Par}.
 
@@ -708,7 +736,7 @@ naming() ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% handle_call(kill_slavenodes, From, State) -> ok
 %%
-%% Kill all slave nodes that remain after a test case 
+%% Kill all slave nodes that remain after a test case
 %% is completed.
 %%
 handle_call(kill_slavenodes, _From, State) ->
@@ -736,7 +764,7 @@ handle_call(get_hosts, _From, State) ->
     {reply, Hosts, State};
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% handle_call({add_job,Dir,Name,TopCase,Skip}, _, State) -> 
+%% handle_call({add_job,Dir,Name,TopCase,Skip}, _, State) ->
 %%     ok | {error,Reason}
 %%
 %% Dir = string()
@@ -760,7 +788,7 @@ handle_call(get_hosts, _From, State) ->
 
 handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
     LogDir = Dir ++ ?logdir_ext,
-    ExtraTools = 
+    ExtraTools =
 	case State#state.cover of
 	    false -> [];
 	    {App,Analyse} -> [{cover,App,Analyse}]
@@ -776,19 +804,21 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
 		{spec,SpecName} ->
 		    Pid = spawn_tester(
 			    ?MODULE, do_spec,
-			    [SpecName,State#state.multiply_timetraps],
-			    LogDir, Name, State#state.levels, 
+			    [SpecName,{State#state.multiply_timetraps,
+				       State#state.scale_timetraps}],
+			    LogDir, Name, State#state.levels,
 			    State#state.testcase_callback, ExtraTools1),
 		    NewJobs = [{Name,Pid}|State#state.jobs],
-		    {reply, ok, State#state{jobs=NewJobs}};		    
+		    {reply, ok, State#state{jobs=NewJobs}};
 		{command_line,SpecList} ->
 		    Pid = spawn_tester(
 			    ?MODULE, do_spec_list,
-			    [SpecList,State#state.multiply_timetraps],
-			    LogDir, Name, State#state.levels, 
+			    [SpecList,{State#state.multiply_timetraps,
+				       State#state.scale_timetraps}],
+			    LogDir, Name, State#state.levels,
 			    State#state.testcase_callback, ExtraTools1),
 		    NewJobs = [{Name,Pid}|State#state.jobs],
-		    {reply, ok, State#state{jobs=NewJobs}};		    		
+		    {reply, ok, State#state{jobs=NewJobs}};
 		TopCase ->
 		    case State#state.get_totals of
 			{CliPid,Fun} ->
@@ -798,10 +828,11 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
 			_ ->
 			    Cfg = make_config([]),
 			    Pid = spawn_tester(
-				    ?MODULE, do_test_cases, 
+				    ?MODULE, do_test_cases,
 				    [TopCase,Skip,Cfg,
-				     State#state.multiply_timetraps],
-				    LogDir, Name, State#state.levels, 
+				     {State#state.multiply_timetraps,
+				      State#state.scale_timetraps}],
+				    LogDir, Name, State#state.levels,
 				    State#state.testcase_callback, ExtraTools1),
 			    NewJobs = [{Name,Pid}|State#state.jobs],
 			    {reply, ok, State#state{jobs=NewJobs}}
@@ -827,7 +858,7 @@ handle_call(jobs, _From, State) ->
 %% handle_call({abort_current_testcase,Reason}, _, State) -> Result
 %% Reason = term()
 %% Result = ok | {error,no_testcase_running}
-%% 
+%%
 %% Attempts to abort the test case that's currently running.
 
 handle_call({abort_current_testcase,Reason}, _From, State) ->
@@ -855,7 +886,7 @@ handle_call({abort_current_testcase,Reason}, _From, State) ->
 handle_call({finish,Fini}, _From, State) ->
     case State#state.jobs of
 	[] ->
-	    lists:foreach(fun({Cli,Fun}) -> Fun(Cli) end, 
+	    lists:foreach(fun({Cli,Fun}) -> Fun(Cli) end,
 			  State#state.idle_notify),
 	    State2 = State#state{finish=false},
 	    {stop,shutdown,{ok,self()}, State2};
@@ -878,7 +909,7 @@ handle_call({idle_notify,Fun}, {Cli,_Ref}, State) ->
 	    {reply, {ok,self()}, State};
 	_ ->
 	    Subscribed = State#state.idle_notify,
-	    {reply, {ok,self()}, 
+	    {reply, {ok,self()},
 	     State#state{idle_notify=[{Cli,Fun}|Subscribed]}}
     end;
 
@@ -891,7 +922,7 @@ handle_call({idle_notify,Fun}, {Cli,_Ref}, State) ->
 
 handle_call({start_get_totals,Fun}, {Cli,_Ref}, State) ->
     {reply, {ok,self()}, State#state{get_totals={Cli,Fun}}};
-     
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% handle_call(stop_get_totals, From, State) -> ok
 %%
@@ -942,11 +973,31 @@ handle_call({multiply_timetraps,N}, _From, State) ->
     {reply,ok,State#state{multiply_timetraps=N}};
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% handle_call({scale_timetraps,Bool}, _, State) -> ok
+%% Bool = true | false
+%%
+%% Specifies if test_server should scale the timetrap value
+%% automatically if e.g. cover is running.
+
+handle_call({scale_timetraps,Bool}, _From, State) ->
+    {reply,ok,State#state{scale_timetraps=Bool}};
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% handle_call(get_timetrap_parameters, _, State) -> {Multiplier,Scale}
+%% Multiplier = integer() | infinity
+%% Scale = true | false
+%%
+%% Returns the parameter values that affect timetraps.
+
+handle_call(get_timetrap_parameters, _From, State) ->
+    {reply,{State#state.multiply_timetraps,State#state.scale_timetraps},State};
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% handle_call({trace,TraceFile}, _, State) -> ok | {error,Reason}
 %%
-%% Starts a separate node (trace control node) which 
+%% Starts a separate node (trace control node) which
 %% starts tracing on target and all slave nodes
-%% 
+%%
 %% TraceFile is a text file with elements of type
 %% {Trace,Mod,TracePattern}.
 %% {Trace,Mod,Func,TracePattern}.
@@ -955,10 +1006,10 @@ handle_call({multiply_timetraps,N}, _From, State) ->
 %% Trace = tp | tpl;  local or global call trace
 %% Mod,Func = atom(), Arity=integer(); defines what to trace
 %% TracePattern = [] | match_spec()
-%% 
+%%
 %% The 'call' trace flag is set on all processes, and then
 %% the given trace patterns are set.
- 
+
 handle_call({trace,TraceFile}, _From, State=#state{trc=false}) ->
     TI = State#state.target_info,
     case test_server_node:start_tracer_node(TraceFile, TI) of
@@ -993,7 +1044,7 @@ handle_call({cover,App,Analyse}, _From, State) ->
 %% handle_call({testcase_callback,{Mod,Func}}, _, State) -> ok | {error,Reason}
 %%
 %% Add a callback function that will be called before and after every
-%% test case (on the test case process): 
+%% test case (on the test case process):
 %%
 %% Mod:Func(Suite,TestCase,InitOrEnd,Config)
 %%
@@ -1001,9 +1052,9 @@ handle_call({cover,App,Analyse}, _From, State) ->
 
 handle_call({testcase_callback,ModFunc}, _From, State) ->
     case ModFunc of
-	{Mod,Func} ->	    
+	{Mod,Func} ->
 	    case code:is_loaded(Mod) of
-		{file,_} -> 
+		{file,_} ->
 		    ok;
 		false ->
 		    code:load_file(Mod)
@@ -1065,15 +1116,15 @@ handle_call({start_node, Name, Type, Options}, From, State) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% handle_call({wait_for_node,Node}, _, State) -> ok
 %%
-%% Waits for a new node to take contact. Used if 
+%% Waits for a new node to take contact. Used if
 %% node is started with option {wait,false}
 
 handle_call({wait_for_node, Node}, From, State) ->
-    NewWaitList = 
+    NewWaitList =
 	case ets:lookup(slave_tab,Node) of
-	    [] -> 
+	    [] ->
 		[{Node,From}|State#state.wait_for_node];
-	    _ -> 
+	    _ ->
 		gen_server:reply(From,ok),
 		State#state.wait_for_node
 	end,
@@ -1086,7 +1137,7 @@ handle_call({wait_for_node, Node}, From, State) ->
 %% - the node is really stopped by test_server when this returns.
 
 handle_call({stop_node, Name}, _From, State) ->
-    R = test_server_node:stop_node(Name, State#state.target_info),    
+    R = test_server_node:stop_node(Name, State#state.target_info),
     {reply, R, State};
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1112,7 +1163,7 @@ handle_cast({node_started,Node}, State) ->
 	false -> ok;
 	Trc -> test_server_node:trace_nodes(Trc, [Node])
     end,
-    NewWaitList = 
+    NewWaitList =
 	case lists:keysearch(Node,1,State#state.wait_for_node) of
 	    {value,{Node,From}} ->
 		gen_server:reply(From, ok),
@@ -1128,10 +1179,10 @@ handle_cast({node_started,Node}, State) ->
 %% Reason = term()
 %%
 %% Handles exit messages from linked processes. Only test suites and
-%% possibly a target client are expected to be linked. 
+%% possibly a target client are expected to be linked.
 %% When a test suite terminates, it is removed from the job queue.
 %% If a target client terminates it means that we lost contact with
-%% target. The test_server_ctrl process is terminated, and teminate/2 
+%% target. The test_server_ctrl process is terminated, and teminate/2
 %% will do the cleanup
 
 handle_info({'EXIT',Pid,Reason}, State) ->
@@ -1139,7 +1190,7 @@ handle_info({'EXIT',Pid,Reason}, State) ->
 	false ->
 	    TI = State#state.target_info,
 	    case TI#target_info.target_client of
-		Pid -> 
+		Pid ->
 		    %% The target client died - lost contact with target
 		    {stop,{lost_contact_with_target,Reason},State};
 		_other ->
@@ -1160,13 +1211,13 @@ handle_info({'EXIT',Pid,Reason}, State) ->
 	    State2 = State#state{jobs=NewJobs},
 	    case NewJobs of
 		[] ->
-		    lists:foreach(fun({Cli,Fun}) -> Fun(Cli) end, 
+		    lists:foreach(fun({Cli,Fun}) -> Fun(Cli) end,
 				  State2#state.idle_notify),
 		    case State2#state.finish of
 			false ->
 			    {noreply,State2#state{idle_notify=[]}};
 			_ ->			% true | abort
-			    %% test_server:finish() has been called and 
+			    %% test_server:finish() has been called and
 			    %% there are no jobs in the job queue =>
 			    %% stop the test_server_ctrl
 			    {stop,shutdown,State2#state{finish=false}}
@@ -1174,7 +1225,7 @@ handle_info({'EXIT',Pid,Reason}, State) ->
 		_ ->				% pending jobs
 		    case State2#state.finish of
 			abort ->		% abort test now!
-			    lists:foreach(fun({Cli,Fun}) -> Fun(Cli) end, 
+			    lists:foreach(fun({Cli,Fun}) -> Fun(Cli) end,
 					  State2#state.idle_notify),
 			    {stop,shutdown,State2#state{finish=false}};
 			_ ->			% true | false
@@ -1194,9 +1245,9 @@ handle_info({tcp,_MainSock,<<1,Request/binary>>}, State) ->
     case binary_to_term(Request) of
 	{job_proc_killed,Name,Reason} ->
 	    %% The only purpose of this is to inform the user about what
-	    %% happened on target. 
+	    %% happened on target.
 	    %% The local job proc will soon be killed by the closed socket or
-	    %% because the job is finished. Then the above clause ('EXIT') will 
+	    %% because the job is finished. Then the above clause ('EXIT') will
 	    %% handle the problem.
 	    io:format("Suite ~s was killed on remote target with reason"
 		      " ~p\n", [Name,Reason]);
@@ -1204,13 +1255,13 @@ handle_info({tcp,_MainSock,<<1,Request/binary>>}, State) ->
 	    ignore
     end,
     {noreply,State};
-    
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% handle_info({tcp_closed,Sock}, State)
 %%
 %% A Socket was closed. This indicates that a node died.
-%% This can be 
+%% This can be
 %% *Target node (if remote)
 %% *Slave or peer node started by a test suite
 %% *Trace controll node
@@ -1221,10 +1272,10 @@ handle_info({tcp_closed,Sock}, State=#state{trc=Sock}) ->
     {noreply,State#state{trc=false}};
 handle_info({tcp_closed,Sock}, State) ->
     case test_server_node:nodedown(Sock,State#state.target_info) of
-	target_died -> 
+	target_died ->
 	    %% terminate/2 will do the cleanup
 	    {stop,target_died,State};
-	_ -> 
+	_ ->
 	    {noreply,State}
     end;
 
@@ -1260,7 +1311,7 @@ kill_all_jobs([]) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% spawn_tester(Mod, Func, Args, Dir, Name, Levels, 
+%% spawn_tester(Mod, Func, Args, Dir, Name, Levels,
 %%              TestCaseCallback, ExtraTools) -> Pid
 %% Mod = atom()
 %% Func = atom()
@@ -1268,23 +1319,23 @@ kill_all_jobs([]) ->
 %% Dir = string()
 %% Name = string()
 %% Levels = {integer(),integer(),integer()}
-%% TestCaseCallback = {CBMod,CBFunc} | undefined 
+%% TestCaseCallback = {CBMod,CBFunc} | undefined
 %% ExtraTools = [ExtraTool,...]
 %% ExtraTool = CoverInfo | TraceInfo | RandomSeed
 %%
 %% Spawns a test suite execute-process, just an ordinary spawn, except
 %% that it will set a lot of dictionary information before starting the
 %% named function. Also, the execution is timed and protected by a catch.
-%% When the named function is done executing, a summary of the results 
+%% When the named function is done executing, a summary of the results
 %% is printed to the log files.
 
 spawn_tester(Mod, Func, Args, Dir, Name, Levels, TCCallback, ExtraTools) ->
     spawn_link(
-      fun() -> init_tester(Mod, Func, Args, Dir, Name, Levels, 
-			   TCCallback, ExtraTools) 
+      fun() -> init_tester(Mod, Func, Args, Dir, Name, Levels,
+			   TCCallback, ExtraTools)
       end).
 
-init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev}, 
+init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev},
 	    TCCallback, ExtraTools) ->
     process_flag(trap_exit, true),
     put(test_server_name, Name),
@@ -1324,7 +1375,7 @@ init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev},
 	    {Skipped,_} -> {Skipped,io_lib:format(", ~p Skipped", [Skipped])}
 	end,
     OkN = get(test_server_ok),
-    FailedN = get(test_server_failed), 
+    FailedN = get(test_server_failed),
     print(html,"<tr><td></td><td><b>TOTAL</b></td><td></td><td></td>"
 	  "<td>~.3fs</td><td><b>~s</b></td><td>~p Ok, ~p Failed~s of ~p</td></tr>\n",
 	  [Time,SuccessStr,OkN,FailedN,SkipStr,OkN+FailedN+SkippedN]).
@@ -1338,9 +1389,9 @@ ts_tc(M, F, A) ->
     {Elapsed,Val}.
 
 elapsed_time(Before, After) ->
-    (element(1,After)*1000000000000 + 
+    (element(1,After)*1000000000000 +
      element(2,After)*1000000 + element(3,After)) -
-    (element(1,Before)*1000000000000 + 
+    (element(1,Before)*1000000000000 +
      element(2,Before)*1000000 + element(3,Before)).
 
 start_extra_tools(ExtraTools) ->
@@ -1378,28 +1429,32 @@ stop_extra_tools([], _) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% do_spec(SpecName, MultiplyTimetrap) -> {error,Reason} | exit(Result)
+%% do_spec(SpecName, TimetrapSpec) -> {error,Reason} | exit(Result)
 %% SpecName = string()
+%% TimetrapSpec = MultiplyTimetrap | {MultiplyTimetrap,ScaleTimetrap}
 %% MultiplyTimetrap = integer() | infinity
+%% ScaleTimetrap = bool()
 %%
 %% Reads the named test suite specification file, and executes it.
 %%
-%% This function is meant to be called by a process created by 
+%% This function is meant to be called by a process created by
 %% spawn_tester/7, which sets up some necessary dictionary values.
 
-do_spec(SpecName, MultiplyTimetrap) when is_list(SpecName) ->
+do_spec(SpecName, TimetrapSpec) when is_list(SpecName) ->
     case file:consult(SpecName) of
 	{ok,TermList} ->
-	    do_spec_list(TermList,MultiplyTimetrap);
+	    do_spec_list(TermList,TimetrapSpec);
 	{error,Reason} ->
 	    io:format("Can't open ~s: ~p\n", [SpecName,Reason]),
 	    {error,{cant_open_spec,Reason}}
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% do_spec_list(TermList) -> exit(Result)
+%% do_spec_list(TermList, TimetrapSpec) -> exit(Result)
 %% TermList = [term()|...]
+%% TimetrapSpec = MultiplyTimetrap | {MultiplyTimetrap,ScaleTimetrap}
 %% MultiplyTimetrap = integer() | infinity
+%% ScaleTimetrap = bool()
 %%
 %% Executes a list of test suite specification commands. The following
 %% commands are available, and may occur zero or more times (if several,
@@ -1422,21 +1477,21 @@ do_spec(SpecName, MultiplyTimetrap) when is_list(SpecName) ->
 %% nodenames will be generated from the local host.
 %%
 %% {hosts, Hosts} Specifies a list of available hosts on which to start
-%% slave nodes. It is used when the {remote, true} option is given to the 
+%% slave nodes. It is used when the {remote, true} option is given to the
 %% test_server:start_node/3 function. Also, if {require_nodenames, Num} is
-%% contained in the TermList, the generated nodenames will be spread over 
+%% contained in the TermList, the generated nodenames will be spread over
 %% all hosts given in this Hosts list. The hostnames are given as atoms or
 %% strings.
-%% 
+%%
 %% {diskless, true}</c></tag> is kept for backwards compatiblilty and
 %% should not be used. Use a configuration test case instead.
-%% 
-%% This function is meant to be called by a process created by 
+%%
+%% This function is meant to be called by a process created by
 %% spawn_tester/7, which sets up some necessary dictionary values.
 
-do_spec_list(TermList0, MultiplyTimetrap) ->
+do_spec_list(TermList0, TimetrapSpec) ->
     Nodes = [],
-    TermList = 
+    TermList =
 	case lists:keysearch(hosts, 1, TermList0) of
 	    {value, {hosts, Hosts0}} ->
 		Hosts = lists:map(fun(H) -> cast_to_list(H) end, Hosts0),
@@ -1447,7 +1502,7 @@ do_spec_list(TermList0, MultiplyTimetrap) ->
 	end,
     DefaultConfig = make_config([{nodes,Nodes}]),
     {TopCases,SkipList,Config} = do_spec_terms(TermList, [], [], DefaultConfig),
-    do_test_cases(TopCases, SkipList, Config, MultiplyTimetrap).
+    do_test_cases(TopCases, SkipList, Config, TimetrapSpec).
 
 do_spec_terms([], TopCases, SkipList, Config) ->
     {TopCases,SkipList,Config};
@@ -1470,21 +1525,21 @@ do_spec_terms([{default_timeout,Tmo}|Terms], TopCases, SkipList, Config) ->
 do_spec_terms([{require_nodenames,NumNames}|Terms], TopCases, SkipList, Config) ->
     NodeNames0=generate_nodenames(NumNames),
     NodeNames=lists:delete([], NodeNames0),
-    do_spec_terms(Terms, TopCases, SkipList, 
+    do_spec_terms(Terms, TopCases, SkipList,
 		  update_config(Config, {nodenames,NodeNames}));
 do_spec_terms([Other|Terms], TopCases, SkipList, Config) ->
     io:format("** WARNING: Spec file contains unknown directive ~p\n",
 	      [Other]),
     do_spec_terms(Terms, TopCases, SkipList, Config).
-    
+
 
 
 generate_nodenames(Num) ->
     Hosts = case controller_call(get_hosts) of
-		[] -> 
+		[] ->
 		    TI = controller_call(get_target_info),
 		    [TI#target_info.host];
-		List -> 
+		List ->
 		    List
 	    end,
     generate_nodenames2(Num, Hosts, []).
@@ -1511,25 +1566,25 @@ temp_nodename([Chr|Base], Acc) ->
 %% NoOfCases = integer() | unknown
 %%
 %% 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 
+%% If there's a conf group in TestSpec with a repeat property, the total number
 %% of cases can not be calculated and NoOfCases = unknown.
 count_test_cases(TopCases, SkipCases) when is_list(TopCases) ->
     case collect_all_cases(TopCases, SkipCases) of
-	{error,_} ->
-	    error;
+	{error,_Why} = Error ->
+	    Error;
 	TestSpec ->
 	    {get_suites(TestSpec, []),
 	     case remove_conf(TestSpec) of
 		 {repeats,_} ->
 		     unknown;
-		 TestSpec1 ->		    
+		 TestSpec1 ->
 		     length(TestSpec1)
 	     end}
     end;
 
 count_test_cases(TopCase, SkipCases) ->
     count_test_cases([TopCase], SkipCases).
-	  
+
 
 remove_conf(Cases) ->
     remove_conf(Cases, [], false).
@@ -1538,13 +1593,15 @@ remove_conf([{conf, _Ref, Props, _MF}|Cases], NoConf, Repeats) ->
     case get_repeat(Props) of
 	undefined ->
 	    remove_conf(Cases, NoConf, Repeats);
+	{_RepType,1} ->
+	    remove_conf(Cases, NoConf, Repeats);
 	_ ->
 	    remove_conf(Cases, NoConf, true)
     end;
 remove_conf([{make,_Ref,_MF}|Cases], NoConf, Repeats) ->
     remove_conf(Cases, NoConf, Repeats);
-remove_conf([{skip_case,{Type,_Ref,_MF,_Cmt}}|Cases], 
-	    NoConf, Repeats) when Type==conf; 
+remove_conf([{skip_case,{Type,_Ref,_MF,_Cmt}}|Cases],
+	    NoConf, Repeats) when Type==conf;
 				   Type==make ->
     remove_conf(Cases, NoConf, Repeats);
 remove_conf([C|Cases], NoConf, Repeats) ->
@@ -1582,22 +1639,30 @@ add_mod(Mod, Mods) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% do_test_cases(TopCases, SkipCases, Config, MultiplyTimetrap) -> 
+%% do_test_cases(TopCases, SkipCases, Config, TimetrapSpec) ->
 %%    exit(Result)
 %%
 %% TopCases = term()      (See collect_cases/3)
 %% SkipCases = term()     (See collect_cases/3)
 %% Config = term()        (See collect_cases/3)
+%% TimetrapSpec = MultiplyTimetrap | {MultiplyTimetrap,ScaleTimetrap}
 %% MultiplyTimetrap = integer() | infinity
+%% ScaleTimetrap = bool()
 %%
 %% Initializes and starts the test run, for "ordinary" test suites.
 %% Creates log directories and log files, inserts initial timestamps and
 %% configuration information into the log files.
 %%
-%% This function is meant to be called by a process created by 
+%% This function is meant to be called by a process created by
 %% spawn_tester/7, which sets up some necessary dictionary values.
-
-do_test_cases(TopCases, SkipCases, Config, MultiplyTimetrap) when is_list(TopCases) ->
+do_test_cases(TopCases, SkipCases,
+	      Config, MultiplyTimetrap) when is_integer(MultiplyTimetrap);
+					     MultiplyTimetrap == infinity ->
+    do_test_cases(TopCases, SkipCases, Config, {MultiplyTimetrap,true});
+
+do_test_cases(TopCases, SkipCases,
+	      Config, TimetrapData) when is_list(TopCases),
+					 is_tuple(TimetrapData) ->
     start_log_file(),
     case collect_all_cases(TopCases, SkipCases) of
 	{error,Why} ->
@@ -1607,27 +1672,36 @@ do_test_cases(TopCases, SkipCases, Config, MultiplyTimetrap) when is_list(TopCas
 	    N = case remove_conf(TestSpec0) of
 		    {repeats,_} -> unknown;
 		    TS -> length(TS)
-		end,		    
+		end,
 	    put(test_server_cases, N),
 	    put(test_server_case_num, 0),
-	    TestSpec = 
+	    TestSpec =
 		add_init_and_end_per_suite(TestSpec0, undefined, undefined),
+
 	    TI = get_target_info(),
 	    print(1, "Starting test~s", [print_if_known(N, {", ~w test cases",[N]},
 							{" (with repeated test cases)",[]})]),
-	    test_server_sup:framework_call(report, [tests_start,
-						    {get(test_server_name),N}]),
-	    print(html,
-		  "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"
-		  "<!-- autogenerated by '"++atom_to_list(?MODULE)++"'. -->\n"
-		  "<html>\n"
-		  "<head><title>Test ~p results</title>\n"
-		  "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n"
-		  "</head>\n"
-		  "<body bgcolor=\"white\" text=\"black\" "
-		  "link=\"blue\" vlink=\"purple\" alink=\"red\">"
-		  "<h2>Results from test ~p</h2>\n",
-		  [get(test_server_name),get(test_server_name)]),
+	    Test = get(test_server_name),
+	    test_server_sup:framework_call(report, [tests_start,{Test,N}]),
+
+	    Header =
+		case test_server_sup:framework_call(overview_html_header, [Test], "") of
+		    ""  ->
+			TestName = lists:flatten(io_lib:format("~p", [Test])),
+			["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n",
+			 "<!-- autogenerated by '", atom_to_list(?MODULE), "'. -->\n",
+			 "<html>\n",
+			 "<head><title>Test ", TestName, " results</title>\n",
+			 "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
+			 "</head>\n",
+			 "<body bgcolor=\"white\" text=\"black\" ",
+			 "link=\"blue\" vlink=\"purple\" alink=\"red\">",
+			 "<h2>Results from test ", TestName, "</h2>\n"];
+		    Html ->
+			["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n",
+			 "<!-- autogenerated by '", atom_to_list(?MODULE), "'. -->\n" | Html]
+		end,
+	    print(html, Header, []),
 	    print_timestamp(html, "Test started at "),
 
 	    print(html, "<p>Host:<br>\n"),
@@ -1636,14 +1710,14 @@ do_test_cases(TopCases, SkipCases, Config, MultiplyTimetrap) when is_list(TopCas
 		  [erlang:system_info(version), code:root_dir()]),
 
 	    case os:getenv("TEST_SERVER_FRAMEWORK") of
-		false ->
+		FW when FW =:= false; FW =:= "undefined" ->
 		    print(html, "<p>Target:<br>\n"),
 		    print_who(TI#target_info.host, TI#target_info.username),
 		    print(html, "<br>Used Erlang ~s in <tt>~s</tt>.\n",
 			  [TI#target_info.version, TI#target_info.root_dir]);
 		_ ->
 		    case test_server_sup:framework_call(target_info, []) of
-			TargetInfo when is_list(TargetInfo), 
+			TargetInfo when is_list(TargetInfo),
 			                length(TargetInfo) > 0 ->
 			    print(html, "<p>Target:<br>\n"),
 			    print(html, "~s\n", [TargetInfo]);
@@ -1658,7 +1732,7 @@ do_test_cases(TopCases, SkipCases, Config, MultiplyTimetrap) when is_list(TopCas
 		  [?suitelog_name,?coverlog_name]),
 	    print(html,"<p>~s"
 		  "<p>\n"
-		  "<table border=3 cellpadding=5>"
+		  "<table bgcolor=\"white\" border=\"3\" cellpadding=\"5\">"
 		  "<tr><th>Num</th><th>Module</th><th>Case</th><th>Log</th>"
 		  "<th>Time</th><th>Result</th><th>Comment</th></tr>\n",
 		  [print_if_known(N, {"Suite contains ~p test cases.\n",[N]},
@@ -1681,12 +1755,12 @@ do_test_cases(TopCases, SkipCases, Config, MultiplyTimetrap) when is_list(TopCas
 	    print(major, "=otp_release   ~s", [TI#target_info.otp_release]),
 	    print(major, "=started       ~s",
 		   [lists:flatten(timestamp_get(""))]),
-	    run_test_cases(TestSpec, Config, MultiplyTimetrap)
+	    run_test_cases(TestSpec, Config, TimetrapData)
     end;
 
-do_test_cases(TopCase, SkipCases, Config, MultiplyTimetrap) -> 
+do_test_cases(TopCase, SkipCases, Config, TimetrapSpec) ->
     %% when not list(TopCase)
-    do_test_cases([TopCase], SkipCases, Config, MultiplyTimetrap).
+    do_test_cases([TopCase], SkipCases, Config, TimetrapSpec).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1741,8 +1815,8 @@ start_log_file() ->
     ok.
 
 make_html_link(LinkName, Target, Explanation) ->
-    %% if possible use a relative reference�to�Target.
-    TargetL = filename:split(Target), 
+    %% if possible use a relative reference to Target.
+    TargetL = filename:split(Target),
     PwdL = filename:split(filename:dirname(LinkName)),
     Href = case lists:prefix(PwdL, TargetL) of
 	       true ->
@@ -1782,7 +1856,7 @@ start_minor_log_file(Mod, Func) ->
 	    start_minor_log_file1(Mod, Func, LogDir, AbsName);
 	{ok,_} ->                            %% special case, duplicate names
 	    {_,S,Us} = now(),
-	    Name1_0 = 
+	    Name1_0 =
 		lists:flatten(io_lib:format("~s.~s.~w.~w~s", [Mod,Func,S,
 							     trunc(Us/1000),
 							     ?html_ext])),
@@ -1853,7 +1927,7 @@ html_convert_modules(TestSpec, _Config) ->
 %% Retrieve a list of modules out of the test spec.
 
 html_isolate_modules(List) -> html_isolate_modules(List, sets:new()).
-    
+
 html_isolate_modules([], Set) -> sets:to_list(Set);
 html_isolate_modules([{skip_case,_}|Cases], Set) ->
     html_isolate_modules(Cases, Set);
@@ -1919,36 +1993,36 @@ add_init_and_end_per_suite([{make,_,_}=Case|Cases], LastMod, LastRef) ->
     [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef)];
 add_init_and_end_per_suite([{skip_case,{{Mod,all},_}}=Case|Cases], LastMod, LastRef)
   when Mod =/= LastMod ->
-    {PreCases, NextMod, NextRef} = 
+    {PreCases, NextMod, NextRef} =
 	do_add_end_per_suite_and_skip(LastMod, LastRef, Mod),
     PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
 add_init_and_end_per_suite([{skip_case,{{Mod,_},_}}=Case|Cases], LastMod, LastRef)
   when Mod =/= LastMod ->
-    {PreCases, NextMod, NextRef} = 
+    {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod),
     PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
 add_init_and_end_per_suite([{skip_case,{conf,_,{Mod,_},_}}=Case|Cases], LastMod, LastRef)
   when Mod =/= LastMod ->
-    {PreCases, NextMod, NextRef} = 
+    {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod),
     PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
 add_init_and_end_per_suite([{skip_case,_}=Case|Cases], LastMod, LastRef) ->
     [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef)];
-add_init_and_end_per_suite([{conf,_,_,{Mod,_}}=Case|Cases], LastMod, LastRef) 
+add_init_and_end_per_suite([{conf,_,_,{Mod,_}}=Case|Cases], LastMod, LastRef)
   when Mod =/= LastMod ->
-    {PreCases, NextMod, NextRef} = 
+    {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod),
     PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
 add_init_and_end_per_suite([{conf,_,_,_}=Case|Cases], LastMod, LastRef) ->
     [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef)];
-add_init_and_end_per_suite([{Mod,_}=Case|Cases], LastMod, LastRef) 
+add_init_and_end_per_suite([{Mod,_}=Case|Cases], LastMod, LastRef)
   when Mod =/= LastMod ->
-    {PreCases, NextMod, NextRef} = 
+    {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod),
     PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
 add_init_and_end_per_suite([{Mod,_,_}=Case|Cases], LastMod, LastRef)
   when Mod =/= LastMod ->
-    {PreCases, NextMod, NextRef} = 
+    {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod),
     PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef)];
 add_init_and_end_per_suite([Case|Cases], LastMod, LastRef)->
@@ -1965,7 +2039,7 @@ do_add_init_and_end_per_suite(LastMod, LastRef, Mod) ->
 	false -> code:load_file(Mod);
 	_ -> ok
     end,
-    {Init,NextMod,NextRef} = 
+    {Init,NextMod,NextRef} =
 	case erlang:function_exported(Mod, init_per_suite, 1) of
 	    true ->
 		Ref = make_ref(),
@@ -1973,15 +2047,15 @@ do_add_init_and_end_per_suite(LastMod, LastRef, Mod) ->
 	    false ->
 		{[],Mod,undefined}
 	end,
-    Cases = 
+    Cases =
 	if LastRef==undefined ->
 		Init;
 	   LastRef==skipped_suite ->
 		Init;
 	   true ->
-		%% Adding end_per_suite here without checking if the 
+		%% Adding end_per_suite here without checking if the
 		%% function is actually exported. This is because a
-		%% conf case must have an end case - so if it doesn't 
+		%% conf case must have an end case - so if it doesn't
 		%% exist, it will only fail...
 		[{conf,LastRef,[],{LastMod,end_per_suite}}|Init]
 	end,
@@ -1997,23 +2071,19 @@ do_add_end_per_suite_and_skip(LastMod, LastRef, Mod) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% run_test_cases(TestSpec, Config, MultiplyTimetrap) -> exit(Result)
+%% run_test_cases(TestSpec, Config, TimetrapData) -> exit(Result)
 %%
 %% If remote target, a socket connection is established.
 %% Runs the specified tests, then displays/logs the summary.
 
-run_test_cases(TestSpec, Config, MultiplyTimetrap) ->
+run_test_cases(TestSpec, Config, TimetrapData) ->
 
     maybe_open_job_sock(),
 
     html_convert_modules(TestSpec, Config),
 
-    %%! For readable tracing...
-    %%! Config1 = [{data_dir,""},{priv_dir,""},{nodes,[]}],
-    %%! run_test_cases_loop(TestSpec, [[]], MultiplyTimetrap, [], []),
+    run_test_cases_loop(TestSpec, [Config], TimetrapData, [], []),
 
-    run_test_cases_loop(TestSpec, [Config], MultiplyTimetrap, [], []),
-    
     maybe_get_privdir(),
 
     {AllSkippedN,UserSkipN,AutoSkipN,SkipStr} =
@@ -2060,10 +2130,10 @@ maybe_open_job_sock() ->
 %% tar packet containing the privdir created by the test case.
 maybe_get_privdir() ->
     case get(test_server_ctrl_job_sock) of
-	undefined -> 
+	undefined ->
 	    %% local target
 	    ok;
-	Sock -> 
+	Sock ->
 	    %% remote target
 	    request(Sock, job_done),
 	    gen_tcp:close(Sock)
@@ -2071,37 +2141,39 @@ maybe_get_privdir() ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% run_test_cases_loop(TestCases, Config, MultiplyTimetrap, Mode, Status) -> ok
+%% run_test_cases_loop(TestCases, Config, TimetrapData, Mode, Status) -> ok
 %% TestCases = [Test,...]
 %% Config = [[{Key,Val},...],...]
+%% TimetrapData = {MultiplyTimetrap,ScaleTimetrap}
 %% MultiplyTimetrap = integer() | infinity
+%% ScaleTimetrap = bool()
 %% Mode = [{Ref,[Prop,..],StartTime}]
 %% Ref = reference()
-%% Prop = {name,Name} | sequence | parallel | 
+%% Prop = {name,Name} | sequence | parallel |
 %%        shuffle | {shuffle,Seed} |
-%%        repeat | {repeat,N} | 
+%%        repeat | {repeat,N} |
 %%        repeat_until_all_ok | {repeat_until_all_ok,N} |
-%%        repeat_until_any_ok | {repeat_until_any_ok,N} | 
-%%        repeat_until_any_fail | {repeat_until_any_fail,N} | 
-%%        repeat_until_all_fail | {repeat_until_all_fail,N} 
+%%        repeat_until_any_ok | {repeat_until_any_ok,N} |
+%%        repeat_until_any_fail | {repeat_until_any_fail,N} |
+%%        repeat_until_all_fail | {repeat_until_all_fail,N}
 %% Status = [{Ref,{{Ok,Skipped,Failed},CopiedCases}}]
 %% Ok = Skipped = Failed = [Case,...]
 %%
 %% Execute the TestCases under configuration Config. Config is a list
 %% of lists, where hd(Config) holds the config tuples for the current
-%% conf case and tl(Config) is the data for the higher level conf cases. 
-%% Config data is "inherited" from top to nested conf cases, but 
+%% conf case and tl(Config) is the data for the higher level conf cases.
+%% Config data is "inherited" from top to nested conf cases, but
 %% never the other way around. if length(Config) == 1, Config contains
 %% only the initial config data for the suite.
 %%
 %% Test may be one of the following:
 %%
-%% {conf,Ref,Props,{Mod,Func}} Mod:Func is a configuration modification 
+%% {conf,Ref,Props,{Mod,Func}} Mod:Func is a configuration modification
 %% function, call it with the current configuration as argument. It will
 %% return a new configuration.
 %%
-%% {make,Ref,{Mod,Func,Args}} Mod:Func is a make function, and it is called 
-%% with the given arguments. This function will *always* be called on the host 
+%% {make,Ref,{Mod,Func,Args}} Mod:Func is a make function, and it is called
+%% with the given arguments. This function will *always* be called on the host
 %% - not on target.
 %%
 %% {Mod,Case} This is a normal test case. Determine the correct
@@ -2114,16 +2186,16 @@ maybe_get_privdir() ->
 %% {skip_case,{conf,Ref,Case,Comment}} An init conf case gets skipped
 %% by the user. This will also cause the end conf case to be skipped.
 %% Note that it is not possible to skip an end conf case directly (it
-%% can only be skipped indirectly by a skipped init conf case). The 
-%% comment (which gets printed in the log files) describes why the case 
+%% can only be skipped indirectly by a skipped init conf case). The
+%% comment (which gets printed in the log files) describes why the case
 %% was skipped.
 %%
-%% {skip_case,{Case,Comment}} A normal test case skipped by the user. 
-%% The comment (which gets printed in the log files) describes why the 
+%% {skip_case,{Case,Comment}} A normal test case skipped by the user.
+%% The comment (which gets printed in the log files) describes why the
 %% case was skipped.
 %%
 %% {auto_skip_case,{conf,Ref,Case,Comment},Mode} This is the result of
-%% an end conf case being automatically skipped due to a failing init 
+%% an end conf case being automatically skipped due to a failing init
 %% conf case. It could also be a nested conf case that gets skipped
 %% because of a failed or skipped top level conf.
 %%
@@ -2151,25 +2223,25 @@ maybe_get_privdir() ->
 %% messages to the main process instead of writing the data to file
 %% (only true for printouts to common log files).
 %%
-%% If a conf group nested under a parallel group in the test 
+%% If a conf group nested under a parallel group in the test
 %% specification should be started, the 'test_server_common_io_handler'
 %% value gets set also on the main process. This causes all printouts
-%% to common files - both from parallel test cases and from cases 
+%% to common files - both from parallel test cases and from cases
 %% executed by the main process - to all end up as messages in the
-%% inbox of the main process. 
+%% inbox of the main process.
 %%
 %% During execution of a parallel group (or of a group nested under a
-%% parallel group), *any* new test case being started gets registered 
+%% parallel group), *any* new test case being started gets registered
 %% in a list saved in the dictionary with 'test_server_queued_io' as key.
 %% When the top level parallel group is finished (only then can we be
 %% sure all parallel test cases have finished and "reported in"), the
-%% list of test cases is traversed in order and printout messages from 
-%% each process - including the main process - are handled in turn. See 
+%% list of test cases is traversed in order and printout messages from
+%% each process - including the main process - are handled in turn. See
 %% handle_test_case_io_and_status/0 for details.
 %%
 %% To be able to handle nested conf groups with different properties,
 %% the Mode argument specifies a list of {Ref,Properties} tuples.
-%% The head of the Mode list at any given time identifies the group 
+%% The head of the Mode list at any given time identifies the group
 %% currently being processed. The tail of the list identifies groups
 %% on higher level.
 %%
@@ -2179,13 +2251,13 @@ maybe_get_privdir() ->
 %%
 %% A group nested under a parallel group will start executing in
 %% parallel with previous (parallel) test cases (no matter what
-%% properties the nested group has). Test cases are however never 
+%% properties the nested group has). Test cases are however never
 %% executed in parallel with the start or end conf case of the same
 %% group! Because of this, the test_server_ctrl loop waits at
 %% the end conf of a group for all parallel cases to finish
 %% before the end conf case actually executes. This has the effect
 %% that it's only after a nested group has finished that any
-%% remaining parallel cases in the previous group get spawned (*). 
+%% remaining parallel cases in the previous group get spawned (*).
 %% Example (all parallel cases):
 %%
 %% group1_init   |---->
@@ -2201,15 +2273,16 @@ maybe_get_privdir() ->
 %%
 
 run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
-		    Config, MultiplyTimetrap, Mode, Status) when Type==conf; 
-								 Type==make ->
-
+		    Config, TimetrapData, Mode, Status) when Type==conf;
+							     Type==make ->
     file:set_cwd(filename:dirname(get(test_server_dir))),
     CurrIOHandler = get(test_server_common_io_handler),
+    ParentMode = tl(Mode),
+
     %% check and update the mode for test case execution and io msg handling
     case {curr_ref(Mode),check_props(parallel, Mode)} of
 	{Ref,Ref} ->
-	    case check_props(parallel, tl(Mode)) of
+	    case check_props(parallel, ParentMode) of
 		false ->
 		    %% this is a skipped end conf for a top level parallel group,
 		    %% buffered io can be flushed
@@ -2217,24 +2290,24 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 		    set_io_buffering(undefined),
 		    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, false, SkipMode),
 		    test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
-		    run_test_cases_loop(Cases, Config, MultiplyTimetrap, tl(Mode), 
+		    run_test_cases_loop(Cases, Config, TimetrapData, ParentMode,
 					delete_status(Ref, Status));
 		_ ->
-		    %% this is a skipped end conf for a parallel group nested under a 
+		    %% this is a skipped end conf for a parallel group nested under a
 		    %% parallel group (io buffering is active)
 		    wait_for_cases(Ref),
 		    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, true, SkipMode),
 		    test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
 		    case CurrIOHandler of
-			{Ref,_} -> 
+			{Ref,_} ->
 			    %% current_io_handler was set by start conf of this
-			    %% group, so we can unset it now (no more io from main 
+			    %% group, so we can unset it now (no more io from main
 			    %% process needs to be buffered)
 			    set_io_buffering(undefined);
-			_ -> 
+			_ ->
 			    ok
 		    end,
-		    run_test_cases_loop(Cases, Config, MultiplyTimetrap, tl(Mode), 
+		    run_test_cases_loop(Cases, Config, TimetrapData, ParentMode,
 					delete_status(Ref, Status))
 	    end;
 	{Ref,false} ->
@@ -2242,7 +2315,31 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 	    %% nested under a parallel group
 	    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, false, SkipMode),
 	    test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
-	    run_test_cases_loop(Cases, Config, MultiplyTimetrap, tl(Mode), 
+
+	    %% Check if this group is auto skipped because of error in the init conf.
+	    %% If so, check if the parent group is a sequence, and if it is, skip
+	    %% all proceeding tests in that group.
+	    GrName = get_name(Mode),
+	    Cases1 =
+		case get_tc_results(Status) of
+		    {_,_,Fails} when length(Fails) > 0 ->
+			case lists:member({group_result,GrName}, Fails) of
+			    true ->
+				case check_prop(sequence, ParentMode) of
+				    false ->
+					Cases;
+				    ParentRef ->
+					Reason = {group_result,GrName,failed},
+					skip_cases_upto(ParentRef, Cases,
+							Reason, tc, Mode)
+				end;
+			    false ->
+				Cases
+			end;
+		    _ ->
+			Cases
+		end,
+	    run_test_cases_loop(Cases1, Config, TimetrapData, ParentMode,
 				delete_status(Ref, Status));
 	{Ref,_} ->
 	    %% this is a skipped end conf for a non-parallel group nested under
@@ -2250,22 +2347,22 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 	    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, true, SkipMode),
 	    test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
 	    case CurrIOHandler of
-		{Ref,_} ->  
+		{Ref,_} ->
 		    %% current_io_handler was set by start conf of this
-		    %% group, so we can unset it now (no more io from main 
+		    %% group, so we can unset it now (no more io from main
 		    %% process needs to be buffered)
 		    set_io_buffering(undefined);
-		_ -> 
+		_ ->
 		    ok
 	    end,
-	    run_test_cases_loop(Cases, Config, MultiplyTimetrap, tl(Mode), 
+	    run_test_cases_loop(Cases, Config, TimetrapData, tl(Mode),
 				delete_status(Ref, Status));
 	{_,false} ->
 	    %% this is a skipped start conf for a group which is not nested
 	    %% under a parallel group
 	    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, false, SkipMode),
 	    test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
-	    run_test_cases_loop(Cases, Config, MultiplyTimetrap, [conf(Ref,[])|Mode], Status);
+	    run_test_cases_loop(Cases, Config, TimetrapData, [conf(Ref,[])|Mode], Status);
 	{_,Ref0} when is_reference(Ref0) ->
 	    %% this is a skipped start conf for a group nested under a parallel group
 	    %% and if this is the first nested group, io buffering must be activated
@@ -2276,19 +2373,19 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 	    end,
 	    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, true, SkipMode),
 	    test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
-	    run_test_cases_loop(Cases, Config, MultiplyTimetrap, [conf(Ref,[])|Mode], Status)
-    end; 
+	    run_test_cases_loop(Cases, Config, TimetrapData, [conf(Ref,[])|Mode], Status)
+    end;
 
 run_test_cases_loop([{auto_skip_case,{Case,Comment},SkipMode}|Cases],
-		    Config, MultiplyTimetrap, Mode, Status) ->
+		    Config, TimetrapData, Mode, Status) ->
     {Mod,Func} = skip_case(auto, undefined, get(test_server_case_num)+1, Case, Comment,
 			   (undefined /= get(test_server_common_io_handler)), SkipMode),
     test_server_sup:framework_call(report, [tc_auto_skip,{?pl2a(Mod),Func,Comment}]),
-    run_test_cases_loop(Cases, Config, MultiplyTimetrap, Mode, 
+    run_test_cases_loop(Cases, Config, TimetrapData, Mode,
 			update_status(skipped, Mod, Func, Status));
 
 run_test_cases_loop([{skip_case,{conf,Ref,Case,Comment}}|Cases0],
-		    Config, MultiplyTimetrap, Mode, Status) ->
+		    Config, TimetrapData, Mode, Status) ->
     {Mod,Func} = skip_case(user, Ref, 0, Case, Comment,
 			   (undefined /= get(test_server_common_io_handler))),
     {Cases,Config1} =
@@ -2301,24 +2398,23 @@ run_test_cases_loop([{skip_case,{conf,Ref,Case,Comment}}|Cases0],
 		{skip_cases_upto(Ref, Cases0, Comment, conf, Mode),Config}
 	end,
     test_server_sup:framework_call(report, [tc_user_skip,{?pl2a(Mod),Func,Comment}]),
-    run_test_cases_loop(Cases, Config1, MultiplyTimetrap, Mode, 
+    run_test_cases_loop(Cases, Config1, TimetrapData, Mode,
 			update_status(skipped, Mod, Func, Status));
 
 run_test_cases_loop([{skip_case,{Case,Comment}}|Cases],
-		    Config, MultiplyTimetrap, Mode, Status) ->
+		    Config, TimetrapData, Mode, Status) ->
     {Mod,Func} = skip_case(user, undefined, get(test_server_case_num)+1, Case, Comment,
 			   (undefined /= get(test_server_common_io_handler))),
     test_server_sup:framework_call(report, [tc_user_skip,{?pl2a(Mod),Func,Comment}]),
-    run_test_cases_loop(Cases, Config, MultiplyTimetrap, Mode,
+    run_test_cases_loop(Cases, Config, TimetrapData, Mode,
 			update_status(skipped, Mod, Func, Status));
 
 %% a start *or* end conf case, wrapping test cases or other conf cases
-run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0, 
-		    Config, MultiplyTimetrap, Mode0, Status) ->
-    
+run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
+		    Config, TimetrapData, Mode0, Status) ->
     CurrIOHandler = get(test_server_common_io_handler),
     %% check and update the mode for test case execution and io msg handling
-    {StartConf,Mode,IOHandler,ConfTime,Status1} = 
+    {StartConf,Mode,IOHandler,ConfTime,Status1} =
 	case {curr_ref(Mode0),check_props(parallel, Mode0)} of
 	    {Ref,Ref} ->
 		case check_props(parallel, tl(Mode0)) of
@@ -2334,19 +2430,19 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 			{false,tl(Mode0),undefined,Elapsed,
 			 update_status(Ref, OkSkipFail, Status)};
 		    _ ->
-			%% this is an end conf for a parallel group nested under a 
+			%% this is an end conf for a parallel group nested under a
 			%% parallel group (io buffering is active)
 			OkSkipFail = wait_for_cases(Ref),
 			queue_test_case_io(Ref, self(), 0, Mod, Func),
 			Elapsed = elapsed_time(conf_start(Ref, Mode0),?now)/1000000,
 			case CurrIOHandler of
-			    {Ref,_} -> 
+			    {Ref,_} ->
 				%% current_io_handler was set by start conf of this
 				%% group, so we can unset it after this case (no
 				%% more io from main process needs to be buffered)
 				{false,tl(Mode0),undefined,Elapsed,
 				 update_status(Ref, OkSkipFail, Status)};
-			    _ -> 
+			    _ ->
 				{false,tl(Mode0),CurrIOHandler,Elapsed,
 				 update_status(Ref, OkSkipFail, Status)}
 			end
@@ -2362,16 +2458,16 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 		queue_test_case_io(Ref, self(), 0, Mod, Func),
 		Elapsed = elapsed_time(conf_start(Ref, Mode0),?now)/1000000,
 		case CurrIOHandler of
-		    {Ref,_} -> 
+		    {Ref,_} ->
 			%% current_io_handler was set by start conf of this
 			%% group, so we can unset it after this case (no
 			%% more io from main process needs to be buffered)
 			{false,tl(Mode0),undefined,Elapsed,Status};
-		    _ -> 
+		    _ ->
 			{false,tl(Mode0),CurrIOHandler,Elapsed,Status}
 		end;
 	    {_,false} ->
-		%% this is a start conf for a group which is not nested under a 
+		%% this is a start conf for a group which is not nested under a
 		%% parallel group, check if this case starts a new parallel group
 		case lists:member(parallel, Props) of
 		    true ->
@@ -2424,9 +2520,9 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 				    end;
 				NumStr ->
 				    %% Ex: "123 456 789" or "123,456,789" -> {123,456,789}
-				    list_to_tuple([list_to_integer(NS) || 
+				    list_to_tuple([list_to_integer(NS) ||
 						   NS <- string:tokens(NumStr, [$ ,$:,$,])])
-			    end,			
+			    end,
 			{shuffle_cases(Ref, Cs0, UseSeed),{shuffle,UseSeed}}
 		end;
 	   not StartConf ->
@@ -2440,17 +2536,19 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 	if StartConf ->
 		case get_repeat(Props) of
 		    undefined ->
-			%% we *must* have a status entry for every conf since we 
+			%% we *must* have a status entry for every conf since we
 			%% will continously update status with test case results
 			%% without knowing the Ref (but update hd(Status))
 			{false,new_status(Ref, Status1),Cases1,?void_fun};
-		    _ ->			
+		    {_RepType,N} when N =< 1 ->
+			{false,new_status(Ref, Status1),Cases1,?void_fun};
+		    _ ->
 			{Copied,_} = copy_cases(Ref, make_ref(), Cs1),
 			{true,new_status(Ref, Copied, Status1),Cases1,?void_fun}
 		end;
 	   not StartConf ->
 		RepVal = get_repeat(get_props(Mode0)),
-		ReportStop = 
+		ReportStop =
 		    fun() ->
 			    print(minor, "~n*** Stopping repeat operation ~w", [RepVal]),
 			    print(1, "Stopping repeat operation ~w", [RepVal])
@@ -2461,21 +2559,23 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 		case RepVal of
 		    undefined ->
 			{false,EndStatus,Cases1,?void_fun};
+		    {_RepType,N} when N =< 1 ->
+			{false,EndStatus,Cases1,?void_fun};
 		    {repeat,_} ->
 			{true,EndStatus,CopiedCases++Cases1,?void_fun};
 		    {repeat_until_all_ok,_} ->
 			{RestCs,Fun} = case get_tc_results(Status1) of
-					   {_,_,[]} -> 
+					   {_,_,[]} ->
 					       {Cases1,ReportStop};
-					   _ -> 
+					   _ ->
 					       {CopiedCases++Cases1,?void_fun}
 				       end,
 			{true,EndStatus,RestCs,Fun};
 		    {repeat_until_any_ok,_} ->
 			{RestCs,Fun} = case get_tc_results(Status1) of
-					   {Ok,_,_} when length(Ok) > 0 -> 
+					   {Ok,_,_Fails} when length(Ok) > 0 ->
 					       {Cases1,ReportStop};
-					   _ -> 
+					   _ ->
 					       {CopiedCases++Cases1,?void_fun}
 				       end,
 			{true,EndStatus,RestCs,Fun};
@@ -2483,15 +2583,15 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 			{RestCs,Fun} = case get_tc_results(Status1) of
 					   {_,_,Fails} when length(Fails) > 0 ->
 					       {Cases1,ReportStop};
-					   _ -> 
+					   _ ->
 					       {CopiedCases++Cases1,?void_fun}
 				 end,
 			{true,EndStatus,RestCs,Fun};
 		    {repeat_until_all_fail,_} ->
 			{RestCs,Fun} = case get_tc_results(Status1) of
-					   {[],_,_} ->  
+					   {[],_,_} ->
 					       {Cases1,ReportStop};
-					   _ -> 
+					   _ ->
 					       {CopiedCases++Cases1,?void_fun}
 				       end,
 			{true,EndStatus,RestCs,Fun}
@@ -2517,13 +2617,13 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 		       [{tc_group_properties,get_props(Mode0)},
 			{tc_group_result,[{ok,TcOk},{skipped,TcSkip},{failed,TcFail}]}]
 	       end,
-    ActualCfg = 
+    ActualCfg =
 	update_config(hd(Config), [{priv_dir,get(test_server_priv_dir)},
 				   {data_dir,get_data_dir(Mod)}] ++ CfgProps),
     CurrMode = curr_mode(Ref, Mode0, Mode),
 
-    ConfCaseResult = run_test_case(Ref, 0, Mod, Func, [ActualCfg], skip_init, target, 
-				   MultiplyTimetrap, CurrMode),
+    ConfCaseResult = run_test_case(Ref, 0, Mod, Func, [ActualCfg], skip_init, target,
+				   TimetrapData, CurrMode),
 
     case ConfCaseResult of
 	{_,NewCfg,_} when Func == init_per_suite, is_list(NewCfg) ->
@@ -2533,8 +2633,8 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 		[] ->
 		    set_io_buffering(IOHandler),
 		    stop_minor_log_file(),
-		    run_test_cases_loop(Cases, [NewCfg|Config], 
-					MultiplyTimetrap, Mode, Status2);
+		    run_test_cases_loop(Cases, [NewCfg|Config],
+					TimetrapData, Mode, Status2);
 		Bad ->
 		    print(minor, "~n*** ~p returned bad elements in Config: ~p.~n",
 			  [Func,Bad]),
@@ -2542,53 +2642,55 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 		    Cases2 = skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
 		    set_io_buffering(IOHandler),
 		    stop_minor_log_file(),
-		    run_test_cases_loop(Cases2, Config, MultiplyTimetrap, Mode, 
+		    run_test_cases_loop(Cases2, Config, TimetrapData, Mode,
 					delete_status(Ref, Status2))
-	    end;		
+	    end;
 	{_,NewCfg,_} when StartConf, is_list(NewCfg) ->
 	    print_conf_time(ConfTime),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(Cases, [NewCfg|Config], MultiplyTimetrap, Mode, Status2);  
+	    run_test_cases_loop(Cases, [NewCfg|Config], TimetrapData, Mode, Status2);
 	{_,{framework_error,{FwMod,FwFunc},Reason},_} ->
 	    print(minor, "~n*** ~p failed in ~p. Reason: ~p~n", [FwMod,FwFunc,Reason]),
 	    print(1, "~p failed in ~p. Reason: ~p~n", [FwMod,FwFunc,Reason]),
 	    exit(framework_error);
-	{_,Fail,_} when element(1,Fail) == 'EXIT'; 
+	{_,Fail,_} when element(1,Fail) == 'EXIT';
 			element(1,Fail) == timetrap_timeout;
 			element(1,Fail) == failed ->
-	    {Cases2,Config1} = 
+	    {Cases2,Config1,Status3} =
 		if StartConf ->
 			ReportAbortRepeat(failed),
 			print(minor, "~n*** ~p failed.~n"
 			      "    Skipping all cases.", [Func]),
 			Reason = {failed,{Mod,Func,Fail}},
-			{skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),Config};
+			{skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
+			 Config,
+			 update_status(failed, group_result, get_name(Mode),
+				       delete_status(Ref, Status2))};
 		   not StartConf ->
 			ReportRepeatStop(),
 			print_conf_time(ConfTime),
-			{Cases,tl(Config)}
+			{Cases,tl(Config),delete_status(Ref, Status2)}
 		end,
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(Cases2, Config1, MultiplyTimetrap, Mode,
-				delete_status(Ref, Status2));
+	    run_test_cases_loop(Cases2, Config1, TimetrapData, Mode, Status3);
 	{died,Why,_} when Func == init_per_suite ->
 	    print(minor, "~n*** Unexpected exit during init_per_suite.~n", []),
 	    Reason = {failed,{Mod,init_per_suite,Why}},
 	    Cases2 = skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(Cases2, Config, MultiplyTimetrap, Mode, 
-				delete_status(Ref, Status2));  
+	    run_test_cases_loop(Cases2, Config, TimetrapData, Mode,
+				delete_status(Ref, Status2));
 	{_,{Skip,Reason},_} when StartConf and ((Skip==skip) or (Skip==skipped)) ->
 	    ReportAbortRepeat(skipped),
 	    print(minor, "~n*** ~p skipped.~n"
 		  "    Skipping all cases.", [Func]),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(skip_cases_upto(Ref, Cases, Reason, conf, CurrMode), 
-				Config, MultiplyTimetrap, Mode,	
+	    run_test_cases_loop(skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
+				Config, TimetrapData, Mode,
 				delete_status(Ref, Status2));
 	{_,{skip_and_save,Reason,_SavedConfig},_} when StartConf ->
 	    ReportAbortRepeat(skipped),
@@ -2596,8 +2698,8 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 		  "    Skipping all cases.", [Func]),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(skip_cases_upto(Ref, Cases, Reason, conf, CurrMode), 
-				Config, MultiplyTimetrap, Mode,	
+	    run_test_cases_loop(skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
+				Config, TimetrapData, Mode,
 				delete_status(Ref, Status2));
 	{_,_Other,_} when Func == init_per_suite ->
 	    print(minor, "~n*** init_per_suite failed to return a Config list.~n", []),
@@ -2605,61 +2707,77 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 	    Cases2 = skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(Cases2, Config, MultiplyTimetrap, Mode,
+	    run_test_cases_loop(Cases2, Config, TimetrapData, Mode,
 				delete_status(Ref, Status2));
 	{_,_Other,_} when StartConf ->
 	    print_conf_time(ConfTime),
 	    set_io_buffering(IOHandler),
 	    ReportRepeatStop(),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(Cases, [hd(Config)|Config], MultiplyTimetrap, 
+	    run_test_cases_loop(Cases, [hd(Config)|Config], TimetrapData,
 				Mode, Status2);
-	
+
 	{_,_EndConfRetVal,Opts} ->
-	    %% check if return_group_result is set (ok, skipped or failed) and
-	    %% if so return the value to the group "above" so that result may be
-	    %% used for evaluating repeat_until_*
-	    Status3 =
+	    %% Check if return_group_result is set (ok, skipped or failed) and
+	    %% if so:
+	    %% 1) *If* the parent group is a sequence, skip all proceeding tests
+	    %%    in that group.
+	    %% 2) Return the value to the group "above" so that result may be
+	    %%    used for evaluating a 'repeat_until_*' property.
+	    GrName = get_name(Mode0, Func),
+	    {Cases2,Status3} =
 		case lists:keysearch(return_group_result, 1, Opts) of
+		    {value,{_,failed}} ->
+			case {curr_ref(Mode),check_prop(sequence, Mode)} of
+			    {ParentRef,ParentRef} ->
+				Reason = {group_result,GrName,failed},
+				{skip_cases_upto(ParentRef, Cases, Reason, tc, Mode),
+				 update_status(failed, group_result, GrName,
+					       delete_status(Ref, Status2))};
+			    _ ->
+				{Cases,update_status(failed, group_result, GrName,
+						     delete_status(Ref, Status2))}
+			end;
 		    {value,{_,GroupResult}} ->
-			update_status(GroupResult, group_result, Func,
-				      delete_status(Ref, Status2));
+			{Cases,update_status(GroupResult, group_result, GrName,
+					     delete_status(Ref, Status2))};
 		    false ->
-			delete_status(Ref, Status2)
+			{Cases,update_status(ok, group_result, GrName,
+					     delete_status(Ref, Status2))}
 		end,
 	    print_conf_time(ConfTime),
 	    ReportRepeatStop(),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(Cases, tl(Config), MultiplyTimetrap, Mode, Status3)
+	    run_test_cases_loop(Cases2, tl(Config), TimetrapData, Mode, Status3)
     end;
 
-run_test_cases_loop([{make,Ref,{Mod,Func,Args}}|Cases0], Config, MultiplyTimetrap, Mode, Status) ->
-    case run_test_case(Ref, 0, Mod, Func, Args, skip_init, host, MultiplyTimetrap) of
+run_test_cases_loop([{make,Ref,{Mod,Func,Args}}|Cases0], Config, TimetrapData, Mode, Status) ->
+    case run_test_case(Ref, 0, Mod, Func, Args, skip_init, host, TimetrapData) of
 	{_,Why={'EXIT',_},_} ->
  	    print(minor, "~n*** ~p failed.~n"
  		  "    Skipping all cases.", [Func]),
 	    Reason = {failed,{Mod,Func,Why}},
 	    Cases = skip_cases_upto(Ref, Cases0, Reason, conf, Mode),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(Cases, Config, MultiplyTimetrap, Mode, Status);
+	    run_test_cases_loop(Cases, Config, TimetrapData, Mode, Status);
 	{_,_Whatever,_} ->
 	    stop_minor_log_file(),
-	    run_test_cases_loop(Cases0, Config, MultiplyTimetrap, Mode, Status)
+	    run_test_cases_loop(Cases0, Config, TimetrapData, Mode, Status)
     end;
 
-run_test_cases_loop([{conf,_Ref,_Props,_X}=Conf|_Cases0], 
-		    Config, _MultiplyTimetrap, _Mode, _Status) ->
+run_test_cases_loop([{conf,_Ref,_Props,_X}=Conf|_Cases0],
+		    Config, _TimetrapData, _Mode, _Status) ->
     erlang:error(badarg, [Conf,Config]);
 
-run_test_cases_loop([{Mod,Case}|Cases], Config, MultiplyTimetrap, Mode, Status) ->
-    ActualCfg = 
+run_test_cases_loop([{Mod,Case}|Cases], Config, TimetrapData, Mode, Status) ->
+    ActualCfg =
 	update_config(hd(Config), [{priv_dir,get(test_server_priv_dir)},
 				   {data_dir,get_data_dir(Mod)}]),
     run_test_cases_loop([{Mod,Case,[ActualCfg]}|Cases], Config,
-			MultiplyTimetrap, Mode, Status);
+			TimetrapData, Mode, Status);
 
-run_test_cases_loop([{Mod,Func,Args}|Cases], Config, MultiplyTimetrap, Mode, Status) ->
+run_test_cases_loop([{Mod,Func,Args}|Cases], Config, TimetrapData, Mode, Status) ->
     Num = put(test_server_case_num, get(test_server_case_num)+1),
     %% check the current execution mode and save info about the case if
     %% detected that printouts to common log files is handled later
@@ -2669,15 +2787,15 @@ run_test_cases_loop([{Mod,Func,Args}|Cases], Config, MultiplyTimetrap, Mode, Sta
 		undefined ->
 		    %% io printouts are written to straight to file
 		    ok;
-		_ -> 
+		_ ->
 		    %% io messages are buffered, put test case in queue
 		    queue_test_case_io(undefined, self(), Num+1, Mod, Func)
 	    end;
 	_ ->
 	    ok
     end,
-    case run_test_case(undefined, Num+1, Mod, Func, Args, 
-		       run_init, target, MultiplyTimetrap, Mode) of
+    case run_test_case(undefined, Num+1, Mod, Func, Args,
+		       run_init, target, TimetrapData, Mode) of
 	%% callback to framework module failed, exit immediately
 	{_,{framework_error,{FwMod,FwFunc},Reason},_} ->
 	    print(minor, "~n*** ~p failed in ~p. Reason: ~p~n", [FwMod,FwFunc,Reason]),
@@ -2688,50 +2806,50 @@ run_test_cases_loop([{Mod,Func,Args}|Cases], Config, MultiplyTimetrap, Mode, Sta
 	{Time,RetVal,_} ->
 	    {Failed,Status1} =
 		case Time of
-		    died -> 
+		    died ->
 			{true,update_status(failed, Mod, Func, Status)};
 		    _ when is_tuple(RetVal) ->
 			case element(1, RetVal) of
-			    R when R=='EXIT'; R==failed -> 
+			    R when R=='EXIT'; R==failed ->
 				{true,update_status(failed, Mod, Func, Status)};
-			    R when R==skip; R==skipped -> 
+			    R when R==skip; R==skipped ->
 				{false,update_status(skipped, Mod, Func, Status)};
-			    _ -> 
+			    _ ->
 				{false,update_status(ok, Mod, Func, Status)}
 			end;
-		    _ -> 
+		    _ ->
 			{false,update_status(ok, Mod, Func, Status)}
-		end,  
+		end,
 	    case check_prop(sequence, Mode) of
 		false ->
 		    stop_minor_log_file(),
-		    run_test_cases_loop(Cases, Config, MultiplyTimetrap, Mode, Status1);
-		Ref ->				
-		    %% the case is in a sequence; we must check the result and 
+		    run_test_cases_loop(Cases, Config, TimetrapData, Mode, 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
 			    stop_minor_log_file(),
-			    run_test_cases_loop(Cases, Config, MultiplyTimetrap, Mode, Status1);
+			    run_test_cases_loop(Cases, Config, TimetrapData, Mode, Status1);
 		       true ->	              % skip rest of cases in sequence
 			    print(minor, "~n*** ~p failed.~n"
 				  "    Skipping all other cases in sequence.", [Func]),
 			    Reason = {failed,{Mod,Func}},
 			    Cases2 = skip_cases_upto(Ref, Cases, Reason, tc, Mode),
 			    stop_minor_log_file(),
-			    run_test_cases_loop(Cases2, Config, MultiplyTimetrap, Mode, Status1)
+			    run_test_cases_loop(Cases2, Config, TimetrapData, Mode, Status1)
 		    end
 	    end;
 	%% the test case is being executed in parallel with the main process (and
 	%% other test cases) and Pid is the dedicated process executing the case
 	Pid ->
-	    %% io from Pid will be buffered in the main process inbox and handled 
+	    %% io from Pid will be buffered in the main process inbox 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, MultiplyTimetrap, Mode, Status)
+	    run_test_cases_loop(Cases, Config, TimetrapData, Mode, Status)
     end;
 
 %% TestSpec processing finished
-run_test_cases_loop([], _Config, _MultiplyTimetrap, _, _) ->
+run_test_cases_loop([], _Config, _TimetrapData, _, _) ->
     ok.
 
 %%--------------------------------------------------------------------
@@ -2765,7 +2883,10 @@ get_copied_cases([{_,{_,Cases}} | _Status]) ->
     Cases.
 
 get_tc_results([{_,{OkSkipFail,_}} | _Status]) ->
-    OkSkipFail.
+    OkSkipFail;
+get_tc_results([]) ->		      % in case init_per_suite crashed
+    {[],[],[]}.
+
 
 conf(Ref, Props) ->
     {Ref,Props,?now}.
@@ -2798,12 +2919,18 @@ check_props(Attrib, Mode) ->
     case [R || {R,Ps,_} <- Mode, lists:member(Attrib, Ps)] of
 	[] -> false;
 	[Ref|_] -> Ref
-    end.	    
+    end.
+
+get_name(Mode, Def) ->
+    case get_name(Mode) of
+	undefined -> Def;
+	Name      -> Name
+    end.
 
 get_name([{_Ref,Props,_}|_]) ->
     proplists:get_value(name, Props);
 get_name([]) ->
-    undefined.    
+    undefined.
 
 conf_start(Ref, Mode) ->
     case lists:keysearch(Ref, 1, Mode) of
@@ -2826,10 +2953,10 @@ print_conf_time(0) ->
 print_conf_time(ConfTime) ->
     print(major, "=group_time    ~.3fs", [ConfTime]),
     print(minor, "~n=== Total execution time of group: ~.3fs~n", [ConfTime]).
-    
-print_props(_, []) -> 
+
+print_props(_, []) ->
     ok;
-print_props(true, Props) -> 
+print_props(true, Props) ->
     print(major, "=group_props   ~p", [Props]),
     print(minor, "Group properties: ~p~n", [Props]);
 print_props(_, _) ->
@@ -2853,12 +2980,12 @@ update_repeat(Props) ->
 	    Props1 =
 		if N == forever ->
 			[{RepType,N}|lists:keydelete(RepType, 1, Props)];
-		   N < 2 ->
+		   N < 3 ->
 			lists:keydelete(RepType, 1, Props);
-		   N >= 2 ->
+		   N >= 3 ->
 			[{RepType,N-1}|lists:keydelete(RepType, 1, Props)]
 		end,
-	    %% if shuffle is used in combination with repeat, a new 
+	    %% if shuffle is used in combination with repeat, a new
 	    %% seed shouldn't be set every new turn
 	    case get_shuffle(Props1) of
 		undefined ->
@@ -2874,13 +3001,13 @@ get_shuffle(Props) ->
 delete_shuffle(Props) ->
     delete_prop([shuffle], Props).
 
-%% Return {Item,Value} if found, else if Item alone 
+%% Return {Item,Value} if found, else if Item alone
 %% is found, return {Item,Default}
 get_prop([Item|Items], Default, Props) ->
     case lists:keysearch(Item, 1, Props) of
-	{value,R} -> 
+	{value,R} ->
 	    R;
-	false -> 
+	false ->
 	    case lists:member(Item, Props) of
 		true ->
 		    {Item,Default};
@@ -2940,8 +3067,8 @@ random_order(1, {_Pos,Seed}, [{_Ix,CaseOrGroup}], Shuffled) ->
     put(test_server_curr_random_seed, Seed),
     Shuffled++CaseOrGroup;
 random_order(N, {Pos,NewSeed}, IxCases, Shuffled) ->
-    {First,[{_Ix,CaseOrGroup}|Rest]} = lists:split(Pos-1, IxCases),	       
-    random_order(N-1, random:uniform_s(N-1, NewSeed), 
+    {First,[{_Ix,CaseOrGroup}|Rest]} = lists:split(Pos-1, IxCases),
+    random_order(N-1, random:uniform_s(N-1, NewSeed),
 		 First++Rest, Shuffled++CaseOrGroup).
 
 
@@ -2949,7 +3076,7 @@ random_order(N, {Pos,NewSeed}, IxCases, Shuffled) ->
 %% skip_case(Type, Ref, CaseNum, Case, Comment, SendSync) -> {Mod,Func}
 %%
 %% Prints info about a skipped case in the major and html log files.
-%% SendSync determines if start and finished messages must be sent so 
+%% SendSync determines if start and finished messages must be sent so
 %% that the printouts can be buffered and handled in order with io from
 %% parallel processes.
 
@@ -2969,13 +3096,13 @@ skip_case(Type, Ref, CaseNum, Case, Comment, SendSync, Mode) ->
        not SendSync ->
 	    skip_case1(Type, CaseNum, Mod, Func, Comment, Mode)
     end,
-    MF.	    
+    MF.
 
 skip_case1(Type, CaseNum, Mod, Func, Comment, Mode) ->
     {{Col0,Col1},_} = get_font_style((CaseNum > 0), Mode),
     ResultCol = if Type == auto -> "#ffcc99";
 		   Type == user -> "#ff9933"
-		end,    
+		end,
 
     Comment1 = reason_to_string(Comment),
 
@@ -3084,7 +3211,7 @@ modify_cases_upto1(Ref, ModOp, [{skip_case,{_F,_Cmt}}=MF|T], Orig, Alt) ->
 
 %% next is a normal case (possibly in a sequence), mark as skipped, or copy, and proceed
 modify_cases_upto1(Ref, {skip,Reason,_,Mode}=Op, [{_M,_F}=MF|T], Orig, Alt) ->
-    modify_cases_upto1(Ref, Op, T, Orig, [{auto_skip_case,{MF,Reason},Mode}|Alt]); 
+    modify_cases_upto1(Ref, Op, T, Orig, [{auto_skip_case,{MF,Reason},Mode}|Alt]);
 modify_cases_upto1(Ref, CopyOp, [{_M,_F}=MF|T], Orig, Alt) ->
     modify_cases_upto1(Ref, CopyOp, T, [MF|Orig], [MF|Alt]);
 
@@ -3110,7 +3237,7 @@ set_io_buffering(IOHandler) ->
 %% queue_test_case_io(Pid, Num, Mod, Func) -> ok
 %%
 %% Save info about test case that gets its io buffered. This can
-%% be a parallel test case or it can be a test case (conf or normal) 
+%% be a parallel test case or it can be a test case (conf or normal)
 %% that belongs to a group nested under a parallel group. The queue
 %% is processed after io buffering is disabled. See run_test_cases_loop/4
 %% and handle_test_case_io_and_status/0 for more info.
@@ -3124,10 +3251,10 @@ queue_test_case_io(Ref, Pid, Num, Mod, Func) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% wait_for_cases(Ref) -> {Ok,Skipped,Failed}
 %%
-%% At the end of a nested parallel group, we have to wait for the test 
+%% At the end of a nested parallel group, we have to wait for the test
 %% cases to terminate before we can go on (since test cases never execute
-%% in parallel with the end conf case of the group). When a top level 
-%% parallel group is finished, buffered io messages must be handled and 
+%% in parallel with the end conf case of the group). When a top level
+%% parallel group is finished, buffered io messages must be handled and
 %% this is taken care of by handle_test_case_io_and_status/0.
 
 wait_for_cases(Ref) ->
@@ -3135,15 +3262,15 @@ wait_for_cases(Ref) ->
 	[] ->
 	    {[],[],[]};
 	Cases ->
-	    [_Start|TCs] = 
+	    [_Start|TCs] =
 		lists:dropwhile(fun({R,_,_,_,_}) when R == Ref -> false;
 				   (_) -> true
 				end, Cases),
 	    wait_and_resend(Ref, TCs, [],[],[])
     end.
 
-wait_and_resend(Ref, [{OtherRef,_,0,_,_}|Ps], 
-		Ok,Skip,Fail) when is_reference(OtherRef), 
+wait_and_resend(Ref, [{OtherRef,_,0,_,_}|Ps],
+		Ok,Skip,Fail) when is_reference(OtherRef),
 				   OtherRef /= Ref ->
     %% ignore cases that belong to nested group
     Ps1 = rm_cases_upto(OtherRef, Ps),
@@ -3152,7 +3279,7 @@ wait_and_resend(Ref, [{OtherRef,_,0,_,_}|Ps],
 wait_and_resend(Ref, [{_,CurrPid,CaseNum,Mod,Func}|Ps] = Cases, Ok,Skip,Fail) ->
     receive
 	{finished,_Ref,CurrPid,CaseNum,Mod,Func,Result,_RetVal} = Msg ->
-	    %% resend message to main process so that it can be used 
+	    %% resend message to main process so that it can be used
 	    %% to handle buffered io messages later
 	    self() ! Msg,
 	    MF = {Mod,Func},
@@ -3163,7 +3290,7 @@ wait_and_resend(Ref, [{_,CurrPid,CaseNum,Mod,Func}|Ps] = Cases, Ok,Skip,Fail) ->
 		    failed -> {Ok,Skip,[MF|Fail]}
 		end,
 	    wait_and_resend(Ref, Ps, Ok1,Skip1,Fail1);
-	{'EXIT',CurrPid,Reason} when Reason /= normal -> 
+	{'EXIT',CurrPid,Reason} when Reason /= normal ->
 	    %% unexpected termination of test case process
 	    {value,{_,_,CaseNum,Mod,Func}} = lists:keysearch(CurrPid, 2, Cases),
 	    print(1, "Error! Process for test case #~p (~p:~p) died! Reason: ~p",
@@ -3186,17 +3313,17 @@ rm_cases_upto(Ref, [_|Ps]) ->
 %% execution. The common log files (major, html etc) must however be
 %% written to sequentially. The test case processes send print requests
 %% to the main (starting) process (the same process executing
-%% run_test_cases_loop/4), which handles these requests in the same 
+%% run_test_cases_loop/4), which handles these requests in the same
 %% order that the test case processes were started.
 %%
 %% An io session is always started with a {started,Ref,Pid,Num,Mod,Func}
 %% message and terminated with {finished,Ref,Pid,Num,Mod,Func,Result,RetVal}.
 %% The result shipped with the finished message from a parallel process
-%% is used to update status data of the current test run. An 'EXIT' 
-%% message from each parallel test case process (after finishing and 
+%% is used to update status data of the current test run. An 'EXIT'
+%% message from each parallel test case process (after finishing and
 %% terminating) is also received and handled here.
 %%
-%% During execution of a parallel group, any cases (conf or normal) 
+%% During execution of a parallel group, any cases (conf or normal)
 %% belonging to a nested group will also get its io printouts buffered.
 %% This is necessary to get the major and html log files written in
 %% correct sequence. This function handles also the print messages
@@ -3207,7 +3334,7 @@ rm_cases_upto(Ref, [_|Ps]) ->
 %% See the header comment for run_test_cases_loop/4 for more
 %% info about IO handling.
 %%
-%% Note: It is important that the type of messages handled here 
+%% Note: It is important that the type of messages handled here
 %% do not get consumated by test_server:run_test_case_msgloop/5
 %% during the test case execution (e.g. in the catch clause of
 %% the receive)!
@@ -3231,7 +3358,7 @@ handle_test_case_io_and_status() ->
 				  ok
 		  end, Cases),
 	    Result
-    end.    
+    end.
 
 %% Handle cases (without Ref) that belong to the top parallel group (i.e. when Refs = [])
 handle_io_and_exit_loop([], [{undefined,CurrPid,CaseNum,Mod,Func}|Ps] = Cases, Ok,Skip,Fail) ->
@@ -3249,7 +3376,7 @@ handle_io_and_exit_loop([], [{undefined,CurrPid,CaseNum,Mod,Func}|Ps] = Cases, O
 	1000 ->
 	    exit({testcase_failed_to_start,Mod,Func})
     end;
-    
+
 %% Handle cases that belong to groups nested under top parallel group
 handle_io_and_exit_loop(Refs, [{Ref,CurrPid,CaseNum,Mod,Func}|Ps] = Cases, Ok,Skip,Fail) ->
     receive
@@ -3269,7 +3396,7 @@ handle_io_and_exit_loop(Refs, [{Ref,CurrPid,CaseNum,Mod,Func}|Ps] = Cases, Ok,Sk
 	1000 ->
 	    exit({testcase_failed_to_start,Mod,Func})
     end;
-    
+
 handle_io_and_exit_loop(_, [], Ok,Skip,Fail) ->
     {lists:reverse(Ok),lists:reverse(Skip),lists:reverse(Fail)}.
 
@@ -3286,7 +3413,7 @@ handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases) ->
 		failed ->
 		    put(test_server_failed, get(test_server_failed)+1);
 		skipped ->
-		    SkipCounters = 
+		    SkipCounters =
 			update_skip_counters(RetVal, get(test_server_skipped)),
 		    put(test_server_skipped, SkipCounters)
 	    end,
@@ -3298,7 +3425,7 @@ handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases) ->
 	    handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases);
 
 	%% unexpected termination of test case process
-	{'EXIT',TCPid,Reason} when Reason /= normal -> 
+	{'EXIT',TCPid,Reason} when Reason /= normal ->
 	    {value,{_,_,Num,M,F}} = lists:keysearch(TCPid, 2, Cases),
 	    print(1, "Error! Process for test case #~p (~p:~p) died! Reason: ~p",
 		  [Num, M, F, Reason]),
@@ -3307,65 +3434,65 @@ handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% run_test_case(Ref, Num, Mod, Func, Args, RunInit, 
-%%               Where, MultiplyTimetrap, Mode) -> RetVal
+%% run_test_case(Ref, Num, Mod, Func, Args, RunInit,
+%%               Where, TimetrapData, Mode) -> RetVal
 %%
 %% Creates the minor log file and inserts some test case specific headers
-%% and footers into the log files. If a remote target is used, the test 
+%% and footers into the log files. If a remote target is used, the test
 %% suite (binary) and the content of data_dir is sent. Then the test case
-%% is executed and the result is printed to the log files (also info 
+%% is executed and the result is printed to the log files (also info
 %% about lingering processes & slave nodes in the system is presented).
-%% 
+%%
 %% RunInit decides if the per test case init is to be run (true for all
 %% but conf cases).
 %%
-%% Where specifies if the test case should run on target or on the host. 
+%% Where specifies if the test case should run on target or on the host.
 %% (Note that 'make' test cases always run on host).
-%% 
+%%
 %% Mode specifies if the test case should be executed by a dedicated,
 %% parallel, process rather than sequentially by the main process. If
 %% the former, the new process is spawned and the dictionary of the main
 %% process is copied to the test case process.
-%% 
-%% RetVal is the result of executing the test case. It contains info 
+%%
+%% RetVal is the result of executing the test case. It contains info
 %% about the execution time and the return value of the test case function.
 
-run_test_case(Ref, Num, Mod, Func, Args, RunInit, Where, MultiplyTimetrap) ->
+run_test_case(Ref, Num, Mod, Func, Args, RunInit, Where, TimetrapData) ->
     file:set_cwd(filename:dirname(get(test_server_dir))),
-    run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where, 
-		   MultiplyTimetrap, [], [], self()).
+    run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
+		   TimetrapData, [], [], self()).
 
-run_test_case(Ref, Num, Mod, Func, Args, skip_init, Where, MultiplyTimetrap, Mode) ->
+run_test_case(Ref, Num, Mod, Func, Args, skip_init, Where, TimetrapData, Mode) ->
     %% a conf case is always executed by the main process
-    run_test_case1(Ref, Num, Mod, Func, Args, skip_init, Where, 
-		   MultiplyTimetrap, [], Mode, self());    
+    run_test_case1(Ref, Num, Mod, Func, Args, skip_init, Where,
+		   TimetrapData, [], Mode, self());
 
-run_test_case(Ref, Num, Mod, Func, Args, RunInit, Where, MultiplyTimetrap, Mode) ->
+run_test_case(Ref, Num, Mod, Func, Args, RunInit, Where, TimetrapData, Mode) ->
     file:set_cwd(filename:dirname(get(test_server_dir))),
     case check_prop(parallel, Mode) of
 	false ->
 	    %% this is a sequential test case
-	    run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where, 
-			   MultiplyTimetrap, [], Mode, self());
+	    run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
+			   TimetrapData, [], Mode, self());
 	_Ref ->
 	    %% this a parallel test case, spawn the new process
 	    Main = self(),
-	    {dictionary,State} = process_info(self(), dictionary), 
+	    {dictionary,State} = process_info(self(), dictionary),
 	    spawn_link(fun() ->
-			   run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where, 
-					  MultiplyTimetrap, State, Mode, Main)
-		       end)	    
+			   run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
+					  TimetrapData, State, Mode, Main)
+		       end)
     end.
 
-run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where, 
-	       MultiplyTimetrap, State, Mode, Main) ->
-    %% if this runs on a parallel test case process, 
+run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
+	       TimetrapData, State, Mode, Main) ->
+    %% if this runs on a parallel test case process,
     %% copy the dictionary from the main process
     do_if_parallel(Main, fun() -> process_flag(trap_exit, true) end, ok),
     CopyDict = fun() -> lists:foreach(fun({Key,Val}) -> put(Key, Val) end, State) end,
     do_if_parallel(Main, CopyDict, ok),
     do_if_parallel(Main, fun() -> put(test_server_common_io_handler, {tc,Main}) end, ok),
-    %% if io is being buffered, send start io session message 
+    %% if io is being buffered, send start io session message
     %% (no matter if case runs on parallel or main process)
     case get(test_server_common_io_handler) of
 	undefined -> ok;
@@ -3373,7 +3500,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
     end,
     TSDir = get(test_server_dir),
     case Where of
-	target -> 
+	target ->
 	    maybe_send_beam_and_datadir(Mod);
 	host ->
 	    ok
@@ -3396,8 +3523,8 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
     do_if_parallel(Main, ok, fun erlang:yield/0),
     %% run the test case
     {Result,DetectedFail,ProcsBefore,ProcsAfter} =
-	run_test_case_apply(Num, Mod, Func, Args, get_name(Mode), 
-			    RunInit, Where, MultiplyTimetrap),
+	run_test_case_apply(Num, Mod, Func, Args, get_name(Mode),
+			    RunInit, Where, TimetrapData),
     {Time,RetVal,Loc,Opts,Comment} =
 	case Result of
 	    Normal={_Time,_RetVal,_Loc,_Opts,_Comment} -> Normal;
@@ -3409,7 +3536,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
     print(major, "=ended         ~s", [lists:flatten(timestamp_get(""))]),
 
     do_if_parallel(Main, ok, fun() -> file:set_cwd(filename:dirname(TSDir)) end),
-    
+
     %% call the appropriate progress function clause to print the results to log
     Status =
 	case {Time,RetVal} of
@@ -3423,16 +3550,16 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
 		progress(skip, Num, Mod, Func, Loc, Reason,
 			 Time, Comment, Style);
 	    {_,{'EXIT',_Pid,{Skip,Reason}}} when Skip==skip; Skip==skipped ->
-		progress(skip, Num, Mod, Func, Loc, Reason, 
+		progress(skip, Num, Mod, Func, Loc, Reason,
 			 Time, Comment, Style);
 	    {_,{'EXIT',_Pid,Reason}} ->
-		progress(failed, Num, Mod, Func, Loc, Reason, 
+		progress(failed, Num, Mod, Func, Loc, Reason,
 			 Time, Comment, Style);
 	    {_,{'EXIT',Reason}} ->
-		progress(failed, Num, Mod, Func, Loc, Reason, 
+		progress(failed, Num, Mod, Func, Loc, Reason,
 			 Time, Comment, Style);
-	    {_, {failed, Reason}} ->
-		progress(failed, Num, Mod, Func, Loc, Reason, 
+	    {_, {Fail, Reason}} when Fail =:= fail; Fail =:= failed ->
+		progress(failed, Num, Mod, Func, Loc, Reason,
 			 Time, Comment, Style);
 	    {_, {Skip, Reason}} when Skip==skip; Skip==skipped ->
 		progress(skip, Num, Mod, Func, Loc, Reason,
@@ -3442,7 +3569,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
 		    [] ->
 			progress(ok, Num, Mod, Func, Loc, RetVal,
 				 Time, Comment, Style);
-		    
+
 		    Reason ->
 			progress(failed, Num, Mod, Func, Loc, Reason,
 				 Time, Comment, Style)
@@ -3465,18 +3592,18 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
 	    {US,AS} = get(test_server_skipped),
 	    put(test_server_skipped, {US,AS+1})
     end,
-    %% only if test case execution is sequential do we care about the 
+    %% only if test case execution is sequential do we care about the
     %% remaining processes and slave nodes count
     case self() of
 	Main ->
 	    case test_server_sup:framework_call(warn, [processes], true) of
 		true ->
 		    if ProcsBefore < ProcsAfter ->
-			    print(minor, 
+			    print(minor,
 				  "WARNING: ~w more processes in system after test case",
 				  [ProcsAfter-ProcsBefore]);
 		       ProcsBefore > ProcsAfter ->
-			    print(minor, 
+			    print(minor,
 				  "WARNING: ~w less processes in system after test case",
 				  [ProcsBefore-ProcsAfter]);
 		       true -> ok
@@ -3487,13 +3614,13 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
 	    case test_server_sup:framework_call(warn, [nodes], true) of
 		true ->
 		    case catch controller_call(kill_slavenodes) of
-			{'EXIT',_}=Exit ->
+			{'EXIT',_} = Exit ->
 			    print(minor,
 				  "WARNING: There might be slavenodes left in the"
 				  " system. I tried to kill them, but I failed: ~p\n",
 				  [Exit]);
 			[] -> ok;
-			List ->	    
+			List ->
 			    print(minor, "WARNING: ~w slave nodes in system after test"++
 				  "case. Tried to killed them.~n"++
 				  "         Names:~p",
@@ -3505,8 +3632,8 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
 	_ ->
 	    ok
     end,
-    %% if the test case was executed sequentially, this updates the execution 
-    %% time count on the main process (adding execution time of parallel test 
+    %% if the test case was executed sequentially, this updates the execution
+    %% time count on the main process (adding execution time of parallel test
     %% case groups is done in run_test_cases_loop/4)
     if is_number(Time) ->
 	    put(test_server_total_time, get(test_server_total_time)+Time);
@@ -3515,7 +3642,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
     end,
     check_new_crash_dumps(Where),
 
-    %% if io is being buffered, send finished message 
+    %% if io is being buffered, send finished message
     %% (no matter if case runs on parallel or main process)
     case get(test_server_common_io_handler) of
 	undefined -> ok;
@@ -3528,7 +3655,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
 %%--------------------------------------------------------------------
 %% various help functions
 
-%% Call If() if we're on parallel process, or 
+%% Call If() if we're on parallel process, or
 %% call Else() if we're on main process
 do_if_parallel(Pid, If, Else) ->
     case self() of
@@ -3536,7 +3663,7 @@ do_if_parallel(Pid, If, Else) ->
 	    if is_function(Else) -> Else();
 	       true -> Else
 	    end;
-	_ -> 
+	_ ->
 	    if is_function(If) -> If();
 	       true -> If
 	    end
@@ -3549,13 +3676,13 @@ num2str(N) -> integer_to_list(N).
 %% and the content of datadir til target.
 maybe_send_beam_and_datadir(Mod) ->
     case get(test_server_ctrl_job_sock) of
-	undefined -> 
+	undefined ->
 	    %% local target
 	    ok;
 	JobSock ->
 	    %% remote target
 	    case get(test_server_downloaded_suites) of
-		undefined -> 
+		undefined ->
 		    send_beam_and_datadir(Mod, JobSock),
 		    put(test_server_downloaded_suites, [Mod]);
 		Suites ->
@@ -3571,10 +3698,10 @@ maybe_send_beam_and_datadir(Mod) ->
 
 send_beam_and_datadir(Mod, JobSock) ->
     case code:which(Mod) of
-	non_existing -> 
+	non_existing ->
 	    io:format("** WARNING: Suite ~w could not be found on host\n",
 		      [Mod]);
-	BeamFile -> 
+	BeamFile ->
 	    send_beam(JobSock, Mod, BeamFile)
     end,
     DataDir = get_data_dir(Mod),
@@ -3589,7 +3716,7 @@ send_beam_and_datadir(Mod, JobSock) ->
 			ModsInDatadir = filelib:wildcard(Wc),
 			SendBeamFun = fun(X) -> send_beam(JobSock, X) end,
 			lists:foreach(SendBeamFun, ModsInDatadir),
-			%% No need to send C code or makefiles since 
+			%% No need to send C code or makefiles since
 			%% no compilation can be done on target anyway.
 			%% Compiled C code must exist on target.
 			%% Beam files are already sent as binaries.
@@ -3597,7 +3724,7 @@ send_beam_and_datadir(Mod, JobSock) ->
 			%% is to compile it.
 			Filter = fun("Makefile") -> false;
 				    ("Makefile.src") -> false;
-				    (Y) -> 
+				    (Y) ->
 					 case filename:extension(Y) of
 					     ".c"   -> false;
 					     ObjExt -> false;
@@ -3611,7 +3738,7 @@ send_beam_and_datadir(Mod, JobSock) ->
 	    Tarfile =  "data_dir.tar.gz",
 	    {ok,Tar} = erl_tar:open(Tarfile, [write,compressed]),
 	    ShortDataDir = filename:basename(DataDir),
-	    AddTarFun = 
+	    AddTarFun =
 		fun(File) ->
 			Long = filename:join(DataDir, File),
 			Short = filename:join(ShortDataDir, File),
@@ -3628,11 +3755,11 @@ send_beam_and_datadir(Mod, JobSock) ->
 
 send_beam(JobSock, BeamFile) ->
     Mod=filename:rootname(filename:basename(BeamFile), code:objfile_extension()),
-    send_beam(JobSock, list_to_atom(Mod), BeamFile).    
+    send_beam(JobSock, list_to_atom(Mod), BeamFile).
 send_beam(JobSock, Mod, BeamFile) ->
     {ok,BeamBin} = file:read_file(BeamFile),
     request(JobSock, {{beam,Mod,BeamFile}, BeamBin}).
-    
+
 check_new_crash_dumps(Where) ->
     case Where of
 	target ->
@@ -3649,25 +3776,25 @@ check_new_crash_dumps(Where) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% progress(Result, CaseNum, Mod, Func, Location, Reason, Time, 
+%% progress(Result, CaseNum, Mod, Func, Location, Reason, Time,
 %%	    Comment, TimeFormat) -> Result
 %%
 %% Prints the result of the test case to log file.
 %% Note: Strings that are to be written to the minor log must
 %% be prefixed with "=== " here, or the indentation will be wrong.
 
-progress(skip, CaseNum, Mod, Func, Loc, Reason, Time, 
+progress(skip, CaseNum, Mod, Func, Loc, Reason, Time,
 	 Comment, {St0,St1}) ->
-    {Reason1,{Color,Ret}} = if_auto_skip(Reason, 
+    {Reason1,{Color,Ret}} = if_auto_skip(Reason,
 					 fun() -> {"#ffcc99",auto_skip} end,
 					 fun() -> {"#ff9933",skip} end),
     print(major, "=result        skipped", []),
-    print(1, "*** SKIPPED *** ~s", 
+    print(1, "*** SKIPPED *** ~s",
 	  [get_info_str(Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report, [tc_done,{?pl2a(Mod),Func,
 						     {skipped,Reason1}}]),
     ReasonStr = reason_to_string(Reason1),
-    ReasonStr1 = lists:flatten([string:strip(S,left) || 
+    ReasonStr1 = lists:flatten([string:strip(S,left) ||
 				S <- string:tokens(ReasonStr,[$\n])]),
     ReasonStr2 =
 	if length(ReasonStr1) > 80 ->
@@ -3686,10 +3813,10 @@ progress(skip, CaseNum, Mod, Func, Loc, Reason, Time,
 	  [Time,Color,ReasonStr2,Comment1]),
     FormatLoc = test_server_sup:format_loc(Loc),
     print(minor, "=== location ~s", [FormatLoc]),
-    print(minor, "=== reason = ~s", [ReasonStr1]),    
+    print(minor, "=== reason = ~s", [ReasonStr1]),
     Ret;
-    
-progress(failed, CaseNum, Mod, Func, Loc, timetrap_timeout, T, 
+
+progress(failed, CaseNum, Mod, Func, Loc, timetrap_timeout, T,
 	 Comment0, {St0,St1}) ->
     print(major, "=result        failed: timeout, ~p", [Loc]),
     print(1, "*** FAILED *** ~s",
@@ -3699,23 +3826,23 @@ progress(failed, CaseNum, Mod, Func, Loc, timetrap_timeout, T,
 					     {failed,timetrap_timeout}}]),
     FormatLastLoc = test_server_sup:format_loc(get_last_loc(Loc)),
     ErrorReason = io_lib:format("{timetrap_timeout,~s}", [FormatLastLoc]),
-    Comment = 
+    Comment =
 	case Comment0 of
 	    "" -> "<font color=\"red\">" ++ ErrorReason ++ "</font>";
-	    _ -> "<font color=\"red\">" ++ ErrorReason ++ "</font><br>" ++ 
+	    _ -> "<font color=\"red\">" ++ ErrorReason ++ "</font><br>" ++
                  to_string(Comment0)
 	end,
-    print(html, 
+    print(html,
 	  "<td>" ++ St0 ++ "~.3fs" ++ St1 ++ "</td>"
 	  "<td><font color=\"red\">FAILED</font></td>"
-	  "<td>~s</td></tr>\n", 
+	  "<td>~s</td></tr>\n",
 	  [T/1000,Comment]),
     FormatLoc = test_server_sup:format_loc(Loc),
     print(minor, "=== location ~s", [FormatLoc]),
     print(minor, "=== reason = timetrap timeout", []),
     failed;
 
-progress(failed, CaseNum, Mod, Func, Loc, {testcase_aborted,Reason}, _T, 
+progress(failed, CaseNum, Mod, Func, Loc, {testcase_aborted,Reason}, _T,
 	 Comment0, {St0,St1}) ->
     print(major, "=result        failed: testcase_aborted, ~p", [Loc]),
     print(1, "*** FAILED *** ~s",
@@ -3725,23 +3852,23 @@ progress(failed, CaseNum, Mod, Func, Loc, {testcase_aborted,Reason}, _T,
 					     {failed,testcase_aborted}}]),
     FormatLastLoc = test_server_sup:format_loc(get_last_loc(Loc)),
     ErrorReason = io_lib:format("{testcase_aborted,~s}", [FormatLastLoc]),
-    Comment = 
+    Comment =
 	case Comment0 of
 	    "" -> "<font color=\"red\">" ++ ErrorReason ++ "</font>";
-	    _ -> "<font color=\"red\">" ++ ErrorReason ++ "</font><br>" ++ 
+	    _ -> "<font color=\"red\">" ++ ErrorReason ++ "</font><br>" ++
                  to_string(Comment0)
 	end,
-    print(html, 
+    print(html,
 	  "<td>" ++ St0 ++ "died" ++ St1 ++ "</td>"
 	  "<td><font color=\"red\">FAILED</font></td>"
-	  "<td>~s</td></tr>\n", 
+	  "<td>~s</td></tr>\n",
 	  [Comment]),
     FormatLoc = test_server_sup:format_loc(Loc),
     print(minor, "=== location ~s", [FormatLoc]),
     print(minor, "=== reason = {testcase_aborted,~p}", [Reason]),
     failed;
 
-progress(failed, CaseNum, Mod, Func, unknown, Reason, Time, 
+progress(failed, CaseNum, Mod, Func, unknown, Reason, Time,
 	 Comment0, {St0,St1}) ->
     print(major, "=result        failed: ~p, ~p", [Reason,unknown]),
     print(1, "*** FAILED *** ~s",
@@ -3749,10 +3876,10 @@ progress(failed, CaseNum, Mod, Func, unknown, Reason, Time,
     test_server_sup:framework_call(report, [tc_done,{?pl2a(Mod),Func,
 						     {failed,Reason}}]),
     TimeStr = io_lib:format(if is_float(Time) -> "~.3fs";
-			       true -> "~w"	     
+			       true -> "~w"
 			    end, [Time]),
     ErrorReason = lists:flatten(io_lib:format("~p", [Reason])),
-    ErrorReason1 = lists:flatten([string:strip(S,left) || 
+    ErrorReason1 = lists:flatten([string:strip(S,left) ||
 				  S <- string:tokens(ErrorReason,[$\n])]),
     ErrorReason2 =
 	if length(ErrorReason1) > 63 ->
@@ -3760,13 +3887,13 @@ progress(failed, CaseNum, Mod, Func, unknown, Reason, Time,
 	   true ->
 		ErrorReason1
 	end,
-    Comment = 
+    Comment =
 	case Comment0 of
 	    "" -> "<font color=\"red\">" ++ ErrorReason2 ++ "</font>";
-	    _ -> "<font color=\"red\">" ++ ErrorReason2 ++ "</font><br>" ++ 
+	    _ -> "<font color=\"red\">" ++ ErrorReason2 ++ "</font><br>" ++
 		 to_string(Comment0)
 	end,
-    print(html, 
+    print(html,
 	  "<td>" ++ St0 ++ "~s" ++ St1 ++ "</td>"
 	  "<td><font color=\"red\">FAILED</font></td>"
 	  "<td>~s</td></tr>\n",
@@ -3776,7 +3903,7 @@ progress(failed, CaseNum, Mod, Func, unknown, Reason, Time,
     print(minor, "=== reason = "++FStr, [FormattedReason]),
     failed;
 
-progress(failed, CaseNum, Mod, Func, Loc, Reason, Time, 
+progress(failed, CaseNum, Mod, Func, Loc, Reason, Time,
 	 Comment0, {St0,St1}) ->
     print(major, "=result        failed: ~p, ~p", [Reason,Loc]),
     print(1, "*** FAILED *** ~s",
@@ -3784,18 +3911,18 @@ progress(failed, CaseNum, Mod, Func, Loc, Reason, Time,
     test_server_sup:framework_call(report, [tc_done,{?pl2a(Mod),Func,
 						     {failed,Reason}}]),
     TimeStr = io_lib:format(if is_float(Time) -> "~.3fs";
-			       true -> "~w"	     
+			       true -> "~w"
 			    end, [Time]),
-    Comment = 
+    Comment =
 	case Comment0 of
 	    "" -> "";
 	    _ -> "<br>" ++ to_string(Comment0)
 	end,
     FormatLastLoc = test_server_sup:format_loc(get_last_loc(Loc)),
-    print(html, 
+    print(html,
 	  "<td>" ++ St0 ++ "~s" ++ St1 ++ "</td>"
 	  "<td><font color=\"red\">FAILED</font></td>"
-	  "<td><font color=\"red\">~s</font>~s</td></tr>\n", 
+	  "<td><font color=\"red\">~s</font>~s</td></tr>\n",
 	  [TimeStr,FormatLastLoc,Comment]),
     FormatLoc = test_server_sup:format_loc(Loc),
     print(minor, "=== location ~s", [FormatLoc]),
@@ -3803,7 +3930,7 @@ progress(failed, CaseNum, Mod, Func, Loc, Reason, Time,
     print(minor, "=== reason = "++FStr, [FormattedReason]),
     failed;
 
-progress(ok, _CaseNum, Mod, Func, _Loc, RetVal, Time, 
+progress(ok, _CaseNum, Mod, Func, _Loc, RetVal, Time,
 	 Comment0, {St0,St1}) ->
     print(minor, "successfully completed test case", []),
     test_server_sup:framework_call(report, [tc_done,{?pl2a(Mod),Func,ok}]),
@@ -3852,9 +3979,9 @@ get_info_str(Func, 0, _Cases) ->
 get_info_str(_Func, CaseNum, unknown) ->
     "test case " ++ integer_to_list(CaseNum);
 get_info_str(_Func, CaseNum, Cases) ->
-    "test case " ++ integer_to_list(CaseNum) ++ 
+    "test case " ++ integer_to_list(CaseNum) ++
 	" of " ++ integer_to_list(Cases).
-    
+
 print_if_known(Known, {SK,AK}, {SU,AU}) ->
     {S,A} = if Known == unknown -> {SU,AU};
 	       true -> {SK,AK}
@@ -3880,7 +4007,7 @@ reason_to_string({failed,{_,FailFunc,bad_return}}) ->
     atom_to_list(FailFunc) ++ " bad return value";
 reason_to_string({failed,{_,FailFunc,{timetrap_timeout,_}}}) ->
     atom_to_list(FailFunc) ++ " timed out";
-reason_to_string(FWInitFail = {failed,{_CB,init_tc,_Reason}}) ->   
+reason_to_string(FWInitFail = {failed,{_CB,init_tc,_Reason}}) ->
     to_string(FWInitFail);
 reason_to_string({failed,{_,FailFunc,_}}) ->
     atom_to_list(FailFunc) ++ " failed";
@@ -3889,29 +4016,29 @@ reason_to_string(Other) ->
 
 %get_font_style(Prop) ->
 %    {Col,St0,St1} = get_font_style1(Prop),
-%    {{"<font color="++Col++">","</font>"}, 
+%    {{"<font color="++Col++">","</font>"},
 %     {"<font color="++Col++">"++St0,St1++"</font>"}}.
-    
+
 get_font_style(NormalCase, Mode) ->
-    Prop = if not NormalCase -> 
+    Prop = if not NormalCase ->
 		   default;
 	      true ->
 		   case check_prop(parallel, Mode) of
-		       false -> 
+		       false ->
 			   case check_prop(sequence, Mode) of
-			       false -> 
+			       false ->
 				   default;
-			       _ -> 
+			       _ ->
 				   sequence
 			   end;
-		       _ -> 
+		       _ ->
 			   parallel
 		   end
 	   end,
     {Col,St0,St1} = get_font_style1(Prop),
-    {{"<font color="++Col++">","</font>"}, 
+    {{"<font color="++Col++">","</font>"},
      {"<font color="++Col++">"++St0,St1++"</font>"}}.
-      
+
 get_font_style1(parallel) ->
     {"\"darkslategray\"","<i>","</i>"};
 get_font_style1(sequence) ->
@@ -3931,12 +4058,12 @@ get_font_style1(default) ->
 %% The framework application can switch this feature off by setting
 %% *its* application environment variable 'format_exception' to false.
 %% It is also possible to switch formatting off by starting the
-%% test_server node with init argument 'test_server_format_exception' 
+%% test_server node with init argument 'test_server_format_exception'
 %% set to false.
 
 format_exception(Reason={_Error,Stack}) when is_list(Stack) ->
     case os:getenv("TEST_SERVER_FRAMEWORK") of
-	false ->
+	FW when FW =:= false; FW =:= "undefined" ->
 	    case application:get_env(test_server, format_exception) of
 		{ok,false} ->
 		    {"~p",Reason};
@@ -3950,17 +4077,17 @@ format_exception(Reason={_Error,Stack}) when is_list(Stack) ->
 		_ ->
 		    do_format_exception(Reason)
 	    end
-    end;             
+    end;
 format_exception(Error) ->
     format_exception({Error,[]}).
 
 do_format_exception(Reason={Error,Stack}) ->
     StackFun = fun(_, _, _) -> false end,
-    PF = fun(Term, I) -> 
-		 io_lib:format("~." ++ integer_to_list(I) ++ "p", [Term]) 
+    PF = fun(Term, I) ->
+		 io_lib:format("~." ++ integer_to_list(I) ++ "p", [Term])
 	 end,
     case catch lib:format_exception(1, error, Error, Stack, StackFun, PF) of
-	{'EXIT',_} -> 
+	{'EXIT',_} ->
 	    {"~p",Reason};
 	Formatted  ->
 	    Formatted1 = re:replace(Formatted, "exception error: ", "", [{return,list}]),
@@ -3969,8 +4096,8 @@ do_format_exception(Reason={Error,Stack}) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, 
-%%                     Where, MultiplyTimetrap) -> 
+%% run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit,
+%%                     Where, TimetrapData) ->
 %%  {{Time,RetVal,Loc,Opts,Comment},DetectedFail,ProcessesBefore,ProcessesAfter} |
 %%  {{died,Reason,unknown,Comment},DetectedFail,ProcessesBefore,ProcessesAfter}
 %% Name = atom()
@@ -3984,24 +4111,24 @@ do_format_exception(Reason={Error,Stack}) ->
 %% ProcessesBefore = ProcessesAfter = integer()
 %%
 %% Where indicates if the test should run on target or always on the host.
-%% 
-%% If test is to be run on target, and target is remote the request is 
+%%
+%% If test is to be run on target, and target is remote the request is
 %% sent over socket to target, and test_server runs the case and sends the
 %% result back over the socket. Else test_server runs the case directly on host.
 
-run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, host, MultiplyTimetrap) ->
+run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, host, TimetrapData) ->
     test_server:run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,
-				     MultiplyTimetrap});
-run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, target, MultiplyTimetrap) ->
+				     TimetrapData});
+run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, target, TimetrapData) ->
     case get(test_server_ctrl_job_sock) of
 	undefined ->
 	    %% local target
 	    test_server:run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,
-					     MultiplyTimetrap});
+					     TimetrapData});
 	JobSock ->
 	    %% remote target
 	    request(JobSock, {test_case,{CaseNum,Mod,Func,Args,Name,RunInit,
-					 MultiplyTimetrap}}),
+					 TimetrapData}}),
 	    read_job_sock_loop(JobSock)
     end.
 
@@ -4012,15 +4139,15 @@ run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, target, MultiplyTim
 %% Args = [term()]
 %%
 %% Just like io:format, except that depending on the Detail value, the output
-%% is directed to console, major and/or minor log files. 
+%% is directed to console, major and/or minor log files.
 %%
 %% To handle printouts to common (not minor) log files from parallel test
 %% case processes, the test_server_common_io_handler value is checked. If
 %% set, the data is sent to the main controlling process. Note that test
 %% cases that belong to a conf group nested under a parallel group will also
 %% get its io data sent to main rather than immediately printed out, even
-%% if the test cases are executed by the same, main, process (ie the main 
-%% process sends messages to itself then). 
+%% if the test cases are executed by the same, main, process (ie the main
+%% process sends messages to itself then).
 %%
 %% Buffered io is handled by the handle_test_case_io_and_status/0 function.
 
@@ -4040,21 +4167,21 @@ print_or_buffer(Detail, Msg, Printer) ->
 	    output({Detail,Msg}, Printer);
 	MinLevel when is_number(Detail), Detail >= MinLevel ->
 	    output({Detail,Msg}, Printer);
-	_ ->					% Detail < Minor | major | html 
+	_ ->					% Detail < Minor | major | html
 	    case get(test_server_common_io_handler) of
-		undefined ->		    
+		undefined ->
 		    output({Detail,Msg}, Printer);
 		{_,MainPid} ->
 		    MainPid ! {print,self(),Detail,Msg}
 	    end
-    end.	    
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% print_timestamp(Detail, Leader) -> ok
 %%
 %% Prints Leader followed by a time stamp (date and time). Depending on
 %% the Detail value, the output is directed to console, major and/or minor
-%% log files. 
+%% log files.
 
 print_timestamp(Detail, Leader) ->
     print(Detail, timestamp_get(Leader), []).
@@ -4288,7 +4415,7 @@ update_config(Config, []) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% collect_cases(CurMod, TopCase, SkipList) -> 
+%% collect_cases(CurMod, TopCase, SkipList) ->
 %%     BasicCaseList | {error,Reason}
 %%
 %% CurMod = atom()
@@ -4319,18 +4446,18 @@ update_config(Config, []) ->
 %%                           are listed, and each Module:all(suite) is called
 %% {dir,Dir,Pattern}         All modules <Pattern>_SUITE in the named dir
 %%                           are listed, and each Module:all(suite) is called
-%% {conf,InitMF,Cases,FinMF} 
-%% {conf,Props,InitMF,Cases,FinMF} 
+%% {conf,InitMF,Cases,FinMF}
+%% {conf,Props,InitMF,Cases,FinMF}
 %%                           InitMF is placed in the BasicCaseList, then
 %%                           Cases is treated according to this table, then
 %%                           FinMF is placed in the BasicCaseList. InitMF
 %%                           and FinMF are configuration manipulation
 %%                           functions. See below.
-%% {make,InitMFA,Cases,FinMFA} 
+%% {make,InitMFA,Cases,FinMFA}
 %%                           InitMFA is placed in the BasicCaseList, then
 %%                           Cases is treated according to this table, then
 %%                           FinMFA is placed in the BasicCaseList. InitMFA
-%%                           and FinMFA are make/unmake functions. If InitMFA 
+%%                           and FinMFA are make/unmake functions. If InitMFA
 %%                           fails, Cases are not run. InitMFA and FinMFA are
 %%                           always run on the host - not on target.
 %%
@@ -4339,7 +4466,7 @@ update_config(Config, []) ->
 %%
 %% []                        Leaf case
 %% {req,ReqList}             Kept for backwards compatibility - same as []
-%% {req,ReqList,Cases}       Kept for backwards compatibility - 
+%% {req,ReqList,Cases}       Kept for backwards compatibility -
 %%                           Cases parsed recursively with collect_cases/3
 %% Cases (list)              Recursively parsed with collect_cases/3
 %%
@@ -4351,7 +4478,7 @@ update_config(Config, []) ->
 %% Configuration manipulation functions are called with the current
 %% configuration list as only argument, and are expected to return a new
 %% configuration list. Such a pair of function may, for example, start a
-%% server and stop it after a serie of test cases. 
+%% server and stop it after a serie of test cases.
 %%
 %% SkipCases is expected to be in the format:
 %%
@@ -4364,10 +4491,10 @@ update_config(Config, []) ->
 	     skip}).				% skip list
 
 collect_all_cases(Top, Skip) when is_list(Skip) ->
-    Result = 
+    Result =
 	case collect_cases(Top, #cc{mod=[],skip=Skip}) of
 	    {ok,Cases,_St} -> Cases;
-	    Other -> Other
+	    Other          -> Other
 	end,
     Result.
 
@@ -4379,12 +4506,12 @@ collect_cases([Case|Cs0], St0) ->
 	    case collect_cases(Cs0, St1) of
 		{ok,FlatCases2,St} ->
 		    {ok,FlatCases1 ++ FlatCases2,St};
-		{error,_Reason}=Error -> Error
+		{error,_Reason} = Error -> Error
 	    end;
-	{error,_Reason}=Error -> Error
+	{error,_Reason} = Error -> Error
     end;
 
-   
+
 collect_cases({module,Case}, St) when is_atom(Case), is_atom(St#cc.mod) ->
     collect_case({St#cc.mod,Case}, St);
 collect_cases({module,Mod,Case}, St) ->
@@ -4404,38 +4531,71 @@ collect_cases({conf,InitMF,CaseList,FinF}, St) when is_atom(FinF) ->
 collect_cases({conf,InitMF,CaseList,FinMF}, St0) ->
     collect_cases({conf,[],InitMF,CaseList,FinMF}, St0);
 collect_cases({conf,Props,InitF,CaseList,FinMF}, St) when is_atom(InitF) ->
-    collect_cases({conf,Props,{St#cc.mod,InitF},CaseList,FinMF}, St);
+    case init_props(Props) of
+	{error,_} ->
+	    {ok,[],St};
+	Props1 ->
+	    collect_cases({conf,Props1,{St#cc.mod,InitF},CaseList,FinMF}, St)
+    end;
 collect_cases({conf,Props,InitMF,CaseList,FinF}, St) when is_atom(FinF) ->
-    collect_cases({conf,Props,InitMF,CaseList,{St#cc.mod,FinF}}, St);
-collect_cases({conf,Props,InitMF,CaseList,FinMF}, St0) ->
-    case collect_cases(CaseList, St0) of
-	{ok,[],_St}=Empty -> 
-	    Empty;
-	{ok,FlatCases,St} ->
+    case init_props(Props) of
+	{error,_} ->
+	    {ok,[],St};
+	Props1 ->
+	    collect_cases({conf,Props1,InitMF,CaseList,{St#cc.mod,FinF}}, St)
+    end;
+collect_cases({conf,Props,InitMF,CaseList,FinMF} = Conf, St) ->
+    case init_props(Props) of
+	{error,_} ->
+	    {ok,[],St};
+	Props1 ->
 	    Ref = make_ref(),
-	    case in_skip_list(InitMF, St#cc.skip) of
-		{true,Comment} ->	    
-		    {ok,[{skip_case,{conf,Ref,InitMF,Comment}} | 
-			 FlatCases ++ [{conf,Ref,[],FinMF}]],St};
+	    Skips = St#cc.skip,
+	    case in_skip_list({St#cc.mod,Conf}, Skips) of
+		{true,Comment} ->	    	           % conf init skipped
+		    {ok,[{skip_case,{conf,Ref,InitMF,Comment}} |
+			 [] ++ [{conf,Ref,[],FinMF}]],St};
+		{true,Name,Comment} when is_atom(Name) ->  % all cases skipped
+		    {ok,[{skip_case,{{St#cc.mod,{group,Name}},Comment}}],St};
+		{true,ToSkip,_} when is_list(ToSkip) ->    % some cases skipped
+		    case collect_cases(CaseList,
+				       St#cc{skip=ToSkip++Skips}) of
+			{ok,[],_St} = Empty ->
+			    Empty;
+			{ok,FlatCases,St1} ->
+			    {ok,[{conf,Ref,Props1,InitMF} |
+				 FlatCases ++ [{conf,Ref,
+						keep_name(Props1),
+						FinMF}]],St1#cc{skip=Skips}};
+			{error,_Reason} = Error ->
+			    Error
+		    end;
 		false ->
-		    {ok,[{conf,Ref,Props,InitMF} | 
-			 FlatCases ++ [{conf,Ref,keep_name(Props),FinMF}]],St}
-	    end;
-	{error,_Reason}=Error -> 
-	    Error
+		    case collect_cases(CaseList, St) of
+			{ok,[],_St} = Empty ->
+			    Empty;
+			{ok,FlatCases,St1} ->
+			    {ok,[{conf,Ref,Props1,InitMF} |
+				 FlatCases ++ [{conf,Ref,
+						keep_name(Props1),
+						FinMF}]],St1};
+			{error,_Reason} = Error ->
+			    Error
+		    end
+	    end
     end;
 
 collect_cases({make,InitMFA,CaseList,FinMFA}, St0) ->
     case collect_cases(CaseList, St0) of
-	{ok,[],_St}=Empty -> Empty;
+	{ok,[],_St} = Empty -> Empty;
 	{ok,FlatCases,St} ->
 	    Ref = make_ref(),
-	    {ok,[{make,Ref,InitMFA}|FlatCases ++ 
+	    {ok,[{make,Ref,InitMFA}|FlatCases ++
 		 [{make,Ref,FinMFA}]],St};
-	{error,_Reason}=Error -> Error
+	{error,_Reason} = Error -> Error
     end;
 
-collect_cases({Module, Cases}, St) when is_list(Cases)  -> 
+collect_cases({Module, Cases}, St) when is_list(Cases)  ->
     case (catch collect_case(Cases, St#cc{mod=Module}, [])) of
 	{ok, NewCases, NewSt} ->
  	    {ok, NewCases, NewSt};
@@ -4450,8 +4610,11 @@ collect_cases({_Mod,_Case,_Args}=Spec, St) ->
     collect_case(Spec, St);
 collect_cases(Case, St) when is_atom(Case), is_atom(St#cc.mod) ->
     collect_case({St#cc.mod,Case}, St);
-collect_cases(Other, _St) ->
-    {error,{bad_subtest_spec,Other}}.
+collect_cases(Other, St) ->
+    {error,{bad_subtest_spec,St#cc.mod,Other}}.
+
+collect_case({Mod,{conf,_,_,_,_}=Conf}, St) ->
+    collect_case_invoke(Mod, Conf, [], St);
 
 collect_case(MFA, St) ->
     case in_skip_list(MFA, St#cc.skip) of
@@ -4473,11 +4636,11 @@ collect_case([Case | Cases], St, Acc) ->
 
 collect_case_invoke(Mod, Case, MFA, St) ->
     case os:getenv("TEST_SERVER_FRAMEWORK") of
-	false ->
+	FW when FW =:= false; FW =:= "undefined" ->
 	    case catch apply(Mod, Case, [suite]) of
-		{'EXIT',_} -> 
+		{'EXIT',_} ->
 		    {ok,[MFA],St};
-		Suite -> 
+		Suite ->
 		    collect_subcases(Mod, Case, MFA, St, Suite)
 	    end;
 	_ ->
@@ -4485,9 +4648,10 @@ collect_case_invoke(Mod, Case, MFA, St) ->
 	    collect_subcases(Mod, Case, MFA, St, Suite)
     end.
 
-collect_subcases(Mod, Case, MFA, St, Suite) ->	    
+collect_subcases(Mod, Case, MFA, St, Suite) ->
     case Suite of
 	[] when Case == all -> {ok,[],St};
+	[] when element(1, Case) == conf -> {ok,[],St};
 	[] -> {ok,[MFA],St};
 %%%! --- START Kept for backwards compatibilty ---
 %%%! Requirements are not used
@@ -4498,6 +4662,8 @@ collect_subcases(Mod, Case, MFA, St, Suite) ->
 %%%! --- END Kept for backwards compatibilty ---
 	{Skip,Reason} when Skip==skip; Skip==skipped ->
 	    {ok,[{skip_case,{MFA,Reason}}],St};
+	{error,Reason} ->
+	    throw(Reason);
 	SubCases ->
 	    collect_case_subcases(Mod, Case, SubCases, St)
     end.
@@ -4536,7 +4702,7 @@ collect_case_deny(Mod, Case, MFA, ReqList, SubCases, St) ->
 	{granted,SubCases} ->
 	    collect_case_subcases(Mod, Case, SubCases, St)
     end.
-    
+
 check_deny([Req|Reqs], DenyList) ->
     case check_deny_req(Req, DenyList) of
 	{denied,_Comment}=Denied -> Denied;
@@ -4559,8 +4725,49 @@ check_deny_req(Req, DenyList) ->
 	false -> granted
     end.
 
+in_skip_list({Mod,{conf,Props,InitMF,_CaseList,_FinMF}}, SkipList) ->
+    case in_skip_list(InitMF, SkipList) of
+	{true,_} = Yes ->
+	    Yes;
+	_ ->
+	    case proplists:get_value(name, Props) of
+		undefined ->
+		    false;
+		Name ->
+		    ToSkip =
+			lists:flatmap(
+			  fun({M,{conf,SProps,_,SCaseList,_},Cmt}) when
+				    M == Mod ->
+				  case proplists:get_value(name, SProps) of
+				      all ->
+					  [{M,all,Cmt}];
+				      Name ->
+					  case SCaseList of
+					      all ->
+						  [{M,all,Cmt}];
+					      _ ->
+						  [{M,F,Cmt} || F <- SCaseList]
+					  end;
+				      _ ->
+					  []
+				  end;
+			     (_) ->
+				  []
+			  end, SkipList),
+		    case ToSkip of
+			[] ->
+			    false;
+			_ ->
+			    case lists:keysearch(all, 2, ToSkip) of
+				{value,{_,_,Cmt}} -> {true,Name,Cmt};
+				_                 -> {true,ToSkip,""}
+			    end
+		    end
+	    end
+    end;
+
 in_skip_list({Mod,Func,_Args}, SkipList) ->
-    in_skip_list({Mod,Func}, SkipList);    
+    in_skip_list({Mod,Func}, SkipList);
 in_skip_list({Mod,Func}, [{Mod,Funcs,Comment}|SkipList]) when is_list(Funcs) ->
     case lists:member(Func, Funcs) of
 	true ->
@@ -4577,9 +4784,21 @@ in_skip_list({Mod,Func}, [_|SkipList]) ->
 in_skip_list(_, []) ->
     false.
 
+%% remove unnecessary properties
+init_props(Props) ->
+    case get_repeat(Props) of
+	Repeat = {_RepType,N} when N < 2 ->
+	    if N == 0 ->
+		    {error,{invalid_property,Repeat}};
+	       true ->
+		    lists:delete(Repeat, Props)
+	    end;
+	_ ->
+	    Props
+    end.
+
 keep_name(Props) ->
     lists:filter(fun({name,_}) -> true; (_) -> false end, Props).
-			    
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%                 Target node handling functions                   %%
@@ -4615,13 +4834,13 @@ start_node(Name, Type, Options) ->
 	    end,
 	    case Warning of
 		[] -> ok;
-		_ -> 
+		_ ->
 		    format(1, Warning),
 		    format(minor, Warning)
 	    end,
 	    {ok, Nodename};
 	{fail,{Ret, Host, Cmd}}  ->
-	    format(minor, 
+	    format(minor,
 		   "Failed to start node ~p on ~p with command: ~p~n"
 		   "Reason: ~p",
 		   [Name, Host, Cmd, Ret]),
@@ -4630,7 +4849,7 @@ start_node(Name, Type, Options) ->
 	    format(minor, "Failed to start node ~p: ~p", [Name,Ret]),
 	    Ret;
 	{Ret, Host, Cmd} ->
-	    format(minor, 
+	    format(minor,
 		   "Failed to start node ~p on ~p with command: ~p~n"
 		   "Reason: ~p",
 		   [Name, Host, Cmd, Ret]),
@@ -4685,7 +4904,7 @@ read_job_sock_loop(Sock) ->
 	    exit({controller,connection_lost,Reason});
 	{ok,<<1,Request/binary>>} ->
 	    case decode(binary_to_term(Request)) of
-		ok -> 
+		ok ->
 		    read_job_sock_loop(Sock);
 		{stop,Result} ->
 		    Result
@@ -4695,14 +4914,14 @@ read_job_sock_loop(Sock) ->
 decode({apply,{M,F,A}}) ->
     apply(M,F,A),
     ok;
-decode({sync_apply,{M,F,A}}) -> 
+decode({sync_apply,{M,F,A}}) ->
     R = apply(M,F,A),
     request(get(test_server_ctrl_job_sock),{sync_result,R}),
     ok;
 decode({sync_result,Result}) ->
     {stop,Result};
 decode({test_case_result,Result}) ->
-    {stop,Result}; 
+    {stop,Result};
 decode({privdir,empty_priv_dir}) ->
     {stop,ok};
 decode({{privdir,PrivDirTar},TarBin}) ->
@@ -4742,7 +4961,7 @@ p({A,B,C}) ->
 p(X) ->
     pinfo(X).
 
-t() -> 
+t() ->
     t(wall_clock).
 t(X) ->
     element(1, statistics(X)).
@@ -4781,7 +5000,7 @@ display_info([Pid|T], R, M) ->
 		       Other ->
 			   Other
 		   end,
-	    Reds  = fetch(reductions, Info), 
+	    Reds  = fetch(reductions, Info),
 	    LM = length(fetch(messages, Info)),
 	    pformat(io_lib:format("~w", [Pid]),
 		    io_lib:format("~w", [Call]),
@@ -4822,12 +5041,12 @@ pinfo(P) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% A module is included in the cover analysis if
-%% - it belongs to the tested application and is not listed in the 
+%% - it belongs to the tested application and is not listed in the
 %%   {exclude,List} part of the App.cover file
 %% - it does not belong to the application, but is listed in the
 %%   {include,List} part of the App.cover file
-%% - it does not belong to the application, but is listed in the 
-%%   cross.cover file (in the test_server application) under 'all' 
+%% - it does not belong to the application, but is listed in the
+%%   cross.cover file (in the test_server application) under 'all'
 %%   or under the tested application.
 %%
 %% The modules listed in the cross.cover file are modules that are
@@ -4893,7 +5112,7 @@ read_cover_file(CoverFile) ->
 		    io:fwrite("Faulty format of CoverFile ~p\n", [CoverFile]),
 		    {[],[]}
 	    end;
-	{error,Reason} -> 
+	{error,Reason} ->
 	    io:fwrite("Can't read CoverFile ~p\nReason: ~p\n",
 		      [CoverFile,Reason]),
 	    {[],[]}
@@ -4958,7 +5177,7 @@ cover_analyse({App,CoverInfo}, Analyse, AnalyseMods, TestDir) ->
     end,
 
     io:fwrite(CoverLog, "<p>Excluded module(s): <code>~p</code>\n", [Excluded]),
-    
+
     Coverage = cover_analyse(Analyse, AnalyseMods),
 
     case lists:filter(fun({_M,{_,_,_}}) -> false;
@@ -4968,7 +5187,7 @@ cover_analyse({App,CoverInfo}, Analyse, AnalyseMods, TestDir) ->
 	    ok;
 	Bad ->
 	    io:fwrite(CoverLog, "<p>Analysis failed for ~w module(s): "
-		      "<code>~w</code>\n", 
+		      "<code>~w</code>\n",
 		      [length(Bad),[BadM || {BadM,{_,_Why}} <- Bad]])
     end,
 
@@ -5002,10 +5221,10 @@ cross_cover_analyse(Analyse, CrossModules) ->
     CoverdataFiles = get_coverdata_files(),
     lists:foreach(fun(CDF) -> cover:import(CDF) end, CoverdataFiles),
     io:fwrite("Cover analysing... ", []),
-    DetailsFun = 
+    DetailsFun =
 	case Analyse of
 	    details ->
-		fun(Dir,M) -> 
+		fun(Dir,M) ->
 			OutFile = filename:join(Dir,
 						atom_to_list(M) ++
 						".CROSS_COVER.html"),
@@ -5018,7 +5237,7 @@ cross_cover_analyse(Analyse, CrossModules) ->
     SortedModules =
 	case CrossModules of
 	    undefined ->
-		sort_modules([Mod || Mod <- get_all_cross_modules(), 
+		sort_modules([Mod || Mod <- get_all_cross_modules(),
 				     lists:member(Mod, cover:imported_modules())], []);
 	    _ ->
 		sort_modules(CrossModules, [])
@@ -5031,7 +5250,7 @@ cross_cover_analyse(Analyse, CrossModules) ->
 %% cross.cover, write a cross cover log (cross_cover.html).
 write_cross_cover_logs([{App,Coverage}|T]) ->
     case last_test_for_app(App) of
-	false -> 
+	false ->
 	    ok;
 	Dir ->
 	    CoverLogName = filename:join(Dir,?cross_coverlog_name),
@@ -5045,13 +5264,13 @@ write_cross_cover_logs([{App,Coverage}|T]) ->
     end,
     write_cross_cover_logs(T);
 write_cross_cover_logs([]) ->
-    io:fwrite("done\n", []).    
+    io:fwrite("done\n", []).
 
 %% Find all exported coverdata files. First find all the latest
 %% run.<timestamp> directories, and the check if there is a file named
 %% all.coverdata.
 get_coverdata_files() ->
-    PossibleFiles = [last_coverdata_file(Dir) || 
+    PossibleFiles = [last_coverdata_file(Dir) ||
 			Dir <- filelib:wildcard([$*|?logdir_ext]),
 			filelib:is_dir(Dir)],
     [File || File <- PossibleFiles, filelib:is_file(File)].
@@ -5074,12 +5293,12 @@ last_test([_|Rest], Latest) ->
     last_test(Rest, Latest);
 last_test([], Latest) ->
     Latest.
-    
+
 %% Sort modules according to the application they belong to.
 %% Return [{App,LastTestDir,ModuleList}]
 sort_modules([M|Modules], Acc) ->
     App = get_app(M),
-    Acc1 = 
+    Acc1 =
 	case lists:keysearch(App, 1, Acc) of
 	    {value,{App,LastTest,List}} ->
 		lists:keyreplace(App, 1, Acc, {App,LastTest,[M|List]});
@@ -5120,9 +5339,9 @@ get_all_cross_modules() ->
     get_cross_modules(all).
 get_cross_modules(App) ->
     case file:consult(?cross_cover_file) of
-	{ok,List} -> 
+	{ok,List} ->
 	    get_cross_modules(App, List, []);
-	_X -> 
+	_X ->
 	    []
     end.
 
@@ -5134,11 +5353,11 @@ get_cross_modules(App, [_H|T], Acc) ->
     get_cross_modules(App, T, Acc);
 get_cross_modules(_App, [], Acc) ->
     Acc.
-    
+
 
 %% Support functions for writing the cover logs (both cross and normal)
 write_coverlog_header(CoverLog) ->
-    case catch 
+    case catch
 	io:fwrite(CoverLog,
 		  "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"
 		  "<!-- autogenerated by '~w'. -->\n"
@@ -5162,13 +5381,13 @@ format_analyse(M,Cov,NotCov,undefined) ->
     io_lib:fwrite("<tr><td>~w</td>"
 		  "<td align=right>~w %</td>"
 		  "<td align=right>~w</td>"
-		  "<td align=right>~w</td></tr>\n", 
+		  "<td align=right>~w</td></tr>\n",
 		  [M,pc(Cov,NotCov),Cov,NotCov]);
 format_analyse(M,Cov,NotCov,{file,File}) ->
     io_lib:fwrite("<tr><td><a href=\"~s\">~w</a></td>"
 		  "<td align=right>~w %</td>"
 		  "<td align=right>~w</td>"
-		  "<td align=right>~w</td></tr>\n", 
+		  "<td align=right>~w</td></tr>\n",
 		  [filename:basename(File),M,pc(Cov,NotCov),Cov,NotCov]);
 format_analyse(M,Cov,NotCov,{lines,Lines}) ->
     CoverOutName = atom_to_list(M)++".COVER.html",
@@ -5177,15 +5396,15 @@ format_analyse(M,Cov,NotCov,{lines,Lines}) ->
     io_lib:fwrite("<tr><td><a href=\"~s\">~w</a></td>"
 		  "<td align=right>~w %</td>"
 		  "<td align=right>~w</td>"
-		  "<td align=right>~w</td></tr>\n", 
+		  "<td align=right>~w</td></tr>\n",
 		  [CoverOutName,M,pc(Cov,NotCov),Cov,NotCov]);
 format_analyse(M,Cov,NotCov,{error,_}) ->
     io_lib:fwrite("<tr><td>~w</td>"
 		  "<td align=right>~w %</td>"
 		  "<td align=right>~w</td>"
-		  "<td align=right>~w</td></tr>\n", 
+		  "<td align=right>~w</td></tr>\n",
 		  [M,pc(Cov,NotCov),Cov,NotCov]).
-    
+
 
 pc(0,0) ->
     0;
@@ -5200,9 +5419,9 @@ write_not_covered(CoverOut,M,Lines) ->
 	      "<table border=3 cellpadding=5>\n"
 	      "<th>Line Number</th>\n",
 	      [M]),
-    lists:foreach(fun({{_M,Line},{0,1}}) -> 
+    lists:foreach(fun({{_M,Line},{0,1}}) ->
 			  io:fwrite(CoverOut,"<tr><td>~w</td></tr>\n", [Line]);
-		     (_) -> 
+		     (_) ->
 			  ok
 		  end,
 		  Lines),
@@ -5216,7 +5435,7 @@ write_default_coverlog(TestDir) ->
     file:close(CoverLog).
 
 write_default_cross_coverlog(TestDir) ->
-    {ok,CrossCoverLog} = 
+    {ok,CrossCoverLog} =
 	file:open(filename:join(TestDir,?cross_coverlog_name), [write]),
     write_coverlog_header(CrossCoverLog),
     io:fwrite(CrossCoverLog,
@@ -5232,7 +5451,7 @@ write_cover_result_table(CoverLog,Coverage) ->
 	      "<th>Not covered (Lines)</th>\n",
 	      []),
     {TotCov,TotNotCov} =
-	lists:foldl(fun({M,{Cov,NotCov,Details}},{AccCov,AccNotCov}) -> 
+	lists:foldl(fun({M,{Cov,NotCov,Details}},{AccCov,AccNotCov}) ->
 			    Str = format_analyse(M,Cov,NotCov,Details),
 			    io:fwrite(CoverLog,"~s", [Str]),
 			    {AccCov+Cov,AccNotCov+NotCov};
diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl
index 49025b1a3d..056d18da96 100644
--- a/lib/test_server/src/test_server_node.erl
+++ b/lib/test_server/src/test_server_node.erl
@@ -84,7 +84,7 @@ start_remote_main_target(Parameters) ->
 					 MasterNode,MasterCookie),
     Cmd = 
 	case os:getenv("TEST_SERVER_FRAMEWORK") of
-	    false -> Cmd0;
+	    FW when FW =:= false; FW =:= "undefined" -> Cmd0;
 	    FW -> Cmd0 ++ " -env TEST_SERVER_FRAMEWORK " ++ FW
 	end,
 	
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index 89edb0f881..4a7804a482 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -21,7 +21,7 @@
 %%% Purpose: Test server support functions.
 %%%-------------------------------------------------------------------
 -module(test_server_sup).
--export([timetrap/2, timetrap_cancel/1, capture_get/1, messages_get/1,
+-export([timetrap/2, timetrap/3, timetrap_cancel/1, capture_get/1, messages_get/1,
 	 timecall/3, call_crash/5, app_test/2, check_new_crash_dumps/0,
 	 cleanup_crash_dumps/0, crash_dump_dir/0, tar_crash_dumps/0,
 	 get_username/0, get_os_family/0, 
@@ -34,16 +34,23 @@
 -define(src_listing_ext, ".src.html").
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% timetrap(Timeout,Pid) -> Handle
+%% timetrap(Timeout,Scale,Pid) -> Handle
 %% Handle = term()
 %%
 %% Creates a time trap, that will kill the given process if the 
 %% trap is not cancelled with timetrap_cancel/1, within Timeout
 %% milliseconds.
+%% Scale says if the time should be scaled up to compensate for
+%% delays during the test (e.g. if cover is running).
 
 timetrap(Timeout0, Pid) ->
+    timetrap(Timeout0, true, Pid).
+
+timetrap(Timeout0, Scale, Pid) ->
     process_flag(priority, max),
-    Timeout = test_server:timetrap_scale_factor() * Timeout0,
+    Timeout = if not Scale -> Timeout0;
+		 true -> test_server:timetrap_scale_factor() * Timeout0
+	      end,
     receive
     after trunc(Timeout) ->
 	    Line = test_server:get_loc(Pid),
@@ -487,7 +494,8 @@ framework_call(Func,Args) ->
 framework_call(Func,Args,DefaultReturn) ->
     CB = os:getenv("TEST_SERVER_FRAMEWORK"),
     framework_call(CB,Func,Args,DefaultReturn).
-framework_call(false,_Func,_Args,DefaultReturn) ->
+framework_call(FW,_Func,_Args,DefaultReturn)  
+  when FW =:= false; FW =:= "undefined" ->
     DefaultReturn;
 framework_call(Callback,Func,Args,DefaultReturn) ->
     Mod = list_to_atom(Callback),
@@ -497,6 +505,7 @@ framework_call(Callback,Func,Args,DefaultReturn) ->
     end,
     case erlang:function_exported(Mod,Func,length(Args)) of
 	true ->
+	    put(test_server_loc, {Mod,Func,framework}),
 	    EH = fun(Reason) -> exit({fw_error,{Mod,Func,Reason}}) end,
 	    try apply(Mod,Func,Args) of
 		Result ->
diff --git a/lib/test_server/src/ts.config b/lib/test_server/src/ts.config
index 30ef25a0b8..f021f5958b 100644
--- a/lib/test_server/src/ts.config
+++ b/lib/test_server/src/ts.config
@@ -1,45 +1,46 @@
 %% -*- erlang -*-
-{ipv6_hosts,[otptest06,otptest08,sauron,iluvatar]}.
 
-%%% Change these to suite the environment.
-%%% test_hosts are looked up using "ypmatch xx yy zz hosts"
-{test_hosts,
- [bingo, hurin, turin, gandalf, super,
-  merry, nenya, sam, elrond, isildur]}.
+%%% Change these to suite the environment. See the inet_SUITE for info about
+%%% what they are used for.
+%%% test_hosts are looked up using "ypmatch xx yy zz hosts.byname"
+%{test_hosts,[my_ip4_host]}.
 
 %% IPv4 host only - no ipv6 entry must exist!
-{test_host_ipv4_only,
- {"isildur",					%Short hostname
-  "isildur.du.uab.ericsson.se",			%Long hostname
-  "134.138.177.24",				%IP string
-  {134,138,177,24},				%IP tuple
-  ["isildur"],					%Any aliases
-  "::ffff:134.138.177.24",			%IPv6 string (compatibilty addr)
-  {0,0,0,0,0,65535,34442,45336}			%IPv6 tuple
- }}.
-
-{test_host_ipv6_only,
- {"otptest06",					%Short hostname
-  "otptest06.du.uab.ericsson.se",		%Long hostname
-  "fec0::a00:20ff:feb2:b4a9",			%IPv6 string
-  {65216,0,0,0,2560,8447,65202,46249},		%IPv6 tuple
-  ["otptest06-ip6"]				%Aliases.
- }}.
-
-
-
-{test_dummy_host, {"dummy",
-		   "dummy.du.uab.ericsson.se",
-		   "192.138.177.1",
-		   {192,138,177,1},
-		   ["dummy"],
-		   "::ffff:192.138.177.1",
-		   {0,0,0,0,0,65535,49290,45313}
-		  }}.
-
-{test_dummy_ipv6_host, {"dummy6",
-			"dummy6.du.uab.ericsson.se",
-			"fec0::a00:20ff:feb2:6666",
-			{65216,0,0,0,2560,8447,65202,26214},
-			["dummy6-ip6"]
-		       }}.
+%{test_host_ipv4_only,
+% {"my_ip4_host",				%Short hostname
+%  "my_ip4_host.mydomain.com",			%Long hostname
+%  "10.10.0.1",				        %IP string
+%  {10,10,0,1},				        %IP tuple
+%  ["my_ip4_host"],				%Any aliases
+%  "::ffff:10.10.0.1",			        %IPv6 string (compatibilty addr)
+%  {0,0,0,0,0,65535,2570,1}		        %IPv6 tuple
+% }}.
+
+%{test_dummy_host, {"dummy",
+%		   "dummy.mydomain.com",
+%		   "192.168.0.1",
+%		   {192,168,0,1},
+%		   ["dummy"],
+%		   "::ffff:192.168.0.1",
+%		   {0,0,0,0,0,65535,49320,1}
+%		  }}.
+
+
+%%% test_hosts are looked up using "ypmatch xx yy zz ipnodes.byname"
+%{ipv6_hosts,[my_ip6_host]}.
+
+
+%{test_host_ipv6_only,
+% {"my_ip6_host",				%Short hostname
+%  "my_ip6_host.mydomain.com",		        %Long hostname
+%  "::2eff:f2b0:1ea0",			        %IPv6 string
+%  {0,0,0,0,0,12031,62128,7840},		%IPv6 tuple
+%  ["my_ip6_host"]				%Aliases.
+% }}.
+
+%{test_dummy_ipv6_host, {"dummy6",
+%			"dummy6.mydomain.com",
+%			"127::1",
+%			{295,0,0,0,0,0,0,1},
+%			["dummy6-ip6"]
+%		       }}.
diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl
index e23b891392..3d55f41b8c 100644
--- a/lib/test_server/src/ts.erl
+++ b/lib/test_server/src/ts.erl
@@ -71,7 +71,7 @@
 %%% ts_erl_config	 Finds out information about the Erlang system,
 %%%			 for instance the location of erl_interface.
 %%%			 This works for either an installed OTP or an Erlang
-%%%			 system running from Clearcase.
+%%%			 system running in a git repository/source tree.
 %%% ts_make		 Interface to run the `make' program on Unix
 %%%			 and other platforms.
 %%% ts_make_erl		 A corrected version of the standar Erlang module
@@ -150,6 +150,14 @@ help(installed) ->
 	 "                      TraceSpec is the name of a file containing\n",
 	 "                      trace specifications or a list of trace\n",
 	 "                      specification elements.\n",
+	 "  {config, Path}    - Specify which directory ts should get it's \n"
+	 "                      config files from. The files should follow\n"
+	 "                      the convention lib/test_server/src/ts*.config.\n"
+	 "                      These config files can also be specified by\n"
+	 "                      setting the TEST_CONFIG_PATH environment\n"
+	 "                      variable to the directory where the config\n"
+	 "                      files are. The default location is\n"
+	 "                      tests/test_server/.\n"
 	 "\n",
 	 "Supported trace information elements\n",
 	 "  {tp | tpl, Mod, [] | match_spec()}\n",
@@ -249,7 +257,7 @@ run_some([Spec|Specs], Opts) ->
 run(Testspec) when is_atom(Testspec) ->
     Options=check_test_get_opts(Testspec, []),
     File = atom_to_list(Testspec),
-    run_test(File, ["SPEC current.spec NAME ",File], Options);
+    run_test(File, [{spec,[File++".spec"]}], Options);
 
 %% This can be used from command line, e.g.
 %% erl -s ts run all_tests <config>
@@ -293,11 +301,11 @@ run(List, Opts) when is_list(List), is_list(Opts) ->
 run(Testspec, Config) when is_atom(Testspec), is_list(Config) ->
     Options=check_test_get_opts(Testspec, Config),
     File=atom_to_list(Testspec),
-    run_test(File, ["SPEC current.spec NAME ", File], Options);
+    run_test(File, [{spec,[File++".spec"]}], Options);
 %% Runs one module in a spec (interactive)
 run(Testspec, Mod) when is_atom(Testspec), is_atom(Mod) ->
     run_test({atom_to_list(Testspec), Mod}, 
-	     ["SPEC current.spec NAME ", atom_to_list(Mod)], 
+	     [{suite,Mod}], 
 	     [interactive]).
 
 %% run/3
@@ -305,20 +313,23 @@ run(Testspec, Mod) when is_atom(Testspec), is_atom(Mod) ->
 run(Testspec,Mod,Config) when is_atom(Testspec), is_atom(Mod), is_list(Config) ->
     Options=check_test_get_opts(Testspec, Config),
     run_test({atom_to_list(Testspec), Mod},
-	     ["SPEC current.spec NAME ", atom_to_list(Mod)], 
+	     [{suite,Mod}], 
 	     Options);
 
 %% Runs one testcase in a module.
 run(Testspec, Mod, Case) when is_atom(Testspec), is_atom(Mod), is_atom(Case) ->
     Options=check_test_get_opts(Testspec, []),
-    Args = ["CASE ",atom_to_list(Mod)," ",atom_to_list(Case)],
+    Args = [{suite,atom_to_list(Mod)},{testcase,atom_to_list(Case)}],
     run_test(atom_to_list(Testspec), Args, Options).
 
 %% run/4
 %% Run one testcase in a module with Options.
-run(Testspec, Mod, Case, Config) when is_atom(Testspec), is_atom(Mod), is_atom(Case), is_list(Config) ->
+run(Testspec, Mod, Case, Config) when is_atom(Testspec), 
+				      is_atom(Mod), 
+				      is_atom(Case), 
+				      is_list(Config) ->
     Options=check_test_get_opts(Testspec, Config),
-    Args = ["CASE ",atom_to_list(Mod), " ",atom_to_list(Case)],
+    Args = [{suite,atom_to_list(Mod)}, {testcase,atom_to_list(Case)}],
     run_test(atom_to_list(Testspec), Args, Options).
 
 %% Check testspec to be valid and get possible Options
@@ -327,10 +338,11 @@ check_test_get_opts(Testspec, Config) ->
     validate_test(Testspec),
     Mode = configmember(batch, {batch, interactive}, Config),
     Vars = configvars(Config),
-    Trace = configtrace(Config),
+    Trace = get_config(trace,Config),
+    ConfigPath = get_config(config,Config),
     KeepTopcase = configmember(keep_topcase, {keep_topcase,[]}, Config),
     Cover = configcover(Testspec,Config),
-    lists:flatten([Vars,Mode,Trace,KeepTopcase,Cover]).
+    lists:flatten([Vars,Mode,Trace,KeepTopcase,Cover,ConfigPath]).
     
 to_erlang_term(Atom) ->
     String = atom_to_list(Atom),
@@ -398,8 +410,8 @@ special_vars(Config) ->
 	    SpecVars1
     end.
 
-configtrace(Config) ->
-    case lists:keysearch(trace,1,Config) of
+get_config(Key,Config) ->
+    case lists:keysearch(Key,1,Config) of
 	{value,Value} -> Value;
 	false -> []
     end.
diff --git a/lib/test_server/src/ts.unix.config b/lib/test_server/src/ts.unix.config
index b4325f065f..5a2580f464 100644
--- a/lib/test_server/src/ts.unix.config
+++ b/lib/test_server/src/ts.unix.config
@@ -1,4 +1,4 @@
 %% -*- erlang -*-
 
 %% Always run a (VNC) X server on host
-{xserver, "frumgar.du.uab.ericsson.se:66"}.
+%% {xserver, "xserver.example.com:66"}.
diff --git a/lib/test_server/src/ts.vxworks.config b/lib/test_server/src/ts.vxworks.config
deleted file mode 100644
index b0b66e07ad..0000000000
--- a/lib/test_server/src/ts.vxworks.config
+++ /dev/null
@@ -1,19 +0,0 @@
-%% -*- erlang -*-
-
-%%% There is no equivalent command to ypmatch on Win32... :-(
-{hardcoded_hosts,
- [{"134.138.177.74","strider"},
-  {"134.138.177.72", "elrond"},
-  {"134.138.177.67", "sam"},
-  {"134.138.176.215", "nenya"},
-  {"134.138.176.192", "merry"},
-  {"134.138.177.35", "lw4"},
-  {"134.138.177.35", "lw5"},
-  {"134.138.176.16", "super"},
-  {"134.138.177.16", "gandalf"},
-  {"134.138.177.92", "turin"},
-  {"134.138.177.86", "mallor"}]}.
-
-{hardcoded_ipv6_hosts,
- [{"fe80::a00:20ff:feb2:b4a9","otptest06"},
-  {"fe80::a00:20ff:feb2:a621","otptest08"}]}.
diff --git a/lib/test_server/src/ts.win32.config b/lib/test_server/src/ts.win32.config
index 2802c4a75a..cae587bea8 100644
--- a/lib/test_server/src/ts.win32.config
+++ b/lib/test_server/src/ts.win32.config
@@ -1,15 +1,8 @@
 %% -*- erlang -*-
 
 %%% There is no equivalent command to ypmatch on Win32... :-(
-{hardcoded_hosts,
- [{"134.138.177.24","isildur"},
-  {"134.138.177.72", "elrond"},
-  {"134.138.176.215", "nenya"},
-  {"134.138.176.192", "merry"},
-  {"134.138.176.16", "super"},
-  {"134.138.177.16", "gandalf"},
-  {"134.138.177.92", "turin"}]}.
+%{hardcoded_hosts,
+% [{"127.0.0.1","localhost"}]}.
 
-{hardcoded_ipv6_hosts,
- [{"fe80::a00:20ff:feb2:b4a9","otptest06"},
-  {"fe80::a00:20ff:feb2:a621","otptest08"}]}.
+%{hardcoded_ipv6_hosts,
+% [{"::1","localhost"}]}.
diff --git a/lib/test_server/src/ts_erl_config.erl b/lib/test_server/src/ts_erl_config.erl
index 5cdbf0fbb8..640c8ddc9f 100644
--- a/lib/test_server/src/ts_erl_config.erl
+++ b/lib/test_server/src/ts_erl_config.erl
@@ -70,18 +70,18 @@ dl_vars(Vars, _) ->
     ShlibRules = ts_lib:subst(ShlibRules0, Vars),
     [{'SHLIB_RULES', ShlibRules}|Vars].
 
-erts_lib_name(multi_threaded, win32) ->
+erts_lib_name(multi_threaded, {win32, V}) ->
     link_library("erts_MD" ++ case is_debug_build() of
 				  true -> "d";
 				  false -> ""
 			      end,
-		 win32);
-erts_lib_name(single_threaded, win32) ->
+		 {win32, V});
+erts_lib_name(single_threaded, {win32, V}) ->
     link_library("erts_ML" ++ case is_debug_build() of
 				  true -> "d";
 				  false -> ""
 			      end,
-		 win32);
+		 {win32, V});
 erts_lib_name(multi_threaded, OsType) ->
     link_library("erts_r", OsType);
 erts_lib_name(single_threaded, OsType) ->
@@ -107,7 +107,7 @@ erts_lib(Vars,OsType) ->
 		   ErtsIncludeInternal,
 		   ErtsLib,
 		   ErtsLibInternal};
-	      {Type, Root, Target} when Type == clearcase; Type == srctree ->
+	      {srctree, Root, Target} ->
 		  Erts = filename:join([Root, "erts"]),
 		  ErtsInclude = filename:join([Erts, "include"]),
 		  ErtsIncludeTarget = filename:join([ErtsInclude, Target]),
@@ -146,7 +146,7 @@ erl_include(Vars) ->
 	case erl_root(Vars) of
 	    {installed, Root} ->
 		filename:join([Root, "usr", "include"]);
-	    {Type, Root, Target} when Type == clearcase; Type == srctree ->
+	    {srctree, Root, Target} ->
 		filename:join([Root, "erts", "emulator", "beam"])
 		    ++ " -I" ++ filename:join([Root, "erts", "emulator"])
 		    ++ system_include(Root, Vars)
@@ -179,7 +179,7 @@ erl_interface(Vars,OsType) ->
 		     {srctree, _Root, _Target} when OsType =:= vxworks ->
 			 {filename:join(Dir, "lib"),
 			  filename:join([Dir, "src"])};
-		     {Type, _Root, Target} when Type == clearcase; Type == srctree ->
+		     {srctree, _Root, Target} ->
 			 {filename:join([Dir, "obj", Target]),
 			  filename:join([Dir, "src", Target])}
 		 end}
@@ -246,7 +246,7 @@ ic(Vars, OsType) ->
 		 case erl_root(Vars) of
 		     {installed, _Root} ->
 			 filename:join([Dir, "priv", "lib"]);
-		     {Type, _Root, Target} when Type == clearcase; Type == srctree ->
+		     {srctree, _Root, Target} ->
 			 filename:join([Dir, "priv", "lib", Target])
 		 end,
 		 filename:join(Dir, "include")}
@@ -266,21 +266,6 @@ jinterface(Vars, _OsType) ->
 	end,
     [{jinterface_classpath, filename:nativename(ClassPath)}|Vars].
 
-%% Unused!
-% ig_vars(Vars) ->
-%     {Lib0, Incl} = 
-% 	case erl_root(Vars) of
-% 	    {installed, Root} ->
-% 		Base = filename:join([Root, "usr"]),
-% 		{filename:join([Base, "lib"]), 
-% 		 filename:join([Base, "include"])};
-% 	    {Type, Root, Target} when Type == clearcase; Type == srctree ->
-% 		{filename:join([Root, "lib", "ig", "obj", Target]),
-% 		 filename:join([Root, "lib", "ig", "include"])}
-% 	end,
-%     [{ig_libdir, filename:nativename(Lib0)},
-%      {ig_include, filename:nativename(Incl)}|Vars].
-
 lib_dir(Vars, Lib) ->
     LibLibDir = case Lib of
 		    erts ->
@@ -317,9 +302,6 @@ lib_dir(Vars, Lib) ->
 erl_root(Vars) ->
     Root = code:root_dir(),
     case ts_lib:erlang_type() of
-	{clearcase, _Version} ->
-	    Target = get_var(target, Vars),
-	    {clearcase, Root, Target};
 	{srctree, _Version} ->
 	    Target = get_var(target, Vars),
 	    {srctree, Root, Target};
@@ -349,10 +331,7 @@ sock_libraries({unix, _}) ->
 sock_libraries(vxworks) ->
     "";
 sock_libraries(ose) ->
-    "";
-sock_libraries(_Other) ->
-    exit({sock_libraries, not_supported}).
-
+    "".
 
 link_library(LibName,{win32, _}) ->
     LibName ++ ".lib";
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl
index 94926eba80..2ddffccf5b 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/test_server/src/ts_install.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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(ts_install).
@@ -175,15 +175,8 @@ get_testcase_callback() ->
 
 get_rsh_name() ->
     case os:getenv("ERL_RSH") of
-	false ->
-	    case ts_lib:erlang_type() of
-		{clearcase, _} ->
-		    "ctrsh";
-		{_, _} ->
-		    "rsh"
-	    end;
-	Str ->
-	    Str
+	false -> "rsh";
+	Str -> Str
     end.
 
 platform_id(Vars) ->
@@ -233,9 +226,11 @@ to_upper(String) ->
 	      String).
 
 word_size() ->
-    case erlang:system_info(wordsize) of
-	4 -> "";
-	8 -> "/64"
+    case {erlang:system_info({wordsize,external}),
+	  erlang:system_info({wordsize,internal})} of
+	{4,4} -> "";
+	{8,8} -> "/64";
+	{8,4} -> "/Halfword"
     end.
 
 linux_dist() ->
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl
new file mode 100644
index 0000000000..d1a24525ab
--- /dev/null
+++ b/lib/test_server/src/ts_install_cth.erl
@@ -0,0 +1,286 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010. 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%
+%%
+
+%%% @doc TS Installed SCB
+%%%
+%%% This module does what the make parts of the ts:run/x command did,
+%%% but not the Makefile.first parts! So they have to be done by ts or
+%%% manually!!
+
+-module(ts_install_cth).
+
+%% Suite Callbacks
+-export([id/1]).
+-export([init/2]).
+
+-export([pre_init_per_suite/3]).
+-export([post_init_per_suite/4]).
+-export([pre_end_per_suite/3]).
+-export([post_end_per_suite/4]).
+
+-export([pre_init_per_group/3]).
+-export([post_init_per_group/4]).
+-export([pre_end_per_group/3]).
+-export([post_end_per_group/4]).
+
+-export([pre_init_per_testcase/3]).
+-export([post_end_per_testcase/4]).
+
+-export([on_tc_fail/3]).
+-export([on_tc_skip/3]).
+
+-export([terminate/1]).
+
+-include_lib("kernel/include/file.hrl").
+
+-type proplist() :: list({atom(),term()}).
+-type config() :: proplist().
+-type reason() :: term().
+-type skip_or_fail() :: {skip, reason()} |
+                        {auto_skip, reason()} |
+                        {fail, reason()}.
+
+-record(state, { ts_conf_dir, target_system, install_opts, nodenames, nodes }).
+
+%% @doc The id of this SCB
+-spec id(Opts :: term()) ->
+    Id :: term().
+id(_Opts) ->
+    ?MODULE.
+
+%% @doc Always called before any other callback function.
+-spec init(Id :: term(), Opts :: proplist()) ->
+    State :: #state{}.
+init(_Id, Opts) ->
+    Nodenames = proplists:get_value(nodenames, Opts, 0),
+    Nodes = proplists:get_value(nodes, Opts, 0),
+    TSConfDir = proplists:get_value(ts_conf_dir, Opts),
+    TargetSystem = proplists:get_value(target_system, Opts, install_local),
+    InstallOpts = proplists:get_value(install_opts, Opts, []),
+    #state{ nodenames = Nodenames,
+	    nodes = Nodes,
+	    ts_conf_dir = TSConfDir,
+	    target_system = TargetSystem, 
+	    install_opts = InstallOpts }.
+
+%% @doc Called before init_per_suite is called.
+-spec pre_init_per_suite(Suite :: atom(),
+			 Config :: config(),
+			 State :: #state{}) ->
+	{config() | skip_or_fail(), NewState :: #state{}}.
+pre_init_per_suite(Suite,Config,#state{ ts_conf_dir = undefined} = State) ->
+    DataDir = proplists:get_value(data_dir, Config),
+    ParentDir = filename:join(
+		  lists:reverse(
+		    tl(lists:reverse(filename:split(DataDir))))),
+    TSConfDir = filename:join([ParentDir, "..","test_server"]),
+    pre_init_per_suite(Suite, Config, State#state{ ts_conf_dir = TSConfDir });
+pre_init_per_suite(_Suite,Config,State) ->
+    DataDir = proplists:get_value(data_dir, Config),
+    try
+	{ok,Variables} = 
+	    file:consult(filename:join(State#state.ts_conf_dir,"variables")),
+
+	%% Make the stuff in all_SUITE_data if it exists
+	AllDir = filename:join(DataDir,"../all_SUITE_data"),
+	case filelib:is_dir(AllDir) of
+	    true ->
+		make_non_erlang(AllDir,Variables);
+	    false ->
+		ok
+	end,
+	
+	make_non_erlang(DataDir, Variables),
+
+	{add_node_name(Config, State), State}
+    catch Error:Reason ->
+	    Stack = erlang:get_stacktrace(),
+	    ct:pal("~p failed! ~p:{~p,~p}",[?MODULE,Error,Reason,Stack]),
+	    {{fail,{?MODULE,{Error,Reason, Stack}}},State}
+    end.
+
+%% @doc Called after init_per_suite.
+-spec post_init_per_suite(Suite :: atom(),
+			  Config :: config(),
+			  Return :: config() | skip_or_fail(),
+			  State :: #state{}) ->
+	{config() | skip_or_fail(), NewState :: #state{}}.
+post_init_per_suite(_Suite,_Config,Return,State) ->
+    test_server_ctrl:kill_slavenodes(),
+    {Return, State}.
+
+%% @doc Called before end_per_suite. 
+-spec pre_end_per_suite(Suite :: atom(),
+			Config :: config() | skip_or_fail(),
+			State :: #state{}) ->
+	{ok | skip_or_fail(), NewState :: #state{}}.
+pre_end_per_suite(_Suite,Config,State) ->
+    {Config, State}.
+
+%% @doc Called after end_per_suite. 
+-spec post_end_per_suite(Suite :: atom(),
+			 Config :: config(),
+			 Return :: term(),
+			 State :: #state{}) ->
+	{ok | skip_or_fail(), NewState :: #state{}}.
+post_end_per_suite(_Suite,_Config,Return,State) ->
+    {Return, State}.
+
+%% @doc Called before each init_per_group.
+-spec pre_init_per_group(Group :: atom(),
+			 Config :: config(),
+			 State :: #state{}) ->
+	{config() | skip_or_fail(), NewState :: #state{}}.
+pre_init_per_group(_Group,Config,State) ->
+    {add_node_name(Config, State), State}.
+
+%% @doc Called after each init_per_group.
+-spec post_init_per_group(Group :: atom(),
+			  Config :: config(),
+			  Return :: config() | skip_or_fail(),
+			  State :: #state{}) ->
+	{config() | skip_or_fail(), NewState :: #state{}}.
+post_init_per_group(_Group,_Config,Return,State) ->
+    {Return, State}.
+
+%% @doc Called after each end_per_group. 
+-spec pre_end_per_group(Group :: atom(),
+			Config :: config() | skip_or_fail(),
+			State :: #state{}) ->
+	{ok | skip_or_fail(), NewState :: #state{}}.
+pre_end_per_group(_Group,Config,State) ->
+    {Config, State}.
+
+%% @doc Called after each end_per_group. 
+-spec post_end_per_group(Group :: atom(),
+			 Config :: config(),
+			 Return :: term(),
+			 State :: #state{}) ->
+	{ok | skip_or_fail(), NewState :: #state{}}.
+post_end_per_group(_Group,_Config,Return,State) ->
+    {Return, State}.
+
+%% @doc Called before each test case.
+-spec pre_init_per_testcase(TC :: atom(),
+			    Config :: config(),
+			    State :: #state{}) ->
+	{config() | skip_or_fail(), NewState :: #state{}}.
+pre_init_per_testcase(_TC,Config,State) ->
+    {add_node_name(Config, State), State}.
+
+%% @doc Called after each test case. 
+-spec post_end_per_testcase(TC :: atom(),
+			    Config :: config(),
+			    Return :: term(),
+			    State :: #state{}) ->
+	{ok | skip_or_fail(), NewState :: #state{}}.
+post_end_per_testcase(_TC,_Config,Return,State) ->
+    {Return, State}.
+
+%% @doc Called after a test case failed.
+-spec on_tc_fail(TC :: init_per_suite | end_per_suite |
+		       init_per_group | end_per_group | atom(),
+		 Reason :: term(), State :: #state{}) ->
+	NewState :: #state{}.
+on_tc_fail(_TC, _Reason, State) ->
+    State.
+
+%% @doc Called when a test case is skipped. 
+-spec on_tc_skip(TC :: end_per_suite | init_per_group | end_per_group | atom(),
+		 {tc_auto_skip, {failed, {Mod :: atom(), Function :: atom(), 
+					  Reason :: term()}}} |
+		 {tc_user_skip, {skipped, Reason :: term()}},
+		 State :: #state{}) ->
+	NewState :: #state{}.
+on_tc_skip(_TC, _Reason, State) ->
+    State.
+
+%% @doc Called when the scope of the SCB is done.
+-spec terminate(State :: #state{}) ->
+	term().
+terminate(_State) ->
+    ok.
+
+%%% ============================================================================
+%%% Local functions
+%%% ============================================================================
+%% Configure and run all the Makefiles in the data dirs of the suite 
+%% in question
+make_non_erlang(DataDir, Variables) ->
+    {ok,CurrWD} = file:get_cwd(),
+    try
+	file:set_cwd(DataDir),
+	MakeCommand = proplists:get_value(make_command,Variables),
+	
+	FirstMakefile = filename:join(DataDir,"Makefile.first"),
+	case filelib:is_regular(FirstMakefile) of
+	    true ->
+		ct:log("Making ~p",[FirstMakefile]),
+		ok = ts_make:make(
+		       MakeCommand, DataDir, filename:basename(FirstMakefile));
+	    false ->
+		ok
+	end,
+	
+	MakefileSrc = filename:join(DataDir,"Makefile.src"),
+	MakefileDest = filename:join(DataDir,"Makefile"),
+	case filelib:is_regular(MakefileSrc) of
+	    true ->
+		ok = ts_lib:subst_file(MakefileSrc,MakefileDest,Variables),
+		ct:log("Making ~p",[MakefileDest]),
+		ok = ts_make:make([{makefile,"Makefile"},{data_dir,DataDir} 
+				   | Variables]);
+	    false ->
+		ok
+	end
+    after
+	file:set_cwd(CurrWD),
+	timer:sleep(100)
+    end.
+
+%% Add a nodename to config if it does not exist
+add_node_name(Config, State) ->
+    case proplists:get_value(nodenames, Config) of
+	undefined ->
+	    lists:keystore(
+	       nodenames, 1, Config, 
+	       {nodenames,generate_nodenames(State#state.nodenames)});
+	_Else ->
+	    Config
+    end.
+
+
+%% Copied from test_server_ctrl.erl
+generate_nodenames(Num) ->
+    {ok,Name} = inet:gethostname(),
+    generate_nodenames2(Num, [Name], []).
+
+generate_nodenames2(0, _Hosts, Acc) ->
+    Acc;
+generate_nodenames2(N, Hosts, Acc) ->
+    Host=lists:nth((N rem (length(Hosts)))+1, Hosts),
+    Name=list_to_atom(temp_nodename("nod", []) ++ "@" ++ Host),
+    generate_nodenames2(N-1, Hosts, [Name|Acc]).
+
+temp_nodename([], Acc) ->
+    lists:flatten(Acc);
+temp_nodename([Chr|Base], Acc) ->
+    {A,B,C} = erlang:now(),
+    New = [Chr | integer_to_list(Chr bxor A bxor B+A bxor C+B)],
+    temp_nodename(Base, [New|Acc]).
diff --git a/lib/test_server/src/ts_lib.erl b/lib/test_server/src/ts_lib.erl
index 082c9e0519..2f0a4ea8c0 100644
--- a/lib/test_server/src/ts_lib.erl
+++ b/lib/test_server/src/ts_lib.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1997-2010. 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(ts_lib).
@@ -21,6 +21,8 @@
 -include_lib("kernel/include/file.hrl").
 -include("ts.hrl").
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([error/1, var/2, erlang_type/0,
 	 initial_capital/1, interesting_logs/1, 
 	 specs/1, suites/2, last_test/1,
@@ -72,12 +74,10 @@ progress(Vars, Level, Format, Args) ->
 
 erlang_type() ->
     {_, Version} = init:script_id(),
-    RelDir = filename:join([code:root_dir(), "releases"]), % Only in installed
-    SysDir = filename:join([code:root_dir(), "system"]),   % Nonexisting link/dir outside ClearCase 
-    case {filelib:is_file(RelDir),filelib:is_file(SysDir)} of
-	{true,_} -> {otp,       Version};	% installed OTP
-	{_,true} -> {clearcase, Version};
-	_        -> {srctree,   Version}
+    RelDir = filename:join(code:root_dir(), "releases"), % Only in installed
+    case filelib:is_file(RelDir) of
+	true -> {otp,Version};			% installed OTP
+	false -> {srctree,Version}		% source code tree
     end.
 	        
 %% Upcases the first letter in a string.
diff --git a/lib/test_server/src/ts_reports.erl b/lib/test_server/src/ts_reports.erl
index b41291d342..f981a77ae4 100644
--- a/lib/test_server/src/ts_reports.erl
+++ b/lib/test_server/src/ts_reports.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2010. 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
@@ -27,6 +27,8 @@
 -include_lib("kernel/include/file.hrl").
 -include("ts.hrl").
 
+-compile({no_auto_import,[error/1]}).
+
 -import(filename, [basename/1, rootname/1]).
 -import(ts_lib, [error/1]).
 
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl
index 888ac98973..d572b1454c 100644
--- a/lib/test_server/src/ts_run.erl
+++ b/lib/test_server/src/ts_run.erl
@@ -28,7 +28,7 @@
 
 -include("ts.hrl").
 
--import(lists, [map/2,member/2,filter/2,reverse/1]).
+-import(lists, [member/2,filter/2]).
 
 -record(state,
 	{file,					% File given.
@@ -63,50 +63,18 @@ run(File, Args0, Options, Vars0) ->
 	    _ ->
 		{false, fun run_interactive/3}
 	end,
-    HandleTopcase = case member(keep_topcase, Options) of
-			true -> [fun copy_topcase/3];
-			false -> [fun remove_original_topcase/3,
-				  fun init_topcase/3]
-		    end,
-    MakefileHooks = [fun make_make/3,
-		     fun add_make_testcase/3],
-    MakeLoop = fun(V, Sp, St) -> make_loop(MakefileHooks, V, Sp, St) end,
     Hooks = [fun init_state/3,
-	     fun read_spec_file/3] ++
-	     HandleTopcase ++
-             [fun run_preinits/3,
-	     fun find_makefiles/3,
-	     MakeLoop,
-	     fun make_test_suite/3,
-	     fun add_topcase_to_spec/3,
-	     fun write_spec_file/3,
+             fun run_preinits/3,
 	     fun make_command/3,
 	     Runner],
-    Args = make_test_server_args(Args0,Options,Vars),
+    Args = make_common_test_args(Args0,Options,Vars),
     St = #state{file=File,test_server_args=Args,batch=Batch},
     R = execute(Hooks, Vars, [], St),
-    case Batch of
-	true -> ts_reports:make_index();
-	false -> ok % ts_reports:make_index() is run on the test_server node
-    end,
     case R of
 	{ok,_,_,_} -> ok;
 	Error -> Error
     end.
 
-make_loop(Hooks, Vars0, Spec0, St0) ->
-    case St0#state.makefiles of
-	[Makefile|Rest] ->
-	    case execute(Hooks, Vars0, Spec0, St0#state{makefile=Makefile}) of
-		{error, Reason} ->
-		    {error, Reason};
-		{ok, Vars, Spec, St} ->
-		    make_loop(Hooks, Vars, Spec, St#state{makefiles=Rest})
-	    end;
-	[] ->
-	    {ok, Vars0, Spec0, St0}
-    end.
-
 execute([Hook|Rest], Vars0, Spec0, St0) ->
     case Hook(Vars0, Spec0, St0) of
 	ok ->
@@ -156,101 +124,6 @@ init_state(Vars, [], St0) ->
 	false ->
 	    {error,{no_test_directory,TestDir}}
     end.
-    
-%% Read the spec file for the test suite.
-
-read_spec_file(Vars, _, St) ->
-    TestDir = St#state.test_dir,
-    File = St#state.file,
-    {SpecFile,Res} = get_spec_filename(Vars, TestDir, File),
-    case Res of
-	{ok,Spec} ->
-	    {ok,Vars,Spec,St};
-	{error,Atom} when is_atom(Atom) ->
-	    {error,{no_spec,SpecFile}};
-	{error,Reason} ->
-	    {error,{bad_spec,lists:flatten(file:format_error(Reason))}}
-    end.
-
-get_spec_filename(Vars, TestDir, File) ->
-    DynSpec = filename:join(TestDir, File ++ ".dynspec"),
-    case filelib:is_file(DynSpec) of
-	true ->
-	    Bs0 = erl_eval:new_bindings(),
-	    Bs1 = erl_eval:add_binding('Target', ts_lib:var(target, Vars), Bs0),
-	    Bs2 = erl_eval:add_binding('Os', ts_lib:var(os, Vars), Bs1),
-	    TCCStr = ts_lib:var(test_c_compiler, Vars),
-	    TCC = try
-		      {ok, Toks, _} = erl_scan:string(TCCStr ++ "."),
-		      {ok, Tcc} = erl_parse:parse_term(Toks),
-		      Tcc
-		  catch
-		      _:_ -> undefined
-		  end,
-	    Bs = erl_eval:add_binding('TestCCompiler', TCC, Bs2),
-	    {DynSpec,file:script(DynSpec, Bs)};
-	false ->
-	    SpecFile = get_spec_filename_1(Vars, TestDir, File),
-	    {SpecFile,file:consult(SpecFile)}
-    end.
-
-get_spec_filename_1(Vars, TestDir, File) ->
-    case ts_lib:var(os, Vars) of
-	"VxWorks" ->
-	    check_spec_filename(TestDir, File, ".spec.vxworks");
-	"Windows"++_ ->
-	    check_spec_filename(TestDir, File, ".spec.win");
-	_Other ->
-	    filename:join(TestDir, File ++ ".spec")
-    end.
-
-check_spec_filename(TestDir, File, Ext) ->
-    Spec = filename:join(TestDir, File ++ Ext),
-    case filelib:is_file(Spec) of
-	true -> Spec;
-	false -> filename:join(TestDir, File ++ ".spec")
-    end.
-
-%% Remove the top case from the spec file. We will add our own
-%% top case later.
-
-remove_original_topcase(Vars, Spec, St) ->
-    {ok,Vars,filter(fun ({topcase,_}) -> false;
-			(_Other) -> true end, Spec),St}.
-
-%% Initialize our new top case. We'll keep in it the state to be
-%%  able to add more to it.
-
-init_topcase(Vars, Spec, St) ->
-    TestDir = St#state.test_dir,
-    TopCase = 
-	case St#state.mod of
-	    Mod when is_atom(Mod) ->
-		ModStr = atom_to_list(Mod),
-		case filelib:is_file(filename:join(TestDir,ModStr++".erl")) of
-		    true -> [{Mod,all}];
-		    false ->
-			Wc = filename:join(TestDir, ModStr ++ "*_SUITE.erl"),
-			[{list_to_atom(filename:basename(M, ".erl")),all} ||
-			    M <- filelib:wildcard(Wc)]
-		end;
-	    _Other ->
-		%% Here we used to return {dir,TestDir}. Now we instead
-		%% list all suites in TestDir, so we can add make testcases
-		%% around it later (see add_make_testcase) without getting
-		%% duplicates of the suite. (test_server_ctrl does no longer
-		%% check for duplicates of testcases)
-		Wc = filename:join(TestDir, "*_SUITE.erl"),
-		[{list_to_atom(filename:basename(M, ".erl")),all} ||
-		    M <- filelib:wildcard(Wc)]
-	end,
-    {ok,Vars,Spec,St#state{topcase=TopCase}}.
-
-%% Or if option keep_topcase was given, eh... keep the topcase
-copy_topcase(Vars, Spec, St) ->
-    {value,{topcase,Tc}} = lists:keysearch(topcase,1,Spec),
-    {ok, Vars, lists:keydelete(topcase,1,Spec),St#state{topcase=Tc}}.
-
 
 %% Run any "Makefile.first" files first.
 %%  XXX We should fake a failing test case if the make fails.
@@ -279,171 +152,14 @@ run_pre_makefile(Vars, Spec, St) ->
 	{error,_Reason}=Error -> Error
     end.
 
-%% Search for `Makefile.src' in each *_SUITE_data directory.
-
-find_makefiles(Vars, Spec, St) ->
-    Wc = filename:join(St#state.data_wc, "Makefile.src"),
-    Makefiles = reverse(del_skipped_suite_data_dir(filelib:wildcard(Wc), Spec)),
-    {ok,Vars,Spec,St#state{makefiles=Makefiles}}.
-    
-%% Create "Makefile" from "Makefile.src".
-
-make_make(Vars, Spec, State) ->
-    Src = State#state.makefile,
-    Dest = filename:rootname(Src),
-    ts_lib:progress(Vars, 1, "Making ~s...\n", [Dest]),
-    case ts_lib:subst_file(Src, Dest, Vars) of
-	ok ->
-	    {ok, Vars, Spec, State#state{makefile=Dest}};
-	{error, Reason} ->
-	    {error, {Src, Reason}}
-    end.
-
-%% Add a testcase which will do the making of the stuff in the data directory.
-
-add_make_testcase(Vars, Spec, St) ->
-    Makefile = St#state.makefile,
-    Dir = filename:dirname(Makefile),
-    Shortname = filename:basename(Makefile),
-    Suite = filename:basename(Dir, "_data"),
-    Config = [{data_dir,Dir},{makefile,Shortname}],
-    MakeModule = Suite ++ "_make",
-    MakeModuleSrc = filename:join(filename:dirname(Dir),
-				  MakeModule ++ ".erl"),
-    MakeMod = list_to_atom(MakeModule),
-    case filelib:is_file(MakeModuleSrc) of
-	true -> ok;
-	false -> generate_make_module(ts_lib:var(make_command, Vars),
-				      MakeModuleSrc,
-				      MakeModule)
-    end,
-    case Suite of
-	"all_SUITE" ->
-	    {ok,Vars,Spec,St#state{all={MakeMod,Config}}};
-	_ ->
-	    %% Avoid duplicates of testcases. There is no longer
-	    %% a check for this in test_server_ctrl.
-	    TestCase = {list_to_atom(Suite),all},
-	    TopCase0 = case St#state.topcase of
-			   List when is_list(List) ->
-			       List -- [TestCase];
-			   Top ->
-			       [Top] -- [TestCase]
-		       end,
-	    TopCase = [{make,{MakeMod,make,[Config]},
-			TestCase,
-			{MakeMod,unmake,[Config]}}|TopCase0],
-	    {ok,Vars,Spec,St#state{topcase=TopCase}}
-    end.
-
-generate_make_module(MakeCmd, Name, ModuleString) ->
-    {ok,Host} = inet:gethostname(),
-    file:write_file(Name,
-		    ["-module(",ModuleString,").\n",
-		     "\n",
-		     "-export([make/1,unmake/1]).\n",
-		     "\n",
-		     "make(Config) when is_list(Config) ->\n",
-		     "    Mins = " ++ integer_to_list(?DEFAULT_MAKE_TIMETRAP_MINUTES) ++ ",\n"
-		     "    test_server:format(\"=== Setting timetrap to ~p minutes ===~n\", [Mins]),\n"
-		     "    TimeTrap = test_server:timetrap(test_server:minutes(Mins)),\n"
-		     "    Res = ts_make:make([{make_command, \""++MakeCmd++"\"},{cross_node,\'ts@" ++ Host ++ "\'}|Config]),\n",
-		     "    test_server:timetrap_cancel(TimeTrap),\n"
-		     "    Res.\n"
-		     "\n",
-		     "unmake(Config) when is_list(Config) ->\n",
-		     "    Mins = " ++ integer_to_list(?DEFAULT_UNMAKE_TIMETRAP_MINUTES) ++ ",\n"
-		     "    test_server:format(\"=== Setting timetrap to ~p minutes ===~n\", [Mins]),\n"
-		     "    TimeTrap = test_server:timetrap(test_server:minutes(Mins)),\n"
-		     "    Res = ts_make:unmake([{make_command, \""++MakeCmd++"\"}|Config]),\n"
-		     "    test_server:timetrap_cancel(TimeTrap),\n"
-		     "    Res.\n"
-		     "\n"]).
-			   
-
-make_test_suite(Vars, _Spec, State) ->
-    TestDir = State#state.test_dir,
-
-    Erl_flags=[{i, "../test_server"}|ts_lib:var(erl_flags,Vars)],
-
-    case code:is_loaded(test_server_line) of
-        false -> code:load_file(test_server_line);
-	_ -> ok
-    end,
-
-    {ok, Cwd} = file:get_cwd(),
-    ok = file:set_cwd(TestDir),
-    Result = (catch make_all(Erl_flags)),
-    ok = file:set_cwd(Cwd),
-    case Result of
-	up_to_date ->
-	    ok;
-	{'EXIT', Reason} ->
-	    %% If I return an error here, the test will be stopped
-	    %% and it will not show up in the top index page. Instead
-	    %% I return ok - the test will run for all existing suites.
-	    %% It might be that there are old suites that are run, but
-	    %% at least one suite is missing, and that is reported on the
-	    %% top index page.
-	    io:format("~s: {error,{make_crashed,~p}\n",
-		      [State#state.file,Reason]),
-	    ok;
-	error ->
-	    %% See comment above
-	    io:format("~s: {error,make_of_test_suite_failed}\n",
-		      [State#state.file]),
-	    ok
-    end.
-
-%% Add topcase to spec.
-
-add_topcase_to_spec(Vars, Spec, St) ->
-    Tc = case St#state.all of
-	     {MakeMod,Config} ->
-		 [{make,{MakeMod,make,[Config]},
-		   St#state.topcase,
-		   {MakeMod,unmake,[Config]}}];
-	     undefined -> St#state.topcase
-	 end,
-    {ok,Vars,Spec++[{topcase,Tc}],St}.
-
-%% Writes the (possibly transformed) spec file.
-
-write_spec_file(Vars, Spec, _State) ->
-    F = fun(Term) -> io_lib:format("~p.~n", [Term]) end,
-    SpecFile = map(F, Spec),
-    Hosts = 
-	case lists:keysearch(hosts, 1, Vars) of
-	    false ->
-		[];
-	    {value, {hosts, HostList}} ->
-		io_lib:format("{hosts,~p}.~n",[HostList])
-	end,
-    DiskLess =
-	case lists:keysearch(diskless, 1, Vars) of
-	    false ->
-		[];
-	    {value, {diskless, How}} ->
-		io_lib:format("{diskless, ~p}.~n",[How])
-	end,
-    Conf = consult_config(),
-    MoreConfig = io_lib:format("~p.\n", [{config,Conf}]),
-    file:write_file("current.spec", [DiskLess,Hosts,MoreConfig,SpecFile]).
-
-consult_config() ->
-    {ok,Conf} = file:consult("ts.config"),
-    case os:type() of
-	{unix,_} -> consult_config("ts.unix.config", Conf);
-	{win32,_} -> consult_config("ts.win32.config", Conf);
-	vxworks -> consult_config("ts.vxworks.config", Conf);
-	_ -> Conf
-    end.
-
-consult_config(File, Conf0) ->
-    case file:consult(File) of
-	{ok,Conf} -> Conf++Conf0;
-	{error,enoent} -> Conf0
-    end.
+get_config_files() ->
+    TSConfig = "ts.config",
+    [TSConfig | case os:type() of
+		    {unix,_} -> ["ts.unix.config"];
+		    {win32,_} -> ["ts.win32.config"];
+		    vxworks -> ["ts.vxworks.config"];
+		    _ -> []
+		end].
 
 %% Makes the command to start up the Erlang node to run the tests.
 
@@ -457,6 +173,7 @@ backslashify([]) ->
     [].
 
 make_command(Vars, Spec, State) ->
+    {ok,Cwd} = file:get_cwd(),
     TestDir = State#state.test_dir,
     TestPath = filename:nativename(TestDir),
     Erl = case os:getenv("TS_RUN_VALGRIND") of
@@ -487,7 +204,7 @@ make_command(Vars, Spec, State) ->
 	    {value,{erl_start_args,Args}} -> Args;
 	    false -> ""
 	end,
-    CrashFile = State#state.file ++ "_erl_crash.dump",
+    CrashFile = filename:join(Cwd,State#state.file ++ "_erl_crash.dump"),
     case filelib:is_file(CrashFile) of
 	true -> 
 	    io:format("ts_run: Deleting dump: ~s\n",[CrashFile]),
@@ -495,7 +212,8 @@ make_command(Vars, Spec, State) ->
 	false -> 
 	    ok
     end,
-    Cmd = [Erl, Naming, "test_server -pa ", $", TestPath, $",
+    %% NOTE: Do not use ' in these commands as it wont work on windows
+    Cmd = [Erl, Naming, "test_server"
 	   " -rsh ", ts_lib:var(rsh_name, Vars),
 	   " -env PATH \"",
 	   backslashify(lists:flatten([TestPath, path_separator(),
@@ -505,15 +223,20 @@ make_command(Vars, Spec, State) ->
 	   %% uncomment the line below to disable exception formatting 
 	   %%	   " -test_server_format_exception false",
 	   " -boot start_sasl -sasl errlog_type error",
-	   " -s test_server_ctrl run_test ", State#state.test_server_args,
+	   " -pz ",Cwd,
+	   " -eval \"file:set_cwd(\\\"",TestDir,"\\\")\" "
+	   " -eval \"ct:run_test(", 
+	   backslashify(lists:flatten(State#state.test_server_args)),")\""
 	   " ",
 	   ExtraArgs],
     {ok, Vars, Spec, State#state{command=lists:flatten(Cmd)}}.
+    
 
 run_batch(Vars, _Spec, State) ->
     process_flag(trap_exit, true),
     Command = State#state.command ++ " -noinput -s erlang halt",
     ts_lib:progress(Vars, 1, "Command: ~s~n", [Command]),
+    io:format(user, "Command: ~s~n",[Command]),
     Port = open_port({spawn, Command}, [stream, in, eof]),
     tricky_print_data(Port).
 
@@ -554,7 +277,7 @@ is_testnode_dead([{"test_server",_}|_]) -> false;
 is_testnode_dead([_|T]) -> is_testnode_dead(T).
 
 run_interactive(Vars, _Spec, State) ->
-    Command = State#state.command ++ " -s ts_reports make_index",
+    Command = State#state.command,
     ts_lib:progress(Vars, 1, "Command: ~s~n", [Command]),
     case ts_lib:var(os, Vars) of
 	"Windows 95" ->
@@ -604,77 +327,57 @@ path_separator() ->
     end.
 
 
-make_test_server_args(Args0,Options,Vars) ->
-    Parameters = 
-	case ts_lib:var(os, Vars) of
-	    "VxWorks" ->
-		F = write_parameterfile(vxworks,Vars),
-		" PARAMETERS " ++ F;
-	    _ ->
-		""
-	end,
+make_common_test_args(Args0, Options, _Vars) ->
     Trace = 
 	case lists:keysearch(trace,1,Options) of
 	    {value,{trace,TI}} when is_tuple(TI); is_tuple(hd(TI)) ->
 		ok = file:write_file(?tracefile,io_lib:format("~p.~n",[TI])),
-		" TRACE " ++ ?tracefile;
+		[{ct_trace,?tracefile}];
 	    {value,{trace,TIFile}} when is_atom(TIFile) ->
-		" TRACE " ++ atom_to_list(TIFile);
+		[{ct_trace,atom_to_list(TIFile)}];
 	    {value,{trace,TIFile}} ->
-		" TRACE " ++ TIFile;
+		[{ct_trace,TIFile}];
 	    false ->
-		""
+		[]
 	end,
     Cover = 
 	case lists:keysearch(cover,1,Options) of
-	    {value,{cover,App,File,Analyse}} -> 
-		" COVER " ++ to_list(App) ++ " " ++ to_list(File) ++ " " ++ 
-		    to_list(Analyse);
+	    {value,{cover, App, none, _Analyse}} ->
+		io:format("No cover file found for ~p~n",[App]),
+		[];
+	    {value,{cover,_App,File,_Analyse}} -> 
+		[{cover,to_list(File)}];
 	    false -> 
-		""
-	end,
-    TCCallback =
-	case ts_lib:var(ts_testcase_callback, Vars) of
-	    "" -> 
-		"";
-	    {Mod,Func} ->
-		io:format("Function ~w:~w/4 will be called before and "
-			  "after each test case.\n", [Mod,Func]),
-		" TESTCASE_CALLBACK " ++ to_list(Mod) ++ " " ++ to_list(Func);	    
-	    ModFunc when is_list(ModFunc) ->
-		[Mod,Func]=string:tokens(ModFunc," "),
-		io:format("Function ~s:~s/4 will be called before and "
-			  "after each test case.\n", [Mod,Func]),			
-		" TESTCASE_CALLBACK " ++ ModFunc;		    
-	    _ ->
-		""
+		[]
 	end,
-    Args0 ++ Parameters ++ Trace ++ Cover ++ TCCallback.
+
+    Logdir = case lists:keysearch(logdir, 1, Options) of
+		  {value,{logdir, _}} ->
+		      [];
+		  false ->
+		      [{logdir,"../test_server"}]
+	     end,
+
+    ConfigPath = case {os:getenv("TEST_CONFIG_PATH"),
+		       lists:keysearch(config, 1, Options)} of
+		     {false,{value, {config, Path}}} ->
+			 Path;
+		     {false,false} ->
+			 "../test_server";
+		     {Path,_} ->
+			 Path
+		 end,
+    ConfigFiles = [{config,[filename:join(ConfigPath,File)
+			    || File <- get_config_files()]}],
+
+    io_lib:format("~100000p",[Args0++Trace++Cover++Logdir++
+				  ConfigFiles++Options]).
 
 to_list(X) when is_atom(X) ->
     atom_to_list(X);
 to_list(X) when is_list(X) ->
     X.
 
-write_parameterfile(Type,Vars) ->
-    Cross_host = ts_lib:var(target_host, Vars),
-    SlaveTargets = case lists:keysearch(slavetargets,1,Vars) of
-		       {value, ST} ->
-			   [ST];
-		       _ ->
-			   []
-		   end,
-    Master = case lists:keysearch(master,1,Vars) of
-		 {value,M} -> [M];
-		 false -> []
-	     end,
-    ToWrite = [{type,Type},
-	       {target, list_to_atom(Cross_host)}] ++ SlaveTargets ++ Master,
-
-    Crossfile = atom_to_list(Type) ++ "parameters" ++ os:getpid(),
-    ok = file:write_file(Crossfile,io_lib:format("~p.~n", [ToWrite])),
-    Crossfile.
-
 %%
 %% Paths and spaces handling for w2k and XP
 %%
@@ -720,53 +423,3 @@ split_one(Path) ->
 
 split_path(Path) ->
     string:tokens(Path,";").
-
-%%
-%% Run make:all/1 if the test suite seems to be designed
-%% to be built/re-built by ts.
-%%
-make_all(Flags) ->
-    case filelib:is_regular("Emakefile") of
-	false ->
-	    make_all_no_emakefile(Flags);
-	true ->
-	    make:all(Flags)
-    end.
-
-make_all_no_emakefile(Flags) ->
-    case filelib:wildcard("*.beam") of
-	[] ->
-	    %% Since there are no *.beam files, we will assume
-	    %% that this test suite was designed to be built and
-	    %% re-built by ts. Create an Emakefile so that
-	    %% make:all/1 will be run the next time too
-	    %% (in case a test suite is being interactively
-	    %% developed).
-	    create_emakefile(Flags, "*.erl");
-	[_|_] ->
-	    %% There is no Emakefile and there already are
-	    %% some *.beam files here. Assume that this test
-	    %% suite was not designed to be re-built by ts.
-	    %% Only create a Emakefile that will compile
-	    %% generated *_SUITE_make files (if any).
-	    create_emakefile(Flags, "*_SUITE_make.erl")
-    end.
-
-create_emakefile(Flags, Wc) ->
-    case filelib:wildcard(Wc) of
-	[] ->
-	    %% There are no files to be built (i.e. not even any
-	    %% generated *_SUITE_make.erl files). We must handle
-	    %% this case specially, because make:all/1 will crash
-	    %% on Emakefile with an empty list of modules.
-	    io:put_chars("No Emakefile found - not running make:all/1\n"),
-	    up_to_date;
-	[_|_]=Ms0 ->
-	    io:format("Creating an Emakefile for compiling files matching ~s\n",
-		      [Wc]),
-	    Ms = [list_to_atom(filename:rootname(M, ".erl")) || M <- Ms0],
-	    Make0 = {Ms,Flags},
-	    Make = io_lib:format("~p. \n", [Make0]),
-	    ok = file:write_file("Emakefile", Make),
-	    make:all(Flags)
-    end.
diff --git a/lib/test_server/test/Makefile b/lib/test_server/test/Makefile
index 702d73f5af..0648c1f96a 100644
--- a/lib/test_server/test/Makefile
+++ b/lib/test_server/test/Makefile
@@ -27,11 +27,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 MODULES= \
 	test_server_SUITE \
 	test_server_line_SUITE \
-	test_server_skip_SUITE \
-	test_server_conf01_SUITE \
-	test_server_conf02_SUITE \
-	test_server_parallel01_SUITE \
-	test_server_shuffle01_SUITE
+	test_server_test_lib
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -52,6 +48,7 @@ RELSYSDIR = $(RELEASE_PATH)/test_server_test
 
 ERL_MAKE_FLAGS += -pa $(ERL_TOP)/lib/test_server/ebin
 ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/test
 
 EBIN = .
 
@@ -88,7 +85,7 @@ release_spec: opt
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(COVERFILE) $(RELSYSDIR)
-	$(INSTALL_PROGRAM) test_server.spec $(RELSYSDIR)
+	$(INSTALL_DATA) test_server.spec test_server.cover $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/test_server/test/test_server.cover b/lib/test_server/test/test_server.cover
index c2366db166..5c59bab494 100644
--- a/lib/test_server/test/test_server.cover
+++ b/lib/test_server/test/test_server.cover
@@ -1,20 +1,22 @@
-{exclude,[test_server,
-	  test_server_ctrl,
-	  ts_selftest]}.
+{incl_app,test_server,details}.
 
-%% Using include list here because the test_server might not find
+{excl_mods, test_server, [test_server,
+			  test_server_ctrl,
+			  ts_selftest]}.
+
+%% Using incl_mods list here because the test_server might not find
 %% lib_dir for test_server - and so it will not find which modules to
 %% compile.
-{include,[erl2html2,
-	  test_server_node,
-	  test_server_sup,
-	  ts,
-	  ts_autoconf_vxworks,
-	  ts_autoconf_win32,
-	  ts_erl_config,
-	  ts_install,
-	  ts_lib,
-	  ts_make,
-	  ts_run,
-	  vxworks_client]}.
+{incl_mods, test_server, [erl2html2,
+			  test_server_node,
+			  test_server_sup,
+			  ts,
+			  ts_autoconf_vxworks,
+			  ts_autoconf_win32,
+			  ts_erl_config,
+			  ts_install,
+			  ts_lib,
+			  ts_make,
+			  ts_run,
+			  vxworks_client]}.
 
diff --git a/lib/test_server/test/test_server.spec b/lib/test_server/test/test_server.spec
index 23b0b71963..a3b4d01d08 100644
--- a/lib/test_server/test/test_server.spec
+++ b/lib/test_server/test/test_server.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../test_server_test"}}.
-{skip,{test_server_SUITE,skip_case7,"This case should be noted as `Skipped'"}}.
+{suites, "../test_server_test", all}.
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index dfe1028d3a..f4c19eeaf9 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2010. 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
@@ -16,539 +16,149 @@
 %%
 %% %CopyrightEnd%
 %%
-
-%%%------------------------------------------------------------------
-%%% Test Server self test. 
-%%%------------------------------------------------------------------
+%%%-------------------------------------------------------------------
+%%% @author Lukas Larsson <[email protected]>
+%%% @copyright (C) 2011, Erlang Solutions Ltd.
+%%% @doc
+%%%
+%%% @end
+%%% Created : 15 Feb 2011 by Lukas Larsson <[email protected]>
+%%%-------------------------------------------------------------------
 -module(test_server_SUITE).
--include_lib("test_server/include/test_server.hrl").
--include_lib("test_server/include/test_server_line.hrl").
--include_lib("kernel/include/file.hrl").
--export([all/1]).
 
--export([init_per_suite/1, end_per_suite/1]).
--export([init_per_testcase/2, end_per_testcase/2, fin_per_testcase/2]).
--export([config/1, comment/1, timetrap/1, timetrap_cancel/1, multiply_timetrap/1,
-	 init_per_s/1, init_per_tc/1, end_per_tc/1,
-	 timeconv/1, msgs/1, capture/1, timecall/1,
-	 do_times/1, do_times_mfa/1, do_times_fun/1,
-	 skip_cases/1, skip_case1/1, skip_case2/1, skip_case3/1, 
-	 skip_case4/1, skip_case5/1, skip_case6/1, skip_case7/1,
-	 skip_case8/1, skip_case9/1, undefined_functions/1,
-	 conf_init/1, check_new_conf/1, conf_cleanup/1,
-	 check_old_conf/1, conf_init_fail/1, start_stop_node/1,
-	 cleanup_nodes_init/1, check_survive_nodes/1, cleanup_nodes_fin/1,
-	 commercial/1]).
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include("test_server_test_lib.hrl").
 
--export([dummy_function/0,dummy_function/1,doer/1]).
+%%--------------------------------------------------------------------
+%% COMMON TEST CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
 
-all(doc) -> ["Test Server self test"];
-all(suite) ->
-    [config, comment, timetrap, timetrap_cancel, multiply_timetrap,
-     init_per_s, init_per_tc, end_per_tc,
-     timeconv, msgs, capture, timecall, do_times, skip_cases,
-     undefined_functions, commercial,
-     {conf, conf_init, [check_new_conf], conf_cleanup},
-     check_old_conf,
-     {conf, conf_init_fail,[conf_member_skip],conf_cleanup_skip},
-     start_stop_node,
-     {conf, cleanup_nodes_init,[check_survive_nodes],cleanup_nodes_fin},
-     config
-    ].
+%% @spec suite() -> Info
+suite() ->
+    [{ct_hooks,[ts_install_cth,test_server_test_lib]}].
 
 
+%% @spec init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
 init_per_suite(Config) ->
-    [{init_per_suite_var,ok}|Config].
+    [{path_dirs,[proplists:get_value(data_dir,Config)]} | Config].
 
+%% @spec end_per_suite(Config) -> _
 end_per_suite(_Config) ->
-    ok.
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(2)),
-    Config1 = [{watchdog, Dog}|Config],
-    case Func of
-	init_per_tc ->
-	    [{strange_var, 1}|Config1];
-	skip_case8 -> 
-	    {skipped, "This case should be noted as `Skipped'"};
-	skip_case9 ->
-	    {skip, "This case should be noted as `Skipped'"};
-	_ ->
-	    Config1
-    end;
-init_per_testcase(Func, Config) ->
-    io:format("Func:~p",[Func]),
-    io:format("Config:~p",[Config]),
-    ?t:fail("Arguments to init_per_testcase not correct").
-
-end_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    case Func of
-	end_per_tc -> io:format("CLEANUP => this test case is ok\n");
-	_Other -> ok
-    end;
-end_per_testcase(Func, Config) ->
-    io:format("Func:~p",[Func]),
-    io:format("Config:~p",[Config]),
-    ?t:fail("Arguments to end_per_testcase not correct").
-
-fin_per_testcase(Func, Config) ->
-    io:format("Func:~p",[Func]),
-    io:format("Config:~p",[Config]),
-    ?t:fail("fin_per_testcase/2 called, should have called end_per_testcase/2").
+    io:format("TEST_SERVER_FRAMEWORK: ~p",[os:getenv("TEST_SERVER_FRAMEWORK")]),
+    ok.
+
+%% @spec init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%% @spec end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%% @spec init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%% @spec end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1} | {fail,Reason}
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%% @spec: groups() -> [Group]
+groups() ->
+    [].
+
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+all() ->
+    [test_server_SUITE, test_server_parallel01_SUITE,
+     test_server_conf02_SUITE, test_server_conf01_SUITE,
+     test_server_skip_SUITE, test_server_shuffle01_SUITE].
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+%% @spec TestCase(Config0) ->
+%%           ok | exit() | {skip,Reason} | {comment,Comment} |
+%%           {save_config,Config1} | {skip_and_save,Reason,Config1}
+test_server_SUITE(Config) ->
+%    rpc:call(Node,dbg, tracer,[]),
+%    rpc:call(Node,dbg, p,[all,c]),
+%    rpc:call(Node,dbg, tpl,[test_server_ctrl,x]),
+    run_test_server_tests("test_server_SUITE", 39, 1, 31, 
+			  20, 9, 1, 11, 2, 26, Config).
+
+test_server_parallel01_SUITE(Config) ->
+    run_test_server_tests("test_server_parallel01_SUITE", 37, 0, 19, 
+			  19, 0, 0, 0, 0, 37, Config).
+
+test_server_shuffle01_SUITE(Config) ->
+    run_test_server_tests("test_server_shuffle01_SUITE", 130, 0, 0, 
+			  76, 0, 0, 0, 0, 130, Config).
+
+test_server_skip_SUITE(Config) ->
+    run_test_server_tests("test_server_skip_SUITE", 3, 0, 1, 
+			  0, 0, 1, 3, 0, 0, Config).
+
+test_server_conf01_SUITE(Config) ->
+    run_test_server_tests("test_server_conf01_SUITE", 24, 0, 12, 
+			  12, 0, 0, 0, 0, 24, Config).
+
+test_server_conf02_SUITE(Config) ->
+    run_test_server_tests("test_server_conf02_SUITE", 26, 0, 12, 
+			  12, 0, 0, 0, 0, 26, Config).
+
+
+run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc, 
+		      NUsrSkip, NAutoSkip, 
+		      NActualSkip, NActualFail, NActualSucc, Config) ->
+    Node = proplists:get_value(node, Config),
+    {ok,_Pid} = rpc:call(Node,test_server_ctrl, start, []),
+    rpc:call(Node,
+	     test_server_ctrl,add_dir_with_skip,
+	     [SuiteName, 
+	      [proplists:get_value(data_dir,Config)],SuiteName,
+	      [{test_server_SUITE,skip_case7,"SKIPPED!"}]]),
+
+    until(fun() ->
+		  rpc:call(Node,test_server_ctrl,jobs,[]) =:= []
+	  end),
     
-
-config(suite) -> [];
-config(doc) -> ["Test that the Config variable is decent, ",
-		"and that the std config variables are correct ",
-		"(check that data/priv dir exists)."
-		"Also check that ?config macro works."];
-config(Config) when is_list(Config) ->
-    is_tuplelist(Config),
-    {value,{data_dir,Dd}}=lists:keysearch(data_dir,1,Config),
-    {value,{priv_dir,Dp}}=lists:keysearch(priv_dir,1,Config),
-    true=is_dir(Dd),
-    {ok, _Bin}=file:read_file(filename:join(Dd, "dummy_file")),
-    true=is_dir(Dp),
-
-    Dd = ?config(data_dir,Config),
-    Dp = ?config(priv_dir,Config),
-    ok;
-config(_Config) ->
-    ?t:fail("Config variable is not a list.").
-
-is_tuplelist([]) ->
-    true;
-is_tuplelist([{_A,_B}|Rest]) ->
-    is_tuplelist(Rest);
-is_tuplelist(_) ->
-    false.
-
-is_dir(Dir) ->
-    case file:read_file_info(Dir) of
-	{ok, #file_info{type=directory}} ->
-	    true;
-	_ ->
-	    false
-    end.
-
-comment(suite) -> [];
-comment(doc) -> ["Print a comment in the HTML log"];
-comment(Config) when is_list(Config) ->
-    ?t:comment("This comment should not occur in the HTML log because a later"
-	       " comment shall overwrite it"),
-    ?t:comment("This comment is printed with the comment/1 function."
-	       " It should occur in the HTML log").
-
-
-
-timetrap(suite) -> [];
-timetrap(doc) -> ["Test that timetrap works."];
-timetrap(Config) when is_list(Config) ->
-    TrapAfter = 3000,
-    Dog=?t:timetrap(TrapAfter),
-    process_flag(trap_exit, true),
-    TimeOut = TrapAfter * test_server:timetrap_scale_factor() + 1000,
-    receive
-	{'EXIT', Dog, {timetrap_timeout, _, _}} ->
-	    ok;
-	{'EXIT', _OtherPid, {timetrap_timeout, _, _}} ->
-	    ?t:fail("EXIT signal from wrong process")
-    after
-	TimeOut ->
-	    ?t:fail("Timetrap is not working.")
-    end,
-    ?t:timetrap_cancel(Dog),
-    ok.
-
-
-timetrap_cancel(suite) -> [];
-timetrap_cancel(doc) -> ["Test that timetrap_cancel works."];
-timetrap_cancel(Config) when is_list(Config) ->
-    Dog=?t:timetrap(1000),
-    receive
-    after
-	500 ->
-	    ok
-    end,
-    ?t:timetrap_cancel(Dog),
-    receive
-    after 1000 ->
-	    ok
-    end,
-    ok.
-
-multiply_timetrap(suite) -> [];
-multiply_timetrap(doc) -> ["Test multiply timetrap"];
-multiply_timetrap(Config) when is_list(Config) ->
-    %% This simulates the call to test_server_ctrl:multiply_timetraps/1:
-    put(test_server_multiply_timetraps,2),
-
-    Dog = ?t:timetrap(500),
-    timer:sleep(800),
-    ?t:timetrap_cancel(Dog),
-
-    %% Reset
-    put(test_server_multiply_timetraps,1),
-    ok.
-
-
-init_per_s(suite) -> [];
-init_per_s(doc) -> ["Test that a Config that is altered in ",
-		     "init_per_suite gets through to the testcases."];
-init_per_s(Config) ->
-    %% Check that the config var sent from init_per_suite
-    %% really exists.
-    {value, {init_per_suite_var, ok}} = 
-	lists:keysearch(init_per_suite_var,1,Config),
-
-    %% Check that the other variables still exist.
-    {value,{data_dir,_Dd}}=lists:keysearch(data_dir,1,Config),
-    {value,{priv_dir,_Dp}}=lists:keysearch(priv_dir,1,Config),
-    ok.
-
-init_per_tc(suite) -> [];
-init_per_tc(doc) -> ["Test that a Config that is altered in ",
-		     "init_per_testcase gets through to the ",
-		     "actual testcase."];
-init_per_tc(Config) ->
-    %% Check that the config var sent from init_per_testcase
-    %% really exists.
-    {value, {strange_var, 1}} = lists:keysearch(strange_var,1,Config),
-
-    %% Check that the other variables still exist.
-    {value,{data_dir,_Dd}}=lists:keysearch(data_dir,1,Config),
-    {value,{priv_dir,_Dp}}=lists:keysearch(priv_dir,1,Config),
-    ok.
-
-end_per_tc(suite) -> [];
-end_per_tc(doc) -> ["Test that end_per_testcase/2 is called even if"
-		    " test case fails"];
-end_per_tc(Config) when is_list(Config) ->
-    ?t:fail("This case should fail! Check that \"CLEANUP\" is"
-	    " printed in the minor log file.").
-
-
-timeconv(suite) -> [];
-timeconv(doc) -> ["Test that the time unit conversion functions ",
-		  "works."];
-timeconv(Config) when is_list(Config) ->
-    Val=2,
-    Secs=Val*1000,
-    Mins=Secs*60,
-    Hrs=Mins*60,
-    Secs=?t:seconds(2),
-    Mins=?t:minutes(2),
-    Hrs=?t:hours(2),
-    ok.
-
-
-msgs(suite) -> [];
-msgs(doc) -> ["Tests the messages_get function."];
-msgs(Config) when is_list(Config) ->
-    self() ! {hej, du},
-    self() ! {lite, "data"},
-    self() ! en_atom,
-    [{hej, du}, {lite, "data"}, en_atom] = ?t:messages_get(),
-    ok.
-
-capture(suite) -> [];
-capture(doc) -> ["Test that the capture functions work properly."];
-capture(Config) when is_list(Config) ->
-    String1="abcedfghjiklmnopqrstuvwxyz",
-    String2="0123456789",
-    ?t:capture_start(),
-    io:format(String1),
-    [String1]=?t:capture_get(),
-    io:format(String2),
-    [String2]=?t:capture_get(),
-    ?t:capture_stop(),
-    []=?t:capture_get(),
-    io:format(String2),
-    []=?t:capture_get(),
-    ok.
-
-timecall(suite) -> [];
-timecall(doc) -> ["Tests that timed calls work."];
-timecall(Config) when is_list(Config) ->
-    {_Time1, liten_apa_e_oxo_farlig} = ?t:timecall(?MODULE, dummy_function, []),
-    {Time2, jag_ar_en_gorilla} = ?t:timecall(?MODULE, dummy_function, [gorilla]),
-    DTime=round(Time2),
-    if
-	DTime<1 ->
-	    ?t:fail("Timecall reported a too low time.");
-	DTime==1 ->
+    rpc:call(Node,test_server_ctrl, stop, []),
+    {ok,#suite{ n_cases = NCases,
+		n_cases_failed = NFail,
+		n_cases_expected = NExpected, 
+		n_cases_succ = NSucc,
+		n_cases_user_skip = NUsrSkip,
+		n_cases_auto_skip = NAutoSkip,
+		cases = Cases }} = Data =
+	test_server_test_lib:parse_suite(
+	  hd(filelib:wildcard(
+	       filename:join([proplists:get_value(priv_dir, Config), 
+			      SuiteName++".logs","run*","suite.log"])))),
+    {NActualSkip,NActualFail,NActualSucc} = 
+	lists:foldl(fun(#tc{ result = skip },{S,F,Su}) ->
+			     {S+1,F,Su};
+			 (#tc{ result = ok },{S,F,Su}) ->
+			     {S,F,Su+1};
+			(#tc{ result = failed },{S,F,Su}) ->
+			     {S,F+1,Su}
+			  end,{0,0,0},Cases),
+    Data.
+
+until(Fun) ->
+    case Fun() of
+	true ->
 	    ok;
-	DTime>1 ->
-	    ?t:fail("Timecall reported a too high time.")
-    end,
-    ok.
-
-dummy_function() ->
-    liten_apa_e_oxo_farlig.
-dummy_function(gorilla) ->
-    receive after 1000 -> ok end,
-    jag_ar_en_gorilla.
-
-
-do_times(suite) -> [do_times_mfa, do_times_fun];
-do_times(doc) -> ["Test the do_times function."].
-
-do_times_mfa(suite) -> [];
-do_times_mfa(doc) -> ["Test the do_times function with M,F,A given."];
-do_times_mfa(Config) when is_list(Config) ->
-    ?t:do_times(100, ?MODULE, doer, [self()]),
-    100=length(?t:messages_get()),
-    ok.
-
-do_times_fun(suite) -> [];
-do_times_fun(doc) -> ["Test the do_times function with fun given."];
-do_times_fun(Config) when is_list(Config) ->
-    Self = self(),
-    ?t:do_times(100, fun() -> doer(Self) end),
-    100=length(?t:messages_get()),
-    ok.
-
-doer(From) ->
-    From ! a,
-    ok.
-
-skip_cases(doc) -> ["Test all possible ways to skip a test case."];
-skip_cases(suite) -> [skip_case1, skip_case2, skip_case3, skip_case4,
-		      skip_case5, skip_case6, skip_case7, skip_case8,
-		      skip_case9].
-
-skip_case1(suite) -> [];
-skip_case1(doc) -> ["Test that you can return {skipped, Reason},"
-		    " and that Reason is in the comment field in the HTML log"];
-skip_case1(Config) when is_list(Config) ->
-    %% If this comment shows, the case failed!!
-    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
-    %% The Reason in {skipped, Reason} should overwrite a 'comment'
-    {skipped, "This case should be noted as `Skipped'"}.
-
-skip_case2(suite) -> [];
-skip_case2(doc) -> ["Test that you can return {skipped, Reason},"
-		    " and that Reason is in the comment field in the HTML log"];
-skip_case2(Config) when is_list(Config) ->
-    %% If this comment shows, the case failed!!
-    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
-    %% The Reason in {skipped, Reason} should overwrite a 'comment'
-    exit({skipped, "This case should be noted as `Skipped'"}).    
-
-skip_case3(suite) -> [];
-skip_case3(doc) -> ["Test that you can return {skip, Reason},"
-		    " and that Reason is in the comment field in the HTML log"];
-skip_case3(Config) when is_list(Config) ->
-    %% If this comment shows, the case failed!!
-    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
-    %% The Reason in {skip, Reason} should overwrite a 'comment'
-    {skip, "This case should be noted as `Skipped'"}.
-
-skip_case4(suite) -> [];
-skip_case4(doc) -> ["Test that you can return {skip, Reason},"
-		    " and that Reason is in the comment field in the HTML log"];
-skip_case4(Config) when is_list(Config) ->
-    %% If this comment shows, the case failed!!
-    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
-    %% The Reason in {skip, Reason} should overwrite a 'comment'
-    exit({skip, "This case should be noted as `Skipped'"}).    
-
-skip_case5(suite) -> {skipped, "This case should be noted as `Skipped'"};
-skip_case5(doc) -> ["Test that you can return {skipped, Reason}"
-		    " from the specification clause"].
-
-skip_case6(suite) -> {skip, "This case should be noted as `Skipped'"};
-skip_case6(doc) -> ["Test that you can return {skip, Reason}"
-		    " from the specification clause"].
-
-skip_case7(suite) -> [];
-skip_case7(doc) -> ["Test that skip works from a test specification file"];
-skip_case7(Config) when is_list(Config) ->
-    %% This case shall be skipped by adding 
-    %% {skip, {test_server_SUITE, skip_case7, Reason}}. 
-    %% to the test specification file.
-    ?t:fail("This case should have been Skipped by the .spec file").
-
-skip_case8(suite) -> [];
-skip_case8(doc) -> ["Test that {skipped, Reason} works from"
-		    " init_per_testcase/2"];
-skip_case8(Config) when is_list(Config) ->
-    %% This case shall be skipped by adding a specific clause to 
-    %% returning {skipped, Reason} from init_per_testcase/2 for this case. 
-    ?t:fail("This case should have been Skipped by init_per_testcase/2").
-
-skip_case9(suite) -> [];
-skip_case9(doc) -> ["Test that {skip, Reason} works from a init_per_testcase/2"];
-skip_case9(Config) when is_list(Config) ->
-    %% This case shall be skipped by adding a specific clause to 
-    %% returning {skip, Reason} from init_per_testcase/2 for this case. 
-    ?t:fail("This case should have been Skipped by init_per_testcase/2").
-
-undefined_functions(suite) -> [];
-undefined_functions(doc) -> ["Check for calls to undefined functions in"
-			     " test_server."
-			     "Skip if cover is running"];
-undefined_functions(Config) when is_list(Config) ->
-    case whereis(cover_server) of
-	Pid when is_pid(Pid) -> 
-	    {skip,"Cover is running"};
-	undefined -> 
-	    undefined_functions()
-    end.
-
-undefined_functions() ->
-    TestServerDir = filename:dirname(code:which(test_server)),
-    Res = xref:d(TestServerDir),
-    
-    {value,{unused,Unused}} = lists:keysearch(unused, 1, Res),
-    case Unused of
-	[] -> ok;
-	_ ->
-	    lists:foreach(fun (MFA) ->
-				  io:format("~s unused", [format_mfa(MFA)])
-			  end, Unused)
-    end,
-    
-    {value,{undefined,Undef0}} = lists:keysearch(undefined, 1, Res),
-    Undef = [U || U <- Undef0, not unresolved(U)],
-    case Undef of
-	[] -> ok;
-	_ ->
-	    lists:foreach(fun ({MFA1,MFA2}) ->
-				  io:format("~s calls undefined ~s",
-					    [format_mfa(MFA1),format_mfa(MFA2)])
-			  end, Undef),
-	    ?t:fail({length(Undef),undefined_functions_in_otp})
-    end,
-    ok.
-
-unresolved({_,{_,'$F_EXPR',_}}) -> true;
-unresolved(_) -> false.
-
-format_mfa({M,F,A}) ->
-    lists:flatten(io_lib:format("~s:~s/~p", [M,F,A])).
-
-conf_init(doc) -> ["Test successful conf case: Change Config parameter"];
-conf_init(Config) when is_list(Config) ->
-    [{conf_init_var,1389}|Config].
-
-check_new_conf(suite) -> [];
-check_new_conf(doc) -> ["Check that Config parameter changed by"
-			" conf_init is used"];
-check_new_conf(Config) when is_list(Config) ->
-    1389 = ?config(conf_init_var,Config),
-    ok.
-
-conf_cleanup(doc) -> ["Test successful conf case: Restore Config parameter"];
-conf_cleanup(Config) when is_list(Config) ->
-    lists:keydelete(conf_init_var,1,Config).
-
-check_old_conf(suite) -> [];
-check_old_conf(doc) -> ["Test that the restored Config is used after a"
-			" conf cleanup"];
-check_old_conf(Config) when is_list(Config) ->
-    undefined = ?config(conf_init_var,Config),
-    ok.
-
-conf_init_fail(doc) -> ["Test that config members are skipped if"
-			" conf init function fails."];
-conf_init_fail(Config) when is_list(Config) -> 
-    ?t:fail("This case should fail! Check that conf_member_skip and"
-	    " conf_cleanup_skip are skipped.").
-
-
-
-start_stop_node(suite) -> [];
-start_stop_node(doc) -> ["Test start and stop of slave and peer nodes"];
-start_stop_node(Config) when is_list(Config) ->
-    {ok,Node2} = ?t:start_node(node2,peer,[]),
-    {error, _} = ?t:start_node(node2,peer,[{fail_on_error,false}]),
-    true = lists:member(Node2,nodes()),
-
-    {ok,Node3} = ?t:start_node(node3,slave,[]),
-    {error, _} = ?t:start_node(node3,slave,[]),
-    true = lists:member(Node3,nodes()),
-
-    {ok,Node4} = ?t:start_node(node4,peer,[{wait,false}]),
-    case lists:member(Node4,nodes()) of
-	true -> 
-	    ?t:comment("WARNING: Node started with {wait,false}"
-			     " is up faster than expected...");
 	false ->
-	    wait_for_node(Node4,0),
-	    true = lists:member(Node4,nodes())
-    end,
-
-    true = ?t:stop_node(Node2),
-    false = lists:member(Node2,nodes()),
-
-    true = ?t:stop_node(Node3),
-    false = lists:member(Node3,nodes()),
-    
-    true = ?t:stop_node(Node4),
-    false = lists:member(Node4,nodes()),
-    timer:sleep(2000),
-    false = ?t:stop_node(Node4),
-
-    ok.
-
-
-wait_for_node(Node,Acc) ->
-    case net_adm:ping(Node) of
-	pang -> 
 	    timer:sleep(100),
-	    wait_for_node(Node,Acc+100);
-	pong ->
-	    Acc
+	    until(Fun)
     end.
-
-cleanup_nodes_init(doc) -> ["Test that nodes are terminated when test case"
-			    " is finished unless {cleanup,false} is given."];
-cleanup_nodes_init(Config) when is_list(Config) ->
-    {ok,DieSlave} = ?t:start_node(die_slave, slave, []),
-    {ok,SurviveSlave} = ?t:start_node(survive_slave, slave, [{cleanup,false}]),
-    {ok,DiePeer} = ?t:start_node(die_peer, peer, []),
-    {ok,SurvivePeer} = ?t:start_node(survive_peer, peer, [{cleanup,false}]),
-    [{die_slave,DieSlave},
-     {survive_slave,SurviveSlave},
-     {die_peer,DiePeer},
-     {survive_peer,SurvivePeer} | Config].
-
-
-
-check_survive_nodes(suite) -> [];
-check_survive_nodes(doc) -> ["Test that nodes with {cleanup,false} survived"];
-check_survive_nodes(Config) when is_list(Config) ->
-    timer:sleep(1000),
-    false = lists:member(?config(die_slave,Config),nodes()),
-    true = lists:member(?config(survive_slave,Config),nodes()),
-    false = lists:member(?config(die_peer,Config),nodes()),
-    true = lists:member(?config(survive_peer,Config),nodes()),
-    ok.
-
-
-cleanup_nodes_fin(doc) -> ["Test that nodes started with {cleanup,false}"
-			   " can be stopped"];
-cleanup_nodes_fin(Config) when is_list(Config) ->
-    Slave = ?config(survive_slave,Config),
-    Peer = ?config(survive_peer,Config),
-    
-    true = ?t:stop_node(Slave),
-    false = lists:member(Slave,nodes()),
-    true = ?t:stop_node(Peer),
-    false = lists:member(Peer,nodes()),
-    
-    C1 = lists:keydelete(die_slave,1,Config),
-    C2 = lists:keydelete(survive_slave,1,C1),
-    C3 = lists:keydelete(die_peer,1,C2),
-    lists:keydelete(survive_peer,1,C3).
-
-commercial(Config) when is_list(Config) ->
-    case ?t:is_commercial() of
-	false -> {comment,"Open-source build"};
-	true -> {comment,"Commercial build"}
-    end.
-
-	    
+	  
diff --git a/lib/test_server/test/test_server_SUITE_data/Makefile.src b/lib/test_server/test/test_server_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..d5af919eec
--- /dev/null
+++ b/lib/test_server/test/test_server_SUITE_data/Makefile.src
@@ -0,0 +1,2 @@
+all:
+	erlc *.erl
\ No newline at end of file
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
new file mode 100644
index 0000000000..0563e1104f
--- /dev/null
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
@@ -0,0 +1,554 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2010. 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%
+%%
+
+%%%------------------------------------------------------------------
+%%% Test Server self test. 
+%%%------------------------------------------------------------------
+-module(test_server_SUITE).
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("test_server/include/test_server_line.hrl").
+-include_lib("kernel/include/file.hrl").
+-export([all/1]).
+
+-export([init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2, fin_per_testcase/2]).
+-export([config/1, comment/1, timetrap/1, timetrap_cancel/1, multiply_timetrap/1,
+	 init_per_s/1, init_per_tc/1, end_per_tc/1,
+	 timeconv/1, msgs/1, capture/1, timecall/1,
+	 do_times/1, do_times_mfa/1, do_times_fun/1,
+	 skip_cases/1, skip_case1/1, skip_case2/1, skip_case3/1, 
+	 skip_case4/1, skip_case5/1, skip_case6/1, skip_case7/1,
+	 skip_case8/1, skip_case9/1, undefined_functions/1,
+	 conf_init/1, check_new_conf/1, conf_cleanup/1,
+	 check_old_conf/1, conf_init_fail/1, start_stop_node/1,
+	 cleanup_nodes_init/1, check_survive_nodes/1, cleanup_nodes_fin/1,
+	 commercial/1]).
+
+-export([dummy_function/0,dummy_function/1,doer/1]).
+
+all(doc) -> ["Test Server self test"];
+all(suite) ->
+    [config, comment, timetrap, timetrap_cancel, multiply_timetrap,
+     init_per_s, init_per_tc, end_per_tc,
+     timeconv, msgs, capture, timecall, do_times, skip_cases,
+     undefined_functions, commercial,
+     {conf, conf_init, [check_new_conf], conf_cleanup},
+     check_old_conf,
+     {conf, conf_init_fail,[conf_member_skip],conf_cleanup_skip},
+     start_stop_node,
+     {conf, cleanup_nodes_init,[check_survive_nodes],cleanup_nodes_fin},
+     config
+    ].
+
+
+init_per_suite(Config) ->
+    [{init_per_suite_var,ok}|Config].
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
+    Dog = ?t:timetrap(?t:minutes(2)),
+    Config1 = [{watchdog, Dog}|Config],
+    case Func of
+	init_per_tc ->
+	    [{strange_var, 1}|Config1];
+	skip_case8 -> 
+	    {skipped, "This case should be noted as `Skipped'"};
+	skip_case9 ->
+	    {skip, "This case should be noted as `Skipped'"};
+	_ ->
+	    Config1
+    end;
+init_per_testcase(Func, Config) ->
+    io:format("Func:~p",[Func]),
+    io:format("Config:~p",[Config]),
+    ?t:fail("Arguments to init_per_testcase not correct").
+
+end_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
+    Dog=?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    case Func of
+	end_per_tc -> io:format("CLEANUP => this test case is ok\n");
+	_Other -> ok
+    end;
+end_per_testcase(Func, Config) ->
+    io:format("Func:~p",[Func]),
+    io:format("Config:~p",[Config]),
+    ?t:fail("Arguments to end_per_testcase not correct").
+
+fin_per_testcase(Func, Config) ->
+    io:format("Func:~p",[Func]),
+    io:format("Config:~p",[Config]),
+    ?t:fail("fin_per_testcase/2 called, should have called end_per_testcase/2").
+    
+
+config(suite) -> [];
+config(doc) -> ["Test that the Config variable is decent, ",
+		"and that the std config variables are correct ",
+		"(check that data/priv dir exists)."
+		"Also check that ?config macro works."];
+config(Config) when is_list(Config) ->
+    is_tuplelist(Config),
+    {value,{data_dir,Dd}}=lists:keysearch(data_dir,1,Config),
+    {value,{priv_dir,Dp}}=lists:keysearch(priv_dir,1,Config),
+    true=is_dir(Dd),
+    {ok, _Bin}=file:read_file(filename:join(Dd, "dummy_file")),
+    true=is_dir(Dp),
+
+    Dd = ?config(data_dir,Config),
+    Dp = ?config(priv_dir,Config),
+    ok;
+config(_Config) ->
+    ?t:fail("Config variable is not a list.").
+
+is_tuplelist([]) ->
+    true;
+is_tuplelist([{_A,_B}|Rest]) ->
+    is_tuplelist(Rest);
+is_tuplelist(_) ->
+    false.
+
+is_dir(Dir) ->
+    case file:read_file_info(Dir) of
+	{ok, #file_info{type=directory}} ->
+	    true;
+	_ ->
+	    false
+    end.
+
+comment(suite) -> [];
+comment(doc) -> ["Print a comment in the HTML log"];
+comment(Config) when is_list(Config) ->
+    ?t:comment("This comment should not occur in the HTML log because a later"
+	       " comment shall overwrite it"),
+    ?t:comment("This comment is printed with the comment/1 function."
+	       " It should occur in the HTML log").
+
+
+
+timetrap(suite) -> [];
+timetrap(doc) -> ["Test that timetrap works."];
+timetrap(Config) when is_list(Config) ->
+    TrapAfter = 3000,
+    Dog=?t:timetrap(TrapAfter),
+    process_flag(trap_exit, true),
+    TimeOut = TrapAfter * test_server:timetrap_scale_factor() + 1000,
+    receive
+	{'EXIT', Dog, {timetrap_timeout, _, _}} ->
+	    ok;
+	{'EXIT', _OtherPid, {timetrap_timeout, _, _}} ->
+	    ?t:fail("EXIT signal from wrong process")
+    after
+	TimeOut ->
+	    ?t:fail("Timetrap is not working.")
+    end,
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+
+timetrap_cancel(suite) -> [];
+timetrap_cancel(doc) -> ["Test that timetrap_cancel works."];
+timetrap_cancel(Config) when is_list(Config) ->
+    Dog=?t:timetrap(1000),
+    receive
+    after
+	500 ->
+	    ok
+    end,
+    ?t:timetrap_cancel(Dog),
+    receive
+    after 1000 ->
+	    ok
+    end,
+    ok.
+
+multiply_timetrap(suite) -> [];
+multiply_timetrap(doc) -> ["Test multiply timetrap"];
+multiply_timetrap(Config) when is_list(Config) ->
+    %% This simulates the call to test_server_ctrl:multiply_timetraps/1:
+    put(test_server_multiply_timetraps,{2,true}),
+
+    Dog = ?t:timetrap(500),
+    timer:sleep(800),
+    ?t:timetrap_cancel(Dog),
+
+    %% Reset
+    put(test_server_multiply_timetraps,1),
+    ok.
+
+
+init_per_s(suite) -> [];
+init_per_s(doc) -> ["Test that a Config that is altered in ",
+		     "init_per_suite gets through to the testcases."];
+init_per_s(Config) ->
+    %% Check that the config var sent from init_per_suite
+    %% really exists.
+    {value, {init_per_suite_var, ok}} = 
+	lists:keysearch(init_per_suite_var,1,Config),
+
+    %% Check that the other variables still exist.
+    {value,{data_dir,_Dd}}=lists:keysearch(data_dir,1,Config),
+    {value,{priv_dir,_Dp}}=lists:keysearch(priv_dir,1,Config),
+    ok.
+
+init_per_tc(suite) -> [];
+init_per_tc(doc) -> ["Test that a Config that is altered in ",
+		     "init_per_testcase gets through to the ",
+		     "actual testcase."];
+init_per_tc(Config) ->
+    %% Check that the config var sent from init_per_testcase
+    %% really exists.
+    {value, {strange_var, 1}} = lists:keysearch(strange_var,1,Config),
+
+    %% Check that the other variables still exist.
+    {value,{data_dir,_Dd}}=lists:keysearch(data_dir,1,Config),
+    {value,{priv_dir,_Dp}}=lists:keysearch(priv_dir,1,Config),
+    ok.
+
+end_per_tc(suite) -> [];
+end_per_tc(doc) -> ["Test that end_per_testcase/2 is called even if"
+		    " test case fails"];
+end_per_tc(Config) when is_list(Config) ->
+    ?t:fail("This case should fail! Check that \"CLEANUP\" is"
+	    " printed in the minor log file.").
+
+
+timeconv(suite) -> [];
+timeconv(doc) -> ["Test that the time unit conversion functions ",
+		  "works."];
+timeconv(Config) when is_list(Config) ->
+    Val=2,
+    Secs=Val*1000,
+    Mins=Secs*60,
+    Hrs=Mins*60,
+    Secs=?t:seconds(2),
+    Mins=?t:minutes(2),
+    Hrs=?t:hours(2),
+    ok.
+
+
+msgs(suite) -> [];
+msgs(doc) -> ["Tests the messages_get function."];
+msgs(Config) when is_list(Config) ->
+    self() ! {hej, du},
+    self() ! {lite, "data"},
+    self() ! en_atom,
+    [{hej, du}, {lite, "data"}, en_atom] = ?t:messages_get(),
+    ok.
+
+capture(suite) -> [];
+capture(doc) -> ["Test that the capture functions work properly."];
+capture(Config) when is_list(Config) ->
+    String1="abcedfghjiklmnopqrstuvwxyz",
+    String2="0123456789",
+    ?t:capture_start(),
+    io:format(String1),
+    [String1]=?t:capture_get(),
+    io:format(String2),
+    [String2]=?t:capture_get(),
+    ?t:capture_stop(),
+    []=?t:capture_get(),
+    io:format(String2),
+    []=?t:capture_get(),
+    ok.
+
+timecall(suite) -> [];
+timecall(doc) -> ["Tests that timed calls work."];
+timecall(Config) when is_list(Config) ->
+    {_Time1, liten_apa_e_oxo_farlig} = ?t:timecall(?MODULE, dummy_function, []),
+    {Time2, jag_ar_en_gorilla} = ?t:timecall(?MODULE, dummy_function, [gorilla]),
+    DTime=round(Time2),
+    if
+	DTime<1 ->
+	    ?t:fail("Timecall reported a too low time.");
+	DTime==1 ->
+	    ok;
+	DTime>1 ->
+	    ?t:fail("Timecall reported a too high time.")
+    end,
+    ok.
+
+dummy_function() ->
+    liten_apa_e_oxo_farlig.
+dummy_function(gorilla) ->
+    receive after 1000 -> ok end,
+    jag_ar_en_gorilla.
+
+
+do_times(suite) -> [do_times_mfa, do_times_fun];
+do_times(doc) -> ["Test the do_times function."].
+
+do_times_mfa(suite) -> [];
+do_times_mfa(doc) -> ["Test the do_times function with M,F,A given."];
+do_times_mfa(Config) when is_list(Config) ->
+    ?t:do_times(100, ?MODULE, doer, [self()]),
+    100=length(?t:messages_get()),
+    ok.
+
+do_times_fun(suite) -> [];
+do_times_fun(doc) -> ["Test the do_times function with fun given."];
+do_times_fun(Config) when is_list(Config) ->
+    Self = self(),
+    ?t:do_times(100, fun() -> doer(Self) end),
+    100=length(?t:messages_get()),
+    ok.
+
+doer(From) ->
+    From ! a,
+    ok.
+
+skip_cases(doc) -> ["Test all possible ways to skip a test case."];
+skip_cases(suite) -> [skip_case1, skip_case2, skip_case3, skip_case4,
+		      skip_case5, skip_case6, skip_case7, skip_case8,
+		      skip_case9].
+
+skip_case1(suite) -> [];
+skip_case1(doc) -> ["Test that you can return {skipped, Reason},"
+		    " and that Reason is in the comment field in the HTML log"];
+skip_case1(Config) when is_list(Config) ->
+    %% If this comment shows, the case failed!!
+    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
+    %% The Reason in {skipped, Reason} should overwrite a 'comment'
+    {skipped, "This case should be noted as `Skipped'"}.
+
+skip_case2(suite) -> [];
+skip_case2(doc) -> ["Test that you can return {skipped, Reason},"
+		    " and that Reason is in the comment field in the HTML log"];
+skip_case2(Config) when is_list(Config) ->
+    %% If this comment shows, the case failed!!
+    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
+    %% The Reason in {skipped, Reason} should overwrite a 'comment'
+    exit({skipped, "This case should be noted as `Skipped'"}).    
+
+skip_case3(suite) -> [];
+skip_case3(doc) -> ["Test that you can return {skip, Reason},"
+		    " and that Reason is in the comment field in the HTML log"];
+skip_case3(Config) when is_list(Config) ->
+    %% If this comment shows, the case failed!!
+    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
+    %% The Reason in {skip, Reason} should overwrite a 'comment'
+    {skip, "This case should be noted as `Skipped'"}.
+
+skip_case4(suite) -> [];
+skip_case4(doc) -> ["Test that you can return {skip, Reason},"
+		    " and that Reason is in the comment field in the HTML log"];
+skip_case4(Config) when is_list(Config) ->
+    %% If this comment shows, the case failed!!
+    ?t:comment("ERROR: This case should have been noted as `Skipped'"),
+    %% The Reason in {skip, Reason} should overwrite a 'comment'
+    exit({skip, "This case should be noted as `Skipped'"}).    
+
+skip_case5(suite) -> {skipped, "This case should be noted as `Skipped'"};
+skip_case5(doc) -> ["Test that you can return {skipped, Reason}"
+		    " from the specification clause"].
+
+skip_case6(suite) -> {skip, "This case should be noted as `Skipped'"};
+skip_case6(doc) -> ["Test that you can return {skip, Reason}"
+		    " from the specification clause"].
+
+skip_case7(suite) -> [];
+skip_case7(doc) -> ["Test that skip works from a test specification file"];
+skip_case7(Config) when is_list(Config) ->
+    %% This case shall be skipped by adding 
+    %% {skip, {test_server_SUITE, skip_case7, Reason}}. 
+    %% to the test specification file.
+    ?t:fail("This case should have been Skipped by the .spec file").
+
+skip_case8(suite) -> [];
+skip_case8(doc) -> ["Test that {skipped, Reason} works from"
+		    " init_per_testcase/2"];
+skip_case8(Config) when is_list(Config) ->
+    %% This case shall be skipped by adding a specific clause to 
+    %% returning {skipped, Reason} from init_per_testcase/2 for this case. 
+    ?t:fail("This case should have been Skipped by init_per_testcase/2").
+
+skip_case9(suite) -> [];
+skip_case9(doc) -> ["Test that {skip, Reason} works from a init_per_testcase/2"];
+skip_case9(Config) when is_list(Config) ->
+    %% This case shall be skipped by adding a specific clause to 
+    %% returning {skip, Reason} from init_per_testcase/2 for this case. 
+    ?t:fail("This case should have been Skipped by init_per_testcase/2").
+
+undefined_functions(suite) -> [];
+undefined_functions(doc) -> ["Check for calls to undefined functions in"
+			     " test_server."
+			     "Skip if cover is running"];
+undefined_functions(Config) when is_list(Config) ->
+    case whereis(cover_server) of
+	Pid when is_pid(Pid) -> 
+	    {skip,"Cover is running"};
+	undefined -> 
+	    undefined_functions()
+    end.
+
+undefined_functions() ->
+    TestServerDir = filename:dirname(code:which(test_server)),
+    Res = xref:d(TestServerDir),
+    
+    {value,{unused,Unused}} = lists:keysearch(unused, 1, Res),
+    case Unused of
+	[] -> ok;
+	_ ->
+	    lists:foreach(fun (MFA) ->
+				  io:format("~s unused", [format_mfa(MFA)])
+			  end, Unused)
+    end,
+    
+    {value,{undefined,Undef0}} = lists:keysearch(undefined, 1, Res),
+    Undef = [U || U <- Undef0, not unresolved(U)],
+    case Undef of
+	[] -> ok;
+	_ ->
+	    lists:foreach(fun ({MFA1,MFA2}) ->
+				  io:format("~s calls undefined ~s",
+					    [format_mfa(MFA1),format_mfa(MFA2)])
+			  end, Undef),
+	    ?t:fail({length(Undef),undefined_functions_in_otp})
+    end,
+    ok.
+
+unresolved({_,{_,'$F_EXPR',_}}) -> true;
+unresolved(_) -> false.
+
+format_mfa({M,F,A}) ->
+    lists:flatten(io_lib:format("~s:~s/~p", [M,F,A])).
+
+conf_init(doc) -> ["Test successful conf case: Change Config parameter"];
+conf_init(Config) when is_list(Config) ->
+    [{conf_init_var,1389}|Config].
+
+check_new_conf(suite) -> [];
+check_new_conf(doc) -> ["Check that Config parameter changed by"
+			" conf_init is used"];
+check_new_conf(Config) when is_list(Config) ->
+    1389 = ?config(conf_init_var,Config),
+    ok.
+
+conf_cleanup(doc) -> ["Test successful conf case: Restore Config parameter"];
+conf_cleanup(Config) when is_list(Config) ->
+    lists:keydelete(conf_init_var,1,Config).
+
+check_old_conf(suite) -> [];
+check_old_conf(doc) -> ["Test that the restored Config is used after a"
+			" conf cleanup"];
+check_old_conf(Config) when is_list(Config) ->
+    undefined = ?config(conf_init_var,Config),
+    ok.
+
+conf_init_fail(doc) -> ["Test that config members are skipped if"
+			" conf init function fails."];
+conf_init_fail(Config) when is_list(Config) -> 
+    ?t:fail("This case should fail! Check that conf_member_skip and"
+	    " conf_cleanup_skip are skipped.").
+
+
+
+start_stop_node(suite) -> [];
+start_stop_node(doc) -> ["Test start and stop of slave and peer nodes"];
+start_stop_node(Config) when is_list(Config) ->
+    {ok,Node2} = ?t:start_node(node2,peer,[]),
+    {error, _} = ?t:start_node(node2,peer,[{fail_on_error,false}]),
+    true = lists:member(Node2,nodes()),
+
+    {ok,Node3} = ?t:start_node(node3,slave,[]),
+    {error, _} = ?t:start_node(node3,slave,[]),
+    true = lists:member(Node3,nodes()),
+
+    {ok,Node4} = ?t:start_node(node4,peer,[{wait,false}]),
+    case lists:member(Node4,nodes()) of
+	true -> 
+	    ?t:comment("WARNING: Node started with {wait,false}"
+			     " is up faster than expected...");
+	false ->
+	    wait_for_node(Node4,0),
+	    true = lists:member(Node4,nodes())
+    end,
+
+    true = ?t:stop_node(Node2),
+    false = lists:member(Node2,nodes()),
+
+    true = ?t:stop_node(Node3),
+    false = lists:member(Node3,nodes()),
+    
+    true = ?t:stop_node(Node4),
+    false = lists:member(Node4,nodes()),
+    timer:sleep(2000),
+    false = ?t:stop_node(Node4),
+
+    ok.
+
+
+wait_for_node(Node,Acc) ->
+    case net_adm:ping(Node) of
+	pang -> 
+	    timer:sleep(100),
+	    wait_for_node(Node,Acc+100);
+	pong ->
+	    Acc
+    end.
+
+cleanup_nodes_init(doc) -> ["Test that nodes are terminated when test case"
+			    " is finished unless {cleanup,false} is given."];
+cleanup_nodes_init(Config) when is_list(Config) ->
+    {ok,DieSlave} = ?t:start_node(die_slave, slave, []),
+    {ok,SurviveSlave} = ?t:start_node(survive_slave, slave, [{cleanup,false}]),
+    {ok,DiePeer} = ?t:start_node(die_peer, peer, []),
+    {ok,SurvivePeer} = ?t:start_node(survive_peer, peer, [{cleanup,false}]),
+    [{die_slave,DieSlave},
+     {survive_slave,SurviveSlave},
+     {die_peer,DiePeer},
+     {survive_peer,SurvivePeer} | Config].
+
+
+
+check_survive_nodes(suite) -> [];
+check_survive_nodes(doc) -> ["Test that nodes with {cleanup,false} survived"];
+check_survive_nodes(Config) when is_list(Config) ->
+    timer:sleep(1000),
+    false = lists:member(?config(die_slave,Config),nodes()),
+    true = lists:member(?config(survive_slave,Config),nodes()),
+    false = lists:member(?config(die_peer,Config),nodes()),
+    true = lists:member(?config(survive_peer,Config),nodes()),
+    ok.
+
+
+cleanup_nodes_fin(doc) -> ["Test that nodes started with {cleanup,false}"
+			   " can be stopped"];
+cleanup_nodes_fin(Config) when is_list(Config) ->
+    Slave = ?config(survive_slave,Config),
+    Peer = ?config(survive_peer,Config),
+    
+    true = ?t:stop_node(Slave),
+    false = lists:member(Slave,nodes()),
+    true = ?t:stop_node(Peer),
+    false = lists:member(Peer,nodes()),
+    
+    C1 = lists:keydelete(die_slave,1,Config),
+    C2 = lists:keydelete(survive_slave,1,C1),
+    C3 = lists:keydelete(die_peer,1,C2),
+    lists:keydelete(survive_peer,1,C3).
+
+commercial(Config) when is_list(Config) ->
+    case ?t:is_commercial() of
+	false -> {comment,"Open-source build"};
+	true -> {comment,"Commercial build"}
+    end.
+
+	    
diff --git a/lib/test_server/test/test_server_SUITE_data/dummy_file b/lib/test_server/test/test_server_SUITE_data/test_server_SUITE_data/dummy_file
index 65c88fbd75..65c88fbd75 100644
--- a/lib/test_server/test/test_server_SUITE_data/dummy_file
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_SUITE_data/dummy_file
diff --git a/lib/test_server/test/test_server_conf01_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_conf01_SUITE.erl
index a6d7dfe851..a6d7dfe851 100644
--- a/lib/test_server/test/test_server_conf01_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_conf01_SUITE.erl
diff --git a/lib/test_server/test/test_server_conf02_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_conf02_SUITE.erl
index deba4660c6..deba4660c6 100644
--- a/lib/test_server/test/test_server_conf02_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_conf02_SUITE.erl
diff --git a/lib/test_server/test/test_server_parallel01_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_parallel01_SUITE.erl
index 0e7f329f89..0e7f329f89 100644
--- a/lib/test_server/test/test_server_parallel01_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_parallel01_SUITE.erl
diff --git a/lib/test_server/test/test_server_shuffle01_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_shuffle01_SUITE.erl
index 7ad269501d..7ad269501d 100644
--- a/lib/test_server/test/test_server_shuffle01_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_shuffle01_SUITE.erl
diff --git a/lib/test_server/test/test_server_skip_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_skip_SUITE.erl
index 4037e1cc0e..4037e1cc0e 100644
--- a/lib/test_server/test/test_server_skip_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_skip_SUITE.erl
diff --git a/lib/test_server/test/test_server_line_SUITE.erl b/lib/test_server/test/test_server_line_SUITE.erl
index 02897f164f..aa14862e5a 100644
--- a/lib/test_server/test/test_server_line_SUITE.erl
+++ b/lib/test_server/test/test_server_line_SUITE.erl
@@ -23,20 +23,29 @@
 -module(test_server_line_SUITE).
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0,suite/0]).
+-export([init_per_suite/1,end_per_suite/1,
+	 init_per_testcase/2, end_per_testcase/2]).
 -export([parse_transform/1, lines/1]).
 
-all(doc) -> ["Test of parse transform for collection line numbers"];
-all(suite) -> [parse_transform,lines].
+suite() -> 
+    [{ct_hooks,[ts_install_cth]},
+     {doc,["Test of parse transform for collection line numbers"]}].
 
+all() -> [parse_transform,lines].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
 
 init_per_testcase(_Case, Config) ->
     ?line test_server_line:clear(),
     Dog = ?t:timetrap(?t:minutes(2)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     ?line test_server_line:clear(),
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
diff --git a/lib/test_server/test/test_server_test_lib.erl b/lib/test_server/test/test_server_test_lib.erl
new file mode 100644
index 0000000000..66ff06e0ce
--- /dev/null
+++ b/lib/test_server/test/test_server_test_lib.erl
@@ -0,0 +1,191 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2010. 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(test_server_test_lib).
+-export([parse_suite/1]).
+-export([init/2, pre_init_per_testcase/3, post_end_per_testcase/4]).
+
+-include("test_server_test_lib.hrl").
+
+%% The CTH hooks all tests
+init(_Id, _Opts) ->
+    [].
+
+pre_init_per_testcase(_TC,Config,State) ->
+    case os:type() of
+	{win32, _} ->
+	    %% Extend timeout for windows as starting node
+	    %% can take a long time there
+	    test_server:timetrap( 120000 * test_server:timetrap_scale_factor());
+	_ ->
+	    ok
+    end,
+    {start_slave(Config, 50),State}.
+
+start_slave(Config,_Level) ->
+    [_,Host] = string:tokens(atom_to_list(node()), "@"),
+    
+    ct:log("Trying to start ~s~n", 
+	   ["test_server_tester@"++Host]),
+    case slave:start(Host, test_server_tester, []) of
+	{error,Reason} ->
+	    test_server:fail(Reason);
+	{ok,Node} ->
+	    ct:log("Node ~p started~n", [Node]),
+	    IsCover = test_server:is_cover(),
+	    if IsCover ->
+		cover:start(Node);
+	    true->
+		ok
+	    end,
+	    DataDir = proplists:get_value(data_dir, Config),
+	    PrivDir = proplists:get_value(priv_dir, Config),
+
+	    %% PrivDir as well as directory of Test Server suites
+	    %% have to be in code path on Test Server node.
+	    [_ | Parts] = lists:reverse(filename:split(DataDir)),
+	    TSDir = filename:join(lists:reverse(Parts)),
+	    AddPathDirs = case proplists:get_value(path_dirs, Config) of
+			      undefined -> [];
+			      Ds -> Ds
+			  end,
+	    PathDirs = [PrivDir,TSDir | AddPathDirs],
+	    [true = rpc:call(Node, code, add_patha, [D]) || D <- PathDirs],
+	    io:format("Dirs added to code path (on ~w):~n",
+		      [Node]),
+	    [io:format("~s~n", [D]) || D <- PathDirs],
+
+	    true = rpc:call(Node, os, putenv, 
+			    ["TEST_SERVER_FRAMEWORK", "undefined"]),
+
+	    ok = rpc:call(Node, file, set_cwd, [PrivDir]),
+	    [{node,Node} | Config]     
+    end.
+
+post_end_per_testcase(_TC, Config, Return, State) ->
+    Node = proplists:get_value(node, Config),
+    cover:stop(Node),
+    slave:stop(Node),
+
+    {Return, State}.
+
+%% Parse an .suite log file
+parse_suite(FileName) ->
+    
+    case file:open(FileName, [read, raw, read_ahead]) of
+	{ok, Fd} ->
+	    Data = parse_suite(Fd, #suite{ }),
+	    file:close(Fd),
+	    {ok, Data};
+	_ ->
+	    error
+    end.
+
+fline(Fd) ->
+    case prim_file:read_line(Fd) of
+	eof -> eof;
+	{ok, Line} -> Line
+    end.
+
+parse_suite(Fd, S) ->
+    _Started                  = fline(Fd),
+    _Starting                 = fline(Fd),
+    "=cases"        ++ NCases = fline(Fd),
+    "=user"         ++ _User  = fline(Fd),
+    "=host"         ++ Host   = fline(Fd),
+    "=hosts"        ++ _Hosts = fline(Fd),
+    "=emulator_vsn" ++ Evsn   = fline(Fd),
+    "=emulator"     ++ Emu    = fline(Fd),
+    "=otp_release"  ++ OtpRel = fline(Fd),
+    "=started"      ++ Start  = fline(Fd),
+    NewS = parse_cases(Fd, S#suite{
+			     n_cases_expected = list_to_int(clean(NCases)),
+			     host             = list_to_binary(clean(Host)),
+			     emulator_vsn     = list_to_binary(clean(Evsn)),
+			     emulator         = list_to_binary(clean(Emu)),
+			     otp_release      = list_to_binary(clean(OtpRel)),
+			     started          = list_to_binary(clean(Start))
+			    }),
+    "=failed"       ++ Failed  = fline(Fd),
+    "=successful"   ++ Succ    = fline(Fd),
+    "=user_skipped" ++ UsrSkip = fline(Fd),
+    "=auto_skipped" ++ AutSkip  = fline(Fd),
+    NewS#suite{ n_cases_failed = list_to_int(clean(Failed)),
+		n_cases_succ   = list_to_int(clean(Succ)),
+		n_cases_user_skip   = list_to_int(clean(UsrSkip)),
+		n_cases_auto_skip   = list_to_int(clean(AutSkip)) }.
+    
+
+parse_cases(Fd, #suite{ n_cases = N, 
+			cases = Cases } = S) ->
+    case parse_case(Fd) of
+	finished -> S#suite{ log_ok = true };
+	{eof, Tc} -> 
+	    S#suite{ n_cases = N + 1,
+		     cases = [Tc#tc{ result = crashed }|Cases]};
+	{ok, Case} ->
+	    parse_cases(Fd, S#suite{ n_cases = N + 1, 
+				     cases = [Case|Cases]})
+    end.
+
+parse_case(Fd) -> parse_case(Fd, #tc{}).
+parse_case(Fd, Tc) -> parse_case(fline(Fd), Fd, Tc).
+
+parse_case(eof, _, Tc) -> {eof, Tc};
+parse_case("=case" ++ Case, Fd, Tc) ->
+    Name = list_to_binary(clean(Case)),
+    parse_case(fline(Fd), Fd, Tc#tc{ name = Name });
+parse_case("=logfile" ++ File, Fd, Tc) ->
+    Log = list_to_binary(clean(File)),
+    parse_case(fline(Fd), Fd, Tc#tc{ logfile = Log });
+parse_case("=elapsed" ++ Elapsed, Fd, Tc) ->
+    {ok, [Time], _} = io_lib:fread("~f", clean(Elapsed)),
+    parse_case(fline(Fd), Fd, Tc#tc{ elapsed = Time });
+parse_case("=result" ++ Result, _, Tc) ->
+    case clean(Result) of
+	"ok" ++ _ ->
+	    {ok, Tc#tc{ result = ok } };
+	"failed" ++ _ ->
+	    {ok, Tc#tc{ result = failed } };
+	"skipped" ++ _ ->
+	    {ok, Tc#tc{ result = skip } }
+    end;
+parse_case("=finished" ++ _ , _Fd, #tc{ name = undefined }) ->
+    finished;
+parse_case(_, Fd, Tc) ->
+    parse_case(fline(Fd), Fd, Tc).
+
+skip([]) -> [];
+skip([$ |Ts]) -> skip(Ts);
+skip(Ts) -> Ts.
+
+%rmnl(L) -> L.
+rmnl([]) -> [];
+rmnl([$\n | Ts]) -> rmnl(Ts);
+rmnl([T|Ts]) -> [T | rmnl(Ts)].
+
+clean(L) -> 
+    rmnl(skip(L)).
+
+list_to_int(L) ->
+    try
+	list_to_integer(L)
+    catch
+	_:_ ->
+	    0
+    end.
diff --git a/lib/test_server/test/test_server_test_lib.hrl b/lib/test_server/test/test_server_test_lib.hrl
new file mode 100644
index 0000000000..27b7be9618
--- /dev/null
+++ b/lib/test_server/test/test_server_test_lib.hrl
@@ -0,0 +1,23 @@
+-record(tc, {
+	  name,
+	  result,
+	  elapsed,
+	  logfile
+	 }).
+
+-record(suite, {
+	  application,
+	  n_cases = 0,
+	  n_cases_failed = 0,
+	  n_cases_expected = 0,
+	  n_cases_succ,
+	  n_cases_user_skip,
+	  n_cases_auto_skip,
+	  cases = [],
+	  host,
+	  emulator_vsn,
+	  emulator,
+	  otp_release,
+	  started,
+	  log_ok = false
+	 }).
diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk
index 3c6efeffde..4e293b76a7 100644
--- a/lib/test_server/vsn.mk
+++ b/lib/test_server/vsn.mk
@@ -1,2 +1,2 @@
-TEST_SERVER_VSN = 3.3.7
+TEST_SERVER_VSN = 3.4.2
 
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
index e6b76e2238..65a7f5f424 100644
--- a/lib/tools/c_src/Makefile.in
+++ b/lib/tools/c_src/Makefile.in
@@ -128,12 +128,13 @@ EMEM_ERTS_LIB=erts_r$(TYPEMARKER)
 
 endif
 
+EMEM_ETHR_LIBS=$(subst -l$(ETHR_LIB_NAME),-l$(ETHR_LIB_NAME)$(TYPEMARKER),$(subst -lerts_internal_r,-lerts_internal_r$(TYPEMARKER),$(ETHR_LIBS)))
+
 EMEM_LIBS =	$(LIBS) \
 		-L$(ERL_TOP)/erts/lib/$(TARGET) \
 		-L$(ERL_TOP)/erts/lib/internal/$(TARGET) \
 		-l$(EMEM_ERTS_LIB) \
-		-l$(ETHR_LIB_NAME)$(TYPEMARKER) \
-		$(ETHR_X_LIBS)
+		$(EMEM_ETHR_LIBS)
 
 EMEM_OBJS = $(addprefix $(EMEM_OBJ_DIR)/,$(notdir $(EMEM_SRCS:.c=.o)))
 
diff --git a/lib/tools/c_src/erl_memory.c b/lib/tools/c_src/erl_memory.c
index a0e139f059..872d55e789 100644
--- a/lib/tools/c_src/erl_memory.c
+++ b/lib/tools/c_src/erl_memory.c
@@ -1,22 +1,22 @@
-/* ``The contents of this file are subject to the Erlang Public License,
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2003-2010. 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 via the world wide web at http://www.erlang.org/.
- * 
+ * 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.
- * 
- * 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$
+ *
+ * %CopyrightEnd%
  */
 
-
 /*
  * Description:	
  *
@@ -281,17 +281,13 @@ mutex_destroy(ethr_mutex *mtx)
 static INLINE void
 mutex_lock(ethr_mutex *mtx)
 {
-    int res = ethr_mutex_lock(mtx);
-    if (res)
-	error_msg(res, "Mutex lock");
+    ethr_mutex_lock(mtx);
 }
 
 static INLINE void
 mutex_unlock(ethr_mutex *mtx)
 {
-    int res = ethr_mutex_unlock(mtx);
-    if (res)
-	error_msg(res, "Mutex unlock");
+    ethr_mutex_unlock(mtx);
 }
 
 static INLINE void
@@ -314,16 +310,14 @@ static INLINE void
 cond_wait(ethr_cond *cnd, ethr_mutex *mtx)
 {
     int res = ethr_cond_wait(cnd, mtx);
-    if (res)
+    if (res != 0 && res != EINTR)
 	error_msg(res, "Cond wait");
 }
 
 static INLINE void
 cond_signal(ethr_cond *cnd)
 {
-    int res = ethr_cond_signal(cnd);
-    if (res)
-	error_msg(res, "Cond signal");
+    ethr_cond_signal(cnd);
 }
 
 
@@ -2774,7 +2768,7 @@ main(int argc, char *argv[])
 	exit(1);
     }
 
-    if (ethr_init(NULL) != 0) {
+    if (ethr_init(NULL) != 0 || ethr_late_init(NULL) != 0) {
 	fprintf(stderr, "emem: failed to initialize thread package\n");
 	exit(1);
     }
diff --git a/lib/tools/doc/src/cover.xml b/lib/tools/doc/src/cover.xml
index 323bd0dda8..0a3302bda5 100644
--- a/lib/tools/doc/src/cover.xml
+++ b/lib/tools/doc/src/cover.xml
@@ -270,6 +270,8 @@
           defaults to <c>function</c>.</p>
         <p>If <c>Module</c> is not Cover compiled, the function returns
           <c>{error,{not_cover_compiled,Module}}</c>.</p>
+	<p>HINT: It is possible to issue multiple analyse_to_file commands at
+	  the same time. </p>
       </desc>
     </func>
     <func>
@@ -307,6 +309,33 @@
           <c>.beam</c> file, or in <c>../src</c> relative to that
           directory. If no source code is found, 
           <c>,{error,no_source_code_found}</c> is returned.</p>
+	<p>HINT: It is possible to issue multiple analyse_to_file commands at
+	  the same time. </p> 
+      </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>
+      <fsummary>Asynchronous call to analyse_to_file.</fsummary>
+      <type>
+        <v>Module = atom()</v>
+        <v>OutFile = string()</v>
+        <v>Options = [Option]</v>
+        <v>Option = html</v>
+        <v>Error = {not_cover_compiled,Module} | {file,File,Reason} | no_source_code_found | not_main_node</v>
+        <v>&nbsp;File = string()</v>
+        <v>&nbsp;Reason = term()</v>
+      </type>
+      <desc>
+	<p>This function works exactly the same way as 
+	<seealso marker="#analyse_to_file-1">analyse_to_file</seealso> except
+	that it is asynchronous instead of synchronous. The spawned process
+	will link with the caller when created. If an <c>Error</c> occurs
+	while doing the cover analysis the process will crash with the same
+	error reason as <seealso marker="#analyse_to_file-1">analyse_to_file</seealso> 
+	would return.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/tools/doc/src/cover_chapter.xml b/lib/tools/doc/src/cover_chapter.xml
index b4f7919183..92a790c34e 100644
--- a/lib/tools/doc/src/cover_chapter.xml
+++ b/lib/tools/doc/src/cover_chapter.xml
@@ -403,6 +403,13 @@ ok
         database contains information about each executable line in each
         Cover compiled module, performance decreases proportionally to
         the size and number of the Cover compiled modules.</p>
+      <p>To improve performance when analysing cover results it is possible
+	to do multiple calls to <seealso marker="cover#analyse-1">analyse</seealso>
+	and <seealso marker="cover#analyse_to_file-1">analyse_to_file</seealso>
+	at once. You can also use the 
+	<seealso marker="cover#async_analyse_to_file-1">async_analyse_to_file</seealso> 
+	convenience function.
+      </p>
     </section>
 
     <section>
diff --git a/lib/tools/doc/src/eprof.xml b/lib/tools/doc/src/eprof.xml
index ae1033f2d0..6d68c90768 100644
--- a/lib/tools/doc/src/eprof.xml
+++ b/lib/tools/doc/src/eprof.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>eprof</title>
@@ -35,8 +35,7 @@
       used. The profiling is done using the Erlang trace BIFs. Tracing of
       local function calls for a specified set of processes is enabled when
       profiling is begun, and disabled when profiling is stopped.</p>
-    <p>When using Eprof, expect a significant slowdown in program execution,
-      in most cases at least 100 percent.</p>
+    <p>When using Eprof expect a slowdown in program execution.</p>
   </description>
   <funcs>
     <func>
@@ -47,15 +46,19 @@
         <v>Reason = {already_started,Pid}</v>
       </type>
       <desc>
-        <p>Starts the Eprof server which owns the Eprof internal database.</p>
+        <p>Starts the Eprof server which holds the internal state of the collected data.</p>
       </desc>
     </func>
     <func>
-      <name>start_profiling(Rootset) -> profiling | error</name>
-      <name>profile(Rootset) -> profiling | error</name>
+      <name>start_profiling(Rootset) -> profiling | {error, Reason}</name>
+      <name>start_profiling(Rootset,Pattern) -> profiling | {error, Reason}</name>
       <fsummary>Start profiling.</fsummary>
       <type>
         <v>Rootset = [atom() | pid()]</v>
+	<v>Pattern = {Module, Function, Arity}</v>
+	<v>Module = Function = atom()</v>
+	<v>Arity = integer()</v>
+        <v>Reason = term()</v>
       </type>
       <desc>
         <p>Starts profiling for the processes in <c>Rootset</c> (and any new
@@ -64,6 +67,9 @@
         <p><c>Rootset</c> is a list of pids and registered names.</p>
         <p>The function returns <c>profiling</c> if tracing could be enabled
           for all processes in <c>Rootset</c>, or <c>error</c> otherwise.</p>
+        <p>A pattern can be selected to narrow the profiling. For instance ca a specific
+	    module be selected and only the code processes executes in that module will be
+	    profiled.</p>
       </desc>
     </func>
     <func>
@@ -75,14 +81,20 @@
       </desc>
     </func>
     <func>
-      <name>profile(Rootset,Fun) -> {ok,Value} | {error,Reason} | error</name>
-      <name>profile(Rootset,Module,Function,Args) -> {ok,Value} | {error,Reason} | error</name>
+      <name>profile(Fun) -> 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>
       <fsummary>Start profiling.</fsummary>
       <type>
         <v>Rootset = [atom() | pid()]</v>
         <v>Fun = fun() -> term()</v>
+	<v>Pattern = {Module, Function, Arity}</v>
         <v>Module = Function = atom()</v>
         <v>Args = [term()]</v>
+	<v>Arity = integer()</v>
         <v>Value = Reason = term()</v>
       </type>
       <desc>
@@ -96,7 +108,7 @@
           <c>Rootset</c>, the function returns <c>{ok,Value}</c> when
           <c>Fun()</c>/<c>apply</c> returns with the value <c>Value</c>, or
           <c>{error,Reason}</c> if <c>Fun()</c>/<c>apply</c> fails with
-          exit reason <c>Reason</c>. Otherwise it returns <c>error</c>
+	  exit reason <c>Reason</c>. Otherwise it returns <c>{error, Reason}</c>
           immediately.</p>
         <p>The programmer must ensure that the function given as argument
           is truly synchronous and that no work continues after
@@ -104,7 +116,15 @@
       </desc>
     </func>
     <func>
-      <name>analyse()</name>
+      <name>analyze() -> ok</name>
+      <name>analyze(Type) -> ok</name>
+      <name>analyze(Type,Options) -> ok</name>
+      <type>
+        <v>Type = procs | total</v>
+	<v>Options = [{filter, Filter} | {sort, Sort}</v>
+	<v>Filter = [{calls, integer()} | {time, float()}]</v>
+	<v>Sort = time | calls | mfa</v>
+      </type>
       <fsummary>Display profiling results per process.</fsummary>
       <desc>
         <p>Call this function when profiling has been stopped to display
@@ -113,17 +133,10 @@
           <item>how much time has been used by each process, and</item>
           <item>in which function calls this time has been spent.</item>
         </list>
-        <p>Time is shown as percentage of total time, not as absolute time.</p>
-      </desc>
-    </func>
-    <func>
-      <name>total_analyse()</name>
-      <fsummary>Display profiling results per function call.</fsummary>
-      <desc>
-        <p>Call this function when profiling has been stopped to display
+	<p>Call <c>analyze</c> with <c>total</c> option when profiling has been stopped to display
           the results per function call, that is in which function calls
           the time has been spent.</p>
-        <p>Time is shown as percentage of total time, not as absolute time.</p>
+        <p>Time is shown as percentage of total time and as absolute time.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/tools/doc/src/erlang_mode.xml b/lib/tools/doc/src/erlang_mode.xml
index 912c442153..c21afc1f9b 100644
--- a/lib/tools/doc/src/erlang_mode.xml
+++ b/lib/tools/doc/src/erlang_mode.xml
@@ -173,7 +173,7 @@
         
         sum(L)          -> sum(L, 0).
         sum([H|T], Sum) -> sum(T, Sum + H);
-        sum([], Sum)    -> Sum."</code>
+        sum([], Sum)    -> Sum.</code>
       </item>
     </list>
   </section>
diff --git a/lib/tools/doc/src/erlang_mode_chapter.xml b/lib/tools/doc/src/erlang_mode_chapter.xml
index b22c6b1809..8aabd6ae74 100644
--- a/lib/tools/doc/src/erlang_mode_chapter.xml
+++ b/lib/tools/doc/src/erlang_mode_chapter.xml
@@ -45,7 +45,7 @@
 
   <section>
     <title>Elisp</title>
-    <p>There are two Elsip modules include in this tool package
+    <p>There are two Elisp modules included in this tool package
       for Emacs. There is erlang.el that defines the actual erlang mode
       and there is erlang-start.el that makes some nice initializations.</p>
   </section>
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index e7d1ae150c..5f9cecd6e4 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -30,6 +30,112 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 2.6.6.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>eprof: API sort mismatch has now been fixed. </p>
+          <p>
+	    Own Id: OTP-8853</p>
+        </item>
+        <item>
+          <p>
+	    eprof: fix division by zero in statistics</p>
+          <p>
+	    Own Id: OTP-8963</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tools 2.6.6.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    <c>cover</c> will now show ampersand characters in the
+	    source code correctly. (Thanks to Tom Moertel.)</p>
+          <p>
+	    Own Id: OTP-8776</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tools 2.6.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>A race condition affecting Cover has been removed.</p>
+          <p>
+	    Own Id: OTP-8469</p>
+        </item>
+        <item>
+          <p>
+	    Emacs improvements:</p>
+          <p>
+	    Fixed emacs-mode installation problems.</p>
+          <p>
+	    Fixed a couple of -spec and -type indentation and
+	    font-lock problems.</p>
+          <p>
+	    Fixed error messages on emacs-21.</p>
+          <p>
+	    Magnus Henoch fixed several issues.</p>
+          <p>
+	    Ralf Doering, Klas Johansson and Chris Bernard
+	    contributed various emacs-eunit improvements.</p>
+          <p>
+	    Klas Johansson and Dave Peticolas added emacs-flymake
+	    support.</p>
+          <p>
+	    Own Id: OTP-8530</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Xref has been updated to use the <c>re</c> module
+	    instead of the deprecated <c>regexp</c> module.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8472</p>
+        </item>
+        <item>
+	    <p>When given the option <c>{builtins,true}</c> Xref now
+	    adds calls to operators.</p>
+          <p>
+	    Own Id: OTP-8647</p>
+        </item>
+        <item>
+	    <p><c>eprof</c> has been reimplemented with support in
+	    the Erlang virtual machine and is now both faster (i.e.
+	    slows down the code being measured less) and scales much
+	    better. In measurements we saw speed-ups compared to the
+	    old eprof ranging from 6 times (for sequential code that
+	    only uses one scheduler/core) up to 84 times (for
+	    parallel code that uses 8 cores).</p>
+	    <p>Note: The API for the <c>eprof</c> has been cleaned up
+	    and extended. See the documentation.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-8706</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 2.6.5.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/emacs/erlang-eunit.el b/lib/tools/emacs/erlang-eunit.el
index 970afe2e9f..f2c0db67dd 100644
--- a/lib/tools/emacs/erlang-eunit.el
+++ b/lib/tools/emacs/erlang-eunit.el
@@ -23,8 +23,22 @@
 (eval-when-compile
   (require 'cl))
 
-(defvar erlang-eunit-separate-src-and-test-directories t
-  "*Whether or not to keep source and EUnit test files in separate directories")
+(defvar erlang-eunit-src-candidate-dirs '("../src" ".")
+  "*Name of directories which to search for source files matching
+an EUnit test file.  The first directory in the list will be used,
+if there is no match.")
+
+(defvar erlang-eunit-test-candidate-dirs '("../test" ".")
+  "*Name of directories which to search for EUnit test files matching
+a source file.  The first directory in the list will be used,
+if there is no match.")
+
+(defvar erlang-eunit-autosave nil
+  "*Set to non-nil to automtically save unsaved buffers before running tests.
+This is useful, reducing the save-compile-load-test cycle to one keychord.")
+
+(defvar erlang-eunit-recent-info '((mode . nil) (module . nil) (test . nil) (cover . nil))
+  "Info about the most recent running of an EUnit test representation.")
 
 ;;;
 ;;; Switch between src/EUnit test buffers
@@ -44,7 +58,6 @@ buffer and vice versa"
   "Open the EUnit test file which corresponds to a src file"
   (find-file-other-window (erlang-eunit-test-filename src-file-path)))
 
-
 ;;;
 ;;; Open the src file which corresponds to the an EUnit test file
 ;;;
@@ -55,37 +68,55 @@ buffer and vice versa"
 ;;; Return the name and path of the EUnit test file
 ;;, (input may be either the source filename itself or the EUnit test filename)
 (defun erlang-eunit-test-filename (file-path)
-  (erlang-eunit-rewrite-filename file-path "test" "_tests"))
+  (if (erlang-eunit-test-file-p file-path)
+      file-path
+    (erlang-eunit-rewrite-filename file-path erlang-eunit-test-candidate-dirs)))
 
 ;;; Return the name and path of the source file
 ;;, (input may be either the source filename itself or the EUnit test filename)
 (defun erlang-eunit-src-filename (file-path)
-  (erlang-eunit-rewrite-filename file-path "src" ""))
+  (if (erlang-eunit-src-file-p file-path)
+      file-path
+    (erlang-eunit-rewrite-filename file-path erlang-eunit-src-candidate-dirs)))
 
 ;;; Rewrite a filename from the src or test filename to the other
-(defun erlang-eunit-rewrite-filename (orig-file-path dest-dirname dest-suffix)
-  (let* ((root-dir-name    (erlang-eunit-file-root-dir-name orig-file-path))
-	 (src-module-name  (erlang-eunit-source-module-name orig-file-path))
-	 (dest-base-name   (concat src-module-name dest-suffix ".erl"))
-	 (dest-dir-name-1  (file-name-directory orig-file-path))
-	 (dest-dir-name-2  (filename-join root-dir-name dest-dirname))
-	 (dest-file-name-1 (filename-join dest-dir-name-1 dest-base-name))
-	 (dest-file-name-2 (filename-join dest-dir-name-2 dest-base-name)))
-    ;; This function tries to be a bit intelligent: 
-    ;; * if there already is a test (or source) file in the same
-    ;;   directory as a source (or test) file, it'll be picked
-    ;; * if there already is a test (or source) file in a separate
-    ;;   test (or src) directory, it'll be picked
-    ;; * otherwise it'll resort to whatever alternative (same or
-    ;;   separate directories) that the user has chosen
-    (cond ((file-readable-p dest-file-name-1) 
-	   dest-file-name-1)
-	  ((file-readable-p dest-file-name-2) 
-	   dest-file-name-2)
-	  (erlang-eunit-separate-src-and-test-directories
-	   dest-file-name-2)
-	  (t
-	   dest-file-name-1))))
+(defun erlang-eunit-rewrite-filename (orig-file-path candidate-dirs)
+  (or (erlang-eunit-locate-buddy orig-file-path candidate-dirs)
+      (erlang-eunit-buddy-file-path orig-file-path (car candidate-dirs))))
+
+;;; Search for a file's buddy file (a source file's EUnit test file,
+;;; or an EUnit test file's source file) in a list of candidate
+;;; directories.
+(defun erlang-eunit-locate-buddy (orig-file-path candidate-dirs)
+  (when candidate-dirs
+    (let ((buddy-file-path (erlang-eunit-buddy-file-path
+                            orig-file-path
+                            (car candidate-dirs))))
+      (if (file-readable-p buddy-file-path)
+          buddy-file-path
+        (erlang-eunit-locate-buddy orig-file-path (cdr candidate-dirs))))))
+
+(defun erlang-eunit-buddy-file-path (orig-file-path buddy-dir-name)
+  (let* ((orig-dir-name   (file-name-directory orig-file-path))
+         (buddy-dir-name  (file-truename
+                           (filename-join orig-dir-name buddy-dir-name)))
+         (buddy-base-name (erlang-eunit-buddy-basename orig-file-path)))
+    (filename-join buddy-dir-name buddy-base-name)))
+
+;;; Return the basename of the buddy file:
+;;;     /tmp/foo/src/x.erl        --> x_tests.erl
+;;;     /tmp/foo/test/x_tests.erl --> x.erl
+(defun erlang-eunit-buddy-basename (file-path)
+  (let ((src-module-name (erlang-eunit-source-module-name file-path)))
+    (cond
+     ((erlang-eunit-src-file-p file-path)
+      (concat src-module-name "_tests.erl"))
+     ((erlang-eunit-test-file-p file-path)
+      (concat src-module-name ".erl")))))
+
+;;; Checks whether a file is a source file or not
+(defun erlang-eunit-src-file-p (file-path)
+  (not (erlang-eunit-test-file-p file-path)))
 
 ;;; Checks whether a file is a EUnit test file or not
 (defun erlang-eunit-test-file-p (file-path)
@@ -96,11 +127,10 @@ buffer and vice versa"
 ;;;     /tmp/foo/test/x_tests.erl --> x
 (defun erlang-eunit-source-module-name (file-path)
   (interactive)
-  (let* ((file-name (file-name-nondirectory file-path))
-	 (base-name (file-name-sans-extension file-name)))
-    (if (string-match "^\\(.+\\)_tests$" base-name)
-	(substring base-name (match-beginning 1) (match-end 1))
-      base-name)))
+  (let ((module-name (erlang-eunit-module-name file-path)))
+    (if (string-match "^\\(.+\\)_tests$" module-name)
+        (substring module-name (match-beginning 1) (match-end 1))
+      module-name)))
 
 ;;; Return the module name of the file
 ;;;     /tmp/foo/src/x.erl        --> x
@@ -109,18 +139,6 @@ buffer and vice versa"
   (interactive)
   (file-name-sans-extension (file-name-nondirectory file-path)))
 
-;;; Return the directory name which is common to both src and test
-;;;     /tmp/foo/src/x.erl        --> /tmp/foo
-;;;     /tmp/foo/test/x_tests.erl --> /tmp/foo
-(defun erlang-eunit-file-root-dir-name (file-path)
-  (erlang-eunit-dir-parent-dirname (file-name-directory file-path)))
-
-;;; Return the parent directory name of a directory
-;;;     /tmp/foo/ --> /tmp
-;;;     /tmp/foo  --> /tmp
-(defun erlang-eunit-dir-parent-dirname (dir-name)
-  (file-name-directory (directory-file-name dir-name)))
-
 ;;; Older emacsen don't have string-match-p.
 (defun erlang-eunit-string-match-p (regexp string &optional start)
   (if (fboundp 'string-match-p) ;; appeared in emacs 23
@@ -135,12 +153,28 @@ buffer and vice versa"
       (concat dir file)
     (concat dir "/" file)))
 
+;;; Get info about the most recent running of EUnit
+(defun erlang-eunit-recent (key)
+  (cdr (assq key erlang-eunit-recent-info)))
+
+;;; Record info about the most recent running of EUnit
+;;; Known modes are 'module-mode and 'test-mode
+(defun erlang-eunit-record-recent (mode module test)
+  (setcdr (assq 'mode erlang-eunit-recent-info) mode)
+  (setcdr (assq 'module erlang-eunit-recent-info) module)
+  (setcdr (assq 'test erlang-eunit-recent-info) test))
+
+;;; Record whether the most recent running of EUnit included cover
+;;; compilation
+(defun erlang-eunit-record-recent-compile (under-cover)
+  (setcdr (assq 'cover erlang-eunit-recent-info) under-cover))
+
 ;;; Determine options for EUnit.
 (defun erlang-eunit-opts ()
   (if current-prefix-arg ", [verbose]" ""))
 
 ;;; Determine current test function
-(defun erlang-eunit-test-name ()
+(defun erlang-eunit-current-test ()
   (save-excursion
     (erlang-end-of-function 1)
     (erlang-beginning-of-function 1)
@@ -152,45 +186,125 @@ buffer and vice versa"
 (defun erlang-eunit-test-generator-p (test-name)
   (if (erlang-eunit-string-match-p "^\\(.+\\)_test_$" test-name) t nil))
 
-;;; Run the current EUnit test
-(defun erlang-eunit-run-current-test ()
-  (let* ((module-name (erlang-add-quotes-if-needed
-                       (erlang-eunit-module-name buffer-file-name)))
-         (test-name (erlang-eunit-test-name))
-         (command
-          (cond ((erlang-eunit-simple-test-p test-name)
-                 (format "eunit:test({%s, %s}%s)."
-                         module-name test-name (erlang-eunit-opts)))
-                ((erlang-eunit-test-generator-p test-name)
-                 (format "eunit:test({generator, %s, %s}%s)."
-                         module-name test-name (erlang-eunit-opts)))
-                (t (format "%% WARNING: '%s' is not a test function" test-name)))))
+;;; Run one EUnit test
+(defun erlang-eunit-run-test (module-name test-name)
+  (let ((command
+         (cond ((erlang-eunit-simple-test-p test-name)
+                (format "eunit:test({%s, %s}%s)."
+                        module-name test-name (erlang-eunit-opts)))
+               ((erlang-eunit-test-generator-p test-name)
+                (format "eunit:test({generator, %s, %s}%s)."
+                        module-name test-name (erlang-eunit-opts)))
+               (t (format "%% WARNING: '%s' is not a test function" test-name)))))
+    (erlang-eunit-record-recent 'test-mode module-name test-name)
     (erlang-eunit-inferior-erlang-send-command command)))
 
 ;;; Run EUnit tests for the current module
-(defun erlang-eunit-run-module-tests ()
-  (let* ((module-name (erlang-add-quotes-if-needed
-                       (erlang-eunit-source-module-name buffer-file-name)))
-         (command (format "eunit:test(%s%s)." module-name (erlang-eunit-opts))))
+(defun erlang-eunit-run-module-tests (module-name)
+  (let ((command (format "eunit:test(%s%s)." module-name (erlang-eunit-opts))))
+    (erlang-eunit-record-recent 'module-mode module-name nil)
     (erlang-eunit-inferior-erlang-send-command command)))
 
+(defun erlang-eunit-compile-and-run-recent ()
+  "Compile the source and test files and repeat the most recent EUnit test run.
+
+With prefix arg, compiles for debug and runs tests with the verbose flag set."
+  (interactive)
+  (case (erlang-eunit-recent 'mode)
+    ('test-mode
+     (erlang-eunit-compile-and-test
+      'erlang-eunit-run-test (list (erlang-eunit-recent 'module)
+                                   (erlang-eunit-recent 'test))))
+    ('module-mode
+     (erlang-eunit-compile-and-test
+      'erlang-eunit-run-module-tests (list (erlang-eunit-recent 'module))
+      (erlang-eunit-recent 'cover)))
+    (t (error "EUnit has not yet been run.  Please run a test first."))))
+
+(defun erlang-eunit-cover-compile ()
+  "Cover compile current module."
+  (interactive)
+  (let* ((erlang-compile-extra-opts
+          (append (list 'debug_info) erlang-compile-extra-opts))
+         (module-name
+          (erlang-add-quotes-if-needed
+           (erlang-eunit-module-name buffer-file-name)))
+         (compile-command
+          (format "cover:compile_beam(%s)." module-name)))
+    (erlang-compile)
+    (if (erlang-eunit-last-compilation-successful-p)
+        (erlang-eunit-inferior-erlang-send-command compile-command))))
+
+(defun erlang-eunit-analyze-coverage ()
+  "Analyze the data collected by cover tool for the module in the
+current buffer.
+
+Assumes that the module has been cover compiled prior to this
+call.  This function will do two things: print the number of
+covered and uncovered functions in the erlang shell and display a
+new buffer called *<module name> coverage* which shows the source
+code along with the coverage analysis results."
+  (interactive)
+  (let* ((module-name     (erlang-add-quotes-if-needed
+                           (erlang-eunit-module-name buffer-file-name)))
+         (tmp-filename    (make-temp-file "cover"))
+         (analyze-command (format "cover:analyze_to_file(%s, \"%s\"). "
+                                  module-name tmp-filename))
+         (buf-name        (format "*%s coverage*" module-name)))
+    (erlang-eunit-inferior-erlang-send-command analyze-command)
+    ;; The purpose of the following snippet is to get the result of the
+    ;; analysis from a file into a new buffer (or an old, if one with
+    ;; the specified name already exists).  Also we want the erlang-mode
+    ;; *and* view-mode to be enabled.
+    (save-excursion
+      (let ((buf (get-buffer-create (format "*%s coverage*" module-name))))
+        (set-buffer buf)
+        (setq buffer-read-only nil)
+        (insert-file-contents tmp-filename nil nil nil t)
+        (if (= (buffer-size) 0)
+            (kill-buffer buf)
+          ;; FIXME: this would be a good place to enable (emacs-mode)
+          ;;        to get some nice syntax highlighting in the
+          ;;        coverage report, but it doesn't play well with
+          ;;        flymake.  Leave it off for now.
+          (view-buffer buf))))
+    (delete-file tmp-filename)))
+
 (defun erlang-eunit-compile-and-run-current-test ()
   "Compile the source and test files and run the current EUnit test.
 
 With prefix arg, compiles for debug and runs tests with the verbose flag set."
   (interactive)
-  (erlang-eunit-compile-and-test 'erlang-eunit-run-current-test))
+  (let ((module-name (erlang-add-quotes-if-needed
+                      (erlang-eunit-module-name buffer-file-name)))
+        (test-name (erlang-eunit-current-test)))
+    (erlang-eunit-compile-and-test
+     'erlang-eunit-run-test (list module-name test-name))))
 
 (defun erlang-eunit-compile-and-run-module-tests ()
   "Compile the source and test files and run all EUnit tests in the module.
 
 With prefix arg, compiles for debug and runs tests with the verbose flag set."
   (interactive)
-  (erlang-eunit-compile-and-test 'erlang-eunit-run-module-tests))
+  (let ((module-name (erlang-add-quotes-if-needed
+                      (erlang-eunit-source-module-name buffer-file-name))))
+    (erlang-eunit-compile-and-test
+     'erlang-eunit-run-module-tests (list module-name))))
 
 ;;; Compile source and EUnit test file and finally run EUnit tests for
 ;;; the current module
-(defun erlang-eunit-compile-and-test (run-tests)
+(defun erlang-eunit-compile-and-test (test-fun test-args &optional under-cover)
+   "Compile the source and test files and run the EUnit test suite.
+
+If under-cover is set to t, the module under test is compile for
+code coverage analysis.  If under-cover is left out or not set,
+coverage analysis is disabled.  The result of the code coverage
+is both printed to the erlang shell (the number of covered vs
+uncovered functions in a module) and written to a buffer called
+*<module> coverage* (which shows the source code for the module
+and the number of times each line is covered).
+With prefix arg, compiles for debug and runs tests with the verbose flag set."
+  (erlang-eunit-record-recent-compile under-cover)
   (let ((src-filename  (erlang-eunit-src-filename  buffer-file-name))
 	(test-filename (erlang-eunit-test-filename buffer-file-name)))
 
@@ -198,7 +312,7 @@ With prefix arg, compiles for debug and runs tests with the verbose flag set."
     ;; below, is to ask the question about saving buffers only once,
     ;; instead of possibly several: one for each file to compile,
     ;; for instance for both x.erl and x_tests.erl.
-    (save-some-buffers)
+    (save-some-buffers erlang-eunit-autosave)
     (flet ((save-some-buffers (&optional any) nil))
 
       ;; Compilation of the source file is mandatory (the file must
@@ -206,23 +320,56 @@ With prefix arg, compiles for debug and runs tests with the verbose flag set."
       ;; test file on the other hand, is optional, since eunit tests may
       ;; be placed in the source file instead.  Any compilation error
       ;; will prevent the subsequent steps to be run (hence the `and')
-      (and (erlang-eunit-compile-file src-filename)
+      (and (erlang-eunit-compile-file src-filename under-cover)
 	   (if (file-readable-p test-filename)
 	       (erlang-eunit-compile-file test-filename)
 	     t)
-	   (funcall run-tests)))))
+           (apply test-fun test-args)
+           (if under-cover
+               (save-excursion
+                 (set-buffer (find-file-noselect src-filename))
+                 (erlang-eunit-analyze-coverage)))))))
 
-(defun erlang-eunit-compile-file (file-path)
+(defun erlang-eunit-compile-and-run-module-tests-under-cover ()
+  "Compile the source and test files and run the EUnit test suite and measure
+code coverage.
+
+With prefix arg, compiles for debug and runs tests with the verbose flag set."
+  (interactive)
+  (let ((module-name (erlang-add-quotes-if-needed
+                      (erlang-eunit-source-module-name buffer-file-name))))
+    (erlang-eunit-compile-and-test
+     'erlang-eunit-run-module-tests (list module-name) t)))
+
+(defun erlang-eunit-compile-file (file-path &optional under-cover)
   (if (file-readable-p file-path)
       (save-excursion
-	(set-buffer (find-file-noselect file-path))
-	(erlang-compile)
-	(erlang-eunit-last-compilation-successful-p))
+        (set-buffer (find-file-noselect file-path))
+        ;; In order to run a code coverage analysis on a
+        ;; module, we have two options:
+        ;;
+        ;; * either compile the module with cover:compile instead of the
+        ;;   regular compiler
+        ;;
+        ;; * or first compile the module with the regular compiler (but
+        ;;   *with* debug_info) and then compile it for coverage
+        ;;   analysis using cover:compile_beam.
+        ;;
+        ;; We could accomplish the first by changing the
+        ;; erlang-compile-erlang-function to cover:compile, but there's
+        ;; a risk that that's used for other purposes.  Therefore, a
+        ;; safer alternative (although with more steps) is to add
+        ;; debug_info to the list of compiler options and go for the
+        ;; second alternative.
+        (if under-cover
+            (erlang-eunit-cover-compile)
+          (erlang-compile))
+        (erlang-eunit-last-compilation-successful-p))
     (let ((msg (format "Could not read %s" file-path)))
-      (erlang-eunit-inferior-erlang-send-command 
+      (erlang-eunit-inferior-erlang-send-command
        (format "%% WARNING: %s" msg))
       (error msg))))
-  
+
 (defun erlang-eunit-last-compilation-successful-p ()
   (save-excursion
     (set-buffer inferior-erlang-buffer)
@@ -231,7 +378,7 @@ With prefix arg, compiles for debug and runs tests with the verbose flag set."
      (lambda (re) (let ((continue t)
 			(result   t))
 		    (while continue ; ignore warnings, stop at errors
-		      (if (re-search-forward re (point-max) t) 
+		      (if (re-search-forward re (point-max) t)
 			  (if (erlang-eunit-is-compilation-warning)
 			      t
 			    (setq result nil)
@@ -242,7 +389,7 @@ With prefix arg, compiles for debug and runs tests with the verbose flag set."
      (mapcar (lambda (e) (car e)) erlang-error-regexp-alist))))
 
 (defun erlang-eunit-is-compilation-warning ()
-  (erlang-eunit-string-match-p 
+  (erlang-eunit-string-match-p
    "[0-9]+: Warning:"
    (buffer-substring (line-beginning-position) (line-end-position))))
 
@@ -271,7 +418,11 @@ With prefix arg, compiles for debug and runs tests with the verbose flag set."
 (defconst erlang-eunit-key-bindings
   '(("\C-c\C-et" erlang-eunit-toggle-src-and-test-file-other-window)
     ("\C-c\C-ek" erlang-eunit-compile-and-run-module-tests)
-    ("\C-c\C-ej" erlang-eunit-compile-and-run-current-test)))
+    ("\C-c\C-ej" erlang-eunit-compile-and-run-current-test)
+    ("\C-c\C-el" erlang-eunit-compile-and-run-recent)
+    ("\C-c\C-ec" erlang-eunit-compile-and-run-module-tests-under-cover)
+    ("\C-c\C-ev" erlang-eunit-cover-compile)
+    ("\C-c\C-ea" erlang-eunit-analyze-coverage)))
 
 (defun erlang-eunit-add-key-bindings ()
   (dolist (binding erlang-eunit-key-bindings)
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 91acfdf2b6..ed825a298f 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -1481,7 +1481,23 @@ Other commands:
 				    erlang-font-lock-keywords-3 
 				    erlang-font-lock-keywords-4)
 	 nil nil ((?_ . "w")) erlang-beginning-of-clause
-	 (font-lock-mark-block-function . erlang-mark-clause))))
+	 (font-lock-mark-block-function . erlang-mark-clause)
+         (font-lock-syntactic-keywords
+          ;; A dollar sign right before the double quote that ends a
+          ;; string is not a character escape.
+          ;;
+          ;; And a "string" has with a double quote not escaped by a
+          ;; dollar sign, any number of non-backslash non-newline
+          ;; characters or escaped backslashes, a dollar sign
+          ;; (otherwise we wouldn't care) and a double quote.  This
+          ;; doesn't match multi-line strings, but this is probably
+          ;; the best we can get, since while font-locking we don't
+          ;; know whether matching started inside a string: limiting
+          ;; search to a single line keeps things sane.
+          . (("\\(?:^\\|[^$]\\)\"\\(?:[^\"\n]\\|\\\\\"\\)*\\(\\$\\)\"" 1 "w")
+             ;; And the dollar sign in $\" escapes two characters, not
+             ;; just one.
+             ("\\(\\$\\)\\\\\\\"" 1 "'"))))))
 
 
 
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 6501e05a6e..ada2db45be 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -35,23 +35,37 @@
 %% remote_process_loop/1.
 %%
 %% TABLES
-%% Each nodes has an ets table named 'cover_internal_data_table'
-%% (?COVER_TABLE).  This table contains the coverage data and is
-%% continously updated when cover compiled code is executed.
+%% 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.
+%% ?COVER_CLAUSE_TABLE contains information about which clauses in which modules
+%% cover is currently collecting statistics.
 %% 
-%% The main node owns a table named
-%% 'cover_collected_remote_data_table' (?COLLECTION_TABLE). This table
-%% contains 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_TABLE on the main
-%% node to the ?COLLECTION_TABLE.
+%% 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.
 %%
-
+%% PARELLALISM
+%% 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 backwardscompatability 
+%% reasons) so the user of cover will have to spawn several processes to to the
+%% calls ( or use async_analyse_to_file ). 
+%%
 
 %% External exports
 -export([start/0, start/1,
@@ -61,6 +75,9 @@
 	 analyse/1, analyse/2, analyse/3, analyze/1, analyze/2, analyze/3,
 	 analyse_to_file/1, analyse_to_file/2, analyse_to_file/3,
 	 analyze_to_file/1, analyze_to_file/2, analyze_to_file/3,
+	 async_analyse_to_file/1,async_analyse_to_file/2,
+	 async_analyse_to_file/3, async_analyze_to_file/1,
+	 async_analyze_to_file/2, async_analyze_to_file/3,
 	 export/1, export/2, import/1,
 	 modules/0, imported/0, imported_modules/0, which_nodes/0, is_compiled/1,
 	 reset/1, reset/0,
@@ -100,8 +117,10 @@
 	      }).
 
 -define(COVER_TABLE, 'cover_internal_data_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).
 
@@ -114,6 +133,8 @@
             true -> ?BLOCK(Expr)
         end).
 
+-define(SPAWN_DBG(Tag,Value),put(Tag,Value)).
+
 -include_lib("stdlib/include/ms_transform.hrl").
 
 %%%----------------------------------------------------------------------
@@ -127,7 +148,10 @@ start() ->
     case whereis(?SERVER) of
 	undefined ->
 	    Starter = self(),
-	    Pid = spawn(fun() -> init_main(Starter) end),
+	    Pid = spawn(fun() -> 
+				?SPAWN_DBG(start,[]),
+				init_main(Starter) 
+			end),
 	    Ref = erlang:monitor(process,Pid),
 	    Return = 
 		receive 
@@ -382,6 +406,30 @@ analyze_to_file(Module, OptOrOut) -> analyse_to_file(Module, OptOrOut).
 analyze_to_file(Module, OutFile, Options) -> 
     analyse_to_file(Module, OutFile, Options).
 
+async_analyse_to_file(Module) ->
+    do_spawn(?MODULE, analyse_to_file, [Module]).
+async_analyse_to_file(Module, OutFileOrOpts) ->
+    do_spawn(?MODULE, analyse_to_file, [Module, OutFileOrOpts]).
+async_analyse_to_file(Module, OutFile, Options) ->
+    do_spawn(?MODULE, analyse_to_file, [Module, OutFile, Options]).
+
+do_spawn(M,F,A) ->
+    spawn_link(fun() ->
+		  case apply(M,F,A) of
+		      {ok, _} ->
+			  ok;
+		      {error, Reason} ->
+			  exit(Reason)
+		  end
+	  end).
+
+async_analyze_to_file(Module) ->
+    async_analyse_to_file(Module).
+async_analyze_to_file(Module, OutFileOrOpts) ->
+    async_analyse_to_file(Module, OutFileOrOpts).
+async_analyze_to_file(Module, OutFile, Options) ->
+    async_analyse_to_file(Module, OutFile, Options).
+
 outfilename(Module,Opts) ->
     case lists:member(html,Opts) of
 	true ->
@@ -500,6 +548,8 @@ remote_call(Node,Request) ->
 	    Return
     end.
     
+remote_reply(Proc,Reply) when is_pid(Proc) ->
+    Proc ! {?SERVER,Reply};
 remote_reply(MainNode,Reply) ->
     {?SERVER,MainNode} ! {?SERVER,Reply}.
 
@@ -509,9 +559,15 @@ remote_reply(MainNode,Reply) ->
 
 init_main(Starter) ->
     register(?SERVER,self()),
-    ets:new(?COVER_TABLE, [set, public, named_table]),
+    %% Having write concurrancy here gives a 40% performance boost
+    %% when collect/1 is called. 
+    ets:new(?COVER_TABLE, [set, public, named_table
+			   ,{write_concurrency, true}
+			  ]),
+    ets:new(?COVER_CLAUSE_TABLE, [set, public, named_table]),
     ets:new(?BINARY_TABLE, [set, named_table]),
     ets:new(?COLLECTION_TABLE, [set, public, named_table]),
+    ets:new(?COLLECTION_CLAUSE_TABLE, [set, public, named_table]),
     process_flag(trap_exit,true),
     Starter ! {?SERVER,started},
     main_process_loop(#main_state{}).
@@ -593,40 +649,10 @@ main_process_loop(State) ->
 	    end;
 
 	{From, {export,OutFile,Module}} ->
-	    case file:open(OutFile,[write,binary,raw]) of
-		{ok,Fd} ->
-		    Reply = 
-			case Module of
-			    '_' ->
-				export_info(State#main_state.imported),
-				collect(State#main_state.nodes),
-				do_export_table(State#main_state.compiled,
-						State#main_state.imported,
-						Fd);
-			    _ ->
-				export_info(Module,State#main_state.imported),
-				case is_loaded(Module, State) of
-				    {loaded, File} ->
-					[{Module,Clauses}] = 
-					    ets:lookup(?COVER_TABLE,Module),
-					collect(Module, Clauses,
-						State#main_state.nodes),
-					do_export_table([{Module,File}],[],Fd);
-				    {imported, File, ImportFiles} ->
-					%% don't know if I should allow this - 
-					%% export a module which is only imported
-					Imported = [{Module,File,ImportFiles}],
-					do_export_table([],Imported,Fd);
-				    _NotLoaded ->
-					{error,{not_cover_compiled,Module}}
-				end
-			end,
-		    file:close(Fd),
-		    reply(From, Reply);
-		{error,Reason} ->
-		    reply(From, {error, {cant_open_file,OutFile,Reason}})
-	    
-	    end,
+	    spawn(fun() ->
+			  ?SPAWN_DBG(export,{OutFile, Module}),
+			  do_export(Module, OutFile, From, State)
+		  end),
 	    main_process_loop(State);
 	
 	{From, {import,File}} ->
@@ -692,107 +718,73 @@ main_process_loop(State) ->
             unregister(?SERVER),
 	    reply(From, ok);
 
-	{From, {Request, Module}} ->
-	    case is_loaded(Module, State) of
-		{loaded, File} ->
-		    {Reply,State1} = 
-			case Request of
-			    {analyse, Analysis, Level} ->
-				analyse_info(Module,State#main_state.imported),
-				[{Module,Clauses}] = 
-				    ets:lookup(?COVER_TABLE,Module),
-				collect(Module,Clauses,State#main_state.nodes),
-				R = do_analyse(Module, Analysis, Level, Clauses),
-				{R,State};
-			    
-			    {analyse_to_file, OutFile, Opts} ->
-				R = case find_source(File) of
-					{beam,_BeamFile} ->
-					    {error,no_source_code_found};
-					ErlFile ->
-					    Imported = State#main_state.imported,
-					    analyse_info(Module,Imported),
-					    [{Module,Clauses}] = 
-						ets:lookup(?COVER_TABLE,Module),
-					    collect(Module, Clauses,
-						    State#main_state.nodes),
-					    HTML = lists:member(html,Opts),
-					    do_analyse_to_file(Module,OutFile,
-							       ErlFile,HTML)
-				    end,
-				{R,State};
-			    
-			    is_compiled ->
-				{{file, File},State};
-			    
-			    reset ->
-				R = do_reset_main_node(Module,
-						       State#main_state.nodes),
-				Imported = 
-				    remove_imported(Module,
-						    State#main_state.imported),
-				{R,State#main_state{imported=Imported}}
-			end,
-		    reply(From, Reply),
-		    main_process_loop(State1);
-		
-		{imported,File,_ImportFiles} ->
-		    {Reply,State1} = 
-			case Request of
-			    {analyse, Analysis, Level} ->
-				analyse_info(Module,State#main_state.imported),
-				[{Module,Clauses}] = 
-				    ets:lookup(?COLLECTION_TABLE,Module),
-				R = do_analyse(Module, Analysis, Level, Clauses),
-				{R,State};
-			    
-			    {analyse_to_file, OutFile, Opts} ->
-				R = case find_source(File) of
-					{beam,_BeamFile} ->
-					    {error,no_source_code_found};
-					ErlFile ->
-					    Imported = State#main_state.imported,
-					    analyse_info(Module,Imported),
-					    HTML = lists:member(html,Opts),
-					    do_analyse_to_file(Module,OutFile,
-							   ErlFile,HTML)
-				    end,
-				{R,State};
-			    
-			    is_compiled ->
-				{false,State};
-			    
-			    reset ->
-				R = do_reset_collection_table(Module),
-				Imported = 
-				    remove_imported(Module,
-						    State#main_state.imported),
-				{R,State#main_state{imported=Imported}}
-			end,
-		    reply(From, Reply),
-		    main_process_loop(State1);		    
-		
-		NotLoaded ->
-		    Reply = 
-			case Request of
-			    is_compiled ->
-				false;
-			    _ ->
-				{error, {not_cover_compiled,Module}}
-			end,
-		    Compiled = 
-			case NotLoaded of
-			    unloaded ->
-				do_clear(Module),
-				remote_unload(State#main_state.nodes,[Module]),
-				update_compiled([Module],
-						State#main_state.compiled);
-			    false ->
-				State#main_state.compiled
+	{From, {{analyse, Analysis, Level}, Module}} ->
+	    S = try 
+		    Loaded = is_loaded(Module, State),
+		    spawn(fun() ->
+				  ?SPAWN_DBG(analyse,{Module,Analysis, Level}),
+				  do_parallel_analysis(
+				    Module, Analysis, Level, 
+				    Loaded, From, State)
+			  end),
+		    State
+		catch throw:Reason ->
+			reply(From,{error, {not_cover_compiled,Module}}),
+			not_loaded(Module, Reason, State)
+		end,
+	    main_process_loop(S);
+
+	{From, {{analyse_to_file, OutFile, Opts},Module}} ->
+	    S = try 
+		    Loaded = is_loaded(Module, State),
+		    spawn(fun() ->
+				  ?SPAWN_DBG(analyse_to_file,
+					     {Module,OutFile, Opts}),
+				  do_parallel_analysis_to_file(
+				    Module, OutFile, Opts, 
+				    Loaded, From, State)
+			  end),
+		    State
+		catch throw:Reason ->
+			reply(From,{error, {not_cover_compiled,Module}}),
+			not_loaded(Module, Reason, State)
+		end,
+	    main_process_loop(S);
+
+	{From, {is_compiled, Module}} ->
+	    S = try is_loaded(Module, State) of
+		    {loaded, File} ->
+			reply(From,{file, File}),
+			State;
+		    {imported,_File,_ImportFiles} ->
+			reply(From,false),
+			State
+		catch throw:Reason ->
+			reply(From,false),
+			not_loaded(Module, Reason, State)
+		end,
+	    main_process_loop(S);
+
+	{From, {reset, Module}} ->
+	    S = try 
+		    Loaded = is_loaded(Module,State),
+		    R = case Loaded of
+			    {loaded, _File} ->
+				do_reset_main_node(
+				  Module, State#main_state.nodes);
+			    {imported, _File, _} ->
+				do_reset_collection_table(Module)
 			end,
-		    reply(From, Reply),
-		    main_process_loop(State#main_state{compiled=Compiled})
-	    end;
+		    Imported = 
+			remove_imported(Module,
+					State#main_state.imported),
+		    reply(From, R),
+		    State#main_state{imported=Imported}
+		catch throw:Reason ->
+			reply(From,{error, {not_cover_compiled,Module}}),
+			not_loaded(Module, Reason, State)
+		end,
+	    main_process_loop(S);		    
 	
 	{'EXIT',Pid,_Reason} ->
 	    %% Exit is trapped on the main node only, so this will only happen 
@@ -807,17 +799,17 @@ main_process_loop(State) ->
 	    main_process_loop(State)
     end.
 
-
-
-
-
 %%%----------------------------------------------------------------------
 %%% cover_server on remote node
 %%%----------------------------------------------------------------------
 
 init_remote(Starter,MainNode) ->
     register(?SERVER,self()),
-    ets:new(?COVER_TABLE, [set, public, named_table]),
+    ets:new(?COVER_TABLE, [set, public, named_table
+			   %% write_concurrency here makes otp_8270 break :(
+			   %,{write_concurrency, true}
+			  ]),
+    ets:new(?COVER_CLAUSE_TABLE, [set, public, named_table]),
     Starter ! {self(),started},
     remote_process_loop(#remote_state{main_node=MainNode}).
 
@@ -843,29 +835,14 @@ remote_process_loop(State) ->
 	    remote_process_loop(State);
 
 	{remote,collect,Module,CollectorPid} ->
-	    MS = 
-		case Module of
-		    '_' -> ets:fun2ms(fun({M,C}) when is_atom(M) -> C end);
-		    _ -> ets:fun2ms(fun({M,C}) when M=:=Module -> C end)
-		end,
-	    AllClauses = lists:flatten(ets:select(?COVER_TABLE,MS)),
-	    
-	    %% Sending clause by clause in order to avoid large lists
-	    lists:foreach(
-	      fun({M,F,A,C,_L}) ->
-		      Pattern = 
-			  {#bump{module=M, function=F, arity=A, clause=C}, '_'},
-		      Bumps = ets:match_object(?COVER_TABLE, Pattern),
-		      %% Reset
-		      lists:foreach(fun({Bump,_N}) ->
-					    ets:insert(?COVER_TABLE, {Bump,0})
-				    end,
-				    Bumps),
-		      CollectorPid ! {chunk,Bumps}
-	      end,
-	      AllClauses),
-	    CollectorPid ! done,
-	    remote_reply(State#remote_state.main_node, ok),
+	    self() ! {remote,collect,Module,CollectorPid, ?SERVER};
+
+	{remote,collect,Module,CollectorPid,From} ->
+	   spawn(fun() ->
+			 ?SPAWN_DBG(remote_collect, 
+				    {Module, CollectorPid, From}),
+			 do_collect(Module, CollectorPid, From)
+		 end),
 	    remote_process_loop(State);
 
 	{remote,stop} ->
@@ -894,6 +871,33 @@ remote_process_loop(State) ->
 	    
     end.
 
+do_collect(Module, CollectorPid, From) ->
+    AllMods = 
+	case Module of
+	    '_' -> ets:tab2list(?COVER_CLAUSE_TABLE);
+	    _ -> ets:lookup(?COVER_CLAUSE_TABLE, Module)
+	end,
+
+    %% Sending clause by clause in order to avoid large lists
+    pmap(
+      fun({_Mod,Clauses}) ->
+	      lists:map(fun(Clause) ->
+				send_collected_data(Clause, CollectorPid)
+			end,Clauses)
+      end,AllMods),
+    CollectorPid ! done,
+    remote_reply(From, ok).
+
+send_collected_data({M,F,A,C,_L}, CollectorPid) ->
+    Pattern = 
+	{#bump{module=M, function=F, arity=A, clause=C}, '_'},
+    Bumps = ets:match_object(?COVER_TABLE, Pattern),
+    %% Reset
+    lists:foreach(fun({Bump,_N}) ->
+			  ets:insert(?COVER_TABLE, {Bump,0})
+		  end,
+		  Bumps),
+    CollectorPid ! {chunk,Bumps}.
 
 reload_originals([{Module,_File}|Compiled]) ->
     do_reload_original(Module),
@@ -932,6 +936,9 @@ 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);
@@ -957,7 +964,10 @@ remote_start(MainNode) ->
     case whereis(?SERVER) of
 	undefined ->
 	    Starter = self(),
-	    Pid = spawn(fun() -> init_remote(Starter,MainNode) end),
+	    Pid = spawn(fun() -> 
+				?SPAWN_DBG(remote_start,{MainNode}),
+				init_remote(Starter,MainNode) 
+			end),
 	    Ref = erlang:monitor(process,Pid),
 	    Return = 
 		receive 
@@ -972,14 +982,25 @@ remote_start(MainNode) ->
 	    {error,{already_started,Pid}}
     end.
 
-%% Load a set of cover compiled modules on remote nodes
-remote_load_compiled(Nodes,Compiled0) ->
-    Compiled = lists:map(fun get_data_for_remote_loading/1,Compiled0),
+%% Load a set of cover compiled modules on remote nodes,
+%% We do it ?MAX_MODS modules at a time so that we don't
+%% run out of memory on the cover_server node. 
+-define(MAX_MODS, 10).
+remote_load_compiled(Nodes,Compiled) ->
+    remote_load_compiled(Nodes, Compiled, [], 0).
+remote_load_compiled(_Nodes, [], [], _ModNum) ->
+    ok;
+remote_load_compiled(Nodes, Compiled, Acc, ModNum) 
+  when Compiled == []; ModNum == ?MAX_MODS ->
     lists:foreach(
       fun(Node) -> 
-	      remote_call(Node,{remote,load_compiled,Compiled})
+	      remote_call(Node,{remote,load_compiled,Acc})
       end,
-      Nodes).
+      Nodes),
+    remote_load_compiled(Nodes, Compiled, [], 0);
+remote_load_compiled(Nodes, [MF | Rest], Acc, ModNum) ->
+    remote_load_compiled(
+      Nodes, Rest, [get_data_for_remote_loading(MF) | Acc], ModNum + 1).
 
 %% Read all data needed for loading a cover compiled module on a remote node
 %% Binary is the beam code for the module and InitialTable is the initial
@@ -987,15 +1008,15 @@ remote_load_compiled(Nodes,Compiled0) ->
 get_data_for_remote_loading({Module,File}) ->
     [{Module,Binary}] = ets:lookup(?BINARY_TABLE,Module),
     %%! The InitialTable list will be long if the module is big - what to do??
-    InitialTable = ets:select(?COVER_TABLE,ms(Module)),
-    {Module,File,Binary,InitialTable}.
+    InitialBumps = ets:select(?COVER_TABLE,ms(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({Module,InitInfo})  -> 
-		       {Module,InitInfo};
-		  ({Key,_}) when is_record(Key,bump),Key#bump.module=:=Module -> 
+    ets:fun2ms(fun({Key,_}) when Key#bump.module=:=Module -> 
 		       {Key,0}
 	       end).
 
@@ -1017,27 +1038,30 @@ remote_reset(Module,Nodes) ->
 
 %% Collect data from remote nodes - used for analyse or stop(Node)
 remote_collect(Module,Nodes,Stop) ->
-    CollectorPid = spawn(fun() -> collector_proc(length(Nodes)) end),
-    lists:foreach(
-      fun(Node) -> 
-	      remote_call(Node,{remote,collect,Module,CollectorPid}),
-	      if Stop -> remote_call(Node,{remote,stop});
-		 true -> ok
-	      end
-      end,
-      Nodes).
+    pmap(fun(Node) -> 
+		 ?SPAWN_DBG(remote_collect, 
+			    {Module, Nodes, Stop}),
+		 do_collection(Node, Module, Stop)
+	 end,
+	 Nodes).
+
+do_collection(Node, Module, Stop) ->
+    CollectorPid = spawn(fun collector_proc/0),
+    remote_call(Node,{remote,collect,Module,CollectorPid, self()}),
+    if Stop -> remote_call(Node,{remote,stop});
+       true -> ok
+    end.
 
 %% Process which receives chunks of data from remote nodes - either when
 %% analysing or when stopping cover on the remote nodes.
-collector_proc(0) ->
-    ok;
-collector_proc(N) ->
+collector_proc() ->
+    ?SPAWN_DBG(collector_proc, []),
     receive 
 	{chunk,Chunk} ->
 	    insert_in_collection_table(Chunk),
-	    collector_proc(N);
+	    collector_proc();
 	done ->
-	    collector_proc(N-1)
+	    ok
     end.
 
 insert_in_collection_table([{Key,Val}|Chunk]) ->
@@ -1052,7 +1076,13 @@ insert_in_collection_table(Key,Val) ->
 	    ets:update_counter(?COLLECTION_TABLE,
 			       Key,Val);
 	false ->
-	    ets:insert(?COLLECTION_TABLE,{Key,Val})
+	    %% Make sure that there are no race conditions from ets:member
+	    case ets:insert_new(?COLLECTION_TABLE,{Key,Val}) of
+		false ->
+		    insert_in_collection_table(Key,Val);
+		_ ->
+		    ok
+	    end
     end.
 
 
@@ -1073,14 +1103,15 @@ analyse_info(Module,Imported) ->
 
 export_info(_Module,[]) ->
     ok;
-export_info(Module,Imported) ->
-    imported_info("Export",Module,Imported).
+export_info(_Module,_Imported) ->
+    %% Do not print that the export includes imported modules
+    ok.
 
 export_info([]) ->
     ok;
-export_info(Imported) ->
-    AllImportFiles = get_all_importfiles(Imported,[]),
-    io:format("Export includes data from imported files\n~p\n",[AllImportFiles]).
+export_info(_Imported) ->
+    %% Do not print that the export includes imported modules
+    ok.
 
 get_all_importfiles([{_M,_F,ImportFiles}|Imported],Acc) ->
     NewAcc = do_get_all_importfiles(ImportFiles,Acc),
@@ -1153,14 +1184,14 @@ is_loaded(Module, State) ->
 	{ok, File} ->
 	    case code:which(Module) of
 		?TAG -> {loaded, File};
-		_ -> unloaded
+		_ -> throw(unloaded)
 	    end;
 	false ->
 	    case get_file(Module,State#main_state.imported) of
 		{ok,File,ImportFiles} ->
 		    {imported, File, ImportFiles};
 		false ->
-		    false
+		    throw(not_loaded)
 	    end
     end.
 
@@ -1259,7 +1290,7 @@ do_compile_beam(Module,Beam) ->
 		    
 		    %% Store info about all function clauses in database
 		    InitInfo = reverse(Vars#vars.init_info),
-		    ets:insert(?COVER_TABLE, {Module, InitInfo}),
+		    ets:insert(?COVER_CLAUSE_TABLE, {Module, InitInfo}),
 		    
 		    %% Store binary code so it can be loaded on remote nodes
 		    ets:insert(?BINARY_TABLE, {Module, Binary}),
@@ -1793,9 +1824,8 @@ common_elems(L1, L2) ->
 %% Collect data for all modules
 collect(Nodes) ->
     %% local node
-    MS = ets:fun2ms(fun({M,C}) when is_atom(M) -> {M,C} end),
-    AllClauses = ets:select(?COVER_TABLE,MS),
-    move_modules(AllClauses),
+    AllClauses = ets:tab2list(?COVER_CLAUSE_TABLE),
+    pmap(fun move_modules/1,AllClauses),
     
     %% remote nodes
     remote_collect('_',Nodes,false).
@@ -1803,7 +1833,7 @@ collect(Nodes) ->
 %% Collect data for one module
 collect(Module,Clauses,Nodes) ->
     %% local node
-    move_modules([{Module,Clauses}]),
+    move_modules({Module,Clauses}),
     
     %% remote nodes
     remote_collect(Module,Nodes,false).
@@ -1811,12 +1841,9 @@ collect(Module,Clauses,Nodes) ->
 
 %% When analysing, the data from the local ?COVER_TABLE is moved to the
 %% ?COLLECTION_TABLE. Resetting data in ?COVER_TABLE
-move_modules([{Module,Clauses}|AllClauses]) ->
-    ets:insert(?COLLECTION_TABLE,{Module,Clauses}),
-    move_clauses(Clauses),
-    move_modules(AllClauses);
-move_modules([]) ->
-    ok.
+move_modules({Module,Clauses}) ->
+    ets:insert(?COLLECTION_CLAUSE_TABLE,{Module,Clauses}),
+    move_clauses(Clauses).
     
 move_clauses([{M,F,A,C,_L}|Clauses]) ->
     Pattern = {#bump{module=M, function=F, arity=A, clause=C}, '_'},
@@ -1855,6 +1882,22 @@ find_source(File0) ->
 	    end
     end.
 
+do_parallel_analysis(Module, Analysis, Level, Loaded, From, State) ->
+    analyse_info(Module,State#main_state.imported),
+    C = case Loaded of
+	    {loaded, _File} ->
+		[{Module,Clauses}] = 
+		    ets:lookup(?COVER_CLAUSE_TABLE,Module),
+		collect(Module,Clauses,State#main_state.nodes),
+		Clauses;
+	    _ ->
+		[{Module,Clauses}] = 
+		    ets:lookup(?COLLECTION_CLAUSE_TABLE,Module),
+		Clauses
+	end,
+    R = do_analyse(Module, Analysis, Level, C),
+    reply(From, R).
+
 %% do_analyse(Module, Analysis, Level, Clauses)-> {ok,Answer} | {error,Error}
 %%   Clauses = [{Module,Function,Arity,Clause,Lines}]
 do_analyse(Module, Analysis, line, _Clauses) ->
@@ -1931,6 +1974,28 @@ merge_functions([{_MFA,R}|Functions], MFun, Result) ->
 merge_functions([], _MFun, Result) ->
     Result.
 
+do_parallel_analysis_to_file(Module, OutFile, Opts, Loaded, From, State) ->
+    File = case Loaded of
+	       {loaded, File0} ->
+		   [{Module,Clauses}] = 
+		       ets:lookup(?COVER_CLAUSE_TABLE,Module),
+		   collect(Module, Clauses,
+			   State#main_state.nodes),
+		   File0;
+	       {imported, File0, _} ->
+		   File0
+	   end,
+    case find_source(File) of
+	{beam,_BeamFile} ->
+	    reply(From, {error,no_source_code_found});
+	ErlFile ->
+	    analyse_info(Module,State#main_state.imported),
+	    HTML = lists:member(html,Opts),
+	    R = do_analyse_to_file(Module,OutFile,
+				   ErlFile,HTML),
+	    reply(From, R)
+    end.
+
 %% do_analyse_to_file(Module,OutFile,ErlFile) -> {ok,OutFile} | {error,Error}
 %%   Module = atom()
 %%   OutFile = ErlFile = string()
@@ -2027,6 +2092,42 @@ fill2() ->       ".|  ".
 fill3() ->        "|  ".
 
 %%%--Export--------------------------------------------------------------
+do_export(Module, OutFile, From, State) ->
+    case file:open(OutFile,[write,binary,raw]) of
+	{ok,Fd} ->
+	    Reply = 
+		case Module of
+		    '_' ->
+			export_info(State#main_state.imported),
+			collect(State#main_state.nodes),
+			do_export_table(State#main_state.compiled,
+					State#main_state.imported,
+					Fd);
+		    _ ->
+			export_info(Module,State#main_state.imported),
+			try is_loaded(Module, State) of
+			    {loaded, File} ->
+				[{Module,Clauses}] = 
+				    ets:lookup(?COVER_CLAUSE_TABLE,Module),
+				collect(Module, Clauses,
+					State#main_state.nodes),
+				do_export_table([{Module,File}],[],Fd);
+			    {imported, File, ImportFiles} ->
+				%% don't know if I should allow this - 
+				%% export a module which is only imported
+				Imported = [{Module,File,ImportFiles}],
+				do_export_table([],Imported,Fd)
+			catch throw:_ ->
+				{error,{not_cover_compiled,Module}}
+			end
+		end,
+	    file:close(Fd),
+	    reply(From, Reply);
+	{error,Reason} ->
+	    reply(From, {error, {cant_open_file,OutFile,Reason}})
+
+    end.
+
 do_export_table(Compiled, Imported, Fd) ->
     ModList = merge(Imported,Compiled),
     write_module_data(ModList,Fd).
@@ -2043,7 +2144,7 @@ merge([],ModuleList) ->
 
 write_module_data([{Module,File}|ModList],Fd) ->
     write({file,Module,File},Fd),
-    [Clauses] = ets:lookup(?COLLECTION_TABLE,Module),
+    [Clauses] = ets:lookup(?COLLECTION_CLAUSE_TABLE,Module),
     write(Clauses,Fd),
     ModuleData = ets:match_object(?COLLECTION_TABLE,{#bump{module=Module},'_'}),
     do_write_module_data(ModuleData,Fd),
@@ -2093,7 +2194,7 @@ do_import_to_table(Fd,ImportFile,Imported,DontImport) ->
 	{Module,Clauses} ->
 	    case lists:member(Module,DontImport) of
 		false ->
-		    ets:insert(?COLLECTION_TABLE,{Module,Clauses});
+		    ets:insert(?COLLECTION_CLAUSE_TABLE,{Module,Clauses});
 		true ->
 			    ok
 	    end,
@@ -2127,14 +2228,14 @@ do_reset_main_node(Module,Nodes) ->
     remote_reset(Module,Nodes).
 
 do_reset_collection_table(Module) ->
-    ets:delete(?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 a per-clause basis to avoid building
 %% long lists in the case of very large modules
 do_reset(Module) ->
-    [{Module,Clauses}] = ets:lookup(?COVER_TABLE, Module),
+    [{Module,Clauses}] = ets:lookup(?COVER_CLAUSE_TABLE, Module),
     do_reset2(Clauses).
 
 do_reset2([{M,F,A,C,_L}|Clauses]) ->
@@ -2149,10 +2250,19 @@ do_reset2([]) ->
     ok.    
 
 do_clear(Module) ->
-    ets:match_delete(?COVER_TABLE, {Module,'_'}),
+    ets:match_delete(?COVER_CLAUSE_TABLE, {Module,'_'}),
     ets:match_delete(?COVER_TABLE, {#bump{module=Module},'_'}),
     ets:match_delete(?COLLECTION_TABLE, {#bump{module=Module},'_'}).
 
+not_loaded(Module, unloaded, State) ->
+    do_clear(Module),
+    remote_unload(State#main_state.nodes,[Module]),
+    Compiled = update_compiled([Module],
+			       State#main_state.compiled),
+    State#main_state{ compiled = Compiled };
+not_loaded(_Module,_Else, State) ->
+    State.
+
 
 
 %%%--Div-----------------------------------------------------------------
@@ -2174,7 +2284,36 @@ escape_lt_and_gt1([$<|T],Acc) ->
     escape_lt_and_gt1(T,[$;,$t,$l,$&|Acc]);
 escape_lt_and_gt1([$>|T],Acc) ->
     escape_lt_and_gt1(T,[$;,$t,$g,$&|Acc]);
+escape_lt_and_gt1([$&|T],Acc) ->
+    escape_lt_and_gt1(T,[$;,$p,$m,$a,$&|Acc]);
 escape_lt_and_gt1([],Acc) ->
     lists:reverse(Acc);
 escape_lt_and_gt1([H|T],Acc) ->
     escape_lt_and_gt1(T,[H|Acc]).
+
+pmap(Fun, List) ->
+    pmap(Fun, List, 20).
+pmap(Fun, List, Limit) ->
+    pmap(Fun, List, [], Limit, 0, []).
+pmap(Fun, [E | Rest], Pids, Limit, Cnt, Acc) when Cnt < Limit ->
+    Collector = self(),
+    Pid = spawn_link(fun() ->
+			     ?SPAWN_DBG(pmap,E),
+			     Collector ! {res,self(),Fun(E)} 
+		     end),
+    erlang:monitor(process, Pid),
+    pmap(Fun, Rest, Pids ++ [Pid], Limit, Cnt + 1, Acc);
+pmap(Fun, List, [Pid | Pids], Limit, Cnt, Acc) ->
+    receive
+	{'DOWN', _Ref, process, _, _} ->
+	    pmap(Fun, List, [Pid | Pids], Limit, Cnt - 1, Acc);
+	{res, Pid, Res} ->
+	    pmap(Fun, List, Pids, Limit, Cnt, [Res | Acc])
+    end;
+pmap(_Fun, [], [], _Limit, 0, Acc) ->
+    lists:reverse(Acc);
+pmap(Fun, [], [], Limit, Cnt, Acc) ->
+    receive
+	{'DOWN', _Ref, process, _, _} ->
+	    pmap(Fun, [], [], Limit, Cnt - 1, Acc)
+    end.
diff --git a/lib/tools/src/eprof.erl b/lib/tools/src/eprof.erl
index b4313d6888..87fdc1fa34 100644
--- a/lib/tools/src/eprof.erl
+++ b/lib/tools/src/eprof.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-2010. 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%
 %%
 %% Purpose: Profile a system in order to figure out where the 
@@ -23,456 +23,467 @@
 -module(eprof).
 -behaviour(gen_server).
 
--export([start/0, stop/0, dump/0, total_analyse/0,
-	 start_profiling/1, profile/2, profile/4, profile/1,
-	 stop_profiling/0, analyse/0, log/1]).
+-export([start/0,
+	 stop/0,
+	 dump/0,
+	 start_profiling/1, start_profiling/2,
+	 profile/1, profile/2, profile/3, profile/4, profile/5,
+	 stop_profiling/0,
+	 analyze/0, analyze/1, analyze/2,
+	 log/1]).
 
 %% Internal exports 
 -export([init/1,
-	 call/4,
 	 handle_call/3,
 	 handle_cast/2,
 	 handle_info/2,
 	 terminate/2,
 	 code_change/3]).
+-record(bpd, {
+	n   = 0,                 % number of total calls
+	us  = 0,                 % sum of uS for all calls
+	p   = gb_trees:empty(),  % tree of {Pid, {Mfa, {Count, Us}}}
+	mfa = []                 % list of {Mfa, {Count, Us}}
+    }).
+
+-record(state, {
+	profiling = false,
+	pattern   = {'_','_','_'},
+	rootset   = [],
+	fd    = undefined,
+	start_ts  = undefined,
+	reply     = undefined,
+	bpd       = #bpd{}
+    }).
+
+
+
+%% -------------------------------------------------------------------- %%
+%%
+%% API
+%%
+%% -------------------------------------------------------------------- %%
 
--include_lib("stdlib/include/qlc.hrl").
-
--import(lists, [flatten/1,reverse/1,keysort/2]).
-
-
--record(state, {table = notable,
-		proc = noproc,
-		profiling = false, 
-		pfunc = undefined,
-		pop = running,
-		ptime = 0,
-		overhead = 0,
-		rootset = []}).
-
-%%%%%%%%%%%%%%
-
-start() -> gen_server:start({local, eprof}, eprof, [], []).
-stop()  -> gen_server:call(eprof, stop, infinity).
+start() -> gen_server:start({local, ?MODULE}, ?MODULE, [], []).
+stop()  -> gen_server:call(?MODULE, stop, infinity).
 
+profile(Fun) when is_function(Fun) ->
+    profile([], Fun);
+profile(Rs) when is_list(Rs) ->
+    start_profiling(Rs).
 
 profile(Pids, Fun) ->
-    start(),
-    gen_server:call(eprof, {profile,Pids,erlang,apply,[Fun,[]]},infinity).
+    profile(Pids, Fun, {'_','_','_'}).
+
+profile(Pids, Fun, Pattern) ->
+    profile(Pids, erlang, apply, [Fun,[]], Pattern).
 
 profile(Pids, M, F, A) ->
+    profile(Pids, M, F, A, {'_','_','_'}).
+
+profile(Pids, M, F, A, Pattern) ->
     start(),
-    gen_server:call(eprof, {profile,Pids,M,F,A},infinity).
+    gen_server:call(?MODULE, {profile,Pids,Pattern,M,F,A},infinity).
 
 dump() -> 
-    gen_server:call(eprof, dump, infinity).
+    gen_server:call(?MODULE, dump, infinity).
 
-analyse() ->
-    gen_server:call(eprof, analyse, infinity).
+analyze() ->
+    analyze(procs).
 
-log(File) ->
-    gen_server:call(eprof, {logfile, File}, infinity).
+analyze(Type) when is_atom(Type) ->
+    analyze(Type, []);
+analyze(Opts) when is_list(Opts) ->
+    analyze(procs, Opts).
+analyze(Type, Opts) when is_list(Opts) ->
+    gen_server:call(?MODULE, {analyze, Type, Opts}, infinity).
 
-total_analyse() ->
-    gen_server:call(eprof, total_analyse, infinity).
+log(File) ->
+    gen_server:call(?MODULE, {logfile, File}, infinity).
 
 start_profiling(Rootset) ->
+    start_profiling(Rootset, {'_','_','_'}).
+start_profiling(Rootset, Pattern) ->
     start(),
-    gen_server:call(eprof, {profile, Rootset}, infinity).
+    gen_server:call(?MODULE, {profile, Rootset, Pattern}, infinity).
 
 stop_profiling() ->
-    gen_server:call(eprof, stop_profiling, infinity).
+    gen_server:call(?MODULE, stop_profiling, infinity).
 
-profile(Rs) ->
-    start_profiling(Rs).
 
-%%%%%%%%%%%%%%%%
+%% -------------------------------------------------------------------- %%
+%%
+%% init
+%%
+%% -------------------------------------------------------------------- %%
 
-init(_) ->
+init([]) ->
     process_flag(trap_exit, true),
-    process_flag(priority, max),
-    put(three_one, {3,1}),			%To avoid building garbage.
     {ok, #state{}}.
 
-subtr({X1,Y1,Z1}, {X1,Y1,Z2}) ->
-    Z1 - Z2;
-subtr({X1,Y1,Z1}, {X2,Y2,Z2}) ->
-    (((X1-X2) * 1000000) + Y1 - Y2) * 1000000 + Z1 - Z2.
+%% -------------------------------------------------------------------- %%
+%%
+%% handle_call
+%%
+%% -------------------------------------------------------------------- %%
 
-update_call_statistics(Tab, Key, Time) ->
-    try ets:update_counter(Tab, Key, Time) of
-	NewTime when is_integer(NewTime) ->
-	    ets:update_counter(Tab, Key, get(three_one))
-    catch
-	error:badarg ->
-	    ets:insert(Tab, {Key,Time,1})
-    end.
+%% analyze
 
-update_other_statistics(Tab, Key, Time) ->
-    try
-	ets:update_counter(Tab, Key, Time)
-    catch
-	error:badarg ->
-	    ets:insert(Tab, {Key,Time,0})
-    end.
+handle_call({analyze, _, _}, _, #state{ bpd = #bpd{ p = {0,nil}, us = 0, n = 0} = Bpd } = S) when is_record(Bpd, bpd) ->
+    {reply, nothing_to_analyze, S};
 
-do_messages({trace_ts,From,Op,Mfa,Time}, Tab, undefined,_PrevOp0,_PrevTime0) ->
-    PrevFunc = [From|Mfa],
-    receive
-	{trace_ts,_,_,_,_}=Ts -> do_messages(Ts, Tab, PrevFunc, Op, Time)
-    after 0 ->
-	    {PrevFunc,Op,Time}
-    end;
-do_messages({trace_ts,From,Op,Mfa,Time}, Tab, PrevFunc0, call, PrevTime0) ->
-    update_call_statistics(Tab, PrevFunc0, subtr(Time, PrevTime0)),
-    PrevFunc = case Op of
-		   exit -> undefined;
-		   out -> undefined;
-		   _ -> [From|Mfa]
-	       end,
-    receive
-	{trace_ts,_,_,_,_}=Ts -> do_messages(Ts, Tab, PrevFunc, Op, Time)
-    after 0 ->
-	    {PrevFunc,Op,Time}
-    end;
-do_messages({trace_ts,From,Op,Mfa,Time}, Tab, PrevFunc0, _PrevOp0, PrevTime0) ->
-    update_other_statistics(Tab, PrevFunc0, subtr(Time, PrevTime0)),
-    PrevFunc = case Op of
-		   exit -> undefined;
-		   out -> undefined;
-		   _ -> [From|Mfa]
-	       end,
-    receive
-	{trace_ts,_,_,_,_}=Ts -> do_messages(Ts, Tab, PrevFunc, Op, Time)
-    after 0 ->
-	    {PrevFunc,Op,Time}
-    end.
+handle_call({analyze, procs, Opts}, _, #state{ bpd = #bpd{ p = Ps, us = Tus} = Bpd, fd = Fd} = S) when is_record(Bpd, bpd) ->
+    lists:foreach(fun
+	    ({Pid, Mfas}) ->
+		{Pn, Pus} =  sum_bp_total_n_us(Mfas),
+		format(Fd, "~n****** Process ~w    -- ~s % of profiled time *** ~n", [Pid, s("~.2f", [100.0*divide(Pus,Tus)])]),
+		print_bp_mfa(Mfas, {Pn,Pus}, Fd, Opts),
+		ok
+	end, gb_trees:to_list(Ps)),
+    {reply, ok, S};
 
-%%%%%%%%%%%%%%%%%%
+handle_call({analyze, total, Opts}, _, #state{ bpd = #bpd{ mfa = Mfas, n = Tn, us = Tus} = Bpd, fd = Fd} = S) when is_record(Bpd, bpd) ->
+    print_bp_mfa(Mfas, {Tn, Tus}, Fd, Opts),
+    {reply, ok, S};
 
-handle_cast(_Req, S) -> {noreply, S}.
+handle_call({analyze, Type, _Opts}, _, S) ->
+    {reply, {error, {undefined, Type}}, S};
 
-terminate(_Reason,_S) ->
-    call_trace_for_all(false),
-    normal.
+%% profile
 
-%%%%%%%%%%%%%%%%%%
+handle_call({profile, _Rootset, _Pattern, _M,_F,_A}, _From, #state{ profiling = true } = S) ->
+    {reply, {error, already_profiling}, S};
 
-handle_call({logfile, F}, _FromTag, Status) ->
-    case file:open(F, [write]) of
-	{ok, Fd} ->
-	    case get(fd) of
-		undefined -> ok;
-		FdOld -> file:close(FdOld)
-	    end,
-	    put(fd, Fd),
-	    {reply, ok, Status};
-	{error, _} ->
-	    {reply, error, Status}
-    end;
+handle_call({profile, Rootset, Pattern, M,F,A}, From, #state{fd = Fd } = S) ->
 
-handle_call({profile, Rootset}, {From, _Tag}, S) ->
-    link(From),
-    maybe_delete(S#state.table),
-    io:format("eprof: Starting profiling ..... ~n",[]),
-    ptrac(S#state.rootset, false, all()),
-    flush_receive(),
-    Tab = ets:new(eprof, [set, public]),
-    case ptrac(Rootset, true, all()) of
-	false ->
-	    {reply, error,  #state{}};
+    set_pattern_trace(false, S#state.pattern),
+    set_process_trace(false, S#state.rootset),
+
+    Pid = setup_profiling(M,F,A),
+    case set_process_trace(true, [Pid|Rootset]) of
 	true ->
-	    uni_schedule(),
-	    call_trace_for_all(true),
-	    erase(replyto),
-	    {reply, profiling, #state{table = Tab,
-				      proc = From,
-				      profiling = true,
-				      rootset = Rootset}}
+	    set_pattern_trace(true, Pattern),
+	    T0 = now(),
+	    execute_profiling(Pid),
+	    {noreply, #state{
+		    profiling = true,
+		    rootset   = [Pid|Rootset],
+		    start_ts  = T0,
+		    reply     = From,
+		    fd        = Fd,
+		    pattern   = Pattern
+		}};
+	false ->
+	    exit(Pid, eprof_kill),
+	    {reply, error, #state{ fd = Fd}}
     end;
 
-handle_call(stop_profiling, _FromTag, S) when S#state.profiling ->
-    ptrac(S#state.rootset, false, all()),
-    call_trace_for_all(false),
-    multi_schedule(),
-    io:format("eprof: Stop profiling~n",[]),
-    ets:delete(S#state.table, nofunc),
-    {reply, profiling_stopped, S#state{profiling = false}};
+handle_call({profile, _Rootset, _Pattern}, _From, #state{ profiling = true } = S) ->
+    {reply, {error, already_profiling}, S};
 
-handle_call(stop_profiling, _FromTag, S) ->
-    {reply, profiling_already_stopped, S};
+handle_call({profile, Rootset, Pattern}, From, #state{ fd = Fd } = S) ->
+
+    set_pattern_trace(false, S#state.pattern),
+    set_process_trace(false, S#state.rootset),
 
-handle_call({profile, Rootset, M, F, A}, FromTag, S) ->
-    io:format("eprof: Starting profiling..... ~n", []),
-    maybe_delete(S#state.table),
-    ptrac(S#state.rootset, false, all()),
-    flush_receive(),
-    put(replyto, FromTag),
-    Tab = ets:new(eprof, [set, public]),
-    P = spawn_link(eprof, call, [self(), M, F, A]),
-    case ptrac([P|Rootset], true, all()) of
+    case set_process_trace(true, Rootset) of
 	true ->
-	    uni_schedule(),
-	    call_trace_for_all(true),
-	    P ! {self(),go},
-	    {noreply, #state{table     = Tab, 
-			     profiling = true,
-			     rootset   = [P|Rootset]}};
+	    T0 = now(),
+	    set_pattern_trace(true, Pattern),
+	    {reply, profiling, #state{
+		    profiling = true,
+		    rootset   = Rootset,
+		    start_ts  = T0,
+		    reply     = From,
+		    fd        = Fd,
+		    pattern   = Pattern
+		}};
 	false ->
-	    exit(P, kill),
-	    erase(replyto),
-	    {reply, error, #state{}}
+	    {reply, error, #state{ fd = Fd }}
     end;
 
-handle_call(dump, _FromTag, S) ->
-    {reply, dump(S#state.table), S};
-
-handle_call(analyse, _FromTag, S) ->
-    {reply, analyse(S), S};
+handle_call(stop_profiling, _From, #state{ profiling = false } = S) ->
+    {reply, profiling_already_stopped, S};
 
-handle_call(total_analyse, _FromTag, S) ->
-    {reply, total_analyse(S), S};
+handle_call(stop_profiling, _From, #state{ profiling = true } = S) ->
 
-handle_call(stop, _FromTag, S) ->
-    multi_schedule(),
-    {stop, normal, stopped, S}.
+    set_pattern_trace(pause, S#state.pattern),
 
-%%%%%%%%%%%%%%%%%%%
+    Bpd = collect_bpd(),
 
-handle_info({trace_ts,_From,_Op,_Func,_Time}=M, S0) when S0#state.profiling ->
-    Start = erlang:now(),
-    #state{table=Tab,pop=PrevOp0,ptime=PrevTime0,pfunc=PrevFunc0,
-	   overhead=Overhead0} = S0,
-    {PrevFunc,PrevOp,PrevTime} = do_messages(M, Tab, PrevFunc0, PrevOp0, PrevTime0),
-    Overhead = Overhead0 + subtr(erlang:now(), Start),
-    S = S0#state{overhead=Overhead,pfunc=PrevFunc,pop=PrevOp,ptime=PrevTime},
-    {noreply,S};
+    set_process_trace(false, S#state.rootset),
+    set_pattern_trace(false, S#state.pattern),
 
-handle_info({trace_ts, From, _, _, _}, S) when not S#state.profiling ->
-    ptrac([From], false, all()),
-    {noreply, S};
+    {reply, profiling_stopped, S#state{
+	profiling = false,
+	rootset   = [],
+	pattern   = {'_','_','_'},
+	bpd       = Bpd
+    }};
 
-handle_info({_P, {answer, A}}, S) ->
-    ptrac(S#state.rootset, false, all()),
-    io:format("eprof: Stop profiling~n",[]),
-    {From,_Tag} = get(replyto),
-    catch unlink(From),
-    ets:delete(S#state.table, nofunc),
-    gen_server:reply(erase(replyto), {ok, A}),
-    multi_schedule(),
-    {noreply, S#state{profiling = false,
-		      rootset = []}};
-
-handle_info({'EXIT', P, Reason},
-	    #state{profiling=true,proc=P,table=T,rootset=RootSet}) ->
-    maybe_delete(T),
-    ptrac(RootSet, false, all()),
-    multi_schedule(),
-    io:format("eprof: Profiling failed\n",[]),
-    case erase(replyto) of
-	undefined ->
-	    {noreply, #state{}};
-	FromTag ->
-	    gen_server:reply(FromTag, {error, Reason}),
-	    {noreply, #state{}}
+%% logfile
+handle_call({logfile, File}, _From, #state{ fd = OldFd } = S) ->
+    case file:open(File, [write]) of
+	{ok, Fd} ->
+	    case OldFd of
+		undefined -> ok;
+		OldFd -> file:close(OldFd)
+	    end,
+	    {reply, ok, S#state{ fd = Fd}};
+	Error ->
+	    {reply, Error, S}
     end;
 
-handle_info({'EXIT',_P,_Reason}, S) ->
-    {noreply, S}.
+handle_call(dump, _From, #state{ bpd = Bpd } = S) when is_record(Bpd, bpd) ->
+    {reply, gb_trees:to_list(Bpd#bpd.p), S};
 
-uni_schedule() ->
-    erlang:system_flag(multi_scheduling, block).
+handle_call(stop, _FromTag, S) ->
+    {stop, normal, stopped, S}.
 
-multi_schedule() ->
-    erlang:system_flag(multi_scheduling, unblock).
+%% -------------------------------------------------------------------- %%
+%%
+%% handle_cast
+%%
+%% -------------------------------------------------------------------- %%
 
-%%%%%%%%%%%%%%%%%%
+handle_cast(_Msg, State) ->
+    {noreply, State}.
 
-call(Top, M, F, A) ->
-    receive
-	{Top,go} ->
-	    Top ! {self(), {answer, apply(M,F,A)}}
-    end.
+%% -------------------------------------------------------------------- %%
+%%
+%% handle_info
+%%
+%% -------------------------------------------------------------------- %%
 
-call_trace_for_all(Flag) ->
-    erlang:trace_pattern(on_load, Flag, [local]),
-    erlang:trace_pattern({'_','_','_'}, Flag, [local]).
+handle_info({'EXIT', _, normal}, S) ->
+    {noreply, S};
+handle_info({'EXIT', _, eprof_kill}, S) ->
+    {noreply, S};
+handle_info({'EXIT', _, Reason}, #state{ reply = FromTag } = S) ->
 
-ptrac([P|T], How, Flags) when is_pid(P) ->
-    case dotrace(P, How, Flags) of
-	true ->
-	    ptrac(T, How, Flags);
-	false when How ->
-	    false;
-	false ->
-	    ptrac(T, How, Flags)
-    end;
+    set_process_trace(false, S#state.rootset),
+    set_pattern_trace(false, S#state.pattern),
 
-ptrac([P|T], How, Flags) when is_atom(P) ->
-    case whereis(P) of
-	undefined when How ->
-	    false;
-	undefined when not How ->
-	    ptrac(T, How, Flags);
-	Pid ->
-	    ptrac([Pid|T], How, Flags)
-    end;
+    gen_server:reply(FromTag, {error, Reason}),
+    {noreply, S#state{
+	profiling = false,
+	rootset   = [],
+	pattern   = {'_','_','_'}
+    }};
 
-ptrac([H|_],_How,_Flags) ->
-    io:format("** eprof bad process ~w~n",[H]),
-    false;
+% check if Pid is spawned process?
+handle_info({_Pid, {answer, Result}}, #state{ reply = {From,_} = FromTag} = S) ->
 
-ptrac([],_,_) -> true.
+    set_pattern_trace(pause, S#state.pattern),
 
-dotrace(P, How, What) ->
-    case (catch erlang:trace(P, How, What)) of
-	1 ->
-	    true;
-	_Other when not How ->
-	    true;
-	_Other ->
-	    io:format("** eprof: bad process: ~p,~p,~p~n", [P,How,What]),
-	    false
-    end.
+    Bpd = collect_bpd(),
 
-all() -> [call,arity,return_to,running,timestamp,set_on_spawn].
-
-total_analyse(#state{table=notable}) ->
-    nothing_to_analyse;
-total_analyse(S) ->
-    #state{table = T, overhead = Overhead} = S,
-    QH = qlc:q([{{From,Mfa},Time,Count} ||
-		   {[From|Mfa],Time,Count} <- ets:table(T)]),
-    Pcalls = reverse(keysort(2, replicas(qlc:eval(QH)))),
-    Time = collect_times(Pcalls),
-    format("FUNCTION~44s      TIME ~n", ["CALLS"]),   
-    printit(Pcalls, Time),
-    format("\nTotal time: ~.2f\n", [Time / 1000000]),
-    format("Measurement overhead: ~.2f\n", [Overhead / 1000000]).
-
-analyse(#state{table=notable}) ->
-    nothing_to_analyse;
-analyse(S) ->
-    #state{table = T, overhead = Overhead} = S,
-    Pids = ordsets:from_list(flatten(ets:match(T, {['$1'|'_'],'_', '_'}))),
-    Times = sum(ets:match(T, {'_','$1', '_'})),
-    format("FUNCTION~44s      TIME ~n", ["CALLS"]),     
-    do_pids(Pids, T, 0, Times),
-    format("\nTotal time: ~.2f\n", [Times / 1000000]),
-    format("Measurement overhead: ~.2f\n", [Overhead / 1000000]).
-
-do_pids([Pid|Tail], T, AckTime, Total) ->
-    Pcalls = 
-     reverse(keysort(2, to_tups(ets:match(T, {[Pid|'$1'], '$2','$3'})))),
-    Time = collect_times(Pcalls),
-    PercentTotal = 100 * (divide(Time, Total)),
-    format("~n****** Process ~w    -- ~s % of profiled time *** ~n", 
-	   [Pid, fpf(PercentTotal)]),
-    printit(Pcalls, Time),
-    do_pids(Tail, T, AckTime + Time, Total);
-do_pids([], _, _, _) -> 
-    ok.
+    set_process_trace(false, S#state.rootset),
+    set_pattern_trace(false, S#state.pattern),
 
-printit([],_) -> ok;
-printit([{{Mod,Fun,Arity}, Time, Calls} |Tail], ProcTime)  ->
-    format("~s  ~s ~s % ~n", [ff(Mod,Fun,Arity), fint(Calls),
-			      fpf(100*(divide(Time,ProcTime)))]),
-    printit(Tail, ProcTime);
-printit([{{_,{Mod,Fun,Arity}}, Time, Calls} |Tail], ProcTime)  ->
-    format("~s  ~s ~s % ~n", [ff(Mod,Fun,Arity), fint(Calls),
-			      fpf(100*(divide(Time,ProcTime)))]),
-    printit(Tail, ProcTime); 
-printit([_|T], Time) ->
-    printit(T, Time).
-
-ff(Mod,Fun,Arity) ->
-    pad(flatten(io_lib:format("~w:~w/~w", [Mod,Fun, Arity])),45).
-
-pad(Str, Len) -> 
-    Strlen = length(Str),
-    if
-	Strlen > Len -> strip_tail(Str, 45);
-	true -> lists:append(Str, mklist(Len-Strlen))
-    end.
+    catch unlink(From),
+    gen_server:reply(FromTag, {ok, Result}),
+    {noreply, S#state{
+	profiling = false,
+	rootset   = [],
+	pattern   = {'_','_','_'},
+	bpd       = Bpd
+    }}.
+
+%% -------------------------------------------------------------------- %%
+%%
+%% termination
+%%
+%% -------------------------------------------------------------------- %%
+
+terminate(_Reason, #state{ fd = undefined }) ->
+    set_pattern_trace(false, {'_','_','_'}),
+    ok;
+terminate(_Reason, #state{ fd = Fd }) ->
+    file:close(Fd),
+    set_pattern_trace(false, {'_','_','_'}),
+    ok.
 
-strip_tail([_|_], 0) ->[];
-strip_tail([H|T], I) -> [H|strip_tail(T, I-1)];
-strip_tail([],_I) -> [].
+%% -------------------------------------------------------------------- %%
+%%
+%% code_change
+%%
+%% -------------------------------------------------------------------- %%
 
-fpf(F) -> strip_tail(flatten(io_lib:format("~w", [round(F)])), 5).
-fint(Int) -> pad(flatten(io_lib:format("~w",[Int])), 10).
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
 
-mklist(0) -> [];
-mklist(I) -> [$ |mklist(I-1)].
 
-to_tups(L) -> lists:map(fun(List) -> erlang:list_to_tuple(List) end, L).
+%% -------------------------------------------------------------------- %%
+%%
+%% AUX Functions
+%%
+%% -------------------------------------------------------------------- %%
 
-divide(X,Y) -> X / Y.
+setup_profiling(M,F,A) ->
+    spawn_link(fun() -> spin_profile(M,F,A) end).
 
-collect_times([]) -> 0;
-collect_times([Tup|Tail]) -> element(2, Tup) + collect_times(Tail).
+spin_profile(M, F, A) ->
+    receive
+	{Pid, execute} ->
+	    Pid ! {self(), {answer, erlang:apply(M,F,A)}}
+    end.
 
-dump(T) ->
-    L = ets:tab2list(T),
-    format(L).
+execute_profiling(Pid) ->
+    Pid ! {self(), execute}.
 
-format([H|T]) -> 
-    format("~p~n", [H]), format(T);
-format([]) -> ok.
+set_pattern_trace(Flag, Pattern) ->
+    erlang:system_flag(multi_scheduling, block),
+    erlang:trace_pattern(on_load, Flag, [call_time]),
+    erlang:trace_pattern(Pattern, Flag, [call_time]),
+    erlang:system_flag(multi_scheduling, unblock),
+    ok.
 
-format(F, A) ->
-    io:format(F,A),
-    case get(fd) of
-	undefined -> ok;
-	Fd -> io:format(Fd, F,A)
+set_process_trace(Flag, Pids) ->
+    % do we need procs for meta info?
+    % could be useful
+    set_process_trace(Flag, Pids, [call, set_on_spawn]).
+set_process_trace(_, [], _) -> true;
+set_process_trace(Flag, [Pid|Pids], Options) when is_pid(Pid) ->
+    try
+	erlang:trace(Pid, Flag, Options),
+	set_process_trace(Flag, Pids, Options)
+    catch
+	_:_ ->
+	    false
+    end;
+set_process_trace(Flag, [Name|Pids], Options) when is_atom(Name) ->
+    case whereis(Name) of
+	undefined ->
+	    set_process_trace(Flag, Pids, Options);
+	Pid ->
+	    set_process_trace(Flag, [Pid|Pids], Options)
     end.
 
-maybe_delete(T) ->
-    catch ets:delete(T).
+collect_bpd() ->
+    collect_bpd([M || M <- [element(1, Mi) || Mi <- code:all_loaded()], M =/= ?MODULE]).
+
+collect_bpd(Ms) when is_list(Ms) ->
+    collect_bpdf(collect_mfas(Ms) ++ erlang:system_info(snifs)).
+
+collect_mfas(Ms) ->
+    lists:foldl(fun
+	    (M, Mfas) ->
+		Mfas ++ [{M, F, A} || {F, A} <- M:module_info(functions)]
+	end, [], Ms).
+
+collect_bpdf(Mfas) ->
+    collect_bpdf(Mfas, #bpd{}).
+collect_bpdf([], Bpd) ->
+    Bpd;
+collect_bpdf([Mfa|Mfas], #bpd{n = N, us = Us, p = Tree, mfa = Code } = Bpd) ->
+    case erlang:trace_info(Mfa, call_time) of
+	{call_time, []} ->
+	    collect_bpdf(Mfas, Bpd);
+	{call_time, Data} when is_list(Data) ->
+	    {CTn, CTus, CTree} = collect_bpdfp(Mfa, Tree, Data),
+	    collect_bpdf(Mfas, Bpd#bpd{
+		    n   = CTn  + N,
+		    us  = CTus + Us,
+		    p   = CTree,
+		    mfa = [{Mfa, {CTn, CTus}}|Code]
+		});
+	{call_time, false} ->
+	    collect_bpdf(Mfas, Bpd);
+	{call_time, _Other} ->
+	    collect_bpdf(Mfas, Bpd)
+    end.
 
-sum([[H]|T]) -> H + sum(T);
-sum([]) -> 0.
+collect_bpdfp(Mfa, Tree, Data) ->
+     lists:foldl(fun
+	({Pid, Ni, Si, Usi}, {PTno, PTuso, To}) ->
+	    Time = Si * 1000000 + Usi,
+	    Ti1  = case gb_trees:lookup(Pid, To) of
+		none ->
+		    gb_trees:enter(Pid, [{Mfa, {Ni, Time}}], To);
+		{value, Pmfas} ->
+		    gb_trees:enter(Pid, [{Mfa, {Ni, Time}}|Pmfas], To)
+	    end,
+	    {PTno + Ni, PTuso + Time, Ti1}
+    end, {0,0, Tree}, Data).
+
+%% manipulators
+sort_mfa(Bpfs, mfa) when is_list(Bpfs) ->
+    lists:sort(fun
+	    ({A,_}, {B,_}) when A < B -> true;
+	    (_, _) -> false
+	end, Bpfs);
+sort_mfa(Bpfs, time) when is_list(Bpfs) ->
+    lists:sort(fun
+	    ({_,{_,A}}, {_,{_,B}}) when A < B -> true;
+	    (_, _) -> false
+	end, Bpfs);
+sort_mfa(Bpfs, calls) when is_list(Bpfs) ->
+    lists:sort(fun
+	    ({_,{A,_}}, {_,{B,_}}) when A < B -> true;
+	    (_, _) -> false
+	end, Bpfs);
+sort_mfa(Bpfs, _) when is_list(Bpfs) -> sort_mfa(Bpfs, time).
+
+filter_mfa(Bpfs, Ts) when is_list(Ts) ->
+    filter_mfa(Bpfs, [], proplists:get_value(calls, Ts, 0), proplists:get_value(time, Ts, 0));
+filter_mfa(Bpfs, _) -> Bpfs.
+filter_mfa([], Out, _, _) -> lists:reverse(Out);
+filter_mfa([{_, {C, T}}=Bpf|Bpfs], Out, Ct, Tt) when C >= Ct, T >= Tt -> filter_mfa(Bpfs, [Bpf|Out], Ct, Tt);
+filter_mfa([_|Bpfs], Out, Ct, Tt) -> filter_mfa(Bpfs, Out, Ct, Tt).
+
+sum_bp_total_n_us(Mfas) ->
+    lists:foldl(fun ({_, {Ci,Usi}}, {Co, Uso}) -> {Co + Ci, Uso + Usi} end, {0,0}, Mfas).
+
+%% strings and format
+
+string_bp_mfa(Mfas, Tus) -> string_bp_mfa(Mfas, Tus, {0,0,0,0,0}, []).
+string_bp_mfa([], _, Ws, Strings) -> {Ws, lists:reverse(Strings)};
+string_bp_mfa([{Mfa, {Count, Time}}|Mfas], Tus, {MfaW, CountW, PercW, TimeW, TpCW}, Strings) ->
+	Smfa   = s(Mfa),
+	Scount = s(Count),
+	Stime  = s(Time),
+	Sperc  = s("~.2f", [100*divide(Time,Tus)]),
+	Stpc   = s("~.2f", [divide(Time,Count)]),
+
+	string_bp_mfa(Mfas, Tus, {
+		erlang:max(MfaW,  length(Smfa)),
+		erlang:max(CountW,length(Scount)),
+		erlang:max(PercW, length(Sperc)),
+		erlang:max(TimeW, length(Stime)),
+		erlang:max(TpCW,  length(Stpc))
+	    }, [[Smfa, Scount, Sperc, Stime, Stpc] | Strings]).
+
+print_bp_mfa(Mfas, {_Tn, Tus}, Fd, Opts) ->
+    Fmfas = filter_mfa(sort_mfa(Mfas, proplists:get_value(sort, Opts)), proplists:get_value(filter, Opts)),
+    {{MfaW, CountW, PercW, TimeW, TpCW}, Strs} = string_bp_mfa(Fmfas, Tus),
+    Ws = {
+	erlang:max(length("FUNCTION"), MfaW),
+	erlang:max(length("CALLS"), CountW),
+	erlang:max(length("  %"), PercW),
+	erlang:max(length("TIME"), TimeW),
+	erlang:max(length("uS / CALLS"), TpCW)
+    },
+    format(Fd, Ws, ["FUNCTION", "CALLS", "  %", "TIME", "uS / CALLS"]),
+    format(Fd, Ws, ["--------", "-----", "---", "----", "----------"]),
+
+    lists:foreach(fun (String) -> format(Fd, Ws, String) end, Strs),
+    ok.
 
-replicas(L) ->
-    replicas(L, []).
+s({M,F,A}) -> s("~w:~w/~w",[M,F,A]);
+s(Term) -> s("~p", [Term]).
+s(Format, Terms) -> lists:flatten(io_lib:format(Format, Terms)).
 
-replicas([{{Pid, {Mod,Fun,Arity}}, Ack,Calls} |Tail], Result) ->
-    case search({Mod,Fun,Arity},Result) of
-	false ->
-	    replicas(Tail, [{{Pid, {Mod,Fun,Arity}}, Ack,Calls} |Result]);
-	{Ack2, Calls2} ->
-	    Result2 = del({Mod,Fun,Arity}, Result),
-	    replicas(Tail, [{{Pid, {Mod,Fun,Arity}}, 
-			     Ack+Ack2,Calls+Calls2} |Result2])
-    end;
 
-replicas([_|T], Ack) ->  %% Whimpy
-    replicas(T, Ack);
-
-replicas([], Res) -> Res.
-
-search(Key, [{{_,Key}, Ack, Calls}|_]) -> 
-    {Ack, Calls};
-search(Key, [_|T]) -> 
-    search(Key, T);
-search(_Key,[]) -> false.
-
-del(Key, [{{_,Key},_Ack,_Calls}|T]) ->
-    T;
-del(Key, [H | Tail]) ->
-    [H|del(Key, Tail)];
-del(_Key,[]) -> [].
-
-flush_receive() ->
-    receive 
-	{trace_ts, From, _, _, _} when is_pid(From) ->
-	    ptrac([From], false, all()),
-	    flush_receive();
-	_ ->
-	    flush_receive()
-    after 0 ->
-	    ok
-    end.
+format(Fd, {MfaW, CountW, PercW, TimeW, TpCW}, Strings) ->
+    format(Fd, s("~~.~ps  ~~~ps  ~~~ps  ~~~ps  [~~~ps]~~n", [MfaW, CountW, PercW, TimeW, TpCW]), Strings);
+format(undefined, Format, Strings) ->
+    io:format(Format, Strings),
+    ok;
+format(Fd, Format, Strings) ->
+    io:format(Fd, Format, Strings),
+    io:format(Format, Strings),
+    ok.
 
-code_change(_OldVsn, State, _Extra) ->
-    {ok,State}.
+divide(_,0) -> 0.0;
+divide(T,N) -> T/N.
diff --git a/lib/tools/src/xref_base.erl b/lib/tools/src/xref_base.erl
index 1656899e8f..93f0e9c0c8 100644
--- a/lib/tools/src/xref_base.erl
+++ b/lib/tools/src/xref_base.erl
@@ -19,6 +19,8 @@
 
 -module(xref_base).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([new/0, new/1, delete/1,
 	 add_directory/2, add_directory/3,
 	 add_module/2, add_module/3,
diff --git a/lib/tools/src/xref_compiler.erl b/lib/tools/src/xref_compiler.erl
index c80eb0e669..1445e135be 100644
--- a/lib/tools/src/xref_compiler.erl
+++ b/lib/tools/src/xref_compiler.erl
@@ -31,6 +31,8 @@
 -define(CALL(F), ok).
 -endif.
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([compile/2]).
 
 -export([update_graph_counter/3]).
diff --git a/lib/tools/src/xref_utils.erl b/lib/tools/src/xref_utils.erl
index 0ef199cec7..9d4a175d88 100644
--- a/lib/tools/src/xref_utils.erl
+++ b/lib/tools/src/xref_utils.erl
@@ -18,6 +18,8 @@
 %%
 -module(xref_utils).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([xset/2]).
 
 -export([is_directory/1, file_info/1, fa_to_mfa/2]).
diff --git a/lib/tools/test/Makefile b/lib/tools/test/Makefile
index 3a59be758a..826a8f3ee8 100644
--- a/lib/tools/test/Makefile
+++ b/lib/tools/test/Makefile
@@ -39,7 +39,8 @@ INSTALL_PROGS= $(TARGET_FILES)
 
 EMAKEFILE=Emakefile
 
-SPEC_FILES= tools.spec tools.spec.win
+SPEC_FILES= tools.spec
+COVER_FILE = tools.cover
 
 # ----------------------------------------------------
 # Release directory specification
@@ -84,7 +85,8 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SPEC_FILES) $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(EMAKEFILE) \
+		$(ERL_FILES) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index b9ccd62d0b..494ef55f59 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. 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
@@ -18,13 +18,16 @@
 %%
 -module(cover_SUITE).
 
--export([all/1]).
+-export([all/0, init_per_testcase/2, end_per_testcase/2,
+	 suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+
 -export([start/1, compile/1, analyse/1, misc/1, stop/1, 
 	 distribution/1, export_import/1,
 	 otp_5031/1, eif/1, otp_5305/1, otp_5418/1, otp_6115/1, otp_7095/1,
          otp_8188/1, otp_8270/1, otp_8273/1, otp_8340/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %%----------------------------------------------------------------------
 %% The following directory structure is assumed:
@@ -37,18 +40,50 @@
 %%                                             y
 %%----------------------------------------------------------------------
 
-all(suite) -> 
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     case whereis(cover_server) of
 	undefined ->
 	    [start, compile, analyse, misc, stop, distribution,
-	     export_import,
-	     otp_5031, eif, otp_5305, otp_5418, otp_6115, otp_7095,
-             otp_8188, otp_8270, otp_8273, otp_8340];
+	     export_import, otp_5031, eif, otp_5305, otp_5418,
+	     otp_6115, otp_7095, otp_8188, otp_8270, otp_8273,
+	     otp_8340];
 	_pid ->
-	    {skip,"It looks like the test server is running cover. "
-	          "Can't run cover test."}
+	    {skip,
+	     "It looks like the test server is running "
+	     "cover. Can't run cover test."}
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+init_per_testcase(TC, Config) when TC =:= misc; TC =:= compile ->
+    case code:which(crypto) of
+	Path when is_list(Path) ->
+	    init_per_testcase(dummy_tc, Config);
+	_Else ->
+	    {skip, "No crypto file to test with"}
+    end;
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    %cover:stop(),
+    ok.
+
 start(suite) -> [];
 start(Config) when is_list(Config) ->
     ?line ok = file:set_cwd(?config(data_dir, Config)),
@@ -381,8 +416,8 @@ export_import(Config) when is_list(Config) ->
     ?line {ok,a} = cover:compile(a),
     ?line ?t:capture_start(),
     ?line ok = cover:export("all_exported"),
-    ?line [Text2] = ?t:capture_get(),
-    ?line "Export includes data from imported files"++_ = lists:flatten(Text2),
+    ?line [] = ?t:capture_get(),
+%    ?line "Export includes data from imported files"++_ = lists:flatten(Text2),
     ?line ?t:capture_stop(),
     ?line ok = cover:stop(),
     ?line ok = cover:import("all_exported"),
diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl
index e697cc1571..b6f786d33f 100644
--- a/lib/tools/test/cprof_SUITE.erl
+++ b/lib/tools/test/cprof_SUITE.erl
@@ -41,7 +41,7 @@
 -define(config(A,B),config(A,B)).
 -export([config/2]).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -endif.
  
 -ifdef(debug).
@@ -63,14 +63,17 @@ config(data_dir, _) ->
     "cprof_SUITE_data".
 -else.
 %% When run in test server.
--export([all/1, init_per_testcase/2, fin_per_testcase/2, not_run/1]).
+-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, 
+	 not_run/1]).
 -export([basic/1, on_load/1, modules/1]).
 	 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(test_server:seconds(30)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     erlang:trace_pattern({'_','_','_'}, false, [local,meta,call_count]),
     erlang:trace_pattern(on_load, false, [local,meta,call_count]),
     erlang:trace(all, false, [all]),
@@ -78,16 +81,30 @@ fin_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(doc) ->
-    ["Test the cprof profiling tool."];
-all(suite) ->
-    case test_server:is_native(?MODULE) of
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    case test_server:is_native(cprof_SUITE) of
 	true -> [not_run];
 	false -> [basic, on_load, modules]
-%, on_and_off, info, 
-%		  pause_and_restart, combo]
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
diff --git a/lib/tools/test/emem_SUITE.erl b/lib/tools/test/emem_SUITE.erl
index 430fa86c6c..8b38e7d3a8 100644
--- a/lib/tools/test/emem_SUITE.erl
+++ b/lib/tools/test/emem_SUITE.erl
@@ -24,7 +24,8 @@
 	 receive_and_save_trace/2, send_trace/2]).
 
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -export([live_node/1,
 	 'sparc_sunos5.8_32b_emt2.0'/1,
@@ -41,7 +42,7 @@
 
 -include_lib("kernel/include/file.hrl").
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(5)).
 
@@ -65,23 +66,32 @@
 %%
 %%
 
-all(doc) -> [];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     case is_debug_compiled() of
-	true -> {skipped, "Not run when debug compiled"};
+	true -> {skip, "Not run when debug compiled"};
 	false -> test_cases()
     end.
-		 
-test_cases() ->
-    [live_node,
-     'sparc_sunos5.8_32b_emt2.0',
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+test_cases() -> 
+    [live_node, 'sparc_sunos5.8_32b_emt2.0',
      'pc_win2000_32b_emt2.0',
      'pc.smp_linux2.2.19pre17_32b_emt2.0',
      'powerpc_darwin7.7.0_32b_emt2.0',
      'alpha_osf1v5.1_64b_emt2.0',
      'sparc_sunos5.8_64b_emt2.0',
-     'sparc_sunos5.8_32b_emt1.0',
-     'pc_win2000_32b_emt1.0',
+     'sparc_sunos5.8_32b_emt1.0', 'pc_win2000_32b_emt1.0',
      'powerpc_darwin7.7.0_32b_emt1.0',
      'alpha_osf1v5.1_64b_emt1.0',
      'sparc_sunos5.8_64b_emt1.0'].
@@ -100,7 +110,7 @@ init_per_testcase(Case, Config) when is_list(Config) ->
 			       [{watchdog, Dog}, {testcase, Case} | Config])
     end.
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     ignore_cores:restore(Config),
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
@@ -700,8 +710,8 @@ start_node(Name, Args) ->
 % stop_node(Node) ->
 %     ?t:stop_node(Node).
 
-is_debug_compiled() ->
-    is_debug_compiled(erlang:system_info(system_version)).
+is_debug_compiled() -> 
+is_debug_compiled(erlang:system_info(system_version)).
 
 is_debug_compiled([$d,$e,$b,$u,$g | _]) ->
     true;
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 028fea8fe1..16246d5e0b 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -18,12 +18,111 @@
 %%
 -module(eprof_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,tiny/1,eed/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]).
 
-all(suite) -> [tiny,eed].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
+all() -> 
+    [basic, tiny, eed].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+basic(suite) -> [];
+basic(Config) when is_list(Config) ->
+
+    %% load eprof_test and change directory
+
+    ?line {ok, OldCurDir} = file:get_cwd(),
+    Datadir = ?config(data_dir, Config),
+    Privdir = ?config(priv_dir, Config),
+    ?line {ok,eprof_test} = compile:file(filename:join(Datadir, "eprof_test"),
+					       [trace,{outdir, Privdir}]),
+    ?line ok = file:set_cwd(Privdir),
+    ?line code:purge(eprof_test),
+    ?line {module,eprof_test} = code:load_file(eprof_test),
+
+    %% rootset profiling
+
+    ?line ensure_eprof_stopped(),
+    ?line profiling = eprof:profile([self()]),
+    ?line {error, already_profiling} = eprof:profile([self()]),
+    ?line profiling_stopped = eprof:stop_profiling(),
+    ?line profiling_already_stopped = eprof:stop_profiling(),
+    ?line profiling = eprof:start_profiling([self(),self(),self()]),
+    ?line profiling_stopped = eprof:stop_profiling(),
+
+    %% with patterns
+
+    ?line profiling = eprof:start_profiling([self()], {?MODULE, '_', '_'}),
+    ?line {error, already_profiling} = eprof:start_profiling([self()], {?MODULE, '_', '_'}),
+    ?line profiling_stopped = eprof:stop_profiling(),
+    ?line profiling = eprof:start_profiling([self()], {?MODULE, start_stop, '_'}),
+    ?line profiling_stopped = eprof:stop_profiling(),
+    ?line profiling = eprof:start_profiling([self()], {?MODULE, start_stop, 1}),
+    ?line profiling_stopped = eprof:stop_profiling(),
+
+    %% with fun
+
+    ?line {ok, _} = eprof:profile(fun() -> eprof_test:go(10) end),
+    ?line profiling = eprof:profile([self()]),
+    ?line {error, already_profiling} = eprof:profile(fun() -> eprof_test:go(10) end),
+    ?line profiling_stopped = eprof:stop_profiling(),
+    ?line {ok, _} = eprof:profile(fun() -> eprof_test:go(10) end),
+    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end),
+    ?line Pid     = whereis(eprof),
+    ?line {ok, _} = eprof:profile(erlang:processes() -- [Pid], fun() -> eprof_test:go(10) end),
+    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, '_', '_'}),
+    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, go, '_'}),
+    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, go, 1}),
+    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, dec, 1}),
+
+    %% error case
+
+    ?line error     = eprof:profile([Pid], fun() -> eprof_test:go(10) end),
+    ?line Pid       = whereis(eprof),
+    ?line error     = eprof:profile([Pid], fun() -> eprof_test:go(10) end),
+    ?line A         = spawn(fun() -> receive _ -> ok end end),
+    ?line profiling = eprof:profile([A]),
+    ?line true      = exit(A, kill_it),
+    ?line profiling_stopped = eprof:stop_profiling(),
+    ?line {error,_} = eprof:profile(fun() -> a = b end),
+
+    %% with mfa
+
+    ?line {ok, _} = eprof:profile([], eprof_test, go, [10]),
+    ?line {ok, _} = eprof:profile([], eprof_test, go, [10], {eprof_test, dec, 1}),
+
+    %% dump
+
+    ?line {ok, _} = eprof:profile([], fun() -> eprof_test:go(10) end, {eprof_test, '_', '_'}),
+    ?line [{_, Mfas}] = eprof:dump(),
+    ?line Dec_mfa = {eprof_test, dec, 1},
+    ?line Go_mfa  = {eprof_test, go,  1},
+    ?line {value, {Go_mfa,  { 1, _Time1}}} = lists:keysearch(Go_mfa,  1, Mfas),
+    ?line {value, {Dec_mfa, {11, _Time2}}} = lists:keysearch(Dec_mfa, 1, Mfas),
+
+    %% change current working directory
+
+    ?line ok = file:set_cwd(OldCurDir),
+    ?line stopped = eprof:stop(),
+    ok.
 
 tiny(suite) -> [];
 tiny(Config) when is_list(Config) -> 
@@ -40,11 +139,11 @@ tiny(Config) when is_list(Config) ->
     ?line code:purge(eprof_suite_test),
     ?line {module,eprof_suite_test} = code:load_file(eprof_suite_test),
     ?line {ok,_Pid} = eprof:start(),
-    ?line nothing_to_analyse = eprof:analyse(),
-    ?line nothing_to_analyse = eprof:total_analyse(),
+    ?line nothing_to_analyze = eprof:analyze(),
+    ?line nothing_to_analyze = eprof:analyze(total),
     ?line eprof:profile([], eprof_suite_test, test, [Config]),
-    ?line ok = eprof:analyse(),
-    ?line ok = eprof:total_analyse(),
+    ?line ok = eprof:analyze(),
+    ?line ok = eprof:analyze(total),
     ?line ok = eprof:log("eprof_SUITE_logfile"),
     ?line stopped = eprof:stop(),
     ?line ?t:timetrap_cancel(TTrap),
@@ -79,8 +178,8 @@ eed(Config) when is_list(Config) ->
     ?line {ok,ok} = eprof:profile([], eed, file, [Script]),
     ?line {T3,_} = statistics(runtime),
     ?line profiling_already_stopped = eprof:stop_profiling(),
-    ?line ok = eprof:analyse(),
-    ?line ok = eprof:total_analyse(),
+    ?line ok = eprof:analyze(),
+    ?line ok = eprof:analyze(total),
     ?line ok = eprof:log("eprof_SUITE_logfile"),
     ?line stopped = eprof:stop(),
     ?line ?t:timetrap_cancel(TTrap),
diff --git a/lib/tools/test/eprof_SUITE_data/eprof_test.erl b/lib/tools/test/eprof_SUITE_data/eprof_test.erl
new file mode 100644
index 0000000000..33c428e893
--- /dev/null
+++ b/lib/tools/test/eprof_SUITE_data/eprof_test.erl
@@ -0,0 +1,9 @@
+-module(eprof_test).
+-export([go/1]).
+
+go(N) ->
+    0 = dec(N),
+    ok.
+
+dec(0) -> 0;
+dec(N) -> dec(N - 1).
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index e437007e76..78de77526c 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -18,10 +18,11 @@
 %%
 -module(fprof_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test server framework exports
--export([all/1, not_run/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, not_run/1]).
 
 %% Test suites
 -export([stack_seq/1, tail_seq/1, create_file_slow/1, spawn_simple/1,
@@ -54,18 +55,33 @@
 
 
 
-all(doc) ->
-    ["Test the 'fprof' profiling tool."];
-all(suite) ->
-    case test_server:is_native(?MODULE) of
-	true ->
-	    [not_run];
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    case test_server:is_native(fprof_SUITE) of
+	true -> [not_run];
 	false ->
 	    [stack_seq, tail_seq, create_file_slow, spawn_simple,
 	     imm_tail_seq, imm_create_file_slow, imm_compile,
 	     cpu_create_file_slow]
     end.
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 not_run(Config) when is_list(Config) ->
     {skipped, "Native code"}.
 
@@ -356,7 +372,7 @@ imm_tail_seq(Config) when is_list(Config) ->
     ?line profiling_stopped = eprof:stop_profiling(),
     ?line R2 = R0,
     %%
-    ?line eprof:analyse(),
+    ?line eprof:analyze(),
     ?line stopped = eprof:stop(),
     %%
     ?line {ok, Tracer} = fprof:profile(start),
@@ -471,7 +487,7 @@ imm_compile(Config) when is_list(Config) ->
     ?line TS3 = erlang:now(),
     ?line profiling_stopped = eprof:stop_profiling(),
     %%
-    ?line eprof:analyse(),
+    ?line eprof:analyze(),
     ?line stopped = eprof:stop(),
     %%
     ?line {ok, Tracer} = fprof:profile(start),
diff --git a/lib/tools/test/ignore_cores.erl b/lib/tools/test/ignore_cores.erl
index 8902a469ef..8b1ac0fe6c 120000..100644
--- a/lib/tools/test/ignore_cores.erl
+++ b/lib/tools/test/ignore_cores.erl
@@ -1 +1,158 @@
-../../../erts/test/ignore_cores.erl
\ No newline at end of file
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2010. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File    : ignore_cores.erl
+%%% Author  : Rickard Green <[email protected]>
+%%% Description : 
+%%%
+%%% Created : 11 Feb 2008 by Rickard Green <[email protected]>
+%%%-------------------------------------------------------------------
+
+-module(ignore_cores).
+
+-include_lib("test_server/include/test_server.hrl").
+
+-export([init/1, fini/1, setup/3, setup/4, restore/1, dir/1]).
+
+-record(ignore_cores, {org_cwd,
+		       org_path,
+		       org_pwd_env,
+		       ign_dir = false,
+		       cores_dir = false}).
+
+%%
+%% Takes a testcase config
+%%
+
+init(Config) ->
+    {ok, OrgCWD} = file:get_cwd(),
+    [{ignore_cores,
+      #ignore_cores{org_cwd = OrgCWD,
+		    org_path = code:get_path(),
+		    org_pwd_env = os:getenv("PWD")}}
+     | lists:keydelete(ignore_cores, 1, Config)].
+    
+fini(Config) ->
+    #ignore_cores{org_cwd = OrgCWD,
+		  org_path = OrgPath,
+		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+    ok = file:set_cwd(OrgCWD),
+    true = code:set_path(OrgPath),
+    case OrgPWD of
+	false -> ok;
+	_ -> true = os:putenv("PWD", OrgPWD)
+    end,
+    lists:keydelete(ignore_cores, 1, Config).
+
+setup(Suite, Testcase, Config) ->
+    setup(Suite, Testcase, Config, false).
+
+setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite), 
+                                            is_atom(Testcase),
+                                            is_list(Config) ->
+    #ignore_cores{org_cwd = OrgCWD,
+		  org_path = OrgPath,
+		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+    Path = lists:map(fun (".") -> OrgCWD; (Dir) -> Dir end, OrgPath),
+    true = code:set_path(Path),
+    PrivDir = ?config(priv_dir, Config),
+    IgnDir = filename:join([PrivDir,
+			 atom_to_list(Suite)
+			 ++ "_"
+			 ++ atom_to_list(Testcase)
+			 ++ "_wd"]),
+    ok = file:make_dir(IgnDir),
+    case SetCwd of
+	false ->
+	    ok;
+	_ ->
+	    ok = file:set_cwd(IgnDir),
+	    OrgPWD = case os:getenv("PWD") of
+			 false -> false;
+			 PWD ->
+			     os:putenv("PWD", IgnDir),
+			     PWD
+		     end
+    end,
+    ok = file:write_file(filename:join([IgnDir, "ignore_core_files"]), <<>>),
+    %% cores are dumped in /cores on MacOS X
+    CoresDir = case {?t:os_type(), filelib:is_dir("/cores")} of
+		   {{unix,darwin}, true} ->
+		       filelib:fold_files("/cores",
+					  "^core.*$",
+					  false,
+					  fun (C,Cs) -> [C|Cs] end,
+					  []);
+		   _ ->
+		       false
+	       end,
+    lists:keyreplace(ignore_cores,
+		     1,
+		     Config,
+		     {ignore_cores,
+		      #ignore_cores{org_cwd = OrgCWD,
+				    org_path = OrgPath,
+				    org_pwd_env = OrgPWD,
+				    ign_dir = IgnDir,
+				    cores_dir = CoresDir}}).
+
+restore(Config) ->
+    #ignore_cores{org_cwd = OrgCWD,
+		  org_path = OrgPath,
+		  org_pwd_env = OrgPWD,
+		  ign_dir = IgnDir,
+		  cores_dir = CoresDir} = ?config(ignore_cores, Config),
+    try
+	case CoresDir of
+	    false ->
+		ok;
+	    _ ->
+		%% Move cores dumped by these testcases in /cores
+		%% to cwd.
+		lists:foreach(fun (C) ->
+				      case lists:member(C, CoresDir) of
+					  true -> ok;
+					  _ ->
+					      Dst = filename:join(
+						      [IgnDir,
+						       filename:basename(C)]),
+					      {ok, _} = file:copy(C, Dst),
+					      file:delete(C)
+				      end
+			      end,
+			      filelib:fold_files("/cores",
+						 "^core.*$",
+						 false,
+						 fun (C,Cs) -> [C|Cs] end,
+						 []))
+	end
+    after
+	catch file:set_cwd(OrgCWD),
+	catch code:set_path(OrgPath),
+	case OrgPWD of
+	    false -> ok;
+	    _ -> catch os:putenv("PWD", OrgPWD)
+	end
+    end.
+
+
+dir(Config) ->
+    #ignore_cores{ign_dir = Dir} = ?config(ignore_cores, Config),
+    Dir.
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index da5930e015..6800a94f94 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -18,22 +18,43 @@
 %%
 -module(instrument_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2]).
+-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(['+Mim true'/1, '+Mis true'/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=?t:timetrap(10000),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> ['+Mim true', '+Mis true'].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    ['+Mim true', '+Mis true'].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 '+Mim true'(doc) -> ["Check that memory data can be read and processed"];
 '+Mim true'(suite) -> [];
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index e6866f721d..21383fa544 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -18,10 +18,10 @@
 %%
 
 -module(lcnt_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -51,10 +51,21 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    % Test cases
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [load_v1, conflicts, locations, swap_keys].
 
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %%----------------------------------------------------------------------
 %% Tests
 %%----------------------------------------------------------------------
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index 72dccdb465..524ed04af4 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -18,12 +18,13 @@
 %%
 -module(make_SUITE).
 
--export([all/1, make_all/1, make_files/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, make_all/1, make_files/1]).
 -export([otp_6057_init/1,
 	 otp_6057_a/1, otp_6057_b/1, otp_6057_c/1,
 	 otp_6057_end/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -include_lib("kernel/include/file.hrl").
 
@@ -35,9 +36,27 @@
 %% that the file :"test5.erl" shall be compiled with the 'S' option,
 %% i.e. produce "test5.S" instead of "test5.<objext>"
 
-all(suite) -> [make_all, make_files,
-	       {conf, otp_6057_init,
-		[otp_6057_a,otp_6057_b,otp_6057_c], otp_6057_end}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [make_all, make_files, {group, otp_6057}].
+
+groups() -> 
+    [{otp_6057,[],[otp_6057_a, otp_6057_b,
+		   otp_6057_c]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    otp_6057_init(Config).
+
+end_per_group(_GroupName, Config) ->
+    otp_6057_end(Config).
+
 
 test_files() -> ["test1", "test2", "test3", "test4"].
 
@@ -146,7 +165,7 @@ otp_6057_init(Config) when is_list(Config) ->
 otp_6057_a(suite) ->
     [];
 otp_6057_a(doc) ->
-    ["Test that make:all/0 looks for object file in correct place"];
+    ["Test that make:all/0, suite/0 looks for object file in correct place"];
 otp_6057_a(Config) when is_list(Config) ->
     ?line PrivDir = ?config(priv_dir, Config),
 
diff --git a/lib/tools/test/tools.cover b/lib/tools/test/tools.cover
new file mode 100644
index 0000000000..1053be4f0f
--- /dev/null
+++ b/lib/tools/test/tools.cover
@@ -0,0 +1,2 @@
+{incl_app,tools,details}.
+
diff --git a/lib/tools/test/tools.spec b/lib/tools/test/tools.spec
index 93d5930472..1b07cf1cb6 100644
--- a/lib/tools/test/tools.spec
+++ b/lib/tools/test/tools.spec
@@ -1 +1 @@
-{topcase, {dir, "../tools_test"}}.
+{suites,"../tools_test",all}.
diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl
index 6b952f10ab..69dfab8fe7 100644
--- a/lib/tools/test/tools_SUITE.erl
+++ b/lib/tools/test/tools_SUITE.erl
@@ -18,28 +18,45 @@
 %%
 -module(tools_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
 -define(application, tools).
 
 %% Test server specific exports
--export([all/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases must be exported.
 -export([app_test/1]).
 
-all(doc) ->
-    [];
-all(suite) ->
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
     [app_test].
 
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index f9d062ef85..1fad070b67 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -29,28 +29,29 @@
 -define(privdir, "xref_SUITE_priv").
 -define(copydir, "xref_SUITE_priv/datacopy").
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(format(S, A), ok).
 -define(datadir, ?config(data_dir, Conf)).
 -define(privdir, ?config(priv_dir, Conf)).
 -define(copydir, ?config(copy_dir, Conf)).
 -endif.
 
--export([all/1, init/1, fini/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, init/1, fini/1]).
 
--export([xref/1,
+-export([
 	 addrem/1, convert/1, intergraph/1, lines/1, loops/1,
 	 no_data/1, modules/1]).
 
--export([files/1,
+-export([
 	 add/1, default/1, info/1, lib/1, read/1, read2/1, remove/1,
 	 replace/1, update/1, deprecated/1, trycatch/1,
          abstract_modules/1, fun_mfa/1, qlc/1]).
 
--export([analyses/1,
+-export([
 	 analyze/1, basic/1, md/1, q/1, variables/1, unused_locals/1]).
 
--export([misc/1,
+-export([
 	 format_error/1, otp_7423/1, otp_7831/1]).
 
 -import(lists, [append/2, flatten/1, keysearch/3, member/2, sort/1, usort/1]).
@@ -59,7 +60,7 @@
 	range/1, relation_to_family/1, set/1, to_external/1,
 	union/2]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Checks some info counters of a server and some relations that should hold.
 -export([check_count/1, check_state/1]).
@@ -68,8 +69,36 @@
 
 -include_lib("tools/src/xref.hrl").
 
-all(suite) ->
-    {conf, init, [xref, files, analyses, misc], fini}.
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, xref}, {group, files}, {group, analyses},
+     {group, misc}].
+
+groups() -> 
+    [{xref, [],
+      [addrem, convert, intergraph, lines, loops, no_data,
+       modules]},
+     {files, [],
+      [add, default, info, lib, read, read2, remove, replace,
+       update, deprecated, trycatch, abstract_modules, fun_mfa,
+       qlc]},
+     {analyses, [],
+      [analyze, basic, md, q, variables, unused_locals]},
+     {misc, [], [format_error, otp_7423, otp_7831]}].
+
+init_per_suite(Config) ->
+    init(Config).
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 init(Conf) when is_list(Conf) ->
     DataDir = ?datadir,
@@ -91,13 +120,11 @@ init_per_testcase(_Case, Config) ->
     Dog=?t:timetrap(?t:minutes(2)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, _Config) ->
+end_per_testcase(_Case, _Config) ->
     Dog=?config(watchdog, _Config),
     test_server:timetrap_cancel(Dog),
     ok.
 
-xref(suite) ->
-    [addrem, convert, intergraph, lines, loops, no_data, modules].
 
 %% Seems a bit short...
 addrem(suite) -> [];
@@ -680,9 +707,6 @@ modules(Conf) when is_list(Conf) ->
     ?line ok = xref_base:delete(S),
     ok.
 
-files(suite) ->
-    [add, default, info, lib, read, read2, remove, replace, update,
-     deprecated, trycatch, abstract_modules, fun_mfa, qlc].
 
 add(suite) -> [];
 add(doc) -> ["Add modules, applications, releases, directories"];
@@ -1788,8 +1812,6 @@ qlc(Conf) when is_list(Conf) ->
     ok.
 
 
-analyses(suite) ->
-    [analyze, basic, md, q, variables, unused_locals].
 
 analyze(suite) -> [];
 analyze(doc) -> ["Simple analyses"];
@@ -2312,8 +2334,6 @@ unused_locals(Conf) when is_list(Conf) ->
     ?line ok = file:delete(Beam2),
     ok.
 
-misc(suite) ->
-    [format_error, otp_7423, otp_7831].
 
 format_error(suite) -> [];
 format_error(doc) -> ["Format error messages"];
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index 13cf5af9f5..0c89b18065 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1,19 +1 @@
-# This is an -*-makefile-*- file.
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2009. 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%
-
-TOOLS_VSN = 2.6.5.1
+TOOLS_VSN = 2.6.6.2
diff --git a/lib/tv/doc/src/notes.xml b/lib/tv/doc/src/notes.xml
index 62fab2f0f1..388bb82c91 100644
--- a/lib/tv/doc/src/notes.xml
+++ b/lib/tv/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>TV Release Notes</title>
@@ -30,6 +30,38 @@
   </header>
   <p>This document describes the changes made to the TV application.</p>
 
+<section><title>TV 2.1.4.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    With some window managers (e.g. stumpwm), <c>tv</c> would
+	    constantly restart while trying to open a table. (Thanks
+	    to Dmitriy Budashny.)</p>
+          <p>
+	    Own Id: OTP-8751</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>TV 2.1.4.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Warnings due to new autoimported BIFs removed</p>
+          <p>
+	    Own Id: OTP-8674 Aux Id: OTP-8579 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>TV 2.1.4.4</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/tv/src/tv_pg_gridfcns.erl b/lib/tv/src/tv_pg_gridfcns.erl
index ab88e2864f..3d23c8a69f 100644
--- a/lib/tv/src/tv_pg_gridfcns.erl
+++ b/lib/tv/src/tv_pg_gridfcns.erl
@@ -205,8 +205,8 @@ resize_grid(NewWidth, NewHeight, ProcVars) ->
 	check_nof_cols(ColsShown, (NofColsShown - NofCols), ColFrameIds, ColIds, 
 		       RowIds, NofRows, RowHeight, FgColor, BgColor ),
 
-    clear_fields(lists:nthtail(NofColsShown, NewColIds), 
-		 lists:nthtail(NofRowsShown, NewRowIds)),
+    clear_fields(safe_nthtail(NofColsShown, NewColIds),
+		 safe_nthtail(NofRowsShown, NewRowIds)),
 
     RowsToUpdate = lists:sublist(NewRowIds, NofRowsShown),
 
@@ -279,7 +279,7 @@ resize_grid_column(RealCol, VirtualCol, Xdiff, ProcVars) ->
 
        % Update the ColWidths list.
     TempColWidths = lists:sublist(ColWidths, VirtualCol - 1) ++ 
-	[NewWidthOfCol | lists:nthtail(VirtualCol, ColWidths)],
+	[NewWidthOfCol | safe_nthtail(VirtualCol, ColWidths)],
     
        % Check the other columns, whether a new column has to be created.
     ColsShown    = compute_cols_shown(FirstColShown, TempColWidths, GridWidth, 
@@ -455,8 +455,8 @@ scroll_grid_horizontally(NewFirstColShown, ProcVars) ->
     refresh_visible_rows(RowsToUpdate, NewFirstColShown, NofColsShown, RowDataList, ListAsStr),
 
        % Clear fields currently not visible.
-    clear_fields(lists:nthtail(NofColsShown, NewColIds), 
-		 lists:nthtail(NofRowsShown, NewRowIds)),
+    clear_fields(safe_nthtail(NofColsShown, NewColIds),
+		 safe_nthtail(NofRowsShown, NewRowIds)),
 
     
     NewGridP = GridP#grid_params{nof_cols        = NewNofCols,
@@ -1565,7 +1565,7 @@ update_col_widths(ColsShown, ColWidths, FirstColShown, DefaultColWidth) ->
     if 
 	NecessaryNofVirtualCols > NofVirtualCols ->
 	    TailNo = NofVirtualCols - FirstColShown + 1,   % Always >= 0 !!!
-	    NewColWidths ++ lists:nthtail(TailNo, ColsShown);
+	    NewColWidths ++ safe_nthtail(TailNo, ColsShown);
 	true ->
 	    NewColWidths
     end.
@@ -1653,7 +1653,7 @@ compute_cols_shown(FirstColShown, ColWidths, GridWidth, _NofCols, DefaultColWidt
 			ColWidthsLength < FirstColShown ->
 			    [];
 			true ->
-			    lists:nthtail(FirstColShown - 1, ColWidths)
+			    safe_nthtail(FirstColShown - 1, ColWidths)
 		    end,
     compute_cols_shown(UsedColWidths, GridWidth, DefaultColWidth).
 
@@ -1894,3 +1894,21 @@ extract_ids_for_one_row(N, [ColIds | Tail]) ->
 %%%---------------------------------------------------------------------
 %%% END of functions used to create the grid.
 %%%---------------------------------------------------------------------
+
+
+%%======================================================================
+%% Function:
+%%
+%% Return Value:
+%%
+%% Description:
+%%
+%% Parameters:
+%%======================================================================
+
+
+safe_nthtail(_, []) -> [];
+safe_nthtail(1, [_|T]) -> T;
+safe_nthtail(N, [_|T]) when N > 1 ->
+    safe_nthtail(N - 1, T);
+safe_nthtail(0, L) when is_list(L) -> L.
diff --git a/lib/tv/vsn.mk b/lib/tv/vsn.mk
index be1981b755..958aa0ea42 100644
--- a/lib/tv/vsn.mk
+++ b/lib/tv/vsn.mk
@@ -1,20 +1 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2009. 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%
-#
-
-TV_VSN = 2.1.4.4
+TV_VSN = 2.1.4.6
diff --git a/lib/typer/src/typer.erl b/lib/typer/src/typer.erl
index cebe6ea488..e19614f911 100644
--- a/lib/typer/src/typer.erl
+++ b/lib/typer/src/typer.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. 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
@@ -26,6 +26,8 @@
 
 -module(typer).
 
+%% Avoid warning for local function error/1 clashing with autoimported BIF.
+-compile({no_auto_import,[error/1]}).
 -export([start/0]).
 -export([error/1, compile_error/1]).	% for error reporting
 
diff --git a/lib/typer/vsn.mk b/lib/typer/vsn.mk
index 285fa62da3..7f4aabb335 100644
--- a/lib/typer/vsn.mk
+++ b/lib/typer/vsn.mk
@@ -1 +1 @@
-TYPER_VSN = 0.1.7.4
+TYPER_VSN = 0.1.7.5
diff --git a/lib/webtool/doc/src/notes.xml b/lib/webtool/doc/src/notes.xml
index dc325b5b61..5179f37db2 100644
--- a/lib/webtool/doc/src/notes.xml
+++ b/lib/webtool/doc/src/notes.xml
@@ -31,6 +31,23 @@
   <p>This document describes the changes made to the Webtool
     application.</p>
 
+<section><title>WebTool 0.8.7</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Up until now Netscape has been the default web browser on
+	    Unix/Linux. Webtool has now been updated to start Firefox
+	    as default browser instead.</p>
+          <p>
+	    Own Id: OTP-8651 Aux Id: OTP-8650 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>WebTool 0.8.6</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/webtool/doc/src/start_webtool.xml b/lib/webtool/doc/src/start_webtool.xml
index 184285c631..b525b38845 100644
--- a/lib/webtool/doc/src/start_webtool.xml
+++ b/lib/webtool/doc/src/start_webtool.xml
@@ -4,7 +4,7 @@
 <comref>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>start_webtool</title>
@@ -56,7 +56,7 @@ Or  http://127.0.0.1:8888/
 Usage: start_webtool application [ browser ]
 
 Available applications are: [orber,appmon,crashdump_viewer,webcover]
-Default browser is 'iexplore' (Internet Explorer) on Windows or else 'netscape'        </pre>
+Default browser is 'iexplore' (Internet Explorer) on Windows or else 'firefox'        </pre>
         <p>To start any of the listed applications, give the
           application name as the first argument, e.g.</p>
         <pre>
@@ -68,7 +68,7 @@ Starting webcover...
 Sending URL to netscape...done        </pre>
         <p>The WebTool application WebCover is then started and the
           default browser is used. The default browser is Internet
-          Explorer on Windows or else Netscape.
+          Explorer on Windows or else Firefox.
           </p>
         <p>To use another browser, give the browser's start command
           as the second argument, e.g.</p>
diff --git a/lib/webtool/src/webtool.erl b/lib/webtool/src/webtool.erl
index 51d821751c..1be903b827 100644
--- a/lib/webtool/src/webtool.erl
+++ b/lib/webtool/src/webtool.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. 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(webtool).
@@ -139,7 +139,7 @@ script_start([App]) ->
     DefaultBrowser = 
 	case os:type() of
 	    {win32,_} -> iexplore;
-	    _ -> netscape
+	    _ -> firefox
 	end,
     script_start([App,DefaultBrowser]);
 script_start([App,Browser]) ->
@@ -159,6 +159,8 @@ script_start([App,Browser]) ->
 			  "http://localhost:" ++ PortStr ++ "/" ++ StartPage
 		  end,
 	    case Browser of 
+		none ->
+		    ok;
                 iexplore when OSType == win32->
                     io:format("Starting internet explorer...\n"),
                     {ok,R} = win32reg:open(""),
@@ -170,7 +172,7 @@ script_start([App,Browser]) ->
 		_ when OSType == win32 ->
                     io:format("Starting ~w...\n",[Browser]),
                     os:cmd("\"" ++ atom_to_list(Browser) ++ "\" " ++ Url);
-		B when B==netscape; B==mozilla ->
+		B when B==firefox; B==mozilla ->
 		    io:format("Sending URL to ~w...",[Browser]),
 		    BStr = atom_to_list(Browser),
 		    SendCmd = BStr ++ " -raise -remote \'openUrl(" ++ 
@@ -209,7 +211,7 @@ usage() ->
       "\nUsage: start_webtool application [ browser ]\n"
       "\nAvailable applications are: ~p\n"
       "Default browser is \'iexplore\' (Internet Explorer) on Windows "
-      "or else \'netscape\'\n",
+      "or else \'firefox\'\n",
       [Apps]),
     stop().
 
diff --git a/lib/webtool/vsn.mk b/lib/webtool/vsn.mk
index 712e3abbaf..6b76883330 100644
--- a/lib/webtool/vsn.mk
+++ b/lib/webtool/vsn.mk
@@ -1 +1 @@
-WEBTOOL_VSN=0.8.6
+WEBTOOL_VSN=0.8.7
diff --git a/lib/wx/.gitignore b/lib/wx/.gitignore
new file mode 100644
index 0000000000..fd76f078d7
--- /dev/null
+++ b/lib/wx/.gitignore
@@ -0,0 +1,2 @@
+test_log_*
+wx_test_case_info
diff --git a/lib/wx/Makefile b/lib/wx/Makefile
index 83f545b662..0bc89e08ad 100644
--- a/lib/wx/Makefile
+++ b/lib/wx/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2008-2009. All Rights Reserved.
+# Copyright Ericsson AB 2008-2010. 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
@@ -23,7 +23,7 @@ SUBDIRS = src
 ifeq ($(CAN_BUILD_DRIVER), true) 
 SUBDIRS += c_src 
 endif 
-SUBDIRS += examples demos doc/src
+SUBDIRS += examples doc/src
 CLEANDIRS = $(SUBDIRS) api_gen
 
 ifeq ($(INSIDE_ERLSRC),true)
diff --git a/lib/wx/api_gen/Makefile b/lib/wx/api_gen/Makefile
index c6b65b60bc..756ec598ce 100644
--- a/lib/wx/api_gen/Makefile
+++ b/lib/wx/api_gen/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2008-2009. All Rights Reserved.
+# Copyright Ericsson AB 2008-2010. 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
@@ -39,14 +39,14 @@ TARGET_CDIR = ../c_src/gen
 C_TARGETS   = wxe_funcs.cpp
 GL_C_TARGETS = gl_funcs.cpp
 
-WX = $(TARGET_CDIR)/$(C_TARGETS)
+WX = wx_code_generated
 
-GL = $(TARGET_CDIR)/$(GL_C_TARGETS)
+GL = gl_code_generated
 
 opt:  $(WX) $(GL)
 
 $(WX): wxxml_generated $(COMPILER_T) wxapi.conf $(wildcard wx_extra/wx*.c_src) $(wildcard wx_extra/wx*.erl)
-	erl -noshell -run wx_gen code
+	erl -noshell -run wx_gen code && touch wx_code_generated
 
 wxxml_generated:  wx_doxygen.conf wx_extra/bugs.h wx_extra/wxe_evth.h
 	sed -e 's|@WXGTK_DIR@|$(WXGTK_DIR)|g' wx_doxygen.conf > wx_doxygen
@@ -56,9 +56,8 @@ glxml_generated: gl_doxygen.conf
 	sed -e 's|@GL_DIR@|$(GL_DIR)|g' gl_doxygen.conf > gl_doxygen
 	doxygen gl_doxygen && touch glxml_generated
 
-
 $(GL): glxml_generated $(GL_COMP_T) glapi.conf
-	erl -noshell -run gl_gen code
+	erl -noshell -run gl_gen code && touch gl_code_generated
 
 %.beam: %.erl wx_gen.hrl gl_gen.hrl
 	$(ERLC) -W $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) $< -o$(EBIN)
@@ -66,7 +65,7 @@ $(GL): glxml_generated $(GL_COMP_T) glapi.conf
 # TODO split cleans into separate targets?
 complete_clean:
 	rm -f gl_doxygen wx_doxygen wx_xml/*.x* gl_xml/*.x* 
-	rm -f glxml_generated  wxxml_generated
+	rm -f *_generated
 	$(MAKE) clean
 clean: 
 	rm -f *~
diff --git a/lib/wx/api_gen/gen_util.erl b/lib/wx/api_gen/gen_util.erl
index 859317bdef..b53f817ce0 100644
--- a/lib/wx/api_gen/gen_util.erl
+++ b/lib/wx/api_gen/gen_util.erl
@@ -40,6 +40,10 @@ strip_name([H|R1],[H|R2]) ->
     strip_name(R1,R2);
 strip_name(String,[]) -> String.
 
+
+get_hook(_Type, undefined) -> ignore;
+get_hook(Type, List) -> proplists:get_value(Type, List, ignore).
+  
 open_write(File) ->
     %% io:format("Generating ~s~n",[File]),
     {ok, Fd} = file:open(File++".temp", [write]),
@@ -58,10 +62,10 @@ close() ->
 		[] -> 
 		    ok = file:delete(File ++ ".temp"),
 		    %% So that make understands that we have made this
-		    case os:getenv("CLEARCASE_ROOT") of
-			false -> os:cmd("touch " ++ File);
-			_ ->  ignore
-		    end,
+		    %% case os:getenv("CLEARCASE_ROOT") of
+		    %% 	false -> os:cmd("touch " ++ File);
+		    %% 	_ ->  ignore
+		    %% end,
 		    ok;
 		Diff ->
 		    case check_diff(Diff) of
diff --git a/lib/wx/api_gen/gl_gen.erl b/lib/wx/api_gen/gl_gen.erl
index 42802c6de7..374e0bd12b 100644
--- a/lib/wx/api_gen/gl_gen.erl
+++ b/lib/wx/api_gen/gl_gen.erl
@@ -67,7 +67,7 @@ gen_code() ->
 
     gl_gen_erl:gl_defines(GLDefines),
     gl_gen_erl:gl_api(GLFuncs),
-    gl_gen_erl:gen_debug(GLFuncs,GLUFuncs),
+    %%gl_gen_erl:gen_debug(GLFuncs,GLUFuncs),
     gl_gen_c:gen(GLFuncs,GLUFuncs),
     ok.
 
@@ -206,10 +206,10 @@ parse_define([], D, _Opts) ->
 
 parse_func(Xml, Opts) ->
     {Func,_} = foldl(fun(X,Acc) -> parse_func(X,Acc,Opts) end, {#func{},1}, Xml),
+    put(current_func, Func#func.name),
     #func{params=Args0,type=Type0} = Func,
     Args = filter(fun(#arg{type=void}) -> false; (_) -> true end, Args0),
-    #arg{type=Type} = 
-	patch_param(Func#func.name,#arg{name="result",type=Type0},Opts),
+    #arg{type=Type} = patch_param(Func#func.name,#arg{name="result",type=Type0},Opts),
     Func#func{params=reverse(Args), type=Type}.
 
 parse_func(#xmlElement{name=type, content=C}, {F,AC}, Os) ->
@@ -220,6 +220,7 @@ parse_func(#xmlElement{name=name, content=[#xmlText{value=C}]},{F,AC},Os) ->
     put(current_func, Func),
     {F#func{name=name(Func,Os)},AC};
 parse_func(#xmlElement{name=param, content=C},{F,AC},Os) -> 
+    put(current_func, F#func.name),
     Parse  = fun(Con, Ac) -> parse_param(Con, Ac, Os) end,
     Param0 = foldl(Parse, #arg{}, drop_empty(C)),
     Param = fix_param_name(Param0, F, AC),
@@ -314,11 +315,17 @@ handle_arg_opt(both, P) -> P#arg{in=both};
 handle_arg_opt(binary, P=#arg{type=T}) -> 
     P#arg{type=T#type{size=undefined,base=binary}};
 handle_arg_opt({binary,Sz}, P=#arg{type=T}) -> 
-    P#arg{type=T#type{size=Sz,base=binary}};
+    P#arg{type=T#type{size={Sz, Sz},base=binary}};
+handle_arg_opt({binary,Max, Sz}, P=#arg{type=T}) -> 
+    P#arg{type=T#type{size={Max, Sz},base=binary}};
 handle_arg_opt({type,Type}, P=#arg{type=T}) -> P#arg{type=T#type{name=Type}};
 handle_arg_opt({single,Opt},P=#arg{type=T}) -> P#arg{type=T#type{single=Opt}};
+handle_arg_opt({base,{Opt, Sz}},  P=#arg{type=T}) -> P#arg{type=T#type{base=Opt, size=Sz}};
 handle_arg_opt({base,Opt},  P=#arg{type=T}) -> P#arg{type=T#type{base=Opt}};
-handle_arg_opt({c_only,Opt},P) -> P#arg{where=c, alt=Opt}.
+handle_arg_opt({c_only,Opt},P) -> P#arg{where=c, alt=Opt};
+handle_arg_opt(string,  P=#arg{type=T}) -> P#arg{type=T#type{base=string}};
+handle_arg_opt({string,Max,Sz}, P=#arg{type=T}) ->
+    P#arg{type=T#type{base=string, size={Max,Sz}}}.
 
 parse_type([], _Os) -> void;
 parse_type(C, Os) -> 
@@ -367,6 +374,8 @@ parse_type2([N="GLbitfield"|R],T,Opts) ->
     parse_type2(R,T#type{name=N, size=4, base=int},Opts);
 parse_type2([N="GLvoid"|R],T,Opts) -> 
     parse_type2(R,T#type{name=N, base=idx_binary},Opts);
+parse_type2([N="GLsync"|R],T,Opts) -> 
+    parse_type2(R,T#type{name=N, base=int, size=8},Opts);
 
 parse_type2([N="GLbyte"|R],T,Opts) -> 
     parse_type2(R,T#type{name=N, size=1, base=int},Opts);
@@ -378,6 +387,11 @@ parse_type2([N="GLushort"|R],T,Opts) ->
     parse_type2(R,T#type{name=N, size=2, base=int},Opts);
 parse_type2([N="GLint"|R],T,Opts) -> 
     parse_type2(R,T#type{name=N, size=4, base=int},Opts);
+parse_type2([N="GLint64"|R],T,Opts) -> 
+    parse_type2(R,T#type{name=N, size=8, base=int},Opts);
+parse_type2([N="GLuint64"|R],T,Opts) -> 
+    parse_type2(R,T#type{name=N, size=8, base=int},Opts);
+
 parse_type2([N="GLuint"|R],T,Opts) -> 
     parse_type2(R,T#type{name=N, size=4, base=int},Opts);
 parse_type2([N="GLsizei"|R],T,Opts) -> 
@@ -548,8 +562,10 @@ setup_idx_binary(Name,Ext,_Opts) ->
 
     %% Ok warn if single is undefined
     lists:foreach(fun(#arg{type=#type{base=memory}}) -> ok;
+		     (#arg{type=#type{base=string}}) -> ok;
 		     (#arg{type=#type{base=idx_binary}}) -> ok;
 		     (#arg{type=#type{name="GLUquadric"}}) -> ok;
+		     (#arg{type=#type{base=binary, size=Sz}}) when Sz =/= undefined -> ok;
 		     (A=#arg{type=#type{single=undefined}}) -> 
 			  ?warning("~p Unknown size of~n ~p~n",
 				   [get(current_func),A]),
diff --git a/lib/wx/api_gen/gl_gen_c.erl b/lib/wx/api_gen/gl_gen_c.erl
index 3293050ab9..0f5cb0e1f4 100644
--- a/lib/wx/api_gen/gl_gen_c.erl
+++ b/lib/wx/api_gen/gl_gen_c.erl
@@ -47,34 +47,29 @@ gen(GLFuncs, GLUFuncs) ->
     w("/***** This file is generated do not edit ****/~n~n", []),
     w("#include <stdio.h>~n", []),
     w("#include <string.h>~n", []),    
-    w("#include \"../wxe_impl.h\"~n", []),
-    w("#include \"../wxe_gl.h\"~n", []),
-    w("#include \"gl_fdefs.h\"~n", []),
+    w("#include \"../egl_impl.h\"~n", []),
+    w("#include \"gl_fdefs.h\"~n~n", []),
+    w("extern gl_fns_t gl_fns[];~n~n", []),
 
-    w("~nint gl_error_op;~n", []),
-    w("void gl_dispatch(int op, char *bp,ErlDrvTermData caller,WXEBinRef *bins[]){~n",
+    w("void egl_dispatch(int op, char *bp, ErlDrvPort port, "
+      "ErlDrvTermData caller, char *bins[], int bins_sz[]){~n",
       []),
-    w(" gl_error_op = op;~n", []),
-    w(" if(caller != gl_active) {~n", []),
-    w("   wxGLCanvas * current = glc[caller];~n", []),
-    w("   if(current) { gl_active = caller; current->SetCurrent();}~n", []),
-    w("   else {~n "
-      "      ErlDrvTermData rt[] = // Error msg~n"
-      "      {ERL_DRV_ATOM, driver_mk_atom((char *) \"_wxe_error_\"),~n"
-      "       ERL_DRV_INT,  op,~n" 
-      "       ERL_DRV_ATOM, driver_mk_atom((char *) \"no_gl_context\"),~n"
-      "       ERL_DRV_TUPLE,3};~n"
-      "      driver_send_term(WXE_DRV_PORT,caller,rt,8);~n"
-      "      return ;~n   }~n };~n~n", []),
-
+    w(" try {~n",[]),
     w(" switch(op)~n{~n",[]),
-    w(" case 5000:~n   wxe_tess_impl(bp, caller);~n   break;~n", []),
-    w(" case WXE_BIN_INCR:~n   driver_binary_inc_refc(bins[0]->bin);~n   break;~n",[]),
-    w(" case WXE_BIN_DECR:~n   driver_binary_dec_refc(bins[0]->bin);~n   break;~n",[]),
+    w(" case 5000:~n   erl_tess_impl(bp, port, caller);~n   break;~n", []),
 
     [funcs(F) || F <- GLUFuncs],
     [funcs(F) || F <- GLFuncs],
     
+    w("}} catch (char *err_msg) {\n"
+      "int AP = 0; ErlDrvTermData rt[12];\n"
+      "rt[AP++] = ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) \"_egl_error_\");\n"
+      "rt[AP++] = ERL_DRV_INT; rt[AP++] = (int) op;\n"
+      "rt[AP++] = ERL_DRV_ATOM; rt[AP++] = driver_mk_atom((char *) err_msg);\n"
+      "// rt[AP++] = ERL_DRV_ATOM; rt[AP++] = driver_mk_atom((char *) gl_fns[op-GLE_GL_FUNC_START].name);\n"
+      "// rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;\n"
+      "rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 3;\n"
+      "driver_send_term(port,caller,rt,AP);\n", []),
     w("}} /* The End */~n~n",[]),
     
     close().
@@ -123,25 +118,53 @@ declare_var(A=#arg{name=N,in=false,type=#type{name=T,base=B,single={tuple,Sz}}})
     true = is_number(Sz), %% Assert
     w(" ~s ~s[~p] = {~s};~n", [T,N,Sz,args(fun zero/1,",",lists:duplicate(Sz,B))]),
     A;
-declare_var(A=#arg{name=N,in=false,type=#type{name=T,base=B,single={list,Sz}}}) when is_number(Sz) -> 
+declare_var(A=#arg{name=N,in=false,type=#type{name=T,base=B,single={list,Sz}}}) 
+  when is_number(Sz) -> 
     w(" ~s ~s[~p] = {~s};~n", [T,N,Sz,args(fun zero/1,",",lists:duplicate(Sz,B))]),
     A;
+declare_var(A=#arg{name=N,in=false,type=#type{name=T,base=string,size={Max,_}, single=Single}}) -> 
+    case is_integer(Max) of
+	true -> 
+	    w(" ~s ~s[~p];~n", [T,N,Max]);
+	false ->
+	    %% w(" ~s ~s[*~s];~n", [T,N,Max]),
+	    w(" ~s *~s;~n", [T,N]), 
+	    w(" ~s = (~s *) driver_alloc(sizeof(~s) * *~s);~n", [N,T,T,Max]),
+	    store_free(N)		
+	    %% case Single of
+	    %% 	{list, _, _} -> 
+	    %% 	    w(" ~s *~s_p = ~s;~n", [T,N,N]);
+	    %% 	_ -> ok
+	    %% end	    
+    end,
+    A;
+declare_var(A=#arg{name=N,in=false,type=#type{base=binary,size={MaxSz, _}}}) -> 
+    MaxSz == undefined andalso error({assert, A}),
+    case is_integer(MaxSz) of
+	true -> 
+	    w(" ErlDrvBinary *~s = driver_alloc_binary(~p);~n", [N,MaxSz]);
+	false ->
+	    w(" ErlDrvBinary *~s = driver_alloc_binary(*~s);~n", [N,MaxSz])
+    end,
+    A;
 declare_var(A=#arg{name=N,in=false,type=#type{name=T,single={list,ASz,_USz},mod=[]}}) -> 
     true = is_list(ASz), %% Assert
     w(" ~s *~s;~n", [T,N]), 
     w(" ~s = (~s *) driver_alloc(sizeof(~s) * *~s);~n", [N,T,T,ASz]),
     store_free(N),
-    A;
-declare_var(A=#arg{name=N,in=false,type=#type{name=T,base=binary,size=Sz}}) -> 
-    true = is_number(Sz), %% Assert
-    w(" ~s ~s[~p];~n", [T,N,Sz]),
+    %% w(" ~s ~s[*~s];~n", [T,N,ASz]),
     A;
 declare_var(A=#arg{in=false, type=#type{name="GLUquadric",by_val=false,single=true}}) ->
     A;
+declare_var(A=#arg{in=false, type=#type{base=string,by_val=false,single=true}}) ->
+    A;
 declare_var(A=#arg{name=N,in=false,
 		   type=#type{name=T,base=B,by_val=false,single=true}}) -> 
     w(" ~s ~s[1] = {~s};~n", [T,N,zero(B)]),
     A;
+declare_var(A=#arg{where=c, type=#type{name=T}, alt={size,Var}}) -> 
+    w(" ~s ~s_size = bins_sz[~p];~n", [T, Var, get(bin_count)]),
+    A;    
 declare_var(A=#arg{where=_}) -> 
     A.
 
@@ -171,10 +194,10 @@ decode_arg(P=#arg{where=c},A)   -> {P,A};
 decode_arg(P=#arg{in=false},A)  -> {P,A};
 
 decode_arg(P=#arg{name=Name,type=#type{name=Type,base=binary}},A0) ->
-    w(" ~s *~s = (~s *) bins[~p]->base;~n", [Type,Name,Type,next_id(bin_count)]),
+    w(" ~s *~s = (~s *) bins[~p];~n", [Type,Name,Type,next_id(bin_count)]),
     {P, A0};
 decode_arg(P=#arg{name=Name,type=#type{name=Type,base=memory}},A0) ->
-    w(" ~s *~s = (~s *) bins[~p]->base;~n", [Type,Name,Type,next_id(bin_count)]),
+    w(" ~s *~s = (~s *) bins[~p];~n", [Type,Name,Type,next_id(bin_count)]),
     {P, A0};
 decode_arg(P=#arg{name=Name,type=#type{name=T,base=string,single=list}},A0) ->
     A = align(4,A0),
@@ -219,7 +242,7 @@ decode_arg(P=#arg{name=Name,type=#type{name=Type,base=guard_int}},A0) ->
     {P, A};
 decode_arg(P=#arg{name=Name,type=#type{name=Type,base=string,single=true}},A0) ->
     w(" ~s *~s = (~s *) bp;~n", [Type,Name,Type]),
-    w(" int ~sLen = strlen((char *)~s); bp += ~sLen+1+((8-((1+~sLen+~p)%8))%8);~n",
+    w(" int ~sLen[1] = {strlen((char *)~s)}; bp += ~sLen[0]+1+((8-((1+~sLen[0]+~p)%8))%8);~n",
       [Name,Name,Name,Name,A0]),
     {P, 0};
 decode_arg(P=#arg{name=Name,
@@ -288,6 +311,8 @@ result_type(#type{name=T, ref=undefined}) ->    T;
 result_type(#type{name=T, ref={pointer,1}, mod=Mods}) ->  
     mod(Mods) ++ T ++ " * ".
 
+call_arg(#arg{alt={size,Alt},type=#type{}}) ->
+    Alt ++ "_size";
 call_arg(#arg{alt={length,Alt},type=#type{}}) ->
     "*" ++ Alt ++ "Len";
 call_arg(#arg{alt={constant,Alt},type=#type{}}) ->
@@ -298,6 +323,8 @@ call_arg(#arg{name=Name,type=#type{single={list, _}}}) ->
     Name;
 call_arg(#arg{name=Name,type=#type{size=8,base=int,ref=undefined}}) ->
     Name;
+call_arg(#arg{name=Name,in=false,type=#type{name=T, base=binary}}) ->
+    "(" ++ T ++ "*) " ++ Name ++ "->orig_bytes";
 call_arg(#arg{name=Name,type=#type{ref=undefined}}) ->
     "*" ++ Name;
 call_arg(#arg{name=Name,type=#type{base=guard_int}}) ->
@@ -318,27 +345,27 @@ build_return_vals(Type,As) ->
 		true ->
 		    w(" int AP = 0; ErlDrvTermData rt[6];~n",[]),
 		    w(" rt[AP++]=ERL_DRV_ATOM;"
-		      " rt[AP++]=driver_mk_atom((char *) \"_wxe_result_\");~n",[]),
+		      " rt[AP++]=driver_mk_atom((char *) \"_egl_result_\");~n",[]),
 		    w(" rt[AP++]=ERL_DRV_ATOM;"
 		      " rt[AP++]=driver_mk_atom((char *) \"ok\");~n",[]),
 		    w(" rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;~n",[]),
-		    w(" driver_send_term(WXE_DRV_PORT,caller,rt,AP);~n",[]),
+		    w(" driver_send_term(port,caller,rt,AP);~n",[]),
 		    ok
 	    end;
 	{Val,Vars,Cnt} ->
 	    ExtraTuple = if Cnt > 1 -> 2; true -> 0 end,
-	    CSize = if Vars =:= none -> 
-			    Sz = integer_to_list(Val+4+ExtraTuple),
-			    w(" int AP = 0; ErlDrvTermData rt[~s];~n",[Sz]),
-			    Sz;
-		       true -> 
-			    Sz = integer_to_list(Val+4+ExtraTuple) ++ " + " ++ Vars,
-			    w(" int AP = 0; ErlDrvTermData *rt;~n",[]),
-			    w(" rt = (ErlDrvTermData *) "
-			      "driver_alloc(sizeof(ErlDrvTermData)*(~s));~n", [Sz]),
-			    Sz
-		    end,
-	    w(" rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) \"_wxe_result_\");~n",[]),
+	    if Vars =:= none -> 
+		    Sz = integer_to_list(Val+4+ExtraTuple),
+		    w(" int AP = 0; ErlDrvTermData rt[~s];~n",[Sz]),
+		    Sz;
+	       true -> 
+		    Sz = integer_to_list(Val+4+ExtraTuple) ++ " + " ++ Vars,
+		    w(" int AP = 0; ErlDrvTermData *rt;~n",[]),
+		    w(" rt = (ErlDrvTermData *) "
+		      "driver_alloc(sizeof(ErlDrvTermData)*(~s));~n", [Sz]),
+		    Sz
+	    end,
+	    w(" rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) \"_egl_result_\");~n",[]),
 	    FreeList = build_ret_types(Type,As),
 	    case Cnt of
 		1 -> ok;
@@ -346,9 +373,9 @@ build_return_vals(Type,As) ->
 		    w(" rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = ~p;~n",[Cnt])
 	    end,
 	    w(" rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;~n",[]),
-	    w(" if (AP != ~s )  fprintf(stderr, \"%d: ERROR AP mismatch %d %d\\r\\n\",__LINE__,AP,~s);~n",
-	      [CSize,CSize]),
-	    w(" driver_send_term(WXE_DRV_PORT,caller,rt,AP);~n",[]),
+	    %%w(" if (AP != ~s )  fprintf(stderr, \"%d: ERROR AP mismatch %d %d\\r\\n\",__LINE__,AP,~s);~n",
+	    %%  [CSize,CSize]),
+	    w(" driver_send_term(port,caller,rt,AP);~n",[]),
 	    case Vars of 
 		none -> ignore;
 		_ -> 		    
@@ -371,7 +398,7 @@ calc_sizes(Type,As) ->
 		       {Val, none} -> {Sz+Val, Vars, Cnt+1};
 		       {Val, Var} when Vars =:= none -> 			   
 			   {Sz+Val, Var,Cnt+1};
-		       {Val, Var} when Vars =:= none -> 
+		       {Val, Var}  -> 
 			   {Sz+Val, Var ++ " + " ++ Vars,Cnt+1}
 		   end;
 	      (_,Acc) -> Acc
@@ -379,13 +406,16 @@ calc_sizes(Type,As) ->
     foldl(Calc, TSz, As).
  
 return_size(_N,void) -> {0, none};
-return_size(_N,#type{base=binary}) ->                      {4, none};
-return_size(_N,#type{single=true}) ->                      {2,none};
 return_size(_N,#type{single={tuple,Sz}}) ->                {Sz*2+2, none};
-return_size(_N,#type{name="GLubyte",single={list,null}}) ->{3, none};
 return_size(_N,#type{single={list,Sz}})  ->                {Sz*2+3, none};
-return_size(_N,#type{base=string,single={list,_,_}}) ->    {3, none};
-return_size(_N,#type{single={list,_,Sz}}) ->               {3, "(*" ++Sz++")*2"}.
+return_size(_N,#type{base=string,single=true}) ->          {3, none};
+return_size(_N,#type{base=string,single=undefined}) ->     {3, none};
+return_size(_N,#type{base=string,single={list,_,"result"}}) ->   {3, "result*3"};
+return_size(_N,#type{base=string,single={list,_,Sz}}) ->   {3, "(*" ++Sz++")*3"};
+return_size(_N,#type{single={list,_,"result"}}) ->         {3, "result*2"};
+return_size(_N,#type{single={list,_,Sz}}) ->               {3, "(*" ++Sz++")*2"};
+return_size(_N,#type{base=binary}) ->                      {4, none};
+return_size(_N,#type{single=true}) ->                      {2, none}.
 
 
 build_ret_types(void,Ps) -> 
@@ -444,17 +474,27 @@ build_ret(Name,_Q,#type{name=T,base=_,single={tuple,Sz}}) ->
     [w(" rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *~s++;~n", [Temp]) 
      || _ <- lists:seq(1,Sz)],
     w(" rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = ~p;~n",[Sz]);
-build_ret(Name,_Q,#type{name="GLubyte",single={list,null}}) ->
+build_ret(Name,_Q,#type{base=string,size=1,single=true}) ->
     w(" rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) ~s;"
       " rt[AP++] = strlen((char *) ~s);\n", [Name, Name]);
-build_ret(Name,_Q,#type{base=string,single={list,_,Sz}}) ->
+build_ret(Name,_Q,#type{base=string, size={_Max,Sz}, single=S}) 
+  when S == true; S == undefined ->
     w(" rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) ~s;"
       " rt[AP++] = *~s;\n", [Name, Sz]);
+build_ret(Name,_Q,#type{name=_T,base=string,size={_, SSz}, single={list,_,Sz}}) ->
+    P = if Sz == "result" -> ["(int) "]; true -> "*" end,
+    w(" for(int i=0; i < ~s~s; i++) {\n", [P,Sz]),
+    w("    rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) ~s;"
+      " rt[AP++] = ~s[i]-1;\n", [Name, SSz]),
+    w("    ~s += ~s[i]; }~n", [Name, SSz]),
+    w(" rt[AP++] = ERL_DRV_NIL;", []),
+    w(" rt[AP++] = ERL_DRV_LIST; rt[AP++] = (~s~s)+1;~n",[P,Sz]);
 build_ret(Name,_Q,#type{name=_T,base=B,single={list,_,Sz}}) when B =/= float ->
-    w(" for(int i=0; i < *~s; i++) {\n", [Sz]),
+    P = if Sz == "result" -> ["(int) "]; true -> "*" end,
+    w(" for(int i=0; i < ~s~s; i++) {\n", [P,Sz]),
     w("    rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) ~s[i];}~n", [Name]),    
     w(" rt[AP++] = ERL_DRV_NIL;", []),
-    w(" rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*~s)+1;~n",[Sz]);
+    w(" rt[AP++] = ERL_DRV_LIST; rt[AP++] = (~s~s)+1;~n",[P,Sz]);
 build_ret(Name,_Q,#type{name=_T,size=FSz,base=float,single={list,Sz}}) ->
     Temp = Name ++ "Tmp",
     case FSz of
@@ -475,12 +515,14 @@ build_ret(Name,_Q,#type{name=T,base=_,single={list,Sz}}) ->
      || _ <- lists:seq(1,Sz)],
     w(" rt[AP++] = ERL_DRV_NIL;", []),
     w(" rt[AP++] = ERL_DRV_LIST; rt[AP++] = ~p+1;~n",[Sz]);
-build_ret(Name,_Q,#type{name="GLubyte",base=binary,size=Sz}) ->
-    w(" ErlDrvBinary * BinCopy = driver_alloc_binary(~p);~n", [Sz]), 
-    w(" memcpy(BinCopy->orig_bytes, ~s, ~p);~n",  [Name,Sz]),
-    w(" rt[AP++] = ERL_DRV_BINARY; rt[AP++] = (ErlDrvTermData) BinCopy;", []),
-    w(" rt[AP++] = ~p; rt[AP++] = 0;~n", [Sz]),
-    "driver_free_binary(BinCopy);";
+build_ret(Name,_Q,#type{base=binary,size={_,Sz}}) ->
+    w(" rt[AP++] = ERL_DRV_BINARY; rt[AP++] = (ErlDrvTermData) ~s;", [Name]),
+    if is_integer(Sz) ->
+	    w(" rt[AP++] = ~p; rt[AP++] = 0;~n", [Sz]);
+       is_list(Sz) ->
+	    w(" rt[AP++] = *~s; rt[AP++] = 0;~n", [Sz])
+    end,
+    "driver_free_binary(" ++ Name ++ ");";
 build_ret(Name,_Q,T=#type{}) ->
     io:format("{~p, {~p, {single,{tuple,X}}}}.~n", [get(current_func),Name]),
     io:format(" ~p~n",[T]).
@@ -496,6 +538,19 @@ gen_defines(GLFuncs,GLUFuncs) ->
     w("# define WXE_EXTERN~n", []),
     w("#else~n# define WXE_EXTERN extern~n", []),
     w("#endif~n~n", []),
+
+    w("typedef struct {\n"      
+      "   const char * name;\n"      
+      "   const char * alt;\n"
+      "   void * func;\n"
+      "} gl_fns_t;\n\n", []),
+
+    GLFirst = case hd(GLFuncs) of 
+		  [First|_] when is_list(First) -> get(First);
+		  First -> get(First)
+	      end,
+    w("#define GLE_GL_FUNC_START ~p~n", [GLFirst#func.id]),
+
     [fdefs(F) || F <- GLFuncs],
     [fdefs(F) || F <- GLUFuncs],
     close().
@@ -543,11 +598,7 @@ gl_gen_init(Funcs) ->
     open_write("../c_src/gen/gl_finit.h"),
     c_copyright(),
     w("/***** This file is generated do not edit ****/~n~n", []),
-    w("static struct {\n"      
-      "   const char * name;\n"      
-      "   const char * alt;\n"
-      "   void * func;\n"
-      "} gl_fns[] = \n"
+    w("gl_fns_t gl_fns[] = \n"
       "{\n", []),
     [finits(F) || F <- Funcs],
     w(" { NULL, NULL, NULL}};\n",[]),
diff --git a/lib/wx/api_gen/gl_gen_erl.erl b/lib/wx/api_gen/gl_gen_erl.erl
index ce35484561..f292c8723e 100644
--- a/lib/wx/api_gen/gl_gen_erl.erl
+++ b/lib/wx/api_gen/gl_gen_erl.erl
@@ -49,7 +49,7 @@ glu_defines(Defs) ->
     w("~n%% GLU DEFINITIONS~n~n", []),
     w("%% This file is generated DO NOT EDIT~n~n", []),
     [gen_define(Def) || Def=#def{} <- Defs],
-    close(), 
+    close(),
     ok.   
 
 gen_define(#def{name=N, val=Val, type=int}) ->
@@ -78,7 +78,11 @@ types() ->
      {"GLsizeiptr","64/native-unsigned"}, % 64 bits int, convert on c-side
      {"GLintptr",  "64/native-unsigned"}, % 64 bits int, convert on c-sidew
      {"GLUquadric", "64/native-unsigned"},% Handle 32bits aargh 64bits on mac64
-     {"GLhandleARB","64/native-unsigned"} % Handle 32bits aargh 64bits on mac64
+     {"GLhandleARB","64/native-unsigned"},% Handle 32bits aargh 64bits on mac64
+     
+     {"GLsync",     "64/native-unsigned"}, % Pointer to record
+     {"GLuint64",     "64/native-unsigned"},
+     {"GLint64",     "64/native-signed"}
     ].
 
 gl_api(Fs) ->
@@ -90,22 +94,53 @@ gl_api(Fs) ->
     w("%% See <a href=\"http://www.opengl.org/sdk/docs/man/\">www.opengl.org</a>~n",[]),
     w("%%~n", []),
     w("%% Booleans are represented by integers 0 and 1.~n~n", []),
-    w("%% @type wx_mem(). see wx.erl on memory allocation functions~n", []),
+    w("%% @type mem().    memory block~n", []),
     w("%% @type enum().   An integer defined in gl.hrl~n", []),    
     w("%% @type offset(). An integer which is an offset in an array~n", []),
     w("%% @type clamp().  A float clamped between 0.0 - 1.0~n", []),
     
     w("-module(gl).~n~n",[]),    
     w("-compile(inline).~n", []),
-    %%    w("-compile(export_all).~n~n", []),
-    %%    w("-compile(binary_comprehension).~n~n", []),
-    w("-include(\"wxe.hrl\").~n", []),
+%%    w("-include(\"wxe.hrl\").~n", []),
     [w("-define(~s,~s).~n", [GL,Erl]) || {GL,Erl} <- types()],
-    
+
+    gen_types(gl),
+   
     Exp = fun(F) -> gen_export(F) end,
     ExportList = lists:map(Exp,Fs),
     w("~n-export([~s]).~n~n", [args(fun(EF) -> EF end, ",", ExportList, 60)]),
-
+    w("-export([call/2, cast/2, send_bin/1]).~n",[]),
+    w("%% @hidden~n", []),
+    w("call(Op, Args) ->~n", []),
+    w("    Port = get(opengl_port), ~n", []),
+    w("    _ = erlang:port_control(Port,Op,Args),~n", []),
+    w("    rec().~n", []),
+    w("    ~n", []),
+    w("%% @hidden~n", []),
+    w("cast(Op, Args) ->~n", []),
+    w("    Port = get(opengl_port), ~n", []),
+    w("    _ = erlang:port_control(Port,Op,Args),~n", []),
+    w("    ok.~n", []),
+    w("    ~n", []),
+    w("%% @hidden~n", []),
+    w("rec() ->~n", []),
+    w("    receive ~n", []),
+    w("        {'_egl_result_', Res} -> Res;~n", []),
+    w("        {'_egl_error_',  Op, Res} -> error({error,Res,Op})~n", []),
+    w("    end. ~n", []),
+    w("~n", []),
+    w("%% @hidden~n", []),
+    w("send_bin(Bin) when is_binary(Bin) ->~n", []),
+    w("    Port = get(opengl_port), ~n", []),
+    w("    erlang:port_command(Port,Bin);~n", []),
+    w("send_bin(Tuple) when is_tuple(Tuple) ->~n", []),
+    w("    Port = get(opengl_port), ~n", []),
+    w("    case element(2, Tuple) of~n", []),
+    w("        Bin when is_binary(Bin) ->~n", []),
+    w("            erlang:port_command(Port,Bin)~n", []),
+    w("    end.~n", []),
+    w("~n", []),
+    
     w("~n%% API~n~n", []),
     [gen_funcs(F) || F <- Fs],
     close(), 
@@ -120,20 +155,22 @@ glu_api(Fs) ->
     w("%% See <a href=\"http://www.opengl.org/sdk/docs/man/\">www.opengl.org</a>~n",[]),
     w("%%~n", []),
     w("%% Booleans are represented by integers 0 and 1.~n~n", []),
-    w("%% @type wx_mem(). see wx.erl on memory allocation functions~n", []),
+    w("%% @type mem().    memory block~n", []),
     w("%% @type enum().   An integer defined in gl.hrl~n", []),    
     w("%% @type offset(). An integer which is an offset in an array~n", []),
     w("%% @type clamp().  A float clamped between 0.0 - 1.0~n~n", []),
 
     w("-module(glu).~n",[]),    
     w("-compile(inline).~n", []),
-    w("-include(\"wxe.hrl\").~n", []),
+    %%w("-include(\"wxe.hrl\").~n", []),
     [w("-define(~s,~s).~n", [GL,Erl]) || {GL,Erl} <- types()],
 
+    gen_types(glu),
+    
     Exp = fun(F) -> gen_export(F) end,
     ExportList = ["tesselate/2" | lists:map(Exp,Fs)],
     w("~n-export([~s]).~n~n", [args(fun(EF) -> EF end, ",", ExportList, 60)]),
-
+    w("-import(gl, [call/2,cast/2,send_bin/1]).", []),
     w("~n%% API~n~n", []),
 
     w("%% @spec (Vec3, [Vec3]) -> {Triangles, VertexPos}~n",[]),
@@ -148,13 +185,13 @@ glu_api(Fs) ->
       "%% may contain newly created vertices in the end.~n", []),
 
     w("tesselate({Nx,Ny,Nz}, Vs) ->~n",[]),
-    w("  wxe_util:call(5000, <<(length(Vs)):32/native,0:32,~n"
+    w("  call(5000, <<(length(Vs)):32/native,0:32,~n"
       "    Nx:?GLdouble,Ny:?GLdouble,Nz:?GLdouble,~n"
       "    (<< <<Vx:?GLdouble,Vy:?GLdouble,Vz:?GLdouble >>~n"
       "        || {Vx,Vy,Vz} <- Vs>>)/binary >>).~n~n", []),
 
     [gen_funcs(F) || F <- Fs],
-    close(), 
+    close(),
     ok.
 
 gen_funcs([F]) when is_list(F) ->
@@ -178,6 +215,17 @@ gen_funcs(F) ->
     erase(current_func),
     w(".~n~n",[]).
 
+gen_types(Where) ->    
+    case Where of
+	glu -> ignore;
+	gl ->
+	    w("-type clamp() :: float().~n", []),
+	    w("-type offset() :: non_neg_integer().~n", [])
+    end,
+    w("-type enum() :: non_neg_integer().~n", []),
+    w("-type mem() :: binary() | tuple().~n", []),
+    ok.
+
 gen_export(F) ->
     try gen_export_1(F)
     catch E:R ->
@@ -199,19 +247,27 @@ gen_export2(#func{name=Name,params=As0}) ->
     Args = lists:filter(fun(Arg) -> func_arg(Arg) =/= skip end, As0),
     erl_func_name(Name) ++ "/" ++ integer_to_list(length(Args)).
 
-
-gen_doc([#func{alt={vector,VecPos,Vec}}]) ->
+gen_doc([#func{name=Name, alt={vector,VecPos,Vec}}]) ->
     #func{type=T,params=As} = get(Vec), 
     {As1,As2} = lists:split(VecPos, As),
     Args1 = case args(fun func_arg/1, ",", As1) of [] -> []; Else -> Else++"," end,
     Args2 = args(fun func_arg/1, ",", As2),
-    w("%% @spec (~s{~s}) -> ~s~n",[Args1,Args2,doc_return_types(T,As)]), 
-    w("%% @equiv ~s(~s)~n",[erl_func_name(Vec), Args1++Args2]);
+    w("%% @spec (~s{~s}) -> ~s~n",[Args1,Args2,doc_return_types(T,As, doc)]), 
+    w("%% @equiv ~s(~s)~n",[erl_func_name(Vec), Args1++Args2]),
+    SA1 = case doc_arg_types(As1, spec) of [] -> []; E -> E++"," end,
+    SA2 = doc_arg_types(As2, spec),
+    w("-spec ~s(~s{~s}) -> ~s.~n",
+      [erl_func_name(Name), SA1, SA2, 
+       doc_return_types(T,As, spec)]);
+    
 gen_doc([#func{name=Name,type=T,params=As,alt=Alt}|_]) ->
-    w("%% @spec (~s) -> ~s~n", [doc_arg_types(As),doc_return_types(T,As)]),
+    w("%% @spec (~s) -> ~s~n", [doc_arg_types(As, doc),doc_return_types(T,As, doc)]),
     GLDoc = "http://www.opengl.org/sdk/docs/man/xhtml/",
     w("%% @doc See <a href=\"~s~s.xml\">external</a> documentation.~n",
-      [GLDoc, doc_name(Name,Alt)]).
+      [GLDoc, doc_name(Name,Alt)]),
+    w("-spec ~s(~s) -> ~s.~n",
+      [erl_func_name(Name), doc_arg_types(As, spec), doc_return_types(T,As, spec)]).
+
 
 gen_func(#func{name=Name,alt={vector,VecPos,Vec}}) ->
     #func{params=As} = get(Vec), 
@@ -229,9 +285,9 @@ gen_func(_F=#func{name=Name,type=T,params=As,id=MId}) ->
     {StrArgs,_} = marshal_args(PreAs),
     case have_return_vals(T,As) of
 	true ->
-	    w("  wxe_util:call(~p, <<~s>>)", [MId, StrArgs]);
+	    w("  call(~p, <<~s>>)", [MId, StrArgs]);
 	false ->
-	    w("  wxe_util:cast(~p, <<~s>>)", [MId, StrArgs])
+	    w("  cast(~p, <<~s>>)", [MId, StrArgs])
     end.
 
 func_arg(#arg{in=In,where=W,name=Name,type=Type}) 
@@ -249,60 +305,65 @@ func_arg(#arg{in=In,where=W,name=Name,type=Type})
     end;
 func_arg(_) -> skip.
 
-doc_arg_types(Ps0) ->
+doc_arg_types(Ps0, Type) ->
     Ps = [P || P=#arg{in=In, where=Where} <- Ps0,In =/= false, Where =/= c],
-    args(fun doc_arg_type/1, ",", Ps).
+    args(fun(Arg) -> doc_arg_type(Arg, Type) end, ",", Ps).
 
-doc_return_types(T, Ps0) ->
+doc_return_types(T, Ps0, Type) ->
     Ps = [P || P=#arg{in=In, where=Where} <- Ps0,In =/= true, Where =/= c],
-    doc_return_types2(T, Ps).
-
-doc_return_types2(void, []) ->    "ok";
-doc_return_types2(void, [#arg{type=T}]) ->     doc_arg_type2(T);
-doc_return_types2(T, []) ->                      doc_arg_type2(T);
-doc_return_types2(void, Ps) -> 
-    "{" ++ args(fun doc_arg_type/1,",",Ps) ++ "}";
-doc_return_types2(T, Ps) ->
-    "{" ++ doc_arg_type2(T) ++ "," ++ args(fun doc_arg_type/1,",",Ps) ++ "}".
-
-doc_arg_type(#arg{name=Name,type=T}) ->
+    doc_return_types2(T, Ps, Type).
+
+doc_return_types2(void, [], _) ->    "ok";
+doc_return_types2(void, [#arg{type=T}], _) ->     doc_arg_type2(T);
+doc_return_types2(T, [], _) ->                      doc_arg_type2(T);
+doc_return_types2(void, Ps, Type) -> 
+    "{" ++ args(fun(Arg) -> doc_arg_type(Arg, Type) end,",",Ps) ++ "}";
+doc_return_types2(T, Ps, Type) ->
+    "{" ++ doc_arg_type2(T) ++ "," ++ 
+	args(fun(Arg) -> doc_arg_type(Arg, Type) end,",",Ps) ++ "}".
+
+doc_arg_type(#arg{name=Name,type=T}, doc) ->
     try  
 	erl_arg_name(Name) ++ "::" ++ doc_arg_type2(T)
     catch _:Error ->
 	    io:format("Error: ~p ~p~n~p~n",[Name, Error, erlang:get_stacktrace()]),
 	    exit(error)
+    end;
+doc_arg_type(#arg{name=Name,type=T}, spec) ->
+    try  
+	doc_arg_type2(T)
+    catch _:Error ->
+	    io:format("Error spec: ~p ~p~n~p~n",[Name, Error, erlang:get_stacktrace()]),
+	    exit(error)
     end.
 
+
 doc_arg_type2(T=#type{single=true}) ->
     doc_arg_type3(T);
 doc_arg_type2(T=#type{single=undefined}) ->
     doc_arg_type3(T);
 doc_arg_type2(T=#type{single={tuple,undefined}}) ->
     "{" ++ doc_arg_type3(T) ++ "}";
-doc_arg_type2(T=#type{single={tuple,_Sz}}) ->
-    "{" ++ doc_arg_type3(T) ++ "}";
+doc_arg_type2(T=#type{single={tuple,Sz}}) ->
+    "{" ++ args(fun doc_arg_type3/1, ",", lists:duplicate(Sz,T)) ++ "}";
 doc_arg_type2(T=#type{single=list}) ->
     "[" ++ doc_arg_type3(T) ++ "]";
-doc_arg_type2(T=#type{single={list, Max}}) when is_integer(Max) ->
+doc_arg_type2(T=#type{single={list, _Max}}) ->
     "[" ++ doc_arg_type3(T) ++ "]";
-doc_arg_type2(_T=#type{single={list,null}}) ->
-    "string()";
-doc_arg_type2(T=#type{base=string}) ->
-    doc_arg_type3(T);
 doc_arg_type2(T=#type{single={list,_,_}}) ->
     "[" ++ doc_arg_type3(T) ++ "]";
-doc_arg_type2(T=#type{single={tuple_list,_TSz}}) ->
-    "[{" ++ doc_arg_type3(T) ++ "}]".
+doc_arg_type2(T=#type{single={tuple_list,Sz}}) ->
+    "[{" ++ args(fun doc_arg_type3/1, ",", lists:duplicate(Sz,T)) ++ "}]".
 
 doc_arg_type3(#type{name="GLenum"}) ->  "enum()";
 doc_arg_type3(#type{name="GLclamp"++_}) ->  "clamp()";
 doc_arg_type3(#type{base=int}) ->       "integer()";
 doc_arg_type3(#type{base=float}) ->     "float()";
-doc_arg_type3(#type{base=guard_int}) -> "offset()|binary()";
+doc_arg_type3(#type{base=guard_int}) -> "offset()|mem()";
 doc_arg_type3(#type{base=string}) ->    "string()";
 doc_arg_type3(#type{base=bool}) ->      "0|1";
 doc_arg_type3(#type{base=binary}) ->    "binary()";
-doc_arg_type3(#type{base=memory}) ->    "wx:wx_mem()".
+doc_arg_type3(#type{base=memory}) ->    "mem()".
 
 guard_test(As) -> 
     Str = args(fun(#arg{name=N,type=#type{base=guard_int}}) -> 
@@ -316,10 +377,10 @@ guard_test(As) ->
     end.	    
 
 pre_marshal([#arg{name=N,in=true,type=#type{base=binary}}|R]) -> 
-    w("  wxe_util:send_bin(~s),~n", [erl_arg_name(N)]),
+    w("  send_bin(~s),~n", [erl_arg_name(N)]),
     pre_marshal(R);
 pre_marshal([#arg{name=N,type=#type{base=memory}}|R]) -> 
-    w("  wxe_util:send_bin(~s#wx_mem.bin),~n", [erl_arg_name(N)]),
+    w("  send_bin(~s),~n", [erl_arg_name(N)]),
     pre_marshal(R);
 pre_marshal([A=#arg{name=N,type=#type{base=string,single=list}}|R]) ->
     %% With null terminations
@@ -595,6 +656,7 @@ gen_debug(GL, GLU) ->
     w("].~n~n", []),
     close().
 
+
 printd([F|R],Mod) when is_list(F) ->
     printd(F,Mod),
     printd(R,Mod);
diff --git a/lib/wx/api_gen/glapi.conf b/lib/wx/api_gen/glapi.conf
index f9ed7a1065..525ccf8b68 100644
--- a/lib/wx/api_gen/glapi.conf
+++ b/lib/wx/api_gen/glapi.conf
@@ -29,8 +29,35 @@
   "glMatrixIndexPointerARB",
   "glPixelTransformParameter", 
   %% OpengGL 3.0 
-  %"glGetTransformFeedbackVarying",  %% Jobbiga
-  %"glTransformFeedbackVaryings",
+
+  %% ARB 
+  "glCreateSyncFromCLeventARB",  % _cl_context _cl_event ??
+  "glDebugMessageCallbackARB",
+
+  "glGetn", %*
+  "glReadnPixels", %*
+  
+  "glVertexP2",  %*
+  "glVertexP3",  %*
+  "glVertexP4",  %*
+  "glTexCoordP1",  %*
+  "glTexCoordP2",  %*
+  "glTexCoordP3",  %*
+  "glTexCoordP4",  %*
+  "glMultiTexCoordP1",  %*
+  "glMultiTexCoordP2",  %*
+  "glMultiTexCoordP3",  %*
+  "glMultiTexCoordP4",  %*
+  "glNormalP3",  %*
+  "glColorP3",  %*
+  "glColorP4",  %*
+  "glSecondaryColorP3",  %*
+  "glVertexAttribP1",  %*
+  "glVertexAttribP2",  %*
+  "glVertexAttribP3",  %*
+  "glVertexAttribP4",  %*
+
+  "glGetActiveSubroutineUniformiv", %% Bad API don't know what to allocate needs to ask
 
   %% EXT
   %% By default skip these extensions
@@ -136,11 +163,12 @@
 
 {"glRect", [{"v1", {single,{tuple,2}}},{"v2", {single,{tuple,2}}}]}.
 
-{"glGetString",   {"result", {single,{list,null}}}}.
+{"glGetString",   {"result", string}}.
 {"glGetBooleanv", {"params", {single,{list,16}}}}.
 {"glGetDoublev",  {"params", {single,{list,16}}}}.
 {"glGetFloatv",   {"params", {single,{list,16}}}}.
 {"glGetIntegerv", {"params", {single,{list,16}}}}.
+{"glGetInteger64v", {"params", {single,{list,16}}}}.
 
 {"glFeedbackBuffer", {"buffer", [{base,memory}, in]}}.
 {"glSelectBuffer",   {"buffer", [{base,memory}, in]}}.
@@ -174,24 +202,24 @@
 {"glGetActiveAttribARB", [{"length",[skip,{single, true}]},
 			  {"size",  {single, true}},
 			  {"type",  {single, true}},
-			  {"name",  {single, {list,"maxLength","length"}}}
+			  {"name",  {string,"maxLength","length"}}
 			 ]}.
 
 {"glGetActiveAttrib", [{"length",[skip,{single, true}]},
 		       {"size",  {single, true}},
 		       {"type",  {single, true}},
-		       {"name",  {single, {list,"bufSize","length"}}}
+		       {"name",  {string,"bufSize","length"}}
 		      ]}.
 
 {"glGetActiveUniformARB", [{"length",[skip,{single, true}]},
 			   {"size",  {single, true}},
 			   {"type",  {single, true}},
-			   {"name",  {single, {list,"maxLength","length"}}}
+			   {"name",  {string,"maxLength","length"}}
 			  ]}.
 {"glGetActiveUniform", [{"length",[skip,{single, true}]},
 			{"size",  {single, true}},
 			{"type",  {single, true}},
-			{"name",  {single, {list,"bufSize","length"}}}
+			{"name",  {string,"bufSize","length"}}
 		       ]}.
 
 {"glGetAttachedShaders", [{"count", [skip,{single,true}]},
@@ -201,18 +229,18 @@
 {"glGetProgramiv", {"params", {single,true}}}.
 
 {"glGetProgramInfoLog", [{"length", [skip,{single,true}]},
-			 {"infoLog", {single, {list,"bufSize","length"}}}
+			 {"infoLog", {string,"bufSize","length"}}
 			]}.
 {"glGetShaderiv", {"params", {single,true}}}.
 {"glGetShaderInfoLog", [{"length", [skip,{single,true}]},
-			{"infoLog", {single, {list,"bufSize","length"}}}
+			{"infoLog", {string,"bufSize","length"}}
 		       ]}.
 
 {"glGetShaderSourceARB", [{"length", [skip,{single,true}]},
-			  {"source", {single, {list,"maxLength","length"}}}
+			  {"source", {string,"maxLength","length"}}
 			 ]}.
 {"glGetShaderSource", [{"length", [skip,{single,true}]},
-		       {"source", {single, {list,"bufSize","length"}}}
+		       {"source", {string,"bufSize","length"}}
 		      ]}.
 
 
@@ -239,7 +267,7 @@
 {"glMatrixIndex", [{"size",{c_only,{length,"indices"}}}, {"indices", {single,list}}]}.
 
 
-{"glProgramStringARB", [{"len",{c_only,{constant,"stringLen"}}},
+{"glProgramStringARB", [{"len",{c_only,{length,"string"}}},
 			{"string",[{base,string},{single,true}]}]}.
 {"glGetProgramStringARB", {"string", [in,{base,memory}]}}.
 {"glGenProgramsARB", {"programs", {single,{list,"n","n"}}}}.
@@ -250,7 +278,7 @@
 {"glGetProgramLocalParameter", {"params", {single,{tuple,4}}}}.
 {"glGetObjectParameter", {"params", {single,true}}}.
 {"glGetInfoLogARB", [{"length", [skip,{single,true}]},
-		     {"infoLog", {single, {list,"maxLength","length"}}}
+		     {"infoLog", {string,"maxLength","length"}}
 		    ]}.
 {"glGetAttachedObjectsARB", [{"count", [skip,{single,true}]},
 			     {"obj", {single, {list,"maxCount","count"}}}
@@ -280,9 +308,10 @@
 		  {"objW",[{single,true},out]}]}. 
 {"gluBuild", {"data", [binary]}}.
 {"gluScaleImage", [{"dataIn", [in, binary]}, {"dataOut", [in, {base, memory}]}]}.
-{"gluCheckExtension", [{"extName", {single, list}}, {"extString", {single, list}}]}.
-{"gluErrorString", {"result", {single, {list,null}}}}.
-{"gluGetString", {"result", {single, {list,null}}}}.
+{"gluCheckExtension", [{"extName", string}, 
+		       {"extString", string}]}.
+{"gluErrorString", {"result", string}}.
+{"gluGetString", {"result", string}}.
 
 {"gluDeleteQuadric", {"quad", in}}.
 {"gluQuadric",     {"quad", in}}.
@@ -291,15 +320,21 @@
 {"gluDisk",        {"quad", in}}.
 {"gluCylinder",    {"quad", in}}.
 
-%% OpenGL 3.0 
+%% OpenGL 3.0 and later
 {"glGetBooleani_v", {"data", {single,{list,16}}}}.
 {"glGetIntegeri_v", {"data", {single,{list,16}}}}.
+{"glGetFloati_v",   {"data", {single,{list,16}}}}.
+{"glGetDoublei_v",   {"data", {single,{list,16}}}}.
+{"glGetInteger64i_v", {"data", {single,{list,16}}}}.
+
+{"glGetBufferParameteriv", {"params", {single,{list,16}}}}.
+{"glGetBufferParameteri64v", {"params", {single,{list,16}}}}.
 
 {"glTransformFeedbackVaryings", [{"count", {c_only,{length,"varyings"}}},
 				 {"varyings", [{base,string}, {single,list}]}]}.
-{"glGetTransformFeedbackVarying", [{"size", {single, true}},{"type", {single, true}},				   
+{"glGetTransformFeedbackVarying", [{"size", {single, true}},{"type", {single, true}},
 				   {"length", [skip, {single, true}]},
-				   {"name", {single, {list,"bufSize","length"}}}]}.
+				   {"name", {string,"bufSize","length"}}]}.
 
 
 {"glGenRenderbuffers", {"renderbuffers", {single,{list,"n","n"}}}}.
@@ -327,7 +362,133 @@
 			   {"params", [out, {single, {list, "uniformIndicesLen", "uniformIndicesLen"}}]}]}.
 
 {"glGetActiveUniformName", [{"length",[skip,{single, true}]},
-			    {"uniformName", {single, {list,"bufSize","length"}}}]}.
+			    {"uniformName", {string,"bufSize","length"}}]}.
 {"glGetActiveUniformBlockName", [{"length",[skip,{single, true}]},
-				 {"uniformBlockName", {single, {list,"bufSize","length"}}}]}.
+				 {"uniformBlockName", {string,"bufSize","length"}}]}.
 {"glGetActiveUniformBlockiv", {"params", [in, {base,memory}]}}.
+
+
+{"glGetSynciv", [{"values", {single, {list, "bufSize","length"}}},
+		 {"length", [skip,{single, true}]}]}.
+
+{"glGetMultisamplefv", {"val", [out, {single, {tuple,2}}]}}.
+
+
+{"glNamedStringARB", [{"stringlen", {c_only, {length, "string"}}},
+		      {"namelen", {c_only, {length, "name"}}}]}.
+{"glDeleteNamedStringARB", [{"namelen", {c_only, {length, "name"}}}]}.
+{"glIsNamedStringARB", [{"namelen", {c_only, {length, "name"}}}]}.
+{"glGetNamedStringARB",[{"namelen", {c_only, {length, "name"}}},
+			{"stringlen",[skip,{single, true}]},
+			{"string", {string,"bufSize","stringlen"}}]}.
+{"glGetNamedStringivARB",[{"namelen", {c_only, {length, "name"}}},
+			  {"params",  [out, {single, true}]}]}.
+{"glCompileShaderIncludeARB", [{"length", {c_only,{constant,"NULL"}}},
+			       {"count",  {c_only,{length,"path"}}},
+			       {"path", {single,list}}]}.
+
+
+{"glGenSamplers", {"samplers", {single, {list,"count","count"}}}}.
+{"glDeleteSamplers", [{"count", {c_only, {length, "samplers"}}}, 
+		      {"samplers", {single, list}}]}.
+{"glGetSamplerParameter", {"params", {single, {list, 4}}}}.
+{"glSamplerParameterI", {"param", {single, list}}}.
+{"glSamplerParameterfv", {"param", {single, list}}}.
+{"glSamplerParameteriv", {"param", {single, list}}}.
+
+%{"glGetActiveSubroutineUniformiv", {"values", }}.
+{"glGetActiveSubroutineUniformName", [{"length",[skip,{single, true}]},
+				      {"name", {string,"bufsize","length"}}]}.
+{"glGetActiveSubroutineName", [{"length",[skip,{single, true}]},
+			       {"name", {string,"bufsize","length"}}]}.
+{"glGetProgramStageiv", {"values", {single, true}}}.
+{"glUniformSubroutinesuiv", [{"count",{c_only,{length,"indices"}}},{"indices", {single, list}}]}.
+
+{"glGenTransformFeedbacks", {"ids", {single, {list,"n","n"}}}}.
+{"glDeleteTransformFeedbacks", [{"n", {c_only, {length, "ids"}}},
+				{"ids", {single, list}}]}.
+
+{"glPatchParameterfv", {"values", {single, list}}}.
+
+
+{"glGetQueryIndexediv", {"params", {single, true} }}.
+{"glShaderBinary", [{"count", {c_only, {length, "shaders"}}},
+		    {"length", {c_only, {size, "binary"}}},
+		    {"shaders", {single, list}},
+		    {"binary", binary}
+		   ]}.
+{"glGetShaderPrecisionFormat", [{"range", {single, {tuple, 2}}},
+				{"precision", {single, true}}]}.
+
+{"glGetProgramBinary", [{"length",[skip,{single, true}]},
+			{"binary", [out, {binary, "bufSize", "length"}]},
+			{"binaryFormat", {single, true}}]}.
+{"glProgramBinary", [{"binary", binary}, {"length", {c_only, {size, "binary"}}}]}.
+
+{"glGenProgramPipelines", {"pipelines", {single, {list,"n","n"}}}}.
+{"glDeleteProgramPipelines", [{"n", {c_only, {length, "pipelines"}}}, 
+			      {"pipelines", {single, list}}]}.
+
+{"glCreateShaderProgramv", [{"count", {c_only, {length, "strings"}}},
+			    {"strings", {single, list}}]}.
+{"glGetProgramPipelineInfoLog", [{"length", [skip,{single, true}]},
+				 {"infoLog", {string,"bufSize","length"}}]}.
+{"glGetProgramPipelineiv", {"params", {single, true}}}.
+
+
+%% {"glCreateSyncFromCLeventARB", {"context", }}.
+
+{"glDebugMessageControlARB", [{"count", {c_only, {length, "ids"}}},
+			      {"ids", {single, list}}]}.
+{"glDebugMessageInsertARB", {"length", {c_only, {length, "buf"}}}}.
+{"glGetDebugMessageLogARB", [{"sources", {single, {list, "count", "result"}}},
+			     {"types", {single, {list, "count", "result"}}},
+			     {"ids", {single, {list, "count", "result"}}},
+			     {"severities", {single, {list, "count", "result"}}},
+			     {"lengths", [{c_only, undefined}, {single, {list, "count", "result"}}]},
+			     {"messageLog", [{string, "bufsize", "lengths"}, 
+					     {single, {list, "bufsize", "result"}}]}]}.
+
+
+{"glUniformMatrix2dv",   [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,4}}]}]}.
+{"glUniformMatrix3dv",   [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,9}}]}]}.
+{"glUniformMatrix4dv",   [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,16}}]}]}.
+{"glUniformMatrix2x3dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,6}}]}]}.
+{"glUniformMatrix3x2dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,6}}]}]}.
+{"glUniformMatrix2x4dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,8}}]}]}.
+{"glUniformMatrix4x2dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,8}}]}]}.
+{"glUniformMatrix3x4dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,12}}]}]}.
+{"glUniformMatrix4x3dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,12}}]}]}.
+
+{"glProgramUniform1", [{"count",{c_only,{length,"value"}}}, {"value", [{single,list}]}]}.
+{"glProgramUniform2", [{"count",{c_only,{length,"value"}}}, {"value", [{single,{tuple_list,2}}]}]}.
+{"glProgramUniform3", [{"count",{c_only,{length,"value"}}}, {"value", [{single,{tuple_list,3}}]}]}.
+{"glProgramUniform4", [{"count",{c_only,{length,"value"}}}, {"value", [{single,{tuple_list,4}}]}]}.
+
+{"glProgramUniformMatrix2fv",   [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,4}}]}]}.
+{"glProgramUniformMatrix2dv",   [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,4}}]}]}.
+{"glProgramUniformMatrix3dv",   [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,9}}]}]}.
+{"glProgramUniformMatrix3fv",   [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,9}}]}]}.
+{"glProgramUniformMatrix4dv",   [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,16}}]}]}.
+{"glProgramUniformMatrix4fv",   [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,16}}]}]}.
+{"glProgramUniformMatrix2x3fv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,6}}]}]}.
+{"glProgramUniformMatrix3x2fv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,6}}]}]}.
+{"glProgramUniformMatrix2x4fv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,8}}]}]}.
+{"glProgramUniformMatrix4x2fv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,8}}]}]}.
+{"glProgramUniformMatrix3x4fv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,12}}]}]}.
+{"glProgramUniformMatrix4x3fv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,12}}]}]}.
+
+{"glProgramUniformMatrix2x3dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,6}}]}]}.
+{"glProgramUniformMatrix3x2dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,6}}]}]}.
+{"glProgramUniformMatrix2x4dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,8}}]}]}.
+{"glProgramUniformMatrix4x2dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,8}}]}]}.
+{"glProgramUniformMatrix3x4dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,12}}]}]}.
+{"glProgramUniformMatrix4x3dv", [{"count",{c_only,{length,"value"}}},{"value", [{single,{tuple_list,12}}]}]}.
+
+{"glViewportArrayv", [{"count",{c_only,{length,"v"}}}, {"v", [{single,{tuple_list,4}}]}]}.
+{"glViewportIndexedfv", {"v", {single,{tuple,4}}}}.
+{"glScissorArrayv", [{"count",{c_only,{length,"v"}}}, {"v", [{single,{tuple_list,4}}]}]}.
+{"glScissorIndexedv", {"v", {single,{tuple,4}}}}.
+{"glDepthRangeArrayv", [{"count",{c_only,{length,"v"}}}, {"v", [{single,{tuple_list,2}}]}]}.
+
+
diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl
index c075324c1f..2f20c42a5d 100644
--- a/lib/wx/api_gen/wx_gen.erl
+++ b/lib/wx/api_gen/wx_gen.erl
@@ -887,7 +887,7 @@ add_method2(M0=#method{name=Name,params=Ps0,type=T0},#class{name=CName,parent=Pa
 		   id = next_id(func_id),
 		   pre_hook  = get_opt(pre_hook, Name, length(Ps), Opts),
 		   post_hook = get_opt(post_hook, Name, length(Ps), Opts),
-		   doc = get_opt(doc, Name, length(Ps), Opts) 
+		   doc = get_opt(doc, Name, length(Ps), Opts)
 		  },
     M = case Name of
 	    CName ->
diff --git a/lib/wx/api_gen/wx_gen.hrl b/lib/wx/api_gen/wx_gen.hrl
index 17265a2842..426e3adfae 100644
--- a/lib/wx/api_gen/wx_gen.hrl
+++ b/lib/wx/api_gen/wx_gen.hrl
@@ -43,9 +43,9 @@
 	  id          = undefined, % Id (integer)
 	  doc,                     % Extra documentation
 	  virtual,                 % Is virtual?
-	  pre_hook,                % Pre hook  before call in c-code
-	  post_hook                % Post hook after call in c-code
-	 }
+	  pre_hook    = [],        % Pre hook  before call in c-code
+	  post_hook   = []         % Post hook after call in c-code
+	}
        ).
 
 -record(param,
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index 846cec46c4..4b33068d8f 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -152,6 +152,7 @@ gen_funcs(Defs) ->
     w("#include \"../wxe_impl.h\"~n"),
     w("#include \"../wxe_events.h\"~n"),
     w("#include \"../wxe_return.h\"~n"),
+    w("#include \"../wxe_gl.h\"~n"),
     w("#include \"wxe_macros.h\"~n"),
     w("#include \"wxe_derived_dest.h\"~n~n"),
 
@@ -176,6 +177,9 @@ gen_funcs(Defs) ->
       "     rt.addAtom(\"ok\");~n"
       "     break;~n"
       " }~n"),
+    w(" case WXE_BIN_INCR:~n   driver_binary_inc_refc(Ecmd.bin[0]->bin);~n   break;~n",[]),
+    w(" case WXE_BIN_DECR:~n   driver_binary_dec_refc(Ecmd.bin[0]->bin);~n   break;~n",[]),
+    w(" case WXE_INIT_OPENGL:~n  wxe_initOpenGL(rt, bp);~n   break;~n",[]),
 
     Res = [gen_class(Class) || Class <- Defs],
 
@@ -265,13 +269,13 @@ gen_method(CName,  M=#method{name=N,params=Ps0,type=T,method_type=MT,id=MethodId
     Opts = [Opt || Opt = #param{def=Def,in=In,where=Where} <- Ps2, 
 		   Def =/= none, In =/= false, Where =/= c],
     decode_options(Opts, Align),
-    case M#method.pre_hook of
-	undefined -> skip;
+    case gen_util:get_hook(c, M#method.pre_hook) of
+	ignore -> skip;
 	Pre -> w(" ~s;~n", [Pre])
     end,
     Ps3 = call_wx(N,{MT,CName},T,Ps2),
-    case M#method.post_hook of
-	undefined -> skip;
+    case gen_util:get_hook(c, M#method.post_hook) of
+	ignore -> skip;
 	Post -> w(" ~s;~n", [Post])
     end,
     free_args(),
diff --git a/lib/wx/api_gen/wx_gen_erl.erl b/lib/wx/api_gen/wx_gen_erl.erl
index 7962dd9fbf..e1201ab0d4 100644
--- a/lib/wx/api_gen/wx_gen_erl.erl
+++ b/lib/wx/api_gen/wx_gen_erl.erl
@@ -270,6 +270,16 @@ gen_method2(M=#method{name=N,alias=A,params=Ps,type=T,method_type=MT,id=MethodId
     MId = arg_type_tests(Args, "?" ++ get_unique_name(MethodId)),
     {MArgs,Align} = marshal_args(Args),
     MOpts = marshal_opts(Optional, Align, Args),
+    case gen_util:get_hook(erl, M#method.pre_hook) of
+	ignore -> skip;
+	Pre -> w("  ~s~n", [Pre])
+    end,
+
+    case gen_util:get_hook(erl, M#method.post_hook) of
+	ignore -> skip;
+	_ -> w("  _Result =", [])
+    end,
+    
     case have_return_vals(T, Ps) of
 	_ when MT =:= constructor ->
 	    w("  wxe_util:construct(~s,~n  <<~s~s>>)", [MId, MArgs,MOpts]);
@@ -278,6 +288,13 @@ gen_method2(M=#method{name=N,alias=A,params=Ps,type=T,method_type=MT,id=MethodId
 	false -> 
 	    w("  wxe_util:cast(~s,~n  <<~s~s>>)", [MId, MArgs,MOpts])
     end,
+    case gen_util:get_hook(erl, M#method.post_hook) of
+	ignore -> skip;
+	Post -> 
+	    w(",~n  ~s~n", [Post]),
+	    w("  _Result", [])
+    end,
+   
     erase(current_func),
     M.
 
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index c91a9d7fff..aec8a4944a 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -505,15 +505,15 @@
 	      {"data",[in,{base,binary}]},
 	      {"alpha",[in,{base,binary}]},
 	      {{4,pre_hook}, 
-	       "if(!static_data) {"
-	       "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
-	       "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"},
+	       [{c, "if(!static_data) {"
+		 "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
+		 "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}]},
 	      {{5,pre_hook}, 
-	       "if(!static_data) {"
-	       " data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
-	       " alpha = (unsigned char *) malloc(Ecmd.bin[1]->size);"
-	       " memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);"
-	       " memcpy(alpha,Ecmd.bin[1]->base,Ecmd.bin[1]->size);}"}
+	       [{c, "if(!static_data) {"
+		 " data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
+		 " alpha = (unsigned char *) malloc(Ecmd.bin[1]->size);"
+		 " memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);"
+		 " memcpy(alpha,Ecmd.bin[1]->base,Ecmd.bin[1]->size);}"}]}
 	     ]},
   '~wxImage',%'AddHandler',
   'Blur','BlurHorizontal','BlurVertical', 
@@ -524,15 +524,15 @@
 	     {"data",[in,{base,binary}]},
 	     {"alpha",[in,{base,binary}]},
 	     {{4,pre_hook}, 
-	      "if(!static_data) {"
-	      "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
-	      "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"},
+	      [{c, "if(!static_data) {"
+	       "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
+	       "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}]},
 	     {{5,pre_hook}, 
-	      "if(!static_data) {"
-	      " data =  (unsigned char *) malloc(Ecmd.bin[0]->size);"
-	      " alpha = (unsigned char *) malloc(Ecmd.bin[1]->size);"
-	      " memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);"
-	      " memcpy(alpha,Ecmd.bin[1]->base,Ecmd.bin[1]->size);}"}	     
+	      [{c, "if(!static_data) {"
+		" data =  (unsigned char *) malloc(Ecmd.bin[0]->size);"
+		" alpha = (unsigned char *) malloc(Ecmd.bin[1]->size);"
+		" memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);"
+		" memcpy(alpha,Ecmd.bin[1]->base,Ecmd.bin[1]->size);}"}]}
 	    ]},
   'Destroy','FindFirstUnusedColour', %  'FindHandler',
   'GetImageExtWildcard',
@@ -551,15 +551,15 @@
   'Rotate90','SaveFile','Scale','Size',
   {'SetAlpha', [{{2,"alpha"},[in,{base,binary}, {def, none}]},
 		{{2,pre_hook}, 
-		 "if(!static_data) {"
-		 "alpha = (unsigned char *) malloc(Ecmd.bin[0]->size);"
-		 "memcpy(alpha,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}
+		 [{c, "if(!static_data) {"
+		   "alpha = (unsigned char *) malloc(Ecmd.bin[0]->size);"
+		   "memcpy(alpha,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}]}
 	       ]},
   {'SetData',  [{"data",[in,{base,binary}]},
 		{pre_hook, 
-		 "if(!static_data) {"
-		 "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
-		 "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}
+		 [{c, "if(!static_data) {"
+		   "data = (unsigned char *) malloc(Ecmd.bin[0]->size);"
+		   "memcpy(data,Ecmd.bin[0]->base,Ecmd.bin[0]->size);}"}]}
 	       ]},
  'SetMask','SetMaskColour','SetMaskFromImage','SetOption',
   'SetPalette',
@@ -902,8 +902,8 @@
  ['wxTreeCtrl','~wxTreeCtrl','AddRoot','AppendItem',
   %% Not on Windows 'AssignButtonsImageList','GetButtonsImageList','SetButtonsImageList' 
   'AssignImageList','AssignStateImageList','Collapse','CollapseAndReset',
-  'Create','Delete','DeleteAllItems','DeleteChildren',{'EditLabel',1},
-						%'EndEditLabel',
+  'Create','Delete','DeleteAllItems','DeleteChildren',
+  {'EditLabel', [{"textCtrlClass", [nowhere]}]}, %'EndEditLabel',
   'EnsureVisible','Expand','GetBoundingRect',
   'GetChildrenCount','GetCount','GetEditControl',
   {'GetFirstChild',[{"cookie", out}]}, {'GetNextChild',[{"cookie", [both]}]},
@@ -1148,7 +1148,8 @@
  [{skip, [{'SetCurrent', 2}]}], %% NA MAC
  [{'wxGLCanvas', [{"attribList", [in, {single,array}]}]},
   'GetContext',
-  {'SetCurrent', [{post_hook,"if(This->GetContext()) setActiveGL(Ecmd.caller,This)"}]},
+  {'SetCurrent', [{post_hook,[{c, "if(This->GetContext()) setActiveGL(Ecmd.caller,This)"},
+			      {erl, "{ok, _} = wxe_master:init_opengl(),"}]}]},
   %%{'SetColour', [{"colour", [in, {single,array}]}]},
   'SwapBuffers']}.
 
@@ -1740,6 +1741,11 @@
 %%   'GetItemRect', 'SetItemRect', 'GetToolId', 'SetToolId'
 %%  ]}.
 
+{class, wxSystemSettings, object, [],
+ [
+  'GetColour','GetFont','GetMetric','GetScreenType'
+ ]}.
+
 {class, wxAuiNotebookEvent, wxNotifyEvent, 
  [{acc, [{old_selection, "GetOldSelection()"},
 	 {selection, "GetSelection()"},
diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in
index 8710641b57..69418f62ef 100644
--- a/lib/wx/c_src/Makefile.in
+++ b/lib/wx/c_src/Makefile.in
@@ -32,14 +32,16 @@ endif
 
 SO_EXT    = @SO_EXT@
 
-GENERAL     = wxe_driver wxe_ps_init wxe_impl wxePrintout wxe_return
+GENERAL     = wxe_driver wxe_ps_init wxe_impl wxePrintout wxe_return wxe_gl
 GENERAL_H   = wxe_driver.h wxe_impl.h wxe_return.h
 
 GENERATED_F = wxe_funcs wxe_events wxe_init
-GENERATED_H = gen/wxe_macros.h gen/glu_finit.h gen/gl_finit.h gen/gl_fdefs.h 
+GENERATED_H = gen/wxe_macros.h 
+
+GL_H = egl_impl.h gen/glu_finit.h gen/gl_finit.h gen/gl_fdefs.h 
 
 HAVE_OPENGL = true
-OPENGL_F = gl_funcs wxe_gl
+OPENGL_F = gl_funcs egl_impl
 
 ifneq ($(INSIDE_ERLSRC),true)
 
@@ -60,9 +62,9 @@ SYS_TYPE    = @WXERL_SYS_TYPE@
 GENERAL_O   = $(GENERAL:%=$(SYS_TYPE)/%.o) 
 GENERATED_O = $(GENERATED_F:%=$(SYS_TYPE)/%.o)
 ifeq ($(HAVE_OPENGL), true)
-	OPENGL_O = $(OPENGL_F:%=$(SYS_TYPE)/%.o)
+	GL_OBJECTS = $(OPENGL_F:%=$(SYS_TYPE)/%.o)
 else
-	OPENGL_O = 
+	GL_OBJECTS = 
 endif
 
 RC_FILE_EXT = @RC_FILE_TYPE@
@@ -72,10 +74,12 @@ else
 RC_FILE     = 
 endif
 
-OBJECTS     = $(GENERAL_O) $(GENERATED_O) $(OPENGL_O) $(RC_FILE)
+WX_OBJECTS  = $(GENERAL_O) $(GENERATED_O) $(RC_FILE)
+
+OBJECTS = $(WX_OBJECTS) $(GL_OBJECTS)
 
-TARGET_API = wxe_driver
-TARGET_DIR = ../priv/$(SYS_TYPE)
+TARGET_APIS = wxe_driver erl_gl
+TARGET_DIR = ../priv
 
 # -O2 -funroll-loops  -ffast-math -fomit-frame-pointer 
 
@@ -87,31 +91,36 @@ LD		= $(CPP)
 LDFLAGS		= @LDFLAGS@
 RESCOMP		= @WX_RESCOMP@
 
-
 ifeq (@WX_HAVE_STATIC_LIBS@,true) 
-WX_LIBS	         =  @WX_LIBS_STATIC@
+OPT_WX_LIBS      =  @WX_LIBS_STATIC@
 DEBUG_WX_LIBS    =  @DEBUG_WX_LIBS_STATIC@
 else
-WX_LIBS	         =  @WX_LIBS@
+OPT_WX_LIBS      =  @WX_LIBS@
 DEBUG_WX_LIBS    =  @DEBUG_WX_LIBS@
 endif
 
 ifeq ($(TYPE),debug)
-CFLAGS		= @DEBUG_WX_CFLAGS@ @DEBUG_CFLAGS@
-CPP_FLAGS	= @DEBUG_WX_CXXFLAGS@ @DEBUG_CXXFLAGS@
-LIBS		= $(DEBUG_WX_LIBS)
+WX_CFLAGS	= @DEBUG_WX_CFLAGS@
+CFLAGS          = @DEBUG_CFLAGS@
+WX_CXX_FLAGS	= @DEBUG_WX_CXXFLAGS@ 
+CXX_FLAGS       = @DEBUG_CXXFLAGS@
+WX_LIBS		= $(DEBUG_WX_LIBS)
 else
-CFLAGS		= @WX_CFLAGS@ @CFLAGS@
-CPP_FLAGS	= @WX_CXXFLAGS@ @CXXFLAGS@
-LIBS		= $(WX_LIBS)
+WX_CFLAGS	= @WX_CFLAGS@
+CFLAGS          = @CFLAGS@
+WX_CXX_FLAGS	= @WX_CXXFLAGS@ 
+CXX_FLAGS       = @CXXFLAGS@
+WX_LIBS		= $(OPT_WX_LIBS)
 endif
 
-CC_O		= $(CC) -c $(CFLAGS) $(COMMON_CFLAGS)
-CPP_O		= $(CPP) -c $(CPP_FLAGS) $(COMMON_CFLAGS) 
+GL_LIBS         = @GL_LIBS@
+
+CC_O		= $(CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
+CPP_O		= $(CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS)  $(COMMON_CFLAGS) 
 
 # Targets
 
-opt:     $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) 
+opt:     $(TARGET_DIR)/wxe_driver$(SO_EXT) $(TARGET_DIR)/erl_gl$(SO_EXT)
 
 debug:   
 	@${MAKE} TYPE=debug
@@ -132,20 +141,22 @@ complete_clean:
 
 docs:	
 
+$(GL_OBJECTS): $(GL_H)
+$(WX_OBJECTS): $(GENERATED_H) $(GENERAL_H) 
 
-$(SYS_TYPE)/%.o: %.cpp $(GENERATED_H) $(GENERAL_H) 
+$(SYS_TYPE)/%.o: %.cpp 
 	mkdir -p $(SYS_TYPE)
 	$(CPP_O) $< -o $@
 
-$(SYS_TYPE)/%.o: %.c $(GENERATED_H) $(GENERAL_H)
+$(SYS_TYPE)/%.o: %.c 
 	mkdir -p $(SYS_TYPE)
 	$(CC_O) $< -o $@
 
-$(SYS_TYPE)/%.o: gen/%.cpp $(GENERATED_H) $(GENERAL_H)
+$(SYS_TYPE)/%.o: gen/%.cpp 
 	mkdir -p $(SYS_TYPE)
 	$(CPP_O) $< -o $@
 
-$(SYS_TYPE)/%.o: gen/%.c $(GENERATED_H) $(GENERAL_H)
+$(SYS_TYPE)/%.o: gen/%.c 
 	mkdir -p $(SYS_TYPE)
 	$(CC_O) $< -o $@
 
@@ -153,9 +164,13 @@ $(SYS_TYPE)/wxe_win32.$(RC_FILE_EXT): wxe_win32.rc
 	mkdir -p $(SYS_TYPE)
 	$(RESCOMP) -o $@ $< 
 
-$(TARGET_DIR)/$(TARGET_API)$(SO_EXT): $(OBJECTS)
+$(TARGET_DIR)/wxe_driver$(SO_EXT): $(WX_OBJECTS)
+	mkdir -p $(TARGET_DIR)
+	$(LD) $(LDFLAGS) $(WX_OBJECTS) $(WX_LIBS) -o $@
+
+$(TARGET_DIR)/erl_gl$(SO_EXT): $(GL_OBJECTS)
 	mkdir -p $(TARGET_DIR)
-	$(LD) $(LDFLAGS)  $(OBJECTS) $(LIBS) -o $@
+	$(CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@
 
 
 # ----------------------------------------------------
@@ -164,10 +179,11 @@ $(TARGET_DIR)/$(TARGET_API)$(SO_EXT): $(OBJECTS)
 ifeq ($(INSIDE_ERLSRC),true)
 include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE)
+	$(INSTALL_DIR) $(RELSYSDIR)/priv
 	$(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/
 	$(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/
-	$(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE)
+	$(INSTALL_PROGRAM) $(TARGET_DIR)/wxe_driver$(SO_EXT) $(RELSYSDIR)/priv/
+	$(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) $(RELSYSDIR)/priv/
 
 release_docs_spec:
 
diff --git a/lib/wx/c_src/egl_impl.cpp b/lib/wx/c_src/egl_impl.cpp
new file mode 100644
index 0000000000..e2dbbb73c4
--- /dev/null
+++ b/lib/wx/c_src/egl_impl.cpp
@@ -0,0 +1,306 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2010. 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% 
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include "egl_impl.h"
+
+#define WX_DEF_EXTS
+#include "gen/gl_fdefs.h"
+#include "gen/gl_finit.h"
+#include "gen/glu_finit.h"
+
+void init_tess();
+void exit_tess();
+int load_gl_functions();
+
+/* **************************************************************************** 
+ * OPENGL INITIALIZATION 
+ *****************************************************************************/
+
+int egl_initiated = 0;
+
+#ifdef _WIN32
+#define RTLD_LAZY 0
+#define OPENGL_LIB L"opengl32.dll"
+#define OPENGLU_LIB L"glu32.dll"
+typedef HMODULE DL_LIB_P;
+typedef WCHAR DL_CHAR;
+void * dlsym(HMODULE Lib, const char *func) {
+  void * funcp;
+  if((funcp = (void *) GetProcAddress(Lib, func)))
+    return funcp;
+  else 
+    return (void *) wglGetProcAddress(func);
+}
+
+HMODULE dlopen(const WCHAR *DLL, int unused) {
+  return LoadLibrary(DLL);
+}
+
+void dlclose(HMODULE Lib) {
+  FreeLibrary(Lib);
+}
+
+#else
+typedef void * DL_LIB_P;
+typedef char DL_CHAR;
+# ifdef _MACOSX
+#  define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
+#  define OPENGLU_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
+# else
+#  define OPENGL_LIB "libGL.so"
+#  define OPENGLU_LIB "libGLU.so"
+# endif
+#endif 
+extern "C" {
+DRIVER_INIT(EGL_DRIVER) {  
+  return NULL;
+}
+}
+
+int egl_init_opengl(void *erlCallbacks) 
+{
+#ifdef _WIN32
+  driver_init((TWinDynDriverCallbacks *) erlCallbacks);
+#endif
+  if(egl_initiated == 0) {
+    if(load_gl_functions()) {
+      init_tess();
+      egl_initiated = 1;
+    }
+  }
+  return 1;
+}
+
+int load_gl_functions() {
+  DL_CHAR * DLName = OPENGL_LIB;
+  DL_LIB_P LIBhandle = dlopen(DLName, RTLD_LAZY);
+  //fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName);
+  void * func = NULL;
+  int i;
+
+  if(LIBhandle) {
+    for(i=0; gl_fns[i].name != NULL; i++) {
+      if((func = dlsym(LIBhandle, gl_fns[i].name))) {
+	* (void **) (gl_fns[i].func) = func;
+	// fprintf(stderr, "GL LOADED %s \r\n", gl_fns[i].name);
+      } else {
+	if(gl_fns[i].alt != NULL) {
+	  if((func = dlsym(LIBhandle, gl_fns[i].alt))) {
+	    * (void **) (gl_fns[i].func) = func;
+	    // fprintf(stderr, "GL LOADED %s \r\n", gl_fns[i].alt);
+	  } else {
+	    * (void **) (gl_fns[i].func) = (void *) &gl_error;
+	    // fprintf(stderr, "GL Skipped %s and %s \r\n", gl_fns[i].name, gl_fns[i].alt);
+	  };
+	} else {
+	  * (void **) (gl_fns[i].func) = (void *) &gl_error;
+	  // fprintf(stderr, "GL Skipped %s \r\n", gl_fns[i].name);
+	}
+      }
+    }
+    dlclose(LIBhandle);
+    // fprintf(stderr, "OPENGL library is loaded\r\n");
+  } else {
+    fprintf(stderr, "Could NOT load OpenGL library: %s\r\n", DLName);
+  };
+
+  DLName = OPENGLU_LIB;
+  LIBhandle = dlopen(DLName, RTLD_LAZY);
+  // fprintf(stderr, "Loading GLU: %s\r\n", (const char*)DLName);
+  func = NULL;
+
+  if(LIBhandle) {
+    for(i=0; glu_fns[i].name != NULL; i++) {      
+      if((func = dlsym(LIBhandle, glu_fns[i].name))) {
+	* (void **) (glu_fns[i].func) = func;
+      } else {
+	if(glu_fns[i].alt != NULL) {
+	  if((func = dlsym(LIBhandle, glu_fns[i].alt))) {
+	    * (void **) (glu_fns[i].func) = func;
+	  } else {
+	    * (void **) (glu_fns[i].func) = (void *) &gl_error;
+	    // fprintf(stderr, "GLU Skipped %s\r\n", glu_fns[i].alt);
+	  };
+	} else {
+	  * (void **) (glu_fns[i].func) = (void *) &gl_error;
+	  // fprintf(stderr, "GLU Skipped %s\r\n", glu_fns[i].name);
+	}
+      }
+    }
+    dlclose(LIBhandle);
+    // fprintf(stderr, "GLU library is loaded\r\n");
+  } else {
+    fprintf(stderr, "Could NOT load OpenGL GLU library: %s\r\n", DLName);
+  };
+
+  return 1;
+}
+
+void gl_error() {
+  // fprintf(stderr, "OpenGL Extension not available \r\n");
+  throw "undef_extension";
+}
+
+/* *******************************************************************************
+ * GLU Tesselation special
+ * ******************************************************************************/
+
+static GLUtesselator* tess;
+static GLdouble* tess_coords;
+static GLdouble* tess_alloc_vertex;
+static int* tess_vertices;
+
+void CALLBACK
+egl_ogla_vertex(GLdouble* coords)
+{
+  /* fprintf(stderr, "%d\r\n", (int) (coords - tess_coords) / 3); */
+
+  *tess_vertices++ = (int) (coords - tess_coords) / 3;
+}
+
+void CALLBACK
+egl_ogla_edge_flag(GLboolean flag)
+{
+}
+
+void CALLBACK
+egl_ogla_error(GLenum errorCode)
+{
+  const GLubyte *err;
+  err = gluErrorString(errorCode);
+  // wxString msg;
+  // msg.Printf(wxT("Tesselation error:  %d: "), (int)errorCode);
+  // msg += wxString::FromAscii((char *) err);
+  // send_msg("error", &msg);
+  fprintf(stderr, "Tesselation error: %d\r\n", (int) errorCode);
+}
+
+void CALLBACK
+egl_ogla_combine(GLdouble coords[3],
+		 void* vertex_data[4],
+		 GLfloat w[4], 
+		 void **dataOut)
+{
+  GLdouble* vertex = tess_alloc_vertex;
+
+  tess_alloc_vertex += 3;
+
+#if 0
+  fprintf(stderr, "combine: ");
+  int i;
+  for (i = 0; i < 4; i++) {
+    if (w[i] > 0.0) {
+      fprintf(stderr, "%d(%g) ", (int) vertex_data[i], w[i]);
+    }
+  }
+  fprintf(stderr, "\r\n");
+  fprintf(stderr, "%g %g %g\r\n", vertex[0], vertex[1], vertex[2]);
+#endif
+
+  vertex[0] = coords[0];
+  vertex[1] = coords[1];
+  vertex[2] = coords[2];
+  *dataOut = vertex;
+}
+
+void init_tess() 
+{
+  tess = gluNewTess();
+
+  gluTessCallback(tess, GLU_TESS_VERTEX,     (GLUfuncptr) egl_ogla_vertex);
+  gluTessCallback(tess, GLU_TESS_EDGE_FLAG,  (GLUfuncptr) egl_ogla_edge_flag);
+  gluTessCallback(tess, GLU_TESS_COMBINE,    (GLUfuncptr) egl_ogla_combine);
+  gluTessCallback(tess, GLU_TESS_ERROR,      (GLUfuncptr) egl_ogla_error);
+
+}
+
+void exit_tess() 
+{
+  gluDeleteTess(tess);
+}
+
+int erl_tess_impl(char* buff, ErlDrvPort port, ErlDrvTermData caller)
+{
+  ErlDrvBinary* bin;
+  int i;
+  GLdouble* new_vertices;
+  int *vertices;
+  int num_vertices;
+  GLdouble *n;
+  int n_pos, AP, res;
+  
+  num_vertices = * (int *) buff; buff += 8; /* Align */
+  n = (double *) buff; buff += 8*3;
+
+  bin = driver_alloc_binary(num_vertices*6*sizeof(GLdouble));  
+  new_vertices = tess_coords = (double *) bin->orig_bytes;
+  memcpy(tess_coords,buff,num_vertices*3*sizeof(GLdouble));
+  tess_alloc_vertex = tess_coords + num_vertices*3;
+
+#if 0
+  fprintf(stderr, "n=%d\r\n", num_vertices);
+#endif 
+  vertices = (int *) driver_alloc(sizeof(int) * 16*num_vertices);
+  
+  tess_vertices = vertices;
+  
+  gluTessNormal(tess, n[0], n[1], n[2]);
+  gluTessBeginPolygon(tess, 0);
+  gluTessBeginContour(tess);
+  for (i = 0; i < num_vertices; i++) {
+    gluTessVertex(tess, tess_coords+3*i, tess_coords+3*i);
+  }
+  gluTessEndContour(tess);
+  gluTessEndPolygon(tess);
+    
+  n_pos = (tess_vertices - vertices); 
+  
+  AP = 0; ErlDrvTermData *rt;
+  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData) * (13+n_pos*2));
+  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+
+  for(i=0; i < n_pos; i++) {
+    rt[AP++] = ERL_DRV_INT; rt[AP++] = (int) vertices[i];
+  };
+  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = n_pos+1;
+
+  rt[AP++] = ERL_DRV_BINARY; rt[AP++] = (ErlDrvTermData) bin; 
+  rt[AP++] = (tess_alloc_vertex-new_vertices)*sizeof(GLdouble); rt[AP++] = 0;
+  
+  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2; // Return tuple {list, Bin}
+  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2; // Result tuple
+  
+  res = driver_send_term(port,caller,rt,AP);
+  /* fprintf(stderr, "List %d: %d %d %d \r\n",  */
+  /* 	  res, */
+  /* 	  n_pos,  */
+  /* 	  (tess_alloc_vertex-new_vertices)*sizeof(GLdouble),  */
+  /* 	  num_vertices*6*sizeof(GLdouble)); */
+  driver_free_binary(bin);
+  driver_free(vertices);
+  driver_free(rt);
+  return 0;
+}
diff --git a/lib/wx/c_src/egl_impl.h b/lib/wx/c_src/egl_impl.h
new file mode 100644
index 0000000000..e93e4caefd
--- /dev/null
+++ b/lib/wx/c_src/egl_impl.h
@@ -0,0 +1,149 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2010. 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% 
+ */
+
+#include "erl_driver.h"
+
+/* Wrap everything from glext.h so we are not dependent on the user version of it */
+
+#ifndef _WIN32
+# include <dlfcn.h>
+#endif
+
+#ifdef _WIN32
+#include <windows.h>  
+#include <gl/gl.h>
+#include <gl/glu.h>
+#elif defined(HAVE_GL_GL_H)
+#include <GL/gl.h>
+# include <GL/glu.h>	
+#elif defined(HAVE_OPENGL_GL_H)
+#include <OpenGL/gl.h> 
+#include <OpenGL/glu.h> 
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY 
+#endif
+
+#ifndef CALLBACK
+# define CALLBACK
+#endif
+
+#ifdef _WIN32
+# ifndef _GLUfuncptr
+//  Visual studio CPP ++ compiler
+#  define _GLUfuncptr void (_stdcall *)() 
+# endif
+#endif
+
+#ifdef _GLUfuncptr
+# define GLUfuncptr _GLUfuncptr
+#elif defined(TESS_CB_TIGER_STYLE)
+# define GLUfuncptr GLvoid (*)(...)
+#else 
+# define GLUfuncptr GLvoid (*)()
+#endif
+
+/* Some new GL types (eliminates the need for glext.h) */
+
+#ifndef HAVE_GLINTPTR
+#ifndef HAVE_GLINTPTRARB
+# include <stddef.h>
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptrARB;
+typedef ptrdiff_t GLsizeiptrARB;
+#endif  /* HAVE_GLINTPTRARB */
+typedef GLintptrARB   GLintptr;
+typedef GLsizeiptrARB GLsizeiptr;
+#endif  /* HAVE_GLINTPTR */
+
+#ifndef HAVE_GLCHAR
+# ifndef HAVE_GLCHARARB
+/* GL types for handling shader object handles and characters */
+typedef char GLcharARB;		     /* native character */
+typedef unsigned int GLhandleARB;    /* shader object handle */
+#endif  /* HAVE_GLCHARARB */
+typedef GLcharARB GLchar;
+#endif
+
+#ifndef HAVE_GLHALFARB 
+/* GL types for "half" precision (s10e5) float data in host memory */
+typedef unsigned short GLhalfARB;
+#endif
+
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GLX_OML_sync_control extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS )
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(WIN32) && defined(_MSC_VER)
+typedef long int int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#elif defined(WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#else
+#include <inttypes.h>     /* Fallback option */
+#endif
+
+#ifndef HAVE_GLINT64EXT
+typedef int64_t GLint64EXT;
+typedef uint64_t GLuint64EXT;
+#endif
+
+#ifndef GL_ARB_sync
+typedef int64_t GLint64;
+typedef uint64_t GLuint64;
+typedef struct __GLsync *GLsync;
+#endif
+
+/* External Api */
+
+#ifdef _WIN32
+extern "C" __declspec(dllexport) int  egl_init_opengl(void *);
+extern "C" __declspec(dllexport) void egl_dispatch(int, char *, ErlDrvPort, ErlDrvTermData, char **, int *);
+#else 
+extern "C" int egl_init_opengl(void *);
+extern "C" void egl_dispatch(int, char *, ErlDrvPort, ErlDrvTermData, char **, int *);
+#endif
+
+/* internal */
+int erl_tess_impl(char* buff, ErlDrvPort port, ErlDrvTermData caller);
+void gl_error();
+extern int gl_error_op;
+extern ErlDrvTermData gl_active;
+
diff --git a/lib/wx/c_src/gen/gl_fdefs.h b/lib/wx/c_src/gen/gl_fdefs.h
index 2096f7a413..a45896d30d 100644
--- a/lib/wx/c_src/gen/gl_fdefs.h
+++ b/lib/wx/c_src/gen/gl_fdefs.h
@@ -24,6 +24,13 @@
 # define WXE_EXTERN extern
 #endif
 
+typedef struct {
+   const char * name;
+   const char * alt;
+   void * func;
+} gl_fns_t;
+
+#define GLE_GL_FUNC_START 5037
 typedef void (APIENTRY * WXEGLACCUM)(GLenum,GLfloat);
 WXE_EXTERN WXEGLACCUM weglAccum;
 typedef void (APIENTRY * WXEGLALPHAFUNC)(GLenum,GLclampf);
@@ -684,7 +691,7 @@ typedef void (APIENTRY * WXEGLMULTTRANSPOSEMATRIXD)(const GLdouble *);
 WXE_EXTERN WXEGLMULTTRANSPOSEMATRIXD weglMultTransposeMatrixd;
 typedef void (APIENTRY * WXEGLBLENDFUNCSEPARATE)(GLenum,GLenum,GLenum,GLenum);
 WXE_EXTERN WXEGLBLENDFUNCSEPARATE weglBlendFuncSeparate;
-typedef void (APIENTRY * WXEGLMULTIDRAWARRAYS)(GLenum,GLint *,GLsizei *,GLsizei);
+typedef void (APIENTRY * WXEGLMULTIDRAWARRAYS)(GLenum,const GLint *,const GLsizei *,GLsizei);
 WXE_EXTERN WXEGLMULTIDRAWARRAYS weglMultiDrawArrays;
 typedef void (APIENTRY * WXEGLPOINTPARAMETERF)(GLenum,GLfloat);
 WXE_EXTERN WXEGLPOINTPARAMETERF weglPointParameterf;
@@ -972,6 +979,30 @@ typedef void (APIENTRY * WXEGLGETVERTEXATTRIBIIV)(GLuint,GLenum,GLint *);
 WXE_EXTERN WXEGLGETVERTEXATTRIBIIV weglGetVertexAttribIiv;
 typedef void (APIENTRY * WXEGLGETVERTEXATTRIBIUIV)(GLuint,GLenum,GLuint *);
 WXE_EXTERN WXEGLGETVERTEXATTRIBIUIV weglGetVertexAttribIuiv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI1IV)(GLuint,const GLint *);
+WXE_EXTERN WXEGLVERTEXATTRIBI1IV weglVertexAttribI1iv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI2IV)(GLuint,const GLint *);
+WXE_EXTERN WXEGLVERTEXATTRIBI2IV weglVertexAttribI2iv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI3IV)(GLuint,const GLint *);
+WXE_EXTERN WXEGLVERTEXATTRIBI3IV weglVertexAttribI3iv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI4IV)(GLuint,const GLint *);
+WXE_EXTERN WXEGLVERTEXATTRIBI4IV weglVertexAttribI4iv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI1UIV)(GLuint,const GLuint *);
+WXE_EXTERN WXEGLVERTEXATTRIBI1UIV weglVertexAttribI1uiv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI2UIV)(GLuint,const GLuint *);
+WXE_EXTERN WXEGLVERTEXATTRIBI2UIV weglVertexAttribI2uiv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI3UIV)(GLuint,const GLuint *);
+WXE_EXTERN WXEGLVERTEXATTRIBI3UIV weglVertexAttribI3uiv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI4UIV)(GLuint,const GLuint *);
+WXE_EXTERN WXEGLVERTEXATTRIBI4UIV weglVertexAttribI4uiv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI4BV)(GLuint,const GLbyte *);
+WXE_EXTERN WXEGLVERTEXATTRIBI4BV weglVertexAttribI4bv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI4SV)(GLuint,const GLshort *);
+WXE_EXTERN WXEGLVERTEXATTRIBI4SV weglVertexAttribI4sv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI4UBV)(GLuint,const GLubyte *);
+WXE_EXTERN WXEGLVERTEXATTRIBI4UBV weglVertexAttribI4ubv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBI4USV)(GLuint,const GLushort *);
+WXE_EXTERN WXEGLVERTEXATTRIBI4USV weglVertexAttribI4usv;
 typedef void (APIENTRY * WXEGLGETUNIFORMUIV)(GLuint,GLint,GLuint *);
 WXE_EXTERN WXEGLGETUNIFORMUIV weglGetUniformuiv;
 typedef void (APIENTRY * WXEGLBINDFRAGDATALOCATION)(GLuint,GLuint,const GLchar *);
@@ -1012,30 +1043,6 @@ typedef void (APIENTRY * WXEGLCLEARBUFFERFI)(GLenum,GLint,GLfloat,GLint);
 WXE_EXTERN WXEGLCLEARBUFFERFI weglClearBufferfi;
 typedef const GLubyte * (APIENTRY * WXEGLGETSTRINGI)(GLenum,GLuint);
 WXE_EXTERN WXEGLGETSTRINGI weglGetStringi;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI1IV)(GLuint,const GLint *);
-WXE_EXTERN WXEGLVERTEXATTRIBI1IV weglVertexAttribI1iv;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI2IV)(GLuint,const GLint *);
-WXE_EXTERN WXEGLVERTEXATTRIBI2IV weglVertexAttribI2iv;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI3IV)(GLuint,const GLint *);
-WXE_EXTERN WXEGLVERTEXATTRIBI3IV weglVertexAttribI3iv;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI4IV)(GLuint,const GLint *);
-WXE_EXTERN WXEGLVERTEXATTRIBI4IV weglVertexAttribI4iv;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI1UIV)(GLuint,const GLuint *);
-WXE_EXTERN WXEGLVERTEXATTRIBI1UIV weglVertexAttribI1uiv;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI2UIV)(GLuint,const GLuint *);
-WXE_EXTERN WXEGLVERTEXATTRIBI2UIV weglVertexAttribI2uiv;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI3UIV)(GLuint,const GLuint *);
-WXE_EXTERN WXEGLVERTEXATTRIBI3UIV weglVertexAttribI3uiv;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI4UIV)(GLuint,const GLuint *);
-WXE_EXTERN WXEGLVERTEXATTRIBI4UIV weglVertexAttribI4uiv;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI4BV)(GLuint,const GLbyte *);
-WXE_EXTERN WXEGLVERTEXATTRIBI4BV weglVertexAttribI4bv;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI4SV)(GLuint,const GLshort *);
-WXE_EXTERN WXEGLVERTEXATTRIBI4SV weglVertexAttribI4sv;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI4UBV)(GLuint,const GLubyte *);
-WXE_EXTERN WXEGLVERTEXATTRIBI4UBV weglVertexAttribI4ubv;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBI4USV)(GLuint,const GLushort *);
-WXE_EXTERN WXEGLVERTEXATTRIBI4USV weglVertexAttribI4usv;
 typedef void (APIENTRY * WXEGLDRAWARRAYSINSTANCED)(GLenum,GLint,GLsizei,GLsizei);
 WXE_EXTERN WXEGLDRAWARRAYSINSTANCED weglDrawArraysInstanced;
 typedef void (APIENTRY * WXEGLDRAWELEMENTSINSTANCED)(GLenum,GLsizei,GLenum,const GLvoid *,GLsizei);
@@ -1044,6 +1051,24 @@ typedef void (APIENTRY * WXEGLTEXBUFFER)(GLenum,GLenum,GLuint);
 WXE_EXTERN WXEGLTEXBUFFER weglTexBuffer;
 typedef void (APIENTRY * WXEGLPRIMITIVERESTARTINDEX)(GLuint);
 WXE_EXTERN WXEGLPRIMITIVERESTARTINDEX weglPrimitiveRestartIndex;
+typedef void (APIENTRY * WXEGLGETINTEGER64I_V)(GLenum,GLuint,GLint64 *);
+WXE_EXTERN WXEGLGETINTEGER64I_V weglGetInteger64i_v;
+typedef void (APIENTRY * WXEGLGETBUFFERPARAMETERI64V)(GLenum,GLenum,GLint64 *);
+WXE_EXTERN WXEGLGETBUFFERPARAMETERI64V weglGetBufferParameteri64v;
+typedef void (APIENTRY * WXEGLFRAMEBUFFERTEXTURE)(GLenum,GLenum,GLuint,GLint);
+WXE_EXTERN WXEGLFRAMEBUFFERTEXTURE weglFramebufferTexture;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBDIVISOR)(GLuint,GLuint);
+WXE_EXTERN WXEGLVERTEXATTRIBDIVISOR weglVertexAttribDivisor;
+typedef void (APIENTRY * WXEGLMINSAMPLESHADING)(GLclampf);
+WXE_EXTERN WXEGLMINSAMPLESHADING weglMinSampleShading;
+typedef void (APIENTRY * WXEGLBLENDEQUATIONI)(GLuint,GLenum);
+WXE_EXTERN WXEGLBLENDEQUATIONI weglBlendEquationi;
+typedef void (APIENTRY * WXEGLBLENDEQUATIONSEPARATEI)(GLuint,GLenum,GLenum);
+WXE_EXTERN WXEGLBLENDEQUATIONSEPARATEI weglBlendEquationSeparatei;
+typedef void (APIENTRY * WXEGLBLENDFUNCI)(GLuint,GLenum,GLenum);
+WXE_EXTERN WXEGLBLENDFUNCI weglBlendFunci;
+typedef void (APIENTRY * WXEGLBLENDFUNCSEPARATEI)(GLuint,GLenum,GLenum,GLenum,GLenum);
+WXE_EXTERN WXEGLBLENDFUNCSEPARATEI weglBlendFuncSeparatei;
 typedef void (APIENTRY * WXEGLLOADTRANSPOSEMATRIXFARB)(const GLfloat *);
 WXE_EXTERN WXEGLLOADTRANSPOSEMATRIXFARB weglLoadTransposeMatrixfARB;
 typedef void (APIENTRY * WXEGLLOADTRANSPOSEMATRIXDARB)(const GLdouble *);
@@ -1112,6 +1137,8 @@ typedef void (APIENTRY * WXEGLGETPROGRAMLOCALPARAMETERFVARB)(GLenum,GLuint,GLflo
 WXE_EXTERN WXEGLGETPROGRAMLOCALPARAMETERFVARB weglGetProgramLocalParameterfvARB;
 typedef void (APIENTRY * WXEGLGETPROGRAMSTRINGARB)(GLenum,GLenum,GLvoid *);
 WXE_EXTERN WXEGLGETPROGRAMSTRINGARB weglGetProgramStringARB;
+typedef void (APIENTRY * WXEGLGETBUFFERPARAMETERIVARB)(GLenum,GLenum,GLint *);
+WXE_EXTERN WXEGLGETBUFFERPARAMETERIVARB weglGetBufferParameterivARB;
 typedef void (APIENTRY * WXEGLDELETEOBJECTARB)(GLhandleARB);
 WXE_EXTERN WXEGLDELETEOBJECTARB weglDeleteObjectARB;
 typedef GLhandleARB (APIENTRY * WXEGLGETHANDLEARB)(GLenum);
@@ -1198,14 +1225,8 @@ typedef void (APIENTRY * WXEGLRENDERBUFFERSTORAGEMULTISAMPLE)(GLenum,GLsizei,GLe
 WXE_EXTERN WXEGLRENDERBUFFERSTORAGEMULTISAMPLE weglRenderbufferStorageMultisample;
 typedef void (APIENTRY * WXEGLFRAMEBUFFERTEXTURELAYER)(GLenum,GLenum,GLuint,GLint,GLint);
 WXE_EXTERN WXEGLFRAMEBUFFERTEXTURELAYER weglFramebufferTextureLayer;
-typedef void (APIENTRY * WXEGLPROGRAMPARAMETERIARB)(GLuint,GLenum,GLint);
-WXE_EXTERN WXEGLPROGRAMPARAMETERIARB weglProgramParameteriARB;
-typedef void (APIENTRY * WXEGLFRAMEBUFFERTEXTUREARB)(GLenum,GLenum,GLuint,GLint);
-WXE_EXTERN WXEGLFRAMEBUFFERTEXTUREARB weglFramebufferTextureARB;
 typedef void (APIENTRY * WXEGLFRAMEBUFFERTEXTUREFACEARB)(GLenum,GLenum,GLuint,GLint,GLenum);
 WXE_EXTERN WXEGLFRAMEBUFFERTEXTUREFACEARB weglFramebufferTextureFaceARB;
-typedef void (APIENTRY * WXEGLVERTEXATTRIBDIVISORARB)(GLuint,GLuint);
-WXE_EXTERN WXEGLVERTEXATTRIBDIVISORARB weglVertexAttribDivisorARB;
 typedef void (APIENTRY * WXEGLFLUSHMAPPEDBUFFERRANGE)(GLenum,GLintptr,GLsizeiptr);
 WXE_EXTERN WXEGLFLUSHMAPPEDBUFFERRANGE weglFlushMappedBufferRange;
 typedef void (APIENTRY * WXEGLBINDVERTEXARRAY)(GLuint);
@@ -1232,6 +1253,342 @@ typedef void (APIENTRY * WXEGLUNIFORMBLOCKBINDING)(GLuint,GLuint,GLuint);
 WXE_EXTERN WXEGLUNIFORMBLOCKBINDING weglUniformBlockBinding;
 typedef void (APIENTRY * WXEGLCOPYBUFFERSUBDATA)(GLenum,GLenum,GLintptr,GLintptr,GLsizeiptr);
 WXE_EXTERN WXEGLCOPYBUFFERSUBDATA weglCopyBufferSubData;
+typedef void (APIENTRY * WXEGLDRAWELEMENTSBASEVERTEX)(GLenum,GLsizei,GLenum,const GLvoid *,GLint);
+WXE_EXTERN WXEGLDRAWELEMENTSBASEVERTEX weglDrawElementsBaseVertex;
+typedef void (APIENTRY * WXEGLDRAWRANGEELEMENTSBASEVERTEX)(GLenum,GLuint,GLuint,GLsizei,GLenum,const GLvoid *,GLint);
+WXE_EXTERN WXEGLDRAWRANGEELEMENTSBASEVERTEX weglDrawRangeElementsBaseVertex;
+typedef void (APIENTRY * WXEGLDRAWELEMENTSINSTANCEDBASEVERTEX)(GLenum,GLsizei,GLenum,const GLvoid *,GLsizei,GLint);
+WXE_EXTERN WXEGLDRAWELEMENTSINSTANCEDBASEVERTEX weglDrawElementsInstancedBaseVertex;
+typedef void (APIENTRY * WXEGLPROVOKINGVERTEX)(GLenum);
+WXE_EXTERN WXEGLPROVOKINGVERTEX weglProvokingVertex;
+typedef GLsync (APIENTRY * WXEGLFENCESYNC)(GLenum,GLbitfield);
+WXE_EXTERN WXEGLFENCESYNC weglFenceSync;
+typedef GLboolean (APIENTRY * WXEGLISSYNC)(GLsync);
+WXE_EXTERN WXEGLISSYNC weglIsSync;
+typedef void (APIENTRY * WXEGLDELETESYNC)(GLsync);
+WXE_EXTERN WXEGLDELETESYNC weglDeleteSync;
+typedef GLenum (APIENTRY * WXEGLCLIENTWAITSYNC)(GLsync,GLbitfield,GLuint64);
+WXE_EXTERN WXEGLCLIENTWAITSYNC weglClientWaitSync;
+typedef void (APIENTRY * WXEGLWAITSYNC)(GLsync,GLbitfield,GLuint64);
+WXE_EXTERN WXEGLWAITSYNC weglWaitSync;
+typedef void (APIENTRY * WXEGLGETINTEGER64V)(GLenum,GLint64 *);
+WXE_EXTERN WXEGLGETINTEGER64V weglGetInteger64v;
+typedef void (APIENTRY * WXEGLGETSYNCIV)(GLsync,GLenum,GLsizei,GLsizei *,GLint *);
+WXE_EXTERN WXEGLGETSYNCIV weglGetSynciv;
+typedef void (APIENTRY * WXEGLTEXIMAGE2DMULTISAMPLE)(GLenum,GLsizei,GLint,GLsizei,GLsizei,GLboolean);
+WXE_EXTERN WXEGLTEXIMAGE2DMULTISAMPLE weglTexImage2DMultisample;
+typedef void (APIENTRY * WXEGLTEXIMAGE3DMULTISAMPLE)(GLenum,GLsizei,GLint,GLsizei,GLsizei,GLsizei,GLboolean);
+WXE_EXTERN WXEGLTEXIMAGE3DMULTISAMPLE weglTexImage3DMultisample;
+typedef void (APIENTRY * WXEGLGETMULTISAMPLEFV)(GLenum,GLuint,GLfloat *);
+WXE_EXTERN WXEGLGETMULTISAMPLEFV weglGetMultisamplefv;
+typedef void (APIENTRY * WXEGLSAMPLEMASKI)(GLuint,GLbitfield);
+WXE_EXTERN WXEGLSAMPLEMASKI weglSampleMaski;
+typedef void (APIENTRY * WXEGLNAMEDSTRINGARB)(GLenum,GLint,const GLchar *,GLint,const GLchar *);
+WXE_EXTERN WXEGLNAMEDSTRINGARB weglNamedStringARB;
+typedef void (APIENTRY * WXEGLDELETENAMEDSTRINGARB)(GLint,const GLchar *);
+WXE_EXTERN WXEGLDELETENAMEDSTRINGARB weglDeleteNamedStringARB;
+typedef void (APIENTRY * WXEGLCOMPILESHADERINCLUDEARB)(GLuint,GLsizei,const GLchar **,const GLint *);
+WXE_EXTERN WXEGLCOMPILESHADERINCLUDEARB weglCompileShaderIncludeARB;
+typedef GLboolean (APIENTRY * WXEGLISNAMEDSTRINGARB)(GLint,const GLchar *);
+WXE_EXTERN WXEGLISNAMEDSTRINGARB weglIsNamedStringARB;
+typedef void (APIENTRY * WXEGLGETNAMEDSTRINGARB)(GLint,const GLchar *,GLsizei,GLint *,GLchar *);
+WXE_EXTERN WXEGLGETNAMEDSTRINGARB weglGetNamedStringARB;
+typedef void (APIENTRY * WXEGLGETNAMEDSTRINGIVARB)(GLint,const GLchar *,GLenum,GLint *);
+WXE_EXTERN WXEGLGETNAMEDSTRINGIVARB weglGetNamedStringivARB;
+typedef void (APIENTRY * WXEGLBINDFRAGDATALOCATIONINDEXED)(GLuint,GLuint,GLuint,const GLchar *);
+WXE_EXTERN WXEGLBINDFRAGDATALOCATIONINDEXED weglBindFragDataLocationIndexed;
+typedef GLint (APIENTRY * WXEGLGETFRAGDATAINDEX)(GLuint,const GLchar *);
+WXE_EXTERN WXEGLGETFRAGDATAINDEX weglGetFragDataIndex;
+typedef void (APIENTRY * WXEGLGENSAMPLERS)(GLsizei,GLuint *);
+WXE_EXTERN WXEGLGENSAMPLERS weglGenSamplers;
+typedef void (APIENTRY * WXEGLDELETESAMPLERS)(GLsizei,const GLuint *);
+WXE_EXTERN WXEGLDELETESAMPLERS weglDeleteSamplers;
+typedef GLboolean (APIENTRY * WXEGLISSAMPLER)(GLuint);
+WXE_EXTERN WXEGLISSAMPLER weglIsSampler;
+typedef void (APIENTRY * WXEGLBINDSAMPLER)(GLuint,GLuint);
+WXE_EXTERN WXEGLBINDSAMPLER weglBindSampler;
+typedef void (APIENTRY * WXEGLSAMPLERPARAMETERI)(GLuint,GLenum,GLint);
+WXE_EXTERN WXEGLSAMPLERPARAMETERI weglSamplerParameteri;
+typedef void (APIENTRY * WXEGLSAMPLERPARAMETERIV)(GLuint,GLenum,const GLint *);
+WXE_EXTERN WXEGLSAMPLERPARAMETERIV weglSamplerParameteriv;
+typedef void (APIENTRY * WXEGLSAMPLERPARAMETERF)(GLuint,GLenum,GLfloat);
+WXE_EXTERN WXEGLSAMPLERPARAMETERF weglSamplerParameterf;
+typedef void (APIENTRY * WXEGLSAMPLERPARAMETERFV)(GLuint,GLenum,const GLfloat *);
+WXE_EXTERN WXEGLSAMPLERPARAMETERFV weglSamplerParameterfv;
+typedef void (APIENTRY * WXEGLSAMPLERPARAMETERIIV)(GLuint,GLenum,const GLint *);
+WXE_EXTERN WXEGLSAMPLERPARAMETERIIV weglSamplerParameterIiv;
+typedef void (APIENTRY * WXEGLSAMPLERPARAMETERIUIV)(GLuint,GLenum,const GLuint *);
+WXE_EXTERN WXEGLSAMPLERPARAMETERIUIV weglSamplerParameterIuiv;
+typedef void (APIENTRY * WXEGLGETSAMPLERPARAMETERIV)(GLuint,GLenum,GLint *);
+WXE_EXTERN WXEGLGETSAMPLERPARAMETERIV weglGetSamplerParameteriv;
+typedef void (APIENTRY * WXEGLGETSAMPLERPARAMETERIIV)(GLuint,GLenum,GLint *);
+WXE_EXTERN WXEGLGETSAMPLERPARAMETERIIV weglGetSamplerParameterIiv;
+typedef void (APIENTRY * WXEGLGETSAMPLERPARAMETERFV)(GLuint,GLenum,GLfloat *);
+WXE_EXTERN WXEGLGETSAMPLERPARAMETERFV weglGetSamplerParameterfv;
+typedef void (APIENTRY * WXEGLGETSAMPLERPARAMETERIUIV)(GLuint,GLenum,GLuint *);
+WXE_EXTERN WXEGLGETSAMPLERPARAMETERIUIV weglGetSamplerParameterIuiv;
+typedef void (APIENTRY * WXEGLQUERYCOUNTER)(GLuint,GLenum);
+WXE_EXTERN WXEGLQUERYCOUNTER weglQueryCounter;
+typedef void (APIENTRY * WXEGLGETQUERYOBJECTI64V)(GLuint,GLenum,GLint64 *);
+WXE_EXTERN WXEGLGETQUERYOBJECTI64V weglGetQueryObjecti64v;
+typedef void (APIENTRY * WXEGLGETQUERYOBJECTUI64V)(GLuint,GLenum,GLuint64 *);
+WXE_EXTERN WXEGLGETQUERYOBJECTUI64V weglGetQueryObjectui64v;
+typedef void (APIENTRY * WXEGLDRAWARRAYSINDIRECT)(GLenum,const GLvoid *);
+WXE_EXTERN WXEGLDRAWARRAYSINDIRECT weglDrawArraysIndirect;
+typedef void (APIENTRY * WXEGLDRAWELEMENTSINDIRECT)(GLenum,GLenum,const GLvoid *);
+WXE_EXTERN WXEGLDRAWELEMENTSINDIRECT weglDrawElementsIndirect;
+typedef void (APIENTRY * WXEGLUNIFORM1D)(GLint,GLdouble);
+WXE_EXTERN WXEGLUNIFORM1D weglUniform1d;
+typedef void (APIENTRY * WXEGLUNIFORM2D)(GLint,GLdouble,GLdouble);
+WXE_EXTERN WXEGLUNIFORM2D weglUniform2d;
+typedef void (APIENTRY * WXEGLUNIFORM3D)(GLint,GLdouble,GLdouble,GLdouble);
+WXE_EXTERN WXEGLUNIFORM3D weglUniform3d;
+typedef void (APIENTRY * WXEGLUNIFORM4D)(GLint,GLdouble,GLdouble,GLdouble,GLdouble);
+WXE_EXTERN WXEGLUNIFORM4D weglUniform4d;
+typedef void (APIENTRY * WXEGLUNIFORM1DV)(GLint,GLsizei,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORM1DV weglUniform1dv;
+typedef void (APIENTRY * WXEGLUNIFORM2DV)(GLint,GLsizei,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORM2DV weglUniform2dv;
+typedef void (APIENTRY * WXEGLUNIFORM3DV)(GLint,GLsizei,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORM3DV weglUniform3dv;
+typedef void (APIENTRY * WXEGLUNIFORM4DV)(GLint,GLsizei,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORM4DV weglUniform4dv;
+typedef void (APIENTRY * WXEGLUNIFORMMATRIX2DV)(GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORMMATRIX2DV weglUniformMatrix2dv;
+typedef void (APIENTRY * WXEGLUNIFORMMATRIX3DV)(GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORMMATRIX3DV weglUniformMatrix3dv;
+typedef void (APIENTRY * WXEGLUNIFORMMATRIX4DV)(GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORMMATRIX4DV weglUniformMatrix4dv;
+typedef void (APIENTRY * WXEGLUNIFORMMATRIX2X3DV)(GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORMMATRIX2X3DV weglUniformMatrix2x3dv;
+typedef void (APIENTRY * WXEGLUNIFORMMATRIX2X4DV)(GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORMMATRIX2X4DV weglUniformMatrix2x4dv;
+typedef void (APIENTRY * WXEGLUNIFORMMATRIX3X2DV)(GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORMMATRIX3X2DV weglUniformMatrix3x2dv;
+typedef void (APIENTRY * WXEGLUNIFORMMATRIX3X4DV)(GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORMMATRIX3X4DV weglUniformMatrix3x4dv;
+typedef void (APIENTRY * WXEGLUNIFORMMATRIX4X2DV)(GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORMMATRIX4X2DV weglUniformMatrix4x2dv;
+typedef void (APIENTRY * WXEGLUNIFORMMATRIX4X3DV)(GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLUNIFORMMATRIX4X3DV weglUniformMatrix4x3dv;
+typedef void (APIENTRY * WXEGLGETUNIFORMDV)(GLuint,GLint,GLdouble *);
+WXE_EXTERN WXEGLGETUNIFORMDV weglGetUniformdv;
+typedef GLint (APIENTRY * WXEGLGETSUBROUTINEUNIFORMLOCATION)(GLuint,GLenum,const GLchar *);
+WXE_EXTERN WXEGLGETSUBROUTINEUNIFORMLOCATION weglGetSubroutineUniformLocation;
+typedef GLuint (APIENTRY * WXEGLGETSUBROUTINEINDEX)(GLuint,GLenum,const GLchar *);
+WXE_EXTERN WXEGLGETSUBROUTINEINDEX weglGetSubroutineIndex;
+typedef void (APIENTRY * WXEGLGETACTIVESUBROUTINEUNIFORMNAME)(GLuint,GLenum,GLuint,GLsizei,GLsizei *,GLchar *);
+WXE_EXTERN WXEGLGETACTIVESUBROUTINEUNIFORMNAME weglGetActiveSubroutineUniformName;
+typedef void (APIENTRY * WXEGLGETACTIVESUBROUTINENAME)(GLuint,GLenum,GLuint,GLsizei,GLsizei *,GLchar *);
+WXE_EXTERN WXEGLGETACTIVESUBROUTINENAME weglGetActiveSubroutineName;
+typedef void (APIENTRY * WXEGLUNIFORMSUBROUTINESUIV)(GLenum,GLsizei,const GLuint *);
+WXE_EXTERN WXEGLUNIFORMSUBROUTINESUIV weglUniformSubroutinesuiv;
+typedef void (APIENTRY * WXEGLGETUNIFORMSUBROUTINEUIV)(GLenum,GLint,GLuint *);
+WXE_EXTERN WXEGLGETUNIFORMSUBROUTINEUIV weglGetUniformSubroutineuiv;
+typedef void (APIENTRY * WXEGLGETPROGRAMSTAGEIV)(GLuint,GLenum,GLenum,GLint *);
+WXE_EXTERN WXEGLGETPROGRAMSTAGEIV weglGetProgramStageiv;
+typedef void (APIENTRY * WXEGLPATCHPARAMETERI)(GLenum,GLint);
+WXE_EXTERN WXEGLPATCHPARAMETERI weglPatchParameteri;
+typedef void (APIENTRY * WXEGLPATCHPARAMETERFV)(GLenum,const GLfloat *);
+WXE_EXTERN WXEGLPATCHPARAMETERFV weglPatchParameterfv;
+typedef void (APIENTRY * WXEGLBINDTRANSFORMFEEDBACK)(GLenum,GLuint);
+WXE_EXTERN WXEGLBINDTRANSFORMFEEDBACK weglBindTransformFeedback;
+typedef void (APIENTRY * WXEGLDELETETRANSFORMFEEDBACKS)(GLsizei,const GLuint *);
+WXE_EXTERN WXEGLDELETETRANSFORMFEEDBACKS weglDeleteTransformFeedbacks;
+typedef void (APIENTRY * WXEGLGENTRANSFORMFEEDBACKS)(GLsizei,GLuint *);
+WXE_EXTERN WXEGLGENTRANSFORMFEEDBACKS weglGenTransformFeedbacks;
+typedef GLboolean (APIENTRY * WXEGLISTRANSFORMFEEDBACK)(GLuint);
+WXE_EXTERN WXEGLISTRANSFORMFEEDBACK weglIsTransformFeedback;
+typedef void (APIENTRY * WXEGLPAUSETRANSFORMFEEDBACK)();
+WXE_EXTERN WXEGLPAUSETRANSFORMFEEDBACK weglPauseTransformFeedback;
+typedef void (APIENTRY * WXEGLRESUMETRANSFORMFEEDBACK)();
+WXE_EXTERN WXEGLRESUMETRANSFORMFEEDBACK weglResumeTransformFeedback;
+typedef void (APIENTRY * WXEGLDRAWTRANSFORMFEEDBACK)(GLenum,GLuint);
+WXE_EXTERN WXEGLDRAWTRANSFORMFEEDBACK weglDrawTransformFeedback;
+typedef void (APIENTRY * WXEGLDRAWTRANSFORMFEEDBACKSTREAM)(GLenum,GLuint,GLuint);
+WXE_EXTERN WXEGLDRAWTRANSFORMFEEDBACKSTREAM weglDrawTransformFeedbackStream;
+typedef void (APIENTRY * WXEGLBEGINQUERYINDEXED)(GLenum,GLuint,GLuint);
+WXE_EXTERN WXEGLBEGINQUERYINDEXED weglBeginQueryIndexed;
+typedef void (APIENTRY * WXEGLENDQUERYINDEXED)(GLenum,GLuint);
+WXE_EXTERN WXEGLENDQUERYINDEXED weglEndQueryIndexed;
+typedef void (APIENTRY * WXEGLGETQUERYINDEXEDIV)(GLenum,GLuint,GLenum,GLint *);
+WXE_EXTERN WXEGLGETQUERYINDEXEDIV weglGetQueryIndexediv;
+typedef void (APIENTRY * WXEGLRELEASESHADERCOMPILER)();
+WXE_EXTERN WXEGLRELEASESHADERCOMPILER weglReleaseShaderCompiler;
+typedef void (APIENTRY * WXEGLSHADERBINARY)(GLsizei,const GLuint *,GLenum,const GLvoid *,GLsizei);
+WXE_EXTERN WXEGLSHADERBINARY weglShaderBinary;
+typedef void (APIENTRY * WXEGLGETSHADERPRECISIONFORMAT)(GLenum,GLenum,GLint *,GLint *);
+WXE_EXTERN WXEGLGETSHADERPRECISIONFORMAT weglGetShaderPrecisionFormat;
+typedef void (APIENTRY * WXEGLDEPTHRANGEF)(GLclampf,GLclampf);
+WXE_EXTERN WXEGLDEPTHRANGEF weglDepthRangef;
+typedef void (APIENTRY * WXEGLCLEARDEPTHF)(GLclampf);
+WXE_EXTERN WXEGLCLEARDEPTHF weglClearDepthf;
+typedef void (APIENTRY * WXEGLGETPROGRAMBINARY)(GLuint,GLsizei,GLsizei *,GLenum *,GLvoid *);
+WXE_EXTERN WXEGLGETPROGRAMBINARY weglGetProgramBinary;
+typedef void (APIENTRY * WXEGLPROGRAMBINARY)(GLuint,GLenum,const GLvoid *,GLsizei);
+WXE_EXTERN WXEGLPROGRAMBINARY weglProgramBinary;
+typedef void (APIENTRY * WXEGLPROGRAMPARAMETERI)(GLuint,GLenum,GLint);
+WXE_EXTERN WXEGLPROGRAMPARAMETERI weglProgramParameteri;
+typedef void (APIENTRY * WXEGLUSEPROGRAMSTAGES)(GLuint,GLbitfield,GLuint);
+WXE_EXTERN WXEGLUSEPROGRAMSTAGES weglUseProgramStages;
+typedef void (APIENTRY * WXEGLACTIVESHADERPROGRAM)(GLuint,GLuint);
+WXE_EXTERN WXEGLACTIVESHADERPROGRAM weglActiveShaderProgram;
+typedef GLuint (APIENTRY * WXEGLCREATESHADERPROGRAMV)(GLenum,GLsizei,const GLchar **);
+WXE_EXTERN WXEGLCREATESHADERPROGRAMV weglCreateShaderProgramv;
+typedef void (APIENTRY * WXEGLBINDPROGRAMPIPELINE)(GLuint);
+WXE_EXTERN WXEGLBINDPROGRAMPIPELINE weglBindProgramPipeline;
+typedef void (APIENTRY * WXEGLDELETEPROGRAMPIPELINES)(GLsizei,const GLuint *);
+WXE_EXTERN WXEGLDELETEPROGRAMPIPELINES weglDeleteProgramPipelines;
+typedef void (APIENTRY * WXEGLGENPROGRAMPIPELINES)(GLsizei,GLuint *);
+WXE_EXTERN WXEGLGENPROGRAMPIPELINES weglGenProgramPipelines;
+typedef GLboolean (APIENTRY * WXEGLISPROGRAMPIPELINE)(GLuint);
+WXE_EXTERN WXEGLISPROGRAMPIPELINE weglIsProgramPipeline;
+typedef void (APIENTRY * WXEGLGETPROGRAMPIPELINEIV)(GLuint,GLenum,GLint *);
+WXE_EXTERN WXEGLGETPROGRAMPIPELINEIV weglGetProgramPipelineiv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM1I)(GLuint,GLint,GLint);
+WXE_EXTERN WXEGLPROGRAMUNIFORM1I weglProgramUniform1i;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM1IV)(GLuint,GLint,GLsizei,const GLint *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM1IV weglProgramUniform1iv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM1F)(GLuint,GLint,GLfloat);
+WXE_EXTERN WXEGLPROGRAMUNIFORM1F weglProgramUniform1f;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM1FV)(GLuint,GLint,GLsizei,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM1FV weglProgramUniform1fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM1D)(GLuint,GLint,GLdouble);
+WXE_EXTERN WXEGLPROGRAMUNIFORM1D weglProgramUniform1d;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM1DV)(GLuint,GLint,GLsizei,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM1DV weglProgramUniform1dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM1UI)(GLuint,GLint,GLuint);
+WXE_EXTERN WXEGLPROGRAMUNIFORM1UI weglProgramUniform1ui;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM1UIV)(GLuint,GLint,GLsizei,const GLuint *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM1UIV weglProgramUniform1uiv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM2I)(GLuint,GLint,GLint,GLint);
+WXE_EXTERN WXEGLPROGRAMUNIFORM2I weglProgramUniform2i;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM2IV)(GLuint,GLint,GLsizei,const GLint *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM2IV weglProgramUniform2iv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM2F)(GLuint,GLint,GLfloat,GLfloat);
+WXE_EXTERN WXEGLPROGRAMUNIFORM2F weglProgramUniform2f;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM2FV)(GLuint,GLint,GLsizei,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM2FV weglProgramUniform2fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM2D)(GLuint,GLint,GLdouble,GLdouble);
+WXE_EXTERN WXEGLPROGRAMUNIFORM2D weglProgramUniform2d;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM2DV)(GLuint,GLint,GLsizei,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM2DV weglProgramUniform2dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM2UI)(GLuint,GLint,GLuint,GLuint);
+WXE_EXTERN WXEGLPROGRAMUNIFORM2UI weglProgramUniform2ui;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM2UIV)(GLuint,GLint,GLsizei,const GLuint *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM2UIV weglProgramUniform2uiv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM3I)(GLuint,GLint,GLint,GLint,GLint);
+WXE_EXTERN WXEGLPROGRAMUNIFORM3I weglProgramUniform3i;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM3IV)(GLuint,GLint,GLsizei,const GLint *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM3IV weglProgramUniform3iv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM3F)(GLuint,GLint,GLfloat,GLfloat,GLfloat);
+WXE_EXTERN WXEGLPROGRAMUNIFORM3F weglProgramUniform3f;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM3FV)(GLuint,GLint,GLsizei,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM3FV weglProgramUniform3fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM3D)(GLuint,GLint,GLdouble,GLdouble,GLdouble);
+WXE_EXTERN WXEGLPROGRAMUNIFORM3D weglProgramUniform3d;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM3DV)(GLuint,GLint,GLsizei,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM3DV weglProgramUniform3dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM3UI)(GLuint,GLint,GLuint,GLuint,GLuint);
+WXE_EXTERN WXEGLPROGRAMUNIFORM3UI weglProgramUniform3ui;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM3UIV)(GLuint,GLint,GLsizei,const GLuint *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM3UIV weglProgramUniform3uiv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM4I)(GLuint,GLint,GLint,GLint,GLint,GLint);
+WXE_EXTERN WXEGLPROGRAMUNIFORM4I weglProgramUniform4i;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM4IV)(GLuint,GLint,GLsizei,const GLint *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM4IV weglProgramUniform4iv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM4F)(GLuint,GLint,GLfloat,GLfloat,GLfloat,GLfloat);
+WXE_EXTERN WXEGLPROGRAMUNIFORM4F weglProgramUniform4f;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM4FV)(GLuint,GLint,GLsizei,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM4FV weglProgramUniform4fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM4D)(GLuint,GLint,GLdouble,GLdouble,GLdouble,GLdouble);
+WXE_EXTERN WXEGLPROGRAMUNIFORM4D weglProgramUniform4d;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM4DV)(GLuint,GLint,GLsizei,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM4DV weglProgramUniform4dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM4UI)(GLuint,GLint,GLuint,GLuint,GLuint,GLuint);
+WXE_EXTERN WXEGLPROGRAMUNIFORM4UI weglProgramUniform4ui;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORM4UIV)(GLuint,GLint,GLsizei,const GLuint *);
+WXE_EXTERN WXEGLPROGRAMUNIFORM4UIV weglProgramUniform4uiv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX2FV)(GLuint,GLint,GLsizei,GLboolean,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX2FV weglProgramUniformMatrix2fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX3FV)(GLuint,GLint,GLsizei,GLboolean,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX3FV weglProgramUniformMatrix3fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX4FV)(GLuint,GLint,GLsizei,GLboolean,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX4FV weglProgramUniformMatrix4fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX2DV)(GLuint,GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX2DV weglProgramUniformMatrix2dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX3DV)(GLuint,GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX3DV weglProgramUniformMatrix3dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX4DV)(GLuint,GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX4DV weglProgramUniformMatrix4dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX2X3FV)(GLuint,GLint,GLsizei,GLboolean,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX2X3FV weglProgramUniformMatrix2x3fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX3X2FV)(GLuint,GLint,GLsizei,GLboolean,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX3X2FV weglProgramUniformMatrix3x2fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX2X4FV)(GLuint,GLint,GLsizei,GLboolean,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX2X4FV weglProgramUniformMatrix2x4fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX4X2FV)(GLuint,GLint,GLsizei,GLboolean,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX4X2FV weglProgramUniformMatrix4x2fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX3X4FV)(GLuint,GLint,GLsizei,GLboolean,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX3X4FV weglProgramUniformMatrix3x4fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX4X3FV)(GLuint,GLint,GLsizei,GLboolean,const GLfloat *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX4X3FV weglProgramUniformMatrix4x3fv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX2X3DV)(GLuint,GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX2X3DV weglProgramUniformMatrix2x3dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX3X2DV)(GLuint,GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX3X2DV weglProgramUniformMatrix3x2dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX2X4DV)(GLuint,GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX2X4DV weglProgramUniformMatrix2x4dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX4X2DV)(GLuint,GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX4X2DV weglProgramUniformMatrix4x2dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX3X4DV)(GLuint,GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX3X4DV weglProgramUniformMatrix3x4dv;
+typedef void (APIENTRY * WXEGLPROGRAMUNIFORMMATRIX4X3DV)(GLuint,GLint,GLsizei,GLboolean,const GLdouble *);
+WXE_EXTERN WXEGLPROGRAMUNIFORMMATRIX4X3DV weglProgramUniformMatrix4x3dv;
+typedef void (APIENTRY * WXEGLVALIDATEPROGRAMPIPELINE)(GLuint);
+WXE_EXTERN WXEGLVALIDATEPROGRAMPIPELINE weglValidateProgramPipeline;
+typedef void (APIENTRY * WXEGLGETPROGRAMPIPELINEINFOLOG)(GLuint,GLsizei,GLsizei *,GLchar *);
+WXE_EXTERN WXEGLGETPROGRAMPIPELINEINFOLOG weglGetProgramPipelineInfoLog;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBL1DV)(GLuint,const GLdouble *);
+WXE_EXTERN WXEGLVERTEXATTRIBL1DV weglVertexAttribL1dv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBL2DV)(GLuint,const GLdouble *);
+WXE_EXTERN WXEGLVERTEXATTRIBL2DV weglVertexAttribL2dv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBL3DV)(GLuint,const GLdouble *);
+WXE_EXTERN WXEGLVERTEXATTRIBL3DV weglVertexAttribL3dv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBL4DV)(GLuint,const GLdouble *);
+WXE_EXTERN WXEGLVERTEXATTRIBL4DV weglVertexAttribL4dv;
+typedef void (APIENTRY * WXEGLVERTEXATTRIBLPOINTER)(GLuint,GLint,GLenum,GLsizei,const GLvoid *);
+WXE_EXTERN WXEGLVERTEXATTRIBLPOINTER weglVertexAttribLPointer;
+typedef void (APIENTRY * WXEGLGETVERTEXATTRIBLDV)(GLuint,GLenum,GLdouble *);
+WXE_EXTERN WXEGLGETVERTEXATTRIBLDV weglGetVertexAttribLdv;
+typedef void (APIENTRY * WXEGLVIEWPORTARRAYV)(GLuint,GLsizei,const GLfloat *);
+WXE_EXTERN WXEGLVIEWPORTARRAYV weglViewportArrayv;
+typedef void (APIENTRY * WXEGLVIEWPORTINDEXEDF)(GLuint,GLfloat,GLfloat,GLfloat,GLfloat);
+WXE_EXTERN WXEGLVIEWPORTINDEXEDF weglViewportIndexedf;
+typedef void (APIENTRY * WXEGLVIEWPORTINDEXEDFV)(GLuint,const GLfloat *);
+WXE_EXTERN WXEGLVIEWPORTINDEXEDFV weglViewportIndexedfv;
+typedef void (APIENTRY * WXEGLSCISSORARRAYV)(GLuint,GLsizei,const GLint *);
+WXE_EXTERN WXEGLSCISSORARRAYV weglScissorArrayv;
+typedef void (APIENTRY * WXEGLSCISSORINDEXED)(GLuint,GLint,GLint,GLsizei,GLsizei);
+WXE_EXTERN WXEGLSCISSORINDEXED weglScissorIndexed;
+typedef void (APIENTRY * WXEGLSCISSORINDEXEDV)(GLuint,const GLint *);
+WXE_EXTERN WXEGLSCISSORINDEXEDV weglScissorIndexedv;
+typedef void (APIENTRY * WXEGLDEPTHRANGEARRAYV)(GLuint,GLsizei,const GLclampd *);
+WXE_EXTERN WXEGLDEPTHRANGEARRAYV weglDepthRangeArrayv;
+typedef void (APIENTRY * WXEGLDEPTHRANGEINDEXED)(GLuint,GLclampd,GLclampd);
+WXE_EXTERN WXEGLDEPTHRANGEINDEXED weglDepthRangeIndexed;
+typedef void (APIENTRY * WXEGLGETFLOATI_V)(GLenum,GLuint,GLfloat *);
+WXE_EXTERN WXEGLGETFLOATI_V weglGetFloati_v;
+typedef void (APIENTRY * WXEGLGETDOUBLEI_V)(GLenum,GLuint,GLdouble *);
+WXE_EXTERN WXEGLGETDOUBLEI_V weglGetDoublei_v;
+typedef void (APIENTRY * WXEGLDEBUGMESSAGECONTROLARB)(GLenum,GLenum,GLenum,GLsizei,const GLuint *,GLboolean);
+WXE_EXTERN WXEGLDEBUGMESSAGECONTROLARB weglDebugMessageControlARB;
+typedef void (APIENTRY * WXEGLDEBUGMESSAGEINSERTARB)(GLenum,GLenum,GLuint,GLenum,GLsizei,const GLchar *);
+WXE_EXTERN WXEGLDEBUGMESSAGEINSERTARB weglDebugMessageInsertARB;
+typedef GLuint (APIENTRY * WXEGLGETDEBUGMESSAGELOGARB)(GLuint,GLsizei,GLenum *,GLenum *,GLuint *,GLenum *,GLsizei *,GLchar *);
+WXE_EXTERN WXEGLGETDEBUGMESSAGELOGARB weglGetDebugMessageLogARB;
+typedef GLenum (APIENTRY * WXEGLGETGRAPHICSRESETSTATUSARB)();
+WXE_EXTERN WXEGLGETGRAPHICSRESETSTATUSARB weglGetGraphicsResetStatusARB;
 typedef void (APIENTRY * WXEGLRESIZEBUFFERSMESA)();
 WXE_EXTERN WXEGLRESIZEBUFFERSMESA weglResizeBuffersMESA;
 typedef void (APIENTRY * WXEGLWINDOWPOS4DVMESA)(const GLdouble *);
diff --git a/lib/wx/c_src/gen/gl_finit.h b/lib/wx/c_src/gen/gl_finit.h
index ef29f05c4d..583e36faf7 100644
--- a/lib/wx/c_src/gen/gl_finit.h
+++ b/lib/wx/c_src/gen/gl_finit.h
@@ -18,11 +18,7 @@
 */
 /***** This file is generated do not edit ****/
 
-static struct {
-   const char * name;
-   const char * alt;
-   void * func;
-} gl_fns[] = 
+gl_fns_t gl_fns[] = 
 {
  {"glAccum", NULL, &weglAccum},
  {"glAlphaFunc", NULL, &weglAlphaFunc},
@@ -394,7 +390,7 @@ static struct {
  {"glBufferData", "glBufferDataARB", &weglBufferData},
  {"glBufferSubData", "glBufferSubDataARB", &weglBufferSubData},
  {"glGetBufferSubData", "glGetBufferSubDataARB", &weglGetBufferSubData},
- {"glGetBufferParameteriv", "glGetBufferParameterivARB", &weglGetBufferParameteriv},
+ {"glGetBufferParameteriv", NULL, &weglGetBufferParameteriv},
  {"glBlendEquationSeparate", "glBlendEquationSeparateEXT", &weglBlendEquationSeparate},
  {"glDrawBuffers", "glDrawBuffersARB", &weglDrawBuffers},
  {"glStencilOpSeparate", "glStencilOpSeparateATI", &weglStencilOpSeparate},
@@ -498,6 +494,18 @@ static struct {
  {"glVertexAttribIPointer", NULL, &weglVertexAttribIPointer},
  {"glGetVertexAttribIiv", NULL, &weglGetVertexAttribIiv},
  {"glGetVertexAttribIuiv", NULL, &weglGetVertexAttribIuiv},
+ {"glVertexAttribI1iv", NULL, &weglVertexAttribI1iv},
+ {"glVertexAttribI2iv", NULL, &weglVertexAttribI2iv},
+ {"glVertexAttribI3iv", NULL, &weglVertexAttribI3iv},
+ {"glVertexAttribI4iv", NULL, &weglVertexAttribI4iv},
+ {"glVertexAttribI1uiv", NULL, &weglVertexAttribI1uiv},
+ {"glVertexAttribI2uiv", NULL, &weglVertexAttribI2uiv},
+ {"glVertexAttribI3uiv", NULL, &weglVertexAttribI3uiv},
+ {"glVertexAttribI4uiv", NULL, &weglVertexAttribI4uiv},
+ {"glVertexAttribI4bv", NULL, &weglVertexAttribI4bv},
+ {"glVertexAttribI4sv", NULL, &weglVertexAttribI4sv},
+ {"glVertexAttribI4ubv", NULL, &weglVertexAttribI4ubv},
+ {"glVertexAttribI4usv", NULL, &weglVertexAttribI4usv},
  {"glGetUniformuiv", NULL, &weglGetUniformuiv},
  {"glBindFragDataLocation", NULL, &weglBindFragDataLocation},
  {"glGetFragDataLocation", NULL, &weglGetFragDataLocation},
@@ -518,22 +526,19 @@ static struct {
  {"glClearBufferfv", NULL, &weglClearBufferfv},
  {"glClearBufferfi", NULL, &weglClearBufferfi},
  {"glGetStringi", NULL, &weglGetStringi},
- {"glVertexAttribI1iv", NULL, &weglVertexAttribI1iv},
- {"glVertexAttribI2iv", NULL, &weglVertexAttribI2iv},
- {"glVertexAttribI3iv", NULL, &weglVertexAttribI3iv},
- {"glVertexAttribI4iv", NULL, &weglVertexAttribI4iv},
- {"glVertexAttribI1uiv", NULL, &weglVertexAttribI1uiv},
- {"glVertexAttribI2uiv", NULL, &weglVertexAttribI2uiv},
- {"glVertexAttribI3uiv", NULL, &weglVertexAttribI3uiv},
- {"glVertexAttribI4uiv", NULL, &weglVertexAttribI4uiv},
- {"glVertexAttribI4bv", NULL, &weglVertexAttribI4bv},
- {"glVertexAttribI4sv", NULL, &weglVertexAttribI4sv},
- {"glVertexAttribI4ubv", NULL, &weglVertexAttribI4ubv},
- {"glVertexAttribI4usv", NULL, &weglVertexAttribI4usv},
  {"glDrawArraysInstanced", "glDrawArraysInstancedARB", &weglDrawArraysInstanced},
  {"glDrawElementsInstanced", "glDrawElementsInstancedARB", &weglDrawElementsInstanced},
  {"glTexBuffer", "glTexBufferARB", &weglTexBuffer},
  {"glPrimitiveRestartIndex", NULL, &weglPrimitiveRestartIndex},
+ {"glGetInteger64i_v", NULL, &weglGetInteger64i_v},
+ {"glGetBufferParameteri64v", NULL, &weglGetBufferParameteri64v},
+ {"glFramebufferTexture", "glFramebufferTextureARB", &weglFramebufferTexture},
+ {"glVertexAttribDivisor", "glVertexAttribDivisorARB", &weglVertexAttribDivisor},
+ {"glMinSampleShading", "glMinSampleShadingARB", &weglMinSampleShading},
+ {"glBlendEquationi", "glBlendEquationiARB", &weglBlendEquationi},
+ {"glBlendEquationSeparatei", "glBlendEquationSeparateiARB", &weglBlendEquationSeparatei},
+ {"glBlendFunci", "glBlendFunciARB", &weglBlendFunci},
+ {"glBlendFuncSeparatei", "glBlendFuncSeparateiARB", &weglBlendFuncSeparatei},
  {"glLoadTransposeMatrixfARB", NULL, &weglLoadTransposeMatrixfARB},
  {"glLoadTransposeMatrixdARB", NULL, &weglLoadTransposeMatrixdARB},
  {"glMultTransposeMatrixfARB", NULL, &weglMultTransposeMatrixfARB},
@@ -568,6 +573,7 @@ static struct {
  {"glGetProgramLocalParameterdvARB", NULL, &weglGetProgramLocalParameterdvARB},
  {"glGetProgramLocalParameterfvARB", NULL, &weglGetProgramLocalParameterfvARB},
  {"glGetProgramStringARB", NULL, &weglGetProgramStringARB},
+ {"glGetBufferParameterivARB", NULL, &weglGetBufferParameterivARB},
  {"glDeleteObjectARB", NULL, &weglDeleteObjectARB},
  {"glGetHandleARB", NULL, &weglGetHandleARB},
  {"glDetachObjectARB", NULL, &weglDetachObjectARB},
@@ -611,10 +617,7 @@ static struct {
  {"glBlitFramebuffer", "glBlitFramebufferEXT", &weglBlitFramebuffer},
  {"glRenderbufferStorageMultisample", "glRenderbufferStorageMultisampleEXT", &weglRenderbufferStorageMultisample},
  {"glFramebufferTextureLayer", "glFramebufferTextureLayerARB", &weglFramebufferTextureLayer},
- {"glProgramParameteriARB", NULL, &weglProgramParameteriARB},
- {"glFramebufferTextureARB", NULL, &weglFramebufferTextureARB},
  {"glFramebufferTextureFaceARB", NULL, &weglFramebufferTextureFaceARB},
- {"glVertexAttribDivisorARB", NULL, &weglVertexAttribDivisorARB},
  {"glFlushMappedBufferRange", NULL, &weglFlushMappedBufferRange},
  {"glBindVertexArray", NULL, &weglBindVertexArray},
  {"glDeleteVertexArrays", NULL, &weglDeleteVertexArrays},
@@ -628,6 +631,174 @@ static struct {
  {"glGetActiveUniformBlockName", NULL, &weglGetActiveUniformBlockName},
  {"glUniformBlockBinding", NULL, &weglUniformBlockBinding},
  {"glCopyBufferSubData", NULL, &weglCopyBufferSubData},
+ {"glDrawElementsBaseVertex", NULL, &weglDrawElementsBaseVertex},
+ {"glDrawRangeElementsBaseVertex", NULL, &weglDrawRangeElementsBaseVertex},
+ {"glDrawElementsInstancedBaseVertex", NULL, &weglDrawElementsInstancedBaseVertex},
+ {"glProvokingVertex", NULL, &weglProvokingVertex},
+ {"glFenceSync", NULL, &weglFenceSync},
+ {"glIsSync", NULL, &weglIsSync},
+ {"glDeleteSync", NULL, &weglDeleteSync},
+ {"glClientWaitSync", NULL, &weglClientWaitSync},
+ {"glWaitSync", NULL, &weglWaitSync},
+ {"glGetInteger64v", NULL, &weglGetInteger64v},
+ {"glGetSynciv", NULL, &weglGetSynciv},
+ {"glTexImage2DMultisample", NULL, &weglTexImage2DMultisample},
+ {"glTexImage3DMultisample", NULL, &weglTexImage3DMultisample},
+ {"glGetMultisamplefv", NULL, &weglGetMultisamplefv},
+ {"glSampleMaski", NULL, &weglSampleMaski},
+ {"glNamedStringARB", NULL, &weglNamedStringARB},
+ {"glDeleteNamedStringARB", NULL, &weglDeleteNamedStringARB},
+ {"glCompileShaderIncludeARB", NULL, &weglCompileShaderIncludeARB},
+ {"glIsNamedStringARB", NULL, &weglIsNamedStringARB},
+ {"glGetNamedStringARB", NULL, &weglGetNamedStringARB},
+ {"glGetNamedStringivARB", NULL, &weglGetNamedStringivARB},
+ {"glBindFragDataLocationIndexed", NULL, &weglBindFragDataLocationIndexed},
+ {"glGetFragDataIndex", NULL, &weglGetFragDataIndex},
+ {"glGenSamplers", NULL, &weglGenSamplers},
+ {"glDeleteSamplers", NULL, &weglDeleteSamplers},
+ {"glIsSampler", NULL, &weglIsSampler},
+ {"glBindSampler", NULL, &weglBindSampler},
+ {"glSamplerParameteri", NULL, &weglSamplerParameteri},
+ {"glSamplerParameteriv", NULL, &weglSamplerParameteriv},
+ {"glSamplerParameterf", NULL, &weglSamplerParameterf},
+ {"glSamplerParameterfv", NULL, &weglSamplerParameterfv},
+ {"glSamplerParameterIiv", NULL, &weglSamplerParameterIiv},
+ {"glSamplerParameterIuiv", NULL, &weglSamplerParameterIuiv},
+ {"glGetSamplerParameteriv", NULL, &weglGetSamplerParameteriv},
+ {"glGetSamplerParameterIiv", NULL, &weglGetSamplerParameterIiv},
+ {"glGetSamplerParameterfv", NULL, &weglGetSamplerParameterfv},
+ {"glGetSamplerParameterIuiv", NULL, &weglGetSamplerParameterIuiv},
+ {"glQueryCounter", NULL, &weglQueryCounter},
+ {"glGetQueryObjecti64v", NULL, &weglGetQueryObjecti64v},
+ {"glGetQueryObjectui64v", NULL, &weglGetQueryObjectui64v},
+ {"glDrawArraysIndirect", NULL, &weglDrawArraysIndirect},
+ {"glDrawElementsIndirect", NULL, &weglDrawElementsIndirect},
+ {"glUniform1d", NULL, &weglUniform1d},
+ {"glUniform2d", NULL, &weglUniform2d},
+ {"glUniform3d", NULL, &weglUniform3d},
+ {"glUniform4d", NULL, &weglUniform4d},
+ {"glUniform1dv", NULL, &weglUniform1dv},
+ {"glUniform2dv", NULL, &weglUniform2dv},
+ {"glUniform3dv", NULL, &weglUniform3dv},
+ {"glUniform4dv", NULL, &weglUniform4dv},
+ {"glUniformMatrix2dv", NULL, &weglUniformMatrix2dv},
+ {"glUniformMatrix3dv", NULL, &weglUniformMatrix3dv},
+ {"glUniformMatrix4dv", NULL, &weglUniformMatrix4dv},
+ {"glUniformMatrix2x3dv", NULL, &weglUniformMatrix2x3dv},
+ {"glUniformMatrix2x4dv", NULL, &weglUniformMatrix2x4dv},
+ {"glUniformMatrix3x2dv", NULL, &weglUniformMatrix3x2dv},
+ {"glUniformMatrix3x4dv", NULL, &weglUniformMatrix3x4dv},
+ {"glUniformMatrix4x2dv", NULL, &weglUniformMatrix4x2dv},
+ {"glUniformMatrix4x3dv", NULL, &weglUniformMatrix4x3dv},
+ {"glGetUniformdv", NULL, &weglGetUniformdv},
+ {"glGetSubroutineUniformLocation", NULL, &weglGetSubroutineUniformLocation},
+ {"glGetSubroutineIndex", NULL, &weglGetSubroutineIndex},
+ {"glGetActiveSubroutineUniformName", NULL, &weglGetActiveSubroutineUniformName},
+ {"glGetActiveSubroutineName", NULL, &weglGetActiveSubroutineName},
+ {"glUniformSubroutinesuiv", NULL, &weglUniformSubroutinesuiv},
+ {"glGetUniformSubroutineuiv", NULL, &weglGetUniformSubroutineuiv},
+ {"glGetProgramStageiv", NULL, &weglGetProgramStageiv},
+ {"glPatchParameteri", NULL, &weglPatchParameteri},
+ {"glPatchParameterfv", NULL, &weglPatchParameterfv},
+ {"glBindTransformFeedback", NULL, &weglBindTransformFeedback},
+ {"glDeleteTransformFeedbacks", NULL, &weglDeleteTransformFeedbacks},
+ {"glGenTransformFeedbacks", NULL, &weglGenTransformFeedbacks},
+ {"glIsTransformFeedback", NULL, &weglIsTransformFeedback},
+ {"glPauseTransformFeedback", NULL, &weglPauseTransformFeedback},
+ {"glResumeTransformFeedback", NULL, &weglResumeTransformFeedback},
+ {"glDrawTransformFeedback", NULL, &weglDrawTransformFeedback},
+ {"glDrawTransformFeedbackStream", NULL, &weglDrawTransformFeedbackStream},
+ {"glBeginQueryIndexed", NULL, &weglBeginQueryIndexed},
+ {"glEndQueryIndexed", NULL, &weglEndQueryIndexed},
+ {"glGetQueryIndexediv", NULL, &weglGetQueryIndexediv},
+ {"glReleaseShaderCompiler", NULL, &weglReleaseShaderCompiler},
+ {"glShaderBinary", NULL, &weglShaderBinary},
+ {"glGetShaderPrecisionFormat", NULL, &weglGetShaderPrecisionFormat},
+ {"glDepthRangef", NULL, &weglDepthRangef},
+ {"glClearDepthf", NULL, &weglClearDepthf},
+ {"glGetProgramBinary", NULL, &weglGetProgramBinary},
+ {"glProgramBinary", NULL, &weglProgramBinary},
+ {"glProgramParameteri", "glProgramParameteriARB", &weglProgramParameteri},
+ {"glUseProgramStages", NULL, &weglUseProgramStages},
+ {"glActiveShaderProgram", NULL, &weglActiveShaderProgram},
+ {"glCreateShaderProgramv", NULL, &weglCreateShaderProgramv},
+ {"glBindProgramPipeline", NULL, &weglBindProgramPipeline},
+ {"glDeleteProgramPipelines", NULL, &weglDeleteProgramPipelines},
+ {"glGenProgramPipelines", NULL, &weglGenProgramPipelines},
+ {"glIsProgramPipeline", NULL, &weglIsProgramPipeline},
+ {"glGetProgramPipelineiv", NULL, &weglGetProgramPipelineiv},
+ {"glProgramUniform1i", NULL, &weglProgramUniform1i},
+ {"glProgramUniform1iv", NULL, &weglProgramUniform1iv},
+ {"glProgramUniform1f", NULL, &weglProgramUniform1f},
+ {"glProgramUniform1fv", NULL, &weglProgramUniform1fv},
+ {"glProgramUniform1d", NULL, &weglProgramUniform1d},
+ {"glProgramUniform1dv", NULL, &weglProgramUniform1dv},
+ {"glProgramUniform1ui", NULL, &weglProgramUniform1ui},
+ {"glProgramUniform1uiv", NULL, &weglProgramUniform1uiv},
+ {"glProgramUniform2i", NULL, &weglProgramUniform2i},
+ {"glProgramUniform2iv", NULL, &weglProgramUniform2iv},
+ {"glProgramUniform2f", NULL, &weglProgramUniform2f},
+ {"glProgramUniform2fv", NULL, &weglProgramUniform2fv},
+ {"glProgramUniform2d", NULL, &weglProgramUniform2d},
+ {"glProgramUniform2dv", NULL, &weglProgramUniform2dv},
+ {"glProgramUniform2ui", NULL, &weglProgramUniform2ui},
+ {"glProgramUniform2uiv", NULL, &weglProgramUniform2uiv},
+ {"glProgramUniform3i", NULL, &weglProgramUniform3i},
+ {"glProgramUniform3iv", NULL, &weglProgramUniform3iv},
+ {"glProgramUniform3f", NULL, &weglProgramUniform3f},
+ {"glProgramUniform3fv", NULL, &weglProgramUniform3fv},
+ {"glProgramUniform3d", NULL, &weglProgramUniform3d},
+ {"glProgramUniform3dv", NULL, &weglProgramUniform3dv},
+ {"glProgramUniform3ui", NULL, &weglProgramUniform3ui},
+ {"glProgramUniform3uiv", NULL, &weglProgramUniform3uiv},
+ {"glProgramUniform4i", NULL, &weglProgramUniform4i},
+ {"glProgramUniform4iv", NULL, &weglProgramUniform4iv},
+ {"glProgramUniform4f", NULL, &weglProgramUniform4f},
+ {"glProgramUniform4fv", NULL, &weglProgramUniform4fv},
+ {"glProgramUniform4d", NULL, &weglProgramUniform4d},
+ {"glProgramUniform4dv", NULL, &weglProgramUniform4dv},
+ {"glProgramUniform4ui", NULL, &weglProgramUniform4ui},
+ {"glProgramUniform4uiv", NULL, &weglProgramUniform4uiv},
+ {"glProgramUniformMatrix2fv", NULL, &weglProgramUniformMatrix2fv},
+ {"glProgramUniformMatrix3fv", NULL, &weglProgramUniformMatrix3fv},
+ {"glProgramUniformMatrix4fv", NULL, &weglProgramUniformMatrix4fv},
+ {"glProgramUniformMatrix2dv", NULL, &weglProgramUniformMatrix2dv},
+ {"glProgramUniformMatrix3dv", NULL, &weglProgramUniformMatrix3dv},
+ {"glProgramUniformMatrix4dv", NULL, &weglProgramUniformMatrix4dv},
+ {"glProgramUniformMatrix2x3fv", NULL, &weglProgramUniformMatrix2x3fv},
+ {"glProgramUniformMatrix3x2fv", NULL, &weglProgramUniformMatrix3x2fv},
+ {"glProgramUniformMatrix2x4fv", NULL, &weglProgramUniformMatrix2x4fv},
+ {"glProgramUniformMatrix4x2fv", NULL, &weglProgramUniformMatrix4x2fv},
+ {"glProgramUniformMatrix3x4fv", NULL, &weglProgramUniformMatrix3x4fv},
+ {"glProgramUniformMatrix4x3fv", NULL, &weglProgramUniformMatrix4x3fv},
+ {"glProgramUniformMatrix2x3dv", NULL, &weglProgramUniformMatrix2x3dv},
+ {"glProgramUniformMatrix3x2dv", NULL, &weglProgramUniformMatrix3x2dv},
+ {"glProgramUniformMatrix2x4dv", NULL, &weglProgramUniformMatrix2x4dv},
+ {"glProgramUniformMatrix4x2dv", NULL, &weglProgramUniformMatrix4x2dv},
+ {"glProgramUniformMatrix3x4dv", NULL, &weglProgramUniformMatrix3x4dv},
+ {"glProgramUniformMatrix4x3dv", NULL, &weglProgramUniformMatrix4x3dv},
+ {"glValidateProgramPipeline", NULL, &weglValidateProgramPipeline},
+ {"glGetProgramPipelineInfoLog", NULL, &weglGetProgramPipelineInfoLog},
+ {"glVertexAttribL1dv", NULL, &weglVertexAttribL1dv},
+ {"glVertexAttribL2dv", NULL, &weglVertexAttribL2dv},
+ {"glVertexAttribL3dv", NULL, &weglVertexAttribL3dv},
+ {"glVertexAttribL4dv", NULL, &weglVertexAttribL4dv},
+ {"glVertexAttribLPointer", NULL, &weglVertexAttribLPointer},
+ {"glGetVertexAttribLdv", NULL, &weglGetVertexAttribLdv},
+ {"glViewportArrayv", NULL, &weglViewportArrayv},
+ {"glViewportIndexedf", NULL, &weglViewportIndexedf},
+ {"glViewportIndexedfv", NULL, &weglViewportIndexedfv},
+ {"glScissorArrayv", NULL, &weglScissorArrayv},
+ {"glScissorIndexed", NULL, &weglScissorIndexed},
+ {"glScissorIndexedv", NULL, &weglScissorIndexedv},
+ {"glDepthRangeArrayv", NULL, &weglDepthRangeArrayv},
+ {"glDepthRangeIndexed", NULL, &weglDepthRangeIndexed},
+ {"glGetFloati_v", NULL, &weglGetFloati_v},
+ {"glGetDoublei_v", NULL, &weglGetDoublei_v},
+ {"glDebugMessageControlARB", NULL, &weglDebugMessageControlARB},
+ {"glDebugMessageInsertARB", NULL, &weglDebugMessageInsertARB},
+ {"glGetDebugMessageLogARB", NULL, &weglGetDebugMessageLogARB},
+ {"glGetGraphicsResetStatusARB", NULL, &weglGetGraphicsResetStatusARB},
  {"glResizeBuffersMESA", NULL, &weglResizeBuffersMESA},
  {"glWindowPos4dvMESA", NULL, &weglWindowPos4dvMESA},
  {"glWindowPos4fvMESA", NULL, &weglWindowPos4fvMESA},
diff --git a/lib/wx/c_src/gen/gl_funcs.cpp b/lib/wx/c_src/gen/gl_funcs.cpp
index 95d3c23b23..30542a0f02 100644
--- a/lib/wx/c_src/gen/gl_funcs.cpp
+++ b/lib/wx/c_src/gen/gl_funcs.cpp
@@ -20,37 +20,17 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "../wxe_impl.h"
-#include "../wxe_gl.h"
+#include "../egl_impl.h"
 #include "gl_fdefs.h"
 
-int gl_error_op;
-void gl_dispatch(int op, char *bp,ErlDrvTermData caller,WXEBinRef *bins[]){
- gl_error_op = op;
- if(caller != gl_active) {
-   wxGLCanvas * current = glc[caller];
-   if(current) { gl_active = caller; current->SetCurrent();}
-   else {
-       ErlDrvTermData rt[] = // Error msg
-      {ERL_DRV_ATOM, driver_mk_atom((char *) "_wxe_error_"),
-       ERL_DRV_INT,  op,
-       ERL_DRV_ATOM, driver_mk_atom((char *) "no_gl_context"),
-       ERL_DRV_TUPLE,3};
-      driver_send_term(WXE_DRV_PORT,caller,rt,8);
-      return ;
-   }
- };
+extern gl_fns_t gl_fns[];
 
+void egl_dispatch(int op, char *bp, ErlDrvPort port, ErlDrvTermData caller, char *bins[], int bins_sz[]){
+ try {
  switch(op)
 {
  case 5000:
-   wxe_tess_impl(bp, caller);
-   break;
- case WXE_BIN_INCR:
-   driver_binary_inc_refc(bins[0]->bin);
-   break;
- case WXE_BIN_DECR:
-   driver_binary_dec_refc(bins[0]->bin);
+   erl_tess_impl(bp, port, caller);
    break;
 case 5010: { // gluBuild1DMipmapLevels
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -61,14 +41,13 @@ case 5010: { // gluBuild1DMipmapLevels
  GLint *level = (GLint *) bp; bp += 4;
  GLint *base = (GLint *) bp; bp += 4;
  GLint *max = (GLint *) bp; bp += 4;
- void *data = (void *) bins[0]->base;
+ void *data = (void *) bins[0];
  GLint result = wegluBuild1DMipmapLevels(*target,*internalFormat,*width,*format,*type,*level,*base,*max,data);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5011: { // gluBuild1DMipmaps
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -76,14 +55,13 @@ case 5011: { // gluBuild1DMipmaps
  GLsizei *width = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- void *data = (void *) bins[0]->base;
+ void *data = (void *) bins[0];
  GLint result = wegluBuild1DMipmaps(*target,*internalFormat,*width,*format,*type,data);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5012: { // gluBuild2DMipmapLevels
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -95,14 +73,13 @@ case 5012: { // gluBuild2DMipmapLevels
  GLint *level = (GLint *) bp; bp += 4;
  GLint *base = (GLint *) bp; bp += 4;
  GLint *max = (GLint *) bp; bp += 4;
- void *data = (void *) bins[0]->base;
+ void *data = (void *) bins[0];
  GLint result = wegluBuild2DMipmapLevels(*target,*internalFormat,*width,*height,*format,*type,*level,*base,*max,data);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5013: { // gluBuild2DMipmaps
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -111,14 +88,13 @@ case 5013: { // gluBuild2DMipmaps
  GLsizei *height = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- void *data = (void *) bins[0]->base;
+ void *data = (void *) bins[0];
  GLint result = wegluBuild2DMipmaps(*target,*internalFormat,*width,*height,*format,*type,data);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5014: { // gluBuild3DMipmapLevels
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -131,14 +107,13 @@ case 5014: { // gluBuild3DMipmapLevels
  GLint *level = (GLint *) bp; bp += 4;
  GLint *base = (GLint *) bp; bp += 4;
  GLint *max = (GLint *) bp; bp += 4;
- void *data = (void *) bins[0]->base;
+ void *data = (void *) bins[0];
  GLint result = wegluBuild3DMipmapLevels(*target,*internalFormat,*width,*height,*depth,*format,*type,*level,*base,*max,data);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5015: { // gluBuild3DMipmaps
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -148,27 +123,25 @@ case 5015: { // gluBuild3DMipmaps
  GLsizei *depth = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- void *data = (void *) bins[0]->base;
+ void *data = (void *) bins[0];
  GLint result = wegluBuild3DMipmaps(*target,*internalFormat,*width,*height,*depth,*format,*type,data);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5016: { // gluCheckExtension
- int * extNameLen = (int *) bp; bp += 4;
- GLubyte * extName = (GLubyte *) bp;  bp += (8-((*extNameLen*1+4)%8))%8;
- int * extStringLen = (int *) bp; bp += 4;
- GLubyte * extString = (GLubyte *) bp;  bp += (8-((*extStringLen*1+4)%8))%8;
+ GLubyte *extName = (GLubyte *) bp;
+ int extNameLen[1] = {strlen((char *)extName)}; bp += extNameLen[0]+1+((8-((1+extNameLen[0]+0)%8))%8);
+ GLubyte *extString = (GLubyte *) bp;
+ int extStringLen[1] = {strlen((char *)extString)}; bp += extStringLen[0]+1+((8-((1+extStringLen[0]+0)%8))%8);
  GLboolean result = wegluCheckExtension(extName,extString);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5017: { // gluCylinder
  GLUquadric * quad = (GLUquadric *) * (GLuint64EXT *) bp; bp += 8;
@@ -195,21 +168,19 @@ case 5020: { // gluErrorString
  GLenum *error = (GLenum *) bp; bp += 4;
  const GLubyte *  result = wegluErrorString(*error);
  int AP = 0; ErlDrvTermData rt[7];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) result; rt[AP++] = strlen((char *) result);
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5021: { // gluGetString
  GLenum *name = (GLenum *) bp; bp += 4;
  const GLubyte *  result = wegluGetString(*name);
  int AP = 0; ErlDrvTermData rt[7];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) result; rt[AP++] = strlen((char *) result);
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5022: { // gluLookAt
  GLdouble *eyeX = (GLdouble *) bp; bp += 8;
@@ -226,11 +197,10 @@ case 5022: { // gluLookAt
 case 5023: { // gluNewQuadric
  GLUquadric *  result = wegluNewQuadric();
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5024: { // gluOrtho2D
  GLdouble *left = (GLdouble *) bp; bp += 8;
@@ -276,15 +246,14 @@ case 5028: { // gluProject
  GLdouble winZ[1] = {0.0};
  GLint result = wegluProject(*objX,*objY,*objZ,model,proj,view,winX,winY,winZ);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) winX;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) winY;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) winZ;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5029: { // gluQuadricDrawStyle
  GLUquadric * quad = (GLUquadric *) * (GLuint64EXT *) bp; bp += 8;
@@ -311,18 +280,17 @@ case 5033: { // gluScaleImage
  GLsizei *wIn = (GLsizei *) bp; bp += 4;
  GLsizei *hIn = (GLsizei *) bp; bp += 4;
  GLenum *typeIn = (GLenum *) bp; bp += 4;
- void *dataIn = (void *) bins[0]->base;
+ void *dataIn = (void *) bins[0];
  GLsizei *wOut = (GLsizei *) bp; bp += 4;
  GLsizei *hOut = (GLsizei *) bp; bp += 4;
  GLenum *typeOut = (GLenum *) bp; bp += 4;
- GLvoid *dataOut = (GLvoid *) bins[1]->base;
+ GLvoid *dataOut = (GLvoid *) bins[1];
  GLint result = wegluScaleImage(*format,*wIn,*hIn,*typeIn,dataIn,*wOut,*hOut,*typeOut,dataOut);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5034: { // gluSphere
  GLUquadric * quad = (GLUquadric *) * (GLuint64EXT *) bp; bp += 8;
@@ -343,15 +311,14 @@ case 5035: { // gluUnProject
  GLdouble objZ[1] = {0.0};
  GLint result = wegluUnProject(*winX,*winY,*winZ,model,proj,view,objX,objY,objZ);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) objX;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) objY;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) objZ;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5036: { // gluUnProject4
  GLdouble *winX = (GLdouble *) bp; bp += 8;
@@ -369,7 +336,7 @@ case 5036: { // gluUnProject4
  GLdouble objW[1] = {0.0};
  GLint result = wegluUnProject4(*winX,*winY,*winZ,*clipW,model,proj,view,*nearVal,*farVal,objX,objY,objZ,objW);
  int AP = 0; ErlDrvTermData rt[16];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) objX;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) objY;
@@ -377,8 +344,7 @@ case 5036: { // gluUnProject4
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) objW;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 5;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 16 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,16);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5037: { // glAccum
  GLenum *op = (GLenum *) bp; bp += 4;
@@ -398,15 +364,14 @@ case 5039: { // glAreTexturesResident
  GLboolean result = weglAreTexturesResident(*texturesLen,textures,residences);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(11 + (*texturesLen)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  for(int i=0; i < *texturesLen; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) residences[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*texturesLen)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 11 + (*texturesLen)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,11 + (*texturesLen)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(residences);
 }; break;
@@ -440,7 +405,7 @@ case 5044: { // glBitmap
  GLfloat *yorig = (GLfloat *) bp; bp += 4;
  GLfloat *xmove = (GLfloat *) bp; bp += 4;
  GLfloat *ymove = (GLfloat *) bp; bp += 4;
- GLubyte *bitmap = (GLubyte *) bins[0]->base;
+ GLubyte *bitmap = (GLubyte *) bins[0];
  weglBitmap(*width,*height,*xorig,*yorig,*xmove,*ymove,bitmap);
 }; break;
 case 5045: { // glBlendFunc
@@ -580,7 +545,7 @@ case 5074: { // glColorPointer
  GLint *size = (GLint *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
  GLsizei *stride = (GLsizei *) bp; bp += 4;
- GLvoid *pointer = (GLvoid *) bins[0]->base;
+ GLvoid *pointer = (GLvoid *) bins[0];
  weglColorPointer(*size,*type,*stride,pointer);
 }; break;
 case 5075: { // glCopyPixels
@@ -688,7 +653,7 @@ case 5091: { // glDrawElements
  GLenum *mode = (GLenum *) bp; bp += 4;
  GLsizei *count = (GLsizei *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *indices = (GLvoid *) bins[0]->base;
+ GLvoid *indices = (GLvoid *) bins[0];
  weglDrawElements(*mode,*count,*type,indices);
 }; break;
 case 5092: { // glDrawPixels
@@ -704,7 +669,7 @@ case 5093: { // glDrawPixels
  GLsizei *height = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *pixels = (GLvoid *) bins[0]->base;
+ GLvoid *pixels = (GLvoid *) bins[0];
  weglDrawPixels(*width,*height,*format,*type,pixels);
 }; break;
 case 5094: { // glEdgeFlagv
@@ -718,7 +683,7 @@ case 5095: { // glEdgeFlagPointer
 }; break;
 case 5096: { // glEdgeFlagPointer
  GLsizei *stride = (GLsizei *) bp; bp += 4;
- GLvoid *pointer = (GLvoid *) bins[0]->base;
+ GLvoid *pointer = (GLvoid *) bins[0];
  weglEdgeFlagPointer(*stride,pointer);
 }; break;
 case 5097: { // glEnable
@@ -777,13 +742,13 @@ case 5108: { // glEvalPoint2
 case 5109: { // glFeedbackBuffer
  GLsizei *size = (GLsizei *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLfloat *buffer = (GLfloat *) bins[0]->base;
+ GLfloat *buffer = (GLfloat *) bins[0];
  weglFeedbackBuffer(*size,*type,buffer);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5110: { // glFinish
  weglFinish();
@@ -830,11 +795,10 @@ case 5118: { // glGenLists
  GLsizei *range = (GLsizei *) bp; bp += 4;
  GLuint result = weglGenLists(*range);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5119: { // glGenTextures
  GLsizei *n = (GLsizei *) bp; bp += 4;
@@ -843,13 +807,12 @@ case 5119: { // glGenTextures
  weglGenTextures(*n,textures);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*n)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  for(int i=0; i < *n; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) textures[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*n)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 + (*n)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7 + (*n)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(textures);
 }; break;
@@ -858,7 +821,7 @@ case 5120: { // glGetBooleanv
  GLboolean params[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
  weglGetBooleanv(*pname,params);
  int AP = 0; ErlDrvTermData rt[39];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLboolean *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -878,15 +841,14 @@ case 5120: { // glGetBooleanv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 39 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,39);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5121: { // glGetClipPlane
  GLenum *plane = (GLenum *) bp; bp += 4;
  GLdouble equation[4] = {0.0,0.0,0.0,0.0};
  weglGetClipPlane(*plane,equation);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble *equationTmp = equation;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) equationTmp++;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) equationTmp++;
@@ -894,15 +856,14 @@ case 5121: { // glGetClipPlane
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) equationTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5122: { // glGetDoublev
  GLenum *pname = (GLenum *) bp; bp += 4;
  GLdouble params[16] = {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};
  weglGetDoublev(*pname,params);
  int AP = 0; ErlDrvTermData rt[39];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble *paramsTmp = params;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -922,24 +883,22 @@ case 5122: { // glGetDoublev
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 39 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,39);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5123: { // glGetError
  GLenum result = weglGetError();
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5124: { // glGetFloatv
  GLenum *pname = (GLenum *) bp; bp += 4;
  GLfloat params[16] = {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};
  weglGetFloatv(*pname,params);
  int AP = 0; ErlDrvTermData rt[39];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[16], *paramsTmp = paramsConv; 
  for(int i=0; i < 16; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -960,15 +919,14 @@ case 5124: { // glGetFloatv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 39 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,39);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5125: { // glGetIntegerv
  GLenum *pname = (GLenum *) bp; bp += 4;
  GLint params[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
  weglGetIntegerv(*pname,params);
  int AP = 0; ErlDrvTermData rt[39];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -988,8 +946,7 @@ case 5125: { // glGetIntegerv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 39 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,39);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5126: { // glGetLightfv
  GLenum *light = (GLenum *) bp; bp += 4;
@@ -997,7 +954,7 @@ case 5126: { // glGetLightfv
  GLfloat params[4] = {0.0,0.0,0.0,0.0};
  weglGetLightfv(*light,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[4], *paramsTmp = paramsConv; 
  for(int i=0; i < 4; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -1006,8 +963,7 @@ case 5126: { // glGetLightfv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5127: { // glGetLightiv
  GLenum *light = (GLenum *) bp; bp += 4;
@@ -1015,7 +971,7 @@ case 5127: { // glGetLightiv
  GLint params[4] = {0,0,0,0};
  weglGetLightiv(*light,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -1023,41 +979,40 @@ case 5127: { // glGetLightiv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5128: { // glGetMapdv
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *query = (GLenum *) bp; bp += 4;
- GLdouble *v = (GLdouble *) bins[0]->base;
+ GLdouble *v = (GLdouble *) bins[0];
  weglGetMapdv(*target,*query,v);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5129: { // glGetMapfv
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *query = (GLenum *) bp; bp += 4;
- GLfloat *v = (GLfloat *) bins[0]->base;
+ GLfloat *v = (GLfloat *) bins[0];
  weglGetMapfv(*target,*query,v);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5130: { // glGetMapiv
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *query = (GLenum *) bp; bp += 4;
- GLint *v = (GLint *) bins[0]->base;
+ GLint *v = (GLint *) bins[0];
  weglGetMapiv(*target,*query,v);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5131: { // glGetMaterialfv
  GLenum *face = (GLenum *) bp; bp += 4;
@@ -1065,7 +1020,7 @@ case 5131: { // glGetMaterialfv
  GLfloat params[4] = {0.0,0.0,0.0,0.0};
  weglGetMaterialfv(*face,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[4], *paramsTmp = paramsConv; 
  for(int i=0; i < 4; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -1074,8 +1029,7 @@ case 5131: { // glGetMaterialfv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5132: { // glGetMaterialiv
  GLenum *face = (GLenum *) bp; bp += 4;
@@ -1083,7 +1037,7 @@ case 5132: { // glGetMaterialiv
  GLint params[4] = {0,0,0,0};
  weglGetMaterialiv(*face,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -1091,61 +1045,56 @@ case 5132: { // glGetMaterialiv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5133: { // glGetPixelMapfv
  GLenum *map = (GLenum *) bp; bp += 4;
- GLfloat *values = (GLfloat *) bins[0]->base;
+ GLfloat *values = (GLfloat *) bins[0];
  weglGetPixelMapfv(*map,values);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5134: { // glGetPixelMapuiv
  GLenum *map = (GLenum *) bp; bp += 4;
- GLuint *values = (GLuint *) bins[0]->base;
+ GLuint *values = (GLuint *) bins[0];
  weglGetPixelMapuiv(*map,values);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5135: { // glGetPixelMapusv
  GLenum *map = (GLenum *) bp; bp += 4;
- GLushort *values = (GLushort *) bins[0]->base;
+ GLushort *values = (GLushort *) bins[0];
  weglGetPixelMapusv(*map,values);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5136: { // glGetPolygonStipple
- GLubyte mask[128];
- weglGetPolygonStipple(mask);
+ ErlDrvBinary *mask = driver_alloc_binary(128);
+ weglGetPolygonStipple((GLubyte*) mask->orig_bytes);
  int AP = 0; ErlDrvTermData rt[8];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
- ErlDrvBinary * BinCopy = driver_alloc_binary(128);
- memcpy(BinCopy->orig_bytes, mask, 128);
- rt[AP++] = ERL_DRV_BINARY; rt[AP++] = (ErlDrvTermData) BinCopy; rt[AP++] = 128; rt[AP++] = 0;
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_BINARY; rt[AP++] = (ErlDrvTermData) mask; rt[AP++] = 128; rt[AP++] = 0;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 8 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,8);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
- driver_free_binary(BinCopy);
+ driver_send_term(port,caller,rt,AP);
+ driver_free_binary(mask);
 }; break;
 case 5137: { // glGetString
  GLenum *name = (GLenum *) bp; bp += 4;
  const GLubyte *  result = weglGetString(*name);
  int AP = 0; ErlDrvTermData rt[7];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) result; rt[AP++] = strlen((char *) result);
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5138: { // glGetTexEnvfv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -1153,7 +1102,7 @@ case 5138: { // glGetTexEnvfv
  GLfloat params[4] = {0.0,0.0,0.0,0.0};
  weglGetTexEnvfv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[4], *paramsTmp = paramsConv; 
  for(int i=0; i < 4; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -1162,8 +1111,7 @@ case 5138: { // glGetTexEnvfv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5139: { // glGetTexEnviv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -1171,7 +1119,7 @@ case 5139: { // glGetTexEnviv
  GLint params[4] = {0,0,0,0};
  weglGetTexEnviv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -1179,8 +1127,7 @@ case 5139: { // glGetTexEnviv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5140: { // glGetTexGendv
  GLenum *coord = (GLenum *) bp; bp += 4;
@@ -1188,7 +1135,7 @@ case 5140: { // glGetTexGendv
  GLdouble params[4] = {0.0,0.0,0.0,0.0};
  weglGetTexGendv(*coord,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble *paramsTmp = params;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -1196,8 +1143,7 @@ case 5140: { // glGetTexGendv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5141: { // glGetTexGenfv
  GLenum *coord = (GLenum *) bp; bp += 4;
@@ -1205,7 +1151,7 @@ case 5141: { // glGetTexGenfv
  GLfloat params[4] = {0.0,0.0,0.0,0.0};
  weglGetTexGenfv(*coord,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[4], *paramsTmp = paramsConv; 
  for(int i=0; i < 4; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -1214,8 +1160,7 @@ case 5141: { // glGetTexGenfv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5142: { // glGetTexGeniv
  GLenum *coord = (GLenum *) bp; bp += 4;
@@ -1223,7 +1168,7 @@ case 5142: { // glGetTexGeniv
  GLint params[4] = {0,0,0,0};
  weglGetTexGeniv(*coord,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -1231,21 +1176,20 @@ case 5142: { // glGetTexGeniv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5143: { // glGetTexImage
  GLenum *target = (GLenum *) bp; bp += 4;
  GLint *level = (GLint *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *pixels = (GLvoid *) bins[0]->base;
+ GLvoid *pixels = (GLvoid *) bins[0];
  weglGetTexImage(*target,*level,*format,*type,pixels);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5144: { // glGetTexLevelParameterfv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -1254,14 +1198,13 @@ case 5144: { // glGetTexLevelParameterfv
  GLfloat params[1] = {0.0};
  weglGetTexLevelParameterfv(*target,*level,*pname,params);
  int AP = 0; ErlDrvTermData rt[8];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[1], *paramsTmp = paramsConv; 
  for(int i=0; i < 1; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 8 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,8);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5145: { // glGetTexLevelParameteriv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -1270,13 +1213,12 @@ case 5145: { // glGetTexLevelParameteriv
  GLint params[1] = {0};
  weglGetTexLevelParameteriv(*target,*level,*pname,params);
  int AP = 0; ErlDrvTermData rt[8];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 8 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,8);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5146: { // glGetTexParameterfv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -1284,7 +1226,7 @@ case 5146: { // glGetTexParameterfv
  GLfloat params[4] = {0.0,0.0,0.0,0.0};
  weglGetTexParameterfv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[4], *paramsTmp = paramsConv; 
  for(int i=0; i < 4; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -1293,8 +1235,7 @@ case 5146: { // glGetTexParameterfv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5147: { // glGetTexParameteriv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -1302,7 +1243,7 @@ case 5147: { // glGetTexParameteriv
  GLint params[4] = {0,0,0,0};
  weglGetTexParameteriv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -1310,8 +1251,7 @@ case 5147: { // glGetTexParameteriv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5148: { // glHint
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -1331,7 +1271,7 @@ case 5150: { // glIndexPointer
 case 5151: { // glIndexPointer
  GLenum *type = (GLenum *) bp; bp += 4;
  GLsizei *stride = (GLsizei *) bp; bp += 4;
- GLvoid *pointer = (GLvoid *) bins[0]->base;
+ GLvoid *pointer = (GLvoid *) bins[0];
  weglIndexPointer(*type,*stride,pointer);
 }; break;
 case 5152: { // glIndexdv
@@ -1366,38 +1306,35 @@ case 5158: { // glInterleavedArrays
 case 5159: { // glInterleavedArrays
  GLenum *format = (GLenum *) bp; bp += 4;
  GLsizei *stride = (GLsizei *) bp; bp += 4;
- GLvoid *pointer = (GLvoid *) bins[0]->base;
+ GLvoid *pointer = (GLvoid *) bins[0];
  weglInterleavedArrays(*format,*stride,pointer);
 }; break;
 case 5160: { // glIsEnabled
  GLenum *cap = (GLenum *) bp; bp += 4;
  GLboolean result = weglIsEnabled(*cap);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5161: { // glIsList
  GLuint *list = (GLuint *) bp; bp += 4;
  GLboolean result = weglIsList(*list);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5162: { // glIsTexture
  GLuint *texture = (GLuint *) bp; bp += 4;
  GLboolean result = weglIsTexture(*texture);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5163: { // glLightModelf
  GLenum *pname = (GLenum *) bp; bp += 4;
@@ -1486,7 +1423,7 @@ case 5179: { // glMap1d
  GLdouble *u2 = (GLdouble *) bp; bp += 8;
  GLint *stride = (GLint *) bp; bp += 4;
  GLint *order = (GLint *) bp; bp += 4;
- GLdouble *points = (GLdouble *) bins[0]->base;
+ GLdouble *points = (GLdouble *) bins[0];
  weglMap1d(*target,*u1,*u2,*stride,*order,points);
 }; break;
 case 5180: { // glMap1f
@@ -1495,7 +1432,7 @@ case 5180: { // glMap1f
  GLfloat *u2 = (GLfloat *) bp; bp += 4;
  GLint *stride = (GLint *) bp; bp += 4;
  GLint *order = (GLint *) bp; bp += 4;
- GLfloat *points = (GLfloat *) bins[0]->base;
+ GLfloat *points = (GLfloat *) bins[0];
  weglMap1f(*target,*u1,*u2,*stride,*order,points);
 }; break;
 case 5181: { // glMap2d
@@ -1509,7 +1446,7 @@ case 5181: { // glMap2d
  GLdouble *v2 = (GLdouble *) bp; bp += 8;
  GLint *vstride = (GLint *) bp; bp += 4;
  GLint *vorder = (GLint *) bp; bp += 4;
- GLdouble *points = (GLdouble *) bins[0]->base;
+ GLdouble *points = (GLdouble *) bins[0];
  weglMap2d(*target,*u1,*u2,*ustride,*uorder,*v1,*v2,*vstride,*vorder,points);
 }; break;
 case 5182: { // glMap2f
@@ -1522,7 +1459,7 @@ case 5182: { // glMap2f
  GLfloat *v2 = (GLfloat *) bp; bp += 4;
  GLint *vstride = (GLint *) bp; bp += 4;
  GLint *vorder = (GLint *) bp; bp += 4;
- GLfloat *points = (GLfloat *) bins[0]->base;
+ GLfloat *points = (GLfloat *) bins[0];
  weglMap2f(*target,*u1,*u2,*ustride,*uorder,*v1,*v2,*vstride,*vorder,points);
 }; break;
 case 5183: { // glMapGrid1d
@@ -1630,7 +1567,7 @@ case 5200: { // glNormalPointer
 case 5201: { // glNormalPointer
  GLenum *type = (GLenum *) bp; bp += 4;
  GLsizei *stride = (GLsizei *) bp; bp += 4;
- GLvoid *pointer = (GLvoid *) bins[0]->base;
+ GLvoid *pointer = (GLvoid *) bins[0];
  weglNormalPointer(*type,*stride,pointer);
 }; break;
 case 5202: { // glOrtho
@@ -1649,19 +1586,19 @@ case 5203: { // glPassThrough
 case 5204: { // glPixelMapfv
  GLenum *map = (GLenum *) bp; bp += 4;
  GLsizei *mapsize = (GLsizei *) bp; bp += 4;
- GLfloat *values = (GLfloat *) bins[0]->base;
+ GLfloat *values = (GLfloat *) bins[0];
  weglPixelMapfv(*map,*mapsize,values);
 }; break;
 case 5205: { // glPixelMapuiv
  GLenum *map = (GLenum *) bp; bp += 4;
  GLsizei *mapsize = (GLsizei *) bp; bp += 4;
- GLuint *values = (GLuint *) bins[0]->base;
+ GLuint *values = (GLuint *) bins[0];
  weglPixelMapuiv(*map,*mapsize,values);
 }; break;
 case 5206: { // glPixelMapusv
  GLenum *map = (GLenum *) bp; bp += 4;
  GLsizei *mapsize = (GLsizei *) bp; bp += 4;
- GLushort *values = (GLushort *) bins[0]->base;
+ GLushort *values = (GLushort *) bins[0];
  weglPixelMapusv(*map,*mapsize,values);
 }; break;
 case 5207: { // glPixelStoref
@@ -1704,7 +1641,7 @@ case 5214: { // glPolygonOffset
  weglPolygonOffset(*factor,*units);
 }; break;
 case 5215: { // glPolygonStipple
- GLubyte *mask = (GLubyte *) bins[0]->base;
+ GLubyte *mask = (GLubyte *) bins[0];
  weglPolygonStipple(mask);
 }; break;
 case 5216: { // glPopAttrib
@@ -1800,13 +1737,13 @@ case 5238: { // glReadPixels
  GLsizei *height = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *pixels = (GLvoid *) bins[0]->base;
+ GLvoid *pixels = (GLvoid *) bins[0];
  weglReadPixels(*x,*y,*width,*height,*format,*type,pixels);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5239: { // glRectd
  GLdouble *x1 = (GLdouble *) bp; bp += 8;
@@ -1860,11 +1797,10 @@ case 5247: { // glRenderMode
  GLenum *mode = (GLenum *) bp; bp += 4;
  GLint result = weglRenderMode(*mode);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5248: { // glRotated
  GLdouble *angle = (GLdouble *) bp; bp += 8;
@@ -1901,13 +1837,13 @@ case 5252: { // glScissor
 }; break;
 case 5253: { // glSelectBuffer
  GLsizei *size = (GLsizei *) bp; bp += 4;
- GLuint *buffer = (GLuint *) bins[0]->base;
+ GLuint *buffer = (GLuint *) bins[0];
  weglSelectBuffer(*size,buffer);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5254: { // glShadeModel
  GLenum *mode = (GLenum *) bp; bp += 4;
@@ -2004,7 +1940,7 @@ case 5275: { // glTexCoordPointer
  GLint *size = (GLint *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
  GLsizei *stride = (GLsizei *) bp; bp += 4;
- GLvoid *pointer = (GLvoid *) bins[0]->base;
+ GLvoid *pointer = (GLvoid *) bins[0];
  weglTexCoordPointer(*size,*type,*stride,pointer);
 }; break;
 case 5276: { // glTexEnvf
@@ -2091,7 +2027,7 @@ case 5287: { // glTexImage1D
  GLint *border = (GLint *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *pixels = (GLvoid *) bins[0]->base;
+ GLvoid *pixels = (GLvoid *) bins[0];
  weglTexImage1D(*target,*level,*internalformat,*width,*border,*format,*type,pixels);
 }; break;
 case 5288: { // glTexImage2D
@@ -2115,7 +2051,7 @@ case 5289: { // glTexImage2D
  GLint *border = (GLint *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *pixels = (GLvoid *) bins[0]->base;
+ GLvoid *pixels = (GLvoid *) bins[0];
  weglTexImage2D(*target,*level,*internalformat,*width,*height,*border,*format,*type,pixels);
 }; break;
 case 5290: { // glTexParameterf
@@ -2161,7 +2097,7 @@ case 5295: { // glTexSubImage1D
  GLsizei *width = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *pixels = (GLvoid *) bins[0]->base;
+ GLvoid *pixels = (GLvoid *) bins[0];
  weglTexSubImage1D(*target,*level,*xoffset,*width,*format,*type,pixels);
 }; break;
 case 5296: { // glTexSubImage2D
@@ -2185,7 +2121,7 @@ case 5297: { // glTexSubImage2D
  GLsizei *height = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *pixels = (GLvoid *) bins[0]->base;
+ GLvoid *pixels = (GLvoid *) bins[0];
  weglTexSubImage2D(*target,*level,*xoffset,*yoffset,*width,*height,*format,*type,pixels);
 }; break;
 case 5298: { // glTranslated
@@ -2259,7 +2195,7 @@ case 5313: { // glVertexPointer
  GLint *size = (GLint *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
  GLsizei *stride = (GLsizei *) bp; bp += 4;
- GLvoid *pointer = (GLvoid *) bins[0]->base;
+ GLvoid *pointer = (GLvoid *) bins[0];
  weglVertexPointer(*size,*type,*stride,pointer);
 }; break;
 case 5314: { // glViewport
@@ -2295,7 +2231,7 @@ case 5318: { // glDrawRangeElements
  GLuint *end = (GLuint *) bp; bp += 4;
  GLsizei *count = (GLsizei *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *indices = (GLvoid *) bins[0]->base;
+ GLvoid *indices = (GLvoid *) bins[0];
  weglDrawRangeElements(*mode,*start,*end,*count,*type,indices);
 }; break;
 case 5319: { // glTexImage3D
@@ -2321,7 +2257,7 @@ case 5320: { // glTexImage3D
  GLint *border = (GLint *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *pixels = (GLvoid *) bins[0]->base;
+ GLvoid *pixels = (GLvoid *) bins[0];
  weglTexImage3D(*target,*level,*internalformat,*width,*height,*depth,*border,*format,*type,pixels);
 }; break;
 case 5321: { // glTexSubImage3D
@@ -2349,7 +2285,7 @@ case 5322: { // glTexSubImage3D
  GLsizei *depth = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *pixels = (GLvoid *) bins[0]->base;
+ GLvoid *pixels = (GLvoid *) bins[0];
  weglTexSubImage3D(*target,*level,*xoffset,*yoffset,*zoffset,*width,*height,*depth,*format,*type,pixels);
 }; break;
 case 5323: { // glCopyTexSubImage3D
@@ -2379,7 +2315,7 @@ case 5325: { // glColorTable
  GLsizei *width = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *table = (GLvoid *) bins[0]->base;
+ GLvoid *table = (GLvoid *) bins[0];
  weglColorTable(*target,*internalformat,*width,*format,*type,table);
 }; break;
 case 5326: { // glColorTableParameterfv
@@ -2406,13 +2342,13 @@ case 5329: { // glGetColorTable
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *table = (GLvoid *) bins[0]->base;
+ GLvoid *table = (GLvoid *) bins[0];
  weglGetColorTable(*target,*format,*type,table);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5330: { // glGetColorTableParameterfv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2420,7 +2356,7 @@ case 5330: { // glGetColorTableParameterfv
  GLfloat params[4] = {0.0,0.0,0.0,0.0};
  weglGetColorTableParameterfv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[4], *paramsTmp = paramsConv; 
  for(int i=0; i < 4; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -2429,8 +2365,7 @@ case 5330: { // glGetColorTableParameterfv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5331: { // glGetColorTableParameteriv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2438,7 +2373,7 @@ case 5331: { // glGetColorTableParameteriv
  GLint params[4] = {0,0,0,0};
  weglGetColorTableParameteriv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -2446,8 +2381,7 @@ case 5331: { // glGetColorTableParameteriv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5332: { // glColorSubTable
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2464,7 +2398,7 @@ case 5333: { // glColorSubTable
  GLsizei *count = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *data = (GLvoid *) bins[0]->base;
+ GLvoid *data = (GLvoid *) bins[0];
  weglColorSubTable(*target,*start,*count,*format,*type,data);
 }; break;
 case 5334: { // glCopyColorSubTable
@@ -2490,7 +2424,7 @@ case 5336: { // glConvolutionFilter1D
  GLsizei *width = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *image = (GLvoid *) bins[0]->base;
+ GLvoid *image = (GLvoid *) bins[0];
  weglConvolutionFilter1D(*target,*internalformat,*width,*format,*type,image);
 }; break;
 case 5337: { // glConvolutionFilter2D
@@ -2510,7 +2444,7 @@ case 5338: { // glConvolutionFilter2D
  GLsizei *height = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *image = (GLvoid *) bins[0]->base;
+ GLvoid *image = (GLvoid *) bins[0];
  weglConvolutionFilter2D(*target,*internalformat,*width,*height,*format,*type,image);
 }; break;
 case 5339: { // glConvolutionParameterfv
@@ -2548,13 +2482,13 @@ case 5343: { // glGetConvolutionFilter
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *image = (GLvoid *) bins[0]->base;
+ GLvoid *image = (GLvoid *) bins[0];
  weglGetConvolutionFilter(*target,*format,*type,image);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5344: { // glGetConvolutionParameterfv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2562,7 +2496,7 @@ case 5344: { // glGetConvolutionParameterfv
  GLfloat params[4] = {0.0,0.0,0.0,0.0};
  weglGetConvolutionParameterfv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[4], *paramsTmp = paramsConv; 
  for(int i=0; i < 4; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -2571,8 +2505,7 @@ case 5344: { // glGetConvolutionParameterfv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5345: { // glGetConvolutionParameteriv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2580,7 +2513,7 @@ case 5345: { // glGetConvolutionParameteriv
  GLint params[4] = {0,0,0,0};
  weglGetConvolutionParameteriv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -2588,8 +2521,7 @@ case 5345: { // glGetConvolutionParameteriv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5346: { // glSeparableFilter2D
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2609,8 +2541,8 @@ case 5347: { // glSeparableFilter2D
  GLsizei *height = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *row = (GLvoid *) bins[0]->base;
- GLvoid *column = (GLvoid *) bins[1]->base;
+ GLvoid *row = (GLvoid *) bins[0];
+ GLvoid *column = (GLvoid *) bins[1];
  weglSeparableFilter2D(*target,*internalformat,*width,*height,*format,*type,row,column);
 }; break;
 case 5348: { // glGetHistogram
@@ -2619,13 +2551,13 @@ case 5348: { // glGetHistogram
  bp += 3;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *values = (GLvoid *) bins[0]->base;
+ GLvoid *values = (GLvoid *) bins[0];
  weglGetHistogram(*target,*reset,*format,*type,values);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5349: { // glGetHistogramParameterfv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2633,14 +2565,13 @@ case 5349: { // glGetHistogramParameterfv
  GLfloat params[1] = {0.0};
  weglGetHistogramParameterfv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[8];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[1], *paramsTmp = paramsConv; 
  for(int i=0; i < 1; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 8 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,8);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5350: { // glGetHistogramParameteriv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2648,13 +2579,12 @@ case 5350: { // glGetHistogramParameteriv
  GLint params[1] = {0};
  weglGetHistogramParameteriv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[8];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 8 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,8);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5351: { // glGetMinmax
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2662,13 +2592,13 @@ case 5351: { // glGetMinmax
  bp += 3;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *values = (GLvoid *) bins[0]->base;
+ GLvoid *values = (GLvoid *) bins[0];
  weglGetMinmax(*target,*reset,*format,*type,values);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5352: { // glGetMinmaxParameterfv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2676,14 +2606,13 @@ case 5352: { // glGetMinmaxParameterfv
  GLfloat params[1] = {0.0};
  weglGetMinmaxParameterfv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[8];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[1], *paramsTmp = paramsConv; 
  for(int i=0; i < 1; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 8 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,8);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5353: { // glGetMinmaxParameteriv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2691,13 +2620,12 @@ case 5353: { // glGetMinmaxParameteriv
  GLint params[1] = {0};
  weglGetMinmaxParameteriv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[8];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 8 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,8);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5354: { // glHistogram
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -2750,7 +2678,7 @@ case 5361: { // glCompressedTexImage3D
  GLsizei *depth = (GLsizei *) bp; bp += 4;
  GLint *border = (GLint *) bp; bp += 4;
  GLsizei *imageSize = (GLsizei *) bp; bp += 4;
- GLvoid *data = (GLvoid *) bins[0]->base;
+ GLvoid *data = (GLvoid *) bins[0];
  weglCompressedTexImage3D(*target,*level,*internalformat,*width,*height,*depth,*border,*imageSize,data);
 }; break;
 case 5362: { // glCompressedTexImage2D
@@ -2772,7 +2700,7 @@ case 5363: { // glCompressedTexImage2D
  GLsizei *height = (GLsizei *) bp; bp += 4;
  GLint *border = (GLint *) bp; bp += 4;
  GLsizei *imageSize = (GLsizei *) bp; bp += 4;
- GLvoid *data = (GLvoid *) bins[0]->base;
+ GLvoid *data = (GLvoid *) bins[0];
  weglCompressedTexImage2D(*target,*level,*internalformat,*width,*height,*border,*imageSize,data);
 }; break;
 case 5364: { // glCompressedTexImage1D
@@ -2792,7 +2720,7 @@ case 5365: { // glCompressedTexImage1D
  GLsizei *width = (GLsizei *) bp; bp += 4;
  GLint *border = (GLint *) bp; bp += 4;
  GLsizei *imageSize = (GLsizei *) bp; bp += 4;
- GLvoid *data = (GLvoid *) bins[0]->base;
+ GLvoid *data = (GLvoid *) bins[0];
  weglCompressedTexImage1D(*target,*level,*internalformat,*width,*border,*imageSize,data);
 }; break;
 case 5366: { // glCompressedTexSubImage3D
@@ -2820,7 +2748,7 @@ case 5367: { // glCompressedTexSubImage3D
  GLsizei *depth = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLsizei *imageSize = (GLsizei *) bp; bp += 4;
- GLvoid *data = (GLvoid *) bins[0]->base;
+ GLvoid *data = (GLvoid *) bins[0];
  weglCompressedTexSubImage3D(*target,*level,*xoffset,*yoffset,*zoffset,*width,*height,*depth,*format,*imageSize,data);
 }; break;
 case 5368: { // glCompressedTexSubImage2D
@@ -2844,7 +2772,7 @@ case 5369: { // glCompressedTexSubImage2D
  GLsizei *height = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLsizei *imageSize = (GLsizei *) bp; bp += 4;
- GLvoid *data = (GLvoid *) bins[0]->base;
+ GLvoid *data = (GLvoid *) bins[0];
  weglCompressedTexSubImage2D(*target,*level,*xoffset,*yoffset,*width,*height,*format,*imageSize,data);
 }; break;
 case 5370: { // glCompressedTexSubImage1D
@@ -2864,19 +2792,19 @@ case 5371: { // glCompressedTexSubImage1D
  GLsizei *width = (GLsizei *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLsizei *imageSize = (GLsizei *) bp; bp += 4;
- GLvoid *data = (GLvoid *) bins[0]->base;
+ GLvoid *data = (GLvoid *) bins[0];
  weglCompressedTexSubImage1D(*target,*level,*xoffset,*width,*format,*imageSize,data);
 }; break;
 case 5372: { // glGetCompressedTexImage
  GLenum *target = (GLenum *) bp; bp += 4;
  GLint *level = (GLint *) bp; bp += 4;
- GLvoid *img = (GLvoid *) bins[0]->base;
+ GLvoid *img = (GLvoid *) bins[0];
  weglGetCompressedTexImage(*target,*level,img);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5373: { // glClientActiveTexture
  GLenum *texture = (GLenum *) bp; bp += 4;
@@ -3036,7 +2964,7 @@ case 5402: { // glFogCoordPointer
 case 5403: { // glFogCoordPointer
  GLenum *type = (GLenum *) bp; bp += 4;
  GLsizei *stride = (GLsizei *) bp; bp += 4;
- GLvoid *pointer = (GLvoid *) bins[0]->base;
+ GLvoid *pointer = (GLvoid *) bins[0];
  weglFogCoordPointer(*type,*stride,pointer);
 }; break;
 case 5404: { // glSecondaryColor3bv
@@ -3082,7 +3010,7 @@ case 5413: { // glSecondaryColorPointer
  GLint *size = (GLint *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
  GLsizei *stride = (GLsizei *) bp; bp += 4;
- GLvoid *pointer = (GLvoid *) bins[0]->base;
+ GLvoid *pointer = (GLvoid *) bins[0];
  weglSecondaryColorPointer(*size,*type,*stride,pointer);
 }; break;
 case 5414: { // glWindowPos2dv
@@ -3124,13 +3052,12 @@ case 5422: { // glGenQueries
  weglGenQueries(*n,ids);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*n)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  for(int i=0; i < *n; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) ids[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*n)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 + (*n)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7 + (*n)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(ids);
 }; break;
@@ -3143,11 +3070,10 @@ case 5424: { // glIsQuery
  GLuint *id = (GLuint *) bp; bp += 4;
  GLboolean result = weglIsQuery(*id);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5425: { // glBeginQuery
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -3164,11 +3090,10 @@ case 5427: { // glGetQueryiv
  GLint params[1] = {0};
  weglGetQueryiv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5428: { // glGetQueryObjectiv
  GLuint *id = (GLuint *) bp; bp += 4;
@@ -3176,11 +3101,10 @@ case 5428: { // glGetQueryObjectiv
  GLint params[1] = {0};
  weglGetQueryObjectiv(*id,*pname,params);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5429: { // glGetQueryObjectuiv
  GLuint *id = (GLuint *) bp; bp += 4;
@@ -3188,11 +3112,10 @@ case 5429: { // glGetQueryObjectuiv
  GLuint params[1] = {0};
  weglGetQueryObjectuiv(*id,*pname,params);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5430: { // glBindBuffer
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -3211,13 +3134,12 @@ case 5432: { // glGenBuffers
  weglGenBuffers(*n,buffers);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*n)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  for(int i=0; i < *n; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) buffers[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*n)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 + (*n)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7 + (*n)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(buffers);
 }; break;
@@ -3225,11 +3147,10 @@ case 5433: { // glIsBuffer
  GLuint *buffer = (GLuint *) bp; bp += 4;
  GLboolean result = weglIsBuffer(*buffer);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5434: { // glBufferData
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -3243,7 +3164,7 @@ case 5435: { // glBufferData
  GLenum *target = (GLenum *) bp; bp += 4;
  bp += 4;
  GLsizeiptr size = (GLsizeiptr) * (GLuint64EXT *) bp; bp += 8;
- GLvoid *data = (GLvoid *) bins[0]->base;
+ GLvoid *data = (GLvoid *) bins[0];
  GLenum *usage = (GLenum *) bp; bp += 4;
  weglBufferData(*target,size,data,*usage);
 }; break;
@@ -3260,7 +3181,7 @@ case 5437: { // glBufferSubData
  bp += 4;
  GLintptr offset = (GLintptr) * (GLuint64EXT *) bp; bp += 8;
  GLsizeiptr size = (GLsizeiptr) * (GLuint64EXT *) bp; bp += 8;
- GLvoid *data = (GLvoid *) bins[0]->base;
+ GLvoid *data = (GLvoid *) bins[0];
  weglBufferSubData(*target,offset,size,data);
 }; break;
 case 5438: { // glGetBufferSubData
@@ -3268,13 +3189,13 @@ case 5438: { // glGetBufferSubData
  bp += 4;
  GLintptr offset = (GLintptr) * (GLuint64EXT *) bp; bp += 8;
  GLsizeiptr size = (GLsizeiptr) * (GLuint64EXT *) bp; bp += 8;
- GLvoid *data = (GLvoid *) bins[0]->base;
+ GLvoid *data = (GLvoid *) bins[0];
  weglGetBufferSubData(*target,offset,size,data);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5439: { // glGetBufferParameteriv
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -3282,11 +3203,10 @@ case 5439: { // glGetBufferParameteriv
  GLint params[1] = {0};
  weglGetBufferParameteriv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5440: { // glBlendEquationSeparate
  GLenum *modeRGB = (GLenum *) bp; bp += 4;
@@ -3306,11 +3226,11 @@ case 5442: { // glStencilOpSeparate
  weglStencilOpSeparate(*face,*sfail,*dpfail,*dppass);
 }; break;
 case 5443: { // glStencilFuncSeparate
- GLenum *frontfunc = (GLenum *) bp; bp += 4;
- GLenum *backfunc = (GLenum *) bp; bp += 4;
+ GLenum *face = (GLenum *) bp; bp += 4;
+ GLenum *func = (GLenum *) bp; bp += 4;
  GLint *ref = (GLint *) bp; bp += 4;
  GLuint *mask = (GLuint *) bp; bp += 4;
- weglStencilFuncSeparate(*frontfunc,*backfunc,*ref,*mask);
+ weglStencilFuncSeparate(*face,*func,*ref,*mask);
 }; break;
 case 5444: { // glStencilMaskSeparate
  GLenum *face = (GLenum *) bp; bp += 4;
@@ -3326,7 +3246,7 @@ case 5446: { // glBindAttribLocation
  GLuint *program = (GLuint *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen = strlen((char *)name); bp += nameLen+1+((8-((1+nameLen+0)%8))%8);
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  weglBindAttribLocation(*program,*index,name);
 }; break;
 case 5447: { // glCompileShader
@@ -3336,21 +3256,19 @@ case 5447: { // glCompileShader
 case 5448: { // glCreateProgram
  GLuint result = weglCreateProgram();
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5449: { // glCreateShader
  GLenum *type = (GLenum *) bp; bp += 4;
  GLuint result = weglCreateShader(*type);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5450: { // glDeleteProgram
  GLuint *program = (GLuint *) bp; bp += 4;
@@ -3384,14 +3302,13 @@ case 5455: { // glGetActiveAttrib
  name = (GLchar *) driver_alloc(sizeof(GLchar) * *bufSize);
  weglGetActiveAttrib(*program,*index,*bufSize,length,size,type,name);
  int AP = 0; ErlDrvTermData rt[13];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *size;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *type;
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) name; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 3;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 13 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,13);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(name);
 }; break;
 case 5456: { // glGetActiveUniform
@@ -3405,14 +3322,13 @@ case 5456: { // glGetActiveUniform
  name = (GLchar *) driver_alloc(sizeof(GLchar) * *bufSize);
  weglGetActiveUniform(*program,*index,*bufSize,length,size,type,name);
  int AP = 0; ErlDrvTermData rt[13];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *size;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *type;
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) name; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 3;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 13 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,13);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(name);
 }; break;
 case 5457: { // glGetAttachedShaders
@@ -3424,27 +3340,25 @@ case 5457: { // glGetAttachedShaders
  weglGetAttachedShaders(*program,*maxCount,count,obj);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*count)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  for(int i=0; i < *count; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) obj[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*count)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 + (*count)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7 + (*count)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(obj);
 }; break;
 case 5458: { // glGetAttribLocation
  GLuint *program = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen = strlen((char *)name); bp += nameLen+1+((8-((1+nameLen+4)%8))%8);
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
  GLint result = weglGetAttribLocation(*program,name);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5459: { // glGetProgramiv
  GLuint *program = (GLuint *) bp; bp += 4;
@@ -3452,11 +3366,10 @@ case 5459: { // glGetProgramiv
  GLint params[1] = {0};
  weglGetProgramiv(*program,*pname,params);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5460: { // glGetProgramInfoLog
  GLuint *program = (GLuint *) bp; bp += 4;
@@ -3466,11 +3379,10 @@ case 5460: { // glGetProgramInfoLog
  infoLog = (GLchar *) driver_alloc(sizeof(GLchar) * *bufSize);
  weglGetProgramInfoLog(*program,*bufSize,length,infoLog);
  int AP = 0; ErlDrvTermData rt[7];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) infoLog; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(infoLog);
 }; break;
 case 5461: { // glGetShaderiv
@@ -3479,11 +3391,10 @@ case 5461: { // glGetShaderiv
  GLint params[1] = {0};
  weglGetShaderiv(*shader,*pname,params);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5462: { // glGetShaderInfoLog
  GLuint *shader = (GLuint *) bp; bp += 4;
@@ -3493,11 +3404,10 @@ case 5462: { // glGetShaderInfoLog
  infoLog = (GLchar *) driver_alloc(sizeof(GLchar) * *bufSize);
  weglGetShaderInfoLog(*shader,*bufSize,length,infoLog);
  int AP = 0; ErlDrvTermData rt[7];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) infoLog; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(infoLog);
 }; break;
 case 5463: { // glGetShaderSource
@@ -3508,24 +3418,22 @@ case 5463: { // glGetShaderSource
  source = (GLchar *) driver_alloc(sizeof(GLchar) * *bufSize);
  weglGetShaderSource(*shader,*bufSize,length,source);
  int AP = 0; ErlDrvTermData rt[7];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) source; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(source);
 }; break;
 case 5464: { // glGetUniformLocation
  GLuint *program = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen = strlen((char *)name); bp += nameLen+1+((8-((1+nameLen+4)%8))%8);
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
  GLint result = weglGetUniformLocation(*program,name);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5465: { // glGetUniformfv
  GLuint *program = (GLuint *) bp; bp += 4;
@@ -3533,7 +3441,7 @@ case 5465: { // glGetUniformfv
  GLfloat params[16] = {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};
  weglGetUniformfv(*program,*location,params);
  int AP = 0; ErlDrvTermData rt[38];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[16], *paramsTmp = paramsConv; 
  for(int i=0; i < 16; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -3554,8 +3462,7 @@ case 5465: { // glGetUniformfv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 16;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 38 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,38);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5466: { // glGetUniformiv
  GLuint *program = (GLuint *) bp; bp += 4;
@@ -3563,7 +3470,7 @@ case 5466: { // glGetUniformiv
  GLint params[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
  weglGetUniformiv(*program,*location,params);
  int AP = 0; ErlDrvTermData rt[38];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -3583,8 +3490,7 @@ case 5466: { // glGetUniformiv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 16;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 38 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,38);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5467: { // glGetVertexAttribdv
  GLuint *index = (GLuint *) bp; bp += 4;
@@ -3592,7 +3498,7 @@ case 5467: { // glGetVertexAttribdv
  GLdouble params[4] = {0.0,0.0,0.0,0.0};
  weglGetVertexAttribdv(*index,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble *paramsTmp = params;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -3600,8 +3506,7 @@ case 5467: { // glGetVertexAttribdv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5468: { // glGetVertexAttribfv
  GLuint *index = (GLuint *) bp; bp += 4;
@@ -3609,7 +3514,7 @@ case 5468: { // glGetVertexAttribfv
  GLfloat params[4] = {0.0,0.0,0.0,0.0};
  weglGetVertexAttribfv(*index,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[4], *paramsTmp = paramsConv; 
  for(int i=0; i < 4; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -3618,8 +3523,7 @@ case 5468: { // glGetVertexAttribfv
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5469: { // glGetVertexAttribiv
  GLuint *index = (GLuint *) bp; bp += 4;
@@ -3627,7 +3531,7 @@ case 5469: { // glGetVertexAttribiv
  GLint params[4] = {0,0,0,0};
  weglGetVertexAttribiv(*index,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -3635,28 +3539,25 @@ case 5469: { // glGetVertexAttribiv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5470: { // glIsProgram
  GLuint *program = (GLuint *) bp; bp += 4;
  GLboolean result = weglIsProgram(*program);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5471: { // glIsShader
  GLuint *shader = (GLuint *) bp; bp += 4;
  GLboolean result = weglIsShader(*shader);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5472: { // glLinkProgram
  GLuint *program = (GLuint *) bp; bp += 4;
@@ -3942,7 +3843,7 @@ case 5519: { // glVertexAttribPointer
  GLboolean *normalized = (GLboolean *) bp; bp += 1;
  bp += 3;
  GLsizei *stride = (GLsizei *) bp; bp += 4;
- GLvoid *pointer = (GLvoid *) bins[0]->base;
+ GLvoid *pointer = (GLvoid *) bins[0];
  weglVertexAttribPointer(*index,*size,*type,*normalized,*stride,pointer);
 }; break;
 case 5520: { // glUniformMatrix2x3fv
@@ -4007,7 +3908,7 @@ case 5527: { // glGetBooleani_v
  GLboolean data[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
  weglGetBooleani_v(*target,*index,data);
  int AP = 0; ErlDrvTermData rt[39];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLboolean *dataTmp = data;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
@@ -4027,8 +3928,7 @@ case 5527: { // glGetBooleani_v
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 39 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,39);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5528: { // glGetIntegeri_v
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -4036,7 +3936,7 @@ case 5528: { // glGetIntegeri_v
  GLint data[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
  weglGetIntegeri_v(*target,*index,data);
  int AP = 0; ErlDrvTermData rt[39];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *dataTmp = data;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
@@ -4056,8 +3956,7 @@ case 5528: { // glGetIntegeri_v
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 39 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,39);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5529: { // glEnablei
  GLenum *target = (GLenum *) bp; bp += 4;
@@ -4074,11 +3973,10 @@ case 5531: { // glIsEnabledi
  GLuint *index = (GLuint *) bp; bp += 4;
  GLboolean result = weglIsEnabledi(*target,*index);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5532: { // glBeginTransformFeedback
  GLenum *primitiveMode = (GLenum *) bp; bp += 4;
@@ -4126,14 +4024,13 @@ case 5537: { // glGetTransformFeedbackVarying
  name = (GLchar *) driver_alloc(sizeof(GLchar) * *bufSize);
  weglGetTransformFeedbackVarying(*program,*index,*bufSize,length,size,type,name);
  int AP = 0; ErlDrvTermData rt[13];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *size;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *type;
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) name; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 3;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 13 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,13);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(name);
 }; break;
 case 5538: { // glClampColor
@@ -4162,7 +4059,7 @@ case 5542: { // glVertexAttribIPointer
  GLint *size = (GLint *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
  GLsizei *stride = (GLsizei *) bp; bp += 4;
- GLvoid *pointer = (GLvoid *) bins[0]->base;
+ GLvoid *pointer = (GLvoid *) bins[0];
  weglVertexAttribIPointer(*index,*size,*type,*stride,pointer);
 }; break;
 case 5543: { // glGetVertexAttribIiv
@@ -4171,7 +4068,7 @@ case 5543: { // glGetVertexAttribIiv
  GLint params[4] = {0,0,0,0};
  weglGetVertexAttribIiv(*index,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -4179,8 +4076,7 @@ case 5543: { // glGetVertexAttribIiv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5544: { // glGetVertexAttribIuiv
  GLuint *index = (GLuint *) bp; bp += 4;
@@ -4188,7 +4084,7 @@ case 5544: { // glGetVertexAttribIuiv
  GLuint params[4] = {0,0,0,0};
  weglGetVertexAttribIuiv(*index,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLuint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -4196,16 +4092,75 @@ case 5544: { // glGetVertexAttribIuiv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5545: { // glVertexAttribI1iv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLint *v = (GLint *) bp; bp += 4;
+ weglVertexAttribI1iv(*index,v);
+}; break;
+case 5546: { // glVertexAttribI2iv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLint *v = (GLint *) bp; bp += 4;
+ weglVertexAttribI2iv(*index,v);
+}; break;
+case 5547: { // glVertexAttribI3iv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLint *v = (GLint *) bp; bp += 4;
+ weglVertexAttribI3iv(*index,v);
+}; break;
+case 5548: { // glVertexAttribI4iv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLint * v = (GLint *) bp; bp += 16;
+ weglVertexAttribI4iv(*index,v);
+}; break;
+case 5549: { // glVertexAttribI1uiv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLuint *v = (GLuint *) bp; bp += 4;
+ weglVertexAttribI1uiv(*index,v);
+}; break;
+case 5550: { // glVertexAttribI2uiv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLuint *v = (GLuint *) bp; bp += 4;
+ weglVertexAttribI2uiv(*index,v);
+}; break;
+case 5551: { // glVertexAttribI3uiv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLuint *v = (GLuint *) bp; bp += 4;
+ weglVertexAttribI3uiv(*index,v);
 }; break;
-case 5545: { // glGetUniformuiv
+case 5552: { // glVertexAttribI4uiv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLuint * v = (GLuint *) bp; bp += 16;
+ weglVertexAttribI4uiv(*index,v);
+}; break;
+case 5553: { // glVertexAttribI4bv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLbyte * v = (GLbyte *) bp; bp += 4;
+ weglVertexAttribI4bv(*index,v);
+}; break;
+case 5554: { // glVertexAttribI4sv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLshort * v = (GLshort *) bp; bp += 8;
+ weglVertexAttribI4sv(*index,v);
+}; break;
+case 5555: { // glVertexAttribI4ubv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLubyte * v = (GLubyte *) bp; bp += 4;
+ weglVertexAttribI4ubv(*index,v);
+}; break;
+case 5556: { // glVertexAttribI4usv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLushort * v = (GLushort *) bp; bp += 8;
+ weglVertexAttribI4usv(*index,v);
+}; break;
+case 5557: { // glGetUniformuiv
  GLuint *program = (GLuint *) bp; bp += 4;
  GLint *location = (GLint *) bp; bp += 4;
  GLuint params[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
  weglGetUniformuiv(*program,*location,params);
  int AP = 0; ErlDrvTermData rt[38];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLuint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -4225,47 +4180,45 @@ case 5545: { // glGetUniformuiv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 16;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 38 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,38);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5546: { // glBindFragDataLocation
+case 5558: { // glBindFragDataLocation
  GLuint *program = (GLuint *) bp; bp += 4;
  GLuint *color = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen = strlen((char *)name); bp += nameLen+1+((8-((1+nameLen+0)%8))%8);
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  weglBindFragDataLocation(*program,*color,name);
 }; break;
-case 5547: { // glGetFragDataLocation
+case 5559: { // glGetFragDataLocation
  GLuint *program = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen = strlen((char *)name); bp += nameLen+1+((8-((1+nameLen+4)%8))%8);
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
  GLint result = weglGetFragDataLocation(*program,name);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5548: { // glUniform1ui
+case 5560: { // glUniform1ui
  GLint *location = (GLint *) bp; bp += 4;
  GLuint *v0 = (GLuint *) bp; bp += 4;
  weglUniform1ui(*location,*v0);
 }; break;
-case 5549: { // glUniform2ui
+case 5561: { // glUniform2ui
  GLint *location = (GLint *) bp; bp += 4;
  GLuint *v0 = (GLuint *) bp; bp += 4;
  GLuint *v1 = (GLuint *) bp; bp += 4;
  weglUniform2ui(*location,*v0,*v1);
 }; break;
-case 5550: { // glUniform3ui
+case 5562: { // glUniform3ui
  GLint *location = (GLint *) bp; bp += 4;
  GLuint *v0 = (GLuint *) bp; bp += 4;
  GLuint *v1 = (GLuint *) bp; bp += 4;
  GLuint *v2 = (GLuint *) bp; bp += 4;
  weglUniform3ui(*location,*v0,*v1,*v2);
 }; break;
-case 5551: { // glUniform4ui
+case 5563: { // glUniform4ui
  GLint *location = (GLint *) bp; bp += 4;
  GLuint *v0 = (GLuint *) bp; bp += 4;
  GLuint *v1 = (GLuint *) bp; bp += 4;
@@ -4273,51 +4226,51 @@ case 5551: { // glUniform4ui
  GLuint *v3 = (GLuint *) bp; bp += 4;
  weglUniform4ui(*location,*v0,*v1,*v2,*v3);
 }; break;
-case 5552: { // glUniform1uiv
+case 5564: { // glUniform1uiv
  GLint *location = (GLint *) bp; bp += 4;
  int * valueLen = (int *) bp; bp += 4;
  GLuint * value = (GLuint *) bp;  bp += (8-((*valueLen*4+0)%8))%8;
  weglUniform1uiv(*location,*valueLen,value);
 }; break;
-case 5553: { // glUniform2uiv
+case 5565: { // glUniform2uiv
  GLint *location = (GLint *) bp; bp += 4;
  int *valueLen = (int *) bp; bp += 4;
  GLuint * value = (GLuint *) bp; bp += *valueLen*8;
  weglUniform2uiv(*location,*valueLen,value);
 }; break;
-case 5554: { // glUniform3uiv
+case 5566: { // glUniform3uiv
  GLint *location = (GLint *) bp; bp += 4;
  int *valueLen = (int *) bp; bp += 4;
  GLuint * value = (GLuint *) bp; bp += *valueLen*12;
  weglUniform3uiv(*location,*valueLen,value);
 }; break;
-case 5555: { // glUniform4uiv
+case 5567: { // glUniform4uiv
  GLint *location = (GLint *) bp; bp += 4;
  int *valueLen = (int *) bp; bp += 4;
  GLuint * value = (GLuint *) bp; bp += *valueLen*16;
  weglUniform4uiv(*location,*valueLen,value);
 }; break;
-case 5556: { // glTexParameterIiv
+case 5568: { // glTexParameterIiv
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *pname = (GLenum *) bp; bp += 4;
  int *paramsLen = (int *) bp; bp += 4;
  GLint *params = (GLint *) bp; bp += *paramsLen*4+((*paramsLen)+1)%2*4;
  weglTexParameterIiv(*target,*pname,params);
 }; break;
-case 5557: { // glTexParameterIuiv
+case 5569: { // glTexParameterIuiv
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *pname = (GLenum *) bp; bp += 4;
  int *paramsLen = (int *) bp; bp += 4;
  GLuint *params = (GLuint *) bp; bp += *paramsLen*4+((*paramsLen)+1)%2*4;
  weglTexParameterIuiv(*target,*pname,params);
 }; break;
-case 5558: { // glGetTexParameterIiv
+case 5570: { // glGetTexParameterIiv
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *pname = (GLenum *) bp; bp += 4;
  GLint params[4] = {0,0,0,0};
  weglGetTexParameterIiv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -4325,16 +4278,15 @@ case 5558: { // glGetTexParameterIiv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5559: { // glGetTexParameterIuiv
+case 5571: { // glGetTexParameterIuiv
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *pname = (GLenum *) bp; bp += 4;
  GLuint params[4] = {0,0,0,0};
  weglGetTexParameterIuiv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLuint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -4342,107 +4294,45 @@ case 5559: { // glGetTexParameterIuiv
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5560: { // glClearBufferiv
+case 5572: { // glClearBufferiv
  GLenum *buffer = (GLenum *) bp; bp += 4;
  GLint *drawbuffer = (GLint *) bp; bp += 4;
  int *valueLen = (int *) bp; bp += 4;
  GLint *value = (GLint *) bp; bp += *valueLen*4+((*valueLen)+1)%2*4;
  weglClearBufferiv(*buffer,*drawbuffer,value);
 }; break;
-case 5561: { // glClearBufferuiv
+case 5573: { // glClearBufferuiv
  GLenum *buffer = (GLenum *) bp; bp += 4;
  GLint *drawbuffer = (GLint *) bp; bp += 4;
  int *valueLen = (int *) bp; bp += 4;
  GLuint *value = (GLuint *) bp; bp += *valueLen*4+((*valueLen)+1)%2*4;
  weglClearBufferuiv(*buffer,*drawbuffer,value);
 }; break;
-case 5562: { // glClearBufferfv
+case 5574: { // glClearBufferfv
  GLenum *buffer = (GLenum *) bp; bp += 4;
  GLint *drawbuffer = (GLint *) bp; bp += 4;
  int *valueLen = (int *) bp; bp += 4;
  GLfloat *value = (GLfloat *) bp; bp += *valueLen*4+((*valueLen)+1)%2*4;
  weglClearBufferfv(*buffer,*drawbuffer,value);
 }; break;
-case 5563: { // glClearBufferfi
+case 5575: { // glClearBufferfi
  GLenum *buffer = (GLenum *) bp; bp += 4;
  GLint *drawbuffer = (GLint *) bp; bp += 4;
  GLfloat *depth = (GLfloat *) bp; bp += 4;
  GLint *stencil = (GLint *) bp; bp += 4;
  weglClearBufferfi(*buffer,*drawbuffer,*depth,*stencil);
 }; break;
-case 5564: { // glGetStringi
+case 5576: { // glGetStringi
  GLenum *name = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  const GLubyte *  result = weglGetStringi(*name,*index);
  int AP = 0; ErlDrvTermData rt[7];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) result; rt[AP++] = strlen((char *) result);
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
-}; break;
-case 5565: { // glVertexAttribI1iv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLint *v = (GLint *) bp; bp += 4;
- weglVertexAttribI1iv(*index,v);
-}; break;
-case 5566: { // glVertexAttribI2iv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLint *v = (GLint *) bp; bp += 4;
- weglVertexAttribI2iv(*index,v);
-}; break;
-case 5567: { // glVertexAttribI3iv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLint *v = (GLint *) bp; bp += 4;
- weglVertexAttribI3iv(*index,v);
-}; break;
-case 5568: { // glVertexAttribI4iv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLint * v = (GLint *) bp; bp += 16;
- weglVertexAttribI4iv(*index,v);
-}; break;
-case 5569: { // glVertexAttribI1uiv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLuint *v = (GLuint *) bp; bp += 4;
- weglVertexAttribI1uiv(*index,v);
-}; break;
-case 5570: { // glVertexAttribI2uiv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLuint *v = (GLuint *) bp; bp += 4;
- weglVertexAttribI2uiv(*index,v);
-}; break;
-case 5571: { // glVertexAttribI3uiv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLuint *v = (GLuint *) bp; bp += 4;
- weglVertexAttribI3uiv(*index,v);
-}; break;
-case 5572: { // glVertexAttribI4uiv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLuint * v = (GLuint *) bp; bp += 16;
- weglVertexAttribI4uiv(*index,v);
-}; break;
-case 5573: { // glVertexAttribI4bv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLbyte * v = (GLbyte *) bp; bp += 4;
- weglVertexAttribI4bv(*index,v);
-}; break;
-case 5574: { // glVertexAttribI4sv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLshort * v = (GLshort *) bp; bp += 8;
- weglVertexAttribI4sv(*index,v);
-}; break;
-case 5575: { // glVertexAttribI4ubv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLubyte * v = (GLubyte *) bp; bp += 4;
- weglVertexAttribI4ubv(*index,v);
-}; break;
-case 5576: { // glVertexAttribI4usv
- GLuint *index = (GLuint *) bp; bp += 4;
- GLushort * v = (GLushort *) bp; bp += 8;
- weglVertexAttribI4usv(*index,v);
+ driver_send_term(port,caller,rt,AP);
 }; break;
 case 5577: { // glDrawArraysInstanced
  GLenum *mode = (GLenum *) bp; bp += 4;
@@ -4463,7 +4353,7 @@ case 5579: { // glDrawElementsInstanced
  GLenum *mode = (GLenum *) bp; bp += 4;
  GLsizei *count = (GLsizei *) bp; bp += 4;
  GLenum *type = (GLenum *) bp; bp += 4;
- GLvoid *indices = (GLvoid *) bins[0]->base;
+ GLvoid *indices = (GLvoid *) bins[0];
  GLsizei *primcount = (GLsizei *) bp; bp += 4;
  weglDrawElementsInstanced(*mode,*count,*type,indices,*primcount);
 }; break;
@@ -4477,120 +4367,216 @@ case 5581: { // glPrimitiveRestartIndex
  GLuint *index = (GLuint *) bp; bp += 4;
  weglPrimitiveRestartIndex(*index);
 }; break;
-case 5582: { // glLoadTransposeMatrixfARB
+case 5582: { // glGetInteger64i_v
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLint64 data[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+ weglGetInteger64i_v(*target,*index,data);
+ int AP = 0; ErlDrvTermData rt[39];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLint64 *dataTmp = data;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *dataTmp++;
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5583: { // glGetBufferParameteri64v
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint64 params[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+ weglGetBufferParameteri64v(*target,*pname,params);
+ int AP = 0; ErlDrvTermData rt[39];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLint64 *paramsTmp = params;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5584: { // glFramebufferTexture
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLenum *attachment = (GLenum *) bp; bp += 4;
+ GLuint *texture = (GLuint *) bp; bp += 4;
+ GLint *level = (GLint *) bp; bp += 4;
+ weglFramebufferTexture(*target,*attachment,*texture,*level);
+}; break;
+case 5585: { // glVertexAttribDivisor
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLuint *divisor = (GLuint *) bp; bp += 4;
+ weglVertexAttribDivisor(*index,*divisor);
+}; break;
+case 5586: { // glMinSampleShading
+ GLclampf *value = (GLclampf *) bp; bp += 4;
+ weglMinSampleShading(*value);
+}; break;
+case 5587: { // glBlendEquationi
+ GLuint *buf = (GLuint *) bp; bp += 4;
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ weglBlendEquationi(*buf,*mode);
+}; break;
+case 5588: { // glBlendEquationSeparatei
+ GLuint *buf = (GLuint *) bp; bp += 4;
+ GLenum *modeRGB = (GLenum *) bp; bp += 4;
+ GLenum *modeAlpha = (GLenum *) bp; bp += 4;
+ weglBlendEquationSeparatei(*buf,*modeRGB,*modeAlpha);
+}; break;
+case 5589: { // glBlendFunci
+ GLuint *buf = (GLuint *) bp; bp += 4;
+ GLenum *src = (GLenum *) bp; bp += 4;
+ GLenum *dst = (GLenum *) bp; bp += 4;
+ weglBlendFunci(*buf,*src,*dst);
+}; break;
+case 5590: { // glBlendFuncSeparatei
+ GLuint *buf = (GLuint *) bp; bp += 4;
+ GLenum *srcRGB = (GLenum *) bp; bp += 4;
+ GLenum *dstRGB = (GLenum *) bp; bp += 4;
+ GLenum *srcAlpha = (GLenum *) bp; bp += 4;
+ GLenum *dstAlpha = (GLenum *) bp; bp += 4;
+ weglBlendFuncSeparatei(*buf,*srcRGB,*dstRGB,*srcAlpha,*dstAlpha);
+}; break;
+case 5591: { // glLoadTransposeMatrixfARB
  GLfloat * m = (GLfloat *) bp; bp += 64;
  weglLoadTransposeMatrixfARB(m);
 }; break;
-case 5583: { // glLoadTransposeMatrixdARB
+case 5592: { // glLoadTransposeMatrixdARB
  GLdouble * m = (GLdouble *) bp; bp += 128;
  weglLoadTransposeMatrixdARB(m);
 }; break;
-case 5584: { // glMultTransposeMatrixfARB
+case 5593: { // glMultTransposeMatrixfARB
  GLfloat * m = (GLfloat *) bp; bp += 64;
  weglMultTransposeMatrixfARB(m);
 }; break;
-case 5585: { // glMultTransposeMatrixdARB
+case 5594: { // glMultTransposeMatrixdARB
  GLdouble * m = (GLdouble *) bp; bp += 128;
  weglMultTransposeMatrixdARB(m);
 }; break;
-case 5586: { // glWeightbvARB
+case 5595: { // glWeightbvARB
  int * weightsLen = (int *) bp; bp += 4;
  GLbyte * weights = (GLbyte *) bp;  bp += (8-((*weightsLen*1+4)%8))%8;
  weglWeightbvARB(*weightsLen,weights);
 }; break;
-case 5587: { // glWeightsvARB
+case 5596: { // glWeightsvARB
  int * weightsLen = (int *) bp; bp += 4;
  GLshort * weights = (GLshort *) bp;  bp += (8-((*weightsLen*2+4)%8))%8;
  weglWeightsvARB(*weightsLen,weights);
 }; break;
-case 5588: { // glWeightivARB
+case 5597: { // glWeightivARB
  int * weightsLen = (int *) bp; bp += 4;
  GLint * weights = (GLint *) bp;  bp += (8-((*weightsLen*4+4)%8))%8;
  weglWeightivARB(*weightsLen,weights);
 }; break;
-case 5589: { // glWeightfvARB
+case 5598: { // glWeightfvARB
  int * weightsLen = (int *) bp; bp += 4;
  GLfloat * weights = (GLfloat *) bp;  bp += (8-((*weightsLen*4+4)%8))%8;
  weglWeightfvARB(*weightsLen,weights);
 }; break;
-case 5590: { // glWeightdvARB
+case 5599: { // glWeightdvARB
  int * weightsLen = (int *) bp; bp += 8;
  GLdouble * weights = (GLdouble *) bp;  bp += (8-((*weightsLen*8+0)%8))%8;
  weglWeightdvARB(*weightsLen,weights);
 }; break;
-case 5591: { // glWeightubvARB
+case 5600: { // glWeightubvARB
  int * weightsLen = (int *) bp; bp += 4;
  GLubyte * weights = (GLubyte *) bp;  bp += (8-((*weightsLen*1+4)%8))%8;
  weglWeightubvARB(*weightsLen,weights);
 }; break;
-case 5592: { // glWeightusvARB
+case 5601: { // glWeightusvARB
  int * weightsLen = (int *) bp; bp += 4;
  GLushort * weights = (GLushort *) bp;  bp += (8-((*weightsLen*2+4)%8))%8;
  weglWeightusvARB(*weightsLen,weights);
 }; break;
-case 5593: { // glWeightuivARB
+case 5602: { // glWeightuivARB
  int * weightsLen = (int *) bp; bp += 4;
  GLuint * weights = (GLuint *) bp;  bp += (8-((*weightsLen*4+4)%8))%8;
  weglWeightuivARB(*weightsLen,weights);
 }; break;
-case 5594: { // glVertexBlendARB
+case 5603: { // glVertexBlendARB
  GLint *count = (GLint *) bp; bp += 4;
  weglVertexBlendARB(*count);
 }; break;
-case 5595: { // glCurrentPaletteMatrixARB
+case 5604: { // glCurrentPaletteMatrixARB
  GLint *index = (GLint *) bp; bp += 4;
  weglCurrentPaletteMatrixARB(*index);
 }; break;
-case 5596: { // glMatrixIndexubvARB
+case 5605: { // glMatrixIndexubvARB
  int * indicesLen = (int *) bp; bp += 4;
  GLubyte * indices = (GLubyte *) bp;  bp += (8-((*indicesLen*1+4)%8))%8;
  weglMatrixIndexubvARB(*indicesLen,indices);
 }; break;
-case 5597: { // glMatrixIndexusvARB
+case 5606: { // glMatrixIndexusvARB
  int * indicesLen = (int *) bp; bp += 4;
  GLushort * indices = (GLushort *) bp;  bp += (8-((*indicesLen*2+4)%8))%8;
  weglMatrixIndexusvARB(*indicesLen,indices);
 }; break;
-case 5598: { // glMatrixIndexuivARB
+case 5607: { // glMatrixIndexuivARB
  int * indicesLen = (int *) bp; bp += 4;
  GLuint * indices = (GLuint *) bp;  bp += (8-((*indicesLen*4+4)%8))%8;
  weglMatrixIndexuivARB(*indicesLen,indices);
 }; break;
-case 5599: { // glProgramStringARB
+case 5608: { // glProgramStringARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLvoid *string = (GLvoid *) bp;
- int stringLen = strlen((char *)string); bp += stringLen+1+((8-((1+stringLen+0)%8))%8);
- weglProgramStringARB(*target,*format,stringLen,string);
+ int stringLen[1] = {strlen((char *)string)}; bp += stringLen[0]+1+((8-((1+stringLen[0]+0)%8))%8);
+ weglProgramStringARB(*target,*format,*stringLen,string);
 }; break;
-case 5600: { // glBindProgramARB
+case 5609: { // glBindProgramARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *program = (GLuint *) bp; bp += 4;
  weglBindProgramARB(*target,*program);
 }; break;
-case 5601: { // glDeleteProgramsARB
+case 5610: { // glDeleteProgramsARB
  int * programsLen = (int *) bp; bp += 4;
  GLuint * programs = (GLuint *) bp;  bp += (8-((*programsLen*4+4)%8))%8;
  weglDeleteProgramsARB(*programsLen,programs);
 }; break;
-case 5602: { // glGenProgramsARB
+case 5611: { // glGenProgramsARB
  GLsizei *n = (GLsizei *) bp; bp += 4;
  GLuint *programs;
  programs = (GLuint *) driver_alloc(sizeof(GLuint) * *n);
  weglGenProgramsARB(*n,programs);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*n)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  for(int i=0; i < *n; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) programs[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*n)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 + (*n)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7 + (*n)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(programs);
 }; break;
-case 5603: { // glProgramEnvParameter4dARB
+case 5612: { // glProgramEnvParameter4dARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLdouble *x = (GLdouble *) bp; bp += 8;
@@ -4599,13 +4585,13 @@ case 5603: { // glProgramEnvParameter4dARB
  GLdouble *w = (GLdouble *) bp; bp += 8;
  weglProgramEnvParameter4dARB(*target,*index,*x,*y,*z,*w);
 }; break;
-case 5604: { // glProgramEnvParameter4dvARB
+case 5613: { // glProgramEnvParameter4dvARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLdouble * params = (GLdouble *) bp; bp += 32;
  weglProgramEnvParameter4dvARB(*target,*index,params);
 }; break;
-case 5605: { // glProgramEnvParameter4fARB
+case 5614: { // glProgramEnvParameter4fARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLfloat *x = (GLfloat *) bp; bp += 4;
@@ -4614,13 +4600,13 @@ case 5605: { // glProgramEnvParameter4fARB
  GLfloat *w = (GLfloat *) bp; bp += 4;
  weglProgramEnvParameter4fARB(*target,*index,*x,*y,*z,*w);
 }; break;
-case 5606: { // glProgramEnvParameter4fvARB
+case 5615: { // glProgramEnvParameter4fvARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLfloat * params = (GLfloat *) bp; bp += 16;
  weglProgramEnvParameter4fvARB(*target,*index,params);
 }; break;
-case 5607: { // glProgramLocalParameter4dARB
+case 5616: { // glProgramLocalParameter4dARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLdouble *x = (GLdouble *) bp; bp += 8;
@@ -4629,13 +4615,13 @@ case 5607: { // glProgramLocalParameter4dARB
  GLdouble *w = (GLdouble *) bp; bp += 8;
  weglProgramLocalParameter4dARB(*target,*index,*x,*y,*z,*w);
 }; break;
-case 5608: { // glProgramLocalParameter4dvARB
+case 5617: { // glProgramLocalParameter4dvARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLdouble * params = (GLdouble *) bp; bp += 32;
  weglProgramLocalParameter4dvARB(*target,*index,params);
 }; break;
-case 5609: { // glProgramLocalParameter4fARB
+case 5618: { // glProgramLocalParameter4fARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLfloat *x = (GLfloat *) bp; bp += 4;
@@ -4644,19 +4630,19 @@ case 5609: { // glProgramLocalParameter4fARB
  GLfloat *w = (GLfloat *) bp; bp += 4;
  weglProgramLocalParameter4fARB(*target,*index,*x,*y,*z,*w);
 }; break;
-case 5610: { // glProgramLocalParameter4fvARB
+case 5619: { // glProgramLocalParameter4fvARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLfloat * params = (GLfloat *) bp; bp += 16;
  weglProgramLocalParameter4fvARB(*target,*index,params);
 }; break;
-case 5611: { // glGetProgramEnvParameterdvARB
+case 5620: { // glGetProgramEnvParameterdvARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLdouble params[4] = {0.0,0.0,0.0,0.0};
  weglGetProgramEnvParameterdvARB(*target,*index,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble *paramsTmp = params;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -4664,16 +4650,15 @@ case 5611: { // glGetProgramEnvParameterdvARB
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5612: { // glGetProgramEnvParameterfvARB
+case 5621: { // glGetProgramEnvParameterfvARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLfloat params[4] = {0.0,0.0,0.0,0.0};
  weglGetProgramEnvParameterfvARB(*target,*index,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[4], *paramsTmp = paramsConv; 
  for(int i=0; i < 4; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -4682,16 +4667,15 @@ case 5612: { // glGetProgramEnvParameterfvARB
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5613: { // glGetProgramLocalParameterdvARB
+case 5622: { // glGetProgramLocalParameterdvARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLdouble params[4] = {0.0,0.0,0.0,0.0};
  weglGetProgramLocalParameterdvARB(*target,*index,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble *paramsTmp = params;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -4699,16 +4683,15 @@ case 5613: { // glGetProgramLocalParameterdvARB
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5614: { // glGetProgramLocalParameterfvARB
+case 5623: { // glGetProgramLocalParameterfvARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLfloat params[4] = {0.0,0.0,0.0,0.0};
  weglGetProgramLocalParameterfvARB(*target,*index,params);
  int AP = 0; ErlDrvTermData rt[14];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[4], *paramsTmp = paramsConv; 
  for(int i=0; i < 4; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -4717,50 +4700,75 @@ case 5614: { // glGetProgramLocalParameterfvARB
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 14 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,14);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5615: { // glGetProgramStringARB
+case 5624: { // glGetProgramStringARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *pname = (GLenum *) bp; bp += 4;
- GLvoid *string = (GLvoid *) bins[0]->base;
+ GLvoid *string = (GLvoid *) bins[0];
  weglGetProgramStringARB(*target,*pname,string);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5625: { // glGetBufferParameterivARB
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint params[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+ weglGetBufferParameterivARB(*target,*pname,params);
+ int AP = 0; ErlDrvTermData rt[39];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLint *paramsTmp = params;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5616: { // glDeleteObjectARB
+case 5626: { // glDeleteObjectARB
  GLhandleARB obj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  weglDeleteObjectARB(obj);
 }; break;
-case 5617: { // glGetHandleARB
+case 5627: { // glGetHandleARB
  GLenum *pname = (GLenum *) bp; bp += 4;
  GLhandleARB result = weglGetHandleARB(*pname);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5618: { // glDetachObjectARB
+case 5628: { // glDetachObjectARB
  GLhandleARB containerObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLhandleARB attachedObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  weglDetachObjectARB(containerObj,attachedObj);
 }; break;
-case 5619: { // glCreateShaderObjectARB
+case 5629: { // glCreateShaderObjectARB
  GLenum *shaderType = (GLenum *) bp; bp += 4;
  GLhandleARB result = weglCreateShaderObjectARB(*shaderType);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5620: { // glShaderSourceARB
+case 5630: { // glShaderSourceARB
  GLhandleARB shaderObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  int * stringLen = (int *) bp; bp += 4;
  int * stringTotSize = (int *) bp; bp += 4;
@@ -4772,62 +4780,59 @@ case 5620: { // glShaderSourceARB
  weglShaderSourceARB(shaderObj,*stringLen,(const GLchar **) string,NULL);
  driver_free(string);
 }; break;
-case 5621: { // glCompileShaderARB
+case 5631: { // glCompileShaderARB
  GLhandleARB shaderObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  weglCompileShaderARB(shaderObj);
 }; break;
-case 5622: { // glCreateProgramObjectARB
+case 5632: { // glCreateProgramObjectARB
  GLhandleARB result = weglCreateProgramObjectARB();
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5623: { // glAttachObjectARB
+case 5633: { // glAttachObjectARB
  GLhandleARB containerObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLhandleARB obj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  weglAttachObjectARB(containerObj,obj);
 }; break;
-case 5624: { // glLinkProgramARB
+case 5634: { // glLinkProgramARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  weglLinkProgramARB(programObj);
 }; break;
-case 5625: { // glUseProgramObjectARB
+case 5635: { // glUseProgramObjectARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  weglUseProgramObjectARB(programObj);
 }; break;
-case 5626: { // glValidateProgramARB
+case 5636: { // glValidateProgramARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  weglValidateProgramARB(programObj);
 }; break;
-case 5627: { // glGetObjectParameterfvARB
+case 5637: { // glGetObjectParameterfvARB
  GLhandleARB obj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLenum *pname = (GLenum *) bp; bp += 4;
  GLfloat params[1] = {0.0};
  weglGetObjectParameterfvARB(obj,*pname,params);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv = (double) *params; 
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) &paramsConv;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5628: { // glGetObjectParameterivARB
+case 5638: { // glGetObjectParameterivARB
  GLhandleARB obj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLenum *pname = (GLenum *) bp; bp += 4;
  GLint params[1] = {0};
  weglGetObjectParameterivARB(obj,*pname,params);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5629: { // glGetInfoLogARB
+case 5639: { // glGetInfoLogARB
  GLhandleARB obj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLsizei *maxLength = (GLsizei *) bp; bp += 4;
  GLsizei length[1] = {0};
@@ -4835,14 +4840,13 @@ case 5629: { // glGetInfoLogARB
  infoLog = (GLchar *) driver_alloc(sizeof(GLchar) * *maxLength);
  weglGetInfoLogARB(obj,*maxLength,length,infoLog);
  int AP = 0; ErlDrvTermData rt[7];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) infoLog; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(infoLog);
 }; break;
-case 5630: { // glGetAttachedObjectsARB
+case 5640: { // glGetAttachedObjectsARB
  GLhandleARB containerObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLsizei *maxCount = (GLsizei *) bp; bp += 4;
  GLsizei count[1] = {0};
@@ -4851,29 +4855,27 @@ case 5630: { // glGetAttachedObjectsARB
  weglGetAttachedObjectsARB(containerObj,*maxCount,count,obj);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*count)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  for(int i=0; i < *count; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) obj[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*count)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 + (*count)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7 + (*count)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(obj);
 }; break;
-case 5631: { // glGetUniformLocationARB
+case 5641: { // glGetUniformLocationARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLchar *name = (GLchar *) bp;
- int nameLen = strlen((char *)name); bp += nameLen+1+((8-((1+nameLen+0)%8))%8);
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  GLint result = weglGetUniformLocationARB(programObj,name);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5632: { // glGetActiveUniformARB
+case 5642: { // glGetActiveUniformARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLsizei *maxLength = (GLsizei *) bp; bp += 4;
@@ -4884,23 +4886,22 @@ case 5632: { // glGetActiveUniformARB
  name = (GLchar *) driver_alloc(sizeof(GLchar) * *maxLength);
  weglGetActiveUniformARB(programObj,*index,*maxLength,length,size,type,name);
  int AP = 0; ErlDrvTermData rt[13];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *size;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *type;
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) name; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 3;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 13 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,13);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(name);
 }; break;
-case 5633: { // glGetUniformfvARB
+case 5643: { // glGetUniformfvARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLint *location = (GLint *) bp; bp += 4;
  GLfloat params[16] = {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};
  weglGetUniformfvARB(programObj,*location,params);
  int AP = 0; ErlDrvTermData rt[38];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLdouble paramsConv[16], *paramsTmp = paramsConv; 
  for(int i=0; i < 16; i++) paramsConv[i] = (GLdouble) params[i];
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
@@ -4921,16 +4922,15 @@ case 5633: { // glGetUniformfvARB
  rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 16;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 38 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,38);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5634: { // glGetUniformivARB
+case 5644: { // glGetUniformivARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLint *location = (GLint *) bp; bp += 4;
  GLint params[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
  weglGetUniformivARB(programObj,*location,params);
  int AP = 0; ErlDrvTermData rt[38];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  GLint *paramsTmp = params;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
@@ -4950,10 +4950,9 @@ case 5634: { // glGetUniformivARB
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 16;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 38 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,38);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5635: { // glGetShaderSourceARB
+case 5645: { // glGetShaderSourceARB
  GLhandleARB obj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLsizei *maxLength = (GLsizei *) bp; bp += 4;
  GLsizei length[1] = {0};
@@ -4961,21 +4960,20 @@ case 5635: { // glGetShaderSourceARB
  source = (GLchar *) driver_alloc(sizeof(GLchar) * *maxLength);
  weglGetShaderSourceARB(obj,*maxLength,length,source);
  int AP = 0; ErlDrvTermData rt[7];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) source; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(source);
 }; break;
-case 5636: { // glBindAttribLocationARB
+case 5646: { // glBindAttribLocationARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen = strlen((char *)name); bp += nameLen+1+((8-((1+nameLen+4)%8))%8);
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
  weglBindAttribLocationARB(programObj,*index,name);
 }; break;
-case 5637: { // glGetActiveAttribARB
+case 5647: { // glGetActiveAttribARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLsizei *maxLength = (GLsizei *) bp; bp += 4;
@@ -4986,132 +4984,124 @@ case 5637: { // glGetActiveAttribARB
  name = (GLchar *) driver_alloc(sizeof(GLchar) * *maxLength);
  weglGetActiveAttribARB(programObj,*index,*maxLength,length,size,type,name);
  int AP = 0; ErlDrvTermData rt[13];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *size;
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *type;
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) name; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 3;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 13 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,13);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(name);
 }; break;
-case 5638: { // glGetAttribLocationARB
+case 5648: { // glGetAttribLocationARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLchar *name = (GLchar *) bp;
- int nameLen = strlen((char *)name); bp += nameLen+1+((8-((1+nameLen+0)%8))%8);
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  GLint result = weglGetAttribLocationARB(programObj,name);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5639: { // glIsRenderbuffer
+case 5649: { // glIsRenderbuffer
  GLuint *renderbuffer = (GLuint *) bp; bp += 4;
  GLboolean result = weglIsRenderbuffer(*renderbuffer);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5640: { // glBindRenderbuffer
+case 5650: { // glBindRenderbuffer
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *renderbuffer = (GLuint *) bp; bp += 4;
  weglBindRenderbuffer(*target,*renderbuffer);
 }; break;
-case 5641: { // glDeleteRenderbuffers
+case 5651: { // glDeleteRenderbuffers
  int * renderbuffersLen = (int *) bp; bp += 4;
  GLuint * renderbuffers = (GLuint *) bp;  bp += (8-((*renderbuffersLen*4+4)%8))%8;
  weglDeleteRenderbuffers(*renderbuffersLen,renderbuffers);
 }; break;
-case 5642: { // glGenRenderbuffers
+case 5652: { // glGenRenderbuffers
  GLsizei *n = (GLsizei *) bp; bp += 4;
  GLuint *renderbuffers;
  renderbuffers = (GLuint *) driver_alloc(sizeof(GLuint) * *n);
  weglGenRenderbuffers(*n,renderbuffers);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*n)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  for(int i=0; i < *n; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) renderbuffers[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*n)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 + (*n)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7 + (*n)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(renderbuffers);
 }; break;
-case 5643: { // glRenderbufferStorage
+case 5653: { // glRenderbufferStorage
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *internalformat = (GLenum *) bp; bp += 4;
  GLsizei *width = (GLsizei *) bp; bp += 4;
  GLsizei *height = (GLsizei *) bp; bp += 4;
  weglRenderbufferStorage(*target,*internalformat,*width,*height);
 }; break;
-case 5644: { // glGetRenderbufferParameteriv
+case 5654: { // glGetRenderbufferParameteriv
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *pname = (GLenum *) bp; bp += 4;
  GLint params[1] = {0};
  weglGetRenderbufferParameteriv(*target,*pname,params);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5645: { // glIsFramebuffer
+case 5655: { // glIsFramebuffer
  GLuint *framebuffer = (GLuint *) bp; bp += 4;
  GLboolean result = weglIsFramebuffer(*framebuffer);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5646: { // glBindFramebuffer
+case 5656: { // glBindFramebuffer
  GLenum *target = (GLenum *) bp; bp += 4;
  GLuint *framebuffer = (GLuint *) bp; bp += 4;
  weglBindFramebuffer(*target,*framebuffer);
 }; break;
-case 5647: { // glDeleteFramebuffers
+case 5657: { // glDeleteFramebuffers
  int * framebuffersLen = (int *) bp; bp += 4;
  GLuint * framebuffers = (GLuint *) bp;  bp += (8-((*framebuffersLen*4+4)%8))%8;
  weglDeleteFramebuffers(*framebuffersLen,framebuffers);
 }; break;
-case 5648: { // glGenFramebuffers
+case 5658: { // glGenFramebuffers
  GLsizei *n = (GLsizei *) bp; bp += 4;
  GLuint *framebuffers;
  framebuffers = (GLuint *) driver_alloc(sizeof(GLuint) * *n);
  weglGenFramebuffers(*n,framebuffers);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*n)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  for(int i=0; i < *n; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) framebuffers[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*n)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 + (*n)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7 + (*n)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(framebuffers);
 }; break;
-case 5649: { // glCheckFramebufferStatus
+case 5659: { // glCheckFramebufferStatus
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum result = weglCheckFramebufferStatus(*target);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5650: { // glFramebufferTexture1D
+case 5660: { // glFramebufferTexture1D
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *attachment = (GLenum *) bp; bp += 4;
  GLenum *textarget = (GLenum *) bp; bp += 4;
@@ -5119,7 +5109,7 @@ case 5650: { // glFramebufferTexture1D
  GLint *level = (GLint *) bp; bp += 4;
  weglFramebufferTexture1D(*target,*attachment,*textarget,*texture,*level);
 }; break;
-case 5651: { // glFramebufferTexture2D
+case 5661: { // glFramebufferTexture2D
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *attachment = (GLenum *) bp; bp += 4;
  GLenum *textarget = (GLenum *) bp; bp += 4;
@@ -5127,7 +5117,7 @@ case 5651: { // glFramebufferTexture2D
  GLint *level = (GLint *) bp; bp += 4;
  weglFramebufferTexture2D(*target,*attachment,*textarget,*texture,*level);
 }; break;
-case 5652: { // glFramebufferTexture3D
+case 5662: { // glFramebufferTexture3D
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *attachment = (GLenum *) bp; bp += 4;
  GLenum *textarget = (GLenum *) bp; bp += 4;
@@ -5136,31 +5126,30 @@ case 5652: { // glFramebufferTexture3D
  GLint *zoffset = (GLint *) bp; bp += 4;
  weglFramebufferTexture3D(*target,*attachment,*textarget,*texture,*level,*zoffset);
 }; break;
-case 5653: { // glFramebufferRenderbuffer
+case 5663: { // glFramebufferRenderbuffer
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *attachment = (GLenum *) bp; bp += 4;
  GLenum *renderbuffertarget = (GLenum *) bp; bp += 4;
  GLuint *renderbuffer = (GLuint *) bp; bp += 4;
  weglFramebufferRenderbuffer(*target,*attachment,*renderbuffertarget,*renderbuffer);
 }; break;
-case 5654: { // glGetFramebufferAttachmentParameteriv
+case 5664: { // glGetFramebufferAttachmentParameteriv
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *attachment = (GLenum *) bp; bp += 4;
  GLenum *pname = (GLenum *) bp; bp += 4;
  GLint params[1] = {0};
  weglGetFramebufferAttachmentParameteriv(*target,*attachment,*pname,params);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5655: { // glGenerateMipmap
+case 5665: { // glGenerateMipmap
  GLenum *target = (GLenum *) bp; bp += 4;
  weglGenerateMipmap(*target);
 }; break;
-case 5656: { // glBlitFramebuffer
+case 5666: { // glBlitFramebuffer
  GLint *srcX0 = (GLint *) bp; bp += 4;
  GLint *srcY0 = (GLint *) bp; bp += 4;
  GLint *srcX1 = (GLint *) bp; bp += 4;
@@ -5173,7 +5162,7 @@ case 5656: { // glBlitFramebuffer
  GLenum *filter = (GLenum *) bp; bp += 4;
  weglBlitFramebuffer(*srcX0,*srcY0,*srcX1,*srcY1,*dstX0,*dstY0,*dstX1,*dstY1,*mask,*filter);
 }; break;
-case 5657: { // glRenderbufferStorageMultisample
+case 5667: { // glRenderbufferStorageMultisample
  GLenum *target = (GLenum *) bp; bp += 4;
  GLsizei *samples = (GLsizei *) bp; bp += 4;
  GLenum *internalformat = (GLenum *) bp; bp += 4;
@@ -5181,7 +5170,7 @@ case 5657: { // glRenderbufferStorageMultisample
  GLsizei *height = (GLsizei *) bp; bp += 4;
  weglRenderbufferStorageMultisample(*target,*samples,*internalformat,*width,*height);
 }; break;
-case 5658: { // glFramebufferTextureLayer
+case 5668: { // glFramebufferTextureLayer
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *attachment = (GLenum *) bp; bp += 4;
  GLuint *texture = (GLuint *) bp; bp += 4;
@@ -5189,20 +5178,7 @@ case 5658: { // glFramebufferTextureLayer
  GLint *layer = (GLint *) bp; bp += 4;
  weglFramebufferTextureLayer(*target,*attachment,*texture,*level,*layer);
 }; break;
-case 5659: { // glProgramParameteriARB
- GLuint *program = (GLuint *) bp; bp += 4;
- GLenum *pname = (GLenum *) bp; bp += 4;
- GLint *value = (GLint *) bp; bp += 4;
- weglProgramParameteriARB(*program,*pname,*value);
-}; break;
-case 5660: { // glFramebufferTextureARB
- GLenum *target = (GLenum *) bp; bp += 4;
- GLenum *attachment = (GLenum *) bp; bp += 4;
- GLuint *texture = (GLuint *) bp; bp += 4;
- GLint *level = (GLint *) bp; bp += 4;
- weglFramebufferTextureARB(*target,*attachment,*texture,*level);
-}; break;
-case 5661: { // glFramebufferTextureFaceARB
+case 5669: { // glFramebufferTextureFaceARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *attachment = (GLenum *) bp; bp += 4;
  GLuint *texture = (GLuint *) bp; bp += 4;
@@ -5210,55 +5186,48 @@ case 5661: { // glFramebufferTextureFaceARB
  GLenum *face = (GLenum *) bp; bp += 4;
  weglFramebufferTextureFaceARB(*target,*attachment,*texture,*level,*face);
 }; break;
-case 5662: { // glVertexAttribDivisorARB
- GLuint *index = (GLuint *) bp; bp += 4;
- GLuint *divisor = (GLuint *) bp; bp += 4;
- weglVertexAttribDivisorARB(*index,*divisor);
-}; break;
-case 5663: { // glFlushMappedBufferRange
+case 5670: { // glFlushMappedBufferRange
  GLenum *target = (GLenum *) bp; bp += 4;
  bp += 4;
  GLintptr offset = (GLintptr) * (GLuint64EXT *) bp; bp += 8;
  GLsizeiptr length = (GLsizeiptr) * (GLuint64EXT *) bp; bp += 8;
  weglFlushMappedBufferRange(*target,offset,length);
 }; break;
-case 5664: { // glBindVertexArray
+case 5671: { // glBindVertexArray
  GLuint *array = (GLuint *) bp; bp += 4;
  weglBindVertexArray(*array);
 }; break;
-case 5665: { // glDeleteVertexArrays
+case 5672: { // glDeleteVertexArrays
  int * arraysLen = (int *) bp; bp += 4;
  GLuint * arrays = (GLuint *) bp;  bp += (8-((*arraysLen*4+4)%8))%8;
  weglDeleteVertexArrays(*arraysLen,arrays);
 }; break;
-case 5666: { // glGenVertexArrays
+case 5673: { // glGenVertexArrays
  GLsizei *n = (GLsizei *) bp; bp += 4;
  GLuint *arrays;
  arrays = (GLuint *) driver_alloc(sizeof(GLuint) * *n);
  weglGenVertexArrays(*n,arrays);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*n)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  for(int i=0; i < *n; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) arrays[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*n)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 + (*n)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7 + (*n)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(arrays);
 }; break;
-case 5667: { // glIsVertexArray
+case 5674: { // glIsVertexArray
  GLuint *array = (GLuint *) bp; bp += 4;
  GLboolean result = weglIsVertexArray(*array);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5668: { // glGetUniformIndices
+case 5675: { // glGetUniformIndices
  GLuint *program = (GLuint *) bp; bp += 4;
  int * uniformNamesLen = (int *) bp; bp += 4;
  int * uniformNamesTotSize = (int *) bp; bp += 4;
@@ -5272,18 +5241,17 @@ case 5668: { // glGetUniformIndices
  weglGetUniformIndices(*program,*uniformNamesLen,(const GLchar **) uniformNames,uniformIndices);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*uniformNamesLen)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  for(int i=0; i < *uniformNamesLen; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) uniformIndices[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*uniformNamesLen)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 + (*uniformNamesLen)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7 + (*uniformNamesLen)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(uniformIndices);
  driver_free(uniformNames);
 }; break;
-case 5669: { // glGetActiveUniformsiv
+case 5676: { // glGetActiveUniformsiv
  GLuint *program = (GLuint *) bp; bp += 4;
  int * uniformIndicesLen = (int *) bp; bp += 4;
  GLuint * uniformIndices = (GLuint *) bp;  bp += (8-((*uniformIndicesLen*4+0)%8))%8;
@@ -5293,17 +5261,16 @@ case 5669: { // glGetActiveUniformsiv
  weglGetActiveUniformsiv(*program,*uniformIndicesLen,uniformIndices,*pname,params);
  int AP = 0; ErlDrvTermData *rt;
  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*uniformIndicesLen)*2));
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  for(int i=0; i < *uniformIndicesLen; i++) {
     rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) params[i];}
  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*uniformIndicesLen)+1;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 + (*uniformIndicesLen)*2 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7 + (*uniformIndicesLen)*2);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(rt);
  driver_free(params);
 }; break;
-case 5670: { // glGetActiveUniformName
+case 5677: { // glGetActiveUniformName
  GLuint *program = (GLuint *) bp; bp += 4;
  GLuint *uniformIndex = (GLuint *) bp; bp += 4;
  GLsizei *bufSize = (GLsizei *) bp; bp += 4;
@@ -5312,38 +5279,36 @@ case 5670: { // glGetActiveUniformName
  uniformName = (GLchar *) driver_alloc(sizeof(GLchar) * *bufSize);
  weglGetActiveUniformName(*program,*uniformIndex,*bufSize,length,uniformName);
  int AP = 0; ErlDrvTermData rt[7];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) uniformName; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(uniformName);
 }; break;
-case 5671: { // glGetUniformBlockIndex
+case 5678: { // glGetUniformBlockIndex
  GLuint *program = (GLuint *) bp; bp += 4;
  GLchar *uniformBlockName = (GLchar *) bp;
- int uniformBlockNameLen = strlen((char *)uniformBlockName); bp += uniformBlockNameLen+1+((8-((1+uniformBlockNameLen+4)%8))%8);
+ int uniformBlockNameLen[1] = {strlen((char *)uniformBlockName)}; bp += uniformBlockNameLen[0]+1+((8-((1+uniformBlockNameLen[0]+4)%8))%8);
  GLuint result = weglGetUniformBlockIndex(*program,uniformBlockName);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 6 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,6);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5672: { // glGetActiveUniformBlockiv
+case 5679: { // glGetActiveUniformBlockiv
  GLuint *program = (GLuint *) bp; bp += 4;
  GLuint *uniformBlockIndex = (GLuint *) bp; bp += 4;
  GLenum *pname = (GLenum *) bp; bp += 4;
- GLint *params = (GLint *) bins[0]->base;
+ GLint *params = (GLint *) bins[0];
  weglGetActiveUniformBlockiv(*program,*uniformBlockIndex,*pname,params);
  int AP = 0; ErlDrvTermData rt[6];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "ok");
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
 }; break;
-case 5673: { // glGetActiveUniformBlockName
+case 5680: { // glGetActiveUniformBlockName
  GLuint *program = (GLuint *) bp; bp += 4;
  GLuint *uniformBlockIndex = (GLuint *) bp; bp += 4;
  GLsizei *bufSize = (GLsizei *) bp; bp += 4;
@@ -5352,20 +5317,19 @@ case 5673: { // glGetActiveUniformBlockName
  uniformBlockName = (GLchar *) driver_alloc(sizeof(GLchar) * *bufSize);
  weglGetActiveUniformBlockName(*program,*uniformBlockIndex,*bufSize,length,uniformBlockName);
  int AP = 0; ErlDrvTermData rt[7];
- rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
  rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) uniformBlockName; rt[AP++] = *length;
  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
- if (AP != 7 )  fprintf(stderr, "%d: ERROR AP mismatch %d %d\r\n",__LINE__,AP,7);
- driver_send_term(WXE_DRV_PORT,caller,rt,AP);
+ driver_send_term(port,caller,rt,AP);
  driver_free(uniformBlockName);
 }; break;
-case 5674: { // glUniformBlockBinding
+case 5681: { // glUniformBlockBinding
  GLuint *program = (GLuint *) bp; bp += 4;
  GLuint *uniformBlockIndex = (GLuint *) bp; bp += 4;
  GLuint *uniformBlockBinding = (GLuint *) bp; bp += 4;
  weglUniformBlockBinding(*program,*uniformBlockIndex,*uniformBlockBinding);
 }; break;
-case 5675: { // glCopyBufferSubData
+case 5682: { // glCopyBufferSubData
  GLenum *readTarget = (GLenum *) bp; bp += 4;
  GLenum *writeTarget = (GLenum *) bp; bp += 4;
  GLintptr readOffset = (GLintptr) * (GLuint64EXT *) bp; bp += 8;
@@ -5373,34 +5337,1633 @@ case 5675: { // glCopyBufferSubData
  GLsizeiptr size = (GLsizeiptr) * (GLuint64EXT *) bp; bp += 8;
  weglCopyBufferSubData(*readTarget,*writeTarget,readOffset,writeOffset,size);
 }; break;
-case 5676: { // glResizeBuffersMESA
+case 5683: { // glDrawElementsBaseVertex
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLsizei *count = (GLsizei *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLvoid *indices = (GLvoid *) * (int *) bp; bp += 4;
+ GLint *basevertex = (GLint *) bp; bp += 4;
+ weglDrawElementsBaseVertex(*mode,*count,*type,indices,*basevertex);
+}; break;
+case 5684: { // glDrawElementsBaseVertex
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLsizei *count = (GLsizei *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLvoid *indices = (GLvoid *) bins[0];
+ GLint *basevertex = (GLint *) bp; bp += 4;
+ weglDrawElementsBaseVertex(*mode,*count,*type,indices,*basevertex);
+}; break;
+case 5685: { // glDrawRangeElementsBaseVertex
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLuint *start = (GLuint *) bp; bp += 4;
+ GLuint *end = (GLuint *) bp; bp += 4;
+ GLsizei *count = (GLsizei *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLvoid *indices = (GLvoid *) * (int *) bp; bp += 4;
+ GLint *basevertex = (GLint *) bp; bp += 4;
+ weglDrawRangeElementsBaseVertex(*mode,*start,*end,*count,*type,indices,*basevertex);
+}; break;
+case 5686: { // glDrawRangeElementsBaseVertex
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLuint *start = (GLuint *) bp; bp += 4;
+ GLuint *end = (GLuint *) bp; bp += 4;
+ GLsizei *count = (GLsizei *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLvoid *indices = (GLvoid *) bins[0];
+ GLint *basevertex = (GLint *) bp; bp += 4;
+ weglDrawRangeElementsBaseVertex(*mode,*start,*end,*count,*type,indices,*basevertex);
+}; break;
+case 5687: { // glDrawElementsInstancedBaseVertex
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLsizei *count = (GLsizei *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLvoid *indices = (GLvoid *) * (int *) bp; bp += 4;
+ GLsizei *primcount = (GLsizei *) bp; bp += 4;
+ GLint *basevertex = (GLint *) bp; bp += 4;
+ weglDrawElementsInstancedBaseVertex(*mode,*count,*type,indices,*primcount,*basevertex);
+}; break;
+case 5688: { // glDrawElementsInstancedBaseVertex
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLsizei *count = (GLsizei *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLvoid *indices = (GLvoid *) bins[0];
+ GLsizei *primcount = (GLsizei *) bp; bp += 4;
+ GLint *basevertex = (GLint *) bp; bp += 4;
+ weglDrawElementsInstancedBaseVertex(*mode,*count,*type,indices,*primcount,*basevertex);
+}; break;
+case 5689: { // glProvokingVertex
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ weglProvokingVertex(*mode);
+}; break;
+case 5690: { // glFenceSync
+ GLenum *condition = (GLenum *) bp; bp += 4;
+ GLbitfield *flags = (GLbitfield *) bp; bp += 4;
+ GLsync result = weglFenceSync(*condition,*flags);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5691: { // glIsSync
+ GLsync sync = (GLsync) * (GLuint64EXT *) bp; bp += 8;
+ GLboolean result = weglIsSync(sync);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5692: { // glDeleteSync
+ GLsync sync = (GLsync) * (GLuint64EXT *) bp; bp += 8;
+ weglDeleteSync(sync);
+}; break;
+case 5693: { // glClientWaitSync
+ GLsync sync = (GLsync) * (GLuint64EXT *) bp; bp += 8;
+ GLbitfield *flags = (GLbitfield *) bp; bp += 4;
+ bp += 4;
+ GLuint64 timeout = (GLuint64) * (GLuint64EXT *) bp; bp += 8;
+ GLenum result = weglClientWaitSync(sync,*flags,timeout);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5694: { // glWaitSync
+ GLsync sync = (GLsync) * (GLuint64EXT *) bp; bp += 8;
+ GLbitfield *flags = (GLbitfield *) bp; bp += 4;
+ bp += 4;
+ GLuint64 timeout = (GLuint64) * (GLuint64EXT *) bp; bp += 8;
+ weglWaitSync(sync,*flags,timeout);
+}; break;
+case 5695: { // glGetInteger64v
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint64 params[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+ weglGetInteger64v(*pname,params);
+ int AP = 0; ErlDrvTermData rt[39];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLint64 *paramsTmp = params;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5696: { // glGetSynciv
+ GLsync sync = (GLsync) * (GLuint64EXT *) bp; bp += 8;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLsizei *bufSize = (GLsizei *) bp; bp += 4;
+ GLsizei length[1] = {0};
+ GLint *values;
+ values = (GLint *) driver_alloc(sizeof(GLint) * *bufSize);
+ weglGetSynciv(sync,*pname,*bufSize,length,values);
+ int AP = 0; ErlDrvTermData *rt;
+ rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*length)*2));
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ for(int i=0; i < *length; i++) {
+    rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) values[i];}
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*length)+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+ driver_free(rt);
+ driver_free(values);
+}; break;
+case 5697: { // glTexImage2DMultisample
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLsizei *samples = (GLsizei *) bp; bp += 4;
+ GLint *internalformat = (GLint *) bp; bp += 4;
+ GLsizei *width = (GLsizei *) bp; bp += 4;
+ GLsizei *height = (GLsizei *) bp; bp += 4;
+ GLboolean *fixedsamplelocations = (GLboolean *) bp; bp += 1;
+ weglTexImage2DMultisample(*target,*samples,*internalformat,*width,*height,*fixedsamplelocations);
+}; break;
+case 5698: { // glTexImage3DMultisample
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLsizei *samples = (GLsizei *) bp; bp += 4;
+ GLint *internalformat = (GLint *) bp; bp += 4;
+ GLsizei *width = (GLsizei *) bp; bp += 4;
+ GLsizei *height = (GLsizei *) bp; bp += 4;
+ GLsizei *depth = (GLsizei *) bp; bp += 4;
+ GLboolean *fixedsamplelocations = (GLboolean *) bp; bp += 1;
+ weglTexImage3DMultisample(*target,*samples,*internalformat,*width,*height,*depth,*fixedsamplelocations);
+}; break;
+case 5699: { // glGetMultisamplefv
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLfloat val[2] = {0.0,0.0};
+ weglGetMultisamplefv(*pname,*index,val);
+ int AP = 0; ErlDrvTermData rt[10];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLdouble valConv[2], *valTmp = valConv; 
+ for(int i=0; i < 2; i++) valConv[i] = (GLdouble) val[i];
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) valTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) valTmp++;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5700: { // glSampleMaski
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLbitfield *mask = (GLbitfield *) bp; bp += 4;
+ weglSampleMaski(*index,*mask);
+}; break;
+case 5701: { // glNamedStringARB
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLchar *name = (GLchar *) bp;
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
+ GLchar *string = (GLchar *) bp;
+ int stringLen[1] = {strlen((char *)string)}; bp += stringLen[0]+1+((8-((1+stringLen[0]+0)%8))%8);
+ weglNamedStringARB(*type,*nameLen,name,*stringLen,string);
+}; break;
+case 5702: { // glDeleteNamedStringARB
+ GLchar *name = (GLchar *) bp;
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ weglDeleteNamedStringARB(*nameLen,name);
+}; break;
+case 5703: { // glCompileShaderIncludeARB
+ GLuint *shader = (GLuint *) bp; bp += 4;
+ int * pathLen = (int *) bp; bp += 4;
+ int * pathTotSize = (int *) bp; bp += 4;
+ GLchar **path;
+ path = (GLchar **) driver_alloc(sizeof(GLchar *) * *pathLen);
+ for(int i=0;i<*pathLen;i++) {
+    path[i] = (GLchar *) bp; bp += 1+strlen(bp);};
+ bp += (8 - ((0 + *pathTotSize) % 8)) % 8;
+ weglCompileShaderIncludeARB(*shader,*pathLen,(const GLchar **) path,NULL);
+ driver_free(path);
+}; break;
+case 5704: { // glIsNamedStringARB
+ GLchar *name = (GLchar *) bp;
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ GLboolean result = weglIsNamedStringARB(*nameLen,name);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5705: { // glGetNamedStringARB
+ GLchar *name = (GLchar *) bp;
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ GLsizei *bufSize = (GLsizei *) bp; bp += 4;
+ GLint stringlen[1] = {0};
+ GLchar *string;
+ string = (GLchar *) driver_alloc(sizeof(GLchar) * *bufSize);
+ weglGetNamedStringARB(*nameLen,name,*bufSize,stringlen,string);
+ int AP = 0; ErlDrvTermData rt[7];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) string; rt[AP++] = *stringlen;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+ driver_free(string);
+}; break;
+case 5706: { // glGetNamedStringivARB
+ GLchar *name = (GLchar *) bp;
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint params[1] = {0};
+ weglGetNamedStringivARB(*nameLen,name,*pname,params);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5707: { // glBindFragDataLocationIndexed
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLuint *colorNumber = (GLuint *) bp; bp += 4;
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLchar *name = (GLchar *) bp;
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
+ weglBindFragDataLocationIndexed(*program,*colorNumber,*index,name);
+}; break;
+case 5708: { // glGetFragDataIndex
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLchar *name = (GLchar *) bp;
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
+ GLint result = weglGetFragDataIndex(*program,name);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5709: { // glGenSamplers
+ GLsizei *count = (GLsizei *) bp; bp += 4;
+ GLuint *samplers;
+ samplers = (GLuint *) driver_alloc(sizeof(GLuint) * *count);
+ weglGenSamplers(*count,samplers);
+ int AP = 0; ErlDrvTermData *rt;
+ rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*count)*2));
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ for(int i=0; i < *count; i++) {
+    rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) samplers[i];}
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*count)+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+ driver_free(rt);
+ driver_free(samplers);
+}; break;
+case 5710: { // glDeleteSamplers
+ int * samplersLen = (int *) bp; bp += 4;
+ GLuint * samplers = (GLuint *) bp;  bp += (8-((*samplersLen*4+4)%8))%8;
+ weglDeleteSamplers(*samplersLen,samplers);
+}; break;
+case 5711: { // glIsSampler
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ GLboolean result = weglIsSampler(*sampler);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5712: { // glBindSampler
+ GLuint *unit = (GLuint *) bp; bp += 4;
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ weglBindSampler(*unit,*sampler);
+}; break;
+case 5713: { // glSamplerParameteri
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint *param = (GLint *) bp; bp += 4;
+ weglSamplerParameteri(*sampler,*pname,*param);
+}; break;
+case 5714: { // glSamplerParameteriv
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ int * paramLen = (int *) bp; bp += 4;
+ GLint * param = (GLint *) bp;  bp += (8-((*paramLen*4+4)%8))%8;
+ weglSamplerParameteriv(*sampler,*pname,param);
+}; break;
+case 5715: { // glSamplerParameterf
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLfloat *param = (GLfloat *) bp; bp += 4;
+ weglSamplerParameterf(*sampler,*pname,*param);
+}; break;
+case 5716: { // glSamplerParameterfv
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ int * paramLen = (int *) bp; bp += 4;
+ GLfloat * param = (GLfloat *) bp;  bp += (8-((*paramLen*4+4)%8))%8;
+ weglSamplerParameterfv(*sampler,*pname,param);
+}; break;
+case 5717: { // glSamplerParameterIiv
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ int * paramLen = (int *) bp; bp += 4;
+ GLint * param = (GLint *) bp;  bp += (8-((*paramLen*4+4)%8))%8;
+ weglSamplerParameterIiv(*sampler,*pname,param);
+}; break;
+case 5718: { // glSamplerParameterIuiv
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ int * paramLen = (int *) bp; bp += 4;
+ GLuint * param = (GLuint *) bp;  bp += (8-((*paramLen*4+4)%8))%8;
+ weglSamplerParameterIuiv(*sampler,*pname,param);
+}; break;
+case 5719: { // glGetSamplerParameteriv
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint params[4] = {0,0,0,0};
+ weglGetSamplerParameteriv(*sampler,*pname,params);
+ int AP = 0; ErlDrvTermData rt[15];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLint *paramsTmp = params;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 4+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5720: { // glGetSamplerParameterIiv
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint params[4] = {0,0,0,0};
+ weglGetSamplerParameterIiv(*sampler,*pname,params);
+ int AP = 0; ErlDrvTermData rt[15];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLint *paramsTmp = params;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 4+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5721: { // glGetSamplerParameterfv
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLfloat params[4] = {0.0,0.0,0.0,0.0};
+ weglGetSamplerParameterfv(*sampler,*pname,params);
+ int AP = 0; ErlDrvTermData rt[15];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLdouble paramsConv[4], *paramsTmp = paramsConv; 
+ for(int i=0; i < 4; i++) paramsConv[i] = (GLdouble) params[i];
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 4+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5722: { // glGetSamplerParameterIuiv
+ GLuint *sampler = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLuint params[4] = {0,0,0,0};
+ weglGetSamplerParameterIuiv(*sampler,*pname,params);
+ int AP = 0; ErlDrvTermData rt[15];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLuint *paramsTmp = params;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 4+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5723: { // glQueryCounter
+ GLuint *id = (GLuint *) bp; bp += 4;
+ GLenum *target = (GLenum *) bp; bp += 4;
+ weglQueryCounter(*id,*target);
+}; break;
+case 5724: { // glGetQueryObjecti64v
+ GLuint *id = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint64 params[1] = {0};
+ weglGetQueryObjecti64v(*id,*pname,params);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5725: { // glGetQueryObjectui64v
+ GLuint *id = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLuint64 params[1] = {0};
+ weglGetQueryObjectui64v(*id,*pname,params);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5726: { // glDrawArraysIndirect
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLvoid *indirect = (GLvoid *) * (int *) bp; bp += 4;
+ weglDrawArraysIndirect(*mode,indirect);
+}; break;
+case 5727: { // glDrawArraysIndirect
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLvoid *indirect = (GLvoid *) bins[0];
+ weglDrawArraysIndirect(*mode,indirect);
+}; break;
+case 5728: { // glDrawElementsIndirect
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLvoid *indirect = (GLvoid *) * (int *) bp; bp += 4;
+ weglDrawElementsIndirect(*mode,*type,indirect);
+}; break;
+case 5729: { // glDrawElementsIndirect
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLvoid *indirect = (GLvoid *) bins[0];
+ weglDrawElementsIndirect(*mode,*type,indirect);
+}; break;
+case 5730: { // glUniform1d
+ GLint *location = (GLint *) bp; bp += 4;
+ bp += 4;
+ GLdouble *x = (GLdouble *) bp; bp += 8;
+ weglUniform1d(*location,*x);
+}; break;
+case 5731: { // glUniform2d
+ GLint *location = (GLint *) bp; bp += 4;
+ bp += 4;
+ GLdouble *x = (GLdouble *) bp; bp += 8;
+ GLdouble *y = (GLdouble *) bp; bp += 8;
+ weglUniform2d(*location,*x,*y);
+}; break;
+case 5732: { // glUniform3d
+ GLint *location = (GLint *) bp; bp += 4;
+ bp += 4;
+ GLdouble *x = (GLdouble *) bp; bp += 8;
+ GLdouble *y = (GLdouble *) bp; bp += 8;
+ GLdouble *z = (GLdouble *) bp; bp += 8;
+ weglUniform3d(*location,*x,*y,*z);
+}; break;
+case 5733: { // glUniform4d
+ GLint *location = (GLint *) bp; bp += 4;
+ bp += 4;
+ GLdouble *x = (GLdouble *) bp; bp += 8;
+ GLdouble *y = (GLdouble *) bp; bp += 8;
+ GLdouble *z = (GLdouble *) bp; bp += 8;
+ GLdouble *w = (GLdouble *) bp; bp += 8;
+ weglUniform4d(*location,*x,*y,*z,*w);
+}; break;
+case 5734: { // glUniform1dv
+ GLint *location = (GLint *) bp; bp += 4;
+ bp += 4;
+ int * valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp;  bp += (8-((*valueLen*8+0)%8))%8;
+ weglUniform1dv(*location,*valueLen,value);
+}; break;
+case 5735: { // glUniform2dv
+ GLint *location = (GLint *) bp; bp += 4;
+ bp += 4;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*16;
+ weglUniform2dv(*location,*valueLen,value);
+}; break;
+case 5736: { // glUniform3dv
+ GLint *location = (GLint *) bp; bp += 4;
+ bp += 4;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*24;
+ weglUniform3dv(*location,*valueLen,value);
+}; break;
+case 5737: { // glUniform4dv
+ GLint *location = (GLint *) bp; bp += 4;
+ bp += 4;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*32;
+ weglUniform4dv(*location,*valueLen,value);
+}; break;
+case 5738: { // glUniformMatrix2dv
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*32;
+ weglUniformMatrix2dv(*location,*valueLen,*transpose,value);
+}; break;
+case 5739: { // glUniformMatrix3dv
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*72;
+ weglUniformMatrix3dv(*location,*valueLen,*transpose,value);
+}; break;
+case 5740: { // glUniformMatrix4dv
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*128;
+ weglUniformMatrix4dv(*location,*valueLen,*transpose,value);
+}; break;
+case 5741: { // glUniformMatrix2x3dv
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*48;
+ weglUniformMatrix2x3dv(*location,*valueLen,*transpose,value);
+}; break;
+case 5742: { // glUniformMatrix2x4dv
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*64;
+ weglUniformMatrix2x4dv(*location,*valueLen,*transpose,value);
+}; break;
+case 5743: { // glUniformMatrix3x2dv
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*48;
+ weglUniformMatrix3x2dv(*location,*valueLen,*transpose,value);
+}; break;
+case 5744: { // glUniformMatrix3x4dv
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*96;
+ weglUniformMatrix3x4dv(*location,*valueLen,*transpose,value);
+}; break;
+case 5745: { // glUniformMatrix4x2dv
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*64;
+ weglUniformMatrix4x2dv(*location,*valueLen,*transpose,value);
+}; break;
+case 5746: { // glUniformMatrix4x3dv
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*96;
+ weglUniformMatrix4x3dv(*location,*valueLen,*transpose,value);
+}; break;
+case 5747: { // glGetUniformdv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLdouble params[16] = {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};
+ weglGetUniformdv(*program,*location,params);
+ int AP = 0; ErlDrvTermData rt[38];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLdouble *paramsTmp = params;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 16;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5748: { // glGetSubroutineUniformLocation
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLenum *shadertype = (GLenum *) bp; bp += 4;
+ GLchar *name = (GLchar *) bp;
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ GLint result = weglGetSubroutineUniformLocation(*program,*shadertype,name);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5749: { // glGetSubroutineIndex
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLenum *shadertype = (GLenum *) bp; bp += 4;
+ GLchar *name = (GLchar *) bp;
+ int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ GLuint result = weglGetSubroutineIndex(*program,*shadertype,name);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5750: { // glGetActiveSubroutineUniformName
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLenum *shadertype = (GLenum *) bp; bp += 4;
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLsizei *bufsize = (GLsizei *) bp; bp += 4;
+ GLsizei length[1] = {0};
+ GLchar *name;
+ name = (GLchar *) driver_alloc(sizeof(GLchar) * *bufsize);
+ weglGetActiveSubroutineUniformName(*program,*shadertype,*index,*bufsize,length,name);
+ int AP = 0; ErlDrvTermData rt[7];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) name; rt[AP++] = *length;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+ driver_free(name);
+}; break;
+case 5751: { // glGetActiveSubroutineName
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLenum *shadertype = (GLenum *) bp; bp += 4;
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLsizei *bufsize = (GLsizei *) bp; bp += 4;
+ GLsizei length[1] = {0};
+ GLchar *name;
+ name = (GLchar *) driver_alloc(sizeof(GLchar) * *bufsize);
+ weglGetActiveSubroutineName(*program,*shadertype,*index,*bufsize,length,name);
+ int AP = 0; ErlDrvTermData rt[7];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) name; rt[AP++] = *length;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+ driver_free(name);
+}; break;
+case 5752: { // glUniformSubroutinesuiv
+ GLenum *shadertype = (GLenum *) bp; bp += 4;
+ int * indicesLen = (int *) bp; bp += 4;
+ GLuint * indices = (GLuint *) bp;  bp += (8-((*indicesLen*4+0)%8))%8;
+ weglUniformSubroutinesuiv(*shadertype,*indicesLen,indices);
+}; break;
+case 5753: { // glGetUniformSubroutineuiv
+ GLenum *shadertype = (GLenum *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLuint params[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+ weglGetUniformSubroutineuiv(*shadertype,*location,params);
+ int AP = 0; ErlDrvTermData rt[38];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLuint *paramsTmp = params;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *paramsTmp++;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 16;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5754: { // glGetProgramStageiv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLenum *shadertype = (GLenum *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint values[1] = {0};
+ weglGetProgramStageiv(*program,*shadertype,*pname,values);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *values;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5755: { // glPatchParameteri
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint *value = (GLint *) bp; bp += 4;
+ weglPatchParameteri(*pname,*value);
+}; break;
+case 5756: { // glPatchParameterfv
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ int * valuesLen = (int *) bp; bp += 4;
+ GLfloat * values = (GLfloat *) bp;  bp += (8-((*valuesLen*4+0)%8))%8;
+ weglPatchParameterfv(*pname,values);
+}; break;
+case 5757: { // glBindTransformFeedback
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLuint *id = (GLuint *) bp; bp += 4;
+ weglBindTransformFeedback(*target,*id);
+}; break;
+case 5758: { // glDeleteTransformFeedbacks
+ int * idsLen = (int *) bp; bp += 4;
+ GLuint * ids = (GLuint *) bp;  bp += (8-((*idsLen*4+4)%8))%8;
+ weglDeleteTransformFeedbacks(*idsLen,ids);
+}; break;
+case 5759: { // glGenTransformFeedbacks
+ GLsizei *n = (GLsizei *) bp; bp += 4;
+ GLuint *ids;
+ ids = (GLuint *) driver_alloc(sizeof(GLuint) * *n);
+ weglGenTransformFeedbacks(*n,ids);
+ int AP = 0; ErlDrvTermData *rt;
+ rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*n)*2));
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ for(int i=0; i < *n; i++) {
+    rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) ids[i];}
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*n)+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+ driver_free(rt);
+ driver_free(ids);
+}; break;
+case 5760: { // glIsTransformFeedback
+ GLuint *id = (GLuint *) bp; bp += 4;
+ GLboolean result = weglIsTransformFeedback(*id);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5761: { // glPauseTransformFeedback
+ weglPauseTransformFeedback();
+}; break;
+case 5762: { // glResumeTransformFeedback
+ weglResumeTransformFeedback();
+}; break;
+case 5763: { // glDrawTransformFeedback
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLuint *id = (GLuint *) bp; bp += 4;
+ weglDrawTransformFeedback(*mode,*id);
+}; break;
+case 5764: { // glDrawTransformFeedbackStream
+ GLenum *mode = (GLenum *) bp; bp += 4;
+ GLuint *id = (GLuint *) bp; bp += 4;
+ GLuint *stream = (GLuint *) bp; bp += 4;
+ weglDrawTransformFeedbackStream(*mode,*id,*stream);
+}; break;
+case 5765: { // glBeginQueryIndexed
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLuint *id = (GLuint *) bp; bp += 4;
+ weglBeginQueryIndexed(*target,*index,*id);
+}; break;
+case 5766: { // glEndQueryIndexed
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLuint *index = (GLuint *) bp; bp += 4;
+ weglEndQueryIndexed(*target,*index);
+}; break;
+case 5767: { // glGetQueryIndexediv
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint params[1] = {0};
+ weglGetQueryIndexediv(*target,*index,*pname,params);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5768: { // glReleaseShaderCompiler
+ weglReleaseShaderCompiler();
+}; break;
+case 5769: { // glShaderBinary
+ int * shadersLen = (int *) bp; bp += 4;
+ GLuint * shaders = (GLuint *) bp;  bp += (8-((*shadersLen*4+4)%8))%8;
+ GLenum *binaryformat = (GLenum *) bp; bp += 4;
+ GLvoid *binary = (GLvoid *) bins[0];
+ GLsizei binary_size = bins_sz[0];
+ weglShaderBinary(*shadersLen,shaders,*binaryformat,binary,binary_size);
+}; break;
+case 5770: { // glGetShaderPrecisionFormat
+ GLenum *shadertype = (GLenum *) bp; bp += 4;
+ GLenum *precisiontype = (GLenum *) bp; bp += 4;
+ GLint range[2] = {0,0};
+ GLint precision[1] = {0};
+ weglGetShaderPrecisionFormat(*shadertype,*precisiontype,range,precision);
+ int AP = 0; ErlDrvTermData rt[14];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLint *rangeTmp = range;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *rangeTmp++;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *rangeTmp++;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *precision;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5771: { // glDepthRangef
+ GLclampf *n = (GLclampf *) bp; bp += 4;
+ GLclampf *f = (GLclampf *) bp; bp += 4;
+ weglDepthRangef(*n,*f);
+}; break;
+case 5772: { // glClearDepthf
+ GLclampf *d = (GLclampf *) bp; bp += 4;
+ weglClearDepthf(*d);
+}; break;
+case 5773: { // glGetProgramBinary
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLsizei *bufSize = (GLsizei *) bp; bp += 4;
+ GLsizei length[1] = {0};
+ GLenum binaryFormat[1] = {0};
+ ErlDrvBinary *binary = driver_alloc_binary(*bufSize);
+ weglGetProgramBinary(*program,*bufSize,length,binaryFormat,(GLvoid*) binary->orig_bytes);
+ int AP = 0; ErlDrvTermData rt[12];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *binaryFormat;
+ rt[AP++] = ERL_DRV_BINARY; rt[AP++] = (ErlDrvTermData) binary; rt[AP++] = *length; rt[AP++] = 0;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+ driver_free_binary(binary);
+}; break;
+case 5774: { // glProgramBinary
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLenum *binaryFormat = (GLenum *) bp; bp += 4;
+ GLvoid *binary = (GLvoid *) bins[0];
+ GLsizei binary_size = bins_sz[0];
+ weglProgramBinary(*program,*binaryFormat,binary,binary_size);
+}; break;
+case 5775: { // glProgramParameteri
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint *value = (GLint *) bp; bp += 4;
+ weglProgramParameteri(*program,*pname,*value);
+}; break;
+case 5776: { // glUseProgramStages
+ GLuint *pipeline = (GLuint *) bp; bp += 4;
+ GLbitfield *stages = (GLbitfield *) bp; bp += 4;
+ GLuint *program = (GLuint *) bp; bp += 4;
+ weglUseProgramStages(*pipeline,*stages,*program);
+}; break;
+case 5777: { // glActiveShaderProgram
+ GLuint *pipeline = (GLuint *) bp; bp += 4;
+ GLuint *program = (GLuint *) bp; bp += 4;
+ weglActiveShaderProgram(*pipeline,*program);
+}; break;
+case 5778: { // glCreateShaderProgramv
+ GLenum *type = (GLenum *) bp; bp += 4;
+ int * stringsLen = (int *) bp; bp += 4;
+ int * stringsTotSize = (int *) bp; bp += 4;
+ GLchar **strings;
+ strings = (GLchar **) driver_alloc(sizeof(GLchar *) * *stringsLen);
+ for(int i=0;i<*stringsLen;i++) {
+    strings[i] = (GLchar *) bp; bp += 1+strlen(bp);};
+ bp += (8 - ((0 + *stringsTotSize) % 8)) % 8;
+ GLuint result = weglCreateShaderProgramv(*type,*stringsLen,(const GLchar **) strings);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+ driver_free(strings);
+}; break;
+case 5779: { // glBindProgramPipeline
+ GLuint *pipeline = (GLuint *) bp; bp += 4;
+ weglBindProgramPipeline(*pipeline);
+}; break;
+case 5780: { // glDeleteProgramPipelines
+ int * pipelinesLen = (int *) bp; bp += 4;
+ GLuint * pipelines = (GLuint *) bp;  bp += (8-((*pipelinesLen*4+4)%8))%8;
+ weglDeleteProgramPipelines(*pipelinesLen,pipelines);
+}; break;
+case 5781: { // glGenProgramPipelines
+ GLsizei *n = (GLsizei *) bp; bp += 4;
+ GLuint *pipelines;
+ pipelines = (GLuint *) driver_alloc(sizeof(GLuint) * *n);
+ weglGenProgramPipelines(*n,pipelines);
+ int AP = 0; ErlDrvTermData *rt;
+ rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(7 + (*n)*2));
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ for(int i=0; i < *n; i++) {
+    rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) pipelines[i];}
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = (*n)+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+ driver_free(rt);
+ driver_free(pipelines);
+}; break;
+case 5782: { // glIsProgramPipeline
+ GLuint *pipeline = (GLuint *) bp; bp += 4;
+ GLboolean result = weglIsProgramPipeline(*pipeline);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5783: { // glGetProgramPipelineiv
+ GLuint *pipeline = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLint params[1] = {0};
+ weglGetProgramPipelineiv(*pipeline,*pname,params);
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) *params;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5784: { // glProgramUniform1i
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLint *v0 = (GLint *) bp; bp += 4;
+ weglProgramUniform1i(*program,*location,*v0);
+}; break;
+case 5785: { // glProgramUniform1iv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int * valueLen = (int *) bp; bp += 4;
+ GLint * value = (GLint *) bp;  bp += (8-((*valueLen*4+4)%8))%8;
+ weglProgramUniform1iv(*program,*location,*valueLen,value);
+}; break;
+case 5786: { // glProgramUniform1f
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLfloat *v0 = (GLfloat *) bp; bp += 4;
+ weglProgramUniform1f(*program,*location,*v0);
+}; break;
+case 5787: { // glProgramUniform1fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int * valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp;  bp += (8-((*valueLen*4+4)%8))%8;
+ weglProgramUniform1fv(*program,*location,*valueLen,value);
+}; break;
+case 5788: { // glProgramUniform1d
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLdouble *v0 = (GLdouble *) bp; bp += 8;
+ weglProgramUniform1d(*program,*location,*v0);
+}; break;
+case 5789: { // glProgramUniform1dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int * valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp;  bp += (8-((*valueLen*8+0)%8))%8;
+ weglProgramUniform1dv(*program,*location,*valueLen,value);
+}; break;
+case 5790: { // glProgramUniform1ui
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLuint *v0 = (GLuint *) bp; bp += 4;
+ weglProgramUniform1ui(*program,*location,*v0);
+}; break;
+case 5791: { // glProgramUniform1uiv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int * valueLen = (int *) bp; bp += 4;
+ GLuint * value = (GLuint *) bp;  bp += (8-((*valueLen*4+4)%8))%8;
+ weglProgramUniform1uiv(*program,*location,*valueLen,value);
+}; break;
+case 5792: { // glProgramUniform2i
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLint *v0 = (GLint *) bp; bp += 4;
+ GLint *v1 = (GLint *) bp; bp += 4;
+ weglProgramUniform2i(*program,*location,*v0,*v1);
+}; break;
+case 5793: { // glProgramUniform2iv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 4;
+ GLint * value = (GLint *) bp; bp += *valueLen*8;
+ weglProgramUniform2iv(*program,*location,*valueLen,value);
+}; break;
+case 5794: { // glProgramUniform2f
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLfloat *v0 = (GLfloat *) bp; bp += 4;
+ GLfloat *v1 = (GLfloat *) bp; bp += 4;
+ weglProgramUniform2f(*program,*location,*v0,*v1);
+}; break;
+case 5795: { // glProgramUniform2fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*8;
+ weglProgramUniform2fv(*program,*location,*valueLen,value);
+}; break;
+case 5796: { // glProgramUniform2d
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLdouble *v0 = (GLdouble *) bp; bp += 8;
+ GLdouble *v1 = (GLdouble *) bp; bp += 8;
+ weglProgramUniform2d(*program,*location,*v0,*v1);
+}; break;
+case 5797: { // glProgramUniform2dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*16;
+ weglProgramUniform2dv(*program,*location,*valueLen,value);
+}; break;
+case 5798: { // glProgramUniform2ui
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLuint *v0 = (GLuint *) bp; bp += 4;
+ GLuint *v1 = (GLuint *) bp; bp += 4;
+ weglProgramUniform2ui(*program,*location,*v0,*v1);
+}; break;
+case 5799: { // glProgramUniform2uiv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 4;
+ GLuint * value = (GLuint *) bp; bp += *valueLen*8;
+ weglProgramUniform2uiv(*program,*location,*valueLen,value);
+}; break;
+case 5800: { // glProgramUniform3i
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLint *v0 = (GLint *) bp; bp += 4;
+ GLint *v1 = (GLint *) bp; bp += 4;
+ GLint *v2 = (GLint *) bp; bp += 4;
+ weglProgramUniform3i(*program,*location,*v0,*v1,*v2);
+}; break;
+case 5801: { // glProgramUniform3iv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 4;
+ GLint * value = (GLint *) bp; bp += *valueLen*12;
+ weglProgramUniform3iv(*program,*location,*valueLen,value);
+}; break;
+case 5802: { // glProgramUniform3f
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLfloat *v0 = (GLfloat *) bp; bp += 4;
+ GLfloat *v1 = (GLfloat *) bp; bp += 4;
+ GLfloat *v2 = (GLfloat *) bp; bp += 4;
+ weglProgramUniform3f(*program,*location,*v0,*v1,*v2);
+}; break;
+case 5803: { // glProgramUniform3fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*12;
+ weglProgramUniform3fv(*program,*location,*valueLen,value);
+}; break;
+case 5804: { // glProgramUniform3d
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLdouble *v0 = (GLdouble *) bp; bp += 8;
+ GLdouble *v1 = (GLdouble *) bp; bp += 8;
+ GLdouble *v2 = (GLdouble *) bp; bp += 8;
+ weglProgramUniform3d(*program,*location,*v0,*v1,*v2);
+}; break;
+case 5805: { // glProgramUniform3dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*24;
+ weglProgramUniform3dv(*program,*location,*valueLen,value);
+}; break;
+case 5806: { // glProgramUniform3ui
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLuint *v0 = (GLuint *) bp; bp += 4;
+ GLuint *v1 = (GLuint *) bp; bp += 4;
+ GLuint *v2 = (GLuint *) bp; bp += 4;
+ weglProgramUniform3ui(*program,*location,*v0,*v1,*v2);
+}; break;
+case 5807: { // glProgramUniform3uiv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 4;
+ GLuint * value = (GLuint *) bp; bp += *valueLen*12;
+ weglProgramUniform3uiv(*program,*location,*valueLen,value);
+}; break;
+case 5808: { // glProgramUniform4i
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLint *v0 = (GLint *) bp; bp += 4;
+ GLint *v1 = (GLint *) bp; bp += 4;
+ GLint *v2 = (GLint *) bp; bp += 4;
+ GLint *v3 = (GLint *) bp; bp += 4;
+ weglProgramUniform4i(*program,*location,*v0,*v1,*v2,*v3);
+}; break;
+case 5809: { // glProgramUniform4iv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 4;
+ GLint * value = (GLint *) bp; bp += *valueLen*16;
+ weglProgramUniform4iv(*program,*location,*valueLen,value);
+}; break;
+case 5810: { // glProgramUniform4f
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLfloat *v0 = (GLfloat *) bp; bp += 4;
+ GLfloat *v1 = (GLfloat *) bp; bp += 4;
+ GLfloat *v2 = (GLfloat *) bp; bp += 4;
+ GLfloat *v3 = (GLfloat *) bp; bp += 4;
+ weglProgramUniform4f(*program,*location,*v0,*v1,*v2,*v3);
+}; break;
+case 5811: { // glProgramUniform4fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*16;
+ weglProgramUniform4fv(*program,*location,*valueLen,value);
+}; break;
+case 5812: { // glProgramUniform4d
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLdouble *v0 = (GLdouble *) bp; bp += 8;
+ GLdouble *v1 = (GLdouble *) bp; bp += 8;
+ GLdouble *v2 = (GLdouble *) bp; bp += 8;
+ GLdouble *v3 = (GLdouble *) bp; bp += 8;
+ weglProgramUniform4d(*program,*location,*v0,*v1,*v2,*v3);
+}; break;
+case 5813: { // glProgramUniform4dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*32;
+ weglProgramUniform4dv(*program,*location,*valueLen,value);
+}; break;
+case 5814: { // glProgramUniform4ui
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLuint *v0 = (GLuint *) bp; bp += 4;
+ GLuint *v1 = (GLuint *) bp; bp += 4;
+ GLuint *v2 = (GLuint *) bp; bp += 4;
+ GLuint *v3 = (GLuint *) bp; bp += 4;
+ weglProgramUniform4ui(*program,*location,*v0,*v1,*v2,*v3);
+}; break;
+case 5815: { // glProgramUniform4uiv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ int *valueLen = (int *) bp; bp += 4;
+ GLuint * value = (GLuint *) bp; bp += *valueLen*16;
+ weglProgramUniform4uiv(*program,*location,*valueLen,value);
+}; break;
+case 5816: { // glProgramUniformMatrix2fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*16;
+ weglProgramUniformMatrix2fv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5817: { // glProgramUniformMatrix3fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*36;
+ weglProgramUniformMatrix3fv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5818: { // glProgramUniformMatrix4fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*64;
+ weglProgramUniformMatrix4fv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5819: { // glProgramUniformMatrix2dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 7;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*32;
+ weglProgramUniformMatrix2dv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5820: { // glProgramUniformMatrix3dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 7;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*72;
+ weglProgramUniformMatrix3dv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5821: { // glProgramUniformMatrix4dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 7;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*128;
+ weglProgramUniformMatrix4dv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5822: { // glProgramUniformMatrix2x3fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*24;
+ weglProgramUniformMatrix2x3fv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5823: { // glProgramUniformMatrix3x2fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*24;
+ weglProgramUniformMatrix3x2fv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5824: { // glProgramUniformMatrix2x4fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*32;
+ weglProgramUniformMatrix2x4fv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5825: { // glProgramUniformMatrix4x2fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*32;
+ weglProgramUniformMatrix4x2fv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5826: { // glProgramUniformMatrix3x4fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*48;
+ weglProgramUniformMatrix3x4fv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5827: { // glProgramUniformMatrix4x3fv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 3;
+ int *valueLen = (int *) bp; bp += 4;
+ GLfloat * value = (GLfloat *) bp; bp += *valueLen*48;
+ weglProgramUniformMatrix4x3fv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5828: { // glProgramUniformMatrix2x3dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 7;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*48;
+ weglProgramUniformMatrix2x3dv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5829: { // glProgramUniformMatrix3x2dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 7;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*48;
+ weglProgramUniformMatrix3x2dv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5830: { // glProgramUniformMatrix2x4dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 7;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*64;
+ weglProgramUniformMatrix2x4dv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5831: { // glProgramUniformMatrix4x2dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 7;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*64;
+ weglProgramUniformMatrix4x2dv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5832: { // glProgramUniformMatrix3x4dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 7;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*96;
+ weglProgramUniformMatrix3x4dv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5833: { // glProgramUniformMatrix4x3dv
+ GLuint *program = (GLuint *) bp; bp += 4;
+ GLint *location = (GLint *) bp; bp += 4;
+ GLboolean *transpose = (GLboolean *) bp; bp += 1;
+ bp += 7;
+ int *valueLen = (int *) bp; bp += 8;
+ GLdouble * value = (GLdouble *) bp; bp += *valueLen*96;
+ weglProgramUniformMatrix4x3dv(*program,*location,*valueLen,*transpose,value);
+}; break;
+case 5834: { // glValidateProgramPipeline
+ GLuint *pipeline = (GLuint *) bp; bp += 4;
+ weglValidateProgramPipeline(*pipeline);
+}; break;
+case 5835: { // glGetProgramPipelineInfoLog
+ GLuint *pipeline = (GLuint *) bp; bp += 4;
+ GLsizei *bufSize = (GLsizei *) bp; bp += 4;
+ GLsizei length[1] = {0};
+ GLchar *infoLog;
+ infoLog = (GLchar *) driver_alloc(sizeof(GLchar) * *bufSize);
+ weglGetProgramPipelineInfoLog(*pipeline,*bufSize,length,infoLog);
+ int AP = 0; ErlDrvTermData rt[7];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) infoLog; rt[AP++] = *length;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+ driver_free(infoLog);
+}; break;
+case 5836: { // glVertexAttribL1dv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ bp += 4;
+ GLdouble *v = (GLdouble *) bp; bp += 8;
+ weglVertexAttribL1dv(*index,v);
+}; break;
+case 5837: { // glVertexAttribL2dv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ bp += 4;
+ GLdouble *v = (GLdouble *) bp; bp += 8;
+ weglVertexAttribL2dv(*index,v);
+}; break;
+case 5838: { // glVertexAttribL3dv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ bp += 4;
+ GLdouble *v = (GLdouble *) bp; bp += 8;
+ weglVertexAttribL3dv(*index,v);
+}; break;
+case 5839: { // glVertexAttribL4dv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ bp += 4;
+ GLdouble *v = (GLdouble *) bp; bp += 8;
+ weglVertexAttribL4dv(*index,v);
+}; break;
+case 5840: { // glVertexAttribLPointer
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLint *size = (GLint *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLsizei *stride = (GLsizei *) bp; bp += 4;
+ GLvoid *pointer = (GLvoid *) * (int *) bp; bp += 4;
+ weglVertexAttribLPointer(*index,*size,*type,*stride,pointer);
+}; break;
+case 5841: { // glVertexAttribLPointer
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLint *size = (GLint *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLsizei *stride = (GLsizei *) bp; bp += 4;
+ GLvoid *pointer = (GLvoid *) bins[0];
+ weglVertexAttribLPointer(*index,*size,*type,*stride,pointer);
+}; break;
+case 5842: { // glGetVertexAttribLdv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLenum *pname = (GLenum *) bp; bp += 4;
+ GLdouble params[4] = {0.0,0.0,0.0,0.0};
+ weglGetVertexAttribLdv(*index,*pname,params);
+ int AP = 0; ErlDrvTermData rt[14];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLdouble *paramsTmp = params;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) paramsTmp++;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 4;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5843: { // glViewportArrayv
+ GLuint *first = (GLuint *) bp; bp += 4;
+ int *vLen = (int *) bp; bp += 4;
+ GLfloat * v = (GLfloat *) bp; bp += *vLen*16;
+ weglViewportArrayv(*first,*vLen,v);
+}; break;
+case 5844: { // glViewportIndexedf
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLfloat *x = (GLfloat *) bp; bp += 4;
+ GLfloat *y = (GLfloat *) bp; bp += 4;
+ GLfloat *w = (GLfloat *) bp; bp += 4;
+ GLfloat *h = (GLfloat *) bp; bp += 4;
+ weglViewportIndexedf(*index,*x,*y,*w,*h);
+}; break;
+case 5845: { // glViewportIndexedfv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLfloat * v = (GLfloat *) bp; bp += 16;
+ weglViewportIndexedfv(*index,v);
+}; break;
+case 5846: { // glScissorArrayv
+ GLuint *first = (GLuint *) bp; bp += 4;
+ int *vLen = (int *) bp; bp += 4;
+ GLint * v = (GLint *) bp; bp += *vLen*16;
+ weglScissorArrayv(*first,*vLen,v);
+}; break;
+case 5847: { // glScissorIndexed
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLint *left = (GLint *) bp; bp += 4;
+ GLint *bottom = (GLint *) bp; bp += 4;
+ GLsizei *width = (GLsizei *) bp; bp += 4;
+ GLsizei *height = (GLsizei *) bp; bp += 4;
+ weglScissorIndexed(*index,*left,*bottom,*width,*height);
+}; break;
+case 5848: { // glScissorIndexedv
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLint * v = (GLint *) bp; bp += 16;
+ weglScissorIndexedv(*index,v);
+}; break;
+case 5849: { // glDepthRangeArrayv
+ GLuint *first = (GLuint *) bp; bp += 4;
+ bp += 4;
+ int *vLen = (int *) bp; bp += 8;
+ GLclampd * v = (GLclampd *) bp; bp += *vLen*16;
+ weglDepthRangeArrayv(*first,*vLen,v);
+}; break;
+case 5850: { // glDepthRangeIndexed
+ GLuint *index = (GLuint *) bp; bp += 4;
+ bp += 4;
+ GLclampd *n = (GLclampd *) bp; bp += 8;
+ GLclampd *f = (GLclampd *) bp; bp += 8;
+ weglDepthRangeIndexed(*index,*n,*f);
+}; break;
+case 5851: { // glGetFloati_v
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLfloat data[16] = {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};
+ weglGetFloati_v(*target,*index,data);
+ int AP = 0; ErlDrvTermData rt[39];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLdouble dataConv[16], *dataTmp = dataConv; 
+ for(int i=0; i < 16; i++) dataConv[i] = (GLdouble) data[i];
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5852: { // glGetDoublei_v
+ GLenum *target = (GLenum *) bp; bp += 4;
+ GLuint *index = (GLuint *) bp; bp += 4;
+ GLdouble data[16] = {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};
+ weglGetDoublei_v(*target,*index,data);
+ int AP = 0; ErlDrvTermData rt[39];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ GLdouble *dataTmp = data;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_FLOAT; rt[AP++] = (ErlDrvTermData) dataTmp++;
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = 16+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5853: { // glDebugMessageControlARB
+ GLenum *source = (GLenum *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLenum *severity = (GLenum *) bp; bp += 4;
+ int * idsLen = (int *) bp; bp += 4;
+ GLuint * ids = (GLuint *) bp;  bp += (8-((*idsLen*4+0)%8))%8;
+ GLboolean *enabled = (GLboolean *) bp; bp += 1;
+ weglDebugMessageControlARB(*source,*type,*severity,*idsLen,ids,*enabled);
+}; break;
+case 5854: { // glDebugMessageInsertARB
+ GLenum *source = (GLenum *) bp; bp += 4;
+ GLenum *type = (GLenum *) bp; bp += 4;
+ GLuint *id = (GLuint *) bp; bp += 4;
+ GLenum *severity = (GLenum *) bp; bp += 4;
+ GLchar *buf = (GLchar *) bp;
+ int bufLen[1] = {strlen((char *)buf)}; bp += bufLen[0]+1+((8-((1+bufLen[0]+0)%8))%8);
+ weglDebugMessageInsertARB(*source,*type,*id,*severity,*bufLen,buf);
+}; break;
+case 5855: { // glGetDebugMessageLogARB
+ GLuint *count = (GLuint *) bp; bp += 4;
+ GLsizei *bufsize = (GLsizei *) bp; bp += 4;
+ GLenum *sources;
+ sources = (GLenum *) driver_alloc(sizeof(GLenum) * *count);
+ GLenum *types;
+ types = (GLenum *) driver_alloc(sizeof(GLenum) * *count);
+ GLuint *ids;
+ ids = (GLuint *) driver_alloc(sizeof(GLuint) * *count);
+ GLenum *severities;
+ severities = (GLenum *) driver_alloc(sizeof(GLenum) * *count);
+ GLsizei *lengths;
+ lengths = (GLsizei *) driver_alloc(sizeof(GLsizei) * *count);
+ GLchar *messageLog;
+ messageLog = (GLchar *) driver_alloc(sizeof(GLchar) * *bufsize);
+ GLuint result = weglGetDebugMessageLogARB(*count,*bufsize,sources,types,ids,severities,lengths,messageLog);
+ int AP = 0; ErlDrvTermData *rt;
+ rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData)*(23 + result*3 + result*2 + result*2 + result*2 + result*2));
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ for(int i=0; i < (int) result; i++) {
+    rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) sources[i];}
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = ((int) result)+1;
+ for(int i=0; i < (int) result; i++) {
+    rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) types[i];}
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = ((int) result)+1;
+ for(int i=0; i < (int) result; i++) {
+    rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) ids[i];}
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = ((int) result)+1;
+ for(int i=0; i < (int) result; i++) {
+    rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) severities[i];}
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = ((int) result)+1;
+ for(int i=0; i < (int) result; i++) {
+    rt[AP++] = ERL_DRV_STRING; rt[AP++] = (ErlDrvTermData) messageLog; rt[AP++] = lengths[i]-1;
+    messageLog += lengths[i]; }
+ rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = ((int) result)+1;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 6;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+ driver_free(rt);
+ driver_free(messageLog);
+ driver_free(lengths);
+ driver_free(severities);
+ driver_free(ids);
+ driver_free(types);
+ driver_free(sources);
+}; break;
+case 5856: { // glGetGraphicsResetStatusARB
+ GLenum result = weglGetGraphicsResetStatusARB();
+ int AP = 0; ErlDrvTermData rt[6];
+ rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
+ rt[AP++] = ERL_DRV_INT; rt[AP++] = (ErlDrvSInt) result;
+ rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+ driver_send_term(port,caller,rt,AP);
+}; break;
+case 5857: { // glResizeBuffersMESA
  weglResizeBuffersMESA();
 }; break;
-case 5677: { // glWindowPos4dvMESA
+case 5858: { // glWindowPos4dvMESA
  GLdouble *v = (GLdouble *) bp; bp += 8;
  weglWindowPos4dvMESA(v);
 }; break;
-case 5678: { // glWindowPos4fvMESA
+case 5859: { // glWindowPos4fvMESA
  GLfloat *v = (GLfloat *) bp; bp += 4;
  weglWindowPos4fvMESA(v);
 }; break;
-case 5679: { // glWindowPos4ivMESA
+case 5860: { // glWindowPos4ivMESA
  GLint *v = (GLint *) bp; bp += 4;
  weglWindowPos4ivMESA(v);
 }; break;
-case 5680: { // glWindowPos4svMESA
+case 5861: { // glWindowPos4svMESA
  GLshort *v = (GLshort *) bp; bp += 2;
  weglWindowPos4svMESA(v);
 }; break;
-case 5681: { // glDepthBoundsEXT
+case 5862: { // glDepthBoundsEXT
  GLclampd *zmin = (GLclampd *) bp; bp += 8;
  GLclampd *zmax = (GLclampd *) bp; bp += 8;
  weglDepthBoundsEXT(*zmin,*zmax);
 }; break;
-case 5682: { // glStencilClearTagEXT
+case 5863: { // glStencilClearTagEXT
  GLsizei *stencilTagBits = (GLsizei *) bp; bp += 4;
  GLuint *stencilClearTag = (GLuint *) bp; bp += 4;
  weglStencilClearTagEXT(*stencilTagBits,*stencilClearTag);
 }; break;
+}} catch (char *err_msg) {
+int AP = 0; ErlDrvTermData rt[12];
+rt[AP++] = ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_error_");
+rt[AP++] = ERL_DRV_INT; rt[AP++] = (int) op;
+rt[AP++] = ERL_DRV_ATOM; rt[AP++] = driver_mk_atom((char *) err_msg);
+// rt[AP++] = ERL_DRV_ATOM; rt[AP++] = driver_mk_atom((char *) gl_fns[op-GLE_GL_FUNC_START].name);
+// rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;
+rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 3;
+driver_send_term(port,caller,rt,AP);
 }} /* The End */
 
diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h
index 57b0faa2cb..ad46a98c90 100644
--- a/lib/wx/c_src/gen/wxe_derived_dest.h
+++ b/lib/wx/c_src/gen/wxe_derived_dest.h
@@ -736,7 +736,7 @@ void WxeApp::delete_object(void *ptr, wxeRefData *refd) {
   case 211: /* delete (wxFileDataObject *) ptr;These objects must be deleted by owner object */ break;
   case 212: /* delete (wxTextDataObject *) ptr;These objects must be deleted by owner object */ break;
   case 213: /* delete (wxBitmapDataObject *) ptr;These objects must be deleted by owner object */ break;
-  case 222: delete (wxLogNull *) ptr; break;
+  case 223: delete (wxLogNull *) ptr; break;
   default: delete (wxObject *) ptr;
 }}
 
diff --git a/lib/wx/c_src/gen/wxe_events.cpp b/lib/wx/c_src/gen/wxe_events.cpp
index a6857442c9..692eef858c 100644
--- a/lib/wx/c_src/gen/wxe_events.cpp
+++ b/lib/wx/c_src/gen/wxe_events.cpp
@@ -266,41 +266,41 @@ void initEventTable()
    {wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 217, "command_splitter_doubleclicked"},
    {wxEVT_COMMAND_SPLITTER_UNSPLIT, 217, "command_splitter_unsplit"},
    {wxEVT_COMMAND_HTML_LINK_CLICKED, 219, "command_html_link_clicked"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 220, "command_auinotebook_page_close"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 220, "command_auinotebook_page_changed"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 220, "command_auinotebook_page_changing"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 220, "command_auinotebook_button"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 220, "command_auinotebook_begin_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 220, "command_auinotebook_end_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 220, "command_auinotebook_drag_motion"},
-   {wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 220, "command_auinotebook_allow_dnd"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 221, "command_auinotebook_page_close"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 221, "command_auinotebook_page_changed"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 221, "command_auinotebook_page_changing"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 221, "command_auinotebook_button"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 221, "command_auinotebook_begin_drag"},
+   {wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 221, "command_auinotebook_end_drag"},
+   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 221, "command_auinotebook_drag_motion"},
+   {wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 221, "command_auinotebook_allow_dnd"},
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 220, "command_auinotebook_tab_middle_down"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 221, "command_auinotebook_tab_middle_down"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 220, "command_auinotebook_tab_middle_up"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 221, "command_auinotebook_tab_middle_up"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 220, "command_auinotebook_tab_right_down"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 221, "command_auinotebook_tab_right_down"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 220, "command_auinotebook_tab_right_up"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 221, "command_auinotebook_tab_right_up"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 220, "command_auinotebook_page_closed"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 221, "command_auinotebook_page_closed"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 220, "command_auinotebook_drag_done"},
+   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 221, "command_auinotebook_drag_done"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 220, "command_auinotebook_bg_dclick"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 221, "command_auinotebook_bg_dclick"},
 #endif
-   {wxEVT_AUI_PANE_BUTTON, 221, "aui_pane_button"},
-   {wxEVT_AUI_PANE_CLOSE, 221, "aui_pane_close"},
-   {wxEVT_AUI_PANE_MAXIMIZE, 221, "aui_pane_maximize"},
-   {wxEVT_AUI_PANE_RESTORE, 221, "aui_pane_restore"},
-   {wxEVT_AUI_RENDER, 221, "aui_render"},
-   {wxEVT_AUI_FIND_MANAGER, 221, "aui_find_manager"},
+   {wxEVT_AUI_PANE_BUTTON, 222, "aui_pane_button"},
+   {wxEVT_AUI_PANE_CLOSE, 222, "aui_pane_close"},
+   {wxEVT_AUI_PANE_MAXIMIZE, 222, "aui_pane_maximize"},
+   {wxEVT_AUI_PANE_RESTORE, 222, "aui_pane_restore"},
+   {wxEVT_AUI_RENDER, 222, "aui_render"},
+   {wxEVT_AUI_FIND_MANAGER, 222, "aui_find_manager"},
    {-1, 0, }
   };
   for(int i=0; event_types[i].ev_type != -1; i++) {
@@ -778,7 +778,7 @@ case 219: {// wxHtmlLinkEvent
     rt.addTupleCount(3);
   break;
 }
-case 220: {// wxAuiNotebookEvent
+case 221: {// wxAuiNotebookEvent
  wxAuiNotebookEvent * ev = (wxAuiNotebookEvent *) event;
  wxAuiNotebook * GetDragSource = ev->GetDragSource();
     evClass = (char*)"wxAuiNotebookEvent";
@@ -790,7 +790,7 @@ case 220: {// wxAuiNotebookEvent
     rt.addTupleCount(5);
   break;
 }
-case 221: {// wxAuiManagerEvent
+case 222: {// wxAuiManagerEvent
  wxAuiManagerEvent * ev = (wxAuiManagerEvent *) event;
  wxAuiManager * GetManager = ev->GetManager();
  wxAuiPaneInfo * GetPane = ev->GetPane();
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp
index fd496c2ccc..479d7679a4 100644
--- a/lib/wx/c_src/gen/wxe_funcs.cpp
+++ b/lib/wx/c_src/gen/wxe_funcs.cpp
@@ -23,6 +23,7 @@
 #include "../wxe_impl.h"
 #include "../wxe_events.h"
 #include "../wxe_return.h"
+#include "../wxe_gl.h"
 #include "wxe_macros.h"
 #include "wxe_derived_dest.h"
 
@@ -43,6 +44,15 @@ void WxeApp::wxe_dispatch(wxeCommand& Ecmd)
      rt.addAtom("ok");
      break;
  }
+ case WXE_BIN_INCR:
+   driver_binary_inc_refc(Ecmd.bin[0]->bin);
+   break;
+ case WXE_BIN_DECR:
+   driver_binary_dec_refc(Ecmd.bin[0]->bin);
+   break;
+ case WXE_INIT_OPENGL:
+  wxe_initOpenGL(rt, bp);
+   break;
 case 98:  { // wxeEvtListener::wxeEvtListener
   wxeEvtListener *Result = new wxeEvtListener(Ecmd.port);
   rt.addRef(getRef((void *)Result,memenv), "wxeEvtListener");
@@ -18501,6 +18511,15 @@ case wxTreeCtrl_DeleteChildren: { // wxTreeCtrl::DeleteChildren
  This->DeleteChildren(item);
  break;
 }
+case wxTreeCtrl_EditLabel: { // wxTreeCtrl::EditLabel
+ wxTreeCtrl *This = (wxTreeCtrl *) getPtr(bp,memenv); bp += 4;
+ bp += 4; /* Align */
+ wxTreeItemId item = wxTreeItemId((void *) *(wxUint64 *) bp); bp += 8;
+ if(!This) throw wxe_badarg(0);
+ wxTextCtrl * Result = (wxTextCtrl*)This->EditLabel(item);
+ rt.addRef(getRef((void *)Result,memenv), "wxTextCtrl");
+ break;
+}
 case wxTreeCtrl_EnsureVisible: { // wxTreeCtrl::EnsureVisible
  wxTreeCtrl *This = (wxTreeCtrl *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
@@ -30976,6 +30995,36 @@ case wxHtmlLinkEvent_GetLinkInfo: { // wxHtmlLinkEvent::GetLinkInfo
  rt.add(Result);
  break;
 }
+case wxSystemSettings_GetColour: { // wxSystemSettings::GetColour
+ wxSystemColour index = *(wxSystemColour *) bp; bp += 4;;
+ wxColour Result = wxSystemSettings::GetColour((wxSystemColour) index);
+ rt.add(Result);
+ break;
+}
+case wxSystemSettings_GetFont: { // wxSystemSettings::GetFont
+ wxSystemFont index = *(wxSystemFont *) bp; bp += 4;;
+ wxFont * Result = new wxFont(wxSystemSettings::GetFont((wxSystemFont) index)); newPtr((void *) Result,3, memenv);;
+ rt.addRef(getRef((void *)Result,memenv), "wxFont");
+ break;
+}
+case wxSystemSettings_GetMetric: { // wxSystemSettings::GetMetric
+ wxWindow * win=NULL;
+ wxSystemMetric index = *(wxSystemMetric *) bp; bp += 4;;
+ bp += 4; /* Align */
+ while( * (int*) bp) { switch (* (int*) bp) {
+  case 1: {bp += 4;
+win = (wxWindow *) getPtr(bp,memenv); bp += 4;
+  } break;
+ }};
+ int Result = wxSystemSettings::GetMetric((wxSystemMetric) index,win);
+ rt.addInt(Result);
+ break;
+}
+case wxSystemSettings_GetScreenType: { // wxSystemSettings::GetScreenType
+ int Result = wxSystemSettings::GetScreenType();
+ rt.addInt(Result);
+ break;
+}
 case wxAuiNotebookEvent_SetSelection: { // wxAuiNotebookEvent::SetSelection
  wxAuiNotebookEvent *This = (wxAuiNotebookEvent *) getPtr(bp,memenv); bp += 4;
  int * s = (int *) bp; bp += 4;
@@ -31110,7 +31159,7 @@ case wxAuiManagerEvent_CanVeto: { // wxAuiManagerEvent::CanVeto
 }
 case wxLogNull_new: { // wxLogNull::wxLogNull
  wxLogNull * Result = new wxLogNull();
- newPtr((void *) Result, 222, memenv);
+ newPtr((void *) Result, 223, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxLogNull");
  break;
 }
diff --git a/lib/wx/c_src/gen/wxe_macros.h b/lib/wx/c_src/gen/wxe_macros.h
index 415b7f0b29..4fb76f960b 100644
--- a/lib/wx/c_src/gen/wxe_macros.h
+++ b/lib/wx/c_src/gen/wxe_macros.h
@@ -1882,1444 +1882,1449 @@
 #define wxTreeCtrl_Delete 2007
 #define wxTreeCtrl_DeleteAllItems 2008
 #define wxTreeCtrl_DeleteChildren 2009
-#define wxTreeCtrl_EnsureVisible 2010
-#define wxTreeCtrl_Expand 2011
-#define wxTreeCtrl_GetBoundingRect 2012
-#define wxTreeCtrl_GetChildrenCount 2014
-#define wxTreeCtrl_GetCount 2015
-#define wxTreeCtrl_GetEditControl 2016
-#define wxTreeCtrl_GetFirstChild 2017
-#define wxTreeCtrl_GetNextChild 2018
-#define wxTreeCtrl_GetFirstVisibleItem 2019
-#define wxTreeCtrl_GetImageList 2020
-#define wxTreeCtrl_GetIndent 2021
-#define wxTreeCtrl_GetItemBackgroundColour 2022
-#define wxTreeCtrl_GetItemData 2023
-#define wxTreeCtrl_GetItemFont 2024
-#define wxTreeCtrl_GetItemImage_1 2025
-#define wxTreeCtrl_GetItemImage_2 2026
-#define wxTreeCtrl_GetItemText 2027
-#define wxTreeCtrl_GetItemTextColour 2028
-#define wxTreeCtrl_GetLastChild 2029
-#define wxTreeCtrl_GetNextSibling 2030
-#define wxTreeCtrl_GetNextVisible 2031
-#define wxTreeCtrl_GetItemParent 2032
-#define wxTreeCtrl_GetPrevSibling 2033
-#define wxTreeCtrl_GetPrevVisible 2034
-#define wxTreeCtrl_GetRootItem 2035
-#define wxTreeCtrl_GetSelection 2036
-#define wxTreeCtrl_GetSelections 2037
-#define wxTreeCtrl_GetStateImageList 2038
-#define wxTreeCtrl_HitTest 2039
-#define wxTreeCtrl_InsertItem 2041
-#define wxTreeCtrl_IsBold 2042
-#define wxTreeCtrl_IsExpanded 2043
-#define wxTreeCtrl_IsSelected 2044
-#define wxTreeCtrl_IsVisible 2045
-#define wxTreeCtrl_ItemHasChildren 2046
-#define wxTreeCtrl_PrependItem 2047
-#define wxTreeCtrl_ScrollTo 2048
-#define wxTreeCtrl_SelectItem_1 2049
-#define wxTreeCtrl_SelectItem_2 2050
-#define wxTreeCtrl_SetIndent 2051
-#define wxTreeCtrl_SetImageList 2052
-#define wxTreeCtrl_SetItemBackgroundColour 2053
-#define wxTreeCtrl_SetItemBold 2054
-#define wxTreeCtrl_SetItemData 2055
-#define wxTreeCtrl_SetItemDropHighlight 2056
-#define wxTreeCtrl_SetItemFont 2057
-#define wxTreeCtrl_SetItemHasChildren 2058
-#define wxTreeCtrl_SetItemImage_2 2059
-#define wxTreeCtrl_SetItemImage_3 2060
-#define wxTreeCtrl_SetItemText 2061
-#define wxTreeCtrl_SetItemTextColour 2062
-#define wxTreeCtrl_SetStateImageList 2063
-#define wxTreeCtrl_SetWindowStyle 2064
-#define wxTreeCtrl_SortChildren 2065
-#define wxTreeCtrl_Toggle 2066
-#define wxTreeCtrl_ToggleItemSelection 2067
-#define wxTreeCtrl_Unselect 2068
-#define wxTreeCtrl_UnselectAll 2069
-#define wxTreeCtrl_UnselectItem 2070
-#define wxScrollBar_new_0 2071
-#define wxScrollBar_new_3 2072
-#define wxScrollBar_destruct 2073
-#define wxScrollBar_Create 2074
-#define wxScrollBar_GetRange 2075
-#define wxScrollBar_GetPageSize 2076
-#define wxScrollBar_GetThumbPosition 2077
-#define wxScrollBar_GetThumbSize 2078
-#define wxScrollBar_SetThumbPosition 2079
-#define wxScrollBar_SetScrollbar 2080
-#define wxSpinButton_new_2 2082
-#define wxSpinButton_new_0 2083
-#define wxSpinButton_Create 2084
-#define wxSpinButton_GetMax 2085
-#define wxSpinButton_GetMin 2086
-#define wxSpinButton_GetValue 2087
-#define wxSpinButton_SetRange 2088
-#define wxSpinButton_SetValue 2089
-#define wxSpinButton_destroy 2090
-#define wxSpinCtrl_new_0 2091
-#define wxSpinCtrl_new_2 2092
-#define wxSpinCtrl_Create 2094
-#define wxSpinCtrl_SetValue_1_1 2097
-#define wxSpinCtrl_SetValue_1_0 2098
-#define wxSpinCtrl_GetValue 2100
-#define wxSpinCtrl_SetRange 2102
-#define wxSpinCtrl_SetSelection 2103
-#define wxSpinCtrl_GetMin 2105
-#define wxSpinCtrl_GetMax 2107
-#define wxSpinCtrl_destroy 2108
-#define wxStaticText_new_0 2109
-#define wxStaticText_new_4 2110
-#define wxStaticText_Create 2111
-#define wxStaticText_GetLabel 2112
-#define wxStaticText_SetLabel 2113
-#define wxStaticText_Wrap 2114
-#define wxStaticText_destroy 2115
-#define wxStaticBitmap_new_0 2116
-#define wxStaticBitmap_new_4 2117
-#define wxStaticBitmap_Create 2118
-#define wxStaticBitmap_GetBitmap 2119
-#define wxStaticBitmap_SetBitmap 2120
-#define wxStaticBitmap_destroy 2121
-#define wxRadioBox_new 2122
-#define wxRadioBox_destruct 2124
-#define wxRadioBox_Create 2125
-#define wxRadioBox_Enable_2 2126
-#define wxRadioBox_Enable_1 2127
-#define wxRadioBox_GetSelection 2128
-#define wxRadioBox_GetString 2129
-#define wxRadioBox_SetSelection 2130
-#define wxRadioBox_Show_2 2131
-#define wxRadioBox_Show_1 2132
-#define wxRadioBox_GetColumnCount 2133
-#define wxRadioBox_GetItemHelpText 2134
-#define wxRadioBox_GetItemToolTip 2135
-#define wxRadioBox_GetItemFromPoint 2137
-#define wxRadioBox_GetRowCount 2138
-#define wxRadioBox_IsItemEnabled 2139
-#define wxRadioBox_IsItemShown 2140
-#define wxRadioBox_SetItemHelpText 2141
-#define wxRadioBox_SetItemToolTip 2142
-#define wxRadioButton_new_0 2143
-#define wxRadioButton_new_4 2144
-#define wxRadioButton_Create 2145
-#define wxRadioButton_GetValue 2146
-#define wxRadioButton_SetValue 2147
-#define wxRadioButton_destroy 2148
-#define wxSlider_new_6 2150
-#define wxSlider_new_0 2151
-#define wxSlider_Create 2152
-#define wxSlider_GetLineSize 2153
-#define wxSlider_GetMax 2154
-#define wxSlider_GetMin 2155
-#define wxSlider_GetPageSize 2156
-#define wxSlider_GetThumbLength 2157
-#define wxSlider_GetValue 2158
-#define wxSlider_SetLineSize 2159
-#define wxSlider_SetPageSize 2160
-#define wxSlider_SetRange 2161
-#define wxSlider_SetThumbLength 2162
-#define wxSlider_SetValue 2163
-#define wxSlider_destroy 2164
-#define wxDialog_new_4 2166
-#define wxDialog_new_0 2167
-#define wxDialog_destruct 2169
-#define wxDialog_Create 2170
-#define wxDialog_CreateButtonSizer 2171
-#define wxDialog_CreateStdDialogButtonSizer 2172
-#define wxDialog_EndModal 2173
-#define wxDialog_GetAffirmativeId 2174
-#define wxDialog_GetReturnCode 2175
-#define wxDialog_IsModal 2176
-#define wxDialog_SetAffirmativeId 2177
-#define wxDialog_SetReturnCode 2178
-#define wxDialog_Show 2179
-#define wxDialog_ShowModal 2180
-#define wxColourDialog_new_0 2181
-#define wxColourDialog_new_2 2182
-#define wxColourDialog_destruct 2183
-#define wxColourDialog_Create 2184
-#define wxColourDialog_GetColourData 2185
-#define wxColourData_new_0 2186
-#define wxColourData_new_1 2187
-#define wxColourData_destruct 2188
-#define wxColourData_GetChooseFull 2189
-#define wxColourData_GetColour 2190
-#define wxColourData_GetCustomColour 2192
-#define wxColourData_SetChooseFull 2193
-#define wxColourData_SetColour 2194
-#define wxColourData_SetCustomColour 2195
-#define wxPalette_new_0 2196
-#define wxPalette_new_4 2197
-#define wxPalette_destruct 2199
-#define wxPalette_Create 2200
-#define wxPalette_GetColoursCount 2201
-#define wxPalette_GetPixel 2202
-#define wxPalette_GetRGB 2203
-#define wxPalette_IsOk 2204
-#define wxDirDialog_new 2208
-#define wxDirDialog_destruct 2209
-#define wxDirDialog_GetPath 2210
-#define wxDirDialog_GetMessage 2211
-#define wxDirDialog_SetMessage 2212
-#define wxDirDialog_SetPath 2213
-#define wxFileDialog_new 2217
-#define wxFileDialog_destruct 2218
-#define wxFileDialog_GetDirectory 2219
-#define wxFileDialog_GetFilename 2220
-#define wxFileDialog_GetFilenames 2221
-#define wxFileDialog_GetFilterIndex 2222
-#define wxFileDialog_GetMessage 2223
-#define wxFileDialog_GetPath 2224
-#define wxFileDialog_GetPaths 2225
-#define wxFileDialog_GetWildcard 2226
-#define wxFileDialog_SetDirectory 2227
-#define wxFileDialog_SetFilename 2228
-#define wxFileDialog_SetFilterIndex 2229
-#define wxFileDialog_SetMessage 2230
-#define wxFileDialog_SetPath 2231
-#define wxFileDialog_SetWildcard 2232
-#define wxPickerBase_SetInternalMargin 2233
-#define wxPickerBase_GetInternalMargin 2234
-#define wxPickerBase_SetTextCtrlProportion 2235
-#define wxPickerBase_SetPickerCtrlProportion 2236
-#define wxPickerBase_GetTextCtrlProportion 2237
-#define wxPickerBase_GetPickerCtrlProportion 2238
-#define wxPickerBase_HasTextCtrl 2239
-#define wxPickerBase_GetTextCtrl 2240
-#define wxPickerBase_IsTextCtrlGrowable 2241
-#define wxPickerBase_SetPickerCtrlGrowable 2242
-#define wxPickerBase_SetTextCtrlGrowable 2243
-#define wxPickerBase_IsPickerCtrlGrowable 2244
-#define wxFilePickerCtrl_new_0 2245
-#define wxFilePickerCtrl_new_3 2246
-#define wxFilePickerCtrl_Create 2247
-#define wxFilePickerCtrl_GetPath 2248
-#define wxFilePickerCtrl_SetPath 2249
-#define wxFilePickerCtrl_destroy 2250
-#define wxDirPickerCtrl_new_0 2251
-#define wxDirPickerCtrl_new_3 2252
-#define wxDirPickerCtrl_Create 2253
-#define wxDirPickerCtrl_GetPath 2254
-#define wxDirPickerCtrl_SetPath 2255
-#define wxDirPickerCtrl_destroy 2256
-#define wxColourPickerCtrl_new_0 2257
-#define wxColourPickerCtrl_new_3 2258
-#define wxColourPickerCtrl_Create 2259
-#define wxColourPickerCtrl_GetColour 2260
-#define wxColourPickerCtrl_SetColour_1_1 2261
-#define wxColourPickerCtrl_SetColour_1_0 2262
-#define wxColourPickerCtrl_destroy 2263
-#define wxDatePickerCtrl_new_0 2264
-#define wxDatePickerCtrl_new_3 2265
-#define wxDatePickerCtrl_GetRange 2266
-#define wxDatePickerCtrl_GetValue 2267
-#define wxDatePickerCtrl_SetRange 2268
-#define wxDatePickerCtrl_SetValue 2269
-#define wxDatePickerCtrl_destroy 2270
-#define wxFontPickerCtrl_new_0 2271
-#define wxFontPickerCtrl_new_3 2272
-#define wxFontPickerCtrl_Create 2273
-#define wxFontPickerCtrl_GetSelectedFont 2274
-#define wxFontPickerCtrl_SetSelectedFont 2275
-#define wxFontPickerCtrl_GetMaxPointSize 2276
-#define wxFontPickerCtrl_SetMaxPointSize 2277
-#define wxFontPickerCtrl_destroy 2278
-#define wxFindReplaceDialog_new_0 2281
-#define wxFindReplaceDialog_new_4 2282
-#define wxFindReplaceDialog_destruct 2283
-#define wxFindReplaceDialog_Create 2284
-#define wxFindReplaceDialog_GetData 2285
-#define wxFindReplaceData_new_0 2286
-#define wxFindReplaceData_new_1 2287
-#define wxFindReplaceData_GetFindString 2288
-#define wxFindReplaceData_GetReplaceString 2289
-#define wxFindReplaceData_GetFlags 2290
-#define wxFindReplaceData_SetFlags 2291
-#define wxFindReplaceData_SetFindString 2292
-#define wxFindReplaceData_SetReplaceString 2293
-#define wxFindReplaceData_destroy 2294
-#define wxMultiChoiceDialog_new_0 2295
-#define wxMultiChoiceDialog_new_5 2297
-#define wxMultiChoiceDialog_GetSelections 2298
-#define wxMultiChoiceDialog_SetSelections 2299
-#define wxMultiChoiceDialog_destroy 2300
-#define wxSingleChoiceDialog_new_0 2301
-#define wxSingleChoiceDialog_new_5 2303
-#define wxSingleChoiceDialog_GetSelection 2304
-#define wxSingleChoiceDialog_GetStringSelection 2305
-#define wxSingleChoiceDialog_SetSelection 2306
-#define wxSingleChoiceDialog_destroy 2307
-#define wxTextEntryDialog_new 2308
-#define wxTextEntryDialog_GetValue 2309
-#define wxTextEntryDialog_SetValue 2310
-#define wxTextEntryDialog_destroy 2311
-#define wxPasswordEntryDialog_new 2312
-#define wxPasswordEntryDialog_destroy 2313
-#define wxFontData_new_0 2314
-#define wxFontData_new_1 2315
-#define wxFontData_destruct 2316
-#define wxFontData_EnableEffects 2317
-#define wxFontData_GetAllowSymbols 2318
-#define wxFontData_GetColour 2319
-#define wxFontData_GetChosenFont 2320
-#define wxFontData_GetEnableEffects 2321
-#define wxFontData_GetInitialFont 2322
-#define wxFontData_GetShowHelp 2323
-#define wxFontData_SetAllowSymbols 2324
-#define wxFontData_SetChosenFont 2325
-#define wxFontData_SetColour 2326
-#define wxFontData_SetInitialFont 2327
-#define wxFontData_SetRange 2328
-#define wxFontData_SetShowHelp 2329
-#define wxFontDialog_new_0 2333
-#define wxFontDialog_new_2 2335
-#define wxFontDialog_Create 2337
-#define wxFontDialog_GetFontData 2338
-#define wxFontDialog_destroy 2340
-#define wxProgressDialog_new 2341
-#define wxProgressDialog_destruct 2342
-#define wxProgressDialog_Resume 2343
-#define wxProgressDialog_Update_2 2344
-#define wxProgressDialog_Update_0 2345
-#define wxMessageDialog_new 2346
-#define wxMessageDialog_destruct 2347
-#define wxPageSetupDialog_new 2348
-#define wxPageSetupDialog_destruct 2349
-#define wxPageSetupDialog_GetPageSetupData 2350
-#define wxPageSetupDialog_ShowModal 2351
-#define wxPageSetupDialogData_new_0 2352
-#define wxPageSetupDialogData_new_1_0 2353
-#define wxPageSetupDialogData_new_1_1 2354
-#define wxPageSetupDialogData_destruct 2355
-#define wxPageSetupDialogData_EnableHelp 2356
-#define wxPageSetupDialogData_EnableMargins 2357
-#define wxPageSetupDialogData_EnableOrientation 2358
-#define wxPageSetupDialogData_EnablePaper 2359
-#define wxPageSetupDialogData_EnablePrinter 2360
-#define wxPageSetupDialogData_GetDefaultMinMargins 2361
-#define wxPageSetupDialogData_GetEnableMargins 2362
-#define wxPageSetupDialogData_GetEnableOrientation 2363
-#define wxPageSetupDialogData_GetEnablePaper 2364
-#define wxPageSetupDialogData_GetEnablePrinter 2365
-#define wxPageSetupDialogData_GetEnableHelp 2366
-#define wxPageSetupDialogData_GetDefaultInfo 2367
-#define wxPageSetupDialogData_GetMarginTopLeft 2368
-#define wxPageSetupDialogData_GetMarginBottomRight 2369
-#define wxPageSetupDialogData_GetMinMarginTopLeft 2370
-#define wxPageSetupDialogData_GetMinMarginBottomRight 2371
-#define wxPageSetupDialogData_GetPaperId 2372
-#define wxPageSetupDialogData_GetPaperSize 2373
-#define wxPageSetupDialogData_GetPrintData 2375
-#define wxPageSetupDialogData_IsOk 2376
-#define wxPageSetupDialogData_SetDefaultInfo 2377
-#define wxPageSetupDialogData_SetDefaultMinMargins 2378
-#define wxPageSetupDialogData_SetMarginTopLeft 2379
-#define wxPageSetupDialogData_SetMarginBottomRight 2380
-#define wxPageSetupDialogData_SetMinMarginTopLeft 2381
-#define wxPageSetupDialogData_SetMinMarginBottomRight 2382
-#define wxPageSetupDialogData_SetPaperId 2383
-#define wxPageSetupDialogData_SetPaperSize_1_1 2384
-#define wxPageSetupDialogData_SetPaperSize_1_0 2385
-#define wxPageSetupDialogData_SetPrintData 2386
-#define wxPrintDialog_new_2_0 2387
-#define wxPrintDialog_new_2_1 2388
-#define wxPrintDialog_destruct 2389
-#define wxPrintDialog_GetPrintDialogData 2390
-#define wxPrintDialog_GetPrintDC 2391
-#define wxPrintDialogData_new_0 2392
-#define wxPrintDialogData_new_1_1 2393
-#define wxPrintDialogData_new_1_0 2394
-#define wxPrintDialogData_destruct 2395
-#define wxPrintDialogData_EnableHelp 2396
-#define wxPrintDialogData_EnablePageNumbers 2397
-#define wxPrintDialogData_EnablePrintToFile 2398
-#define wxPrintDialogData_EnableSelection 2399
-#define wxPrintDialogData_GetAllPages 2400
-#define wxPrintDialogData_GetCollate 2401
-#define wxPrintDialogData_GetFromPage 2402
-#define wxPrintDialogData_GetMaxPage 2403
-#define wxPrintDialogData_GetMinPage 2404
-#define wxPrintDialogData_GetNoCopies 2405
-#define wxPrintDialogData_GetPrintData 2406
-#define wxPrintDialogData_GetPrintToFile 2407
-#define wxPrintDialogData_GetSelection 2408
-#define wxPrintDialogData_GetToPage 2409
-#define wxPrintDialogData_IsOk 2410
-#define wxPrintDialogData_SetCollate 2411
-#define wxPrintDialogData_SetFromPage 2412
-#define wxPrintDialogData_SetMaxPage 2413
-#define wxPrintDialogData_SetMinPage 2414
-#define wxPrintDialogData_SetNoCopies 2415
-#define wxPrintDialogData_SetPrintData 2416
-#define wxPrintDialogData_SetPrintToFile 2417
-#define wxPrintDialogData_SetSelection 2418
-#define wxPrintDialogData_SetToPage 2419
-#define wxPrintData_new_0 2420
-#define wxPrintData_new_1 2421
-#define wxPrintData_destruct 2422
-#define wxPrintData_GetCollate 2423
-#define wxPrintData_GetBin 2424
-#define wxPrintData_GetColour 2425
-#define wxPrintData_GetDuplex 2426
-#define wxPrintData_GetNoCopies 2427
-#define wxPrintData_GetOrientation 2428
-#define wxPrintData_GetPaperId 2429
-#define wxPrintData_GetPrinterName 2430
-#define wxPrintData_GetQuality 2431
-#define wxPrintData_IsOk 2432
-#define wxPrintData_SetBin 2433
-#define wxPrintData_SetCollate 2434
-#define wxPrintData_SetColour 2435
-#define wxPrintData_SetDuplex 2436
-#define wxPrintData_SetNoCopies 2437
-#define wxPrintData_SetOrientation 2438
-#define wxPrintData_SetPaperId 2439
-#define wxPrintData_SetPrinterName 2440
-#define wxPrintData_SetQuality 2441
-#define wxPrintPreview_new_2 2444
-#define wxPrintPreview_new_3 2445
-#define wxPrintPreview_destruct 2447
-#define wxPrintPreview_GetCanvas 2448
-#define wxPrintPreview_GetCurrentPage 2449
-#define wxPrintPreview_GetFrame 2450
-#define wxPrintPreview_GetMaxPage 2451
-#define wxPrintPreview_GetMinPage 2452
-#define wxPrintPreview_GetPrintout 2453
-#define wxPrintPreview_GetPrintoutForPrinting 2454
-#define wxPrintPreview_IsOk 2455
-#define wxPrintPreview_PaintPage 2456
-#define wxPrintPreview_Print 2457
-#define wxPrintPreview_RenderPage 2458
-#define wxPrintPreview_SetCanvas 2459
-#define wxPrintPreview_SetCurrentPage 2460
-#define wxPrintPreview_SetFrame 2461
-#define wxPrintPreview_SetPrintout 2462
-#define wxPrintPreview_SetZoom 2463
-#define wxPreviewFrame_new 2464
-#define wxPreviewFrame_destruct 2465
-#define wxPreviewFrame_CreateControlBar 2466
-#define wxPreviewFrame_CreateCanvas 2467
-#define wxPreviewFrame_Initialize 2468
-#define wxPreviewFrame_OnCloseWindow 2469
-#define wxPreviewControlBar_new 2470
-#define wxPreviewControlBar_destruct 2471
-#define wxPreviewControlBar_CreateButtons 2472
-#define wxPreviewControlBar_GetPrintPreview 2473
-#define wxPreviewControlBar_GetZoomControl 2474
-#define wxPreviewControlBar_SetZoomControl 2475
-#define wxPrinter_new 2477
-#define wxPrinter_CreateAbortWindow 2478
-#define wxPrinter_GetAbort 2479
-#define wxPrinter_GetLastError 2480
-#define wxPrinter_GetPrintDialogData 2481
-#define wxPrinter_Print 2482
-#define wxPrinter_PrintDialog 2483
-#define wxPrinter_ReportError 2484
-#define wxPrinter_Setup 2485
-#define wxPrinter_destroy 2486
-#define wxXmlResource_new_1 2487
-#define wxXmlResource_new_2 2488
-#define wxXmlResource_destruct 2489
-#define wxXmlResource_AttachUnknownControl 2490
-#define wxXmlResource_ClearHandlers 2491
-#define wxXmlResource_CompareVersion 2492
-#define wxXmlResource_Get 2493
-#define wxXmlResource_GetFlags 2494
-#define wxXmlResource_GetVersion 2495
-#define wxXmlResource_GetXRCID 2496
-#define wxXmlResource_InitAllHandlers 2497
-#define wxXmlResource_Load 2498
-#define wxXmlResource_LoadBitmap 2499
-#define wxXmlResource_LoadDialog_2 2500
-#define wxXmlResource_LoadDialog_3 2501
-#define wxXmlResource_LoadFrame_2 2502
-#define wxXmlResource_LoadFrame_3 2503
-#define wxXmlResource_LoadIcon 2504
-#define wxXmlResource_LoadMenu 2505
-#define wxXmlResource_LoadMenuBar_2 2506
-#define wxXmlResource_LoadMenuBar_1 2507
-#define wxXmlResource_LoadPanel_2 2508
-#define wxXmlResource_LoadPanel_3 2509
-#define wxXmlResource_LoadToolBar 2510
-#define wxXmlResource_Set 2511
-#define wxXmlResource_SetFlags 2512
-#define wxXmlResource_Unload 2513
-#define wxXmlResource_xrcctrl 2514
-#define wxHtmlEasyPrinting_new 2515
-#define wxHtmlEasyPrinting_destruct 2516
-#define wxHtmlEasyPrinting_GetPrintData 2517
-#define wxHtmlEasyPrinting_GetPageSetupData 2518
-#define wxHtmlEasyPrinting_PreviewFile 2519
-#define wxHtmlEasyPrinting_PreviewText 2520
-#define wxHtmlEasyPrinting_PrintFile 2521
-#define wxHtmlEasyPrinting_PrintText 2522
-#define wxHtmlEasyPrinting_PageSetup 2523
-#define wxHtmlEasyPrinting_SetFonts 2524
-#define wxHtmlEasyPrinting_SetHeader 2525
-#define wxHtmlEasyPrinting_SetFooter 2526
-#define wxGLCanvas_new_2 2528
-#define wxGLCanvas_new_3_1 2529
-#define wxGLCanvas_new_3_0 2530
-#define wxGLCanvas_GetContext 2531
-#define wxGLCanvas_SetCurrent 2533
-#define wxGLCanvas_SwapBuffers 2534
-#define wxGLCanvas_destroy 2535
-#define wxAuiManager_new 2536
-#define wxAuiManager_destruct 2537
-#define wxAuiManager_AddPane_2_1 2538
-#define wxAuiManager_AddPane_3 2539
-#define wxAuiManager_AddPane_2_0 2540
-#define wxAuiManager_DetachPane 2541
-#define wxAuiManager_GetAllPanes 2542
-#define wxAuiManager_GetArtProvider 2543
-#define wxAuiManager_GetDockSizeConstraint 2544
-#define wxAuiManager_GetFlags 2545
-#define wxAuiManager_GetManagedWindow 2546
-#define wxAuiManager_GetManager 2547
-#define wxAuiManager_GetPane_1_1 2548
-#define wxAuiManager_GetPane_1_0 2549
-#define wxAuiManager_HideHint 2550
-#define wxAuiManager_InsertPane 2551
-#define wxAuiManager_LoadPaneInfo 2552
-#define wxAuiManager_LoadPerspective 2553
-#define wxAuiManager_SavePaneInfo 2554
-#define wxAuiManager_SavePerspective 2555
-#define wxAuiManager_SetArtProvider 2556
-#define wxAuiManager_SetDockSizeConstraint 2557
-#define wxAuiManager_SetFlags 2558
-#define wxAuiManager_SetManagedWindow 2559
-#define wxAuiManager_ShowHint 2560
-#define wxAuiManager_UnInit 2561
-#define wxAuiManager_Update 2562
-#define wxAuiPaneInfo_new_0 2563
-#define wxAuiPaneInfo_new_1 2564
-#define wxAuiPaneInfo_destruct 2565
-#define wxAuiPaneInfo_BestSize_1 2566
-#define wxAuiPaneInfo_BestSize_2 2567
-#define wxAuiPaneInfo_Bottom 2568
-#define wxAuiPaneInfo_BottomDockable 2569
-#define wxAuiPaneInfo_Caption 2570
-#define wxAuiPaneInfo_CaptionVisible 2571
-#define wxAuiPaneInfo_Centre 2572
-#define wxAuiPaneInfo_CentrePane 2573
-#define wxAuiPaneInfo_CloseButton 2574
-#define wxAuiPaneInfo_DefaultPane 2575
-#define wxAuiPaneInfo_DestroyOnClose 2576
-#define wxAuiPaneInfo_Direction 2577
-#define wxAuiPaneInfo_Dock 2578
-#define wxAuiPaneInfo_Dockable 2579
-#define wxAuiPaneInfo_Fixed 2580
-#define wxAuiPaneInfo_Float 2581
-#define wxAuiPaneInfo_Floatable 2582
-#define wxAuiPaneInfo_FloatingPosition_1 2583
-#define wxAuiPaneInfo_FloatingPosition_2 2584
-#define wxAuiPaneInfo_FloatingSize_1 2585
-#define wxAuiPaneInfo_FloatingSize_2 2586
-#define wxAuiPaneInfo_Gripper 2587
-#define wxAuiPaneInfo_GripperTop 2588
-#define wxAuiPaneInfo_HasBorder 2589
-#define wxAuiPaneInfo_HasCaption 2590
-#define wxAuiPaneInfo_HasCloseButton 2591
-#define wxAuiPaneInfo_HasFlag 2592
-#define wxAuiPaneInfo_HasGripper 2593
-#define wxAuiPaneInfo_HasGripperTop 2594
-#define wxAuiPaneInfo_HasMaximizeButton 2595
-#define wxAuiPaneInfo_HasMinimizeButton 2596
-#define wxAuiPaneInfo_HasPinButton 2597
-#define wxAuiPaneInfo_Hide 2598
-#define wxAuiPaneInfo_IsBottomDockable 2599
-#define wxAuiPaneInfo_IsDocked 2600
-#define wxAuiPaneInfo_IsFixed 2601
-#define wxAuiPaneInfo_IsFloatable 2602
-#define wxAuiPaneInfo_IsFloating 2603
-#define wxAuiPaneInfo_IsLeftDockable 2604
-#define wxAuiPaneInfo_IsMovable 2605
-#define wxAuiPaneInfo_IsOk 2606
-#define wxAuiPaneInfo_IsResizable 2607
-#define wxAuiPaneInfo_IsRightDockable 2608
-#define wxAuiPaneInfo_IsShown 2609
-#define wxAuiPaneInfo_IsToolbar 2610
-#define wxAuiPaneInfo_IsTopDockable 2611
-#define wxAuiPaneInfo_Layer 2612
-#define wxAuiPaneInfo_Left 2613
-#define wxAuiPaneInfo_LeftDockable 2614
-#define wxAuiPaneInfo_MaxSize_1 2615
-#define wxAuiPaneInfo_MaxSize_2 2616
-#define wxAuiPaneInfo_MaximizeButton 2617
-#define wxAuiPaneInfo_MinSize_1 2618
-#define wxAuiPaneInfo_MinSize_2 2619
-#define wxAuiPaneInfo_MinimizeButton 2620
-#define wxAuiPaneInfo_Movable 2621
-#define wxAuiPaneInfo_Name 2622
-#define wxAuiPaneInfo_PaneBorder 2623
-#define wxAuiPaneInfo_PinButton 2624
-#define wxAuiPaneInfo_Position 2625
-#define wxAuiPaneInfo_Resizable 2626
-#define wxAuiPaneInfo_Right 2627
-#define wxAuiPaneInfo_RightDockable 2628
-#define wxAuiPaneInfo_Row 2629
-#define wxAuiPaneInfo_SafeSet 2630
-#define wxAuiPaneInfo_SetFlag 2631
-#define wxAuiPaneInfo_Show 2632
-#define wxAuiPaneInfo_ToolbarPane 2633
-#define wxAuiPaneInfo_Top 2634
-#define wxAuiPaneInfo_TopDockable 2635
-#define wxAuiPaneInfo_Window 2636
-#define wxAuiNotebook_new_0 2637
-#define wxAuiNotebook_new_2 2638
-#define wxAuiNotebook_AddPage 2639
-#define wxAuiNotebook_Create 2640
-#define wxAuiNotebook_DeletePage 2641
-#define wxAuiNotebook_GetArtProvider 2642
-#define wxAuiNotebook_GetPage 2643
-#define wxAuiNotebook_GetPageBitmap 2644
-#define wxAuiNotebook_GetPageCount 2645
-#define wxAuiNotebook_GetPageIndex 2646
-#define wxAuiNotebook_GetPageText 2647
-#define wxAuiNotebook_GetSelection 2648
-#define wxAuiNotebook_InsertPage 2649
-#define wxAuiNotebook_RemovePage 2650
-#define wxAuiNotebook_SetArtProvider 2651
-#define wxAuiNotebook_SetFont 2652
-#define wxAuiNotebook_SetPageBitmap 2653
-#define wxAuiNotebook_SetPageText 2654
-#define wxAuiNotebook_SetSelection 2655
-#define wxAuiNotebook_SetTabCtrlHeight 2656
-#define wxAuiNotebook_SetUniformBitmapSize 2657
-#define wxAuiNotebook_destroy 2658
-#define wxMDIParentFrame_new_0 2659
-#define wxMDIParentFrame_new_4 2660
-#define wxMDIParentFrame_destruct 2661
-#define wxMDIParentFrame_ActivateNext 2662
-#define wxMDIParentFrame_ActivatePrevious 2663
-#define wxMDIParentFrame_ArrangeIcons 2664
-#define wxMDIParentFrame_Cascade 2665
-#define wxMDIParentFrame_Create 2666
-#define wxMDIParentFrame_GetActiveChild 2667
-#define wxMDIParentFrame_GetClientWindow 2668
-#define wxMDIParentFrame_Tile 2669
-#define wxMDIChildFrame_new_0 2670
-#define wxMDIChildFrame_new_4 2671
-#define wxMDIChildFrame_destruct 2672
-#define wxMDIChildFrame_Activate 2673
-#define wxMDIChildFrame_Create 2674
-#define wxMDIChildFrame_Maximize 2675
-#define wxMDIChildFrame_Restore 2676
-#define wxMDIClientWindow_new_0 2677
-#define wxMDIClientWindow_new_2 2678
-#define wxMDIClientWindow_destruct 2679
-#define wxMDIClientWindow_CreateClient 2680
-#define wxLayoutAlgorithm_new 2681
-#define wxLayoutAlgorithm_LayoutFrame 2682
-#define wxLayoutAlgorithm_LayoutMDIFrame 2683
-#define wxLayoutAlgorithm_LayoutWindow 2684
-#define wxLayoutAlgorithm_destroy 2685
-#define wxEvent_GetId 2686
-#define wxEvent_GetSkipped 2687
-#define wxEvent_GetTimestamp 2688
-#define wxEvent_IsCommandEvent 2689
-#define wxEvent_ResumePropagation 2690
-#define wxEvent_ShouldPropagate 2691
-#define wxEvent_Skip 2692
-#define wxEvent_StopPropagation 2693
-#define wxCommandEvent_getClientData 2694
-#define wxCommandEvent_GetExtraLong 2695
-#define wxCommandEvent_GetInt 2696
-#define wxCommandEvent_GetSelection 2697
-#define wxCommandEvent_GetString 2698
-#define wxCommandEvent_IsChecked 2699
-#define wxCommandEvent_IsSelection 2700
-#define wxCommandEvent_SetInt 2701
-#define wxCommandEvent_SetString 2702
-#define wxScrollEvent_GetOrientation 2703
-#define wxScrollEvent_GetPosition 2704
-#define wxScrollWinEvent_GetOrientation 2705
-#define wxScrollWinEvent_GetPosition 2706
-#define wxMouseEvent_AltDown 2707
-#define wxMouseEvent_Button 2708
-#define wxMouseEvent_ButtonDClick 2709
-#define wxMouseEvent_ButtonDown 2710
-#define wxMouseEvent_ButtonUp 2711
-#define wxMouseEvent_CmdDown 2712
-#define wxMouseEvent_ControlDown 2713
-#define wxMouseEvent_Dragging 2714
-#define wxMouseEvent_Entering 2715
-#define wxMouseEvent_GetButton 2716
-#define wxMouseEvent_GetPosition 2719
-#define wxMouseEvent_GetLogicalPosition 2720
-#define wxMouseEvent_GetLinesPerAction 2721
-#define wxMouseEvent_GetWheelRotation 2722
-#define wxMouseEvent_GetWheelDelta 2723
-#define wxMouseEvent_GetX 2724
-#define wxMouseEvent_GetY 2725
-#define wxMouseEvent_IsButton 2726
-#define wxMouseEvent_IsPageScroll 2727
-#define wxMouseEvent_Leaving 2728
-#define wxMouseEvent_LeftDClick 2729
-#define wxMouseEvent_LeftDown 2730
-#define wxMouseEvent_LeftIsDown 2731
-#define wxMouseEvent_LeftUp 2732
-#define wxMouseEvent_MetaDown 2733
-#define wxMouseEvent_MiddleDClick 2734
-#define wxMouseEvent_MiddleDown 2735
-#define wxMouseEvent_MiddleIsDown 2736
-#define wxMouseEvent_MiddleUp 2737
-#define wxMouseEvent_Moving 2738
-#define wxMouseEvent_RightDClick 2739
-#define wxMouseEvent_RightDown 2740
-#define wxMouseEvent_RightIsDown 2741
-#define wxMouseEvent_RightUp 2742
-#define wxMouseEvent_ShiftDown 2743
-#define wxSetCursorEvent_GetCursor 2744
-#define wxSetCursorEvent_GetX 2745
-#define wxSetCursorEvent_GetY 2746
-#define wxSetCursorEvent_HasCursor 2747
-#define wxSetCursorEvent_SetCursor 2748
-#define wxKeyEvent_AltDown 2749
-#define wxKeyEvent_CmdDown 2750
-#define wxKeyEvent_ControlDown 2751
-#define wxKeyEvent_GetKeyCode 2752
-#define wxKeyEvent_GetModifiers 2753
-#define wxKeyEvent_GetPosition 2756
-#define wxKeyEvent_GetRawKeyCode 2757
-#define wxKeyEvent_GetRawKeyFlags 2758
-#define wxKeyEvent_GetUnicodeKey 2759
-#define wxKeyEvent_GetX 2760
-#define wxKeyEvent_GetY 2761
-#define wxKeyEvent_HasModifiers 2762
-#define wxKeyEvent_MetaDown 2763
-#define wxKeyEvent_ShiftDown 2764
-#define wxSizeEvent_GetSize 2765
-#define wxMoveEvent_GetPosition 2766
-#define wxEraseEvent_GetDC 2767
-#define wxFocusEvent_GetWindow 2768
-#define wxChildFocusEvent_GetWindow 2769
-#define wxMenuEvent_GetMenu 2770
-#define wxMenuEvent_GetMenuId 2771
-#define wxMenuEvent_IsPopup 2772
-#define wxCloseEvent_CanVeto 2773
-#define wxCloseEvent_GetLoggingOff 2774
-#define wxCloseEvent_SetCanVeto 2775
-#define wxCloseEvent_SetLoggingOff 2776
-#define wxCloseEvent_Veto 2777
-#define wxShowEvent_SetShow 2778
-#define wxShowEvent_GetShow 2779
-#define wxIconizeEvent_Iconized 2780
-#define wxJoystickEvent_ButtonDown 2781
-#define wxJoystickEvent_ButtonIsDown 2782
-#define wxJoystickEvent_ButtonUp 2783
-#define wxJoystickEvent_GetButtonChange 2784
-#define wxJoystickEvent_GetButtonState 2785
-#define wxJoystickEvent_GetJoystick 2786
-#define wxJoystickEvent_GetPosition 2787
-#define wxJoystickEvent_GetZPosition 2788
-#define wxJoystickEvent_IsButton 2789
-#define wxJoystickEvent_IsMove 2790
-#define wxJoystickEvent_IsZMove 2791
-#define wxUpdateUIEvent_CanUpdate 2792
-#define wxUpdateUIEvent_Check 2793
-#define wxUpdateUIEvent_Enable 2794
-#define wxUpdateUIEvent_Show 2795
-#define wxUpdateUIEvent_GetChecked 2796
-#define wxUpdateUIEvent_GetEnabled 2797
-#define wxUpdateUIEvent_GetShown 2798
-#define wxUpdateUIEvent_GetSetChecked 2799
-#define wxUpdateUIEvent_GetSetEnabled 2800
-#define wxUpdateUIEvent_GetSetShown 2801
-#define wxUpdateUIEvent_GetSetText 2802
-#define wxUpdateUIEvent_GetText 2803
-#define wxUpdateUIEvent_GetMode 2804
-#define wxUpdateUIEvent_GetUpdateInterval 2805
-#define wxUpdateUIEvent_ResetUpdateTime 2806
-#define wxUpdateUIEvent_SetMode 2807
-#define wxUpdateUIEvent_SetText 2808
-#define wxUpdateUIEvent_SetUpdateInterval 2809
-#define wxMouseCaptureChangedEvent_GetCapturedWindow 2810
-#define wxPaletteChangedEvent_SetChangedWindow 2811
-#define wxPaletteChangedEvent_GetChangedWindow 2812
-#define wxQueryNewPaletteEvent_SetPaletteRealized 2813
-#define wxQueryNewPaletteEvent_GetPaletteRealized 2814
-#define wxNavigationKeyEvent_GetDirection 2815
-#define wxNavigationKeyEvent_SetDirection 2816
-#define wxNavigationKeyEvent_IsWindowChange 2817
-#define wxNavigationKeyEvent_SetWindowChange 2818
-#define wxNavigationKeyEvent_IsFromTab 2819
-#define wxNavigationKeyEvent_SetFromTab 2820
-#define wxNavigationKeyEvent_GetCurrentFocus 2821
-#define wxNavigationKeyEvent_SetCurrentFocus 2822
-#define wxHelpEvent_GetOrigin 2823
-#define wxHelpEvent_GetPosition 2824
-#define wxHelpEvent_SetOrigin 2825
-#define wxHelpEvent_SetPosition 2826
-#define wxContextMenuEvent_GetPosition 2827
-#define wxContextMenuEvent_SetPosition 2828
-#define wxIdleEvent_CanSend 2829
-#define wxIdleEvent_GetMode 2830
-#define wxIdleEvent_RequestMore 2831
-#define wxIdleEvent_MoreRequested 2832
-#define wxIdleEvent_SetMode 2833
-#define wxGridEvent_AltDown 2834
-#define wxGridEvent_ControlDown 2835
-#define wxGridEvent_GetCol 2836
-#define wxGridEvent_GetPosition 2837
-#define wxGridEvent_GetRow 2838
-#define wxGridEvent_MetaDown 2839
-#define wxGridEvent_Selecting 2840
-#define wxGridEvent_ShiftDown 2841
-#define wxNotifyEvent_Allow 2842
-#define wxNotifyEvent_IsAllowed 2843
-#define wxNotifyEvent_Veto 2844
-#define wxSashEvent_GetEdge 2845
-#define wxSashEvent_GetDragRect 2846
-#define wxSashEvent_GetDragStatus 2847
-#define wxListEvent_GetCacheFrom 2848
-#define wxListEvent_GetCacheTo 2849
-#define wxListEvent_GetKeyCode 2850
-#define wxListEvent_GetIndex 2851
-#define wxListEvent_GetColumn 2852
-#define wxListEvent_GetPoint 2853
-#define wxListEvent_GetLabel 2854
-#define wxListEvent_GetText 2855
-#define wxListEvent_GetImage 2856
-#define wxListEvent_GetData 2857
-#define wxListEvent_GetMask 2858
-#define wxListEvent_GetItem 2859
-#define wxListEvent_IsEditCancelled 2860
-#define wxDateEvent_GetDate 2861
-#define wxCalendarEvent_GetWeekDay 2862
-#define wxFileDirPickerEvent_GetPath 2863
-#define wxColourPickerEvent_GetColour 2864
-#define wxFontPickerEvent_GetFont 2865
-#define wxStyledTextEvent_GetPosition 2866
-#define wxStyledTextEvent_GetKey 2867
-#define wxStyledTextEvent_GetModifiers 2868
-#define wxStyledTextEvent_GetModificationType 2869
-#define wxStyledTextEvent_GetText 2870
-#define wxStyledTextEvent_GetLength 2871
-#define wxStyledTextEvent_GetLinesAdded 2872
-#define wxStyledTextEvent_GetLine 2873
-#define wxStyledTextEvent_GetFoldLevelNow 2874
-#define wxStyledTextEvent_GetFoldLevelPrev 2875
-#define wxStyledTextEvent_GetMargin 2876
-#define wxStyledTextEvent_GetMessage 2877
-#define wxStyledTextEvent_GetWParam 2878
-#define wxStyledTextEvent_GetLParam 2879
-#define wxStyledTextEvent_GetListType 2880
-#define wxStyledTextEvent_GetX 2881
-#define wxStyledTextEvent_GetY 2882
-#define wxStyledTextEvent_GetDragText 2883
-#define wxStyledTextEvent_GetDragAllowMove 2884
-#define wxStyledTextEvent_GetDragResult 2885
-#define wxStyledTextEvent_GetShift 2886
-#define wxStyledTextEvent_GetControl 2887
-#define wxStyledTextEvent_GetAlt 2888
-#define utils_wxGetKeyState 2889
-#define utils_wxGetMousePosition 2890
-#define utils_wxGetMouseState 2891
-#define utils_wxSetDetectableAutoRepeat 2892
-#define utils_wxBell 2893
-#define utils_wxFindMenuItemId 2894
-#define utils_wxGenericFindWindowAtPoint 2895
-#define utils_wxFindWindowAtPoint 2896
-#define utils_wxBeginBusyCursor 2897
-#define utils_wxEndBusyCursor 2898
-#define utils_wxIsBusy 2899
-#define utils_wxShutdown 2900
-#define utils_wxShell 2901
-#define utils_wxLaunchDefaultBrowser 2902
-#define utils_wxGetEmailAddress 2903
-#define utils_wxGetUserId 2904
-#define utils_wxGetHomeDir 2905
-#define utils_wxNewId 2906
-#define utils_wxRegisterId 2907
-#define utils_wxGetCurrentId 2908
-#define utils_wxGetOsDescription 2909
-#define utils_wxIsPlatformLittleEndian 2910
-#define utils_wxIsPlatform64Bit 2911
-#define wxPrintout_new 2912
-#define wxPrintout_destruct 2913
-#define wxPrintout_GetDC 2914
-#define wxPrintout_GetPageSizeMM 2915
-#define wxPrintout_GetPageSizePixels 2916
-#define wxPrintout_GetPaperRectPixels 2917
-#define wxPrintout_GetPPIPrinter 2918
-#define wxPrintout_GetPPIScreen 2919
-#define wxPrintout_GetTitle 2920
-#define wxPrintout_IsPreview 2921
-#define wxPrintout_FitThisSizeToPaper 2922
-#define wxPrintout_FitThisSizeToPage 2923
-#define wxPrintout_FitThisSizeToPageMargins 2924
-#define wxPrintout_MapScreenSizeToPaper 2925
-#define wxPrintout_MapScreenSizeToPage 2926
-#define wxPrintout_MapScreenSizeToPageMargins 2927
-#define wxPrintout_MapScreenSizeToDevice 2928
-#define wxPrintout_GetLogicalPaperRect 2929
-#define wxPrintout_GetLogicalPageRect 2930
-#define wxPrintout_GetLogicalPageMarginsRect 2931
-#define wxPrintout_SetLogicalOrigin 2932
-#define wxPrintout_OffsetLogicalOrigin 2933
-#define wxStyledTextCtrl_new_2 2934
-#define wxStyledTextCtrl_new_0 2935
-#define wxStyledTextCtrl_destruct 2936
-#define wxStyledTextCtrl_Create 2937
-#define wxStyledTextCtrl_AddText 2938
-#define wxStyledTextCtrl_AddStyledText 2939
-#define wxStyledTextCtrl_InsertText 2940
-#define wxStyledTextCtrl_ClearAll 2941
-#define wxStyledTextCtrl_ClearDocumentStyle 2942
-#define wxStyledTextCtrl_GetLength 2943
-#define wxStyledTextCtrl_GetCharAt 2944
-#define wxStyledTextCtrl_GetCurrentPos 2945
-#define wxStyledTextCtrl_GetAnchor 2946
-#define wxStyledTextCtrl_GetStyleAt 2947
-#define wxStyledTextCtrl_Redo 2948
-#define wxStyledTextCtrl_SetUndoCollection 2949
-#define wxStyledTextCtrl_SelectAll 2950
-#define wxStyledTextCtrl_SetSavePoint 2951
-#define wxStyledTextCtrl_GetStyledText 2952
-#define wxStyledTextCtrl_CanRedo 2953
-#define wxStyledTextCtrl_MarkerLineFromHandle 2954
-#define wxStyledTextCtrl_MarkerDeleteHandle 2955
-#define wxStyledTextCtrl_GetUndoCollection 2956
-#define wxStyledTextCtrl_GetViewWhiteSpace 2957
-#define wxStyledTextCtrl_SetViewWhiteSpace 2958
-#define wxStyledTextCtrl_PositionFromPoint 2959
-#define wxStyledTextCtrl_PositionFromPointClose 2960
-#define wxStyledTextCtrl_GotoLine 2961
-#define wxStyledTextCtrl_GotoPos 2962
-#define wxStyledTextCtrl_SetAnchor 2963
-#define wxStyledTextCtrl_GetCurLine 2964
-#define wxStyledTextCtrl_GetEndStyled 2965
-#define wxStyledTextCtrl_ConvertEOLs 2966
-#define wxStyledTextCtrl_GetEOLMode 2967
-#define wxStyledTextCtrl_SetEOLMode 2968
-#define wxStyledTextCtrl_StartStyling 2969
-#define wxStyledTextCtrl_SetStyling 2970
-#define wxStyledTextCtrl_GetBufferedDraw 2971
-#define wxStyledTextCtrl_SetBufferedDraw 2972
-#define wxStyledTextCtrl_SetTabWidth 2973
-#define wxStyledTextCtrl_GetTabWidth 2974
-#define wxStyledTextCtrl_SetCodePage 2975
-#define wxStyledTextCtrl_MarkerDefine 2976
-#define wxStyledTextCtrl_MarkerSetForeground 2977
-#define wxStyledTextCtrl_MarkerSetBackground 2978
-#define wxStyledTextCtrl_MarkerAdd 2979
-#define wxStyledTextCtrl_MarkerDelete 2980
-#define wxStyledTextCtrl_MarkerDeleteAll 2981
-#define wxStyledTextCtrl_MarkerGet 2982
-#define wxStyledTextCtrl_MarkerNext 2983
-#define wxStyledTextCtrl_MarkerPrevious 2984
-#define wxStyledTextCtrl_MarkerDefineBitmap 2985
-#define wxStyledTextCtrl_MarkerAddSet 2986
-#define wxStyledTextCtrl_MarkerSetAlpha 2987
-#define wxStyledTextCtrl_SetMarginType 2988
-#define wxStyledTextCtrl_GetMarginType 2989
-#define wxStyledTextCtrl_SetMarginWidth 2990
-#define wxStyledTextCtrl_GetMarginWidth 2991
-#define wxStyledTextCtrl_SetMarginMask 2992
-#define wxStyledTextCtrl_GetMarginMask 2993
-#define wxStyledTextCtrl_SetMarginSensitive 2994
-#define wxStyledTextCtrl_GetMarginSensitive 2995
-#define wxStyledTextCtrl_StyleClearAll 2996
-#define wxStyledTextCtrl_StyleSetForeground 2997
-#define wxStyledTextCtrl_StyleSetBackground 2998
-#define wxStyledTextCtrl_StyleSetBold 2999
-#define wxStyledTextCtrl_StyleSetItalic 3000
-#define wxStyledTextCtrl_StyleSetSize 3001
-#define wxStyledTextCtrl_StyleSetFaceName 3002
-#define wxStyledTextCtrl_StyleSetEOLFilled 3003
-#define wxStyledTextCtrl_StyleResetDefault 3004
-#define wxStyledTextCtrl_StyleSetUnderline 3005
-#define wxStyledTextCtrl_StyleSetCase 3006
-#define wxStyledTextCtrl_StyleSetHotSpot 3007
-#define wxStyledTextCtrl_SetSelForeground 3008
-#define wxStyledTextCtrl_SetSelBackground 3009
-#define wxStyledTextCtrl_GetSelAlpha 3010
-#define wxStyledTextCtrl_SetSelAlpha 3011
-#define wxStyledTextCtrl_SetCaretForeground 3012
-#define wxStyledTextCtrl_CmdKeyAssign 3013
-#define wxStyledTextCtrl_CmdKeyClear 3014
-#define wxStyledTextCtrl_CmdKeyClearAll 3015
-#define wxStyledTextCtrl_SetStyleBytes 3016
-#define wxStyledTextCtrl_StyleSetVisible 3017
-#define wxStyledTextCtrl_GetCaretPeriod 3018
-#define wxStyledTextCtrl_SetCaretPeriod 3019
-#define wxStyledTextCtrl_SetWordChars 3020
-#define wxStyledTextCtrl_BeginUndoAction 3021
-#define wxStyledTextCtrl_EndUndoAction 3022
-#define wxStyledTextCtrl_IndicatorSetStyle 3023
-#define wxStyledTextCtrl_IndicatorGetStyle 3024
-#define wxStyledTextCtrl_IndicatorSetForeground 3025
-#define wxStyledTextCtrl_IndicatorGetForeground 3026
-#define wxStyledTextCtrl_SetWhitespaceForeground 3027
-#define wxStyledTextCtrl_SetWhitespaceBackground 3028
-#define wxStyledTextCtrl_GetStyleBits 3029
-#define wxStyledTextCtrl_SetLineState 3030
-#define wxStyledTextCtrl_GetLineState 3031
-#define wxStyledTextCtrl_GetMaxLineState 3032
-#define wxStyledTextCtrl_GetCaretLineVisible 3033
-#define wxStyledTextCtrl_SetCaretLineVisible 3034
-#define wxStyledTextCtrl_GetCaretLineBackground 3035
-#define wxStyledTextCtrl_SetCaretLineBackground 3036
-#define wxStyledTextCtrl_AutoCompShow 3037
-#define wxStyledTextCtrl_AutoCompCancel 3038
-#define wxStyledTextCtrl_AutoCompActive 3039
-#define wxStyledTextCtrl_AutoCompPosStart 3040
-#define wxStyledTextCtrl_AutoCompComplete 3041
-#define wxStyledTextCtrl_AutoCompStops 3042
-#define wxStyledTextCtrl_AutoCompSetSeparator 3043
-#define wxStyledTextCtrl_AutoCompGetSeparator 3044
-#define wxStyledTextCtrl_AutoCompSelect 3045
-#define wxStyledTextCtrl_AutoCompSetCancelAtStart 3046
-#define wxStyledTextCtrl_AutoCompGetCancelAtStart 3047
-#define wxStyledTextCtrl_AutoCompSetFillUps 3048
-#define wxStyledTextCtrl_AutoCompSetChooseSingle 3049
-#define wxStyledTextCtrl_AutoCompGetChooseSingle 3050
-#define wxStyledTextCtrl_AutoCompSetIgnoreCase 3051
-#define wxStyledTextCtrl_AutoCompGetIgnoreCase 3052
-#define wxStyledTextCtrl_UserListShow 3053
-#define wxStyledTextCtrl_AutoCompSetAutoHide 3054
-#define wxStyledTextCtrl_AutoCompGetAutoHide 3055
-#define wxStyledTextCtrl_AutoCompSetDropRestOfWord 3056
-#define wxStyledTextCtrl_AutoCompGetDropRestOfWord 3057
-#define wxStyledTextCtrl_RegisterImage 3058
-#define wxStyledTextCtrl_ClearRegisteredImages 3059
-#define wxStyledTextCtrl_AutoCompGetTypeSeparator 3060
-#define wxStyledTextCtrl_AutoCompSetTypeSeparator 3061
-#define wxStyledTextCtrl_AutoCompSetMaxWidth 3062
-#define wxStyledTextCtrl_AutoCompGetMaxWidth 3063
-#define wxStyledTextCtrl_AutoCompSetMaxHeight 3064
-#define wxStyledTextCtrl_AutoCompGetMaxHeight 3065
-#define wxStyledTextCtrl_SetIndent 3066
-#define wxStyledTextCtrl_GetIndent 3067
-#define wxStyledTextCtrl_SetUseTabs 3068
-#define wxStyledTextCtrl_GetUseTabs 3069
-#define wxStyledTextCtrl_SetLineIndentation 3070
-#define wxStyledTextCtrl_GetLineIndentation 3071
-#define wxStyledTextCtrl_GetLineIndentPosition 3072
-#define wxStyledTextCtrl_GetColumn 3073
-#define wxStyledTextCtrl_SetUseHorizontalScrollBar 3074
-#define wxStyledTextCtrl_GetUseHorizontalScrollBar 3075
-#define wxStyledTextCtrl_SetIndentationGuides 3076
-#define wxStyledTextCtrl_GetIndentationGuides 3077
-#define wxStyledTextCtrl_SetHighlightGuide 3078
-#define wxStyledTextCtrl_GetHighlightGuide 3079
-#define wxStyledTextCtrl_GetLineEndPosition 3080
-#define wxStyledTextCtrl_GetCodePage 3081
-#define wxStyledTextCtrl_GetCaretForeground 3082
-#define wxStyledTextCtrl_GetReadOnly 3083
-#define wxStyledTextCtrl_SetCurrentPos 3084
-#define wxStyledTextCtrl_SetSelectionStart 3085
-#define wxStyledTextCtrl_GetSelectionStart 3086
-#define wxStyledTextCtrl_SetSelectionEnd 3087
-#define wxStyledTextCtrl_GetSelectionEnd 3088
-#define wxStyledTextCtrl_SetPrintMagnification 3089
-#define wxStyledTextCtrl_GetPrintMagnification 3090
-#define wxStyledTextCtrl_SetPrintColourMode 3091
-#define wxStyledTextCtrl_GetPrintColourMode 3092
-#define wxStyledTextCtrl_FindText 3093
-#define wxStyledTextCtrl_FormatRange 3094
-#define wxStyledTextCtrl_GetFirstVisibleLine 3095
-#define wxStyledTextCtrl_GetLine 3096
-#define wxStyledTextCtrl_GetLineCount 3097
-#define wxStyledTextCtrl_SetMarginLeft 3098
-#define wxStyledTextCtrl_GetMarginLeft 3099
-#define wxStyledTextCtrl_SetMarginRight 3100
-#define wxStyledTextCtrl_GetMarginRight 3101
-#define wxStyledTextCtrl_GetModify 3102
-#define wxStyledTextCtrl_SetSelection 3103
-#define wxStyledTextCtrl_GetSelectedText 3104
-#define wxStyledTextCtrl_GetTextRange 3105
-#define wxStyledTextCtrl_HideSelection 3106
-#define wxStyledTextCtrl_LineFromPosition 3107
-#define wxStyledTextCtrl_PositionFromLine 3108
-#define wxStyledTextCtrl_LineScroll 3109
-#define wxStyledTextCtrl_EnsureCaretVisible 3110
-#define wxStyledTextCtrl_ReplaceSelection 3111
-#define wxStyledTextCtrl_SetReadOnly 3112
-#define wxStyledTextCtrl_CanPaste 3113
-#define wxStyledTextCtrl_CanUndo 3114
-#define wxStyledTextCtrl_EmptyUndoBuffer 3115
-#define wxStyledTextCtrl_Undo 3116
-#define wxStyledTextCtrl_Cut 3117
-#define wxStyledTextCtrl_Copy 3118
-#define wxStyledTextCtrl_Paste 3119
-#define wxStyledTextCtrl_Clear 3120
-#define wxStyledTextCtrl_SetText 3121
-#define wxStyledTextCtrl_GetText 3122
-#define wxStyledTextCtrl_GetTextLength 3123
-#define wxStyledTextCtrl_GetOvertype 3124
-#define wxStyledTextCtrl_SetCaretWidth 3125
-#define wxStyledTextCtrl_GetCaretWidth 3126
-#define wxStyledTextCtrl_SetTargetStart 3127
-#define wxStyledTextCtrl_GetTargetStart 3128
-#define wxStyledTextCtrl_SetTargetEnd 3129
-#define wxStyledTextCtrl_GetTargetEnd 3130
-#define wxStyledTextCtrl_ReplaceTarget 3131
-#define wxStyledTextCtrl_SearchInTarget 3132
-#define wxStyledTextCtrl_SetSearchFlags 3133
-#define wxStyledTextCtrl_GetSearchFlags 3134
-#define wxStyledTextCtrl_CallTipShow 3135
-#define wxStyledTextCtrl_CallTipCancel 3136
-#define wxStyledTextCtrl_CallTipActive 3137
-#define wxStyledTextCtrl_CallTipPosAtStart 3138
-#define wxStyledTextCtrl_CallTipSetHighlight 3139
-#define wxStyledTextCtrl_CallTipSetBackground 3140
-#define wxStyledTextCtrl_CallTipSetForeground 3141
-#define wxStyledTextCtrl_CallTipSetForegroundHighlight 3142
-#define wxStyledTextCtrl_CallTipUseStyle 3143
-#define wxStyledTextCtrl_VisibleFromDocLine 3144
-#define wxStyledTextCtrl_DocLineFromVisible 3145
-#define wxStyledTextCtrl_WrapCount 3146
-#define wxStyledTextCtrl_SetFoldLevel 3147
-#define wxStyledTextCtrl_GetFoldLevel 3148
-#define wxStyledTextCtrl_GetLastChild 3149
-#define wxStyledTextCtrl_GetFoldParent 3150
-#define wxStyledTextCtrl_ShowLines 3151
-#define wxStyledTextCtrl_HideLines 3152
-#define wxStyledTextCtrl_GetLineVisible 3153
-#define wxStyledTextCtrl_SetFoldExpanded 3154
-#define wxStyledTextCtrl_GetFoldExpanded 3155
-#define wxStyledTextCtrl_ToggleFold 3156
-#define wxStyledTextCtrl_EnsureVisible 3157
-#define wxStyledTextCtrl_SetFoldFlags 3158
-#define wxStyledTextCtrl_EnsureVisibleEnforcePolicy 3159
-#define wxStyledTextCtrl_SetTabIndents 3160
-#define wxStyledTextCtrl_GetTabIndents 3161
-#define wxStyledTextCtrl_SetBackSpaceUnIndents 3162
-#define wxStyledTextCtrl_GetBackSpaceUnIndents 3163
-#define wxStyledTextCtrl_SetMouseDwellTime 3164
-#define wxStyledTextCtrl_GetMouseDwellTime 3165
-#define wxStyledTextCtrl_WordStartPosition 3166
-#define wxStyledTextCtrl_WordEndPosition 3167
-#define wxStyledTextCtrl_SetWrapMode 3168
-#define wxStyledTextCtrl_GetWrapMode 3169
-#define wxStyledTextCtrl_SetWrapVisualFlags 3170
-#define wxStyledTextCtrl_GetWrapVisualFlags 3171
-#define wxStyledTextCtrl_SetWrapVisualFlagsLocation 3172
-#define wxStyledTextCtrl_GetWrapVisualFlagsLocation 3173
-#define wxStyledTextCtrl_SetWrapStartIndent 3174
-#define wxStyledTextCtrl_GetWrapStartIndent 3175
-#define wxStyledTextCtrl_SetLayoutCache 3176
-#define wxStyledTextCtrl_GetLayoutCache 3177
-#define wxStyledTextCtrl_SetScrollWidth 3178
-#define wxStyledTextCtrl_GetScrollWidth 3179
-#define wxStyledTextCtrl_TextWidth 3180
-#define wxStyledTextCtrl_GetEndAtLastLine 3181
-#define wxStyledTextCtrl_TextHeight 3182
-#define wxStyledTextCtrl_SetUseVerticalScrollBar 3183
-#define wxStyledTextCtrl_GetUseVerticalScrollBar 3184
-#define wxStyledTextCtrl_AppendText 3185
-#define wxStyledTextCtrl_GetTwoPhaseDraw 3186
-#define wxStyledTextCtrl_SetTwoPhaseDraw 3187
-#define wxStyledTextCtrl_TargetFromSelection 3188
-#define wxStyledTextCtrl_LinesJoin 3189
-#define wxStyledTextCtrl_LinesSplit 3190
-#define wxStyledTextCtrl_SetFoldMarginColour 3191
-#define wxStyledTextCtrl_SetFoldMarginHiColour 3192
-#define wxStyledTextCtrl_LineDown 3193
-#define wxStyledTextCtrl_LineDownExtend 3194
-#define wxStyledTextCtrl_LineUp 3195
-#define wxStyledTextCtrl_LineUpExtend 3196
-#define wxStyledTextCtrl_CharLeft 3197
-#define wxStyledTextCtrl_CharLeftExtend 3198
-#define wxStyledTextCtrl_CharRight 3199
-#define wxStyledTextCtrl_CharRightExtend 3200
-#define wxStyledTextCtrl_WordLeft 3201
-#define wxStyledTextCtrl_WordLeftExtend 3202
-#define wxStyledTextCtrl_WordRight 3203
-#define wxStyledTextCtrl_WordRightExtend 3204
-#define wxStyledTextCtrl_Home 3205
-#define wxStyledTextCtrl_HomeExtend 3206
-#define wxStyledTextCtrl_LineEnd 3207
-#define wxStyledTextCtrl_LineEndExtend 3208
-#define wxStyledTextCtrl_DocumentStart 3209
-#define wxStyledTextCtrl_DocumentStartExtend 3210
-#define wxStyledTextCtrl_DocumentEnd 3211
-#define wxStyledTextCtrl_DocumentEndExtend 3212
-#define wxStyledTextCtrl_PageUp 3213
-#define wxStyledTextCtrl_PageUpExtend 3214
-#define wxStyledTextCtrl_PageDown 3215
-#define wxStyledTextCtrl_PageDownExtend 3216
-#define wxStyledTextCtrl_EditToggleOvertype 3217
-#define wxStyledTextCtrl_Cancel 3218
-#define wxStyledTextCtrl_DeleteBack 3219
-#define wxStyledTextCtrl_Tab 3220
-#define wxStyledTextCtrl_BackTab 3221
-#define wxStyledTextCtrl_NewLine 3222
-#define wxStyledTextCtrl_FormFeed 3223
-#define wxStyledTextCtrl_VCHome 3224
-#define wxStyledTextCtrl_VCHomeExtend 3225
-#define wxStyledTextCtrl_ZoomIn 3226
-#define wxStyledTextCtrl_ZoomOut 3227
-#define wxStyledTextCtrl_DelWordLeft 3228
-#define wxStyledTextCtrl_DelWordRight 3229
-#define wxStyledTextCtrl_LineCut 3230
-#define wxStyledTextCtrl_LineDelete 3231
-#define wxStyledTextCtrl_LineTranspose 3232
-#define wxStyledTextCtrl_LineDuplicate 3233
-#define wxStyledTextCtrl_LowerCase 3234
-#define wxStyledTextCtrl_UpperCase 3235
-#define wxStyledTextCtrl_LineScrollDown 3236
-#define wxStyledTextCtrl_LineScrollUp 3237
-#define wxStyledTextCtrl_DeleteBackNotLine 3238
-#define wxStyledTextCtrl_HomeDisplay 3239
-#define wxStyledTextCtrl_HomeDisplayExtend 3240
-#define wxStyledTextCtrl_LineEndDisplay 3241
-#define wxStyledTextCtrl_LineEndDisplayExtend 3242
-#define wxStyledTextCtrl_HomeWrapExtend 3243
-#define wxStyledTextCtrl_LineEndWrap 3244
-#define wxStyledTextCtrl_LineEndWrapExtend 3245
-#define wxStyledTextCtrl_VCHomeWrap 3246
-#define wxStyledTextCtrl_VCHomeWrapExtend 3247
-#define wxStyledTextCtrl_LineCopy 3248
-#define wxStyledTextCtrl_MoveCaretInsideView 3249
-#define wxStyledTextCtrl_LineLength 3250
-#define wxStyledTextCtrl_BraceHighlight 3251
-#define wxStyledTextCtrl_BraceBadLight 3252
-#define wxStyledTextCtrl_BraceMatch 3253
-#define wxStyledTextCtrl_GetViewEOL 3254
-#define wxStyledTextCtrl_SetViewEOL 3255
-#define wxStyledTextCtrl_SetModEventMask 3256
-#define wxStyledTextCtrl_GetEdgeColumn 3257
-#define wxStyledTextCtrl_SetEdgeColumn 3258
-#define wxStyledTextCtrl_GetEdgeMode 3259
-#define wxStyledTextCtrl_GetEdgeColour 3260
-#define wxStyledTextCtrl_SetEdgeColour 3261
-#define wxStyledTextCtrl_SearchAnchor 3262
-#define wxStyledTextCtrl_SearchNext 3263
-#define wxStyledTextCtrl_SearchPrev 3264
-#define wxStyledTextCtrl_LinesOnScreen 3265
-#define wxStyledTextCtrl_UsePopUp 3266
-#define wxStyledTextCtrl_SelectionIsRectangle 3267
-#define wxStyledTextCtrl_SetZoom 3268
-#define wxStyledTextCtrl_GetZoom 3269
-#define wxStyledTextCtrl_GetModEventMask 3270
-#define wxStyledTextCtrl_SetSTCFocus 3271
-#define wxStyledTextCtrl_GetSTCFocus 3272
-#define wxStyledTextCtrl_SetStatus 3273
-#define wxStyledTextCtrl_GetStatus 3274
-#define wxStyledTextCtrl_SetMouseDownCaptures 3275
-#define wxStyledTextCtrl_GetMouseDownCaptures 3276
-#define wxStyledTextCtrl_SetSTCCursor 3277
-#define wxStyledTextCtrl_GetSTCCursor 3278
-#define wxStyledTextCtrl_SetControlCharSymbol 3279
-#define wxStyledTextCtrl_GetControlCharSymbol 3280
-#define wxStyledTextCtrl_WordPartLeft 3281
-#define wxStyledTextCtrl_WordPartLeftExtend 3282
-#define wxStyledTextCtrl_WordPartRight 3283
-#define wxStyledTextCtrl_WordPartRightExtend 3284
-#define wxStyledTextCtrl_SetVisiblePolicy 3285
-#define wxStyledTextCtrl_DelLineLeft 3286
-#define wxStyledTextCtrl_DelLineRight 3287
-#define wxStyledTextCtrl_GetXOffset 3288
-#define wxStyledTextCtrl_ChooseCaretX 3289
-#define wxStyledTextCtrl_SetXCaretPolicy 3290
-#define wxStyledTextCtrl_SetYCaretPolicy 3291
-#define wxStyledTextCtrl_GetPrintWrapMode 3292
-#define wxStyledTextCtrl_SetHotspotActiveForeground 3293
-#define wxStyledTextCtrl_SetHotspotActiveBackground 3294
-#define wxStyledTextCtrl_SetHotspotActiveUnderline 3295
-#define wxStyledTextCtrl_SetHotspotSingleLine 3296
-#define wxStyledTextCtrl_ParaDownExtend 3297
-#define wxStyledTextCtrl_ParaUp 3298
-#define wxStyledTextCtrl_ParaUpExtend 3299
-#define wxStyledTextCtrl_PositionBefore 3300
-#define wxStyledTextCtrl_PositionAfter 3301
-#define wxStyledTextCtrl_CopyRange 3302
-#define wxStyledTextCtrl_CopyText 3303
-#define wxStyledTextCtrl_SetSelectionMode 3304
-#define wxStyledTextCtrl_GetSelectionMode 3305
-#define wxStyledTextCtrl_LineDownRectExtend 3306
-#define wxStyledTextCtrl_LineUpRectExtend 3307
-#define wxStyledTextCtrl_CharLeftRectExtend 3308
-#define wxStyledTextCtrl_CharRightRectExtend 3309
-#define wxStyledTextCtrl_HomeRectExtend 3310
-#define wxStyledTextCtrl_VCHomeRectExtend 3311
-#define wxStyledTextCtrl_LineEndRectExtend 3312
-#define wxStyledTextCtrl_PageUpRectExtend 3313
-#define wxStyledTextCtrl_PageDownRectExtend 3314
-#define wxStyledTextCtrl_StutteredPageUp 3315
-#define wxStyledTextCtrl_StutteredPageUpExtend 3316
-#define wxStyledTextCtrl_StutteredPageDown 3317
-#define wxStyledTextCtrl_StutteredPageDownExtend 3318
-#define wxStyledTextCtrl_WordLeftEnd 3319
-#define wxStyledTextCtrl_WordLeftEndExtend 3320
-#define wxStyledTextCtrl_WordRightEnd 3321
-#define wxStyledTextCtrl_WordRightEndExtend 3322
-#define wxStyledTextCtrl_SetWhitespaceChars 3323
-#define wxStyledTextCtrl_SetCharsDefault 3324
-#define wxStyledTextCtrl_AutoCompGetCurrent 3325
-#define wxStyledTextCtrl_Allocate 3326
-#define wxStyledTextCtrl_FindColumn 3327
-#define wxStyledTextCtrl_GetCaretSticky 3328
-#define wxStyledTextCtrl_SetCaretSticky 3329
-#define wxStyledTextCtrl_ToggleCaretSticky 3330
-#define wxStyledTextCtrl_SetPasteConvertEndings 3331
-#define wxStyledTextCtrl_GetPasteConvertEndings 3332
-#define wxStyledTextCtrl_SelectionDuplicate 3333
-#define wxStyledTextCtrl_SetCaretLineBackAlpha 3334
-#define wxStyledTextCtrl_GetCaretLineBackAlpha 3335
-#define wxStyledTextCtrl_StartRecord 3336
-#define wxStyledTextCtrl_StopRecord 3337
-#define wxStyledTextCtrl_SetLexer 3338
-#define wxStyledTextCtrl_GetLexer 3339
-#define wxStyledTextCtrl_Colourise 3340
-#define wxStyledTextCtrl_SetProperty 3341
-#define wxStyledTextCtrl_SetKeyWords 3342
-#define wxStyledTextCtrl_SetLexerLanguage 3343
-#define wxStyledTextCtrl_GetProperty 3344
-#define wxStyledTextCtrl_GetStyleBitsNeeded 3345
-#define wxStyledTextCtrl_GetCurrentLine 3346
-#define wxStyledTextCtrl_StyleSetSpec 3347
-#define wxStyledTextCtrl_StyleSetFont 3348
-#define wxStyledTextCtrl_StyleSetFontAttr 3349
-#define wxStyledTextCtrl_StyleSetCharacterSet 3350
-#define wxStyledTextCtrl_StyleSetFontEncoding 3351
-#define wxStyledTextCtrl_CmdKeyExecute 3352
-#define wxStyledTextCtrl_SetMargins 3353
-#define wxStyledTextCtrl_GetSelection 3354
-#define wxStyledTextCtrl_PointFromPosition 3355
-#define wxStyledTextCtrl_ScrollToLine 3356
-#define wxStyledTextCtrl_ScrollToColumn 3357
-#define wxStyledTextCtrl_SendMsg 3358
-#define wxStyledTextCtrl_SetVScrollBar 3359
-#define wxStyledTextCtrl_SetHScrollBar 3360
-#define wxStyledTextCtrl_GetLastKeydownProcessed 3361
-#define wxStyledTextCtrl_SetLastKeydownProcessed 3362
-#define wxStyledTextCtrl_SaveFile 3363
-#define wxStyledTextCtrl_LoadFile 3364
-#define wxStyledTextCtrl_DoDragOver 3365
-#define wxStyledTextCtrl_DoDropText 3366
-#define wxStyledTextCtrl_GetUseAntiAliasing 3367
-#define wxStyledTextCtrl_AddTextRaw 3368
-#define wxStyledTextCtrl_InsertTextRaw 3369
-#define wxStyledTextCtrl_GetCurLineRaw 3370
-#define wxStyledTextCtrl_GetLineRaw 3371
-#define wxStyledTextCtrl_GetSelectedTextRaw 3372
-#define wxStyledTextCtrl_GetTextRangeRaw 3373
-#define wxStyledTextCtrl_SetTextRaw 3374
-#define wxStyledTextCtrl_GetTextRaw 3375
-#define wxStyledTextCtrl_AppendTextRaw 3376
-#define wxArtProvider_GetBitmap 3377
-#define wxArtProvider_GetIcon 3378
-#define wxTreeEvent_GetKeyCode 3379
-#define wxTreeEvent_GetItem 3380
-#define wxTreeEvent_GetKeyEvent 3381
-#define wxTreeEvent_GetLabel 3382
-#define wxTreeEvent_GetOldItem 3383
-#define wxTreeEvent_GetPoint 3384
-#define wxTreeEvent_IsEditCancelled 3385
-#define wxTreeEvent_SetToolTip 3386
-#define wxNotebookEvent_GetOldSelection 3387
-#define wxNotebookEvent_GetSelection 3388
-#define wxNotebookEvent_SetOldSelection 3389
-#define wxNotebookEvent_SetSelection 3390
-#define wxFileDataObject_new 3391
-#define wxFileDataObject_AddFile 3392
-#define wxFileDataObject_GetFilenames 3393
-#define wxFileDataObject_destroy 3394
-#define wxTextDataObject_new 3395
-#define wxTextDataObject_GetTextLength 3396
-#define wxTextDataObject_GetText 3397
-#define wxTextDataObject_SetText 3398
-#define wxTextDataObject_destroy 3399
-#define wxBitmapDataObject_new_1_1 3400
-#define wxBitmapDataObject_new_1_0 3401
-#define wxBitmapDataObject_GetBitmap 3402
-#define wxBitmapDataObject_SetBitmap 3403
-#define wxBitmapDataObject_destroy 3404
-#define wxClipboard_new 3406
-#define wxClipboard_destruct 3407
-#define wxClipboard_AddData 3408
-#define wxClipboard_Clear 3409
-#define wxClipboard_Close 3410
-#define wxClipboard_Flush 3411
-#define wxClipboard_GetData 3412
-#define wxClipboard_IsOpened 3413
-#define wxClipboard_Open 3414
-#define wxClipboard_SetData 3415
-#define wxClipboard_UsePrimarySelection 3417
-#define wxClipboard_IsSupported 3418
-#define wxClipboard_Get 3419
-#define wxSpinEvent_GetPosition 3420
-#define wxSpinEvent_SetPosition 3421
-#define wxSplitterWindow_new_0 3422
-#define wxSplitterWindow_new_2 3423
-#define wxSplitterWindow_destruct 3424
-#define wxSplitterWindow_Create 3425
-#define wxSplitterWindow_GetMinimumPaneSize 3426
-#define wxSplitterWindow_GetSashGravity 3427
-#define wxSplitterWindow_GetSashPosition 3428
-#define wxSplitterWindow_GetSplitMode 3429
-#define wxSplitterWindow_GetWindow1 3430
-#define wxSplitterWindow_GetWindow2 3431
-#define wxSplitterWindow_Initialize 3432
-#define wxSplitterWindow_IsSplit 3433
-#define wxSplitterWindow_ReplaceWindow 3434
-#define wxSplitterWindow_SetSashGravity 3435
-#define wxSplitterWindow_SetSashPosition 3436
-#define wxSplitterWindow_SetSashSize 3437
-#define wxSplitterWindow_SetMinimumPaneSize 3438
-#define wxSplitterWindow_SetSplitMode 3439
-#define wxSplitterWindow_SplitHorizontally 3440
-#define wxSplitterWindow_SplitVertically 3441
-#define wxSplitterWindow_Unsplit 3442
-#define wxSplitterWindow_UpdateSize 3443
-#define wxSplitterEvent_GetSashPosition 3444
-#define wxSplitterEvent_GetX 3445
-#define wxSplitterEvent_GetY 3446
-#define wxSplitterEvent_GetWindowBeingRemoved 3447
-#define wxSplitterEvent_SetSashPosition 3448
-#define wxHtmlWindow_new_0 3449
-#define wxHtmlWindow_new_2 3450
-#define wxHtmlWindow_AppendToPage 3451
-#define wxHtmlWindow_GetOpenedAnchor 3452
-#define wxHtmlWindow_GetOpenedPage 3453
-#define wxHtmlWindow_GetOpenedPageTitle 3454
-#define wxHtmlWindow_GetRelatedFrame 3455
-#define wxHtmlWindow_HistoryBack 3456
-#define wxHtmlWindow_HistoryCanBack 3457
-#define wxHtmlWindow_HistoryCanForward 3458
-#define wxHtmlWindow_HistoryClear 3459
-#define wxHtmlWindow_HistoryForward 3460
-#define wxHtmlWindow_LoadFile 3461
-#define wxHtmlWindow_LoadPage 3462
-#define wxHtmlWindow_SelectAll 3463
-#define wxHtmlWindow_SelectionToText 3464
-#define wxHtmlWindow_SelectLine 3465
-#define wxHtmlWindow_SelectWord 3466
-#define wxHtmlWindow_SetBorders 3467
-#define wxHtmlWindow_SetFonts 3468
-#define wxHtmlWindow_SetPage 3469
-#define wxHtmlWindow_SetRelatedFrame 3470
-#define wxHtmlWindow_SetRelatedStatusBar 3471
-#define wxHtmlWindow_ToText 3472
-#define wxHtmlWindow_destroy 3473
-#define wxHtmlLinkEvent_GetLinkInfo 3474
-#define wxAuiNotebookEvent_SetSelection 3475
-#define wxAuiNotebookEvent_GetSelection 3476
-#define wxAuiNotebookEvent_SetOldSelection 3477
-#define wxAuiNotebookEvent_GetOldSelection 3478
-#define wxAuiNotebookEvent_SetDragSource 3479
-#define wxAuiNotebookEvent_GetDragSource 3480
-#define wxAuiManagerEvent_SetManager 3481
-#define wxAuiManagerEvent_GetManager 3482
-#define wxAuiManagerEvent_SetPane 3483
-#define wxAuiManagerEvent_GetPane 3484
-#define wxAuiManagerEvent_SetButton 3485
-#define wxAuiManagerEvent_GetButton 3486
-#define wxAuiManagerEvent_SetDC 3487
-#define wxAuiManagerEvent_GetDC 3488
-#define wxAuiManagerEvent_Veto 3489
-#define wxAuiManagerEvent_GetVeto 3490
-#define wxAuiManagerEvent_SetCanVeto 3491
-#define wxAuiManagerEvent_CanVeto 3492
-#define wxLogNull_new 3493
-#define wxLogNull_destroy 3494
+#define wxTreeCtrl_EditLabel 2010
+#define wxTreeCtrl_EnsureVisible 2011
+#define wxTreeCtrl_Expand 2012
+#define wxTreeCtrl_GetBoundingRect 2013
+#define wxTreeCtrl_GetChildrenCount 2015
+#define wxTreeCtrl_GetCount 2016
+#define wxTreeCtrl_GetEditControl 2017
+#define wxTreeCtrl_GetFirstChild 2018
+#define wxTreeCtrl_GetNextChild 2019
+#define wxTreeCtrl_GetFirstVisibleItem 2020
+#define wxTreeCtrl_GetImageList 2021
+#define wxTreeCtrl_GetIndent 2022
+#define wxTreeCtrl_GetItemBackgroundColour 2023
+#define wxTreeCtrl_GetItemData 2024
+#define wxTreeCtrl_GetItemFont 2025
+#define wxTreeCtrl_GetItemImage_1 2026
+#define wxTreeCtrl_GetItemImage_2 2027
+#define wxTreeCtrl_GetItemText 2028
+#define wxTreeCtrl_GetItemTextColour 2029
+#define wxTreeCtrl_GetLastChild 2030
+#define wxTreeCtrl_GetNextSibling 2031
+#define wxTreeCtrl_GetNextVisible 2032
+#define wxTreeCtrl_GetItemParent 2033
+#define wxTreeCtrl_GetPrevSibling 2034
+#define wxTreeCtrl_GetPrevVisible 2035
+#define wxTreeCtrl_GetRootItem 2036
+#define wxTreeCtrl_GetSelection 2037
+#define wxTreeCtrl_GetSelections 2038
+#define wxTreeCtrl_GetStateImageList 2039
+#define wxTreeCtrl_HitTest 2040
+#define wxTreeCtrl_InsertItem 2042
+#define wxTreeCtrl_IsBold 2043
+#define wxTreeCtrl_IsExpanded 2044
+#define wxTreeCtrl_IsSelected 2045
+#define wxTreeCtrl_IsVisible 2046
+#define wxTreeCtrl_ItemHasChildren 2047
+#define wxTreeCtrl_PrependItem 2048
+#define wxTreeCtrl_ScrollTo 2049
+#define wxTreeCtrl_SelectItem_1 2050
+#define wxTreeCtrl_SelectItem_2 2051
+#define wxTreeCtrl_SetIndent 2052
+#define wxTreeCtrl_SetImageList 2053
+#define wxTreeCtrl_SetItemBackgroundColour 2054
+#define wxTreeCtrl_SetItemBold 2055
+#define wxTreeCtrl_SetItemData 2056
+#define wxTreeCtrl_SetItemDropHighlight 2057
+#define wxTreeCtrl_SetItemFont 2058
+#define wxTreeCtrl_SetItemHasChildren 2059
+#define wxTreeCtrl_SetItemImage_2 2060
+#define wxTreeCtrl_SetItemImage_3 2061
+#define wxTreeCtrl_SetItemText 2062
+#define wxTreeCtrl_SetItemTextColour 2063
+#define wxTreeCtrl_SetStateImageList 2064
+#define wxTreeCtrl_SetWindowStyle 2065
+#define wxTreeCtrl_SortChildren 2066
+#define wxTreeCtrl_Toggle 2067
+#define wxTreeCtrl_ToggleItemSelection 2068
+#define wxTreeCtrl_Unselect 2069
+#define wxTreeCtrl_UnselectAll 2070
+#define wxTreeCtrl_UnselectItem 2071
+#define wxScrollBar_new_0 2072
+#define wxScrollBar_new_3 2073
+#define wxScrollBar_destruct 2074
+#define wxScrollBar_Create 2075
+#define wxScrollBar_GetRange 2076
+#define wxScrollBar_GetPageSize 2077
+#define wxScrollBar_GetThumbPosition 2078
+#define wxScrollBar_GetThumbSize 2079
+#define wxScrollBar_SetThumbPosition 2080
+#define wxScrollBar_SetScrollbar 2081
+#define wxSpinButton_new_2 2083
+#define wxSpinButton_new_0 2084
+#define wxSpinButton_Create 2085
+#define wxSpinButton_GetMax 2086
+#define wxSpinButton_GetMin 2087
+#define wxSpinButton_GetValue 2088
+#define wxSpinButton_SetRange 2089
+#define wxSpinButton_SetValue 2090
+#define wxSpinButton_destroy 2091
+#define wxSpinCtrl_new_0 2092
+#define wxSpinCtrl_new_2 2093
+#define wxSpinCtrl_Create 2095
+#define wxSpinCtrl_SetValue_1_1 2098
+#define wxSpinCtrl_SetValue_1_0 2099
+#define wxSpinCtrl_GetValue 2101
+#define wxSpinCtrl_SetRange 2103
+#define wxSpinCtrl_SetSelection 2104
+#define wxSpinCtrl_GetMin 2106
+#define wxSpinCtrl_GetMax 2108
+#define wxSpinCtrl_destroy 2109
+#define wxStaticText_new_0 2110
+#define wxStaticText_new_4 2111
+#define wxStaticText_Create 2112
+#define wxStaticText_GetLabel 2113
+#define wxStaticText_SetLabel 2114
+#define wxStaticText_Wrap 2115
+#define wxStaticText_destroy 2116
+#define wxStaticBitmap_new_0 2117
+#define wxStaticBitmap_new_4 2118
+#define wxStaticBitmap_Create 2119
+#define wxStaticBitmap_GetBitmap 2120
+#define wxStaticBitmap_SetBitmap 2121
+#define wxStaticBitmap_destroy 2122
+#define wxRadioBox_new 2123
+#define wxRadioBox_destruct 2125
+#define wxRadioBox_Create 2126
+#define wxRadioBox_Enable_2 2127
+#define wxRadioBox_Enable_1 2128
+#define wxRadioBox_GetSelection 2129
+#define wxRadioBox_GetString 2130
+#define wxRadioBox_SetSelection 2131
+#define wxRadioBox_Show_2 2132
+#define wxRadioBox_Show_1 2133
+#define wxRadioBox_GetColumnCount 2134
+#define wxRadioBox_GetItemHelpText 2135
+#define wxRadioBox_GetItemToolTip 2136
+#define wxRadioBox_GetItemFromPoint 2138
+#define wxRadioBox_GetRowCount 2139
+#define wxRadioBox_IsItemEnabled 2140
+#define wxRadioBox_IsItemShown 2141
+#define wxRadioBox_SetItemHelpText 2142
+#define wxRadioBox_SetItemToolTip 2143
+#define wxRadioButton_new_0 2144
+#define wxRadioButton_new_4 2145
+#define wxRadioButton_Create 2146
+#define wxRadioButton_GetValue 2147
+#define wxRadioButton_SetValue 2148
+#define wxRadioButton_destroy 2149
+#define wxSlider_new_6 2151
+#define wxSlider_new_0 2152
+#define wxSlider_Create 2153
+#define wxSlider_GetLineSize 2154
+#define wxSlider_GetMax 2155
+#define wxSlider_GetMin 2156
+#define wxSlider_GetPageSize 2157
+#define wxSlider_GetThumbLength 2158
+#define wxSlider_GetValue 2159
+#define wxSlider_SetLineSize 2160
+#define wxSlider_SetPageSize 2161
+#define wxSlider_SetRange 2162
+#define wxSlider_SetThumbLength 2163
+#define wxSlider_SetValue 2164
+#define wxSlider_destroy 2165
+#define wxDialog_new_4 2167
+#define wxDialog_new_0 2168
+#define wxDialog_destruct 2170
+#define wxDialog_Create 2171
+#define wxDialog_CreateButtonSizer 2172
+#define wxDialog_CreateStdDialogButtonSizer 2173
+#define wxDialog_EndModal 2174
+#define wxDialog_GetAffirmativeId 2175
+#define wxDialog_GetReturnCode 2176
+#define wxDialog_IsModal 2177
+#define wxDialog_SetAffirmativeId 2178
+#define wxDialog_SetReturnCode 2179
+#define wxDialog_Show 2180
+#define wxDialog_ShowModal 2181
+#define wxColourDialog_new_0 2182
+#define wxColourDialog_new_2 2183
+#define wxColourDialog_destruct 2184
+#define wxColourDialog_Create 2185
+#define wxColourDialog_GetColourData 2186
+#define wxColourData_new_0 2187
+#define wxColourData_new_1 2188
+#define wxColourData_destruct 2189
+#define wxColourData_GetChooseFull 2190
+#define wxColourData_GetColour 2191
+#define wxColourData_GetCustomColour 2193
+#define wxColourData_SetChooseFull 2194
+#define wxColourData_SetColour 2195
+#define wxColourData_SetCustomColour 2196
+#define wxPalette_new_0 2197
+#define wxPalette_new_4 2198
+#define wxPalette_destruct 2200
+#define wxPalette_Create 2201
+#define wxPalette_GetColoursCount 2202
+#define wxPalette_GetPixel 2203
+#define wxPalette_GetRGB 2204
+#define wxPalette_IsOk 2205
+#define wxDirDialog_new 2209
+#define wxDirDialog_destruct 2210
+#define wxDirDialog_GetPath 2211
+#define wxDirDialog_GetMessage 2212
+#define wxDirDialog_SetMessage 2213
+#define wxDirDialog_SetPath 2214
+#define wxFileDialog_new 2218
+#define wxFileDialog_destruct 2219
+#define wxFileDialog_GetDirectory 2220
+#define wxFileDialog_GetFilename 2221
+#define wxFileDialog_GetFilenames 2222
+#define wxFileDialog_GetFilterIndex 2223
+#define wxFileDialog_GetMessage 2224
+#define wxFileDialog_GetPath 2225
+#define wxFileDialog_GetPaths 2226
+#define wxFileDialog_GetWildcard 2227
+#define wxFileDialog_SetDirectory 2228
+#define wxFileDialog_SetFilename 2229
+#define wxFileDialog_SetFilterIndex 2230
+#define wxFileDialog_SetMessage 2231
+#define wxFileDialog_SetPath 2232
+#define wxFileDialog_SetWildcard 2233
+#define wxPickerBase_SetInternalMargin 2234
+#define wxPickerBase_GetInternalMargin 2235
+#define wxPickerBase_SetTextCtrlProportion 2236
+#define wxPickerBase_SetPickerCtrlProportion 2237
+#define wxPickerBase_GetTextCtrlProportion 2238
+#define wxPickerBase_GetPickerCtrlProportion 2239
+#define wxPickerBase_HasTextCtrl 2240
+#define wxPickerBase_GetTextCtrl 2241
+#define wxPickerBase_IsTextCtrlGrowable 2242
+#define wxPickerBase_SetPickerCtrlGrowable 2243
+#define wxPickerBase_SetTextCtrlGrowable 2244
+#define wxPickerBase_IsPickerCtrlGrowable 2245
+#define wxFilePickerCtrl_new_0 2246
+#define wxFilePickerCtrl_new_3 2247
+#define wxFilePickerCtrl_Create 2248
+#define wxFilePickerCtrl_GetPath 2249
+#define wxFilePickerCtrl_SetPath 2250
+#define wxFilePickerCtrl_destroy 2251
+#define wxDirPickerCtrl_new_0 2252
+#define wxDirPickerCtrl_new_3 2253
+#define wxDirPickerCtrl_Create 2254
+#define wxDirPickerCtrl_GetPath 2255
+#define wxDirPickerCtrl_SetPath 2256
+#define wxDirPickerCtrl_destroy 2257
+#define wxColourPickerCtrl_new_0 2258
+#define wxColourPickerCtrl_new_3 2259
+#define wxColourPickerCtrl_Create 2260
+#define wxColourPickerCtrl_GetColour 2261
+#define wxColourPickerCtrl_SetColour_1_1 2262
+#define wxColourPickerCtrl_SetColour_1_0 2263
+#define wxColourPickerCtrl_destroy 2264
+#define wxDatePickerCtrl_new_0 2265
+#define wxDatePickerCtrl_new_3 2266
+#define wxDatePickerCtrl_GetRange 2267
+#define wxDatePickerCtrl_GetValue 2268
+#define wxDatePickerCtrl_SetRange 2269
+#define wxDatePickerCtrl_SetValue 2270
+#define wxDatePickerCtrl_destroy 2271
+#define wxFontPickerCtrl_new_0 2272
+#define wxFontPickerCtrl_new_3 2273
+#define wxFontPickerCtrl_Create 2274
+#define wxFontPickerCtrl_GetSelectedFont 2275
+#define wxFontPickerCtrl_SetSelectedFont 2276
+#define wxFontPickerCtrl_GetMaxPointSize 2277
+#define wxFontPickerCtrl_SetMaxPointSize 2278
+#define wxFontPickerCtrl_destroy 2279
+#define wxFindReplaceDialog_new_0 2282
+#define wxFindReplaceDialog_new_4 2283
+#define wxFindReplaceDialog_destruct 2284
+#define wxFindReplaceDialog_Create 2285
+#define wxFindReplaceDialog_GetData 2286
+#define wxFindReplaceData_new_0 2287
+#define wxFindReplaceData_new_1 2288
+#define wxFindReplaceData_GetFindString 2289
+#define wxFindReplaceData_GetReplaceString 2290
+#define wxFindReplaceData_GetFlags 2291
+#define wxFindReplaceData_SetFlags 2292
+#define wxFindReplaceData_SetFindString 2293
+#define wxFindReplaceData_SetReplaceString 2294
+#define wxFindReplaceData_destroy 2295
+#define wxMultiChoiceDialog_new_0 2296
+#define wxMultiChoiceDialog_new_5 2298
+#define wxMultiChoiceDialog_GetSelections 2299
+#define wxMultiChoiceDialog_SetSelections 2300
+#define wxMultiChoiceDialog_destroy 2301
+#define wxSingleChoiceDialog_new_0 2302
+#define wxSingleChoiceDialog_new_5 2304
+#define wxSingleChoiceDialog_GetSelection 2305
+#define wxSingleChoiceDialog_GetStringSelection 2306
+#define wxSingleChoiceDialog_SetSelection 2307
+#define wxSingleChoiceDialog_destroy 2308
+#define wxTextEntryDialog_new 2309
+#define wxTextEntryDialog_GetValue 2310
+#define wxTextEntryDialog_SetValue 2311
+#define wxTextEntryDialog_destroy 2312
+#define wxPasswordEntryDialog_new 2313
+#define wxPasswordEntryDialog_destroy 2314
+#define wxFontData_new_0 2315
+#define wxFontData_new_1 2316
+#define wxFontData_destruct 2317
+#define wxFontData_EnableEffects 2318
+#define wxFontData_GetAllowSymbols 2319
+#define wxFontData_GetColour 2320
+#define wxFontData_GetChosenFont 2321
+#define wxFontData_GetEnableEffects 2322
+#define wxFontData_GetInitialFont 2323
+#define wxFontData_GetShowHelp 2324
+#define wxFontData_SetAllowSymbols 2325
+#define wxFontData_SetChosenFont 2326
+#define wxFontData_SetColour 2327
+#define wxFontData_SetInitialFont 2328
+#define wxFontData_SetRange 2329
+#define wxFontData_SetShowHelp 2330
+#define wxFontDialog_new_0 2334
+#define wxFontDialog_new_2 2336
+#define wxFontDialog_Create 2338
+#define wxFontDialog_GetFontData 2339
+#define wxFontDialog_destroy 2341
+#define wxProgressDialog_new 2342
+#define wxProgressDialog_destruct 2343
+#define wxProgressDialog_Resume 2344
+#define wxProgressDialog_Update_2 2345
+#define wxProgressDialog_Update_0 2346
+#define wxMessageDialog_new 2347
+#define wxMessageDialog_destruct 2348
+#define wxPageSetupDialog_new 2349
+#define wxPageSetupDialog_destruct 2350
+#define wxPageSetupDialog_GetPageSetupData 2351
+#define wxPageSetupDialog_ShowModal 2352
+#define wxPageSetupDialogData_new_0 2353
+#define wxPageSetupDialogData_new_1_0 2354
+#define wxPageSetupDialogData_new_1_1 2355
+#define wxPageSetupDialogData_destruct 2356
+#define wxPageSetupDialogData_EnableHelp 2357
+#define wxPageSetupDialogData_EnableMargins 2358
+#define wxPageSetupDialogData_EnableOrientation 2359
+#define wxPageSetupDialogData_EnablePaper 2360
+#define wxPageSetupDialogData_EnablePrinter 2361
+#define wxPageSetupDialogData_GetDefaultMinMargins 2362
+#define wxPageSetupDialogData_GetEnableMargins 2363
+#define wxPageSetupDialogData_GetEnableOrientation 2364
+#define wxPageSetupDialogData_GetEnablePaper 2365
+#define wxPageSetupDialogData_GetEnablePrinter 2366
+#define wxPageSetupDialogData_GetEnableHelp 2367
+#define wxPageSetupDialogData_GetDefaultInfo 2368
+#define wxPageSetupDialogData_GetMarginTopLeft 2369
+#define wxPageSetupDialogData_GetMarginBottomRight 2370
+#define wxPageSetupDialogData_GetMinMarginTopLeft 2371
+#define wxPageSetupDialogData_GetMinMarginBottomRight 2372
+#define wxPageSetupDialogData_GetPaperId 2373
+#define wxPageSetupDialogData_GetPaperSize 2374
+#define wxPageSetupDialogData_GetPrintData 2376
+#define wxPageSetupDialogData_IsOk 2377
+#define wxPageSetupDialogData_SetDefaultInfo 2378
+#define wxPageSetupDialogData_SetDefaultMinMargins 2379
+#define wxPageSetupDialogData_SetMarginTopLeft 2380
+#define wxPageSetupDialogData_SetMarginBottomRight 2381
+#define wxPageSetupDialogData_SetMinMarginTopLeft 2382
+#define wxPageSetupDialogData_SetMinMarginBottomRight 2383
+#define wxPageSetupDialogData_SetPaperId 2384
+#define wxPageSetupDialogData_SetPaperSize_1_1 2385
+#define wxPageSetupDialogData_SetPaperSize_1_0 2386
+#define wxPageSetupDialogData_SetPrintData 2387
+#define wxPrintDialog_new_2_0 2388
+#define wxPrintDialog_new_2_1 2389
+#define wxPrintDialog_destruct 2390
+#define wxPrintDialog_GetPrintDialogData 2391
+#define wxPrintDialog_GetPrintDC 2392
+#define wxPrintDialogData_new_0 2393
+#define wxPrintDialogData_new_1_1 2394
+#define wxPrintDialogData_new_1_0 2395
+#define wxPrintDialogData_destruct 2396
+#define wxPrintDialogData_EnableHelp 2397
+#define wxPrintDialogData_EnablePageNumbers 2398
+#define wxPrintDialogData_EnablePrintToFile 2399
+#define wxPrintDialogData_EnableSelection 2400
+#define wxPrintDialogData_GetAllPages 2401
+#define wxPrintDialogData_GetCollate 2402
+#define wxPrintDialogData_GetFromPage 2403
+#define wxPrintDialogData_GetMaxPage 2404
+#define wxPrintDialogData_GetMinPage 2405
+#define wxPrintDialogData_GetNoCopies 2406
+#define wxPrintDialogData_GetPrintData 2407
+#define wxPrintDialogData_GetPrintToFile 2408
+#define wxPrintDialogData_GetSelection 2409
+#define wxPrintDialogData_GetToPage 2410
+#define wxPrintDialogData_IsOk 2411
+#define wxPrintDialogData_SetCollate 2412
+#define wxPrintDialogData_SetFromPage 2413
+#define wxPrintDialogData_SetMaxPage 2414
+#define wxPrintDialogData_SetMinPage 2415
+#define wxPrintDialogData_SetNoCopies 2416
+#define wxPrintDialogData_SetPrintData 2417
+#define wxPrintDialogData_SetPrintToFile 2418
+#define wxPrintDialogData_SetSelection 2419
+#define wxPrintDialogData_SetToPage 2420
+#define wxPrintData_new_0 2421
+#define wxPrintData_new_1 2422
+#define wxPrintData_destruct 2423
+#define wxPrintData_GetCollate 2424
+#define wxPrintData_GetBin 2425
+#define wxPrintData_GetColour 2426
+#define wxPrintData_GetDuplex 2427
+#define wxPrintData_GetNoCopies 2428
+#define wxPrintData_GetOrientation 2429
+#define wxPrintData_GetPaperId 2430
+#define wxPrintData_GetPrinterName 2431
+#define wxPrintData_GetQuality 2432
+#define wxPrintData_IsOk 2433
+#define wxPrintData_SetBin 2434
+#define wxPrintData_SetCollate 2435
+#define wxPrintData_SetColour 2436
+#define wxPrintData_SetDuplex 2437
+#define wxPrintData_SetNoCopies 2438
+#define wxPrintData_SetOrientation 2439
+#define wxPrintData_SetPaperId 2440
+#define wxPrintData_SetPrinterName 2441
+#define wxPrintData_SetQuality 2442
+#define wxPrintPreview_new_2 2445
+#define wxPrintPreview_new_3 2446
+#define wxPrintPreview_destruct 2448
+#define wxPrintPreview_GetCanvas 2449
+#define wxPrintPreview_GetCurrentPage 2450
+#define wxPrintPreview_GetFrame 2451
+#define wxPrintPreview_GetMaxPage 2452
+#define wxPrintPreview_GetMinPage 2453
+#define wxPrintPreview_GetPrintout 2454
+#define wxPrintPreview_GetPrintoutForPrinting 2455
+#define wxPrintPreview_IsOk 2456
+#define wxPrintPreview_PaintPage 2457
+#define wxPrintPreview_Print 2458
+#define wxPrintPreview_RenderPage 2459
+#define wxPrintPreview_SetCanvas 2460
+#define wxPrintPreview_SetCurrentPage 2461
+#define wxPrintPreview_SetFrame 2462
+#define wxPrintPreview_SetPrintout 2463
+#define wxPrintPreview_SetZoom 2464
+#define wxPreviewFrame_new 2465
+#define wxPreviewFrame_destruct 2466
+#define wxPreviewFrame_CreateControlBar 2467
+#define wxPreviewFrame_CreateCanvas 2468
+#define wxPreviewFrame_Initialize 2469
+#define wxPreviewFrame_OnCloseWindow 2470
+#define wxPreviewControlBar_new 2471
+#define wxPreviewControlBar_destruct 2472
+#define wxPreviewControlBar_CreateButtons 2473
+#define wxPreviewControlBar_GetPrintPreview 2474
+#define wxPreviewControlBar_GetZoomControl 2475
+#define wxPreviewControlBar_SetZoomControl 2476
+#define wxPrinter_new 2478
+#define wxPrinter_CreateAbortWindow 2479
+#define wxPrinter_GetAbort 2480
+#define wxPrinter_GetLastError 2481
+#define wxPrinter_GetPrintDialogData 2482
+#define wxPrinter_Print 2483
+#define wxPrinter_PrintDialog 2484
+#define wxPrinter_ReportError 2485
+#define wxPrinter_Setup 2486
+#define wxPrinter_destroy 2487
+#define wxXmlResource_new_1 2488
+#define wxXmlResource_new_2 2489
+#define wxXmlResource_destruct 2490
+#define wxXmlResource_AttachUnknownControl 2491
+#define wxXmlResource_ClearHandlers 2492
+#define wxXmlResource_CompareVersion 2493
+#define wxXmlResource_Get 2494
+#define wxXmlResource_GetFlags 2495
+#define wxXmlResource_GetVersion 2496
+#define wxXmlResource_GetXRCID 2497
+#define wxXmlResource_InitAllHandlers 2498
+#define wxXmlResource_Load 2499
+#define wxXmlResource_LoadBitmap 2500
+#define wxXmlResource_LoadDialog_2 2501
+#define wxXmlResource_LoadDialog_3 2502
+#define wxXmlResource_LoadFrame_2 2503
+#define wxXmlResource_LoadFrame_3 2504
+#define wxXmlResource_LoadIcon 2505
+#define wxXmlResource_LoadMenu 2506
+#define wxXmlResource_LoadMenuBar_2 2507
+#define wxXmlResource_LoadMenuBar_1 2508
+#define wxXmlResource_LoadPanel_2 2509
+#define wxXmlResource_LoadPanel_3 2510
+#define wxXmlResource_LoadToolBar 2511
+#define wxXmlResource_Set 2512
+#define wxXmlResource_SetFlags 2513
+#define wxXmlResource_Unload 2514
+#define wxXmlResource_xrcctrl 2515
+#define wxHtmlEasyPrinting_new 2516
+#define wxHtmlEasyPrinting_destruct 2517
+#define wxHtmlEasyPrinting_GetPrintData 2518
+#define wxHtmlEasyPrinting_GetPageSetupData 2519
+#define wxHtmlEasyPrinting_PreviewFile 2520
+#define wxHtmlEasyPrinting_PreviewText 2521
+#define wxHtmlEasyPrinting_PrintFile 2522
+#define wxHtmlEasyPrinting_PrintText 2523
+#define wxHtmlEasyPrinting_PageSetup 2524
+#define wxHtmlEasyPrinting_SetFonts 2525
+#define wxHtmlEasyPrinting_SetHeader 2526
+#define wxHtmlEasyPrinting_SetFooter 2527
+#define wxGLCanvas_new_2 2529
+#define wxGLCanvas_new_3_1 2530
+#define wxGLCanvas_new_3_0 2531
+#define wxGLCanvas_GetContext 2532
+#define wxGLCanvas_SetCurrent 2534
+#define wxGLCanvas_SwapBuffers 2535
+#define wxGLCanvas_destroy 2536
+#define wxAuiManager_new 2537
+#define wxAuiManager_destruct 2538
+#define wxAuiManager_AddPane_2_1 2539
+#define wxAuiManager_AddPane_3 2540
+#define wxAuiManager_AddPane_2_0 2541
+#define wxAuiManager_DetachPane 2542
+#define wxAuiManager_GetAllPanes 2543
+#define wxAuiManager_GetArtProvider 2544
+#define wxAuiManager_GetDockSizeConstraint 2545
+#define wxAuiManager_GetFlags 2546
+#define wxAuiManager_GetManagedWindow 2547
+#define wxAuiManager_GetManager 2548
+#define wxAuiManager_GetPane_1_1 2549
+#define wxAuiManager_GetPane_1_0 2550
+#define wxAuiManager_HideHint 2551
+#define wxAuiManager_InsertPane 2552
+#define wxAuiManager_LoadPaneInfo 2553
+#define wxAuiManager_LoadPerspective 2554
+#define wxAuiManager_SavePaneInfo 2555
+#define wxAuiManager_SavePerspective 2556
+#define wxAuiManager_SetArtProvider 2557
+#define wxAuiManager_SetDockSizeConstraint 2558
+#define wxAuiManager_SetFlags 2559
+#define wxAuiManager_SetManagedWindow 2560
+#define wxAuiManager_ShowHint 2561
+#define wxAuiManager_UnInit 2562
+#define wxAuiManager_Update 2563
+#define wxAuiPaneInfo_new_0 2564
+#define wxAuiPaneInfo_new_1 2565
+#define wxAuiPaneInfo_destruct 2566
+#define wxAuiPaneInfo_BestSize_1 2567
+#define wxAuiPaneInfo_BestSize_2 2568
+#define wxAuiPaneInfo_Bottom 2569
+#define wxAuiPaneInfo_BottomDockable 2570
+#define wxAuiPaneInfo_Caption 2571
+#define wxAuiPaneInfo_CaptionVisible 2572
+#define wxAuiPaneInfo_Centre 2573
+#define wxAuiPaneInfo_CentrePane 2574
+#define wxAuiPaneInfo_CloseButton 2575
+#define wxAuiPaneInfo_DefaultPane 2576
+#define wxAuiPaneInfo_DestroyOnClose 2577
+#define wxAuiPaneInfo_Direction 2578
+#define wxAuiPaneInfo_Dock 2579
+#define wxAuiPaneInfo_Dockable 2580
+#define wxAuiPaneInfo_Fixed 2581
+#define wxAuiPaneInfo_Float 2582
+#define wxAuiPaneInfo_Floatable 2583
+#define wxAuiPaneInfo_FloatingPosition_1 2584
+#define wxAuiPaneInfo_FloatingPosition_2 2585
+#define wxAuiPaneInfo_FloatingSize_1 2586
+#define wxAuiPaneInfo_FloatingSize_2 2587
+#define wxAuiPaneInfo_Gripper 2588
+#define wxAuiPaneInfo_GripperTop 2589
+#define wxAuiPaneInfo_HasBorder 2590
+#define wxAuiPaneInfo_HasCaption 2591
+#define wxAuiPaneInfo_HasCloseButton 2592
+#define wxAuiPaneInfo_HasFlag 2593
+#define wxAuiPaneInfo_HasGripper 2594
+#define wxAuiPaneInfo_HasGripperTop 2595
+#define wxAuiPaneInfo_HasMaximizeButton 2596
+#define wxAuiPaneInfo_HasMinimizeButton 2597
+#define wxAuiPaneInfo_HasPinButton 2598
+#define wxAuiPaneInfo_Hide 2599
+#define wxAuiPaneInfo_IsBottomDockable 2600
+#define wxAuiPaneInfo_IsDocked 2601
+#define wxAuiPaneInfo_IsFixed 2602
+#define wxAuiPaneInfo_IsFloatable 2603
+#define wxAuiPaneInfo_IsFloating 2604
+#define wxAuiPaneInfo_IsLeftDockable 2605
+#define wxAuiPaneInfo_IsMovable 2606
+#define wxAuiPaneInfo_IsOk 2607
+#define wxAuiPaneInfo_IsResizable 2608
+#define wxAuiPaneInfo_IsRightDockable 2609
+#define wxAuiPaneInfo_IsShown 2610
+#define wxAuiPaneInfo_IsToolbar 2611
+#define wxAuiPaneInfo_IsTopDockable 2612
+#define wxAuiPaneInfo_Layer 2613
+#define wxAuiPaneInfo_Left 2614
+#define wxAuiPaneInfo_LeftDockable 2615
+#define wxAuiPaneInfo_MaxSize_1 2616
+#define wxAuiPaneInfo_MaxSize_2 2617
+#define wxAuiPaneInfo_MaximizeButton 2618
+#define wxAuiPaneInfo_MinSize_1 2619
+#define wxAuiPaneInfo_MinSize_2 2620
+#define wxAuiPaneInfo_MinimizeButton 2621
+#define wxAuiPaneInfo_Movable 2622
+#define wxAuiPaneInfo_Name 2623
+#define wxAuiPaneInfo_PaneBorder 2624
+#define wxAuiPaneInfo_PinButton 2625
+#define wxAuiPaneInfo_Position 2626
+#define wxAuiPaneInfo_Resizable 2627
+#define wxAuiPaneInfo_Right 2628
+#define wxAuiPaneInfo_RightDockable 2629
+#define wxAuiPaneInfo_Row 2630
+#define wxAuiPaneInfo_SafeSet 2631
+#define wxAuiPaneInfo_SetFlag 2632
+#define wxAuiPaneInfo_Show 2633
+#define wxAuiPaneInfo_ToolbarPane 2634
+#define wxAuiPaneInfo_Top 2635
+#define wxAuiPaneInfo_TopDockable 2636
+#define wxAuiPaneInfo_Window 2637
+#define wxAuiNotebook_new_0 2638
+#define wxAuiNotebook_new_2 2639
+#define wxAuiNotebook_AddPage 2640
+#define wxAuiNotebook_Create 2641
+#define wxAuiNotebook_DeletePage 2642
+#define wxAuiNotebook_GetArtProvider 2643
+#define wxAuiNotebook_GetPage 2644
+#define wxAuiNotebook_GetPageBitmap 2645
+#define wxAuiNotebook_GetPageCount 2646
+#define wxAuiNotebook_GetPageIndex 2647
+#define wxAuiNotebook_GetPageText 2648
+#define wxAuiNotebook_GetSelection 2649
+#define wxAuiNotebook_InsertPage 2650
+#define wxAuiNotebook_RemovePage 2651
+#define wxAuiNotebook_SetArtProvider 2652
+#define wxAuiNotebook_SetFont 2653
+#define wxAuiNotebook_SetPageBitmap 2654
+#define wxAuiNotebook_SetPageText 2655
+#define wxAuiNotebook_SetSelection 2656
+#define wxAuiNotebook_SetTabCtrlHeight 2657
+#define wxAuiNotebook_SetUniformBitmapSize 2658
+#define wxAuiNotebook_destroy 2659
+#define wxMDIParentFrame_new_0 2660
+#define wxMDIParentFrame_new_4 2661
+#define wxMDIParentFrame_destruct 2662
+#define wxMDIParentFrame_ActivateNext 2663
+#define wxMDIParentFrame_ActivatePrevious 2664
+#define wxMDIParentFrame_ArrangeIcons 2665
+#define wxMDIParentFrame_Cascade 2666
+#define wxMDIParentFrame_Create 2667
+#define wxMDIParentFrame_GetActiveChild 2668
+#define wxMDIParentFrame_GetClientWindow 2669
+#define wxMDIParentFrame_Tile 2670
+#define wxMDIChildFrame_new_0 2671
+#define wxMDIChildFrame_new_4 2672
+#define wxMDIChildFrame_destruct 2673
+#define wxMDIChildFrame_Activate 2674
+#define wxMDIChildFrame_Create 2675
+#define wxMDIChildFrame_Maximize 2676
+#define wxMDIChildFrame_Restore 2677
+#define wxMDIClientWindow_new_0 2678
+#define wxMDIClientWindow_new_2 2679
+#define wxMDIClientWindow_destruct 2680
+#define wxMDIClientWindow_CreateClient 2681
+#define wxLayoutAlgorithm_new 2682
+#define wxLayoutAlgorithm_LayoutFrame 2683
+#define wxLayoutAlgorithm_LayoutMDIFrame 2684
+#define wxLayoutAlgorithm_LayoutWindow 2685
+#define wxLayoutAlgorithm_destroy 2686
+#define wxEvent_GetId 2687
+#define wxEvent_GetSkipped 2688
+#define wxEvent_GetTimestamp 2689
+#define wxEvent_IsCommandEvent 2690
+#define wxEvent_ResumePropagation 2691
+#define wxEvent_ShouldPropagate 2692
+#define wxEvent_Skip 2693
+#define wxEvent_StopPropagation 2694
+#define wxCommandEvent_getClientData 2695
+#define wxCommandEvent_GetExtraLong 2696
+#define wxCommandEvent_GetInt 2697
+#define wxCommandEvent_GetSelection 2698
+#define wxCommandEvent_GetString 2699
+#define wxCommandEvent_IsChecked 2700
+#define wxCommandEvent_IsSelection 2701
+#define wxCommandEvent_SetInt 2702
+#define wxCommandEvent_SetString 2703
+#define wxScrollEvent_GetOrientation 2704
+#define wxScrollEvent_GetPosition 2705
+#define wxScrollWinEvent_GetOrientation 2706
+#define wxScrollWinEvent_GetPosition 2707
+#define wxMouseEvent_AltDown 2708
+#define wxMouseEvent_Button 2709
+#define wxMouseEvent_ButtonDClick 2710
+#define wxMouseEvent_ButtonDown 2711
+#define wxMouseEvent_ButtonUp 2712
+#define wxMouseEvent_CmdDown 2713
+#define wxMouseEvent_ControlDown 2714
+#define wxMouseEvent_Dragging 2715
+#define wxMouseEvent_Entering 2716
+#define wxMouseEvent_GetButton 2717
+#define wxMouseEvent_GetPosition 2720
+#define wxMouseEvent_GetLogicalPosition 2721
+#define wxMouseEvent_GetLinesPerAction 2722
+#define wxMouseEvent_GetWheelRotation 2723
+#define wxMouseEvent_GetWheelDelta 2724
+#define wxMouseEvent_GetX 2725
+#define wxMouseEvent_GetY 2726
+#define wxMouseEvent_IsButton 2727
+#define wxMouseEvent_IsPageScroll 2728
+#define wxMouseEvent_Leaving 2729
+#define wxMouseEvent_LeftDClick 2730
+#define wxMouseEvent_LeftDown 2731
+#define wxMouseEvent_LeftIsDown 2732
+#define wxMouseEvent_LeftUp 2733
+#define wxMouseEvent_MetaDown 2734
+#define wxMouseEvent_MiddleDClick 2735
+#define wxMouseEvent_MiddleDown 2736
+#define wxMouseEvent_MiddleIsDown 2737
+#define wxMouseEvent_MiddleUp 2738
+#define wxMouseEvent_Moving 2739
+#define wxMouseEvent_RightDClick 2740
+#define wxMouseEvent_RightDown 2741
+#define wxMouseEvent_RightIsDown 2742
+#define wxMouseEvent_RightUp 2743
+#define wxMouseEvent_ShiftDown 2744
+#define wxSetCursorEvent_GetCursor 2745
+#define wxSetCursorEvent_GetX 2746
+#define wxSetCursorEvent_GetY 2747
+#define wxSetCursorEvent_HasCursor 2748
+#define wxSetCursorEvent_SetCursor 2749
+#define wxKeyEvent_AltDown 2750
+#define wxKeyEvent_CmdDown 2751
+#define wxKeyEvent_ControlDown 2752
+#define wxKeyEvent_GetKeyCode 2753
+#define wxKeyEvent_GetModifiers 2754
+#define wxKeyEvent_GetPosition 2757
+#define wxKeyEvent_GetRawKeyCode 2758
+#define wxKeyEvent_GetRawKeyFlags 2759
+#define wxKeyEvent_GetUnicodeKey 2760
+#define wxKeyEvent_GetX 2761
+#define wxKeyEvent_GetY 2762
+#define wxKeyEvent_HasModifiers 2763
+#define wxKeyEvent_MetaDown 2764
+#define wxKeyEvent_ShiftDown 2765
+#define wxSizeEvent_GetSize 2766
+#define wxMoveEvent_GetPosition 2767
+#define wxEraseEvent_GetDC 2768
+#define wxFocusEvent_GetWindow 2769
+#define wxChildFocusEvent_GetWindow 2770
+#define wxMenuEvent_GetMenu 2771
+#define wxMenuEvent_GetMenuId 2772
+#define wxMenuEvent_IsPopup 2773
+#define wxCloseEvent_CanVeto 2774
+#define wxCloseEvent_GetLoggingOff 2775
+#define wxCloseEvent_SetCanVeto 2776
+#define wxCloseEvent_SetLoggingOff 2777
+#define wxCloseEvent_Veto 2778
+#define wxShowEvent_SetShow 2779
+#define wxShowEvent_GetShow 2780
+#define wxIconizeEvent_Iconized 2781
+#define wxJoystickEvent_ButtonDown 2782
+#define wxJoystickEvent_ButtonIsDown 2783
+#define wxJoystickEvent_ButtonUp 2784
+#define wxJoystickEvent_GetButtonChange 2785
+#define wxJoystickEvent_GetButtonState 2786
+#define wxJoystickEvent_GetJoystick 2787
+#define wxJoystickEvent_GetPosition 2788
+#define wxJoystickEvent_GetZPosition 2789
+#define wxJoystickEvent_IsButton 2790
+#define wxJoystickEvent_IsMove 2791
+#define wxJoystickEvent_IsZMove 2792
+#define wxUpdateUIEvent_CanUpdate 2793
+#define wxUpdateUIEvent_Check 2794
+#define wxUpdateUIEvent_Enable 2795
+#define wxUpdateUIEvent_Show 2796
+#define wxUpdateUIEvent_GetChecked 2797
+#define wxUpdateUIEvent_GetEnabled 2798
+#define wxUpdateUIEvent_GetShown 2799
+#define wxUpdateUIEvent_GetSetChecked 2800
+#define wxUpdateUIEvent_GetSetEnabled 2801
+#define wxUpdateUIEvent_GetSetShown 2802
+#define wxUpdateUIEvent_GetSetText 2803
+#define wxUpdateUIEvent_GetText 2804
+#define wxUpdateUIEvent_GetMode 2805
+#define wxUpdateUIEvent_GetUpdateInterval 2806
+#define wxUpdateUIEvent_ResetUpdateTime 2807
+#define wxUpdateUIEvent_SetMode 2808
+#define wxUpdateUIEvent_SetText 2809
+#define wxUpdateUIEvent_SetUpdateInterval 2810
+#define wxMouseCaptureChangedEvent_GetCapturedWindow 2811
+#define wxPaletteChangedEvent_SetChangedWindow 2812
+#define wxPaletteChangedEvent_GetChangedWindow 2813
+#define wxQueryNewPaletteEvent_SetPaletteRealized 2814
+#define wxQueryNewPaletteEvent_GetPaletteRealized 2815
+#define wxNavigationKeyEvent_GetDirection 2816
+#define wxNavigationKeyEvent_SetDirection 2817
+#define wxNavigationKeyEvent_IsWindowChange 2818
+#define wxNavigationKeyEvent_SetWindowChange 2819
+#define wxNavigationKeyEvent_IsFromTab 2820
+#define wxNavigationKeyEvent_SetFromTab 2821
+#define wxNavigationKeyEvent_GetCurrentFocus 2822
+#define wxNavigationKeyEvent_SetCurrentFocus 2823
+#define wxHelpEvent_GetOrigin 2824
+#define wxHelpEvent_GetPosition 2825
+#define wxHelpEvent_SetOrigin 2826
+#define wxHelpEvent_SetPosition 2827
+#define wxContextMenuEvent_GetPosition 2828
+#define wxContextMenuEvent_SetPosition 2829
+#define wxIdleEvent_CanSend 2830
+#define wxIdleEvent_GetMode 2831
+#define wxIdleEvent_RequestMore 2832
+#define wxIdleEvent_MoreRequested 2833
+#define wxIdleEvent_SetMode 2834
+#define wxGridEvent_AltDown 2835
+#define wxGridEvent_ControlDown 2836
+#define wxGridEvent_GetCol 2837
+#define wxGridEvent_GetPosition 2838
+#define wxGridEvent_GetRow 2839
+#define wxGridEvent_MetaDown 2840
+#define wxGridEvent_Selecting 2841
+#define wxGridEvent_ShiftDown 2842
+#define wxNotifyEvent_Allow 2843
+#define wxNotifyEvent_IsAllowed 2844
+#define wxNotifyEvent_Veto 2845
+#define wxSashEvent_GetEdge 2846
+#define wxSashEvent_GetDragRect 2847
+#define wxSashEvent_GetDragStatus 2848
+#define wxListEvent_GetCacheFrom 2849
+#define wxListEvent_GetCacheTo 2850
+#define wxListEvent_GetKeyCode 2851
+#define wxListEvent_GetIndex 2852
+#define wxListEvent_GetColumn 2853
+#define wxListEvent_GetPoint 2854
+#define wxListEvent_GetLabel 2855
+#define wxListEvent_GetText 2856
+#define wxListEvent_GetImage 2857
+#define wxListEvent_GetData 2858
+#define wxListEvent_GetMask 2859
+#define wxListEvent_GetItem 2860
+#define wxListEvent_IsEditCancelled 2861
+#define wxDateEvent_GetDate 2862
+#define wxCalendarEvent_GetWeekDay 2863
+#define wxFileDirPickerEvent_GetPath 2864
+#define wxColourPickerEvent_GetColour 2865
+#define wxFontPickerEvent_GetFont 2866
+#define wxStyledTextEvent_GetPosition 2867
+#define wxStyledTextEvent_GetKey 2868
+#define wxStyledTextEvent_GetModifiers 2869
+#define wxStyledTextEvent_GetModificationType 2870
+#define wxStyledTextEvent_GetText 2871
+#define wxStyledTextEvent_GetLength 2872
+#define wxStyledTextEvent_GetLinesAdded 2873
+#define wxStyledTextEvent_GetLine 2874
+#define wxStyledTextEvent_GetFoldLevelNow 2875
+#define wxStyledTextEvent_GetFoldLevelPrev 2876
+#define wxStyledTextEvent_GetMargin 2877
+#define wxStyledTextEvent_GetMessage 2878
+#define wxStyledTextEvent_GetWParam 2879
+#define wxStyledTextEvent_GetLParam 2880
+#define wxStyledTextEvent_GetListType 2881
+#define wxStyledTextEvent_GetX 2882
+#define wxStyledTextEvent_GetY 2883
+#define wxStyledTextEvent_GetDragText 2884
+#define wxStyledTextEvent_GetDragAllowMove 2885
+#define wxStyledTextEvent_GetDragResult 2886
+#define wxStyledTextEvent_GetShift 2887
+#define wxStyledTextEvent_GetControl 2888
+#define wxStyledTextEvent_GetAlt 2889
+#define utils_wxGetKeyState 2890
+#define utils_wxGetMousePosition 2891
+#define utils_wxGetMouseState 2892
+#define utils_wxSetDetectableAutoRepeat 2893
+#define utils_wxBell 2894
+#define utils_wxFindMenuItemId 2895
+#define utils_wxGenericFindWindowAtPoint 2896
+#define utils_wxFindWindowAtPoint 2897
+#define utils_wxBeginBusyCursor 2898
+#define utils_wxEndBusyCursor 2899
+#define utils_wxIsBusy 2900
+#define utils_wxShutdown 2901
+#define utils_wxShell 2902
+#define utils_wxLaunchDefaultBrowser 2903
+#define utils_wxGetEmailAddress 2904
+#define utils_wxGetUserId 2905
+#define utils_wxGetHomeDir 2906
+#define utils_wxNewId 2907
+#define utils_wxRegisterId 2908
+#define utils_wxGetCurrentId 2909
+#define utils_wxGetOsDescription 2910
+#define utils_wxIsPlatformLittleEndian 2911
+#define utils_wxIsPlatform64Bit 2912
+#define wxPrintout_new 2913
+#define wxPrintout_destruct 2914
+#define wxPrintout_GetDC 2915
+#define wxPrintout_GetPageSizeMM 2916
+#define wxPrintout_GetPageSizePixels 2917
+#define wxPrintout_GetPaperRectPixels 2918
+#define wxPrintout_GetPPIPrinter 2919
+#define wxPrintout_GetPPIScreen 2920
+#define wxPrintout_GetTitle 2921
+#define wxPrintout_IsPreview 2922
+#define wxPrintout_FitThisSizeToPaper 2923
+#define wxPrintout_FitThisSizeToPage 2924
+#define wxPrintout_FitThisSizeToPageMargins 2925
+#define wxPrintout_MapScreenSizeToPaper 2926
+#define wxPrintout_MapScreenSizeToPage 2927
+#define wxPrintout_MapScreenSizeToPageMargins 2928
+#define wxPrintout_MapScreenSizeToDevice 2929
+#define wxPrintout_GetLogicalPaperRect 2930
+#define wxPrintout_GetLogicalPageRect 2931
+#define wxPrintout_GetLogicalPageMarginsRect 2932
+#define wxPrintout_SetLogicalOrigin 2933
+#define wxPrintout_OffsetLogicalOrigin 2934
+#define wxStyledTextCtrl_new_2 2935
+#define wxStyledTextCtrl_new_0 2936
+#define wxStyledTextCtrl_destruct 2937
+#define wxStyledTextCtrl_Create 2938
+#define wxStyledTextCtrl_AddText 2939
+#define wxStyledTextCtrl_AddStyledText 2940
+#define wxStyledTextCtrl_InsertText 2941
+#define wxStyledTextCtrl_ClearAll 2942
+#define wxStyledTextCtrl_ClearDocumentStyle 2943
+#define wxStyledTextCtrl_GetLength 2944
+#define wxStyledTextCtrl_GetCharAt 2945
+#define wxStyledTextCtrl_GetCurrentPos 2946
+#define wxStyledTextCtrl_GetAnchor 2947
+#define wxStyledTextCtrl_GetStyleAt 2948
+#define wxStyledTextCtrl_Redo 2949
+#define wxStyledTextCtrl_SetUndoCollection 2950
+#define wxStyledTextCtrl_SelectAll 2951
+#define wxStyledTextCtrl_SetSavePoint 2952
+#define wxStyledTextCtrl_GetStyledText 2953
+#define wxStyledTextCtrl_CanRedo 2954
+#define wxStyledTextCtrl_MarkerLineFromHandle 2955
+#define wxStyledTextCtrl_MarkerDeleteHandle 2956
+#define wxStyledTextCtrl_GetUndoCollection 2957
+#define wxStyledTextCtrl_GetViewWhiteSpace 2958
+#define wxStyledTextCtrl_SetViewWhiteSpace 2959
+#define wxStyledTextCtrl_PositionFromPoint 2960
+#define wxStyledTextCtrl_PositionFromPointClose 2961
+#define wxStyledTextCtrl_GotoLine 2962
+#define wxStyledTextCtrl_GotoPos 2963
+#define wxStyledTextCtrl_SetAnchor 2964
+#define wxStyledTextCtrl_GetCurLine 2965
+#define wxStyledTextCtrl_GetEndStyled 2966
+#define wxStyledTextCtrl_ConvertEOLs 2967
+#define wxStyledTextCtrl_GetEOLMode 2968
+#define wxStyledTextCtrl_SetEOLMode 2969
+#define wxStyledTextCtrl_StartStyling 2970
+#define wxStyledTextCtrl_SetStyling 2971
+#define wxStyledTextCtrl_GetBufferedDraw 2972
+#define wxStyledTextCtrl_SetBufferedDraw 2973
+#define wxStyledTextCtrl_SetTabWidth 2974
+#define wxStyledTextCtrl_GetTabWidth 2975
+#define wxStyledTextCtrl_SetCodePage 2976
+#define wxStyledTextCtrl_MarkerDefine 2977
+#define wxStyledTextCtrl_MarkerSetForeground 2978
+#define wxStyledTextCtrl_MarkerSetBackground 2979
+#define wxStyledTextCtrl_MarkerAdd 2980
+#define wxStyledTextCtrl_MarkerDelete 2981
+#define wxStyledTextCtrl_MarkerDeleteAll 2982
+#define wxStyledTextCtrl_MarkerGet 2983
+#define wxStyledTextCtrl_MarkerNext 2984
+#define wxStyledTextCtrl_MarkerPrevious 2985
+#define wxStyledTextCtrl_MarkerDefineBitmap 2986
+#define wxStyledTextCtrl_MarkerAddSet 2987
+#define wxStyledTextCtrl_MarkerSetAlpha 2988
+#define wxStyledTextCtrl_SetMarginType 2989
+#define wxStyledTextCtrl_GetMarginType 2990
+#define wxStyledTextCtrl_SetMarginWidth 2991
+#define wxStyledTextCtrl_GetMarginWidth 2992
+#define wxStyledTextCtrl_SetMarginMask 2993
+#define wxStyledTextCtrl_GetMarginMask 2994
+#define wxStyledTextCtrl_SetMarginSensitive 2995
+#define wxStyledTextCtrl_GetMarginSensitive 2996
+#define wxStyledTextCtrl_StyleClearAll 2997
+#define wxStyledTextCtrl_StyleSetForeground 2998
+#define wxStyledTextCtrl_StyleSetBackground 2999
+#define wxStyledTextCtrl_StyleSetBold 3000
+#define wxStyledTextCtrl_StyleSetItalic 3001
+#define wxStyledTextCtrl_StyleSetSize 3002
+#define wxStyledTextCtrl_StyleSetFaceName 3003
+#define wxStyledTextCtrl_StyleSetEOLFilled 3004
+#define wxStyledTextCtrl_StyleResetDefault 3005
+#define wxStyledTextCtrl_StyleSetUnderline 3006
+#define wxStyledTextCtrl_StyleSetCase 3007
+#define wxStyledTextCtrl_StyleSetHotSpot 3008
+#define wxStyledTextCtrl_SetSelForeground 3009
+#define wxStyledTextCtrl_SetSelBackground 3010
+#define wxStyledTextCtrl_GetSelAlpha 3011
+#define wxStyledTextCtrl_SetSelAlpha 3012
+#define wxStyledTextCtrl_SetCaretForeground 3013
+#define wxStyledTextCtrl_CmdKeyAssign 3014
+#define wxStyledTextCtrl_CmdKeyClear 3015
+#define wxStyledTextCtrl_CmdKeyClearAll 3016
+#define wxStyledTextCtrl_SetStyleBytes 3017
+#define wxStyledTextCtrl_StyleSetVisible 3018
+#define wxStyledTextCtrl_GetCaretPeriod 3019
+#define wxStyledTextCtrl_SetCaretPeriod 3020
+#define wxStyledTextCtrl_SetWordChars 3021
+#define wxStyledTextCtrl_BeginUndoAction 3022
+#define wxStyledTextCtrl_EndUndoAction 3023
+#define wxStyledTextCtrl_IndicatorSetStyle 3024
+#define wxStyledTextCtrl_IndicatorGetStyle 3025
+#define wxStyledTextCtrl_IndicatorSetForeground 3026
+#define wxStyledTextCtrl_IndicatorGetForeground 3027
+#define wxStyledTextCtrl_SetWhitespaceForeground 3028
+#define wxStyledTextCtrl_SetWhitespaceBackground 3029
+#define wxStyledTextCtrl_GetStyleBits 3030
+#define wxStyledTextCtrl_SetLineState 3031
+#define wxStyledTextCtrl_GetLineState 3032
+#define wxStyledTextCtrl_GetMaxLineState 3033
+#define wxStyledTextCtrl_GetCaretLineVisible 3034
+#define wxStyledTextCtrl_SetCaretLineVisible 3035
+#define wxStyledTextCtrl_GetCaretLineBackground 3036
+#define wxStyledTextCtrl_SetCaretLineBackground 3037
+#define wxStyledTextCtrl_AutoCompShow 3038
+#define wxStyledTextCtrl_AutoCompCancel 3039
+#define wxStyledTextCtrl_AutoCompActive 3040
+#define wxStyledTextCtrl_AutoCompPosStart 3041
+#define wxStyledTextCtrl_AutoCompComplete 3042
+#define wxStyledTextCtrl_AutoCompStops 3043
+#define wxStyledTextCtrl_AutoCompSetSeparator 3044
+#define wxStyledTextCtrl_AutoCompGetSeparator 3045
+#define wxStyledTextCtrl_AutoCompSelect 3046
+#define wxStyledTextCtrl_AutoCompSetCancelAtStart 3047
+#define wxStyledTextCtrl_AutoCompGetCancelAtStart 3048
+#define wxStyledTextCtrl_AutoCompSetFillUps 3049
+#define wxStyledTextCtrl_AutoCompSetChooseSingle 3050
+#define wxStyledTextCtrl_AutoCompGetChooseSingle 3051
+#define wxStyledTextCtrl_AutoCompSetIgnoreCase 3052
+#define wxStyledTextCtrl_AutoCompGetIgnoreCase 3053
+#define wxStyledTextCtrl_UserListShow 3054
+#define wxStyledTextCtrl_AutoCompSetAutoHide 3055
+#define wxStyledTextCtrl_AutoCompGetAutoHide 3056
+#define wxStyledTextCtrl_AutoCompSetDropRestOfWord 3057
+#define wxStyledTextCtrl_AutoCompGetDropRestOfWord 3058
+#define wxStyledTextCtrl_RegisterImage 3059
+#define wxStyledTextCtrl_ClearRegisteredImages 3060
+#define wxStyledTextCtrl_AutoCompGetTypeSeparator 3061
+#define wxStyledTextCtrl_AutoCompSetTypeSeparator 3062
+#define wxStyledTextCtrl_AutoCompSetMaxWidth 3063
+#define wxStyledTextCtrl_AutoCompGetMaxWidth 3064
+#define wxStyledTextCtrl_AutoCompSetMaxHeight 3065
+#define wxStyledTextCtrl_AutoCompGetMaxHeight 3066
+#define wxStyledTextCtrl_SetIndent 3067
+#define wxStyledTextCtrl_GetIndent 3068
+#define wxStyledTextCtrl_SetUseTabs 3069
+#define wxStyledTextCtrl_GetUseTabs 3070
+#define wxStyledTextCtrl_SetLineIndentation 3071
+#define wxStyledTextCtrl_GetLineIndentation 3072
+#define wxStyledTextCtrl_GetLineIndentPosition 3073
+#define wxStyledTextCtrl_GetColumn 3074
+#define wxStyledTextCtrl_SetUseHorizontalScrollBar 3075
+#define wxStyledTextCtrl_GetUseHorizontalScrollBar 3076
+#define wxStyledTextCtrl_SetIndentationGuides 3077
+#define wxStyledTextCtrl_GetIndentationGuides 3078
+#define wxStyledTextCtrl_SetHighlightGuide 3079
+#define wxStyledTextCtrl_GetHighlightGuide 3080
+#define wxStyledTextCtrl_GetLineEndPosition 3081
+#define wxStyledTextCtrl_GetCodePage 3082
+#define wxStyledTextCtrl_GetCaretForeground 3083
+#define wxStyledTextCtrl_GetReadOnly 3084
+#define wxStyledTextCtrl_SetCurrentPos 3085
+#define wxStyledTextCtrl_SetSelectionStart 3086
+#define wxStyledTextCtrl_GetSelectionStart 3087
+#define wxStyledTextCtrl_SetSelectionEnd 3088
+#define wxStyledTextCtrl_GetSelectionEnd 3089
+#define wxStyledTextCtrl_SetPrintMagnification 3090
+#define wxStyledTextCtrl_GetPrintMagnification 3091
+#define wxStyledTextCtrl_SetPrintColourMode 3092
+#define wxStyledTextCtrl_GetPrintColourMode 3093
+#define wxStyledTextCtrl_FindText 3094
+#define wxStyledTextCtrl_FormatRange 3095
+#define wxStyledTextCtrl_GetFirstVisibleLine 3096
+#define wxStyledTextCtrl_GetLine 3097
+#define wxStyledTextCtrl_GetLineCount 3098
+#define wxStyledTextCtrl_SetMarginLeft 3099
+#define wxStyledTextCtrl_GetMarginLeft 3100
+#define wxStyledTextCtrl_SetMarginRight 3101
+#define wxStyledTextCtrl_GetMarginRight 3102
+#define wxStyledTextCtrl_GetModify 3103
+#define wxStyledTextCtrl_SetSelection 3104
+#define wxStyledTextCtrl_GetSelectedText 3105
+#define wxStyledTextCtrl_GetTextRange 3106
+#define wxStyledTextCtrl_HideSelection 3107
+#define wxStyledTextCtrl_LineFromPosition 3108
+#define wxStyledTextCtrl_PositionFromLine 3109
+#define wxStyledTextCtrl_LineScroll 3110
+#define wxStyledTextCtrl_EnsureCaretVisible 3111
+#define wxStyledTextCtrl_ReplaceSelection 3112
+#define wxStyledTextCtrl_SetReadOnly 3113
+#define wxStyledTextCtrl_CanPaste 3114
+#define wxStyledTextCtrl_CanUndo 3115
+#define wxStyledTextCtrl_EmptyUndoBuffer 3116
+#define wxStyledTextCtrl_Undo 3117
+#define wxStyledTextCtrl_Cut 3118
+#define wxStyledTextCtrl_Copy 3119
+#define wxStyledTextCtrl_Paste 3120
+#define wxStyledTextCtrl_Clear 3121
+#define wxStyledTextCtrl_SetText 3122
+#define wxStyledTextCtrl_GetText 3123
+#define wxStyledTextCtrl_GetTextLength 3124
+#define wxStyledTextCtrl_GetOvertype 3125
+#define wxStyledTextCtrl_SetCaretWidth 3126
+#define wxStyledTextCtrl_GetCaretWidth 3127
+#define wxStyledTextCtrl_SetTargetStart 3128
+#define wxStyledTextCtrl_GetTargetStart 3129
+#define wxStyledTextCtrl_SetTargetEnd 3130
+#define wxStyledTextCtrl_GetTargetEnd 3131
+#define wxStyledTextCtrl_ReplaceTarget 3132
+#define wxStyledTextCtrl_SearchInTarget 3133
+#define wxStyledTextCtrl_SetSearchFlags 3134
+#define wxStyledTextCtrl_GetSearchFlags 3135
+#define wxStyledTextCtrl_CallTipShow 3136
+#define wxStyledTextCtrl_CallTipCancel 3137
+#define wxStyledTextCtrl_CallTipActive 3138
+#define wxStyledTextCtrl_CallTipPosAtStart 3139
+#define wxStyledTextCtrl_CallTipSetHighlight 3140
+#define wxStyledTextCtrl_CallTipSetBackground 3141
+#define wxStyledTextCtrl_CallTipSetForeground 3142
+#define wxStyledTextCtrl_CallTipSetForegroundHighlight 3143
+#define wxStyledTextCtrl_CallTipUseStyle 3144
+#define wxStyledTextCtrl_VisibleFromDocLine 3145
+#define wxStyledTextCtrl_DocLineFromVisible 3146
+#define wxStyledTextCtrl_WrapCount 3147
+#define wxStyledTextCtrl_SetFoldLevel 3148
+#define wxStyledTextCtrl_GetFoldLevel 3149
+#define wxStyledTextCtrl_GetLastChild 3150
+#define wxStyledTextCtrl_GetFoldParent 3151
+#define wxStyledTextCtrl_ShowLines 3152
+#define wxStyledTextCtrl_HideLines 3153
+#define wxStyledTextCtrl_GetLineVisible 3154
+#define wxStyledTextCtrl_SetFoldExpanded 3155
+#define wxStyledTextCtrl_GetFoldExpanded 3156
+#define wxStyledTextCtrl_ToggleFold 3157
+#define wxStyledTextCtrl_EnsureVisible 3158
+#define wxStyledTextCtrl_SetFoldFlags 3159
+#define wxStyledTextCtrl_EnsureVisibleEnforcePolicy 3160
+#define wxStyledTextCtrl_SetTabIndents 3161
+#define wxStyledTextCtrl_GetTabIndents 3162
+#define wxStyledTextCtrl_SetBackSpaceUnIndents 3163
+#define wxStyledTextCtrl_GetBackSpaceUnIndents 3164
+#define wxStyledTextCtrl_SetMouseDwellTime 3165
+#define wxStyledTextCtrl_GetMouseDwellTime 3166
+#define wxStyledTextCtrl_WordStartPosition 3167
+#define wxStyledTextCtrl_WordEndPosition 3168
+#define wxStyledTextCtrl_SetWrapMode 3169
+#define wxStyledTextCtrl_GetWrapMode 3170
+#define wxStyledTextCtrl_SetWrapVisualFlags 3171
+#define wxStyledTextCtrl_GetWrapVisualFlags 3172
+#define wxStyledTextCtrl_SetWrapVisualFlagsLocation 3173
+#define wxStyledTextCtrl_GetWrapVisualFlagsLocation 3174
+#define wxStyledTextCtrl_SetWrapStartIndent 3175
+#define wxStyledTextCtrl_GetWrapStartIndent 3176
+#define wxStyledTextCtrl_SetLayoutCache 3177
+#define wxStyledTextCtrl_GetLayoutCache 3178
+#define wxStyledTextCtrl_SetScrollWidth 3179
+#define wxStyledTextCtrl_GetScrollWidth 3180
+#define wxStyledTextCtrl_TextWidth 3181
+#define wxStyledTextCtrl_GetEndAtLastLine 3182
+#define wxStyledTextCtrl_TextHeight 3183
+#define wxStyledTextCtrl_SetUseVerticalScrollBar 3184
+#define wxStyledTextCtrl_GetUseVerticalScrollBar 3185
+#define wxStyledTextCtrl_AppendText 3186
+#define wxStyledTextCtrl_GetTwoPhaseDraw 3187
+#define wxStyledTextCtrl_SetTwoPhaseDraw 3188
+#define wxStyledTextCtrl_TargetFromSelection 3189
+#define wxStyledTextCtrl_LinesJoin 3190
+#define wxStyledTextCtrl_LinesSplit 3191
+#define wxStyledTextCtrl_SetFoldMarginColour 3192
+#define wxStyledTextCtrl_SetFoldMarginHiColour 3193
+#define wxStyledTextCtrl_LineDown 3194
+#define wxStyledTextCtrl_LineDownExtend 3195
+#define wxStyledTextCtrl_LineUp 3196
+#define wxStyledTextCtrl_LineUpExtend 3197
+#define wxStyledTextCtrl_CharLeft 3198
+#define wxStyledTextCtrl_CharLeftExtend 3199
+#define wxStyledTextCtrl_CharRight 3200
+#define wxStyledTextCtrl_CharRightExtend 3201
+#define wxStyledTextCtrl_WordLeft 3202
+#define wxStyledTextCtrl_WordLeftExtend 3203
+#define wxStyledTextCtrl_WordRight 3204
+#define wxStyledTextCtrl_WordRightExtend 3205
+#define wxStyledTextCtrl_Home 3206
+#define wxStyledTextCtrl_HomeExtend 3207
+#define wxStyledTextCtrl_LineEnd 3208
+#define wxStyledTextCtrl_LineEndExtend 3209
+#define wxStyledTextCtrl_DocumentStart 3210
+#define wxStyledTextCtrl_DocumentStartExtend 3211
+#define wxStyledTextCtrl_DocumentEnd 3212
+#define wxStyledTextCtrl_DocumentEndExtend 3213
+#define wxStyledTextCtrl_PageUp 3214
+#define wxStyledTextCtrl_PageUpExtend 3215
+#define wxStyledTextCtrl_PageDown 3216
+#define wxStyledTextCtrl_PageDownExtend 3217
+#define wxStyledTextCtrl_EditToggleOvertype 3218
+#define wxStyledTextCtrl_Cancel 3219
+#define wxStyledTextCtrl_DeleteBack 3220
+#define wxStyledTextCtrl_Tab 3221
+#define wxStyledTextCtrl_BackTab 3222
+#define wxStyledTextCtrl_NewLine 3223
+#define wxStyledTextCtrl_FormFeed 3224
+#define wxStyledTextCtrl_VCHome 3225
+#define wxStyledTextCtrl_VCHomeExtend 3226
+#define wxStyledTextCtrl_ZoomIn 3227
+#define wxStyledTextCtrl_ZoomOut 3228
+#define wxStyledTextCtrl_DelWordLeft 3229
+#define wxStyledTextCtrl_DelWordRight 3230
+#define wxStyledTextCtrl_LineCut 3231
+#define wxStyledTextCtrl_LineDelete 3232
+#define wxStyledTextCtrl_LineTranspose 3233
+#define wxStyledTextCtrl_LineDuplicate 3234
+#define wxStyledTextCtrl_LowerCase 3235
+#define wxStyledTextCtrl_UpperCase 3236
+#define wxStyledTextCtrl_LineScrollDown 3237
+#define wxStyledTextCtrl_LineScrollUp 3238
+#define wxStyledTextCtrl_DeleteBackNotLine 3239
+#define wxStyledTextCtrl_HomeDisplay 3240
+#define wxStyledTextCtrl_HomeDisplayExtend 3241
+#define wxStyledTextCtrl_LineEndDisplay 3242
+#define wxStyledTextCtrl_LineEndDisplayExtend 3243
+#define wxStyledTextCtrl_HomeWrapExtend 3244
+#define wxStyledTextCtrl_LineEndWrap 3245
+#define wxStyledTextCtrl_LineEndWrapExtend 3246
+#define wxStyledTextCtrl_VCHomeWrap 3247
+#define wxStyledTextCtrl_VCHomeWrapExtend 3248
+#define wxStyledTextCtrl_LineCopy 3249
+#define wxStyledTextCtrl_MoveCaretInsideView 3250
+#define wxStyledTextCtrl_LineLength 3251
+#define wxStyledTextCtrl_BraceHighlight 3252
+#define wxStyledTextCtrl_BraceBadLight 3253
+#define wxStyledTextCtrl_BraceMatch 3254
+#define wxStyledTextCtrl_GetViewEOL 3255
+#define wxStyledTextCtrl_SetViewEOL 3256
+#define wxStyledTextCtrl_SetModEventMask 3257
+#define wxStyledTextCtrl_GetEdgeColumn 3258
+#define wxStyledTextCtrl_SetEdgeColumn 3259
+#define wxStyledTextCtrl_GetEdgeMode 3260
+#define wxStyledTextCtrl_GetEdgeColour 3261
+#define wxStyledTextCtrl_SetEdgeColour 3262
+#define wxStyledTextCtrl_SearchAnchor 3263
+#define wxStyledTextCtrl_SearchNext 3264
+#define wxStyledTextCtrl_SearchPrev 3265
+#define wxStyledTextCtrl_LinesOnScreen 3266
+#define wxStyledTextCtrl_UsePopUp 3267
+#define wxStyledTextCtrl_SelectionIsRectangle 3268
+#define wxStyledTextCtrl_SetZoom 3269
+#define wxStyledTextCtrl_GetZoom 3270
+#define wxStyledTextCtrl_GetModEventMask 3271
+#define wxStyledTextCtrl_SetSTCFocus 3272
+#define wxStyledTextCtrl_GetSTCFocus 3273
+#define wxStyledTextCtrl_SetStatus 3274
+#define wxStyledTextCtrl_GetStatus 3275
+#define wxStyledTextCtrl_SetMouseDownCaptures 3276
+#define wxStyledTextCtrl_GetMouseDownCaptures 3277
+#define wxStyledTextCtrl_SetSTCCursor 3278
+#define wxStyledTextCtrl_GetSTCCursor 3279
+#define wxStyledTextCtrl_SetControlCharSymbol 3280
+#define wxStyledTextCtrl_GetControlCharSymbol 3281
+#define wxStyledTextCtrl_WordPartLeft 3282
+#define wxStyledTextCtrl_WordPartLeftExtend 3283
+#define wxStyledTextCtrl_WordPartRight 3284
+#define wxStyledTextCtrl_WordPartRightExtend 3285
+#define wxStyledTextCtrl_SetVisiblePolicy 3286
+#define wxStyledTextCtrl_DelLineLeft 3287
+#define wxStyledTextCtrl_DelLineRight 3288
+#define wxStyledTextCtrl_GetXOffset 3289
+#define wxStyledTextCtrl_ChooseCaretX 3290
+#define wxStyledTextCtrl_SetXCaretPolicy 3291
+#define wxStyledTextCtrl_SetYCaretPolicy 3292
+#define wxStyledTextCtrl_GetPrintWrapMode 3293
+#define wxStyledTextCtrl_SetHotspotActiveForeground 3294
+#define wxStyledTextCtrl_SetHotspotActiveBackground 3295
+#define wxStyledTextCtrl_SetHotspotActiveUnderline 3296
+#define wxStyledTextCtrl_SetHotspotSingleLine 3297
+#define wxStyledTextCtrl_ParaDownExtend 3298
+#define wxStyledTextCtrl_ParaUp 3299
+#define wxStyledTextCtrl_ParaUpExtend 3300
+#define wxStyledTextCtrl_PositionBefore 3301
+#define wxStyledTextCtrl_PositionAfter 3302
+#define wxStyledTextCtrl_CopyRange 3303
+#define wxStyledTextCtrl_CopyText 3304
+#define wxStyledTextCtrl_SetSelectionMode 3305
+#define wxStyledTextCtrl_GetSelectionMode 3306
+#define wxStyledTextCtrl_LineDownRectExtend 3307
+#define wxStyledTextCtrl_LineUpRectExtend 3308
+#define wxStyledTextCtrl_CharLeftRectExtend 3309
+#define wxStyledTextCtrl_CharRightRectExtend 3310
+#define wxStyledTextCtrl_HomeRectExtend 3311
+#define wxStyledTextCtrl_VCHomeRectExtend 3312
+#define wxStyledTextCtrl_LineEndRectExtend 3313
+#define wxStyledTextCtrl_PageUpRectExtend 3314
+#define wxStyledTextCtrl_PageDownRectExtend 3315
+#define wxStyledTextCtrl_StutteredPageUp 3316
+#define wxStyledTextCtrl_StutteredPageUpExtend 3317
+#define wxStyledTextCtrl_StutteredPageDown 3318
+#define wxStyledTextCtrl_StutteredPageDownExtend 3319
+#define wxStyledTextCtrl_WordLeftEnd 3320
+#define wxStyledTextCtrl_WordLeftEndExtend 3321
+#define wxStyledTextCtrl_WordRightEnd 3322
+#define wxStyledTextCtrl_WordRightEndExtend 3323
+#define wxStyledTextCtrl_SetWhitespaceChars 3324
+#define wxStyledTextCtrl_SetCharsDefault 3325
+#define wxStyledTextCtrl_AutoCompGetCurrent 3326
+#define wxStyledTextCtrl_Allocate 3327
+#define wxStyledTextCtrl_FindColumn 3328
+#define wxStyledTextCtrl_GetCaretSticky 3329
+#define wxStyledTextCtrl_SetCaretSticky 3330
+#define wxStyledTextCtrl_ToggleCaretSticky 3331
+#define wxStyledTextCtrl_SetPasteConvertEndings 3332
+#define wxStyledTextCtrl_GetPasteConvertEndings 3333
+#define wxStyledTextCtrl_SelectionDuplicate 3334
+#define wxStyledTextCtrl_SetCaretLineBackAlpha 3335
+#define wxStyledTextCtrl_GetCaretLineBackAlpha 3336
+#define wxStyledTextCtrl_StartRecord 3337
+#define wxStyledTextCtrl_StopRecord 3338
+#define wxStyledTextCtrl_SetLexer 3339
+#define wxStyledTextCtrl_GetLexer 3340
+#define wxStyledTextCtrl_Colourise 3341
+#define wxStyledTextCtrl_SetProperty 3342
+#define wxStyledTextCtrl_SetKeyWords 3343
+#define wxStyledTextCtrl_SetLexerLanguage 3344
+#define wxStyledTextCtrl_GetProperty 3345
+#define wxStyledTextCtrl_GetStyleBitsNeeded 3346
+#define wxStyledTextCtrl_GetCurrentLine 3347
+#define wxStyledTextCtrl_StyleSetSpec 3348
+#define wxStyledTextCtrl_StyleSetFont 3349
+#define wxStyledTextCtrl_StyleSetFontAttr 3350
+#define wxStyledTextCtrl_StyleSetCharacterSet 3351
+#define wxStyledTextCtrl_StyleSetFontEncoding 3352
+#define wxStyledTextCtrl_CmdKeyExecute 3353
+#define wxStyledTextCtrl_SetMargins 3354
+#define wxStyledTextCtrl_GetSelection 3355
+#define wxStyledTextCtrl_PointFromPosition 3356
+#define wxStyledTextCtrl_ScrollToLine 3357
+#define wxStyledTextCtrl_ScrollToColumn 3358
+#define wxStyledTextCtrl_SendMsg 3359
+#define wxStyledTextCtrl_SetVScrollBar 3360
+#define wxStyledTextCtrl_SetHScrollBar 3361
+#define wxStyledTextCtrl_GetLastKeydownProcessed 3362
+#define wxStyledTextCtrl_SetLastKeydownProcessed 3363
+#define wxStyledTextCtrl_SaveFile 3364
+#define wxStyledTextCtrl_LoadFile 3365
+#define wxStyledTextCtrl_DoDragOver 3366
+#define wxStyledTextCtrl_DoDropText 3367
+#define wxStyledTextCtrl_GetUseAntiAliasing 3368
+#define wxStyledTextCtrl_AddTextRaw 3369
+#define wxStyledTextCtrl_InsertTextRaw 3370
+#define wxStyledTextCtrl_GetCurLineRaw 3371
+#define wxStyledTextCtrl_GetLineRaw 3372
+#define wxStyledTextCtrl_GetSelectedTextRaw 3373
+#define wxStyledTextCtrl_GetTextRangeRaw 3374
+#define wxStyledTextCtrl_SetTextRaw 3375
+#define wxStyledTextCtrl_GetTextRaw 3376
+#define wxStyledTextCtrl_AppendTextRaw 3377
+#define wxArtProvider_GetBitmap 3378
+#define wxArtProvider_GetIcon 3379
+#define wxTreeEvent_GetKeyCode 3380
+#define wxTreeEvent_GetItem 3381
+#define wxTreeEvent_GetKeyEvent 3382
+#define wxTreeEvent_GetLabel 3383
+#define wxTreeEvent_GetOldItem 3384
+#define wxTreeEvent_GetPoint 3385
+#define wxTreeEvent_IsEditCancelled 3386
+#define wxTreeEvent_SetToolTip 3387
+#define wxNotebookEvent_GetOldSelection 3388
+#define wxNotebookEvent_GetSelection 3389
+#define wxNotebookEvent_SetOldSelection 3390
+#define wxNotebookEvent_SetSelection 3391
+#define wxFileDataObject_new 3392
+#define wxFileDataObject_AddFile 3393
+#define wxFileDataObject_GetFilenames 3394
+#define wxFileDataObject_destroy 3395
+#define wxTextDataObject_new 3396
+#define wxTextDataObject_GetTextLength 3397
+#define wxTextDataObject_GetText 3398
+#define wxTextDataObject_SetText 3399
+#define wxTextDataObject_destroy 3400
+#define wxBitmapDataObject_new_1_1 3401
+#define wxBitmapDataObject_new_1_0 3402
+#define wxBitmapDataObject_GetBitmap 3403
+#define wxBitmapDataObject_SetBitmap 3404
+#define wxBitmapDataObject_destroy 3405
+#define wxClipboard_new 3407
+#define wxClipboard_destruct 3408
+#define wxClipboard_AddData 3409
+#define wxClipboard_Clear 3410
+#define wxClipboard_Close 3411
+#define wxClipboard_Flush 3412
+#define wxClipboard_GetData 3413
+#define wxClipboard_IsOpened 3414
+#define wxClipboard_Open 3415
+#define wxClipboard_SetData 3416
+#define wxClipboard_UsePrimarySelection 3418
+#define wxClipboard_IsSupported 3419
+#define wxClipboard_Get 3420
+#define wxSpinEvent_GetPosition 3421
+#define wxSpinEvent_SetPosition 3422
+#define wxSplitterWindow_new_0 3423
+#define wxSplitterWindow_new_2 3424
+#define wxSplitterWindow_destruct 3425
+#define wxSplitterWindow_Create 3426
+#define wxSplitterWindow_GetMinimumPaneSize 3427
+#define wxSplitterWindow_GetSashGravity 3428
+#define wxSplitterWindow_GetSashPosition 3429
+#define wxSplitterWindow_GetSplitMode 3430
+#define wxSplitterWindow_GetWindow1 3431
+#define wxSplitterWindow_GetWindow2 3432
+#define wxSplitterWindow_Initialize 3433
+#define wxSplitterWindow_IsSplit 3434
+#define wxSplitterWindow_ReplaceWindow 3435
+#define wxSplitterWindow_SetSashGravity 3436
+#define wxSplitterWindow_SetSashPosition 3437
+#define wxSplitterWindow_SetSashSize 3438
+#define wxSplitterWindow_SetMinimumPaneSize 3439
+#define wxSplitterWindow_SetSplitMode 3440
+#define wxSplitterWindow_SplitHorizontally 3441
+#define wxSplitterWindow_SplitVertically 3442
+#define wxSplitterWindow_Unsplit 3443
+#define wxSplitterWindow_UpdateSize 3444
+#define wxSplitterEvent_GetSashPosition 3445
+#define wxSplitterEvent_GetX 3446
+#define wxSplitterEvent_GetY 3447
+#define wxSplitterEvent_GetWindowBeingRemoved 3448
+#define wxSplitterEvent_SetSashPosition 3449
+#define wxHtmlWindow_new_0 3450
+#define wxHtmlWindow_new_2 3451
+#define wxHtmlWindow_AppendToPage 3452
+#define wxHtmlWindow_GetOpenedAnchor 3453
+#define wxHtmlWindow_GetOpenedPage 3454
+#define wxHtmlWindow_GetOpenedPageTitle 3455
+#define wxHtmlWindow_GetRelatedFrame 3456
+#define wxHtmlWindow_HistoryBack 3457
+#define wxHtmlWindow_HistoryCanBack 3458
+#define wxHtmlWindow_HistoryCanForward 3459
+#define wxHtmlWindow_HistoryClear 3460
+#define wxHtmlWindow_HistoryForward 3461
+#define wxHtmlWindow_LoadFile 3462
+#define wxHtmlWindow_LoadPage 3463
+#define wxHtmlWindow_SelectAll 3464
+#define wxHtmlWindow_SelectionToText 3465
+#define wxHtmlWindow_SelectLine 3466
+#define wxHtmlWindow_SelectWord 3467
+#define wxHtmlWindow_SetBorders 3468
+#define wxHtmlWindow_SetFonts 3469
+#define wxHtmlWindow_SetPage 3470
+#define wxHtmlWindow_SetRelatedFrame 3471
+#define wxHtmlWindow_SetRelatedStatusBar 3472
+#define wxHtmlWindow_ToText 3473
+#define wxHtmlWindow_destroy 3474
+#define wxHtmlLinkEvent_GetLinkInfo 3475
+#define wxSystemSettings_GetColour 3476
+#define wxSystemSettings_GetFont 3477
+#define wxSystemSettings_GetMetric 3478
+#define wxSystemSettings_GetScreenType 3479
+#define wxAuiNotebookEvent_SetSelection 3480
+#define wxAuiNotebookEvent_GetSelection 3481
+#define wxAuiNotebookEvent_SetOldSelection 3482
+#define wxAuiNotebookEvent_GetOldSelection 3483
+#define wxAuiNotebookEvent_SetDragSource 3484
+#define wxAuiNotebookEvent_GetDragSource 3485
+#define wxAuiManagerEvent_SetManager 3486
+#define wxAuiManagerEvent_GetManager 3487
+#define wxAuiManagerEvent_SetPane 3488
+#define wxAuiManagerEvent_GetPane 3489
+#define wxAuiManagerEvent_SetButton 3490
+#define wxAuiManagerEvent_GetButton 3491
+#define wxAuiManagerEvent_SetDC 3492
+#define wxAuiManagerEvent_GetDC 3493
+#define wxAuiManagerEvent_Veto 3494
+#define wxAuiManagerEvent_GetVeto 3495
+#define wxAuiManagerEvent_SetCanVeto 3496
+#define wxAuiManagerEvent_CanVeto 3497
+#define wxLogNull_new 3498
+#define wxLogNull_destroy 3499
 
 
diff --git a/lib/wx/c_src/wxe_driver.c b/lib/wx/c_src/wxe_driver.c
index 310325ea26..2404b13cc3 100644
--- a/lib/wx/c_src/wxe_driver.c
+++ b/lib/wx/c_src/wxe_driver.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. 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
@@ -117,8 +117,7 @@ wxe_driver_start(ErlDrvPort port, char *buff)
       if(WXE_DRV_PORT == 0) {
 	 for(; *buff != 32; buff++); 
 	 buff++; 
-	 erl_wx_privdir = malloc(strlen(buff));
-	 strcpy(erl_wx_privdir, buff);
+	 erl_wx_privdir = strdup(buff);
 	 
 	 WXE_DRV_PORT = port;
 	 wxe_master = data;
@@ -146,7 +145,6 @@ static void
 wxe_driver_unload(void) 
 {
    // fprintf(stderr, "%s:%d: UNLOAD \r\n", __FILE__,__LINE__);
-   meta_command(WXE_SHUTDOWN, wxe_master);
    stop_native_gui(wxe_master);
    unload_native_gui();
    free(wxe_master);
diff --git a/lib/wx/c_src/wxe_driver.h b/lib/wx/c_src/wxe_driver.h
index 13a17e356f..5c5b8614ed 100644
--- a/lib/wx/c_src/wxe_driver.h
+++ b/lib/wx/c_src/wxe_driver.h
@@ -83,8 +83,9 @@ extern char * erl_wx_privdir;
 #define WXE_CB_START        8
 #define WXE_DEBUG_DRIVER    9
 #define WXE_DEBUG_PING      10
-#define WXE_BIN_INCR        5001
-#define WXE_BIN_DECR        5002
+#define WXE_BIN_INCR        11
+#define WXE_BIN_DECR        12
+#define WXE_INIT_OPENGL     13
 
 #define OPENGL_START        5000
 
diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp
index 63dd68fa5e..e947a1bc6e 100644
--- a/lib/wx/c_src/wxe_gl.cpp
+++ b/lib/wx/c_src/wxe_gl.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2008-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2010. 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
@@ -19,303 +19,142 @@
 
 #include <stdio.h>
 #include <string.h>
+#ifndef _WIN32
+#include <dlfcn.h>
+#else
+#include <windows.h>
+#endif
 #include "wxe_impl.h"
-
-#include "wxe_gl.h"
-
-#define WX_DEF_EXTS
-#include "gen/gl_fdefs.h"
-#include "gen/gl_finit.h"
-#include "gen/glu_finit.h"
+#include "wxe_return.h"
 
 /* **************************************************************************** 
  * Opengl context management *
  * ****************************************************************************/
-int gl_initiated = FALSE;
 
+int erl_gl_initiated = FALSE;
 ErlDrvTermData gl_active = 0;
 wxeGLC glc;
 
-void setActiveGL(ErlDrvTermData caller, wxGLCanvas *canvas)
-{
-  if(gl_initiated == FALSE) {
-    initOpenGL();
-    init_tess();
-    gl_initiated = TRUE;
-  }
-  gl_active = caller;
-  glc[caller] = canvas;
-}
-
-void deleteActiveGL(wxGLCanvas *canvas)
-{
-  gl_active = 0;
-  wxeGLC::iterator it;
-  for(it = glc.begin(); it != glc.end(); ++it) {
-    if(it->second == canvas) { 
-      it->second = (wxGLCanvas *) 0;
-    }
-  }
-}
-
-/* **************************************************************************** 
- * OPENGL INITIALIZATION 
- *****************************************************************************/
+typedef void (*WXE_GL_DISPATCH) (int, char *, ErlDrvPort, ErlDrvTermData, char **, int *);
+WXE_GL_DISPATCH wxe_gl_dispatch;
 
 #ifdef _WIN32
+#define RTLD_LAZY 0
+typedef HMODULE DL_LIB_P;
 void * dlsym(HMODULE Lib, const char *func) {
   void * funcp;
-  if((funcp = (void *) GetProcAddress(Lib, func))) 
+  if((funcp = (void *) GetProcAddress(Lib, func)))
     return funcp;
-  else 
+  else
     return (void *) wglGetProcAddress(func);
 }
-#endif 
 
-int initOpenGL() 
-{
-#ifdef _MACOSX
-  char * DLName = "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib";
-  void * LIBhandle = dlopen(DLName, RTLD_LAZY);
-#elif defined(_WIN32)
-  WCHAR * DLName = wxT("opengl32.dll");
-  HMODULE LIBhandle = LoadLibrary(DLName);
-#else 
-  char * DLName = (char *) "libGL.so";
-  void * LIBhandle = dlopen(DLName, RTLD_LAZY);
-#endif
-  // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName);
-  void * func = NULL;
-  int i;
+HMODULE dlopen(const char *path, int unused) {
+  WCHAR * DLL;
+  int len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0);
+  DLL = (WCHAR *) malloc(len * sizeof(WCHAR));
+  MultiByteToWideChar(CP_ACP, 0, path, -1, DLL, len);
+  HMODULE lib = LoadLibrary(DLL);
+  free(DLL);
+  return lib;
+}
 
-  if(LIBhandle) {
-    for(i=0; gl_fns[i].name != NULL; i++) {      
-      if((func = dlsym(LIBhandle, gl_fns[i].name))) {
-	* (void **) (gl_fns[i].func) = func;
-	// fprintf(stderr, "GL LOADED %s \r\n", gl_fns[i].name);
-      } else {
-	if(gl_fns[i].alt != NULL) {
-	  if((func = dlsym(LIBhandle, gl_fns[i].alt))) {
-	    * (void **) (gl_fns[i].func) = func;
-	    // fprintf(stderr, "GL LOADED %s \r\n", gl_fns[i].alt);
-	  } else {
-	    * (void **) (gl_fns[i].func) = (void *) &gl_error;
-	    // fprintf(stderr, "GL Skipped %s and %s \r\n", gl_fns[i].name, gl_fns[i].alt);
-	  };
-	} else {
-	  * (void **) (gl_fns[i].func) = (void *) &gl_error;
-	  // fprintf(stderr, "GL Skipped %s \r\n", gl_fns[i].name);
-	}
-      }
-    }
-#ifdef _WIN32
-    FreeLibrary(LIBhandle);
-#else
-    dlclose(LIBhandle);
-#endif
-    // fprintf(stderr, "OPENGL library is loaded\r\n");
-  } else {
-    wxString msg;
-    msg.Printf(wxT("Could NOT load OpenGL library: "));
-#ifdef _WIN32
-    msg += DLName;
+void dlclose(HMODULE Lib) {
+  FreeLibrary(Lib);
+}
 #else
-    msg += wxString::FromAscii((char *)DLName);
+typedef void * DL_LIB_P;
 #endif
-    send_msg("error", &msg);
-  };
 
-#ifdef _MACOSX
-  DLName = "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib";
-  LIBhandle = dlopen(DLName, RTLD_LAZY);
-#elif defined(_WIN32)
-  DLName = wxT("glu32.dll");
-  LIBhandle = LoadLibrary(DLName);
+void wxe_initOpenGL(wxeReturn rt, char *bp) {
+  DL_LIB_P LIBhandle;
+  int (*init_opengl)(void *);
+#ifdef _WIN32
+  void * erlCallbacks = &WinDynDriverCallbacks;
 #else 
-  DLName = (char *) "libGLU.so";
-  LIBhandle = dlopen(DLName, RTLD_LAZY);
+  void * erlCallbacks = NULL;
 #endif
-  // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName);
-  func = NULL;
-
-  if(LIBhandle) {
-    for(i=0; glu_fns[i].name != NULL; i++) {      
-      if((func = dlsym(LIBhandle, glu_fns[i].name))) {
-	* (void **) (glu_fns[i].func) = func;
+  
+  if(erl_gl_initiated == FALSE) {
+    if((LIBhandle = dlopen(bp, RTLD_LAZY))) {
+      *(void **) (&init_opengl) = dlsym(LIBhandle, "egl_init_opengl");
+      wxe_gl_dispatch = (WXE_GL_DISPATCH) dlsym(LIBhandle, "egl_dispatch");
+      if(init_opengl && wxe_gl_dispatch) {
+	(*init_opengl)(erlCallbacks);
+	rt.addAtom((char *) "ok");
+	rt.add(wxString::FromAscii("initiated"));
+	rt.addTupleCount(2);
+	erl_gl_initiated = TRUE;
       } else {
-	if(glu_fns[i].alt != NULL) {
-	  if((func = dlsym(LIBhandle, glu_fns[i].alt))) {
-	    * (void **) (glu_fns[i].func) = func;
-	  } else {
-	    * (void **) (glu_fns[i].func) = (void *) &gl_error;
-	    // fprintf(stderr, "GLU Skipped %s\r\n", glu_fns[i].alt);
-	  };
-	} else {
-	  * (void **) (glu_fns[i].func) = (void *) &gl_error;
-	  // fprintf(stderr, "GLU Skipped %s\r\n", glu_fns[i].name);
-	}
+	wxString msg;
+	msg.Printf(wxT("In library: "));
+	msg += wxString::FromAscii(bp);
+	msg += wxT(" functions: ");
+	if(!init_opengl) 
+	  msg += wxT("egl_init_opengl ");
+	if(!wxe_gl_dispatch) 
+	  msg += wxT("egl_dispatch ");
+	rt.addAtom((char *) "error");
+	rt.add(msg);
+	rt.addTupleCount(2);
       }
+    } else {
+      wxString msg;
+      msg.Printf(wxT("Could not load dll: "));
+      msg += wxString::FromAscii(bp);
+      rt.addAtom((char *) "error");
+      rt.add(msg);
+      rt.addTupleCount(2);
     }
-#ifdef _WIN32
-    FreeLibrary(LIBhandle);
-#else
-    dlclose(LIBhandle);
-#endif
-    // fprintf(stderr, "GLU library is loaded\r\n");
   } else {
-    wxString msg;
-    msg.Printf(wxT("Could NOT load OpenGL GLU library: "));
-#ifdef _WIN32
-    msg += DLName;
-#else
-    msg += wxString::FromAscii((char *)DLName);
-#endif
-    send_msg("error", &msg);
-  };
-  return 0;
-}
-
-void gl_error() {
-  int AP = 0; ErlDrvTermData rt[8];
-  rt[AP++] = ERL_DRV_ATOM; rt[AP++] = driver_mk_atom((char *)"_wxe_error_");
-  rt[AP++] = ERL_DRV_INT;  rt[AP++] = (int) gl_error_op;
-  rt[AP++] = ERL_DRV_ATOM; rt[AP++] = driver_mk_atom((char *)"undef");
-  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 3;
-  driver_send_term(WXE_DRV_PORT,gl_active,rt,AP);
-}
-
-/* *******************************************************************************
- * GLU Tesselation special
- * ******************************************************************************/
-
-static GLUtesselator* tess;
-static GLdouble* tess_coords;
-static GLdouble* tess_alloc_vertex;
-static int* tess_vertices;
-
-void CALLBACK
-wxe_ogla_vertex(GLdouble* coords)
-{
-  /* fprintf(stderr, "%d\r\n", (int) (coords - tess_coords) / 3); */
-
-  *tess_vertices++ = (int) (coords - tess_coords) / 3;
-}
-
-void CALLBACK
-wxe_ogla_edge_flag(GLboolean flag)
-{
+    rt.addAtom((char *) "ok");
+    rt.add(wxString::FromAscii("already initilized"));
+    rt.addTupleCount(2);
+  }
+  rt.send();
 }
 
-void CALLBACK
-wxe_ogla_error(GLenum errorCode)
+void setActiveGL(ErlDrvTermData caller, wxGLCanvas *canvas)
 {
-  const GLubyte *err;
-  err = gluErrorString(errorCode);
-  wxString msg;
-  msg.Printf(wxT("Tesselation error:  %d: "), (int)errorCode);
-  msg += wxString::FromAscii((char *) err);
-  send_msg("error", &msg);
+  gl_active = caller;
+  glc[caller] = canvas;
 }
 
-void CALLBACK
-wxe_ogla_combine(GLdouble coords[3],
-		   void* vertex_data[4],
-		   GLfloat w[4], 
-		   void **dataOut)
+void deleteActiveGL(wxGLCanvas *canvas)
 {
-  GLdouble* vertex = tess_alloc_vertex;
-
-  tess_alloc_vertex += 3;
-
-#if 0
-  fprintf(stderr, "combine: ");
-  int i;
-  for (i = 0; i < 4; i++) {
-    if (w[i] > 0.0) {
-      fprintf(stderr, "%d(%g) ", (int) vertex_data[i], w[i]);
+  gl_active = 0;
+  wxeGLC::iterator it;
+  for(it = glc.begin(); it != glc.end(); ++it) {
+    if(it->second == canvas) { 
+      it->second = (wxGLCanvas *) 0;
     }
   }
-  fprintf(stderr, "\r\n");
-  fprintf(stderr, "%g %g %g\r\n", vertex[0], vertex[1], vertex[2]);
-#endif
-
-  vertex[0] = coords[0];
-  vertex[1] = coords[1];
-  vertex[2] = coords[2];
-  *dataOut = vertex;
-}
-
-void init_tess() 
-{
-  tess = gluNewTess();
-
-  gluTessCallback(tess, GLU_TESS_VERTEX,     (GLUfuncptr) wxe_ogla_vertex);
-  gluTessCallback(tess, GLU_TESS_EDGE_FLAG,  (GLUfuncptr) wxe_ogla_edge_flag);
-  gluTessCallback(tess, GLU_TESS_COMBINE,    (GLUfuncptr) wxe_ogla_combine);
-  gluTessCallback(tess, GLU_TESS_ERROR,      (GLUfuncptr) wxe_ogla_error);
-
 }
 
-void exit_tess() 
-{
-  gluDeleteTess(tess);
-}
-
-int wxe_tess_impl(char* buff, ErlDrvTermData caller)
-{
-  ErlDrvBinary* bin;
-  int i;
-  int num_vertices = * (int *) buff; buff += 8; // Align
-  GLdouble *n = (double *) buff; buff += 8*3;
-
-  GLdouble* new_vertices;
-  bin = driver_alloc_binary(num_vertices*6*sizeof(GLdouble));  
-  new_vertices = tess_coords = (double *) bin->orig_bytes;
-  memcpy(tess_coords,buff,num_vertices*3*sizeof(GLdouble));
-  tess_alloc_vertex = tess_coords + num_vertices*3;
-
-#if 0
-  fprintf(stderr, "n=%d\r\n", num_vertices);
-#endif 
-  int *vertices;
-  vertices = (int *) driver_alloc(sizeof(int) * 16*num_vertices);
-  
-  tess_vertices = vertices;
-  
-  gluTessNormal(tess, n[0], n[1], n[2]);
-  gluTessBeginPolygon(tess, 0);
-  gluTessBeginContour(tess);
-  for (i = 0; i < num_vertices; i++) {
-    gluTessVertex(tess, tess_coords+3*i, tess_coords+3*i);
-  }
-  gluTessEndContour(tess);
-  gluTessEndPolygon(tess);
-    
-  int n_pos = (tess_vertices - vertices); 
-  
-  int AP = 0; ErlDrvTermData *rt;
-  rt = (ErlDrvTermData *) driver_alloc(sizeof(ErlDrvTermData) * (13+n_pos*2));
-  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_wxe_result_");
-
-  for(i=0; i < n_pos; i++) {
-    rt[AP++] = ERL_DRV_INT; rt[AP++] = (int) vertices[i];
+void gl_dispatch(int op, char *bp,ErlDrvTermData caller,WXEBinRef *bins[]){
+  if(caller != gl_active) {
+    wxGLCanvas * current = glc[caller];
+    if(current) { gl_active = caller; current->SetCurrent();}
+    else {
+      ErlDrvTermData rt[] = // Error msg
+	{ERL_DRV_ATOM, driver_mk_atom((char *) "_egl_error_"),
+	 ERL_DRV_INT,  op,
+	 ERL_DRV_ATOM, driver_mk_atom((char *) "no_gl_context"),
+	 ERL_DRV_TUPLE,3};
+      driver_send_term(WXE_DRV_PORT,caller,rt,8);
+      return ;
+    }
   };
-  rt[AP++] = ERL_DRV_NIL; rt[AP++] = ERL_DRV_LIST; rt[AP++] = n_pos+1;
-
-  rt[AP++] = ERL_DRV_BINARY; rt[AP++] = (ErlDrvTermData) bin; 
-  rt[AP++] = (tess_alloc_vertex-new_vertices)*sizeof(GLdouble); rt[AP++] = 0;
-  
-  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2; // Return tuple {list, Bin}
-  rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2; // Result tuple
-  
-  driver_send_term(WXE_DRV_PORT,caller,rt,AP);
-//   fprintf(stderr, "List %d %d %d \r\n", 
-// 	  n_pos, 
-// 	  (tess_alloc_vertex-new_vertices)*sizeof(GLdouble), 
-// 	  num_vertices*6*sizeof(GLdouble));
-  driver_free_binary(bin);
-  driver_free(vertices);
-  driver_free(rt);
-  return 0;
+  char * bs[3];
+  int bs_sz[3];
+  for(int i=0; i<3; i++) {
+    if(bins[i]) {
+      bs[i] = bins[i]->base;
+      bs_sz[i] = bins[i]->size;
+    }
+    else 
+      bs[i] = NULL;
+  }
+  wxe_gl_dispatch(op, bp, WXE_DRV_PORT, caller, bs, bs_sz);
 }
 
diff --git a/lib/wx/c_src/wxe_gl.h b/lib/wx/c_src/wxe_gl.h
index 3a47b3c1bd..1b556ff4ec 100644
--- a/lib/wx/c_src/wxe_gl.h
+++ b/lib/wx/c_src/wxe_gl.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2008-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2010. 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
@@ -17,119 +17,6 @@
  * %CopyrightEnd% 
  */
 
+#include "egl_impl.h"
 
-#ifndef _WIN32
-# include <dlfcn.h>
-#endif
-
-#ifndef __WXMAC__
-# include <GL/gl.h>
-# include <GL/glu.h>	/* Header File For The OpenGL Library */
-#else
-# include <OpenGL/glu.h>    /* Header File For The OpenGL Library */
-#endif
-
-#ifndef CALLBACK
-# define CALLBACK
-#endif
-
-#ifdef _WIN32
-# ifndef _GLUfuncptr
-//  Visual studio CPP ++ compiler
-#  define _GLUfuncptr void (_stdcall *)() 
-# endif
-#endif
-
-#ifdef _GLUfuncptr
-# define GLUfuncptr _GLUfuncptr
-#elif defined(TESS_CB_TIGER_STYLE)
-# define GLUfuncptr GLvoid (*)(...)
-#else 
-# define GLUfuncptr GLvoid (*)()
-#endif
-
-#ifdef WIN32
-#include <windows.h>  
-#include <gl/gl.h>
-#elif defined(HAVE_GL_GL_H)
-#include <GL/gl.h>
-#elif defined(HAVE_OPENGL_GL_H)
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY 
-#endif
-
-int initOpenGL();
-void gl_error();
-extern int gl_error_op;
-extern ErlDrvTermData gl_active;
-
-/* Some new GL types (eliminates the need for glext.h) */
-
-#ifndef HAVE_GLINTPTR
-#ifndef HAVE_GLINTPTRARB
-# include <stddef.h>
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif  /* HAVE_GLINTPTRARB */
-typedef GLintptrARB   GLintptr;
-typedef GLsizeiptrARB GLsizeiptr;
-#endif  /* HAVE_GLINTPTR */
-
-#ifndef HAVE_GLCHAR
-# ifndef HAVE_GLCHARARB
-/* GL types for handling shader object handles and characters */
-typedef char GLcharARB;		     /* native character */
-typedef unsigned int GLhandleARB;    /* shader object handle */
-#endif  /* HAVE_GLCHARARB */
-typedef GLcharARB GLchar;
-#endif
-
-#ifndef HAVE_GLHALFARB 
-/* GL types for "half" precision (s10e5) float data in host memory */
-typedef unsigned short GLhalfARB;
-#endif
-
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GLX_OML_sync_control extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS )
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(WIN32) && defined(_MSC_VER)
-typedef long int int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#elif defined(WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#else
-#include <inttypes.h>     /* Fallback option */
-#endif
-
-#ifndef HAVE_GLINT64EXT
-typedef int64_t GLint64EXT;
-typedef uint64_t GLuint64EXT;
-#endif
-
-void init_tess(); 
-void exit_tess();
-int wxe_tess_impl(char* buff, ErlDrvTermData caller);
+void wxe_initOpenGL(wxeReturn, char*);
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index 528a08e654..365fb691a1 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. 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
@@ -68,7 +68,6 @@ ErlDrvTermData  wxe_batch_caller = 0;
 ErlDrvTermData  init_caller = 0;
 
 // extern opengl 
-extern int gl_initiated;
 void gl_dispatch(int op, char *bp, ErlDrvTermData caller, WXEBinRef *bins[]);
 
 
@@ -79,6 +78,21 @@ extern void erts_thread_disable_fpe(void);
 }
 #endif
 
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+#define __DARWIN__ 1
+#endif
+
+#ifdef __DARWIN__
+extern "C" {
+  int erl_drv_stolen_main_thread_join(ErlDrvTid tid, void **respp);
+  int erl_drv_steal_main_thread(char *name,
+				ErlDrvTid *dtid,
+				void* (*func)(void*),
+				void* arg,
+				ErlDrvThreadOpts *opts);
+}
+#endif
+
 void *wxe_main_loop(void * );
 
 /* ************************************************************
@@ -100,8 +114,14 @@ int start_native_gui(wxe_data *sd)
   wxe_batch_locker_c = erl_drv_cond_create((char *)"wxe_batch_locker_c");
   init_caller = driver_connected(sd->port); 
 
-  if((res = erl_drv_thread_create((char *)"wxwidgets",
-				  &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL)) == 0) {
+#ifdef __DARWIN__
+  res = erl_drv_steal_main_thread((char *)"wxwidgets",
+				  &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL);
+#else
+  res = erl_drv_thread_create((char *)"wxwidgets",
+			      &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL);
+#endif
+  if(res == 0) {
     erl_drv_mutex_lock(wxe_status_m);
     for(;wxe_status == WXE_NOT_INITIATED;) {
       erl_drv_cond_wait(wxe_status_c, wxe_status_m);
@@ -118,7 +138,14 @@ int start_native_gui(wxe_data *sd)
 
 void stop_native_gui(wxe_data *sd)
 {
+  if(wxe_status == WXE_INITIATED) {
+    meta_command(WXE_SHUTDOWN, sd);
+  }
+#ifdef __DARWIN__
+  erl_drv_stolen_main_thread_join(wxe_thread, NULL);
+#else
   erl_drv_thread_join(wxe_thread, NULL);
+#endif
   erl_drv_mutex_destroy(wxe_status_m);
   erl_drv_cond_destroy(wxe_status_c);
   erl_drv_mutex_destroy(wxe_batch_locker_m);
@@ -183,8 +210,8 @@ void *wxe_main_loop(void *vpdl)
 {
   int result; 
   int  argc = 1;
-  char * temp = (char *) "Erlang\0";
-  char ** argv = &temp;
+  char * temp = (char *) "Erlang";
+  char * argv[] = {temp,NULL};
   ErlDrvPDL pdl = (ErlDrvPDL) vpdl;
   
   driver_pdl_inc_refc(pdl);
@@ -203,7 +230,9 @@ void *wxe_main_loop(void *vpdl)
     /* We are done try to make a clean exit */
     wxe_status = WXE_EXITED;
     driver_pdl_dec_refc(pdl);
+#ifndef __DARWIN__
     erl_drv_thread_exit(NULL);
+#endif
     return NULL;
   } else {
     erl_drv_mutex_lock(wxe_status_m);
@@ -265,7 +294,6 @@ bool WxeApp::OnInit()
   init_nonconsts(global_me, init_caller);
   erl_drv_mutex_lock(wxe_status_m);
   wxe_status = WXE_INITIATED;
-  gl_initiated = FALSE;   
   erl_drv_cond_signal(wxe_status_c);
   erl_drv_mutex_unlock(wxe_status_m);
   return TRUE;
@@ -411,7 +439,7 @@ void WxeApp::dispatch_cb(wxList * batch, wxList * temp, ErlDrvTermData process)
 	  if(event->caller == process ||  // Callbacks from CB process only 
 	     event->op == WXE_CB_START || // Recursive event callback allow
 	     // Allow connect_cb during CB i.e. msg from wxe_server.
-	     event->caller == memenv->owner) 
+	     (memenv && event->caller == memenv->owner)) 
 	    {
 	      switch(event->op) {
 	      case WXE_BATCH_END:
@@ -669,7 +697,7 @@ void WxeApp::clearPtr(void * ptr) {
       send_msg("debug", &msg);
     }
     
-    if(refd->pid != -1) {  
+    if(((int) refd->pid) != -1) {
       // Send terminate pid to owner
       wxeReturn rt = wxeReturn(WXE_DRV_PORT,refd->memenv->owner, false);
       rt.addAtom("_wxe_destroy_");
diff --git a/lib/wx/c_src/wxe_ps_init.c b/lib/wx/c_src/wxe_ps_init.c
index e787c214bd..a85f751024 100644
--- a/lib/wx/c_src/wxe_ps_init.c
+++ b/lib/wx/c_src/wxe_ps_init.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2008-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2011. 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
diff --git a/lib/wx/c_src/wxe_return.cpp b/lib/wx/c_src/wxe_return.cpp
index 2c4f7541e7..9fd627829e 100644
--- a/lib/wx/c_src/wxe_return.cpp
+++ b/lib/wx/c_src/wxe_return.cpp
@@ -64,11 +64,14 @@ int wxeReturn::send() {
     int res = driver_send_term(port, caller, rtData, rtLength);
     driver_free(rtData);
 
+#ifdef DEBUG
     if(res == -1) {
       wxString msg;
       msg.Printf(wxT("Failed to send return or event msg"));
       send_msg("internal_error", &msg);
     }
+#endif
+
     reset();
     return res;
 }
diff --git a/lib/wx/configure.in b/lib/wx/configure.in
index 855c0c975e..f7128db23a 100755
--- a/lib/wx/configure.in
+++ b/lib/wx/configure.in
@@ -162,16 +162,20 @@ esac
 case $host_os in
     darwin*)
 	CFLAGS="-no-cpp-precomp $CFLAGS"
-	LDFLAGS="-bundle -flat_namespace -undefined warning -fPIC -framework OpenGL $LDFLAGS"
+	LDFLAGS="-bundle -flat_namespace -undefined warning -fPIC $LDFLAGS"
+	GL_LIBS="-framework OpenGL"
 	;;
     win32)
         LDFLAGS="-dll $LDFLAGS"
+	GL_LIBS="-lglu32 -lOpengl32"
 	;;
     mingw32)
 	LDFLAGS="-shared -fPIC $LDFLAGS"
+	GL_LIBS="-lglu32 -lOpengl32"
 	;;
     *)
 	LDFLAGS="-shared -fPIC $LDFLAGS"
+	GL_LIBS="-lGL -lGLU"
 	;;
 esac
 
@@ -194,6 +198,42 @@ case $host_os in
 	;;
 esac
 
+dnl  
+dnl  Opengl tests
+dnl
+
+if test X"$host_os" != X"win32" ; then
+    AC_CHECK_HEADERS([GL/gl.h], [],
+    	[AC_CHECK_HEADERS([OpenGL/gl.h])])
+    if test X"$ac_cv_header_GL_gl_h" != Xyes &&
+       	test X"$ac_cv_header_OpenGL_gl_h" != Xyes
+    then
+       	saved_CPPFLAGS="$CPPFLAGS"
+	AC_MSG_NOTICE(Checking for OpenGL headers in /usr/X11R6)
+       	CPPFLAGS="-isystem /usr/X11R6/include $CPPFLAGS"
+       	$as_unset ac_cv_header_GL_gl_h
+       	AC_CHECK_HEADERS([GL/gl.h])
+       	if test X"$ac_cv_header_GL_gl_h" != Xyes ; then
+	    AC_MSG_NOTICE(Checking for OpenGL headers in /usr/local)
+	    CPPFLAGS="-isystem /usr/local/include $saved_CPPFLAGS"
+	    $as_unset ac_cv_header_GL_gl_h
+	    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])
+		CPPFLAGS="$saved_CPPFLAGS"
+	    else 
+	    	GL_LIBS="-L/usr/local/lib $GL_LIBS"
+	    fi
+	else 
+    	    GL_LIBS="-L/usr/X11R6/lib $GL_LIBS"
+       	fi
+    fi
+else
+    AC_CHECK_HEADERS([gl/gl.h],[],[],[#include <windows.h>])
+fi
+
+AC_SUBST(GL_LIBS)
+
 CXXFLAGS="$CFLAGS $CPPFLAGS" 
 CFLAGS="$CFLAGS $CPPFLAGS $C_ONLY_FLAGS"
 
@@ -386,17 +426,6 @@ if test "$WXERL_CAN_BUILD_DRIVER" != "false"; then
 AC_SUBST(WX_HAVE_STATIC_LIBS)
 AC_SUBST(RC_FILE_TYPE)
 
-dnl  
-dnl  Opengl tests
-dnl
-
-if test X"$host_os" != X"win32" ; then
-    AC_CHECK_HEADERS([GL/gl.h])
-    AC_CHECK_HEADERS([OpenGL/gl.h])
-else
-    AC_CHECK_HEADERS([gl/gl.h],[],[],[#include <windows.h>])
-fi
-
 AC_MSG_CHECKING(if wxwidgets have opengl support)
 AC_LANG_PUSH(C++)
 saved_CXXFLAGS=$CXXFLAGS
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 92933c348b..1493501ea4 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -31,6 +31,71 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 0.98.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Add wxSystemSettings which was missing in the previous
+	    release, despite previous comments.</p> <p>Fix an
+	    external loop when stopping erlang nicely.</p>
+	    <p>Separate OpenGL to it's own dynamic loaded library, so
+	    other graphic libraries can reuse the gl module and it
+	    will not waste memory if not used.</p>
+          <p>
+	    Own Id: OTP-8951</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Wx 0.98.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix crash (segmentation fault) in callback handling.</p>
+          <p>
+	    Own Id: OTP-8766</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add wxSystemSettings module.</p>
+          <p>
+	    Add wxTreeCtrl:editLabel/2.</p>
+          <p>
+	    Own Id: OTP-8767</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Wx 0.98.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+            Calling <c>sys:get_status()</c> for processes that have
+            globally registered names that were not atoms would cause
+            a crash. Corrected. (Thanks to Steve Vinoski.)</p>
+          <p>
+            Own Id: OTP-8656</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 0.98.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/include/gl.hrl b/lib/wx/include/gl.hrl
index 2fa0d72a59..52f2635af9 100644
--- a/lib/wx/include/gl.hrl
+++ b/lib/wx/include/gl.hrl
@@ -782,7 +782,7 @@
 -define(GL_TEXTURE_COMPARE_MODE, 16#884C).
 -define(GL_TEXTURE_COMPARE_FUNC, 16#884D).
 -define(GL_COMPARE_R_TO_TEXTURE, 16#884E).
--define(GL_GLEXT_VERSION, 52).
+-define(GL_GLEXT_VERSION, 65).
 -define(GL_CONSTANT_COLOR, 16#8001).
 -define(GL_ONE_MINUS_CONSTANT_COLOR, 16#8002).
 -define(GL_CONSTANT_ALPHA, 16#8003).
@@ -1021,6 +1021,8 @@
 -define(GL_CLIP_DISTANCE3, 16#3003).
 -define(GL_CLIP_DISTANCE4, 16#3004).
 -define(GL_CLIP_DISTANCE5, 16#3005).
+-define(GL_CLIP_DISTANCE6, 16#3006).
+-define(GL_CLIP_DISTANCE7, 16#3007).
 -define(GL_MAX_CLIP_DISTANCES, 16#D32).
 -define(GL_MAJOR_VERSION, 16#821B).
 -define(GL_MINOR_VERSION, 16#821C).
@@ -1111,6 +1113,9 @@
 -define(GL_QUERY_NO_WAIT, 16#8E14).
 -define(GL_QUERY_BY_REGION_WAIT, 16#8E15).
 -define(GL_QUERY_BY_REGION_NO_WAIT, 16#8E16).
+-define(GL_BUFFER_ACCESS_FLAGS, 16#911F).
+-define(GL_BUFFER_MAP_LENGTH, 16#9120).
+-define(GL_BUFFER_MAP_OFFSET, 16#9121).
 -define(GL_CLAMP_VERTEX_COLOR, 16#891A).
 -define(GL_CLAMP_FRAGMENT_COLOR, 16#891B).
 -define(GL_ALPHA_INTEGER, 16#8D97).
@@ -1145,6 +1150,40 @@
 -define(GL_SIGNED_NORMALIZED, 16#8F9C).
 -define(GL_PRIMITIVE_RESTART, 16#8F9D).
 -define(GL_PRIMITIVE_RESTART_INDEX, 16#8F9E).
+-define(GL_CONTEXT_CORE_PROFILE_BIT, 16#1).
+-define(GL_CONTEXT_COMPATIBILITY_PROFILE_BIT, 16#2).
+-define(GL_LINES_ADJACENCY, 16#A).
+-define(GL_LINE_STRIP_ADJACENCY, 16#B).
+-define(GL_TRIANGLES_ADJACENCY, 16#C).
+-define(GL_TRIANGLE_STRIP_ADJACENCY, 16#D).
+-define(GL_PROGRAM_POINT_SIZE, 16#8642).
+-define(GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS, 16#8C29).
+-define(GL_FRAMEBUFFER_ATTACHMENT_LAYERED, 16#8DA7).
+-define(GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS, 16#8DA8).
+-define(GL_GEOMETRY_SHADER, 16#8DD9).
+-define(GL_GEOMETRY_VERTICES_OUT, 16#8916).
+-define(GL_GEOMETRY_INPUT_TYPE, 16#8917).
+-define(GL_GEOMETRY_OUTPUT_TYPE, 16#8918).
+-define(GL_MAX_GEOMETRY_UNIFORM_COMPONENTS, 16#8DDF).
+-define(GL_MAX_GEOMETRY_OUTPUT_VERTICES, 16#8DE0).
+-define(GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS, 16#8DE1).
+-define(GL_MAX_VERTEX_OUTPUT_COMPONENTS, 16#9122).
+-define(GL_MAX_GEOMETRY_INPUT_COMPONENTS, 16#9123).
+-define(GL_MAX_GEOMETRY_OUTPUT_COMPONENTS, 16#9124).
+-define(GL_MAX_FRAGMENT_INPUT_COMPONENTS, 16#9125).
+-define(GL_CONTEXT_PROFILE_MASK, 16#9126).
+-define(GL_VERTEX_ATTRIB_ARRAY_DIVISOR, 16#88FE).
+-define(GL_SAMPLE_SHADING, 16#8C36).
+-define(GL_MIN_SAMPLE_SHADING_VALUE, 16#8C37).
+-define(GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET, 16#8E5E).
+-define(GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET, 16#8E5F).
+-define(GL_TEXTURE_CUBE_MAP_ARRAY, 16#9009).
+-define(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY, 16#900A).
+-define(GL_PROXY_TEXTURE_CUBE_MAP_ARRAY, 16#900B).
+-define(GL_SAMPLER_CUBE_MAP_ARRAY, 16#900C).
+-define(GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW, 16#900D).
+-define(GL_INT_SAMPLER_CUBE_MAP_ARRAY, 16#900E).
+-define(GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY, 16#900F).
 -define(GL_TEXTURE0_ARB, 16#84C0).
 -define(GL_TEXTURE1_ARB, 16#84C1).
 -define(GL_TEXTURE2_ARB, 16#84C2).
@@ -1712,6 +1751,211 @@
 -define(GL_INVALID_INDEX, 16#FFFFFFFF).
 -define(GL_COPY_READ_BUFFER, 16#8F36).
 -define(GL_COPY_WRITE_BUFFER, 16#8F37).
+-define(GL_DEPTH_CLAMP, 16#864F).
+-define(GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION, 16#8E4C).
+-define(GL_FIRST_VERTEX_CONVENTION, 16#8E4D).
+-define(GL_LAST_VERTEX_CONVENTION, 16#8E4E).
+-define(GL_PROVOKING_VERTEX, 16#8E4F).
+-define(GL_TEXTURE_CUBE_MAP_SEAMLESS, 16#884F).
+-define(GL_MAX_SERVER_WAIT_TIMEOUT, 16#9111).
+-define(GL_OBJECT_TYPE, 16#9112).
+-define(GL_SYNC_CONDITION, 16#9113).
+-define(GL_SYNC_STATUS, 16#9114).
+-define(GL_SYNC_FLAGS, 16#9115).
+-define(GL_SYNC_FENCE, 16#9116).
+-define(GL_SYNC_GPU_COMMANDS_COMPLETE, 16#9117).
+-define(GL_UNSIGNALED, 16#9118).
+-define(GL_SIGNALED, 16#9119).
+-define(GL_ALREADY_SIGNALED, 16#911A).
+-define(GL_TIMEOUT_EXPIRED, 16#911B).
+-define(GL_CONDITION_SATISFIED, 16#911C).
+-define(GL_WAIT_FAILED, 16#911D).
+-define(GL_SYNC_FLUSH_COMMANDS_BIT, 16#1).
+-define(GL_TIMEOUT_IGNORED, 16#FFFFFFFFFFFFFFFF).
+-define(GL_SAMPLE_POSITION, 16#8E50).
+-define(GL_SAMPLE_MASK, 16#8E51).
+-define(GL_SAMPLE_MASK_VALUE, 16#8E52).
+-define(GL_MAX_SAMPLE_MASK_WORDS, 16#8E59).
+-define(GL_TEXTURE_2D_MULTISAMPLE, 16#9100).
+-define(GL_PROXY_TEXTURE_2D_MULTISAMPLE, 16#9101).
+-define(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, 16#9102).
+-define(GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY, 16#9103).
+-define(GL_TEXTURE_BINDING_2D_MULTISAMPLE, 16#9104).
+-define(GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY, 16#9105).
+-define(GL_TEXTURE_SAMPLES, 16#9106).
+-define(GL_TEXTURE_FIXED_SAMPLE_LOCATIONS, 16#9107).
+-define(GL_SAMPLER_2D_MULTISAMPLE, 16#9108).
+-define(GL_INT_SAMPLER_2D_MULTISAMPLE, 16#9109).
+-define(GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE, 16#910A).
+-define(GL_SAMPLER_2D_MULTISAMPLE_ARRAY, 16#910B).
+-define(GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY, 16#910C).
+-define(GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY, 16#910D).
+-define(GL_MAX_COLOR_TEXTURE_SAMPLES, 16#910E).
+-define(GL_MAX_DEPTH_TEXTURE_SAMPLES, 16#910F).
+-define(GL_MAX_INTEGER_SAMPLES, 16#9110).
+-define(GL_SAMPLE_SHADING_ARB, 16#8C36).
+-define(GL_MIN_SAMPLE_SHADING_VALUE_ARB, 16#8C37).
+-define(GL_TEXTURE_CUBE_MAP_ARRAY_ARB, 16#9009).
+-define(GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB, 16#900A).
+-define(GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB, 16#900B).
+-define(GL_SAMPLER_CUBE_MAP_ARRAY_ARB, 16#900C).
+-define(GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB, 16#900D).
+-define(GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB, 16#900E).
+-define(GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB, 16#900F).
+-define(GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB, 16#8E5E).
+-define(GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB, 16#8E5F).
+-define(GL_SHADER_INCLUDE_ARB, 16#8DAE).
+-define(GL_NAMED_STRING_LENGTH_ARB, 16#8DE9).
+-define(GL_NAMED_STRING_TYPE_ARB, 16#8DEA).
+-define(GL_COMPRESSED_RGBA_BPTC_UNORM_ARB, 16#8E8C).
+-define(GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB, 16#8E8D).
+-define(GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB, 16#8E8E).
+-define(GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB, 16#8E8F).
+-define(GL_SRC1_COLOR, 16#88F9).
+-define(GL_ONE_MINUS_SRC1_COLOR, 16#88FA).
+-define(GL_ONE_MINUS_SRC1_ALPHA, 16#88FB).
+-define(GL_MAX_DUAL_SOURCE_DRAW_BUFFERS, 16#88FC).
+-define(GL_ANY_SAMPLES_PASSED, 16#8C2F).
+-define(GL_SAMPLER_BINDING, 16#8919).
+-define(GL_RGB10_A2UI, 16#906F).
+-define(GL_TEXTURE_SWIZZLE_R, 16#8E42).
+-define(GL_TEXTURE_SWIZZLE_G, 16#8E43).
+-define(GL_TEXTURE_SWIZZLE_B, 16#8E44).
+-define(GL_TEXTURE_SWIZZLE_A, 16#8E45).
+-define(GL_TEXTURE_SWIZZLE_RGBA, 16#8E46).
+-define(GL_TIME_ELAPSED, 16#88BF).
+-define(GL_TIMESTAMP, 16#8E28).
+-define(GL_INT_2_10_10_10_REV, 16#8D9F).
+-define(GL_DRAW_INDIRECT_BUFFER, 16#8F3F).
+-define(GL_DRAW_INDIRECT_BUFFER_BINDING, 16#8F43).
+-define(GL_GEOMETRY_SHADER_INVOCATIONS, 16#887F).
+-define(GL_MAX_GEOMETRY_SHADER_INVOCATIONS, 16#8E5A).
+-define(GL_MIN_FRAGMENT_INTERPOLATION_OFFSET, 16#8E5B).
+-define(GL_MAX_FRAGMENT_INTERPOLATION_OFFSET, 16#8E5C).
+-define(GL_FRAGMENT_INTERPOLATION_OFFSET_BITS, 16#8E5D).
+-define(GL_DOUBLE_VEC2, 16#8FFC).
+-define(GL_DOUBLE_VEC3, 16#8FFD).
+-define(GL_DOUBLE_VEC4, 16#8FFE).
+-define(GL_DOUBLE_MAT2, 16#8F46).
+-define(GL_DOUBLE_MAT3, 16#8F47).
+-define(GL_DOUBLE_MAT4, 16#8F48).
+-define(GL_DOUBLE_MAT2x3, 16#8F49).
+-define(GL_DOUBLE_MAT2x4, 16#8F4A).
+-define(GL_DOUBLE_MAT3x2, 16#8F4B).
+-define(GL_DOUBLE_MAT3x4, 16#8F4C).
+-define(GL_DOUBLE_MAT4x2, 16#8F4D).
+-define(GL_DOUBLE_MAT4x3, 16#8F4E).
+-define(GL_ACTIVE_SUBROUTINES, 16#8DE5).
+-define(GL_ACTIVE_SUBROUTINE_UNIFORMS, 16#8DE6).
+-define(GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS, 16#8E47).
+-define(GL_ACTIVE_SUBROUTINE_MAX_LENGTH, 16#8E48).
+-define(GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH, 16#8E49).
+-define(GL_MAX_SUBROUTINES, 16#8DE7).
+-define(GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS, 16#8DE8).
+-define(GL_NUM_COMPATIBLE_SUBROUTINES, 16#8E4A).
+-define(GL_COMPATIBLE_SUBROUTINES, 16#8E4B).
+-define(GL_PATCHES, 16#E).
+-define(GL_PATCH_VERTICES, 16#8E72).
+-define(GL_PATCH_DEFAULT_INNER_LEVEL, 16#8E73).
+-define(GL_PATCH_DEFAULT_OUTER_LEVEL, 16#8E74).
+-define(GL_TESS_CONTROL_OUTPUT_VERTICES, 16#8E75).
+-define(GL_TESS_GEN_MODE, 16#8E76).
+-define(GL_TESS_GEN_SPACING, 16#8E77).
+-define(GL_TESS_GEN_VERTEX_ORDER, 16#8E78).
+-define(GL_TESS_GEN_POINT_MODE, 16#8E79).
+-define(GL_ISOLINES, 16#8E7A).
+-define(GL_FRACTIONAL_ODD, 16#8E7B).
+-define(GL_FRACTIONAL_EVEN, 16#8E7C).
+-define(GL_MAX_PATCH_VERTICES, 16#8E7D).
+-define(GL_MAX_TESS_GEN_LEVEL, 16#8E7E).
+-define(GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS, 16#8E7F).
+-define(GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS, 16#8E80).
+-define(GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS, 16#8E81).
+-define(GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS, 16#8E82).
+-define(GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS, 16#8E83).
+-define(GL_MAX_TESS_PATCH_COMPONENTS, 16#8E84).
+-define(GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS, 16#8E85).
+-define(GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS, 16#8E86).
+-define(GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS, 16#8E89).
+-define(GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS, 16#8E8A).
+-define(GL_MAX_TESS_CONTROL_INPUT_COMPONENTS, 16#886C).
+-define(GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS, 16#886D).
+-define(GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS, 16#8E1E).
+-define(GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS, 16#8E1F).
+-define(GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER, 16#84F0).
+-define(GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER, 16#84F1).
+-define(GL_TESS_EVALUATION_SHADER, 16#8E87).
+-define(GL_TESS_CONTROL_SHADER, 16#8E88).
+-define(GL_TRANSFORM_FEEDBACK, 16#8E22).
+-define(GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED, 16#8E23).
+-define(GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE, 16#8E24).
+-define(GL_TRANSFORM_FEEDBACK_BINDING, 16#8E25).
+-define(GL_MAX_TRANSFORM_FEEDBACK_BUFFERS, 16#8E70).
+-define(GL_MAX_VERTEX_STREAMS, 16#8E71).
+-define(GL_FIXED, 16#140C).
+-define(GL_IMPLEMENTATION_COLOR_READ_TYPE, 16#8B9A).
+-define(GL_IMPLEMENTATION_COLOR_READ_FORMAT, 16#8B9B).
+-define(GL_LOW_FLOAT, 16#8DF0).
+-define(GL_MEDIUM_FLOAT, 16#8DF1).
+-define(GL_HIGH_FLOAT, 16#8DF2).
+-define(GL_LOW_INT, 16#8DF3).
+-define(GL_MEDIUM_INT, 16#8DF4).
+-define(GL_HIGH_INT, 16#8DF5).
+-define(GL_SHADER_COMPILER, 16#8DFA).
+-define(GL_NUM_SHADER_BINARY_FORMATS, 16#8DF9).
+-define(GL_MAX_VERTEX_UNIFORM_VECTORS, 16#8DFB).
+-define(GL_MAX_VARYING_VECTORS, 16#8DFC).
+-define(GL_MAX_FRAGMENT_UNIFORM_VECTORS, 16#8DFD).
+-define(GL_PROGRAM_BINARY_RETRIEVABLE_HINT, 16#8257).
+-define(GL_PROGRAM_BINARY_LENGTH, 16#8741).
+-define(GL_NUM_PROGRAM_BINARY_FORMATS, 16#87FE).
+-define(GL_PROGRAM_BINARY_FORMATS, 16#87FF).
+-define(GL_VERTEX_SHADER_BIT, 16#1).
+-define(GL_FRAGMENT_SHADER_BIT, 16#2).
+-define(GL_GEOMETRY_SHADER_BIT, 16#4).
+-define(GL_TESS_CONTROL_SHADER_BIT, 16#8).
+-define(GL_TESS_EVALUATION_SHADER_BIT, 16#10).
+-define(GL_ALL_SHADER_BITS, 16#FFFFFFFF).
+-define(GL_PROGRAM_SEPARABLE, 16#8258).
+-define(GL_ACTIVE_PROGRAM, 16#8259).
+-define(GL_PROGRAM_PIPELINE_BINDING, 16#825A).
+-define(GL_MAX_VIEWPORTS, 16#825B).
+-define(GL_VIEWPORT_SUBPIXEL_BITS, 16#825C).
+-define(GL_VIEWPORT_BOUNDS_RANGE, 16#825D).
+-define(GL_LAYER_PROVOKING_VERTEX, 16#825E).
+-define(GL_VIEWPORT_INDEX_PROVOKING_VERTEX, 16#825F).
+-define(GL_UNDEFINED_VERTEX, 16#8260).
+-define(GL_SYNC_CL_EVENT_ARB, 16#8240).
+-define(GL_SYNC_CL_EVENT_COMPLETE_ARB, 16#8241).
+-define(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB, 16#8242).
+-define(GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB, 16#8243).
+-define(GL_DEBUG_CALLBACK_FUNCTION_ARB, 16#8244).
+-define(GL_DEBUG_CALLBACK_USER_PARAM_ARB, 16#8245).
+-define(GL_DEBUG_SOURCE_API_ARB, 16#8246).
+-define(GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB, 16#8247).
+-define(GL_DEBUG_SOURCE_SHADER_COMPILER_ARB, 16#8248).
+-define(GL_DEBUG_SOURCE_THIRD_PARTY_ARB, 16#8249).
+-define(GL_DEBUG_SOURCE_APPLICATION_ARB, 16#824A).
+-define(GL_DEBUG_SOURCE_OTHER_ARB, 16#824B).
+-define(GL_DEBUG_TYPE_ERROR_ARB, 16#824C).
+-define(GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB, 16#824D).
+-define(GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB, 16#824E).
+-define(GL_DEBUG_TYPE_PORTABILITY_ARB, 16#824F).
+-define(GL_DEBUG_TYPE_PERFORMANCE_ARB, 16#8250).
+-define(GL_DEBUG_TYPE_OTHER_ARB, 16#8251).
+-define(GL_MAX_DEBUG_MESSAGE_LENGTH_ARB, 16#9143).
+-define(GL_MAX_DEBUG_LOGGED_MESSAGES_ARB, 16#9144).
+-define(GL_DEBUG_LOGGED_MESSAGES_ARB, 16#9145).
+-define(GL_DEBUG_SEVERITY_HIGH_ARB, 16#9146).
+-define(GL_DEBUG_SEVERITY_MEDIUM_ARB, 16#9147).
+-define(GL_DEBUG_SEVERITY_LOW_ARB, 16#9148).
+-define(GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB, 16#4).
+-define(GL_LOSE_CONTEXT_ON_RESET_ARB, 16#8252).
+-define(GL_GUILTY_CONTEXT_RESET_ARB, 16#8253).
+-define(GL_INNOCENT_CONTEXT_RESET_ARB, 16#8254).
+-define(GL_UNKNOWN_CONTEXT_RESET_ARB, 16#8255).
+-define(GL_RESET_NOTIFICATION_STRATEGY_ARB, 16#8256).
+-define(GL_NO_RESET_NOTIFICATION_ARB, 16#8261).
 -define(GL_CONSTANT_COLOR_EXT, 16#8001).
 -define(GL_ONE_MINUS_CONSTANT_COLOR_EXT, 16#8002).
 -define(GL_CONSTANT_ALPHA_EXT, 16#8003).
@@ -2921,9 +3165,9 @@
 -define(GL_ACTIVE_STENCIL_FACE_EXT, 16#8911).
 -define(GL_TEXT_FRAGMENT_SHADER_ATI, 16#8200).
 -define(GL_UNPACK_CLIENT_STORAGE_APPLE, 16#85B2).
--define(GL_ELEMENT_ARRAY_APPLE, 16#8768).
--define(GL_ELEMENT_ARRAY_TYPE_APPLE, 16#8769).
--define(GL_ELEMENT_ARRAY_POINTER_APPLE, 16#876A).
+-define(GL_ELEMENT_ARRAY_APPLE, 16#8A0C).
+-define(GL_ELEMENT_ARRAY_TYPE_APPLE, 16#8A0D).
+-define(GL_ELEMENT_ARRAY_POINTER_APPLE, 16#8A0E).
 -define(GL_DRAW_PIXELS_APPLE, 16#8A0A).
 -define(GL_FENCE_APPLE, 16#8A0B).
 -define(GL_VERTEX_ARRAY_BINDING_APPLE, 16#85B5).
@@ -2931,6 +3175,7 @@
 -define(GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE, 16#851E).
 -define(GL_VERTEX_ARRAY_STORAGE_HINT_APPLE, 16#851F).
 -define(GL_VERTEX_ARRAY_RANGE_POINTER_APPLE, 16#8521).
+-define(GL_STORAGE_CLIENT_APPLE, 16#85B4).
 -define(GL_STORAGE_CACHED_APPLE, 16#85BE).
 -define(GL_STORAGE_SHARED_APPLE, 16#85BF).
 -define(GL_YCBCR_422_APPLE, 16#85B9).
@@ -3244,6 +3489,12 @@
 -define(GL_SEPARATE_ATTRIBS_NV, 16#8C8D).
 -define(GL_TRANSFORM_FEEDBACK_BUFFER_NV, 16#8C8E).
 -define(GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV, 16#8C8F).
+-define(GL_LAYER_NV, 16#8DAA).
+-define(GL_NEXT_BUFFER_NV, -2).
+-define(GL_SKIP_COMPONENTS4_NV, -3).
+-define(GL_SKIP_COMPONENTS3_NV, -4).
+-define(GL_SKIP_COMPONENTS2_NV, -5).
+-define(GL_SKIP_COMPONENTS1_NV, -6).
 -define(GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT, 16#8DE2).
 -define(GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT, 16#8DE3).
 -define(GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT, 16#8DE4).
@@ -3335,11 +3586,11 @@
 -define(GL_SAMPLE_MASK_VALUE_NV, 16#8E52).
 -define(GL_TEXTURE_BINDING_RENDERBUFFER_NV, 16#8E53).
 -define(GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV, 16#8E54).
--define(GL_MAX_SAMPLE_MASK_WORDS_NV, 16#8E59).
 -define(GL_TEXTURE_RENDERBUFFER_NV, 16#8E55).
 -define(GL_SAMPLER_RENDERBUFFER_NV, 16#8E56).
 -define(GL_INT_SAMPLER_RENDERBUFFER_NV, 16#8E57).
 -define(GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV, 16#8E58).
+-define(GL_MAX_SAMPLE_MASK_WORDS_NV, 16#8E59).
 -define(GL_TRANSFORM_FEEDBACK_NV, 16#8E22).
 -define(GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV, 16#8E23).
 -define(GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV, 16#8E24).
@@ -3365,6 +3616,247 @@
 -define(GL_FIRST_VERTEX_CONVENTION_EXT, 16#8E4D).
 -define(GL_LAST_VERTEX_CONVENTION_EXT, 16#8E4E).
 -define(GL_PROVOKING_VERTEX_EXT, 16#8E4F).
+-define(GL_ALPHA_SNORM, 16#9010).
+-define(GL_LUMINANCE_SNORM, 16#9011).
+-define(GL_LUMINANCE_ALPHA_SNORM, 16#9012).
+-define(GL_INTENSITY_SNORM, 16#9013).
+-define(GL_ALPHA8_SNORM, 16#9014).
+-define(GL_LUMINANCE8_SNORM, 16#9015).
+-define(GL_LUMINANCE8_ALPHA8_SNORM, 16#9016).
+-define(GL_INTENSITY8_SNORM, 16#9017).
+-define(GL_ALPHA16_SNORM, 16#9018).
+-define(GL_LUMINANCE16_SNORM, 16#9019).
+-define(GL_LUMINANCE16_ALPHA16_SNORM, 16#901A).
+-define(GL_INTENSITY16_SNORM, 16#901B).
+-define(GL_TEXTURE_RANGE_LENGTH_APPLE, 16#85B7).
+-define(GL_TEXTURE_RANGE_POINTER_APPLE, 16#85B8).
+-define(GL_TEXTURE_STORAGE_HINT_APPLE, 16#85BC).
+-define(GL_STORAGE_PRIVATE_APPLE, 16#85BD).
+-define(GL_HALF_APPLE, 16#140B).
+-define(GL_RGBA_FLOAT32_APPLE, 16#8814).
+-define(GL_RGB_FLOAT32_APPLE, 16#8815).
+-define(GL_ALPHA_FLOAT32_APPLE, 16#8816).
+-define(GL_INTENSITY_FLOAT32_APPLE, 16#8817).
+-define(GL_LUMINANCE_FLOAT32_APPLE, 16#8818).
+-define(GL_LUMINANCE_ALPHA_FLOAT32_APPLE, 16#8819).
+-define(GL_RGBA_FLOAT16_APPLE, 16#881A).
+-define(GL_RGB_FLOAT16_APPLE, 16#881B).
+-define(GL_ALPHA_FLOAT16_APPLE, 16#881C).
+-define(GL_INTENSITY_FLOAT16_APPLE, 16#881D).
+-define(GL_LUMINANCE_FLOAT16_APPLE, 16#881E).
+-define(GL_LUMINANCE_ALPHA_FLOAT16_APPLE, 16#881F).
+-define(GL_COLOR_FLOAT_APPLE, 16#8A0F).
+-define(GL_VERTEX_ATTRIB_MAP1_APPLE, 16#8A00).
+-define(GL_VERTEX_ATTRIB_MAP2_APPLE, 16#8A01).
+-define(GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE, 16#8A02).
+-define(GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE, 16#8A03).
+-define(GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE, 16#8A04).
+-define(GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE, 16#8A05).
+-define(GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE, 16#8A06).
+-define(GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE, 16#8A07).
+-define(GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE, 16#8A08).
+-define(GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE, 16#8A09).
+-define(GL_AUX_DEPTH_STENCIL_APPLE, 16#8A14).
+-define(GL_BUFFER_OBJECT_APPLE, 16#85B3).
+-define(GL_RELEASED_APPLE, 16#8A19).
+-define(GL_VOLATILE_APPLE, 16#8A1A).
+-define(GL_RETAINED_APPLE, 16#8A1B).
+-define(GL_UNDEFINED_APPLE, 16#8A1C).
+-define(GL_PURGEABLE_APPLE, 16#8A1D).
+-define(GL_PACK_ROW_BYTES_APPLE, 16#8A15).
+-define(GL_UNPACK_ROW_BYTES_APPLE, 16#8A16).
+-define(GL_RGB_422_APPLE, 16#8A1F).
+-define(GL_VIDEO_BUFFER_NV, 16#9020).
+-define(GL_VIDEO_BUFFER_BINDING_NV, 16#9021).
+-define(GL_FIELD_UPPER_NV, 16#9022).
+-define(GL_FIELD_LOWER_NV, 16#9023).
+-define(GL_NUM_VIDEO_CAPTURE_STREAMS_NV, 16#9024).
+-define(GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV, 16#9025).
+-define(GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV, 16#9026).
+-define(GL_LAST_VIDEO_CAPTURE_STATUS_NV, 16#9027).
+-define(GL_VIDEO_BUFFER_PITCH_NV, 16#9028).
+-define(GL_VIDEO_COLOR_CONVERSION_MATRIX_NV, 16#9029).
+-define(GL_VIDEO_COLOR_CONVERSION_MAX_NV, 16#902A).
+-define(GL_VIDEO_COLOR_CONVERSION_MIN_NV, 16#902B).
+-define(GL_VIDEO_COLOR_CONVERSION_OFFSET_NV, 16#902C).
+-define(GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV, 16#902D).
+-define(GL_PARTIAL_SUCCESS_NV, 16#902E).
+-define(GL_SUCCESS_NV, 16#902F).
+-define(GL_FAILURE_NV, 16#9030).
+-define(GL_YCBYCR8_422_NV, 16#9031).
+-define(GL_YCBAYCR8A_4224_NV, 16#9032).
+-define(GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV, 16#9033).
+-define(GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV, 16#9034).
+-define(GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV, 16#9035).
+-define(GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV, 16#9036).
+-define(GL_Z4Y12Z4CB12Z4CR12_444_NV, 16#9037).
+-define(GL_VIDEO_CAPTURE_FRAME_WIDTH_NV, 16#9038).
+-define(GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV, 16#9039).
+-define(GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV, 16#903A).
+-define(GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV, 16#903B).
+-define(GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV, 16#903C).
+-define(GL_ACTIVE_PROGRAM_EXT, 16#8B8D).
+-define(GL_BUFFER_GPU_ADDRESS_NV, 16#8F1D).
+-define(GL_GPU_ADDRESS_NV, 16#8F34).
+-define(GL_MAX_SHADER_BUFFER_ADDRESS_NV, 16#8F35).
+-define(GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV, 16#8F1E).
+-define(GL_ELEMENT_ARRAY_UNIFIED_NV, 16#8F1F).
+-define(GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV, 16#8F20).
+-define(GL_VERTEX_ARRAY_ADDRESS_NV, 16#8F21).
+-define(GL_NORMAL_ARRAY_ADDRESS_NV, 16#8F22).
+-define(GL_COLOR_ARRAY_ADDRESS_NV, 16#8F23).
+-define(GL_INDEX_ARRAY_ADDRESS_NV, 16#8F24).
+-define(GL_TEXTURE_COORD_ARRAY_ADDRESS_NV, 16#8F25).
+-define(GL_EDGE_FLAG_ARRAY_ADDRESS_NV, 16#8F26).
+-define(GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV, 16#8F27).
+-define(GL_FOG_COORD_ARRAY_ADDRESS_NV, 16#8F28).
+-define(GL_ELEMENT_ARRAY_ADDRESS_NV, 16#8F29).
+-define(GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV, 16#8F2A).
+-define(GL_VERTEX_ARRAY_LENGTH_NV, 16#8F2B).
+-define(GL_NORMAL_ARRAY_LENGTH_NV, 16#8F2C).
+-define(GL_COLOR_ARRAY_LENGTH_NV, 16#8F2D).
+-define(GL_INDEX_ARRAY_LENGTH_NV, 16#8F2E).
+-define(GL_TEXTURE_COORD_ARRAY_LENGTH_NV, 16#8F2F).
+-define(GL_EDGE_FLAG_ARRAY_LENGTH_NV, 16#8F30).
+-define(GL_SECONDARY_COLOR_ARRAY_LENGTH_NV, 16#8F31).
+-define(GL_FOG_COORD_ARRAY_LENGTH_NV, 16#8F32).
+-define(GL_ELEMENT_ARRAY_LENGTH_NV, 16#8F33).
+-define(GL_DRAW_INDIRECT_UNIFIED_NV, 16#8F40).
+-define(GL_DRAW_INDIRECT_ADDRESS_NV, 16#8F41).
+-define(GL_DRAW_INDIRECT_LENGTH_NV, 16#8F42).
+-define(GL_MAX_IMAGE_UNITS_EXT, 16#8F38).
+-define(GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT, 16#8F39).
+-define(GL_IMAGE_BINDING_NAME_EXT, 16#8F3A).
+-define(GL_IMAGE_BINDING_LEVEL_EXT, 16#8F3B).
+-define(GL_IMAGE_BINDING_LAYERED_EXT, 16#8F3C).
+-define(GL_IMAGE_BINDING_LAYER_EXT, 16#8F3D).
+-define(GL_IMAGE_BINDING_ACCESS_EXT, 16#8F3E).
+-define(GL_IMAGE_1D_EXT, 16#904C).
+-define(GL_IMAGE_2D_EXT, 16#904D).
+-define(GL_IMAGE_3D_EXT, 16#904E).
+-define(GL_IMAGE_2D_RECT_EXT, 16#904F).
+-define(GL_IMAGE_CUBE_EXT, 16#9050).
+-define(GL_IMAGE_BUFFER_EXT, 16#9051).
+-define(GL_IMAGE_1D_ARRAY_EXT, 16#9052).
+-define(GL_IMAGE_2D_ARRAY_EXT, 16#9053).
+-define(GL_IMAGE_CUBE_MAP_ARRAY_EXT, 16#9054).
+-define(GL_IMAGE_2D_MULTISAMPLE_EXT, 16#9055).
+-define(GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT, 16#9056).
+-define(GL_INT_IMAGE_1D_EXT, 16#9057).
+-define(GL_INT_IMAGE_2D_EXT, 16#9058).
+-define(GL_INT_IMAGE_3D_EXT, 16#9059).
+-define(GL_INT_IMAGE_2D_RECT_EXT, 16#905A).
+-define(GL_INT_IMAGE_CUBE_EXT, 16#905B).
+-define(GL_INT_IMAGE_BUFFER_EXT, 16#905C).
+-define(GL_INT_IMAGE_1D_ARRAY_EXT, 16#905D).
+-define(GL_INT_IMAGE_2D_ARRAY_EXT, 16#905E).
+-define(GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT, 16#905F).
+-define(GL_INT_IMAGE_2D_MULTISAMPLE_EXT, 16#9060).
+-define(GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT, 16#9061).
+-define(GL_UNSIGNED_INT_IMAGE_1D_EXT, 16#9062).
+-define(GL_UNSIGNED_INT_IMAGE_2D_EXT, 16#9063).
+-define(GL_UNSIGNED_INT_IMAGE_3D_EXT, 16#9064).
+-define(GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT, 16#9065).
+-define(GL_UNSIGNED_INT_IMAGE_CUBE_EXT, 16#9066).
+-define(GL_UNSIGNED_INT_IMAGE_BUFFER_EXT, 16#9067).
+-define(GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT, 16#9068).
+-define(GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT, 16#9069).
+-define(GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT, 16#906A).
+-define(GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT, 16#906B).
+-define(GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT, 16#906C).
+-define(GL_MAX_IMAGE_SAMPLES_EXT, 16#906D).
+-define(GL_IMAGE_BINDING_FORMAT_EXT, 16#906E).
+-define(GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT, 16#1).
+-define(GL_ELEMENT_ARRAY_BARRIER_BIT_EXT, 16#2).
+-define(GL_UNIFORM_BARRIER_BIT_EXT, 16#4).
+-define(GL_TEXTURE_FETCH_BARRIER_BIT_EXT, 16#8).
+-define(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT, 16#20).
+-define(GL_COMMAND_BARRIER_BIT_EXT, 16#40).
+-define(GL_PIXEL_BUFFER_BARRIER_BIT_EXT, 16#80).
+-define(GL_TEXTURE_UPDATE_BARRIER_BIT_EXT, 16#100).
+-define(GL_BUFFER_UPDATE_BARRIER_BIT_EXT, 16#200).
+-define(GL_FRAMEBUFFER_BARRIER_BIT_EXT, 16#400).
+-define(GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT, 16#800).
+-define(GL_ATOMIC_COUNTER_BARRIER_BIT_EXT, 16#1000).
+-define(GL_ALL_BARRIER_BITS_EXT, 16#FFFFFFFF).
+-define(GL_DOUBLE_VEC2_EXT, 16#8FFC).
+-define(GL_DOUBLE_VEC3_EXT, 16#8FFD).
+-define(GL_DOUBLE_VEC4_EXT, 16#8FFE).
+-define(GL_DOUBLE_MAT2_EXT, 16#8F46).
+-define(GL_DOUBLE_MAT3_EXT, 16#8F47).
+-define(GL_DOUBLE_MAT4_EXT, 16#8F48).
+-define(GL_DOUBLE_MAT2x3_EXT, 16#8F49).
+-define(GL_DOUBLE_MAT2x4_EXT, 16#8F4A).
+-define(GL_DOUBLE_MAT3x2_EXT, 16#8F4B).
+-define(GL_DOUBLE_MAT3x4_EXT, 16#8F4C).
+-define(GL_DOUBLE_MAT4x2_EXT, 16#8F4D).
+-define(GL_DOUBLE_MAT4x3_EXT, 16#8F4E).
+-define(GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV, 16#8E5A).
+-define(GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV, 16#8E5B).
+-define(GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV, 16#8E5C).
+-define(GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV, 16#8E5D).
+-define(GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV, 16#8E5E).
+-define(GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV, 16#8E5F).
+-define(GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV, 16#8F44).
+-define(GL_MAX_PROGRAM_SUBROUTINE_NUM_NV, 16#8F45).
+-define(GL_INT64_NV, 16#140E).
+-define(GL_UNSIGNED_INT64_NV, 16#140F).
+-define(GL_INT8_NV, 16#8FE0).
+-define(GL_INT8_VEC2_NV, 16#8FE1).
+-define(GL_INT8_VEC3_NV, 16#8FE2).
+-define(GL_INT8_VEC4_NV, 16#8FE3).
+-define(GL_INT16_NV, 16#8FE4).
+-define(GL_INT16_VEC2_NV, 16#8FE5).
+-define(GL_INT16_VEC3_NV, 16#8FE6).
+-define(GL_INT16_VEC4_NV, 16#8FE7).
+-define(GL_INT64_VEC2_NV, 16#8FE9).
+-define(GL_INT64_VEC3_NV, 16#8FEA).
+-define(GL_INT64_VEC4_NV, 16#8FEB).
+-define(GL_UNSIGNED_INT8_NV, 16#8FEC).
+-define(GL_UNSIGNED_INT8_VEC2_NV, 16#8FED).
+-define(GL_UNSIGNED_INT8_VEC3_NV, 16#8FEE).
+-define(GL_UNSIGNED_INT8_VEC4_NV, 16#8FEF).
+-define(GL_UNSIGNED_INT16_NV, 16#8FF0).
+-define(GL_UNSIGNED_INT16_VEC2_NV, 16#8FF1).
+-define(GL_UNSIGNED_INT16_VEC3_NV, 16#8FF2).
+-define(GL_UNSIGNED_INT16_VEC4_NV, 16#8FF3).
+-define(GL_UNSIGNED_INT64_VEC2_NV, 16#8FF5).
+-define(GL_UNSIGNED_INT64_VEC3_NV, 16#8FF6).
+-define(GL_UNSIGNED_INT64_VEC4_NV, 16#8FF7).
+-define(GL_FLOAT16_NV, 16#8FF8).
+-define(GL_FLOAT16_VEC2_NV, 16#8FF9).
+-define(GL_FLOAT16_VEC3_NV, 16#8FFA).
+-define(GL_FLOAT16_VEC4_NV, 16#8FFB).
+-define(GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV, 16#10).
+-define(GL_MAX_PROGRAM_PATCH_ATTRIBS_NV, 16#86D8).
+-define(GL_TESS_CONTROL_PROGRAM_NV, 16#891E).
+-define(GL_TESS_EVALUATION_PROGRAM_NV, 16#891F).
+-define(GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV, 16#8C74).
+-define(GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV, 16#8C75).
+-define(GL_COVERAGE_SAMPLES_NV, 16#80A9).
+-define(GL_COLOR_SAMPLES_NV, 16#8E20).
+-define(GL_DATA_BUFFER_AMD, 16#9151).
+-define(GL_PERFORMANCE_MONITOR_AMD, 16#9152).
+-define(GL_QUERY_OBJECT_AMD, 16#9153).
+-define(GL_VERTEX_ARRAY_OBJECT_AMD, 16#9154).
+-define(GL_SAMPLER_OBJECT_AMD, 16#9155).
+-define(GL_MAX_DEBUG_LOGGED_MESSAGES_AMD, 16#9144).
+-define(GL_DEBUG_LOGGED_MESSAGES_AMD, 16#9145).
+-define(GL_DEBUG_SEVERITY_HIGH_AMD, 16#9146).
+-define(GL_DEBUG_SEVERITY_MEDIUM_AMD, 16#9147).
+-define(GL_DEBUG_SEVERITY_LOW_AMD, 16#9148).
+-define(GL_DEBUG_CATEGORY_API_ERROR_AMD, 16#9149).
+-define(GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD, 16#914A).
+-define(GL_DEBUG_CATEGORY_DEPRECATION_AMD, 16#914B).
+-define(GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD, 16#914C).
+-define(GL_DEBUG_CATEGORY_PERFORMANCE_AMD, 16#914D).
+-define(GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD, 16#914E).
+-define(GL_DEBUG_CATEGORY_APPLICATION_AMD, 16#914F).
+-define(GL_DEBUG_CATEGORY_OTHER_AMD, 16#9150).
+-define(GL_SURFACE_STATE_NV, 16#86EB).
+-define(GL_SURFACE_REGISTERED_NV, 16#86FD).
+-define(GL_SURFACE_MAPPED_NV, 16#8700).
+-define(GL_WRITE_DISCARD_NV, 16#88BE).
 -define(GL_VERSION_1_2, 1).
 -define(GL_VERSION_1_2_DEPRECATED, 1).
 -define(GL_VERSION_1_3, 1).
@@ -3375,8 +3867,11 @@
 -define(GL_VERSION_2_0, 1).
 -define(GL_VERSION_2_1, 1).
 -define(GL_VERSION_3_0, 1).
--define(GL_VERSION_3_0_DEPRECATED, 1).
 -define(GL_VERSION_3_1, 1).
+-define(GL_VERSION_3_2, 1).
+-define(GL_VERSION_3_3, 1).
+-define(GL_VERSION_4_0, 1).
+-define(GL_VERSION_4_1, 1).
 -define(GL_ARB_multitexture, 1).
 -define(GL_ARB_transpose_matrix, 1).
 -define(GL_ARB_multisample, 1).
@@ -3428,6 +3923,46 @@
 -define(GL_ARB_compatibility, 1).
 -define(GL_ARB_copy_buffer, 1).
 -define(GL_ARB_shader_texture_lod, 1).
+-define(GL_ARB_depth_clamp, 1).
+-define(GL_ARB_draw_elements_base_vertex, 1).
+-define(GL_ARB_fragment_coord_conventions, 1).
+-define(GL_ARB_provoking_vertex, 1).
+-define(GL_ARB_seamless_cube_map, 1).
+-define(GL_ARB_sync, 1).
+-define(GL_ARB_texture_multisample, 1).
+-define(GL_ARB_vertex_array_bgra, 1).
+-define(GL_ARB_draw_buffers_blend, 1).
+-define(GL_ARB_sample_shading, 1).
+-define(GL_ARB_texture_cube_map_array, 1).
+-define(GL_ARB_texture_gather, 1).
+-define(GL_ARB_texture_query_lod, 1).
+-define(GL_ARB_shading_language_include, 1).
+-define(GL_ARB_texture_compression_bptc, 1).
+-define(GL_ARB_blend_func_extended, 1).
+-define(GL_ARB_explicit_attrib_location, 1).
+-define(GL_ARB_occlusion_query2, 1).
+-define(GL_ARB_sampler_objects, 1).
+-define(GL_ARB_texture_rgb10_a2ui, 1).
+-define(GL_ARB_texture_swizzle, 1).
+-define(GL_ARB_timer_query, 1).
+-define(GL_ARB_vertex_type_2_10_10_10_rev, 1).
+-define(GL_ARB_draw_indirect, 1).
+-define(GL_ARB_gpu_shader5, 1).
+-define(GL_ARB_gpu_shader_fp64, 1).
+-define(GL_ARB_shader_subroutine, 1).
+-define(GL_ARB_tessellation_shader, 1).
+-define(GL_ARB_texture_buffer_object_rgb32, 1).
+-define(GL_ARB_transform_feedback2, 1).
+-define(GL_ARB_transform_feedback3, 1).
+-define(GL_ARB_ES2_compatibility, 1).
+-define(GL_ARB_get_program_binary, 1).
+-define(GL_ARB_separate_shader_objects, 1).
+-define(GL_ARB_vertex_attrib_64bit, 1).
+-define(GL_ARB_viewport_array, 1).
+-define(GL_ARB_cl_event, 1).
+-define(GL_ARB_debug_output, 1).
+-define(GL_ARB_robustness, 1).
+-define(GL_ARB_shader_stencil_export, 1).
 -define(GL_EXT_abgr, 1).
 -define(GL_EXT_blend_color, 1).
 -define(GL_EXT_polygon_offset, 1).
@@ -3684,3 +4219,34 @@
 -define(GL_AMD_texture_texture4, 1).
 -define(GL_AMD_vertex_shader_tesselator, 1).
 -define(GL_EXT_provoking_vertex, 1).
+-define(GL_EXT_texture_snorm, 1).
+-define(GL_AMD_draw_buffers_blend, 1).
+-define(GL_APPLE_texture_range, 1).
+-define(GL_APPLE_float_pixels, 1).
+-define(GL_APPLE_vertex_program_evaluators, 1).
+-define(GL_APPLE_aux_depth_stencil, 1).
+-define(GL_APPLE_object_purgeable, 1).
+-define(GL_APPLE_row_bytes, 1).
+-define(GL_APPLE_rgb_422, 1).
+-define(GL_NV_video_capture, 1).
+-define(GL_NV_copy_image, 1).
+-define(GL_EXT_separate_shader_objects, 1).
+-define(GL_NV_parameter_buffer_object2, 1).
+-define(GL_NV_shader_buffer_load, 1).
+-define(GL_NV_vertex_buffer_unified_memory, 1).
+-define(GL_NV_texture_barrier, 1).
+-define(GL_AMD_shader_stencil_export, 1).
+-define(GL_AMD_seamless_cubemap_per_texture, 1).
+-define(GL_AMD_conservative_depth, 1).
+-define(GL_EXT_shader_image_load_store, 1).
+-define(GL_EXT_vertex_attrib_64bit, 1).
+-define(GL_NV_gpu_program5, 1).
+-define(GL_NV_gpu_shader5, 1).
+-define(GL_NV_shader_buffer_store, 1).
+-define(GL_NV_tessellation_program5, 1).
+-define(GL_NV_vertex_attrib_integer_64bit, 1).
+-define(GL_NV_multisample_coverage, 1).
+-define(GL_AMD_name_gen_delete, 1).
+-define(GL_AMD_debug_output, 1).
+-define(GL_NV_vdpau_interop, 1).
+-define(GL_AMD_transform_feedback3_lines_triangles, 1).
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
index a9fd468959..3cc668375f 100644
--- a/lib/wx/src/Makefile
+++ b/lib/wx/src/Makefile
@@ -47,7 +47,6 @@ GEN_FILES       = $(wildcard gen/wx*.erl) \
 GEN_MODS        = $(GEN_FILES:gen/%.erl=  %,\n )
 
 GEN_HRL		= \
-		$(EGEN)/gl_debug.hrl \
 		$(EGEN)/wxe_debug.hrl \
 		$(EGEN)/wxe_funcs.hrl
 
diff --git a/lib/wx/src/gen/gl.erl b/lib/wx/src/gen/gl.erl
index 62d0ff6aed..0ebf51d28a 100644
--- a/lib/wx/src/gen/gl.erl
+++ b/lib/wx/src/gen/gl.erl
@@ -25,14 +25,13 @@
 %%
 %% Booleans are represented by integers 0 and 1.
 
-%% @type wx_mem(). see wx.erl on memory allocation functions
+%% @type mem().    memory block
 %% @type enum().   An integer defined in gl.hrl
 %% @type offset(). An integer which is an offset in an array
 %% @type clamp().  A float clamped between 0.0 - 1.0
 -module(gl).
 
 -compile(inline).
--include("wxe.hrl").
 -define(GLenum,32/native-unsigned).
 -define(GLboolean,8/native-unsigned).
 -define(GLbitfield,32/native-unsigned).
@@ -51,6 +50,13 @@
 -define(GLintptr,64/native-unsigned).
 -define(GLUquadric,64/native-unsigned).
 -define(GLhandleARB,64/native-unsigned).
+-define(GLsync,64/native-unsigned).
+-define(GLuint64,64/native-unsigned).
+-define(GLint64,64/native-signed).
+-type clamp() :: float().
+-type offset() :: non_neg_integer().
+-type enum() :: non_neg_integer().
+-type mem() :: binary() | tuple().
 
 -export([accum/2,alphaFunc/2,areTexturesResident/1,arrayElement/1,'begin'/1,
   bindTexture/2,bitmap/7,blendFunc/2,callList/1,callLists/1,clear/1,clearAccum/4,
@@ -173,3862 +179,5840 @@
   enablei/2,disablei/2,isEnabledi/2,beginTransformFeedback/1,endTransformFeedback/0,
   bindBufferRange/5,bindBufferBase/3,transformFeedbackVaryings/3,getTransformFeedbackVarying/3,
   clampColor/2,beginConditionalRender/2,endConditionalRender/0,vertexAttribIPointer/5,
-  getVertexAttribIiv/2,getVertexAttribIuiv/2,getUniformuiv/2,bindFragDataLocation/3,
+  getVertexAttribIiv/2,getVertexAttribIuiv/2,vertexAttribI1i/2,vertexAttribI2i/3,
+  vertexAttribI3i/4,vertexAttribI4i/5,vertexAttribI1ui/2,vertexAttribI2ui/3,
+  vertexAttribI3ui/4,vertexAttribI4ui/5,vertexAttribI1iv/2,vertexAttribI2iv/2,
+  vertexAttribI3iv/2,vertexAttribI4iv/2,vertexAttribI1uiv/2,vertexAttribI2uiv/2,
+  vertexAttribI3uiv/2,vertexAttribI4uiv/2,vertexAttribI4bv/2,vertexAttribI4sv/2,
+  vertexAttribI4ubv/2,vertexAttribI4usv/2,getUniformuiv/2,bindFragDataLocation/3,
   getFragDataLocation/2,uniform1ui/2,uniform2ui/3,uniform3ui/4,uniform4ui/5,
   uniform1uiv/2,uniform2uiv/2,uniform3uiv/2,uniform4uiv/2,texParameterIiv/3,
   texParameterIuiv/3,getTexParameterIiv/2,getTexParameterIuiv/2,clearBufferiv/3,
-  clearBufferuiv/3,clearBufferfv/3,clearBufferfi/4,getStringi/2,vertexAttribI1i/2,
-  vertexAttribI2i/3,vertexAttribI3i/4,vertexAttribI4i/5,vertexAttribI1ui/2,
-  vertexAttribI2ui/3,vertexAttribI3ui/4,vertexAttribI4ui/5,vertexAttribI1iv/2,
-  vertexAttribI2iv/2,vertexAttribI3iv/2,vertexAttribI4iv/2,vertexAttribI1uiv/2,
-  vertexAttribI2uiv/2,vertexAttribI3uiv/2,vertexAttribI4uiv/2,vertexAttribI4bv/2,
-  vertexAttribI4sv/2,vertexAttribI4ubv/2,vertexAttribI4usv/2,drawArraysInstanced/4,
-  drawElementsInstanced/5,texBuffer/3,primitiveRestartIndex/1,loadTransposeMatrixfARB/1,
-  loadTransposeMatrixdARB/1,multTransposeMatrixfARB/1,multTransposeMatrixdARB/1,
-  weightbvARB/1,weightsvARB/1,weightivARB/1,weightfvARB/1,weightdvARB/1,
-  weightubvARB/1,weightusvARB/1,weightuivARB/1,vertexBlendARB/1,currentPaletteMatrixARB/1,
+  clearBufferuiv/3,clearBufferfv/3,clearBufferfi/4,getStringi/2,drawArraysInstanced/4,
+  drawElementsInstanced/5,texBuffer/3,primitiveRestartIndex/1,getInteger64i_v/2,
+  getBufferParameteri64v/2,framebufferTexture/4,vertexAttribDivisor/2,
+  minSampleShading/1,blendEquationi/2,blendEquationSeparatei/3,blendFunci/3,
+  blendFuncSeparatei/5,loadTransposeMatrixfARB/1,loadTransposeMatrixdARB/1,
+  multTransposeMatrixfARB/1,multTransposeMatrixdARB/1,weightbvARB/1,
+  weightsvARB/1,weightivARB/1,weightfvARB/1,weightdvARB/1,weightubvARB/1,
+  weightusvARB/1,weightuivARB/1,vertexBlendARB/1,currentPaletteMatrixARB/1,
   matrixIndexubvARB/1,matrixIndexusvARB/1,matrixIndexuivARB/1,programStringARB/3,
   bindProgramARB/2,deleteProgramsARB/1,genProgramsARB/1,programEnvParameter4dARB/6,
   programEnvParameter4dvARB/3,programEnvParameter4fARB/6,programEnvParameter4fvARB/3,
   programLocalParameter4dARB/6,programLocalParameter4dvARB/3,programLocalParameter4fARB/6,
   programLocalParameter4fvARB/3,getProgramEnvParameterdvARB/2,getProgramEnvParameterfvARB/2,
   getProgramLocalParameterdvARB/2,getProgramLocalParameterfvARB/2,
-  getProgramStringARB/3,deleteObjectARB/1,getHandleARB/1,detachObjectARB/2,
-  createShaderObjectARB/1,shaderSourceARB/2,compileShaderARB/1,createProgramObjectARB/0,
-  attachObjectARB/2,linkProgramARB/1,useProgramObjectARB/1,validateProgramARB/1,
-  getObjectParameterfvARB/2,getObjectParameterivARB/2,getInfoLogARB/2,
-  getAttachedObjectsARB/2,getUniformLocationARB/2,getActiveUniformARB/3,
-  getUniformfvARB/2,getUniformivARB/2,getShaderSourceARB/2,bindAttribLocationARB/3,
-  getActiveAttribARB/3,getAttribLocationARB/2,isRenderbuffer/1,bindRenderbuffer/2,
-  deleteRenderbuffers/1,genRenderbuffers/1,renderbufferStorage/4,getRenderbufferParameteriv/2,
+  getProgramStringARB/3,getBufferParameterivARB/2,deleteObjectARB/1,
+  getHandleARB/1,detachObjectARB/2,createShaderObjectARB/1,shaderSourceARB/2,
+  compileShaderARB/1,createProgramObjectARB/0,attachObjectARB/2,linkProgramARB/1,
+  useProgramObjectARB/1,validateProgramARB/1,getObjectParameterfvARB/2,
+  getObjectParameterivARB/2,getInfoLogARB/2,getAttachedObjectsARB/2,
+  getUniformLocationARB/2,getActiveUniformARB/3,getUniformfvARB/2,
+  getUniformivARB/2,getShaderSourceARB/2,bindAttribLocationARB/3,getActiveAttribARB/3,
+  getAttribLocationARB/2,isRenderbuffer/1,bindRenderbuffer/2,deleteRenderbuffers/1,
+  genRenderbuffers/1,renderbufferStorage/4,getRenderbufferParameteriv/2,
   isFramebuffer/1,bindFramebuffer/2,deleteFramebuffers/1,genFramebuffers/1,
   checkFramebufferStatus/1,framebufferTexture1D/5,framebufferTexture2D/5,
   framebufferTexture3D/6,framebufferRenderbuffer/4,getFramebufferAttachmentParameteriv/3,
   generateMipmap/1,blitFramebuffer/10,renderbufferStorageMultisample/5,
-  framebufferTextureLayer/5,programParameteriARB/3,framebufferTextureARB/4,
-  framebufferTextureFaceARB/5,vertexAttribDivisorARB/2,flushMappedBufferRange/3,
+  framebufferTextureLayer/5,framebufferTextureFaceARB/5,flushMappedBufferRange/3,
   bindVertexArray/1,deleteVertexArrays/1,genVertexArrays/1,isVertexArray/1,
   getUniformIndices/2,getActiveUniformsiv/3,getActiveUniformName/3,
   getUniformBlockIndex/2,getActiveUniformBlockiv/4,getActiveUniformBlockName/3,
-  uniformBlockBinding/3,copyBufferSubData/5,resizeBuffersMESA/0,windowPos4dMESA/4,
+  uniformBlockBinding/3,copyBufferSubData/5,drawElementsBaseVertex/5,
+  drawRangeElementsBaseVertex/7,drawElementsInstancedBaseVertex/6,
+  provokingVertex/1,fenceSync/2,isSync/1,deleteSync/1,clientWaitSync/3,
+  waitSync/3,getInteger64v/1,getSynciv/3,texImage2DMultisample/6,texImage3DMultisample/7,
+  getMultisamplefv/2,sampleMaski/2,namedStringARB/3,deleteNamedStringARB/1,
+  compileShaderIncludeARB/2,isNamedStringARB/1,getNamedStringARB/2,
+  getNamedStringivARB/2,bindFragDataLocationIndexed/4,getFragDataIndex/2,
+  genSamplers/1,deleteSamplers/1,isSampler/1,bindSampler/2,samplerParameteri/3,
+  samplerParameteriv/3,samplerParameterf/3,samplerParameterfv/3,samplerParameterIiv/3,
+  samplerParameterIuiv/3,getSamplerParameteriv/2,getSamplerParameterIiv/2,
+  getSamplerParameterfv/2,getSamplerParameterIuiv/2,queryCounter/2,
+  getQueryObjecti64v/2,getQueryObjectui64v/2,drawArraysIndirect/2,
+  drawElementsIndirect/3,uniform1d/2,uniform2d/3,uniform3d/4,uniform4d/5,
+  uniform1dv/2,uniform2dv/2,uniform3dv/2,uniform4dv/2,uniformMatrix2dv/3,
+  uniformMatrix3dv/3,uniformMatrix4dv/3,uniformMatrix2x3dv/3,uniformMatrix2x4dv/3,
+  uniformMatrix3x2dv/3,uniformMatrix3x4dv/3,uniformMatrix4x2dv/3,uniformMatrix4x3dv/3,
+  getUniformdv/2,getSubroutineUniformLocation/3,getSubroutineIndex/3,
+  getActiveSubroutineUniformName/4,getActiveSubroutineName/4,uniformSubroutinesuiv/2,
+  getUniformSubroutineuiv/2,getProgramStageiv/3,patchParameteri/2,
+  patchParameterfv/2,bindTransformFeedback/2,deleteTransformFeedbacks/1,
+  genTransformFeedbacks/1,isTransformFeedback/1,pauseTransformFeedback/0,
+  resumeTransformFeedback/0,drawTransformFeedback/2,drawTransformFeedbackStream/3,
+  beginQueryIndexed/3,endQueryIndexed/2,getQueryIndexediv/3,releaseShaderCompiler/0,
+  shaderBinary/3,getShaderPrecisionFormat/2,depthRangef/2,clearDepthf/1,
+  getProgramBinary/2,programBinary/3,programParameteri/3,useProgramStages/3,
+  activeShaderProgram/2,createShaderProgramv/2,bindProgramPipeline/1,
+  deleteProgramPipelines/1,genProgramPipelines/1,isProgramPipeline/1,
+  getProgramPipelineiv/2,programUniform1i/3,programUniform1iv/3,programUniform1f/3,
+  programUniform1fv/3,programUniform1d/3,programUniform1dv/3,programUniform1ui/3,
+  programUniform1uiv/3,programUniform2i/4,programUniform2iv/3,programUniform2f/4,
+  programUniform2fv/3,programUniform2d/4,programUniform2dv/3,programUniform2ui/4,
+  programUniform2uiv/3,programUniform3i/5,programUniform3iv/3,programUniform3f/5,
+  programUniform3fv/3,programUniform3d/5,programUniform3dv/3,programUniform3ui/5,
+  programUniform3uiv/3,programUniform4i/6,programUniform4iv/3,programUniform4f/6,
+  programUniform4fv/3,programUniform4d/6,programUniform4dv/3,programUniform4ui/6,
+  programUniform4uiv/3,programUniformMatrix2fv/4,programUniformMatrix3fv/4,
+  programUniformMatrix4fv/4,programUniformMatrix2dv/4,programUniformMatrix3dv/4,
+  programUniformMatrix4dv/4,programUniformMatrix2x3fv/4,programUniformMatrix3x2fv/4,
+  programUniformMatrix2x4fv/4,programUniformMatrix4x2fv/4,programUniformMatrix3x4fv/4,
+  programUniformMatrix4x3fv/4,programUniformMatrix2x3dv/4,programUniformMatrix3x2dv/4,
+  programUniformMatrix2x4dv/4,programUniformMatrix4x2dv/4,programUniformMatrix3x4dv/4,
+  programUniformMatrix4x3dv/4,validateProgramPipeline/1,getProgramPipelineInfoLog/2,
+  vertexAttribL1d/2,vertexAttribL2d/3,vertexAttribL3d/4,vertexAttribL4d/5,
+  vertexAttribL1dv/2,vertexAttribL2dv/2,vertexAttribL3dv/2,vertexAttribL4dv/2,
+  vertexAttribLPointer/5,getVertexAttribLdv/2,viewportArrayv/2,viewportIndexedf/5,
+  viewportIndexedfv/2,scissorArrayv/2,scissorIndexed/5,scissorIndexedv/2,
+  depthRangeArrayv/2,depthRangeIndexed/3,getFloati_v/2,getDoublei_v/2,
+  debugMessageControlARB/5,debugMessageInsertARB/5,getDebugMessageLogARB/2,
+  getGraphicsResetStatusARB/0,resizeBuffersMESA/0,windowPos4dMESA/4,
   windowPos4dvMESA/1,windowPos4fMESA/4,windowPos4fvMESA/1,windowPos4iMESA/4,
   windowPos4ivMESA/1,windowPos4sMESA/4,windowPos4svMESA/1,depthBoundsEXT/2,
   stencilClearTagEXT/2]).
 
+-export([call/2, cast/2, send_bin/1]).
+%% @hidden
+call(Op, Args) ->
+    Port = get(opengl_port), 
+    _ = erlang:port_control(Port,Op,Args),
+    rec().
+    
+%% @hidden
+cast(Op, Args) ->
+    Port = get(opengl_port), 
+    _ = erlang:port_control(Port,Op,Args),
+    ok.
+    
+%% @hidden
+rec() ->
+    receive 
+        {'_egl_result_', Res} -> Res;
+        {'_egl_error_',  Op, Res} -> error({error,Res,Op})
+    end. 
+
+%% @hidden
+send_bin(Bin) when is_binary(Bin) ->
+    Port = get(opengl_port), 
+    erlang:port_command(Port,Bin);
+send_bin(Tuple) when is_tuple(Tuple) ->
+    Port = get(opengl_port), 
+    case element(2, Tuple) of
+        Bin when is_binary(Bin) ->
+            erlang:port_command(Port,Bin)
+    end.
+
 
 %% API
 
 %% @spec (Op::enum(),Value::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glAccum.xml">external</a> documentation.
+-spec accum(enum(),float()) -> ok.
 accum(Op,Value) ->
-  wxe_util:cast(5037, <<Op:?GLenum,Value:?GLfloat>>).
+  cast(5037, <<Op:?GLenum,Value:?GLfloat>>).
 
 %% @spec (Func::enum(),Ref::clamp()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glAlphaFunc.xml">external</a> documentation.
+-spec alphaFunc(enum(),clamp()) -> ok.
 alphaFunc(Func,Ref) ->
-  wxe_util:cast(5038, <<Func:?GLenum,Ref:?GLclampf>>).
+  cast(5038, <<Func:?GLenum,Ref:?GLclampf>>).
 
 %% @spec (Textures::[integer()]) -> {0|1,Residences::[0|1]}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glAreTexturesResident.xml">external</a> documentation.
+-spec areTexturesResident([integer()]) -> {0|1,[0|1]}.
 areTexturesResident(Textures) ->
-  wxe_util:call(5039, <<(length(Textures)):?GLuint,
+  call(5039, <<(length(Textures)):?GLuint,
         (<< <<C:?GLuint>> || C <- Textures>>)/binary,0:(((1+length(Textures)) rem 2)*32)>>).
 
 %% @spec (I::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glArrayElement.xml">external</a> documentation.
+-spec arrayElement(integer()) -> ok.
 arrayElement(I) ->
-  wxe_util:cast(5040, <<I:?GLint>>).
+  cast(5040, <<I:?GLint>>).
 
 %% @spec (Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBegin.xml">external</a> documentation.
+-spec 'begin'(enum()) -> ok.
 'begin'(Mode) ->
-  wxe_util:cast(5041, <<Mode:?GLenum>>).
+  cast(5041, <<Mode:?GLenum>>).
 
 %% @spec (Target::enum(),Texture::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindTexture.xml">external</a> documentation.
+-spec bindTexture(enum(),integer()) -> ok.
 bindTexture(Target,Texture) ->
-  wxe_util:cast(5042, <<Target:?GLenum,Texture:?GLuint>>).
+  cast(5042, <<Target:?GLenum,Texture:?GLuint>>).
 
-%% @spec (Width::integer(),Height::integer(),Xorig::float(),Yorig::float(),Xmove::float(),Ymove::float(),Bitmap::offset()|binary()) -> ok
+%% @spec (Width::integer(),Height::integer(),Xorig::float(),Yorig::float(),Xmove::float(),Ymove::float(),Bitmap::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBitmap.xml">external</a> documentation.
+-spec bitmap(integer(),integer(),float(),float(),float(),float(),offset()|mem()) -> ok.
 bitmap(Width,Height,Xorig,Yorig,Xmove,Ymove,Bitmap) when  is_integer(Bitmap) ->
-  wxe_util:cast(5043, <<Width:?GLsizei,Height:?GLsizei,Xorig:?GLfloat,Yorig:?GLfloat,Xmove:?GLfloat,Ymove:?GLfloat,Bitmap:?GLuint>>);
+  cast(5043, <<Width:?GLsizei,Height:?GLsizei,Xorig:?GLfloat,Yorig:?GLfloat,Xmove:?GLfloat,Ymove:?GLfloat,Bitmap:?GLuint>>);
 bitmap(Width,Height,Xorig,Yorig,Xmove,Ymove,Bitmap) ->
-  wxe_util:send_bin(Bitmap),
-  wxe_util:cast(5044, <<Width:?GLsizei,Height:?GLsizei,Xorig:?GLfloat,Yorig:?GLfloat,Xmove:?GLfloat,Ymove:?GLfloat>>).
+  send_bin(Bitmap),
+  cast(5044, <<Width:?GLsizei,Height:?GLsizei,Xorig:?GLfloat,Yorig:?GLfloat,Xmove:?GLfloat,Ymove:?GLfloat>>).
 
 %% @spec (Sfactor::enum(),Dfactor::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBlendFunc.xml">external</a> documentation.
+-spec blendFunc(enum(),enum()) -> ok.
 blendFunc(Sfactor,Dfactor) ->
-  wxe_util:cast(5045, <<Sfactor:?GLenum,Dfactor:?GLenum>>).
+  cast(5045, <<Sfactor:?GLenum,Dfactor:?GLenum>>).
 
 %% @spec (List::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCallList.xml">external</a> documentation.
+-spec callList(integer()) -> ok.
 callList(List) ->
-  wxe_util:cast(5046, <<List:?GLuint>>).
+  cast(5046, <<List:?GLuint>>).
 
 %% @spec (Lists::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCallLists.xml">external</a> documentation.
+-spec callLists([integer()]) -> ok.
 callLists(Lists) ->
-  wxe_util:cast(5047, <<(length(Lists)):?GLuint,
+  cast(5047, <<(length(Lists)):?GLuint,
         (<< <<C:?GLuint>> || C <- Lists>>)/binary,0:(((1+length(Lists)) rem 2)*32)>>).
 
 %% @spec (Mask::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClear.xml">external</a> documentation.
+-spec clear(integer()) -> ok.
 clear(Mask) ->
-  wxe_util:cast(5048, <<Mask:?GLbitfield>>).
+  cast(5048, <<Mask:?GLbitfield>>).
 
 %% @spec (Red::float(),Green::float(),Blue::float(),Alpha::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClearAccum.xml">external</a> documentation.
+-spec clearAccum(float(),float(),float(),float()) -> ok.
 clearAccum(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5049, <<Red:?GLfloat,Green:?GLfloat,Blue:?GLfloat,Alpha:?GLfloat>>).
+  cast(5049, <<Red:?GLfloat,Green:?GLfloat,Blue:?GLfloat,Alpha:?GLfloat>>).
 
 %% @spec (Red::clamp(),Green::clamp(),Blue::clamp(),Alpha::clamp()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClearColor.xml">external</a> documentation.
+-spec clearColor(clamp(),clamp(),clamp(),clamp()) -> ok.
 clearColor(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5050, <<Red:?GLclampf,Green:?GLclampf,Blue:?GLclampf,Alpha:?GLclampf>>).
+  cast(5050, <<Red:?GLclampf,Green:?GLclampf,Blue:?GLclampf,Alpha:?GLclampf>>).
 
 %% @spec (Depth::clamp()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClearDepth.xml">external</a> documentation.
+-spec clearDepth(clamp()) -> ok.
 clearDepth(Depth) ->
-  wxe_util:cast(5051, <<Depth:?GLclampd>>).
+  cast(5051, <<Depth:?GLclampd>>).
 
 %% @spec (C::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClearIndex.xml">external</a> documentation.
+-spec clearIndex(float()) -> ok.
 clearIndex(C) ->
-  wxe_util:cast(5052, <<C:?GLfloat>>).
+  cast(5052, <<C:?GLfloat>>).
 
 %% @spec (S::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClearStencil.xml">external</a> documentation.
+-spec clearStencil(integer()) -> ok.
 clearStencil(S) ->
-  wxe_util:cast(5053, <<S:?GLint>>).
+  cast(5053, <<S:?GLint>>).
 
-%% @spec (Plane::enum(),Equation::{float()}) -> ok
+%% @spec (Plane::enum(),Equation::{float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClipPlane.xml">external</a> documentation.
+-spec clipPlane(enum(),{float(),float(),float(),float()}) -> ok.
 clipPlane(Plane,{E1,E2,E3,E4}) ->
-  wxe_util:cast(5054, <<Plane:?GLenum,0:32,E1:?GLdouble,E2:?GLdouble,E3:?GLdouble,E4:?GLdouble>>).
+  cast(5054, <<Plane:?GLenum,0:32,E1:?GLdouble,E2:?GLdouble,E3:?GLdouble,E4:?GLdouble>>).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color3b(integer(),integer(),integer()) -> ok.
 color3b(Red,Green,Blue) ->
-  wxe_util:cast(5055, <<Red:?GLbyte,Green:?GLbyte,Blue:?GLbyte>>).
+  cast(5055, <<Red:?GLbyte,Green:?GLbyte,Blue:?GLbyte>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv color3b(Red,Green,Blue)
+-spec color3bv({integer(),integer(),integer()}) -> ok.
 color3bv({Red,Green,Blue}) ->  color3b(Red,Green,Blue).
 
 %% @spec (Red::float(),Green::float(),Blue::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color3d(float(),float(),float()) -> ok.
 color3d(Red,Green,Blue) ->
-  wxe_util:cast(5056, <<Red:?GLdouble,Green:?GLdouble,Blue:?GLdouble>>).
+  cast(5056, <<Red:?GLdouble,Green:?GLdouble,Blue:?GLdouble>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv color3d(Red,Green,Blue)
+-spec color3dv({float(),float(),float()}) -> ok.
 color3dv({Red,Green,Blue}) ->  color3d(Red,Green,Blue).
 
 %% @spec (Red::float(),Green::float(),Blue::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color3f(float(),float(),float()) -> ok.
 color3f(Red,Green,Blue) ->
-  wxe_util:cast(5057, <<Red:?GLfloat,Green:?GLfloat,Blue:?GLfloat>>).
+  cast(5057, <<Red:?GLfloat,Green:?GLfloat,Blue:?GLfloat>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv color3f(Red,Green,Blue)
+-spec color3fv({float(),float(),float()}) -> ok.
 color3fv({Red,Green,Blue}) ->  color3f(Red,Green,Blue).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color3i(integer(),integer(),integer()) -> ok.
 color3i(Red,Green,Blue) ->
-  wxe_util:cast(5058, <<Red:?GLint,Green:?GLint,Blue:?GLint>>).
+  cast(5058, <<Red:?GLint,Green:?GLint,Blue:?GLint>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv color3i(Red,Green,Blue)
+-spec color3iv({integer(),integer(),integer()}) -> ok.
 color3iv({Red,Green,Blue}) ->  color3i(Red,Green,Blue).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color3s(integer(),integer(),integer()) -> ok.
 color3s(Red,Green,Blue) ->
-  wxe_util:cast(5059, <<Red:?GLshort,Green:?GLshort,Blue:?GLshort>>).
+  cast(5059, <<Red:?GLshort,Green:?GLshort,Blue:?GLshort>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv color3s(Red,Green,Blue)
+-spec color3sv({integer(),integer(),integer()}) -> ok.
 color3sv({Red,Green,Blue}) ->  color3s(Red,Green,Blue).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color3ub(integer(),integer(),integer()) -> ok.
 color3ub(Red,Green,Blue) ->
-  wxe_util:cast(5060, <<Red:?GLubyte,Green:?GLubyte,Blue:?GLubyte>>).
+  cast(5060, <<Red:?GLubyte,Green:?GLubyte,Blue:?GLubyte>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv color3ub(Red,Green,Blue)
+-spec color3ubv({integer(),integer(),integer()}) -> ok.
 color3ubv({Red,Green,Blue}) ->  color3ub(Red,Green,Blue).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color3ui(integer(),integer(),integer()) -> ok.
 color3ui(Red,Green,Blue) ->
-  wxe_util:cast(5061, <<Red:?GLuint,Green:?GLuint,Blue:?GLuint>>).
+  cast(5061, <<Red:?GLuint,Green:?GLuint,Blue:?GLuint>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv color3ui(Red,Green,Blue)
+-spec color3uiv({integer(),integer(),integer()}) -> ok.
 color3uiv({Red,Green,Blue}) ->  color3ui(Red,Green,Blue).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color3us(integer(),integer(),integer()) -> ok.
 color3us(Red,Green,Blue) ->
-  wxe_util:cast(5062, <<Red:?GLushort,Green:?GLushort,Blue:?GLushort>>).
+  cast(5062, <<Red:?GLushort,Green:?GLushort,Blue:?GLushort>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv color3us(Red,Green,Blue)
+-spec color3usv({integer(),integer(),integer()}) -> ok.
 color3usv({Red,Green,Blue}) ->  color3us(Red,Green,Blue).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer(),Alpha::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color4b(integer(),integer(),integer(),integer()) -> ok.
 color4b(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5063, <<Red:?GLbyte,Green:?GLbyte,Blue:?GLbyte,Alpha:?GLbyte>>).
+  cast(5063, <<Red:?GLbyte,Green:?GLbyte,Blue:?GLbyte,Alpha:?GLbyte>>).
 
 %% @spec ({Red,Green,Blue,Alpha}) -> ok
 %% @equiv color4b(Red,Green,Blue,Alpha)
+-spec color4bv({integer(),integer(),integer(),integer()}) -> ok.
 color4bv({Red,Green,Blue,Alpha}) ->  color4b(Red,Green,Blue,Alpha).
 
 %% @spec (Red::float(),Green::float(),Blue::float(),Alpha::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color4d(float(),float(),float(),float()) -> ok.
 color4d(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5064, <<Red:?GLdouble,Green:?GLdouble,Blue:?GLdouble,Alpha:?GLdouble>>).
+  cast(5064, <<Red:?GLdouble,Green:?GLdouble,Blue:?GLdouble,Alpha:?GLdouble>>).
 
 %% @spec ({Red,Green,Blue,Alpha}) -> ok
 %% @equiv color4d(Red,Green,Blue,Alpha)
+-spec color4dv({float(),float(),float(),float()}) -> ok.
 color4dv({Red,Green,Blue,Alpha}) ->  color4d(Red,Green,Blue,Alpha).
 
 %% @spec (Red::float(),Green::float(),Blue::float(),Alpha::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color4f(float(),float(),float(),float()) -> ok.
 color4f(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5065, <<Red:?GLfloat,Green:?GLfloat,Blue:?GLfloat,Alpha:?GLfloat>>).
+  cast(5065, <<Red:?GLfloat,Green:?GLfloat,Blue:?GLfloat,Alpha:?GLfloat>>).
 
 %% @spec ({Red,Green,Blue,Alpha}) -> ok
 %% @equiv color4f(Red,Green,Blue,Alpha)
+-spec color4fv({float(),float(),float(),float()}) -> ok.
 color4fv({Red,Green,Blue,Alpha}) ->  color4f(Red,Green,Blue,Alpha).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer(),Alpha::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color4i(integer(),integer(),integer(),integer()) -> ok.
 color4i(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5066, <<Red:?GLint,Green:?GLint,Blue:?GLint,Alpha:?GLint>>).
+  cast(5066, <<Red:?GLint,Green:?GLint,Blue:?GLint,Alpha:?GLint>>).
 
 %% @spec ({Red,Green,Blue,Alpha}) -> ok
 %% @equiv color4i(Red,Green,Blue,Alpha)
+-spec color4iv({integer(),integer(),integer(),integer()}) -> ok.
 color4iv({Red,Green,Blue,Alpha}) ->  color4i(Red,Green,Blue,Alpha).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer(),Alpha::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color4s(integer(),integer(),integer(),integer()) -> ok.
 color4s(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5067, <<Red:?GLshort,Green:?GLshort,Blue:?GLshort,Alpha:?GLshort>>).
+  cast(5067, <<Red:?GLshort,Green:?GLshort,Blue:?GLshort,Alpha:?GLshort>>).
 
 %% @spec ({Red,Green,Blue,Alpha}) -> ok
 %% @equiv color4s(Red,Green,Blue,Alpha)
+-spec color4sv({integer(),integer(),integer(),integer()}) -> ok.
 color4sv({Red,Green,Blue,Alpha}) ->  color4s(Red,Green,Blue,Alpha).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer(),Alpha::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color4ub(integer(),integer(),integer(),integer()) -> ok.
 color4ub(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5068, <<Red:?GLubyte,Green:?GLubyte,Blue:?GLubyte,Alpha:?GLubyte>>).
+  cast(5068, <<Red:?GLubyte,Green:?GLubyte,Blue:?GLubyte,Alpha:?GLubyte>>).
 
 %% @spec ({Red,Green,Blue,Alpha}) -> ok
 %% @equiv color4ub(Red,Green,Blue,Alpha)
+-spec color4ubv({integer(),integer(),integer(),integer()}) -> ok.
 color4ubv({Red,Green,Blue,Alpha}) ->  color4ub(Red,Green,Blue,Alpha).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer(),Alpha::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color4ui(integer(),integer(),integer(),integer()) -> ok.
 color4ui(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5069, <<Red:?GLuint,Green:?GLuint,Blue:?GLuint,Alpha:?GLuint>>).
+  cast(5069, <<Red:?GLuint,Green:?GLuint,Blue:?GLuint,Alpha:?GLuint>>).
 
 %% @spec ({Red,Green,Blue,Alpha}) -> ok
 %% @equiv color4ui(Red,Green,Blue,Alpha)
+-spec color4uiv({integer(),integer(),integer(),integer()}) -> ok.
 color4uiv({Red,Green,Blue,Alpha}) ->  color4ui(Red,Green,Blue,Alpha).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer(),Alpha::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColor.xml">external</a> documentation.
+-spec color4us(integer(),integer(),integer(),integer()) -> ok.
 color4us(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5070, <<Red:?GLushort,Green:?GLushort,Blue:?GLushort,Alpha:?GLushort>>).
+  cast(5070, <<Red:?GLushort,Green:?GLushort,Blue:?GLushort,Alpha:?GLushort>>).
 
 %% @spec ({Red,Green,Blue,Alpha}) -> ok
 %% @equiv color4us(Red,Green,Blue,Alpha)
+-spec color4usv({integer(),integer(),integer(),integer()}) -> ok.
 color4usv({Red,Green,Blue,Alpha}) ->  color4us(Red,Green,Blue,Alpha).
 
 %% @spec (Red::0|1,Green::0|1,Blue::0|1,Alpha::0|1) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColorMask.xml">external</a> documentation.
+-spec colorMask(0|1,0|1,0|1,0|1) -> ok.
 colorMask(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5071, <<Red:?GLboolean,Green:?GLboolean,Blue:?GLboolean,Alpha:?GLboolean>>).
+  cast(5071, <<Red:?GLboolean,Green:?GLboolean,Blue:?GLboolean,Alpha:?GLboolean>>).
 
 %% @spec (Face::enum(),Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColorMaterial.xml">external</a> documentation.
+-spec colorMaterial(enum(),enum()) -> ok.
 colorMaterial(Face,Mode) ->
-  wxe_util:cast(5072, <<Face:?GLenum,Mode:?GLenum>>).
+  cast(5072, <<Face:?GLenum,Mode:?GLenum>>).
 
-%% @spec (Size::integer(),Type::enum(),Stride::integer(),Pointer::offset()|binary()) -> ok
+%% @spec (Size::integer(),Type::enum(),Stride::integer(),Pointer::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColorPointer.xml">external</a> documentation.
+-spec colorPointer(integer(),enum(),integer(),offset()|mem()) -> ok.
 colorPointer(Size,Type,Stride,Pointer) when  is_integer(Pointer) ->
-  wxe_util:cast(5073, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
+  cast(5073, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
 colorPointer(Size,Type,Stride,Pointer) ->
-  wxe_util:send_bin(Pointer),
-  wxe_util:cast(5074, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei>>).
+  send_bin(Pointer),
+  cast(5074, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei>>).
 
 %% @spec (X::integer(),Y::integer(),Width::integer(),Height::integer(),Type::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCopyPixels.xml">external</a> documentation.
+-spec copyPixels(integer(),integer(),integer(),integer(),enum()) -> ok.
 copyPixels(X,Y,Width,Height,Type) ->
-  wxe_util:cast(5075, <<X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei,Type:?GLenum>>).
+  cast(5075, <<X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei,Type:?GLenum>>).
 
 %% @spec (Target::enum(),Level::integer(),InternalFormat::enum(),X::integer(),Y::integer(),Width::integer(),Border::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCopyTexImage1D.xml">external</a> documentation.
+-spec copyTexImage1D(enum(),integer(),enum(),integer(),integer(),integer(),integer()) -> ok.
 copyTexImage1D(Target,Level,InternalFormat,X,Y,Width,Border) ->
-  wxe_util:cast(5076, <<Target:?GLenum,Level:?GLint,InternalFormat:?GLenum,X:?GLint,Y:?GLint,Width:?GLsizei,Border:?GLint>>).
+  cast(5076, <<Target:?GLenum,Level:?GLint,InternalFormat:?GLenum,X:?GLint,Y:?GLint,Width:?GLsizei,Border:?GLint>>).
 
 %% @spec (Target::enum(),Level::integer(),InternalFormat::enum(),X::integer(),Y::integer(),Width::integer(),Height::integer(),Border::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCopyTexImage2D.xml">external</a> documentation.
+-spec copyTexImage2D(enum(),integer(),enum(),integer(),integer(),integer(),integer(),integer()) -> ok.
 copyTexImage2D(Target,Level,InternalFormat,X,Y,Width,Height,Border) ->
-  wxe_util:cast(5077, <<Target:?GLenum,Level:?GLint,InternalFormat:?GLenum,X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei,Border:?GLint>>).
+  cast(5077, <<Target:?GLenum,Level:?GLint,InternalFormat:?GLenum,X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei,Border:?GLint>>).
 
 %% @spec (Target::enum(),Level::integer(),Xoffset::integer(),X::integer(),Y::integer(),Width::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCopyTexSubImage1D.xml">external</a> documentation.
+-spec copyTexSubImage1D(enum(),integer(),integer(),integer(),integer(),integer()) -> ok.
 copyTexSubImage1D(Target,Level,Xoffset,X,Y,Width) ->
-  wxe_util:cast(5078, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,X:?GLint,Y:?GLint,Width:?GLsizei>>).
+  cast(5078, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,X:?GLint,Y:?GLint,Width:?GLsizei>>).
 
 %% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Yoffset::integer(),X::integer(),Y::integer(),Width::integer(),Height::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCopyTexSubImage2D.xml">external</a> documentation.
+-spec copyTexSubImage2D(enum(),integer(),integer(),integer(),integer(),integer(),integer(),integer()) -> ok.
 copyTexSubImage2D(Target,Level,Xoffset,Yoffset,X,Y,Width,Height) ->
-  wxe_util:cast(5079, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei>>).
+  cast(5079, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei>>).
 
 %% @spec (Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCullFace.xml">external</a> documentation.
+-spec cullFace(enum()) -> ok.
 cullFace(Mode) ->
-  wxe_util:cast(5080, <<Mode:?GLenum>>).
+  cast(5080, <<Mode:?GLenum>>).
 
 %% @spec (List::integer(),Range::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteLists.xml">external</a> documentation.
+-spec deleteLists(integer(),integer()) -> ok.
 deleteLists(List,Range) ->
-  wxe_util:cast(5081, <<List:?GLuint,Range:?GLsizei>>).
+  cast(5081, <<List:?GLuint,Range:?GLsizei>>).
 
 %% @spec (Textures::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteTextures.xml">external</a> documentation.
+-spec deleteTextures([integer()]) -> ok.
 deleteTextures(Textures) ->
-  wxe_util:cast(5082, <<(length(Textures)):?GLuint,
+  cast(5082, <<(length(Textures)):?GLuint,
         (<< <<C:?GLuint>> || C <- Textures>>)/binary,0:(((1+length(Textures)) rem 2)*32)>>).
 
 %% @spec (Func::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDepthFunc.xml">external</a> documentation.
+-spec depthFunc(enum()) -> ok.
 depthFunc(Func) ->
-  wxe_util:cast(5083, <<Func:?GLenum>>).
+  cast(5083, <<Func:?GLenum>>).
 
 %% @spec (Flag::0|1) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDepthMask.xml">external</a> documentation.
+-spec depthMask(0|1) -> ok.
 depthMask(Flag) ->
-  wxe_util:cast(5084, <<Flag:?GLboolean>>).
+  cast(5084, <<Flag:?GLboolean>>).
 
 %% @spec (ZNear::clamp(),ZFar::clamp()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDepthRange.xml">external</a> documentation.
+-spec depthRange(clamp(),clamp()) -> ok.
 depthRange(ZNear,ZFar) ->
-  wxe_util:cast(5085, <<ZNear:?GLclampd,ZFar:?GLclampd>>).
+  cast(5085, <<ZNear:?GLclampd,ZFar:?GLclampd>>).
 
 %% @spec (Cap::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDisable.xml">external</a> documentation.
+-spec disable(enum()) -> ok.
 disable(Cap) ->
-  wxe_util:cast(5086, <<Cap:?GLenum>>).
+  cast(5086, <<Cap:?GLenum>>).
 
 %% @spec (Array::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDisableClientState.xml">external</a> documentation.
+-spec disableClientState(enum()) -> ok.
 disableClientState(Array) ->
-  wxe_util:cast(5087, <<Array:?GLenum>>).
+  cast(5087, <<Array:?GLenum>>).
 
 %% @spec (Mode::enum(),First::integer(),Count::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawArrays.xml">external</a> documentation.
+-spec drawArrays(enum(),integer(),integer()) -> ok.
 drawArrays(Mode,First,Count) ->
-  wxe_util:cast(5088, <<Mode:?GLenum,First:?GLint,Count:?GLsizei>>).
+  cast(5088, <<Mode:?GLenum,First:?GLint,Count:?GLsizei>>).
 
 %% @spec (Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawBuffer.xml">external</a> documentation.
+-spec drawBuffer(enum()) -> ok.
 drawBuffer(Mode) ->
-  wxe_util:cast(5089, <<Mode:?GLenum>>).
+  cast(5089, <<Mode:?GLenum>>).
 
-%% @spec (Mode::enum(),Count::integer(),Type::enum(),Indices::offset()|binary()) -> ok
+%% @spec (Mode::enum(),Count::integer(),Type::enum(),Indices::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawElements.xml">external</a> documentation.
+-spec drawElements(enum(),integer(),enum(),offset()|mem()) -> ok.
 drawElements(Mode,Count,Type,Indices) when  is_integer(Indices) ->
-  wxe_util:cast(5090, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum,Indices:?GLuint>>);
+  cast(5090, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum,Indices:?GLuint>>);
 drawElements(Mode,Count,Type,Indices) ->
-  wxe_util:send_bin(Indices),
-  wxe_util:cast(5091, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum>>).
+  send_bin(Indices),
+  cast(5091, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum>>).
 
-%% @spec (Width::integer(),Height::integer(),Format::enum(),Type::enum(),Pixels::offset()|binary()) -> ok
+%% @spec (Width::integer(),Height::integer(),Format::enum(),Type::enum(),Pixels::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawPixels.xml">external</a> documentation.
+-spec drawPixels(integer(),integer(),enum(),enum(),offset()|mem()) -> ok.
 drawPixels(Width,Height,Format,Type,Pixels) when  is_integer(Pixels) ->
-  wxe_util:cast(5092, <<Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
+  cast(5092, <<Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
 drawPixels(Width,Height,Format,Type,Pixels) ->
-  wxe_util:send_bin(Pixels),
-  wxe_util:cast(5093, <<Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Pixels),
+  cast(5093, <<Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (Flag::0|1) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEdgeFlag.xml">external</a> documentation.
+-spec edgeFlag(0|1) -> ok.
 edgeFlag(Flag) ->
-  wxe_util:cast(5094, <<Flag:?GLboolean>>).
+  cast(5094, <<Flag:?GLboolean>>).
 
-%% @spec (Stride::integer(),Pointer::offset()|binary()) -> ok
+%% @spec (Stride::integer(),Pointer::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEdgeFlagPointer.xml">external</a> documentation.
+-spec edgeFlagPointer(integer(),offset()|mem()) -> ok.
 edgeFlagPointer(Stride,Pointer) when  is_integer(Pointer) ->
-  wxe_util:cast(5095, <<Stride:?GLsizei,Pointer:?GLuint>>);
+  cast(5095, <<Stride:?GLsizei,Pointer:?GLuint>>);
 edgeFlagPointer(Stride,Pointer) ->
-  wxe_util:send_bin(Pointer),
-  wxe_util:cast(5096, <<Stride:?GLsizei>>).
+  send_bin(Pointer),
+  cast(5096, <<Stride:?GLsizei>>).
 
 %% @spec ({Flag}) -> ok
 %% @equiv edgeFlag(Flag)
+-spec edgeFlagv({0|1}) -> ok.
 edgeFlagv({Flag}) ->  edgeFlag(Flag).
 
 %% @spec (Cap::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEnable.xml">external</a> documentation.
+-spec enable(enum()) -> ok.
 enable(Cap) ->
-  wxe_util:cast(5097, <<Cap:?GLenum>>).
+  cast(5097, <<Cap:?GLenum>>).
 
 %% @spec (Array::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEnableClientState.xml">external</a> documentation.
+-spec enableClientState(enum()) -> ok.
 enableClientState(Array) ->
-  wxe_util:cast(5098, <<Array:?GLenum>>).
+  cast(5098, <<Array:?GLenum>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEnd.xml">external</a> documentation.
+-spec 'end'() -> ok.
 'end'() ->
-  wxe_util:cast(5099, <<>>).
+  cast(5099, <<>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEndList.xml">external</a> documentation.
+-spec endList() -> ok.
 endList() ->
-  wxe_util:cast(5100, <<>>).
+  cast(5100, <<>>).
 
 %% @spec (U::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalCoord.xml">external</a> documentation.
+-spec evalCoord1d(float()) -> ok.
 evalCoord1d(U) ->
-  wxe_util:cast(5101, <<U:?GLdouble>>).
+  cast(5101, <<U:?GLdouble>>).
 
 %% @spec ({U}) -> ok
 %% @equiv evalCoord1d(U)
+-spec evalCoord1dv({float()}) -> ok.
 evalCoord1dv({U}) ->  evalCoord1d(U).
 
 %% @spec (U::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalCoord.xml">external</a> documentation.
+-spec evalCoord1f(float()) -> ok.
 evalCoord1f(U) ->
-  wxe_util:cast(5102, <<U:?GLfloat>>).
+  cast(5102, <<U:?GLfloat>>).
 
 %% @spec ({U}) -> ok
 %% @equiv evalCoord1f(U)
+-spec evalCoord1fv({float()}) -> ok.
 evalCoord1fv({U}) ->  evalCoord1f(U).
 
 %% @spec (U::float(),V::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalCoord.xml">external</a> documentation.
+-spec evalCoord2d(float(),float()) -> ok.
 evalCoord2d(U,V) ->
-  wxe_util:cast(5103, <<U:?GLdouble,V:?GLdouble>>).
+  cast(5103, <<U:?GLdouble,V:?GLdouble>>).
 
 %% @spec ({U,V}) -> ok
 %% @equiv evalCoord2d(U,V)
+-spec evalCoord2dv({float(),float()}) -> ok.
 evalCoord2dv({U,V}) ->  evalCoord2d(U,V).
 
 %% @spec (U::float(),V::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalCoord.xml">external</a> documentation.
+-spec evalCoord2f(float(),float()) -> ok.
 evalCoord2f(U,V) ->
-  wxe_util:cast(5104, <<U:?GLfloat,V:?GLfloat>>).
+  cast(5104, <<U:?GLfloat,V:?GLfloat>>).
 
 %% @spec ({U,V}) -> ok
 %% @equiv evalCoord2f(U,V)
+-spec evalCoord2fv({float(),float()}) -> ok.
 evalCoord2fv({U,V}) ->  evalCoord2f(U,V).
 
 %% @spec (Mode::enum(),I1::integer(),I2::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalMesh.xml">external</a> documentation.
+-spec evalMesh1(enum(),integer(),integer()) -> ok.
 evalMesh1(Mode,I1,I2) ->
-  wxe_util:cast(5105, <<Mode:?GLenum,I1:?GLint,I2:?GLint>>).
+  cast(5105, <<Mode:?GLenum,I1:?GLint,I2:?GLint>>).
 
 %% @spec (Mode::enum(),I1::integer(),I2::integer(),J1::integer(),J2::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalMesh.xml">external</a> documentation.
+-spec evalMesh2(enum(),integer(),integer(),integer(),integer()) -> ok.
 evalMesh2(Mode,I1,I2,J1,J2) ->
-  wxe_util:cast(5106, <<Mode:?GLenum,I1:?GLint,I2:?GLint,J1:?GLint,J2:?GLint>>).
+  cast(5106, <<Mode:?GLenum,I1:?GLint,I2:?GLint,J1:?GLint,J2:?GLint>>).
 
 %% @spec (I::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalPoint.xml">external</a> documentation.
+-spec evalPoint1(integer()) -> ok.
 evalPoint1(I) ->
-  wxe_util:cast(5107, <<I:?GLint>>).
+  cast(5107, <<I:?GLint>>).
 
 %% @spec (I::integer(),J::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEvalPoint.xml">external</a> documentation.
+-spec evalPoint2(integer(),integer()) -> ok.
 evalPoint2(I,J) ->
-  wxe_util:cast(5108, <<I:?GLint,J:?GLint>>).
+  cast(5108, <<I:?GLint,J:?GLint>>).
 
-%% @spec (Size::integer(),Type::enum(),Buffer::wx:wx_mem()) -> ok
+%% @spec (Size::integer(),Type::enum(),Buffer::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFeedbackBuffer.xml">external</a> documentation.
+-spec feedbackBuffer(integer(),enum(),mem()) -> ok.
 feedbackBuffer(Size,Type,Buffer) ->
-  wxe_util:send_bin(Buffer#wx_mem.bin),
-  wxe_util:call(5109, <<Size:?GLsizei,Type:?GLenum>>).
+  send_bin(Buffer),
+  call(5109, <<Size:?GLsizei,Type:?GLenum>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFinish.xml">external</a> documentation.
+-spec finish() -> ok.
 finish() ->
-  wxe_util:cast(5110, <<>>).
+  cast(5110, <<>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFlush.xml">external</a> documentation.
+-spec flush() -> ok.
 flush() ->
-  wxe_util:cast(5111, <<>>).
+  cast(5111, <<>>).
 
 %% @spec (Pname::enum(),Param::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFog.xml">external</a> documentation.
+-spec fogf(enum(),float()) -> ok.
 fogf(Pname,Param) ->
-  wxe_util:cast(5112, <<Pname:?GLenum,Param:?GLfloat>>).
+  cast(5112, <<Pname:?GLenum,Param:?GLfloat>>).
 
 %% @spec (Pname::enum(),Params::{float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFog.xml">external</a> documentation.
+-spec fogfv(enum(),{float()}) -> ok.
 fogfv(Pname,Params) ->
-  wxe_util:cast(5113, <<Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5113, <<Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLfloat>> ||C <- tuple_to_list(Params)>>)/binary,0:(((0+size(Params)) rem 2)*32)>>).
 
 %% @spec (Pname::enum(),Param::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFog.xml">external</a> documentation.
+-spec fogi(enum(),integer()) -> ok.
 fogi(Pname,Param) ->
-  wxe_util:cast(5114, <<Pname:?GLenum,Param:?GLint>>).
+  cast(5114, <<Pname:?GLenum,Param:?GLint>>).
 
 %% @spec (Pname::enum(),Params::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFog.xml">external</a> documentation.
+-spec fogiv(enum(),{integer()}) -> ok.
 fogiv(Pname,Params) ->
-  wxe_util:cast(5115, <<Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5115, <<Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLint>> ||C <- tuple_to_list(Params)>>)/binary,0:(((0+size(Params)) rem 2)*32)>>).
 
 %% @spec (Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFrontFace.xml">external</a> documentation.
+-spec frontFace(enum()) -> ok.
 frontFace(Mode) ->
-  wxe_util:cast(5116, <<Mode:?GLenum>>).
+  cast(5116, <<Mode:?GLenum>>).
 
 %% @spec (Left::float(),Right::float(),Bottom::float(),Top::float(),ZNear::float(),ZFar::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFrustum.xml">external</a> documentation.
+-spec frustum(float(),float(),float(),float(),float(),float()) -> ok.
 frustum(Left,Right,Bottom,Top,ZNear,ZFar) ->
-  wxe_util:cast(5117, <<Left:?GLdouble,Right:?GLdouble,Bottom:?GLdouble,Top:?GLdouble,ZNear:?GLdouble,ZFar:?GLdouble>>).
+  cast(5117, <<Left:?GLdouble,Right:?GLdouble,Bottom:?GLdouble,Top:?GLdouble,ZNear:?GLdouble,ZFar:?GLdouble>>).
 
 %% @spec (Range::integer()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenLists.xml">external</a> documentation.
+-spec genLists(integer()) -> integer().
 genLists(Range) ->
-  wxe_util:call(5118, <<Range:?GLsizei>>).
+  call(5118, <<Range:?GLsizei>>).
 
 %% @spec (N::integer()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenTextures.xml">external</a> documentation.
+-spec genTextures(integer()) -> [integer()].
 genTextures(N) ->
-  wxe_util:call(5119, <<N:?GLsizei>>).
+  call(5119, <<N:?GLsizei>>).
 
 %% @spec (Pname::enum()) -> [0|1]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetBooleanv.xml">external</a> documentation.
+-spec getBooleanv(enum()) -> [0|1].
 getBooleanv(Pname) ->
-  wxe_util:call(5120, <<Pname:?GLenum>>).
+  call(5120, <<Pname:?GLenum>>).
 
-%% @spec (Plane::enum()) -> {float()}
+%% @spec (Plane::enum()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetClipPlane.xml">external</a> documentation.
+-spec getClipPlane(enum()) -> {float(),float(),float(),float()}.
 getClipPlane(Plane) ->
-  wxe_util:call(5121, <<Plane:?GLenum>>).
+  call(5121, <<Plane:?GLenum>>).
 
 %% @spec (Pname::enum()) -> [float()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetDoublev.xml">external</a> documentation.
+-spec getDoublev(enum()) -> [float()].
 getDoublev(Pname) ->
-  wxe_util:call(5122, <<Pname:?GLenum>>).
+  call(5122, <<Pname:?GLenum>>).
 
 %% @spec () -> enum()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetError.xml">external</a> documentation.
+-spec getError() -> enum().
 getError() ->
-  wxe_util:call(5123, <<>>).
+  call(5123, <<>>).
 
 %% @spec (Pname::enum()) -> [float()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetFloatv.xml">external</a> documentation.
+-spec getFloatv(enum()) -> [float()].
 getFloatv(Pname) ->
-  wxe_util:call(5124, <<Pname:?GLenum>>).
+  call(5124, <<Pname:?GLenum>>).
 
 %% @spec (Pname::enum()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetIntegerv.xml">external</a> documentation.
+-spec getIntegerv(enum()) -> [integer()].
 getIntegerv(Pname) ->
-  wxe_util:call(5125, <<Pname:?GLenum>>).
+  call(5125, <<Pname:?GLenum>>).
 
-%% @spec (Light::enum(),Pname::enum()) -> {float()}
+%% @spec (Light::enum(),Pname::enum()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetLight.xml">external</a> documentation.
+-spec getLightfv(enum(),enum()) -> {float(),float(),float(),float()}.
 getLightfv(Light,Pname) ->
-  wxe_util:call(5126, <<Light:?GLenum,Pname:?GLenum>>).
+  call(5126, <<Light:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Light::enum(),Pname::enum()) -> {integer()}
+%% @spec (Light::enum(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetLight.xml">external</a> documentation.
+-spec getLightiv(enum(),enum()) -> {integer(),integer(),integer(),integer()}.
 getLightiv(Light,Pname) ->
-  wxe_util:call(5127, <<Light:?GLenum,Pname:?GLenum>>).
+  call(5127, <<Light:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Target::enum(),Query::enum(),V::wx:wx_mem()) -> ok
+%% @spec (Target::enum(),Query::enum(),V::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetMap.xml">external</a> documentation.
+-spec getMapdv(enum(),enum(),mem()) -> ok.
 getMapdv(Target,Query,V) ->
-  wxe_util:send_bin(V#wx_mem.bin),
-  wxe_util:call(5128, <<Target:?GLenum,Query:?GLenum>>).
+  send_bin(V),
+  call(5128, <<Target:?GLenum,Query:?GLenum>>).
 
-%% @spec (Target::enum(),Query::enum(),V::wx:wx_mem()) -> ok
+%% @spec (Target::enum(),Query::enum(),V::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetMap.xml">external</a> documentation.
+-spec getMapfv(enum(),enum(),mem()) -> ok.
 getMapfv(Target,Query,V) ->
-  wxe_util:send_bin(V#wx_mem.bin),
-  wxe_util:call(5129, <<Target:?GLenum,Query:?GLenum>>).
+  send_bin(V),
+  call(5129, <<Target:?GLenum,Query:?GLenum>>).
 
-%% @spec (Target::enum(),Query::enum(),V::wx:wx_mem()) -> ok
+%% @spec (Target::enum(),Query::enum(),V::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetMap.xml">external</a> documentation.
+-spec getMapiv(enum(),enum(),mem()) -> ok.
 getMapiv(Target,Query,V) ->
-  wxe_util:send_bin(V#wx_mem.bin),
-  wxe_util:call(5130, <<Target:?GLenum,Query:?GLenum>>).
+  send_bin(V),
+  call(5130, <<Target:?GLenum,Query:?GLenum>>).
 
-%% @spec (Face::enum(),Pname::enum()) -> {float()}
+%% @spec (Face::enum(),Pname::enum()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetMaterial.xml">external</a> documentation.
+-spec getMaterialfv(enum(),enum()) -> {float(),float(),float(),float()}.
 getMaterialfv(Face,Pname) ->
-  wxe_util:call(5131, <<Face:?GLenum,Pname:?GLenum>>).
+  call(5131, <<Face:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Face::enum(),Pname::enum()) -> {integer()}
+%% @spec (Face::enum(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetMaterial.xml">external</a> documentation.
+-spec getMaterialiv(enum(),enum()) -> {integer(),integer(),integer(),integer()}.
 getMaterialiv(Face,Pname) ->
-  wxe_util:call(5132, <<Face:?GLenum,Pname:?GLenum>>).
+  call(5132, <<Face:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Map::enum(),Values::wx:wx_mem()) -> ok
+%% @spec (Map::enum(),Values::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetPixelMap.xml">external</a> documentation.
+-spec getPixelMapfv(enum(),mem()) -> ok.
 getPixelMapfv(Map,Values) ->
-  wxe_util:send_bin(Values#wx_mem.bin),
-  wxe_util:call(5133, <<Map:?GLenum>>).
+  send_bin(Values),
+  call(5133, <<Map:?GLenum>>).
 
-%% @spec (Map::enum(),Values::wx:wx_mem()) -> ok
+%% @spec (Map::enum(),Values::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetPixelMap.xml">external</a> documentation.
+-spec getPixelMapuiv(enum(),mem()) -> ok.
 getPixelMapuiv(Map,Values) ->
-  wxe_util:send_bin(Values#wx_mem.bin),
-  wxe_util:call(5134, <<Map:?GLenum>>).
+  send_bin(Values),
+  call(5134, <<Map:?GLenum>>).
 
-%% @spec (Map::enum(),Values::wx:wx_mem()) -> ok
+%% @spec (Map::enum(),Values::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetPixelMap.xml">external</a> documentation.
+-spec getPixelMapusv(enum(),mem()) -> ok.
 getPixelMapusv(Map,Values) ->
-  wxe_util:send_bin(Values#wx_mem.bin),
-  wxe_util:call(5135, <<Map:?GLenum>>).
+  send_bin(Values),
+  call(5135, <<Map:?GLenum>>).
 
 %% @spec () -> binary()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetPolygonStipple.xml">external</a> documentation.
+-spec getPolygonStipple() -> binary().
 getPolygonStipple() ->
-  wxe_util:call(5136, <<>>).
+  call(5136, <<>>).
 
 %% @spec (Name::enum()) -> string()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetString.xml">external</a> documentation.
+-spec getString(enum()) -> string().
 getString(Name) ->
-  wxe_util:call(5137, <<Name:?GLenum>>).
+  call(5137, <<Name:?GLenum>>).
 
-%% @spec (Target::enum(),Pname::enum()) -> {float()}
+%% @spec (Target::enum(),Pname::enum()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexEnv.xml">external</a> documentation.
+-spec getTexEnvfv(enum(),enum()) -> {float(),float(),float(),float()}.
 getTexEnvfv(Target,Pname) ->
-  wxe_util:call(5138, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5138, <<Target:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Target::enum(),Pname::enum()) -> {integer()}
+%% @spec (Target::enum(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexEnv.xml">external</a> documentation.
+-spec getTexEnviv(enum(),enum()) -> {integer(),integer(),integer(),integer()}.
 getTexEnviv(Target,Pname) ->
-  wxe_util:call(5139, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5139, <<Target:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Coord::enum(),Pname::enum()) -> {float()}
+%% @spec (Coord::enum(),Pname::enum()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexGen.xml">external</a> documentation.
+-spec getTexGendv(enum(),enum()) -> {float(),float(),float(),float()}.
 getTexGendv(Coord,Pname) ->
-  wxe_util:call(5140, <<Coord:?GLenum,Pname:?GLenum>>).
+  call(5140, <<Coord:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Coord::enum(),Pname::enum()) -> {float()}
+%% @spec (Coord::enum(),Pname::enum()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexGen.xml">external</a> documentation.
+-spec getTexGenfv(enum(),enum()) -> {float(),float(),float(),float()}.
 getTexGenfv(Coord,Pname) ->
-  wxe_util:call(5141, <<Coord:?GLenum,Pname:?GLenum>>).
+  call(5141, <<Coord:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Coord::enum(),Pname::enum()) -> {integer()}
+%% @spec (Coord::enum(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexGen.xml">external</a> documentation.
+-spec getTexGeniv(enum(),enum()) -> {integer(),integer(),integer(),integer()}.
 getTexGeniv(Coord,Pname) ->
-  wxe_util:call(5142, <<Coord:?GLenum,Pname:?GLenum>>).
+  call(5142, <<Coord:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Target::enum(),Level::integer(),Format::enum(),Type::enum(),Pixels::wx:wx_mem()) -> ok
+%% @spec (Target::enum(),Level::integer(),Format::enum(),Type::enum(),Pixels::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexImage.xml">external</a> documentation.
+-spec getTexImage(enum(),integer(),enum(),enum(),mem()) -> ok.
 getTexImage(Target,Level,Format,Type,Pixels) ->
-  wxe_util:send_bin(Pixels#wx_mem.bin),
-  wxe_util:call(5143, <<Target:?GLenum,Level:?GLint,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Pixels),
+  call(5143, <<Target:?GLenum,Level:?GLint,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (Target::enum(),Level::integer(),Pname::enum()) -> {float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexLevelParameter.xml">external</a> documentation.
+-spec getTexLevelParameterfv(enum(),integer(),enum()) -> {float()}.
 getTexLevelParameterfv(Target,Level,Pname) ->
-  wxe_util:call(5144, <<Target:?GLenum,Level:?GLint,Pname:?GLenum>>).
+  call(5144, <<Target:?GLenum,Level:?GLint,Pname:?GLenum>>).
 
 %% @spec (Target::enum(),Level::integer(),Pname::enum()) -> {integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexLevelParameter.xml">external</a> documentation.
+-spec getTexLevelParameteriv(enum(),integer(),enum()) -> {integer()}.
 getTexLevelParameteriv(Target,Level,Pname) ->
-  wxe_util:call(5145, <<Target:?GLenum,Level:?GLint,Pname:?GLenum>>).
+  call(5145, <<Target:?GLenum,Level:?GLint,Pname:?GLenum>>).
 
-%% @spec (Target::enum(),Pname::enum()) -> {float()}
+%% @spec (Target::enum(),Pname::enum()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexParameter.xml">external</a> documentation.
+-spec getTexParameterfv(enum(),enum()) -> {float(),float(),float(),float()}.
 getTexParameterfv(Target,Pname) ->
-  wxe_util:call(5146, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5146, <<Target:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Target::enum(),Pname::enum()) -> {integer()}
+%% @spec (Target::enum(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexParameter.xml">external</a> documentation.
+-spec getTexParameteriv(enum(),enum()) -> {integer(),integer(),integer(),integer()}.
 getTexParameteriv(Target,Pname) ->
-  wxe_util:call(5147, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5147, <<Target:?GLenum,Pname:?GLenum>>).
 
 %% @spec (Target::enum(),Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glHint.xml">external</a> documentation.
+-spec hint(enum(),enum()) -> ok.
 hint(Target,Mode) ->
-  wxe_util:cast(5148, <<Target:?GLenum,Mode:?GLenum>>).
+  cast(5148, <<Target:?GLenum,Mode:?GLenum>>).
 
 %% @spec (Mask::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIndexMask.xml">external</a> documentation.
+-spec indexMask(integer()) -> ok.
 indexMask(Mask) ->
-  wxe_util:cast(5149, <<Mask:?GLuint>>).
+  cast(5149, <<Mask:?GLuint>>).
 
-%% @spec (Type::enum(),Stride::integer(),Pointer::offset()|binary()) -> ok
+%% @spec (Type::enum(),Stride::integer(),Pointer::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIndexPointer.xml">external</a> documentation.
+-spec indexPointer(enum(),integer(),offset()|mem()) -> ok.
 indexPointer(Type,Stride,Pointer) when  is_integer(Pointer) ->
-  wxe_util:cast(5150, <<Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
+  cast(5150, <<Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
 indexPointer(Type,Stride,Pointer) ->
-  wxe_util:send_bin(Pointer),
-  wxe_util:cast(5151, <<Type:?GLenum,Stride:?GLsizei>>).
+  send_bin(Pointer),
+  cast(5151, <<Type:?GLenum,Stride:?GLsizei>>).
 
 %% @spec (C::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIndex.xml">external</a> documentation.
+-spec indexd(float()) -> ok.
 indexd(C) ->
-  wxe_util:cast(5152, <<C:?GLdouble>>).
+  cast(5152, <<C:?GLdouble>>).
 
 %% @spec ({C}) -> ok
 %% @equiv indexd(C)
+-spec indexdv({float()}) -> ok.
 indexdv({C}) ->  indexd(C).
 
 %% @spec (C::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIndex.xml">external</a> documentation.
+-spec indexf(float()) -> ok.
 indexf(C) ->
-  wxe_util:cast(5153, <<C:?GLfloat>>).
+  cast(5153, <<C:?GLfloat>>).
 
 %% @spec ({C}) -> ok
 %% @equiv indexf(C)
+-spec indexfv({float()}) -> ok.
 indexfv({C}) ->  indexf(C).
 
 %% @spec (C::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIndex.xml">external</a> documentation.
+-spec indexi(integer()) -> ok.
 indexi(C) ->
-  wxe_util:cast(5154, <<C:?GLint>>).
+  cast(5154, <<C:?GLint>>).
 
 %% @spec ({C}) -> ok
 %% @equiv indexi(C)
+-spec indexiv({integer()}) -> ok.
 indexiv({C}) ->  indexi(C).
 
 %% @spec (C::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIndex.xml">external</a> documentation.
+-spec indexs(integer()) -> ok.
 indexs(C) ->
-  wxe_util:cast(5155, <<C:?GLshort>>).
+  cast(5155, <<C:?GLshort>>).
 
 %% @spec ({C}) -> ok
 %% @equiv indexs(C)
+-spec indexsv({integer()}) -> ok.
 indexsv({C}) ->  indexs(C).
 
 %% @spec (C::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIndex.xml">external</a> documentation.
+-spec indexub(integer()) -> ok.
 indexub(C) ->
-  wxe_util:cast(5156, <<C:?GLubyte>>).
+  cast(5156, <<C:?GLubyte>>).
 
 %% @spec ({C}) -> ok
 %% @equiv indexub(C)
+-spec indexubv({integer()}) -> ok.
 indexubv({C}) ->  indexub(C).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glInitNames.xml">external</a> documentation.
+-spec initNames() -> ok.
 initNames() ->
-  wxe_util:cast(5157, <<>>).
+  cast(5157, <<>>).
 
-%% @spec (Format::enum(),Stride::integer(),Pointer::offset()|binary()) -> ok
+%% @spec (Format::enum(),Stride::integer(),Pointer::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glInterleavedArrays.xml">external</a> documentation.
+-spec interleavedArrays(enum(),integer(),offset()|mem()) -> ok.
 interleavedArrays(Format,Stride,Pointer) when  is_integer(Pointer) ->
-  wxe_util:cast(5158, <<Format:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
+  cast(5158, <<Format:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
 interleavedArrays(Format,Stride,Pointer) ->
-  wxe_util:send_bin(Pointer),
-  wxe_util:cast(5159, <<Format:?GLenum,Stride:?GLsizei>>).
+  send_bin(Pointer),
+  cast(5159, <<Format:?GLenum,Stride:?GLsizei>>).
 
 %% @spec (Cap::enum()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsEnabled.xml">external</a> documentation.
+-spec isEnabled(enum()) -> 0|1.
 isEnabled(Cap) ->
-  wxe_util:call(5160, <<Cap:?GLenum>>).
+  call(5160, <<Cap:?GLenum>>).
 
 %% @spec (List::integer()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsList.xml">external</a> documentation.
+-spec isList(integer()) -> 0|1.
 isList(List) ->
-  wxe_util:call(5161, <<List:?GLuint>>).
+  call(5161, <<List:?GLuint>>).
 
 %% @spec (Texture::integer()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsTexture.xml">external</a> documentation.
+-spec isTexture(integer()) -> 0|1.
 isTexture(Texture) ->
-  wxe_util:call(5162, <<Texture:?GLuint>>).
+  call(5162, <<Texture:?GLuint>>).
 
 %% @spec (Pname::enum(),Param::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLightModel.xml">external</a> documentation.
+-spec lightModelf(enum(),float()) -> ok.
 lightModelf(Pname,Param) ->
-  wxe_util:cast(5163, <<Pname:?GLenum,Param:?GLfloat>>).
+  cast(5163, <<Pname:?GLenum,Param:?GLfloat>>).
 
 %% @spec (Pname::enum(),Params::{float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLightModel.xml">external</a> documentation.
+-spec lightModelfv(enum(),{float()}) -> ok.
 lightModelfv(Pname,Params) ->
-  wxe_util:cast(5164, <<Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5164, <<Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLfloat>> ||C <- tuple_to_list(Params)>>)/binary,0:(((0+size(Params)) rem 2)*32)>>).
 
 %% @spec (Pname::enum(),Param::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLightModel.xml">external</a> documentation.
+-spec lightModeli(enum(),integer()) -> ok.
 lightModeli(Pname,Param) ->
-  wxe_util:cast(5165, <<Pname:?GLenum,Param:?GLint>>).
+  cast(5165, <<Pname:?GLenum,Param:?GLint>>).
 
 %% @spec (Pname::enum(),Params::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLightModel.xml">external</a> documentation.
+-spec lightModeliv(enum(),{integer()}) -> ok.
 lightModeliv(Pname,Params) ->
-  wxe_util:cast(5166, <<Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5166, <<Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLint>> ||C <- tuple_to_list(Params)>>)/binary,0:(((0+size(Params)) rem 2)*32)>>).
 
 %% @spec (Light::enum(),Pname::enum(),Param::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLight.xml">external</a> documentation.
+-spec lightf(enum(),enum(),float()) -> ok.
 lightf(Light,Pname,Param) ->
-  wxe_util:cast(5167, <<Light:?GLenum,Pname:?GLenum,Param:?GLfloat>>).
+  cast(5167, <<Light:?GLenum,Pname:?GLenum,Param:?GLfloat>>).
 
 %% @spec (Light::enum(),Pname::enum(),Params::{float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLight.xml">external</a> documentation.
+-spec lightfv(enum(),enum(),{float()}) -> ok.
 lightfv(Light,Pname,Params) ->
-  wxe_util:cast(5168, <<Light:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5168, <<Light:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLfloat>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
 %% @spec (Light::enum(),Pname::enum(),Param::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLight.xml">external</a> documentation.
+-spec lighti(enum(),enum(),integer()) -> ok.
 lighti(Light,Pname,Param) ->
-  wxe_util:cast(5169, <<Light:?GLenum,Pname:?GLenum,Param:?GLint>>).
+  cast(5169, <<Light:?GLenum,Pname:?GLenum,Param:?GLint>>).
 
 %% @spec (Light::enum(),Pname::enum(),Params::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLight.xml">external</a> documentation.
+-spec lightiv(enum(),enum(),{integer()}) -> ok.
 lightiv(Light,Pname,Params) ->
-  wxe_util:cast(5170, <<Light:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5170, <<Light:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLint>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
 %% @spec (Factor::integer(),Pattern::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLineStipple.xml">external</a> documentation.
+-spec lineStipple(integer(),integer()) -> ok.
 lineStipple(Factor,Pattern) ->
-  wxe_util:cast(5171, <<Factor:?GLint,Pattern:?GLushort>>).
+  cast(5171, <<Factor:?GLint,Pattern:?GLushort>>).
 
 %% @spec (Width::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLineWidth.xml">external</a> documentation.
+-spec lineWidth(float()) -> ok.
 lineWidth(Width) ->
-  wxe_util:cast(5172, <<Width:?GLfloat>>).
+  cast(5172, <<Width:?GLfloat>>).
 
 %% @spec (Base::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glListBase.xml">external</a> documentation.
+-spec listBase(integer()) -> ok.
 listBase(Base) ->
-  wxe_util:cast(5173, <<Base:?GLuint>>).
+  cast(5173, <<Base:?GLuint>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLoadIdentity.xml">external</a> documentation.
+-spec loadIdentity() -> ok.
 loadIdentity() ->
-  wxe_util:cast(5174, <<>>).
+  cast(5174, <<>>).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLoadMatrix.xml">external</a> documentation.
+-spec loadMatrixd({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 loadMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5175, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
+  cast(5175, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
 loadMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5175, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
+  cast(5175, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLoadMatrix.xml">external</a> documentation.
+-spec loadMatrixf({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 loadMatrixf({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5176, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
+  cast(5176, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
 loadMatrixf({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5176, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
+  cast(5176, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
 
 %% @spec (Name::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLoadName.xml">external</a> documentation.
+-spec loadName(integer()) -> ok.
 loadName(Name) ->
-  wxe_util:cast(5177, <<Name:?GLuint>>).
+  cast(5177, <<Name:?GLuint>>).
 
 %% @spec (Opcode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLogicOp.xml">external</a> documentation.
+-spec logicOp(enum()) -> ok.
 logicOp(Opcode) ->
-  wxe_util:cast(5178, <<Opcode:?GLenum>>).
+  cast(5178, <<Opcode:?GLenum>>).
 
 %% @spec (Target::enum(),U1::float(),U2::float(),Stride::integer(),Order::integer(),Points::binary()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMap.xml">external</a> documentation.
+-spec map1d(enum(),float(),float(),integer(),integer(),binary()) -> ok.
 map1d(Target,U1,U2,Stride,Order,Points) ->
-  wxe_util:send_bin(Points),
-  wxe_util:cast(5179, <<Target:?GLenum,0:32,U1:?GLdouble,U2:?GLdouble,Stride:?GLint,Order:?GLint>>).
+  send_bin(Points),
+  cast(5179, <<Target:?GLenum,0:32,U1:?GLdouble,U2:?GLdouble,Stride:?GLint,Order:?GLint>>).
 
 %% @spec (Target::enum(),U1::float(),U2::float(),Stride::integer(),Order::integer(),Points::binary()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMap.xml">external</a> documentation.
+-spec map1f(enum(),float(),float(),integer(),integer(),binary()) -> ok.
 map1f(Target,U1,U2,Stride,Order,Points) ->
-  wxe_util:send_bin(Points),
-  wxe_util:cast(5180, <<Target:?GLenum,U1:?GLfloat,U2:?GLfloat,Stride:?GLint,Order:?GLint>>).
+  send_bin(Points),
+  cast(5180, <<Target:?GLenum,U1:?GLfloat,U2:?GLfloat,Stride:?GLint,Order:?GLint>>).
 
 %% @spec (Target::enum(),U1::float(),U2::float(),Ustride::integer(),Uorder::integer(),V1::float(),V2::float(),Vstride::integer(),Vorder::integer(),Points::binary()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMap.xml">external</a> documentation.
+-spec map2d(enum(),float(),float(),integer(),integer(),float(),float(),integer(),integer(),binary()) -> ok.
 map2d(Target,U1,U2,Ustride,Uorder,V1,V2,Vstride,Vorder,Points) ->
-  wxe_util:send_bin(Points),
-  wxe_util:cast(5181, <<Target:?GLenum,0:32,U1:?GLdouble,U2:?GLdouble,Ustride:?GLint,Uorder:?GLint,V1:?GLdouble,V2:?GLdouble,Vstride:?GLint,Vorder:?GLint>>).
+  send_bin(Points),
+  cast(5181, <<Target:?GLenum,0:32,U1:?GLdouble,U2:?GLdouble,Ustride:?GLint,Uorder:?GLint,V1:?GLdouble,V2:?GLdouble,Vstride:?GLint,Vorder:?GLint>>).
 
 %% @spec (Target::enum(),U1::float(),U2::float(),Ustride::integer(),Uorder::integer(),V1::float(),V2::float(),Vstride::integer(),Vorder::integer(),Points::binary()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMap.xml">external</a> documentation.
+-spec map2f(enum(),float(),float(),integer(),integer(),float(),float(),integer(),integer(),binary()) -> ok.
 map2f(Target,U1,U2,Ustride,Uorder,V1,V2,Vstride,Vorder,Points) ->
-  wxe_util:send_bin(Points),
-  wxe_util:cast(5182, <<Target:?GLenum,U1:?GLfloat,U2:?GLfloat,Ustride:?GLint,Uorder:?GLint,V1:?GLfloat,V2:?GLfloat,Vstride:?GLint,Vorder:?GLint>>).
+  send_bin(Points),
+  cast(5182, <<Target:?GLenum,U1:?GLfloat,U2:?GLfloat,Ustride:?GLint,Uorder:?GLint,V1:?GLfloat,V2:?GLfloat,Vstride:?GLint,Vorder:?GLint>>).
 
 %% @spec (Un::integer(),U1::float(),U2::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMapGrid.xml">external</a> documentation.
+-spec mapGrid1d(integer(),float(),float()) -> ok.
 mapGrid1d(Un,U1,U2) ->
-  wxe_util:cast(5183, <<Un:?GLint,0:32,U1:?GLdouble,U2:?GLdouble>>).
+  cast(5183, <<Un:?GLint,0:32,U1:?GLdouble,U2:?GLdouble>>).
 
 %% @spec (Un::integer(),U1::float(),U2::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMapGrid.xml">external</a> documentation.
+-spec mapGrid1f(integer(),float(),float()) -> ok.
 mapGrid1f(Un,U1,U2) ->
-  wxe_util:cast(5184, <<Un:?GLint,U1:?GLfloat,U2:?GLfloat>>).
+  cast(5184, <<Un:?GLint,U1:?GLfloat,U2:?GLfloat>>).
 
 %% @spec (Un::integer(),U1::float(),U2::float(),Vn::integer(),V1::float(),V2::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMapGrid.xml">external</a> documentation.
+-spec mapGrid2d(integer(),float(),float(),integer(),float(),float()) -> ok.
 mapGrid2d(Un,U1,U2,Vn,V1,V2) ->
-  wxe_util:cast(5185, <<Un:?GLint,0:32,U1:?GLdouble,U2:?GLdouble,Vn:?GLint,0:32,V1:?GLdouble,V2:?GLdouble>>).
+  cast(5185, <<Un:?GLint,0:32,U1:?GLdouble,U2:?GLdouble,Vn:?GLint,0:32,V1:?GLdouble,V2:?GLdouble>>).
 
 %% @spec (Un::integer(),U1::float(),U2::float(),Vn::integer(),V1::float(),V2::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMapGrid.xml">external</a> documentation.
+-spec mapGrid2f(integer(),float(),float(),integer(),float(),float()) -> ok.
 mapGrid2f(Un,U1,U2,Vn,V1,V2) ->
-  wxe_util:cast(5186, <<Un:?GLint,U1:?GLfloat,U2:?GLfloat,Vn:?GLint,V1:?GLfloat,V2:?GLfloat>>).
+  cast(5186, <<Un:?GLint,U1:?GLfloat,U2:?GLfloat,Vn:?GLint,V1:?GLfloat,V2:?GLfloat>>).
 
 %% @spec (Face::enum(),Pname::enum(),Param::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMaterial.xml">external</a> documentation.
+-spec materialf(enum(),enum(),float()) -> ok.
 materialf(Face,Pname,Param) ->
-  wxe_util:cast(5187, <<Face:?GLenum,Pname:?GLenum,Param:?GLfloat>>).
+  cast(5187, <<Face:?GLenum,Pname:?GLenum,Param:?GLfloat>>).
 
 %% @spec (Face::enum(),Pname::enum(),Params::{float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMaterial.xml">external</a> documentation.
+-spec materialfv(enum(),enum(),{float()}) -> ok.
 materialfv(Face,Pname,Params) ->
-  wxe_util:cast(5188, <<Face:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5188, <<Face:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLfloat>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
 %% @spec (Face::enum(),Pname::enum(),Param::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMaterial.xml">external</a> documentation.
+-spec materiali(enum(),enum(),integer()) -> ok.
 materiali(Face,Pname,Param) ->
-  wxe_util:cast(5189, <<Face:?GLenum,Pname:?GLenum,Param:?GLint>>).
+  cast(5189, <<Face:?GLenum,Pname:?GLenum,Param:?GLint>>).
 
 %% @spec (Face::enum(),Pname::enum(),Params::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMaterial.xml">external</a> documentation.
+-spec materialiv(enum(),enum(),{integer()}) -> ok.
 materialiv(Face,Pname,Params) ->
-  wxe_util:cast(5190, <<Face:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5190, <<Face:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLint>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
 %% @spec (Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMatrixMode.xml">external</a> documentation.
+-spec matrixMode(enum()) -> ok.
 matrixMode(Mode) ->
-  wxe_util:cast(5191, <<Mode:?GLenum>>).
+  cast(5191, <<Mode:?GLenum>>).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultMatrix.xml">external</a> documentation.
+-spec multMatrixd({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 multMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5192, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
+  cast(5192, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
 multMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5192, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
+  cast(5192, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultMatrix.xml">external</a> documentation.
+-spec multMatrixf({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 multMatrixf({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5193, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
+  cast(5193, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
 multMatrixf({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5193, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
+  cast(5193, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
 
 %% @spec (List::integer(),Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glNewList.xml">external</a> documentation.
+-spec newList(integer(),enum()) -> ok.
 newList(List,Mode) ->
-  wxe_util:cast(5194, <<List:?GLuint,Mode:?GLenum>>).
+  cast(5194, <<List:?GLuint,Mode:?GLenum>>).
 
 %% @spec (Nx::integer(),Ny::integer(),Nz::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glNormal.xml">external</a> documentation.
+-spec normal3b(integer(),integer(),integer()) -> ok.
 normal3b(Nx,Ny,Nz) ->
-  wxe_util:cast(5195, <<Nx:?GLbyte,Ny:?GLbyte,Nz:?GLbyte>>).
+  cast(5195, <<Nx:?GLbyte,Ny:?GLbyte,Nz:?GLbyte>>).
 
 %% @spec ({Nx,Ny,Nz}) -> ok
 %% @equiv normal3b(Nx,Ny,Nz)
+-spec normal3bv({integer(),integer(),integer()}) -> ok.
 normal3bv({Nx,Ny,Nz}) ->  normal3b(Nx,Ny,Nz).
 
 %% @spec (Nx::float(),Ny::float(),Nz::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glNormal.xml">external</a> documentation.
+-spec normal3d(float(),float(),float()) -> ok.
 normal3d(Nx,Ny,Nz) ->
-  wxe_util:cast(5196, <<Nx:?GLdouble,Ny:?GLdouble,Nz:?GLdouble>>).
+  cast(5196, <<Nx:?GLdouble,Ny:?GLdouble,Nz:?GLdouble>>).
 
 %% @spec ({Nx,Ny,Nz}) -> ok
 %% @equiv normal3d(Nx,Ny,Nz)
+-spec normal3dv({float(),float(),float()}) -> ok.
 normal3dv({Nx,Ny,Nz}) ->  normal3d(Nx,Ny,Nz).
 
 %% @spec (Nx::float(),Ny::float(),Nz::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glNormal.xml">external</a> documentation.
+-spec normal3f(float(),float(),float()) -> ok.
 normal3f(Nx,Ny,Nz) ->
-  wxe_util:cast(5197, <<Nx:?GLfloat,Ny:?GLfloat,Nz:?GLfloat>>).
+  cast(5197, <<Nx:?GLfloat,Ny:?GLfloat,Nz:?GLfloat>>).
 
 %% @spec ({Nx,Ny,Nz}) -> ok
 %% @equiv normal3f(Nx,Ny,Nz)
+-spec normal3fv({float(),float(),float()}) -> ok.
 normal3fv({Nx,Ny,Nz}) ->  normal3f(Nx,Ny,Nz).
 
 %% @spec (Nx::integer(),Ny::integer(),Nz::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glNormal.xml">external</a> documentation.
+-spec normal3i(integer(),integer(),integer()) -> ok.
 normal3i(Nx,Ny,Nz) ->
-  wxe_util:cast(5198, <<Nx:?GLint,Ny:?GLint,Nz:?GLint>>).
+  cast(5198, <<Nx:?GLint,Ny:?GLint,Nz:?GLint>>).
 
 %% @spec ({Nx,Ny,Nz}) -> ok
 %% @equiv normal3i(Nx,Ny,Nz)
+-spec normal3iv({integer(),integer(),integer()}) -> ok.
 normal3iv({Nx,Ny,Nz}) ->  normal3i(Nx,Ny,Nz).
 
 %% @spec (Nx::integer(),Ny::integer(),Nz::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glNormal.xml">external</a> documentation.
+-spec normal3s(integer(),integer(),integer()) -> ok.
 normal3s(Nx,Ny,Nz) ->
-  wxe_util:cast(5199, <<Nx:?GLshort,Ny:?GLshort,Nz:?GLshort>>).
+  cast(5199, <<Nx:?GLshort,Ny:?GLshort,Nz:?GLshort>>).
 
 %% @spec ({Nx,Ny,Nz}) -> ok
 %% @equiv normal3s(Nx,Ny,Nz)
+-spec normal3sv({integer(),integer(),integer()}) -> ok.
 normal3sv({Nx,Ny,Nz}) ->  normal3s(Nx,Ny,Nz).
 
-%% @spec (Type::enum(),Stride::integer(),Pointer::offset()|binary()) -> ok
+%% @spec (Type::enum(),Stride::integer(),Pointer::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glNormalPointer.xml">external</a> documentation.
+-spec normalPointer(enum(),integer(),offset()|mem()) -> ok.
 normalPointer(Type,Stride,Pointer) when  is_integer(Pointer) ->
-  wxe_util:cast(5200, <<Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
+  cast(5200, <<Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
 normalPointer(Type,Stride,Pointer) ->
-  wxe_util:send_bin(Pointer),
-  wxe_util:cast(5201, <<Type:?GLenum,Stride:?GLsizei>>).
+  send_bin(Pointer),
+  cast(5201, <<Type:?GLenum,Stride:?GLsizei>>).
 
 %% @spec (Left::float(),Right::float(),Bottom::float(),Top::float(),ZNear::float(),ZFar::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glOrtho.xml">external</a> documentation.
+-spec ortho(float(),float(),float(),float(),float(),float()) -> ok.
 ortho(Left,Right,Bottom,Top,ZNear,ZFar) ->
-  wxe_util:cast(5202, <<Left:?GLdouble,Right:?GLdouble,Bottom:?GLdouble,Top:?GLdouble,ZNear:?GLdouble,ZFar:?GLdouble>>).
+  cast(5202, <<Left:?GLdouble,Right:?GLdouble,Bottom:?GLdouble,Top:?GLdouble,ZNear:?GLdouble,ZFar:?GLdouble>>).
 
 %% @spec (Token::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPassThrough.xml">external</a> documentation.
+-spec passThrough(float()) -> ok.
 passThrough(Token) ->
-  wxe_util:cast(5203, <<Token:?GLfloat>>).
+  cast(5203, <<Token:?GLfloat>>).
 
 %% @spec (Map::enum(),Mapsize::integer(),Values::binary()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPixelMap.xml">external</a> documentation.
+-spec pixelMapfv(enum(),integer(),binary()) -> ok.
 pixelMapfv(Map,Mapsize,Values) ->
-  wxe_util:send_bin(Values),
-  wxe_util:cast(5204, <<Map:?GLenum,Mapsize:?GLsizei>>).
+  send_bin(Values),
+  cast(5204, <<Map:?GLenum,Mapsize:?GLsizei>>).
 
 %% @spec (Map::enum(),Mapsize::integer(),Values::binary()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPixelMap.xml">external</a> documentation.
+-spec pixelMapuiv(enum(),integer(),binary()) -> ok.
 pixelMapuiv(Map,Mapsize,Values) ->
-  wxe_util:send_bin(Values),
-  wxe_util:cast(5205, <<Map:?GLenum,Mapsize:?GLsizei>>).
+  send_bin(Values),
+  cast(5205, <<Map:?GLenum,Mapsize:?GLsizei>>).
 
 %% @spec (Map::enum(),Mapsize::integer(),Values::binary()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPixelMap.xml">external</a> documentation.
+-spec pixelMapusv(enum(),integer(),binary()) -> ok.
 pixelMapusv(Map,Mapsize,Values) ->
-  wxe_util:send_bin(Values),
-  wxe_util:cast(5206, <<Map:?GLenum,Mapsize:?GLsizei>>).
+  send_bin(Values),
+  cast(5206, <<Map:?GLenum,Mapsize:?GLsizei>>).
 
 %% @spec (Pname::enum(),Param::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPixelStore.xml">external</a> documentation.
+-spec pixelStoref(enum(),float()) -> ok.
 pixelStoref(Pname,Param) ->
-  wxe_util:cast(5207, <<Pname:?GLenum,Param:?GLfloat>>).
+  cast(5207, <<Pname:?GLenum,Param:?GLfloat>>).
 
 %% @spec (Pname::enum(),Param::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPixelStore.xml">external</a> documentation.
+-spec pixelStorei(enum(),integer()) -> ok.
 pixelStorei(Pname,Param) ->
-  wxe_util:cast(5208, <<Pname:?GLenum,Param:?GLint>>).
+  cast(5208, <<Pname:?GLenum,Param:?GLint>>).
 
 %% @spec (Pname::enum(),Param::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPixelTransfer.xml">external</a> documentation.
+-spec pixelTransferf(enum(),float()) -> ok.
 pixelTransferf(Pname,Param) ->
-  wxe_util:cast(5209, <<Pname:?GLenum,Param:?GLfloat>>).
+  cast(5209, <<Pname:?GLenum,Param:?GLfloat>>).
 
 %% @spec (Pname::enum(),Param::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPixelTransfer.xml">external</a> documentation.
+-spec pixelTransferi(enum(),integer()) -> ok.
 pixelTransferi(Pname,Param) ->
-  wxe_util:cast(5210, <<Pname:?GLenum,Param:?GLint>>).
+  cast(5210, <<Pname:?GLenum,Param:?GLint>>).
 
 %% @spec (Xfactor::float(),Yfactor::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPixelZoom.xml">external</a> documentation.
+-spec pixelZoom(float(),float()) -> ok.
 pixelZoom(Xfactor,Yfactor) ->
-  wxe_util:cast(5211, <<Xfactor:?GLfloat,Yfactor:?GLfloat>>).
+  cast(5211, <<Xfactor:?GLfloat,Yfactor:?GLfloat>>).
 
 %% @spec (Size::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPointSize.xml">external</a> documentation.
+-spec pointSize(float()) -> ok.
 pointSize(Size) ->
-  wxe_util:cast(5212, <<Size:?GLfloat>>).
+  cast(5212, <<Size:?GLfloat>>).
 
 %% @spec (Face::enum(),Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPolygonMode.xml">external</a> documentation.
+-spec polygonMode(enum(),enum()) -> ok.
 polygonMode(Face,Mode) ->
-  wxe_util:cast(5213, <<Face:?GLenum,Mode:?GLenum>>).
+  cast(5213, <<Face:?GLenum,Mode:?GLenum>>).
 
 %% @spec (Factor::float(),Units::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPolygonOffset.xml">external</a> documentation.
+-spec polygonOffset(float(),float()) -> ok.
 polygonOffset(Factor,Units) ->
-  wxe_util:cast(5214, <<Factor:?GLfloat,Units:?GLfloat>>).
+  cast(5214, <<Factor:?GLfloat,Units:?GLfloat>>).
 
 %% @spec (Mask::binary()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPolygonStipple.xml">external</a> documentation.
+-spec polygonStipple(binary()) -> ok.
 polygonStipple(Mask) ->
-  wxe_util:send_bin(Mask),
-  wxe_util:cast(5215, <<>>).
+  send_bin(Mask),
+  cast(5215, <<>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPopAttrib.xml">external</a> documentation.
+-spec popAttrib() -> ok.
 popAttrib() ->
-  wxe_util:cast(5216, <<>>).
+  cast(5216, <<>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPopClientAttrib.xml">external</a> documentation.
+-spec popClientAttrib() -> ok.
 popClientAttrib() ->
-  wxe_util:cast(5217, <<>>).
+  cast(5217, <<>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPopMatrix.xml">external</a> documentation.
+-spec popMatrix() -> ok.
 popMatrix() ->
-  wxe_util:cast(5218, <<>>).
+  cast(5218, <<>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPopName.xml">external</a> documentation.
+-spec popName() -> ok.
 popName() ->
-  wxe_util:cast(5219, <<>>).
+  cast(5219, <<>>).
 
 %% @spec (Textures::[integer()],Priorities::[clamp()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPrioritizeTextures.xml">external</a> documentation.
+-spec prioritizeTextures([integer()],[clamp()]) -> ok.
 prioritizeTextures(Textures,Priorities) ->
-  wxe_util:cast(5220, <<(length(Textures)):?GLuint,
+  cast(5220, <<(length(Textures)):?GLuint,
         (<< <<C:?GLuint>> || C <- Textures>>)/binary,0:(((1+length(Textures)) rem 2)*32),(length(Priorities)):?GLuint,
         (<< <<C:?GLclampf>> || C <- Priorities>>)/binary,0:(((1+length(Priorities)) rem 2)*32)>>).
 
 %% @spec (Mask::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPushAttrib.xml">external</a> documentation.
+-spec pushAttrib(integer()) -> ok.
 pushAttrib(Mask) ->
-  wxe_util:cast(5221, <<Mask:?GLbitfield>>).
+  cast(5221, <<Mask:?GLbitfield>>).
 
 %% @spec (Mask::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPushClientAttrib.xml">external</a> documentation.
+-spec pushClientAttrib(integer()) -> ok.
 pushClientAttrib(Mask) ->
-  wxe_util:cast(5222, <<Mask:?GLbitfield>>).
+  cast(5222, <<Mask:?GLbitfield>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPushMatrix.xml">external</a> documentation.
+-spec pushMatrix() -> ok.
 pushMatrix() ->
-  wxe_util:cast(5223, <<>>).
+  cast(5223, <<>>).
 
 %% @spec (Name::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPushName.xml">external</a> documentation.
+-spec pushName(integer()) -> ok.
 pushName(Name) ->
-  wxe_util:cast(5224, <<Name:?GLuint>>).
+  cast(5224, <<Name:?GLuint>>).
 
 %% @spec (X::float(),Y::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos2d(float(),float()) -> ok.
 rasterPos2d(X,Y) ->
-  wxe_util:cast(5225, <<X:?GLdouble,Y:?GLdouble>>).
+  cast(5225, <<X:?GLdouble,Y:?GLdouble>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv rasterPos2d(X,Y)
+-spec rasterPos2dv({float(),float()}) -> ok.
 rasterPos2dv({X,Y}) ->  rasterPos2d(X,Y).
 
 %% @spec (X::float(),Y::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos2f(float(),float()) -> ok.
 rasterPos2f(X,Y) ->
-  wxe_util:cast(5226, <<X:?GLfloat,Y:?GLfloat>>).
+  cast(5226, <<X:?GLfloat,Y:?GLfloat>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv rasterPos2f(X,Y)
+-spec rasterPos2fv({float(),float()}) -> ok.
 rasterPos2fv({X,Y}) ->  rasterPos2f(X,Y).
 
 %% @spec (X::integer(),Y::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos2i(integer(),integer()) -> ok.
 rasterPos2i(X,Y) ->
-  wxe_util:cast(5227, <<X:?GLint,Y:?GLint>>).
+  cast(5227, <<X:?GLint,Y:?GLint>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv rasterPos2i(X,Y)
+-spec rasterPos2iv({integer(),integer()}) -> ok.
 rasterPos2iv({X,Y}) ->  rasterPos2i(X,Y).
 
 %% @spec (X::integer(),Y::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos2s(integer(),integer()) -> ok.
 rasterPos2s(X,Y) ->
-  wxe_util:cast(5228, <<X:?GLshort,Y:?GLshort>>).
+  cast(5228, <<X:?GLshort,Y:?GLshort>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv rasterPos2s(X,Y)
+-spec rasterPos2sv({integer(),integer()}) -> ok.
 rasterPos2sv({X,Y}) ->  rasterPos2s(X,Y).
 
 %% @spec (X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos3d(float(),float(),float()) -> ok.
 rasterPos3d(X,Y,Z) ->
-  wxe_util:cast(5229, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
+  cast(5229, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv rasterPos3d(X,Y,Z)
+-spec rasterPos3dv({float(),float(),float()}) -> ok.
 rasterPos3dv({X,Y,Z}) ->  rasterPos3d(X,Y,Z).
 
 %% @spec (X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos3f(float(),float(),float()) -> ok.
 rasterPos3f(X,Y,Z) ->
-  wxe_util:cast(5230, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
+  cast(5230, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv rasterPos3f(X,Y,Z)
+-spec rasterPos3fv({float(),float(),float()}) -> ok.
 rasterPos3fv({X,Y,Z}) ->  rasterPos3f(X,Y,Z).
 
 %% @spec (X::integer(),Y::integer(),Z::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos3i(integer(),integer(),integer()) -> ok.
 rasterPos3i(X,Y,Z) ->
-  wxe_util:cast(5231, <<X:?GLint,Y:?GLint,Z:?GLint>>).
+  cast(5231, <<X:?GLint,Y:?GLint,Z:?GLint>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv rasterPos3i(X,Y,Z)
+-spec rasterPos3iv({integer(),integer(),integer()}) -> ok.
 rasterPos3iv({X,Y,Z}) ->  rasterPos3i(X,Y,Z).
 
 %% @spec (X::integer(),Y::integer(),Z::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos3s(integer(),integer(),integer()) -> ok.
 rasterPos3s(X,Y,Z) ->
-  wxe_util:cast(5232, <<X:?GLshort,Y:?GLshort,Z:?GLshort>>).
+  cast(5232, <<X:?GLshort,Y:?GLshort,Z:?GLshort>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv rasterPos3s(X,Y,Z)
+-spec rasterPos3sv({integer(),integer(),integer()}) -> ok.
 rasterPos3sv({X,Y,Z}) ->  rasterPos3s(X,Y,Z).
 
 %% @spec (X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos4d(float(),float(),float(),float()) -> ok.
 rasterPos4d(X,Y,Z,W) ->
-  wxe_util:cast(5233, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
+  cast(5233, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv rasterPos4d(X,Y,Z,W)
+-spec rasterPos4dv({float(),float(),float(),float()}) -> ok.
 rasterPos4dv({X,Y,Z,W}) ->  rasterPos4d(X,Y,Z,W).
 
 %% @spec (X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos4f(float(),float(),float(),float()) -> ok.
 rasterPos4f(X,Y,Z,W) ->
-  wxe_util:cast(5234, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
+  cast(5234, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv rasterPos4f(X,Y,Z,W)
+-spec rasterPos4fv({float(),float(),float(),float()}) -> ok.
 rasterPos4fv({X,Y,Z,W}) ->  rasterPos4f(X,Y,Z,W).
 
 %% @spec (X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos4i(integer(),integer(),integer(),integer()) -> ok.
 rasterPos4i(X,Y,Z,W) ->
-  wxe_util:cast(5235, <<X:?GLint,Y:?GLint,Z:?GLint,W:?GLint>>).
+  cast(5235, <<X:?GLint,Y:?GLint,Z:?GLint,W:?GLint>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv rasterPos4i(X,Y,Z,W)
+-spec rasterPos4iv({integer(),integer(),integer(),integer()}) -> ok.
 rasterPos4iv({X,Y,Z,W}) ->  rasterPos4i(X,Y,Z,W).
 
 %% @spec (X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRasterPos.xml">external</a> documentation.
+-spec rasterPos4s(integer(),integer(),integer(),integer()) -> ok.
 rasterPos4s(X,Y,Z,W) ->
-  wxe_util:cast(5236, <<X:?GLshort,Y:?GLshort,Z:?GLshort,W:?GLshort>>).
+  cast(5236, <<X:?GLshort,Y:?GLshort,Z:?GLshort,W:?GLshort>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv rasterPos4s(X,Y,Z,W)
+-spec rasterPos4sv({integer(),integer(),integer(),integer()}) -> ok.
 rasterPos4sv({X,Y,Z,W}) ->  rasterPos4s(X,Y,Z,W).
 
 %% @spec (Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glReadBuffer.xml">external</a> documentation.
+-spec readBuffer(enum()) -> ok.
 readBuffer(Mode) ->
-  wxe_util:cast(5237, <<Mode:?GLenum>>).
+  cast(5237, <<Mode:?GLenum>>).
 
-%% @spec (X::integer(),Y::integer(),Width::integer(),Height::integer(),Format::enum(),Type::enum(),Pixels::wx:wx_mem()) -> ok
+%% @spec (X::integer(),Y::integer(),Width::integer(),Height::integer(),Format::enum(),Type::enum(),Pixels::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glReadPixels.xml">external</a> documentation.
+-spec readPixels(integer(),integer(),integer(),integer(),enum(),enum(),mem()) -> ok.
 readPixels(X,Y,Width,Height,Format,Type,Pixels) ->
-  wxe_util:send_bin(Pixels#wx_mem.bin),
-  wxe_util:call(5238, <<X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Pixels),
+  call(5238, <<X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (X1::float(),Y1::float(),X2::float(),Y2::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRect.xml">external</a> documentation.
+-spec rectd(float(),float(),float(),float()) -> ok.
 rectd(X1,Y1,X2,Y2) ->
-  wxe_util:cast(5239, <<X1:?GLdouble,Y1:?GLdouble,X2:?GLdouble,Y2:?GLdouble>>).
+  cast(5239, <<X1:?GLdouble,Y1:?GLdouble,X2:?GLdouble,Y2:?GLdouble>>).
 
-%% @spec (V1::{float()},V2::{float()}) -> ok
+%% @spec (V1::{float(),float()},V2::{float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRect.xml">external</a> documentation.
+-spec rectdv({float(),float()},{float(),float()}) -> ok.
 rectdv({V1,V2},{V1,V2}) ->
-  wxe_util:cast(5240, <<V1:?GLdouble,V2:?GLdouble,V1:?GLdouble,V2:?GLdouble>>).
+  cast(5240, <<V1:?GLdouble,V2:?GLdouble,V1:?GLdouble,V2:?GLdouble>>).
 
 %% @spec (X1::float(),Y1::float(),X2::float(),Y2::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRect.xml">external</a> documentation.
+-spec rectf(float(),float(),float(),float()) -> ok.
 rectf(X1,Y1,X2,Y2) ->
-  wxe_util:cast(5241, <<X1:?GLfloat,Y1:?GLfloat,X2:?GLfloat,Y2:?GLfloat>>).
+  cast(5241, <<X1:?GLfloat,Y1:?GLfloat,X2:?GLfloat,Y2:?GLfloat>>).
 
-%% @spec (V1::{float()},V2::{float()}) -> ok
+%% @spec (V1::{float(),float()},V2::{float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRect.xml">external</a> documentation.
+-spec rectfv({float(),float()},{float(),float()}) -> ok.
 rectfv({V1,V2},{V1,V2}) ->
-  wxe_util:cast(5242, <<V1:?GLfloat,V2:?GLfloat,V1:?GLfloat,V2:?GLfloat>>).
+  cast(5242, <<V1:?GLfloat,V2:?GLfloat,V1:?GLfloat,V2:?GLfloat>>).
 
 %% @spec (X1::integer(),Y1::integer(),X2::integer(),Y2::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRect.xml">external</a> documentation.
+-spec recti(integer(),integer(),integer(),integer()) -> ok.
 recti(X1,Y1,X2,Y2) ->
-  wxe_util:cast(5243, <<X1:?GLint,Y1:?GLint,X2:?GLint,Y2:?GLint>>).
+  cast(5243, <<X1:?GLint,Y1:?GLint,X2:?GLint,Y2:?GLint>>).
 
-%% @spec (V1::{integer()},V2::{integer()}) -> ok
+%% @spec (V1::{integer(),integer()},V2::{integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRect.xml">external</a> documentation.
+-spec rectiv({integer(),integer()},{integer(),integer()}) -> ok.
 rectiv({V1,V2},{V1,V2}) ->
-  wxe_util:cast(5244, <<V1:?GLint,V2:?GLint,V1:?GLint,V2:?GLint>>).
+  cast(5244, <<V1:?GLint,V2:?GLint,V1:?GLint,V2:?GLint>>).
 
 %% @spec (X1::integer(),Y1::integer(),X2::integer(),Y2::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRect.xml">external</a> documentation.
+-spec rects(integer(),integer(),integer(),integer()) -> ok.
 rects(X1,Y1,X2,Y2) ->
-  wxe_util:cast(5245, <<X1:?GLshort,Y1:?GLshort,X2:?GLshort,Y2:?GLshort>>).
+  cast(5245, <<X1:?GLshort,Y1:?GLshort,X2:?GLshort,Y2:?GLshort>>).
 
-%% @spec (V1::{integer()},V2::{integer()}) -> ok
+%% @spec (V1::{integer(),integer()},V2::{integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRect.xml">external</a> documentation.
+-spec rectsv({integer(),integer()},{integer(),integer()}) -> ok.
 rectsv({V1,V2},{V1,V2}) ->
-  wxe_util:cast(5246, <<V1:?GLshort,V2:?GLshort,V1:?GLshort,V2:?GLshort>>).
+  cast(5246, <<V1:?GLshort,V2:?GLshort,V1:?GLshort,V2:?GLshort>>).
 
 %% @spec (Mode::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRenderMode.xml">external</a> documentation.
+-spec renderMode(enum()) -> integer().
 renderMode(Mode) ->
-  wxe_util:call(5247, <<Mode:?GLenum>>).
+  call(5247, <<Mode:?GLenum>>).
 
 %% @spec (Angle::float(),X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRotate.xml">external</a> documentation.
+-spec rotated(float(),float(),float(),float()) -> ok.
 rotated(Angle,X,Y,Z) ->
-  wxe_util:cast(5248, <<Angle:?GLdouble,X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
+  cast(5248, <<Angle:?GLdouble,X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
 
 %% @spec (Angle::float(),X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRotate.xml">external</a> documentation.
+-spec rotatef(float(),float(),float(),float()) -> ok.
 rotatef(Angle,X,Y,Z) ->
-  wxe_util:cast(5249, <<Angle:?GLfloat,X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
+  cast(5249, <<Angle:?GLfloat,X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
 
 %% @spec (X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glScale.xml">external</a> documentation.
+-spec scaled(float(),float(),float()) -> ok.
 scaled(X,Y,Z) ->
-  wxe_util:cast(5250, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
+  cast(5250, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
 
 %% @spec (X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glScale.xml">external</a> documentation.
+-spec scalef(float(),float(),float()) -> ok.
 scalef(X,Y,Z) ->
-  wxe_util:cast(5251, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
+  cast(5251, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
 
 %% @spec (X::integer(),Y::integer(),Width::integer(),Height::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glScissor.xml">external</a> documentation.
+-spec scissor(integer(),integer(),integer(),integer()) -> ok.
 scissor(X,Y,Width,Height) ->
-  wxe_util:cast(5252, <<X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei>>).
+  cast(5252, <<X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei>>).
 
-%% @spec (Size::integer(),Buffer::wx:wx_mem()) -> ok
+%% @spec (Size::integer(),Buffer::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSelectBuffer.xml">external</a> documentation.
+-spec selectBuffer(integer(),mem()) -> ok.
 selectBuffer(Size,Buffer) ->
-  wxe_util:send_bin(Buffer#wx_mem.bin),
-  wxe_util:call(5253, <<Size:?GLsizei>>).
+  send_bin(Buffer),
+  call(5253, <<Size:?GLsizei>>).
 
 %% @spec (Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glShadeModel.xml">external</a> documentation.
+-spec shadeModel(enum()) -> ok.
 shadeModel(Mode) ->
-  wxe_util:cast(5254, <<Mode:?GLenum>>).
+  cast(5254, <<Mode:?GLenum>>).
 
 %% @spec (Func::enum(),Ref::integer(),Mask::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glStencilFunc.xml">external</a> documentation.
+-spec stencilFunc(enum(),integer(),integer()) -> ok.
 stencilFunc(Func,Ref,Mask) ->
-  wxe_util:cast(5255, <<Func:?GLenum,Ref:?GLint,Mask:?GLuint>>).
+  cast(5255, <<Func:?GLenum,Ref:?GLint,Mask:?GLuint>>).
 
 %% @spec (Mask::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glStencilMask.xml">external</a> documentation.
+-spec stencilMask(integer()) -> ok.
 stencilMask(Mask) ->
-  wxe_util:cast(5256, <<Mask:?GLuint>>).
+  cast(5256, <<Mask:?GLuint>>).
 
 %% @spec (Fail::enum(),Zfail::enum(),Zpass::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glStencilOp.xml">external</a> documentation.
+-spec stencilOp(enum(),enum(),enum()) -> ok.
 stencilOp(Fail,Zfail,Zpass) ->
-  wxe_util:cast(5257, <<Fail:?GLenum,Zfail:?GLenum,Zpass:?GLenum>>).
+  cast(5257, <<Fail:?GLenum,Zfail:?GLenum,Zpass:?GLenum>>).
 
 %% @spec (S::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord1d(float()) -> ok.
 texCoord1d(S) ->
-  wxe_util:cast(5258, <<S:?GLdouble>>).
+  cast(5258, <<S:?GLdouble>>).
 
 %% @spec ({S}) -> ok
 %% @equiv texCoord1d(S)
+-spec texCoord1dv({float()}) -> ok.
 texCoord1dv({S}) ->  texCoord1d(S).
 
 %% @spec (S::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord1f(float()) -> ok.
 texCoord1f(S) ->
-  wxe_util:cast(5259, <<S:?GLfloat>>).
+  cast(5259, <<S:?GLfloat>>).
 
 %% @spec ({S}) -> ok
 %% @equiv texCoord1f(S)
+-spec texCoord1fv({float()}) -> ok.
 texCoord1fv({S}) ->  texCoord1f(S).
 
 %% @spec (S::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord1i(integer()) -> ok.
 texCoord1i(S) ->
-  wxe_util:cast(5260, <<S:?GLint>>).
+  cast(5260, <<S:?GLint>>).
 
 %% @spec ({S}) -> ok
 %% @equiv texCoord1i(S)
+-spec texCoord1iv({integer()}) -> ok.
 texCoord1iv({S}) ->  texCoord1i(S).
 
 %% @spec (S::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord1s(integer()) -> ok.
 texCoord1s(S) ->
-  wxe_util:cast(5261, <<S:?GLshort>>).
+  cast(5261, <<S:?GLshort>>).
 
 %% @spec ({S}) -> ok
 %% @equiv texCoord1s(S)
+-spec texCoord1sv({integer()}) -> ok.
 texCoord1sv({S}) ->  texCoord1s(S).
 
 %% @spec (S::float(),T::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord2d(float(),float()) -> ok.
 texCoord2d(S,T) ->
-  wxe_util:cast(5262, <<S:?GLdouble,T:?GLdouble>>).
+  cast(5262, <<S:?GLdouble,T:?GLdouble>>).
 
 %% @spec ({S,T}) -> ok
 %% @equiv texCoord2d(S,T)
+-spec texCoord2dv({float(),float()}) -> ok.
 texCoord2dv({S,T}) ->  texCoord2d(S,T).
 
 %% @spec (S::float(),T::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord2f(float(),float()) -> ok.
 texCoord2f(S,T) ->
-  wxe_util:cast(5263, <<S:?GLfloat,T:?GLfloat>>).
+  cast(5263, <<S:?GLfloat,T:?GLfloat>>).
 
 %% @spec ({S,T}) -> ok
 %% @equiv texCoord2f(S,T)
+-spec texCoord2fv({float(),float()}) -> ok.
 texCoord2fv({S,T}) ->  texCoord2f(S,T).
 
 %% @spec (S::integer(),T::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord2i(integer(),integer()) -> ok.
 texCoord2i(S,T) ->
-  wxe_util:cast(5264, <<S:?GLint,T:?GLint>>).
+  cast(5264, <<S:?GLint,T:?GLint>>).
 
 %% @spec ({S,T}) -> ok
 %% @equiv texCoord2i(S,T)
+-spec texCoord2iv({integer(),integer()}) -> ok.
 texCoord2iv({S,T}) ->  texCoord2i(S,T).
 
 %% @spec (S::integer(),T::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord2s(integer(),integer()) -> ok.
 texCoord2s(S,T) ->
-  wxe_util:cast(5265, <<S:?GLshort,T:?GLshort>>).
+  cast(5265, <<S:?GLshort,T:?GLshort>>).
 
 %% @spec ({S,T}) -> ok
 %% @equiv texCoord2s(S,T)
+-spec texCoord2sv({integer(),integer()}) -> ok.
 texCoord2sv({S,T}) ->  texCoord2s(S,T).
 
 %% @spec (S::float(),T::float(),R::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord3d(float(),float(),float()) -> ok.
 texCoord3d(S,T,R) ->
-  wxe_util:cast(5266, <<S:?GLdouble,T:?GLdouble,R:?GLdouble>>).
+  cast(5266, <<S:?GLdouble,T:?GLdouble,R:?GLdouble>>).
 
 %% @spec ({S,T,R}) -> ok
 %% @equiv texCoord3d(S,T,R)
+-spec texCoord3dv({float(),float(),float()}) -> ok.
 texCoord3dv({S,T,R}) ->  texCoord3d(S,T,R).
 
 %% @spec (S::float(),T::float(),R::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord3f(float(),float(),float()) -> ok.
 texCoord3f(S,T,R) ->
-  wxe_util:cast(5267, <<S:?GLfloat,T:?GLfloat,R:?GLfloat>>).
+  cast(5267, <<S:?GLfloat,T:?GLfloat,R:?GLfloat>>).
 
 %% @spec ({S,T,R}) -> ok
 %% @equiv texCoord3f(S,T,R)
+-spec texCoord3fv({float(),float(),float()}) -> ok.
 texCoord3fv({S,T,R}) ->  texCoord3f(S,T,R).
 
 %% @spec (S::integer(),T::integer(),R::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord3i(integer(),integer(),integer()) -> ok.
 texCoord3i(S,T,R) ->
-  wxe_util:cast(5268, <<S:?GLint,T:?GLint,R:?GLint>>).
+  cast(5268, <<S:?GLint,T:?GLint,R:?GLint>>).
 
 %% @spec ({S,T,R}) -> ok
 %% @equiv texCoord3i(S,T,R)
+-spec texCoord3iv({integer(),integer(),integer()}) -> ok.
 texCoord3iv({S,T,R}) ->  texCoord3i(S,T,R).
 
 %% @spec (S::integer(),T::integer(),R::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord3s(integer(),integer(),integer()) -> ok.
 texCoord3s(S,T,R) ->
-  wxe_util:cast(5269, <<S:?GLshort,T:?GLshort,R:?GLshort>>).
+  cast(5269, <<S:?GLshort,T:?GLshort,R:?GLshort>>).
 
 %% @spec ({S,T,R}) -> ok
 %% @equiv texCoord3s(S,T,R)
+-spec texCoord3sv({integer(),integer(),integer()}) -> ok.
 texCoord3sv({S,T,R}) ->  texCoord3s(S,T,R).
 
 %% @spec (S::float(),T::float(),R::float(),Q::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord4d(float(),float(),float(),float()) -> ok.
 texCoord4d(S,T,R,Q) ->
-  wxe_util:cast(5270, <<S:?GLdouble,T:?GLdouble,R:?GLdouble,Q:?GLdouble>>).
+  cast(5270, <<S:?GLdouble,T:?GLdouble,R:?GLdouble,Q:?GLdouble>>).
 
 %% @spec ({S,T,R,Q}) -> ok
 %% @equiv texCoord4d(S,T,R,Q)
+-spec texCoord4dv({float(),float(),float(),float()}) -> ok.
 texCoord4dv({S,T,R,Q}) ->  texCoord4d(S,T,R,Q).
 
 %% @spec (S::float(),T::float(),R::float(),Q::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord4f(float(),float(),float(),float()) -> ok.
 texCoord4f(S,T,R,Q) ->
-  wxe_util:cast(5271, <<S:?GLfloat,T:?GLfloat,R:?GLfloat,Q:?GLfloat>>).
+  cast(5271, <<S:?GLfloat,T:?GLfloat,R:?GLfloat,Q:?GLfloat>>).
 
 %% @spec ({S,T,R,Q}) -> ok
 %% @equiv texCoord4f(S,T,R,Q)
+-spec texCoord4fv({float(),float(),float(),float()}) -> ok.
 texCoord4fv({S,T,R,Q}) ->  texCoord4f(S,T,R,Q).
 
 %% @spec (S::integer(),T::integer(),R::integer(),Q::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord4i(integer(),integer(),integer(),integer()) -> ok.
 texCoord4i(S,T,R,Q) ->
-  wxe_util:cast(5272, <<S:?GLint,T:?GLint,R:?GLint,Q:?GLint>>).
+  cast(5272, <<S:?GLint,T:?GLint,R:?GLint,Q:?GLint>>).
 
 %% @spec ({S,T,R,Q}) -> ok
 %% @equiv texCoord4i(S,T,R,Q)
+-spec texCoord4iv({integer(),integer(),integer(),integer()}) -> ok.
 texCoord4iv({S,T,R,Q}) ->  texCoord4i(S,T,R,Q).
 
 %% @spec (S::integer(),T::integer(),R::integer(),Q::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoord.xml">external</a> documentation.
+-spec texCoord4s(integer(),integer(),integer(),integer()) -> ok.
 texCoord4s(S,T,R,Q) ->
-  wxe_util:cast(5273, <<S:?GLshort,T:?GLshort,R:?GLshort,Q:?GLshort>>).
+  cast(5273, <<S:?GLshort,T:?GLshort,R:?GLshort,Q:?GLshort>>).
 
 %% @spec ({S,T,R,Q}) -> ok
 %% @equiv texCoord4s(S,T,R,Q)
+-spec texCoord4sv({integer(),integer(),integer(),integer()}) -> ok.
 texCoord4sv({S,T,R,Q}) ->  texCoord4s(S,T,R,Q).
 
-%% @spec (Size::integer(),Type::enum(),Stride::integer(),Pointer::offset()|binary()) -> ok
+%% @spec (Size::integer(),Type::enum(),Stride::integer(),Pointer::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexCoordPointer.xml">external</a> documentation.
+-spec texCoordPointer(integer(),enum(),integer(),offset()|mem()) -> ok.
 texCoordPointer(Size,Type,Stride,Pointer) when  is_integer(Pointer) ->
-  wxe_util:cast(5274, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
+  cast(5274, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
 texCoordPointer(Size,Type,Stride,Pointer) ->
-  wxe_util:send_bin(Pointer),
-  wxe_util:cast(5275, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei>>).
+  send_bin(Pointer),
+  cast(5275, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei>>).
 
 %% @spec (Target::enum(),Pname::enum(),Param::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexEnvf.xml">external</a> documentation.
+-spec texEnvf(enum(),enum(),float()) -> ok.
 texEnvf(Target,Pname,Param) ->
-  wxe_util:cast(5276, <<Target:?GLenum,Pname:?GLenum,Param:?GLfloat>>).
+  cast(5276, <<Target:?GLenum,Pname:?GLenum,Param:?GLfloat>>).
 
 %% @spec (Target::enum(),Pname::enum(),Params::{float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexEnv.xml">external</a> documentation.
+-spec texEnvfv(enum(),enum(),{float()}) -> ok.
 texEnvfv(Target,Pname,Params) ->
-  wxe_util:cast(5277, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5277, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLfloat>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
 %% @spec (Target::enum(),Pname::enum(),Param::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexEnvi.xml">external</a> documentation.
+-spec texEnvi(enum(),enum(),integer()) -> ok.
 texEnvi(Target,Pname,Param) ->
-  wxe_util:cast(5278, <<Target:?GLenum,Pname:?GLenum,Param:?GLint>>).
+  cast(5278, <<Target:?GLenum,Pname:?GLenum,Param:?GLint>>).
 
 %% @spec (Target::enum(),Pname::enum(),Params::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexEnv.xml">external</a> documentation.
+-spec texEnviv(enum(),enum(),{integer()}) -> ok.
 texEnviv(Target,Pname,Params) ->
-  wxe_util:cast(5279, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5279, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLint>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
 %% @spec (Coord::enum(),Pname::enum(),Param::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexGen.xml">external</a> documentation.
+-spec texGend(enum(),enum(),float()) -> ok.
 texGend(Coord,Pname,Param) ->
-  wxe_util:cast(5280, <<Coord:?GLenum,Pname:?GLenum,Param:?GLdouble>>).
+  cast(5280, <<Coord:?GLenum,Pname:?GLenum,Param:?GLdouble>>).
 
 %% @spec (Coord::enum(),Pname::enum(),Params::{float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexGen.xml">external</a> documentation.
+-spec texGendv(enum(),enum(),{float()}) -> ok.
 texGendv(Coord,Pname,Params) ->
-  wxe_util:cast(5281, <<Coord:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,0:32,
+  cast(5281, <<Coord:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,0:32,
       (<< <<C:?GLdouble>> ||C <- tuple_to_list(Params)>>)/binary>>).
 
 %% @spec (Coord::enum(),Pname::enum(),Param::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexGen.xml">external</a> documentation.
+-spec texGenf(enum(),enum(),float()) -> ok.
 texGenf(Coord,Pname,Param) ->
-  wxe_util:cast(5282, <<Coord:?GLenum,Pname:?GLenum,Param:?GLfloat>>).
+  cast(5282, <<Coord:?GLenum,Pname:?GLenum,Param:?GLfloat>>).
 
 %% @spec (Coord::enum(),Pname::enum(),Params::{float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexGen.xml">external</a> documentation.
+-spec texGenfv(enum(),enum(),{float()}) -> ok.
 texGenfv(Coord,Pname,Params) ->
-  wxe_util:cast(5283, <<Coord:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5283, <<Coord:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLfloat>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
 %% @spec (Coord::enum(),Pname::enum(),Param::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexGen.xml">external</a> documentation.
+-spec texGeni(enum(),enum(),integer()) -> ok.
 texGeni(Coord,Pname,Param) ->
-  wxe_util:cast(5284, <<Coord:?GLenum,Pname:?GLenum,Param:?GLint>>).
+  cast(5284, <<Coord:?GLenum,Pname:?GLenum,Param:?GLint>>).
 
 %% @spec (Coord::enum(),Pname::enum(),Params::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexGen.xml">external</a> documentation.
+-spec texGeniv(enum(),enum(),{integer()}) -> ok.
 texGeniv(Coord,Pname,Params) ->
-  wxe_util:cast(5285, <<Coord:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5285, <<Coord:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLint>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
-%% @spec (Target::enum(),Level::integer(),Internalformat::integer(),Width::integer(),Border::integer(),Format::enum(),Type::enum(),Pixels::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Internalformat::integer(),Width::integer(),Border::integer(),Format::enum(),Type::enum(),Pixels::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexImage1D.xml">external</a> documentation.
+-spec texImage1D(enum(),integer(),integer(),integer(),integer(),enum(),enum(),offset()|mem()) -> ok.
 texImage1D(Target,Level,Internalformat,Width,Border,Format,Type,Pixels) when  is_integer(Pixels) ->
-  wxe_util:cast(5286, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
+  cast(5286, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
 texImage1D(Target,Level,Internalformat,Width,Border,Format,Type,Pixels) ->
-  wxe_util:send_bin(Pixels),
-  wxe_util:cast(5287, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Pixels),
+  cast(5287, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum>>).
 
-%% @spec (Target::enum(),Level::integer(),Internalformat::integer(),Width::integer(),Height::integer(),Border::integer(),Format::enum(),Type::enum(),Pixels::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Internalformat::integer(),Width::integer(),Height::integer(),Border::integer(),Format::enum(),Type::enum(),Pixels::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexImage2D.xml">external</a> documentation.
+-spec texImage2D(enum(),integer(),integer(),integer(),integer(),integer(),enum(),enum(),offset()|mem()) -> ok.
 texImage2D(Target,Level,Internalformat,Width,Height,Border,Format,Type,Pixels) when  is_integer(Pixels) ->
-  wxe_util:cast(5288, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Height:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
+  cast(5288, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Height:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
 texImage2D(Target,Level,Internalformat,Width,Height,Border,Format,Type,Pixels) ->
-  wxe_util:send_bin(Pixels),
-  wxe_util:cast(5289, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Height:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Pixels),
+  cast(5289, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Height:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (Target::enum(),Pname::enum(),Param::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexParameter.xml">external</a> documentation.
+-spec texParameterf(enum(),enum(),float()) -> ok.
 texParameterf(Target,Pname,Param) ->
-  wxe_util:cast(5290, <<Target:?GLenum,Pname:?GLenum,Param:?GLfloat>>).
+  cast(5290, <<Target:?GLenum,Pname:?GLenum,Param:?GLfloat>>).
 
 %% @spec (Target::enum(),Pname::enum(),Params::{float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexParameter.xml">external</a> documentation.
+-spec texParameterfv(enum(),enum(),{float()}) -> ok.
 texParameterfv(Target,Pname,Params) ->
-  wxe_util:cast(5291, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5291, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLfloat>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
 %% @spec (Target::enum(),Pname::enum(),Param::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexParameter.xml">external</a> documentation.
+-spec texParameteri(enum(),enum(),integer()) -> ok.
 texParameteri(Target,Pname,Param) ->
-  wxe_util:cast(5292, <<Target:?GLenum,Pname:?GLenum,Param:?GLint>>).
+  cast(5292, <<Target:?GLenum,Pname:?GLenum,Param:?GLint>>).
 
 %% @spec (Target::enum(),Pname::enum(),Params::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexParameter.xml">external</a> documentation.
+-spec texParameteriv(enum(),enum(),{integer()}) -> ok.
 texParameteriv(Target,Pname,Params) ->
-  wxe_util:cast(5293, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5293, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLint>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
-%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Width::integer(),Format::enum(),Type::enum(),Pixels::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Width::integer(),Format::enum(),Type::enum(),Pixels::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexSubImage1D.xml">external</a> documentation.
+-spec texSubImage1D(enum(),integer(),integer(),integer(),enum(),enum(),offset()|mem()) -> ok.
 texSubImage1D(Target,Level,Xoffset,Width,Format,Type,Pixels) when  is_integer(Pixels) ->
-  wxe_util:cast(5294, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Width:?GLsizei,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
+  cast(5294, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Width:?GLsizei,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
 texSubImage1D(Target,Level,Xoffset,Width,Format,Type,Pixels) ->
-  wxe_util:send_bin(Pixels),
-  wxe_util:cast(5295, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Width:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Pixels),
+  cast(5295, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Width:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
-%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Yoffset::integer(),Width::integer(),Height::integer(),Format::enum(),Type::enum(),Pixels::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Yoffset::integer(),Width::integer(),Height::integer(),Format::enum(),Type::enum(),Pixels::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexSubImage2D.xml">external</a> documentation.
+-spec texSubImage2D(enum(),integer(),integer(),integer(),integer(),integer(),enum(),enum(),offset()|mem()) -> ok.
 texSubImage2D(Target,Level,Xoffset,Yoffset,Width,Height,Format,Type,Pixels) when  is_integer(Pixels) ->
-  wxe_util:cast(5296, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
+  cast(5296, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
 texSubImage2D(Target,Level,Xoffset,Yoffset,Width,Height,Format,Type,Pixels) ->
-  wxe_util:send_bin(Pixels),
-  wxe_util:cast(5297, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Pixels),
+  cast(5297, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTranslate.xml">external</a> documentation.
+-spec translated(float(),float(),float()) -> ok.
 translated(X,Y,Z) ->
-  wxe_util:cast(5298, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
+  cast(5298, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
 
 %% @spec (X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTranslate.xml">external</a> documentation.
+-spec translatef(float(),float(),float()) -> ok.
 translatef(X,Y,Z) ->
-  wxe_util:cast(5299, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
+  cast(5299, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
 
 %% @spec (X::float(),Y::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex2d(float(),float()) -> ok.
 vertex2d(X,Y) ->
-  wxe_util:cast(5300, <<X:?GLdouble,Y:?GLdouble>>).
+  cast(5300, <<X:?GLdouble,Y:?GLdouble>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv vertex2d(X,Y)
+-spec vertex2dv({float(),float()}) -> ok.
 vertex2dv({X,Y}) ->  vertex2d(X,Y).
 
 %% @spec (X::float(),Y::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex2f(float(),float()) -> ok.
 vertex2f(X,Y) ->
-  wxe_util:cast(5301, <<X:?GLfloat,Y:?GLfloat>>).
+  cast(5301, <<X:?GLfloat,Y:?GLfloat>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv vertex2f(X,Y)
+-spec vertex2fv({float(),float()}) -> ok.
 vertex2fv({X,Y}) ->  vertex2f(X,Y).
 
 %% @spec (X::integer(),Y::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex2i(integer(),integer()) -> ok.
 vertex2i(X,Y) ->
-  wxe_util:cast(5302, <<X:?GLint,Y:?GLint>>).
+  cast(5302, <<X:?GLint,Y:?GLint>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv vertex2i(X,Y)
+-spec vertex2iv({integer(),integer()}) -> ok.
 vertex2iv({X,Y}) ->  vertex2i(X,Y).
 
 %% @spec (X::integer(),Y::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex2s(integer(),integer()) -> ok.
 vertex2s(X,Y) ->
-  wxe_util:cast(5303, <<X:?GLshort,Y:?GLshort>>).
+  cast(5303, <<X:?GLshort,Y:?GLshort>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv vertex2s(X,Y)
+-spec vertex2sv({integer(),integer()}) -> ok.
 vertex2sv({X,Y}) ->  vertex2s(X,Y).
 
 %% @spec (X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex3d(float(),float(),float()) -> ok.
 vertex3d(X,Y,Z) ->
-  wxe_util:cast(5304, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
+  cast(5304, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv vertex3d(X,Y,Z)
+-spec vertex3dv({float(),float(),float()}) -> ok.
 vertex3dv({X,Y,Z}) ->  vertex3d(X,Y,Z).
 
 %% @spec (X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex3f(float(),float(),float()) -> ok.
 vertex3f(X,Y,Z) ->
-  wxe_util:cast(5305, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
+  cast(5305, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv vertex3f(X,Y,Z)
+-spec vertex3fv({float(),float(),float()}) -> ok.
 vertex3fv({X,Y,Z}) ->  vertex3f(X,Y,Z).
 
 %% @spec (X::integer(),Y::integer(),Z::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex3i(integer(),integer(),integer()) -> ok.
 vertex3i(X,Y,Z) ->
-  wxe_util:cast(5306, <<X:?GLint,Y:?GLint,Z:?GLint>>).
+  cast(5306, <<X:?GLint,Y:?GLint,Z:?GLint>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv vertex3i(X,Y,Z)
+-spec vertex3iv({integer(),integer(),integer()}) -> ok.
 vertex3iv({X,Y,Z}) ->  vertex3i(X,Y,Z).
 
 %% @spec (X::integer(),Y::integer(),Z::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex3s(integer(),integer(),integer()) -> ok.
 vertex3s(X,Y,Z) ->
-  wxe_util:cast(5307, <<X:?GLshort,Y:?GLshort,Z:?GLshort>>).
+  cast(5307, <<X:?GLshort,Y:?GLshort,Z:?GLshort>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv vertex3s(X,Y,Z)
+-spec vertex3sv({integer(),integer(),integer()}) -> ok.
 vertex3sv({X,Y,Z}) ->  vertex3s(X,Y,Z).
 
 %% @spec (X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex4d(float(),float(),float(),float()) -> ok.
 vertex4d(X,Y,Z,W) ->
-  wxe_util:cast(5308, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
+  cast(5308, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv vertex4d(X,Y,Z,W)
+-spec vertex4dv({float(),float(),float(),float()}) -> ok.
 vertex4dv({X,Y,Z,W}) ->  vertex4d(X,Y,Z,W).
 
 %% @spec (X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex4f(float(),float(),float(),float()) -> ok.
 vertex4f(X,Y,Z,W) ->
-  wxe_util:cast(5309, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
+  cast(5309, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv vertex4f(X,Y,Z,W)
+-spec vertex4fv({float(),float(),float(),float()}) -> ok.
 vertex4fv({X,Y,Z,W}) ->  vertex4f(X,Y,Z,W).
 
 %% @spec (X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex4i(integer(),integer(),integer(),integer()) -> ok.
 vertex4i(X,Y,Z,W) ->
-  wxe_util:cast(5310, <<X:?GLint,Y:?GLint,Z:?GLint,W:?GLint>>).
+  cast(5310, <<X:?GLint,Y:?GLint,Z:?GLint,W:?GLint>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv vertex4i(X,Y,Z,W)
+-spec vertex4iv({integer(),integer(),integer(),integer()}) -> ok.
 vertex4iv({X,Y,Z,W}) ->  vertex4i(X,Y,Z,W).
 
 %% @spec (X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertex.xml">external</a> documentation.
+-spec vertex4s(integer(),integer(),integer(),integer()) -> ok.
 vertex4s(X,Y,Z,W) ->
-  wxe_util:cast(5311, <<X:?GLshort,Y:?GLshort,Z:?GLshort,W:?GLshort>>).
+  cast(5311, <<X:?GLshort,Y:?GLshort,Z:?GLshort,W:?GLshort>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv vertex4s(X,Y,Z,W)
+-spec vertex4sv({integer(),integer(),integer(),integer()}) -> ok.
 vertex4sv({X,Y,Z,W}) ->  vertex4s(X,Y,Z,W).
 
-%% @spec (Size::integer(),Type::enum(),Stride::integer(),Pointer::offset()|binary()) -> ok
+%% @spec (Size::integer(),Type::enum(),Stride::integer(),Pointer::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexPointer.xml">external</a> documentation.
+-spec vertexPointer(integer(),enum(),integer(),offset()|mem()) -> ok.
 vertexPointer(Size,Type,Stride,Pointer) when  is_integer(Pointer) ->
-  wxe_util:cast(5312, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
+  cast(5312, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
 vertexPointer(Size,Type,Stride,Pointer) ->
-  wxe_util:send_bin(Pointer),
-  wxe_util:cast(5313, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei>>).
+  send_bin(Pointer),
+  cast(5313, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei>>).
 
 %% @spec (X::integer(),Y::integer(),Width::integer(),Height::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glViewport.xml">external</a> documentation.
+-spec viewport(integer(),integer(),integer(),integer()) -> ok.
 viewport(X,Y,Width,Height) ->
-  wxe_util:cast(5314, <<X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei>>).
+  cast(5314, <<X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei>>).
 
 %% @spec (Red::clamp(),Green::clamp(),Blue::clamp(),Alpha::clamp()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBlendColor.xml">external</a> documentation.
+-spec blendColor(clamp(),clamp(),clamp(),clamp()) -> ok.
 blendColor(Red,Green,Blue,Alpha) ->
-  wxe_util:cast(5315, <<Red:?GLclampf,Green:?GLclampf,Blue:?GLclampf,Alpha:?GLclampf>>).
+  cast(5315, <<Red:?GLclampf,Green:?GLclampf,Blue:?GLclampf,Alpha:?GLclampf>>).
 
 %% @spec (Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBlendEquation.xml">external</a> documentation.
+-spec blendEquation(enum()) -> ok.
 blendEquation(Mode) ->
-  wxe_util:cast(5316, <<Mode:?GLenum>>).
+  cast(5316, <<Mode:?GLenum>>).
 
-%% @spec (Mode::enum(),Start::integer(),End::integer(),Count::integer(),Type::enum(),Indices::offset()|binary()) -> ok
+%% @spec (Mode::enum(),Start::integer(),End::integer(),Count::integer(),Type::enum(),Indices::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawRangeElements.xml">external</a> documentation.
+-spec drawRangeElements(enum(),integer(),integer(),integer(),enum(),offset()|mem()) -> ok.
 drawRangeElements(Mode,Start,End,Count,Type,Indices) when  is_integer(Indices) ->
-  wxe_util:cast(5317, <<Mode:?GLenum,Start:?GLuint,End:?GLuint,Count:?GLsizei,Type:?GLenum,Indices:?GLuint>>);
+  cast(5317, <<Mode:?GLenum,Start:?GLuint,End:?GLuint,Count:?GLsizei,Type:?GLenum,Indices:?GLuint>>);
 drawRangeElements(Mode,Start,End,Count,Type,Indices) ->
-  wxe_util:send_bin(Indices),
-  wxe_util:cast(5318, <<Mode:?GLenum,Start:?GLuint,End:?GLuint,Count:?GLsizei,Type:?GLenum>>).
+  send_bin(Indices),
+  cast(5318, <<Mode:?GLenum,Start:?GLuint,End:?GLuint,Count:?GLsizei,Type:?GLenum>>).
 
-%% @spec (Target::enum(),Level::integer(),Internalformat::integer(),Width::integer(),Height::integer(),Depth::integer(),Border::integer(),Format::enum(),Type::enum(),Pixels::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Internalformat::integer(),Width::integer(),Height::integer(),Depth::integer(),Border::integer(),Format::enum(),Type::enum(),Pixels::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexImage3D.xml">external</a> documentation.
+-spec texImage3D(enum(),integer(),integer(),integer(),integer(),integer(),integer(),enum(),enum(),offset()|mem()) -> ok.
 texImage3D(Target,Level,Internalformat,Width,Height,Depth,Border,Format,Type,Pixels) when  is_integer(Pixels) ->
-  wxe_util:cast(5319, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
+  cast(5319, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
 texImage3D(Target,Level,Internalformat,Width,Height,Depth,Border,Format,Type,Pixels) ->
-  wxe_util:send_bin(Pixels),
-  wxe_util:cast(5320, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Pixels),
+  cast(5320, <<Target:?GLenum,Level:?GLint,Internalformat:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Border:?GLint,Format:?GLenum,Type:?GLenum>>).
 
-%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Yoffset::integer(),Zoffset::integer(),Width::integer(),Height::integer(),Depth::integer(),Format::enum(),Type::enum(),Pixels::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Yoffset::integer(),Zoffset::integer(),Width::integer(),Height::integer(),Depth::integer(),Format::enum(),Type::enum(),Pixels::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexSubImage3D.xml">external</a> documentation.
+-spec texSubImage3D(enum(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),enum(),enum(),offset()|mem()) -> ok.
 texSubImage3D(Target,Level,Xoffset,Yoffset,Zoffset,Width,Height,Depth,Format,Type,Pixels) when  is_integer(Pixels) ->
-  wxe_util:cast(5321, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Zoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
+  cast(5321, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Zoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,Type:?GLenum,Pixels:?GLuint>>);
 texSubImage3D(Target,Level,Xoffset,Yoffset,Zoffset,Width,Height,Depth,Format,Type,Pixels) ->
-  wxe_util:send_bin(Pixels),
-  wxe_util:cast(5322, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Zoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Pixels),
+  cast(5322, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Zoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Yoffset::integer(),Zoffset::integer(),X::integer(),Y::integer(),Width::integer(),Height::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCopyTexSubImage3D.xml">external</a> documentation.
+-spec copyTexSubImage3D(enum(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer()) -> ok.
 copyTexSubImage3D(Target,Level,Xoffset,Yoffset,Zoffset,X,Y,Width,Height) ->
-  wxe_util:cast(5323, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Zoffset:?GLint,X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei>>).
+  cast(5323, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Zoffset:?GLint,X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei>>).
 
-%% @spec (Target::enum(),Internalformat::enum(),Width::integer(),Format::enum(),Type::enum(),Table::offset()|binary()) -> ok
+%% @spec (Target::enum(),Internalformat::enum(),Width::integer(),Format::enum(),Type::enum(),Table::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColorTable.xml">external</a> documentation.
+-spec colorTable(enum(),enum(),integer(),enum(),enum(),offset()|mem()) -> ok.
 colorTable(Target,Internalformat,Width,Format,Type,Table) when  is_integer(Table) ->
-  wxe_util:cast(5324, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Format:?GLenum,Type:?GLenum,Table:?GLuint>>);
+  cast(5324, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Format:?GLenum,Type:?GLenum,Table:?GLuint>>);
 colorTable(Target,Internalformat,Width,Format,Type,Table) ->
-  wxe_util:send_bin(Table),
-  wxe_util:cast(5325, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Table),
+  cast(5325, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
-%% @spec (Target::enum(),Pname::enum(),Params::{float()}) -> ok
+%% @spec (Target::enum(),Pname::enum(),Params::{float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColorTableParameter.xml">external</a> documentation.
+-spec colorTableParameterfv(enum(),enum(),{float(),float(),float(),float()}) -> ok.
 colorTableParameterfv(Target,Pname,{P1,P2,P3,P4}) ->
-  wxe_util:cast(5326, <<Target:?GLenum,Pname:?GLenum,P1:?GLfloat,P2:?GLfloat,P3:?GLfloat,P4:?GLfloat>>).
+  cast(5326, <<Target:?GLenum,Pname:?GLenum,P1:?GLfloat,P2:?GLfloat,P3:?GLfloat,P4:?GLfloat>>).
 
-%% @spec (Target::enum(),Pname::enum(),Params::{integer()}) -> ok
+%% @spec (Target::enum(),Pname::enum(),Params::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColorTableParameter.xml">external</a> documentation.
+-spec colorTableParameteriv(enum(),enum(),{integer(),integer(),integer(),integer()}) -> ok.
 colorTableParameteriv(Target,Pname,{P1,P2,P3,P4}) ->
-  wxe_util:cast(5327, <<Target:?GLenum,Pname:?GLenum,P1:?GLint,P2:?GLint,P3:?GLint,P4:?GLint>>).
+  cast(5327, <<Target:?GLenum,Pname:?GLenum,P1:?GLint,P2:?GLint,P3:?GLint,P4:?GLint>>).
 
 %% @spec (Target::enum(),Internalformat::enum(),X::integer(),Y::integer(),Width::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCopyColorTable.xml">external</a> documentation.
+-spec copyColorTable(enum(),enum(),integer(),integer(),integer()) -> ok.
 copyColorTable(Target,Internalformat,X,Y,Width) ->
-  wxe_util:cast(5328, <<Target:?GLenum,Internalformat:?GLenum,X:?GLint,Y:?GLint,Width:?GLsizei>>).
+  cast(5328, <<Target:?GLenum,Internalformat:?GLenum,X:?GLint,Y:?GLint,Width:?GLsizei>>).
 
-%% @spec (Target::enum(),Format::enum(),Type::enum(),Table::wx:wx_mem()) -> ok
+%% @spec (Target::enum(),Format::enum(),Type::enum(),Table::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetColorTable.xml">external</a> documentation.
+-spec getColorTable(enum(),enum(),enum(),mem()) -> ok.
 getColorTable(Target,Format,Type,Table) ->
-  wxe_util:send_bin(Table#wx_mem.bin),
-  wxe_util:call(5329, <<Target:?GLenum,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Table),
+  call(5329, <<Target:?GLenum,Format:?GLenum,Type:?GLenum>>).
 
-%% @spec (Target::enum(),Pname::enum()) -> {float()}
+%% @spec (Target::enum(),Pname::enum()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetColorTableParameter.xml">external</a> documentation.
+-spec getColorTableParameterfv(enum(),enum()) -> {float(),float(),float(),float()}.
 getColorTableParameterfv(Target,Pname) ->
-  wxe_util:call(5330, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5330, <<Target:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Target::enum(),Pname::enum()) -> {integer()}
+%% @spec (Target::enum(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetColorTableParameter.xml">external</a> documentation.
+-spec getColorTableParameteriv(enum(),enum()) -> {integer(),integer(),integer(),integer()}.
 getColorTableParameteriv(Target,Pname) ->
-  wxe_util:call(5331, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5331, <<Target:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Target::enum(),Start::integer(),Count::integer(),Format::enum(),Type::enum(),Data::offset()|binary()) -> ok
+%% @spec (Target::enum(),Start::integer(),Count::integer(),Format::enum(),Type::enum(),Data::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColorSubTable.xml">external</a> documentation.
+-spec colorSubTable(enum(),integer(),integer(),enum(),enum(),offset()|mem()) -> ok.
 colorSubTable(Target,Start,Count,Format,Type,Data) when  is_integer(Data) ->
-  wxe_util:cast(5332, <<Target:?GLenum,Start:?GLsizei,Count:?GLsizei,Format:?GLenum,Type:?GLenum,Data:?GLuint>>);
+  cast(5332, <<Target:?GLenum,Start:?GLsizei,Count:?GLsizei,Format:?GLenum,Type:?GLenum,Data:?GLuint>>);
 colorSubTable(Target,Start,Count,Format,Type,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:cast(5333, <<Target:?GLenum,Start:?GLsizei,Count:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Data),
+  cast(5333, <<Target:?GLenum,Start:?GLsizei,Count:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (Target::enum(),Start::integer(),X::integer(),Y::integer(),Width::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCopyColorSubTable.xml">external</a> documentation.
+-spec copyColorSubTable(enum(),integer(),integer(),integer(),integer()) -> ok.
 copyColorSubTable(Target,Start,X,Y,Width) ->
-  wxe_util:cast(5334, <<Target:?GLenum,Start:?GLsizei,X:?GLint,Y:?GLint,Width:?GLsizei>>).
+  cast(5334, <<Target:?GLenum,Start:?GLsizei,X:?GLint,Y:?GLint,Width:?GLsizei>>).
 
-%% @spec (Target::enum(),Internalformat::enum(),Width::integer(),Format::enum(),Type::enum(),Image::offset()|binary()) -> ok
+%% @spec (Target::enum(),Internalformat::enum(),Width::integer(),Format::enum(),Type::enum(),Image::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glConvolutionFilter1D.xml">external</a> documentation.
+-spec convolutionFilter1D(enum(),enum(),integer(),enum(),enum(),offset()|mem()) -> ok.
 convolutionFilter1D(Target,Internalformat,Width,Format,Type,Image) when  is_integer(Image) ->
-  wxe_util:cast(5335, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Format:?GLenum,Type:?GLenum,Image:?GLuint>>);
+  cast(5335, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Format:?GLenum,Type:?GLenum,Image:?GLuint>>);
 convolutionFilter1D(Target,Internalformat,Width,Format,Type,Image) ->
-  wxe_util:send_bin(Image),
-  wxe_util:cast(5336, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Image),
+  cast(5336, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
-%% @spec (Target::enum(),Internalformat::enum(),Width::integer(),Height::integer(),Format::enum(),Type::enum(),Image::offset()|binary()) -> ok
+%% @spec (Target::enum(),Internalformat::enum(),Width::integer(),Height::integer(),Format::enum(),Type::enum(),Image::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glConvolutionFilter2D.xml">external</a> documentation.
+-spec convolutionFilter2D(enum(),enum(),integer(),integer(),enum(),enum(),offset()|mem()) -> ok.
 convolutionFilter2D(Target,Internalformat,Width,Height,Format,Type,Image) when  is_integer(Image) ->
-  wxe_util:cast(5337, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum,Image:?GLuint>>);
+  cast(5337, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum,Image:?GLuint>>);
 convolutionFilter2D(Target,Internalformat,Width,Height,Format,Type,Image) ->
-  wxe_util:send_bin(Image),
-  wxe_util:cast(5338, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Image),
+  cast(5338, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (Target::enum(),Pname::enum(),Params::{float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glConvolutionParameter.xml">external</a> documentation.
+-spec convolutionParameterf(enum(),enum(),{float()}) -> ok.
 convolutionParameterf(Target,Pname,Params) ->
-  wxe_util:cast(5339, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5339, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLfloat>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
 %% @spec (Target,Pname,{Params}) -> ok
 %% @equiv convolutionParameterf(Target,Pname,Params)
+-spec convolutionParameterfv(enum(),enum(),{{float()}}) -> ok.
 convolutionParameterfv(Target,Pname,{Params}) ->  convolutionParameterf(Target,Pname,Params).
 
 %% @spec (Target::enum(),Pname::enum(),Params::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glConvolutionParameter.xml">external</a> documentation.
+-spec convolutionParameteri(enum(),enum(),{integer()}) -> ok.
 convolutionParameteri(Target,Pname,Params) ->
-  wxe_util:cast(5340, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5340, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLint>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
 %% @spec (Target,Pname,{Params}) -> ok
 %% @equiv convolutionParameteri(Target,Pname,Params)
+-spec convolutionParameteriv(enum(),enum(),{{integer()}}) -> ok.
 convolutionParameteriv(Target,Pname,{Params}) ->  convolutionParameteri(Target,Pname,Params).
 
 %% @spec (Target::enum(),Internalformat::enum(),X::integer(),Y::integer(),Width::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCopyConvolutionFilter1D.xml">external</a> documentation.
+-spec copyConvolutionFilter1D(enum(),enum(),integer(),integer(),integer()) -> ok.
 copyConvolutionFilter1D(Target,Internalformat,X,Y,Width) ->
-  wxe_util:cast(5341, <<Target:?GLenum,Internalformat:?GLenum,X:?GLint,Y:?GLint,Width:?GLsizei>>).
+  cast(5341, <<Target:?GLenum,Internalformat:?GLenum,X:?GLint,Y:?GLint,Width:?GLsizei>>).
 
 %% @spec (Target::enum(),Internalformat::enum(),X::integer(),Y::integer(),Width::integer(),Height::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCopyConvolutionFilter2D.xml">external</a> documentation.
+-spec copyConvolutionFilter2D(enum(),enum(),integer(),integer(),integer(),integer()) -> ok.
 copyConvolutionFilter2D(Target,Internalformat,X,Y,Width,Height) ->
-  wxe_util:cast(5342, <<Target:?GLenum,Internalformat:?GLenum,X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei>>).
+  cast(5342, <<Target:?GLenum,Internalformat:?GLenum,X:?GLint,Y:?GLint,Width:?GLsizei,Height:?GLsizei>>).
 
-%% @spec (Target::enum(),Format::enum(),Type::enum(),Image::wx:wx_mem()) -> ok
+%% @spec (Target::enum(),Format::enum(),Type::enum(),Image::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetConvolutionFilter.xml">external</a> documentation.
+-spec getConvolutionFilter(enum(),enum(),enum(),mem()) -> ok.
 getConvolutionFilter(Target,Format,Type,Image) ->
-  wxe_util:send_bin(Image#wx_mem.bin),
-  wxe_util:call(5343, <<Target:?GLenum,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Image),
+  call(5343, <<Target:?GLenum,Format:?GLenum,Type:?GLenum>>).
 
-%% @spec (Target::enum(),Pname::enum()) -> {float()}
+%% @spec (Target::enum(),Pname::enum()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetConvolutionParameter.xml">external</a> documentation.
+-spec getConvolutionParameterfv(enum(),enum()) -> {float(),float(),float(),float()}.
 getConvolutionParameterfv(Target,Pname) ->
-  wxe_util:call(5344, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5344, <<Target:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Target::enum(),Pname::enum()) -> {integer()}
+%% @spec (Target::enum(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetConvolutionParameter.xml">external</a> documentation.
+-spec getConvolutionParameteriv(enum(),enum()) -> {integer(),integer(),integer(),integer()}.
 getConvolutionParameteriv(Target,Pname) ->
-  wxe_util:call(5345, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5345, <<Target:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Target::enum(),Internalformat::enum(),Width::integer(),Height::integer(),Format::enum(),Type::enum(),Row::offset()|binary(),Column::offset()|binary()) -> ok
+%% @spec (Target::enum(),Internalformat::enum(),Width::integer(),Height::integer(),Format::enum(),Type::enum(),Row::offset()|mem(),Column::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSeparableFilter2D.xml">external</a> documentation.
+-spec separableFilter2D(enum(),enum(),integer(),integer(),enum(),enum(),offset()|mem(),offset()|mem()) -> ok.
 separableFilter2D(Target,Internalformat,Width,Height,Format,Type,Row,Column) when  is_integer(Row), is_integer(Column) ->
-  wxe_util:cast(5346, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum,Row:?GLuint,Column:?GLuint>>);
+  cast(5346, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum,Row:?GLuint,Column:?GLuint>>);
 separableFilter2D(Target,Internalformat,Width,Height,Format,Type,Row,Column) ->
-  wxe_util:send_bin(Row),
-  wxe_util:send_bin(Column),
-  wxe_util:cast(5347, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Row),
+  send_bin(Column),
+  cast(5347, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
-%% @spec (Target::enum(),Reset::0|1,Format::enum(),Type::enum(),Values::wx:wx_mem()) -> ok
+%% @spec (Target::enum(),Reset::0|1,Format::enum(),Type::enum(),Values::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetHistogram.xml">external</a> documentation.
+-spec getHistogram(enum(),0|1,enum(),enum(),mem()) -> ok.
 getHistogram(Target,Reset,Format,Type,Values) ->
-  wxe_util:send_bin(Values#wx_mem.bin),
-  wxe_util:call(5348, <<Target:?GLenum,Reset:?GLboolean,0:24,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Values),
+  call(5348, <<Target:?GLenum,Reset:?GLboolean,0:24,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (Target::enum(),Pname::enum()) -> {float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetHistogramParameter.xml">external</a> documentation.
+-spec getHistogramParameterfv(enum(),enum()) -> {float()}.
 getHistogramParameterfv(Target,Pname) ->
-  wxe_util:call(5349, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5349, <<Target:?GLenum,Pname:?GLenum>>).
 
 %% @spec (Target::enum(),Pname::enum()) -> {integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetHistogramParameter.xml">external</a> documentation.
+-spec getHistogramParameteriv(enum(),enum()) -> {integer()}.
 getHistogramParameteriv(Target,Pname) ->
-  wxe_util:call(5350, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5350, <<Target:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Target::enum(),Reset::0|1,Format::enum(),Type::enum(),Values::wx:wx_mem()) -> ok
+%% @spec (Target::enum(),Reset::0|1,Format::enum(),Type::enum(),Values::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetMinmax.xml">external</a> documentation.
+-spec getMinmax(enum(),0|1,enum(),enum(),mem()) -> ok.
 getMinmax(Target,Reset,Format,Type,Values) ->
-  wxe_util:send_bin(Values#wx_mem.bin),
-  wxe_util:call(5351, <<Target:?GLenum,Reset:?GLboolean,0:24,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Values),
+  call(5351, <<Target:?GLenum,Reset:?GLboolean,0:24,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (Target::enum(),Pname::enum()) -> {float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetMinmaxParameter.xml">external</a> documentation.
+-spec getMinmaxParameterfv(enum(),enum()) -> {float()}.
 getMinmaxParameterfv(Target,Pname) ->
-  wxe_util:call(5352, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5352, <<Target:?GLenum,Pname:?GLenum>>).
 
 %% @spec (Target::enum(),Pname::enum()) -> {integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetMinmaxParameter.xml">external</a> documentation.
+-spec getMinmaxParameteriv(enum(),enum()) -> {integer()}.
 getMinmaxParameteriv(Target,Pname) ->
-  wxe_util:call(5353, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5353, <<Target:?GLenum,Pname:?GLenum>>).
 
 %% @spec (Target::enum(),Width::integer(),Internalformat::enum(),Sink::0|1) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glHistogram.xml">external</a> documentation.
+-spec histogram(enum(),integer(),enum(),0|1) -> ok.
 histogram(Target,Width,Internalformat,Sink) ->
-  wxe_util:cast(5354, <<Target:?GLenum,Width:?GLsizei,Internalformat:?GLenum,Sink:?GLboolean>>).
+  cast(5354, <<Target:?GLenum,Width:?GLsizei,Internalformat:?GLenum,Sink:?GLboolean>>).
 
 %% @spec (Target::enum(),Internalformat::enum(),Sink::0|1) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMinmax.xml">external</a> documentation.
+-spec minmax(enum(),enum(),0|1) -> ok.
 minmax(Target,Internalformat,Sink) ->
-  wxe_util:cast(5355, <<Target:?GLenum,Internalformat:?GLenum,Sink:?GLboolean>>).
+  cast(5355, <<Target:?GLenum,Internalformat:?GLenum,Sink:?GLboolean>>).
 
 %% @spec (Target::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glResetHistogram.xml">external</a> documentation.
+-spec resetHistogram(enum()) -> ok.
 resetHistogram(Target) ->
-  wxe_util:cast(5356, <<Target:?GLenum>>).
+  cast(5356, <<Target:?GLenum>>).
 
 %% @spec (Target::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glResetMinmax.xml">external</a> documentation.
+-spec resetMinmax(enum()) -> ok.
 resetMinmax(Target) ->
-  wxe_util:cast(5357, <<Target:?GLenum>>).
+  cast(5357, <<Target:?GLenum>>).
 
 %% @spec (Texture::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glActiveTexture.xml">external</a> documentation.
+-spec activeTexture(enum()) -> ok.
 activeTexture(Texture) ->
-  wxe_util:cast(5358, <<Texture:?GLenum>>).
+  cast(5358, <<Texture:?GLenum>>).
 
 %% @spec (Value::clamp(),Invert::0|1) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSampleCoverage.xml">external</a> documentation.
+-spec sampleCoverage(clamp(),0|1) -> ok.
 sampleCoverage(Value,Invert) ->
-  wxe_util:cast(5359, <<Value:?GLclampf,Invert:?GLboolean>>).
+  cast(5359, <<Value:?GLclampf,Invert:?GLboolean>>).
 
-%% @spec (Target::enum(),Level::integer(),Internalformat::enum(),Width::integer(),Height::integer(),Depth::integer(),Border::integer(),ImageSize::integer(),Data::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Internalformat::enum(),Width::integer(),Height::integer(),Depth::integer(),Border::integer(),ImageSize::integer(),Data::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexImage3D.xml">external</a> documentation.
+-spec compressedTexImage3D(enum(),integer(),enum(),integer(),integer(),integer(),integer(),integer(),offset()|mem()) -> ok.
 compressedTexImage3D(Target,Level,Internalformat,Width,Height,Depth,Border,ImageSize,Data) when  is_integer(Data) ->
-  wxe_util:cast(5360, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Border:?GLint,ImageSize:?GLsizei,Data:?GLuint>>);
+  cast(5360, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Border:?GLint,ImageSize:?GLsizei,Data:?GLuint>>);
 compressedTexImage3D(Target,Level,Internalformat,Width,Height,Depth,Border,ImageSize,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:cast(5361, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Border:?GLint,ImageSize:?GLsizei>>).
+  send_bin(Data),
+  cast(5361, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Border:?GLint,ImageSize:?GLsizei>>).
 
-%% @spec (Target::enum(),Level::integer(),Internalformat::enum(),Width::integer(),Height::integer(),Border::integer(),ImageSize::integer(),Data::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Internalformat::enum(),Width::integer(),Height::integer(),Border::integer(),ImageSize::integer(),Data::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexImage2D.xml">external</a> documentation.
+-spec compressedTexImage2D(enum(),integer(),enum(),integer(),integer(),integer(),integer(),offset()|mem()) -> ok.
 compressedTexImage2D(Target,Level,Internalformat,Width,Height,Border,ImageSize,Data) when  is_integer(Data) ->
-  wxe_util:cast(5362, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Border:?GLint,ImageSize:?GLsizei,Data:?GLuint>>);
+  cast(5362, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Border:?GLint,ImageSize:?GLsizei,Data:?GLuint>>);
 compressedTexImage2D(Target,Level,Internalformat,Width,Height,Border,ImageSize,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:cast(5363, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Border:?GLint,ImageSize:?GLsizei>>).
+  send_bin(Data),
+  cast(5363, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei,Border:?GLint,ImageSize:?GLsizei>>).
 
-%% @spec (Target::enum(),Level::integer(),Internalformat::enum(),Width::integer(),Border::integer(),ImageSize::integer(),Data::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Internalformat::enum(),Width::integer(),Border::integer(),ImageSize::integer(),Data::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexImage1D.xml">external</a> documentation.
+-spec compressedTexImage1D(enum(),integer(),enum(),integer(),integer(),integer(),offset()|mem()) -> ok.
 compressedTexImage1D(Target,Level,Internalformat,Width,Border,ImageSize,Data) when  is_integer(Data) ->
-  wxe_util:cast(5364, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Border:?GLint,ImageSize:?GLsizei,Data:?GLuint>>);
+  cast(5364, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Border:?GLint,ImageSize:?GLsizei,Data:?GLuint>>);
 compressedTexImage1D(Target,Level,Internalformat,Width,Border,ImageSize,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:cast(5365, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Border:?GLint,ImageSize:?GLsizei>>).
+  send_bin(Data),
+  cast(5365, <<Target:?GLenum,Level:?GLint,Internalformat:?GLenum,Width:?GLsizei,Border:?GLint,ImageSize:?GLsizei>>).
 
-%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Yoffset::integer(),Zoffset::integer(),Width::integer(),Height::integer(),Depth::integer(),Format::enum(),ImageSize::integer(),Data::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Yoffset::integer(),Zoffset::integer(),Width::integer(),Height::integer(),Depth::integer(),Format::enum(),ImageSize::integer(),Data::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexSubImage3D.xml">external</a> documentation.
+-spec compressedTexSubImage3D(enum(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),enum(),integer(),offset()|mem()) -> ok.
 compressedTexSubImage3D(Target,Level,Xoffset,Yoffset,Zoffset,Width,Height,Depth,Format,ImageSize,Data) when  is_integer(Data) ->
-  wxe_util:cast(5366, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Zoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,ImageSize:?GLsizei,Data:?GLuint>>);
+  cast(5366, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Zoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,ImageSize:?GLsizei,Data:?GLuint>>);
 compressedTexSubImage3D(Target,Level,Xoffset,Yoffset,Zoffset,Width,Height,Depth,Format,ImageSize,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:cast(5367, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Zoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,ImageSize:?GLsizei>>).
+  send_bin(Data),
+  cast(5367, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Zoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,ImageSize:?GLsizei>>).
 
-%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Yoffset::integer(),Width::integer(),Height::integer(),Format::enum(),ImageSize::integer(),Data::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Yoffset::integer(),Width::integer(),Height::integer(),Format::enum(),ImageSize::integer(),Data::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexSubImage2D.xml">external</a> documentation.
+-spec compressedTexSubImage2D(enum(),integer(),integer(),integer(),integer(),integer(),enum(),integer(),offset()|mem()) -> ok.
 compressedTexSubImage2D(Target,Level,Xoffset,Yoffset,Width,Height,Format,ImageSize,Data) when  is_integer(Data) ->
-  wxe_util:cast(5368, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,ImageSize:?GLsizei,Data:?GLuint>>);
+  cast(5368, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,ImageSize:?GLsizei,Data:?GLuint>>);
 compressedTexSubImage2D(Target,Level,Xoffset,Yoffset,Width,Height,Format,ImageSize,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:cast(5369, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,ImageSize:?GLsizei>>).
+  send_bin(Data),
+  cast(5369, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Yoffset:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,ImageSize:?GLsizei>>).
 
-%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Width::integer(),Format::enum(),ImageSize::integer(),Data::offset()|binary()) -> ok
+%% @spec (Target::enum(),Level::integer(),Xoffset::integer(),Width::integer(),Format::enum(),ImageSize::integer(),Data::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompressedTexSubImage1D.xml">external</a> documentation.
+-spec compressedTexSubImage1D(enum(),integer(),integer(),integer(),enum(),integer(),offset()|mem()) -> ok.
 compressedTexSubImage1D(Target,Level,Xoffset,Width,Format,ImageSize,Data) when  is_integer(Data) ->
-  wxe_util:cast(5370, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Width:?GLsizei,Format:?GLenum,ImageSize:?GLsizei,Data:?GLuint>>);
+  cast(5370, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Width:?GLsizei,Format:?GLenum,ImageSize:?GLsizei,Data:?GLuint>>);
 compressedTexSubImage1D(Target,Level,Xoffset,Width,Format,ImageSize,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:cast(5371, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Width:?GLsizei,Format:?GLenum,ImageSize:?GLsizei>>).
+  send_bin(Data),
+  cast(5371, <<Target:?GLenum,Level:?GLint,Xoffset:?GLint,Width:?GLsizei,Format:?GLenum,ImageSize:?GLsizei>>).
 
-%% @spec (Target::enum(),Level::integer(),Img::wx:wx_mem()) -> ok
+%% @spec (Target::enum(),Level::integer(),Img::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetCompressedTexImage.xml">external</a> documentation.
+-spec getCompressedTexImage(enum(),integer(),mem()) -> ok.
 getCompressedTexImage(Target,Level,Img) ->
-  wxe_util:send_bin(Img#wx_mem.bin),
-  wxe_util:call(5372, <<Target:?GLenum,Level:?GLint>>).
+  send_bin(Img),
+  call(5372, <<Target:?GLenum,Level:?GLint>>).
 
 %% @spec (Texture::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClientActiveTexture.xml">external</a> documentation.
+-spec clientActiveTexture(enum()) -> ok.
 clientActiveTexture(Texture) ->
-  wxe_util:cast(5373, <<Texture:?GLenum>>).
+  cast(5373, <<Texture:?GLenum>>).
 
 %% @spec (Target::enum(),S::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord1d(enum(),float()) -> ok.
 multiTexCoord1d(Target,S) ->
-  wxe_util:cast(5374, <<Target:?GLenum,0:32,S:?GLdouble>>).
+  cast(5374, <<Target:?GLenum,0:32,S:?GLdouble>>).
 
 %% @spec (Target,{S}) -> ok
 %% @equiv multiTexCoord1d(Target,S)
+-spec multiTexCoord1dv(enum(),{float()}) -> ok.
 multiTexCoord1dv(Target,{S}) ->  multiTexCoord1d(Target,S).
 
 %% @spec (Target::enum(),S::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord1f(enum(),float()) -> ok.
 multiTexCoord1f(Target,S) ->
-  wxe_util:cast(5375, <<Target:?GLenum,S:?GLfloat>>).
+  cast(5375, <<Target:?GLenum,S:?GLfloat>>).
 
 %% @spec (Target,{S}) -> ok
 %% @equiv multiTexCoord1f(Target,S)
+-spec multiTexCoord1fv(enum(),{float()}) -> ok.
 multiTexCoord1fv(Target,{S}) ->  multiTexCoord1f(Target,S).
 
 %% @spec (Target::enum(),S::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord1i(enum(),integer()) -> ok.
 multiTexCoord1i(Target,S) ->
-  wxe_util:cast(5376, <<Target:?GLenum,S:?GLint>>).
+  cast(5376, <<Target:?GLenum,S:?GLint>>).
 
 %% @spec (Target,{S}) -> ok
 %% @equiv multiTexCoord1i(Target,S)
+-spec multiTexCoord1iv(enum(),{integer()}) -> ok.
 multiTexCoord1iv(Target,{S}) ->  multiTexCoord1i(Target,S).
 
 %% @spec (Target::enum(),S::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord1s(enum(),integer()) -> ok.
 multiTexCoord1s(Target,S) ->
-  wxe_util:cast(5377, <<Target:?GLenum,S:?GLshort>>).
+  cast(5377, <<Target:?GLenum,S:?GLshort>>).
 
 %% @spec (Target,{S}) -> ok
 %% @equiv multiTexCoord1s(Target,S)
+-spec multiTexCoord1sv(enum(),{integer()}) -> ok.
 multiTexCoord1sv(Target,{S}) ->  multiTexCoord1s(Target,S).
 
 %% @spec (Target::enum(),S::float(),T::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord2d(enum(),float(),float()) -> ok.
 multiTexCoord2d(Target,S,T) ->
-  wxe_util:cast(5378, <<Target:?GLenum,0:32,S:?GLdouble,T:?GLdouble>>).
+  cast(5378, <<Target:?GLenum,0:32,S:?GLdouble,T:?GLdouble>>).
 
 %% @spec (Target,{S,T}) -> ok
 %% @equiv multiTexCoord2d(Target,S,T)
+-spec multiTexCoord2dv(enum(),{float(),float()}) -> ok.
 multiTexCoord2dv(Target,{S,T}) ->  multiTexCoord2d(Target,S,T).
 
 %% @spec (Target::enum(),S::float(),T::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord2f(enum(),float(),float()) -> ok.
 multiTexCoord2f(Target,S,T) ->
-  wxe_util:cast(5379, <<Target:?GLenum,S:?GLfloat,T:?GLfloat>>).
+  cast(5379, <<Target:?GLenum,S:?GLfloat,T:?GLfloat>>).
 
 %% @spec (Target,{S,T}) -> ok
 %% @equiv multiTexCoord2f(Target,S,T)
+-spec multiTexCoord2fv(enum(),{float(),float()}) -> ok.
 multiTexCoord2fv(Target,{S,T}) ->  multiTexCoord2f(Target,S,T).
 
 %% @spec (Target::enum(),S::integer(),T::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord2i(enum(),integer(),integer()) -> ok.
 multiTexCoord2i(Target,S,T) ->
-  wxe_util:cast(5380, <<Target:?GLenum,S:?GLint,T:?GLint>>).
+  cast(5380, <<Target:?GLenum,S:?GLint,T:?GLint>>).
 
 %% @spec (Target,{S,T}) -> ok
 %% @equiv multiTexCoord2i(Target,S,T)
+-spec multiTexCoord2iv(enum(),{integer(),integer()}) -> ok.
 multiTexCoord2iv(Target,{S,T}) ->  multiTexCoord2i(Target,S,T).
 
 %% @spec (Target::enum(),S::integer(),T::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord2s(enum(),integer(),integer()) -> ok.
 multiTexCoord2s(Target,S,T) ->
-  wxe_util:cast(5381, <<Target:?GLenum,S:?GLshort,T:?GLshort>>).
+  cast(5381, <<Target:?GLenum,S:?GLshort,T:?GLshort>>).
 
 %% @spec (Target,{S,T}) -> ok
 %% @equiv multiTexCoord2s(Target,S,T)
+-spec multiTexCoord2sv(enum(),{integer(),integer()}) -> ok.
 multiTexCoord2sv(Target,{S,T}) ->  multiTexCoord2s(Target,S,T).
 
 %% @spec (Target::enum(),S::float(),T::float(),R::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord3d(enum(),float(),float(),float()) -> ok.
 multiTexCoord3d(Target,S,T,R) ->
-  wxe_util:cast(5382, <<Target:?GLenum,0:32,S:?GLdouble,T:?GLdouble,R:?GLdouble>>).
+  cast(5382, <<Target:?GLenum,0:32,S:?GLdouble,T:?GLdouble,R:?GLdouble>>).
 
 %% @spec (Target,{S,T,R}) -> ok
 %% @equiv multiTexCoord3d(Target,S,T,R)
+-spec multiTexCoord3dv(enum(),{float(),float(),float()}) -> ok.
 multiTexCoord3dv(Target,{S,T,R}) ->  multiTexCoord3d(Target,S,T,R).
 
 %% @spec (Target::enum(),S::float(),T::float(),R::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord3f(enum(),float(),float(),float()) -> ok.
 multiTexCoord3f(Target,S,T,R) ->
-  wxe_util:cast(5383, <<Target:?GLenum,S:?GLfloat,T:?GLfloat,R:?GLfloat>>).
+  cast(5383, <<Target:?GLenum,S:?GLfloat,T:?GLfloat,R:?GLfloat>>).
 
 %% @spec (Target,{S,T,R}) -> ok
 %% @equiv multiTexCoord3f(Target,S,T,R)
+-spec multiTexCoord3fv(enum(),{float(),float(),float()}) -> ok.
 multiTexCoord3fv(Target,{S,T,R}) ->  multiTexCoord3f(Target,S,T,R).
 
 %% @spec (Target::enum(),S::integer(),T::integer(),R::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord3i(enum(),integer(),integer(),integer()) -> ok.
 multiTexCoord3i(Target,S,T,R) ->
-  wxe_util:cast(5384, <<Target:?GLenum,S:?GLint,T:?GLint,R:?GLint>>).
+  cast(5384, <<Target:?GLenum,S:?GLint,T:?GLint,R:?GLint>>).
 
 %% @spec (Target,{S,T,R}) -> ok
 %% @equiv multiTexCoord3i(Target,S,T,R)
+-spec multiTexCoord3iv(enum(),{integer(),integer(),integer()}) -> ok.
 multiTexCoord3iv(Target,{S,T,R}) ->  multiTexCoord3i(Target,S,T,R).
 
 %% @spec (Target::enum(),S::integer(),T::integer(),R::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord3s(enum(),integer(),integer(),integer()) -> ok.
 multiTexCoord3s(Target,S,T,R) ->
-  wxe_util:cast(5385, <<Target:?GLenum,S:?GLshort,T:?GLshort,R:?GLshort>>).
+  cast(5385, <<Target:?GLenum,S:?GLshort,T:?GLshort,R:?GLshort>>).
 
 %% @spec (Target,{S,T,R}) -> ok
 %% @equiv multiTexCoord3s(Target,S,T,R)
+-spec multiTexCoord3sv(enum(),{integer(),integer(),integer()}) -> ok.
 multiTexCoord3sv(Target,{S,T,R}) ->  multiTexCoord3s(Target,S,T,R).
 
 %% @spec (Target::enum(),S::float(),T::float(),R::float(),Q::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord4d(enum(),float(),float(),float(),float()) -> ok.
 multiTexCoord4d(Target,S,T,R,Q) ->
-  wxe_util:cast(5386, <<Target:?GLenum,0:32,S:?GLdouble,T:?GLdouble,R:?GLdouble,Q:?GLdouble>>).
+  cast(5386, <<Target:?GLenum,0:32,S:?GLdouble,T:?GLdouble,R:?GLdouble,Q:?GLdouble>>).
 
 %% @spec (Target,{S,T,R,Q}) -> ok
 %% @equiv multiTexCoord4d(Target,S,T,R,Q)
+-spec multiTexCoord4dv(enum(),{float(),float(),float(),float()}) -> ok.
 multiTexCoord4dv(Target,{S,T,R,Q}) ->  multiTexCoord4d(Target,S,T,R,Q).
 
 %% @spec (Target::enum(),S::float(),T::float(),R::float(),Q::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord4f(enum(),float(),float(),float(),float()) -> ok.
 multiTexCoord4f(Target,S,T,R,Q) ->
-  wxe_util:cast(5387, <<Target:?GLenum,S:?GLfloat,T:?GLfloat,R:?GLfloat,Q:?GLfloat>>).
+  cast(5387, <<Target:?GLenum,S:?GLfloat,T:?GLfloat,R:?GLfloat,Q:?GLfloat>>).
 
 %% @spec (Target,{S,T,R,Q}) -> ok
 %% @equiv multiTexCoord4f(Target,S,T,R,Q)
+-spec multiTexCoord4fv(enum(),{float(),float(),float(),float()}) -> ok.
 multiTexCoord4fv(Target,{S,T,R,Q}) ->  multiTexCoord4f(Target,S,T,R,Q).
 
 %% @spec (Target::enum(),S::integer(),T::integer(),R::integer(),Q::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord4i(enum(),integer(),integer(),integer(),integer()) -> ok.
 multiTexCoord4i(Target,S,T,R,Q) ->
-  wxe_util:cast(5388, <<Target:?GLenum,S:?GLint,T:?GLint,R:?GLint,Q:?GLint>>).
+  cast(5388, <<Target:?GLenum,S:?GLint,T:?GLint,R:?GLint,Q:?GLint>>).
 
 %% @spec (Target,{S,T,R,Q}) -> ok
 %% @equiv multiTexCoord4i(Target,S,T,R,Q)
+-spec multiTexCoord4iv(enum(),{integer(),integer(),integer(),integer()}) -> ok.
 multiTexCoord4iv(Target,{S,T,R,Q}) ->  multiTexCoord4i(Target,S,T,R,Q).
 
 %% @spec (Target::enum(),S::integer(),T::integer(),R::integer(),Q::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiTexCoord.xml">external</a> documentation.
+-spec multiTexCoord4s(enum(),integer(),integer(),integer(),integer()) -> ok.
 multiTexCoord4s(Target,S,T,R,Q) ->
-  wxe_util:cast(5389, <<Target:?GLenum,S:?GLshort,T:?GLshort,R:?GLshort,Q:?GLshort>>).
+  cast(5389, <<Target:?GLenum,S:?GLshort,T:?GLshort,R:?GLshort,Q:?GLshort>>).
 
 %% @spec (Target,{S,T,R,Q}) -> ok
 %% @equiv multiTexCoord4s(Target,S,T,R,Q)
+-spec multiTexCoord4sv(enum(),{integer(),integer(),integer(),integer()}) -> ok.
 multiTexCoord4sv(Target,{S,T,R,Q}) ->  multiTexCoord4s(Target,S,T,R,Q).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLoadTransposeMatrix.xml">external</a> documentation.
+-spec loadTransposeMatrixf({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 loadTransposeMatrixf({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5390, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
+  cast(5390, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
 loadTransposeMatrixf({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5390, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
+  cast(5390, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLoadTransposeMatrix.xml">external</a> documentation.
+-spec loadTransposeMatrixd({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 loadTransposeMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5391, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
+  cast(5391, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
 loadTransposeMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5391, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
+  cast(5391, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultTransposeMatrix.xml">external</a> documentation.
+-spec multTransposeMatrixf({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 multTransposeMatrixf({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5392, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
+  cast(5392, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
 multTransposeMatrixf({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5392, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
+  cast(5392, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultTransposeMatrix.xml">external</a> documentation.
+-spec multTransposeMatrixd({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 multTransposeMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5393, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
+  cast(5393, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
 multTransposeMatrixd({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5393, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
+  cast(5393, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
 
 %% @spec (SfactorRGB::enum(),DfactorRGB::enum(),SfactorAlpha::enum(),DfactorAlpha::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBlendFuncSeparate.xml">external</a> documentation.
+-spec blendFuncSeparate(enum(),enum(),enum(),enum()) -> ok.
 blendFuncSeparate(SfactorRGB,DfactorRGB,SfactorAlpha,DfactorAlpha) ->
-  wxe_util:cast(5394, <<SfactorRGB:?GLenum,DfactorRGB:?GLenum,SfactorAlpha:?GLenum,DfactorAlpha:?GLenum>>).
+  cast(5394, <<SfactorRGB:?GLenum,DfactorRGB:?GLenum,SfactorAlpha:?GLenum,DfactorAlpha:?GLenum>>).
 
 %% @spec (Mode::enum(),First::[integer()],Count::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultiDrawArrays.xml">external</a> documentation.
+-spec multiDrawArrays(enum(),[integer()],[integer()]) -> ok.
 multiDrawArrays(Mode,First,Count) ->
-  wxe_util:cast(5395, <<Mode:?GLenum,(length(First)):?GLuint,
+  cast(5395, <<Mode:?GLenum,(length(First)):?GLuint,
         (<< <<C:?GLint>> || C <- First>>)/binary,0:(((length(First)) rem 2)*32),(length(Count)):?GLuint,
         (<< <<C:?GLsizei>> || C <- Count>>)/binary,0:(((1+length(Count)) rem 2)*32)>>).
 
 %% @spec (Pname::enum(),Param::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPointParameter.xml">external</a> documentation.
+-spec pointParameterf(enum(),float()) -> ok.
 pointParameterf(Pname,Param) ->
-  wxe_util:cast(5396, <<Pname:?GLenum,Param:?GLfloat>>).
+  cast(5396, <<Pname:?GLenum,Param:?GLfloat>>).
 
 %% @spec (Pname::enum(),Params::{float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPointParameter.xml">external</a> documentation.
+-spec pointParameterfv(enum(),{float()}) -> ok.
 pointParameterfv(Pname,Params) ->
-  wxe_util:cast(5397, <<Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5397, <<Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLfloat>> ||C <- tuple_to_list(Params)>>)/binary,0:(((0+size(Params)) rem 2)*32)>>).
 
 %% @spec (Pname::enum(),Param::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPointParameter.xml">external</a> documentation.
+-spec pointParameteri(enum(),integer()) -> ok.
 pointParameteri(Pname,Param) ->
-  wxe_util:cast(5398, <<Pname:?GLenum,Param:?GLint>>).
+  cast(5398, <<Pname:?GLenum,Param:?GLint>>).
 
 %% @spec (Pname::enum(),Params::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPointParameter.xml">external</a> documentation.
+-spec pointParameteriv(enum(),{integer()}) -> ok.
 pointParameteriv(Pname,Params) ->
-  wxe_util:cast(5399, <<Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5399, <<Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLint>> ||C <- tuple_to_list(Params)>>)/binary,0:(((0+size(Params)) rem 2)*32)>>).
 
 %% @spec (Coord::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFogCoord.xml">external</a> documentation.
+-spec fogCoordf(float()) -> ok.
 fogCoordf(Coord) ->
-  wxe_util:cast(5400, <<Coord:?GLfloat>>).
+  cast(5400, <<Coord:?GLfloat>>).
 
 %% @spec ({Coord}) -> ok
 %% @equiv fogCoordf(Coord)
+-spec fogCoordfv({float()}) -> ok.
 fogCoordfv({Coord}) ->  fogCoordf(Coord).
 
 %% @spec (Coord::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFogCoord.xml">external</a> documentation.
+-spec fogCoordd(float()) -> ok.
 fogCoordd(Coord) ->
-  wxe_util:cast(5401, <<Coord:?GLdouble>>).
+  cast(5401, <<Coord:?GLdouble>>).
 
 %% @spec ({Coord}) -> ok
 %% @equiv fogCoordd(Coord)
+-spec fogCoorddv({float()}) -> ok.
 fogCoorddv({Coord}) ->  fogCoordd(Coord).
 
-%% @spec (Type::enum(),Stride::integer(),Pointer::offset()|binary()) -> ok
+%% @spec (Type::enum(),Stride::integer(),Pointer::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFogCoordPointer.xml">external</a> documentation.
+-spec fogCoordPointer(enum(),integer(),offset()|mem()) -> ok.
 fogCoordPointer(Type,Stride,Pointer) when  is_integer(Pointer) ->
-  wxe_util:cast(5402, <<Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
+  cast(5402, <<Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
 fogCoordPointer(Type,Stride,Pointer) ->
-  wxe_util:send_bin(Pointer),
-  wxe_util:cast(5403, <<Type:?GLenum,Stride:?GLsizei>>).
+  send_bin(Pointer),
+  cast(5403, <<Type:?GLenum,Stride:?GLsizei>>).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSecondaryColor.xml">external</a> documentation.
+-spec secondaryColor3b(integer(),integer(),integer()) -> ok.
 secondaryColor3b(Red,Green,Blue) ->
-  wxe_util:cast(5404, <<Red:?GLbyte,Green:?GLbyte,Blue:?GLbyte>>).
+  cast(5404, <<Red:?GLbyte,Green:?GLbyte,Blue:?GLbyte>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv secondaryColor3b(Red,Green,Blue)
+-spec secondaryColor3bv({integer(),integer(),integer()}) -> ok.
 secondaryColor3bv({Red,Green,Blue}) ->  secondaryColor3b(Red,Green,Blue).
 
 %% @spec (Red::float(),Green::float(),Blue::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSecondaryColor.xml">external</a> documentation.
+-spec secondaryColor3d(float(),float(),float()) -> ok.
 secondaryColor3d(Red,Green,Blue) ->
-  wxe_util:cast(5405, <<Red:?GLdouble,Green:?GLdouble,Blue:?GLdouble>>).
+  cast(5405, <<Red:?GLdouble,Green:?GLdouble,Blue:?GLdouble>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv secondaryColor3d(Red,Green,Blue)
+-spec secondaryColor3dv({float(),float(),float()}) -> ok.
 secondaryColor3dv({Red,Green,Blue}) ->  secondaryColor3d(Red,Green,Blue).
 
 %% @spec (Red::float(),Green::float(),Blue::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSecondaryColor.xml">external</a> documentation.
+-spec secondaryColor3f(float(),float(),float()) -> ok.
 secondaryColor3f(Red,Green,Blue) ->
-  wxe_util:cast(5406, <<Red:?GLfloat,Green:?GLfloat,Blue:?GLfloat>>).
+  cast(5406, <<Red:?GLfloat,Green:?GLfloat,Blue:?GLfloat>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv secondaryColor3f(Red,Green,Blue)
+-spec secondaryColor3fv({float(),float(),float()}) -> ok.
 secondaryColor3fv({Red,Green,Blue}) ->  secondaryColor3f(Red,Green,Blue).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSecondaryColor.xml">external</a> documentation.
+-spec secondaryColor3i(integer(),integer(),integer()) -> ok.
 secondaryColor3i(Red,Green,Blue) ->
-  wxe_util:cast(5407, <<Red:?GLint,Green:?GLint,Blue:?GLint>>).
+  cast(5407, <<Red:?GLint,Green:?GLint,Blue:?GLint>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv secondaryColor3i(Red,Green,Blue)
+-spec secondaryColor3iv({integer(),integer(),integer()}) -> ok.
 secondaryColor3iv({Red,Green,Blue}) ->  secondaryColor3i(Red,Green,Blue).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSecondaryColor.xml">external</a> documentation.
+-spec secondaryColor3s(integer(),integer(),integer()) -> ok.
 secondaryColor3s(Red,Green,Blue) ->
-  wxe_util:cast(5408, <<Red:?GLshort,Green:?GLshort,Blue:?GLshort>>).
+  cast(5408, <<Red:?GLshort,Green:?GLshort,Blue:?GLshort>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv secondaryColor3s(Red,Green,Blue)
+-spec secondaryColor3sv({integer(),integer(),integer()}) -> ok.
 secondaryColor3sv({Red,Green,Blue}) ->  secondaryColor3s(Red,Green,Blue).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSecondaryColor.xml">external</a> documentation.
+-spec secondaryColor3ub(integer(),integer(),integer()) -> ok.
 secondaryColor3ub(Red,Green,Blue) ->
-  wxe_util:cast(5409, <<Red:?GLubyte,Green:?GLubyte,Blue:?GLubyte>>).
+  cast(5409, <<Red:?GLubyte,Green:?GLubyte,Blue:?GLubyte>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv secondaryColor3ub(Red,Green,Blue)
+-spec secondaryColor3ubv({integer(),integer(),integer()}) -> ok.
 secondaryColor3ubv({Red,Green,Blue}) ->  secondaryColor3ub(Red,Green,Blue).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSecondaryColor.xml">external</a> documentation.
+-spec secondaryColor3ui(integer(),integer(),integer()) -> ok.
 secondaryColor3ui(Red,Green,Blue) ->
-  wxe_util:cast(5410, <<Red:?GLuint,Green:?GLuint,Blue:?GLuint>>).
+  cast(5410, <<Red:?GLuint,Green:?GLuint,Blue:?GLuint>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv secondaryColor3ui(Red,Green,Blue)
+-spec secondaryColor3uiv({integer(),integer(),integer()}) -> ok.
 secondaryColor3uiv({Red,Green,Blue}) ->  secondaryColor3ui(Red,Green,Blue).
 
 %% @spec (Red::integer(),Green::integer(),Blue::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSecondaryColor.xml">external</a> documentation.
+-spec secondaryColor3us(integer(),integer(),integer()) -> ok.
 secondaryColor3us(Red,Green,Blue) ->
-  wxe_util:cast(5411, <<Red:?GLushort,Green:?GLushort,Blue:?GLushort>>).
+  cast(5411, <<Red:?GLushort,Green:?GLushort,Blue:?GLushort>>).
 
 %% @spec ({Red,Green,Blue}) -> ok
 %% @equiv secondaryColor3us(Red,Green,Blue)
+-spec secondaryColor3usv({integer(),integer(),integer()}) -> ok.
 secondaryColor3usv({Red,Green,Blue}) ->  secondaryColor3us(Red,Green,Blue).
 
-%% @spec (Size::integer(),Type::enum(),Stride::integer(),Pointer::offset()|binary()) -> ok
+%% @spec (Size::integer(),Type::enum(),Stride::integer(),Pointer::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSecondaryColorPointer.xml">external</a> documentation.
+-spec secondaryColorPointer(integer(),enum(),integer(),offset()|mem()) -> ok.
 secondaryColorPointer(Size,Type,Stride,Pointer) when  is_integer(Pointer) ->
-  wxe_util:cast(5412, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
+  cast(5412, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
 secondaryColorPointer(Size,Type,Stride,Pointer) ->
-  wxe_util:send_bin(Pointer),
-  wxe_util:cast(5413, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei>>).
+  send_bin(Pointer),
+  cast(5413, <<Size:?GLint,Type:?GLenum,Stride:?GLsizei>>).
 
 %% @spec (X::float(),Y::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos.xml">external</a> documentation.
+-spec windowPos2d(float(),float()) -> ok.
 windowPos2d(X,Y) ->
-  wxe_util:cast(5414, <<X:?GLdouble,Y:?GLdouble>>).
+  cast(5414, <<X:?GLdouble,Y:?GLdouble>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv windowPos2d(X,Y)
+-spec windowPos2dv({float(),float()}) -> ok.
 windowPos2dv({X,Y}) ->  windowPos2d(X,Y).
 
 %% @spec (X::float(),Y::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos.xml">external</a> documentation.
+-spec windowPos2f(float(),float()) -> ok.
 windowPos2f(X,Y) ->
-  wxe_util:cast(5415, <<X:?GLfloat,Y:?GLfloat>>).
+  cast(5415, <<X:?GLfloat,Y:?GLfloat>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv windowPos2f(X,Y)
+-spec windowPos2fv({float(),float()}) -> ok.
 windowPos2fv({X,Y}) ->  windowPos2f(X,Y).
 
 %% @spec (X::integer(),Y::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos.xml">external</a> documentation.
+-spec windowPos2i(integer(),integer()) -> ok.
 windowPos2i(X,Y) ->
-  wxe_util:cast(5416, <<X:?GLint,Y:?GLint>>).
+  cast(5416, <<X:?GLint,Y:?GLint>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv windowPos2i(X,Y)
+-spec windowPos2iv({integer(),integer()}) -> ok.
 windowPos2iv({X,Y}) ->  windowPos2i(X,Y).
 
 %% @spec (X::integer(),Y::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos.xml">external</a> documentation.
+-spec windowPos2s(integer(),integer()) -> ok.
 windowPos2s(X,Y) ->
-  wxe_util:cast(5417, <<X:?GLshort,Y:?GLshort>>).
+  cast(5417, <<X:?GLshort,Y:?GLshort>>).
 
 %% @spec ({X,Y}) -> ok
 %% @equiv windowPos2s(X,Y)
+-spec windowPos2sv({integer(),integer()}) -> ok.
 windowPos2sv({X,Y}) ->  windowPos2s(X,Y).
 
 %% @spec (X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos.xml">external</a> documentation.
+-spec windowPos3d(float(),float(),float()) -> ok.
 windowPos3d(X,Y,Z) ->
-  wxe_util:cast(5418, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
+  cast(5418, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv windowPos3d(X,Y,Z)
+-spec windowPos3dv({float(),float(),float()}) -> ok.
 windowPos3dv({X,Y,Z}) ->  windowPos3d(X,Y,Z).
 
 %% @spec (X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos.xml">external</a> documentation.
+-spec windowPos3f(float(),float(),float()) -> ok.
 windowPos3f(X,Y,Z) ->
-  wxe_util:cast(5419, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
+  cast(5419, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv windowPos3f(X,Y,Z)
+-spec windowPos3fv({float(),float(),float()}) -> ok.
 windowPos3fv({X,Y,Z}) ->  windowPos3f(X,Y,Z).
 
 %% @spec (X::integer(),Y::integer(),Z::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos.xml">external</a> documentation.
+-spec windowPos3i(integer(),integer(),integer()) -> ok.
 windowPos3i(X,Y,Z) ->
-  wxe_util:cast(5420, <<X:?GLint,Y:?GLint,Z:?GLint>>).
+  cast(5420, <<X:?GLint,Y:?GLint,Z:?GLint>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv windowPos3i(X,Y,Z)
+-spec windowPos3iv({integer(),integer(),integer()}) -> ok.
 windowPos3iv({X,Y,Z}) ->  windowPos3i(X,Y,Z).
 
 %% @spec (X::integer(),Y::integer(),Z::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos.xml">external</a> documentation.
+-spec windowPos3s(integer(),integer(),integer()) -> ok.
 windowPos3s(X,Y,Z) ->
-  wxe_util:cast(5421, <<X:?GLshort,Y:?GLshort,Z:?GLshort>>).
+  cast(5421, <<X:?GLshort,Y:?GLshort,Z:?GLshort>>).
 
 %% @spec ({X,Y,Z}) -> ok
 %% @equiv windowPos3s(X,Y,Z)
+-spec windowPos3sv({integer(),integer(),integer()}) -> ok.
 windowPos3sv({X,Y,Z}) ->  windowPos3s(X,Y,Z).
 
 %% @spec (N::integer()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenQueries.xml">external</a> documentation.
+-spec genQueries(integer()) -> [integer()].
 genQueries(N) ->
-  wxe_util:call(5422, <<N:?GLsizei>>).
+  call(5422, <<N:?GLsizei>>).
 
 %% @spec (Ids::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteQueries.xml">external</a> documentation.
+-spec deleteQueries([integer()]) -> ok.
 deleteQueries(Ids) ->
-  wxe_util:cast(5423, <<(length(Ids)):?GLuint,
+  cast(5423, <<(length(Ids)):?GLuint,
         (<< <<C:?GLuint>> || C <- Ids>>)/binary,0:(((1+length(Ids)) rem 2)*32)>>).
 
 %% @spec (Id::integer()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsQuery.xml">external</a> documentation.
+-spec isQuery(integer()) -> 0|1.
 isQuery(Id) ->
-  wxe_util:call(5424, <<Id:?GLuint>>).
+  call(5424, <<Id:?GLuint>>).
 
 %% @spec (Target::enum(),Id::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBeginQuery.xml">external</a> documentation.
+-spec beginQuery(enum(),integer()) -> ok.
 beginQuery(Target,Id) ->
-  wxe_util:cast(5425, <<Target:?GLenum,Id:?GLuint>>).
+  cast(5425, <<Target:?GLenum,Id:?GLuint>>).
 
 %% @spec (Target::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEndQuery.xml">external</a> documentation.
+-spec endQuery(enum()) -> ok.
 endQuery(Target) ->
-  wxe_util:cast(5426, <<Target:?GLenum>>).
+  cast(5426, <<Target:?GLenum>>).
 
 %% @spec (Target::enum(),Pname::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetQuery.xml">external</a> documentation.
+-spec getQueryiv(enum(),enum()) -> integer().
 getQueryiv(Target,Pname) ->
-  wxe_util:call(5427, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5427, <<Target:?GLenum,Pname:?GLenum>>).
 
 %% @spec (Id::integer(),Pname::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetQueryObject.xml">external</a> documentation.
+-spec getQueryObjectiv(integer(),enum()) -> integer().
 getQueryObjectiv(Id,Pname) ->
-  wxe_util:call(5428, <<Id:?GLuint,Pname:?GLenum>>).
+  call(5428, <<Id:?GLuint,Pname:?GLenum>>).
 
 %% @spec (Id::integer(),Pname::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetQueryObject.xml">external</a> documentation.
+-spec getQueryObjectuiv(integer(),enum()) -> integer().
 getQueryObjectuiv(Id,Pname) ->
-  wxe_util:call(5429, <<Id:?GLuint,Pname:?GLenum>>).
+  call(5429, <<Id:?GLuint,Pname:?GLenum>>).
 
 %% @spec (Target::enum(),Buffer::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindBuffer.xml">external</a> documentation.
+-spec bindBuffer(enum(),integer()) -> ok.
 bindBuffer(Target,Buffer) ->
-  wxe_util:cast(5430, <<Target:?GLenum,Buffer:?GLuint>>).
+  cast(5430, <<Target:?GLenum,Buffer:?GLuint>>).
 
 %% @spec (Buffers::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteBuffers.xml">external</a> documentation.
+-spec deleteBuffers([integer()]) -> ok.
 deleteBuffers(Buffers) ->
-  wxe_util:cast(5431, <<(length(Buffers)):?GLuint,
+  cast(5431, <<(length(Buffers)):?GLuint,
         (<< <<C:?GLuint>> || C <- Buffers>>)/binary,0:(((1+length(Buffers)) rem 2)*32)>>).
 
 %% @spec (N::integer()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenBuffers.xml">external</a> documentation.
+-spec genBuffers(integer()) -> [integer()].
 genBuffers(N) ->
-  wxe_util:call(5432, <<N:?GLsizei>>).
+  call(5432, <<N:?GLsizei>>).
 
 %% @spec (Buffer::integer()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsBuffer.xml">external</a> documentation.
+-spec isBuffer(integer()) -> 0|1.
 isBuffer(Buffer) ->
-  wxe_util:call(5433, <<Buffer:?GLuint>>).
+  call(5433, <<Buffer:?GLuint>>).
 
-%% @spec (Target::enum(),Size::integer(),Data::offset()|binary(),Usage::enum()) -> ok
+%% @spec (Target::enum(),Size::integer(),Data::offset()|mem(),Usage::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBufferData.xml">external</a> documentation.
+-spec bufferData(enum(),integer(),offset()|mem(),enum()) -> ok.
 bufferData(Target,Size,Data,Usage) when  is_integer(Data) ->
-  wxe_util:cast(5434, <<Target:?GLenum,0:32,Size:?GLsizeiptr,Data:?GLuint,Usage:?GLenum>>);
+  cast(5434, <<Target:?GLenum,0:32,Size:?GLsizeiptr,Data:?GLuint,Usage:?GLenum>>);
 bufferData(Target,Size,Data,Usage) ->
-  wxe_util:send_bin(Data),
-  wxe_util:cast(5435, <<Target:?GLenum,0:32,Size:?GLsizeiptr,Usage:?GLenum>>).
+  send_bin(Data),
+  cast(5435, <<Target:?GLenum,0:32,Size:?GLsizeiptr,Usage:?GLenum>>).
 
-%% @spec (Target::enum(),Offset::integer(),Size::integer(),Data::offset()|binary()) -> ok
+%% @spec (Target::enum(),Offset::integer(),Size::integer(),Data::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBufferSubData.xml">external</a> documentation.
+-spec bufferSubData(enum(),integer(),integer(),offset()|mem()) -> ok.
 bufferSubData(Target,Offset,Size,Data) when  is_integer(Data) ->
-  wxe_util:cast(5436, <<Target:?GLenum,0:32,Offset:?GLintptr,Size:?GLsizeiptr,Data:?GLuint>>);
+  cast(5436, <<Target:?GLenum,0:32,Offset:?GLintptr,Size:?GLsizeiptr,Data:?GLuint>>);
 bufferSubData(Target,Offset,Size,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:cast(5437, <<Target:?GLenum,0:32,Offset:?GLintptr,Size:?GLsizeiptr>>).
+  send_bin(Data),
+  cast(5437, <<Target:?GLenum,0:32,Offset:?GLintptr,Size:?GLsizeiptr>>).
 
-%% @spec (Target::enum(),Offset::integer(),Size::integer(),Data::wx:wx_mem()) -> ok
+%% @spec (Target::enum(),Offset::integer(),Size::integer(),Data::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetBufferSubData.xml">external</a> documentation.
+-spec getBufferSubData(enum(),integer(),integer(),mem()) -> ok.
 getBufferSubData(Target,Offset,Size,Data) ->
-  wxe_util:send_bin(Data#wx_mem.bin),
-  wxe_util:call(5438, <<Target:?GLenum,0:32,Offset:?GLintptr,Size:?GLsizeiptr>>).
+  send_bin(Data),
+  call(5438, <<Target:?GLenum,0:32,Offset:?GLintptr,Size:?GLsizeiptr>>).
 
 %% @spec (Target::enum(),Pname::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetBufferParameteriv.xml">external</a> documentation.
+-spec getBufferParameteriv(enum(),enum()) -> integer().
 getBufferParameteriv(Target,Pname) ->
-  wxe_util:call(5439, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5439, <<Target:?GLenum,Pname:?GLenum>>).
 
 %% @spec (ModeRGB::enum(),ModeAlpha::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBlendEquationSeparate.xml">external</a> documentation.
+-spec blendEquationSeparate(enum(),enum()) -> ok.
 blendEquationSeparate(ModeRGB,ModeAlpha) ->
-  wxe_util:cast(5440, <<ModeRGB:?GLenum,ModeAlpha:?GLenum>>).
+  cast(5440, <<ModeRGB:?GLenum,ModeAlpha:?GLenum>>).
 
 %% @spec (Bufs::[enum()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawBuffers.xml">external</a> documentation.
+-spec drawBuffers([enum()]) -> ok.
 drawBuffers(Bufs) ->
-  wxe_util:cast(5441, <<(length(Bufs)):?GLuint,
+  cast(5441, <<(length(Bufs)):?GLuint,
         (<< <<C:?GLenum>> || C <- Bufs>>)/binary,0:(((1+length(Bufs)) rem 2)*32)>>).
 
 %% @spec (Face::enum(),Sfail::enum(),Dpfail::enum(),Dppass::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glStencilOpSeparate.xml">external</a> documentation.
+-spec stencilOpSeparate(enum(),enum(),enum(),enum()) -> ok.
 stencilOpSeparate(Face,Sfail,Dpfail,Dppass) ->
-  wxe_util:cast(5442, <<Face:?GLenum,Sfail:?GLenum,Dpfail:?GLenum,Dppass:?GLenum>>).
+  cast(5442, <<Face:?GLenum,Sfail:?GLenum,Dpfail:?GLenum,Dppass:?GLenum>>).
 
-%% @spec (Frontfunc::enum(),Backfunc::enum(),Ref::integer(),Mask::integer()) -> ok
+%% @spec (Face::enum(),Func::enum(),Ref::integer(),Mask::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glStencilFuncSeparate.xml">external</a> documentation.
-stencilFuncSeparate(Frontfunc,Backfunc,Ref,Mask) ->
-  wxe_util:cast(5443, <<Frontfunc:?GLenum,Backfunc:?GLenum,Ref:?GLint,Mask:?GLuint>>).
+-spec stencilFuncSeparate(enum(),enum(),integer(),integer()) -> ok.
+stencilFuncSeparate(Face,Func,Ref,Mask) ->
+  cast(5443, <<Face:?GLenum,Func:?GLenum,Ref:?GLint,Mask:?GLuint>>).
 
 %% @spec (Face::enum(),Mask::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glStencilMaskSeparate.xml">external</a> documentation.
+-spec stencilMaskSeparate(enum(),integer()) -> ok.
 stencilMaskSeparate(Face,Mask) ->
-  wxe_util:cast(5444, <<Face:?GLenum,Mask:?GLuint>>).
+  cast(5444, <<Face:?GLenum,Mask:?GLuint>>).
 
 %% @spec (Program::integer(),Shader::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glAttachShader.xml">external</a> documentation.
+-spec attachShader(integer(),integer()) -> ok.
 attachShader(Program,Shader) ->
-  wxe_util:cast(5445, <<Program:?GLuint,Shader:?GLuint>>).
+  cast(5445, <<Program:?GLuint,Shader:?GLuint>>).
 
 %% @spec (Program::integer(),Index::integer(),Name::string()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindAttribLocation.xml">external</a> documentation.
+-spec bindAttribLocation(integer(),integer(),string()) -> ok.
 bindAttribLocation(Program,Index,Name) ->
-  wxe_util:cast(5446, <<Program:?GLuint,Index:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
+  cast(5446, <<Program:?GLuint,Index:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
 
 %% @spec (Shader::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompileShader.xml">external</a> documentation.
+-spec compileShader(integer()) -> ok.
 compileShader(Shader) ->
-  wxe_util:cast(5447, <<Shader:?GLuint>>).
+  cast(5447, <<Shader:?GLuint>>).
 
 %% @spec () -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCreateProgram.xml">external</a> documentation.
+-spec createProgram() -> integer().
 createProgram() ->
-  wxe_util:call(5448, <<>>).
+  call(5448, <<>>).
 
 %% @spec (Type::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCreateShader.xml">external</a> documentation.
+-spec createShader(enum()) -> integer().
 createShader(Type) ->
-  wxe_util:call(5449, <<Type:?GLenum>>).
+  call(5449, <<Type:?GLenum>>).
 
 %% @spec (Program::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteProgram.xml">external</a> documentation.
+-spec deleteProgram(integer()) -> ok.
 deleteProgram(Program) ->
-  wxe_util:cast(5450, <<Program:?GLuint>>).
+  cast(5450, <<Program:?GLuint>>).
 
 %% @spec (Shader::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteShader.xml">external</a> documentation.
+-spec deleteShader(integer()) -> ok.
 deleteShader(Shader) ->
-  wxe_util:cast(5451, <<Shader:?GLuint>>).
+  cast(5451, <<Shader:?GLuint>>).
 
 %% @spec (Program::integer(),Shader::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDetachShader.xml">external</a> documentation.
+-spec detachShader(integer(),integer()) -> ok.
 detachShader(Program,Shader) ->
-  wxe_util:cast(5452, <<Program:?GLuint,Shader:?GLuint>>).
+  cast(5452, <<Program:?GLuint,Shader:?GLuint>>).
 
 %% @spec (Index::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDisableVertexAttribArray.xml">external</a> documentation.
+-spec disableVertexAttribArray(integer()) -> ok.
 disableVertexAttribArray(Index) ->
-  wxe_util:cast(5453, <<Index:?GLuint>>).
+  cast(5453, <<Index:?GLuint>>).
 
 %% @spec (Index::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEnableVertexAttribArray.xml">external</a> documentation.
+-spec enableVertexAttribArray(integer()) -> ok.
 enableVertexAttribArray(Index) ->
-  wxe_util:cast(5454, <<Index:?GLuint>>).
+  cast(5454, <<Index:?GLuint>>).
 
 %% @spec (Program::integer(),Index::integer(),BufSize::integer()) -> {Size::integer(),Type::enum(),Name::string()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetActiveAttrib.xml">external</a> documentation.
+-spec getActiveAttrib(integer(),integer(),integer()) -> {integer(),enum(),string()}.
 getActiveAttrib(Program,Index,BufSize) ->
-  wxe_util:call(5455, <<Program:?GLuint,Index:?GLuint,BufSize:?GLsizei>>).
+  call(5455, <<Program:?GLuint,Index:?GLuint,BufSize:?GLsizei>>).
 
 %% @spec (Program::integer(),Index::integer(),BufSize::integer()) -> {Size::integer(),Type::enum(),Name::string()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetActiveUniform.xml">external</a> documentation.
+-spec getActiveUniform(integer(),integer(),integer()) -> {integer(),enum(),string()}.
 getActiveUniform(Program,Index,BufSize) ->
-  wxe_util:call(5456, <<Program:?GLuint,Index:?GLuint,BufSize:?GLsizei>>).
+  call(5456, <<Program:?GLuint,Index:?GLuint,BufSize:?GLsizei>>).
 
 %% @spec (Program::integer(),MaxCount::integer()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetAttachedShaders.xml">external</a> documentation.
+-spec getAttachedShaders(integer(),integer()) -> [integer()].
 getAttachedShaders(Program,MaxCount) ->
-  wxe_util:call(5457, <<Program:?GLuint,MaxCount:?GLsizei>>).
+  call(5457, <<Program:?GLuint,MaxCount:?GLsizei>>).
 
 %% @spec (Program::integer(),Name::string()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetAttribLocation.xml">external</a> documentation.
+-spec getAttribLocation(integer(),string()) -> integer().
 getAttribLocation(Program,Name) ->
-  wxe_util:call(5458, <<Program:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 5) rem 8)) rem 8)>>).
+  call(5458, <<Program:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 5) rem 8)) rem 8)>>).
 
 %% @spec (Program::integer(),Pname::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetProgram.xml">external</a> documentation.
+-spec getProgramiv(integer(),enum()) -> integer().
 getProgramiv(Program,Pname) ->
-  wxe_util:call(5459, <<Program:?GLuint,Pname:?GLenum>>).
+  call(5459, <<Program:?GLuint,Pname:?GLenum>>).
 
 %% @spec (Program::integer(),BufSize::integer()) -> string()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetProgramInfoLog.xml">external</a> documentation.
+-spec getProgramInfoLog(integer(),integer()) -> string().
 getProgramInfoLog(Program,BufSize) ->
-  wxe_util:call(5460, <<Program:?GLuint,BufSize:?GLsizei>>).
+  call(5460, <<Program:?GLuint,BufSize:?GLsizei>>).
 
 %% @spec (Shader::integer(),Pname::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetShader.xml">external</a> documentation.
+-spec getShaderiv(integer(),enum()) -> integer().
 getShaderiv(Shader,Pname) ->
-  wxe_util:call(5461, <<Shader:?GLuint,Pname:?GLenum>>).
+  call(5461, <<Shader:?GLuint,Pname:?GLenum>>).
 
 %% @spec (Shader::integer(),BufSize::integer()) -> string()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetShaderInfoLog.xml">external</a> documentation.
+-spec getShaderInfoLog(integer(),integer()) -> string().
 getShaderInfoLog(Shader,BufSize) ->
-  wxe_util:call(5462, <<Shader:?GLuint,BufSize:?GLsizei>>).
+  call(5462, <<Shader:?GLuint,BufSize:?GLsizei>>).
 
 %% @spec (Shader::integer(),BufSize::integer()) -> string()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetShaderSource.xml">external</a> documentation.
+-spec getShaderSource(integer(),integer()) -> string().
 getShaderSource(Shader,BufSize) ->
-  wxe_util:call(5463, <<Shader:?GLuint,BufSize:?GLsizei>>).
+  call(5463, <<Shader:?GLuint,BufSize:?GLsizei>>).
 
 %% @spec (Program::integer(),Name::string()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetUniformLocation.xml">external</a> documentation.
+-spec getUniformLocation(integer(),string()) -> integer().
 getUniformLocation(Program,Name) ->
-  wxe_util:call(5464, <<Program:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 5) rem 8)) rem 8)>>).
+  call(5464, <<Program:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 5) rem 8)) rem 8)>>).
 
-%% @spec (Program::integer(),Location::integer()) -> {float()}
+%% @spec (Program::integer(),Location::integer()) -> {float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetUniform.xml">external</a> documentation.
+-spec getUniformfv(integer(),integer()) -> {float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}.
 getUniformfv(Program,Location) ->
-  wxe_util:call(5465, <<Program:?GLuint,Location:?GLint>>).
+  call(5465, <<Program:?GLuint,Location:?GLint>>).
 
-%% @spec (Program::integer(),Location::integer()) -> {integer()}
+%% @spec (Program::integer(),Location::integer()) -> {integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetUniform.xml">external</a> documentation.
+-spec getUniformiv(integer(),integer()) -> {integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer()}.
 getUniformiv(Program,Location) ->
-  wxe_util:call(5466, <<Program:?GLuint,Location:?GLint>>).
+  call(5466, <<Program:?GLuint,Location:?GLint>>).
 
-%% @spec (Index::integer(),Pname::enum()) -> {float()}
+%% @spec (Index::integer(),Pname::enum()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetVertexAttrib.xml">external</a> documentation.
+-spec getVertexAttribdv(integer(),enum()) -> {float(),float(),float(),float()}.
 getVertexAttribdv(Index,Pname) ->
-  wxe_util:call(5467, <<Index:?GLuint,Pname:?GLenum>>).
+  call(5467, <<Index:?GLuint,Pname:?GLenum>>).
 
-%% @spec (Index::integer(),Pname::enum()) -> {float()}
+%% @spec (Index::integer(),Pname::enum()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetVertexAttrib.xml">external</a> documentation.
+-spec getVertexAttribfv(integer(),enum()) -> {float(),float(),float(),float()}.
 getVertexAttribfv(Index,Pname) ->
-  wxe_util:call(5468, <<Index:?GLuint,Pname:?GLenum>>).
+  call(5468, <<Index:?GLuint,Pname:?GLenum>>).
 
-%% @spec (Index::integer(),Pname::enum()) -> {integer()}
+%% @spec (Index::integer(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetVertexAttrib.xml">external</a> documentation.
+-spec getVertexAttribiv(integer(),enum()) -> {integer(),integer(),integer(),integer()}.
 getVertexAttribiv(Index,Pname) ->
-  wxe_util:call(5469, <<Index:?GLuint,Pname:?GLenum>>).
+  call(5469, <<Index:?GLuint,Pname:?GLenum>>).
 
 %% @spec (Program::integer()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsProgram.xml">external</a> documentation.
+-spec isProgram(integer()) -> 0|1.
 isProgram(Program) ->
-  wxe_util:call(5470, <<Program:?GLuint>>).
+  call(5470, <<Program:?GLuint>>).
 
 %% @spec (Shader::integer()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsShader.xml">external</a> documentation.
+-spec isShader(integer()) -> 0|1.
 isShader(Shader) ->
-  wxe_util:call(5471, <<Shader:?GLuint>>).
+  call(5471, <<Shader:?GLuint>>).
 
 %% @spec (Program::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLinkProgram.xml">external</a> documentation.
+-spec linkProgram(integer()) -> ok.
 linkProgram(Program) ->
-  wxe_util:cast(5472, <<Program:?GLuint>>).
+  cast(5472, <<Program:?GLuint>>).
 
 %% @spec (Shader::integer(),String::[string()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glShaderSource.xml">external</a> documentation.
+-spec shaderSource(integer(),[string()]) -> ok.
 shaderSource(Shader,String) ->
  StringTemp = list_to_binary([[Str|[0]] || Str <- String ]),
-  wxe_util:cast(5473, <<Shader:?GLuint,(length(String)):?GLuint,(size(StringTemp)):?GLuint,(StringTemp)/binary,0:((8-((size(StringTemp)+0) rem 8)) rem 8)>>).
+  cast(5473, <<Shader:?GLuint,(length(String)):?GLuint,(size(StringTemp)):?GLuint,(StringTemp)/binary,0:((8-((size(StringTemp)+0) rem 8)) rem 8)>>).
 
 %% @spec (Program::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUseProgram.xml">external</a> documentation.
+-spec useProgram(integer()) -> ok.
 useProgram(Program) ->
-  wxe_util:cast(5474, <<Program:?GLuint>>).
+  cast(5474, <<Program:?GLuint>>).
 
 %% @spec (Location::integer(),V0::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform1f(integer(),float()) -> ok.
 uniform1f(Location,V0) ->
-  wxe_util:cast(5475, <<Location:?GLint,V0:?GLfloat>>).
+  cast(5475, <<Location:?GLint,V0:?GLfloat>>).
 
 %% @spec (Location::integer(),V0::float(),V1::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform2f(integer(),float(),float()) -> ok.
 uniform2f(Location,V0,V1) ->
-  wxe_util:cast(5476, <<Location:?GLint,V0:?GLfloat,V1:?GLfloat>>).
+  cast(5476, <<Location:?GLint,V0:?GLfloat,V1:?GLfloat>>).
 
 %% @spec (Location::integer(),V0::float(),V1::float(),V2::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform3f(integer(),float(),float(),float()) -> ok.
 uniform3f(Location,V0,V1,V2) ->
-  wxe_util:cast(5477, <<Location:?GLint,V0:?GLfloat,V1:?GLfloat,V2:?GLfloat>>).
+  cast(5477, <<Location:?GLint,V0:?GLfloat,V1:?GLfloat,V2:?GLfloat>>).
 
 %% @spec (Location::integer(),V0::float(),V1::float(),V2::float(),V3::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform4f(integer(),float(),float(),float(),float()) -> ok.
 uniform4f(Location,V0,V1,V2,V3) ->
-  wxe_util:cast(5478, <<Location:?GLint,V0:?GLfloat,V1:?GLfloat,V2:?GLfloat,V3:?GLfloat>>).
+  cast(5478, <<Location:?GLint,V0:?GLfloat,V1:?GLfloat,V2:?GLfloat,V3:?GLfloat>>).
 
 %% @spec (Location::integer(),V0::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform1i(integer(),integer()) -> ok.
 uniform1i(Location,V0) ->
-  wxe_util:cast(5479, <<Location:?GLint,V0:?GLint>>).
+  cast(5479, <<Location:?GLint,V0:?GLint>>).
 
 %% @spec (Location::integer(),V0::integer(),V1::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform2i(integer(),integer(),integer()) -> ok.
 uniform2i(Location,V0,V1) ->
-  wxe_util:cast(5480, <<Location:?GLint,V0:?GLint,V1:?GLint>>).
+  cast(5480, <<Location:?GLint,V0:?GLint,V1:?GLint>>).
 
 %% @spec (Location::integer(),V0::integer(),V1::integer(),V2::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform3i(integer(),integer(),integer(),integer()) -> ok.
 uniform3i(Location,V0,V1,V2) ->
-  wxe_util:cast(5481, <<Location:?GLint,V0:?GLint,V1:?GLint,V2:?GLint>>).
+  cast(5481, <<Location:?GLint,V0:?GLint,V1:?GLint,V2:?GLint>>).
 
 %% @spec (Location::integer(),V0::integer(),V1::integer(),V2::integer(),V3::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform4i(integer(),integer(),integer(),integer(),integer()) -> ok.
 uniform4i(Location,V0,V1,V2,V3) ->
-  wxe_util:cast(5482, <<Location:?GLint,V0:?GLint,V1:?GLint,V2:?GLint,V3:?GLint>>).
+  cast(5482, <<Location:?GLint,V0:?GLint,V1:?GLint,V2:?GLint,V3:?GLint>>).
 
 %% @spec (Location::integer(),Value::[float()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform1fv(integer(),[float()]) -> ok.
 uniform1fv(Location,Value) ->
-  wxe_util:cast(5483, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5483, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<C:?GLfloat>> || C <- Value>>)/binary,0:(((length(Value)) rem 2)*32)>>).
 
-%% @spec (Location::integer(),Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Value::[{float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform2fv(integer(),[{float(),float()}]) -> ok.
 uniform2fv(Location,Value) ->
-  wxe_util:cast(5484, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5484, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat>> || {V1,V2} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Value::[{float(),float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform3fv(integer(),[{float(),float(),float()}]) -> ok.
 uniform3fv(Location,Value) ->
-  wxe_util:cast(5485, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5485, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat>> || {V1,V2,V3} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Value::[{float(),float(),float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform4fv(integer(),[{float(),float(),float(),float()}]) -> ok.
 uniform4fv(Location,Value) ->
-  wxe_util:cast(5486, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5486, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
 
 %% @spec (Location::integer(),Value::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform1iv(integer(),[integer()]) -> ok.
 uniform1iv(Location,Value) ->
-  wxe_util:cast(5487, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5487, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<C:?GLint>> || C <- Value>>)/binary,0:(((length(Value)) rem 2)*32)>>).
 
-%% @spec (Location::integer(),Value::[{integer()}]) -> ok
+%% @spec (Location::integer(),Value::[{integer(),integer()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform2iv(integer(),[{integer(),integer()}]) -> ok.
 uniform2iv(Location,Value) ->
-  wxe_util:cast(5488, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5488, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<V1:?GLint,V2:?GLint>> || {V1,V2} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Value::[{integer()}]) -> ok
+%% @spec (Location::integer(),Value::[{integer(),integer(),integer()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform3iv(integer(),[{integer(),integer(),integer()}]) -> ok.
 uniform3iv(Location,Value) ->
-  wxe_util:cast(5489, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5489, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<V1:?GLint,V2:?GLint,V3:?GLint>> || {V1,V2,V3} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Value::[{integer()}]) -> ok
+%% @spec (Location::integer(),Value::[{integer(),integer(),integer(),integer()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform4iv(integer(),[{integer(),integer(),integer(),integer()}]) -> ok.
 uniform4iv(Location,Value) ->
-  wxe_util:cast(5490, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5490, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Transpose::0|1,Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix.xml">external</a> documentation.
+-spec uniformMatrix2fv(integer(),0|1,[{float(),float(),float(),float()}]) -> ok.
 uniformMatrix2fv(Location,Transpose,Value) ->
-  wxe_util:cast(5491, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+  cast(5491, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Transpose::0|1,Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix.xml">external</a> documentation.
+-spec uniformMatrix3fv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
 uniformMatrix3fv(Location,Transpose,Value) ->
-  wxe_util:cast(5492, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+  cast(5492, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat,V9:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Transpose::0|1,Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix.xml">external</a> documentation.
+-spec uniformMatrix4fv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
 uniformMatrix4fv(Location,Transpose,Value) ->
-  wxe_util:cast(5493, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+  cast(5493, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat,V9:?GLfloat,V10:?GLfloat,V11:?GLfloat,V12:?GLfloat,V13:?GLfloat,V14:?GLfloat,V15:?GLfloat,V16:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12,V13,V14,V15,V16} <- Value>>)/binary>>).
 
 %% @spec (Program::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glValidateProgram.xml">external</a> documentation.
+-spec validateProgram(integer()) -> ok.
 validateProgram(Program) ->
-  wxe_util:cast(5494, <<Program:?GLuint>>).
+  cast(5494, <<Program:?GLuint>>).
 
 %% @spec (Index::integer(),X::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib1d(integer(),float()) -> ok.
 vertexAttrib1d(Index,X) ->
-  wxe_util:cast(5495, <<Index:?GLuint,0:32,X:?GLdouble>>).
+  cast(5495, <<Index:?GLuint,0:32,X:?GLdouble>>).
 
 %% @spec (Index,{X}) -> ok
 %% @equiv vertexAttrib1d(Index,X)
+-spec vertexAttrib1dv(integer(),{float()}) -> ok.
 vertexAttrib1dv(Index,{X}) ->  vertexAttrib1d(Index,X).
 
 %% @spec (Index::integer(),X::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib1f(integer(),float()) -> ok.
 vertexAttrib1f(Index,X) ->
-  wxe_util:cast(5496, <<Index:?GLuint,X:?GLfloat>>).
+  cast(5496, <<Index:?GLuint,X:?GLfloat>>).
 
 %% @spec (Index,{X}) -> ok
 %% @equiv vertexAttrib1f(Index,X)
+-spec vertexAttrib1fv(integer(),{float()}) -> ok.
 vertexAttrib1fv(Index,{X}) ->  vertexAttrib1f(Index,X).
 
 %% @spec (Index::integer(),X::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib1s(integer(),integer()) -> ok.
 vertexAttrib1s(Index,X) ->
-  wxe_util:cast(5497, <<Index:?GLuint,X:?GLshort>>).
+  cast(5497, <<Index:?GLuint,X:?GLshort>>).
 
 %% @spec (Index,{X}) -> ok
 %% @equiv vertexAttrib1s(Index,X)
+-spec vertexAttrib1sv(integer(),{integer()}) -> ok.
 vertexAttrib1sv(Index,{X}) ->  vertexAttrib1s(Index,X).
 
 %% @spec (Index::integer(),X::float(),Y::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib2d(integer(),float(),float()) -> ok.
 vertexAttrib2d(Index,X,Y) ->
-  wxe_util:cast(5498, <<Index:?GLuint,0:32,X:?GLdouble,Y:?GLdouble>>).
+  cast(5498, <<Index:?GLuint,0:32,X:?GLdouble,Y:?GLdouble>>).
 
 %% @spec (Index,{X,Y}) -> ok
 %% @equiv vertexAttrib2d(Index,X,Y)
+-spec vertexAttrib2dv(integer(),{float(),float()}) -> ok.
 vertexAttrib2dv(Index,{X,Y}) ->  vertexAttrib2d(Index,X,Y).
 
 %% @spec (Index::integer(),X::float(),Y::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib2f(integer(),float(),float()) -> ok.
 vertexAttrib2f(Index,X,Y) ->
-  wxe_util:cast(5499, <<Index:?GLuint,X:?GLfloat,Y:?GLfloat>>).
+  cast(5499, <<Index:?GLuint,X:?GLfloat,Y:?GLfloat>>).
 
 %% @spec (Index,{X,Y}) -> ok
 %% @equiv vertexAttrib2f(Index,X,Y)
+-spec vertexAttrib2fv(integer(),{float(),float()}) -> ok.
 vertexAttrib2fv(Index,{X,Y}) ->  vertexAttrib2f(Index,X,Y).
 
 %% @spec (Index::integer(),X::integer(),Y::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib2s(integer(),integer(),integer()) -> ok.
 vertexAttrib2s(Index,X,Y) ->
-  wxe_util:cast(5500, <<Index:?GLuint,X:?GLshort,Y:?GLshort>>).
+  cast(5500, <<Index:?GLuint,X:?GLshort,Y:?GLshort>>).
 
 %% @spec (Index,{X,Y}) -> ok
 %% @equiv vertexAttrib2s(Index,X,Y)
+-spec vertexAttrib2sv(integer(),{integer(),integer()}) -> ok.
 vertexAttrib2sv(Index,{X,Y}) ->  vertexAttrib2s(Index,X,Y).
 
 %% @spec (Index::integer(),X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib3d(integer(),float(),float(),float()) -> ok.
 vertexAttrib3d(Index,X,Y,Z) ->
-  wxe_util:cast(5501, <<Index:?GLuint,0:32,X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
+  cast(5501, <<Index:?GLuint,0:32,X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
 
 %% @spec (Index,{X,Y,Z}) -> ok
 %% @equiv vertexAttrib3d(Index,X,Y,Z)
+-spec vertexAttrib3dv(integer(),{float(),float(),float()}) -> ok.
 vertexAttrib3dv(Index,{X,Y,Z}) ->  vertexAttrib3d(Index,X,Y,Z).
 
 %% @spec (Index::integer(),X::float(),Y::float(),Z::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib3f(integer(),float(),float(),float()) -> ok.
 vertexAttrib3f(Index,X,Y,Z) ->
-  wxe_util:cast(5502, <<Index:?GLuint,X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
+  cast(5502, <<Index:?GLuint,X:?GLfloat,Y:?GLfloat,Z:?GLfloat>>).
 
 %% @spec (Index,{X,Y,Z}) -> ok
 %% @equiv vertexAttrib3f(Index,X,Y,Z)
+-spec vertexAttrib3fv(integer(),{float(),float(),float()}) -> ok.
 vertexAttrib3fv(Index,{X,Y,Z}) ->  vertexAttrib3f(Index,X,Y,Z).
 
 %% @spec (Index::integer(),X::integer(),Y::integer(),Z::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib3s(integer(),integer(),integer(),integer()) -> ok.
 vertexAttrib3s(Index,X,Y,Z) ->
-  wxe_util:cast(5503, <<Index:?GLuint,X:?GLshort,Y:?GLshort,Z:?GLshort>>).
+  cast(5503, <<Index:?GLuint,X:?GLshort,Y:?GLshort,Z:?GLshort>>).
 
 %% @spec (Index,{X,Y,Z}) -> ok
 %% @equiv vertexAttrib3s(Index,X,Y,Z)
+-spec vertexAttrib3sv(integer(),{integer(),integer(),integer()}) -> ok.
 vertexAttrib3sv(Index,{X,Y,Z}) ->  vertexAttrib3s(Index,X,Y,Z).
 
-%% @spec (Index::integer(),V::{integer()}) -> ok
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4Nbv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4Nbv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5504, <<Index:?GLuint,V1:?GLbyte,V2:?GLbyte,V3:?GLbyte,V4:?GLbyte>>).
+  cast(5504, <<Index:?GLuint,V1:?GLbyte,V2:?GLbyte,V3:?GLbyte,V4:?GLbyte>>).
 
-%% @spec (Index::integer(),V::{integer()}) -> ok
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4Niv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4Niv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5505, <<Index:?GLuint,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>).
+  cast(5505, <<Index:?GLuint,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>).
 
-%% @spec (Index::integer(),V::{integer()}) -> ok
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4Nsv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4Nsv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5506, <<Index:?GLuint,V1:?GLshort,V2:?GLshort,V3:?GLshort,V4:?GLshort>>).
+  cast(5506, <<Index:?GLuint,V1:?GLshort,V2:?GLshort,V3:?GLshort,V4:?GLshort>>).
 
 %% @spec (Index::integer(),X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4Nub(integer(),integer(),integer(),integer(),integer()) -> ok.
 vertexAttrib4Nub(Index,X,Y,Z,W) ->
-  wxe_util:cast(5507, <<Index:?GLuint,X:?GLubyte,Y:?GLubyte,Z:?GLubyte,W:?GLubyte>>).
+  cast(5507, <<Index:?GLuint,X:?GLubyte,Y:?GLubyte,Z:?GLubyte,W:?GLubyte>>).
 
 %% @spec (Index,{X,Y,Z,W}) -> ok
 %% @equiv vertexAttrib4Nub(Index,X,Y,Z,W)
+-spec vertexAttrib4Nubv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4Nubv(Index,{X,Y,Z,W}) ->  vertexAttrib4Nub(Index,X,Y,Z,W).
 
-%% @spec (Index::integer(),V::{integer()}) -> ok
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4Nuiv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4Nuiv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5508, <<Index:?GLuint,V1:?GLuint,V2:?GLuint,V3:?GLuint,V4:?GLuint>>).
+  cast(5508, <<Index:?GLuint,V1:?GLuint,V2:?GLuint,V3:?GLuint,V4:?GLuint>>).
 
-%% @spec (Index::integer(),V::{integer()}) -> ok
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4Nusv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4Nusv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5509, <<Index:?GLuint,V1:?GLushort,V2:?GLushort,V3:?GLushort,V4:?GLushort>>).
+  cast(5509, <<Index:?GLuint,V1:?GLushort,V2:?GLushort,V3:?GLushort,V4:?GLushort>>).
 
-%% @spec (Index::integer(),V::{integer()}) -> ok
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4bv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4bv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5510, <<Index:?GLuint,V1:?GLbyte,V2:?GLbyte,V3:?GLbyte,V4:?GLbyte>>).
+  cast(5510, <<Index:?GLuint,V1:?GLbyte,V2:?GLbyte,V3:?GLbyte,V4:?GLbyte>>).
 
 %% @spec (Index::integer(),X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4d(integer(),float(),float(),float(),float()) -> ok.
 vertexAttrib4d(Index,X,Y,Z,W) ->
-  wxe_util:cast(5511, <<Index:?GLuint,0:32,X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
+  cast(5511, <<Index:?GLuint,0:32,X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
 
 %% @spec (Index,{X,Y,Z,W}) -> ok
 %% @equiv vertexAttrib4d(Index,X,Y,Z,W)
+-spec vertexAttrib4dv(integer(),{float(),float(),float(),float()}) -> ok.
 vertexAttrib4dv(Index,{X,Y,Z,W}) ->  vertexAttrib4d(Index,X,Y,Z,W).
 
 %% @spec (Index::integer(),X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4f(integer(),float(),float(),float(),float()) -> ok.
 vertexAttrib4f(Index,X,Y,Z,W) ->
-  wxe_util:cast(5512, <<Index:?GLuint,X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
+  cast(5512, <<Index:?GLuint,X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
 
 %% @spec (Index,{X,Y,Z,W}) -> ok
 %% @equiv vertexAttrib4f(Index,X,Y,Z,W)
+-spec vertexAttrib4fv(integer(),{float(),float(),float(),float()}) -> ok.
 vertexAttrib4fv(Index,{X,Y,Z,W}) ->  vertexAttrib4f(Index,X,Y,Z,W).
 
-%% @spec (Index::integer(),V::{integer()}) -> ok
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4iv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4iv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5513, <<Index:?GLuint,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>).
+  cast(5513, <<Index:?GLuint,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>).
 
 %% @spec (Index::integer(),X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4s(integer(),integer(),integer(),integer(),integer()) -> ok.
 vertexAttrib4s(Index,X,Y,Z,W) ->
-  wxe_util:cast(5514, <<Index:?GLuint,X:?GLshort,Y:?GLshort,Z:?GLshort,W:?GLshort>>).
+  cast(5514, <<Index:?GLuint,X:?GLshort,Y:?GLshort,Z:?GLshort,W:?GLshort>>).
 
 %% @spec (Index,{X,Y,Z,W}) -> ok
 %% @equiv vertexAttrib4s(Index,X,Y,Z,W)
+-spec vertexAttrib4sv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4sv(Index,{X,Y,Z,W}) ->  vertexAttrib4s(Index,X,Y,Z,W).
 
-%% @spec (Index::integer(),V::{integer()}) -> ok
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4ubv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4ubv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5515, <<Index:?GLuint,V1:?GLubyte,V2:?GLubyte,V3:?GLubyte,V4:?GLubyte>>).
+  cast(5515, <<Index:?GLuint,V1:?GLubyte,V2:?GLubyte,V3:?GLubyte,V4:?GLubyte>>).
 
-%% @spec (Index::integer(),V::{integer()}) -> ok
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4uiv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4uiv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5516, <<Index:?GLuint,V1:?GLuint,V2:?GLuint,V3:?GLuint,V4:?GLuint>>).
+  cast(5516, <<Index:?GLuint,V1:?GLuint,V2:?GLuint,V3:?GLuint,V4:?GLuint>>).
 
-%% @spec (Index::integer(),V::{integer()}) -> ok
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttrib.xml">external</a> documentation.
+-spec vertexAttrib4usv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
 vertexAttrib4usv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5517, <<Index:?GLuint,V1:?GLushort,V2:?GLushort,V3:?GLushort,V4:?GLushort>>).
+  cast(5517, <<Index:?GLuint,V1:?GLushort,V2:?GLushort,V3:?GLushort,V4:?GLushort>>).
 
-%% @spec (Index::integer(),Size::integer(),Type::enum(),Normalized::0|1,Stride::integer(),Pointer::offset()|binary()) -> ok
+%% @spec (Index::integer(),Size::integer(),Type::enum(),Normalized::0|1,Stride::integer(),Pointer::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribPointer.xml">external</a> documentation.
+-spec vertexAttribPointer(integer(),integer(),enum(),0|1,integer(),offset()|mem()) -> ok.
 vertexAttribPointer(Index,Size,Type,Normalized,Stride,Pointer) when  is_integer(Pointer) ->
-  wxe_util:cast(5518, <<Index:?GLuint,Size:?GLint,Type:?GLenum,Normalized:?GLboolean,0:24,Stride:?GLsizei,Pointer:?GLuint>>);
+  cast(5518, <<Index:?GLuint,Size:?GLint,Type:?GLenum,Normalized:?GLboolean,0:24,Stride:?GLsizei,Pointer:?GLuint>>);
 vertexAttribPointer(Index,Size,Type,Normalized,Stride,Pointer) ->
-  wxe_util:send_bin(Pointer),
-  wxe_util:cast(5519, <<Index:?GLuint,Size:?GLint,Type:?GLenum,Normalized:?GLboolean,0:24,Stride:?GLsizei>>).
+  send_bin(Pointer),
+  cast(5519, <<Index:?GLuint,Size:?GLint,Type:?GLenum,Normalized:?GLboolean,0:24,Stride:?GLsizei>>).
 
-%% @spec (Location::integer(),Transpose::0|1,Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix2x.xml">external</a> documentation.
+-spec uniformMatrix2x3fv(integer(),0|1,[{float(),float(),float(),float(),float(),float()}]) -> ok.
 uniformMatrix2x3fv(Location,Transpose,Value) ->
-  wxe_util:cast(5520, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+  cast(5520, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat>> || {V1,V2,V3,V4,V5,V6} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Transpose::0|1,Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix3x.xml">external</a> documentation.
+-spec uniformMatrix3x2fv(integer(),0|1,[{float(),float(),float(),float(),float(),float()}]) -> ok.
 uniformMatrix3x2fv(Location,Transpose,Value) ->
-  wxe_util:cast(5521, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+  cast(5521, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat>> || {V1,V2,V3,V4,V5,V6} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Transpose::0|1,Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix2x.xml">external</a> documentation.
+-spec uniformMatrix2x4fv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
 uniformMatrix2x4fv(Location,Transpose,Value) ->
-  wxe_util:cast(5522, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+  cast(5522, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Transpose::0|1,Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix4x.xml">external</a> documentation.
+-spec uniformMatrix4x2fv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
 uniformMatrix4x2fv(Location,Transpose,Value) ->
-  wxe_util:cast(5523, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+  cast(5523, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Transpose::0|1,Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix3x.xml">external</a> documentation.
+-spec uniformMatrix3x4fv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
 uniformMatrix3x4fv(Location,Transpose,Value) ->
-  wxe_util:cast(5524, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+  cast(5524, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat,V9:?GLfloat,V10:?GLfloat,V11:?GLfloat,V12:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Transpose::0|1,Value::[{float()}]) -> ok
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix4x.xml">external</a> documentation.
+-spec uniformMatrix4x3fv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
 uniformMatrix4x3fv(Location,Transpose,Value) ->
-  wxe_util:cast(5525, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+  cast(5525, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
         (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat,V9:?GLfloat,V10:?GLfloat,V11:?GLfloat,V12:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12} <- Value>>)/binary>>).
 
 %% @spec (Index::integer(),R::0|1,G::0|1,B::0|1,A::0|1) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glColorMaski.xml">external</a> documentation.
+-spec colorMaski(integer(),0|1,0|1,0|1,0|1) -> ok.
 colorMaski(Index,R,G,B,A) ->
-  wxe_util:cast(5526, <<Index:?GLuint,R:?GLboolean,G:?GLboolean,B:?GLboolean,A:?GLboolean>>).
+  cast(5526, <<Index:?GLuint,R:?GLboolean,G:?GLboolean,B:?GLboolean,A:?GLboolean>>).
 
 %% @spec (Target::enum(),Index::integer()) -> [0|1]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetBooleani_v.xml">external</a> documentation.
+-spec getBooleani_v(enum(),integer()) -> [0|1].
 getBooleani_v(Target,Index) ->
-  wxe_util:call(5527, <<Target:?GLenum,Index:?GLuint>>).
+  call(5527, <<Target:?GLenum,Index:?GLuint>>).
 
 %% @spec (Target::enum(),Index::integer()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetIntegeri_v.xml">external</a> documentation.
+-spec getIntegeri_v(enum(),integer()) -> [integer()].
 getIntegeri_v(Target,Index) ->
-  wxe_util:call(5528, <<Target:?GLenum,Index:?GLuint>>).
+  call(5528, <<Target:?GLenum,Index:?GLuint>>).
 
 %% @spec (Target::enum(),Index::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEnable.xml">external</a> documentation.
+-spec enablei(enum(),integer()) -> ok.
 enablei(Target,Index) ->
-  wxe_util:cast(5529, <<Target:?GLenum,Index:?GLuint>>).
+  cast(5529, <<Target:?GLenum,Index:?GLuint>>).
 
 %% @spec (Target::enum(),Index::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDisable.xml">external</a> documentation.
+-spec disablei(enum(),integer()) -> ok.
 disablei(Target,Index) ->
-  wxe_util:cast(5530, <<Target:?GLenum,Index:?GLuint>>).
+  cast(5530, <<Target:?GLenum,Index:?GLuint>>).
 
 %% @spec (Target::enum(),Index::integer()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsEnabledi.xml">external</a> documentation.
+-spec isEnabledi(enum(),integer()) -> 0|1.
 isEnabledi(Target,Index) ->
-  wxe_util:call(5531, <<Target:?GLenum,Index:?GLuint>>).
+  call(5531, <<Target:?GLenum,Index:?GLuint>>).
 
 %% @spec (PrimitiveMode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBeginTransformFeedback.xml">external</a> documentation.
+-spec beginTransformFeedback(enum()) -> ok.
 beginTransformFeedback(PrimitiveMode) ->
-  wxe_util:cast(5532, <<PrimitiveMode:?GLenum>>).
+  cast(5532, <<PrimitiveMode:?GLenum>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEndTransformFeedback.xml">external</a> documentation.
+-spec endTransformFeedback() -> ok.
 endTransformFeedback() ->
-  wxe_util:cast(5533, <<>>).
+  cast(5533, <<>>).
 
 %% @spec (Target::enum(),Index::integer(),Buffer::integer(),Offset::integer(),Size::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindBufferRange.xml">external</a> documentation.
+-spec bindBufferRange(enum(),integer(),integer(),integer(),integer()) -> ok.
 bindBufferRange(Target,Index,Buffer,Offset,Size) ->
-  wxe_util:cast(5534, <<Target:?GLenum,Index:?GLuint,Buffer:?GLuint,0:32,Offset:?GLintptr,Size:?GLsizeiptr>>).
+  cast(5534, <<Target:?GLenum,Index:?GLuint,Buffer:?GLuint,0:32,Offset:?GLintptr,Size:?GLsizeiptr>>).
 
 %% @spec (Target::enum(),Index::integer(),Buffer::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindBufferBase.xml">external</a> documentation.
+-spec bindBufferBase(enum(),integer(),integer()) -> ok.
 bindBufferBase(Target,Index,Buffer) ->
-  wxe_util:cast(5535, <<Target:?GLenum,Index:?GLuint,Buffer:?GLuint>>).
+  cast(5535, <<Target:?GLenum,Index:?GLuint,Buffer:?GLuint>>).
 
 %% @spec (Program::integer(),Varyings::[string()],BufferMode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTransformFeedbackVaryings.xml">external</a> documentation.
+-spec transformFeedbackVaryings(integer(),[string()],enum()) -> ok.
 transformFeedbackVaryings(Program,Varyings,BufferMode) ->
  VaryingsTemp = list_to_binary([[Str|[0]] || Str <- Varyings ]),
-  wxe_util:cast(5536, <<Program:?GLuint,(length(Varyings)):?GLuint,(size(VaryingsTemp)):?GLuint,(VaryingsTemp)/binary,0:((8-((size(VaryingsTemp)+0) rem 8)) rem 8),BufferMode:?GLenum>>).
+  cast(5536, <<Program:?GLuint,(length(Varyings)):?GLuint,(size(VaryingsTemp)):?GLuint,(VaryingsTemp)/binary,0:((8-((size(VaryingsTemp)+0) rem 8)) rem 8),BufferMode:?GLenum>>).
 
 %% @spec (Program::integer(),Index::integer(),BufSize::integer()) -> {Size::integer(),Type::enum(),Name::string()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTransformFeedbackVarying.xml">external</a> documentation.
+-spec getTransformFeedbackVarying(integer(),integer(),integer()) -> {integer(),enum(),string()}.
 getTransformFeedbackVarying(Program,Index,BufSize) ->
-  wxe_util:call(5537, <<Program:?GLuint,Index:?GLuint,BufSize:?GLsizei>>).
+  call(5537, <<Program:?GLuint,Index:?GLuint,BufSize:?GLsizei>>).
 
 %% @spec (Target::enum(),Clamp::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClampColor.xml">external</a> documentation.
+-spec clampColor(enum(),enum()) -> ok.
 clampColor(Target,Clamp) ->
-  wxe_util:cast(5538, <<Target:?GLenum,Clamp:?GLenum>>).
+  cast(5538, <<Target:?GLenum,Clamp:?GLenum>>).
 
 %% @spec (Id::integer(),Mode::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBeginConditionalRender.xml">external</a> documentation.
+-spec beginConditionalRender(integer(),enum()) -> ok.
 beginConditionalRender(Id,Mode) ->
-  wxe_util:cast(5539, <<Id:?GLuint,Mode:?GLenum>>).
+  cast(5539, <<Id:?GLuint,Mode:?GLenum>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEndConditionalRender.xml">external</a> documentation.
+-spec endConditionalRender() -> ok.
 endConditionalRender() ->
-  wxe_util:cast(5540, <<>>).
+  cast(5540, <<>>).
 
-%% @spec (Index::integer(),Size::integer(),Type::enum(),Stride::integer(),Pointer::offset()|binary()) -> ok
+%% @spec (Index::integer(),Size::integer(),Type::enum(),Stride::integer(),Pointer::offset()|mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribIPointer.xml">external</a> documentation.
+-spec vertexAttribIPointer(integer(),integer(),enum(),integer(),offset()|mem()) -> ok.
 vertexAttribIPointer(Index,Size,Type,Stride,Pointer) when  is_integer(Pointer) ->
-  wxe_util:cast(5541, <<Index:?GLuint,Size:?GLint,Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
+  cast(5541, <<Index:?GLuint,Size:?GLint,Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
 vertexAttribIPointer(Index,Size,Type,Stride,Pointer) ->
-  wxe_util:send_bin(Pointer),
-  wxe_util:cast(5542, <<Index:?GLuint,Size:?GLint,Type:?GLenum,Stride:?GLsizei>>).
+  send_bin(Pointer),
+  cast(5542, <<Index:?GLuint,Size:?GLint,Type:?GLenum,Stride:?GLsizei>>).
 
-%% @spec (Index::integer(),Pname::enum()) -> {integer()}
+%% @spec (Index::integer(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetVertexAttribI.xml">external</a> documentation.
+-spec getVertexAttribIiv(integer(),enum()) -> {integer(),integer(),integer(),integer()}.
 getVertexAttribIiv(Index,Pname) ->
-  wxe_util:call(5543, <<Index:?GLuint,Pname:?GLenum>>).
+  call(5543, <<Index:?GLuint,Pname:?GLenum>>).
 
-%% @spec (Index::integer(),Pname::enum()) -> {integer()}
+%% @spec (Index::integer(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetVertexAttribI.xml">external</a> documentation.
+-spec getVertexAttribIuiv(integer(),enum()) -> {integer(),integer(),integer(),integer()}.
 getVertexAttribIuiv(Index,Pname) ->
-  wxe_util:call(5544, <<Index:?GLuint,Pname:?GLenum>>).
+  call(5544, <<Index:?GLuint,Pname:?GLenum>>).
+
+%% @spec (Index::integer(),X::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI1i(integer(),integer()) -> ok.
+vertexAttribI1i(Index,X) ->
+  cast(5545, <<Index:?GLuint,X:?GLint>>).
+
+%% @spec (Index::integer(),X::integer(),Y::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI2i(integer(),integer(),integer()) -> ok.
+vertexAttribI2i(Index,X,Y) ->
+  cast(5546, <<Index:?GLuint,X:?GLint,Y:?GLint>>).
+
+%% @spec (Index::integer(),X::integer(),Y::integer(),Z::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI3i(integer(),integer(),integer(),integer()) -> ok.
+vertexAttribI3i(Index,X,Y,Z) ->
+  cast(5547, <<Index:?GLuint,X:?GLint,Y:?GLint,Z:?GLint>>).
+
+%% @spec (Index::integer(),X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI4i(integer(),integer(),integer(),integer(),integer()) -> ok.
+vertexAttribI4i(Index,X,Y,Z,W) ->
+  cast(5548, <<Index:?GLuint,X:?GLint,Y:?GLint,Z:?GLint,W:?GLint>>).
+
+%% @spec (Index::integer(),X::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI1ui(integer(),integer()) -> ok.
+vertexAttribI1ui(Index,X) ->
+  cast(5549, <<Index:?GLuint,X:?GLuint>>).
+
+%% @spec (Index::integer(),X::integer(),Y::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI2ui(integer(),integer(),integer()) -> ok.
+vertexAttribI2ui(Index,X,Y) ->
+  cast(5550, <<Index:?GLuint,X:?GLuint,Y:?GLuint>>).
+
+%% @spec (Index::integer(),X::integer(),Y::integer(),Z::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI3ui(integer(),integer(),integer(),integer()) -> ok.
+vertexAttribI3ui(Index,X,Y,Z) ->
+  cast(5551, <<Index:?GLuint,X:?GLuint,Y:?GLuint,Z:?GLuint>>).
+
+%% @spec (Index::integer(),X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI4ui(integer(),integer(),integer(),integer(),integer()) -> ok.
+vertexAttribI4ui(Index,X,Y,Z,W) ->
+  cast(5552, <<Index:?GLuint,X:?GLuint,Y:?GLuint,Z:?GLuint,W:?GLuint>>).
+
+%% @spec (Index,{X}) -> ok
+%% @equiv vertexAttribI1i(Index,X)
+-spec vertexAttribI1iv(integer(),{integer()}) -> ok.
+vertexAttribI1iv(Index,{X}) ->  vertexAttribI1i(Index,X).
+
+%% @spec (Index,{X,Y}) -> ok
+%% @equiv vertexAttribI2i(Index,X,Y)
+-spec vertexAttribI2iv(integer(),{integer(),integer()}) -> ok.
+vertexAttribI2iv(Index,{X,Y}) ->  vertexAttribI2i(Index,X,Y).
+
+%% @spec (Index,{X,Y,Z}) -> ok
+%% @equiv vertexAttribI3i(Index,X,Y,Z)
+-spec vertexAttribI3iv(integer(),{integer(),integer(),integer()}) -> ok.
+vertexAttribI3iv(Index,{X,Y,Z}) ->  vertexAttribI3i(Index,X,Y,Z).
+
+%% @spec (Index,{X,Y,Z,W}) -> ok
+%% @equiv vertexAttribI4i(Index,X,Y,Z,W)
+-spec vertexAttribI4iv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
+vertexAttribI4iv(Index,{X,Y,Z,W}) ->  vertexAttribI4i(Index,X,Y,Z,W).
+
+%% @spec (Index,{X}) -> ok
+%% @equiv vertexAttribI1ui(Index,X)
+-spec vertexAttribI1uiv(integer(),{integer()}) -> ok.
+vertexAttribI1uiv(Index,{X}) ->  vertexAttribI1ui(Index,X).
+
+%% @spec (Index,{X,Y}) -> ok
+%% @equiv vertexAttribI2ui(Index,X,Y)
+-spec vertexAttribI2uiv(integer(),{integer(),integer()}) -> ok.
+vertexAttribI2uiv(Index,{X,Y}) ->  vertexAttribI2ui(Index,X,Y).
+
+%% @spec (Index,{X,Y,Z}) -> ok
+%% @equiv vertexAttribI3ui(Index,X,Y,Z)
+-spec vertexAttribI3uiv(integer(),{integer(),integer(),integer()}) -> ok.
+vertexAttribI3uiv(Index,{X,Y,Z}) ->  vertexAttribI3ui(Index,X,Y,Z).
+
+%% @spec (Index,{X,Y,Z,W}) -> ok
+%% @equiv vertexAttribI4ui(Index,X,Y,Z,W)
+-spec vertexAttribI4uiv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
+vertexAttribI4uiv(Index,{X,Y,Z,W}) ->  vertexAttribI4ui(Index,X,Y,Z,W).
+
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI4bv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
+vertexAttribI4bv(Index,{V1,V2,V3,V4}) ->
+  cast(5553, <<Index:?GLuint,V1:?GLbyte,V2:?GLbyte,V3:?GLbyte,V4:?GLbyte>>).
+
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI4sv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
+vertexAttribI4sv(Index,{V1,V2,V3,V4}) ->
+  cast(5554, <<Index:?GLuint,V1:?GLshort,V2:?GLshort,V3:?GLshort,V4:?GLshort>>).
+
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI4ubv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
+vertexAttribI4ubv(Index,{V1,V2,V3,V4}) ->
+  cast(5555, <<Index:?GLuint,V1:?GLubyte,V2:?GLubyte,V3:?GLubyte,V4:?GLubyte>>).
+
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
+-spec vertexAttribI4usv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
+vertexAttribI4usv(Index,{V1,V2,V3,V4}) ->
+  cast(5556, <<Index:?GLuint,V1:?GLushort,V2:?GLushort,V3:?GLushort,V4:?GLushort>>).
 
-%% @spec (Program::integer(),Location::integer()) -> {integer()}
+%% @spec (Program::integer(),Location::integer()) -> {integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetUniform.xml">external</a> documentation.
+-spec getUniformuiv(integer(),integer()) -> {integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer()}.
 getUniformuiv(Program,Location) ->
-  wxe_util:call(5545, <<Program:?GLuint,Location:?GLint>>).
+  call(5557, <<Program:?GLuint,Location:?GLint>>).
 
 %% @spec (Program::integer(),Color::integer(),Name::string()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindFragDataLocation.xml">external</a> documentation.
+-spec bindFragDataLocation(integer(),integer(),string()) -> ok.
 bindFragDataLocation(Program,Color,Name) ->
-  wxe_util:cast(5546, <<Program:?GLuint,Color:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
+  cast(5558, <<Program:?GLuint,Color:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
 
 %% @spec (Program::integer(),Name::string()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetFragDataLocation.xml">external</a> documentation.
+-spec getFragDataLocation(integer(),string()) -> integer().
 getFragDataLocation(Program,Name) ->
-  wxe_util:call(5547, <<Program:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 5) rem 8)) rem 8)>>).
+  call(5559, <<Program:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 5) rem 8)) rem 8)>>).
 
 %% @spec (Location::integer(),V0::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform1ui(integer(),integer()) -> ok.
 uniform1ui(Location,V0) ->
-  wxe_util:cast(5548, <<Location:?GLint,V0:?GLuint>>).
+  cast(5560, <<Location:?GLint,V0:?GLuint>>).
 
 %% @spec (Location::integer(),V0::integer(),V1::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform2ui(integer(),integer(),integer()) -> ok.
 uniform2ui(Location,V0,V1) ->
-  wxe_util:cast(5549, <<Location:?GLint,V0:?GLuint,V1:?GLuint>>).
+  cast(5561, <<Location:?GLint,V0:?GLuint,V1:?GLuint>>).
 
 %% @spec (Location::integer(),V0::integer(),V1::integer(),V2::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform3ui(integer(),integer(),integer(),integer()) -> ok.
 uniform3ui(Location,V0,V1,V2) ->
-  wxe_util:cast(5550, <<Location:?GLint,V0:?GLuint,V1:?GLuint,V2:?GLuint>>).
+  cast(5562, <<Location:?GLint,V0:?GLuint,V1:?GLuint,V2:?GLuint>>).
 
 %% @spec (Location::integer(),V0::integer(),V1::integer(),V2::integer(),V3::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform4ui(integer(),integer(),integer(),integer(),integer()) -> ok.
 uniform4ui(Location,V0,V1,V2,V3) ->
-  wxe_util:cast(5551, <<Location:?GLint,V0:?GLuint,V1:?GLuint,V2:?GLuint,V3:?GLuint>>).
+  cast(5563, <<Location:?GLint,V0:?GLuint,V1:?GLuint,V2:?GLuint,V3:?GLuint>>).
 
 %% @spec (Location::integer(),Value::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform1uiv(integer(),[integer()]) -> ok.
 uniform1uiv(Location,Value) ->
-  wxe_util:cast(5552, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5564, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<C:?GLuint>> || C <- Value>>)/binary,0:(((length(Value)) rem 2)*32)>>).
 
-%% @spec (Location::integer(),Value::[{integer()}]) -> ok
+%% @spec (Location::integer(),Value::[{integer(),integer()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform2uiv(integer(),[{integer(),integer()}]) -> ok.
 uniform2uiv(Location,Value) ->
-  wxe_util:cast(5553, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5565, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<V1:?GLuint,V2:?GLuint>> || {V1,V2} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Value::[{integer()}]) -> ok
+%% @spec (Location::integer(),Value::[{integer(),integer(),integer()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform3uiv(integer(),[{integer(),integer(),integer()}]) -> ok.
 uniform3uiv(Location,Value) ->
-  wxe_util:cast(5554, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5566, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<V1:?GLuint,V2:?GLuint,V3:?GLuint>> || {V1,V2,V3} <- Value>>)/binary>>).
 
-%% @spec (Location::integer(),Value::[{integer()}]) -> ok
+%% @spec (Location::integer(),Value::[{integer(),integer(),integer(),integer()}]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform4uiv(integer(),[{integer(),integer(),integer(),integer()}]) -> ok.
 uniform4uiv(Location,Value) ->
-  wxe_util:cast(5555, <<Location:?GLint,(length(Value)):?GLuint,
+  cast(5567, <<Location:?GLint,(length(Value)):?GLuint,
         (<< <<V1:?GLuint,V2:?GLuint,V3:?GLuint,V4:?GLuint>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
 
 %% @spec (Target::enum(),Pname::enum(),Params::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexParameterI.xml">external</a> documentation.
+-spec texParameterIiv(enum(),enum(),{integer()}) -> ok.
 texParameterIiv(Target,Pname,Params) ->
-  wxe_util:cast(5556, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5568, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLint>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
 %% @spec (Target::enum(),Pname::enum(),Params::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexParameterI.xml">external</a> documentation.
+-spec texParameterIuiv(enum(),enum(),{integer()}) -> ok.
 texParameterIuiv(Target,Pname,Params) ->
-  wxe_util:cast(5557, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
+  cast(5569, <<Target:?GLenum,Pname:?GLenum,(size(Params)):?GLuint,
       (<< <<C:?GLuint>> ||C <- tuple_to_list(Params)>>)/binary,0:(((1+size(Params)) rem 2)*32)>>).
 
-%% @spec (Target::enum(),Pname::enum()) -> {integer()}
+%% @spec (Target::enum(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexParameterI.xml">external</a> documentation.
+-spec getTexParameterIiv(enum(),enum()) -> {integer(),integer(),integer(),integer()}.
 getTexParameterIiv(Target,Pname) ->
-  wxe_util:call(5558, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5570, <<Target:?GLenum,Pname:?GLenum>>).
 
-%% @spec (Target::enum(),Pname::enum()) -> {integer()}
+%% @spec (Target::enum(),Pname::enum()) -> {integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetTexParameterI.xml">external</a> documentation.
+-spec getTexParameterIuiv(enum(),enum()) -> {integer(),integer(),integer(),integer()}.
 getTexParameterIuiv(Target,Pname) ->
-  wxe_util:call(5559, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5571, <<Target:?GLenum,Pname:?GLenum>>).
 
 %% @spec (Buffer::enum(),Drawbuffer::integer(),Value::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClearBuffer.xml">external</a> documentation.
+-spec clearBufferiv(enum(),integer(),{integer()}) -> ok.
 clearBufferiv(Buffer,Drawbuffer,Value) ->
-  wxe_util:cast(5560, <<Buffer:?GLenum,Drawbuffer:?GLint,(size(Value)):?GLuint,
+  cast(5572, <<Buffer:?GLenum,Drawbuffer:?GLint,(size(Value)):?GLuint,
       (<< <<C:?GLint>> ||C <- tuple_to_list(Value)>>)/binary,0:(((1+size(Value)) rem 2)*32)>>).
 
 %% @spec (Buffer::enum(),Drawbuffer::integer(),Value::{integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClearBuffer.xml">external</a> documentation.
+-spec clearBufferuiv(enum(),integer(),{integer()}) -> ok.
 clearBufferuiv(Buffer,Drawbuffer,Value) ->
-  wxe_util:cast(5561, <<Buffer:?GLenum,Drawbuffer:?GLint,(size(Value)):?GLuint,
+  cast(5573, <<Buffer:?GLenum,Drawbuffer:?GLint,(size(Value)):?GLuint,
       (<< <<C:?GLuint>> ||C <- tuple_to_list(Value)>>)/binary,0:(((1+size(Value)) rem 2)*32)>>).
 
 %% @spec (Buffer::enum(),Drawbuffer::integer(),Value::{float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClearBuffer.xml">external</a> documentation.
+-spec clearBufferfv(enum(),integer(),{float()}) -> ok.
 clearBufferfv(Buffer,Drawbuffer,Value) ->
-  wxe_util:cast(5562, <<Buffer:?GLenum,Drawbuffer:?GLint,(size(Value)):?GLuint,
+  cast(5574, <<Buffer:?GLenum,Drawbuffer:?GLint,(size(Value)):?GLuint,
       (<< <<C:?GLfloat>> ||C <- tuple_to_list(Value)>>)/binary,0:(((1+size(Value)) rem 2)*32)>>).
 
 %% @spec (Buffer::enum(),Drawbuffer::integer(),Depth::float(),Stencil::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClearBufferfi.xml">external</a> documentation.
+-spec clearBufferfi(enum(),integer(),float(),integer()) -> ok.
 clearBufferfi(Buffer,Drawbuffer,Depth,Stencil) ->
-  wxe_util:cast(5563, <<Buffer:?GLenum,Drawbuffer:?GLint,Depth:?GLfloat,Stencil:?GLint>>).
+  cast(5575, <<Buffer:?GLenum,Drawbuffer:?GLint,Depth:?GLfloat,Stencil:?GLint>>).
 
 %% @spec (Name::enum(),Index::integer()) -> string()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetString.xml">external</a> documentation.
+-spec getStringi(enum(),integer()) -> string().
 getStringi(Name,Index) ->
-  wxe_util:call(5564, <<Name:?GLenum,Index:?GLuint>>).
-
-%% @spec (Index::integer(),X::integer()) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI1i(Index,X) ->
-  wxe_util:cast(5565, <<Index:?GLuint,X:?GLint>>).
-
-%% @spec (Index::integer(),X::integer(),Y::integer()) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI2i(Index,X,Y) ->
-  wxe_util:cast(5566, <<Index:?GLuint,X:?GLint,Y:?GLint>>).
-
-%% @spec (Index::integer(),X::integer(),Y::integer(),Z::integer()) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI3i(Index,X,Y,Z) ->
-  wxe_util:cast(5567, <<Index:?GLuint,X:?GLint,Y:?GLint,Z:?GLint>>).
-
-%% @spec (Index::integer(),X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI4i(Index,X,Y,Z,W) ->
-  wxe_util:cast(5568, <<Index:?GLuint,X:?GLint,Y:?GLint,Z:?GLint,W:?GLint>>).
-
-%% @spec (Index::integer(),X::integer()) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI1ui(Index,X) ->
-  wxe_util:cast(5569, <<Index:?GLuint,X:?GLuint>>).
-
-%% @spec (Index::integer(),X::integer(),Y::integer()) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI2ui(Index,X,Y) ->
-  wxe_util:cast(5570, <<Index:?GLuint,X:?GLuint,Y:?GLuint>>).
-
-%% @spec (Index::integer(),X::integer(),Y::integer(),Z::integer()) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI3ui(Index,X,Y,Z) ->
-  wxe_util:cast(5571, <<Index:?GLuint,X:?GLuint,Y:?GLuint,Z:?GLuint>>).
-
-%% @spec (Index::integer(),X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI4ui(Index,X,Y,Z,W) ->
-  wxe_util:cast(5572, <<Index:?GLuint,X:?GLuint,Y:?GLuint,Z:?GLuint,W:?GLuint>>).
-
-%% @spec (Index,{X}) -> ok
-%% @equiv vertexAttribI1i(Index,X)
-vertexAttribI1iv(Index,{X}) ->  vertexAttribI1i(Index,X).
-
-%% @spec (Index,{X,Y}) -> ok
-%% @equiv vertexAttribI2i(Index,X,Y)
-vertexAttribI2iv(Index,{X,Y}) ->  vertexAttribI2i(Index,X,Y).
-
-%% @spec (Index,{X,Y,Z}) -> ok
-%% @equiv vertexAttribI3i(Index,X,Y,Z)
-vertexAttribI3iv(Index,{X,Y,Z}) ->  vertexAttribI3i(Index,X,Y,Z).
-
-%% @spec (Index,{X,Y,Z,W}) -> ok
-%% @equiv vertexAttribI4i(Index,X,Y,Z,W)
-vertexAttribI4iv(Index,{X,Y,Z,W}) ->  vertexAttribI4i(Index,X,Y,Z,W).
-
-%% @spec (Index,{X}) -> ok
-%% @equiv vertexAttribI1ui(Index,X)
-vertexAttribI1uiv(Index,{X}) ->  vertexAttribI1ui(Index,X).
-
-%% @spec (Index,{X,Y}) -> ok
-%% @equiv vertexAttribI2ui(Index,X,Y)
-vertexAttribI2uiv(Index,{X,Y}) ->  vertexAttribI2ui(Index,X,Y).
-
-%% @spec (Index,{X,Y,Z}) -> ok
-%% @equiv vertexAttribI3ui(Index,X,Y,Z)
-vertexAttribI3uiv(Index,{X,Y,Z}) ->  vertexAttribI3ui(Index,X,Y,Z).
-
-%% @spec (Index,{X,Y,Z,W}) -> ok
-%% @equiv vertexAttribI4ui(Index,X,Y,Z,W)
-vertexAttribI4uiv(Index,{X,Y,Z,W}) ->  vertexAttribI4ui(Index,X,Y,Z,W).
-
-%% @spec (Index::integer(),V::{integer()}) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI4bv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5573, <<Index:?GLuint,V1:?GLbyte,V2:?GLbyte,V3:?GLbyte,V4:?GLbyte>>).
-
-%% @spec (Index::integer(),V::{integer()}) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI4sv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5574, <<Index:?GLuint,V1:?GLshort,V2:?GLshort,V3:?GLshort,V4:?GLshort>>).
-
-%% @spec (Index::integer(),V::{integer()}) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI4ubv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5575, <<Index:?GLuint,V1:?GLubyte,V2:?GLubyte,V3:?GLubyte,V4:?GLubyte>>).
-
-%% @spec (Index::integer(),V::{integer()}) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribI.xml">external</a> documentation.
-vertexAttribI4usv(Index,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5576, <<Index:?GLuint,V1:?GLushort,V2:?GLushort,V3:?GLushort,V4:?GLushort>>).
+  call(5576, <<Name:?GLenum,Index:?GLuint>>).
 
 %% @spec (Mode::enum(),First::integer(),Count::integer(),Primcount::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawArraysInstance.xml">external</a> documentation.
+-spec drawArraysInstanced(enum(),integer(),integer(),integer()) -> ok.
 drawArraysInstanced(Mode,First,Count,Primcount) ->
-  wxe_util:cast(5577, <<Mode:?GLenum,First:?GLint,Count:?GLsizei,Primcount:?GLsizei>>).
+  cast(5577, <<Mode:?GLenum,First:?GLint,Count:?GLsizei,Primcount:?GLsizei>>).
 
-%% @spec (Mode::enum(),Count::integer(),Type::enum(),Indices::offset()|binary(),Primcount::integer()) -> ok
+%% @spec (Mode::enum(),Count::integer(),Type::enum(),Indices::offset()|mem(),Primcount::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawElementsInstance.xml">external</a> documentation.
+-spec drawElementsInstanced(enum(),integer(),enum(),offset()|mem(),integer()) -> ok.
 drawElementsInstanced(Mode,Count,Type,Indices,Primcount) when  is_integer(Indices) ->
-  wxe_util:cast(5578, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum,Indices:?GLuint,Primcount:?GLsizei>>);
+  cast(5578, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum,Indices:?GLuint,Primcount:?GLsizei>>);
 drawElementsInstanced(Mode,Count,Type,Indices,Primcount) ->
-  wxe_util:send_bin(Indices),
-  wxe_util:cast(5579, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum,Primcount:?GLsizei>>).
+  send_bin(Indices),
+  cast(5579, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum,Primcount:?GLsizei>>).
 
 %% @spec (Target::enum(),Internalformat::enum(),Buffer::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexBuffer.xml">external</a> documentation.
+-spec texBuffer(enum(),enum(),integer()) -> ok.
 texBuffer(Target,Internalformat,Buffer) ->
-  wxe_util:cast(5580, <<Target:?GLenum,Internalformat:?GLenum,Buffer:?GLuint>>).
+  cast(5580, <<Target:?GLenum,Internalformat:?GLenum,Buffer:?GLuint>>).
 
 %% @spec (Index::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPrimitiveRestartIndex.xml">external</a> documentation.
+-spec primitiveRestartIndex(integer()) -> ok.
 primitiveRestartIndex(Index) ->
-  wxe_util:cast(5581, <<Index:?GLuint>>).
+  cast(5581, <<Index:?GLuint>>).
+
+%% @spec (Target::enum(),Index::integer()) -> [integer()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetInteger64i_v.xml">external</a> documentation.
+-spec getInteger64i_v(enum(),integer()) -> [integer()].
+getInteger64i_v(Target,Index) ->
+  call(5582, <<Target:?GLenum,Index:?GLuint>>).
+
+%% @spec (Target::enum(),Pname::enum()) -> [integer()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetBufferParameteri64v.xml">external</a> documentation.
+-spec getBufferParameteri64v(enum(),enum()) -> [integer()].
+getBufferParameteri64v(Target,Pname) ->
+  call(5583, <<Target:?GLenum,Pname:?GLenum>>).
+
+%% @spec (Target::enum(),Attachment::enum(),Texture::integer(),Level::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFramebufferTexture.xml">external</a> documentation.
+-spec framebufferTexture(enum(),enum(),integer(),integer()) -> ok.
+framebufferTexture(Target,Attachment,Texture,Level) ->
+  cast(5584, <<Target:?GLenum,Attachment:?GLenum,Texture:?GLuint,Level:?GLint>>).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (Index::integer(),Divisor::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribDivisor.xml">external</a> documentation.
+-spec vertexAttribDivisor(integer(),integer()) -> ok.
+vertexAttribDivisor(Index,Divisor) ->
+  cast(5585, <<Index:?GLuint,Divisor:?GLuint>>).
+
+%% @spec (Value::clamp()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMinSampleShading.xml">external</a> documentation.
+-spec minSampleShading(clamp()) -> ok.
+minSampleShading(Value) ->
+  cast(5586, <<Value:?GLclampf>>).
+
+%% @spec (Buf::integer(),Mode::enum()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBlendEquation.xml">external</a> documentation.
+-spec blendEquationi(integer(),enum()) -> ok.
+blendEquationi(Buf,Mode) ->
+  cast(5587, <<Buf:?GLuint,Mode:?GLenum>>).
+
+%% @spec (Buf::integer(),ModeRGB::enum(),ModeAlpha::enum()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBlendEquationSeparate.xml">external</a> documentation.
+-spec blendEquationSeparatei(integer(),enum(),enum()) -> ok.
+blendEquationSeparatei(Buf,ModeRGB,ModeAlpha) ->
+  cast(5588, <<Buf:?GLuint,ModeRGB:?GLenum,ModeAlpha:?GLenum>>).
+
+%% @spec (Buf::integer(),Src::enum(),Dst::enum()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBlendFunci.xml">external</a> documentation.
+-spec blendFunci(integer(),enum(),enum()) -> ok.
+blendFunci(Buf,Src,Dst) ->
+  cast(5589, <<Buf:?GLuint,Src:?GLenum,Dst:?GLenum>>).
+
+%% @spec (Buf::integer(),SrcRGB::enum(),DstRGB::enum(),SrcAlpha::enum(),DstAlpha::enum()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBlendFuncSeparate.xml">external</a> documentation.
+-spec blendFuncSeparatei(integer(),enum(),enum(),enum(),enum()) -> ok.
+blendFuncSeparatei(Buf,SrcRGB,DstRGB,SrcAlpha,DstAlpha) ->
+  cast(5590, <<Buf:?GLuint,SrcRGB:?GLenum,DstRGB:?GLenum,SrcAlpha:?GLenum,DstAlpha:?GLenum>>).
+
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLoadTransposeMatrixARB.xml">external</a> documentation.
+-spec loadTransposeMatrixfARB({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 loadTransposeMatrixfARB({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5582, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
+  cast(5591, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
 loadTransposeMatrixfARB({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5582, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
+  cast(5591, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLoadTransposeMatrixARB.xml">external</a> documentation.
+-spec loadTransposeMatrixdARB({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 loadTransposeMatrixdARB({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5583, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
+  cast(5592, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
 loadTransposeMatrixdARB({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5583, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
+  cast(5592, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultTransposeMatrixARB.xml">external</a> documentation.
+-spec multTransposeMatrixfARB({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 multTransposeMatrixfARB({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5584, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
+  cast(5593, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,M13:?GLfloat,M14:?GLfloat,M15:?GLfloat,M16:?GLfloat>>);
 multTransposeMatrixfARB({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5584, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
+  cast(5593, <<M1:?GLfloat,M2:?GLfloat,M3:?GLfloat,0:?GLfloat,M4:?GLfloat,M5:?GLfloat,M6:?GLfloat,0:?GLfloat,M7:?GLfloat,M8:?GLfloat,M9:?GLfloat,0:?GLfloat,M10:?GLfloat,M11:?GLfloat,M12:?GLfloat,1:?GLfloat>>).
 
-%% @spec (M::{float()}) -> ok
+%% @spec (M::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMultTransposeMatrixARB.xml">external</a> documentation.
+-spec multTransposeMatrixdARB({float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}) -> ok.
 multTransposeMatrixdARB({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16}) ->
-  wxe_util:cast(5585, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
+  cast(5594, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble>>);
 multTransposeMatrixdARB({M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12}) ->
-  wxe_util:cast(5585, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
+  cast(5594, <<M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble>>).
 
 %% @spec (Weights::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWeightARB.xml">external</a> documentation.
+-spec weightbvARB([integer()]) -> ok.
 weightbvARB(Weights) ->
-  wxe_util:cast(5586, <<(length(Weights)):?GLuint,
+  cast(5595, <<(length(Weights)):?GLuint,
         (<< <<C:?GLbyte>> || C <- Weights>>)/binary,0:((8-((length(Weights)+ 4) rem 8)) rem 8)>>).
 
 %% @spec (Weights::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWeightARB.xml">external</a> documentation.
+-spec weightsvARB([integer()]) -> ok.
 weightsvARB(Weights) ->
-  wxe_util:cast(5587, <<(length(Weights)):?GLuint,
+  cast(5596, <<(length(Weights)):?GLuint,
         (<< <<C:?GLshort>> || C <- Weights>>)/binary,0:((8-((length(Weights)*2+ 4) rem 8)) rem 8)>>).
 
 %% @spec (Weights::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWeightARB.xml">external</a> documentation.
+-spec weightivARB([integer()]) -> ok.
 weightivARB(Weights) ->
-  wxe_util:cast(5588, <<(length(Weights)):?GLuint,
+  cast(5597, <<(length(Weights)):?GLuint,
         (<< <<C:?GLint>> || C <- Weights>>)/binary,0:(((1+length(Weights)) rem 2)*32)>>).
 
 %% @spec (Weights::[float()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWeightARB.xml">external</a> documentation.
+-spec weightfvARB([float()]) -> ok.
 weightfvARB(Weights) ->
-  wxe_util:cast(5589, <<(length(Weights)):?GLuint,
+  cast(5598, <<(length(Weights)):?GLuint,
         (<< <<C:?GLfloat>> || C <- Weights>>)/binary,0:(((1+length(Weights)) rem 2)*32)>>).
 
 %% @spec (Weights::[float()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWeightARB.xml">external</a> documentation.
+-spec weightdvARB([float()]) -> ok.
 weightdvARB(Weights) ->
-  wxe_util:cast(5590, <<(length(Weights)):?GLuint,0:32,
+  cast(5599, <<(length(Weights)):?GLuint,0:32,
         (<< <<C:?GLdouble>> || C <- Weights>>)/binary>>).
 
 %% @spec (Weights::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWeightARB.xml">external</a> documentation.
+-spec weightubvARB([integer()]) -> ok.
 weightubvARB(Weights) ->
-  wxe_util:cast(5591, <<(length(Weights)):?GLuint,
+  cast(5600, <<(length(Weights)):?GLuint,
         (<< <<C:?GLubyte>> || C <- Weights>>)/binary,0:((8-((length(Weights)+ 4) rem 8)) rem 8)>>).
 
 %% @spec (Weights::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWeightARB.xml">external</a> documentation.
+-spec weightusvARB([integer()]) -> ok.
 weightusvARB(Weights) ->
-  wxe_util:cast(5592, <<(length(Weights)):?GLuint,
+  cast(5601, <<(length(Weights)):?GLuint,
         (<< <<C:?GLushort>> || C <- Weights>>)/binary,0:((8-((length(Weights)*2+ 4) rem 8)) rem 8)>>).
 
 %% @spec (Weights::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWeightARB.xml">external</a> documentation.
+-spec weightuivARB([integer()]) -> ok.
 weightuivARB(Weights) ->
-  wxe_util:cast(5593, <<(length(Weights)):?GLuint,
+  cast(5602, <<(length(Weights)):?GLuint,
         (<< <<C:?GLuint>> || C <- Weights>>)/binary,0:(((1+length(Weights)) rem 2)*32)>>).
 
 %% @spec (Count::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexBlenARB.xml">external</a> documentation.
+-spec vertexBlendARB(integer()) -> ok.
 vertexBlendARB(Count) ->
-  wxe_util:cast(5594, <<Count:?GLint>>).
+  cast(5603, <<Count:?GLint>>).
 
 %% @spec (Index::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCurrentPaletteMatrixARB.xml">external</a> documentation.
+-spec currentPaletteMatrixARB(integer()) -> ok.
 currentPaletteMatrixARB(Index) ->
-  wxe_util:cast(5595, <<Index:?GLint>>).
+  cast(5604, <<Index:?GLint>>).
 
 %% @spec (Indices::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMatrixIndexARB.xml">external</a> documentation.
+-spec matrixIndexubvARB([integer()]) -> ok.
 matrixIndexubvARB(Indices) ->
-  wxe_util:cast(5596, <<(length(Indices)):?GLuint,
+  cast(5605, <<(length(Indices)):?GLuint,
         (<< <<C:?GLubyte>> || C <- Indices>>)/binary,0:((8-((length(Indices)+ 4) rem 8)) rem 8)>>).
 
 %% @spec (Indices::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMatrixIndexARB.xml">external</a> documentation.
+-spec matrixIndexusvARB([integer()]) -> ok.
 matrixIndexusvARB(Indices) ->
-  wxe_util:cast(5597, <<(length(Indices)):?GLuint,
+  cast(5606, <<(length(Indices)):?GLuint,
         (<< <<C:?GLushort>> || C <- Indices>>)/binary,0:((8-((length(Indices)*2+ 4) rem 8)) rem 8)>>).
 
 %% @spec (Indices::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glMatrixIndexARB.xml">external</a> documentation.
+-spec matrixIndexuivARB([integer()]) -> ok.
 matrixIndexuivARB(Indices) ->
-  wxe_util:cast(5598, <<(length(Indices)):?GLuint,
+  cast(5607, <<(length(Indices)):?GLuint,
         (<< <<C:?GLuint>> || C <- Indices>>)/binary,0:(((1+length(Indices)) rem 2)*32)>>).
 
 %% @spec (Target::enum(),Format::enum(),String::string()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramStringARB.xml">external</a> documentation.
+-spec programStringARB(enum(),enum(),string()) -> ok.
 programStringARB(Target,Format,String) ->
-  wxe_util:cast(5599, <<Target:?GLenum,Format:?GLenum,(list_to_binary([String|[0]]))/binary,0:((8-((length(String)+ 1) rem 8)) rem 8)>>).
+  cast(5608, <<Target:?GLenum,Format:?GLenum,(list_to_binary([String|[0]]))/binary,0:((8-((length(String)+ 1) rem 8)) rem 8)>>).
 
 %% @spec (Target::enum(),Program::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindProgramARB.xml">external</a> documentation.
+-spec bindProgramARB(enum(),integer()) -> ok.
 bindProgramARB(Target,Program) ->
-  wxe_util:cast(5600, <<Target:?GLenum,Program:?GLuint>>).
+  cast(5609, <<Target:?GLenum,Program:?GLuint>>).
 
 %% @spec (Programs::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteProgramsARB.xml">external</a> documentation.
+-spec deleteProgramsARB([integer()]) -> ok.
 deleteProgramsARB(Programs) ->
-  wxe_util:cast(5601, <<(length(Programs)):?GLuint,
+  cast(5610, <<(length(Programs)):?GLuint,
         (<< <<C:?GLuint>> || C <- Programs>>)/binary,0:(((1+length(Programs)) rem 2)*32)>>).
 
 %% @spec (N::integer()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenProgramsARB.xml">external</a> documentation.
+-spec genProgramsARB(integer()) -> [integer()].
 genProgramsARB(N) ->
-  wxe_util:call(5602, <<N:?GLsizei>>).
+  call(5611, <<N:?GLsizei>>).
 
 %% @spec (Target::enum(),Index::integer(),X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramEnvParameterARB.xml">external</a> documentation.
+-spec programEnvParameter4dARB(enum(),integer(),float(),float(),float(),float()) -> ok.
 programEnvParameter4dARB(Target,Index,X,Y,Z,W) ->
-  wxe_util:cast(5603, <<Target:?GLenum,Index:?GLuint,X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
+  cast(5612, <<Target:?GLenum,Index:?GLuint,X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
 
-%% @spec (Target::enum(),Index::integer(),Params::{float()}) -> ok
+%% @spec (Target::enum(),Index::integer(),Params::{float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramEnvParameterARB.xml">external</a> documentation.
+-spec programEnvParameter4dvARB(enum(),integer(),{float(),float(),float(),float()}) -> ok.
 programEnvParameter4dvARB(Target,Index,{P1,P2,P3,P4}) ->
-  wxe_util:cast(5604, <<Target:?GLenum,Index:?GLuint,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,P4:?GLdouble>>).
+  cast(5613, <<Target:?GLenum,Index:?GLuint,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,P4:?GLdouble>>).
 
 %% @spec (Target::enum(),Index::integer(),X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramEnvParameterARB.xml">external</a> documentation.
+-spec programEnvParameter4fARB(enum(),integer(),float(),float(),float(),float()) -> ok.
 programEnvParameter4fARB(Target,Index,X,Y,Z,W) ->
-  wxe_util:cast(5605, <<Target:?GLenum,Index:?GLuint,X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
+  cast(5614, <<Target:?GLenum,Index:?GLuint,X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
 
-%% @spec (Target::enum(),Index::integer(),Params::{float()}) -> ok
+%% @spec (Target::enum(),Index::integer(),Params::{float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramEnvParameterARB.xml">external</a> documentation.
+-spec programEnvParameter4fvARB(enum(),integer(),{float(),float(),float(),float()}) -> ok.
 programEnvParameter4fvARB(Target,Index,{P1,P2,P3,P4}) ->
-  wxe_util:cast(5606, <<Target:?GLenum,Index:?GLuint,P1:?GLfloat,P2:?GLfloat,P3:?GLfloat,P4:?GLfloat>>).
+  cast(5615, <<Target:?GLenum,Index:?GLuint,P1:?GLfloat,P2:?GLfloat,P3:?GLfloat,P4:?GLfloat>>).
 
 %% @spec (Target::enum(),Index::integer(),X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramLocalParameterARB.xml">external</a> documentation.
+-spec programLocalParameter4dARB(enum(),integer(),float(),float(),float(),float()) -> ok.
 programLocalParameter4dARB(Target,Index,X,Y,Z,W) ->
-  wxe_util:cast(5607, <<Target:?GLenum,Index:?GLuint,X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
+  cast(5616, <<Target:?GLenum,Index:?GLuint,X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
 
-%% @spec (Target::enum(),Index::integer(),Params::{float()}) -> ok
+%% @spec (Target::enum(),Index::integer(),Params::{float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramLocalParameterARB.xml">external</a> documentation.
+-spec programLocalParameter4dvARB(enum(),integer(),{float(),float(),float(),float()}) -> ok.
 programLocalParameter4dvARB(Target,Index,{P1,P2,P3,P4}) ->
-  wxe_util:cast(5608, <<Target:?GLenum,Index:?GLuint,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,P4:?GLdouble>>).
+  cast(5617, <<Target:?GLenum,Index:?GLuint,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,P4:?GLdouble>>).
 
 %% @spec (Target::enum(),Index::integer(),X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramLocalParameterARB.xml">external</a> documentation.
+-spec programLocalParameter4fARB(enum(),integer(),float(),float(),float(),float()) -> ok.
 programLocalParameter4fARB(Target,Index,X,Y,Z,W) ->
-  wxe_util:cast(5609, <<Target:?GLenum,Index:?GLuint,X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
+  cast(5618, <<Target:?GLenum,Index:?GLuint,X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
 
-%% @spec (Target::enum(),Index::integer(),Params::{float()}) -> ok
+%% @spec (Target::enum(),Index::integer(),Params::{float(),float(),float(),float()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramLocalParameterARB.xml">external</a> documentation.
+-spec programLocalParameter4fvARB(enum(),integer(),{float(),float(),float(),float()}) -> ok.
 programLocalParameter4fvARB(Target,Index,{P1,P2,P3,P4}) ->
-  wxe_util:cast(5610, <<Target:?GLenum,Index:?GLuint,P1:?GLfloat,P2:?GLfloat,P3:?GLfloat,P4:?GLfloat>>).
+  cast(5619, <<Target:?GLenum,Index:?GLuint,P1:?GLfloat,P2:?GLfloat,P3:?GLfloat,P4:?GLfloat>>).
 
-%% @spec (Target::enum(),Index::integer()) -> {float()}
+%% @spec (Target::enum(),Index::integer()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetProgramEnvParameterARB.xml">external</a> documentation.
+-spec getProgramEnvParameterdvARB(enum(),integer()) -> {float(),float(),float(),float()}.
 getProgramEnvParameterdvARB(Target,Index) ->
-  wxe_util:call(5611, <<Target:?GLenum,Index:?GLuint>>).
+  call(5620, <<Target:?GLenum,Index:?GLuint>>).
 
-%% @spec (Target::enum(),Index::integer()) -> {float()}
+%% @spec (Target::enum(),Index::integer()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetProgramEnvParameterARB.xml">external</a> documentation.
+-spec getProgramEnvParameterfvARB(enum(),integer()) -> {float(),float(),float(),float()}.
 getProgramEnvParameterfvARB(Target,Index) ->
-  wxe_util:call(5612, <<Target:?GLenum,Index:?GLuint>>).
+  call(5621, <<Target:?GLenum,Index:?GLuint>>).
 
-%% @spec (Target::enum(),Index::integer()) -> {float()}
+%% @spec (Target::enum(),Index::integer()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetProgramLocalParameterARB.xml">external</a> documentation.
+-spec getProgramLocalParameterdvARB(enum(),integer()) -> {float(),float(),float(),float()}.
 getProgramLocalParameterdvARB(Target,Index) ->
-  wxe_util:call(5613, <<Target:?GLenum,Index:?GLuint>>).
+  call(5622, <<Target:?GLenum,Index:?GLuint>>).
 
-%% @spec (Target::enum(),Index::integer()) -> {float()}
+%% @spec (Target::enum(),Index::integer()) -> {float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetProgramLocalParameterARB.xml">external</a> documentation.
+-spec getProgramLocalParameterfvARB(enum(),integer()) -> {float(),float(),float(),float()}.
 getProgramLocalParameterfvARB(Target,Index) ->
-  wxe_util:call(5614, <<Target:?GLenum,Index:?GLuint>>).
+  call(5623, <<Target:?GLenum,Index:?GLuint>>).
 
-%% @spec (Target::enum(),Pname::enum(),String::wx:wx_mem()) -> ok
+%% @spec (Target::enum(),Pname::enum(),String::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetProgramStringARB.xml">external</a> documentation.
+-spec getProgramStringARB(enum(),enum(),mem()) -> ok.
 getProgramStringARB(Target,Pname,String) ->
-  wxe_util:send_bin(String#wx_mem.bin),
-  wxe_util:call(5615, <<Target:?GLenum,Pname:?GLenum>>).
+  send_bin(String),
+  call(5624, <<Target:?GLenum,Pname:?GLenum>>).
+
+%% @spec (Target::enum(),Pname::enum()) -> [integer()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetBufferParameterARB.xml">external</a> documentation.
+-spec getBufferParameterivARB(enum(),enum()) -> [integer()].
+getBufferParameterivARB(Target,Pname) ->
+  call(5625, <<Target:?GLenum,Pname:?GLenum>>).
 
 %% @spec (Obj::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteObjectARB.xml">external</a> documentation.
+-spec deleteObjectARB(integer()) -> ok.
 deleteObjectARB(Obj) ->
-  wxe_util:cast(5616, <<Obj:?GLhandleARB>>).
+  cast(5626, <<Obj:?GLhandleARB>>).
 
 %% @spec (Pname::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetHandleARB.xml">external</a> documentation.
+-spec getHandleARB(enum()) -> integer().
 getHandleARB(Pname) ->
-  wxe_util:call(5617, <<Pname:?GLenum>>).
+  call(5627, <<Pname:?GLenum>>).
 
 %% @spec (ContainerObj::integer(),AttachedObj::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDetachObjectARB.xml">external</a> documentation.
+-spec detachObjectARB(integer(),integer()) -> ok.
 detachObjectARB(ContainerObj,AttachedObj) ->
-  wxe_util:cast(5618, <<ContainerObj:?GLhandleARB,AttachedObj:?GLhandleARB>>).
+  cast(5628, <<ContainerObj:?GLhandleARB,AttachedObj:?GLhandleARB>>).
 
 %% @spec (ShaderType::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCreateShaderObjectARB.xml">external</a> documentation.
+-spec createShaderObjectARB(enum()) -> integer().
 createShaderObjectARB(ShaderType) ->
-  wxe_util:call(5619, <<ShaderType:?GLenum>>).
+  call(5629, <<ShaderType:?GLenum>>).
 
 %% @spec (ShaderObj::integer(),String::[string()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glShaderSourceARB.xml">external</a> documentation.
+-spec shaderSourceARB(integer(),[string()]) -> ok.
 shaderSourceARB(ShaderObj,String) ->
  StringTemp = list_to_binary([[Str|[0]] || Str <- String ]),
-  wxe_util:cast(5620, <<ShaderObj:?GLhandleARB,(length(String)):?GLuint,(size(StringTemp)):?GLuint,(StringTemp)/binary,0:((8-((size(StringTemp)+4) rem 8)) rem 8)>>).
+  cast(5630, <<ShaderObj:?GLhandleARB,(length(String)):?GLuint,(size(StringTemp)):?GLuint,(StringTemp)/binary,0:((8-((size(StringTemp)+4) rem 8)) rem 8)>>).
 
 %% @spec (ShaderObj::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompileShaderARB.xml">external</a> documentation.
+-spec compileShaderARB(integer()) -> ok.
 compileShaderARB(ShaderObj) ->
-  wxe_util:cast(5621, <<ShaderObj:?GLhandleARB>>).
+  cast(5631, <<ShaderObj:?GLhandleARB>>).
 
 %% @spec () -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCreateProgramObjectARB.xml">external</a> documentation.
+-spec createProgramObjectARB() -> integer().
 createProgramObjectARB() ->
-  wxe_util:call(5622, <<>>).
+  call(5632, <<>>).
 
 %% @spec (ContainerObj::integer(),Obj::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glAttachObjectARB.xml">external</a> documentation.
+-spec attachObjectARB(integer(),integer()) -> ok.
 attachObjectARB(ContainerObj,Obj) ->
-  wxe_util:cast(5623, <<ContainerObj:?GLhandleARB,Obj:?GLhandleARB>>).
+  cast(5633, <<ContainerObj:?GLhandleARB,Obj:?GLhandleARB>>).
 
 %% @spec (ProgramObj::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glLinkProgramARB.xml">external</a> documentation.
+-spec linkProgramARB(integer()) -> ok.
 linkProgramARB(ProgramObj) ->
-  wxe_util:cast(5624, <<ProgramObj:?GLhandleARB>>).
+  cast(5634, <<ProgramObj:?GLhandleARB>>).
 
 %% @spec (ProgramObj::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUseProgramObjectARB.xml">external</a> documentation.
+-spec useProgramObjectARB(integer()) -> ok.
 useProgramObjectARB(ProgramObj) ->
-  wxe_util:cast(5625, <<ProgramObj:?GLhandleARB>>).
+  cast(5635, <<ProgramObj:?GLhandleARB>>).
 
 %% @spec (ProgramObj::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glValidateProgramARB.xml">external</a> documentation.
+-spec validateProgramARB(integer()) -> ok.
 validateProgramARB(ProgramObj) ->
-  wxe_util:cast(5626, <<ProgramObj:?GLhandleARB>>).
+  cast(5636, <<ProgramObj:?GLhandleARB>>).
 
 %% @spec (Obj::integer(),Pname::enum()) -> float()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetObjectParameterARB.xml">external</a> documentation.
+-spec getObjectParameterfvARB(integer(),enum()) -> float().
 getObjectParameterfvARB(Obj,Pname) ->
-  wxe_util:call(5627, <<Obj:?GLhandleARB,Pname:?GLenum>>).
+  call(5637, <<Obj:?GLhandleARB,Pname:?GLenum>>).
 
 %% @spec (Obj::integer(),Pname::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetObjectParameterARB.xml">external</a> documentation.
+-spec getObjectParameterivARB(integer(),enum()) -> integer().
 getObjectParameterivARB(Obj,Pname) ->
-  wxe_util:call(5628, <<Obj:?GLhandleARB,Pname:?GLenum>>).
+  call(5638, <<Obj:?GLhandleARB,Pname:?GLenum>>).
 
 %% @spec (Obj::integer(),MaxLength::integer()) -> string()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetInfoLogARB.xml">external</a> documentation.
+-spec getInfoLogARB(integer(),integer()) -> string().
 getInfoLogARB(Obj,MaxLength) ->
-  wxe_util:call(5629, <<Obj:?GLhandleARB,MaxLength:?GLsizei>>).
+  call(5639, <<Obj:?GLhandleARB,MaxLength:?GLsizei>>).
 
 %% @spec (ContainerObj::integer(),MaxCount::integer()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetAttachedObjectsARB.xml">external</a> documentation.
+-spec getAttachedObjectsARB(integer(),integer()) -> [integer()].
 getAttachedObjectsARB(ContainerObj,MaxCount) ->
-  wxe_util:call(5630, <<ContainerObj:?GLhandleARB,MaxCount:?GLsizei>>).
+  call(5640, <<ContainerObj:?GLhandleARB,MaxCount:?GLsizei>>).
 
 %% @spec (ProgramObj::integer(),Name::string()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetUniformLocationARB.xml">external</a> documentation.
+-spec getUniformLocationARB(integer(),string()) -> integer().
 getUniformLocationARB(ProgramObj,Name) ->
-  wxe_util:call(5631, <<ProgramObj:?GLhandleARB,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
+  call(5641, <<ProgramObj:?GLhandleARB,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
 
 %% @spec (ProgramObj::integer(),Index::integer(),MaxLength::integer()) -> {Size::integer(),Type::enum(),Name::string()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetActiveUniformARB.xml">external</a> documentation.
+-spec getActiveUniformARB(integer(),integer(),integer()) -> {integer(),enum(),string()}.
 getActiveUniformARB(ProgramObj,Index,MaxLength) ->
-  wxe_util:call(5632, <<ProgramObj:?GLhandleARB,Index:?GLuint,MaxLength:?GLsizei>>).
+  call(5642, <<ProgramObj:?GLhandleARB,Index:?GLuint,MaxLength:?GLsizei>>).
 
-%% @spec (ProgramObj::integer(),Location::integer()) -> {float()}
+%% @spec (ProgramObj::integer(),Location::integer()) -> {float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetUniformARB.xml">external</a> documentation.
+-spec getUniformfvARB(integer(),integer()) -> {float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}.
 getUniformfvARB(ProgramObj,Location) ->
-  wxe_util:call(5633, <<ProgramObj:?GLhandleARB,Location:?GLint>>).
+  call(5643, <<ProgramObj:?GLhandleARB,Location:?GLint>>).
 
-%% @spec (ProgramObj::integer(),Location::integer()) -> {integer()}
+%% @spec (ProgramObj::integer(),Location::integer()) -> {integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetUniformARB.xml">external</a> documentation.
+-spec getUniformivARB(integer(),integer()) -> {integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer()}.
 getUniformivARB(ProgramObj,Location) ->
-  wxe_util:call(5634, <<ProgramObj:?GLhandleARB,Location:?GLint>>).
+  call(5644, <<ProgramObj:?GLhandleARB,Location:?GLint>>).
 
 %% @spec (Obj::integer(),MaxLength::integer()) -> string()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetShaderSourceARB.xml">external</a> documentation.
+-spec getShaderSourceARB(integer(),integer()) -> string().
 getShaderSourceARB(Obj,MaxLength) ->
-  wxe_util:call(5635, <<Obj:?GLhandleARB,MaxLength:?GLsizei>>).
+  call(5645, <<Obj:?GLhandleARB,MaxLength:?GLsizei>>).
 
 %% @spec (ProgramObj::integer(),Index::integer(),Name::string()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindAttribLocationARB.xml">external</a> documentation.
+-spec bindAttribLocationARB(integer(),integer(),string()) -> ok.
 bindAttribLocationARB(ProgramObj,Index,Name) ->
-  wxe_util:cast(5636, <<ProgramObj:?GLhandleARB,Index:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 5) rem 8)) rem 8)>>).
+  cast(5646, <<ProgramObj:?GLhandleARB,Index:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 5) rem 8)) rem 8)>>).
 
 %% @spec (ProgramObj::integer(),Index::integer(),MaxLength::integer()) -> {Size::integer(),Type::enum(),Name::string()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetActiveAttribARB.xml">external</a> documentation.
+-spec getActiveAttribARB(integer(),integer(),integer()) -> {integer(),enum(),string()}.
 getActiveAttribARB(ProgramObj,Index,MaxLength) ->
-  wxe_util:call(5637, <<ProgramObj:?GLhandleARB,Index:?GLuint,MaxLength:?GLsizei>>).
+  call(5647, <<ProgramObj:?GLhandleARB,Index:?GLuint,MaxLength:?GLsizei>>).
 
 %% @spec (ProgramObj::integer(),Name::string()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetAttribLocationARB.xml">external</a> documentation.
+-spec getAttribLocationARB(integer(),string()) -> integer().
 getAttribLocationARB(ProgramObj,Name) ->
-  wxe_util:call(5638, <<ProgramObj:?GLhandleARB,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
+  call(5648, <<ProgramObj:?GLhandleARB,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
 
 %% @spec (Renderbuffer::integer()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsRenderbuffer.xml">external</a> documentation.
+-spec isRenderbuffer(integer()) -> 0|1.
 isRenderbuffer(Renderbuffer) ->
-  wxe_util:call(5639, <<Renderbuffer:?GLuint>>).
+  call(5649, <<Renderbuffer:?GLuint>>).
 
 %% @spec (Target::enum(),Renderbuffer::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindRenderbuffer.xml">external</a> documentation.
+-spec bindRenderbuffer(enum(),integer()) -> ok.
 bindRenderbuffer(Target,Renderbuffer) ->
-  wxe_util:cast(5640, <<Target:?GLenum,Renderbuffer:?GLuint>>).
+  cast(5650, <<Target:?GLenum,Renderbuffer:?GLuint>>).
 
 %% @spec (Renderbuffers::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteRenderbuffers.xml">external</a> documentation.
+-spec deleteRenderbuffers([integer()]) -> ok.
 deleteRenderbuffers(Renderbuffers) ->
-  wxe_util:cast(5641, <<(length(Renderbuffers)):?GLuint,
+  cast(5651, <<(length(Renderbuffers)):?GLuint,
         (<< <<C:?GLuint>> || C <- Renderbuffers>>)/binary,0:(((1+length(Renderbuffers)) rem 2)*32)>>).
 
 %% @spec (N::integer()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenRenderbuffers.xml">external</a> documentation.
+-spec genRenderbuffers(integer()) -> [integer()].
 genRenderbuffers(N) ->
-  wxe_util:call(5642, <<N:?GLsizei>>).
+  call(5652, <<N:?GLsizei>>).
 
 %% @spec (Target::enum(),Internalformat::enum(),Width::integer(),Height::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRenderbufferStorage.xml">external</a> documentation.
+-spec renderbufferStorage(enum(),enum(),integer(),integer()) -> ok.
 renderbufferStorage(Target,Internalformat,Width,Height) ->
-  wxe_util:cast(5643, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei>>).
+  cast(5653, <<Target:?GLenum,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei>>).
 
 %% @spec (Target::enum(),Pname::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetRenderbufferParameter.xml">external</a> documentation.
+-spec getRenderbufferParameteriv(enum(),enum()) -> integer().
 getRenderbufferParameteriv(Target,Pname) ->
-  wxe_util:call(5644, <<Target:?GLenum,Pname:?GLenum>>).
+  call(5654, <<Target:?GLenum,Pname:?GLenum>>).
 
 %% @spec (Framebuffer::integer()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsFramebuffer.xml">external</a> documentation.
+-spec isFramebuffer(integer()) -> 0|1.
 isFramebuffer(Framebuffer) ->
-  wxe_util:call(5645, <<Framebuffer:?GLuint>>).
+  call(5655, <<Framebuffer:?GLuint>>).
 
 %% @spec (Target::enum(),Framebuffer::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindFramebuffer.xml">external</a> documentation.
+-spec bindFramebuffer(enum(),integer()) -> ok.
 bindFramebuffer(Target,Framebuffer) ->
-  wxe_util:cast(5646, <<Target:?GLenum,Framebuffer:?GLuint>>).
+  cast(5656, <<Target:?GLenum,Framebuffer:?GLuint>>).
 
 %% @spec (Framebuffers::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteFramebuffers.xml">external</a> documentation.
+-spec deleteFramebuffers([integer()]) -> ok.
 deleteFramebuffers(Framebuffers) ->
-  wxe_util:cast(5647, <<(length(Framebuffers)):?GLuint,
+  cast(5657, <<(length(Framebuffers)):?GLuint,
         (<< <<C:?GLuint>> || C <- Framebuffers>>)/binary,0:(((1+length(Framebuffers)) rem 2)*32)>>).
 
 %% @spec (N::integer()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenFramebuffers.xml">external</a> documentation.
+-spec genFramebuffers(integer()) -> [integer()].
 genFramebuffers(N) ->
-  wxe_util:call(5648, <<N:?GLsizei>>).
+  call(5658, <<N:?GLsizei>>).
 
 %% @spec (Target::enum()) -> enum()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCheckFramebufferStatus.xml">external</a> documentation.
+-spec checkFramebufferStatus(enum()) -> enum().
 checkFramebufferStatus(Target) ->
-  wxe_util:call(5649, <<Target:?GLenum>>).
+  call(5659, <<Target:?GLenum>>).
 
 %% @spec (Target::enum(),Attachment::enum(),Textarget::enum(),Texture::integer(),Level::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFramebufferTexture1D.xml">external</a> documentation.
+-spec framebufferTexture1D(enum(),enum(),enum(),integer(),integer()) -> ok.
 framebufferTexture1D(Target,Attachment,Textarget,Texture,Level) ->
-  wxe_util:cast(5650, <<Target:?GLenum,Attachment:?GLenum,Textarget:?GLenum,Texture:?GLuint,Level:?GLint>>).
+  cast(5660, <<Target:?GLenum,Attachment:?GLenum,Textarget:?GLenum,Texture:?GLuint,Level:?GLint>>).
 
 %% @spec (Target::enum(),Attachment::enum(),Textarget::enum(),Texture::integer(),Level::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFramebufferTexture2D.xml">external</a> documentation.
+-spec framebufferTexture2D(enum(),enum(),enum(),integer(),integer()) -> ok.
 framebufferTexture2D(Target,Attachment,Textarget,Texture,Level) ->
-  wxe_util:cast(5651, <<Target:?GLenum,Attachment:?GLenum,Textarget:?GLenum,Texture:?GLuint,Level:?GLint>>).
+  cast(5661, <<Target:?GLenum,Attachment:?GLenum,Textarget:?GLenum,Texture:?GLuint,Level:?GLint>>).
 
 %% @spec (Target::enum(),Attachment::enum(),Textarget::enum(),Texture::integer(),Level::integer(),Zoffset::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFramebufferTexture3D.xml">external</a> documentation.
+-spec framebufferTexture3D(enum(),enum(),enum(),integer(),integer(),integer()) -> ok.
 framebufferTexture3D(Target,Attachment,Textarget,Texture,Level,Zoffset) ->
-  wxe_util:cast(5652, <<Target:?GLenum,Attachment:?GLenum,Textarget:?GLenum,Texture:?GLuint,Level:?GLint,Zoffset:?GLint>>).
+  cast(5662, <<Target:?GLenum,Attachment:?GLenum,Textarget:?GLenum,Texture:?GLuint,Level:?GLint,Zoffset:?GLint>>).
 
 %% @spec (Target::enum(),Attachment::enum(),Renderbuffertarget::enum(),Renderbuffer::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFramebufferRenderbuffer.xml">external</a> documentation.
+-spec framebufferRenderbuffer(enum(),enum(),enum(),integer()) -> ok.
 framebufferRenderbuffer(Target,Attachment,Renderbuffertarget,Renderbuffer) ->
-  wxe_util:cast(5653, <<Target:?GLenum,Attachment:?GLenum,Renderbuffertarget:?GLenum,Renderbuffer:?GLuint>>).
+  cast(5663, <<Target:?GLenum,Attachment:?GLenum,Renderbuffertarget:?GLenum,Renderbuffer:?GLuint>>).
 
 %% @spec (Target::enum(),Attachment::enum(),Pname::enum()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetFramebufferAttachmentParameter.xml">external</a> documentation.
+-spec getFramebufferAttachmentParameteriv(enum(),enum(),enum()) -> integer().
 getFramebufferAttachmentParameteriv(Target,Attachment,Pname) ->
-  wxe_util:call(5654, <<Target:?GLenum,Attachment:?GLenum,Pname:?GLenum>>).
+  call(5664, <<Target:?GLenum,Attachment:?GLenum,Pname:?GLenum>>).
 
 %% @spec (Target::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenerateMipmap.xml">external</a> documentation.
+-spec generateMipmap(enum()) -> ok.
 generateMipmap(Target) ->
-  wxe_util:cast(5655, <<Target:?GLenum>>).
+  cast(5665, <<Target:?GLenum>>).
 
 %% @spec (SrcX0::integer(),SrcY0::integer(),SrcX1::integer(),SrcY1::integer(),DstX0::integer(),DstY0::integer(),DstX1::integer(),DstY1::integer(),Mask::integer(),Filter::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBlitFramebuffer.xml">external</a> documentation.
+-spec blitFramebuffer(integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),enum()) -> ok.
 blitFramebuffer(SrcX0,SrcY0,SrcX1,SrcY1,DstX0,DstY0,DstX1,DstY1,Mask,Filter) ->
-  wxe_util:cast(5656, <<SrcX0:?GLint,SrcY0:?GLint,SrcX1:?GLint,SrcY1:?GLint,DstX0:?GLint,DstY0:?GLint,DstX1:?GLint,DstY1:?GLint,Mask:?GLbitfield,Filter:?GLenum>>).
+  cast(5666, <<SrcX0:?GLint,SrcY0:?GLint,SrcX1:?GLint,SrcY1:?GLint,DstX0:?GLint,DstY0:?GLint,DstX1:?GLint,DstY1:?GLint,Mask:?GLbitfield,Filter:?GLenum>>).
 
 %% @spec (Target::enum(),Samples::integer(),Internalformat::enum(),Width::integer(),Height::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glRenderbufferStorageMultisample.xml">external</a> documentation.
+-spec renderbufferStorageMultisample(enum(),integer(),enum(),integer(),integer()) -> ok.
 renderbufferStorageMultisample(Target,Samples,Internalformat,Width,Height) ->
-  wxe_util:cast(5657, <<Target:?GLenum,Samples:?GLsizei,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei>>).
+  cast(5667, <<Target:?GLenum,Samples:?GLsizei,Internalformat:?GLenum,Width:?GLsizei,Height:?GLsizei>>).
 
 %% @spec (Target::enum(),Attachment::enum(),Texture::integer(),Level::integer(),Layer::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFramebufferTextureLayer.xml">external</a> documentation.
+-spec framebufferTextureLayer(enum(),enum(),integer(),integer(),integer()) -> ok.
 framebufferTextureLayer(Target,Attachment,Texture,Level,Layer) ->
-  wxe_util:cast(5658, <<Target:?GLenum,Attachment:?GLenum,Texture:?GLuint,Level:?GLint,Layer:?GLint>>).
-
-%% @spec (Program::integer(),Pname::enum(),Value::integer()) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramParameterARB.xml">external</a> documentation.
-programParameteriARB(Program,Pname,Value) ->
-  wxe_util:cast(5659, <<Program:?GLuint,Pname:?GLenum,Value:?GLint>>).
-
-%% @spec (Target::enum(),Attachment::enum(),Texture::integer(),Level::integer()) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFramebufferTextureARB.xml">external</a> documentation.
-framebufferTextureARB(Target,Attachment,Texture,Level) ->
-  wxe_util:cast(5660, <<Target:?GLenum,Attachment:?GLenum,Texture:?GLuint,Level:?GLint>>).
+  cast(5668, <<Target:?GLenum,Attachment:?GLenum,Texture:?GLuint,Level:?GLint,Layer:?GLint>>).
 
 %% @spec (Target::enum(),Attachment::enum(),Texture::integer(),Level::integer(),Face::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFramebufferTextureFaceARB.xml">external</a> documentation.
+-spec framebufferTextureFaceARB(enum(),enum(),integer(),integer(),enum()) -> ok.
 framebufferTextureFaceARB(Target,Attachment,Texture,Level,Face) ->
-  wxe_util:cast(5661, <<Target:?GLenum,Attachment:?GLenum,Texture:?GLuint,Level:?GLint,Face:?GLenum>>).
-
-%% @spec (Index::integer(),Divisor::integer()) -> ok
-%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribDivisorARB.xml">external</a> documentation.
-vertexAttribDivisorARB(Index,Divisor) ->
-  wxe_util:cast(5662, <<Index:?GLuint,Divisor:?GLuint>>).
+  cast(5669, <<Target:?GLenum,Attachment:?GLenum,Texture:?GLuint,Level:?GLint,Face:?GLenum>>).
 
 %% @spec (Target::enum(),Offset::integer(),Length::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFlushMappedBufferRange.xml">external</a> documentation.
+-spec flushMappedBufferRange(enum(),integer(),integer()) -> ok.
 flushMappedBufferRange(Target,Offset,Length) ->
-  wxe_util:cast(5663, <<Target:?GLenum,0:32,Offset:?GLintptr,Length:?GLsizeiptr>>).
+  cast(5670, <<Target:?GLenum,0:32,Offset:?GLintptr,Length:?GLsizeiptr>>).
 
 %% @spec (Array::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindVertexArray.xml">external</a> documentation.
+-spec bindVertexArray(integer()) -> ok.
 bindVertexArray(Array) ->
-  wxe_util:cast(5664, <<Array:?GLuint>>).
+  cast(5671, <<Array:?GLuint>>).
 
 %% @spec (Arrays::[integer()]) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteVertexArrays.xml">external</a> documentation.
+-spec deleteVertexArrays([integer()]) -> ok.
 deleteVertexArrays(Arrays) ->
-  wxe_util:cast(5665, <<(length(Arrays)):?GLuint,
+  cast(5672, <<(length(Arrays)):?GLuint,
         (<< <<C:?GLuint>> || C <- Arrays>>)/binary,0:(((1+length(Arrays)) rem 2)*32)>>).
 
 %% @spec (N::integer()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenVertexArrays.xml">external</a> documentation.
+-spec genVertexArrays(integer()) -> [integer()].
 genVertexArrays(N) ->
-  wxe_util:call(5666, <<N:?GLsizei>>).
+  call(5673, <<N:?GLsizei>>).
 
 %% @spec (Array::integer()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsVertexArray.xml">external</a> documentation.
+-spec isVertexArray(integer()) -> 0|1.
 isVertexArray(Array) ->
-  wxe_util:call(5667, <<Array:?GLuint>>).
+  call(5674, <<Array:?GLuint>>).
 
 %% @spec (Program::integer(),UniformNames::[string()]) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetUniformIndices.xml">external</a> documentation.
+-spec getUniformIndices(integer(),[string()]) -> [integer()].
 getUniformIndices(Program,UniformNames) ->
  UniformNamesTemp = list_to_binary([[Str|[0]] || Str <- UniformNames ]),
-  wxe_util:call(5668, <<Program:?GLuint,(length(UniformNames)):?GLuint,(size(UniformNamesTemp)):?GLuint,(UniformNamesTemp)/binary,0:((8-((size(UniformNamesTemp)+0) rem 8)) rem 8)>>).
+  call(5675, <<Program:?GLuint,(length(UniformNames)):?GLuint,(size(UniformNamesTemp)):?GLuint,(UniformNamesTemp)/binary,0:((8-((size(UniformNamesTemp)+0) rem 8)) rem 8)>>).
 
 %% @spec (Program::integer(),UniformIndices::[integer()],Pname::enum()) -> [integer()]
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetActiveUniforms.xml">external</a> documentation.
+-spec getActiveUniformsiv(integer(),[integer()],enum()) -> [integer()].
 getActiveUniformsiv(Program,UniformIndices,Pname) ->
-  wxe_util:call(5669, <<Program:?GLuint,(length(UniformIndices)):?GLuint,
+  call(5676, <<Program:?GLuint,(length(UniformIndices)):?GLuint,
         (<< <<C:?GLuint>> || C <- UniformIndices>>)/binary,0:(((length(UniformIndices)) rem 2)*32),Pname:?GLenum>>).
 
 %% @spec (Program::integer(),UniformIndex::integer(),BufSize::integer()) -> string()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetActiveUniformName.xml">external</a> documentation.
+-spec getActiveUniformName(integer(),integer(),integer()) -> string().
 getActiveUniformName(Program,UniformIndex,BufSize) ->
-  wxe_util:call(5670, <<Program:?GLuint,UniformIndex:?GLuint,BufSize:?GLsizei>>).
+  call(5677, <<Program:?GLuint,UniformIndex:?GLuint,BufSize:?GLsizei>>).
 
 %% @spec (Program::integer(),UniformBlockName::string()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetUniformBlockIndex.xml">external</a> documentation.
+-spec getUniformBlockIndex(integer(),string()) -> integer().
 getUniformBlockIndex(Program,UniformBlockName) ->
-  wxe_util:call(5671, <<Program:?GLuint,(list_to_binary([UniformBlockName|[0]]))/binary,0:((8-((length(UniformBlockName)+ 5) rem 8)) rem 8)>>).
+  call(5678, <<Program:?GLuint,(list_to_binary([UniformBlockName|[0]]))/binary,0:((8-((length(UniformBlockName)+ 5) rem 8)) rem 8)>>).
 
-%% @spec (Program::integer(),UniformBlockIndex::integer(),Pname::enum(),Params::wx:wx_mem()) -> ok
+%% @spec (Program::integer(),UniformBlockIndex::integer(),Pname::enum(),Params::mem()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetActiveUniformBlock.xml">external</a> documentation.
+-spec getActiveUniformBlockiv(integer(),integer(),enum(),mem()) -> ok.
 getActiveUniformBlockiv(Program,UniformBlockIndex,Pname,Params) ->
-  wxe_util:send_bin(Params#wx_mem.bin),
-  wxe_util:call(5672, <<Program:?GLuint,UniformBlockIndex:?GLuint,Pname:?GLenum>>).
+  send_bin(Params),
+  call(5679, <<Program:?GLuint,UniformBlockIndex:?GLuint,Pname:?GLenum>>).
 
 %% @spec (Program::integer(),UniformBlockIndex::integer(),BufSize::integer()) -> string()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetActiveUniformBlockName.xml">external</a> documentation.
+-spec getActiveUniformBlockName(integer(),integer(),integer()) -> string().
 getActiveUniformBlockName(Program,UniformBlockIndex,BufSize) ->
-  wxe_util:call(5673, <<Program:?GLuint,UniformBlockIndex:?GLuint,BufSize:?GLsizei>>).
+  call(5680, <<Program:?GLuint,UniformBlockIndex:?GLuint,BufSize:?GLsizei>>).
 
 %% @spec (Program::integer(),UniformBlockIndex::integer(),UniformBlockBinding::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformBlockBinding.xml">external</a> documentation.
+-spec uniformBlockBinding(integer(),integer(),integer()) -> ok.
 uniformBlockBinding(Program,UniformBlockIndex,UniformBlockBinding) ->
-  wxe_util:cast(5674, <<Program:?GLuint,UniformBlockIndex:?GLuint,UniformBlockBinding:?GLuint>>).
+  cast(5681, <<Program:?GLuint,UniformBlockIndex:?GLuint,UniformBlockBinding:?GLuint>>).
 
 %% @spec (ReadTarget::enum(),WriteTarget::enum(),ReadOffset::integer(),WriteOffset::integer(),Size::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCopyBufferSubData.xml">external</a> documentation.
+-spec copyBufferSubData(enum(),enum(),integer(),integer(),integer()) -> ok.
 copyBufferSubData(ReadTarget,WriteTarget,ReadOffset,WriteOffset,Size) ->
-  wxe_util:cast(5675, <<ReadTarget:?GLenum,WriteTarget:?GLenum,ReadOffset:?GLintptr,WriteOffset:?GLintptr,Size:?GLsizeiptr>>).
+  cast(5682, <<ReadTarget:?GLenum,WriteTarget:?GLenum,ReadOffset:?GLintptr,WriteOffset:?GLintptr,Size:?GLsizeiptr>>).
+
+%% @spec (Mode::enum(),Count::integer(),Type::enum(),Indices::offset()|mem(),Basevertex::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawElementsBaseVertex.xml">external</a> documentation.
+-spec drawElementsBaseVertex(enum(),integer(),enum(),offset()|mem(),integer()) -> ok.
+drawElementsBaseVertex(Mode,Count,Type,Indices,Basevertex) when  is_integer(Indices) ->
+  cast(5683, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum,Indices:?GLuint,Basevertex:?GLint>>);
+drawElementsBaseVertex(Mode,Count,Type,Indices,Basevertex) ->
+  send_bin(Indices),
+  cast(5684, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum,Basevertex:?GLint>>).
+
+%% @spec (Mode::enum(),Start::integer(),End::integer(),Count::integer(),Type::enum(),Indices::offset()|mem(),Basevertex::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawRangeElementsBaseVertex.xml">external</a> documentation.
+-spec drawRangeElementsBaseVertex(enum(),integer(),integer(),integer(),enum(),offset()|mem(),integer()) -> ok.
+drawRangeElementsBaseVertex(Mode,Start,End,Count,Type,Indices,Basevertex) when  is_integer(Indices) ->
+  cast(5685, <<Mode:?GLenum,Start:?GLuint,End:?GLuint,Count:?GLsizei,Type:?GLenum,Indices:?GLuint,Basevertex:?GLint>>);
+drawRangeElementsBaseVertex(Mode,Start,End,Count,Type,Indices,Basevertex) ->
+  send_bin(Indices),
+  cast(5686, <<Mode:?GLenum,Start:?GLuint,End:?GLuint,Count:?GLsizei,Type:?GLenum,Basevertex:?GLint>>).
+
+%% @spec (Mode::enum(),Count::integer(),Type::enum(),Indices::offset()|mem(),Primcount::integer(),Basevertex::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawElementsInstancedBaseVertex.xml">external</a> documentation.
+-spec drawElementsInstancedBaseVertex(enum(),integer(),enum(),offset()|mem(),integer(),integer()) -> ok.
+drawElementsInstancedBaseVertex(Mode,Count,Type,Indices,Primcount,Basevertex) when  is_integer(Indices) ->
+  cast(5687, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum,Indices:?GLuint,Primcount:?GLsizei,Basevertex:?GLint>>);
+drawElementsInstancedBaseVertex(Mode,Count,Type,Indices,Primcount,Basevertex) ->
+  send_bin(Indices),
+  cast(5688, <<Mode:?GLenum,Count:?GLsizei,Type:?GLenum,Primcount:?GLsizei,Basevertex:?GLint>>).
+
+%% @spec (Mode::enum()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProvokingVertex.xml">external</a> documentation.
+-spec provokingVertex(enum()) -> ok.
+provokingVertex(Mode) ->
+  cast(5689, <<Mode:?GLenum>>).
+
+%% @spec (Condition::enum(),Flags::integer()) -> integer()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glFenceSync.xml">external</a> documentation.
+-spec fenceSync(enum(),integer()) -> integer().
+fenceSync(Condition,Flags) ->
+  call(5690, <<Condition:?GLenum,Flags:?GLbitfield>>).
+
+%% @spec (Sync::integer()) -> 0|1
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsSync.xml">external</a> documentation.
+-spec isSync(integer()) -> 0|1.
+isSync(Sync) ->
+  call(5691, <<Sync:?GLsync>>).
+
+%% @spec (Sync::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteSync.xml">external</a> documentation.
+-spec deleteSync(integer()) -> ok.
+deleteSync(Sync) ->
+  cast(5692, <<Sync:?GLsync>>).
+
+%% @spec (Sync::integer(),Flags::integer(),Timeout::integer()) -> enum()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClientWaitSync.xml">external</a> documentation.
+-spec clientWaitSync(integer(),integer(),integer()) -> enum().
+clientWaitSync(Sync,Flags,Timeout) ->
+  call(5693, <<Sync:?GLsync,Flags:?GLbitfield,0:32,Timeout:?GLuint64>>).
+
+%% @spec (Sync::integer(),Flags::integer(),Timeout::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWaitSync.xml">external</a> documentation.
+-spec waitSync(integer(),integer(),integer()) -> ok.
+waitSync(Sync,Flags,Timeout) ->
+  cast(5694, <<Sync:?GLsync,Flags:?GLbitfield,0:32,Timeout:?GLuint64>>).
+
+%% @spec (Pname::enum()) -> [integer()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetInteger64v.xml">external</a> documentation.
+-spec getInteger64v(enum()) -> [integer()].
+getInteger64v(Pname) ->
+  call(5695, <<Pname:?GLenum>>).
+
+%% @spec (Sync::integer(),Pname::enum(),BufSize::integer()) -> [integer()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetSync.xml">external</a> documentation.
+-spec getSynciv(integer(),enum(),integer()) -> [integer()].
+getSynciv(Sync,Pname,BufSize) ->
+  call(5696, <<Sync:?GLsync,Pname:?GLenum,BufSize:?GLsizei>>).
+
+%% @spec (Target::enum(),Samples::integer(),Internalformat::integer(),Width::integer(),Height::integer(),Fixedsamplelocations::0|1) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexImage2DMultisample.xml">external</a> documentation.
+-spec texImage2DMultisample(enum(),integer(),integer(),integer(),integer(),0|1) -> ok.
+texImage2DMultisample(Target,Samples,Internalformat,Width,Height,Fixedsamplelocations) ->
+  cast(5697, <<Target:?GLenum,Samples:?GLsizei,Internalformat:?GLint,Width:?GLsizei,Height:?GLsizei,Fixedsamplelocations:?GLboolean>>).
+
+%% @spec (Target::enum(),Samples::integer(),Internalformat::integer(),Width::integer(),Height::integer(),Depth::integer(),Fixedsamplelocations::0|1) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glTexImage3DMultisample.xml">external</a> documentation.
+-spec texImage3DMultisample(enum(),integer(),integer(),integer(),integer(),integer(),0|1) -> ok.
+texImage3DMultisample(Target,Samples,Internalformat,Width,Height,Depth,Fixedsamplelocations) ->
+  cast(5698, <<Target:?GLenum,Samples:?GLsizei,Internalformat:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Fixedsamplelocations:?GLboolean>>).
+
+%% @spec (Pname::enum(),Index::integer()) -> {float(),float()}
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetMultisample.xml">external</a> documentation.
+-spec getMultisamplefv(enum(),integer()) -> {float(),float()}.
+getMultisamplefv(Pname,Index) ->
+  call(5699, <<Pname:?GLenum,Index:?GLuint>>).
+
+%% @spec (Index::integer(),Mask::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSampleMaski.xml">external</a> documentation.
+-spec sampleMaski(integer(),integer()) -> ok.
+sampleMaski(Index,Mask) ->
+  cast(5700, <<Index:?GLuint,Mask:?GLbitfield>>).
+
+%% @spec (Type::enum(),Name::string(),String::string()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glNamedStringARB.xml">external</a> documentation.
+-spec namedStringARB(enum(),string(),string()) -> ok.
+namedStringARB(Type,Name,String) ->
+  cast(5701, <<Type:?GLenum,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 5) rem 8)) rem 8),(list_to_binary([String|[0]]))/binary,0:((8-((length(String)+ 1) rem 8)) rem 8)>>).
+
+%% @spec (Name::string()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteNamedStringARB.xml">external</a> documentation.
+-spec deleteNamedStringARB(string()) -> ok.
+deleteNamedStringARB(Name) ->
+  cast(5702, <<(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
+
+%% @spec (Shader::integer(),Path::[string()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCompileShaderIncludeARB.xml">external</a> documentation.
+-spec compileShaderIncludeARB(integer(),[string()]) -> ok.
+compileShaderIncludeARB(Shader,Path) ->
+ PathTemp = list_to_binary([[Str|[0]] || Str <- Path ]),
+  cast(5703, <<Shader:?GLuint,(length(Path)):?GLuint,(size(PathTemp)):?GLuint,(PathTemp)/binary,0:((8-((size(PathTemp)+0) rem 8)) rem 8)>>).
+
+%% @spec (Name::string()) -> 0|1
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsNamedStringARB.xml">external</a> documentation.
+-spec isNamedStringARB(string()) -> 0|1.
+isNamedStringARB(Name) ->
+  call(5704, <<(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
+
+%% @spec (Name::string(),BufSize::integer()) -> string()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetNamedStringARB.xml">external</a> documentation.
+-spec getNamedStringARB(string(),integer()) -> string().
+getNamedStringARB(Name,BufSize) ->
+  call(5705, <<(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8),BufSize:?GLsizei>>).
+
+%% @spec (Name::string(),Pname::enum()) -> integer()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetNamedStringARB.xml">external</a> documentation.
+-spec getNamedStringivARB(string(),enum()) -> integer().
+getNamedStringivARB(Name,Pname) ->
+  call(5706, <<(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8),Pname:?GLenum>>).
+
+%% @spec (Program::integer(),ColorNumber::integer(),Index::integer(),Name::string()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindFragDataLocationIndexe.xml">external</a> documentation.
+-spec bindFragDataLocationIndexed(integer(),integer(),integer(),string()) -> ok.
+bindFragDataLocationIndexed(Program,ColorNumber,Index,Name) ->
+  cast(5707, <<Program:?GLuint,ColorNumber:?GLuint,Index:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 5) rem 8)) rem 8)>>).
+
+%% @spec (Program::integer(),Name::string()) -> integer()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetFragDataIndex.xml">external</a> documentation.
+-spec getFragDataIndex(integer(),string()) -> integer().
+getFragDataIndex(Program,Name) ->
+  call(5708, <<Program:?GLuint,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 5) rem 8)) rem 8)>>).
+
+%% @spec (Count::integer()) -> [integer()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenSamplers.xml">external</a> documentation.
+-spec genSamplers(integer()) -> [integer()].
+genSamplers(Count) ->
+  call(5709, <<Count:?GLsizei>>).
+
+%% @spec (Samplers::[integer()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteSamplers.xml">external</a> documentation.
+-spec deleteSamplers([integer()]) -> ok.
+deleteSamplers(Samplers) ->
+  cast(5710, <<(length(Samplers)):?GLuint,
+        (<< <<C:?GLuint>> || C <- Samplers>>)/binary,0:(((1+length(Samplers)) rem 2)*32)>>).
+
+%% @spec (Sampler::integer()) -> 0|1
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsSampler.xml">external</a> documentation.
+-spec isSampler(integer()) -> 0|1.
+isSampler(Sampler) ->
+  call(5711, <<Sampler:?GLuint>>).
+
+%% @spec (Unit::integer(),Sampler::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindSampler.xml">external</a> documentation.
+-spec bindSampler(integer(),integer()) -> ok.
+bindSampler(Unit,Sampler) ->
+  cast(5712, <<Unit:?GLuint,Sampler:?GLuint>>).
+
+%% @spec (Sampler::integer(),Pname::enum(),Param::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSamplerParameter.xml">external</a> documentation.
+-spec samplerParameteri(integer(),enum(),integer()) -> ok.
+samplerParameteri(Sampler,Pname,Param) ->
+  cast(5713, <<Sampler:?GLuint,Pname:?GLenum,Param:?GLint>>).
+
+%% @spec (Sampler::integer(),Pname::enum(),Param::[integer()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSamplerParameter.xml">external</a> documentation.
+-spec samplerParameteriv(integer(),enum(),[integer()]) -> ok.
+samplerParameteriv(Sampler,Pname,Param) ->
+  cast(5714, <<Sampler:?GLuint,Pname:?GLenum,(length(Param)):?GLuint,
+        (<< <<C:?GLint>> || C <- Param>>)/binary,0:(((1+length(Param)) rem 2)*32)>>).
+
+%% @spec (Sampler::integer(),Pname::enum(),Param::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSamplerParameter.xml">external</a> documentation.
+-spec samplerParameterf(integer(),enum(),float()) -> ok.
+samplerParameterf(Sampler,Pname,Param) ->
+  cast(5715, <<Sampler:?GLuint,Pname:?GLenum,Param:?GLfloat>>).
+
+%% @spec (Sampler::integer(),Pname::enum(),Param::[float()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSamplerParameter.xml">external</a> documentation.
+-spec samplerParameterfv(integer(),enum(),[float()]) -> ok.
+samplerParameterfv(Sampler,Pname,Param) ->
+  cast(5716, <<Sampler:?GLuint,Pname:?GLenum,(length(Param)):?GLuint,
+        (<< <<C:?GLfloat>> || C <- Param>>)/binary,0:(((1+length(Param)) rem 2)*32)>>).
+
+%% @spec (Sampler::integer(),Pname::enum(),Param::[integer()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSamplerParameterI.xml">external</a> documentation.
+-spec samplerParameterIiv(integer(),enum(),[integer()]) -> ok.
+samplerParameterIiv(Sampler,Pname,Param) ->
+  cast(5717, <<Sampler:?GLuint,Pname:?GLenum,(length(Param)):?GLuint,
+        (<< <<C:?GLint>> || C <- Param>>)/binary,0:(((1+length(Param)) rem 2)*32)>>).
+
+%% @spec (Sampler::integer(),Pname::enum(),Param::[integer()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glSamplerParameterI.xml">external</a> documentation.
+-spec samplerParameterIuiv(integer(),enum(),[integer()]) -> ok.
+samplerParameterIuiv(Sampler,Pname,Param) ->
+  cast(5718, <<Sampler:?GLuint,Pname:?GLenum,(length(Param)):?GLuint,
+        (<< <<C:?GLuint>> || C <- Param>>)/binary,0:(((1+length(Param)) rem 2)*32)>>).
+
+%% @spec (Sampler::integer(),Pname::enum()) -> [integer()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetSamplerParameter.xml">external</a> documentation.
+-spec getSamplerParameteriv(integer(),enum()) -> [integer()].
+getSamplerParameteriv(Sampler,Pname) ->
+  call(5719, <<Sampler:?GLuint,Pname:?GLenum>>).
+
+%% @spec (Sampler::integer(),Pname::enum()) -> [integer()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetSamplerParameterI.xml">external</a> documentation.
+-spec getSamplerParameterIiv(integer(),enum()) -> [integer()].
+getSamplerParameterIiv(Sampler,Pname) ->
+  call(5720, <<Sampler:?GLuint,Pname:?GLenum>>).
+
+%% @spec (Sampler::integer(),Pname::enum()) -> [float()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetSamplerParameter.xml">external</a> documentation.
+-spec getSamplerParameterfv(integer(),enum()) -> [float()].
+getSamplerParameterfv(Sampler,Pname) ->
+  call(5721, <<Sampler:?GLuint,Pname:?GLenum>>).
+
+%% @spec (Sampler::integer(),Pname::enum()) -> [integer()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetSamplerParameterI.xml">external</a> documentation.
+-spec getSamplerParameterIuiv(integer(),enum()) -> [integer()].
+getSamplerParameterIuiv(Sampler,Pname) ->
+  call(5722, <<Sampler:?GLuint,Pname:?GLenum>>).
+
+%% @spec (Id::integer(),Target::enum()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glQueryCounter.xml">external</a> documentation.
+-spec queryCounter(integer(),enum()) -> ok.
+queryCounter(Id,Target) ->
+  cast(5723, <<Id:?GLuint,Target:?GLenum>>).
+
+%% @spec (Id::integer(),Pname::enum()) -> integer()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetQueryObjecti64v.xml">external</a> documentation.
+-spec getQueryObjecti64v(integer(),enum()) -> integer().
+getQueryObjecti64v(Id,Pname) ->
+  call(5724, <<Id:?GLuint,Pname:?GLenum>>).
+
+%% @spec (Id::integer(),Pname::enum()) -> integer()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetQueryObjectui64v.xml">external</a> documentation.
+-spec getQueryObjectui64v(integer(),enum()) -> integer().
+getQueryObjectui64v(Id,Pname) ->
+  call(5725, <<Id:?GLuint,Pname:?GLenum>>).
+
+%% @spec (Mode::enum(),Indirect::offset()|mem()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawArraysIndirect.xml">external</a> documentation.
+-spec drawArraysIndirect(enum(),offset()|mem()) -> ok.
+drawArraysIndirect(Mode,Indirect) when  is_integer(Indirect) ->
+  cast(5726, <<Mode:?GLenum,Indirect:?GLuint>>);
+drawArraysIndirect(Mode,Indirect) ->
+  send_bin(Indirect),
+  cast(5727, <<Mode:?GLenum>>).
+
+%% @spec (Mode::enum(),Type::enum(),Indirect::offset()|mem()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawElementsIndirect.xml">external</a> documentation.
+-spec drawElementsIndirect(enum(),enum(),offset()|mem()) -> ok.
+drawElementsIndirect(Mode,Type,Indirect) when  is_integer(Indirect) ->
+  cast(5728, <<Mode:?GLenum,Type:?GLenum,Indirect:?GLuint>>);
+drawElementsIndirect(Mode,Type,Indirect) ->
+  send_bin(Indirect),
+  cast(5729, <<Mode:?GLenum,Type:?GLenum>>).
+
+%% @spec (Location::integer(),X::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform1d(integer(),float()) -> ok.
+uniform1d(Location,X) ->
+  cast(5730, <<Location:?GLint,0:32,X:?GLdouble>>).
+
+%% @spec (Location::integer(),X::float(),Y::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform2d(integer(),float(),float()) -> ok.
+uniform2d(Location,X,Y) ->
+  cast(5731, <<Location:?GLint,0:32,X:?GLdouble,Y:?GLdouble>>).
+
+%% @spec (Location::integer(),X::float(),Y::float(),Z::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform3d(integer(),float(),float(),float()) -> ok.
+uniform3d(Location,X,Y,Z) ->
+  cast(5732, <<Location:?GLint,0:32,X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
+
+%% @spec (Location::integer(),X::float(),Y::float(),Z::float(),W::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform4d(integer(),float(),float(),float(),float()) -> ok.
+uniform4d(Location,X,Y,Z,W) ->
+  cast(5733, <<Location:?GLint,0:32,X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
+
+%% @spec (Location::integer(),Value::[float()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform1dv(integer(),[float()]) -> ok.
+uniform1dv(Location,Value) ->
+  cast(5734, <<Location:?GLint,0:32,(length(Value)):?GLuint,0:32,
+        (<< <<C:?GLdouble>> || C <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Value::[{float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform2dv(integer(),[{float(),float()}]) -> ok.
+uniform2dv(Location,Value) ->
+  cast(5735, <<Location:?GLint,0:32,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble>> || {V1,V2} <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Value::[{float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform3dv(integer(),[{float(),float(),float()}]) -> ok.
+uniform3dv(Location,Value) ->
+  cast(5736, <<Location:?GLint,0:32,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble>> || {V1,V2,V3} <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Value::[{float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniform.xml">external</a> documentation.
+-spec uniform4dv(integer(),[{float(),float(),float(),float()}]) -> ok.
+uniform4dv(Location,Value) ->
+  cast(5737, <<Location:?GLint,0:32,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix.xml">external</a> documentation.
+-spec uniformMatrix2dv(integer(),0|1,[{float(),float(),float(),float()}]) -> ok.
+uniformMatrix2dv(Location,Transpose,Value) ->
+  cast(5738, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix.xml">external</a> documentation.
+-spec uniformMatrix3dv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+uniformMatrix3dv(Location,Transpose,Value) ->
+  cast(5739, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble,V9:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9} <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix.xml">external</a> documentation.
+-spec uniformMatrix4dv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+uniformMatrix4dv(Location,Transpose,Value) ->
+  cast(5740, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble,V9:?GLdouble,V10:?GLdouble,V11:?GLdouble,V12:?GLdouble,V13:?GLdouble,V14:?GLdouble,V15:?GLdouble,V16:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12,V13,V14,V15,V16} <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix2x.xml">external</a> documentation.
+-spec uniformMatrix2x3dv(integer(),0|1,[{float(),float(),float(),float(),float(),float()}]) -> ok.
+uniformMatrix2x3dv(Location,Transpose,Value) ->
+  cast(5741, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble>> || {V1,V2,V3,V4,V5,V6} <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix2x.xml">external</a> documentation.
+-spec uniformMatrix2x4dv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+uniformMatrix2x4dv(Location,Transpose,Value) ->
+  cast(5742, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8} <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix3x.xml">external</a> documentation.
+-spec uniformMatrix3x2dv(integer(),0|1,[{float(),float(),float(),float(),float(),float()}]) -> ok.
+uniformMatrix3x2dv(Location,Transpose,Value) ->
+  cast(5743, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble>> || {V1,V2,V3,V4,V5,V6} <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix3x.xml">external</a> documentation.
+-spec uniformMatrix3x4dv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+uniformMatrix3x4dv(Location,Transpose,Value) ->
+  cast(5744, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble,V9:?GLdouble,V10:?GLdouble,V11:?GLdouble,V12:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12} <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix4x.xml">external</a> documentation.
+-spec uniformMatrix4x2dv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+uniformMatrix4x2dv(Location,Transpose,Value) ->
+  cast(5745, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8} <- Value>>)/binary>>).
+
+%% @spec (Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformMatrix4x.xml">external</a> documentation.
+-spec uniformMatrix4x3dv(integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+uniformMatrix4x3dv(Location,Transpose,Value) ->
+  cast(5746, <<Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble,V9:?GLdouble,V10:?GLdouble,V11:?GLdouble,V12:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer()) -> {float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetUniform.xml">external</a> documentation.
+-spec getUniformdv(integer(),integer()) -> {float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}.
+getUniformdv(Program,Location) ->
+  call(5747, <<Program:?GLuint,Location:?GLint>>).
+
+%% @spec (Program::integer(),Shadertype::enum(),Name::string()) -> integer()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetSubroutineUniformLocation.xml">external</a> documentation.
+-spec getSubroutineUniformLocation(integer(),enum(),string()) -> integer().
+getSubroutineUniformLocation(Program,Shadertype,Name) ->
+  call(5748, <<Program:?GLuint,Shadertype:?GLenum,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
+
+%% @spec (Program::integer(),Shadertype::enum(),Name::string()) -> integer()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetSubroutineIndex.xml">external</a> documentation.
+-spec getSubroutineIndex(integer(),enum(),string()) -> integer().
+getSubroutineIndex(Program,Shadertype,Name) ->
+  call(5749, <<Program:?GLuint,Shadertype:?GLenum,(list_to_binary([Name|[0]]))/binary,0:((8-((length(Name)+ 1) rem 8)) rem 8)>>).
+
+%% @spec (Program::integer(),Shadertype::enum(),Index::integer(),Bufsize::integer()) -> string()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetActiveSubroutineUniformName.xml">external</a> documentation.
+-spec getActiveSubroutineUniformName(integer(),enum(),integer(),integer()) -> string().
+getActiveSubroutineUniformName(Program,Shadertype,Index,Bufsize) ->
+  call(5750, <<Program:?GLuint,Shadertype:?GLenum,Index:?GLuint,Bufsize:?GLsizei>>).
+
+%% @spec (Program::integer(),Shadertype::enum(),Index::integer(),Bufsize::integer()) -> string()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetActiveSubroutineName.xml">external</a> documentation.
+-spec getActiveSubroutineName(integer(),enum(),integer(),integer()) -> string().
+getActiveSubroutineName(Program,Shadertype,Index,Bufsize) ->
+  call(5751, <<Program:?GLuint,Shadertype:?GLenum,Index:?GLuint,Bufsize:?GLsizei>>).
+
+%% @spec (Shadertype::enum(),Indices::[integer()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUniformSubroutines.xml">external</a> documentation.
+-spec uniformSubroutinesuiv(enum(),[integer()]) -> ok.
+uniformSubroutinesuiv(Shadertype,Indices) ->
+  cast(5752, <<Shadertype:?GLenum,(length(Indices)):?GLuint,
+        (<< <<C:?GLuint>> || C <- Indices>>)/binary,0:(((length(Indices)) rem 2)*32)>>).
+
+%% @spec (Shadertype::enum(),Location::integer()) -> {integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer()}
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetUniformSubroutine.xml">external</a> documentation.
+-spec getUniformSubroutineuiv(enum(),integer()) -> {integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer(),integer()}.
+getUniformSubroutineuiv(Shadertype,Location) ->
+  call(5753, <<Shadertype:?GLenum,Location:?GLint>>).
+
+%% @spec (Program::integer(),Shadertype::enum(),Pname::enum()) -> integer()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetProgramStage.xml">external</a> documentation.
+-spec getProgramStageiv(integer(),enum(),enum()) -> integer().
+getProgramStageiv(Program,Shadertype,Pname) ->
+  call(5754, <<Program:?GLuint,Shadertype:?GLenum,Pname:?GLenum>>).
+
+%% @spec (Pname::enum(),Value::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPatchParameter.xml">external</a> documentation.
+-spec patchParameteri(enum(),integer()) -> ok.
+patchParameteri(Pname,Value) ->
+  cast(5755, <<Pname:?GLenum,Value:?GLint>>).
+
+%% @spec (Pname::enum(),Values::[float()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPatchParameter.xml">external</a> documentation.
+-spec patchParameterfv(enum(),[float()]) -> ok.
+patchParameterfv(Pname,Values) ->
+  cast(5756, <<Pname:?GLenum,(length(Values)):?GLuint,
+        (<< <<C:?GLfloat>> || C <- Values>>)/binary,0:(((length(Values)) rem 2)*32)>>).
+
+%% @spec (Target::enum(),Id::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindTransformFeedback.xml">external</a> documentation.
+-spec bindTransformFeedback(enum(),integer()) -> ok.
+bindTransformFeedback(Target,Id) ->
+  cast(5757, <<Target:?GLenum,Id:?GLuint>>).
+
+%% @spec (Ids::[integer()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteTransformFeedbacks.xml">external</a> documentation.
+-spec deleteTransformFeedbacks([integer()]) -> ok.
+deleteTransformFeedbacks(Ids) ->
+  cast(5758, <<(length(Ids)):?GLuint,
+        (<< <<C:?GLuint>> || C <- Ids>>)/binary,0:(((1+length(Ids)) rem 2)*32)>>).
+
+%% @spec (N::integer()) -> [integer()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenTransformFeedbacks.xml">external</a> documentation.
+-spec genTransformFeedbacks(integer()) -> [integer()].
+genTransformFeedbacks(N) ->
+  call(5759, <<N:?GLsizei>>).
+
+%% @spec (Id::integer()) -> 0|1
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsTransformFeedback.xml">external</a> documentation.
+-spec isTransformFeedback(integer()) -> 0|1.
+isTransformFeedback(Id) ->
+  call(5760, <<Id:?GLuint>>).
+
+%% @spec () -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glPauseTransformFeedback.xml">external</a> documentation.
+-spec pauseTransformFeedback() -> ok.
+pauseTransformFeedback() ->
+  cast(5761, <<>>).
+
+%% @spec () -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glResumeTransformFeedback.xml">external</a> documentation.
+-spec resumeTransformFeedback() -> ok.
+resumeTransformFeedback() ->
+  cast(5762, <<>>).
+
+%% @spec (Mode::enum(),Id::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawTransformFeedback.xml">external</a> documentation.
+-spec drawTransformFeedback(enum(),integer()) -> ok.
+drawTransformFeedback(Mode,Id) ->
+  cast(5763, <<Mode:?GLenum,Id:?GLuint>>).
+
+%% @spec (Mode::enum(),Id::integer(),Stream::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDrawTransformFeedbackStream.xml">external</a> documentation.
+-spec drawTransformFeedbackStream(enum(),integer(),integer()) -> ok.
+drawTransformFeedbackStream(Mode,Id,Stream) ->
+  cast(5764, <<Mode:?GLenum,Id:?GLuint,Stream:?GLuint>>).
+
+%% @spec (Target::enum(),Index::integer(),Id::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBeginQueryIndexe.xml">external</a> documentation.
+-spec beginQueryIndexed(enum(),integer(),integer()) -> ok.
+beginQueryIndexed(Target,Index,Id) ->
+  cast(5765, <<Target:?GLenum,Index:?GLuint,Id:?GLuint>>).
+
+%% @spec (Target::enum(),Index::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glEndQueryIndexe.xml">external</a> documentation.
+-spec endQueryIndexed(enum(),integer()) -> ok.
+endQueryIndexed(Target,Index) ->
+  cast(5766, <<Target:?GLenum,Index:?GLuint>>).
+
+%% @spec (Target::enum(),Index::integer(),Pname::enum()) -> integer()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetQueryIndexed.xml">external</a> documentation.
+-spec getQueryIndexediv(enum(),integer(),enum()) -> integer().
+getQueryIndexediv(Target,Index,Pname) ->
+  call(5767, <<Target:?GLenum,Index:?GLuint,Pname:?GLenum>>).
+
+%% @spec () -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glReleaseShaderCompiler.xml">external</a> documentation.
+-spec releaseShaderCompiler() -> ok.
+releaseShaderCompiler() ->
+  cast(5768, <<>>).
+
+%% @spec (Shaders::[integer()],Binaryformat::enum(),Binary::binary()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glShaderBinary.xml">external</a> documentation.
+-spec shaderBinary([integer()],enum(),binary()) -> ok.
+shaderBinary(Shaders,Binaryformat,Binary) ->
+  send_bin(Binary),
+  cast(5769, <<(length(Shaders)):?GLuint,
+        (<< <<C:?GLuint>> || C <- Shaders>>)/binary,0:(((1+length(Shaders)) rem 2)*32),Binaryformat:?GLenum>>).
+
+%% @spec (Shadertype::enum(),Precisiontype::enum()) -> {Range::{integer(),integer()},Precision::integer()}
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetShaderPrecisionFormat.xml">external</a> documentation.
+-spec getShaderPrecisionFormat(enum(),enum()) -> {{integer(),integer()},integer()}.
+getShaderPrecisionFormat(Shadertype,Precisiontype) ->
+  call(5770, <<Shadertype:?GLenum,Precisiontype:?GLenum>>).
+
+%% @spec (N::clamp(),F::clamp()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDepthRange.xml">external</a> documentation.
+-spec depthRangef(clamp(),clamp()) -> ok.
+depthRangef(N,F) ->
+  cast(5771, <<N:?GLclampf,F:?GLclampf>>).
+
+%% @spec (D::clamp()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glClearDepthf.xml">external</a> documentation.
+-spec clearDepthf(clamp()) -> ok.
+clearDepthf(D) ->
+  cast(5772, <<D:?GLclampf>>).
+
+%% @spec (Program::integer(),BufSize::integer()) -> {BinaryFormat::enum(),Binary::binary()}
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetProgramBinary.xml">external</a> documentation.
+-spec getProgramBinary(integer(),integer()) -> {enum(),binary()}.
+getProgramBinary(Program,BufSize) ->
+  call(5773, <<Program:?GLuint,BufSize:?GLsizei>>).
+
+%% @spec (Program::integer(),BinaryFormat::enum(),Binary::binary()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramBinary.xml">external</a> documentation.
+-spec programBinary(integer(),enum(),binary()) -> ok.
+programBinary(Program,BinaryFormat,Binary) ->
+  send_bin(Binary),
+  cast(5774, <<Program:?GLuint,BinaryFormat:?GLenum>>).
+
+%% @spec (Program::integer(),Pname::enum(),Value::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramParameter.xml">external</a> documentation.
+-spec programParameteri(integer(),enum(),integer()) -> ok.
+programParameteri(Program,Pname,Value) ->
+  cast(5775, <<Program:?GLuint,Pname:?GLenum,Value:?GLint>>).
+
+%% @spec (Pipeline::integer(),Stages::integer(),Program::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glUseProgramStages.xml">external</a> documentation.
+-spec useProgramStages(integer(),integer(),integer()) -> ok.
+useProgramStages(Pipeline,Stages,Program) ->
+  cast(5776, <<Pipeline:?GLuint,Stages:?GLbitfield,Program:?GLuint>>).
+
+%% @spec (Pipeline::integer(),Program::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glActiveShaderProgram.xml">external</a> documentation.
+-spec activeShaderProgram(integer(),integer()) -> ok.
+activeShaderProgram(Pipeline,Program) ->
+  cast(5777, <<Pipeline:?GLuint,Program:?GLuint>>).
+
+%% @spec (Type::enum(),Strings::[string()]) -> integer()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glCreateShaderProgramv.xml">external</a> documentation.
+-spec createShaderProgramv(enum(),[string()]) -> integer().
+createShaderProgramv(Type,Strings) ->
+ StringsTemp = list_to_binary([[Str|[0]] || Str <- Strings ]),
+  call(5778, <<Type:?GLenum,(length(Strings)):?GLuint,(size(StringsTemp)):?GLuint,(StringsTemp)/binary,0:((8-((size(StringsTemp)+0) rem 8)) rem 8)>>).
+
+%% @spec (Pipeline::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glBindProgramPipeline.xml">external</a> documentation.
+-spec bindProgramPipeline(integer()) -> ok.
+bindProgramPipeline(Pipeline) ->
+  cast(5779, <<Pipeline:?GLuint>>).
+
+%% @spec (Pipelines::[integer()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDeleteProgramPipelines.xml">external</a> documentation.
+-spec deleteProgramPipelines([integer()]) -> ok.
+deleteProgramPipelines(Pipelines) ->
+  cast(5780, <<(length(Pipelines)):?GLuint,
+        (<< <<C:?GLuint>> || C <- Pipelines>>)/binary,0:(((1+length(Pipelines)) rem 2)*32)>>).
+
+%% @spec (N::integer()) -> [integer()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGenProgramPipelines.xml">external</a> documentation.
+-spec genProgramPipelines(integer()) -> [integer()].
+genProgramPipelines(N) ->
+  call(5781, <<N:?GLsizei>>).
+
+%% @spec (Pipeline::integer()) -> 0|1
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glIsProgramPipeline.xml">external</a> documentation.
+-spec isProgramPipeline(integer()) -> 0|1.
+isProgramPipeline(Pipeline) ->
+  call(5782, <<Pipeline:?GLuint>>).
+
+%% @spec (Pipeline::integer(),Pname::enum()) -> integer()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetProgramPipeline.xml">external</a> documentation.
+-spec getProgramPipelineiv(integer(),enum()) -> integer().
+getProgramPipelineiv(Pipeline,Pname) ->
+  call(5783, <<Pipeline:?GLuint,Pname:?GLenum>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform1i(integer(),integer(),integer()) -> ok.
+programUniform1i(Program,Location,V0) ->
+  cast(5784, <<Program:?GLuint,Location:?GLint,V0:?GLint>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[integer()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform1iv(integer(),integer(),[integer()]) -> ok.
+programUniform1iv(Program,Location,Value) ->
+  cast(5785, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<C:?GLint>> || C <- Value>>)/binary,0:(((1+length(Value)) rem 2)*32)>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform1f(integer(),integer(),float()) -> ok.
+programUniform1f(Program,Location,V0) ->
+  cast(5786, <<Program:?GLuint,Location:?GLint,V0:?GLfloat>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[float()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform1fv(integer(),integer(),[float()]) -> ok.
+programUniform1fv(Program,Location,Value) ->
+  cast(5787, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<C:?GLfloat>> || C <- Value>>)/binary,0:(((1+length(Value)) rem 2)*32)>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform1d(integer(),integer(),float()) -> ok.
+programUniform1d(Program,Location,V0) ->
+  cast(5788, <<Program:?GLuint,Location:?GLint,V0:?GLdouble>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[float()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform1dv(integer(),integer(),[float()]) -> ok.
+programUniform1dv(Program,Location,Value) ->
+  cast(5789, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,0:32,
+        (<< <<C:?GLdouble>> || C <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform1ui(integer(),integer(),integer()) -> ok.
+programUniform1ui(Program,Location,V0) ->
+  cast(5790, <<Program:?GLuint,Location:?GLint,V0:?GLuint>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[integer()]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform1uiv(integer(),integer(),[integer()]) -> ok.
+programUniform1uiv(Program,Location,Value) ->
+  cast(5791, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<C:?GLuint>> || C <- Value>>)/binary,0:(((1+length(Value)) rem 2)*32)>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::integer(),V1::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform2i(integer(),integer(),integer(),integer()) -> ok.
+programUniform2i(Program,Location,V0,V1) ->
+  cast(5792, <<Program:?GLuint,Location:?GLint,V0:?GLint,V1:?GLint>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{integer(),integer()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform2iv(integer(),integer(),[{integer(),integer()}]) -> ok.
+programUniform2iv(Program,Location,Value) ->
+  cast(5793, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<V1:?GLint,V2:?GLint>> || {V1,V2} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::float(),V1::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform2f(integer(),integer(),float(),float()) -> ok.
+programUniform2f(Program,Location,V0,V1) ->
+  cast(5794, <<Program:?GLuint,Location:?GLint,V0:?GLfloat,V1:?GLfloat>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform2fv(integer(),integer(),[{float(),float()}]) -> ok.
+programUniform2fv(Program,Location,Value) ->
+  cast(5795, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat>> || {V1,V2} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::float(),V1::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform2d(integer(),integer(),float(),float()) -> ok.
+programUniform2d(Program,Location,V0,V1) ->
+  cast(5796, <<Program:?GLuint,Location:?GLint,V0:?GLdouble,V1:?GLdouble>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform2dv(integer(),integer(),[{float(),float()}]) -> ok.
+programUniform2dv(Program,Location,Value) ->
+  cast(5797, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble>> || {V1,V2} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::integer(),V1::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform2ui(integer(),integer(),integer(),integer()) -> ok.
+programUniform2ui(Program,Location,V0,V1) ->
+  cast(5798, <<Program:?GLuint,Location:?GLint,V0:?GLuint,V1:?GLuint>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{integer(),integer()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform2uiv(integer(),integer(),[{integer(),integer()}]) -> ok.
+programUniform2uiv(Program,Location,Value) ->
+  cast(5799, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<V1:?GLuint,V2:?GLuint>> || {V1,V2} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::integer(),V1::integer(),V2::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform3i(integer(),integer(),integer(),integer(),integer()) -> ok.
+programUniform3i(Program,Location,V0,V1,V2) ->
+  cast(5800, <<Program:?GLuint,Location:?GLint,V0:?GLint,V1:?GLint,V2:?GLint>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{integer(),integer(),integer()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform3iv(integer(),integer(),[{integer(),integer(),integer()}]) -> ok.
+programUniform3iv(Program,Location,Value) ->
+  cast(5801, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<V1:?GLint,V2:?GLint,V3:?GLint>> || {V1,V2,V3} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::float(),V1::float(),V2::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform3f(integer(),integer(),float(),float(),float()) -> ok.
+programUniform3f(Program,Location,V0,V1,V2) ->
+  cast(5802, <<Program:?GLuint,Location:?GLint,V0:?GLfloat,V1:?GLfloat,V2:?GLfloat>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform3fv(integer(),integer(),[{float(),float(),float()}]) -> ok.
+programUniform3fv(Program,Location,Value) ->
+  cast(5803, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat>> || {V1,V2,V3} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::float(),V1::float(),V2::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform3d(integer(),integer(),float(),float(),float()) -> ok.
+programUniform3d(Program,Location,V0,V1,V2) ->
+  cast(5804, <<Program:?GLuint,Location:?GLint,V0:?GLdouble,V1:?GLdouble,V2:?GLdouble>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform3dv(integer(),integer(),[{float(),float(),float()}]) -> ok.
+programUniform3dv(Program,Location,Value) ->
+  cast(5805, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble>> || {V1,V2,V3} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::integer(),V1::integer(),V2::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform3ui(integer(),integer(),integer(),integer(),integer()) -> ok.
+programUniform3ui(Program,Location,V0,V1,V2) ->
+  cast(5806, <<Program:?GLuint,Location:?GLint,V0:?GLuint,V1:?GLuint,V2:?GLuint>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{integer(),integer(),integer()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform3uiv(integer(),integer(),[{integer(),integer(),integer()}]) -> ok.
+programUniform3uiv(Program,Location,Value) ->
+  cast(5807, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<V1:?GLuint,V2:?GLuint,V3:?GLuint>> || {V1,V2,V3} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::integer(),V1::integer(),V2::integer(),V3::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform4i(integer(),integer(),integer(),integer(),integer(),integer()) -> ok.
+programUniform4i(Program,Location,V0,V1,V2,V3) ->
+  cast(5808, <<Program:?GLuint,Location:?GLint,V0:?GLint,V1:?GLint,V2:?GLint,V3:?GLint>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{integer(),integer(),integer(),integer()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform4iv(integer(),integer(),[{integer(),integer(),integer(),integer()}]) -> ok.
+programUniform4iv(Program,Location,Value) ->
+  cast(5809, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::float(),V1::float(),V2::float(),V3::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform4f(integer(),integer(),float(),float(),float(),float()) -> ok.
+programUniform4f(Program,Location,V0,V1,V2,V3) ->
+  cast(5810, <<Program:?GLuint,Location:?GLint,V0:?GLfloat,V1:?GLfloat,V2:?GLfloat,V3:?GLfloat>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform4fv(integer(),integer(),[{float(),float(),float(),float()}]) -> ok.
+programUniform4fv(Program,Location,Value) ->
+  cast(5811, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::float(),V1::float(),V2::float(),V3::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform4d(integer(),integer(),float(),float(),float(),float()) -> ok.
+programUniform4d(Program,Location,V0,V1,V2,V3) ->
+  cast(5812, <<Program:?GLuint,Location:?GLint,V0:?GLdouble,V1:?GLdouble,V2:?GLdouble,V3:?GLdouble>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform4dv(integer(),integer(),[{float(),float(),float(),float()}]) -> ok.
+programUniform4dv(Program,Location,Value) ->
+  cast(5813, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),V0::integer(),V1::integer(),V2::integer(),V3::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform4ui(integer(),integer(),integer(),integer(),integer(),integer()) -> ok.
+programUniform4ui(Program,Location,V0,V1,V2,V3) ->
+  cast(5814, <<Program:?GLuint,Location:?GLint,V0:?GLuint,V1:?GLuint,V2:?GLuint,V3:?GLuint>>).
+
+%% @spec (Program::integer(),Location::integer(),Value::[{integer(),integer(),integer(),integer()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniform.xml">external</a> documentation.
+-spec programUniform4uiv(integer(),integer(),[{integer(),integer(),integer(),integer()}]) -> ok.
+programUniform4uiv(Program,Location,Value) ->
+  cast(5815, <<Program:?GLuint,Location:?GLint,(length(Value)):?GLuint,
+        (<< <<V1:?GLuint,V2:?GLuint,V3:?GLuint,V4:?GLuint>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix.xml">external</a> documentation.
+-spec programUniformMatrix2fv(integer(),integer(),0|1,[{float(),float(),float(),float()}]) -> ok.
+programUniformMatrix2fv(Program,Location,Transpose,Value) ->
+  cast(5816, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix.xml">external</a> documentation.
+-spec programUniformMatrix3fv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix3fv(Program,Location,Transpose,Value) ->
+  cast(5817, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat,V9:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix.xml">external</a> documentation.
+-spec programUniformMatrix4fv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix4fv(Program,Location,Transpose,Value) ->
+  cast(5818, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat,V9:?GLfloat,V10:?GLfloat,V11:?GLfloat,V12:?GLfloat,V13:?GLfloat,V14:?GLfloat,V15:?GLfloat,V16:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12,V13,V14,V15,V16} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix.xml">external</a> documentation.
+-spec programUniformMatrix2dv(integer(),integer(),0|1,[{float(),float(),float(),float()}]) -> ok.
+programUniformMatrix2dv(Program,Location,Transpose,Value) ->
+  cast(5819, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:56,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble>> || {V1,V2,V3,V4} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix.xml">external</a> documentation.
+-spec programUniformMatrix3dv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix3dv(Program,Location,Transpose,Value) ->
+  cast(5820, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:56,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble,V9:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix.xml">external</a> documentation.
+-spec programUniformMatrix4dv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix4dv(Program,Location,Transpose,Value) ->
+  cast(5821, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:56,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble,V9:?GLdouble,V10:?GLdouble,V11:?GLdouble,V12:?GLdouble,V13:?GLdouble,V14:?GLdouble,V15:?GLdouble,V16:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12,V13,V14,V15,V16} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix2x.xml">external</a> documentation.
+-spec programUniformMatrix2x3fv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix2x3fv(Program,Location,Transpose,Value) ->
+  cast(5822, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat>> || {V1,V2,V3,V4,V5,V6} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix3x.xml">external</a> documentation.
+-spec programUniformMatrix3x2fv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix3x2fv(Program,Location,Transpose,Value) ->
+  cast(5823, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat>> || {V1,V2,V3,V4,V5,V6} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix2x.xml">external</a> documentation.
+-spec programUniformMatrix2x4fv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix2x4fv(Program,Location,Transpose,Value) ->
+  cast(5824, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix4x.xml">external</a> documentation.
+-spec programUniformMatrix4x2fv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix4x2fv(Program,Location,Transpose,Value) ->
+  cast(5825, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix3x.xml">external</a> documentation.
+-spec programUniformMatrix3x4fv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix3x4fv(Program,Location,Transpose,Value) ->
+  cast(5826, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat,V9:?GLfloat,V10:?GLfloat,V11:?GLfloat,V12:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix4x.xml">external</a> documentation.
+-spec programUniformMatrix4x3fv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix4x3fv(Program,Location,Transpose,Value) ->
+  cast(5827, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:24,(length(Value)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat,V5:?GLfloat,V6:?GLfloat,V7:?GLfloat,V8:?GLfloat,V9:?GLfloat,V10:?GLfloat,V11:?GLfloat,V12:?GLfloat>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix2x.xml">external</a> documentation.
+-spec programUniformMatrix2x3dv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix2x3dv(Program,Location,Transpose,Value) ->
+  cast(5828, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:56,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble>> || {V1,V2,V3,V4,V5,V6} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix3x.xml">external</a> documentation.
+-spec programUniformMatrix3x2dv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix3x2dv(Program,Location,Transpose,Value) ->
+  cast(5829, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:56,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble>> || {V1,V2,V3,V4,V5,V6} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix2x.xml">external</a> documentation.
+-spec programUniformMatrix2x4dv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix2x4dv(Program,Location,Transpose,Value) ->
+  cast(5830, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:56,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix4x.xml">external</a> documentation.
+-spec programUniformMatrix4x2dv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix4x2dv(Program,Location,Transpose,Value) ->
+  cast(5831, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:56,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix3x.xml">external</a> documentation.
+-spec programUniformMatrix3x4dv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix3x4dv(Program,Location,Transpose,Value) ->
+  cast(5832, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:56,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble,V9:?GLdouble,V10:?GLdouble,V11:?GLdouble,V12:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12} <- Value>>)/binary>>).
+
+%% @spec (Program::integer(),Location::integer(),Transpose::0|1,Value::[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glProgramUniformMatrix4x.xml">external</a> documentation.
+-spec programUniformMatrix4x3dv(integer(),integer(),0|1,[{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()}]) -> ok.
+programUniformMatrix4x3dv(Program,Location,Transpose,Value) ->
+  cast(5833, <<Program:?GLuint,Location:?GLint,Transpose:?GLboolean,0:56,(length(Value)):?GLuint,0:32,
+        (<< <<V1:?GLdouble,V2:?GLdouble,V3:?GLdouble,V4:?GLdouble,V5:?GLdouble,V6:?GLdouble,V7:?GLdouble,V8:?GLdouble,V9:?GLdouble,V10:?GLdouble,V11:?GLdouble,V12:?GLdouble>> || {V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12} <- Value>>)/binary>>).
+
+%% @spec (Pipeline::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glValidateProgramPipeline.xml">external</a> documentation.
+-spec validateProgramPipeline(integer()) -> ok.
+validateProgramPipeline(Pipeline) ->
+  cast(5834, <<Pipeline:?GLuint>>).
+
+%% @spec (Pipeline::integer(),BufSize::integer()) -> string()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetProgramPipelineInfoLog.xml">external</a> documentation.
+-spec getProgramPipelineInfoLog(integer(),integer()) -> string().
+getProgramPipelineInfoLog(Pipeline,BufSize) ->
+  call(5835, <<Pipeline:?GLuint,BufSize:?GLsizei>>).
+
+%% @spec (Index::integer(),X::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribL.xml">external</a> documentation.
+-spec vertexAttribL1d(integer(),float()) -> ok.
+vertexAttribL1d(Index,X) ->
+  cast(5836, <<Index:?GLuint,0:32,X:?GLdouble>>).
+
+%% @spec (Index::integer(),X::float(),Y::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribL.xml">external</a> documentation.
+-spec vertexAttribL2d(integer(),float(),float()) -> ok.
+vertexAttribL2d(Index,X,Y) ->
+  cast(5837, <<Index:?GLuint,0:32,X:?GLdouble,Y:?GLdouble>>).
+
+%% @spec (Index::integer(),X::float(),Y::float(),Z::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribL.xml">external</a> documentation.
+-spec vertexAttribL3d(integer(),float(),float(),float()) -> ok.
+vertexAttribL3d(Index,X,Y,Z) ->
+  cast(5838, <<Index:?GLuint,0:32,X:?GLdouble,Y:?GLdouble,Z:?GLdouble>>).
+
+%% @spec (Index::integer(),X::float(),Y::float(),Z::float(),W::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribL.xml">external</a> documentation.
+-spec vertexAttribL4d(integer(),float(),float(),float(),float()) -> ok.
+vertexAttribL4d(Index,X,Y,Z,W) ->
+  cast(5839, <<Index:?GLuint,0:32,X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
+
+%% @spec (Index,{X}) -> ok
+%% @equiv vertexAttribL1d(Index,X)
+-spec vertexAttribL1dv(integer(),{float()}) -> ok.
+vertexAttribL1dv(Index,{X}) ->  vertexAttribL1d(Index,X).
+
+%% @spec (Index,{X,Y}) -> ok
+%% @equiv vertexAttribL2d(Index,X,Y)
+-spec vertexAttribL2dv(integer(),{float(),float()}) -> ok.
+vertexAttribL2dv(Index,{X,Y}) ->  vertexAttribL2d(Index,X,Y).
+
+%% @spec (Index,{X,Y,Z}) -> ok
+%% @equiv vertexAttribL3d(Index,X,Y,Z)
+-spec vertexAttribL3dv(integer(),{float(),float(),float()}) -> ok.
+vertexAttribL3dv(Index,{X,Y,Z}) ->  vertexAttribL3d(Index,X,Y,Z).
+
+%% @spec (Index,{X,Y,Z,W}) -> ok
+%% @equiv vertexAttribL4d(Index,X,Y,Z,W)
+-spec vertexAttribL4dv(integer(),{float(),float(),float(),float()}) -> ok.
+vertexAttribL4dv(Index,{X,Y,Z,W}) ->  vertexAttribL4d(Index,X,Y,Z,W).
+
+%% @spec (Index::integer(),Size::integer(),Type::enum(),Stride::integer(),Pointer::offset()|mem()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glVertexAttribLPointer.xml">external</a> documentation.
+-spec vertexAttribLPointer(integer(),integer(),enum(),integer(),offset()|mem()) -> ok.
+vertexAttribLPointer(Index,Size,Type,Stride,Pointer) when  is_integer(Pointer) ->
+  cast(5840, <<Index:?GLuint,Size:?GLint,Type:?GLenum,Stride:?GLsizei,Pointer:?GLuint>>);
+vertexAttribLPointer(Index,Size,Type,Stride,Pointer) ->
+  send_bin(Pointer),
+  cast(5841, <<Index:?GLuint,Size:?GLint,Type:?GLenum,Stride:?GLsizei>>).
+
+%% @spec (Index::integer(),Pname::enum()) -> {float(),float(),float(),float()}
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetVertexAttribL.xml">external</a> documentation.
+-spec getVertexAttribLdv(integer(),enum()) -> {float(),float(),float(),float()}.
+getVertexAttribLdv(Index,Pname) ->
+  call(5842, <<Index:?GLuint,Pname:?GLenum>>).
+
+%% @spec (First::integer(),V::[{float(),float(),float(),float()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glViewportArrayv.xml">external</a> documentation.
+-spec viewportArrayv(integer(),[{float(),float(),float(),float()}]) -> ok.
+viewportArrayv(First,V) ->
+  cast(5843, <<First:?GLuint,(length(V)):?GLuint,
+        (<< <<V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat>> || {V1,V2,V3,V4} <- V>>)/binary>>).
+
+%% @spec (Index::integer(),X::float(),Y::float(),W::float(),H::float()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glViewportIndexed.xml">external</a> documentation.
+-spec viewportIndexedf(integer(),float(),float(),float(),float()) -> ok.
+viewportIndexedf(Index,X,Y,W,H) ->
+  cast(5844, <<Index:?GLuint,X:?GLfloat,Y:?GLfloat,W:?GLfloat,H:?GLfloat>>).
+
+%% @spec (Index::integer(),V::{float(),float(),float(),float()}) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glViewportIndexed.xml">external</a> documentation.
+-spec viewportIndexedfv(integer(),{float(),float(),float(),float()}) -> ok.
+viewportIndexedfv(Index,{V1,V2,V3,V4}) ->
+  cast(5845, <<Index:?GLuint,V1:?GLfloat,V2:?GLfloat,V3:?GLfloat,V4:?GLfloat>>).
+
+%% @spec (First::integer(),V::[{integer(),integer(),integer(),integer()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glScissorArrayv.xml">external</a> documentation.
+-spec scissorArrayv(integer(),[{integer(),integer(),integer(),integer()}]) -> ok.
+scissorArrayv(First,V) ->
+  cast(5846, <<First:?GLuint,(length(V)):?GLuint,
+        (<< <<V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>> || {V1,V2,V3,V4} <- V>>)/binary>>).
+
+%% @spec (Index::integer(),Left::integer(),Bottom::integer(),Width::integer(),Height::integer()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glScissorIndexe.xml">external</a> documentation.
+-spec scissorIndexed(integer(),integer(),integer(),integer(),integer()) -> ok.
+scissorIndexed(Index,Left,Bottom,Width,Height) ->
+  cast(5847, <<Index:?GLuint,Left:?GLint,Bottom:?GLint,Width:?GLsizei,Height:?GLsizei>>).
+
+%% @spec (Index::integer(),V::{integer(),integer(),integer(),integer()}) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glScissorIndexe.xml">external</a> documentation.
+-spec scissorIndexedv(integer(),{integer(),integer(),integer(),integer()}) -> ok.
+scissorIndexedv(Index,{V1,V2,V3,V4}) ->
+  cast(5848, <<Index:?GLuint,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>).
+
+%% @spec (First::integer(),V::[{clamp(),clamp()}]) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDepthRangeArrayv.xml">external</a> documentation.
+-spec depthRangeArrayv(integer(),[{clamp(),clamp()}]) -> ok.
+depthRangeArrayv(First,V) ->
+  cast(5849, <<First:?GLuint,0:32,(length(V)):?GLuint,0:32,
+        (<< <<V1:?GLclampd,V2:?GLclampd>> || {V1,V2} <- V>>)/binary>>).
+
+%% @spec (Index::integer(),N::clamp(),F::clamp()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDepthRangeIndexe.xml">external</a> documentation.
+-spec depthRangeIndexed(integer(),clamp(),clamp()) -> ok.
+depthRangeIndexed(Index,N,F) ->
+  cast(5850, <<Index:?GLuint,0:32,N:?GLclampd,F:?GLclampd>>).
+
+%% @spec (Target::enum(),Index::integer()) -> [float()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetFloati_v.xml">external</a> documentation.
+-spec getFloati_v(enum(),integer()) -> [float()].
+getFloati_v(Target,Index) ->
+  call(5851, <<Target:?GLenum,Index:?GLuint>>).
+
+%% @spec (Target::enum(),Index::integer()) -> [float()]
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetDoublei_v.xml">external</a> documentation.
+-spec getDoublei_v(enum(),integer()) -> [float()].
+getDoublei_v(Target,Index) ->
+  call(5852, <<Target:?GLenum,Index:?GLuint>>).
+
+%% @spec (Source::enum(),Type::enum(),Severity::enum(),Ids::[integer()],Enabled::0|1) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDebugMessageControlARB.xml">external</a> documentation.
+-spec debugMessageControlARB(enum(),enum(),enum(),[integer()],0|1) -> ok.
+debugMessageControlARB(Source,Type,Severity,Ids,Enabled) ->
+  cast(5853, <<Source:?GLenum,Type:?GLenum,Severity:?GLenum,(length(Ids)):?GLuint,
+        (<< <<C:?GLuint>> || C <- Ids>>)/binary,0:(((length(Ids)) rem 2)*32),Enabled:?GLboolean>>).
+
+%% @spec (Source::enum(),Type::enum(),Id::integer(),Severity::enum(),Buf::string()) -> ok
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDebugMessageInsertARB.xml">external</a> documentation.
+-spec debugMessageInsertARB(enum(),enum(),integer(),enum(),string()) -> ok.
+debugMessageInsertARB(Source,Type,Id,Severity,Buf) ->
+  cast(5854, <<Source:?GLenum,Type:?GLenum,Id:?GLuint,Severity:?GLenum,(list_to_binary([Buf|[0]]))/binary,0:((8-((length(Buf)+ 1) rem 8)) rem 8)>>).
+
+%% @spec (Count::integer(),Bufsize::integer()) -> {integer(),Sources::[enum()],Types::[enum()],Ids::[integer()],Severities::[enum()],MessageLog::[string()]}
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetDebugMessageLogARB.xml">external</a> documentation.
+-spec getDebugMessageLogARB(integer(),integer()) -> {integer(),[enum()],[enum()],[integer()],[enum()],[string()]}.
+getDebugMessageLogARB(Count,Bufsize) ->
+  call(5855, <<Count:?GLuint,Bufsize:?GLsizei>>).
+
+%% @spec () -> enum()
+%% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glGetGraphicsResetStatusARB.xml">external</a> documentation.
+-spec getGraphicsResetStatusARB() -> enum().
+getGraphicsResetStatusARB() ->
+  call(5856, <<>>).
 
 %% @spec () -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glResizeBuffersMESA.xml">external</a> documentation.
+-spec resizeBuffersMESA() -> ok.
 resizeBuffersMESA() ->
-  wxe_util:cast(5676, <<>>).
+  cast(5857, <<>>).
 
 %% @spec (X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos4dMESA.xml">external</a> documentation.
+-spec windowPos4dMESA(float(),float(),float(),float()) -> ok.
 windowPos4dMESA(X,Y,Z,W) ->
-  wxe_util:cast(5677, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
+  cast(5858, <<X:?GLdouble,Y:?GLdouble,Z:?GLdouble,W:?GLdouble>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv windowPos4dMESA(X,Y,Z,W)
+-spec windowPos4dvMESA({float(),float(),float(),float()}) -> ok.
 windowPos4dvMESA({X,Y,Z,W}) ->  windowPos4dMESA(X,Y,Z,W).
 
 %% @spec (X::float(),Y::float(),Z::float(),W::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos4fMESA.xml">external</a> documentation.
+-spec windowPos4fMESA(float(),float(),float(),float()) -> ok.
 windowPos4fMESA(X,Y,Z,W) ->
-  wxe_util:cast(5678, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
+  cast(5859, <<X:?GLfloat,Y:?GLfloat,Z:?GLfloat,W:?GLfloat>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv windowPos4fMESA(X,Y,Z,W)
+-spec windowPos4fvMESA({float(),float(),float(),float()}) -> ok.
 windowPos4fvMESA({X,Y,Z,W}) ->  windowPos4fMESA(X,Y,Z,W).
 
 %% @spec (X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos4iMESA.xml">external</a> documentation.
+-spec windowPos4iMESA(integer(),integer(),integer(),integer()) -> ok.
 windowPos4iMESA(X,Y,Z,W) ->
-  wxe_util:cast(5679, <<X:?GLint,Y:?GLint,Z:?GLint,W:?GLint>>).
+  cast(5860, <<X:?GLint,Y:?GLint,Z:?GLint,W:?GLint>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv windowPos4iMESA(X,Y,Z,W)
+-spec windowPos4ivMESA({integer(),integer(),integer(),integer()}) -> ok.
 windowPos4ivMESA({X,Y,Z,W}) ->  windowPos4iMESA(X,Y,Z,W).
 
 %% @spec (X::integer(),Y::integer(),Z::integer(),W::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glWindowPos4sMESA.xml">external</a> documentation.
+-spec windowPos4sMESA(integer(),integer(),integer(),integer()) -> ok.
 windowPos4sMESA(X,Y,Z,W) ->
-  wxe_util:cast(5680, <<X:?GLshort,Y:?GLshort,Z:?GLshort,W:?GLshort>>).
+  cast(5861, <<X:?GLshort,Y:?GLshort,Z:?GLshort,W:?GLshort>>).
 
 %% @spec ({X,Y,Z,W}) -> ok
 %% @equiv windowPos4sMESA(X,Y,Z,W)
+-spec windowPos4svMESA({integer(),integer(),integer(),integer()}) -> ok.
 windowPos4svMESA({X,Y,Z,W}) ->  windowPos4sMESA(X,Y,Z,W).
 
 %% @spec (Zmin::clamp(),Zmax::clamp()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glDepthBoundsEXT.xml">external</a> documentation.
+-spec depthBoundsEXT(clamp(),clamp()) -> ok.
 depthBoundsEXT(Zmin,Zmax) ->
-  wxe_util:cast(5681, <<Zmin:?GLclampd,Zmax:?GLclampd>>).
+  cast(5862, <<Zmin:?GLclampd,Zmax:?GLclampd>>).
 
 %% @spec (StencilTagBits::integer(),StencilClearTag::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/glStencilClearTagEXT.xml">external</a> documentation.
+-spec stencilClearTagEXT(integer(),integer()) -> ok.
 stencilClearTagEXT(StencilTagBits,StencilClearTag) ->
-  wxe_util:cast(5682, <<StencilTagBits:?GLsizei,StencilClearTag:?GLuint>>).
+  cast(5863, <<StencilTagBits:?GLsizei,StencilClearTag:?GLuint>>).
 
diff --git a/lib/wx/src/gen/gl_debug.hrl b/lib/wx/src/gen/gl_debug.hrl
deleted file mode 100644
index 0b8086f24e..0000000000
--- a/lib/wx/src/gen/gl_debug.hrl
+++ /dev/null
@@ -1,697 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2010. 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%
-%% This file is generated DO NOT EDIT
-
-gldebug_table() ->
-[
- {5037, {gl, accum, 0}},
- {5038, {gl, alphaFunc, 0}},
- {5039, {gl, areTexturesResident, 0}},
- {5040, {gl, arrayElement, 0}},
- {5041, {gl, 'begin', 0}},
- {5042, {gl, bindTexture, 0}},
- {5043, {gl, bitmap, 0}},
- {5044, {gl, bitmap, 0}},
- {5045, {gl, blendFunc, 0}},
- {5046, {gl, callList, 0}},
- {5047, {gl, callLists, 0}},
- {5048, {gl, clear, 0}},
- {5049, {gl, clearAccum, 0}},
- {5050, {gl, clearColor, 0}},
- {5051, {gl, clearDepth, 0}},
- {5052, {gl, clearIndex, 0}},
- {5053, {gl, clearStencil, 0}},
- {5054, {gl, clipPlane, 0}},
- {5055, {gl, color3b, 0}},
- {5056, {gl, color3d, 0}},
- {5057, {gl, color3f, 0}},
- {5058, {gl, color3i, 0}},
- {5059, {gl, color3s, 0}},
- {5060, {gl, color3ub, 0}},
- {5061, {gl, color3ui, 0}},
- {5062, {gl, color3us, 0}},
- {5063, {gl, color4b, 0}},
- {5064, {gl, color4d, 0}},
- {5065, {gl, color4f, 0}},
- {5066, {gl, color4i, 0}},
- {5067, {gl, color4s, 0}},
- {5068, {gl, color4ub, 0}},
- {5069, {gl, color4ui, 0}},
- {5070, {gl, color4us, 0}},
- {5071, {gl, colorMask, 0}},
- {5072, {gl, colorMaterial, 0}},
- {5073, {gl, colorPointer, 0}},
- {5074, {gl, colorPointer, 0}},
- {5075, {gl, copyPixels, 0}},
- {5076, {gl, copyTexImage1D, 0}},
- {5077, {gl, copyTexImage2D, 0}},
- {5078, {gl, copyTexSubImage1D, 0}},
- {5079, {gl, copyTexSubImage2D, 0}},
- {5080, {gl, cullFace, 0}},
- {5081, {gl, deleteLists, 0}},
- {5082, {gl, deleteTextures, 0}},
- {5083, {gl, depthFunc, 0}},
- {5084, {gl, depthMask, 0}},
- {5085, {gl, depthRange, 0}},
- {5086, {gl, disable, 0}},
- {5087, {gl, disableClientState, 0}},
- {5088, {gl, drawArrays, 0}},
- {5089, {gl, drawBuffer, 0}},
- {5090, {gl, drawElements, 0}},
- {5091, {gl, drawElements, 0}},
- {5092, {gl, drawPixels, 0}},
- {5093, {gl, drawPixels, 0}},
- {5094, {gl, edgeFlag, 0}},
- {5095, {gl, edgeFlagPointer, 0}},
- {5096, {gl, edgeFlagPointer, 0}},
- {5097, {gl, enable, 0}},
- {5098, {gl, enableClientState, 0}},
- {5099, {gl, 'end', 0}},
- {5100, {gl, endList, 0}},
- {5101, {gl, evalCoord1d, 0}},
- {5102, {gl, evalCoord1f, 0}},
- {5103, {gl, evalCoord2d, 0}},
- {5104, {gl, evalCoord2f, 0}},
- {5105, {gl, evalMesh1, 0}},
- {5106, {gl, evalMesh2, 0}},
- {5107, {gl, evalPoint1, 0}},
- {5108, {gl, evalPoint2, 0}},
- {5109, {gl, feedbackBuffer, 0}},
- {5110, {gl, finish, 0}},
- {5111, {gl, flush, 0}},
- {5112, {gl, fogf, 0}},
- {5113, {gl, fogfv, 0}},
- {5114, {gl, fogi, 0}},
- {5115, {gl, fogiv, 0}},
- {5116, {gl, frontFace, 0}},
- {5117, {gl, frustum, 0}},
- {5118, {gl, genLists, 0}},
- {5119, {gl, genTextures, 0}},
- {5120, {gl, getBooleanv, 0}},
- {5121, {gl, getClipPlane, 0}},
- {5122, {gl, getDoublev, 0}},
- {5123, {gl, getError, 0}},
- {5124, {gl, getFloatv, 0}},
- {5125, {gl, getIntegerv, 0}},
- {5126, {gl, getLightfv, 0}},
- {5127, {gl, getLightiv, 0}},
- {5128, {gl, getMapdv, 0}},
- {5129, {gl, getMapfv, 0}},
- {5130, {gl, getMapiv, 0}},
- {5131, {gl, getMaterialfv, 0}},
- {5132, {gl, getMaterialiv, 0}},
- {5133, {gl, getPixelMapfv, 0}},
- {5134, {gl, getPixelMapuiv, 0}},
- {5135, {gl, getPixelMapusv, 0}},
- {5136, {gl, getPolygonStipple, 0}},
- {5137, {gl, getString, 0}},
- {5138, {gl, getTexEnvfv, 0}},
- {5139, {gl, getTexEnviv, 0}},
- {5140, {gl, getTexGendv, 0}},
- {5141, {gl, getTexGenfv, 0}},
- {5142, {gl, getTexGeniv, 0}},
- {5143, {gl, getTexImage, 0}},
- {5144, {gl, getTexLevelParameterfv, 0}},
- {5145, {gl, getTexLevelParameteriv, 0}},
- {5146, {gl, getTexParameterfv, 0}},
- {5147, {gl, getTexParameteriv, 0}},
- {5148, {gl, hint, 0}},
- {5149, {gl, indexMask, 0}},
- {5150, {gl, indexPointer, 0}},
- {5151, {gl, indexPointer, 0}},
- {5152, {gl, indexd, 0}},
- {5153, {gl, indexf, 0}},
- {5154, {gl, indexi, 0}},
- {5155, {gl, indexs, 0}},
- {5156, {gl, indexub, 0}},
- {5157, {gl, initNames, 0}},
- {5158, {gl, interleavedArrays, 0}},
- {5159, {gl, interleavedArrays, 0}},
- {5160, {gl, isEnabled, 0}},
- {5161, {gl, isList, 0}},
- {5162, {gl, isTexture, 0}},
- {5163, {gl, lightModelf, 0}},
- {5164, {gl, lightModelfv, 0}},
- {5165, {gl, lightModeli, 0}},
- {5166, {gl, lightModeliv, 0}},
- {5167, {gl, lightf, 0}},
- {5168, {gl, lightfv, 0}},
- {5169, {gl, lighti, 0}},
- {5170, {gl, lightiv, 0}},
- {5171, {gl, lineStipple, 0}},
- {5172, {gl, lineWidth, 0}},
- {5173, {gl, listBase, 0}},
- {5174, {gl, loadIdentity, 0}},
- {5175, {gl, loadMatrixd, 0}},
- {5176, {gl, loadMatrixf, 0}},
- {5177, {gl, loadName, 0}},
- {5178, {gl, logicOp, 0}},
- {5179, {gl, map1d, 0}},
- {5180, {gl, map1f, 0}},
- {5181, {gl, map2d, 0}},
- {5182, {gl, map2f, 0}},
- {5183, {gl, mapGrid1d, 0}},
- {5184, {gl, mapGrid1f, 0}},
- {5185, {gl, mapGrid2d, 0}},
- {5186, {gl, mapGrid2f, 0}},
- {5187, {gl, materialf, 0}},
- {5188, {gl, materialfv, 0}},
- {5189, {gl, materiali, 0}},
- {5190, {gl, materialiv, 0}},
- {5191, {gl, matrixMode, 0}},
- {5192, {gl, multMatrixd, 0}},
- {5193, {gl, multMatrixf, 0}},
- {5194, {gl, newList, 0}},
- {5195, {gl, normal3b, 0}},
- {5196, {gl, normal3d, 0}},
- {5197, {gl, normal3f, 0}},
- {5198, {gl, normal3i, 0}},
- {5199, {gl, normal3s, 0}},
- {5200, {gl, normalPointer, 0}},
- {5201, {gl, normalPointer, 0}},
- {5202, {gl, ortho, 0}},
- {5203, {gl, passThrough, 0}},
- {5204, {gl, pixelMapfv, 0}},
- {5205, {gl, pixelMapuiv, 0}},
- {5206, {gl, pixelMapusv, 0}},
- {5207, {gl, pixelStoref, 0}},
- {5208, {gl, pixelStorei, 0}},
- {5209, {gl, pixelTransferf, 0}},
- {5210, {gl, pixelTransferi, 0}},
- {5211, {gl, pixelZoom, 0}},
- {5212, {gl, pointSize, 0}},
- {5213, {gl, polygonMode, 0}},
- {5214, {gl, polygonOffset, 0}},
- {5215, {gl, polygonStipple, 0}},
- {5216, {gl, popAttrib, 0}},
- {5217, {gl, popClientAttrib, 0}},
- {5218, {gl, popMatrix, 0}},
- {5219, {gl, popName, 0}},
- {5220, {gl, prioritizeTextures, 0}},
- {5221, {gl, pushAttrib, 0}},
- {5222, {gl, pushClientAttrib, 0}},
- {5223, {gl, pushMatrix, 0}},
- {5224, {gl, pushName, 0}},
- {5225, {gl, rasterPos2d, 0}},
- {5226, {gl, rasterPos2f, 0}},
- {5227, {gl, rasterPos2i, 0}},
- {5228, {gl, rasterPos2s, 0}},
- {5229, {gl, rasterPos3d, 0}},
- {5230, {gl, rasterPos3f, 0}},
- {5231, {gl, rasterPos3i, 0}},
- {5232, {gl, rasterPos3s, 0}},
- {5233, {gl, rasterPos4d, 0}},
- {5234, {gl, rasterPos4f, 0}},
- {5235, {gl, rasterPos4i, 0}},
- {5236, {gl, rasterPos4s, 0}},
- {5237, {gl, readBuffer, 0}},
- {5238, {gl, readPixels, 0}},
- {5239, {gl, rectd, 0}},
- {5240, {gl, rectdv, 0}},
- {5241, {gl, rectf, 0}},
- {5242, {gl, rectfv, 0}},
- {5243, {gl, recti, 0}},
- {5244, {gl, rectiv, 0}},
- {5245, {gl, rects, 0}},
- {5246, {gl, rectsv, 0}},
- {5247, {gl, renderMode, 0}},
- {5248, {gl, rotated, 0}},
- {5249, {gl, rotatef, 0}},
- {5250, {gl, scaled, 0}},
- {5251, {gl, scalef, 0}},
- {5252, {gl, scissor, 0}},
- {5253, {gl, selectBuffer, 0}},
- {5254, {gl, shadeModel, 0}},
- {5255, {gl, stencilFunc, 0}},
- {5256, {gl, stencilMask, 0}},
- {5257, {gl, stencilOp, 0}},
- {5258, {gl, texCoord1d, 0}},
- {5259, {gl, texCoord1f, 0}},
- {5260, {gl, texCoord1i, 0}},
- {5261, {gl, texCoord1s, 0}},
- {5262, {gl, texCoord2d, 0}},
- {5263, {gl, texCoord2f, 0}},
- {5264, {gl, texCoord2i, 0}},
- {5265, {gl, texCoord2s, 0}},
- {5266, {gl, texCoord3d, 0}},
- {5267, {gl, texCoord3f, 0}},
- {5268, {gl, texCoord3i, 0}},
- {5269, {gl, texCoord3s, 0}},
- {5270, {gl, texCoord4d, 0}},
- {5271, {gl, texCoord4f, 0}},
- {5272, {gl, texCoord4i, 0}},
- {5273, {gl, texCoord4s, 0}},
- {5274, {gl, texCoordPointer, 0}},
- {5275, {gl, texCoordPointer, 0}},
- {5276, {gl, texEnvf, 0}},
- {5277, {gl, texEnvfv, 0}},
- {5278, {gl, texEnvi, 0}},
- {5279, {gl, texEnviv, 0}},
- {5280, {gl, texGend, 0}},
- {5281, {gl, texGendv, 0}},
- {5282, {gl, texGenf, 0}},
- {5283, {gl, texGenfv, 0}},
- {5284, {gl, texGeni, 0}},
- {5285, {gl, texGeniv, 0}},
- {5286, {gl, texImage1D, 0}},
- {5287, {gl, texImage1D, 0}},
- {5288, {gl, texImage2D, 0}},
- {5289, {gl, texImage2D, 0}},
- {5290, {gl, texParameterf, 0}},
- {5291, {gl, texParameterfv, 0}},
- {5292, {gl, texParameteri, 0}},
- {5293, {gl, texParameteriv, 0}},
- {5294, {gl, texSubImage1D, 0}},
- {5295, {gl, texSubImage1D, 0}},
- {5296, {gl, texSubImage2D, 0}},
- {5297, {gl, texSubImage2D, 0}},
- {5298, {gl, translated, 0}},
- {5299, {gl, translatef, 0}},
- {5300, {gl, vertex2d, 0}},
- {5301, {gl, vertex2f, 0}},
- {5302, {gl, vertex2i, 0}},
- {5303, {gl, vertex2s, 0}},
- {5304, {gl, vertex3d, 0}},
- {5305, {gl, vertex3f, 0}},
- {5306, {gl, vertex3i, 0}},
- {5307, {gl, vertex3s, 0}},
- {5308, {gl, vertex4d, 0}},
- {5309, {gl, vertex4f, 0}},
- {5310, {gl, vertex4i, 0}},
- {5311, {gl, vertex4s, 0}},
- {5312, {gl, vertexPointer, 0}},
- {5313, {gl, vertexPointer, 0}},
- {5314, {gl, viewport, 0}},
- {5315, {gl, blendColor, 0}},
- {5316, {gl, blendEquation, 0}},
- {5317, {gl, drawRangeElements, 0}},
- {5318, {gl, drawRangeElements, 0}},
- {5319, {gl, texImage3D, 0}},
- {5320, {gl, texImage3D, 0}},
- {5321, {gl, texSubImage3D, 0}},
- {5322, {gl, texSubImage3D, 0}},
- {5323, {gl, copyTexSubImage3D, 0}},
- {5324, {gl, colorTable, 0}},
- {5325, {gl, colorTable, 0}},
- {5326, {gl, colorTableParameterfv, 0}},
- {5327, {gl, colorTableParameteriv, 0}},
- {5328, {gl, copyColorTable, 0}},
- {5329, {gl, getColorTable, 0}},
- {5330, {gl, getColorTableParameterfv, 0}},
- {5331, {gl, getColorTableParameteriv, 0}},
- {5332, {gl, colorSubTable, 0}},
- {5333, {gl, colorSubTable, 0}},
- {5334, {gl, copyColorSubTable, 0}},
- {5335, {gl, convolutionFilter1D, 0}},
- {5336, {gl, convolutionFilter1D, 0}},
- {5337, {gl, convolutionFilter2D, 0}},
- {5338, {gl, convolutionFilter2D, 0}},
- {5339, {gl, convolutionParameterf, 0}},
- {5340, {gl, convolutionParameteri, 0}},
- {5341, {gl, copyConvolutionFilter1D, 0}},
- {5342, {gl, copyConvolutionFilter2D, 0}},
- {5343, {gl, getConvolutionFilter, 0}},
- {5344, {gl, getConvolutionParameterfv, 0}},
- {5345, {gl, getConvolutionParameteriv, 0}},
- {5346, {gl, separableFilter2D, 0}},
- {5347, {gl, separableFilter2D, 0}},
- {5348, {gl, getHistogram, 0}},
- {5349, {gl, getHistogramParameterfv, 0}},
- {5350, {gl, getHistogramParameteriv, 0}},
- {5351, {gl, getMinmax, 0}},
- {5352, {gl, getMinmaxParameterfv, 0}},
- {5353, {gl, getMinmaxParameteriv, 0}},
- {5354, {gl, histogram, 0}},
- {5355, {gl, minmax, 0}},
- {5356, {gl, resetHistogram, 0}},
- {5357, {gl, resetMinmax, 0}},
- {5358, {gl, activeTexture, 0}},
- {5359, {gl, sampleCoverage, 0}},
- {5360, {gl, compressedTexImage3D, 0}},
- {5361, {gl, compressedTexImage3D, 0}},
- {5362, {gl, compressedTexImage2D, 0}},
- {5363, {gl, compressedTexImage2D, 0}},
- {5364, {gl, compressedTexImage1D, 0}},
- {5365, {gl, compressedTexImage1D, 0}},
- {5366, {gl, compressedTexSubImage3D, 0}},
- {5367, {gl, compressedTexSubImage3D, 0}},
- {5368, {gl, compressedTexSubImage2D, 0}},
- {5369, {gl, compressedTexSubImage2D, 0}},
- {5370, {gl, compressedTexSubImage1D, 0}},
- {5371, {gl, compressedTexSubImage1D, 0}},
- {5372, {gl, getCompressedTexImage, 0}},
- {5373, {gl, clientActiveTexture, 0}},
- {5374, {gl, multiTexCoord1d, 0}},
- {5375, {gl, multiTexCoord1f, 0}},
- {5376, {gl, multiTexCoord1i, 0}},
- {5377, {gl, multiTexCoord1s, 0}},
- {5378, {gl, multiTexCoord2d, 0}},
- {5379, {gl, multiTexCoord2f, 0}},
- {5380, {gl, multiTexCoord2i, 0}},
- {5381, {gl, multiTexCoord2s, 0}},
- {5382, {gl, multiTexCoord3d, 0}},
- {5383, {gl, multiTexCoord3f, 0}},
- {5384, {gl, multiTexCoord3i, 0}},
- {5385, {gl, multiTexCoord3s, 0}},
- {5386, {gl, multiTexCoord4d, 0}},
- {5387, {gl, multiTexCoord4f, 0}},
- {5388, {gl, multiTexCoord4i, 0}},
- {5389, {gl, multiTexCoord4s, 0}},
- {5390, {gl, loadTransposeMatrixf, 0}},
- {5391, {gl, loadTransposeMatrixd, 0}},
- {5392, {gl, multTransposeMatrixf, 0}},
- {5393, {gl, multTransposeMatrixd, 0}},
- {5394, {gl, blendFuncSeparate, 0}},
- {5395, {gl, multiDrawArrays, 0}},
- {5396, {gl, pointParameterf, 0}},
- {5397, {gl, pointParameterfv, 0}},
- {5398, {gl, pointParameteri, 0}},
- {5399, {gl, pointParameteriv, 0}},
- {5400, {gl, fogCoordf, 0}},
- {5401, {gl, fogCoordd, 0}},
- {5402, {gl, fogCoordPointer, 0}},
- {5403, {gl, fogCoordPointer, 0}},
- {5404, {gl, secondaryColor3b, 0}},
- {5405, {gl, secondaryColor3d, 0}},
- {5406, {gl, secondaryColor3f, 0}},
- {5407, {gl, secondaryColor3i, 0}},
- {5408, {gl, secondaryColor3s, 0}},
- {5409, {gl, secondaryColor3ub, 0}},
- {5410, {gl, secondaryColor3ui, 0}},
- {5411, {gl, secondaryColor3us, 0}},
- {5412, {gl, secondaryColorPointer, 0}},
- {5413, {gl, secondaryColorPointer, 0}},
- {5414, {gl, windowPos2d, 0}},
- {5415, {gl, windowPos2f, 0}},
- {5416, {gl, windowPos2i, 0}},
- {5417, {gl, windowPos2s, 0}},
- {5418, {gl, windowPos3d, 0}},
- {5419, {gl, windowPos3f, 0}},
- {5420, {gl, windowPos3i, 0}},
- {5421, {gl, windowPos3s, 0}},
- {5422, {gl, genQueries, 0}},
- {5423, {gl, deleteQueries, 0}},
- {5424, {gl, isQuery, 0}},
- {5425, {gl, beginQuery, 0}},
- {5426, {gl, endQuery, 0}},
- {5427, {gl, getQueryiv, 0}},
- {5428, {gl, getQueryObjectiv, 0}},
- {5429, {gl, getQueryObjectuiv, 0}},
- {5430, {gl, bindBuffer, 0}},
- {5431, {gl, deleteBuffers, 0}},
- {5432, {gl, genBuffers, 0}},
- {5433, {gl, isBuffer, 0}},
- {5434, {gl, bufferData, 0}},
- {5435, {gl, bufferData, 0}},
- {5436, {gl, bufferSubData, 0}},
- {5437, {gl, bufferSubData, 0}},
- {5438, {gl, getBufferSubData, 0}},
- {5439, {gl, getBufferParameteriv, 0}},
- {5440, {gl, blendEquationSeparate, 0}},
- {5441, {gl, drawBuffers, 0}},
- {5442, {gl, stencilOpSeparate, 0}},
- {5443, {gl, stencilFuncSeparate, 0}},
- {5444, {gl, stencilMaskSeparate, 0}},
- {5445, {gl, attachShader, 0}},
- {5446, {gl, bindAttribLocation, 0}},
- {5447, {gl, compileShader, 0}},
- {5448, {gl, createProgram, 0}},
- {5449, {gl, createShader, 0}},
- {5450, {gl, deleteProgram, 0}},
- {5451, {gl, deleteShader, 0}},
- {5452, {gl, detachShader, 0}},
- {5453, {gl, disableVertexAttribArray, 0}},
- {5454, {gl, enableVertexAttribArray, 0}},
- {5455, {gl, getActiveAttrib, 0}},
- {5456, {gl, getActiveUniform, 0}},
- {5457, {gl, getAttachedShaders, 0}},
- {5458, {gl, getAttribLocation, 0}},
- {5459, {gl, getProgramiv, 0}},
- {5460, {gl, getProgramInfoLog, 0}},
- {5461, {gl, getShaderiv, 0}},
- {5462, {gl, getShaderInfoLog, 0}},
- {5463, {gl, getShaderSource, 0}},
- {5464, {gl, getUniformLocation, 0}},
- {5465, {gl, getUniformfv, 0}},
- {5466, {gl, getUniformiv, 0}},
- {5467, {gl, getVertexAttribdv, 0}},
- {5468, {gl, getVertexAttribfv, 0}},
- {5469, {gl, getVertexAttribiv, 0}},
- {5470, {gl, isProgram, 0}},
- {5471, {gl, isShader, 0}},
- {5472, {gl, linkProgram, 0}},
- {5473, {gl, shaderSource, 0}},
- {5474, {gl, useProgram, 0}},
- {5475, {gl, uniform1f, 0}},
- {5476, {gl, uniform2f, 0}},
- {5477, {gl, uniform3f, 0}},
- {5478, {gl, uniform4f, 0}},
- {5479, {gl, uniform1i, 0}},
- {5480, {gl, uniform2i, 0}},
- {5481, {gl, uniform3i, 0}},
- {5482, {gl, uniform4i, 0}},
- {5483, {gl, uniform1fv, 0}},
- {5484, {gl, uniform2fv, 0}},
- {5485, {gl, uniform3fv, 0}},
- {5486, {gl, uniform4fv, 0}},
- {5487, {gl, uniform1iv, 0}},
- {5488, {gl, uniform2iv, 0}},
- {5489, {gl, uniform3iv, 0}},
- {5490, {gl, uniform4iv, 0}},
- {5491, {gl, uniformMatrix2fv, 0}},
- {5492, {gl, uniformMatrix3fv, 0}},
- {5493, {gl, uniformMatrix4fv, 0}},
- {5494, {gl, validateProgram, 0}},
- {5495, {gl, vertexAttrib1d, 0}},
- {5496, {gl, vertexAttrib1f, 0}},
- {5497, {gl, vertexAttrib1s, 0}},
- {5498, {gl, vertexAttrib2d, 0}},
- {5499, {gl, vertexAttrib2f, 0}},
- {5500, {gl, vertexAttrib2s, 0}},
- {5501, {gl, vertexAttrib3d, 0}},
- {5502, {gl, vertexAttrib3f, 0}},
- {5503, {gl, vertexAttrib3s, 0}},
- {5504, {gl, vertexAttrib4Nbv, 0}},
- {5505, {gl, vertexAttrib4Niv, 0}},
- {5506, {gl, vertexAttrib4Nsv, 0}},
- {5507, {gl, vertexAttrib4Nub, 0}},
- {5508, {gl, vertexAttrib4Nuiv, 0}},
- {5509, {gl, vertexAttrib4Nusv, 0}},
- {5510, {gl, vertexAttrib4bv, 0}},
- {5511, {gl, vertexAttrib4d, 0}},
- {5512, {gl, vertexAttrib4f, 0}},
- {5513, {gl, vertexAttrib4iv, 0}},
- {5514, {gl, vertexAttrib4s, 0}},
- {5515, {gl, vertexAttrib4ubv, 0}},
- {5516, {gl, vertexAttrib4uiv, 0}},
- {5517, {gl, vertexAttrib4usv, 0}},
- {5518, {gl, vertexAttribPointer, 0}},
- {5519, {gl, vertexAttribPointer, 0}},
- {5520, {gl, uniformMatrix2x3fv, 0}},
- {5521, {gl, uniformMatrix3x2fv, 0}},
- {5522, {gl, uniformMatrix2x4fv, 0}},
- {5523, {gl, uniformMatrix4x2fv, 0}},
- {5524, {gl, uniformMatrix3x4fv, 0}},
- {5525, {gl, uniformMatrix4x3fv, 0}},
- {5526, {gl, colorMaski, 0}},
- {5527, {gl, getBooleani_v, 0}},
- {5528, {gl, getIntegeri_v, 0}},
- {5529, {gl, enablei, 0}},
- {5530, {gl, disablei, 0}},
- {5531, {gl, isEnabledi, 0}},
- {5532, {gl, beginTransformFeedback, 0}},
- {5533, {gl, endTransformFeedback, 0}},
- {5534, {gl, bindBufferRange, 0}},
- {5535, {gl, bindBufferBase, 0}},
- {5536, {gl, transformFeedbackVaryings, 0}},
- {5537, {gl, getTransformFeedbackVarying, 0}},
- {5538, {gl, clampColor, 0}},
- {5539, {gl, beginConditionalRender, 0}},
- {5540, {gl, endConditionalRender, 0}},
- {5541, {gl, vertexAttribIPointer, 0}},
- {5542, {gl, vertexAttribIPointer, 0}},
- {5543, {gl, getVertexAttribIiv, 0}},
- {5544, {gl, getVertexAttribIuiv, 0}},
- {5545, {gl, getUniformuiv, 0}},
- {5546, {gl, bindFragDataLocation, 0}},
- {5547, {gl, getFragDataLocation, 0}},
- {5548, {gl, uniform1ui, 0}},
- {5549, {gl, uniform2ui, 0}},
- {5550, {gl, uniform3ui, 0}},
- {5551, {gl, uniform4ui, 0}},
- {5552, {gl, uniform1uiv, 0}},
- {5553, {gl, uniform2uiv, 0}},
- {5554, {gl, uniform3uiv, 0}},
- {5555, {gl, uniform4uiv, 0}},
- {5556, {gl, texParameterIiv, 0}},
- {5557, {gl, texParameterIuiv, 0}},
- {5558, {gl, getTexParameterIiv, 0}},
- {5559, {gl, getTexParameterIuiv, 0}},
- {5560, {gl, clearBufferiv, 0}},
- {5561, {gl, clearBufferuiv, 0}},
- {5562, {gl, clearBufferfv, 0}},
- {5563, {gl, clearBufferfi, 0}},
- {5564, {gl, getStringi, 0}},
- {5565, {gl, vertexAttribI1i, 0}},
- {5566, {gl, vertexAttribI2i, 0}},
- {5567, {gl, vertexAttribI3i, 0}},
- {5568, {gl, vertexAttribI4i, 0}},
- {5569, {gl, vertexAttribI1ui, 0}},
- {5570, {gl, vertexAttribI2ui, 0}},
- {5571, {gl, vertexAttribI3ui, 0}},
- {5572, {gl, vertexAttribI4ui, 0}},
- {5573, {gl, vertexAttribI4bv, 0}},
- {5574, {gl, vertexAttribI4sv, 0}},
- {5575, {gl, vertexAttribI4ubv, 0}},
- {5576, {gl, vertexAttribI4usv, 0}},
- {5577, {gl, drawArraysInstanced, 0}},
- {5578, {gl, drawElementsInstanced, 0}},
- {5579, {gl, drawElementsInstanced, 0}},
- {5580, {gl, texBuffer, 0}},
- {5581, {gl, primitiveRestartIndex, 0}},
- {5582, {gl, loadTransposeMatrixfARB, 0}},
- {5583, {gl, loadTransposeMatrixdARB, 0}},
- {5584, {gl, multTransposeMatrixfARB, 0}},
- {5585, {gl, multTransposeMatrixdARB, 0}},
- {5586, {gl, weightbvARB, 0}},
- {5587, {gl, weightsvARB, 0}},
- {5588, {gl, weightivARB, 0}},
- {5589, {gl, weightfvARB, 0}},
- {5590, {gl, weightdvARB, 0}},
- {5591, {gl, weightubvARB, 0}},
- {5592, {gl, weightusvARB, 0}},
- {5593, {gl, weightuivARB, 0}},
- {5594, {gl, vertexBlendARB, 0}},
- {5595, {gl, currentPaletteMatrixARB, 0}},
- {5596, {gl, matrixIndexubvARB, 0}},
- {5597, {gl, matrixIndexusvARB, 0}},
- {5598, {gl, matrixIndexuivARB, 0}},
- {5599, {gl, programStringARB, 0}},
- {5600, {gl, bindProgramARB, 0}},
- {5601, {gl, deleteProgramsARB, 0}},
- {5602, {gl, genProgramsARB, 0}},
- {5603, {gl, programEnvParameter4dARB, 0}},
- {5604, {gl, programEnvParameter4dvARB, 0}},
- {5605, {gl, programEnvParameter4fARB, 0}},
- {5606, {gl, programEnvParameter4fvARB, 0}},
- {5607, {gl, programLocalParameter4dARB, 0}},
- {5608, {gl, programLocalParameter4dvARB, 0}},
- {5609, {gl, programLocalParameter4fARB, 0}},
- {5610, {gl, programLocalParameter4fvARB, 0}},
- {5611, {gl, getProgramEnvParameterdvARB, 0}},
- {5612, {gl, getProgramEnvParameterfvARB, 0}},
- {5613, {gl, getProgramLocalParameterdvARB, 0}},
- {5614, {gl, getProgramLocalParameterfvARB, 0}},
- {5615, {gl, getProgramStringARB, 0}},
- {5616, {gl, deleteObjectARB, 0}},
- {5617, {gl, getHandleARB, 0}},
- {5618, {gl, detachObjectARB, 0}},
- {5619, {gl, createShaderObjectARB, 0}},
- {5620, {gl, shaderSourceARB, 0}},
- {5621, {gl, compileShaderARB, 0}},
- {5622, {gl, createProgramObjectARB, 0}},
- {5623, {gl, attachObjectARB, 0}},
- {5624, {gl, linkProgramARB, 0}},
- {5625, {gl, useProgramObjectARB, 0}},
- {5626, {gl, validateProgramARB, 0}},
- {5627, {gl, getObjectParameterfvARB, 0}},
- {5628, {gl, getObjectParameterivARB, 0}},
- {5629, {gl, getInfoLogARB, 0}},
- {5630, {gl, getAttachedObjectsARB, 0}},
- {5631, {gl, getUniformLocationARB, 0}},
- {5632, {gl, getActiveUniformARB, 0}},
- {5633, {gl, getUniformfvARB, 0}},
- {5634, {gl, getUniformivARB, 0}},
- {5635, {gl, getShaderSourceARB, 0}},
- {5636, {gl, bindAttribLocationARB, 0}},
- {5637, {gl, getActiveAttribARB, 0}},
- {5638, {gl, getAttribLocationARB, 0}},
- {5639, {gl, isRenderbuffer, 0}},
- {5640, {gl, bindRenderbuffer, 0}},
- {5641, {gl, deleteRenderbuffers, 0}},
- {5642, {gl, genRenderbuffers, 0}},
- {5643, {gl, renderbufferStorage, 0}},
- {5644, {gl, getRenderbufferParameteriv, 0}},
- {5645, {gl, isFramebuffer, 0}},
- {5646, {gl, bindFramebuffer, 0}},
- {5647, {gl, deleteFramebuffers, 0}},
- {5648, {gl, genFramebuffers, 0}},
- {5649, {gl, checkFramebufferStatus, 0}},
- {5650, {gl, framebufferTexture1D, 0}},
- {5651, {gl, framebufferTexture2D, 0}},
- {5652, {gl, framebufferTexture3D, 0}},
- {5653, {gl, framebufferRenderbuffer, 0}},
- {5654, {gl, getFramebufferAttachmentParameteriv, 0}},
- {5655, {gl, generateMipmap, 0}},
- {5656, {gl, blitFramebuffer, 0}},
- {5657, {gl, renderbufferStorageMultisample, 0}},
- {5658, {gl, framebufferTextureLayer, 0}},
- {5659, {gl, programParameteriARB, 0}},
- {5660, {gl, framebufferTextureARB, 0}},
- {5661, {gl, framebufferTextureFaceARB, 0}},
- {5662, {gl, vertexAttribDivisorARB, 0}},
- {5663, {gl, flushMappedBufferRange, 0}},
- {5664, {gl, bindVertexArray, 0}},
- {5665, {gl, deleteVertexArrays, 0}},
- {5666, {gl, genVertexArrays, 0}},
- {5667, {gl, isVertexArray, 0}},
- {5668, {gl, getUniformIndices, 0}},
- {5669, {gl, getActiveUniformsiv, 0}},
- {5670, {gl, getActiveUniformName, 0}},
- {5671, {gl, getUniformBlockIndex, 0}},
- {5672, {gl, getActiveUniformBlockiv, 0}},
- {5673, {gl, getActiveUniformBlockName, 0}},
- {5674, {gl, uniformBlockBinding, 0}},
- {5675, {gl, copyBufferSubData, 0}},
- {5676, {gl, resizeBuffersMESA, 0}},
- {5677, {gl, windowPos4dMESA, 0}},
- {5678, {gl, windowPos4fMESA, 0}},
- {5679, {gl, windowPos4iMESA, 0}},
- {5680, {gl, windowPos4sMESA, 0}},
- {5681, {gl, depthBoundsEXT, 0}},
- {5682, {gl, stencilClearTagEXT, 0}},
- {5010, {glu, build1DMipmapLevels, 0}},
- {5011, {glu, build1DMipmaps, 0}},
- {5012, {glu, build2DMipmapLevels, 0}},
- {5013, {glu, build2DMipmaps, 0}},
- {5014, {glu, build3DMipmapLevels, 0}},
- {5015, {glu, build3DMipmaps, 0}},
- {5016, {glu, checkExtension, 0}},
- {5017, {glu, cylinder, 0}},
- {5018, {glu, deleteQuadric, 0}},
- {5019, {glu, disk, 0}},
- {5020, {glu, errorString, 0}},
- {5021, {glu, getString, 0}},
- {5022, {glu, lookAt, 0}},
- {5023, {glu, newQuadric, 0}},
- {5024, {glu, ortho2D, 0}},
- {5025, {glu, partialDisk, 0}},
- {5026, {glu, perspective, 0}},
- {5027, {glu, pickMatrix, 0}},
- {5028, {glu, project, 0}},
- {5029, {glu, quadricDrawStyle, 0}},
- {5030, {glu, quadricNormals, 0}},
- {5031, {glu, quadricOrientation, 0}},
- {5032, {glu, quadricTexture, 0}},
- {5033, {glu, scaleImage, 0}},
- {5034, {glu, sphere, 0}},
- {5035, {glu, unProject, 0}},
- {5036, {glu, unProject4, 0}},
- {-1, {mod, func, -1}}
-].
-
diff --git a/lib/wx/src/gen/glu.erl b/lib/wx/src/gen/glu.erl
index d410c4663d..c16f0cf125 100644
--- a/lib/wx/src/gen/glu.erl
+++ b/lib/wx/src/gen/glu.erl
@@ -25,14 +25,13 @@
 %%
 %% Booleans are represented by integers 0 and 1.
 
-%% @type wx_mem(). see wx.erl on memory allocation functions
+%% @type mem().    memory block
 %% @type enum().   An integer defined in gl.hrl
 %% @type offset(). An integer which is an offset in an array
 %% @type clamp().  A float clamped between 0.0 - 1.0
 
 -module(glu).
 -compile(inline).
--include("wxe.hrl").
 -define(GLenum,32/native-unsigned).
 -define(GLboolean,8/native-unsigned).
 -define(GLbitfield,32/native-unsigned).
@@ -51,6 +50,11 @@
 -define(GLintptr,64/native-unsigned).
 -define(GLUquadric,64/native-unsigned).
 -define(GLhandleARB,64/native-unsigned).
+-define(GLsync,64/native-unsigned).
+-define(GLuint64,64/native-unsigned).
+-define(GLint64,64/native-signed).
+-type enum() :: non_neg_integer().
+-type mem() :: binary() | tuple().
 
 -export([tesselate/2,build1DMipmapLevels/9,build1DMipmaps/6,build2DMipmapLevels/10,
   build2DMipmaps/7,build3DMipmapLevels/11,build3DMipmaps/8,checkExtension/2,
@@ -59,7 +63,7 @@
   quadricDrawStyle/2,quadricNormals/2,quadricOrientation/2,quadricTexture/2,
   scaleImage/9,sphere/4,unProject/6,unProject4/9]).
 
-
+-import(gl, [call/2,cast/2,send_bin/1]).
 %% API
 
 %% @spec (Vec3, [Vec3]) -> {Triangles, VertexPos}
@@ -73,159 +77,184 @@
 %% vertex positions, it starts with the vertices in Vs and
 %% may contain newly created vertices in the end.
 tesselate({Nx,Ny,Nz}, Vs) ->
-  wxe_util:call(5000, <<(length(Vs)):32/native,0:32,
+  call(5000, <<(length(Vs)):32/native,0:32,
     Nx:?GLdouble,Ny:?GLdouble,Nz:?GLdouble,
     (<< <<Vx:?GLdouble,Vy:?GLdouble,Vz:?GLdouble >>
         || {Vx,Vy,Vz} <- Vs>>)/binary >>).
 
 %% @spec (Target::enum(),InternalFormat::integer(),Width::integer(),Format::enum(),Type::enum(),Level::integer(),Base::integer(),Max::integer(),Data::binary()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluBuild1DMipmapLevels.xml">external</a> documentation.
+-spec build1DMipmapLevels(enum(),integer(),integer(),enum(),enum(),integer(),integer(),integer(),binary()) -> integer().
 build1DMipmapLevels(Target,InternalFormat,Width,Format,Type,Level,Base,Max,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:call(5010, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Format:?GLenum,Type:?GLenum,Level:?GLint,Base:?GLint,Max:?GLint>>).
+  send_bin(Data),
+  call(5010, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Format:?GLenum,Type:?GLenum,Level:?GLint,Base:?GLint,Max:?GLint>>).
 
 %% @spec (Target::enum(),InternalFormat::integer(),Width::integer(),Format::enum(),Type::enum(),Data::binary()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluBuild1DMipmaps.xml">external</a> documentation.
+-spec build1DMipmaps(enum(),integer(),integer(),enum(),enum(),binary()) -> integer().
 build1DMipmaps(Target,InternalFormat,Width,Format,Type,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:call(5011, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Data),
+  call(5011, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (Target::enum(),InternalFormat::integer(),Width::integer(),Height::integer(),Format::enum(),Type::enum(),Level::integer(),Base::integer(),Max::integer(),Data::binary()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluBuild2DMipmapLevels.xml">external</a> documentation.
+-spec build2DMipmapLevels(enum(),integer(),integer(),integer(),enum(),enum(),integer(),integer(),integer(),binary()) -> integer().
 build2DMipmapLevels(Target,InternalFormat,Width,Height,Format,Type,Level,Base,Max,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:call(5012, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum,Level:?GLint,Base:?GLint,Max:?GLint>>).
+  send_bin(Data),
+  call(5012, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum,Level:?GLint,Base:?GLint,Max:?GLint>>).
 
 %% @spec (Target::enum(),InternalFormat::integer(),Width::integer(),Height::integer(),Format::enum(),Type::enum(),Data::binary()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluBuild2DMipmaps.xml">external</a> documentation.
+-spec build2DMipmaps(enum(),integer(),integer(),integer(),enum(),enum(),binary()) -> integer().
 build2DMipmaps(Target,InternalFormat,Width,Height,Format,Type,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:call(5013, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Data),
+  call(5013, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Height:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
 %% @spec (Target::enum(),InternalFormat::integer(),Width::integer(),Height::integer(),Depth::integer(),Format::enum(),Type::enum(),Level::integer(),Base::integer(),Max::integer(),Data::binary()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluBuild3DMipmapLevels.xml">external</a> documentation.
+-spec build3DMipmapLevels(enum(),integer(),integer(),integer(),integer(),enum(),enum(),integer(),integer(),integer(),binary()) -> integer().
 build3DMipmapLevels(Target,InternalFormat,Width,Height,Depth,Format,Type,Level,Base,Max,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:call(5014, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,Type:?GLenum,Level:?GLint,Base:?GLint,Max:?GLint>>).
+  send_bin(Data),
+  call(5014, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,Type:?GLenum,Level:?GLint,Base:?GLint,Max:?GLint>>).
 
 %% @spec (Target::enum(),InternalFormat::integer(),Width::integer(),Height::integer(),Depth::integer(),Format::enum(),Type::enum(),Data::binary()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluBuild3DMipmaps.xml">external</a> documentation.
+-spec build3DMipmaps(enum(),integer(),integer(),integer(),integer(),enum(),enum(),binary()) -> integer().
 build3DMipmaps(Target,InternalFormat,Width,Height,Depth,Format,Type,Data) ->
-  wxe_util:send_bin(Data),
-  wxe_util:call(5015, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,Type:?GLenum>>).
+  send_bin(Data),
+  call(5015, <<Target:?GLenum,InternalFormat:?GLint,Width:?GLsizei,Height:?GLsizei,Depth:?GLsizei,Format:?GLenum,Type:?GLenum>>).
 
-%% @spec (ExtName::[integer()],ExtString::[integer()]) -> 0|1
+%% @spec (ExtName::string(),ExtString::string()) -> 0|1
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluCheckExtension.xml">external</a> documentation.
+-spec checkExtension(string(),string()) -> 0|1.
 checkExtension(ExtName,ExtString) ->
-  wxe_util:call(5016, <<(length(ExtName)):?GLuint,
-        (<< <<C:?GLubyte>> || C <- ExtName>>)/binary,0:((8-((length(ExtName)+ 4) rem 8)) rem 8),(length(ExtString)):?GLuint,
-        (<< <<C:?GLubyte>> || C <- ExtString>>)/binary,0:((8-((length(ExtString)+ 4) rem 8)) rem 8)>>).
+  call(5016, <<(list_to_binary([ExtName|[0]]))/binary,0:((8-((length(ExtName)+ 1) rem 8)) rem 8),(list_to_binary([ExtString|[0]]))/binary,0:((8-((length(ExtString)+ 1) rem 8)) rem 8)>>).
 
 %% @spec (Quad::integer(),Base::float(),Top::float(),Height::float(),Slices::integer(),Stacks::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluCylinder.xml">external</a> documentation.
+-spec cylinder(integer(),float(),float(),float(),integer(),integer()) -> ok.
 cylinder(Quad,Base,Top,Height,Slices,Stacks) ->
-  wxe_util:cast(5017, <<Quad:?GLUquadric,Base:?GLdouble,Top:?GLdouble,Height:?GLdouble,Slices:?GLint,Stacks:?GLint>>).
+  cast(5017, <<Quad:?GLUquadric,Base:?GLdouble,Top:?GLdouble,Height:?GLdouble,Slices:?GLint,Stacks:?GLint>>).
 
 %% @spec (Quad::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluDeleteQuadric.xml">external</a> documentation.
+-spec deleteQuadric(integer()) -> ok.
 deleteQuadric(Quad) ->
-  wxe_util:cast(5018, <<Quad:?GLUquadric>>).
+  cast(5018, <<Quad:?GLUquadric>>).
 
 %% @spec (Quad::integer(),Inner::float(),Outer::float(),Slices::integer(),Loops::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluDisk.xml">external</a> documentation.
+-spec disk(integer(),float(),float(),integer(),integer()) -> ok.
 disk(Quad,Inner,Outer,Slices,Loops) ->
-  wxe_util:cast(5019, <<Quad:?GLUquadric,Inner:?GLdouble,Outer:?GLdouble,Slices:?GLint,Loops:?GLint>>).
+  cast(5019, <<Quad:?GLUquadric,Inner:?GLdouble,Outer:?GLdouble,Slices:?GLint,Loops:?GLint>>).
 
 %% @spec (Error::enum()) -> string()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluErrorString.xml">external</a> documentation.
+-spec errorString(enum()) -> string().
 errorString(Error) ->
-  wxe_util:call(5020, <<Error:?GLenum>>).
+  call(5020, <<Error:?GLenum>>).
 
 %% @spec (Name::enum()) -> string()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluGetString.xml">external</a> documentation.
+-spec getString(enum()) -> string().
 getString(Name) ->
-  wxe_util:call(5021, <<Name:?GLenum>>).
+  call(5021, <<Name:?GLenum>>).
 
 %% @spec (EyeX::float(),EyeY::float(),EyeZ::float(),CenterX::float(),CenterY::float(),CenterZ::float(),UpX::float(),UpY::float(),UpZ::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluLookAt.xml">external</a> documentation.
+-spec lookAt(float(),float(),float(),float(),float(),float(),float(),float(),float()) -> ok.
 lookAt(EyeX,EyeY,EyeZ,CenterX,CenterY,CenterZ,UpX,UpY,UpZ) ->
-  wxe_util:cast(5022, <<EyeX:?GLdouble,EyeY:?GLdouble,EyeZ:?GLdouble,CenterX:?GLdouble,CenterY:?GLdouble,CenterZ:?GLdouble,UpX:?GLdouble,UpY:?GLdouble,UpZ:?GLdouble>>).
+  cast(5022, <<EyeX:?GLdouble,EyeY:?GLdouble,EyeZ:?GLdouble,CenterX:?GLdouble,CenterY:?GLdouble,CenterZ:?GLdouble,UpX:?GLdouble,UpY:?GLdouble,UpZ:?GLdouble>>).
 
 %% @spec () -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluNewQuadric.xml">external</a> documentation.
+-spec newQuadric() -> integer().
 newQuadric() ->
-  wxe_util:call(5023, <<>>).
+  call(5023, <<>>).
 
 %% @spec (Left::float(),Right::float(),Bottom::float(),Top::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluOrtho2D.xml">external</a> documentation.
+-spec ortho2D(float(),float(),float(),float()) -> ok.
 ortho2D(Left,Right,Bottom,Top) ->
-  wxe_util:cast(5024, <<Left:?GLdouble,Right:?GLdouble,Bottom:?GLdouble,Top:?GLdouble>>).
+  cast(5024, <<Left:?GLdouble,Right:?GLdouble,Bottom:?GLdouble,Top:?GLdouble>>).
 
 %% @spec (Quad::integer(),Inner::float(),Outer::float(),Slices::integer(),Loops::integer(),Start::float(),Sweep::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluPartialDisk.xml">external</a> documentation.
+-spec partialDisk(integer(),float(),float(),integer(),integer(),float(),float()) -> ok.
 partialDisk(Quad,Inner,Outer,Slices,Loops,Start,Sweep) ->
-  wxe_util:cast(5025, <<Quad:?GLUquadric,Inner:?GLdouble,Outer:?GLdouble,Slices:?GLint,Loops:?GLint,Start:?GLdouble,Sweep:?GLdouble>>).
+  cast(5025, <<Quad:?GLUquadric,Inner:?GLdouble,Outer:?GLdouble,Slices:?GLint,Loops:?GLint,Start:?GLdouble,Sweep:?GLdouble>>).
 
 %% @spec (Fovy::float(),Aspect::float(),ZNear::float(),ZFar::float()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluPerspective.xml">external</a> documentation.
+-spec perspective(float(),float(),float(),float()) -> ok.
 perspective(Fovy,Aspect,ZNear,ZFar) ->
-  wxe_util:cast(5026, <<Fovy:?GLdouble,Aspect:?GLdouble,ZNear:?GLdouble,ZFar:?GLdouble>>).
+  cast(5026, <<Fovy:?GLdouble,Aspect:?GLdouble,ZNear:?GLdouble,ZFar:?GLdouble>>).
 
-%% @spec (X::float(),Y::float(),DelX::float(),DelY::float(),Viewport::{integer()}) -> ok
+%% @spec (X::float(),Y::float(),DelX::float(),DelY::float(),Viewport::{integer(),integer(),integer(),integer()}) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluPickMatrix.xml">external</a> documentation.
+-spec pickMatrix(float(),float(),float(),float(),{integer(),integer(),integer(),integer()}) -> ok.
 pickMatrix(X,Y,DelX,DelY,{V1,V2,V3,V4}) ->
-  wxe_util:cast(5027, <<X:?GLdouble,Y:?GLdouble,DelX:?GLdouble,DelY:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>).
+  cast(5027, <<X:?GLdouble,Y:?GLdouble,DelX:?GLdouble,DelY:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>).
 
-%% @spec (ObjX::float(),ObjY::float(),ObjZ::float(),Model::{float()},Proj::{float()},View::{integer()}) -> {integer(),WinX::float(),WinY::float(),WinZ::float()}
+%% @spec (ObjX::float(),ObjY::float(),ObjZ::float(),Model::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},Proj::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},View::{integer(),integer(),integer(),integer()}) -> {integer(),WinX::float(),WinY::float(),WinZ::float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluProject.xml">external</a> documentation.
+-spec project(float(),float(),float(),{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},{integer(),integer(),integer(),integer()}) -> {integer(),float(),float(),float()}.
 project(ObjX,ObjY,ObjZ,{M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16},{P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16},{V1,V2,V3,V4}) ->
-  wxe_util:call(5028, <<ObjX:?GLdouble,ObjY:?GLdouble,ObjZ:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,P13:?GLdouble,P14:?GLdouble,P15:?GLdouble,P16:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>);
+  call(5028, <<ObjX:?GLdouble,ObjY:?GLdouble,ObjZ:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,P13:?GLdouble,P14:?GLdouble,P15:?GLdouble,P16:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>);
 project(ObjX,ObjY,ObjZ,{M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12},{P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12},{V1,V2,V3,V4}) ->
-  wxe_util:call(5028, <<ObjX:?GLdouble,ObjY:?GLdouble,ObjZ:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,0:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,0:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,0:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,1:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>).
+  call(5028, <<ObjX:?GLdouble,ObjY:?GLdouble,ObjZ:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,0:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,0:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,0:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,1:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>).
 
 %% @spec (Quad::integer(),Draw::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluQuadricDrawStyle.xml">external</a> documentation.
+-spec quadricDrawStyle(integer(),enum()) -> ok.
 quadricDrawStyle(Quad,Draw) ->
-  wxe_util:cast(5029, <<Quad:?GLUquadric,Draw:?GLenum>>).
+  cast(5029, <<Quad:?GLUquadric,Draw:?GLenum>>).
 
 %% @spec (Quad::integer(),Normal::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluQuadricNormals.xml">external</a> documentation.
+-spec quadricNormals(integer(),enum()) -> ok.
 quadricNormals(Quad,Normal) ->
-  wxe_util:cast(5030, <<Quad:?GLUquadric,Normal:?GLenum>>).
+  cast(5030, <<Quad:?GLUquadric,Normal:?GLenum>>).
 
 %% @spec (Quad::integer(),Orientation::enum()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluQuadricOrientation.xml">external</a> documentation.
+-spec quadricOrientation(integer(),enum()) -> ok.
 quadricOrientation(Quad,Orientation) ->
-  wxe_util:cast(5031, <<Quad:?GLUquadric,Orientation:?GLenum>>).
+  cast(5031, <<Quad:?GLUquadric,Orientation:?GLenum>>).
 
 %% @spec (Quad::integer(),Texture::0|1) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluQuadricTexture.xml">external</a> documentation.
+-spec quadricTexture(integer(),0|1) -> ok.
 quadricTexture(Quad,Texture) ->
-  wxe_util:cast(5032, <<Quad:?GLUquadric,Texture:?GLboolean>>).
+  cast(5032, <<Quad:?GLUquadric,Texture:?GLboolean>>).
 
-%% @spec (Format::enum(),WIn::integer(),HIn::integer(),TypeIn::enum(),DataIn::binary(),WOut::integer(),HOut::integer(),TypeOut::enum(),DataOut::wx:wx_mem()) -> integer()
+%% @spec (Format::enum(),WIn::integer(),HIn::integer(),TypeIn::enum(),DataIn::binary(),WOut::integer(),HOut::integer(),TypeOut::enum(),DataOut::mem()) -> integer()
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluScaleImage.xml">external</a> documentation.
+-spec scaleImage(enum(),integer(),integer(),enum(),binary(),integer(),integer(),enum(),mem()) -> integer().
 scaleImage(Format,WIn,HIn,TypeIn,DataIn,WOut,HOut,TypeOut,DataOut) ->
-  wxe_util:send_bin(DataIn),
-  wxe_util:send_bin(DataOut#wx_mem.bin),
-  wxe_util:call(5033, <<Format:?GLenum,WIn:?GLsizei,HIn:?GLsizei,TypeIn:?GLenum,WOut:?GLsizei,HOut:?GLsizei,TypeOut:?GLenum>>).
+  send_bin(DataIn),
+  send_bin(DataOut),
+  call(5033, <<Format:?GLenum,WIn:?GLsizei,HIn:?GLsizei,TypeIn:?GLenum,WOut:?GLsizei,HOut:?GLsizei,TypeOut:?GLenum>>).
 
 %% @spec (Quad::integer(),Radius::float(),Slices::integer(),Stacks::integer()) -> ok
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluSphere.xml">external</a> documentation.
+-spec sphere(integer(),float(),integer(),integer()) -> ok.
 sphere(Quad,Radius,Slices,Stacks) ->
-  wxe_util:cast(5034, <<Quad:?GLUquadric,Radius:?GLdouble,Slices:?GLint,Stacks:?GLint>>).
+  cast(5034, <<Quad:?GLUquadric,Radius:?GLdouble,Slices:?GLint,Stacks:?GLint>>).
 
-%% @spec (WinX::float(),WinY::float(),WinZ::float(),Model::{float()},Proj::{float()},View::{integer()}) -> {integer(),ObjX::float(),ObjY::float(),ObjZ::float()}
+%% @spec (WinX::float(),WinY::float(),WinZ::float(),Model::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},Proj::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},View::{integer(),integer(),integer(),integer()}) -> {integer(),ObjX::float(),ObjY::float(),ObjZ::float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluUnProject.xml">external</a> documentation.
+-spec unProject(float(),float(),float(),{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},{integer(),integer(),integer(),integer()}) -> {integer(),float(),float(),float()}.
 unProject(WinX,WinY,WinZ,{M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16},{P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16},{V1,V2,V3,V4}) ->
-  wxe_util:call(5035, <<WinX:?GLdouble,WinY:?GLdouble,WinZ:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,P13:?GLdouble,P14:?GLdouble,P15:?GLdouble,P16:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>);
+  call(5035, <<WinX:?GLdouble,WinY:?GLdouble,WinZ:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,P13:?GLdouble,P14:?GLdouble,P15:?GLdouble,P16:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>);
 unProject(WinX,WinY,WinZ,{M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12},{P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12},{V1,V2,V3,V4}) ->
-  wxe_util:call(5035, <<WinX:?GLdouble,WinY:?GLdouble,WinZ:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,0:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,0:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,0:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,1:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>).
+  call(5035, <<WinX:?GLdouble,WinY:?GLdouble,WinZ:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,0:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,0:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,0:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,1:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint>>).
 
-%% @spec (WinX::float(),WinY::float(),WinZ::float(),ClipW::float(),Model::{float()},Proj::{float()},View::{integer()},NearVal::float(),FarVal::float()) -> {integer(),ObjX::float(),ObjY::float(),ObjZ::float(),ObjW::float()}
+%% @spec (WinX::float(),WinY::float(),WinZ::float(),ClipW::float(),Model::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},Proj::{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},View::{integer(),integer(),integer(),integer()},NearVal::float(),FarVal::float()) -> {integer(),ObjX::float(),ObjY::float(),ObjZ::float(),ObjW::float()}
 %% @doc See <a href="http://www.opengl.org/sdk/docs/man/xhtml/gluUnProject.xml">external</a> documentation.
+-spec unProject4(float(),float(),float(),float(),{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},{float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float(),float()},{integer(),integer(),integer(),integer()},float(),float()) -> {integer(),float(),float(),float(),float()}.
 unProject4(WinX,WinY,WinZ,ClipW,{M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12,M13,M14,M15,M16},{P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12,P13,P14,P15,P16},{V1,V2,V3,V4},NearVal,FarVal) ->
-  wxe_util:call(5036, <<WinX:?GLdouble,WinY:?GLdouble,WinZ:?GLdouble,ClipW:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,P13:?GLdouble,P14:?GLdouble,P15:?GLdouble,P16:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint,NearVal:?GLdouble,FarVal:?GLdouble>>);
+  call(5036, <<WinX:?GLdouble,WinY:?GLdouble,WinZ:?GLdouble,ClipW:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,M13:?GLdouble,M14:?GLdouble,M15:?GLdouble,M16:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,P13:?GLdouble,P14:?GLdouble,P15:?GLdouble,P16:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint,NearVal:?GLdouble,FarVal:?GLdouble>>);
 unProject4(WinX,WinY,WinZ,ClipW,{M1,M2,M3,M4,M5,M6,M7,M8,M9,M10,M11,M12},{P1,P2,P3,P4,P5,P6,P7,P8,P9,P10,P11,P12},{V1,V2,V3,V4},NearVal,FarVal) ->
-  wxe_util:call(5036, <<WinX:?GLdouble,WinY:?GLdouble,WinZ:?GLdouble,ClipW:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,0:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,0:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,0:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,1:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint,NearVal:?GLdouble,FarVal:?GLdouble>>).
+  call(5036, <<WinX:?GLdouble,WinY:?GLdouble,WinZ:?GLdouble,ClipW:?GLdouble,M1:?GLdouble,M2:?GLdouble,M3:?GLdouble,0:?GLdouble,M4:?GLdouble,M5:?GLdouble,M6:?GLdouble,0:?GLdouble,M7:?GLdouble,M8:?GLdouble,M9:?GLdouble,0:?GLdouble,M10:?GLdouble,M11:?GLdouble,M12:?GLdouble,1:?GLdouble,P1:?GLdouble,P2:?GLdouble,P3:?GLdouble,0:?GLdouble,P4:?GLdouble,P5:?GLdouble,P6:?GLdouble,0:?GLdouble,P7:?GLdouble,P8:?GLdouble,P9:?GLdouble,0:?GLdouble,P10:?GLdouble,P11:?GLdouble,P12:?GLdouble,1:?GLdouble,V1:?GLint,V2:?GLint,V3:?GLint,V4:?GLint,NearVal:?GLdouble,FarVal:?GLdouble>>).
 
diff --git a/lib/wx/src/gen/wxGLCanvas.erl b/lib/wx/src/gen/wxGLCanvas.erl
index 3e0d1bd9ae..032d42535d 100644
--- a/lib/wx/src/gen/wxGLCanvas.erl
+++ b/lib/wx/src/gen/wxGLCanvas.erl
@@ -144,8 +144,10 @@ getContext(#wx_ref{type=ThisT,ref=ThisRef}) ->
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvassetcurrent">external documentation</a>.
 setCurrent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxGLCanvas),
-  wxe_util:cast(?wxGLCanvas_SetCurrent,
-  <<ThisRef:32/?UI>>).
+  _Result =  wxe_util:cast(?wxGLCanvas_SetCurrent,
+  <<ThisRef:32/?UI>>),
+  {ok, _} = wxe_master:init_opengl(),
+  _Result.
 
 %% @spec (This::wxGLCanvas()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvasswapbuffers">external documentation</a>.
diff --git a/lib/wx/src/gen/wxSystemSettings.erl b/lib/wx/src/gen/wxSystemSettings.erl
new file mode 100644
index 0000000000..3f7e0a1ad6
--- /dev/null
+++ b/lib/wx/src/gen/wxSystemSettings.erl
@@ -0,0 +1,79 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2010. 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%
+%% This file is generated DO NOT EDIT
+
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html">wxSystemSettings</a>.
+%% @type wxSystemSettings().  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(wxSystemSettings).
+-include("wxe.hrl").
+-export([getColour/1,getFont/1,getMetric/1,getMetric/2,getScreenType/0]).
+
+%% inherited exports
+-export([parent_class/1]).
+
+%% @hidden
+parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
+
+%% @spec (Index::WxSystemColour) -> wx:colour()
+%% WxSystemColour = integer()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetcolour">external documentation</a>.
+%%<br /> WxSystemColour is one of ?wxSYS_COLOUR_SCROLLBAR | ?wxSYS_COLOUR_BACKGROUND | ?wxSYS_COLOUR_DESKTOP | ?wxSYS_COLOUR_ACTIVECAPTION | ?wxSYS_COLOUR_INACTIVECAPTION | ?wxSYS_COLOUR_MENU | ?wxSYS_COLOUR_WINDOW | ?wxSYS_COLOUR_WINDOWFRAME | ?wxSYS_COLOUR_MENUTEXT | ?wxSYS_COLOUR_WINDOWTEXT | ?wxSYS_COLOUR_CAPTIONTEXT | ?wxSYS_COLOUR_ACTIVEBORDER | ?wxSYS_COLOUR_INACTIVEBORDER | ?wxSYS_COLOUR_APPWORKSPACE | ?wxSYS_COLOUR_HIGHLIGHT | ?wxSYS_COLOUR_HIGHLIGHTTEXT | ?wxSYS_COLOUR_BTNFACE | ?wxSYS_COLOUR_3DFACE | ?wxSYS_COLOUR_BTNSHADOW | ?wxSYS_COLOUR_3DSHADOW | ?wxSYS_COLOUR_GRAYTEXT | ?wxSYS_COLOUR_BTNTEXT | ?wxSYS_COLOUR_INACTIVECAPTIONTEXT | ?wxSYS_COLOUR_BTNHIGHLIGHT | ?wxSYS_COLOUR_BTNHILIGHT | ?wxSYS_COLOUR_3DHIGHLIGHT | ?wxSYS_COLOUR_3DHILIGHT | ?wxSYS_COLOUR_3DDKSHADOW | ?wxSYS_COLOUR_3DLIGHT | ?wxSYS_COLOUR_INFOTEXT | ?wxSYS_COLOUR_INFOBK | ?wxSYS_COLOUR_LISTBOX | ?wxSYS_COLOUR_HOTLIGHT | ?wxSYS_COLOUR_GRADIENTACTIVECAPTION | ?wxSYS_COLOUR_GRADIENTINACTIVECAPTION | ?wxSYS_COLOUR_MENUHILIGHT | ?wxSYS_COLOUR_MENUBAR | ?wxSYS_COLOUR_LISTBOXTEXT | ?wxSYS_COLOUR_MAX
+getColour(Index)
+ when is_integer(Index) ->
+  wxe_util:call(?wxSystemSettings_GetColour,
+  <<Index:32/?UI>>).
+
+%% @spec (Index::WxSystemFont) -> wxFont:wxFont()
+%% WxSystemFont = integer()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetfont">external documentation</a>.
+%%<br /> WxSystemFont is one of ?wxSYS_OEM_FIXED_FONT | ?wxSYS_ANSI_FIXED_FONT | ?wxSYS_ANSI_VAR_FONT | ?wxSYS_SYSTEM_FONT | ?wxSYS_DEVICE_DEFAULT_FONT | ?wxSYS_DEFAULT_PALETTE | ?wxSYS_SYSTEM_FIXED_FONT | ?wxSYS_DEFAULT_GUI_FONT | ?wxSYS_ICONTITLE_FONT
+getFont(Index)
+ when is_integer(Index) ->
+  wxe_util:call(?wxSystemSettings_GetFont,
+  <<Index:32/?UI>>).
+
+%% @spec (Index::WxSystemMetric) -> integer()
+%% @equiv getMetric(Index, [])
+getMetric(Index)
+ when is_integer(Index) ->
+  getMetric(Index, []).
+
+%% @spec (Index::WxSystemMetric, [Option]) -> integer()
+%% Option = {win, wxWindow:wxWindow()}
+%% WxSystemMetric = integer()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetmetric">external documentation</a>.
+%%<br /> WxSystemMetric is one of ?wxSYS_MOUSE_BUTTONS | ?wxSYS_BORDER_X | ?wxSYS_BORDER_Y | ?wxSYS_CURSOR_X | ?wxSYS_CURSOR_Y | ?wxSYS_DCLICK_X | ?wxSYS_DCLICK_Y | ?wxSYS_DRAG_X | ?wxSYS_DRAG_Y | ?wxSYS_EDGE_X | ?wxSYS_EDGE_Y | ?wxSYS_HSCROLL_ARROW_X | ?wxSYS_HSCROLL_ARROW_Y | ?wxSYS_HTHUMB_X | ?wxSYS_ICON_X | ?wxSYS_ICON_Y | ?wxSYS_ICONSPACING_X | ?wxSYS_ICONSPACING_Y | ?wxSYS_WINDOWMIN_X | ?wxSYS_WINDOWMIN_Y | ?wxSYS_SCREEN_X | ?wxSYS_SCREEN_Y | ?wxSYS_FRAMESIZE_X | ?wxSYS_FRAMESIZE_Y | ?wxSYS_SMALLICON_X | ?wxSYS_SMALLICON_Y | ?wxSYS_HSCROLL_Y | ?wxSYS_VSCROLL_X | ?wxSYS_VSCROLL_ARROW_X | ?wxSYS_VSCROLL_ARROW_Y | ?wxSYS_VTHUMB_Y | ?wxSYS_CAPTION_Y | ?wxSYS_MENU_Y | ?wxSYS_NETWORK_PRESENT | ?wxSYS_PENWINDOWS_PRESENT | ?wxSYS_SHOW_SOUNDS | ?wxSYS_SWAP_BUTTONS
+getMetric(Index, Options)
+ when is_integer(Index),is_list(Options) ->
+  MOpts = fun({win, #wx_ref{type=WinT,ref=WinRef}}, Acc) ->   ?CLASS(WinT,wxWindow),[<<1:32/?UI,WinRef:32/?UI>>|Acc];
+          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
+  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
+  wxe_util:call(?wxSystemSettings_GetMetric,
+  <<Index:32/?UI, 0:32,BinOpt/binary>>).
+
+%% @spec () -> WxSystemScreenType
+%% WxSystemScreenType = integer()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetscreentype">external documentation</a>.
+%%<br /> WxSystemScreenType is one of ?wxSYS_SCREEN_NONE | ?wxSYS_SCREEN_TINY | ?wxSYS_SCREEN_PDA | ?wxSYS_SCREEN_SMALL | ?wxSYS_SCREEN_DESKTOP
+getScreenType() ->
+  wxe_util:call(?wxSystemSettings_GetScreenType,
+  <<>>).
+
diff --git a/lib/wx/src/gen/wxTreeCtrl.erl b/lib/wx/src/gen/wxTreeCtrl.erl
index 4fcbb9366e..e3fe4c9612 100644
--- a/lib/wx/src/gen/wxTreeCtrl.erl
+++ b/lib/wx/src/gen/wxTreeCtrl.erl
@@ -35,7 +35,7 @@
 -include("wxe.hrl").
 -export([addRoot/2,addRoot/3,appendItem/3,appendItem/4,assignImageList/2,assignStateImageList/2,
   collapse/2,collapseAndReset/2,create/2,create/3,delete/2,deleteAllItems/1,
-  deleteChildren/2,destroy/1,ensureVisible/2,expand/2,getBoundingRect/3,
+  deleteChildren/2,destroy/1,editLabel/2,ensureVisible/2,expand/2,getBoundingRect/3,
   getBoundingRect/4,getChildrenCount/2,getChildrenCount/3,getCount/1,
   getEditControl/1,getFirstChild/2,getFirstVisibleItem/1,getImageList/1,
   getIndent/1,getItemBackgroundColour/2,getItemData/2,getItemFont/2,
@@ -243,6 +243,14 @@ deleteChildren(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:cast(?wxTreeCtrl_DeleteChildren,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
+%% @spec (This::wxTreeCtrl(), Item::integer()) -> wxTextCtrl:wxTextCtrl()
+%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrleditlabel">external documentation</a>.
+editLabel(#wx_ref{type=ThisT,ref=ThisRef},Item)
+ when is_integer(Item) ->
+  ?CLASS(ThisT,wxTreeCtrl),
+  wxe_util:call(?wxTreeCtrl_EditLabel,
+  <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
+
 %% @spec (This::wxTreeCtrl(), Item::integer()) -> ok
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlensurevisible">external documentation</a>.
 ensureVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
diff --git a/lib/wx/src/gen/wxe_debug.hrl b/lib/wx/src/gen/wxe_debug.hrl
index a3416b75c8..3edfa73599 100644
--- a/lib/wx/src/gen/wxe_debug.hrl
+++ b/lib/wx/src/gen/wxe_debug.hrl
@@ -1837,1445 +1837,1450 @@ wxdebug_table() ->
  {2007, {wxTreeCtrl, delete, 1}},
  {2008, {wxTreeCtrl, deleteAllItems, 0}},
  {2009, {wxTreeCtrl, deleteChildren, 1}},
- {2010, {wxTreeCtrl, ensureVisible, 1}},
- {2011, {wxTreeCtrl, expand, 1}},
- {2012, {wxTreeCtrl, getBoundingRect, 3}},
- {2014, {wxTreeCtrl, getChildrenCount, 2}},
- {2015, {wxTreeCtrl, getCount, 0}},
- {2016, {wxTreeCtrl, getEditControl, 0}},
- {2017, {wxTreeCtrl, getFirstChild, 2}},
- {2018, {wxTreeCtrl, getNextChild, 2}},
- {2019, {wxTreeCtrl, getFirstVisibleItem, 0}},
- {2020, {wxTreeCtrl, getImageList, 0}},
- {2021, {wxTreeCtrl, getIndent, 0}},
- {2022, {wxTreeCtrl, getItemBackgroundColour, 1}},
- {2023, {wxTreeCtrl, getItemData, 1}},
- {2024, {wxTreeCtrl, getItemFont, 1}},
- {2025, {wxTreeCtrl, getItemImage_1, 1}},
- {2026, {wxTreeCtrl, getItemImage_2, 2}},
- {2027, {wxTreeCtrl, getItemText, 1}},
- {2028, {wxTreeCtrl, getItemTextColour, 1}},
- {2029, {wxTreeCtrl, getLastChild, 1}},
- {2030, {wxTreeCtrl, getNextSibling, 1}},
- {2031, {wxTreeCtrl, getNextVisible, 1}},
- {2032, {wxTreeCtrl, getItemParent, 1}},
- {2033, {wxTreeCtrl, getPrevSibling, 1}},
- {2034, {wxTreeCtrl, getPrevVisible, 1}},
- {2035, {wxTreeCtrl, getRootItem, 0}},
- {2036, {wxTreeCtrl, getSelection, 0}},
- {2037, {wxTreeCtrl, getSelections, 1}},
- {2038, {wxTreeCtrl, getStateImageList, 0}},
- {2039, {wxTreeCtrl, hitTest, 1}},
- {2041, {wxTreeCtrl, insertItem, 4}},
- {2042, {wxTreeCtrl, isBold, 1}},
- {2043, {wxTreeCtrl, isExpanded, 1}},
- {2044, {wxTreeCtrl, isSelected, 1}},
- {2045, {wxTreeCtrl, isVisible, 1}},
- {2046, {wxTreeCtrl, itemHasChildren, 1}},
- {2047, {wxTreeCtrl, prependItem, 3}},
- {2048, {wxTreeCtrl, scrollTo, 1}},
- {2049, {wxTreeCtrl, selectItem_1, 1}},
- {2050, {wxTreeCtrl, selectItem_2, 2}},
- {2051, {wxTreeCtrl, setIndent, 1}},
- {2052, {wxTreeCtrl, setImageList, 1}},
- {2053, {wxTreeCtrl, setItemBackgroundColour, 2}},
- {2054, {wxTreeCtrl, setItemBold, 2}},
- {2055, {wxTreeCtrl, setItemData, 2}},
- {2056, {wxTreeCtrl, setItemDropHighlight, 2}},
- {2057, {wxTreeCtrl, setItemFont, 2}},
- {2058, {wxTreeCtrl, setItemHasChildren, 2}},
- {2059, {wxTreeCtrl, setItemImage_2, 2}},
- {2060, {wxTreeCtrl, setItemImage_3, 3}},
- {2061, {wxTreeCtrl, setItemText, 2}},
- {2062, {wxTreeCtrl, setItemTextColour, 2}},
- {2063, {wxTreeCtrl, setStateImageList, 1}},
- {2064, {wxTreeCtrl, setWindowStyle, 1}},
- {2065, {wxTreeCtrl, sortChildren, 1}},
- {2066, {wxTreeCtrl, toggle, 1}},
- {2067, {wxTreeCtrl, toggleItemSelection, 1}},
- {2068, {wxTreeCtrl, unselect, 0}},
- {2069, {wxTreeCtrl, unselectAll, 0}},
- {2070, {wxTreeCtrl, unselectItem, 1}},
- {2071, {wxScrollBar, new_0, 0}},
- {2072, {wxScrollBar, new_3, 3}},
- {2073, {wxScrollBar, destruct, 0}},
- {2074, {wxScrollBar, create, 3}},
- {2075, {wxScrollBar, getRange, 0}},
- {2076, {wxScrollBar, getPageSize, 0}},
- {2077, {wxScrollBar, getThumbPosition, 0}},
- {2078, {wxScrollBar, getThumbSize, 0}},
- {2079, {wxScrollBar, setThumbPosition, 1}},
- {2080, {wxScrollBar, setScrollbar, 5}},
- {2082, {wxSpinButton, new_2, 2}},
- {2083, {wxSpinButton, new_0, 0}},
- {2084, {wxSpinButton, create, 2}},
- {2085, {wxSpinButton, getMax, 0}},
- {2086, {wxSpinButton, getMin, 0}},
- {2087, {wxSpinButton, getValue, 0}},
- {2088, {wxSpinButton, setRange, 2}},
- {2089, {wxSpinButton, setValue, 1}},
- {2090, {wxSpinButton, 'Destroy', undefined}},
- {2091, {wxSpinCtrl, new_0, 0}},
- {2092, {wxSpinCtrl, new_2, 2}},
- {2094, {wxSpinCtrl, create, 2}},
- {2097, {wxSpinCtrl, setValue_1_1, 1}},
- {2098, {wxSpinCtrl, setValue_1_0, 1}},
- {2100, {wxSpinCtrl, getValue, 0}},
- {2102, {wxSpinCtrl, setRange, 2}},
- {2103, {wxSpinCtrl, setSelection, 2}},
- {2105, {wxSpinCtrl, getMin, 0}},
- {2107, {wxSpinCtrl, getMax, 0}},
- {2108, {wxSpinCtrl, 'Destroy', undefined}},
- {2109, {wxStaticText, new_0, 0}},
- {2110, {wxStaticText, new_4, 4}},
- {2111, {wxStaticText, create, 4}},
- {2112, {wxStaticText, getLabel, 0}},
- {2113, {wxStaticText, setLabel, 1}},
- {2114, {wxStaticText, wrap, 1}},
- {2115, {wxStaticText, 'Destroy', undefined}},
- {2116, {wxStaticBitmap, new_0, 0}},
- {2117, {wxStaticBitmap, new_4, 4}},
- {2118, {wxStaticBitmap, create, 4}},
- {2119, {wxStaticBitmap, getBitmap, 0}},
- {2120, {wxStaticBitmap, setBitmap, 1}},
- {2121, {wxStaticBitmap, 'Destroy', undefined}},
- {2122, {wxRadioBox, new, 7}},
- {2124, {wxRadioBox, destruct, 0}},
- {2125, {wxRadioBox, create, 7}},
- {2126, {wxRadioBox, enable_2, 2}},
- {2127, {wxRadioBox, enable_1, 1}},
- {2128, {wxRadioBox, getSelection, 0}},
- {2129, {wxRadioBox, getString, 1}},
- {2130, {wxRadioBox, setSelection, 1}},
- {2131, {wxRadioBox, show_2, 2}},
- {2132, {wxRadioBox, show_1, 1}},
- {2133, {wxRadioBox, getColumnCount, 0}},
- {2134, {wxRadioBox, getItemHelpText, 1}},
- {2135, {wxRadioBox, getItemToolTip, 1}},
- {2137, {wxRadioBox, getItemFromPoint, 1}},
- {2138, {wxRadioBox, getRowCount, 0}},
- {2139, {wxRadioBox, isItemEnabled, 1}},
- {2140, {wxRadioBox, isItemShown, 1}},
- {2141, {wxRadioBox, setItemHelpText, 2}},
- {2142, {wxRadioBox, setItemToolTip, 2}},
- {2143, {wxRadioButton, new_0, 0}},
- {2144, {wxRadioButton, new_4, 4}},
- {2145, {wxRadioButton, create, 4}},
- {2146, {wxRadioButton, getValue, 0}},
- {2147, {wxRadioButton, setValue, 1}},
- {2148, {wxRadioButton, 'Destroy', undefined}},
- {2150, {wxSlider, new_6, 6}},
- {2151, {wxSlider, new_0, 0}},
- {2152, {wxSlider, create, 6}},
- {2153, {wxSlider, getLineSize, 0}},
- {2154, {wxSlider, getMax, 0}},
- {2155, {wxSlider, getMin, 0}},
- {2156, {wxSlider, getPageSize, 0}},
- {2157, {wxSlider, getThumbLength, 0}},
- {2158, {wxSlider, getValue, 0}},
- {2159, {wxSlider, setLineSize, 1}},
- {2160, {wxSlider, setPageSize, 1}},
- {2161, {wxSlider, setRange, 2}},
- {2162, {wxSlider, setThumbLength, 1}},
- {2163, {wxSlider, setValue, 1}},
- {2164, {wxSlider, 'Destroy', undefined}},
- {2166, {wxDialog, new_4, 4}},
- {2167, {wxDialog, new_0, 0}},
- {2169, {wxDialog, destruct, 0}},
- {2170, {wxDialog, create, 4}},
- {2171, {wxDialog, createButtonSizer, 1}},
- {2172, {wxDialog, createStdDialogButtonSizer, 1}},
- {2173, {wxDialog, endModal, 1}},
- {2174, {wxDialog, getAffirmativeId, 0}},
- {2175, {wxDialog, getReturnCode, 0}},
- {2176, {wxDialog, isModal, 0}},
- {2177, {wxDialog, setAffirmativeId, 1}},
- {2178, {wxDialog, setReturnCode, 1}},
- {2179, {wxDialog, show, 1}},
- {2180, {wxDialog, showModal, 0}},
- {2181, {wxColourDialog, new_0, 0}},
- {2182, {wxColourDialog, new_2, 2}},
- {2183, {wxColourDialog, destruct, 0}},
- {2184, {wxColourDialog, create, 2}},
- {2185, {wxColourDialog, getColourData, 0}},
- {2186, {wxColourData, new_0, 0}},
- {2187, {wxColourData, new_1, 1}},
- {2188, {wxColourData, destruct, 0}},
- {2189, {wxColourData, getChooseFull, 0}},
- {2190, {wxColourData, getColour, 0}},
- {2192, {wxColourData, getCustomColour, 1}},
- {2193, {wxColourData, setChooseFull, 1}},
- {2194, {wxColourData, setColour, 1}},
- {2195, {wxColourData, setCustomColour, 2}},
- {2196, {wxPalette, new_0, 0}},
- {2197, {wxPalette, new_4, 4}},
- {2199, {wxPalette, destruct, 0}},
- {2200, {wxPalette, create, 4}},
- {2201, {wxPalette, getColoursCount, 0}},
- {2202, {wxPalette, getPixel, 3}},
- {2203, {wxPalette, getRGB, 4}},
- {2204, {wxPalette, isOk, 0}},
- {2208, {wxDirDialog, new, 2}},
- {2209, {wxDirDialog, destruct, 0}},
- {2210, {wxDirDialog, getPath, 0}},
- {2211, {wxDirDialog, getMessage, 0}},
- {2212, {wxDirDialog, setMessage, 1}},
- {2213, {wxDirDialog, setPath, 1}},
- {2217, {wxFileDialog, new, 2}},
- {2218, {wxFileDialog, destruct, 0}},
- {2219, {wxFileDialog, getDirectory, 0}},
- {2220, {wxFileDialog, getFilename, 0}},
- {2221, {wxFileDialog, getFilenames, 1}},
- {2222, {wxFileDialog, getFilterIndex, 0}},
- {2223, {wxFileDialog, getMessage, 0}},
- {2224, {wxFileDialog, getPath, 0}},
- {2225, {wxFileDialog, getPaths, 1}},
- {2226, {wxFileDialog, getWildcard, 0}},
- {2227, {wxFileDialog, setDirectory, 1}},
- {2228, {wxFileDialog, setFilename, 1}},
- {2229, {wxFileDialog, setFilterIndex, 1}},
- {2230, {wxFileDialog, setMessage, 1}},
- {2231, {wxFileDialog, setPath, 1}},
- {2232, {wxFileDialog, setWildcard, 1}},
- {2233, {wxPickerBase, setInternalMargin, 1}},
- {2234, {wxPickerBase, getInternalMargin, 0}},
- {2235, {wxPickerBase, setTextCtrlProportion, 1}},
- {2236, {wxPickerBase, setPickerCtrlProportion, 1}},
- {2237, {wxPickerBase, getTextCtrlProportion, 0}},
- {2238, {wxPickerBase, getPickerCtrlProportion, 0}},
- {2239, {wxPickerBase, hasTextCtrl, 0}},
- {2240, {wxPickerBase, getTextCtrl, 0}},
- {2241, {wxPickerBase, isTextCtrlGrowable, 0}},
- {2242, {wxPickerBase, setPickerCtrlGrowable, 1}},
- {2243, {wxPickerBase, setTextCtrlGrowable, 1}},
- {2244, {wxPickerBase, isPickerCtrlGrowable, 0}},
- {2245, {wxFilePickerCtrl, new_0, 0}},
- {2246, {wxFilePickerCtrl, new_3, 3}},
- {2247, {wxFilePickerCtrl, create, 3}},
- {2248, {wxFilePickerCtrl, getPath, 0}},
- {2249, {wxFilePickerCtrl, setPath, 1}},
- {2250, {wxFilePickerCtrl, 'Destroy', undefined}},
- {2251, {wxDirPickerCtrl, new_0, 0}},
- {2252, {wxDirPickerCtrl, new_3, 3}},
- {2253, {wxDirPickerCtrl, create, 3}},
- {2254, {wxDirPickerCtrl, getPath, 0}},
- {2255, {wxDirPickerCtrl, setPath, 1}},
- {2256, {wxDirPickerCtrl, 'Destroy', undefined}},
- {2257, {wxColourPickerCtrl, new_0, 0}},
- {2258, {wxColourPickerCtrl, new_3, 3}},
- {2259, {wxColourPickerCtrl, create, 3}},
- {2260, {wxColourPickerCtrl, getColour, 0}},
- {2261, {wxColourPickerCtrl, setColour_1_1, 1}},
- {2262, {wxColourPickerCtrl, setColour_1_0, 1}},
- {2263, {wxColourPickerCtrl, 'Destroy', undefined}},
- {2264, {wxDatePickerCtrl, new_0, 0}},
- {2265, {wxDatePickerCtrl, new_3, 3}},
- {2266, {wxDatePickerCtrl, getRange, 2}},
- {2267, {wxDatePickerCtrl, getValue, 0}},
- {2268, {wxDatePickerCtrl, setRange, 2}},
- {2269, {wxDatePickerCtrl, setValue, 1}},
- {2270, {wxDatePickerCtrl, 'Destroy', undefined}},
- {2271, {wxFontPickerCtrl, new_0, 0}},
- {2272, {wxFontPickerCtrl, new_3, 3}},
- {2273, {wxFontPickerCtrl, create, 3}},
- {2274, {wxFontPickerCtrl, getSelectedFont, 0}},
- {2275, {wxFontPickerCtrl, setSelectedFont, 1}},
- {2276, {wxFontPickerCtrl, getMaxPointSize, 0}},
- {2277, {wxFontPickerCtrl, setMaxPointSize, 1}},
- {2278, {wxFontPickerCtrl, 'Destroy', undefined}},
- {2281, {wxFindReplaceDialog, new_0, 0}},
- {2282, {wxFindReplaceDialog, new_4, 4}},
- {2283, {wxFindReplaceDialog, destruct, 0}},
- {2284, {wxFindReplaceDialog, create, 4}},
- {2285, {wxFindReplaceDialog, getData, 0}},
- {2286, {wxFindReplaceData, new_0, 0}},
- {2287, {wxFindReplaceData, new_1, 1}},
- {2288, {wxFindReplaceData, getFindString, 0}},
- {2289, {wxFindReplaceData, getReplaceString, 0}},
- {2290, {wxFindReplaceData, getFlags, 0}},
- {2291, {wxFindReplaceData, setFlags, 1}},
- {2292, {wxFindReplaceData, setFindString, 1}},
- {2293, {wxFindReplaceData, setReplaceString, 1}},
- {2294, {wxFindReplaceData, 'Destroy', undefined}},
- {2295, {wxMultiChoiceDialog, new_0, 0}},
- {2297, {wxMultiChoiceDialog, new_5, 5}},
- {2298, {wxMultiChoiceDialog, getSelections, 0}},
- {2299, {wxMultiChoiceDialog, setSelections, 1}},
- {2300, {wxMultiChoiceDialog, 'Destroy', undefined}},
- {2301, {wxSingleChoiceDialog, new_0, 0}},
- {2303, {wxSingleChoiceDialog, new_5, 5}},
- {2304, {wxSingleChoiceDialog, getSelection, 0}},
- {2305, {wxSingleChoiceDialog, getStringSelection, 0}},
- {2306, {wxSingleChoiceDialog, setSelection, 1}},
- {2307, {wxSingleChoiceDialog, 'Destroy', undefined}},
- {2308, {wxTextEntryDialog, new, 3}},
- {2309, {wxTextEntryDialog, getValue, 0}},
- {2310, {wxTextEntryDialog, setValue, 1}},
- {2311, {wxTextEntryDialog, 'Destroy', undefined}},
- {2312, {wxPasswordEntryDialog, new, 3}},
- {2313, {wxPasswordEntryDialog, 'Destroy', undefined}},
- {2314, {wxFontData, new_0, 0}},
- {2315, {wxFontData, new_1, 1}},
- {2316, {wxFontData, destruct, 0}},
- {2317, {wxFontData, enableEffects, 1}},
- {2318, {wxFontData, getAllowSymbols, 0}},
- {2319, {wxFontData, getColour, 0}},
- {2320, {wxFontData, getChosenFont, 0}},
- {2321, {wxFontData, getEnableEffects, 0}},
- {2322, {wxFontData, getInitialFont, 0}},
- {2323, {wxFontData, getShowHelp, 0}},
- {2324, {wxFontData, setAllowSymbols, 1}},
- {2325, {wxFontData, setChosenFont, 1}},
- {2326, {wxFontData, setColour, 1}},
- {2327, {wxFontData, setInitialFont, 1}},
- {2328, {wxFontData, setRange, 2}},
- {2329, {wxFontData, setShowHelp, 1}},
- {2333, {wxFontDialog, new_0, 0}},
- {2335, {wxFontDialog, new_2, 2}},
- {2337, {wxFontDialog, create, 2}},
- {2338, {wxFontDialog, getFontData, 0}},
- {2340, {wxFontDialog, 'Destroy', undefined}},
- {2341, {wxProgressDialog, new, 3}},
- {2342, {wxProgressDialog, destruct, 0}},
- {2343, {wxProgressDialog, resume, 0}},
- {2344, {wxProgressDialog, update_2, 2}},
- {2345, {wxProgressDialog, update_0, 0}},
- {2346, {wxMessageDialog, new, 3}},
- {2347, {wxMessageDialog, destruct, 0}},
- {2348, {wxPageSetupDialog, new, 2}},
- {2349, {wxPageSetupDialog, destruct, 0}},
- {2350, {wxPageSetupDialog, getPageSetupData, 0}},
- {2351, {wxPageSetupDialog, showModal, 0}},
- {2352, {wxPageSetupDialogData, new_0, 0}},
- {2353, {wxPageSetupDialogData, new_1_0, 1}},
- {2354, {wxPageSetupDialogData, new_1_1, 1}},
- {2355, {wxPageSetupDialogData, destruct, 0}},
- {2356, {wxPageSetupDialogData, enableHelp, 1}},
- {2357, {wxPageSetupDialogData, enableMargins, 1}},
- {2358, {wxPageSetupDialogData, enableOrientation, 1}},
- {2359, {wxPageSetupDialogData, enablePaper, 1}},
- {2360, {wxPageSetupDialogData, enablePrinter, 1}},
- {2361, {wxPageSetupDialogData, getDefaultMinMargins, 0}},
- {2362, {wxPageSetupDialogData, getEnableMargins, 0}},
- {2363, {wxPageSetupDialogData, getEnableOrientation, 0}},
- {2364, {wxPageSetupDialogData, getEnablePaper, 0}},
- {2365, {wxPageSetupDialogData, getEnablePrinter, 0}},
- {2366, {wxPageSetupDialogData, getEnableHelp, 0}},
- {2367, {wxPageSetupDialogData, getDefaultInfo, 0}},
- {2368, {wxPageSetupDialogData, getMarginTopLeft, 0}},
- {2369, {wxPageSetupDialogData, getMarginBottomRight, 0}},
- {2370, {wxPageSetupDialogData, getMinMarginTopLeft, 0}},
- {2371, {wxPageSetupDialogData, getMinMarginBottomRight, 0}},
- {2372, {wxPageSetupDialogData, getPaperId, 0}},
- {2373, {wxPageSetupDialogData, getPaperSize, 0}},
- {2375, {wxPageSetupDialogData, getPrintData, 0}},
- {2376, {wxPageSetupDialogData, isOk, 0}},
- {2377, {wxPageSetupDialogData, setDefaultInfo, 1}},
- {2378, {wxPageSetupDialogData, setDefaultMinMargins, 1}},
- {2379, {wxPageSetupDialogData, setMarginTopLeft, 1}},
- {2380, {wxPageSetupDialogData, setMarginBottomRight, 1}},
- {2381, {wxPageSetupDialogData, setMinMarginTopLeft, 1}},
- {2382, {wxPageSetupDialogData, setMinMarginBottomRight, 1}},
- {2383, {wxPageSetupDialogData, setPaperId, 1}},
- {2384, {wxPageSetupDialogData, setPaperSize_1_1, 1}},
- {2385, {wxPageSetupDialogData, setPaperSize_1_0, 1}},
- {2386, {wxPageSetupDialogData, setPrintData, 1}},
- {2387, {wxPrintDialog, new_2_0, 2}},
- {2388, {wxPrintDialog, new_2_1, 2}},
- {2389, {wxPrintDialog, destruct, 0}},
- {2390, {wxPrintDialog, getPrintDialogData, 0}},
- {2391, {wxPrintDialog, getPrintDC, 0}},
- {2392, {wxPrintDialogData, new_0, 0}},
- {2393, {wxPrintDialogData, new_1_1, 1}},
- {2394, {wxPrintDialogData, new_1_0, 1}},
- {2395, {wxPrintDialogData, destruct, 0}},
- {2396, {wxPrintDialogData, enableHelp, 1}},
- {2397, {wxPrintDialogData, enablePageNumbers, 1}},
- {2398, {wxPrintDialogData, enablePrintToFile, 1}},
- {2399, {wxPrintDialogData, enableSelection, 1}},
- {2400, {wxPrintDialogData, getAllPages, 0}},
- {2401, {wxPrintDialogData, getCollate, 0}},
- {2402, {wxPrintDialogData, getFromPage, 0}},
- {2403, {wxPrintDialogData, getMaxPage, 0}},
- {2404, {wxPrintDialogData, getMinPage, 0}},
- {2405, {wxPrintDialogData, getNoCopies, 0}},
- {2406, {wxPrintDialogData, getPrintData, 0}},
- {2407, {wxPrintDialogData, getPrintToFile, 0}},
- {2408, {wxPrintDialogData, getSelection, 0}},
- {2409, {wxPrintDialogData, getToPage, 0}},
- {2410, {wxPrintDialogData, isOk, 0}},
- {2411, {wxPrintDialogData, setCollate, 1}},
- {2412, {wxPrintDialogData, setFromPage, 1}},
- {2413, {wxPrintDialogData, setMaxPage, 1}},
- {2414, {wxPrintDialogData, setMinPage, 1}},
- {2415, {wxPrintDialogData, setNoCopies, 1}},
- {2416, {wxPrintDialogData, setPrintData, 1}},
- {2417, {wxPrintDialogData, setPrintToFile, 1}},
- {2418, {wxPrintDialogData, setSelection, 1}},
- {2419, {wxPrintDialogData, setToPage, 1}},
- {2420, {wxPrintData, new_0, 0}},
- {2421, {wxPrintData, new_1, 1}},
- {2422, {wxPrintData, destruct, 0}},
- {2423, {wxPrintData, getCollate, 0}},
- {2424, {wxPrintData, getBin, 0}},
- {2425, {wxPrintData, getColour, 0}},
- {2426, {wxPrintData, getDuplex, 0}},
- {2427, {wxPrintData, getNoCopies, 0}},
- {2428, {wxPrintData, getOrientation, 0}},
- {2429, {wxPrintData, getPaperId, 0}},
- {2430, {wxPrintData, getPrinterName, 0}},
- {2431, {wxPrintData, getQuality, 0}},
- {2432, {wxPrintData, isOk, 0}},
- {2433, {wxPrintData, setBin, 1}},
- {2434, {wxPrintData, setCollate, 1}},
- {2435, {wxPrintData, setColour, 1}},
- {2436, {wxPrintData, setDuplex, 1}},
- {2437, {wxPrintData, setNoCopies, 1}},
- {2438, {wxPrintData, setOrientation, 1}},
- {2439, {wxPrintData, setPaperId, 1}},
- {2440, {wxPrintData, setPrinterName, 1}},
- {2441, {wxPrintData, setQuality, 1}},
- {2444, {wxPrintPreview, new_2, 2}},
- {2445, {wxPrintPreview, new_3, 3}},
- {2447, {wxPrintPreview, destruct, 0}},
- {2448, {wxPrintPreview, getCanvas, 0}},
- {2449, {wxPrintPreview, getCurrentPage, 0}},
- {2450, {wxPrintPreview, getFrame, 0}},
- {2451, {wxPrintPreview, getMaxPage, 0}},
- {2452, {wxPrintPreview, getMinPage, 0}},
- {2453, {wxPrintPreview, getPrintout, 0}},
- {2454, {wxPrintPreview, getPrintoutForPrinting, 0}},
- {2455, {wxPrintPreview, isOk, 0}},
- {2456, {wxPrintPreview, paintPage, 2}},
- {2457, {wxPrintPreview, print, 1}},
- {2458, {wxPrintPreview, renderPage, 1}},
- {2459, {wxPrintPreview, setCanvas, 1}},
- {2460, {wxPrintPreview, setCurrentPage, 1}},
- {2461, {wxPrintPreview, setFrame, 1}},
- {2462, {wxPrintPreview, setPrintout, 1}},
- {2463, {wxPrintPreview, setZoom, 1}},
- {2464, {wxPreviewFrame, new, 3}},
- {2465, {wxPreviewFrame, destruct, 0}},
- {2466, {wxPreviewFrame, createControlBar, 0}},
- {2467, {wxPreviewFrame, createCanvas, 0}},
- {2468, {wxPreviewFrame, initialize, 0}},
- {2469, {wxPreviewFrame, onCloseWindow, 1}},
- {2470, {wxPreviewControlBar, new, 4}},
- {2471, {wxPreviewControlBar, destruct, 0}},
- {2472, {wxPreviewControlBar, createButtons, 0}},
- {2473, {wxPreviewControlBar, getPrintPreview, 0}},
- {2474, {wxPreviewControlBar, getZoomControl, 0}},
- {2475, {wxPreviewControlBar, setZoomControl, 1}},
- {2477, {wxPrinter, new, 1}},
- {2478, {wxPrinter, createAbortWindow, 2}},
- {2479, {wxPrinter, getAbort, 0}},
- {2480, {wxPrinter, getLastError, 0}},
- {2481, {wxPrinter, getPrintDialogData, 0}},
- {2482, {wxPrinter, print, 3}},
- {2483, {wxPrinter, printDialog, 1}},
- {2484, {wxPrinter, reportError, 3}},
- {2485, {wxPrinter, setup, 1}},
- {2486, {wxPrinter, 'Destroy', undefined}},
- {2487, {wxXmlResource, new_1, 1}},
- {2488, {wxXmlResource, new_2, 2}},
- {2489, {wxXmlResource, destruct, 0}},
- {2490, {wxXmlResource, attachUnknownControl, 3}},
- {2491, {wxXmlResource, clearHandlers, 0}},
- {2492, {wxXmlResource, compareVersion, 4}},
- {2493, {wxXmlResource, get, 0}},
- {2494, {wxXmlResource, getFlags, 0}},
- {2495, {wxXmlResource, getVersion, 0}},
- {2496, {wxXmlResource, getXRCID, 2}},
- {2497, {wxXmlResource, initAllHandlers, 0}},
- {2498, {wxXmlResource, load, 1}},
- {2499, {wxXmlResource, loadBitmap, 1}},
- {2500, {wxXmlResource, loadDialog_2, 2}},
- {2501, {wxXmlResource, loadDialog_3, 3}},
- {2502, {wxXmlResource, loadFrame_2, 2}},
- {2503, {wxXmlResource, loadFrame_3, 3}},
- {2504, {wxXmlResource, loadIcon, 1}},
- {2505, {wxXmlResource, loadMenu, 1}},
- {2506, {wxXmlResource, loadMenuBar_2, 2}},
- {2507, {wxXmlResource, loadMenuBar_1, 1}},
- {2508, {wxXmlResource, loadPanel_2, 2}},
- {2509, {wxXmlResource, loadPanel_3, 3}},
- {2510, {wxXmlResource, loadToolBar, 2}},
- {2511, {wxXmlResource, set, 1}},
- {2512, {wxXmlResource, setFlags, 1}},
- {2513, {wxXmlResource, unload, 1}},
- {2514, {wxXmlResource, xrcctrl, 3}},
- {2515, {wxHtmlEasyPrinting, new, 1}},
- {2516, {wxHtmlEasyPrinting, destruct, 0}},
- {2517, {wxHtmlEasyPrinting, getPrintData, 0}},
- {2518, {wxHtmlEasyPrinting, getPageSetupData, 0}},
- {2519, {wxHtmlEasyPrinting, previewFile, 1}},
- {2520, {wxHtmlEasyPrinting, previewText, 2}},
- {2521, {wxHtmlEasyPrinting, printFile, 1}},
- {2522, {wxHtmlEasyPrinting, printText, 2}},
- {2523, {wxHtmlEasyPrinting, pageSetup, 0}},
- {2524, {wxHtmlEasyPrinting, setFonts, 3}},
- {2525, {wxHtmlEasyPrinting, setHeader, 2}},
- {2526, {wxHtmlEasyPrinting, setFooter, 2}},
- {2528, {wxGLCanvas, new_2, 2}},
- {2529, {wxGLCanvas, new_3_1, 3}},
- {2530, {wxGLCanvas, new_3_0, 3}},
- {2531, {wxGLCanvas, getContext, 0}},
- {2533, {wxGLCanvas, setCurrent, 0}},
- {2534, {wxGLCanvas, swapBuffers, 0}},
- {2535, {wxGLCanvas, 'Destroy', undefined}},
- {2536, {wxAuiManager, new, 1}},
- {2537, {wxAuiManager, destruct, 0}},
- {2538, {wxAuiManager, addPane_2_1, 2}},
- {2539, {wxAuiManager, addPane_3, 3}},
- {2540, {wxAuiManager, addPane_2_0, 2}},
- {2541, {wxAuiManager, detachPane, 1}},
- {2542, {wxAuiManager, getAllPanes, 0}},
- {2543, {wxAuiManager, getArtProvider, 0}},
- {2544, {wxAuiManager, getDockSizeConstraint, 2}},
- {2545, {wxAuiManager, getFlags, 0}},
- {2546, {wxAuiManager, getManagedWindow, 0}},
- {2547, {wxAuiManager, getManager, 1}},
- {2548, {wxAuiManager, getPane_1_1, 1}},
- {2549, {wxAuiManager, getPane_1_0, 1}},
- {2550, {wxAuiManager, hideHint, 0}},
- {2551, {wxAuiManager, insertPane, 3}},
- {2552, {wxAuiManager, loadPaneInfo, 2}},
- {2553, {wxAuiManager, loadPerspective, 2}},
- {2554, {wxAuiManager, savePaneInfo, 1}},
- {2555, {wxAuiManager, savePerspective, 0}},
- {2556, {wxAuiManager, setArtProvider, 1}},
- {2557, {wxAuiManager, setDockSizeConstraint, 2}},
- {2558, {wxAuiManager, setFlags, 1}},
- {2559, {wxAuiManager, setManagedWindow, 1}},
- {2560, {wxAuiManager, showHint, 1}},
- {2561, {wxAuiManager, unInit, 0}},
- {2562, {wxAuiManager, update, 0}},
- {2563, {wxAuiPaneInfo, new_0, 0}},
- {2564, {wxAuiPaneInfo, new_1, 1}},
- {2565, {wxAuiPaneInfo, destruct, 0}},
- {2566, {wxAuiPaneInfo, bestSize_1, 1}},
- {2567, {wxAuiPaneInfo, bestSize_2, 2}},
- {2568, {wxAuiPaneInfo, bottom, 0}},
- {2569, {wxAuiPaneInfo, bottomDockable, 1}},
- {2570, {wxAuiPaneInfo, caption, 1}},
- {2571, {wxAuiPaneInfo, captionVisible, 1}},
- {2572, {wxAuiPaneInfo, centre, 0}},
- {2573, {wxAuiPaneInfo, centrePane, 0}},
- {2574, {wxAuiPaneInfo, closeButton, 1}},
- {2575, {wxAuiPaneInfo, defaultPane, 0}},
- {2576, {wxAuiPaneInfo, destroyOnClose, 1}},
- {2577, {wxAuiPaneInfo, direction, 1}},
- {2578, {wxAuiPaneInfo, dock, 0}},
- {2579, {wxAuiPaneInfo, dockable, 1}},
- {2580, {wxAuiPaneInfo, fixed, 0}},
- {2581, {wxAuiPaneInfo, float, 0}},
- {2582, {wxAuiPaneInfo, floatable, 1}},
- {2583, {wxAuiPaneInfo, floatingPosition_1, 1}},
- {2584, {wxAuiPaneInfo, floatingPosition_2, 2}},
- {2585, {wxAuiPaneInfo, floatingSize_1, 1}},
- {2586, {wxAuiPaneInfo, floatingSize_2, 2}},
- {2587, {wxAuiPaneInfo, gripper, 1}},
- {2588, {wxAuiPaneInfo, gripperTop, 1}},
- {2589, {wxAuiPaneInfo, hasBorder, 0}},
- {2590, {wxAuiPaneInfo, hasCaption, 0}},
- {2591, {wxAuiPaneInfo, hasCloseButton, 0}},
- {2592, {wxAuiPaneInfo, hasFlag, 1}},
- {2593, {wxAuiPaneInfo, hasGripper, 0}},
- {2594, {wxAuiPaneInfo, hasGripperTop, 0}},
- {2595, {wxAuiPaneInfo, hasMaximizeButton, 0}},
- {2596, {wxAuiPaneInfo, hasMinimizeButton, 0}},
- {2597, {wxAuiPaneInfo, hasPinButton, 0}},
- {2598, {wxAuiPaneInfo, hide, 0}},
- {2599, {wxAuiPaneInfo, isBottomDockable, 0}},
- {2600, {wxAuiPaneInfo, isDocked, 0}},
- {2601, {wxAuiPaneInfo, isFixed, 0}},
- {2602, {wxAuiPaneInfo, isFloatable, 0}},
- {2603, {wxAuiPaneInfo, isFloating, 0}},
- {2604, {wxAuiPaneInfo, isLeftDockable, 0}},
- {2605, {wxAuiPaneInfo, isMovable, 0}},
- {2606, {wxAuiPaneInfo, isOk, 0}},
- {2607, {wxAuiPaneInfo, isResizable, 0}},
- {2608, {wxAuiPaneInfo, isRightDockable, 0}},
- {2609, {wxAuiPaneInfo, isShown, 0}},
- {2610, {wxAuiPaneInfo, isToolbar, 0}},
- {2611, {wxAuiPaneInfo, isTopDockable, 0}},
- {2612, {wxAuiPaneInfo, layer, 1}},
- {2613, {wxAuiPaneInfo, left, 0}},
- {2614, {wxAuiPaneInfo, leftDockable, 1}},
- {2615, {wxAuiPaneInfo, maxSize_1, 1}},
- {2616, {wxAuiPaneInfo, maxSize_2, 2}},
- {2617, {wxAuiPaneInfo, maximizeButton, 1}},
- {2618, {wxAuiPaneInfo, minSize_1, 1}},
- {2619, {wxAuiPaneInfo, minSize_2, 2}},
- {2620, {wxAuiPaneInfo, minimizeButton, 1}},
- {2621, {wxAuiPaneInfo, movable, 1}},
- {2622, {wxAuiPaneInfo, name, 1}},
- {2623, {wxAuiPaneInfo, paneBorder, 1}},
- {2624, {wxAuiPaneInfo, pinButton, 1}},
- {2625, {wxAuiPaneInfo, position, 1}},
- {2626, {wxAuiPaneInfo, resizable, 1}},
- {2627, {wxAuiPaneInfo, right, 0}},
- {2628, {wxAuiPaneInfo, rightDockable, 1}},
- {2629, {wxAuiPaneInfo, row, 1}},
- {2630, {wxAuiPaneInfo, safeSet, 1}},
- {2631, {wxAuiPaneInfo, setFlag, 2}},
- {2632, {wxAuiPaneInfo, show, 1}},
- {2633, {wxAuiPaneInfo, toolbarPane, 0}},
- {2634, {wxAuiPaneInfo, top, 0}},
- {2635, {wxAuiPaneInfo, topDockable, 1}},
- {2636, {wxAuiPaneInfo, window, 1}},
- {2637, {wxAuiNotebook, new_0, 0}},
- {2638, {wxAuiNotebook, new_2, 2}},
- {2639, {wxAuiNotebook, addPage, 3}},
- {2640, {wxAuiNotebook, create, 2}},
- {2641, {wxAuiNotebook, deletePage, 1}},
- {2642, {wxAuiNotebook, getArtProvider, 0}},
- {2643, {wxAuiNotebook, getPage, 1}},
- {2644, {wxAuiNotebook, getPageBitmap, 1}},
- {2645, {wxAuiNotebook, getPageCount, 0}},
- {2646, {wxAuiNotebook, getPageIndex, 1}},
- {2647, {wxAuiNotebook, getPageText, 1}},
- {2648, {wxAuiNotebook, getSelection, 0}},
- {2649, {wxAuiNotebook, insertPage, 4}},
- {2650, {wxAuiNotebook, removePage, 1}},
- {2651, {wxAuiNotebook, setArtProvider, 1}},
- {2652, {wxAuiNotebook, setFont, 1}},
- {2653, {wxAuiNotebook, setPageBitmap, 2}},
- {2654, {wxAuiNotebook, setPageText, 2}},
- {2655, {wxAuiNotebook, setSelection, 1}},
- {2656, {wxAuiNotebook, setTabCtrlHeight, 1}},
- {2657, {wxAuiNotebook, setUniformBitmapSize, 1}},
- {2658, {wxAuiNotebook, 'Destroy', undefined}},
- {2659, {wxMDIParentFrame, new_0, 0}},
- {2660, {wxMDIParentFrame, new_4, 4}},
- {2661, {wxMDIParentFrame, destruct, 0}},
- {2662, {wxMDIParentFrame, activateNext, 0}},
- {2663, {wxMDIParentFrame, activatePrevious, 0}},
- {2664, {wxMDIParentFrame, arrangeIcons, 0}},
- {2665, {wxMDIParentFrame, cascade, 0}},
- {2666, {wxMDIParentFrame, create, 4}},
- {2667, {wxMDIParentFrame, getActiveChild, 0}},
- {2668, {wxMDIParentFrame, getClientWindow, 0}},
- {2669, {wxMDIParentFrame, tile, 1}},
- {2670, {wxMDIChildFrame, new_0, 0}},
- {2671, {wxMDIChildFrame, new_4, 4}},
- {2672, {wxMDIChildFrame, destruct, 0}},
- {2673, {wxMDIChildFrame, activate, 0}},
- {2674, {wxMDIChildFrame, create, 4}},
- {2675, {wxMDIChildFrame, maximize, 1}},
- {2676, {wxMDIChildFrame, restore, 0}},
- {2677, {wxMDIClientWindow, new_0, 0}},
- {2678, {wxMDIClientWindow, new_2, 2}},
- {2679, {wxMDIClientWindow, destruct, 0}},
- {2680, {wxMDIClientWindow, createClient, 2}},
- {2681, {wxLayoutAlgorithm, new, 0}},
- {2682, {wxLayoutAlgorithm, layoutFrame, 2}},
- {2683, {wxLayoutAlgorithm, layoutMDIFrame, 2}},
- {2684, {wxLayoutAlgorithm, layoutWindow, 2}},
- {2685, {wxLayoutAlgorithm, 'Destroy', undefined}},
- {2686, {wxEvent, getId, 0}},
- {2687, {wxEvent, getSkipped, 0}},
- {2688, {wxEvent, getTimestamp, 0}},
- {2689, {wxEvent, isCommandEvent, 0}},
- {2690, {wxEvent, resumePropagation, 1}},
- {2691, {wxEvent, shouldPropagate, 0}},
- {2692, {wxEvent, skip, 1}},
- {2693, {wxEvent, stopPropagation, 0}},
- {2694, {wxCommandEvent, getClientData, 0}},
- {2695, {wxCommandEvent, getExtraLong, 0}},
- {2696, {wxCommandEvent, getInt, 0}},
- {2697, {wxCommandEvent, getSelection, 0}},
- {2698, {wxCommandEvent, getString, 0}},
- {2699, {wxCommandEvent, isChecked, 0}},
- {2700, {wxCommandEvent, isSelection, 0}},
- {2701, {wxCommandEvent, setInt, 1}},
- {2702, {wxCommandEvent, setString, 1}},
- {2703, {wxScrollEvent, getOrientation, 0}},
- {2704, {wxScrollEvent, getPosition, 0}},
- {2705, {wxScrollWinEvent, getOrientation, 0}},
- {2706, {wxScrollWinEvent, getPosition, 0}},
- {2707, {wxMouseEvent, altDown, 0}},
- {2708, {wxMouseEvent, button, 1}},
- {2709, {wxMouseEvent, buttonDClick, 1}},
- {2710, {wxMouseEvent, buttonDown, 1}},
- {2711, {wxMouseEvent, buttonUp, 1}},
- {2712, {wxMouseEvent, cmdDown, 0}},
- {2713, {wxMouseEvent, controlDown, 0}},
- {2714, {wxMouseEvent, dragging, 0}},
- {2715, {wxMouseEvent, entering, 0}},
- {2716, {wxMouseEvent, getButton, 0}},
- {2719, {wxMouseEvent, getPosition, 0}},
- {2720, {wxMouseEvent, getLogicalPosition, 1}},
- {2721, {wxMouseEvent, getLinesPerAction, 0}},
- {2722, {wxMouseEvent, getWheelRotation, 0}},
- {2723, {wxMouseEvent, getWheelDelta, 0}},
- {2724, {wxMouseEvent, getX, 0}},
- {2725, {wxMouseEvent, getY, 0}},
- {2726, {wxMouseEvent, isButton, 0}},
- {2727, {wxMouseEvent, isPageScroll, 0}},
- {2728, {wxMouseEvent, leaving, 0}},
- {2729, {wxMouseEvent, leftDClick, 0}},
- {2730, {wxMouseEvent, leftDown, 0}},
- {2731, {wxMouseEvent, leftIsDown, 0}},
- {2732, {wxMouseEvent, leftUp, 0}},
- {2733, {wxMouseEvent, metaDown, 0}},
- {2734, {wxMouseEvent, middleDClick, 0}},
- {2735, {wxMouseEvent, middleDown, 0}},
- {2736, {wxMouseEvent, middleIsDown, 0}},
- {2737, {wxMouseEvent, middleUp, 0}},
- {2738, {wxMouseEvent, moving, 0}},
- {2739, {wxMouseEvent, rightDClick, 0}},
- {2740, {wxMouseEvent, rightDown, 0}},
- {2741, {wxMouseEvent, rightIsDown, 0}},
- {2742, {wxMouseEvent, rightUp, 0}},
- {2743, {wxMouseEvent, shiftDown, 0}},
- {2744, {wxSetCursorEvent, getCursor, 0}},
- {2745, {wxSetCursorEvent, getX, 0}},
- {2746, {wxSetCursorEvent, getY, 0}},
- {2747, {wxSetCursorEvent, hasCursor, 0}},
- {2748, {wxSetCursorEvent, setCursor, 1}},
- {2749, {wxKeyEvent, altDown, 0}},
- {2750, {wxKeyEvent, cmdDown, 0}},
- {2751, {wxKeyEvent, controlDown, 0}},
- {2752, {wxKeyEvent, getKeyCode, 0}},
- {2753, {wxKeyEvent, getModifiers, 0}},
- {2756, {wxKeyEvent, getPosition, 0}},
- {2757, {wxKeyEvent, getRawKeyCode, 0}},
- {2758, {wxKeyEvent, getRawKeyFlags, 0}},
- {2759, {wxKeyEvent, getUnicodeKey, 0}},
- {2760, {wxKeyEvent, getX, 0}},
- {2761, {wxKeyEvent, getY, 0}},
- {2762, {wxKeyEvent, hasModifiers, 0}},
- {2763, {wxKeyEvent, metaDown, 0}},
- {2764, {wxKeyEvent, shiftDown, 0}},
- {2765, {wxSizeEvent, getSize, 0}},
- {2766, {wxMoveEvent, getPosition, 0}},
- {2767, {wxEraseEvent, getDC, 0}},
- {2768, {wxFocusEvent, getWindow, 0}},
- {2769, {wxChildFocusEvent, getWindow, 0}},
- {2770, {wxMenuEvent, getMenu, 0}},
- {2771, {wxMenuEvent, getMenuId, 0}},
- {2772, {wxMenuEvent, isPopup, 0}},
- {2773, {wxCloseEvent, canVeto, 0}},
- {2774, {wxCloseEvent, getLoggingOff, 0}},
- {2775, {wxCloseEvent, setCanVeto, 1}},
- {2776, {wxCloseEvent, setLoggingOff, 1}},
- {2777, {wxCloseEvent, veto, 1}},
- {2778, {wxShowEvent, setShow, 1}},
- {2779, {wxShowEvent, getShow, 0}},
- {2780, {wxIconizeEvent, iconized, 0}},
- {2781, {wxJoystickEvent, buttonDown, 1}},
- {2782, {wxJoystickEvent, buttonIsDown, 1}},
- {2783, {wxJoystickEvent, buttonUp, 1}},
- {2784, {wxJoystickEvent, getButtonChange, 0}},
- {2785, {wxJoystickEvent, getButtonState, 0}},
- {2786, {wxJoystickEvent, getJoystick, 0}},
- {2787, {wxJoystickEvent, getPosition, 0}},
- {2788, {wxJoystickEvent, getZPosition, 0}},
- {2789, {wxJoystickEvent, isButton, 0}},
- {2790, {wxJoystickEvent, isMove, 0}},
- {2791, {wxJoystickEvent, isZMove, 0}},
- {2792, {wxUpdateUIEvent, canUpdate, 1}},
- {2793, {wxUpdateUIEvent, check, 1}},
- {2794, {wxUpdateUIEvent, enable, 1}},
- {2795, {wxUpdateUIEvent, show, 1}},
- {2796, {wxUpdateUIEvent, getChecked, 0}},
- {2797, {wxUpdateUIEvent, getEnabled, 0}},
- {2798, {wxUpdateUIEvent, getShown, 0}},
- {2799, {wxUpdateUIEvent, getSetChecked, 0}},
- {2800, {wxUpdateUIEvent, getSetEnabled, 0}},
- {2801, {wxUpdateUIEvent, getSetShown, 0}},
- {2802, {wxUpdateUIEvent, getSetText, 0}},
- {2803, {wxUpdateUIEvent, getText, 0}},
- {2804, {wxUpdateUIEvent, getMode, 0}},
- {2805, {wxUpdateUIEvent, getUpdateInterval, 0}},
- {2806, {wxUpdateUIEvent, resetUpdateTime, 0}},
- {2807, {wxUpdateUIEvent, setMode, 1}},
- {2808, {wxUpdateUIEvent, setText, 1}},
- {2809, {wxUpdateUIEvent, setUpdateInterval, 1}},
- {2810, {wxMouseCaptureChangedEvent, getCapturedWindow, 0}},
- {2811, {wxPaletteChangedEvent, setChangedWindow, 1}},
- {2812, {wxPaletteChangedEvent, getChangedWindow, 0}},
- {2813, {wxQueryNewPaletteEvent, setPaletteRealized, 1}},
- {2814, {wxQueryNewPaletteEvent, getPaletteRealized, 0}},
- {2815, {wxNavigationKeyEvent, getDirection, 0}},
- {2816, {wxNavigationKeyEvent, setDirection, 1}},
- {2817, {wxNavigationKeyEvent, isWindowChange, 0}},
- {2818, {wxNavigationKeyEvent, setWindowChange, 1}},
- {2819, {wxNavigationKeyEvent, isFromTab, 0}},
- {2820, {wxNavigationKeyEvent, setFromTab, 1}},
- {2821, {wxNavigationKeyEvent, getCurrentFocus, 0}},
- {2822, {wxNavigationKeyEvent, setCurrentFocus, 1}},
- {2823, {wxHelpEvent, getOrigin, 0}},
- {2824, {wxHelpEvent, getPosition, 0}},
- {2825, {wxHelpEvent, setOrigin, 1}},
- {2826, {wxHelpEvent, setPosition, 1}},
- {2827, {wxContextMenuEvent, getPosition, 0}},
- {2828, {wxContextMenuEvent, setPosition, 1}},
- {2829, {wxIdleEvent, canSend, 1}},
- {2830, {wxIdleEvent, getMode, 0}},
- {2831, {wxIdleEvent, requestMore, 1}},
- {2832, {wxIdleEvent, moreRequested, 0}},
- {2833, {wxIdleEvent, setMode, 1}},
- {2834, {wxGridEvent, altDown, 0}},
- {2835, {wxGridEvent, controlDown, 0}},
- {2836, {wxGridEvent, getCol, 0}},
- {2837, {wxGridEvent, getPosition, 0}},
- {2838, {wxGridEvent, getRow, 0}},
- {2839, {wxGridEvent, metaDown, 0}},
- {2840, {wxGridEvent, selecting, 0}},
- {2841, {wxGridEvent, shiftDown, 0}},
- {2842, {wxNotifyEvent, allow, 0}},
- {2843, {wxNotifyEvent, isAllowed, 0}},
- {2844, {wxNotifyEvent, veto, 0}},
- {2845, {wxSashEvent, getEdge, 0}},
- {2846, {wxSashEvent, getDragRect, 0}},
- {2847, {wxSashEvent, getDragStatus, 0}},
- {2848, {wxListEvent, getCacheFrom, 0}},
- {2849, {wxListEvent, getCacheTo, 0}},
- {2850, {wxListEvent, getKeyCode, 0}},
- {2851, {wxListEvent, getIndex, 0}},
- {2852, {wxListEvent, getColumn, 0}},
- {2853, {wxListEvent, getPoint, 0}},
- {2854, {wxListEvent, getLabel, 0}},
- {2855, {wxListEvent, getText, 0}},
- {2856, {wxListEvent, getImage, 0}},
- {2857, {wxListEvent, getData, 0}},
- {2858, {wxListEvent, getMask, 0}},
- {2859, {wxListEvent, getItem, 0}},
- {2860, {wxListEvent, isEditCancelled, 0}},
- {2861, {wxDateEvent, getDate, 0}},
- {2862, {wxCalendarEvent, getWeekDay, 0}},
- {2863, {wxFileDirPickerEvent, getPath, 0}},
- {2864, {wxColourPickerEvent, getColour, 0}},
- {2865, {wxFontPickerEvent, getFont, 0}},
- {2866, {wxStyledTextEvent, getPosition, 0}},
- {2867, {wxStyledTextEvent, getKey, 0}},
- {2868, {wxStyledTextEvent, getModifiers, 0}},
- {2869, {wxStyledTextEvent, getModificationType, 0}},
- {2870, {wxStyledTextEvent, getText, 0}},
- {2871, {wxStyledTextEvent, getLength, 0}},
- {2872, {wxStyledTextEvent, getLinesAdded, 0}},
- {2873, {wxStyledTextEvent, getLine, 0}},
- {2874, {wxStyledTextEvent, getFoldLevelNow, 0}},
- {2875, {wxStyledTextEvent, getFoldLevelPrev, 0}},
- {2876, {wxStyledTextEvent, getMargin, 0}},
- {2877, {wxStyledTextEvent, getMessage, 0}},
- {2878, {wxStyledTextEvent, getWParam, 0}},
- {2879, {wxStyledTextEvent, getLParam, 0}},
- {2880, {wxStyledTextEvent, getListType, 0}},
- {2881, {wxStyledTextEvent, getX, 0}},
- {2882, {wxStyledTextEvent, getY, 0}},
- {2883, {wxStyledTextEvent, getDragText, 0}},
- {2884, {wxStyledTextEvent, getDragAllowMove, 0}},
- {2885, {wxStyledTextEvent, getDragResult, 0}},
- {2886, {wxStyledTextEvent, getShift, 0}},
- {2887, {wxStyledTextEvent, getControl, 0}},
- {2888, {wxStyledTextEvent, getAlt, 0}},
- {2889, {utils, getKeyState, 1}},
- {2890, {utils, getMousePosition, 2}},
- {2891, {utils, getMouseState, 0}},
- {2892, {utils, setDetectableAutoRepeat, 1}},
- {2893, {utils, bell, 0}},
- {2894, {utils, findMenuItemId, 3}},
- {2895, {utils, genericFindWindowAtPoint, 1}},
- {2896, {utils, findWindowAtPoint, 1}},
- {2897, {utils, beginBusyCursor, 1}},
- {2898, {utils, endBusyCursor, 0}},
- {2899, {utils, isBusy, 0}},
- {2900, {utils, shutdown, 1}},
- {2901, {utils, shell, 1}},
- {2902, {utils, launchDefaultBrowser, 2}},
- {2903, {utils, getEmailAddress, 0}},
- {2904, {utils, getUserId, 0}},
- {2905, {utils, getHomeDir, 0}},
- {2906, {utils, newId, 0}},
- {2907, {utils, registerId, 1}},
- {2908, {utils, getCurrentId, 0}},
- {2909, {utils, getOsDescription, 0}},
- {2910, {utils, isPlatformLittleEndian, 0}},
- {2911, {utils, isPlatform64Bit, 0}},
- {2912, {wxPrintout, new, 1}},
- {2913, {wxPrintout, destruct, 0}},
- {2914, {wxPrintout, getDC, 0}},
- {2915, {wxPrintout, getPageSizeMM, 2}},
- {2916, {wxPrintout, getPageSizePixels, 2}},
- {2917, {wxPrintout, getPaperRectPixels, 0}},
- {2918, {wxPrintout, getPPIPrinter, 2}},
- {2919, {wxPrintout, getPPIScreen, 2}},
- {2920, {wxPrintout, getTitle, 0}},
- {2921, {wxPrintout, isPreview, 0}},
- {2922, {wxPrintout, fitThisSizeToPaper, 1}},
- {2923, {wxPrintout, fitThisSizeToPage, 1}},
- {2924, {wxPrintout, fitThisSizeToPageMargins, 2}},
- {2925, {wxPrintout, mapScreenSizeToPaper, 0}},
- {2926, {wxPrintout, mapScreenSizeToPage, 0}},
- {2927, {wxPrintout, mapScreenSizeToPageMargins, 1}},
- {2928, {wxPrintout, mapScreenSizeToDevice, 0}},
- {2929, {wxPrintout, getLogicalPaperRect, 0}},
- {2930, {wxPrintout, getLogicalPageRect, 0}},
- {2931, {wxPrintout, getLogicalPageMarginsRect, 1}},
- {2932, {wxPrintout, setLogicalOrigin, 2}},
- {2933, {wxPrintout, offsetLogicalOrigin, 2}},
- {2934, {wxStyledTextCtrl, new_2, 2}},
- {2935, {wxStyledTextCtrl, new_0, 0}},
- {2936, {wxStyledTextCtrl, destruct, 0}},
- {2937, {wxStyledTextCtrl, create, 2}},
- {2938, {wxStyledTextCtrl, addText, 1}},
- {2939, {wxStyledTextCtrl, addStyledText, 1}},
- {2940, {wxStyledTextCtrl, insertText, 2}},
- {2941, {wxStyledTextCtrl, clearAll, 0}},
- {2942, {wxStyledTextCtrl, clearDocumentStyle, 0}},
- {2943, {wxStyledTextCtrl, getLength, 0}},
- {2944, {wxStyledTextCtrl, getCharAt, 1}},
- {2945, {wxStyledTextCtrl, getCurrentPos, 0}},
- {2946, {wxStyledTextCtrl, getAnchor, 0}},
- {2947, {wxStyledTextCtrl, getStyleAt, 1}},
- {2948, {wxStyledTextCtrl, redo, 0}},
- {2949, {wxStyledTextCtrl, setUndoCollection, 1}},
- {2950, {wxStyledTextCtrl, selectAll, 0}},
- {2951, {wxStyledTextCtrl, setSavePoint, 0}},
- {2952, {wxStyledTextCtrl, getStyledText, 2}},
- {2953, {wxStyledTextCtrl, canRedo, 0}},
- {2954, {wxStyledTextCtrl, markerLineFromHandle, 1}},
- {2955, {wxStyledTextCtrl, markerDeleteHandle, 1}},
- {2956, {wxStyledTextCtrl, getUndoCollection, 0}},
- {2957, {wxStyledTextCtrl, getViewWhiteSpace, 0}},
- {2958, {wxStyledTextCtrl, setViewWhiteSpace, 1}},
- {2959, {wxStyledTextCtrl, positionFromPoint, 1}},
- {2960, {wxStyledTextCtrl, positionFromPointClose, 2}},
- {2961, {wxStyledTextCtrl, gotoLine, 1}},
- {2962, {wxStyledTextCtrl, gotoPos, 1}},
- {2963, {wxStyledTextCtrl, setAnchor, 1}},
- {2964, {wxStyledTextCtrl, getCurLine, 1}},
- {2965, {wxStyledTextCtrl, getEndStyled, 0}},
- {2966, {wxStyledTextCtrl, convertEOLs, 1}},
- {2967, {wxStyledTextCtrl, getEOLMode, 0}},
- {2968, {wxStyledTextCtrl, setEOLMode, 1}},
- {2969, {wxStyledTextCtrl, startStyling, 2}},
- {2970, {wxStyledTextCtrl, setStyling, 2}},
- {2971, {wxStyledTextCtrl, getBufferedDraw, 0}},
- {2972, {wxStyledTextCtrl, setBufferedDraw, 1}},
- {2973, {wxStyledTextCtrl, setTabWidth, 1}},
- {2974, {wxStyledTextCtrl, getTabWidth, 0}},
- {2975, {wxStyledTextCtrl, setCodePage, 1}},
- {2976, {wxStyledTextCtrl, markerDefine, 3}},
- {2977, {wxStyledTextCtrl, markerSetForeground, 2}},
- {2978, {wxStyledTextCtrl, markerSetBackground, 2}},
- {2979, {wxStyledTextCtrl, markerAdd, 2}},
- {2980, {wxStyledTextCtrl, markerDelete, 2}},
- {2981, {wxStyledTextCtrl, markerDeleteAll, 1}},
- {2982, {wxStyledTextCtrl, markerGet, 1}},
- {2983, {wxStyledTextCtrl, markerNext, 2}},
- {2984, {wxStyledTextCtrl, markerPrevious, 2}},
- {2985, {wxStyledTextCtrl, markerDefineBitmap, 2}},
- {2986, {wxStyledTextCtrl, markerAddSet, 2}},
- {2987, {wxStyledTextCtrl, markerSetAlpha, 2}},
- {2988, {wxStyledTextCtrl, setMarginType, 2}},
- {2989, {wxStyledTextCtrl, getMarginType, 1}},
- {2990, {wxStyledTextCtrl, setMarginWidth, 2}},
- {2991, {wxStyledTextCtrl, getMarginWidth, 1}},
- {2992, {wxStyledTextCtrl, setMarginMask, 2}},
- {2993, {wxStyledTextCtrl, getMarginMask, 1}},
- {2994, {wxStyledTextCtrl, setMarginSensitive, 2}},
- {2995, {wxStyledTextCtrl, getMarginSensitive, 1}},
- {2996, {wxStyledTextCtrl, styleClearAll, 0}},
- {2997, {wxStyledTextCtrl, styleSetForeground, 2}},
- {2998, {wxStyledTextCtrl, styleSetBackground, 2}},
- {2999, {wxStyledTextCtrl, styleSetBold, 2}},
- {3000, {wxStyledTextCtrl, styleSetItalic, 2}},
- {3001, {wxStyledTextCtrl, styleSetSize, 2}},
- {3002, {wxStyledTextCtrl, styleSetFaceName, 2}},
- {3003, {wxStyledTextCtrl, styleSetEOLFilled, 2}},
- {3004, {wxStyledTextCtrl, styleResetDefault, 0}},
- {3005, {wxStyledTextCtrl, styleSetUnderline, 2}},
- {3006, {wxStyledTextCtrl, styleSetCase, 2}},
- {3007, {wxStyledTextCtrl, styleSetHotSpot, 2}},
- {3008, {wxStyledTextCtrl, setSelForeground, 2}},
- {3009, {wxStyledTextCtrl, setSelBackground, 2}},
- {3010, {wxStyledTextCtrl, getSelAlpha, 0}},
- {3011, {wxStyledTextCtrl, setSelAlpha, 1}},
- {3012, {wxStyledTextCtrl, setCaretForeground, 1}},
- {3013, {wxStyledTextCtrl, cmdKeyAssign, 3}},
- {3014, {wxStyledTextCtrl, cmdKeyClear, 2}},
- {3015, {wxStyledTextCtrl, cmdKeyClearAll, 0}},
- {3016, {wxStyledTextCtrl, setStyleBytes, 2}},
- {3017, {wxStyledTextCtrl, styleSetVisible, 2}},
- {3018, {wxStyledTextCtrl, getCaretPeriod, 0}},
- {3019, {wxStyledTextCtrl, setCaretPeriod, 1}},
- {3020, {wxStyledTextCtrl, setWordChars, 1}},
- {3021, {wxStyledTextCtrl, beginUndoAction, 0}},
- {3022, {wxStyledTextCtrl, endUndoAction, 0}},
- {3023, {wxStyledTextCtrl, indicatorSetStyle, 2}},
- {3024, {wxStyledTextCtrl, indicatorGetStyle, 1}},
- {3025, {wxStyledTextCtrl, indicatorSetForeground, 2}},
- {3026, {wxStyledTextCtrl, indicatorGetForeground, 1}},
- {3027, {wxStyledTextCtrl, setWhitespaceForeground, 2}},
- {3028, {wxStyledTextCtrl, setWhitespaceBackground, 2}},
- {3029, {wxStyledTextCtrl, getStyleBits, 0}},
- {3030, {wxStyledTextCtrl, setLineState, 2}},
- {3031, {wxStyledTextCtrl, getLineState, 1}},
- {3032, {wxStyledTextCtrl, getMaxLineState, 0}},
- {3033, {wxStyledTextCtrl, getCaretLineVisible, 0}},
- {3034, {wxStyledTextCtrl, setCaretLineVisible, 1}},
- {3035, {wxStyledTextCtrl, getCaretLineBackground, 0}},
- {3036, {wxStyledTextCtrl, setCaretLineBackground, 1}},
- {3037, {wxStyledTextCtrl, autoCompShow, 2}},
- {3038, {wxStyledTextCtrl, autoCompCancel, 0}},
- {3039, {wxStyledTextCtrl, autoCompActive, 0}},
- {3040, {wxStyledTextCtrl, autoCompPosStart, 0}},
- {3041, {wxStyledTextCtrl, autoCompComplete, 0}},
- {3042, {wxStyledTextCtrl, autoCompStops, 1}},
- {3043, {wxStyledTextCtrl, autoCompSetSeparator, 1}},
- {3044, {wxStyledTextCtrl, autoCompGetSeparator, 0}},
- {3045, {wxStyledTextCtrl, autoCompSelect, 1}},
- {3046, {wxStyledTextCtrl, autoCompSetCancelAtStart, 1}},
- {3047, {wxStyledTextCtrl, autoCompGetCancelAtStart, 0}},
- {3048, {wxStyledTextCtrl, autoCompSetFillUps, 1}},
- {3049, {wxStyledTextCtrl, autoCompSetChooseSingle, 1}},
- {3050, {wxStyledTextCtrl, autoCompGetChooseSingle, 0}},
- {3051, {wxStyledTextCtrl, autoCompSetIgnoreCase, 1}},
- {3052, {wxStyledTextCtrl, autoCompGetIgnoreCase, 0}},
- {3053, {wxStyledTextCtrl, userListShow, 2}},
- {3054, {wxStyledTextCtrl, autoCompSetAutoHide, 1}},
- {3055, {wxStyledTextCtrl, autoCompGetAutoHide, 0}},
- {3056, {wxStyledTextCtrl, autoCompSetDropRestOfWord, 1}},
- {3057, {wxStyledTextCtrl, autoCompGetDropRestOfWord, 0}},
- {3058, {wxStyledTextCtrl, registerImage, 2}},
- {3059, {wxStyledTextCtrl, clearRegisteredImages, 0}},
- {3060, {wxStyledTextCtrl, autoCompGetTypeSeparator, 0}},
- {3061, {wxStyledTextCtrl, autoCompSetTypeSeparator, 1}},
- {3062, {wxStyledTextCtrl, autoCompSetMaxWidth, 1}},
- {3063, {wxStyledTextCtrl, autoCompGetMaxWidth, 0}},
- {3064, {wxStyledTextCtrl, autoCompSetMaxHeight, 1}},
- {3065, {wxStyledTextCtrl, autoCompGetMaxHeight, 0}},
- {3066, {wxStyledTextCtrl, setIndent, 1}},
- {3067, {wxStyledTextCtrl, getIndent, 0}},
- {3068, {wxStyledTextCtrl, setUseTabs, 1}},
- {3069, {wxStyledTextCtrl, getUseTabs, 0}},
- {3070, {wxStyledTextCtrl, setLineIndentation, 2}},
- {3071, {wxStyledTextCtrl, getLineIndentation, 1}},
- {3072, {wxStyledTextCtrl, getLineIndentPosition, 1}},
- {3073, {wxStyledTextCtrl, getColumn, 1}},
- {3074, {wxStyledTextCtrl, setUseHorizontalScrollBar, 1}},
- {3075, {wxStyledTextCtrl, getUseHorizontalScrollBar, 0}},
- {3076, {wxStyledTextCtrl, setIndentationGuides, 1}},
- {3077, {wxStyledTextCtrl, getIndentationGuides, 0}},
- {3078, {wxStyledTextCtrl, setHighlightGuide, 1}},
- {3079, {wxStyledTextCtrl, getHighlightGuide, 0}},
- {3080, {wxStyledTextCtrl, getLineEndPosition, 1}},
- {3081, {wxStyledTextCtrl, getCodePage, 0}},
- {3082, {wxStyledTextCtrl, getCaretForeground, 0}},
- {3083, {wxStyledTextCtrl, getReadOnly, 0}},
- {3084, {wxStyledTextCtrl, setCurrentPos, 1}},
- {3085, {wxStyledTextCtrl, setSelectionStart, 1}},
- {3086, {wxStyledTextCtrl, getSelectionStart, 0}},
- {3087, {wxStyledTextCtrl, setSelectionEnd, 1}},
- {3088, {wxStyledTextCtrl, getSelectionEnd, 0}},
- {3089, {wxStyledTextCtrl, setPrintMagnification, 1}},
- {3090, {wxStyledTextCtrl, getPrintMagnification, 0}},
- {3091, {wxStyledTextCtrl, setPrintColourMode, 1}},
- {3092, {wxStyledTextCtrl, getPrintColourMode, 0}},
- {3093, {wxStyledTextCtrl, findText, 4}},
- {3094, {wxStyledTextCtrl, formatRange, 7}},
- {3095, {wxStyledTextCtrl, getFirstVisibleLine, 0}},
- {3096, {wxStyledTextCtrl, getLine, 1}},
- {3097, {wxStyledTextCtrl, getLineCount, 0}},
- {3098, {wxStyledTextCtrl, setMarginLeft, 1}},
- {3099, {wxStyledTextCtrl, getMarginLeft, 0}},
- {3100, {wxStyledTextCtrl, setMarginRight, 1}},
- {3101, {wxStyledTextCtrl, getMarginRight, 0}},
- {3102, {wxStyledTextCtrl, getModify, 0}},
- {3103, {wxStyledTextCtrl, setSelection, 2}},
- {3104, {wxStyledTextCtrl, getSelectedText, 0}},
- {3105, {wxStyledTextCtrl, getTextRange, 2}},
- {3106, {wxStyledTextCtrl, hideSelection, 1}},
- {3107, {wxStyledTextCtrl, lineFromPosition, 1}},
- {3108, {wxStyledTextCtrl, positionFromLine, 1}},
- {3109, {wxStyledTextCtrl, lineScroll, 2}},
- {3110, {wxStyledTextCtrl, ensureCaretVisible, 0}},
- {3111, {wxStyledTextCtrl, replaceSelection, 1}},
- {3112, {wxStyledTextCtrl, setReadOnly, 1}},
- {3113, {wxStyledTextCtrl, canPaste, 0}},
- {3114, {wxStyledTextCtrl, canUndo, 0}},
- {3115, {wxStyledTextCtrl, emptyUndoBuffer, 0}},
- {3116, {wxStyledTextCtrl, undo, 0}},
- {3117, {wxStyledTextCtrl, cut, 0}},
- {3118, {wxStyledTextCtrl, copy, 0}},
- {3119, {wxStyledTextCtrl, paste, 0}},
- {3120, {wxStyledTextCtrl, clear, 0}},
- {3121, {wxStyledTextCtrl, setText, 1}},
- {3122, {wxStyledTextCtrl, getText, 0}},
- {3123, {wxStyledTextCtrl, getTextLength, 0}},
- {3124, {wxStyledTextCtrl, getOvertype, 0}},
- {3125, {wxStyledTextCtrl, setCaretWidth, 1}},
- {3126, {wxStyledTextCtrl, getCaretWidth, 0}},
- {3127, {wxStyledTextCtrl, setTargetStart, 1}},
- {3128, {wxStyledTextCtrl, getTargetStart, 0}},
- {3129, {wxStyledTextCtrl, setTargetEnd, 1}},
- {3130, {wxStyledTextCtrl, getTargetEnd, 0}},
- {3131, {wxStyledTextCtrl, replaceTarget, 1}},
- {3132, {wxStyledTextCtrl, searchInTarget, 1}},
- {3133, {wxStyledTextCtrl, setSearchFlags, 1}},
- {3134, {wxStyledTextCtrl, getSearchFlags, 0}},
- {3135, {wxStyledTextCtrl, callTipShow, 2}},
- {3136, {wxStyledTextCtrl, callTipCancel, 0}},
- {3137, {wxStyledTextCtrl, callTipActive, 0}},
- {3138, {wxStyledTextCtrl, callTipPosAtStart, 0}},
- {3139, {wxStyledTextCtrl, callTipSetHighlight, 2}},
- {3140, {wxStyledTextCtrl, callTipSetBackground, 1}},
- {3141, {wxStyledTextCtrl, callTipSetForeground, 1}},
- {3142, {wxStyledTextCtrl, callTipSetForegroundHighlight, 1}},
- {3143, {wxStyledTextCtrl, callTipUseStyle, 1}},
- {3144, {wxStyledTextCtrl, visibleFromDocLine, 1}},
- {3145, {wxStyledTextCtrl, docLineFromVisible, 1}},
- {3146, {wxStyledTextCtrl, wrapCount, 1}},
- {3147, {wxStyledTextCtrl, setFoldLevel, 2}},
- {3148, {wxStyledTextCtrl, getFoldLevel, 1}},
- {3149, {wxStyledTextCtrl, getLastChild, 2}},
- {3150, {wxStyledTextCtrl, getFoldParent, 1}},
- {3151, {wxStyledTextCtrl, showLines, 2}},
- {3152, {wxStyledTextCtrl, hideLines, 2}},
- {3153, {wxStyledTextCtrl, getLineVisible, 1}},
- {3154, {wxStyledTextCtrl, setFoldExpanded, 2}},
- {3155, {wxStyledTextCtrl, getFoldExpanded, 1}},
- {3156, {wxStyledTextCtrl, toggleFold, 1}},
- {3157, {wxStyledTextCtrl, ensureVisible, 1}},
- {3158, {wxStyledTextCtrl, setFoldFlags, 1}},
- {3159, {wxStyledTextCtrl, ensureVisibleEnforcePolicy, 1}},
- {3160, {wxStyledTextCtrl, setTabIndents, 1}},
- {3161, {wxStyledTextCtrl, getTabIndents, 0}},
- {3162, {wxStyledTextCtrl, setBackSpaceUnIndents, 1}},
- {3163, {wxStyledTextCtrl, getBackSpaceUnIndents, 0}},
- {3164, {wxStyledTextCtrl, setMouseDwellTime, 1}},
- {3165, {wxStyledTextCtrl, getMouseDwellTime, 0}},
- {3166, {wxStyledTextCtrl, wordStartPosition, 2}},
- {3167, {wxStyledTextCtrl, wordEndPosition, 2}},
- {3168, {wxStyledTextCtrl, setWrapMode, 1}},
- {3169, {wxStyledTextCtrl, getWrapMode, 0}},
- {3170, {wxStyledTextCtrl, setWrapVisualFlags, 1}},
- {3171, {wxStyledTextCtrl, getWrapVisualFlags, 0}},
- {3172, {wxStyledTextCtrl, setWrapVisualFlagsLocation, 1}},
- {3173, {wxStyledTextCtrl, getWrapVisualFlagsLocation, 0}},
- {3174, {wxStyledTextCtrl, setWrapStartIndent, 1}},
- {3175, {wxStyledTextCtrl, getWrapStartIndent, 0}},
- {3176, {wxStyledTextCtrl, setLayoutCache, 1}},
- {3177, {wxStyledTextCtrl, getLayoutCache, 0}},
- {3178, {wxStyledTextCtrl, setScrollWidth, 1}},
- {3179, {wxStyledTextCtrl, getScrollWidth, 0}},
- {3180, {wxStyledTextCtrl, textWidth, 2}},
- {3181, {wxStyledTextCtrl, getEndAtLastLine, 0}},
- {3182, {wxStyledTextCtrl, textHeight, 1}},
- {3183, {wxStyledTextCtrl, setUseVerticalScrollBar, 1}},
- {3184, {wxStyledTextCtrl, getUseVerticalScrollBar, 0}},
- {3185, {wxStyledTextCtrl, appendText, 1}},
- {3186, {wxStyledTextCtrl, getTwoPhaseDraw, 0}},
- {3187, {wxStyledTextCtrl, setTwoPhaseDraw, 1}},
- {3188, {wxStyledTextCtrl, targetFromSelection, 0}},
- {3189, {wxStyledTextCtrl, linesJoin, 0}},
- {3190, {wxStyledTextCtrl, linesSplit, 1}},
- {3191, {wxStyledTextCtrl, setFoldMarginColour, 2}},
- {3192, {wxStyledTextCtrl, setFoldMarginHiColour, 2}},
- {3193, {wxStyledTextCtrl, lineDown, 0}},
- {3194, {wxStyledTextCtrl, lineDownExtend, 0}},
- {3195, {wxStyledTextCtrl, lineUp, 0}},
- {3196, {wxStyledTextCtrl, lineUpExtend, 0}},
- {3197, {wxStyledTextCtrl, charLeft, 0}},
- {3198, {wxStyledTextCtrl, charLeftExtend, 0}},
- {3199, {wxStyledTextCtrl, charRight, 0}},
- {3200, {wxStyledTextCtrl, charRightExtend, 0}},
- {3201, {wxStyledTextCtrl, wordLeft, 0}},
- {3202, {wxStyledTextCtrl, wordLeftExtend, 0}},
- {3203, {wxStyledTextCtrl, wordRight, 0}},
- {3204, {wxStyledTextCtrl, wordRightExtend, 0}},
- {3205, {wxStyledTextCtrl, home, 0}},
- {3206, {wxStyledTextCtrl, homeExtend, 0}},
- {3207, {wxStyledTextCtrl, lineEnd, 0}},
- {3208, {wxStyledTextCtrl, lineEndExtend, 0}},
- {3209, {wxStyledTextCtrl, documentStart, 0}},
- {3210, {wxStyledTextCtrl, documentStartExtend, 0}},
- {3211, {wxStyledTextCtrl, documentEnd, 0}},
- {3212, {wxStyledTextCtrl, documentEndExtend, 0}},
- {3213, {wxStyledTextCtrl, pageUp, 0}},
- {3214, {wxStyledTextCtrl, pageUpExtend, 0}},
- {3215, {wxStyledTextCtrl, pageDown, 0}},
- {3216, {wxStyledTextCtrl, pageDownExtend, 0}},
- {3217, {wxStyledTextCtrl, editToggleOvertype, 0}},
- {3218, {wxStyledTextCtrl, cancel, 0}},
- {3219, {wxStyledTextCtrl, deleteBack, 0}},
- {3220, {wxStyledTextCtrl, tab, 0}},
- {3221, {wxStyledTextCtrl, backTab, 0}},
- {3222, {wxStyledTextCtrl, newLine, 0}},
- {3223, {wxStyledTextCtrl, formFeed, 0}},
- {3224, {wxStyledTextCtrl, vCHome, 0}},
- {3225, {wxStyledTextCtrl, vCHomeExtend, 0}},
- {3226, {wxStyledTextCtrl, zoomIn, 0}},
- {3227, {wxStyledTextCtrl, zoomOut, 0}},
- {3228, {wxStyledTextCtrl, delWordLeft, 0}},
- {3229, {wxStyledTextCtrl, delWordRight, 0}},
- {3230, {wxStyledTextCtrl, lineCut, 0}},
- {3231, {wxStyledTextCtrl, lineDelete, 0}},
- {3232, {wxStyledTextCtrl, lineTranspose, 0}},
- {3233, {wxStyledTextCtrl, lineDuplicate, 0}},
- {3234, {wxStyledTextCtrl, lowerCase, 0}},
- {3235, {wxStyledTextCtrl, upperCase, 0}},
- {3236, {wxStyledTextCtrl, lineScrollDown, 0}},
- {3237, {wxStyledTextCtrl, lineScrollUp, 0}},
- {3238, {wxStyledTextCtrl, deleteBackNotLine, 0}},
- {3239, {wxStyledTextCtrl, homeDisplay, 0}},
- {3240, {wxStyledTextCtrl, homeDisplayExtend, 0}},
- {3241, {wxStyledTextCtrl, lineEndDisplay, 0}},
- {3242, {wxStyledTextCtrl, lineEndDisplayExtend, 0}},
- {3243, {wxStyledTextCtrl, homeWrapExtend, 0}},
- {3244, {wxStyledTextCtrl, lineEndWrap, 0}},
- {3245, {wxStyledTextCtrl, lineEndWrapExtend, 0}},
- {3246, {wxStyledTextCtrl, vCHomeWrap, 0}},
- {3247, {wxStyledTextCtrl, vCHomeWrapExtend, 0}},
- {3248, {wxStyledTextCtrl, lineCopy, 0}},
- {3249, {wxStyledTextCtrl, moveCaretInsideView, 0}},
- {3250, {wxStyledTextCtrl, lineLength, 1}},
- {3251, {wxStyledTextCtrl, braceHighlight, 2}},
- {3252, {wxStyledTextCtrl, braceBadLight, 1}},
- {3253, {wxStyledTextCtrl, braceMatch, 1}},
- {3254, {wxStyledTextCtrl, getViewEOL, 0}},
- {3255, {wxStyledTextCtrl, setViewEOL, 1}},
- {3256, {wxStyledTextCtrl, setModEventMask, 1}},
- {3257, {wxStyledTextCtrl, getEdgeColumn, 0}},
- {3258, {wxStyledTextCtrl, setEdgeColumn, 1}},
- {3259, {wxStyledTextCtrl, getEdgeMode, 0}},
- {3260, {wxStyledTextCtrl, getEdgeColour, 0}},
- {3261, {wxStyledTextCtrl, setEdgeColour, 1}},
- {3262, {wxStyledTextCtrl, searchAnchor, 0}},
- {3263, {wxStyledTextCtrl, searchNext, 2}},
- {3264, {wxStyledTextCtrl, searchPrev, 2}},
- {3265, {wxStyledTextCtrl, linesOnScreen, 0}},
- {3266, {wxStyledTextCtrl, usePopUp, 1}},
- {3267, {wxStyledTextCtrl, selectionIsRectangle, 0}},
- {3268, {wxStyledTextCtrl, setZoom, 1}},
- {3269, {wxStyledTextCtrl, getZoom, 0}},
- {3270, {wxStyledTextCtrl, getModEventMask, 0}},
- {3271, {wxStyledTextCtrl, setSTCFocus, 1}},
- {3272, {wxStyledTextCtrl, getSTCFocus, 0}},
- {3273, {wxStyledTextCtrl, setStatus, 1}},
- {3274, {wxStyledTextCtrl, getStatus, 0}},
- {3275, {wxStyledTextCtrl, setMouseDownCaptures, 1}},
- {3276, {wxStyledTextCtrl, getMouseDownCaptures, 0}},
- {3277, {wxStyledTextCtrl, setSTCCursor, 1}},
- {3278, {wxStyledTextCtrl, getSTCCursor, 0}},
- {3279, {wxStyledTextCtrl, setControlCharSymbol, 1}},
- {3280, {wxStyledTextCtrl, getControlCharSymbol, 0}},
- {3281, {wxStyledTextCtrl, wordPartLeft, 0}},
- {3282, {wxStyledTextCtrl, wordPartLeftExtend, 0}},
- {3283, {wxStyledTextCtrl, wordPartRight, 0}},
- {3284, {wxStyledTextCtrl, wordPartRightExtend, 0}},
- {3285, {wxStyledTextCtrl, setVisiblePolicy, 2}},
- {3286, {wxStyledTextCtrl, delLineLeft, 0}},
- {3287, {wxStyledTextCtrl, delLineRight, 0}},
- {3288, {wxStyledTextCtrl, getXOffset, 0}},
- {3289, {wxStyledTextCtrl, chooseCaretX, 0}},
- {3290, {wxStyledTextCtrl, setXCaretPolicy, 2}},
- {3291, {wxStyledTextCtrl, setYCaretPolicy, 2}},
- {3292, {wxStyledTextCtrl, getPrintWrapMode, 0}},
- {3293, {wxStyledTextCtrl, setHotspotActiveForeground, 2}},
- {3294, {wxStyledTextCtrl, setHotspotActiveBackground, 2}},
- {3295, {wxStyledTextCtrl, setHotspotActiveUnderline, 1}},
- {3296, {wxStyledTextCtrl, setHotspotSingleLine, 1}},
- {3297, {wxStyledTextCtrl, paraDownExtend, 0}},
- {3298, {wxStyledTextCtrl, paraUp, 0}},
- {3299, {wxStyledTextCtrl, paraUpExtend, 0}},
- {3300, {wxStyledTextCtrl, positionBefore, 1}},
- {3301, {wxStyledTextCtrl, positionAfter, 1}},
- {3302, {wxStyledTextCtrl, copyRange, 2}},
- {3303, {wxStyledTextCtrl, copyText, 2}},
- {3304, {wxStyledTextCtrl, setSelectionMode, 1}},
- {3305, {wxStyledTextCtrl, getSelectionMode, 0}},
- {3306, {wxStyledTextCtrl, lineDownRectExtend, 0}},
- {3307, {wxStyledTextCtrl, lineUpRectExtend, 0}},
- {3308, {wxStyledTextCtrl, charLeftRectExtend, 0}},
- {3309, {wxStyledTextCtrl, charRightRectExtend, 0}},
- {3310, {wxStyledTextCtrl, homeRectExtend, 0}},
- {3311, {wxStyledTextCtrl, vCHomeRectExtend, 0}},
- {3312, {wxStyledTextCtrl, lineEndRectExtend, 0}},
- {3313, {wxStyledTextCtrl, pageUpRectExtend, 0}},
- {3314, {wxStyledTextCtrl, pageDownRectExtend, 0}},
- {3315, {wxStyledTextCtrl, stutteredPageUp, 0}},
- {3316, {wxStyledTextCtrl, stutteredPageUpExtend, 0}},
- {3317, {wxStyledTextCtrl, stutteredPageDown, 0}},
- {3318, {wxStyledTextCtrl, stutteredPageDownExtend, 0}},
- {3319, {wxStyledTextCtrl, wordLeftEnd, 0}},
- {3320, {wxStyledTextCtrl, wordLeftEndExtend, 0}},
- {3321, {wxStyledTextCtrl, wordRightEnd, 0}},
- {3322, {wxStyledTextCtrl, wordRightEndExtend, 0}},
- {3323, {wxStyledTextCtrl, setWhitespaceChars, 1}},
- {3324, {wxStyledTextCtrl, setCharsDefault, 0}},
- {3325, {wxStyledTextCtrl, autoCompGetCurrent, 0}},
- {3326, {wxStyledTextCtrl, allocate, 1}},
- {3327, {wxStyledTextCtrl, findColumn, 2}},
- {3328, {wxStyledTextCtrl, getCaretSticky, 0}},
- {3329, {wxStyledTextCtrl, setCaretSticky, 1}},
- {3330, {wxStyledTextCtrl, toggleCaretSticky, 0}},
- {3331, {wxStyledTextCtrl, setPasteConvertEndings, 1}},
- {3332, {wxStyledTextCtrl, getPasteConvertEndings, 0}},
- {3333, {wxStyledTextCtrl, selectionDuplicate, 0}},
- {3334, {wxStyledTextCtrl, setCaretLineBackAlpha, 1}},
- {3335, {wxStyledTextCtrl, getCaretLineBackAlpha, 0}},
- {3336, {wxStyledTextCtrl, startRecord, 0}},
- {3337, {wxStyledTextCtrl, stopRecord, 0}},
- {3338, {wxStyledTextCtrl, setLexer, 1}},
- {3339, {wxStyledTextCtrl, getLexer, 0}},
- {3340, {wxStyledTextCtrl, colourise, 2}},
- {3341, {wxStyledTextCtrl, setProperty, 2}},
- {3342, {wxStyledTextCtrl, setKeyWords, 2}},
- {3343, {wxStyledTextCtrl, setLexerLanguage, 1}},
- {3344, {wxStyledTextCtrl, getProperty, 1}},
- {3345, {wxStyledTextCtrl, getStyleBitsNeeded, 0}},
- {3346, {wxStyledTextCtrl, getCurrentLine, 0}},
- {3347, {wxStyledTextCtrl, styleSetSpec, 2}},
- {3348, {wxStyledTextCtrl, styleSetFont, 2}},
- {3349, {wxStyledTextCtrl, styleSetFontAttr, 7}},
- {3350, {wxStyledTextCtrl, styleSetCharacterSet, 2}},
- {3351, {wxStyledTextCtrl, styleSetFontEncoding, 2}},
- {3352, {wxStyledTextCtrl, cmdKeyExecute, 1}},
- {3353, {wxStyledTextCtrl, setMargins, 2}},
- {3354, {wxStyledTextCtrl, getSelection, 2}},
- {3355, {wxStyledTextCtrl, pointFromPosition, 1}},
- {3356, {wxStyledTextCtrl, scrollToLine, 1}},
- {3357, {wxStyledTextCtrl, scrollToColumn, 1}},
- {3358, {wxStyledTextCtrl, sendMsg, 2}},
- {3359, {wxStyledTextCtrl, setVScrollBar, 1}},
- {3360, {wxStyledTextCtrl, setHScrollBar, 1}},
- {3361, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
- {3362, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
- {3363, {wxStyledTextCtrl, saveFile, 1}},
- {3364, {wxStyledTextCtrl, loadFile, 1}},
- {3365, {wxStyledTextCtrl, doDragOver, 3}},
- {3366, {wxStyledTextCtrl, doDropText, 3}},
- {3367, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
- {3368, {wxStyledTextCtrl, addTextRaw, 1}},
- {3369, {wxStyledTextCtrl, insertTextRaw, 2}},
- {3370, {wxStyledTextCtrl, getCurLineRaw, 1}},
- {3371, {wxStyledTextCtrl, getLineRaw, 1}},
- {3372, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
- {3373, {wxStyledTextCtrl, getTextRangeRaw, 2}},
- {3374, {wxStyledTextCtrl, setTextRaw, 1}},
- {3375, {wxStyledTextCtrl, getTextRaw, 0}},
- {3376, {wxStyledTextCtrl, appendTextRaw, 1}},
- {3377, {wxArtProvider, getBitmap, 2}},
- {3378, {wxArtProvider, getIcon, 2}},
- {3379, {wxTreeEvent, getKeyCode, 0}},
- {3380, {wxTreeEvent, getItem, 0}},
- {3381, {wxTreeEvent, getKeyEvent, 0}},
- {3382, {wxTreeEvent, getLabel, 0}},
- {3383, {wxTreeEvent, getOldItem, 0}},
- {3384, {wxTreeEvent, getPoint, 0}},
- {3385, {wxTreeEvent, isEditCancelled, 0}},
- {3386, {wxTreeEvent, setToolTip, 1}},
- {3387, {wxNotebookEvent, getOldSelection, 0}},
- {3388, {wxNotebookEvent, getSelection, 0}},
- {3389, {wxNotebookEvent, setOldSelection, 1}},
- {3390, {wxNotebookEvent, setSelection, 1}},
- {3391, {wxFileDataObject, new, 0}},
- {3392, {wxFileDataObject, addFile, 1}},
- {3393, {wxFileDataObject, getFilenames, 0}},
- {3394, {wxFileDataObject, 'Destroy', undefined}},
- {3395, {wxTextDataObject, new, 1}},
- {3396, {wxTextDataObject, getTextLength, 0}},
- {3397, {wxTextDataObject, getText, 0}},
- {3398, {wxTextDataObject, setText, 1}},
- {3399, {wxTextDataObject, 'Destroy', undefined}},
- {3400, {wxBitmapDataObject, new_1_1, 1}},
- {3401, {wxBitmapDataObject, new_1_0, 1}},
- {3402, {wxBitmapDataObject, getBitmap, 0}},
- {3403, {wxBitmapDataObject, setBitmap, 1}},
- {3404, {wxBitmapDataObject, 'Destroy', undefined}},
- {3406, {wxClipboard, new, 0}},
- {3407, {wxClipboard, destruct, 0}},
- {3408, {wxClipboard, addData, 1}},
- {3409, {wxClipboard, clear, 0}},
- {3410, {wxClipboard, close, 0}},
- {3411, {wxClipboard, flush, 0}},
- {3412, {wxClipboard, getData, 1}},
- {3413, {wxClipboard, isOpened, 0}},
- {3414, {wxClipboard, open, 0}},
- {3415, {wxClipboard, setData, 1}},
- {3417, {wxClipboard, usePrimarySelection, 1}},
- {3418, {wxClipboard, isSupported, 1}},
- {3419, {wxClipboard, get, 0}},
- {3420, {wxSpinEvent, getPosition, 0}},
- {3421, {wxSpinEvent, setPosition, 1}},
- {3422, {wxSplitterWindow, new_0, 0}},
- {3423, {wxSplitterWindow, new_2, 2}},
- {3424, {wxSplitterWindow, destruct, 0}},
- {3425, {wxSplitterWindow, create, 2}},
- {3426, {wxSplitterWindow, getMinimumPaneSize, 0}},
- {3427, {wxSplitterWindow, getSashGravity, 0}},
- {3428, {wxSplitterWindow, getSashPosition, 0}},
- {3429, {wxSplitterWindow, getSplitMode, 0}},
- {3430, {wxSplitterWindow, getWindow1, 0}},
- {3431, {wxSplitterWindow, getWindow2, 0}},
- {3432, {wxSplitterWindow, initialize, 1}},
- {3433, {wxSplitterWindow, isSplit, 0}},
- {3434, {wxSplitterWindow, replaceWindow, 2}},
- {3435, {wxSplitterWindow, setSashGravity, 1}},
- {3436, {wxSplitterWindow, setSashPosition, 2}},
- {3437, {wxSplitterWindow, setSashSize, 1}},
- {3438, {wxSplitterWindow, setMinimumPaneSize, 1}},
- {3439, {wxSplitterWindow, setSplitMode, 1}},
- {3440, {wxSplitterWindow, splitHorizontally, 3}},
- {3441, {wxSplitterWindow, splitVertically, 3}},
- {3442, {wxSplitterWindow, unsplit, 1}},
- {3443, {wxSplitterWindow, updateSize, 0}},
- {3444, {wxSplitterEvent, getSashPosition, 0}},
- {3445, {wxSplitterEvent, getX, 0}},
- {3446, {wxSplitterEvent, getY, 0}},
- {3447, {wxSplitterEvent, getWindowBeingRemoved, 0}},
- {3448, {wxSplitterEvent, setSashPosition, 1}},
- {3449, {wxHtmlWindow, new_0, 0}},
- {3450, {wxHtmlWindow, new_2, 2}},
- {3451, {wxHtmlWindow, appendToPage, 1}},
- {3452, {wxHtmlWindow, getOpenedAnchor, 0}},
- {3453, {wxHtmlWindow, getOpenedPage, 0}},
- {3454, {wxHtmlWindow, getOpenedPageTitle, 0}},
- {3455, {wxHtmlWindow, getRelatedFrame, 0}},
- {3456, {wxHtmlWindow, historyBack, 0}},
- {3457, {wxHtmlWindow, historyCanBack, 0}},
- {3458, {wxHtmlWindow, historyCanForward, 0}},
- {3459, {wxHtmlWindow, historyClear, 0}},
- {3460, {wxHtmlWindow, historyForward, 0}},
- {3461, {wxHtmlWindow, loadFile, 1}},
- {3462, {wxHtmlWindow, loadPage, 1}},
- {3463, {wxHtmlWindow, selectAll, 0}},
- {3464, {wxHtmlWindow, selectionToText, 0}},
- {3465, {wxHtmlWindow, selectLine, 1}},
- {3466, {wxHtmlWindow, selectWord, 1}},
- {3467, {wxHtmlWindow, setBorders, 1}},
- {3468, {wxHtmlWindow, setFonts, 3}},
- {3469, {wxHtmlWindow, setPage, 1}},
- {3470, {wxHtmlWindow, setRelatedFrame, 2}},
- {3471, {wxHtmlWindow, setRelatedStatusBar, 1}},
- {3472, {wxHtmlWindow, toText, 0}},
- {3473, {wxHtmlWindow, 'Destroy', undefined}},
- {3474, {wxHtmlLinkEvent, getLinkInfo, 0}},
- {3475, {wxAuiNotebookEvent, setSelection, 1}},
- {3476, {wxAuiNotebookEvent, getSelection, 0}},
- {3477, {wxAuiNotebookEvent, setOldSelection, 1}},
- {3478, {wxAuiNotebookEvent, getOldSelection, 0}},
- {3479, {wxAuiNotebookEvent, setDragSource, 1}},
- {3480, {wxAuiNotebookEvent, getDragSource, 0}},
- {3481, {wxAuiManagerEvent, setManager, 1}},
- {3482, {wxAuiManagerEvent, getManager, 0}},
- {3483, {wxAuiManagerEvent, setPane, 1}},
- {3484, {wxAuiManagerEvent, getPane, 0}},
- {3485, {wxAuiManagerEvent, setButton, 1}},
- {3486, {wxAuiManagerEvent, getButton, 0}},
- {3487, {wxAuiManagerEvent, setDC, 1}},
- {3488, {wxAuiManagerEvent, getDC, 0}},
- {3489, {wxAuiManagerEvent, veto, 1}},
- {3490, {wxAuiManagerEvent, getVeto, 0}},
- {3491, {wxAuiManagerEvent, setCanVeto, 1}},
- {3492, {wxAuiManagerEvent, canVeto, 0}},
- {3493, {wxLogNull, new, 0}},
- {3494, {wxLogNull, 'Destroy', undefined}},
+ {2010, {wxTreeCtrl, editLabel, 1}},
+ {2011, {wxTreeCtrl, ensureVisible, 1}},
+ {2012, {wxTreeCtrl, expand, 1}},
+ {2013, {wxTreeCtrl, getBoundingRect, 3}},
+ {2015, {wxTreeCtrl, getChildrenCount, 2}},
+ {2016, {wxTreeCtrl, getCount, 0}},
+ {2017, {wxTreeCtrl, getEditControl, 0}},
+ {2018, {wxTreeCtrl, getFirstChild, 2}},
+ {2019, {wxTreeCtrl, getNextChild, 2}},
+ {2020, {wxTreeCtrl, getFirstVisibleItem, 0}},
+ {2021, {wxTreeCtrl, getImageList, 0}},
+ {2022, {wxTreeCtrl, getIndent, 0}},
+ {2023, {wxTreeCtrl, getItemBackgroundColour, 1}},
+ {2024, {wxTreeCtrl, getItemData, 1}},
+ {2025, {wxTreeCtrl, getItemFont, 1}},
+ {2026, {wxTreeCtrl, getItemImage_1, 1}},
+ {2027, {wxTreeCtrl, getItemImage_2, 2}},
+ {2028, {wxTreeCtrl, getItemText, 1}},
+ {2029, {wxTreeCtrl, getItemTextColour, 1}},
+ {2030, {wxTreeCtrl, getLastChild, 1}},
+ {2031, {wxTreeCtrl, getNextSibling, 1}},
+ {2032, {wxTreeCtrl, getNextVisible, 1}},
+ {2033, {wxTreeCtrl, getItemParent, 1}},
+ {2034, {wxTreeCtrl, getPrevSibling, 1}},
+ {2035, {wxTreeCtrl, getPrevVisible, 1}},
+ {2036, {wxTreeCtrl, getRootItem, 0}},
+ {2037, {wxTreeCtrl, getSelection, 0}},
+ {2038, {wxTreeCtrl, getSelections, 1}},
+ {2039, {wxTreeCtrl, getStateImageList, 0}},
+ {2040, {wxTreeCtrl, hitTest, 1}},
+ {2042, {wxTreeCtrl, insertItem, 4}},
+ {2043, {wxTreeCtrl, isBold, 1}},
+ {2044, {wxTreeCtrl, isExpanded, 1}},
+ {2045, {wxTreeCtrl, isSelected, 1}},
+ {2046, {wxTreeCtrl, isVisible, 1}},
+ {2047, {wxTreeCtrl, itemHasChildren, 1}},
+ {2048, {wxTreeCtrl, prependItem, 3}},
+ {2049, {wxTreeCtrl, scrollTo, 1}},
+ {2050, {wxTreeCtrl, selectItem_1, 1}},
+ {2051, {wxTreeCtrl, selectItem_2, 2}},
+ {2052, {wxTreeCtrl, setIndent, 1}},
+ {2053, {wxTreeCtrl, setImageList, 1}},
+ {2054, {wxTreeCtrl, setItemBackgroundColour, 2}},
+ {2055, {wxTreeCtrl, setItemBold, 2}},
+ {2056, {wxTreeCtrl, setItemData, 2}},
+ {2057, {wxTreeCtrl, setItemDropHighlight, 2}},
+ {2058, {wxTreeCtrl, setItemFont, 2}},
+ {2059, {wxTreeCtrl, setItemHasChildren, 2}},
+ {2060, {wxTreeCtrl, setItemImage_2, 2}},
+ {2061, {wxTreeCtrl, setItemImage_3, 3}},
+ {2062, {wxTreeCtrl, setItemText, 2}},
+ {2063, {wxTreeCtrl, setItemTextColour, 2}},
+ {2064, {wxTreeCtrl, setStateImageList, 1}},
+ {2065, {wxTreeCtrl, setWindowStyle, 1}},
+ {2066, {wxTreeCtrl, sortChildren, 1}},
+ {2067, {wxTreeCtrl, toggle, 1}},
+ {2068, {wxTreeCtrl, toggleItemSelection, 1}},
+ {2069, {wxTreeCtrl, unselect, 0}},
+ {2070, {wxTreeCtrl, unselectAll, 0}},
+ {2071, {wxTreeCtrl, unselectItem, 1}},
+ {2072, {wxScrollBar, new_0, 0}},
+ {2073, {wxScrollBar, new_3, 3}},
+ {2074, {wxScrollBar, destruct, 0}},
+ {2075, {wxScrollBar, create, 3}},
+ {2076, {wxScrollBar, getRange, 0}},
+ {2077, {wxScrollBar, getPageSize, 0}},
+ {2078, {wxScrollBar, getThumbPosition, 0}},
+ {2079, {wxScrollBar, getThumbSize, 0}},
+ {2080, {wxScrollBar, setThumbPosition, 1}},
+ {2081, {wxScrollBar, setScrollbar, 5}},
+ {2083, {wxSpinButton, new_2, 2}},
+ {2084, {wxSpinButton, new_0, 0}},
+ {2085, {wxSpinButton, create, 2}},
+ {2086, {wxSpinButton, getMax, 0}},
+ {2087, {wxSpinButton, getMin, 0}},
+ {2088, {wxSpinButton, getValue, 0}},
+ {2089, {wxSpinButton, setRange, 2}},
+ {2090, {wxSpinButton, setValue, 1}},
+ {2091, {wxSpinButton, 'Destroy', undefined}},
+ {2092, {wxSpinCtrl, new_0, 0}},
+ {2093, {wxSpinCtrl, new_2, 2}},
+ {2095, {wxSpinCtrl, create, 2}},
+ {2098, {wxSpinCtrl, setValue_1_1, 1}},
+ {2099, {wxSpinCtrl, setValue_1_0, 1}},
+ {2101, {wxSpinCtrl, getValue, 0}},
+ {2103, {wxSpinCtrl, setRange, 2}},
+ {2104, {wxSpinCtrl, setSelection, 2}},
+ {2106, {wxSpinCtrl, getMin, 0}},
+ {2108, {wxSpinCtrl, getMax, 0}},
+ {2109, {wxSpinCtrl, 'Destroy', undefined}},
+ {2110, {wxStaticText, new_0, 0}},
+ {2111, {wxStaticText, new_4, 4}},
+ {2112, {wxStaticText, create, 4}},
+ {2113, {wxStaticText, getLabel, 0}},
+ {2114, {wxStaticText, setLabel, 1}},
+ {2115, {wxStaticText, wrap, 1}},
+ {2116, {wxStaticText, 'Destroy', undefined}},
+ {2117, {wxStaticBitmap, new_0, 0}},
+ {2118, {wxStaticBitmap, new_4, 4}},
+ {2119, {wxStaticBitmap, create, 4}},
+ {2120, {wxStaticBitmap, getBitmap, 0}},
+ {2121, {wxStaticBitmap, setBitmap, 1}},
+ {2122, {wxStaticBitmap, 'Destroy', undefined}},
+ {2123, {wxRadioBox, new, 7}},
+ {2125, {wxRadioBox, destruct, 0}},
+ {2126, {wxRadioBox, create, 7}},
+ {2127, {wxRadioBox, enable_2, 2}},
+ {2128, {wxRadioBox, enable_1, 1}},
+ {2129, {wxRadioBox, getSelection, 0}},
+ {2130, {wxRadioBox, getString, 1}},
+ {2131, {wxRadioBox, setSelection, 1}},
+ {2132, {wxRadioBox, show_2, 2}},
+ {2133, {wxRadioBox, show_1, 1}},
+ {2134, {wxRadioBox, getColumnCount, 0}},
+ {2135, {wxRadioBox, getItemHelpText, 1}},
+ {2136, {wxRadioBox, getItemToolTip, 1}},
+ {2138, {wxRadioBox, getItemFromPoint, 1}},
+ {2139, {wxRadioBox, getRowCount, 0}},
+ {2140, {wxRadioBox, isItemEnabled, 1}},
+ {2141, {wxRadioBox, isItemShown, 1}},
+ {2142, {wxRadioBox, setItemHelpText, 2}},
+ {2143, {wxRadioBox, setItemToolTip, 2}},
+ {2144, {wxRadioButton, new_0, 0}},
+ {2145, {wxRadioButton, new_4, 4}},
+ {2146, {wxRadioButton, create, 4}},
+ {2147, {wxRadioButton, getValue, 0}},
+ {2148, {wxRadioButton, setValue, 1}},
+ {2149, {wxRadioButton, 'Destroy', undefined}},
+ {2151, {wxSlider, new_6, 6}},
+ {2152, {wxSlider, new_0, 0}},
+ {2153, {wxSlider, create, 6}},
+ {2154, {wxSlider, getLineSize, 0}},
+ {2155, {wxSlider, getMax, 0}},
+ {2156, {wxSlider, getMin, 0}},
+ {2157, {wxSlider, getPageSize, 0}},
+ {2158, {wxSlider, getThumbLength, 0}},
+ {2159, {wxSlider, getValue, 0}},
+ {2160, {wxSlider, setLineSize, 1}},
+ {2161, {wxSlider, setPageSize, 1}},
+ {2162, {wxSlider, setRange, 2}},
+ {2163, {wxSlider, setThumbLength, 1}},
+ {2164, {wxSlider, setValue, 1}},
+ {2165, {wxSlider, 'Destroy', undefined}},
+ {2167, {wxDialog, new_4, 4}},
+ {2168, {wxDialog, new_0, 0}},
+ {2170, {wxDialog, destruct, 0}},
+ {2171, {wxDialog, create, 4}},
+ {2172, {wxDialog, createButtonSizer, 1}},
+ {2173, {wxDialog, createStdDialogButtonSizer, 1}},
+ {2174, {wxDialog, endModal, 1}},
+ {2175, {wxDialog, getAffirmativeId, 0}},
+ {2176, {wxDialog, getReturnCode, 0}},
+ {2177, {wxDialog, isModal, 0}},
+ {2178, {wxDialog, setAffirmativeId, 1}},
+ {2179, {wxDialog, setReturnCode, 1}},
+ {2180, {wxDialog, show, 1}},
+ {2181, {wxDialog, showModal, 0}},
+ {2182, {wxColourDialog, new_0, 0}},
+ {2183, {wxColourDialog, new_2, 2}},
+ {2184, {wxColourDialog, destruct, 0}},
+ {2185, {wxColourDialog, create, 2}},
+ {2186, {wxColourDialog, getColourData, 0}},
+ {2187, {wxColourData, new_0, 0}},
+ {2188, {wxColourData, new_1, 1}},
+ {2189, {wxColourData, destruct, 0}},
+ {2190, {wxColourData, getChooseFull, 0}},
+ {2191, {wxColourData, getColour, 0}},
+ {2193, {wxColourData, getCustomColour, 1}},
+ {2194, {wxColourData, setChooseFull, 1}},
+ {2195, {wxColourData, setColour, 1}},
+ {2196, {wxColourData, setCustomColour, 2}},
+ {2197, {wxPalette, new_0, 0}},
+ {2198, {wxPalette, new_4, 4}},
+ {2200, {wxPalette, destruct, 0}},
+ {2201, {wxPalette, create, 4}},
+ {2202, {wxPalette, getColoursCount, 0}},
+ {2203, {wxPalette, getPixel, 3}},
+ {2204, {wxPalette, getRGB, 4}},
+ {2205, {wxPalette, isOk, 0}},
+ {2209, {wxDirDialog, new, 2}},
+ {2210, {wxDirDialog, destruct, 0}},
+ {2211, {wxDirDialog, getPath, 0}},
+ {2212, {wxDirDialog, getMessage, 0}},
+ {2213, {wxDirDialog, setMessage, 1}},
+ {2214, {wxDirDialog, setPath, 1}},
+ {2218, {wxFileDialog, new, 2}},
+ {2219, {wxFileDialog, destruct, 0}},
+ {2220, {wxFileDialog, getDirectory, 0}},
+ {2221, {wxFileDialog, getFilename, 0}},
+ {2222, {wxFileDialog, getFilenames, 1}},
+ {2223, {wxFileDialog, getFilterIndex, 0}},
+ {2224, {wxFileDialog, getMessage, 0}},
+ {2225, {wxFileDialog, getPath, 0}},
+ {2226, {wxFileDialog, getPaths, 1}},
+ {2227, {wxFileDialog, getWildcard, 0}},
+ {2228, {wxFileDialog, setDirectory, 1}},
+ {2229, {wxFileDialog, setFilename, 1}},
+ {2230, {wxFileDialog, setFilterIndex, 1}},
+ {2231, {wxFileDialog, setMessage, 1}},
+ {2232, {wxFileDialog, setPath, 1}},
+ {2233, {wxFileDialog, setWildcard, 1}},
+ {2234, {wxPickerBase, setInternalMargin, 1}},
+ {2235, {wxPickerBase, getInternalMargin, 0}},
+ {2236, {wxPickerBase, setTextCtrlProportion, 1}},
+ {2237, {wxPickerBase, setPickerCtrlProportion, 1}},
+ {2238, {wxPickerBase, getTextCtrlProportion, 0}},
+ {2239, {wxPickerBase, getPickerCtrlProportion, 0}},
+ {2240, {wxPickerBase, hasTextCtrl, 0}},
+ {2241, {wxPickerBase, getTextCtrl, 0}},
+ {2242, {wxPickerBase, isTextCtrlGrowable, 0}},
+ {2243, {wxPickerBase, setPickerCtrlGrowable, 1}},
+ {2244, {wxPickerBase, setTextCtrlGrowable, 1}},
+ {2245, {wxPickerBase, isPickerCtrlGrowable, 0}},
+ {2246, {wxFilePickerCtrl, new_0, 0}},
+ {2247, {wxFilePickerCtrl, new_3, 3}},
+ {2248, {wxFilePickerCtrl, create, 3}},
+ {2249, {wxFilePickerCtrl, getPath, 0}},
+ {2250, {wxFilePickerCtrl, setPath, 1}},
+ {2251, {wxFilePickerCtrl, 'Destroy', undefined}},
+ {2252, {wxDirPickerCtrl, new_0, 0}},
+ {2253, {wxDirPickerCtrl, new_3, 3}},
+ {2254, {wxDirPickerCtrl, create, 3}},
+ {2255, {wxDirPickerCtrl, getPath, 0}},
+ {2256, {wxDirPickerCtrl, setPath, 1}},
+ {2257, {wxDirPickerCtrl, 'Destroy', undefined}},
+ {2258, {wxColourPickerCtrl, new_0, 0}},
+ {2259, {wxColourPickerCtrl, new_3, 3}},
+ {2260, {wxColourPickerCtrl, create, 3}},
+ {2261, {wxColourPickerCtrl, getColour, 0}},
+ {2262, {wxColourPickerCtrl, setColour_1_1, 1}},
+ {2263, {wxColourPickerCtrl, setColour_1_0, 1}},
+ {2264, {wxColourPickerCtrl, 'Destroy', undefined}},
+ {2265, {wxDatePickerCtrl, new_0, 0}},
+ {2266, {wxDatePickerCtrl, new_3, 3}},
+ {2267, {wxDatePickerCtrl, getRange, 2}},
+ {2268, {wxDatePickerCtrl, getValue, 0}},
+ {2269, {wxDatePickerCtrl, setRange, 2}},
+ {2270, {wxDatePickerCtrl, setValue, 1}},
+ {2271, {wxDatePickerCtrl, 'Destroy', undefined}},
+ {2272, {wxFontPickerCtrl, new_0, 0}},
+ {2273, {wxFontPickerCtrl, new_3, 3}},
+ {2274, {wxFontPickerCtrl, create, 3}},
+ {2275, {wxFontPickerCtrl, getSelectedFont, 0}},
+ {2276, {wxFontPickerCtrl, setSelectedFont, 1}},
+ {2277, {wxFontPickerCtrl, getMaxPointSize, 0}},
+ {2278, {wxFontPickerCtrl, setMaxPointSize, 1}},
+ {2279, {wxFontPickerCtrl, 'Destroy', undefined}},
+ {2282, {wxFindReplaceDialog, new_0, 0}},
+ {2283, {wxFindReplaceDialog, new_4, 4}},
+ {2284, {wxFindReplaceDialog, destruct, 0}},
+ {2285, {wxFindReplaceDialog, create, 4}},
+ {2286, {wxFindReplaceDialog, getData, 0}},
+ {2287, {wxFindReplaceData, new_0, 0}},
+ {2288, {wxFindReplaceData, new_1, 1}},
+ {2289, {wxFindReplaceData, getFindString, 0}},
+ {2290, {wxFindReplaceData, getReplaceString, 0}},
+ {2291, {wxFindReplaceData, getFlags, 0}},
+ {2292, {wxFindReplaceData, setFlags, 1}},
+ {2293, {wxFindReplaceData, setFindString, 1}},
+ {2294, {wxFindReplaceData, setReplaceString, 1}},
+ {2295, {wxFindReplaceData, 'Destroy', undefined}},
+ {2296, {wxMultiChoiceDialog, new_0, 0}},
+ {2298, {wxMultiChoiceDialog, new_5, 5}},
+ {2299, {wxMultiChoiceDialog, getSelections, 0}},
+ {2300, {wxMultiChoiceDialog, setSelections, 1}},
+ {2301, {wxMultiChoiceDialog, 'Destroy', undefined}},
+ {2302, {wxSingleChoiceDialog, new_0, 0}},
+ {2304, {wxSingleChoiceDialog, new_5, 5}},
+ {2305, {wxSingleChoiceDialog, getSelection, 0}},
+ {2306, {wxSingleChoiceDialog, getStringSelection, 0}},
+ {2307, {wxSingleChoiceDialog, setSelection, 1}},
+ {2308, {wxSingleChoiceDialog, 'Destroy', undefined}},
+ {2309, {wxTextEntryDialog, new, 3}},
+ {2310, {wxTextEntryDialog, getValue, 0}},
+ {2311, {wxTextEntryDialog, setValue, 1}},
+ {2312, {wxTextEntryDialog, 'Destroy', undefined}},
+ {2313, {wxPasswordEntryDialog, new, 3}},
+ {2314, {wxPasswordEntryDialog, 'Destroy', undefined}},
+ {2315, {wxFontData, new_0, 0}},
+ {2316, {wxFontData, new_1, 1}},
+ {2317, {wxFontData, destruct, 0}},
+ {2318, {wxFontData, enableEffects, 1}},
+ {2319, {wxFontData, getAllowSymbols, 0}},
+ {2320, {wxFontData, getColour, 0}},
+ {2321, {wxFontData, getChosenFont, 0}},
+ {2322, {wxFontData, getEnableEffects, 0}},
+ {2323, {wxFontData, getInitialFont, 0}},
+ {2324, {wxFontData, getShowHelp, 0}},
+ {2325, {wxFontData, setAllowSymbols, 1}},
+ {2326, {wxFontData, setChosenFont, 1}},
+ {2327, {wxFontData, setColour, 1}},
+ {2328, {wxFontData, setInitialFont, 1}},
+ {2329, {wxFontData, setRange, 2}},
+ {2330, {wxFontData, setShowHelp, 1}},
+ {2334, {wxFontDialog, new_0, 0}},
+ {2336, {wxFontDialog, new_2, 2}},
+ {2338, {wxFontDialog, create, 2}},
+ {2339, {wxFontDialog, getFontData, 0}},
+ {2341, {wxFontDialog, 'Destroy', undefined}},
+ {2342, {wxProgressDialog, new, 3}},
+ {2343, {wxProgressDialog, destruct, 0}},
+ {2344, {wxProgressDialog, resume, 0}},
+ {2345, {wxProgressDialog, update_2, 2}},
+ {2346, {wxProgressDialog, update_0, 0}},
+ {2347, {wxMessageDialog, new, 3}},
+ {2348, {wxMessageDialog, destruct, 0}},
+ {2349, {wxPageSetupDialog, new, 2}},
+ {2350, {wxPageSetupDialog, destruct, 0}},
+ {2351, {wxPageSetupDialog, getPageSetupData, 0}},
+ {2352, {wxPageSetupDialog, showModal, 0}},
+ {2353, {wxPageSetupDialogData, new_0, 0}},
+ {2354, {wxPageSetupDialogData, new_1_0, 1}},
+ {2355, {wxPageSetupDialogData, new_1_1, 1}},
+ {2356, {wxPageSetupDialogData, destruct, 0}},
+ {2357, {wxPageSetupDialogData, enableHelp, 1}},
+ {2358, {wxPageSetupDialogData, enableMargins, 1}},
+ {2359, {wxPageSetupDialogData, enableOrientation, 1}},
+ {2360, {wxPageSetupDialogData, enablePaper, 1}},
+ {2361, {wxPageSetupDialogData, enablePrinter, 1}},
+ {2362, {wxPageSetupDialogData, getDefaultMinMargins, 0}},
+ {2363, {wxPageSetupDialogData, getEnableMargins, 0}},
+ {2364, {wxPageSetupDialogData, getEnableOrientation, 0}},
+ {2365, {wxPageSetupDialogData, getEnablePaper, 0}},
+ {2366, {wxPageSetupDialogData, getEnablePrinter, 0}},
+ {2367, {wxPageSetupDialogData, getEnableHelp, 0}},
+ {2368, {wxPageSetupDialogData, getDefaultInfo, 0}},
+ {2369, {wxPageSetupDialogData, getMarginTopLeft, 0}},
+ {2370, {wxPageSetupDialogData, getMarginBottomRight, 0}},
+ {2371, {wxPageSetupDialogData, getMinMarginTopLeft, 0}},
+ {2372, {wxPageSetupDialogData, getMinMarginBottomRight, 0}},
+ {2373, {wxPageSetupDialogData, getPaperId, 0}},
+ {2374, {wxPageSetupDialogData, getPaperSize, 0}},
+ {2376, {wxPageSetupDialogData, getPrintData, 0}},
+ {2377, {wxPageSetupDialogData, isOk, 0}},
+ {2378, {wxPageSetupDialogData, setDefaultInfo, 1}},
+ {2379, {wxPageSetupDialogData, setDefaultMinMargins, 1}},
+ {2380, {wxPageSetupDialogData, setMarginTopLeft, 1}},
+ {2381, {wxPageSetupDialogData, setMarginBottomRight, 1}},
+ {2382, {wxPageSetupDialogData, setMinMarginTopLeft, 1}},
+ {2383, {wxPageSetupDialogData, setMinMarginBottomRight, 1}},
+ {2384, {wxPageSetupDialogData, setPaperId, 1}},
+ {2385, {wxPageSetupDialogData, setPaperSize_1_1, 1}},
+ {2386, {wxPageSetupDialogData, setPaperSize_1_0, 1}},
+ {2387, {wxPageSetupDialogData, setPrintData, 1}},
+ {2388, {wxPrintDialog, new_2_0, 2}},
+ {2389, {wxPrintDialog, new_2_1, 2}},
+ {2390, {wxPrintDialog, destruct, 0}},
+ {2391, {wxPrintDialog, getPrintDialogData, 0}},
+ {2392, {wxPrintDialog, getPrintDC, 0}},
+ {2393, {wxPrintDialogData, new_0, 0}},
+ {2394, {wxPrintDialogData, new_1_1, 1}},
+ {2395, {wxPrintDialogData, new_1_0, 1}},
+ {2396, {wxPrintDialogData, destruct, 0}},
+ {2397, {wxPrintDialogData, enableHelp, 1}},
+ {2398, {wxPrintDialogData, enablePageNumbers, 1}},
+ {2399, {wxPrintDialogData, enablePrintToFile, 1}},
+ {2400, {wxPrintDialogData, enableSelection, 1}},
+ {2401, {wxPrintDialogData, getAllPages, 0}},
+ {2402, {wxPrintDialogData, getCollate, 0}},
+ {2403, {wxPrintDialogData, getFromPage, 0}},
+ {2404, {wxPrintDialogData, getMaxPage, 0}},
+ {2405, {wxPrintDialogData, getMinPage, 0}},
+ {2406, {wxPrintDialogData, getNoCopies, 0}},
+ {2407, {wxPrintDialogData, getPrintData, 0}},
+ {2408, {wxPrintDialogData, getPrintToFile, 0}},
+ {2409, {wxPrintDialogData, getSelection, 0}},
+ {2410, {wxPrintDialogData, getToPage, 0}},
+ {2411, {wxPrintDialogData, isOk, 0}},
+ {2412, {wxPrintDialogData, setCollate, 1}},
+ {2413, {wxPrintDialogData, setFromPage, 1}},
+ {2414, {wxPrintDialogData, setMaxPage, 1}},
+ {2415, {wxPrintDialogData, setMinPage, 1}},
+ {2416, {wxPrintDialogData, setNoCopies, 1}},
+ {2417, {wxPrintDialogData, setPrintData, 1}},
+ {2418, {wxPrintDialogData, setPrintToFile, 1}},
+ {2419, {wxPrintDialogData, setSelection, 1}},
+ {2420, {wxPrintDialogData, setToPage, 1}},
+ {2421, {wxPrintData, new_0, 0}},
+ {2422, {wxPrintData, new_1, 1}},
+ {2423, {wxPrintData, destruct, 0}},
+ {2424, {wxPrintData, getCollate, 0}},
+ {2425, {wxPrintData, getBin, 0}},
+ {2426, {wxPrintData, getColour, 0}},
+ {2427, {wxPrintData, getDuplex, 0}},
+ {2428, {wxPrintData, getNoCopies, 0}},
+ {2429, {wxPrintData, getOrientation, 0}},
+ {2430, {wxPrintData, getPaperId, 0}},
+ {2431, {wxPrintData, getPrinterName, 0}},
+ {2432, {wxPrintData, getQuality, 0}},
+ {2433, {wxPrintData, isOk, 0}},
+ {2434, {wxPrintData, setBin, 1}},
+ {2435, {wxPrintData, setCollate, 1}},
+ {2436, {wxPrintData, setColour, 1}},
+ {2437, {wxPrintData, setDuplex, 1}},
+ {2438, {wxPrintData, setNoCopies, 1}},
+ {2439, {wxPrintData, setOrientation, 1}},
+ {2440, {wxPrintData, setPaperId, 1}},
+ {2441, {wxPrintData, setPrinterName, 1}},
+ {2442, {wxPrintData, setQuality, 1}},
+ {2445, {wxPrintPreview, new_2, 2}},
+ {2446, {wxPrintPreview, new_3, 3}},
+ {2448, {wxPrintPreview, destruct, 0}},
+ {2449, {wxPrintPreview, getCanvas, 0}},
+ {2450, {wxPrintPreview, getCurrentPage, 0}},
+ {2451, {wxPrintPreview, getFrame, 0}},
+ {2452, {wxPrintPreview, getMaxPage, 0}},
+ {2453, {wxPrintPreview, getMinPage, 0}},
+ {2454, {wxPrintPreview, getPrintout, 0}},
+ {2455, {wxPrintPreview, getPrintoutForPrinting, 0}},
+ {2456, {wxPrintPreview, isOk, 0}},
+ {2457, {wxPrintPreview, paintPage, 2}},
+ {2458, {wxPrintPreview, print, 1}},
+ {2459, {wxPrintPreview, renderPage, 1}},
+ {2460, {wxPrintPreview, setCanvas, 1}},
+ {2461, {wxPrintPreview, setCurrentPage, 1}},
+ {2462, {wxPrintPreview, setFrame, 1}},
+ {2463, {wxPrintPreview, setPrintout, 1}},
+ {2464, {wxPrintPreview, setZoom, 1}},
+ {2465, {wxPreviewFrame, new, 3}},
+ {2466, {wxPreviewFrame, destruct, 0}},
+ {2467, {wxPreviewFrame, createControlBar, 0}},
+ {2468, {wxPreviewFrame, createCanvas, 0}},
+ {2469, {wxPreviewFrame, initialize, 0}},
+ {2470, {wxPreviewFrame, onCloseWindow, 1}},
+ {2471, {wxPreviewControlBar, new, 4}},
+ {2472, {wxPreviewControlBar, destruct, 0}},
+ {2473, {wxPreviewControlBar, createButtons, 0}},
+ {2474, {wxPreviewControlBar, getPrintPreview, 0}},
+ {2475, {wxPreviewControlBar, getZoomControl, 0}},
+ {2476, {wxPreviewControlBar, setZoomControl, 1}},
+ {2478, {wxPrinter, new, 1}},
+ {2479, {wxPrinter, createAbortWindow, 2}},
+ {2480, {wxPrinter, getAbort, 0}},
+ {2481, {wxPrinter, getLastError, 0}},
+ {2482, {wxPrinter, getPrintDialogData, 0}},
+ {2483, {wxPrinter, print, 3}},
+ {2484, {wxPrinter, printDialog, 1}},
+ {2485, {wxPrinter, reportError, 3}},
+ {2486, {wxPrinter, setup, 1}},
+ {2487, {wxPrinter, 'Destroy', undefined}},
+ {2488, {wxXmlResource, new_1, 1}},
+ {2489, {wxXmlResource, new_2, 2}},
+ {2490, {wxXmlResource, destruct, 0}},
+ {2491, {wxXmlResource, attachUnknownControl, 3}},
+ {2492, {wxXmlResource, clearHandlers, 0}},
+ {2493, {wxXmlResource, compareVersion, 4}},
+ {2494, {wxXmlResource, get, 0}},
+ {2495, {wxXmlResource, getFlags, 0}},
+ {2496, {wxXmlResource, getVersion, 0}},
+ {2497, {wxXmlResource, getXRCID, 2}},
+ {2498, {wxXmlResource, initAllHandlers, 0}},
+ {2499, {wxXmlResource, load, 1}},
+ {2500, {wxXmlResource, loadBitmap, 1}},
+ {2501, {wxXmlResource, loadDialog_2, 2}},
+ {2502, {wxXmlResource, loadDialog_3, 3}},
+ {2503, {wxXmlResource, loadFrame_2, 2}},
+ {2504, {wxXmlResource, loadFrame_3, 3}},
+ {2505, {wxXmlResource, loadIcon, 1}},
+ {2506, {wxXmlResource, loadMenu, 1}},
+ {2507, {wxXmlResource, loadMenuBar_2, 2}},
+ {2508, {wxXmlResource, loadMenuBar_1, 1}},
+ {2509, {wxXmlResource, loadPanel_2, 2}},
+ {2510, {wxXmlResource, loadPanel_3, 3}},
+ {2511, {wxXmlResource, loadToolBar, 2}},
+ {2512, {wxXmlResource, set, 1}},
+ {2513, {wxXmlResource, setFlags, 1}},
+ {2514, {wxXmlResource, unload, 1}},
+ {2515, {wxXmlResource, xrcctrl, 3}},
+ {2516, {wxHtmlEasyPrinting, new, 1}},
+ {2517, {wxHtmlEasyPrinting, destruct, 0}},
+ {2518, {wxHtmlEasyPrinting, getPrintData, 0}},
+ {2519, {wxHtmlEasyPrinting, getPageSetupData, 0}},
+ {2520, {wxHtmlEasyPrinting, previewFile, 1}},
+ {2521, {wxHtmlEasyPrinting, previewText, 2}},
+ {2522, {wxHtmlEasyPrinting, printFile, 1}},
+ {2523, {wxHtmlEasyPrinting, printText, 2}},
+ {2524, {wxHtmlEasyPrinting, pageSetup, 0}},
+ {2525, {wxHtmlEasyPrinting, setFonts, 3}},
+ {2526, {wxHtmlEasyPrinting, setHeader, 2}},
+ {2527, {wxHtmlEasyPrinting, setFooter, 2}},
+ {2529, {wxGLCanvas, new_2, 2}},
+ {2530, {wxGLCanvas, new_3_1, 3}},
+ {2531, {wxGLCanvas, new_3_0, 3}},
+ {2532, {wxGLCanvas, getContext, 0}},
+ {2534, {wxGLCanvas, setCurrent, 0}},
+ {2535, {wxGLCanvas, swapBuffers, 0}},
+ {2536, {wxGLCanvas, 'Destroy', undefined}},
+ {2537, {wxAuiManager, new, 1}},
+ {2538, {wxAuiManager, destruct, 0}},
+ {2539, {wxAuiManager, addPane_2_1, 2}},
+ {2540, {wxAuiManager, addPane_3, 3}},
+ {2541, {wxAuiManager, addPane_2_0, 2}},
+ {2542, {wxAuiManager, detachPane, 1}},
+ {2543, {wxAuiManager, getAllPanes, 0}},
+ {2544, {wxAuiManager, getArtProvider, 0}},
+ {2545, {wxAuiManager, getDockSizeConstraint, 2}},
+ {2546, {wxAuiManager, getFlags, 0}},
+ {2547, {wxAuiManager, getManagedWindow, 0}},
+ {2548, {wxAuiManager, getManager, 1}},
+ {2549, {wxAuiManager, getPane_1_1, 1}},
+ {2550, {wxAuiManager, getPane_1_0, 1}},
+ {2551, {wxAuiManager, hideHint, 0}},
+ {2552, {wxAuiManager, insertPane, 3}},
+ {2553, {wxAuiManager, loadPaneInfo, 2}},
+ {2554, {wxAuiManager, loadPerspective, 2}},
+ {2555, {wxAuiManager, savePaneInfo, 1}},
+ {2556, {wxAuiManager, savePerspective, 0}},
+ {2557, {wxAuiManager, setArtProvider, 1}},
+ {2558, {wxAuiManager, setDockSizeConstraint, 2}},
+ {2559, {wxAuiManager, setFlags, 1}},
+ {2560, {wxAuiManager, setManagedWindow, 1}},
+ {2561, {wxAuiManager, showHint, 1}},
+ {2562, {wxAuiManager, unInit, 0}},
+ {2563, {wxAuiManager, update, 0}},
+ {2564, {wxAuiPaneInfo, new_0, 0}},
+ {2565, {wxAuiPaneInfo, new_1, 1}},
+ {2566, {wxAuiPaneInfo, destruct, 0}},
+ {2567, {wxAuiPaneInfo, bestSize_1, 1}},
+ {2568, {wxAuiPaneInfo, bestSize_2, 2}},
+ {2569, {wxAuiPaneInfo, bottom, 0}},
+ {2570, {wxAuiPaneInfo, bottomDockable, 1}},
+ {2571, {wxAuiPaneInfo, caption, 1}},
+ {2572, {wxAuiPaneInfo, captionVisible, 1}},
+ {2573, {wxAuiPaneInfo, centre, 0}},
+ {2574, {wxAuiPaneInfo, centrePane, 0}},
+ {2575, {wxAuiPaneInfo, closeButton, 1}},
+ {2576, {wxAuiPaneInfo, defaultPane, 0}},
+ {2577, {wxAuiPaneInfo, destroyOnClose, 1}},
+ {2578, {wxAuiPaneInfo, direction, 1}},
+ {2579, {wxAuiPaneInfo, dock, 0}},
+ {2580, {wxAuiPaneInfo, dockable, 1}},
+ {2581, {wxAuiPaneInfo, fixed, 0}},
+ {2582, {wxAuiPaneInfo, float, 0}},
+ {2583, {wxAuiPaneInfo, floatable, 1}},
+ {2584, {wxAuiPaneInfo, floatingPosition_1, 1}},
+ {2585, {wxAuiPaneInfo, floatingPosition_2, 2}},
+ {2586, {wxAuiPaneInfo, floatingSize_1, 1}},
+ {2587, {wxAuiPaneInfo, floatingSize_2, 2}},
+ {2588, {wxAuiPaneInfo, gripper, 1}},
+ {2589, {wxAuiPaneInfo, gripperTop, 1}},
+ {2590, {wxAuiPaneInfo, hasBorder, 0}},
+ {2591, {wxAuiPaneInfo, hasCaption, 0}},
+ {2592, {wxAuiPaneInfo, hasCloseButton, 0}},
+ {2593, {wxAuiPaneInfo, hasFlag, 1}},
+ {2594, {wxAuiPaneInfo, hasGripper, 0}},
+ {2595, {wxAuiPaneInfo, hasGripperTop, 0}},
+ {2596, {wxAuiPaneInfo, hasMaximizeButton, 0}},
+ {2597, {wxAuiPaneInfo, hasMinimizeButton, 0}},
+ {2598, {wxAuiPaneInfo, hasPinButton, 0}},
+ {2599, {wxAuiPaneInfo, hide, 0}},
+ {2600, {wxAuiPaneInfo, isBottomDockable, 0}},
+ {2601, {wxAuiPaneInfo, isDocked, 0}},
+ {2602, {wxAuiPaneInfo, isFixed, 0}},
+ {2603, {wxAuiPaneInfo, isFloatable, 0}},
+ {2604, {wxAuiPaneInfo, isFloating, 0}},
+ {2605, {wxAuiPaneInfo, isLeftDockable, 0}},
+ {2606, {wxAuiPaneInfo, isMovable, 0}},
+ {2607, {wxAuiPaneInfo, isOk, 0}},
+ {2608, {wxAuiPaneInfo, isResizable, 0}},
+ {2609, {wxAuiPaneInfo, isRightDockable, 0}},
+ {2610, {wxAuiPaneInfo, isShown, 0}},
+ {2611, {wxAuiPaneInfo, isToolbar, 0}},
+ {2612, {wxAuiPaneInfo, isTopDockable, 0}},
+ {2613, {wxAuiPaneInfo, layer, 1}},
+ {2614, {wxAuiPaneInfo, left, 0}},
+ {2615, {wxAuiPaneInfo, leftDockable, 1}},
+ {2616, {wxAuiPaneInfo, maxSize_1, 1}},
+ {2617, {wxAuiPaneInfo, maxSize_2, 2}},
+ {2618, {wxAuiPaneInfo, maximizeButton, 1}},
+ {2619, {wxAuiPaneInfo, minSize_1, 1}},
+ {2620, {wxAuiPaneInfo, minSize_2, 2}},
+ {2621, {wxAuiPaneInfo, minimizeButton, 1}},
+ {2622, {wxAuiPaneInfo, movable, 1}},
+ {2623, {wxAuiPaneInfo, name, 1}},
+ {2624, {wxAuiPaneInfo, paneBorder, 1}},
+ {2625, {wxAuiPaneInfo, pinButton, 1}},
+ {2626, {wxAuiPaneInfo, position, 1}},
+ {2627, {wxAuiPaneInfo, resizable, 1}},
+ {2628, {wxAuiPaneInfo, right, 0}},
+ {2629, {wxAuiPaneInfo, rightDockable, 1}},
+ {2630, {wxAuiPaneInfo, row, 1}},
+ {2631, {wxAuiPaneInfo, safeSet, 1}},
+ {2632, {wxAuiPaneInfo, setFlag, 2}},
+ {2633, {wxAuiPaneInfo, show, 1}},
+ {2634, {wxAuiPaneInfo, toolbarPane, 0}},
+ {2635, {wxAuiPaneInfo, top, 0}},
+ {2636, {wxAuiPaneInfo, topDockable, 1}},
+ {2637, {wxAuiPaneInfo, window, 1}},
+ {2638, {wxAuiNotebook, new_0, 0}},
+ {2639, {wxAuiNotebook, new_2, 2}},
+ {2640, {wxAuiNotebook, addPage, 3}},
+ {2641, {wxAuiNotebook, create, 2}},
+ {2642, {wxAuiNotebook, deletePage, 1}},
+ {2643, {wxAuiNotebook, getArtProvider, 0}},
+ {2644, {wxAuiNotebook, getPage, 1}},
+ {2645, {wxAuiNotebook, getPageBitmap, 1}},
+ {2646, {wxAuiNotebook, getPageCount, 0}},
+ {2647, {wxAuiNotebook, getPageIndex, 1}},
+ {2648, {wxAuiNotebook, getPageText, 1}},
+ {2649, {wxAuiNotebook, getSelection, 0}},
+ {2650, {wxAuiNotebook, insertPage, 4}},
+ {2651, {wxAuiNotebook, removePage, 1}},
+ {2652, {wxAuiNotebook, setArtProvider, 1}},
+ {2653, {wxAuiNotebook, setFont, 1}},
+ {2654, {wxAuiNotebook, setPageBitmap, 2}},
+ {2655, {wxAuiNotebook, setPageText, 2}},
+ {2656, {wxAuiNotebook, setSelection, 1}},
+ {2657, {wxAuiNotebook, setTabCtrlHeight, 1}},
+ {2658, {wxAuiNotebook, setUniformBitmapSize, 1}},
+ {2659, {wxAuiNotebook, 'Destroy', undefined}},
+ {2660, {wxMDIParentFrame, new_0, 0}},
+ {2661, {wxMDIParentFrame, new_4, 4}},
+ {2662, {wxMDIParentFrame, destruct, 0}},
+ {2663, {wxMDIParentFrame, activateNext, 0}},
+ {2664, {wxMDIParentFrame, activatePrevious, 0}},
+ {2665, {wxMDIParentFrame, arrangeIcons, 0}},
+ {2666, {wxMDIParentFrame, cascade, 0}},
+ {2667, {wxMDIParentFrame, create, 4}},
+ {2668, {wxMDIParentFrame, getActiveChild, 0}},
+ {2669, {wxMDIParentFrame, getClientWindow, 0}},
+ {2670, {wxMDIParentFrame, tile, 1}},
+ {2671, {wxMDIChildFrame, new_0, 0}},
+ {2672, {wxMDIChildFrame, new_4, 4}},
+ {2673, {wxMDIChildFrame, destruct, 0}},
+ {2674, {wxMDIChildFrame, activate, 0}},
+ {2675, {wxMDIChildFrame, create, 4}},
+ {2676, {wxMDIChildFrame, maximize, 1}},
+ {2677, {wxMDIChildFrame, restore, 0}},
+ {2678, {wxMDIClientWindow, new_0, 0}},
+ {2679, {wxMDIClientWindow, new_2, 2}},
+ {2680, {wxMDIClientWindow, destruct, 0}},
+ {2681, {wxMDIClientWindow, createClient, 2}},
+ {2682, {wxLayoutAlgorithm, new, 0}},
+ {2683, {wxLayoutAlgorithm, layoutFrame, 2}},
+ {2684, {wxLayoutAlgorithm, layoutMDIFrame, 2}},
+ {2685, {wxLayoutAlgorithm, layoutWindow, 2}},
+ {2686, {wxLayoutAlgorithm, 'Destroy', undefined}},
+ {2687, {wxEvent, getId, 0}},
+ {2688, {wxEvent, getSkipped, 0}},
+ {2689, {wxEvent, getTimestamp, 0}},
+ {2690, {wxEvent, isCommandEvent, 0}},
+ {2691, {wxEvent, resumePropagation, 1}},
+ {2692, {wxEvent, shouldPropagate, 0}},
+ {2693, {wxEvent, skip, 1}},
+ {2694, {wxEvent, stopPropagation, 0}},
+ {2695, {wxCommandEvent, getClientData, 0}},
+ {2696, {wxCommandEvent, getExtraLong, 0}},
+ {2697, {wxCommandEvent, getInt, 0}},
+ {2698, {wxCommandEvent, getSelection, 0}},
+ {2699, {wxCommandEvent, getString, 0}},
+ {2700, {wxCommandEvent, isChecked, 0}},
+ {2701, {wxCommandEvent, isSelection, 0}},
+ {2702, {wxCommandEvent, setInt, 1}},
+ {2703, {wxCommandEvent, setString, 1}},
+ {2704, {wxScrollEvent, getOrientation, 0}},
+ {2705, {wxScrollEvent, getPosition, 0}},
+ {2706, {wxScrollWinEvent, getOrientation, 0}},
+ {2707, {wxScrollWinEvent, getPosition, 0}},
+ {2708, {wxMouseEvent, altDown, 0}},
+ {2709, {wxMouseEvent, button, 1}},
+ {2710, {wxMouseEvent, buttonDClick, 1}},
+ {2711, {wxMouseEvent, buttonDown, 1}},
+ {2712, {wxMouseEvent, buttonUp, 1}},
+ {2713, {wxMouseEvent, cmdDown, 0}},
+ {2714, {wxMouseEvent, controlDown, 0}},
+ {2715, {wxMouseEvent, dragging, 0}},
+ {2716, {wxMouseEvent, entering, 0}},
+ {2717, {wxMouseEvent, getButton, 0}},
+ {2720, {wxMouseEvent, getPosition, 0}},
+ {2721, {wxMouseEvent, getLogicalPosition, 1}},
+ {2722, {wxMouseEvent, getLinesPerAction, 0}},
+ {2723, {wxMouseEvent, getWheelRotation, 0}},
+ {2724, {wxMouseEvent, getWheelDelta, 0}},
+ {2725, {wxMouseEvent, getX, 0}},
+ {2726, {wxMouseEvent, getY, 0}},
+ {2727, {wxMouseEvent, isButton, 0}},
+ {2728, {wxMouseEvent, isPageScroll, 0}},
+ {2729, {wxMouseEvent, leaving, 0}},
+ {2730, {wxMouseEvent, leftDClick, 0}},
+ {2731, {wxMouseEvent, leftDown, 0}},
+ {2732, {wxMouseEvent, leftIsDown, 0}},
+ {2733, {wxMouseEvent, leftUp, 0}},
+ {2734, {wxMouseEvent, metaDown, 0}},
+ {2735, {wxMouseEvent, middleDClick, 0}},
+ {2736, {wxMouseEvent, middleDown, 0}},
+ {2737, {wxMouseEvent, middleIsDown, 0}},
+ {2738, {wxMouseEvent, middleUp, 0}},
+ {2739, {wxMouseEvent, moving, 0}},
+ {2740, {wxMouseEvent, rightDClick, 0}},
+ {2741, {wxMouseEvent, rightDown, 0}},
+ {2742, {wxMouseEvent, rightIsDown, 0}},
+ {2743, {wxMouseEvent, rightUp, 0}},
+ {2744, {wxMouseEvent, shiftDown, 0}},
+ {2745, {wxSetCursorEvent, getCursor, 0}},
+ {2746, {wxSetCursorEvent, getX, 0}},
+ {2747, {wxSetCursorEvent, getY, 0}},
+ {2748, {wxSetCursorEvent, hasCursor, 0}},
+ {2749, {wxSetCursorEvent, setCursor, 1}},
+ {2750, {wxKeyEvent, altDown, 0}},
+ {2751, {wxKeyEvent, cmdDown, 0}},
+ {2752, {wxKeyEvent, controlDown, 0}},
+ {2753, {wxKeyEvent, getKeyCode, 0}},
+ {2754, {wxKeyEvent, getModifiers, 0}},
+ {2757, {wxKeyEvent, getPosition, 0}},
+ {2758, {wxKeyEvent, getRawKeyCode, 0}},
+ {2759, {wxKeyEvent, getRawKeyFlags, 0}},
+ {2760, {wxKeyEvent, getUnicodeKey, 0}},
+ {2761, {wxKeyEvent, getX, 0}},
+ {2762, {wxKeyEvent, getY, 0}},
+ {2763, {wxKeyEvent, hasModifiers, 0}},
+ {2764, {wxKeyEvent, metaDown, 0}},
+ {2765, {wxKeyEvent, shiftDown, 0}},
+ {2766, {wxSizeEvent, getSize, 0}},
+ {2767, {wxMoveEvent, getPosition, 0}},
+ {2768, {wxEraseEvent, getDC, 0}},
+ {2769, {wxFocusEvent, getWindow, 0}},
+ {2770, {wxChildFocusEvent, getWindow, 0}},
+ {2771, {wxMenuEvent, getMenu, 0}},
+ {2772, {wxMenuEvent, getMenuId, 0}},
+ {2773, {wxMenuEvent, isPopup, 0}},
+ {2774, {wxCloseEvent, canVeto, 0}},
+ {2775, {wxCloseEvent, getLoggingOff, 0}},
+ {2776, {wxCloseEvent, setCanVeto, 1}},
+ {2777, {wxCloseEvent, setLoggingOff, 1}},
+ {2778, {wxCloseEvent, veto, 1}},
+ {2779, {wxShowEvent, setShow, 1}},
+ {2780, {wxShowEvent, getShow, 0}},
+ {2781, {wxIconizeEvent, iconized, 0}},
+ {2782, {wxJoystickEvent, buttonDown, 1}},
+ {2783, {wxJoystickEvent, buttonIsDown, 1}},
+ {2784, {wxJoystickEvent, buttonUp, 1}},
+ {2785, {wxJoystickEvent, getButtonChange, 0}},
+ {2786, {wxJoystickEvent, getButtonState, 0}},
+ {2787, {wxJoystickEvent, getJoystick, 0}},
+ {2788, {wxJoystickEvent, getPosition, 0}},
+ {2789, {wxJoystickEvent, getZPosition, 0}},
+ {2790, {wxJoystickEvent, isButton, 0}},
+ {2791, {wxJoystickEvent, isMove, 0}},
+ {2792, {wxJoystickEvent, isZMove, 0}},
+ {2793, {wxUpdateUIEvent, canUpdate, 1}},
+ {2794, {wxUpdateUIEvent, check, 1}},
+ {2795, {wxUpdateUIEvent, enable, 1}},
+ {2796, {wxUpdateUIEvent, show, 1}},
+ {2797, {wxUpdateUIEvent, getChecked, 0}},
+ {2798, {wxUpdateUIEvent, getEnabled, 0}},
+ {2799, {wxUpdateUIEvent, getShown, 0}},
+ {2800, {wxUpdateUIEvent, getSetChecked, 0}},
+ {2801, {wxUpdateUIEvent, getSetEnabled, 0}},
+ {2802, {wxUpdateUIEvent, getSetShown, 0}},
+ {2803, {wxUpdateUIEvent, getSetText, 0}},
+ {2804, {wxUpdateUIEvent, getText, 0}},
+ {2805, {wxUpdateUIEvent, getMode, 0}},
+ {2806, {wxUpdateUIEvent, getUpdateInterval, 0}},
+ {2807, {wxUpdateUIEvent, resetUpdateTime, 0}},
+ {2808, {wxUpdateUIEvent, setMode, 1}},
+ {2809, {wxUpdateUIEvent, setText, 1}},
+ {2810, {wxUpdateUIEvent, setUpdateInterval, 1}},
+ {2811, {wxMouseCaptureChangedEvent, getCapturedWindow, 0}},
+ {2812, {wxPaletteChangedEvent, setChangedWindow, 1}},
+ {2813, {wxPaletteChangedEvent, getChangedWindow, 0}},
+ {2814, {wxQueryNewPaletteEvent, setPaletteRealized, 1}},
+ {2815, {wxQueryNewPaletteEvent, getPaletteRealized, 0}},
+ {2816, {wxNavigationKeyEvent, getDirection, 0}},
+ {2817, {wxNavigationKeyEvent, setDirection, 1}},
+ {2818, {wxNavigationKeyEvent, isWindowChange, 0}},
+ {2819, {wxNavigationKeyEvent, setWindowChange, 1}},
+ {2820, {wxNavigationKeyEvent, isFromTab, 0}},
+ {2821, {wxNavigationKeyEvent, setFromTab, 1}},
+ {2822, {wxNavigationKeyEvent, getCurrentFocus, 0}},
+ {2823, {wxNavigationKeyEvent, setCurrentFocus, 1}},
+ {2824, {wxHelpEvent, getOrigin, 0}},
+ {2825, {wxHelpEvent, getPosition, 0}},
+ {2826, {wxHelpEvent, setOrigin, 1}},
+ {2827, {wxHelpEvent, setPosition, 1}},
+ {2828, {wxContextMenuEvent, getPosition, 0}},
+ {2829, {wxContextMenuEvent, setPosition, 1}},
+ {2830, {wxIdleEvent, canSend, 1}},
+ {2831, {wxIdleEvent, getMode, 0}},
+ {2832, {wxIdleEvent, requestMore, 1}},
+ {2833, {wxIdleEvent, moreRequested, 0}},
+ {2834, {wxIdleEvent, setMode, 1}},
+ {2835, {wxGridEvent, altDown, 0}},
+ {2836, {wxGridEvent, controlDown, 0}},
+ {2837, {wxGridEvent, getCol, 0}},
+ {2838, {wxGridEvent, getPosition, 0}},
+ {2839, {wxGridEvent, getRow, 0}},
+ {2840, {wxGridEvent, metaDown, 0}},
+ {2841, {wxGridEvent, selecting, 0}},
+ {2842, {wxGridEvent, shiftDown, 0}},
+ {2843, {wxNotifyEvent, allow, 0}},
+ {2844, {wxNotifyEvent, isAllowed, 0}},
+ {2845, {wxNotifyEvent, veto, 0}},
+ {2846, {wxSashEvent, getEdge, 0}},
+ {2847, {wxSashEvent, getDragRect, 0}},
+ {2848, {wxSashEvent, getDragStatus, 0}},
+ {2849, {wxListEvent, getCacheFrom, 0}},
+ {2850, {wxListEvent, getCacheTo, 0}},
+ {2851, {wxListEvent, getKeyCode, 0}},
+ {2852, {wxListEvent, getIndex, 0}},
+ {2853, {wxListEvent, getColumn, 0}},
+ {2854, {wxListEvent, getPoint, 0}},
+ {2855, {wxListEvent, getLabel, 0}},
+ {2856, {wxListEvent, getText, 0}},
+ {2857, {wxListEvent, getImage, 0}},
+ {2858, {wxListEvent, getData, 0}},
+ {2859, {wxListEvent, getMask, 0}},
+ {2860, {wxListEvent, getItem, 0}},
+ {2861, {wxListEvent, isEditCancelled, 0}},
+ {2862, {wxDateEvent, getDate, 0}},
+ {2863, {wxCalendarEvent, getWeekDay, 0}},
+ {2864, {wxFileDirPickerEvent, getPath, 0}},
+ {2865, {wxColourPickerEvent, getColour, 0}},
+ {2866, {wxFontPickerEvent, getFont, 0}},
+ {2867, {wxStyledTextEvent, getPosition, 0}},
+ {2868, {wxStyledTextEvent, getKey, 0}},
+ {2869, {wxStyledTextEvent, getModifiers, 0}},
+ {2870, {wxStyledTextEvent, getModificationType, 0}},
+ {2871, {wxStyledTextEvent, getText, 0}},
+ {2872, {wxStyledTextEvent, getLength, 0}},
+ {2873, {wxStyledTextEvent, getLinesAdded, 0}},
+ {2874, {wxStyledTextEvent, getLine, 0}},
+ {2875, {wxStyledTextEvent, getFoldLevelNow, 0}},
+ {2876, {wxStyledTextEvent, getFoldLevelPrev, 0}},
+ {2877, {wxStyledTextEvent, getMargin, 0}},
+ {2878, {wxStyledTextEvent, getMessage, 0}},
+ {2879, {wxStyledTextEvent, getWParam, 0}},
+ {2880, {wxStyledTextEvent, getLParam, 0}},
+ {2881, {wxStyledTextEvent, getListType, 0}},
+ {2882, {wxStyledTextEvent, getX, 0}},
+ {2883, {wxStyledTextEvent, getY, 0}},
+ {2884, {wxStyledTextEvent, getDragText, 0}},
+ {2885, {wxStyledTextEvent, getDragAllowMove, 0}},
+ {2886, {wxStyledTextEvent, getDragResult, 0}},
+ {2887, {wxStyledTextEvent, getShift, 0}},
+ {2888, {wxStyledTextEvent, getControl, 0}},
+ {2889, {wxStyledTextEvent, getAlt, 0}},
+ {2890, {utils, getKeyState, 1}},
+ {2891, {utils, getMousePosition, 2}},
+ {2892, {utils, getMouseState, 0}},
+ {2893, {utils, setDetectableAutoRepeat, 1}},
+ {2894, {utils, bell, 0}},
+ {2895, {utils, findMenuItemId, 3}},
+ {2896, {utils, genericFindWindowAtPoint, 1}},
+ {2897, {utils, findWindowAtPoint, 1}},
+ {2898, {utils, beginBusyCursor, 1}},
+ {2899, {utils, endBusyCursor, 0}},
+ {2900, {utils, isBusy, 0}},
+ {2901, {utils, shutdown, 1}},
+ {2902, {utils, shell, 1}},
+ {2903, {utils, launchDefaultBrowser, 2}},
+ {2904, {utils, getEmailAddress, 0}},
+ {2905, {utils, getUserId, 0}},
+ {2906, {utils, getHomeDir, 0}},
+ {2907, {utils, newId, 0}},
+ {2908, {utils, registerId, 1}},
+ {2909, {utils, getCurrentId, 0}},
+ {2910, {utils, getOsDescription, 0}},
+ {2911, {utils, isPlatformLittleEndian, 0}},
+ {2912, {utils, isPlatform64Bit, 0}},
+ {2913, {wxPrintout, new, 1}},
+ {2914, {wxPrintout, destruct, 0}},
+ {2915, {wxPrintout, getDC, 0}},
+ {2916, {wxPrintout, getPageSizeMM, 2}},
+ {2917, {wxPrintout, getPageSizePixels, 2}},
+ {2918, {wxPrintout, getPaperRectPixels, 0}},
+ {2919, {wxPrintout, getPPIPrinter, 2}},
+ {2920, {wxPrintout, getPPIScreen, 2}},
+ {2921, {wxPrintout, getTitle, 0}},
+ {2922, {wxPrintout, isPreview, 0}},
+ {2923, {wxPrintout, fitThisSizeToPaper, 1}},
+ {2924, {wxPrintout, fitThisSizeToPage, 1}},
+ {2925, {wxPrintout, fitThisSizeToPageMargins, 2}},
+ {2926, {wxPrintout, mapScreenSizeToPaper, 0}},
+ {2927, {wxPrintout, mapScreenSizeToPage, 0}},
+ {2928, {wxPrintout, mapScreenSizeToPageMargins, 1}},
+ {2929, {wxPrintout, mapScreenSizeToDevice, 0}},
+ {2930, {wxPrintout, getLogicalPaperRect, 0}},
+ {2931, {wxPrintout, getLogicalPageRect, 0}},
+ {2932, {wxPrintout, getLogicalPageMarginsRect, 1}},
+ {2933, {wxPrintout, setLogicalOrigin, 2}},
+ {2934, {wxPrintout, offsetLogicalOrigin, 2}},
+ {2935, {wxStyledTextCtrl, new_2, 2}},
+ {2936, {wxStyledTextCtrl, new_0, 0}},
+ {2937, {wxStyledTextCtrl, destruct, 0}},
+ {2938, {wxStyledTextCtrl, create, 2}},
+ {2939, {wxStyledTextCtrl, addText, 1}},
+ {2940, {wxStyledTextCtrl, addStyledText, 1}},
+ {2941, {wxStyledTextCtrl, insertText, 2}},
+ {2942, {wxStyledTextCtrl, clearAll, 0}},
+ {2943, {wxStyledTextCtrl, clearDocumentStyle, 0}},
+ {2944, {wxStyledTextCtrl, getLength, 0}},
+ {2945, {wxStyledTextCtrl, getCharAt, 1}},
+ {2946, {wxStyledTextCtrl, getCurrentPos, 0}},
+ {2947, {wxStyledTextCtrl, getAnchor, 0}},
+ {2948, {wxStyledTextCtrl, getStyleAt, 1}},
+ {2949, {wxStyledTextCtrl, redo, 0}},
+ {2950, {wxStyledTextCtrl, setUndoCollection, 1}},
+ {2951, {wxStyledTextCtrl, selectAll, 0}},
+ {2952, {wxStyledTextCtrl, setSavePoint, 0}},
+ {2953, {wxStyledTextCtrl, getStyledText, 2}},
+ {2954, {wxStyledTextCtrl, canRedo, 0}},
+ {2955, {wxStyledTextCtrl, markerLineFromHandle, 1}},
+ {2956, {wxStyledTextCtrl, markerDeleteHandle, 1}},
+ {2957, {wxStyledTextCtrl, getUndoCollection, 0}},
+ {2958, {wxStyledTextCtrl, getViewWhiteSpace, 0}},
+ {2959, {wxStyledTextCtrl, setViewWhiteSpace, 1}},
+ {2960, {wxStyledTextCtrl, positionFromPoint, 1}},
+ {2961, {wxStyledTextCtrl, positionFromPointClose, 2}},
+ {2962, {wxStyledTextCtrl, gotoLine, 1}},
+ {2963, {wxStyledTextCtrl, gotoPos, 1}},
+ {2964, {wxStyledTextCtrl, setAnchor, 1}},
+ {2965, {wxStyledTextCtrl, getCurLine, 1}},
+ {2966, {wxStyledTextCtrl, getEndStyled, 0}},
+ {2967, {wxStyledTextCtrl, convertEOLs, 1}},
+ {2968, {wxStyledTextCtrl, getEOLMode, 0}},
+ {2969, {wxStyledTextCtrl, setEOLMode, 1}},
+ {2970, {wxStyledTextCtrl, startStyling, 2}},
+ {2971, {wxStyledTextCtrl, setStyling, 2}},
+ {2972, {wxStyledTextCtrl, getBufferedDraw, 0}},
+ {2973, {wxStyledTextCtrl, setBufferedDraw, 1}},
+ {2974, {wxStyledTextCtrl, setTabWidth, 1}},
+ {2975, {wxStyledTextCtrl, getTabWidth, 0}},
+ {2976, {wxStyledTextCtrl, setCodePage, 1}},
+ {2977, {wxStyledTextCtrl, markerDefine, 3}},
+ {2978, {wxStyledTextCtrl, markerSetForeground, 2}},
+ {2979, {wxStyledTextCtrl, markerSetBackground, 2}},
+ {2980, {wxStyledTextCtrl, markerAdd, 2}},
+ {2981, {wxStyledTextCtrl, markerDelete, 2}},
+ {2982, {wxStyledTextCtrl, markerDeleteAll, 1}},
+ {2983, {wxStyledTextCtrl, markerGet, 1}},
+ {2984, {wxStyledTextCtrl, markerNext, 2}},
+ {2985, {wxStyledTextCtrl, markerPrevious, 2}},
+ {2986, {wxStyledTextCtrl, markerDefineBitmap, 2}},
+ {2987, {wxStyledTextCtrl, markerAddSet, 2}},
+ {2988, {wxStyledTextCtrl, markerSetAlpha, 2}},
+ {2989, {wxStyledTextCtrl, setMarginType, 2}},
+ {2990, {wxStyledTextCtrl, getMarginType, 1}},
+ {2991, {wxStyledTextCtrl, setMarginWidth, 2}},
+ {2992, {wxStyledTextCtrl, getMarginWidth, 1}},
+ {2993, {wxStyledTextCtrl, setMarginMask, 2}},
+ {2994, {wxStyledTextCtrl, getMarginMask, 1}},
+ {2995, {wxStyledTextCtrl, setMarginSensitive, 2}},
+ {2996, {wxStyledTextCtrl, getMarginSensitive, 1}},
+ {2997, {wxStyledTextCtrl, styleClearAll, 0}},
+ {2998, {wxStyledTextCtrl, styleSetForeground, 2}},
+ {2999, {wxStyledTextCtrl, styleSetBackground, 2}},
+ {3000, {wxStyledTextCtrl, styleSetBold, 2}},
+ {3001, {wxStyledTextCtrl, styleSetItalic, 2}},
+ {3002, {wxStyledTextCtrl, styleSetSize, 2}},
+ {3003, {wxStyledTextCtrl, styleSetFaceName, 2}},
+ {3004, {wxStyledTextCtrl, styleSetEOLFilled, 2}},
+ {3005, {wxStyledTextCtrl, styleResetDefault, 0}},
+ {3006, {wxStyledTextCtrl, styleSetUnderline, 2}},
+ {3007, {wxStyledTextCtrl, styleSetCase, 2}},
+ {3008, {wxStyledTextCtrl, styleSetHotSpot, 2}},
+ {3009, {wxStyledTextCtrl, setSelForeground, 2}},
+ {3010, {wxStyledTextCtrl, setSelBackground, 2}},
+ {3011, {wxStyledTextCtrl, getSelAlpha, 0}},
+ {3012, {wxStyledTextCtrl, setSelAlpha, 1}},
+ {3013, {wxStyledTextCtrl, setCaretForeground, 1}},
+ {3014, {wxStyledTextCtrl, cmdKeyAssign, 3}},
+ {3015, {wxStyledTextCtrl, cmdKeyClear, 2}},
+ {3016, {wxStyledTextCtrl, cmdKeyClearAll, 0}},
+ {3017, {wxStyledTextCtrl, setStyleBytes, 2}},
+ {3018, {wxStyledTextCtrl, styleSetVisible, 2}},
+ {3019, {wxStyledTextCtrl, getCaretPeriod, 0}},
+ {3020, {wxStyledTextCtrl, setCaretPeriod, 1}},
+ {3021, {wxStyledTextCtrl, setWordChars, 1}},
+ {3022, {wxStyledTextCtrl, beginUndoAction, 0}},
+ {3023, {wxStyledTextCtrl, endUndoAction, 0}},
+ {3024, {wxStyledTextCtrl, indicatorSetStyle, 2}},
+ {3025, {wxStyledTextCtrl, indicatorGetStyle, 1}},
+ {3026, {wxStyledTextCtrl, indicatorSetForeground, 2}},
+ {3027, {wxStyledTextCtrl, indicatorGetForeground, 1}},
+ {3028, {wxStyledTextCtrl, setWhitespaceForeground, 2}},
+ {3029, {wxStyledTextCtrl, setWhitespaceBackground, 2}},
+ {3030, {wxStyledTextCtrl, getStyleBits, 0}},
+ {3031, {wxStyledTextCtrl, setLineState, 2}},
+ {3032, {wxStyledTextCtrl, getLineState, 1}},
+ {3033, {wxStyledTextCtrl, getMaxLineState, 0}},
+ {3034, {wxStyledTextCtrl, getCaretLineVisible, 0}},
+ {3035, {wxStyledTextCtrl, setCaretLineVisible, 1}},
+ {3036, {wxStyledTextCtrl, getCaretLineBackground, 0}},
+ {3037, {wxStyledTextCtrl, setCaretLineBackground, 1}},
+ {3038, {wxStyledTextCtrl, autoCompShow, 2}},
+ {3039, {wxStyledTextCtrl, autoCompCancel, 0}},
+ {3040, {wxStyledTextCtrl, autoCompActive, 0}},
+ {3041, {wxStyledTextCtrl, autoCompPosStart, 0}},
+ {3042, {wxStyledTextCtrl, autoCompComplete, 0}},
+ {3043, {wxStyledTextCtrl, autoCompStops, 1}},
+ {3044, {wxStyledTextCtrl, autoCompSetSeparator, 1}},
+ {3045, {wxStyledTextCtrl, autoCompGetSeparator, 0}},
+ {3046, {wxStyledTextCtrl, autoCompSelect, 1}},
+ {3047, {wxStyledTextCtrl, autoCompSetCancelAtStart, 1}},
+ {3048, {wxStyledTextCtrl, autoCompGetCancelAtStart, 0}},
+ {3049, {wxStyledTextCtrl, autoCompSetFillUps, 1}},
+ {3050, {wxStyledTextCtrl, autoCompSetChooseSingle, 1}},
+ {3051, {wxStyledTextCtrl, autoCompGetChooseSingle, 0}},
+ {3052, {wxStyledTextCtrl, autoCompSetIgnoreCase, 1}},
+ {3053, {wxStyledTextCtrl, autoCompGetIgnoreCase, 0}},
+ {3054, {wxStyledTextCtrl, userListShow, 2}},
+ {3055, {wxStyledTextCtrl, autoCompSetAutoHide, 1}},
+ {3056, {wxStyledTextCtrl, autoCompGetAutoHide, 0}},
+ {3057, {wxStyledTextCtrl, autoCompSetDropRestOfWord, 1}},
+ {3058, {wxStyledTextCtrl, autoCompGetDropRestOfWord, 0}},
+ {3059, {wxStyledTextCtrl, registerImage, 2}},
+ {3060, {wxStyledTextCtrl, clearRegisteredImages, 0}},
+ {3061, {wxStyledTextCtrl, autoCompGetTypeSeparator, 0}},
+ {3062, {wxStyledTextCtrl, autoCompSetTypeSeparator, 1}},
+ {3063, {wxStyledTextCtrl, autoCompSetMaxWidth, 1}},
+ {3064, {wxStyledTextCtrl, autoCompGetMaxWidth, 0}},
+ {3065, {wxStyledTextCtrl, autoCompSetMaxHeight, 1}},
+ {3066, {wxStyledTextCtrl, autoCompGetMaxHeight, 0}},
+ {3067, {wxStyledTextCtrl, setIndent, 1}},
+ {3068, {wxStyledTextCtrl, getIndent, 0}},
+ {3069, {wxStyledTextCtrl, setUseTabs, 1}},
+ {3070, {wxStyledTextCtrl, getUseTabs, 0}},
+ {3071, {wxStyledTextCtrl, setLineIndentation, 2}},
+ {3072, {wxStyledTextCtrl, getLineIndentation, 1}},
+ {3073, {wxStyledTextCtrl, getLineIndentPosition, 1}},
+ {3074, {wxStyledTextCtrl, getColumn, 1}},
+ {3075, {wxStyledTextCtrl, setUseHorizontalScrollBar, 1}},
+ {3076, {wxStyledTextCtrl, getUseHorizontalScrollBar, 0}},
+ {3077, {wxStyledTextCtrl, setIndentationGuides, 1}},
+ {3078, {wxStyledTextCtrl, getIndentationGuides, 0}},
+ {3079, {wxStyledTextCtrl, setHighlightGuide, 1}},
+ {3080, {wxStyledTextCtrl, getHighlightGuide, 0}},
+ {3081, {wxStyledTextCtrl, getLineEndPosition, 1}},
+ {3082, {wxStyledTextCtrl, getCodePage, 0}},
+ {3083, {wxStyledTextCtrl, getCaretForeground, 0}},
+ {3084, {wxStyledTextCtrl, getReadOnly, 0}},
+ {3085, {wxStyledTextCtrl, setCurrentPos, 1}},
+ {3086, {wxStyledTextCtrl, setSelectionStart, 1}},
+ {3087, {wxStyledTextCtrl, getSelectionStart, 0}},
+ {3088, {wxStyledTextCtrl, setSelectionEnd, 1}},
+ {3089, {wxStyledTextCtrl, getSelectionEnd, 0}},
+ {3090, {wxStyledTextCtrl, setPrintMagnification, 1}},
+ {3091, {wxStyledTextCtrl, getPrintMagnification, 0}},
+ {3092, {wxStyledTextCtrl, setPrintColourMode, 1}},
+ {3093, {wxStyledTextCtrl, getPrintColourMode, 0}},
+ {3094, {wxStyledTextCtrl, findText, 4}},
+ {3095, {wxStyledTextCtrl, formatRange, 7}},
+ {3096, {wxStyledTextCtrl, getFirstVisibleLine, 0}},
+ {3097, {wxStyledTextCtrl, getLine, 1}},
+ {3098, {wxStyledTextCtrl, getLineCount, 0}},
+ {3099, {wxStyledTextCtrl, setMarginLeft, 1}},
+ {3100, {wxStyledTextCtrl, getMarginLeft, 0}},
+ {3101, {wxStyledTextCtrl, setMarginRight, 1}},
+ {3102, {wxStyledTextCtrl, getMarginRight, 0}},
+ {3103, {wxStyledTextCtrl, getModify, 0}},
+ {3104, {wxStyledTextCtrl, setSelection, 2}},
+ {3105, {wxStyledTextCtrl, getSelectedText, 0}},
+ {3106, {wxStyledTextCtrl, getTextRange, 2}},
+ {3107, {wxStyledTextCtrl, hideSelection, 1}},
+ {3108, {wxStyledTextCtrl, lineFromPosition, 1}},
+ {3109, {wxStyledTextCtrl, positionFromLine, 1}},
+ {3110, {wxStyledTextCtrl, lineScroll, 2}},
+ {3111, {wxStyledTextCtrl, ensureCaretVisible, 0}},
+ {3112, {wxStyledTextCtrl, replaceSelection, 1}},
+ {3113, {wxStyledTextCtrl, setReadOnly, 1}},
+ {3114, {wxStyledTextCtrl, canPaste, 0}},
+ {3115, {wxStyledTextCtrl, canUndo, 0}},
+ {3116, {wxStyledTextCtrl, emptyUndoBuffer, 0}},
+ {3117, {wxStyledTextCtrl, undo, 0}},
+ {3118, {wxStyledTextCtrl, cut, 0}},
+ {3119, {wxStyledTextCtrl, copy, 0}},
+ {3120, {wxStyledTextCtrl, paste, 0}},
+ {3121, {wxStyledTextCtrl, clear, 0}},
+ {3122, {wxStyledTextCtrl, setText, 1}},
+ {3123, {wxStyledTextCtrl, getText, 0}},
+ {3124, {wxStyledTextCtrl, getTextLength, 0}},
+ {3125, {wxStyledTextCtrl, getOvertype, 0}},
+ {3126, {wxStyledTextCtrl, setCaretWidth, 1}},
+ {3127, {wxStyledTextCtrl, getCaretWidth, 0}},
+ {3128, {wxStyledTextCtrl, setTargetStart, 1}},
+ {3129, {wxStyledTextCtrl, getTargetStart, 0}},
+ {3130, {wxStyledTextCtrl, setTargetEnd, 1}},
+ {3131, {wxStyledTextCtrl, getTargetEnd, 0}},
+ {3132, {wxStyledTextCtrl, replaceTarget, 1}},
+ {3133, {wxStyledTextCtrl, searchInTarget, 1}},
+ {3134, {wxStyledTextCtrl, setSearchFlags, 1}},
+ {3135, {wxStyledTextCtrl, getSearchFlags, 0}},
+ {3136, {wxStyledTextCtrl, callTipShow, 2}},
+ {3137, {wxStyledTextCtrl, callTipCancel, 0}},
+ {3138, {wxStyledTextCtrl, callTipActive, 0}},
+ {3139, {wxStyledTextCtrl, callTipPosAtStart, 0}},
+ {3140, {wxStyledTextCtrl, callTipSetHighlight, 2}},
+ {3141, {wxStyledTextCtrl, callTipSetBackground, 1}},
+ {3142, {wxStyledTextCtrl, callTipSetForeground, 1}},
+ {3143, {wxStyledTextCtrl, callTipSetForegroundHighlight, 1}},
+ {3144, {wxStyledTextCtrl, callTipUseStyle, 1}},
+ {3145, {wxStyledTextCtrl, visibleFromDocLine, 1}},
+ {3146, {wxStyledTextCtrl, docLineFromVisible, 1}},
+ {3147, {wxStyledTextCtrl, wrapCount, 1}},
+ {3148, {wxStyledTextCtrl, setFoldLevel, 2}},
+ {3149, {wxStyledTextCtrl, getFoldLevel, 1}},
+ {3150, {wxStyledTextCtrl, getLastChild, 2}},
+ {3151, {wxStyledTextCtrl, getFoldParent, 1}},
+ {3152, {wxStyledTextCtrl, showLines, 2}},
+ {3153, {wxStyledTextCtrl, hideLines, 2}},
+ {3154, {wxStyledTextCtrl, getLineVisible, 1}},
+ {3155, {wxStyledTextCtrl, setFoldExpanded, 2}},
+ {3156, {wxStyledTextCtrl, getFoldExpanded, 1}},
+ {3157, {wxStyledTextCtrl, toggleFold, 1}},
+ {3158, {wxStyledTextCtrl, ensureVisible, 1}},
+ {3159, {wxStyledTextCtrl, setFoldFlags, 1}},
+ {3160, {wxStyledTextCtrl, ensureVisibleEnforcePolicy, 1}},
+ {3161, {wxStyledTextCtrl, setTabIndents, 1}},
+ {3162, {wxStyledTextCtrl, getTabIndents, 0}},
+ {3163, {wxStyledTextCtrl, setBackSpaceUnIndents, 1}},
+ {3164, {wxStyledTextCtrl, getBackSpaceUnIndents, 0}},
+ {3165, {wxStyledTextCtrl, setMouseDwellTime, 1}},
+ {3166, {wxStyledTextCtrl, getMouseDwellTime, 0}},
+ {3167, {wxStyledTextCtrl, wordStartPosition, 2}},
+ {3168, {wxStyledTextCtrl, wordEndPosition, 2}},
+ {3169, {wxStyledTextCtrl, setWrapMode, 1}},
+ {3170, {wxStyledTextCtrl, getWrapMode, 0}},
+ {3171, {wxStyledTextCtrl, setWrapVisualFlags, 1}},
+ {3172, {wxStyledTextCtrl, getWrapVisualFlags, 0}},
+ {3173, {wxStyledTextCtrl, setWrapVisualFlagsLocation, 1}},
+ {3174, {wxStyledTextCtrl, getWrapVisualFlagsLocation, 0}},
+ {3175, {wxStyledTextCtrl, setWrapStartIndent, 1}},
+ {3176, {wxStyledTextCtrl, getWrapStartIndent, 0}},
+ {3177, {wxStyledTextCtrl, setLayoutCache, 1}},
+ {3178, {wxStyledTextCtrl, getLayoutCache, 0}},
+ {3179, {wxStyledTextCtrl, setScrollWidth, 1}},
+ {3180, {wxStyledTextCtrl, getScrollWidth, 0}},
+ {3181, {wxStyledTextCtrl, textWidth, 2}},
+ {3182, {wxStyledTextCtrl, getEndAtLastLine, 0}},
+ {3183, {wxStyledTextCtrl, textHeight, 1}},
+ {3184, {wxStyledTextCtrl, setUseVerticalScrollBar, 1}},
+ {3185, {wxStyledTextCtrl, getUseVerticalScrollBar, 0}},
+ {3186, {wxStyledTextCtrl, appendText, 1}},
+ {3187, {wxStyledTextCtrl, getTwoPhaseDraw, 0}},
+ {3188, {wxStyledTextCtrl, setTwoPhaseDraw, 1}},
+ {3189, {wxStyledTextCtrl, targetFromSelection, 0}},
+ {3190, {wxStyledTextCtrl, linesJoin, 0}},
+ {3191, {wxStyledTextCtrl, linesSplit, 1}},
+ {3192, {wxStyledTextCtrl, setFoldMarginColour, 2}},
+ {3193, {wxStyledTextCtrl, setFoldMarginHiColour, 2}},
+ {3194, {wxStyledTextCtrl, lineDown, 0}},
+ {3195, {wxStyledTextCtrl, lineDownExtend, 0}},
+ {3196, {wxStyledTextCtrl, lineUp, 0}},
+ {3197, {wxStyledTextCtrl, lineUpExtend, 0}},
+ {3198, {wxStyledTextCtrl, charLeft, 0}},
+ {3199, {wxStyledTextCtrl, charLeftExtend, 0}},
+ {3200, {wxStyledTextCtrl, charRight, 0}},
+ {3201, {wxStyledTextCtrl, charRightExtend, 0}},
+ {3202, {wxStyledTextCtrl, wordLeft, 0}},
+ {3203, {wxStyledTextCtrl, wordLeftExtend, 0}},
+ {3204, {wxStyledTextCtrl, wordRight, 0}},
+ {3205, {wxStyledTextCtrl, wordRightExtend, 0}},
+ {3206, {wxStyledTextCtrl, home, 0}},
+ {3207, {wxStyledTextCtrl, homeExtend, 0}},
+ {3208, {wxStyledTextCtrl, lineEnd, 0}},
+ {3209, {wxStyledTextCtrl, lineEndExtend, 0}},
+ {3210, {wxStyledTextCtrl, documentStart, 0}},
+ {3211, {wxStyledTextCtrl, documentStartExtend, 0}},
+ {3212, {wxStyledTextCtrl, documentEnd, 0}},
+ {3213, {wxStyledTextCtrl, documentEndExtend, 0}},
+ {3214, {wxStyledTextCtrl, pageUp, 0}},
+ {3215, {wxStyledTextCtrl, pageUpExtend, 0}},
+ {3216, {wxStyledTextCtrl, pageDown, 0}},
+ {3217, {wxStyledTextCtrl, pageDownExtend, 0}},
+ {3218, {wxStyledTextCtrl, editToggleOvertype, 0}},
+ {3219, {wxStyledTextCtrl, cancel, 0}},
+ {3220, {wxStyledTextCtrl, deleteBack, 0}},
+ {3221, {wxStyledTextCtrl, tab, 0}},
+ {3222, {wxStyledTextCtrl, backTab, 0}},
+ {3223, {wxStyledTextCtrl, newLine, 0}},
+ {3224, {wxStyledTextCtrl, formFeed, 0}},
+ {3225, {wxStyledTextCtrl, vCHome, 0}},
+ {3226, {wxStyledTextCtrl, vCHomeExtend, 0}},
+ {3227, {wxStyledTextCtrl, zoomIn, 0}},
+ {3228, {wxStyledTextCtrl, zoomOut, 0}},
+ {3229, {wxStyledTextCtrl, delWordLeft, 0}},
+ {3230, {wxStyledTextCtrl, delWordRight, 0}},
+ {3231, {wxStyledTextCtrl, lineCut, 0}},
+ {3232, {wxStyledTextCtrl, lineDelete, 0}},
+ {3233, {wxStyledTextCtrl, lineTranspose, 0}},
+ {3234, {wxStyledTextCtrl, lineDuplicate, 0}},
+ {3235, {wxStyledTextCtrl, lowerCase, 0}},
+ {3236, {wxStyledTextCtrl, upperCase, 0}},
+ {3237, {wxStyledTextCtrl, lineScrollDown, 0}},
+ {3238, {wxStyledTextCtrl, lineScrollUp, 0}},
+ {3239, {wxStyledTextCtrl, deleteBackNotLine, 0}},
+ {3240, {wxStyledTextCtrl, homeDisplay, 0}},
+ {3241, {wxStyledTextCtrl, homeDisplayExtend, 0}},
+ {3242, {wxStyledTextCtrl, lineEndDisplay, 0}},
+ {3243, {wxStyledTextCtrl, lineEndDisplayExtend, 0}},
+ {3244, {wxStyledTextCtrl, homeWrapExtend, 0}},
+ {3245, {wxStyledTextCtrl, lineEndWrap, 0}},
+ {3246, {wxStyledTextCtrl, lineEndWrapExtend, 0}},
+ {3247, {wxStyledTextCtrl, vCHomeWrap, 0}},
+ {3248, {wxStyledTextCtrl, vCHomeWrapExtend, 0}},
+ {3249, {wxStyledTextCtrl, lineCopy, 0}},
+ {3250, {wxStyledTextCtrl, moveCaretInsideView, 0}},
+ {3251, {wxStyledTextCtrl, lineLength, 1}},
+ {3252, {wxStyledTextCtrl, braceHighlight, 2}},
+ {3253, {wxStyledTextCtrl, braceBadLight, 1}},
+ {3254, {wxStyledTextCtrl, braceMatch, 1}},
+ {3255, {wxStyledTextCtrl, getViewEOL, 0}},
+ {3256, {wxStyledTextCtrl, setViewEOL, 1}},
+ {3257, {wxStyledTextCtrl, setModEventMask, 1}},
+ {3258, {wxStyledTextCtrl, getEdgeColumn, 0}},
+ {3259, {wxStyledTextCtrl, setEdgeColumn, 1}},
+ {3260, {wxStyledTextCtrl, getEdgeMode, 0}},
+ {3261, {wxStyledTextCtrl, getEdgeColour, 0}},
+ {3262, {wxStyledTextCtrl, setEdgeColour, 1}},
+ {3263, {wxStyledTextCtrl, searchAnchor, 0}},
+ {3264, {wxStyledTextCtrl, searchNext, 2}},
+ {3265, {wxStyledTextCtrl, searchPrev, 2}},
+ {3266, {wxStyledTextCtrl, linesOnScreen, 0}},
+ {3267, {wxStyledTextCtrl, usePopUp, 1}},
+ {3268, {wxStyledTextCtrl, selectionIsRectangle, 0}},
+ {3269, {wxStyledTextCtrl, setZoom, 1}},
+ {3270, {wxStyledTextCtrl, getZoom, 0}},
+ {3271, {wxStyledTextCtrl, getModEventMask, 0}},
+ {3272, {wxStyledTextCtrl, setSTCFocus, 1}},
+ {3273, {wxStyledTextCtrl, getSTCFocus, 0}},
+ {3274, {wxStyledTextCtrl, setStatus, 1}},
+ {3275, {wxStyledTextCtrl, getStatus, 0}},
+ {3276, {wxStyledTextCtrl, setMouseDownCaptures, 1}},
+ {3277, {wxStyledTextCtrl, getMouseDownCaptures, 0}},
+ {3278, {wxStyledTextCtrl, setSTCCursor, 1}},
+ {3279, {wxStyledTextCtrl, getSTCCursor, 0}},
+ {3280, {wxStyledTextCtrl, setControlCharSymbol, 1}},
+ {3281, {wxStyledTextCtrl, getControlCharSymbol, 0}},
+ {3282, {wxStyledTextCtrl, wordPartLeft, 0}},
+ {3283, {wxStyledTextCtrl, wordPartLeftExtend, 0}},
+ {3284, {wxStyledTextCtrl, wordPartRight, 0}},
+ {3285, {wxStyledTextCtrl, wordPartRightExtend, 0}},
+ {3286, {wxStyledTextCtrl, setVisiblePolicy, 2}},
+ {3287, {wxStyledTextCtrl, delLineLeft, 0}},
+ {3288, {wxStyledTextCtrl, delLineRight, 0}},
+ {3289, {wxStyledTextCtrl, getXOffset, 0}},
+ {3290, {wxStyledTextCtrl, chooseCaretX, 0}},
+ {3291, {wxStyledTextCtrl, setXCaretPolicy, 2}},
+ {3292, {wxStyledTextCtrl, setYCaretPolicy, 2}},
+ {3293, {wxStyledTextCtrl, getPrintWrapMode, 0}},
+ {3294, {wxStyledTextCtrl, setHotspotActiveForeground, 2}},
+ {3295, {wxStyledTextCtrl, setHotspotActiveBackground, 2}},
+ {3296, {wxStyledTextCtrl, setHotspotActiveUnderline, 1}},
+ {3297, {wxStyledTextCtrl, setHotspotSingleLine, 1}},
+ {3298, {wxStyledTextCtrl, paraDownExtend, 0}},
+ {3299, {wxStyledTextCtrl, paraUp, 0}},
+ {3300, {wxStyledTextCtrl, paraUpExtend, 0}},
+ {3301, {wxStyledTextCtrl, positionBefore, 1}},
+ {3302, {wxStyledTextCtrl, positionAfter, 1}},
+ {3303, {wxStyledTextCtrl, copyRange, 2}},
+ {3304, {wxStyledTextCtrl, copyText, 2}},
+ {3305, {wxStyledTextCtrl, setSelectionMode, 1}},
+ {3306, {wxStyledTextCtrl, getSelectionMode, 0}},
+ {3307, {wxStyledTextCtrl, lineDownRectExtend, 0}},
+ {3308, {wxStyledTextCtrl, lineUpRectExtend, 0}},
+ {3309, {wxStyledTextCtrl, charLeftRectExtend, 0}},
+ {3310, {wxStyledTextCtrl, charRightRectExtend, 0}},
+ {3311, {wxStyledTextCtrl, homeRectExtend, 0}},
+ {3312, {wxStyledTextCtrl, vCHomeRectExtend, 0}},
+ {3313, {wxStyledTextCtrl, lineEndRectExtend, 0}},
+ {3314, {wxStyledTextCtrl, pageUpRectExtend, 0}},
+ {3315, {wxStyledTextCtrl, pageDownRectExtend, 0}},
+ {3316, {wxStyledTextCtrl, stutteredPageUp, 0}},
+ {3317, {wxStyledTextCtrl, stutteredPageUpExtend, 0}},
+ {3318, {wxStyledTextCtrl, stutteredPageDown, 0}},
+ {3319, {wxStyledTextCtrl, stutteredPageDownExtend, 0}},
+ {3320, {wxStyledTextCtrl, wordLeftEnd, 0}},
+ {3321, {wxStyledTextCtrl, wordLeftEndExtend, 0}},
+ {3322, {wxStyledTextCtrl, wordRightEnd, 0}},
+ {3323, {wxStyledTextCtrl, wordRightEndExtend, 0}},
+ {3324, {wxStyledTextCtrl, setWhitespaceChars, 1}},
+ {3325, {wxStyledTextCtrl, setCharsDefault, 0}},
+ {3326, {wxStyledTextCtrl, autoCompGetCurrent, 0}},
+ {3327, {wxStyledTextCtrl, allocate, 1}},
+ {3328, {wxStyledTextCtrl, findColumn, 2}},
+ {3329, {wxStyledTextCtrl, getCaretSticky, 0}},
+ {3330, {wxStyledTextCtrl, setCaretSticky, 1}},
+ {3331, {wxStyledTextCtrl, toggleCaretSticky, 0}},
+ {3332, {wxStyledTextCtrl, setPasteConvertEndings, 1}},
+ {3333, {wxStyledTextCtrl, getPasteConvertEndings, 0}},
+ {3334, {wxStyledTextCtrl, selectionDuplicate, 0}},
+ {3335, {wxStyledTextCtrl, setCaretLineBackAlpha, 1}},
+ {3336, {wxStyledTextCtrl, getCaretLineBackAlpha, 0}},
+ {3337, {wxStyledTextCtrl, startRecord, 0}},
+ {3338, {wxStyledTextCtrl, stopRecord, 0}},
+ {3339, {wxStyledTextCtrl, setLexer, 1}},
+ {3340, {wxStyledTextCtrl, getLexer, 0}},
+ {3341, {wxStyledTextCtrl, colourise, 2}},
+ {3342, {wxStyledTextCtrl, setProperty, 2}},
+ {3343, {wxStyledTextCtrl, setKeyWords, 2}},
+ {3344, {wxStyledTextCtrl, setLexerLanguage, 1}},
+ {3345, {wxStyledTextCtrl, getProperty, 1}},
+ {3346, {wxStyledTextCtrl, getStyleBitsNeeded, 0}},
+ {3347, {wxStyledTextCtrl, getCurrentLine, 0}},
+ {3348, {wxStyledTextCtrl, styleSetSpec, 2}},
+ {3349, {wxStyledTextCtrl, styleSetFont, 2}},
+ {3350, {wxStyledTextCtrl, styleSetFontAttr, 7}},
+ {3351, {wxStyledTextCtrl, styleSetCharacterSet, 2}},
+ {3352, {wxStyledTextCtrl, styleSetFontEncoding, 2}},
+ {3353, {wxStyledTextCtrl, cmdKeyExecute, 1}},
+ {3354, {wxStyledTextCtrl, setMargins, 2}},
+ {3355, {wxStyledTextCtrl, getSelection, 2}},
+ {3356, {wxStyledTextCtrl, pointFromPosition, 1}},
+ {3357, {wxStyledTextCtrl, scrollToLine, 1}},
+ {3358, {wxStyledTextCtrl, scrollToColumn, 1}},
+ {3359, {wxStyledTextCtrl, sendMsg, 2}},
+ {3360, {wxStyledTextCtrl, setVScrollBar, 1}},
+ {3361, {wxStyledTextCtrl, setHScrollBar, 1}},
+ {3362, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
+ {3363, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
+ {3364, {wxStyledTextCtrl, saveFile, 1}},
+ {3365, {wxStyledTextCtrl, loadFile, 1}},
+ {3366, {wxStyledTextCtrl, doDragOver, 3}},
+ {3367, {wxStyledTextCtrl, doDropText, 3}},
+ {3368, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
+ {3369, {wxStyledTextCtrl, addTextRaw, 1}},
+ {3370, {wxStyledTextCtrl, insertTextRaw, 2}},
+ {3371, {wxStyledTextCtrl, getCurLineRaw, 1}},
+ {3372, {wxStyledTextCtrl, getLineRaw, 1}},
+ {3373, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
+ {3374, {wxStyledTextCtrl, getTextRangeRaw, 2}},
+ {3375, {wxStyledTextCtrl, setTextRaw, 1}},
+ {3376, {wxStyledTextCtrl, getTextRaw, 0}},
+ {3377, {wxStyledTextCtrl, appendTextRaw, 1}},
+ {3378, {wxArtProvider, getBitmap, 2}},
+ {3379, {wxArtProvider, getIcon, 2}},
+ {3380, {wxTreeEvent, getKeyCode, 0}},
+ {3381, {wxTreeEvent, getItem, 0}},
+ {3382, {wxTreeEvent, getKeyEvent, 0}},
+ {3383, {wxTreeEvent, getLabel, 0}},
+ {3384, {wxTreeEvent, getOldItem, 0}},
+ {3385, {wxTreeEvent, getPoint, 0}},
+ {3386, {wxTreeEvent, isEditCancelled, 0}},
+ {3387, {wxTreeEvent, setToolTip, 1}},
+ {3388, {wxNotebookEvent, getOldSelection, 0}},
+ {3389, {wxNotebookEvent, getSelection, 0}},
+ {3390, {wxNotebookEvent, setOldSelection, 1}},
+ {3391, {wxNotebookEvent, setSelection, 1}},
+ {3392, {wxFileDataObject, new, 0}},
+ {3393, {wxFileDataObject, addFile, 1}},
+ {3394, {wxFileDataObject, getFilenames, 0}},
+ {3395, {wxFileDataObject, 'Destroy', undefined}},
+ {3396, {wxTextDataObject, new, 1}},
+ {3397, {wxTextDataObject, getTextLength, 0}},
+ {3398, {wxTextDataObject, getText, 0}},
+ {3399, {wxTextDataObject, setText, 1}},
+ {3400, {wxTextDataObject, 'Destroy', undefined}},
+ {3401, {wxBitmapDataObject, new_1_1, 1}},
+ {3402, {wxBitmapDataObject, new_1_0, 1}},
+ {3403, {wxBitmapDataObject, getBitmap, 0}},
+ {3404, {wxBitmapDataObject, setBitmap, 1}},
+ {3405, {wxBitmapDataObject, 'Destroy', undefined}},
+ {3407, {wxClipboard, new, 0}},
+ {3408, {wxClipboard, destruct, 0}},
+ {3409, {wxClipboard, addData, 1}},
+ {3410, {wxClipboard, clear, 0}},
+ {3411, {wxClipboard, close, 0}},
+ {3412, {wxClipboard, flush, 0}},
+ {3413, {wxClipboard, getData, 1}},
+ {3414, {wxClipboard, isOpened, 0}},
+ {3415, {wxClipboard, open, 0}},
+ {3416, {wxClipboard, setData, 1}},
+ {3418, {wxClipboard, usePrimarySelection, 1}},
+ {3419, {wxClipboard, isSupported, 1}},
+ {3420, {wxClipboard, get, 0}},
+ {3421, {wxSpinEvent, getPosition, 0}},
+ {3422, {wxSpinEvent, setPosition, 1}},
+ {3423, {wxSplitterWindow, new_0, 0}},
+ {3424, {wxSplitterWindow, new_2, 2}},
+ {3425, {wxSplitterWindow, destruct, 0}},
+ {3426, {wxSplitterWindow, create, 2}},
+ {3427, {wxSplitterWindow, getMinimumPaneSize, 0}},
+ {3428, {wxSplitterWindow, getSashGravity, 0}},
+ {3429, {wxSplitterWindow, getSashPosition, 0}},
+ {3430, {wxSplitterWindow, getSplitMode, 0}},
+ {3431, {wxSplitterWindow, getWindow1, 0}},
+ {3432, {wxSplitterWindow, getWindow2, 0}},
+ {3433, {wxSplitterWindow, initialize, 1}},
+ {3434, {wxSplitterWindow, isSplit, 0}},
+ {3435, {wxSplitterWindow, replaceWindow, 2}},
+ {3436, {wxSplitterWindow, setSashGravity, 1}},
+ {3437, {wxSplitterWindow, setSashPosition, 2}},
+ {3438, {wxSplitterWindow, setSashSize, 1}},
+ {3439, {wxSplitterWindow, setMinimumPaneSize, 1}},
+ {3440, {wxSplitterWindow, setSplitMode, 1}},
+ {3441, {wxSplitterWindow, splitHorizontally, 3}},
+ {3442, {wxSplitterWindow, splitVertically, 3}},
+ {3443, {wxSplitterWindow, unsplit, 1}},
+ {3444, {wxSplitterWindow, updateSize, 0}},
+ {3445, {wxSplitterEvent, getSashPosition, 0}},
+ {3446, {wxSplitterEvent, getX, 0}},
+ {3447, {wxSplitterEvent, getY, 0}},
+ {3448, {wxSplitterEvent, getWindowBeingRemoved, 0}},
+ {3449, {wxSplitterEvent, setSashPosition, 1}},
+ {3450, {wxHtmlWindow, new_0, 0}},
+ {3451, {wxHtmlWindow, new_2, 2}},
+ {3452, {wxHtmlWindow, appendToPage, 1}},
+ {3453, {wxHtmlWindow, getOpenedAnchor, 0}},
+ {3454, {wxHtmlWindow, getOpenedPage, 0}},
+ {3455, {wxHtmlWindow, getOpenedPageTitle, 0}},
+ {3456, {wxHtmlWindow, getRelatedFrame, 0}},
+ {3457, {wxHtmlWindow, historyBack, 0}},
+ {3458, {wxHtmlWindow, historyCanBack, 0}},
+ {3459, {wxHtmlWindow, historyCanForward, 0}},
+ {3460, {wxHtmlWindow, historyClear, 0}},
+ {3461, {wxHtmlWindow, historyForward, 0}},
+ {3462, {wxHtmlWindow, loadFile, 1}},
+ {3463, {wxHtmlWindow, loadPage, 1}},
+ {3464, {wxHtmlWindow, selectAll, 0}},
+ {3465, {wxHtmlWindow, selectionToText, 0}},
+ {3466, {wxHtmlWindow, selectLine, 1}},
+ {3467, {wxHtmlWindow, selectWord, 1}},
+ {3468, {wxHtmlWindow, setBorders, 1}},
+ {3469, {wxHtmlWindow, setFonts, 3}},
+ {3470, {wxHtmlWindow, setPage, 1}},
+ {3471, {wxHtmlWindow, setRelatedFrame, 2}},
+ {3472, {wxHtmlWindow, setRelatedStatusBar, 1}},
+ {3473, {wxHtmlWindow, toText, 0}},
+ {3474, {wxHtmlWindow, 'Destroy', undefined}},
+ {3475, {wxHtmlLinkEvent, getLinkInfo, 0}},
+ {3476, {wxSystemSettings, getColour, 1}},
+ {3477, {wxSystemSettings, getFont, 1}},
+ {3478, {wxSystemSettings, getMetric, 2}},
+ {3479, {wxSystemSettings, getScreenType, 0}},
+ {3480, {wxAuiNotebookEvent, setSelection, 1}},
+ {3481, {wxAuiNotebookEvent, getSelection, 0}},
+ {3482, {wxAuiNotebookEvent, setOldSelection, 1}},
+ {3483, {wxAuiNotebookEvent, getOldSelection, 0}},
+ {3484, {wxAuiNotebookEvent, setDragSource, 1}},
+ {3485, {wxAuiNotebookEvent, getDragSource, 0}},
+ {3486, {wxAuiManagerEvent, setManager, 1}},
+ {3487, {wxAuiManagerEvent, getManager, 0}},
+ {3488, {wxAuiManagerEvent, setPane, 1}},
+ {3489, {wxAuiManagerEvent, getPane, 0}},
+ {3490, {wxAuiManagerEvent, setButton, 1}},
+ {3491, {wxAuiManagerEvent, getButton, 0}},
+ {3492, {wxAuiManagerEvent, setDC, 1}},
+ {3493, {wxAuiManagerEvent, getDC, 0}},
+ {3494, {wxAuiManagerEvent, veto, 1}},
+ {3495, {wxAuiManagerEvent, getVeto, 0}},
+ {3496, {wxAuiManagerEvent, setCanVeto, 1}},
+ {3497, {wxAuiManagerEvent, canVeto, 0}},
+ {3498, {wxLogNull, new, 0}},
+ {3499, {wxLogNull, 'Destroy', undefined}},
  {-1, {mod, func, -1}}
 ].
 
diff --git a/lib/wx/src/gen/wxe_funcs.hrl b/lib/wx/src/gen/wxe_funcs.hrl
index 7b5ca229c8..cf672644c6 100644
--- a/lib/wx/src/gen/wxe_funcs.hrl
+++ b/lib/wx/src/gen/wxe_funcs.hrl
@@ -1834,1442 +1834,1447 @@
 -define(wxTreeCtrl_Delete, 2007).
 -define(wxTreeCtrl_DeleteAllItems, 2008).
 -define(wxTreeCtrl_DeleteChildren, 2009).
--define(wxTreeCtrl_EnsureVisible, 2010).
--define(wxTreeCtrl_Expand, 2011).
--define(wxTreeCtrl_GetBoundingRect, 2012).
--define(wxTreeCtrl_GetChildrenCount, 2014).
--define(wxTreeCtrl_GetCount, 2015).
--define(wxTreeCtrl_GetEditControl, 2016).
--define(wxTreeCtrl_GetFirstChild, 2017).
--define(wxTreeCtrl_GetNextChild, 2018).
--define(wxTreeCtrl_GetFirstVisibleItem, 2019).
--define(wxTreeCtrl_GetImageList, 2020).
--define(wxTreeCtrl_GetIndent, 2021).
--define(wxTreeCtrl_GetItemBackgroundColour, 2022).
--define(wxTreeCtrl_GetItemData, 2023).
--define(wxTreeCtrl_GetItemFont, 2024).
--define(wxTreeCtrl_GetItemImage_1, 2025).
--define(wxTreeCtrl_GetItemImage_2, 2026).
--define(wxTreeCtrl_GetItemText, 2027).
--define(wxTreeCtrl_GetItemTextColour, 2028).
--define(wxTreeCtrl_GetLastChild, 2029).
--define(wxTreeCtrl_GetNextSibling, 2030).
--define(wxTreeCtrl_GetNextVisible, 2031).
--define(wxTreeCtrl_GetItemParent, 2032).
--define(wxTreeCtrl_GetPrevSibling, 2033).
--define(wxTreeCtrl_GetPrevVisible, 2034).
--define(wxTreeCtrl_GetRootItem, 2035).
--define(wxTreeCtrl_GetSelection, 2036).
--define(wxTreeCtrl_GetSelections, 2037).
--define(wxTreeCtrl_GetStateImageList, 2038).
--define(wxTreeCtrl_HitTest, 2039).
--define(wxTreeCtrl_InsertItem, 2041).
--define(wxTreeCtrl_IsBold, 2042).
--define(wxTreeCtrl_IsExpanded, 2043).
--define(wxTreeCtrl_IsSelected, 2044).
--define(wxTreeCtrl_IsVisible, 2045).
--define(wxTreeCtrl_ItemHasChildren, 2046).
--define(wxTreeCtrl_PrependItem, 2047).
--define(wxTreeCtrl_ScrollTo, 2048).
--define(wxTreeCtrl_SelectItem_1, 2049).
--define(wxTreeCtrl_SelectItem_2, 2050).
--define(wxTreeCtrl_SetIndent, 2051).
--define(wxTreeCtrl_SetImageList, 2052).
--define(wxTreeCtrl_SetItemBackgroundColour, 2053).
--define(wxTreeCtrl_SetItemBold, 2054).
--define(wxTreeCtrl_SetItemData, 2055).
--define(wxTreeCtrl_SetItemDropHighlight, 2056).
--define(wxTreeCtrl_SetItemFont, 2057).
--define(wxTreeCtrl_SetItemHasChildren, 2058).
--define(wxTreeCtrl_SetItemImage_2, 2059).
--define(wxTreeCtrl_SetItemImage_3, 2060).
--define(wxTreeCtrl_SetItemText, 2061).
--define(wxTreeCtrl_SetItemTextColour, 2062).
--define(wxTreeCtrl_SetStateImageList, 2063).
--define(wxTreeCtrl_SetWindowStyle, 2064).
--define(wxTreeCtrl_SortChildren, 2065).
--define(wxTreeCtrl_Toggle, 2066).
--define(wxTreeCtrl_ToggleItemSelection, 2067).
--define(wxTreeCtrl_Unselect, 2068).
--define(wxTreeCtrl_UnselectAll, 2069).
--define(wxTreeCtrl_UnselectItem, 2070).
--define(wxScrollBar_new_0, 2071).
--define(wxScrollBar_new_3, 2072).
--define(wxScrollBar_destruct, 2073).
--define(wxScrollBar_Create, 2074).
--define(wxScrollBar_GetRange, 2075).
--define(wxScrollBar_GetPageSize, 2076).
--define(wxScrollBar_GetThumbPosition, 2077).
--define(wxScrollBar_GetThumbSize, 2078).
--define(wxScrollBar_SetThumbPosition, 2079).
--define(wxScrollBar_SetScrollbar, 2080).
--define(wxSpinButton_new_2, 2082).
--define(wxSpinButton_new_0, 2083).
--define(wxSpinButton_Create, 2084).
--define(wxSpinButton_GetMax, 2085).
--define(wxSpinButton_GetMin, 2086).
--define(wxSpinButton_GetValue, 2087).
--define(wxSpinButton_SetRange, 2088).
--define(wxSpinButton_SetValue, 2089).
--define(wxSpinButton_destroy, 2090).
--define(wxSpinCtrl_new_0, 2091).
--define(wxSpinCtrl_new_2, 2092).
--define(wxSpinCtrl_Create, 2094).
--define(wxSpinCtrl_SetValue_1_1, 2097).
--define(wxSpinCtrl_SetValue_1_0, 2098).
--define(wxSpinCtrl_GetValue, 2100).
--define(wxSpinCtrl_SetRange, 2102).
--define(wxSpinCtrl_SetSelection, 2103).
--define(wxSpinCtrl_GetMin, 2105).
--define(wxSpinCtrl_GetMax, 2107).
--define(wxSpinCtrl_destroy, 2108).
--define(wxStaticText_new_0, 2109).
--define(wxStaticText_new_4, 2110).
--define(wxStaticText_Create, 2111).
--define(wxStaticText_GetLabel, 2112).
--define(wxStaticText_SetLabel, 2113).
--define(wxStaticText_Wrap, 2114).
--define(wxStaticText_destroy, 2115).
--define(wxStaticBitmap_new_0, 2116).
--define(wxStaticBitmap_new_4, 2117).
--define(wxStaticBitmap_Create, 2118).
--define(wxStaticBitmap_GetBitmap, 2119).
--define(wxStaticBitmap_SetBitmap, 2120).
--define(wxStaticBitmap_destroy, 2121).
--define(wxRadioBox_new, 2122).
--define(wxRadioBox_destruct, 2124).
--define(wxRadioBox_Create, 2125).
--define(wxRadioBox_Enable_2, 2126).
--define(wxRadioBox_Enable_1, 2127).
--define(wxRadioBox_GetSelection, 2128).
--define(wxRadioBox_GetString, 2129).
--define(wxRadioBox_SetSelection, 2130).
--define(wxRadioBox_Show_2, 2131).
--define(wxRadioBox_Show_1, 2132).
--define(wxRadioBox_GetColumnCount, 2133).
--define(wxRadioBox_GetItemHelpText, 2134).
--define(wxRadioBox_GetItemToolTip, 2135).
--define(wxRadioBox_GetItemFromPoint, 2137).
--define(wxRadioBox_GetRowCount, 2138).
--define(wxRadioBox_IsItemEnabled, 2139).
--define(wxRadioBox_IsItemShown, 2140).
--define(wxRadioBox_SetItemHelpText, 2141).
--define(wxRadioBox_SetItemToolTip, 2142).
--define(wxRadioButton_new_0, 2143).
--define(wxRadioButton_new_4, 2144).
--define(wxRadioButton_Create, 2145).
--define(wxRadioButton_GetValue, 2146).
--define(wxRadioButton_SetValue, 2147).
--define(wxRadioButton_destroy, 2148).
--define(wxSlider_new_6, 2150).
--define(wxSlider_new_0, 2151).
--define(wxSlider_Create, 2152).
--define(wxSlider_GetLineSize, 2153).
--define(wxSlider_GetMax, 2154).
--define(wxSlider_GetMin, 2155).
--define(wxSlider_GetPageSize, 2156).
--define(wxSlider_GetThumbLength, 2157).
--define(wxSlider_GetValue, 2158).
--define(wxSlider_SetLineSize, 2159).
--define(wxSlider_SetPageSize, 2160).
--define(wxSlider_SetRange, 2161).
--define(wxSlider_SetThumbLength, 2162).
--define(wxSlider_SetValue, 2163).
--define(wxSlider_destroy, 2164).
--define(wxDialog_new_4, 2166).
--define(wxDialog_new_0, 2167).
--define(wxDialog_destruct, 2169).
--define(wxDialog_Create, 2170).
--define(wxDialog_CreateButtonSizer, 2171).
--define(wxDialog_CreateStdDialogButtonSizer, 2172).
--define(wxDialog_EndModal, 2173).
--define(wxDialog_GetAffirmativeId, 2174).
--define(wxDialog_GetReturnCode, 2175).
--define(wxDialog_IsModal, 2176).
--define(wxDialog_SetAffirmativeId, 2177).
--define(wxDialog_SetReturnCode, 2178).
--define(wxDialog_Show, 2179).
--define(wxDialog_ShowModal, 2180).
--define(wxColourDialog_new_0, 2181).
--define(wxColourDialog_new_2, 2182).
--define(wxColourDialog_destruct, 2183).
--define(wxColourDialog_Create, 2184).
--define(wxColourDialog_GetColourData, 2185).
--define(wxColourData_new_0, 2186).
--define(wxColourData_new_1, 2187).
--define(wxColourData_destruct, 2188).
--define(wxColourData_GetChooseFull, 2189).
--define(wxColourData_GetColour, 2190).
--define(wxColourData_GetCustomColour, 2192).
--define(wxColourData_SetChooseFull, 2193).
--define(wxColourData_SetColour, 2194).
--define(wxColourData_SetCustomColour, 2195).
--define(wxPalette_new_0, 2196).
--define(wxPalette_new_4, 2197).
--define(wxPalette_destruct, 2199).
--define(wxPalette_Create, 2200).
--define(wxPalette_GetColoursCount, 2201).
--define(wxPalette_GetPixel, 2202).
--define(wxPalette_GetRGB, 2203).
--define(wxPalette_IsOk, 2204).
--define(wxDirDialog_new, 2208).
--define(wxDirDialog_destruct, 2209).
--define(wxDirDialog_GetPath, 2210).
--define(wxDirDialog_GetMessage, 2211).
--define(wxDirDialog_SetMessage, 2212).
--define(wxDirDialog_SetPath, 2213).
--define(wxFileDialog_new, 2217).
--define(wxFileDialog_destruct, 2218).
--define(wxFileDialog_GetDirectory, 2219).
--define(wxFileDialog_GetFilename, 2220).
--define(wxFileDialog_GetFilenames, 2221).
--define(wxFileDialog_GetFilterIndex, 2222).
--define(wxFileDialog_GetMessage, 2223).
--define(wxFileDialog_GetPath, 2224).
--define(wxFileDialog_GetPaths, 2225).
--define(wxFileDialog_GetWildcard, 2226).
--define(wxFileDialog_SetDirectory, 2227).
--define(wxFileDialog_SetFilename, 2228).
--define(wxFileDialog_SetFilterIndex, 2229).
--define(wxFileDialog_SetMessage, 2230).
--define(wxFileDialog_SetPath, 2231).
--define(wxFileDialog_SetWildcard, 2232).
--define(wxPickerBase_SetInternalMargin, 2233).
--define(wxPickerBase_GetInternalMargin, 2234).
--define(wxPickerBase_SetTextCtrlProportion, 2235).
--define(wxPickerBase_SetPickerCtrlProportion, 2236).
--define(wxPickerBase_GetTextCtrlProportion, 2237).
--define(wxPickerBase_GetPickerCtrlProportion, 2238).
--define(wxPickerBase_HasTextCtrl, 2239).
--define(wxPickerBase_GetTextCtrl, 2240).
--define(wxPickerBase_IsTextCtrlGrowable, 2241).
--define(wxPickerBase_SetPickerCtrlGrowable, 2242).
--define(wxPickerBase_SetTextCtrlGrowable, 2243).
--define(wxPickerBase_IsPickerCtrlGrowable, 2244).
--define(wxFilePickerCtrl_new_0, 2245).
--define(wxFilePickerCtrl_new_3, 2246).
--define(wxFilePickerCtrl_Create, 2247).
--define(wxFilePickerCtrl_GetPath, 2248).
--define(wxFilePickerCtrl_SetPath, 2249).
--define(wxFilePickerCtrl_destroy, 2250).
--define(wxDirPickerCtrl_new_0, 2251).
--define(wxDirPickerCtrl_new_3, 2252).
--define(wxDirPickerCtrl_Create, 2253).
--define(wxDirPickerCtrl_GetPath, 2254).
--define(wxDirPickerCtrl_SetPath, 2255).
--define(wxDirPickerCtrl_destroy, 2256).
--define(wxColourPickerCtrl_new_0, 2257).
--define(wxColourPickerCtrl_new_3, 2258).
--define(wxColourPickerCtrl_Create, 2259).
--define(wxColourPickerCtrl_GetColour, 2260).
--define(wxColourPickerCtrl_SetColour_1_1, 2261).
--define(wxColourPickerCtrl_SetColour_1_0, 2262).
--define(wxColourPickerCtrl_destroy, 2263).
--define(wxDatePickerCtrl_new_0, 2264).
--define(wxDatePickerCtrl_new_3, 2265).
--define(wxDatePickerCtrl_GetRange, 2266).
--define(wxDatePickerCtrl_GetValue, 2267).
--define(wxDatePickerCtrl_SetRange, 2268).
--define(wxDatePickerCtrl_SetValue, 2269).
--define(wxDatePickerCtrl_destroy, 2270).
--define(wxFontPickerCtrl_new_0, 2271).
--define(wxFontPickerCtrl_new_3, 2272).
--define(wxFontPickerCtrl_Create, 2273).
--define(wxFontPickerCtrl_GetSelectedFont, 2274).
--define(wxFontPickerCtrl_SetSelectedFont, 2275).
--define(wxFontPickerCtrl_GetMaxPointSize, 2276).
--define(wxFontPickerCtrl_SetMaxPointSize, 2277).
--define(wxFontPickerCtrl_destroy, 2278).
--define(wxFindReplaceDialog_new_0, 2281).
--define(wxFindReplaceDialog_new_4, 2282).
--define(wxFindReplaceDialog_destruct, 2283).
--define(wxFindReplaceDialog_Create, 2284).
--define(wxFindReplaceDialog_GetData, 2285).
--define(wxFindReplaceData_new_0, 2286).
--define(wxFindReplaceData_new_1, 2287).
--define(wxFindReplaceData_GetFindString, 2288).
--define(wxFindReplaceData_GetReplaceString, 2289).
--define(wxFindReplaceData_GetFlags, 2290).
--define(wxFindReplaceData_SetFlags, 2291).
--define(wxFindReplaceData_SetFindString, 2292).
--define(wxFindReplaceData_SetReplaceString, 2293).
--define(wxFindReplaceData_destroy, 2294).
--define(wxMultiChoiceDialog_new_0, 2295).
--define(wxMultiChoiceDialog_new_5, 2297).
--define(wxMultiChoiceDialog_GetSelections, 2298).
--define(wxMultiChoiceDialog_SetSelections, 2299).
--define(wxMultiChoiceDialog_destroy, 2300).
--define(wxSingleChoiceDialog_new_0, 2301).
--define(wxSingleChoiceDialog_new_5, 2303).
--define(wxSingleChoiceDialog_GetSelection, 2304).
--define(wxSingleChoiceDialog_GetStringSelection, 2305).
--define(wxSingleChoiceDialog_SetSelection, 2306).
--define(wxSingleChoiceDialog_destroy, 2307).
--define(wxTextEntryDialog_new, 2308).
--define(wxTextEntryDialog_GetValue, 2309).
--define(wxTextEntryDialog_SetValue, 2310).
--define(wxTextEntryDialog_destroy, 2311).
--define(wxPasswordEntryDialog_new, 2312).
--define(wxPasswordEntryDialog_destroy, 2313).
--define(wxFontData_new_0, 2314).
--define(wxFontData_new_1, 2315).
--define(wxFontData_destruct, 2316).
--define(wxFontData_EnableEffects, 2317).
--define(wxFontData_GetAllowSymbols, 2318).
--define(wxFontData_GetColour, 2319).
--define(wxFontData_GetChosenFont, 2320).
--define(wxFontData_GetEnableEffects, 2321).
--define(wxFontData_GetInitialFont, 2322).
--define(wxFontData_GetShowHelp, 2323).
--define(wxFontData_SetAllowSymbols, 2324).
--define(wxFontData_SetChosenFont, 2325).
--define(wxFontData_SetColour, 2326).
--define(wxFontData_SetInitialFont, 2327).
--define(wxFontData_SetRange, 2328).
--define(wxFontData_SetShowHelp, 2329).
--define(wxFontDialog_new_0, 2333).
--define(wxFontDialog_new_2, 2335).
--define(wxFontDialog_Create, 2337).
--define(wxFontDialog_GetFontData, 2338).
--define(wxFontDialog_destroy, 2340).
--define(wxProgressDialog_new, 2341).
--define(wxProgressDialog_destruct, 2342).
--define(wxProgressDialog_Resume, 2343).
--define(wxProgressDialog_Update_2, 2344).
--define(wxProgressDialog_Update_0, 2345).
--define(wxMessageDialog_new, 2346).
--define(wxMessageDialog_destruct, 2347).
--define(wxPageSetupDialog_new, 2348).
--define(wxPageSetupDialog_destruct, 2349).
--define(wxPageSetupDialog_GetPageSetupData, 2350).
--define(wxPageSetupDialog_ShowModal, 2351).
--define(wxPageSetupDialogData_new_0, 2352).
--define(wxPageSetupDialogData_new_1_0, 2353).
--define(wxPageSetupDialogData_new_1_1, 2354).
--define(wxPageSetupDialogData_destruct, 2355).
--define(wxPageSetupDialogData_EnableHelp, 2356).
--define(wxPageSetupDialogData_EnableMargins, 2357).
--define(wxPageSetupDialogData_EnableOrientation, 2358).
--define(wxPageSetupDialogData_EnablePaper, 2359).
--define(wxPageSetupDialogData_EnablePrinter, 2360).
--define(wxPageSetupDialogData_GetDefaultMinMargins, 2361).
--define(wxPageSetupDialogData_GetEnableMargins, 2362).
--define(wxPageSetupDialogData_GetEnableOrientation, 2363).
--define(wxPageSetupDialogData_GetEnablePaper, 2364).
--define(wxPageSetupDialogData_GetEnablePrinter, 2365).
--define(wxPageSetupDialogData_GetEnableHelp, 2366).
--define(wxPageSetupDialogData_GetDefaultInfo, 2367).
--define(wxPageSetupDialogData_GetMarginTopLeft, 2368).
--define(wxPageSetupDialogData_GetMarginBottomRight, 2369).
--define(wxPageSetupDialogData_GetMinMarginTopLeft, 2370).
--define(wxPageSetupDialogData_GetMinMarginBottomRight, 2371).
--define(wxPageSetupDialogData_GetPaperId, 2372).
--define(wxPageSetupDialogData_GetPaperSize, 2373).
--define(wxPageSetupDialogData_GetPrintData, 2375).
--define(wxPageSetupDialogData_IsOk, 2376).
--define(wxPageSetupDialogData_SetDefaultInfo, 2377).
--define(wxPageSetupDialogData_SetDefaultMinMargins, 2378).
--define(wxPageSetupDialogData_SetMarginTopLeft, 2379).
--define(wxPageSetupDialogData_SetMarginBottomRight, 2380).
--define(wxPageSetupDialogData_SetMinMarginTopLeft, 2381).
--define(wxPageSetupDialogData_SetMinMarginBottomRight, 2382).
--define(wxPageSetupDialogData_SetPaperId, 2383).
--define(wxPageSetupDialogData_SetPaperSize_1_1, 2384).
--define(wxPageSetupDialogData_SetPaperSize_1_0, 2385).
--define(wxPageSetupDialogData_SetPrintData, 2386).
--define(wxPrintDialog_new_2_0, 2387).
--define(wxPrintDialog_new_2_1, 2388).
--define(wxPrintDialog_destruct, 2389).
--define(wxPrintDialog_GetPrintDialogData, 2390).
--define(wxPrintDialog_GetPrintDC, 2391).
--define(wxPrintDialogData_new_0, 2392).
--define(wxPrintDialogData_new_1_1, 2393).
--define(wxPrintDialogData_new_1_0, 2394).
--define(wxPrintDialogData_destruct, 2395).
--define(wxPrintDialogData_EnableHelp, 2396).
--define(wxPrintDialogData_EnablePageNumbers, 2397).
--define(wxPrintDialogData_EnablePrintToFile, 2398).
--define(wxPrintDialogData_EnableSelection, 2399).
--define(wxPrintDialogData_GetAllPages, 2400).
--define(wxPrintDialogData_GetCollate, 2401).
--define(wxPrintDialogData_GetFromPage, 2402).
--define(wxPrintDialogData_GetMaxPage, 2403).
--define(wxPrintDialogData_GetMinPage, 2404).
--define(wxPrintDialogData_GetNoCopies, 2405).
--define(wxPrintDialogData_GetPrintData, 2406).
--define(wxPrintDialogData_GetPrintToFile, 2407).
--define(wxPrintDialogData_GetSelection, 2408).
--define(wxPrintDialogData_GetToPage, 2409).
--define(wxPrintDialogData_IsOk, 2410).
--define(wxPrintDialogData_SetCollate, 2411).
--define(wxPrintDialogData_SetFromPage, 2412).
--define(wxPrintDialogData_SetMaxPage, 2413).
--define(wxPrintDialogData_SetMinPage, 2414).
--define(wxPrintDialogData_SetNoCopies, 2415).
--define(wxPrintDialogData_SetPrintData, 2416).
--define(wxPrintDialogData_SetPrintToFile, 2417).
--define(wxPrintDialogData_SetSelection, 2418).
--define(wxPrintDialogData_SetToPage, 2419).
--define(wxPrintData_new_0, 2420).
--define(wxPrintData_new_1, 2421).
--define(wxPrintData_destruct, 2422).
--define(wxPrintData_GetCollate, 2423).
--define(wxPrintData_GetBin, 2424).
--define(wxPrintData_GetColour, 2425).
--define(wxPrintData_GetDuplex, 2426).
--define(wxPrintData_GetNoCopies, 2427).
--define(wxPrintData_GetOrientation, 2428).
--define(wxPrintData_GetPaperId, 2429).
--define(wxPrintData_GetPrinterName, 2430).
--define(wxPrintData_GetQuality, 2431).
--define(wxPrintData_IsOk, 2432).
--define(wxPrintData_SetBin, 2433).
--define(wxPrintData_SetCollate, 2434).
--define(wxPrintData_SetColour, 2435).
--define(wxPrintData_SetDuplex, 2436).
--define(wxPrintData_SetNoCopies, 2437).
--define(wxPrintData_SetOrientation, 2438).
--define(wxPrintData_SetPaperId, 2439).
--define(wxPrintData_SetPrinterName, 2440).
--define(wxPrintData_SetQuality, 2441).
--define(wxPrintPreview_new_2, 2444).
--define(wxPrintPreview_new_3, 2445).
--define(wxPrintPreview_destruct, 2447).
--define(wxPrintPreview_GetCanvas, 2448).
--define(wxPrintPreview_GetCurrentPage, 2449).
--define(wxPrintPreview_GetFrame, 2450).
--define(wxPrintPreview_GetMaxPage, 2451).
--define(wxPrintPreview_GetMinPage, 2452).
--define(wxPrintPreview_GetPrintout, 2453).
--define(wxPrintPreview_GetPrintoutForPrinting, 2454).
--define(wxPrintPreview_IsOk, 2455).
--define(wxPrintPreview_PaintPage, 2456).
--define(wxPrintPreview_Print, 2457).
--define(wxPrintPreview_RenderPage, 2458).
--define(wxPrintPreview_SetCanvas, 2459).
--define(wxPrintPreview_SetCurrentPage, 2460).
--define(wxPrintPreview_SetFrame, 2461).
--define(wxPrintPreview_SetPrintout, 2462).
--define(wxPrintPreview_SetZoom, 2463).
--define(wxPreviewFrame_new, 2464).
--define(wxPreviewFrame_destruct, 2465).
--define(wxPreviewFrame_CreateControlBar, 2466).
--define(wxPreviewFrame_CreateCanvas, 2467).
--define(wxPreviewFrame_Initialize, 2468).
--define(wxPreviewFrame_OnCloseWindow, 2469).
--define(wxPreviewControlBar_new, 2470).
--define(wxPreviewControlBar_destruct, 2471).
--define(wxPreviewControlBar_CreateButtons, 2472).
--define(wxPreviewControlBar_GetPrintPreview, 2473).
--define(wxPreviewControlBar_GetZoomControl, 2474).
--define(wxPreviewControlBar_SetZoomControl, 2475).
--define(wxPrinter_new, 2477).
--define(wxPrinter_CreateAbortWindow, 2478).
--define(wxPrinter_GetAbort, 2479).
--define(wxPrinter_GetLastError, 2480).
--define(wxPrinter_GetPrintDialogData, 2481).
--define(wxPrinter_Print, 2482).
--define(wxPrinter_PrintDialog, 2483).
--define(wxPrinter_ReportError, 2484).
--define(wxPrinter_Setup, 2485).
--define(wxPrinter_destroy, 2486).
--define(wxXmlResource_new_1, 2487).
--define(wxXmlResource_new_2, 2488).
--define(wxXmlResource_destruct, 2489).
--define(wxXmlResource_AttachUnknownControl, 2490).
--define(wxXmlResource_ClearHandlers, 2491).
--define(wxXmlResource_CompareVersion, 2492).
--define(wxXmlResource_Get, 2493).
--define(wxXmlResource_GetFlags, 2494).
--define(wxXmlResource_GetVersion, 2495).
--define(wxXmlResource_GetXRCID, 2496).
--define(wxXmlResource_InitAllHandlers, 2497).
--define(wxXmlResource_Load, 2498).
--define(wxXmlResource_LoadBitmap, 2499).
--define(wxXmlResource_LoadDialog_2, 2500).
--define(wxXmlResource_LoadDialog_3, 2501).
--define(wxXmlResource_LoadFrame_2, 2502).
--define(wxXmlResource_LoadFrame_3, 2503).
--define(wxXmlResource_LoadIcon, 2504).
--define(wxXmlResource_LoadMenu, 2505).
--define(wxXmlResource_LoadMenuBar_2, 2506).
--define(wxXmlResource_LoadMenuBar_1, 2507).
--define(wxXmlResource_LoadPanel_2, 2508).
--define(wxXmlResource_LoadPanel_3, 2509).
--define(wxXmlResource_LoadToolBar, 2510).
--define(wxXmlResource_Set, 2511).
--define(wxXmlResource_SetFlags, 2512).
--define(wxXmlResource_Unload, 2513).
--define(wxXmlResource_xrcctrl, 2514).
--define(wxHtmlEasyPrinting_new, 2515).
--define(wxHtmlEasyPrinting_destruct, 2516).
--define(wxHtmlEasyPrinting_GetPrintData, 2517).
--define(wxHtmlEasyPrinting_GetPageSetupData, 2518).
--define(wxHtmlEasyPrinting_PreviewFile, 2519).
--define(wxHtmlEasyPrinting_PreviewText, 2520).
--define(wxHtmlEasyPrinting_PrintFile, 2521).
--define(wxHtmlEasyPrinting_PrintText, 2522).
--define(wxHtmlEasyPrinting_PageSetup, 2523).
--define(wxHtmlEasyPrinting_SetFonts, 2524).
--define(wxHtmlEasyPrinting_SetHeader, 2525).
--define(wxHtmlEasyPrinting_SetFooter, 2526).
--define(wxGLCanvas_new_2, 2528).
--define(wxGLCanvas_new_3_1, 2529).
--define(wxGLCanvas_new_3_0, 2530).
--define(wxGLCanvas_GetContext, 2531).
--define(wxGLCanvas_SetCurrent, 2533).
--define(wxGLCanvas_SwapBuffers, 2534).
--define(wxGLCanvas_destroy, 2535).
--define(wxAuiManager_new, 2536).
--define(wxAuiManager_destruct, 2537).
--define(wxAuiManager_AddPane_2_1, 2538).
--define(wxAuiManager_AddPane_3, 2539).
--define(wxAuiManager_AddPane_2_0, 2540).
--define(wxAuiManager_DetachPane, 2541).
--define(wxAuiManager_GetAllPanes, 2542).
--define(wxAuiManager_GetArtProvider, 2543).
--define(wxAuiManager_GetDockSizeConstraint, 2544).
--define(wxAuiManager_GetFlags, 2545).
--define(wxAuiManager_GetManagedWindow, 2546).
--define(wxAuiManager_GetManager, 2547).
--define(wxAuiManager_GetPane_1_1, 2548).
--define(wxAuiManager_GetPane_1_0, 2549).
--define(wxAuiManager_HideHint, 2550).
--define(wxAuiManager_InsertPane, 2551).
--define(wxAuiManager_LoadPaneInfo, 2552).
--define(wxAuiManager_LoadPerspective, 2553).
--define(wxAuiManager_SavePaneInfo, 2554).
--define(wxAuiManager_SavePerspective, 2555).
--define(wxAuiManager_SetArtProvider, 2556).
--define(wxAuiManager_SetDockSizeConstraint, 2557).
--define(wxAuiManager_SetFlags, 2558).
--define(wxAuiManager_SetManagedWindow, 2559).
--define(wxAuiManager_ShowHint, 2560).
--define(wxAuiManager_UnInit, 2561).
--define(wxAuiManager_Update, 2562).
--define(wxAuiPaneInfo_new_0, 2563).
--define(wxAuiPaneInfo_new_1, 2564).
--define(wxAuiPaneInfo_destruct, 2565).
--define(wxAuiPaneInfo_BestSize_1, 2566).
--define(wxAuiPaneInfo_BestSize_2, 2567).
--define(wxAuiPaneInfo_Bottom, 2568).
--define(wxAuiPaneInfo_BottomDockable, 2569).
--define(wxAuiPaneInfo_Caption, 2570).
--define(wxAuiPaneInfo_CaptionVisible, 2571).
--define(wxAuiPaneInfo_Centre, 2572).
--define(wxAuiPaneInfo_CentrePane, 2573).
--define(wxAuiPaneInfo_CloseButton, 2574).
--define(wxAuiPaneInfo_DefaultPane, 2575).
--define(wxAuiPaneInfo_DestroyOnClose, 2576).
--define(wxAuiPaneInfo_Direction, 2577).
--define(wxAuiPaneInfo_Dock, 2578).
--define(wxAuiPaneInfo_Dockable, 2579).
--define(wxAuiPaneInfo_Fixed, 2580).
--define(wxAuiPaneInfo_Float, 2581).
--define(wxAuiPaneInfo_Floatable, 2582).
--define(wxAuiPaneInfo_FloatingPosition_1, 2583).
--define(wxAuiPaneInfo_FloatingPosition_2, 2584).
--define(wxAuiPaneInfo_FloatingSize_1, 2585).
--define(wxAuiPaneInfo_FloatingSize_2, 2586).
--define(wxAuiPaneInfo_Gripper, 2587).
--define(wxAuiPaneInfo_GripperTop, 2588).
--define(wxAuiPaneInfo_HasBorder, 2589).
--define(wxAuiPaneInfo_HasCaption, 2590).
--define(wxAuiPaneInfo_HasCloseButton, 2591).
--define(wxAuiPaneInfo_HasFlag, 2592).
--define(wxAuiPaneInfo_HasGripper, 2593).
--define(wxAuiPaneInfo_HasGripperTop, 2594).
--define(wxAuiPaneInfo_HasMaximizeButton, 2595).
--define(wxAuiPaneInfo_HasMinimizeButton, 2596).
--define(wxAuiPaneInfo_HasPinButton, 2597).
--define(wxAuiPaneInfo_Hide, 2598).
--define(wxAuiPaneInfo_IsBottomDockable, 2599).
--define(wxAuiPaneInfo_IsDocked, 2600).
--define(wxAuiPaneInfo_IsFixed, 2601).
--define(wxAuiPaneInfo_IsFloatable, 2602).
--define(wxAuiPaneInfo_IsFloating, 2603).
--define(wxAuiPaneInfo_IsLeftDockable, 2604).
--define(wxAuiPaneInfo_IsMovable, 2605).
--define(wxAuiPaneInfo_IsOk, 2606).
--define(wxAuiPaneInfo_IsResizable, 2607).
--define(wxAuiPaneInfo_IsRightDockable, 2608).
--define(wxAuiPaneInfo_IsShown, 2609).
--define(wxAuiPaneInfo_IsToolbar, 2610).
--define(wxAuiPaneInfo_IsTopDockable, 2611).
--define(wxAuiPaneInfo_Layer, 2612).
--define(wxAuiPaneInfo_Left, 2613).
--define(wxAuiPaneInfo_LeftDockable, 2614).
--define(wxAuiPaneInfo_MaxSize_1, 2615).
--define(wxAuiPaneInfo_MaxSize_2, 2616).
--define(wxAuiPaneInfo_MaximizeButton, 2617).
--define(wxAuiPaneInfo_MinSize_1, 2618).
--define(wxAuiPaneInfo_MinSize_2, 2619).
--define(wxAuiPaneInfo_MinimizeButton, 2620).
--define(wxAuiPaneInfo_Movable, 2621).
--define(wxAuiPaneInfo_Name, 2622).
--define(wxAuiPaneInfo_PaneBorder, 2623).
--define(wxAuiPaneInfo_PinButton, 2624).
--define(wxAuiPaneInfo_Position, 2625).
--define(wxAuiPaneInfo_Resizable, 2626).
--define(wxAuiPaneInfo_Right, 2627).
--define(wxAuiPaneInfo_RightDockable, 2628).
--define(wxAuiPaneInfo_Row, 2629).
--define(wxAuiPaneInfo_SafeSet, 2630).
--define(wxAuiPaneInfo_SetFlag, 2631).
--define(wxAuiPaneInfo_Show, 2632).
--define(wxAuiPaneInfo_ToolbarPane, 2633).
--define(wxAuiPaneInfo_Top, 2634).
--define(wxAuiPaneInfo_TopDockable, 2635).
--define(wxAuiPaneInfo_Window, 2636).
--define(wxAuiNotebook_new_0, 2637).
--define(wxAuiNotebook_new_2, 2638).
--define(wxAuiNotebook_AddPage, 2639).
--define(wxAuiNotebook_Create, 2640).
--define(wxAuiNotebook_DeletePage, 2641).
--define(wxAuiNotebook_GetArtProvider, 2642).
--define(wxAuiNotebook_GetPage, 2643).
--define(wxAuiNotebook_GetPageBitmap, 2644).
--define(wxAuiNotebook_GetPageCount, 2645).
--define(wxAuiNotebook_GetPageIndex, 2646).
--define(wxAuiNotebook_GetPageText, 2647).
--define(wxAuiNotebook_GetSelection, 2648).
--define(wxAuiNotebook_InsertPage, 2649).
--define(wxAuiNotebook_RemovePage, 2650).
--define(wxAuiNotebook_SetArtProvider, 2651).
--define(wxAuiNotebook_SetFont, 2652).
--define(wxAuiNotebook_SetPageBitmap, 2653).
--define(wxAuiNotebook_SetPageText, 2654).
--define(wxAuiNotebook_SetSelection, 2655).
--define(wxAuiNotebook_SetTabCtrlHeight, 2656).
--define(wxAuiNotebook_SetUniformBitmapSize, 2657).
--define(wxAuiNotebook_destroy, 2658).
--define(wxMDIParentFrame_new_0, 2659).
--define(wxMDIParentFrame_new_4, 2660).
--define(wxMDIParentFrame_destruct, 2661).
--define(wxMDIParentFrame_ActivateNext, 2662).
--define(wxMDIParentFrame_ActivatePrevious, 2663).
--define(wxMDIParentFrame_ArrangeIcons, 2664).
--define(wxMDIParentFrame_Cascade, 2665).
--define(wxMDIParentFrame_Create, 2666).
--define(wxMDIParentFrame_GetActiveChild, 2667).
--define(wxMDIParentFrame_GetClientWindow, 2668).
--define(wxMDIParentFrame_Tile, 2669).
--define(wxMDIChildFrame_new_0, 2670).
--define(wxMDIChildFrame_new_4, 2671).
--define(wxMDIChildFrame_destruct, 2672).
--define(wxMDIChildFrame_Activate, 2673).
--define(wxMDIChildFrame_Create, 2674).
--define(wxMDIChildFrame_Maximize, 2675).
--define(wxMDIChildFrame_Restore, 2676).
--define(wxMDIClientWindow_new_0, 2677).
--define(wxMDIClientWindow_new_2, 2678).
--define(wxMDIClientWindow_destruct, 2679).
--define(wxMDIClientWindow_CreateClient, 2680).
--define(wxLayoutAlgorithm_new, 2681).
--define(wxLayoutAlgorithm_LayoutFrame, 2682).
--define(wxLayoutAlgorithm_LayoutMDIFrame, 2683).
--define(wxLayoutAlgorithm_LayoutWindow, 2684).
--define(wxLayoutAlgorithm_destroy, 2685).
--define(wxEvent_GetId, 2686).
--define(wxEvent_GetSkipped, 2687).
--define(wxEvent_GetTimestamp, 2688).
--define(wxEvent_IsCommandEvent, 2689).
--define(wxEvent_ResumePropagation, 2690).
--define(wxEvent_ShouldPropagate, 2691).
--define(wxEvent_Skip, 2692).
--define(wxEvent_StopPropagation, 2693).
--define(wxCommandEvent_getClientData, 2694).
--define(wxCommandEvent_GetExtraLong, 2695).
--define(wxCommandEvent_GetInt, 2696).
--define(wxCommandEvent_GetSelection, 2697).
--define(wxCommandEvent_GetString, 2698).
--define(wxCommandEvent_IsChecked, 2699).
--define(wxCommandEvent_IsSelection, 2700).
--define(wxCommandEvent_SetInt, 2701).
--define(wxCommandEvent_SetString, 2702).
--define(wxScrollEvent_GetOrientation, 2703).
--define(wxScrollEvent_GetPosition, 2704).
--define(wxScrollWinEvent_GetOrientation, 2705).
--define(wxScrollWinEvent_GetPosition, 2706).
--define(wxMouseEvent_AltDown, 2707).
--define(wxMouseEvent_Button, 2708).
--define(wxMouseEvent_ButtonDClick, 2709).
--define(wxMouseEvent_ButtonDown, 2710).
--define(wxMouseEvent_ButtonUp, 2711).
--define(wxMouseEvent_CmdDown, 2712).
--define(wxMouseEvent_ControlDown, 2713).
--define(wxMouseEvent_Dragging, 2714).
--define(wxMouseEvent_Entering, 2715).
--define(wxMouseEvent_GetButton, 2716).
--define(wxMouseEvent_GetPosition, 2719).
--define(wxMouseEvent_GetLogicalPosition, 2720).
--define(wxMouseEvent_GetLinesPerAction, 2721).
--define(wxMouseEvent_GetWheelRotation, 2722).
--define(wxMouseEvent_GetWheelDelta, 2723).
--define(wxMouseEvent_GetX, 2724).
--define(wxMouseEvent_GetY, 2725).
--define(wxMouseEvent_IsButton, 2726).
--define(wxMouseEvent_IsPageScroll, 2727).
--define(wxMouseEvent_Leaving, 2728).
--define(wxMouseEvent_LeftDClick, 2729).
--define(wxMouseEvent_LeftDown, 2730).
--define(wxMouseEvent_LeftIsDown, 2731).
--define(wxMouseEvent_LeftUp, 2732).
--define(wxMouseEvent_MetaDown, 2733).
--define(wxMouseEvent_MiddleDClick, 2734).
--define(wxMouseEvent_MiddleDown, 2735).
--define(wxMouseEvent_MiddleIsDown, 2736).
--define(wxMouseEvent_MiddleUp, 2737).
--define(wxMouseEvent_Moving, 2738).
--define(wxMouseEvent_RightDClick, 2739).
--define(wxMouseEvent_RightDown, 2740).
--define(wxMouseEvent_RightIsDown, 2741).
--define(wxMouseEvent_RightUp, 2742).
--define(wxMouseEvent_ShiftDown, 2743).
--define(wxSetCursorEvent_GetCursor, 2744).
--define(wxSetCursorEvent_GetX, 2745).
--define(wxSetCursorEvent_GetY, 2746).
--define(wxSetCursorEvent_HasCursor, 2747).
--define(wxSetCursorEvent_SetCursor, 2748).
--define(wxKeyEvent_AltDown, 2749).
--define(wxKeyEvent_CmdDown, 2750).
--define(wxKeyEvent_ControlDown, 2751).
--define(wxKeyEvent_GetKeyCode, 2752).
--define(wxKeyEvent_GetModifiers, 2753).
--define(wxKeyEvent_GetPosition, 2756).
--define(wxKeyEvent_GetRawKeyCode, 2757).
--define(wxKeyEvent_GetRawKeyFlags, 2758).
--define(wxKeyEvent_GetUnicodeKey, 2759).
--define(wxKeyEvent_GetX, 2760).
--define(wxKeyEvent_GetY, 2761).
--define(wxKeyEvent_HasModifiers, 2762).
--define(wxKeyEvent_MetaDown, 2763).
--define(wxKeyEvent_ShiftDown, 2764).
--define(wxSizeEvent_GetSize, 2765).
--define(wxMoveEvent_GetPosition, 2766).
--define(wxEraseEvent_GetDC, 2767).
--define(wxFocusEvent_GetWindow, 2768).
--define(wxChildFocusEvent_GetWindow, 2769).
--define(wxMenuEvent_GetMenu, 2770).
--define(wxMenuEvent_GetMenuId, 2771).
--define(wxMenuEvent_IsPopup, 2772).
--define(wxCloseEvent_CanVeto, 2773).
--define(wxCloseEvent_GetLoggingOff, 2774).
--define(wxCloseEvent_SetCanVeto, 2775).
--define(wxCloseEvent_SetLoggingOff, 2776).
--define(wxCloseEvent_Veto, 2777).
--define(wxShowEvent_SetShow, 2778).
--define(wxShowEvent_GetShow, 2779).
--define(wxIconizeEvent_Iconized, 2780).
--define(wxJoystickEvent_ButtonDown, 2781).
--define(wxJoystickEvent_ButtonIsDown, 2782).
--define(wxJoystickEvent_ButtonUp, 2783).
--define(wxJoystickEvent_GetButtonChange, 2784).
--define(wxJoystickEvent_GetButtonState, 2785).
--define(wxJoystickEvent_GetJoystick, 2786).
--define(wxJoystickEvent_GetPosition, 2787).
--define(wxJoystickEvent_GetZPosition, 2788).
--define(wxJoystickEvent_IsButton, 2789).
--define(wxJoystickEvent_IsMove, 2790).
--define(wxJoystickEvent_IsZMove, 2791).
--define(wxUpdateUIEvent_CanUpdate, 2792).
--define(wxUpdateUIEvent_Check, 2793).
--define(wxUpdateUIEvent_Enable, 2794).
--define(wxUpdateUIEvent_Show, 2795).
--define(wxUpdateUIEvent_GetChecked, 2796).
--define(wxUpdateUIEvent_GetEnabled, 2797).
--define(wxUpdateUIEvent_GetShown, 2798).
--define(wxUpdateUIEvent_GetSetChecked, 2799).
--define(wxUpdateUIEvent_GetSetEnabled, 2800).
--define(wxUpdateUIEvent_GetSetShown, 2801).
--define(wxUpdateUIEvent_GetSetText, 2802).
--define(wxUpdateUIEvent_GetText, 2803).
--define(wxUpdateUIEvent_GetMode, 2804).
--define(wxUpdateUIEvent_GetUpdateInterval, 2805).
--define(wxUpdateUIEvent_ResetUpdateTime, 2806).
--define(wxUpdateUIEvent_SetMode, 2807).
--define(wxUpdateUIEvent_SetText, 2808).
--define(wxUpdateUIEvent_SetUpdateInterval, 2809).
--define(wxMouseCaptureChangedEvent_GetCapturedWindow, 2810).
--define(wxPaletteChangedEvent_SetChangedWindow, 2811).
--define(wxPaletteChangedEvent_GetChangedWindow, 2812).
--define(wxQueryNewPaletteEvent_SetPaletteRealized, 2813).
--define(wxQueryNewPaletteEvent_GetPaletteRealized, 2814).
--define(wxNavigationKeyEvent_GetDirection, 2815).
--define(wxNavigationKeyEvent_SetDirection, 2816).
--define(wxNavigationKeyEvent_IsWindowChange, 2817).
--define(wxNavigationKeyEvent_SetWindowChange, 2818).
--define(wxNavigationKeyEvent_IsFromTab, 2819).
--define(wxNavigationKeyEvent_SetFromTab, 2820).
--define(wxNavigationKeyEvent_GetCurrentFocus, 2821).
--define(wxNavigationKeyEvent_SetCurrentFocus, 2822).
--define(wxHelpEvent_GetOrigin, 2823).
--define(wxHelpEvent_GetPosition, 2824).
--define(wxHelpEvent_SetOrigin, 2825).
--define(wxHelpEvent_SetPosition, 2826).
--define(wxContextMenuEvent_GetPosition, 2827).
--define(wxContextMenuEvent_SetPosition, 2828).
--define(wxIdleEvent_CanSend, 2829).
--define(wxIdleEvent_GetMode, 2830).
--define(wxIdleEvent_RequestMore, 2831).
--define(wxIdleEvent_MoreRequested, 2832).
--define(wxIdleEvent_SetMode, 2833).
--define(wxGridEvent_AltDown, 2834).
--define(wxGridEvent_ControlDown, 2835).
--define(wxGridEvent_GetCol, 2836).
--define(wxGridEvent_GetPosition, 2837).
--define(wxGridEvent_GetRow, 2838).
--define(wxGridEvent_MetaDown, 2839).
--define(wxGridEvent_Selecting, 2840).
--define(wxGridEvent_ShiftDown, 2841).
--define(wxNotifyEvent_Allow, 2842).
--define(wxNotifyEvent_IsAllowed, 2843).
--define(wxNotifyEvent_Veto, 2844).
--define(wxSashEvent_GetEdge, 2845).
--define(wxSashEvent_GetDragRect, 2846).
--define(wxSashEvent_GetDragStatus, 2847).
--define(wxListEvent_GetCacheFrom, 2848).
--define(wxListEvent_GetCacheTo, 2849).
--define(wxListEvent_GetKeyCode, 2850).
--define(wxListEvent_GetIndex, 2851).
--define(wxListEvent_GetColumn, 2852).
--define(wxListEvent_GetPoint, 2853).
--define(wxListEvent_GetLabel, 2854).
--define(wxListEvent_GetText, 2855).
--define(wxListEvent_GetImage, 2856).
--define(wxListEvent_GetData, 2857).
--define(wxListEvent_GetMask, 2858).
--define(wxListEvent_GetItem, 2859).
--define(wxListEvent_IsEditCancelled, 2860).
--define(wxDateEvent_GetDate, 2861).
--define(wxCalendarEvent_GetWeekDay, 2862).
--define(wxFileDirPickerEvent_GetPath, 2863).
--define(wxColourPickerEvent_GetColour, 2864).
--define(wxFontPickerEvent_GetFont, 2865).
--define(wxStyledTextEvent_GetPosition, 2866).
--define(wxStyledTextEvent_GetKey, 2867).
--define(wxStyledTextEvent_GetModifiers, 2868).
--define(wxStyledTextEvent_GetModificationType, 2869).
--define(wxStyledTextEvent_GetText, 2870).
--define(wxStyledTextEvent_GetLength, 2871).
--define(wxStyledTextEvent_GetLinesAdded, 2872).
--define(wxStyledTextEvent_GetLine, 2873).
--define(wxStyledTextEvent_GetFoldLevelNow, 2874).
--define(wxStyledTextEvent_GetFoldLevelPrev, 2875).
--define(wxStyledTextEvent_GetMargin, 2876).
--define(wxStyledTextEvent_GetMessage, 2877).
--define(wxStyledTextEvent_GetWParam, 2878).
--define(wxStyledTextEvent_GetLParam, 2879).
--define(wxStyledTextEvent_GetListType, 2880).
--define(wxStyledTextEvent_GetX, 2881).
--define(wxStyledTextEvent_GetY, 2882).
--define(wxStyledTextEvent_GetDragText, 2883).
--define(wxStyledTextEvent_GetDragAllowMove, 2884).
--define(wxStyledTextEvent_GetDragResult, 2885).
--define(wxStyledTextEvent_GetShift, 2886).
--define(wxStyledTextEvent_GetControl, 2887).
--define(wxStyledTextEvent_GetAlt, 2888).
--define(utils_wxGetKeyState, 2889).
--define(utils_wxGetMousePosition, 2890).
--define(utils_wxGetMouseState, 2891).
--define(utils_wxSetDetectableAutoRepeat, 2892).
--define(utils_wxBell, 2893).
--define(utils_wxFindMenuItemId, 2894).
--define(utils_wxGenericFindWindowAtPoint, 2895).
--define(utils_wxFindWindowAtPoint, 2896).
--define(utils_wxBeginBusyCursor, 2897).
--define(utils_wxEndBusyCursor, 2898).
--define(utils_wxIsBusy, 2899).
--define(utils_wxShutdown, 2900).
--define(utils_wxShell, 2901).
--define(utils_wxLaunchDefaultBrowser, 2902).
--define(utils_wxGetEmailAddress, 2903).
--define(utils_wxGetUserId, 2904).
--define(utils_wxGetHomeDir, 2905).
--define(utils_wxNewId, 2906).
--define(utils_wxRegisterId, 2907).
--define(utils_wxGetCurrentId, 2908).
--define(utils_wxGetOsDescription, 2909).
--define(utils_wxIsPlatformLittleEndian, 2910).
--define(utils_wxIsPlatform64Bit, 2911).
--define(wxPrintout_new, 2912).
--define(wxPrintout_destruct, 2913).
--define(wxPrintout_GetDC, 2914).
--define(wxPrintout_GetPageSizeMM, 2915).
--define(wxPrintout_GetPageSizePixels, 2916).
--define(wxPrintout_GetPaperRectPixels, 2917).
--define(wxPrintout_GetPPIPrinter, 2918).
--define(wxPrintout_GetPPIScreen, 2919).
--define(wxPrintout_GetTitle, 2920).
--define(wxPrintout_IsPreview, 2921).
--define(wxPrintout_FitThisSizeToPaper, 2922).
--define(wxPrintout_FitThisSizeToPage, 2923).
--define(wxPrintout_FitThisSizeToPageMargins, 2924).
--define(wxPrintout_MapScreenSizeToPaper, 2925).
--define(wxPrintout_MapScreenSizeToPage, 2926).
--define(wxPrintout_MapScreenSizeToPageMargins, 2927).
--define(wxPrintout_MapScreenSizeToDevice, 2928).
--define(wxPrintout_GetLogicalPaperRect, 2929).
--define(wxPrintout_GetLogicalPageRect, 2930).
--define(wxPrintout_GetLogicalPageMarginsRect, 2931).
--define(wxPrintout_SetLogicalOrigin, 2932).
--define(wxPrintout_OffsetLogicalOrigin, 2933).
--define(wxStyledTextCtrl_new_2, 2934).
--define(wxStyledTextCtrl_new_0, 2935).
--define(wxStyledTextCtrl_destruct, 2936).
--define(wxStyledTextCtrl_Create, 2937).
--define(wxStyledTextCtrl_AddText, 2938).
--define(wxStyledTextCtrl_AddStyledText, 2939).
--define(wxStyledTextCtrl_InsertText, 2940).
--define(wxStyledTextCtrl_ClearAll, 2941).
--define(wxStyledTextCtrl_ClearDocumentStyle, 2942).
--define(wxStyledTextCtrl_GetLength, 2943).
--define(wxStyledTextCtrl_GetCharAt, 2944).
--define(wxStyledTextCtrl_GetCurrentPos, 2945).
--define(wxStyledTextCtrl_GetAnchor, 2946).
--define(wxStyledTextCtrl_GetStyleAt, 2947).
--define(wxStyledTextCtrl_Redo, 2948).
--define(wxStyledTextCtrl_SetUndoCollection, 2949).
--define(wxStyledTextCtrl_SelectAll, 2950).
--define(wxStyledTextCtrl_SetSavePoint, 2951).
--define(wxStyledTextCtrl_GetStyledText, 2952).
--define(wxStyledTextCtrl_CanRedo, 2953).
--define(wxStyledTextCtrl_MarkerLineFromHandle, 2954).
--define(wxStyledTextCtrl_MarkerDeleteHandle, 2955).
--define(wxStyledTextCtrl_GetUndoCollection, 2956).
--define(wxStyledTextCtrl_GetViewWhiteSpace, 2957).
--define(wxStyledTextCtrl_SetViewWhiteSpace, 2958).
--define(wxStyledTextCtrl_PositionFromPoint, 2959).
--define(wxStyledTextCtrl_PositionFromPointClose, 2960).
--define(wxStyledTextCtrl_GotoLine, 2961).
--define(wxStyledTextCtrl_GotoPos, 2962).
--define(wxStyledTextCtrl_SetAnchor, 2963).
--define(wxStyledTextCtrl_GetCurLine, 2964).
--define(wxStyledTextCtrl_GetEndStyled, 2965).
--define(wxStyledTextCtrl_ConvertEOLs, 2966).
--define(wxStyledTextCtrl_GetEOLMode, 2967).
--define(wxStyledTextCtrl_SetEOLMode, 2968).
--define(wxStyledTextCtrl_StartStyling, 2969).
--define(wxStyledTextCtrl_SetStyling, 2970).
--define(wxStyledTextCtrl_GetBufferedDraw, 2971).
--define(wxStyledTextCtrl_SetBufferedDraw, 2972).
--define(wxStyledTextCtrl_SetTabWidth, 2973).
--define(wxStyledTextCtrl_GetTabWidth, 2974).
--define(wxStyledTextCtrl_SetCodePage, 2975).
--define(wxStyledTextCtrl_MarkerDefine, 2976).
--define(wxStyledTextCtrl_MarkerSetForeground, 2977).
--define(wxStyledTextCtrl_MarkerSetBackground, 2978).
--define(wxStyledTextCtrl_MarkerAdd, 2979).
--define(wxStyledTextCtrl_MarkerDelete, 2980).
--define(wxStyledTextCtrl_MarkerDeleteAll, 2981).
--define(wxStyledTextCtrl_MarkerGet, 2982).
--define(wxStyledTextCtrl_MarkerNext, 2983).
--define(wxStyledTextCtrl_MarkerPrevious, 2984).
--define(wxStyledTextCtrl_MarkerDefineBitmap, 2985).
--define(wxStyledTextCtrl_MarkerAddSet, 2986).
--define(wxStyledTextCtrl_MarkerSetAlpha, 2987).
--define(wxStyledTextCtrl_SetMarginType, 2988).
--define(wxStyledTextCtrl_GetMarginType, 2989).
--define(wxStyledTextCtrl_SetMarginWidth, 2990).
--define(wxStyledTextCtrl_GetMarginWidth, 2991).
--define(wxStyledTextCtrl_SetMarginMask, 2992).
--define(wxStyledTextCtrl_GetMarginMask, 2993).
--define(wxStyledTextCtrl_SetMarginSensitive, 2994).
--define(wxStyledTextCtrl_GetMarginSensitive, 2995).
--define(wxStyledTextCtrl_StyleClearAll, 2996).
--define(wxStyledTextCtrl_StyleSetForeground, 2997).
--define(wxStyledTextCtrl_StyleSetBackground, 2998).
--define(wxStyledTextCtrl_StyleSetBold, 2999).
--define(wxStyledTextCtrl_StyleSetItalic, 3000).
--define(wxStyledTextCtrl_StyleSetSize, 3001).
--define(wxStyledTextCtrl_StyleSetFaceName, 3002).
--define(wxStyledTextCtrl_StyleSetEOLFilled, 3003).
--define(wxStyledTextCtrl_StyleResetDefault, 3004).
--define(wxStyledTextCtrl_StyleSetUnderline, 3005).
--define(wxStyledTextCtrl_StyleSetCase, 3006).
--define(wxStyledTextCtrl_StyleSetHotSpot, 3007).
--define(wxStyledTextCtrl_SetSelForeground, 3008).
--define(wxStyledTextCtrl_SetSelBackground, 3009).
--define(wxStyledTextCtrl_GetSelAlpha, 3010).
--define(wxStyledTextCtrl_SetSelAlpha, 3011).
--define(wxStyledTextCtrl_SetCaretForeground, 3012).
--define(wxStyledTextCtrl_CmdKeyAssign, 3013).
--define(wxStyledTextCtrl_CmdKeyClear, 3014).
--define(wxStyledTextCtrl_CmdKeyClearAll, 3015).
--define(wxStyledTextCtrl_SetStyleBytes, 3016).
--define(wxStyledTextCtrl_StyleSetVisible, 3017).
--define(wxStyledTextCtrl_GetCaretPeriod, 3018).
--define(wxStyledTextCtrl_SetCaretPeriod, 3019).
--define(wxStyledTextCtrl_SetWordChars, 3020).
--define(wxStyledTextCtrl_BeginUndoAction, 3021).
--define(wxStyledTextCtrl_EndUndoAction, 3022).
--define(wxStyledTextCtrl_IndicatorSetStyle, 3023).
--define(wxStyledTextCtrl_IndicatorGetStyle, 3024).
--define(wxStyledTextCtrl_IndicatorSetForeground, 3025).
--define(wxStyledTextCtrl_IndicatorGetForeground, 3026).
--define(wxStyledTextCtrl_SetWhitespaceForeground, 3027).
--define(wxStyledTextCtrl_SetWhitespaceBackground, 3028).
--define(wxStyledTextCtrl_GetStyleBits, 3029).
--define(wxStyledTextCtrl_SetLineState, 3030).
--define(wxStyledTextCtrl_GetLineState, 3031).
--define(wxStyledTextCtrl_GetMaxLineState, 3032).
--define(wxStyledTextCtrl_GetCaretLineVisible, 3033).
--define(wxStyledTextCtrl_SetCaretLineVisible, 3034).
--define(wxStyledTextCtrl_GetCaretLineBackground, 3035).
--define(wxStyledTextCtrl_SetCaretLineBackground, 3036).
--define(wxStyledTextCtrl_AutoCompShow, 3037).
--define(wxStyledTextCtrl_AutoCompCancel, 3038).
--define(wxStyledTextCtrl_AutoCompActive, 3039).
--define(wxStyledTextCtrl_AutoCompPosStart, 3040).
--define(wxStyledTextCtrl_AutoCompComplete, 3041).
--define(wxStyledTextCtrl_AutoCompStops, 3042).
--define(wxStyledTextCtrl_AutoCompSetSeparator, 3043).
--define(wxStyledTextCtrl_AutoCompGetSeparator, 3044).
--define(wxStyledTextCtrl_AutoCompSelect, 3045).
--define(wxStyledTextCtrl_AutoCompSetCancelAtStart, 3046).
--define(wxStyledTextCtrl_AutoCompGetCancelAtStart, 3047).
--define(wxStyledTextCtrl_AutoCompSetFillUps, 3048).
--define(wxStyledTextCtrl_AutoCompSetChooseSingle, 3049).
--define(wxStyledTextCtrl_AutoCompGetChooseSingle, 3050).
--define(wxStyledTextCtrl_AutoCompSetIgnoreCase, 3051).
--define(wxStyledTextCtrl_AutoCompGetIgnoreCase, 3052).
--define(wxStyledTextCtrl_UserListShow, 3053).
--define(wxStyledTextCtrl_AutoCompSetAutoHide, 3054).
--define(wxStyledTextCtrl_AutoCompGetAutoHide, 3055).
--define(wxStyledTextCtrl_AutoCompSetDropRestOfWord, 3056).
--define(wxStyledTextCtrl_AutoCompGetDropRestOfWord, 3057).
--define(wxStyledTextCtrl_RegisterImage, 3058).
--define(wxStyledTextCtrl_ClearRegisteredImages, 3059).
--define(wxStyledTextCtrl_AutoCompGetTypeSeparator, 3060).
--define(wxStyledTextCtrl_AutoCompSetTypeSeparator, 3061).
--define(wxStyledTextCtrl_AutoCompSetMaxWidth, 3062).
--define(wxStyledTextCtrl_AutoCompGetMaxWidth, 3063).
--define(wxStyledTextCtrl_AutoCompSetMaxHeight, 3064).
--define(wxStyledTextCtrl_AutoCompGetMaxHeight, 3065).
--define(wxStyledTextCtrl_SetIndent, 3066).
--define(wxStyledTextCtrl_GetIndent, 3067).
--define(wxStyledTextCtrl_SetUseTabs, 3068).
--define(wxStyledTextCtrl_GetUseTabs, 3069).
--define(wxStyledTextCtrl_SetLineIndentation, 3070).
--define(wxStyledTextCtrl_GetLineIndentation, 3071).
--define(wxStyledTextCtrl_GetLineIndentPosition, 3072).
--define(wxStyledTextCtrl_GetColumn, 3073).
--define(wxStyledTextCtrl_SetUseHorizontalScrollBar, 3074).
--define(wxStyledTextCtrl_GetUseHorizontalScrollBar, 3075).
--define(wxStyledTextCtrl_SetIndentationGuides, 3076).
--define(wxStyledTextCtrl_GetIndentationGuides, 3077).
--define(wxStyledTextCtrl_SetHighlightGuide, 3078).
--define(wxStyledTextCtrl_GetHighlightGuide, 3079).
--define(wxStyledTextCtrl_GetLineEndPosition, 3080).
--define(wxStyledTextCtrl_GetCodePage, 3081).
--define(wxStyledTextCtrl_GetCaretForeground, 3082).
--define(wxStyledTextCtrl_GetReadOnly, 3083).
--define(wxStyledTextCtrl_SetCurrentPos, 3084).
--define(wxStyledTextCtrl_SetSelectionStart, 3085).
--define(wxStyledTextCtrl_GetSelectionStart, 3086).
--define(wxStyledTextCtrl_SetSelectionEnd, 3087).
--define(wxStyledTextCtrl_GetSelectionEnd, 3088).
--define(wxStyledTextCtrl_SetPrintMagnification, 3089).
--define(wxStyledTextCtrl_GetPrintMagnification, 3090).
--define(wxStyledTextCtrl_SetPrintColourMode, 3091).
--define(wxStyledTextCtrl_GetPrintColourMode, 3092).
--define(wxStyledTextCtrl_FindText, 3093).
--define(wxStyledTextCtrl_FormatRange, 3094).
--define(wxStyledTextCtrl_GetFirstVisibleLine, 3095).
--define(wxStyledTextCtrl_GetLine, 3096).
--define(wxStyledTextCtrl_GetLineCount, 3097).
--define(wxStyledTextCtrl_SetMarginLeft, 3098).
--define(wxStyledTextCtrl_GetMarginLeft, 3099).
--define(wxStyledTextCtrl_SetMarginRight, 3100).
--define(wxStyledTextCtrl_GetMarginRight, 3101).
--define(wxStyledTextCtrl_GetModify, 3102).
--define(wxStyledTextCtrl_SetSelection, 3103).
--define(wxStyledTextCtrl_GetSelectedText, 3104).
--define(wxStyledTextCtrl_GetTextRange, 3105).
--define(wxStyledTextCtrl_HideSelection, 3106).
--define(wxStyledTextCtrl_LineFromPosition, 3107).
--define(wxStyledTextCtrl_PositionFromLine, 3108).
--define(wxStyledTextCtrl_LineScroll, 3109).
--define(wxStyledTextCtrl_EnsureCaretVisible, 3110).
--define(wxStyledTextCtrl_ReplaceSelection, 3111).
--define(wxStyledTextCtrl_SetReadOnly, 3112).
--define(wxStyledTextCtrl_CanPaste, 3113).
--define(wxStyledTextCtrl_CanUndo, 3114).
--define(wxStyledTextCtrl_EmptyUndoBuffer, 3115).
--define(wxStyledTextCtrl_Undo, 3116).
--define(wxStyledTextCtrl_Cut, 3117).
--define(wxStyledTextCtrl_Copy, 3118).
--define(wxStyledTextCtrl_Paste, 3119).
--define(wxStyledTextCtrl_Clear, 3120).
--define(wxStyledTextCtrl_SetText, 3121).
--define(wxStyledTextCtrl_GetText, 3122).
--define(wxStyledTextCtrl_GetTextLength, 3123).
--define(wxStyledTextCtrl_GetOvertype, 3124).
--define(wxStyledTextCtrl_SetCaretWidth, 3125).
--define(wxStyledTextCtrl_GetCaretWidth, 3126).
--define(wxStyledTextCtrl_SetTargetStart, 3127).
--define(wxStyledTextCtrl_GetTargetStart, 3128).
--define(wxStyledTextCtrl_SetTargetEnd, 3129).
--define(wxStyledTextCtrl_GetTargetEnd, 3130).
--define(wxStyledTextCtrl_ReplaceTarget, 3131).
--define(wxStyledTextCtrl_SearchInTarget, 3132).
--define(wxStyledTextCtrl_SetSearchFlags, 3133).
--define(wxStyledTextCtrl_GetSearchFlags, 3134).
--define(wxStyledTextCtrl_CallTipShow, 3135).
--define(wxStyledTextCtrl_CallTipCancel, 3136).
--define(wxStyledTextCtrl_CallTipActive, 3137).
--define(wxStyledTextCtrl_CallTipPosAtStart, 3138).
--define(wxStyledTextCtrl_CallTipSetHighlight, 3139).
--define(wxStyledTextCtrl_CallTipSetBackground, 3140).
--define(wxStyledTextCtrl_CallTipSetForeground, 3141).
--define(wxStyledTextCtrl_CallTipSetForegroundHighlight, 3142).
--define(wxStyledTextCtrl_CallTipUseStyle, 3143).
--define(wxStyledTextCtrl_VisibleFromDocLine, 3144).
--define(wxStyledTextCtrl_DocLineFromVisible, 3145).
--define(wxStyledTextCtrl_WrapCount, 3146).
--define(wxStyledTextCtrl_SetFoldLevel, 3147).
--define(wxStyledTextCtrl_GetFoldLevel, 3148).
--define(wxStyledTextCtrl_GetLastChild, 3149).
--define(wxStyledTextCtrl_GetFoldParent, 3150).
--define(wxStyledTextCtrl_ShowLines, 3151).
--define(wxStyledTextCtrl_HideLines, 3152).
--define(wxStyledTextCtrl_GetLineVisible, 3153).
--define(wxStyledTextCtrl_SetFoldExpanded, 3154).
--define(wxStyledTextCtrl_GetFoldExpanded, 3155).
--define(wxStyledTextCtrl_ToggleFold, 3156).
--define(wxStyledTextCtrl_EnsureVisible, 3157).
--define(wxStyledTextCtrl_SetFoldFlags, 3158).
--define(wxStyledTextCtrl_EnsureVisibleEnforcePolicy, 3159).
--define(wxStyledTextCtrl_SetTabIndents, 3160).
--define(wxStyledTextCtrl_GetTabIndents, 3161).
--define(wxStyledTextCtrl_SetBackSpaceUnIndents, 3162).
--define(wxStyledTextCtrl_GetBackSpaceUnIndents, 3163).
--define(wxStyledTextCtrl_SetMouseDwellTime, 3164).
--define(wxStyledTextCtrl_GetMouseDwellTime, 3165).
--define(wxStyledTextCtrl_WordStartPosition, 3166).
--define(wxStyledTextCtrl_WordEndPosition, 3167).
--define(wxStyledTextCtrl_SetWrapMode, 3168).
--define(wxStyledTextCtrl_GetWrapMode, 3169).
--define(wxStyledTextCtrl_SetWrapVisualFlags, 3170).
--define(wxStyledTextCtrl_GetWrapVisualFlags, 3171).
--define(wxStyledTextCtrl_SetWrapVisualFlagsLocation, 3172).
--define(wxStyledTextCtrl_GetWrapVisualFlagsLocation, 3173).
--define(wxStyledTextCtrl_SetWrapStartIndent, 3174).
--define(wxStyledTextCtrl_GetWrapStartIndent, 3175).
--define(wxStyledTextCtrl_SetLayoutCache, 3176).
--define(wxStyledTextCtrl_GetLayoutCache, 3177).
--define(wxStyledTextCtrl_SetScrollWidth, 3178).
--define(wxStyledTextCtrl_GetScrollWidth, 3179).
--define(wxStyledTextCtrl_TextWidth, 3180).
--define(wxStyledTextCtrl_GetEndAtLastLine, 3181).
--define(wxStyledTextCtrl_TextHeight, 3182).
--define(wxStyledTextCtrl_SetUseVerticalScrollBar, 3183).
--define(wxStyledTextCtrl_GetUseVerticalScrollBar, 3184).
--define(wxStyledTextCtrl_AppendText, 3185).
--define(wxStyledTextCtrl_GetTwoPhaseDraw, 3186).
--define(wxStyledTextCtrl_SetTwoPhaseDraw, 3187).
--define(wxStyledTextCtrl_TargetFromSelection, 3188).
--define(wxStyledTextCtrl_LinesJoin, 3189).
--define(wxStyledTextCtrl_LinesSplit, 3190).
--define(wxStyledTextCtrl_SetFoldMarginColour, 3191).
--define(wxStyledTextCtrl_SetFoldMarginHiColour, 3192).
--define(wxStyledTextCtrl_LineDown, 3193).
--define(wxStyledTextCtrl_LineDownExtend, 3194).
--define(wxStyledTextCtrl_LineUp, 3195).
--define(wxStyledTextCtrl_LineUpExtend, 3196).
--define(wxStyledTextCtrl_CharLeft, 3197).
--define(wxStyledTextCtrl_CharLeftExtend, 3198).
--define(wxStyledTextCtrl_CharRight, 3199).
--define(wxStyledTextCtrl_CharRightExtend, 3200).
--define(wxStyledTextCtrl_WordLeft, 3201).
--define(wxStyledTextCtrl_WordLeftExtend, 3202).
--define(wxStyledTextCtrl_WordRight, 3203).
--define(wxStyledTextCtrl_WordRightExtend, 3204).
--define(wxStyledTextCtrl_Home, 3205).
--define(wxStyledTextCtrl_HomeExtend, 3206).
--define(wxStyledTextCtrl_LineEnd, 3207).
--define(wxStyledTextCtrl_LineEndExtend, 3208).
--define(wxStyledTextCtrl_DocumentStart, 3209).
--define(wxStyledTextCtrl_DocumentStartExtend, 3210).
--define(wxStyledTextCtrl_DocumentEnd, 3211).
--define(wxStyledTextCtrl_DocumentEndExtend, 3212).
--define(wxStyledTextCtrl_PageUp, 3213).
--define(wxStyledTextCtrl_PageUpExtend, 3214).
--define(wxStyledTextCtrl_PageDown, 3215).
--define(wxStyledTextCtrl_PageDownExtend, 3216).
--define(wxStyledTextCtrl_EditToggleOvertype, 3217).
--define(wxStyledTextCtrl_Cancel, 3218).
--define(wxStyledTextCtrl_DeleteBack, 3219).
--define(wxStyledTextCtrl_Tab, 3220).
--define(wxStyledTextCtrl_BackTab, 3221).
--define(wxStyledTextCtrl_NewLine, 3222).
--define(wxStyledTextCtrl_FormFeed, 3223).
--define(wxStyledTextCtrl_VCHome, 3224).
--define(wxStyledTextCtrl_VCHomeExtend, 3225).
--define(wxStyledTextCtrl_ZoomIn, 3226).
--define(wxStyledTextCtrl_ZoomOut, 3227).
--define(wxStyledTextCtrl_DelWordLeft, 3228).
--define(wxStyledTextCtrl_DelWordRight, 3229).
--define(wxStyledTextCtrl_LineCut, 3230).
--define(wxStyledTextCtrl_LineDelete, 3231).
--define(wxStyledTextCtrl_LineTranspose, 3232).
--define(wxStyledTextCtrl_LineDuplicate, 3233).
--define(wxStyledTextCtrl_LowerCase, 3234).
--define(wxStyledTextCtrl_UpperCase, 3235).
--define(wxStyledTextCtrl_LineScrollDown, 3236).
--define(wxStyledTextCtrl_LineScrollUp, 3237).
--define(wxStyledTextCtrl_DeleteBackNotLine, 3238).
--define(wxStyledTextCtrl_HomeDisplay, 3239).
--define(wxStyledTextCtrl_HomeDisplayExtend, 3240).
--define(wxStyledTextCtrl_LineEndDisplay, 3241).
--define(wxStyledTextCtrl_LineEndDisplayExtend, 3242).
--define(wxStyledTextCtrl_HomeWrapExtend, 3243).
--define(wxStyledTextCtrl_LineEndWrap, 3244).
--define(wxStyledTextCtrl_LineEndWrapExtend, 3245).
--define(wxStyledTextCtrl_VCHomeWrap, 3246).
--define(wxStyledTextCtrl_VCHomeWrapExtend, 3247).
--define(wxStyledTextCtrl_LineCopy, 3248).
--define(wxStyledTextCtrl_MoveCaretInsideView, 3249).
--define(wxStyledTextCtrl_LineLength, 3250).
--define(wxStyledTextCtrl_BraceHighlight, 3251).
--define(wxStyledTextCtrl_BraceBadLight, 3252).
--define(wxStyledTextCtrl_BraceMatch, 3253).
--define(wxStyledTextCtrl_GetViewEOL, 3254).
--define(wxStyledTextCtrl_SetViewEOL, 3255).
--define(wxStyledTextCtrl_SetModEventMask, 3256).
--define(wxStyledTextCtrl_GetEdgeColumn, 3257).
--define(wxStyledTextCtrl_SetEdgeColumn, 3258).
--define(wxStyledTextCtrl_GetEdgeMode, 3259).
--define(wxStyledTextCtrl_GetEdgeColour, 3260).
--define(wxStyledTextCtrl_SetEdgeColour, 3261).
--define(wxStyledTextCtrl_SearchAnchor, 3262).
--define(wxStyledTextCtrl_SearchNext, 3263).
--define(wxStyledTextCtrl_SearchPrev, 3264).
--define(wxStyledTextCtrl_LinesOnScreen, 3265).
--define(wxStyledTextCtrl_UsePopUp, 3266).
--define(wxStyledTextCtrl_SelectionIsRectangle, 3267).
--define(wxStyledTextCtrl_SetZoom, 3268).
--define(wxStyledTextCtrl_GetZoom, 3269).
--define(wxStyledTextCtrl_GetModEventMask, 3270).
--define(wxStyledTextCtrl_SetSTCFocus, 3271).
--define(wxStyledTextCtrl_GetSTCFocus, 3272).
--define(wxStyledTextCtrl_SetStatus, 3273).
--define(wxStyledTextCtrl_GetStatus, 3274).
--define(wxStyledTextCtrl_SetMouseDownCaptures, 3275).
--define(wxStyledTextCtrl_GetMouseDownCaptures, 3276).
--define(wxStyledTextCtrl_SetSTCCursor, 3277).
--define(wxStyledTextCtrl_GetSTCCursor, 3278).
--define(wxStyledTextCtrl_SetControlCharSymbol, 3279).
--define(wxStyledTextCtrl_GetControlCharSymbol, 3280).
--define(wxStyledTextCtrl_WordPartLeft, 3281).
--define(wxStyledTextCtrl_WordPartLeftExtend, 3282).
--define(wxStyledTextCtrl_WordPartRight, 3283).
--define(wxStyledTextCtrl_WordPartRightExtend, 3284).
--define(wxStyledTextCtrl_SetVisiblePolicy, 3285).
--define(wxStyledTextCtrl_DelLineLeft, 3286).
--define(wxStyledTextCtrl_DelLineRight, 3287).
--define(wxStyledTextCtrl_GetXOffset, 3288).
--define(wxStyledTextCtrl_ChooseCaretX, 3289).
--define(wxStyledTextCtrl_SetXCaretPolicy, 3290).
--define(wxStyledTextCtrl_SetYCaretPolicy, 3291).
--define(wxStyledTextCtrl_GetPrintWrapMode, 3292).
--define(wxStyledTextCtrl_SetHotspotActiveForeground, 3293).
--define(wxStyledTextCtrl_SetHotspotActiveBackground, 3294).
--define(wxStyledTextCtrl_SetHotspotActiveUnderline, 3295).
--define(wxStyledTextCtrl_SetHotspotSingleLine, 3296).
--define(wxStyledTextCtrl_ParaDownExtend, 3297).
--define(wxStyledTextCtrl_ParaUp, 3298).
--define(wxStyledTextCtrl_ParaUpExtend, 3299).
--define(wxStyledTextCtrl_PositionBefore, 3300).
--define(wxStyledTextCtrl_PositionAfter, 3301).
--define(wxStyledTextCtrl_CopyRange, 3302).
--define(wxStyledTextCtrl_CopyText, 3303).
--define(wxStyledTextCtrl_SetSelectionMode, 3304).
--define(wxStyledTextCtrl_GetSelectionMode, 3305).
--define(wxStyledTextCtrl_LineDownRectExtend, 3306).
--define(wxStyledTextCtrl_LineUpRectExtend, 3307).
--define(wxStyledTextCtrl_CharLeftRectExtend, 3308).
--define(wxStyledTextCtrl_CharRightRectExtend, 3309).
--define(wxStyledTextCtrl_HomeRectExtend, 3310).
--define(wxStyledTextCtrl_VCHomeRectExtend, 3311).
--define(wxStyledTextCtrl_LineEndRectExtend, 3312).
--define(wxStyledTextCtrl_PageUpRectExtend, 3313).
--define(wxStyledTextCtrl_PageDownRectExtend, 3314).
--define(wxStyledTextCtrl_StutteredPageUp, 3315).
--define(wxStyledTextCtrl_StutteredPageUpExtend, 3316).
--define(wxStyledTextCtrl_StutteredPageDown, 3317).
--define(wxStyledTextCtrl_StutteredPageDownExtend, 3318).
--define(wxStyledTextCtrl_WordLeftEnd, 3319).
--define(wxStyledTextCtrl_WordLeftEndExtend, 3320).
--define(wxStyledTextCtrl_WordRightEnd, 3321).
--define(wxStyledTextCtrl_WordRightEndExtend, 3322).
--define(wxStyledTextCtrl_SetWhitespaceChars, 3323).
--define(wxStyledTextCtrl_SetCharsDefault, 3324).
--define(wxStyledTextCtrl_AutoCompGetCurrent, 3325).
--define(wxStyledTextCtrl_Allocate, 3326).
--define(wxStyledTextCtrl_FindColumn, 3327).
--define(wxStyledTextCtrl_GetCaretSticky, 3328).
--define(wxStyledTextCtrl_SetCaretSticky, 3329).
--define(wxStyledTextCtrl_ToggleCaretSticky, 3330).
--define(wxStyledTextCtrl_SetPasteConvertEndings, 3331).
--define(wxStyledTextCtrl_GetPasteConvertEndings, 3332).
--define(wxStyledTextCtrl_SelectionDuplicate, 3333).
--define(wxStyledTextCtrl_SetCaretLineBackAlpha, 3334).
--define(wxStyledTextCtrl_GetCaretLineBackAlpha, 3335).
--define(wxStyledTextCtrl_StartRecord, 3336).
--define(wxStyledTextCtrl_StopRecord, 3337).
--define(wxStyledTextCtrl_SetLexer, 3338).
--define(wxStyledTextCtrl_GetLexer, 3339).
--define(wxStyledTextCtrl_Colourise, 3340).
--define(wxStyledTextCtrl_SetProperty, 3341).
--define(wxStyledTextCtrl_SetKeyWords, 3342).
--define(wxStyledTextCtrl_SetLexerLanguage, 3343).
--define(wxStyledTextCtrl_GetProperty, 3344).
--define(wxStyledTextCtrl_GetStyleBitsNeeded, 3345).
--define(wxStyledTextCtrl_GetCurrentLine, 3346).
--define(wxStyledTextCtrl_StyleSetSpec, 3347).
--define(wxStyledTextCtrl_StyleSetFont, 3348).
--define(wxStyledTextCtrl_StyleSetFontAttr, 3349).
--define(wxStyledTextCtrl_StyleSetCharacterSet, 3350).
--define(wxStyledTextCtrl_StyleSetFontEncoding, 3351).
--define(wxStyledTextCtrl_CmdKeyExecute, 3352).
--define(wxStyledTextCtrl_SetMargins, 3353).
--define(wxStyledTextCtrl_GetSelection, 3354).
--define(wxStyledTextCtrl_PointFromPosition, 3355).
--define(wxStyledTextCtrl_ScrollToLine, 3356).
--define(wxStyledTextCtrl_ScrollToColumn, 3357).
--define(wxStyledTextCtrl_SendMsg, 3358).
--define(wxStyledTextCtrl_SetVScrollBar, 3359).
--define(wxStyledTextCtrl_SetHScrollBar, 3360).
--define(wxStyledTextCtrl_GetLastKeydownProcessed, 3361).
--define(wxStyledTextCtrl_SetLastKeydownProcessed, 3362).
--define(wxStyledTextCtrl_SaveFile, 3363).
--define(wxStyledTextCtrl_LoadFile, 3364).
--define(wxStyledTextCtrl_DoDragOver, 3365).
--define(wxStyledTextCtrl_DoDropText, 3366).
--define(wxStyledTextCtrl_GetUseAntiAliasing, 3367).
--define(wxStyledTextCtrl_AddTextRaw, 3368).
--define(wxStyledTextCtrl_InsertTextRaw, 3369).
--define(wxStyledTextCtrl_GetCurLineRaw, 3370).
--define(wxStyledTextCtrl_GetLineRaw, 3371).
--define(wxStyledTextCtrl_GetSelectedTextRaw, 3372).
--define(wxStyledTextCtrl_GetTextRangeRaw, 3373).
--define(wxStyledTextCtrl_SetTextRaw, 3374).
--define(wxStyledTextCtrl_GetTextRaw, 3375).
--define(wxStyledTextCtrl_AppendTextRaw, 3376).
--define(wxArtProvider_GetBitmap, 3377).
--define(wxArtProvider_GetIcon, 3378).
--define(wxTreeEvent_GetKeyCode, 3379).
--define(wxTreeEvent_GetItem, 3380).
--define(wxTreeEvent_GetKeyEvent, 3381).
--define(wxTreeEvent_GetLabel, 3382).
--define(wxTreeEvent_GetOldItem, 3383).
--define(wxTreeEvent_GetPoint, 3384).
--define(wxTreeEvent_IsEditCancelled, 3385).
--define(wxTreeEvent_SetToolTip, 3386).
--define(wxNotebookEvent_GetOldSelection, 3387).
--define(wxNotebookEvent_GetSelection, 3388).
--define(wxNotebookEvent_SetOldSelection, 3389).
--define(wxNotebookEvent_SetSelection, 3390).
--define(wxFileDataObject_new, 3391).
--define(wxFileDataObject_AddFile, 3392).
--define(wxFileDataObject_GetFilenames, 3393).
--define(wxFileDataObject_destroy, 3394).
--define(wxTextDataObject_new, 3395).
--define(wxTextDataObject_GetTextLength, 3396).
--define(wxTextDataObject_GetText, 3397).
--define(wxTextDataObject_SetText, 3398).
--define(wxTextDataObject_destroy, 3399).
--define(wxBitmapDataObject_new_1_1, 3400).
--define(wxBitmapDataObject_new_1_0, 3401).
--define(wxBitmapDataObject_GetBitmap, 3402).
--define(wxBitmapDataObject_SetBitmap, 3403).
--define(wxBitmapDataObject_destroy, 3404).
--define(wxClipboard_new, 3406).
--define(wxClipboard_destruct, 3407).
--define(wxClipboard_AddData, 3408).
--define(wxClipboard_Clear, 3409).
--define(wxClipboard_Close, 3410).
--define(wxClipboard_Flush, 3411).
--define(wxClipboard_GetData, 3412).
--define(wxClipboard_IsOpened, 3413).
--define(wxClipboard_Open, 3414).
--define(wxClipboard_SetData, 3415).
--define(wxClipboard_UsePrimarySelection, 3417).
--define(wxClipboard_IsSupported, 3418).
--define(wxClipboard_Get, 3419).
--define(wxSpinEvent_GetPosition, 3420).
--define(wxSpinEvent_SetPosition, 3421).
--define(wxSplitterWindow_new_0, 3422).
--define(wxSplitterWindow_new_2, 3423).
--define(wxSplitterWindow_destruct, 3424).
--define(wxSplitterWindow_Create, 3425).
--define(wxSplitterWindow_GetMinimumPaneSize, 3426).
--define(wxSplitterWindow_GetSashGravity, 3427).
--define(wxSplitterWindow_GetSashPosition, 3428).
--define(wxSplitterWindow_GetSplitMode, 3429).
--define(wxSplitterWindow_GetWindow1, 3430).
--define(wxSplitterWindow_GetWindow2, 3431).
--define(wxSplitterWindow_Initialize, 3432).
--define(wxSplitterWindow_IsSplit, 3433).
--define(wxSplitterWindow_ReplaceWindow, 3434).
--define(wxSplitterWindow_SetSashGravity, 3435).
--define(wxSplitterWindow_SetSashPosition, 3436).
--define(wxSplitterWindow_SetSashSize, 3437).
--define(wxSplitterWindow_SetMinimumPaneSize, 3438).
--define(wxSplitterWindow_SetSplitMode, 3439).
--define(wxSplitterWindow_SplitHorizontally, 3440).
--define(wxSplitterWindow_SplitVertically, 3441).
--define(wxSplitterWindow_Unsplit, 3442).
--define(wxSplitterWindow_UpdateSize, 3443).
--define(wxSplitterEvent_GetSashPosition, 3444).
--define(wxSplitterEvent_GetX, 3445).
--define(wxSplitterEvent_GetY, 3446).
--define(wxSplitterEvent_GetWindowBeingRemoved, 3447).
--define(wxSplitterEvent_SetSashPosition, 3448).
--define(wxHtmlWindow_new_0, 3449).
--define(wxHtmlWindow_new_2, 3450).
--define(wxHtmlWindow_AppendToPage, 3451).
--define(wxHtmlWindow_GetOpenedAnchor, 3452).
--define(wxHtmlWindow_GetOpenedPage, 3453).
--define(wxHtmlWindow_GetOpenedPageTitle, 3454).
--define(wxHtmlWindow_GetRelatedFrame, 3455).
--define(wxHtmlWindow_HistoryBack, 3456).
--define(wxHtmlWindow_HistoryCanBack, 3457).
--define(wxHtmlWindow_HistoryCanForward, 3458).
--define(wxHtmlWindow_HistoryClear, 3459).
--define(wxHtmlWindow_HistoryForward, 3460).
--define(wxHtmlWindow_LoadFile, 3461).
--define(wxHtmlWindow_LoadPage, 3462).
--define(wxHtmlWindow_SelectAll, 3463).
--define(wxHtmlWindow_SelectionToText, 3464).
--define(wxHtmlWindow_SelectLine, 3465).
--define(wxHtmlWindow_SelectWord, 3466).
--define(wxHtmlWindow_SetBorders, 3467).
--define(wxHtmlWindow_SetFonts, 3468).
--define(wxHtmlWindow_SetPage, 3469).
--define(wxHtmlWindow_SetRelatedFrame, 3470).
--define(wxHtmlWindow_SetRelatedStatusBar, 3471).
--define(wxHtmlWindow_ToText, 3472).
--define(wxHtmlWindow_destroy, 3473).
--define(wxHtmlLinkEvent_GetLinkInfo, 3474).
--define(wxAuiNotebookEvent_SetSelection, 3475).
--define(wxAuiNotebookEvent_GetSelection, 3476).
--define(wxAuiNotebookEvent_SetOldSelection, 3477).
--define(wxAuiNotebookEvent_GetOldSelection, 3478).
--define(wxAuiNotebookEvent_SetDragSource, 3479).
--define(wxAuiNotebookEvent_GetDragSource, 3480).
--define(wxAuiManagerEvent_SetManager, 3481).
--define(wxAuiManagerEvent_GetManager, 3482).
--define(wxAuiManagerEvent_SetPane, 3483).
--define(wxAuiManagerEvent_GetPane, 3484).
--define(wxAuiManagerEvent_SetButton, 3485).
--define(wxAuiManagerEvent_GetButton, 3486).
--define(wxAuiManagerEvent_SetDC, 3487).
--define(wxAuiManagerEvent_GetDC, 3488).
--define(wxAuiManagerEvent_Veto, 3489).
--define(wxAuiManagerEvent_GetVeto, 3490).
--define(wxAuiManagerEvent_SetCanVeto, 3491).
--define(wxAuiManagerEvent_CanVeto, 3492).
--define(wxLogNull_new, 3493).
--define(wxLogNull_destroy, 3494).
+-define(wxTreeCtrl_EditLabel, 2010).
+-define(wxTreeCtrl_EnsureVisible, 2011).
+-define(wxTreeCtrl_Expand, 2012).
+-define(wxTreeCtrl_GetBoundingRect, 2013).
+-define(wxTreeCtrl_GetChildrenCount, 2015).
+-define(wxTreeCtrl_GetCount, 2016).
+-define(wxTreeCtrl_GetEditControl, 2017).
+-define(wxTreeCtrl_GetFirstChild, 2018).
+-define(wxTreeCtrl_GetNextChild, 2019).
+-define(wxTreeCtrl_GetFirstVisibleItem, 2020).
+-define(wxTreeCtrl_GetImageList, 2021).
+-define(wxTreeCtrl_GetIndent, 2022).
+-define(wxTreeCtrl_GetItemBackgroundColour, 2023).
+-define(wxTreeCtrl_GetItemData, 2024).
+-define(wxTreeCtrl_GetItemFont, 2025).
+-define(wxTreeCtrl_GetItemImage_1, 2026).
+-define(wxTreeCtrl_GetItemImage_2, 2027).
+-define(wxTreeCtrl_GetItemText, 2028).
+-define(wxTreeCtrl_GetItemTextColour, 2029).
+-define(wxTreeCtrl_GetLastChild, 2030).
+-define(wxTreeCtrl_GetNextSibling, 2031).
+-define(wxTreeCtrl_GetNextVisible, 2032).
+-define(wxTreeCtrl_GetItemParent, 2033).
+-define(wxTreeCtrl_GetPrevSibling, 2034).
+-define(wxTreeCtrl_GetPrevVisible, 2035).
+-define(wxTreeCtrl_GetRootItem, 2036).
+-define(wxTreeCtrl_GetSelection, 2037).
+-define(wxTreeCtrl_GetSelections, 2038).
+-define(wxTreeCtrl_GetStateImageList, 2039).
+-define(wxTreeCtrl_HitTest, 2040).
+-define(wxTreeCtrl_InsertItem, 2042).
+-define(wxTreeCtrl_IsBold, 2043).
+-define(wxTreeCtrl_IsExpanded, 2044).
+-define(wxTreeCtrl_IsSelected, 2045).
+-define(wxTreeCtrl_IsVisible, 2046).
+-define(wxTreeCtrl_ItemHasChildren, 2047).
+-define(wxTreeCtrl_PrependItem, 2048).
+-define(wxTreeCtrl_ScrollTo, 2049).
+-define(wxTreeCtrl_SelectItem_1, 2050).
+-define(wxTreeCtrl_SelectItem_2, 2051).
+-define(wxTreeCtrl_SetIndent, 2052).
+-define(wxTreeCtrl_SetImageList, 2053).
+-define(wxTreeCtrl_SetItemBackgroundColour, 2054).
+-define(wxTreeCtrl_SetItemBold, 2055).
+-define(wxTreeCtrl_SetItemData, 2056).
+-define(wxTreeCtrl_SetItemDropHighlight, 2057).
+-define(wxTreeCtrl_SetItemFont, 2058).
+-define(wxTreeCtrl_SetItemHasChildren, 2059).
+-define(wxTreeCtrl_SetItemImage_2, 2060).
+-define(wxTreeCtrl_SetItemImage_3, 2061).
+-define(wxTreeCtrl_SetItemText, 2062).
+-define(wxTreeCtrl_SetItemTextColour, 2063).
+-define(wxTreeCtrl_SetStateImageList, 2064).
+-define(wxTreeCtrl_SetWindowStyle, 2065).
+-define(wxTreeCtrl_SortChildren, 2066).
+-define(wxTreeCtrl_Toggle, 2067).
+-define(wxTreeCtrl_ToggleItemSelection, 2068).
+-define(wxTreeCtrl_Unselect, 2069).
+-define(wxTreeCtrl_UnselectAll, 2070).
+-define(wxTreeCtrl_UnselectItem, 2071).
+-define(wxScrollBar_new_0, 2072).
+-define(wxScrollBar_new_3, 2073).
+-define(wxScrollBar_destruct, 2074).
+-define(wxScrollBar_Create, 2075).
+-define(wxScrollBar_GetRange, 2076).
+-define(wxScrollBar_GetPageSize, 2077).
+-define(wxScrollBar_GetThumbPosition, 2078).
+-define(wxScrollBar_GetThumbSize, 2079).
+-define(wxScrollBar_SetThumbPosition, 2080).
+-define(wxScrollBar_SetScrollbar, 2081).
+-define(wxSpinButton_new_2, 2083).
+-define(wxSpinButton_new_0, 2084).
+-define(wxSpinButton_Create, 2085).
+-define(wxSpinButton_GetMax, 2086).
+-define(wxSpinButton_GetMin, 2087).
+-define(wxSpinButton_GetValue, 2088).
+-define(wxSpinButton_SetRange, 2089).
+-define(wxSpinButton_SetValue, 2090).
+-define(wxSpinButton_destroy, 2091).
+-define(wxSpinCtrl_new_0, 2092).
+-define(wxSpinCtrl_new_2, 2093).
+-define(wxSpinCtrl_Create, 2095).
+-define(wxSpinCtrl_SetValue_1_1, 2098).
+-define(wxSpinCtrl_SetValue_1_0, 2099).
+-define(wxSpinCtrl_GetValue, 2101).
+-define(wxSpinCtrl_SetRange, 2103).
+-define(wxSpinCtrl_SetSelection, 2104).
+-define(wxSpinCtrl_GetMin, 2106).
+-define(wxSpinCtrl_GetMax, 2108).
+-define(wxSpinCtrl_destroy, 2109).
+-define(wxStaticText_new_0, 2110).
+-define(wxStaticText_new_4, 2111).
+-define(wxStaticText_Create, 2112).
+-define(wxStaticText_GetLabel, 2113).
+-define(wxStaticText_SetLabel, 2114).
+-define(wxStaticText_Wrap, 2115).
+-define(wxStaticText_destroy, 2116).
+-define(wxStaticBitmap_new_0, 2117).
+-define(wxStaticBitmap_new_4, 2118).
+-define(wxStaticBitmap_Create, 2119).
+-define(wxStaticBitmap_GetBitmap, 2120).
+-define(wxStaticBitmap_SetBitmap, 2121).
+-define(wxStaticBitmap_destroy, 2122).
+-define(wxRadioBox_new, 2123).
+-define(wxRadioBox_destruct, 2125).
+-define(wxRadioBox_Create, 2126).
+-define(wxRadioBox_Enable_2, 2127).
+-define(wxRadioBox_Enable_1, 2128).
+-define(wxRadioBox_GetSelection, 2129).
+-define(wxRadioBox_GetString, 2130).
+-define(wxRadioBox_SetSelection, 2131).
+-define(wxRadioBox_Show_2, 2132).
+-define(wxRadioBox_Show_1, 2133).
+-define(wxRadioBox_GetColumnCount, 2134).
+-define(wxRadioBox_GetItemHelpText, 2135).
+-define(wxRadioBox_GetItemToolTip, 2136).
+-define(wxRadioBox_GetItemFromPoint, 2138).
+-define(wxRadioBox_GetRowCount, 2139).
+-define(wxRadioBox_IsItemEnabled, 2140).
+-define(wxRadioBox_IsItemShown, 2141).
+-define(wxRadioBox_SetItemHelpText, 2142).
+-define(wxRadioBox_SetItemToolTip, 2143).
+-define(wxRadioButton_new_0, 2144).
+-define(wxRadioButton_new_4, 2145).
+-define(wxRadioButton_Create, 2146).
+-define(wxRadioButton_GetValue, 2147).
+-define(wxRadioButton_SetValue, 2148).
+-define(wxRadioButton_destroy, 2149).
+-define(wxSlider_new_6, 2151).
+-define(wxSlider_new_0, 2152).
+-define(wxSlider_Create, 2153).
+-define(wxSlider_GetLineSize, 2154).
+-define(wxSlider_GetMax, 2155).
+-define(wxSlider_GetMin, 2156).
+-define(wxSlider_GetPageSize, 2157).
+-define(wxSlider_GetThumbLength, 2158).
+-define(wxSlider_GetValue, 2159).
+-define(wxSlider_SetLineSize, 2160).
+-define(wxSlider_SetPageSize, 2161).
+-define(wxSlider_SetRange, 2162).
+-define(wxSlider_SetThumbLength, 2163).
+-define(wxSlider_SetValue, 2164).
+-define(wxSlider_destroy, 2165).
+-define(wxDialog_new_4, 2167).
+-define(wxDialog_new_0, 2168).
+-define(wxDialog_destruct, 2170).
+-define(wxDialog_Create, 2171).
+-define(wxDialog_CreateButtonSizer, 2172).
+-define(wxDialog_CreateStdDialogButtonSizer, 2173).
+-define(wxDialog_EndModal, 2174).
+-define(wxDialog_GetAffirmativeId, 2175).
+-define(wxDialog_GetReturnCode, 2176).
+-define(wxDialog_IsModal, 2177).
+-define(wxDialog_SetAffirmativeId, 2178).
+-define(wxDialog_SetReturnCode, 2179).
+-define(wxDialog_Show, 2180).
+-define(wxDialog_ShowModal, 2181).
+-define(wxColourDialog_new_0, 2182).
+-define(wxColourDialog_new_2, 2183).
+-define(wxColourDialog_destruct, 2184).
+-define(wxColourDialog_Create, 2185).
+-define(wxColourDialog_GetColourData, 2186).
+-define(wxColourData_new_0, 2187).
+-define(wxColourData_new_1, 2188).
+-define(wxColourData_destruct, 2189).
+-define(wxColourData_GetChooseFull, 2190).
+-define(wxColourData_GetColour, 2191).
+-define(wxColourData_GetCustomColour, 2193).
+-define(wxColourData_SetChooseFull, 2194).
+-define(wxColourData_SetColour, 2195).
+-define(wxColourData_SetCustomColour, 2196).
+-define(wxPalette_new_0, 2197).
+-define(wxPalette_new_4, 2198).
+-define(wxPalette_destruct, 2200).
+-define(wxPalette_Create, 2201).
+-define(wxPalette_GetColoursCount, 2202).
+-define(wxPalette_GetPixel, 2203).
+-define(wxPalette_GetRGB, 2204).
+-define(wxPalette_IsOk, 2205).
+-define(wxDirDialog_new, 2209).
+-define(wxDirDialog_destruct, 2210).
+-define(wxDirDialog_GetPath, 2211).
+-define(wxDirDialog_GetMessage, 2212).
+-define(wxDirDialog_SetMessage, 2213).
+-define(wxDirDialog_SetPath, 2214).
+-define(wxFileDialog_new, 2218).
+-define(wxFileDialog_destruct, 2219).
+-define(wxFileDialog_GetDirectory, 2220).
+-define(wxFileDialog_GetFilename, 2221).
+-define(wxFileDialog_GetFilenames, 2222).
+-define(wxFileDialog_GetFilterIndex, 2223).
+-define(wxFileDialog_GetMessage, 2224).
+-define(wxFileDialog_GetPath, 2225).
+-define(wxFileDialog_GetPaths, 2226).
+-define(wxFileDialog_GetWildcard, 2227).
+-define(wxFileDialog_SetDirectory, 2228).
+-define(wxFileDialog_SetFilename, 2229).
+-define(wxFileDialog_SetFilterIndex, 2230).
+-define(wxFileDialog_SetMessage, 2231).
+-define(wxFileDialog_SetPath, 2232).
+-define(wxFileDialog_SetWildcard, 2233).
+-define(wxPickerBase_SetInternalMargin, 2234).
+-define(wxPickerBase_GetInternalMargin, 2235).
+-define(wxPickerBase_SetTextCtrlProportion, 2236).
+-define(wxPickerBase_SetPickerCtrlProportion, 2237).
+-define(wxPickerBase_GetTextCtrlProportion, 2238).
+-define(wxPickerBase_GetPickerCtrlProportion, 2239).
+-define(wxPickerBase_HasTextCtrl, 2240).
+-define(wxPickerBase_GetTextCtrl, 2241).
+-define(wxPickerBase_IsTextCtrlGrowable, 2242).
+-define(wxPickerBase_SetPickerCtrlGrowable, 2243).
+-define(wxPickerBase_SetTextCtrlGrowable, 2244).
+-define(wxPickerBase_IsPickerCtrlGrowable, 2245).
+-define(wxFilePickerCtrl_new_0, 2246).
+-define(wxFilePickerCtrl_new_3, 2247).
+-define(wxFilePickerCtrl_Create, 2248).
+-define(wxFilePickerCtrl_GetPath, 2249).
+-define(wxFilePickerCtrl_SetPath, 2250).
+-define(wxFilePickerCtrl_destroy, 2251).
+-define(wxDirPickerCtrl_new_0, 2252).
+-define(wxDirPickerCtrl_new_3, 2253).
+-define(wxDirPickerCtrl_Create, 2254).
+-define(wxDirPickerCtrl_GetPath, 2255).
+-define(wxDirPickerCtrl_SetPath, 2256).
+-define(wxDirPickerCtrl_destroy, 2257).
+-define(wxColourPickerCtrl_new_0, 2258).
+-define(wxColourPickerCtrl_new_3, 2259).
+-define(wxColourPickerCtrl_Create, 2260).
+-define(wxColourPickerCtrl_GetColour, 2261).
+-define(wxColourPickerCtrl_SetColour_1_1, 2262).
+-define(wxColourPickerCtrl_SetColour_1_0, 2263).
+-define(wxColourPickerCtrl_destroy, 2264).
+-define(wxDatePickerCtrl_new_0, 2265).
+-define(wxDatePickerCtrl_new_3, 2266).
+-define(wxDatePickerCtrl_GetRange, 2267).
+-define(wxDatePickerCtrl_GetValue, 2268).
+-define(wxDatePickerCtrl_SetRange, 2269).
+-define(wxDatePickerCtrl_SetValue, 2270).
+-define(wxDatePickerCtrl_destroy, 2271).
+-define(wxFontPickerCtrl_new_0, 2272).
+-define(wxFontPickerCtrl_new_3, 2273).
+-define(wxFontPickerCtrl_Create, 2274).
+-define(wxFontPickerCtrl_GetSelectedFont, 2275).
+-define(wxFontPickerCtrl_SetSelectedFont, 2276).
+-define(wxFontPickerCtrl_GetMaxPointSize, 2277).
+-define(wxFontPickerCtrl_SetMaxPointSize, 2278).
+-define(wxFontPickerCtrl_destroy, 2279).
+-define(wxFindReplaceDialog_new_0, 2282).
+-define(wxFindReplaceDialog_new_4, 2283).
+-define(wxFindReplaceDialog_destruct, 2284).
+-define(wxFindReplaceDialog_Create, 2285).
+-define(wxFindReplaceDialog_GetData, 2286).
+-define(wxFindReplaceData_new_0, 2287).
+-define(wxFindReplaceData_new_1, 2288).
+-define(wxFindReplaceData_GetFindString, 2289).
+-define(wxFindReplaceData_GetReplaceString, 2290).
+-define(wxFindReplaceData_GetFlags, 2291).
+-define(wxFindReplaceData_SetFlags, 2292).
+-define(wxFindReplaceData_SetFindString, 2293).
+-define(wxFindReplaceData_SetReplaceString, 2294).
+-define(wxFindReplaceData_destroy, 2295).
+-define(wxMultiChoiceDialog_new_0, 2296).
+-define(wxMultiChoiceDialog_new_5, 2298).
+-define(wxMultiChoiceDialog_GetSelections, 2299).
+-define(wxMultiChoiceDialog_SetSelections, 2300).
+-define(wxMultiChoiceDialog_destroy, 2301).
+-define(wxSingleChoiceDialog_new_0, 2302).
+-define(wxSingleChoiceDialog_new_5, 2304).
+-define(wxSingleChoiceDialog_GetSelection, 2305).
+-define(wxSingleChoiceDialog_GetStringSelection, 2306).
+-define(wxSingleChoiceDialog_SetSelection, 2307).
+-define(wxSingleChoiceDialog_destroy, 2308).
+-define(wxTextEntryDialog_new, 2309).
+-define(wxTextEntryDialog_GetValue, 2310).
+-define(wxTextEntryDialog_SetValue, 2311).
+-define(wxTextEntryDialog_destroy, 2312).
+-define(wxPasswordEntryDialog_new, 2313).
+-define(wxPasswordEntryDialog_destroy, 2314).
+-define(wxFontData_new_0, 2315).
+-define(wxFontData_new_1, 2316).
+-define(wxFontData_destruct, 2317).
+-define(wxFontData_EnableEffects, 2318).
+-define(wxFontData_GetAllowSymbols, 2319).
+-define(wxFontData_GetColour, 2320).
+-define(wxFontData_GetChosenFont, 2321).
+-define(wxFontData_GetEnableEffects, 2322).
+-define(wxFontData_GetInitialFont, 2323).
+-define(wxFontData_GetShowHelp, 2324).
+-define(wxFontData_SetAllowSymbols, 2325).
+-define(wxFontData_SetChosenFont, 2326).
+-define(wxFontData_SetColour, 2327).
+-define(wxFontData_SetInitialFont, 2328).
+-define(wxFontData_SetRange, 2329).
+-define(wxFontData_SetShowHelp, 2330).
+-define(wxFontDialog_new_0, 2334).
+-define(wxFontDialog_new_2, 2336).
+-define(wxFontDialog_Create, 2338).
+-define(wxFontDialog_GetFontData, 2339).
+-define(wxFontDialog_destroy, 2341).
+-define(wxProgressDialog_new, 2342).
+-define(wxProgressDialog_destruct, 2343).
+-define(wxProgressDialog_Resume, 2344).
+-define(wxProgressDialog_Update_2, 2345).
+-define(wxProgressDialog_Update_0, 2346).
+-define(wxMessageDialog_new, 2347).
+-define(wxMessageDialog_destruct, 2348).
+-define(wxPageSetupDialog_new, 2349).
+-define(wxPageSetupDialog_destruct, 2350).
+-define(wxPageSetupDialog_GetPageSetupData, 2351).
+-define(wxPageSetupDialog_ShowModal, 2352).
+-define(wxPageSetupDialogData_new_0, 2353).
+-define(wxPageSetupDialogData_new_1_0, 2354).
+-define(wxPageSetupDialogData_new_1_1, 2355).
+-define(wxPageSetupDialogData_destruct, 2356).
+-define(wxPageSetupDialogData_EnableHelp, 2357).
+-define(wxPageSetupDialogData_EnableMargins, 2358).
+-define(wxPageSetupDialogData_EnableOrientation, 2359).
+-define(wxPageSetupDialogData_EnablePaper, 2360).
+-define(wxPageSetupDialogData_EnablePrinter, 2361).
+-define(wxPageSetupDialogData_GetDefaultMinMargins, 2362).
+-define(wxPageSetupDialogData_GetEnableMargins, 2363).
+-define(wxPageSetupDialogData_GetEnableOrientation, 2364).
+-define(wxPageSetupDialogData_GetEnablePaper, 2365).
+-define(wxPageSetupDialogData_GetEnablePrinter, 2366).
+-define(wxPageSetupDialogData_GetEnableHelp, 2367).
+-define(wxPageSetupDialogData_GetDefaultInfo, 2368).
+-define(wxPageSetupDialogData_GetMarginTopLeft, 2369).
+-define(wxPageSetupDialogData_GetMarginBottomRight, 2370).
+-define(wxPageSetupDialogData_GetMinMarginTopLeft, 2371).
+-define(wxPageSetupDialogData_GetMinMarginBottomRight, 2372).
+-define(wxPageSetupDialogData_GetPaperId, 2373).
+-define(wxPageSetupDialogData_GetPaperSize, 2374).
+-define(wxPageSetupDialogData_GetPrintData, 2376).
+-define(wxPageSetupDialogData_IsOk, 2377).
+-define(wxPageSetupDialogData_SetDefaultInfo, 2378).
+-define(wxPageSetupDialogData_SetDefaultMinMargins, 2379).
+-define(wxPageSetupDialogData_SetMarginTopLeft, 2380).
+-define(wxPageSetupDialogData_SetMarginBottomRight, 2381).
+-define(wxPageSetupDialogData_SetMinMarginTopLeft, 2382).
+-define(wxPageSetupDialogData_SetMinMarginBottomRight, 2383).
+-define(wxPageSetupDialogData_SetPaperId, 2384).
+-define(wxPageSetupDialogData_SetPaperSize_1_1, 2385).
+-define(wxPageSetupDialogData_SetPaperSize_1_0, 2386).
+-define(wxPageSetupDialogData_SetPrintData, 2387).
+-define(wxPrintDialog_new_2_0, 2388).
+-define(wxPrintDialog_new_2_1, 2389).
+-define(wxPrintDialog_destruct, 2390).
+-define(wxPrintDialog_GetPrintDialogData, 2391).
+-define(wxPrintDialog_GetPrintDC, 2392).
+-define(wxPrintDialogData_new_0, 2393).
+-define(wxPrintDialogData_new_1_1, 2394).
+-define(wxPrintDialogData_new_1_0, 2395).
+-define(wxPrintDialogData_destruct, 2396).
+-define(wxPrintDialogData_EnableHelp, 2397).
+-define(wxPrintDialogData_EnablePageNumbers, 2398).
+-define(wxPrintDialogData_EnablePrintToFile, 2399).
+-define(wxPrintDialogData_EnableSelection, 2400).
+-define(wxPrintDialogData_GetAllPages, 2401).
+-define(wxPrintDialogData_GetCollate, 2402).
+-define(wxPrintDialogData_GetFromPage, 2403).
+-define(wxPrintDialogData_GetMaxPage, 2404).
+-define(wxPrintDialogData_GetMinPage, 2405).
+-define(wxPrintDialogData_GetNoCopies, 2406).
+-define(wxPrintDialogData_GetPrintData, 2407).
+-define(wxPrintDialogData_GetPrintToFile, 2408).
+-define(wxPrintDialogData_GetSelection, 2409).
+-define(wxPrintDialogData_GetToPage, 2410).
+-define(wxPrintDialogData_IsOk, 2411).
+-define(wxPrintDialogData_SetCollate, 2412).
+-define(wxPrintDialogData_SetFromPage, 2413).
+-define(wxPrintDialogData_SetMaxPage, 2414).
+-define(wxPrintDialogData_SetMinPage, 2415).
+-define(wxPrintDialogData_SetNoCopies, 2416).
+-define(wxPrintDialogData_SetPrintData, 2417).
+-define(wxPrintDialogData_SetPrintToFile, 2418).
+-define(wxPrintDialogData_SetSelection, 2419).
+-define(wxPrintDialogData_SetToPage, 2420).
+-define(wxPrintData_new_0, 2421).
+-define(wxPrintData_new_1, 2422).
+-define(wxPrintData_destruct, 2423).
+-define(wxPrintData_GetCollate, 2424).
+-define(wxPrintData_GetBin, 2425).
+-define(wxPrintData_GetColour, 2426).
+-define(wxPrintData_GetDuplex, 2427).
+-define(wxPrintData_GetNoCopies, 2428).
+-define(wxPrintData_GetOrientation, 2429).
+-define(wxPrintData_GetPaperId, 2430).
+-define(wxPrintData_GetPrinterName, 2431).
+-define(wxPrintData_GetQuality, 2432).
+-define(wxPrintData_IsOk, 2433).
+-define(wxPrintData_SetBin, 2434).
+-define(wxPrintData_SetCollate, 2435).
+-define(wxPrintData_SetColour, 2436).
+-define(wxPrintData_SetDuplex, 2437).
+-define(wxPrintData_SetNoCopies, 2438).
+-define(wxPrintData_SetOrientation, 2439).
+-define(wxPrintData_SetPaperId, 2440).
+-define(wxPrintData_SetPrinterName, 2441).
+-define(wxPrintData_SetQuality, 2442).
+-define(wxPrintPreview_new_2, 2445).
+-define(wxPrintPreview_new_3, 2446).
+-define(wxPrintPreview_destruct, 2448).
+-define(wxPrintPreview_GetCanvas, 2449).
+-define(wxPrintPreview_GetCurrentPage, 2450).
+-define(wxPrintPreview_GetFrame, 2451).
+-define(wxPrintPreview_GetMaxPage, 2452).
+-define(wxPrintPreview_GetMinPage, 2453).
+-define(wxPrintPreview_GetPrintout, 2454).
+-define(wxPrintPreview_GetPrintoutForPrinting, 2455).
+-define(wxPrintPreview_IsOk, 2456).
+-define(wxPrintPreview_PaintPage, 2457).
+-define(wxPrintPreview_Print, 2458).
+-define(wxPrintPreview_RenderPage, 2459).
+-define(wxPrintPreview_SetCanvas, 2460).
+-define(wxPrintPreview_SetCurrentPage, 2461).
+-define(wxPrintPreview_SetFrame, 2462).
+-define(wxPrintPreview_SetPrintout, 2463).
+-define(wxPrintPreview_SetZoom, 2464).
+-define(wxPreviewFrame_new, 2465).
+-define(wxPreviewFrame_destruct, 2466).
+-define(wxPreviewFrame_CreateControlBar, 2467).
+-define(wxPreviewFrame_CreateCanvas, 2468).
+-define(wxPreviewFrame_Initialize, 2469).
+-define(wxPreviewFrame_OnCloseWindow, 2470).
+-define(wxPreviewControlBar_new, 2471).
+-define(wxPreviewControlBar_destruct, 2472).
+-define(wxPreviewControlBar_CreateButtons, 2473).
+-define(wxPreviewControlBar_GetPrintPreview, 2474).
+-define(wxPreviewControlBar_GetZoomControl, 2475).
+-define(wxPreviewControlBar_SetZoomControl, 2476).
+-define(wxPrinter_new, 2478).
+-define(wxPrinter_CreateAbortWindow, 2479).
+-define(wxPrinter_GetAbort, 2480).
+-define(wxPrinter_GetLastError, 2481).
+-define(wxPrinter_GetPrintDialogData, 2482).
+-define(wxPrinter_Print, 2483).
+-define(wxPrinter_PrintDialog, 2484).
+-define(wxPrinter_ReportError, 2485).
+-define(wxPrinter_Setup, 2486).
+-define(wxPrinter_destroy, 2487).
+-define(wxXmlResource_new_1, 2488).
+-define(wxXmlResource_new_2, 2489).
+-define(wxXmlResource_destruct, 2490).
+-define(wxXmlResource_AttachUnknownControl, 2491).
+-define(wxXmlResource_ClearHandlers, 2492).
+-define(wxXmlResource_CompareVersion, 2493).
+-define(wxXmlResource_Get, 2494).
+-define(wxXmlResource_GetFlags, 2495).
+-define(wxXmlResource_GetVersion, 2496).
+-define(wxXmlResource_GetXRCID, 2497).
+-define(wxXmlResource_InitAllHandlers, 2498).
+-define(wxXmlResource_Load, 2499).
+-define(wxXmlResource_LoadBitmap, 2500).
+-define(wxXmlResource_LoadDialog_2, 2501).
+-define(wxXmlResource_LoadDialog_3, 2502).
+-define(wxXmlResource_LoadFrame_2, 2503).
+-define(wxXmlResource_LoadFrame_3, 2504).
+-define(wxXmlResource_LoadIcon, 2505).
+-define(wxXmlResource_LoadMenu, 2506).
+-define(wxXmlResource_LoadMenuBar_2, 2507).
+-define(wxXmlResource_LoadMenuBar_1, 2508).
+-define(wxXmlResource_LoadPanel_2, 2509).
+-define(wxXmlResource_LoadPanel_3, 2510).
+-define(wxXmlResource_LoadToolBar, 2511).
+-define(wxXmlResource_Set, 2512).
+-define(wxXmlResource_SetFlags, 2513).
+-define(wxXmlResource_Unload, 2514).
+-define(wxXmlResource_xrcctrl, 2515).
+-define(wxHtmlEasyPrinting_new, 2516).
+-define(wxHtmlEasyPrinting_destruct, 2517).
+-define(wxHtmlEasyPrinting_GetPrintData, 2518).
+-define(wxHtmlEasyPrinting_GetPageSetupData, 2519).
+-define(wxHtmlEasyPrinting_PreviewFile, 2520).
+-define(wxHtmlEasyPrinting_PreviewText, 2521).
+-define(wxHtmlEasyPrinting_PrintFile, 2522).
+-define(wxHtmlEasyPrinting_PrintText, 2523).
+-define(wxHtmlEasyPrinting_PageSetup, 2524).
+-define(wxHtmlEasyPrinting_SetFonts, 2525).
+-define(wxHtmlEasyPrinting_SetHeader, 2526).
+-define(wxHtmlEasyPrinting_SetFooter, 2527).
+-define(wxGLCanvas_new_2, 2529).
+-define(wxGLCanvas_new_3_1, 2530).
+-define(wxGLCanvas_new_3_0, 2531).
+-define(wxGLCanvas_GetContext, 2532).
+-define(wxGLCanvas_SetCurrent, 2534).
+-define(wxGLCanvas_SwapBuffers, 2535).
+-define(wxGLCanvas_destroy, 2536).
+-define(wxAuiManager_new, 2537).
+-define(wxAuiManager_destruct, 2538).
+-define(wxAuiManager_AddPane_2_1, 2539).
+-define(wxAuiManager_AddPane_3, 2540).
+-define(wxAuiManager_AddPane_2_0, 2541).
+-define(wxAuiManager_DetachPane, 2542).
+-define(wxAuiManager_GetAllPanes, 2543).
+-define(wxAuiManager_GetArtProvider, 2544).
+-define(wxAuiManager_GetDockSizeConstraint, 2545).
+-define(wxAuiManager_GetFlags, 2546).
+-define(wxAuiManager_GetManagedWindow, 2547).
+-define(wxAuiManager_GetManager, 2548).
+-define(wxAuiManager_GetPane_1_1, 2549).
+-define(wxAuiManager_GetPane_1_0, 2550).
+-define(wxAuiManager_HideHint, 2551).
+-define(wxAuiManager_InsertPane, 2552).
+-define(wxAuiManager_LoadPaneInfo, 2553).
+-define(wxAuiManager_LoadPerspective, 2554).
+-define(wxAuiManager_SavePaneInfo, 2555).
+-define(wxAuiManager_SavePerspective, 2556).
+-define(wxAuiManager_SetArtProvider, 2557).
+-define(wxAuiManager_SetDockSizeConstraint, 2558).
+-define(wxAuiManager_SetFlags, 2559).
+-define(wxAuiManager_SetManagedWindow, 2560).
+-define(wxAuiManager_ShowHint, 2561).
+-define(wxAuiManager_UnInit, 2562).
+-define(wxAuiManager_Update, 2563).
+-define(wxAuiPaneInfo_new_0, 2564).
+-define(wxAuiPaneInfo_new_1, 2565).
+-define(wxAuiPaneInfo_destruct, 2566).
+-define(wxAuiPaneInfo_BestSize_1, 2567).
+-define(wxAuiPaneInfo_BestSize_2, 2568).
+-define(wxAuiPaneInfo_Bottom, 2569).
+-define(wxAuiPaneInfo_BottomDockable, 2570).
+-define(wxAuiPaneInfo_Caption, 2571).
+-define(wxAuiPaneInfo_CaptionVisible, 2572).
+-define(wxAuiPaneInfo_Centre, 2573).
+-define(wxAuiPaneInfo_CentrePane, 2574).
+-define(wxAuiPaneInfo_CloseButton, 2575).
+-define(wxAuiPaneInfo_DefaultPane, 2576).
+-define(wxAuiPaneInfo_DestroyOnClose, 2577).
+-define(wxAuiPaneInfo_Direction, 2578).
+-define(wxAuiPaneInfo_Dock, 2579).
+-define(wxAuiPaneInfo_Dockable, 2580).
+-define(wxAuiPaneInfo_Fixed, 2581).
+-define(wxAuiPaneInfo_Float, 2582).
+-define(wxAuiPaneInfo_Floatable, 2583).
+-define(wxAuiPaneInfo_FloatingPosition_1, 2584).
+-define(wxAuiPaneInfo_FloatingPosition_2, 2585).
+-define(wxAuiPaneInfo_FloatingSize_1, 2586).
+-define(wxAuiPaneInfo_FloatingSize_2, 2587).
+-define(wxAuiPaneInfo_Gripper, 2588).
+-define(wxAuiPaneInfo_GripperTop, 2589).
+-define(wxAuiPaneInfo_HasBorder, 2590).
+-define(wxAuiPaneInfo_HasCaption, 2591).
+-define(wxAuiPaneInfo_HasCloseButton, 2592).
+-define(wxAuiPaneInfo_HasFlag, 2593).
+-define(wxAuiPaneInfo_HasGripper, 2594).
+-define(wxAuiPaneInfo_HasGripperTop, 2595).
+-define(wxAuiPaneInfo_HasMaximizeButton, 2596).
+-define(wxAuiPaneInfo_HasMinimizeButton, 2597).
+-define(wxAuiPaneInfo_HasPinButton, 2598).
+-define(wxAuiPaneInfo_Hide, 2599).
+-define(wxAuiPaneInfo_IsBottomDockable, 2600).
+-define(wxAuiPaneInfo_IsDocked, 2601).
+-define(wxAuiPaneInfo_IsFixed, 2602).
+-define(wxAuiPaneInfo_IsFloatable, 2603).
+-define(wxAuiPaneInfo_IsFloating, 2604).
+-define(wxAuiPaneInfo_IsLeftDockable, 2605).
+-define(wxAuiPaneInfo_IsMovable, 2606).
+-define(wxAuiPaneInfo_IsOk, 2607).
+-define(wxAuiPaneInfo_IsResizable, 2608).
+-define(wxAuiPaneInfo_IsRightDockable, 2609).
+-define(wxAuiPaneInfo_IsShown, 2610).
+-define(wxAuiPaneInfo_IsToolbar, 2611).
+-define(wxAuiPaneInfo_IsTopDockable, 2612).
+-define(wxAuiPaneInfo_Layer, 2613).
+-define(wxAuiPaneInfo_Left, 2614).
+-define(wxAuiPaneInfo_LeftDockable, 2615).
+-define(wxAuiPaneInfo_MaxSize_1, 2616).
+-define(wxAuiPaneInfo_MaxSize_2, 2617).
+-define(wxAuiPaneInfo_MaximizeButton, 2618).
+-define(wxAuiPaneInfo_MinSize_1, 2619).
+-define(wxAuiPaneInfo_MinSize_2, 2620).
+-define(wxAuiPaneInfo_MinimizeButton, 2621).
+-define(wxAuiPaneInfo_Movable, 2622).
+-define(wxAuiPaneInfo_Name, 2623).
+-define(wxAuiPaneInfo_PaneBorder, 2624).
+-define(wxAuiPaneInfo_PinButton, 2625).
+-define(wxAuiPaneInfo_Position, 2626).
+-define(wxAuiPaneInfo_Resizable, 2627).
+-define(wxAuiPaneInfo_Right, 2628).
+-define(wxAuiPaneInfo_RightDockable, 2629).
+-define(wxAuiPaneInfo_Row, 2630).
+-define(wxAuiPaneInfo_SafeSet, 2631).
+-define(wxAuiPaneInfo_SetFlag, 2632).
+-define(wxAuiPaneInfo_Show, 2633).
+-define(wxAuiPaneInfo_ToolbarPane, 2634).
+-define(wxAuiPaneInfo_Top, 2635).
+-define(wxAuiPaneInfo_TopDockable, 2636).
+-define(wxAuiPaneInfo_Window, 2637).
+-define(wxAuiNotebook_new_0, 2638).
+-define(wxAuiNotebook_new_2, 2639).
+-define(wxAuiNotebook_AddPage, 2640).
+-define(wxAuiNotebook_Create, 2641).
+-define(wxAuiNotebook_DeletePage, 2642).
+-define(wxAuiNotebook_GetArtProvider, 2643).
+-define(wxAuiNotebook_GetPage, 2644).
+-define(wxAuiNotebook_GetPageBitmap, 2645).
+-define(wxAuiNotebook_GetPageCount, 2646).
+-define(wxAuiNotebook_GetPageIndex, 2647).
+-define(wxAuiNotebook_GetPageText, 2648).
+-define(wxAuiNotebook_GetSelection, 2649).
+-define(wxAuiNotebook_InsertPage, 2650).
+-define(wxAuiNotebook_RemovePage, 2651).
+-define(wxAuiNotebook_SetArtProvider, 2652).
+-define(wxAuiNotebook_SetFont, 2653).
+-define(wxAuiNotebook_SetPageBitmap, 2654).
+-define(wxAuiNotebook_SetPageText, 2655).
+-define(wxAuiNotebook_SetSelection, 2656).
+-define(wxAuiNotebook_SetTabCtrlHeight, 2657).
+-define(wxAuiNotebook_SetUniformBitmapSize, 2658).
+-define(wxAuiNotebook_destroy, 2659).
+-define(wxMDIParentFrame_new_0, 2660).
+-define(wxMDIParentFrame_new_4, 2661).
+-define(wxMDIParentFrame_destruct, 2662).
+-define(wxMDIParentFrame_ActivateNext, 2663).
+-define(wxMDIParentFrame_ActivatePrevious, 2664).
+-define(wxMDIParentFrame_ArrangeIcons, 2665).
+-define(wxMDIParentFrame_Cascade, 2666).
+-define(wxMDIParentFrame_Create, 2667).
+-define(wxMDIParentFrame_GetActiveChild, 2668).
+-define(wxMDIParentFrame_GetClientWindow, 2669).
+-define(wxMDIParentFrame_Tile, 2670).
+-define(wxMDIChildFrame_new_0, 2671).
+-define(wxMDIChildFrame_new_4, 2672).
+-define(wxMDIChildFrame_destruct, 2673).
+-define(wxMDIChildFrame_Activate, 2674).
+-define(wxMDIChildFrame_Create, 2675).
+-define(wxMDIChildFrame_Maximize, 2676).
+-define(wxMDIChildFrame_Restore, 2677).
+-define(wxMDIClientWindow_new_0, 2678).
+-define(wxMDIClientWindow_new_2, 2679).
+-define(wxMDIClientWindow_destruct, 2680).
+-define(wxMDIClientWindow_CreateClient, 2681).
+-define(wxLayoutAlgorithm_new, 2682).
+-define(wxLayoutAlgorithm_LayoutFrame, 2683).
+-define(wxLayoutAlgorithm_LayoutMDIFrame, 2684).
+-define(wxLayoutAlgorithm_LayoutWindow, 2685).
+-define(wxLayoutAlgorithm_destroy, 2686).
+-define(wxEvent_GetId, 2687).
+-define(wxEvent_GetSkipped, 2688).
+-define(wxEvent_GetTimestamp, 2689).
+-define(wxEvent_IsCommandEvent, 2690).
+-define(wxEvent_ResumePropagation, 2691).
+-define(wxEvent_ShouldPropagate, 2692).
+-define(wxEvent_Skip, 2693).
+-define(wxEvent_StopPropagation, 2694).
+-define(wxCommandEvent_getClientData, 2695).
+-define(wxCommandEvent_GetExtraLong, 2696).
+-define(wxCommandEvent_GetInt, 2697).
+-define(wxCommandEvent_GetSelection, 2698).
+-define(wxCommandEvent_GetString, 2699).
+-define(wxCommandEvent_IsChecked, 2700).
+-define(wxCommandEvent_IsSelection, 2701).
+-define(wxCommandEvent_SetInt, 2702).
+-define(wxCommandEvent_SetString, 2703).
+-define(wxScrollEvent_GetOrientation, 2704).
+-define(wxScrollEvent_GetPosition, 2705).
+-define(wxScrollWinEvent_GetOrientation, 2706).
+-define(wxScrollWinEvent_GetPosition, 2707).
+-define(wxMouseEvent_AltDown, 2708).
+-define(wxMouseEvent_Button, 2709).
+-define(wxMouseEvent_ButtonDClick, 2710).
+-define(wxMouseEvent_ButtonDown, 2711).
+-define(wxMouseEvent_ButtonUp, 2712).
+-define(wxMouseEvent_CmdDown, 2713).
+-define(wxMouseEvent_ControlDown, 2714).
+-define(wxMouseEvent_Dragging, 2715).
+-define(wxMouseEvent_Entering, 2716).
+-define(wxMouseEvent_GetButton, 2717).
+-define(wxMouseEvent_GetPosition, 2720).
+-define(wxMouseEvent_GetLogicalPosition, 2721).
+-define(wxMouseEvent_GetLinesPerAction, 2722).
+-define(wxMouseEvent_GetWheelRotation, 2723).
+-define(wxMouseEvent_GetWheelDelta, 2724).
+-define(wxMouseEvent_GetX, 2725).
+-define(wxMouseEvent_GetY, 2726).
+-define(wxMouseEvent_IsButton, 2727).
+-define(wxMouseEvent_IsPageScroll, 2728).
+-define(wxMouseEvent_Leaving, 2729).
+-define(wxMouseEvent_LeftDClick, 2730).
+-define(wxMouseEvent_LeftDown, 2731).
+-define(wxMouseEvent_LeftIsDown, 2732).
+-define(wxMouseEvent_LeftUp, 2733).
+-define(wxMouseEvent_MetaDown, 2734).
+-define(wxMouseEvent_MiddleDClick, 2735).
+-define(wxMouseEvent_MiddleDown, 2736).
+-define(wxMouseEvent_MiddleIsDown, 2737).
+-define(wxMouseEvent_MiddleUp, 2738).
+-define(wxMouseEvent_Moving, 2739).
+-define(wxMouseEvent_RightDClick, 2740).
+-define(wxMouseEvent_RightDown, 2741).
+-define(wxMouseEvent_RightIsDown, 2742).
+-define(wxMouseEvent_RightUp, 2743).
+-define(wxMouseEvent_ShiftDown, 2744).
+-define(wxSetCursorEvent_GetCursor, 2745).
+-define(wxSetCursorEvent_GetX, 2746).
+-define(wxSetCursorEvent_GetY, 2747).
+-define(wxSetCursorEvent_HasCursor, 2748).
+-define(wxSetCursorEvent_SetCursor, 2749).
+-define(wxKeyEvent_AltDown, 2750).
+-define(wxKeyEvent_CmdDown, 2751).
+-define(wxKeyEvent_ControlDown, 2752).
+-define(wxKeyEvent_GetKeyCode, 2753).
+-define(wxKeyEvent_GetModifiers, 2754).
+-define(wxKeyEvent_GetPosition, 2757).
+-define(wxKeyEvent_GetRawKeyCode, 2758).
+-define(wxKeyEvent_GetRawKeyFlags, 2759).
+-define(wxKeyEvent_GetUnicodeKey, 2760).
+-define(wxKeyEvent_GetX, 2761).
+-define(wxKeyEvent_GetY, 2762).
+-define(wxKeyEvent_HasModifiers, 2763).
+-define(wxKeyEvent_MetaDown, 2764).
+-define(wxKeyEvent_ShiftDown, 2765).
+-define(wxSizeEvent_GetSize, 2766).
+-define(wxMoveEvent_GetPosition, 2767).
+-define(wxEraseEvent_GetDC, 2768).
+-define(wxFocusEvent_GetWindow, 2769).
+-define(wxChildFocusEvent_GetWindow, 2770).
+-define(wxMenuEvent_GetMenu, 2771).
+-define(wxMenuEvent_GetMenuId, 2772).
+-define(wxMenuEvent_IsPopup, 2773).
+-define(wxCloseEvent_CanVeto, 2774).
+-define(wxCloseEvent_GetLoggingOff, 2775).
+-define(wxCloseEvent_SetCanVeto, 2776).
+-define(wxCloseEvent_SetLoggingOff, 2777).
+-define(wxCloseEvent_Veto, 2778).
+-define(wxShowEvent_SetShow, 2779).
+-define(wxShowEvent_GetShow, 2780).
+-define(wxIconizeEvent_Iconized, 2781).
+-define(wxJoystickEvent_ButtonDown, 2782).
+-define(wxJoystickEvent_ButtonIsDown, 2783).
+-define(wxJoystickEvent_ButtonUp, 2784).
+-define(wxJoystickEvent_GetButtonChange, 2785).
+-define(wxJoystickEvent_GetButtonState, 2786).
+-define(wxJoystickEvent_GetJoystick, 2787).
+-define(wxJoystickEvent_GetPosition, 2788).
+-define(wxJoystickEvent_GetZPosition, 2789).
+-define(wxJoystickEvent_IsButton, 2790).
+-define(wxJoystickEvent_IsMove, 2791).
+-define(wxJoystickEvent_IsZMove, 2792).
+-define(wxUpdateUIEvent_CanUpdate, 2793).
+-define(wxUpdateUIEvent_Check, 2794).
+-define(wxUpdateUIEvent_Enable, 2795).
+-define(wxUpdateUIEvent_Show, 2796).
+-define(wxUpdateUIEvent_GetChecked, 2797).
+-define(wxUpdateUIEvent_GetEnabled, 2798).
+-define(wxUpdateUIEvent_GetShown, 2799).
+-define(wxUpdateUIEvent_GetSetChecked, 2800).
+-define(wxUpdateUIEvent_GetSetEnabled, 2801).
+-define(wxUpdateUIEvent_GetSetShown, 2802).
+-define(wxUpdateUIEvent_GetSetText, 2803).
+-define(wxUpdateUIEvent_GetText, 2804).
+-define(wxUpdateUIEvent_GetMode, 2805).
+-define(wxUpdateUIEvent_GetUpdateInterval, 2806).
+-define(wxUpdateUIEvent_ResetUpdateTime, 2807).
+-define(wxUpdateUIEvent_SetMode, 2808).
+-define(wxUpdateUIEvent_SetText, 2809).
+-define(wxUpdateUIEvent_SetUpdateInterval, 2810).
+-define(wxMouseCaptureChangedEvent_GetCapturedWindow, 2811).
+-define(wxPaletteChangedEvent_SetChangedWindow, 2812).
+-define(wxPaletteChangedEvent_GetChangedWindow, 2813).
+-define(wxQueryNewPaletteEvent_SetPaletteRealized, 2814).
+-define(wxQueryNewPaletteEvent_GetPaletteRealized, 2815).
+-define(wxNavigationKeyEvent_GetDirection, 2816).
+-define(wxNavigationKeyEvent_SetDirection, 2817).
+-define(wxNavigationKeyEvent_IsWindowChange, 2818).
+-define(wxNavigationKeyEvent_SetWindowChange, 2819).
+-define(wxNavigationKeyEvent_IsFromTab, 2820).
+-define(wxNavigationKeyEvent_SetFromTab, 2821).
+-define(wxNavigationKeyEvent_GetCurrentFocus, 2822).
+-define(wxNavigationKeyEvent_SetCurrentFocus, 2823).
+-define(wxHelpEvent_GetOrigin, 2824).
+-define(wxHelpEvent_GetPosition, 2825).
+-define(wxHelpEvent_SetOrigin, 2826).
+-define(wxHelpEvent_SetPosition, 2827).
+-define(wxContextMenuEvent_GetPosition, 2828).
+-define(wxContextMenuEvent_SetPosition, 2829).
+-define(wxIdleEvent_CanSend, 2830).
+-define(wxIdleEvent_GetMode, 2831).
+-define(wxIdleEvent_RequestMore, 2832).
+-define(wxIdleEvent_MoreRequested, 2833).
+-define(wxIdleEvent_SetMode, 2834).
+-define(wxGridEvent_AltDown, 2835).
+-define(wxGridEvent_ControlDown, 2836).
+-define(wxGridEvent_GetCol, 2837).
+-define(wxGridEvent_GetPosition, 2838).
+-define(wxGridEvent_GetRow, 2839).
+-define(wxGridEvent_MetaDown, 2840).
+-define(wxGridEvent_Selecting, 2841).
+-define(wxGridEvent_ShiftDown, 2842).
+-define(wxNotifyEvent_Allow, 2843).
+-define(wxNotifyEvent_IsAllowed, 2844).
+-define(wxNotifyEvent_Veto, 2845).
+-define(wxSashEvent_GetEdge, 2846).
+-define(wxSashEvent_GetDragRect, 2847).
+-define(wxSashEvent_GetDragStatus, 2848).
+-define(wxListEvent_GetCacheFrom, 2849).
+-define(wxListEvent_GetCacheTo, 2850).
+-define(wxListEvent_GetKeyCode, 2851).
+-define(wxListEvent_GetIndex, 2852).
+-define(wxListEvent_GetColumn, 2853).
+-define(wxListEvent_GetPoint, 2854).
+-define(wxListEvent_GetLabel, 2855).
+-define(wxListEvent_GetText, 2856).
+-define(wxListEvent_GetImage, 2857).
+-define(wxListEvent_GetData, 2858).
+-define(wxListEvent_GetMask, 2859).
+-define(wxListEvent_GetItem, 2860).
+-define(wxListEvent_IsEditCancelled, 2861).
+-define(wxDateEvent_GetDate, 2862).
+-define(wxCalendarEvent_GetWeekDay, 2863).
+-define(wxFileDirPickerEvent_GetPath, 2864).
+-define(wxColourPickerEvent_GetColour, 2865).
+-define(wxFontPickerEvent_GetFont, 2866).
+-define(wxStyledTextEvent_GetPosition, 2867).
+-define(wxStyledTextEvent_GetKey, 2868).
+-define(wxStyledTextEvent_GetModifiers, 2869).
+-define(wxStyledTextEvent_GetModificationType, 2870).
+-define(wxStyledTextEvent_GetText, 2871).
+-define(wxStyledTextEvent_GetLength, 2872).
+-define(wxStyledTextEvent_GetLinesAdded, 2873).
+-define(wxStyledTextEvent_GetLine, 2874).
+-define(wxStyledTextEvent_GetFoldLevelNow, 2875).
+-define(wxStyledTextEvent_GetFoldLevelPrev, 2876).
+-define(wxStyledTextEvent_GetMargin, 2877).
+-define(wxStyledTextEvent_GetMessage, 2878).
+-define(wxStyledTextEvent_GetWParam, 2879).
+-define(wxStyledTextEvent_GetLParam, 2880).
+-define(wxStyledTextEvent_GetListType, 2881).
+-define(wxStyledTextEvent_GetX, 2882).
+-define(wxStyledTextEvent_GetY, 2883).
+-define(wxStyledTextEvent_GetDragText, 2884).
+-define(wxStyledTextEvent_GetDragAllowMove, 2885).
+-define(wxStyledTextEvent_GetDragResult, 2886).
+-define(wxStyledTextEvent_GetShift, 2887).
+-define(wxStyledTextEvent_GetControl, 2888).
+-define(wxStyledTextEvent_GetAlt, 2889).
+-define(utils_wxGetKeyState, 2890).
+-define(utils_wxGetMousePosition, 2891).
+-define(utils_wxGetMouseState, 2892).
+-define(utils_wxSetDetectableAutoRepeat, 2893).
+-define(utils_wxBell, 2894).
+-define(utils_wxFindMenuItemId, 2895).
+-define(utils_wxGenericFindWindowAtPoint, 2896).
+-define(utils_wxFindWindowAtPoint, 2897).
+-define(utils_wxBeginBusyCursor, 2898).
+-define(utils_wxEndBusyCursor, 2899).
+-define(utils_wxIsBusy, 2900).
+-define(utils_wxShutdown, 2901).
+-define(utils_wxShell, 2902).
+-define(utils_wxLaunchDefaultBrowser, 2903).
+-define(utils_wxGetEmailAddress, 2904).
+-define(utils_wxGetUserId, 2905).
+-define(utils_wxGetHomeDir, 2906).
+-define(utils_wxNewId, 2907).
+-define(utils_wxRegisterId, 2908).
+-define(utils_wxGetCurrentId, 2909).
+-define(utils_wxGetOsDescription, 2910).
+-define(utils_wxIsPlatformLittleEndian, 2911).
+-define(utils_wxIsPlatform64Bit, 2912).
+-define(wxPrintout_new, 2913).
+-define(wxPrintout_destruct, 2914).
+-define(wxPrintout_GetDC, 2915).
+-define(wxPrintout_GetPageSizeMM, 2916).
+-define(wxPrintout_GetPageSizePixels, 2917).
+-define(wxPrintout_GetPaperRectPixels, 2918).
+-define(wxPrintout_GetPPIPrinter, 2919).
+-define(wxPrintout_GetPPIScreen, 2920).
+-define(wxPrintout_GetTitle, 2921).
+-define(wxPrintout_IsPreview, 2922).
+-define(wxPrintout_FitThisSizeToPaper, 2923).
+-define(wxPrintout_FitThisSizeToPage, 2924).
+-define(wxPrintout_FitThisSizeToPageMargins, 2925).
+-define(wxPrintout_MapScreenSizeToPaper, 2926).
+-define(wxPrintout_MapScreenSizeToPage, 2927).
+-define(wxPrintout_MapScreenSizeToPageMargins, 2928).
+-define(wxPrintout_MapScreenSizeToDevice, 2929).
+-define(wxPrintout_GetLogicalPaperRect, 2930).
+-define(wxPrintout_GetLogicalPageRect, 2931).
+-define(wxPrintout_GetLogicalPageMarginsRect, 2932).
+-define(wxPrintout_SetLogicalOrigin, 2933).
+-define(wxPrintout_OffsetLogicalOrigin, 2934).
+-define(wxStyledTextCtrl_new_2, 2935).
+-define(wxStyledTextCtrl_new_0, 2936).
+-define(wxStyledTextCtrl_destruct, 2937).
+-define(wxStyledTextCtrl_Create, 2938).
+-define(wxStyledTextCtrl_AddText, 2939).
+-define(wxStyledTextCtrl_AddStyledText, 2940).
+-define(wxStyledTextCtrl_InsertText, 2941).
+-define(wxStyledTextCtrl_ClearAll, 2942).
+-define(wxStyledTextCtrl_ClearDocumentStyle, 2943).
+-define(wxStyledTextCtrl_GetLength, 2944).
+-define(wxStyledTextCtrl_GetCharAt, 2945).
+-define(wxStyledTextCtrl_GetCurrentPos, 2946).
+-define(wxStyledTextCtrl_GetAnchor, 2947).
+-define(wxStyledTextCtrl_GetStyleAt, 2948).
+-define(wxStyledTextCtrl_Redo, 2949).
+-define(wxStyledTextCtrl_SetUndoCollection, 2950).
+-define(wxStyledTextCtrl_SelectAll, 2951).
+-define(wxStyledTextCtrl_SetSavePoint, 2952).
+-define(wxStyledTextCtrl_GetStyledText, 2953).
+-define(wxStyledTextCtrl_CanRedo, 2954).
+-define(wxStyledTextCtrl_MarkerLineFromHandle, 2955).
+-define(wxStyledTextCtrl_MarkerDeleteHandle, 2956).
+-define(wxStyledTextCtrl_GetUndoCollection, 2957).
+-define(wxStyledTextCtrl_GetViewWhiteSpace, 2958).
+-define(wxStyledTextCtrl_SetViewWhiteSpace, 2959).
+-define(wxStyledTextCtrl_PositionFromPoint, 2960).
+-define(wxStyledTextCtrl_PositionFromPointClose, 2961).
+-define(wxStyledTextCtrl_GotoLine, 2962).
+-define(wxStyledTextCtrl_GotoPos, 2963).
+-define(wxStyledTextCtrl_SetAnchor, 2964).
+-define(wxStyledTextCtrl_GetCurLine, 2965).
+-define(wxStyledTextCtrl_GetEndStyled, 2966).
+-define(wxStyledTextCtrl_ConvertEOLs, 2967).
+-define(wxStyledTextCtrl_GetEOLMode, 2968).
+-define(wxStyledTextCtrl_SetEOLMode, 2969).
+-define(wxStyledTextCtrl_StartStyling, 2970).
+-define(wxStyledTextCtrl_SetStyling, 2971).
+-define(wxStyledTextCtrl_GetBufferedDraw, 2972).
+-define(wxStyledTextCtrl_SetBufferedDraw, 2973).
+-define(wxStyledTextCtrl_SetTabWidth, 2974).
+-define(wxStyledTextCtrl_GetTabWidth, 2975).
+-define(wxStyledTextCtrl_SetCodePage, 2976).
+-define(wxStyledTextCtrl_MarkerDefine, 2977).
+-define(wxStyledTextCtrl_MarkerSetForeground, 2978).
+-define(wxStyledTextCtrl_MarkerSetBackground, 2979).
+-define(wxStyledTextCtrl_MarkerAdd, 2980).
+-define(wxStyledTextCtrl_MarkerDelete, 2981).
+-define(wxStyledTextCtrl_MarkerDeleteAll, 2982).
+-define(wxStyledTextCtrl_MarkerGet, 2983).
+-define(wxStyledTextCtrl_MarkerNext, 2984).
+-define(wxStyledTextCtrl_MarkerPrevious, 2985).
+-define(wxStyledTextCtrl_MarkerDefineBitmap, 2986).
+-define(wxStyledTextCtrl_MarkerAddSet, 2987).
+-define(wxStyledTextCtrl_MarkerSetAlpha, 2988).
+-define(wxStyledTextCtrl_SetMarginType, 2989).
+-define(wxStyledTextCtrl_GetMarginType, 2990).
+-define(wxStyledTextCtrl_SetMarginWidth, 2991).
+-define(wxStyledTextCtrl_GetMarginWidth, 2992).
+-define(wxStyledTextCtrl_SetMarginMask, 2993).
+-define(wxStyledTextCtrl_GetMarginMask, 2994).
+-define(wxStyledTextCtrl_SetMarginSensitive, 2995).
+-define(wxStyledTextCtrl_GetMarginSensitive, 2996).
+-define(wxStyledTextCtrl_StyleClearAll, 2997).
+-define(wxStyledTextCtrl_StyleSetForeground, 2998).
+-define(wxStyledTextCtrl_StyleSetBackground, 2999).
+-define(wxStyledTextCtrl_StyleSetBold, 3000).
+-define(wxStyledTextCtrl_StyleSetItalic, 3001).
+-define(wxStyledTextCtrl_StyleSetSize, 3002).
+-define(wxStyledTextCtrl_StyleSetFaceName, 3003).
+-define(wxStyledTextCtrl_StyleSetEOLFilled, 3004).
+-define(wxStyledTextCtrl_StyleResetDefault, 3005).
+-define(wxStyledTextCtrl_StyleSetUnderline, 3006).
+-define(wxStyledTextCtrl_StyleSetCase, 3007).
+-define(wxStyledTextCtrl_StyleSetHotSpot, 3008).
+-define(wxStyledTextCtrl_SetSelForeground, 3009).
+-define(wxStyledTextCtrl_SetSelBackground, 3010).
+-define(wxStyledTextCtrl_GetSelAlpha, 3011).
+-define(wxStyledTextCtrl_SetSelAlpha, 3012).
+-define(wxStyledTextCtrl_SetCaretForeground, 3013).
+-define(wxStyledTextCtrl_CmdKeyAssign, 3014).
+-define(wxStyledTextCtrl_CmdKeyClear, 3015).
+-define(wxStyledTextCtrl_CmdKeyClearAll, 3016).
+-define(wxStyledTextCtrl_SetStyleBytes, 3017).
+-define(wxStyledTextCtrl_StyleSetVisible, 3018).
+-define(wxStyledTextCtrl_GetCaretPeriod, 3019).
+-define(wxStyledTextCtrl_SetCaretPeriod, 3020).
+-define(wxStyledTextCtrl_SetWordChars, 3021).
+-define(wxStyledTextCtrl_BeginUndoAction, 3022).
+-define(wxStyledTextCtrl_EndUndoAction, 3023).
+-define(wxStyledTextCtrl_IndicatorSetStyle, 3024).
+-define(wxStyledTextCtrl_IndicatorGetStyle, 3025).
+-define(wxStyledTextCtrl_IndicatorSetForeground, 3026).
+-define(wxStyledTextCtrl_IndicatorGetForeground, 3027).
+-define(wxStyledTextCtrl_SetWhitespaceForeground, 3028).
+-define(wxStyledTextCtrl_SetWhitespaceBackground, 3029).
+-define(wxStyledTextCtrl_GetStyleBits, 3030).
+-define(wxStyledTextCtrl_SetLineState, 3031).
+-define(wxStyledTextCtrl_GetLineState, 3032).
+-define(wxStyledTextCtrl_GetMaxLineState, 3033).
+-define(wxStyledTextCtrl_GetCaretLineVisible, 3034).
+-define(wxStyledTextCtrl_SetCaretLineVisible, 3035).
+-define(wxStyledTextCtrl_GetCaretLineBackground, 3036).
+-define(wxStyledTextCtrl_SetCaretLineBackground, 3037).
+-define(wxStyledTextCtrl_AutoCompShow, 3038).
+-define(wxStyledTextCtrl_AutoCompCancel, 3039).
+-define(wxStyledTextCtrl_AutoCompActive, 3040).
+-define(wxStyledTextCtrl_AutoCompPosStart, 3041).
+-define(wxStyledTextCtrl_AutoCompComplete, 3042).
+-define(wxStyledTextCtrl_AutoCompStops, 3043).
+-define(wxStyledTextCtrl_AutoCompSetSeparator, 3044).
+-define(wxStyledTextCtrl_AutoCompGetSeparator, 3045).
+-define(wxStyledTextCtrl_AutoCompSelect, 3046).
+-define(wxStyledTextCtrl_AutoCompSetCancelAtStart, 3047).
+-define(wxStyledTextCtrl_AutoCompGetCancelAtStart, 3048).
+-define(wxStyledTextCtrl_AutoCompSetFillUps, 3049).
+-define(wxStyledTextCtrl_AutoCompSetChooseSingle, 3050).
+-define(wxStyledTextCtrl_AutoCompGetChooseSingle, 3051).
+-define(wxStyledTextCtrl_AutoCompSetIgnoreCase, 3052).
+-define(wxStyledTextCtrl_AutoCompGetIgnoreCase, 3053).
+-define(wxStyledTextCtrl_UserListShow, 3054).
+-define(wxStyledTextCtrl_AutoCompSetAutoHide, 3055).
+-define(wxStyledTextCtrl_AutoCompGetAutoHide, 3056).
+-define(wxStyledTextCtrl_AutoCompSetDropRestOfWord, 3057).
+-define(wxStyledTextCtrl_AutoCompGetDropRestOfWord, 3058).
+-define(wxStyledTextCtrl_RegisterImage, 3059).
+-define(wxStyledTextCtrl_ClearRegisteredImages, 3060).
+-define(wxStyledTextCtrl_AutoCompGetTypeSeparator, 3061).
+-define(wxStyledTextCtrl_AutoCompSetTypeSeparator, 3062).
+-define(wxStyledTextCtrl_AutoCompSetMaxWidth, 3063).
+-define(wxStyledTextCtrl_AutoCompGetMaxWidth, 3064).
+-define(wxStyledTextCtrl_AutoCompSetMaxHeight, 3065).
+-define(wxStyledTextCtrl_AutoCompGetMaxHeight, 3066).
+-define(wxStyledTextCtrl_SetIndent, 3067).
+-define(wxStyledTextCtrl_GetIndent, 3068).
+-define(wxStyledTextCtrl_SetUseTabs, 3069).
+-define(wxStyledTextCtrl_GetUseTabs, 3070).
+-define(wxStyledTextCtrl_SetLineIndentation, 3071).
+-define(wxStyledTextCtrl_GetLineIndentation, 3072).
+-define(wxStyledTextCtrl_GetLineIndentPosition, 3073).
+-define(wxStyledTextCtrl_GetColumn, 3074).
+-define(wxStyledTextCtrl_SetUseHorizontalScrollBar, 3075).
+-define(wxStyledTextCtrl_GetUseHorizontalScrollBar, 3076).
+-define(wxStyledTextCtrl_SetIndentationGuides, 3077).
+-define(wxStyledTextCtrl_GetIndentationGuides, 3078).
+-define(wxStyledTextCtrl_SetHighlightGuide, 3079).
+-define(wxStyledTextCtrl_GetHighlightGuide, 3080).
+-define(wxStyledTextCtrl_GetLineEndPosition, 3081).
+-define(wxStyledTextCtrl_GetCodePage, 3082).
+-define(wxStyledTextCtrl_GetCaretForeground, 3083).
+-define(wxStyledTextCtrl_GetReadOnly, 3084).
+-define(wxStyledTextCtrl_SetCurrentPos, 3085).
+-define(wxStyledTextCtrl_SetSelectionStart, 3086).
+-define(wxStyledTextCtrl_GetSelectionStart, 3087).
+-define(wxStyledTextCtrl_SetSelectionEnd, 3088).
+-define(wxStyledTextCtrl_GetSelectionEnd, 3089).
+-define(wxStyledTextCtrl_SetPrintMagnification, 3090).
+-define(wxStyledTextCtrl_GetPrintMagnification, 3091).
+-define(wxStyledTextCtrl_SetPrintColourMode, 3092).
+-define(wxStyledTextCtrl_GetPrintColourMode, 3093).
+-define(wxStyledTextCtrl_FindText, 3094).
+-define(wxStyledTextCtrl_FormatRange, 3095).
+-define(wxStyledTextCtrl_GetFirstVisibleLine, 3096).
+-define(wxStyledTextCtrl_GetLine, 3097).
+-define(wxStyledTextCtrl_GetLineCount, 3098).
+-define(wxStyledTextCtrl_SetMarginLeft, 3099).
+-define(wxStyledTextCtrl_GetMarginLeft, 3100).
+-define(wxStyledTextCtrl_SetMarginRight, 3101).
+-define(wxStyledTextCtrl_GetMarginRight, 3102).
+-define(wxStyledTextCtrl_GetModify, 3103).
+-define(wxStyledTextCtrl_SetSelection, 3104).
+-define(wxStyledTextCtrl_GetSelectedText, 3105).
+-define(wxStyledTextCtrl_GetTextRange, 3106).
+-define(wxStyledTextCtrl_HideSelection, 3107).
+-define(wxStyledTextCtrl_LineFromPosition, 3108).
+-define(wxStyledTextCtrl_PositionFromLine, 3109).
+-define(wxStyledTextCtrl_LineScroll, 3110).
+-define(wxStyledTextCtrl_EnsureCaretVisible, 3111).
+-define(wxStyledTextCtrl_ReplaceSelection, 3112).
+-define(wxStyledTextCtrl_SetReadOnly, 3113).
+-define(wxStyledTextCtrl_CanPaste, 3114).
+-define(wxStyledTextCtrl_CanUndo, 3115).
+-define(wxStyledTextCtrl_EmptyUndoBuffer, 3116).
+-define(wxStyledTextCtrl_Undo, 3117).
+-define(wxStyledTextCtrl_Cut, 3118).
+-define(wxStyledTextCtrl_Copy, 3119).
+-define(wxStyledTextCtrl_Paste, 3120).
+-define(wxStyledTextCtrl_Clear, 3121).
+-define(wxStyledTextCtrl_SetText, 3122).
+-define(wxStyledTextCtrl_GetText, 3123).
+-define(wxStyledTextCtrl_GetTextLength, 3124).
+-define(wxStyledTextCtrl_GetOvertype, 3125).
+-define(wxStyledTextCtrl_SetCaretWidth, 3126).
+-define(wxStyledTextCtrl_GetCaretWidth, 3127).
+-define(wxStyledTextCtrl_SetTargetStart, 3128).
+-define(wxStyledTextCtrl_GetTargetStart, 3129).
+-define(wxStyledTextCtrl_SetTargetEnd, 3130).
+-define(wxStyledTextCtrl_GetTargetEnd, 3131).
+-define(wxStyledTextCtrl_ReplaceTarget, 3132).
+-define(wxStyledTextCtrl_SearchInTarget, 3133).
+-define(wxStyledTextCtrl_SetSearchFlags, 3134).
+-define(wxStyledTextCtrl_GetSearchFlags, 3135).
+-define(wxStyledTextCtrl_CallTipShow, 3136).
+-define(wxStyledTextCtrl_CallTipCancel, 3137).
+-define(wxStyledTextCtrl_CallTipActive, 3138).
+-define(wxStyledTextCtrl_CallTipPosAtStart, 3139).
+-define(wxStyledTextCtrl_CallTipSetHighlight, 3140).
+-define(wxStyledTextCtrl_CallTipSetBackground, 3141).
+-define(wxStyledTextCtrl_CallTipSetForeground, 3142).
+-define(wxStyledTextCtrl_CallTipSetForegroundHighlight, 3143).
+-define(wxStyledTextCtrl_CallTipUseStyle, 3144).
+-define(wxStyledTextCtrl_VisibleFromDocLine, 3145).
+-define(wxStyledTextCtrl_DocLineFromVisible, 3146).
+-define(wxStyledTextCtrl_WrapCount, 3147).
+-define(wxStyledTextCtrl_SetFoldLevel, 3148).
+-define(wxStyledTextCtrl_GetFoldLevel, 3149).
+-define(wxStyledTextCtrl_GetLastChild, 3150).
+-define(wxStyledTextCtrl_GetFoldParent, 3151).
+-define(wxStyledTextCtrl_ShowLines, 3152).
+-define(wxStyledTextCtrl_HideLines, 3153).
+-define(wxStyledTextCtrl_GetLineVisible, 3154).
+-define(wxStyledTextCtrl_SetFoldExpanded, 3155).
+-define(wxStyledTextCtrl_GetFoldExpanded, 3156).
+-define(wxStyledTextCtrl_ToggleFold, 3157).
+-define(wxStyledTextCtrl_EnsureVisible, 3158).
+-define(wxStyledTextCtrl_SetFoldFlags, 3159).
+-define(wxStyledTextCtrl_EnsureVisibleEnforcePolicy, 3160).
+-define(wxStyledTextCtrl_SetTabIndents, 3161).
+-define(wxStyledTextCtrl_GetTabIndents, 3162).
+-define(wxStyledTextCtrl_SetBackSpaceUnIndents, 3163).
+-define(wxStyledTextCtrl_GetBackSpaceUnIndents, 3164).
+-define(wxStyledTextCtrl_SetMouseDwellTime, 3165).
+-define(wxStyledTextCtrl_GetMouseDwellTime, 3166).
+-define(wxStyledTextCtrl_WordStartPosition, 3167).
+-define(wxStyledTextCtrl_WordEndPosition, 3168).
+-define(wxStyledTextCtrl_SetWrapMode, 3169).
+-define(wxStyledTextCtrl_GetWrapMode, 3170).
+-define(wxStyledTextCtrl_SetWrapVisualFlags, 3171).
+-define(wxStyledTextCtrl_GetWrapVisualFlags, 3172).
+-define(wxStyledTextCtrl_SetWrapVisualFlagsLocation, 3173).
+-define(wxStyledTextCtrl_GetWrapVisualFlagsLocation, 3174).
+-define(wxStyledTextCtrl_SetWrapStartIndent, 3175).
+-define(wxStyledTextCtrl_GetWrapStartIndent, 3176).
+-define(wxStyledTextCtrl_SetLayoutCache, 3177).
+-define(wxStyledTextCtrl_GetLayoutCache, 3178).
+-define(wxStyledTextCtrl_SetScrollWidth, 3179).
+-define(wxStyledTextCtrl_GetScrollWidth, 3180).
+-define(wxStyledTextCtrl_TextWidth, 3181).
+-define(wxStyledTextCtrl_GetEndAtLastLine, 3182).
+-define(wxStyledTextCtrl_TextHeight, 3183).
+-define(wxStyledTextCtrl_SetUseVerticalScrollBar, 3184).
+-define(wxStyledTextCtrl_GetUseVerticalScrollBar, 3185).
+-define(wxStyledTextCtrl_AppendText, 3186).
+-define(wxStyledTextCtrl_GetTwoPhaseDraw, 3187).
+-define(wxStyledTextCtrl_SetTwoPhaseDraw, 3188).
+-define(wxStyledTextCtrl_TargetFromSelection, 3189).
+-define(wxStyledTextCtrl_LinesJoin, 3190).
+-define(wxStyledTextCtrl_LinesSplit, 3191).
+-define(wxStyledTextCtrl_SetFoldMarginColour, 3192).
+-define(wxStyledTextCtrl_SetFoldMarginHiColour, 3193).
+-define(wxStyledTextCtrl_LineDown, 3194).
+-define(wxStyledTextCtrl_LineDownExtend, 3195).
+-define(wxStyledTextCtrl_LineUp, 3196).
+-define(wxStyledTextCtrl_LineUpExtend, 3197).
+-define(wxStyledTextCtrl_CharLeft, 3198).
+-define(wxStyledTextCtrl_CharLeftExtend, 3199).
+-define(wxStyledTextCtrl_CharRight, 3200).
+-define(wxStyledTextCtrl_CharRightExtend, 3201).
+-define(wxStyledTextCtrl_WordLeft, 3202).
+-define(wxStyledTextCtrl_WordLeftExtend, 3203).
+-define(wxStyledTextCtrl_WordRight, 3204).
+-define(wxStyledTextCtrl_WordRightExtend, 3205).
+-define(wxStyledTextCtrl_Home, 3206).
+-define(wxStyledTextCtrl_HomeExtend, 3207).
+-define(wxStyledTextCtrl_LineEnd, 3208).
+-define(wxStyledTextCtrl_LineEndExtend, 3209).
+-define(wxStyledTextCtrl_DocumentStart, 3210).
+-define(wxStyledTextCtrl_DocumentStartExtend, 3211).
+-define(wxStyledTextCtrl_DocumentEnd, 3212).
+-define(wxStyledTextCtrl_DocumentEndExtend, 3213).
+-define(wxStyledTextCtrl_PageUp, 3214).
+-define(wxStyledTextCtrl_PageUpExtend, 3215).
+-define(wxStyledTextCtrl_PageDown, 3216).
+-define(wxStyledTextCtrl_PageDownExtend, 3217).
+-define(wxStyledTextCtrl_EditToggleOvertype, 3218).
+-define(wxStyledTextCtrl_Cancel, 3219).
+-define(wxStyledTextCtrl_DeleteBack, 3220).
+-define(wxStyledTextCtrl_Tab, 3221).
+-define(wxStyledTextCtrl_BackTab, 3222).
+-define(wxStyledTextCtrl_NewLine, 3223).
+-define(wxStyledTextCtrl_FormFeed, 3224).
+-define(wxStyledTextCtrl_VCHome, 3225).
+-define(wxStyledTextCtrl_VCHomeExtend, 3226).
+-define(wxStyledTextCtrl_ZoomIn, 3227).
+-define(wxStyledTextCtrl_ZoomOut, 3228).
+-define(wxStyledTextCtrl_DelWordLeft, 3229).
+-define(wxStyledTextCtrl_DelWordRight, 3230).
+-define(wxStyledTextCtrl_LineCut, 3231).
+-define(wxStyledTextCtrl_LineDelete, 3232).
+-define(wxStyledTextCtrl_LineTranspose, 3233).
+-define(wxStyledTextCtrl_LineDuplicate, 3234).
+-define(wxStyledTextCtrl_LowerCase, 3235).
+-define(wxStyledTextCtrl_UpperCase, 3236).
+-define(wxStyledTextCtrl_LineScrollDown, 3237).
+-define(wxStyledTextCtrl_LineScrollUp, 3238).
+-define(wxStyledTextCtrl_DeleteBackNotLine, 3239).
+-define(wxStyledTextCtrl_HomeDisplay, 3240).
+-define(wxStyledTextCtrl_HomeDisplayExtend, 3241).
+-define(wxStyledTextCtrl_LineEndDisplay, 3242).
+-define(wxStyledTextCtrl_LineEndDisplayExtend, 3243).
+-define(wxStyledTextCtrl_HomeWrapExtend, 3244).
+-define(wxStyledTextCtrl_LineEndWrap, 3245).
+-define(wxStyledTextCtrl_LineEndWrapExtend, 3246).
+-define(wxStyledTextCtrl_VCHomeWrap, 3247).
+-define(wxStyledTextCtrl_VCHomeWrapExtend, 3248).
+-define(wxStyledTextCtrl_LineCopy, 3249).
+-define(wxStyledTextCtrl_MoveCaretInsideView, 3250).
+-define(wxStyledTextCtrl_LineLength, 3251).
+-define(wxStyledTextCtrl_BraceHighlight, 3252).
+-define(wxStyledTextCtrl_BraceBadLight, 3253).
+-define(wxStyledTextCtrl_BraceMatch, 3254).
+-define(wxStyledTextCtrl_GetViewEOL, 3255).
+-define(wxStyledTextCtrl_SetViewEOL, 3256).
+-define(wxStyledTextCtrl_SetModEventMask, 3257).
+-define(wxStyledTextCtrl_GetEdgeColumn, 3258).
+-define(wxStyledTextCtrl_SetEdgeColumn, 3259).
+-define(wxStyledTextCtrl_GetEdgeMode, 3260).
+-define(wxStyledTextCtrl_GetEdgeColour, 3261).
+-define(wxStyledTextCtrl_SetEdgeColour, 3262).
+-define(wxStyledTextCtrl_SearchAnchor, 3263).
+-define(wxStyledTextCtrl_SearchNext, 3264).
+-define(wxStyledTextCtrl_SearchPrev, 3265).
+-define(wxStyledTextCtrl_LinesOnScreen, 3266).
+-define(wxStyledTextCtrl_UsePopUp, 3267).
+-define(wxStyledTextCtrl_SelectionIsRectangle, 3268).
+-define(wxStyledTextCtrl_SetZoom, 3269).
+-define(wxStyledTextCtrl_GetZoom, 3270).
+-define(wxStyledTextCtrl_GetModEventMask, 3271).
+-define(wxStyledTextCtrl_SetSTCFocus, 3272).
+-define(wxStyledTextCtrl_GetSTCFocus, 3273).
+-define(wxStyledTextCtrl_SetStatus, 3274).
+-define(wxStyledTextCtrl_GetStatus, 3275).
+-define(wxStyledTextCtrl_SetMouseDownCaptures, 3276).
+-define(wxStyledTextCtrl_GetMouseDownCaptures, 3277).
+-define(wxStyledTextCtrl_SetSTCCursor, 3278).
+-define(wxStyledTextCtrl_GetSTCCursor, 3279).
+-define(wxStyledTextCtrl_SetControlCharSymbol, 3280).
+-define(wxStyledTextCtrl_GetControlCharSymbol, 3281).
+-define(wxStyledTextCtrl_WordPartLeft, 3282).
+-define(wxStyledTextCtrl_WordPartLeftExtend, 3283).
+-define(wxStyledTextCtrl_WordPartRight, 3284).
+-define(wxStyledTextCtrl_WordPartRightExtend, 3285).
+-define(wxStyledTextCtrl_SetVisiblePolicy, 3286).
+-define(wxStyledTextCtrl_DelLineLeft, 3287).
+-define(wxStyledTextCtrl_DelLineRight, 3288).
+-define(wxStyledTextCtrl_GetXOffset, 3289).
+-define(wxStyledTextCtrl_ChooseCaretX, 3290).
+-define(wxStyledTextCtrl_SetXCaretPolicy, 3291).
+-define(wxStyledTextCtrl_SetYCaretPolicy, 3292).
+-define(wxStyledTextCtrl_GetPrintWrapMode, 3293).
+-define(wxStyledTextCtrl_SetHotspotActiveForeground, 3294).
+-define(wxStyledTextCtrl_SetHotspotActiveBackground, 3295).
+-define(wxStyledTextCtrl_SetHotspotActiveUnderline, 3296).
+-define(wxStyledTextCtrl_SetHotspotSingleLine, 3297).
+-define(wxStyledTextCtrl_ParaDownExtend, 3298).
+-define(wxStyledTextCtrl_ParaUp, 3299).
+-define(wxStyledTextCtrl_ParaUpExtend, 3300).
+-define(wxStyledTextCtrl_PositionBefore, 3301).
+-define(wxStyledTextCtrl_PositionAfter, 3302).
+-define(wxStyledTextCtrl_CopyRange, 3303).
+-define(wxStyledTextCtrl_CopyText, 3304).
+-define(wxStyledTextCtrl_SetSelectionMode, 3305).
+-define(wxStyledTextCtrl_GetSelectionMode, 3306).
+-define(wxStyledTextCtrl_LineDownRectExtend, 3307).
+-define(wxStyledTextCtrl_LineUpRectExtend, 3308).
+-define(wxStyledTextCtrl_CharLeftRectExtend, 3309).
+-define(wxStyledTextCtrl_CharRightRectExtend, 3310).
+-define(wxStyledTextCtrl_HomeRectExtend, 3311).
+-define(wxStyledTextCtrl_VCHomeRectExtend, 3312).
+-define(wxStyledTextCtrl_LineEndRectExtend, 3313).
+-define(wxStyledTextCtrl_PageUpRectExtend, 3314).
+-define(wxStyledTextCtrl_PageDownRectExtend, 3315).
+-define(wxStyledTextCtrl_StutteredPageUp, 3316).
+-define(wxStyledTextCtrl_StutteredPageUpExtend, 3317).
+-define(wxStyledTextCtrl_StutteredPageDown, 3318).
+-define(wxStyledTextCtrl_StutteredPageDownExtend, 3319).
+-define(wxStyledTextCtrl_WordLeftEnd, 3320).
+-define(wxStyledTextCtrl_WordLeftEndExtend, 3321).
+-define(wxStyledTextCtrl_WordRightEnd, 3322).
+-define(wxStyledTextCtrl_WordRightEndExtend, 3323).
+-define(wxStyledTextCtrl_SetWhitespaceChars, 3324).
+-define(wxStyledTextCtrl_SetCharsDefault, 3325).
+-define(wxStyledTextCtrl_AutoCompGetCurrent, 3326).
+-define(wxStyledTextCtrl_Allocate, 3327).
+-define(wxStyledTextCtrl_FindColumn, 3328).
+-define(wxStyledTextCtrl_GetCaretSticky, 3329).
+-define(wxStyledTextCtrl_SetCaretSticky, 3330).
+-define(wxStyledTextCtrl_ToggleCaretSticky, 3331).
+-define(wxStyledTextCtrl_SetPasteConvertEndings, 3332).
+-define(wxStyledTextCtrl_GetPasteConvertEndings, 3333).
+-define(wxStyledTextCtrl_SelectionDuplicate, 3334).
+-define(wxStyledTextCtrl_SetCaretLineBackAlpha, 3335).
+-define(wxStyledTextCtrl_GetCaretLineBackAlpha, 3336).
+-define(wxStyledTextCtrl_StartRecord, 3337).
+-define(wxStyledTextCtrl_StopRecord, 3338).
+-define(wxStyledTextCtrl_SetLexer, 3339).
+-define(wxStyledTextCtrl_GetLexer, 3340).
+-define(wxStyledTextCtrl_Colourise, 3341).
+-define(wxStyledTextCtrl_SetProperty, 3342).
+-define(wxStyledTextCtrl_SetKeyWords, 3343).
+-define(wxStyledTextCtrl_SetLexerLanguage, 3344).
+-define(wxStyledTextCtrl_GetProperty, 3345).
+-define(wxStyledTextCtrl_GetStyleBitsNeeded, 3346).
+-define(wxStyledTextCtrl_GetCurrentLine, 3347).
+-define(wxStyledTextCtrl_StyleSetSpec, 3348).
+-define(wxStyledTextCtrl_StyleSetFont, 3349).
+-define(wxStyledTextCtrl_StyleSetFontAttr, 3350).
+-define(wxStyledTextCtrl_StyleSetCharacterSet, 3351).
+-define(wxStyledTextCtrl_StyleSetFontEncoding, 3352).
+-define(wxStyledTextCtrl_CmdKeyExecute, 3353).
+-define(wxStyledTextCtrl_SetMargins, 3354).
+-define(wxStyledTextCtrl_GetSelection, 3355).
+-define(wxStyledTextCtrl_PointFromPosition, 3356).
+-define(wxStyledTextCtrl_ScrollToLine, 3357).
+-define(wxStyledTextCtrl_ScrollToColumn, 3358).
+-define(wxStyledTextCtrl_SendMsg, 3359).
+-define(wxStyledTextCtrl_SetVScrollBar, 3360).
+-define(wxStyledTextCtrl_SetHScrollBar, 3361).
+-define(wxStyledTextCtrl_GetLastKeydownProcessed, 3362).
+-define(wxStyledTextCtrl_SetLastKeydownProcessed, 3363).
+-define(wxStyledTextCtrl_SaveFile, 3364).
+-define(wxStyledTextCtrl_LoadFile, 3365).
+-define(wxStyledTextCtrl_DoDragOver, 3366).
+-define(wxStyledTextCtrl_DoDropText, 3367).
+-define(wxStyledTextCtrl_GetUseAntiAliasing, 3368).
+-define(wxStyledTextCtrl_AddTextRaw, 3369).
+-define(wxStyledTextCtrl_InsertTextRaw, 3370).
+-define(wxStyledTextCtrl_GetCurLineRaw, 3371).
+-define(wxStyledTextCtrl_GetLineRaw, 3372).
+-define(wxStyledTextCtrl_GetSelectedTextRaw, 3373).
+-define(wxStyledTextCtrl_GetTextRangeRaw, 3374).
+-define(wxStyledTextCtrl_SetTextRaw, 3375).
+-define(wxStyledTextCtrl_GetTextRaw, 3376).
+-define(wxStyledTextCtrl_AppendTextRaw, 3377).
+-define(wxArtProvider_GetBitmap, 3378).
+-define(wxArtProvider_GetIcon, 3379).
+-define(wxTreeEvent_GetKeyCode, 3380).
+-define(wxTreeEvent_GetItem, 3381).
+-define(wxTreeEvent_GetKeyEvent, 3382).
+-define(wxTreeEvent_GetLabel, 3383).
+-define(wxTreeEvent_GetOldItem, 3384).
+-define(wxTreeEvent_GetPoint, 3385).
+-define(wxTreeEvent_IsEditCancelled, 3386).
+-define(wxTreeEvent_SetToolTip, 3387).
+-define(wxNotebookEvent_GetOldSelection, 3388).
+-define(wxNotebookEvent_GetSelection, 3389).
+-define(wxNotebookEvent_SetOldSelection, 3390).
+-define(wxNotebookEvent_SetSelection, 3391).
+-define(wxFileDataObject_new, 3392).
+-define(wxFileDataObject_AddFile, 3393).
+-define(wxFileDataObject_GetFilenames, 3394).
+-define(wxFileDataObject_destroy, 3395).
+-define(wxTextDataObject_new, 3396).
+-define(wxTextDataObject_GetTextLength, 3397).
+-define(wxTextDataObject_GetText, 3398).
+-define(wxTextDataObject_SetText, 3399).
+-define(wxTextDataObject_destroy, 3400).
+-define(wxBitmapDataObject_new_1_1, 3401).
+-define(wxBitmapDataObject_new_1_0, 3402).
+-define(wxBitmapDataObject_GetBitmap, 3403).
+-define(wxBitmapDataObject_SetBitmap, 3404).
+-define(wxBitmapDataObject_destroy, 3405).
+-define(wxClipboard_new, 3407).
+-define(wxClipboard_destruct, 3408).
+-define(wxClipboard_AddData, 3409).
+-define(wxClipboard_Clear, 3410).
+-define(wxClipboard_Close, 3411).
+-define(wxClipboard_Flush, 3412).
+-define(wxClipboard_GetData, 3413).
+-define(wxClipboard_IsOpened, 3414).
+-define(wxClipboard_Open, 3415).
+-define(wxClipboard_SetData, 3416).
+-define(wxClipboard_UsePrimarySelection, 3418).
+-define(wxClipboard_IsSupported, 3419).
+-define(wxClipboard_Get, 3420).
+-define(wxSpinEvent_GetPosition, 3421).
+-define(wxSpinEvent_SetPosition, 3422).
+-define(wxSplitterWindow_new_0, 3423).
+-define(wxSplitterWindow_new_2, 3424).
+-define(wxSplitterWindow_destruct, 3425).
+-define(wxSplitterWindow_Create, 3426).
+-define(wxSplitterWindow_GetMinimumPaneSize, 3427).
+-define(wxSplitterWindow_GetSashGravity, 3428).
+-define(wxSplitterWindow_GetSashPosition, 3429).
+-define(wxSplitterWindow_GetSplitMode, 3430).
+-define(wxSplitterWindow_GetWindow1, 3431).
+-define(wxSplitterWindow_GetWindow2, 3432).
+-define(wxSplitterWindow_Initialize, 3433).
+-define(wxSplitterWindow_IsSplit, 3434).
+-define(wxSplitterWindow_ReplaceWindow, 3435).
+-define(wxSplitterWindow_SetSashGravity, 3436).
+-define(wxSplitterWindow_SetSashPosition, 3437).
+-define(wxSplitterWindow_SetSashSize, 3438).
+-define(wxSplitterWindow_SetMinimumPaneSize, 3439).
+-define(wxSplitterWindow_SetSplitMode, 3440).
+-define(wxSplitterWindow_SplitHorizontally, 3441).
+-define(wxSplitterWindow_SplitVertically, 3442).
+-define(wxSplitterWindow_Unsplit, 3443).
+-define(wxSplitterWindow_UpdateSize, 3444).
+-define(wxSplitterEvent_GetSashPosition, 3445).
+-define(wxSplitterEvent_GetX, 3446).
+-define(wxSplitterEvent_GetY, 3447).
+-define(wxSplitterEvent_GetWindowBeingRemoved, 3448).
+-define(wxSplitterEvent_SetSashPosition, 3449).
+-define(wxHtmlWindow_new_0, 3450).
+-define(wxHtmlWindow_new_2, 3451).
+-define(wxHtmlWindow_AppendToPage, 3452).
+-define(wxHtmlWindow_GetOpenedAnchor, 3453).
+-define(wxHtmlWindow_GetOpenedPage, 3454).
+-define(wxHtmlWindow_GetOpenedPageTitle, 3455).
+-define(wxHtmlWindow_GetRelatedFrame, 3456).
+-define(wxHtmlWindow_HistoryBack, 3457).
+-define(wxHtmlWindow_HistoryCanBack, 3458).
+-define(wxHtmlWindow_HistoryCanForward, 3459).
+-define(wxHtmlWindow_HistoryClear, 3460).
+-define(wxHtmlWindow_HistoryForward, 3461).
+-define(wxHtmlWindow_LoadFile, 3462).
+-define(wxHtmlWindow_LoadPage, 3463).
+-define(wxHtmlWindow_SelectAll, 3464).
+-define(wxHtmlWindow_SelectionToText, 3465).
+-define(wxHtmlWindow_SelectLine, 3466).
+-define(wxHtmlWindow_SelectWord, 3467).
+-define(wxHtmlWindow_SetBorders, 3468).
+-define(wxHtmlWindow_SetFonts, 3469).
+-define(wxHtmlWindow_SetPage, 3470).
+-define(wxHtmlWindow_SetRelatedFrame, 3471).
+-define(wxHtmlWindow_SetRelatedStatusBar, 3472).
+-define(wxHtmlWindow_ToText, 3473).
+-define(wxHtmlWindow_destroy, 3474).
+-define(wxHtmlLinkEvent_GetLinkInfo, 3475).
+-define(wxSystemSettings_GetColour, 3476).
+-define(wxSystemSettings_GetFont, 3477).
+-define(wxSystemSettings_GetMetric, 3478).
+-define(wxSystemSettings_GetScreenType, 3479).
+-define(wxAuiNotebookEvent_SetSelection, 3480).
+-define(wxAuiNotebookEvent_GetSelection, 3481).
+-define(wxAuiNotebookEvent_SetOldSelection, 3482).
+-define(wxAuiNotebookEvent_GetOldSelection, 3483).
+-define(wxAuiNotebookEvent_SetDragSource, 3484).
+-define(wxAuiNotebookEvent_GetDragSource, 3485).
+-define(wxAuiManagerEvent_SetManager, 3486).
+-define(wxAuiManagerEvent_GetManager, 3487).
+-define(wxAuiManagerEvent_SetPane, 3488).
+-define(wxAuiManagerEvent_GetPane, 3489).
+-define(wxAuiManagerEvent_SetButton, 3490).
+-define(wxAuiManagerEvent_GetButton, 3491).
+-define(wxAuiManagerEvent_SetDC, 3492).
+-define(wxAuiManagerEvent_GetDC, 3493).
+-define(wxAuiManagerEvent_Veto, 3494).
+-define(wxAuiManagerEvent_GetVeto, 3495).
+-define(wxAuiManagerEvent_SetCanVeto, 3496).
+-define(wxAuiManagerEvent_CanVeto, 3497).
+-define(wxLogNull_new, 3498).
+-define(wxLogNull_destroy, 3499).
diff --git a/lib/wx/src/wx.erl b/lib/wx/src/wx.erl
index 14abd0d817..9d76f3bc42 100644
--- a/lib/wx/src/wx.erl
+++ b/lib/wx/src/wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -96,7 +96,8 @@ new() ->
 %% @doc Starts a wx server. 
 %% Option may be {debug, Level}, see debug/1.
 new(Options) when is_list(Options) ->
-    #wx_env{} = wxe_server:start(),
+    #wx_env{port=Port} = wxe_server:start(),
+    put(opengl_port, Port),
     Debug = proplists:get_value(debug, Options, 0),
     debug(Debug),
     null().
@@ -121,8 +122,9 @@ get_env() ->
 %% @spec (wx_env()) -> ok
 %% @doc Sets the process wx environment, allows this process to use
 %% another process wx environment.
-set_env(#wx_env{sv=Pid} = Env) ->
-    put(?WXE_IDENTIFIER, Env),
+set_env(#wx_env{sv=Pid, port=Port} = Env) ->
+    put(?WXE_IDENTIFIER, Env),    
+    put(opengl_port, Port),
     %%    wxe_util:cast(?REGISTER_PID, <<>>),
     wxe_server:register_me(Pid),
     ok.
diff --git a/lib/wx/src/wxe.hrl b/lib/wx/src/wxe.hrl
index bb70a03bfe..bd34b13385 100644
--- a/lib/wx/src/wxe.hrl
+++ b/lib/wx/src/wxe.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -50,6 +50,8 @@
 -define(WXE_CB_START,   8).  %% Used for event-callback start
 -define(WXE_DEBUG_DRIVER,  9).    %% Set debug
 %%-define(WXE_DEBUG_PING,  10).    %% debug ping (when using debugger it's needed)
--define(WXE_BIN_INCR,   5001). %% Binary refc incr 
--define(WXE_BIN_DECR,   5002). %% Binary refc decr
+-define(WXE_BIN_INCR,    11). %% Binary refc incr 
+-define(WXE_BIN_DECR,    12). %% Binary refc decr
+-define(WXE_INIT_OPENGL, 13). %% Binary refc decr
+
 -include("gen/wxe_funcs.hrl").
diff --git a/lib/wx/src/wxe_master.erl b/lib/wx/src/wxe_master.erl
index 5ab76a77cf..9efe59054c 100644
--- a/lib/wx/src/wxe_master.erl
+++ b/lib/wx/src/wxe_master.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -28,7 +28,7 @@
 -behaviour(gen_server).
 
 %% API
--export([start/0, init_port/0]).
+-export([start/0, init_port/0, init_opengl/0]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -38,8 +38,8 @@
 		users,    %% List of wx servers, needed ??
 		driver}). %% Driver name so wx_server can create it's own port
 
+-include("wxe.hrl").
 -include("gen/wxe_debug.hrl").
--include("gen/gl_debug.hrl").
 
 -define(DRIVER, "wxe_driver").
 
@@ -74,6 +74,14 @@ init_port() ->
     receive wx_port_initiated -> ok end,
     {Port, CBport}.
 
+
+%%--------------------------------------------------------------------
+%% Initlizes the opengl library
+%%--------------------------------------------------------------------
+init_opengl() ->
+    GLLib = wxe_util:wxgl_dl(),
+    wxe_util:call(?WXE_INIT_OPENGL, <<(list_to_binary(GLLib))/binary, 0:8>>).
+
 %%====================================================================
 %% gen_server callbacks
 %%====================================================================
@@ -87,7 +95,7 @@ init_port() ->
 %%--------------------------------------------------------------------
 init([]) ->
     DriverName = ?DRIVER,
-    PrivDir = priv_dir(),
+    PrivDir = wxe_util:priv_dir(?DRIVER),
     erlang:group_leader(whereis(init), self()),
     case catch erlang:system_info(smp_support) of
 	true -> ok;
@@ -120,20 +128,19 @@ init([]) ->
     process_flag(trap_exit, true),
     DriverWithArgs = DriverName ++ " " ++ code:priv_dir(wx) ++ [0],
     
-    case catch open_port({spawn, DriverWithArgs},[binary]) of
-	{'EXIT', Err} -> 
-	    erlang:error({open_port,Err});
-	Port ->
-	    wx_debug_info = ets:new(wx_debug_info, [named_table]),
-	    wx_non_consts = ets:new(wx_non_consts, [named_table]),
-	    true = ets:insert(wx_debug_info, wxdebug_table()),
-	    true = ets:insert(wx_debug_info, gldebug_table()),
-	    spawn_link(fun() -> debug_ping(Port) end),
-	    receive 
-		{wx_consts, List} ->
-		    true = ets:insert(wx_non_consts, List)
-	    end,
-	    {ok, #state{cb_port=Port, driver=DriverName, users=gb_sets:empty()}}
+    try
+	Port = open_port({spawn, DriverWithArgs},[binary]),
+	wx_debug_info = ets:new(wx_debug_info, [named_table]),
+	wx_non_consts = ets:new(wx_non_consts, [named_table]),
+	true = ets:insert(wx_debug_info, wxdebug_table()),
+	spawn_link(fun() -> debug_ping(Port) end),
+	receive
+	    {wx_consts, List} ->
+		true = ets:insert(wx_non_consts, List)
+	end,
+	{ok, #state{cb_port=Port, driver=DriverName, users=gb_sets:empty()}}
+    catch _:Err ->
+	    error({Err, "Could not initiate graphics"})
     end.
 
 %%--------------------------------------------------------------------
@@ -205,108 +212,9 @@ code_change(_OldVsn, State, _Extra) ->
 
 %%%%%%%%%%%% INTERNAL %%%%%%%%%%%%%%%%%%%%%%%%
 
-%% If you want anything done, do it yourself. 
-
-priv_dir() ->
-    Type = erlang:system_info(system_architecture),
-    {file, Path} = code:is_loaded(?MODULE),
-    Priv = case filelib:is_regular(Path) of
-	       true ->
-		   Beam = filename:join(["ebin/",atom_to_list(?MODULE) ++ ".beam"]),
-		   filename:join(strip(Path, Beam), "priv");
-	       false ->
-		   code:priv_dir(wx)
-	   end,
-    try 
-	{ok, Dirs0} = file:list_dir(Priv),
-	Dirs1 = split_dirs(Dirs0),
-	Dirs  = lists:reverse(lists:sort(Dirs1)),    
-	
-	Best = best_dir(hd(split_dirs([Type])),Dirs, Priv),
-	filename:join(Priv, Best)
-    catch _:_ ->
-	    error_logger:format("WX ERROR: Could not find suitable \'~s\' for ~s in: ~s~n", 
-				[?DRIVER, Type, Priv]),
-	    erlang:error({load_driver, "No driver found"})
-    end.
-    
-best_dir(Dir, Dirs0, Priv) ->
-    Dirs = [{D,D} || D <- Dirs0],
-    best_dir(Dir, Dirs, [], Priv).
-
-best_dir(Pre, [{[],_}|R], Acc, Priv) -> %% Empty skip'em
-    best_dir(Pre, R, Acc, Priv);
-best_dir(Pre, [{Pre,Dir}|R], Acc, Priv) -> 
-    Real = dir_app(lists:reverse(Dir)),
-    case file:list_dir(filename:join(Priv,Real)) of
-	{ok, Fs} ->
-	    case lists:any(fun(File) -> filename:rootname(File) =:= ?DRIVER end, Fs) of
-		true ->  Real; %% Found dir and it contains a driver
-		false -> best_dir(Pre, R, Acc, Priv)
-	    end;
-	_ ->
-	    best_dir(Pre, R, Acc, Priv)
-    end;
-best_dir(Pre, [{[_|F],Dir}|R], Acc, Priv) ->
-    best_dir(Pre, R, [{F,Dir}|Acc], Priv);
-best_dir(_Pre, [], [],_) -> throw(no_dir);  %% Nothing found
-best_dir([_|Pre], [], Acc, Priv) ->
-    best_dir(Pre, lists:reverse(Acc), [], Priv);
-best_dir([], _, _,_) -> throw(no_dir).  %% Nothing found
-
-split_dirs(Dirs0) ->
-    ToInt = fun(Str) ->
-		    try 
-			list_to_integer(Str)
-		    catch _:_ -> Str
-		    end
-	    end,
-    Split = fun(Dir) ->
-		    Toks = tokens(Dir,".-"),
-		    lists:reverse([ToInt(Str) || Str <- Toks])
-	    end,
-    lists:map(Split,Dirs0).
-
-dir_app([]) -> [];
-dir_app([Dir]) -> Dir;
-dir_app(Dir) ->
-    dir_app2(Dir).
-dir_app2([Int]) when is_integer(Int) ->
-    integer_to_list(Int);
-dir_app2([Str]) when is_list(Str) ->
-    Str;
-dir_app2([Head|Rest]) when is_integer(Head) ->
-    integer_to_list(Head) ++ dir_app2(Rest);
-dir_app2([Head|Rest]) when is_list(Head) ->
-    Head ++ dir_app2(Rest).
-    
-strip(Src, Src) ->
-    [];
-strip([H|R], Src) ->
-    [H| strip(R, Src)].
-
-
 debug_ping(Port) ->
     timer:sleep(1*333),    
     _R = (catch erlang:port_call(Port, 0, [])),
 %%    io:format("Erlang ping ~p ~n", [_R]),
     debug_ping(Port).
 
-tokens(S,Seps) ->
-    tokens1(S, Seps, []).
-
-tokens1([C|S], Seps, Toks) ->
-    case lists:member(C, Seps) of
-        true -> tokens1(S, Seps, [[C]|Toks]);
-        false -> tokens2(S, Seps, Toks, [C])
-    end;
-tokens1([], _Seps, Toks) ->
-    lists:reverse(Toks).
-
-tokens2([C|S], Seps, Toks, Cs) ->
-    case lists:member(C, Seps) of
-        true -> tokens1(S, Seps, [[C], lists:reverse(Cs) |Toks]);
-        false -> tokens2(S, Seps, Toks, [C|Cs])
-    end;
-tokens2([], _Seps, Toks, Cs) ->
-    lists:reverse([lists:reverse(Cs)|Toks]).
diff --git a/lib/wx/src/wxe_util.erl b/lib/wx/src/wxe_util.erl
index a2fb4641c9..02bca62486 100644
--- a/lib/wx/src/wxe_util.erl
+++ b/lib/wx/src/wxe_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -32,8 +32,9 @@
 	 get_const/1,colour_bin/1,datetime_bin/1,
 	 to_bool/1,from_bool/1]).
 
--include("wxe.hrl").
+-export([wxgl_dl/0, priv_dir/1]).
 
+-include("wxe.hrl").
 
 to_bool(0) -> false;
 to_bool(_) -> true.
@@ -199,3 +200,47 @@ check_previous() ->
 	    erlang:error({Error, MF})    
     after 0 -> ok
     end.
+
+%% Get gl dynamic library
+
+wxgl_dl() ->
+    DynLib0 = "erl_gl",
+    PrivDir = priv_dir(DynLib0),
+    DynLib = case os:type() of
+		 {win32,_} ->
+		     DynLib0 ++ ".dll";
+		 _ ->
+		     DynLib0 ++ ".so"
+	     end,
+    filename:join(PrivDir, DynLib).
+
+priv_dir(Driver0) ->
+    {file, Path} = code:is_loaded(?MODULE),
+    Priv = case filelib:is_regular(Path) of
+	       true ->
+		   Beam = filename:join(["ebin/",atom_to_list(?MODULE) ++ ".beam"]),
+		   filename:join(strip(Path, Beam), "priv");
+	       false ->
+		   code:priv_dir(wx)
+	   end,
+    Driver = case os:type() of
+		 {win32,_} ->
+		     Driver0 ++ ".dll";
+		 _ ->
+		     Driver0 ++ ".so"
+	     end,
+
+    case file:read_file_info(filename:join(Priv, Driver)) of
+	{ok, _} ->
+	    Priv;
+	{error, _} ->
+	    error_logger:format("ERROR: Could not find \'~s\' in: ~s~n",
+				[Driver, Priv]),
+	    erlang:error({load_driver, "No driver found"})
+    end.
+
+strip(Src, Src) ->
+    [];
+strip([H|R], Src) ->
+    [H| strip(R, Src)].
+
diff --git a/lib/wx/test/Makefile b/lib/wx/test/Makefile
index 71b79aa272..90272372b2 100644
--- a/lib/wx/test/Makefile
+++ b/lib/wx/test/Makefile
@@ -62,8 +62,8 @@ release_spec:
 
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) wx.spec wx_test_lib.hrl $(ErlSrc) $(ErlTargets) $(RELSYSDIR)
-	$(INSTALL_PROGRAM) wxt $(RELSYSDIR)
+	$(INSTALL_DATA) wx.spec wx.cover wx_test_lib.hrl $(ErlSrc) $(ErlTargets) $(RELSYSDIR)
+	$(INSTALL_SCRIPT) wxt $(RELSYSDIR)
 
 release_docs_spec:
 
diff --git a/lib/wx/test/wx.cover b/lib/wx/test/wx.cover
new file mode 100644
index 0000000000..47e162ba7d
--- /dev/null
+++ b/lib/wx/test/wx.cover
@@ -0,0 +1,2 @@
+{incl_app,wx,details}.
+
diff --git a/lib/wx/test/wx.spec b/lib/wx/test/wx.spec
index a9201e5737..21e4a8c064 100644
--- a/lib/wx/test/wx.spec
+++ b/lib/wx/test/wx.spec
@@ -1,2 +1 @@
-{topcase, {dir, "../wx_test"}}.
-
+{suites,"../wx_test",all}.
diff --git a/lib/wx/test/wx_app_SUITE.erl b/lib/wx/test/wx_app_SUITE.erl
index 8fff324913..9c1e5868f4 100644
--- a/lib/wx/test/wx_app_SUITE.erl
+++ b/lib/wx/test/wx_app_SUITE.erl
@@ -45,22 +45,28 @@ init_per_testcase(Case, Config0) ->
 end_per_testcase(Func,Config) ->
     wx_test_lib:end_per_testcase(Func, Config).
 
-fin_per_testcase(Case, Config) ->
-    wx_test_lib:end_per_testcase(Case, Config).
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all() ->
-    all(suite).
-
-all(suite) ->
-    [
-     fields,
-     modules,
-     exportall,
-     app_depend,
-     undef_funcs
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [fields, modules, exportall, app_depend, undef_funcs].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl
index 599aa371ba..bdf54a1b35 100644
--- a/lib/wx/test/wx_basic_SUITE.erl
+++ b/lib/wx/test/wx_basic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -23,8 +23,9 @@
 %%% Created :  3 Nov 2008 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
 -module(wx_basic_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
 
@@ -41,20 +42,23 @@ init_per_testcase(Func,Config) ->
     wx_test_lib:init_per_testcase(Func,Config).
 end_per_testcase(Func,Config) -> 
     wx_test_lib:end_per_testcase(Func,Config).
-fin_per_testcase(Func,Config) -> %% For test_server
-    wx_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
-all() ->
-    all(suite).
-all(suite) ->
-    [
-     create_window,
-     several_apps,
-     wx_api,
-     wx_misc,
-     data_types
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [create_window, several_apps, wx_api, wx_misc,
+     data_types].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
   
 %% The test cases
 
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl
index 76df6e4a23..9c9dcd3576 100644
--- a/lib/wx/test/wx_class_SUITE.erl
+++ b/lib/wx/test/wx_class_SUITE.erl
@@ -24,8 +24,9 @@
 %%%-------------------------------------------------------------------
 -module(wx_class_SUITE).
 
--export([all/0, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
 
@@ -42,24 +43,23 @@ init_per_testcase(Func,Config) ->
     wx_test_lib:init_per_testcase(Func,Config).
 end_per_testcase(Func,Config) -> 
     wx_test_lib:end_per_testcase(Func,Config).
-fin_per_testcase(Func,Config) -> %% For test_server
-    wx_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
-all() ->
-    all(suite).
-all(suite) ->
-    [
-     calendarCtrl, 
-     treeCtrl,
-     notebook,
-     staticBoxSizer,
-     clipboard,
-     helpFrame,
-     htmlWindow,
-     listCtrlSort,
-     radioBox
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [calendarCtrl, treeCtrl, notebook, staticBoxSizer,
+     clipboard, helpFrame, htmlWindow, listCtrlSort,
+     radioBox, systemSettings].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 %% The test cases
 
@@ -137,6 +137,9 @@ treeCtrl(Config) ->
     wxFrame:connect(Tree, command_tree_item_expanded),
     wxFrame:connect(Tree, command_tree_item_collapsed),
     wxFrame:connect(Frame, close_window),
+
+    wxTreeCtrl:editLabel(Tree, Root),
+
     
     wx_test_lib:wx_destroy(Frame,Config).
 
@@ -389,3 +392,17 @@ radioBox(Config) ->
 
     wxWindow:show(Frame),
     wx_test_lib:wx_destroy(Frame,Config).
+
+
+systemSettings(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
+systemSettings(Config) ->
+    Wx = wx:new(),
+    Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
+    
+    ?m({_,_,_,_}, wxSystemSettings:getColour(?wxSYS_COLOUR_DESKTOP)),
+    ?mt(wxFont, wxSystemSettings:getFont(?wxSYS_SYSTEM_FONT)),
+    ?m(true, is_integer(wxSystemSettings:getMetric(?wxSYS_MOUSE_BUTTONS))),
+    ?m(true, is_integer(wxSystemSettings:getScreenType())),
+
+    wxWindow:show(Frame),
+    wx_test_lib:wx_destroy(Frame,Config).
diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl
index dea10d892e..3258f55e50 100644
--- a/lib/wx/test/wx_event_SUITE.erl
+++ b/lib/wx/test/wx_event_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -22,8 +22,9 @@
 %%% Created :  3 Nov 2008 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
 -module(wx_event_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
 
@@ -40,22 +41,23 @@ init_per_testcase(Func,Config) ->
     wx_test_lib:init_per_testcase(Func,Config).
 end_per_testcase(Func,Config) -> 
     wx_test_lib:end_per_testcase(Func,Config).
-fin_per_testcase(Func,Config) -> %% For test_server
-    wx_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
-all() ->
-    all(suite).
-all(suite) ->
-    [
-     connect,
-     disconnect,
-     connect_msg_20,
-     connect_cb_20,
-     mouse_on_grid,
-     spin_event,
-     connect_in_callback
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [connect, disconnect, connect_msg_20, connect_cb_20,
+     mouse_on_grid, spin_event, connect_in_callback].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
   
 %% The test cases
 
diff --git a/lib/wx/test/wx_opengl_SUITE.erl b/lib/wx/test/wx_opengl_SUITE.erl
index ce4651bcb1..93efa4c68f 100644
--- a/lib/wx/test/wx_opengl_SUITE.erl
+++ b/lib/wx/test/wx_opengl_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -22,8 +22,9 @@
 %%% Created :  3 Nov 2008 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
 -module(wx_opengl_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
 
@@ -48,18 +49,23 @@ init_per_testcase(Func,Config) ->
     wx_test_lib:init_per_testcase(Func,Config).
 end_per_testcase(Func,Config) -> 
     wx_test_lib:end_per_testcase(Func,Config).
-fin_per_testcase(Func,Config) -> %% For test_server
-    wx_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
-all() ->
-    all(suite).
-all(suite) ->
-    [
-     canvas,
-     glu_tesselation
-    ].
-  
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [canvas, glu_tesselation].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
 %% The test cases
 
 -define(VS, {{ 0.5,  0.5, -0.5},  %1
@@ -91,7 +97,7 @@ canvas(Config) ->
     
     ?m(true, wxWindow:show(Frame)),
     ?m(false, wx:is_null(wxGLCanvas:getContext(Canvas))),
-    ?m({'EXIT', {{no_gl_context,_},_}}, gl:getString(?GL_VENDOR)),
+    ?m({'EXIT', {{error, no_gl_context,_},_}}, gl:getString(?GL_VENDOR)),
 
     ?m(ok, wxGLCanvas:setCurrent(Canvas)),
     io:format("Vendor:     ~s~n",  [gl:getString(?GL_VENDOR)]),
@@ -113,7 +119,7 @@ canvas(Config) ->
     Data = {?FACES,?VS},
     drawBox(0, Data),
     ?m(ok, wxGLCanvas:swapBuffers(Canvas)),
-
+    ?m([], flush()),
     Env = wx:get_env(),
     Tester = self(),
     spawn_link(fun() -> 
@@ -125,10 +131,23 @@ canvas(Config) ->
 		       %% This may fail when window is deleted
 		       catch draw_loop(2,Data,Canvas)
 	       end),
-
     ?m_receive(works),
+    ?m([], flush()),
+    io:format("Undef func ~p ~n", [catch gl:uniform1d(2, 0.75)]),
+    timer:sleep(500),
+    ?m([], flush()),
     wx_test_lib:wx_destroy(Frame, Config).
-    
+
+flush() ->
+    flush([]).
+
+flush(Collected) ->
+    receive Msg -> 
+	    flush([Msg|Collected])
+    after 1 ->
+	    lists:reverse(Collected)
+    end.
+    	  
 draw_loop(Deg,Data,Canvas) ->
     timer:sleep(15),
     drawBox(Deg,Data),
@@ -136,6 +155,7 @@ draw_loop(Deg,Data,Canvas) ->
     draw_loop(Deg+1, Data,Canvas).
 
 
+
 drawBox(Deg,{Fs,Vs}) ->
     gl:matrixMode(?GL_MODELVIEW),
     gl:loadIdentity(),
diff --git a/lib/wx/test/wx_test_lib.erl b/lib/wx/test/wx_test_lib.erl
index 9368aa4bdc..8509d6be6f 100644
--- a/lib/wx/test/wx_test_lib.erl
+++ b/lib/wx/test/wx_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -35,7 +35,7 @@ init_per_suite(Config) ->
 		exit("Can not test on MacOSX");
 	    {unix, _} ->
 		io:format("DISPLAY ~s~n", [os:getenv("DISPLAY")]),
-		case proplists:get_value(xserver, Config, none) of
+		case ct:get_config(xserver, none) of
 		    none -> ignore;
 		    Server -> 
 			os:putenv("DISPLAY", Server)
@@ -200,7 +200,7 @@ eval_test_case(Mod, Fun, Config) ->
 test_case_evaluator(Mod, Fun, [Config]) ->
     NewConfig = Mod:init_per_testcase(Fun, Config),
     R = apply(Mod, Fun, [NewConfig]),
-    Mod:fin_per_testcase(Fun, NewConfig),
+    Mod:end_per_testcase(Fun, NewConfig),
     exit({test_case_ok, R}).
 
 wait_for_evaluator(Pid, Mod, Fun, Config) ->
@@ -216,12 +216,12 @@ wait_for_evaluator(Pid, Mod, Fun, Config) ->
 	{'EXIT', Pid, {skipped, Reason}} ->
 	    log("<WARNING> Test case ~w skipped, because ~p~n",
 		[{Mod, Fun}, Reason]),
-	    Mod:fin_per_testcase(Fun, Config),
+	    Mod:end_per_testcase(Fun, Config),
 	    {skip, {Mod, Fun}, Reason};
 	{'EXIT', Pid, Reason} ->
 	    log("<ERROR> Eval process ~w exited, because ~p~n",
 		[{Mod, Fun}, Reason]),
-	    Mod:fin_per_testcase(Fun, Config),
+	    Mod:end_per_testcase(Fun, Config),
 	    {crash, {Mod, Fun}, Reason}
     end.
 
diff --git a/lib/wx/test/wx_xtra_SUITE.erl b/lib/wx/test/wx_xtra_SUITE.erl
index d5888bbf94..0d876c4e52 100644
--- a/lib/wx/test/wx_xtra_SUITE.erl
+++ b/lib/wx/test/wx_xtra_SUITE.erl
@@ -23,8 +23,9 @@
 %%% Created :  3 Nov 2008 by Dan Gudmundsson <[email protected]>
 %%%-------------------------------------------------------------------
 -module(wx_xtra_SUITE).
--export([all/0, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
 
@@ -41,19 +42,23 @@ init_per_testcase(Func,Config) ->
     wx_test_lib:init_per_testcase(Func,Config).
 end_per_testcase(Func,Config) -> 
     wx_test_lib:end_per_testcase(Func,Config).
-fin_per_testcase(Func,Config) -> %% For test_server
-    wx_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
-all() ->
-    all(suite).
-all(suite) ->
-    [
-     destroy_app,
-     multiple_add_in_sizer,
-     app_dies,
-     menu_item_debug
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [destroy_app, multiple_add_in_sizer, app_dies,
+     menu_item_debug].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 
 %% The test cases
 
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index 54ab92cad2..dea0678063 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1,7 +1 @@
-WX_VSN = 0.98.5
-
-TICKETS = OTP-8330 OTP-8461  OTP-8408 OTP-8455 OTP-8462 
-TICKETS_0.98.4 = OTP-8243 OTP-8250 OTP-8292
-TICKETS_0.98.3 = OTP-8138 OTP-8126 OTP-8083
-TICKETS_0.98.2 = OTP-7943
-TICKETS_0.98.1 = OTP-7875
\ No newline at end of file
+WX_VSN = 0.98.8
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 207f6fdf16..aa66cbec77 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -31,6 +31,59 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.2.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> An empty element declared as simpleContent was not
+	    properly validated. </p>
+          <p>
+	    Own Id: OTP-8599</p>
+        </item>
+        <item>
+	    <p> Fix format_man_pages so it handles all man sections
+	    and remove warnings/errors in various man pages. </p>
+          <p>
+	    Own Id: OTP-8600</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Fix entity checking so there are no fatal errors for
+	    undefined entities when option skip_external_dtd is used.
+	    </p>
+          <p>
+	    Own Id: OTP-8947</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Xmerl 1.2.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fixed problem with hex entities in UTF-8 documents:
+	    When a document was in UTF-8 encoding, xmerl_scan
+	    improperly replaced hex entities by the UTF-8 bytes
+	    instead of returning the character, as it does with
+	    inline UTF-8 text and decimal entities. (Thanks to Paul
+	    Guyot.) </p>
+          <p>
+	    Own Id: OTP-8697</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.2.5</title>
 
     <section><title>Improvements and New Features</title>
@@ -50,6 +103,14 @@
             Own Id: OTP-8537
           </p>
         </item>
+        <item>
+          <p>
+           An empty element declared as a simpleContent was not properly validated.
+          </p>
+          <p>
+            Own Id: OTP-8599
+          </p>
+        </item>
       </list>
     </section>
 
diff --git a/lib/xmerl/src/xmerl_lib.erl b/lib/xmerl/src/xmerl_lib.erl
index 7b76a76a33..1b3a7e57f0 100644
--- a/lib/xmerl/src/xmerl_lib.erl
+++ b/lib/xmerl/src/xmerl_lib.erl
@@ -148,9 +148,10 @@ expand_element(Element) ->
 expand_element(Element, Pos, Parents) ->
     expand_element(Element, Pos, Parents, false).
 
-expand_element(E = #xmlElement{}, Pos, Parents, Norm) ->
-    Content = expand_content(E#xmlElement.content, 1, Parents, Norm),
-    Attrs = expand_attributes(E#xmlElement.attributes, 1, []),
+expand_element(E = #xmlElement{name = N}, Pos, Parents, Norm) ->
+    NewParents = [{N,Pos}|Parents],
+    Content = expand_content(E#xmlElement.content, 1, NewParents, Norm),
+    Attrs = expand_attributes(E#xmlElement.attributes, 1, NewParents),
     E#xmlElement{pos = Pos,
 		 parents = Parents,
 		 attributes = Attrs,
diff --git a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
index 9d184152d1..3b9eaa309c 100644
--- a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
+++ b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
@@ -1,7 +1,7 @@
 %%-*-erlang-*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -934,6 +934,13 @@ parse_att_value(?STRING_REST("&", Rest), State, Stop, Acc)  ->
 	    parse_att_value(Rest1, State2, Stop, ParsedValue ++ Acc);
 	{external_general, Name, _} ->
 	    ?fatal_error(State1, "External parsed entity reference in attribute value: " ++ Name);
+	{not_found, Name} ->
+	    case State#xmerl_sax_parser_state.skip_external_dtd of
+		false ->
+		    ?fatal_error(State1, "Entity not declared: " ++ Name); %%VC: Entity Declared
+		true ->
+		    parse_att_value(Rest1, State1, Stop, ";" ++ lists:reverse(Name) ++ "&" ++ Acc)
+	    end;
 	{unparsed, Name, _}  ->
 	    ?fatal_error(State1, "Unparsed entity reference in  attribute value: " ++ Name)
     end;
@@ -1098,6 +1105,13 @@ parse_content(?STRING_REST("&", Rest), State, Acc, _IgnorableWS) ->
 	{external_general, _, {PubId, SysId}} ->
 	    State2 = parse_external_entity(State1, PubId, SysId),
 	    parse_content(Rest1, State2, Acc, false);
+	{not_found, Name} ->
+	    case State#xmerl_sax_parser_state.skip_external_dtd of
+		false ->
+		    ?fatal_error(State1, "Entity not declared: " ++ Name); %%VC: Entity Declared
+		true ->
+		    parse_content(Rest1, State1, ";" ++ lists:reverse(Name) ++ "&" ++ Acc, false)
+	    end;
 	{unparsed, Name, _}  ->
 	    ?fatal_error(State1, "Unparsed entity reference in content: " ++ Name)
     end;
@@ -1357,7 +1371,7 @@ look_up_reference(Name, HaveToExist, State) ->
 			yes ->
 			    ?fatal_error(State, "Entity not declared: " ++ Name); %%WFC: Entity Declared 
 			no ->
-			    ?fatal_error(State, "Entity not declared: " ++ Name) %%VC: Entity Declared
+			    {not_found, Name}  %%VC: Entity Declared
 		    end;
 		false ->
 		    {not_found, Name}
@@ -1869,7 +1883,14 @@ parse_doctype_decl(?STRING_REST("%", Rest), State) ->
 	    parse_doctype_decl(?APPEND_STRING(IValue, Rest1), State1);
 	{external_parameter, _, {PubId, SysId}} ->
 	    State2 = parse_external_entity(State1#xmerl_sax_parser_state{file_type = entity}, PubId, SysId),
-	    parse_doctype_decl(Rest1, State2)
+	    parse_doctype_decl(Rest1, State2);
+	 {not_found, Name} ->
+	    case State#xmerl_sax_parser_state.skip_external_dtd of
+		false ->
+		    ?fatal_error(State1, "Entity not declared: " ++ Name); %%WFC: Entity Declared 
+		true ->
+		    parse_doctype_decl(Rest1, State1)
+	    end
     end;
 parse_doctype_decl(?STRING_REST("<!", Rest1), State) ->
     parse_doctype_decl_1(Rest1, State);
@@ -2443,7 +2464,7 @@ parse_ndata(Bytes, State) ->
 %%             Acc = string()
 %% Result    : {Value, Rest, State}
 %%             Value = string()
-%% Description: Parse an attribute value
+%% Description: Parse an entity value
 %%----------------------------------------------------------------------
 parse_entity_value(?STRING_EMPTY, State, undefined, Acc) ->
     {Acc, [], State}; %% stop clause when parsing references
@@ -2473,7 +2494,7 @@ parse_entity_value(?STRING_REST("&", Rest), State, Stop, Acc)  ->
 	{external_general, Name, _} ->
 	    parse_entity_value(Rest1, State1, Stop, ";" ++ lists:reverse(Name) ++ "&" ++ Acc);
 	{not_found, Name} ->
-	    parse_entity_value(Rest1, State1, Stop, ";" ++ lists:reverse(Name) ++ "&" ++ Acc);
+	    parse_entity_value(Rest1, State1, Stop, ";" ++ lists:reverse(Name) ++ "&" ++ Acc); 
 	{unparsed, Name, _} ->
 	    ?fatal_error(State1, "Unparsed entity reference in entity value: " ++ Name)
     end;
@@ -2490,7 +2511,15 @@ parse_entity_value(?STRING_REST("%", Rest), #xmerl_sax_parser_state{file_type=Ty
 		    IValue = ?TO_INPUT_FORMAT(" " ++ RefValue ++ " "),
 		    parse_entity_value(?APPEND_STRING(IValue, Rest1), State1, Stop, Acc);
 		{external_parameter, _, {_PubId, _SysId}} ->
-		    ?fatal_error(State1, "Parameter references in entity value not supported yet.")
+		    ?fatal_error(State1, "Parameter references in entity value not supported yet.");
+		{not_found, Name} ->
+		    case State#xmerl_sax_parser_state.skip_external_dtd of
+			false ->
+			    ?fatal_error(State1, "Entity not declared: " ++ Name); %%VC: Entity Declared
+			true ->
+			    parse_entity_value(Rest1, State1, Stop, ";" ++ lists:reverse(Name) ++ "&" ++ Acc)
+		    end
+			
 	    end
     end;
 parse_entity_value(?STRING_UNBOUND_REST(Stop, Rest), State, Stop, Acc) -> 
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 4e5cc59d8f..e07d495fc7 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2003-2010. 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%
 %%
 
@@ -34,7 +34,9 @@
 %% See also <a href="xmerl_examples.html">tutorial</a> on customization
 %% functions.
 %% </p>
+%% <p>
 %% Possible options are:
+%% </p>
 %% <dl>
 %%  <dt><code>{acc_fun, Fun}</code></dt>
 %%    <dd>Call back function to accumulate contents of entity.</dd>
@@ -2602,8 +2604,7 @@ scan_reference("#x" ++ T, S0) ->
     %% [66] CharRef
     ?bump_col(1),
     if hd(T) /= $; ->
-	    {[Ch], T2, S2} = scan_char_ref_hex(T, S, 0),
-	    {to_char_set(S2#xmerl_scanner.encoding,Ch),T2,S2};
+	    scan_char_ref_hex(T, S, 0);
        true ->
 	    ?fatal(invalid_char_ref, S)
     end;
@@ -3452,14 +3453,14 @@ scan_entity_value("%" ++ T, S0, Delim, Acc, PEName,Namespace,PENesting) ->
 			%% {system,URI} or {public,URI}
 			%% Included in literal.
 			{ExpRef,Sx}=fetch_not_parse(Tuple,S1),
-			{EntV,_,_S2} = 
-			    scan_entity_value(ExpRef, Sx, no_delim,[],
+			{EntV, _, S5} = 
+		 	    scan_entity_value(ExpRef, Sx, no_delim,[],
 					      PERefName,parameter,[]),
 			%% should do an update Write(parameter_entity)
 			%% so next expand_pe_reference is faster
-			{EntV,_S2};
+			{string_to_char_set(S5#xmerl_scanner.encoding, EntV), S5};
 		     ExpRef ->
-			{ExpRef,S1}
+			{string_to_char_set(S1#xmerl_scanner.encoding, ExpRef) ,S1}
 		end,
 	    %% single or duoble qoutes are not treated as delimeters
 	    %% in passages "included in literal"
@@ -4020,12 +4021,12 @@ utf8_2_ucs([A|Rest]) when A < 16#80 ->
 utf8_2_ucs([A|Rest]) ->
     {{error,{bad_character,A}},Rest}.
 
-to_char_set("iso-10646-utf-1",Ch) ->
-    [Ch];
-to_char_set(UTF8,Ch) when UTF8 =:= "utf-8"; UTF8 =:= undefined ->
-    ucs_2_utf8(Ch);
-to_char_set(_,Ch) ->
-    [Ch].
+%% to_char_set("iso-10646-utf-1",Ch) ->
+%%     [Ch];
+%% to_char_set(UTF8,Ch) when UTF8 =:= "utf-8"; UTF8 =:= undefined ->
+%%     ucs_2_utf8(Ch);
+%% to_char_set(_,Ch) ->
+%%     [Ch].
 
 ucs_2_utf8(Ch) when Ch < 128 ->
     %% 0vvvvvvv
diff --git a/lib/xmerl/src/xmerl_xpath.erl b/lib/xmerl/src/xmerl_xpath.erl
index 182a186d2c..e654a8ef1d 100644
--- a/lib/xmerl/src/xmerl_xpath.erl
+++ b/lib/xmerl/src/xmerl_xpath.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -57,7 +57,9 @@
 %% @type option_list(). <p>Options allows to customize the behaviour of the
 %%     XPath scanner.
 %% </p>
+%% <p>
 %% Possible options are:
+%% </p>
 %% <dl>
 %%  <dt><code>{namespace, #xmlNamespace}</code></dt>
 %%    <dd>Set namespace nodes, from XmlNamspace, in xmlContext</dd>
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index c7bca86205..c0923520c2 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2006-2010. 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%
 %%
 
@@ -29,7 +29,9 @@
 %% @type option_list(). <p>Options allow to customize the behaviour of the 
 %% validation.
 %% </p>
+%% <p>
 %% Possible options are :
+%% </p>
 %% <dl>
 %%   <dt><code>{tab2file,boolean()}</code></dt>
 %%      <dd>Enables saving of abstract structure on file for debugging
@@ -46,6 +48,7 @@
 %%      <dd>It is possible by this option to provide a state with process
 %%          information from an earlier validation.</dd> 
 %% </dl>
+%% @end
 %%%-------------------------------------------------------------------
 -module(xmerl_xsd).
 
@@ -2687,13 +2690,16 @@ check_element_type(XML=[E=#xmlElement{name=Name}|Rest],
 	_ ->
 	    {error,{error_path(E,Name),?MODULE,{element_bad_match,E,Any,Env}}}
     end;
-check_element_type([],CM,_Env,_Block,_S,Checked) ->
+check_element_type([],CM,_Env,_Block,S,Checked) ->
     %% #schema_complex_type, any, #schema_group, anyType and lists are
     %% catched above.
     case CM of
+	#schema_simple_type{} ->
+	    {NewVal,S2} = check_type(CM,[],unapplied,S),
+	    {NewVal,[],S2};
 	{simpleType,_} ->
-	    {error,{error_path(Checked,undefined),?MODULE,
-		    {empty_content_not_allowed,CM}}};
+	    {NewVal,S2} = check_type(CM,[],unapplied,S),
+	    {NewVal,[],S2};
 	_ ->
 	    {error,{error_path(Checked,undefined),?MODULE,
 		    {empty_content_not_allowed,CM}}}
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 83b9d4826f..a4d7efaee3 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1,129 +1 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2003-2010. 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%
-#
-
-XMERL_VSN = 1.2.5
-
-
-TICKETS	= \
-	OTP-8537
-
-TICKETS_1.2.5 = \
-	OTP-8537
-
-TICKETS_1.2.4 = \
-	OTP-8343 
-
-TICKETS_1.2.3 = \
-	OTP-8251 \
-	OTP-8252 \
-	OTP-8253 
-
-TICKETS_1.2.2 = \
-        OTP-8213 \
-	OTP-8214
-
-TICKETS_1.2.1 = \
-	OTP-8084 \
-	OTP-8153 \
-	OTP-8156
-
-TICKETS_1.2 = \
-	OTP-6635
-
-TICKETS_1.1.12 = \
-	OTP-7847
-
-TICKETS_1.1.11 = \
-	OTP-7736
-
-TICKETS_1.1.10 = \
-	OTP-6053 \
-	OTP-6873 \
-        OTP-7430 \
-        OTP-7473 \
-	OTP-7496
-
-TICKETS_1.1.9 = \
-	OTP-5998 \
-	OTP-6947 \
-	OTP-7288
-
-TICKETS_1.1.8 = \
-	OTP-7211 \
-	OTP-7214
-
-TICKETS_1.1.7 = \
-	OTP-7190
-
-TICKETS_1.1.6 = \
-	OTP-6773 \
-	OTP-6777 \
-	OTP-6877 \
-	OTP-6910
-
-TICKETS_1.1.5 = \
-	OTP-6720 \
-	OTP-6739 \
-	OTP-6752
-
-TICKETS_1.1.4 = \
-	OTP-6679
-
-TICKETS_1.1.3 = \
-	OTP-6599
-
-TICKETS_1.1.2 = \
-	OTP-6507 \
-	OTP-6460
-
-TICKETS_1.1.1 = \
-	OTP-6402
-
-TICKETS_1.1 = \
-	OTP-6043 \
-	OTP-6099 \
-	OTP-6401
-
-TICKETS_1.0.5 = \
-
-
-TICKETS_1.0.4 = \
-	OTP-5599 \
-	OTP-5718 \
-	OTP-5734 \
-	OTP-5895 \
-	OTP-5902 \
-	OTP-5905
-
-TICKETS_1.0.3 = \
-	OTP-5587
-
-TICKETS_1.0.2 = \
-	OTP-5498 \
-	OTP-5500 \
-	OTP-5531
-
-TICKETS_1.0.1 = \
-	OTP-5268 \
-	OTP-5301 \
-	OTP-5407
-
-TICKETS_1.0 = \
-        OTP-5174 \
-
+XMERL_VSN = 1.2.7
diff --git a/make/emd2exml.in b/make/emd2exml.in
index 17cb0a0b57..16c38379d9 100644
--- a/make/emd2exml.in
+++ b/make/emd2exml.in
@@ -44,6 +44,7 @@
 -define(DELAYED_TOC_IX, 1).
 -define(DELAYED_START_IX, 2).
 
+-compile({no_auto_import,[error/2]}).
 -mode(compile).
 
 -export([main/1]).
@@ -380,6 +381,8 @@ put_text(S, [$>|Cs], CTag, EmTag, Acc) when CTag /= no ->
     put_text(S, Cs, CTag, EmTag, ["&gt;"|Acc]);
 put_text(S, [$&|Cs], CTag, EmTag, Acc) when CTag /= no ->
     put_text(S, Cs, CTag, EmTag, ["&amp;"|Acc]);
+put_text(S, [$&, $  |Cs], CTag, EmTag, Acc) -> %Workaround for INSTALL-WIN32.md
+     put_text(S, Cs, CTag, EmTag, ["&amp; "|Acc]);
 put_text(S, [$'|Cs], CTag, EmTag, Acc)when CTag /= no  ->
     put_text(S, Cs, CTag, EmTag, ["&apos;"|Acc]);
 put_text(S, [$<|Cs], no, EmTag, Acc) ->
diff --git a/make/otp.mk.in b/make/otp.mk.in
index 9f0486a609..bf287be416 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -25,6 +25,11 @@
 	.3 .1 .fig .dvi .tex .class .java .pdf .fo .psframe .pscrop .el .elc
 
 # ----------------------------------------------------
+#	Cross Compiling
+# ----------------------------------------------------
+CROSS_COMPILING = @CROSS_COMPILING@
+
+# ----------------------------------------------------
 #	Common macros
 # ----------------------------------------------------
 DEFAULT_TARGETS =  opt debug release release_docs clean docs
@@ -204,6 +209,8 @@ MAN9DIR = $(DOCDIR)/man9
 
 TEXDIR = .
 
+SPECDIR = $(DOCDIR)/specs
+
 # HTML & GIF files that always are generated and must be delivered 
 SGML_COLL_FILES = $(SGML_APPLICATION_FILES) $(SGML_PART_FILES)
 XML_COLL_FILES = $(XML_APPLICATION_FILES) $(XML_PART_FILES)
@@ -232,41 +239,52 @@ FOP = @FOP@
 
 DOCGEN=$(ERL_TOP)/lib/erl_docgen
 
+SPECS_ESRC = ../../src
+# Extract specifications and types from Erlang source files (-spec, -type)
+$(SPECDIR)/specs_%.xml: $(SPECS_ESRC)/%.erl
+	escript $(DOCGEN)/priv/bin/specs_gen.escript $(SPECS_FLAGS) -o$(dir $@) $<
 
 
-$(MAN1DIR)/%.1:: %.xml
+$(MAN1DIR)/%.1: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
 
-$(MAN2DIR)/%.2:: %.xml
+$(MAN2DIR)/%.2: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
 
-$(MAN3DIR)/%.3:: %.xml
+ifneq ($(wildcard $(SPECDIR)),)
+$(MAN3DIR)/%.3: %.xml $(SPECDIR)/specs_%.xml
+	date=`date +"%B %e %Y"`; \
+	specs_file=`pwd`/$(SPECDIR)/specs_$*.xml; \
+	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --stringparam specs_file "$$specs_file" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
+else
+$(MAN3DIR)/%.3: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
+endif
 
 # left for compatability
-$(MAN4DIR)/%.4:: %.xml
+$(MAN4DIR)/%.4: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
-$(MAN4DIR)/%.5:: %.xml
+$(MAN4DIR)/%.5: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
 # left for compatability
-$(MAN6DIR)/%.6:: %_app.xml
+$(MAN6DIR)/%.6: %_app.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
-$(MAN6DIR)/%.7:: %_app.xml
+$(MAN6DIR)/%.7: %_app.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
-$(MAN9DIR)/%.9:: %.xml
+$(MAN9DIR)/%.9: %.xml
 	date=`date +"%B %e %Y"`; \
 	xsltproc --output "$@" --stringparam company "Ericsson AB" --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude -path $(DOCGEN)/priv/docbuilder_dtd  -path $(DOCGEN)/priv/dtd_man_entities $(DOCGEN)/priv/xsl/db_man.xsl $<
 
diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk
index 7d433e738c..8058e634d4 100644
--- a/make/otp_release_targets.mk
+++ b/make/otp_release_targets.mk
@@ -21,13 +21,30 @@
 # Targets for the new documentation support
 # ----------------------------------------------------
 
+ifneq ($(TOP_SPECS_FILE),)
+TOP_SPECS_PARAM = --stringparam specs_file "`pwd`/$(TOP_SPECS_FILE)"
+endif
+
+MOD2APP = $(ERL_TOP)/make/$(TARGET)/mod2app.xml
+ifneq ($(wildcard $(MOD2APP)),)
+MOD2APP_PARAM = --stringparam mod2app_file "$(MOD2APP)"
+endif
+
 ifeq ($(TOPDOC),)
-$(HTMLDIR)/index.html: $(XML_FILES)
+$(HTMLDIR)/index.html: $(XML_FILES) $(SPECS_FILES)
 	date=`date +"%B %e %Y"`; \
-	$(XSLTPROC) --noout --stringparam outdir $(HTMLDIR) --stringparam docgen "$(DOCGEN)" --stringparam topdocdir "$(TOPDOCDIR)" \
-		--stringparam pdfdir "$(PDFDIR)" \
-		--stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude \
-		-path $(DOCGEN)/priv/docbuilder_dtd -path $(DOCGEN)/priv/dtd_html_entities $(DOCGEN)/priv/xsl/db_html.xsl book.xml
+	$(XSLTPROC) --noout \
+          --stringparam outdir $(HTMLDIR) \
+          --stringparam docgen "$(DOCGEN)" \
+          --stringparam topdocdir "$(TOPDOCDIR)" \
+          --stringparam pdfdir "$(PDFDIR)" \
+          --xinclude $(TOP_SPECS_PARAM) $(MOD2APP_PARAM) \
+          --stringparam gendate "$$date" \
+          --stringparam appname "$(APPLICATION)" \
+          --stringparam appver "$(VSN)" \
+          -path $(DOCGEN)/priv/docbuilder_dtd \
+          -path $(DOCGEN)/priv/dtd_html_entities \
+            $(DOCGEN)/priv/xsl/db_html.xsl book.xml
 endif
 
 $(HTMLDIR)/users_guide.html: $(XML_FILES)
@@ -37,14 +54,17 @@ $(HTMLDIR)/users_guide.html: $(XML_FILES)
 		--stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" --stringparam appver "$(VSN)" --xinclude  \
 		-path $(DOCGEN)/priv/docbuilder_dtd -path $(DOCGEN)/priv/dtd_html_entities $(DOCGEN)/priv/xsl/db_html.xsl book.xml
 
-
-%.fo: $(XML_FILES)
+%.fo: $(XML_FILES) $(SPECS_FILES)
 	date=`date +"%B %e %Y"`; \
-	$(XSLTPROC) --stringparam docgen "$(DOCGEN)" --stringparam gendate "$$date" --stringparam appname "$(APPLICATION)" \
-		--stringparam appver "$(VSN)" --xinclude \
-		-path $(DOCGEN)/priv/docbuilder_dtd -path $(DOCGEN)/priv/dtd_html_entities $(DOCGEN)/priv/xsl/db_pdf.xsl book.xml > $@
-
-
+	$(XSLTPROC) \
+         --stringparam docgen "$(DOCGEN)" \
+         --stringparam gendate "$$date" \
+         --stringparam appname "$(APPLICATION)" \
+         --stringparam appver "$(VSN)" \
+         --xinclude $(TOP_SPECS_PARAM) \
+         -path $(DOCGEN)/priv/docbuilder_dtd \
+         -path $(DOCGEN)/priv/dtd_html_entities \
+           $(DOCGEN)/priv/xsl/db_pdf.xsl book.xml > $@
 
 # ------------------------------------------------------------------------
 # The following targets just exist in the documentation directory
diff --git a/otp_build b/otp_build
index 67608138f7..1172592415 100755
--- a/otp_build
+++ b/otp_build
@@ -21,9 +21,6 @@
 # Expected autoconf version
 EXPECTED_AUTOCONF_VERSION=2.59
 
-# clearmake command to use
-clearmake=false
-
 # Global configuration variables
 #
 # NOTE: lazy_configure depends on '.' always being last directory
@@ -77,14 +74,6 @@ usage ()
     case $version_controller in
 	none)
 	    ;;
-	clearcase)
-	    echo ""
-	    echo "Handle the primary bootstrap in Clearcase:"
-	    echo "    prepare_primary - prepare for building a primary bootstrap"
-	    echo "    update_primary - create the primary bootstrap"
-	    echo "    commit_primary - commit a primary bootstrap"
-	    echo "    cancel_primary - uncheckout a primary bootstrap"
-	    ;;
 	git)
 	    echo ""
 	    echo "update_primary - build and commit a new primary bootstrap"
@@ -94,14 +83,6 @@ usage ()
     case $version_controller in
 	none)
 	    ;;
-	clearcase)
-	    echo ""
-	    echo "Handle the preloaded modules in Clearcase:"
-	    echo "    prepare_preloaded - prepares for building preloaded code"
-	    echo "    update_preloaded - creates the preloaded code"
-	    echo "    commit_preloaded - commits the preloaded code"
-	    echo "    cancel_preloaded - uncheckout preloaded code"
-	    ;;
 	git)
 	    echo ""
 	    echo "update_preloaded - build and commit the preloaded modules"
@@ -109,6 +90,12 @@ usage ()
     esac
 }
 
+git_required ()
+{
+    echo "This operation must be run in a git repository."
+    exit 1
+}
+
 hide_vars ()
 {
     script=
@@ -164,17 +151,11 @@ determine_version_controller ()
 {
     version_controller=none
 
-    # The current directory is now $ERL_TOP. Check for
-    # either this directory being controlled by git or
-    # for the "otp_build" file being a Clearcase controlled
-    # object.
+    # The current directory is now $ERL_TOP. Find out whether
+    # this directory is a git repository.
 
     if { git rev-parse --git-dir; } 2>/dev/null >/dev/null; then
 	version_controller=git
-    else
-	if test -d "otp_build@@/"; then
-	    version_controller=clearcase
-	fi
     fi
 }
 # Execution of the different options
@@ -505,6 +486,15 @@ EOF
     return 0
 }
 
+maybe_copy_static_cache ()
+{
+    if [ '!' -z "$OVERRIDE_CONFIG_CACHE_STATIC" ]; then
+	if [ '!' -z "$OVERRIDE_CONFIG_CACHE" ]; then
+	    cp -f "$OVERRIDE_CONFIG_CACHE_STATIC" "$OVERRIDE_CONFIG_CACHE"
+	fi
+    fi
+}
+
 do_configure ()
 {
     setup_make
@@ -534,6 +524,7 @@ do_configure ()
 		exit 1;;
 	esac
     else
+	maybe_copy_static_cache
 	try_cross_configure "$@"
 	if [ $cross_configure = no ]; then
 	    CONFIG_FLAGS=
@@ -550,6 +541,7 @@ do_lazy_configure ()
 	echo "Not supported for cross compilation" >&2
 	exit 1
     fi
+    maybe_copy_static_cache
     CONFIG_FLAGS=
     set_config_flags "$@"
     CONFIGURE_FLAGS="$@"
@@ -756,8 +748,11 @@ echo_env_win32 ()
     echo_setenv CXX cc.sh ';'
     echo_setenv AR ar.sh ';'
     echo_setenv RANLIB true ';'
-    echo_setenv OVERRIDE_CONFIG_CACHE "$ERL_TOP/erts/autoconf/win32.config.cache"
-    echo_setenv PATH "$ERL_TOP/erts/etc/win32/cygwin_tools/vc:$ERL_TOP/erts/etc/win32/cygwin_tools:$P3"
+    if [ -f "$ERL_TOP/erts/autoconf/win32.config.cache.static" ]; then
+	echo_setenv OVERRIDE_CONFIG_CACHE_STATIC  "$ERL_TOP/erts/autoconf/win32.config.cache.static" ';'
+    fi
+    echo_setenv OVERRIDE_CONFIG_CACHE "$ERL_TOP/erts/autoconf/win32.config.cache" ';'
+    echo_setenv PATH "$ERL_TOP/erts/etc/win32/cygwin_tools/vc:$ERL_TOP/erts/etc/win32/cygwin_tools:$P3" ';'
     echo_envinfo
 }
 
@@ -861,47 +856,16 @@ setup_make ()
 	    win32)
 		MAKE=make;;
 	    *)
-		if [ "X$CLEARCASE_MAKE_COMPAT" = "Xgnu" -a \
-		     X"$CLEARCASE_ROOT" != X"" -a \
-		    -n "`lookup_prog_in_path clearmake`"  ]; then
-		    clearmake="clearmake -V"
-		    MAKE=$clearmake
-		else 
-		    if [ -n "`lookup_prog_in_path gmake`" ]; then
-			MAKE=gmake
-		    else
-			MAKE=make
-		    fi
+		if [ -n "`lookup_prog_in_path gmake`" ]; then
+		    MAKE=gmake
+		else
+		    MAKE=make
 		fi;;
        esac
     fi
     export MAKE
 }
     
-do_noboot_lib_and_erts ()
-{
-    setup_make
-    EMULATORS=emulator
-    if [ X`$MAKE is_cross_configured` = Xyes ]; then
-	TARGET=`$MAKE target_configured`
-    fi
-    if [ "x$MAKE" != "x$clearmake" ]; then
-	$MAKE MAKE="$MAKE" TARGET=$TARGET OTP_SMALL_BUILD=$OTP_SMALL_BUILD depend || exit 1;
-    fi
-    $MAKE MAKE="$MAKE" TARGET=$TARGET OTP_SMALL_BUILD=$OTP_SMALL_BUILD TYPE=$TYPE FLAVOR=$FLAVOR noboot || exit 1
-}
-
-do_primary ()
-{
-    setup_make
-    if [ "x$OVERRIDE_TARGET" != "x" -a "x$OVERRIDE_TARGET" != "xwin32" ]; then
-	echo "OVERRIDE_TARGET set" >&2
-	exit 1
-    else
-	$MAKE MAKE="$MAKE" BOOTSTRAP_ROOT=$BOOTSTRAP_ROOT TARGET=$TARGET primary_bootstrap || exit 1;
-    fi
-}
-
 do_primary_git ()
 {
     setup_make
@@ -918,124 +882,6 @@ do_primary_git ()
     git commit --no-verify -m 'Update primary bootstrap'
 }
 
-
-do_prepare ()
-{
-    CT=`lookup_prog_in_path cleartool`
-    if [ X"$CLEARCASE_ROOT" = X"" -o  X"$CT" = X"" ]; then 
-	echo "To prepare for update of primary bootstrap, you need to run in a clearcase view." >&2
-	return
-    fi
-
-    if [ X"$ERL_TOP" = X"" ]; then
-	echo "ERL_TOP is not set." >&2
-	return
-    fi
-
-    $CT ls -rec -view_only $ERL_TOP/bootstrap | xargs rm -rf
-
-    $CT find $ERL_TOP/bootstrap -cview -nxname -print | xargs $CT co -nc
-    echo '*****************************************************'
-    echo "Prepared for new bootstrap build - "
-    echo "directory bootstrap clean and completely checked out."
-    echo '*****************************************************'
-}
-
-do_commit ()
-{
-    CT=`lookup_prog_in_path cleartool`
-    if [ X"$CLEARCASE_ROOT" = X"" -o  X"$CT" = X"" ]; then 
-	echo "To prepare for update of primary bootstrap, you need to run in a clearcase view." >&2
-	return
-    fi
-
-    if [ X"$ERL_TOP" = X"" ]; then
-	echo "ERL_TOP is not set." >&2
-	return
-    fi
-
-
-    for x in compiler kernel stdlib orber/include; do
-	files=`$CT lspriv -do $ERL_TOP/bootstrap/lib/$x`
-	for y in $files; do
-	    echo "Creating $y"
-	    $CT mkelem -nc $y
-	done
-    done
-    $CT lsco -rec -me -cview -s $ERL_TOP/bootstrap | xargs $CT ci -nc -ident
-    $CT lsco -d -me -cview -s $ERL_TOP/bootstrap | xargs $CT ci -nc -ident
-
-    $CT ls -rec -view_only -nxname $ERL_TOP/bootstrap | xargs rm -rf
-
-
-    echo '*****************************************************'
-    echo "Checked in primary bootstrap."
-    echo '*****************************************************'
-}
-
-do_cancel ()
-{
-    CT=`lookup_prog_in_path cleartool`
-    if [ X"$CLEARCASE_ROOT" = X"" -o  X"$CT" = X"" ]; then 
-	echo "To prepare for update of primary bootstrap, you need to run in a clearcase view." >&2
-	return
-    fi
-
-    if [ X"$ERL_TOP" = X"" ]; then
-	echo "ERL_TOP is not set." >&2
-	return
-    fi
-    NOTEMPTY=`$CT lsco -rec -me -cview -s $ERL_TOP/bootstrap`
-    if [ X"$NOTEMPTY" != X"" ]; then
-	$CT lsco -rec -me -cview -s $ERL_TOP/bootstrap | xargs $CT unco -rm
-	$CT unco $ERL_TOP/bootstrap
-    fi
-    $CT ls -rec -view_only $ERL_TOP/bootstrap | xargs rm -rf
-    echo '*****************************************************'
-    echo "Cancelled all checkouts for primary bootstrap."
-    echo '*****************************************************'
-
-}
-do_prepare_prel ()
-{
-    CT=`lookup_prog_in_path cleartool`
-    if [ X"$CLEARCASE_ROOT" = X"" -o  X"$CT" = X"" ]; then 
-	echo "To prepare for update of preloaded code, you have to run in a Clearcase view" >&2
-	return
-    fi
-
-    if [ X"$ERL_TOP" = X"" ]; then
-	echo "ERL_TOP is not set." >&2
-	return
-    fi
-
-    setup_make
-    (cd $ERL_TOP/erts/preloaded/src && $MAKE MAKE="$MAKE" BOOTSTRAP_ROOT=$BOOTSTRAP_ROOT TARGET=$TARGET prepare) || exit 1
-    echo '*****************************************************'
-    echo "Prepared for new preloaded code build - "
-    echo "Directory ERL_TOP/erts/preloaded/ebin completely"
-    echo "checked out."
-    echo '*****************************************************'
-}
-
-do_update_prel ()
-{
-    CT=`lookup_prog_in_path cleartool`
-
-    if [ X"$ERL_TOP" = X"" ]; then
-	echo "ERL_TOP is not set." >&2
-	return
-    fi
-
-    setup_make
-    (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)
-    echo '*****************************************************'
-    echo "Rebuilt preloaded code."
-    echo '*****************************************************'
-}    
-
 do_update_prel_git ()
 {
     setup_make
@@ -1046,48 +892,6 @@ do_update_prel_git ()
     git commit -m 'Update preloaded modules'
 }
 
-do_commit_prel ()
-{
-    CT=`lookup_prog_in_path cleartool`
-    if [ X"$CLEARCASE_ROOT" = X"" -o  X"$CT" = X"" ]; then 
-	echo "To prepare for update of primary bootstrap, you need to run in a clearcase view." >&2
-	return
-    fi
-
-    if [ X"$ERL_TOP" = X"" ]; then
-	echo "ERL_TOP is not set." >&2
-	return
-    fi
-    setup_make
-
-    (cd $ERL_TOP/erts/preloaded/ebin && $CT ci -ident -nc *.beam)
-    (cd $ERL_TOP/erts/preloaded && $CT ci -ident -nc ebin)
-
-    echo '*****************************************************'
-    echo "Checked in preloaded code."
-    echo '*****************************************************'
-}
-
-do_cancel_prel ()
-{
-    CT=`lookup_prog_in_path cleartool`
-    if [ X"$CLEARCASE_ROOT" = X"" -o  X"$CT" = X"" ]; then 
-	echo "To prepare for update of primary bootstrap, you need to run in a clearcase view." >&2
-	return
-    fi
-
-    if [ X"$ERL_TOP" = X"" ]; then
-	echo "ERL_TOP is not set." >&2
-	return
-    fi
-    setup_make
-    (cd $ERL_TOP/erts/preloaded/src && $MAKE MAKE="$MAKE" BOOTSTRAP_ROOT=$BOOTSTRAP_ROOT TARGET=$TARGET cancel) || exit 1
-    echo '*****************************************************'
-    echo "Cancelled all checkouts for preloaded code."
-    echo '*****************************************************'
-
-}
-
 do_boot ()
 {
     setup_make
@@ -1362,33 +1166,19 @@ case "$1" in
 		    FLAVOR=plain
 		fi
 		do_boot;;
-	prepare_primary)
-		do_prepare;;
 	update_primary)
 		case $version_controller in
 		    git) do_primary_git ;;
-		    clearcase) do_primary ;;
-		    none) do_primary ;;
+		    none) git_required ;;
 		esac ;;
-	commit_primary)
-		do_commit;;
-	cancel_primary)
-		do_cancel;;
-	prepare_preloaded)
-		do_prepare_prel;;
 	update_preloaded)
 		case $version_controller in
 		    git) do_update_prel_git ;;
-		    clearcase) do_update_prel ;;
-		    none) do_update_prel ;;
+		    none) git_required ;;
 		esac ;;
-	commit_preloaded)
-		do_commit_prel;;
-	cancel_preloaded)
-		do_cancel_prel;;
         primary)
 	        echo "Primary bootstrap is under version control since R13";
-		echo "Use {prepare,update,commit}_primary if you really are"; 
+		echo "Use update_primary if you really are";
 		echo "updating the primary bootstrap...";;
 	boot)
 		do_boot;;
diff --git a/prebuild.delete b/prebuild.delete
index 901480a63d..b1b18adbcb 100644
--- a/prebuild.delete
+++ b/prebuild.delete
@@ -1 +1,2 @@
 bootstrap/lib
+bootstrap/target
diff --git a/system/README b/system/README
index 15ccfd2f84..317030373c 100644
--- a/system/README
+++ b/system/README
@@ -1,7 +1,7 @@
-Erlang/OTP                                               February 18, 2010
+Erlang/OTP                                               June 11, 2010
 
 
-LAST MINUTE INFORMATION -- Release of Erlang 5.7.5/OTP R13B04
+LAST MINUTE INFORMATION -- Release of Erlang 5.8/OTP R14A
 
 
 1.      GENERAL
diff --git a/system/doc/Books/src/HOWTO.txt b/system/doc/Books/src/HOWTO.txt
deleted file mode 100644
index 1fa47446e3..0000000000
--- a/system/doc/Books/src/HOWTO.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Peter H�gfeldt		2001-04-27	A
-
-HOWTO for building books for printing
--------------------------------------
-
-Note:	Books are also built automatically by a daily build script.
-	That is the only safe way to build books. 
-
-Note:	Manual handling of dependency files has been removed. 
-
-1.	To build a book, ug say, in pdf format with a frame, be sure
-	to have a clean view, and run
-
-	i)	clearmake -V clean
-	ii)	clearmake -V depend
-	iii)	clearmake -V ug.frame.pdf
-
-	You can build the following variants: ug.ps, ug.pdf, ug.frame.ps,
-	ug.frame.pdf, ug.crop.ps, and ug.crop.pdf. 
-
-	To build all frame.pdf and crop.pdf books replace iii) by
-
-	iii)	clearmake -V release_books TESTROOT=/some/dest/dir
-
-	and you will get all books in /some/dest/dir.
-
-2.	To change the contents of a book you have to:
-
-	i)	Edit the sgml book file, e.g. ug.sgml.
-
-	ii)	Do the corresponding changes in the Makefile (if needed).
-
-
-
-
diff --git a/system/doc/Books/src/Makefile b/system/doc/Books/src/Makefile
deleted file mode 100644
index 9d346cb230..0000000000
--- a/system/doc/Books/src/Makefile
+++ /dev/null
@@ -1,127 +0,0 @@
-# ----------------------------------------------------
-# Copyright (C) 1997, Ericsson Telecommunications
-# Author: Lars Thorsen, Hans Nilsson
-# ----------------------------------------------------
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifeq (ug.dep,$(wildcard ug.dep))
-include ug.dep
-include database_management.dep
-include orber_ic.dep
-include basic_application.dep
-include tools.dep
-include operation_maintenance.dep
-include interfaces.dep
-include stdlib.dep
-include corba_service.dep
-endif
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-BOOKS = \
-	ug \
-	database_management \
-	orber_ic \
-	corba_service \
-	basic_application \
-	tools \
-	operation_maintenance \
-	interfaces \
-	stdlib
-
-TEX_FILES = $(shell for i in $(BOOKS) ; do (echo $$i.tex); done)
-
-FRAME_CROP_PDF_FILES = $(BOOKS:%=%.frame.pdf) $(BOOKS:%=%.crop.pdf)
-
-# ----------------------------------------------------
-# FLAGS 
-# ----------------------------------------------------
-XML_FLAG_booksty = -booksty otpBOOK
-DVIPS_FLAGS += -O '19mm,32.5mm'
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-all:	$(FRAME_CROP_PDF_FILES)
-
-books:	all
-
-clean:
-	rm -f $(TEX_FILES)
-	rm -f *.psframe *.pscrop *.ps
-	rm -f $(TOP_PS_FILES)
-	rm -f errs core *~ $(LATEX_CLEAN)
-	rm -f *.dep *.pdf
-
-dep depend:
-	@for i in $(BOOKS); do \
-		echo "Running docdepend for $$i ..." ; \
-		docdepend $$i.xml | \
-		sed s/insidecover.tex/insidecover.xml/ > $$i.dep ; \
-	done
-
-# ----------------------------------------------------
-# Rules
-# ----------------------------------------------------
-.SUFFIXES: .psframe .pscrop
-
-# The following rules are for multiple suffixes, e.g. kalle.pdf, 
-# kalle.frame.pdf. The order of the rules is important. Default rules
-# from otp.mk are disabled in order to get it right.
-
-%.pdf:	%.ps
-
-%.ps:	%.dvi
-
-%.pdf:	%.dvi
-
-%.frame.ps:	%.dvi
-	BOOK=$@ ./make_headers
-	$(DVI2PS) -frame $(DVIPS_FLAGS) -f $< > $@
-
-%.frame.pdf:	%.dvi
-	BOOK=$@ ./make_headers
-	$(DVI2PS) -frame $(DVIPS_FLAGS) -f $< | \
-		$(DISTILL) $(DISTILL_FLAGS) > $@
-
-%.crop.ps:	%.dvi
-	BOOK=$@ ./make_headers
-	$(DVI2PS) -crop $(DVIPS_FLAGS) -f $< > $@
-
-%.crop.pdf:	%.dvi
-	BOOK=$@ ./make_headers
-	$(DVI2PS) -crop $(DVIPS_FLAGS) -f $< | \
-		$(DISTILL) $(DISTILL_FLAGS) > $@
-
-%.pdf:	%.dvi
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | \
-		$(DISTILL) $(DISTILL_FLAGS) > $@
-
-%.ps:  %.dvi
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-%.pdf: %.dvi
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | \
-		$(DISTILL) $(DISTILL_FLAGS) > $@
-
-# ----------------------------------------------------
-# Release targets
-# ----------------------------------------------------
-#
-
-ifeq ($(TESTROOT),)
-release_books:	all
-
-else
-release_books:	all
-	$(INSTALL_DIR) $(TESTROOT)/books
-	$(INSTALL_DATA) $(FRAME_CROP_PDF_FILES) $(TESTROOT)/books
-endif
-
diff --git a/system/doc/Books/src/basic_application.xml b/system/doc/Books/src/basic_application.xml
deleted file mode 100644
index 8097dafd7e..0000000000
--- a/system/doc/Books/src/basic_application.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book>
-  <header titlestyle="special">
-    <copyright>
-      <year>2000</year>
-      <year>2007</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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Erlang 5.1/OTP R8 Run-Time System and Basic Applications</title>
-    <prepared>Bengt Nilsson</prepared>
-    <docno></docno>
-    <date>2000-10-17</date>
-    <rev></rev>
-  </header>
-  <insidecover>
-    <include file="insidecover"></include>
-  </insidecover>
-  <pagetext>Erlang/OTP Run-Time System and Basic Applications</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-    <preface>
-      <p><em>Introduction</em>        <br></br>
-This documentation describes the Open 
-        Telecom Platform (Erlang/OTP), a middle-ware based on the Erlang
-        programming language, aiming at providing time-saving and flexible 
-        development for robust, adaptable telecom systems.</p>
-      <p><em>Organization of the Documentation</em>        <br></br>
-
-        The documentation is divided into eight parts:</p>
-      <list type="bulleted">
-        <item>Erlang 5.0/OTP R7 System Documentation, EN/LZT 1084095 R1</item>
-        <item>Erlang 5.0/OTP R7 Run-Time System and Basic Applications, 
-         EN/LZT 108 4106 R1</item>
-        <item>Erlang 5.0/OTP R7 Standard Library Application, EN/LZT 108 4107 
-         R1</item>
-        <item>Erlang 5.0/OTP R7 Database Applications, EN/LZT 108 194 R3</item>
-        <item>Erlang 5.0/OTP R7 CORBA and IDL Applications,
-         EN/LZT 151 810 R2</item>
-        <item>Erlang 5.0/OTP R7 Interface and Communication Applications, 
-         EN/LZT 108 4110 R1</item>
-        <item>Erlang 5.0/OTP R7 Operation and Maintenance Applications, 
-         EN/LZT 108 4108 R1</item>
-        <item>Erlang 5.0/OTP R7 Tool Applications, EN/LZT 108 4109 R1</item>
-      </list>
-      <p><em>About this Book</em>        <br></br>
-This book is a collection of User's  Guides for</p>
-      <list type="bulleted">
-        <item>ERTS</item>
-        <item>SASL</item>
-      </list>
-      <p>and of Reference Manuals for</p>
-      <list type="bulleted">
-        <item>ERTS</item>
-        <item>SASL</item>
-        <item>Compiler</item>
-        <item>Kernel</item>
-      </list>
-      <p>The Standard Libraries (STDLIB), which are in close
-        connection with Kernel, are documented in a volume of its
-        own.</p>
-      <br></br>
-    </preface>
-  </preamble>
-  <pagetext>ERTS</pagetext>
-  <parts lift="no">
-    <title>ERTS User's Guide</title>
-    <include file="../../../../erts/erts/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../erts/erts/doc/src/application"></include>
-  </applications>
-  <pagetext>SASL</pagetext>
-  <parts lift="no">
-    <title>SASL User's Guide</title>
-    <include file="../../../../erts/lib/sasl/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../erts/lib/sasl/doc/src/application"></include>
-  </applications>
-  <pagetext>Kernel</pagetext>
-  <applications>
-    <include file="../../../../erts/lib/kernel/doc/src/application_holder"></include>
-  </applications>
-  <pagetext>Compiler</pagetext>
-  <applications>
-    <include file="../../../../erts/lib/compiler/doc/src/application"></include>
-  </applications>
-  <pagetext>Erlang/OTP Run-Time System and Basic Applications</pagetext>
-</book>
-
diff --git a/system/doc/Books/src/corba_service.xml b/system/doc/Books/src/corba_service.xml
deleted file mode 100644
index dce2894a52..0000000000
--- a/system/doc/Books/src/corba_service.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book>
-  <header titlestyle="special">
-    <copyright>
-      <year>2001</year>
-      <year>2007</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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Erlang 5.1/OTP R8 CORBA Services </title>
-    <prepared></prepared>
-    <docno>EN/LZT 151 ??? R1</docno>
-    <date>1997-05-27</date>
-    <rev></rev>
-    <abbreviation></abbreviation>
-  </header>
-  <insidecover>
-    <include file="insidecover"></include>
-  </insidecover>
-  <pagetext>Erlang/OTP CORBA Services</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-    <preface>
-      <p><em>Introduction</em>        <br></br>
-
-        This documentation describes the Open 
-        Telecom Platform (Erlang/OTP), a middle-ware based on the Erlang
-        programming language, aiming at providing time-saving and flexible 
-        development for robust, adaptable telecom systems.</p>
-      <p><em>Organization of the Documentation</em>        <br></br>
-
-        The documentation is divided into eight parts:</p>
-      <list type="bulleted">
-        <item>Erlang 5.0/OTP R7 System Documentation, EN/LZT 1084095 R1</item>
-        <item>Erlang 5.0/OTP R7 Run-Time System and Basic Applications, 
-         EN/LZT 108 4106 R1</item>
-        <item>Erlang 5.0/OTP R7 Standard Library Application, EN/LZT 108 4107 
-         R1</item>
-        <item>Erlang 5.0/OTP R7 Database Applications, EN/LZT 108 194 R3</item>
-        <item>Erlang 5.0/OTP R7 CORBA and IDL Applications,
-         EN/LZT 151 810 R2</item>
-        <item>Erlang 5.0/OTP R7 Interface and Communication Applications, 
-         EN/LZT 108 4110 R1</item>
-        <item>Erlang 5.0/OTP R7 Operation and Maintenance Applications, 
-         EN/LZT 108 4108 R1</item>
-        <item>Erlang 5.0/OTP R7 Tool Applications, EN/LZT 108 4109 R1</item>
-      </list>
-      <p><em>About this Book</em>        <br></br>
-</p>
-      <p>This book contains documentation about the six applications in Erlang/OTP that
-        implement the CORBA services.
-        These applications are:</p>
-      <list type="bulleted">
-        <item><em>cosEvent</em>, an Erlang implementation of the 
-         CORBA service CosEvent.</item>
-        <item><em>cosEventDomain</em>, an Erlang implementation of the 
-         CORBA service CosEventDomainAdmin.</item>
-        <item><em>cosFileTransfer</em>, an Erlang implementation of the 
-         CORBA service CosFileTransfer.</item>
-        <item><em>cosNotificaton</em>, an Erlang implementation of the 
-         CORBA service CosNotification.</item>
-        <item><em>cosProperty</em>, an Erlang implementation of the 
-         CORBA service CosProperty.</item>
-        <item><em>cosTime</em>, an Erlang implementation of the 
-         CORBA service CosTime.</item>
-        <item><em>cosTransaction</em>, an Erlang implementation of the 
-         CORBA service CosTransaction.</item>
-      </list>
-    </preface>
-  </preamble>
-  <pagetext>cosEvent</pagetext>
-  <parts lift="no">
-    <title>cosEvent User's Guide</title>
-    <include file="../../../../libraries/cosEvent/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/cosEvent/doc/src/application"></include>
-  </applications>
-  <pagetext>cosEventDomain</pagetext>
-  <parts lift="no">
-    <title>cosEventDomain User's Guide</title>
-    <include file="../../../../libraries/cosEventDomain/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/cosEventDomain/doc/src/application"></include>
-  </applications>
-  <pagetext>cosFileTransfert</pagetext>
-  <parts lift="no">
-    <title>cosFileTransfer User's Guide</title>
-    <include file="../../../../libraries/cosFileTransfer/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/cosFileTransfer/doc/src/application"></include>
-  </applications>
-  <pagetext>cosNotification</pagetext>
-  <parts lift="no">
-    <title>cosNotification User's Guide</title>
-    <include file="../../../../libraries/cosNotification/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/cosNotification/doc/src/application"></include>
-  </applications>
-  <pagetext>cosTime</pagetext>
-  <parts lift="no">
-    <title>cosTime User's Guide</title>
-    <include file="../../../../libraries/cosTime/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/cosTime/doc/src/application"></include>
-  </applications>
-  <pagetext>cosProperty</pagetext>
-  <parts lift="no">
-    <title>cosProperty User's Guide</title>
-    <include file="../../../../libraries/cosProperty/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/cosProperty/doc/src/application"></include>
-  </applications>
-  <pagetext>Erlang/OTP CORBA Services</pagetext>
-</book>
-
diff --git a/system/doc/Books/src/database_management.xml b/system/doc/Books/src/database_management.xml
deleted file mode 100644
index 268612a990..0000000000
--- a/system/doc/Books/src/database_management.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book>
-  <header titlestyle="special">
-    <copyright>
-      <year>1997</year>
-      <year>2007</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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Erlang 5.1/OTP R8 Database Applications </title>
-    <prepared></prepared>
-    <docno>EN/LZT 108 194 R2</docno>
-    <date>1997-05-27</date>
-    <rev></rev>
-    <abbreviation></abbreviation>
-  </header>
-  <insidecover>
-    <include file="insidecover"></include>
-  </insidecover>
-  <pagetext>Erlang/OTP Database Applications</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-    <preface>
-      <p><em>Introduction</em>        <br></br>
-This documentation describes the Open 
-        Telecom Platform (Erlang/OTP), a middle-ware based on the Erlang
-        programming language, aiming at providing time-saving and flexible 
-        development for robust, adaptable telecom systems.</p>
-      <p><em>Organization of the Documentation</em>        <br></br>
-
-        The documentation is divided into eight parts:</p>
-      <list type="bulleted">
-        <item>Erlang 5.0/OTP R7 System Documentation, EN/LZT 1084095 R1</item>
-        <item>Erlang 5.0/OTP R7 Run-Time System and Basic Applications, 
-         EN/LZT 108 4106 R1</item>
-        <item>Erlang 5.0/OTP R7 Standard Library Application, EN/LZT 108 4107 
-         R1</item>
-        <item>Erlang 5.0/OTP R7 Database Applications, EN/LZT 108 194 R3</item>
-        <item>Erlang 5.0/OTP R7 CORBA and IDL Applications,
-         EN/LZT 151 810 R2</item>
-        <item>Erlang 5.0/OTP R7 Interface and Communication Applications, 
-         EN/LZT 108 4110 R1</item>
-        <item>Erlang 5.0/OTP R7 Operation and Maintenance Applications, 
-         EN/LZT 108 4108 R1</item>
-        <item>Erlang 5.0/OTP R7 Tool Applications, EN/LZT 108 4109 R1</item>
-      </list>
-      <p><em>About this Book</em>        <br></br>
-</p>
-      <p>This book is common for the four applications in Erlang/OTP, which
-        manage databases. These applications are:</p>
-      <list type="bulleted">
-        <item><em>Mnesia</em>; to be used when
-         a continuous
-         operation and soft real-time properties are required.</item>
-        <item><em>Mnesia_Session</em>; to be used when the Mnesia Database 
-         Management
-         System has to be accessed from other programming languages than
-         Erlang.</item>
-        <item><em>Mnemosyne</em>; to be used as a query language for the
-         Mnesia Database
-         Management System. </item>
-        <item><em>ODBC,</em> Open DataBase Connectivity; to be used when
-         various SQL
-         databases will be accessed.</item>
-      </list>
-    </preface>
-  </preamble>
-  <pagetext>Mnesia</pagetext>
-  <parts lift="no">
-    <title>Mnesia User's Guide</title>
-    <include file="../../../../libraries/mnesia/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/mnesia/doc/src/application"></include>
-  </applications>
-  <pagetext>Mnesia_Session</pagetext>
-  <parts lift="no">
-    <title>Mnesia_Session User's Guide</title>
-    <include file="../../../../libraries/mnesia_session/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/mnesia_session/doc/src/application"></include>
-  </applications>
-  <pagetext>Mnemosyne</pagetext>
-  <parts lift="no">
-    <title>Mnemosyne User's Guide</title>
-    <include file="../../../../libraries/mnemosyne/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/mnemosyne/doc/src/application"></include>
-  </applications>
-  <pagetext>ODBC </pagetext>
-  <parts lift="no">
-    <title>ODBC User's Guide</title>
-    <include file="../../../../libraries/odbc/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/odbc/doc/src/application"></include>
-  </applications>
-  <pagetext>Erlang/OTP Database Applications</pagetext>
-</book>
-
diff --git a/system/doc/Books/src/frame_crop.header.src b/system/doc/Books/src/frame_crop.header.src
deleted file mode 100644
index 131045ef8d..0000000000
--- a/system/doc/Books/src/frame_crop.header.src
+++ /dev/null
@@ -1,101 +0,0 @@
-%% This PostScript file centers the page on an A4 paper and draws a
-%% crop marks. dvips is assumed.
-
-%% DEBUG 
-%% /mydict 20 dict def mydict begin
-
-%% Millimeter to postscript points:
-
-/mm{ 25.4 div 72 mul }def
-
-
-%% The size of the retangle is:
-
-/papw 172 mm def
-/paph 232 mm def
-
-%% The text area size is:
-
-%%/txtw{131 mm}def
-%%/txth{285 mm}def
-
-
-%% A4 size is:
-
-/A4w 209 mm def
-/A4h 296 mm def
-
-%% Draw crop marks
-
-/mkcrop{
-	0.3 setlinewidth
-	0 0 mkonecrop
-	papw 0 mkonecrop
-	0 paph mkonecrop
-	papw paph mkonecrop
-} def
-
-/mkonecrop{gsave
-	translate
-	newpath
-	0 18 moveto
-	0 -18 lineto
-	stroke
-	newpath
-	-18 0 moveto
-	18 0 lineto
-	stroke
-	grestore } def
-
-%% Draw a frame
-
-/mkframe{
-	gsave
-	0 A4h paph sub moveto
-	papw 0 rlineto
-	0 paph rlineto
-	papw neg 0 rlineto
-	0 paph neg rlineto  
-	stroke
-	grestore
-} def
-
-/mkmarks{mk@MARKS@} def
-	
-/mkinfo{ gsave
-	 72 68 moveto (Book: @BOOK@) show
-	 72 60 moveto (Generated by dvips: @DATE@) show
-	 72 52 moveto (Config spec: @CSFILE@) show
-	 72 44 moveto (View: @VIEW@) show
-	 72 36 moveto (User: @USER@) show
-	 72 28 moveto (Latex: @LATEX@) show
-	 72 20 moveto (@DOCBVSN@ @DOCB@) show
-	 72 12 moveto (@DVIPSVSN@ @DVIPS@) show
-	 288 68 moveto (Book build: @BOOKBUILD@) show
-	 288 60 moveto (Build script: @BUILDSCRIPT@) show
-	 grestore
-} def
-
-
-%% Beginning-of-page hook (the thing called by dvips):
-
-/bop-hook{
-	gsave
-	/Helvetica findfont 7 scalefont setfont
-	gsave
-	A4w papw sub 2 div
-	A4h paph sub 2 div neg
-	translate
-	mkmarks
-	grestore
-	mkinfo
-	grestore
-} def
-
-%% DEBUG
-%%/bop-hook
-%%showpage
-%%end
-
-
-
diff --git a/system/doc/Books/src/insidecover.xml b/system/doc/Books/src/insidecover.xml
deleted file mode 100644
index e6b4b4206c..0000000000
--- a/system/doc/Books/src/insidecover.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE bookinsidecover SYSTEM "bookinsidecover.dtd">
-
-<bookinsidecover>
-Ericsson Utvecklings AB provides this publication ``as is'' without warranty of any kind.  In no event shall Ericsson Utvecklings AB be liable for any damage arising from any defect or error in this publication. The contents of this publication is subject to revision without notice due to continued progress in design.  <br></br>
-  <br></br>
-Copyright &copy; 1996-2000 Ericsson Utvecklings AB.  <br></br>
-  <br></br>
-All rights reserved including the right of reproduction in whole or in part in any form.  <br></br>
-  <vfill></vfill>
-  <br></br>
-  <bold>Editors &amp; Layout:</bold>
-Anna Fedoriw and Bengt Nilsson  <br></br>
-  <bold>Written and Produced by:</bold>
-The Open Telecom Platform Project  <br></br>
-  <bold>Cover by:</bold>
-R&ouml;jning &amp; Co   <br></br>
-  <br></br>
-Fourth revised and restructured edition.  <br></br>
-  <br></br>
-Printed in Sweden by XBS Koncerntryck, Stockholm 2000  <br></br>
-  <br></br>
-  <vfill></vfill>
-  <br></br>
-For more information: URL   <tt>http://www.erlang.se</tt>
-  <br></br>
-  <br></br>
-  <br></br>
-Ericsson Utvecklings AB  <br></br>
-OTP Product Development  <br></br>
-Box 1505  <br></br>
-SE-125 25  &Auml;LVSJ&Ouml;  <br></br>
-Sweden  <br></br>
-</bookinsidecover>
-
diff --git a/system/doc/Books/src/interfaces.xml b/system/doc/Books/src/interfaces.xml
deleted file mode 100644
index b225f9581a..0000000000
--- a/system/doc/Books/src/interfaces.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book>
-  <header titlestyle="special">
-    <copyright>
-      <year>2000</year>
-      <year>2007</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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Erlang 5.1/OTP R8 Interface and Communication Applications</title>
-    <prepared>Bengt Nilsson</prepared>
-    <docno></docno>
-    <date>2000-02-09</date>
-    <rev></rev>
-  </header>
-  <insidecover>
-    <include file="insidecover"></include>
-  </insidecover>
-  <pagetext>Erlang/OTP Interface and Communication </pagetext>
-  <preamble>
-    <contents level="2"></contents>
-    <preface>
-      <p><em>Introduction</em>        <br></br>
-This documentation describes the Open 
-        Telecom Platform (Erlang/OTP), a middle-ware based on the Erlang
-        programming language, aiming at providing time-saving and flexible 
-        development for robust, adaptable telecom systems.</p>
-      <p><em>Organization of the Documentation</em>        <br></br>
-
-        The documentation is divided into eight parts:</p>
-      <list type="bulleted">
-        <item>Erlang 5.0/OTP R7 System Documentation, EN/LZT 1084095 R1</item>
-        <item>Erlang 5.0/OTP R7 Run-Time System and Basic Applications, 
-         EN/LZT 108 4106 R1</item>
-        <item>Erlang 5.0/OTP R7 Standard Library Application, EN/LZT 108 4107 
-         R1</item>
-        <item>Erlang 5.0/OTP R7 Database Applications, EN/LZT 108 194 R3</item>
-        <item>Erlang 5.0/OTP R7 CORBA and IDL Applications,
-         EN/LZT 151 810 R2</item>
-        <item>Erlang 5.0/OTP R7 Interface and Communication Applications, 
-         EN/LZT 108 4110 R1</item>
-        <item>Erlang 5.0/OTP R7 Operation and Maintenance Applications, 
-         EN/LZT 108 4108 R1</item>
-        <item>Erlang 5.0/OTP R7 Tool Applications, EN/LZT 108 4109 R1</item>
-      </list>
-      <p><em>About this Book</em>        <br></br>
-</p>
-      <p>This book is a collection of the documentation of following applications:</p>
-      <list type="bulleted">
-        <item>Asn1</item>
-        <item>Comet</item>
-        <item>Crypto</item>
-        <item>Erl_Interface</item>
-        <item>GS</item>
-        <item>Inets</item>
-        <item>Jinterface</item>
-        <item>Megaco</item>
-        <item>SSL</item>
-      </list>
-    </preface>
-  </preamble>
-  <pagetext>Asn1</pagetext>
-  <parts lift="yes">
-    <title>Asn1 User's Guide</title>
-    <include file="../../../../erts/lib/asn1/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../erts/lib/asn1/doc/src/application"></include>
-  </applications>
-  <pagetext>Comet </pagetext>
-  <parts lift="no">
-    <title>Comet User's Guide</title>
-    <include file="../../../../erts/lib/comet/doc/src/users_guide"></include>
-  </parts>
-  <applications>
-    <include file="../../../../erts/lib/comet/doc/src/refman"></include>
-  </applications>
-  <pagetext>Crypto</pagetext>
-  <applications>
-    <include file="../../../../erts/lib/crypto/doc/src/refman"></include>
-  </applications>
-  <pagetext>Erl_Interface</pagetext>
-  <parts lift="yes">
-    <title>Erl_Interface User's Guide</title>
-    <include file="../../../../erts/lib/erl_interface/doc/src/part_erl_interface"></include>
-  </parts>
-  <applications>
-    <include file="../../../../erts/lib/erl_interface/doc/src/application_erl_interface"></include>
-  </applications>
-  <pagetext>GS</pagetext>
-  <parts lift="no">
-    <title>GS User's Guide</title>
-    <include file="../../../../erts/lib/gs/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../erts/lib/gs/doc/src/application"></include>
-  </applications>
-  <pagetext>Inets</pagetext>
-  <applications>
-    <include file="../../../../libraries/inets/doc/src/application"></include>
-  </applications>
-  <pagetext>Jinterface </pagetext>
-  <parts lift="yes">
-    <title>Jinterface User's Guide</title>
-    <include file="../../../../erts/lib/jinterface/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../erts/lib/jinterface/doc/src/application"></include>
-  </applications>
-  <pagetext>Megaco</pagetext>
-  <parts lift="no">
-    <title>Megaco User's Guide</title>
-    <include file="../../../../erts/lib/megaco/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../erts/lib/megaco/doc/src/application"></include>
-  </applications>
-  <pagetext>SSL </pagetext>
-  <parts lift="yes">
-    <title>SSL Users Guide</title>
-    <include file="../../../../erts/lib/ssl/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../erts/lib/ssl/doc/src/refman"></include>
-  </applications>
-  <pagetext>Erlang/OTP Interface and Communication </pagetext>
-</book>
-
diff --git a/system/doc/Books/src/make_headers b/system/doc/Books/src/make_headers
deleted file mode 100755
index 0ec7aca632..0000000000
--- a/system/doc/Books/src/make_headers
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# Make Postscript header files (frame and crop marks)
-#
-# From environment: BOOK CSFILE USER BOOKBUILD
-
-DATE=`date`
-VIEW=`cleartool pwv -s -set`  
-LATEX=`which latex`
-DVIPSVSN=`dvips -version`
-DVIPS=`which dvips`
-DOCBVSN=`docb_transform -version`
-DOCB=`which docb_transform`
-for marks in frame crop; do
-    sed -e "s/@DATE@/$DATE/g" \
-	-e "s/@BOOK@/$BOOK/g" \
-	-e "s/@MARKS@/$marks/g" \
-	-e "s;@CSFILE@;$CSFILE;g" \
-	-e "s/@VIEW@/$VIEW/g" \
-	-e "s/@USER@/$USER/g" \
-	-e "s;@LATEX@;$LATEX;g" \
-	-e "s;@DVIPSVSN@;$DVIPSVSN;g" \
-	-e "s;@DVIPS@;$DVIPS;g" \
-	-e "s/@DOCBVSN@/$DOCBVSN/g" \
-	-e "s;@DOCB@;$DOCB;g" \
-	-e "s;@BOOKBUILD@;$BOOKBUILD;g" \
-	-e "s;@BUILDSCRIPT@;$BUILDSCRIPT;g" \
-	    frame_crop.header.src > $marks.header
-done
-
diff --git a/system/doc/Books/src/operation_maintenance.xml b/system/doc/Books/src/operation_maintenance.xml
deleted file mode 100644
index 41bdd3dff7..0000000000
--- a/system/doc/Books/src/operation_maintenance.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book>
-  <header titlestyle="special">
-    <copyright>
-      <year>2000</year>
-      <year>2007</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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Erlang 5.1/OTP R8 Operation and Maintenance Applications</title>
-    <prepared>Bengt Nilsson</prepared>
-    <docno></docno>
-    <date>2000-02-09</date>
-    <rev></rev>
-  </header>
-  <insidecover>
-    <include file="insidecover"></include>
-  </insidecover>
-  <pagetext>Erlang/OTP Operation and Maintenance</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-    <preface>
-      <p><em>Introduction</em>        <br></br>
-This documentation describes the Open 
-        Telecom Platform (Erlang/OTP), a middle-ware based on the Erlang
-        programming language, aiming at providing time-saving and flexible 
-        development for robust, adaptable telecom systems.</p>
-      <p><em>Organization of the Documentation</em>        <br></br>
-the documentation is 
-        divided into eight parts:</p>
-      <list type="bulleted">
-        <item>Erlang 5.0/OTP R7 System Documentation, EN/LZT 1084095 R1</item>
-        <item>Erlang 5.0/OTP R7 Run-Time System and Basic Applications, 
-         EN/LZT 108 4106 R1</item>
-        <item>Erlang 5.0/OTP R7 Standard Library Application, EN/LZT 108 4107 R1</item>
-        <item>Erlang 5.0/OTP R7 Database Applications, EN/LZT 108 194 R3</item>
-        <item>Erlang 5.0/OTP R7 CORBA and IDL Applications,
-         EN/LZT 151 810 R2</item>
-        <item>Erlang 5.0/OTP R7 Interface and Communication Applications, 
-         EN/LZT 108 4110 R1</item>
-        <item>Erlang 5.0/OTP R7 Operation and Maintenance Applications, 
-         EN/LZT 108 4108 R1</item>
-        <item>Erlang 5.0/OTP R7 Tool Applications, EN/LZT 108 4109 R1</item>
-      </list>
-      <p><em>About this Book</em>        <br></br>
-
-        This book is a collection of Erlang application used during Operation and Maintenance. The following applications are covered:</p>
-      <list type="bulleted">
-        <item>EVA</item>
-        <item>OS_Mon </item>
-        <item>SNMP</item>
-      </list>
-    </preface>
-  </preamble>
-  <pagetext>EVA</pagetext>
-  <parts lift="no">
-    <title>EVA User's Guide</title>
-    <include file="../../../../libraries/eva/doc/src/users_guide"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/eva/doc/src/refman"></include>
-    <include file="../../../../libraries/eva/doc/src/refman_snmp"></include>
-  </applications>
-  <pagetext>OS_Mon</pagetext>
-  <applications>
-    <include file="../../../../erts/lib/os_mon/doc/src/application"></include>
-  </applications>
-  <pagetext>SNMP</pagetext>
-  <parts lift="no">
-    <title>SNMP User's Guide</title>
-    <include file="../../../../libraries/snmp/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/snmp/doc/src/application"></include>
-  </applications>
-  <pagetext>Erlang/OTP Operation and Maintenance</pagetext>
-</book>
-
diff --git a/system/doc/Books/src/orber_ic.xml b/system/doc/Books/src/orber_ic.xml
deleted file mode 100644
index 16eb076dc7..0000000000
--- a/system/doc/Books/src/orber_ic.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book>
-  <header titlestyle="special">
-    <copyright>
-      <year>1999</year>
-      <year>2007</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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Erlang 5.1/OTP R8 CORBA and IDL Applications </title>
-    <prepared></prepared>
-    <docno>EN/LZT 151 810 R1</docno>
-    <date>1997-05-27</date>
-    <rev></rev>
-    <abbreviation></abbreviation>
-  </header>
-  <insidecover>
-    <include file="insidecover"></include>
-  </insidecover>
-  <pagetext>Erlang/OTP CORBA and IDL</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-    <preface>
-      <p><em>Introduction</em>        <br></br>
-
-        This documentation describes the Open 
-        Telecom Platform (Erlang/OTP), a middle-ware based on the Erlang
-        programming language, aiming at providing time-saving and flexible 
-        development for robust, adaptable telecom systems.</p>
-      <p><em>Organization of the Documentation</em>        <br></br>
-
-        The documentation is divided into eight parts:</p>
-      <list type="bulleted">
-        <item>Erlang 5.0/OTP R7 System Documentation, EN/LZT 1084095 R1</item>
-        <item>Erlang 5.0/OTP R7 Run-Time System and Basic Applications, 
-         EN/LZT 108 4106 R1</item>
-        <item>Erlang 5.0/OTP R7 Standard Library Application, EN/LZT 108 4107 
-         R1</item>
-        <item>Erlang 5.0/OTP R7 Database Applications, EN/LZT 108 194 R3</item>
-        <item>Erlang 5.0/OTP R7 CORBA and IDL Applications,
-         EN/LZT 151 810 R2</item>
-        <item>Erlang 5.0/OTP R7 Interface and Communication Applications, 
-         EN/LZT 108 4110 R1</item>
-        <item>Erlang 5.0/OTP R7 Operation and Maintenance Applications, 
-         EN/LZT 108 4108 R1</item>
-        <item>Erlang 5.0/OTP R7 Tool Applications, EN/LZT 108 4109 R1</item>
-      </list>
-      <p><em>About this Book</em>        <br></br>
-</p>
-      <p>This book contains documentation about the six applications in Erlang/OTP that
-        implement the CORBA standard.
-        These applications are:</p>
-      <list type="bulleted">
-        <item>
-          <p><em>IC</em>, a compiler for OMG Interface Definition
-            Language (IDL).
-            The OMG IDL is used for 
-            language-independent interface specifications.</p>
-          <p>The compiler 
-            is capable of producing;</p>
-          <list type="bulleted">
-            <item>Erlang stub/skeleton code for CORBA (default behavior)</item>
-            <item>Erlang stub/skeleton code for OTP generic servers</item>
-            <item>C stub/skeleton code for OTP generic servers</item>
-            <item>Java stub/skeleton code for OTP generic servers</item>
-            <item>Erlang code for module interfaces</item>
-          </list>
-        </item>
-        <item><em>Orber</em>, which is an Object Request Broker that can be
-         used for
-         accessing distributed services in an 
-         soft real-time environment. It is especially useful for applications
-         that use a heterogeneous 
-         language environments.</item>
-      </list>
-    </preface>
-  </preamble>
-  <pagetext>IC</pagetext>
-  <parts lift="no">
-    <title>IC User's Guide </title>
-    <include file="../../../../libraries/ic/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/ic/doc/src/application"></include>
-  </applications>
-  <pagetext>Orber</pagetext>
-  <parts lift="no">
-    <title>Orber User's Guide</title>
-    <include file="../../../../libraries/orber/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/orber/doc/src/application"></include>
-  </applications>
-  <pagetext>Erlang/OTP CORBA and IDL</pagetext>
-</book>
-
diff --git a/system/doc/Books/src/stdlib.xml b/system/doc/Books/src/stdlib.xml
deleted file mode 100644
index 31ea0d6962..0000000000
--- a/system/doc/Books/src/stdlib.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book>
-  <header titlestyle="special">
-    <copyright>
-      <year>2000</year>
-      <year>2007</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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Erlang 5.1/OTP R8 Standard Library Application</title>
-    <prepared>Bengt Nilsson</prepared>
-    <docno></docno>
-    <date>2000-05-30</date>
-    <rev></rev>
-  </header>
-  <insidecover>
-    <include file="insidecover"></include>
-  </insidecover>
-  <pagetext>Erlang/OTP Standard Library Application</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-    <preface>
-      <p><em>Introduction</em>        <br></br>
-This documentation describes the Open 
-        Telecom Platform (Erlang/OTP), a middle-ware based on the Erlang
-        programming language, aiming at providing time-saving and flexible 
-        development for robust, adaptable telecom systems.</p>
-      <p><em>Organization of the Documentation</em>        <br></br>
-
-        The documentation is divided into eight parts:</p>
-      <list type="bulleted">
-        <item>Erlang 5.0/OTP R7 System Documentation, EN/LZT 1084095 R1</item>
-        <item>Erlang 5.0/OTP R7 Run-Time System and Basic Applications, 
-         EN/LZT 108 4106 R1</item>
-        <item>Erlang 5.0/OTP R7 Standard Library Application, EN/LZT 108 4107 
-         R1</item>
-        <item>Erlang 5.0/OTP R7 Database Applications, EN/LZT 108 194 R3</item>
-        <item>Erlang 5.0/OTP R7 CORBA and IDL Applications,
-         EN/LZT 151 810 R2</item>
-        <item>Erlang 5.0/OTP R7 Interface and Communication Applications, 
-         EN/LZT 108 4110 R1</item>
-        <item>Erlang 5.0/OTP R7 Operation and Maintenance Applications, 
-         EN/LZT 108 4108 R1</item>
-        <item>Erlang 5.0/OTP R7 Tool Applications, EN/LZT 108 4109 R1</item>
-      </list>
-      <p><em>About this Book</em>        <br></br>
-</p>
-      <p>This book describes  all standard libraries in Erlang/OTP. 
-        It contains modules for manipulating lists, strings, and files etc.
-        </p>
-    </preface>
-  </preamble>
-  <applications>
-    <include file="../../../../erts/lib/stdlib/doc/src/application"></include>
-  </applications>
-</book>
-
diff --git a/system/doc/Books/src/tools.xml b/system/doc/Books/src/tools.xml
deleted file mode 100644
index 9d7bf45f31..0000000000
--- a/system/doc/Books/src/tools.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book>
-  <header titlestyle="special">
-    <copyright>
-      <year>2000</year>
-      <year>2007</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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Erlang 5.1/OTP R8 Tool Applications</title>
-    <prepared>Bengt Nilsson</prepared>
-    <docno></docno>
-    <date>2000-02-09</date>
-    <rev></rev>
-  </header>
-  <insidecover>
-    <include file="insidecover"></include>
-  </insidecover>
-  <pagetext>Erlang/OTP Tools</pagetext>
-  <preamble>
-    <contents level="1"></contents>
-    <preface>
-      <p><em>Introduction</em>        <br></br>
-This documentation describes the Open 
-        Telecom Platform (Erlang/OTP), a middle-ware based on the Erlang
-        programming language, aiming at providing time-saving and flexible 
-        development for robust, adaptable telecom systems.</p>
-      <p><em>Organization of the Documentation</em>        <br></br>
-
-        The documentation is divided into eight parts:</p>
-      <list type="bulleted">
-        <item>Erlang 5.0/OTP R7 System Documentation, EN/LZT 1084095 R1</item>
-        <item>Erlang 5.0/OTP R7 Run-Time System and Basic Applications, 
-         EN/LZT 108 4106 R1</item>
-        <item>Erlang 5.0/OTP R7 Standard Library Application, 
-         EN/LZT 108 4107 R1</item>
-        <item>Erlang 5.0/OTP R7 Database Applications, EN/LZT 108 194 R3</item>
-        <item>Erlang 5.0/OTP R7 CORBA and IDL Applications,
-         EN/LZT 151 810 R2</item>
-        <item>Erlang 5.0/OTP R7 Interface and Communication Applications, 
-         EN/LZT 108 4110 R1</item>
-        <item>Erlang 5.0/OTP R7 Operation and Maintenance Applications, 
-         EN/LZT 108 4108 R1</item>
-        <item>Erlang 5.0/OTP R7 Tool Applications, EN/LZT 108 4109 R1</item>
-      </list>
-      <p><em>About this Book</em>        <br></br>
-This book contains User's Guides 
-        and Reference Manuals 
-        for the following applications:</p>
-      <list type="bulleted">
-        <item>Appmon</item>
-        <item>Debugger</item>
-        <item>Pman</item>
-        <item>Toolbar</item>
-        <item>Tools</item>
-        <item>TV</item>
-      </list>
-      <p>For the following applications, only Reference Manuals are available:</p>
-      <list type="bulleted">
-        <item>Parsetools</item>
-        <item>Runtime_Tools</item>
-      </list>
-    </preface>
-  </preamble>
-  <pagetext>Appmon</pagetext>
-  <parts lift="yes">
-    <title>Appmon User's Guide</title>
-    <include file="../../../../libraries/appmon/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../libraries/appmon/doc/src/application"></include>
-  </applications>
-  <pagetext>Debugger</pagetext>
-  <parts lift="yes">
-    <title>Debugger User's Guide</title>
-    <include file="../../../../tools/debugger/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../tools/debugger/doc/src/application"></include>
-  </applications>
-  <pagetext>Pman</pagetext>
-  <parts lift="yes">
-    <title>Pman User's Guide</title>
-    <include file="../../../../tools/pman/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../tools/pman/doc/src/application"></include>
-  </applications>
-  <pagetext>Toolbar</pagetext>
-  <parts lift="yes">
-    <title>Toolbar User's Guide</title>
-    <include file="../../../../tools/toolbar/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../tools/toolbar/doc/src/application"></include>
-  </applications>
-  <pagetext>Tools</pagetext>
-  <parts lift="no">
-    <title>Tools User's Guide</title>
-    <include file="../../../../tools/tools/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../tools/tools/doc/src/application"></include>
-  </applications>
-  <pagetext>TV</pagetext>
-  <parts lift="yes">
-    <title>TV User's Guide</title>
-    <include file="../../../../tools/tv/doc/src/part"></include>
-  </parts>
-  <applications>
-    <include file="../../../../tools/tv/doc/src/application"></include>
-  </applications>
-  <pagetext>Parsetools</pagetext>
-  <applications>
-    <include file="../../../../tools/parsetools/doc/src/application"></include>
-  </applications>
-  <pagetext>Runtime_Tools</pagetext>
-  <applications>
-    <include file="../../../../tools/runtime_tools/doc/src/refman"></include>
-  </applications>
-  <pagetext>Erlang/OTP Tools</pagetext>
-</book>
-
diff --git a/system/doc/Books/src/ug.xml b/system/doc/Books/src/ug.xml
deleted file mode 100644
index 15b3dc0a31..0000000000
--- a/system/doc/Books/src/ug.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book>
-  <header titlestyle="special">
-    <copyright>
-      <year>1997</year>
-      <year>2007</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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Erlang 5.1/OTP R8 System Documentation</title>
-    <prepared></prepared>
-    <docno>EN/LZT 151 247 R2</docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <insidecover>
-    <include file="insidecover"></include>
-  </insidecover>
-  <pagetext>Erlang/OTP System Documentation</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-    <preface>
-      <p><em>Introduction</em>        <br></br>
-This documentation describes the Open 
-        Telecom Platform (Erlang/OTP), a middle-ware based on the Erlang
-        programming language, aiming at providing time-saving and flexible 
-        development for robust, adaptable telecom systems.</p>
-      <p><em>Organization of the Documentation</em>        <br></br>
-
-        The documentation is divided into eight parts:</p>
-      <list type="bulleted">
-        <item>Erlang 5.0/OTP R7 System Documentation, EN/LZT 1084095 R1</item>
-        <item>Erlang 5.0/OTP R7 Run-Time System and Basic Applications, 
-         EN/LZT 108 4106 R1</item>
-        <item>Erlang 5.0/OTP R7 Standard Library Application, EN/LZT 108 4107 
-         R1</item>
-        <item>Erlang 5.0/OTP R7 Database Applications, EN/LZT 108 194 R3</item>
-        <item>Erlang 5.0/OTP R7 CORBA and IDL Applications,
-         EN/LZT 151 810 R2</item>
-        <item>Erlang 5.0/OTP R7 Interface and Communication Applications, 
-         EN/LZT 108 4110 R1</item>
-        <item>Erlang 5.0/OTP R7 Operation and Maintenance Applications, 
-         EN/LZT 108 4108 R1</item>
-        <item>Erlang 5.0/OTP R7 Tool Applications, EN/LZT 108 4109 R1</item>
-      </list>
-      <p><em>About this Book</em>        <br></br>
- This book is the starting point of the documentation and contains information about the Erlang programming language and runtime system, the OTP design principles, and how to install and configure Erlang/OTP.</p>
-      <list type="bulleted">
-        <item>Chapter 1: Introduction</item>
-        <item>Chapter 2: "Getting Started with Erlang" gives an introduction to the Erlang runtime system and to tools such as Compiler and Debugger.</item>
-        <item>Chapter 3: "OTP Design Principles" describes a way to structure Erlang code in terms of applications and supervision trees. The standard behaviors are described and examples illustrate how to apply these behaviors to typical applications.</item>
-        <item>Chapter 4: "System Principles" describes the strategies
-         and options, which are available to start an Erlang/OTP system. </item>
-        <item>Chapter 5: "Operation and Management Principles" describes the model for operation and maintenance of sub-systems.</item>
-        <item>Chapter 6: "Installation Guide"gives guidelines on how to install Erlang/OTP on UNIX or Windows.</item>
-        <item>Chapter 7: "Embedded Systems" is a supplement to "Installation Guide", It describes issues that are specific for running Erlang/OTP on an embedded system.</item>
-        <item>Chapter 8: "Erlang Extensions Since 4.4" lists all extensions to the Erlang programming languages since the latest version of the book <em>Concurrent Programming in ERLANG</em>.</item>
-        <item>Chapter 9: "Interoperability Tutorial" gives an orientation of the different 
-         interoperability mechanisms, which can be used when integrating an 
-         Erlang program with a program written in an other programming language.</item>
-      </list>
-    </preface>
-  </preamble>
-  <pagetext>Introduction</pagetext>
-  <parts lift="yes">
-    <title>Introduction</title>
-    <include file="../../system_architecture_intro/part"></include>
-  </parts>
-  <pagetext>Getting Started with Erlang</pagetext>
-  <parts lift="yes">
-    <title>Getting Started with Erlang</title>
-    <include file="../../getting_started/part"></include>
-  </parts>
-  <pagetext>Design Principles</pagetext>
-  <parts lift="no">
-    <title>OTP Design Principles</title>
-    <include file="../../design_principles/part"></include>
-  </parts>
-  <pagetext>System Principles</pagetext>
-  <parts lift="yes">
-    <title>System Principles</title>
-    <include file="../../system_principles/part"></include>
-  </parts>
-  <pagetext>Operation and Management Principles</pagetext>
-  <parts lift="yes">
-    <title>Operation and Management Principles</title>
-    <include file="../../oam/part"></include>
-  </parts>
-  <pagetext>Installation Guide</pagetext>
-  <parts lift="no">
-    <title>Installation Guide</title>
-    <include file="../../../../system/doc/installation_guide/part"></include>
-  </parts>
-  <pagetext>Embedded System</pagetext>
-  <parts lift="no">
-    <title>Embedded System</title>
-    <include file="../../../../system/doc/embedded/part"></include>
-  </parts>
-  <pagetext>Erlang Extensions since 4.4</pagetext>
-  <parts lift="no">
-    <title>Erlang Extensions since 4.4</title>
-    <include file="../../../../system/doc/extensions/part"></include>
-  </parts>
-  <pagetext>Interoperability Tutorial</pagetext>
-  <parts lift="no">
-    <title>Interoperability Tutorial</title>
-    <include file="../../tutorial/part"></include>
-  </parts>
-  <pagetext>Erlang/OTP System Documentation</pagetext>
-</book>
-
diff --git a/system/doc/efficiency_guide/advanced.xml b/system/doc/efficiency_guide/advanced.xml
index 2383e3cf3d..8126b93a2d 100644
--- a/system/doc/efficiency_guide/advanced.xml
+++ b/system/doc/efficiency_guide/advanced.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2010</year>
+      <year>2001</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -200,7 +200,7 @@ On 64-bit architectures: 4 words for a reference from the current local node, an
       <seealso marker="#ports">the maximum number of Erlang ports</seealso>
        available, and operating system specific settings and limits.</item>
       <tag><em>Number of arguments to a function or fun</em></tag>
-      <item>256</item>
+      <item>255</item>
     </taglist>
   </section>
 </chapter>
diff --git a/system/doc/reference_manual/typespec.xml b/system/doc/reference_manual/typespec.xml
index a3660713e4..f08639f9a1 100755
--- 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>2009</year>
+      <year>2003</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,29 +32,24 @@
   <section>
   <title>Introduction of Types</title>
   <p>
-  Although Erlang is a dynamically typed language this section describes
-  an extension to the Erlang language for declaring sets of Erlang terms 
-  to form a particular type, effectively forming a specific sub-type of the 
-  set of all Erlang terms.
+    Erlang is a dynamically typed language. Still, it comes with a
+    language extension for declaring sets of Erlang terms to form a
+    particular type, effectively forming a specific sub-type of the set
+    of all Erlang terms.
   </p>
   <p> 
-  Subsequently, these types can be used to specify types of record fields 
-  and the argument and return types of functions.
+    Subsequently, these types can be used to specify types of record fields 
+    and the argument and return types of functions.
   </p>
   <p>
-  Type information can be used to document function interfaces, 
-  provide more information for bug detection tools such as <c>Dialyzer</c>, 
-  and can be exploited by documentation tools such as <c>Edoc</c> for 
-  generating program documentation of various forms. 
-  It is expected that the type language described in this document will 
-  supersede and replace the purely comment-based <c>@type</c> and 
+    Type information can be used to document function interfaces, 
+    provide more information for bug detection tools such as <c>Dialyzer</c>, 
+    and can be exploited by documentation tools such as <c>Edoc</c> for 
+    generating program documentation of various forms. 
+    It is expected that the type language described in this document will 
+    supersede and replace the purely comment-based <c>@type</c> and 
   <c>@spec</c> declarations used by <c>Edoc</c>.
   </p>
-  <warning>
-    The syntax and semantics described here is still preliminary and might be 
-    slightly changed and extended before it becomes officially supported.
-    The plan is that this will happen in R14B.
-  </warning>
   </section>
   <section>
     <marker id="syntax"></marker>
@@ -96,7 +91,7 @@ Type :: any()            %% The top type, the set of all Erlang terms.
       | none()           %% The bottom type, contains no terms.
       | pid()
       | port()
-      | ref()
+      | reference()
       | []               %% nil
       | Atom
       | Binary
@@ -139,326 +134,334 @@ Tuple :: tuple()                          %% stands for a tuple of any size
 TList :: Type
        | Type, TList
 ]]></pre>
-	<p>
-	Because lists are commonly used, they have shorthand type notations. 
-	The type <c>list(T)</c> has the shorthand <c>[T]</c>. The shorthand <c>[T,...]</c> stands for 
-	the set of non-empty proper lists whose elements are of type <c>T</c>. 
-	The only difference between the two shorthands is that <c>[T]</c> may be an 
-	empty list but <c>[T,...]</c> may not.
-	</p>
-	<p>
-	Notice that the shorthand for <c>list()</c>, i.e. the list of elements of unknown type,
-	is <c>[_]</c> (or <c>[any()]</c>), not <c>[]</c>. 
-	The notation <c>[]</c> specifies the singleton type for the empty list.
-	</p>
-	<p>
-	For convenience, the following types are also built-in. 
-	They can be thought as predefined aliases for the type unions also shown in 
-	the table. (Some type unions below slightly abuse the syntax of types.)
-	</p>
-	<table>
-		<row>
-		<cell><b>Built-in type</b></cell><cell><b>Stands for</b></cell>
-		</row>
-		<row>
-		<cell><c>term()</c></cell><cell><c>any()</c></cell>
-		</row>
-		<row> 
-		<cell><c>bool()</c></cell><cell><c>'false' | 'true'</c></cell>
-		</row>
-		<row> 
-		<cell><c>byte()</c></cell><cell><c>0..255</c></cell>
-		</row>
-		<row>
-		<cell><c>char()</c></cell><cell><c>0..16#10ffff</c></cell>
-		</row>
-		<row> 
-		<cell><c>non_neg_integer()</c></cell><cell><c>0..</c></cell>
-		</row>
-		<row> 
-		<cell><c>pos_integer()</c></cell><cell><c>1..</c></cell>
-		</row>
-		<row> 
-		<cell><c>neg_integer()</c></cell><cell><c>..-1</c></cell>
-		</row>
-		<row> 
-		<cell><c>number()</c></cell><cell><c>integer() | float()</c></cell>
-		</row>
-		<row> 
-		<cell><c>list()</c></cell><cell><c>[any()]</c></cell>
-		</row>
-		<row> 
-		<cell><c>maybe_improper_list()</c></cell><cell><c>maybe_improper_list(any(), any())</c></cell>
-		</row>
-		<row> 
-		<cell><c>maybe_improper_list(T)</c></cell><cell><c>maybe_improper_list(T, any())</c></cell> 
-		</row>
-		<row>
-		<cell><c>string()</c></cell><cell><c>[char()]</c></cell>
-		</row>
-		<row> 
-		<cell><c>nonempty_string()</c></cell><cell><c>[char(),...]</c></cell>
-		</row>
-		<row> 
-		<cell><c>iolist()</c></cell><cell><c>maybe_improper_list( 
-char() | binary() | iolist(), binary() | [])</c></cell>
-		</row>
-		<row>
-		<cell><c>module()</c></cell><cell><c>atom()</c></cell>
-		</row>
-		<row> 
-		<cell><c>mfa()</c></cell><cell><c>{atom(),atom(),byte()}</c></cell>
-		</row>
-		<row>
-		<cell><c>node()</c></cell><cell><c>atom()</c></cell>
-		</row>
-		<row>
-		<cell><c>timeout()</c></cell><cell><c>'infinity' | non_neg_integer()</c></cell>
-		</row>
-		<row>
-		<cell><c>no_return()</c></cell><cell><c>none()</c></cell> 
-		</row>
-	</table>
-	
-	<p>
-	Users are not allowed to define types with the same names as the predefined or 
-	built-in ones. 
-	This is checked by the compiler and its violation results in a compilation 
-	error. 
-	(For bootstrapping purposes, it can also result to just a warning if this 
-	involves a built-in type which has just been introduced.)
-	</p>
-	<note>
-	The following built-in list types also exist, 
-	but they are expected to be rarely used. Hence, they have long names:
-	</note>
-	<pre>
+  <p>
+    Because lists are commonly used, they have shorthand type notations. 
+    The type <c>list(T)</c> has the shorthand <c>[T]</c>.
+    The shorthand <c>[T,...]</c> stands for 
+    the set of non-empty proper lists whose elements are of type <c>T</c>. 
+    The only difference between the two shorthands is that <c>[T]</c> may be an 
+    empty list but <c>[T,...]</c> may not.
+  </p>
+  <p>
+    Notice that the shorthand for <c>list()</c>, i.e. the list of
+    elements of unknown type, is <c>[_]</c> (or <c>[any()]</c>), not <c>[]</c>. 
+    The notation <c>[]</c> specifies the singleton type for the empty list.
+  </p>
+  <p>
+    For convenience, the following types are also built-in. 
+    They can be thought as predefined aliases for the type unions also shown in 
+    the table. (Some type unions below slightly abuse the syntax of types.)
+  </p>
+  <table>
+    <row>
+      <cell><b>Built-in type</b></cell><cell><b>Stands for</b></cell>
+    </row>
+    <row>
+      <cell><c>term()</c></cell><cell><c>any()</c></cell>
+    </row>
+    <row> 
+      <cell><c>boolean()</c></cell><cell><c>'false' | 'true'</c></cell>
+    </row>
+    <row> 
+      <cell><c>byte()</c></cell><cell><c>0..255</c></cell>
+    </row>
+    <row>
+      <cell><c>char()</c></cell><cell><c>0..16#10ffff</c></cell>
+    </row>
+    <row> 
+      <cell><c>non_neg_integer()</c></cell><cell><c>0..</c></cell>
+    </row>
+    <row> 
+      <cell><c>pos_integer()</c></cell><cell><c>1..</c></cell>
+    </row>
+    <row> 
+      <cell><c>neg_integer()</c></cell><cell><c>..-1</c></cell>
+    </row>
+    <row> 
+      <cell><c>number()</c></cell><cell><c>integer() | float()</c></cell>
+    </row>
+    <row> 
+      <cell><c>list()</c></cell><cell><c>[any()]</c></cell>
+    </row>
+    <row> 
+      <cell><c>maybe_improper_list()</c></cell><cell><c>maybe_improper_list(any(), any())</c></cell>
+    </row>
+    <row> 
+      <cell><c>maybe_improper_list(T)</c></cell><cell><c>maybe_improper_list(T, any())</c></cell> 
+    </row>
+    <row>
+      <cell><c>string()</c></cell><cell><c>[char()]</c></cell>
+    </row>
+    <row> 
+      <cell><c>nonempty_string()</c></cell><cell><c>[char(),...]</c></cell>
+    </row>
+    <row> 
+      <cell><c>iolist()</c></cell><cell><c>maybe_improper_list(char() | binary() | iolist(), binary() | [])</c></cell>
+    </row>
+    <row>
+      <cell><c>module()</c></cell><cell><c>atom()</c></cell>
+    </row>
+    <row> 
+      <cell><c>mfa()</c></cell><cell><c>{atom(),atom(),byte()}</c></cell>
+    </row>
+    <row>
+      <cell><c>node()</c></cell><cell><c>atom()</c></cell>
+    </row>
+    <row>
+      <cell><c>timeout()</c></cell><cell><c>'infinity' | non_neg_integer()</c></cell>
+    </row>
+    <row>
+      <cell><c>no_return()</c></cell><cell><c>none()</c></cell> 
+    </row>
+  </table>
+  
+  <p>
+    Users are not allowed to define types with the same names as the
+    predefined or built-in ones. This is checked by the compiler and
+    its violation results in a compilation error. 
+    (For bootstrapping purposes, it can also result to just a warning if this 
+    involves a built-in type which has just been introduced.)
+  </p>
+  <note>
+    The following built-in list types also exist, 
+    but they are expected to be rarely used. Hence, they have long names:
+  </note>
+  <pre>
 nonempty_maybe_improper_list(Type) :: nonempty_maybe_improper_list(Type, any())
-nonempty_maybe_improper_list() :: nonempty_maybe_improper_list(any())
-	</pre>
-	<p>
-	  where the following two types
-	  define the set of Erlang terms one would expect:
-	</p>
-	<pre>
+nonempty_maybe_improper_list() :: nonempty_maybe_improper_list(any())</pre>
+  <p>
+    where the following two types
+    define the set of Erlang terms one would expect:
+  </p>
+  <pre>
 nonempty_improper_list(Type1, Type2)
-nonempty_maybe_improper_list(Type1, Type2)
-	</pre>
-	<p>
-	Also for convenience, we allow for record notation to be used. 
-	Records are just shorthands for the corresponding tuples.
-	</p>
-	<pre>
+nonempty_maybe_improper_list(Type1, Type2)</pre>
+  <p>
+    Also for convenience, we allow for record notation to be used. 
+    Records are just shorthands for the corresponding tuples.
+  </p>
+  <pre>
 Record :: #Erlang_Atom{}
-        | #Erlang_Atom{Fields}
-    </pre>
+        | #Erlang_Atom{Fields}</pre>
+  <p>
+    Records have been extended to possibly contain type information. 
+    This is described in the sub-section <seealso marker="#typeinrecords">"Type information in record declarations"</seealso> below.
+  </p>
+  </section>
+  
+  <section>
+    <title>Type declarations of user-defined types</title>
     <p>
-	Records have been extended to possibly contain type information. 
-	This is described in the sub-section <seealso marker="#typeinrecords">"Type information in record declarations"</seealso> below.
-	</p>
-	</section>
-	
-	<section>
-		<title>Type declarations of user-defined types</title>
-		<p>
-		As seen, the basic syntax of a type is an atom followed by closed 
-		parentheses. New types are declared using '-type' compiler attributes 
-		as in the following:
-		</p>
-		<pre>
--type my_type() :: Type.
-		</pre>
-		<p>
-		where the type name is an atom (<c>'my_type'</c> in the above) followed by 
-		parenthesis. Type is a type as defined in the previous section. 
-		A current restriction is that Type can contain only predefined types 
-		or user-defined types which have been previously defined. 
-		This restriction is enforced by the compiler and results in a 
-		compilation error. (A similar restriction currently exists for records).
-		</p>
-		<p>
-		This means that currently general recursive types cannot be defined. 
-		Lifting this restriction is future work.
-		</p>
-		<p>
-		Type declarations can also be parameterized by including type variables 
-		between the parentheses. The syntax of type variables is the same as 
-		Erlang variables (starts with an upper case letter). 
-		Naturally, these variables can - and should - appear on the RHS of the 
-		definition. A concrete example appears below:
-		</p>
-		<pre>
--type orddict(Key, Val) :: [{Key, Val}].
-		</pre>
-		
-		</section>
-
-		<marker id="typeinrecords"/>
-		<section>
-			<title>
-			  Type information in record declarations
-			</title>
-		<p>
-		The types of record fields can be specified in the declaration of the 
-		record. The syntax for this is:
-		</p>
-		<pre>
--record(rec, {field1 :: Type1, field2, field3 :: Type3}).
-		</pre>
-		<p>
-		For fields without type annotations, their type defaults to any(). 
-		I.e., the above is a shorthand for:
-		</p>
-		<pre>
--record(rec, {field1 :: Type1, field2 :: any(), field3 :: Type3}).		
-		</pre>
-		<p>
-		In the presence of initial values for fields, 
-		the type must be declared after the initialization as in the following:
-		</p>
-		<pre>
--record(rec, {field1 = [] :: Type1, field2, field3 = 42 :: Type3}).
-		</pre>
-		<p>
-		Naturally, the initial values for fields should be compatible 
-		with (i.e. a member of) the corresponding types. 
-		This is checked by the compiler and results in a compilation error 
-		if a violation is detected. For fields without initial values, 
-		the singleton type <c>'undefined'</c> is added to all declared types. 
-		In other words, the following two record declarations have identical 
-		effects:
-		</p>
-		<pre>
+      As seen, the basic syntax of a type is an atom followed by closed
+      parentheses. New types are declared using '-type' and '-opaque'
+      compiler attributes as in the following:
+    </p>
+    <pre>
+-type my_struct_type() :: Type.
+-opaque my_opaq_type() :: Type.</pre>
+    <p>
+      where the type name is an atom (<c>'my_struct_type'</c> in the above)
+      followed by parentheses. Type is a type as defined in the
+      previous section.
+      A current restriction is that Type can contain only predefined types,
+      or user-defined types which are either module-local (i.e., with a
+      definition that is present in the code of the module) or are remote
+      types (i.e., types defined in and exported by other modules; see below).
+      For module-local types, the restriction that their definition
+      exists in the module is enforced by the compiler and results in a
+      compilation error. (A similar restriction currently exists for records.)
+    </p>
+    <p>
+      Type declarations can also be parameterized by including type variables
+      between the parentheses. The syntax of type variables is the same as
+      Erlang variables (starts with an upper case letter).
+      Naturally, these variables can - and should - appear on the RHS of the
+      definition. A concrete example appears below:
+    </p>
+    <pre>
+-type orddict(Key, Val) :: [{Key, Val}].</pre>
+    <p>
+      A module can export some types in order to declare that other modules
+      are allowed to refer to them as <em>remote types</em>.
+      This declaration has the following form:
+      <pre>
+-export_type([T1/A1, ..., Tk/Ak]).</pre>
+      where the Ti's are atoms (the name of the type) and the Ai's are their
+      arguments.  An example is given below:
+      <pre>
+-export_type([my_struct_type/0, orddict/2]).</pre>
+      Assuming that these types are exported from module <c>'mod'</c> then
+      one can refer to them from other modules using remote type expressions
+      like those below:
+      <pre>
+mod:my_struct_type()
+mod:orddict(atom(), term())</pre>
+      One is not allowed to refer to types which are not declared as exported.
+    </p>
+    <p>
+      Types declared as <c>opaque</c> represent sets of terms whose
+      structure is not supposed to be visible in any way outside of
+      their defining module (i.e., only the module defining them is
+      allowed to depend on their term structure). Consequently, such
+      types do not make much sense as module local - module local
+      types are not accessible by other modules anyway - and should
+      always be exported.
+    </p>
+  </section>
+  
+  <marker id="typeinrecords"/>
+  <section>
+    <title>Type information in record declarations</title>
+    <p>
+      The types of record fields can be specified in the declaration of the 
+      record. The syntax for this is:
+    </p>
+    <pre>
+-record(rec, {field1 :: Type1, field2, field3 :: Type3}).</pre>
+    <p>
+      For fields without type annotations, their type defaults to any(). 
+      I.e., the above is a shorthand for:
+    </p>
+    <pre>
+-record(rec, {field1 :: Type1, field2 :: any(), field3 :: Type3}).</pre>
+    <p>
+      In the presence of initial values for fields, 
+      the type must be declared after the initialization as in the following:
+    </p>
+    <pre>
+-record(rec, {field1 = [] :: Type1, field2, field3 = 42 :: Type3}).</pre>
+    <p>
+      Naturally, the initial values for fields should be compatible 
+      with (i.e. a member of) the corresponding types. 
+      This is checked by the compiler and results in a compilation error 
+      if a violation is detected. For fields without initial values, 
+      the singleton type <c>'undefined'</c> is added to all declared types. 
+      In other words, the following two record declarations have identical 
+      effects:
+    </p>
+    <pre>
 -record(rec, {f1 = 42 :: integer(),
               f2      :: float(),
-              f3      :: 'a' | 'b').
+              f3      :: 'a' | 'b'}).
 
 -record(rec, {f1 = 42 :: integer(),
               f2      :: 'undefined' | float(),
-              f3      :: 'undefined' | 'a' | 'b').
-		</pre>
-		<p>
-		For this reason, it is recommended that records contain initializers, 
-		whenever possible.
-		</p>
-		<p>
-		Any record, containing type information or not, once defined, 
-		can be used as a type using the syntax:
-		</p>
-		<pre>
-#rec{}
-		</pre>
-		<p>
-		In addition, the record fields can be further specified when using 
-		a record type by adding type information about the field in the following 
-		manner:
-		</p>
-		<pre>
-#rec{some_field :: Type}
-		</pre>
-		<p>
-		Any unspecified fields are assumed to have the type in the original 
-		record declaration.
-		</p>
-	</section>
+              f3      :: 'undefined' | 'a' | 'b'}).</pre>
+    <p>
+      For this reason, it is recommended that records contain initializers, 
+      whenever possible.
+    </p>
+    <p>
+      Any record, containing type information or not, once defined, 
+      can be used as a type using the syntax:
+    </p>
+    <pre>
+#rec{}</pre>
+    <p>
+      In addition, the record fields can be further specified when using 
+      a record type by adding type information about the field in
+      the following manner:
+    </p>
+    <pre>
+#rec{some_field :: Type}</pre>
+    <p>
+      Any unspecified fields are assumed to have the type in the original 
+      record declaration.
+    </p>
+  </section>
 	
-	<section>
-		<title>Specifications (contracts) for functions</title>
-		<p>
-		A contract (or specification) for a function is given using the new 
-		compiler attribute <c>'-spec'</c>. The basic format is as follows:
-		</p>
-		<pre>
--spec Module:Function(ArgType1, ..., ArgTypeN) -> ReturnType.
-		</pre>
-		<p>
-		The arity of the function has to match the number of arguments, 
-		or else a compilation error occurs.
-		</p>
-		<p>
-		This form can also be used in header files (.hrl) to declare type 
-		information for exported functions. 
-		Then these header files can be included in files that (implicitly or 
-		explicitly) import these functions.
-		</p>
-		<p>
-		For most uses within a given module, the following shorthand is allowed:
-		</p>
-		<pre>
--spec Function(ArgType1, ..., ArgTypeN) -> ReturnType.
-		</pre>
-		<p>
-		Also, for documentation purposes, argument names can be given:
-		</p>
-		<pre>
--spec Function(ArgName1 :: Type1, ..., ArgNameN :: TypeN) -> RT.
-		</pre>
-		<p>
-		A function specification can be overloaded. 
-		That is, it can have several types, separated by a semicolon (<c>;</c>):
-		</p>
-		<pre>
+  <section>
+    <title>Specifications for functions</title>
+    <p>
+      A specification (or contract) for a function is given using the new 
+      compiler attribute <c>'-spec'</c>. The general format is as follows:
+    </p>
+    <pre>
+-spec Module:Function(ArgType1, ..., ArgTypeN) -> ReturnType.</pre>
+    <p>
+      The arity of the function has to match the number of arguments, 
+      or else a compilation error occurs.
+    </p>
+    <p>
+      This form can also be used in header files (.hrl) to declare type 
+      information for exported functions. 
+      Then these header files can be included in files that (implicitly or 
+      explicitly) import these functions.
+    </p>
+    <p>
+      For most uses within a given module, the following shorthand suffices:
+    </p>
+    <pre>
+-spec Function(ArgType1, ..., ArgTypeN) -> ReturnType.</pre>
+    <p>
+      Also, for documentation purposes, argument names can be given:
+    </p>
+    <pre>
+-spec Function(ArgName1 :: Type1, ..., ArgNameN :: TypeN) -> RT.</pre>
+    <p>
+      A function specification can be overloaded. 
+      That is, it can have several types, separated by a semicolon (<c>;</c>):
+    </p>
+    <pre>
 -spec foo(T1, T2) -> T3
-       ; (T4, T5) -> T6.
-       </pre>
-       <p>
-		A current restriction, which currently results in a warning 
-		(OBS: not an error) by the compiler, is that the domains of the argument 
-		types cannot be overlapping. 
-		For example, the following specification results in a warning:
-		</p>
-		<pre>
+       ; (T4, T5) -> T6.</pre>
+    <p>
+      A current restriction, which currently results in a warning 
+      (OBS: not an error) by the compiler, is that the domains of
+      the argument types cannot be overlapping.
+      For example, the following specification results in a warning:
+    </p>
+    <pre>
 -spec foo(pos_integer()) -> pos_integer()
-       ; (integer()) -> integer().
-       	</pre>
-       	<p>
-		Type variables can be used in specifications to specify relations for 
-		the input and output arguments of a function. 
-		For example, the following specification defines the type of a 
-		polymorphic identity function:
-		</p>
-		<pre>
--spec id(X) -> X.
-		</pre>
-		<p>
-		However, note that the above specification does not restrict the input 
-		and output type in any way. 
-		We can constrain these types by guard-like subtype constraints:
-		</p>
-		<pre>
--spec id(X) -> X when is_subtype(X, tuple()).
-		</pre>
-		<p>
-		and provide bounded quantification. Currently, 
-		the <c>is_subtype/2</c> guard is the only guard which can 
-		be used in a <c>'-spec'</c> attribute.
-		</p>
-		<p>
-		The scope of an <c>is_subtype/2</c> constraint is the 
-		<c>(...) -> RetType</c> 
-		specification after which it appears. To avoid confusion, 
-		we suggest that different variables are used in different constituents of 
-		an overloaded contract as in the example below:
-		</p>
-		<pre>
--spec foo({X, integer()}) -> X when is_subtype(X, atom())
-       ; ([Y]) -> Y when is_subtype(Y, number()).
-		</pre>
-		<p>
-		Some functions in Erlang are not meant to return; 
-		either because they define servers or because they are used to 
-		throw exceptions as the function below:
-		</p>
-		<pre>
-my_error(Err) -> erlang:throw({error, Err}).
-		</pre>
-		<p>
-		For such functions we recommend the use of the special no_return() 
-		type for their "return", via a contract of the form:
-		</p>
-		<pre>
--spec my_error(term()) -> no_return().
-		</pre>
-	      </section>
+       ; (integer()) -> integer().</pre>
+    <p>
+      Type variables can be used in specifications to specify relations for 
+      the input and output arguments of a function. 
+      For example, the following specification defines the type of a 
+      polymorphic identity function:
+    </p>
+    <pre>
+-spec id(X) -> X.</pre>
+    <p>
+      However, note that the above specification does not restrict the input 
+      and output type in any way. 
+      We can constrain these types by guard-like subtype constraints:
+    </p>
+    <pre>
+-spec id(X) -> X when is_subtype(X, tuple()).</pre>
+    <p>
+    or equivalently by the more succinct and more modern form of the above:
+    </p>
+    <pre>
+-spec id(X) -> X when X :: tuple().</pre>
+    <p>
+      and provide bounded quantification. Currently, the <c>::</c> constraint
+      (the <c>is_subtype/2</c> guard) is the only guard constraint which can 
+      be used in the <c>'when'</c> part of a <c>'-spec'</c> attribute.
+    </p>
+    <p>
+      The scope of an <c>::</c> constraint is the 
+      <c>(...) -> RetType</c> 
+      specification after which it appears. To avoid confusion, 
+      we suggest that different variables are used in different
+      constituents of	an overloaded contract as in the example below:
+    </p>
+    <pre>
+-spec foo({X, integer()}) -> X when X :: atom()
+       ; ([Y]) -> Y when Y :: number().</pre>
+    <p>
+      Some functions in Erlang are not meant to return; 
+      either because they define servers or because they are used to 
+      throw exceptions as the function below:
+    </p>
+    <pre>
+my_error(Err) -> erlang:throw({error, Err}).</pre>
+    <p>
+      For such functions we recommend the use of the special no_return() 
+      type for their "return", via a contract of the form:
+    </p>
+    <pre>
+-spec my_error(term()) -> no_return().</pre>
+  </section>
 </chapter>
 
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index 154deb006b..aac90fcaa4 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -111,6 +111,10 @@ GLOSSARY  = $(HTMLDIR)/glossary.html
 GLOSSARY_SRC = $(ERL_TOP)/system/internal_tools/doctools/src/glossary.erl
 GLOSSARY_SCRIPT = $(EBIN)/glossary.$(EMULATOR)
 
+TEMPLATES = \
+	templates/index.html.src \
+	templates/applications.html.src
+
 #--------------------------------------------------------------------------
 
 $(INDEX_SCRIPT): $(INDEX_SRC)
@@ -119,8 +123,14 @@ $(INDEX_SCRIPT): $(INDEX_SRC)
 # We don't list toc_*.html as targets because we don't know
 $(HTMLDIR)/index.html + $(HTMLDIR)/applications.html: $(INDEX_SCRIPT)
 	echo "Generating index $@"
-	$(ERL) -noshell -pa $(EBIN) -s erl_html_tools top_index $(ERL_TOP) \
-	$(HTMLDIR) $(SYSTEM_VSN) -s erlang halt
+# 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) $(SYSTEM_VSN) -s erlang halt ;\
+	else \
+		$(ERL) -noshell -pa $(EBIN) -s erl_html_tools top_index rel $(RELEASE_ROOT) \
+		$(HTMLDIR) $(SYSTEM_VSN) -s erlang halt ;\
+	fi
 
 
 #--------------------------------------------------------------------------
@@ -139,8 +149,15 @@ $(MAN_INDEX_SCRIPT): $(MAN_INDEX_SRC)
 	$(ERLC) -o$(EBIN) +warn_unused_vars $<
 
 $(MAN_INDEX): $(MAN_INDEX_SCRIPT)
-	$(ERL) -noshell -pa $(EBIN) -s otp_man_index gen $(ERL_TOP) $@  \
-		-s erlang halt
+# 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
+
 
 #--------------------------------------------------------------------------
 
@@ -226,7 +243,11 @@ release_docs_spec: docs
 	$(INSTALL_DIR)  $(RELSYSDIR)/js
 	$(INSTALL_DATA)  \
 		$(JAVASCRIPT) $(RELSYSDIR)/js
-	$(INSTALL_DATA) $(INDEX_FILES) $(MAN_INDEX) $(TOP_HTML_FILES) $(RELSYSDIR) 
+	$(INSTALL_DATA) $(INDEX_FILES) $(MAN_INDEX) $(TOP_HTML_FILES) $(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
 
 
 release_spec:
diff --git a/system/doc/top/highlights.xml b/system/doc/top/highlights.xml
index a30742aed6..251bb1a47d 100644
--- a/system/doc/top/highlights.xml
+++ b/system/doc/top/highlights.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>Highlights</title>
@@ -28,133 +28,53 @@
     <rev>A</rev>
     <file>highlights.xml</file>
   </header>
-  <p>This document lists some highlights of Erlang 5.7/OTP R13A
-    (unpatched), compared to the previous version Erlang 5.6/OTP R12B,
-    with focus on things not already released as R12B patches.</p>
-  <p>Note: This document was compiled at the time when R13A was released
-    and does not list any features introduced in R13 patches.</p>
+  <p>This document lists some highlights of Erlang 5.8/OTP R14A
+    (unpatched), compared to the previous version Erlang 5.7.1/OTP R13B,
+    with focus on things not already released as R13B patches.</p>
+  <p>Note: This document was compiled at the time when R14A was released
+    and does not list any features introduced in R14 patches.</p>
 
   <section>
     <title>Erlang Language and Run-time System</title>
     <section>
-      <title>Multi-core and SMP performance improvements</title>
-      <p>
-	There SMP performance is significantly improved and will 
-	allow most applications to scale much better on systems with many
-	cores or processors. Listed below are some of the most important improvements:
-      </p>
-    <list type="bulleted">
-      <item>
-      <p>
-	The runtime system with SMP support now uses <em>multiple,
-	scheduler specific run queues</em>, instead of one globally shared
-	run queue.
-      </p>
-      <p>
-	The lock protecting the shared run queue was heavily
-	contended, and the shared run queue also caused Erlang
-	processes to randomly migrate between schedulers with
-	negative cache effects as a result.
-      </p>
-      <p>
-	With the current scheduler specific run queue solution, lock
-	contention due to run queue protection has been reduced, and
-	Erlang processes are only migrated when needed to balance the
-	load between the schedulers. The reduced amount of migration
-	also reduce lock contention on locks protecting the scheduler
-	specific instances of the erts internal memory allocators.
-      </p>
-      <p>
-	The scheduler specific run queues are also a necessity for a
-	lot of future planned NUMA (Non-Uniform Memory Access)
-	specific optimizations.
-      </p>
-      </item>
-      <item>
-	<p>
-	  Message passing has been further optimized for parallell execution.
-	  This makes parallell sending to one common receiver much more efficient.
-	</p>
-      </item>
-      <item>
-	<p>
-	  Scheduler threads can now be bound to logical processors on newer 
-	  Linux ans Solaris systems.
-	</p>
-      </item>
-    </list>
-    </section>
-    <section>
-      <title>Unicode support</title>
-	<p>
-	  Support for Unicode is implemented as described in EEP10.
-	  Formatting and reading of unicode data both from terminals
-	  and files is supported by the <c>io</c> and <c>io_lib</c> modules. 
-	  Files
-	  can be opened in modes with automatic translation to and from
-	  different unicode formats. The module 'unicode' contains
-	  functions for conversion between external and internal
-	  unicode formats and the re module has support for unicode
-	  data. There is also language syntax for specifying string and
-	  character data beyond the ISO-latin-1 range.
-	</p>
-    </section>
+      <title>New NIF features</title>
+      <list type="bulleted">
+	      <item><p>Send messages from a NIF, or from thread created by NIF, to
+	      any local process (enif_send)</p></item>
 
-    <section>
-      <title>New BIF's</title>
-      <p>
-	The BIFs <c>atom_to_binary/2</c>, <c>binary_to_atom/2</c> and 
-	<c>binary_to_existing_atom/2</c> have been added.
-      </p>
-    </section>
-
-    <section>
-      <title>Independent Erlang clusters on the same host</title>
-      <p>
-	Nodes belonging to different independent clusters can now
-	co-exist on the same host with the help of a new
-	environment variable setting <c>ERL_EPMD_PORT</c>.
-	The environment variable is used by Erl_interface and J_interface 
-	as well.
-      </p>
-    </section>
-  </section>
+	      <item><p>Store terms between NIF calls (enif_alloc_env,
+	      enif_make_copy)</p></item>
 
-  <section>
-    <title>New Applications</title>
+	      <item><p>Create binary terms with user defined memory management
+	      (enif_make_resource_binary)</p></item>
 
+	      <item><p>Some incompatible changes made to the API. For more
+	      information see the warning text in erl_nif(3).</p></item>
+	</list>
+    </section>
     <section>
-      <title>Reltool</title>
-
-           <p>
-	     Reltool is a release management tool. 
-	     It analyses a given Erlang/OTP installation and determines 
-	     various dependencies between applications. 
-	     The graphical frontend depicts the dependencies and enables 
-	     interactive customization of a target system. 
-	     The backend provides a batch interface for generation of 
-	     customized target systems.
-	     The application is still somewhat limited and should be regarded 
-	     as experimental in this release. The intention is that this
-	     application will be a valuable tool for making both traditional
-	     Erlang target systems as well as standalone components in Erlang.
-	   </p>
+      <title>Receive optimizations</title>
+	<p>Receive statements that can only read out a newly created
+	   reference are now specially optimized so that it will execute
+	   in constant time regardless of the number of messages in the
+	   receive queue for the process. That optimization will benefit
+	   calls to gen_server:call(). (See gen:do_call/4 for an example
+	   of a receive statement that will be optimized.)</p>
     </section>
-
     <section>
-      <title>WxErlang</title>
-      <p>
-	wxErlang is an Erlang binding to the WxWidgets GUI library which 
-	provides support for cross platform GUI applications. 
-	wxErlang is still in beta status and the intention is that it shall 
-	replace GS in a later stage. The Erlang debugger is also shipped in
-	a wxErlang version.
-      </p>
+      <title>Improved eprof</title>
+      <p>eprof has been reimplemented with support in the Erlang
+	 virtual machine and is now both faster (i.e. slows down the
+	 code being measured less) and scales much better. In
+	 measurements we saw speed-ups compared to the old eprof
+	 ranging from 6 times (for sequential code that only uses one
+	 scheduler/core) up to 84 times (for parallel code that uses 8
+	 cores).</p>
+
+	 <p>Note: The API for the eprof has been cleaned up and extended.
+	 See the documentation.</p>
     </section>
-
-
   </section>
-
   <section>
     <title>New features in Existing Applications</title>
 
@@ -162,77 +82,29 @@
       <title>Common_test</title>
 
       <p>
-	A support client module for SSH and SFTP, <c>ct_ssh</c>, has
-	been introduced.
-      </p>
-      <p>
-	Test case groups have been introduced. With this feature
-	it's possible to execute groups (possibly nested)
-	of test cases.
+	      It is now possible for the user to provide specific callback
+	      modules that handle test configuration data, so that data on
+	      arbitray form can be accessed (e.g. by reading files or by
+	      communicating with a configuration server process). Two
+	      default callback modules have been introduced in Common Test:
+	      ct_config_plain and ct_config_xml. The former is used to
+	      handle the traditional Common Test configuration files (with
+	      terms on key-value tuple form) and the latter to handle
+	      configuration data on XML representation.
       </p>
       <p>
-	A group definition contains a name tag, a list of
-	properties and a list of test cases (including possible
-	nested group definitions). The properties make it possible
-	to execute test cases in parallel, in sequence and in
-	shuffled order. It is also possible to repeat test cases
-	according to different criteria. 
+	      The run_test script has been replaced by a program (with the
+	      same name) which can be executed without explicit
+	      installation. The start flags are the same as for the legacy
+	      start script.
       </p>
     </section>
-
-
     <section>
-      <title>Dialyzer</title>
-      <p>
-	The analysis now accepts <em>opaque type declarations</em> and 
-	detects
-	violations of opaqueness of terms of such types. Starting
-	with R13, many Erlang/OTP standard libraries (array, dict,
-	digraph, ets, gb_sets, gb_trees, queue, and sets) contain
-	opaque type declarations of their main data types. Dialyzer
-	will spit out warnings in code that explicitly depends on the
-	structure of these terms.
-      </p>
-      <p>
-	Added support for handling UTF segments in bitstreams and for
-	detecting obvious type errors in these segments. Warning:
-	This code is not terribly tested though since there are very
-	few Erlang programs which use Unicode-based binaries - not
-	surprising since this is a new language feature of R13.
-      </p>
-      <p>
-	Strengthened the discrepancy identification when testing for
-	equality and matching between terms of different types. This
-	detects more bugs in code.
-      </p>
-      <p>
-	See the Dialyzer documentation and release notes for even more 
-	enhancements.
-      </p>
-    </section>
-
-    <section>
-      <title>SSL</title>
-      <p>
-	The "new_ssl" implementation is significantly improved and should be
-	near product status now. 
-	The new SSL is implemented in pure Erlang except for 
-	the crypto routines that are implemented in the crypto driver which
-	is an interface to libcrypto from OpenSSL.
-      </p>
-    </section>
-    
-   <section>
       <title>STDLIB</title>
-
-      <p>The Erlang scanner has been augmented as to return white-space, 
-      comments and exact location of tokens. 
-      This means that the scanner can easily be used in tools such as editors, 
-      pretty printers, syntax highlighters etc. 
-      where it is important to be able recreate the original source document.
+      <p>
+      The module binary from EEP31 (and EEP9) is implemented.
       </p>
     </section>
-
   </section>
 </chapter>
 
diff --git a/system/doc/top/incompatible.xml b/system/doc/top/incompatible.xml
index ce9522725b..e09fa7272f 100644
--- a/system/doc/top/incompatible.xml
+++ b/system/doc/top/incompatible.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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>Potential Incompatibilities</title>
@@ -29,353 +29,241 @@
     <file>incompatible.xml</file>
   </header>
   <p>This document contains a list of potential incompatibilities
-    between Erlang 5.7/OTP R12A and Erl 5.6.5/OTP R12B-5,
+    between Erlang 5.8/OTP R14A and Erl 5.7.5/OTP R13B04,
     and is an extract from the release notes for the respective applications.</p>
 
   <section>
-    <title>compiler</title>
+    <title>Tools</title>
     <list type="bulleted">
         <item>
           <p>
-	    The undocumented, unsupported, and deprecated guard BIF
-	    <c>is_constant/1</c> has been removed.</p>
-          <p>
-	    *** INCOMPATIBILITY with R12B ***</p>
-          <p>
-	    Own Id: OTP-7673</p>
-        </item>
-        <item>
-	    <p>The short-circuit operators <c>andalso</c> and
-	    <c>orelse</c> no longer guarantees that their second
-	    argument is either <c>true</c> or <c>false</c>. As a
-	    consequence, <c>andalso</c>/<c>orelse</c> are now
-	    tail-recursive.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
+	  Xref has been updated to use the re module instead of the
+	  deprecated regexp module.</p>          
+	  <p>*** INCOMPATIBILITY with R12B ***</p>
           <p>
-	    Own Id: OTP-7748</p>
+	    Own Id: OTP-8472</p>
         </item>
         <item>
-	    <p>The compiler will refuse to a compile file where the
-	    module name in the file differs from the output file
-	    name.</p>
-	    <p>When compiling using <c>erlc</c>, the current working
-	    directory will no be included in the code path (unless
-	    explicitly added using "-pa .").</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-7793</p>
-        </item>
-        <item>
-	    <p>If a module contains an exported function with the
-	    same name as an auto-imported BIF (such as
-	    <c>length/1</c>), any calls to the BIF must have an
-	    explicit <c>erlang:</c> prefix, or there will be a
-	    compilation error (such calls would only generate a
-	    warning in previous releases).</p>
-	    <p>(The reason for the change is to avoid breaking code
-	    in a future major release, R14 or R15, in which we plan
-	    to make calls without a module prefix always call the
-	    local function in the same module even if there is an
-	    auto-imported BIF with the same name.)</p>
+	    <p>eprof has been reimplemented with support in the Erlang
+	      virtual machine and is now both faster (i.e. slows down the
+	      code being measured less) and scales much better. In
+	      measurements we saw speed-ups compared to the old eprof
+	      ranging from 6 times (for sequential code that only uses one
+	      scheduler/core) up to 84 times (for parallel code that uses 8
+	      cores).</p>
+
+	      <p>Note: The API for the eprof has been cleaned up and extended.
+	      See the documentation.</p>
           <p>
 	    *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-	    Own Id: OTP-7873</p>
+	    Own Id: OTP-8706</p>
         </item>
     </list>
   </section>
 
   <section>
-    <title>Erts</title>
+    <title>Odbc</title>
     <list type="bulleted">
         <item>
-	    <p>Support for Unicode is implemented as described in
-	    EEP10. Formatting and reading of unicode data both from
-	    terminals and files is supported by the io and io_lib
-	    modules. Files can be opened in modes with automatic
-	    translation to and from different unicode formats. The
-	    module 'unicode' contains functions for conversion
-	    between external and internal unicode formats and the re
-	    module has support for unicode data. There is also
-	    language syntax for specifying string and character data
-	    beyond the ISO-latin-1 range.</p>
-	    <p>The interactive shell will support input and output of
-	    unicode characters when the terminal and operating system
-	    supports it.</p>
-	    <p>Please see the EEP and the io/io_lib manual pages as
-	    well as the stdlib users guide for details.</p>
-	    <p><em>I/O-protocol incompatibilities:</em></p>
-	    <p>The io_protocol between io_Server and client is
-	    updated to handle protocol data in unicode formats. The
-	    updated protocol is now documented. The specification
-	    resides in the stdlib <em>users manual</em>, which is a
-	    new part of the manual.</p>
-	    <p><em>io module incompatibilities:</em></p>
-	    <p>The io:put_chars, io:get_chars and io:get_line all
-	    handle and return unicode data. In the case where
-	    binaries can be provided (as to io:put_chars), they shall
-	    be encoded in UTF-8. When binaries are returned (as by
-	    io:get_line/get_chars when the io_server is set in
-	    <em>binary mode</em>) the returned data is also
-	    <em>always</em> encoded as UTF-8. The file module however
-	    still returns byte-oriented data, why file:read can be
-	    used instead of io:get_chars to read binary data in
-	    ISO-latin-1.</p>
-	    <p><em>io_lib module incompatibilities:</em></p>
-	    <p>io_lib:format can, given new format directives (i.e
-	    "~ts" and "~tc"), return lists containing integers larger
-	    than 255. </p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-7648 Aux Id: OTP-7580 OTP-7514 OTP-7494
-	    OTP-7443 OTP-7181 EEP10 EEP11 </p>
-        </item>
-        <item>
-          <p>
-	    The undocumented, unsupported, and deprecated guard BIF
-	    <c>is_constant/1</c> has been removed.</p>
-          <p>
-	    *** INCOMPATIBILITY with R12B ***</p>
-          <p>
-	    Own Id: OTP-7673</p>
-        </item>
-        <item>
-	    <p>The short-circuit operators <c>andalso</c> and
-	    <c>orelse</c> no longer guarantees that their second
-	    argument is either <c>true</c> or <c>false</c>. As a
-	    consequence, <c>andalso</c>/<c>orelse</c> are now
-	    tail-recursive.</p>
+	    <p>
+	      Now supports SQL_TYPE_TIMESTAMP on the format {{YY, MM, DD},
+	      {HH, MM, SS}}. Thanks to Juhani Ränkimies.
+	    </p>
           <p>
 	    *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-	    Own Id: OTP-7748</p>
+	    Own Id: OTP-8511</p>
         </item>
-        <item>
-	    <p>The compiler will refuse to a compile file where the
-	    module name in the file differs from the output file
-	    name.</p>
-	    <p>When compiling using <c>erlc</c>, the current working
-	    directory will no be included in the code path (unless
-	    explicitly added using "-pa .").</p>
+    </list>
+  </section>
+
+  <section>
+    <title>Ssh</title>
+    <list type="bulleted">
+     <item>
           <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
+            The configuration parameter ip_v6_disabled is now available,
+	      which makes it possible for the user to alter the IP version
+	      SSH shall use.</p>
           <p>
-	    Own Id: OTP-7793</p>
-        </item>
-        <item>
-	    <p>The deprecated functions <c>erlang:fault/1</c>,
-	    <c>erlang:fault/2</c>, and <c>file:rawopen/2</c> have
-	    been removed.</p>
+            *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
+            Own Id: OTP-8535</p>
+     </item>
+     <item>
           <p>
-	    Own Id: OTP-7812</p>
-        </item>
-        <item>
-	    <p>The escape sequences <c>\x</c> and <c>\{</c> have been
-	    assigned new interpretations (they used to return the
-	    ASCII code for <c>x</c> and <c>{</c> respectively). One
-	    or more octal characters inside curly brackets after a
-	    leading backslash is from now on an alternative to the
-	    existing syntax <c>\NNN</c>, but can also be used for
-	    codes greater than 255. In a similar fashion, one or more
-	    hexadecimal characters can be put inside curly brackets
-	    after a leading <c>\x</c>. Furthermore, the escape
-	    sequences <c>\xH</c> and <c>\xHH</c>, where N is a
-	    hexadecimal character, can be used for codes less than
-	    256.</p>
-	    <p>NOTE: These new escape sequences are still considered
-	    experimental and may be changed in the R13B release.</p>
+            Removed deprecated modules (ssh_ssh, ssh_sshd and ssh_cm) and
+	      functions (ssh_sftp:connect and ssh_sftp:stop).</p>
           <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
+            *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-	    Own Id: OTP-7855</p>
-        </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Inets</title>
-    <list type="bulleted">
+            Own Id: OTP-8596</p>
+     </item>
      <item>
           <p>
-            [httpc] - The inets http client will now use persistent
-            connections without pipelining as default and if a
-            pipeline timeout is set it will pipeline the requests on
-            the persistent connections.</p>
+            Aligned error message with used version (SSH_FX_FAILURE vs
+	      SSH_FX_NOT_A_DIRECTORY, the latter introduced in version 6).</p>
           <p>
             *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-            Own Id: OTP-7463</p>
-        </item>
+            Own Id: OTP-8644</p>
+     </item>
     </list>
   </section>
 
     <section>
-    <title>Jinterface</title>
+    <title>ERTS</title>
       <list>
         <item>
-          <p>
-	    A number of fixes and improvements from the ErlIDE group;
-	    Vlad Dumitrescu and Jakob Cederlund: JDK 1.5 is now a
-	    minimal requirement for building Jinterface. New method:
-	    OtpEpmd.lookupNames. OtpErlangList is now iterable.
-	    Non-proper lists are now allowed - you have to test if a
-	    list is proper or not. Non-proper lists can also be
-	    created. New methods: isProper, getHead, getTail and
-	    getNthTail. The get tail methods creates a sublist object
-	    that re-uses the original list. OtpErlangPid is now
-	    Comparable. Empty atoms can now be constructed, a missing
-	    feature pointed out by Sebastien Boisgerault on
-	    erlang-questions.</p>
+          <p>Some incompatible changes made to the NIF API. For more
+	      information see the warning text in erl_nif(3).</p>
           <p>
 	    *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-	    Own Id: OTP-7832</p>
+	    Own Id: OTP-8555</p>
         </item>
       </list>
     </section>
 
   <section>
-    <title>Kernel</title>
+    <title>STDLIB</title>
     <list type="bulleted">
         <item>
-	    <p>The deprecated functions <c>erlang:fault/1</c>,
-	    <c>erlang:fault/2</c>, and <c>file:rawopen/2</c> have
-	    been removed.</p>
+	    <p>When defining macros the closing right parenthesis before the
+	      dot is now mandatory.</p>
           <p>
 	    *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-	    Own Id: OTP-7812</p>
+	    Own Id: OTP-8562</p>
         </item>
     </list>
   </section>
 
   <section>
-    <title>SSH</title>
+    <title>Compiler and STDLIB</title>
     <list type="bulleted">
         <item>
           <p>
-            Ssh timeouts will now behave as expected i.e. defaults to
-            infinity. Only the user of the ssh application can know of
-            a reasonable timeout value for their application.</p>
+             Local and imported functions now override the auto-imported
+	      BIFs when the names clash. The pre R14 behaviour was that
+	      auto-imported BIFs would override local functions. To avoid
+	      that old programs change behaviour, the following will
+	      generate an error:</p>
+
+	      <list type="bulleted">
+	      <item>Doing a call without explicit module name to a local function
+	      having a name clashing with the name of an auto-imported BIF
+	      that was present (and auto-imported) before OTP R14A</item>
+
+	      <item>Explicitly importing a function having a name clashing with
+	      the name of an autoimported BIF that was present (and
+	      autoimported) before OTP R14A</item>
+
+	      <item>Using any form of the old compiler directive nowarn_bif_clash</item>
+	      </list>
+
+	      <p>If the BIF was added or auto-imported in OTP R14A or later,
+	      overriding it with an import or a local function will only
+	      result in a warning.</p>
+
+	      <p>To resolve clashes, you can either use the explicit module
+	      name erlang to call the BIF, or you can remove the
+	      auto-import of that specific BIF by using the new compiler
+	      directive -compile({no_auto_import,[F/A]})., which makes all
+	      calls to the local or imported function without explicit
+	      module name pass without warnings or errors.</p>
+
+	      <p>The change makes it possible to add auto-imported BIFs
+	      without breaking or silently changing old code in the future.
+	      However some current code ingeniously utilizing the old
+	      behaviour or the nowarn_bif_clash compiler directive, might
+	      need changing to be accepted by the compiler.</p>
           <p>
             *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-            Own Id: OTP-7807</p>
+            Own Id: OTP-8579</p>
         </item>
         <item>
           <p>
-            Added the message {ssh_channel_up, ChannelId,
-            ConnectionManager} that shall be handled by the channel
-            callback handle_msg/2. This makes the function
-            handle_msg/2 a mandatory function for ssh channels
-            implementations which it was not in ssh-1.1.</p>
+            The recently added BIFs erlang:min/2, erlang:max/2 and
+	      erlang:port_command/3 are now auto-imported (as they were
+	      originally intended to be). Due to the recent compiler change
+	      (OTP-8579), the only impact on old code defining it's own
+	      min/2, max/2 or port_command/3 functions will be a warning,
+	      the local functions will still be used. The warning can be
+	      removed by using
+	      -compile({no_auto_import,[min/2,max/2,port_command/3]}). in
+	      the source file.</p>
           <p>
             *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-            Own Id: OTP-7828</p>
+            Own Id: OTP-8669</p>
         </item>
-    </list>
-  </section>
-
-  <section>
-    <title>STDLIB</title>
-    <list type="bulleted">
         <item>
-	    <p>The functions <c>lists:seq/1,2</c> return the empty
-	    list in a few cases when they used to generate an
-	    exception, for example <c>lists:seq(1, 0)</c>. See
-	    lists(3) for details. (Thanks to Richard O'Keefe.)</p>
           <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
+           Now, binary_to_term/2 is auto-imported. This will cause a
+	      compile warning if and only if a module has got a local
+	      function with that name.</p>
           <p>
-	    Own Id: OTP-7230</p>
-        </item>
-        <item>
-	    <p>Support for Unicode is implemented as described in
-	    EEP10. Formatting and reading of unicode data both from
-	    terminals and files is supported by the io and io_lib
-	    modules. Files can be opened in modes with automatic
-	    translation to and from different unicode formats. The
-	    module 'unicode' contains functions for conversion
-	    between external and internal unicode formats and the re
-	    module has support for unicode data. There is also
-	    language syntax for specifying string and character data
-	    beyond the ISO-latin-1 range.</p>
-	    <p>The interactive shell will support input and output of
-	    unicode characters when the terminal and operating system
-	    supports it.</p>
-	    <p>Please see the EEP and the io/io_lib manual pages as
-	    well as the stdlib users guide for details.</p>
-	    <p><em>I/O-protocol incompatibilities:</em></p>
-	    <p>The io_protocol between io_Server and client is
-	    updated to handle protocol data in unicode formats. The
-	    updated protocol is now documented. The specification
-	    resides in the stdlib <em>users manual</em>, which is a
-	    new part of the manual.</p>
-	    <p><em>io module incompatibilities:</em></p>
-	    <p>The io:put_chars, io:get_chars and io:get_line all
-	    handle and return unicode data. In the case where
-	    binaries can be provided (as to io:put_chars), they shall
-	    be encoded in UTF-8. When binaries are returned (as by
-	    io:get_line/get_chars when the io_server is set in
-	    <em>binary mode</em>) the returned data is also
-	    <em>always</em> encoded as UTF-8. The file module however
-	    still returns byte-oriented data, why file:read can be
-	    used instead of io:get_chars to read binary data in
-	    ISO-latin-1.</p>
-	    <p><em>io_lib module incompatibilities:</em></p>
-	    <p>io_lib:format can, given new format directives (i.e
-	    "~ts" and "~tc"), return lists containing integers larger
-	    than 255. </p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-7648 Aux Id: OTP-7580 OTP-7514 OTP-7494
-	    OTP-7443 OTP-7181 EEP10 EEP11 </p>
-        </item>
-        <item>
-          <p>
-	    <c>filelib:fold_files/5</c> now uses the <c>re</c> module
-	    instead of the <c>regexp</c> module for regular
-	    expression matching. In practice, this change will not be
-	    a problem for most regular expressions used for
-	    <c>filelib:fold_files/5</c>. (The major difference in
-	    regular expression is that parenthesis and curly brackets
-	    is treated as literal characters by <c>regexp</c> but as
-	    special characters by <c>re</c>; fortunately, those
-	    characters are rarely used in filenames.)</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
+            *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-	    Own Id: OTP-7819</p>
+            Own Id: OTP-8671</p>
         </item>
+    </list>
+  </section>
+
+  <section>
+    <title>Erl_interface</title>
+    <list type="bulleted">
         <item>
-          <p>
-	    <c>digraph:new(Type)</c> will now cause a <c>badarg</c>
-	    exception if <c>Type</c> is not a valid type. Similarly,
-	    <c>digraph_utils:subgraph/2,3</c> will now cause a
-	    <c>badarg</c> if the arguments are invalid. (Those
-	    functions used to return error tuples if something was
-	    wrong.)</p>
+	    <p>Compact IEEE 754 double encoding in external binary format
+	      for ei</p>
+
+	      <p>Implement the compact IEEE 754 double encoding in external
+	      binary format for ei. Encoding for ei now always produces the
+	      NEW_FLOAT_EXT format. Decoding and term printing handle both
+	      the old ERL_FLOAT_EXT encoding and the new NEW_FLOAT_EXT
+	      encoding.</p> 
+
+	      <p>Legacy erl_interface code also handles the new encoding, but
+	      still produces the ERL_FLOAT_EXT encoding by default.</p>
+
+	      <p>Also enable the DFLAG_NEW_FLOATS distribution flag.</p>
+
+	      <p>ei_get_type() will return ERL_FLOAT_EXT regardless if the
+	      external format is encoded with ERL_FLOAT_EXT or
+	      NEW_FLOAT_EXT for doubles.</p>
+
+	      <p>Reduce the number of copies of the code for encoding and
+	      decoding doubles throughout ei and erl_interface by instead
+	      calling the ei encoding and decoding functions wherever
+	      possible.</p>
+
+	      <p>Restore commented-out float tests in ei_decode_SUITE and
+	      ei_encode_SUITE in lib/erl_interface/test. Modify them to
+	      make them match the style of other tests in the same suites.</p>
+
+	      <p>These changes are based on an ei float patch from Serge
+	      Aleynikov originally submitted against R12B-2 in July 2008
+	      and reworked by Steve Vinoski May 2010.</p>
           <p>
 	    *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-	    Own Id: OTP-7824</p>
+	    Own Id: OTP-8684</p>
         </item>
+    </list>
+  </section>
+  <section>
+    <title>Debugger and STDLIB</title>
+    <list type="bulleted">
         <item>
-	    <p>The argument passed to <c>random:uniform/1</c> must
-	    now be an integer (as stated in the documentation). In
-	    previous releases, a floating point number was also
-	    allowed.</p>
+	    <p> The predefined builtin type tid() has been removed. Instead,
+	      ets:tid() should be used.</p>
           <p>
 	    *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
-	    Own Id: OTP-7827</p>
+	    Own Id: OTP-8687</p>
         </item>
     </list>
   </section>
diff --git a/system/doc/top/src/erl_html_tools.erl b/system/doc/top/src/erl_html_tools.erl
index c920245f94..599268804e 100644
--- a/system/doc/top/src/erl_html_tools.erl
+++ b/system/doc/top/src/erl_html_tools.erl
@@ -26,7 +26,7 @@
 %%-----------------------------------------------------------------
 -module(erl_html_tools). 
 
--export([top_index/0,top_index/1,top_index/3,top_index_silent/3]).
+-export([top_index/0,top_index/1,top_index/4,top_index_silent/3]).
 
 -include_lib("kernel/include/file.hrl").
 
@@ -40,7 +40,8 @@ group_order() ->
      {test, "Test"},
      {doc, "Documentation"},
      {orb, "Object Request Broker & IDL"},
-     {misc, "Miscellaneous"}
+     {misc, "Miscellaneous"},
+     {eric, "Ericsson Internal"}
     ].
 
 top_index() ->
@@ -49,19 +50,22 @@ top_index() ->
 	    io:format("Variable ERL_TOP is required\n",[]);
 	Value ->
 	    {_,RelName} = init:script_id(),	    
-	    top_index(Value, filename:join(Value, "doc"), RelName)
+	    top_index(src, Value, filename:join(Value, "doc"), RelName)
     end.
 
-top_index([RootDir, DestDir, OtpRel])
+top_index([src, RootDir, DestDir, OtpRel])
   when is_atom(RootDir), is_atom(DestDir), is_atom(OtpRel) ->
-    top_index(atom_to_list(RootDir), atom_to_list(DestDir), atom_to_list(OtpRel));
-top_index(RootDir)  when is_atom(RootDir) ->
+    top_index(src, atom_to_list(RootDir), atom_to_list(DestDir), atom_to_list(OtpRel));
+top_index([rel, RootDir, DestDir, OtpRel])
+  when is_atom(RootDir), is_atom(DestDir), is_atom(OtpRel) ->
+    top_index(rel, atom_to_list(RootDir), atom_to_list(DestDir), atom_to_list(OtpRel));
+top_index(RootDir)  when is_atom(RootDir) -> 
     {_,RelName} = init:script_id(),
-    top_index(RootDir, filename:join(RootDir, "doc"), RelName).
+    top_index(rel, RootDir, filename:join(RootDir, "doc"), RelName).
 
 
 
-top_index(RootDir, DestDir, OtpRel) ->
+top_index(Source, RootDir, DestDir, OtpRel) ->
     report("****\nRootDir: ~p", [RootDir]),
     report("****\nDestDir: ~p", [DestDir]),
     report("****\nOtpRel: ~p", [OtpRel]),
@@ -72,13 +76,13 @@ top_index(RootDir, DestDir, OtpRel) ->
     report("****\nTemplates: ~p", [Templates]),
     Bases = [{"../lib/", filename:join(RootDir,"lib")},
 	     {"../",     RootDir}],
-    Groups = find_information(Bases),
+    Groups = find_information(Source, Bases),
     report("****\nGroups: ~p", [Groups]),
     process_templates(Templates, DestDir, Groups).
 
 top_index_silent(RootDir, DestDir, OtpRel) ->
     put(silent,true),
-    Result = top_index(RootDir, DestDir, OtpRel),
+    Result = top_index(rel, RootDir, DestDir, OtpRel),
     erase(silent),
     Result.
 
@@ -159,8 +163,8 @@ find_templates([], AllSearchPaths) ->
 % This function read all application names and if present all "info" files.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-find_information(Bases) ->
-    Paths = find_application_paths(Bases),
+find_information(Source, Bases) ->
+    Paths = find_application_paths(Source, Bases),
 %    report("****\nPaths: ~p", [Paths]),
     Apps = find_application_infos(Paths),
 %    report("****\nApps: ~p", [Apps]),
@@ -176,35 +180,47 @@ find_information(Bases) ->
 %
 % We know URL ends in a slash.
 
-find_application_paths([]) ->
+find_application_paths(_, []) ->
     [];
-find_application_paths([{URL, Dir} | Paths]) ->
+find_application_paths(Source, [{URL, Dir} | Paths]) ->
+
+    AppDirs = get_app_dirs(Dir),   
+    AppPaths = get_app_paths(Source, AppDirs, URL),
+    AppPaths ++ find_application_paths(Source, Paths).
+
+
+get_app_paths(src, AppDirs, URL) ->
     Sub1 = "doc/html/index.html",
 %%     Sub2 = "doc/index.html",
+    lists:map(
+      fun({App, AppPath}) -> 
+	      VsnFile = filename:join(AppPath, "vsn.mk"),
+	      VsnStr = 
+		  case file:read_file(VsnFile) of
+		      {ok, Bin} ->
+			  case re:run(Bin, ".*VSN\s*=\s*([0-9\.]+).*",[{capture,[1],list}]) of
+			      {match, [V]} ->
+				  V;
+			      nomatch ->
+				  exit(io_lib:format("No VSN variable found in ~s\n",
+						     [VsnFile]))
+			  end;
+		      {error, Reason} ->
+			  exit(io_lib:format("~p : ~s\n", [Reason, VsnFile]))
+		  end,
+	      AppURL = URL ++ App ++ "-" ++ VsnStr,
+	      {App, VsnStr, AppPath, AppURL ++ "/" ++ Sub1}
+      end, AppDirs);
+get_app_paths(rel, AppDirs, URL) ->
+    Sub1 = "doc/html/index.html",
+%%     Sub2 = "doc/index.html",
+    lists:map(
+      fun({App, AppPath}) -> 
+	      [AppName, VsnStr] = string:tokens(App, "-"),
+	      AppURL = URL ++ App,
+	      {AppName, VsnStr, AppPath, AppURL ++ "/" ++ Sub1}
+      end, AppDirs).
 
-    AppDirs = get_app_dirs(Dir),
-    
-    AppPaths =
-	lists:map(
-	  fun({App, AppPath}) -> 
-		  VsnFile = filename:join(AppPath, "vsn.mk"),
-		  VsnStr = 
-		      case file:read_file(VsnFile) of
-			  {ok, Bin} ->
-			      case re:run(Bin, ".*VSN\s*=\s*([0-9\.]+).*",[{capture,[1],list}]) of
-				  {match, [V]} ->
-				      V;
-				  nomatch ->
-				      exit(io_lib:format("No VSN variable found in ~s\n",
-							 [VsnFile]))
-			      end;
-			  {error, Reason} ->
-			      exit(io_lib:format("~p : ~s\n", [Reason, VsnFile]))
-		      end,
-		  AppURL = URL ++ App ++ "-" ++ VsnStr,
-		  {App, VsnStr, AppPath, AppURL ++ "/" ++ Sub1}
-	  end, AppDirs),
-    AppPaths ++ find_application_paths(Paths).
 
 get_app_dirs(Dir) ->
     {ok, Files} = file:list_dir(Dir),
@@ -212,7 +228,7 @@ get_app_dirs(Dir) ->
 	lists:map(fun(File) -> {File, filename:join([Dir, File])} end, Files),
     lists:zf(fun is_app_with_doc/1, AFiles).
 
-is_app_with_doc({"." ++ ADir, _APath}) ->
+is_app_with_doc({"." ++ _ADir, _APath}) ->
     false;
 is_app_with_doc({ADir, APath}) ->
     case file:read_file_info(filename:join([APath, "info"])) of
diff --git a/system/doc/top/src/otp_man_index.erl b/system/doc/top/src/otp_man_index.erl
index 0fdc531b37..4ad975c53d 100644
--- a/system/doc/top/src/otp_man_index.erl
+++ b/system/doc/top/src/otp_man_index.erl
@@ -27,14 +27,20 @@
 
 -module(otp_man_index). 
 
--export([gen/1]).
+-export([gen/1, gen/2]).
 -include_lib("kernel/include/file.hrl").
 
 
-gen([RootDir, OutFile])  when is_atom(RootDir),  is_atom(OutFile)->
+gen([Source, RootDir, OutFile])  when is_atom(RootDir),  is_atom(OutFile)->
+    gen(Source, RootDir, OutFile).
+
+gen(RootDir, OutFile) ->
+    gen(rel, RootDir, OutFile).
+
+gen(Source, RootDir, OutFile) ->
     Bases = [{"../lib/", filename:join(RootDir, "lib")},
 	     {"../", RootDir}],
-    Apps = find_application_paths(Bases),
+    Apps = find_application_paths(Source, Bases),
     RefPages = find_ref_files(Apps),
     gen_html(RefPages, atom_to_list(OutFile)).
     
@@ -81,43 +87,52 @@ find_ref_files([{App, Vsn, AppPath, RelPath} |Apps], Acc) ->
 	    find_ref_files(Apps, Refs2 ++ Acc)
     end.
 
-find_application_paths([]) ->
+find_application_paths(_, []) ->
     [];
-find_application_paths([{URL, Dir} | Paths]) ->
-    Sub1 = "doc/html",
+find_application_paths(Source, [{URL, Dir} | Paths]) ->
 
     AppDirs = get_app_dirs(Dir),
-    
-    AppPaths =
-	lists:map(
-	  fun({App, AppPath}) -> 
-		  VsnFile = filename:join(AppPath, "vsn.mk"),
-		  VsnStr = 
-		      case file:read_file(VsnFile) of
-			  {ok, Bin} ->
-			      case re:run(Bin, ".*VSN\s*=\s*([0-9\.]+).*",[{capture,[1],list}]) of
-				  {match, [V]} ->
-				      V;
-				  nomatch ->
-				      exit(io_lib:format("No VSN variable found in ~s\n",
-							 [VsnFile]))
-			      end;
-			  {error, Reason} ->
-			      exit(io_lib:format("~p : ~s\n", [Reason, VsnFile]))
-		      end,
-		  AppURL = URL ++ App ++ "-" ++ VsnStr,
-		  {App, VsnStr, AppPath ++ "/" ++ Sub1, AppURL ++ "/" ++ Sub1}
-	  end, AppDirs),
-    AppPaths ++ find_application_paths(Paths).
-    
+    AppPaths = get_app_paths(Source, AppDirs, URL),
+    AppPaths ++ find_application_paths(Source, Paths).
 
+get_app_paths(src, AppDirs, URL) ->
+    Sub1 = "doc/html",
+    lists:map(
+      fun({App, AppPath}) -> 
+	      VsnFile = filename:join(AppPath, "vsn.mk"),
+	      VsnStr = 
+		  case file:read_file(VsnFile) of
+		      {ok, Bin} ->
+			  case re:run(Bin, ".*VSN\s*=\s*([0-9\.]+).*",[{capture,[1],list}]) of
+			      {match, [V]} ->
+				  V;
+			      nomatch ->
+				  exit(io_lib:format("No VSN variable found in ~s\n",
+						     [VsnFile]))
+			  end;
+		      {error, Reason} ->
+			  exit(io_lib:format("~p : ~s\n", [Reason, VsnFile]))
+		  end,
+	      AppURL = URL ++ App ++ "-" ++ VsnStr,
+	      {App, VsnStr, AppPath ++ "/" ++ Sub1, AppURL ++ "/" ++ Sub1}
+      end, AppDirs);
+get_app_paths(rel, AppDirs, URL) ->
+    Sub1 = "doc/html",
+    lists:map(
+      fun({App, AppPath}) -> 
+	      [AppName, VsnStr] = string:tokens(App, "-"),
+	      AppURL = URL ++ App,
+	      {AppName, VsnStr, AppPath ++ "/" ++ Sub1, AppURL ++ "/" ++ Sub1}
+      end, AppDirs).
+
+    
 get_app_dirs(Dir) ->
     {ok, Files} = file:list_dir(Dir),
     AFiles = 
 	lists:map(fun(File) -> {File, filename:join([Dir, File])} end, Files),
     lists:zf(fun is_app_with_doc/1, AFiles).
 
-is_app_with_doc({"." ++ ADir, _APath}) ->
+is_app_with_doc({"." ++ _ADir, _APath}) ->
     false;
 is_app_with_doc({ADir, APath}) ->
     case file:read_file_info(filename:join([APath, "info"])) of
diff --git a/system/doc/top/templates/index.html.src b/system/doc/top/templates/index.html.src
index 88d425ac1d..655f532a5d 100644
--- a/system/doc/top/templates/index.html.src
+++ b/system/doc/top/templates/index.html.src
@@ -39,10 +39,6 @@ under the License.
 <small><a href="applications.html">Applications</a><br>
 <a href="man_index.html">Modules</a></small>
 <p/>
-<small><a href="highlights.html">Release highlights</a><br/>
-<a href="incompatible.html">Potential incompatibilities</a><br/>
-</small>
-<br>
 <a href="javascript:openAllFlips()">Expand All</a><br>
 <a href="javascript:closeAllFlips()">Contract All</a>
 <p/>
diff --git a/system/doc/tutorial/c_port.xmlsrc b/system/doc/tutorial/c_port.xmlsrc
index 7e6034807b..b4caa07578 100644
--- a/system/doc/tutorial/c_port.xmlsrc
+++ b/system/doc/tutorial/c_port.xmlsrc
@@ -70,7 +70,7 @@ loop(Port) ->
     {call, Caller, Msg} ->
       Port ! {self(), {command, encode(Msg)}},
       receive
-\011{Port, {data, Data}} ->
+    {Port, {data, Data}} ->
           Caller ! {complex, decode(Data)}
       end,
       loop(Port)